diff --git a/.editorconfig b/.editorconfig
index 0139377bf9..6479173ef8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,6 +4,17 @@ root = true
 indent_size = 2
 ktlint_standard_trailing-comma-on-call-site = disable
 ktlint_standard_trailing-comma-on-declaration-site = disable
-ktlink_standard_spacing-between-declarations-with-annotations = disable
+ktlint_standard_spacing-between-declarations-with-annotations = disable
 ktlint_code_style = intellij_idea
-ktlint_standard_class-naming = disabled
\ No newline at end of file
+ktlint_standard_class-naming = disabled
+
+# below rules disabled during ktlint version migration because they were preexisting but should be corrected and re-enabled ASAP
+ktlint_function_naming_ignore_when_annotated_with = Composable
+ktlint_standard_property-naming = disabled
+ktlint_standard_enum-wrapping = disabled
+ktlint_standard_multiline-if-else = disabled
+ktlint_standard_backing-property-naming = disabled
+ktlint_standard_statement-wrapping = disabled
+internal:ktlint-suppression = disabled
+ktlint_standard_unnecessary-parentheses-before-trailing-lambda = disabled
+ktlint_standard_value-parameter-comment = disabled
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 2a5a8a1a5c..172098c107 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -49,6 +49,10 @@
       </indentOptions>
     </codeStyleSettings>
     <codeStyleSettings language="JAVA">
+      <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="LINE_COMMENT_ADD_SPACE" value="true" />
+      <option name="BLOCK_COMMENT_ADD_SPACE" value="true" />
       <option name="BRACE_STYLE" value="5" />
       <option name="CLASS_BRACE_STYLE" value="5" />
       <option name="METHOD_BRACE_STYLE" value="5" />
@@ -213,6 +217,10 @@
       </arrangement>
     </codeStyleSettings>
     <codeStyleSettings language="kotlin">
+      <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="LINE_COMMENT_ADD_SPACE" value="true" />
+      <option name="BLOCK_COMMENT_ADD_SPACE" value="true" />
       <indentOptions>
         <option name="INDENT_SIZE" value="2" />
         <option name="CONTINUATION_INDENT_SIZE" value="2" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 15406e8935..05e1d66a22 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -18,11 +18,11 @@ apply {
   from("fix-profm.gradle")
 }
 
-val canonicalVersionCode = 1421
-val canonicalVersionName = "7.8.1"
-val mollyRevision = 2
-
-val postFixSize = 100
+val canonicalVersionCode = 1436
+val canonicalVersionName = "7.11.4"
+val mollyRevision = 1
+val currentHotfixVersion = 1
+val maxHotfixVersions = 100
 
 val sourceVersionNameWithRevision = "${canonicalVersionName}-${mollyRevision}"
 
@@ -85,6 +85,8 @@ android {
   useLibrary("org.apache.http.legacy")
   testBuildType = "instrumentation"
 
+  android.bundle.language.enableSplit = false
+
   kotlinOptions {
     jvmTarget = signalKotlinJvmTarget
   }
@@ -142,15 +144,15 @@ android {
   }
 
   composeOptions {
-    kotlinCompilerExtensionVersion = "1.4.4"
+    kotlinCompilerExtensionVersion = "1.5.4"
   }
 
-  if (mollyRevision < 0 || mollyRevision >= postFixSize) {
-    throw GradleException("Molly revision $mollyRevision out of range")
+  if (mollyRevision < 0 || currentHotfixVersion < 0 || (mollyRevision + currentHotfixVersion) >= maxHotfixVersions) {
+    throw GradleException("Molly revision $mollyRevision or Hotfix version $currentHotfixVersion out of range")
   }
 
   defaultConfig {
-    versionCode = canonicalVersionCode * postFixSize + mollyRevision
+    versionCode = (canonicalVersionCode * maxHotfixVersions) + mollyRevision + currentHotfixVersion
     versionName = if (ciEnabled) getCommitTag() else sourceVersionNameWithRevision
 
     minSdk = signalMinSdkVersion
@@ -198,11 +200,12 @@ android {
     buildConfigField("String", "SIGNAL_CAPTCHA_URL", "\"https://signalcaptchas.org/registration/generate.html\"")
     buildConfigField("String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/challenge/generate.html\"")
     buildConfigField("org.signal.libsignal.net.Network.Environment", "LIBSIGNAL_NET_ENV", "org.signal.libsignal.net.Network.Environment.PRODUCTION")
+    buildConfigField("int", "LIBSIGNAL_LOG_LEVEL", "org.signal.libsignal.protocol.logging.SignalProtocolLogger.INFO")
 
     // MOLLY: Rely on the built-in variables FLAVOR and BUILD_TYPE instead of BUILD_*_TYPE
     buildConfigField("String", "BADGE_STATIC_ROOT", "\"https://updates2.signal.org/static/badges/\"")
+    buildConfigField("String", "STRIPE_PUBLISHABLE_KEY", "\"pk_live_6cmGZopuTsV8novGgJJW9JpC00vLIgtQ1D\"")
     buildConfigField("boolean", "TRACING_ENABLED", "false")
-    buildConfigField("boolean", "MESSAGE_BACKUP_RESTORE_ENABLED", "false")
 
     ndk {
       //noinspection ChromeOsAbiSupport
@@ -211,12 +214,6 @@ android {
 
     resourceConfigurations += listOf()
 
-    bundle {
-      language {
-        enableSplit = false
-      }
-    }
-
     testInstrumentationRunner = "org.thoughtcrime.securesms.testing.SignalTestRunner"
     testInstrumentationRunnerArguments["clearPackageData"] = "true"
   }
@@ -342,10 +339,10 @@ android {
       buildConfigField("String", "SIGNAL_CAPTCHA_URL", "\"https://signalcaptchas.org/staging/registration/generate.html\"")
       buildConfigField("String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/staging/challenge/generate.html\"")
       buildConfigField("org.signal.libsignal.net.Network.Environment", "LIBSIGNAL_NET_ENV", "org.signal.libsignal.net.Network.Environment.STAGING")
+      buildConfigField("int", "LIBSIGNAL_LOG_LEVEL", "org.signal.libsignal.protocol.logging.SignalProtocolLogger.DEBUG")
 
       buildConfigField("String", "BUILD_ENVIRONMENT_TYPE", "\"Staging\"")
       buildConfigField("String", "STRIPE_PUBLISHABLE_KEY", "\"pk_test_sngOd8FnXNkpce9nPXawKrJD00kIDngZkD\"")
-      buildConfigField("boolean", "MESSAGE_BACKUP_RESTORE_ENABLED", "true")
     }
   }
 
@@ -406,6 +403,7 @@ dependencies {
   implementation(project(":video"))
   implementation(project(":device-transfer"))
   implementation(project(":image-editor"))
+  implementation(project(":donations"))
   implementation(project(":contacts"))
   implementation(project(":qr"))
   implementation(project(":sticky-header-grid"))
@@ -454,6 +452,7 @@ dependencies {
   implementation(libs.androidx.profileinstaller)
   implementation(libs.androidx.asynclayoutinflater)
   implementation(libs.androidx.asynclayoutinflater.appcompat)
+  implementation(libs.androidx.emoji2)
   implementation(libs.androidx.webkit)
   "gmsImplementation"(libs.firebase.messaging) {
     exclude(group = "com.google.firebase", module = "firebase-core")
@@ -462,6 +461,7 @@ dependencies {
   }
   "gmsImplementation"(libs.google.play.services.maps)
   "gmsImplementation"(libs.google.play.services.auth)
+  "fossImplementation"(project(":libfakegms"))
   implementation(libs.bundles.media3)
   implementation(libs.conscrypt.android)
   implementation(libs.signal.aesgcmprovider)
@@ -486,6 +486,7 @@ dependencies {
   }
   implementation(libs.stream)
   implementation(libs.lottie)
+  implementation(libs.lottie.compose)
   implementation(libs.signal.android.database.sqlcipher)
   implementation(libs.androidx.sqlite)
   implementation(libs.google.ez.vcard) {
@@ -496,6 +497,9 @@ dependencies {
   implementation(libs.kotlinx.collections.immutable)
   implementation(libs.accompanist.permissions)
   implementation(libs.kotlin.stdlib.jdk8)
+  implementation(libs.kotlin.reflect)
+  "gmsImplementation"(libs.kotlinx.coroutines.play.services)
+  implementation(libs.jackson.module.kotlin)
   implementation(libs.rxjava3.rxandroid)
   implementation(libs.rxjava3.rxkotlin)
   implementation(libs.rxdogtag)
@@ -506,7 +510,6 @@ dependencies {
   implementation(libs.molly.glide.webp.decoder)
   implementation(libs.gosimple.nbvcxz)
   "fossImplementation"("org.osmdroid:osmdroid-android:6.1.16")
-  "fossImplementation"(project(":libfakegms"))
 
   "spinnerImplementation"(project(":spinner"))
 
diff --git a/app/proguard/proguard.cfg b/app/proguard/proguard.cfg
index 65f2de3c3b..d52eb11852 100644
--- a/app/proguard/proguard.cfg
+++ b/app/proguard/proguard.cfg
@@ -15,6 +15,10 @@
 
 -keep class androidx.window.** { *; }
 
+-keepclassmembers class * extends androidx.constraintlayout.motion.widget.Key {
+  public <init>();
+}
+
 # AGP generated dont warns
 -dontwarn com.android.org.conscrypt.SSLParametersImpl
 -dontwarn org.apache.harmony.xnet.provider.jsse.SSLParametersImpl
diff --git a/app/src/androidTest/assets/backupTests/account-data.binproto b/app/src/androidTest/assets/backupTests/account-data.binproto
new file mode 100644
index 0000000000..54ebb6e04a
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/account-data.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/registered-blocked-contact.binproto b/app/src/androidTest/assets/backupTests/registered-blocked-contact.binproto
new file mode 100644
index 0000000000..439129a11c
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/registered-blocked-contact.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/story-distribution-list.binproto b/app/src/androidTest/assets/backupTests/story-distribution-list.binproto
new file mode 100644
index 0000000000..369e68ab6b
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/story-distribution-list.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/unregistered-contact.binproto b/app/src/androidTest/assets/backupTests/unregistered-contact.binproto
new file mode 100644
index 0000000000..cf94133160
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/unregistered-contact.binproto differ
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/SignalInstrumentationApplicationContext.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/SignalInstrumentationApplicationContext.kt
index f7164a0eae..362bfd03c3 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/SignalInstrumentationApplicationContext.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/SignalInstrumentationApplicationContext.kt
@@ -6,7 +6,7 @@ import org.signal.core.util.logging.Log
 import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil
 import org.thoughtcrime.securesms.database.LogDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider
 import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger
@@ -26,8 +26,8 @@ class SignalInstrumentationApplicationContext : ApplicationContext() {
 
   override fun initializeAppDependencies() {
     val default = ApplicationDependencyProvider(this)
-    ApplicationDependencies.init(this, InstrumentationApplicationDependencyProvider(this, default))
-    ApplicationDependencies.getDeadlockDetector().start()
+    AppDependencies.init(this, InstrumentationApplicationDependencyProvider(this, default))
+    AppDependencies.deadlockDetector.start()
   }
 
   override fun initializeLogging(locked: Boolean) {
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/BackupTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/BackupTest.kt
index 77cff4430d..704cd2bac0 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/BackupTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/BackupTest.kt
@@ -10,6 +10,7 @@ import android.database.Cursor
 import androidx.core.content.contentValuesOf
 import net.zetetic.database.sqlcipher.SQLiteDatabase
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Test
 import org.signal.core.util.Hex
 import org.signal.core.util.SqlUtil
@@ -24,27 +25,30 @@ import org.signal.core.util.toInt
 import org.signal.core.util.withinTransaction
 import org.signal.libsignal.zkgroup.profiles.ProfileKey
 import org.thoughtcrime.securesms.backup.v2.database.clearAllDataForBackupRestore
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
 import org.thoughtcrime.securesms.database.CallTable
 import org.thoughtcrime.securesms.database.EmojiSearchTable
 import org.thoughtcrime.securesms.database.MessageTable
 import org.thoughtcrime.securesms.database.MessageTypes
 import org.thoughtcrime.securesms.database.RecipientTable
 import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.QuoteModel
 import org.thoughtcrime.securesms.profiles.ProfileName
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.subscription.Subscriber
 import org.thoughtcrime.securesms.testing.assertIs
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import org.whispersystems.signalservice.api.subscriptions.SubscriberId
 import java.io.ByteArrayInputStream
+import java.util.Currency
 import java.util.UUID
 import kotlin.random.Random
 
@@ -79,18 +83,20 @@ class BackupTest {
 
   @Before
   fun setup() {
-    SignalStore.account().setE164(SELF_E164)
-    SignalStore.account().setAci(SELF_ACI)
-    SignalStore.account().setPni(SELF_PNI)
-    SignalStore.account().generateAciIdentityKeyIfNecessary()
-    SignalStore.account().generatePniIdentityKeyIfNecessary()
+    SignalStore.account.setE164(SELF_E164)
+    SignalStore.account.setAci(SELF_ACI)
+    SignalStore.account.setPni(SELF_PNI)
+    SignalStore.account.generateAciIdentityKeyIfNecessary()
+    SignalStore.account.generatePniIdentityKeyIfNecessary()
   }
 
+  @Ignore("Will likely be removed soon")
   @Test
   fun emptyDatabase() {
     backupTest { }
   }
 
+  @Ignore("Will likely be removed soon")
   @Test
   fun noteToSelf() {
     backupTest {
@@ -102,6 +108,7 @@ class BackupTest {
     }
   }
 
+  @Ignore("Will likely be removed soon")
   @Test
   fun individualChat() {
     backupTest {
@@ -118,6 +125,7 @@ class BackupTest {
     }
   }
 
+  @Ignore("Will likely be removed soon")
   @Test
   fun individualRecipients() {
     backupTest {
@@ -149,6 +157,7 @@ class BackupTest {
     }
   }
 
+  @Ignore("Will likely be removed soon")
   @Test
   fun individualCallLogs() {
     backupTest {
@@ -231,9 +240,10 @@ class BackupTest {
     }
   }
 
+  @Ignore("Will likely be removed soon")
   @Test
   fun accountData() {
-    val context = ApplicationDependencies.getApplication()
+    val context = AppDependencies.application
 
     backupTest(validateKeyValue = true) {
       val self = Recipient.self()
@@ -241,35 +251,34 @@ class BackupTest {
       // TODO note-to-self archived
       // TODO note-to-self unread
 
-      SignalStore.account().setAci(SELF_ACI)
-      SignalStore.account().setPni(SELF_PNI)
-      SignalStore.account().setE164(SELF_E164)
-      SignalStore.account().generateAciIdentityKeyIfNecessary()
-      SignalStore.account().generatePniIdentityKeyIfNecessary()
+      SignalStore.account.setAci(SELF_ACI)
+      SignalStore.account.setPni(SELF_PNI)
+      SignalStore.account.setE164(SELF_E164)
+      SignalStore.account.generateAciIdentityKeyIfNecessary()
+      SignalStore.account.generatePniIdentityKeyIfNecessary()
 
       SignalDatabase.recipients.setProfileKey(self.id, ProfileKey(Random.nextBytes(32)))
       SignalDatabase.recipients.setProfileName(self.id, ProfileName.fromParts("Peter", "Parker"))
       SignalDatabase.recipients.setProfileAvatar(self.id, "https://example.com/")
 
-      SignalStore.donationsValues().markUserManuallyCancelled()
-      SignalStore.donationsValues().setSubscriber(Subscriber(SubscriberId.generate(), "USD"))
-      SignalStore.donationsValues().setDisplayBadgesOnProfile(false)
+      InAppPaymentsRepository.setSubscriber(InAppPaymentSubscriberRecord(SubscriberId.generate(), Currency.getInstance("USD"), InAppPaymentSubscriberRecord.Type.DONATION, false, InAppPaymentData.PaymentMethodType.UNKNOWN))
+      SignalStore.inAppPayments.setDisplayBadgesOnProfile(false)
 
-      SignalStore.phoneNumberPrivacy().phoneNumberDiscoverabilityMode = PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE
-      SignalStore.phoneNumberPrivacy().phoneNumberSharingMode = PhoneNumberPrivacyValues.PhoneNumberSharingMode.NOBODY
+      SignalStore.phoneNumberPrivacy.phoneNumberDiscoverabilityMode = PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE
+      SignalStore.phoneNumberPrivacy.phoneNumberSharingMode = PhoneNumberPrivacyValues.PhoneNumberSharingMode.NOBODY
 
-      SignalStore.settings().isLinkPreviewsEnabled = false
-      SignalStore.settings().isPreferSystemContactPhotos = true
-      SignalStore.settings().universalExpireTimer = 42
-      SignalStore.settings().setKeepMutedChatsArchived(true)
+      SignalStore.settings.isLinkPreviewsEnabled = false
+      SignalStore.settings.isPreferSystemContactPhotos = true
+      SignalStore.settings.universalExpireTimer = 42
+      SignalStore.settings.setKeepMutedChatsArchived(true)
 
-      SignalStore.storyValues().viewedReceiptsEnabled = false
-      SignalStore.storyValues().userHasViewedOnboardingStory = true
-      SignalStore.storyValues().isFeatureDisabled = false
-      SignalStore.storyValues().userHasBeenNotifiedAboutStories = true
-      SignalStore.storyValues().userHasSeenGroupStoryEducationSheet = true
+      SignalStore.story.viewedReceiptsEnabled = false
+      SignalStore.story.userHasViewedOnboardingStory = true
+      SignalStore.story.isFeatureDisabled = false
+      SignalStore.story.userHasBeenNotifiedAboutStories = true
+      SignalStore.story.userHasSeenGroupStoryEducationSheet = true
 
-      SignalStore.emojiValues().reactions = listOf("a", "b", "c")
+      SignalStore.emoji.reactions = listOf("a", "b", "c")
 
       TextSecurePreferences.setTypingIndicatorsEnabled(context, false)
       TextSecurePreferences.setReadReceiptsEnabled(context, false)
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ImportExportTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ImportExportTest.kt
index 689afeeeed..3112c32100 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ImportExportTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ImportExportTest.kt
@@ -7,9 +7,9 @@ package org.thoughtcrime.securesms.backup.v2
 
 import android.Manifest
 import android.app.UiAutomation
+import android.content.Context
 import android.os.Environment
 import androidx.test.platform.app.InstrumentationRegistry
-import io.mockk.InternalPlatformDsl.toArray
 import okio.ByteString.Companion.toByteString
 import org.junit.Assert
 import org.junit.Before
@@ -17,6 +17,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TestName
 import org.signal.core.util.Base64
+import org.signal.core.util.test.getObjectDiff
 import org.signal.libsignal.messagebackup.MessageBackup
 import org.signal.libsignal.messagebackup.MessageBackupKey
 import org.signal.libsignal.zkgroup.profiles.ProfileKey
@@ -28,12 +29,17 @@ import org.thoughtcrime.securesms.backup.v2.proto.Chat
 import org.thoughtcrime.securesms.backup.v2.proto.ChatItem
 import org.thoughtcrime.securesms.backup.v2.proto.ChatUpdateMessage
 import org.thoughtcrime.securesms.backup.v2.proto.Contact
+import org.thoughtcrime.securesms.backup.v2.proto.ContactAttachment
+import org.thoughtcrime.securesms.backup.v2.proto.ContactMessage
 import org.thoughtcrime.securesms.backup.v2.proto.DistributionList
+import org.thoughtcrime.securesms.backup.v2.proto.DistributionListItem
 import org.thoughtcrime.securesms.backup.v2.proto.ExpirationTimerChatUpdate
 import org.thoughtcrime.securesms.backup.v2.proto.FilePointer
 import org.thoughtcrime.securesms.backup.v2.proto.Frame
+import org.thoughtcrime.securesms.backup.v2.proto.GiftBadge
 import org.thoughtcrime.securesms.backup.v2.proto.Group
 import org.thoughtcrime.securesms.backup.v2.proto.IndividualCall
+import org.thoughtcrime.securesms.backup.v2.proto.LinkPreview
 import org.thoughtcrime.securesms.backup.v2.proto.MessageAttachment
 import org.thoughtcrime.securesms.backup.v2.proto.ProfileChangeChatUpdate
 import org.thoughtcrime.securesms.backup.v2.proto.Quote
@@ -48,9 +54,12 @@ import org.thoughtcrime.securesms.backup.v2.proto.StandardMessage
 import org.thoughtcrime.securesms.backup.v2.proto.StickerPack
 import org.thoughtcrime.securesms.backup.v2.proto.Text
 import org.thoughtcrime.securesms.backup.v2.proto.ThreadMergeChatUpdate
+import org.thoughtcrime.securesms.backup.v2.stream.BackupExportWriter
 import org.thoughtcrime.securesms.backup.v2.stream.EncryptedBackupReader
 import org.thoughtcrime.securesms.backup.v2.stream.EncryptedBackupWriter
+import org.thoughtcrime.securesms.backup.v2.stream.PlainTextBackupWriter
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.util.Util
 import org.whispersystems.signalservice.api.kbs.MasterKey
 import org.whispersystems.signalservice.api.push.DistributionId
 import org.whispersystems.signalservice.api.push.ServiceId
@@ -71,6 +80,14 @@ import kotlin.time.Duration.Companion.days
  */
 class ImportExportTest {
   companion object {
+    /**
+     * Output the frames as a plaintext .binproto for sharing tests
+     *
+     * This only seems to work on API 28 emulators, You can find the generated files
+     * at /sdcard/backup-tests/
+     * */
+    val OUTPUT_FILES = false
+
     val SELF_ACI = ServiceId.ACI.from(UUID.fromString("77770000-b477-4f35-a824-d92987a63641"))
     val SELF_PNI = ServiceId.PNI.from(UUID.fromString("77771111-b014-41fb-bf73-05cb2ec52910"))
     const val SELF_E164 = "+10000000000"
@@ -79,7 +96,17 @@ class ImportExportTest {
 
     val defaultBackupInfo = BackupInfo(version = 1L, backupTimeMs = 123456L)
     val selfRecipient = Recipient(id = 1, self = Self())
-    val releaseNotes = Recipient(id = 2, releaseNotes = ReleaseNotes())
+    val myStory = Recipient(
+      id = 2,
+      distributionList = DistributionListItem(
+        distributionId = DistributionId.MY_STORY.asUuid().toByteArray().toByteString(),
+        distributionList = DistributionList(
+          name = DistributionId.MY_STORY.toString(),
+          privacyMode = DistributionList.PrivacyMode.ALL
+        )
+      )
+    )
+    val releaseNotes = Recipient(id = 3, releaseNotes = ReleaseNotes())
     val standardAccountData = AccountData(
       profileKey = SELF_PROFILE_KEY.serialize().toByteString(),
       username = "self.01",
@@ -87,9 +114,11 @@ class ImportExportTest {
       givenName = "Peter",
       familyName = "Parker",
       avatarUrlPath = "https://example.com/",
-      subscriberId = SubscriberId.generate().bytes.toByteString(),
-      subscriberCurrencyCode = "USD",
-      subscriptionManuallyCancelled = true,
+      donationSubscriberData = AccountData.SubscriberData(
+        subscriberId = SubscriberId.generate().bytes.toByteString(),
+        currencyCode = "USD",
+        manuallyCancelled = true
+      ),
       accountSettings = AccountData.AccountSettings(
         readReceipts = true,
         sealedSenderIndicators = true,
@@ -111,16 +140,15 @@ class ImportExportTest {
       )
     )
     val alice = Recipient(
-      id = 3,
+      id = 4,
       contact = Contact(
         aci = TestRecipientUtils.nextAci().toByteString(),
         pni = TestRecipientUtils.nextPni().toByteString(),
         username = "cool.01",
         e164 = 141255501234,
         blocked = false,
-        hidden = false,
-        registered = Contact.Registered.REGISTERED,
-        unregisteredTimestamp = 0L,
+        visibility = Contact.Visibility.VISIBLE,
+        registered = Contact.Registered(),
         profileKey = TestRecipientUtils.generateProfileKey().toByteString(),
         profileSharing = true,
         profileGivenName = "Alexa",
@@ -130,23 +158,26 @@ class ImportExportTest {
     )
 
     /**
-     * When using standardFrames you must start recipient ids at 3.
+     * When using standardFrames you must start recipient ids at 4.
      */
-    private val standardFrames = arrayOf(defaultBackupInfo, standardAccountData, selfRecipient, releaseNotes)
+    private val standardFrames = arrayOf(defaultBackupInfo, standardAccountData, selfRecipient, myStory, releaseNotes)
   }
 
+  private val context: Context
+    get() = InstrumentationRegistry.getInstrumentation().targetContext
+
   @JvmField
   @Rule
   var testName = TestName()
 
   @Before
   fun setup() {
-    SignalStore.svr().setMasterKey(MasterKey(MASTER_KEY), "1234")
-    SignalStore.account().setE164(SELF_E164)
-    SignalStore.account().setAci(SELF_ACI)
-    SignalStore.account().setPni(SELF_PNI)
-    SignalStore.account().generateAciIdentityKeyIfNecessary()
-    SignalStore.account().generatePniIdentityKeyIfNecessary()
+    SignalStore.svr.setMasterKey(MasterKey(MASTER_KEY), "1234")
+    SignalStore.account.setE164(SELF_E164)
+    SignalStore.account.setAci(SELF_ACI)
+    SignalStore.account.setPni(SELF_PNI)
+    SignalStore.account.generateAciIdentityKeyIfNecessary()
+    SignalStore.account.generatePniIdentityKeyIfNecessary()
   }
 
   @Test
@@ -158,7 +189,7 @@ class ImportExportTest {
   fun largeNumberOfRecipientsAndChats() {
     val recipients = ArrayList<Recipient>(5000)
     val chats = ArrayList<Chat>(5000)
-    var id = 3L
+    var id = 4L
     for (i in 0..5000) {
       val recipientId = id++
       recipients.add(
@@ -170,9 +201,8 @@ class ImportExportTest {
             username = "rec$i.01",
             e164 = 14125550000 + i,
             blocked = false,
-            hidden = false,
-            registered = Contact.Registered.REGISTERED,
-            unregisteredTimestamp = 0L,
+            visibility = Contact.Visibility.VISIBLE,
+            registered = Contact.Registered(),
             profileKey = TestRecipientUtils.generateProfileKey().toByteString(),
             profileSharing = true,
             profileGivenName = "Test",
@@ -216,7 +246,7 @@ class ImportExportTest {
 
   @Test
   fun largeNumberOfMessagesAndChats() {
-    val NUM_INDIVIDUAL_RECIPIENTS = 1000
+    val numIndividualRecipients = 1000
     val numIndividualMessages = 500
     val numGroupMessagesPerPerson = 200
 
@@ -225,7 +255,7 @@ class ImportExportTest {
     val recipients = ArrayList<Recipient>(1010)
     val chats = ArrayList<Chat>(1010)
     var id = 3L
-    for (i in 0 until NUM_INDIVIDUAL_RECIPIENTS) {
+    for (i in 0 until numIndividualRecipients) {
       val recipientId = id++
       recipients.add(
         Recipient(
@@ -236,9 +266,8 @@ class ImportExportTest {
             username = if (random.trueWithProbability(0.2f)) "rec$i.01" else null,
             e164 = 14125550000 + i,
             blocked = random.trueWithProbability(0.1f),
-            hidden = random.trueWithProbability(0.1f),
-            registered = Contact.Registered.REGISTERED,
-            unregisteredTimestamp = 0L,
+            visibility = if (random.trueWithProbability(0.1f)) Contact.Visibility.HIDDEN else Contact.Visibility.VISIBLE,
+            registered = Contact.Registered(),
             profileKey = TestRecipientUtils.generateProfileKey().toByteString(),
             profileSharing = random.trueWithProbability(0.9f),
             profileGivenName = "Test",
@@ -369,12 +398,12 @@ class ImportExportTest {
         }
       }
     }
-    val import = exportFrames(
+
+    exportFrames(
       *standardFrames,
       *recipients.toArray(),
       *chatItems.toArray()
     )
-    outputFile(import)
   }
 
   @Test
@@ -382,16 +411,15 @@ class ImportExportTest {
     importExport(
       *standardFrames,
       Recipient(
-        id = 3,
+        id = 4,
         contact = Contact(
           aci = TestRecipientUtils.nextAci().toByteString(),
           pni = TestRecipientUtils.nextPni().toByteString(),
           username = "cool.01",
           e164 = 141255501234,
           blocked = true,
-          hidden = true,
-          registered = Contact.Registered.REGISTERED,
-          unregisteredTimestamp = 0L,
+          visibility = Contact.Visibility.VISIBLE,
+          registered = Contact.Registered(),
           profileKey = TestRecipientUtils.generateProfileKey().toByteString(),
           profileSharing = true,
           profileGivenName = "Alexa",
@@ -400,16 +428,15 @@ class ImportExportTest {
         )
       ),
       Recipient(
-        id = 4,
+        id = 5,
         contact = Contact(
           aci = null,
           pni = null,
           username = null,
           e164 = 141255501235,
           blocked = true,
-          hidden = true,
-          registered = Contact.Registered.NOT_REGISTERED,
-          unregisteredTimestamp = 1234568927398L,
+          visibility = Contact.Visibility.HIDDEN,
+          notRegistered = Contact.NotRegistered(unregisteredTimestamp = 1234568927398L),
           profileKey = TestRecipientUtils.generateProfileKey().toByteString(),
           profileSharing = false,
           profileGivenName = "Peter",
@@ -425,7 +452,7 @@ class ImportExportTest {
     importExport(
       *standardFrames,
       Recipient(
-        id = 3,
+        id = 4,
         group = Group(
           masterKey = TestRecipientUtils.generateGroupMasterKey().toByteString(),
           whitelisted = true,
@@ -440,7 +467,7 @@ class ImportExportTest {
         )
       ),
       Recipient(
-        id = 4,
+        id = 5,
         group = Group(
           masterKey = TestRecipientUtils.generateGroupMasterKey().toByteString(),
           whitelisted = false,
@@ -462,16 +489,15 @@ class ImportExportTest {
     importExport(
       *standardFrames,
       Recipient(
-        id = 3,
+        id = 4,
         contact = Contact(
           aci = TestRecipientUtils.nextAci().toByteString(),
           pni = TestRecipientUtils.nextPni().toByteString(),
           username = "cool.01",
           e164 = 141255501234,
           blocked = true,
-          hidden = true,
-          registered = Contact.Registered.REGISTERED,
-          unregisteredTimestamp = 0L,
+          visibility = Contact.Visibility.HIDDEN,
+          registered = Contact.Registered(),
           profileKey = TestRecipientUtils.generateProfileKey().toByteString(),
           profileSharing = true,
           profileGivenName = "Alexa",
@@ -480,16 +506,15 @@ class ImportExportTest {
         )
       ),
       Recipient(
-        id = 4,
+        id = 5,
         contact = Contact(
           aci = null,
           pni = null,
           username = null,
           e164 = 141255501235,
           blocked = true,
-          hidden = true,
-          registered = Contact.Registered.REGISTERED,
-          unregisteredTimestamp = 0L,
+          visibility = Contact.Visibility.HIDDEN,
+          registered = Contact.Registered(),
           profileKey = TestRecipientUtils.generateProfileKey().toByteString(),
           profileSharing = true,
           profileGivenName = "Peter",
@@ -498,16 +523,15 @@ class ImportExportTest {
         )
       ),
       Recipient(
-        id = 5,
+        id = 6,
         contact = Contact(
           aci = null,
           pni = null,
           username = null,
           e164 = 141255501236,
           blocked = true,
-          hidden = true,
-          registered = Contact.Registered.REGISTERED,
-          unregisteredTimestamp = 0L,
+          visibility = Contact.Visibility.HIDDEN,
+          registered = Contact.Registered(),
           profileKey = TestRecipientUtils.generateProfileKey().toByteString(),
           profileSharing = true,
           profileGivenName = "Father",
@@ -516,14 +540,15 @@ class ImportExportTest {
         )
       ),
       Recipient(
-        id = 6,
-        distributionList = DistributionList(
-          name = "Kim Family",
+        id = 7,
+        distributionList = DistributionListItem(
           distributionId = DistributionId.create().asUuid().toByteArray().toByteString(),
-          allowReplies = true,
-          deletionTimestamp = 0L,
-          privacyMode = DistributionList.PrivacyMode.ONLY_WITH,
-          memberRecipientIds = listOf(3, 4, 5)
+          distributionList = DistributionList(
+            name = "Kim Family",
+            allowReplies = true,
+            privacyMode = DistributionList.PrivacyMode.ONLY_WITH,
+            memberRecipientIds = listOf(3, 4, 5)
+          )
         )
       )
     )
@@ -532,16 +557,15 @@ class ImportExportTest {
   @Test
   fun deletedDistributionList() {
     val alexa = Recipient(
-      id = 3,
+      id = 4,
       contact = Contact(
         aci = TestRecipientUtils.nextAci().toByteString(),
         pni = TestRecipientUtils.nextPni().toByteString(),
         username = "cool.01",
         e164 = 141255501234,
         blocked = true,
-        hidden = true,
-        registered = Contact.Registered.REGISTERED,
-        unregisteredTimestamp = 0L,
+        visibility = Contact.Visibility.HIDDEN,
+        registered = Contact.Registered(),
         profileKey = TestRecipientUtils.generateProfileKey().toByteString(),
         profileSharing = true,
         profileGivenName = "Alexa",
@@ -554,23 +578,19 @@ class ImportExportTest {
       alexa,
       Recipient(
         id = 6,
-        distributionList = DistributionList(
-          name = "Deleted list",
+        distributionList = DistributionListItem(
           distributionId = DistributionId.create().asUuid().toByteArray().toByteString(),
-          allowReplies = true,
-          deletionTimestamp = 12345L,
-          privacyMode = DistributionList.PrivacyMode.ONLY_WITH,
-          memberRecipientIds = listOf(3)
+          deletionTimestamp = 12345L
         )
       )
     )
     import(importData)
-    val exported = export()
+    val exported = BackupRepository.export()
     val expected = exportFrames(
       *standardFrames,
       alexa
     )
-    outputFile(importData, expected)
+
     compare(expected, exported)
   }
 
@@ -579,16 +599,15 @@ class ImportExportTest {
     importExport(
       *standardFrames,
       Recipient(
-        id = 3,
+        id = 4,
         contact = Contact(
           aci = TestRecipientUtils.nextAci().toByteString(),
           pni = TestRecipientUtils.nextPni().toByteString(),
           username = "cool.01",
           e164 = 141255501234,
           blocked = false,
-          hidden = false,
-          registered = Contact.Registered.REGISTERED,
-          unregisteredTimestamp = 0L,
+          visibility = Contact.Visibility.VISIBLE,
+          registered = Contact.Registered(),
           profileKey = TestRecipientUtils.generateProfileKey().toByteString(),
           profileSharing = true,
           profileGivenName = "Alexa",
@@ -597,7 +616,7 @@ class ImportExportTest {
         )
       ),
       Recipient(
-        id = 4,
+        id = 5,
         group = Group(
           masterKey = TestRecipientUtils.generateGroupMasterKey().toByteString(),
           whitelisted = true,
@@ -607,14 +626,13 @@ class ImportExportTest {
       ),
       Chat(
         id = 1,
-        recipientId = 3,
+        recipientId = 4,
         archived = true,
         pinnedOrder = 1,
         expirationTimerMs = 1.days.inWholeMilliseconds,
         muteUntilMs = System.currentTimeMillis(),
         markedUnread = true,
-        dontNotifyForMentionsIfMuted = true,
-        wallpaper = null
+        dontNotifyForMentionsIfMuted = true
       )
     )
   }
@@ -681,16 +699,15 @@ class ImportExportTest {
     importExport(
       *standardFrames,
       Recipient(
-        id = 3,
+        id = 4,
         contact = Contact(
           aci = startedAci,
           pni = TestRecipientUtils.nextPni().toByteString(),
           username = "cool.01",
           e164 = 141255501234,
           blocked = false,
-          hidden = false,
-          registered = Contact.Registered.REGISTERED,
-          unregisteredTimestamp = 0L,
+          visibility = Contact.Visibility.VISIBLE,
+          registered = Contact.Registered(),
           profileKey = TestRecipientUtils.generateProfileKey().toByteString(),
           profileSharing = true,
           profileGivenName = "Alexa",
@@ -699,7 +716,7 @@ class ImportExportTest {
         )
       ),
       Recipient(
-        id = 4,
+        id = 5,
         group = Group(
           masterKey = TestRecipientUtils.generateGroupMasterKey().toByteString(),
           whitelisted = true,
@@ -709,14 +726,13 @@ class ImportExportTest {
       ),
       Chat(
         id = 1,
-        recipientId = 3,
+        recipientId = 4,
         archived = true,
         pinnedOrder = 1,
         expirationTimerMs = 1.days.inWholeMilliseconds,
         muteUntilMs = System.currentTimeMillis(),
         markedUnread = true,
-        dontNotifyForMentionsIfMuted = true,
-        wallpaper = null
+        dontNotifyForMentionsIfMuted = true
       ),
       *individualCalls.toArray()
     )
@@ -994,14 +1010,13 @@ class ImportExportTest {
       expirationNotStarted
     )
     import(importData)
-    val exported = export()
+    val exported = BackupRepository.export()
     val expected = exportFrames(
       *standardFrames,
       alice,
       chat,
       expirationNotStarted
     )
-    outputFile(importData, expected)
     compare(expected, exported)
   }
 
@@ -1051,23 +1066,175 @@ class ImportExportTest {
                 incrementalMacChunkSize = 0
               ),
               wasDownloaded = false
+            )
+          )
+        )
+      )
+    )
+  }
+
+  @Test
+  fun linkPreviewMessages() {
+    var dateSent = System.currentTimeMillis()
+    val sendStatuses = enumerateSendStatuses(alice.id)
+    val incomingMessageDetails = enumerateIncomingMessageDetails(dateSent + 200)
+    val outgoingMessages = ArrayList<ChatItem>()
+    val incomingMessages = ArrayList<ChatItem>()
+    for (sendStatus in sendStatuses) {
+      outgoingMessages.add(
+        ChatItem(
+          chatId = 1,
+          authorId = selfRecipient.id,
+          dateSent = dateSent++,
+          expireStartDate = dateSent + 1000,
+          expiresInMs = TimeUnit.DAYS.toMillis(2),
+          sms = false,
+          outgoing = ChatItem.OutgoingMessageDetails(
+            sendStatus = listOf(sendStatus)
+          ),
+          standardMessage = StandardMessage(
+            text = Text(
+              body = "Text only body"
             ),
-            MessageAttachment(
-              pointer = FilePointer(
-                backupLocator = FilePointer.BackupLocator(
-                  "digestherebutimlazy",
-                  cdnNumber = 3,
+            linkPreview = listOf(
+              LinkPreview(
+                url = "https://signal.org/",
+                title = "Signal Messenger: Speak Freely",
+                description = "Say \"hello\" to a different messaging experience. An unexpected focus on privacy, combined with all the features you expect.",
+                date = System.currentTimeMillis(),
+                image = FilePointer(
+                  invalidAttachmentLocator = FilePointer.InvalidAttachmentLocator(),
+                  contentType = "image/png",
+                  width = 100,
+                  height = 200,
+                  caption = "Love this cool picture! Too bad u cant download it",
+                  incrementalMacChunkSize = 0
+                )
+              )
+            )
+          )
+        )
+      )
+    }
+    dateSent++
+    for (incomingDetail in incomingMessageDetails) {
+      incomingMessages.add(
+        ChatItem(
+          chatId = 1,
+          authorId = alice.id,
+          dateSent = dateSent++,
+          expireStartDate = dateSent + 1000,
+          expiresInMs = TimeUnit.DAYS.toMillis(2),
+          sms = false,
+          incoming = incomingDetail,
+          standardMessage = StandardMessage(
+            text = Text(
+              body = "Text only body"
+            ),
+            linkPreview = listOf(
+              LinkPreview(
+                url = "https://signal.org/",
+                title = "Signal Messenger: Speak Freely",
+                description = "Say \"hello\" to a different messaging experience. An unexpected focus on privacy, combined with all the features you expect.",
+                date = System.currentTimeMillis(),
+                image = FilePointer(
+                  invalidAttachmentLocator = FilePointer.InvalidAttachmentLocator(),
+                  contentType = "image/png",
+                  width = 100,
+                  height = 200,
+                  caption = "Love this cool picture! Too bad u cant download it",
+                  incrementalMacChunkSize = 0
+                )
+              )
+            )
+          )
+        )
+      )
+    }
+
+    importExport(
+      *standardFrames,
+      alice,
+      buildChat(alice, 1),
+      *outgoingMessages.toArray(),
+      *incomingMessages.toArray()
+    )
+  }
+
+  @Test
+  fun contactMessageWithAllFields() {
+    importExport(
+      *standardFrames,
+      alice,
+      buildChat(alice, 1),
+      ChatItem(
+        chatId = 1,
+        authorId = selfRecipient.id,
+        dateSent = 150L,
+        sms = false,
+        outgoing = ChatItem.OutgoingMessageDetails(
+          sendStatus = listOf(SendStatus(alice.id, deliveryStatus = SendStatus.Status.READ, lastStatusUpdateTimestamp = -1))
+        ),
+        contactMessage = ContactMessage(
+          contact = listOf(
+            ContactAttachment(
+              name = ContactAttachment.Name(
+                givenName = "Given",
+                familyName = "Family",
+                prefix = "Prefix",
+                suffix = "Suffix",
+                middleName = "Middle",
+                displayName = "Display Name"
+              ),
+              organization = "Organization",
+              email = listOf(
+                ContactAttachment.Email(
+                  value_ = "coolemail@gmail.com",
+                  label = "Label",
+                  type = ContactAttachment.Email.Type.HOME
+                ),
+                ContactAttachment.Email(
+                  value_ = "coolemail2@gmail.com",
+                  label = "Label2",
+                  type = ContactAttachment.Email.Type.MOBILE
+                )
+              ),
+              address = listOf(
+                ContactAttachment.PostalAddress(
+                  type = ContactAttachment.PostalAddress.Type.HOME,
+                  label = "Label",
+                  street = "Street",
+                  pobox = "POBOX",
+                  neighborhood = "Neighborhood",
+                  city = "City",
+                  region = "Region",
+                  postcode = "15213",
+                  country = "United States"
+                )
+              ),
+              number = listOf(
+                ContactAttachment.Phone(
+                  value_ = "+14155551234",
+                  type = ContactAttachment.Phone.Type.CUSTOM,
+                  label = "Label"
+                )
+              ),
+              avatar = FilePointer(
+                attachmentLocator = FilePointer.AttachmentLocator(
+                  cdnKey = "coolCdnKey",
+                  cdnNumber = 2,
+                  uploadTimestamp = System.currentTimeMillis(),
                   key = (1..32).map { it.toByte() }.toByteArray().toByteString(),
-                  digest = (1..64).map { it.toByte() }.toByteArray().toByteString(),
-                  size = 12345
+                  size = 12345,
+                  digest = (1..32).map { it.toByte() }.toByteArray().toByteString()
                 ),
                 contentType = "image/png",
+                fileName = "very_cool_picture.png",
                 width = 100,
                 height = 200,
-                caption = "Love this cool picture! Too bad u cant download it",
+                caption = "Love this cool picture!",
                 incrementalMacChunkSize = 0
-              ),
-              wasDownloaded = true
+              )
             )
           )
         )
@@ -1256,6 +1423,76 @@ class ImportExportTest {
     )
   }
 
+  @Test
+  fun giftBadgeMessage() {
+    var dateSentStart = 100L
+    importExport(
+      *standardFrames,
+      alice,
+      buildChat(alice, 1),
+      ChatItem(
+        chatId = 1,
+        authorId = alice.id,
+        dateSent = dateSentStart++,
+        incoming = ChatItem.IncomingMessageDetails(
+          dateReceived = dateSentStart,
+          dateServerSent = dateSentStart,
+          read = true,
+          sealedSender = true
+        ),
+        giftBadge = GiftBadge(
+          receiptCredentialPresentation = Util.getSecretBytes(32).toByteString(),
+          state = GiftBadge.State.OPENED
+        )
+      ),
+      ChatItem(
+        chatId = 1,
+        authorId = alice.id,
+        dateSent = dateSentStart++,
+        incoming = ChatItem.IncomingMessageDetails(
+          dateReceived = dateSentStart,
+          dateServerSent = dateSentStart,
+          read = true,
+          sealedSender = true
+        ),
+        giftBadge = GiftBadge(
+          receiptCredentialPresentation = Util.getSecretBytes(32).toByteString(),
+          state = GiftBadge.State.FAILED
+        )
+      ),
+      ChatItem(
+        chatId = 1,
+        authorId = alice.id,
+        dateSent = dateSentStart++,
+        incoming = ChatItem.IncomingMessageDetails(
+          dateReceived = dateSentStart,
+          dateServerSent = dateSentStart,
+          read = true,
+          sealedSender = true
+        ),
+        giftBadge = GiftBadge(
+          receiptCredentialPresentation = Util.getSecretBytes(32).toByteString(),
+          state = GiftBadge.State.REDEEMED
+        )
+      ),
+      ChatItem(
+        chatId = 1,
+        authorId = alice.id,
+        dateSent = dateSentStart++,
+        incoming = ChatItem.IncomingMessageDetails(
+          dateReceived = dateSentStart,
+          dateServerSent = dateSentStart,
+          read = true,
+          sealedSender = true
+        ),
+        giftBadge = GiftBadge(
+          receiptCredentialPresentation = Util.getSecretBytes(32).toByteString(),
+          state = GiftBadge.State.UNOPENED
+        )
+      )
+    )
+  }
+
   fun enumerateIncomingMessageDetails(dateSent: Long): List<ChatItem.IncomingMessageDetails> {
     val details = mutableListOf<ChatItem.IncomingMessageDetails>()
     details.add(
@@ -1361,8 +1598,7 @@ class ImportExportTest {
       expirationTimerMs = 0,
       muteUntilMs = 0,
       markedUnread = false,
-      dontNotifyForMentionsIfMuted = false,
-      wallpaper = null
+      dontNotifyForMentionsIfMuted = false
     )
   }
 
@@ -1371,95 +1607,85 @@ class ImportExportTest {
    * any standard frames (e.g. backup header).
    */
   private fun exportFrames(vararg objects: Any): ByteArray {
+    outputBinProto(*objects)
     val outputStream = ByteArrayOutputStream()
     val writer = EncryptedBackupWriter(
-      key = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey(),
-      aci = SignalStore.account().aci!!,
+      key = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey(),
+      aci = SignalStore.account.aci!!,
       outputStream = outputStream,
       append = { mac -> outputStream.write(mac) }
     )
 
     writer.use {
-      for (obj in objects) {
-        when (obj) {
-          is BackupInfo -> writer.write(obj)
-          is AccountData -> writer.write(Frame(account = obj))
-          is Recipient -> writer.write(Frame(recipient = obj))
-          is Chat -> writer.write(Frame(chat = obj))
-          is ChatItem -> writer.write(Frame(chatItem = obj))
-          is AdHocCall -> writer.write(Frame(adHocCall = obj))
-          is StickerPack -> writer.write(Frame(stickerPack = obj))
-          else -> Assert.fail("invalid object $obj")
-        }
-      }
+      writer.writeFrames(*objects)
     }
     return outputStream.toByteArray()
   }
 
-  /**
-   * Exports the passed in frames as a backup and then attempts to
-   * import them.
-   */
-  private fun import(vararg objects: Any) {
-    val importData = exportFrames(*objects)
-    import(importData)
-  }
-
   private fun import(importData: ByteArray) {
     BackupRepository.import(length = importData.size.toLong(), inputStreamFactory = { ByteArrayInputStream(importData) }, selfData = BackupRepository.SelfData(SELF_ACI, SELF_PNI, SELF_E164, SELF_PROFILE_KEY))
   }
 
-  /**
-   * Export our current database as a backup.
-   */
-  private fun export(): ByteArray {
-    val exportData = BackupRepository.export()
-    return exportData
-  }
-
   private fun validate(importData: ByteArray): MessageBackup.ValidationResult {
     val factory = { ByteArrayInputStream(importData) }
-    val masterKey = SignalStore.svr().getOrCreateMasterKey()
+    val masterKey = SignalStore.svr.getOrCreateMasterKey()
     val key = MessageBackupKey(masterKey.serialize(), org.signal.libsignal.protocol.ServiceId.Aci.parseFromBinary(SELF_ACI.toByteArray()))
 
     return MessageBackup.validate(key, MessageBackup.Purpose.REMOTE_BACKUP, factory, importData.size.toLong())
   }
 
   /**
-   * Imports the passed in frames and then exports them.
+   * Given some [Frame]s, this will do the following:
    *
-   * It will do a comparison to assert that the import and export
-   * are equal.
+   * 1. Write the frames using an [EncryptedBackupWriter] and keep the result in memory (A).
+   * 2. Import those frames back into the local database.
+   * 3. Export the state of the local database and keep the result in memory (B).
+   * 4. Assert that (A) and (B) are identical. Or, in other words, assert that importing and exporting again results in the original backup data.
    */
   private fun importExport(vararg objects: Any) {
+    val originalBackupData = exportFrames(*objects)
+
+    import(originalBackupData)
+
+    val generatedBackupData = BackupRepository.export()
+    compare(originalBackupData, generatedBackupData)
+  }
+
+  private fun BackupExportWriter.writeFrames(vararg objects: Any) {
+    for (obj in objects) {
+      when (obj) {
+        is BackupInfo -> write(obj)
+        is AccountData -> write(Frame(account = obj))
+        is Recipient -> write(Frame(recipient = obj))
+        is Chat -> write(Frame(chat = obj))
+        is ChatItem -> write(Frame(chatItem = obj))
+        is AdHocCall -> write(Frame(adHocCall = obj))
+        is StickerPack -> write(Frame(stickerPack = obj))
+        else -> Assert.fail("invalid object $obj")
+      }
+    }
+  }
+
+  private fun outputBinProto(vararg objects: Any) {
+    if (!OUTPUT_FILES) return
+
     val outputStream = ByteArrayOutputStream()
-    val writer = EncryptedBackupWriter(
-      key = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey(),
-      aci = SignalStore.account().aci!!,
-      outputStream = outputStream,
-      append = { mac -> outputStream.write(mac) }
+    val plaintextWriter = PlainTextBackupWriter(
+      outputStream = outputStream
     )
 
-    writer.use {
-      for (obj in objects) {
-        when (obj) {
-          is BackupInfo -> writer.write(obj)
-          is AccountData -> writer.write(Frame(account = obj))
-          is Recipient -> writer.write(Frame(recipient = obj))
-          is Chat -> writer.write(Frame(chat = obj))
-          is ChatItem -> writer.write(Frame(chatItem = obj))
-          is AdHocCall -> writer.write(Frame(adHocCall = obj))
-          is StickerPack -> writer.write(Frame(stickerPack = obj))
-          else -> Assert.fail("invalid object $obj")
-        }
-      }
+    plaintextWriter.use {
+      it.writeFrames(*objects)
     }
-    val importData = outputStream.toByteArray()
-    outputFile(importData)
-    BackupRepository.import(length = importData.size.toLong(), inputStreamFactory = { ByteArrayInputStream(importData) }, selfData = BackupRepository.SelfData(SELF_ACI, SELF_PNI, SELF_E164, SELF_PROFILE_KEY))
 
-    val export = export()
-    compare(importData, export)
+    grantPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)
+    val dir = File(Environment.getExternalStorageDirectory(), "backup-tests")
+    if (dir.mkdirs() || dir.exists()) {
+      FileOutputStream(File(dir, testName.methodName + ".binproto")).use {
+        it.write(outputStream.toByteArray())
+        it.flush()
+      }
+    }
   }
 
   private fun compare(import: ByteArray, export: ByteArray) {
@@ -1498,7 +1724,14 @@ class ImportExportTest {
     for (f in framesExported) {
       when {
         f.account != null -> accountImported.add(f.account!!)
-        f.recipient != null -> recipientsExported.add(f.recipient!!)
+        f.recipient != null -> {
+          val frameRecipient = f.recipient!!
+          if (frameRecipient.distributionList != null && frameRecipient.distributionList!!.distributionId == DistributionId.MY_STORY.asUuid().toByteArray().toByteString()) {
+            recipientsExported.add(frameRecipient.copy(distributionList = frameRecipient.distributionList!!.copyWithoutMembers()))
+          } else {
+            recipientsExported.add(f.recipient!!)
+          }
+        }
         f.chat != null -> chatsExported.add(f.chat!!)
         f.chatItem != null -> chatItemsExported.add(f.chatItem!!)
         f.adHocCall != null -> callsExported.add(f.adHocCall!!)
@@ -1513,11 +1746,19 @@ class ImportExportTest {
     prettyAssertEquals(stickersImported, stickersExported) { it.packId }
   }
 
-  private fun <T> prettyAssertEquals(import: List<T>, export: List<T>) {
+  private fun DistributionListItem.copyWithoutMembers(): DistributionListItem {
+    return this.copy(
+      distributionList = this.distributionList?.copy(
+        memberRecipientIds = emptyList()
+      )
+    )
+  }
+
+  private inline fun <reified T : Any> prettyAssertEquals(import: List<T>, export: List<T>) {
     Assert.assertEquals(import.size, export.size)
     import.zip(export).forEach { (a1, a2) ->
       if (a1 != a2) {
-        Assert.fail("Items do not match: \n $a1 \n $a2")
+        Assert.fail("Items do not match:\n\n-- Pretty diff\n${getObjectDiff(a1, a2)}\n-- Full objects\n$a1\n$a2")
       }
     }
   }
@@ -1526,19 +1767,31 @@ class ImportExportTest {
     return nextFloat() < prob
   }
 
-  private fun <T, R : Comparable<R>> prettyAssertEquals(import: List<T>, export: List<T>, selector: (T) -> R?) {
+  private inline fun <reified T : Any, R : Comparable<R>> prettyAssertEquals(import: List<T>, export: List<T>, crossinline selector: (T) -> R?) {
     if (import.size != export.size) {
-      var msg = StringBuilder()
+      val msg = StringBuilder()
+      msg.append("There's a different number of items in the lists!\n\n")
+
+      msg.append("Imported:\n")
       for (i in import) {
         msg.append(i)
         msg.append("\n")
       }
+      if (import.isEmpty()) {
+        msg.append("<None>")
+      }
+      msg.append("\n")
+      msg.append("Exported:\n")
       for (i in export) {
         msg.append(i)
         msg.append("\n")
       }
+      if (export.isEmpty()) {
+        msg.append("<None>")
+      }
       Assert.fail(msg.toString())
     }
+
     Assert.assertEquals(import.size, export.size)
     val sortedImport = import.sortedBy(selector)
     val sortedExport = export.sortedBy(selector)
@@ -1549,9 +1802,9 @@ class ImportExportTest {
   private fun readAllFrames(import: ByteArray, selfData: BackupRepository.SelfData): List<Frame> {
     val inputFactory = { ByteArrayInputStream(import) }
     val frameReader = EncryptedBackupReader(
-      key = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey(),
+      key = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey(),
       aci = selfData.aci,
-      streamLength = import.size.toLong(),
+      length = import.size.toLong(),
       dataStream = inputFactory
     )
     val frames = ArrayList<Frame>()
@@ -1562,25 +1815,9 @@ class ImportExportTest {
     return frames
   }
 
-  private fun outputFile(importBytes: ByteArray, resultBytes: ByteArray? = null) {
-    grantPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)
-    val dir = File(Environment.getExternalStorageDirectory(), "backup-tests")
-    if (dir.mkdirs() || dir.exists()) {
-      FileOutputStream(File(dir, testName.methodName + ".import")).use {
-        it.write(importBytes)
-        it.flush()
-      }
-
-      if (resultBytes != null) {
-        FileOutputStream(File(dir, testName.methodName + ".result")).use {
-          it.write(resultBytes)
-          it.flush()
-        }
-      }
-    }
-  }
-
   private fun grantPermissions(vararg permissions: String?) {
+    if (!OUTPUT_FILES) return
+
     val auto: UiAutomation = InstrumentationRegistry.getInstrumentation().uiAutomation
     for (perm in permissions) {
       auto.grantRuntimePermissionAsUser(InstrumentationRegistry.getInstrumentation().targetContext.packageName, perm, android.os.Process.myUserHandle())
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ImportExportTestSuite.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ImportExportTestSuite.kt
new file mode 100644
index 0000000000..3aa19b3105
--- /dev/null
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ImportExportTestSuite.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2
+
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+import org.signal.core.util.Base64
+import org.signal.core.util.StreamUtil
+import org.signal.libsignal.zkgroup.profiles.ProfileKey
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.whispersystems.signalservice.api.kbs.MasterKey
+import org.whispersystems.signalservice.api.push.ServiceId
+import java.io.ByteArrayInputStream
+import java.util.UUID
+import kotlin.random.Random
+
+@RunWith(Parameterized::class)
+class ImportExportTestSuite(private val path: String) {
+  companion object {
+    val SELF_ACI = ServiceId.ACI.from(UUID.fromString("77770000-b477-4f35-a824-d92987a63641"))
+    val SELF_PNI = ServiceId.PNI.from(UUID.fromString("77771111-b014-41fb-bf73-05cb2ec52910"))
+    const val SELF_E164 = "+10000000000"
+    val SELF_PROFILE_KEY = ProfileKey(Random.nextBytes(32))
+    val MASTER_KEY = Base64.decode("sHuBMP4ToZk4tcNU+S8eBUeCt8Am5EZnvuqTBJIR4Do")
+
+    const val TESTS_FOLDER = "backupTests"
+
+    @JvmStatic
+    @Parameterized.Parameters(name = "{0}")
+    fun data(): Collection<Array<String>> {
+      val testFiles = InstrumentationRegistry.getInstrumentation().context.resources.assets.list(TESTS_FOLDER)
+      return testFiles?.map { arrayOf(it) }!!.toList()
+    }
+  }
+
+  @Before
+  fun setup() {
+    SignalStore.svr.setMasterKey(MasterKey(MASTER_KEY), "1234")
+    SignalStore.account.setE164(SELF_E164)
+    SignalStore.account.setAci(SELF_ACI)
+    SignalStore.account.setPni(SELF_PNI)
+    SignalStore.account.generateAciIdentityKeyIfNecessary()
+    SignalStore.account.generatePniIdentityKeyIfNecessary()
+  }
+
+  @Test
+  fun testBinProto() {
+    val binProtoBytes: ByteArray = InstrumentationRegistry.getInstrumentation().context.resources.assets.open("${TESTS_FOLDER}/$path").use {
+      StreamUtil.readFully(it)
+    }
+    import(binProtoBytes)
+    val generatedBackupData = BackupRepository.export()
+    compare(binProtoBytes, generatedBackupData)
+  }
+
+  private fun import(importData: ByteArray) {
+    BackupRepository.import(
+      length = importData.size.toLong(),
+      inputStreamFactory = { ByteArrayInputStream(importData) },
+      selfData = BackupRepository.SelfData(SELF_ACI, SELF_PNI, SELF_E164, SELF_PROFILE_KEY),
+      plaintext = true
+    )
+  }
+
+  // TODO compare with libsignal's library
+  private fun compare(import: ByteArray, export: ByteArray) {
+  }
+}
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModelTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModelTest.kt
deleted file mode 100644
index 49e18a29d6..0000000000
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModelTest.kt
+++ /dev/null
@@ -1,393 +0,0 @@
-package org.thoughtcrime.securesms.components.settings.app.changenumber
-
-import androidx.lifecycle.SavedStateHandle
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.FlakyTest
-import okhttp3.mockwebserver.MockResponse
-import org.junit.After
-import org.junit.Before
-import org.junit.Ignore
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.ThreadUtil
-import org.signal.libsignal.protocol.state.SignedPreKeyRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.registration.VerifyAccountRepository
-import org.thoughtcrime.securesms.registration.VerifyResponseProcessor
-import org.thoughtcrime.securesms.testing.Get
-import org.thoughtcrime.securesms.testing.MockProvider
-import org.thoughtcrime.securesms.testing.Post
-import org.thoughtcrime.securesms.testing.Put
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.assertIs
-import org.thoughtcrime.securesms.testing.assertIsNot
-import org.thoughtcrime.securesms.testing.assertIsNotNull
-import org.thoughtcrime.securesms.testing.assertIsNull
-import org.thoughtcrime.securesms.testing.assertIsSize
-import org.thoughtcrime.securesms.testing.connectionFailure
-import org.thoughtcrime.securesms.testing.failure
-import org.thoughtcrime.securesms.testing.parsedRequestBody
-import org.thoughtcrime.securesms.testing.success
-import org.thoughtcrime.securesms.testing.timeout
-import org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest
-import org.whispersystems.signalservice.api.push.ServiceId
-import org.whispersystems.signalservice.api.push.ServiceId.PNI
-import org.whispersystems.signalservice.internal.push.MismatchedDevices
-import org.whispersystems.signalservice.internal.push.PreKeyState
-import java.util.UUID
-
-@RunWith(AndroidJUnit4::class)
-class ChangeNumberViewModelTest {
-
-  @get:Rule
-  val harness = SignalActivityRule()
-
-  private lateinit var viewModel: ChangeNumberViewModel
-
-  @Before
-  fun setUp() {
-    ThreadUtil.runOnMainSync {
-      viewModel = ChangeNumberViewModel(
-        localNumber = harness.self.requireE164(),
-        changeNumberRepository = ChangeNumberRepository(),
-        savedState = SavedStateHandle(),
-        password = SignalStore.account().servicePassword!!,
-        verifyAccountRepository = VerifyAccountRepository(harness.application)
-      )
-
-      viewModel.setNewCountry(1)
-      viewModel.setNewNationalNumber("5555550102")
-    }
-  }
-
-  @After
-  fun tearDown() {
-    InstrumentationApplicationDependencyProvider.clearHandlers()
-  }
-
-  @Test
-  fun testChangeNumber_givenOnlyPrimaryAndNoRegLock() {
-    // GIVEN
-    val aci = Recipient.self().requireServiceId()
-    val newPni = PNI.from(UUID.randomUUID())
-    lateinit var changeNumberRequest: ChangePhoneNumberRequest
-    lateinit var setPreKeysRequest: PreKeyState
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Post("/v1/verification/session") { MockResponse().success(MockProvider.sessionMetadataJson.copy(verified = false)) },
-      Put("/v1/verification/session/${MockProvider.sessionMetadataJson.id}/code") { MockResponse().success(MockProvider.sessionMetadataJson) },
-      Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
-      Put("/v2/accounts/number") { r ->
-        changeNumberRequest = r.parsedRequestBody()
-        MockResponse().success(MockProvider.createVerifyAccountResponse(aci, newPni))
-      },
-      Put("/v2/keys") { r ->
-        setPreKeysRequest = r.parsedRequestBody()
-        MockResponse().success()
-      },
-      Get("/v1/certificate/delivery") { MockResponse().success(MockProvider.senderCertificate) }
-    )
-
-    // WHEN
-    viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER, null, null).blockingGet().resultOrThrow
-    viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet().resultOrThrow
-
-    // THEN
-    assertSuccess(newPni, changeNumberRequest, setPreKeysRequest)
-  }
-
-  /**
-   * If we encounter a server error, this means the server ack our request and rejected it. In this
-   * case we know the change *did not* take on the server and can reset to a clean state.
-   */
-  @Test
-  fun testChangeNumber_givenServerFailedApiCall() {
-    // GIVEN
-    val oldPni = Recipient.self().requirePni()
-    val oldE164 = Recipient.self().requireE164()
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Post("/v1/verification/session") { MockResponse().success(MockProvider.sessionMetadataJson.copy(verified = false)) },
-      Put("/v1/verification/session/${MockProvider.sessionMetadataJson.id}/code") { MockResponse().success(MockProvider.sessionMetadataJson) },
-      Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
-      Put("/v2/accounts/number") { MockResponse().failure(500) }
-    )
-
-    // WHEN
-    viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER, null, null).blockingGet().resultOrThrow
-    val processor: VerifyResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
-
-    // THEN
-    processor.isServerSentError() assertIs true
-    Recipient.self().requireE164() assertIs oldE164
-    Recipient.self().requirePni() assertIs oldPni
-    SignalStore.misc().pendingChangeNumberMetadata.assertIsNull()
-  }
-
-  /**
-   * If we encounter a non-server error like a timeout or bad SSL, we do not know the state of our change
-   * number on the server side. We have to do a whoami call to query the server for our details and then
-   * respond accordingly.
-   *
-   * In this case, the whoami is our old details, so we can know the change *did not* take on the server
-   * and can reset to a clean state.
-   */
-  @Test
-  fun testChangeNumber_givenNetworkFailedApiCallEnRouteToServer() {
-    // GIVEN
-    val aci = Recipient.self().requireServiceId()
-    val oldPni = Recipient.self().requirePni()
-    val oldE164 = Recipient.self().requireE164()
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Post("/v1/verification/session") { MockResponse().success(MockProvider.sessionMetadataJson.copy(verified = false)) },
-      Put("/v1/verification/session/${MockProvider.sessionMetadataJson.id}/code") { MockResponse().success(MockProvider.sessionMetadataJson) },
-      Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
-      Put("/v2/accounts/number") { MockResponse().connectionFailure() },
-      Get("/v1/accounts/whoami") { MockResponse().success(MockProvider.createWhoAmIResponse(aci, oldPni, oldE164)) }
-    )
-
-    // WHEN
-    viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER, null, null).blockingGet().resultOrThrow
-    val processor: VerifyResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
-
-    // THEN
-    processor.isServerSentError() assertIs false
-    Recipient.self().requireE164() assertIs oldE164
-    Recipient.self().requirePni() assertIs oldPni
-    SignalStore.misc().isChangeNumberLocked assertIs false
-    SignalStore.misc().pendingChangeNumberMetadata.assertIsNull()
-  }
-
-  /**
-   * If we encounter a non-server error like a timeout or bad SSL, we do not know the state of our change
-   * number on the server side. We have to do a whoami call to query the server for our details and then
-   * respond accordingly.
-   *
-   * In this case, the whoami is our new details, so we can know the change *did* take on the server
-   * and need to keep the app in a locked state. The test then uses the ChangeNumberLockActivity to unlock
-   * and apply the pending state after confirming the change on the server.
-   */
-  @Test
-  @FlakyTest
-  @Ignore("Test sometimes requires manual intervention to continue.")
-  fun testChangeNumber_givenNetworkFailedApiCallEnRouteToClient() {
-    // GIVEN
-    val aci = Recipient.self().requireServiceId()
-    val oldPni = Recipient.self().requirePni()
-    val oldE164 = Recipient.self().requireE164()
-    val newPni = PNI.from(UUID.randomUUID())
-
-    lateinit var changeNumberRequest: ChangePhoneNumberRequest
-    lateinit var setPreKeysRequest: PreKeyState
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Post("/v1/verification/session") { MockResponse().success(MockProvider.sessionMetadataJson.copy(verified = false)) },
-      Put("/v1/verification/session/${MockProvider.sessionMetadataJson.id}/code") { MockResponse().success(MockProvider.sessionMetadataJson) },
-      Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
-      Put("/v2/accounts/number") { r ->
-        changeNumberRequest = r.parsedRequestBody()
-        MockResponse().timeout()
-      },
-      Get("/v1/accounts/whoami") { MockResponse().success(MockProvider.createWhoAmIResponse(aci, newPni, "+15555550102")) },
-      Put("/v2/keys") { r ->
-        setPreKeysRequest = r.parsedRequestBody()
-        MockResponse().success()
-      },
-      Get("/v1/certificate/delivery") { MockResponse().success(MockProvider.senderCertificate) }
-    )
-
-    // WHEN
-    viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER, null, null).blockingGet().resultOrThrow
-    val processor: VerifyResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
-
-    // THEN
-    processor.isServerSentError() assertIs false
-    Recipient.self().requireE164() assertIs oldE164
-    Recipient.self().requirePni() assertIs oldPni
-    SignalStore.misc().isChangeNumberLocked assertIs true
-    SignalStore.misc().pendingChangeNumberMetadata.assertIsNotNull()
-
-    // WHEN AGAIN Processing lock
-    val scenario = harness.launchActivity<ChangeNumberLockActivity>()
-    scenario.onActivity {}
-    ThreadUtil.sleep(500)
-
-    // THEN AGAIN
-    assertSuccess(newPni, changeNumberRequest, setPreKeysRequest)
-  }
-
-  @Test
-  fun testChangeNumber_givenOnlyPrimaryAndRegistrationLock() {
-    // GIVEN
-    val aci = Recipient.self().requireServiceId()
-    val newPni = PNI.from(UUID.randomUUID())
-
-    lateinit var changeNumberRequest: ChangePhoneNumberRequest
-    lateinit var setPreKeysRequest: PreKeyState
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Post("/v1/verification/session") { MockResponse().success(MockProvider.sessionMetadataJson.copy(verified = false)) },
-      Put("/v1/verification/session/${MockProvider.sessionMetadataJson.id}/code") { MockResponse().success(MockProvider.sessionMetadataJson) },
-      Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
-      Put("/v2/accounts/number") { r ->
-        changeNumberRequest = r.parsedRequestBody()
-        if (changeNumberRequest.registrationLock.isNullOrEmpty()) {
-          MockResponse().failure(423, MockProvider.lockedFailure)
-        } else {
-          MockResponse().success(MockProvider.createVerifyAccountResponse(aci, newPni))
-        }
-      },
-      Put("/v2/keys") { r ->
-        setPreKeysRequest = r.parsedRequestBody()
-        MockResponse().success()
-      },
-      Get("/v1/certificate/delivery") { MockResponse().success(MockProvider.senderCertificate) }
-    )
-
-    // WHEN
-    viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER, null, null).blockingGet().resultOrThrow
-    viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet().also { processor ->
-      processor.registrationLock() assertIs true
-      Recipient.self().requirePni() assertIsNot newPni
-      SignalStore.misc().pendingChangeNumberMetadata.assertIsNull()
-    }
-
-    viewModel.verifyCodeAndRegisterAccountWithRegistrationLock("pin").blockingGet().resultOrThrow
-
-    // THEN
-    assertSuccess(newPni, changeNumberRequest, setPreKeysRequest)
-  }
-
-  @Test
-  fun testChangeNumber_givenMismatchedDevicesOnFirstCall() {
-    // GIVEN
-    val aci = Recipient.self().requireServiceId()
-    val newPni = PNI.from(UUID.randomUUID())
-    lateinit var changeNumberRequest: ChangePhoneNumberRequest
-    lateinit var setPreKeysRequest: PreKeyState
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Post("/v1/verification/session") { MockResponse().success(MockProvider.sessionMetadataJson.copy(verified = false)) },
-      Put("/v1/verification/session/${MockProvider.sessionMetadataJson.id}/code") { MockResponse().success(MockProvider.sessionMetadataJson) },
-      Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
-      Put("/v2/accounts/number") { r ->
-        changeNumberRequest = r.parsedRequestBody()
-        if (changeNumberRequest.deviceMessages.isEmpty()) {
-          MockResponse().failure(
-            409,
-            MismatchedDevices().apply {
-              missingDevices = listOf(2)
-              extraDevices = emptyList()
-            }
-          )
-        } else {
-          MockResponse().success(MockProvider.createVerifyAccountResponse(aci, newPni))
-        }
-      },
-      Get("/v2/keys/$aci/2") {
-        MockResponse().success(MockProvider.createPreKeyResponse(deviceId = 2))
-      },
-      Put("/v2/keys") { r ->
-        setPreKeysRequest = r.parsedRequestBody()
-        MockResponse().success()
-      },
-      Get("/v1/certificate/delivery") { MockResponse().success(MockProvider.senderCertificate) }
-    )
-
-    // WHEN
-    viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER, null, null).blockingGet().resultOrThrow
-    viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet().resultOrThrow
-
-    // THEN
-    assertSuccess(newPni, changeNumberRequest, setPreKeysRequest)
-  }
-
-  @Test
-  fun testChangeNumber_givenRegLockAndMismatchedDevicesOnFirstTwoCalls() {
-    // GIVEN
-    val aci = Recipient.self().requireServiceId()
-    val newPni = PNI.from(UUID.randomUUID())
-
-    lateinit var changeNumberRequest: ChangePhoneNumberRequest
-    lateinit var setPreKeysRequest: PreKeyState
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Post("/v1/verification/session") { MockResponse().success(MockProvider.sessionMetadataJson.copy(verified = false)) },
-      Put("/v1/verification/session/${MockProvider.sessionMetadataJson.id}/code") { MockResponse().success(MockProvider.sessionMetadataJson) },
-      Put("/v2/accounts/number") { r ->
-        changeNumberRequest = r.parsedRequestBody()
-        if (changeNumberRequest.registrationLock.isNullOrEmpty()) {
-          MockResponse().failure(423, MockProvider.lockedFailure)
-        } else if (changeNumberRequest.deviceMessages.isEmpty()) {
-          MockResponse().failure(
-            409,
-            MismatchedDevices().apply {
-              missingDevices = listOf(2)
-              extraDevices = emptyList()
-            }
-          )
-        } else if (changeNumberRequest.deviceMessages.size == 1) {
-          MockResponse().failure(
-            409,
-            MismatchedDevices().apply {
-              missingDevices = listOf(2, 3)
-              extraDevices = emptyList()
-            }
-          )
-        } else {
-          MockResponse().success(MockProvider.createVerifyAccountResponse(aci, newPni))
-        }
-      },
-      Get("/v2/keys/$aci/2") {
-        MockResponse().success(MockProvider.createPreKeyResponse(deviceId = 2))
-      },
-      Get("/v2/keys/$aci/3") {
-        MockResponse().success(MockProvider.createPreKeyResponse(deviceId = 3))
-      },
-      Put("/v2/keys") { r ->
-        setPreKeysRequest = r.parsedRequestBody()
-        MockResponse().success()
-      },
-      Get("/v1/certificate/delivery") { MockResponse().success(MockProvider.senderCertificate) }
-    )
-
-    // WHEN
-    viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER, null, null).blockingGet().resultOrThrow
-    viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet().also { processor ->
-      processor.registrationLock() assertIs true
-      Recipient.self().requirePni() assertIsNot newPni
-      SignalStore.misc().pendingChangeNumberMetadata.assertIsNull()
-    }
-
-    viewModel.verifyCodeAndRegisterAccountWithRegistrationLock("pin").blockingGet().resultOrThrow
-
-    // THEN
-    assertSuccess(newPni, changeNumberRequest, setPreKeysRequest)
-  }
-
-  private fun assertSuccess(newPni: ServiceId, changeNumberRequest: ChangePhoneNumberRequest, setPreKeysRequest: PreKeyState) {
-    val pniProtocolStore = ApplicationDependencies.getProtocolStore().pni()
-    val pniMetadataStore = SignalStore.account().pniPreKeys
-
-    Recipient.self().requireE164() assertIs "+15555550102"
-    Recipient.self().requirePni() assertIs newPni
-
-    SignalStore.account().pniRegistrationId assertIs changeNumberRequest.pniRegistrationIds["1"]!!
-    SignalStore.account().pniIdentityKey.publicKey assertIs changeNumberRequest.pniIdentityKey
-    pniMetadataStore.activeSignedPreKeyId assertIs changeNumberRequest.devicePniSignedPrekeys["1"]!!.keyId
-
-    val activeSignedPreKey: SignedPreKeyRecord = pniProtocolStore.loadSignedPreKey(pniMetadataStore.activeSignedPreKeyId)
-    activeSignedPreKey.keyPair.publicKey assertIs changeNumberRequest.devicePniSignedPrekeys["1"]!!.publicKey
-    activeSignedPreKey.signature assertIs changeNumberRequest.devicePniSignedPrekeys["1"]!!.signature
-
-    setPreKeysRequest.signedPreKey.publicKey assertIs activeSignedPreKey.keyPair.publicKey
-    setPreKeysRequest.preKeys assertIsSize 100
-
-    SignalStore.misc().pendingChangeNumberMetadata.assertIsNull()
-  }
-}
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt
index 2ea7db24ab..3e8fc8cca5 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt
@@ -154,7 +154,8 @@ class ConversationItemPreviewer {
       false,
       Optional.empty(),
       Optional.empty(),
-      System.currentTimeMillis()
+      System.currentTimeMillis(),
+      null
     )
   }
 }
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/SafetyNumberChangeDialogPreviewer.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/SafetyNumberChangeDialogPreviewer.kt
index 597d5d5d63..f6d94001f4 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/SafetyNumberChangeDialogPreviewer.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/SafetyNumberChangeDialogPreviewer.kt
@@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.database.IdentityTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.DistributionListId
 import org.thoughtcrime.securesms.database.model.DistributionListPrivacyMode
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.profiles.ProfileName
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.safety.SafetyNumberBottomSheet
@@ -64,7 +64,7 @@ class SafetyNumberChangeDialogPreviewer {
     scenario.onActivity { conversationActivity ->
       SafetyNumberBottomSheet
         .forIdentityRecordsAndDestinations(
-          identityRecords = ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecords(othersRecipients).identityRecords,
+          identityRecords = AppDependencies.protocolStore.aci().identities().getIdentityRecords(othersRecipients).identityRecords,
           destinations = listOf(ContactSearchKey.RecipientSearchKey(myStoryRecipientId, true))
         )
         .show(conversationActivity.supportFragmentManager)
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShapeTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShapeTest.kt
index a9d4b2009d..c750d999fa 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShapeTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShapeTest.kt
@@ -290,6 +290,8 @@ class V2ConversationItemShapeTest {
 
     override fun onChangeNumberUpdateContact(recipient: Recipient) = Unit
 
+    override fun onChangeProfileNameUpdateContact(recipient: Recipient) = Unit
+
     override fun onCallToAction(action: String) = Unit
 
     override fun onDonateClicked() = Unit
@@ -310,7 +312,7 @@ class V2ConversationItemShapeTest {
 
     override fun goToMediaPreview(parent: ConversationItem?, sharedElement: View?, args: MediaIntentFactory.MediaPreviewArgs?) = Unit
 
-    override fun onEditedIndicatorClicked(messageRecord: MessageRecord) = Unit
+    override fun onEditedIndicatorClicked(conversationMessage: ConversationMessage) = Unit
 
     override fun onShowGroupDescriptionClicked(groupName: String, description: String, shouldLinkifyWebLinks: Boolean) = Unit
 
@@ -327,5 +329,6 @@ class V2ConversationItemShapeTest {
     override fun onMessageRequestAcceptOptionsClicked() = Unit
 
     override fun onItemDoubleClick(item: MultiselectPart) = Unit
+    override fun onPaymentTombstoneClicked() = Unit
   }
 }
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest_deduping.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest_deduping.kt
index d5f8015ce2..2940cc0204 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest_deduping.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest_deduping.kt
@@ -16,6 +16,7 @@ import org.signal.core.util.update
 import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.attachments.Cdn
 import org.thoughtcrime.securesms.attachments.PointerAttachment
+import org.thoughtcrime.securesms.backup.v2.BackupRepository.getMediaName
 import org.thoughtcrime.securesms.database.AttachmentTable.TransformProperties
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.MediaStream
@@ -25,6 +26,8 @@ import org.thoughtcrime.securesms.mms.SentMediaQuality
 import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.MediaUtil
+import org.thoughtcrime.securesms.util.Util
+import org.whispersystems.signalservice.api.backup.MediaId
 import org.whispersystems.signalservice.api.push.ServiceId
 import java.io.File
 import java.util.UUID
@@ -47,9 +50,9 @@ class AttachmentTableTest_deduping {
 
   @Before
   fun setUp() {
-    SignalStore.account().setAci(ServiceId.ACI.from(UUID.randomUUID()))
-    SignalStore.account().setPni(ServiceId.PNI.from(UUID.randomUUID()))
-    SignalStore.account().setE164("+15558675309")
+    SignalStore.account.setAci(ServiceId.ACI.from(UUID.randomUUID()))
+    SignalStore.account.setPni(ServiceId.PNI.from(UUID.randomUUID()))
+    SignalStore.account.setE164("+15558675309")
 
     SignalDatabase.attachments.deleteAllAttachments()
   }
@@ -195,6 +198,8 @@ class AttachmentTableTest_deduping {
       assertDataHashEndMatches(id1, id2)
       assertSkipTransform(id1, true)
       assertSkipTransform(id2, true)
+      assertRemoteFieldsMatch(id1, id2)
+      assertArchiveFieldsMatch(id1, id2)
     }
 
     // Mimics sending two files at once. Ensures all fields are kept in sync as we compress and upload.
@@ -220,6 +225,7 @@ class AttachmentTableTest_deduping {
       assertDataHashStartMatches(id1, id2)
       assertDataHashEndMatches(id1, id2)
       assertRemoteFieldsMatch(id1, id2)
+      assertArchiveFieldsMatch(id1, id2)
     }
 
     // Re-use the upload when uploaded recently
@@ -234,6 +240,7 @@ class AttachmentTableTest_deduping {
       assertDataHashStartMatches(id1, id2)
       assertDataHashEndMatches(id1, id2)
       assertRemoteFieldsMatch(id1, id2)
+      assertArchiveFieldsMatch(id1, id2)
       assertSkipTransform(id1, true)
       assertSkipTransform(id2, true)
     }
@@ -253,6 +260,7 @@ class AttachmentTableTest_deduping {
       assertSkipTransform(id2, true)
 
       assertDoesNotHaveRemoteFields(id2)
+      assertArchiveFieldsMatch(id1, id2)
     }
 
     // This isn't so much "desirable behavior" as it is documenting how things work.
@@ -282,6 +290,7 @@ class AttachmentTableTest_deduping {
       assertSkipTransform(id1, true)
       assertSkipTransform(id1, true)
       assertRemoteFieldsMatch(id1, id2)
+      assertArchiveFieldsMatch(id1, id2)
     }
 
     // This represents what would happen if you edited a video, sent it, then forwarded it. We should match, skip transform, and skip upload.
@@ -297,6 +306,7 @@ class AttachmentTableTest_deduping {
       assertSkipTransform(id1, true)
       assertSkipTransform(id1, true)
       assertRemoteFieldsMatch(id1, id2)
+      assertArchiveFieldsMatch(id1, id2)
     }
 
     // This represents what would happen if you edited a video, sent it, then forwarded it, but *edited the forwarded video*. We should not dedupe.
@@ -327,6 +337,7 @@ class AttachmentTableTest_deduping {
       assertSkipTransform(id1, true)
       assertSkipTransform(id1, true)
       assertRemoteFieldsMatch(id1, id2)
+      assertArchiveFieldsMatch(id1, id2)
     }
 
     // This represents what would happen if you sent an image using high quality, then forwarded it using standard quality.
@@ -343,6 +354,7 @@ class AttachmentTableTest_deduping {
       assertSkipTransform(id1, true)
       assertSkipTransform(id1, true)
       assertRemoteFieldsMatch(id1, id2)
+      assertArchiveFieldsMatch(id1, id2)
     }
 
     // Make sure that files marked as unhashable are all updated together
@@ -457,6 +469,7 @@ class AttachmentTableTest_deduping {
       assertDataHashStartMatches(id1, id2)
       assertDataHashEndMatches(id1, id2)
       assertRemoteFieldsMatch(id1, id2)
+      assertArchiveFieldsMatch(id1, id2)
     }
 
     // Making sure things work for quotes of videos, which have trickier transform properties
@@ -470,6 +483,7 @@ class AttachmentTableTest_deduping {
       assertDataFilesAreTheSame(id1, id2)
       assertDataHashEndMatches(id1, id2)
       assertRemoteFieldsMatch(id1, id2)
+      assertArchiveFieldsMatch(id1, id2)
     }
   }
 
@@ -648,6 +662,15 @@ class AttachmentTableTest_deduping {
 
     fun upload(attachmentId: AttachmentId, uploadTimestamp: Long = System.currentTimeMillis()) {
       SignalDatabase.attachments.finalizeAttachmentAfterUpload(attachmentId, createPointerAttachment(attachmentId, uploadTimestamp), uploadTimestamp)
+
+      val attachment = SignalDatabase.attachments.getAttachment(attachmentId)!!
+      SignalDatabase.attachments.setArchiveData(
+        attachmentId = attachmentId,
+        archiveCdn = Cdn.CDN_3.cdnNumber,
+        archiveMediaName = attachment.getMediaName().name,
+        archiveThumbnailMediaId = MediaId(Util.getSecretBytes(15)).encode(),
+        archiveMediaId = MediaId(Util.getSecretBytes(15)).encode()
+      )
     }
 
     fun delete(attachmentId: AttachmentId) {
@@ -746,6 +769,15 @@ class AttachmentTableTest_deduping {
       assertEquals(lhsAttachment.cdn.cdnNumber, rhsAttachment.cdn.cdnNumber)
     }
 
+    fun assertArchiveFieldsMatch(lhs: AttachmentId, rhs: AttachmentId) {
+      val lhsAttachment = SignalDatabase.attachments.getAttachment(lhs)!!
+      val rhsAttachment = SignalDatabase.attachments.getAttachment(rhs)!!
+
+      assertEquals(lhsAttachment.archiveCdn, rhsAttachment.archiveCdn)
+      assertEquals(lhsAttachment.archiveMediaName, rhsAttachment.archiveMediaName)
+      assertEquals(lhsAttachment.archiveMediaId, rhsAttachment.archiveMediaId)
+    }
+
     fun assertDoesNotHaveRemoteFields(attachmentId: AttachmentId) {
       val databaseAttachment = SignalDatabase.attachments.getAttachment(attachmentId)!!
       assertEquals(0, databaseAttachment.uploadTimestamp)
@@ -792,7 +824,8 @@ class AttachmentTableTest_deduping {
         uploadTimestamp,
         databaseAttachment.caption,
         databaseAttachment.stickerLocator,
-        databaseAttachment.blurHash
+        databaseAttachment.blurHash,
+        databaseAttachment.uuid
       )
     }
   }
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/CallTableTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/CallTableTest.kt
index 38c63ce8b5..b02dad66b9 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/CallTableTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/CallTableTest.kt
@@ -56,7 +56,7 @@ class CallTableTest {
     )
 
     val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    SignalDatabase.calls.deleteGroupCall(call!!)
+    SignalDatabase.calls.markCallDeletedFromSyncEvent(call!!)
 
     val deletedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
     val oldestDeletionTimestamp = SignalDatabase.calls.getOldestDeletionTimestamp()
@@ -69,9 +69,10 @@ class CallTableTest {
   @Test
   fun givenNoPreExistingEvent_whenIDeleteGroupCall_thenIInsertAndMarkCallDeleted() {
     val callId = 1L
-    SignalDatabase.calls.insertDeletedGroupCallFromSyncEvent(
+    SignalDatabase.calls.insertDeletedCallFromSyncEvent(
       callId,
       groupRecipientId,
+      CallTable.Type.GROUP_CALL,
       CallTable.Direction.OUTGOING,
       System.currentTimeMillis()
     )
@@ -438,11 +439,12 @@ class CallTableTest {
   @Test
   fun givenADeletedCallEvent_whenIReceiveARingUpdate_thenIIgnoreTheRingUpdate() {
     val callId = 1L
-    SignalDatabase.calls.insertDeletedGroupCallFromSyncEvent(
+    SignalDatabase.calls.insertDeletedCallFromSyncEvent(
       callId = callId,
       recipientId = groupRecipientId,
       direction = CallTable.Direction.INCOMING,
-      timestamp = System.currentTimeMillis()
+      timestamp = System.currentTimeMillis(),
+      type = CallTable.Type.GROUP_CALL
     )
 
     SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/DatabaseConsistencyTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/DatabaseConsistencyTest.kt
index dbd03dfae7..fc6938e72e 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/DatabaseConsistencyTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/DatabaseConsistencyTest.kt
@@ -15,7 +15,7 @@ import org.signal.core.util.getIndexes
 import org.signal.core.util.readToList
 import org.signal.core.util.requireNonNullString
 import org.thoughtcrime.securesms.database.helpers.SignalDatabaseMigrations
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 
 /**
@@ -30,7 +30,7 @@ class DatabaseConsistencyTest {
   @Test
   fun testUpgradeConsistency() {
     val currentVersionStatements = SignalDatabase.rawDatabase.getAllCreateStatements()
-    val testHelper = InMemoryTestHelper(ApplicationDependencies.getApplication()).also {
+    val testHelper = InMemoryTestHelper(AppDependencies.application).also {
       it.onUpgrade(it.writableDatabase, 181, SignalDatabaseMigrations.DATABASE_VERSION)
     }
 
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/DatabaseObserverTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/DatabaseObserverTest.kt
index c86e5bdb57..f1118138e1 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/DatabaseObserverTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/DatabaseObserverTest.kt
@@ -8,7 +8,7 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.core.util.concurrent.SignalExecutors
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicInteger
@@ -26,7 +26,7 @@ class DatabaseObserverTest {
   @Before
   fun setup() {
     db = SignalDatabase.instance!!.signalWritableDatabase
-    observer = ApplicationDependencies.getDatabaseObserver()
+    observer = AppDependencies.databaseObserver
   }
 
   @Test
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/DistributionListTablesTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/DistributionListTablesTest.kt
index df616f9c70..33d21a4f61 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/DistributionListTablesTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/DistributionListTablesTest.kt
@@ -25,15 +25,6 @@ class DistributionListTablesTest {
     Assert.assertNotNull(id)
   }
 
-  @Test
-  fun createList_whenNameConflict_failToInsert() {
-    val id: DistributionListId? = distributionDatabase.createList("test", recipientList(1, 2, 3))
-    Assert.assertNotNull(id)
-
-    val id2: DistributionListId? = distributionDatabase.createList("test", recipientList(1, 2, 3))
-    Assert.assertNull(id2)
-  }
-
   @Test
   fun getList_returnCorrectList() {
     createRecipients(3)
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/GroupTableTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/GroupTableTest.kt
index 0ca921ede5..195ff7d8b3 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/GroupTableTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/GroupTableTest.kt
@@ -167,8 +167,8 @@ class GroupTableTest {
 
   @Test
   fun givenTwoGroupsWithoutMembers_whenIQueryThem_thenIExpectEach() {
-    val g1 = insertPushGroup(listOf())
-    val g2 = insertPushGroup(listOf())
+    val g1 = insertPushGroup(members = emptyList())
+    val g2 = insertPushGroup(members = emptyList())
 
     val gr1 = groupTable.getGroup(g1)
     val gr2 = groupTable.getGroup(g2)
@@ -195,6 +195,85 @@ class GroupTableTest {
     assertEquals(groups[0].id, groupInCommon)
   }
 
+  @Test
+  fun givenTwoGroupsWithANameThatSharesAToken_whenISearchForTheSharedToken_thenIExpectBothGroups() {
+    insertPushGroup("Group Alice")
+    insertPushGroup("Group Bob")
+
+    SignalDatabase.groups.queryGroupsByTitle(
+      inputQuery = "Group",
+      includeInactive = false,
+      excludeV1 = false,
+      excludeMms = false
+    ).use {
+      assertEquals(2, it.cursor?.count)
+
+      val firstGroup = it.getNext()
+      val secondGroup = it.getNext()
+
+      assertEquals("Group Alice", firstGroup?.title)
+      assertEquals("Group Bob", secondGroup?.title)
+    }
+  }
+
+  @Test
+  fun givenTwoGroupsWithANameThatSharesAToken_whenISearchForAnUnsharedToken_thenIExpectOneGroup() {
+    insertPushGroup("Group Alice")
+    insertPushGroup("Group Bob")
+
+    SignalDatabase.groups.queryGroupsByTitle(
+      inputQuery = "Alice",
+      includeInactive = false,
+      excludeV1 = false,
+      excludeMms = false
+    ).use {
+      assertEquals(1, it.cursor?.count)
+
+      val firstGroup = it.getNext()
+
+      assertEquals("Group Alice", firstGroup?.title)
+    }
+  }
+
+  @Test
+  fun givenAGroupWithThreeTokens_whenISearchForTheFirstAndLastToken_thenIExpectThatGroup() {
+    insertPushGroup("Group & Alice")
+
+    SignalDatabase.groups.queryGroupsByTitle(
+      inputQuery = "Group Alice",
+      includeInactive = false,
+      excludeV1 = false,
+      excludeMms = false
+    ).use {
+      assertEquals(1, it.cursor?.count)
+
+      val firstGroup = it.getNext()
+
+      assertEquals("Group & Alice", firstGroup?.title)
+    }
+  }
+
+  @Test
+  fun givenTwoGroupsWithSharedTokens_whenISearchForAnExactMatch_thenIExpectThatGroupFirst() {
+    insertPushGroup("Group Alice Bob")
+    insertPushGroup("Group Bob")
+
+    SignalDatabase.groups.queryGroupsByTitle(
+      inputQuery = "Group Bob",
+      includeInactive = false,
+      excludeV1 = false,
+      excludeMms = false
+    ).use {
+      assertEquals(2, it.cursor?.count)
+
+      val firstGroup = it.getNext()
+      val second = it.getNext()
+
+      assertEquals("Group Bob", firstGroup?.title)
+      assertEquals("Group Alice Bob", second?.title)
+    }
+  }
+
   private fun insertThread(groupId: GroupId): Long {
     val groupRecipient = SignalDatabase.recipients.getByGroupId(groupId).get()
     return SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(groupRecipient))
@@ -214,6 +293,7 @@ class GroupTableTest {
   }
 
   private fun insertPushGroup(
+    title: String = "Test Group",
     members: List<DecryptedMember> = listOf(
       DecryptedMember.Builder()
         .aciBytes(harness.self.requireAci().toByteString())
@@ -229,11 +309,12 @@ class GroupTableTest {
   ): GroupId {
     val groupMasterKey = GroupMasterKey(Random.nextBytes(GroupMasterKey.SIZE))
     val decryptedGroupState = DecryptedGroup.Builder()
+      .title(title)
       .members(members)
       .revision(0)
       .build()
 
-    return groupTable.create(groupMasterKey, decryptedGroupState)!!
+    return groupTable.create(groupMasterKey, decryptedGroupState, null)!!
   }
 
   private fun insertPushGroupWithSelfAndOthers(others: List<RecipientId>): GroupId {
@@ -258,6 +339,6 @@ class GroupTableTest {
       .revision(0)
       .build()
 
-    return groupTable.create(groupMasterKey, decryptedGroupState)!!
+    return groupTable.create(groupMasterKey, decryptedGroupState, null)!!
   }
 }
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/KyberPreKeyTableTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/KyberPreKeyTableTest.kt
index 4736aac117..e52deb27ec 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/KyberPreKeyTableTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/KyberPreKeyTableTest.kt
@@ -159,7 +159,7 @@ class KyberPreKeyTableTest {
     val count = SignalDatabase.rawDatabase
       .update(KyberPreKeyTable.TABLE_NAME)
       .values(KyberPreKeyTable.STALE_TIMESTAMP to staleTime)
-      .where("${KyberPreKeyTable.ACCOUNT_ID} = ? AND ${KyberPreKeyTable.KEY_ID} = $id", account)
+      .where("${KyberPreKeyTable.ACCOUNT_ID} = ? AND ${KyberPreKeyTable.KEY_ID} = $id", account.toAccountId())
       .run()
 
     assertEquals(1, count)
@@ -169,8 +169,15 @@ class KyberPreKeyTableTest {
     return SignalDatabase.rawDatabase
       .select(KyberPreKeyTable.STALE_TIMESTAMP)
       .from(KyberPreKeyTable.TABLE_NAME)
-      .where("${KyberPreKeyTable.ACCOUNT_ID} = ? AND ${KyberPreKeyTable.KEY_ID} = $id", account)
+      .where("${KyberPreKeyTable.ACCOUNT_ID} = ? AND ${KyberPreKeyTable.KEY_ID} = $id", account.toAccountId())
       .run()
       .readToSingleObject { it.requireLongOrNull(KyberPreKeyTable.STALE_TIMESTAMP) }
   }
+
+  private fun ServiceId.toAccountId(): String {
+    return when (this) {
+      is ACI -> this.toString()
+      is PNI -> KyberPreKeyTable.PNI_ACCOUNT_ID
+    }
+  }
 }
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MessageTableTest_gifts.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MessageTableTest_gifts.kt
index 3fe7d7ed5c..01f4c5cd68 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MessageTableTest_gifts.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MessageTableTest_gifts.kt
@@ -30,8 +30,8 @@ class MessageTableTest_gifts {
 
     mms.deleteAllThreads()
 
-    SignalStore.account().setAci(localAci)
-    SignalStore.account().setPni(localPni)
+    SignalStore.account.setAci(localAci)
+    SignalStore.account.setPni(localPni)
 
     recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())) }
   }
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_stories.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_stories.kt
index 792aa96b14..23b918a9f8 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_stories.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_stories.kt
@@ -40,14 +40,14 @@ class MmsTableTest_stories {
 
     mms.deleteAllThreads()
 
-    SignalStore.account().setAci(localAci)
-    SignalStore.account().setPni(localPni)
+    SignalStore.account.setAci(localAci)
+    SignalStore.account.setPni(localPni)
 
     myStory = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromDistributionListId(DistributionListId.MY_STORY))
     recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())) }
     releaseChannelRecipient = Recipient.resolved(SignalDatabase.recipients.insertReleaseChannelRecipient())
 
-    SignalStore.releaseChannelValues().setReleaseChannelRecipientId(releaseChannelRecipient.id)
+    SignalStore.releaseChannel.setReleaseChannelRecipientId(releaseChannelRecipient.id)
   }
 
   @Test
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/OneTimePreKeyTableTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/OneTimePreKeyTableTest.kt
index beaacf0d34..e28b54b891 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/OneTimePreKeyTableTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/OneTimePreKeyTableTest.kt
@@ -120,7 +120,7 @@ class OneTimePreKeyTableTest {
     val count = SignalDatabase.rawDatabase
       .update(OneTimePreKeyTable.TABLE_NAME)
       .values(OneTimePreKeyTable.STALE_TIMESTAMP to staleTime)
-      .where("${OneTimePreKeyTable.ACCOUNT_ID} = ? AND ${OneTimePreKeyTable.KEY_ID} = $id", account)
+      .where("${OneTimePreKeyTable.ACCOUNT_ID} = ? AND ${OneTimePreKeyTable.KEY_ID} = $id", account.toAccountId())
       .run()
 
     assertEquals(1, count)
@@ -130,8 +130,15 @@ class OneTimePreKeyTableTest {
     return SignalDatabase.rawDatabase
       .select(OneTimePreKeyTable.STALE_TIMESTAMP)
       .from(OneTimePreKeyTable.TABLE_NAME)
-      .where("${OneTimePreKeyTable.ACCOUNT_ID} = ? AND ${OneTimePreKeyTable.KEY_ID} = $id", account)
+      .where("${OneTimePreKeyTable.ACCOUNT_ID} = ? AND ${OneTimePreKeyTable.KEY_ID} = $id", account.toAccountId())
       .run()
       .readToSingleObject { it.requireLongOrNull(OneTimePreKeyTable.STALE_TIMESTAMP) }
   }
+
+  private fun ServiceId.toAccountId(): String {
+    return when (this) {
+      is ACI -> this.toString()
+      is PNI -> OneTimePreKeyTable.PNI_ACCOUNT_ID
+    }
+  }
 }
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_applyStorageSyncContactUpdate.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_applyStorageSyncContactUpdate.kt
index a795cfbab3..dfd59bf614 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_applyStorageSyncContactUpdate.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_applyStorageSyncContactUpdate.kt
@@ -9,7 +9,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.storage.StorageRecordUpdate
 import org.thoughtcrime.securesms.storage.StorageSyncModels
@@ -28,7 +28,7 @@ class RecipientTableTest_applyStorageSyncContactUpdate {
   @Test
   fun insertMessageOnVerifiedToDefault() {
     // GIVEN
-    val identities = ApplicationDependencies.getProtocolStore().aci().identities()
+    val identities = AppDependencies.protocolStore.aci().identities()
     val other = Recipient.resolved(harness.others[0])
 
     MmsHelper.insert(recipient = other)
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt
index aba11af7cd..624395ecfd 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt
@@ -34,7 +34,7 @@ import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.ReactionRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.SessionSwitchoverEvent
 import org.thoughtcrime.securesms.database.model.databaseprotos.ThreadMergeEvent
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.IncomingMessage
@@ -53,9 +53,9 @@ class RecipientTableTest_getAndPossiblyMerge {
 
   @Before
   fun setup() {
-    SignalStore.account().setE164(E164_SELF)
-    SignalStore.account().setAci(ACI_SELF)
-    SignalStore.account().setPni(PNI_SELF)
+    SignalStore.account.setE164(E164_SELF)
+    SignalStore.account.setAci(ACI_SELF)
+    SignalStore.account.setPni(PNI_SELF)
   }
 
   @Test
@@ -1113,8 +1113,8 @@ class RecipientTableTest_getAndPossiblyMerge {
           SignalDatabase.rawDatabase.execSQL("DELETE FROM $table")
         }
 
-      ApplicationDependencies.getRecipientCache().clear()
-      ApplicationDependencies.getRecipientCache().clearSelf()
+      AppDependencies.recipientCache.clear()
+      AppDependencies.recipientCache.clearSelf()
       RecipientId.clearCache()
     }
 
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/SmsDatabaseTest_collapseJoinRequestEventsIfPossible.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/SmsDatabaseTest_collapseJoinRequestEventsIfPossible.kt
index b00aba7111..5b89e19e1d 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/SmsDatabaseTest_collapseJoinRequestEventsIfPossible.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/SmsDatabaseTest_collapseJoinRequestEventsIfPossible.kt
@@ -10,7 +10,9 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.core.util.Hex
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey
+import org.thoughtcrime.securesms.database.model.GroupsV2UpdateMessageConverter
 import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context
+import org.thoughtcrime.securesms.database.model.databaseprotos.GV2UpdateDescription
 import org.thoughtcrime.securesms.database.model.databaseprotos.addMember
 import org.thoughtcrime.securesms.database.model.databaseprotos.addRequestingMember
 import org.thoughtcrime.securesms.database.model.databaseprotos.deleteRequestingMember
@@ -44,8 +46,8 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
     recipients = SignalDatabase.recipients
     sms = SignalDatabase.messages
 
-    SignalStore.account().setAci(localAci)
-    SignalStore.account().setPni(localPni)
+    SignalStore.account.setAci(localAci)
+    SignalStore.account.setPni(localPni)
 
     alice = recipients.getOrInsertFromServiceId(aliceServiceId)
     bob = recipients.getOrInsertFromServiceId(bobServiceId)
@@ -286,11 +288,18 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
 
   private fun groupUpdateMessage(sender: RecipientId, groupContext: DecryptedGroupV2Context): IncomingMessage {
     wallClock++
+
+    val updateDescription = GV2UpdateDescription(
+      gv2ChangeDescription = groupContext,
+      groupChangeUpdate = GroupsV2UpdateMessageConverter.translateDecryptedChangeUpdate(SignalStore.account.getServiceIds(), groupContext)
+    )
+
     return IncomingMessage.groupUpdate(
       from = sender,
       timestamp = wallClock,
       groupId = groupId,
-      groupContext = groupContext,
+      update = updateDescription,
+      isGroupAdd = false,
       serverGuid = null
     )
   }
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/UriAttachmentBuilder.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/UriAttachmentBuilder.kt
index 828b75fe71..a51693a2ee 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/UriAttachmentBuilder.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/UriAttachmentBuilder.kt
@@ -5,6 +5,7 @@ import org.thoughtcrime.securesms.attachments.UriAttachment
 import org.thoughtcrime.securesms.audio.AudioHash
 import org.thoughtcrime.securesms.blurhash.BlurHash
 import org.thoughtcrime.securesms.stickers.StickerLocator
+import java.util.UUID
 
 object UriAttachmentBuilder {
   fun build(
@@ -22,23 +23,28 @@ object UriAttachmentBuilder {
     stickerLocator: StickerLocator? = null,
     blurHash: BlurHash? = null,
     audioHash: AudioHash? = null,
-    transformProperties: AttachmentTable.TransformProperties? = null
+    transformProperties: AttachmentTable.TransformProperties? = null,
+    uuid: UUID? = UUID.randomUUID()
   ): UriAttachment {
     return UriAttachment(
-      uri,
-      contentType,
-      transferState,
-      size,
-      fileName,
-      voiceNote,
-      borderless,
-      videoGif,
-      quote,
-      caption,
-      stickerLocator,
-      blurHash,
-      audioHash,
-      transformProperties
+      dataUri = uri,
+      contentType = contentType,
+      transferState = transferState,
+      size = size,
+      width = 0,
+      height = 0,
+      fileName = fileName,
+      fastPreflightId = null,
+      voiceNote = voiceNote,
+      borderless = borderless,
+      videoGif = videoGif,
+      quote = quote,
+      caption = caption,
+      stickerLocator = stickerLocator,
+      blurHash = blurHash,
+      audioHash = audioHash,
+      transformProperties = transformProperties,
+      uuid = uuid
     )
   }
 }
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/database/helpers/migration/FixInAppCurrencyIfAbleTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/database/helpers/migration/FixInAppCurrencyIfAbleTest.kt
new file mode 100644
index 0000000000..ea471c92ad
--- /dev/null
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/helpers/migration/FixInAppCurrencyIfAbleTest.kt
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.database.helpers.migration
+
+import android.app.Application
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.util.readToSingleObject
+import org.signal.core.util.requireNonNullString
+import org.signal.core.util.select
+import org.signal.core.util.update
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toDecimalValue
+import org.thoughtcrime.securesms.database.InAppPaymentSubscriberTable
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.database.model.databaseprotos.FiatValue
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.testing.SignalDatabaseRule
+import org.thoughtcrime.securesms.testing.assertIs
+import org.whispersystems.signalservice.api.subscriptions.SubscriberId
+import java.math.BigDecimal
+import java.util.Currency
+
+@RunWith(AndroidJUnit4::class)
+class FixInAppCurrencyIfAbleTest {
+
+  @get:Rule
+  val harness = SignalDatabaseRule(deleteAllThreadsOnEachRun = false)
+
+  @Test
+  fun givenNoSubscribers_whenIMigrate_thenIDoNothing() {
+    migrate()
+  }
+
+  @Test
+  fun givenASubscriberButNoPayment_whenIMigrate_thenIDoNothing() {
+    val subscriber = insertSubscriber("USD")
+    clearCurrencyCode(subscriber)
+    migrate()
+
+    getCurrencyCode(subscriber) assertIs ""
+  }
+
+  @Test
+  fun givenASubscriberAndMismatchedPayment_whenIMigrate_thenIDoNothing() {
+    val subscriber = insertSubscriber("USD")
+    val otherSubscriber = insertSubscriber("EUR")
+    insertPayment(otherSubscriber)
+    clearCurrencyCode(subscriber)
+    migrate()
+
+    getCurrencyCode(subscriber) assertIs ""
+  }
+
+  @Test
+  fun givenASubscriberAndPaymentWithNoSubscriber_whenIMigrate_thenDoNothing() {
+    val subscriber = insertSubscriber("USD")
+    insertPayment(null)
+    clearCurrencyCode(subscriber)
+    migrate()
+
+    getCurrencyCode(subscriber) assertIs ""
+  }
+
+  @Test
+  fun givenASubscriberAndMatchingPayment_whenIMigrate_thenUpdateCurrencyCode() {
+    val subscriber = insertSubscriber("USD")
+    insertPayment(subscriber)
+    clearCurrencyCode(subscriber)
+    migrate()
+
+    getCurrencyCode(subscriber) assertIs "USD"
+  }
+
+  @Test
+  fun givenASupercededSubscriber_whenIMigrate_thenIDoNothing() {
+    val oldSubscriber = insertSubscriber("USD")
+    insertPayment(oldSubscriber)
+    clearCurrencyCode(oldSubscriber)
+    insertSubscriber("USD")
+    migrate()
+  }
+
+  private fun migrate() {
+    V236_FixInAppSubscriberCurrencyIfAble.migrate(
+      context = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext as Application,
+      db = SignalDatabase.rawDatabase,
+      oldVersion = 0,
+      newVersion = 0
+    )
+  }
+
+  private fun insertSubscriber(currencyCode: String): InAppPaymentSubscriberRecord {
+    val record = InAppPaymentSubscriberRecord(
+      subscriberId = SubscriberId.generate(),
+      currency = Currency.getInstance(currencyCode),
+      type = InAppPaymentSubscriberRecord.Type.DONATION,
+      requiresCancel = false,
+      paymentMethodType = InAppPaymentData.PaymentMethodType.PAYPAL
+    )
+
+    SignalDatabase.inAppPaymentSubscribers.insertOrReplace(record)
+
+    return record
+  }
+
+  private fun clearCurrencyCode(inAppPaymentSubscriberRecord: InAppPaymentSubscriberRecord) {
+    SignalDatabase.rawDatabase.update(InAppPaymentSubscriberTable.TABLE_NAME)
+      .values(InAppPaymentSubscriberTable.CURRENCY_CODE to "")
+      .where("${InAppPaymentSubscriberTable.SUBSCRIBER_ID} = ?", inAppPaymentSubscriberRecord.subscriberId.serialize())
+      .run()
+  }
+
+  private fun getCurrencyCode(inAppPaymentSubscriberRecord: InAppPaymentSubscriberRecord): String {
+    return SignalDatabase.rawDatabase.select(InAppPaymentSubscriberTable.CURRENCY_CODE)
+      .from(InAppPaymentSubscriberTable.TABLE_NAME)
+      .where("${InAppPaymentSubscriberTable.SUBSCRIBER_ID} = ?", inAppPaymentSubscriberRecord.subscriberId.serialize())
+      .run()
+      .readToSingleObject { it.requireNonNullString(InAppPaymentSubscriberTable.CURRENCY_CODE) }!!
+  }
+
+  private fun insertPayment(inAppPaymentSubscriberRecord: InAppPaymentSubscriberRecord?): InAppPaymentTable.InAppPayment {
+    val id = SignalDatabase.inAppPayments.insert(
+      type = InAppPaymentType.RECURRING_DONATION,
+      state = InAppPaymentTable.State.END,
+      subscriberId = inAppPaymentSubscriberRecord?.subscriberId,
+      endOfPeriod = null,
+      inAppPaymentData = InAppPaymentData(
+        amount = FiatValue(
+          currencyCode = inAppPaymentSubscriberRecord?.currency?.currencyCode ?: "USD",
+          amount = BigDecimal.ONE.toDecimalValue()
+        ),
+        level = 200,
+        paymentMethodType = inAppPaymentSubscriberRecord?.paymentMethodType ?: InAppPaymentData.PaymentMethodType.UNKNOWN
+      )
+    )
+
+    return SignalDatabase.inAppPayments.getById(id)!!
+  }
+}
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt
index ab4b457930..8297bc67c9 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.dependencies
 
 import android.app.Application
+import io.mockk.spyk
 import okhttp3.ConnectionSpec
 import okhttp3.Response
 import okhttp3.WebSocket
@@ -24,6 +25,9 @@ import org.thoughtcrime.securesms.testing.Get
 import org.thoughtcrime.securesms.testing.Verb
 import org.thoughtcrime.securesms.testing.runSync
 import org.thoughtcrime.securesms.testing.success
+import org.whispersystems.signalservice.api.SignalServiceDataStore
+import org.whispersystems.signalservice.api.SignalServiceMessageSender
+import org.whispersystems.signalservice.api.SignalWebSocket
 import org.whispersystems.signalservice.api.push.TrustStore
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl
 import org.whispersystems.signalservice.internal.configuration.SignalCdsiUrl
@@ -37,12 +41,13 @@ import org.whispersystems.signalservice.internal.configuration.SignalSvr2Url
  *
  * Handles setting up a mock web server for API calls, and provides mockable versions of [SignalServiceNetworkAccess].
  */
-class InstrumentationApplicationDependencyProvider(val application: Application, private val default: ApplicationDependencyProvider) : ApplicationDependencies.Provider by default {
+class InstrumentationApplicationDependencyProvider(val application: Application, private val default: ApplicationDependencyProvider) : AppDependencies.Provider by default {
 
   private val serviceTrustStore: TrustStore
   private val uncensoredConfiguration: SignalServiceConfiguration
   private val serviceNetworkAccessMock: SignalServiceNetworkAccess
   private val recipientCache: LiveRecipientCache
+  private var signalServiceMessageSender: SignalServiceMessageSender? = null
 
   init {
     runSync {
@@ -53,18 +58,21 @@ class InstrumentationApplicationDependencyProvider(val application: Application,
         Get("/v1/websocket/?login=") {
           MockResponse().success().withWebSocketUpgrade(mockIdentifiedWebSocket)
         },
-        Get("/v1/websocket", { !it.path.contains("login") }) {
+        Get("/v1/websocket", {
+          val path = it.path
+          return@Get path == null || !path.contains("login")
+        }) {
           MockResponse().success().withWebSocketUpgrade(object : WebSocketListener() {})
         }
       )
     }
 
-    webServer.setDispatcher(object : Dispatcher() {
+    webServer.dispatcher = object : Dispatcher() {
       override fun dispatch(request: RecordedRequest): MockResponse {
         val handler = handlers.firstOrNull { it.requestPredicate(request) }
         return handler?.responseFactory?.invoke(request) ?: MockResponse().setResponseCode(500)
       }
-    })
+    }
 
     serviceTrustStore = SignalServiceTrustStore(application)
     uncensoredConfiguration = SignalServiceConfiguration(
@@ -102,6 +110,17 @@ class InstrumentationApplicationDependencyProvider(val application: Application,
     return recipientCache
   }
 
+  override fun provideSignalServiceMessageSender(
+    signalWebSocket: SignalWebSocket,
+    protocolStore: SignalServiceDataStore,
+    signalServiceConfiguration: SignalServiceConfiguration
+  ): SignalServiceMessageSender {
+    if (signalServiceMessageSender == null) {
+      signalServiceMessageSender = spyk(objToCopy = default.provideSignalServiceMessageSender(signalWebSocket, protocolStore, signalServiceConfiguration))
+    }
+    return signalServiceMessageSender!!
+  }
+
   class MockWebSocket : WebSocketListener() {
     private val TAG = "MockWebSocket"
 
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJobTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJobTest.kt
index 3a05feabb6..536443a257 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJobTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJobTest.kt
@@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.attachments.UriAttachment
 import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.UriAttachmentBuilder
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.mms.SentMediaQuality
 import org.thoughtcrime.securesms.providers.BlobProvider
@@ -38,7 +38,7 @@ class AttachmentCompressionJobTest {
       StreamUtil.readFully(it)
     }
 
-    val blob = BlobProvider.getInstance().forData(imageBytes).createForSingleSessionOnDisk(ApplicationDependencies.getApplication())
+    val blob = BlobProvider.getInstance().forData(imageBytes).createForSingleSessionOnDisk(AppDependencies.application)
 
     val firstPreUpload = createAttachment(1, blob, AttachmentTable.TransformProperties.empty())
     val firstDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(firstPreUpload)
@@ -51,12 +51,12 @@ class AttachmentCompressionJobTest {
 
     val secondJobLatch = CountDownLatch(1)
     val jobThread = Thread {
-      firstCompressionJob.setContext(ApplicationDependencies.getApplication())
+      firstCompressionJob.setContext(AppDependencies.application)
       firstJobResult = firstCompressionJob.run()
 
       secondJobLatch.await()
 
-      secondCompressionJob!!.setContext(ApplicationDependencies.getApplication())
+      secondCompressionJob!!.setContext(AppDependencies.application)
       secondJobResult = secondCompressionJob!!.run()
     }
 
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageHelper.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageHelper.kt
new file mode 100644
index 0000000000..43fa465044
--- /dev/null
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageHelper.kt
@@ -0,0 +1,290 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.messages
+
+import android.net.Uri
+import io.mockk.every
+import io.mockk.mockkStatic
+import io.mockk.slot
+import io.mockk.unmockkStatic
+import org.thoughtcrime.securesms.attachments.Attachment
+import org.thoughtcrime.securesms.attachments.UriAttachment
+import org.thoughtcrime.securesms.database.AttachmentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.UriAttachmentBuilder
+import org.thoughtcrime.securesms.database.model.GroupsV2UpdateMessageConverter
+import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context
+import org.thoughtcrime.securesms.database.model.databaseprotos.GV2UpdateDescription
+import org.thoughtcrime.securesms.jobs.ThreadUpdateJob
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.mms.OutgoingMessage
+import org.thoughtcrime.securesms.providers.BlobProvider
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.testing.GroupTestingUtils
+import org.thoughtcrime.securesms.testing.MessageContentFuzzer
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.util.MediaUtil
+import java.util.UUID
+import kotlin.random.Random
+
+/**
+ * Makes inserting messages through the "normal" code paths simpler. Mostly focused on incoming messages.
+ */
+class MessageHelper(private val harness: SignalActivityRule, var startTime: Long = System.currentTimeMillis()) {
+
+  val alice: RecipientId = harness.others[0]
+  val bob: RecipientId = harness.others[1]
+  val group: GroupTestingUtils.TestGroupInfo = harness.group!!
+  val processor: MessageContentProcessor = MessageContentProcessor(harness.context)
+
+  init {
+    val threadIdSlot = slot<Long>()
+    mockkStatic(ThreadUpdateJob::class)
+    every { ThreadUpdateJob.enqueue(capture(threadIdSlot)) } answers {
+      SignalDatabase.threads.update(threadIdSlot.captured, false)
+    }
+  }
+
+  fun tearDown() {
+    unmockkStatic(ThreadUpdateJob::class)
+  }
+
+  fun incomingText(sender: RecipientId = alice, destination: RecipientId = harness.self.id): MessageData {
+    startTime = nextStartTime()
+
+    val messageData = MessageData(author = sender, timestamp = startTime)
+
+    processor.process(
+      envelope = MessageContentFuzzer.envelope(messageData.timestamp, serverGuid = messageData.serverGuid),
+      content = MessageContentFuzzer.fuzzTextMessage(
+        sentTimestamp = messageData.timestamp,
+        groupContextV2 = if (destination == group.recipientId) group.groupV2Context else null,
+        allowExpireTimeChanges = false
+      ),
+      metadata = MessageContentFuzzer.envelopeMetadata(
+        source = sender,
+        destination = harness.self.id,
+        groupId = if (destination == group.recipientId) group.groupId else null
+      ),
+      serverDeliveredTimestamp = messageData.timestamp + 10
+    )
+
+    return messageData
+  }
+
+  fun outgoingText(conversationId: RecipientId = alice, successfulSend: Boolean = true, updateMessage: ((OutgoingMessage) -> OutgoingMessage)? = null): MessageData {
+    startTime = nextStartTime()
+
+    val messageData = MessageData(author = harness.self.id, timestamp = startTime)
+    val threadRecipient = Recipient.resolved(conversationId)
+
+    val message = OutgoingMessage(
+      threadRecipient = threadRecipient,
+      body = MessageContentFuzzer.string(),
+      sentTimeMillis = messageData.timestamp,
+      isUrgent = true,
+      isSecure = true
+    ).let { updateMessage?.invoke(it) ?: it }
+
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(threadRecipient)
+    val messageId = SignalDatabase.messages.insertMessageOutbox(message, threadId, false, null)
+
+    if (successfulSend) {
+      SignalDatabase.messages.markAsSent(messageId, true)
+    }
+
+    return messageData.copy(messageId = messageId)
+  }
+
+  fun outgoingMessage(conversationId: RecipientId = alice, updateMessage: OutgoingMessage.() -> OutgoingMessage): MessageData {
+    startTime = nextStartTime()
+
+    val messageData = MessageData(author = harness.self.id, timestamp = startTime)
+    val threadRecipient = Recipient.resolved(conversationId)
+
+    val message = OutgoingMessage(
+      threadRecipient = threadRecipient,
+      sentTimeMillis = messageData.timestamp,
+      isUrgent = true,
+      isSecure = true
+    ).apply { updateMessage() }
+
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(threadRecipient)
+    val messageId = SignalDatabase.messages.insertMessageOutbox(message, threadId, false, null)
+
+    return messageData.copy(messageId = messageId)
+  }
+
+  fun outgoingAttachment(data: ByteArray, uuid: UUID? = UUID.randomUUID()): Attachment {
+    val uri: Uri = BlobProvider.getInstance().forData(data).createForSingleSessionInMemory()
+
+    val attachment: UriAttachment = UriAttachmentBuilder.build(
+      id = Random.nextLong(),
+      uri = uri,
+      contentType = MediaUtil.IMAGE_JPEG,
+      transformProperties = AttachmentTable.TransformProperties(),
+      uuid = uuid
+    )
+
+    return attachment
+  }
+
+  fun outgoingGroupChange(): MessageData {
+    startTime = nextStartTime()
+
+    val messageData = MessageData(author = harness.self.id, timestamp = startTime)
+    val groupRecipient = Recipient.resolved(group.recipientId)
+    val decryptedGroupV2Context = DecryptedGroupV2Context(
+      context = group.groupV2Context,
+      groupState = SignalDatabase.groups.getGroup(group.groupId).get().requireV2GroupProperties().decryptedGroup
+    )
+
+    val updateDescription = GV2UpdateDescription.Builder()
+      .gv2ChangeDescription(decryptedGroupV2Context)
+      .groupChangeUpdate(GroupsV2UpdateMessageConverter.translateDecryptedChange(SignalStore.account.getServiceIds(), decryptedGroupV2Context))
+      .build()
+
+    val outgoingMessage = OutgoingMessage.groupUpdateMessage(groupRecipient, updateDescription, startTime)
+
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(groupRecipient)
+    val messageId = SignalDatabase.messages.insertMessageOutbox(outgoingMessage, threadId, false, null)
+    SignalDatabase.messages.markAsSent(messageId, true)
+
+    return messageData.copy(messageId = messageId)
+  }
+
+  fun incomingMedia(sender: RecipientId = alice, destination: RecipientId = harness.self.id): MessageData {
+    startTime = nextStartTime()
+
+    val messageData = MessageData(author = sender, timestamp = startTime)
+
+    processor.process(
+      envelope = MessageContentFuzzer.envelope(messageData.timestamp, serverGuid = messageData.serverGuid),
+      content = MessageContentFuzzer.fuzzStickerMediaMessage(
+        sentTimestamp = messageData.timestamp,
+        groupContextV2 = if (destination == group.recipientId) group.groupV2Context else null
+      ),
+      metadata = MessageContentFuzzer.envelopeMetadata(
+        source = sender,
+        destination = harness.self.id,
+        groupId = if (destination == group.recipientId) group.groupId else null
+      ),
+      serverDeliveredTimestamp = messageData.timestamp + 10
+    )
+
+    return messageData
+  }
+
+  fun incomingEditText(targetTimestamp: Long = System.currentTimeMillis(), sender: RecipientId = alice, destination: RecipientId = harness.self.id): MessageData {
+    startTime = nextStartTime()
+
+    val messageData = MessageData(author = sender, timestamp = startTime)
+
+    processor.process(
+      envelope = MessageContentFuzzer.envelope(messageData.timestamp, serverGuid = messageData.serverGuid),
+      content = MessageContentFuzzer.editTextMessage(
+        targetTimestamp = targetTimestamp,
+        editedDataMessage = MessageContentFuzzer.fuzzTextMessage(
+          sentTimestamp = messageData.timestamp,
+          groupContextV2 = if (destination == group.recipientId) group.groupV2Context else null
+        ).dataMessage!!
+      ),
+      metadata = MessageContentFuzzer.envelopeMetadata(
+        source = sender,
+        destination = harness.self.id,
+        groupId = if (destination == group.recipientId) group.groupId else null
+      ),
+      serverDeliveredTimestamp = messageData.timestamp + 10
+    )
+
+    return messageData
+  }
+
+  fun syncReadMessage(vararg reads: Pair<RecipientId, Long>): MessageData {
+    startTime = nextStartTime()
+    val messageData = MessageData(timestamp = startTime)
+
+    processor.process(
+      envelope = MessageContentFuzzer.envelope(messageData.timestamp, serverGuid = messageData.serverGuid),
+      content = MessageContentFuzzer.syncReadsMessage(reads.toList()),
+      metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, harness.self.id, sourceDeviceId = 2),
+      serverDeliveredTimestamp = messageData.timestamp + 10
+    )
+
+    return messageData
+  }
+
+  fun syncDeleteForMeMessage(vararg deletes: MessageContentFuzzer.DeleteForMeSync): MessageData {
+    startTime = nextStartTime()
+    val messageData = MessageData(timestamp = startTime)
+
+    processor.process(
+      envelope = MessageContentFuzzer.envelope(messageData.timestamp, serverGuid = messageData.serverGuid),
+      content = MessageContentFuzzer.syncDeleteForMeMessage(deletes.toList()),
+      metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, harness.self.id, sourceDeviceId = 2),
+      serverDeliveredTimestamp = messageData.timestamp + 10
+    )
+
+    return messageData
+  }
+
+  fun syncDeleteForMeConversation(vararg deletes: MessageContentFuzzer.DeleteForMeSync): MessageData {
+    startTime = nextStartTime()
+    val messageData = MessageData(timestamp = startTime)
+
+    processor.process(
+      envelope = MessageContentFuzzer.envelope(messageData.timestamp, serverGuid = messageData.serverGuid),
+      content = MessageContentFuzzer.syncDeleteForMeConversation(deletes.toList()),
+      metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, harness.self.id, sourceDeviceId = 2),
+      serverDeliveredTimestamp = messageData.timestamp + 10
+    )
+
+    return messageData
+  }
+
+  fun syncDeleteForMeLocalOnlyConversation(vararg conversations: RecipientId): MessageData {
+    startTime = nextStartTime()
+    val messageData = MessageData(timestamp = startTime)
+
+    processor.process(
+      envelope = MessageContentFuzzer.envelope(messageData.timestamp, serverGuid = messageData.serverGuid),
+      content = MessageContentFuzzer.syncDeleteForMeLocalOnlyConversation(conversations.toList()),
+      metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, harness.self.id, sourceDeviceId = 2),
+      serverDeliveredTimestamp = messageData.timestamp + 10
+    )
+
+    return messageData
+  }
+
+  fun syncDeleteForMeAttachment(conversationId: RecipientId, message: Pair<RecipientId, Long>, uuid: UUID?, digest: ByteArray?, plainTextHash: String?): MessageData {
+    startTime = nextStartTime()
+    val messageData = MessageData(timestamp = startTime)
+
+    processor.process(
+      envelope = MessageContentFuzzer.envelope(messageData.timestamp, serverGuid = messageData.serverGuid),
+      content = MessageContentFuzzer.syncDeleteForMeAttachment(conversationId, message, uuid, digest, plainTextHash),
+      metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, harness.self.id, sourceDeviceId = 2),
+      serverDeliveredTimestamp = messageData.timestamp + 10
+    )
+
+    return messageData
+  }
+
+  /**
+   * Get the next "sentTimestamp" for current + [nextMessageOffset]th message. Useful for early message processing and future message timestamps.
+   */
+  fun nextStartTime(nextMessageOffset: Int = 1): Long {
+    return startTime + 1000 * nextMessageOffset
+  }
+
+  data class MessageData(
+    val author: RecipientId = RecipientId.UNKNOWN,
+    val serverGuid: UUID = UUID.randomUUID(),
+    val timestamp: Long,
+    val messageId: Long = -1L
+  )
+}
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageProcessingPerformanceTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageProcessingPerformanceTest.kt
index 07233e48f7..f51d478c35 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageProcessingPerformanceTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageProcessingPerformanceTest.kt
@@ -16,7 +16,7 @@ import org.signal.core.util.logging.Log
 import org.signal.libsignal.protocol.ecc.Curve
 import org.signal.libsignal.protocol.ecc.ECKeyPair
 import org.signal.libsignal.zkgroup.profiles.ProfileKey
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil
+import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil
 import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.testing.AliceClient
@@ -55,8 +55,8 @@ class MessageProcessingPerformanceTest {
 
   @Before
   fun setup() {
-    mockkStatic(UnidentifiedAccessUtil::class)
-    every { UnidentifiedAccessUtil.getCertificateValidator() } returns FakeClientHelpers.noOpCertificateValidator
+    mockkStatic(SealedSenderAccessUtil::class)
+    every { SealedSenderAccessUtil.getCertificateValidator() } returns FakeClientHelpers.noOpCertificateValidator
 
     mockkObject(MessageContentProcessor)
     every { MessageContentProcessor.create(harness.application) } returns TimingMessageContentProcessor(harness.application)
@@ -64,7 +64,7 @@ class MessageProcessingPerformanceTest {
 
   @After
   fun after() {
-    unmockkStatic(UnidentifiedAccessUtil::class)
+    unmockkStatic(SealedSenderAccessUtil::class)
     unmockkStatic(MessageContentProcessor::class)
   }
 
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/SyncMessageProcessorTest_readSyncs.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/SyncMessageProcessorTest_readSyncs.kt
index 36a752235c..67f0f2dfa4 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/SyncMessageProcessorTest_readSyncs.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/SyncMessageProcessorTest_readSyncs.kt
@@ -6,23 +6,14 @@
 package org.thoughtcrime.securesms.messages
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.mockk.every
-import io.mockk.mockkStatic
-import io.mockk.slot
-import io.mockk.unmockkStatic
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.jobs.ThreadUpdateJob
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testing.GroupTestingUtils
-import org.thoughtcrime.securesms.testing.MessageContentFuzzer
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.testing.assertIs
-import java.util.UUID
 
 @Suppress("ClassName")
 @RunWith(AndroidJUnit4::class)
@@ -31,43 +22,28 @@ class SyncMessageProcessorTest_readSyncs {
   @get:Rule
   val harness = SignalActivityRule(createGroup = true)
 
-  private lateinit var alice: RecipientId
-  private lateinit var bob: RecipientId
-  private lateinit var group: GroupTestingUtils.TestGroupInfo
-  private lateinit var processor: MessageContentProcessor
+  private lateinit var messageHelper: MessageHelper
 
   @Before
   fun setUp() {
-    alice = harness.others[0]
-    bob = harness.others[1]
-    group = harness.group!!
-
-    processor = MessageContentProcessor(harness.context)
-
-    val threadIdSlot = slot<Long>()
-    mockkStatic(ThreadUpdateJob::class)
-    every { ThreadUpdateJob.enqueue(capture(threadIdSlot)) } answers {
-      SignalDatabase.threads.update(threadIdSlot.captured, false)
-    }
+    messageHelper = MessageHelper(harness)
   }
 
   @After
   fun tearDown() {
-    unmockkStatic(ThreadUpdateJob::class)
+    messageHelper.tearDown()
   }
 
   @Test
   fun handleSynchronizeReadMessage() {
-    val messageHelper = MessageHelper()
-
     val message1Timestamp = messageHelper.incomingText().timestamp
     val message2Timestamp = messageHelper.incomingText().timestamp
 
-    val threadId = SignalDatabase.threads.getThreadIdFor(alice)!!
+    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
     var threadRecord = SignalDatabase.threads.getThreadRecord(threadId)!!
     threadRecord.unreadCount assertIs 2
 
-    messageHelper.syncReadMessage(alice to message1Timestamp, alice to message2Timestamp)
+    messageHelper.syncReadMessage(messageHelper.alice to message1Timestamp, messageHelper.alice to message2Timestamp)
 
     threadRecord = SignalDatabase.threads.getThreadRecord(threadId)!!
     threadRecord.unreadCount assertIs 0
@@ -75,16 +51,14 @@ class SyncMessageProcessorTest_readSyncs {
 
   @Test
   fun handleSynchronizeReadMessageMissingTimestamp() {
-    val messageHelper = MessageHelper()
-
     messageHelper.incomingText().timestamp
     val message2Timestamp = messageHelper.incomingText().timestamp
 
-    val threadId = SignalDatabase.threads.getThreadIdFor(alice)!!
+    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
     var threadRecord = SignalDatabase.threads.getThreadRecord(threadId)!!
     threadRecord.unreadCount assertIs 2
 
-    messageHelper.syncReadMessage(alice to message2Timestamp)
+    messageHelper.syncReadMessage(messageHelper.alice to message2Timestamp)
 
     threadRecord = SignalDatabase.threads.getThreadRecord(threadId)!!
     threadRecord.unreadCount assertIs 0
@@ -92,21 +66,19 @@ class SyncMessageProcessorTest_readSyncs {
 
   @Test
   fun handleSynchronizeReadWithEdits() {
-    val messageHelper = MessageHelper()
-
     val message1Timestamp = messageHelper.incomingText().timestamp
-    messageHelper.syncReadMessage(alice to message1Timestamp)
+    messageHelper.syncReadMessage(messageHelper.alice to message1Timestamp)
 
     val editMessage1Timestamp1 = messageHelper.incomingEditText(message1Timestamp).timestamp
     val editMessage1Timestamp2 = messageHelper.incomingEditText(editMessage1Timestamp1).timestamp
 
     val message2Timestamp = messageHelper.incomingMedia().timestamp
 
-    val threadId = SignalDatabase.threads.getThreadIdFor(alice)!!
+    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
     var threadRecord = SignalDatabase.threads.getThreadRecord(threadId)!!
     threadRecord.unreadCount assertIs 2
 
-    messageHelper.syncReadMessage(alice to message2Timestamp, alice to editMessage1Timestamp1, alice to editMessage1Timestamp2)
+    messageHelper.syncReadMessage(messageHelper.alice to message2Timestamp, messageHelper.alice to editMessage1Timestamp1, messageHelper.alice to editMessage1Timestamp2)
 
     threadRecord = SignalDatabase.threads.getThreadRecord(threadId)!!
     threadRecord.unreadCount assertIs 0
@@ -114,112 +86,22 @@ class SyncMessageProcessorTest_readSyncs {
 
   @Test
   fun handleSynchronizeReadWithEditsInGroup() {
-    val messageHelper = MessageHelper()
+    val message1Timestamp = messageHelper.incomingText(sender = messageHelper.alice, destination = messageHelper.group.recipientId).timestamp
 
-    val message1Timestamp = messageHelper.incomingText(sender = alice, destination = group.recipientId).timestamp
+    messageHelper.syncReadMessage(messageHelper.alice to message1Timestamp)
 
-    messageHelper.syncReadMessage(alice to message1Timestamp)
+    val editMessage1Timestamp1 = messageHelper.incomingEditText(targetTimestamp = message1Timestamp, sender = messageHelper.alice, destination = messageHelper.group.recipientId).timestamp
+    val editMessage1Timestamp2 = messageHelper.incomingEditText(targetTimestamp = editMessage1Timestamp1, sender = messageHelper.alice, destination = messageHelper.group.recipientId).timestamp
 
-    val editMessage1Timestamp1 = messageHelper.incomingEditText(targetTimestamp = message1Timestamp, sender = alice, destination = group.recipientId).timestamp
-    val editMessage1Timestamp2 = messageHelper.incomingEditText(targetTimestamp = editMessage1Timestamp1, sender = alice, destination = group.recipientId).timestamp
+    val message2Timestamp = messageHelper.incomingMedia(sender = messageHelper.bob, destination = messageHelper.group.recipientId).timestamp
 
-    val message2Timestamp = messageHelper.incomingMedia(sender = bob, destination = group.recipientId).timestamp
-
-    val threadId = SignalDatabase.threads.getThreadIdFor(group.recipientId)!!
+    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.group.recipientId)!!
     var threadRecord = SignalDatabase.threads.getThreadRecord(threadId)!!
     threadRecord.unreadCount assertIs 2
 
-    messageHelper.syncReadMessage(bob to message2Timestamp, alice to editMessage1Timestamp1, alice to editMessage1Timestamp2)
+    messageHelper.syncReadMessage(messageHelper.bob to message2Timestamp, messageHelper.alice to editMessage1Timestamp1, messageHelper.alice to editMessage1Timestamp2)
 
     threadRecord = SignalDatabase.threads.getThreadRecord(threadId)!!
     threadRecord.unreadCount assertIs 0
   }
-
-  private inner class MessageHelper(var startTime: Long = System.currentTimeMillis()) {
-
-    fun incomingText(sender: RecipientId = alice, destination: RecipientId = harness.self.id): MessageData {
-      startTime += 1000
-
-      val messageData = MessageData(timestamp = startTime)
-
-      processor.process(
-        envelope = MessageContentFuzzer.envelope(messageData.timestamp, serverGuid = messageData.serverGuid),
-        content = MessageContentFuzzer.fuzzTextMessage(
-          sentTimestamp = messageData.timestamp,
-          groupContextV2 = if (destination == group.recipientId) group.groupV2Context else null
-        ),
-        metadata = MessageContentFuzzer.envelopeMetadata(
-          source = sender,
-          destination = harness.self.id,
-          groupId = if (destination == group.recipientId) group.groupId else null
-        ),
-        serverDeliveredTimestamp = messageData.timestamp + 10
-      )
-
-      return messageData
-    }
-
-    fun incomingMedia(sender: RecipientId = alice, destination: RecipientId = harness.self.id): MessageData {
-      startTime += 1000
-
-      val messageData = MessageData(timestamp = startTime)
-
-      processor.process(
-        envelope = MessageContentFuzzer.envelope(messageData.timestamp, serverGuid = messageData.serverGuid),
-        content = MessageContentFuzzer.fuzzStickerMediaMessage(
-          sentTimestamp = messageData.timestamp,
-          groupContextV2 = if (destination == group.recipientId) group.groupV2Context else null
-        ),
-        metadata = MessageContentFuzzer.envelopeMetadata(
-          source = sender,
-          destination = harness.self.id,
-          groupId = if (destination == group.recipientId) group.groupId else null
-        ),
-        serverDeliveredTimestamp = messageData.timestamp + 10
-      )
-
-      return messageData
-    }
-
-    fun incomingEditText(targetTimestamp: Long = System.currentTimeMillis(), sender: RecipientId = alice, destination: RecipientId = harness.self.id): MessageData {
-      startTime += 1000
-
-      val messageData = MessageData(timestamp = startTime)
-
-      processor.process(
-        envelope = MessageContentFuzzer.envelope(messageData.timestamp, serverGuid = messageData.serverGuid),
-        content = MessageContentFuzzer.editTextMessage(
-          targetTimestamp = targetTimestamp,
-          editedDataMessage = MessageContentFuzzer.fuzzTextMessage(
-            sentTimestamp = messageData.timestamp,
-            groupContextV2 = if (destination == group.recipientId) group.groupV2Context else null
-          ).dataMessage!!
-        ),
-        metadata = MessageContentFuzzer.envelopeMetadata(
-          source = sender,
-          destination = harness.self.id,
-          groupId = if (destination == group.recipientId) group.groupId else null
-        ),
-        serverDeliveredTimestamp = messageData.timestamp + 10
-      )
-
-      return messageData
-    }
-
-    fun syncReadMessage(vararg reads: Pair<RecipientId, Long>): MessageData {
-      startTime += 1000
-      val messageData = MessageData(timestamp = startTime)
-
-      processor.process(
-        envelope = MessageContentFuzzer.envelope(messageData.timestamp, serverGuid = messageData.serverGuid),
-        content = MessageContentFuzzer.syncReadsMessage(reads.toList()),
-        metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, harness.self.id, sourceDeviceId = 2),
-        serverDeliveredTimestamp = messageData.timestamp + 10
-      )
-
-      return messageData
-    }
-  }
-
-  private data class MessageData(val serverGuid: UUID = UUID.randomUUID(), val timestamp: Long)
 }
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/SyncMessageProcessorTest_synchronizeDeleteForMe.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/SyncMessageProcessorTest_synchronizeDeleteForMe.kt
new file mode 100644
index 0000000000..f0a3abccfc
--- /dev/null
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/SyncMessageProcessorTest_synchronizeDeleteForMe.kt
@@ -0,0 +1,703 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.messages
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.hamcrest.Matchers.greaterThan
+import org.junit.After
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.util.logging.Log
+import org.signal.core.util.update
+import org.signal.core.util.withinTransaction
+import org.thoughtcrime.securesms.attachments.Attachment
+import org.thoughtcrime.securesms.attachments.DatabaseAttachment
+import org.thoughtcrime.securesms.database.AttachmentTable
+import org.thoughtcrime.securesms.database.CallTable
+import org.thoughtcrime.securesms.database.MessageTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.databaseprotos.SessionSwitchoverEvent
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.testing.MessageContentFuzzer.DeleteForMeSync
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.testing.assert
+import org.thoughtcrime.securesms.testing.assertIs
+import org.thoughtcrime.securesms.testing.assertIsNot
+import org.thoughtcrime.securesms.testing.assertIsNotNull
+import org.thoughtcrime.securesms.testing.assertIsSize
+import org.thoughtcrime.securesms.util.IdentityUtil
+import java.util.UUID
+
+@Suppress("ClassName")
+@RunWith(AndroidJUnit4::class)
+class SyncMessageProcessorTest_synchronizeDeleteForMe {
+
+  companion object {
+    private val TAG = "SyncDeleteForMeTest"
+  }
+
+  @get:Rule
+  val harness = SignalActivityRule(createGroup = true)
+
+  private lateinit var messageHelper: MessageHelper
+
+  @Before
+  fun setUp() {
+    messageHelper = MessageHelper(harness)
+  }
+
+  @After
+  fun tearDown() {
+    messageHelper.tearDown()
+  }
+
+  @Test
+  fun singleMessageDelete() {
+    // GIVEN
+    val message1Timestamp = messageHelper.incomingText().timestamp
+    messageHelper.incomingText()
+
+    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
+    var messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
+    messageCount assertIs 2
+
+    // WHEN
+    messageHelper.syncDeleteForMeMessage(
+      DeleteForMeSync(conversationId = messageHelper.alice, messageHelper.alice to message1Timestamp)
+    )
+
+    // THEN
+    messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
+    messageCount assertIs 1
+  }
+
+  @Test
+  fun singleOutgoingMessageDelete() {
+    // GIVEN
+    val message1Timestamp = messageHelper.outgoingText().timestamp
+    messageHelper.incomingText()
+
+    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
+    var messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
+    messageCount assertIs 2
+
+    // WHEN
+    messageHelper.syncDeleteForMeMessage(
+      DeleteForMeSync(conversationId = messageHelper.alice, harness.self.id to message1Timestamp)
+    )
+
+    // THEN
+    messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
+    messageCount assertIs 1
+  }
+
+  @Test
+  fun singleGroupMessageDelete() {
+    // GIVEN
+    val message1Timestamp = messageHelper.incomingText(sender = messageHelper.alice, destination = messageHelper.group.recipientId).timestamp
+    messageHelper.incomingText(sender = messageHelper.alice, destination = messageHelper.group.recipientId)
+    messageHelper.incomingText(sender = messageHelper.bob, destination = messageHelper.group.recipientId)
+
+    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.group.recipientId)!!
+    var messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
+    messageCount assertIs 3
+
+    // WHEN
+    messageHelper.syncDeleteForMeMessage(
+      DeleteForMeSync(conversationId = messageHelper.group.recipientId, messageHelper.alice to message1Timestamp)
+    )
+
+    // THEN
+    messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
+    messageCount assertIs 2
+  }
+
+  @Test
+  fun multipleGroupMessageDelete() {
+    // GIVEN
+    val message1Timestamp = messageHelper.incomingText(sender = messageHelper.alice, destination = messageHelper.group.recipientId).timestamp
+    messageHelper.incomingText(sender = messageHelper.alice, destination = messageHelper.group.recipientId)
+    val message3Timestamp = messageHelper.incomingText(sender = messageHelper.bob, destination = messageHelper.group.recipientId).timestamp
+
+    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.group.recipientId)!!
+    var messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
+    messageCount assertIs 3
+
+    // WHEN
+    messageHelper.syncDeleteForMeMessage(
+      DeleteForMeSync(conversationId = messageHelper.group.recipientId, messageHelper.alice to message1Timestamp, messageHelper.bob to message3Timestamp)
+    )
+
+    // THEN
+    messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
+    messageCount assertIs 1
+  }
+
+  @Test
+  fun allMessagesDelete() {
+    // GIVEN
+    val message1Timestamp = messageHelper.incomingText().timestamp
+    val message2Timestamp = messageHelper.incomingText().timestamp
+
+    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
+    var messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
+    messageCount assertIs 2
+
+    // WHEN
+    messageHelper.syncDeleteForMeMessage(
+      DeleteForMeSync(conversationId = messageHelper.alice, messageHelper.alice to message1Timestamp, messageHelper.alice to message2Timestamp)
+    )
+
+    // THEN
+    messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
+    messageCount assertIs 0
+
+    val threadRecord = SignalDatabase.threads.getThreadRecord(threadId)
+    threadRecord assertIs null
+  }
+
+  @Test
+  fun earlyMessagesDelete() {
+    // GIVEN
+    messageHelper.incomingText().timestamp
+
+    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
+    var messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
+    messageCount assertIs 1
+
+    // WHEN
+    val nextTextMessageTimestamp = messageHelper.nextStartTime(2)
+    messageHelper.syncDeleteForMeMessage(
+      DeleteForMeSync(conversationId = messageHelper.alice, messageHelper.alice to nextTextMessageTimestamp)
+    )
+    messageHelper.incomingText()
+
+    // THEN
+    messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
+    messageCount assertIs 1
+  }
+
+  @Test
+  fun multipleConversationMessagesDelete() {
+    // GIVEN
+    messageHelper.incomingText(sender = messageHelper.alice)
+    val aliceMessage2 = messageHelper.incomingText(sender = messageHelper.alice).timestamp
+
+    messageHelper.incomingText(sender = messageHelper.bob)
+    val bobMessage2 = messageHelper.incomingText(sender = messageHelper.bob).timestamp
+
+    val aliceThreadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
+    var aliceMessageCount = SignalDatabase.messages.getMessageCountForThread(aliceThreadId)
+    aliceMessageCount assertIs 2
+
+    val bobThreadId = SignalDatabase.threads.getThreadIdFor(messageHelper.bob)!!
+    var bobMessageCount = SignalDatabase.messages.getMessageCountForThread(bobThreadId)
+    bobMessageCount assertIs 2
+
+    // WHEN
+    messageHelper.syncDeleteForMeMessage(
+      DeleteForMeSync(conversationId = messageHelper.alice, messageHelper.alice to aliceMessage2),
+      DeleteForMeSync(conversationId = messageHelper.bob, messageHelper.bob to bobMessage2)
+    )
+
+    // THEN
+    aliceMessageCount = SignalDatabase.messages.getMessageCountForThread(aliceThreadId)
+    aliceMessageCount assertIs 1
+
+    bobMessageCount = SignalDatabase.messages.getMessageCountForThread(bobThreadId)
+    bobMessageCount assertIs 1
+  }
+
+  @Test
+  fun singleConversationDelete() {
+    // GIVEN
+    val messages = mutableListOf<MessageTable.SyncMessageId>()
+
+    for (i in 0 until 10) {
+      messages += MessageTable.SyncMessageId(messageHelper.alice, messageHelper.incomingText().timestamp)
+      messages += MessageTable.SyncMessageId(harness.self.id, messageHelper.outgoingText().timestamp)
+    }
+
+    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
+    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 20
+
+    // WHEN
+    messageHelper.syncDeleteForMeConversation(
+      DeleteForMeSync(
+        conversationId = messageHelper.alice,
+        messages = messages.takeLast(5).map { it.recipientId to it.timetamp },
+        isFullDelete = true
+      )
+    )
+
+    // THEN
+    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 0
+    SignalDatabase.threads.getThreadRecord(threadId) assertIs null
+  }
+
+  @Test
+  fun singleConversationNoRecentsFoundDelete() {
+    // GIVEN
+    val messages = mutableListOf<MessageTable.SyncMessageId>()
+
+    for (i in 0 until 10) {
+      messages += MessageTable.SyncMessageId(messageHelper.alice, messageHelper.incomingText().timestamp)
+      messages += MessageTable.SyncMessageId(harness.self.id, messageHelper.outgoingText().timestamp)
+    }
+
+    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
+    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 20
+
+    // WHEN
+    val randomFutureMessages = (1..5).map {
+      messageHelper.alice to messageHelper.nextStartTime(it)
+    }
+
+    messageHelper.syncDeleteForMeConversation(
+      DeleteForMeSync(conversationId = messageHelper.alice, randomFutureMessages, isFullDelete = true)
+    )
+
+    // THEN
+    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 20
+    SignalDatabase.threads.getThreadRecord(threadId).assertIsNotNull()
+
+    harness.inMemoryLogger.flush()
+    harness.inMemoryLogger.entries().filter { it.message?.contains("Unable to find most recent received at timestamp") == true }.size assertIs 1
+  }
+
+  @Test
+  fun singleConversationNoRecentsFoundNonExpiringRecentsFoundDelete() {
+    // GIVEN
+    val messages = mutableListOf<MessageTable.SyncMessageId>()
+
+    for (i in 0 until 10) {
+      messages += MessageTable.SyncMessageId(messageHelper.alice, messageHelper.incomingText().timestamp)
+      messages += MessageTable.SyncMessageId(harness.self.id, messageHelper.outgoingText().timestamp)
+    }
+
+    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
+    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 20
+
+    // WHEN
+    val nonExpiringMessages = messages.takeLast(5).map { it.recipientId to it.timetamp }
+
+    val randomFutureMessages = (1..5).map {
+      messageHelper.alice to messageHelper.nextStartTime(it)
+    }
+
+    messageHelper.syncDeleteForMeConversation(
+      DeleteForMeSync(conversationId = messageHelper.alice, randomFutureMessages, nonExpiringMessages, true)
+    )
+
+    // THEN
+    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 0
+    SignalDatabase.threads.getThreadRecord(threadId) assertIs null
+
+    harness.inMemoryLogger.flush()
+    harness.inMemoryLogger.entries().filter { it.message?.contains("Using backup non-expiring messages") == true }.size assertIs 1
+  }
+
+  @Test
+  fun localOnlyRemainingAfterConversationDeleteWithFullDelete() {
+    // GIVEN
+    val messages = mutableListOf<MessageTable.SyncMessageId>()
+
+    Log.v(TAG, "Adding normal messages")
+    for (i in 0 until 10) {
+      messages += MessageTable.SyncMessageId(messageHelper.alice, messageHelper.incomingText().timestamp)
+      messages += MessageTable.SyncMessageId(harness.self.id, messageHelper.outgoingText().timestamp)
+    }
+
+    val alice = Recipient.resolved(messageHelper.alice)
+    Log.v(TAG, "Adding identity message")
+    IdentityUtil.markIdentityVerified(harness.context, alice, true, true)
+    Log.v(TAG, "Adding profile message")
+    SignalDatabase.messages.insertProfileNameChangeMessages(alice, "new name", "previous name")
+    Log.v(TAG, "Adding call message")
+    SignalDatabase.calls.insertOneToOneCall(1, System.currentTimeMillis(), alice.id, CallTable.Type.AUDIO_CALL, CallTable.Direction.OUTGOING, CallTable.Event.ACCEPTED)
+
+    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
+    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 23
+
+    // WHEN
+    Log.v(TAG, "Processing sync message")
+    messageHelper.syncDeleteForMeConversation(
+      DeleteForMeSync(
+        conversationId = messageHelper.alice,
+        messages = messages.takeLast(5).map { it.recipientId to it.timetamp },
+        isFullDelete = true
+      )
+    )
+
+    // THEN
+    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 0
+    SignalDatabase.threads.getThreadRecord(threadId) assertIs null
+  }
+
+  @Test
+  fun localOnlyRemainingAfterConversationDeleteWithoutFullDelete() {
+    // GIVEN
+    val messages = mutableListOf<MessageTable.SyncMessageId>()
+
+    for (i in 0 until 10) {
+      messages += MessageTable.SyncMessageId(messageHelper.alice, messageHelper.incomingText().timestamp)
+      messages += MessageTable.SyncMessageId(harness.self.id, messageHelper.outgoingText().timestamp)
+    }
+
+    val alice = Recipient.resolved(messageHelper.alice)
+    IdentityUtil.markIdentityVerified(harness.context, alice, true, true)
+    SignalDatabase.messages.insertProfileNameChangeMessages(alice, "new name", "previous name")
+    SignalDatabase.calls.insertOneToOneCall(1, System.currentTimeMillis(), alice.id, CallTable.Type.AUDIO_CALL, CallTable.Direction.OUTGOING, CallTable.Event.ACCEPTED)
+
+    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
+    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 23
+
+    // WHEN
+    messageHelper.syncDeleteForMeConversation(
+      DeleteForMeSync(
+        conversationId = messageHelper.alice,
+        messages = messages.takeLast(5).map { it.recipientId to it.timetamp },
+        isFullDelete = false
+      )
+    )
+
+    // THEN
+    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 3
+    SignalDatabase.threads.getThreadRecord(threadId).assertIsNotNull()
+  }
+
+  @Test
+  fun groupConversationDelete() {
+    // GIVEN
+    val messages = mutableListOf<MessageTable.SyncMessageId>()
+
+    for (i in 0 until 50) {
+      messages += when (i % 3) {
+        1 -> MessageTable.SyncMessageId(messageHelper.alice, messageHelper.incomingText(sender = messageHelper.alice, destination = messageHelper.group.recipientId).timestamp)
+        2 -> MessageTable.SyncMessageId(messageHelper.bob, messageHelper.incomingText(sender = messageHelper.bob, destination = messageHelper.group.recipientId).timestamp)
+        else -> MessageTable.SyncMessageId(harness.self.id, messageHelper.outgoingText(messageHelper.group.recipientId).timestamp)
+      }
+    }
+
+    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.group.recipientId)!!
+
+    // WHEN
+    messageHelper.syncDeleteForMeConversation(
+      DeleteForMeSync(
+        conversationId = messageHelper.group.recipientId,
+        messages = messages.takeLast(5).map { it.recipientId to it.timetamp },
+        isFullDelete = true
+      )
+    )
+
+    // THEN
+    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 0
+    SignalDatabase.threads.getThreadRecord(threadId) assertIs null
+  }
+
+  @Test
+  fun multipleConversationDelete() {
+    // GIVEN
+    val allMessages = mapOf<RecipientId, MutableList<MessageTable.SyncMessageId>>(
+      messageHelper.alice to mutableListOf(),
+      messageHelper.bob to mutableListOf()
+    )
+
+    allMessages.forEach { (conversation, messages) ->
+      for (i in 0 until 10) {
+        messages += MessageTable.SyncMessageId(conversation, messageHelper.incomingText(sender = conversation).timestamp)
+        messages += MessageTable.SyncMessageId(harness.self.id, messageHelper.outgoingText(conversationId = conversation).timestamp)
+      }
+    }
+
+    val threadIds = allMessages.keys.map { SignalDatabase.threads.getThreadIdFor(it)!! }
+    threadIds.forEach { SignalDatabase.messages.getMessageCountForThread(it) assertIs 20 }
+
+    // WHEN
+    messageHelper.syncDeleteForMeConversation(
+      DeleteForMeSync(conversationId = messageHelper.alice, allMessages[messageHelper.alice]!!.takeLast(5).map { it.recipientId to it.timetamp }, isFullDelete = true),
+      DeleteForMeSync(conversationId = messageHelper.bob, allMessages[messageHelper.bob]!!.takeLast(5).map { it.recipientId to it.timetamp }, isFullDelete = true)
+    )
+
+    // THEN
+    threadIds.forEach {
+      SignalDatabase.messages.getMessageCountForThread(it) assertIs 0
+      SignalDatabase.threads.getThreadRecord(it) assertIs null
+    }
+  }
+
+  @Test
+  fun singleLocalOnlyConversation() {
+    // GIVEN
+    val alice = Recipient.resolved(messageHelper.alice)
+
+    // Insert placeholder message to prevent early thread update deletes
+    val oneToOnePlaceHolderMessage = messageHelper.outgoingText().messageId
+
+    val aliceThreadId = SignalDatabase.threads.getOrCreateThreadIdFor(messageHelper.alice, isGroup = false)
+
+    IdentityUtil.markIdentityVerified(harness.context, alice, true, false)
+    SignalDatabase.calls.insertOneToOneCall(1, System.currentTimeMillis(), alice.id, CallTable.Type.AUDIO_CALL, CallTable.Direction.OUTGOING, CallTable.Event.ACCEPTED)
+    SignalDatabase.messages.insertProfileNameChangeMessages(alice, "new name", "previous name")
+    SignalDatabase.messages.markAsSentFailed(messageHelper.outgoingText().messageId)
+
+    // Cleanup and confirm setup
+    SignalDatabase.messages.deleteMessage(messageId = oneToOnePlaceHolderMessage, threadId = aliceThreadId, notify = false, updateThread = false)
+    SignalDatabase.messages.getMessageCountForThread(aliceThreadId) assert greaterThan(0)
+
+    // WHEN
+    messageHelper.syncDeleteForMeLocalOnlyConversation(messageHelper.alice)
+
+    // THEN
+    SignalDatabase.messages.getMessageCountForThread(aliceThreadId) assertIs 0
+    SignalDatabase.threads.getThreadRecord(aliceThreadId) assertIs null
+  }
+
+  @Ignore("counts are consistent for some reason")
+  @Test
+  fun multipleLocalOnlyConversation() {
+    // GIVEN
+    val alice = Recipient.resolved(messageHelper.alice)
+
+    // Insert placeholder messages in group and alice thread to prevent early thread update deletes
+    val groupPlaceholderMessage = messageHelper.outgoingText(conversationId = messageHelper.group.recipientId).messageId
+    val oneToOnePlaceHolderMessage = messageHelper.outgoingText().messageId
+
+    val aliceThreadId = SignalDatabase.threads.getOrCreateThreadIdFor(messageHelper.alice, isGroup = false)
+    val groupThreadId = SignalDatabase.threads.getOrCreateThreadIdFor(messageHelper.group.recipientId, isGroup = true)
+
+    // Identity changes
+    IdentityUtil.markIdentityVerified(harness.context, alice, true, true)
+    IdentityUtil.markIdentityVerified(harness.context, alice, false, true)
+    IdentityUtil.markIdentityVerified(harness.context, alice, true, false)
+    IdentityUtil.markIdentityVerified(harness.context, alice, false, false)
+
+    IdentityUtil.markIdentityUpdate(harness.context, alice.id)
+
+    // Calls
+    SignalDatabase.calls.insertOneToOneCall(1, System.currentTimeMillis(), alice.id, CallTable.Type.AUDIO_CALL, CallTable.Direction.OUTGOING, CallTable.Event.ACCEPTED)
+    SignalDatabase.calls.insertOneToOneCall(2, System.currentTimeMillis(), alice.id, CallTable.Type.VIDEO_CALL, CallTable.Direction.INCOMING, CallTable.Event.MISSED)
+    SignalDatabase.calls.insertOneToOneCall(3, System.currentTimeMillis(), alice.id, CallTable.Type.AUDIO_CALL, CallTable.Direction.INCOMING, CallTable.Event.MISSED_NOTIFICATION_PROFILE)
+
+    SignalDatabase.calls.insertAcceptedGroupCall(4, messageHelper.group.recipientId, CallTable.Direction.INCOMING, System.currentTimeMillis())
+    SignalDatabase.calls.insertDeclinedGroupCall(5, messageHelper.group.recipientId, System.currentTimeMillis())
+
+    // Detected changes
+    SignalDatabase.messages.insertProfileNameChangeMessages(alice, "new name", "previous name")
+    SignalDatabase.messages.insertLearnedProfileNameChangeMessage(alice, null, "username.42")
+    SignalDatabase.messages.insertNumberChangeMessages(alice.id)
+    SignalDatabase.messages.insertSmsExportMessage(alice.id, SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!)
+    SignalDatabase.messages.insertSessionSwitchoverEvent(alice.id, aliceThreadId, SessionSwitchoverEvent())
+
+    // Sent failed
+    SignalDatabase.messages.markAsSending(messageHelper.outgoingText().messageId)
+    SignalDatabase.messages.markAsSentFailed(messageHelper.outgoingText().messageId)
+    messageHelper.outgoingText().let {
+      SignalDatabase.messages.markAsSending(it.messageId)
+      SignalDatabase.messages.markAsRateLimited(it.messageId)
+    }
+
+    // Group change
+    messageHelper.outgoingGroupChange()
+
+    // Cleanup and confirm setup
+    SignalDatabase.messages.deleteMessage(messageId = oneToOnePlaceHolderMessage, threadId = aliceThreadId, notify = false, updateThread = false)
+    SignalDatabase.messages.deleteMessage(messageId = groupPlaceholderMessage, threadId = aliceThreadId, notify = false, updateThread = false)
+
+    SignalDatabase.rawDatabase.withinTransaction {
+      SignalDatabase.messages.getMessageCountForThread(aliceThreadId) assertIs 16
+      SignalDatabase.messages.getMessageCountForThread(groupThreadId) assertIs 10
+    }
+
+    // WHEN
+    messageHelper.syncDeleteForMeLocalOnlyConversation(messageHelper.alice, messageHelper.group.recipientId)
+
+    // THEN
+    SignalDatabase.messages.getMessageCountForThread(aliceThreadId) assertIs 0
+    SignalDatabase.threads.getThreadRecord(aliceThreadId) assertIs null
+
+    SignalDatabase.messages.getMessageCountForThread(groupThreadId) assertIs 0
+    SignalDatabase.threads.getThreadRecord(groupThreadId) assertIs null
+  }
+
+  @Test
+  fun singleLocalOnlyConversationHasAddressable() {
+    // GIVEN
+    val messages = mutableListOf<MessageTable.SyncMessageId>()
+
+    for (i in 0 until 10) {
+      messages += MessageTable.SyncMessageId(messageHelper.alice, messageHelper.incomingText().timestamp)
+      messages += MessageTable.SyncMessageId(harness.self.id, messageHelper.outgoingText().timestamp)
+    }
+
+    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
+    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 20
+
+    // WHEN
+    messageHelper.syncDeleteForMeLocalOnlyConversation(messageHelper.alice)
+
+    // THEN
+    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 20
+    SignalDatabase.threads.getThreadRecord(threadId).assertIsNotNull()
+
+    harness.inMemoryLogger.flush()
+    harness.inMemoryLogger.entries().filter { it.message?.contains("Thread is not local only") == true }.size assertIs 1
+  }
+
+  @Test
+  fun singleAttachmentDeletes() {
+    // GIVEN
+    val message1 = messageHelper.outgoingText { message ->
+      message.copy(
+        attachments = listOf(
+          messageHelper.outgoingAttachment(byteArrayOf(1, 2, 3)),
+          messageHelper.outgoingAttachment(byteArrayOf(2, 3, 4), null),
+          messageHelper.outgoingAttachment(byteArrayOf(5, 6, 7), null),
+          messageHelper.outgoingAttachment(byteArrayOf(10, 11, 12))
+        )
+      )
+    }
+
+    var attachments = SignalDatabase.attachments.getAttachmentsForMessage(message1.messageId)
+    attachments assertIsSize 4
+
+    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
+    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 1
+
+    // Has all three
+    SignalDatabase.attachments.finalizeAttachmentAfterUpload(
+      id = attachments[0].attachmentId,
+      attachment = attachments[0].copy(digest = byteArrayOf(attachments[0].attachmentId.id.toByte())),
+      uploadTimestamp = message1.timestamp + 1
+    )
+
+    // Missing uuid and digest
+    SignalDatabase.attachments.finalizeAttachmentAfterUpload(
+      id = attachments[1].attachmentId,
+      attachment = attachments[1],
+      uploadTimestamp = message1.timestamp + 1
+    )
+
+    // Missing uuid and plain text
+    SignalDatabase.attachments.finalizeAttachmentAfterUpload(
+      id = attachments[2].attachmentId,
+      attachment = attachments[2].copy(digest = byteArrayOf(attachments[2].attachmentId.id.toByte())),
+      uploadTimestamp = message1.timestamp + 1
+    )
+    SignalDatabase.rawDatabase.update(AttachmentTable.TABLE_NAME).values(AttachmentTable.DATA_HASH_END to null).where("${AttachmentTable.ID} = ?", attachments[2].attachmentId).run()
+
+    // Different has all three
+    SignalDatabase.attachments.finalizeAttachmentAfterUpload(
+      id = attachments[3].attachmentId,
+      attachment = attachments[3].copy(digest = byteArrayOf(attachments[3].attachmentId.id.toByte())),
+      uploadTimestamp = message1.timestamp + 1
+    )
+
+    attachments = SignalDatabase.attachments.getAttachmentsForMessage(message1.messageId)
+
+    // WHEN
+    messageHelper.syncDeleteForMeAttachment(
+      conversationId = messageHelper.alice,
+      message = message1.author to message1.timestamp,
+      attachments[0].uuid,
+      attachments[0].remoteDigest,
+      attachments[0].dataHash
+    )
+
+    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 1
+    var updatedAttachments = SignalDatabase.attachments.getAttachmentsForMessage(message1.messageId)
+    updatedAttachments assertIsSize 3
+    updatedAttachments.forEach { it.attachmentId assertIsNot attachments[0].attachmentId }
+
+    messageHelper.syncDeleteForMeAttachment(
+      conversationId = messageHelper.alice,
+      message = message1.author to message1.timestamp,
+      attachments[1].uuid,
+      attachments[1].remoteDigest,
+      attachments[1].dataHash
+    )
+
+    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 1
+    updatedAttachments = SignalDatabase.attachments.getAttachmentsForMessage(message1.messageId)
+    updatedAttachments assertIsSize 2
+    updatedAttachments.forEach { it.attachmentId assertIsNot attachments[1].attachmentId }
+
+    messageHelper.syncDeleteForMeAttachment(
+      conversationId = messageHelper.alice,
+      message = message1.author to message1.timestamp,
+      attachments[2].uuid,
+      attachments[2].remoteDigest,
+      attachments[2].dataHash
+    )
+
+    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 1
+    updatedAttachments = SignalDatabase.attachments.getAttachmentsForMessage(message1.messageId)
+    updatedAttachments assertIsSize 1
+    updatedAttachments.forEach { it.attachmentId assertIsNot attachments[2].attachmentId }
+
+    messageHelper.syncDeleteForMeAttachment(
+      conversationId = messageHelper.alice,
+      message = message1.author to message1.timestamp,
+      attachments[3].uuid,
+      attachments[3].remoteDigest,
+      attachments[3].dataHash
+    )
+
+    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 0
+    updatedAttachments = SignalDatabase.attachments.getAttachmentsForMessage(message1.messageId)
+    updatedAttachments assertIsSize 0
+
+    SignalDatabase.threads.getThreadRecord(threadId) assertIs null
+  }
+
+  private fun DatabaseAttachment.copy(
+    uuid: UUID? = this.uuid,
+    digest: ByteArray? = this.remoteDigest
+  ): Attachment {
+    return DatabaseAttachment(
+      attachmentId = this.attachmentId,
+      mmsId = this.mmsId,
+      hasData = this.hasData,
+      hasThumbnail = false,
+      hasArchiveThumbnail = false,
+      contentType = this.contentType,
+      transferProgress = this.transferState,
+      size = this.size,
+      fileName = this.fileName,
+      cdn = this.cdn,
+      location = this.remoteLocation,
+      key = this.remoteKey,
+      digest = digest,
+      incrementalDigest = this.incrementalDigest,
+      incrementalMacChunkSize = this.incrementalMacChunkSize,
+      fastPreflightId = this.fastPreflightId,
+      voiceNote = this.voiceNote,
+      borderless = this.borderless,
+      videoGif = this.videoGif,
+      width = this.width,
+      height = this.height,
+      quote = this.quote,
+      caption = this.caption,
+      stickerLocator = this.stickerLocator,
+      blurHash = this.blurHash,
+      audioHash = this.audioHash,
+      transformProperties = this.transformProperties,
+      displayOrder = this.displayOrder,
+      uploadTimestamp = this.uploadTimestamp,
+      dataHash = this.dataHash,
+      archiveCdn = this.archiveCdn,
+      archiveThumbnailCdn = this.archiveThumbnailCdn,
+      archiveMediaName = this.archiveMediaName,
+      archiveMediaId = this.archiveMediaId,
+      thumbnailRestoreState = this.thumbnailRestoreState,
+      uuid = uuid
+    )
+  }
+}
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/migrations/SubscriberIdMigrationJobTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/migrations/SubscriberIdMigrationJobTest.kt
new file mode 100644
index 0000000000..3eed9ac9d7
--- /dev/null
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/migrations/SubscriberIdMigrationJobTest.kt
@@ -0,0 +1,55 @@
+package org.thoughtcrime.securesms.migrations
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.util.count
+import org.signal.core.util.readToSingleInt
+import org.signal.donations.PaymentSourceType
+import org.thoughtcrime.securesms.database.InAppPaymentSubscriberTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.testing.assertIs
+import org.thoughtcrime.securesms.testing.assertIsNotNull
+import org.whispersystems.signalservice.api.subscriptions.SubscriberId
+import java.util.Currency
+
+@RunWith(AndroidJUnit4::class)
+class SubscriberIdMigrationJobTest {
+
+  private val testSubject = SubscriberIdMigrationJob()
+
+  @Test
+  fun givenNoSubscriber_whenIRunSubscriberIdMigrationJob_thenIExpectNoDatabaseEntries() {
+    testSubject.run()
+
+    val actual = SignalDatabase.inAppPaymentSubscribers.readableDatabase.count()
+      .from(InAppPaymentSubscriberTable.TABLE_NAME)
+      .run()
+      .readToSingleInt()
+
+    actual assertIs 0
+  }
+
+  @Test
+  fun givenUSDSubscriber_whenIRunSubscriberIdMigrationJob_thenIExpectASingleEntry() {
+    val subscriberId = SubscriberId.generate()
+    SignalStore.inAppPayments.setSubscriberCurrency(Currency.getInstance("USD"), InAppPaymentSubscriberRecord.Type.DONATION)
+    SignalStore.inAppPayments.setSubscriber("USD", subscriberId)
+    SignalStore.inAppPayments.setSubscriptionPaymentSourceType(PaymentSourceType.PayPal)
+    SignalStore.inAppPayments.shouldCancelSubscriptionBeforeNextSubscribeAttempt = true
+
+    testSubject.run()
+
+    val actual = SignalDatabase.inAppPaymentSubscribers.getByCurrencyCode("USD", InAppPaymentSubscriberRecord.Type.DONATION)
+
+    actual.assertIsNotNull()
+    actual!!.subscriberId.bytes assertIs subscriberId.bytes
+    actual.paymentMethodType assertIs InAppPaymentData.PaymentMethodType.PAYPAL
+    actual.requiresCancel assertIs true
+    actual.currency assertIs Currency.getInstance("USD")
+    actual.type assertIs InAppPaymentSubscriberRecord.Type.DONATION
+  }
+}
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/storage/ContactRecordProcessorTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/storage/ContactRecordProcessorTest.kt
index e33b739bab..c986ef8c55 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/storage/ContactRecordProcessorTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/storage/ContactRecordProcessorTest.kt
@@ -24,9 +24,9 @@ class ContactRecordProcessorTest {
 
   @Before
   fun setup() {
-    SignalStore.account().setE164(E164_SELF)
-    SignalStore.account().setAci(ACI_SELF)
-    SignalStore.account().setPni(PNI_SELF)
+    SignalStore.account.setE164(E164_SELF)
+    SignalStore.account.setAci(ACI_SELF)
+    SignalStore.account.setPni(PNI_SELF)
   }
 
   @Test
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/AliceClient.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/AliceClient.kt
index 04d09283de..b429745306 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/AliceClient.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/AliceClient.kt
@@ -3,8 +3,7 @@ package org.thoughtcrime.securesms.testing
 import org.signal.core.util.logging.Log
 import org.signal.libsignal.protocol.ecc.ECKeyPair
 import org.signal.libsignal.zkgroup.profiles.ProfileKey
-import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.messages.protocol.BufferedProtocolStore
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -30,14 +29,14 @@ class AliceClient(val serviceId: ServiceId, val e164: String, val trustRoot: ECK
     uuid = serviceId.rawUuid,
     e164 = e164,
     deviceId = 1,
-    identityKey = SignalStore.account().aciIdentityKey.publicKey.publicKey,
+    identityKey = SignalStore.account.aciIdentityKey.publicKey.publicKey,
     expires = 31337
   )
 
   fun process(envelope: Envelope, serverDeliveredTimestamp: Long) {
     val start = System.currentTimeMillis()
     val bufferedStore = BufferedProtocolStore.create()
-    ApplicationDependencies.getIncomingMessageObserver()
+    AppDependencies.incomingMessageObserver
       .processEnvelope(bufferedStore, envelope, serverDeliveredTimestamp)
       ?.mapNotNull { it.run() }
       ?.forEach { it.enqueue() }
@@ -48,9 +47,9 @@ class AliceClient(val serviceId: ServiceId, val e164: String, val trustRoot: ECK
   }
 
   fun encrypt(now: Long, destination: Recipient): Envelope {
-    return ApplicationDependencies.getSignalServiceMessageSender().getEncryptedMessage(
+    return AppDependencies.signalServiceMessageSender.getEncryptedMessage(
       SignalServiceAddress(destination.requireServiceId(), destination.requireE164()),
-      FakeClientHelpers.getTargetUnidentifiedAccess(ProfileKeyUtil.getSelfProfileKey(), ProfileKey(destination.profileKey), aliceSenderCertificate),
+      FakeClientHelpers.getSealedSenderAccess(ProfileKey(destination.profileKey), aliceSenderCertificate),
       1,
       FakeClientHelpers.encryptedTextMessage(now),
       false
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/BobClient.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/BobClient.kt
index b79713ff46..3eb4d602be 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/BobClient.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/BobClient.kt
@@ -17,7 +17,7 @@ import org.signal.libsignal.protocol.state.SignedPreKeyRecord
 import org.signal.libsignal.protocol.util.KeyHelper
 import org.signal.libsignal.zkgroup.profiles.ProfileKey
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil
+import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil
 import org.thoughtcrime.securesms.database.OneTimePreKeyTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.SignedPreKeyTable
@@ -25,14 +25,13 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.testing.FakeClientHelpers.toEnvelope
 import org.whispersystems.signalservice.api.SignalServiceAccountDataStore
 import org.whispersystems.signalservice.api.SignalSessionLock
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess
 import org.whispersystems.signalservice.api.crypto.SignalServiceCipher
 import org.whispersystems.signalservice.api.crypto.SignalSessionBuilder
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess
 import org.whispersystems.signalservice.api.push.DistributionId
 import org.whispersystems.signalservice.api.push.ServiceId
 import org.whispersystems.signalservice.api.push.SignalServiceAddress
 import org.whispersystems.signalservice.internal.push.Envelope
-import java.util.Optional
 import java.util.UUID
 import java.util.concurrent.locks.ReentrantLock
 
@@ -75,12 +74,12 @@ class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair:
   }
 
   fun decrypt(envelope: Envelope, serverDeliveredTimestamp: Long) {
-    val cipher = SignalServiceCipher(serviceAddress, 1, aciStore, sessionLock, UnidentifiedAccessUtil.getCertificateValidator())
+    val cipher = SignalServiceCipher(serviceAddress, 1, aciStore, sessionLock, SealedSenderAccessUtil.getCertificateValidator())
     cipher.decrypt(envelope, serverDeliveredTimestamp)
   }
 
   private fun getAliceServiceId(): ServiceId {
-    return SignalStore.account().requireAci()
+    return SignalStore.account.requireAci()
   }
 
   private fun getAlicePreKeyBundle(): PreKeyBundle {
@@ -103,7 +102,7 @@ class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair:
     val selfSignedPreKeyRecord = SignalDatabase.signedPreKeys.get(getAliceServiceId(), selfSignedPreKeyId)!!
 
     return PreKeyBundle(
-      SignalStore.account().registrationId,
+      SignalStore.account.registrationId,
       1,
       selfPreKeyId,
       selfPreKeyRecord.keyPair.publicKey,
@@ -115,19 +114,19 @@ class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair:
   }
 
   private fun getAliceProtocolAddress(): SignalProtocolAddress {
-    return SignalProtocolAddress(SignalStore.account().requireAci().toString(), 1)
+    return SignalProtocolAddress(SignalStore.account.requireAci().toString(), 1)
   }
 
   private fun getAlicePublicKey(): IdentityKey {
-    return SignalStore.account().aciIdentityKey.publicKey
+    return SignalStore.account.aciIdentityKey.publicKey
   }
 
   private fun getAliceProfileKey(): ProfileKey {
     return ProfileKeyUtil.getSelfProfileKey()
   }
 
-  private fun getAliceUnidentifiedAccess(): Optional<UnidentifiedAccess> {
-    return FakeClientHelpers.getTargetUnidentifiedAccess(profileKey, getAliceProfileKey(), senderCertificate)
+  private fun getAliceUnidentifiedAccess(): SealedSenderAccess? {
+    return FakeClientHelpers.getSealedSenderAccess(getAliceProfileKey(), senderCertificate)
   }
 
   private class BobSignalServiceAccountDataStore(private val registrationId: Int, private val identityKeyPair: IdentityKeyPair) : SignalServiceAccountDataStore {
@@ -139,10 +138,12 @@ class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair:
     override fun isTrustedIdentity(address: SignalProtocolAddress?, identityKey: IdentityKey?, direction: IdentityKeyStore.Direction?): Boolean = true
     override fun loadSession(address: SignalProtocolAddress?): SessionRecord = aliceSessionRecord ?: SessionRecord()
     override fun saveIdentity(address: SignalProtocolAddress?, identityKey: IdentityKey?): Boolean = false
-    override fun storeSession(address: SignalProtocolAddress?, record: SessionRecord?) { aliceSessionRecord = record }
+    override fun storeSession(address: SignalProtocolAddress?, record: SessionRecord?) {
+      aliceSessionRecord = record
+    }
     override fun getSubDeviceSessions(name: String?): List<Int> = emptyList()
     override fun containsSession(address: SignalProtocolAddress?): Boolean = aliceSessionRecord != null
-    override fun getIdentity(address: SignalProtocolAddress?): IdentityKey = SignalStore.account().aciIdentityKey.publicKey
+    override fun getIdentity(address: SignalProtocolAddress?): IdentityKey = SignalStore.account.aciIdentityKey.publicKey
     override fun loadPreKey(preKeyId: Int): PreKeyRecord = throw UnsupportedOperationException()
     override fun storePreKey(preKeyId: Int, record: PreKeyRecord?) = throw UnsupportedOperationException()
     override fun containsPreKey(preKeyId: Int): Boolean = throw UnsupportedOperationException()
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/FakeClientHelpers.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/FakeClientHelpers.kt
index d18eb79922..903c530611 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/FakeClientHelpers.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/FakeClientHelpers.kt
@@ -14,8 +14,8 @@ import org.signal.libsignal.zkgroup.profiles.ProfileKey
 import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.buildWith
 import org.whispersystems.signalservice.api.crypto.ContentHint
 import org.whispersystems.signalservice.api.crypto.EnvelopeContent
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair
 import org.whispersystems.signalservice.api.push.ServiceId
 import org.whispersystems.signalservice.internal.push.Content
 import org.whispersystems.signalservice.internal.push.DataMessage
@@ -46,11 +46,10 @@ object FakeClientHelpers {
     }
   }
 
-  fun getTargetUnidentifiedAccess(myProfileKey: ProfileKey, theirProfileKey: ProfileKey, senderCertificate: SenderCertificate): Optional<UnidentifiedAccess> {
-    val selfUnidentifiedAccessKey = UnidentifiedAccess.deriveAccessKeyFrom(myProfileKey)
-    val themUnidentifiedAccessKey = UnidentifiedAccess.deriveAccessKeyFrom(theirProfileKey)
+  fun getSealedSenderAccess(theirProfileKey: ProfileKey, senderCertificate: SenderCertificate): SealedSenderAccess? {
+    val themUnidentifiedAccessKey = UnidentifiedAccess(UnidentifiedAccess.deriveAccessKeyFrom(theirProfileKey), senderCertificate.serialized, false)
 
-    return UnidentifiedAccessPair(UnidentifiedAccess(selfUnidentifiedAccessKey, senderCertificate.serialized, false), UnidentifiedAccess(themUnidentifiedAccessKey, senderCertificate.serialized, false)).targetUnidentifiedAccess
+    return SealedSenderAccess.forIndividual(themUnidentifiedAccessKey)
   }
 
   fun encryptedTextMessage(now: Long, message: String = "Test body message"): EnvelopeContent {
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/GroupTestingUtils.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/GroupTestingUtils.kt
index 0c0d366194..cecba043d0 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/GroupTestingUtils.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/GroupTestingUtils.kt
@@ -33,7 +33,7 @@ object GroupTestingUtils {
       .title(MessageContentFuzzer.string())
       .build()
 
-    val groupId = SignalDatabase.groups.create(groupMasterKey, decryptedGroupState)!!
+    val groupId = SignalDatabase.groups.create(groupMasterKey, decryptedGroupState, null)!!
     val groupRecipientId = SignalDatabase.recipients.getOrInsertFromGroupId(groupId)
     SignalDatabase.recipients.setProfileSharing(groupRecipientId, true)
 
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/MessageContentFuzzer.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/MessageContentFuzzer.kt
index 38a366315b..35ace0612a 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/MessageContentFuzzer.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/MessageContentFuzzer.kt
@@ -2,12 +2,15 @@ package org.thoughtcrime.securesms.testing
 
 import okio.ByteString
 import okio.ByteString.Companion.toByteString
+import org.signal.core.util.Base64
+import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.buildWith
 import org.thoughtcrime.securesms.messages.TestMessage
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.whispersystems.signalservice.api.crypto.EnvelopeMetadata
+import org.whispersystems.signalservice.api.util.UuidUtil
 import org.whispersystems.signalservice.internal.push.AttachmentPointer
 import org.whispersystems.signalservice.internal.push.BodyRange
 import org.whispersystems.signalservice.internal.push.Content
@@ -61,13 +64,13 @@ object MessageContentFuzzer {
    * - An expire timer value
    * - Bold style body ranges
    */
-  fun fuzzTextMessage(sentTimestamp: Long? = null, groupContextV2: GroupContextV2? = null): Content {
+  fun fuzzTextMessage(sentTimestamp: Long? = null, groupContextV2: GroupContextV2? = null, allowExpireTimeChanges: Boolean = true): Content {
     return Content.Builder()
       .dataMessage(
         DataMessage.Builder().buildWith {
           timestamp = sentTimestamp
           body = string()
-          if (random.nextBoolean()) {
+          if (allowExpireTimeChanges && random.nextBoolean()) {
             expireTimer = random.nextInt(0..28.days.inWholeSeconds.toInt())
           }
           if (random.nextBoolean()) {
@@ -150,6 +153,121 @@ object MessageContentFuzzer {
       ).build()
   }
 
+  fun syncDeleteForMeMessage(allDeletes: List<DeleteForMeSync>): Content {
+    return Content
+      .Builder()
+      .syncMessage(
+        SyncMessage(
+          deleteForMe = SyncMessage.DeleteForMe(
+            messageDeletes = allDeletes.map { (conversationId, conversationDeletes) ->
+              val conversation = Recipient.resolved(conversationId)
+              SyncMessage.DeleteForMe.MessageDeletes(
+                conversation = if (conversation.isGroup) {
+                  SyncMessage.DeleteForMe.ConversationIdentifier(threadGroupId = conversation.requireGroupId().decodedId.toByteString())
+                } else {
+                  SyncMessage.DeleteForMe.ConversationIdentifier(threadServiceId = conversation.requireAci().toString())
+                },
+
+                messages = conversationDeletes.map { (author, timestamp) ->
+                  SyncMessage.DeleteForMe.AddressableMessage(
+                    authorServiceId = Recipient.resolved(author).requireAci().toString(),
+                    sentTimestamp = timestamp
+                  )
+                }
+              )
+            }
+          )
+        )
+      ).build()
+  }
+
+  fun syncDeleteForMeConversation(allDeletes: List<DeleteForMeSync>): Content {
+    return Content
+      .Builder()
+      .syncMessage(
+        SyncMessage(
+          deleteForMe = SyncMessage.DeleteForMe(
+            conversationDeletes = allDeletes.map { delete ->
+              val conversation = Recipient.resolved(delete.conversationId)
+              SyncMessage.DeleteForMe.ConversationDelete(
+                conversation = if (conversation.isGroup) {
+                  SyncMessage.DeleteForMe.ConversationIdentifier(threadGroupId = conversation.requireGroupId().decodedId.toByteString())
+                } else {
+                  SyncMessage.DeleteForMe.ConversationIdentifier(threadServiceId = conversation.requireAci().toString())
+                },
+
+                mostRecentMessages = delete.messages.map { (author, timestamp) ->
+                  SyncMessage.DeleteForMe.AddressableMessage(
+                    authorServiceId = Recipient.resolved(author).requireAci().toString(),
+                    sentTimestamp = timestamp
+                  )
+                },
+
+                mostRecentNonExpiringMessages = delete.nonExpiringMessages.map { (author, timestamp) ->
+                  SyncMessage.DeleteForMe.AddressableMessage(
+                    authorServiceId = Recipient.resolved(author).requireAci().toString(),
+                    sentTimestamp = timestamp
+                  )
+                },
+
+                isFullDelete = delete.isFullDelete
+              )
+            }
+          )
+        )
+      ).build()
+  }
+
+  fun syncDeleteForMeLocalOnlyConversation(conversations: List<RecipientId>): Content {
+    return Content
+      .Builder()
+      .syncMessage(
+        SyncMessage(
+          deleteForMe = SyncMessage.DeleteForMe(
+            localOnlyConversationDeletes = conversations.map { conversationId ->
+              val conversation = Recipient.resolved(conversationId)
+              SyncMessage.DeleteForMe.LocalOnlyConversationDelete(
+                conversation = if (conversation.isGroup) {
+                  SyncMessage.DeleteForMe.ConversationIdentifier(threadGroupId = conversation.requireGroupId().decodedId.toByteString())
+                } else {
+                  SyncMessage.DeleteForMe.ConversationIdentifier(threadServiceId = conversation.requireAci().toString())
+                }
+              )
+            }
+          )
+        )
+      ).build()
+  }
+
+  fun syncDeleteForMeAttachment(conversationId: RecipientId, message: Pair<RecipientId, Long>, uuid: UUID?, digest: ByteArray?, plainTextHash: String?): Content {
+    val conversation = Recipient.resolved(conversationId)
+
+    return Content
+      .Builder()
+      .syncMessage(
+        SyncMessage(
+          deleteForMe = SyncMessage.DeleteForMe(
+            attachmentDeletes = listOf(
+              SyncMessage.DeleteForMe.AttachmentDelete(
+                conversation = if (conversation.isGroup) {
+                  SyncMessage.DeleteForMe.ConversationIdentifier(threadGroupId = conversation.requireGroupId().decodedId.toByteString())
+                } else {
+                  SyncMessage.DeleteForMe.ConversationIdentifier(threadServiceId = conversation.requireAci().toString())
+                },
+                targetMessage = SyncMessage.DeleteForMe.AddressableMessage(
+                  authorServiceId = Recipient.resolved(message.first).requireAci().toString(),
+                  sentTimestamp = message.second
+                ),
+                uuid = uuid?.let { UuidUtil.toByteString(it) },
+                fallbackDigest = digest?.toByteString(),
+                fallbackPlaintextHash = plainTextHash?.let { Base64.decodeOrNull(it)?.toByteString() }
+              )
+            )
+          )
+        )
+      ).build()
+  }
+
   /**
    * Create a random media message that may be:
    * - A text body
@@ -278,7 +396,7 @@ object MessageContentFuzzer {
       caption = string(allowNullString = true)
       blurHash = string()
       uploadTimestamp = random.nextLong()
-      cdnNumber = 1
+      cdnNumber = 2
 
       build()
     }
@@ -290,4 +408,14 @@ object MessageContentFuzzer {
   fun fuzzServerDeliveredTimestamp(envelopeTimestamp: Long): Long {
     return envelopeTimestamp + 10
   }
+
+  data class DeleteForMeSync(
+    val conversationId: RecipientId,
+    val messages: List<Pair<RecipientId, Long>>,
+    val nonExpiringMessages: List<Pair<RecipientId, Long>> = emptyList(),
+    val isFullDelete: Boolean = true,
+    val attachments: List<Pair<Long, AttachmentTable.SyncAttachmentId>> = emptyList()
+  ) {
+    constructor(conversationId: RecipientId, vararg messages: Pair<RecipientId, Long>) : this(conversationId, messages.toList())
+  }
 }
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/MockProvider.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/MockProvider.kt
index 4175150446..daca791f17 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/MockProvider.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/MockProvider.kt
@@ -31,7 +31,7 @@ object MockProvider {
 
   val lockedFailure = PushServiceSocket.RegistrationLockFailure().apply {
     svr1Credentials = AuthCredentials.create("username", "password")
-    svr2Credentials = null
+    svr2Credentials = AuthCredentials.create("username", "password")
   }
 
   val primaryOnlyDeviceList = DeviceInfoList().apply {
@@ -68,7 +68,7 @@ object MockProvider {
     }
   }
 
-  fun createPreKeyResponse(identity: IdentityKeyPair = SignalStore.account().aciIdentityKey, deviceId: Int): PreKeyResponse {
+  fun createPreKeyResponse(identity: IdentityKeyPair = SignalStore.account.aciIdentityKey, deviceId: Int): PreKeyResponse {
     val signedPreKeyRecord = PreKeyUtil.generateSignedPreKey(SecureRandom().nextInt(Medium.MAX_VALUE), identity.privateKey)
     val oneTimePreKey = PreKeyRecord(SecureRandom().nextInt(Medium.MAX_VALUE), Curve.generateKeyPair())
 
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/ResponseMocking.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/ResponseMocking.kt
index 13268521da..3d3ca25567 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/ResponseMocking.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/ResponseMocking.kt
@@ -55,5 +55,5 @@ inline fun <reified T> RecordedRequest.parsedRequestBody(): T {
 }
 
 private fun defaultRequestPredicate(verb: String, path: String, predicate: RequestPredicate = { true }): RequestPredicate = { request ->
-  request.method == verb && request.path.startsWith("/$path") && predicate(request)
+  request.method == verb && request.path?.startsWith("/$path") == true && predicate(request)
 }
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt
index c827a0f82a..153ee24c1b 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt
@@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
 import org.thoughtcrime.securesms.database.IdentityTable
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.profiles.ProfileName
@@ -45,7 +45,7 @@ import java.util.UUID
  */
 class SignalActivityRule(private val othersCount: Int = 4, private val createGroup: Boolean = false) : ExternalResource() {
 
-  val application: Application = ApplicationDependencies.getApplication()
+  val application: Application = AppDependencies.application
 
   lateinit var context: Context
     private set
@@ -87,8 +87,8 @@ class SignalActivityRule(private val othersCount: Int = 4, private val createGro
     SecurePreferenceManager.getSecurePreferences(application).edit().putBoolean("pref_prompted_push_registration", true).commit()
     // MOLLY: Test runner SignalTestRunner initializes MasterSecret
 
-    SignalStore.account().generateAciIdentityKeyIfNecessary()
-    SignalStore.account().generatePniIdentityKeyIfNecessary()
+    SignalStore.account.generateAciIdentityKeyIfNecessary()
+    SignalStore.account.generatePniIdentityKeyIfNecessary()
 
     val registrationRepository = RegistrationRepository(application)
 
@@ -108,19 +108,19 @@ class SignalActivityRule(private val othersCount: Int = 4, private val createGro
         verifyAccountResponse = VerifyAccountResponse(UUID.randomUUID().toString(), UUID.randomUUID().toString(), false),
         masterKey = null,
         pin = null,
-        aciPreKeyCollection = RegistrationRepository.generateSignedAndLastResortPreKeys(SignalStore.account().aciIdentityKey, SignalStore.account().aciPreKeys),
-        pniPreKeyCollection = RegistrationRepository.generateSignedAndLastResortPreKeys(SignalStore.account().aciIdentityKey, SignalStore.account().pniPreKeys)
+        aciPreKeyCollection = RegistrationRepository.generateSignedAndLastResortPreKeys(SignalStore.account.aciIdentityKey, SignalStore.account.aciPreKeys),
+        pniPreKeyCollection = RegistrationRepository.generateSignedAndLastResortPreKeys(SignalStore.account.aciIdentityKey, SignalStore.account.pniPreKeys)
       ),
       false
     ).blockingGet()
 
     ServiceResponseProcessor.DefaultProcessor(response).resultOrThrow
 
-    SignalStore.svr().optOut()
+    SignalStore.svr.optOut()
     RegistrationUtil.maybeMarkRegistrationComplete()
     SignalDatabase.recipients.setProfileName(Recipient.self().id, ProfileName.fromParts("Tester", "McTesterson"))
 
-    SignalStore.settings().isMessageNotificationsEnabled = false
+    SignalStore.settings.isMessageNotificationsEnabled = false
 
     return Recipient.self()
   }
@@ -138,11 +138,11 @@ class SignalActivityRule(private val othersCount: Int = 4, private val createGro
       val recipientId = RecipientId.from(SignalServiceAddress(aci, "+15555551%03d".format(i)))
       SignalDatabase.recipients.setProfileName(recipientId, ProfileName.fromParts("Buddy", "#$i"))
       SignalDatabase.recipients.setProfileKeyIfAbsent(recipientId, ProfileKeyUtil.createNew())
-      SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true))
+      SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, false))
       SignalDatabase.recipients.setProfileSharing(recipientId, true)
       SignalDatabase.recipients.markRegistered(recipientId, aci)
       val otherIdentity = IdentityKeyUtil.generateIdentityKeyPair()
-      ApplicationDependencies.getProtocolStore().aci().saveIdentity(SignalProtocolAddress(aci.toString(), 0), otherIdentity.publicKey)
+      AppDependencies.protocolStore.aci().saveIdentity(SignalProtocolAddress(aci.toString(), 0), otherIdentity.publicKey)
       others += recipientId
       othersKeys += otherIdentity
     }
@@ -155,14 +155,14 @@ class SignalActivityRule(private val othersCount: Int = 4, private val createGro
   }
 
   fun changeIdentityKey(recipient: Recipient, identityKey: IdentityKey = IdentityKeyUtil.generateIdentityKeyPair().publicKey) {
-    ApplicationDependencies.getProtocolStore().aci().saveIdentity(SignalProtocolAddress(recipient.requireServiceId().toString(), 0), identityKey)
+    AppDependencies.protocolStore.aci().saveIdentity(SignalProtocolAddress(recipient.requireServiceId().toString(), 0), identityKey)
   }
 
   fun getIdentity(recipient: Recipient): IdentityKey {
-    return ApplicationDependencies.getProtocolStore().aci().identities().getIdentity(SignalProtocolAddress(recipient.requireServiceId().toString(), 0))
+    return AppDependencies.protocolStore.aci().identities().getIdentity(SignalProtocolAddress(recipient.requireServiceId().toString(), 0))
   }
 
   fun setVerified(recipient: Recipient, status: IdentityTable.VerifiedStatus) {
-    ApplicationDependencies.getProtocolStore().aci().identities().setVerified(recipient.id, getIdentity(recipient), IdentityTable.VerifiedStatus.VERIFIED)
+    AppDependencies.protocolStore.aci().identities().setVerified(recipient.id, getIdentity(recipient), IdentityTable.VerifiedStatus.VERIFIED)
   }
 }
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalDatabaseRule.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalDatabaseRule.kt
index a3a0794545..978c346685 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalDatabaseRule.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalDatabaseRule.kt
@@ -26,8 +26,8 @@ class SignalDatabaseRule(
   override fun starting(description: Description?) {
     deleteAllThreads()
 
-    SignalStore.account().setAci(localAci)
-    SignalStore.account().setPni(localPni)
+    SignalStore.account.setAci(localAci)
+    SignalStore.account.setPni(localPni)
   }
 
   override fun finished(description: Description?) {
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestUtils.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestUtils.kt
index 542672cc17..49831b637f 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestUtils.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestUtils.kt
@@ -1,13 +1,14 @@
 package org.thoughtcrime.securesms.testing
 
 import android.database.Cursor
-import android.util.Base64
+import org.hamcrest.Matcher
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.hasSize
 import org.hamcrest.Matchers.`is`
 import org.hamcrest.Matchers.not
 import org.hamcrest.Matchers.notNullValue
 import org.hamcrest.Matchers.nullValue
+import org.signal.core.util.Hex
 import org.signal.core.util.logging.Log
 import org.signal.core.util.readToList
 import org.signal.core.util.select
@@ -56,33 +57,41 @@ infix fun <E, T : Collection<E>> T.assertIsSize(expected: Int) {
   assertThat(this, hasSize(expected))
 }
 
+infix fun <T : Any> T.assert(matcher: Matcher<T>) {
+  assertThat(this, matcher)
+}
+
 fun CountDownLatch.awaitFor(duration: Duration) {
   if (!await(duration.inWholeMilliseconds, TimeUnit.MILLISECONDS)) {
     throw TimeoutException("Latch await took longer than ${duration.inWholeMilliseconds}ms")
   }
 }
 
-fun dumpTableToLogs(tag: String = "TestUtils", table: String) {
-  dumpTable(table).forEach { Log.d(tag, it.toString()) }
+fun dumpTableToLogs(tag: String = "TestUtils", table: String, columns: Set<String>? = null) {
+  dumpTable(table, columns).forEach { Log.d(tag, it.toString()) }
 }
 
-fun dumpTable(table: String): List<List<Pair<String, String?>>> {
+fun dumpTable(table: String, columns: Set<String>?): List<List<Pair<String, String?>>> {
   return SignalDatabase.rawDatabase
     .select()
     .from(table)
     .run()
     .readToList { cursor ->
-      val map: List<Pair<String, String?>> = cursor.columnNames.map { column ->
-        val index = cursor.getColumnIndex(column)
-        var data: String? = when (cursor.getType(index)) {
-          Cursor.FIELD_TYPE_BLOB -> Base64.encodeToString(cursor.getBlob(index), 0)
-          else -> cursor.getString(index)
-        }
-        if (table == MessageTable.TABLE_NAME && column == MessageTable.TYPE) {
-          data = MessageTableTestUtils.typeColumnToString(cursor.getLong(index))
-        }
+      val map: List<Pair<String, String?>> = cursor.columnNames.mapNotNull { column ->
+        if (columns == null || columns.contains(column)) {
+          val index = cursor.getColumnIndex(column)
+          var data: String? = when (cursor.getType(index)) {
+            Cursor.FIELD_TYPE_BLOB -> Hex.toStringCondensed(cursor.getBlob(index))
+            else -> cursor.getString(index)
+          }
+          if (table == MessageTable.TABLE_NAME && column == MessageTable.TYPE) {
+            data = MessageTableTestUtils.typeColumnToString(cursor.getLong(index))
+          }
 
-        column to data
+          column to data
+        } else {
+          null
+        }
       }
       map
     }
diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/util/FeatureFlagsAccessor.java b/app/src/androidTest/java/org/thoughtcrime/securesms/util/FeatureFlagsAccessor.java
deleted file mode 100644
index 437b1f6e77..0000000000
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/util/FeatureFlagsAccessor.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.thoughtcrime.securesms.util;
-
-/**
- * A class that allows us to inject feature flags during tests.
- */
-public final class FeatureFlagsAccessor {
-
-  public static void forceValue(String key, Object value) {
-    FeatureFlags.FORCED_VALUES.put(key, value);
-  }
-}
diff --git a/app/src/benchmark/java/org/signal/benchmark/setup/TestUsers.kt b/app/src/benchmark/java/org/signal/benchmark/setup/TestUsers.kt
deleted file mode 100644
index 829dbd0c86..0000000000
--- a/app/src/benchmark/java/org/signal/benchmark/setup/TestUsers.kt
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.signal.benchmark.setup
-
-import android.app.Application
-import android.content.SharedPreferences
-import android.preference.PreferenceManager
-import org.signal.benchmark.DummyAccountManagerFactory
-import org.signal.core.util.concurrent.safeBlockingGet
-import org.signal.libsignal.protocol.SignalProtocolAddress
-import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
-import org.thoughtcrime.securesms.crypto.MasterSecretUtil
-import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.net.DeviceTransferBlockingInterceptor
-import org.thoughtcrime.securesms.profiles.ProfileName
-import org.thoughtcrime.securesms.push.AccountManagerFactory
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.registration.RegistrationData
-import org.thoughtcrime.securesms.registration.RegistrationRepository
-import org.thoughtcrime.securesms.registration.RegistrationUtil
-import org.thoughtcrime.securesms.registration.VerifyResponse
-import org.thoughtcrime.securesms.util.Util
-import org.whispersystems.signalservice.api.profiles.SignalServiceProfile
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
-import org.whispersystems.signalservice.api.push.SignalServiceAddress
-import org.whispersystems.signalservice.internal.ServiceResponse
-import org.whispersystems.signalservice.internal.ServiceResponseProcessor
-import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
-import java.util.UUID
-
-object TestUsers {
-
-  private var generatedOthers: Int = 0
-
-  fun setupSelf(): Recipient {
-    val application: Application = ApplicationDependencies.getApplication()
-    DeviceTransferBlockingInterceptor.getInstance().blockNetwork()
-
-    PreferenceManager.getDefaultSharedPreferences(application).edit().putBoolean("pref_prompted_push_registration", true).commit()
-    val masterSecret = MasterSecretUtil.generateMasterSecret(application, MasterSecretUtil.UNENCRYPTED_PASSPHRASE)
-    MasterSecretUtil.generateAsymmetricMasterSecret(application, masterSecret)
-    val preferences: SharedPreferences = application.getSharedPreferences(MasterSecretUtil.PREFERENCES_NAME, 0)
-    preferences.edit().putBoolean("passphrase_initialized", true).commit()
-
-    SignalStore.account().generateAciIdentityKeyIfNecessary()
-    SignalStore.account().generatePniIdentityKeyIfNecessary()
-
-    val registrationRepository = RegistrationRepository(application)
-    val registrationData = RegistrationData(
-      code = "123123",
-      e164 = "+15555550101",
-      password = Util.getSecret(18),
-      registrationId = registrationRepository.registrationId,
-      profileKey = registrationRepository.getProfileKey("+15555550101"),
-      fcmToken = "fcm-token",
-      pniRegistrationId = registrationRepository.pniRegistrationId,
-      recoveryPassword = "asdfasdfasdfasdf"
-    )
-
-    val verifyResponse = VerifyResponse(
-      VerifyAccountResponse(UUID.randomUUID().toString(), UUID.randomUUID().toString(), false),
-      masterKey = null,
-      pin = null,
-      aciPreKeyCollection = RegistrationRepository.generateSignedAndLastResortPreKeys(SignalStore.account().aciIdentityKey, SignalStore.account().aciPreKeys),
-      pniPreKeyCollection = RegistrationRepository.generateSignedAndLastResortPreKeys(SignalStore.account().aciIdentityKey, SignalStore.account().pniPreKeys)
-    )
-
-    AccountManagerFactory.setInstance(DummyAccountManagerFactory())
-
-    val response: ServiceResponse<VerifyResponse> = registrationRepository.registerAccount(
-      registrationData,
-      verifyResponse,
-      false
-    ).safeBlockingGet()
-
-    ServiceResponseProcessor.DefaultProcessor(response).resultOrThrow
-
-    SignalStore.svr().optOut()
-    RegistrationUtil.maybeMarkRegistrationComplete()
-    SignalDatabase.recipients.setProfileName(Recipient.self().id, ProfileName.fromParts("Tester", "McTesterson"))
-
-    return Recipient.self()
-  }
-
-  fun setupTestRecipient(): RecipientId {
-    return setupTestRecipients(1).first()
-  }
-
-  fun setupTestRecipients(othersCount: Int): List<RecipientId> {
-    val others = mutableListOf<RecipientId>()
-    synchronized(this) {
-      if (generatedOthers + othersCount !in 0 until 1000) {
-        throw IllegalArgumentException("$othersCount must be between 0 and 1000")
-      }
-
-      for (i in generatedOthers until generatedOthers + othersCount) {
-        val aci = ACI.from(UUID.randomUUID())
-        val recipientId = RecipientId.from(SignalServiceAddress(aci, "+15555551%03d".format(i)))
-        SignalDatabase.recipients.setProfileName(recipientId, ProfileName.fromParts("Buddy", "#$i"))
-        SignalDatabase.recipients.setProfileKeyIfAbsent(recipientId, ProfileKeyUtil.createNew())
-        SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true))
-        SignalDatabase.recipients.setProfileSharing(recipientId, true)
-        SignalDatabase.recipients.markRegistered(recipientId, aci)
-        val otherIdentity = IdentityKeyUtil.generateIdentityKeyPair()
-        ApplicationDependencies.getProtocolStore().aci().saveIdentity(SignalProtocolAddress(aci.toString(), 0), otherIdentity.publicKey)
-
-        others += recipientId
-      }
-
-      generatedOthers += othersCount
-    }
-
-    return others
-  }
-}
diff --git a/app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/test/ConversationElementGenerator.kt b/app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/test/ConversationElementGenerator.kt
index 1b358b84cd..47997cc23b 100644
--- a/app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/test/ConversationElementGenerator.kt
+++ b/app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/test/ConversationElementGenerator.kt
@@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.conversation.v2.data.OutgoingTextOnly
 import org.thoughtcrime.securesms.database.MessageTypes
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.database.model.StoryType
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.mms.SlideDeck
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
@@ -123,7 +123,7 @@ class ConversationElementGenerator {
     )
 
     val conversationMessage = ConversationMessageFactory.createWithUnresolvedData(
-      ApplicationDependencies.getApplication(),
+      AppDependencies.application,
       record,
       Recipient.UNKNOWN
     )
diff --git a/app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/test/InternalConversationTestFragment.kt b/app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/test/InternalConversationTestFragment.kt
index 3dfdd94d5e..929d9de17b 100644
--- a/app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/test/InternalConversationTestFragment.kt
+++ b/app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/test/InternalConversationTestFragment.kt
@@ -231,6 +231,10 @@ class InternalConversationTestFragment : Fragment(R.layout.conversation_test_fra
       Toast.makeText(requireContext(), "Can't touch this.", Toast.LENGTH_SHORT).show()
     }
 
+    override fun onChangeProfileNameUpdateContact(recipient: Recipient) {
+      Toast.makeText(requireContext(), "Can't touch this.", Toast.LENGTH_SHORT).show()
+    }
+
     override fun onCallToAction(action: String) {
       Toast.makeText(requireContext(), "Can't touch this.", Toast.LENGTH_SHORT).show()
     }
@@ -272,7 +276,7 @@ class InternalConversationTestFragment : Fragment(R.layout.conversation_test_fra
       Toast.makeText(requireContext(), "Can't touch this.", Toast.LENGTH_SHORT).show()
     }
 
-    override fun onEditedIndicatorClicked(messageRecord: MessageRecord) {
+    override fun onEditedIndicatorClicked(conversationMessage: ConversationMessage) {
       Toast.makeText(requireContext(), "Can't touch this.", Toast.LENGTH_SHORT).show()
     }
 
@@ -296,6 +300,10 @@ class InternalConversationTestFragment : Fragment(R.layout.conversation_test_fra
       Toast.makeText(requireContext(), "Can't touch this.", Toast.LENGTH_SHORT).show()
     }
 
+    override fun onPaymentTombstoneClicked() {
+      Toast.makeText(requireContext(), "Can't touch this.", Toast.LENGTH_SHORT).show()
+    }
+
     override fun onShowSafetyTips(forGroup: Boolean) {
       Toast.makeText(requireContext(), "Can't touch this.", Toast.LENGTH_SHORT).show()
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9f491e6e98..d32a766b25 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -719,13 +719,6 @@
         android:windowSoftInputMode="stateAlwaysHidden"
         android:exported="false"/>
 
-    <activity
-        android:name=".backup.v2.ui.subscription.MessageBackupsFlowActivity"
-        android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-        android:exported="false"
-        android:theme="@style/Signal.DayNight.NoActionBar"
-        android:windowSoftInputMode="adjustResize" />
-
     <activity
         android:name=".stories.settings.StorySettingsActivity"
         android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
@@ -794,14 +787,7 @@
         android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
         android:exported="false"/>
 
-    <activity android:name=".registration.RegistrationNavigationActivity"
-              android:launchMode="singleTask"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:exported="false"/>
-
-    <activity android:name=".registration.v2.ui.RegistrationV2Activity"
+    <activity android:name=".registration.ui.RegistrationActivity"
               android:launchMode="singleTask"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="stateHidden"
@@ -936,8 +922,8 @@
               android:windowSoftInputMode="stateVisible|adjustResize"
               android:exported="false"/>
 
-    <activity android:name=".backup.v2.ui.subscription.MessageBackupsTestRestoreActivity"
-              android:theme="@style/TextSecure.LightRegistrationTheme"
+    <activity android:name=".registration.ui.restore.RemoteRestoreActivity"
+              android:theme="@style/Signal.DayNight.NoActionBar"
               android:exported="false"/>
 
     <activity android:name=".profiles.manage.EditProfileActivity"
@@ -1053,7 +1039,7 @@
               android:theme="@style/Theme.Signal.WallpaperCropper"
               android:exported="false"/>
 
-    <activity android:name=".components.settings.app.usernamelinks.main.UsernameQrImageSelectionActivity"
+    <activity android:name=".components.settings.app.usernamelinks.main.QrImageSelectionActivity"
         android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
         android:theme="@style/TextSecure.DarkNoActionBar"
         android:exported="false"/>
diff --git a/app/src/main/baseline-prof.txt b/app/src/main/baseline-prof.txt
index cdd8c68769..59c47ff109 100644
--- a/app/src/main/baseline-prof.txt
+++ b/app/src/main/baseline-prof.txt
@@ -1,38 +1,313 @@
+HPLandroidx/appcompat/widget/AppCompatTextView;->setCompoundDrawablesWithIntrinsicBounds(IIII)V
 HPLandroidx/appcompat/widget/SearchView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 HPLandroidx/core/view/ViewGroupKt$descendants$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
-HPLandroidx/customview/poolingcontainer/PoolingContainer;->callPoolingContainerOnRelease(Landroid/view/View;)V
+HPLandroidx/core/view/ViewGroupKt$iterator$1;->next()Landroid/view/View;
+HPLandroidx/core/view/ViewGroupKt$iterator$1;->next()Ljava/lang/Object;
+HPLandroidx/customview/poolingcontainer/PoolingContainerListenerHolder;-><init>()V
 HPLandroidx/customview/poolingcontainer/PoolingContainerListenerHolder;->onRelease()V
 HPLandroidx/fragment/app/FragmentManager;->saveAllStateInternal()Landroid/os/Bundle;
 HPLandroidx/fragment/app/FragmentStateManager;->saveState()Landroid/os/Bundle;
-HPLandroidx/recyclerview/widget/AsyncListDiffer$1$1;->areItemsTheSame(II)Z
+HPLandroidx/recyclerview/widget/BatchingListUpdateCallback;->onChanged(IILjava/lang/Object;)V
+HPLandroidx/recyclerview/widget/ConcatAdapter;->findRelativeAdapterPositionIn(Landroidx/recyclerview/widget/RecyclerView$Adapter;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)I
+HPLandroidx/recyclerview/widget/ConcatAdapter;->getItemViewType(I)I
+HPLandroidx/recyclerview/widget/ConcatAdapterController;->findWrapperAndLocalPosition(I)Landroidx/recyclerview/widget/ConcatAdapterController$WrapperAndLocalPosition;
+HPLandroidx/recyclerview/widget/ConcatAdapterController;->getItemViewType(I)I
+HPLandroidx/recyclerview/widget/ConcatAdapterController;->getLocalAdapterPosition(Landroidx/recyclerview/widget/RecyclerView$Adapter;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)I
+HPLandroidx/recyclerview/widget/ConcatAdapterController;->onBindViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
+HPLandroidx/recyclerview/widget/ConcatAdapterController;->releaseWrapperAndLocalPosition(Landroidx/recyclerview/widget/ConcatAdapterController$WrapperAndLocalPosition;)V
 HPLandroidx/recyclerview/widget/DiffUtil;->backward(Landroidx/recyclerview/widget/DiffUtil$Range;Landroidx/recyclerview/widget/DiffUtil$Callback;Landroidx/recyclerview/widget/DiffUtil$CenteredArray;Landroidx/recyclerview/widget/DiffUtil$CenteredArray;I)Landroidx/recyclerview/widget/DiffUtil$Snake;
+HPLandroidx/recyclerview/widget/ListAdapter;->getCurrentList()Ljava/util/List;
+HPLandroidx/recyclerview/widget/NestedAdapterWrapper;->getItemViewType(I)I
+HPLandroidx/recyclerview/widget/RecyclerView;->getChildViewHolder(Landroid/view/View;)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+HPLandroidx/recyclerview/widget/RecyclerView;->viewRangeUpdate(IILjava/lang/Object;)V
 HPLandroidx/recyclerview/widget/ViewInfoStore;->addToPreLayout(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)V
+HPLandroidx/recyclerview/widget/ViewInfoStore;->isDisappearing(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Z
 HPLandroidx/recyclerview/widget/ViewInfoStore;->popFromLayoutStep(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;
+HPLandroidx/recyclerview/widget/ViewTypeStorage$IsolatedViewTypeStorage$WrapperViewTypeLookup;->localToGlobal(I)I
 HPLandroidx/savedstate/SavedStateRegistry;->performSave(Landroid/os/Bundle;)V
-HPLcom/annimon/stream/iterator/LazyIterator;->hasNext()Z
+HPLcom/annimon/stream/operator/ObjFilter;->hasNext()Z
+HPLcom/google/android/material/animation/ArgbEvaluatorCompat;->evaluate(FLjava/lang/Integer;Ljava/lang/Integer;)Ljava/lang/Integer;
+HPLcom/google/common/collect/Sets;->intersection(Ljava/util/Set;Ljava/util/Set;)Lcom/google/common/collect/Sets$SetView;
+HPLio/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn$BaseObserveOnSubscriber;->cancel()V
 HPLio/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe$FlatMapMaybeObserver;->innerSuccess(Lio/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe$FlatMapMaybeObserver$InnerObserver;Ljava/lang/Object;)V
 HPLio/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe$FlatMapMaybeObserver;->onNext(Ljava/lang/Object;)V
-HPLj$/util/Optional;->ofNullable(Ljava/lang/Object;)Lj$/util/Optional;
-HPLokio/SegmentPool;->firstRef()Ljava/util/concurrent/atomic/AtomicReference;
-HPLorg/signal/core/util/concurrent/DeadlockDetector;->hasPotentialLock([Ljava/lang/StackTraceElement;)Z
-HPLorg/signal/core/util/tracing/Tracer;->start(Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;)V
-HPLorg/signal/core/util/tracing/TrackEvent$Builder;->track_uuid(Ljava/lang/Long;)Lorg/signal/core/util/tracing/TrackEvent$Builder;
-HPLorg/thoughtcrime/securesms/attachments/PointerAttachment$Companion;->forPointers(Lj$/util/Optional;)Ljava/util/List;
+HPLio/reactivex/rxjava3/internal/operators/observable/ObservableReplay$BoundedReplayBuffer;->removeFirst()V
+HPLj$/time/Instant;->atZone(Lj$/time/ZoneId;)Lj$/time/ZonedDateTime;
+HPLj$/time/LocalDateTime;->U()Lj$/time/LocalDate;
+HPLj$/time/ZonedDateTime;-><init>(Lj$/time/LocalDateTime;Lj$/time/ZoneId;Lj$/time/ZoneOffset;)V
+HPLj$/time/ZonedDateTime;->M(JILj$/time/ZoneId;)Lj$/time/ZonedDateTime;
+HPLj$/time/ZonedDateTime;->N(Lj$/time/Instant;Lj$/time/ZoneId;)Lj$/time/ZonedDateTime;
+HPLj$/time/ZonedDateTime;->toLocalDate()Lj$/time/LocalDate;
+HPLj$/util/S;->r(Lj$/util/function/Consumer;)Z
+HPLkotlin/collections/CollectionsKt___CollectionsKt;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+HPLkotlin/sequences/SequencesKt__SequenceBuilderKt;->sequence(Lkotlin/jvm/functions/Function2;)Lkotlin/sequences/Sequence;
+HPLkotlin/sequences/SequencesKt___SequencesJvmKt$filterIsInstance$1;->invoke(Ljava/lang/Object;)Ljava/lang/Boolean;
+HPLkotlin/sequences/SequencesKt___SequencesJvmKt$filterIsInstance$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+HPLokio/OutputStreamSink;->write(Lokio/Buffer;J)V
+HPLorg/conscrypt/ConscryptEngineSocket$SSLInputStream;->readFromSocket()I
+HPLorg/signal/core/util/OptionalExtensionsKt;->toOptional(Ljava/lang/Object;)Lj$/util/Optional;
+HPLorg/signal/core/util/concurrent/SettableFuture;-><init>(Ljava/lang/Object;)V
+HPLorg/signal/core/util/concurrent/SignalExecutors;->lambda$newCachedBoundedExecutor$1(Ljava/lang/Runnable;Ljava/util/concurrent/ThreadPoolExecutor;)V
+HPLorg/signal/libsignal/protocol/ecc/ECPublicKey;->equals(Ljava/lang/Object;)Z
+HPLorg/signal/paging/FixedSizePagingController;->lambda$onDataItemChanged$2(Ljava/lang/Object;)V
+HPLorg/thoughtcrime/securesms/WebRtcCallActivity$$ExternalSyntheticBackport8;->m([Ljava/lang/Object;)Ljava/util/List;
+HPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration$onDrawOver$2;->invoke(Lorg/thoughtcrime/securesms/badges/gifts/OpenableGift;)Ljava/lang/Boolean;
+HPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration$onDrawOver$4;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+HPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration$onDrawOver$4;->invoke(Lorg/thoughtcrime/securesms/badges/gifts/OpenableGift;)Ljava/lang/Boolean;
+HPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration$onDrawOver$notAnimated$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+HPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration$onDrawOver$notAnimated$1;->invoke(Lorg/thoughtcrime/securesms/badges/gifts/OpenableGift;)Ljava/lang/Boolean;
+HPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->applyCorners()V
+HPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->applyCornersForSizeClass2()V
+HPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->getCells()[Lorg/thoughtcrime/securesms/components/ThumbnailView;
+HPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->setCellBackgroundColor(I)V
+HPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->setRadii(IIII)V
+HPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->setRelativeRadii(Lorg/thoughtcrime/securesms/components/ThumbnailView;IIII)V
+HPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->setSlide(Lcom/bumptech/glide/RequestManager;Lorg/thoughtcrime/securesms/mms/Slide;IZ)V
+HPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->setSlides(Lcom/bumptech/glide/RequestManager;Ljava/util/List;Z)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->presentDate(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Ljava/util/Locale;Lorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->presentDeliveryStatus(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->dispatchDraw(Landroid/graphics/Canvas;)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setCancelTransferClickListener(Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setClickable(Z)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setConversationColor(I)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setCorners(IIII)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setFocusable(Z)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setImageResource(Lcom/bumptech/glide/RequestManager;Ljava/util/List;ZZ)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setMaximumThumbnailHeight(I)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setMinimumThumbnailWidth(I)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setOnLongClickListener(Landroid/view/View$OnLongClickListener;)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setPlayVideoClickListener(Lorg/thoughtcrime/securesms/mms/SlideClickListener;)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setStartTransferClickListener(Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setThumbnailBounds([I)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setThumbnailClickListener(Lorg/thoughtcrime/securesms/mms/SlideClickListener;)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->showThumbnailView()V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;-><init>(ZZLorg/thoughtcrime/securesms/mms/SlideClickListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlideClickListener;Landroid/view/View$OnLongClickListener;IIIIII)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;->applyState(Lorg/thoughtcrime/securesms/util/views/Stub;)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;->copy$default(Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;ZZLorg/thoughtcrime/securesms/mms/SlideClickListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlideClickListener;Landroid/view/View$OnLongClickListener;IIIIIIILjava/lang/Object;)Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;->copy(ZZLorg/thoughtcrime/securesms/mms/SlideClickListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlideClickListener;Landroid/view/View$OnLongClickListener;IIIIII)Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;-><init>(FZZLorg/thoughtcrime/securesms/mms/SlideClickListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlideClickListener;Landroid/view/View$OnLongClickListener;IIIIIIIII)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;->applyState(Lorg/thoughtcrime/securesms/util/views/Stub;)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;->copy$default(Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;FZZLorg/thoughtcrime/securesms/mms/SlideClickListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlideClickListener;Landroid/view/View$OnLongClickListener;IIIIIIIIIILjava/lang/Object;)Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;->copy(FZZLorg/thoughtcrime/securesms/mms/SlideClickListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlideClickListener;Landroid/view/View$OnLongClickListener;IIIIIIIII)Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;-><init>(Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;->applyState(Lorg/thoughtcrime/securesms/util/views/Stub;Lorg/thoughtcrime/securesms/util/views/Stub;)V
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;->copy$default(Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;ILjava/lang/Object;)Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;->copy(Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;)Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;->getAlbumViewState()Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;
+HPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;->getThumbnailViewState()Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;
+HPLorg/thoughtcrime/securesms/components/CornerMask;->mask(Landroid/graphics/Canvas;)V
+HPLorg/thoughtcrime/securesms/components/Outliner;->draw(Landroid/graphics/Canvas;IIII)V
+HPLorg/thoughtcrime/securesms/components/QuoteView;->dismiss()V
+HPLorg/thoughtcrime/securesms/components/ThumbnailView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+HPLorg/thoughtcrime/securesms/components/ThumbnailView;->hasSameContents(Lorg/thoughtcrime/securesms/mms/Slide;Lorg/thoughtcrime/securesms/mms/Slide;)Z
+HPLorg/thoughtcrime/securesms/components/ThumbnailView;->onMeasure(II)V
+HPLorg/thoughtcrime/securesms/components/ThumbnailView;->setBounds(IIII)V
+HPLorg/thoughtcrime/securesms/components/ThumbnailView;->setCancelTransferClickListener(Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;)V
+HPLorg/thoughtcrime/securesms/components/ThumbnailView;->setClickable(Z)V
+HPLorg/thoughtcrime/securesms/components/ThumbnailView;->setFocusable(Z)V
+HPLorg/thoughtcrime/securesms/components/ThumbnailView;->setImageResource(Lcom/bumptech/glide/RequestManager;Lorg/thoughtcrime/securesms/mms/Slide;ZZII)Lorg/signal/core/util/concurrent/ListenableFuture;
+HPLorg/thoughtcrime/securesms/components/ThumbnailView;->setRadii(IIII)V
+HPLorg/thoughtcrime/securesms/components/ThumbnailView;->setThumbnailClickListener(Lorg/thoughtcrime/securesms/mms/SlideClickListener;)V
+HPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->getLongestLineWidth(Ljava/lang/CharSequence;)F
+HPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->setOverflowText(Ljava/lang/CharSequence;)V
+HPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->setTextSize(IF)V
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Companion;->getTransferState(Ljava/util/List;)I
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Progress;->toString()Ljava/lang/String;
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setClickable$1;-><init>(Z)V
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setClickable$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setClickable$1;->invoke(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;)Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setFocusable$1;-><init>(Z)V
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setFocusable$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setFocusable$1;->invoke(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;)Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setSlides$2;->invoke(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;)Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->deriveMode(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;)Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Mode;
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->isUpdateToExistingSet(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;Ljava/util/List;)Z
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->setCancelClickListener(Landroid/view/View$OnClickListener;)V
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->setClickable(Z)V
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->setFocusable(Z)V
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->setShowSecondaryText(Z)V
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->setSlides(Ljava/util/List;)V
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->setTransferClickListener(Landroid/view/View$OnClickListener;)V
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->setVisible(Z)V
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->updateState(Lkotlin/jvm/functions/Function1;)V
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;-><init>(ZZZLjava/util/List;Landroid/view/View$OnClickListener;Landroid/view/View$OnClickListener;Landroid/view/View$OnClickListener;ZLjava/util/Map;Ljava/util/Map;ZZ)V
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;->copy$default(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;ZZZLjava/util/List;Landroid/view/View$OnClickListener;Landroid/view/View$OnClickListener;Landroid/view/View$OnClickListener;ZLjava/util/Map;Ljava/util/Map;ZZILjava/lang/Object;)Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;->copy(ZZZLjava/util/List;Landroid/view/View$OnClickListener;Landroid/view/View$OnClickListener;Landroid/view/View$OnClickListener;ZLjava/util/Map;Ljava/util/Map;ZZ)Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;->equals(Ljava/lang/Object;)Z
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;->toString()Ljava/lang/String;
+HPLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;->setTitle(Lorg/thoughtcrime/securesms/recipients/Recipient;Ljava/lang/Runnable;)Ljava/lang/String;
+HPLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;->updateOutlineVisibility()V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->bind(Landroidx/lifecycle/LifecycleOwner;Lorg/thoughtcrime/securesms/conversation/ConversationMessage;Lj$/util/Optional;Lj$/util/Optional;Lcom/bumptech/glide/RequestManager;Ljava/util/Locale;Ljava/util/Set;Lorg/thoughtcrime/securesms/recipients/Recipient;Ljava/lang/String;ZZZZLorg/thoughtcrime/securesms/conversation/colors/Colorizer;Lorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->forceFooter(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->getActiveFooter(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Lorg/thoughtcrime/securesms/components/ConversationItemFooter;
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->getColorizerProjections(Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/util/ProjectionList;
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->getGiftId()J
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->getOpenableGiftProjection(Z)Lorg/thoughtcrime/securesms/util/Projection;
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->getSnapshotProjections(Landroid/view/ViewGroup;ZZ)Lorg/thoughtcrime/securesms/util/ProjectionList;
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->hasExtraText(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->hasNoBubble(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->isCaptionlessMms(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->isEndOfMessageCluster(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Z)Z
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->isFooterVisible(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Z)Z
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->isStartOfMessageCluster(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Z)Z
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->isWithinClusteringTime(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->onMeasure(II)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->readDimen(I)I
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setAuthor(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Lj$/util/Optional;ZZ)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setBodyText(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Ljava/lang/String;Z)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setBubbleState(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lorg/thoughtcrime/securesms/recipients/Recipient;ZLorg/thoughtcrime/securesms/conversation/colors/Colorizer;)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setContactPhoto(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setFooter(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Ljava/util/Locale;ZZ)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setGroupAuthorColor(Lorg/thoughtcrime/securesms/database/model/MessageRecord;ZLorg/thoughtcrime/securesms/conversation/colors/Colorizer;)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setGutterSizes(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Z)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setHasBeenQuoted(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setInteractionState(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;Z)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setMediaAttributes(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Lj$/util/Optional;ZZZZ)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setMessageShape(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Lj$/util/Optional;Z)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setMessageSpacing(Landroid/content/Context;Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Lj$/util/Optional;Z)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setQuote(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Lj$/util/Optional;Z)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setReactions(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setStatusIcons(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Z)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setThumbnailCorners(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Lj$/util/Optional;Z)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->shouldInterceptClicks(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->showProjectionArea()V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItem;->unbind()V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble;->onDrawForeground(Landroid/graphics/Canvas;)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble;->setQuoteViewProjection(Lorg/thoughtcrime/securesms/util/Projection;)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble;->setVideoPlayerProjection(Lorg/thoughtcrime/securesms/util/Projection;)V
+HPLorg/thoughtcrime/securesms/conversation/ConversationMessage;->getConversationTimestamp()J
+HPLorg/thoughtcrime/securesms/conversation/MarkReadHelper;->getLatestTimestamp(Lorg/thoughtcrime/securesms/conversation/ConversationAdapterBridge;Landroidx/recyclerview/widget/LinearLayoutManager;)Lj$/util/Optional;
+HPLorg/thoughtcrime/securesms/conversation/colors/Colorizer;->getIncomingBodyTextColor(Landroid/content/Context;Z)I
+HPLorg/thoughtcrime/securesms/conversation/colors/Colorizer;->getIncomingGroupSenderColor(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/Recipient;)I
+HPLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer$itemDecoration$1;->getItemOffsets(Landroid/graphics/Rect;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
 HPLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator;->animateChange(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)Z
 HPLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator;->animatePersistence(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)Z
+HPLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator;->animateSlide(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)Z
+HPLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator;->onAnimationFinished(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+HPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectCollection$Single;->toSet()Ljava/util/Set;
+HPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->getCurrentSelection(Landroidx/recyclerview/widget/RecyclerView;)Ljava/util/Set;
+HPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->getDifferenceForPart(Ljava/util/Set;Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectPart;)Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration$Difference;
+HPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->getItemOffsets(Landroid/graphics/Rect;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
+HPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->resolveMultiselectable(Landroidx/recyclerview/widget/RecyclerView;Landroid/view/View;)Lorg/thoughtcrime/securesms/conversation/mutiselect/Multiselectable;
+HPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->updateChildOffsets(Landroidx/recyclerview/widget/RecyclerView;Landroid/view/View;)V
+HPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->updateMultiselectPartAnimator(Ljava/util/Set;Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectPart;)V
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;->bindPayloadsIfAvailable()Z
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;->getBindable()Lorg/thoughtcrime/securesms/BindableConversationItem;
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;->getColorizerProjections(Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/util/ProjectionList;
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;->getNextMessage()Lj$/util/Optional;
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;->getPreviousMessage()Lj$/util/Optional;
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$IncomingMediaViewHolder;->bind(Lorg/thoughtcrime/securesms/conversation/v2/data/IncomingMedia;)V
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ThreadHeaderViewHolder;->bind(Lorg/thoughtcrime/securesms/conversation/v2/data/ThreadHeader;)V
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->getChatColorsData()Lorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsData;
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->getConversationMessage(I)Lorg/thoughtcrime/securesms/conversation/ConversationMessage;
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener;->onScrolled(Landroidx/recyclerview/widget/RecyclerView;II)V
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ThreadHeaderMarginDecoration;->getItemOffsets(Landroid/graphics/Rect;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$2;->get()Ljava/lang/Object;
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$6;->invoke()Ljava/lang/Boolean;
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$7;->invoke()Ljava/lang/Boolean;
 HPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$8;->invoke()Ljava/lang/Boolean;
 HPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->doAfterFirstRender()V
-HPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->getReminder$lambda$10(Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;Lorg/thoughtcrime/securesms/database/model/GroupRecord;)Lj$/util/Optional;
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->getHeader(Landroidx/recyclerview/widget/RecyclerView;Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationMessageElement;)Lorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$DateHeaderViewHolder;
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->getItemOffsets(Landroid/graphics/Rect;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->hasHeader(I)Z
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->isFirstUnread(I)Z
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->timestamp(Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationMessageElement;)J
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->toEpochDay(Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationMessageElement;)J
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->getReminder$lambda$12(Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;Lorg/thoughtcrime/securesms/database/model/GroupRecord;)Lj$/util/Optional;
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->getRequestReviewState$lambda$17(Lorg/thoughtcrime/securesms/database/model/GroupRecord;Lorg/thoughtcrime/securesms/messagerequests/MessageRequestState;Lorg/thoughtcrime/securesms/recipients/Recipient;)Lorg/thoughtcrime/securesms/conversation/v2/RequestReviewState;
 HPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->getRequestReviewState(Lorg/thoughtcrime/securesms/recipients/Recipient;Lorg/thoughtcrime/securesms/database/model/GroupRecord;Lorg/thoughtcrime/securesms/messagerequests/MessageRequestState;)Lio/reactivex/rxjava3/core/Single;
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$13;->apply(Lj$/util/Optional;)Lio/reactivex/rxjava3/core/MaybeSource;
 HPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$canShowAsBubble$1;->apply(Lorg/thoughtcrime/securesms/recipients/Recipient;)Ljava/lang/Boolean;
 HPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$getRequestReviewState$1;->apply(Lorg/thoughtcrime/securesms/conversation/v2/InputReadyState;)Lio/reactivex/rxjava3/core/SingleSource;
+HPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->getChatColorsSnapshot()Lorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsData;
 HPLorg/thoughtcrime/securesms/conversation/v2/IdentityRecordsState;->equals(Ljava/lang/Object;)Z
 HPLorg/thoughtcrime/securesms/conversation/v2/InputReadyState;->equals(Ljava/lang/Object;)Z
+HPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsItemDecoration$onDraw$$inlined$filterIsInstance$1;->invoke(Ljava/lang/Object;)Ljava/lang/Boolean;
+HPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsItemDecoration$onDraw$1;->invoke(Landroid/view/View;)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+HPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsItemDecoration$onDraw$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+HPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;->draw(Landroid/graphics/Canvas;)V
+HPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;->getChatColors()Lorg/thoughtcrime/securesms/conversation/colors/ChatColors;
+HPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;->getOutline(Landroid/graphics/Outline;)V
+HPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;->isSolidColor()Z
+HPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;->setCorners([F)V
+HPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;->onMeasure(II)V
+HPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;->isEndOfMessageCluster(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
+HPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;->setMessageShape(Lorg/thoughtcrime/securesms/database/model/MessageRecord;ZI)Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;
+HPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$footerDrawable$1;->invoke()Lorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsData;
+HPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationContext;Lorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate;)V
+HPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->bind(Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingModel;)V
+HPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->getColorizerProjections(Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/util/ProjectionList;
+HPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->invalidateBodyBubbleDrawable(Landroid/view/ViewGroup;)V
+HPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->invalidateChatColorsDrawable(Landroid/view/ViewGroup;)V
+HPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->linkifyMessageBody(Landroid/text/Spannable;)V
+HPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentBody()V
+HPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentSender()V
+HPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme;->getBodyTextColor(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;)I
+HPLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate;->onPostMeasure()Z
+HPLorg/thoughtcrime/securesms/conversationlist/model/Conversation;->equals(Ljava/lang/Object;)Z
+HPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$unregisterObserver$18(Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+HPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isFailed()Z
 HPLorg/thoughtcrime/securesms/database/model/IdentityRecord;->equals(Ljava/lang/Object;)Z
+HPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isBundleKeyExchange()Z
+HPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isRateLimited()Z
+HPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isSecure()Z
+HPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord;->isMediaPending()Z
+HPLorg/thoughtcrime/securesms/database/model/ThreadRecord;->equals(Ljava/lang/Object;)Z
+HPLorg/thoughtcrime/securesms/fonts/SignalSymbols$CustomTypefaceSpan;->update(Landroid/text/TextPaint;)V
+HPLorg/thoughtcrime/securesms/fonts/SignalSymbols;->getSpannedString(Landroid/content/Context;Lorg/thoughtcrime/securesms/fonts/SignalSymbols$Weight;Lorg/thoughtcrime/securesms/fonts/SignalSymbols$Glyph;)Ljava/lang/CharSequence;
+HPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ItemDecoration$onDraw$1;->invoke(Landroid/view/View;)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+HPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ItemDecoration$onDraw$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+HPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController$RangeComparator;->compare(Ljava/lang/Integer;Ljava/lang/Integer;)I
+HPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionRecycler;->getCurrentHolder(I)Lorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionPlayerHolder;
+HPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionRecycler;->updateVideoDisplayPositionAndSize(Landroidx/recyclerview/widget/RecyclerView;Lorg/thoughtcrime/securesms/giph/mp4/GiphyMp4Playable;)V
+HPLorg/thoughtcrime/securesms/keyvalue/SettingsValues;->getMessageFontSize()I
+HPLorg/thoughtcrime/securesms/keyvalue/WallpaperValues;->hasWallpaperSet()Z
 HPLorg/thoughtcrime/securesms/mms/Slide;->equals(Ljava/lang/Object;)Z
+HPLorg/thoughtcrime/securesms/mms/Slide;->getTransferState()I
+HPLorg/thoughtcrime/securesms/mms/Slide;->hashCode()I
+HPLorg/thoughtcrime/securesms/mms/Slide;->isInProgress()Z
+HPLorg/thoughtcrime/securesms/mms/Slide;->isPendingDownload()Z
+HPLorg/thoughtcrime/securesms/mms/SlideDeck;->getThumbnailSlides()Ljava/util/List;
 HPLorg/thoughtcrime/securesms/profiles/ProfileName;->equals(Ljava/lang/Object;)Z
+HPLorg/thoughtcrime/securesms/reactions/ReactionsConversationView;->clear()V
+HPLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda5;-><init>(Lorg/thoughtcrime/securesms/recipients/LiveRecipient;Lorg/thoughtcrime/securesms/recipients/RecipientForeverObserver;)V
+HPLorg/thoughtcrime/securesms/recipients/LiveRecipient;->removeForeverObserver(Lorg/thoughtcrime/securesms/recipients/RecipientForeverObserver;)V
+HPLorg/thoughtcrime/securesms/recipients/Recipient$combinedAboutAndEmoji$2;->invoke()Ljava/lang/String;
+HPLorg/thoughtcrime/securesms/recipients/Recipient;->getHasWallpaper()Z
 HPLorg/thoughtcrime/securesms/recipients/Recipient;->hasSameContent(Lorg/thoughtcrime/securesms/recipients/Recipient;)Z
 HPLorg/thoughtcrime/securesms/util/BubbleUtil;->canBubble(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/Recipient;Ljava/lang/Long;)Z
+HPLorg/thoughtcrime/securesms/util/DateUtils;->getSameDayDateFormat()Ljava/text/SimpleDateFormat;
+HPLorg/thoughtcrime/securesms/util/DateUtils;->isSameDay(JJ)Z
+HPLorg/thoughtcrime/securesms/util/JavaTimeExtensionsKt;->toLocalDate$default(JLj$/time/ZoneId;ILjava/lang/Object;)Lj$/time/LocalDate;
+HPLorg/thoughtcrime/securesms/util/JavaTimeExtensionsKt;->toLocalDate(JLj$/time/ZoneId;)Lj$/time/LocalDate;
+HPLorg/thoughtcrime/securesms/util/Material3OnScrollHelper;->updateActiveState$lambda$7$lambda$6(Lorg/thoughtcrime/securesms/util/Material3OnScrollHelper;IIIILandroid/animation/ValueAnimator;)V
+HPLorg/thoughtcrime/securesms/util/MediaUtil;->isInstantVideoSupported(Lorg/thoughtcrime/securesms/mms/Slide;)Z
+HPLorg/thoughtcrime/securesms/util/MediaUtil;->isVideoType(Ljava/lang/String;)Z
+HPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->hasNoBubble(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Landroid/content/Context;)Z
+HPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->hasOnlyThumbnail(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Landroid/content/Context;)Z
+HPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->isBorderless(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Landroid/content/Context;)Z
+HPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->isEditMessage(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
+HPLorg/thoughtcrime/securesms/util/Projection$Corners;-><init>(FFFF)V
+HPLorg/thoughtcrime/securesms/util/Projection$Corners;->toRadii()[F
+HPLorg/thoughtcrime/securesms/util/ProjectionList;->close()V
+HPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->getMessageBodyTextSize(Landroid/content/Context;)I
+HPLorg/thoughtcrime/securesms/util/ViewExtensionsKt;->drawAsTopItemDecoration(Landroid/view/View;Landroid/graphics/Canvas;Landroid/view/View;Landroid/view/View;I)V
+HPLorg/thoughtcrime/securesms/util/ViewExtensionsKt;->layoutIn(Landroid/view/View;Landroid/view/View;)V
+HPLorg/thoughtcrime/securesms/util/ViewUtil;->isRtl(Landroid/view/View;)Z
+HPLorg/thoughtcrime/securesms/util/ViewUtil;->setPaddingBottom(Landroid/view/View;I)V
+HPLorg/thoughtcrime/securesms/util/ViewUtil;->setPaddingEnd(Landroid/view/View;I)V
+HPLorg/thoughtcrime/securesms/util/ViewUtil;->setPaddingStart(Landroid/view/View;I)V
+HPLorg/thoughtcrime/securesms/util/ViewUtil;->setPaddingTop(Landroid/view/View;I)V
+HPLorg/thoughtcrime/securesms/util/ViewUtil;->setTopMargin(Landroid/view/View;IZ)V
+HPLorg/thoughtcrime/securesms/util/ViewUtil;->updateLayoutParams(Landroid/view/View;II)V
+HPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;->setPayload(Ljava/util/List;)V
+HPLorg/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter;->getItem(I)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingModel;
+HPLorg/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter;->getItemViewType(I)I
+HPLorg/thoughtcrime/securesms/util/views/NullableStub;->get()Ljava/lang/Object;
+HPLorg/thoughtcrime/securesms/util/views/NullableStub;->require()Ljava/lang/Object;
 HSPLandroid/support/v4/media/MediaBrowserCompat$MediaBrowserImplApi21$$ExternalSyntheticThrowCCEIfNotNull0;->m(Ljava/lang/Object;)V
 HSPLandroid/support/v4/media/session/IMediaSession$Stub;-><init>()V
 HSPLandroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21;-><init>(Landroid/content/Context;Landroid/support/v4/media/session/MediaSessionCompat$Token;)V
@@ -63,7 +338,6 @@ HSPLandroid/support/v4/media/session/MediaSessionCompat$MediaSessionImplApi22;->
 HSPLandroid/support/v4/media/session/MediaSessionCompat$MediaSessionImplApi22;->setRatingType(I)V
 HSPLandroid/support/v4/media/session/MediaSessionCompat$MediaSessionImplApi28;-><init>(Landroid/content/Context;Ljava/lang/String;Landroidx/versionedparcelable/VersionedParcelable;Landroid/os/Bundle;)V
 HSPLandroid/support/v4/media/session/MediaSessionCompat$MediaSessionImplApi29$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/Context;Ljava/lang/String;Landroid/os/Bundle;)Landroid/media/session/MediaSession;
-HSPLandroid/support/v4/media/session/MediaSessionCompat$MediaSessionImplApi29$$ExternalSyntheticApiModelOutline1;->m()V
 HSPLandroid/support/v4/media/session/MediaSessionCompat$MediaSessionImplApi29;-><init>(Landroid/content/Context;Ljava/lang/String;Landroidx/versionedparcelable/VersionedParcelable;Landroid/os/Bundle;)V
 HSPLandroid/support/v4/media/session/MediaSessionCompat$MediaSessionImplApi29;->createFwkMediaSession(Landroid/content/Context;Ljava/lang/String;Landroid/os/Bundle;)Landroid/media/session/MediaSession;
 HSPLandroid/support/v4/media/session/MediaSessionCompat$Token$1;-><init>()V
@@ -93,7 +367,7 @@ HSPLandroid/support/v4/media/session/PlaybackStateCompat$Api21Impl;->setActiveQu
 HSPLandroid/support/v4/media/session/PlaybackStateCompat$Api21Impl;->setBufferedPosition(Landroid/media/session/PlaybackState$Builder;J)V
 HSPLandroid/support/v4/media/session/PlaybackStateCompat$Api21Impl;->setErrorMessage(Landroid/media/session/PlaybackState$Builder;Ljava/lang/CharSequence;)V
 HSPLandroid/support/v4/media/session/PlaybackStateCompat$Api21Impl;->setState(Landroid/media/session/PlaybackState$Builder;IJFJ)V
-HSPLandroid/support/v4/media/session/PlaybackStateCompat$Api22Impl$$ExternalSyntheticApiModelOutline1;->m(Landroid/media/session/PlaybackState$Builder;Landroid/os/Bundle;)Landroid/media/session/PlaybackState$Builder;
+HSPLandroid/support/v4/media/session/PlaybackStateCompat$Api22Impl$$ExternalSyntheticApiModelOutline0;->m(Landroid/media/session/PlaybackState$Builder;Landroid/os/Bundle;)Landroid/media/session/PlaybackState$Builder;
 HSPLandroid/support/v4/media/session/PlaybackStateCompat$Api22Impl;->setExtras(Landroid/media/session/PlaybackState$Builder;Landroid/os/Bundle;)V
 HSPLandroid/support/v4/media/session/PlaybackStateCompat$Builder;-><init>()V
 HSPLandroid/support/v4/media/session/PlaybackStateCompat$Builder;->build()Landroid/support/v4/media/session/PlaybackStateCompat;
@@ -124,7 +398,7 @@ HSPLandroidx/activity/ComponentActivity$6;->onStateChanged(Landroidx/lifecycle/L
 HSPLandroidx/activity/ComponentActivity$Api19Impl;->cancelPendingInputEvents(Landroid/view/View;)V
 HSPLandroidx/activity/ComponentActivity$ReportFullyDrawnExecutorApi16Impl;-><init>(Landroidx/activity/ComponentActivity;)V
 HSPLandroidx/activity/ComponentActivity$ReportFullyDrawnExecutorApi16Impl;->activityDestroyed()V
-HSPLandroidx/activity/ComponentActivity;->$r8$lambda$h2i_RK2mddCIbAsGubaI4eL8_cU(Landroidx/activity/ComponentActivity;Landroid/content/Context;)V
+HSPLandroidx/activity/ComponentActivity;->$r8$lambda$278Cq622rQ9X9WaDkyOm2xm3rFw(Landroidx/activity/ComponentActivity;Landroid/content/Context;)V
 HSPLandroidx/activity/ComponentActivity;-><init>()V
 HSPLandroidx/activity/ComponentActivity;->addMenuProvider(Landroidx/core/view/MenuProvider;)V
 HSPLandroidx/activity/ComponentActivity;->addOnConfigurationChangedListener(Landroidx/core/util/Consumer;)V
@@ -262,8 +536,8 @@ HSPLandroidx/appcompat/app/AppCompatDelegateImpl$5;-><init>(Landroidx/appcompat/
 HSPLandroidx/appcompat/app/AppCompatDelegateImpl$5;->onAttachedFromWindow()V
 HSPLandroidx/appcompat/app/AppCompatDelegateImpl$5;->onDetachedFromWindow()V
 HSPLandroidx/appcompat/app/AppCompatDelegateImpl$Api17Impl;->createConfigurationContext(Landroid/content/Context;Landroid/content/res/Configuration;)Landroid/content/Context;
-HSPLandroidx/appcompat/app/AppCompatDelegateImpl$Api24Impl$$ExternalSyntheticApiModelOutline1;->m(Landroid/content/res/Configuration;)Landroid/os/LocaleList;
-HSPLandroidx/appcompat/app/AppCompatDelegateImpl$Api24Impl$$ExternalSyntheticApiModelOutline2;->m(Landroid/os/LocaleList;)Ljava/lang/String;
+HSPLandroidx/appcompat/app/AppCompatDelegateImpl$Api24Impl$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/res/Configuration;)Landroid/os/LocaleList;
+HSPLandroidx/appcompat/app/AppCompatDelegateImpl$Api24Impl$$ExternalSyntheticApiModelOutline5;->m(Landroid/os/LocaleList;)Ljava/lang/String;
 HSPLandroidx/appcompat/app/AppCompatDelegateImpl$Api24Impl;->getLocales(Landroid/content/res/Configuration;)Landroidx/core/os/LocaleListCompat;
 HSPLandroidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback;-><init>(Landroidx/appcompat/app/AppCompatDelegateImpl;Landroid/view/Window$Callback;)V
 HSPLandroidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback;->bypassOnContentChanged(Landroid/view/Window$Callback;)V
@@ -563,7 +837,6 @@ HSPLandroidx/appcompat/widget/AppCompatEditText;->drawableStateChanged()V
 HSPLandroidx/appcompat/widget/AppCompatEditText;->getText()Landroid/text/Editable;
 HSPLandroidx/appcompat/widget/AppCompatEditText;->getText()Ljava/lang/CharSequence;
 HSPLandroidx/appcompat/widget/AppCompatEditText;->initEmojiKeyListener(Landroidx/appcompat/widget/AppCompatEmojiEditTextHelper;)V
-HSPLandroidx/appcompat/widget/AppCompatEditText;->onCreateInputConnection(Landroid/view/inputmethod/EditorInfo;)Landroid/view/inputmethod/InputConnection;
 HSPLandroidx/appcompat/widget/AppCompatEditText;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 HSPLandroidx/appcompat/widget/AppCompatEditText;->setCompoundDrawables(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
 HSPLandroidx/appcompat/widget/AppCompatEditText;->setCustomSelectionActionModeCallback(Landroid/view/ActionMode$Callback;)V
@@ -572,13 +845,11 @@ HSPLandroidx/appcompat/widget/AppCompatEmojiEditTextHelper;-><init>(Landroid/wid
 HSPLandroidx/appcompat/widget/AppCompatEmojiEditTextHelper;->getKeyListener(Landroid/text/method/KeyListener;)Landroid/text/method/KeyListener;
 HSPLandroidx/appcompat/widget/AppCompatEmojiEditTextHelper;->isEmojiCapableKeyListener(Landroid/text/method/KeyListener;)Z
 HSPLandroidx/appcompat/widget/AppCompatEmojiEditTextHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V
-HSPLandroidx/appcompat/widget/AppCompatEmojiEditTextHelper;->onCreateInputConnection(Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;)Landroid/view/inputmethod/InputConnection;
 HSPLandroidx/appcompat/widget/AppCompatEmojiEditTextHelper;->setEnabled(Z)V
 HSPLandroidx/appcompat/widget/AppCompatEmojiTextHelper;-><init>(Landroid/widget/TextView;)V
 HSPLandroidx/appcompat/widget/AppCompatEmojiTextHelper;->getFilters([Landroid/text/InputFilter;)[Landroid/text/InputFilter;
 HSPLandroidx/appcompat/widget/AppCompatEmojiTextHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V
 HSPLandroidx/appcompat/widget/AppCompatEmojiTextHelper;->setEnabled(Z)V
-HSPLandroidx/appcompat/widget/AppCompatHintHelper;->onCreateInputConnection(Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;Landroid/view/View;)Landroid/view/inputmethod/InputConnection;
 HSPLandroidx/appcompat/widget/AppCompatImageButton;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLandroidx/appcompat/widget/AppCompatImageButton;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 HSPLandroidx/appcompat/widget/AppCompatImageButton;->drawableStateChanged()V
@@ -615,7 +886,6 @@ HSPLandroidx/appcompat/widget/AppCompatSeekBarHelper;->drawableStateChanged()V
 HSPLandroidx/appcompat/widget/AppCompatSeekBarHelper;->jumpDrawablesToCurrentState()V
 HSPLandroidx/appcompat/widget/AppCompatSeekBarHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V
 HSPLandroidx/appcompat/widget/AppCompatSeekBarHelper;->setTickMark(Landroid/graphics/drawable/Drawable;)V
-HSPLandroidx/appcompat/widget/AppCompatTextClassifierHelper$Api26Impl$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/Context;Ljava/lang/Class;)Ljava/lang/Object;
 HSPLandroidx/appcompat/widget/AppCompatTextClassifierHelper;-><init>(Landroid/widget/TextView;)V
 HSPLandroidx/appcompat/widget/AppCompatTextHelper$1;-><init>(Landroidx/appcompat/widget/AppCompatTextHelper;IILjava/lang/ref/WeakReference;)V
 HSPLandroidx/appcompat/widget/AppCompatTextHelper$1;->onFontRetrievalFailed(I)V
@@ -626,7 +896,6 @@ HSPLandroidx/appcompat/widget/AppCompatTextHelper;->applyCompoundDrawablesTints(
 HSPLandroidx/appcompat/widget/AppCompatTextHelper;->onLayout(ZIIII)V
 HSPLandroidx/appcompat/widget/AppCompatTextHelper;->onSetCompoundDrawables()V
 HSPLandroidx/appcompat/widget/AppCompatTextHelper;->onSetTextAppearance(Landroid/content/Context;I)V
-HSPLandroidx/appcompat/widget/AppCompatTextHelper;->populateSurroundingTextIfNeeded(Landroid/widget/TextView;Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;)V
 HSPLandroidx/appcompat/widget/AppCompatTextHelper;->setCompoundDrawables(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
 HSPLandroidx/appcompat/widget/AppCompatTextHelper;->updateTypefaceAndStyle(Landroid/content/Context;Landroidx/appcompat/widget/TintTypedArray;)V
 HSPLandroidx/appcompat/widget/AppCompatTextView;-><init>(Landroid/content/Context;)V
@@ -645,7 +914,6 @@ HSPLandroidx/appcompat/widget/AppCompatTextView;->setCompoundDrawables(Landroid/
 HSPLandroidx/appcompat/widget/AppCompatTextView;->setCompoundDrawablesRelative(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
 HSPLandroidx/appcompat/widget/AppCompatTextView;->setCompoundDrawablesRelativeWithIntrinsicBounds(IIII)V
 HSPLandroidx/appcompat/widget/AppCompatTextView;->setCompoundDrawablesRelativeWithIntrinsicBounds(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
-HSPLandroidx/appcompat/widget/AppCompatTextView;->setCompoundDrawablesWithIntrinsicBounds(IIII)V
 HSPLandroidx/appcompat/widget/AppCompatTextView;->setCompoundDrawablesWithIntrinsicBounds(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
 HSPLandroidx/appcompat/widget/AppCompatTextView;->setEmojiCompatEnabled(Z)V
 HSPLandroidx/appcompat/widget/AppCompatTextView;->setFilters([Landroid/text/InputFilter;)V
@@ -689,7 +957,6 @@ HSPLandroidx/appcompat/widget/LinearLayoutCompat;->checkLayoutParams(Landroid/vi
 HSPLandroidx/appcompat/widget/LinearLayoutCompat;->drawDividersHorizontal(Landroid/graphics/Canvas;)V
 HSPLandroidx/appcompat/widget/LinearLayoutCompat;->generateLayoutParams(Landroid/util/AttributeSet;)Landroid/view/ViewGroup$LayoutParams;
 HSPLandroidx/appcompat/widget/LinearLayoutCompat;->generateLayoutParams(Landroid/util/AttributeSet;)Landroidx/appcompat/widget/LinearLayoutCompat$LayoutParams;
-HSPLandroidx/appcompat/widget/LinearLayoutCompat;->getBaseline()I
 HSPLandroidx/appcompat/widget/LinearLayoutCompat;->getChildrenSkipCount(Landroid/view/View;I)I
 HSPLandroidx/appcompat/widget/LinearLayoutCompat;->getLocationOffset(Landroid/view/View;)I
 HSPLandroidx/appcompat/widget/LinearLayoutCompat;->getNextLocationOffset(Landroid/view/View;)I
@@ -766,8 +1033,8 @@ HSPLandroidx/appcompat/widget/TintTypedArray;->obtainStyledAttributes(Landroid/c
 HSPLandroidx/appcompat/widget/TintTypedArray;->obtainStyledAttributes(Landroid/content/Context;Landroid/util/AttributeSet;[I)Landroidx/appcompat/widget/TintTypedArray;
 HSPLandroidx/appcompat/widget/TintTypedArray;->obtainStyledAttributes(Landroid/content/Context;Landroid/util/AttributeSet;[III)Landroidx/appcompat/widget/TintTypedArray;
 HSPLandroidx/appcompat/widget/TintTypedArray;->recycle()V
-HSPLandroidx/appcompat/widget/Toolbar$$ExternalSyntheticLambda0;-><init>(Landroidx/appcompat/widget/Toolbar;)V
-HSPLandroidx/appcompat/widget/Toolbar$$ExternalSyntheticLambda0;->run()V
+HSPLandroidx/appcompat/widget/Toolbar$$ExternalSyntheticLambda1;-><init>(Landroidx/appcompat/widget/Toolbar;)V
+HSPLandroidx/appcompat/widget/Toolbar$$ExternalSyntheticLambda1;->run()V
 HSPLandroidx/appcompat/widget/Toolbar$1;-><init>(Landroidx/appcompat/widget/Toolbar;)V
 HSPLandroidx/appcompat/widget/Toolbar$2;-><init>(Landroidx/appcompat/widget/Toolbar;)V
 HSPLandroidx/appcompat/widget/Toolbar$3;-><init>(Landroidx/appcompat/widget/Toolbar;)V
@@ -852,7 +1119,6 @@ HSPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->setTitleInt(Ljava/lang/Char
 HSPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->setWindowCallback(Landroid/view/Window$Callback;)V
 HSPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->setWindowTitle(Ljava/lang/CharSequence;)V
 HSPLandroidx/appcompat/widget/ToolbarWidgetWrapper;->updateHomeAccessibility()V
-HSPLandroidx/appcompat/widget/TooltipCompat$Api26Impl$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/View;Ljava/lang/CharSequence;)V
 HSPLandroidx/appcompat/widget/TooltipCompat$Api26Impl;->setTooltipText(Landroid/view/View;Ljava/lang/CharSequence;)V
 HSPLandroidx/appcompat/widget/TooltipCompat;->setTooltipText(Landroid/view/View;Ljava/lang/CharSequence;)V
 HSPLandroidx/appcompat/widget/VectorEnabledTintResources;-><clinit>()V
@@ -872,7 +1138,6 @@ HSPLandroidx/arch/core/executor/ArchTaskExecutor;->getInstance()Landroidx/arch/c
 HSPLandroidx/arch/core/executor/ArchTaskExecutor;->isMainThread()Z
 HSPLandroidx/arch/core/executor/ArchTaskExecutor;->postToMainThread(Ljava/lang/Runnable;)V
 HSPLandroidx/arch/core/executor/DefaultTaskExecutor$1;-><init>(Landroidx/arch/core/executor/DefaultTaskExecutor;)V
-HSPLandroidx/arch/core/executor/DefaultTaskExecutor$Api28Impl$$ExternalSyntheticApiModelOutline0;->m(Landroid/os/Looper;)Landroid/os/Handler;
 HSPLandroidx/arch/core/executor/DefaultTaskExecutor$Api28Impl;->createAsync(Landroid/os/Looper;)Landroid/os/Handler;
 HSPLandroidx/arch/core/executor/DefaultTaskExecutor;-><init>()V
 HSPLandroidx/arch/core/executor/DefaultTaskExecutor;->createAsync(Landroid/os/Looper;)Landroid/os/Handler;
@@ -938,8 +1203,42 @@ HSPLandroidx/asynclayoutinflater/view/AsyncLayoutInflater;-><init>(Landroid/cont
 HSPLandroidx/asynclayoutinflater/view/AsyncLayoutInflater;->inflate(ILandroid/view/ViewGroup;Landroidx/asynclayoutinflater/view/AsyncLayoutInflater$OnInflateFinishedListener;)V
 HSPLandroidx/asynclayoutinflater/view/AsyncLayoutInflater;->inflateInternal(ILandroid/view/ViewGroup;Landroidx/asynclayoutinflater/view/AsyncLayoutInflater$OnInflateFinishedListener;Landroid/view/LayoutInflater;Ljava/util/concurrent/Executor;)V
 HSPLandroidx/asynclayoutinflater/view/AsyncLayoutInflater;->triggerCallbacks(Landroidx/asynclayoutinflater/view/AsyncLayoutInflater$InflateRequest;Landroidx/asynclayoutinflater/view/AsyncLayoutInflater$InflateThread;)V
-HSPLandroidx/camera/camera2/internal/compat/params/OutputConfigurationCompatApi24Impl$OutputConfigurationParamsApi24$$ExternalSyntheticBackport1;->m(J)I
+HSPLandroidx/camera/camera2/internal/compat/params/OutputConfigurationCompatApi24Impl$OutputConfigurationParamsApi24$$ExternalSyntheticBackport0;->m(J)I
 HSPLandroidx/camera/view/PreviewView$1$$ExternalSyntheticBackportWithForwarding0;->m(Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/Object;Ljava/lang/Object;)Z
+HSPLandroidx/cardview/R$styleable;-><clinit>()V
+HSPLandroidx/cardview/widget/CardView$1;-><init>(Landroidx/cardview/widget/CardView;)V
+HSPLandroidx/cardview/widget/CardView$1;->getCardBackground()Landroid/graphics/drawable/Drawable;
+HSPLandroidx/cardview/widget/CardView$1;->getCardView()Landroid/view/View;
+HSPLandroidx/cardview/widget/CardView$1;->getPreventCornerOverlap()Z
+HSPLandroidx/cardview/widget/CardView$1;->getUseCompatPadding()Z
+HSPLandroidx/cardview/widget/CardView$1;->setCardBackground(Landroid/graphics/drawable/Drawable;)V
+HSPLandroidx/cardview/widget/CardView$1;->setShadowPadding(IIII)V
+HSPLandroidx/cardview/widget/CardView;-><clinit>()V
+HSPLandroidx/cardview/widget/CardView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+HSPLandroidx/cardview/widget/CardView;->access$001(Landroidx/cardview/widget/CardView;IIII)V
+HSPLandroidx/cardview/widget/CardView;->getCardBackgroundColor()Landroid/content/res/ColorStateList;
+HSPLandroidx/cardview/widget/CardView;->getCardElevation()F
+HSPLandroidx/cardview/widget/CardView;->getContentPaddingBottom()I
+HSPLandroidx/cardview/widget/CardView;->getContentPaddingLeft()I
+HSPLandroidx/cardview/widget/CardView;->getContentPaddingRight()I
+HSPLandroidx/cardview/widget/CardView;->getContentPaddingTop()I
+HSPLandroidx/cardview/widget/CardView;->getPreventCornerOverlap()Z
+HSPLandroidx/cardview/widget/CardView;->getUseCompatPadding()Z
+HSPLandroidx/cardview/widget/CardView;->onMeasure(II)V
+HSPLandroidx/cardview/widget/CardView;->setContentPadding(IIII)V
+HSPLandroidx/cardview/widget/CardViewApi21Impl;-><init>()V
+HSPLandroidx/cardview/widget/CardViewApi21Impl;->getBackgroundColor(Landroidx/cardview/widget/CardViewDelegate;)Landroid/content/res/ColorStateList;
+HSPLandroidx/cardview/widget/CardViewApi21Impl;->getCardBackground(Landroidx/cardview/widget/CardViewDelegate;)Landroidx/cardview/widget/RoundRectDrawable;
+HSPLandroidx/cardview/widget/CardViewApi21Impl;->getElevation(Landroidx/cardview/widget/CardViewDelegate;)F
+HSPLandroidx/cardview/widget/CardViewApi21Impl;->initStatic()V
+HSPLandroidx/cardview/widget/CardViewApi21Impl;->initialize(Landroidx/cardview/widget/CardViewDelegate;Landroid/content/Context;Landroid/content/res/ColorStateList;FFF)V
+HSPLandroidx/cardview/widget/CardViewApi21Impl;->setMaxElevation(Landroidx/cardview/widget/CardViewDelegate;F)V
+HSPLandroidx/cardview/widget/CardViewApi21Impl;->updatePadding(Landroidx/cardview/widget/CardViewDelegate;)V
+HSPLandroidx/cardview/widget/RoundRectDrawable;-><init>(Landroid/content/res/ColorStateList;F)V
+HSPLandroidx/cardview/widget/RoundRectDrawable;->getColor()Landroid/content/res/ColorStateList;
+HSPLandroidx/cardview/widget/RoundRectDrawable;->setBackground(Landroid/content/res/ColorStateList;)V
+HSPLandroidx/cardview/widget/RoundRectDrawable;->setPadding(FZZ)V
+HSPLandroidx/cardview/widget/RoundRectDrawable;->updateBounds(Landroid/graphics/Rect;)V
 HSPLandroidx/collection/ArrayMap$EntrySet;-><init>(Landroidx/collection/ArrayMap;)V
 HSPLandroidx/collection/ArrayMap$EntrySet;->iterator()Ljava/util/Iterator;
 HSPLandroidx/collection/ArrayMap$MapIterator;-><init>(Landroidx/collection/ArrayMap;)V
@@ -1035,16 +1334,12 @@ HSPLandroidx/collection/SparseArrayKt$valueIterator$1;-><init>(Landroidx/collect
 HSPLandroidx/collection/SparseArrayKt$valueIterator$1;->hasNext()Z
 HSPLandroidx/collection/SparseArrayKt$valueIterator$1;->next()Ljava/lang/Object;
 HSPLandroidx/collection/SparseArrayKt;->valueIterator(Landroidx/collection/SparseArrayCompat;)Ljava/util/Iterator;
-HSPLandroidx/compose/ui/autofill/AndroidAutofill$$ExternalSyntheticApiModelOutline1;->m(Landroid/view/View;I)V
 HSPLandroidx/compose/ui/graphics/AndroidImageBitmap_androidKt$$ExternalSyntheticApiModelOutline0;->m()Landroid/graphics/Bitmap$Config;
 HSPLandroidx/compose/ui/graphics/AndroidImageBitmap_androidKt$$ExternalSyntheticApiModelOutline1;->m()Landroid/graphics/Bitmap$Config;
 HSPLandroidx/compose/ui/platform/AndroidComposeView$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/res/Configuration;)I
-HSPLandroidx/compose/ui/platform/coreshims/SoftwareKeyboardControllerCompat$Impl30$$ExternalSyntheticApiModelOutline1;->m()I
-HSPLandroidx/compose/ui/text/intl/AndroidLocaleDelegateAPI24$$ExternalSyntheticApiModelOutline0;->m()Landroid/os/LocaleList;
+HSPLandroidx/compose/ui/platform/coreshims/SoftwareKeyboardControllerCompat$Impl30$$ExternalSyntheticApiModelOutline3;->m()I
 HSPLandroidx/compose/ui/text/intl/AndroidLocaleDelegateAPI24$$ExternalSyntheticApiModelOutline1;->m(Landroid/os/LocaleList;)I
 HSPLandroidx/compose/ui/text/intl/AndroidLocaleDelegateAPI24$$ExternalSyntheticApiModelOutline2;->m(Landroid/os/LocaleList;I)Ljava/util/Locale;
-HSPLandroidx/compose/ui/text/platform/extensions/LocaleListHelperMethods$$ExternalSyntheticApiModelOutline0;->m([Ljava/util/Locale;)Landroid/os/LocaleList;
-HSPLandroidx/compose/ui/text/platform/extensions/LocaleListHelperMethods$$ExternalSyntheticApiModelOutline2;->m()V
 HSPLandroidx/concurrent/futures/AbstractResolvableFuture$SafeAtomicHelper$$ExternalSyntheticBackportWithForwarding0;->m(Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 HSPLandroidx/constraintlayout/core/ArrayLinkedVariables;-><clinit>()V
 HSPLandroidx/constraintlayout/core/ArrayLinkedVariables;-><init>(Landroidx/constraintlayout/core/ArrayRow;Landroidx/constraintlayout/core/Cache;)V
@@ -1056,6 +1351,8 @@ HSPLandroidx/constraintlayout/core/ArrayLinkedVariables;->getCurrentSize()I
 HSPLandroidx/constraintlayout/core/ArrayLinkedVariables;->getVariable(I)Landroidx/constraintlayout/core/SolverVariable;
 HSPLandroidx/constraintlayout/core/ArrayLinkedVariables;->getVariableValue(I)F
 HSPLandroidx/constraintlayout/core/ArrayLinkedVariables;->invert()V
+HSPLandroidx/constraintlayout/core/ArrayLinkedVariables;->remove(Landroidx/constraintlayout/core/SolverVariable;Z)F
+HSPLandroidx/constraintlayout/core/ArrayLinkedVariables;->use(Landroidx/constraintlayout/core/ArrayRow;Z)F
 HSPLandroidx/constraintlayout/core/ArrayRow;-><init>(Landroidx/constraintlayout/core/Cache;)V
 HSPLandroidx/constraintlayout/core/ArrayRow;->addError(Landroidx/constraintlayout/core/LinearSystem;I)Landroidx/constraintlayout/core/ArrayRow;
 HSPLandroidx/constraintlayout/core/ArrayRow;->addSingleError(Landroidx/constraintlayout/core/SolverVariable;I)Landroidx/constraintlayout/core/ArrayRow;
@@ -1075,7 +1372,6 @@ HSPLandroidx/constraintlayout/core/ArrayRow;->isNew(Landroidx/constraintlayout/c
 HSPLandroidx/constraintlayout/core/ArrayRow;->pivot(Landroidx/constraintlayout/core/SolverVariable;)V
 HSPLandroidx/constraintlayout/core/ArrayRow;->reset()V
 HSPLandroidx/constraintlayout/core/ArrayRow;->updateFromFinalVariable(Landroidx/constraintlayout/core/LinearSystem;Landroidx/constraintlayout/core/SolverVariable;Z)V
-HSPLandroidx/constraintlayout/core/ArrayRow;->updateFromSystem(Landroidx/constraintlayout/core/LinearSystem;)V
 HSPLandroidx/constraintlayout/core/Cache;-><init>()V
 HSPLandroidx/constraintlayout/core/LinearSystem;-><clinit>()V
 HSPLandroidx/constraintlayout/core/LinearSystem;-><init>()V
@@ -1086,10 +1382,11 @@ HSPLandroidx/constraintlayout/core/LinearSystem;->addGreaterBarrier(Landroidx/co
 HSPLandroidx/constraintlayout/core/LinearSystem;->addGreaterThan(Landroidx/constraintlayout/core/SolverVariable;Landroidx/constraintlayout/core/SolverVariable;II)V
 HSPLandroidx/constraintlayout/core/LinearSystem;->addLowerBarrier(Landroidx/constraintlayout/core/SolverVariable;Landroidx/constraintlayout/core/SolverVariable;IZ)V
 HSPLandroidx/constraintlayout/core/LinearSystem;->addLowerThan(Landroidx/constraintlayout/core/SolverVariable;Landroidx/constraintlayout/core/SolverVariable;II)V
+HSPLandroidx/constraintlayout/core/LinearSystem;->addRow(Landroidx/constraintlayout/core/ArrayRow;)V
 HSPLandroidx/constraintlayout/core/LinearSystem;->addSingleError(Landroidx/constraintlayout/core/ArrayRow;II)V
 HSPLandroidx/constraintlayout/core/LinearSystem;->computeValues()V
-HSPLandroidx/constraintlayout/core/LinearSystem;->createErrorVariable(ILjava/lang/String;)Landroidx/constraintlayout/core/SolverVariable;
 HSPLandroidx/constraintlayout/core/LinearSystem;->createObjectVariable(Ljava/lang/Object;)Landroidx/constraintlayout/core/SolverVariable;
+HSPLandroidx/constraintlayout/core/LinearSystem;->createRow()Landroidx/constraintlayout/core/ArrayRow;
 HSPLandroidx/constraintlayout/core/LinearSystem;->createSlackVariable()Landroidx/constraintlayout/core/SolverVariable;
 HSPLandroidx/constraintlayout/core/LinearSystem;->enforceBFS(Landroidx/constraintlayout/core/LinearSystem$Row;)I
 HSPLandroidx/constraintlayout/core/LinearSystem;->getCache()Landroidx/constraintlayout/core/Cache;
@@ -1173,6 +1470,7 @@ HSPLandroidx/constraintlayout/core/widgets/ConstraintWidget;-><clinit>()V
 HSPLandroidx/constraintlayout/core/widgets/ConstraintWidget;-><init>()V
 HSPLandroidx/constraintlayout/core/widgets/ConstraintWidget;->addAnchors()V
 HSPLandroidx/constraintlayout/core/widgets/ConstraintWidget;->addFirst()Z
+HSPLandroidx/constraintlayout/core/widgets/ConstraintWidget;->applyConstraints(Landroidx/constraintlayout/core/LinearSystem;ZZZZLandroidx/constraintlayout/core/SolverVariable;Landroidx/constraintlayout/core/SolverVariable;Landroidx/constraintlayout/core/widgets/ConstraintWidget$DimensionBehaviour;ZLandroidx/constraintlayout/core/widgets/ConstraintAnchor;Landroidx/constraintlayout/core/widgets/ConstraintAnchor;IIIIFZZZZZIIIIFZ)V
 HSPLandroidx/constraintlayout/core/widgets/ConstraintWidget;->createObjectVariables(Landroidx/constraintlayout/core/LinearSystem;)V
 HSPLandroidx/constraintlayout/core/widgets/ConstraintWidget;->getAnchor(Landroidx/constraintlayout/core/widgets/ConstraintAnchor$Type;)Landroidx/constraintlayout/core/widgets/ConstraintAnchor;
 HSPLandroidx/constraintlayout/core/widgets/ConstraintWidget;->getBaselineDistance()I
@@ -1215,6 +1513,7 @@ HSPLandroidx/constraintlayout/core/widgets/ConstraintWidget;->isResolvedVertical
 HSPLandroidx/constraintlayout/core/widgets/ConstraintWidget;->isVerticalSolvingPassDone()Z
 HSPLandroidx/constraintlayout/core/widgets/ConstraintWidget;->markHorizontalSolvingPassDone()V
 HSPLandroidx/constraintlayout/core/widgets/ConstraintWidget;->markVerticalSolvingPassDone()V
+HSPLandroidx/constraintlayout/core/widgets/ConstraintWidget;->reset()V
 HSPLandroidx/constraintlayout/core/widgets/ConstraintWidget;->resetFinalResolution()V
 HSPLandroidx/constraintlayout/core/widgets/ConstraintWidget;->resetSolverVariables(Landroidx/constraintlayout/core/Cache;)V
 HSPLandroidx/constraintlayout/core/widgets/ConstraintWidget;->setBaselineDistance(I)V
@@ -1272,7 +1571,6 @@ HSPLandroidx/constraintlayout/core/widgets/ConstraintWidgetContainer;->invalidat
 HSPLandroidx/constraintlayout/core/widgets/ConstraintWidgetContainer;->isHeightMeasuredTooSmall()Z
 HSPLandroidx/constraintlayout/core/widgets/ConstraintWidgetContainer;->isRtl()Z
 HSPLandroidx/constraintlayout/core/widgets/ConstraintWidgetContainer;->isWidthMeasuredTooSmall()Z
-HSPLandroidx/constraintlayout/core/widgets/ConstraintWidgetContainer;->layout()V
 HSPLandroidx/constraintlayout/core/widgets/ConstraintWidgetContainer;->measure(IIIIIIIII)J
 HSPLandroidx/constraintlayout/core/widgets/ConstraintWidgetContainer;->measure(ILandroidx/constraintlayout/core/widgets/ConstraintWidget;Landroidx/constraintlayout/core/widgets/analyzer/BasicMeasure$Measurer;Landroidx/constraintlayout/core/widgets/analyzer/BasicMeasure$Measure;I)Z
 HSPLandroidx/constraintlayout/core/widgets/ConstraintWidgetContainer;->optimizeFor(I)Z
@@ -1323,6 +1621,7 @@ HSPLandroidx/constraintlayout/core/widgets/analyzer/DependencyGraph;->invalidate
 HSPLandroidx/constraintlayout/core/widgets/analyzer/DependencyGraph;->setMeasurer(Landroidx/constraintlayout/core/widgets/analyzer/BasicMeasure$Measurer;)V
 HSPLandroidx/constraintlayout/core/widgets/analyzer/Direct;-><clinit>()V
 HSPLandroidx/constraintlayout/core/widgets/analyzer/Direct;->canMeasure(ILandroidx/constraintlayout/core/widgets/ConstraintWidget;)Z
+HSPLandroidx/constraintlayout/core/widgets/analyzer/Direct;->horizontalSolvingPass(ILandroidx/constraintlayout/core/widgets/ConstraintWidget;Landroidx/constraintlayout/core/widgets/analyzer/BasicMeasure$Measurer;Z)V
 HSPLandroidx/constraintlayout/core/widgets/analyzer/Direct;->solveBarrier(ILandroidx/constraintlayout/core/widgets/Barrier;Landroidx/constraintlayout/core/widgets/analyzer/BasicMeasure$Measurer;IZ)V
 HSPLandroidx/constraintlayout/core/widgets/analyzer/Direct;->solveHorizontalCenterConstraints(ILandroidx/constraintlayout/core/widgets/analyzer/BasicMeasure$Measurer;Landroidx/constraintlayout/core/widgets/ConstraintWidget;Z)V
 HSPLandroidx/constraintlayout/core/widgets/analyzer/Direct;->solveHorizontalMatchConstraint(ILandroidx/constraintlayout/core/widgets/ConstraintWidget;Landroidx/constraintlayout/core/widgets/analyzer/BasicMeasure$Measurer;Landroidx/constraintlayout/core/widgets/ConstraintWidget;Z)V
@@ -1352,7 +1651,7 @@ HSPLandroidx/constraintlayout/widget/ConstraintHelper;->updatePreLayout(Landroid
 HSPLandroidx/constraintlayout/widget/ConstraintHelper;->validateParams()V
 HSPLandroidx/constraintlayout/widget/ConstraintLayout$1;-><clinit>()V
 HSPLandroidx/constraintlayout/widget/ConstraintLayout$LayoutParams$Table;-><clinit>()V
-HSPLandroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+HSPLandroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->resolveLayoutDirection(I)V
 HSPLandroidx/constraintlayout/widget/ConstraintLayout$LayoutParams;->validate()V
 HSPLandroidx/constraintlayout/widget/ConstraintLayout$Measurer;-><init>(Landroidx/constraintlayout/widget/ConstraintLayout;Landroidx/constraintlayout/widget/ConstraintLayout;)V
 HSPLandroidx/constraintlayout/widget/ConstraintLayout$Measurer;->captureLayoutInfo(IIIIII)V
@@ -1409,6 +1708,7 @@ HSPLandroidx/constraintlayout/widget/Guideline;->setGuidelineBegin(I)V
 HSPLandroidx/constraintlayout/widget/Guideline;->setGuidelineEnd(I)V
 HSPLandroidx/constraintlayout/widget/R$styleable;-><clinit>()V
 HSPLandroidx/coordinatorlayout/R$styleable;-><clinit>()V
+HSPLandroidx/coordinatorlayout/widget/CoordinatorLayout$$ExternalSyntheticApiModelOutline0;->m(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/content/Context;[ILandroid/util/AttributeSet;Landroid/content/res/TypedArray;II)V
 HSPLandroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLandroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;->blocksInteractionBelow(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;)Z
 HSPLandroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;->getScrimOpacity(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;)F
@@ -1506,10 +1806,7 @@ HSPLandroidx/coordinatorlayout/widget/ViewGroupUtils;->offsetDescendantMatrix(La
 HSPLandroidx/coordinatorlayout/widget/ViewGroupUtils;->offsetDescendantRect(Landroid/view/ViewGroup;Landroid/view/View;Landroid/graphics/Rect;)V
 HSPLandroidx/core/R$styleable;-><clinit>()V
 HSPLandroidx/core/app/ActivityCompat$Api21Impl;->postponeEnterTransition(Landroid/app/Activity;)V
-HSPLandroidx/core/app/ActivityCompat$Api21Impl;->startPostponedEnterTransition(Landroid/app/Activity;)V
 HSPLandroidx/core/app/ActivityCompat;->postponeEnterTransition(Landroid/app/Activity;)V
-HSPLandroidx/core/app/ActivityCompat;->startPostponedEnterTransition(Landroid/app/Activity;)V
-HSPLandroidx/core/app/AppOpsManagerCompat$Api23Impl$$ExternalSyntheticApiModelOutline1;->m(Ljava/lang/String;)Ljava/lang/String;
 HSPLandroidx/core/app/AppOpsManagerCompat$Api23Impl;->permissionToOp(Ljava/lang/String;)Ljava/lang/String;
 HSPLandroidx/core/app/AppOpsManagerCompat;->permissionToOp(Ljava/lang/String;)Ljava/lang/String;
 HSPLandroidx/core/app/ComponentActivity;-><init>()V
@@ -1522,19 +1819,15 @@ HSPLandroidx/core/app/CoreComponentFactory;->instantiateProvider(Ljava/lang/Clas
 HSPLandroidx/core/app/CoreComponentFactory;->instantiateService(Ljava/lang/ClassLoader;Ljava/lang/String;Landroid/content/Intent;)Landroid/app/Service;
 HSPLandroidx/core/app/NavUtils;->getParentActivityName(Landroid/app/Activity;)Ljava/lang/String;
 HSPLandroidx/core/app/NavUtils;->getParentActivityName(Landroid/content/Context;Landroid/content/ComponentName;)Ljava/lang/String;
-HSPLandroidx/core/app/NotificationManagerCompat$Api24Impl$$ExternalSyntheticApiModelOutline1;->m(Landroid/app/NotificationManager;)Z
 HSPLandroidx/core/app/NotificationManagerCompat;-><clinit>()V
 HSPLandroidx/core/app/NotificationManagerCompat;-><init>(Landroid/content/Context;)V
 HSPLandroidx/core/app/NotificationManagerCompat;->cancel(I)V
 HSPLandroidx/core/app/NotificationManagerCompat;->cancel(Ljava/lang/String;I)V
 HSPLandroidx/core/app/NotificationManagerCompat;->from(Landroid/content/Context;)Landroidx/core/app/NotificationManagerCompat;
-HSPLandroidx/core/content/ContentValuesKt;->contentValuesOf([Lkotlin/Pair;)Landroid/content/ContentValues;
 HSPLandroidx/core/content/ContextCompat$Api21Impl;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
-HSPLandroidx/core/content/ContextCompat$Api23Impl$$ExternalSyntheticApiModelOutline1;->m(Landroid/content/Context;I)I
 HSPLandroidx/core/content/ContextCompat$Api23Impl;->getColor(Landroid/content/Context;I)I
 HSPLandroidx/core/content/ContextCompat$Api23Impl;->getSystemService(Landroid/content/Context;Ljava/lang/Class;)Ljava/lang/Object;
 HSPLandroidx/core/content/ContextCompat$Api26Impl;->registerReceiver(Landroid/content/Context;Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;Ljava/lang/String;Landroid/os/Handler;I)Landroid/content/Intent;
-HSPLandroidx/core/content/ContextCompat$Api28Impl$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/Context;)Ljava/util/concurrent/Executor;
 HSPLandroidx/core/content/ContextCompat$Api28Impl;->getMainExecutor(Landroid/content/Context;)Ljava/util/concurrent/Executor;
 HSPLandroidx/core/content/ContextCompat;-><clinit>()V
 HSPLandroidx/core/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I
@@ -1562,7 +1855,6 @@ HSPLandroidx/core/content/res/ColorStateListInflaterCompat;->modulateColorAlpha(
 HSPLandroidx/core/content/res/ColorStateListInflaterCompat;->obtainAttributes(Landroid/content/res/Resources;Landroid/content/res/Resources$Theme;Landroid/util/AttributeSet;[I)Landroid/content/res/TypedArray;
 HSPLandroidx/core/content/res/GrowingArrayUtils;->append([III)[I
 HSPLandroidx/core/content/res/GrowingArrayUtils;->append([Ljava/lang/Object;ILjava/lang/Object;)[Ljava/lang/Object;
-HSPLandroidx/core/content/res/ResourcesCompat$Api23Impl$$ExternalSyntheticApiModelOutline0;->m(Landroid/content/res/Resources;ILandroid/content/res/Resources$Theme;)Landroid/content/res/ColorStateList;
 HSPLandroidx/core/content/res/ResourcesCompat$Api23Impl;->getColorStateList(Landroid/content/res/Resources;ILandroid/content/res/Resources$Theme;)Landroid/content/res/ColorStateList;
 HSPLandroidx/core/content/res/ResourcesCompat$ColorStateListCacheEntry;-><init>(Landroid/content/res/ColorStateList;Landroid/content/res/Configuration;Landroid/content/res/Resources$Theme;)V
 HSPLandroidx/core/content/res/ResourcesCompat$ColorStateListCacheKey;-><init>(Landroid/content/res/Resources;Landroid/content/res/Resources$Theme;)V
@@ -1570,7 +1862,7 @@ HSPLandroidx/core/content/res/ResourcesCompat$ColorStateListCacheKey;->equals(Lj
 HSPLandroidx/core/content/res/ResourcesCompat$ColorStateListCacheKey;->hashCode()I
 HSPLandroidx/core/content/res/ResourcesCompat$FontCallback$$ExternalSyntheticLambda1;-><init>(Landroidx/core/content/res/ResourcesCompat$FontCallback;I)V
 HSPLandroidx/core/content/res/ResourcesCompat$FontCallback$$ExternalSyntheticLambda1;->run()V
-HSPLandroidx/core/content/res/ResourcesCompat$FontCallback;->$r8$lambda$3yv7dDJDSSH8XKTxkNkwYH6nK6w(Landroidx/core/content/res/ResourcesCompat$FontCallback;I)V
+HSPLandroidx/core/content/res/ResourcesCompat$FontCallback;->$r8$lambda$iq3V68-a5RqNx7LeKJ2odF7JKlo(Landroidx/core/content/res/ResourcesCompat$FontCallback;I)V
 HSPLandroidx/core/content/res/ResourcesCompat$FontCallback;-><init>()V
 HSPLandroidx/core/content/res/ResourcesCompat$FontCallback;->callbackFailAsync(ILandroid/os/Handler;)V
 HSPLandroidx/core/content/res/ResourcesCompat$FontCallback;->getHandler(Landroid/os/Handler;)Landroid/os/Handler;
@@ -1604,8 +1896,6 @@ HSPLandroidx/core/graphics/drawable/DrawableCompat$Api21Impl;->setHotspotBounds(
 HSPLandroidx/core/graphics/drawable/DrawableCompat$Api21Impl;->setTint(Landroid/graphics/drawable/Drawable;I)V
 HSPLandroidx/core/graphics/drawable/DrawableCompat$Api21Impl;->setTintList(Landroid/graphics/drawable/Drawable;Landroid/content/res/ColorStateList;)V
 HSPLandroidx/core/graphics/drawable/DrawableCompat$Api21Impl;->setTintMode(Landroid/graphics/drawable/Drawable;Landroid/graphics/PorterDuff$Mode;)V
-HSPLandroidx/core/graphics/drawable/DrawableCompat$Api23Impl$$ExternalSyntheticApiModelOutline0;->m(Landroid/graphics/drawable/Drawable;I)Z
-HSPLandroidx/core/graphics/drawable/DrawableCompat$Api23Impl$$ExternalSyntheticApiModelOutline1;->m(Landroid/graphics/drawable/Drawable;)I
 HSPLandroidx/core/graphics/drawable/DrawableCompat$Api23Impl;->getLayoutDirection(Landroid/graphics/drawable/Drawable;)I
 HSPLandroidx/core/graphics/drawable/DrawableCompat$Api23Impl;->setLayoutDirection(Landroid/graphics/drawable/Drawable;I)Z
 HSPLandroidx/core/graphics/drawable/DrawableCompat;->getLayoutDirection(Landroid/graphics/drawable/Drawable;)I
@@ -1621,7 +1911,6 @@ HSPLandroidx/core/math/MathUtils;->clamp(III)I
 HSPLandroidx/core/os/CancellationSignal;-><init>()V
 HSPLandroidx/core/os/CancellationSignal;->setOnCancelListener(Landroidx/core/os/CancellationSignal$OnCancelListener;)V
 HSPLandroidx/core/os/CancellationSignal;->waitForCancelFinishedLocked()V
-HSPLandroidx/core/os/ConfigurationCompat$Api24Impl$$ExternalSyntheticApiModelOutline0;->m(Ljava/lang/Object;)Landroid/os/LocaleList;
 HSPLandroidx/core/os/ConfigurationCompat$Api24Impl;->getLocales(Landroid/content/res/Configuration;)Landroid/os/LocaleList;
 HSPLandroidx/core/os/ConfigurationCompat;->getLocales(Landroid/content/res/Configuration;)Landroidx/core/os/LocaleListCompat;
 HSPLandroidx/core/os/LocaleListCompat$Api21Impl;-><clinit>()V
@@ -1638,6 +1927,7 @@ HSPLandroidx/core/os/LocaleListCompat;->getFirstMatch([Ljava/lang/String;)Ljava/
 HSPLandroidx/core/os/LocaleListCompat;->size()I
 HSPLandroidx/core/os/LocaleListCompat;->wrap(Landroid/os/LocaleList;)Landroidx/core/os/LocaleListCompat;
 HSPLandroidx/core/os/LocaleListPlatformWrapper$$ExternalSyntheticApiModelOutline0;->m(Landroid/os/LocaleList;[Ljava/lang/String;)Ljava/util/Locale;
+HSPLandroidx/core/os/LocaleListPlatformWrapper$$ExternalSyntheticApiModelOutline4;->m(Ljava/lang/Object;)Landroid/os/LocaleList;
 HSPLandroidx/core/os/LocaleListPlatformWrapper;-><init>(Ljava/lang/Object;)V
 HSPLandroidx/core/os/LocaleListPlatformWrapper;->get(I)Ljava/util/Locale;
 HSPLandroidx/core/os/LocaleListPlatformWrapper;->getFirstMatch([Ljava/lang/String;)Ljava/util/Locale;
@@ -1647,13 +1937,8 @@ HSPLandroidx/core/os/TraceCompat$Api18Impl;->endSection()V
 HSPLandroidx/core/os/TraceCompat;-><clinit>()V
 HSPLandroidx/core/os/TraceCompat;->beginSection(Ljava/lang/String;)V
 HSPLandroidx/core/os/TraceCompat;->endSection()V
-HSPLandroidx/core/os/UserManagerCompat$Api24Impl$$ExternalSyntheticApiModelOutline0;->m(Landroid/os/UserManager;)Z
 HSPLandroidx/core/os/UserManagerCompat$Api24Impl;->isUserUnlocked(Landroid/content/Context;)Z
 HSPLandroidx/core/os/UserManagerCompat;->isUserUnlocked(Landroid/content/Context;)Z
-HSPLandroidx/core/text/util/LinkifyCompat$$ExternalSyntheticLambda0;-><init>()V
-HSPLandroidx/core/text/util/LinkifyCompat;-><clinit>()V
-HSPLandroidx/core/text/util/LinkifyCompat;->addLinks(Landroid/text/Spannable;I)Z
-HSPLandroidx/core/text/util/LinkifyCompat;->shouldAddLinksFallbackToFramework()Z
 HSPLandroidx/core/util/ObjectsCompat$Api19Impl;->equals(Ljava/lang/Object;Ljava/lang/Object;)Z
 HSPLandroidx/core/util/ObjectsCompat$Api19Impl;->hash([Ljava/lang/Object;)I
 HSPLandroidx/core/util/ObjectsCompat;->equals(Ljava/lang/Object;Ljava/lang/Object;)Z
@@ -1723,7 +2008,6 @@ HSPLandroidx/core/view/NestedScrollingChildHelper;->isNestedScrollingEnabled()Z
 HSPLandroidx/core/view/NestedScrollingChildHelper;->setNestedScrollingEnabled(Z)V
 HSPLandroidx/core/view/NestedScrollingChildHelper;->setNestedScrollingParentForType(ILandroid/view/ViewParent;)V
 HSPLandroidx/core/view/NestedScrollingChildHelper;->startNestedScroll(II)Z
-HSPLandroidx/core/view/NestedScrollingChildHelper;->stopNestedScroll()V
 HSPLandroidx/core/view/NestedScrollingChildHelper;->stopNestedScroll(I)V
 HSPLandroidx/core/view/NestedScrollingParentHelper;-><init>(Landroid/view/ViewGroup;)V
 HSPLandroidx/core/view/NestedScrollingParentHelper;->onNestedScrollAccepted(Landroid/view/View;Landroid/view/View;II)V
@@ -1778,23 +2062,14 @@ HSPLandroidx/core/view/ViewCompat$Api21Impl;->getElevation(Landroid/view/View;)F
 HSPLandroidx/core/view/ViewCompat$Api21Impl;->getZ(Landroid/view/View;)F
 HSPLandroidx/core/view/ViewCompat$Api21Impl;->setBackgroundTintList(Landroid/view/View;Landroid/content/res/ColorStateList;)V
 HSPLandroidx/core/view/ViewCompat$Api21Impl;->setOnApplyWindowInsetsListener(Landroid/view/View;Landroidx/core/view/OnApplyWindowInsetsListener;)V
-HSPLandroidx/core/view/ViewCompat$Api23Impl$$ExternalSyntheticApiModelOutline1;->m(Landroid/view/View;)Landroid/view/WindowInsets;
 HSPLandroidx/core/view/ViewCompat$Api23Impl;->getRootWindowInsets(Landroid/view/View;)Landroidx/core/view/WindowInsetsCompat;
-HSPLandroidx/core/view/ViewCompat$Api26Impl$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/View;)I
 HSPLandroidx/core/view/ViewCompat$Api26Impl;->getImportantForAutofill(Landroid/view/View;)I
 HSPLandroidx/core/view/ViewCompat$Api26Impl;->setImportantForAutofill(Landroid/view/View;I)V
-HSPLandroidx/core/view/ViewCompat$Api28Impl$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/View;)Z
-HSPLandroidx/core/view/ViewCompat$Api28Impl$$ExternalSyntheticApiModelOutline10;->m(Landroid/view/View;)Ljava/lang/CharSequence;
-HSPLandroidx/core/view/ViewCompat$Api28Impl$$ExternalSyntheticApiModelOutline2;->m(Landroid/view/View;Landroid/view/View$OnUnhandledKeyEventListener;)V
-HSPLandroidx/core/view/ViewCompat$Api28Impl$$ExternalSyntheticApiModelOutline4;->m(Landroid/view/View;)Z
 HSPLandroidx/core/view/ViewCompat$Api28Impl;->getAccessibilityPaneTitle(Landroid/view/View;)Ljava/lang/CharSequence;
 HSPLandroidx/core/view/ViewCompat$Api28Impl;->isAccessibilityHeading(Landroid/view/View;)Z
 HSPLandroidx/core/view/ViewCompat$Api28Impl;->isScreenReaderFocusable(Landroid/view/View;)Z
-HSPLandroidx/core/view/ViewCompat$Api29Impl$$ExternalSyntheticApiModelOutline2;->m(Landroid/view/View;)Landroid/view/View$AccessibilityDelegate;
-HSPLandroidx/core/view/ViewCompat$Api29Impl$$ExternalSyntheticApiModelOutline3;->m(Landroid/view/View;Landroid/content/Context;[ILandroid/util/AttributeSet;Landroid/content/res/TypedArray;II)V
 HSPLandroidx/core/view/ViewCompat$Api29Impl;->getAccessibilityDelegate(Landroid/view/View;)Landroid/view/View$AccessibilityDelegate;
 HSPLandroidx/core/view/ViewCompat$Api29Impl;->saveAttributeDataForStyleable(Landroid/view/View;Landroid/content/Context;[ILandroid/util/AttributeSet;Landroid/content/res/TypedArray;II)V
-HSPLandroidx/core/view/ViewCompat$Api30Impl$$ExternalSyntheticApiModelOutline2;->m(Landroid/view/View;)Ljava/lang/CharSequence;
 HSPLandroidx/core/view/ViewCompat$Api30Impl;->getStateDescription(Landroid/view/View;)Ljava/lang/CharSequence;
 HSPLandroidx/core/view/ViewCompat;-><clinit>()V
 HSPLandroidx/core/view/ViewCompat;->accessibilityHeadingProperty()Landroidx/core/view/ViewCompat$AccessibilityViewProperty;
@@ -1849,11 +2124,8 @@ HSPLandroidx/core/view/ViewCompat;->setOnApplyWindowInsetsListener(Landroid/view
 HSPLandroidx/core/view/ViewCompat;->setPaddingRelative(Landroid/view/View;IIII)V
 HSPLandroidx/core/view/ViewCompat;->setWindowInsetsAnimationCallback(Landroid/view/View;Landroidx/core/view/WindowInsetsAnimationCompat$Callback;)V
 HSPLandroidx/core/view/ViewCompat;->stateDescriptionProperty()Landroidx/core/view/ViewCompat$AccessibilityViewProperty;
-HSPLandroidx/core/view/ViewConfigurationCompat$Api26Impl$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/ViewConfiguration;)F
-HSPLandroidx/core/view/ViewConfigurationCompat$Api26Impl$$ExternalSyntheticApiModelOutline1;->m(Landroid/view/ViewConfiguration;)F
 HSPLandroidx/core/view/ViewConfigurationCompat$Api26Impl;->getScaledHorizontalScrollFactor(Landroid/view/ViewConfiguration;)F
 HSPLandroidx/core/view/ViewConfigurationCompat$Api26Impl;->getScaledVerticalScrollFactor(Landroid/view/ViewConfiguration;)F
-HSPLandroidx/core/view/ViewConfigurationCompat$Api28Impl$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/ViewConfiguration;)Z
 HSPLandroidx/core/view/ViewConfigurationCompat$Api28Impl;->shouldShowMenuShortcutsWhenKeyboardPresent(Landroid/view/ViewConfiguration;)Z
 HSPLandroidx/core/view/ViewConfigurationCompat;-><clinit>()V
 HSPLandroidx/core/view/ViewConfigurationCompat;->getScaledHorizontalScrollFactor(Landroid/view/ViewConfiguration;Landroid/content/Context;)F
@@ -1863,28 +2135,24 @@ HSPLandroidx/core/view/ViewGroupKt$children$1;-><init>(Landroid/view/ViewGroup;)
 HSPLandroidx/core/view/ViewGroupKt$children$1;->iterator()Ljava/util/Iterator;
 HSPLandroidx/core/view/ViewGroupKt$iterator$1;-><init>(Landroid/view/ViewGroup;)V
 HSPLandroidx/core/view/ViewGroupKt$iterator$1;->hasNext()Z
-HSPLandroidx/core/view/ViewGroupKt$iterator$1;->next()Landroid/view/View;
-HSPLandroidx/core/view/ViewGroupKt$iterator$1;->next()Ljava/lang/Object;
 HSPLandroidx/core/view/ViewGroupKt;->getChildren(Landroid/view/ViewGroup;)Lkotlin/sequences/Sequence;
 HSPLandroidx/core/view/ViewGroupKt;->iterator(Landroid/view/ViewGroup;)Ljava/util/Iterator;
 HSPLandroidx/core/view/ViewKt$doOnPreDraw$1;-><init>(Lkotlin/jvm/functions/Function1;Landroid/view/View;)V
 HSPLandroidx/core/view/ViewKt$doOnPreDraw$1;->run()V
 HSPLandroidx/core/view/ViewKt;->doOnPreDraw(Landroid/view/View;Lkotlin/jvm/functions/Function1;)Landroidx/core/view/OneShotPreDrawListener;
-HSPLandroidx/core/view/ViewKt;->isVisible(Landroid/view/View;)Z
 HSPLandroidx/core/view/ViewParentCompat;->onNestedScrollAccepted(Landroid/view/ViewParent;Landroid/view/View;Landroid/view/View;II)V
 HSPLandroidx/core/view/ViewParentCompat;->onStartNestedScroll(Landroid/view/ViewParent;Landroid/view/View;Landroid/view/View;II)Z
 HSPLandroidx/core/view/ViewParentCompat;->onStopNestedScroll(Landroid/view/ViewParent;Landroid/view/View;I)V
 HSPLandroidx/core/view/WindowInsetsAnimationCompat$Callback;-><init>(I)V
 HSPLandroidx/core/view/WindowInsetsAnimationCompat$Callback;->getDispatchMode()I
-HSPLandroidx/core/view/WindowInsetsAnimationCompat$Impl30$$ExternalSyntheticApiModelOutline2;->m(Landroid/view/View;Landroid/view/WindowInsetsAnimation$Callback;)V
+HSPLandroidx/core/view/WindowInsetsAnimationCompat$Impl30$$ExternalSyntheticApiModelOutline4;->m(Landroid/view/View;Landroid/view/WindowInsetsAnimation$Callback;)V
 HSPLandroidx/core/view/WindowInsetsAnimationCompat$Impl30$ProxyCallback;-><init>(Landroidx/core/view/WindowInsetsAnimationCompat$Callback;)V
 HSPLandroidx/core/view/WindowInsetsAnimationCompat$Impl30;->setCallback(Landroid/view/View;Landroidx/core/view/WindowInsetsAnimationCompat$Callback;)V
 HSPLandroidx/core/view/WindowInsetsAnimationCompat;->setCallback(Landroid/view/View;Landroidx/core/view/WindowInsetsAnimationCompat$Callback;)V
 HSPLandroidx/core/view/WindowInsetsCompat$Builder;-><init>()V
 HSPLandroidx/core/view/WindowInsetsCompat$Builder;->build()Landroidx/core/view/WindowInsetsCompat;
-HSPLandroidx/core/view/WindowInsetsCompat$BuilderImpl29$$ExternalSyntheticApiModelOutline5;->m(Landroid/view/WindowInsets$Builder;)Landroid/view/WindowInsets;
-HSPLandroidx/core/view/WindowInsetsCompat$BuilderImpl29$$ExternalSyntheticApiModelOutline6;->m()Landroid/view/WindowInsets$Builder;
-HSPLandroidx/core/view/WindowInsetsCompat$BuilderImpl29$$ExternalSyntheticApiModelOutline8;->m()V
+HSPLandroidx/core/view/WindowInsetsCompat$BuilderImpl29$$ExternalSyntheticApiModelOutline3;->m(Landroid/view/WindowInsets$Builder;)Landroid/view/WindowInsets;
+HSPLandroidx/core/view/WindowInsetsCompat$BuilderImpl29$$ExternalSyntheticApiModelOutline7;->m()Landroid/view/WindowInsets$Builder;
 HSPLandroidx/core/view/WindowInsetsCompat$BuilderImpl29;-><init>()V
 HSPLandroidx/core/view/WindowInsetsCompat$BuilderImpl29;->build()Landroidx/core/view/WindowInsetsCompat;
 HSPLandroidx/core/view/WindowInsetsCompat$BuilderImpl30;-><init>()V
@@ -1904,8 +2172,8 @@ HSPLandroidx/core/view/WindowInsetsCompat$Impl28$$ExternalSyntheticApiModelOutli
 HSPLandroidx/core/view/WindowInsetsCompat$Impl28;-><init>(Landroidx/core/view/WindowInsetsCompat;Landroid/view/WindowInsets;)V
 HSPLandroidx/core/view/WindowInsetsCompat$Impl28;->consumeDisplayCutout()Landroidx/core/view/WindowInsetsCompat;
 HSPLandroidx/core/view/WindowInsetsCompat$Impl29;-><init>(Landroidx/core/view/WindowInsetsCompat;Landroid/view/WindowInsets;)V
-HSPLandroidx/core/view/WindowInsetsCompat$Impl30$$ExternalSyntheticApiModelOutline1;->m()Landroid/view/WindowInsets;
-HSPLandroidx/core/view/WindowInsetsCompat$Impl30$$ExternalSyntheticApiModelOutline3;->m(Landroid/view/WindowInsets;I)Landroid/graphics/Insets;
+HSPLandroidx/core/view/WindowInsetsCompat$Impl30$$ExternalSyntheticApiModelOutline1;->m(Landroid/view/WindowInsets;I)Landroid/graphics/Insets;
+HSPLandroidx/core/view/WindowInsetsCompat$Impl30$$ExternalSyntheticApiModelOutline2;->m()Landroid/view/WindowInsets;
 HSPLandroidx/core/view/WindowInsetsCompat$Impl30;-><clinit>()V
 HSPLandroidx/core/view/WindowInsetsCompat$Impl30;-><init>(Landroidx/core/view/WindowInsetsCompat;Landroid/view/WindowInsets;)V
 HSPLandroidx/core/view/WindowInsetsCompat$Impl30;->copyRootViewBounds(Landroid/view/View;)V
@@ -1935,12 +2203,11 @@ HSPLandroidx/core/view/WindowInsetsCompat;->setRootWindowInsets(Landroidx/core/v
 HSPLandroidx/core/view/WindowInsetsCompat;->toWindowInsets()Landroid/view/WindowInsets;
 HSPLandroidx/core/view/WindowInsetsCompat;->toWindowInsetsCompat(Landroid/view/WindowInsets;)Landroidx/core/view/WindowInsetsCompat;
 HSPLandroidx/core/view/WindowInsetsCompat;->toWindowInsetsCompat(Landroid/view/WindowInsets;Landroid/view/View;)Landroidx/core/view/WindowInsetsCompat;
-HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$$ExternalSyntheticApiModelOutline11;->m(Landroid/view/accessibility/AccessibilityNodeInfo;Z)V
 HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$$ExternalSyntheticApiModelOutline3;->m(Landroid/view/accessibility/AccessibilityNodeInfo;Z)V
-HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$$ExternalSyntheticApiModelOutline6;->m(Landroid/view/accessibility/AccessibilityNodeInfo;Ljava/lang/CharSequence;)V
+HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$$ExternalSyntheticApiModelOutline4;->m(Landroid/view/accessibility/AccessibilityNodeInfo;Ljava/lang/CharSequence;)V
+HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$$ExternalSyntheticApiModelOutline5;->m(Landroid/view/accessibility/AccessibilityNodeInfo;Z)V
 HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline0;->m()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
 HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline11;->m()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
-HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline13;->m()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
 HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline14;->m()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
 HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline15;->m()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
 HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline16;->m()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
@@ -1949,6 +2216,7 @@ HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityAc
 HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline19;->m()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
 HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline1;->m()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
 HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline20;->m()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
+HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline21;->m()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
 HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline2;->m()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
 HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline3;->m()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
 HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline4;->m()Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;
@@ -1961,7 +2229,6 @@ HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityAc
 HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;-><init>(Ljava/lang/Object;ILjava/lang/CharSequence;Landroidx/core/view/accessibility/AccessibilityViewCommand;Ljava/lang/Class;)V
 HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->createReplacementAction(Ljava/lang/CharSequence;Landroidx/core/view/accessibility/AccessibilityViewCommand;)Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;
 HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->getId()I
-HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$Api30Impl$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/accessibility/AccessibilityNodeInfo;Ljava/lang/CharSequence;)V
 HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$Api30Impl;->setStateDescription(Landroid/view/accessibility/AccessibilityNodeInfo;Ljava/lang/CharSequence;)V
 HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionInfoCompat;-><init>(Ljava/lang/Object;)V
 HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionInfoCompat;->obtain(IIZI)Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionInfoCompat;
@@ -1981,17 +2248,11 @@ HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->unwrap()Landr
 HSPLandroidx/core/view/accessibility/AccessibilityNodeInfoCompat;->wrap(Landroid/view/accessibility/AccessibilityNodeInfo;)Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;
 HSPLandroidx/core/view/animation/PathInterpolatorCompat$Api21Impl;->createPathInterpolator(FFFF)Landroid/view/animation/Interpolator;
 HSPLandroidx/core/view/animation/PathInterpolatorCompat;->create(FFFF)Landroid/view/animation/Interpolator;
-HSPLandroidx/core/view/inputmethod/EditorInfoCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/inputmethod/EditorInfo;[Ljava/lang/String;)V
-HSPLandroidx/core/view/inputmethod/EditorInfoCompat;-><clinit>()V
-HSPLandroidx/core/view/inputmethod/EditorInfoCompat;->setContentMimeTypes(Landroid/view/inputmethod/EditorInfo;[Ljava/lang/String;)V
-HSPLandroidx/core/view/inputmethod/InputConnectionCompat$1;-><init>(Landroid/view/inputmethod/InputConnection;ZLandroidx/core/view/inputmethod/InputConnectionCompat$OnCommitContentListener;)V
-HSPLandroidx/core/view/inputmethod/InputConnectionCompat;->createWrapper(Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;Landroidx/core/view/inputmethod/InputConnectionCompat$OnCommitContentListener;)Landroid/view/inputmethod/InputConnection;
 HSPLandroidx/core/widget/ImageViewCompat$Api21Impl;->setImageTintList(Landroid/widget/ImageView;Landroid/content/res/ColorStateList;)V
 HSPLandroidx/core/widget/ImageViewCompat;->setImageTintList(Landroid/widget/ImageView;Landroid/content/res/ColorStateList;)V
 HSPLandroidx/core/widget/TextViewCompat$Api16Impl;->getMaxLines(Landroid/widget/TextView;)I
 HSPLandroidx/core/widget/TextViewCompat$Api17Impl;->getCompoundDrawablesRelative(Landroid/widget/TextView;)[Landroid/graphics/drawable/Drawable;
 HSPLandroidx/core/widget/TextViewCompat$Api17Impl;->setCompoundDrawablesRelative(Landroid/widget/TextView;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
-HSPLandroidx/core/widget/TextViewCompat$Api23Impl$$ExternalSyntheticApiModelOutline5;->m(Landroid/widget/TextView;Landroid/content/res/ColorStateList;)V
 HSPLandroidx/core/widget/TextViewCompat$Api23Impl;->setCompoundDrawableTintList(Landroid/widget/TextView;Landroid/content/res/ColorStateList;)V
 HSPLandroidx/core/widget/TextViewCompat;->getCompoundDrawablesRelative(Landroid/widget/TextView;)[Landroid/graphics/drawable/Drawable;
 HSPLandroidx/core/widget/TextViewCompat;->getMaxLines(Landroid/widget/TextView;)I
@@ -2001,7 +2262,6 @@ HSPLandroidx/core/widget/TextViewCompat;->setLineHeight(Landroid/widget/TextView
 HSPLandroidx/core/widget/TextViewCompat;->wrapCustomSelectionActionModeCallback(Landroid/widget/TextView;Landroid/view/ActionMode$Callback;)Landroid/view/ActionMode$Callback;
 HSPLandroidx/core/widget/TextViewOnReceiveContentListener;-><init>()V
 HSPLandroidx/customview/poolingcontainer/PoolingContainer;-><clinit>()V
-HSPLandroidx/customview/poolingcontainer/PoolingContainer;->callPoolingContainerOnReleaseForChildren(Landroid/view/ViewGroup;)V
 HSPLandroidx/customview/poolingcontainer/PoolingContainer;->setPoolingContainer(Landroid/view/View;Z)V
 HSPLandroidx/customview/widget/ExploreByTouchHelper$1;-><init>()V
 HSPLandroidx/customview/widget/ExploreByTouchHelper$2;-><init>()V
@@ -2009,8 +2269,9 @@ HSPLandroidx/customview/widget/ExploreByTouchHelper;-><clinit>()V
 HSPLandroidx/customview/widget/ExploreByTouchHelper;-><init>(Landroid/view/View;)V
 HSPLandroidx/emoji2/text/ConcurrencyHelpers$$ExternalSyntheticLambda0;-><init>(Ljava/lang/String;)V
 HSPLandroidx/emoji2/text/ConcurrencyHelpers$$ExternalSyntheticLambda0;->newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
+HSPLandroidx/emoji2/text/ConcurrencyHelpers$Handler28Impl$$ExternalSyntheticApiModelOutline0;->m(Landroid/os/Looper;)Landroid/os/Handler;
 HSPLandroidx/emoji2/text/ConcurrencyHelpers$Handler28Impl;->createAsync(Landroid/os/Looper;)Landroid/os/Handler;
-HSPLandroidx/emoji2/text/ConcurrencyHelpers;->$r8$lambda$rm7NN8F9tEuy2Vr8i0fl8_hnx_A(Ljava/lang/String;Ljava/lang/Runnable;)Ljava/lang/Thread;
+HSPLandroidx/emoji2/text/ConcurrencyHelpers;->$r8$lambda$hDWNjMgTS47ccxPkL8ebwFGVHg4(Ljava/lang/String;Ljava/lang/Runnable;)Ljava/lang/Thread;
 HSPLandroidx/emoji2/text/ConcurrencyHelpers;->createBackgroundPriorityExecutor(Ljava/lang/String;)Ljava/util/concurrent/ThreadPoolExecutor;
 HSPLandroidx/emoji2/text/ConcurrencyHelpers;->lambda$createBackgroundPriorityExecutor$0(Ljava/lang/String;Ljava/lang/Runnable;)Ljava/lang/Thread;
 HSPLandroidx/emoji2/text/ConcurrencyHelpers;->mainHandlerAsync()Landroid/os/Handler;
@@ -2048,7 +2309,6 @@ HSPLandroidx/emoji2/text/EmojiCompat;->isInitialized()Z
 HSPLandroidx/emoji2/text/EmojiCompat;->load()V
 HSPLandroidx/emoji2/text/EmojiCompat;->loadMetadata()V
 HSPLandroidx/emoji2/text/EmojiCompat;->onMetadataLoadFailed(Ljava/lang/Throwable;)V
-HSPLandroidx/emoji2/text/EmojiCompat;->updateEditorInfo(Landroid/view/inputmethod/EditorInfo;)V
 HSPLandroidx/emoji2/text/EmojiCompatInitializer$1;-><init>(Landroidx/emoji2/text/EmojiCompatInitializer;Landroidx/lifecycle/Lifecycle;)V
 HSPLandroidx/emoji2/text/EmojiCompatInitializer$1;->onCreate(Landroidx/lifecycle/LifecycleOwner;)V
 HSPLandroidx/emoji2/text/EmojiCompatInitializer$1;->onResume(Landroidx/lifecycle/LifecycleOwner;)V
@@ -2056,7 +2316,7 @@ HSPLandroidx/emoji2/text/EmojiCompatInitializer$1;->onStart(Landroidx/lifecycle/
 HSPLandroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultConfig;-><init>(Landroid/content/Context;)V
 HSPLandroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader$$ExternalSyntheticLambda0;-><init>(Landroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader;Landroidx/emoji2/text/EmojiCompat$MetadataRepoLoaderCallback;Ljava/util/concurrent/ThreadPoolExecutor;)V
 HSPLandroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader$$ExternalSyntheticLambda0;->run()V
-HSPLandroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader;->$r8$lambda$2V1iWTiAwNxOBlVvz73bbuEdzIw(Landroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader;Landroidx/emoji2/text/EmojiCompat$MetadataRepoLoaderCallback;Ljava/util/concurrent/ThreadPoolExecutor;)V
+HSPLandroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader;->$r8$lambda$55Ivg7v_3m1eazHc6HmoU-ZdULY(Landroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader;Landroidx/emoji2/text/EmojiCompat$MetadataRepoLoaderCallback;Ljava/util/concurrent/ThreadPoolExecutor;)V
 HSPLandroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader;-><init>(Landroid/content/Context;)V
 HSPLandroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader;->doLoad(Landroidx/emoji2/text/EmojiCompat$MetadataRepoLoaderCallback;Ljava/util/concurrent/ThreadPoolExecutor;)V
 HSPLandroidx/emoji2/text/EmojiCompatInitializer$BackgroundDefaultLoader;->lambda$load$0(Landroidx/emoji2/text/EmojiCompat$MetadataRepoLoaderCallback;Ljava/util/concurrent/ThreadPoolExecutor;)V
@@ -2084,21 +2344,15 @@ HSPLandroidx/emoji2/text/SpannableBuilder;->removeSpan(Ljava/lang/Object;)V
 HSPLandroidx/emoji2/text/SpannableBuilder;->setSpan(Ljava/lang/Object;III)V
 HSPLandroidx/emoji2/viewsintegration/EmojiEditTextHelper$HelperInternal19;-><init>(Landroid/widget/EditText;Z)V
 HSPLandroidx/emoji2/viewsintegration/EmojiEditTextHelper$HelperInternal19;->getKeyListener(Landroid/text/method/KeyListener;)Landroid/text/method/KeyListener;
-HSPLandroidx/emoji2/viewsintegration/EmojiEditTextHelper$HelperInternal19;->onCreateInputConnection(Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;)Landroid/view/inputmethod/InputConnection;
 HSPLandroidx/emoji2/viewsintegration/EmojiEditTextHelper$HelperInternal19;->setEnabled(Z)V
 HSPLandroidx/emoji2/viewsintegration/EmojiEditTextHelper$HelperInternal;-><init>()V
 HSPLandroidx/emoji2/viewsintegration/EmojiEditTextHelper;-><init>(Landroid/widget/EditText;Z)V
 HSPLandroidx/emoji2/viewsintegration/EmojiEditTextHelper;->getKeyListener(Landroid/text/method/KeyListener;)Landroid/text/method/KeyListener;
-HSPLandroidx/emoji2/viewsintegration/EmojiEditTextHelper;->onCreateInputConnection(Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;)Landroid/view/inputmethod/InputConnection;
 HSPLandroidx/emoji2/viewsintegration/EmojiEditTextHelper;->setEnabled(Z)V
 HSPLandroidx/emoji2/viewsintegration/EmojiEditableFactory;-><clinit>()V
 HSPLandroidx/emoji2/viewsintegration/EmojiEditableFactory;-><init>()V
 HSPLandroidx/emoji2/viewsintegration/EmojiEditableFactory;->getInstance()Landroid/text/Editable$Factory;
 HSPLandroidx/emoji2/viewsintegration/EmojiEditableFactory;->newEditable(Ljava/lang/CharSequence;)Landroid/text/Editable;
-HSPLandroidx/emoji2/viewsintegration/EmojiInputConnection$EmojiCompatDeleteHelper;-><init>()V
-HSPLandroidx/emoji2/viewsintegration/EmojiInputConnection$EmojiCompatDeleteHelper;->updateEditorInfoAttrs(Landroid/view/inputmethod/EditorInfo;)V
-HSPLandroidx/emoji2/viewsintegration/EmojiInputConnection;-><init>(Landroid/widget/TextView;Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;)V
-HSPLandroidx/emoji2/viewsintegration/EmojiInputConnection;-><init>(Landroid/widget/TextView;Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;Landroidx/emoji2/viewsintegration/EmojiInputConnection$EmojiCompatDeleteHelper;)V
 HSPLandroidx/emoji2/viewsintegration/EmojiInputFilter;-><init>(Landroid/widget/TextView;)V
 HSPLandroidx/emoji2/viewsintegration/EmojiInputFilter;->filter(Ljava/lang/CharSequence;IILandroid/text/Spanned;II)Ljava/lang/CharSequence;
 HSPLandroidx/emoji2/viewsintegration/EmojiKeyListener$EmojiCompatHandleKeyDownHelper;-><init>()V
@@ -2165,7 +2419,7 @@ HSPLandroidx/fragment/app/Fragment$9;->onPreAttached()V
 HSPLandroidx/fragment/app/Fragment$AnimationInfo;-><init>()V
 HSPLandroidx/fragment/app/Fragment$OnPreAttachedListener;-><init>()V
 HSPLandroidx/fragment/app/Fragment$OnPreAttachedListener;-><init>(Landroidx/fragment/app/Fragment$1;)V
-HSPLandroidx/fragment/app/Fragment;->$r8$lambda$Cl7MxTaA6NVZ8I5KAGBxRTLl1sc(Landroidx/fragment/app/Fragment;)V
+HSPLandroidx/fragment/app/Fragment;->$r8$lambda$fb2iz_9i-0AeQEy2DZBRxlwOv0g(Landroidx/fragment/app/Fragment;)V
 HSPLandroidx/fragment/app/Fragment;-><clinit>()V
 HSPLandroidx/fragment/app/Fragment;-><init>()V
 HSPLandroidx/fragment/app/Fragment;-><init>(I)V
@@ -2276,7 +2530,7 @@ HSPLandroidx/fragment/app/FragmentActivity$HostCallbacks;->removeOnConfiguration
 HSPLandroidx/fragment/app/FragmentActivity$HostCallbacks;->removeOnMultiWindowModeChangedListener(Landroidx/core/util/Consumer;)V
 HSPLandroidx/fragment/app/FragmentActivity$HostCallbacks;->removeOnPictureInPictureModeChangedListener(Landroidx/core/util/Consumer;)V
 HSPLandroidx/fragment/app/FragmentActivity$HostCallbacks;->removeOnTrimMemoryListener(Landroidx/core/util/Consumer;)V
-HSPLandroidx/fragment/app/FragmentActivity;->$r8$lambda$euPNEtWNfVdMY89Jt5kWt_WEHqw(Landroidx/fragment/app/FragmentActivity;Landroid/content/Context;)V
+HSPLandroidx/fragment/app/FragmentActivity;->$r8$lambda$4ROHaS4O6f2WoPhKvhOMRg_7Bzo(Landroidx/fragment/app/FragmentActivity;Landroid/content/Context;)V
 HSPLandroidx/fragment/app/FragmentActivity;-><init>()V
 HSPLandroidx/fragment/app/FragmentActivity;->dispatchFragmentsOnCreateView(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View;
 HSPLandroidx/fragment/app/FragmentActivity;->getSupportFragmentManager()Landroidx/fragment/app/FragmentManager;
@@ -2297,7 +2551,6 @@ HSPLandroidx/fragment/app/FragmentActivity;->onStart()V
 HSPLandroidx/fragment/app/FragmentActivity;->onStateNotSaved()V
 HSPLandroidx/fragment/app/FragmentActivity;->onStop()V
 HSPLandroidx/fragment/app/FragmentActivity;->supportPostponeEnterTransition()V
-HSPLandroidx/fragment/app/FragmentActivity;->supportStartPostponedEnterTransition()V
 HSPLandroidx/fragment/app/FragmentContainer;-><init>()V
 HSPLandroidx/fragment/app/FragmentContainer;->instantiate(Landroid/content/Context;Ljava/lang/String;Landroid/os/Bundle;)Landroidx/fragment/app/Fragment;
 HSPLandroidx/fragment/app/FragmentContainerView;-><init>(Landroid/content/Context;)V
@@ -2542,8 +2795,8 @@ HSPLandroidx/fragment/app/SpecialEffectsController$Operation;->getLifecycleImpac
 HSPLandroidx/fragment/app/SpecialEffectsController$Operation;->isCanceled()Z
 HSPLandroidx/fragment/app/SpecialEffectsController$Operation;->mergeWith(Landroidx/fragment/app/SpecialEffectsController$Operation$State;Landroidx/fragment/app/SpecialEffectsController$Operation$LifecycleImpact;)V
 HSPLandroidx/fragment/app/SpecialEffectsController$WhenMappings;-><clinit>()V
-HSPLandroidx/fragment/app/SpecialEffectsController;->$r8$lambda$HzA9s4aFoOsiJ_WkKfUvVoTfNJY(Landroidx/fragment/app/SpecialEffectsController;Landroidx/fragment/app/SpecialEffectsController$FragmentStateManagerOperation;)V
-HSPLandroidx/fragment/app/SpecialEffectsController;->$r8$lambda$PcxTk79tvtTaJMirbpJm6o9rlVo(Landroidx/fragment/app/SpecialEffectsController;Landroidx/fragment/app/SpecialEffectsController$FragmentStateManagerOperation;)V
+HSPLandroidx/fragment/app/SpecialEffectsController;->$r8$lambda$TeCmoVW0hctjg0BNHLP6mPbAs5U(Landroidx/fragment/app/SpecialEffectsController;Landroidx/fragment/app/SpecialEffectsController$FragmentStateManagerOperation;)V
+HSPLandroidx/fragment/app/SpecialEffectsController;->$r8$lambda$ahdwWRJghvCwX2xG1GsepYfILrY(Landroidx/fragment/app/SpecialEffectsController;Landroidx/fragment/app/SpecialEffectsController$FragmentStateManagerOperation;)V
 HSPLandroidx/fragment/app/SpecialEffectsController;-><clinit>()V
 HSPLandroidx/fragment/app/SpecialEffectsController;-><init>(Landroid/view/ViewGroup;)V
 HSPLandroidx/fragment/app/SpecialEffectsController;->enqueue$lambda$4$lambda$2(Landroidx/fragment/app/SpecialEffectsController;Landroidx/fragment/app/SpecialEffectsController$FragmentStateManagerOperation;)V
@@ -2702,7 +2955,6 @@ HSPLandroidx/lifecycle/ProcessLifecycleInitializer;->create(Landroid/content/Con
 HSPLandroidx/lifecycle/ProcessLifecycleInitializer;->create(Landroid/content/Context;)Ljava/lang/Object;
 HSPLandroidx/lifecycle/ProcessLifecycleInitializer;->dependencies()Ljava/util/List;
 HSPLandroidx/lifecycle/ProcessLifecycleOwner$$ExternalSyntheticLambda0;-><init>(Landroidx/lifecycle/ProcessLifecycleOwner;)V
-HSPLandroidx/lifecycle/ProcessLifecycleOwner$Api29Impl$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/Activity;Landroid/app/Application$ActivityLifecycleCallbacks;)V
 HSPLandroidx/lifecycle/ProcessLifecycleOwner$Api29Impl;-><clinit>()V
 HSPLandroidx/lifecycle/ProcessLifecycleOwner$Api29Impl;-><init>()V
 HSPLandroidx/lifecycle/ProcessLifecycleOwner$Api29Impl;->registerActivityLifecycleCallbacks(Landroid/app/Activity;Landroid/app/Application$ActivityLifecycleCallbacks;)V
@@ -2736,6 +2988,7 @@ HSPLandroidx/lifecycle/ReportFragment$Companion;-><init>()V
 HSPLandroidx/lifecycle/ReportFragment$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLandroidx/lifecycle/ReportFragment$Companion;->dispatch$lifecycle_runtime_release(Landroid/app/Activity;Landroidx/lifecycle/Lifecycle$Event;)V
 HSPLandroidx/lifecycle/ReportFragment$Companion;->injectIfNeededIn(Landroid/app/Activity;)V
+HSPLandroidx/lifecycle/ReportFragment$LifecycleCallbacks$Companion$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/Activity;Landroid/app/Application$ActivityLifecycleCallbacks;)V
 HSPLandroidx/lifecycle/ReportFragment$LifecycleCallbacks$Companion;-><init>()V
 HSPLandroidx/lifecycle/ReportFragment$LifecycleCallbacks$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLandroidx/lifecycle/ReportFragment$LifecycleCallbacks$Companion;->registerIn(Landroid/app/Activity;)V
@@ -2903,7 +3156,6 @@ HSPLandroidx/media/MediaSessionManagerImplApi21;-><init>(Landroid/content/Contex
 HSPLandroidx/media/MediaSessionManagerImplApi21;->hasMediaControlPermission(Landroidx/media/MediaSessionManager$RemoteUserInfoImpl;)Z
 HSPLandroidx/media/MediaSessionManagerImplApi21;->isTrustedForMediaControl(Landroidx/media/MediaSessionManager$RemoteUserInfoImpl;)Z
 HSPLandroidx/media/MediaSessionManagerImplApi28$RemoteUserInfoImplApi28$$ExternalSyntheticApiModelOutline0;->m(Ljava/lang/String;II)Landroid/media/session/MediaSessionManager$RemoteUserInfo;
-HSPLandroidx/media/MediaSessionManagerImplApi28$RemoteUserInfoImplApi28$$ExternalSyntheticApiModelOutline1;->m()V
 HSPLandroidx/media/MediaSessionManagerImplApi28$RemoteUserInfoImplApi28;-><init>(Ljava/lang/String;II)V
 HSPLandroidx/media/MediaSessionManagerImplApi28;-><init>(Landroid/content/Context;)V
 HSPLandroidx/media/MediaSessionManagerImplApi28;->isTrustedForMediaControl(Landroidx/media/MediaSessionManager$RemoteUserInfoImpl;)Z
@@ -3250,8 +3502,8 @@ HSPLandroidx/media3/common/util/ListenerSet$ListenerHolder;-><init>(Ljava/lang/O
 HSPLandroidx/media3/common/util/ListenerSet$ListenerHolder;->equals(Ljava/lang/Object;)Z
 HSPLandroidx/media3/common/util/ListenerSet$ListenerHolder;->invoke(ILandroidx/media3/common/util/ListenerSet$Event;)V
 HSPLandroidx/media3/common/util/ListenerSet$ListenerHolder;->iterationFinished(Landroidx/media3/common/util/ListenerSet$IterationFinishedEvent;)V
-HSPLandroidx/media3/common/util/ListenerSet;->$r8$lambda$AlaP-gu7Lfe4GahLPmVnd_l2pLA(Ljava/util/concurrent/CopyOnWriteArraySet;ILandroidx/media3/common/util/ListenerSet$Event;)V
-HSPLandroidx/media3/common/util/ListenerSet;->$r8$lambda$bio3pd12v5B_9b5UeFaPn9XBQ90(Landroidx/media3/common/util/ListenerSet;Landroid/os/Message;)Z
+HSPLandroidx/media3/common/util/ListenerSet;->$r8$lambda$Maws-DUsVhcg5uFQgolq5mcQJiM(Ljava/util/concurrent/CopyOnWriteArraySet;ILandroidx/media3/common/util/ListenerSet$Event;)V
+HSPLandroidx/media3/common/util/ListenerSet;->$r8$lambda$rFcF5Pkb99AL585p5-2u78YfNkY(Landroidx/media3/common/util/ListenerSet;Landroid/os/Message;)Z
 HSPLandroidx/media3/common/util/ListenerSet;-><init>(Landroid/os/Looper;Landroidx/media3/common/util/Clock;Landroidx/media3/common/util/ListenerSet$IterationFinishedEvent;)V
 HSPLandroidx/media3/common/util/ListenerSet;-><init>(Ljava/util/concurrent/CopyOnWriteArraySet;Landroid/os/Looper;Landroidx/media3/common/util/Clock;Landroidx/media3/common/util/ListenerSet$IterationFinishedEvent;Z)V
 HSPLandroidx/media3/common/util/ListenerSet;->add(Ljava/lang/Object;)V
@@ -3272,11 +3524,11 @@ HSPLandroidx/media3/common/util/Log;->getThrowableString(Ljava/lang/Throwable;)L
 HSPLandroidx/media3/common/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)V
 HSPLandroidx/media3/common/util/NetworkTypeObserver$$ExternalSyntheticLambda0;-><init>(Landroidx/media3/common/util/NetworkTypeObserver;Landroidx/media3/common/util/NetworkTypeObserver$Listener;)V
 HSPLandroidx/media3/common/util/NetworkTypeObserver$$ExternalSyntheticLambda0;->run()V
-HSPLandroidx/media3/common/util/NetworkTypeObserver$Api31$$ExternalSyntheticApiModelOutline0;->m(Landroid/telephony/TelephonyManager;Ljava/util/concurrent/Executor;Landroid/telephony/TelephonyCallback;)V
+HSPLandroidx/media3/common/util/NetworkTypeObserver$Api31$$ExternalSyntheticApiModelOutline1;->m(Landroid/telephony/TelephonyManager;Ljava/util/concurrent/Executor;Landroid/telephony/TelephonyCallback;)V
 HSPLandroidx/media3/common/util/NetworkTypeObserver$Receiver;-><init>(Landroidx/media3/common/util/NetworkTypeObserver;)V
 HSPLandroidx/media3/common/util/NetworkTypeObserver$Receiver;-><init>(Landroidx/media3/common/util/NetworkTypeObserver;Landroidx/media3/common/util/NetworkTypeObserver$1;)V
 HSPLandroidx/media3/common/util/NetworkTypeObserver$Receiver;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V
-HSPLandroidx/media3/common/util/NetworkTypeObserver;->$r8$lambda$DoEVJeYUKRUR6jupXFdxPNaPJ8k(Landroidx/media3/common/util/NetworkTypeObserver;Landroidx/media3/common/util/NetworkTypeObserver$Listener;)V
+HSPLandroidx/media3/common/util/NetworkTypeObserver;->$r8$lambda$op5b6rwTRtpp14FG2_2m__BFiFs(Landroidx/media3/common/util/NetworkTypeObserver;Landroidx/media3/common/util/NetworkTypeObserver$Listener;)V
 HSPLandroidx/media3/common/util/NetworkTypeObserver;-><init>(Landroid/content/Context;)V
 HSPLandroidx/media3/common/util/NetworkTypeObserver;->access$100(Landroid/content/Context;)I
 HSPLandroidx/media3/common/util/NetworkTypeObserver;->access$200(Landroidx/media3/common/util/NetworkTypeObserver;I)V
@@ -3336,7 +3588,7 @@ HSPLandroidx/media3/common/util/Util;->shouldShowPlayButton(Landroidx/media3/com
 HSPLandroidx/media3/common/util/Util;->usToMs(J)J
 HSPLandroidx/media3/datasource/DataSourceBitmapLoader$$ExternalSyntheticLambda0;-><init>()V
 HSPLandroidx/media3/datasource/DataSourceBitmapLoader$$ExternalSyntheticLambda0;->get()Ljava/lang/Object;
-HSPLandroidx/media3/datasource/DataSourceBitmapLoader;->$r8$lambda$5oU0w6Wyi1QAQIwNfmTcRBDVUHo()Lcom/google/common/util/concurrent/ListeningExecutorService;
+HSPLandroidx/media3/datasource/DataSourceBitmapLoader;->$r8$lambda$ctPCnFN_Nvj3nel8GNv7G1INN2M()Lcom/google/common/util/concurrent/ListeningExecutorService;
 HSPLandroidx/media3/datasource/DataSourceBitmapLoader;-><clinit>()V
 HSPLandroidx/media3/datasource/DataSourceBitmapLoader;-><init>(Landroid/content/Context;)V
 HSPLandroidx/media3/datasource/DataSourceBitmapLoader;-><init>(Lcom/google/common/util/concurrent/ListeningExecutorService;Landroidx/media3/datasource/DataSource$Factory;)V
@@ -3347,7 +3599,6 @@ HSPLandroidx/media3/datasource/DefaultHttpDataSource$Factory;-><init>()V
 HSPLandroidx/media3/datasource/HttpDataSource$RequestProperties;-><init>()V
 HSPLandroidx/media3/decoder/Buffer;-><init>()V
 HSPLandroidx/media3/decoder/CryptoInfo$PatternHolderV24$$ExternalSyntheticApiModelOutline0;->m(II)Landroid/media/MediaCodec$CryptoInfo$Pattern;
-HSPLandroidx/media3/decoder/CryptoInfo$PatternHolderV24$$ExternalSyntheticApiModelOutline1;->m()V
 HSPLandroidx/media3/decoder/CryptoInfo$PatternHolderV24;-><init>(Landroid/media/MediaCodec$CryptoInfo;)V
 HSPLandroidx/media3/decoder/CryptoInfo$PatternHolderV24;-><init>(Landroid/media/MediaCodec$CryptoInfo;Landroidx/media3/decoder/CryptoInfo$1;)V
 HSPLandroidx/media3/decoder/CryptoInfo;-><init>()V
@@ -3397,11 +3648,11 @@ HSPLandroidx/media3/exoplayer/DefaultRenderersFactory;->createRenderers(Landroid
 HSPLandroidx/media3/exoplayer/DefaultRenderersFactory;->getCodecAdapterFactory()Landroidx/media3/exoplayer/mediacodec/MediaCodecAdapter$Factory;
 HSPLandroidx/media3/exoplayer/ExoPlayer$Builder$$ExternalSyntheticLambda0;-><init>(Landroidx/media3/exoplayer/LoadControl;)V
 HSPLandroidx/media3/exoplayer/ExoPlayer$Builder$$ExternalSyntheticLambda0;->get()Ljava/lang/Object;
-HSPLandroidx/media3/exoplayer/ExoPlayer$Builder$$ExternalSyntheticLambda1;-><init>(Landroid/content/Context;)V
+HSPLandroidx/media3/exoplayer/ExoPlayer$Builder$$ExternalSyntheticLambda1;-><init>(Landroidx/media3/exoplayer/source/MediaSource$Factory;)V
+HSPLandroidx/media3/exoplayer/ExoPlayer$Builder$$ExternalSyntheticLambda1;->get()Ljava/lang/Object;
 HSPLandroidx/media3/exoplayer/ExoPlayer$Builder$$ExternalSyntheticLambda2;-><init>(Landroid/content/Context;)V
-HSPLandroidx/media3/exoplayer/ExoPlayer$Builder$$ExternalSyntheticLambda3;-><init>(Landroidx/media3/exoplayer/RenderersFactory;)V
-HSPLandroidx/media3/exoplayer/ExoPlayer$Builder$$ExternalSyntheticLambda3;->get()Ljava/lang/Object;
-HSPLandroidx/media3/exoplayer/ExoPlayer$Builder$$ExternalSyntheticLambda4;-><init>(Landroidx/media3/exoplayer/source/MediaSource$Factory;)V
+HSPLandroidx/media3/exoplayer/ExoPlayer$Builder$$ExternalSyntheticLambda3;-><init>(Landroid/content/Context;)V
+HSPLandroidx/media3/exoplayer/ExoPlayer$Builder$$ExternalSyntheticLambda4;-><init>(Landroidx/media3/exoplayer/RenderersFactory;)V
 HSPLandroidx/media3/exoplayer/ExoPlayer$Builder$$ExternalSyntheticLambda4;->get()Ljava/lang/Object;
 HSPLandroidx/media3/exoplayer/ExoPlayer$Builder$$ExternalSyntheticLambda5;-><init>(Landroid/content/Context;)V
 HSPLandroidx/media3/exoplayer/ExoPlayer$Builder$$ExternalSyntheticLambda5;->get()Ljava/lang/Object;
@@ -3410,11 +3661,11 @@ HSPLandroidx/media3/exoplayer/ExoPlayer$Builder$$ExternalSyntheticLambda7;-><ini
 HSPLandroidx/media3/exoplayer/ExoPlayer$Builder$$ExternalSyntheticLambda7;->get()Ljava/lang/Object;
 HSPLandroidx/media3/exoplayer/ExoPlayer$Builder$$ExternalSyntheticLambda8;-><init>()V
 HSPLandroidx/media3/exoplayer/ExoPlayer$Builder$$ExternalSyntheticLambda8;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLandroidx/media3/exoplayer/ExoPlayer$Builder;->$r8$lambda$E_UuRuiJ7XuGPeWDLUXM247HnO4(Landroidx/media3/exoplayer/LoadControl;)Landroidx/media3/exoplayer/LoadControl;
-HSPLandroidx/media3/exoplayer/ExoPlayer$Builder;->$r8$lambda$FplZJNis2C-ck82WaYRNg8j54tA(Landroid/content/Context;)Landroidx/media3/exoplayer/upstream/BandwidthMeter;
-HSPLandroidx/media3/exoplayer/ExoPlayer$Builder;->$r8$lambda$MbwKRuXmGQh3ZURCZek3Rj0CAIc(Landroidx/media3/exoplayer/RenderersFactory;)Landroidx/media3/exoplayer/RenderersFactory;
-HSPLandroidx/media3/exoplayer/ExoPlayer$Builder;->$r8$lambda$PFgrmzXy8dtRca-zfooecXIZLiM(Landroidx/media3/exoplayer/source/MediaSource$Factory;)Landroidx/media3/exoplayer/source/MediaSource$Factory;
-HSPLandroidx/media3/exoplayer/ExoPlayer$Builder;->$r8$lambda$PLv_OFGgiO4MKR7PBORW2kAfOy8(Landroid/content/Context;)Landroidx/media3/exoplayer/trackselection/TrackSelector;
+HSPLandroidx/media3/exoplayer/ExoPlayer$Builder;->$r8$lambda$1S4JTYE6v7ASEpYX-zQPTquCFzM(Landroidx/media3/exoplayer/RenderersFactory;)Landroidx/media3/exoplayer/RenderersFactory;
+HSPLandroidx/media3/exoplayer/ExoPlayer$Builder;->$r8$lambda$HekyiBTTjarrX819XM5j8sFRos8(Landroidx/media3/exoplayer/LoadControl;)Landroidx/media3/exoplayer/LoadControl;
+HSPLandroidx/media3/exoplayer/ExoPlayer$Builder;->$r8$lambda$HqY2oZARF3vhlKA0gKaeZ2l_Oa8(Landroidx/media3/exoplayer/source/MediaSource$Factory;)Landroidx/media3/exoplayer/source/MediaSource$Factory;
+HSPLandroidx/media3/exoplayer/ExoPlayer$Builder;->$r8$lambda$WPXsxQz0xLwRE7OHWiDerxu51BU(Landroid/content/Context;)Landroidx/media3/exoplayer/upstream/BandwidthMeter;
+HSPLandroidx/media3/exoplayer/ExoPlayer$Builder;->$r8$lambda$xUvto8h1vMLVIth0_snkoRcg_Fw(Landroid/content/Context;)Landroidx/media3/exoplayer/trackselection/TrackSelector;
 HSPLandroidx/media3/exoplayer/ExoPlayer$Builder;-><init>(Landroid/content/Context;)V
 HSPLandroidx/media3/exoplayer/ExoPlayer$Builder;-><init>(Landroid/content/Context;Lcom/google/common/base/Supplier;Lcom/google/common/base/Supplier;)V
 HSPLandroidx/media3/exoplayer/ExoPlayer$Builder;-><init>(Landroid/content/Context;Lcom/google/common/base/Supplier;Lcom/google/common/base/Supplier;Lcom/google/common/base/Supplier;Lcom/google/common/base/Supplier;Lcom/google/common/base/Supplier;Lcom/google/common/base/Function;)V
@@ -3429,20 +3680,20 @@ HSPLandroidx/media3/exoplayer/ExoPlayer$Builder;->setLoadControl(Landroidx/media
 HSPLandroidx/media3/exoplayer/ExoPlayer$Builder;->setMediaSourceFactory(Landroidx/media3/exoplayer/source/MediaSource$Factory;)Landroidx/media3/exoplayer/ExoPlayer$Builder;
 HSPLandroidx/media3/exoplayer/ExoPlayer$Builder;->setRenderersFactory(Landroidx/media3/exoplayer/RenderersFactory;)Landroidx/media3/exoplayer/ExoPlayer$Builder;
 HSPLandroidx/media3/exoplayer/ExoPlayerImpl$$ExternalSyntheticApiModelOutline0;->m(Landroid/media/AudioManager;I)[Landroid/media/AudioDeviceInfo;
-HSPLandroidx/media3/exoplayer/ExoPlayerImpl$$ExternalSyntheticLambda16;-><init>(Landroidx/media3/common/AudioAttributes;)V
-HSPLandroidx/media3/exoplayer/ExoPlayerImpl$$ExternalSyntheticLambda16;->invoke(Ljava/lang/Object;)V
-HSPLandroidx/media3/exoplayer/ExoPlayerImpl$$ExternalSyntheticLambda18;-><init>(Landroidx/media3/exoplayer/ExoPlayerImpl;)V
-HSPLandroidx/media3/exoplayer/ExoPlayerImpl$$ExternalSyntheticLambda18;->invoke(Ljava/lang/Object;Landroidx/media3/common/FlagSet;)V
-HSPLandroidx/media3/exoplayer/ExoPlayerImpl$$ExternalSyntheticLambda19;-><init>(Landroidx/media3/exoplayer/ExoPlayerImpl;)V
-HSPLandroidx/media3/exoplayer/ExoPlayerImpl$Api23$$ExternalSyntheticApiModelOutline0;->m(Landroid/media/AudioDeviceInfo;)I
+HSPLandroidx/media3/exoplayer/ExoPlayerImpl$$ExternalSyntheticLambda7;-><init>(Landroidx/media3/exoplayer/ExoPlayerImpl;)V
+HSPLandroidx/media3/exoplayer/ExoPlayerImpl$$ExternalSyntheticLambda7;->invoke(Ljava/lang/Object;Landroidx/media3/common/FlagSet;)V
+HSPLandroidx/media3/exoplayer/ExoPlayerImpl$$ExternalSyntheticLambda8;-><init>(Landroidx/media3/exoplayer/ExoPlayerImpl;)V
+HSPLandroidx/media3/exoplayer/ExoPlayerImpl$$ExternalSyntheticLambda9;-><init>(Landroidx/media3/common/AudioAttributes;)V
+HSPLandroidx/media3/exoplayer/ExoPlayerImpl$$ExternalSyntheticLambda9;->invoke(Ljava/lang/Object;)V
+HSPLandroidx/media3/exoplayer/ExoPlayerImpl$Api23$$ExternalSyntheticApiModelOutline1;->m(Landroid/media/AudioDeviceInfo;)I
 HSPLandroidx/media3/exoplayer/ExoPlayerImpl$Api31$$ExternalSyntheticApiModelOutline0;->m()Landroid/media/metrics/LogSessionId;
 HSPLandroidx/media3/exoplayer/ExoPlayerImpl$Api31;->registerMediaMetricsListener(Landroid/content/Context;Landroidx/media3/exoplayer/ExoPlayerImpl;Z)Landroidx/media3/exoplayer/analytics/PlayerId;
 HSPLandroidx/media3/exoplayer/ExoPlayerImpl$ComponentListener;-><init>(Landroidx/media3/exoplayer/ExoPlayerImpl;)V
 HSPLandroidx/media3/exoplayer/ExoPlayerImpl$ComponentListener;-><init>(Landroidx/media3/exoplayer/ExoPlayerImpl;Landroidx/media3/exoplayer/ExoPlayerImpl$1;)V
 HSPLandroidx/media3/exoplayer/ExoPlayerImpl$FrameMetadataListener;-><init>()V
 HSPLandroidx/media3/exoplayer/ExoPlayerImpl$FrameMetadataListener;-><init>(Landroidx/media3/exoplayer/ExoPlayerImpl$1;)V
-HSPLandroidx/media3/exoplayer/ExoPlayerImpl;->$r8$lambda$JtzxNRDnWahnXIvwxzcFksVgOkU(Landroidx/media3/exoplayer/ExoPlayerImpl;Landroidx/media3/common/Player$Listener;Landroidx/media3/common/FlagSet;)V
-HSPLandroidx/media3/exoplayer/ExoPlayerImpl;->$r8$lambda$Kk09jzs0OKewoiSfI3wTI0zS6O4(Landroidx/media3/common/AudioAttributes;Landroidx/media3/common/Player$Listener;)V
+HSPLandroidx/media3/exoplayer/ExoPlayerImpl;->$r8$lambda$SA7gbpEMwf_Ft8S0LNQ1m_I4CcI(Landroidx/media3/exoplayer/ExoPlayerImpl;Landroidx/media3/common/Player$Listener;Landroidx/media3/common/FlagSet;)V
+HSPLandroidx/media3/exoplayer/ExoPlayerImpl;->$r8$lambda$j8fsQ-0x1CDXust9j-5G2ehEs6Q(Landroidx/media3/common/AudioAttributes;Landroidx/media3/common/Player$Listener;)V
 HSPLandroidx/media3/exoplayer/ExoPlayerImpl;-><clinit>()V
 HSPLandroidx/media3/exoplayer/ExoPlayerImpl;-><init>(Landroidx/media3/exoplayer/ExoPlayer$Builder;Landroidx/media3/common/Player;)V
 HSPLandroidx/media3/exoplayer/ExoPlayerImpl;->addAnalyticsListener(Landroidx/media3/exoplayer/analytics/AnalyticsListener;)V
@@ -3540,20 +3791,20 @@ HSPLandroidx/media3/exoplayer/analytics/AnalyticsListener$Events;->contains(I)Z
 HSPLandroidx/media3/exoplayer/analytics/AnalyticsListener$Events;->get(I)I
 HSPLandroidx/media3/exoplayer/analytics/AnalyticsListener$Events;->getEventTime(I)Landroidx/media3/exoplayer/analytics/AnalyticsListener$EventTime;
 HSPLandroidx/media3/exoplayer/analytics/AnalyticsListener$Events;->size()I
-HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda13;-><init>()V
-HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda26;-><init>(Landroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector;Landroidx/media3/common/Player;)V
-HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda26;->invoke(Ljava/lang/Object;Landroidx/media3/common/FlagSet;)V
-HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda49;-><init>(Landroidx/media3/exoplayer/analytics/AnalyticsListener$EventTime;Landroidx/media3/common/AudioAttributes;)V
-HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda49;->invoke(Ljava/lang/Object;)V
-HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda67;-><init>(Landroidx/media3/exoplayer/analytics/AnalyticsListener$EventTime;IJJ)V
-HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda67;->invoke(Ljava/lang/Object;)V
+HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda17;-><init>(Landroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector;Landroidx/media3/common/Player;)V
+HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda17;->invoke(Ljava/lang/Object;Landroidx/media3/common/FlagSet;)V
+HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda19;-><init>(Landroidx/media3/exoplayer/analytics/AnalyticsListener$EventTime;Landroidx/media3/common/AudioAttributes;)V
+HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda19;->invoke(Ljava/lang/Object;)V
+HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda31;-><init>()V
+HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda66;-><init>(Landroidx/media3/exoplayer/analytics/AnalyticsListener$EventTime;IJJ)V
+HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda66;->invoke(Ljava/lang/Object;)V
 HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$MediaPeriodQueueTracker;-><init>(Landroidx/media3/common/Timeline$Period;)V
 HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$MediaPeriodQueueTracker;->getCurrentPlayerMediaPeriod()Landroidx/media3/exoplayer/source/MediaSource$MediaPeriodId;
 HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$MediaPeriodQueueTracker;->getLoadingMediaPeriod()Landroidx/media3/exoplayer/source/MediaSource$MediaPeriodId;
 HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$MediaPeriodQueueTracker;->getReadingMediaPeriod()Landroidx/media3/exoplayer/source/MediaSource$MediaPeriodId;
-HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector;->$r8$lambda$ePy0AIO8UW-xy9MiygZkuaitgYQ(Landroidx/media3/exoplayer/analytics/AnalyticsListener$EventTime;IJJLandroidx/media3/exoplayer/analytics/AnalyticsListener;)V
-HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector;->$r8$lambda$jkdNgF6pLu9A9h86YXT1MXSbNQs(Landroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector;Landroidx/media3/common/Player;Landroidx/media3/exoplayer/analytics/AnalyticsListener;Landroidx/media3/common/FlagSet;)V
-HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector;->$r8$lambda$sGolLeq9t66qzdTT2dT-to4LkZE(Landroidx/media3/exoplayer/analytics/AnalyticsListener$EventTime;Landroidx/media3/common/AudioAttributes;Landroidx/media3/exoplayer/analytics/AnalyticsListener;)V
+HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector;->$r8$lambda$NazTkydGfX6jUSUhgOk3tFa3GFY(Landroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector;Landroidx/media3/common/Player;Landroidx/media3/exoplayer/analytics/AnalyticsListener;Landroidx/media3/common/FlagSet;)V
+HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector;->$r8$lambda$_m96_vv_yAOVAXQW3RVABXR0xvI(Landroidx/media3/exoplayer/analytics/AnalyticsListener$EventTime;IJJLandroidx/media3/exoplayer/analytics/AnalyticsListener;)V
+HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector;->$r8$lambda$tcs3tXiTFY1umbKkJi1QjADgn4c(Landroidx/media3/exoplayer/analytics/AnalyticsListener$EventTime;Landroidx/media3/common/AudioAttributes;Landroidx/media3/exoplayer/analytics/AnalyticsListener;)V
 HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector;-><init>(Landroidx/media3/common/util/Clock;)V
 HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector;->addListener(Landroidx/media3/exoplayer/analytics/AnalyticsListener;)V
 HSPLandroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector;->generateEventTime(Landroidx/media3/common/Timeline;ILandroidx/media3/exoplayer/source/MediaSource$MediaPeriodId;)Landroidx/media3/exoplayer/analytics/AnalyticsListener$EventTime;
@@ -3574,15 +3825,14 @@ HSPLandroidx/media3/exoplayer/analytics/DefaultPlaybackSessionManager;-><init>()
 HSPLandroidx/media3/exoplayer/analytics/DefaultPlaybackSessionManager;-><init>(Lcom/google/common/base/Supplier;)V
 HSPLandroidx/media3/exoplayer/analytics/DefaultPlaybackSessionManager;->setListener(Landroidx/media3/exoplayer/analytics/PlaybackSessionManager$Listener;)V
 HSPLandroidx/media3/exoplayer/analytics/DefaultPlaybackSessionManager;->updateSessions(Landroidx/media3/exoplayer/analytics/AnalyticsListener$EventTime;)V
-HSPLandroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline10;->m(Ljava/lang/Object;)Landroid/media/metrics/MediaMetricsManager;
-HSPLandroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline11;->m(Landroid/media/metrics/MediaMetricsManager;)Landroid/media/metrics/PlaybackSession;
-HSPLandroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline50;->m(Landroid/media/metrics/NetworkEvent$Builder;I)Landroid/media/metrics/NetworkEvent$Builder;
-HSPLandroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline51;->m(Landroid/media/metrics/NetworkEvent$Builder;J)Landroid/media/metrics/NetworkEvent$Builder;
-HSPLandroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline52;->m(Landroid/media/metrics/NetworkEvent$Builder;)Landroid/media/metrics/NetworkEvent;
-HSPLandroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline53;->m(Landroid/media/metrics/PlaybackSession;Landroid/media/metrics/NetworkEvent;)V
-HSPLandroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline54;->m(Landroid/media/metrics/PlaybackSession;)Landroid/media/metrics/LogSessionId;
-HSPLandroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline8;->m()Landroid/media/metrics/NetworkEvent$Builder;
-HSPLandroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline9;->m()V
+HSPLandroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline1;->m()Landroid/media/metrics/NetworkEvent$Builder;
+HSPLandroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline23;->m(Landroid/media/metrics/NetworkEvent$Builder;I)Landroid/media/metrics/NetworkEvent$Builder;
+HSPLandroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline24;->m(Landroid/media/metrics/NetworkEvent$Builder;J)Landroid/media/metrics/NetworkEvent$Builder;
+HSPLandroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline25;->m(Landroid/media/metrics/NetworkEvent$Builder;)Landroid/media/metrics/NetworkEvent;
+HSPLandroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline26;->m(Landroid/media/metrics/PlaybackSession;Landroid/media/metrics/NetworkEvent;)V
+HSPLandroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline49;->m(Landroid/media/metrics/PlaybackSession;)Landroid/media/metrics/LogSessionId;
+HSPLandroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline5;->m(Ljava/lang/Object;)Landroid/media/metrics/MediaMetricsManager;
+HSPLandroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline6;->m(Landroid/media/metrics/MediaMetricsManager;)Landroid/media/metrics/PlaybackSession;
 HSPLandroidx/media3/exoplayer/analytics/MediaMetricsListener;-><init>(Landroid/content/Context;Landroid/media/metrics/PlaybackSession;)V
 HSPLandroidx/media3/exoplayer/analytics/MediaMetricsListener;->canReportPendingFormatUpdate(Landroidx/media3/exoplayer/analytics/MediaMetricsListener$PendingFormatUpdate;)Z
 HSPLandroidx/media3/exoplayer/analytics/MediaMetricsListener;->create(Landroid/content/Context;)Landroidx/media3/exoplayer/analytics/MediaMetricsListener;
@@ -3749,8 +3999,8 @@ HSPLandroidx/media3/exoplayer/text/TextRenderer;-><init>(Landroidx/media3/exopla
 HSPLandroidx/media3/exoplayer/trackselection/AdaptiveTrackSelection$Factory;-><init>()V
 HSPLandroidx/media3/exoplayer/trackselection/AdaptiveTrackSelection$Factory;-><init>(IIIF)V
 HSPLandroidx/media3/exoplayer/trackselection/AdaptiveTrackSelection$Factory;-><init>(IIIIIFFLandroidx/media3/common/util/Clock;)V
-HSPLandroidx/media3/exoplayer/trackselection/DefaultTrackSelector$$ExternalSyntheticLambda6;-><init>()V
-HSPLandroidx/media3/exoplayer/trackselection/DefaultTrackSelector$$ExternalSyntheticLambda7;-><init>()V
+HSPLandroidx/media3/exoplayer/trackselection/DefaultTrackSelector$$ExternalSyntheticLambda0;-><init>()V
+HSPLandroidx/media3/exoplayer/trackselection/DefaultTrackSelector$$ExternalSyntheticLambda1;-><init>()V
 HSPLandroidx/media3/exoplayer/trackselection/DefaultTrackSelector$Parameters$$ExternalSyntheticLambda0;-><init>()V
 HSPLandroidx/media3/exoplayer/trackselection/DefaultTrackSelector$Parameters$Builder;-><init>()V
 HSPLandroidx/media3/exoplayer/trackselection/DefaultTrackSelector$Parameters$Builder;-><init>(Landroid/content/Context;)V
@@ -3805,7 +4055,7 @@ HSPLandroidx/media3/exoplayer/upstream/BandwidthMeter$EventListener$EventDispatc
 HSPLandroidx/media3/exoplayer/upstream/BandwidthMeter$EventListener$EventDispatcher$HandlerAndListener;->access$000(Landroidx/media3/exoplayer/upstream/BandwidthMeter$EventListener$EventDispatcher$HandlerAndListener;)Landroidx/media3/exoplayer/upstream/BandwidthMeter$EventListener;
 HSPLandroidx/media3/exoplayer/upstream/BandwidthMeter$EventListener$EventDispatcher$HandlerAndListener;->access$100(Landroidx/media3/exoplayer/upstream/BandwidthMeter$EventListener$EventDispatcher$HandlerAndListener;)Z
 HSPLandroidx/media3/exoplayer/upstream/BandwidthMeter$EventListener$EventDispatcher$HandlerAndListener;->access$200(Landroidx/media3/exoplayer/upstream/BandwidthMeter$EventListener$EventDispatcher$HandlerAndListener;)Landroid/os/Handler;
-HSPLandroidx/media3/exoplayer/upstream/BandwidthMeter$EventListener$EventDispatcher;->$r8$lambda$Mbwn2ga0EIE0XL-yT6DTuqKqjlA(Landroidx/media3/exoplayer/upstream/BandwidthMeter$EventListener$EventDispatcher$HandlerAndListener;IJJ)V
+HSPLandroidx/media3/exoplayer/upstream/BandwidthMeter$EventListener$EventDispatcher;->$r8$lambda$GKE-2Ys_1MhN-RoBQ2ySsnFXCbI(Landroidx/media3/exoplayer/upstream/BandwidthMeter$EventListener$EventDispatcher$HandlerAndListener;IJJ)V
 HSPLandroidx/media3/exoplayer/upstream/BandwidthMeter$EventListener$EventDispatcher;-><init>()V
 HSPLandroidx/media3/exoplayer/upstream/BandwidthMeter$EventListener$EventDispatcher;->addListener(Landroid/os/Handler;Landroidx/media3/exoplayer/upstream/BandwidthMeter$EventListener;)V
 HSPLandroidx/media3/exoplayer/upstream/BandwidthMeter$EventListener$EventDispatcher;->bandwidthSample(IJJ)V
@@ -3818,7 +4068,7 @@ HSPLandroidx/media3/exoplayer/upstream/DefaultBandwidthMeter$$ExternalSyntheticL
 HSPLandroidx/media3/exoplayer/upstream/DefaultBandwidthMeter$Builder;-><init>(Landroid/content/Context;)V
 HSPLandroidx/media3/exoplayer/upstream/DefaultBandwidthMeter$Builder;->build()Landroidx/media3/exoplayer/upstream/DefaultBandwidthMeter;
 HSPLandroidx/media3/exoplayer/upstream/DefaultBandwidthMeter$Builder;->getInitialBitrateEstimatesForCountry(Ljava/lang/String;)Ljava/util/Map;
-HSPLandroidx/media3/exoplayer/upstream/DefaultBandwidthMeter;->$r8$lambda$8vbqeEDAAIcRppX7lWd9C-LcIoU(Landroidx/media3/exoplayer/upstream/DefaultBandwidthMeter;I)V
+HSPLandroidx/media3/exoplayer/upstream/DefaultBandwidthMeter;->$r8$lambda$pO_odySZ98SgTVF8TZTXVnU5Mq8(Landroidx/media3/exoplayer/upstream/DefaultBandwidthMeter;I)V
 HSPLandroidx/media3/exoplayer/upstream/DefaultBandwidthMeter;-><clinit>()V
 HSPLandroidx/media3/exoplayer/upstream/DefaultBandwidthMeter;-><init>(Landroid/content/Context;Ljava/util/Map;ILandroidx/media3/common/util/Clock;Z)V
 HSPLandroidx/media3/exoplayer/upstream/DefaultBandwidthMeter;-><init>(Landroid/content/Context;Ljava/util/Map;ILandroidx/media3/common/util/Clock;ZLandroidx/media3/exoplayer/upstream/DefaultBandwidthMeter$1;)V
@@ -3885,7 +4135,7 @@ HSPLandroidx/media3/session/CommandButton$Builder;->setEnabled(Z)Landroidx/media
 HSPLandroidx/media3/session/CommandButton$Builder;->setExtras(Landroid/os/Bundle;)Landroidx/media3/session/CommandButton$Builder;
 HSPLandroidx/media3/session/CommandButton$Builder;->setIconResId(I)Landroidx/media3/session/CommandButton$Builder;
 HSPLandroidx/media3/session/CommandButton$Builder;->setPlayerCommand(I)Landroidx/media3/session/CommandButton$Builder;
-HSPLandroidx/media3/session/CommandButton;->$r8$lambda$NuCyllBZqMGlcMmw2c9ZW1r2MLk(Landroid/os/Bundle;)Landroidx/media3/session/CommandButton;
+HSPLandroidx/media3/session/CommandButton;->$r8$lambda$6L4hW452HZbYJebXfe5--Ib5wqI(Landroid/os/Bundle;)Landroidx/media3/session/CommandButton;
 HSPLandroidx/media3/session/CommandButton;-><clinit>()V
 HSPLandroidx/media3/session/CommandButton;-><init>(Landroidx/media3/session/SessionCommand;IILjava/lang/CharSequence;Landroid/os/Bundle;Z)V
 HSPLandroidx/media3/session/CommandButton;-><init>(Landroidx/media3/session/SessionCommand;IILjava/lang/CharSequence;Landroid/os/Bundle;ZLandroidx/media3/session/CommandButton$1;)V
@@ -3906,7 +4156,7 @@ HSPLandroidx/media3/session/ConnectedControllersManager;->isConnected(Landroidx/
 HSPLandroidx/media3/session/ConnectedControllersManager;->isSessionCommandAvailable(Landroidx/media3/session/MediaSession$ControllerInfo;Landroidx/media3/session/SessionCommand;)Z
 HSPLandroidx/media3/session/ConnectionRequest$$ExternalSyntheticLambda0;-><init>()V
 HSPLandroidx/media3/session/ConnectionRequest$$ExternalSyntheticLambda0;->fromBundle(Landroid/os/Bundle;)Landroidx/media3/common/Bundleable;
-HSPLandroidx/media3/session/ConnectionRequest;->$r8$lambda$2A3KvllqTYxjJdHPpYs14G1Hda8(Landroid/os/Bundle;)Landroidx/media3/session/ConnectionRequest;
+HSPLandroidx/media3/session/ConnectionRequest;->$r8$lambda$b_Waycodj9J3042X1XpIMwaWqVo(Landroid/os/Bundle;)Landroidx/media3/session/ConnectionRequest;
 HSPLandroidx/media3/session/ConnectionRequest;-><clinit>()V
 HSPLandroidx/media3/session/ConnectionRequest;-><init>(IILjava/lang/String;ILandroid/os/Bundle;)V
 HSPLandroidx/media3/session/ConnectionRequest;-><init>(Ljava/lang/String;ILandroid/os/Bundle;)V
@@ -3917,7 +4167,7 @@ HSPLandroidx/media3/session/ConnectionState$$ExternalSyntheticLambda0;->fromBund
 HSPLandroidx/media3/session/ConnectionState$InProcessBinder;-><init>(Landroidx/media3/session/ConnectionState;)V
 HSPLandroidx/media3/session/ConnectionState$InProcessBinder;-><init>(Landroidx/media3/session/ConnectionState;Landroidx/media3/session/ConnectionState$1;)V
 HSPLandroidx/media3/session/ConnectionState$InProcessBinder;->getConnectionState()Landroidx/media3/session/ConnectionState;
-HSPLandroidx/media3/session/ConnectionState;->$r8$lambda$ZjTwf4GufRk5624GRLNfHLYPV2s(Landroid/os/Bundle;)Landroidx/media3/session/ConnectionState;
+HSPLandroidx/media3/session/ConnectionState;->$r8$lambda$YkD8FSZoBRRjMhL5WUIP3LSgHdk(Landroid/os/Bundle;)Landroidx/media3/session/ConnectionState;
 HSPLandroidx/media3/session/ConnectionState;-><clinit>()V
 HSPLandroidx/media3/session/ConnectionState;-><init>(IILandroidx/media3/session/IMediaSession;Landroid/app/PendingIntent;Lcom/google/common/collect/ImmutableList;Landroidx/media3/session/SessionCommands;Landroidx/media3/common/Player$Commands;Landroidx/media3/common/Player$Commands;Landroid/os/Bundle;Landroid/os/Bundle;Landroidx/media3/session/PlayerInfo;)V
 HSPLandroidx/media3/session/ConnectionState;->fromBundle(Landroid/os/Bundle;)Landroidx/media3/session/ConnectionState;
@@ -3925,8 +4175,7 @@ HSPLandroidx/media3/session/ConnectionState;->toBundleInProcess()Landroid/os/Bun
 HSPLandroidx/media3/session/DefaultActionFactory;-><init>(Landroid/app/Service;)V
 HSPLandroidx/media3/session/DefaultMediaNotificationProvider$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/NotificationManager;Ljava/lang/String;)Landroid/app/NotificationChannel;
 HSPLandroidx/media3/session/DefaultMediaNotificationProvider$Api26$$ExternalSyntheticApiModelOutline0;->m(Ljava/lang/String;Ljava/lang/CharSequence;I)Landroid/app/NotificationChannel;
-HSPLandroidx/media3/session/DefaultMediaNotificationProvider$Api26$$ExternalSyntheticApiModelOutline1;->m()V
-HSPLandroidx/media3/session/DefaultMediaNotificationProvider$Api26$$ExternalSyntheticApiModelOutline2;->m(Landroid/app/NotificationChannel;Z)V
+HSPLandroidx/media3/session/DefaultMediaNotificationProvider$Api26$$ExternalSyntheticApiModelOutline1;->m(Landroid/app/NotificationChannel;Z)V
 HSPLandroidx/media3/session/IMediaController$Stub;-><init>()V
 HSPLandroidx/media3/session/IMediaController$Stub;->asBinder()Landroid/os/IBinder;
 HSPLandroidx/media3/session/IMediaSession$Stub;-><init>()V
@@ -3947,7 +4196,7 @@ HSPLandroidx/media3/session/MediaController$Builder$$ExternalSyntheticLambda0;->
 HSPLandroidx/media3/session/MediaController$Builder$1;-><init>(Landroidx/media3/session/MediaController$Builder;)V
 HSPLandroidx/media3/session/MediaController$Builder$1;->onCustomLayoutChanged(Landroidx/media3/session/MediaController;Ljava/util/List;)V
 HSPLandroidx/media3/session/MediaController$Builder$1;->onSetCustomLayout(Landroidx/media3/session/MediaController;Ljava/util/List;)Lcom/google/common/util/concurrent/ListenableFuture;
-HSPLandroidx/media3/session/MediaController$Builder;->$r8$lambda$zyVzcB3Sb8jhbB9a-kIcWAaXt7s(Landroidx/media3/session/MediaControllerHolder;Landroidx/media3/session/MediaController;)V
+HSPLandroidx/media3/session/MediaController$Builder;->$r8$lambda$TGj5Athe5Tx0dY85NlPbhdIlN6Y(Landroidx/media3/session/MediaControllerHolder;Landroidx/media3/session/MediaController;)V
 HSPLandroidx/media3/session/MediaController$Builder;-><init>(Landroid/content/Context;Landroidx/media3/session/SessionToken;)V
 HSPLandroidx/media3/session/MediaController$Builder;->buildAsync()Lcom/google/common/util/concurrent/ListenableFuture;
 HSPLandroidx/media3/session/MediaController$Builder;->lambda$buildAsync$0(Landroidx/media3/session/MediaControllerHolder;Landroidx/media3/session/MediaController;)V
@@ -3974,8 +4223,8 @@ HSPLandroidx/media3/session/MediaControllerHolder$$ExternalSyntheticLambda0;-><i
 HSPLandroidx/media3/session/MediaControllerHolder$$ExternalSyntheticLambda0;->run()V
 HSPLandroidx/media3/session/MediaControllerHolder$$ExternalSyntheticLambda1;-><init>(Landroidx/media3/session/MediaControllerHolder;)V
 HSPLandroidx/media3/session/MediaControllerHolder$$ExternalSyntheticLambda1;->execute(Ljava/lang/Runnable;)V
-HSPLandroidx/media3/session/MediaControllerHolder;->$r8$lambda$0uHDg3PUO16yaKQbREVujLjFB_o(Landroidx/media3/session/MediaControllerHolder;Landroidx/media3/session/MediaController;)V
-HSPLandroidx/media3/session/MediaControllerHolder;->$r8$lambda$VFe1KzajtydbtNtJfzKnUJSxHgA(Landroidx/media3/session/MediaControllerHolder;Ljava/lang/Runnable;)V
+HSPLandroidx/media3/session/MediaControllerHolder;->$r8$lambda$1SOTI-KnTKkJvcI_Bq9yhGROff4(Landroidx/media3/session/MediaControllerHolder;Ljava/lang/Runnable;)V
+HSPLandroidx/media3/session/MediaControllerHolder;->$r8$lambda$uUP6uG1La2JYxvft6nMxeL9XL5k(Landroidx/media3/session/MediaControllerHolder;Landroidx/media3/session/MediaController;)V
 HSPLandroidx/media3/session/MediaControllerHolder;-><init>(Landroid/os/Looper;)V
 HSPLandroidx/media3/session/MediaControllerHolder;->lambda$setController$0(Landroidx/media3/session/MediaController;)V
 HSPLandroidx/media3/session/MediaControllerHolder;->lambda$setController$1(Ljava/lang/Runnable;)V
@@ -3984,24 +4233,24 @@ HSPLandroidx/media3/session/MediaControllerHolder;->onAccepted()V
 HSPLandroidx/media3/session/MediaControllerHolder;->setController(Landroidx/media3/session/MediaController;)V
 HSPLandroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda104;-><init>(Landroidx/media3/session/MediaControllerImplBase;I)V
 HSPLandroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda104;->run()V
-HSPLandroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda108;-><init>(Landroidx/media3/session/MediaControllerImplBase;ZI)V
-HSPLandroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda108;->accept(Ljava/lang/Object;)V
+HSPLandroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda109;-><init>(Landroidx/media3/session/MediaControllerImplBase;ZI)V
+HSPLandroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda109;->accept(Ljava/lang/Object;)V
 HSPLandroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda114;-><init>(Landroidx/media3/session/MediaControllerImplBase;Lcom/google/common/util/concurrent/ListenableFuture;I)V
 HSPLandroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda114;->run()V
-HSPLandroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda38;-><init>(Landroidx/media3/session/MediaControllerImplBase;)V
+HSPLandroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda23;-><init>(Landroidx/media3/session/MediaControllerImplBase;Landroidx/media3/session/SessionCommand;Landroid/os/Bundle;)V
+HSPLandroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda23;->run(Landroidx/media3/session/IMediaSession;I)V
 HSPLandroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda39;-><init>(Landroidx/media3/session/MediaControllerImplBase;)V
-HSPLandroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda41;-><init>(Landroidx/media3/session/MediaControllerImplBase;Landroidx/media3/session/SessionCommand;Landroid/os/Bundle;)V
-HSPLandroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda41;->run(Landroidx/media3/session/IMediaSession;I)V
+HSPLandroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda40;-><init>(Landroidx/media3/session/MediaControllerImplBase;)V
 HSPLandroidx/media3/session/MediaControllerImplBase$FlushCommandQueueHandler$$ExternalSyntheticLambda0;-><init>(Landroidx/media3/session/MediaControllerImplBase$FlushCommandQueueHandler;)V
 HSPLandroidx/media3/session/MediaControllerImplBase$FlushCommandQueueHandler;-><init>(Landroidx/media3/session/MediaControllerImplBase;Landroid/os/Looper;)V
 HSPLandroidx/media3/session/MediaControllerImplBase$SessionServiceConnection;-><init>(Landroidx/media3/session/MediaControllerImplBase;Landroid/os/Bundle;)V
 HSPLandroidx/media3/session/MediaControllerImplBase$SessionServiceConnection;->onServiceConnected(Landroid/content/ComponentName;Landroid/os/IBinder;)V
 HSPLandroidx/media3/session/MediaControllerImplBase$SurfaceCallback;-><init>(Landroidx/media3/session/MediaControllerImplBase;)V
 HSPLandroidx/media3/session/MediaControllerImplBase$SurfaceCallback;-><init>(Landroidx/media3/session/MediaControllerImplBase;Landroidx/media3/session/MediaControllerImplBase$1;)V
-HSPLandroidx/media3/session/MediaControllerImplBase;->$r8$lambda$9zYDBLO34_xl0JlcPU0_tzaQUTE(Landroidx/media3/session/MediaControllerImplBase;Lcom/google/common/util/concurrent/ListenableFuture;I)V
-HSPLandroidx/media3/session/MediaControllerImplBase;->$r8$lambda$es4RLb9JXUKd95d4cKofXSS87xM(Landroidx/media3/session/MediaControllerImplBase;I)V
-HSPLandroidx/media3/session/MediaControllerImplBase;->$r8$lambda$mXQX_Ogg1Zjg5n58ylw_9v5Iv2Y(Landroidx/media3/session/MediaControllerImplBase;Landroidx/media3/session/SessionCommand;Landroid/os/Bundle;Landroidx/media3/session/IMediaSession;I)V
-HSPLandroidx/media3/session/MediaControllerImplBase;->$r8$lambda$oTMV0r3uwAPvI1WXxNvazTtoPXw(Landroidx/media3/session/MediaControllerImplBase;ZILandroidx/media3/session/MediaController$Listener;)V
+HSPLandroidx/media3/session/MediaControllerImplBase;->$r8$lambda$YjhkL1c3adQlF6E4YLqZLT1eyIs(Landroidx/media3/session/MediaControllerImplBase;Landroidx/media3/session/SessionCommand;Landroid/os/Bundle;Landroidx/media3/session/IMediaSession;I)V
+HSPLandroidx/media3/session/MediaControllerImplBase;->$r8$lambda$jS669y0kZsC3CYRSle6J3bWLRMk(Landroidx/media3/session/MediaControllerImplBase;ZILandroidx/media3/session/MediaController$Listener;)V
+HSPLandroidx/media3/session/MediaControllerImplBase;->$r8$lambda$n1APUsSGENTveFPC-ajvUqEp2Jw(Landroidx/media3/session/MediaControllerImplBase;I)V
+HSPLandroidx/media3/session/MediaControllerImplBase;->$r8$lambda$rrUIVY081WE_bH0bYzfaYw0jlBU(Landroidx/media3/session/MediaControllerImplBase;Lcom/google/common/util/concurrent/ListenableFuture;I)V
 HSPLandroidx/media3/session/MediaControllerImplBase;-><init>(Landroid/content/Context;Landroidx/media3/session/MediaController;Landroidx/media3/session/SessionToken;Landroid/os/Bundle;Landroid/os/Looper;)V
 HSPLandroidx/media3/session/MediaControllerImplBase;->access$300(Landroidx/media3/session/MediaControllerImplBase;)Landroidx/media3/session/SessionToken;
 HSPLandroidx/media3/session/MediaControllerImplBase;->addListener(Landroidx/media3/common/Player$Listener;)V
@@ -4032,18 +4281,18 @@ HSPLandroidx/media3/session/MediaControllerImplBase;->sendControllerResult(ILand
 HSPLandroidx/media3/session/MediaControllerImplBase;->sendControllerResultWhenReady(ILcom/google/common/util/concurrent/ListenableFuture;)V
 HSPLandroidx/media3/session/MediaControllerImplBase;->sendCustomCommand(Landroidx/media3/session/SessionCommand;Landroid/os/Bundle;)Lcom/google/common/util/concurrent/ListenableFuture;
 HSPLandroidx/media3/session/MediaControllerImplBase;->setFutureResult(ILjava/lang/Object;)V
-HSPLandroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda0;-><init>(Landroidx/media3/session/PlayerInfo;Landroidx/media3/session/PlayerInfo$BundlingExclusions;)V
-HSPLandroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda0;->run(Landroidx/media3/session/MediaControllerImplBase;)V
+HSPLandroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda12;-><init>(Landroidx/media3/session/PlayerInfo;Landroidx/media3/session/PlayerInfo$BundlingExclusions;)V
+HSPLandroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda12;->run(Landroidx/media3/session/MediaControllerImplBase;)V
 HSPLandroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda13;-><init>(Landroidx/media3/session/MediaControllerImplBase;Landroidx/media3/session/MediaControllerStub$ControllerTask;)V
 HSPLandroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda13;->run()V
-HSPLandroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda1;-><init>(ILjava/util/List;)V
-HSPLandroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda1;->run(Landroidx/media3/session/MediaControllerImplBase;)V
-HSPLandroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda3;-><init>(Landroidx/media3/session/ConnectionState;)V
-HSPLandroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda3;->run(Landroidx/media3/session/MediaControllerImplBase;)V
-HSPLandroidx/media3/session/MediaControllerStub;->$r8$lambda$JGVSWCsU6Jlg0sL9859LYxYyOC0(Landroidx/media3/session/PlayerInfo;Landroidx/media3/session/PlayerInfo$BundlingExclusions;Landroidx/media3/session/MediaControllerImplBase;)V
-HSPLandroidx/media3/session/MediaControllerStub;->$r8$lambda$MjY9_DNY4SSRIb5zTIg0JPQvRmg(ILjava/util/List;Landroidx/media3/session/MediaControllerImplBase;)V
-HSPLandroidx/media3/session/MediaControllerStub;->$r8$lambda$YGpG-xpiKgSpdH847m1pEUdLemY(Landroidx/media3/session/MediaControllerImplBase;Landroidx/media3/session/MediaControllerStub$ControllerTask;)V
-HSPLandroidx/media3/session/MediaControllerStub;->$r8$lambda$xpPa91l5F1le6Kbgz5kYcVmIzWE(Landroidx/media3/session/ConnectionState;Landroidx/media3/session/MediaControllerImplBase;)V
+HSPLandroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda7;-><init>(Landroidx/media3/session/ConnectionState;)V
+HSPLandroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda7;->run(Landroidx/media3/session/MediaControllerImplBase;)V
+HSPLandroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda9;-><init>(ILjava/util/List;)V
+HSPLandroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda9;->run(Landroidx/media3/session/MediaControllerImplBase;)V
+HSPLandroidx/media3/session/MediaControllerStub;->$r8$lambda$1mqEmhpt-kfk4BRdU-3KyMUq3ro(Landroidx/media3/session/MediaControllerImplBase;Landroidx/media3/session/MediaControllerStub$ControllerTask;)V
+HSPLandroidx/media3/session/MediaControllerStub;->$r8$lambda$FxCmFzI5VRLaeXNrPjn8QeuaQfY(Landroidx/media3/session/ConnectionState;Landroidx/media3/session/MediaControllerImplBase;)V
+HSPLandroidx/media3/session/MediaControllerStub;->$r8$lambda$L9tmulJjKWDMbV1OLxxHgcURspg(ILjava/util/List;Landroidx/media3/session/MediaControllerImplBase;)V
+HSPLandroidx/media3/session/MediaControllerStub;->$r8$lambda$OeO_3w6AAj8dyNf3ovvxdZzzzBY(Landroidx/media3/session/PlayerInfo;Landroidx/media3/session/PlayerInfo$BundlingExclusions;Landroidx/media3/session/MediaControllerImplBase;)V
 HSPLandroidx/media3/session/MediaControllerStub;-><init>(Landroidx/media3/session/MediaControllerImplBase;)V
 HSPLandroidx/media3/session/MediaControllerStub;->dispatchControllerTaskOnHandler(Landroidx/media3/session/MediaControllerStub$ControllerTask;)V
 HSPLandroidx/media3/session/MediaControllerStub;->lambda$dispatchControllerTaskOnHandler$12(Landroidx/media3/session/MediaControllerImplBase;Landroidx/media3/session/MediaControllerStub$ControllerTask;)V
@@ -4055,17 +4304,18 @@ HSPLandroidx/media3/session/MediaControllerStub;->onPlayerInfoChangedWithExclusi
 HSPLandroidx/media3/session/MediaControllerStub;->onSessionResult(ILandroid/os/Bundle;)V
 HSPLandroidx/media3/session/MediaControllerStub;->onSetCustomLayout(ILjava/util/List;)V
 HSPLandroidx/media3/session/MediaControllerStub;->setControllerFutureResult(ILjava/lang/Object;)V
-HSPLandroidx/media3/session/MediaNotificationManager$$ExternalSyntheticLambda2;-><init>(Landroid/os/Handler;)V
-HSPLandroidx/media3/session/MediaNotificationManager$$ExternalSyntheticLambda2;->execute(Ljava/lang/Runnable;)V
-HSPLandroidx/media3/session/MediaNotificationManager$$ExternalSyntheticLambda5;-><init>(Landroidx/media3/session/MediaNotificationManager;Lcom/google/common/util/concurrent/ListenableFuture;Landroidx/media3/session/MediaNotificationManager$MediaControllerListener;Landroidx/media3/session/MediaSession;)V
-HSPLandroidx/media3/session/MediaNotificationManager$$ExternalSyntheticLambda5;->run()V
+HSPLandroidx/media3/session/MediaNotificationManager$$ExternalSyntheticLambda0;-><init>(Landroid/os/Handler;)V
+HSPLandroidx/media3/session/MediaNotificationManager$$ExternalSyntheticLambda0;->execute(Ljava/lang/Runnable;)V
+HSPLandroidx/media3/session/MediaNotificationManager$$ExternalSyntheticLambda6;-><init>(Landroidx/media3/session/MediaNotificationManager;Lcom/google/common/util/concurrent/ListenableFuture;Landroidx/media3/session/MediaNotificationManager$MediaControllerListener;Landroidx/media3/session/MediaSession;)V
+HSPLandroidx/media3/session/MediaNotificationManager$$ExternalSyntheticLambda6;->run()V
+HSPLandroidx/media3/session/MediaNotificationManager$Api24$$ExternalSyntheticApiModelOutline0;->m(Landroidx/media3/session/MediaSessionService;I)V
 HSPLandroidx/media3/session/MediaNotificationManager$Api24;->stopForeground(Landroidx/media3/session/MediaSessionService;Z)V
 HSPLandroidx/media3/session/MediaNotificationManager$MediaControllerListener;-><init>(Landroidx/media3/session/MediaSessionService;Landroidx/media3/session/MediaSession;)V
 HSPLandroidx/media3/session/MediaNotificationManager$MediaControllerListener;->onConnected(Z)V
 HSPLandroidx/media3/session/MediaNotificationManager$MediaControllerListener;->onCustomLayoutChanged(Landroidx/media3/session/MediaController;Ljava/util/List;)V
 HSPLandroidx/media3/session/MediaNotificationManager$MediaControllerListener;->onSetCustomLayout(Landroidx/media3/session/MediaController;Ljava/util/List;)Lcom/google/common/util/concurrent/ListenableFuture;
-HSPLandroidx/media3/session/MediaNotificationManager;->$r8$lambda$1ulvKeHiWSsj_M-1JZwhrZVhpA8(Landroidx/media3/session/MediaNotificationManager;Lcom/google/common/util/concurrent/ListenableFuture;Landroidx/media3/session/MediaNotificationManager$MediaControllerListener;Landroidx/media3/session/MediaSession;)V
-HSPLandroidx/media3/session/MediaNotificationManager;->$r8$lambda$NYHZ5KZm0zYYXQuqLwbY7Jckyvo(Landroid/os/Handler;Ljava/lang/Runnable;)V
+HSPLandroidx/media3/session/MediaNotificationManager;->$r8$lambda$efQrfEcHMoYeoAKtM2U12Qb3MoE(Landroid/os/Handler;Ljava/lang/Runnable;)V
+HSPLandroidx/media3/session/MediaNotificationManager;->$r8$lambda$ur2iSgtipZCUIjBtKVEwwBZgiTQ(Landroidx/media3/session/MediaNotificationManager;Lcom/google/common/util/concurrent/ListenableFuture;Landroidx/media3/session/MediaNotificationManager$MediaControllerListener;Landroidx/media3/session/MediaSession;)V
 HSPLandroidx/media3/session/MediaNotificationManager;-><init>(Landroidx/media3/session/MediaSessionService;Landroidx/media3/session/MediaNotification$Provider;Landroidx/media3/session/MediaNotification$ActionFactory;)V
 HSPLandroidx/media3/session/MediaNotificationManager;->addSession(Landroidx/media3/session/MediaSession;)V
 HSPLandroidx/media3/session/MediaNotificationManager;->getConnectedControllerForSession(Landroidx/media3/session/MediaSession;)Landroidx/media3/session/MediaController;
@@ -4108,30 +4358,30 @@ HSPLandroidx/media3/session/MediaSession;->handleControllerConnectionFromService
 HSPLandroidx/media3/session/MediaSession;->isReleased()Z
 HSPLandroidx/media3/session/MediaSession;->setCustomLayout(Landroidx/media3/session/MediaSession$ControllerInfo;Ljava/util/List;)Lcom/google/common/util/concurrent/ListenableFuture;
 HSPLandroidx/media3/session/MediaSession;->setListener(Landroidx/media3/session/MediaSession$Listener;)V
-HSPLandroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda0;-><init>(Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/PlayerWrapper;)V
-HSPLandroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda0;->run()V
+HSPLandroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda15;-><init>(Landroidx/media3/session/PlayerWrapper;Landroidx/media3/session/PlayerWrapper;)V
+HSPLandroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda15;->run(Landroidx/media3/session/MediaSession$ControllerCb;I)V
 HSPLandroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda17;-><init>(Landroidx/media3/common/Player$Commands;)V
 HSPLandroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda17;->run(Landroidx/media3/session/MediaSession$ControllerCb;I)V
 HSPLandroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda18;-><init>(Landroidx/media3/session/MediaSessionImpl;)V
 HSPLandroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda18;->run(Landroidx/media3/session/MediaSession$ControllerCb;I)V
-HSPLandroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda1;-><init>(Landroidx/media3/session/MediaSessionImpl;)V
+HSPLandroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda1;-><init>(Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/PlayerWrapper;)V
+HSPLandroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda1;->run()V
 HSPLandroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda2;-><init>(Landroidx/media3/session/MediaSessionImpl;)V
-HSPLandroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda2;->run()V
+HSPLandroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda3;-><init>(Landroidx/media3/session/MediaSessionImpl;)V
+HSPLandroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda3;->run()V
 HSPLandroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda4;-><init>(Lcom/google/common/collect/ImmutableList;)V
 HSPLandroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda4;->run(Landroidx/media3/session/MediaSession$ControllerCb;I)V
-HSPLandroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda6;-><init>(Landroidx/media3/session/PlayerWrapper;Landroidx/media3/session/PlayerWrapper;)V
-HSPLandroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda6;->run(Landroidx/media3/session/MediaSession$ControllerCb;I)V
 HSPLandroidx/media3/session/MediaSessionImpl$MediaPlayPauseKeyHandler;-><init>(Landroidx/media3/session/MediaSessionImpl;Landroid/os/Looper;)V
 HSPLandroidx/media3/session/MediaSessionImpl$PlayerInfoChangedHandler;-><init>(Landroidx/media3/session/MediaSessionImpl;Landroid/os/Looper;)V
 HSPLandroidx/media3/session/MediaSessionImpl$PlayerInfoChangedHandler;->handleMessage(Landroid/os/Message;)V
 HSPLandroidx/media3/session/MediaSessionImpl$PlayerInfoChangedHandler;->sendPlayerInfoChangedMessage(ZZ)V
 HSPLandroidx/media3/session/MediaSessionImpl$PlayerListener;-><init>(Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/PlayerWrapper;)V
-HSPLandroidx/media3/session/MediaSessionImpl;->$r8$lambda$01SsO3LCKUvxOjWIW3Kn8h3-Otg(Landroidx/media3/session/PlayerWrapper;Landroidx/media3/session/PlayerWrapper;Landroidx/media3/session/MediaSession$ControllerCb;I)V
-HSPLandroidx/media3/session/MediaSessionImpl;->$r8$lambda$1wh78gmVIoNd6SPfHgugwWfFrbo(Landroidx/media3/session/MediaSessionImpl;)V
-HSPLandroidx/media3/session/MediaSessionImpl;->$r8$lambda$NroOxpjPW02vBGUiZXAlHZ1e5NI(Landroidx/media3/common/Player$Commands;Landroidx/media3/session/MediaSession$ControllerCb;I)V
-HSPLandroidx/media3/session/MediaSessionImpl;->$r8$lambda$b5lgJN0r2mELH0IoiJEFkVL86gg(Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/PlayerWrapper;)V
-HSPLandroidx/media3/session/MediaSessionImpl;->$r8$lambda$dpzBmwiuu4PypD-_kp4T1pSZ1EU(Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/MediaSession$ControllerCb;I)V
-HSPLandroidx/media3/session/MediaSessionImpl;->$r8$lambda$jR9N3TTZxFJ0KbFQHAwTWn_wTpc(Lcom/google/common/collect/ImmutableList;Landroidx/media3/session/MediaSession$ControllerCb;I)V
+HSPLandroidx/media3/session/MediaSessionImpl;->$r8$lambda$-tv9SMUrbIvniXW6tvzMyhuXmEs(Lcom/google/common/collect/ImmutableList;Landroidx/media3/session/MediaSession$ControllerCb;I)V
+HSPLandroidx/media3/session/MediaSessionImpl;->$r8$lambda$0KXhYynaXSf7ddUrubjSkjdskIU(Landroidx/media3/session/MediaSessionImpl;)V
+HSPLandroidx/media3/session/MediaSessionImpl;->$r8$lambda$8Imq7BY3Fm0wc7OUOm-25HBznu0(Landroidx/media3/session/PlayerWrapper;Landroidx/media3/session/PlayerWrapper;Landroidx/media3/session/MediaSession$ControllerCb;I)V
+HSPLandroidx/media3/session/MediaSessionImpl;->$r8$lambda$CdqzAor5T5PmGUfH0mloHXDOQmM(Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/MediaSession$ControllerCb;I)V
+HSPLandroidx/media3/session/MediaSessionImpl;->$r8$lambda$KCCkwburjdKlbVt8wwQSkeKFCqY(Landroidx/media3/common/Player$Commands;Landroidx/media3/session/MediaSession$ControllerCb;I)V
+HSPLandroidx/media3/session/MediaSessionImpl;->$r8$lambda$skkGNmjm-ETktD2Qmg3gU3g3bg0(Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/PlayerWrapper;)V
 HSPLandroidx/media3/session/MediaSessionImpl;-><clinit>()V
 HSPLandroidx/media3/session/MediaSessionImpl;-><init>(Landroidx/media3/session/MediaSession;Landroid/content/Context;Ljava/lang/String;Landroidx/media3/common/Player;Landroid/app/PendingIntent;Lcom/google/common/collect/ImmutableList;Landroidx/media3/session/MediaSession$Callback;Landroid/os/Bundle;Landroid/os/Bundle;Landroidx/media3/common/util/BitmapLoader;ZZ)V
 HSPLandroidx/media3/session/MediaSessionImpl;->access$200(Landroidx/media3/session/MediaSessionImpl;)Landroidx/media3/session/PlayerInfo;
@@ -4168,8 +4418,8 @@ HSPLandroidx/media3/session/MediaSessionImpl;->setAvailableFrameworkControllerCo
 HSPLandroidx/media3/session/MediaSessionImpl;->setCustomLayout(Landroidx/media3/session/MediaSession$ControllerInfo;Lcom/google/common/collect/ImmutableList;)Lcom/google/common/util/concurrent/ListenableFuture;
 HSPLandroidx/media3/session/MediaSessionImpl;->setMediaSessionListener(Landroidx/media3/session/MediaSession$Listener;)V
 HSPLandroidx/media3/session/MediaSessionImpl;->setPlayerInternal(Landroidx/media3/session/PlayerWrapper;Landroidx/media3/session/PlayerWrapper;)V
-HSPLandroidx/media3/session/MediaSessionLegacyStub$$ExternalSyntheticLambda3;-><init>(Landroidx/media3/session/MediaSessionLegacyStub;Landroidx/media3/session/PlayerWrapper;)V
-HSPLandroidx/media3/session/MediaSessionLegacyStub$$ExternalSyntheticLambda3;->run()V
+HSPLandroidx/media3/session/MediaSessionLegacyStub$$ExternalSyntheticLambda0;-><init>(Landroidx/media3/session/MediaSessionLegacyStub;Landroidx/media3/session/PlayerWrapper;)V
+HSPLandroidx/media3/session/MediaSessionLegacyStub$$ExternalSyntheticLambda0;->run()V
 HSPLandroidx/media3/session/MediaSessionLegacyStub$Api31$$ExternalSyntheticApiModelOutline0;->m(Landroid/media/session/MediaSession;Landroid/content/ComponentName;)V
 HSPLandroidx/media3/session/MediaSessionLegacyStub$Api31;->setMediaButtonBroadcastReceiver(Landroid/support/v4/media/session/MediaSessionCompat;Landroid/content/ComponentName;)V
 HSPLandroidx/media3/session/MediaSessionLegacyStub$ConnectionTimeoutHandler;-><init>(Landroid/os/Looper;Landroidx/media3/session/ConnectedControllersManager;)V
@@ -4185,7 +4435,7 @@ HSPLandroidx/media3/session/MediaSessionLegacyStub$ControllerLegacyCbForBroadcas
 HSPLandroidx/media3/session/MediaSessionLegacyStub$ControllerLegacyCbForBroadcast;->onTimelineChanged(ILandroidx/media3/common/Timeline;I)V
 HSPLandroidx/media3/session/MediaSessionLegacyStub$ControllerLegacyCbForBroadcast;->updateMetadataIfChanged()V
 HSPLandroidx/media3/session/MediaSessionLegacyStub$ControllerLegacyCbForBroadcast;->updateQueue(Landroidx/media3/common/Timeline;)V
-HSPLandroidx/media3/session/MediaSessionLegacyStub;->$r8$lambda$2Zr6irjo-J9zgmVW6WSJ8242FKI(Landroidx/media3/session/MediaSessionLegacyStub;Landroidx/media3/session/PlayerWrapper;)V
+HSPLandroidx/media3/session/MediaSessionLegacyStub;->$r8$lambda$i_hiXgnlh3yefF3weSKAVCwfWdA(Landroidx/media3/session/MediaSessionLegacyStub;Landroidx/media3/session/PlayerWrapper;)V
 HSPLandroidx/media3/session/MediaSessionLegacyStub;-><clinit>()V
 HSPLandroidx/media3/session/MediaSessionLegacyStub;-><init>(Landroidx/media3/session/MediaSessionImpl;Landroid/net/Uri;Landroid/os/Handler;)V
 HSPLandroidx/media3/session/MediaSessionLegacyStub;->access$100(Landroidx/media3/session/MediaSessionLegacyStub;)Landroidx/media3/session/MediaSessionImpl;
@@ -4203,17 +4453,17 @@ HSPLandroidx/media3/session/MediaSessionLegacyStub;->queryPackageManagerForMedia
 HSPLandroidx/media3/session/MediaSessionLegacyStub;->setQueue(Landroid/support/v4/media/session/MediaSessionCompat;Ljava/util/List;)V
 HSPLandroidx/media3/session/MediaSessionLegacyStub;->start()V
 HSPLandroidx/media3/session/MediaSessionLegacyStub;->updateLegacySessionPlaybackState(Landroidx/media3/session/PlayerWrapper;)V
-HSPLandroidx/media3/session/MediaSessionService$$ExternalSyntheticLambda0;-><init>(Landroidx/media3/session/MediaSessionService;Landroidx/media3/session/MediaNotificationManager;Landroidx/media3/session/MediaSession;)V
-HSPLandroidx/media3/session/MediaSessionService$$ExternalSyntheticLambda0;->run()V
+HSPLandroidx/media3/session/MediaSessionService$$ExternalSyntheticLambda3;-><init>(Landroidx/media3/session/MediaSessionService;Landroidx/media3/session/MediaNotificationManager;Landroidx/media3/session/MediaSession;)V
+HSPLandroidx/media3/session/MediaSessionService$$ExternalSyntheticLambda3;->run()V
 HSPLandroidx/media3/session/MediaSessionService$MediaSessionListener;-><init>(Landroidx/media3/session/MediaSessionService;)V
 HSPLandroidx/media3/session/MediaSessionService$MediaSessionListener;-><init>(Landroidx/media3/session/MediaSessionService;Landroidx/media3/session/MediaSessionService$1;)V
 HSPLandroidx/media3/session/MediaSessionService$MediaSessionServiceStub$$ExternalSyntheticLambda0;-><init>(Landroidx/media3/session/MediaSessionService$MediaSessionServiceStub;Landroidx/media3/session/IMediaController;Landroidx/media/MediaSessionManager$RemoteUserInfo;Landroidx/media3/session/ConnectionRequest;Z)V
 HSPLandroidx/media3/session/MediaSessionService$MediaSessionServiceStub$$ExternalSyntheticLambda0;->run()V
-HSPLandroidx/media3/session/MediaSessionService$MediaSessionServiceStub;->$r8$lambda$MguNtDaJ33H3oNxSukWPqQObUfY(Landroidx/media3/session/MediaSessionService$MediaSessionServiceStub;Landroidx/media3/session/IMediaController;Landroidx/media/MediaSessionManager$RemoteUserInfo;Landroidx/media3/session/ConnectionRequest;Z)V
+HSPLandroidx/media3/session/MediaSessionService$MediaSessionServiceStub;->$r8$lambda$WimxQSmf3WLVYVBjoloYH8aR1Jc(Landroidx/media3/session/MediaSessionService$MediaSessionServiceStub;Landroidx/media3/session/IMediaController;Landroidx/media/MediaSessionManager$RemoteUserInfo;Landroidx/media3/session/ConnectionRequest;Z)V
 HSPLandroidx/media3/session/MediaSessionService$MediaSessionServiceStub;-><init>(Landroidx/media3/session/MediaSessionService;)V
 HSPLandroidx/media3/session/MediaSessionService$MediaSessionServiceStub;->connect(Landroidx/media3/session/IMediaController;Landroid/os/Bundle;)V
 HSPLandroidx/media3/session/MediaSessionService$MediaSessionServiceStub;->lambda$connect$0(Landroidx/media3/session/IMediaController;Landroidx/media/MediaSessionManager$RemoteUserInfo;Landroidx/media3/session/ConnectionRequest;Z)V
-HSPLandroidx/media3/session/MediaSessionService;->$r8$lambda$a2XpJPVIWvV21YOEzzqJkEpwBQI(Landroidx/media3/session/MediaSessionService;Landroidx/media3/session/MediaNotificationManager;Landroidx/media3/session/MediaSession;)V
+HSPLandroidx/media3/session/MediaSessionService;->$r8$lambda$1zkjmmeEDwKYxmaGNRXaCadqAOg(Landroidx/media3/session/MediaSessionService;Landroidx/media3/session/MediaNotificationManager;Landroidx/media3/session/MediaSession;)V
 HSPLandroidx/media3/session/MediaSessionService;-><init>()V
 HSPLandroidx/media3/session/MediaSessionService;->addSession(Landroidx/media3/session/MediaSession;)V
 HSPLandroidx/media3/session/MediaSessionService;->getActionFactory()Landroidx/media3/session/DefaultActionFactory;
@@ -4229,30 +4479,30 @@ HSPLandroidx/media3/session/MediaSessionService;->onUpdateNotification(Landroidx
 HSPLandroidx/media3/session/MediaSessionService;->onUpdateNotificationInternal(Landroidx/media3/session/MediaSession;Z)Z
 HSPLandroidx/media3/session/MediaSessionService;->setListener(Landroidx/media3/session/MediaSessionService$Listener;)V
 HSPLandroidx/media3/session/MediaSessionService;->setMediaNotificationProvider(Landroidx/media3/session/MediaNotification$Provider;)V
-HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda24;-><init>(Landroidx/media3/session/SessionCommand;Landroid/os/Bundle;)V
-HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda24;->run(Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/MediaSession$ControllerInfo;I)Ljava/lang/Object;
-HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda56;-><init>(Landroidx/media3/session/MediaSessionStub;Landroidx/media3/session/MediaSession$ControllerInfo;Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/IMediaController;)V
-HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda56;->run()V
-HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda70;-><init>(Landroidx/media3/session/MediaSessionStub$SessionTask;)V
-HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda70;->run(Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/MediaSession$ControllerInfo;I)Ljava/lang/Object;
-HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda73;-><init>(Landroidx/media3/session/MediaSessionStub;Landroidx/media3/session/MediaSession$ControllerInfo;Landroidx/media3/session/SessionCommand;IILandroidx/media3/session/MediaSessionStub$SessionTask;Landroidx/media3/session/MediaSessionImpl;)V
-HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda73;->run()V
-HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda77;-><init>(Landroidx/media3/session/MediaSession$ControllerInfo;I)V
-HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda77;->accept(Ljava/lang/Object;)V
-HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda82;-><init>(Landroidx/media3/session/MediaSessionImpl;Lcom/google/common/util/concurrent/SettableFuture;Landroidx/media3/common/util/Consumer;Lcom/google/common/util/concurrent/ListenableFuture;)V
-HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda82;->run()V
+HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda28;-><init>(Landroidx/media3/session/SessionCommand;Landroid/os/Bundle;)V
+HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda28;->run(Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/MediaSession$ControllerInfo;I)Ljava/lang/Object;
+HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda3;-><init>(Landroidx/media3/session/MediaSessionStub;Landroidx/media3/session/MediaSession$ControllerInfo;Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/IMediaController;)V
+HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda3;->run()V
+HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda68;-><init>(Landroidx/media3/session/MediaSessionStub;Landroidx/media3/session/MediaSession$ControllerInfo;Landroidx/media3/session/SessionCommand;IILandroidx/media3/session/MediaSessionStub$SessionTask;Landroidx/media3/session/MediaSessionImpl;)V
+HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda68;->run()V
+HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda73;-><init>(Landroidx/media3/session/MediaSessionStub$SessionTask;)V
+HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda73;->run(Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/MediaSession$ControllerInfo;I)Ljava/lang/Object;
+HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda80;-><init>(Landroidx/media3/session/MediaSession$ControllerInfo;I)V
+HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda80;->accept(Ljava/lang/Object;)V
+HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda81;-><init>(Landroidx/media3/session/MediaSessionImpl;Lcom/google/common/util/concurrent/SettableFuture;Landroidx/media3/common/util/Consumer;Lcom/google/common/util/concurrent/ListenableFuture;)V
+HSPLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda81;->run()V
 HSPLandroidx/media3/session/MediaSessionStub$Controller2Cb;-><init>(Landroidx/media3/session/IMediaController;)V
 HSPLandroidx/media3/session/MediaSessionStub$Controller2Cb;->getCallbackBinder()Landroid/os/IBinder;
 HSPLandroidx/media3/session/MediaSessionStub$Controller2Cb;->hashCode()I
 HSPLandroidx/media3/session/MediaSessionStub$Controller2Cb;->onPlayerInfoChanged(ILandroidx/media3/session/PlayerInfo;Landroidx/media3/common/Player$Commands;ZZI)V
 HSPLandroidx/media3/session/MediaSessionStub$Controller2Cb;->onSessionResult(ILandroidx/media3/session/SessionResult;)V
 HSPLandroidx/media3/session/MediaSessionStub$Controller2Cb;->setCustomLayout(ILjava/util/List;)V
-HSPLandroidx/media3/session/MediaSessionStub;->$r8$lambda$5u7ZOZu1E3qtXLejtiVCfQspblM(Landroidx/media3/session/MediaSessionStub;Landroidx/media3/session/MediaSession$ControllerInfo;Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/IMediaController;)V
-HSPLandroidx/media3/session/MediaSessionStub;->$r8$lambda$KndwrP4QTMahDsglk9eR6NWxXtA(Landroidx/media3/session/SessionCommand;Landroid/os/Bundle;Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/MediaSession$ControllerInfo;I)Lcom/google/common/util/concurrent/ListenableFuture;
-HSPLandroidx/media3/session/MediaSessionStub;->$r8$lambda$RagmTrsP9kOCYea3J9OJn28bc5c(Landroidx/media3/session/MediaSession$ControllerInfo;ILcom/google/common/util/concurrent/ListenableFuture;)V
-HSPLandroidx/media3/session/MediaSessionStub;->$r8$lambda$Uz2_vcr_OU9Iuz1uNRDrsZj31fE(Landroidx/media3/session/MediaSessionStub$SessionTask;Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/MediaSession$ControllerInfo;I)Lcom/google/common/util/concurrent/ListenableFuture;
-HSPLandroidx/media3/session/MediaSessionStub;->$r8$lambda$VrGmk0e1imzW80ACT-qbuXd3aCA(Landroidx/media3/session/MediaSessionImpl;Lcom/google/common/util/concurrent/SettableFuture;Landroidx/media3/common/util/Consumer;Lcom/google/common/util/concurrent/ListenableFuture;)V
-HSPLandroidx/media3/session/MediaSessionStub;->$r8$lambda$r3ns0uu-mjbAk0TkMAI7ay4cBrI(Landroidx/media3/session/MediaSessionStub;Landroidx/media3/session/MediaSession$ControllerInfo;Landroidx/media3/session/SessionCommand;IILandroidx/media3/session/MediaSessionStub$SessionTask;Landroidx/media3/session/MediaSessionImpl;)V
+HSPLandroidx/media3/session/MediaSessionStub;->$r8$lambda$4tHpaoO9OfNhbG3zdzmneZxAO2w(Landroidx/media3/session/MediaSessionStub;Landroidx/media3/session/MediaSession$ControllerInfo;Landroidx/media3/session/SessionCommand;IILandroidx/media3/session/MediaSessionStub$SessionTask;Landroidx/media3/session/MediaSessionImpl;)V
+HSPLandroidx/media3/session/MediaSessionStub;->$r8$lambda$eBYEb4hdvmb8_NvJdQcYW_NbeUQ(Landroidx/media3/session/MediaSessionStub;Landroidx/media3/session/MediaSession$ControllerInfo;Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/IMediaController;)V
+HSPLandroidx/media3/session/MediaSessionStub;->$r8$lambda$iwymEOWW-bdQV3aSZ9K5q7sOpwU(Landroidx/media3/session/MediaSession$ControllerInfo;ILcom/google/common/util/concurrent/ListenableFuture;)V
+HSPLandroidx/media3/session/MediaSessionStub;->$r8$lambda$mdjzG08KjiIcUiSGhLWXonK_2F0(Landroidx/media3/session/MediaSessionStub$SessionTask;Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/MediaSession$ControllerInfo;I)Lcom/google/common/util/concurrent/ListenableFuture;
+HSPLandroidx/media3/session/MediaSessionStub;->$r8$lambda$vZhZQF2vW4WdI1dX10QEfSas5VE(Landroidx/media3/session/SessionCommand;Landroid/os/Bundle;Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/MediaSession$ControllerInfo;I)Lcom/google/common/util/concurrent/ListenableFuture;
+HSPLandroidx/media3/session/MediaSessionStub;->$r8$lambda$zNvv3J7cSmshUkEZlCtyHBdu4zw(Landroidx/media3/session/MediaSessionImpl;Lcom/google/common/util/concurrent/SettableFuture;Landroidx/media3/common/util/Consumer;Lcom/google/common/util/concurrent/ListenableFuture;)V
 HSPLandroidx/media3/session/MediaSessionStub;-><init>(Landroidx/media3/session/MediaSessionImpl;)V
 HSPLandroidx/media3/session/MediaSessionStub;->connect(Landroidx/media3/session/IMediaController;ILandroid/os/Bundle;)V
 HSPLandroidx/media3/session/MediaSessionStub;->connect(Landroidx/media3/session/IMediaController;Landroidx/media3/session/MediaSession$ControllerInfo;)V
@@ -4289,7 +4539,7 @@ HSPLandroidx/media3/session/PlayerInfo$Builder;->setTimelineChangeReason(I)Landr
 HSPLandroidx/media3/session/PlayerInfo$Builder;->setVolume(F)Landroidx/media3/session/PlayerInfo$Builder;
 HSPLandroidx/media3/session/PlayerInfo$BundlingExclusions$$ExternalSyntheticLambda0;-><init>()V
 HSPLandroidx/media3/session/PlayerInfo$BundlingExclusions$$ExternalSyntheticLambda0;->fromBundle(Landroid/os/Bundle;)Landroidx/media3/common/Bundleable;
-HSPLandroidx/media3/session/PlayerInfo$BundlingExclusions;->$r8$lambda$-IF8BPS2-UR_KVmEsmOA_l72_k0(Landroid/os/Bundle;)Landroidx/media3/session/PlayerInfo$BundlingExclusions;
+HSPLandroidx/media3/session/PlayerInfo$BundlingExclusions;->$r8$lambda$deSNBnmY7Us7QZ-RD0ZCzELkNcQ(Landroid/os/Bundle;)Landroidx/media3/session/PlayerInfo$BundlingExclusions;
 HSPLandroidx/media3/session/PlayerInfo$BundlingExclusions;-><clinit>()V
 HSPLandroidx/media3/session/PlayerInfo$BundlingExclusions;-><init>(ZZ)V
 HSPLandroidx/media3/session/PlayerInfo$BundlingExclusions;->lambda$static$0(Landroid/os/Bundle;)Landroidx/media3/session/PlayerInfo$BundlingExclusions;
@@ -4297,7 +4547,7 @@ HSPLandroidx/media3/session/PlayerInfo$BundlingExclusions;->toBundle()Landroid/o
 HSPLandroidx/media3/session/PlayerInfo$InProcessBinder;-><init>(Landroidx/media3/session/PlayerInfo;)V
 HSPLandroidx/media3/session/PlayerInfo$InProcessBinder;-><init>(Landroidx/media3/session/PlayerInfo;Landroidx/media3/session/PlayerInfo$1;)V
 HSPLandroidx/media3/session/PlayerInfo$InProcessBinder;->getPlayerInfo()Landroidx/media3/session/PlayerInfo;
-HSPLandroidx/media3/session/PlayerInfo;->$r8$lambda$UYUSO7JOpKqYSM-ZlCuW_lSgFks(Landroid/os/Bundle;)Landroidx/media3/session/PlayerInfo;
+HSPLandroidx/media3/session/PlayerInfo;->$r8$lambda$XQYznITuykmhT3UniUhTff82tR8(Landroid/os/Bundle;)Landroidx/media3/session/PlayerInfo;
 HSPLandroidx/media3/session/PlayerInfo;-><clinit>()V
 HSPLandroidx/media3/session/PlayerInfo;-><init>(Landroidx/media3/common/PlaybackException;ILandroidx/media3/session/SessionPositionInfo;Landroidx/media3/common/Player$PositionInfo;Landroidx/media3/common/Player$PositionInfo;ILandroidx/media3/common/PlaybackParameters;IZLandroidx/media3/common/VideoSize;Landroidx/media3/common/Timeline;ILandroidx/media3/common/MediaMetadata;FLandroidx/media3/common/AudioAttributes;Landroidx/media3/common/text/CueGroup;Landroidx/media3/common/DeviceInfo;IZZIIIZZLandroidx/media3/common/MediaMetadata;JJJLandroidx/media3/common/Tracks;Landroidx/media3/common/TrackSelectionParameters;)V
 HSPLandroidx/media3/session/PlayerInfo;->copyWithCurrentTracks(Landroidx/media3/common/Tracks;)Landroidx/media3/session/PlayerInfo;
@@ -4379,7 +4629,7 @@ HSPLandroidx/media3/session/SequencedFutureManager;->obtainNextSequenceNumber()I
 HSPLandroidx/media3/session/SequencedFutureManager;->setFutureResult(ILjava/lang/Object;)V
 HSPLandroidx/media3/session/SessionCommand$$ExternalSyntheticLambda0;-><init>()V
 HSPLandroidx/media3/session/SessionCommand$$ExternalSyntheticLambda0;->fromBundle(Landroid/os/Bundle;)Landroidx/media3/common/Bundleable;
-HSPLandroidx/media3/session/SessionCommand;->$r8$lambda$-vVtmRPGIu-NOoGvOcmGBqPpE2A(Landroid/os/Bundle;)Landroidx/media3/session/SessionCommand;
+HSPLandroidx/media3/session/SessionCommand;->$r8$lambda$iLWFDWfiJcsixSMXlD00jh7LvY4(Landroid/os/Bundle;)Landroidx/media3/session/SessionCommand;
 HSPLandroidx/media3/session/SessionCommand;-><clinit>()V
 HSPLandroidx/media3/session/SessionCommand;-><init>(I)V
 HSPLandroidx/media3/session/SessionCommand;-><init>(Ljava/lang/String;Landroid/os/Bundle;)V
@@ -4404,7 +4654,7 @@ HSPLandroidx/media3/session/SessionPositionInfo;-><init>(Landroidx/media3/common
 HSPLandroidx/media3/session/SessionPositionInfo;->filterByAvailableCommands(ZZ)Landroidx/media3/session/SessionPositionInfo;
 HSPLandroidx/media3/session/SessionResult$$ExternalSyntheticLambda0;-><init>()V
 HSPLandroidx/media3/session/SessionResult$$ExternalSyntheticLambda0;->fromBundle(Landroid/os/Bundle;)Landroidx/media3/common/Bundleable;
-HSPLandroidx/media3/session/SessionResult;->$r8$lambda$x2DqL-v4-Wv0EFW4SM0qwLgSBU4(Landroid/os/Bundle;)Landroidx/media3/session/SessionResult;
+HSPLandroidx/media3/session/SessionResult;->$r8$lambda$dWeGiNdjQC6ZAKWHVpCMdOwlIJE(Landroid/os/Bundle;)Landroidx/media3/session/SessionResult;
 HSPLandroidx/media3/session/SessionResult;-><clinit>()V
 HSPLandroidx/media3/session/SessionResult;-><init>(I)V
 HSPLandroidx/media3/session/SessionResult;-><init>(ILandroid/os/Bundle;)V
@@ -4515,7 +4765,7 @@ HSPLandroidx/navigation/NavController$navigate$5;-><init>(Lkotlin/jvm/internal/R
 HSPLandroidx/navigation/NavController$navigate$5;->invoke(Landroidx/navigation/NavBackStackEntry;)V
 HSPLandroidx/navigation/NavController$navigate$5;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLandroidx/navigation/NavController$onBackPressedCallback$1;-><init>(Landroidx/navigation/NavController;)V
-HSPLandroidx/navigation/NavController;->$r8$lambda$bZL_fnLbLD5ZZthGK_6aY8AQ2pA(Landroidx/navigation/NavController;Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+HSPLandroidx/navigation/NavController;->$r8$lambda$K8jodmBuizwBSvVXOV95ACRvTsE(Landroidx/navigation/NavController;Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
 HSPLandroidx/navigation/NavController;-><clinit>()V
 HSPLandroidx/navigation/NavController;-><init>(Landroid/content/Context;)V
 HSPLandroidx/navigation/NavController;->access$getAddToBackStackHandler$p(Landroidx/navigation/NavController;)Lkotlin/jvm/functions/Function1;
@@ -4612,6 +4862,7 @@ HSPLandroidx/navigation/NavGraphNavigator;->navigate(Ljava/util/List;Landroidx/n
 HSPLandroidx/navigation/NavHostController;-><init>(Landroid/content/Context;)V
 HSPLandroidx/navigation/NavHostController;->setLifecycleOwner(Landroidx/lifecycle/LifecycleOwner;)V
 HSPLandroidx/navigation/NavHostController;->setViewModelStore(Landroidx/lifecycle/ViewModelStore;)V
+HSPLandroidx/navigation/NavInflater$$ExternalSyntheticDesugaredLibraryBridge0;->m(Landroidx/navigation/NavType$Companion;Ljava/lang/String;Ljava/lang/String;)Landroidx/navigation/NavType;
 HSPLandroidx/navigation/NavInflater$Companion;-><init>()V
 HSPLandroidx/navigation/NavInflater$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLandroidx/navigation/NavInflater;-><clinit>()V
@@ -4708,7 +4959,7 @@ HSPLandroidx/navigation/fragment/DialogFragmentNavigator$Destination;->hashCode(
 HSPLandroidx/navigation/fragment/DialogFragmentNavigator$Destination;->onInflate(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLandroidx/navigation/fragment/DialogFragmentNavigator$Destination;->setClassName(Ljava/lang/String;)Landroidx/navigation/fragment/DialogFragmentNavigator$Destination;
 HSPLandroidx/navigation/fragment/DialogFragmentNavigator$observer$1;-><init>(Landroidx/navigation/fragment/DialogFragmentNavigator;)V
-HSPLandroidx/navigation/fragment/DialogFragmentNavigator;->$r8$lambda$OuKZrEwFknYNYkG7DbIDx8rmInw(Landroidx/navigation/fragment/DialogFragmentNavigator;Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/Fragment;)V
+HSPLandroidx/navigation/fragment/DialogFragmentNavigator;->$r8$lambda$1vd2O2lW-4Qf_QuVN4zuT1SkMys(Landroidx/navigation/fragment/DialogFragmentNavigator;Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/Fragment;)V
 HSPLandroidx/navigation/fragment/DialogFragmentNavigator;-><clinit>()V
 HSPLandroidx/navigation/fragment/DialogFragmentNavigator;-><init>(Landroid/content/Context;Landroidx/fragment/app/FragmentManager;)V
 HSPLandroidx/navigation/fragment/DialogFragmentNavigator;->createDestination()Landroidx/navigation/NavDestination;
@@ -4739,7 +4990,7 @@ HSPLandroidx/navigation/fragment/FragmentNavigator$attachObservers$1;->invoke(La
 HSPLandroidx/navigation/fragment/FragmentNavigator$attachObservers$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLandroidx/navigation/fragment/FragmentNavigator$fragmentViewObserver$1$$ExternalSyntheticLambda0;-><init>(Landroidx/navigation/fragment/FragmentNavigator;Landroidx/navigation/NavBackStackEntry;)V
 HSPLandroidx/navigation/fragment/FragmentNavigator$fragmentViewObserver$1$$ExternalSyntheticLambda0;->onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
-HSPLandroidx/navigation/fragment/FragmentNavigator$fragmentViewObserver$1;->$r8$lambda$Jzx85N2GSIKHQhRmW3MdQS7gc1c(Landroidx/navigation/fragment/FragmentNavigator;Landroidx/navigation/NavBackStackEntry;Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+HSPLandroidx/navigation/fragment/FragmentNavigator$fragmentViewObserver$1;->$r8$lambda$ea33lpuYLOWf3u8ozyObG3HuCYA(Landroidx/navigation/fragment/FragmentNavigator;Landroidx/navigation/NavBackStackEntry;Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
 HSPLandroidx/navigation/fragment/FragmentNavigator$fragmentViewObserver$1;-><init>(Landroidx/navigation/fragment/FragmentNavigator;)V
 HSPLandroidx/navigation/fragment/FragmentNavigator$fragmentViewObserver$1;->invoke$lambda$0(Landroidx/navigation/fragment/FragmentNavigator;Landroidx/navigation/NavBackStackEntry;Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
 HSPLandroidx/navigation/fragment/FragmentNavigator$fragmentViewObserver$1;->invoke(Landroidx/navigation/NavBackStackEntry;)Landroidx/lifecycle/LifecycleEventObserver;
@@ -4747,8 +4998,8 @@ HSPLandroidx/navigation/fragment/FragmentNavigator$fragmentViewObserver$1;->invo
 HSPLandroidx/navigation/fragment/FragmentNavigator$onAttach$2;-><init>(Landroidx/navigation/NavigatorState;Landroidx/navigation/fragment/FragmentNavigator;)V
 HSPLandroidx/navigation/fragment/FragmentNavigator$sam$androidx_lifecycle_Observer$0;-><init>(Lkotlin/jvm/functions/Function1;)V
 HSPLandroidx/navigation/fragment/FragmentNavigator$sam$androidx_lifecycle_Observer$0;->onChanged(Ljava/lang/Object;)V
-HSPLandroidx/navigation/fragment/FragmentNavigator;->$r8$lambda$57AG1ONdZyfSFri9zMhNMaEoS04(Landroidx/navigation/NavigatorState;Landroidx/navigation/fragment/FragmentNavigator;Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/Fragment;)V
-HSPLandroidx/navigation/fragment/FragmentNavigator;->$r8$lambda$UGHviOGo1Bg3DZy7AltD2gCe0Ns(Landroidx/navigation/fragment/FragmentNavigator;Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+HSPLandroidx/navigation/fragment/FragmentNavigator;->$r8$lambda$DmVlTMOZNaR8QuSKDv8iPyCDdqQ(Landroidx/navigation/NavigatorState;Landroidx/navigation/fragment/FragmentNavigator;Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/Fragment;)V
+HSPLandroidx/navigation/fragment/FragmentNavigator;->$r8$lambda$Y8Uh0Ae62vKj6CTqgv50YqB1zjk(Landroidx/navigation/fragment/FragmentNavigator;Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
 HSPLandroidx/navigation/fragment/FragmentNavigator;-><clinit>()V
 HSPLandroidx/navigation/fragment/FragmentNavigator;-><init>(Landroid/content/Context;Landroidx/fragment/app/FragmentManager;I)V
 HSPLandroidx/navigation/fragment/FragmentNavigator;->access$getFragmentViewObserver$p(Landroidx/navigation/fragment/FragmentNavigator;)Lkotlin/jvm/functions/Function1;
@@ -4793,12 +5044,12 @@ HSPLandroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLamb
 HSPLandroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLambda1;-><init>(Landroid/content/Context;)V
 HSPLandroidx/profileinstaller/ProfileInstallerInitializer$Choreographer16Impl$$ExternalSyntheticLambda0;-><init>(Ljava/lang/Runnable;)V
 HSPLandroidx/profileinstaller/ProfileInstallerInitializer$Choreographer16Impl$$ExternalSyntheticLambda0;->doFrame(J)V
-HSPLandroidx/profileinstaller/ProfileInstallerInitializer$Choreographer16Impl;->$r8$lambda$DSwPKNQiVu4DdgIKQZrSpqkWM-A(Ljava/lang/Runnable;J)V
+HSPLandroidx/profileinstaller/ProfileInstallerInitializer$Choreographer16Impl;->$r8$lambda$tNoFoacLpIq9EDLF7sdX19s0Qbs(Ljava/lang/Runnable;J)V
 HSPLandroidx/profileinstaller/ProfileInstallerInitializer$Choreographer16Impl;->lambda$postFrameCallback$0(Ljava/lang/Runnable;J)V
 HSPLandroidx/profileinstaller/ProfileInstallerInitializer$Choreographer16Impl;->postFrameCallback(Ljava/lang/Runnable;)V
 HSPLandroidx/profileinstaller/ProfileInstallerInitializer$Handler28Impl;->createAsync(Landroid/os/Looper;)Landroid/os/Handler;
 HSPLandroidx/profileinstaller/ProfileInstallerInitializer$Result;-><init>()V
-HSPLandroidx/profileinstaller/ProfileInstallerInitializer;->$r8$lambda$QGpANLTF0YGY0pXfe2eje4OKwkc(Landroidx/profileinstaller/ProfileInstallerInitializer;Landroid/content/Context;)V
+HSPLandroidx/profileinstaller/ProfileInstallerInitializer;->$r8$lambda$I6kpUA-yYyp_PFlECpfBFtMqjag(Landroidx/profileinstaller/ProfileInstallerInitializer;Landroid/content/Context;)V
 HSPLandroidx/profileinstaller/ProfileInstallerInitializer;-><init>()V
 HSPLandroidx/profileinstaller/ProfileInstallerInitializer;->create(Landroid/content/Context;)Landroidx/profileinstaller/ProfileInstallerInitializer$Result;
 HSPLandroidx/profileinstaller/ProfileInstallerInitializer;->create(Landroid/content/Context;)Ljava/lang/Object;
@@ -4881,14 +5132,9 @@ HSPLandroidx/recyclerview/widget/ConcatAdapter;-><init>(Landroidx/recyclerview/w
 HSPLandroidx/recyclerview/widget/ConcatAdapter;-><init>(Landroidx/recyclerview/widget/ConcatAdapter$Config;[Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 HSPLandroidx/recyclerview/widget/ConcatAdapter;-><init>([Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 HSPLandroidx/recyclerview/widget/ConcatAdapter;->addAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)Z
-HSPLandroidx/recyclerview/widget/ConcatAdapter;->findRelativeAdapterPositionIn(Landroidx/recyclerview/widget/RecyclerView$Adapter;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)I
 HSPLandroidx/recyclerview/widget/ConcatAdapter;->getAdapters()Ljava/util/List;
 HSPLandroidx/recyclerview/widget/ConcatAdapter;->getItemCount()I
-HSPLandroidx/recyclerview/widget/ConcatAdapter;->getItemViewType(I)I
 HSPLandroidx/recyclerview/widget/ConcatAdapter;->onAttachedToRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
-HSPLandroidx/recyclerview/widget/ConcatAdapter;->onBindViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
-HSPLandroidx/recyclerview/widget/ConcatAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
-HSPLandroidx/recyclerview/widget/ConcatAdapter;->onViewAttachedToWindow(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 HSPLandroidx/recyclerview/widget/ConcatAdapterController$WrapperAndLocalPosition;-><init>()V
 HSPLandroidx/recyclerview/widget/ConcatAdapterController;-><init>(Landroidx/recyclerview/widget/ConcatAdapter;Landroidx/recyclerview/widget/ConcatAdapter$Config;)V
 HSPLandroidx/recyclerview/widget/ConcatAdapterController;->addAdapter(ILandroidx/recyclerview/widget/RecyclerView$Adapter;)Z
@@ -4896,29 +5142,19 @@ HSPLandroidx/recyclerview/widget/ConcatAdapterController;->addAdapter(Landroidx/
 HSPLandroidx/recyclerview/widget/ConcatAdapterController;->calculateAndUpdateStateRestorationPolicy()V
 HSPLandroidx/recyclerview/widget/ConcatAdapterController;->computeStateRestorationPolicy()Landroidx/recyclerview/widget/RecyclerView$Adapter$StateRestorationPolicy;
 HSPLandroidx/recyclerview/widget/ConcatAdapterController;->countItemsBefore(Landroidx/recyclerview/widget/NestedAdapterWrapper;)I
-HSPLandroidx/recyclerview/widget/ConcatAdapterController;->findWrapperAndLocalPosition(I)Landroidx/recyclerview/widget/ConcatAdapterController$WrapperAndLocalPosition;
 HSPLandroidx/recyclerview/widget/ConcatAdapterController;->findWrapperFor(Landroidx/recyclerview/widget/RecyclerView$Adapter;)Landroidx/recyclerview/widget/NestedAdapterWrapper;
 HSPLandroidx/recyclerview/widget/ConcatAdapterController;->getCopyOfAdapters()Ljava/util/List;
-HSPLandroidx/recyclerview/widget/ConcatAdapterController;->getItemViewType(I)I
-HSPLandroidx/recyclerview/widget/ConcatAdapterController;->getLocalAdapterPosition(Landroidx/recyclerview/widget/RecyclerView$Adapter;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)I
 HSPLandroidx/recyclerview/widget/ConcatAdapterController;->getTotalCount()I
-HSPLandroidx/recyclerview/widget/ConcatAdapterController;->getWrapper(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Landroidx/recyclerview/widget/NestedAdapterWrapper;
 HSPLandroidx/recyclerview/widget/ConcatAdapterController;->hasStableIds()Z
 HSPLandroidx/recyclerview/widget/ConcatAdapterController;->indexOfWrapper(Landroidx/recyclerview/widget/RecyclerView$Adapter;)I
 HSPLandroidx/recyclerview/widget/ConcatAdapterController;->isAttachedTo(Landroidx/recyclerview/widget/RecyclerView;)Z
 HSPLandroidx/recyclerview/widget/ConcatAdapterController;->onAttachedToRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
-HSPLandroidx/recyclerview/widget/ConcatAdapterController;->onBindViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
-HSPLandroidx/recyclerview/widget/ConcatAdapterController;->onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 HSPLandroidx/recyclerview/widget/ConcatAdapterController;->onItemRangeChanged(Landroidx/recyclerview/widget/NestedAdapterWrapper;IILjava/lang/Object;)V
-HSPLandroidx/recyclerview/widget/ConcatAdapterController;->onItemRangeInserted(Landroidx/recyclerview/widget/NestedAdapterWrapper;II)V
-HSPLandroidx/recyclerview/widget/ConcatAdapterController;->onViewAttachedToWindow(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
-HSPLandroidx/recyclerview/widget/ConcatAdapterController;->releaseWrapperAndLocalPosition(Landroidx/recyclerview/widget/ConcatAdapterController$WrapperAndLocalPosition;)V
 HSPLandroidx/recyclerview/widget/ConversationLayoutManager$Companion;-><init>()V
 HSPLandroidx/recyclerview/widget/ConversationLayoutManager$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLandroidx/recyclerview/widget/ConversationLayoutManager;-><clinit>()V
 HSPLandroidx/recyclerview/widget/ConversationLayoutManager;-><init>(Landroid/content/Context;)V
 HSPLandroidx/recyclerview/widget/ConversationLayoutManager;->onLayoutCompleted(Landroidx/recyclerview/widget/RecyclerView$State;)V
-HSPLandroidx/recyclerview/widget/ConversationLayoutManager;->scrollToPositionWithOffset(IILkotlin/jvm/functions/Function0;)V
 HSPLandroidx/recyclerview/widget/ConversationLayoutManager;->supportsPredictiveItemAnimations()Z
 HSPLandroidx/recyclerview/widget/DefaultItemAnimator$3;-><init>(Landroidx/recyclerview/widget/DefaultItemAnimator;Ljava/util/ArrayList;)V
 HSPLandroidx/recyclerview/widget/DefaultItemAnimator$3;->run()V
@@ -4960,7 +5196,6 @@ HSPLandroidx/recyclerview/widget/GapWorker$LayoutPrefetchRegistryImpl;->clearPre
 HSPLandroidx/recyclerview/widget/GapWorker;-><clinit>()V
 HSPLandroidx/recyclerview/widget/GapWorker;-><init>()V
 HSPLandroidx/recyclerview/widget/GapWorker;->add(Landroidx/recyclerview/widget/RecyclerView;)V
-HSPLandroidx/recyclerview/widget/GapWorker;->remove(Landroidx/recyclerview/widget/RecyclerView;)V
 HSPLandroidx/recyclerview/widget/ItemTouchHelper$1;-><init>(Landroidx/recyclerview/widget/ItemTouchHelper;)V
 HSPLandroidx/recyclerview/widget/ItemTouchHelper$2;-><init>(Landroidx/recyclerview/widget/ItemTouchHelper;)V
 HSPLandroidx/recyclerview/widget/ItemTouchHelper$2;->onInterceptTouchEvent(Landroidx/recyclerview/widget/RecyclerView;Landroid/view/MotionEvent;)Z
@@ -5000,6 +5235,9 @@ HSPLandroidx/recyclerview/widget/LinearLayoutManager;->assertNotInLayoutOrScroll
 HSPLandroidx/recyclerview/widget/LinearLayoutManager;->calculateExtraLayoutSpace(Landroidx/recyclerview/widget/RecyclerView$State;[I)V
 HSPLandroidx/recyclerview/widget/LinearLayoutManager;->canScrollHorizontally()Z
 HSPLandroidx/recyclerview/widget/LinearLayoutManager;->canScrollVertically()Z
+HSPLandroidx/recyclerview/widget/LinearLayoutManager;->computeHorizontalScrollExtent(Landroidx/recyclerview/widget/RecyclerView$State;)I
+HSPLandroidx/recyclerview/widget/LinearLayoutManager;->computeHorizontalScrollOffset(Landroidx/recyclerview/widget/RecyclerView$State;)I
+HSPLandroidx/recyclerview/widget/LinearLayoutManager;->computeHorizontalScrollRange(Landroidx/recyclerview/widget/RecyclerView$State;)I
 HSPLandroidx/recyclerview/widget/LinearLayoutManager;->computeScrollExtent(Landroidx/recyclerview/widget/RecyclerView$State;)I
 HSPLandroidx/recyclerview/widget/LinearLayoutManager;->computeScrollOffset(Landroidx/recyclerview/widget/RecyclerView$State;)I
 HSPLandroidx/recyclerview/widget/LinearLayoutManager;->computeScrollRange(Landroidx/recyclerview/widget/RecyclerView$State;)I
@@ -5025,13 +5263,11 @@ HSPLandroidx/recyclerview/widget/LinearLayoutManager;->isLayoutRTL()Z
 HSPLandroidx/recyclerview/widget/LinearLayoutManager;->layoutChunk(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/LinearLayoutManager$LayoutState;Landroidx/recyclerview/widget/LinearLayoutManager$LayoutChunkResult;)V
 HSPLandroidx/recyclerview/widget/LinearLayoutManager;->layoutForPredictiveAnimations(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;II)V
 HSPLandroidx/recyclerview/widget/LinearLayoutManager;->onAnchorReady(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/LinearLayoutManager$AnchorInfo;I)V
-HSPLandroidx/recyclerview/widget/LinearLayoutManager;->onDetachedFromWindow(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$Recycler;)V
 HSPLandroidx/recyclerview/widget/LinearLayoutManager;->onInitializeAccessibilityEvent(Landroid/view/accessibility/AccessibilityEvent;)V
 HSPLandroidx/recyclerview/widget/LinearLayoutManager;->onLayoutChildren(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)V
 HSPLandroidx/recyclerview/widget/LinearLayoutManager;->onLayoutCompleted(Landroidx/recyclerview/widget/RecyclerView$State;)V
 HSPLandroidx/recyclerview/widget/LinearLayoutManager;->resolveIsInfinite()Z
 HSPLandroidx/recyclerview/widget/LinearLayoutManager;->resolveShouldLayoutReverse()V
-HSPLandroidx/recyclerview/widget/LinearLayoutManager;->scrollToPositionWithOffset(II)V
 HSPLandroidx/recyclerview/widget/LinearLayoutManager;->setOrientation(I)V
 HSPLandroidx/recyclerview/widget/LinearLayoutManager;->setReverseLayout(Z)V
 HSPLandroidx/recyclerview/widget/LinearLayoutManager;->setStackFromEnd(Z)V
@@ -5047,23 +5283,22 @@ HSPLandroidx/recyclerview/widget/LinearLayoutManager;->updateLayoutStateToFillSt
 HSPLandroidx/recyclerview/widget/ListAdapter$1;-><init>(Landroidx/recyclerview/widget/ListAdapter;)V
 HSPLandroidx/recyclerview/widget/ListAdapter$1;->onCurrentListChanged(Ljava/util/List;Ljava/util/List;)V
 HSPLandroidx/recyclerview/widget/ListAdapter;-><init>(Landroidx/recyclerview/widget/DiffUtil$ItemCallback;)V
-HSPLandroidx/recyclerview/widget/ListAdapter;->getCurrentList()Ljava/util/List;
 HSPLandroidx/recyclerview/widget/ListAdapter;->getItem(I)Ljava/lang/Object;
 HSPLandroidx/recyclerview/widget/ListAdapter;->getItemCount()I
 HSPLandroidx/recyclerview/widget/ListAdapter;->onCurrentListChanged(Ljava/util/List;Ljava/util/List;)V
 HSPLandroidx/recyclerview/widget/ListAdapter;->submitList(Ljava/util/List;Ljava/lang/Runnable;)V
 HSPLandroidx/recyclerview/widget/NestedAdapterWrapper$1;-><init>(Landroidx/recyclerview/widget/NestedAdapterWrapper;)V
 HSPLandroidx/recyclerview/widget/NestedAdapterWrapper$1;->onItemRangeChanged(IILjava/lang/Object;)V
-HSPLandroidx/recyclerview/widget/NestedAdapterWrapper$1;->onItemRangeInserted(II)V
 HSPLandroidx/recyclerview/widget/NestedAdapterWrapper;-><init>(Landroidx/recyclerview/widget/RecyclerView$Adapter;Landroidx/recyclerview/widget/NestedAdapterWrapper$Callback;Landroidx/recyclerview/widget/ViewTypeStorage;Landroidx/recyclerview/widget/StableIdStorage$StableIdLookup;)V
 HSPLandroidx/recyclerview/widget/NestedAdapterWrapper;->getCachedItemCount()I
-HSPLandroidx/recyclerview/widget/NestedAdapterWrapper;->getItemViewType(I)I
-HSPLandroidx/recyclerview/widget/NestedAdapterWrapper;->onBindViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
-HSPLandroidx/recyclerview/widget/NestedAdapterWrapper;->onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 HSPLandroidx/recyclerview/widget/OpReorderer;-><init>(Landroidx/recyclerview/widget/OpReorderer$Callback;)V
 HSPLandroidx/recyclerview/widget/OpReorderer;->getLastMoveOutOfOrder(Ljava/util/List;)I
 HSPLandroidx/recyclerview/widget/OpReorderer;->reorderOps(Ljava/util/List;)V
 HSPLandroidx/recyclerview/widget/OrientationHelper$1;-><init>(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
+HSPLandroidx/recyclerview/widget/OrientationHelper$1;->getDecoratedEnd(Landroid/view/View;)I
+HSPLandroidx/recyclerview/widget/OrientationHelper$1;->getDecoratedMeasurement(Landroid/view/View;)I
+HSPLandroidx/recyclerview/widget/OrientationHelper$1;->getDecoratedMeasurementInOther(Landroid/view/View;)I
+HSPLandroidx/recyclerview/widget/OrientationHelper$1;->getDecoratedStart(Landroid/view/View;)I
 HSPLandroidx/recyclerview/widget/OrientationHelper$1;->getEndAfterPadding()I
 HSPLandroidx/recyclerview/widget/OrientationHelper$1;->getEndPadding()I
 HSPLandroidx/recyclerview/widget/OrientationHelper$1;->getMode()I
@@ -5151,6 +5386,11 @@ HSPLandroidx/recyclerview/widget/RecyclerView$ItemDecoration;->onDraw(Landroid/g
 HSPLandroidx/recyclerview/widget/RecyclerView$ItemDecoration;->onDrawOver(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;)V
 HSPLandroidx/recyclerview/widget/RecyclerView$ItemDecoration;->onDrawOver(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$1;-><init>(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
+HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$1;->getChildAt(I)Landroid/view/View;
+HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$1;->getChildEnd(Landroid/view/View;)I
+HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$1;->getChildStart(Landroid/view/View;)I
+HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$1;->getParentEnd()I
+HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$1;->getParentStart()I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$2;-><init>(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)V
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$2;->getChildAt(I)Landroid/view/View;
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager$2;->getChildEnd(Landroid/view/View;)I
@@ -5169,9 +5409,7 @@ HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->detachAndScrapAtta
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->detachViewAt(I)V
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->detachViewInternal(ILandroid/view/View;)V
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->dispatchAttachedToWindow(Landroidx/recyclerview/widget/RecyclerView;)V
-HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->dispatchDetachedFromWindow(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$Recycler;)V
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->generateLayoutParams(Landroid/content/Context;Landroid/util/AttributeSet;)Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
-HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->generateLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getBaseline()I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getBottomDecorationHeight(Landroid/view/View;)I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getChildAt(I)Landroid/view/View;
@@ -5179,33 +5417,37 @@ HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getChildCount()I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getChildMeasureSpec(IIIIZ)I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getColumnCountForAccessibility(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getDecoratedBottom(Landroid/view/View;)I
+HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getDecoratedBoundsWithMargins(Landroid/view/View;Landroid/graphics/Rect;)V
+HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getDecoratedLeft(Landroid/view/View;)I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getDecoratedMeasuredHeight(Landroid/view/View;)I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getDecoratedMeasuredWidth(Landroid/view/View;)I
+HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getDecoratedRight(Landroid/view/View;)I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getDecoratedTop(Landroid/view/View;)I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getFocusedChild()Landroid/view/View;
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getHeight()I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getHeightMode()I
-HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getItemCount()I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getLayoutDirection()I
+HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getLeftDecorationWidth(Landroid/view/View;)I
+HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getMinimumHeight()I
+HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getMinimumWidth()I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPaddingBottom()I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPaddingLeft()I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPaddingRight()I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPaddingTop()I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPosition(Landroid/view/View;)I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getProperties(Landroid/content/Context;Landroid/util/AttributeSet;II)Landroidx/recyclerview/widget/RecyclerView$LayoutManager$Properties;
+HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getRightDecorationWidth(Landroid/view/View;)I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getRowCountForAccessibility(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getSelectionModeForAccessibility(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getTopDecorationHeight(Landroid/view/View;)I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getWidth()I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getWidthMode()I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->isLayoutHierarchical(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;)Z
+HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->isMeasurementUpToDate(III)Z
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->layoutDecoratedWithMargins(Landroid/view/View;IIII)V
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->measureChildWithMargins(Landroid/view/View;II)V
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onAdapterChanged(Landroidx/recyclerview/widget/RecyclerView$Adapter;Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
-HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onAddFocusables(Landroidx/recyclerview/widget/RecyclerView;Ljava/util/ArrayList;II)Z
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onAttachedToWindow(Landroidx/recyclerview/widget/RecyclerView;)V
-HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onDetachedFromWindow(Landroidx/recyclerview/widget/RecyclerView;)V
-HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onDetachedFromWindow(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$Recycler;)V
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onInitializeAccessibilityEvent(Landroid/view/accessibility/AccessibilityEvent;)V
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onInitializeAccessibilityEvent(Landroidx/recyclerview/widget/RecyclerView$Recycler;Landroidx/recyclerview/widget/RecyclerView$State;Landroid/view/accessibility/AccessibilityEvent;)V
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onInitializeAccessibilityNodeInfo(Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
@@ -5221,17 +5463,17 @@ HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->requestLayout()V
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->scrapOrRecycleView(Landroidx/recyclerview/widget/RecyclerView$Recycler;ILandroid/view/View;)V
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->setExactMeasureSpecsFrom(Landroidx/recyclerview/widget/RecyclerView;)V
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->setMeasureSpecs(II)V
+HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->setMeasuredDimension(II)V
+HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->setMeasuredDimension(Landroid/graphics/Rect;II)V
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->setMeasuredDimensionFromChildren(II)V
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->setRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->shouldMeasureChild(Landroid/view/View;IILandroidx/recyclerview/widget/RecyclerView$LayoutParams;)Z
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->stopSmoothScroller()V
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutParams;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-HSPLandroidx/recyclerview/widget/RecyclerView$LayoutParams;-><init>(Landroid/view/ViewGroup$MarginLayoutParams;)V
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutParams;->getViewLayoutPosition()I
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutParams;->isItemChanged()Z
 HSPLandroidx/recyclerview/widget/RecyclerView$LayoutParams;->isItemRemoved()Z
 HSPLandroidx/recyclerview/widget/RecyclerView$OnScrollListener;-><init>()V
-HSPLandroidx/recyclerview/widget/RecyclerView$OnScrollListener;->onScrolled(Landroidx/recyclerview/widget/RecyclerView;II)V
 HSPLandroidx/recyclerview/widget/RecyclerView$RecycledViewPool$ScrapData;-><init>()V
 HSPLandroidx/recyclerview/widget/RecyclerView$RecycledViewPool;-><init>()V
 HSPLandroidx/recyclerview/widget/RecyclerView$RecycledViewPool;->attach()V
@@ -5253,6 +5495,7 @@ HSPLandroidx/recyclerview/widget/RecyclerView$Recycler;->clearScrap()V
 HSPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getRecycledViewPool()Landroidx/recyclerview/widget/RecyclerView$RecycledViewPool;
 HSPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getScrapCount()I
 HSPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getScrapList()Ljava/util/List;
+HSPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getScrapOrCachedViewForId(JIZ)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 HSPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getScrapOrHiddenOrCachedHolderForPosition(IZ)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 HSPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getViewForPosition(I)Landroid/view/View;
 HSPLandroidx/recyclerview/widget/RecyclerView$Recycler;->getViewForPosition(IZ)Landroid/view/View;
@@ -5262,8 +5505,6 @@ HSPLandroidx/recyclerview/widget/RecyclerView$Recycler;->maybeSendPoolingContain
 HSPLandroidx/recyclerview/widget/RecyclerView$Recycler;->offsetPositionRecordsForInsert(II)V
 HSPLandroidx/recyclerview/widget/RecyclerView$Recycler;->onAdapterChanged(Landroidx/recyclerview/widget/RecyclerView$Adapter;Landroidx/recyclerview/widget/RecyclerView$Adapter;Z)V
 HSPLandroidx/recyclerview/widget/RecyclerView$Recycler;->onAttachedToWindow()V
-HSPLandroidx/recyclerview/widget/RecyclerView$Recycler;->onDetachedFromWindow()V
-HSPLandroidx/recyclerview/widget/RecyclerView$Recycler;->poolingContainerDetach(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 HSPLandroidx/recyclerview/widget/RecyclerView$Recycler;->poolingContainerDetach(Landroidx/recyclerview/widget/RecyclerView$Adapter;Z)V
 HSPLandroidx/recyclerview/widget/RecyclerView$Recycler;->recycleAndClearCachedViews()V
 HSPLandroidx/recyclerview/widget/RecyclerView$Recycler;->scrapView(Landroid/view/View;)V
@@ -5292,9 +5533,9 @@ HSPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->clearOldPosition()V
 HSPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->clearPayload()V
 HSPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->clearReturnedFromScrapFlag()V
 HSPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->clearTmpDetachFlag()V
-HSPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->getAbsoluteAdapterPosition()I
 HSPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->getAdapterPosition()I
 HSPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->getBindingAdapterPosition()I
+HSPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->getItemId()J
 HSPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->getItemViewType()I
 HSPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->getLayoutPosition()I
 HSPLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->getUnmodifiedPayloads()Ljava/util/List;
@@ -5318,7 +5559,7 @@ HSPLandroidx/recyclerview/widget/RecyclerView;-><init>(Landroid/content/Context;
 HSPLandroidx/recyclerview/widget/RecyclerView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 HSPLandroidx/recyclerview/widget/RecyclerView;->access$000(Landroidx/recyclerview/widget/RecyclerView;Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;)V
 HSPLandroidx/recyclerview/widget/RecyclerView;->access$100(Landroidx/recyclerview/widget/RecyclerView;I)V
-HSPLandroidx/recyclerview/widget/RecyclerView;->addFocusables(Ljava/util/ArrayList;II)V
+HSPLandroidx/recyclerview/widget/RecyclerView;->access$500(Landroidx/recyclerview/widget/RecyclerView;II)V
 HSPLandroidx/recyclerview/widget/RecyclerView;->addItemDecoration(Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;)V
 HSPLandroidx/recyclerview/widget/RecyclerView;->addItemDecoration(Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;I)V
 HSPLandroidx/recyclerview/widget/RecyclerView;->addOnChildAttachStateChangeListener(Landroidx/recyclerview/widget/RecyclerView$OnChildAttachStateChangeListener;)V
@@ -5352,14 +5593,13 @@ HSPLandroidx/recyclerview/widget/RecyclerView;->findInterceptingOnItemTouchListe
 HSPLandroidx/recyclerview/widget/RecyclerView;->findMinMaxChildLayoutPositions([I)V
 HSPLandroidx/recyclerview/widget/RecyclerView;->findNestedRecyclerView(Landroid/view/View;)Landroidx/recyclerview/widget/RecyclerView;
 HSPLandroidx/recyclerview/widget/RecyclerView;->generateLayoutParams(Landroid/util/AttributeSet;)Landroid/view/ViewGroup$LayoutParams;
-HSPLandroidx/recyclerview/widget/RecyclerView;->generateLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Landroid/view/ViewGroup$LayoutParams;
 HSPLandroidx/recyclerview/widget/RecyclerView;->getAccessibilityClassName()Ljava/lang/CharSequence;
 HSPLandroidx/recyclerview/widget/RecyclerView;->getAdapter()Landroidx/recyclerview/widget/RecyclerView$Adapter;
 HSPLandroidx/recyclerview/widget/RecyclerView;->getAdapterPositionInRecyclerView(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)I
 HSPLandroidx/recyclerview/widget/RecyclerView;->getBaseline()I
 HSPLandroidx/recyclerview/widget/RecyclerView;->getChangedHolderKey(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)J
-HSPLandroidx/recyclerview/widget/RecyclerView;->getChildViewHolder(Landroid/view/View;)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 HSPLandroidx/recyclerview/widget/RecyclerView;->getChildViewHolderInt(Landroid/view/View;)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+HSPLandroidx/recyclerview/widget/RecyclerView;->getDecoratedBoundsWithMarginsInt(Landroid/view/View;Landroid/graphics/Rect;)V
 HSPLandroidx/recyclerview/widget/RecyclerView;->getFullClassName(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/String;
 HSPLandroidx/recyclerview/widget/RecyclerView;->getItemAnimator()Landroidx/recyclerview/widget/RecyclerView$ItemAnimator;
 HSPLandroidx/recyclerview/widget/RecyclerView;->getItemDecorInsetsForChild(Landroid/view/View;)Landroid/graphics/Rect;
@@ -5382,7 +5622,6 @@ HSPLandroidx/recyclerview/widget/RecyclerView;->markKnownViewsInvalid()V
 HSPLandroidx/recyclerview/widget/RecyclerView;->offsetPositionRecordsForInsert(II)V
 HSPLandroidx/recyclerview/widget/RecyclerView;->onAttachedToWindow()V
 HSPLandroidx/recyclerview/widget/RecyclerView;->onChildAttachedToWindow(Landroid/view/View;)V
-HSPLandroidx/recyclerview/widget/RecyclerView;->onDetachedFromWindow()V
 HSPLandroidx/recyclerview/widget/RecyclerView;->onDraw(Landroid/graphics/Canvas;)V
 HSPLandroidx/recyclerview/widget/RecyclerView;->onEnterLayoutOrScroll()V
 HSPLandroidx/recyclerview/widget/RecyclerView;->onExitLayoutOrScroll()V
@@ -5420,7 +5659,6 @@ HSPLandroidx/recyclerview/widget/RecyclerView;->startInterceptRequestLayout()V
 HSPLandroidx/recyclerview/widget/RecyclerView;->startNestedScroll(II)Z
 HSPLandroidx/recyclerview/widget/RecyclerView;->stopGlowAnimations(Landroid/view/MotionEvent;)Z
 HSPLandroidx/recyclerview/widget/RecyclerView;->stopInterceptRequestLayout(Z)V
-HSPLandroidx/recyclerview/widget/RecyclerView;->stopNestedScroll()V
 HSPLandroidx/recyclerview/widget/RecyclerView;->stopNestedScroll(I)V
 HSPLandroidx/recyclerview/widget/RecyclerView;->stopScroll()V
 HSPLandroidx/recyclerview/widget/RecyclerView;->stopScrollersInternal()V
@@ -5462,24 +5700,18 @@ HSPLandroidx/recyclerview/widget/ViewBoundsCheck;-><init>(Landroidx/recyclerview
 HSPLandroidx/recyclerview/widget/ViewBoundsCheck;->findOneViewWithinBoundFlags(IIII)Landroid/view/View;
 HSPLandroidx/recyclerview/widget/ViewInfoStore$InfoRecord;-><clinit>()V
 HSPLandroidx/recyclerview/widget/ViewInfoStore$InfoRecord;-><init>()V
-HSPLandroidx/recyclerview/widget/ViewInfoStore$InfoRecord;->drainCache()V
 HSPLandroidx/recyclerview/widget/ViewInfoStore$InfoRecord;->obtain()Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;
 HSPLandroidx/recyclerview/widget/ViewInfoStore$InfoRecord;->recycle(Landroidx/recyclerview/widget/ViewInfoStore$InfoRecord;)V
 HSPLandroidx/recyclerview/widget/ViewInfoStore;-><init>()V
 HSPLandroidx/recyclerview/widget/ViewInfoStore;->addToPostLayout(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)V
 HSPLandroidx/recyclerview/widget/ViewInfoStore;->clear()V
 HSPLandroidx/recyclerview/widget/ViewInfoStore;->getFromOldChangeHolders(J)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
-HSPLandroidx/recyclerview/widget/ViewInfoStore;->onDetach()V
 HSPLandroidx/recyclerview/widget/ViewInfoStore;->onViewDetached(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 HSPLandroidx/recyclerview/widget/ViewInfoStore;->process(Landroidx/recyclerview/widget/ViewInfoStore$ProcessCallback;)V
 HSPLandroidx/recyclerview/widget/ViewInfoStore;->removeFromDisappearedInLayout(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 HSPLandroidx/recyclerview/widget/ViewTypeStorage$IsolatedViewTypeStorage$WrapperViewTypeLookup;-><init>(Landroidx/recyclerview/widget/ViewTypeStorage$IsolatedViewTypeStorage;Landroidx/recyclerview/widget/NestedAdapterWrapper;)V
-HSPLandroidx/recyclerview/widget/ViewTypeStorage$IsolatedViewTypeStorage$WrapperViewTypeLookup;->globalToLocal(I)I
-HSPLandroidx/recyclerview/widget/ViewTypeStorage$IsolatedViewTypeStorage$WrapperViewTypeLookup;->localToGlobal(I)I
 HSPLandroidx/recyclerview/widget/ViewTypeStorage$IsolatedViewTypeStorage;-><init>()V
 HSPLandroidx/recyclerview/widget/ViewTypeStorage$IsolatedViewTypeStorage;->createViewTypeWrapper(Landroidx/recyclerview/widget/NestedAdapterWrapper;)Landroidx/recyclerview/widget/ViewTypeStorage$ViewTypeLookup;
-HSPLandroidx/recyclerview/widget/ViewTypeStorage$IsolatedViewTypeStorage;->getWrapperForGlobalType(I)Landroidx/recyclerview/widget/NestedAdapterWrapper;
-HSPLandroidx/recyclerview/widget/ViewTypeStorage$IsolatedViewTypeStorage;->obtainViewType(Landroidx/recyclerview/widget/NestedAdapterWrapper;)I
 HSPLandroidx/savedstate/Recreator$Companion;-><init>()V
 HSPLandroidx/savedstate/Recreator$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLandroidx/savedstate/Recreator;-><clinit>()V
@@ -5489,7 +5721,7 @@ HSPLandroidx/savedstate/SavedStateRegistry$$ExternalSyntheticLambda0;-><init>(La
 HSPLandroidx/savedstate/SavedStateRegistry$$ExternalSyntheticLambda0;->onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
 HSPLandroidx/savedstate/SavedStateRegistry$Companion;-><init>()V
 HSPLandroidx/savedstate/SavedStateRegistry$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLandroidx/savedstate/SavedStateRegistry;->$r8$lambda$AUDDdpkzZrJMhBj0r-_9pI-j6hA(Landroidx/savedstate/SavedStateRegistry;Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+HSPLandroidx/savedstate/SavedStateRegistry;->$r8$lambda$eDF1FsaoUa1afQFv2y5LNvCkYm4(Landroidx/savedstate/SavedStateRegistry;Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
 HSPLandroidx/savedstate/SavedStateRegistry;-><clinit>()V
 HSPLandroidx/savedstate/SavedStateRegistry;-><init>()V
 HSPLandroidx/savedstate/SavedStateRegistry;->consumeRestoredStateForKey(Ljava/lang/String;)Landroid/os/Bundle;
@@ -5546,16 +5778,15 @@ HSPLandroidx/viewbinding/ViewBindings;->findChildViewById(Landroid/view/View;I)L
 HSPLcom/airbnb/lottie/L;-><clinit>()V
 HSPLcom/airbnb/lottie/L;->beginSection(Ljava/lang/String;)V
 HSPLcom/airbnb/lottie/L;->endSection(Ljava/lang/String;)F
-HSPLcom/airbnb/lottie/LottieAnimationView$$ExternalSyntheticLambda1;-><init>(Lcom/airbnb/lottie/LottieAnimationView;)V
-HSPLcom/airbnb/lottie/LottieAnimationView$$ExternalSyntheticLambda1;->onResult(Ljava/lang/Object;)V
-HSPLcom/airbnb/lottie/LottieAnimationView$$ExternalSyntheticLambda2;-><init>()V
+HSPLcom/airbnb/lottie/LottieAnimationView$$ExternalSyntheticLambda1;-><init>()V
+HSPLcom/airbnb/lottie/LottieAnimationView$$ExternalSyntheticLambda3;-><init>(Lcom/airbnb/lottie/LottieAnimationView;)V
+HSPLcom/airbnb/lottie/LottieAnimationView$$ExternalSyntheticLambda3;->onResult(Ljava/lang/Object;)V
 HSPLcom/airbnb/lottie/LottieAnimationView$1;-><init>(Lcom/airbnb/lottie/LottieAnimationView;)V
 HSPLcom/airbnb/lottie/LottieAnimationView$2;-><init>(Lcom/airbnb/lottie/LottieAnimationView;Lcom/airbnb/lottie/value/SimpleLottieValueCallback;)V
 HSPLcom/airbnb/lottie/LottieAnimationView$UserActionTaken;-><clinit>()V
 HSPLcom/airbnb/lottie/LottieAnimationView$UserActionTaken;-><init>(Ljava/lang/String;I)V
 HSPLcom/airbnb/lottie/LottieAnimationView;-><clinit>()V
 HSPLcom/airbnb/lottie/LottieAnimationView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-HSPLcom/airbnb/lottie/LottieAnimationView;->addValueCallback(Lcom/airbnb/lottie/model/KeyPath;Ljava/lang/Object;Lcom/airbnb/lottie/value/LottieValueCallback;)V
 HSPLcom/airbnb/lottie/LottieAnimationView;->addValueCallback(Lcom/airbnb/lottie/model/KeyPath;Ljava/lang/Object;Lcom/airbnb/lottie/value/SimpleLottieValueCallback;)V
 HSPLcom/airbnb/lottie/LottieAnimationView;->cancelLoaderTask()V
 HSPLcom/airbnb/lottie/LottieAnimationView;->clearComposition()V
@@ -5587,16 +5818,16 @@ HSPLcom/airbnb/lottie/LottieComposition;->hasDashPattern()Z
 HSPLcom/airbnb/lottie/LottieComposition;->incrementMatteOrMaskCount(I)V
 HSPLcom/airbnb/lottie/LottieComposition;->init(Landroid/graphics/Rect;FFFLjava/util/List;Landroidx/collection/LongSparseArray;Ljava/util/Map;Ljava/util/Map;Landroidx/collection/SparseArrayCompat;Ljava/util/Map;Ljava/util/List;)V
 HSPLcom/airbnb/lottie/LottieComposition;->setPerformanceTrackingEnabled(Z)V
-HSPLcom/airbnb/lottie/LottieCompositionFactory$$ExternalSyntheticLambda2;-><init>(Lcom/airbnb/lottie/LottieComposition;)V
-HSPLcom/airbnb/lottie/LottieCompositionFactory$$ExternalSyntheticLambda2;->call()Ljava/lang/Object;
-HSPLcom/airbnb/lottie/LottieCompositionFactory$$ExternalSyntheticLambda3;-><init>(Ljava/lang/String;Ljava/util/concurrent/atomic/AtomicBoolean;)V
-HSPLcom/airbnb/lottie/LottieCompositionFactory$$ExternalSyntheticLambda3;->onResult(Ljava/lang/Object;)V
+HSPLcom/airbnb/lottie/LottieCompositionFactory$$ExternalSyntheticLambda3;-><init>(Lcom/airbnb/lottie/LottieComposition;)V
+HSPLcom/airbnb/lottie/LottieCompositionFactory$$ExternalSyntheticLambda3;->call()Ljava/lang/Object;
 HSPLcom/airbnb/lottie/LottieCompositionFactory$$ExternalSyntheticLambda4;-><init>(Ljava/lang/String;Ljava/util/concurrent/atomic/AtomicBoolean;)V
+HSPLcom/airbnb/lottie/LottieCompositionFactory$$ExternalSyntheticLambda4;->onResult(Ljava/lang/Object;)V
+HSPLcom/airbnb/lottie/LottieCompositionFactory$$ExternalSyntheticLambda5;-><init>(Ljava/lang/String;Ljava/util/concurrent/atomic/AtomicBoolean;)V
 HSPLcom/airbnb/lottie/LottieCompositionFactory$$ExternalSyntheticLambda6;-><init>(Ljava/lang/ref/WeakReference;Landroid/content/Context;ILjava/lang/String;)V
 HSPLcom/airbnb/lottie/LottieCompositionFactory$$ExternalSyntheticLambda6;->call()Ljava/lang/Object;
-HSPLcom/airbnb/lottie/LottieCompositionFactory;->$r8$lambda$GHTR9zHPpgTQOzChVCFJdsYjeJc(Ljava/lang/ref/WeakReference;Landroid/content/Context;ILjava/lang/String;)Lcom/airbnb/lottie/LottieResult;
-HSPLcom/airbnb/lottie/LottieCompositionFactory;->$r8$lambda$QKw11Xf-il8Q45eZiXJcCWI4UL8(Ljava/lang/String;Ljava/util/concurrent/atomic/AtomicBoolean;Lcom/airbnb/lottie/LottieComposition;)V
-HSPLcom/airbnb/lottie/LottieCompositionFactory;->$r8$lambda$TQsQOaUIc6Is8SOnplNQRP2La48(Lcom/airbnb/lottie/LottieComposition;)Lcom/airbnb/lottie/LottieResult;
+HSPLcom/airbnb/lottie/LottieCompositionFactory;->$r8$lambda$0Xu9wIv_BT_qd1SXQ6iVXJUWOy4(Ljava/lang/ref/WeakReference;Landroid/content/Context;ILjava/lang/String;)Lcom/airbnb/lottie/LottieResult;
+HSPLcom/airbnb/lottie/LottieCompositionFactory;->$r8$lambda$nPsX-CZnaPe5YtH-ZUb0-PkSF70(Ljava/lang/String;Ljava/util/concurrent/atomic/AtomicBoolean;Lcom/airbnb/lottie/LottieComposition;)V
+HSPLcom/airbnb/lottie/LottieCompositionFactory;->$r8$lambda$pWO9j36zcs5SiBhXtzuyr2TUg78(Lcom/airbnb/lottie/LottieComposition;)Lcom/airbnb/lottie/LottieResult;
 HSPLcom/airbnb/lottie/LottieCompositionFactory;-><clinit>()V
 HSPLcom/airbnb/lottie/LottieCompositionFactory;->cache(Ljava/lang/String;Ljava/util/concurrent/Callable;)Lcom/airbnb/lottie/LottieTask;
 HSPLcom/airbnb/lottie/LottieCompositionFactory;->fromJsonInputStreamSync(Ljava/io/InputStream;Ljava/lang/String;)Lcom/airbnb/lottie/LottieResult;
@@ -5612,16 +5843,16 @@ HSPLcom/airbnb/lottie/LottieCompositionFactory;->lambda$cache$8(Lcom/airbnb/lott
 HSPLcom/airbnb/lottie/LottieCompositionFactory;->lambda$cache$9(Ljava/lang/String;Ljava/util/concurrent/atomic/AtomicBoolean;Lcom/airbnb/lottie/LottieComposition;)V
 HSPLcom/airbnb/lottie/LottieCompositionFactory;->lambda$fromRawRes$2(Ljava/lang/ref/WeakReference;Landroid/content/Context;ILjava/lang/String;)Lcom/airbnb/lottie/LottieResult;
 HSPLcom/airbnb/lottie/LottieCompositionFactory;->rawResCacheKey(Landroid/content/Context;I)Ljava/lang/String;
-HSPLcom/airbnb/lottie/LottieDrawable$$ExternalSyntheticLambda0;-><init>(Lcom/airbnb/lottie/LottieDrawable;F)V
-HSPLcom/airbnb/lottie/LottieDrawable$$ExternalSyntheticLambda0;->run(Lcom/airbnb/lottie/LottieComposition;)V
-HSPLcom/airbnb/lottie/LottieDrawable$$ExternalSyntheticLambda9;-><init>(Lcom/airbnb/lottie/LottieDrawable;Lcom/airbnb/lottie/model/KeyPath;Ljava/lang/Object;Lcom/airbnb/lottie/value/LottieValueCallback;)V
-HSPLcom/airbnb/lottie/LottieDrawable$$ExternalSyntheticLambda9;->run(Lcom/airbnb/lottie/LottieComposition;)V
+HSPLcom/airbnb/lottie/LottieDrawable$$ExternalSyntheticLambda13;-><init>(Lcom/airbnb/lottie/LottieDrawable;Lcom/airbnb/lottie/model/KeyPath;Ljava/lang/Object;Lcom/airbnb/lottie/value/LottieValueCallback;)V
+HSPLcom/airbnb/lottie/LottieDrawable$$ExternalSyntheticLambda13;->run(Lcom/airbnb/lottie/LottieComposition;)V
+HSPLcom/airbnb/lottie/LottieDrawable$$ExternalSyntheticLambda7;-><init>(Lcom/airbnb/lottie/LottieDrawable;F)V
+HSPLcom/airbnb/lottie/LottieDrawable$$ExternalSyntheticLambda7;->run(Lcom/airbnb/lottie/LottieComposition;)V
 HSPLcom/airbnb/lottie/LottieDrawable$1;-><init>(Lcom/airbnb/lottie/LottieDrawable;)V
 HSPLcom/airbnb/lottie/LottieDrawable$1;->onAnimationUpdate(Landroid/animation/ValueAnimator;)V
 HSPLcom/airbnb/lottie/LottieDrawable$OnVisibleAction;-><clinit>()V
 HSPLcom/airbnb/lottie/LottieDrawable$OnVisibleAction;-><init>(Ljava/lang/String;I)V
-HSPLcom/airbnb/lottie/LottieDrawable;->$r8$lambda$7HgNmvtAytyG5A3axzRshxgGqrI(Lcom/airbnb/lottie/LottieDrawable;FLcom/airbnb/lottie/LottieComposition;)V
-HSPLcom/airbnb/lottie/LottieDrawable;->$r8$lambda$riFJCWOqfI5iOFlatZRlwc9qv1U(Lcom/airbnb/lottie/LottieDrawable;Lcom/airbnb/lottie/model/KeyPath;Ljava/lang/Object;Lcom/airbnb/lottie/value/LottieValueCallback;Lcom/airbnb/lottie/LottieComposition;)V
+HSPLcom/airbnb/lottie/LottieDrawable;->$r8$lambda$KwJMyA-JwSc1wPIJgRAESIy0cUU(Lcom/airbnb/lottie/LottieDrawable;Lcom/airbnb/lottie/model/KeyPath;Ljava/lang/Object;Lcom/airbnb/lottie/value/LottieValueCallback;Lcom/airbnb/lottie/LottieComposition;)V
+HSPLcom/airbnb/lottie/LottieDrawable;->$r8$lambda$OJC0Zqmfc6AslVW0ET1hhLqrHN4(Lcom/airbnb/lottie/LottieDrawable;FLcom/airbnb/lottie/LottieComposition;)V
 HSPLcom/airbnb/lottie/LottieDrawable;-><init>()V
 HSPLcom/airbnb/lottie/LottieDrawable;->access$000(Lcom/airbnb/lottie/LottieDrawable;)Lcom/airbnb/lottie/model/layer/CompositionLayer;
 HSPLcom/airbnb/lottie/LottieDrawable;->access$100(Lcom/airbnb/lottie/LottieDrawable;)Lcom/airbnb/lottie/utils/LottieValueAnimator;
@@ -5657,7 +5888,7 @@ HSPLcom/airbnb/lottie/LottieTask$$ExternalSyntheticLambda0;-><init>(Lcom/airbnb/
 HSPLcom/airbnb/lottie/LottieTask$$ExternalSyntheticLambda0;->run()V
 HSPLcom/airbnb/lottie/LottieTask$LottieFutureTask;-><init>(Lcom/airbnb/lottie/LottieTask;Ljava/util/concurrent/Callable;)V
 HSPLcom/airbnb/lottie/LottieTask$LottieFutureTask;->done()V
-HSPLcom/airbnb/lottie/LottieTask;->$r8$lambda$Rpnx63cLRLCF9DbgjiFM7rp0Vik(Lcom/airbnb/lottie/LottieTask;)V
+HSPLcom/airbnb/lottie/LottieTask;->$r8$lambda$UC3_JTMsZz4BrYi2A85clsQgepU(Lcom/airbnb/lottie/LottieTask;)V
 HSPLcom/airbnb/lottie/LottieTask;-><clinit>()V
 HSPLcom/airbnb/lottie/LottieTask;-><init>(Ljava/util/concurrent/Callable;)V
 HSPLcom/airbnb/lottie/LottieTask;-><init>(Ljava/util/concurrent/Callable;Z)V
@@ -5756,7 +5987,6 @@ HSPLcom/airbnb/lottie/animation/keyframe/IntegerKeyframeAnimation;->getValue(Lco
 HSPLcom/airbnb/lottie/animation/keyframe/KeyframeAnimation;-><init>(Ljava/util/List;)V
 HSPLcom/airbnb/lottie/animation/keyframe/PathKeyframe;-><init>(Lcom/airbnb/lottie/LottieComposition;Lcom/airbnb/lottie/value/Keyframe;)V
 HSPLcom/airbnb/lottie/animation/keyframe/PathKeyframe;->createPath()V
-HSPLcom/airbnb/lottie/animation/keyframe/PathKeyframeAnimation;-><init>(Ljava/util/List;)V
 HSPLcom/airbnb/lottie/animation/keyframe/PointKeyframeAnimation;-><init>(Ljava/util/List;)V
 HSPLcom/airbnb/lottie/animation/keyframe/PointKeyframeAnimation;->getValue(Lcom/airbnb/lottie/value/Keyframe;F)Landroid/graphics/PointF;
 HSPLcom/airbnb/lottie/animation/keyframe/PointKeyframeAnimation;->getValue(Lcom/airbnb/lottie/value/Keyframe;F)Ljava/lang/Object;
@@ -5873,7 +6103,7 @@ HSPLcom/airbnb/lottie/model/content/ShapePath;->toContent(Lcom/airbnb/lottie/Lot
 HSPLcom/airbnb/lottie/model/layer/BaseLayer$$ExternalSyntheticLambda0;-><init>(Lcom/airbnb/lottie/model/layer/BaseLayer;)V
 HSPLcom/airbnb/lottie/model/layer/BaseLayer$$ExternalSyntheticLambda0;->onValueChanged()V
 HSPLcom/airbnb/lottie/model/layer/BaseLayer$1;-><clinit>()V
-HSPLcom/airbnb/lottie/model/layer/BaseLayer;->$r8$lambda$4LxogRHfsgkEfWkfLvNOorPl2m0(Lcom/airbnb/lottie/model/layer/BaseLayer;)V
+HSPLcom/airbnb/lottie/model/layer/BaseLayer;->$r8$lambda$Sex8aFGiTOtvDrIkDy-hn-ODWJE(Lcom/airbnb/lottie/model/layer/BaseLayer;)V
 HSPLcom/airbnb/lottie/model/layer/BaseLayer;-><init>(Lcom/airbnb/lottie/LottieDrawable;Lcom/airbnb/lottie/model/layer/Layer;)V
 HSPLcom/airbnb/lottie/model/layer/BaseLayer;->addAnimation(Lcom/airbnb/lottie/animation/keyframe/BaseKeyframeAnimation;)V
 HSPLcom/airbnb/lottie/model/layer/BaseLayer;->addValueCallback(Ljava/lang/Object;Lcom/airbnb/lottie/value/LottieValueCallback;)V
@@ -5890,7 +6120,6 @@ HSPLcom/airbnb/lottie/model/layer/BaseLayer;->invalidateSelf()V
 HSPLcom/airbnb/lottie/model/layer/BaseLayer;->lambda$setupInOutAnimations$0()V
 HSPLcom/airbnb/lottie/model/layer/BaseLayer;->onValueChanged()V
 HSPLcom/airbnb/lottie/model/layer/BaseLayer;->recordRenderTime(F)V
-HSPLcom/airbnb/lottie/model/layer/BaseLayer;->removeAnimation(Lcom/airbnb/lottie/animation/keyframe/BaseKeyframeAnimation;)V
 HSPLcom/airbnb/lottie/model/layer/BaseLayer;->resolveKeyPath(Lcom/airbnb/lottie/model/KeyPath;ILjava/util/List;Lcom/airbnb/lottie/model/KeyPath;)V
 HSPLcom/airbnb/lottie/model/layer/BaseLayer;->setMatteLayer(Lcom/airbnb/lottie/model/layer/BaseLayer;)V
 HSPLcom/airbnb/lottie/model/layer/BaseLayer;->setProgress(F)V
@@ -6042,12 +6271,12 @@ HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->nextBoolean()Z
 HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->nextDouble()D
 HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->nextInt()I
 HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->nextName()Ljava/lang/String;
-HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->nextNonWhitespace(Z)I
 HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->nextQuotedValue(Lokio/ByteString;)Ljava/lang/String;
 HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->nextString()Ljava/lang/String;
 HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->peek()Lcom/airbnb/lottie/parser/moshi/JsonReader$Token;
 HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->peekKeyword()I
 HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->peekNumber()I
+HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->selectName(Lcom/airbnb/lottie/parser/moshi/JsonReader$Options;)I
 HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->skipName()V
 HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->skipQuotedValue(Lokio/ByteString;)V
 HSPLcom/airbnb/lottie/parser/moshi/JsonUtf8Reader;->skipValue()V
@@ -6102,7 +6331,6 @@ HSPLcom/airbnb/lottie/value/Keyframe;->getStartValueInt()I
 HSPLcom/airbnb/lottie/value/Keyframe;->isStatic()Z
 HSPLcom/airbnb/lottie/value/LottieFrameInfo;-><init>()V
 HSPLcom/airbnb/lottie/value/LottieValueCallback;-><init>()V
-HSPLcom/airbnb/lottie/value/LottieValueCallback;-><init>(Ljava/lang/Object;)V
 HSPLcom/airbnb/lottie/value/LottieValueCallback;->setAnimation(Lcom/airbnb/lottie/animation/keyframe/BaseKeyframeAnimation;)V
 HSPLcom/airbnb/lottie/value/ScaleXY;-><init>()V
 HSPLcom/airbnb/lottie/value/ScaleXY;-><init>(FF)V
@@ -6164,9 +6392,7 @@ HSPLcom/annimon/stream/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Ob
 HSPLcom/annimon/stream/Optional;-><clinit>()V
 HSPLcom/annimon/stream/Optional;-><init>()V
 HSPLcom/annimon/stream/Optional;-><init>(Ljava/lang/Object;)V
-HSPLcom/annimon/stream/Optional;->empty()Lcom/annimon/stream/Optional;
 HSPLcom/annimon/stream/Optional;->of(Ljava/lang/Object;)Lcom/annimon/stream/Optional;
-HSPLcom/annimon/stream/Optional;->orElse(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLcom/annimon/stream/Optional;->orElseThrow(Lcom/annimon/stream/function/Supplier;)Ljava/lang/Object;
 HSPLcom/annimon/stream/Stream$2;-><init>(Lcom/annimon/stream/Stream;)V
 HSPLcom/annimon/stream/Stream$2;->apply(ILjava/lang/Object;)Lcom/annimon/stream/IntPair;
@@ -6178,7 +6404,6 @@ HSPLcom/annimon/stream/Stream;-><init>(Ljava/util/Iterator;)V
 HSPLcom/annimon/stream/Stream;->allMatch(Lcom/annimon/stream/function/Predicate;)Z
 HSPLcom/annimon/stream/Stream;->anyMatch(Lcom/annimon/stream/function/Predicate;)Z
 HSPLcom/annimon/stream/Stream;->collect(Lcom/annimon/stream/Collector;)Ljava/lang/Object;
-HSPLcom/annimon/stream/Stream;->empty()Lcom/annimon/stream/Stream;
 HSPLcom/annimon/stream/Stream;->filter(Lcom/annimon/stream/function/Predicate;)Lcom/annimon/stream/Stream;
 HSPLcom/annimon/stream/Stream;->filterNot(Lcom/annimon/stream/function/Predicate;)Lcom/annimon/stream/Stream;
 HSPLcom/annimon/stream/Stream;->findFirst()Lcom/annimon/stream/Optional;
@@ -6189,19 +6414,15 @@ HSPLcom/annimon/stream/Stream;->limit(J)Lcom/annimon/stream/Stream;
 HSPLcom/annimon/stream/Stream;->map(Lcom/annimon/stream/function/Function;)Lcom/annimon/stream/Stream;
 HSPLcom/annimon/stream/Stream;->mapIndexed(IILcom/annimon/stream/function/IndexedFunction;)Lcom/annimon/stream/Stream;
 HSPLcom/annimon/stream/Stream;->match(Lcom/annimon/stream/function/Predicate;I)Z
-HSPLcom/annimon/stream/Stream;->max(Ljava/util/Comparator;)Lcom/annimon/stream/Optional;
 HSPLcom/annimon/stream/Stream;->of(Ljava/lang/Iterable;)Lcom/annimon/stream/Stream;
 HSPLcom/annimon/stream/Stream;->of(Ljava/util/Map;)Lcom/annimon/stream/Stream;
 HSPLcom/annimon/stream/Stream;->of([Ljava/lang/Object;)Lcom/annimon/stream/Stream;
 HSPLcom/annimon/stream/Stream;->rangeClosed(II)Lcom/annimon/stream/Stream;
-HSPLcom/annimon/stream/Stream;->reduce(Lcom/annimon/stream/function/BiFunction;)Lcom/annimon/stream/Optional;
 HSPLcom/annimon/stream/Stream;->reduce(Ljava/lang/Object;Lcom/annimon/stream/function/BiFunction;)Ljava/lang/Object;
 HSPLcom/annimon/stream/Stream;->sorted()Lcom/annimon/stream/Stream;
 HSPLcom/annimon/stream/Stream;->sorted(Ljava/util/Comparator;)Lcom/annimon/stream/Stream;
 HSPLcom/annimon/stream/Stream;->toList()Ljava/util/List;
 HSPLcom/annimon/stream/Stream;->withoutNulls()Lcom/annimon/stream/Stream;
-HSPLcom/annimon/stream/function/BinaryOperator$Util$2;-><init>(Ljava/util/Comparator;)V
-HSPLcom/annimon/stream/function/BinaryOperator$Util;->maxBy(Ljava/util/Comparator;)Lcom/annimon/stream/function/BinaryOperator;
 HSPLcom/annimon/stream/function/Predicate$Util$4;-><init>(Lcom/annimon/stream/function/Predicate;)V
 HSPLcom/annimon/stream/function/Predicate$Util$4;->test(Ljava/lang/Object;)Z
 HSPLcom/annimon/stream/function/Predicate$Util$5;-><init>()V
@@ -6215,6 +6436,7 @@ HSPLcom/annimon/stream/iterator/IndexedIterator;->hasNext()Z
 HSPLcom/annimon/stream/iterator/IndexedIterator;->next()Ljava/lang/Object;
 HSPLcom/annimon/stream/iterator/LazyIterator;-><init>(Ljava/lang/Iterable;)V
 HSPLcom/annimon/stream/iterator/LazyIterator;->ensureIterator()V
+HSPLcom/annimon/stream/iterator/LazyIterator;->hasNext()Z
 HSPLcom/annimon/stream/iterator/LazyIterator;->next()Ljava/lang/Object;
 HSPLcom/annimon/stream/iterator/LsaExtIterator;-><init>()V
 HSPLcom/annimon/stream/iterator/LsaExtIterator;->hasNext()Z
@@ -6227,14 +6449,10 @@ HSPLcom/annimon/stream/iterator/PrimitiveIterator$OfInt;->next()Ljava/lang/Objec
 HSPLcom/annimon/stream/operator/IntArray;-><init>([I)V
 HSPLcom/annimon/stream/operator/IntArray;->hasNext()Z
 HSPLcom/annimon/stream/operator/IntArray;->nextInt()I
-HSPLcom/annimon/stream/operator/IntRangeClosed;-><init>(II)V
-HSPLcom/annimon/stream/operator/IntRangeClosed;->hasNext()Z
-HSPLcom/annimon/stream/operator/IntRangeClosed;->nextInt()I
 HSPLcom/annimon/stream/operator/ObjArray;-><init>([Ljava/lang/Object;)V
 HSPLcom/annimon/stream/operator/ObjArray;->hasNext()Z
 HSPLcom/annimon/stream/operator/ObjArray;->nextIteration()Ljava/lang/Object;
 HSPLcom/annimon/stream/operator/ObjFilter;-><init>(Ljava/util/Iterator;Lcom/annimon/stream/function/Predicate;)V
-HSPLcom/annimon/stream/operator/ObjFilter;->hasNext()Z
 HSPLcom/annimon/stream/operator/ObjFilter;->next()Ljava/lang/Object;
 HSPLcom/annimon/stream/operator/ObjFilter;->nextIteration()V
 HSPLcom/annimon/stream/operator/ObjLimit;-><init>(Ljava/util/Iterator;J)V
@@ -7198,6 +7416,7 @@ HSPLcom/fasterxml/jackson/core/Base64Variant;->getMaxLineLength()I
 HSPLcom/fasterxml/jackson/core/Base64Variant;->usesPadding()Z
 HSPLcom/fasterxml/jackson/core/Base64Variants;-><clinit>()V
 HSPLcom/fasterxml/jackson/core/Base64Variants;->getDefaultVariant()Lcom/fasterxml/jackson/core/Base64Variant;
+HSPLcom/fasterxml/jackson/core/JacksonException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 HSPLcom/fasterxml/jackson/core/JsonEncoding;-><clinit>()V
 HSPLcom/fasterxml/jackson/core/JsonEncoding;-><init>(Ljava/lang/String;ILjava/lang/String;ZI)V
 HSPLcom/fasterxml/jackson/core/JsonFactory$Feature;-><clinit>()V
@@ -7208,6 +7427,7 @@ HSPLcom/fasterxml/jackson/core/JsonFactory$Feature;->enabledIn(I)Z
 HSPLcom/fasterxml/jackson/core/JsonFactory$Feature;->getMask()I
 HSPLcom/fasterxml/jackson/core/JsonFactory$Feature;->values()[Lcom/fasterxml/jackson/core/JsonFactory$Feature;
 HSPLcom/fasterxml/jackson/core/JsonFactory;-><clinit>()V
+HSPLcom/fasterxml/jackson/core/JsonFactory;-><init>()V
 HSPLcom/fasterxml/jackson/core/JsonFactory;-><init>(Lcom/fasterxml/jackson/core/ObjectCodec;)V
 HSPLcom/fasterxml/jackson/core/JsonFactory;->_createContext(Ljava/lang/Object;Z)Lcom/fasterxml/jackson/core/io/IOContext;
 HSPLcom/fasterxml/jackson/core/JsonFactory;->_createGenerator(Ljava/io/Writer;Lcom/fasterxml/jackson/core/io/IOContext;)Lcom/fasterxml/jackson/core/JsonGenerator;
@@ -7226,7 +7446,9 @@ HSPLcom/fasterxml/jackson/core/JsonFactory;->createGenerator(Ljava/io/Writer;)Lc
 HSPLcom/fasterxml/jackson/core/JsonFactory;->createParser(Ljava/io/InputStream;)Lcom/fasterxml/jackson/core/JsonParser;
 HSPLcom/fasterxml/jackson/core/JsonFactory;->createParser(Ljava/io/Reader;)Lcom/fasterxml/jackson/core/JsonParser;
 HSPLcom/fasterxml/jackson/core/JsonFactory;->createParser(Ljava/lang/String;)Lcom/fasterxml/jackson/core/JsonParser;
+HSPLcom/fasterxml/jackson/core/JsonFactory;->getCodec()Lcom/fasterxml/jackson/core/ObjectCodec;
 HSPLcom/fasterxml/jackson/core/JsonFactory;->requiresPropertyOrdering()Z
+HSPLcom/fasterxml/jackson/core/JsonFactory;->setCodec(Lcom/fasterxml/jackson/core/ObjectCodec;)Lcom/fasterxml/jackson/core/JsonFactory;
 HSPLcom/fasterxml/jackson/core/JsonGenerator$Feature;-><clinit>()V
 HSPLcom/fasterxml/jackson/core/JsonGenerator$Feature;-><init>(Ljava/lang/String;IZ)V
 HSPLcom/fasterxml/jackson/core/JsonGenerator$Feature;->collectDefaults()I
@@ -7239,6 +7461,8 @@ HSPLcom/fasterxml/jackson/core/JsonGenerator;-><init>()V
 HSPLcom/fasterxml/jackson/core/JsonGenerator;->canWriteBinaryNatively()Z
 HSPLcom/fasterxml/jackson/core/JsonLocation;-><clinit>()V
 HSPLcom/fasterxml/jackson/core/JsonLocation;-><init>(Ljava/lang/Object;JJII)V
+HSPLcom/fasterxml/jackson/core/JsonParseException;-><init>(Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;)V
+HSPLcom/fasterxml/jackson/core/JsonParseException;->withRequestPayload(Lcom/fasterxml/jackson/core/util/RequestPayload;)Lcom/fasterxml/jackson/core/JsonParseException;
 HSPLcom/fasterxml/jackson/core/JsonParser$Feature;-><clinit>()V
 HSPLcom/fasterxml/jackson/core/JsonParser$Feature;-><init>(Ljava/lang/String;IZ)V
 HSPLcom/fasterxml/jackson/core/JsonParser$Feature;->collectDefaults()I
@@ -7250,8 +7474,11 @@ HSPLcom/fasterxml/jackson/core/JsonParser$NumberType;-><clinit>()V
 HSPLcom/fasterxml/jackson/core/JsonParser$NumberType;-><init>(Ljava/lang/String;I)V
 HSPLcom/fasterxml/jackson/core/JsonParser;-><clinit>()V
 HSPLcom/fasterxml/jackson/core/JsonParser;-><init>(I)V
+HSPLcom/fasterxml/jackson/core/JsonParser;->_constructError(Ljava/lang/String;)Lcom/fasterxml/jackson/core/JsonParseException;
 HSPLcom/fasterxml/jackson/core/JsonParser;->currentName()Ljava/lang/String;
 HSPLcom/fasterxml/jackson/core/JsonParser;->isEnabled(Lcom/fasterxml/jackson/core/JsonParser$Feature;)Z
+HSPLcom/fasterxml/jackson/core/JsonProcessingException;-><init>(Ljava/lang/String;Lcom/fasterxml/jackson/core/JsonLocation;)V
+HSPLcom/fasterxml/jackson/core/JsonProcessingException;-><init>(Ljava/lang/String;Lcom/fasterxml/jackson/core/JsonLocation;Ljava/lang/Throwable;)V
 HSPLcom/fasterxml/jackson/core/JsonStreamContext;-><init>()V
 HSPLcom/fasterxml/jackson/core/JsonStreamContext;-><init>(II)V
 HSPLcom/fasterxml/jackson/core/JsonStreamContext;->inArray()Z
@@ -7286,6 +7513,7 @@ HSPLcom/fasterxml/jackson/core/base/GeneratorBase;->getOutputContext()Lcom/faste
 HSPLcom/fasterxml/jackson/core/base/GeneratorBase;->isEnabled(Lcom/fasterxml/jackson/core/JsonGenerator$Feature;)Z
 HSPLcom/fasterxml/jackson/core/base/ParserBase;-><clinit>()V
 HSPLcom/fasterxml/jackson/core/base/ParserBase;-><init>(Lcom/fasterxml/jackson/core/io/IOContext;I)V
+HSPLcom/fasterxml/jackson/core/base/ParserBase;->_getSourceReference()Ljava/lang/Object;
 HSPLcom/fasterxml/jackson/core/base/ParserBase;->_parseIntValue()I
 HSPLcom/fasterxml/jackson/core/base/ParserBase;->_parseNumericValue(I)V
 HSPLcom/fasterxml/jackson/core/base/ParserBase;->_releaseBuffers()V
@@ -7300,6 +7528,7 @@ HSPLcom/fasterxml/jackson/core/base/ParserBase;->resetInt(ZI)Lcom/fasterxml/jack
 HSPLcom/fasterxml/jackson/core/base/ParserBase;->setCurrentValue(Ljava/lang/Object;)V
 HSPLcom/fasterxml/jackson/core/base/ParserMinimalBase;-><clinit>()V
 HSPLcom/fasterxml/jackson/core/base/ParserMinimalBase;-><init>(I)V
+HSPLcom/fasterxml/jackson/core/base/ParserMinimalBase;->_reportError(Ljava/lang/String;)V
 HSPLcom/fasterxml/jackson/core/base/ParserMinimalBase;->currentToken()Lcom/fasterxml/jackson/core/JsonToken;
 HSPLcom/fasterxml/jackson/core/base/ParserMinimalBase;->currentTokenId()I
 HSPLcom/fasterxml/jackson/core/base/ParserMinimalBase;->getValueAsString()Ljava/lang/String;
@@ -7310,6 +7539,7 @@ HSPLcom/fasterxml/jackson/core/base/ParserMinimalBase;->isExpectedNumberIntToken
 HSPLcom/fasterxml/jackson/core/base/ParserMinimalBase;->isExpectedStartArrayToken()Z
 HSPLcom/fasterxml/jackson/core/base/ParserMinimalBase;->isExpectedStartObjectToken()Z
 HSPLcom/fasterxml/jackson/core/base/ParserMinimalBase;->skipChildren()Lcom/fasterxml/jackson/core/JsonParser;
+HSPLcom/fasterxml/jackson/core/exc/StreamReadException;-><init>(Lcom/fasterxml/jackson/core/JsonParser;Ljava/lang/String;)V
 HSPLcom/fasterxml/jackson/core/io/CharTypes;-><clinit>()V
 HSPLcom/fasterxml/jackson/core/io/CharTypes;->copyHexBytes()[B
 HSPLcom/fasterxml/jackson/core/io/CharTypes;->copyHexChars()[C
@@ -7326,6 +7556,7 @@ HSPLcom/fasterxml/jackson/core/io/IOContext;->allocTokenBuffer()[C
 HSPLcom/fasterxml/jackson/core/io/IOContext;->allocTokenBuffer(I)[C
 HSPLcom/fasterxml/jackson/core/io/IOContext;->allocWriteEncodingBuffer()[B
 HSPLcom/fasterxml/jackson/core/io/IOContext;->constructTextBuffer()Lcom/fasterxml/jackson/core/util/TextBuffer;
+HSPLcom/fasterxml/jackson/core/io/IOContext;->getSourceReference()Ljava/lang/Object;
 HSPLcom/fasterxml/jackson/core/io/IOContext;->isResourceManaged()Z
 HSPLcom/fasterxml/jackson/core/io/IOContext;->releaseConcatBuffer([C)V
 HSPLcom/fasterxml/jackson/core/io/IOContext;->releaseReadIOBuffer([B)V
@@ -7394,6 +7625,7 @@ HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;->_loadMore()Z
 HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;->_matchFalse()V
 HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;->_matchNull()V
 HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;->_matchTrue()V
+HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;->_nextAfterName()Lcom/fasterxml/jackson/core/JsonToken;
 HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;->_parseName()Ljava/lang/String;
 HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;->_parseName2(III)Ljava/lang/String;
 HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;->_parseNumber2(ZI)Lcom/fasterxml/jackson/core/JsonToken;
@@ -7410,7 +7642,6 @@ HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;->_updateLocation()V
 HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;->_updateNameLocation()V
 HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;->_verifyNoLeadingZeroes()C
 HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;->getReadCapabilities()Lcom/fasterxml/jackson/core/util/JacksonFeatureSet;
-HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;->getText()Ljava/lang/String;
 HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;->getValueAsString()Ljava/lang/String;
 HSPLcom/fasterxml/jackson/core/json/ReaderBasedJsonParser;->nextTextValue()Ljava/lang/String;
 HSPLcom/fasterxml/jackson/core/json/UTF8JsonGenerator;-><clinit>()V
@@ -7435,7 +7666,9 @@ HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;-><clinit>()V
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;-><init>(Lcom/fasterxml/jackson/core/io/IOContext;ILjava/io/InputStream;Lcom/fasterxml/jackson/core/ObjectCodec;Lcom/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer;[BIIIZ)V
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->_closeInput()V
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->_closeObjectScope()V
+HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->_decodeCharForError(I)I
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->_finishString2([CI)V
+HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->_handleOddName(I)Ljava/lang/String;
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->_loadMore()Z
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->_loadMoreGuaranteed()V
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->_nextAfterName()Lcom/fasterxml/jackson/core/JsonToken;
@@ -7443,6 +7676,7 @@ HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->_padLastQuad(II)I
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->_parseName(I)Ljava/lang/String;
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->_parsePosNumber(I)Lcom/fasterxml/jackson/core/JsonToken;
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->_releaseBuffers()V
+HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->_reportInvalidOther(I)V
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->_skipColon()I
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->_skipWS()I
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->_skipWS2()I
@@ -7453,7 +7687,10 @@ HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->findName(II)Ljava/lan
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->findName(III)Ljava/lang/String;
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->findName(IIII)Ljava/lang/String;
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->findName([IIII)Ljava/lang/String;
+HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->getCurrentLocation()Lcom/fasterxml/jackson/core/JsonLocation;
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->getReadCapabilities()Lcom/fasterxml/jackson/core/util/JacksonFeatureSet;
+HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->getText()Ljava/lang/String;
+HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->nextByte()I
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->nextFieldName()Ljava/lang/String;
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->parseEscapedName([IIIII)Ljava/lang/String;
 HSPLcom/fasterxml/jackson/core/json/UTF8StreamJsonParser;->parseLongName(III)Ljava/lang/String;
@@ -7771,6 +8008,7 @@ HSPLcom/fasterxml/jackson/databind/ObjectMapper$1;->isEnabled(Lcom/fasterxml/jac
 HSPLcom/fasterxml/jackson/databind/ObjectMapper$1;->setMixInAnnotations(Ljava/lang/Class;Ljava/lang/Class;)V
 HSPLcom/fasterxml/jackson/databind/ObjectMapper;-><clinit>()V
 HSPLcom/fasterxml/jackson/databind/ObjectMapper;-><init>()V
+HSPLcom/fasterxml/jackson/databind/ObjectMapper;-><init>(Lcom/fasterxml/jackson/core/JsonFactory;)V
 HSPLcom/fasterxml/jackson/databind/ObjectMapper;-><init>(Lcom/fasterxml/jackson/core/JsonFactory;Lcom/fasterxml/jackson/databind/ser/DefaultSerializerProvider;Lcom/fasterxml/jackson/databind/deser/DefaultDeserializationContext;)V
 HSPLcom/fasterxml/jackson/databind/ObjectMapper;->_assertNotNull(Ljava/lang/String;Ljava/lang/Object;)V
 HSPLcom/fasterxml/jackson/databind/ObjectMapper;->_convert(Ljava/lang/Object;Lcom/fasterxml/jackson/databind/JavaType;)Ljava/lang/Object;
@@ -7940,6 +8178,10 @@ HSPLcom/fasterxml/jackson/databind/cfg/DeserializerFactoryConfig;->keyDeserializ
 HSPLcom/fasterxml/jackson/databind/cfg/DeserializerFactoryConfig;->valueInstantiators()Ljava/lang/Iterable;
 HSPLcom/fasterxml/jackson/databind/cfg/DeserializerFactoryConfig;->withAdditionalDeserializers(Lcom/fasterxml/jackson/databind/deser/Deserializers;)Lcom/fasterxml/jackson/databind/cfg/DeserializerFactoryConfig;
 HSPLcom/fasterxml/jackson/databind/cfg/DeserializerFactoryConfig;->withValueInstantiators(Lcom/fasterxml/jackson/databind/deser/ValueInstantiators;)Lcom/fasterxml/jackson/databind/cfg/DeserializerFactoryConfig;
+HSPLcom/fasterxml/jackson/databind/cfg/MapperBuilder;-><init>(Lcom/fasterxml/jackson/databind/ObjectMapper;)V
+HSPLcom/fasterxml/jackson/databind/cfg/MapperBuilder;->_this()Lcom/fasterxml/jackson/databind/cfg/MapperBuilder;
+HSPLcom/fasterxml/jackson/databind/cfg/MapperBuilder;->addModule(Lcom/fasterxml/jackson/databind/Module;)Lcom/fasterxml/jackson/databind/cfg/MapperBuilder;
+HSPLcom/fasterxml/jackson/databind/cfg/MapperBuilder;->build()Lcom/fasterxml/jackson/databind/ObjectMapper;
 HSPLcom/fasterxml/jackson/databind/cfg/MapperConfig;-><clinit>()V
 HSPLcom/fasterxml/jackson/databind/cfg/MapperConfig;-><init>(Lcom/fasterxml/jackson/databind/cfg/BaseSettings;I)V
 HSPLcom/fasterxml/jackson/databind/cfg/MapperConfig;-><init>(Lcom/fasterxml/jackson/databind/cfg/MapperConfig;I)V
@@ -8362,7 +8604,6 @@ HSPLcom/fasterxml/jackson/databind/deser/std/StringCollectionDeserializer;-><ini
 HSPLcom/fasterxml/jackson/databind/deser/std/StringCollectionDeserializer;->createContextual(Lcom/fasterxml/jackson/databind/DeserializationContext;Lcom/fasterxml/jackson/databind/BeanProperty;)Lcom/fasterxml/jackson/databind/JsonDeserializer;
 HSPLcom/fasterxml/jackson/databind/deser/std/StringCollectionDeserializer;->deserialize(Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/lang/Object;
 HSPLcom/fasterxml/jackson/databind/deser/std/StringCollectionDeserializer;->deserialize(Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;)Ljava/util/Collection;
-HSPLcom/fasterxml/jackson/databind/deser/std/StringCollectionDeserializer;->deserialize(Lcom/fasterxml/jackson/core/JsonParser;Lcom/fasterxml/jackson/databind/DeserializationContext;Ljava/util/Collection;)Ljava/util/Collection;
 HSPLcom/fasterxml/jackson/databind/deser/std/StringCollectionDeserializer;->isCachable()Z
 HSPLcom/fasterxml/jackson/databind/deser/std/StringCollectionDeserializer;->withResolved(Lcom/fasterxml/jackson/databind/JsonDeserializer;Lcom/fasterxml/jackson/databind/JsonDeserializer;Lcom/fasterxml/jackson/databind/deser/NullValueProvider;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/deser/std/StringCollectionDeserializer;
 HSPLcom/fasterxml/jackson/databind/deser/std/StringDeserializer;-><clinit>()V
@@ -8887,6 +9128,10 @@ HSPLcom/fasterxml/jackson/databind/introspect/VisibilityChecker$Std;->isIsGetter
 HSPLcom/fasterxml/jackson/databind/introspect/VisibilityChecker$Std;->isIsGetterVisible(Ljava/lang/reflect/Method;)Z
 HSPLcom/fasterxml/jackson/databind/introspect/VisibilityChecker$Std;->isSetterVisible(Lcom/fasterxml/jackson/databind/introspect/AnnotatedMethod;)Z
 HSPLcom/fasterxml/jackson/databind/introspect/VisibilityChecker$Std;->isSetterVisible(Ljava/lang/reflect/Method;)Z
+HSPLcom/fasterxml/jackson/databind/json/JsonMapper$Builder;-><init>(Lcom/fasterxml/jackson/databind/json/JsonMapper;)V
+HSPLcom/fasterxml/jackson/databind/json/JsonMapper;-><init>()V
+HSPLcom/fasterxml/jackson/databind/json/JsonMapper;-><init>(Lcom/fasterxml/jackson/core/JsonFactory;)V
+HSPLcom/fasterxml/jackson/databind/json/JsonMapper;->builder()Lcom/fasterxml/jackson/databind/json/JsonMapper$Builder;
 HSPLcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator$Base;-><init>()V
 HSPLcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;-><init>()V
 HSPLcom/fasterxml/jackson/databind/jsontype/SubtypeResolver;-><init>()V
@@ -8913,6 +9158,7 @@ HSPLcom/fasterxml/jackson/databind/node/IntNode;-><clinit>()V
 HSPLcom/fasterxml/jackson/databind/node/IntNode;-><init>(I)V
 HSPLcom/fasterxml/jackson/databind/node/IntNode;->intValue()I
 HSPLcom/fasterxml/jackson/databind/node/IntNode;->valueOf(I)Lcom/fasterxml/jackson/databind/node/IntNode;
+HSPLcom/fasterxml/jackson/databind/node/JsonNodeFactory$$ExternalSyntheticBackportWithForwarding0;->m(Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
 HSPLcom/fasterxml/jackson/databind/node/JsonNodeFactory;-><clinit>()V
 HSPLcom/fasterxml/jackson/databind/node/JsonNodeFactory;-><init>(Z)V
 HSPLcom/fasterxml/jackson/databind/node/JsonNodeFactory;->arrayNode()Lcom/fasterxml/jackson/databind/node/ArrayNode;
@@ -8967,6 +9213,7 @@ HSPLcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;->getTypeSerializer()L
 HSPLcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;->getViews()[Ljava/lang/Class;
 HSPLcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;->hasNullSerializer()Z
 HSPLcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;->hasSerializer()Z
+HSPLcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;->serializeAsField(Ljava/lang/Object;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;)V
 HSPLcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;->setNonTrivialBaseType(Lcom/fasterxml/jackson/databind/JavaType;)V
 HSPLcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;->willSuppressNulls()Z
 HSPLcom/fasterxml/jackson/databind/ser/BeanSerializer;-><init>(Lcom/fasterxml/jackson/databind/JavaType;Lcom/fasterxml/jackson/databind/ser/BeanSerializerBuilder;[Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;[Lcom/fasterxml/jackson/databind/ser/BeanPropertyWriter;)V
@@ -9046,15 +9293,12 @@ HSPLcom/fasterxml/jackson/databind/ser/impl/IndexedListSerializer;->serializeCon
 HSPLcom/fasterxml/jackson/databind/ser/impl/IndexedListSerializer;->serializeContentsUsing(Ljava/util/List;Lcom/fasterxml/jackson/core/JsonGenerator;Lcom/fasterxml/jackson/databind/SerializerProvider;Lcom/fasterxml/jackson/databind/JsonSerializer;)V
 HSPLcom/fasterxml/jackson/databind/ser/impl/IndexedListSerializer;->withResolved(Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/ser/impl/IndexedListSerializer;
 HSPLcom/fasterxml/jackson/databind/ser/impl/IndexedListSerializer;->withResolved(Lcom/fasterxml/jackson/databind/BeanProperty;Lcom/fasterxml/jackson/databind/jsontype/TypeSerializer;Lcom/fasterxml/jackson/databind/JsonSerializer;Ljava/lang/Boolean;)Lcom/fasterxml/jackson/databind/ser/std/AsArraySerializerBase;
-HSPLcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$Double;-><init>(Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap;Ljava/lang/Class;Lcom/fasterxml/jackson/databind/JsonSerializer;Ljava/lang/Class;Lcom/fasterxml/jackson/databind/JsonSerializer;)V
-HSPLcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$Double;->serializerFor(Ljava/lang/Class;)Lcom/fasterxml/jackson/databind/JsonSerializer;
 HSPLcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$Empty;-><clinit>()V
 HSPLcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$Empty;-><init>(Z)V
 HSPLcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$Empty;->newWith(Ljava/lang/Class;Lcom/fasterxml/jackson/databind/JsonSerializer;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap;
 HSPLcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$Empty;->serializerFor(Ljava/lang/Class;)Lcom/fasterxml/jackson/databind/JsonSerializer;
 HSPLcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;-><init>(Lcom/fasterxml/jackson/databind/JsonSerializer;Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap;)V
 HSPLcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$Single;-><init>(Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap;Ljava/lang/Class;Lcom/fasterxml/jackson/databind/JsonSerializer;)V
-HSPLcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$Single;->newWith(Ljava/lang/Class;Lcom/fasterxml/jackson/databind/JsonSerializer;)Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap;
 HSPLcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$Single;->serializerFor(Ljava/lang/Class;)Lcom/fasterxml/jackson/databind/JsonSerializer;
 HSPLcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap;-><init>(Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap;)V
 HSPLcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap;-><init>(Z)V
@@ -9400,6 +9644,7 @@ HSPLcom/fasterxml/jackson/module/kotlin/ExtensionsKt$kotlinModule$1;-><clinit>()
 HSPLcom/fasterxml/jackson/module/kotlin/ExtensionsKt$kotlinModule$1;-><init>()V
 HSPLcom/fasterxml/jackson/module/kotlin/ExtensionsKt$kotlinModule$1;->invoke(Lcom/fasterxml/jackson/module/kotlin/KotlinModule$Builder;)V
 HSPLcom/fasterxml/jackson/module/kotlin/ExtensionsKt$kotlinModule$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLcom/fasterxml/jackson/module/kotlin/ExtensionsKt;->jsonMapper(Lkotlin/jvm/functions/Function1;)Lcom/fasterxml/jackson/databind/json/JsonMapper;
 HSPLcom/fasterxml/jackson/module/kotlin/ExtensionsKt;->kotlinModule$default(Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/fasterxml/jackson/module/kotlin/KotlinModule;
 HSPLcom/fasterxml/jackson/module/kotlin/ExtensionsKt;->kotlinModule(Lkotlin/jvm/functions/Function1;)Lcom/fasterxml/jackson/module/kotlin/KotlinModule;
 HSPLcom/fasterxml/jackson/module/kotlin/ExtensionsKt;->registerKotlinModule(Lcom/fasterxml/jackson/databind/ObjectMapper;)Lcom/fasterxml/jackson/databind/ObjectMapper;
@@ -9627,8 +9872,8 @@ HSPLcom/google/android/datatransport/runtime/scheduling/jobscheduling/WorkInitia
 HSPLcom/google/android/datatransport/runtime/scheduling/jobscheduling/WorkInitializer$$ExternalSyntheticLambda0;->run()V
 HSPLcom/google/android/datatransport/runtime/scheduling/jobscheduling/WorkInitializer$$ExternalSyntheticLambda1;-><init>(Lcom/google/android/datatransport/runtime/scheduling/jobscheduling/WorkInitializer;)V
 HSPLcom/google/android/datatransport/runtime/scheduling/jobscheduling/WorkInitializer$$ExternalSyntheticLambda1;->execute()Ljava/lang/Object;
-HSPLcom/google/android/datatransport/runtime/scheduling/jobscheduling/WorkInitializer;->$r8$lambda$9qDRtwUbk8Lu0d-4AfNJqExglzE(Lcom/google/android/datatransport/runtime/scheduling/jobscheduling/WorkInitializer;)Ljava/lang/Object;
-HSPLcom/google/android/datatransport/runtime/scheduling/jobscheduling/WorkInitializer;->$r8$lambda$IZdbY5oNmKQf7_hQvjCC3nA27Mo(Lcom/google/android/datatransport/runtime/scheduling/jobscheduling/WorkInitializer;)V
+HSPLcom/google/android/datatransport/runtime/scheduling/jobscheduling/WorkInitializer;->$r8$lambda$-ZllettEmXhg2KekoGpGM9ilHcY(Lcom/google/android/datatransport/runtime/scheduling/jobscheduling/WorkInitializer;)Ljava/lang/Object;
+HSPLcom/google/android/datatransport/runtime/scheduling/jobscheduling/WorkInitializer;->$r8$lambda$tpvOkK6TzmDn8PHPQtWD9jX7-wo(Lcom/google/android/datatransport/runtime/scheduling/jobscheduling/WorkInitializer;)V
 HSPLcom/google/android/datatransport/runtime/scheduling/jobscheduling/WorkInitializer;-><init>(Ljava/util/concurrent/Executor;Lcom/google/android/datatransport/runtime/scheduling/persistence/EventStore;Lcom/google/android/datatransport/runtime/scheduling/jobscheduling/WorkScheduler;Lcom/google/android/datatransport/runtime/synchronization/SynchronizationGuard;)V
 HSPLcom/google/android/datatransport/runtime/scheduling/jobscheduling/WorkInitializer;->ensureContextsScheduled()V
 HSPLcom/google/android/datatransport/runtime/scheduling/jobscheduling/WorkInitializer;->lambda$ensureContextsScheduled$0()Ljava/lang/Object;
@@ -9677,19 +9922,19 @@ HSPLcom/google/android/datatransport/runtime/scheduling/persistence/EventStoreMo
 HSPLcom/google/android/datatransport/runtime/scheduling/persistence/EventStoreModule_StoreConfigFactory;->get()Lcom/google/android/datatransport/runtime/scheduling/persistence/EventStoreConfig;
 HSPLcom/google/android/datatransport/runtime/scheduling/persistence/EventStoreModule_StoreConfigFactory;->get()Ljava/lang/Object;
 HSPLcom/google/android/datatransport/runtime/scheduling/persistence/EventStoreModule_StoreConfigFactory;->storeConfig()Lcom/google/android/datatransport/runtime/scheduling/persistence/EventStoreConfig;
-HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda0;-><init>()V
-HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda1;-><init>(Lcom/google/android/datatransport/runtime/scheduling/persistence/SchemaManager;)V
-HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda1;->produce()Ljava/lang/Object;
-HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda2;-><init>()V
-HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda4;-><init>(Landroid/database/sqlite/SQLiteDatabase;)V
-HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda4;->produce()Ljava/lang/Object;
-HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda5;-><init>()V
+HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda0;-><init>(Landroid/database/sqlite/SQLiteDatabase;)V
+HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda0;->produce()Ljava/lang/Object;
+HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda1;-><init>()V
+HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda2;-><init>(Lcom/google/android/datatransport/runtime/scheduling/persistence/SchemaManager;)V
+HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda2;->produce()Ljava/lang/Object;
+HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda3;-><init>()V
+HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda4;-><init>()V
+HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda4;->apply(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda7;-><init>()V
 HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda7;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore;->$r8$lambda$CVcnzpiKCONHRUqzlHyi1YquY4g(Landroid/database/sqlite/SQLiteDatabase;)Ljava/lang/Object;
-HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore;->$r8$lambda$LwIniJ7TEMABr5XDNZ-hjZEDpbo(Landroid/database/Cursor;)Ljava/util/List;
-HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore;->$r8$lambda$zn4IshrquL3Sn0eA13DcwuSm0VQ(Landroid/database/sqlite/SQLiteDatabase;)Ljava/util/List;
+HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore;->$r8$lambda$5Uvct5cGMjQeavljSmguhr62CK8(Landroid/database/Cursor;)Ljava/util/List;
+HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore;->$r8$lambda$OYeq4gZ6BLfEujKfNIuFZurIZak(Landroid/database/sqlite/SQLiteDatabase;)Ljava/util/List;
+HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore;->$r8$lambda$bBQL4XWV8rqSJshoDiUR95y-_jM(Landroid/database/sqlite/SQLiteDatabase;)Ljava/lang/Object;
 HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore;-><clinit>()V
 HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore;-><init>(Lcom/google/android/datatransport/runtime/time/Clock;Lcom/google/android/datatransport/runtime/time/Clock;Lcom/google/android/datatransport/runtime/scheduling/persistence/EventStoreConfig;Lcom/google/android/datatransport/runtime/scheduling/persistence/SchemaManager;Ljavax/inject/Provider;)V
 HSPLcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore;->ensureBeginTransaction(Landroid/database/sqlite/SQLiteDatabase;)V
@@ -9800,7 +10045,6 @@ HSPLcom/google/android/material/animation/AnimationUtils;-><clinit>()V
 HSPLcom/google/android/material/animation/AnimationUtils;->lerp(FFF)F
 HSPLcom/google/android/material/animation/ArgbEvaluatorCompat;-><clinit>()V
 HSPLcom/google/android/material/animation/ArgbEvaluatorCompat;-><init>()V
-HSPLcom/google/android/material/animation/ArgbEvaluatorCompat;->evaluate(FLjava/lang/Integer;Ljava/lang/Integer;)Ljava/lang/Integer;
 HSPLcom/google/android/material/animation/ArgbEvaluatorCompat;->getInstance()Lcom/google/android/material/animation/ArgbEvaluatorCompat;
 HSPLcom/google/android/material/animation/MotionSpec;-><init>()V
 HSPLcom/google/android/material/animation/MotionSpec;->addInfoFromAnimator(Lcom/google/android/material/animation/MotionSpec;Landroid/animation/Animator;)V
@@ -9812,9 +10056,11 @@ HSPLcom/google/android/material/animation/MotionSpec;->setTiming(Ljava/lang/Stri
 HSPLcom/google/android/material/animation/MotionTiming;-><init>(JJLandroid/animation/TimeInterpolator;)V
 HSPLcom/google/android/material/animation/MotionTiming;->createFromAnimator(Landroid/animation/ValueAnimator;)Lcom/google/android/material/animation/MotionTiming;
 HSPLcom/google/android/material/animation/MotionTiming;->getInterpolatorCompat(Landroid/animation/ValueAnimator;)Landroid/animation/TimeInterpolator;
+HSPLcom/google/android/material/appbar/AppBarLayout$$ExternalSyntheticApiModelOutline0;->m(Lcom/google/android/material/appbar/AppBarLayout;Z)V
 HSPLcom/google/android/material/appbar/AppBarLayout$$ExternalSyntheticLambda1;-><init>(Lcom/google/android/material/appbar/AppBarLayout;Lcom/google/android/material/shape/MaterialShapeDrawable;)V
 HSPLcom/google/android/material/appbar/AppBarLayout$1;-><init>(Lcom/google/android/material/appbar/AppBarLayout;)V
-HSPLcom/google/android/material/appbar/AppBarLayout$BaseBehavior$$ExternalSyntheticLambda0;-><init>(Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;Landroid/view/View;Lcom/google/android/material/appbar/AppBarLayout;)V
+HSPLcom/google/android/material/appbar/AppBarLayout$BaseBehavior$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/View;Landroid/view/View$OnUnhandledKeyEventListener;)V
+HSPLcom/google/android/material/appbar/AppBarLayout$BaseBehavior$$ExternalSyntheticLambda1;-><init>(Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;Landroid/view/View;Lcom/google/android/material/appbar/AppBarLayout;)V
 HSPLcom/google/android/material/appbar/AppBarLayout$BaseBehavior$2;-><init>(Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;)V
 HSPLcom/google/android/material/appbar/AppBarLayout$BaseBehavior$2;->onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
 HSPLcom/google/android/material/appbar/AppBarLayout$BaseBehavior$4;-><init>(Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;Lcom/google/android/material/appbar/AppBarLayout;Z)V
@@ -10010,6 +10256,57 @@ HSPLcom/google/android/material/button/MaterialButtonHelper;->setShapeAppearance
 HSPLcom/google/android/material/button/MaterialButtonHelper;->updateBackground()V
 HSPLcom/google/android/material/button/MaterialButtonHelper;->updateButtonShape(Lcom/google/android/material/shape/ShapeAppearanceModel;)V
 HSPLcom/google/android/material/button/MaterialButtonHelper;->wrapDrawableWithInset(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/InsetDrawable;
+HSPLcom/google/android/material/card/MaterialCardView;-><clinit>()V
+HSPLcom/google/android/material/card/MaterialCardView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+HSPLcom/google/android/material/card/MaterialCardView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+HSPLcom/google/android/material/card/MaterialCardView;->isCheckable()Z
+HSPLcom/google/android/material/card/MaterialCardView;->isChecked()Z
+HSPLcom/google/android/material/card/MaterialCardView;->isDragged()Z
+HSPLcom/google/android/material/card/MaterialCardView;->onAttachedToWindow()V
+HSPLcom/google/android/material/card/MaterialCardView;->onCreateDrawableState(I)[I
+HSPLcom/google/android/material/card/MaterialCardView;->onInitializeAccessibilityNodeInfo(Landroid/view/accessibility/AccessibilityNodeInfo;)V
+HSPLcom/google/android/material/card/MaterialCardView;->onMeasure(II)V
+HSPLcom/google/android/material/card/MaterialCardView;->setAncestorContentPadding(IIII)V
+HSPLcom/google/android/material/card/MaterialCardView;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
+HSPLcom/google/android/material/card/MaterialCardView;->setBackgroundInternal(Landroid/graphics/drawable/Drawable;)V
+HSPLcom/google/android/material/card/MaterialCardView;->setCardBackgroundColor(I)V
+HSPLcom/google/android/material/card/MaterialCardView;->setClickable(Z)V
+HSPLcom/google/android/material/card/MaterialCardViewHelper$$ExternalSyntheticApiModelOutline0;->m(Landroid/graphics/drawable/InsetDrawable;Landroid/graphics/drawable/Drawable;)V
+HSPLcom/google/android/material/card/MaterialCardViewHelper$1;-><init>(Lcom/google/android/material/card/MaterialCardViewHelper;Landroid/graphics/drawable/Drawable;IIII)V
+HSPLcom/google/android/material/card/MaterialCardViewHelper$1;->getMinimumHeight()I
+HSPLcom/google/android/material/card/MaterialCardViewHelper$1;->getMinimumWidth()I
+HSPLcom/google/android/material/card/MaterialCardViewHelper$1;->getPadding(Landroid/graphics/Rect;)Z
+HSPLcom/google/android/material/card/MaterialCardViewHelper;-><clinit>()V
+HSPLcom/google/android/material/card/MaterialCardViewHelper;-><init>(Lcom/google/android/material/card/MaterialCardView;Landroid/util/AttributeSet;II)V
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->canClipToOutline()Z
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->createForegroundRippleDrawable()Landroid/graphics/drawable/Drawable;
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->createForegroundShapeDrawable()Lcom/google/android/material/shape/MaterialShapeDrawable;
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->getBackground()Lcom/google/android/material/shape/MaterialShapeDrawable;
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->getClickableForeground()Landroid/graphics/drawable/Drawable;
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->getParentCardViewCalculatedCornerPadding()F
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->insetDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->isCheckable()Z
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->isCheckedIconBottom()Z
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->isCheckedIconEnd()Z
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->loadFromAttributes(Landroid/content/res/TypedArray;)V
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->recalculateCheckedIconPosition(II)V
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->setCardBackgroundColor(Landroid/content/res/ColorStateList;)V
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->setCardForegroundColor(Landroid/content/res/ColorStateList;)V
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->setChecked(Z)V
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->setChecked(ZZ)V
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->setCheckedIcon(Landroid/graphics/drawable/Drawable;)V
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->setCheckedIconMargin(I)V
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->setCheckedIconSize(I)V
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->setShapeAppearanceModel(Lcom/google/android/material/shape/ShapeAppearanceModel;)V
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->setUserContentPadding(IIII)V
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->shouldAddCornerPaddingInsideCardBackground()Z
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->shouldAddCornerPaddingOutsideCardBackground()Z
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->updateClickable()V
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->updateContentPadding()V
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->updateElevation()V
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->updateInsetForeground(Landroid/graphics/drawable/Drawable;)V
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->updateRippleColor()V
+HSPLcom/google/android/material/card/MaterialCardViewHelper;->updateStroke()V
 HSPLcom/google/android/material/chip/Chip$$ExternalSyntheticLambda0;-><init>(Lcom/google/android/material/chip/Chip;)V
 HSPLcom/google/android/material/chip/Chip$1;-><init>(Lcom/google/android/material/chip/Chip;)V
 HSPLcom/google/android/material/chip/Chip$1;->onFontRetrieved(Landroid/graphics/Typeface;Z)V
@@ -10224,21 +10521,6 @@ HSPLcom/google/android/material/imageview/ShapeableImageView;->access$000(Lcom/g
 HSPLcom/google/android/material/imageview/ShapeableImageView;->access$100(Lcom/google/android/material/imageview/ShapeableImageView;)Lcom/google/android/material/shape/MaterialShapeDrawable;
 HSPLcom/google/android/material/imageview/ShapeableImageView;->access$102(Lcom/google/android/material/imageview/ShapeableImageView;Lcom/google/android/material/shape/MaterialShapeDrawable;)Lcom/google/android/material/shape/MaterialShapeDrawable;
 HSPLcom/google/android/material/imageview/ShapeableImageView;->access$200(Lcom/google/android/material/imageview/ShapeableImageView;)Landroid/graphics/RectF;
-HSPLcom/google/android/material/imageview/ShapeableImageView;->drawStroke(Landroid/graphics/Canvas;)V
-HSPLcom/google/android/material/imageview/ShapeableImageView;->getContentPaddingBottom()I
-HSPLcom/google/android/material/imageview/ShapeableImageView;->getContentPaddingLeft()I
-HSPLcom/google/android/material/imageview/ShapeableImageView;->getContentPaddingRight()I
-HSPLcom/google/android/material/imageview/ShapeableImageView;->getContentPaddingTop()I
-HSPLcom/google/android/material/imageview/ShapeableImageView;->getPaddingBottom()I
-HSPLcom/google/android/material/imageview/ShapeableImageView;->getPaddingLeft()I
-HSPLcom/google/android/material/imageview/ShapeableImageView;->getPaddingRight()I
-HSPLcom/google/android/material/imageview/ShapeableImageView;->getPaddingTop()I
-HSPLcom/google/android/material/imageview/ShapeableImageView;->isContentPaddingRelative()Z
-HSPLcom/google/android/material/imageview/ShapeableImageView;->onDraw(Landroid/graphics/Canvas;)V
-HSPLcom/google/android/material/imageview/ShapeableImageView;->onMeasure(II)V
-HSPLcom/google/android/material/imageview/ShapeableImageView;->onSizeChanged(IIII)V
-HSPLcom/google/android/material/imageview/ShapeableImageView;->setPadding(IIII)V
-HSPLcom/google/android/material/imageview/ShapeableImageView;->updateShapeMask(II)V
 HSPLcom/google/android/material/internal/CollapsingTextHelper$1;-><init>(Lcom/google/android/material/internal/CollapsingTextHelper;)V
 HSPLcom/google/android/material/internal/CollapsingTextHelper$1;->apply(Landroid/graphics/Typeface;)V
 HSPLcom/google/android/material/internal/CollapsingTextHelper$2;-><init>(Lcom/google/android/material/internal/CollapsingTextHelper;)V
@@ -10418,6 +10700,8 @@ HSPLcom/google/android/material/shape/MaterialShapeDrawable;->requiresCompatShad
 HSPLcom/google/android/material/shape/MaterialShapeDrawable;->setColorFilter(Landroid/graphics/ColorFilter;)V
 HSPLcom/google/android/material/shape/MaterialShapeDrawable;->setElevation(F)V
 HSPLcom/google/android/material/shape/MaterialShapeDrawable;->setFillColor(Landroid/content/res/ColorStateList;)V
+HSPLcom/google/android/material/shape/MaterialShapeDrawable;->setShadowBitmapDrawingEnable(Z)V
+HSPLcom/google/android/material/shape/MaterialShapeDrawable;->setShadowColor(I)V
 HSPLcom/google/android/material/shape/MaterialShapeDrawable;->setShapeAppearanceModel(Lcom/google/android/material/shape/ShapeAppearanceModel;)V
 HSPLcom/google/android/material/shape/MaterialShapeDrawable;->setStroke(FI)V
 HSPLcom/google/android/material/shape/MaterialShapeDrawable;->setStroke(FLandroid/content/res/ColorStateList;)V
@@ -10436,8 +10720,6 @@ HSPLcom/google/android/material/shape/MaterialShapeUtils;->setElevation(Landroid
 HSPLcom/google/android/material/shape/MaterialShapeUtils;->setParentAbsoluteElevation(Landroid/view/View;)V
 HSPLcom/google/android/material/shape/MaterialShapeUtils;->setParentAbsoluteElevation(Landroid/view/View;Lcom/google/android/material/shape/MaterialShapeDrawable;)V
 HSPLcom/google/android/material/shape/RelativeCornerSize;-><init>(F)V
-HSPLcom/google/android/material/shape/RelativeCornerSize;->getCornerSize(Landroid/graphics/RectF;)F
-HSPLcom/google/android/material/shape/RelativeCornerSize;->getMaxCornerSize(Landroid/graphics/RectF;)F
 HSPLcom/google/android/material/shape/RoundedCornerTreatment;-><init>()V
 HSPLcom/google/android/material/shape/RoundedCornerTreatment;->getCornerPath(Lcom/google/android/material/shape/ShapePath;FFF)V
 HSPLcom/google/android/material/shape/ShapeAppearanceModel$Builder;-><init>()V
@@ -10680,11 +10962,6 @@ HSPLcom/google/common/collect/RegularImmutableSet;-><clinit>()V
 HSPLcom/google/common/collect/RegularImmutableSet;-><init>([Ljava/lang/Object;I[Ljava/lang/Object;II)V
 HSPLcom/google/common/collect/RegularImmutableSet;->contains(Ljava/lang/Object;)Z
 HSPLcom/google/common/collect/RegularImmutableSet;->size()I
-HSPLcom/google/common/collect/Sets$2;-><init>(Ljava/util/Set;Ljava/util/Set;)V
-HSPLcom/google/common/collect/Sets$2;->isEmpty()Z
-HSPLcom/google/common/collect/Sets$SetView;-><init>()V
-HSPLcom/google/common/collect/Sets$SetView;-><init>(Lcom/google/common/collect/Sets$1;)V
-HSPLcom/google/common/collect/Sets;->intersection(Ljava/util/Set;Ljava/util/Set;)Lcom/google/common/collect/Sets$SetView;
 HSPLcom/google/common/collect/Sets;->newIdentityHashSet()Ljava/util/Set;
 HSPLcom/google/common/collect/SingletonImmutableSet;-><init>(Ljava/lang/Object;)V
 HSPLcom/google/common/collect/UnmodifiableIterator;-><init>()V
@@ -10785,10 +11062,10 @@ HSPLcom/google/firebase/FirebaseCommonRegistrar$$ExternalSyntheticLambda3;-><ini
 HSPLcom/google/firebase/FirebaseCommonRegistrar$$ExternalSyntheticLambda3;->extract(Ljava/lang/Object;)Ljava/lang/String;
 HSPLcom/google/firebase/FirebaseCommonRegistrar$$ExternalSyntheticLambda4;-><init>()V
 HSPLcom/google/firebase/FirebaseCommonRegistrar$$ExternalSyntheticLambda4;->extract(Ljava/lang/Object;)Ljava/lang/String;
-HSPLcom/google/firebase/FirebaseCommonRegistrar;->$r8$lambda$4z_FoKjSmKejlSwMYYMZeC7LsMo(Landroid/content/Context;)Ljava/lang/String;
-HSPLcom/google/firebase/FirebaseCommonRegistrar;->$r8$lambda$5K-XEd3fUx19CnAZSAZ0M1s9qGg(Landroid/content/Context;)Ljava/lang/String;
-HSPLcom/google/firebase/FirebaseCommonRegistrar;->$r8$lambda$lmqwsm474glUdjxQuX0286DJQr0(Landroid/content/Context;)Ljava/lang/String;
-HSPLcom/google/firebase/FirebaseCommonRegistrar;->$r8$lambda$sUt18gVyvEV5RL6q8HJBhUltbQU(Landroid/content/Context;)Ljava/lang/String;
+HSPLcom/google/firebase/FirebaseCommonRegistrar;->$r8$lambda$4HU-LsSJXjiWd9yqSIuIvr69gmw(Landroid/content/Context;)Ljava/lang/String;
+HSPLcom/google/firebase/FirebaseCommonRegistrar;->$r8$lambda$6KbLzjDGzlo31N3xe2HtYAtvoWM(Landroid/content/Context;)Ljava/lang/String;
+HSPLcom/google/firebase/FirebaseCommonRegistrar;->$r8$lambda$JRfXgWruDOlX8_YsmPkDH9kjxAM(Landroid/content/Context;)Ljava/lang/String;
+HSPLcom/google/firebase/FirebaseCommonRegistrar;->$r8$lambda$i32xAjD3ZPnT8CWh_N09uYXbvXY(Landroid/content/Context;)Ljava/lang/String;
 HSPLcom/google/firebase/FirebaseCommonRegistrar;-><init>()V
 HSPLcom/google/firebase/FirebaseCommonRegistrar;->getComponents()Ljava/util/List;
 HSPLcom/google/firebase/FirebaseCommonRegistrar;->lambda$getComponents$0(Landroid/content/Context;)Ljava/lang/String;
@@ -10819,8 +11096,8 @@ HSPLcom/google/firebase/components/Component$Builder;->intoSet()Lcom/google/fire
 HSPLcom/google/firebase/components/Component$Builder;->name(Ljava/lang/String;)Lcom/google/firebase/components/Component$Builder;
 HSPLcom/google/firebase/components/Component$Builder;->setInstantiation(I)Lcom/google/firebase/components/Component$Builder;
 HSPLcom/google/firebase/components/Component$Builder;->validateInterface(Lcom/google/firebase/components/Qualified;)V
-HSPLcom/google/firebase/components/Component;->$r8$lambda$Ffrth-d9Peo_i_HGmbM5iJb0gQQ(Ljava/lang/Object;Lcom/google/firebase/components/ComponentContainer;)Ljava/lang/Object;
-HSPLcom/google/firebase/components/Component;->$r8$lambda$KryL7UebsJ6sFV-CDK2Yw3_BWQc(Ljava/lang/Object;Lcom/google/firebase/components/ComponentContainer;)Ljava/lang/Object;
+HSPLcom/google/firebase/components/Component;->$r8$lambda$1XnijlikLlzJWfIqLOXy2V5iuHw(Ljava/lang/Object;Lcom/google/firebase/components/ComponentContainer;)Ljava/lang/Object;
+HSPLcom/google/firebase/components/Component;->$r8$lambda$OZ0j4a0bDeW_qgAe4WJTrUMuxVw(Ljava/lang/Object;Lcom/google/firebase/components/ComponentContainer;)Ljava/lang/Object;
 HSPLcom/google/firebase/components/Component;-><init>(Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;IILcom/google/firebase/components/ComponentFactory;Ljava/util/Set;)V
 HSPLcom/google/firebase/components/Component;-><init>(Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;IILcom/google/firebase/components/ComponentFactory;Ljava/util/Set;Lcom/google/firebase/components/Component$1;)V
 HSPLcom/google/firebase/components/Component;->builder(Lcom/google/firebase/components/Qualified;)Lcom/google/firebase/components/Component$Builder;
@@ -10853,7 +11130,7 @@ HSPLcom/google/firebase/components/ComponentDiscovery$MetadataRegistrarNameRetri
 HSPLcom/google/firebase/components/ComponentDiscovery$MetadataRegistrarNameRetriever;->getMetadata(Landroid/content/Context;)Landroid/os/Bundle;
 HSPLcom/google/firebase/components/ComponentDiscovery$MetadataRegistrarNameRetriever;->retrieve(Landroid/content/Context;)Ljava/util/List;
 HSPLcom/google/firebase/components/ComponentDiscovery$MetadataRegistrarNameRetriever;->retrieve(Ljava/lang/Object;)Ljava/util/List;
-HSPLcom/google/firebase/components/ComponentDiscovery;->$r8$lambda$g7eF8YtNQOk49-ub0JV5u7HvrjE(Ljava/lang/String;)Lcom/google/firebase/components/ComponentRegistrar;
+HSPLcom/google/firebase/components/ComponentDiscovery;->$r8$lambda$Gc4-uboerSWhT4Qj_o2kYkHFf50(Ljava/lang/String;)Lcom/google/firebase/components/ComponentRegistrar;
 HSPLcom/google/firebase/components/ComponentDiscovery;-><init>(Ljava/lang/Object;Lcom/google/firebase/components/ComponentDiscovery$RegistrarNameRetriever;)V
 HSPLcom/google/firebase/components/ComponentDiscovery;->discoverLazy()Ljava/util/List;
 HSPLcom/google/firebase/components/ComponentDiscovery;->forContext(Landroid/content/Context;Ljava/lang/Class;)Lcom/google/firebase/components/ComponentDiscovery;
@@ -10861,12 +11138,12 @@ HSPLcom/google/firebase/components/ComponentDiscovery;->instantiate(Ljava/lang/S
 HSPLcom/google/firebase/components/ComponentDiscovery;->lambda$discoverLazy$0(Ljava/lang/String;)Lcom/google/firebase/components/ComponentRegistrar;
 HSPLcom/google/firebase/components/ComponentRegistrarProcessor$$ExternalSyntheticLambda0;-><init>()V
 HSPLcom/google/firebase/components/ComponentRegistrarProcessor;-><clinit>()V
-HSPLcom/google/firebase/components/ComponentRuntime$$ExternalSyntheticLambda0;-><init>(Lcom/google/firebase/components/ComponentRuntime;Lcom/google/firebase/components/Component;)V
-HSPLcom/google/firebase/components/ComponentRuntime$$ExternalSyntheticLambda0;->get()Ljava/lang/Object;
-HSPLcom/google/firebase/components/ComponentRuntime$$ExternalSyntheticLambda1;-><init>()V
+HSPLcom/google/firebase/components/ComponentRuntime$$ExternalSyntheticLambda0;-><init>()V
+HSPLcom/google/firebase/components/ComponentRuntime$$ExternalSyntheticLambda1;-><init>(Lcom/google/firebase/components/ComponentRuntime;Lcom/google/firebase/components/Component;)V
+HSPLcom/google/firebase/components/ComponentRuntime$$ExternalSyntheticLambda1;->get()Ljava/lang/Object;
 HSPLcom/google/firebase/components/ComponentRuntime$Builder$$ExternalSyntheticLambda0;-><init>(Lcom/google/firebase/components/ComponentRegistrar;)V
 HSPLcom/google/firebase/components/ComponentRuntime$Builder$$ExternalSyntheticLambda0;->get()Ljava/lang/Object;
-HSPLcom/google/firebase/components/ComponentRuntime$Builder;->$r8$lambda$zALdpHRUq1MLquOd6LSJTHoIM3w(Lcom/google/firebase/components/ComponentRegistrar;)Lcom/google/firebase/components/ComponentRegistrar;
+HSPLcom/google/firebase/components/ComponentRuntime$Builder;->$r8$lambda$rq5ahKBnCKJMyE365M3jifpISoo(Lcom/google/firebase/components/ComponentRegistrar;)Lcom/google/firebase/components/ComponentRegistrar;
 HSPLcom/google/firebase/components/ComponentRuntime$Builder;-><init>(Ljava/util/concurrent/Executor;)V
 HSPLcom/google/firebase/components/ComponentRuntime$Builder;->addComponent(Lcom/google/firebase/components/Component;)Lcom/google/firebase/components/ComponentRuntime$Builder;
 HSPLcom/google/firebase/components/ComponentRuntime$Builder;->addComponentRegistrar(Lcom/google/firebase/components/ComponentRegistrar;)Lcom/google/firebase/components/ComponentRuntime$Builder;
@@ -10874,7 +11151,7 @@ HSPLcom/google/firebase/components/ComponentRuntime$Builder;->addLazyComponentRe
 HSPLcom/google/firebase/components/ComponentRuntime$Builder;->build()Lcom/google/firebase/components/ComponentRuntime;
 HSPLcom/google/firebase/components/ComponentRuntime$Builder;->lambda$addComponentRegistrar$0(Lcom/google/firebase/components/ComponentRegistrar;)Lcom/google/firebase/components/ComponentRegistrar;
 HSPLcom/google/firebase/components/ComponentRuntime$Builder;->setProcessor(Lcom/google/firebase/components/ComponentRegistrarProcessor;)Lcom/google/firebase/components/ComponentRuntime$Builder;
-HSPLcom/google/firebase/components/ComponentRuntime;->$r8$lambda$4FqOW9eOQsvFYo-HpMfxCOnPQr0(Lcom/google/firebase/components/ComponentRuntime;Lcom/google/firebase/components/Component;)Ljava/lang/Object;
+HSPLcom/google/firebase/components/ComponentRuntime;->$r8$lambda$KkGLnATw7zawFxzXHI2bmfEwUaI(Lcom/google/firebase/components/ComponentRuntime;Lcom/google/firebase/components/Component;)Ljava/lang/Object;
 HSPLcom/google/firebase/components/ComponentRuntime;-><clinit>()V
 HSPLcom/google/firebase/components/ComponentRuntime;-><init>(Ljava/util/concurrent/Executor;Ljava/lang/Iterable;Ljava/util/Collection;Lcom/google/firebase/components/ComponentRegistrarProcessor;)V
 HSPLcom/google/firebase/components/ComponentRuntime;-><init>(Ljava/util/concurrent/Executor;Ljava/lang/Iterable;Ljava/util/Collection;Lcom/google/firebase/components/ComponentRegistrarProcessor;Lcom/google/firebase/components/ComponentRuntime$1;)V
@@ -10936,7 +11213,7 @@ HSPLcom/google/firebase/components/LazySet;->updateSet()V
 HSPLcom/google/firebase/components/OptionalProvider$$ExternalSyntheticLambda0;-><init>()V
 HSPLcom/google/firebase/components/OptionalProvider$$ExternalSyntheticLambda1;-><init>()V
 HSPLcom/google/firebase/components/OptionalProvider$$ExternalSyntheticLambda1;->get()Ljava/lang/Object;
-HSPLcom/google/firebase/components/OptionalProvider;->$r8$lambda$ILPY1nlr_ULZNpsKMbNjkBMT0Ec()Ljava/lang/Object;
+HSPLcom/google/firebase/components/OptionalProvider;->$r8$lambda$42DdGLxm8XDmnYxP5XsnqhLiudg()Ljava/lang/Object;
 HSPLcom/google/firebase/components/OptionalProvider;-><clinit>()V
 HSPLcom/google/firebase/components/OptionalProvider;-><init>(Lcom/google/firebase/inject/Deferred$DeferredHandler;Lcom/google/firebase/inject/Provider;)V
 HSPLcom/google/firebase/components/OptionalProvider;->empty()Lcom/google/firebase/components/OptionalProvider;
@@ -10959,7 +11236,7 @@ HSPLcom/google/firebase/components/RestrictedComponentContainer;->setOf(Lcom/goo
 HSPLcom/google/firebase/components/RestrictedComponentContainer;->setOf(Ljava/lang/Class;)Ljava/util/Set;
 HSPLcom/google/firebase/concurrent/CustomThreadFactory$$ExternalSyntheticLambda0;-><init>(Lcom/google/firebase/concurrent/CustomThreadFactory;Ljava/lang/Runnable;)V
 HSPLcom/google/firebase/concurrent/CustomThreadFactory$$ExternalSyntheticLambda0;->run()V
-HSPLcom/google/firebase/concurrent/CustomThreadFactory;->$r8$lambda$25wFMnJXuxCXflRCTG3ggSOiDOE(Lcom/google/firebase/concurrent/CustomThreadFactory;Ljava/lang/Runnable;)V
+HSPLcom/google/firebase/concurrent/CustomThreadFactory;->$r8$lambda$XB8AY3Hcio74byWuTzgVEC3Hiek(Lcom/google/firebase/concurrent/CustomThreadFactory;Ljava/lang/Runnable;)V
 HSPLcom/google/firebase/concurrent/CustomThreadFactory;-><clinit>()V
 HSPLcom/google/firebase/concurrent/CustomThreadFactory;-><init>(Ljava/lang/String;ILandroid/os/StrictMode$ThreadPolicy;)V
 HSPLcom/google/firebase/concurrent/CustomThreadFactory;->lambda$newThread$0(Ljava/lang/Runnable;)V
@@ -10981,11 +11258,11 @@ HSPLcom/google/firebase/concurrent/ExecutorsRegistrar$$ExternalSyntheticLambda7;
 HSPLcom/google/firebase/concurrent/ExecutorsRegistrar$$ExternalSyntheticLambda7;->create(Lcom/google/firebase/components/ComponentContainer;)Ljava/lang/Object;
 HSPLcom/google/firebase/concurrent/ExecutorsRegistrar$$ExternalSyntheticLambda8;-><init>()V
 HSPLcom/google/firebase/concurrent/ExecutorsRegistrar$$ExternalSyntheticLambda9;-><init>()V
-HSPLcom/google/firebase/concurrent/ExecutorsRegistrar;->$r8$lambda$B0uxZM3vtzbxsiba-BG0uULoiD4(Lcom/google/firebase/components/ComponentContainer;)Ljava/util/concurrent/ScheduledExecutorService;
-HSPLcom/google/firebase/concurrent/ExecutorsRegistrar;->$r8$lambda$CPw8Fkb3IUuXxyMDEX7jRTY3RLU()Ljava/util/concurrent/ScheduledExecutorService;
-HSPLcom/google/firebase/concurrent/ExecutorsRegistrar;->$r8$lambda$LcRQ6Y9Lyx04G2dP62SABiYdGvk()Ljava/util/concurrent/ScheduledExecutorService;
-HSPLcom/google/firebase/concurrent/ExecutorsRegistrar;->$r8$lambda$TiDqygDBKMAJW7krWBoK3hUmMi4()Ljava/util/concurrent/ScheduledExecutorService;
-HSPLcom/google/firebase/concurrent/ExecutorsRegistrar;->$r8$lambda$zUzQedCnza4BjszhsGQ_Vcga9ug(Lcom/google/firebase/components/ComponentContainer;)Ljava/util/concurrent/ScheduledExecutorService;
+HSPLcom/google/firebase/concurrent/ExecutorsRegistrar;->$r8$lambda$OS8tHCI75smJjzjFpk7FAmcergI()Ljava/util/concurrent/ScheduledExecutorService;
+HSPLcom/google/firebase/concurrent/ExecutorsRegistrar;->$r8$lambda$cIc-1kmvOGchekIoFcI-gGfoNXQ(Lcom/google/firebase/components/ComponentContainer;)Ljava/util/concurrent/ScheduledExecutorService;
+HSPLcom/google/firebase/concurrent/ExecutorsRegistrar;->$r8$lambda$oILf_7MyPHExPMmFKzTN2S-0gK0()Ljava/util/concurrent/ScheduledExecutorService;
+HSPLcom/google/firebase/concurrent/ExecutorsRegistrar;->$r8$lambda$oK_dgAjsJ4YgUN9Bhr7JxEecTHE(Lcom/google/firebase/components/ComponentContainer;)Ljava/util/concurrent/ScheduledExecutorService;
+HSPLcom/google/firebase/concurrent/ExecutorsRegistrar;->$r8$lambda$wRz-qixVe00UVZpQosGIZYyKmqY()Ljava/util/concurrent/ScheduledExecutorService;
 HSPLcom/google/firebase/concurrent/ExecutorsRegistrar;-><clinit>()V
 HSPLcom/google/firebase/concurrent/ExecutorsRegistrar;-><init>()V
 HSPLcom/google/firebase/concurrent/ExecutorsRegistrar;->bgPolicy()Landroid/os/StrictMode$ThreadPolicy;
@@ -11009,19 +11286,19 @@ HSPLcom/google/firebase/concurrent/UiExecutor;-><clinit>()V
 HSPLcom/google/firebase/concurrent/UiExecutor;-><init>(Ljava/lang/String;I)V
 HSPLcom/google/firebase/datatransport/TransportRegistrar$$ExternalSyntheticLambda0;-><init>()V
 HSPLcom/google/firebase/datatransport/TransportRegistrar$$ExternalSyntheticLambda0;->create(Lcom/google/firebase/components/ComponentContainer;)Ljava/lang/Object;
-HSPLcom/google/firebase/datatransport/TransportRegistrar;->$r8$lambda$cPZPPfWZLxVwhtSgzJNU9TpSidE(Lcom/google/firebase/components/ComponentContainer;)Lcom/google/android/datatransport/TransportFactory;
+HSPLcom/google/firebase/datatransport/TransportRegistrar;->$r8$lambda$QkqDNTnBQvxCK9qVVo8puvSQXG0(Lcom/google/firebase/components/ComponentContainer;)Lcom/google/android/datatransport/TransportFactory;
 HSPLcom/google/firebase/datatransport/TransportRegistrar;-><init>()V
 HSPLcom/google/firebase/datatransport/TransportRegistrar;->getComponents()Ljava/util/List;
 HSPLcom/google/firebase/datatransport/TransportRegistrar;->lambda$getComponents$0(Lcom/google/firebase/components/ComponentContainer;)Lcom/google/android/datatransport/TransportFactory;
 HSPLcom/google/firebase/heartbeatinfo/DefaultHeartBeatController$$ExternalSyntheticLambda0;-><init>(Lcom/google/firebase/components/Qualified;)V
 HSPLcom/google/firebase/heartbeatinfo/DefaultHeartBeatController$$ExternalSyntheticLambda0;->create(Lcom/google/firebase/components/ComponentContainer;)Ljava/lang/Object;
-HSPLcom/google/firebase/heartbeatinfo/DefaultHeartBeatController$$ExternalSyntheticLambda2;-><init>(Lcom/google/firebase/heartbeatinfo/DefaultHeartBeatController;)V
-HSPLcom/google/firebase/heartbeatinfo/DefaultHeartBeatController$$ExternalSyntheticLambda2;->call()Ljava/lang/Object;
-HSPLcom/google/firebase/heartbeatinfo/DefaultHeartBeatController$$ExternalSyntheticLambda3;-><init>(Landroid/content/Context;Ljava/lang/String;)V
-HSPLcom/google/firebase/heartbeatinfo/DefaultHeartBeatController$$ExternalSyntheticLambda3;->get()Ljava/lang/Object;
-HSPLcom/google/firebase/heartbeatinfo/DefaultHeartBeatController;->$r8$lambda$UUZPx8hW0V_ozcVKYhdoH5HkTH0(Lcom/google/firebase/heartbeatinfo/DefaultHeartBeatController;)Ljava/lang/Void;
-HSPLcom/google/firebase/heartbeatinfo/DefaultHeartBeatController;->$r8$lambda$e9wvYmF9HQ89hhnXeiCNZyN4iuA(Landroid/content/Context;Ljava/lang/String;)Lcom/google/firebase/heartbeatinfo/HeartBeatInfoStorage;
-HSPLcom/google/firebase/heartbeatinfo/DefaultHeartBeatController;->$r8$lambda$f9LR9_JXukKv6Ee8-VN-gd8cy5Q(Lcom/google/firebase/components/Qualified;Lcom/google/firebase/components/ComponentContainer;)Lcom/google/firebase/heartbeatinfo/DefaultHeartBeatController;
+HSPLcom/google/firebase/heartbeatinfo/DefaultHeartBeatController$$ExternalSyntheticLambda1;-><init>(Landroid/content/Context;Ljava/lang/String;)V
+HSPLcom/google/firebase/heartbeatinfo/DefaultHeartBeatController$$ExternalSyntheticLambda1;->get()Ljava/lang/Object;
+HSPLcom/google/firebase/heartbeatinfo/DefaultHeartBeatController$$ExternalSyntheticLambda3;-><init>(Lcom/google/firebase/heartbeatinfo/DefaultHeartBeatController;)V
+HSPLcom/google/firebase/heartbeatinfo/DefaultHeartBeatController$$ExternalSyntheticLambda3;->call()Ljava/lang/Object;
+HSPLcom/google/firebase/heartbeatinfo/DefaultHeartBeatController;->$r8$lambda$W62DRj4tEJPeea0uD3QbdJLqqVQ(Landroid/content/Context;Ljava/lang/String;)Lcom/google/firebase/heartbeatinfo/HeartBeatInfoStorage;
+HSPLcom/google/firebase/heartbeatinfo/DefaultHeartBeatController;->$r8$lambda$qqd15T_K2a1gIcWWKlBsXOoLnRU(Lcom/google/firebase/components/Qualified;Lcom/google/firebase/components/ComponentContainer;)Lcom/google/firebase/heartbeatinfo/DefaultHeartBeatController;
+HSPLcom/google/firebase/heartbeatinfo/DefaultHeartBeatController;->$r8$lambda$ssxGEaCSc5qotNfnf_nT87dJ5TU(Lcom/google/firebase/heartbeatinfo/DefaultHeartBeatController;)Ljava/lang/Void;
 HSPLcom/google/firebase/heartbeatinfo/DefaultHeartBeatController;-><init>(Landroid/content/Context;Ljava/lang/String;Ljava/util/Set;Lcom/google/firebase/inject/Provider;Ljava/util/concurrent/Executor;)V
 HSPLcom/google/firebase/heartbeatinfo/DefaultHeartBeatController;-><init>(Lcom/google/firebase/inject/Provider;Ljava/util/Set;Ljava/util/concurrent/Executor;Lcom/google/firebase/inject/Provider;Landroid/content/Context;)V
 HSPLcom/google/firebase/heartbeatinfo/DefaultHeartBeatController;->component()Lcom/google/firebase/components/Component;
@@ -11035,15 +11312,17 @@ HSPLcom/google/firebase/heartbeatinfo/HeartBeatInfoStorage;-><clinit>()V
 HSPLcom/google/firebase/heartbeatinfo/HeartBeatInfoStorage;-><init>(Landroid/content/Context;Ljava/lang/String;)V
 HSPLcom/google/firebase/heartbeatinfo/HeartBeatInfoStorage;->getFormattedDate(J)Ljava/lang/String;
 HSPLcom/google/firebase/heartbeatinfo/HeartBeatInfoStorage;->getStoredUserAgentString(Ljava/lang/String;)Ljava/lang/String;
+HSPLcom/google/firebase/heartbeatinfo/HeartBeatInfoStorage;->removeStoredDate(Ljava/lang/String;)V
 HSPLcom/google/firebase/heartbeatinfo/HeartBeatInfoStorage;->storeHeartBeat(JLjava/lang/String;)V
-HSPLcom/google/firebase/installations/FirebaseInstallations$$ExternalSyntheticLambda1;-><init>(Lcom/google/firebase/FirebaseApp;)V
+HSPLcom/google/firebase/heartbeatinfo/HeartBeatInfoStorage;->updateStoredUserAgent(Ljava/lang/String;Ljava/lang/String;)V
+HSPLcom/google/firebase/installations/FirebaseInstallations$$ExternalSyntheticLambda0;-><init>(Lcom/google/firebase/FirebaseApp;)V
 HSPLcom/google/firebase/installations/FirebaseInstallations$1;-><init>()V
 HSPLcom/google/firebase/installations/FirebaseInstallations;-><clinit>()V
 HSPLcom/google/firebase/installations/FirebaseInstallations;-><init>(Lcom/google/firebase/FirebaseApp;Lcom/google/firebase/inject/Provider;Ljava/util/concurrent/ExecutorService;Ljava/util/concurrent/Executor;)V
 HSPLcom/google/firebase/installations/FirebaseInstallations;-><init>(Ljava/util/concurrent/ExecutorService;Ljava/util/concurrent/Executor;Lcom/google/firebase/FirebaseApp;Lcom/google/firebase/installations/remote/FirebaseInstallationServiceClient;Lcom/google/firebase/installations/local/PersistedInstallation;Lcom/google/firebase/installations/Utils;Lcom/google/firebase/components/Lazy;Lcom/google/firebase/installations/RandomFidGenerator;)V
 HSPLcom/google/firebase/installations/FirebaseInstallationsRegistrar$$ExternalSyntheticLambda0;-><init>()V
 HSPLcom/google/firebase/installations/FirebaseInstallationsRegistrar$$ExternalSyntheticLambda0;->create(Lcom/google/firebase/components/ComponentContainer;)Ljava/lang/Object;
-HSPLcom/google/firebase/installations/FirebaseInstallationsRegistrar;->$r8$lambda$S-TGqLUnPeNlFWH4x9vB3gPxkgs(Lcom/google/firebase/components/ComponentContainer;)Lcom/google/firebase/installations/FirebaseInstallationsApi;
+HSPLcom/google/firebase/installations/FirebaseInstallationsRegistrar;->$r8$lambda$vJ_ijnislX2JLJx5rFvt8ObqNeg(Lcom/google/firebase/components/ComponentContainer;)Lcom/google/firebase/installations/FirebaseInstallationsApi;
 HSPLcom/google/firebase/installations/FirebaseInstallationsRegistrar;-><init>()V
 HSPLcom/google/firebase/installations/FirebaseInstallationsRegistrar;->getComponents()Ljava/util/List;
 HSPLcom/google/firebase/installations/FirebaseInstallationsRegistrar;->lambda$getComponents$0(Lcom/google/firebase/components/ComponentContainer;)Lcom/google/firebase/installations/FirebaseInstallationsApi;
@@ -11083,9 +11362,9 @@ HSPLcom/google/firebase/messaging/FirebaseMessaging$AutoInit;-><init>(Lcom/googl
 HSPLcom/google/firebase/messaging/FirebaseMessaging$AutoInit;->initialize()V
 HSPLcom/google/firebase/messaging/FirebaseMessaging$AutoInit;->isEnabled()Z
 HSPLcom/google/firebase/messaging/FirebaseMessaging$AutoInit;->readEnabled()Ljava/lang/Boolean;
-HSPLcom/google/firebase/messaging/FirebaseMessaging;->$r8$lambda$9BmBSJbzpOj10CNc9P4MUbet9uE(Lcom/google/firebase/messaging/FirebaseMessaging;)V
-HSPLcom/google/firebase/messaging/FirebaseMessaging;->$r8$lambda$_CC6q-CGZcBUrohC2lIZVPyQAR8(Lcom/google/firebase/messaging/FirebaseMessaging;Lcom/google/firebase/messaging/TopicsSubscriber;)V
-HSPLcom/google/firebase/messaging/FirebaseMessaging;->$r8$lambda$cBWayaClDrzWL1MceyUXuYYS9NE(Lcom/google/firebase/messaging/FirebaseMessaging;)V
+HSPLcom/google/firebase/messaging/FirebaseMessaging;->$r8$lambda$8G-h7_n0Um1DYcfUNw5VOGbjt-M(Lcom/google/firebase/messaging/FirebaseMessaging;)V
+HSPLcom/google/firebase/messaging/FirebaseMessaging;->$r8$lambda$bTZfnbXKrjIXUCiyu8l-9-JPAxs(Lcom/google/firebase/messaging/FirebaseMessaging;)V
+HSPLcom/google/firebase/messaging/FirebaseMessaging;->$r8$lambda$ssvggG6aCg9AxxngyeNF7gHjciA(Lcom/google/firebase/messaging/FirebaseMessaging;Lcom/google/firebase/messaging/TopicsSubscriber;)V
 HSPLcom/google/firebase/messaging/FirebaseMessaging;-><clinit>()V
 HSPLcom/google/firebase/messaging/FirebaseMessaging;-><init>(Lcom/google/firebase/FirebaseApp;Lcom/google/firebase/iid/internal/FirebaseInstanceIdInternal;Lcom/google/firebase/inject/Provider;Lcom/google/firebase/inject/Provider;Lcom/google/firebase/installations/FirebaseInstallationsApi;Lcom/google/android/datatransport/TransportFactory;Lcom/google/firebase/events/Subscriber;)V
 HSPLcom/google/firebase/messaging/FirebaseMessaging;-><init>(Lcom/google/firebase/FirebaseApp;Lcom/google/firebase/iid/internal/FirebaseInstanceIdInternal;Lcom/google/firebase/inject/Provider;Lcom/google/firebase/inject/Provider;Lcom/google/firebase/installations/FirebaseInstallationsApi;Lcom/google/android/datatransport/TransportFactory;Lcom/google/firebase/events/Subscriber;Lcom/google/firebase/messaging/Metadata;)V
@@ -11097,7 +11376,7 @@ HSPLcom/google/firebase/messaging/FirebaseMessaging;->lambda$new$2(Lcom/google/f
 HSPLcom/google/firebase/messaging/FirebaseMessaging;->lambda$new$3()V
 HSPLcom/google/firebase/messaging/FirebaseMessagingRegistrar$$ExternalSyntheticLambda0;-><init>()V
 HSPLcom/google/firebase/messaging/FirebaseMessagingRegistrar$$ExternalSyntheticLambda0;->create(Lcom/google/firebase/components/ComponentContainer;)Ljava/lang/Object;
-HSPLcom/google/firebase/messaging/FirebaseMessagingRegistrar;->$r8$lambda$mnyerHGo6RZM3xcn1FE3fapbktk(Lcom/google/firebase/components/ComponentContainer;)Lcom/google/firebase/messaging/FirebaseMessaging;
+HSPLcom/google/firebase/messaging/FirebaseMessagingRegistrar;->$r8$lambda$bZoaCm49JrDNg3UPCIlAWkp3Nnc(Lcom/google/firebase/components/ComponentContainer;)Lcom/google/firebase/messaging/FirebaseMessaging;
 HSPLcom/google/firebase/messaging/FirebaseMessagingRegistrar;-><init>()V
 HSPLcom/google/firebase/messaging/FirebaseMessagingRegistrar;->getComponents()Ljava/util/List;
 HSPLcom/google/firebase/messaging/FirebaseMessagingRegistrar;->lambda$getComponents$0(Lcom/google/firebase/components/ComponentContainer;)Lcom/google/firebase/messaging/FirebaseMessaging;
@@ -11117,7 +11396,7 @@ HSPLcom/google/firebase/messaging/TopicsStore;->getInstance(Landroid/content/Con
 HSPLcom/google/firebase/messaging/TopicsStore;->initStore()V
 HSPLcom/google/firebase/messaging/TopicsSubscriber$$ExternalSyntheticLambda0;-><init>(Landroid/content/Context;Ljava/util/concurrent/ScheduledExecutorService;Lcom/google/firebase/messaging/FirebaseMessaging;Lcom/google/firebase/messaging/Metadata;Lcom/google/firebase/messaging/GmsRpc;)V
 HSPLcom/google/firebase/messaging/TopicsSubscriber$$ExternalSyntheticLambda0;->call()Ljava/lang/Object;
-HSPLcom/google/firebase/messaging/TopicsSubscriber;->$r8$lambda$R19xMPvQeQT1bL3ZcaA4xTgSxIs(Landroid/content/Context;Ljava/util/concurrent/ScheduledExecutorService;Lcom/google/firebase/messaging/FirebaseMessaging;Lcom/google/firebase/messaging/Metadata;Lcom/google/firebase/messaging/GmsRpc;)Lcom/google/firebase/messaging/TopicsSubscriber;
+HSPLcom/google/firebase/messaging/TopicsSubscriber;->$r8$lambda$cQm16Wsc8osz2g8HYy5wwc3xjQc(Landroid/content/Context;Ljava/util/concurrent/ScheduledExecutorService;Lcom/google/firebase/messaging/FirebaseMessaging;Lcom/google/firebase/messaging/Metadata;Lcom/google/firebase/messaging/GmsRpc;)Lcom/google/firebase/messaging/TopicsSubscriber;
 HSPLcom/google/firebase/messaging/TopicsSubscriber;-><clinit>()V
 HSPLcom/google/firebase/messaging/TopicsSubscriber;-><init>(Lcom/google/firebase/messaging/FirebaseMessaging;Lcom/google/firebase/messaging/Metadata;Lcom/google/firebase/messaging/TopicsStore;Lcom/google/firebase/messaging/GmsRpc;Landroid/content/Context;Ljava/util/concurrent/ScheduledExecutorService;)V
 HSPLcom/google/firebase/messaging/TopicsSubscriber;->createInstance(Lcom/google/firebase/messaging/FirebaseMessaging;Lcom/google/firebase/messaging/Metadata;Lcom/google/firebase/messaging/GmsRpc;Landroid/content/Context;Ljava/util/concurrent/ScheduledExecutorService;)Lcom/google/android/gms/tasks/Task;
@@ -11128,7 +11407,7 @@ HSPLcom/google/firebase/platforminfo/AutoValue_LibraryVersion;->getVersion()Ljav
 HSPLcom/google/firebase/platforminfo/AutoValue_LibraryVersion;->hashCode()I
 HSPLcom/google/firebase/platforminfo/DefaultUserAgentPublisher$$ExternalSyntheticLambda0;-><init>()V
 HSPLcom/google/firebase/platforminfo/DefaultUserAgentPublisher$$ExternalSyntheticLambda0;->create(Lcom/google/firebase/components/ComponentContainer;)Ljava/lang/Object;
-HSPLcom/google/firebase/platforminfo/DefaultUserAgentPublisher;->$r8$lambda$4ig3kBSwJpLAUmRXJRn9olP8BdE(Lcom/google/firebase/components/ComponentContainer;)Lcom/google/firebase/platforminfo/UserAgentPublisher;
+HSPLcom/google/firebase/platforminfo/DefaultUserAgentPublisher;->$r8$lambda$l1TCuYGXPzjNfiAA4kssoT8wtDA(Lcom/google/firebase/components/ComponentContainer;)Lcom/google/firebase/platforminfo/UserAgentPublisher;
 HSPLcom/google/firebase/platforminfo/DefaultUserAgentPublisher;-><init>(Ljava/util/Set;Lcom/google/firebase/platforminfo/GlobalLibraryVersionRegistrar;)V
 HSPLcom/google/firebase/platforminfo/DefaultUserAgentPublisher;->component()Lcom/google/firebase/components/Component;
 HSPLcom/google/firebase/platforminfo/DefaultUserAgentPublisher;->getUserAgent()Ljava/lang/String;
@@ -11142,7 +11421,7 @@ HSPLcom/google/firebase/platforminfo/LibraryVersion;-><init>()V
 HSPLcom/google/firebase/platforminfo/LibraryVersion;->create(Ljava/lang/String;Ljava/lang/String;)Lcom/google/firebase/platforminfo/LibraryVersion;
 HSPLcom/google/firebase/platforminfo/LibraryVersionComponent$$ExternalSyntheticLambda0;-><init>(Ljava/lang/String;Lcom/google/firebase/platforminfo/LibraryVersionComponent$VersionExtractor;)V
 HSPLcom/google/firebase/platforminfo/LibraryVersionComponent$$ExternalSyntheticLambda0;->create(Lcom/google/firebase/components/ComponentContainer;)Ljava/lang/Object;
-HSPLcom/google/firebase/platforminfo/LibraryVersionComponent;->$r8$lambda$Dl2UOJASySXKbW5tJLYAdrR74MU(Ljava/lang/String;Lcom/google/firebase/platforminfo/LibraryVersionComponent$VersionExtractor;Lcom/google/firebase/components/ComponentContainer;)Lcom/google/firebase/platforminfo/LibraryVersion;
+HSPLcom/google/firebase/platforminfo/LibraryVersionComponent;->$r8$lambda$y-qYaNyKEB8h4Vc2fUd5Fnj2sbE(Ljava/lang/String;Lcom/google/firebase/platforminfo/LibraryVersionComponent$VersionExtractor;Lcom/google/firebase/components/ComponentContainer;)Lcom/google/firebase/platforminfo/LibraryVersion;
 HSPLcom/google/firebase/platforminfo/LibraryVersionComponent;->create(Ljava/lang/String;Ljava/lang/String;)Lcom/google/firebase/components/Component;
 HSPLcom/google/firebase/platforminfo/LibraryVersionComponent;->fromContext(Ljava/lang/String;Lcom/google/firebase/platforminfo/LibraryVersionComponent$VersionExtractor;)Lcom/google/firebase/components/Component;
 HSPLcom/google/firebase/platforminfo/LibraryVersionComponent;->lambda$fromContext$0(Ljava/lang/String;Lcom/google/firebase/platforminfo/LibraryVersionComponent$VersionExtractor;Lcom/google/firebase/components/ComponentContainer;)Lcom/google/firebase/platforminfo/LibraryVersion;
@@ -11155,7 +11434,7 @@ HSPLcom/google/firebase/provider/FirebaseInitProvider;->isCurrentlyInitializing(
 HSPLcom/google/firebase/provider/FirebaseInitProvider;->onCreate()Z
 HSPLcom/google/firebase/tracing/ComponentMonitor$$ExternalSyntheticLambda0;-><init>(Ljava/lang/String;Lcom/google/firebase/components/Component;)V
 HSPLcom/google/firebase/tracing/ComponentMonitor$$ExternalSyntheticLambda0;->create(Lcom/google/firebase/components/ComponentContainer;)Ljava/lang/Object;
-HSPLcom/google/firebase/tracing/ComponentMonitor;->$r8$lambda$nUgWIWAyyZxi6mRt6KSZMmA5LxE(Ljava/lang/String;Lcom/google/firebase/components/Component;Lcom/google/firebase/components/ComponentContainer;)Ljava/lang/Object;
+HSPLcom/google/firebase/tracing/ComponentMonitor;->$r8$lambda$VxUPTnF8OKnnbKKjQblzb1_PJuw(Ljava/lang/String;Lcom/google/firebase/components/Component;Lcom/google/firebase/components/ComponentContainer;)Ljava/lang/Object;
 HSPLcom/google/firebase/tracing/ComponentMonitor;-><init>()V
 HSPLcom/google/firebase/tracing/ComponentMonitor;->lambda$processRegistrar$0(Ljava/lang/String;Lcom/google/firebase/components/Component;Lcom/google/firebase/components/ComponentContainer;)Ljava/lang/Object;
 HSPLcom/google/firebase/tracing/ComponentMonitor;->processRegistrar(Lcom/google/firebase/components/ComponentRegistrar;)Ljava/util/List;
@@ -11434,13 +11713,14 @@ HSPLcom/squareup/wire/internal/Internal__InternalKt;->checkElementsNotNull(Ljava
 HSPLcom/squareup/wire/internal/Internal__InternalKt;->countNonNull(Ljava/lang/Object;Ljava/lang/Object;)I
 HSPLcom/squareup/wire/internal/Internal__InternalKt;->countNonNull(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)I
 HSPLcom/squareup/wire/internal/Internal__InternalKt;->countNonNull(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;[Ljava/lang/Object;)I
+HSPLcom/squareup/wire/internal/Internal__InternalKt;->immutableCopyOf(Ljava/lang/String;Ljava/util/List;)Ljava/util/List;
 HSPLio/reactivex/rxjava3/android/plugins/RxAndroidPlugins;->callRequireNonNull(Ljava/util/concurrent/Callable;)Lio/reactivex/rxjava3/core/Scheduler;
 HSPLio/reactivex/rxjava3/android/plugins/RxAndroidPlugins;->initMainThreadScheduler(Ljava/util/concurrent/Callable;)Lio/reactivex/rxjava3/core/Scheduler;
 HSPLio/reactivex/rxjava3/android/plugins/RxAndroidPlugins;->onMainThreadScheduler(Lio/reactivex/rxjava3/core/Scheduler;)Lio/reactivex/rxjava3/core/Scheduler;
 HSPLio/reactivex/rxjava3/android/schedulers/AndroidSchedulers$$ExternalSyntheticLambda0;-><init>()V
 HSPLio/reactivex/rxjava3/android/schedulers/AndroidSchedulers$$ExternalSyntheticLambda0;->call()Ljava/lang/Object;
 HSPLio/reactivex/rxjava3/android/schedulers/AndroidSchedulers$MainHolder;-><clinit>()V
-HSPLio/reactivex/rxjava3/android/schedulers/AndroidSchedulers;->$r8$lambda$rU6g57daHLH3vbmmB880Hk3ow8s()Lio/reactivex/rxjava3/core/Scheduler;
+HSPLio/reactivex/rxjava3/android/schedulers/AndroidSchedulers;->$r8$lambda$5aJzegSojaU5zBVA7VjDoizfc-M()Lio/reactivex/rxjava3/core/Scheduler;
 HSPLio/reactivex/rxjava3/android/schedulers/AndroidSchedulers;-><clinit>()V
 HSPLio/reactivex/rxjava3/android/schedulers/AndroidSchedulers;->lambda$static$0()Lio/reactivex/rxjava3/core/Scheduler;
 HSPLio/reactivex/rxjava3/android/schedulers/AndroidSchedulers;->mainThread()Lio/reactivex/rxjava3/core/Scheduler;
@@ -11577,6 +11857,7 @@ HSPLio/reactivex/rxjava3/core/Single;->subscribeOn(Lio/reactivex/rxjava3/core/Sc
 HSPLio/reactivex/rxjava3/core/Single;->toSingle(Lio/reactivex/rxjava3/core/Flowable;)Lio/reactivex/rxjava3/core/Single;
 HSPLio/reactivex/rxjava3/disposables/CompositeDisposable;-><init>()V
 HSPLio/reactivex/rxjava3/disposables/CompositeDisposable;->add(Lio/reactivex/rxjava3/disposables/Disposable;)Z
+HSPLio/reactivex/rxjava3/disposables/CompositeDisposable;->clear()V
 HSPLio/reactivex/rxjava3/disposables/CompositeDisposable;->delete(Lio/reactivex/rxjava3/disposables/Disposable;)Z
 HSPLio/reactivex/rxjava3/disposables/CompositeDisposable;->dispose()V
 HSPLio/reactivex/rxjava3/disposables/CompositeDisposable;->dispose(Lio/reactivex/rxjava3/internal/util/OpenHashSet;)V
@@ -11593,7 +11874,6 @@ HSPLio/reactivex/rxjava3/exceptions/Exceptions;->throwIfFatal(Ljava/lang/Throwab
 HSPLio/reactivex/rxjava3/flowables/ConnectableFlowable;-><init>()V
 HSPLio/reactivex/rxjava3/flowables/ConnectableFlowable;->refCount()Lio/reactivex/rxjava3/core/Flowable;
 HSPLio/reactivex/rxjava3/internal/disposables/CancellableDisposable;-><init>(Lio/reactivex/rxjava3/functions/Cancellable;)V
-HSPLio/reactivex/rxjava3/internal/disposables/CancellableDisposable;->dispose()V
 HSPLio/reactivex/rxjava3/internal/disposables/DisposableHelper;-><clinit>()V
 HSPLio/reactivex/rxjava3/internal/disposables/DisposableHelper;-><init>(Ljava/lang/String;I)V
 HSPLio/reactivex/rxjava3/internal/disposables/DisposableHelper;->dispose(Ljava/util/concurrent/atomic/AtomicReference;)Z
@@ -11784,9 +12064,7 @@ HSPLio/reactivex/rxjava3/internal/operators/flowable/FlowableReplay$BoundedRepla
 HSPLio/reactivex/rxjava3/internal/operators/flowable/FlowableReplay$BoundedReplayBuffer;->getHead()Lio/reactivex/rxjava3/internal/operators/flowable/FlowableReplay$Node;
 HSPLio/reactivex/rxjava3/internal/operators/flowable/FlowableReplay$BoundedReplayBuffer;->leaveTransform(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLio/reactivex/rxjava3/internal/operators/flowable/FlowableReplay$BoundedReplayBuffer;->next(Ljava/lang/Object;)V
-HSPLio/reactivex/rxjava3/internal/operators/flowable/FlowableReplay$BoundedReplayBuffer;->removeFirst()V
 HSPLio/reactivex/rxjava3/internal/operators/flowable/FlowableReplay$BoundedReplayBuffer;->replay(Lio/reactivex/rxjava3/internal/operators/flowable/FlowableReplay$InnerSubscription;)V
-HSPLio/reactivex/rxjava3/internal/operators/flowable/FlowableReplay$BoundedReplayBuffer;->setFirst(Lio/reactivex/rxjava3/internal/operators/flowable/FlowableReplay$Node;)V
 HSPLio/reactivex/rxjava3/internal/operators/flowable/FlowableReplay$DefaultUnboundedFactory;-><init>()V
 HSPLio/reactivex/rxjava3/internal/operators/flowable/FlowableReplay$InnerSubscription;-><init>(Lio/reactivex/rxjava3/internal/operators/flowable/FlowableReplay$ReplaySubscriber;Lorg/reactivestreams/Subscriber;)V
 HSPLio/reactivex/rxjava3/internal/operators/flowable/FlowableReplay$InnerSubscription;->index()Ljava/lang/Object;
@@ -11906,7 +12184,6 @@ HSPLio/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap$Conca
 HSPLio/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap;-><init>(Lio/reactivex/rxjava3/core/ObservableSource;Lio/reactivex/rxjava3/functions/Function;ILio/reactivex/rxjava3/internal/util/ErrorMode;)V
 HSPLio/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap;->subscribeActual(Lio/reactivex/rxjava3/core/Observer;)V
 HSPLio/reactivex/rxjava3/internal/operators/observable/ObservableCreate$CreateEmitter;-><init>(Lio/reactivex/rxjava3/core/Observer;)V
-HSPLio/reactivex/rxjava3/internal/operators/observable/ObservableCreate$CreateEmitter;->dispose()V
 HSPLio/reactivex/rxjava3/internal/operators/observable/ObservableCreate$CreateEmitter;->isDisposed()Z
 HSPLio/reactivex/rxjava3/internal/operators/observable/ObservableCreate$CreateEmitter;->onNext(Ljava/lang/Object;)V
 HSPLio/reactivex/rxjava3/internal/operators/observable/ObservableCreate$CreateEmitter;->setCancellable(Lio/reactivex/rxjava3/functions/Cancellable;)V
@@ -11987,9 +12264,7 @@ HSPLio/reactivex/rxjava3/internal/operators/observable/ObservableReplay$BoundedR
 HSPLio/reactivex/rxjava3/internal/operators/observable/ObservableReplay$BoundedReplayBuffer;->getHead()Lio/reactivex/rxjava3/internal/operators/observable/ObservableReplay$Node;
 HSPLio/reactivex/rxjava3/internal/operators/observable/ObservableReplay$BoundedReplayBuffer;->leaveTransform(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLio/reactivex/rxjava3/internal/operators/observable/ObservableReplay$BoundedReplayBuffer;->next(Ljava/lang/Object;)V
-HSPLio/reactivex/rxjava3/internal/operators/observable/ObservableReplay$BoundedReplayBuffer;->removeFirst()V
 HSPLio/reactivex/rxjava3/internal/operators/observable/ObservableReplay$BoundedReplayBuffer;->replay(Lio/reactivex/rxjava3/internal/operators/observable/ObservableReplay$InnerDisposable;)V
-HSPLio/reactivex/rxjava3/internal/operators/observable/ObservableReplay$BoundedReplayBuffer;->setFirst(Lio/reactivex/rxjava3/internal/operators/observable/ObservableReplay$Node;)V
 HSPLio/reactivex/rxjava3/internal/operators/observable/ObservableReplay$InnerDisposable;-><init>(Lio/reactivex/rxjava3/internal/operators/observable/ObservableReplay$ReplayObserver;Lio/reactivex/rxjava3/core/Observer;)V
 HSPLio/reactivex/rxjava3/internal/operators/observable/ObservableReplay$InnerDisposable;->dispose()V
 HSPLio/reactivex/rxjava3/internal/operators/observable/ObservableReplay$InnerDisposable;->index()Ljava/lang/Object;
@@ -12124,9 +12399,7 @@ HSPLio/reactivex/rxjava3/internal/queue/MpscLinkedQueue$LinkedQueueNode;->soNext
 HSPLio/reactivex/rxjava3/internal/queue/MpscLinkedQueue$LinkedQueueNode;->spValue(Ljava/lang/Object;)V
 HSPLio/reactivex/rxjava3/internal/queue/MpscLinkedQueue;-><init>()V
 HSPLio/reactivex/rxjava3/internal/queue/MpscLinkedQueue;->clear()V
-HSPLio/reactivex/rxjava3/internal/queue/MpscLinkedQueue;->isEmpty()Z
 HSPLio/reactivex/rxjava3/internal/queue/MpscLinkedQueue;->lpConsumerNode()Lio/reactivex/rxjava3/internal/queue/MpscLinkedQueue$LinkedQueueNode;
-HSPLio/reactivex/rxjava3/internal/queue/MpscLinkedQueue;->lvConsumerNode()Lio/reactivex/rxjava3/internal/queue/MpscLinkedQueue$LinkedQueueNode;
 HSPLio/reactivex/rxjava3/internal/queue/MpscLinkedQueue;->lvProducerNode()Lio/reactivex/rxjava3/internal/queue/MpscLinkedQueue$LinkedQueueNode;
 HSPLio/reactivex/rxjava3/internal/queue/MpscLinkedQueue;->offer(Ljava/lang/Object;)Z
 HSPLio/reactivex/rxjava3/internal/queue/MpscLinkedQueue;->poll()Ljava/lang/Object;
@@ -12163,7 +12436,6 @@ HSPLio/reactivex/rxjava3/internal/queue/SpscLinkedArrayQueue;->soProducerIndex(J
 HSPLio/reactivex/rxjava3/internal/queue/SpscLinkedArrayQueue;->writeToQueue(Ljava/util/concurrent/atomic/AtomicReferenceArray;Ljava/lang/Object;JI)Z
 HSPLio/reactivex/rxjava3/internal/schedulers/AbstractDirectTask;-><clinit>()V
 HSPLio/reactivex/rxjava3/internal/schedulers/AbstractDirectTask;-><init>(Ljava/lang/Runnable;Z)V
-HSPLio/reactivex/rxjava3/internal/schedulers/AbstractDirectTask;->cancelFuture(Ljava/util/concurrent/Future;)V
 HSPLio/reactivex/rxjava3/internal/schedulers/AbstractDirectTask;->dispose()V
 HSPLio/reactivex/rxjava3/internal/schedulers/AbstractDirectTask;->setFuture(Ljava/util/concurrent/Future;)V
 HSPLio/reactivex/rxjava3/internal/schedulers/DisposeOnCancel;-><init>(Lio/reactivex/rxjava3/disposables/Disposable;)V
@@ -12362,6 +12634,7 @@ HSPLio/reactivex/rxjava3/processors/BehaviorProcessor;->subscribeActual(Lorg/rea
 HSPLio/reactivex/rxjava3/processors/FlowableProcessor;-><init>()V
 HSPLio/reactivex/rxjava3/processors/PublishProcessor$PublishSubscription;-><init>(Lorg/reactivestreams/Subscriber;Lio/reactivex/rxjava3/processors/PublishProcessor;)V
 HSPLio/reactivex/rxjava3/processors/PublishProcessor$PublishSubscription;->isCancelled()Z
+HSPLio/reactivex/rxjava3/processors/PublishProcessor$PublishSubscription;->onNext(Ljava/lang/Object;)V
 HSPLio/reactivex/rxjava3/processors/PublishProcessor$PublishSubscription;->request(J)V
 HSPLio/reactivex/rxjava3/processors/PublishProcessor;-><clinit>()V
 HSPLio/reactivex/rxjava3/processors/PublishProcessor;-><init>()V
@@ -12415,182 +12688,175 @@ HSPLio/reactivex/rxjava3/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)
 HSPLio/reactivex/rxjava3/subjects/SerializedSubject;->subscribeActual(Lio/reactivex/rxjava3/core/Observer;)V
 HSPLio/reactivex/rxjava3/subjects/Subject;-><init>()V
 HSPLio/reactivex/rxjava3/subjects/Subject;->toSerialized()Lio/reactivex/rxjava3/subjects/Subject;
+HSPLj$/com/android/tools/r8/a;->e(JJ)J
+HSPLj$/com/android/tools/r8/a;->f(Lsun/misc/Unsafe;Ljava/lang/Object;JLjava/lang/Object;)Z
+HSPLj$/com/android/tools/r8/a;->g(JJ)J
+HSPLj$/com/android/tools/r8/a;->h(JJ)J
+HSPLj$/com/android/tools/r8/a;->i(JJ)J
 HSPLj$/time/DayOfWeek;-><clinit>()V
-HSPLj$/time/DayOfWeek;-><init>(Ljava/lang/String;I)V
 HSPLj$/time/DayOfWeek;->values()[Lj$/time/DayOfWeek;
 HSPLj$/time/Duration;-><clinit>()V
 HSPLj$/time/Duration;-><init>(JI)V
-HSPLj$/time/Duration;->d(JI)Lj$/time/Duration;
-HSPLj$/time/Duration;->f(J)Lj$/time/Duration;
+HSPLj$/time/Duration;->o(JI)Lj$/time/Duration;
 HSPLj$/time/Duration;->ofMillis(J)Lj$/time/Duration;
 HSPLj$/time/Duration;->ofSeconds(J)Lj$/time/Duration;
 HSPLj$/time/Duration;->ofSeconds(JJ)Lj$/time/Duration;
+HSPLj$/time/Duration;->q(J)Lj$/time/Duration;
 HSPLj$/time/Duration;->toDays()J
 HSPLj$/time/Instant;-><clinit>()V
 HSPLj$/time/Instant;-><init>(JI)V
+HSPLj$/time/Instant;->N(JI)Lj$/time/Instant;
 HSPLj$/time/Instant;->atOffset(Lj$/time/ZoneOffset;)Lj$/time/OffsetDateTime;
-HSPLj$/time/Instant;->atZone(Lj$/time/ZoneId;)Lj$/time/ZonedDateTime;
 HSPLj$/time/Instant;->getEpochSecond()J
 HSPLj$/time/Instant;->getNano()I
-HSPLj$/time/Instant;->n(JI)Lj$/time/Instant;
 HSPLj$/time/Instant;->ofEpochMilli(J)Lj$/time/Instant;
 HSPLj$/time/Instant;->ofEpochSecond(JJ)Lj$/time/Instant;
 HSPLj$/time/Instant;->toEpochMilli()J
 HSPLj$/time/LocalDate;-><clinit>()V
 HSPLj$/time/LocalDate;-><init>(III)V
-HSPLj$/time/LocalDate;->C(J)Lj$/time/LocalDate;
+HSPLj$/time/LocalDate;->D()Z
+HSPLj$/time/LocalDate;->N(III)Lj$/time/LocalDate;
+HSPLj$/time/LocalDate;->P(Lj$/time/temporal/TemporalField;)I
+HSPLj$/time/LocalDate;->a()Lj$/time/chrono/o;
+HSPLj$/time/LocalDate;->a0(III)Lj$/time/LocalDate;
+HSPLj$/time/LocalDate;->c0(J)Lj$/time/LocalDate;
+HSPLj$/time/LocalDate;->f0(J)Lj$/time/LocalDate;
 HSPLj$/time/LocalDate;->getLong(Lj$/time/temporal/TemporalField;)J
-HSPLj$/time/LocalDate;->o(III)Lj$/time/LocalDate;
-HSPLj$/time/LocalDate;->q(Lj$/time/temporal/TemporalField;)I
 HSPLj$/time/LocalDate;->toEpochDay()J
-HSPLj$/time/LocalDate;->w()Z
-HSPLj$/time/LocalDate;->x(III)Lj$/time/LocalDate;
-HSPLj$/time/LocalDate;->z(J)Lj$/time/LocalDate;
 HSPLj$/time/LocalDateTime;-><clinit>()V
 HSPLj$/time/LocalDateTime;-><init>(Lj$/time/LocalDate;Lj$/time/LocalTime;)V
-HSPLj$/time/LocalDateTime;->a()Lj$/time/chrono/e;
+HSPLj$/time/LocalDateTime;->Q(Lj$/time/LocalDate;Lj$/time/LocalTime;)Lj$/time/LocalDateTime;
+HSPLj$/time/LocalDateTime;->R(JILj$/time/ZoneOffset;)Lj$/time/LocalDateTime;
+HSPLj$/time/LocalDateTime;->W(Lj$/time/LocalDate;Lj$/time/LocalTime;)Lj$/time/LocalDateTime;
+HSPLj$/time/LocalDateTime;->a()Lj$/time/chrono/o;
+HSPLj$/time/LocalDateTime;->b()Lj$/time/chrono/e;
 HSPLj$/time/LocalDateTime;->format(Lj$/time/format/DateTimeFormatter;)Ljava/lang/String;
 HSPLj$/time/LocalDateTime;->getLong(Lj$/time/temporal/TemporalField;)J
-HSPLj$/time/LocalDateTime;->j(Lj$/time/temporal/m;)Ljava/lang/Object;
 HSPLj$/time/LocalDateTime;->now()Lj$/time/LocalDateTime;
 HSPLj$/time/LocalDateTime;->ofInstant(Lj$/time/Instant;Lj$/time/ZoneId;)Lj$/time/LocalDateTime;
-HSPLj$/time/LocalDateTime;->p(Lj$/time/c;)Lj$/time/LocalDateTime;
 HSPLj$/time/LocalDateTime;->plusDays(J)Lj$/time/LocalDateTime;
-HSPLj$/time/LocalDateTime;->s(Lj$/time/LocalDate;Lj$/time/LocalTime;)Lj$/time/LocalDateTime;
-HSPLj$/time/LocalDateTime;->t(JILj$/time/ZoneOffset;)Lj$/time/LocalDateTime;
 HSPLj$/time/LocalDateTime;->toEpochSecond(Lj$/time/ZoneOffset;)J
 HSPLj$/time/LocalDateTime;->toLocalTime()Lj$/time/LocalTime;
-HSPLj$/time/LocalDateTime;->w()Lj$/time/LocalDate;
 HSPLj$/time/LocalDateTime;->withHour(I)Lj$/time/LocalDateTime;
 HSPLj$/time/LocalDateTime;->withMinute(I)Lj$/time/LocalDateTime;
 HSPLj$/time/LocalDateTime;->withSecond(I)Lj$/time/LocalDateTime;
-HSPLj$/time/LocalDateTime;->y(Lj$/time/LocalDate;Lj$/time/LocalTime;)Lj$/time/LocalDateTime;
+HSPLj$/time/LocalDateTime;->x(Lj$/time/temporal/m;)Ljava/lang/Object;
 HSPLj$/time/LocalTime;-><clinit>()V
 HSPLj$/time/LocalTime;-><init>(IIII)V
-HSPLj$/time/LocalTime;->A(I)Lj$/time/LocalTime;
-HSPLj$/time/LocalTime;->B(I)Lj$/time/LocalTime;
-HSPLj$/time/LocalTime;->D(I)Lj$/time/LocalTime;
-HSPLj$/time/LocalTime;->n(IIII)Lj$/time/LocalTime;
-HSPLj$/time/LocalTime;->s(J)Lj$/time/LocalTime;
-HSPLj$/time/LocalTime;->y()I
+HSPLj$/time/LocalTime;->N(IIII)Lj$/time/LocalTime;
+HSPLj$/time/LocalTime;->S(J)Lj$/time/LocalTime;
+HSPLj$/time/LocalTime;->b0()I
+HSPLj$/time/LocalTime;->d0(I)Lj$/time/LocalTime;
+HSPLj$/time/LocalTime;->e0(I)Lj$/time/LocalTime;
+HSPLj$/time/LocalTime;->g0(I)Lj$/time/LocalTime;
 HSPLj$/time/OffsetDateTime;-><clinit>()V
 HSPLj$/time/OffsetDateTime;-><init>(Lj$/time/LocalDateTime;Lj$/time/ZoneOffset;)V
+HSPLj$/time/OffsetDateTime;->M(Lj$/time/LocalDateTime;Lj$/time/ZoneOffset;)Lj$/time/OffsetDateTime;
+HSPLj$/time/OffsetDateTime;->N(Lj$/time/Instant;Lj$/time/ZoneId;)Lj$/time/OffsetDateTime;
 HSPLj$/time/OffsetDateTime;->getOffset()Lj$/time/ZoneOffset;
-HSPLj$/time/OffsetDateTime;->m(Lj$/time/LocalDateTime;Lj$/time/ZoneOffset;)Lj$/time/OffsetDateTime;
-HSPLj$/time/OffsetDateTime;->n(Lj$/time/Instant;Lj$/time/ZoneId;)Lj$/time/OffsetDateTime;
 HSPLj$/time/OffsetDateTime;->now(Lj$/time/ZoneId;)Lj$/time/OffsetDateTime;
 HSPLj$/time/OffsetDateTime;->toLocalDateTime()Lj$/time/LocalDateTime;
 HSPLj$/time/ZoneId;-><clinit>()V
 HSPLj$/time/ZoneId;-><init>()V
+HSPLj$/time/ZoneId;->N(Ljava/lang/String;Z)Lj$/time/ZoneId;
 HSPLj$/time/ZoneId;->of(Ljava/lang/String;)Lj$/time/ZoneId;
 HSPLj$/time/ZoneId;->systemDefault()Lj$/time/ZoneId;
 HSPLj$/time/ZoneOffset;-><clinit>()V
 HSPLj$/time/ZoneOffset;-><init>(I)V
-HSPLj$/time/ZoneOffset;->n()Lj$/time/zone/c;
-HSPLj$/time/ZoneOffset;->o()I
-HSPLj$/time/ZoneOffset;->r(I)Lj$/time/ZoneOffset;
-HSPLj$/time/ZonedDateTime;-><init>(Lj$/time/LocalDateTime;Lj$/time/ZoneId;Lj$/time/ZoneOffset;)V
-HSPLj$/time/ZonedDateTime;->m(JILj$/time/ZoneId;)Lj$/time/ZonedDateTime;
-HSPLj$/time/ZonedDateTime;->n(Lj$/time/Instant;Lj$/time/ZoneId;)Lj$/time/ZonedDateTime;
-HSPLj$/time/ZonedDateTime;->toLocalDate()Lj$/time/LocalDate;
-HSPLj$/time/a;->g(JJ)J
-HSPLj$/time/a;->h(Lsun/misc/Unsafe;Ljava/lang/Object;JLjava/lang/Object;Ljava/lang/Object;)Z
-HSPLj$/time/a;->i(JJ)J
-HSPLj$/time/a;->j(JJ)J
-HSPLj$/time/a;->k(JJ)J
-HSPLj$/time/b;-><init>(Lj$/time/ZoneId;)V
-HSPLj$/time/b;->a()Lj$/time/ZoneId;
-HSPLj$/time/c;-><init>()V
-HSPLj$/time/chrono/a;-><clinit>()V
+HSPLj$/time/ZoneOffset;->M()Lj$/time/zone/f;
+HSPLj$/time/ZoneOffset;->R()I
+HSPLj$/time/ZoneOffset;->U(I)Lj$/time/ZoneOffset;
+HSPLj$/time/a;-><init>(Lj$/time/ZoneId;)V
+HSPLj$/time/a;->a()Lj$/time/ZoneId;
+HSPLj$/time/b;-><init>()V
+HSPLj$/time/b;->c()Lj$/time/b;
 HSPLj$/time/chrono/a;-><init>()V
-HSPLj$/time/chrono/f;-><clinit>()V
-HSPLj$/time/chrono/f;-><init>()V
-HSPLj$/time/chrono/f;->f(J)Z
+HSPLj$/time/chrono/b;-><init>()V
+HSPLj$/time/chrono/c;-><init>()V
+HSPLj$/time/chrono/d;-><clinit>()V
+HSPLj$/time/chrono/d;-><init>()V
+HSPLj$/time/chrono/k;->k(Lj$/time/chrono/ChronoLocalDateTime;Lj$/time/temporal/m;)Ljava/lang/Object;
+HSPLj$/time/chrono/k;->n(Lj$/time/chrono/ChronoLocalDateTime;Lj$/time/ZoneOffset;)J
+HSPLj$/time/chrono/v;-><clinit>()V
+HSPLj$/time/chrono/v;-><init>()V
+HSPLj$/time/chrono/v;->K(J)Z
 HSPLj$/time/f;-><clinit>()V
-HSPLj$/time/format/B;-><init>(Lj$/time/temporal/TemporalAccessor;Lj$/time/format/DateTimeFormatter;)V
-HSPLj$/time/format/B;->b()Lj$/time/format/E;
-HSPLj$/time/format/B;->e(Lj$/time/temporal/TemporalField;)Ljava/lang/Long;
+HSPLj$/time/format/A;-><init>(Lj$/time/temporal/TemporalAccessor;Lj$/time/format/DateTimeFormatter;)V
+HSPLj$/time/format/A;->b()Lj$/time/format/E;
+HSPLj$/time/format/A;->e(Lj$/time/temporal/TemporalField;)Ljava/lang/Long;
+HSPLj$/time/format/B;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
 HSPLj$/time/format/C;-><init>(Ljava/util/Map;)V
 HSPLj$/time/format/D;-><clinit>()V
-HSPLj$/time/format/D;-><init>()V
 HSPLj$/time/format/D;->a()Ljava/util/Comparator;
 HSPLj$/time/format/DateTimeFormatter;-><clinit>()V
-HSPLj$/time/format/DateTimeFormatter;-><init>(Lj$/time/format/f;Ljava/util/Locale;Lj$/time/format/G;Lj$/time/chrono/f;)V
-HSPLj$/time/format/DateTimeFormatter;->a()Lj$/time/chrono/e;
+HSPLj$/time/format/DateTimeFormatter;-><init>(Lj$/time/format/e;Ljava/util/Locale;Lj$/time/format/G;Lj$/time/chrono/v;)V
+HSPLj$/time/format/DateTimeFormatter;->a()Lj$/time/chrono/o;
 HSPLj$/time/format/DateTimeFormatter;->b()Lj$/time/format/E;
 HSPLj$/time/format/DateTimeFormatter;->d()Lj$/time/ZoneId;
-HSPLj$/time/format/DateTimeFormatter;->f()Lj$/time/format/f;
+HSPLj$/time/format/DateTimeFormatter;->f()Lj$/time/format/e;
 HSPLj$/time/format/DateTimeFormatter;->format(Lj$/time/temporal/TemporalAccessor;)Ljava/lang/String;
 HSPLj$/time/format/E;-><clinit>()V
-HSPLj$/time/format/E;-><init>()V
 HSPLj$/time/format/G;-><clinit>()V
-HSPLj$/time/format/G;-><init>(Ljava/lang/String;I)V
 HSPLj$/time/format/H;-><clinit>()V
-HSPLj$/time/format/H;-><init>(Ljava/lang/String;I)V
 HSPLj$/time/format/H;->values()[Lj$/time/format/H;
 HSPLj$/time/format/TextStyle;-><clinit>()V
 HSPLj$/time/format/TextStyle;-><init>(Ljava/lang/String;II)V
-HSPLj$/time/format/a;-><init>()V
 HSPLj$/time/format/b;-><init>(Lj$/time/format/C;)V
-HSPLj$/time/format/c;-><init>()V
-HSPLj$/time/format/c;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
-HSPLj$/time/format/d;-><clinit>()V
-HSPLj$/time/format/e;-><init>(C)V
-HSPLj$/time/format/e;->b(Lj$/time/format/B;Ljava/lang/StringBuilder;)Z
-HSPLj$/time/format/f;-><init>(Ljava/util/List;Z)V
-HSPLj$/time/format/f;-><init>([Lj$/time/format/g;Z)V
-HSPLj$/time/format/f;->a()Lj$/time/format/f;
-HSPLj$/time/format/f;->b(Lj$/time/format/B;Ljava/lang/StringBuilder;)Z
-HSPLj$/time/format/h;-><init>(Lj$/time/temporal/ChronoField;IIZ)V
-HSPLj$/time/format/i;-><init>()V
-HSPLj$/time/format/j;-><init>(Ljava/lang/Object;I)V
+HSPLj$/time/format/c;-><clinit>()V
+HSPLj$/time/format/d;-><init>(C)V
+HSPLj$/time/format/d;->m(Lj$/time/format/A;Ljava/lang/StringBuilder;)Z
+HSPLj$/time/format/e;-><init>(Ljava/util/ArrayList;Z)V
+HSPLj$/time/format/e;-><init>([Lj$/time/format/f;Z)V
+HSPLj$/time/format/e;->a()Lj$/time/format/e;
+HSPLj$/time/format/e;->m(Lj$/time/format/A;Ljava/lang/StringBuilder;)Z
+HSPLj$/time/format/g;-><init>(Lj$/time/temporal/ChronoField;IIZ)V
+HSPLj$/time/format/i;-><init>(Ljava/lang/Object;I)V
+HSPLj$/time/format/k;-><clinit>()V
+HSPLj$/time/format/k;-><init>(Lj$/time/temporal/TemporalField;IILj$/time/format/H;)V
+HSPLj$/time/format/k;-><init>(Lj$/time/temporal/TemporalField;IILj$/time/format/H;I)V
+HSPLj$/time/format/k;->a(Lj$/time/format/k;)Lj$/time/format/H;
+HSPLj$/time/format/k;->b(Lj$/time/format/A;J)J
+HSPLj$/time/format/k;->e()Lj$/time/format/k;
+HSPLj$/time/format/k;->f(I)Lj$/time/format/k;
+HSPLj$/time/format/k;->m(Lj$/time/format/A;Ljava/lang/StringBuilder;)Z
 HSPLj$/time/format/l;-><clinit>()V
-HSPLj$/time/format/l;-><init>(Lj$/time/temporal/TemporalField;IILj$/time/format/H;)V
-HSPLj$/time/format/l;-><init>(Lj$/time/temporal/TemporalField;IILj$/time/format/H;I)V
-HSPLj$/time/format/l;->a(Lj$/time/format/l;)Lj$/time/format/H;
-HSPLj$/time/format/l;->b(Lj$/time/format/B;Ljava/lang/StringBuilder;)Z
-HSPLj$/time/format/l;->c(Lj$/time/format/B;J)J
-HSPLj$/time/format/l;->g()Lj$/time/format/l;
-HSPLj$/time/format/l;->h(I)Lj$/time/format/l;
-HSPLj$/time/format/m;-><clinit>()V
-HSPLj$/time/format/m;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-HSPLj$/time/format/s;-><clinit>()V
-HSPLj$/time/format/s;-><init>(Ljava/lang/String;I)V
-HSPLj$/time/format/t;-><init>(Lj$/time/temporal/TemporalField;Lj$/time/format/TextStyle;Lj$/time/format/D;)V
-HSPLj$/time/format/v;-><init>(Lj$/time/temporal/m;Ljava/lang/String;)V
-HSPLj$/time/format/x;-><clinit>()V
-HSPLj$/time/format/x;-><init>()V
-HSPLj$/time/format/x;-><init>(Lj$/time/format/x;)V
-HSPLj$/time/format/x;->a(Lj$/time/format/DateTimeFormatter;)V
-HSPLj$/time/format/x;->b(Lj$/time/temporal/ChronoField;IIZ)V
-HSPLj$/time/format/x;->c()V
-HSPLj$/time/format/x;->d(Lj$/time/format/g;)I
-HSPLj$/time/format/x;->e(C)V
-HSPLj$/time/format/x;->f(Ljava/lang/String;)V
-HSPLj$/time/format/x;->h(Ljava/lang/String;Ljava/lang/String;)V
-HSPLj$/time/format/x;->i()V
-HSPLj$/time/format/x;->k(Lj$/time/temporal/ChronoField;Ljava/util/Map;)V
-HSPLj$/time/format/x;->m(Lj$/time/temporal/TemporalField;IILj$/time/format/H;)Lj$/time/format/x;
-HSPLj$/time/format/x;->n(Lj$/time/format/l;)V
-HSPLj$/time/format/x;->o(Lj$/time/temporal/TemporalField;I)V
-HSPLj$/time/format/x;->p()V
-HSPLj$/time/format/x;->q()V
-HSPLj$/time/format/x;->r()V
-HSPLj$/time/format/x;->s()V
-HSPLj$/time/format/x;->t()V
-HSPLj$/time/format/x;->u()V
-HSPLj$/time/format/x;->v(Lj$/time/format/G;Lj$/time/chrono/f;)Lj$/time/format/DateTimeFormatter;
-HSPLj$/time/format/x;->x(Ljava/util/Locale;Lj$/time/format/G;Lj$/time/chrono/f;)Lj$/time/format/DateTimeFormatter;
-HSPLj$/time/l;-><init>(Ljava/lang/String;Lj$/time/zone/c;)V
-HSPLj$/time/l;->n()Lj$/time/zone/c;
-HSPLj$/time/l;->o(Ljava/lang/String;)Lj$/time/l;
+HSPLj$/time/format/l;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+HSPLj$/time/format/r;-><clinit>()V
+HSPLj$/time/format/s;-><init>(Lj$/time/temporal/TemporalField;Lj$/time/format/TextStyle;Lj$/time/format/D;)V
+HSPLj$/time/format/u;-><init>(Lj$/time/temporal/m;Ljava/lang/String;)V
+HSPLj$/time/format/w;-><clinit>()V
+HSPLj$/time/format/w;-><init>()V
+HSPLj$/time/format/w;-><init>(Lj$/time/format/w;)V
+HSPLj$/time/format/w;->a(Lj$/time/format/DateTimeFormatter;)V
+HSPLj$/time/format/w;->b(Lj$/time/temporal/ChronoField;IIZ)V
+HSPLj$/time/format/w;->c()V
+HSPLj$/time/format/w;->d(Lj$/time/format/f;)I
+HSPLj$/time/format/w;->e(C)V
+HSPLj$/time/format/w;->f(Ljava/lang/String;)V
+HSPLj$/time/format/w;->i(Ljava/lang/String;Ljava/lang/String;)V
+HSPLj$/time/format/w;->j()V
+HSPLj$/time/format/w;->l(Lj$/time/temporal/ChronoField;Ljava/util/HashMap;)V
+HSPLj$/time/format/w;->n(Lj$/time/format/k;)V
+HSPLj$/time/format/w;->p(Lj$/time/temporal/TemporalField;I)V
+HSPLj$/time/format/w;->q(Lj$/time/temporal/TemporalField;IILj$/time/format/H;)V
+HSPLj$/time/format/w;->r()V
+HSPLj$/time/format/w;->s()V
+HSPLj$/time/format/w;->t()V
+HSPLj$/time/format/w;->u()V
+HSPLj$/time/format/w;->v()V
+HSPLj$/time/format/w;->w()V
+HSPLj$/time/format/w;->x(Lj$/time/format/G;Lj$/time/chrono/v;)Lj$/time/format/DateTimeFormatter;
+HSPLj$/time/format/w;->z(Ljava/util/Locale;Lj$/time/format/G;Lj$/time/chrono/v;)Lj$/time/format/DateTimeFormatter;
+HSPLj$/time/s;-><init>(Ljava/lang/String;Lj$/time/zone/f;)V
+HSPLj$/time/s;->M()Lj$/time/zone/f;
+HSPLj$/time/s;->Q(Ljava/lang/String;Z)Lj$/time/s;
 HSPLj$/time/temporal/ChronoField;-><clinit>()V
 HSPLj$/time/temporal/ChronoField;-><init>(Ljava/lang/String;ILjava/lang/String;Lj$/time/temporal/ChronoUnit;Lj$/time/temporal/ChronoUnit;Lj$/time/temporal/o;)V
 HSPLj$/time/temporal/ChronoField;-><init>(Ljava/lang/String;ILjava/lang/String;Lj$/time/temporal/ChronoUnit;Lj$/time/temporal/ChronoUnit;Lj$/time/temporal/o;I)V
-HSPLj$/time/temporal/ChronoField;->d()Lj$/time/temporal/o;
-HSPLj$/time/temporal/ChronoField;->f()Z
-HSPLj$/time/temporal/ChronoField;->m(J)I
-HSPLj$/time/temporal/ChronoField;->n(J)V
+HSPLj$/time/temporal/ChronoField;->N(J)I
+HSPLj$/time/temporal/ChronoField;->O(J)V
+HSPLj$/time/temporal/ChronoField;->P()Z
+HSPLj$/time/temporal/ChronoField;->m()Lj$/time/temporal/o;
 HSPLj$/time/temporal/ChronoField;->values()[Lj$/time/temporal/ChronoField;
 HSPLj$/time/temporal/ChronoUnit;-><clinit>()V
 HSPLj$/time/temporal/ChronoUnit;-><init>(Ljava/lang/String;ILjava/lang/String;Lj$/time/Duration;)V
@@ -12600,42 +12866,39 @@ HSPLj$/time/temporal/c;-><init>()V
 HSPLj$/time/temporal/d;-><init>()V
 HSPLj$/time/temporal/e;-><init>()V
 HSPLj$/time/temporal/f;-><clinit>()V
-HSPLj$/time/temporal/f;-><init>(Ljava/lang/String;I)V
 HSPLj$/time/temporal/g;-><clinit>()V
 HSPLj$/time/temporal/g;-><init>(Ljava/lang/String;ILjava/lang/String;Lj$/time/Duration;)V
 HSPLj$/time/temporal/h;-><clinit>()V
-HSPLj$/time/temporal/k;-><init>(I)V
-HSPLj$/time/temporal/l;-><clinit>()V
-HSPLj$/time/temporal/l;->a()Lj$/time/temporal/k;
-HSPLj$/time/temporal/l;->b()Lj$/time/temporal/k;
-HSPLj$/time/temporal/l;->c()Lj$/time/temporal/k;
-HSPLj$/time/temporal/l;->d()Lj$/time/temporal/k;
-HSPLj$/time/temporal/l;->f()Lj$/time/temporal/k;
-HSPLj$/time/temporal/l;->g()Lj$/time/temporal/k;
+HSPLj$/time/temporal/j;-><clinit>()V
+HSPLj$/time/temporal/j;->e()Lj$/time/temporal/l;
+HSPLj$/time/temporal/j;->f()Lj$/time/temporal/l;
+HSPLj$/time/temporal/j;->g()Lj$/time/temporal/l;
+HSPLj$/time/temporal/j;->i()Lj$/time/temporal/l;
+HSPLj$/time/temporal/j;->k()Lj$/time/temporal/l;
+HSPLj$/time/temporal/j;->l()Lj$/time/temporal/l;
+HSPLj$/time/temporal/l;-><init>(I)V
 HSPLj$/time/temporal/o;-><init>(JJJJ)V
 HSPLj$/time/temporal/o;->a(JLj$/time/temporal/TemporalField;)I
 HSPLj$/time/temporal/o;->b(JLj$/time/temporal/TemporalField;)V
-HSPLj$/time/temporal/o;->f()Z
 HSPLj$/time/temporal/o;->g()Z
-HSPLj$/time/temporal/o;->h(J)Z
-HSPLj$/time/temporal/o;->i(JJ)Lj$/time/temporal/o;
-HSPLj$/time/temporal/o;->j(JJJ)Lj$/time/temporal/o;
-HSPLj$/time/temporal/o;->k(JJ)Lj$/time/temporal/o;
-HSPLj$/time/zone/c;-><clinit>()V
-HSPLj$/time/zone/c;-><init>(Lj$/time/ZoneOffset;)V
-HSPLj$/time/zone/c;-><init>(Ljava/util/TimeZone;)V
-HSPLj$/time/zone/c;->d(Lj$/time/Instant;)Lj$/time/ZoneOffset;
-HSPLj$/time/zone/c;->j(Lj$/time/ZoneOffset;)Lj$/time/zone/c;
-HSPLj$/time/zone/c;->k(I)Lj$/time/ZoneOffset;
-HSPLj$/time/zone/e;-><init>(Ljava/util/List;)V
-HSPLj$/time/zone/e;->run()Ljava/lang/Object;
-HSPLj$/time/zone/f;-><init>()V
-HSPLj$/time/zone/f;->c(Ljava/lang/String;)Lj$/time/zone/c;
-HSPLj$/time/zone/f;->d()Ljava/util/Set;
-HSPLj$/time/zone/g;-><clinit>()V
-HSPLj$/time/zone/g;-><init>()V
-HSPLj$/time/zone/g;->b(Ljava/lang/String;Z)Lj$/time/zone/c;
-HSPLj$/time/zone/g;->e(Lj$/time/zone/g;)V
+HSPLj$/time/temporal/o;->h()Z
+HSPLj$/time/temporal/o;->i(J)Z
+HSPLj$/time/temporal/o;->j(JJ)Lj$/time/temporal/o;
+HSPLj$/time/temporal/o;->k(JJJ)Lj$/time/temporal/o;
+HSPLj$/time/zone/f;-><clinit>()V
+HSPLj$/time/zone/f;-><init>(Lj$/time/ZoneOffset;)V
+HSPLj$/time/zone/f;-><init>(Ljava/util/TimeZone;)V
+HSPLj$/time/zone/f;->d(Lj$/time/Instant;)Lj$/time/ZoneOffset;
+HSPLj$/time/zone/f;->j(Lj$/time/ZoneOffset;)Lj$/time/zone/f;
+HSPLj$/time/zone/f;->k(I)Lj$/time/ZoneOffset;
+HSPLj$/time/zone/h;-><init>(Ljava/util/ArrayList;)V
+HSPLj$/time/zone/h;->run()Ljava/lang/Object;
+HSPLj$/time/zone/i;-><init>()V
+HSPLj$/time/zone/i;->c(Ljava/lang/String;)Lj$/time/zone/f;
+HSPLj$/time/zone/i;->d()Ljava/util/Set;
+HSPLj$/time/zone/j;-><clinit>()V
+HSPLj$/time/zone/j;->b(Ljava/lang/String;Z)Lj$/time/zone/f;
+HSPLj$/time/zone/j;->e(Lj$/time/zone/j;)V
 HSPLj$/util/Collection$-CC;->$default$removeIf(Ljava/util/Collection;Lj$/util/function/Predicate;)Z
 HSPLj$/util/Collection$-CC;->$default$stream(Ljava/util/Collection;)Lj$/util/stream/Stream;
 HSPLj$/util/Collection$-EL;->b(Ljava/util/Collection;)Lj$/util/Spliterator;
@@ -12652,7 +12915,7 @@ HSPLj$/util/List$-CC;->$default$spliterator(Ljava/util/List;)Lj$/util/Spliterato
 HSPLj$/util/List$-EL;->sort(Ljava/util/List;Ljava/util/Comparator;)V
 HSPLj$/util/Map$-CC;->$default$getOrDefault(Ljava/util/Map;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 HSPLj$/util/Map$-CC;->$default$putIfAbsent(Ljava/util/Map;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-HSPLj$/util/Map$-EL;->b(Ljava/util/Map;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+HSPLj$/util/Map$-EL;->c(Ljava/util/Map;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 HSPLj$/util/Map$-EL;->getOrDefault(Ljava/util/Map;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 HSPLj$/util/Optional;-><clinit>()V
 HSPLj$/util/Optional;-><init>()V
@@ -12660,70 +12923,60 @@ HSPLj$/util/Optional;-><init>(Ljava/lang/Object;)V
 HSPLj$/util/Optional;->empty()Lj$/util/Optional;
 HSPLj$/util/Optional;->equals(Ljava/lang/Object;)Z
 HSPLj$/util/Optional;->get()Ljava/lang/Object;
-HSPLj$/util/Optional;->ifPresent(Lj$/util/function/Consumer;)V
 HSPLj$/util/Optional;->isPresent()Z
 HSPLj$/util/Optional;->map(Lj$/util/function/Function;)Lj$/util/Optional;
 HSPLj$/util/Optional;->of(Ljava/lang/Object;)Lj$/util/Optional;
+HSPLj$/util/Optional;->ofNullable(Ljava/lang/Object;)Lj$/util/Optional;
 HSPLj$/util/Optional;->orElse(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLj$/util/S;-><init>([Ljava/lang/Object;III)V
 HSPLj$/util/S;->a(Lj$/util/function/Consumer;)V
 HSPLj$/util/S;->characteristics()I
 HSPLj$/util/S;->estimateSize()J
 HSPLj$/util/S;->getExactSizeIfKnown()J
-HSPLj$/util/S;->p(Lj$/util/function/Consumer;)Z
-HSPLj$/util/U;-><init>()V
-HSPLj$/util/V;-><init>()V
-HSPLj$/util/W;-><init>()V
-HSPLj$/util/X;-><init>()V
 HSPLj$/util/Z;-><init>(Ljava/util/Collection;I)V
 HSPLj$/util/Z;->a(Lj$/util/function/Consumer;)V
 HSPLj$/util/Z;->characteristics()I
 HSPLj$/util/Z;->estimateSize()J
 HSPLj$/util/Z;->getExactSizeIfKnown()J
-HSPLj$/util/Z;->p(Lj$/util/function/Consumer;)Z
+HSPLj$/util/Z;->r(Lj$/util/function/Consumer;)Z
 HSPLj$/util/b0;-><clinit>()V
 HSPLj$/util/b0;->a(III)V
 HSPLj$/util/b0;->m([Ljava/lang/Object;II)Lj$/util/Spliterator;
 HSPLj$/util/c;-><clinit>()V
-HSPLj$/util/c;-><init>()V
 HSPLj$/util/concurrent/ConcurrentHashMap;-><clinit>()V
 HSPLj$/util/concurrent/ConcurrentHashMap;-><init>()V
 HSPLj$/util/concurrent/ConcurrentHashMap;-><init>(IFI)V
-HSPLj$/util/concurrent/ConcurrentHashMap;->addCount(JI)V
-HSPLj$/util/concurrent/ConcurrentHashMap;->casTabAt([Lj$/util/concurrent/l;ILj$/util/concurrent/l;Lj$/util/concurrent/l;)Z
+HSPLj$/util/concurrent/ConcurrentHashMap;->b([Lj$/util/concurrent/l;ILj$/util/concurrent/l;)Z
+HSPLj$/util/concurrent/ConcurrentHashMap;->c(Ljava/lang/Object;)Ljava/lang/Class;
 HSPLj$/util/concurrent/ConcurrentHashMap;->clear()V
-HSPLj$/util/concurrent/ConcurrentHashMap;->comparableClassFor(Ljava/lang/Object;)Ljava/lang/Class;
 HSPLj$/util/concurrent/ConcurrentHashMap;->containsKey(Ljava/lang/Object;)Z
 HSPLj$/util/concurrent/ConcurrentHashMap;->entrySet()Ljava/util/Set;
+HSPLj$/util/concurrent/ConcurrentHashMap;->f()[Lj$/util/concurrent/l;
+HSPLj$/util/concurrent/ConcurrentHashMap;->g(Ljava/lang/Object;Ljava/lang/Object;Z)Ljava/lang/Object;
 HSPLj$/util/concurrent/ConcurrentHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLj$/util/concurrent/ConcurrentHashMap;->initTable()[Lj$/util/concurrent/l;
+HSPLj$/util/concurrent/ConcurrentHashMap;->h(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+HSPLj$/util/concurrent/ConcurrentHashMap;->i([Lj$/util/concurrent/l;ILj$/util/concurrent/l;)V
 HSPLj$/util/concurrent/ConcurrentHashMap;->isEmpty()Z
+HSPLj$/util/concurrent/ConcurrentHashMap;->j(I)I
+HSPLj$/util/concurrent/ConcurrentHashMap;->k()J
 HSPLj$/util/concurrent/ConcurrentHashMap;->keySet()Ljava/util/Set;
-HSPLj$/util/concurrent/ConcurrentHashMap;->mappingCount()J
+HSPLj$/util/concurrent/ConcurrentHashMap;->l([Lj$/util/concurrent/l;I)Lj$/util/concurrent/l;
+HSPLj$/util/concurrent/ConcurrentHashMap;->m(I)I
+HSPLj$/util/concurrent/ConcurrentHashMap;->n([Lj$/util/concurrent/l;[Lj$/util/concurrent/l;)V
+HSPLj$/util/concurrent/ConcurrentHashMap;->o([Lj$/util/concurrent/l;I)V
 HSPLj$/util/concurrent/ConcurrentHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 HSPLj$/util/concurrent/ConcurrentHashMap;->putIfAbsent(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+HSPLj$/util/concurrent/ConcurrentHashMap;->q(Lj$/util/concurrent/r;)Lj$/util/concurrent/l;
 HSPLj$/util/concurrent/ConcurrentHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLj$/util/concurrent/ConcurrentHashMap;->replaceNode(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-HSPLj$/util/concurrent/ConcurrentHashMap;->resizeStamp(I)I
-HSPLj$/util/concurrent/ConcurrentHashMap;->setTabAt([Lj$/util/concurrent/l;ILj$/util/concurrent/l;)V
 HSPLj$/util/concurrent/ConcurrentHashMap;->size()I
-HSPLj$/util/concurrent/ConcurrentHashMap;->spread(I)I
-HSPLj$/util/concurrent/ConcurrentHashMap;->sumCount()J
-HSPLj$/util/concurrent/ConcurrentHashMap;->tabAt([Lj$/util/concurrent/l;I)Lj$/util/concurrent/l;
-HSPLj$/util/concurrent/ConcurrentHashMap;->tableSizeFor(I)I
-HSPLj$/util/concurrent/ConcurrentHashMap;->transfer([Lj$/util/concurrent/l;[Lj$/util/concurrent/l;)V
-HSPLj$/util/concurrent/ConcurrentHashMap;->treeifyBin([Lj$/util/concurrent/l;I)V
 HSPLj$/util/concurrent/a;-><init>([Lj$/util/concurrent/l;IILj$/util/concurrent/ConcurrentHashMap;)V
 HSPLj$/util/concurrent/a;->hasNext()Z
 HSPLj$/util/concurrent/b;-><init>(Lj$/util/concurrent/ConcurrentHashMap;)V
 HSPLj$/util/concurrent/b;->toArray()[Ljava/lang/Object;
-HSPLj$/util/concurrent/d;-><init>([Lj$/util/concurrent/l;IILj$/util/concurrent/ConcurrentHashMap;)V
-HSPLj$/util/concurrent/e;-><init>(Lj$/util/concurrent/ConcurrentHashMap;)V
 HSPLj$/util/concurrent/e;->iterator()Ljava/util/Iterator;
 HSPLj$/util/concurrent/g;-><init>([Lj$/util/concurrent/l;)V
 HSPLj$/util/concurrent/h;-><init>([Lj$/util/concurrent/l;IILj$/util/concurrent/ConcurrentHashMap;I)V
 HSPLj$/util/concurrent/h;->next()Ljava/lang/Object;
-HSPLj$/util/concurrent/i;-><init>(Lj$/util/concurrent/ConcurrentHashMap;)V
 HSPLj$/util/concurrent/i;->iterator()Ljava/util/Iterator;
 HSPLj$/util/concurrent/l;-><init>(ILjava/lang/Object;Ljava/lang/Object;Lj$/util/concurrent/l;)V
 HSPLj$/util/concurrent/p;-><init>([Lj$/util/concurrent/l;III)V
@@ -12748,142 +13001,99 @@ HSPLj$/util/d;->get(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLj$/util/d;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 HSPLj$/util/d;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLj$/util/d;->values()Ljava/util/Collection;
-HSPLj$/util/function/b;-><init>(Ljava/util/Comparator;I)V
-HSPLj$/util/m;-><init>()V
-HSPLj$/util/m;->j(Lj$/util/Spliterator;)J
-HSPLj$/util/m;->y(Ljava/lang/Object;Ljava/lang/Object;)Z
-HSPLj$/util/stream/A1;-><init>(Lj$/util/stream/V2;Ljava/lang/Object;I)V
-HSPLj$/util/stream/A1;->l1()Lj$/util/stream/P1;
-HSPLj$/util/stream/B2;-><init>(Lj$/util/stream/c;)V
-HSPLj$/util/stream/B2;->B1(ILj$/util/stream/g2;)Lj$/util/stream/g2;
-HSPLj$/util/stream/C2;-><init>(Lj$/util/stream/g2;Ljava/util/Comparator;)V
+HSPLj$/util/stream/B2;-><init>(Lj$/util/stream/b;)V
+HSPLj$/util/stream/B2;->u0(ILj$/util/stream/g2;)Lj$/util/stream/g2;
 HSPLj$/util/stream/C2;->l()V
 HSPLj$/util/stream/C2;->m(J)V
 HSPLj$/util/stream/Collector$Characteristics;-><clinit>()V
-HSPLj$/util/stream/Collector$Characteristics;-><init>(Ljava/lang/String;I)V
 HSPLj$/util/stream/Collector$Characteristics;->values()[Lj$/util/stream/Collector$Characteristics;
 HSPLj$/util/stream/Collectors;-><clinit>()V
 HSPLj$/util/stream/Collectors;->toList()Lj$/util/stream/Collector;
 HSPLj$/util/stream/Collectors;->toSet()Lj$/util/stream/Collector;
-HSPLj$/util/stream/E1;-><init>(Lj$/util/function/BinaryOperator;)V
-HSPLj$/util/stream/E1;->accept(Ljava/lang/Object;)V
-HSPLj$/util/stream/E1;->get()Ljava/lang/Object;
-HSPLj$/util/stream/E1;->l()V
-HSPLj$/util/stream/E1;->m(J)V
-HSPLj$/util/stream/E1;->q()Z
-HSPLj$/util/stream/F1;-><init>(Lj$/util/stream/V2;Lj$/util/function/BinaryOperator;Lj$/util/function/BiConsumer;Lj$/util/function/Supplier;Lj$/util/stream/Collector;)V
-HSPLj$/util/stream/F1;->l1()Lj$/util/stream/P1;
-HSPLj$/util/stream/F1;->p()I
-HSPLj$/util/stream/G1;-><init>(Lj$/util/function/Supplier;Lj$/util/function/BiConsumer;Lj$/util/function/BinaryOperator;)V
-HSPLj$/util/stream/G1;->accept(Ljava/lang/Object;)V
-HSPLj$/util/stream/G1;->l()V
-HSPLj$/util/stream/G1;->m(J)V
-HSPLj$/util/stream/H;-><init>(I)V
-HSPLj$/util/stream/I;-><init>(ZLj$/util/stream/V2;Ljava/lang/Object;Lj$/util/function/Predicate;Lj$/util/stream/b;)V
-HSPLj$/util/stream/I;->f0(Lj$/util/stream/w0;Lj$/util/Spliterator;)Ljava/lang/Object;
-HSPLj$/util/stream/I;->p()I
-HSPLj$/util/stream/L0;-><init>(I)V
-HSPLj$/util/stream/L0;->accept(Ljava/lang/Object;Ljava/lang/Object;)V
-HSPLj$/util/stream/L0;->get()Ljava/lang/Object;
-HSPLj$/util/stream/M;-><init>()V
-HSPLj$/util/stream/M;->get()Ljava/lang/Object;
-HSPLj$/util/stream/N;-><init>()V
-HSPLj$/util/stream/N;->l()V
-HSPLj$/util/stream/N;->m(J)V
-HSPLj$/util/stream/Q1;-><init>()V
-HSPLj$/util/stream/Q1;->get()Ljava/lang/Object;
-HSPLj$/util/stream/S1;-><init>(Lj$/util/stream/c;Lj$/util/stream/g2;I)V
-HSPLj$/util/stream/S1;->accept(Ljava/lang/Object;)V
-HSPLj$/util/stream/S1;->m(J)V
-HSPLj$/util/stream/S2;-><init>(Ljava/util/Map;)V
+HSPLj$/util/stream/G1;-><init>(Lj$/util/stream/V2;Lj$/util/function/BinaryOperator;Lj$/util/function/BiConsumer;Lj$/util/function/Supplier;Lj$/util/stream/Collector;)V
+HSPLj$/util/stream/G1;->d()I
+HSPLj$/util/stream/G1;->d0()Lj$/util/stream/Q1;
+HSPLj$/util/stream/G;-><init>(ZLj$/util/stream/V2;Ljava/lang/Object;Lj$/util/function/Predicate;Lj$/util/function/Supplier;)V
+HSPLj$/util/stream/G;->a(Lj$/util/stream/b;Lj$/util/Spliterator;)Ljava/lang/Object;
+HSPLj$/util/stream/G;->d()I
+HSPLj$/util/stream/H1;-><init>(Lj$/util/function/Supplier;Lj$/util/function/BiConsumer;Lj$/util/function/BinaryOperator;)V
+HSPLj$/util/stream/H1;->accept(Ljava/lang/Object;)V
+HSPLj$/util/stream/H1;->l()V
+HSPLj$/util/stream/H1;->m(J)V
+HSPLj$/util/stream/K;->get()Ljava/lang/Object;
+HSPLj$/util/stream/L;->l()V
+HSPLj$/util/stream/L;->m(J)V
+HSPLj$/util/stream/Q;-><init>(Lj$/util/function/Consumer;Z)V
+HSPLj$/util/stream/Q;->accept(Ljava/lang/Object;)V
+HSPLj$/util/stream/R1;->get()Ljava/lang/Object;
+HSPLj$/util/stream/S2;-><init>(Ljava/util/EnumMap;)V
 HSPLj$/util/stream/S2;->a(Lj$/util/stream/T2;)V
+HSPLj$/util/stream/S;-><init>(Z)V
+HSPLj$/util/stream/S;->a(Lj$/util/stream/b;Lj$/util/Spliterator;)Ljava/lang/Object;
+HSPLj$/util/stream/S;->d()I
+HSPLj$/util/stream/S;->l()V
+HSPLj$/util/stream/S;->m(J)V
 HSPLj$/util/stream/T2;-><clinit>()V
-HSPLj$/util/stream/T2;-><init>(Ljava/lang/String;I)V
 HSPLj$/util/stream/T2;->values()[Lj$/util/stream/T2;
-HSPLj$/util/stream/T;-><init>(Lj$/util/function/Consumer;Z)V
-HSPLj$/util/stream/T;->accept(Ljava/lang/Object;)V
-HSPLj$/util/stream/U1;-><init>(Lj$/util/stream/c;ILj$/util/function/Function;I)V
-HSPLj$/util/stream/U1;->B1(ILj$/util/stream/g2;)Lj$/util/stream/g2;
 HSPLj$/util/stream/U2;-><clinit>()V
 HSPLj$/util/stream/U2;-><init>(Ljava/lang/String;IILj$/util/stream/S2;)V
-HSPLj$/util/stream/U2;->b(II)I
-HSPLj$/util/stream/U2;->d(Lj$/util/stream/T2;)I
-HSPLj$/util/stream/U2;->f(Lj$/util/Spliterator;)I
-HSPLj$/util/stream/U2;->g(I)Z
-HSPLj$/util/stream/U2;->j(Lj$/util/stream/T2;)Lj$/util/stream/S2;
+HSPLj$/util/stream/U2;->m(II)I
+HSPLj$/util/stream/U2;->o(Lj$/util/stream/T2;)I
+HSPLj$/util/stream/U2;->q(Lj$/util/Spliterator;)I
+HSPLj$/util/stream/U2;->r(I)Z
 HSPLj$/util/stream/U2;->values()[Lj$/util/stream/U2;
-HSPLj$/util/stream/U;-><init>(Z)V
-HSPLj$/util/stream/U;->f0(Lj$/util/stream/w0;Lj$/util/Spliterator;)Ljava/lang/Object;
-HSPLj$/util/stream/U;->l()V
-HSPLj$/util/stream/U;->m(J)V
-HSPLj$/util/stream/U;->p()I
-HSPLj$/util/stream/V0;-><init>()V
-HSPLj$/util/stream/V1;-><init>(Lj$/util/Spliterator;IZ)V
+HSPLj$/util/stream/U2;->y(Lj$/util/stream/T2;)Lj$/util/stream/S2;
+HSPLj$/util/stream/V1;-><init>(Lj$/util/stream/b;ILj$/util/function/Function;I)V
+HSPLj$/util/stream/V1;->u0(ILj$/util/stream/g2;)Lj$/util/stream/g2;
 HSPLj$/util/stream/V2;-><clinit>()V
-HSPLj$/util/stream/V2;-><init>(Ljava/lang/String;I)V
-HSPLj$/util/stream/W0;-><init>()V
-HSPLj$/util/stream/W1;-><clinit>()V
-HSPLj$/util/stream/W1;-><init>(Lj$/util/stream/c;I)V
-HSPLj$/util/stream/W1;->A1()Z
-HSPLj$/util/stream/X0;-><init>()V
-HSPLj$/util/stream/X1;-><clinit>()V
-HSPLj$/util/stream/X1;-><init>(Lj$/util/stream/c;I)V
-HSPLj$/util/stream/X1;->A1()Z
-HSPLj$/util/stream/Y0;-><init>()V
-HSPLj$/util/stream/Y1;-><init>(Lj$/util/Spliterator;IZ)V
-HSPLj$/util/stream/Y1;-><init>(Lj$/util/stream/c;I)V
+HSPLj$/util/stream/X1;-><init>(Lj$/util/stream/b;II)V
+HSPLj$/util/stream/X1;->t0()Z
 HSPLj$/util/stream/Y1;->collect(Lj$/util/stream/Collector;)Ljava/lang/Object;
 HSPLj$/util/stream/Y1;->filter(Lj$/util/function/Predicate;)Lj$/util/stream/Stream;
 HSPLj$/util/stream/Y1;->findFirst()Lj$/util/Optional;
 HSPLj$/util/stream/Y1;->forEach(Lj$/util/function/Consumer;)V
-HSPLj$/util/stream/Y1;->limit(J)Lj$/util/stream/Stream;
+HSPLj$/util/stream/Y1;->k0(Lj$/util/Spliterator;Lj$/util/stream/g2;)V
 HSPLj$/util/stream/Y1;->map(Lj$/util/function/Function;)Lj$/util/stream/Stream;
-HSPLj$/util/stream/Y1;->max(Ljava/util/Comparator;)Lj$/util/Optional;
-HSPLj$/util/stream/Y1;->n(Lj$/util/function/BinaryOperator;)Lj$/util/Optional;
 HSPLj$/util/stream/Y1;->sorted()Lj$/util/stream/Stream;
-HSPLj$/util/stream/Y1;->t1(Lj$/util/Spliterator;Lj$/util/stream/g2;)V
-HSPLj$/util/stream/Z0;-><init>()V
-HSPLj$/util/stream/b;-><init>(I)V
-HSPLj$/util/stream/b;->get()Ljava/lang/Object;
+HSPLj$/util/stream/b;-><init>(Lj$/util/Spliterator;IZ)V
+HSPLj$/util/stream/b;-><init>(Lj$/util/stream/b;I)V
+HSPLj$/util/stream/b;->d0(Lj$/util/Spliterator;Lj$/util/stream/g2;)V
+HSPLj$/util/stream/b;->e0(Lj$/util/Spliterator;Lj$/util/stream/g2;)V
+HSPLj$/util/stream/b;->g0(Lj$/util/stream/B3;)Ljava/lang/Object;
+HSPLj$/util/stream/b;->isParallel()Z
+HSPLj$/util/stream/b;->v0(I)Lj$/util/Spliterator;
+HSPLj$/util/stream/b;->y0(Lj$/util/Spliterator;Lj$/util/stream/g2;)Lj$/util/stream/g2;
+HSPLj$/util/stream/b;->z0(Lj$/util/stream/g2;)Lj$/util/stream/g2;
 HSPLj$/util/stream/c2;-><init>(Lj$/util/stream/g2;)V
 HSPLj$/util/stream/c2;->l()V
-HSPLj$/util/stream/c2;->q()Z
-HSPLj$/util/stream/c;-><clinit>()V
-HSPLj$/util/stream/c;-><init>(Lj$/util/Spliterator;IZ)V
-HSPLj$/util/stream/c;-><init>(Lj$/util/stream/c;I)V
-HSPLj$/util/stream/c;->C1(I)Lj$/util/Spliterator;
-HSPLj$/util/stream/c;->M0(Lj$/util/Spliterator;Lj$/util/stream/g2;)V
-HSPLj$/util/stream/c;->N0(Lj$/util/Spliterator;Lj$/util/stream/g2;)V
-HSPLj$/util/stream/c;->isParallel()Z
-HSPLj$/util/stream/c;->n1(Lj$/util/Spliterator;Lj$/util/stream/g2;)Lj$/util/stream/g2;
-HSPLj$/util/stream/c;->o1(Lj$/util/stream/g2;)Lj$/util/stream/g2;
-HSPLj$/util/stream/c;->q1(Lj$/util/stream/F3;)Ljava/lang/Object;
-HSPLj$/util/stream/h2;-><init>(Lj$/util/stream/i2;Lj$/util/stream/g2;)V
-HSPLj$/util/stream/h2;->accept(Ljava/lang/Object;)V
-HSPLj$/util/stream/h2;->m(J)V
-HSPLj$/util/stream/h2;->q()Z
-HSPLj$/util/stream/i2;-><init>(Lj$/util/stream/c;IJJ)V
-HSPLj$/util/stream/i2;->B1(ILj$/util/stream/g2;)Lj$/util/stream/g2;
-HSPLj$/util/stream/l;-><init>(I)V
+HSPLj$/util/stream/c2;->m(J)V
+HSPLj$/util/stream/c2;->p()Z
+HSPLj$/util/stream/k;-><init>(I)V
+HSPLj$/util/stream/m;-><init>(I)V
+HSPLj$/util/stream/m;->accept(Ljava/lang/Object;Ljava/lang/Object;)V
+HSPLj$/util/stream/m;->get()Ljava/lang/Object;
 HSPLj$/util/stream/n;-><init>(Lj$/util/function/Supplier;Lj$/util/function/BiConsumer;Lj$/util/function/BinaryOperator;Lj$/util/function/Function;Ljava/util/Set;)V
 HSPLj$/util/stream/n;-><init>(Lj$/util/function/Supplier;Lj$/util/function/BiConsumer;Lj$/util/function/BinaryOperator;Ljava/util/Set;)V
 HSPLj$/util/stream/n;->accumulator()Lj$/util/function/BiConsumer;
 HSPLj$/util/stream/n;->characteristics()Ljava/util/Set;
 HSPLj$/util/stream/n;->combiner()Lj$/util/function/BinaryOperator;
 HSPLj$/util/stream/n;->supplier()Lj$/util/function/Supplier;
+HSPLj$/util/stream/p;-><init>(Lj$/util/stream/b;Lj$/util/stream/g2;I)V
+HSPLj$/util/stream/p;->accept(Ljava/lang/Object;)V
+HSPLj$/util/stream/p;->l()V
+HSPLj$/util/stream/p;->m(J)V
+HSPLj$/util/stream/s;-><init>(I)V
 HSPLj$/util/stream/u2;-><init>(Lj$/util/stream/g2;Ljava/util/Comparator;)V
-HSPLj$/util/stream/u2;->q()Z
+HSPLj$/util/stream/u2;->p()Z
 HSPLj$/util/stream/w0;-><clinit>()V
-HSPLj$/util/stream/w0;-><init>()V
 HSPLj$/util/stream/w0;-><init>(Lj$/util/stream/V2;)V
-HSPLj$/util/stream/w0;->C0(JJJ)J
-HSPLj$/util/stream/w0;->S0(J)I
-HSPLj$/util/stream/w0;->f0(Lj$/util/stream/w0;Lj$/util/Spliterator;)Ljava/lang/Object;
-HSPLj$/util/stream/w0;->k1(Lj$/util/stream/c;JJ)Lj$/util/stream/Stream;
-HSPLj$/util/stream/w0;->m1(Lj$/util/Spliterator;Z)Lj$/util/stream/Stream;
-HSPLj$/util/stream/w0;->p()I
-HSPLj$/util/stream/w;-><init>(Lj$/util/stream/c;ILjava/lang/Object;I)V
-HSPLj$/util/stream/w;->B1(ILj$/util/stream/g2;)Lj$/util/stream/g2;
+HSPLj$/util/stream/w0;->a(Lj$/util/stream/b;Lj$/util/Spliterator;)Ljava/lang/Object;
+HSPLj$/util/stream/w0;->e0(Lj$/util/Spliterator;Z)Lj$/util/stream/Stream;
+HSPLj$/util/stream/w;-><init>(Lj$/util/stream/b;ILjava/lang/Object;I)V
+HSPLj$/util/stream/w;->u0(ILj$/util/stream/g2;)Lj$/util/stream/g2;
+HSPLj$/util/z;->j(Lj$/util/Spliterator;)J
+HSPLj$/util/z;->y(Ljava/lang/Object;Ljava/lang/Object;)Z
+HSPLj$/util/z;->z(Ljava/lang/Object;Ljava/lang/String;)V
 HSPLkotlin/InitializedLazyImpl;-><init>(Ljava/lang/Object;)V
 HSPLkotlin/KotlinVersion$Companion;-><init>()V
 HSPLkotlin/KotlinVersion$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -12953,6 +13163,7 @@ HSPLkotlin/collections/AbstractCollection$toString$1;-><init>(Lkotlin/collection
 HSPLkotlin/collections/AbstractCollection;-><init>()V
 HSPLkotlin/collections/AbstractCollection;->contains(Ljava/lang/Object;)Z
 HSPLkotlin/collections/AbstractCollection;->isEmpty()Z
+HSPLkotlin/collections/AbstractCollection;->size()I
 HSPLkotlin/collections/AbstractCollection;->toString()Ljava/lang/String;
 HSPLkotlin/collections/AbstractList$Companion;-><init>()V
 HSPLkotlin/collections/AbstractList$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -13081,7 +13292,6 @@ HSPLkotlin/collections/CollectionsKt;->maxOrNull(Ljava/lang/Iterable;)Ljava/lang
 HSPLkotlin/collections/CollectionsKt;->minOrNull(Ljava/lang/Iterable;)Ljava/lang/Comparable;
 HSPLkotlin/collections/CollectionsKt;->minus(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/List;
 HSPLkotlin/collections/CollectionsKt;->mutableListOf([Ljava/lang/Object;)Ljava/util/List;
-HSPLkotlin/collections/CollectionsKt;->optimizeReadOnlyList(Ljava/util/List;)Ljava/util/List;
 HSPLkotlin/collections/CollectionsKt;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 HSPLkotlin/collections/CollectionsKt;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
 HSPLkotlin/collections/CollectionsKt;->plus(Ljava/util/Collection;[Ljava/lang/Object;)Ljava/util/List;
@@ -13093,6 +13303,7 @@ HSPLkotlin/collections/CollectionsKt;->sorted(Ljava/lang/Iterable;)Ljava/util/Li
 HSPLkotlin/collections/CollectionsKt;->sortedDescending(Ljava/lang/Iterable;)Ljava/util/List;
 HSPLkotlin/collections/CollectionsKt;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 HSPLkotlin/collections/CollectionsKt;->sumOfFloat(Ljava/lang/Iterable;)F
+HSPLkotlin/collections/CollectionsKt;->terminateCollectionToArray(I[Ljava/lang/Object;)[Ljava/lang/Object;
 HSPLkotlin/collections/CollectionsKt;->toIntArray(Ljava/util/Collection;)[I
 HSPLkotlin/collections/CollectionsKt;->toList(Ljava/lang/Iterable;)Ljava/util/List;
 HSPLkotlin/collections/CollectionsKt;->toMutableList(Ljava/util/Collection;)Ljava/util/List;
@@ -13102,6 +13313,7 @@ HSPLkotlin/collections/CollectionsKt;->windowed$default(Ljava/lang/Iterable;IIZI
 HSPLkotlin/collections/CollectionsKt;->withIndex(Ljava/lang/Iterable;)Ljava/lang/Iterable;
 HSPLkotlin/collections/CollectionsKt__CollectionsJVMKt;->copyToArrayOfAny([Ljava/lang/Object;Z)[Ljava/lang/Object;
 HSPLkotlin/collections/CollectionsKt__CollectionsJVMKt;->listOf(Ljava/lang/Object;)Ljava/util/List;
+HSPLkotlin/collections/CollectionsKt__CollectionsJVMKt;->terminateCollectionToArray(I[Ljava/lang/Object;)[Ljava/lang/Object;
 HSPLkotlin/collections/CollectionsKt__CollectionsKt;->asCollection([Ljava/lang/Object;)Ljava/util/Collection;
 HSPLkotlin/collections/CollectionsKt__CollectionsKt;->binarySearch$default(Ljava/util/List;Ljava/lang/Comparable;IIILjava/lang/Object;)I
 HSPLkotlin/collections/CollectionsKt__CollectionsKt;->binarySearch(Ljava/util/List;Ljava/lang/Comparable;II)I
@@ -13149,13 +13361,11 @@ HSPLkotlin/collections/CollectionsKt___CollectionsKt;->lastOrNull(Ljava/util/Lis
 HSPLkotlin/collections/CollectionsKt___CollectionsKt;->maxOrNull(Ljava/lang/Iterable;)Ljava/lang/Comparable;
 HSPLkotlin/collections/CollectionsKt___CollectionsKt;->minOrNull(Ljava/lang/Iterable;)Ljava/lang/Comparable;
 HSPLkotlin/collections/CollectionsKt___CollectionsKt;->minus(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/List;
-HSPLkotlin/collections/CollectionsKt___CollectionsKt;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
 HSPLkotlin/collections/CollectionsKt___CollectionsKt;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
 HSPLkotlin/collections/CollectionsKt___CollectionsKt;->plus(Ljava/util/Collection;[Ljava/lang/Object;)Ljava/util/List;
 HSPLkotlin/collections/CollectionsKt___CollectionsKt;->reversed(Ljava/lang/Iterable;)Ljava/util/List;
 HSPLkotlin/collections/CollectionsKt___CollectionsKt;->sorted(Ljava/lang/Iterable;)Ljava/util/List;
 HSPLkotlin/collections/CollectionsKt___CollectionsKt;->sortedDescending(Ljava/lang/Iterable;)Ljava/util/List;
-HSPLkotlin/collections/CollectionsKt___CollectionsKt;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
 HSPLkotlin/collections/CollectionsKt___CollectionsKt;->sumOfFloat(Ljava/lang/Iterable;)F
 HSPLkotlin/collections/CollectionsKt___CollectionsKt;->toCollection(Ljava/lang/Iterable;Ljava/util/Collection;)Ljava/util/Collection;
 HSPLkotlin/collections/CollectionsKt___CollectionsKt;->toIntArray(Ljava/util/Collection;)[I
@@ -13220,7 +13430,6 @@ HSPLkotlin/collections/MapsKt;->mapCapacity(I)I
 HSPLkotlin/collections/MapsKt;->mapOf(Lkotlin/Pair;)Ljava/util/Map;
 HSPLkotlin/collections/MapsKt;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
 HSPLkotlin/collections/MapsKt;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
-HSPLkotlin/collections/MapsKt;->plus(Ljava/util/Map;Lkotlin/Pair;)Ljava/util/Map;
 HSPLkotlin/collections/MapsKt;->putAll(Ljava/util/Map;[Lkotlin/Pair;)V
 HSPLkotlin/collections/MapsKt;->toMap(Ljava/lang/Iterable;)Ljava/util/Map;
 HSPLkotlin/collections/MapsKt;->toMap(Ljava/util/Map;)Ljava/util/Map;
@@ -13233,7 +13442,6 @@ HSPLkotlin/collections/MapsKt__MapsKt;->emptyMap()Ljava/util/Map;
 HSPLkotlin/collections/MapsKt__MapsKt;->linkedMapOf([Lkotlin/Pair;)Ljava/util/LinkedHashMap;
 HSPLkotlin/collections/MapsKt__MapsKt;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
 HSPLkotlin/collections/MapsKt__MapsKt;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
-HSPLkotlin/collections/MapsKt__MapsKt;->plus(Ljava/util/Map;Lkotlin/Pair;)Ljava/util/Map;
 HSPLkotlin/collections/MapsKt__MapsKt;->putAll(Ljava/util/Map;Ljava/lang/Iterable;)V
 HSPLkotlin/collections/MapsKt__MapsKt;->putAll(Ljava/util/Map;[Lkotlin/Pair;)V
 HSPLkotlin/collections/MapsKt__MapsKt;->toMap(Ljava/lang/Iterable;)Ljava/util/Map;
@@ -13287,6 +13495,7 @@ HSPLkotlin/collections/builders/MapBuilder;->getHashSize()I
 HSPLkotlin/collections/builders/MapBuilder;->getSize()I
 HSPLkotlin/collections/builders/MapBuilder;->hash(Ljava/lang/Object;)I
 HSPLkotlin/collections/builders/MapBuilder;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+HSPLkotlin/collections/builders/MapBuilder;->registerModification()V
 HSPLkotlin/collections/builders/MapBuilder;->size()I
 HSPLkotlin/comparisons/ComparisonsKt;->compareValues(Ljava/lang/Comparable;Ljava/lang/Comparable;)I
 HSPLkotlin/comparisons/ComparisonsKt;->reverseOrder()Ljava/util/Comparator;
@@ -13311,6 +13520,8 @@ HSPLkotlin/coroutines/jvm/internal/DebugProbesKt;->probeCoroutineResumed(Lkotlin
 HSPLkotlin/coroutines/jvm/internal/DebugProbesKt;->probeCoroutineSuspended(Lkotlin/coroutines/Continuation;)V
 HSPLkotlin/coroutines/jvm/internal/RestrictedContinuationImpl;-><init>(Lkotlin/coroutines/Continuation;)V
 HSPLkotlin/coroutines/jvm/internal/RestrictedSuspendLambda;-><init>(ILkotlin/coroutines/Continuation;)V
+HSPLkotlin/enums/EnumEntriesKt;->enumEntries([Ljava/lang/Enum;)Lkotlin/enums/EnumEntries;
+HSPLkotlin/enums/EnumEntriesList;-><init>([Ljava/lang/Enum;)V
 HSPLkotlin/internal/PlatformImplementations;-><init>()V
 HSPLkotlin/internal/PlatformImplementations;->defaultPlatformRandom()Lkotlin/random/Random;
 HSPLkotlin/internal/PlatformImplementationsKt;-><clinit>()V
@@ -13348,12 +13559,14 @@ HSPLkotlin/jvm/internal/FunctionReference;-><init>(ILjava/lang/Object;)V
 HSPLkotlin/jvm/internal/FunctionReference;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 HSPLkotlin/jvm/internal/FunctionReferenceImpl;-><init>(ILjava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 HSPLkotlin/jvm/internal/FunctionReferenceImpl;-><init>(ILjava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
+HSPLkotlin/jvm/internal/Intrinsics;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 HSPLkotlin/jvm/internal/Intrinsics;->checkNotNull(Ljava/lang/Object;)V
 HSPLkotlin/jvm/internal/Intrinsics;->checkNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 HSPLkotlin/jvm/internal/Intrinsics;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 HSPLkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 HSPLkotlin/jvm/internal/Intrinsics;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 HSPLkotlin/jvm/internal/Intrinsics;->compare(II)I
+HSPLkotlin/jvm/internal/Intrinsics;->compare(JJ)I
 HSPLkotlin/jvm/internal/Lambda;-><init>(I)V
 HSPLkotlin/jvm/internal/MutablePropertyReference1;-><init>(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
 HSPLkotlin/jvm/internal/MutablePropertyReference1Impl;-><init>(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)V
@@ -13456,6 +13669,7 @@ HSPLkotlin/reflect/full/KClasses;->getPrimaryConstructor(Lkotlin/reflect/KClass;
 HSPLkotlin/reflect/full/KClasses;->isExtension(Lkotlin/reflect/jvm/internal/KCallableImpl;)Z
 HSPLkotlin/reflect/full/KClasses;->isNotExtension(Lkotlin/reflect/jvm/internal/KCallableImpl;)Z
 HSPLkotlin/reflect/jvm/ReflectJvmMapping$WhenMappings;-><clinit>()V
+HSPLkotlin/reflect/jvm/ReflectJvmMapping;->findKFunction(Ljava/util/Collection;Ljava/lang/reflect/Method;)Lkotlin/reflect/KFunction;
 HSPLkotlin/reflect/jvm/ReflectJvmMapping;->getJavaConstructor(Lkotlin/reflect/KFunction;)Ljava/lang/reflect/Constructor;
 HSPLkotlin/reflect/jvm/ReflectJvmMapping;->getJavaGetter(Lkotlin/reflect/KProperty;)Ljava/lang/reflect/Method;
 HSPLkotlin/reflect/jvm/ReflectJvmMapping;->getJavaMethod(Lkotlin/reflect/KFunction;)Ljava/lang/reflect/Method;
@@ -13506,6 +13720,7 @@ HSPLkotlin/reflect/jvm/internal/JvmPropertySignature$KotlinProperty;->getSignatu
 HSPLkotlin/reflect/jvm/internal/JvmPropertySignature$KotlinProperty;->getTypeTable()Lkotlin/reflect/jvm/internal/impl/metadata/deserialization/TypeTable;
 HSPLkotlin/reflect/jvm/internal/JvmPropertySignature;-><init>()V
 HSPLkotlin/reflect/jvm/internal/JvmPropertySignature;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLkotlin/reflect/jvm/internal/KCallableImpl$_absentArguments$1;-><init>(Lkotlin/reflect/jvm/internal/KCallableImpl;)V
 HSPLkotlin/reflect/jvm/internal/KCallableImpl$_annotations$1;-><init>(Lkotlin/reflect/jvm/internal/KCallableImpl;)V
 HSPLkotlin/reflect/jvm/internal/KCallableImpl$_annotations$1;->invoke()Ljava/lang/Object;
 HSPLkotlin/reflect/jvm/internal/KCallableImpl$_annotations$1;->invoke()Ljava/util/List;
@@ -13524,6 +13739,7 @@ HSPLkotlin/reflect/jvm/internal/KCallableImpl$_returnType$1;-><init>(Lkotlin/ref
 HSPLkotlin/reflect/jvm/internal/KCallableImpl$_returnType$1;->invoke()Ljava/lang/Object;
 HSPLkotlin/reflect/jvm/internal/KCallableImpl$_returnType$1;->invoke()Lkotlin/reflect/jvm/internal/KTypeImpl;
 HSPLkotlin/reflect/jvm/internal/KCallableImpl$_typeParameters$1;-><init>(Lkotlin/reflect/jvm/internal/KCallableImpl;)V
+HSPLkotlin/reflect/jvm/internal/KCallableImpl$parametersNeedMFVCFlattening$1;-><init>(Lkotlin/reflect/jvm/internal/KCallableImpl;)V
 HSPLkotlin/reflect/jvm/internal/KCallableImpl;-><init>()V
 HSPLkotlin/reflect/jvm/internal/KCallableImpl;->getAnnotations()Ljava/util/List;
 HSPLkotlin/reflect/jvm/internal/KCallableImpl;->getParameters()Ljava/util/List;
@@ -13594,7 +13810,7 @@ HSPLkotlin/reflect/jvm/internal/KClassImpl;->equals(Ljava/lang/Object;)Z
 HSPLkotlin/reflect/jvm/internal/KClassImpl;->getClassId()Lkotlin/reflect/jvm/internal/impl/name/ClassId;
 HSPLkotlin/reflect/jvm/internal/KClassImpl;->getConstructorDescriptors()Ljava/util/Collection;
 HSPLkotlin/reflect/jvm/internal/KClassImpl;->getConstructors()Ljava/util/Collection;
-HSPLkotlin/reflect/jvm/internal/KClassImpl;->getData()Lkotlin/reflect/jvm/internal/ReflectProperties$LazyVal;
+HSPLkotlin/reflect/jvm/internal/KClassImpl;->getData()Lkotlin/Lazy;
 HSPLkotlin/reflect/jvm/internal/KClassImpl;->getDescriptor()Lkotlin/reflect/jvm/internal/impl/descriptors/ClassDescriptor;
 HSPLkotlin/reflect/jvm/internal/KClassImpl;->getJClass()Ljava/lang/Class;
 HSPLkotlin/reflect/jvm/internal/KClassImpl;->getMemberScope$kotlin_reflection()Lkotlin/reflect/jvm/internal/impl/resolve/scopes/MemberScope;
@@ -13719,15 +13935,12 @@ HSPLkotlin/reflect/jvm/internal/KTypeImpl;->isMarkedNullable()Z
 HSPLkotlin/reflect/jvm/internal/ModuleByClassLoaderKt;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/ModuleByClassLoaderKt;->getOrCreateModule(Ljava/lang/Class;)Lkotlin/reflect/jvm/internal/impl/descriptors/runtime/components/RuntimeModuleData;
 HSPLkotlin/reflect/jvm/internal/ReflectProperties$LazySoftVal;-><init>(Ljava/lang/Object;Lkotlin/jvm/functions/Function0;)V
-HSPLkotlin/reflect/jvm/internal/ReflectProperties$LazyVal;-><init>(Lkotlin/jvm/functions/Function0;)V
-HSPLkotlin/reflect/jvm/internal/ReflectProperties$LazyVal;->invoke()Ljava/lang/Object;
 HSPLkotlin/reflect/jvm/internal/ReflectProperties$Val$1;-><init>()V
 HSPLkotlin/reflect/jvm/internal/ReflectProperties$Val;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/ReflectProperties$Val;-><init>()V
 HSPLkotlin/reflect/jvm/internal/ReflectProperties$Val;->escape(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLkotlin/reflect/jvm/internal/ReflectProperties$Val;->getValue(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 HSPLkotlin/reflect/jvm/internal/ReflectProperties$Val;->unescape(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLkotlin/reflect/jvm/internal/ReflectProperties;->lazy(Lkotlin/jvm/functions/Function0;)Lkotlin/reflect/jvm/internal/ReflectProperties$LazyVal;
 HSPLkotlin/reflect/jvm/internal/ReflectProperties;->lazySoft(Ljava/lang/Object;Lkotlin/jvm/functions/Function0;)Lkotlin/reflect/jvm/internal/ReflectProperties$LazySoftVal;
 HSPLkotlin/reflect/jvm/internal/ReflectProperties;->lazySoft(Lkotlin/jvm/functions/Function0;)Lkotlin/reflect/jvm/internal/ReflectProperties$LazySoftVal;
 HSPLkotlin/reflect/jvm/internal/ReflectionFactoryImpl;-><init>()V
@@ -13746,6 +13959,7 @@ HSPLkotlin/reflect/jvm/internal/UtilKt;->asKCallableImpl(Ljava/lang/Object;)Lkot
 HSPLkotlin/reflect/jvm/internal/UtilKt;->asKFunctionImpl(Ljava/lang/Object;)Lkotlin/reflect/jvm/internal/KFunctionImpl;
 HSPLkotlin/reflect/jvm/internal/UtilKt;->computeAnnotations(Lkotlin/reflect/jvm/internal/impl/descriptors/annotations/Annotated;)Ljava/util/List;
 HSPLkotlin/reflect/jvm/internal/UtilKt;->createArrayType(Ljava/lang/Class;)Ljava/lang/Class;
+HSPLkotlin/reflect/jvm/internal/UtilKt;->getDeclaredMethodOrNull(Ljava/lang/Class;Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
 HSPLkotlin/reflect/jvm/internal/UtilKt;->getInstanceReceiverParameter(Lkotlin/reflect/jvm/internal/impl/descriptors/CallableDescriptor;)Lkotlin/reflect/jvm/internal/impl/descriptors/ReceiverParameterDescriptor;
 HSPLkotlin/reflect/jvm/internal/UtilKt;->toJavaClass(Lkotlin/reflect/jvm/internal/impl/descriptors/ClassDescriptor;)Ljava/lang/Class;
 HSPLkotlin/reflect/jvm/internal/UtilKt;->unwrapRepeatableAnnotations(Ljava/util/List;)Ljava/util/List;
@@ -13769,32 +13983,17 @@ HSPLkotlin/reflect/jvm/internal/calls/CallerImpl;-><init>(Ljava/lang/reflect/Mem
 HSPLkotlin/reflect/jvm/internal/calls/CallerImpl;->getMember()Ljava/lang/reflect/Member;
 HSPLkotlin/reflect/jvm/internal/calls/CallerImpl;->getParameterTypes()Ljava/util/List;
 HSPLkotlin/reflect/jvm/internal/calls/CallerImpl;->getReturnType()Ljava/lang/reflect/Type;
-HSPLkotlin/reflect/jvm/internal/calls/InlineClassAwareCallerKt;->createInlineClassAwareCallerIfNeeded$default(Lkotlin/reflect/jvm/internal/calls/Caller;Lkotlin/reflect/jvm/internal/impl/descriptors/CallableMemberDescriptor;ZILjava/lang/Object;)Lkotlin/reflect/jvm/internal/calls/Caller;
-HSPLkotlin/reflect/jvm/internal/calls/InlineClassAwareCallerKt;->createInlineClassAwareCallerIfNeeded(Lkotlin/reflect/jvm/internal/calls/Caller;Lkotlin/reflect/jvm/internal/impl/descriptors/CallableMemberDescriptor;Z)Lkotlin/reflect/jvm/internal/calls/Caller;
-HSPLkotlin/reflect/jvm/internal/calls/InlineClassAwareCallerKt;->getExpectedReceiverType(Lkotlin/reflect/jvm/internal/impl/descriptors/CallableMemberDescriptor;)Lkotlin/reflect/jvm/internal/impl/types/KotlinType;
-HSPLkotlin/reflect/jvm/internal/calls/InlineClassAwareCallerKt;->hasInlineClassReceiver(Lkotlin/reflect/jvm/internal/impl/descriptors/CallableMemberDescriptor;)Z
+HSPLkotlin/reflect/jvm/internal/calls/ValueClassAwareCallerKt;->createValueClassAwareCallerIfNeeded$default(Lkotlin/reflect/jvm/internal/calls/Caller;Lkotlin/reflect/jvm/internal/impl/descriptors/CallableMemberDescriptor;ZILjava/lang/Object;)Lkotlin/reflect/jvm/internal/calls/Caller;
+HSPLkotlin/reflect/jvm/internal/calls/ValueClassAwareCallerKt;->createValueClassAwareCallerIfNeeded(Lkotlin/reflect/jvm/internal/calls/Caller;Lkotlin/reflect/jvm/internal/impl/descriptors/CallableMemberDescriptor;Z)Lkotlin/reflect/jvm/internal/calls/Caller;
+HSPLkotlin/reflect/jvm/internal/calls/ValueClassAwareCallerKt;->getExpectedReceiverType(Lkotlin/reflect/jvm/internal/impl/descriptors/CallableMemberDescriptor;)Lkotlin/reflect/jvm/internal/impl/types/KotlinType;
+HSPLkotlin/reflect/jvm/internal/calls/ValueClassAwareCallerKt;->hasValueClassReceiver(Lkotlin/reflect/jvm/internal/impl/descriptors/CallableMemberDescriptor;)Z
 HSPLkotlin/reflect/jvm/internal/impl/SpecialJvmAnnotations;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/SpecialJvmAnnotations;-><init>()V
 HSPLkotlin/reflect/jvm/internal/impl/SpecialJvmAnnotations;->getJAVA_LANG_ANNOTATION_REPEATABLE()Lkotlin/reflect/jvm/internal/impl/name/ClassId;
 HSPLkotlin/reflect/jvm/internal/impl/SpecialJvmAnnotations;->getSPECIAL_ANNOTATIONS()Ljava/util/Set;
-HSPLkotlin/reflect/jvm/internal/impl/builtins/BuiltInsLoader$Companion$Instance$2;-><clinit>()V
-HSPLkotlin/reflect/jvm/internal/impl/builtins/BuiltInsLoader$Companion$Instance$2;-><init>()V
-HSPLkotlin/reflect/jvm/internal/impl/builtins/BuiltInsLoader$Companion$Instance$2;->invoke()Ljava/lang/Object;
-HSPLkotlin/reflect/jvm/internal/impl/builtins/BuiltInsLoader$Companion$Instance$2;->invoke()Lkotlin/reflect/jvm/internal/impl/builtins/BuiltInsLoader;
-HSPLkotlin/reflect/jvm/internal/impl/builtins/BuiltInsLoader$Companion;-><clinit>()V
-HSPLkotlin/reflect/jvm/internal/impl/builtins/BuiltInsLoader$Companion;-><init>()V
-HSPLkotlin/reflect/jvm/internal/impl/builtins/BuiltInsLoader$Companion;->getInstance()Lkotlin/reflect/jvm/internal/impl/builtins/BuiltInsLoader;
-HSPLkotlin/reflect/jvm/internal/impl/builtins/BuiltInsLoader;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/builtins/CompanionObjectMapping;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/builtins/CompanionObjectMapping;-><init>()V
 HSPLkotlin/reflect/jvm/internal/impl/builtins/CompanionObjectMapping;->allClassesWithIntrinsicCompanions()Ljava/util/Set;
-HSPLkotlin/reflect/jvm/internal/impl/builtins/DefaultBuiltIns$Companion;-><init>()V
-HSPLkotlin/reflect/jvm/internal/impl/builtins/DefaultBuiltIns$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLkotlin/reflect/jvm/internal/impl/builtins/DefaultBuiltIns$Companion;->getInstance()Lkotlin/reflect/jvm/internal/impl/builtins/DefaultBuiltIns;
-HSPLkotlin/reflect/jvm/internal/impl/builtins/DefaultBuiltIns;-><clinit>()V
-HSPLkotlin/reflect/jvm/internal/impl/builtins/DefaultBuiltIns;-><init>(Z)V
-HSPLkotlin/reflect/jvm/internal/impl/builtins/DefaultBuiltIns;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLkotlin/reflect/jvm/internal/impl/builtins/DefaultBuiltIns;->access$getInstance$cp()Lkotlin/reflect/jvm/internal/impl/builtins/DefaultBuiltIns;
 HSPLkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns$1;-><init>(Lkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns;)V
 HSPLkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns$2;-><init>(Lkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns;)V
 HSPLkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns$3;-><init>(Lkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns;)V
@@ -13806,11 +14005,7 @@ HSPLkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns;-><init>(Lkotlin/re
 HSPLkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns;->access$200(Lkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns;)Lkotlin/reflect/jvm/internal/impl/descriptors/impl/ModuleDescriptorImpl;
 HSPLkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns;->access$202(Lkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns;Lkotlin/reflect/jvm/internal/impl/descriptors/impl/ModuleDescriptorImpl;)Lkotlin/reflect/jvm/internal/impl/descriptors/impl/ModuleDescriptorImpl;
 HSPLkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns;->classFqNameEquals(Lkotlin/reflect/jvm/internal/impl/descriptors/ClassifierDescriptor;Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;)Z
-HSPLkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns;->createBuiltInsModule(Z)V
-HSPLkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns;->getAdditionalClassPartsProvider()Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/AdditionalClassPartsProvider;
 HSPLkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns;->getBuiltInsModule()Lkotlin/reflect/jvm/internal/impl/descriptors/impl/ModuleDescriptorImpl;
-HSPLkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns;->getClassDescriptorFactories()Ljava/lang/Iterable;
-HSPLkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns;->getPlatformDependentDeclarationFilter()Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/PlatformDependentDeclarationFilter;
 HSPLkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns;->isAny(Lkotlin/reflect/jvm/internal/impl/descriptors/ClassDescriptor;)Z
 HSPLkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns;->isBuiltIn(Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptor;)Z
 HSPLkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns;->isSpecialClassWithNoSupertypes(Lkotlin/reflect/jvm/internal/impl/descriptors/ClassDescriptor;)Z
@@ -13838,6 +14033,7 @@ HSPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;->annotation
 HSPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;->collectionsFqName(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/FqName;
 HSPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;->fqName(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/FqName;
 HSPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;->fqNameUnsafe(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;
+HSPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;->internalName(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/FqName;
 HSPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;->rangesFqName(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;
 HSPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;->reflect(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;
 HSPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames;-><clinit>()V
@@ -13848,13 +14044,17 @@ HSPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames;->getPrimitiveFqName
 HSPLkotlin/reflect/jvm/internal/impl/builtins/StandardNames;->isPrimitiveArray(Lkotlin/reflect/jvm/internal/impl/name/FqNameUnsafe;)Z
 HSPLkotlin/reflect/jvm/internal/impl/builtins/functions/BuiltInFictitiousFunctionClassFactory;-><init>(Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;)V
 HSPLkotlin/reflect/jvm/internal/impl/builtins/functions/BuiltInFictitiousFunctionClassFactory;->createClass(Lkotlin/reflect/jvm/internal/impl/name/ClassId;)Lkotlin/reflect/jvm/internal/impl/descriptors/ClassDescriptor;
-HSPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionClassKind$Companion;-><init>()V
-HSPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionClassKind$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionClassKind;->$values()[Lkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionClassKind;
-HSPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionClassKind;-><clinit>()V
-HSPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionClassKind;-><init>(Ljava/lang/String;ILkotlin/reflect/jvm/internal/impl/name/FqName;Ljava/lang/String;ZZ)V
-HSPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionClassKind;->getClassNamePrefix()Ljava/lang/String;
-HSPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionClassKind;->getPackageFqName()Lkotlin/reflect/jvm/internal/impl/name/FqName;
+HSPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$Function;-><clinit>()V
+HSPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$Function;-><init>()V
+HSPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$KFunction;-><clinit>()V
+HSPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$KFunction;-><init>()V
+HSPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$KSuspendFunction;-><clinit>()V
+HSPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$KSuspendFunction;-><init>()V
+HSPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$SuspendFunction;-><clinit>()V
+HSPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$SuspendFunction;-><init>()V
+HSPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind;-><init>(Lkotlin/reflect/jvm/internal/impl/name/FqName;Ljava/lang/String;ZLkotlin/reflect/jvm/internal/impl/name/ClassId;)V
+HSPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind;->getClassNamePrefix()Ljava/lang/String;
+HSPLkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind;->getPackageFqName()Lkotlin/reflect/jvm/internal/impl/name/FqName;
 HSPLkotlin/reflect/jvm/internal/impl/builtins/jvm/CloneableClassScope$Companion;-><init>()V
 HSPLkotlin/reflect/jvm/internal/impl/builtins/jvm/CloneableClassScope$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLkotlin/reflect/jvm/internal/impl/builtins/jvm/CloneableClassScope$Companion;->getCLONE_NAME()Lkotlin/reflect/jvm/internal/impl/name/Name;
@@ -13913,6 +14113,7 @@ HSPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JvmBuiltIns;->setPostponedSett
 HSPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JvmBuiltInsCustomizer$cloneableType$2;-><init>(Lkotlin/reflect/jvm/internal/impl/builtins/jvm/JvmBuiltInsCustomizer;Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;)V
 HSPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JvmBuiltInsCustomizer$createMockJavaIoSerializableType$mockJavaIoPackageFragment$1;-><init>(Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;Lkotlin/reflect/jvm/internal/impl/name/FqName;)V
 HSPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JvmBuiltInsCustomizer$createMockJavaIoSerializableType$superTypes$1;-><init>(Lkotlin/reflect/jvm/internal/impl/builtins/jvm/JvmBuiltInsCustomizer;)V
+HSPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JvmBuiltInsCustomizer$deprecationForSomeOfTheListMethods$1;-><init>(Lkotlin/reflect/jvm/internal/impl/builtins/jvm/JvmBuiltInsCustomizer;)V
 HSPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JvmBuiltInsCustomizer$getFunctions$2;-><init>(Lkotlin/reflect/jvm/internal/impl/name/Name;)V
 HSPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JvmBuiltInsCustomizer$notConsideredDeprecation$2;-><init>(Lkotlin/reflect/jvm/internal/impl/builtins/jvm/JvmBuiltInsCustomizer;)V
 HSPLkotlin/reflect/jvm/internal/impl/builtins/jvm/JvmBuiltInsCustomizer;-><clinit>()V
@@ -13986,7 +14187,6 @@ HSPLkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor$DefaultImpls;-
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses$classes$1;-><init>(Lkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses;)V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses$packageFragments$1;-><init>(Lkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses;)V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses;-><init>(Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;)V
-HSPLkotlin/reflect/jvm/internal/impl/descriptors/PackageFragmentProviderImpl;-><init>(Ljava/util/Collection;)V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/PackageFragmentProviderKt;->collectPackageFragmentsOptimizedIfPossible(Lkotlin/reflect/jvm/internal/impl/descriptors/PackageFragmentProvider;Lkotlin/reflect/jvm/internal/impl/name/FqName;Ljava/util/Collection;)V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/PackageFragmentProviderKt;->isEmpty(Lkotlin/reflect/jvm/internal/impl/descriptors/PackageFragmentProvider;Lkotlin/reflect/jvm/internal/impl/name/FqName;)Z
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/PackageFragmentProviderKt;->packageFragments(Lkotlin/reflect/jvm/internal/impl/descriptors/PackageFragmentProvider;Lkotlin/reflect/jvm/internal/impl/name/FqName;)Ljava/util/List;
@@ -14042,13 +14242,6 @@ HSPLkotlin/reflect/jvm/internal/impl/descriptors/annotations/Annotations$Compani
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/annotations/Annotations$Companion;-><init>()V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/annotations/Annotations$Companion;->getEMPTY()Lkotlin/reflect/jvm/internal/impl/descriptors/annotations/Annotations;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/annotations/Annotations;-><clinit>()V
-HSPLkotlin/reflect/jvm/internal/impl/descriptors/deserialization/AdditionalClassPartsProvider$None;-><clinit>()V
-HSPLkotlin/reflect/jvm/internal/impl/descriptors/deserialization/AdditionalClassPartsProvider$None;-><init>()V
-HSPLkotlin/reflect/jvm/internal/impl/descriptors/deserialization/PlatformDependentDeclarationFilter$NoPlatformDependent;-><clinit>()V
-HSPLkotlin/reflect/jvm/internal/impl/descriptors/deserialization/PlatformDependentDeclarationFilter$NoPlatformDependent;-><init>()V
-HSPLkotlin/reflect/jvm/internal/impl/descriptors/deserialization/PlatformDependentTypeTransformer$None;-><clinit>()V
-HSPLkotlin/reflect/jvm/internal/impl/descriptors/deserialization/PlatformDependentTypeTransformer$None;-><init>()V
-HSPLkotlin/reflect/jvm/internal/impl/descriptors/deserialization/PlatformDependentTypeTransformer$None;->transformPlatformType(Lkotlin/reflect/jvm/internal/impl/name/ClassId;Lkotlin/reflect/jvm/internal/impl/types/SimpleType;)Lkotlin/reflect/jvm/internal/impl/types/SimpleType;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/AbstractClassDescriptor$1$1;-><init>(Lkotlin/reflect/jvm/internal/impl/descriptors/impl/AbstractClassDescriptor$1;)V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/AbstractClassDescriptor$1;-><init>(Lkotlin/reflect/jvm/internal/impl/descriptors/impl/AbstractClassDescriptor;)V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/AbstractClassDescriptor$1;->invoke()Ljava/lang/Object;
@@ -14070,6 +14263,7 @@ HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/AbstractClassDescriptor;->
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/AbstractClassDescriptor;->getUnsubstitutedMemberScope()Lkotlin/reflect/jvm/internal/impl/resolve/scopes/MemberScope;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/AbstractLazyTypeParameterDescriptor;-><init>(Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptor;Lkotlin/reflect/jvm/internal/impl/descriptors/annotations/Annotations;Lkotlin/reflect/jvm/internal/impl/name/Name;Lkotlin/reflect/jvm/internal/impl/types/Variance;ZILkotlin/reflect/jvm/internal/impl/descriptors/SourceElement;Lkotlin/reflect/jvm/internal/impl/descriptors/SupertypeLoopChecker;)V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/AbstractReceiverParameterDescriptor;-><init>(Lkotlin/reflect/jvm/internal/impl/descriptors/annotations/Annotations;)V
+HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/AbstractReceiverParameterDescriptor;-><init>(Lkotlin/reflect/jvm/internal/impl/descriptors/annotations/Annotations;Lkotlin/reflect/jvm/internal/impl/name/Name;)V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/AbstractReceiverParameterDescriptor;->getType()Lkotlin/reflect/jvm/internal/impl/types/KotlinType;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/AbstractReceiverParameterDescriptor;->substitute(Lkotlin/reflect/jvm/internal/impl/types/TypeSubstitutor;)Lkotlin/reflect/jvm/internal/impl/descriptors/ReceiverParameterDescriptor;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/AbstractTypeParameterDescriptor$1;-><init>(Lkotlin/reflect/jvm/internal/impl/descriptors/impl/AbstractTypeParameterDescriptor;Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/descriptors/SupertypeLoopChecker;)V
@@ -14207,7 +14401,6 @@ HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/ModuleDescriptorImpl$packa
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/ModuleDescriptorImpl$packages$1;-><init>(Lkotlin/reflect/jvm/internal/impl/descriptors/impl/ModuleDescriptorImpl;)V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/ModuleDescriptorImpl$packages$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/ModuleDescriptorImpl$packages$1;->invoke(Lkotlin/reflect/jvm/internal/impl/name/FqName;)Lkotlin/reflect/jvm/internal/impl/descriptors/PackageViewDescriptor;
-HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/ModuleDescriptorImpl;-><init>(Lkotlin/reflect/jvm/internal/impl/name/Name;Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns;Lkotlin/reflect/jvm/internal/impl/platform/TargetPlatform;)V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/ModuleDescriptorImpl;-><init>(Lkotlin/reflect/jvm/internal/impl/name/Name;Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns;Lkotlin/reflect/jvm/internal/impl/platform/TargetPlatform;Ljava/util/Map;Lkotlin/reflect/jvm/internal/impl/name/Name;)V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/ModuleDescriptorImpl;-><init>(Lkotlin/reflect/jvm/internal/impl/name/Name;Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns;Lkotlin/reflect/jvm/internal/impl/platform/TargetPlatform;Ljava/util/Map;Lkotlin/reflect/jvm/internal/impl/name/Name;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/ModuleDescriptorImpl;->accept(Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptorVisitor;Ljava/lang/Object;)Ljava/lang/Object;
@@ -14230,6 +14423,7 @@ HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/ModuleDescriptorImpl;->set
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/ModuleDescriptorImpl;->setDependencies(Ljava/util/List;Ljava/util/Set;)V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/ModuleDescriptorImpl;->setDependencies(Lkotlin/reflect/jvm/internal/impl/descriptors/impl/ModuleDependencies;)V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/ModuleDescriptorImpl;->setDependencies([Lkotlin/reflect/jvm/internal/impl/descriptors/impl/ModuleDescriptorImpl;)V
+HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/ModuleDescriptorImpl;->toString()Ljava/lang/String;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/PackageFragmentDescriptorImpl;-><init>(Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;Lkotlin/reflect/jvm/internal/impl/name/FqName;)V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/PackageFragmentDescriptorImpl;->getContainingDeclaration()Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptor;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/PackageFragmentDescriptorImpl;->getContainingDeclaration()Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;
@@ -14243,12 +14437,14 @@ HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/PackageViewDescriptorFacto
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/PackageViewDescriptorFactory;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/PropertyAccessorDescriptorImpl;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/PropertyAccessorDescriptorImpl;-><init>(Lkotlin/reflect/jvm/internal/impl/descriptors/Modality;Lkotlin/reflect/jvm/internal/impl/descriptors/DescriptorVisibility;Lkotlin/reflect/jvm/internal/impl/descriptors/PropertyDescriptor;Lkotlin/reflect/jvm/internal/impl/descriptors/annotations/Annotations;Lkotlin/reflect/jvm/internal/impl/name/Name;ZZZLkotlin/reflect/jvm/internal/impl/descriptors/CallableMemberDescriptor$Kind;Lkotlin/reflect/jvm/internal/impl/descriptors/SourceElement;)V
+HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/PropertyAccessorDescriptorImpl;->getContextReceiverParameters()Ljava/util/List;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/PropertyAccessorDescriptorImpl;->getCorrespondingProperty()Lkotlin/reflect/jvm/internal/impl/descriptors/PropertyDescriptor;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/PropertyAccessorDescriptorImpl;->getDispatchReceiverParameter()Lkotlin/reflect/jvm/internal/impl/descriptors/ReceiverParameterDescriptor;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/PropertyAccessorDescriptorImpl;->getExtensionReceiverParameter()Lkotlin/reflect/jvm/internal/impl/descriptors/ReceiverParameterDescriptor;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/PropertyDescriptorImpl;-><init>(Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptor;Lkotlin/reflect/jvm/internal/impl/descriptors/PropertyDescriptor;Lkotlin/reflect/jvm/internal/impl/descriptors/annotations/Annotations;Lkotlin/reflect/jvm/internal/impl/descriptors/Modality;Lkotlin/reflect/jvm/internal/impl/descriptors/DescriptorVisibility;ZLkotlin/reflect/jvm/internal/impl/name/Name;Lkotlin/reflect/jvm/internal/impl/descriptors/CallableMemberDescriptor$Kind;Lkotlin/reflect/jvm/internal/impl/descriptors/SourceElement;ZZZZZZ)V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/PropertyDescriptorImpl;->accept(Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptorVisitor;Ljava/lang/Object;)Ljava/lang/Object;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/PropertyDescriptorImpl;->create(Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptor;Lkotlin/reflect/jvm/internal/impl/descriptors/annotations/Annotations;Lkotlin/reflect/jvm/internal/impl/descriptors/Modality;Lkotlin/reflect/jvm/internal/impl/descriptors/DescriptorVisibility;ZLkotlin/reflect/jvm/internal/impl/name/Name;Lkotlin/reflect/jvm/internal/impl/descriptors/CallableMemberDescriptor$Kind;Lkotlin/reflect/jvm/internal/impl/descriptors/SourceElement;ZZZZZZ)Lkotlin/reflect/jvm/internal/impl/descriptors/impl/PropertyDescriptorImpl;
+HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/PropertyDescriptorImpl;->getContextReceiverParameters()Ljava/util/List;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/PropertyDescriptorImpl;->getDispatchReceiverParameter()Lkotlin/reflect/jvm/internal/impl/descriptors/ReceiverParameterDescriptor;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/PropertyDescriptorImpl;->getExtensionReceiverParameter()Lkotlin/reflect/jvm/internal/impl/descriptors/ReceiverParameterDescriptor;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/PropertyDescriptorImpl;->getGetter()Lkotlin/reflect/jvm/internal/impl/descriptors/PropertyGetterDescriptor;
@@ -14267,6 +14463,7 @@ HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/PropertyGetterDescriptorIm
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/PropertyGetterDescriptorImpl;->initialize(Lkotlin/reflect/jvm/internal/impl/types/KotlinType;)V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/ReceiverParameterDescriptorImpl;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/ReceiverParameterDescriptorImpl;-><init>(Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptor;Lkotlin/reflect/jvm/internal/impl/resolve/scopes/receivers/ReceiverValue;Lkotlin/reflect/jvm/internal/impl/descriptors/annotations/Annotations;)V
+HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/ReceiverParameterDescriptorImpl;-><init>(Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptor;Lkotlin/reflect/jvm/internal/impl/resolve/scopes/receivers/ReceiverValue;Lkotlin/reflect/jvm/internal/impl/descriptors/annotations/Annotations;Lkotlin/reflect/jvm/internal/impl/name/Name;)V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/SimpleFunctionDescriptorImpl;-><init>(Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptor;Lkotlin/reflect/jvm/internal/impl/descriptors/SimpleFunctionDescriptor;Lkotlin/reflect/jvm/internal/impl/descriptors/annotations/Annotations;Lkotlin/reflect/jvm/internal/impl/name/Name;Lkotlin/reflect/jvm/internal/impl/descriptors/CallableMemberDescriptor$Kind;Lkotlin/reflect/jvm/internal/impl/descriptors/SourceElement;)V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/SimpleFunctionDescriptorImpl;->copy(Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptor;Lkotlin/reflect/jvm/internal/impl/descriptors/Modality;Lkotlin/reflect/jvm/internal/impl/descriptors/DescriptorVisibility;Lkotlin/reflect/jvm/internal/impl/descriptors/CallableMemberDescriptor$Kind;Z)Lkotlin/reflect/jvm/internal/impl/descriptors/CallableMemberDescriptor;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/impl/SimpleFunctionDescriptorImpl;->copy(Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptor;Lkotlin/reflect/jvm/internal/impl/descriptors/Modality;Lkotlin/reflect/jvm/internal/impl/descriptors/DescriptorVisibility;Lkotlin/reflect/jvm/internal/impl/descriptors/CallableMemberDescriptor$Kind;Z)Lkotlin/reflect/jvm/internal/impl/descriptors/SimpleFunctionDescriptor;
@@ -14332,7 +14529,7 @@ HSPLkotlin/reflect/jvm/internal/impl/descriptors/runtime/components/ReflectKotli
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/runtime/components/ReflectKotlinClassFinder;-><init>(Ljava/lang/ClassLoader;)V
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/runtime/components/ReflectKotlinClassFinder;->findBuiltInsData(Lkotlin/reflect/jvm/internal/impl/name/FqName;)Ljava/io/InputStream;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/runtime/components/ReflectKotlinClassFinder;->findKotlinClass(Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinClassFinder$Result;
-HSPLkotlin/reflect/jvm/internal/impl/descriptors/runtime/components/ReflectKotlinClassFinder;->findKotlinClassOrContent(Lkotlin/reflect/jvm/internal/impl/name/ClassId;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinClassFinder$Result;
+HSPLkotlin/reflect/jvm/internal/impl/descriptors/runtime/components/ReflectKotlinClassFinder;->findKotlinClassOrContent(Lkotlin/reflect/jvm/internal/impl/name/ClassId;Lkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinClassFinder$Result;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/runtime/components/ReflectKotlinClassFinderKt;->access$toRuntimeFqName(Lkotlin/reflect/jvm/internal/impl/name/ClassId;)Ljava/lang/String;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/runtime/components/ReflectKotlinClassFinderKt;->toRuntimeFqName(Lkotlin/reflect/jvm/internal/impl/name/ClassId;)Ljava/lang/String;
 HSPLkotlin/reflect/jvm/internal/impl/descriptors/runtime/components/ReflectKotlinClassKt;-><clinit>()V
@@ -14481,7 +14678,9 @@ HSPLkotlin/reflect/jvm/internal/impl/load/java/ReportLevel$Companion;-><init>(Lk
 HSPLkotlin/reflect/jvm/internal/impl/load/java/ReportLevel;->$values()[Lkotlin/reflect/jvm/internal/impl/load/java/ReportLevel;
 HSPLkotlin/reflect/jvm/internal/impl/load/java/ReportLevel;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/load/java/ReportLevel;-><init>(Ljava/lang/String;ILjava/lang/String;)V
-HSPLkotlin/reflect/jvm/internal/impl/load/java/SpecialGenericSignatures$Companion$NameAndSignature;-><init>(Lkotlin/reflect/jvm/internal/impl/name/Name;Ljava/lang/String;)V
+HSPLkotlin/reflect/jvm/internal/impl/load/java/SpecialGenericSignatures$Companion$NameAndSignature;-><init>(Ljava/lang/String;Lkotlin/reflect/jvm/internal/impl/name/Name;Ljava/lang/String;Ljava/lang/String;)V
+HSPLkotlin/reflect/jvm/internal/impl/load/java/SpecialGenericSignatures$Companion$NameAndSignature;->copy$default(Lkotlin/reflect/jvm/internal/impl/load/java/SpecialGenericSignatures$Companion$NameAndSignature;Ljava/lang/String;Lkotlin/reflect/jvm/internal/impl/name/Name;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lkotlin/reflect/jvm/internal/impl/load/java/SpecialGenericSignatures$Companion$NameAndSignature;
+HSPLkotlin/reflect/jvm/internal/impl/load/java/SpecialGenericSignatures$Companion$NameAndSignature;->copy(Ljava/lang/String;Lkotlin/reflect/jvm/internal/impl/name/Name;Ljava/lang/String;Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/load/java/SpecialGenericSignatures$Companion$NameAndSignature;
 HSPLkotlin/reflect/jvm/internal/impl/load/java/SpecialGenericSignatures$Companion$NameAndSignature;->getName()Lkotlin/reflect/jvm/internal/impl/name/Name;
 HSPLkotlin/reflect/jvm/internal/impl/load/java/SpecialGenericSignatures$Companion$NameAndSignature;->getSignature()Ljava/lang/String;
 HSPLkotlin/reflect/jvm/internal/impl/load/java/SpecialGenericSignatures$Companion$NameAndSignature;->hashCode()I
@@ -14628,9 +14827,11 @@ HSPLkotlin/reflect/jvm/internal/impl/load/java/lazy/descriptors/LazyJavaPackageS
 HSPLkotlin/reflect/jvm/internal/impl/load/java/lazy/descriptors/LazyJavaPackageScope$knownClassNamesInPackage$1;->invoke()Ljava/lang/Object;
 HSPLkotlin/reflect/jvm/internal/impl/load/java/lazy/descriptors/LazyJavaPackageScope$knownClassNamesInPackage$1;->invoke()Ljava/util/Set;
 HSPLkotlin/reflect/jvm/internal/impl/load/java/lazy/descriptors/LazyJavaPackageScope;-><init>(Lkotlin/reflect/jvm/internal/impl/load/java/lazy/LazyJavaResolverContext;Lkotlin/reflect/jvm/internal/impl/load/java/structure/JavaPackage;Lkotlin/reflect/jvm/internal/impl/load/java/lazy/descriptors/LazyJavaPackageFragment;)V
+HSPLkotlin/reflect/jvm/internal/impl/load/java/lazy/descriptors/LazyJavaPackageScope;->access$getJvmMetadataVersion(Lkotlin/reflect/jvm/internal/impl/load/java/lazy/descriptors/LazyJavaPackageScope;)Lkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;
 HSPLkotlin/reflect/jvm/internal/impl/load/java/lazy/descriptors/LazyJavaPackageScope;->access$resolveKotlinBinaryClass(Lkotlin/reflect/jvm/internal/impl/load/java/lazy/descriptors/LazyJavaPackageScope;Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;)Lkotlin/reflect/jvm/internal/impl/load/java/lazy/descriptors/LazyJavaPackageScope$KotlinClassLookupResult;
 HSPLkotlin/reflect/jvm/internal/impl/load/java/lazy/descriptors/LazyJavaPackageScope;->findClassifier(Lkotlin/reflect/jvm/internal/impl/name/Name;Lkotlin/reflect/jvm/internal/impl/load/java/structure/JavaClass;)Lkotlin/reflect/jvm/internal/impl/descriptors/ClassDescriptor;
 HSPLkotlin/reflect/jvm/internal/impl/load/java/lazy/descriptors/LazyJavaPackageScope;->getContributedClassifier(Lkotlin/reflect/jvm/internal/impl/name/Name;Lkotlin/reflect/jvm/internal/impl/incremental/components/LookupLocation;)Lkotlin/reflect/jvm/internal/impl/descriptors/ClassDescriptor;
+HSPLkotlin/reflect/jvm/internal/impl/load/java/lazy/descriptors/LazyJavaPackageScope;->getJvmMetadataVersion()Lkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;
 HSPLkotlin/reflect/jvm/internal/impl/load/java/lazy/descriptors/LazyJavaPackageScope;->getOwnerDescriptor()Lkotlin/reflect/jvm/internal/impl/load/java/lazy/descriptors/LazyJavaPackageFragment;
 HSPLkotlin/reflect/jvm/internal/impl/load/java/lazy/descriptors/LazyJavaPackageScope;->resolveKotlinBinaryClass(Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;)Lkotlin/reflect/jvm/internal/impl/load/java/lazy/descriptors/LazyJavaPackageScope$KotlinClassLookupResult;
 HSPLkotlin/reflect/jvm/internal/impl/load/java/lazy/descriptors/LazyJavaScope$allDescriptors$1;-><init>(Lkotlin/reflect/jvm/internal/impl/load/java/lazy/descriptors/LazyJavaScope;)V
@@ -14655,8 +14856,6 @@ HSPLkotlin/reflect/jvm/internal/impl/load/java/structure/LightClassOriginKind;->
 HSPLkotlin/reflect/jvm/internal/impl/load/java/structure/LightClassOriginKind;-><init>(Ljava/lang/String;I)V
 HSPLkotlin/reflect/jvm/internal/impl/load/java/typeEnhancement/JavaTypeEnhancement;-><init>(Lkotlin/reflect/jvm/internal/impl/load/java/lazy/JavaResolverSettings;)V
 HSPLkotlin/reflect/jvm/internal/impl/load/java/typeEnhancement/SignatureEnhancement;-><init>(Lkotlin/reflect/jvm/internal/impl/load/java/typeEnhancement/JavaTypeEnhancement;)V
-HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$AnnotationsContainerWithConstants;-><init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V
-HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$AnnotationsContainerWithConstants;->getMemberAnnotations()Ljava/util/Map;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$loadAnnotationsAndInitializers$1$AnnotationVisitorForMethod;-><init>(Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$loadAnnotationsAndInitializers$1;Lkotlin/reflect/jvm/internal/impl/load/kotlin/MemberSignature;)V
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$loadAnnotationsAndInitializers$1$AnnotationVisitorForMethod;->visitParameterAnnotation(ILkotlin/reflect/jvm/internal/impl/name/ClassId;Lkotlin/reflect/jvm/internal/impl/descriptors/SourceElement;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass$AnnotationArgumentVisitor;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$loadAnnotationsAndInitializers$1$MemberAnnotationVisitor;-><init>(Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$loadAnnotationsAndInitializers$1;Lkotlin/reflect/jvm/internal/impl/load/kotlin/MemberSignature;)V
@@ -14668,14 +14867,18 @@ HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAn
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$loadAnnotationsAndInitializers$1;->visitMethod(Lkotlin/reflect/jvm/internal/impl/name/Name;Ljava/lang/String;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass$MethodAnnotationVisitor;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$storage$1;-><init>(Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader;)V
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$storage$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$storage$1;->invoke(Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$AnnotationsContainerWithConstants;
+HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$storage$1;->invoke(Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/AnnotationsContainerWithConstants;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader;-><init>(Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinClassFinder;)V
-HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader;->access$loadAnnotationsAndInitializers(Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader;Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$AnnotationsContainerWithConstants;
-HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader;->getAnnotationsContainer(Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$AnnotationsContainerWithConstants;
+HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader;->access$loadAnnotationsAndInitializers(Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader;Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/AnnotationsContainerWithConstants;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader;->getAnnotationsContainer(Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader$AnnotationsContainer;
+HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader;->getAnnotationsContainer(Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/AnnotationsContainerWithConstants;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader;->isRepeatableWithImplicitContainer(Lkotlin/reflect/jvm/internal/impl/name/ClassId;Ljava/util/Map;)Z
-HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader;->loadAnnotationsAndInitializers(Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$AnnotationsContainerWithConstants;
+HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader;->loadAnnotationsAndInitializers(Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/AnnotationsContainerWithConstants;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader$AnnotationsContainer;-><init>()V
+HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader$Companion;-><init>()V
+HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader$Companion;->getSpecialCaseContainerClass(Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ProtoContainer;ZZLjava/lang/Boolean;ZLkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinClassFinder;Lkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;
+HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader;-><init>(Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinClassFinder;)V
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader;->findClassAndLoadMemberAnnotations$default(Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ProtoContainer;Lkotlin/reflect/jvm/internal/impl/load/kotlin/MemberSignature;ZZLjava/lang/Boolean;ZILjava/lang/Object;)Ljava/util/List;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader;->findClassAndLoadMemberAnnotations(Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ProtoContainer;Lkotlin/reflect/jvm/internal/impl/load/kotlin/MemberSignature;ZZLjava/lang/Boolean;Z)Ljava/util/List;
@@ -14683,12 +14886,13 @@ HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLo
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader;->getCachedFileContent(Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;)[B
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader;->getCallableSignature$default(Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader;Lkotlin/reflect/jvm/internal/impl/protobuf/MessageLite;Lkotlin/reflect/jvm/internal/impl/metadata/deserialization/NameResolver;Lkotlin/reflect/jvm/internal/impl/metadata/deserialization/TypeTable;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/AnnotatedCallableKind;ZILjava/lang/Object;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/MemberSignature;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader;->getCallableSignature(Lkotlin/reflect/jvm/internal/impl/protobuf/MessageLite;Lkotlin/reflect/jvm/internal/impl/metadata/deserialization/NameResolver;Lkotlin/reflect/jvm/internal/impl/metadata/deserialization/TypeTable;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/AnnotatedCallableKind;Z)Lkotlin/reflect/jvm/internal/impl/load/kotlin/MemberSignature;
-HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader;->getSpecialCaseContainerClass(Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ProtoContainer;ZZLjava/lang/Boolean;Z)Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader;->isImplicitRepeatableContainer(Lkotlin/reflect/jvm/internal/impl/name/ClassId;)Z
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader;->loadAnnotationIfNotSpecial(Lkotlin/reflect/jvm/internal/impl/name/ClassId;Lkotlin/reflect/jvm/internal/impl/descriptors/SourceElement;Ljava/util/List;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass$AnnotationArgumentVisitor;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader;->loadCallableAnnotations(Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ProtoContainer;Lkotlin/reflect/jvm/internal/impl/protobuf/MessageLite;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/AnnotatedCallableKind;)Ljava/util/List;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader;->loadTypeAnnotations(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;Lkotlin/reflect/jvm/internal/impl/metadata/deserialization/NameResolver;)Ljava/util/List;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader;->toBinaryClass(Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ProtoContainer$Class;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;
+HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AnnotationsContainerWithConstants;-><init>(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V
+HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/AnnotationsContainerWithConstants;->getMemberAnnotations()Ljava/util/Map;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl$AbstractAnnotationArgumentVisitor;-><init>(Lkotlin/reflect/jvm/internal/impl/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl;)V
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl$AbstractAnnotationArgumentVisitor;->visit(Lkotlin/reflect/jvm/internal/impl/name/Name;Ljava/lang/Object;)V
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl$AbstractAnnotationArgumentVisitor;->visitEnum(Lkotlin/reflect/jvm/internal/impl/name/Name;Lkotlin/reflect/jvm/internal/impl/name/ClassId;Lkotlin/reflect/jvm/internal/impl/name/Name;)V
@@ -14698,8 +14902,11 @@ HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/BinaryClassAnnotationAndConstan
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl;-><init>(Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;Lkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses;Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinClassFinder;)V
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl;->access$createConstant(Lkotlin/reflect/jvm/internal/impl/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl;Lkotlin/reflect/jvm/internal/impl/name/Name;Ljava/lang/Object;)Lkotlin/reflect/jvm/internal/impl/resolve/constants/ConstantValue;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl;->createConstant(Lkotlin/reflect/jvm/internal/impl/name/Name;Ljava/lang/Object;)Lkotlin/reflect/jvm/internal/impl/resolve/constants/ConstantValue;
+HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl;->getJvmMetadataVersion()Lkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl;->loadAnnotation(Lkotlin/reflect/jvm/internal/impl/name/ClassId;Lkotlin/reflect/jvm/internal/impl/descriptors/SourceElement;Ljava/util/List;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass$AnnotationArgumentVisitor;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl;->resolveClass(Lkotlin/reflect/jvm/internal/impl/name/ClassId;)Lkotlin/reflect/jvm/internal/impl/descriptors/ClassDescriptor;
+HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl;->setJvmMetadataVersion(Lkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;)V
+HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/BinaryClassAnnotationAndConstantLoaderImplKt;->createBinaryClassAnnotationAndConstantLoader(Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;Lkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses;Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinClassFinder;Lkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializationComponentsForJava$Companion$ModuleData;-><init>(Lkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializationComponentsForJava;Lkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializedDescriptorResolver;)V
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializationComponentsForJava$Companion$ModuleData;->getDeserializationComponentsForJava()Lkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializationComponentsForJava;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializationComponentsForJava$Companion$ModuleData;->getDeserializedDescriptorResolver()Lkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializedDescriptorResolver;
@@ -14710,7 +14917,7 @@ HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializationComponentsForJav
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializationComponentsForJava;-><init>(Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationConfiguration;Lkotlin/reflect/jvm/internal/impl/load/kotlin/JavaClassDataFinder;Lkotlin/reflect/jvm/internal/impl/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl;Lkotlin/reflect/jvm/internal/impl/load/java/lazy/LazyJavaPackageFragmentProvider;Lkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ErrorReporter;Lkotlin/reflect/jvm/internal/impl/incremental/components/LookupTracker;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ContractDeserializer;Lkotlin/reflect/jvm/internal/impl/types/checker/NewKotlinTypeChecker;Lkotlin/reflect/jvm/internal/impl/types/extensions/TypeAttributeTranslators;)V
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializationComponentsForJava;->getComponents()Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationComponents;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializationComponentsForJavaKt$makeLazyJavaPackageFragmentProvider$javaResolverComponents$1;-><init>()V
-HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializationComponentsForJavaKt;->makeDeserializationComponentsForJava(Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses;Lkotlin/reflect/jvm/internal/impl/load/java/lazy/LazyJavaPackageFragmentProvider;Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinClassFinder;Lkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializedDescriptorResolver;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ErrorReporter;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializationComponentsForJava;
+HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializationComponentsForJavaKt;->makeDeserializationComponentsForJava(Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses;Lkotlin/reflect/jvm/internal/impl/load/java/lazy/LazyJavaPackageFragmentProvider;Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinClassFinder;Lkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializedDescriptorResolver;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ErrorReporter;Lkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializationComponentsForJava;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializationComponentsForJavaKt;->makeLazyJavaPackageFragmentProvider$default(Lkotlin/reflect/jvm/internal/impl/load/java/JavaClassFinder;Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses;Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinClassFinder;Lkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializedDescriptorResolver;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ErrorReporter;Lkotlin/reflect/jvm/internal/impl/load/java/sources/JavaSourceElementFactory;Lkotlin/reflect/jvm/internal/impl/load/java/lazy/ModuleClassResolver;Lkotlin/reflect/jvm/internal/impl/load/kotlin/PackagePartProvider;ILjava/lang/Object;)Lkotlin/reflect/jvm/internal/impl/load/java/lazy/LazyJavaPackageFragmentProvider;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializationComponentsForJavaKt;->makeLazyJavaPackageFragmentProvider(Lkotlin/reflect/jvm/internal/impl/load/java/JavaClassFinder;Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses;Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinClassFinder;Lkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializedDescriptorResolver;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ErrorReporter;Lkotlin/reflect/jvm/internal/impl/load/java/sources/JavaSourceElementFactory;Lkotlin/reflect/jvm/internal/impl/load/java/lazy/ModuleClassResolver;Lkotlin/reflect/jvm/internal/impl/load/kotlin/PackagePartProvider;)Lkotlin/reflect/jvm/internal/impl/load/java/lazy/LazyJavaPackageFragmentProvider;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializedDescriptorResolver$Companion;-><init>()V
@@ -14720,6 +14927,7 @@ HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializedDescriptorResolver;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializedDescriptorResolver;->getAbiStability(Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;)Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/descriptors/DeserializedContainerAbiStability;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializedDescriptorResolver;->getComponents()Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationComponents;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializedDescriptorResolver;->getIncompatibility(Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;)Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/IncompatibleVersionErrorData;
+HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializedDescriptorResolver;->getOwnMetadataVersion()Lkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializedDescriptorResolver;->getSkipMetadataVersionCheck()Z
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializedDescriptorResolver;->isCompiledWith13M1(Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;)Z
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializedDescriptorResolver;->isPreReleaseInvisible(Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;)Z
@@ -14738,7 +14946,7 @@ HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinClassFinder$Result$Kotlin
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinClassFinder$Result;-><init>()V
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinClassFinder$Result;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinClassFinder$Result;->toKotlinJvmBinaryClass()Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;
-HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinClassFinderKt;->findKotlinClass(Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinClassFinder;Lkotlin/reflect/jvm/internal/impl/name/ClassId;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;
+HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinClassFinderKt;->findKotlinClass(Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinClassFinder;Lkotlin/reflect/jvm/internal/impl/name/ClassId;Lkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinarySourceElement;-><init>(Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/IncompatibleVersionErrorData;ZLkotlin/reflect/jvm/internal/impl/serialization/deserialization/descriptors/DeserializedContainerAbiStability;)V
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinarySourceElement;->getBinaryClass()Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/MemberSignature$Companion;-><init>()V
@@ -14804,7 +15012,8 @@ HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/header/ReadKotlinClassHeaderAnn
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor;->access$602(Lkotlin/reflect/jvm/internal/impl/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor;I)I
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor;->access$802(Lkotlin/reflect/jvm/internal/impl/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor;[Ljava/lang/String;)[Ljava/lang/String;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor;->access$902(Lkotlin/reflect/jvm/internal/impl/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor;[Ljava/lang/String;)[Ljava/lang/String;
-HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor;->createHeader()Lkotlin/reflect/jvm/internal/impl/load/kotlin/header/KotlinClassHeader;
+HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor;->createHeader(Lkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/header/KotlinClassHeader;
+HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor;->createHeaderWithDefaultMetadataVersion()Lkotlin/reflect/jvm/internal/impl/load/kotlin/header/KotlinClassHeader;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor;->shouldHaveData()Z
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor;->visitAnnotation(Lkotlin/reflect/jvm/internal/impl/name/ClassId;Lkotlin/reflect/jvm/internal/impl/descriptors/SourceElement;)Lkotlin/reflect/jvm/internal/impl/load/kotlin/KotlinJvmBinaryClass$AnnotationArgumentVisitor;
 HSPLkotlin/reflect/jvm/internal/impl/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor;->visitEnd()V
@@ -14935,6 +15144,7 @@ HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Class$Kind;-><init>(Ljava
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Class$Kind;->getNumber()I
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Class$Kind;->values()[Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Class$Kind;
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Class;-><clinit>()V
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Class;-><init>(Lkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;)V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Class;-><init>(Lkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$1;)V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Class;-><init>(Z)V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Class;->getConstructor(I)Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Constructor;
@@ -14953,7 +15163,6 @@ HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Class;->getFqName()I
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Class;->getFunction(I)Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Function;
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Class;->getFunctionCount()I
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Class;->getFunctionList()Ljava/util/List;
-HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Class;->getMultiFieldValueClassUnderlyingNameList()Ljava/util/List;
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Class;->getMultiFieldValueClassUnderlyingTypeCount()I
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Class;->getNestedClassNameList()Ljava/util/List;
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Class;->getProperty(I)Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;
@@ -15005,8 +15214,6 @@ HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$EnumEntry;-><init>(Lkotli
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$EnumEntry;-><init>(Lkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$1;)V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$EnumEntry;-><init>(Z)V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$EnumEntry;->getDefaultInstance()Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$EnumEntry;
-HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$EnumEntry;->getDefaultInstanceForType()Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$EnumEntry;
-HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$EnumEntry;->getDefaultInstanceForType()Lkotlin/reflect/jvm/internal/impl/protobuf/MessageLite;
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$EnumEntry;->initFields()V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$EnumEntry;->isInitialized()Z
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Function$1;-><init>()V
@@ -15043,6 +15250,7 @@ HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Function;->hasReturnType(
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Function;->hasReturnTypeId()Z
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Function;->hasTypeTable()Z
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Function;->initFields()V
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Function;->isInitialized()Z
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$MemberKind$1;-><init>()V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$MemberKind;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$MemberKind;-><init>(Ljava/lang/String;III)V
@@ -15096,10 +15304,44 @@ HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$PackageFragment;->parseFr
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$1;-><init>()V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$1;->parsePartialFrom(Lkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;)Ljava/lang/Object;
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$1;->parsePartialFrom(Lkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;)Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;-><init>()V
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;->access$16000()Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;->build()Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;->build()Lkotlin/reflect/jvm/internal/impl/protobuf/MessageLite;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;->buildPartial()Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;->create()Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;->maybeForceBuilderInitialization()V
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;->mergeFrom(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;)Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;->mergeFrom(Lkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;)Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;->mergeFrom(Lkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;)Lkotlin/reflect/jvm/internal/impl/protobuf/MessageLite$Builder;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;->mergeReturnType(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;)Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;->setFlags(I)Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;->setName(I)Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;-><clinit>()V
-HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;-><init>(Lkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;)V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;-><init>(Lkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$1;)V
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;-><init>(Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableBuilder;)V
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;-><init>(Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableBuilder;Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$1;)V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;-><init>(Z)V
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->access$16202(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;I)I
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->access$16302(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;I)I
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->access$16402(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;I)I
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->access$16502(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;)Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->access$16602(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;I)I
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->access$16700(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;)Ljava/util/List;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->access$16702(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;Ljava/util/List;)Ljava/util/List;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->access$16802(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;)Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->access$16902(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;I)I
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->access$17000(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;)Ljava/util/List;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->access$17002(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;Ljava/util/List;)Ljava/util/List;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->access$17100(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;)Ljava/util/List;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->access$17102(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;Ljava/util/List;)Ljava/util/List;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->access$17202(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$ValueParameter;)Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$ValueParameter;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->access$17302(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;I)I
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->access$17402(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;I)I
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->access$17500(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;)Ljava/util/List;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->access$17502(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;Ljava/util/List;)Ljava/util/List;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->access$17602(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;I)I
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->access$17700(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;)Lkotlin/reflect/jvm/internal/impl/protobuf/ByteString;
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->getContextReceiverTypeCount()I
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->getContextReceiverTypeIdList()Ljava/util/List;
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->getContextReceiverTypeList()Ljava/util/List;
@@ -15118,12 +15360,18 @@ HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->getVersionRequ
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->hasFlags()Z
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->hasGetterFlags()Z
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->hasName()Z
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->hasOldFlags()Z
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->hasReceiverType()Z
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->hasReceiverTypeId()Z
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->hasReturnType()Z
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->hasReturnTypeId()Z
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->hasSetterFlags()Z
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->hasSetterValueParameter()Z
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->initFields()V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->isInitialized()Z
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->newBuilder()Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->newBuilderForType()Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->newBuilderForType()Lkotlin/reflect/jvm/internal/impl/protobuf/MessageLite$Builder;
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;->writeTo(Lkotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream;)V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$QualifiedNameTable$1;-><init>()V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$QualifiedNameTable$1;->parsePartialFrom(Lkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;)Ljava/lang/Object;
@@ -15289,7 +15537,7 @@ HSPLkotlin/reflect/jvm/internal/impl/metadata/builtins/BuiltInsBinaryVersion$Com
 HSPLkotlin/reflect/jvm/internal/impl/metadata/builtins/BuiltInsBinaryVersion$Companion;->readFrom(Ljava/io/InputStream;)Lkotlin/reflect/jvm/internal/impl/metadata/builtins/BuiltInsBinaryVersion;
 HSPLkotlin/reflect/jvm/internal/impl/metadata/builtins/BuiltInsBinaryVersion;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/builtins/BuiltInsBinaryVersion;-><init>([I)V
-HSPLkotlin/reflect/jvm/internal/impl/metadata/builtins/BuiltInsBinaryVersion;->isCompatible()Z
+HSPLkotlin/reflect/jvm/internal/impl/metadata/builtins/BuiltInsBinaryVersion;->isCompatibleWithCurrentCompilerVersion()Z
 HSPLkotlin/reflect/jvm/internal/impl/metadata/builtins/BuiltInsProtoBuf;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/builtins/BuiltInsProtoBuf;->registerAllExtensions(Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;)V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/builtins/ReadPackageFragmentKt;->readBuiltinsPackageFragment(Ljava/io/InputStream;)Lkotlin/Pair;
@@ -15488,7 +15736,6 @@ HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmFlags;->get
 HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMemberSignature$Field;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMemberSignature$Field;->component1()Ljava/lang/String;
 HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMemberSignature$Field;->component2()Ljava/lang/String;
-HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMemberSignature$Field;->getDesc()Ljava/lang/String;
 HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMemberSignature$Field;->getName()Ljava/lang/String;
 HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMemberSignature$Method;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMemberSignature$Method;->asString()Ljava/lang/String;
@@ -15501,7 +15748,11 @@ HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVer
 HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;-><init>([I)V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;-><init>([IZ)V
-HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;->isCompatible()Z
+HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;->isCompatible(Lkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;)Z
+HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;->isCompatibleInternal(Lkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;)Z
+HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;->lastSupportedVersionWithThisLanguageVersion(Z)Lkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;
+HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;->newerThan(Lkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;)Z
+HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;->next()Lkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;
 HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmNameResolver;-><init>(Lkotlin/reflect/jvm/internal/impl/metadata/jvm/JvmProtoBuf$StringTableTypes;[Ljava/lang/String;)V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmNameResolverBase$Companion;-><init>()V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmNameResolverBase$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -15509,7 +15760,6 @@ HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmNameResolve
 HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmNameResolverBase;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmNameResolverBase;-><init>([Ljava/lang/String;Ljava/util/Set;Ljava/util/List;)V
 HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmNameResolverBase;->getQualifiedClassName(I)Ljava/lang/String;
-HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmNameResolverBase;->getString(I)Ljava/lang/String;
 HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmNameResolverBase;->isLocalClassName(I)Z
 HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmNameResolverKt;->toExpandedRecordsList(Ljava/util/List;)Ljava/util/List;
 HSPLkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmProtoBufUtil;-><clinit>()V
@@ -15678,6 +15928,8 @@ HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;->readBytes()Lkot
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;->readDouble()D
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;->readEnum()I
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;->readFloat()F
+HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;->readInt32()I
+HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;->readMessage(Lkotlin/reflect/jvm/internal/impl/protobuf/Parser;Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;)Lkotlin/reflect/jvm/internal/impl/protobuf/MessageLite;
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;->readRawByte()B
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;->readRawLittleEndian32()I
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;->readRawLittleEndian64()J
@@ -15687,6 +15939,7 @@ HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;->readRawVarint64
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;->readSInt64()J
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;->recomputeBufferSizeAfterLimit()V
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;->refillBuffer(I)V
+HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;->tryRefillBuffer(I)Z
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream;-><init>(Ljava/io/OutputStream;[B)V
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream;->computeBoolSize(IZ)I
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream;->computeBoolSizeNoTag(Z)I
@@ -15701,6 +15954,7 @@ HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream;->computeRawVari
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream;->computeTagSize(I)I
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream;->flush()V
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream;->newInstance(Ljava/io/OutputStream;I)Lkotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream;
+HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream;->refreshBuffer()V
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream;->writeBool(IZ)V
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream;->writeBoolNoTag(Z)V
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream;->writeEnum(II)V
@@ -15730,15 +15984,19 @@ HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;-><init>()V
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;-><init>(Z)V
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;->addRepeatedField(Lkotlin/reflect/jvm/internal/impl/protobuf/FieldSet$FieldDescriptorLite;Ljava/lang/Object;)V
+HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;->clone()Lkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;->computeElementSize(Lkotlin/reflect/jvm/internal/impl/protobuf/WireFormat$FieldType;ILjava/lang/Object;)I
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;->computeElementSizeNoTag(Lkotlin/reflect/jvm/internal/impl/protobuf/WireFormat$FieldType;Ljava/lang/Object;)I
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;->computeFieldSize(Lkotlin/reflect/jvm/internal/impl/protobuf/FieldSet$FieldDescriptorLite;Ljava/lang/Object;)I
+HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;->emptySet()Lkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;->getField(Lkotlin/reflect/jvm/internal/impl/protobuf/FieldSet$FieldDescriptorLite;)Ljava/lang/Object;
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;->getSerializedSize()I
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;->getWireFormatForFieldType(Lkotlin/reflect/jvm/internal/impl/protobuf/WireFormat$FieldType;Z)I
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;->hasField(Lkotlin/reflect/jvm/internal/impl/protobuf/FieldSet$FieldDescriptorLite;)Z
+HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;->isInitialized()Z
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;->isInitialized(Ljava/util/Map$Entry;)Z
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;->iterator()Ljava/util/Iterator;
+HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;->mergeFrom(Lkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;)V
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;->newFieldSet()Lkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;->readPrimitiveField(Lkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;Lkotlin/reflect/jvm/internal/impl/protobuf/WireFormat$FieldType;Z)Ljava/lang/Object;
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;->setField(Lkotlin/reflect/jvm/internal/impl/protobuf/FieldSet$FieldDescriptorLite;Ljava/lang/Object;)V
@@ -15750,15 +16008,22 @@ HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$1;-><clinit>(
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$Builder;-><init>()V
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$Builder;->getUnknownFields()Lkotlin/reflect/jvm/internal/impl/protobuf/ByteString;
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$Builder;->setUnknownFields(Lkotlin/reflect/jvm/internal/impl/protobuf/ByteString;)Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$Builder;
+HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableBuilder;-><init>()V
+HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableBuilder;->access$000(Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableBuilder;)Lkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;
+HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableBuilder;->buildExtensions()Lkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;
+HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableBuilder;->ensureExtensionsIsMutable()V
+HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableBuilder;->mergeExtensionFields(Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableMessage;)V
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableMessage$ExtensionWriter;-><init>(Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableMessage;Z)V
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableMessage$ExtensionWriter;-><init>(Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableMessage;ZLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$1;)V
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableMessage$ExtensionWriter;->writeUntil(ILkotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream;)V
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableMessage;-><init>()V
+HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableMessage;-><init>(Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableBuilder;)V
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableMessage;->access$200(Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableMessage;)Lkotlin/reflect/jvm/internal/impl/protobuf/FieldSet;
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableMessage;->extensionsAreInitialized()Z
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableMessage;->extensionsSerializedSize()I
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableMessage;->getExtension(Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;)Ljava/lang/Object;
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableMessage;->hasExtension(Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;)Z
+HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableMessage;->makeExtensionsImmutable()V
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableMessage;->newExtensionWriter()Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableMessage$ExtensionWriter;
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableMessage;->parseUnknownField(Lkotlin/reflect/jvm/internal/impl/protobuf/CodedInputStream;Lkotlin/reflect/jvm/internal/impl/protobuf/CodedOutputStream;Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;I)Z
 HSPLkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$ExtendableMessage;->verifyExtensionContainingType(Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;)V
@@ -16005,10 +16270,15 @@ HSPLkotlin/reflect/jvm/internal/impl/resolve/ExternalOverridabilityCondition$Res
 HSPLkotlin/reflect/jvm/internal/impl/resolve/ExternalOverridabilityCondition$Result;-><init>(Ljava/lang/String;I)V
 HSPLkotlin/reflect/jvm/internal/impl/resolve/ExternalOverridabilityCondition$Result;->values()[Lkotlin/reflect/jvm/internal/impl/resolve/ExternalOverridabilityCondition$Result;
 HSPLkotlin/reflect/jvm/internal/impl/resolve/InlineClassesUtilsKt;-><clinit>()V
-HSPLkotlin/reflect/jvm/internal/impl/resolve/InlineClassesUtilsKt;->isGetterOfUnderlyingPropertyOfInlineClass(Lkotlin/reflect/jvm/internal/impl/descriptors/CallableDescriptor;)Z
+HSPLkotlin/reflect/jvm/internal/impl/resolve/InlineClassesUtilsKt;->isGetterOfUnderlyingPropertyOfValueClass(Lkotlin/reflect/jvm/internal/impl/descriptors/CallableDescriptor;)Z
 HSPLkotlin/reflect/jvm/internal/impl/resolve/InlineClassesUtilsKt;->isInlineClass(Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptor;)Z
 HSPLkotlin/reflect/jvm/internal/impl/resolve/InlineClassesUtilsKt;->isInlineClassType(Lkotlin/reflect/jvm/internal/impl/types/KotlinType;)Z
+HSPLkotlin/reflect/jvm/internal/impl/resolve/InlineClassesUtilsKt;->isMultiFieldValueClass(Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptor;)Z
 HSPLkotlin/reflect/jvm/internal/impl/resolve/InlineClassesUtilsKt;->isUnderlyingPropertyOfInlineClass(Lkotlin/reflect/jvm/internal/impl/descriptors/VariableDescriptor;)Z
+HSPLkotlin/reflect/jvm/internal/impl/resolve/InlineClassesUtilsKt;->isUnderlyingPropertyOfValueClass(Lkotlin/reflect/jvm/internal/impl/descriptors/VariableDescriptor;)Z
+HSPLkotlin/reflect/jvm/internal/impl/resolve/InlineClassesUtilsKt;->isValueClass(Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptor;)Z
+HSPLkotlin/reflect/jvm/internal/impl/resolve/InlineClassesUtilsKt;->isValueClassType(Lkotlin/reflect/jvm/internal/impl/types/KotlinType;)Z
+HSPLkotlin/reflect/jvm/internal/impl/resolve/InlineClassesUtilsKt;->needsMfvcFlattening(Lkotlin/reflect/jvm/internal/impl/types/KotlinType;)Z
 HSPLkotlin/reflect/jvm/internal/impl/resolve/MemberComparator$NameAndTypeMemberComparator;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/resolve/MemberComparator$NameAndTypeMemberComparator;-><init>()V
 HSPLkotlin/reflect/jvm/internal/impl/resolve/MemberComparator$NameAndTypeMemberComparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
@@ -16080,7 +16350,7 @@ HSPLkotlin/reflect/jvm/internal/impl/resolve/constants/BooleanValue;-><init>(Z)V
 HSPLkotlin/reflect/jvm/internal/impl/resolve/constants/ConstantValue;-><init>(Ljava/lang/Object;)V
 HSPLkotlin/reflect/jvm/internal/impl/resolve/constants/ConstantValueFactory;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/resolve/constants/ConstantValueFactory;-><init>()V
-HSPLkotlin/reflect/jvm/internal/impl/resolve/constants/ConstantValueFactory;->createConstantValue(Ljava/lang/Object;)Lkotlin/reflect/jvm/internal/impl/resolve/constants/ConstantValue;
+HSPLkotlin/reflect/jvm/internal/impl/resolve/constants/ConstantValueFactory;->createConstantValue(Ljava/lang/Object;Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;)Lkotlin/reflect/jvm/internal/impl/resolve/constants/ConstantValue;
 HSPLkotlin/reflect/jvm/internal/impl/resolve/constants/EnumValue;-><init>(Lkotlin/reflect/jvm/internal/impl/name/ClassId;Lkotlin/reflect/jvm/internal/impl/name/Name;)V
 HSPLkotlin/reflect/jvm/internal/impl/resolve/constants/IntValue;-><init>(I)V
 HSPLkotlin/reflect/jvm/internal/impl/resolve/constants/IntegerValueConstant;-><init>(Ljava/lang/Object;)V
@@ -16102,11 +16372,10 @@ HSPLkotlin/reflect/jvm/internal/impl/resolve/descriptorUtil/DescriptorUtilsKt;->
 HSPLkotlin/reflect/jvm/internal/impl/resolve/descriptorUtil/DescriptorUtilsKt;->getKotlinTypeRefiner(Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;)Lkotlin/reflect/jvm/internal/impl/types/checker/KotlinTypeRefiner;
 HSPLkotlin/reflect/jvm/internal/impl/resolve/descriptorUtil/DescriptorUtilsKt;->getModule(Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptor;)Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;
 HSPLkotlin/reflect/jvm/internal/impl/resolve/jvm/CompositeSyntheticJavaPartsProvider;-><init>(Ljava/util/List;)V
-HSPLkotlin/reflect/jvm/internal/impl/resolve/jvm/InlineClassManglingRulesKt;->isInlineClassThatRequiresMangling(Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptor;)Z
-HSPLkotlin/reflect/jvm/internal/impl/resolve/jvm/InlineClassManglingRulesKt;->isInlineClassThatRequiresMangling(Lkotlin/reflect/jvm/internal/impl/types/KotlinType;)Z
-HSPLkotlin/reflect/jvm/internal/impl/resolve/jvm/InlineClassManglingRulesKt;->isTypeParameterWithUpperBoundThatRequiresMangling(Lkotlin/reflect/jvm/internal/impl/types/KotlinType;)Z
+HSPLkotlin/reflect/jvm/internal/impl/resolve/jvm/InlineClassManglingRulesKt;->isTypeParameterWithUpperBoundThatRequiresMangling(Lkotlin/reflect/jvm/internal/impl/types/KotlinType;Z)Z
+HSPLkotlin/reflect/jvm/internal/impl/resolve/jvm/InlineClassManglingRulesKt;->isValueClassThatRequiresMangling(Lkotlin/reflect/jvm/internal/impl/types/KotlinType;)Z
 HSPLkotlin/reflect/jvm/internal/impl/resolve/jvm/InlineClassManglingRulesKt;->requiresFunctionNameManglingInParameterTypes(Lkotlin/reflect/jvm/internal/impl/types/KotlinType;)Z
-HSPLkotlin/reflect/jvm/internal/impl/resolve/jvm/InlineClassManglingRulesKt;->shouldHideConstructorDueToInlineClassTypeValueParameters(Lkotlin/reflect/jvm/internal/impl/descriptors/CallableMemberDescriptor;)Z
+HSPLkotlin/reflect/jvm/internal/impl/resolve/jvm/InlineClassManglingRulesKt;->shouldHideConstructorDueToValueClassTypeValueParameters(Lkotlin/reflect/jvm/internal/impl/descriptors/CallableMemberDescriptor;)Z
 HSPLkotlin/reflect/jvm/internal/impl/resolve/jvm/JavaDescriptorResolver;-><init>(Lkotlin/reflect/jvm/internal/impl/load/java/lazy/LazyJavaPackageFragmentProvider;Lkotlin/reflect/jvm/internal/impl/load/java/components/JavaResolverCache;)V
 HSPLkotlin/reflect/jvm/internal/impl/resolve/jvm/JavaDescriptorResolver;->getPackageFragmentProvider()Lkotlin/reflect/jvm/internal/impl/load/java/lazy/LazyJavaPackageFragmentProvider;
 HSPLkotlin/reflect/jvm/internal/impl/resolve/jvm/JvmClassName;-><init>(Ljava/lang/String;)V
@@ -16187,7 +16456,7 @@ HSPLkotlin/reflect/jvm/internal/impl/resolve/scopes/receivers/ExtensionReceiver;
 HSPLkotlin/reflect/jvm/internal/impl/resolve/scopes/receivers/ImplicitClassReceiver;-><init>(Lkotlin/reflect/jvm/internal/impl/descriptors/ClassDescriptor;Lkotlin/reflect/jvm/internal/impl/resolve/scopes/receivers/ImplicitClassReceiver;)V
 HSPLkotlin/reflect/jvm/internal/impl/resolve/scopes/receivers/ImplicitClassReceiver;->getType()Lkotlin/reflect/jvm/internal/impl/types/KotlinType;
 HSPLkotlin/reflect/jvm/internal/impl/resolve/scopes/receivers/ImplicitClassReceiver;->getType()Lkotlin/reflect/jvm/internal/impl/types/SimpleType;
-HSPLkotlin/reflect/jvm/internal/impl/serialization/SerializerExtensionProtocol;-><init>(Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;)V
+HSPLkotlin/reflect/jvm/internal/impl/serialization/SerializerExtensionProtocol;-><init>(Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;)V
 HSPLkotlin/reflect/jvm/internal/impl/serialization/SerializerExtensionProtocol;->getExtensionRegistry()Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/SerializerExtensionProtocol;->getTypeAnnotation()Lkotlin/reflect/jvm/internal/impl/protobuf/GeneratedMessageLite$GeneratedExtension;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/AbstractDeserializedPackageFragmentProvider$fragments$1;-><init>(Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/AbstractDeserializedPackageFragmentProvider;)V
@@ -16234,8 +16503,8 @@ HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/ContractDeser
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/ContractDeserializer$Companion;-><init>()V
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/ContractDeserializer$Companion;->getDEFAULT()Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ContractDeserializer;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/ContractDeserializer;-><clinit>()V
-HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationComponents;-><init>(Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationConfiguration;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ClassDataFinder;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/AnnotationAndConstantLoader;Lkotlin/reflect/jvm/internal/impl/descriptors/PackageFragmentProvider;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/LocalClassifierTypeSettings;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ErrorReporter;Lkotlin/reflect/jvm/internal/impl/incremental/components/LookupTracker;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/FlexibleTypeDeserializer;Ljava/lang/Iterable;Lkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ContractDeserializer;Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/AdditionalClassPartsProvider;Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/PlatformDependentDeclarationFilter;Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;Lkotlin/reflect/jvm/internal/impl/types/checker/NewKotlinTypeChecker;Lkotlin/reflect/jvm/internal/impl/resolve/sam/SamConversionResolver;Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/PlatformDependentTypeTransformer;Ljava/util/List;)V
-HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationComponents;-><init>(Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationConfiguration;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ClassDataFinder;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/AnnotationAndConstantLoader;Lkotlin/reflect/jvm/internal/impl/descriptors/PackageFragmentProvider;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/LocalClassifierTypeSettings;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ErrorReporter;Lkotlin/reflect/jvm/internal/impl/incremental/components/LookupTracker;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/FlexibleTypeDeserializer;Ljava/lang/Iterable;Lkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ContractDeserializer;Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/AdditionalClassPartsProvider;Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/PlatformDependentDeclarationFilter;Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;Lkotlin/reflect/jvm/internal/impl/types/checker/NewKotlinTypeChecker;Lkotlin/reflect/jvm/internal/impl/resolve/sam/SamConversionResolver;Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/PlatformDependentTypeTransformer;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationComponents;-><init>(Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationConfiguration;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ClassDataFinder;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/AnnotationAndConstantLoader;Lkotlin/reflect/jvm/internal/impl/descriptors/PackageFragmentProvider;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/LocalClassifierTypeSettings;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ErrorReporter;Lkotlin/reflect/jvm/internal/impl/incremental/components/LookupTracker;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/FlexibleTypeDeserializer;Ljava/lang/Iterable;Lkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ContractDeserializer;Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/AdditionalClassPartsProvider;Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/PlatformDependentDeclarationFilter;Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;Lkotlin/reflect/jvm/internal/impl/types/checker/NewKotlinTypeChecker;Lkotlin/reflect/jvm/internal/impl/resolve/sam/SamConversionResolver;Ljava/util/List;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/EnumEntriesDeserializationSupport;)V
+HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationComponents;-><init>(Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationConfiguration;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ClassDataFinder;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/AnnotationAndConstantLoader;Lkotlin/reflect/jvm/internal/impl/descriptors/PackageFragmentProvider;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/LocalClassifierTypeSettings;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ErrorReporter;Lkotlin/reflect/jvm/internal/impl/incremental/components/LookupTracker;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/FlexibleTypeDeserializer;Ljava/lang/Iterable;Lkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ContractDeserializer;Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/AdditionalClassPartsProvider;Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/PlatformDependentDeclarationFilter;Lkotlin/reflect/jvm/internal/impl/protobuf/ExtensionRegistryLite;Lkotlin/reflect/jvm/internal/impl/types/checker/NewKotlinTypeChecker;Lkotlin/reflect/jvm/internal/impl/resolve/sam/SamConversionResolver;Ljava/util/List;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/EnumEntriesDeserializationSupport;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationComponents;->createContext(Lkotlin/reflect/jvm/internal/impl/descriptors/PackageFragmentDescriptor;Lkotlin/reflect/jvm/internal/impl/metadata/deserialization/NameResolver;Lkotlin/reflect/jvm/internal/impl/metadata/deserialization/TypeTable;Lkotlin/reflect/jvm/internal/impl/metadata/deserialization/VersionRequirementTable;Lkotlin/reflect/jvm/internal/impl/metadata/deserialization/BinaryVersion;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/descriptors/DeserializedContainerSource;)Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationContext;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationComponents;->deserializeClass(Lkotlin/reflect/jvm/internal/impl/name/ClassId;)Lkotlin/reflect/jvm/internal/impl/descriptors/ClassDescriptor;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationComponents;->getAdditionalClassPartsProvider()Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/AdditionalClassPartsProvider;
@@ -16252,12 +16521,12 @@ HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/Deserializati
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationComponents;->getNotFoundClasses()Lkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationComponents;->getPackageFragmentProvider()Lkotlin/reflect/jvm/internal/impl/descriptors/PackageFragmentProvider;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationComponents;->getPlatformDependentDeclarationFilter()Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/PlatformDependentDeclarationFilter;
-HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationComponents;->getPlatformDependentTypeTransformer()Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/PlatformDependentTypeTransformer;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationComponents;->getStorageManager()Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationComponents;->getTypeAttributeTranslators()Ljava/util/List;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationConfiguration$Default;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationConfiguration$Default;-><init>()V
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationConfiguration$Default;->getAllowUnstableDependencies()Z
+HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationConfiguration$Default;->getBinaryVersion()Lkotlin/reflect/jvm/internal/impl/metadata/deserialization/BinaryVersion;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationConfiguration$Default;->getPreserveDeclarationsOrdering()Z
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationConfiguration$Default;->getReportErrorsOnPreReleaseDependencies()Z
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationConfiguration$Default;->getSkipMetadataVersionCheck()Z
@@ -16295,6 +16564,8 @@ HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/ErrorReporter
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/ErrorReporter;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/FlexibleTypeDeserializer$ThrowException;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/FlexibleTypeDeserializer$ThrowException;-><init>()V
+HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/JvmEnumEntriesDeserializationSupport;-><clinit>()V
+HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/JvmEnumEntriesDeserializationSupport;-><init>()V
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/LocalClassifierTypeSettings$Default;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/LocalClassifierTypeSettings$Default;-><init>()V
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/MemberDeserializer$getAnnotations$1;-><init>(Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/MemberDeserializer;Lkotlin/reflect/jvm/internal/impl/protobuf/MessageLite;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/AnnotatedCallableKind;)V
@@ -16317,6 +16588,7 @@ HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/MemberDeseria
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/MemberDeserializer;->getReceiverParameterAnnotations(Lkotlin/reflect/jvm/internal/impl/protobuf/MessageLite;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/AnnotatedCallableKind;)Lkotlin/reflect/jvm/internal/impl/descriptors/annotations/Annotations;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/MemberDeserializer;->initializeWithCoroutinesExperimentalityStatus(Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/descriptors/DeserializedSimpleFunctionDescriptor;Lkotlin/reflect/jvm/internal/impl/descriptors/ReceiverParameterDescriptor;Lkotlin/reflect/jvm/internal/impl/descriptors/ReceiverParameterDescriptor;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lkotlin/reflect/jvm/internal/impl/types/KotlinType;Lkotlin/reflect/jvm/internal/impl/descriptors/Modality;Lkotlin/reflect/jvm/internal/impl/descriptors/DescriptorVisibility;Ljava/util/Map;)V
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/MemberDeserializer;->loadConstructor(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Constructor;Z)Lkotlin/reflect/jvm/internal/impl/descriptors/ClassConstructorDescriptor;
+HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/MemberDeserializer;->loadFunction(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Function;)Lkotlin/reflect/jvm/internal/impl/descriptors/SimpleFunctionDescriptor;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/MemberDeserializer;->loadOldFlags(I)I
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/MemberDeserializer;->loadProperty(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;)Lkotlin/reflect/jvm/internal/impl/descriptors/PropertyDescriptor;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/MemberDeserializer;->valueParameters(Ljava/util/List;Lkotlin/reflect/jvm/internal/impl/protobuf/MessageLite;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/AnnotatedCallableKind;)Ljava/util/List;
@@ -16356,6 +16628,7 @@ HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/TypeDeseriali
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/TypeDeserializer;->computeLocalClassifierReplacementType(I)Lkotlin/reflect/jvm/internal/impl/types/SimpleType;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/TypeDeserializer;->getOwnTypeParameters()Ljava/util/List;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/TypeDeserializer;->simpleType$collectAllArguments(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/TypeDeserializer;)Ljava/util/List;
+HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/TypeDeserializer;->simpleType(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;Z)Lkotlin/reflect/jvm/internal/impl/types/SimpleType;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/TypeDeserializer;->toAttributes(Ljava/util/List;Lkotlin/reflect/jvm/internal/impl/descriptors/annotations/Annotations;Lkotlin/reflect/jvm/internal/impl/types/TypeConstructor;Lkotlin/reflect/jvm/internal/impl/descriptors/DeclarationDescriptor;)Lkotlin/reflect/jvm/internal/impl/types/TypeAttributes;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/TypeDeserializer;->type(Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type;)Lkotlin/reflect/jvm/internal/impl/types/KotlinType;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/TypeDeserializer;->typeArgument(Lkotlin/reflect/jvm/internal/impl/descriptors/TypeParameterDescriptor;Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Type$Argument;)Lkotlin/reflect/jvm/internal/impl/types/TypeProjection;
@@ -16365,12 +16638,6 @@ HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/builtins/Buil
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/builtins/BuiltInSerializerProtocol;->getBuiltInsFileName(Lkotlin/reflect/jvm/internal/impl/name/FqName;)Ljava/lang/String;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/builtins/BuiltInSerializerProtocol;->getBuiltInsFilePath(Lkotlin/reflect/jvm/internal/impl/name/FqName;)Ljava/lang/String;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/builtins/BuiltInSerializerProtocol;->shortName(Lkotlin/reflect/jvm/internal/impl/name/FqName;)Ljava/lang/String;
-HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/builtins/BuiltInsLoaderImpl$createPackageFragmentProvider$1;-><init>(Ljava/lang/Object;)V
-HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/builtins/BuiltInsLoaderImpl$createPackageFragmentProvider$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/builtins/BuiltInsLoaderImpl$createPackageFragmentProvider$1;->invoke(Ljava/lang/String;)Ljava/io/InputStream;
-HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/builtins/BuiltInsLoaderImpl;-><init>()V
-HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/builtins/BuiltInsLoaderImpl;->createBuiltInPackageFragmentProvider(Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;Ljava/util/Set;Ljava/lang/Iterable;Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/PlatformDependentDeclarationFilter;Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/AdditionalClassPartsProvider;ZLkotlin/jvm/functions/Function1;)Lkotlin/reflect/jvm/internal/impl/descriptors/PackageFragmentProvider;
-HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/builtins/BuiltInsLoaderImpl;->createPackageFragmentProvider(Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;Ljava/lang/Iterable;Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/PlatformDependentDeclarationFilter;Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/AdditionalClassPartsProvider;Z)Lkotlin/reflect/jvm/internal/impl/descriptors/PackageFragmentProvider;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/builtins/BuiltInsPackageFragmentImpl$Companion;-><init>()V
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/builtins/BuiltInsPackageFragmentImpl$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/builtins/BuiltInsPackageFragmentImpl$Companion;->create(Lkotlin/reflect/jvm/internal/impl/name/FqName;Lkotlin/reflect/jvm/internal/impl/storage/StorageManager;Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;Ljava/io/InputStream;Z)Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/builtins/BuiltInsPackageFragmentImpl;
@@ -16453,8 +16720,6 @@ HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/descriptors/D
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/descriptors/DeserializedClassDescriptor;->access$getEnumEntries$p(Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/descriptors/DeserializedClassDescriptor;)Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/descriptors/DeserializedClassDescriptor$EnumEntryClassDescriptors;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/descriptors/DeserializedClassDescriptor;->access$getTypeConstructor$p(Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/descriptors/DeserializedClassDescriptor;)Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/descriptors/DeserializedClassDescriptor$DeserializedClassTypeConstructor;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/descriptors/DeserializedClassDescriptor;->computeConstructors()Ljava/util/Collection;
-HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/descriptors/DeserializedClassDescriptor;->computeInlineClassRepresentation()Lkotlin/reflect/jvm/internal/impl/descriptors/InlineClassRepresentation;
-HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/descriptors/DeserializedClassDescriptor;->computeMultiFieldValueClassRepresentation()Lkotlin/reflect/jvm/internal/impl/descriptors/MultiFieldValueClassRepresentation;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/descriptors/DeserializedClassDescriptor;->computePrimaryConstructor()Lkotlin/reflect/jvm/internal/impl/descriptors/ClassConstructorDescriptor;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/descriptors/DeserializedClassDescriptor;->computeSecondaryConstructors()Ljava/util/List;
 HSPLkotlin/reflect/jvm/internal/impl/serialization/deserialization/descriptors/DeserializedClassDescriptor;->computeValueClassRepresentation()Lkotlin/reflect/jvm/internal/impl/descriptors/ValueClassRepresentation;
@@ -16581,7 +16846,6 @@ HSPLkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager$KeyWithComp
 HSPLkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager$KeyWithComputation;->equals(Ljava/lang/Object;)Z
 HSPLkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager$KeyWithComputation;->hashCode()I
 HSPLkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager$LockBasedLazyValue;-><init>(Lkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager;Lkotlin/jvm/functions/Function0;)V
-HSPLkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager$LockBasedLazyValue;->invoke()Ljava/lang/Object;
 HSPLkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager$LockBasedLazyValue;->postCompute(Ljava/lang/Object;)V
 HSPLkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager$LockBasedLazyValueWithPostCompute;-><init>(Lkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager;Lkotlin/jvm/functions/Function0;)V
 HSPLkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager$LockBasedLazyValueWithPostCompute;->invoke()Ljava/lang/Object;
@@ -16593,7 +16857,6 @@ HSPLkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager$LockBasedNo
 HSPLkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager$LockBasedNotNullLazyValueWithPostCompute;-><init>(Lkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager;Lkotlin/jvm/functions/Function0;)V
 HSPLkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager$LockBasedNotNullLazyValueWithPostCompute;->invoke()Ljava/lang/Object;
 HSPLkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager$MapBasedMemoizedFunction;-><init>(Lkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager;Ljava/util/concurrent/ConcurrentMap;Lkotlin/jvm/functions/Function1;)V
-HSPLkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager$MapBasedMemoizedFunction;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager$MapBasedMemoizedFunctionToNotNull;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager$MapBasedMemoizedFunctionToNotNull;-><init>(Lkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager;Ljava/util/concurrent/ConcurrentMap;Lkotlin/jvm/functions/Function1;)V
 HSPLkotlin/reflect/jvm/internal/impl/storage/LockBasedStorageManager$MapBasedMemoizedFunctionToNotNull;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
@@ -16800,6 +17063,8 @@ HSPLkotlin/reflect/jvm/internal/impl/types/error/ErrorEntity;->$values()[Lkotlin
 HSPLkotlin/reflect/jvm/internal/impl/types/error/ErrorEntity;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/types/error/ErrorEntity;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 HSPLkotlin/reflect/jvm/internal/impl/types/error/ErrorEntity;->getDebugText()Ljava/lang/String;
+HSPLkotlin/reflect/jvm/internal/impl/types/error/ErrorModuleDescriptor$builtIns$2;-><clinit>()V
+HSPLkotlin/reflect/jvm/internal/impl/types/error/ErrorModuleDescriptor$builtIns$2;-><init>()V
 HSPLkotlin/reflect/jvm/internal/impl/types/error/ErrorModuleDescriptor;-><clinit>()V
 HSPLkotlin/reflect/jvm/internal/impl/types/error/ErrorModuleDescriptor;-><init>()V
 HSPLkotlin/reflect/jvm/internal/impl/types/error/ErrorPropertyDescriptor;-><init>()V
@@ -16871,6 +17136,7 @@ HSPLkotlin/reflect/jvm/internal/impl/utils/DFS;->dfs(Ljava/util/Collection;Lkotl
 HSPLkotlin/reflect/jvm/internal/impl/utils/DFS;->dfs(Ljava/util/Collection;Lkotlin/reflect/jvm/internal/impl/utils/DFS$Neighbors;Lkotlin/reflect/jvm/internal/impl/utils/DFS$Visited;Lkotlin/reflect/jvm/internal/impl/utils/DFS$NodeHandler;)Ljava/lang/Object;
 HSPLkotlin/reflect/jvm/internal/impl/utils/DFS;->doDfs(Ljava/lang/Object;Lkotlin/reflect/jvm/internal/impl/utils/DFS$Neighbors;Lkotlin/reflect/jvm/internal/impl/utils/DFS$Visited;Lkotlin/reflect/jvm/internal/impl/utils/DFS$NodeHandler;)V
 HSPLkotlin/reflect/jvm/internal/impl/utils/DFS;->ifAny(Ljava/util/Collection;Lkotlin/reflect/jvm/internal/impl/utils/DFS$Neighbors;Lkotlin/jvm/functions/Function1;)Ljava/lang/Boolean;
+HSPLkotlin/reflect/jvm/internal/impl/utils/DeserializationHelpersKt;->jvmMetadataVersionOrDefault(Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializationConfiguration;)Lkotlin/reflect/jvm/internal/impl/metadata/jvm/deserialization/JvmMetadataVersion;
 HSPLkotlin/reflect/jvm/internal/impl/utils/SmartList;-><init>()V
 HSPLkotlin/reflect/jvm/internal/impl/utils/SmartList;->add(Ljava/lang/Object;)Z
 HSPLkotlin/reflect/jvm/internal/impl/utils/SmartList;->size()I
@@ -16908,7 +17174,6 @@ HSPLkotlin/sequences/FilteringSequence;->access$getSendWhen$p(Lkotlin/sequences/
 HSPLkotlin/sequences/FilteringSequence;->access$getSequence$p(Lkotlin/sequences/FilteringSequence;)Lkotlin/sequences/Sequence;
 HSPLkotlin/sequences/FilteringSequence;->iterator()Ljava/util/Iterator;
 HSPLkotlin/sequences/FlatteningSequence$iterator$1;-><init>(Lkotlin/sequences/FlatteningSequence;)V
-HSPLkotlin/sequences/FlatteningSequence$iterator$1;->ensureItemIterator()Z
 HSPLkotlin/sequences/FlatteningSequence$iterator$1;->hasNext()Z
 HSPLkotlin/sequences/FlatteningSequence$iterator$1;->next()Ljava/lang/Object;
 HSPLkotlin/sequences/FlatteningSequence;-><init>(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
@@ -16959,8 +17224,6 @@ HSPLkotlin/sequences/SequencesKt__SequencesKt;->constrainOnce(Lkotlin/sequences/
 HSPLkotlin/sequences/SequencesKt__SequencesKt;->generateSequence(Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
 HSPLkotlin/sequences/SequencesKt__SequencesKt;->generateSequence(Lkotlin/jvm/functions/Function0;)Lkotlin/sequences/Sequence;
 HSPLkotlin/sequences/SequencesKt___SequencesJvmKt$filterIsInstance$1;-><init>(Ljava/lang/Class;)V
-HSPLkotlin/sequences/SequencesKt___SequencesJvmKt$filterIsInstance$1;->invoke(Ljava/lang/Object;)Ljava/lang/Boolean;
-HSPLkotlin/sequences/SequencesKt___SequencesJvmKt$filterIsInstance$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLkotlin/sequences/SequencesKt___SequencesJvmKt;->filterIsInstance(Lkotlin/sequences/Sequence;Ljava/lang/Class;)Lkotlin/sequences/Sequence;
 HSPLkotlin/sequences/SequencesKt___SequencesKt$filterNotNull$1;-><clinit>()V
 HSPLkotlin/sequences/SequencesKt___SequencesKt$filterNotNull$1;-><init>()V
@@ -17033,6 +17296,7 @@ HSPLkotlin/text/StringsKt;->contains$default(Ljava/lang/CharSequence;CZILjava/la
 HSPLkotlin/text/StringsKt;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZILjava/lang/Object;)Z
 HSPLkotlin/text/StringsKt;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
 HSPLkotlin/text/StringsKt;->drop(Ljava/lang/String;I)Ljava/lang/String;
+HSPLkotlin/text/StringsKt;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Z
 HSPLkotlin/text/StringsKt;->getIndices(Ljava/lang/CharSequence;)Lkotlin/ranges/IntRange;
 HSPLkotlin/text/StringsKt;->getLastIndex(Ljava/lang/CharSequence;)I
 HSPLkotlin/text/StringsKt;->indexOf$default(Ljava/lang/CharSequence;CIZILjava/lang/Object;)I
@@ -17062,6 +17326,8 @@ HSPLkotlin/text/StringsKt__IndentKt;->replaceIndent(Ljava/lang/String;Ljava/lang
 HSPLkotlin/text/StringsKt__IndentKt;->trimIndent(Ljava/lang/String;)Ljava/lang/String;
 HSPLkotlin/text/StringsKt__StringNumberConversionsKt;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
 HSPLkotlin/text/StringsKt__StringNumberConversionsKt;->toLongOrNull(Ljava/lang/String;I)Ljava/lang/Long;
+HSPLkotlin/text/StringsKt__StringsJVMKt;->endsWith$default(Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Z
+HSPLkotlin/text/StringsKt__StringsJVMKt;->endsWith(Ljava/lang/String;Ljava/lang/String;Z)Z
 HSPLkotlin/text/StringsKt__StringsJVMKt;->isBlank(Ljava/lang/CharSequence;)Z
 HSPLkotlin/text/StringsKt__StringsJVMKt;->regionMatches(Ljava/lang/String;ILjava/lang/String;IIZ)Z
 HSPLkotlin/text/StringsKt__StringsJVMKt;->replace$default(Ljava/lang/String;CCZILjava/lang/Object;)Ljava/lang/String;
@@ -17103,6 +17369,7 @@ HSPLkotlin/text/StringsKt__StringsKt;->splitToSequence$default(Ljava/lang/CharSe
 HSPLkotlin/text/StringsKt__StringsKt;->splitToSequence(Ljava/lang/CharSequence;[Ljava/lang/String;ZI)Lkotlin/sequences/Sequence;
 HSPLkotlin/text/StringsKt__StringsKt;->startsWith$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZILjava/lang/Object;)Z
 HSPLkotlin/text/StringsKt__StringsKt;->startsWith(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+HSPLkotlin/text/StringsKt__StringsKt;->substring(Ljava/lang/CharSequence;Lkotlin/ranges/IntRange;)Ljava/lang/String;
 HSPLkotlin/text/StringsKt__StringsKt;->substringAfter(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 HSPLkotlin/text/StringsKt__StringsKt;->substringBeforeLast(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 HSPLkotlin/text/StringsKt__StringsKt;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
@@ -17113,8 +17380,10 @@ HSPLkotlin/time/Duration$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstruc
 HSPLkotlin/time/Duration;-><clinit>()V
 HSPLkotlin/time/Duration;-><init>(J)V
 HSPLkotlin/time/Duration;->box-impl(J)Lkotlin/time/Duration;
+HSPLkotlin/time/Duration;->compareTo-LRDsOJo(JJ)I
 HSPLkotlin/time/Duration;->constructor-impl(J)J
 HSPLkotlin/time/Duration;->getInWholeMilliseconds-impl(J)J
+HSPLkotlin/time/Duration;->getInWholeSeconds-impl(J)J
 HSPLkotlin/time/Duration;->getStorageUnit-impl(J)Lkotlin/time/DurationUnit;
 HSPLkotlin/time/Duration;->getValue-impl(J)J
 HSPLkotlin/time/Duration;->isInMillis-impl(J)Z
@@ -17212,6 +17481,7 @@ HSPLkotlinx/coroutines/flow/SharedFlowKt;->setBufferAt([Ljava/lang/Object;JLjava
 HSPLkotlinx/coroutines/flow/StateFlowImpl;-><clinit>()V
 HSPLkotlinx/coroutines/flow/StateFlowImpl;-><init>(Ljava/lang/Object;)V
 HSPLkotlinx/coroutines/flow/StateFlowImpl;->getValue()Ljava/lang/Object;
+HSPLkotlinx/coroutines/flow/StateFlowImpl;->get_state$volatile$FU()Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 HSPLkotlinx/coroutines/flow/StateFlowImpl;->setValue(Ljava/lang/Object;)V
 HSPLkotlinx/coroutines/flow/StateFlowImpl;->tryEmit(Ljava/lang/Object;)Z
 HSPLkotlinx/coroutines/flow/StateFlowImpl;->updateState(Ljava/lang/Object;Ljava/lang/Object;)Z
@@ -17239,6 +17509,7 @@ HSPLnet/zetetic/database/sqlcipher/CloseGuard;->open(Ljava/lang/String;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteClosable;-><init>()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteClosable;->acquireReference()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteClosable;->close()V
+HSPLnet/zetetic/database/sqlcipher/SQLiteClosable;->releaseReference()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection$Operation;-><init>()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection$Operation;-><init>(Lnet/zetetic/database/sqlcipher/SQLiteConnection$1;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection$OperationLog;-><init>()V
@@ -17258,14 +17529,14 @@ HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;-><clinit>()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;-><init>(Lnet/zetetic/database/sqlcipher/SQLiteConnectionPool;Lnet/zetetic/database/sqlcipher/SQLiteDatabaseConfiguration;IZ)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->access$200(Lnet/zetetic/database/sqlcipher/SQLiteConnection;Lnet/zetetic/database/sqlcipher/SQLiteConnection$PreparedStatement;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->access$500()[B
-HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->acquirePreparedStatement(Ljava/lang/String;)Lnet/zetetic/database/sqlcipher/SQLiteConnection$PreparedStatement;
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->applyBlockGuardPolicy(Lnet/zetetic/database/sqlcipher/SQLiteConnection$PreparedStatement;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->attachCancellationSignal(Landroid/os/CancellationSignal;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->bindArguments(Lnet/zetetic/database/sqlcipher/SQLiteConnection$PreparedStatement;[Ljava/lang/Object;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->canonicalizeSyncMode(Ljava/lang/String;)Ljava/lang/String;
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->detachCancellationSignal(Landroid/os/CancellationSignal;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->execute(Ljava/lang/String;[Ljava/lang/Object;Landroid/os/CancellationSignal;)V
-HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->executeForChangedRowCount(Ljava/lang/String;[Ljava/lang/Object;Landroid/os/CancellationSignal;)I
+HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->executeForCursorWindow(Ljava/lang/String;[Ljava/lang/Object;Landroid/database/CursorWindow;IIZLandroid/os/CancellationSignal;)I
+HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->executeForLastInsertedRowId(Ljava/lang/String;[Ljava/lang/Object;Landroid/os/CancellationSignal;)J
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->executeForLong(Ljava/lang/String;[Ljava/lang/Object;Landroid/os/CancellationSignal;)J
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->executeForString(Ljava/lang/String;[Ljava/lang/Object;Landroid/os/CancellationSignal;)Ljava/lang/String;
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->finalizePreparedStatement(Lnet/zetetic/database/sqlcipher/SQLiteConnection$PreparedStatement;)V
@@ -17276,7 +17547,6 @@ HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->isPrimaryConnection()Z
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->obtainPreparedStatement(Ljava/lang/String;JIIZ)Lnet/zetetic/database/sqlcipher/SQLiteConnection$PreparedStatement;
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->open()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->open(Lnet/zetetic/database/sqlcipher/SQLiteConnectionPool;Lnet/zetetic/database/sqlcipher/SQLiteDatabaseConfiguration;IZ)Lnet/zetetic/database/sqlcipher/SQLiteConnection;
-HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->prepare(Ljava/lang/String;Lnet/zetetic/database/sqlcipher/SQLiteStatementInfo;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->reconfigure(Lnet/zetetic/database/sqlcipher/SQLiteDatabaseConfiguration;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->recyclePreparedStatement(Lnet/zetetic/database/sqlcipher/SQLiteConnection$PreparedStatement;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnection;->releasePreparedStatement(Lnet/zetetic/database/sqlcipher/SQLiteConnection$PreparedStatement;)V
@@ -17308,9 +17578,9 @@ HSPLnet/zetetic/database/sqlcipher/SQLiteConnectionPool;->reconfigure(Lnet/zetet
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnectionPool;->reconfigureAllConnectionsLocked()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnectionPool;->recycleConnectionLocked(Lnet/zetetic/database/sqlcipher/SQLiteConnection;Lnet/zetetic/database/sqlcipher/SQLiteConnectionPool$AcquiredConnectionStatus;)Z
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnectionPool;->recycleConnectionWaiterLocked(Lnet/zetetic/database/sqlcipher/SQLiteConnectionPool$ConnectionWaiter;)V
+HSPLnet/zetetic/database/sqlcipher/SQLiteConnectionPool;->releaseConnection(Lnet/zetetic/database/sqlcipher/SQLiteConnection;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnectionPool;->setMaxConnectionPoolSizeLocked()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnectionPool;->throwIfClosedLocked()V
-HSPLnet/zetetic/database/sqlcipher/SQLiteConnectionPool;->tryAcquireNonPrimaryConnectionLocked(Ljava/lang/String;I)Lnet/zetetic/database/sqlcipher/SQLiteConnection;
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnectionPool;->tryAcquirePrimaryConnectionLocked(I)Lnet/zetetic/database/sqlcipher/SQLiteConnection;
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnectionPool;->waitForConnection(Ljava/lang/String;ILandroid/os/CancellationSignal;)Lnet/zetetic/database/sqlcipher/SQLiteConnection;
 HSPLnet/zetetic/database/sqlcipher/SQLiteConnectionPool;->wakeConnectionWaitersLocked()V
@@ -17347,9 +17617,9 @@ HSPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->executeSql(Ljava/lang/String
 HSPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->findEditTable(Ljava/lang/String;)Ljava/lang/String;
 HSPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->getPath()Ljava/lang/String;
 HSPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->getThreadDefaultConnectionFlags(Z)I
+HSPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->getThreadSession()Lnet/zetetic/database/sqlcipher/SQLiteSession;
 HSPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->getVersion()I
 HSPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->hasCodec()Z
-HSPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->inTransaction()Z
 HSPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->insert(Ljava/lang/String;ILandroid/content/ContentValues;)J
 HSPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->insert(Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;)J
 HSPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->insertWithOnConflict(Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;I)J
@@ -17377,6 +17647,7 @@ HSPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->setVersion(I)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->throwIfNotOpenLocked()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->update(Ljava/lang/String;ILandroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/Object;)I
 HSPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->update(Ljava/lang/String;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;)I
+HSPLnet/zetetic/database/sqlcipher/SQLiteDatabase;->updateWithOnConflict(Ljava/lang/String;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;I)I
 HSPLnet/zetetic/database/sqlcipher/SQLiteDatabaseConfiguration;-><clinit>()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteDatabaseConfiguration;-><init>(Ljava/lang/String;I[BLnet/zetetic/database/sqlcipher/SQLiteDatabaseHook;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteDatabaseConfiguration;-><init>(Lnet/zetetic/database/sqlcipher/SQLiteDatabaseConfiguration;)V
@@ -17410,7 +17681,9 @@ HSPLnet/zetetic/database/sqlcipher/SQLiteProgram;->bindString(ILjava/lang/String
 HSPLnet/zetetic/database/sqlcipher/SQLiteProgram;->clearBindings()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteProgram;->getBindArgs()[Ljava/lang/Object;
 HSPLnet/zetetic/database/sqlcipher/SQLiteProgram;->getColumnNames()[Ljava/lang/String;
+HSPLnet/zetetic/database/sqlcipher/SQLiteProgram;->getConnectionFlags()I
 HSPLnet/zetetic/database/sqlcipher/SQLiteProgram;->getDatabase()Lnet/zetetic/database/sqlcipher/SQLiteDatabase;
+HSPLnet/zetetic/database/sqlcipher/SQLiteProgram;->getSession()Lnet/zetetic/database/sqlcipher/SQLiteSession;
 HSPLnet/zetetic/database/sqlcipher/SQLiteProgram;->getSql()Ljava/lang/String;
 HSPLnet/zetetic/database/sqlcipher/SQLiteQuery;-><init>(Lnet/zetetic/database/sqlcipher/SQLiteDatabase;Ljava/lang/String;Landroid/os/CancellationSignal;)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteQuery;->fillWindow(Landroid/database/CursorWindow;IIZ)I
@@ -17428,15 +17701,18 @@ HSPLnet/zetetic/database/sqlcipher/SQLiteSession;->endTransaction(Landroid/os/Ca
 HSPLnet/zetetic/database/sqlcipher/SQLiteSession;->endTransactionUnchecked(Landroid/os/CancellationSignal;Z)V
 HSPLnet/zetetic/database/sqlcipher/SQLiteSession;->executeForChangedRowCount(Ljava/lang/String;[Ljava/lang/Object;ILandroid/os/CancellationSignal;)I
 HSPLnet/zetetic/database/sqlcipher/SQLiteSession;->executeForCursorWindow(Ljava/lang/String;[Ljava/lang/Object;Landroid/database/CursorWindow;IIZILandroid/os/CancellationSignal;)I
+HSPLnet/zetetic/database/sqlcipher/SQLiteSession;->executeForLastInsertedRowId(Ljava/lang/String;[Ljava/lang/Object;ILandroid/os/CancellationSignal;)J
 HSPLnet/zetetic/database/sqlcipher/SQLiteSession;->executeForLong(Ljava/lang/String;[Ljava/lang/Object;ILandroid/os/CancellationSignal;)J
 HSPLnet/zetetic/database/sqlcipher/SQLiteSession;->executeSpecial(Ljava/lang/String;[Ljava/lang/Object;ILandroid/os/CancellationSignal;)Z
 HSPLnet/zetetic/database/sqlcipher/SQLiteSession;->hasTransaction()Z
 HSPLnet/zetetic/database/sqlcipher/SQLiteSession;->obtainTransaction(ILnet/zetetic/database/sqlcipher/SQLiteTransactionListener;)Lnet/zetetic/database/sqlcipher/SQLiteSession$Transaction;
 HSPLnet/zetetic/database/sqlcipher/SQLiteSession;->recycleTransaction(Lnet/zetetic/database/sqlcipher/SQLiteSession$Transaction;)V
+HSPLnet/zetetic/database/sqlcipher/SQLiteSession;->releaseConnection()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteSession;->setTransactionSuccessful()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteSession;->throwIfNoTransaction()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteSession;->throwIfTransactionMarkedSuccessful()V
 HSPLnet/zetetic/database/sqlcipher/SQLiteStatement;-><init>(Lnet/zetetic/database/sqlcipher/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/Object;)V
+HSPLnet/zetetic/database/sqlcipher/SQLiteStatement;->executeInsert()J
 HSPLnet/zetetic/database/sqlcipher/SQLiteStatement;->executeUpdateDelete()I
 HSPLnet/zetetic/database/sqlcipher/SQLiteStatement;->simpleQueryForLong()J
 HSPLnet/zetetic/database/sqlcipher/SQLiteStatementInfo;-><init>()V
@@ -17744,6 +18020,7 @@ HSPLokhttp3/Response;->isSuccessful()Z
 HSPLokhttp3/Response;->message()Ljava/lang/String;
 HSPLokhttp3/Response;->newBuilder()Lokhttp3/Response$Builder;
 HSPLokhttp3/Response;->request()Lokhttp3/Request;
+HSPLokhttp3/Response;->toString()Ljava/lang/String;
 HSPLokhttp3/ResponseBody$1;-><init>(Lokhttp3/MediaType;JLokio/BufferedSource;)V
 HSPLokhttp3/ResponseBody$1;->source()Lokio/BufferedSource;
 HSPLokhttp3/ResponseBody;-><init>()V
@@ -17910,8 +18187,8 @@ HSPLokhttp3/internal/http1/Http1Codec;->writeRequestHeaders(Lokhttp3/Request;)V
 HSPLokhttp3/internal/http2/Http2Connection$Listener$1;-><init>()V
 HSPLokhttp3/internal/http2/Http2Connection$Listener;-><clinit>()V
 HSPLokhttp3/internal/http2/Http2Connection$Listener;-><init>()V
-HSPLokhttp3/internal/platform/Android10Platform$$ExternalSyntheticApiModelOutline0;->m(Ljavax/net/ssl/SSLParameters;[Ljava/lang/String;)V
-HSPLokhttp3/internal/platform/Android10Platform$$ExternalSyntheticApiModelOutline1;->m(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
+HSPLokhttp3/internal/platform/Android10Platform$$ExternalSyntheticApiModelOutline0;->m(Ljavax/net/ssl/SSLSocket;)Ljava/lang/String;
+HSPLokhttp3/internal/platform/Android10Platform$$ExternalSyntheticApiModelOutline1;->m(Ljavax/net/ssl/SSLParameters;[Ljava/lang/String;)V
 HSPLokhttp3/internal/platform/Android10Platform$$ExternalSyntheticApiModelOutline2;->m(Ljavax/net/ssl/SSLSocket;)Z
 HSPLokhttp3/internal/platform/Android10Platform;-><init>(Ljava/lang/Class;)V
 HSPLokhttp3/internal/platform/Android10Platform;->buildIfSupported()Lokhttp3/internal/platform/Platform;
@@ -17990,6 +18267,7 @@ HSPLokio/AsyncTimeout;-><clinit>()V
 HSPLokio/AsyncTimeout;-><init>()V
 HSPLokio/AsyncTimeout;->access$getHead$cp()Lokio/AsyncTimeout;
 HSPLokio/AsyncTimeout;->access$getIDLE_TIMEOUT_MILLIS$cp()J
+HSPLokio/AsyncTimeout;->access$getIDLE_TIMEOUT_NANOS$cp()J
 HSPLokio/AsyncTimeout;->access$getInQueue$p(Lokio/AsyncTimeout;)Z
 HSPLokio/AsyncTimeout;->access$getNext$p(Lokio/AsyncTimeout;)Lokio/AsyncTimeout;
 HSPLokio/AsyncTimeout;->access$remainingNanos(Lokio/AsyncTimeout;J)J
@@ -18009,7 +18287,6 @@ HSPLokio/Buffer$UnsafeCursor;-><init>()V
 HSPLokio/Buffer;-><init>()V
 HSPLokio/Buffer;->clear()V
 HSPLokio/Buffer;->close()V
-HSPLokio/Buffer;->completeSegmentByteCount()J
 HSPLokio/Buffer;->copyTo(Lokio/Buffer;JJ)Lokio/Buffer;
 HSPLokio/Buffer;->exhausted()Z
 HSPLokio/Buffer;->indexOf(BJJ)J
@@ -18031,7 +18308,9 @@ HSPLokio/Buffer;->readUtf8()Ljava/lang/String;
 HSPLokio/Buffer;->readUtf8(J)Ljava/lang/String;
 HSPLokio/Buffer;->setSize$okio(J)V
 HSPLokio/Buffer;->size()J
+HSPLokio/Buffer;->skip(J)V
 HSPLokio/Buffer;->writableSegment$okio(I)Lokio/Segment;
+HSPLokio/Buffer;->write(Lokio/Buffer;J)V
 HSPLokio/Buffer;->write([B)Lokio/Buffer;
 HSPLokio/Buffer;->write([BII)Lokio/Buffer;
 HSPLokio/Buffer;->writeAll(Lokio/Source;)J
@@ -18096,6 +18375,7 @@ HSPLokio/InflaterSource;->refill()Z
 HSPLokio/InflaterSource;->releaseBytesAfterInflate()V
 HSPLokio/InputStreamSource;-><init>(Ljava/io/InputStream;Lokio/Timeout;)V
 HSPLokio/InputStreamSource;->close()V
+HSPLokio/InputStreamSource;->read(Lokio/Buffer;J)J
 HSPLokio/Okio;->blackhole()Lokio/Sink;
 HSPLokio/Okio;->buffer(Lokio/Sink;)Lokio/BufferedSink;
 HSPLokio/Okio;->buffer(Lokio/Source;)Lokio/BufferedSource;
@@ -18126,7 +18406,6 @@ HSPLokio/Options;->of([Lokio/ByteString;)Lokio/Options;
 HSPLokio/OutputStreamSink;-><init>(Ljava/io/OutputStream;Lokio/Timeout;)V
 HSPLokio/OutputStreamSink;->close()V
 HSPLokio/OutputStreamSink;->flush()V
-HSPLokio/OutputStreamSink;->write(Lokio/Buffer;J)V
 HSPLokio/PeekSource;-><init>(Lokio/BufferedSource;)V
 HSPLokio/PeekSource;->read(Lokio/Buffer;J)J
 HSPLokio/RealBufferedSink;-><init>(Lokio/Sink;)V
@@ -18149,7 +18428,6 @@ HSPLokio/RealBufferedSource;->inputStream()Ljava/io/InputStream;
 HSPLokio/RealBufferedSource;->peek()Lokio/BufferedSource;
 HSPLokio/RealBufferedSource;->rangeEquals(JLokio/ByteString;)Z
 HSPLokio/RealBufferedSource;->rangeEquals(JLokio/ByteString;II)Z
-HSPLokio/RealBufferedSource;->read(Lokio/Buffer;J)J
 HSPLokio/RealBufferedSource;->readAll(Lokio/Sink;)J
 HSPLokio/RealBufferedSource;->readByte()B
 HSPLokio/RealBufferedSource;->readHexadecimalUnsignedLong()J
@@ -18176,6 +18454,7 @@ HSPLokio/Segment;->split(I)Lokio/Segment;
 HSPLokio/Segment;->writeTo(Lokio/Segment;I)V
 HSPLokio/SegmentPool;-><clinit>()V
 HSPLokio/SegmentPool;-><init>()V
+HSPLokio/SegmentPool;->firstRef()Ljava/util/concurrent/atomic/AtomicReference;
 HSPLokio/SegmentPool;->recycle(Lokio/Segment;)V
 HSPLokio/SegmentPool;->take()Lokio/Segment;
 HSPLokio/SocketAsyncTimeout;-><init>(Ljava/net/Socket;)V
@@ -18201,6 +18480,7 @@ HSPLokio/_UtilKt;->checkOffsetAndCount(JJJ)V
 HSPLokio/_UtilKt;->reverseBytes(I)I
 HSPLokio/internal/_BufferKt;-><clinit>()V
 HSPLokio/internal/_BufferKt;->readUtf8Line(Lokio/Buffer;J)Ljava/lang/String;
+HSPLokio/internal/_BufferKt;->selectPrefix(Lokio/Buffer;Lokio/Options;Z)I
 HSPLokio/internal/_ByteStringKt;-><clinit>()V
 HSPLokio/internal/_ByteStringKt;->access$decodeHexDigit(C)I
 HSPLokio/internal/_ByteStringKt;->decodeHexDigit(C)I
@@ -18334,6 +18614,7 @@ HSPLorg/conscrypt/ConscryptEngine;->singleDstBuffer(Ljava/nio/ByteBuffer;)[Ljava
 HSPLorg/conscrypt/ConscryptEngine;->singleSrcBuffer(Ljava/nio/ByteBuffer;)[Ljava/nio/ByteBuffer;
 HSPLorg/conscrypt/ConscryptEngine;->transitionTo(I)V
 HSPLorg/conscrypt/ConscryptEngine;->unwrap(Ljava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)Ljavax/net/ssl/SSLEngineResult;
+HSPLorg/conscrypt/ConscryptEngine;->unwrap([Ljava/nio/ByteBuffer;II[Ljava/nio/ByteBuffer;II)Ljavax/net/ssl/SSLEngineResult;
 HSPLorg/conscrypt/ConscryptEngine;->unwrap([Ljava/nio/ByteBuffer;[Ljava/nio/ByteBuffer;)Ljavax/net/ssl/SSLEngineResult;
 HSPLorg/conscrypt/ConscryptEngine;->verifyCertificateChain([[BLjava/lang/String;)V
 HSPLorg/conscrypt/ConscryptEngine;->wrap(Ljava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)Ljavax/net/ssl/SSLEngineResult;
@@ -18354,7 +18635,6 @@ HSPLorg/conscrypt/ConscryptEngineSocket$SSLInputStream;->init()V
 HSPLorg/conscrypt/ConscryptEngineSocket$SSLInputStream;->isHandshaking(Ljavax/net/ssl/SSLEngineResult$HandshakeStatus;)Z
 HSPLorg/conscrypt/ConscryptEngineSocket$SSLInputStream;->processDataFromSocket([BII)I
 HSPLorg/conscrypt/ConscryptEngineSocket$SSLInputStream;->read([BII)I
-HSPLorg/conscrypt/ConscryptEngineSocket$SSLInputStream;->readFromSocket()I
 HSPLorg/conscrypt/ConscryptEngineSocket$SSLInputStream;->readUntilDataAvailable([BII)I
 HSPLorg/conscrypt/ConscryptEngineSocket$SSLOutputStream;-><init>(Lorg/conscrypt/ConscryptEngineSocket;)V
 HSPLorg/conscrypt/ConscryptEngineSocket$SSLOutputStream;->access$200(Lorg/conscrypt/ConscryptEngineSocket$SSLOutputStream;Ljava/nio/ByteBuffer;)V
@@ -18421,7 +18701,6 @@ HSPLorg/conscrypt/Java7ExtendedSSLSession;->getPeerHost()Ljava/lang/String;
 HSPLorg/conscrypt/Java7ExtendedSSLSession;->getProtocol()Ljava/lang/String;
 HSPLorg/conscrypt/Java8EngineSocket;-><init>(Ljava/net/Socket;Ljava/lang/String;IZLorg/conscrypt/SSLParametersImpl;)V
 HSPLorg/conscrypt/Java8ExtendedSSLSession$$ExternalSyntheticApiModelOutline0;->m(Ljava/lang/String;)Ljavax/net/ssl/SNIHostName;
-HSPLorg/conscrypt/Java8ExtendedSSLSession$$ExternalSyntheticApiModelOutline1;->m()V
 HSPLorg/conscrypt/Java8ExtendedSSLSession;-><init>(Lorg/conscrypt/ExternalSession;)V
 HSPLorg/conscrypt/KeyGeneratorImpl$AES;-><init>()V
 HSPLorg/conscrypt/KeyGeneratorImpl$AES;->checkKeySize(I)V
@@ -18663,10 +18942,11 @@ HSPLorg/conscrypt/OpenSSLX509CertificateFactory;->engineGenerateCertificate(Ljav
 HSPLorg/conscrypt/PeerInfoProvider$1;-><init>()V
 HSPLorg/conscrypt/PeerInfoProvider;-><clinit>()V
 HSPLorg/conscrypt/PeerInfoProvider;-><init>()V
-HSPLorg/conscrypt/Platform$$ExternalSyntheticApiModelOutline2;->m(Ljava/lang/Object;)Ljavax/net/ssl/SNIServerName;
-HSPLorg/conscrypt/Platform$$ExternalSyntheticApiModelOutline3;->m(Ljavax/net/ssl/SNIServerName;)I
-HSPLorg/conscrypt/Platform$$ExternalSyntheticApiModelOutline4;->m(Ljava/lang/Object;)Ljavax/net/ssl/SNIHostName;
-HSPLorg/conscrypt/Platform$$ExternalSyntheticApiModelOutline5;->m(Ljavax/net/ssl/SNIHostName;)Ljava/lang/String;
+HSPLorg/conscrypt/Platform$$ExternalSyntheticApiModelOutline0;->m(Ljava/lang/Object;)Ljavax/net/ssl/SNIServerName;
+HSPLorg/conscrypt/Platform$$ExternalSyntheticApiModelOutline1;->m(Ljavax/net/ssl/SNIServerName;)I
+HSPLorg/conscrypt/Platform$$ExternalSyntheticApiModelOutline2;->m(Ljava/lang/Object;)Ljavax/net/ssl/SNIHostName;
+HSPLorg/conscrypt/Platform$$ExternalSyntheticApiModelOutline3;->m(Ljavax/net/ssl/SNIHostName;)Ljava/lang/String;
+HSPLorg/conscrypt/Platform$$ExternalSyntheticApiModelOutline6;->m()V
 HSPLorg/conscrypt/Platform;-><clinit>()V
 HSPLorg/conscrypt/Platform;->blockGuardOnNetwork()V
 HSPLorg/conscrypt/Platform;->checkServerTrusted(Ljavax/net/ssl/X509TrustManager;[Ljava/security/cert/X509Certificate;Ljava/lang/String;Lorg/conscrypt/ConscryptEngine;)V
@@ -18786,7 +19066,6 @@ HSPLorg/greenrobot/eventbus/SubscriberMethodFinder;->getMethodsAndRelease(Lorg/g
 HSPLorg/greenrobot/eventbus/SubscriberMethodFinder;->getSubscriberInfo(Lorg/greenrobot/eventbus/SubscriberMethodFinder$FindState;)Lorg/greenrobot/eventbus/meta/SubscriberInfo;
 HSPLorg/greenrobot/eventbus/SubscriberMethodFinder;->prepareFindState()Lorg/greenrobot/eventbus/SubscriberMethodFinder$FindState;
 HSPLorg/greenrobot/eventbus/Subscription;-><init>(Ljava/lang/Object;Lorg/greenrobot/eventbus/SubscriberMethod;)V
-HSPLorg/greenrobot/eventbus/Subscription;->equals(Ljava/lang/Object;)Z
 HSPLorg/greenrobot/eventbus/ThreadMode;-><clinit>()V
 HSPLorg/greenrobot/eventbus/ThreadMode;-><init>(Ljava/lang/String;I)V
 HSPLorg/signal/aesgcmprovider/AesGcmProvider;-><clinit>()V
@@ -18835,10 +19114,10 @@ HSPLorg/signal/core/util/Bitmask;->checkArgument(ZLjava/lang/String;)V
 HSPLorg/signal/core/util/Bitmask;->read(JII)J
 HSPLorg/signal/core/util/Bitmask;->twoToThe(J)J
 HSPLorg/signal/core/util/Bitmask;->update(JIIJ)J
-HSPLorg/signal/core/util/BreakIteratorCompat$AndroidIcuBreakIterator$$ExternalSyntheticApiModelOutline0;->m(Landroid/icu/text/BreakIterator;)I
+HSPLorg/signal/core/util/BreakIteratorCompat$AndroidIcuBreakIterator$$ExternalSyntheticApiModelOutline0;->m()Landroid/icu/text/BreakIterator;
 HSPLorg/signal/core/util/BreakIteratorCompat$AndroidIcuBreakIterator$$ExternalSyntheticApiModelOutline1;->m(Landroid/icu/text/BreakIterator;)I
 HSPLorg/signal/core/util/BreakIteratorCompat$AndroidIcuBreakIterator$$ExternalSyntheticApiModelOutline3;->m(Landroid/icu/text/BreakIterator;Ljava/lang/String;)V
-HSPLorg/signal/core/util/BreakIteratorCompat$AndroidIcuBreakIterator$$ExternalSyntheticApiModelOutline4;->m()Landroid/icu/text/BreakIterator;
+HSPLorg/signal/core/util/BreakIteratorCompat$AndroidIcuBreakIterator$$ExternalSyntheticApiModelOutline4;->m(Landroid/icu/text/BreakIterator;)I
 HSPLorg/signal/core/util/ByteSize;-><init>(J)V
 HSPLorg/signal/core/util/ByteSize;->getInWholeBytes()J
 HSPLorg/signal/core/util/CharacterIterable$AndroidIcuBreakIterator;-><init>(Ljava/lang/String;)V
@@ -18865,11 +19144,13 @@ HSPLorg/signal/core/util/CursorExtensionsKt;->readToSingleInt$default(Landroid/d
 HSPLorg/signal/core/util/CursorExtensionsKt;->readToSingleInt(Landroid/database/Cursor;I)I
 HSPLorg/signal/core/util/CursorExtensionsKt;->readToSingleLong$default(Landroid/database/Cursor;JILjava/lang/Object;)J
 HSPLorg/signal/core/util/CursorExtensionsKt;->readToSingleLong(Landroid/database/Cursor;J)J
+HSPLorg/signal/core/util/CursorExtensionsKt;->readToSingleLongOrNull(Landroid/database/Cursor;)Ljava/lang/Long;
 HSPLorg/signal/core/util/CursorExtensionsKt;->readToSingleObject(Landroid/database/Cursor;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 HSPLorg/signal/core/util/CursorExtensionsKt;->requireBlob(Landroid/database/Cursor;Ljava/lang/String;)[B
 HSPLorg/signal/core/util/CursorExtensionsKt;->requireBoolean(Landroid/database/Cursor;Ljava/lang/String;)Z
 HSPLorg/signal/core/util/CursorExtensionsKt;->requireInt(Landroid/database/Cursor;Ljava/lang/String;)I
 HSPLorg/signal/core/util/CursorExtensionsKt;->requireLong(Landroid/database/Cursor;Ljava/lang/String;)J
+HSPLorg/signal/core/util/CursorExtensionsKt;->requireNonNullString(Landroid/database/Cursor;Ljava/lang/String;)Ljava/lang/String;
 HSPLorg/signal/core/util/CursorExtensionsKt;->requireObject(Landroid/database/Cursor;Ljava/lang/String;Lorg/signal/core/util/IntSerializer;)Ljava/lang/Object;
 HSPLorg/signal/core/util/CursorExtensionsKt;->requireString(Landroid/database/Cursor;Ljava/lang/String;)Ljava/lang/String;
 HSPLorg/signal/core/util/CursorExtensionsKt;->toInt(Z)I
@@ -18882,8 +19163,6 @@ HSPLorg/signal/core/util/CursorUtil;->isNull(Landroid/database/Cursor;Ljava/lang
 HSPLorg/signal/core/util/CursorUtil;->requireBlob(Landroid/database/Cursor;Ljava/lang/String;)[B
 HSPLorg/signal/core/util/CursorUtil;->requireBoolean(Landroid/database/Cursor;Ljava/lang/String;)Z
 HSPLorg/signal/core/util/CursorUtil;->requireInt(Landroid/database/Cursor;Ljava/lang/String;)I
-HSPLorg/signal/core/util/CursorUtil;->requireLong(Landroid/database/Cursor;Ljava/lang/String;)J
-HSPLorg/signal/core/util/CursorUtil;->requireString(Landroid/database/Cursor;Ljava/lang/String;)Ljava/lang/String;
 HSPLorg/signal/core/util/DeleteBuilderPart1;-><init>(Landroidx/sqlite/db/SupportSQLiteDatabase;Ljava/lang/String;)V
 HSPLorg/signal/core/util/DeleteBuilderPart1;->where(Ljava/lang/String;[Ljava/lang/Object;)Lorg/signal/core/util/DeleteBuilderPart2;
 HSPLorg/signal/core/util/DeleteBuilderPart2;-><init>(Landroidx/sqlite/db/SupportSQLiteDatabase;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
@@ -18927,12 +19206,19 @@ HSPLorg/signal/core/util/MemoryTracker;->getAppJvmHeapUsage()Lorg/signal/core/ut
 HSPLorg/signal/core/util/MemoryTracker;->start()V
 HSPLorg/signal/core/util/OptionalExtensionsKt;->or(Lj$/util/Optional;Lj$/util/Optional;)Lj$/util/Optional;
 HSPLorg/signal/core/util/OptionalExtensionsKt;->orNull(Lj$/util/Optional;)Ljava/lang/Object;
-HSPLorg/signal/core/util/OptionalExtensionsKt;->toOptional(Ljava/lang/Object;)Lj$/util/Optional;
 HSPLorg/signal/core/util/PendingIntentFlags;-><clinit>()V
 HSPLorg/signal/core/util/PendingIntentFlags;-><init>()V
 HSPLorg/signal/core/util/PendingIntentFlags;->immutable()I
 HSPLorg/signal/core/util/PendingIntentFlags;->mutable()I
 HSPLorg/signal/core/util/PendingIntentFlags;->updateCurrent()I
+HSPLorg/signal/core/util/ResettableLazy$Companion;-><init>()V
+HSPLorg/signal/core/util/ResettableLazy$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/signal/core/util/ResettableLazy;-><clinit>()V
+HSPLorg/signal/core/util/ResettableLazy;-><init>(Lkotlin/jvm/functions/Function0;)V
+HSPLorg/signal/core/util/ResettableLazy;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+HSPLorg/signal/core/util/ResettableLazy;->isInitialized()Z
+HSPLorg/signal/core/util/ResettableLazy;->reset()V
+HSPLorg/signal/core/util/ResettableLazyKt;->resettableLazy(Lkotlin/jvm/functions/Function0;)Lorg/signal/core/util/ResettableLazy;
 HSPLorg/signal/core/util/SQLiteDatabaseExtensionsKt;->count(Landroidx/sqlite/db/SupportSQLiteDatabase;)Lorg/signal/core/util/SelectBuilderPart1;
 HSPLorg/signal/core/util/SQLiteDatabaseExtensionsKt;->delete(Landroidx/sqlite/db/SupportSQLiteDatabase;Ljava/lang/String;)Lorg/signal/core/util/DeleteBuilderPart1;
 HSPLorg/signal/core/util/SQLiteDatabaseExtensionsKt;->deleteAll(Landroidx/sqlite/db/SupportSQLiteDatabase;Ljava/lang/String;)I
@@ -18976,7 +19262,7 @@ HSPLorg/signal/core/util/SqlUtil$Query;->getWhereArgs()[Ljava/lang/String;
 HSPLorg/signal/core/util/SqlUtil$buildCustomCollectionQuery$1;-><init>(Ljava/lang/String;)V
 HSPLorg/signal/core/util/SqlUtil$buildCustomCollectionQuery$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/signal/core/util/SqlUtil$buildCustomCollectionQuery$1;->invoke(Ljava/util/List;)Lorg/signal/core/util/SqlUtil$Query;
-HSPLorg/signal/core/util/SqlUtil;->$r8$lambda$zW4YXJaIlJT3vPgMCfyiQ3eZdqc(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Lorg/signal/core/util/SqlUtil$Query;
+HSPLorg/signal/core/util/SqlUtil;->$r8$lambda$nDdaya1lXpkXr4wYffy_jH9F2Rc(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Lorg/signal/core/util/SqlUtil$Query;
 HSPLorg/signal/core/util/SqlUtil;-><clinit>()V
 HSPLorg/signal/core/util/SqlUtil;-><init>()V
 HSPLorg/signal/core/util/SqlUtil;->access$buildSingleCustomCollectionQuery(Lorg/signal/core/util/SqlUtil;Ljava/lang/String;Ljava/util/List;)Lorg/signal/core/util/SqlUtil$Query;
@@ -19017,7 +19303,6 @@ HSPLorg/signal/core/util/StringUtil;-><clinit>()V
 HSPLorg/signal/core/util/StringUtil;->isEmpty(Ljava/lang/String;)Z
 HSPLorg/signal/core/util/StringUtil;->isolateBidi(Ljava/lang/String;)Ljava/lang/String;
 HSPLorg/signal/core/util/StringUtil;->replace(Ljava/lang/CharSequence;CLjava/lang/String;)Ljava/lang/CharSequence;
-HSPLorg/signal/core/util/StringUtil;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 HSPLorg/signal/core/util/StringUtil;->trimToFit(Ljava/lang/String;I)Ljava/lang/String;
 HSPLorg/signal/core/util/ThreadUtil;-><clinit>()V
 HSPLorg/signal/core/util/ThreadUtil;->assertMainThread()V
@@ -19043,7 +19328,7 @@ HSPLorg/signal/core/util/UpdateBuilderPart3;->run$default(Lorg/signal/core/util/
 HSPLorg/signal/core/util/UpdateBuilderPart3;->run(I)I
 HSPLorg/signal/core/util/concurrent/AnrDetector$AnrDetectorThread$$ExternalSyntheticLambda0;-><init>(Lorg/signal/core/util/concurrent/AnrDetector$AnrDetectorThread;)V
 HSPLorg/signal/core/util/concurrent/AnrDetector$AnrDetectorThread$$ExternalSyntheticLambda0;->run()V
-HSPLorg/signal/core/util/concurrent/AnrDetector$AnrDetectorThread;->$r8$lambda$CzqZ8g-EFmZi6oXLrPkYehulx_E(Lorg/signal/core/util/concurrent/AnrDetector$AnrDetectorThread;)V
+HSPLorg/signal/core/util/concurrent/AnrDetector$AnrDetectorThread;->$r8$lambda$ALK6uon1VllHVhKK_2jL6sOhabA(Lorg/signal/core/util/concurrent/AnrDetector$AnrDetectorThread;)V
 HSPLorg/signal/core/util/concurrent/AnrDetector$AnrDetectorThread;-><init>(JLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)V
 HSPLorg/signal/core/util/concurrent/AnrDetector$AnrDetectorThread;-><init>(JLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/signal/core/util/concurrent/AnrDetector$AnrDetectorThread;->end()V
@@ -19084,14 +19369,11 @@ HSPLorg/signal/core/util/concurrent/RxExtensions$subscribeWithSubject$3;-><init>
 HSPLorg/signal/core/util/concurrent/RxExtensions;->safeBlockingGet(Lio/reactivex/rxjava3/core/Single;)Ljava/lang/Object;
 HSPLorg/signal/core/util/concurrent/RxExtensions;->subscribeWithSubject(Lio/reactivex/rxjava3/core/Observable;Lio/reactivex/rxjava3/subjects/Subject;Lio/reactivex/rxjava3/disposables/CompositeDisposable;)Lio/reactivex/rxjava3/subjects/Subject;
 HSPLorg/signal/core/util/concurrent/SettableFuture;-><init>()V
-HSPLorg/signal/core/util/concurrent/SettableFuture;-><init>(Ljava/lang/Object;)V
 HSPLorg/signal/core/util/concurrent/SettableFuture;->get()Ljava/lang/Object;
 HSPLorg/signal/core/util/concurrent/SettableFuture;->get(JLjava/util/concurrent/TimeUnit;)Ljava/lang/Object;
 HSPLorg/signal/core/util/concurrent/SettableFuture;->notifyAllListeners()V
-HSPLorg/signal/core/util/concurrent/SettableFuture;->set(Ljava/lang/Object;)Z
 HSPLorg/signal/core/util/concurrent/SettableFuture;->setException(Ljava/lang/Throwable;)Z
 HSPLorg/signal/core/util/concurrent/SignalExecutors$$ExternalSyntheticLambda0;-><init>()V
-HSPLorg/signal/core/util/concurrent/SignalExecutors$$ExternalSyntheticLambda0;->rejectedExecution(Ljava/lang/Runnable;Ljava/util/concurrent/ThreadPoolExecutor;)V
 HSPLorg/signal/core/util/concurrent/SignalExecutors$$ExternalSyntheticLambda1;-><init>(Ljava/lang/String;I)V
 HSPLorg/signal/core/util/concurrent/SignalExecutors$$ExternalSyntheticLambda1;->newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
 HSPLorg/signal/core/util/concurrent/SignalExecutors$1;-><init>(Ljava/lang/Runnable;Ljava/lang/String;I)V
@@ -19104,26 +19386,24 @@ HSPLorg/signal/core/util/concurrent/SignalExecutors$NumberedThreadFactory$1;->ru
 HSPLorg/signal/core/util/concurrent/SignalExecutors$NumberedThreadFactory;->-$$Nest$fgetpriority(Lorg/signal/core/util/concurrent/SignalExecutors$NumberedThreadFactory;)I
 HSPLorg/signal/core/util/concurrent/SignalExecutors$NumberedThreadFactory;-><init>(Ljava/lang/String;I)V
 HSPLorg/signal/core/util/concurrent/SignalExecutors$NumberedThreadFactory;->newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
-HSPLorg/signal/core/util/concurrent/SignalExecutors;->$r8$lambda$0Q0afsv1raKIrq3aP-SuMcT2Ad0(Ljava/lang/Runnable;Ljava/util/concurrent/ThreadPoolExecutor;)V
-HSPLorg/signal/core/util/concurrent/SignalExecutors;->$r8$lambda$QcfzSx3VRxairlCydtFL9hAJp4M(Ljava/lang/String;ILjava/lang/Runnable;)Ljava/lang/Thread;
+HSPLorg/signal/core/util/concurrent/SignalExecutors;->$r8$lambda$CjE2RMTJtH6cknGNaFsN0_4i2U4(Ljava/lang/String;ILjava/lang/Runnable;)Ljava/lang/Thread;
 HSPLorg/signal/core/util/concurrent/SignalExecutors;-><clinit>()V
 HSPLorg/signal/core/util/concurrent/SignalExecutors;->getAndStartHandlerThread(Ljava/lang/String;I)Landroid/os/HandlerThread;
-HSPLorg/signal/core/util/concurrent/SignalExecutors;->lambda$newCachedBoundedExecutor$1(Ljava/lang/Runnable;Ljava/util/concurrent/ThreadPoolExecutor;)V
 HSPLorg/signal/core/util/concurrent/SignalExecutors;->lambda$newCachedSingleThreadExecutor$0(Ljava/lang/String;ILjava/lang/Runnable;)Ljava/lang/Thread;
 HSPLorg/signal/core/util/concurrent/SignalExecutors;->newCachedBoundedExecutor(Ljava/lang/String;IIII)Ljava/util/concurrent/ExecutorService;
 HSPLorg/signal/core/util/concurrent/SignalExecutors;->newCachedSingleThreadExecutor(Ljava/lang/String;I)Ljava/util/concurrent/ExecutorService;
-HSPLorg/signal/core/util/concurrent/SimpleTask$$ExternalSyntheticLambda0;-><init>(Lorg/signal/core/util/concurrent/SimpleTask$BackgroundTask;Lorg/signal/core/util/concurrent/SimpleTask$ForegroundTask;)V
+HSPLorg/signal/core/util/concurrent/SimpleTask$$ExternalSyntheticLambda0;-><init>(Lorg/signal/core/util/concurrent/SimpleTask$BackgroundTask;Landroidx/lifecycle/Lifecycle;Lorg/signal/core/util/concurrent/SimpleTask$ForegroundTask;)V
 HSPLorg/signal/core/util/concurrent/SimpleTask$$ExternalSyntheticLambda0;->run()V
-HSPLorg/signal/core/util/concurrent/SimpleTask$$ExternalSyntheticLambda1;-><init>(Lorg/signal/core/util/concurrent/SimpleTask$BackgroundTask;Landroidx/lifecycle/Lifecycle;Lorg/signal/core/util/concurrent/SimpleTask$ForegroundTask;)V
+HSPLorg/signal/core/util/concurrent/SimpleTask$$ExternalSyntheticLambda1;-><init>(Lorg/signal/core/util/concurrent/SimpleTask$BackgroundTask;Lorg/signal/core/util/concurrent/SimpleTask$ForegroundTask;)V
 HSPLorg/signal/core/util/concurrent/SimpleTask$$ExternalSyntheticLambda1;->run()V
 HSPLorg/signal/core/util/concurrent/SimpleTask$$ExternalSyntheticLambda2;-><init>(Lorg/signal/core/util/concurrent/SimpleTask$ForegroundTask;Ljava/lang/Object;)V
 HSPLorg/signal/core/util/concurrent/SimpleTask$$ExternalSyntheticLambda2;->run()V
 HSPLorg/signal/core/util/concurrent/SimpleTask$$ExternalSyntheticLambda3;-><init>(Landroidx/lifecycle/Lifecycle;Lorg/signal/core/util/concurrent/SimpleTask$ForegroundTask;Ljava/lang/Object;)V
 HSPLorg/signal/core/util/concurrent/SimpleTask$$ExternalSyntheticLambda3;->run()V
-HSPLorg/signal/core/util/concurrent/SimpleTask;->$r8$lambda$5EnOtL_RDkT3AhG5joH_4sU-BmQ(Lorg/signal/core/util/concurrent/SimpleTask$ForegroundTask;Ljava/lang/Object;)V
-HSPLorg/signal/core/util/concurrent/SimpleTask;->$r8$lambda$apmfpgqoFpbYCMY0RJkcKP8U8Hw(Lorg/signal/core/util/concurrent/SimpleTask$BackgroundTask;Landroidx/lifecycle/Lifecycle;Lorg/signal/core/util/concurrent/SimpleTask$ForegroundTask;)V
-HSPLorg/signal/core/util/concurrent/SimpleTask;->$r8$lambda$jvZ0-8nsHlQ_qvU-Rex9q6uvOXs(Lorg/signal/core/util/concurrent/SimpleTask$BackgroundTask;Lorg/signal/core/util/concurrent/SimpleTask$ForegroundTask;)V
-HSPLorg/signal/core/util/concurrent/SimpleTask;->$r8$lambda$lF69t8y3DMy8ar7C2ujewLrrhTs(Landroidx/lifecycle/Lifecycle;Lorg/signal/core/util/concurrent/SimpleTask$ForegroundTask;Ljava/lang/Object;)V
+HSPLorg/signal/core/util/concurrent/SimpleTask;->$r8$lambda$9RE8gXXeUg1TrXsO7aUUHbURISo(Lorg/signal/core/util/concurrent/SimpleTask$ForegroundTask;Ljava/lang/Object;)V
+HSPLorg/signal/core/util/concurrent/SimpleTask;->$r8$lambda$Avk5gNeftItM8qZeeX5cHfhvVCY(Lorg/signal/core/util/concurrent/SimpleTask$BackgroundTask;Lorg/signal/core/util/concurrent/SimpleTask$ForegroundTask;)V
+HSPLorg/signal/core/util/concurrent/SimpleTask;->$r8$lambda$KDClmp1HrDuqo_PtLzSHRHhzFjw(Landroidx/lifecycle/Lifecycle;Lorg/signal/core/util/concurrent/SimpleTask$ForegroundTask;Ljava/lang/Object;)V
+HSPLorg/signal/core/util/concurrent/SimpleTask;->$r8$lambda$mjz2-z3vx6OZeVwe6xQy9dzZykU(Lorg/signal/core/util/concurrent/SimpleTask$BackgroundTask;Landroidx/lifecycle/Lifecycle;Lorg/signal/core/util/concurrent/SimpleTask$ForegroundTask;)V
 HSPLorg/signal/core/util/concurrent/SimpleTask;->isValid(Landroidx/lifecycle/Lifecycle;)Z
 HSPLorg/signal/core/util/concurrent/SimpleTask;->lambda$run$0(Landroidx/lifecycle/Lifecycle;Lorg/signal/core/util/concurrent/SimpleTask$ForegroundTask;Ljava/lang/Object;)V
 HSPLorg/signal/core/util/concurrent/SimpleTask;->lambda$run$1(Lorg/signal/core/util/concurrent/SimpleTask$BackgroundTask;Landroidx/lifecycle/Lifecycle;Lorg/signal/core/util/concurrent/SimpleTask$ForegroundTask;)V
@@ -19199,6 +19479,7 @@ HSPLorg/signal/core/util/logging/Scrubber;->access$getTOP_100_TLDS$p()Ljava/util
 HSPLorg/signal/core/util/logging/Scrubber;->access$hash(Lorg/signal/core/util/logging/Scrubber;Ljava/lang/String;)Ljava/lang/String;
 HSPLorg/signal/core/util/logging/Scrubber;->hash(Ljava/lang/String;)Ljava/lang/String;
 HSPLorg/signal/core/util/logging/Scrubber;->scrub(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+HSPLorg/signal/core/util/logging/Scrubber;->scrub(Ljava/lang/CharSequence;Ljava/util/regex/Pattern;Lkotlin/jvm/functions/Function2;)Ljava/lang/CharSequence;
 HSPLorg/signal/core/util/logging/Scrubber;->scrubCallLinkKeys(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 HSPLorg/signal/core/util/logging/Scrubber;->scrubDomains(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 HSPLorg/signal/core/util/logging/Scrubber;->scrubE164(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
@@ -19213,6 +19494,7 @@ HSPLorg/signal/core/util/logging/Scrubber;->scrubUuids(Ljava/lang/CharSequence;)
 HSPLorg/signal/core/util/logging/Scrubber;->setIdentifierHmacKeyProvider(Lkotlin/jvm/functions/Function0;)V
 HSPLorg/signal/core/util/stream/TruncatingInputStream$$ExternalSyntheticBackport0;->m(J)I
 HSPLorg/signal/core/util/tracing/DebugAnnotation$Builder;-><init>()V
+HSPLorg/signal/core/util/tracing/DebugAnnotation$Builder;->build()Lorg/signal/core/util/tracing/DebugAnnotation;
 HSPLorg/signal/core/util/tracing/DebugAnnotation$Builder;->name(Ljava/lang/String;)Lorg/signal/core/util/tracing/DebugAnnotation$Builder;
 HSPLorg/signal/core/util/tracing/DebugAnnotation$Builder;->string_value(Ljava/lang/String;)Lorg/signal/core/util/tracing/DebugAnnotation$Builder;
 HSPLorg/signal/core/util/tracing/DebugAnnotation$Companion$ADAPTER$1;-><init>(Lcom/squareup/wire/FieldEncoding;Lkotlin/reflect/KClass;Lcom/squareup/wire/Syntax;)V
@@ -19222,6 +19504,7 @@ HSPLorg/signal/core/util/tracing/DebugAnnotation;-><clinit>()V
 HSPLorg/signal/core/util/tracing/DebugAnnotation;-><init>(Ljava/lang/Long;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Double;Ljava/lang/String;Ljava/lang/Long;Lorg/signal/core/util/tracing/DebugAnnotation$NestedValue;Lokio/ByteString;)V
 HSPLorg/signal/core/util/tracing/DebugAnnotation;->equals(Ljava/lang/Object;)Z
 HSPLorg/signal/core/util/tracing/TracePacket$Builder;-><init>()V
+HSPLorg/signal/core/util/tracing/TracePacket$Builder;->build()Lorg/signal/core/util/tracing/TracePacket;
 HSPLorg/signal/core/util/tracing/TracePacket$Builder;->synchronization_marker(Lokio/ByteString;)Lorg/signal/core/util/tracing/TracePacket$Builder;
 HSPLorg/signal/core/util/tracing/TracePacket$Builder;->timestamp(Ljava/lang/Long;)Lorg/signal/core/util/tracing/TracePacket$Builder;
 HSPLorg/signal/core/util/tracing/TracePacket$Builder;->track_descriptor(Lorg/signal/core/util/tracing/TrackDescriptor;)Lorg/signal/core/util/tracing/TracePacket$Builder;
@@ -19237,13 +19520,19 @@ HSPLorg/signal/core/util/tracing/Tracer$$ExternalSyntheticLambda0;->getTimeNanos
 HSPLorg/signal/core/util/tracing/Tracer;-><clinit>()V
 HSPLorg/signal/core/util/tracing/Tracer;-><init>()V
 HSPLorg/signal/core/util/tracing/Tracer;->addPacket(Lorg/signal/core/util/tracing/TracePacket;)V
+HSPLorg/signal/core/util/tracing/Tracer;->end(Ljava/lang/String;)V
+HSPLorg/signal/core/util/tracing/Tracer;->end(Ljava/lang/String;J)V
+HSPLorg/signal/core/util/tracing/Tracer;->forMethodEnd(Ljava/lang/String;JJ)Lorg/signal/core/util/tracing/TracePacket;
 HSPLorg/signal/core/util/tracing/Tracer;->forMethodStart(Ljava/lang/String;JJLjava/util/Map;)Lorg/signal/core/util/tracing/TracePacket;
 HSPLorg/signal/core/util/tracing/Tracer;->forSynchronization(J)Lorg/signal/core/util/tracing/TracePacket;
 HSPLorg/signal/core/util/tracing/Tracer;->forTrack(JLjava/lang/String;)Lorg/signal/core/util/tracing/TracePacket;
 HSPLorg/signal/core/util/tracing/Tracer;->forTrackId(J)Lorg/signal/core/util/tracing/TracePacket;
 HSPLorg/signal/core/util/tracing/Tracer;->getInstance()Lorg/signal/core/util/tracing/Tracer;
 HSPLorg/signal/core/util/tracing/Tracer;->start(Ljava/lang/String;)V
+HSPLorg/signal/core/util/tracing/Tracer;->start(Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;)V
+HSPLorg/signal/core/util/tracing/Tracer;->start(Ljava/lang/String;JLjava/util/Map;)V
 HSPLorg/signal/core/util/tracing/Tracer;->start(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+HSPLorg/signal/core/util/tracing/Tracer;->start(Ljava/lang/String;Ljava/util/Map;)V
 HSPLorg/signal/core/util/tracing/Tracer;->toByteArray(Ljava/util/UUID;)[B
 HSPLorg/signal/core/util/tracing/TrackDescriptor$Builder;-><init>()V
 HSPLorg/signal/core/util/tracing/TrackDescriptor$Builder;->build()Lorg/signal/core/util/tracing/TrackDescriptor;
@@ -19258,6 +19547,7 @@ HSPLorg/signal/core/util/tracing/TrackEvent$Builder;-><init>()V
 HSPLorg/signal/core/util/tracing/TrackEvent$Builder;->build()Lorg/signal/core/util/tracing/TrackEvent;
 HSPLorg/signal/core/util/tracing/TrackEvent$Builder;->debug_annotations(Ljava/util/List;)Lorg/signal/core/util/tracing/TrackEvent$Builder;
 HSPLorg/signal/core/util/tracing/TrackEvent$Builder;->name(Ljava/lang/String;)Lorg/signal/core/util/tracing/TrackEvent$Builder;
+HSPLorg/signal/core/util/tracing/TrackEvent$Builder;->track_uuid(Ljava/lang/Long;)Lorg/signal/core/util/tracing/TrackEvent$Builder;
 HSPLorg/signal/core/util/tracing/TrackEvent$Builder;->type(Lorg/signal/core/util/tracing/TrackEvent$Type;)Lorg/signal/core/util/tracing/TrackEvent$Builder;
 HSPLorg/signal/core/util/tracing/TrackEvent$Companion$ADAPTER$1;-><init>(Lcom/squareup/wire/FieldEncoding;Lkotlin/reflect/KClass;Lcom/squareup/wire/Syntax;)V
 HSPLorg/signal/core/util/tracing/TrackEvent$Companion;-><init>()V
@@ -19270,6 +19560,17 @@ HSPLorg/signal/core/util/tracing/TrackEvent$Type;-><clinit>()V
 HSPLorg/signal/core/util/tracing/TrackEvent$Type;-><init>(Ljava/lang/String;II)V
 HSPLorg/signal/core/util/tracing/TrackEvent;-><clinit>()V
 HSPLorg/signal/core/util/tracing/TrackEvent;-><init>(Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/lang/Long;Ljava/lang/String;Lorg/signal/core/util/tracing/TrackEvent$Type;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;Lokio/ByteString;)V
+HSPLorg/signal/donations/GooglePayApi$Configuration;-><init>(I)V
+HSPLorg/signal/donations/StripeApi$Companion;-><init>()V
+HSPLorg/signal/donations/StripeApi$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/signal/donations/StripeApi$Configuration;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+HSPLorg/signal/donations/StripeApi$Configuration;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/signal/donations/StripeApi$objectMapper$1;-><clinit>()V
+HSPLorg/signal/donations/StripeApi$objectMapper$1;-><init>()V
+HSPLorg/signal/donations/StripeApi$objectMapper$1;->invoke(Lcom/fasterxml/jackson/databind/json/JsonMapper$Builder;)V
+HSPLorg/signal/donations/StripeApi$objectMapper$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/signal/donations/StripeApi;-><clinit>()V
+HSPLorg/signal/donations/StripeApi;-><init>(Lorg/signal/donations/StripeApi$Configuration;Lorg/signal/donations/StripeApi$PaymentIntentFetcher;Lorg/signal/donations/StripeApi$SetupIntentHelper;Lokhttp3/OkHttpClient;)V
 HSPLorg/signal/glide/Log$Provider$1;-><init>()V
 HSPLorg/signal/glide/Log$Provider;-><clinit>()V
 HSPLorg/signal/glide/SignalGlideCodecs;-><clinit>()V
@@ -19282,6 +19583,7 @@ HSPLorg/signal/libsignal/internal/FilterExceptions;->filterExceptions(Lorg/signa
 HSPLorg/signal/libsignal/internal/Native;-><clinit>()V
 HSPLorg/signal/libsignal/internal/Native;->loadLibrary()V
 HSPLorg/signal/libsignal/internal/NativeHandleGuard$SimpleOwner;-><init>(J)V
+HSPLorg/signal/libsignal/internal/NativeHandleGuard$SimpleOwner;->finalize()V
 HSPLorg/signal/libsignal/internal/NativeHandleGuard;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard$Owner;)V
 HSPLorg/signal/libsignal/internal/NativeHandleGuard;->close()V
 HSPLorg/signal/libsignal/internal/NativeHandleGuard;->nativeHandle()J
@@ -19300,7 +19602,7 @@ HSPLorg/signal/libsignal/protocol/ServiceId$Aci;-><init>(Ljava/util/UUID;)V
 HSPLorg/signal/libsignal/protocol/ServiceId$Aci;-><init>([B)V
 HSPLorg/signal/libsignal/protocol/ServiceId$Pni;-><init>(Ljava/util/UUID;)V
 HSPLorg/signal/libsignal/protocol/ServiceId$Pni;-><init>([B)V
-HSPLorg/signal/libsignal/protocol/ServiceId;->$r8$lambda$6niRLkVB4-fMn50YvNnwEAE9qFo(Ljava/lang/String;)[B
+HSPLorg/signal/libsignal/protocol/ServiceId;->$r8$lambda$3zlh4WfyJ8LVauqqWlbgrv_vN5c(Ljava/lang/String;)[B
 HSPLorg/signal/libsignal/protocol/ServiceId;-><init>(BLjava/util/UUID;)V
 HSPLorg/signal/libsignal/protocol/ServiceId;-><init>([B)V
 HSPLorg/signal/libsignal/protocol/ServiceId;->equals(Ljava/lang/Object;)Z
@@ -19326,18 +19628,18 @@ HSPLorg/signal/libsignal/protocol/ecc/Curve;->generateKeyPair()Lorg/signal/libsi
 HSPLorg/signal/libsignal/protocol/ecc/ECKeyPair;-><init>(Lorg/signal/libsignal/protocol/ecc/ECPublicKey;Lorg/signal/libsignal/protocol/ecc/ECPrivateKey;)V
 HSPLorg/signal/libsignal/protocol/ecc/ECKeyPair;->getPrivateKey()Lorg/signal/libsignal/protocol/ecc/ECPrivateKey;
 HSPLorg/signal/libsignal/protocol/ecc/ECKeyPair;->getPublicKey()Lorg/signal/libsignal/protocol/ecc/ECPublicKey;
-HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey$$ExternalSyntheticLambda0;-><init>([B)V
-HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey$$ExternalSyntheticLambda0;->run()J
+HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey$$ExternalSyntheticLambda0;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;[B)V
+HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey$$ExternalSyntheticLambda0;->run()Ljava/lang/Object;
 HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey$$ExternalSyntheticLambda1;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;)V
 HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey$$ExternalSyntheticLambda1;->run()Ljava/lang/Object;
-HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey$$ExternalSyntheticLambda2;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;[B)V
-HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey$$ExternalSyntheticLambda2;->run()Ljava/lang/Object;
-HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey$$ExternalSyntheticLambda3;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;)V
-HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey$$ExternalSyntheticLambda3;->run()J
-HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey;->$r8$lambda$MbIbSgGj4niVXXiGPBORZ8mLmPA([B)J
-HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey;->$r8$lambda$No5KwUEdBqdc-1QGTQLYyCn-1Ok(Lorg/signal/libsignal/internal/NativeHandleGuard;[B)[B
-HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey;->$r8$lambda$r02r7YksOYrvlBsxqqiaG7cC26M(Lorg/signal/libsignal/internal/NativeHandleGuard;)J
-HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey;->$r8$lambda$zGcWUEm42-Be9OQnqpxvn8R7rCM(Lorg/signal/libsignal/internal/NativeHandleGuard;)[B
+HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey$$ExternalSyntheticLambda2;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;)V
+HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey$$ExternalSyntheticLambda2;->run()J
+HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey$$ExternalSyntheticLambda4;-><init>([B)V
+HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey$$ExternalSyntheticLambda4;->run()J
+HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey;->$r8$lambda$8SAu6ouq53lEa11EHLAV9ptJGRk(Lorg/signal/libsignal/internal/NativeHandleGuard;)J
+HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey;->$r8$lambda$EpsWPsNiiryZ9ZNqVsUNxOddz1A(Lorg/signal/libsignal/internal/NativeHandleGuard;[B)[B
+HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey;->$r8$lambda$G2PFsV6vmQwqMhJYoiBPNk6hsH4([B)J
+HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey;->$r8$lambda$iRxSuou2V5jVd6Ps3_y4tuSuxko(Lorg/signal/libsignal/internal/NativeHandleGuard;)[B
 HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey;-><init>(J)V
 HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey;-><init>([B)V
 HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey;->calculateSignature([B)[B
@@ -19350,12 +19652,12 @@ HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey;->lambda$serialize$1(Lorg/sig
 HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey;->publicKey()Lorg/signal/libsignal/protocol/ecc/ECPublicKey;
 HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey;->serialize()[B
 HSPLorg/signal/libsignal/protocol/ecc/ECPrivateKey;->unsafeNativeHandleWithoutGuard()J
-HSPLorg/signal/libsignal/protocol/ecc/ECPublicKey$$ExternalSyntheticLambda1;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;)V
-HSPLorg/signal/libsignal/protocol/ecc/ECPublicKey$$ExternalSyntheticLambda1;->run()Ljava/lang/Object;
 HSPLorg/signal/libsignal/protocol/ecc/ECPublicKey$$ExternalSyntheticLambda2;-><init>([BI)V
 HSPLorg/signal/libsignal/protocol/ecc/ECPublicKey$$ExternalSyntheticLambda2;->run()J
-HSPLorg/signal/libsignal/protocol/ecc/ECPublicKey;->$r8$lambda$OpnN_jVP7qaUUbXglZKRaEAF2Xw([BI)J
-HSPLorg/signal/libsignal/protocol/ecc/ECPublicKey;->$r8$lambda$bw3MsoZI-RTGig2vUkoTpX-F9g8(Lorg/signal/libsignal/internal/NativeHandleGuard;)[B
+HSPLorg/signal/libsignal/protocol/ecc/ECPublicKey$$ExternalSyntheticLambda4;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;)V
+HSPLorg/signal/libsignal/protocol/ecc/ECPublicKey$$ExternalSyntheticLambda4;->run()Ljava/lang/Object;
+HSPLorg/signal/libsignal/protocol/ecc/ECPublicKey;->$r8$lambda$3cPra89GOvCGgFbZK-EV1Qv-jxc([BI)J
+HSPLorg/signal/libsignal/protocol/ecc/ECPublicKey;->$r8$lambda$U-6Yr1xzoYhvmWfi9fnn9ib6HzM(Lorg/signal/libsignal/internal/NativeHandleGuard;)[B
 HSPLorg/signal/libsignal/protocol/ecc/ECPublicKey;-><init>(J)V
 HSPLorg/signal/libsignal/protocol/ecc/ECPublicKey;-><init>([BI)V
 HSPLorg/signal/libsignal/protocol/ecc/ECPublicKey;->finalize()V
@@ -19373,7 +19675,7 @@ HSPLorg/signal/libsignal/protocol/kem/KEMKeyType;-><clinit>()V
 HSPLorg/signal/libsignal/protocol/kem/KEMKeyType;-><init>(Ljava/lang/String;II)V
 HSPLorg/signal/libsignal/protocol/kem/KEMPublicKey$$ExternalSyntheticLambda0;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;)V
 HSPLorg/signal/libsignal/protocol/kem/KEMPublicKey$$ExternalSyntheticLambda0;->run()Ljava/lang/Object;
-HSPLorg/signal/libsignal/protocol/kem/KEMPublicKey;->$r8$lambda$whBY5xWFe6ENKYo1IF5Ruj1ZtjA(Lorg/signal/libsignal/internal/NativeHandleGuard;)[B
+HSPLorg/signal/libsignal/protocol/kem/KEMPublicKey;->$r8$lambda$ClQity3L-eJRW6cDl35SAyBJHl4(Lorg/signal/libsignal/internal/NativeHandleGuard;)[B
 HSPLorg/signal/libsignal/protocol/kem/KEMPublicKey;-><init>(J)V
 HSPLorg/signal/libsignal/protocol/kem/KEMPublicKey;->finalize()V
 HSPLorg/signal/libsignal/protocol/kem/KEMPublicKey;->lambda$serialize$2(Lorg/signal/libsignal/internal/NativeHandleGuard;)[B
@@ -19387,13 +19689,13 @@ HSPLorg/signal/libsignal/protocol/logging/SignalProtocolLoggerProvider;->getProv
 HSPLorg/signal/libsignal/protocol/logging/SignalProtocolLoggerProvider;->setProvider(Lorg/signal/libsignal/protocol/logging/SignalProtocolLogger;)V
 HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord$$ExternalSyntheticLambda1;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;)V
 HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord$$ExternalSyntheticLambda1;->run()Ljava/lang/Object;
-HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord$$ExternalSyntheticLambda2;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;)V
-HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord$$ExternalSyntheticLambda2;->run()J
 HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord$$ExternalSyntheticLambda3;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;)V
 HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord$$ExternalSyntheticLambda3;->run()I
-HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord;->$r8$lambda$6jUER9DICRh22Rfr9hqKLR1wPvo(Lorg/signal/libsignal/internal/NativeHandleGuard;)I
-HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord;->$r8$lambda$6m0gBlf_hbPN_PcswfbDYkQDi90(Lorg/signal/libsignal/internal/NativeHandleGuard;)[B
-HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord;->$r8$lambda$t8mPfc1nmPABKUpk7EyhxTgJQaY(Lorg/signal/libsignal/internal/NativeHandleGuard;)J
+HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord$$ExternalSyntheticLambda4;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;)V
+HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord$$ExternalSyntheticLambda4;->run()J
+HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord;->$r8$lambda$32MB9sZSAWdo_2XQpRup3tGZ3YQ(Lorg/signal/libsignal/internal/NativeHandleGuard;)I
+HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord;->$r8$lambda$4lzKb3MiS_SqXVzn6cWDksr5Gt0(Lorg/signal/libsignal/internal/NativeHandleGuard;)J
+HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord;->$r8$lambda$baSB-43je-Ao8l5PMdw4qPaOy_E(Lorg/signal/libsignal/internal/NativeHandleGuard;)[B
 HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord;-><init>(IJLorg/signal/libsignal/protocol/kem/KEMKeyPair;[B)V
 HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord;->finalize()V
 HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord;->getId()I
@@ -19403,18 +19705,18 @@ HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord;->lambda$getTimestamp$
 HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord;->lambda$serialize$5(Lorg/signal/libsignal/internal/NativeHandleGuard;)[B
 HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord;->serialize()[B
 HSPLorg/signal/libsignal/protocol/state/KyberPreKeyRecord;->unsafeNativeHandleWithoutGuard()J
-HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda2;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;)V
-HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda2;->run()Ljava/lang/Object;
+HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda0;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;)V
+HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda0;->run()J
 HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda3;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;)V
-HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda3;->run()I
+HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda3;->run()Ljava/lang/Object;
 HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda4;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;)V
-HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda4;->run()J
+HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda4;->run()I
 HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda5;-><init>(Lorg/signal/libsignal/internal/NativeHandleGuard;)V
 HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda5;->run()Ljava/lang/Object;
-HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord;->$r8$lambda$CDxhLFeixdJJ3Gbnc7rtYlou6XM(Lorg/signal/libsignal/internal/NativeHandleGuard;)I
-HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord;->$r8$lambda$NNeXiB4zebY13vEwwB1h5auBUd4(Lorg/signal/libsignal/internal/NativeHandleGuard;)[B
-HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord;->$r8$lambda$jMI4_aTYFD7DBqxBerR9ubPEl0s(Lorg/signal/libsignal/internal/NativeHandleGuard;)Lorg/signal/libsignal/protocol/ecc/ECKeyPair;
-HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord;->$r8$lambda$z1983UhCwwiBA9TVd8Th08hmyZ8(Lorg/signal/libsignal/internal/NativeHandleGuard;)J
+HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord;->$r8$lambda$RoYPboO3Et35TOZ89OFK3aXZa7Y(Lorg/signal/libsignal/internal/NativeHandleGuard;)Lorg/signal/libsignal/protocol/ecc/ECKeyPair;
+HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord;->$r8$lambda$dHFNQeuHzRojIu44BVP_Zj_J7Ic(Lorg/signal/libsignal/internal/NativeHandleGuard;)I
+HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord;->$r8$lambda$heGMDHU4oQIuwyJfKvnO9XAgFtM(Lorg/signal/libsignal/internal/NativeHandleGuard;)[B
+HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord;->$r8$lambda$yEtm1YYGQ8XRNlvrGxJtHRqTORE(Lorg/signal/libsignal/internal/NativeHandleGuard;)J
 HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord;-><init>(IJLorg/signal/libsignal/protocol/ecc/ECKeyPair;[B)V
 HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord;->finalize()V
 HSPLorg/signal/libsignal/protocol/state/SignedPreKeyRecord;->getId()I
@@ -19432,11 +19734,12 @@ HSPLorg/signal/libsignal/protocol/util/Medium;-><clinit>()V
 HSPLorg/signal/libsignal/protocol/util/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 HSPLorg/signal/libsignal/protocol/util/Pair;->first()Ljava/lang/Object;
 HSPLorg/signal/libsignal/protocol/util/Pair;->second()Ljava/lang/Object;
-HSPLorg/signal/libsignal/zkgroup/ServerPublicParams$$ExternalSyntheticLambda0;-><init>([B)V
-HSPLorg/signal/libsignal/zkgroup/ServerPublicParams$$ExternalSyntheticLambda0;->run()J
-HSPLorg/signal/libsignal/zkgroup/ServerPublicParams;->$r8$lambda$seZa-GNqGGj1AGfCKLVPf3_WvAQ([B)J
+HSPLorg/signal/libsignal/zkgroup/ServerPublicParams$$ExternalSyntheticLambda1;-><init>([B)V
+HSPLorg/signal/libsignal/zkgroup/ServerPublicParams$$ExternalSyntheticLambda1;->run()J
+HSPLorg/signal/libsignal/zkgroup/ServerPublicParams;->$r8$lambda$5dZUH3gMXRqzEI6cu4Xk2xJSWJM([B)J
 HSPLorg/signal/libsignal/zkgroup/ServerPublicParams;-><init>([B)V
 HSPLorg/signal/libsignal/zkgroup/ServerPublicParams;->lambda$new$0([B)J
+HSPLorg/signal/libsignal/zkgroup/ServerPublicParams;->release(J)V
 HSPLorg/signal/libsignal/zkgroup/auth/ClientZkAuthOperations;-><init>(Lorg/signal/libsignal/zkgroup/ServerPublicParams;)V
 HSPLorg/signal/libsignal/zkgroup/internal/ByteArray$UncheckedAndUncloned;->$values()[Lorg/signal/libsignal/zkgroup/internal/ByteArray$UncheckedAndUncloned;
 HSPLorg/signal/libsignal/zkgroup/internal/ByteArray$UncheckedAndUncloned;-><clinit>()V
@@ -19449,8 +19752,8 @@ HSPLorg/signal/libsignal/zkgroup/profiles/ProfileKey$$ExternalSyntheticLambda0;-
 HSPLorg/signal/libsignal/zkgroup/profiles/ProfileKey$$ExternalSyntheticLambda0;->run()V
 HSPLorg/signal/libsignal/zkgroup/profiles/ProfileKey$$ExternalSyntheticLambda1;-><init>([B)V
 HSPLorg/signal/libsignal/zkgroup/profiles/ProfileKey$$ExternalSyntheticLambda1;->run()V
-HSPLorg/signal/libsignal/zkgroup/profiles/ProfileKey;->$r8$lambda$P6SigbXj8mqaGapQBcbV5r7YaRQ([B)V
-HSPLorg/signal/libsignal/zkgroup/profiles/ProfileKey;->$r8$lambda$W0dzhytOheOI1kXOMee43NnvnCA([B)V
+HSPLorg/signal/libsignal/zkgroup/profiles/ProfileKey;->$r8$lambda$KzGumpm9sCnHGKaZTKnGq5Gey1Y([B)V
+HSPLorg/signal/libsignal/zkgroup/profiles/ProfileKey;->$r8$lambda$rZTdjajsy_qA91zw8Ad0DGCs-ZM([B)V
 HSPLorg/signal/libsignal/zkgroup/profiles/ProfileKey;-><init>([B)V
 HSPLorg/signal/libsignal/zkgroup/profiles/ProfileKey;->getProfileKeyVersion(Lorg/signal/libsignal/protocol/ServiceId$Aci;)Lorg/signal/libsignal/zkgroup/profiles/ProfileKeyVersion;
 HSPLorg/signal/libsignal/zkgroup/profiles/ProfileKey;->lambda$new$0([B)V
@@ -19460,19 +19763,14 @@ HSPLorg/signal/libsignal/zkgroup/profiles/ProfileKeyVersion;->serialize()Ljava/l
 HSPLorg/signal/libsignal/zkgroup/receipts/ClientZkReceiptOperations;-><init>(Lorg/signal/libsignal/zkgroup/ServerPublicParams;)V
 HSPLorg/signal/paging/BufferedPagingController$$ExternalSyntheticLambda1;-><init>(Lorg/signal/paging/BufferedPagingController;I)V
 HSPLorg/signal/paging/BufferedPagingController$$ExternalSyntheticLambda1;->run()V
-HSPLorg/signal/paging/BufferedPagingController$$ExternalSyntheticLambda2;-><init>(Lorg/signal/paging/BufferedPagingController;Ljava/lang/Object;)V
-HSPLorg/signal/paging/BufferedPagingController$$ExternalSyntheticLambda2;->run()V
 HSPLorg/signal/paging/BufferedPagingController$$ExternalSyntheticLambda3;-><init>(Lorg/signal/paging/BufferedPagingController;)V
 HSPLorg/signal/paging/BufferedPagingController$$ExternalSyntheticLambda3;->run()V
-HSPLorg/signal/paging/BufferedPagingController;->$r8$lambda$GxlLAxjfERBgyqmyvxteAPWaQkA(Lorg/signal/paging/BufferedPagingController;Ljava/lang/Object;)V
-HSPLorg/signal/paging/BufferedPagingController;->$r8$lambda$LZo0__w5_DH31X-e0IJhSqYlhmM(Lorg/signal/paging/BufferedPagingController;I)V
-HSPLorg/signal/paging/BufferedPagingController;->$r8$lambda$rEsvvMe_LeaFyq_h5sQ9KWDvIFs(Lorg/signal/paging/BufferedPagingController;)V
+HSPLorg/signal/paging/BufferedPagingController;->$r8$lambda$5AlNKr0Kwlh9m0GvOthVPvnR4bM(Lorg/signal/paging/BufferedPagingController;I)V
+HSPLorg/signal/paging/BufferedPagingController;->$r8$lambda$tEiNw3L2q5qsuezGu4XfjXAOubU(Lorg/signal/paging/BufferedPagingController;)V
 HSPLorg/signal/paging/BufferedPagingController;-><init>(Lorg/signal/paging/PagedDataSource;Lorg/signal/paging/PagingConfig;Lorg/signal/paging/DataStream;)V
 HSPLorg/signal/paging/BufferedPagingController;->lambda$onDataInvalidated$1()V
-HSPLorg/signal/paging/BufferedPagingController;->lambda$onDataItemChanged$2(Ljava/lang/Object;)V
 HSPLorg/signal/paging/BufferedPagingController;->lambda$onDataNeededAroundIndex$0(I)V
 HSPLorg/signal/paging/BufferedPagingController;->onDataInvalidated()V
-HSPLorg/signal/paging/BufferedPagingController;->onDataItemChanged(Ljava/lang/Object;)V
 HSPLorg/signal/paging/BufferedPagingController;->onDataNeededAroundIndex(I)V
 HSPLorg/signal/paging/CompressedList;-><init>(I)V
 HSPLorg/signal/paging/CompressedList;-><init>(Ljava/util/List;)V
@@ -19483,36 +19781,30 @@ HSPLorg/signal/paging/DataStatus;-><clinit>()V
 HSPLorg/signal/paging/DataStatus;-><init>(ILjava/util/BitSet;)V
 HSPLorg/signal/paging/DataStatus;->getEarliestUnmarkedIndexInRange(II)I
 HSPLorg/signal/paging/DataStatus;->getLatestUnmarkedIndexInRange(II)I
-HSPLorg/signal/paging/DataStatus;->mark(I)V
 HSPLorg/signal/paging/DataStatus;->markRange(II)V
 HSPLorg/signal/paging/DataStatus;->obtain(I)Lorg/signal/paging/DataStatus;
 HSPLorg/signal/paging/DataStatus;->recycle()V
 HSPLorg/signal/paging/DataStatus;->size()I
-HSPLorg/signal/paging/FixedSizePagingController$$ExternalSyntheticLambda0;-><init>(Lorg/signal/paging/FixedSizePagingController;Ljava/lang/Object;)V
-HSPLorg/signal/paging/FixedSizePagingController$$ExternalSyntheticLambda0;->run()V
 HSPLorg/signal/paging/FixedSizePagingController$$ExternalSyntheticLambda2;-><init>(Lorg/signal/paging/FixedSizePagingController;IIII)V
 HSPLorg/signal/paging/FixedSizePagingController$$ExternalSyntheticLambda2;->run()V
 HSPLorg/signal/paging/FixedSizePagingController$$ExternalSyntheticLambda3;-><init>(Lorg/signal/paging/FixedSizePagingController;)V
 HSPLorg/signal/paging/FixedSizePagingController$$ExternalSyntheticLambda3;->isCanceled()Z
-HSPLorg/signal/paging/FixedSizePagingController;->$r8$lambda$2jZFFAhs3dG0IThMmzJQSvWvcd0(Lorg/signal/paging/FixedSizePagingController;Ljava/lang/Object;)V
-HSPLorg/signal/paging/FixedSizePagingController;->$r8$lambda$S1N9oMReIFywjAgkTfXskOOFzyk(Lorg/signal/paging/FixedSizePagingController;)Z
-HSPLorg/signal/paging/FixedSizePagingController;->$r8$lambda$pQWvrV6w7QQq3SnkCgnHNDTtP_I(Lorg/signal/paging/FixedSizePagingController;IIII)V
+HSPLorg/signal/paging/FixedSizePagingController;->$r8$lambda$CJYULDWTrsCT1y9GTLNv-G3IRgc(Lorg/signal/paging/FixedSizePagingController;)Z
+HSPLorg/signal/paging/FixedSizePagingController;->$r8$lambda$WQyt151g-UxIXEXdvZ7zhi8sK54(Lorg/signal/paging/FixedSizePagingController;IIII)V
 HSPLorg/signal/paging/FixedSizePagingController;-><clinit>()V
 HSPLorg/signal/paging/FixedSizePagingController;-><init>(Lorg/signal/paging/PagedDataSource;Lorg/signal/paging/PagingConfig;Lorg/signal/paging/DataStream;I)V
 HSPLorg/signal/paging/FixedSizePagingController;->buildDataNeededLog(ILjava/lang/String;)Ljava/lang/String;
-HSPLorg/signal/paging/FixedSizePagingController;->lambda$onDataItemChanged$2(Ljava/lang/Object;)V
 HSPLorg/signal/paging/FixedSizePagingController;->lambda$onDataNeededAroundIndex$0()Z
 HSPLorg/signal/paging/FixedSizePagingController;->lambda$onDataNeededAroundIndex$1(IIII)V
 HSPLorg/signal/paging/FixedSizePagingController;->onDataInvalidated()V
-HSPLorg/signal/paging/FixedSizePagingController;->onDataItemChanged(Ljava/lang/Object;)V
 HSPLorg/signal/paging/FixedSizePagingController;->onDataNeededAroundIndex(I)V
 HSPLorg/signal/paging/LivePagedData;-><init>(Landroidx/lifecycle/LiveData;Lorg/signal/paging/PagingController;)V
 HSPLorg/signal/paging/LivePagedData;->getData()Landroidx/lifecycle/LiveData;
 HSPLorg/signal/paging/ObservablePagedData;-><init>(Lio/reactivex/rxjava3/core/Observable;Lorg/signal/paging/PagingController;)V
 HSPLorg/signal/paging/ObservablePagedData;->getData()Lio/reactivex/rxjava3/core/Observable;
-HSPLorg/signal/paging/PagedData$$ExternalSyntheticLambda0;-><init>(Landroidx/lifecycle/MutableLiveData;)V
+HSPLorg/signal/paging/PagedData$$ExternalSyntheticLambda0;-><init>(Lio/reactivex/rxjava3/subjects/Subject;)V
 HSPLorg/signal/paging/PagedData$$ExternalSyntheticLambda0;->next(Ljava/util/List;)V
-HSPLorg/signal/paging/PagedData$$ExternalSyntheticLambda1;-><init>(Lio/reactivex/rxjava3/subjects/Subject;)V
+HSPLorg/signal/paging/PagedData$$ExternalSyntheticLambda1;-><init>(Landroidx/lifecycle/MutableLiveData;)V
 HSPLorg/signal/paging/PagedData$$ExternalSyntheticLambda1;->next(Ljava/util/List;)V
 HSPLorg/signal/paging/PagedData;-><init>(Lorg/signal/paging/PagingController;)V
 HSPLorg/signal/paging/PagedData;->createForLiveData(Lorg/signal/paging/PagedDataSource;Lorg/signal/paging/PagingConfig;)Lorg/signal/paging/LivePagedData;
@@ -19533,7 +19825,6 @@ HSPLorg/signal/paging/PagingConfig;->pageSize()I
 HSPLorg/signal/paging/PagingConfig;->startIndex()I
 HSPLorg/signal/paging/ProxyPagingController;-><init>()V
 HSPLorg/signal/paging/ProxyPagingController;->onDataInvalidated()V
-HSPLorg/signal/paging/ProxyPagingController;->onDataItemChanged(Ljava/lang/Object;)V
 HSPLorg/signal/paging/ProxyPagingController;->onDataNeededAroundIndex(I)V
 HSPLorg/signal/paging/ProxyPagingController;->set(Lorg/signal/paging/PagingController;)V
 HSPLorg/signal/ringrtc/BuildInfo;-><clinit>()V
@@ -19553,8 +19844,8 @@ HSPLorg/signal/ringrtc/WebRtcLogger;-><init>()V
 HSPLorg/thoughtcrime/securesms/AppCapabilities;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/AppCapabilities;-><init>()V
 HSPLorg/thoughtcrime/securesms/AppCapabilities;->getCapabilities(Z)Lorg/whispersystems/signalservice/api/account/AccountAttributes$Capabilities;
-HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda0;-><init>()V
-HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda0;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda0;->run()V
 HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda10;-><init>()V
 HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda10;->run()V
 HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda11;-><init>()V
@@ -19666,17 +19957,17 @@ HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda59;->r
 HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda5;-><init>(Lorg/thoughtcrime/securesms/ApplicationContext;)V
 HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda5;->run()V
 HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda60;-><init>()V
-HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda61;-><init>(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda61;->run()V
-HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda62;-><init>(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda62;->run()V
+HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda60;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda61;-><init>()V
+HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda61;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda62;-><init>()V
 HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda63;-><init>()V
-HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda64;-><init>(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda65;-><init>()V
-HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda65;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda63;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda64;-><init>()V
+HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda65;-><init>(Lorg/thoughtcrime/securesms/ApplicationContext;)V
 HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda66;-><init>()V
-HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda66;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda67;-><init>()V
+HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda67;-><init>(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda67;->run()V
 HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda6;-><init>()V
 HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda6;->run()V
 HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda7;-><init>(Lorg/thoughtcrime/securesms/ApplicationContext;)V
@@ -19686,53 +19977,53 @@ HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda8;->ru
 HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda9;-><init>(Lorg/thoughtcrime/securesms/ApplicationContext;)V
 HSPLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda9;->run()V
 HSPLorg/thoughtcrime/securesms/ApplicationContext$1;-><init>(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$-wHBiLBDa8OJf1k67fcIsduxfzw(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$1vBGBwM2yUq7VyFaTDG10uWDuPc(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$3QS0qrAN7nliLfSi63lQeukrNXw(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$66l9coKQ_660ADutlicH4GeEP6I(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$6C1lVL7dG_-wAqmFY6Az_Qc88wU()V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$6_YWJVxHZo1viw16tbrU7MDbDJg(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$6jOUg8y8V8AjFQVDC73SAPGSCaQ(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$74GuULvxFktNDe6rV-VHuIqPVJg(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$7zPKdwtEmk03-CX6PmLruPNQaJU()V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$83-lELF9kG6SNHBaUnZs_iTSSfc(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$AGPtfUzlxykaeQb2_And4XR5_cI()V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$AT704sPxWjxGd8P7Knkz-CNN53E(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$BM9zXNQo3VjL7z8V2jLaBOSk3xM(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$CadNTUODZG2Ef63Ub7A1il6CBD0(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$Fx-d1Nr9YoqUcyvu6Ylhfae3_S4(Lio/reactivex/rxjava3/functions/Supplier;)Lio/reactivex/rxjava3/core/Scheduler;
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$H1VD3W_hLtRQIh7BCwmVe1JId7M(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$HAbYs3d3-yBwCTZTjClId9asWMo(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$JFFOXPLm4n83iu1CrQCwt8Rt1vs(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$QTEjfsRccjaeTw0od8y5UGofLnw()V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$QoPhFlm0XNA9Pq0eqhx6SpS3Yf8(Lio/reactivex/rxjava3/functions/Supplier;)Lio/reactivex/rxjava3/core/Scheduler;
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$RIVst1BPIo-PfHpYnrmNZ6n5IC4()V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$RhzI01M6WPCcwVqZ9bQRQL3rEFk(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$VPmvaBBdqqvvVsnAcF1XPhfNAwg(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$Wc-lTVXx_Cj3iM16JtR6Ju_gG5s(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$WhOpCGkNoE806tpRKQr4cnlCHgs()V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$XEBpgM6g0m715OxGVQde5BV4obs()V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$YPJbusS4_A6ryTaa4uhXIPJboWA(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$avxGAGkfv3Ev4XZkSUGrF0ov8Xw(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$bErCCzC-UcRA-wciaIM0aFj_fYc(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$bISWquam07woR6Zo_SGN-pGcVHo(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$cQnTp954Na4k9YavnTCgv-5QUVQ()V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$d1IiCBeJCM6wI7G1fz_gXkhXmmY()V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$dXZkn_yX1EofCAblV1XQ5RabFZk(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$gsuXSdfhwRFZebO53F99f8IHmAg(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$idYYlPtuECvmRBdMPMIWbD5a3kU()V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$j9SYVZNI3aEbrOx6jxBWYL046uc()V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$kC2GAeM9RoAdu5aL5vjepb8NRt4()V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$ltM0LNCO0IpxItflkQs1-OW5yWo(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$nCL1qFe_6GUmC6LRVpbNvqPnxzs(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$nYPlff79P2l-muLhW8EMuKgR50w(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$ot12xp6xNVtSSQ4GK9tV7IySHoM(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$ruqqX1Z0LLWOgajy7Wtjs5N3iks(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$uRzpmm1efLVUhJMEHNtyfP7BiA8(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$vq13xoFA2KFXFtE5Jlx3i42fU-8(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$xQ9ZfcE66PEynu9uNL9k6bEaLXs(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$zLJvo83whBob1hm-1YvxiH4EKqg(Lorg/thoughtcrime/securesms/ApplicationContext;)V
-HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$zNA2sxapNn8tnXiST4flFZyy97A()[B
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$-02k7aUe9mAkBTAbsTRbWLcmBS0(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$07P0rcZ3xGxlT5QbNPXuP5GRKFQ(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$0PxkNakxU0m1q-ouzrRPG73VDx8(Lio/reactivex/rxjava3/functions/Supplier;)Lio/reactivex/rxjava3/core/Scheduler;
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$3J1PNGbz2JxpTs0geSwWhqOfoZA(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$43PRWTqRBaOkYeMixaODJGYqmf0()V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$4YMOa9ItQzDrhwP7k6YAIAYIPeA(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$4bfKzrvr44sx1OqfRYXrYFRw1oc()V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$6Ise0BIfQ2A_HZcvifNQ7uQweCw(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$6VGyDZNHAL4l3sTUQjhVRJ6-eqM(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$7WWrWDoUbrpQC5NaICpCXWDqqlo(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$9FHdJ8ywD_YA5raAuwziL71jClE(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$DEYHGs5VWAq0lpOSrkAXpXJDFg4(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$EBqfiLcI2HVLIbfAzrcRNkY7lzM(Lio/reactivex/rxjava3/functions/Supplier;)Lio/reactivex/rxjava3/core/Scheduler;
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$EHZc2_sS6QN4fG2RvctPLUp6WHw()V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$ExOguOn0LLhKVpegqLH67PVgaIY(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$FZJzt353WLt28YlTmH3IXg3UtC8(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$GJLn-tkZjWSUGiWswcsNME0lz8Q(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$GJVtOgs04iL2OogYmL8950R-pLU()V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$II9Y9KoikM-HhQNafZbKcxJGEIg(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$LMi-GnGFfEOgtxynQbtH4xO6NsY(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$Lkwkw15RujXBqth-W9X0ik5h9JI(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$OLICUv4eitQ3pRh6ltuDeKyfJvs(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$Pr5MnHiAVWUTGJX2u8e9C5J59Tw()V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$V-uXiyQQ6dB_Efs4S8q6EFvM2UQ(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$VqidANq6USGwadl4wqCwcxfMXyQ(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$Vw8t3BIgu0lH8tm5qb5PDke-VP8()V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$XF9_iJ0wSuZpv6e7sef6Rsq8GlE(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$YVZTfJLuRNZM7ebnTTn9-0kJTwQ(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$ZNjwtaU3L4_kPLS0Y8XHKD5orjQ()V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$_MrP-PMJggvS2Uyq6Fl5jB-4mnk(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$b992JFg9PbUfN_9LE-xKLI5Zgak(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$cMSR7SRjgOsgEjmuxQFWdlMDq-4(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$cYBjO4U52Qpc7_6OZFKHUtmxwOk(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$dYk_AM98HjXDWGunFSvm7DJ7Hec(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$eNfYvIO2AO6mJZ0DISmlwCfyFGk()V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$ftK5CLABFY1uXUZ4uqJtd3sDdK4()V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$g4Tr3-ILabGI142ZYkvA84M2oVk()V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$iO9F5hZ-t0KJrIxFZxf5xQL4qd4(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$jKsCRmt5cRg65wmwi3L19FmENVs()V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$kBU0GZg8VhuKZVQF_qfVAJCSyqU()[B
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$nrUlAACXjmln6ZOMDMfhGnqOaYs(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$phOaiTq0DNxBL58p51SwaprPwY4(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$q0blJ1M1_wv3-IUa9EX9aF-bN00(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$vJQILrnvhq7nONjXPvp5XU76h7M()V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$vv6743ogNBAaQNcivpzBaI7HMLg(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$xbfqD8SSc4liQ4KDMlafN4yf82g(Lorg/thoughtcrime/securesms/ApplicationContext;)V
+HSPLorg/thoughtcrime/securesms/ApplicationContext;->$r8$lambda$zLhYg2ZQGMuzpxHmF08uR9qliXk(Lorg/thoughtcrime/securesms/ApplicationContext;)V
 HSPLorg/thoughtcrime/securesms/ApplicationContext;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/ApplicationContext;-><init>()V
 HSPLorg/thoughtcrime/securesms/ApplicationContext;->attachBaseContext(Landroid/content/Context;)V
@@ -19814,7 +20105,7 @@ HSPLorg/thoughtcrime/securesms/MainActivity$$ExternalSyntheticLambda2;->accept(L
 HSPLorg/thoughtcrime/securesms/MainActivity$1;-><init>(Lorg/thoughtcrime/securesms/MainActivity;Landroid/view/View;)V
 HSPLorg/thoughtcrime/securesms/MainActivity$1;->onPreDraw()Z
 HSPLorg/thoughtcrime/securesms/MainActivity$2;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/MainActivity;->$r8$lambda$JMubGcyt2TPHL8nK5TRaxXztRe8(Lorg/thoughtcrime/securesms/MainActivity;Lorg/thoughtcrime/securesms/notifications/VitalsViewModel$State;)V
+HSPLorg/thoughtcrime/securesms/MainActivity;->$r8$lambda$0-FC2vXEpPQSkjlvnwGvegtkKgU(Lorg/thoughtcrime/securesms/MainActivity;Lorg/thoughtcrime/securesms/notifications/VitalsViewModel$State;)V
 HSPLorg/thoughtcrime/securesms/MainActivity;->-$$Nest$fgetonFirstRender(Lorg/thoughtcrime/securesms/MainActivity;)Z
 HSPLorg/thoughtcrime/securesms/MainActivity;-><init>()V
 HSPLorg/thoughtcrime/securesms/MainActivity;->getIntent()Landroid/content/Intent;
@@ -19839,8 +20130,8 @@ HSPLorg/thoughtcrime/securesms/MainNavigator$$ExternalSyntheticLambda0;-><init>(
 HSPLorg/thoughtcrime/securesms/MainNavigator$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/MainNavigator$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/MainNavigator;)V
 HSPLorg/thoughtcrime/securesms/MainNavigator$$ExternalSyntheticLambda1;->accept(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/MainNavigator;->$r8$lambda$BsmRZ7TbLMbFLO4HbBAA_UZA_dc(IILorg/thoughtcrime/securesms/conversation/ConversationIntents$Builder;)Landroid/content/Intent;
-HSPLorg/thoughtcrime/securesms/MainNavigator;->$r8$lambda$QRR_-StramqxZCQdyuE0wK2mbHA(Lorg/thoughtcrime/securesms/MainNavigator;Landroid/content/Intent;)V
+HSPLorg/thoughtcrime/securesms/MainNavigator;->$r8$lambda$qepPMqFZXgoZ1eVcPCIlNLoPumY(IILorg/thoughtcrime/securesms/conversation/ConversationIntents$Builder;)Landroid/content/Intent;
+HSPLorg/thoughtcrime/securesms/MainNavigator;->$r8$lambda$xsTr2U3OhBvgCgIGC5AL7TadH7Q(Lorg/thoughtcrime/securesms/MainNavigator;Landroid/content/Intent;)V
 HSPLorg/thoughtcrime/securesms/MainNavigator;-><init>(Lorg/thoughtcrime/securesms/MainActivity;)V
 HSPLorg/thoughtcrime/securesms/MainNavigator;->get(Landroid/app/Activity;)Lorg/thoughtcrime/securesms/MainNavigator;
 HSPLorg/thoughtcrime/securesms/MainNavigator;->goToConversation(Lorg/thoughtcrime/securesms/recipients/RecipientId;JII)V
@@ -19866,8 +20157,7 @@ HSPLorg/thoughtcrime/securesms/attachments/Attachment$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/attachments/Attachment$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/attachments/Attachment;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/attachments/Attachment;-><init>(Ljava/lang/String;IJLjava/lang/String;Lorg/thoughtcrime/securesms/attachments/Cdn;Ljava/lang/String;Ljava/lang/String;[B[BLjava/lang/String;ZZZIIIZJLjava/lang/String;Lorg/thoughtcrime/securesms/stickers/StickerLocator;Lorg/thoughtcrime/securesms/blurhash/BlurHash;Lorg/thoughtcrime/securesms/audio/AudioHash;Lorg/thoughtcrime/securesms/database/AttachmentTable$TransformProperties;)V
-HSPLorg/thoughtcrime/securesms/attachments/Attachment;->isInProgress()Z
-HSPLorg/thoughtcrime/securesms/attachments/Attachment;->isPermanentlyFailed()Z
+HSPLorg/thoughtcrime/securesms/attachments/Attachment;->getIncrementalDigest()[B
 HSPLorg/thoughtcrime/securesms/attachments/Attachment;->isSticker()Z
 HSPLorg/thoughtcrime/securesms/attachments/AttachmentCreator;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/attachments/AttachmentCreator;-><init>()V
@@ -19895,14 +20185,14 @@ HSPLorg/thoughtcrime/securesms/attachments/DatabaseAttachment$DisplayOrderCompar
 HSPLorg/thoughtcrime/securesms/attachments/DatabaseAttachment$DisplayOrderComparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
 HSPLorg/thoughtcrime/securesms/attachments/DatabaseAttachment$DisplayOrderComparator;->compare(Lorg/thoughtcrime/securesms/attachments/DatabaseAttachment;Lorg/thoughtcrime/securesms/attachments/DatabaseAttachment;)I
 HSPLorg/thoughtcrime/securesms/attachments/DatabaseAttachment;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/attachments/DatabaseAttachment;-><init>(Lorg/thoughtcrime/securesms/attachments/AttachmentId;JZZLjava/lang/String;IJLjava/lang/String;Lorg/thoughtcrime/securesms/attachments/Cdn;Ljava/lang/String;Ljava/lang/String;[B[BILjava/lang/String;ZZZIIZLjava/lang/String;Lorg/thoughtcrime/securesms/stickers/StickerLocator;Lorg/thoughtcrime/securesms/blurhash/BlurHash;Lorg/thoughtcrime/securesms/audio/AudioHash;Lorg/thoughtcrime/securesms/database/AttachmentTable$TransformProperties;IJLjava/lang/String;ILjava/lang/String;Ljava/lang/String;)V
+HSPLorg/thoughtcrime/securesms/attachments/DatabaseAttachment;-><init>(Lorg/thoughtcrime/securesms/attachments/AttachmentId;JZZZLjava/lang/String;IJLjava/lang/String;Lorg/thoughtcrime/securesms/attachments/Cdn;Ljava/lang/String;Ljava/lang/String;[B[BILjava/lang/String;ZZZIIZLjava/lang/String;Lorg/thoughtcrime/securesms/stickers/StickerLocator;Lorg/thoughtcrime/securesms/blurhash/BlurHash;Lorg/thoughtcrime/securesms/audio/AudioHash;Lorg/thoughtcrime/securesms/database/AttachmentTable$TransformProperties;IJLjava/lang/String;IILjava/lang/String;Ljava/lang/String;Lorg/thoughtcrime/securesms/database/AttachmentTable$ThumbnailRestoreState;)V
 HSPLorg/thoughtcrime/securesms/attachments/DatabaseAttachment;->getDisplayOrder()I
 HSPLorg/thoughtcrime/securesms/attachments/DatabaseAttachment;->getUri()Landroid/net/Uri;
 HSPLorg/thoughtcrime/securesms/attachments/DatabaseAttachment;->hashCode()I
 HSPLorg/thoughtcrime/securesms/attachments/PointerAttachment$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/attachments/PointerAttachment$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/attachments/PointerAttachment$Companion;->forPointer$default(Lorg/thoughtcrime/securesms/attachments/PointerAttachment$Companion;Lj$/util/Optional;Lorg/thoughtcrime/securesms/stickers/StickerLocator;Ljava/lang/String;IILjava/lang/Object;)Lj$/util/Optional;
-HSPLorg/thoughtcrime/securesms/attachments/PointerAttachment$Companion;->forPointer(Lj$/util/Optional;Lorg/thoughtcrime/securesms/stickers/StickerLocator;Ljava/lang/String;I)Lj$/util/Optional;
+HSPLorg/thoughtcrime/securesms/attachments/PointerAttachment$Companion;->forPointers(Lj$/util/Optional;)Ljava/util/List;
 HSPLorg/thoughtcrime/securesms/attachments/PointerAttachment;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/attachments/PointerAttachment;-><init>(Ljava/lang/String;IJLjava/lang/String;Lorg/thoughtcrime/securesms/attachments/Cdn;Ljava/lang/String;Ljava/lang/String;[B[BILjava/lang/String;ZZZIIJLjava/lang/String;Lorg/thoughtcrime/securesms/stickers/StickerLocator;Lorg/thoughtcrime/securesms/blurhash/BlurHash;)V
 HSPLorg/thoughtcrime/securesms/attachments/PointerAttachment;->getUri()Landroid/net/Uri;
@@ -19932,7 +20222,7 @@ HSPLorg/thoughtcrime/securesms/avatar/AvatarRenderer$$ExternalSyntheticLambda0;-
 HSPLorg/thoughtcrime/securesms/avatar/AvatarRenderer$renderResource$1;-><init>(Landroid/content/Context;Lorg/thoughtcrime/securesms/avatar/Avatar$Resource;)V
 HSPLorg/thoughtcrime/securesms/avatar/AvatarRenderer$renderResource$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/avatar/AvatarRenderer$renderResource$1;->invoke-IoAF18A(Landroid/graphics/Canvas;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/avatar/AvatarRenderer;->$r8$lambda$LMRb5EH7u5JsF-ZatOYl7HXPvGU(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroid/content/Context;Lkotlin/jvm/functions/Function1;)V
+HSPLorg/thoughtcrime/securesms/avatar/AvatarRenderer;->$r8$lambda$BsOfDZkP0adTAK1NoJ0RuKLEDjg(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Landroid/content/Context;Lkotlin/jvm/functions/Function1;)V
 HSPLorg/thoughtcrime/securesms/avatar/AvatarRenderer;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/avatar/AvatarRenderer;-><init>()V
 HSPLorg/thoughtcrime/securesms/avatar/AvatarRenderer;->createMedia(Landroid/net/Uri;J)Lorg/thoughtcrime/securesms/mediasend/Media;
@@ -19969,12 +20259,9 @@ HSPLorg/thoughtcrime/securesms/avatar/TextAvatarDrawable;->draw(Landroid/graphic
 HSPLorg/thoughtcrime/securesms/avatar/TextAvatarDrawable;->draw(Landroid/text/Layout;Landroid/graphics/Canvas;FF)V
 HSPLorg/thoughtcrime/securesms/avatar/TextAvatarDrawable;->getOpacity()I
 HSPLorg/thoughtcrime/securesms/avatar/TextAvatarDrawable;->getStartX(Landroid/text/StaticLayout;)F
-HSPLorg/thoughtcrime/securesms/avatar/view/AvatarView$WhenMappings;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/avatar/view/AvatarView;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/avatar/view/AvatarView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/avatar/view/AvatarView;->displayChatAvatar(Lcom/bumptech/glide/RequestManager;Lorg/thoughtcrime/securesms/recipients/Recipient;Z)V
-HSPLorg/thoughtcrime/securesms/avatar/view/AvatarView;->hideStoryRing()V
-HSPLorg/thoughtcrime/securesms/avatar/view/AvatarView;->setStoryRingFromState(Lorg/thoughtcrime/securesms/database/model/StoryViewState;)V
 HSPLorg/thoughtcrime/securesms/backup/RestoreState$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/backup/RestoreState$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/backup/RestoreState$Companion;->getSerializer()Lorg/signal/core/util/LongSerializer;
@@ -19989,6 +20276,11 @@ HSPLorg/thoughtcrime/securesms/backup/v2/BackupFrequency$Serializer;-><init>(Lko
 HSPLorg/thoughtcrime/securesms/backup/v2/BackupFrequency;->$values()[Lorg/thoughtcrime/securesms/backup/v2/BackupFrequency;
 HSPLorg/thoughtcrime/securesms/backup/v2/BackupFrequency;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/backup/v2/BackupFrequency;-><init>(Ljava/lang/String;II)V
+HSPLorg/thoughtcrime/securesms/backup/v2/MessageBackupTier$Serializer;-><init>()V
+HSPLorg/thoughtcrime/securesms/backup/v2/MessageBackupTier$Serializer;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/thoughtcrime/securesms/backup/v2/MessageBackupTier;->$values()[Lorg/thoughtcrime/securesms/backup/v2/MessageBackupTier;
+HSPLorg/thoughtcrime/securesms/backup/v2/MessageBackupTier;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/backup/v2/MessageBackupTier;-><init>(Ljava/lang/String;II)V
 HSPLorg/thoughtcrime/securesms/badges/BadgeImageView;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/badges/BadgeImageView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/badges/BadgeImageView;->clearDrawable()V
@@ -19999,18 +20291,10 @@ HSPLorg/thoughtcrime/securesms/badges/BadgeImageView;->setBadgeFromRecipient(Lor
 HSPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration$onDrawOver$2;-><init>(Lorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration;)V
-HSPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration$onDrawOver$2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration$onDrawOver$2;->invoke(Lorg/thoughtcrime/securesms/badges/gifts/OpenableGift;)Ljava/lang/Boolean;
 HSPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration$onDrawOver$4;-><init>(Lorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration;)V
-HSPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration$onDrawOver$4;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration$onDrawOver$4;->invoke(Lorg/thoughtcrime/securesms/badges/gifts/OpenableGift;)Ljava/lang/Boolean;
 HSPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration$onDrawOver$notAnimated$1;-><init>(Lorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration;)V
-HSPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration$onDrawOver$notAnimated$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration$onDrawOver$notAnimated$1;->invoke(Lorg/thoughtcrime/securesms/badges/gifts/OpenableGift;)Ljava/lang/Boolean;
 HSPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration;-><init>(Landroid/content/Context;)V
-HSPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration;->access$getAnimationState$p(Lorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration;)Ljava/util/Map;
-HSPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration;->access$getMessageIdsOpenedThisSession$p(Lorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration;)Ljava/util/Set;
 HSPLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration;->onDrawOver(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
 HSPLorg/thoughtcrime/securesms/blurhash/Base83;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/blurhash/Base83;->isValid(Ljava/lang/String;)Z
@@ -20019,26 +20303,6 @@ HSPLorg/thoughtcrime/securesms/blurhash/BlurHash;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/blurhash/BlurHash;->parseOrNull(Ljava/lang/String;)Lorg/thoughtcrime/securesms/blurhash/BlurHash;
 HSPLorg/thoughtcrime/securesms/blurhash/BlurHashModelLoader$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/blurhash/BlurHashResourceDecoder;-><init>()V
-HSPLorg/thoughtcrime/securesms/components/AlbumThumbnailView$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/components/AlbumThumbnailView;Ljava/util/List;)V
-HSPLorg/thoughtcrime/securesms/components/AlbumThumbnailView$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/components/AlbumThumbnailView;Ljava/util/List;)V
-HSPLorg/thoughtcrime/securesms/components/AlbumThumbnailView$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/components/AlbumThumbnailView;)V
-HSPLorg/thoughtcrime/securesms/components/AlbumThumbnailView$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/components/AlbumThumbnailView;)V
-HSPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-HSPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->applyCorners()V
-HSPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->applyCornersForSizeClass2()V
-HSPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->getCells()[Lorg/thoughtcrime/securesms/components/ThumbnailView;
-HSPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->inflateLayout(I)V
-HSPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->setCancelTransferClickListener(Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;)V
-HSPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->setCellBackgroundColor(I)V
-HSPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->setPlayVideoClickListener(Lorg/thoughtcrime/securesms/mms/SlideClickListener;)V
-HSPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->setRadii(IIII)V
-HSPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->setRelativeRadii(Lorg/thoughtcrime/securesms/components/ThumbnailView;IIII)V
-HSPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->setSlide(Lcom/bumptech/glide/RequestManager;Lorg/thoughtcrime/securesms/mms/Slide;IZ)V
-HSPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->setSlides(Lcom/bumptech/glide/RequestManager;Ljava/util/List;Z)V
-HSPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->setStartTransferClickListener(Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;)V
-HSPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->setThumbnailClickListener(Lorg/thoughtcrime/securesms/mms/SlideClickListener;)V
-HSPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->showSlides(Lcom/bumptech/glide/RequestManager;Ljava/util/List;)V
-HSPLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->sizeClass(I)I
 HSPLorg/thoughtcrime/securesms/components/AlertView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/components/AlertView;->initialize()V
 HSPLorg/thoughtcrime/securesms/components/AlertView;->setNone()V
@@ -20048,16 +20312,13 @@ HSPLorg/thoughtcrime/securesms/components/AnimatingToggle;->addView(Landroid/vie
 HSPLorg/thoughtcrime/securesms/components/AudioView$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/components/AudioView;)V
 HSPLorg/thoughtcrime/securesms/components/AudioView$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/components/AudioView;)V
 HSPLorg/thoughtcrime/securesms/components/AudioView$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/components/AudioView;I)V
-HSPLorg/thoughtcrime/securesms/components/AudioView$$ExternalSyntheticLambda4;->run()V
 HSPLorg/thoughtcrime/securesms/components/AudioView$PlayPauseClickedListener;-><init>(Lorg/thoughtcrime/securesms/components/AudioView;)V
 HSPLorg/thoughtcrime/securesms/components/AudioView$PlayPauseClickedListener;-><init>(Lorg/thoughtcrime/securesms/components/AudioView;Lorg/thoughtcrime/securesms/components/AudioView$PlayPauseClickedListener-IA;)V
 HSPLorg/thoughtcrime/securesms/components/AudioView$SeekBarModifiedListener;-><init>(Lorg/thoughtcrime/securesms/components/AudioView;)V
 HSPLorg/thoughtcrime/securesms/components/AudioView$SeekBarModifiedListener;-><init>(Lorg/thoughtcrime/securesms/components/AudioView;Lorg/thoughtcrime/securesms/components/AudioView$SeekBarModifiedListener-IA;)V
-HSPLorg/thoughtcrime/securesms/components/AudioView;->$r8$lambda$ttH02xbblnAnQbQdy9cXzPNafwQ(Lorg/thoughtcrime/securesms/components/AudioView;I)V
 HSPLorg/thoughtcrime/securesms/components/AudioView;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/components/AudioView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/components/AudioView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-HSPLorg/thoughtcrime/securesms/components/AudioView;->lambda$setTint$3(I)V
 HSPLorg/thoughtcrime/securesms/components/AudioView;->onAttachedToWindow()V
 HSPLorg/thoughtcrime/securesms/components/AudioView;->setProgressAndPlayBackgroundTint(I)V
 HSPLorg/thoughtcrime/securesms/components/AudioView;->setTint(I)V
@@ -20088,12 +20349,7 @@ HSPLorg/thoughtcrime/securesms/components/AvatarImageView;->setAvatar(Lcom/bumpt
 HSPLorg/thoughtcrime/securesms/components/AvatarImageView;->setAvatar(Lcom/bumptech/glide/RequestManager;Lorg/thoughtcrime/securesms/recipients/Recipient;Z)V
 HSPLorg/thoughtcrime/securesms/components/AvatarImageView;->setAvatar(Lcom/bumptech/glide/RequestManager;Lorg/thoughtcrime/securesms/recipients/Recipient;ZZ)V
 HSPLorg/thoughtcrime/securesms/components/AvatarImageView;->setAvatarClickHandler(Lorg/thoughtcrime/securesms/recipients/Recipient;Z)V
-HSPLorg/thoughtcrime/securesms/components/AvatarImageView;->setFallbackPhotoProvider(Lorg/thoughtcrime/securesms/recipients/Recipient$FallbackPhotoProvider;)V
-HSPLorg/thoughtcrime/securesms/components/AvatarImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 HSPLorg/thoughtcrime/securesms/components/ComposeText$1;-><init>(Lorg/thoughtcrime/securesms/components/ComposeText;)V
-HSPLorg/thoughtcrime/securesms/components/ComposeText$CommitContentListener;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/components/ComposeText$CommitContentListener;-><init>(Lorg/thoughtcrime/securesms/components/InputPanel$MediaListener;)V
-HSPLorg/thoughtcrime/securesms/components/ComposeText$CommitContentListener;-><init>(Lorg/thoughtcrime/securesms/components/InputPanel$MediaListener;Lorg/thoughtcrime/securesms/components/ComposeText$CommitContentListener-IA;)V
 HSPLorg/thoughtcrime/securesms/components/ComposeText$QueryStart;-><init>(IZ)V
 HSPLorg/thoughtcrime/securesms/components/ComposeText;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/components/ComposeText;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
@@ -20101,92 +20357,23 @@ HSPLorg/thoughtcrime/securesms/components/ComposeText;->canFilter(Landroid/text/
 HSPLorg/thoughtcrime/securesms/components/ComposeText;->changeSelectionForPartialMentions(Landroid/text/Spanned;II)Z
 HSPLorg/thoughtcrime/securesms/components/ComposeText;->clearInlineQuery()V
 HSPLorg/thoughtcrime/securesms/components/ComposeText;->doAfterCursorChange(Landroid/text/Editable;)V
-HSPLorg/thoughtcrime/securesms/components/ComposeText;->ellipsizeToWidth(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 HSPLorg/thoughtcrime/securesms/components/ComposeText;->findQueryStart(Ljava/lang/CharSequence;I)Lorg/thoughtcrime/securesms/components/ComposeText$QueryStart;
 HSPLorg/thoughtcrime/securesms/components/ComposeText;->findQueryStart(Ljava/lang/CharSequence;IC)I
 HSPLorg/thoughtcrime/securesms/components/ComposeText;->initialize()V
-HSPLorg/thoughtcrime/securesms/components/ComposeText;->isLandscape()Z
-HSPLorg/thoughtcrime/securesms/components/ComposeText;->onCreateInputConnection(Landroid/view/inputmethod/EditorInfo;)Landroid/view/inputmethod/InputConnection;
 HSPLorg/thoughtcrime/securesms/components/ComposeText;->onDraw(Landroid/graphics/Canvas;)V
 HSPLorg/thoughtcrime/securesms/components/ComposeText;->onMeasure(II)V
 HSPLorg/thoughtcrime/securesms/components/ComposeText;->onSelectionChanged(II)V
-HSPLorg/thoughtcrime/securesms/components/ComposeText;->setHint(Ljava/lang/String;)V
-HSPLorg/thoughtcrime/securesms/components/ComposeText;->setHintWithChecks(Ljava/lang/CharSequence;)V
 HSPLorg/thoughtcrime/securesms/components/ComposeText;->setMediaListener(Lorg/thoughtcrime/securesms/components/InputPanel$MediaListener;)V
-HSPLorg/thoughtcrime/securesms/components/ComposeText;->setMessageSendType(Lorg/thoughtcrime/securesms/conversation/MessageSendType;)V
 HSPLorg/thoughtcrime/securesms/components/ComposeTextStyleWatcher;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/components/ComposeTextStyleWatcher;-><init>()V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter$$ExternalSyntheticLambda0;-><init>(I)V
+HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter$$ExternalSyntheticLambda1;-><init>(I)V
 HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/components/ConversationItemFooter;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter$$ExternalSyntheticLambda2;->onLayoutChange(Landroid/view/View;IIIIIIII)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->$r8$lambda$rILpFw6OPAVn7dsgVBus6R0qlZk(Lorg/thoughtcrime/securesms/components/ConversationItemFooter;Landroid/view/View;IIIIIIII)V
 HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->buildMessageId(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)J
-HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->disableBubbleBackground()V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->getDateView()Landroid/view/View;
-HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->getPlaybackSpeedToggleTouchDelegateRect()Landroid/graphics/Rect;
-HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->hideAudioDurationViews()V
 HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->init(Landroid/util/AttributeSet;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->lambda$init$0(Landroid/view/View;IIIIIIII)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->notifyTouchDelegateChanged(Landroid/graphics/Rect;Landroid/view/View;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->presentAudioDuration(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->presentDate(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Ljava/util/Locale;Lorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->presentDeliveryStatus(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->presentInsecureIndicator(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->presentSimInfo(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->presentTimer(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)V
 HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->setIconColor(I)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->setMessageRecord(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Ljava/util/Locale;Lorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;)V
 HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->setOnTouchDelegateChangedListener(Lorg/thoughtcrime/securesms/components/ConversationItemFooter$OnTouchDelegateChangedListener;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->setOnlyShowSendingStatus(ZLorg/thoughtcrime/securesms/database/model/MessageRecord;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->setPlaybackSpeedListener(Lorg/thoughtcrime/securesms/components/PlaybackSpeedToggleTextView$PlaybackSpeedListener;)V
 HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->setRevealDotColor(I)V
 HSPLorg/thoughtcrime/securesms/components/ConversationItemFooter;->setTextColor(I)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail$Companion;-><init>()V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->dispatchDraw(Landroid/graphics/Canvas;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->getFooter()Lorg/thoughtcrime/securesms/util/views/Stub;
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setBorderless(Z)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setCancelTransferClickListener(Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setClickable(Z)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setConversationColor(I)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setCorners(IIII)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setFocusable(Z)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setImageResource(Lcom/bumptech/glide/RequestManager;Ljava/util/List;ZZ)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setMaximumThumbnailHeight(I)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setMinimumThumbnailWidth(I)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setOnLongClickListener(Landroid/view/View$OnLongClickListener;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setPlayVideoClickListener(Lorg/thoughtcrime/securesms/mms/SlideClickListener;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setStartTransferClickListener(Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setThumbnailBounds([I)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setThumbnailClickListener(Lorg/thoughtcrime/securesms/mms/SlideClickListener;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->showShade(Z)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->showThumbnailView()V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState$Creator;-><init>()V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;-><init>(ZZLorg/thoughtcrime/securesms/mms/SlideClickListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlideClickListener;Landroid/view/View$OnLongClickListener;IIIIII)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;-><init>(ZZLorg/thoughtcrime/securesms/mms/SlideClickListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlideClickListener;Landroid/view/View$OnLongClickListener;IIIIIIILkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;->applyState(Lorg/thoughtcrime/securesms/util/views/Stub;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;->copy$default(Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;ZZLorg/thoughtcrime/securesms/mms/SlideClickListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlideClickListener;Landroid/view/View$OnLongClickListener;IIIIIIILjava/lang/Object;)Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;->copy(ZZLorg/thoughtcrime/securesms/mms/SlideClickListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlideClickListener;Landroid/view/View$OnLongClickListener;IIIIII)Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$Creator;-><init>()V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState$Creator;-><init>()V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;-><init>(FZZLorg/thoughtcrime/securesms/mms/SlideClickListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlideClickListener;Landroid/view/View$OnLongClickListener;IIIIIIIII)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;-><init>(FZZLorg/thoughtcrime/securesms/mms/SlideClickListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlideClickListener;Landroid/view/View$OnLongClickListener;IIIIIIIIIILkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;->applyState(Lorg/thoughtcrime/securesms/util/views/Stub;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;->copy$default(Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;FZZLorg/thoughtcrime/securesms/mms/SlideClickListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlideClickListener;Landroid/view/View$OnLongClickListener;IIIIIIIIIILjava/lang/Object;)Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;->copy(FZZLorg/thoughtcrime/securesms/mms/SlideClickListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlideClickListener;Landroid/view/View$OnLongClickListener;IIIIIIIII)Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;-><init>(Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;-><init>(Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;->applyState(Lorg/thoughtcrime/securesms/util/views/Stub;Lorg/thoughtcrime/securesms/util/views/Stub;)V
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;->copy$default(Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;ILjava/lang/Object;)Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;->copy(Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;)Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;->getAlbumViewState()Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;
-HSPLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;->getThumbnailViewState()Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;
 HSPLorg/thoughtcrime/securesms/components/ConversationScrollToView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/components/ConversationScrollToView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 HSPLorg/thoughtcrime/securesms/components/ConversationScrollToView;->setUnreadCountBackgroundTint(I)V
@@ -20194,9 +20381,7 @@ HSPLorg/thoughtcrime/securesms/components/ConversationScrollToView;->setWallpape
 HSPLorg/thoughtcrime/securesms/components/ConversationSearchBottomBar;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/components/ConversationSearchBottomBar;->onFinishInflate()V
 HSPLorg/thoughtcrime/securesms/components/CornerMask;-><init>(Landroid/view/View;)V
-HSPLorg/thoughtcrime/securesms/components/CornerMask;->mask(Landroid/graphics/Canvas;)V
 HSPLorg/thoughtcrime/securesms/components/CornerMask;->setRadii(IIII)V
-HSPLorg/thoughtcrime/securesms/components/CornerMask;->setRadius(I)V
 HSPLorg/thoughtcrime/securesms/components/CornerMask;->setTopLeftRadius(I)V
 HSPLorg/thoughtcrime/securesms/components/CornerMask;->setTopRightRadius(I)V
 HSPLorg/thoughtcrime/securesms/components/DeliveryStatusView$State;->$values()[Lorg/thoughtcrime/securesms/components/DeliveryStatusView$State;
@@ -20209,7 +20394,6 @@ HSPLorg/thoughtcrime/securesms/components/DeliveryStatusView;->setNone()V
 HSPLorg/thoughtcrime/securesms/components/DeliveryStatusView;->setTint(I)V
 HSPLorg/thoughtcrime/securesms/components/DeliveryStatusView;->updateContentDescription()V
 HSPLorg/thoughtcrime/securesms/components/ExpirationTimerView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-HSPLorg/thoughtcrime/securesms/components/ExpirationTimerView;->stopAnimation()V
 HSPLorg/thoughtcrime/securesms/components/FromTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/components/FromTextView;->setText(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
 HSPLorg/thoughtcrime/securesms/components/FromTextView;->setText(Lorg/thoughtcrime/securesms/recipients/Recipient;Ljava/lang/CharSequence;)V
@@ -20222,11 +20406,11 @@ HSPLorg/thoughtcrime/securesms/components/InputAwareConstraintLayout;-><init>(La
 HSPLorg/thoughtcrime/securesms/components/InputAwareConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 HSPLorg/thoughtcrime/securesms/components/InputAwareConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/components/InputAwareConstraintLayout;->setFragmentManager(Landroidx/fragment/app/FragmentManager;)V
+HSPLorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/components/InputPanel;)V
+HSPLorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/components/InputPanel;)V
+HSPLorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/components/InputPanel;)V
+HSPLorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/components/InputPanel;)V
 HSPLorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/components/InputPanel;)V
-HSPLorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda5;-><init>(Lorg/thoughtcrime/securesms/components/InputPanel;)V
-HSPLorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda6;-><init>(Lorg/thoughtcrime/securesms/components/InputPanel;)V
-HSPLorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda7;-><init>(Lorg/thoughtcrime/securesms/components/InputPanel;)V
-HSPLorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda8;-><init>(Lorg/thoughtcrime/securesms/components/InputPanel;)V
 HSPLorg/thoughtcrime/securesms/components/InputPanel$RecordTime;-><init>(Landroid/widget/TextView;Landroid/view/View;JLjava/lang/Runnable;)V
 HSPLorg/thoughtcrime/securesms/components/InputPanel$RecordTime;-><init>(Landroid/widget/TextView;Landroid/view/View;JLjava/lang/Runnable;Lorg/thoughtcrime/securesms/components/InputPanel$RecordTime-IA;)V
 HSPLorg/thoughtcrime/securesms/components/InputPanel$SlideToCancel;-><init>(Landroid/view/View;)V
@@ -20234,12 +20418,10 @@ HSPLorg/thoughtcrime/securesms/components/InputPanel;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/components/InputPanel;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/components/InputPanel;->getVoiceNoteDraft()Lorg/thoughtcrime/securesms/database/DraftTable$Draft;
 HSPLorg/thoughtcrime/securesms/components/InputPanel;->onFinishInflate()V
-HSPLorg/thoughtcrime/securesms/components/InputPanel;->setHideForMessageRequestState(Z)V
 HSPLorg/thoughtcrime/securesms/components/InputPanel;->setMediaKeyboardToggleMode(Lorg/thoughtcrime/securesms/keyboard/KeyboardPage;)V
 HSPLorg/thoughtcrime/securesms/components/InputPanel;->setMediaListener(Lorg/thoughtcrime/securesms/components/InputPanel$MediaListener;)V
 HSPLorg/thoughtcrime/securesms/components/InputPanel;->setWallpaperEnabled(Z)V
 HSPLorg/thoughtcrime/securesms/components/InputPanel;->showMediaKeyboardToggle(Z)V
-HSPLorg/thoughtcrime/securesms/components/InputPanel;->updateVisibility()V
 HSPLorg/thoughtcrime/securesms/components/InsetAwareConstraintLayout$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/components/InsetAwareConstraintLayout;)V
 HSPLorg/thoughtcrime/securesms/components/InsetAwareConstraintLayout$$ExternalSyntheticLambda1;->onApplyWindowInsets(Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
 HSPLorg/thoughtcrime/securesms/components/InsetAwareConstraintLayout$Companion;-><init>()V
@@ -20261,7 +20443,7 @@ HSPLorg/thoughtcrime/securesms/components/InsetAwareConstraintLayout$parentStart
 HSPLorg/thoughtcrime/securesms/components/InsetAwareConstraintLayout$statusBarGuideline$2;-><init>(Lorg/thoughtcrime/securesms/components/InsetAwareConstraintLayout;)V
 HSPLorg/thoughtcrime/securesms/components/InsetAwareConstraintLayout$statusBarGuideline$2;->invoke()Landroidx/constraintlayout/widget/Guideline;
 HSPLorg/thoughtcrime/securesms/components/InsetAwareConstraintLayout$statusBarGuideline$2;->invoke()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/components/InsetAwareConstraintLayout;->$r8$lambda$wNlRlegYRZAGLCv-uS3_baE_8zg(Lorg/thoughtcrime/securesms/components/InsetAwareConstraintLayout;Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
+HSPLorg/thoughtcrime/securesms/components/InsetAwareConstraintLayout;->$r8$lambda$ay1uWHp15t8iWpsybVFP_bM3X7g(Lorg/thoughtcrime/securesms/components/InsetAwareConstraintLayout;Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
 HSPLorg/thoughtcrime/securesms/components/InsetAwareConstraintLayout;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/components/InsetAwareConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 HSPLorg/thoughtcrime/securesms/components/InsetAwareConstraintLayout;->_init_$lambda$0(Lorg/thoughtcrime/securesms/components/InsetAwareConstraintLayout;Landroid/view/View;Landroidx/core/view/WindowInsetsCompat;)Landroidx/core/view/WindowInsetsCompat;
@@ -20294,17 +20476,12 @@ HSPLorg/thoughtcrime/securesms/components/MicrophoneRecorderView;-><init>(Landro
 HSPLorg/thoughtcrime/securesms/components/MicrophoneRecorderView;->onFinishInflate()V
 HSPLorg/thoughtcrime/securesms/components/MicrophoneRecorderView;->setHandler(Lorg/thoughtcrime/securesms/audio/AudioRecordingHandler;)V
 HSPLorg/thoughtcrime/securesms/components/Outliner;-><init>()V
-HSPLorg/thoughtcrime/securesms/components/Outliner;->draw(Landroid/graphics/Canvas;IIII)V
-HSPLorg/thoughtcrime/securesms/components/Outliner;->setColor(I)V
-HSPLorg/thoughtcrime/securesms/components/Outliner;->setRadii(IIII)V
-HSPLorg/thoughtcrime/securesms/components/Outliner;->setStrokeWidth(F)V
 HSPLorg/thoughtcrime/securesms/components/PlaybackSpeedToggleTextView$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/components/PlaybackSpeedToggleTextView;)V
 HSPLorg/thoughtcrime/securesms/components/PlaybackSpeedToggleTextView;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/components/PlaybackSpeedToggleTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/components/PlaybackSpeedToggleTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 HSPLorg/thoughtcrime/securesms/components/PlaybackSpeedToggleTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/components/PlaybackSpeedToggleTextView;->getCurrentLabel()Ljava/lang/String;
-HSPLorg/thoughtcrime/securesms/components/PlaybackSpeedToggleTextView;->setPlaybackSpeedListener(Lorg/thoughtcrime/securesms/components/PlaybackSpeedToggleTextView$PlaybackSpeedListener;)V
 HSPLorg/thoughtcrime/securesms/components/QuoteView$$ExternalSyntheticLambda7;-><init>(Lorg/thoughtcrime/securesms/components/QuoteView;)V
 HSPLorg/thoughtcrime/securesms/components/QuoteView$MessageType;->$values()[Lorg/thoughtcrime/securesms/components/QuoteView$MessageType;
 HSPLorg/thoughtcrime/securesms/components/QuoteView$MessageType;->-$$Nest$smfromCode(I)Lorg/thoughtcrime/securesms/components/QuoteView$MessageType;
@@ -20315,24 +20492,15 @@ HSPLorg/thoughtcrime/securesms/components/QuoteView$MessageType;->values()[Lorg/
 HSPLorg/thoughtcrime/securesms/components/QuoteView;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/components/QuoteView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/components/QuoteView;->applyColorTheme()V
-HSPLorg/thoughtcrime/securesms/components/QuoteView;->dismiss()V
 HSPLorg/thoughtcrime/securesms/components/QuoteView;->initialize(Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/components/QuoteView;->isStoryReply()Z
 HSPLorg/thoughtcrime/securesms/components/QuoteView;->setMessageType(Lorg/thoughtcrime/securesms/components/QuoteView$MessageType;)V
 HSPLorg/thoughtcrime/securesms/components/QuoteView;->setWallpaperEnabled(Z)V
 HSPLorg/thoughtcrime/securesms/components/RatingManager;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/components/RatingManager;->showRatingDialogIfNecessary(Landroid/content/Context;)V
-HSPLorg/thoughtcrime/securesms/components/RecyclerViewParentTransitionController;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/components/RecyclerViewParentTransitionController;-><init>(Landroid/view/ViewGroup;Landroid/animation/LayoutTransition;)V
-HSPLorg/thoughtcrime/securesms/components/RecyclerViewParentTransitionController;-><init>(Landroid/view/ViewGroup;Landroid/animation/LayoutTransition;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/components/RecyclerViewParentTransitionController;->findRecyclerParent()Landroidx/recyclerview/widget/RecyclerView;
-HSPLorg/thoughtcrime/securesms/components/RecyclerViewParentTransitionController;->onScrollStateChanged(Landroidx/recyclerview/widget/RecyclerView;I)V
-HSPLorg/thoughtcrime/securesms/components/RecyclerViewParentTransitionController;->onViewAttachedToWindow(Landroid/view/View;)V
 HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$2;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$2;-><init>()V
 HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$3;-><init>(Lkotlin/jvm/functions/Function1;)V
-HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$3;->test(Ljava/lang/Object;)Z
-HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$3;->test(Lorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$ScrollToPositionRequest;)Z
 HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$4;-><init>(Lkotlin/jvm/functions/Function1;)V
 HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$5;-><init>(Lorg/thoughtcrime/securesms/components/ScrollToPositionDelegate;)V
 HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$Companion;-><init>()V
@@ -20340,47 +20508,14 @@ HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$Companion;-><
 HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$DefaultScrollStrategy;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$DefaultScrollStrategy;-><init>()V
 HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$ScrollToPositionRequest;-><init>(IZLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$ScrollStrategy;)V
-HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$ScrollToPositionRequest;->getPosition()I
 HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$scrollPositionRequests$1;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$scrollPositionRequests$1;-><init>()V
-HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$scrollPositionRequests$1;->apply(JLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$ScrollToPositionRequest;)Lorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$ScrollToPositionRequest;
-HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$scrollPositionRequests$1;->apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate;-><init>(Landroidx/recyclerview/widget/RecyclerView;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
 HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate;-><init>(Landroidx/recyclerview/widget/RecyclerView;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate;-><init>(Landroidx/recyclerview/widget/RecyclerView;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lio/reactivex/rxjava3/disposables/CompositeDisposable;)V
-HSPLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate;->notifyListCommitted()V
 HSPLorg/thoughtcrime/securesms/components/SendButton;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/components/SendButton;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView$$ExternalSyntheticBackport0;->m(Ljava/lang/Object;)Ljava/util/List;
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView$$ExternalSyntheticBackport1;->m(Ljava/lang/Object;)Ljava/util/List;
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView$$ExternalSyntheticBackport2;->m([Ljava/lang/Object;)Ljava/util/List;
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView$CancelClickDispatcher;-><init>(Lorg/thoughtcrime/securesms/components/ThumbnailView;)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView$CancelClickDispatcher;-><init>(Lorg/thoughtcrime/securesms/components/ThumbnailView;Lorg/thoughtcrime/securesms/components/ThumbnailView$CancelClickDispatcher-IA;)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView$DownloadClickDispatcher;-><init>(Lorg/thoughtcrime/securesms/components/ThumbnailView;)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView$DownloadClickDispatcher;-><init>(Lorg/thoughtcrime/securesms/components/ThumbnailView;Lorg/thoughtcrime/securesms/components/ThumbnailView$DownloadClickDispatcher-IA;)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView$ThumbnailClickDispatcher;-><init>(Lorg/thoughtcrime/securesms/components/ThumbnailView;)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView$ThumbnailClickDispatcher;-><init>(Lorg/thoughtcrime/securesms/components/ThumbnailView;Lorg/thoughtcrime/securesms/components/ThumbnailView$ThumbnailClickDispatcher-IA;)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView;->dispatchDraw(Landroid/graphics/Canvas;)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView;->fillTargetDimensions([I[I[I)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView;->getNonZeroCount([I)I
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView;->hasSameContents(Lorg/thoughtcrime/securesms/mms/Slide;Lorg/thoughtcrime/securesms/mms/Slide;)Z
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView;->onMeasure(II)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView;->onSizeChanged(IIII)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView;->setBounds(IIII)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView;->setCancelTransferClickListener(Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView;->setClickable(Z)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView;->setFocusable(Z)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView;->setImageResource(Lcom/bumptech/glide/RequestManager;Lorg/thoughtcrime/securesms/mms/Slide;ZZ)Lorg/signal/core/util/concurrent/ListenableFuture;
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView;->setImageResource(Lcom/bumptech/glide/RequestManager;Lorg/thoughtcrime/securesms/mms/Slide;ZZII)Lorg/signal/core/util/concurrent/ListenableFuture;
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView;->setPlayVideoClickListener(Lorg/thoughtcrime/securesms/mms/SlideClickListener;)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView;->setRadii(IIII)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView;->setStartTransferClickListener(Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView;->setThumbnailClickListener(Lorg/thoughtcrime/securesms/mms/SlideClickListener;)V
-HSPLorg/thoughtcrime/securesms/components/ThumbnailView;->showSecondaryText(Z)V
 HSPLorg/thoughtcrime/securesms/components/TypingIndicatorView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/components/TypingIndicatorView;->initialize(Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/components/TypingIndicatorView;->setDotTint(I)V
@@ -20410,7 +20545,7 @@ HSPLorg/thoughtcrime/securesms/components/emoji/Emoji;->getRawVariation(I)Ljava/
 HSPLorg/thoughtcrime/securesms/components/emoji/Emoji;->getVariations()Ljava/util/List;
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiEditText$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/components/emoji/EmojiEditText;)V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiEditText$$ExternalSyntheticLambda0;->onFocusChange(Landroid/view/View;Z)V
-HSPLorg/thoughtcrime/securesms/components/emoji/EmojiEditText;->$r8$lambda$8pyXdt50o8im33POXP_o4TKoD6U(Lorg/thoughtcrime/securesms/components/emoji/EmojiEditText;Landroid/view/View;Z)V
+HSPLorg/thoughtcrime/securesms/components/emoji/EmojiEditText;->$r8$lambda$lDZsdJllHZCEY_BZNOkh-crnBZo(Lorg/thoughtcrime/securesms/components/emoji/EmojiEditText;Landroid/view/View;Z)V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiEditText;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiEditText;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiEditText;->appendEmojiFilter([Landroid/text/InputFilter;Z)[Landroid/text/InputFilter;
@@ -20422,7 +20557,7 @@ HSPLorg/thoughtcrime/securesms/components/emoji/EmojiProvider$$ExternalSynthetic
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiProvider$$ExternalSyntheticLambda2;->run()V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiProvider$1$$ExternalSyntheticLambda0;-><init>(Ljava/util/concurrent/atomic/AtomicBoolean;Lorg/thoughtcrime/securesms/components/emoji/EmojiProvider$EmojiDrawable;Landroid/graphics/Bitmap;Ljava/lang/Runnable;)V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiProvider$1$$ExternalSyntheticLambda0;->run()V
-HSPLorg/thoughtcrime/securesms/components/emoji/EmojiProvider$1;->$r8$lambda$4L2_h8aPokle0HaCJaAushylooI(Ljava/util/concurrent/atomic/AtomicBoolean;Lorg/thoughtcrime/securesms/components/emoji/EmojiProvider$EmojiDrawable;Landroid/graphics/Bitmap;Ljava/lang/Runnable;)V
+HSPLorg/thoughtcrime/securesms/components/emoji/EmojiProvider$1;->$r8$lambda$jz3NFBN0YyUiUPCPM_u__5nee7s(Ljava/util/concurrent/atomic/AtomicBoolean;Lorg/thoughtcrime/securesms/components/emoji/EmojiProvider$EmojiDrawable;Landroid/graphics/Bitmap;Ljava/lang/Runnable;)V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiProvider$1;-><init>(Ljava/util/concurrent/atomic/AtomicBoolean;Lorg/thoughtcrime/securesms/components/emoji/EmojiProvider$EmojiDrawable;Ljava/lang/Runnable;)V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiProvider$1;->lambda$onSuccess$0(Ljava/util/concurrent/atomic/AtomicBoolean;Lorg/thoughtcrime/securesms/components/emoji/EmojiProvider$EmojiDrawable;Landroid/graphics/Bitmap;Ljava/lang/Runnable;)V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiProvider$1;->onSuccess(Landroid/graphics/Bitmap;)V
@@ -20440,39 +20575,27 @@ HSPLorg/thoughtcrime/securesms/components/emoji/EmojiSpan;-><init>(Landroid/grap
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiSpan;->draw(Landroid/graphics/Canvas;Ljava/lang/CharSequence;IIFIIILandroid/graphics/Paint;)V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiSpan;->getSize(Landroid/graphics/Paint;Ljava/lang/CharSequence;IILandroid/graphics/Paint$FontMetricsInt;)I
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;)V
-HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView$$ExternalSyntheticLambda1;-><init>()V
-HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;)V
-HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView$$ExternalSyntheticLambda2;->run()V
-HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView$$ExternalSyntheticLambda3;-><init>(Ljava/lang/Runnable;)V
-HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView$$ExternalSyntheticLambda3;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->$r8$lambda$5IPAQraRDnd37oqJyWeDCIArE8A(Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;Ljava/lang/String;)Ljava/lang/Float;
-HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->$r8$lambda$9VxJG--rce_LMrBbBVi5JkyJelM(Ljava/lang/Runnable;Landroid/view/View;)Lkotlin/Unit;
-HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->$r8$lambda$PicvuNf_O0Zy5LBsFpj6-AJMdsI(Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;)V
+HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView$$ExternalSyntheticLambda0;->run()V
+HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView$$ExternalSyntheticLambda1;-><init>(Ljava/lang/Runnable;)V
+HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView$$ExternalSyntheticLambda1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->$r8$lambda$Wu3CFKvJwFFWN-o0X8m-zsbIJpA(Ljava/lang/Runnable;Landroid/view/View;)Lkotlin/Unit;
+HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->$r8$lambda$_XmAzJ07P5yhLgrWLOrmxQntA7M(Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;)V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->applyWidthMeasureRoundingFix(I)I
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->drawSpecialRenderers(Landroid/graphics/Canvas;Lorg/thoughtcrime/securesms/components/mention/MentionRendererDelegate;Lorg/thoughtcrime/securesms/components/spoiler/SpoilerRendererDelegate;)V
-HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->ellipsizeAnyTextForMaxLength()V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->ellipsizeEmojiTextForMaxLines()V
-HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->getLastLineWidth()I
-HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->getLongestLineWidth(Ljava/lang/CharSequence;)F
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->hasMetricAffectingSpan(Ljava/lang/CharSequence;)Z
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->invalidateDrawable(Landroid/graphics/drawable/Drawable;)V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->isEllipsizedAtEnd()Z
-HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->isJumbomoji()Z
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->isSingleLine()Z
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->lambda$ellipsizeEmojiTextForMaxLines$2()V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->lambda$ellipsizeEmojiTextForMaxLines$3(Ljava/lang/Runnable;Landroid/view/View;)Lkotlin/Unit;
-HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->lambda$getLongestLineWidth$0(Ljava/lang/String;)Ljava/lang/Float;
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->onDraw(Landroid/graphics/Canvas;)V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->onMeasure(II)V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->onSizeChanged(IIII)V
-HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->setMentionBackgroundTint(I)V
-HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->setOverflowText(Ljava/lang/CharSequence;)V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->setText(Ljava/lang/CharSequence;Landroid/widget/TextView$BufferType;)V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->setTextColor(I)V
-HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->setTextSize(IF)V
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->unchanged(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Landroid/widget/TextView$BufferType;)Z
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->useSystemEmoji()Z
 HSPLorg/thoughtcrime/securesms/components/emoji/EmojiToggle$1;-><clinit>()V
@@ -20485,7 +20608,7 @@ HSPLorg/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel;-><init>(La
 HSPLorg/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel;->getPersistedCache()Ljava/util/LinkedHashSet;
 HSPLorg/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView$$ExternalSyntheticLambda0;-><init>(IILorg/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView;)V
 HSPLorg/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView$$ExternalSyntheticLambda0;->run()V
-HSPLorg/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView;->$r8$lambda$4Klqi0f0CTTxkCnsSD7H1XDP4BU(IILorg/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView;)V
+HSPLorg/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView;->$r8$lambda$FPUtk6YnAe_RhEyo3wf9WhQ3Qf4(IILorg/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView;)V
 HSPLorg/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
@@ -20496,11 +20619,10 @@ HSPLorg/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView;->onSizeChan
 HSPLorg/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView;->setText(Ljava/lang/CharSequence;Landroid/widget/TextView$BufferType;)V
 HSPLorg/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel$$ExternalSyntheticLambda0;-><init>()V
 HSPLorg/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel;->$r8$lambda$JF4b3_hSAjv4mgyJdDQqQKS7TPI(Ljava/lang/String;)Lorg/thoughtcrime/securesms/components/emoji/Emoji;
+HSPLorg/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel;->$r8$lambda$Jvl1o9JCi4FhfHhXHM7lO_X6PFc(Ljava/lang/String;)Lorg/thoughtcrime/securesms/components/emoji/Emoji;
 HSPLorg/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel;-><init>(Lorg/thoughtcrime/securesms/emoji/EmojiCategory;Ljava/util/List;Landroid/net/Uri;)V
 HSPLorg/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel;-><init>(Lorg/thoughtcrime/securesms/emoji/EmojiCategory;[Ljava/lang/String;Landroid/net/Uri;)V
 HSPLorg/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel;->getDisplayEmoji()Ljava/util/List;
-HSPLorg/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel;->getEmoji()Ljava/util/List;
 HSPLorg/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel;->getIconAttr()I
 HSPLorg/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel;->getSpriteUri()Landroid/net/Uri;
 HSPLorg/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel;->lambda$new$0(Ljava/lang/String;)Lorg/thoughtcrime/securesms/components/emoji/Emoji;
@@ -20540,16 +20662,12 @@ HSPLorg/thoughtcrime/securesms/components/emoji/parsing/Fitzpatrick;-><clinit>()
 HSPLorg/thoughtcrime/securesms/components/emoji/parsing/Fitzpatrick;-><init>(Ljava/lang/String;ILjava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/components/emoji/parsing/Fitzpatrick;->fitzpatrickFromUnicode(Ljava/lang/CharSequence;I)Lorg/thoughtcrime/securesms/components/emoji/parsing/Fitzpatrick;
 HSPLorg/thoughtcrime/securesms/components/emoji/parsing/Fitzpatrick;->values()[Lorg/thoughtcrime/securesms/components/emoji/parsing/Fitzpatrick;
-HSPLorg/thoughtcrime/securesms/components/mention/MentionAnnotation$$ExternalSyntheticLambda1;-><init>()V
-HSPLorg/thoughtcrime/securesms/components/mention/MentionAnnotation;->getMentionAnnotations(Landroid/text/Spanned;)Ljava/util/List;
-HSPLorg/thoughtcrime/securesms/components/mention/MentionAnnotation;->getMentionAnnotations(Landroid/text/Spanned;II)Ljava/util/List;
 HSPLorg/thoughtcrime/securesms/components/mention/MentionDeleter;-><init>()V
 HSPLorg/thoughtcrime/securesms/components/mention/MentionRenderer$MultiLineMentionRenderer;-><init>(IILandroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
 HSPLorg/thoughtcrime/securesms/components/mention/MentionRenderer$SingleLineMentionRenderer;-><init>(IILandroid/graphics/drawable/Drawable;)V
 HSPLorg/thoughtcrime/securesms/components/mention/MentionRenderer;-><init>(II)V
 HSPLorg/thoughtcrime/securesms/components/mention/MentionRendererDelegate;-><init>(Landroid/content/Context;I)V
 HSPLorg/thoughtcrime/securesms/components/mention/MentionRendererDelegate;->draw(Landroid/graphics/Canvas;Landroid/text/Spanned;Landroid/text/Layout;)V
-HSPLorg/thoughtcrime/securesms/components/mention/MentionRendererDelegate;->setTint(I)V
 HSPLorg/thoughtcrime/securesms/components/mention/MentionValidatorWatcher;-><init>()V
 HSPLorg/thoughtcrime/securesms/components/menu/ActionItem;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/components/menu/ActionItem;-><init>(ILjava/lang/CharSequence;ILjava/lang/Runnable;)V
@@ -20609,8 +20727,16 @@ HSPLorg/thoughtcrime/securesms/components/settings/app/notifications/profiles/No
 HSPLorg/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesRepository;-><init>()V
 HSPLorg/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesRepository;->access$getDatabase$p(Lorg/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesRepository;)Lorg/thoughtcrime/securesms/database/NotificationProfileDatabase;
 HSPLorg/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesRepository;->getProfiles()Lio/reactivex/rxjava3/core/Flowable;
+HSPLorg/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate$$ExternalSyntheticLambda0;-><init>()V
+HSPLorg/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate$$ExternalSyntheticLambda0;->call()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate$handleInAppPaymentSheets$2;-><init>(Lorg/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate;)V
+HSPLorg/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate$handleInAppPaymentSheets$2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate$handleInAppPaymentSheets$2;->invoke(Ljava/util/List;)V
+HSPLorg/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate;->$r8$lambda$KgPhBnaXF0FIeLAQCubxacezMXs()Ljava/util/List;
 HSPLorg/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate;-><init>(Landroidx/fragment/app/FragmentManager;Landroidx/lifecycle/LifecycleOwner;)V
+HSPLorg/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate;->handleInAppPaymentSheets$lambda$2()Ljava/util/List;
+HSPLorg/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate;->handleInAppPaymentSheets()V
 HSPLorg/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate;->onCreate(Landroidx/lifecycle/LifecycleOwner;)V
 HSPLorg/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate;->onPause(Landroidx/lifecycle/LifecycleOwner;)V
 HSPLorg/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate;->onResume(Landroidx/lifecycle/LifecycleOwner;)V
@@ -20657,82 +20783,6 @@ HSPLorg/thoughtcrime/securesms/components/spoiler/SpoilerRendererDelegate;->acce
 HSPLorg/thoughtcrime/securesms/components/spoiler/SpoilerRendererDelegate;->draw(Landroid/graphics/Canvas;Landroid/text/Spanned;Landroid/text/Layout;)V
 HSPLorg/thoughtcrime/securesms/components/spoiler/SpoilerRendererDelegate;->stopAnimating()V
 HSPLorg/thoughtcrime/securesms/components/spoiler/SpoilerRendererDelegate;->updateFromTextColor()V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Companion;-><init>()V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Companion;->containsPlayableSlides(Ljava/util/List;)Z
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Companion;->getTransferState(Ljava/util/List;)I
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Mode;->$values()[Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Mode;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Mode;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Mode;-><init>(Ljava/lang/String;I)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Progress$Companion;-><init>()V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Progress$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Progress;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Progress;-><init>(JJ)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Progress;->toString()Ljava/lang/String;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setCancelClickListener$1;-><init>(Landroid/view/View$OnClickListener;)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setCancelClickListener$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setCancelClickListener$1;->invoke(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;)Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setClickable$1;-><init>(Z)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setClickable$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setClickable$1;->invoke(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;)Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setFocusable$1;-><init>(Z)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setFocusable$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setFocusable$1;->invoke(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;)Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setShowSecondaryText$1;-><init>(Z)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setShowSecondaryText$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setShowSecondaryText$1;->invoke(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;)Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setSlides$2;-><init>(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;Ljava/util/List;)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setSlides$2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setSlides$2;->invoke(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;)Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setTransferClickListener$1;-><init>(Landroid/view/View$OnClickListener;)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setTransferClickListener$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setTransferClickListener$1;->invoke(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;)Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setVisible$1;-><init>(Z)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setVisible$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setVisible$1;->invoke(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;)Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->access$isUpdateToExistingSet(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;Ljava/util/List;)Z
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->access$slidesAsListOfTimestamps(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;Ljava/util/List;)Ljava/lang/String;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->access$verboseLog(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;Ljava/lang/String;)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->containsPlayableSlides(Ljava/util/List;)Z
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->deriveMode(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;)Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Mode;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->getTransferState(Ljava/util/List;)I
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->isUpdateToExistingSet(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;Ljava/util/List;)Z
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->onAttachedToWindow()V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->setCancelClickListener(Landroid/view/View$OnClickListener;)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->setClickable(Z)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->setFocusable(Z)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->setShowSecondaryText(Z)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->setSlides(Ljava/util/List;)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->setTransferClickListener(Landroid/view/View$OnClickListener;)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->setVisible(Z)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->slidesAsListOfTimestamps(Ljava/util/List;)Ljava/lang/String;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->updateState(Lkotlin/jvm/functions/Function1;)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->verboseLog(Ljava/lang/String;)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;-><init>(ZZZLjava/util/List;Landroid/view/View$OnClickListener;Landroid/view/View$OnClickListener;Landroid/view/View$OnClickListener;ZLjava/util/Map;Ljava/util/Map;ZZ)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;-><init>(ZZZLjava/util/List;Landroid/view/View$OnClickListener;Landroid/view/View$OnClickListener;Landroid/view/View$OnClickListener;ZLjava/util/Map;Ljava/util/Map;ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;->copy$default(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;ZZZLjava/util/List;Landroid/view/View$OnClickListener;Landroid/view/View$OnClickListener;Landroid/view/View$OnClickListener;ZLjava/util/Map;Ljava/util/Map;ZZILjava/lang/Object;)Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;->copy(ZZZLjava/util/List;Landroid/view/View$OnClickListener;Landroid/view/View$OnClickListener;Landroid/view/View$OnClickListener;ZLjava/util/Map;Ljava/util/Map;ZZ)Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;->equals(Ljava/lang/Object;)Z
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;->getNetworkProgress()Ljava/util/Map;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;->getSlides()Ljava/util/List;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;->toString()Ljava/lang/String;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView$Companion;-><init>()V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView$State;->$values()[Lorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView$State;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView$State;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView$State;-><init>(Ljava/lang/String;I)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;II)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IIILkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView;->progressPaint(I)Landroid/graphics/Paint;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView;->stopIconPaint(I)Landroid/graphics/Paint;
-HSPLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView;->trackPaint(I)Landroid/graphics/Paint;
 HSPLorg/thoughtcrime/securesms/components/voice/RetryableInitAudioSink$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/components/voice/RetryableInitAudioSink$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/components/voice/RetryableInitAudioSink;-><clinit>()V
@@ -20772,7 +20822,7 @@ HSPLorg/thoughtcrime/securesms/components/voice/VoiceNoteMediaNotificationProvid
 HSPLorg/thoughtcrime/securesms/components/voice/VoiceNoteMediaNotificationProvider$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/components/voice/VoiceNoteMediaNotificationProvider;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/components/voice/VoiceNoteMediaNotificationProvider;-><init>(Landroid/content/Context;)V
-HSPLorg/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService;)V
+HSPLorg/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService;)V
 HSPLorg/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService$KeyClearedReceiver$1;-><init>(Lorg/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService$KeyClearedReceiver;)V
 HSPLorg/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService$KeyClearedReceiver$1;->onSuccess(Landroidx/media3/session/MediaController;)V
 HSPLorg/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService$KeyClearedReceiver$1;->onSuccess(Ljava/lang/Object;)V
@@ -20865,10 +20915,10 @@ HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$1;-><init>(Lo
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$2;-><init>(Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$ClickCallbacks;)V
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$3;-><init>(Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$LongClickCallbacks;)V
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$4;-><init>(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$Companion$$ExternalSyntheticLambda0;-><init>(ZLorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$OnClickedCallback;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$StoryContextMenuCallbacks;Z)V
-HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$Companion$$ExternalSyntheticLambda1;-><init>(Lkotlin/jvm/functions/Function1;)V
+HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$Companion$$ExternalSyntheticLambda0;-><init>(Ljava/util/Set;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$DisplayOptions;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$OnClickedCallback;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$OnLongClickedCallback;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$CallButtonClickCallbacks;)V
+HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$Companion$$ExternalSyntheticLambda1;-><init>(ZLorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$OnClickedCallback;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$StoryContextMenuCallbacks;Z)V
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$Companion$$ExternalSyntheticLambda2;-><init>()V
-HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$Companion$$ExternalSyntheticLambda3;-><init>(Ljava/util/Set;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$DisplayOptions;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$OnClickedCallback;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$OnLongClickedCallback;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$CallButtonClickCallbacks;)V
+HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$Companion$$ExternalSyntheticLambda3;-><init>(Lkotlin/jvm/functions/Function1;)V
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$Companion;->registerExpands(Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;Lkotlin/jvm/functions/Function1;)V
@@ -20910,7 +20960,7 @@ HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchMediator$$ExternalSyn
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchMediator$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchMediator$1$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchMediator;Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchMediator$1$$ExternalSyntheticLambda0;->run()V
-HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchMediator$1;->$r8$lambda$xNpnlh4xS-aY5nsmh0mQIk3E9iE(Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchMediator;Ljava/util/List;)V
+HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchMediator$1;->$r8$lambda$2GJWL7WDs5Q7IkWqe-wlXRVxnyk(Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchMediator;Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchMediator$1;-><init>(Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchMediator;Lorg/thoughtcrime/securesms/contacts/paged/ArbitraryRepository;)V
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchMediator$1;->invoke$lambda$0(Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchMediator;Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchMediator$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
@@ -20954,8 +21004,8 @@ HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchState;-><init>(Ljava/
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchState;->copy$default(Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchState;Ljava/lang/String;Lorg/thoughtcrime/securesms/conversationlist/chatfilter/ConversationFilterRequest;Ljava/util/Set;Ljava/util/Set;ILjava/lang/Object;)Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchState;
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchState;->copy(Ljava/lang/String;Lorg/thoughtcrime/securesms/conversationlist/chatfilter/ConversationFilterRequest;Ljava/util/Set;Ljava/util/Set;)Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchState;
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchState;->getQuery()Ljava/lang/String;
-HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/conversationlist/chatfilter/ConversationFilterRequest;)V
-HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel$$ExternalSyntheticLambda2;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel$$ExternalSyntheticLambda6;-><init>(Lorg/thoughtcrime/securesms/conversationlist/chatfilter/ConversationFilterRequest;)V
+HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel$$ExternalSyntheticLambda6;->apply(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel$Factory;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel$Factory;-><init>(Lorg/thoughtcrime/securesms/groups/SelectionLimits;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchRepository;ZLorg/thoughtcrime/securesms/contacts/paged/ArbitraryRepository;Lorg/thoughtcrime/securesms/search/SearchRepository;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchPagedDataSourceRepository;)V
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel$Factory;->create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
@@ -20970,7 +21020,7 @@ HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel$data$1;->in
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel$data$1;->invoke(Lorg/signal/paging/LivePagedData;)Landroidx/lifecycle/LiveData;
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel$safetyNumberRepository$2;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel$safetyNumberRepository$2;-><init>()V
-HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel;->$r8$lambda$duJlOPaWhrRQAejXXQFDSSB1x-M(Lorg/thoughtcrime/securesms/conversationlist/chatfilter/ConversationFilterRequest;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchState;)Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchState;
+HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel;->$r8$lambda$YgqnHa40K-rkZwpb6-Yj54ItoKs(Lorg/thoughtcrime/securesms/conversationlist/chatfilter/ConversationFilterRequest;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchState;)Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchState;
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel;-><init>(Lorg/thoughtcrime/securesms/groups/SelectionLimits;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchRepository;ZLorg/thoughtcrime/securesms/contacts/paged/ArbitraryRepository;Lorg/thoughtcrime/securesms/search/SearchRepository;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchPagedDataSourceRepository;)V
 HSPLorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel;->getConfigurationState()Landroidx/lifecycle/LiveData;
@@ -20988,7 +21038,6 @@ HSPLorg/thoughtcrime/securesms/conversation/BodyBubbleLayoutTransition;-><clinit
 HSPLorg/thoughtcrime/securesms/conversation/BodyBubbleLayoutTransition;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/ClipProjectionDrawable;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/ClipProjectionDrawable;-><init>(Landroid/graphics/drawable/Drawable;)V
-HSPLorg/thoughtcrime/securesms/conversation/ClipProjectionDrawable;->draw(Landroid/graphics/Canvas;)V
 HSPLorg/thoughtcrime/securesms/conversation/ClipProjectionDrawable;->setProjections(Ljava/util/Set;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationData$MessageRequestData;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationData$MessageRequestData;-><init>(ZZ)V
@@ -21006,20 +21055,6 @@ HSPLorg/thoughtcrime/securesms/conversation/ConversationData;->getUnreadCount()I
 HSPLorg/thoughtcrime/securesms/conversation/ConversationData;->shouldJumpToMessage()Z
 HSPLorg/thoughtcrime/securesms/conversation/ConversationData;->shouldScrollToLastSeen()Z
 HSPLorg/thoughtcrime/securesms/conversation/ConversationData;->showUniversalExpireTimerMessage()Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationHeaderView$$ExternalSyntheticLambda3;-><init>(Ljava/lang/Runnable;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationHeaderView$FallbackPhotoProvider;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationHeaderView$FallbackPhotoProvider;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationHeaderView$FallbackPhotoProvider-IA;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;->hideButton()V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;->hideDescription()V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;->hideSubtitle()V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;->setAbout(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;->setAvatar(Lcom/bumptech/glide/RequestManager;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;->setLinkifyDescription(Z)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;->setTitle(Lorg/thoughtcrime/securesms/recipients/Recipient;Ljava/lang/Runnable;)Ljava/lang/String;
-HSPLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;->showBackgroundBubble(Z)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;->updateOutlineVisibility()V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationIntents$Args;-><init>(Lorg/thoughtcrime/securesms/recipients/RecipientId;JLjava/lang/String;Landroid/net/Uri;Ljava/lang/String;Ljava/util/ArrayList;Lorg/thoughtcrime/securesms/stickers/StickerLocator;ZIIZZLorg/thoughtcrime/securesms/badges/models/Badge;JLorg/thoughtcrime/securesms/conversation/ConversationIntents$ConversationScreenType;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationIntents$Args;->from(Landroid/os/Bundle;)Lorg/thoughtcrime/securesms/conversation/ConversationIntents$Args;
 HSPLorg/thoughtcrime/securesms/conversation/ConversationIntents$Args;->getChatColors()Lorg/thoughtcrime/securesms/conversation/colors/ChatColors;
@@ -21053,8 +21088,7 @@ HSPLorg/thoughtcrime/securesms/conversation/ConversationIntents;->createParentFr
 HSPLorg/thoughtcrime/securesms/conversation/ConversationIntents;->getIntentData(Landroid/os/Bundle;)Landroid/net/Uri;
 HSPLorg/thoughtcrime/securesms/conversation/ConversationIntents;->getIntentType(Landroid/os/Bundle;)Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/conversation/ConversationIntents;->isBubbleIntentUri(Landroid/net/Uri;)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$$ExternalSyntheticLambda4;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$$ExternalSyntheticLambda7;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
+HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$$ExternalSyntheticLambda14;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$1;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$AttachmentDownloadClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$AttachmentDownloadClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;Lorg/thoughtcrime/securesms/conversation/ConversationItem$AttachmentDownloadClickListener-IA;)V
@@ -21067,6 +21101,8 @@ HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$LinkPreviewClickLis
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$LinkPreviewClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;Lorg/thoughtcrime/securesms/conversation/ConversationItem$LinkPreviewClickListener-IA;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$PassthroughClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$PassthroughClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;Lorg/thoughtcrime/securesms/conversation/ConversationItem$PassthroughClickListener-IA;)V
+HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$PaymentTombstoneClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;)V
+HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$PaymentTombstoneClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;Lorg/thoughtcrime/securesms/conversation/ConversationItem$PaymentTombstoneClickListener-IA;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$PlayVideoClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$PlayVideoClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;Lorg/thoughtcrime/securesms/conversation/ConversationItem$PlayVideoClickListener-IA;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$QuotedIndicatorClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;)V
@@ -21079,8 +21115,6 @@ HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$SharedContactEventL
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$SharedContactEventListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;Lorg/thoughtcrime/securesms/conversation/ConversationItem$SharedContactEventListener-IA;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$SlideClickPassthroughListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$SlideClickPassthroughListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/conversation/ConversationItem$SlideClickPassthroughListener-IA;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$ThumbnailClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$ThumbnailClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;Lorg/thoughtcrime/securesms/conversation/ConversationItem$ThumbnailClickListener-IA;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$TouchDelegateChangedListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$TouchDelegateChangedListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;Lorg/thoughtcrime/securesms/conversation/ConversationItem$TouchDelegateChangedListener-IA;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$UrlClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;)V
@@ -21089,112 +21123,25 @@ HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$ViewOnceMessageClic
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem$ViewOnceMessageClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;Lorg/thoughtcrime/securesms/conversation/ConversationItem$ViewOnceMessageClickListener-IA;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->bind(Landroidx/lifecycle/LifecycleOwner;Lorg/thoughtcrime/securesms/conversation/ConversationMessage;Lj$/util/Optional;Lj$/util/Optional;Lcom/bumptech/glide/RequestManager;Ljava/util/Locale;Ljava/util/Set;Lorg/thoughtcrime/securesms/recipients/Recipient;Ljava/lang/String;ZZZZLorg/thoughtcrime/securesms/conversation/colors/Colorizer;Lorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->canPlayContent()Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->forceFooter(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->getActiveFooter(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Lorg/thoughtcrime/securesms/components/ConversationItemFooter;
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->getBodyBubbleCorners(IIII)Lorg/thoughtcrime/securesms/util/Projection$Corners;
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->getColorizerProjections(Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/util/ProjectionList;
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->getConversationMessage()Lorg/thoughtcrime/securesms/conversation/ConversationMessage;
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->getDefaultBubbleColor(Z)I
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->getDefaultTopMarginForRecord(Lorg/thoughtcrime/securesms/database/model/MessageRecord;II)I
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->getGiftId()J
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->getOpenableGiftProjection(Z)Lorg/thoughtcrime/securesms/util/Projection;
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->getRoot()Landroid/view/ViewGroup;
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->getSnapshotProjections(Landroid/view/ViewGroup;ZZ)Lorg/thoughtcrime/securesms/util/ProjectionList;
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->hasAudio(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->hasDocument(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->hasExtraText(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->hasLinkPreview(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->hasNoBubble(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->hasOnlyThumbnail(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->hasQuote(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->hasSharedContact(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->hasSticker(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->hasThumbnail(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->initializeAttributes()V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->isBorderless(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->isCaptionlessMms(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->isCondensedMode()Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->isContentCondensed()Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->isEndOfMessageCluster(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Z)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->isFooterVisible(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Z)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->isGiftMessage(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->isSingularMessage(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Lj$/util/Optional;Z)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->isStartOfMessageCluster(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Z)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->isStoryReaction(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->isViewOnceMessage(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->isWithinClusteringTime(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->onFinishInflate()V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->onMeasure(II)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->readDimen(I)I
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->readDimen(Landroid/content/Context;I)I
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setAuthor(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Lj$/util/Optional;ZZ)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setBodyText(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Ljava/lang/String;Z)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setBubbleState(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lorg/thoughtcrime/securesms/recipients/Recipient;ZLorg/thoughtcrime/securesms/conversation/colors/Colorizer;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setContactPhoto(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setEventListener(Lorg/thoughtcrime/securesms/BindableConversationItem$EventListener;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setFooter(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Ljava/util/Locale;ZZ)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setGroupAuthorColor(Lorg/thoughtcrime/securesms/database/model/MessageRecord;ZLorg/thoughtcrime/securesms/conversation/colors/Colorizer;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setGroupMessageStatus(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setGutterSizes(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Z)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setHasBeenQuoted(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setHasBeenScheduled(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setInteractionState(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;Z)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setMediaAttributes(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Lj$/util/Optional;ZZZZ)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setMessageShape(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Lj$/util/Optional;Z)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setMessageSpacing(Landroid/content/Context;Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Lj$/util/Optional;Z)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setOutlinerRadii(Lorg/thoughtcrime/securesms/components/Outliner;IIII)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setParentScrolling(Z)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setQuote(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Lj$/util/Optional;Z)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setReactions(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setStatusIcons(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Z)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setStoryReactionLabel(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->setThumbnailCorners(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Lj$/util/Optional;Z)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->shouldDrawBodyBubbleOutline(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Z)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->shouldInterceptClicks(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->showProjectionArea()V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItem;->unbind()V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble$$ExternalSyntheticBackport0;->m(Ljava/lang/Object;)Z
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble$$ExternalSyntheticLambda2;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble;->getProjections()Ljava/util/Set;
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble;->init()V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble;->onDrawForeground(Landroid/graphics/Canvas;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble;->onSizeChanged(IIII)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble;->setBackground(Landroid/graphics/drawable/Drawable;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble;->setOnSizeChangedListener(Lorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble$OnSizeChangedListener;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble;->setOutliners(Ljava/util/List;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble;->setParentScrolling(Z)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble;->setQuoteViewProjection(Lorg/thoughtcrime/securesms/util/Projection;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble;->setVideoPlayerProjection(Lorg/thoughtcrime/securesms/util/Projection;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode$Detailed;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode$Detailed;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode$EditHistory;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode$EditHistory;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode$Standard;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode$Standard;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;-><init>(Z)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;-><init>(ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationMessage$ComputedProperties;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/computed/FormattedDate;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationMessage$ConversationMessageFactory;->createWithUnresolvedData(Landroid/content/Context;Lorg/thoughtcrime/securesms/database/model/MessageRecord;Ljava/lang/CharSequence;Ljava/util/List;ZLorg/thoughtcrime/securesms/recipients/Recipient;)Lorg/thoughtcrime/securesms/conversation/ConversationMessage;
 HSPLorg/thoughtcrime/securesms/conversation/ConversationMessage;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationMessage;-><init>(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Ljava/lang/CharSequence;Ljava/util/List;ZLorg/thoughtcrime/securesms/conversation/MessageStyler$Result;Lorg/thoughtcrime/securesms/recipients/Recipient;Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lorg/thoughtcrime/securesms/conversation/ConversationMessage$ComputedProperties;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationMessage;-><init>(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Ljava/lang/CharSequence;Ljava/util/List;ZLorg/thoughtcrime/securesms/conversation/MessageStyler$Result;Lorg/thoughtcrime/securesms/recipients/Recipient;Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lorg/thoughtcrime/securesms/conversation/ConversationMessage$ComputedProperties;Lorg/thoughtcrime/securesms/conversation/ConversationMessage-IA;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationMessage;->equals(Ljava/lang/Object;)Z
 HSPLorg/thoughtcrime/securesms/conversation/ConversationMessage;->getBottomButton()Lorg/thoughtcrime/securesms/database/model/databaseprotos/BodyRangeList$BodyRange$Button;
-HSPLorg/thoughtcrime/securesms/conversation/ConversationMessage;->getConversationTimestamp()J
-HSPLorg/thoughtcrime/securesms/conversation/ConversationMessage;->getDisplayBody(Landroid/content/Context;)Landroid/text/SpannableString;
 HSPLorg/thoughtcrime/securesms/conversation/ConversationMessage;->getFormattedDate(Landroid/content/Context;Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Lorg/thoughtcrime/securesms/conversation/v2/computed/FormattedDate;
 HSPLorg/thoughtcrime/securesms/conversation/ConversationMessage;->getMessageRecord()Lorg/thoughtcrime/securesms/database/model/MessageRecord;
-HSPLorg/thoughtcrime/securesms/conversation/ConversationMessage;->getMultiselectCollection()Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectCollection;
-HSPLorg/thoughtcrime/securesms/conversation/ConversationMessage;->getThreadRecipient()Lorg/thoughtcrime/securesms/recipients/Recipient;
 HSPLorg/thoughtcrime/securesms/conversation/ConversationMessage;->hasBeenQuoted()Z
-HSPLorg/thoughtcrime/securesms/conversation/ConversationMessage;->hasStyleLinks()Z
 HSPLorg/thoughtcrime/securesms/conversation/ConversationMessage;->hashCode()I
 HSPLorg/thoughtcrime/securesms/conversation/ConversationMessage;->isTextOnly(Landroid/content/Context;)Z
 HSPLorg/thoughtcrime/securesms/conversation/ConversationOptionsMenu$Provider;-><clinit>()V
@@ -21225,13 +21172,12 @@ HSPLorg/thoughtcrime/securesms/conversation/ConversationTitleView;->onFinishInfl
 HSPLorg/thoughtcrime/securesms/conversation/ConversationTitleView;->setIndividualRecipientTitle(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationTitleView;->setOnStoryRingClickListener(Landroid/view/View$OnClickListener;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationTitleView;->setRecipientTitle(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationTitleView;->setStoryRingFromState(Lorg/thoughtcrime/securesms/database/model/StoryViewState;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationTitleView;->setTitle(Lcom/bumptech/glide/RequestManager;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationTitleView;->updateSubtitleVisibility()V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationTitleView;->updateVerifiedSubtitleVisibility()V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem;)V
-HSPLorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$GroupDataManager$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$GroupDataManager;)V
+HSPLorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$$ExternalSyntheticLambda20;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem;)V
+HSPLorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$$ExternalSyntheticLambda21;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem;)V
+HSPLorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$GroupDataManager$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$GroupDataManager;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$GroupDataManager;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$InternalClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem;Landroid/view/View$OnClickListener;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$PresentOnChange;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem;)V
@@ -21243,15 +21189,9 @@ HSPLorg/thoughtcrime/securesms/conversation/ConversationUpdateItem;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationUpdateItem;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationUpdateItem;->onFinishInflate()V
 HSPLorg/thoughtcrime/securesms/conversation/ConversationUpdateItem;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-HSPLorg/thoughtcrime/securesms/conversation/MarkReadHelper$$ExternalSyntheticLambda0;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/MarkReadHelper$$ExternalSyntheticLambda1;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/MarkReadHelper$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/conversation/MarkReadHelper;J)V
 HSPLorg/thoughtcrime/securesms/conversation/MarkReadHelper;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/MarkReadHelper;-><init>(Lorg/thoughtcrime/securesms/notifications/v2/ConversationId;Landroid/content/Context;Landroidx/lifecycle/LifecycleOwner;)V
-HSPLorg/thoughtcrime/securesms/conversation/MarkReadHelper;->getLatestTimestamp(Lorg/thoughtcrime/securesms/conversation/ConversationAdapterBridge;Landroidx/recyclerview/widget/LinearLayoutManager;)Lj$/util/Optional;
 HSPLorg/thoughtcrime/securesms/conversation/MarkReadHelper;->ignoreViewReveals()V
-HSPLorg/thoughtcrime/securesms/conversation/MarkReadHelper;->onViewsRevealed(J)V
-HSPLorg/thoughtcrime/securesms/conversation/MarkReadHelper;->stopIgnoringViewReveals(Ljava/lang/Long;)V
 HSPLorg/thoughtcrime/securesms/conversation/MessageSendType$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/MessageSendType$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/conversation/MessageSendType$SignalMessageSendType$Creator;-><init>()V
@@ -21264,7 +21204,6 @@ HSPLorg/thoughtcrime/securesms/conversation/MessageSendType;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/MessageSendType;-><init>(IIIIILorg/thoughtcrime/securesms/conversation/MessageSendType$TransportType;Lorg/thoughtcrime/securesms/util/CharacterCalculator;)V
 HSPLorg/thoughtcrime/securesms/conversation/MessageSendType;-><init>(IIIIILorg/thoughtcrime/securesms/conversation/MessageSendType$TransportType;Lorg/thoughtcrime/securesms/util/CharacterCalculator;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/conversation/MessageSendType;->getButtonDrawableRes()I
-HSPLorg/thoughtcrime/securesms/conversation/MessageSendType;->getComposeHintRes()I
 HSPLorg/thoughtcrime/securesms/conversation/MessageSendType;->getTitleRes()I
 HSPLorg/thoughtcrime/securesms/conversation/MessageStyler$Result$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/MessageStyler$Result$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -21275,14 +21214,13 @@ HSPLorg/thoughtcrime/securesms/conversation/MessageStyler$Result;-><init>(ZLorg/
 HSPLorg/thoughtcrime/securesms/conversation/MessageStyler$Result;-><init>(ZLorg/thoughtcrime/securesms/database/model/databaseprotos/BodyRangeList$BodyRange$Button;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/conversation/MessageStyler$Result;->access$getNO_STYLE$cp()Lorg/thoughtcrime/securesms/conversation/MessageStyler$Result;
 HSPLorg/thoughtcrime/securesms/conversation/MessageStyler$Result;->getBottomButton()Lorg/thoughtcrime/securesms/database/model/databaseprotos/BodyRangeList$BodyRange$Button;
-HSPLorg/thoughtcrime/securesms/conversation/MessageStyler$Result;->getHasStyleLinks()Z
 HSPLorg/thoughtcrime/securesms/conversation/MessageStyler$Result;->none()Lorg/thoughtcrime/securesms/conversation/MessageStyler$Result;
 HSPLorg/thoughtcrime/securesms/conversation/MessageStyler;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/MessageStyler;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/MessageStyler;->style$default(Ljava/lang/Object;Lorg/thoughtcrime/securesms/database/model/databaseprotos/BodyRangeList;Landroid/text/Spannable;ZILjava/lang/Object;)Lorg/thoughtcrime/securesms/conversation/MessageStyler$Result;
 HSPLorg/thoughtcrime/securesms/conversation/MessageStyler;->style(Ljava/lang/Object;Lorg/thoughtcrime/securesms/database/model/databaseprotos/BodyRangeList;Landroid/text/Spannable;)Lorg/thoughtcrime/securesms/conversation/MessageStyler$Result;
 HSPLorg/thoughtcrime/securesms/conversation/MessageStyler;->style(Ljava/lang/Object;Lorg/thoughtcrime/securesms/database/model/databaseprotos/BodyRangeList;Landroid/text/Spannable;Z)Lorg/thoughtcrime/securesms/conversation/MessageStyler$Result;
-HSPLorg/thoughtcrime/securesms/conversation/ReenableScheduledMessagesDialogFragment$Companion$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/AlarmManager;)Z
+HSPLorg/thoughtcrime/securesms/conversation/ReenableScheduledMessagesDialogFragment$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/AlarmManager;)Z
 HSPLorg/thoughtcrime/securesms/conversation/ScheduledMessagesRepository;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/ScheduledMessagesRepository;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/VoiceNoteDraftView$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/conversation/VoiceNoteDraftView;)V
@@ -21332,8 +21270,6 @@ HSPLorg/thoughtcrime/securesms/conversation/colors/ChatColors$Id$BuiltIn;-><init
 HSPLorg/thoughtcrime/securesms/conversation/colors/ChatColors$Id$Companion$CREATOR$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/colors/ChatColors$Id$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/colors/ChatColors$Id$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/conversation/colors/ChatColors$Id$NotSet;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/colors/ChatColors$Id$NotSet;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/colors/ChatColors$Id;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/colors/ChatColors$Id;-><init>(J)V
 HSPLorg/thoughtcrime/securesms/conversation/colors/ChatColors$Id;-><init>(JLkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -21354,38 +21290,23 @@ HSPLorg/thoughtcrime/securesms/conversation/colors/ChatColorsPalette$Bubbles;->g
 HSPLorg/thoughtcrime/securesms/conversation/colors/Colorizer$onGroupMembershipChanged$$inlined$sortedBy$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/colors/Colorizer;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/colors/Colorizer;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/colors/Colorizer;->getDefaultColor(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/Recipient;)I
-HSPLorg/thoughtcrime/securesms/conversation/colors/Colorizer;->getIncomingBodyTextColor(Landroid/content/Context;Z)I
-HSPLorg/thoughtcrime/securesms/conversation/colors/Colorizer;->getIncomingFooterIconColor(Landroid/content/Context;Z)I
-HSPLorg/thoughtcrime/securesms/conversation/colors/Colorizer;->getIncomingFooterTextColor(Landroid/content/Context;Z)I
-HSPLorg/thoughtcrime/securesms/conversation/colors/Colorizer;->getIncomingGroupSenderColor(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/Recipient;)I
 HSPLorg/thoughtcrime/securesms/conversation/colors/Colorizer;->onGroupMembershipChanged(Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer$edgeEffectFactory$1;-><init>(Lorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;)V
 HSPLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer$itemDecoration$1;-><init>(Lorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;)V
 HSPLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer$itemDecoration$1;->drawShaderMask(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;Lorg/thoughtcrime/securesms/conversation/colors/ChatColors;)V
-HSPLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer$itemDecoration$1;->getItemOffsets(Landroid/graphics/Rect;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
 HSPLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer$itemDecoration$1;->onDraw(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
 HSPLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer$scrollListener$1;-><init>(Lorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;)V
-HSPLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer$scrollListener$1;->onScrolled(Landroidx/recyclerview/widget/RecyclerView;II)V
 HSPLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 HSPLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;->access$getChatColors$p(Lorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;)Lorg/thoughtcrime/securesms/conversation/colors/ChatColors;
-HSPLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;->access$getLayerXfermode$p(Lorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;)Landroid/graphics/PorterDuffXfermode;
-HSPLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;->access$getLayoutManager(Lorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;)Landroidx/recyclerview/widget/LinearLayoutManager;
 HSPLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;->access$getNoLayerXfermode$p(Lorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;)Landroid/graphics/PorterDuffXfermode;
 HSPLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;->access$getUseLayer$p(Lorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;)Z
-HSPLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;->access$setUseLayer$p(Lorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;Z)V
-HSPLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;->getLayoutManager()Landroidx/recyclerview/widget/LinearLayoutManager;
 HSPLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;->setChatColors(Lorg/thoughtcrime/securesms/conversation/colors/ChatColors;)V
-HSPLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator$$ExternalSyntheticLambda1;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator;-><init>(Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)V
-HSPLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator;->animateAppearance(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)Z
-HSPLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator;->animateSlide(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)Z
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator;->isRunning()Z
-HSPLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator;->onAnimationFinished(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/Multiselect;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/Multiselect;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/Multiselect;->getMmsParts(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;Lorg/thoughtcrime/securesms/database/model/MmsMessageRecord;)Ljava/util/Set;
@@ -21395,26 +21316,16 @@ HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectCollection$Com
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectCollection$Companion;->fromSet(Ljava/util/Set;)Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectCollection;
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectCollection$Single;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectCollection$Single;-><init>(Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectPart;)V
-HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectCollection$Single;->toSet()Ljava/util/Set;
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectCollection;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectCollection;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectCollection;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration$Difference;->$values()[Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration$Difference;
-HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration$Difference;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration$Difference;-><init>(Ljava/lang/String;I)V
-HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration$Difference;->values()[Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration$Difference;
-HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration$WhenMappings;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;-><init>(Landroid/content/Context;Lkotlin/jvm/functions/Function0;)V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->cleanPulseAnimators()V
-HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->consumePulseRequest(Lorg/thoughtcrime/securesms/conversation/ConversationAdapterBridge;)V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->drawFocusShadeOverIfNecessary(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;)V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->drawFocusShadeUnderIfNecessary(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;)V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->drawPulseShadeOverIfNecessary(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;)V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->findAdapterBridge(Landroidx/recyclerview/widget/RecyclerView;)Lorg/thoughtcrime/securesms/conversation/ConversationAdapterBridge;
-HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->getCurrentSelection(Landroidx/recyclerview/widget/RecyclerView;)Ljava/util/Set;
-HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->getDifferenceForPart(Ljava/util/Set;Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectPart;)Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration$Difference;
-HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->getItemOffsets(Landroid/graphics/Rect;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->hasRunningPulseRequestAnimators()Z
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->invalidateIfEnterExitAnimatorsAreRunning(Landroidx/recyclerview/widget/RecyclerView;)V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->invalidateIfPulseRequestAnimatorsAreRunning(Landroidx/recyclerview/widget/RecyclerView;)V
@@ -21423,16 +21334,11 @@ HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->onDrawOver(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->onResume(Landroidx/lifecycle/LifecycleOwner;)V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->onStart(Landroidx/lifecycle/LifecycleOwner;)V
-HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->resolveMultiselectable(Landroidx/recyclerview/widget/RecyclerView;Landroid/view/View;)Lorg/thoughtcrime/securesms/conversation/mutiselect/Multiselectable;
-HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->updateChildOffsets(Landroidx/recyclerview/widget/RecyclerView;Landroid/view/View;)V
-HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->updateMultiselectPartAnimator(Ljava/util/Set;Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectPart;)V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectPart$Attachments;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectPart$Attachments;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;)V
-HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectPart$Attachments;->getConversationMessage()Lorg/thoughtcrime/securesms/conversation/ConversationMessage;
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectPart$Attachments;->hashCode()I
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectPart$Text;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectPart$Text;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;)V
-HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectPart$Text;->getConversationMessage()Lorg/thoughtcrime/securesms/conversation/ConversationMessage;
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectPart$Text;->hashCode()I
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectPart;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectPart;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;)V
@@ -21462,7 +21368,6 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/BubbleLayoutTransitionListener;->
 HSPLorg/thoughtcrime/securesms/conversation/v2/BubbleLayoutTransitionListener;->onResume(Landroidx/lifecycle/LifecycleOwner;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/BubbleLayoutTransitionListener;->onStart(Landroidx/lifecycle/LifecycleOwner;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity$$ExternalSyntheticLambda0;->run()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity$special$$inlined$viewModels$default$1;-><init>(Landroidx/activity/ComponentActivity;)V
@@ -21472,14 +21377,20 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity$special$$inl
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity$special$$inlined$viewModels$default$5;-><init>(Landroidx/activity/ComponentActivity;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity$special$$inlined$viewModels$default$6;-><init>(Lkotlin/jvm/functions/Function0;Landroidx/activity/ComponentActivity;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity$stripeRepository$2;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;->$r8$lambda$rJaCnn2xrQlJTPwnM83GXFMdMzE(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;->onCreate$lambda$0(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;->onCreate(Landroid/os/Bundle;Z)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;->onPreCreate()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;->onResume()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;->replaceFragment()V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$$ExternalSyntheticLambda10;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$$ExternalSyntheticLambda11;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$$ExternalSyntheticLambda12;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$$ExternalSyntheticLambda5;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$$ExternalSyntheticLambda6;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$$ExternalSyntheticLambda7;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$$ExternalSyntheticLambda8;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$$ExternalSyntheticLambda9;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$ContactShareEditor;-><clinit>()V
@@ -21498,75 +21409,21 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContrac
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$SelectFile;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$SelectLocation;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$SelectLocation;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$cameraLauncher$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$contactShareLauncher$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$gifSearchLauncher$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$mediaGalleryLauncher$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$mediaSelectionLauncher$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$selectContactLauncher$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$selectFileLauncher$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$selectLocationLauncher$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts;-><init>(Landroidx/fragment/app/Fragment;Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$Callbacks;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$$ExternalSyntheticLambda5;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$$ExternalSyntheticLambda5;->createViewHolder(Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$$ExternalSyntheticLambda6;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$$ExternalSyntheticLambda7;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$$ExternalSyntheticLambda7;->createViewHolder(Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder$gestureDetector$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Landroid/view/View;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;->bindPayloadsIfAvailable()Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;->canPlayContent()Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;->getBindable()Lorg/thoughtcrime/securesms/BindableConversationItem;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;->getColorizerProjections(Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/util/ProjectionList;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;->getDisplayMode()Lorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;->getNextMessage()Lj$/util/Optional;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;->getPreviousMessage()Lj$/util/Optional;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;->showProjectionArea()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$IncomingMediaViewHolder;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Landroid/view/View;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$IncomingMediaViewHolder;->bind(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$IncomingMediaViewHolder;->bind(Lorg/thoughtcrime/securesms/conversation/v2/data/IncomingMedia;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$OnScrollStateChangedListener;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ThreadHeaderViewHolder$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ThreadHeaderViewHolder;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Landroid/view/View;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ThreadHeaderViewHolder;->bind(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ThreadHeaderViewHolder;->bind(Lorg/thoughtcrime/securesms/conversation/v2/data/ThreadHeader;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->$r8$lambda$0GW66dll143qhTHiVUdlBHolclI(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->$r8$lambda$u2AJxgyeBquqI1nF9ok3s6g0b5Q(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;-><init>(Landroidx/lifecycle/LifecycleOwner;Lcom/bumptech/glide/RequestManager;Lorg/thoughtcrime/securesms/conversation/ConversationAdapter$ItemClickListener;ZLorg/thoughtcrime/securesms/conversation/colors/Colorizer;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->_init_$lambda$4(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->_init_$lambda$6(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->access$getColorizer$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;)Lorg/thoughtcrime/securesms/conversation/colors/Colorizer;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->access$getCondensedMode$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;)Lorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->access$getHasWallpaper$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;)Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->access$getInlineContent$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;)Lorg/thoughtcrime/securesms/conversation/ConversationMessage;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->access$getLifecycleOwner$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;)Landroidx/lifecycle/LifecycleOwner;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->access$get_selected$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;)Ljava/util/HashSet;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->consumePulseRequest()Lorg/thoughtcrime/securesms/conversation/ConversationAdapterBridge$PulseRequest;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->getChatColorsData()Lorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsData;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->getClickListener()Lorg/thoughtcrime/securesms/conversation/ConversationAdapter$ItemClickListener;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->getColorizer()Lorg/thoughtcrime/securesms/conversation/colors/Colorizer;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->getConversationMessage(I)Lorg/thoughtcrime/securesms/conversation/ConversationMessage;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->getDisplayMode()Lorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->getNextMessage(I)Lorg/thoughtcrime/securesms/database/model/MessageRecord;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->getPreviousMessage(I)Lorg/thoughtcrime/securesms/database/model/MessageRecord;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->getRequestManager()Lcom/bumptech/glide/RequestManager;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->getSearchQuery()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->getSelectedItems()Ljava/util/Set;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->hasNoConversationMessages()Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->hasWallpaper()Z
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->isMessageRequestAccepted()Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->isParentInScroll()Z
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->onAttachedToRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->onHasWallpaperChanged(Z)Z
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->setMessageRequestAccepted(Z)V
@@ -21579,13 +21436,14 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationBannerView;-><clinit>
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationBannerView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationBannerView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationBannerView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda11;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda12;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda12;->onLayoutChange(Landroid/view/View;IIIIIIII)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda13;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda13;->onLayoutChange(Landroid/view/View;IIIIIIII)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda27;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda15;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda15;->onLayoutChange(Landroid/view/View;IIIIIIII)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda16;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda16;->onLayoutChange(Landroid/view/View;IIIIIIII)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda26;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda8;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ActionModeCallback;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ActivityResultCallbacks;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$AttachmentManagerListener;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
@@ -21596,19 +21454,8 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$Conversation
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ConversationOptionsMenuCallback;->getSnapshot()Lorg/thoughtcrime/securesms/conversation/ConversationOptionsMenu$Snapshot;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$InputPanelMediaListener;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollDateHeaderHelper;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollDateHeaderHelper;->bind(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener$$ExternalSyntheticLambda0;-><init>(Lkotlin/jvm/functions/Function1;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener$onScrolled$1;-><init>(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener$onScrolled$1;->invoke(J)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener$onScrolled$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener;->$r8$lambda$SqiWUifYWEV36mNfvnPsrkHWoAw(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener;->onScrolled$lambda$0(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener;->onScrolled(Landroidx/recyclerview/widget/RecyclerView;II)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener;->presentComposeDivider()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ThreadHeaderMarginDecoration;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ThreadHeaderMarginDecoration;->getItemOffsets(Landroid/graphics/Rect;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ThreadHeaderMarginDecoration;->setToolbarMargin(I)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ToolbarDependentMarginListener;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Landroidx/appcompat/widget/Toolbar;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ToolbarDependentMarginListener;->onGlobalLayout()V
@@ -21633,21 +21480,14 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$groupCallVie
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$groupCallViewModel$2;->invoke()Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$1;-><init>(Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$2;-><init>(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$2;->get()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$3;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$4;-><init>(Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$5;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$6;-><init>(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$6;->invoke()Ljava/lang/Boolean;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$6;->invoke()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$7;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$7;->invoke()Ljava/lang/Boolean;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$7;->invoke()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$8;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$9;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$9;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$9;->invoke(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Ljava/lang/Boolean;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$9;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$inlineQueryController$2;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$jumpAndPulseScrollStrategy$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$linkPreviewViewModel$2;-><clinit>()V
@@ -21657,29 +21497,13 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$messageReque
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$messageRequestRepository$2;->invoke()Lorg/thoughtcrime/securesms/messagerequests/MessageRequestRepository;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$messageRequestViewModel$2;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$motionEventRelay$2;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$moveToStartPosition$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$moveToStartPosition$1;->invoke()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$moveToStartPosition$1;->invoke()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$1;->accept(Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$1;->accept(Lorg/thoughtcrime/securesms/conversation/v2/ConversationThreadState;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$2;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$2;->accept(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$2;->accept(Lorg/thoughtcrime/securesms/conversation/v2/ConversationThreadState;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$3;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$3;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$3;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$3;->apply(Lorg/thoughtcrime/securesms/conversation/v2/ConversationThreadState;)Lio/reactivex/rxjava3/core/ObservableSource;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Ljava/util/List;Lkotlin/jvm/internal/Ref$BooleanRef;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4$$ExternalSyntheticLambda0;->run()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4$invoke$lambda$1$$inlined$doAfterNextLayout$1$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4$invoke$lambda$1$$inlined$doAfterNextLayout$1;-><init>(Landroid/view/View;Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4$invoke$lambda$1$$inlined$doAfterNextLayout$1;->onLayoutChange(Landroid/view/View;IIIIIIII)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4;->$r8$lambda$oOR6vln5-HH0T67uKvvWOaEanvw(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Ljava/util/List;Lkotlin/jvm/internal/Ref$BooleanRef;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4;-><init>(Lkotlin/jvm/internal/Ref$BooleanRef;Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4;->invoke$lambda$1(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Ljava/util/List;Lkotlin/jvm/internal/Ref$BooleanRef;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4;->invoke(Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$onViewCreated$$inlined$createActivityViewModel$1;-><init>(Lkotlin/jvm/functions/Function0;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$onViewCreated$$inlined$createActivityViewModel$1;->invoke()Landroidx/lifecycle/ViewModel;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$onViewCreated$$inlined$createActivityViewModel$1;->invoke()Ljava/lang/Object;
@@ -21687,18 +21511,12 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$onViewCreate
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$onViewCreated$1;->invoke()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$onViewCreated$1;->invoke()Lorg/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryViewModelV2;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$onViewCreated$2;-><init>(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$onViewCreated$2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$onViewCreated$2;->invoke(Lorg/thoughtcrime/securesms/conversation/v2/InputReadyState;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$onViewCreated$conversationToolbarOnScrollHelper$1;-><init>(Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$onViewCreated$conversationToolbarOnScrollHelper$1;->get()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$presentStoryRing$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$presentStoryRing$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$presentStoryRing$1;->invoke(Lorg/thoughtcrime/securesms/database/model/StoryViewState;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$reactionDelegate$2;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$recentEmojis$2;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$recentEmojis$2;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$registerForResults$1;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$registerForResults$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$scheduledMessagesStub$2;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$searchViewModel$2;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$special$$inlined$activityViewModels$default$1;-><init>(Landroidx/fragment/app/Fragment;)V
@@ -21735,32 +21553,22 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$viewModel$2;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$viewModel$2;->invoke()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$viewModel$2;->invoke()Lorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$voiceNotePlayerListener$2;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->$r8$lambda$YDQLzyHN5FWBrQEkaTYrdZ0__OI(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Landroid/view/View;IIIIIIII)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->$r8$lambda$kJPihjGezsCMgRuLFcLcDD6QOYE(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Landroid/view/View;IIIIIIII)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->$r8$lambda$JQZ6-Uv_KCmA8HJEVGHCN-LWlII(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Landroid/view/View;IIIIIIII)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->$r8$lambda$dliyXDVt1Fi2LVRCB0MkbgvAuFc(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Landroid/view/View;IIIIIIII)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getAdapter$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getAnimationsAllowed$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Z
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getArgs(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/conversation/ConversationIntents$Args;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getBinding(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/databinding/V2ConversationFragmentBinding;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getColorizer$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/conversation/colors/Colorizer;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getConversationItemDecorations$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getConversationRecipientRepository(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getGroupCallViewModel(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getLayoutManager$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Landroidx/recyclerview/widget/ConversationLayoutManager;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getMarkReadHelper$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/conversation/MarkReadHelper;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getMessageRequestRepository(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/messagerequests/MessageRequestRepository;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getScrollToPositionDelegate$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/components/ScrollToPositionDelegate;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getThreadHeaderMarginDecoration$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ThreadHeaderMarginDecoration;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getViewModel(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$isScrolledToBottom(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$moveToStartPosition(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Lorg/thoughtcrime/securesms/conversation/ConversationData;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$presentInputReadyState(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Lorg/thoughtcrime/securesms/conversation/v2/InputReadyState;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$setAnimationsAllowed$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Z)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$updateMessageRequestAcceptedState(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Z)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->getArgs()Lorg/thoughtcrime/securesms/conversation/ConversationIntents$Args;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->getBinding()Lorg/thoughtcrime/securesms/databinding/V2ConversationFragmentBinding;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->getComposeText()Lorg/thoughtcrime/securesms/components/ComposeText;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->getContainer()Lorg/thoughtcrime/securesms/components/InputAwareConstraintLayout;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->getConversationGroupViewModel()Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->getConversationRecipientRepository()Lorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository;
@@ -21773,8 +21581,6 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->initialize
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->initializeGiphyMp4()Lorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionRecycler;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->initializeMediaKeyboard()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->invalidateOptionsMenu()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->isScrolledToBottom()Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->moveToStartPosition(Lorg/thoughtcrime/securesms/conversation/ConversationData;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->observeConversationThread()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->onCreate(Landroid/os/Bundle;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->onResume()V
@@ -21785,17 +21591,11 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->onViewStat
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->presentActionBarMenu()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->presentChatColors(Lorg/thoughtcrime/securesms/conversation/colors/ChatColors;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->presentConversationTitle(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->presentInputReadyState(Lorg/thoughtcrime/securesms/conversation/v2/InputReadyState;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->presentNavigationIconForNormal()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->presentStoryRing()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->presentWallpaper(Lorg/thoughtcrime/securesms/wallpaper/ChatWallpaper;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->registerForResults()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->updateMessageRequestAcceptedState(Z)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$DateHeaderViewHolder;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;Landroid/view/View;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$DateHeaderViewHolder;->bind(Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationMessageElement;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$DateHeaderViewHolder;->getHeight()I
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$DateHeaderViewHolder;->getItemView()Landroid/view/View;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$DateHeaderViewHolder;->updateForWallpaper()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$UnreadState$None;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$UnreadState$None;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$UnreadState;-><clinit>()V
@@ -21804,33 +21604,23 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$Unrea
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;-><init>(ZZ)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;-><init>(ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->access$timestamp(Lorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationMessageElement;)J
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->getHasWallpaper()Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->getHeader(Landroidx/recyclerview/widget/RecyclerView;Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationMessageElement;)Lorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$DateHeaderViewHolder;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->getItemOffsets(Landroid/graphics/Rect;Landroid/view/View;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->hasHeader(I)Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->isFirstUnread(I)Z
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->onDrawOver(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->setCurrentItems(Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->setFirstUnreadCount(I)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->setHasWallpaper(Z)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->timestamp(Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationMessageElement;)J
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->toEpochDay(Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationMessageElement;)J
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->updateUnreadState(Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$conversationRecipient$2$$ExternalSyntheticLambda0;-><init>(J)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$conversationRecipient$2$$ExternalSyntheticLambda0;->call()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$conversationRecipient$2$1;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$conversationRecipient$2$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$conversationRecipient$2$1;->apply(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$conversationRecipient$2$1;->apply(Lorg/thoughtcrime/securesms/recipients/RecipientId;)Lio/reactivex/rxjava3/core/ObservableSource;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$conversationRecipient$2;->$r8$lambda$C1ukP4YSsuxMkwIfGNrqsHmBxh0(J)Lorg/thoughtcrime/securesms/recipients/RecipientId;
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$conversationRecipient$2;->$r8$lambda$cO81i1XjpOGbTL1Bc1REtOTGdQw(J)Lorg/thoughtcrime/securesms/recipients/RecipientId;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$conversationRecipient$2;-><init>(J)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$conversationRecipient$2;->invoke$lambda$0(J)Lorg/thoughtcrime/securesms/recipients/RecipientId;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$conversationRecipient$2;->invoke()Lio/reactivex/rxjava3/core/Observable;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$conversationRecipient$2;->invoke()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$groupRecord$2$1$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$groupRecord$2$1$$ExternalSyntheticLambda0;->call()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$groupRecord$2$1;->$r8$lambda$NvFETYLxPBjE2XjrolSGmoCr9vc(Lorg/thoughtcrime/securesms/recipients/Recipient;)Lj$/util/Optional;
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$groupRecord$2$1;->$r8$lambda$JuMsqhsXpq__gkB4gn6Rbh-r19w(Lorg/thoughtcrime/securesms/recipients/Recipient;)Lj$/util/Optional;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$groupRecord$2$1;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$groupRecord$2$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$groupRecord$2$1;->apply$lambda$0(Lorg/thoughtcrime/securesms/recipients/Recipient;)Lj$/util/Optional;
@@ -21843,10 +21633,10 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository;-
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository;-><init>(J)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository;->getConversationRecipient()Lio/reactivex/rxjava3/core/Observable;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository;->getGroupRecord()Lio/reactivex/rxjava3/core/Observable;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda12;-><init>(Lorg/thoughtcrime/securesms/database/model/GroupRecord;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda12;->call()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda8;-><init>(JLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;I)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda8;->call()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda19;-><init>(JLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;I)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda19;->call()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda5;-><init>(Lorg/thoughtcrime/securesms/database/model/GroupRecord;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda5;->call()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$MessageCounts;-><clinit>()V
@@ -21859,15 +21649,15 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$getMessage
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$getMessageCounts$2;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;J)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$getMessageCounts$2;->apply(I)Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$MessageCounts;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$getMessageCounts$2;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->$r8$lambda$98QfcuQyzMi7mf2qZrmWDK7X98k(Lorg/thoughtcrime/securesms/database/model/GroupRecord;Lorg/thoughtcrime/securesms/recipients/Recipient;)Lorg/thoughtcrime/securesms/conversation/v2/IdentityRecordsState;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->$r8$lambda$SEmY6z8BVO3vpDRoIUBmm8tqjes(JLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;I)Lorg/thoughtcrime/securesms/conversation/v2/ConversationThreadState;
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->$r8$lambda$VVmPvLFZN6qP36WixRbpmaQ0NrQ(JLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;I)Lorg/thoughtcrime/securesms/conversation/v2/ConversationThreadState;
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->$r8$lambda$xl7w6erbLwtfJCNGwRxU6hJOHbc(Lorg/thoughtcrime/securesms/database/model/GroupRecord;Lorg/thoughtcrime/securesms/recipients/Recipient;)Lorg/thoughtcrime/securesms/conversation/v2/IdentityRecordsState;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;-><init>(Landroid/content/Context;Z)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->access$getUnreadCount(Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;J)I
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->access$getUnreadMentionsCount(Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;J)I
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->getConversationThreadState$lambda$0(JLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;I)Lorg/thoughtcrime/securesms/conversation/v2/ConversationThreadState;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->getConversationThreadState(JI)Lio/reactivex/rxjava3/core/Single;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->getIdentityRecords$lambda$11(Lorg/thoughtcrime/securesms/database/model/GroupRecord;Lorg/thoughtcrime/securesms/recipients/Recipient;)Lorg/thoughtcrime/securesms/conversation/v2/IdentityRecordsState;
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->getIdentityRecords$lambda$13(Lorg/thoughtcrime/securesms/database/model/GroupRecord;Lorg/thoughtcrime/securesms/recipients/Recipient;)Lorg/thoughtcrime/securesms/conversation/v2/IdentityRecordsState;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->getIdentityRecords(Lorg/thoughtcrime/securesms/recipients/Recipient;Lorg/thoughtcrime/securesms/database/model/GroupRecord;)Lio/reactivex/rxjava3/core/Single;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->getMessageCounts(J)Lio/reactivex/rxjava3/core/Flowable;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->getUnreadCount(J)I
@@ -21944,7 +21734,7 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$4$$External
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$4$$ExternalSyntheticLambda2;-><init>(Lorg/signal/paging/PagingController;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$4$$ExternalSyntheticLambda3;-><init>(Lorg/signal/paging/PagingController;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$4$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$4;->$r8$lambda$-cDP_eKfgHXjbVxKWQM3akAxvQw(Lorg/thoughtcrime/securesms/conversation/v2/ConversationThreadState;Lorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;Lio/reactivex/rxjava3/core/ObservableEmitter;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$4;->$r8$lambda$4LpNGsLr00oReURpU7UzU7Emg30(Lorg/thoughtcrime/securesms/conversation/v2/ConversationThreadState;Lorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;Lio/reactivex/rxjava3/core/ObservableEmitter;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$4;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$4;->apply$lambda$4(Lorg/thoughtcrime/securesms/conversation/v2/ConversationThreadState;Lorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;Lio/reactivex/rxjava3/core/ObservableEmitter;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$4;->apply(Ljava/lang/Object;)Ljava/lang/Object;
@@ -21958,8 +21748,6 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$6;-><init>(
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$6;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$6;->invoke(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$7;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$7;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$7;->invoke(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$8;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$8;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$8;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -21981,9 +21769,6 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$groupMember
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$groupMemberServiceIds$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$groupMemberServiceIds$2;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$groupMemberServiceIds$2;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$setShowScrollButtonsForScrollPosition$1;-><init>(ZZ)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$setShowScrollButtonsForScrollPosition$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$setShowScrollButtonsForScrollPosition$1;->invoke(Lorg/thoughtcrime/securesms/conversation/v2/ConversationScrollButtonState;)Lorg/thoughtcrime/securesms/conversation/v2/ConversationScrollButtonState;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$storyRingState$1;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$storyRingState$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$storyRingState$1;->apply(Ljava/lang/Object;)Ljava/lang/Object;
@@ -21996,7 +21781,6 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->access$ge
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->access$get_conversationThreadState$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;)Lio/reactivex/rxjava3/subjects/Subject;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->access$setRecipientSnapshot$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->canShowAsBubble(Landroid/content/Context;)Lio/reactivex/rxjava3/core/Observable;
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->getChatColorsSnapshot()Lorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsData;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->getConversationThreadState()Lio/reactivex/rxjava3/core/Single;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->getInputReadyState()Lio/reactivex/rxjava3/core/Observable;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->getMessageRequestState()Lorg/thoughtcrime/securesms/messagerequests/MessageRequestState;
@@ -22007,31 +21791,21 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->getThread
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->getWallpaperSnapshot()Lorg/thoughtcrime/securesms/wallpaper/ChatWallpaper;
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->isPushAvailable()Z
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->onChatBoundsChanged(Landroid/graphics/Rect;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->setShowScrollButtonsForScrollPosition(ZZ)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->updateIdentityRecordsInBackground()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/DisabledInputView$inflater$2;-><init>(Landroid/content/Context;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/DisabledInputView;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/DisabledInputView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/DisabledInputView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/DisabledInputView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/DisabledInputView;->clear()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/DisabledInputView;->setWallpaperEnabled(Z)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/IdentityRecordsState;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/IdentityRecordsState;-><init>(Lorg/thoughtcrime/securesms/recipients/Recipient;Lorg/thoughtcrime/securesms/database/model/GroupRecord;ZLorg/thoughtcrime/securesms/database/identity/IdentityRecordList;Z)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/IdentityRecordsState;-><init>(Lorg/thoughtcrime/securesms/recipients/Recipient;Lorg/thoughtcrime/securesms/database/model/GroupRecord;ZLorg/thoughtcrime/securesms/database/identity/IdentityRecordList;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/InputReadyState;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/InputReadyState;-><init>(Lorg/thoughtcrime/securesms/recipients/Recipient;Lorg/thoughtcrime/securesms/messagerequests/MessageRequestState;Lorg/thoughtcrime/securesms/database/model/GroupRecord;ZZZ)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/InputReadyState;->getConversationRecipient()Lorg/thoughtcrime/securesms/recipients/Recipient;
 HSPLorg/thoughtcrime/securesms/conversation/v2/InputReadyState;->getMessageRequestState()Lorg/thoughtcrime/securesms/messagerequests/MessageRequestState;
-HSPLorg/thoughtcrime/securesms/conversation/v2/InputReadyState;->isActiveGroup()Ljava/lang/Boolean;
-HSPLorg/thoughtcrime/securesms/conversation/v2/InputReadyState;->isAnnouncementGroup()Ljava/lang/Boolean;
-HSPLorg/thoughtcrime/securesms/conversation/v2/InputReadyState;->isClientExpired()Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/InputReadyState;->isRequestingMember()Ljava/lang/Boolean;
-HSPLorg/thoughtcrime/securesms/conversation/v2/InputReadyState;->isUnauthorized()Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/InputReadyState;->shouldShowInviteToSignal()Z
 HSPLorg/thoughtcrime/securesms/conversation/v2/computed/FormattedDate;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/computed/FormattedDate;-><init>(ZZLjava/lang/String;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/computed/FormattedDate;->getValue()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource$threadRecipient$2;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource;)V
@@ -22046,15 +21820,9 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource;->get
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource;->getSizeInternal()I
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource;->getThreadRecipient()Lorg/thoughtcrime/securesms/recipients/Recipient;
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource;->load(IIILorg/signal/paging/PagedDataSource$CancellationSignal;)Ljava/util/List;
-HSPLorg/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource;->load(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource;->load(Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationElementKey;)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingModel;
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource;->loadThreadHeader()Lorg/thoughtcrime/securesms/conversation/v2/data/ThreadHeader;
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource;->size()I
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource;->toMappingModel(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingModel;
-HSPLorg/thoughtcrime/securesms/conversation/v2/data/ConversationElementKey$Companion;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/data/ConversationElementKey$Companion;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/data/ConversationElementKey$Companion;->getThreadHeader()Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationElementKey;
-HSPLorg/thoughtcrime/securesms/conversation/v2/data/ConversationElementKey;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/IncomingMedia;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/IncomingMedia;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/IncomingMedia;->getConversationMessage()Lorg/thoughtcrime/securesms/conversation/ConversationMessage;
@@ -22063,7 +21831,7 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/data/IncomingTextOnly;-><init>(Lo
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/IncomingTextOnly;->getConversationMessage()Lorg/thoughtcrime/securesms/conversation/ConversationMessage;
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageBackedKey;-><init>(J)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageBackedKey;->hashCode()I
-HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$$ExternalSyntheticLambda0;-><init>(Ljava/util/concurrent/Callable;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$$ExternalSyntheticLambda0;-><init>(Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$$ExternalSyntheticLambda0;->call()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$$ExternalSyntheticLambda1;-><init>(Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$$ExternalSyntheticLambda1;->call()Ljava/lang/Object;
@@ -22075,9 +21843,9 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$$External
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$$ExternalSyntheticLambda4;->call()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$$ExternalSyntheticLambda5;-><init>(Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$$ExternalSyntheticLambda5;->call()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$$ExternalSyntheticLambda6;-><init>(Ljava/util/List;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$$ExternalSyntheticLambda6;-><init>(Ljava/util/List;Landroid/app/Application;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$$ExternalSyntheticLambda6;->call()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$$ExternalSyntheticLambda7;-><init>(Ljava/util/List;Landroid/app/Application;)V
+HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$$ExternalSyntheticLambda7;-><init>(Ljava/util/concurrent/Callable;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$$ExternalSyntheticLambda7;->call()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$ExtraMessageData;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$ExtraMessageData;-><init>(Ljava/util/Map;Ljava/util/Set;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/String;)V
@@ -22093,14 +21861,14 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$TimedResu
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$TimedResult;->getDuration()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$TimedResult;->getDurationNanos()J
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$TimedResult;->getResult()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;->$r8$lambda$Cs9l2XA1WNP95TiUSxohh7ra3Ww(Ljava/util/List;)Ljava/util/Map;
-HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;->$r8$lambda$FrUVeLhot38doVCglQFObvc5AaY(Ljava/util/List;)Ljava/util/Map;
-HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;->$r8$lambda$RMAc6YctMyIBPxCbXNgRTW89bsw(Ljava/util/List;Landroid/app/Application;)Lkotlin/Unit;
-HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;->$r8$lambda$VVeGNqSH8Ds974z_DCkG6lrE4Vk(Ljava/util/List;)Ljava/util/Map;
-HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;->$r8$lambda$f-lfvLq_IbuaQLneolXX3ub4kj4(Ljava/util/List;)Ljava/util/Map;
-HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;->$r8$lambda$tRT3GzOp1DPXuQw76v5coP2Wv1s(Ljava/util/List;)Ljava/util/Set;
-HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;->$r8$lambda$xdS5DH5tLLZB1PgnkW3I8tIGiDw(Ljava/util/List;)Ljava/util/Map;
-HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;->$r8$lambda$y9zmNO5eO3RqgCXAGsDgImftxNM(Ljava/util/concurrent/Callable;)Lorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$TimedResult;
+HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;->$r8$lambda$4iSCT01DKCHe43trYUNF_gzAhdU(Ljava/util/List;)Ljava/util/Map;
+HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;->$r8$lambda$AI5QuQI30AGAfxBXvdK3ytC16qA(Ljava/util/List;)Ljava/util/Set;
+HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;->$r8$lambda$Nbvgc34Xky_eAfEPUhIxvLTPa6I(Ljava/util/List;)Ljava/util/Map;
+HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;->$r8$lambda$PhusYyKvajGM6fA3m69QpnmGJDY(Ljava/util/List;Landroid/app/Application;)Lkotlin/Unit;
+HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;->$r8$lambda$nHaVDSeTqiC8KYk5Ok_bIjuhXJU(Ljava/util/concurrent/Callable;)Lorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$TimedResult;
+HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;->$r8$lambda$pPswBV489yo6I4-R3Y-J1xVlyoY(Ljava/util/List;)Ljava/util/Map;
+HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;->$r8$lambda$t1JXujlBFwd4SZoHN2PII1Py2GE(Ljava/util/List;)Ljava/util/Map;
+HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;->$r8$lambda$tl1YdHQ7t4d5MI6cyN3rmPPSdSs(Ljava/util/List;)Ljava/util/Map;
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;->fetch$lambda$1(Ljava/util/List;)Ljava/util/Map;
@@ -22117,7 +21885,6 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;->updateM
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher;->updateWithData(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lorg/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher$ExtraMessageData;)Lorg/thoughtcrime/securesms/database/model/MessageRecord;
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/ThreadHeader;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/ThreadHeader;-><init>(Lorg/thoughtcrime/securesms/messagerequests/MessageRequestRecipientInfo;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/data/ThreadHeader;->getRecipientInfo()Lorg/thoughtcrime/securesms/messagerequests/MessageRequestRecipientInfo;
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/ThreadHeaderKey;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/data/ThreadHeaderKey;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallState;-><clinit>()V
@@ -22135,8 +21902,12 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewM
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel$1;->invoke(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel$2;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel$2;->apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel$2;->apply(Lkotlin/Unit;Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallState;)Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallState;
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel$3;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel$3;-><init>()V
+HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel$3;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel$3;->invoke(Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallState;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel$filteredState$1;-><clinit>()V
@@ -22175,163 +21946,16 @@ HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel
 HSPLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel;->updateGroupStateIfNeeded()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsData;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsData;-><init>(Lorg/thoughtcrime/securesms/conversation/colors/ChatColors;Landroid/graphics/drawable/Drawable;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsData;->getChatColors()Lorg/thoughtcrime/securesms/conversation/colors/ChatColors;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsData;->getMask()Landroid/graphics/drawable/Drawable;
 HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsItemDecoration$onDraw$$inlined$filterIsInstance$1;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsItemDecoration$onDraw$$inlined$filterIsInstance$1;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsItemDecoration$onDraw$$inlined$filterIsInstance$1;->invoke(Ljava/lang/Object;)Ljava/lang/Boolean;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsItemDecoration$onDraw$$inlined$filterIsInstance$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsItemDecoration$onDraw$1;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsItemDecoration$onDraw$1;->invoke(Landroid/view/View;)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsItemDecoration$onDraw$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsItemDecoration;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsItemDecoration;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsItemDecoration;->onDraw(Landroid/graphics/Canvas;Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$State;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;-><init>(Lkotlin/jvm/functions/Function0;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;->draw(Landroid/graphics/Canvas;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;->getChatColors()Lorg/thoughtcrime/securesms/conversation/colors/ChatColors;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;->getMask()Landroid/graphics/drawable/Drawable;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;->getOpacity()I
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;->getOutline(Landroid/graphics/Outline;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;->isSolidColor()Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;->setCorners(Lorg/thoughtcrime/securesms/util/Projection$Corners;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;->setCorners([F)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;->setLocalChatColors(Lorg/thoughtcrime/securesms/conversation/colors/ChatColors;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/items/ShrinkWrapLinearLayout;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/items/ShrinkWrapLinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/ShrinkWrapLinearLayout;->onMeasure(II)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/ShrinkWrapLinearLayout;->shrinkWrapWidthMeasureSpec(I)I
 HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;->addOnMeasureListener(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout$OnMeasureListener;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;->onMeasure(II)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;->removeOnMeasureListener(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout$OnMeasureListener;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;->setOnDispatchTouchEventListener(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout$OnDispatchTouchEventListener;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$Companion;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;->$values()[Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;-><init>(Ljava/lang/String;IFF)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;->getBottomPadding()F
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;->getTopPadding()F
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;->isEndingShape()Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;->isStartingShape()Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationContext;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;->access$getCollapsedSpacing$cp()F
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;->access$getDefaultSpacing$cp()F
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;->getCornersLTR()Lorg/thoughtcrime/securesms/util/Projection$Corners;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;->isEndOfMessageCluster(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;->isSingularMessage(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lorg/thoughtcrime/securesms/database/model/MessageRecord;Z)Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;->isStartOfMessageCluster(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lorg/thoughtcrime/securesms/database/model/MessageRecord;Z)Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;->isWithinClusteringTime(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;->setBodyBubbleCorners(FFFF)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;->setMessageShape(Lorg/thoughtcrime/securesms/database/model/MessageRecord;ZI)Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;Lorg/thoughtcrime/securesms/components/AvatarImageView;Lorg/thoughtcrime/securesms/badges/BadgeImageView;Landroid/view/ViewGroup;Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;Lcom/google/android/material/imageview/ShapeableImageView;Lorg/thoughtcrime/securesms/reactions/ReactionsConversationView;Lorg/thoughtcrime/securesms/components/DeliveryStatusView;Landroid/widget/TextView;Lorg/thoughtcrime/securesms/components/ExpirationTimerView;Landroid/view/View;Landroid/widget/Space;Lorg/thoughtcrime/securesms/components/AlertView;Z)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getAlert()Lorg/thoughtcrime/securesms/components/AlertView;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getBody()Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getBodyWrapper()Landroid/view/ViewGroup;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getDeliveryStatus()Lorg/thoughtcrime/securesms/components/DeliveryStatusView;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getFooterBackground()Landroid/view/View;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getFooterDate()Landroid/widget/TextView;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getFooterExpiry()Lorg/thoughtcrime/securesms/components/ExpirationTimerView;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getFooterSpace()Landroid/widget/Space;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getReactions()Lorg/thoughtcrime/securesms/reactions/ReactionsConversationView;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getReply()Lcom/google/android/material/imageview/ShapeableImageView;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getRoot()Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getSenderBadge()Lorg/thoughtcrime/securesms/badges/BadgeImageView;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getSenderName()Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getSenderPhoto()Lorg/thoughtcrime/securesms/components/AvatarImageView;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->isIncoming()Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridgeKt;->bridge(Lorg/thoughtcrime/securesms/databinding/V2ConversationItemTextOnlyIncomingBinding;)Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda0;->onLayoutChange(Landroid/view/View;IIIIIIII)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda5;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda6;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda9;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationAdapter$ItemClickListener;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$Companion;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$PassthroughClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$ReactionMeasureListener;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$bodyBubbleDrawable$1;-><init>(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$bodyBubbleDrawable$1;->invoke()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$bodyBubbleDrawable$1;->invoke()Lorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsData;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$footerDrawable$1;-><init>(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$footerDrawable$1;->invoke()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$footerDrawable$1;->invoke()Lorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsData;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$gestureDetector$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$replyDelegate$1;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$senderDrawable$1;-><init>(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->$r8$lambda$ocilDMoff9b132TfYhzB6ol1qqk(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;Landroid/view/View;IIIIIIII)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationContext;Lorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationContext;Lorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->_init_$lambda$0(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;Landroid/view/View;IIIIIIII)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->bind(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->bind(Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingModel;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->canPlayContent()Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->getColorizerProjections(Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/util/ProjectionList;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->getConversationMessage()Lorg/thoughtcrime/securesms/conversation/ConversationMessage;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->getShape()Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->invalidateBodyBubbleDrawable(Landroid/view/ViewGroup;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->invalidateChatColorsDrawable(Landroid/view/ViewGroup;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->invalidateFooterDrawable(Landroid/view/ViewGroup;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->isContentCondensed()Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->isForcedFooter()Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->linkifyMessageBody(Landroid/text/Spannable;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentAlert()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentBody()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentDate()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentDeliveryStatus()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentFooterBackground()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentFooterEndPadding()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentFooterExpiry()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentReactions()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentSender()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentSenderNameBackground()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentSenderNameColor()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->setConversationMessage(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->setShape(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->showProjectionArea()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme$getBodyTextColor$1;-><init>(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme$getBodyTextColor$2;-><init>(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme$getBodyTextColor$2;->invoke(Landroid/content/Context;Z)Ljava/lang/Integer;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme$getBodyTextColor$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme;-><init>(Landroid/content/Context;Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationContext;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme;->getBodyBubbleColor(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;)I
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme;->getBodyTextColor(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;)I
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme;->getColor(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)I
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme;->getFooterBubbleColor(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;)I
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme;->getReplyIconBackgroundColor()I
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemUtils;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemUtils;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemUtils;->linkifyUrlLinks(Landroid/text/Spannable;ZLorg/thoughtcrime/securesms/util/UrlClickHandler;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationContext;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder;->getShapeDelegate()Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder;->getThemeDelegate()Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate$DisplayState;->$values()[Lorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate$DisplayState;
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate$DisplayState;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate$DisplayState;-><init>(Ljava/lang/String;I)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;Ljava/util/List;Landroid/view/View;Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;Landroid/widget/Space;Lorg/thoughtcrime/securesms/util/views/Stub;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate;->displayTuckedIntoBody()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate;->getFooterWidth()I
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate;->onPostMeasure()Z
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate;->onPreMeasure()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2OnDispatchTouchEventListener$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2OnDispatchTouchEventListener;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2OnDispatchTouchEventListener$Companion;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2OnDispatchTouchEventListener$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2OnDispatchTouchEventListener;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2OnDispatchTouchEventListener;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationContext;Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;)V
 HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2Payload;->$values()[Lorg/thoughtcrime/securesms/conversation/v2/items/V2Payload;
 HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2Payload;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversation/v2/items/V2Payload;-><init>(Ljava/lang/String;I)V
@@ -22356,7 +21980,7 @@ HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListAdapter$Payload;
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListAdapter$Payload;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListAdapter$Payload;-><init>(Ljava/lang/String;I)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListAdapter$Payload;->values()[Lorg/thoughtcrime/securesms/conversationlist/ConversationListAdapter$Payload;
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListAdapter;->$r8$lambda$2QDH4q4xSHpazU1KhZ4uhNUhhdI(Lorg/thoughtcrime/securesms/conversationlist/ConversationListAdapter;Lorg/thoughtcrime/securesms/conversationlist/ConversationListAdapter$ConversationViewHolder;Landroid/view/View;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListAdapter;->$r8$lambda$iJ3M5_PwpZ0_BVU0QPD67wRep54(Lorg/thoughtcrime/securesms/conversationlist/ConversationListAdapter;Lorg/thoughtcrime/securesms/conversationlist/ConversationListAdapter$ConversationViewHolder;Landroid/view/View;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListAdapter;-><init>(Landroidx/lifecycle/LifecycleOwner;Lcom/bumptech/glide/RequestManager;Lorg/thoughtcrime/securesms/conversationlist/ConversationListAdapter$OnConversationClickListener;Lorg/thoughtcrime/securesms/conversationlist/ClearFilterViewHolder$OnClearFilterClickListener;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListAdapter;->getItem(I)Lorg/thoughtcrime/securesms/conversationlist/model/Conversation;
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListAdapter;->getItemViewType(I)I
@@ -22383,66 +22007,66 @@ HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListDataSource;->cre
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListDataSource;->getKey(Lorg/thoughtcrime/securesms/conversationlist/model/Conversation;)Ljava/lang/Long;
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListDataSource;->load(IIILorg/signal/paging/PagedDataSource$CancellationSignal;)Ljava/util/List;
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListDataSource;->size()I
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda10;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda10;->accept(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda26;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;ILjava/util/List;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda26;->run()V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda28;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda28;->run()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda29;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lorg/thoughtcrime/securesms/recipients/Recipient;JI)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda29;->run(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda32;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda32;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda34;-><init>(Landroid/content/Context;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda34;->run()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda35;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda35;->run(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda36;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda39;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda39;->onChanged(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda44;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda45;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Ljava/util/Set;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda47;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda48;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda49;-><init>()V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda0;-><init>(Landroid/content/Context;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda0;->run()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda16;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda16;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda17;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda17;->create(Landroid/content/Context;Ljava/util/Set;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$DisplayOptions;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$ClickCallbacks;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$LongClickCallbacks;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$StoryContextMenuCallbacks;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$CallButtonClickCallbacks;)Lorg/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter;
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda18;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lcom/google/android/material/appbar/CollapsingToolbarLayout;I)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda18;->newState(Lorg/thoughtcrime/securesms/conversationlist/chatfilter/FilterPullState;Lorg/thoughtcrime/securesms/conversationlist/chatfilter/ConversationFilterSource;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda19;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda1;->run(Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda20;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda20;->onOffsetChanged(Lcom/google/android/material/appbar/AppBarLayout;I)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda21;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda22;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda23;-><init>()V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda24;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda2;->accept(Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda3;->accept(Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda43;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;ILjava/util/List;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda43;->run()V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda44;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda44;->onChanged(Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda45;-><init>()V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda46;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Ljava/util/Set;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda48;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda49;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda4;->accept(Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda50;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda51;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda53;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Ljava/util/Set;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda55;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Ljava/util/Set;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda57;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Ljava/util/Set;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda52;-><init>()V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda54;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Ljava/util/Set;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda56;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Ljava/util/Set;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda58;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Ljava/util/Set;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda5;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda5;->accept(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda64;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda64;->accept(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda65;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda69;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda69;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda6;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda6;->accept(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda70;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda70;->create(Landroid/content/Context;Ljava/util/Set;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$DisplayOptions;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$ClickCallbacks;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$LongClickCallbacks;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$StoryContextMenuCallbacks;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$CallButtonClickCallbacks;)Lorg/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter;
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda71;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lcom/google/android/material/appbar/CollapsingToolbarLayout;I)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda71;->newState(Lorg/thoughtcrime/securesms/conversationlist/chatfilter/FilterPullState;Lorg/thoughtcrime/securesms/conversationlist/chatfilter/ConversationFilterSource;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda72;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda73;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda73;->onOffsetChanged(Lcom/google/android/material/appbar/AppBarLayout;I)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda74;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda75;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda76;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda77;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda78;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda78;->run()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda79;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lorg/thoughtcrime/securesms/recipients/Recipient;JI)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda79;->run(Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda7;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda7;->accept(Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda80;-><init>()V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda80;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda8;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda8;->accept(Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda9;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda9;->accept(Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$1;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$1;->canStartNestedScroll()Z
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$1;->onStopNestedScroll()V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$2;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Z)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$4$1$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$4$1$$ExternalSyntheticLambda0;->run()V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$4$1;->$r8$lambda$SnysAwplStZp3tpB-YFvMGqNG2o(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$4$1;->$r8$lambda$Y8JIyAbcQPA7qwtQh9qNmu7nmjo(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$4$1;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$4;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$4$1;->onLayoutChange(Landroid/view/View;IIIIIIII)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$4;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)V
@@ -22453,23 +22077,23 @@ HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$9;-><cl
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$ArchiveListenerCallback;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;II)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$ContactSearchClickCallbacks;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$ClickCallbacks;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$ContactSearchClickCallbacks;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$ClickCallbacks;Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$ContactSearchClickCallbacks-IA;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$1-_EPfn2vgxH_kxzEykuOW67npo(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lj$/util/Optional;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$45b3V1g-PPuuWgpa1Ul0Jn_UPvM(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lcom/google/android/material/appbar/AppBarLayout;I)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$BOZzdAXQrbAXwLajdgW2T3Bxy3Q(Landroid/content/Context;)Lj$/util/Optional;
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$CHaS6EtcD8ZUzRob16bd4t2DfYA(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchState;)Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchConfiguration;
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$MXbnRw_QuSRvu0100HnXToK4Bec(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lorg/thoughtcrime/securesms/conversationlist/model/ConversationSet;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$P74OAYq-GE64Wer4ReNxsVIAZy4(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;ILjava/util/List;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$SjqQGnCYg0hI4HkBpa5riMMrMQ4(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lorg/thoughtcrime/securesms/recipients/Recipient;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$WxM-bD4JoTmHJH8u0wyp1qN0HG0(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lorg/whispersystems/signalservice/api/websocket/WebSocketConnectionState;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$XUCe97UTDs7M-HFYX56xCDoC2LU(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lorg/thoughtcrime/securesms/megaphone/Megaphone;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$gaHPeGBLj1T27XM2mYRLMFHpFZs(Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchConfiguration$Builder;)Lkotlin/Unit;
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$gxdX3HpiKzsdIozb_s5Yw8Ffv2o(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lj$/util/Optional;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$hEZTRWazW93Jz7EQVXpXVQkY9VM(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Ljava/util/List;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$iJUotN70H_1yimzrBAvjzwLI6XI(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lorg/thoughtcrime/securesms/recipients/Recipient;JILjava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$lQNSZ9ZvUINlOiP87Y2YfwCK4mw(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Landroid/content/Context;Ljava/util/Set;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$DisplayOptions;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$ClickCallbacks;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$LongClickCallbacks;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$StoryContextMenuCallbacks;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$CallButtonClickCallbacks;)Lorg/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter;
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$q8M4HOpj-dzvXcjgSAWL0Tav6QQ(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Ljava/util/List;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$qMaEvHiJjK9-v37ev9D8tnKbApM(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lorg/thoughtcrime/securesms/conversationlist/chatfilter/ConversationFilterRequest;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$xY1tugayO1Yb7N8B0MgQZvOIMbA(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lcom/google/android/material/appbar/CollapsingToolbarLayout;ILorg/thoughtcrime/securesms/conversationlist/chatfilter/FilterPullState;Lorg/thoughtcrime/securesms/conversationlist/chatfilter/ConversationFilterSource;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$BT005Zy9c3YGjY9-gIiJli9XBQo(Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchConfiguration$Builder;)Lkotlin/Unit;
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$E2kQol4XezoS9z_wSx7q3Qsji9M(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Landroid/content/Context;Ljava/util/Set;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$DisplayOptions;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$ClickCallbacks;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$LongClickCallbacks;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$StoryContextMenuCallbacks;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter$CallButtonClickCallbacks;)Lorg/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter;
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$HjS8fuhzh2EhWGUsZtmkPRTpWBA(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lj$/util/Optional;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$ILgXAgMKWGMQPnkCVbofKBZFovo(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Ljava/util/List;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$KPzBA-7CvAirzeY08ZpxNtNW7Qk(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lcom/google/android/material/appbar/AppBarLayout;I)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$MlLBYJBd-8X6pDWOeA-x-13z2vg(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lorg/thoughtcrime/securesms/recipients/Recipient;JILjava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$NTWiRmHMeoz7xrMcVr1nMem4vIc(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lorg/thoughtcrime/securesms/conversationlist/chatfilter/ConversationFilterRequest;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$O3EqPlBcOC1O0tswXr4bEQu4PnM(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Ljava/util/List;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$SH4kWaKbmAoY2aQQCW_tUIy87vg(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lj$/util/Optional;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$ToefntJ60h2eJvYyhkjR66HuS8E(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchState;)Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchConfiguration;
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$cUHeQTdkw8rtF2k3Xqnq2Ht40nI(Landroid/content/Context;)Lj$/util/Optional;
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$iMw9-C63WDOdMX-OUKIJG67fgOk(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lorg/thoughtcrime/securesms/recipients/Recipient;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$oJToVEfmPG2Nmv72YONUgEwD4Iw(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lorg/whispersystems/signalservice/api/websocket/WebSocketConnectionState;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$qPt3w4vY61Nmx4dsnvsd6mVpCTg(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lcom/google/android/material/appbar/CollapsingToolbarLayout;ILorg/thoughtcrime/securesms/conversationlist/chatfilter/FilterPullState;Lorg/thoughtcrime/securesms/conversationlist/chatfilter/ConversationFilterSource;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$tcQJleeNLeLj2r6VXSKldpVNmC4(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lorg/thoughtcrime/securesms/megaphone/Megaphone;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$uCAxrpNHyQU6WMh1lwQ6XMhaFd4(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;ILjava/util/List;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->$r8$lambda$zKSnir3PkzoeYQ8dEt0-qT0DaQY(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;Lorg/thoughtcrime/securesms/conversationlist/model/ConversationSet;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->-$$Nest$fgetdefaultAdapter(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)Lorg/thoughtcrime/securesms/conversationlist/ConversationListAdapter;
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->-$$Nest$fgetlist(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)Landroidx/recyclerview/widget/RecyclerView;
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->-$$Nest$fgetpullView(Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;)Lorg/thoughtcrime/securesms/conversationlist/chatfilter/ConversationListFilterPullView;
@@ -22488,8 +22112,8 @@ HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->initi
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->isArchived()Z
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->isSearchOpen()Z
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->isSearchVisible()Z
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->lambda$handleCreateConversation$46(Lorg/thoughtcrime/securesms/recipients/Recipient;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->lambda$handleCreateConversation$47(Lorg/thoughtcrime/securesms/recipients/Recipient;JILjava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->lambda$handleCreateConversation$47(Lorg/thoughtcrime/securesms/recipients/Recipient;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->lambda$handleCreateConversation$48(Lorg/thoughtcrime/securesms/recipients/Recipient;JILjava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->lambda$initializeSearchListener$19(Lorg/thoughtcrime/securesms/conversationlist/chatfilter/ConversationFilterRequest;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->lambda$initializeViewModel$23(Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->lambda$initializeViewModel$24(Lorg/whispersystems/signalservice/api/websocket/WebSocketConnectionState;)V
@@ -22511,7 +22135,6 @@ HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->onCre
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->onFirstRender()V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->onMegaphoneChanged(Lorg/thoughtcrime/securesms/megaphone/Megaphone;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->onMegaphoneCompleted(Lorg/thoughtcrime/securesms/megaphone/Megaphones$Event;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->onPause()V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->onPostSubmitList(I)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->onPrepareOptionsMenu(Landroid/view/Menu;)V
@@ -22524,19 +22147,19 @@ HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->updat
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->updateMultiSelectState()V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->updateReminders()V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->updateSearchToolbarHint(Lorg/thoughtcrime/securesms/conversationlist/chatfilter/ConversationFilterRequest;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda10;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem;Ljava/util/Locale;Lorg/thoughtcrime/securesms/database/model/ThreadRecord;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda10;->run()V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda13;-><init>(Lorg/thoughtcrime/securesms/database/model/ThreadRecord;Landroid/content/Context;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda13;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda13;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda5;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda5;->onChanged(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda6;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda6;->onChanged(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem;->$r8$lambda$LAkoq7MeJO-fCezsfjX-mK5pWPo(Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem;Landroid/text/SpannableString;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem;->$r8$lambda$dlLpa5X9k6koT8N7PU2hVGd424s(Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem;->$r8$lambda$k1MmUJ3xOtwOkC4HHJE6kKVtClw(Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem;Ljava/util/Locale;Lorg/thoughtcrime/securesms/database/model/ThreadRecord;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem;->$r8$lambda$m6UBhFD1iIvqrclbuOW7C8gY-JM(Lorg/thoughtcrime/securesms/database/model/ThreadRecord;Landroid/content/Context;Ljava/lang/CharSequence;)Landroid/text/SpannableString;
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda2;->onChanged(Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda3;->onChanged(Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem;Ljava/util/Locale;Lorg/thoughtcrime/securesms/database/model/ThreadRecord;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda4;->run()V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda7;-><init>(Lorg/thoughtcrime/securesms/database/model/ThreadRecord;Landroid/content/Context;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda7;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem;->$r8$lambda$Ao_h4FypxhvytTG1WGaBgdSX7eg(Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem;Landroid/text/SpannableString;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem;->$r8$lambda$T86rrhhNpOwpF-_nveU8kJF2fOY(Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem;Ljava/util/Locale;Lorg/thoughtcrime/securesms/database/model/ThreadRecord;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem;->$r8$lambda$YVT0i2Mx86ySfKgZXhCzOgTWsuM(Lorg/thoughtcrime/securesms/database/model/ThreadRecord;Landroid/content/Context;Ljava/lang/CharSequence;)Landroid/text/SpannableString;
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem;->$r8$lambda$l0BmMo0qB3CGN0zh5wka8AFVoUA(Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListItem;->bind(Landroidx/lifecycle/LifecycleOwner;Lorg/thoughtcrime/securesms/database/model/ThreadRecord;Lcom/bumptech/glide/RequestManager;Ljava/util/Locale;Ljava/util/Set;Lorg/thoughtcrime/securesms/conversationlist/model/ConversationSet;)V
@@ -22629,10 +22252,6 @@ HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$megaph
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$megaphoneState$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$megaphoneState$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$megaphoneState$1;->invoke(Lorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$ConversationListState;)Lorg/thoughtcrime/securesms/megaphone/Megaphone;
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$onMegaphoneCompleted$1;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$onMegaphoneCompleted$1;-><init>()V
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$onMegaphoneCompleted$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$onMegaphoneCompleted$1;->invoke(Lorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$ConversationListState;)Lorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$ConversationListState;
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$onVisible$1$1;-><init>(Lorg/thoughtcrime/securesms/megaphone/Megaphone;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$onVisible$1$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$onVisible$1$1;->invoke(Lorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$ConversationListState;)Lorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$ConversationListState;
@@ -22654,7 +22273,7 @@ HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$select
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$selectedState$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$selectedState$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$selectedState$1;->invoke(Lorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$ConversationListState;)Lorg/thoughtcrime/securesms/conversationlist/model/ConversationSet;
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel;->$r8$lambda$IeDxfE4aTcbQAzoj6an5ycuCSo0(Lorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel;Lorg/thoughtcrime/securesms/megaphone/Megaphone;)V
+HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel;->$r8$lambda$7pizsg6VdKcR7O0n1SdZmZxImT0(Lorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel;Lorg/thoughtcrime/securesms/megaphone/Megaphone;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel;-><init>(ZLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;Lorg/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesRepository;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel;-><init>(ZLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;Lorg/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesRepository;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -22671,7 +22290,6 @@ HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel;->getN
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel;->getPinnedCount()I
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel;->getSelectedState()Lio/reactivex/rxjava3/core/Flowable;
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel;->getWebSocketState()Lio/reactivex/rxjava3/core/Observable;
-HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel;->onMegaphoneCompleted(Lorg/thoughtcrime/securesms/megaphone/Megaphones$Event;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel;->onMegaphoneVisible(Lorg/thoughtcrime/securesms/megaphone/Megaphone;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel;->onVisible$lambda$0(Lorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel;Lorg/thoughtcrime/securesms/megaphone/Megaphone;)V
 HSPLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel;->onVisible()V
@@ -22747,7 +22365,6 @@ HSPLorg/thoughtcrime/securesms/conversationlist/model/Conversation$Type;-><clini
 HSPLorg/thoughtcrime/securesms/conversationlist/model/Conversation$Type;-><init>(Ljava/lang/String;I)V
 HSPLorg/thoughtcrime/securesms/conversationlist/model/Conversation$Type;->values()[Lorg/thoughtcrime/securesms/conversationlist/model/Conversation$Type;
 HSPLorg/thoughtcrime/securesms/conversationlist/model/Conversation;-><init>(Lorg/thoughtcrime/securesms/database/model/ThreadRecord;)V
-HSPLorg/thoughtcrime/securesms/conversationlist/model/Conversation;->equals(Ljava/lang/Object;)Z
 HSPLorg/thoughtcrime/securesms/conversationlist/model/Conversation;->getThreadRecord()Lorg/thoughtcrime/securesms/database/model/ThreadRecord;
 HSPLorg/thoughtcrime/securesms/conversationlist/model/Conversation;->getType()Lorg/thoughtcrime/securesms/conversationlist/model/Conversation$Type;
 HSPLorg/thoughtcrime/securesms/conversationlist/model/ConversationFilter;->$values()[Lorg/thoughtcrime/securesms/conversationlist/model/ConversationFilter;
@@ -22852,15 +22469,15 @@ HSPLorg/thoughtcrime/securesms/crypto/ReentrantSessionLock;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/crypto/ReentrantSessionLock;-><init>(Ljava/lang/String;I)V
 HSPLorg/thoughtcrime/securesms/crypto/ReentrantSessionLock;->acquire()Lorg/whispersystems/signalservice/api/SignalSessionLock$Lock;
 HSPLorg/thoughtcrime/securesms/crypto/SenderKeyUtil;->clearAllState()V
+HSPLorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$$ExternalSyntheticLambda0;-><init>()V
+HSPLorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z
 HSPLorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$$ExternalSyntheticLambda1;-><init>()V
-HSPLorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z
+HSPLorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$$ExternalSyntheticLambda2;-><init>()V
 HSPLorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$$ExternalSyntheticLambda2;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$$ExternalSyntheticLambda3;-><init>()V
-HSPLorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$$ExternalSyntheticLambda3;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$Cache$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$Cache;Ljava/lang/String;Lorg/thoughtcrime/securesms/recipients/RecipientId;Lorg/signal/libsignal/protocol/IdentityKey;Lorg/thoughtcrime/securesms/database/IdentityTable$VerifiedStatus;ZJZ)V
-HSPLorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$Cache$$ExternalSyntheticLambda3;->run()V
-HSPLorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$Cache;->$r8$lambda$7HwivD63yrsET6yjsVpd_w19Vyg(Lorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$Cache;Ljava/lang/String;Lorg/thoughtcrime/securesms/recipients/RecipientId;Lorg/signal/libsignal/protocol/IdentityKey;Lorg/thoughtcrime/securesms/database/IdentityTable$VerifiedStatus;ZJZ)V
+HSPLorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$Cache$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$Cache;Ljava/lang/String;Lorg/thoughtcrime/securesms/recipients/RecipientId;Lorg/signal/libsignal/protocol/IdentityKey;Lorg/thoughtcrime/securesms/database/IdentityTable$VerifiedStatus;ZJZ)V
+HSPLorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$Cache$$ExternalSyntheticLambda2;->run()V
+HSPLorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$Cache;->$r8$lambda$gez7cshA2E7KhGOBD2nnbu-makA(Lorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$Cache;Ljava/lang/String;Lorg/thoughtcrime/securesms/recipients/RecipientId;Lorg/signal/libsignal/protocol/IdentityKey;Lorg/thoughtcrime/securesms/database/IdentityTable$VerifiedStatus;ZJZ)V
 HSPLorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$Cache;-><init>(Lorg/thoughtcrime/securesms/database/IdentityTable;)V
 HSPLorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$Cache;->get(Ljava/lang/String;)Lorg/thoughtcrime/securesms/database/model/IdentityStoreRecord;
 HSPLorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$Cache;->lambda$save$0(Ljava/lang/String;Lorg/thoughtcrime/securesms/recipients/RecipientId;Lorg/signal/libsignal/protocol/IdentityKey;Lorg/thoughtcrime/securesms/database/IdentityTable$VerifiedStatus;ZJZ)V
@@ -22911,6 +22528,14 @@ HSPLorg/thoughtcrime/securesms/database/AttachmentTable$ArchiveTransferState;-><
 HSPLorg/thoughtcrime/securesms/database/AttachmentTable$ArchiveTransferState;->getValue()I
 HSPLorg/thoughtcrime/securesms/database/AttachmentTable$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/database/AttachmentTable$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/thoughtcrime/securesms/database/AttachmentTable$ThumbnailRestoreState$Companion;-><init>()V
+HSPLorg/thoughtcrime/securesms/database/AttachmentTable$ThumbnailRestoreState$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/thoughtcrime/securesms/database/AttachmentTable$ThumbnailRestoreState$Companion;->deserialize(I)Lorg/thoughtcrime/securesms/database/AttachmentTable$ThumbnailRestoreState;
+HSPLorg/thoughtcrime/securesms/database/AttachmentTable$ThumbnailRestoreState;->$values()[Lorg/thoughtcrime/securesms/database/AttachmentTable$ThumbnailRestoreState;
+HSPLorg/thoughtcrime/securesms/database/AttachmentTable$ThumbnailRestoreState;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/database/AttachmentTable$ThumbnailRestoreState;-><init>(Ljava/lang/String;II)V
+HSPLorg/thoughtcrime/securesms/database/AttachmentTable$ThumbnailRestoreState;->getValue()I
+HSPLorg/thoughtcrime/securesms/database/AttachmentTable$ThumbnailRestoreState;->values()[Lorg/thoughtcrime/securesms/database/AttachmentTable$ThumbnailRestoreState;
 HSPLorg/thoughtcrime/securesms/database/AttachmentTable$TransformProperties$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/database/AttachmentTable$TransformProperties$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/database/AttachmentTable$TransformProperties$Companion;->empty()Lorg/thoughtcrime/securesms/database/AttachmentTable$TransformProperties;
@@ -22924,6 +22549,7 @@ HSPLorg/thoughtcrime/securesms/database/AttachmentTable$insertUndownloadedAttach
 HSPLorg/thoughtcrime/securesms/database/AttachmentTable$insertUndownloadedAttachment$attachmentId$1;->invoke(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;)Lorg/thoughtcrime/securesms/attachments/AttachmentId;
 HSPLorg/thoughtcrime/securesms/database/AttachmentTable;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/AttachmentTable;-><init>(Landroid/content/Context;Lorg/thoughtcrime/securesms/database/SignalDatabase;Lorg/thoughtcrime/securesms/crypto/AttachmentSecret;)V
+HSPLorg/thoughtcrime/securesms/database/AttachmentTable;->containsStickerPackId(Ljava/lang/String;)Z
 HSPLorg/thoughtcrime/securesms/database/AttachmentTable;->deleteAbandonedPreuploadedAttachments()I
 HSPLorg/thoughtcrime/securesms/database/AttachmentTable;->getAttachment(Landroid/database/Cursor;)Lorg/thoughtcrime/securesms/attachments/DatabaseAttachment;
 HSPLorg/thoughtcrime/securesms/database/AttachmentTable;->getAttachment(Lorg/thoughtcrime/securesms/attachments/AttachmentId;)Lorg/thoughtcrime/securesms/attachments/DatabaseAttachment;
@@ -22985,57 +22611,62 @@ HSPLorg/thoughtcrime/securesms/database/DatabaseMonitor;->onDelete(Ljava/lang/St
 HSPLorg/thoughtcrime/securesms/database/DatabaseMonitor;->onQuery(ZLjava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseMonitor;->onSql(Ljava/lang/String;[Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseMonitor;->onUpdate(Ljava/lang/String;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda10;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;JLorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda10;->run()V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda11;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda11;->run()V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda17;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/recipients/RecipientId;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda17;->run()V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda1;->run()V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda20;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda20;->run()V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda12;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;JLorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda12;->run()V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda13;-><init>(Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda13;->run()V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda15;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda15;->run()V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda16;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda16;->run()V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda19;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda19;->run()V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda22;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda22;->run()V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda23;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda23;->run()V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda24;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda24;->run()V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda28;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;JLorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda25;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;JLorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda25;->run()V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda28;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda28;->run()V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda29;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;J)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda29;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda29;->run()V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda30;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;JLorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda30;->run()V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda37;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda37;->run()V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda40;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Ljava/lang/Runnable;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda40;->run()V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda31;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;J)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda31;->run()V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda32;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda32;->run()V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda35;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda35;->run()V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda39;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/recipients/RecipientId;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda39;->run()V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda42;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda42;->run()V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;JLorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda4;->run()V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda5;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda5;->run()V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$6H_TtixOHSa7Tr30medlqcHry2c(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$6mdIgDDCV4XFVFnyxH8Vj4a6MqU(Lorg/thoughtcrime/securesms/database/DatabaseObserver;JLorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$Aq7iz6-OcN5qdEpvMz8WyoOoHtc(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Ljava/lang/Runnable;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$FLqOSncPM9UHAHmQfH7ITyYgYis(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$P-H8JPj8WgBa8EorlTkjTC0yG1E(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/recipients/RecipientId;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$Q9T3e0x03-9UyovUEacfv32ZkYs(Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$Rd4ts_QPgl4yKrcyZyl-dxASD8g(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$XcpL0fyOGdTr1sc4d0z4i8eoe14(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$XpAe1b_YlxfSEkV3hD_v20iDkHw(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$mv9tymw4eNQuLtAMo52Pot0i2c4(Lorg/thoughtcrime/securesms/database/DatabaseObserver;J)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$nM9Xevlg3i5jd4hhWqCSJ8V0APs(Lorg/thoughtcrime/securesms/database/DatabaseObserver;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$oXFDlhvhHFY1OBIQHYp3Oanmq-k(Lorg/thoughtcrime/securesms/database/DatabaseObserver;JLorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$wnm9BEANNc03FZmWKcqOLSgrT_U(Lorg/thoughtcrime/securesms/database/DatabaseObserver;JLorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$wtkgxGON7fTcqqEso3BleXuYIA8(Lorg/thoughtcrime/securesms/database/DatabaseObserver;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$zacSulZCbj18KAJ4fsL5guxghT4(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda9;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Ljava/lang/Runnable;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda9;->run()V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$4H5U_Q8BP_LdOaO31GRxD77lsIo(Lorg/thoughtcrime/securesms/database/DatabaseObserver;JLorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$5UW9QDrEKGH9VfKHFARm7EYg6Y4(Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$5zqND7tiNTa9gs7gVRxgKWtRBzs(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$7xjIiYJ7ofRfKIKwQNoSVZVoH6Y(Lorg/thoughtcrime/securesms/database/DatabaseObserver;JLorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$GZNtDzoQYPJR_Jwlst5txm2KIJA(Lorg/thoughtcrime/securesms/database/DatabaseObserver;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$Q0dnc33_yK9hNPIEfpjGuVPX7J8(Lorg/thoughtcrime/securesms/database/DatabaseObserver;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$aDlk4LMltjlqmtefwZJ0u-hGZs8(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/recipients/RecipientId;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$gOpKx5nfeUSNxkhYbb4sEs1fYVM(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$hHYnudhLLDq3UpBEPX4iy6qChBo(Lorg/thoughtcrime/securesms/database/DatabaseObserver;JLorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$hj5q8RkVeIAGjQyaOP1xfy4K218(Lorg/thoughtcrime/securesms/database/DatabaseObserver;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$nWVZ0GtsJtiPq4Zsu0SH8XaISrk(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$oBQKscRnadvTUZ1fDbSIsdzYPh0(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$qXnDHzFG1tXkv5eQQLSTGhDqTyI(Lorg/thoughtcrime/securesms/database/DatabaseObserver;J)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$rlxC4VqF1GvFwnMfuOHZtrYbtes(Lorg/thoughtcrime/securesms/database/DatabaseObserver;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$wW3vZab8MHeXSvE5WzToD55FDIo(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Ljava/lang/Runnable;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$zaVuaFNMlzpMqWh3RXJKifkcxiE(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;-><init>(Landroid/app/Application;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$notifyAttachmentObservers$28()V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$notifyConversationListListeners$22()V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$notifyConversationListeners$19(J)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$notifyRecipientChanged$34(Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$notifyStoryObservers$35(Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$notifyAttachmentObservers$30()V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$notifyConversationListListeners$24()V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$notifyConversationListeners$21(J)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$notifyRecipientChanged$36(Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$notifyStickerObservers$28()V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$notifyStickerPackObservers$29()V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$notifyStoryObservers$37(Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$registerAttachmentObserver$9(Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$registerConversationListObserver$0(Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$registerConversationObserver$1(JLorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
@@ -23044,14 +22675,15 @@ HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$registerMessag
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$registerNotificationProfileObserver$12(Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$registerStoryObserver$13(Lorg/thoughtcrime/securesms/recipients/RecipientId;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$registerVerboseConversationObserver$2(JLorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$runPostSuccessfulTransaction$40(Ljava/lang/Runnable;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$unregisterObserver$17(Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$runPostSuccessfulTransaction$44(Ljava/lang/Runnable;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->notifyAttachmentObservers()V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->notifyConversationListListeners()V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->notifyConversationListeners(J)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->notifyMapped(Ljava/util/Map;Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->notifyRecipientChanged(Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->notifySet(Ljava/util/Set;)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->notifyStickerObservers()V
+HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->notifyStickerPackObservers()V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->notifyStoryObservers(Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->registerAttachmentObserver(Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->registerConversationListObserver(Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
@@ -23063,8 +22695,6 @@ HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->registerNotificationP
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->registerStoryObserver(Lorg/thoughtcrime/securesms/recipients/RecipientId;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->registerVerboseConversationObserver(JLorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->runPostSuccessfulTransaction(Ljava/lang/String;Ljava/lang/Runnable;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->unregisterMapped(Ljava/util/Map;Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/database/DatabaseObserver;->unregisterObserver(Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseTable;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/DatabaseTable;-><init>(Landroid/content/Context;Lorg/thoughtcrime/securesms/database/SignalDatabase;)V
 HSPLorg/thoughtcrime/securesms/database/DatabaseTable;->getReadableDatabase()Lorg/thoughtcrime/securesms/database/SQLiteDatabase;
@@ -23072,6 +22702,8 @@ HSPLorg/thoughtcrime/securesms/database/DatabaseTable;->getWritableDatabase()Lor
 HSPLorg/thoughtcrime/securesms/database/DatabaseTable;->notifyAttachmentListeners()V
 HSPLorg/thoughtcrime/securesms/database/DatabaseTable;->notifyConversationListListeners()V
 HSPLorg/thoughtcrime/securesms/database/DatabaseTable;->notifyConversationListeners(J)V
+HSPLorg/thoughtcrime/securesms/database/DatabaseTable;->notifyStickerListeners()V
+HSPLorg/thoughtcrime/securesms/database/DatabaseTable;->notifyStickerPackListeners()V
 HSPLorg/thoughtcrime/securesms/database/DistributionListTables$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/database/DistributionListTables$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/database/DistributionListTables$ListTable;-><clinit>()V
@@ -23149,6 +22781,24 @@ HSPLorg/thoughtcrime/securesms/database/IdentityTable;-><init>(Landroid/content/
 HSPLorg/thoughtcrime/securesms/database/IdentityTable;->getIdentityStoreRecord(Ljava/lang/String;)Lorg/thoughtcrime/securesms/database/model/IdentityStoreRecord;
 HSPLorg/thoughtcrime/securesms/database/IdentityTable;->saveIdentity(Ljava/lang/String;Lorg/thoughtcrime/securesms/recipients/RecipientId;Lorg/signal/libsignal/protocol/IdentityKey;Lorg/thoughtcrime/securesms/database/IdentityTable$VerifiedStatus;ZJZ)V
 HSPLorg/thoughtcrime/securesms/database/IdentityTable;->saveIdentityInternal(Ljava/lang/String;Lorg/thoughtcrime/securesms/recipients/RecipientId;Lorg/signal/libsignal/protocol/IdentityKey;Lorg/thoughtcrime/securesms/database/IdentityTable$VerifiedStatus;ZJZ)V
+HSPLorg/thoughtcrime/securesms/database/InAppPaymentSubscriberTable$Companion;-><init>()V
+HSPLorg/thoughtcrime/securesms/database/InAppPaymentSubscriberTable$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/thoughtcrime/securesms/database/InAppPaymentSubscriberTable;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/database/InAppPaymentSubscriberTable;-><init>(Landroid/content/Context;Lorg/thoughtcrime/securesms/database/SignalDatabase;)V
+HSPLorg/thoughtcrime/securesms/database/InAppPaymentTable$Companion;-><init>()V
+HSPLorg/thoughtcrime/securesms/database/InAppPaymentTable$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/thoughtcrime/securesms/database/InAppPaymentTable$Type$Companion;-><init>()V
+HSPLorg/thoughtcrime/securesms/database/InAppPaymentTable$Type$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/thoughtcrime/securesms/database/InAppPaymentTable$Type;->$values()[Lorg/thoughtcrime/securesms/database/InAppPaymentTable$Type;
+HSPLorg/thoughtcrime/securesms/database/InAppPaymentTable$Type;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/database/InAppPaymentTable$Type;-><init>(Ljava/lang/String;IIZ)V
+HSPLorg/thoughtcrime/securesms/database/InAppPaymentTable$consumeInAppPaymentsToNotifyUser$1;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/database/InAppPaymentTable$consumeInAppPaymentsToNotifyUser$1;-><init>()V
+HSPLorg/thoughtcrime/securesms/database/InAppPaymentTable$consumeInAppPaymentsToNotifyUser$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/database/InAppPaymentTable$consumeInAppPaymentsToNotifyUser$1;->invoke(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;)Ljava/util/List;
+HSPLorg/thoughtcrime/securesms/database/InAppPaymentTable;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/database/InAppPaymentTable;-><init>(Landroid/content/Context;Lorg/thoughtcrime/securesms/database/SignalDatabase;)V
+HSPLorg/thoughtcrime/securesms/database/InAppPaymentTable;->consumeInAppPaymentsToNotifyUser()Ljava/util/List;
 HSPLorg/thoughtcrime/securesms/database/JobDatabase$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/database/JobDatabase;)V
 HSPLorg/thoughtcrime/securesms/database/JobDatabase$$ExternalSyntheticLambda0;->run()V
 HSPLorg/thoughtcrime/securesms/database/JobDatabase$Companion;-><init>()V
@@ -23160,7 +22810,10 @@ HSPLorg/thoughtcrime/securesms/database/JobDatabase$deleteJobs$1;->invoke(Lnet/z
 HSPLorg/thoughtcrime/securesms/database/JobDatabase$insertJobs$2;-><init>(Ljava/util/List;Lorg/thoughtcrime/securesms/database/JobDatabase;)V
 HSPLorg/thoughtcrime/securesms/database/JobDatabase$insertJobs$2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/database/JobDatabase$insertJobs$2;->invoke(Lnet/zetetic/database/sqlcipher/SQLiteDatabase;)V
-HSPLorg/thoughtcrime/securesms/database/JobDatabase;->$r8$lambda$ou_p531IVGikC2LNueT6qnVrWyc(Lorg/thoughtcrime/securesms/database/JobDatabase;)V
+HSPLorg/thoughtcrime/securesms/database/JobDatabase$updateJobs$2;-><init>(Ljava/util/List;)V
+HSPLorg/thoughtcrime/securesms/database/JobDatabase$updateJobs$2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/database/JobDatabase$updateJobs$2;->invoke(Lnet/zetetic/database/sqlcipher/SQLiteDatabase;)V
+HSPLorg/thoughtcrime/securesms/database/JobDatabase;->$r8$lambda$QG9gfPEt1nMVSr2ltzqu-cEwVes(Lorg/thoughtcrime/securesms/database/JobDatabase;)V
 HSPLorg/thoughtcrime/securesms/database/JobDatabase;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/JobDatabase;-><init>(Landroid/app/Application;Lorg/thoughtcrime/securesms/crypto/DatabaseSecret;)V
 HSPLorg/thoughtcrime/securesms/database/JobDatabase;->access$getInstance$cp()Lorg/thoughtcrime/securesms/database/JobDatabase;
@@ -23168,6 +22821,7 @@ HSPLorg/thoughtcrime/securesms/database/JobDatabase;->access$insertConstraintSpe
 HSPLorg/thoughtcrime/securesms/database/JobDatabase;->access$insertDependencySpecs(Lorg/thoughtcrime/securesms/database/JobDatabase;Lnet/zetetic/database/sqlcipher/SQLiteDatabase;Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/database/JobDatabase;->access$insertJobSpec(Lorg/thoughtcrime/securesms/database/JobDatabase;Lnet/zetetic/database/sqlcipher/SQLiteDatabase;Lorg/thoughtcrime/securesms/jobmanager/persistence/JobSpec;)V
 HSPLorg/thoughtcrime/securesms/database/JobDatabase;->access$setInstance$cp(Lorg/thoughtcrime/securesms/database/JobDatabase;)V
+HSPLorg/thoughtcrime/securesms/database/JobDatabase;->constraintSpecFromCursor(Landroid/database/Cursor;)Lorg/thoughtcrime/securesms/jobmanager/persistence/ConstraintSpec;
 HSPLorg/thoughtcrime/securesms/database/JobDatabase;->deleteJobs(Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/database/JobDatabase;->dropTableIfPresent(Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/database/JobDatabase;->getAllConstraintSpecs()Ljava/util/List;
@@ -23178,11 +22832,13 @@ HSPLorg/thoughtcrime/securesms/database/JobDatabase;->insertConstraintSpecs(Lnet
 HSPLorg/thoughtcrime/securesms/database/JobDatabase;->insertDependencySpecs(Lnet/zetetic/database/sqlcipher/SQLiteDatabase;Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/database/JobDatabase;->insertJobSpec(Lnet/zetetic/database/sqlcipher/SQLiteDatabase;Lorg/thoughtcrime/securesms/jobmanager/persistence/JobSpec;)V
 HSPLorg/thoughtcrime/securesms/database/JobDatabase;->insertJobs(Ljava/util/List;)V
+HSPLorg/thoughtcrime/securesms/database/JobDatabase;->jobSpecFromCursor(Landroid/database/Cursor;)Lorg/thoughtcrime/securesms/jobmanager/persistence/JobSpec;
 HSPLorg/thoughtcrime/securesms/database/JobDatabase;->markJobAsRunning(Ljava/lang/String;J)V
 HSPLorg/thoughtcrime/securesms/database/JobDatabase;->onOpen$lambda$0(Lorg/thoughtcrime/securesms/database/JobDatabase;)V
 HSPLorg/thoughtcrime/securesms/database/JobDatabase;->onOpen(Lnet/zetetic/database/sqlcipher/SQLiteDatabase;)V
 HSPLorg/thoughtcrime/securesms/database/JobDatabase;->updateAllJobsToBePending()V
 HSPLorg/thoughtcrime/securesms/database/JobDatabase;->updateJobAfterRetry(Ljava/lang/String;JIJ[B)V
+HSPLorg/thoughtcrime/securesms/database/JobDatabase;->updateJobs(Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/database/KeyValueDatabase$$ExternalSyntheticLambda0;-><init>()V
 HSPLorg/thoughtcrime/securesms/database/KeyValueDatabase$$ExternalSyntheticLambda0;->run()V
 HSPLorg/thoughtcrime/securesms/database/KeyValueDatabase$1;-><clinit>()V
@@ -23192,7 +22848,7 @@ HSPLorg/thoughtcrime/securesms/database/KeyValueDatabase$Type;-><init>(Ljava/lan
 HSPLorg/thoughtcrime/securesms/database/KeyValueDatabase$Type;->fromId(I)Lorg/thoughtcrime/securesms/database/KeyValueDatabase$Type;
 HSPLorg/thoughtcrime/securesms/database/KeyValueDatabase$Type;->getId()I
 HSPLorg/thoughtcrime/securesms/database/KeyValueDatabase$Type;->values()[Lorg/thoughtcrime/securesms/database/KeyValueDatabase$Type;
-HSPLorg/thoughtcrime/securesms/database/KeyValueDatabase;->$r8$lambda$jefACyoHK4h3lvPI5zn7iBuWxuI()V
+HSPLorg/thoughtcrime/securesms/database/KeyValueDatabase;->$r8$lambda$G2dZI_gAXkqExOGYLgmndIoi47k()V
 HSPLorg/thoughtcrime/securesms/database/KeyValueDatabase;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/KeyValueDatabase;-><init>(Landroid/app/Application;Lorg/thoughtcrime/securesms/crypto/DatabaseSecret;)V
 HSPLorg/thoughtcrime/securesms/database/KeyValueDatabase;->getDataSet()Lorg/thoughtcrime/securesms/keyvalue/KeyValueDataSet;
@@ -23279,7 +22935,7 @@ HSPLorg/thoughtcrime/securesms/database/MediaTable;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/MediaTable;-><init>(Landroid/content/Context;Lorg/thoughtcrime/securesms/database/SignalDatabase;)V
 HSPLorg/thoughtcrime/securesms/database/MegaphoneDatabase$$ExternalSyntheticLambda0;-><init>()V
 HSPLorg/thoughtcrime/securesms/database/MegaphoneDatabase$$ExternalSyntheticLambda0;->run()V
-HSPLorg/thoughtcrime/securesms/database/MegaphoneDatabase;->$r8$lambda$oaKdGZ6vz5nb61QGUswa0LtZuAY()V
+HSPLorg/thoughtcrime/securesms/database/MegaphoneDatabase;->$r8$lambda$Hn6TX4rnCrZWpQUu_qk_FiE0W94()V
 HSPLorg/thoughtcrime/securesms/database/MegaphoneDatabase;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/MegaphoneDatabase;-><init>(Landroid/app/Application;Lorg/thoughtcrime/securesms/crypto/DatabaseSecret;)V
 HSPLorg/thoughtcrime/securesms/database/MegaphoneDatabase;->getAllAndDeleteMissing()Ljava/util/List;
@@ -23304,7 +22960,7 @@ HSPLorg/thoughtcrime/securesms/database/MentionTable;->getMentionsForMessage(J)L
 HSPLorg/thoughtcrime/securesms/database/MentionTable;->getMentionsForMessages(Ljava/util/Collection;)Ljava/util/Map;
 HSPLorg/thoughtcrime/securesms/database/MentionTable;->insert(JJLjava/util/Collection;)V
 HSPLorg/thoughtcrime/securesms/database/MentionTable;->readMentions(Landroid/database/Cursor;)Ljava/util/Map;
-HSPLorg/thoughtcrime/securesms/database/MentionUtil$$ExternalSyntheticLambda4;-><init>(Landroid/content/Context;)V
+HSPLorg/thoughtcrime/securesms/database/MentionUtil$$ExternalSyntheticLambda3;-><init>(Landroid/content/Context;)V
 HSPLorg/thoughtcrime/securesms/database/MentionUtil$UpdatedBodyAndMentions;-><init>(Ljava/lang/CharSequence;Ljava/util/List;Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/database/MentionUtil$UpdatedBodyAndMentions;-><init>(Ljava/lang/CharSequence;Ljava/util/List;Ljava/util/List;Lorg/thoughtcrime/securesms/database/MentionUtil$UpdatedBodyAndMentions-IA;)V
 HSPLorg/thoughtcrime/securesms/database/MentionUtil$UpdatedBodyAndMentions;->getBody()Ljava/lang/CharSequence;
@@ -23423,6 +23079,7 @@ HSPLorg/thoughtcrime/securesms/database/MessageTable;->hasFailedOutgoingStory()Z
 HSPLorg/thoughtcrime/securesms/database/MessageTable;->hasMeaningfulMessage(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTable;->insertMediaMessage(JLjava/lang/String;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lorg/thoughtcrime/securesms/database/model/databaseprotos/BodyRangeList;Landroid/content/ContentValues;Lorg/thoughtcrime/securesms/database/MessageTable$InsertListener;ZZ)Lkotlin/Pair;
 HSPLorg/thoughtcrime/securesms/database/MessageTable;->insertMessageInbox$default(Lorg/thoughtcrime/securesms/database/MessageTable;Lorg/thoughtcrime/securesms/mms/IncomingMessage;JLorg/thoughtcrime/securesms/database/model/MmsMessageRecord;ZILjava/lang/Object;)Lj$/util/Optional;
+HSPLorg/thoughtcrime/securesms/database/MessageTable;->insertMessageInbox(Lorg/thoughtcrime/securesms/mms/IncomingMessage;JLorg/thoughtcrime/securesms/database/model/MmsMessageRecord;Z)Lj$/util/Optional;
 HSPLorg/thoughtcrime/securesms/database/MessageTable;->isQuoted(Ljava/util/Collection;)Ljava/util/Set;
 HSPLorg/thoughtcrime/securesms/database/MessageTable;->mmsReaderFor(Landroid/database/Cursor;)Lorg/thoughtcrime/securesms/database/MessageTable$MmsReader;
 HSPLorg/thoughtcrime/securesms/database/MessageTable;->rawQueryWithAttachments$default(Lorg/thoughtcrime/securesms/database/MessageTable;Ljava/lang/String;[Ljava/lang/String;ZJILjava/lang/Object;)Landroid/database/Cursor;
@@ -23438,7 +23095,6 @@ HSPLorg/thoughtcrime/securesms/database/MessageType;->values()[Lorg/thoughtcrime
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isBadDecryptType(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isBoostRequest(J)Z
-HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isBundleKeyExchange(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isCallLog(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isChangeNumber(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isChatSessionRefresh(J)Z
@@ -23446,7 +23102,6 @@ HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isDraftMessageType(J)
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isDuplicateMessageType(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isEndSessionType(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isExpirationTimerUpdate(J)Z
-HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isFailedMessageType(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isForcedSms(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isGiftBadge(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isGroupCall(J)Z
@@ -23469,17 +23124,13 @@ HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isNoRemoteSessionType
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isOutgoingAudioCall(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isOutgoingMessageType(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isOutgoingVideoCall(J)Z
+HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isPaymentTombstone(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isPaymentsActivated(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isPaymentsNotification(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isPaymentsRequestToActivate(J)Z
-HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isPendingInsecureSmsFallbackType(J)Z
-HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isPendingMessageType(J)Z
-HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isPendingSecureSmsFallbackType(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isProfileChange(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isPushType(J)Z
-HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isRateLimited(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isReportedSpam(J)Z
-HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isSecureType(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isSessionSwitchoverType(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isSmsExport(J)Z
 HSPLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isStoryReaction(J)Z
@@ -23562,8 +23213,8 @@ HSPLorg/thoughtcrime/securesms/database/ReactionTable$Companion;-><init>(Lkotlin
 HSPLorg/thoughtcrime/securesms/database/ReactionTable;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/ReactionTable;-><init>(Landroid/content/Context;Lorg/thoughtcrime/securesms/database/SignalDatabase;)V
 HSPLorg/thoughtcrime/securesms/database/ReactionTable;->getReactionsForMessages(Ljava/util/Collection;)Ljava/util/Map;
-HSPLorg/thoughtcrime/securesms/database/RecipientTable$$ExternalSyntheticLambda1;-><init>()V
-HSPLorg/thoughtcrime/securesms/database/RecipientTable$$ExternalSyntheticLambda1;->run()V
+HSPLorg/thoughtcrime/securesms/database/RecipientTable$$ExternalSyntheticLambda5;-><init>()V
+HSPLorg/thoughtcrime/securesms/database/RecipientTable$$ExternalSyntheticLambda5;->run()V
 HSPLorg/thoughtcrime/securesms/database/RecipientTable$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/database/RecipientTable$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/database/RecipientTable$Companion;->maskCapabilitiesToLong(Lorg/whispersystems/signalservice/api/profiles/SignalServiceProfile$Capabilities;)J
@@ -23637,12 +23288,12 @@ HSPLorg/thoughtcrime/securesms/database/RecipientTable$VibrateState;->getId()I
 HSPLorg/thoughtcrime/securesms/database/RecipientTable$VibrateState;->values()[Lorg/thoughtcrime/securesms/database/RecipientTable$VibrateState;
 HSPLorg/thoughtcrime/securesms/database/RecipientTable$getAndPossiblyMerge$3$$ExternalSyntheticLambda0;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;)V
 HSPLorg/thoughtcrime/securesms/database/RecipientTable$getAndPossiblyMerge$3$$ExternalSyntheticLambda0;->run()V
-HSPLorg/thoughtcrime/securesms/database/RecipientTable$getAndPossiblyMerge$3;->$r8$lambda$VUPjpJzVVE8vlQGmPfSlIlqx-mg(Lkotlin/jvm/internal/Ref$ObjectRef;)V
+HSPLorg/thoughtcrime/securesms/database/RecipientTable$getAndPossiblyMerge$3;->$r8$lambda$EEbZqopud2nN-hQ-YgUhu_wCeWY(Lkotlin/jvm/internal/Ref$ObjectRef;)V
 HSPLorg/thoughtcrime/securesms/database/RecipientTable$getAndPossiblyMerge$3;-><init>(Lkotlin/jvm/internal/Ref$ObjectRef;Lorg/thoughtcrime/securesms/database/RecipientTable;Ljava/lang/String;Lorg/whispersystems/signalservice/api/push/ServiceId$PNI;Lorg/whispersystems/signalservice/api/push/ServiceId$ACI;ZZLorg/thoughtcrime/securesms/database/SQLiteDatabase;)V
 HSPLorg/thoughtcrime/securesms/database/RecipientTable$getAndPossiblyMerge$3;->invoke$lambda$2(Lkotlin/jvm/internal/Ref$ObjectRef;)V
 HSPLorg/thoughtcrime/securesms/database/RecipientTable$getAndPossiblyMerge$3;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/database/RecipientTable$getAndPossiblyMerge$3;->invoke(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;)V
-HSPLorg/thoughtcrime/securesms/database/RecipientTable;->$r8$lambda$aWzIz5YHb9jNapMRCuQVry5PhmE()V
+HSPLorg/thoughtcrime/securesms/database/RecipientTable;->$r8$lambda$jhzJSFSkBWDfsqk2EJwOGWqyvSk()V
 HSPLorg/thoughtcrime/securesms/database/RecipientTable;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/RecipientTable;-><init>(Landroid/content/Context;Lorg/thoughtcrime/securesms/database/SignalDatabase;)V
 HSPLorg/thoughtcrime/securesms/database/RecipientTable;->buildContentValuesForNewUser(Ljava/lang/String;Lorg/whispersystems/signalservice/api/push/ServiceId$PNI;Lorg/whispersystems/signalservice/api/push/ServiceId$ACI;Z)Landroid/content/ContentValues;
@@ -23698,12 +23349,13 @@ HSPLorg/thoughtcrime/securesms/database/RecipientTableCursorUtil$getSyncExtras$5
 HSPLorg/thoughtcrime/securesms/database/RecipientTableCursorUtil$getSyncExtras$5;-><init>()V
 HSPLorg/thoughtcrime/securesms/database/RecipientTableCursorUtil$getSyncExtras$5;->invoke(I)Ljava/lang/Boolean;
 HSPLorg/thoughtcrime/securesms/database/RecipientTableCursorUtil$getSyncExtras$5;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/database/RecipientTableCursorUtil;->$r8$lambda$SZDnYaDAB9DrkxazGttwF3vWx5o(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Ljava/lang/Boolean;
+HSPLorg/thoughtcrime/securesms/database/RecipientTableCursorUtil;->$r8$lambda$ZGKEbLbSrEb43JhRmlfDmCjdSJg(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Ljava/lang/Boolean;
 HSPLorg/thoughtcrime/securesms/database/RecipientTableCursorUtil;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/RecipientTableCursorUtil;-><init>()V
 HSPLorg/thoughtcrime/securesms/database/RecipientTableCursorUtil;->getExtras(Landroid/database/Cursor;)Lorg/thoughtcrime/securesms/recipients/Recipient$Extras;
 HSPLorg/thoughtcrime/securesms/database/RecipientTableCursorUtil;->getRecipientExtras(Landroid/database/Cursor;)Lorg/thoughtcrime/securesms/database/model/databaseprotos/RecipientExtras;
 HSPLorg/thoughtcrime/securesms/database/RecipientTableCursorUtil;->getRecord(Landroid/content/Context;Landroid/database/Cursor;)Lorg/thoughtcrime/securesms/database/model/RecipientRecord;
+HSPLorg/thoughtcrime/securesms/database/RecipientTableCursorUtil;->getRecord(Landroid/content/Context;Landroid/database/Cursor;Ljava/lang/String;)Lorg/thoughtcrime/securesms/database/model/RecipientRecord;
 HSPLorg/thoughtcrime/securesms/database/RecipientTableCursorUtil;->getSyncExtras$lambda$6(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Ljava/lang/Boolean;
 HSPLorg/thoughtcrime/securesms/database/RecipientTableCursorUtil;->parseBadgeList([B)Ljava/util/List;
 HSPLorg/thoughtcrime/securesms/database/RecipientTableCursorUtil;->readCapabilities(Landroid/database/Cursor;)Lorg/thoughtcrime/securesms/database/model/RecipientRecord$Capabilities;
@@ -23716,9 +23368,9 @@ HSPLorg/thoughtcrime/securesms/database/RemoteMegaphoneTable$Companion;-><init>(
 HSPLorg/thoughtcrime/securesms/database/RemoteMegaphoneTable;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/RemoteMegaphoneTable;-><init>(Landroid/content/Context;Lorg/thoughtcrime/securesms/database/SignalDatabase;)V
 HSPLorg/thoughtcrime/securesms/database/RemoteMegaphoneTable;->getPotentialMegaphonesAndClearOld(J)Ljava/util/List;
-HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver$$ExternalSyntheticLambda0;-><init>(Lkotlin/jvm/functions/Function1;)V
-HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver$$ExternalSyntheticLambda0;->subscribe(Lio/reactivex/rxjava3/core/FlowableEmitter;)V
-HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/database/RxDatabaseObserver$RxObserver;)V
+HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/database/RxDatabaseObserver$RxObserver;)V
+HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver$$ExternalSyntheticLambda1;-><init>(Lkotlin/jvm/functions/Function1;)V
+HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver$$ExternalSyntheticLambda1;->subscribe(Lio/reactivex/rxjava3/core/FlowableEmitter;)V
 HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver$RxObserver;-><init>(Lio/reactivex/rxjava3/core/Emitter;)V
 HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver$RxObserver;->onChanged()V
 HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver$RxObserver;->prime()V
@@ -23745,7 +23397,7 @@ HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver$notificationProfilesF
 HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver$notificationProfilesFlowable$2;-><init>()V
 HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver$notificationProfilesFlowable$2;->apply(JLkotlin/Unit;)V
 HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver$notificationProfilesFlowable$2;->apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver;->$r8$lambda$7EpXxRd-kg2ILxDRdunSBwL5fzs(Lkotlin/jvm/functions/Function1;Lio/reactivex/rxjava3/core/FlowableEmitter;)V
+HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver;->$r8$lambda$Q-MHO-3EVj6lQ5qvnI2O-7YevNQ(Lkotlin/jvm/functions/Function1;Lio/reactivex/rxjava3/core/FlowableEmitter;)V
 HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver;-><init>()V
 HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver;->access$conversationListFlowable(Lorg/thoughtcrime/securesms/database/RxDatabaseObserver;)Lio/reactivex/rxjava3/core/Flowable;
@@ -23757,36 +23409,36 @@ HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver;->databaseFlowable(Lk
 HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver;->getConversationList()Lio/reactivex/rxjava3/core/Flowable;
 HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver;->getNotificationProfiles()Lio/reactivex/rxjava3/core/Flowable;
 HSPLorg/thoughtcrime/securesms/database/RxDatabaseObserver;->notificationProfilesFlowable()Lio/reactivex/rxjava3/core/Flowable;
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;I)V
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda0;->run()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda10;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;)V
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda10;->run()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda11;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;I)V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda0;-><init>(Lnet/zetetic/database/sqlcipher/SQLiteDatabase;)V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda0;->run()V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda11;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda11;->run()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda12;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda12;->run()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda13;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda13;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;I)V
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda13;->run()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda14;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/String;)V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda14;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda14;->run()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda15;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda15;->run()V
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda17;-><init>(Lnet/zetetic/database/sqlcipher/SQLiteDatabase;)V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda16;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda16;->run()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda17;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda17;->run()V
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda18;-><init>(Lnet/zetetic/database/sqlcipher/SQLiteDatabase;)V
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda18;->run()V
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda19;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;)V
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda19;->run()V
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda21;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;)V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda1;->run()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda21;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda21;->run()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda3;-><init>(Lnet/zetetic/database/sqlcipher/SQLiteDatabase;)V
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda3;->run()V
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda22;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;I)V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda22;->run()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda3;->run()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;)V
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda4;->run()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda5;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;)V
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda5;->run()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda7;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda7;->run()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda5;-><init>(Lnet/zetetic/database/sqlcipher/SQLiteDatabase;)V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda5;->run()V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda6;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;)V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda6;->run()V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda8;-><init>(Lnet/zetetic/database/sqlcipher/SQLiteDatabase;)V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda8;->run()V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda9;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;)V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda9;->run()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$1;-><init>(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;)V
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$1;->onBegin()V
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$1;->onCommit()V
@@ -23794,18 +23446,18 @@ HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$DedupedRunnable;-><init>(
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$DedupedRunnable;->equals(Ljava/lang/Object;)Z
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$DedupedRunnable;->hashCode()I
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase$DedupedRunnable;->run()V
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$7et4tsAJDomDbG3nqETNrQR4y2U(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/Integer;
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$84ZUkaSnUYQbzaFgbcLYU2GbgN4(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/Object;)Landroid/database/Cursor;
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$EPMfo6df3cgR6BCZ-hqCIN4Oqlo(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/String;)Landroid/database/Cursor;
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$M2dGB_vmS-aoBgck2zt6F2h6rb4(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/Integer;
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$OJ_GKl5ualt7sxHCS71OACqaPgE(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$PFumX8gsMH0Yn0ZTdDId1_9oWEA(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$eBR4RIjrRyyBXYMF_BA_zlT3YmA(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;)Ljava/lang/Long;
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$eBy5mr7cGwpaGfif6XwVCAPWl_A(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$sxX_UsW8CfX4XRG8LVaHjNlCyVA(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;I)Ljava/lang/Long;
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$thWq-xMSB79IwmaAnXhLQP0hKPM(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;I)Ljava/lang/Integer;
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$vPyhxG_ElC05RJ7ryrRg9Q0v8aM(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;)Ljava/lang/Long;
-HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$vjnQWRLg38ZS9Tmuk7av0eZ4AQY(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;)V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$63Fe22gM04vRs0Lck4IAEYvS3K8(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/String;)Landroid/database/Cursor;
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$9D7KAq9NCczrpmSVEkO_XUhPe2s(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/Object;)Landroid/database/Cursor;
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$9QKARmS1NrWLhiTs3jy3h35k3cg(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;)Ljava/lang/Long;
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$FAm5jDhBcoiLSdkNNftoR0AhNUc(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/Integer;
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$PyA2iFvYVAY63tfugnLHzewdsY4(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;I)Ljava/lang/Long;
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$ktrfKV1b6h-vFBRNFRCPFx5_4Zo(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$qx1dYAO84QSSLaHe5_pqljq0bWk(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;I)Ljava/lang/Integer;
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$rYLTDWeVtTxUHcUFh9f2udi_ldo(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;)V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$tg3UkoqWBLpZ9bZdovlBQ_xyUBo(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$tw0Fv9xDoZzgnkzgX2fwZPNTwog(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/Integer;
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$wsAFLU6031Ostah-pKfCVT3V2To(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->$r8$lambda$xWPWYdzmp19Dp68cLtHDT31WH4g(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;Ljava/lang/String;Landroid/content/ContentValues;)Ljava/lang/Long;
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->-$$Nest$mgetPendingPostSuccessfulTransactionTasks(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;)Ljava/util/Set;
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->-$$Nest$mgetPostSuccessfulTransactionTasks(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;)Ljava/util/Set;
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;-><clinit>()V
@@ -23843,6 +23495,8 @@ HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->runPostSuccessfulTransa
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->runPostSuccessfulTransaction(Ljava/lang/String;Ljava/lang/Runnable;)V
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->setTransactionSuccessful()V
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->trace(Ljava/lang/String;Ljava/lang/Runnable;)V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->traceLockStart()V
+HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->traceSql(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLorg/thoughtcrime/securesms/database/SQLiteDatabase$Returnable;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->traceSql(Ljava/lang/String;Ljava/lang/String;ZLjava/lang/Runnable;)V
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->traceSql(Ljava/lang/String;Ljava/lang/String;ZLorg/thoughtcrime/securesms/database/SQLiteDatabase$Returnable;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/database/SQLiteDatabase;->update(Ljava/lang/String;ILandroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/Object;)I
@@ -23880,6 +23534,7 @@ HSPLorg/thoughtcrime/securesms/database/SignalDatabase$Companion;->getRawDatabas
 HSPLorg/thoughtcrime/securesms/database/SignalDatabase$Companion;->groups()Lorg/thoughtcrime/securesms/database/GroupTable;
 HSPLorg/thoughtcrime/securesms/database/SignalDatabase$Companion;->hasTable(Ljava/lang/String;)Z
 HSPLorg/thoughtcrime/securesms/database/SignalDatabase$Companion;->identities()Lorg/thoughtcrime/securesms/database/IdentityTable;
+HSPLorg/thoughtcrime/securesms/database/SignalDatabase$Companion;->inAppPayments()Lorg/thoughtcrime/securesms/database/InAppPaymentTable;
 HSPLorg/thoughtcrime/securesms/database/SignalDatabase$Companion;->inTransaction()Z
 HSPLorg/thoughtcrime/securesms/database/SignalDatabase$Companion;->init(Landroid/app/Application;Lorg/thoughtcrime/securesms/crypto/DatabaseSecret;Lorg/thoughtcrime/securesms/crypto/AttachmentSecret;)V
 HSPLorg/thoughtcrime/securesms/database/SignalDatabase$Companion;->kyberPreKeys()Lorg/thoughtcrime/securesms/database/KyberPreKeyTable;
@@ -23916,6 +23571,7 @@ HSPLorg/thoughtcrime/securesms/database/SignalDatabase;->getDraftTable()Lorg/tho
 HSPLorg/thoughtcrime/securesms/database/SignalDatabase;->getEmojiSearchTable()Lorg/thoughtcrime/securesms/database/EmojiSearchTable;
 HSPLorg/thoughtcrime/securesms/database/SignalDatabase;->getGroupTable()Lorg/thoughtcrime/securesms/database/GroupTable;
 HSPLorg/thoughtcrime/securesms/database/SignalDatabase;->getIdentityTable()Lorg/thoughtcrime/securesms/database/IdentityTable;
+HSPLorg/thoughtcrime/securesms/database/SignalDatabase;->getInAppPaymentTable()Lorg/thoughtcrime/securesms/database/InAppPaymentTable;
 HSPLorg/thoughtcrime/securesms/database/SignalDatabase;->getKyberPreKeyTable()Lorg/thoughtcrime/securesms/database/KyberPreKeyTable;
 HSPLorg/thoughtcrime/securesms/database/SignalDatabase;->getMentionTable()Lorg/thoughtcrime/securesms/database/MentionTable;
 HSPLorg/thoughtcrime/securesms/database/SignalDatabase;->getMessageSendLogTables()Lorg/thoughtcrime/securesms/database/MessageSendLogTables;
@@ -23974,9 +23630,17 @@ HSPLorg/thoughtcrime/securesms/database/SqlCipherErrorHandler;-><init>(Ljava/lan
 HSPLorg/thoughtcrime/securesms/database/SqlCipherLibraryLoader;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/SqlCipherLibraryLoader;-><init>()V
 HSPLorg/thoughtcrime/securesms/database/SqlCipherLibraryLoader;->load()V
+HSPLorg/thoughtcrime/securesms/database/StickerTable$StickerPackRecordReader;-><init>(Landroid/database/Cursor;)V
+HSPLorg/thoughtcrime/securesms/database/StickerTable$StickerPackRecordReader;->getNext()Lorg/thoughtcrime/securesms/database/model/StickerPackRecord;
 HSPLorg/thoughtcrime/securesms/database/StickerTable;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/StickerTable;-><init>(Landroid/content/Context;Lorg/thoughtcrime/securesms/database/SignalDatabase;Lorg/thoughtcrime/securesms/crypto/AttachmentSecret;)V
+HSPLorg/thoughtcrime/securesms/database/StickerTable;->deleteOrphanedPacks()V
+HSPLorg/thoughtcrime/securesms/database/StickerTable;->deleteStickersInPackExceptCover(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/database/StickerTable;->getAllStickerPacks(Ljava/lang/String;)Landroid/database/Cursor;
+HSPLorg/thoughtcrime/securesms/database/StickerTable;->getStickerPack(Ljava/lang/String;)Lorg/thoughtcrime/securesms/database/model/StickerPackRecord;
+HSPLorg/thoughtcrime/securesms/database/StickerTable;->isPackAvailableAsReference(Ljava/lang/String;)Z
+HSPLorg/thoughtcrime/securesms/database/StickerTable;->uninstallPack(Ljava/lang/String;)V
+HSPLorg/thoughtcrime/securesms/database/StickerTable;->updatePackInstalled(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;Ljava/lang/String;ZZ)V
 HSPLorg/thoughtcrime/securesms/database/StorySendTable$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/database/StorySendTable$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/database/StorySendTable;-><clinit>()V
@@ -24039,7 +23703,6 @@ HSPLorg/thoughtcrime/securesms/database/ThreadTable$update$1$isPinned$2;-><init>
 HSPLorg/thoughtcrime/securesms/database/ThreadTable$update$1$shouldDelete$2;-><init>(ZJLkotlin/Lazy;)V
 HSPLorg/thoughtcrime/securesms/database/ThreadTable$update$1;-><init>(JLorg/thoughtcrime/securesms/database/ThreadTable;ZZZ)V
 HSPLorg/thoughtcrime/securesms/database/ThreadTable$update$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/database/ThreadTable$update$1;->invoke(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;)Ljava/lang/Boolean;
 HSPLorg/thoughtcrime/securesms/database/ThreadTable;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/ThreadTable;-><init>(Landroid/content/Context;Lorg/thoughtcrime/securesms/database/SignalDatabase;)V
 HSPLorg/thoughtcrime/securesms/database/ThreadTable;->access$createThreadForRecipient(Lorg/thoughtcrime/securesms/database/ThreadTable;Lorg/thoughtcrime/securesms/recipients/RecipientId;ZI)J
@@ -24091,6 +23754,7 @@ HSPLorg/thoughtcrime/securesms/database/helpers/migration/V149_LegacyMigrations$
 HSPLorg/thoughtcrime/securesms/database/helpers/migration/V149_LegacyMigrations$$ExternalSyntheticApiModelOutline20;->m(Ljava/lang/Object;)Landroid/app/NotificationChannel;
 HSPLorg/thoughtcrime/securesms/database/helpers/migration/V149_LegacyMigrations$$ExternalSyntheticApiModelOutline21;->m(Landroid/app/NotificationManager;Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/database/helpers/migration/V149_LegacyMigrations$$ExternalSyntheticApiModelOutline22;->m(Landroid/app/NotificationChannel;)I
+HSPLorg/thoughtcrime/securesms/database/helpers/migration/V149_LegacyMigrations$$ExternalSyntheticApiModelOutline23;->m()V
 HSPLorg/thoughtcrime/securesms/database/helpers/migration/V149_LegacyMigrations$$ExternalSyntheticApiModelOutline3;->m(Landroid/app/NotificationChannel;Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/database/helpers/migration/V149_LegacyMigrations$$ExternalSyntheticApiModelOutline6;->m(Landroid/app/NotificationChannel;Landroid/net/Uri;Landroid/media/AudioAttributes;)V
 HSPLorg/thoughtcrime/securesms/database/identity/IdentityRecordList;-><clinit>()V
@@ -24119,7 +23783,6 @@ HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isCallLog()Z
 HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isChangeNumber()Z
 HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isEndSession()Z
 HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isExpirationTimerUpdate()Z
-HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isFailed()Z
 HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isGroupAction()Z
 HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isGroupCall()Z
 HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isGroupQuit()Z
@@ -24127,7 +23790,6 @@ HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isGroupUpdate()Z
 HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isIncomingAudioCall()Z
 HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isIncomingVideoCall()Z
 HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isJoined()Z
-HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isKeyExchange()Z
 HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isMessageRequestAccepted()Z
 HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isMissedAudioCall()Z
 HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isMissedVideoCall()Z
@@ -24135,9 +23797,9 @@ HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isOutgoing()Z
 HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isOutgoingAudioCall()Z
 HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isOutgoingVideoCall()Z
 HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isPaymentNotification()Z
+HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isPaymentTombstone()Z
 HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isPaymentsActivated()Z
 HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isPaymentsRequestToActivate()Z
-HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isPending()Z
 HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isProfileChange()Z
 HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isReportedSpam()Z
 HSPLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isViewed()Z
@@ -24162,15 +23824,21 @@ HSPLorg/thoughtcrime/securesms/database/model/IdentityRecord;->getVerifiedStatus
 HSPLorg/thoughtcrime/securesms/database/model/IdentityStoreRecord;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/model/IdentityStoreRecord;-><init>(Ljava/lang/String;Lorg/signal/libsignal/protocol/IdentityKey;Lorg/thoughtcrime/securesms/database/IdentityTable$VerifiedStatus;ZJZ)V
 HSPLorg/thoughtcrime/securesms/database/model/IdentityStoreRecord;->toIdentityRecord(Lorg/thoughtcrime/securesms/recipients/RecipientId;)Lorg/thoughtcrime/securesms/database/model/IdentityRecord;
+HSPLorg/thoughtcrime/securesms/database/model/InAppPaymentSubscriberRecord$Type;->$values()[Lorg/thoughtcrime/securesms/database/model/InAppPaymentSubscriberRecord$Type;
+HSPLorg/thoughtcrime/securesms/database/model/InAppPaymentSubscriberRecord$Type;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/database/model/InAppPaymentSubscriberRecord$Type;-><init>(Ljava/lang/String;IILjava/lang/String;Lorg/thoughtcrime/securesms/database/InAppPaymentTable$Type;)V
+HSPLorg/thoughtcrime/securesms/database/model/InAppPaymentSubscriberRecord$Type;->getCode()I
+HSPLorg/thoughtcrime/securesms/database/model/InAppPaymentSubscriberRecord$Type;->getJobQueue()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/database/model/LocalMetricsEvent$WhenMappings;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/model/LocalMetricsEvent;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/database/model/LocalMetricsEvent;-><init>(JLjava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/concurrent/TimeUnit;)V
+HSPLorg/thoughtcrime/securesms/database/model/LocalMetricsEvent;-><init>(JLjava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/concurrent/TimeUnit;Ljava/lang/String;)V
+HSPLorg/thoughtcrime/securesms/database/model/LocalMetricsEvent;-><init>(JLjava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/concurrent/TimeUnit;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/database/model/LocalMetricsEvent;->fractionalMillis(JLjava/util/concurrent/TimeUnit;)Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/database/model/LocalMetricsEvent;->getCreatedAt()J
 HSPLorg/thoughtcrime/securesms/database/model/LocalMetricsEvent;->getEventId()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/database/model/LocalMetricsEvent;->getEventName()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/database/model/LocalMetricsEvent;->getSplits()Ljava/util/List;
-HSPLorg/thoughtcrime/securesms/database/model/LocalMetricsEvent;->getTimeunit()Ljava/util/concurrent/TimeUnit;
+HSPLorg/thoughtcrime/securesms/database/model/LocalMetricsEvent;->getTimeUnit()Ljava/util/concurrent/TimeUnit;
 HSPLorg/thoughtcrime/securesms/database/model/LocalMetricsEvent;->toString()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/database/model/LocalMetricsSplit$WhenMappings;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/model/LocalMetricsSplit;-><clinit>()V
@@ -24218,7 +23886,6 @@ HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->getType()J
 HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->getUpdateDisplayBody(Landroid/content/Context;Lj$/util/function/Consumer;)Lorg/thoughtcrime/securesms/database/model/UpdateDescription;
 HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->hashCode()I
 HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isBadDecryptType()Z
-HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isBundleKeyExchange()Z
 HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isChatSessionRefresh()Z
 HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isDisplayBodyEmpty(Landroid/content/Context;)Z
 HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isEditMessage()Z
@@ -24226,20 +23893,17 @@ HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isGroupV1Migration
 HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isIdentityDefault()Z
 HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isIdentityUpdate()Z
 HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isIdentityVerified()Z
-HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isJumbomoji(Landroid/content/Context;)Z
 HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isLegacyMessage()Z
 HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isPush()Z
-HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isRateLimited()Z
 HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isRemoteDelete()Z
-HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isSecure()Z
 HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isSessionSwitchoverEventType()Z
 HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isSmsExportType()Z
 HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isThreadMergeEventType()Z
 HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isUnidentified()Z
 HSPLorg/thoughtcrime/securesms/database/model/MessageRecord;->isUpdate()Z
 HSPLorg/thoughtcrime/securesms/database/model/MessageRecordExtensionsKt;->withAttachments(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Ljava/util/List;)Lorg/thoughtcrime/securesms/database/model/MessageRecord;
+HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord$$ExternalSyntheticLambda0;-><init>(Ljava/util/Map;)V
 HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord$$ExternalSyntheticLambda1;-><init>(Ljava/util/Map;)V
-HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord$$ExternalSyntheticLambda2;-><init>(Ljava/util/Map;)V
 HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord$$ExternalSyntheticLambda3;-><init>()V
 HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord$$ExternalSyntheticLambda4;-><init>()V
 HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord$$ExternalSyntheticLambda5;-><init>()V
@@ -24249,8 +23913,8 @@ HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord$$ExternalSyntheti
 HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord$$ExternalSyntheticLambda8;->test(Ljava/lang/Object;)Z
 HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord$$ExternalSyntheticLambda9;-><init>(Ljava/util/Set;)V
 HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord$$ExternalSyntheticLambda9;->test(Ljava/lang/Object;)Z
-HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord;->$r8$lambda$61cfVwuT9NopES3EvrpU58ByOrs(Ljava/util/Set;Lorg/thoughtcrime/securesms/attachments/DatabaseAttachment;)Z
-HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord;->$r8$lambda$yFErtnyhgG1o4FUJh3c90u9IkrI(Ljava/util/Set;Lorg/thoughtcrime/securesms/attachments/DatabaseAttachment;)Z
+HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord;->$r8$lambda$YgOhn_yZ3URCWv9eqDWRhugqOuo(Ljava/util/Set;Lorg/thoughtcrime/securesms/attachments/DatabaseAttachment;)Z
+HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord;->$r8$lambda$bAahgoNJhTHNLJYtKZo1DK6xfFU(Ljava/util/Set;Lorg/thoughtcrime/securesms/attachments/DatabaseAttachment;)Z
 HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord;-><init>(JLorg/thoughtcrime/securesms/recipients/Recipient;ILorg/thoughtcrime/securesms/recipients/Recipient;JJJZJLjava/lang/String;Lorg/thoughtcrime/securesms/mms/SlideDeck;JLjava/util/Set;Ljava/util/Set;IJJZZLorg/thoughtcrime/securesms/database/model/Quote;Ljava/util/List;Ljava/util/List;ZLjava/util/List;ZZJZJLorg/thoughtcrime/securesms/database/model/databaseprotos/BodyRangeList;Lorg/thoughtcrime/securesms/database/model/StoryType;Lorg/thoughtcrime/securesms/database/model/ParentStoryId;Lorg/thoughtcrime/securesms/database/model/databaseprotos/GiftBadge;Lorg/thoughtcrime/securesms/payments/Payment;Lorg/thoughtcrime/securesms/database/CallTable$Call;JLorg/thoughtcrime/securesms/database/model/MessageId;Lorg/thoughtcrime/securesms/database/model/MessageId;IZLorg/thoughtcrime/securesms/database/model/databaseprotos/MessageExtras;)V
 HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord;->getCall()Lorg/thoughtcrime/securesms/database/CallTable$Call;
@@ -24267,7 +23931,6 @@ HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord;->getSharedContac
 HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord;->getSlideDeck()Lorg/thoughtcrime/securesms/mms/SlideDeck;
 HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord;->getStoryType()Lorg/thoughtcrime/securesms/database/model/StoryType;
 HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord;->getUpdateDisplayBody(Landroid/content/Context;Lj$/util/function/Consumer;)Lorg/thoughtcrime/securesms/database/model/UpdateDescription;
-HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord;->isMediaPending()Z
 HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord;->isMms()Z
 HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord;->isMmsNotification()Z
 HSPLorg/thoughtcrime/securesms/database/model/MmsMessageRecord;->isRead()Z
@@ -24360,24 +24023,20 @@ HSPLorg/thoughtcrime/securesms/database/model/StoryType;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/model/StoryType;-><init>(Ljava/lang/String;II)V
 HSPLorg/thoughtcrime/securesms/database/model/StoryType;->getCode()I
 HSPLorg/thoughtcrime/securesms/database/model/StoryType;->isStory()Z
-HSPLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
-HSPLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion$$ExternalSyntheticLambda1;->subscribe(Lio/reactivex/rxjava3/core/ObservableEmitter;)V
-HSPLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion$$ExternalSyntheticLambda2;-><init>(Lio/reactivex/rxjava3/core/ObservableEmitter;Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
-HSPLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
-HSPLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion$$ExternalSyntheticLambda3;->cancel()V
-HSPLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion;->$r8$lambda$_YM1i9V93JIKhbRirbAeb_98VJw(Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
-HSPLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion;->$r8$lambda$qlVsO3gJogFXwiR82wyUg4D6NdU(Lorg/thoughtcrime/securesms/recipients/RecipientId;Lio/reactivex/rxjava3/core/ObservableEmitter;)V
+HSPLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion$$ExternalSyntheticLambda0;-><init>(Lio/reactivex/rxjava3/core/ObservableEmitter;Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
+HSPLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+HSPLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
+HSPLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion$$ExternalSyntheticLambda3;->subscribe(Lio/reactivex/rxjava3/core/ObservableEmitter;)V
+HSPLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion;->$r8$lambda$7Nera3phCgEkgtpK6CkPU19Nsus(Lorg/thoughtcrime/securesms/recipients/RecipientId;Lio/reactivex/rxjava3/core/ObservableEmitter;)V
 HSPLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion;->getForRecipientId(Lorg/thoughtcrime/securesms/recipients/RecipientId;)Lio/reactivex/rxjava3/core/Observable;
-HSPLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion;->getState$lambda$3$lambda$2(Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
 HSPLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion;->getState$lambda$3$refresh(Lio/reactivex/rxjava3/core/ObservableEmitter;Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
 HSPLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion;->getState$lambda$3(Lorg/thoughtcrime/securesms/recipients/RecipientId;Lio/reactivex/rxjava3/core/ObservableEmitter;)V
 HSPLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion;->getState(Lorg/thoughtcrime/securesms/recipients/RecipientId;)Lio/reactivex/rxjava3/core/Observable;
 HSPLorg/thoughtcrime/securesms/database/model/StoryViewState;->$values()[Lorg/thoughtcrime/securesms/database/model/StoryViewState;
 HSPLorg/thoughtcrime/securesms/database/model/StoryViewState;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/database/model/StoryViewState;-><init>(Ljava/lang/String;I)V
-HSPLorg/thoughtcrime/securesms/database/model/StoryViewState;->values()[Lorg/thoughtcrime/securesms/database/model/StoryViewState;
 HSPLorg/thoughtcrime/securesms/database/model/ThreadRecord$Builder;->-$$Nest$fgetarchived(Lorg/thoughtcrime/securesms/database/model/ThreadRecord$Builder;)Z
 HSPLorg/thoughtcrime/securesms/database/model/ThreadRecord$Builder;->-$$Nest$fgetbody(Lorg/thoughtcrime/securesms/database/model/ThreadRecord$Builder;)Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/database/model/ThreadRecord$Builder;->-$$Nest$fgetcontentType(Lorg/thoughtcrime/securesms/database/model/ThreadRecord$Builder;)Ljava/lang/String;
@@ -24423,7 +24082,6 @@ HSPLorg/thoughtcrime/securesms/database/model/ThreadRecord$Builder;->setUnreadCo
 HSPLorg/thoughtcrime/securesms/database/model/ThreadRecord$Builder;->setUnreadSelfMentionsCount(I)Lorg/thoughtcrime/securesms/database/model/ThreadRecord$Builder;
 HSPLorg/thoughtcrime/securesms/database/model/ThreadRecord;-><init>(Lorg/thoughtcrime/securesms/database/model/ThreadRecord$Builder;)V
 HSPLorg/thoughtcrime/securesms/database/model/ThreadRecord;-><init>(Lorg/thoughtcrime/securesms/database/model/ThreadRecord$Builder;Lorg/thoughtcrime/securesms/database/model/ThreadRecord-IA;)V
-HSPLorg/thoughtcrime/securesms/database/model/ThreadRecord;->equals(Ljava/lang/Object;)Z
 HSPLorg/thoughtcrime/securesms/database/model/ThreadRecord;->getBody()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/database/model/ThreadRecord;->getBodyRanges()Lorg/thoughtcrime/securesms/database/model/databaseprotos/BodyRangeList;
 HSPLorg/thoughtcrime/securesms/database/model/ThreadRecord;->getDate()J
@@ -24446,8 +24104,6 @@ HSPLorg/thoughtcrime/securesms/database/model/databaseprotos/PendingOneTimeDonat
 HSPLorg/thoughtcrime/securesms/database/model/databaseprotos/PendingOneTimeDonation$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/database/model/databaseprotos/PendingOneTimeDonation$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/database/model/databaseprotos/PendingOneTimeDonation;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/databinding/ConversationHeaderViewBinding;-><init>(Landroid/view/View;Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;Lorg/thoughtcrime/securesms/components/AvatarImageView;Landroid/widget/LinearLayout;Lorg/thoughtcrime/securesms/badges/BadgeImageView;Lcom/google/android/material/button/MaterialButton;Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;Landroid/view/View;Landroidx/constraintlayout/widget/ConstraintLayout;Landroid/view/View;Landroid/widget/TextView;Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;)V
-HSPLorg/thoughtcrime/securesms/databinding/ConversationHeaderViewBinding;->bind(Landroid/view/View;)Lorg/thoughtcrime/securesms/databinding/ConversationHeaderViewBinding;
 HSPLorg/thoughtcrime/securesms/databinding/ConversationInputPanelBinding;-><init>(Lorg/thoughtcrime/securesms/components/InputPanel;Landroid/widget/ImageButton;Landroidx/constraintlayout/widget/Barrier;Lorg/thoughtcrime/securesms/components/InputPanel;Lorg/thoughtcrime/securesms/components/AnimatingToggle;Landroid/view/View;Landroidx/constraintlayout/widget/Barrier;Lcom/google/android/material/imageview/ShapeableImageView;Landroidx/appcompat/widget/AppCompatTextView;Lorg/thoughtcrime/securesms/components/ComposeText;Lorg/thoughtcrime/securesms/components/emoji/EmojiToggle;Landroid/widget/ImageButton;Lorg/thoughtcrime/securesms/components/HidingLinearLayout;Landroidx/appcompat/widget/AppCompatImageButton;Landroidx/recyclerview/widget/RecyclerView;Lorg/thoughtcrime/securesms/components/LinkPreviewView;Lorg/thoughtcrime/securesms/components/HidingLinearLayout;Landroid/widget/ImageButton;Lorg/thoughtcrime/securesms/components/QuoteView;Lorg/thoughtcrime/securesms/components/MicrophoneRecorderView;Lorg/thoughtcrime/securesms/components/SendButton;Landroid/widget/ImageButton;Lorg/thoughtcrime/securesms/conversation/VoiceNoteDraftView;)V
 HSPLorg/thoughtcrime/securesms/databinding/ConversationInputPanelBinding;->bind(Landroid/view/View;)Lorg/thoughtcrime/securesms/databinding/ConversationInputPanelBinding;
 HSPLorg/thoughtcrime/securesms/databinding/ConversationInputPanelBinding;->getRoot()Lorg/thoughtcrime/securesms/components/InputPanel;
@@ -24461,54 +24117,136 @@ HSPLorg/thoughtcrime/securesms/databinding/ConversationSearchNavBinding;->bind(L
 HSPLorg/thoughtcrime/securesms/databinding/ConversationTitleViewBinding;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationTitleView;Lorg/thoughtcrime/securesms/badges/BadgeImageView;Landroid/widget/FrameLayout;Lorg/thoughtcrime/securesms/avatar/view/AvatarView;Lorg/thoughtcrime/securesms/conversation/ConversationTitleView;Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;Landroid/widget/LinearLayout;Lorg/thoughtcrime/securesms/components/FromTextView;Landroidx/appcompat/widget/AppCompatImageView;Landroid/widget/TextView;)V
 HSPLorg/thoughtcrime/securesms/databinding/ConversationTitleViewBinding;->bind(Landroid/view/View;)Lorg/thoughtcrime/securesms/databinding/ConversationTitleViewBinding;
 HSPLorg/thoughtcrime/securesms/databinding/ConversationTitleViewBinding;->getRoot()Lorg/thoughtcrime/securesms/conversation/ConversationTitleView;
-HSPLorg/thoughtcrime/securesms/databinding/TransferControlsViewBinding;-><init>(Landroid/view/View;Landroidx/constraintlayout/widget/Guideline;Landroidx/appcompat/widget/AppCompatImageView;Landroid/view/View;Landroid/widget/TextView;Lorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView;Landroid/view/View;Landroid/widget/TextView;Lorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView;Landroidx/constraintlayout/widget/Guideline;)V
-HSPLorg/thoughtcrime/securesms/databinding/TransferControlsViewBinding;->bind(Landroid/view/View;)Lorg/thoughtcrime/securesms/databinding/TransferControlsViewBinding;
-HSPLorg/thoughtcrime/securesms/databinding/TransferControlsViewBinding;->inflate(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/databinding/TransferControlsViewBinding;
+HSPLorg/thoughtcrime/securesms/databinding/OnboardingMegaphoneCardBinding;-><init>(Lcom/google/android/material/card/MaterialCardView;Landroid/widget/ImageView;Landroid/widget/ImageView;Landroid/widget/TextView;)V
+HSPLorg/thoughtcrime/securesms/databinding/OnboardingMegaphoneCardBinding;->bind(Landroid/view/View;)Lorg/thoughtcrime/securesms/databinding/OnboardingMegaphoneCardBinding;
+HSPLorg/thoughtcrime/securesms/databinding/OnboardingMegaphoneCardBinding;->getRoot()Lcom/google/android/material/card/MaterialCardView;
 HSPLorg/thoughtcrime/securesms/databinding/V2ConversationFragmentBinding;-><init>(Lorg/thoughtcrime/securesms/components/InputAwareConstraintLayout;Landroid/view/ViewStub;Landroid/view/View;Lorg/thoughtcrime/securesms/conversation/v2/ConversationBannerView;Landroid/widget/FrameLayout;Lorg/thoughtcrime/securesms/components/menu/SignalBottomActionBar;Landroidx/constraintlayout/widget/Barrier;Lorg/thoughtcrime/securesms/conversation/v2/DisabledInputView;Lcom/google/android/material/button/MaterialButton;Lorg/thoughtcrime/securesms/databinding/ConversationInputPanelBinding;Landroidx/constraintlayout/widget/Barrier;Landroid/widget/TextView;Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectRecyclerView;Landroid/widget/FrameLayout;Landroid/view/ViewStub;Lorg/thoughtcrime/securesms/databinding/ConversationSearchNavBinding;Lorg/thoughtcrime/securesms/databinding/ConversationTitleViewBinding;Landroid/widget/FrameLayout;Landroid/widget/ImageView;Landroid/view/View;Landroidx/fragment/app/FragmentContainerView;Landroidx/fragment/app/FragmentContainerView;Landroidx/fragment/app/FragmentContainerView;Landroid/widget/FrameLayout;Landroid/view/ViewStub;Landroid/view/ViewStub;Landroid/view/ViewStub;Landroid/widget/TextView;Lorg/thoughtcrime/securesms/components/ConversationScrollToView;Lorg/thoughtcrime/securesms/components/ConversationScrollToView;Lorg/thoughtcrime/securesms/util/views/DarkOverflowToolbar;Landroid/view/View;Landroid/view/ViewStub;Landroid/view/ViewStub;)V
 HSPLorg/thoughtcrime/securesms/databinding/V2ConversationFragmentBinding;->bind(Landroid/view/View;)Lorg/thoughtcrime/securesms/databinding/V2ConversationFragmentBinding;
-HSPLorg/thoughtcrime/securesms/databinding/V2ConversationItemTextOnlyIncomingBinding;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;Lorg/thoughtcrime/securesms/badges/BadgeImageView;Lorg/thoughtcrime/securesms/components/AvatarImageView;Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;Lorg/thoughtcrime/securesms/conversation/v2/items/ShrinkWrapLinearLayout;Lorg/thoughtcrime/securesms/components/ExpirationTimerView;Landroid/view/View;Landroid/widget/TextView;Lorg/thoughtcrime/securesms/reactions/ReactionsConversationView;Lcom/google/android/material/imageview/ShapeableImageView;Landroid/widget/Space;Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;)V
-HSPLorg/thoughtcrime/securesms/databinding/V2ConversationItemTextOnlyIncomingBinding;->bind(Landroid/view/View;)Lorg/thoughtcrime/securesms/databinding/V2ConversationItemTextOnlyIncomingBinding;
-HSPLorg/thoughtcrime/securesms/databinding/V2ConversationItemTextOnlyIncomingBinding;->getRoot()Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies$$ExternalSyntheticLambda0;-><init>()V
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies$$ExternalSyntheticLambda0;->get()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies$$ExternalSyntheticLambda1;-><init>()V
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->$r8$lambda$TTNxYGZvGlMOp1oidmVJeKiRxZs()Lorg/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->closeConnections()V
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getAppForegroundObserver()Lorg/thoughtcrime/securesms/util/AppForegroundObserver;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getApplication()Landroid/app/Application;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getDatabaseObserver()Lorg/thoughtcrime/securesms/database/DatabaseObserver;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getDeadlockDetector()Lorg/signal/core/util/concurrent/DeadlockDetector;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getDeletedCallEventManager()Lorg/thoughtcrime/securesms/service/DeletedCallEventManager;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getDonationsService()Lorg/whispersystems/signalservice/api/services/DonationsService;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getExoPlayerPool()Lorg/thoughtcrime/securesms/video/exo/ExoPlayerPool;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getExpireStoriesManager()Lorg/thoughtcrime/securesms/service/ExpiringStoriesManager;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getExpiringMessageManager()Lorg/thoughtcrime/securesms/service/ExpiringMessageManager;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getFrameRateTracker()Lorg/thoughtcrime/securesms/util/FrameRateTracker;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getGiphyMp4Cache()Lorg/thoughtcrime/securesms/video/exo/GiphyMp4Cache;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getGroupsV2Operations()Lorg/whispersystems/signalservice/api/groupsv2/GroupsV2Operations;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getIncomingMessageObserver()Lorg/thoughtcrime/securesms/messages/IncomingMessageObserver;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getJobManager()Lorg/thoughtcrime/securesms/jobmanager/JobManager;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getMegaphoneRepository()Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getMessageNotifier()Lorg/thoughtcrime/securesms/notifications/MessageNotifier;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getOkHttpClient()Lokhttp3/OkHttpClient;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getPendingRetryReceiptCache()Lorg/thoughtcrime/securesms/database/PendingRetryReceiptCache;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getPendingRetryReceiptManager()Lorg/thoughtcrime/securesms/service/PendingRetryReceiptManager;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getProfileService()Lorg/whispersystems/signalservice/api/services/ProfileService;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getProtocolStore()Lorg/thoughtcrime/securesms/crypto/storage/SignalServiceDataStoreImpl;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getRecipientCache()Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getScheduledMessageManager()Lorg/thoughtcrime/securesms/service/ScheduledMessageManager;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getShakeToReport()Lorg/thoughtcrime/securesms/shakereport/ShakeToReport;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getSignalOkHttpClient()Lokhttp3/OkHttpClient;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getSignalServiceAccountManager()Lorg/whispersystems/signalservice/api/SignalServiceAccountManager;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getSignalServiceMessageReceiver()Lorg/whispersystems/signalservice/api/SignalServiceMessageReceiver;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getSignalServiceNetworkAccess()Lorg/thoughtcrime/securesms/push/SignalServiceNetworkAccess;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getSignalWebSocket()Lorg/whispersystems/signalservice/api/SignalWebSocket;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getTypingStatusRepository()Lorg/thoughtcrime/securesms/components/TypingStatusRepository;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->getViewOnceMessageManager()Lorg/thoughtcrime/securesms/revealable/ViewOnceMessageManager;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->init(Landroid/app/Application;Lorg/thoughtcrime/securesms/dependencies/ApplicationDependencies$Provider;)V
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->lambda$getSignalWebSocket$0()Lorg/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;->resetProtocolStores()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$_networkModule$1;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$_networkModule$1;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$_networkModule$1;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$_networkModule$1;->invoke()Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$androidCallAudioManager$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$androidCallAudioManager$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$databaseObserver$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$databaseObserver$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$databaseObserver$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$databaseObserver$2;->invoke()Lorg/thoughtcrime/securesms/database/DatabaseObserver;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$deadlockDetector$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$deadlockDetector$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$deadlockDetector$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$deadlockDetector$2;->invoke()Lorg/signal/core/util/concurrent/DeadlockDetector;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$deletedCallEventManager$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$deletedCallEventManager$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$deletedCallEventManager$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$deletedCallEventManager$2;->invoke()Lorg/thoughtcrime/securesms/service/DeletedCallEventManager;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$earlyMessageCache$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$earlyMessageCache$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$exoPlayerPool$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$exoPlayerPool$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$exoPlayerPool$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$exoPlayerPool$2;->invoke()Lorg/thoughtcrime/securesms/video/exo/SimpleExoPlayerPool;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$expireStoriesManager$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$expireStoriesManager$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$expireStoriesManager$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$expireStoriesManager$2;->invoke()Lorg/thoughtcrime/securesms/service/ExpiringStoriesManager;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$expiringMessageManager$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$expiringMessageManager$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$expiringMessageManager$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$expiringMessageManager$2;->invoke()Lorg/thoughtcrime/securesms/service/ExpiringMessageManager;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$frameRateTracker$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$frameRateTracker$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$frameRateTracker$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$frameRateTracker$2;->invoke()Lorg/thoughtcrime/securesms/util/FrameRateTracker;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$giphyMp4Cache$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$giphyMp4Cache$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$giphyMp4Cache$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$giphyMp4Cache$2;->invoke()Lorg/thoughtcrime/securesms/video/exo/GiphyMp4Cache;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$jobManager$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$jobManager$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$jobManager$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$jobManager$2;->invoke()Lorg/thoughtcrime/securesms/jobmanager/JobManager;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$megaphoneRepository$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$megaphoneRepository$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$megaphoneRepository$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$megaphoneRepository$2;->invoke()Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$messageNotifier$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$messageNotifier$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$messageNotifier$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$messageNotifier$2;->invoke()Lorg/thoughtcrime/securesms/notifications/MessageNotifier;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$pendingRetryReceiptCache$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$pendingRetryReceiptCache$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$pendingRetryReceiptCache$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$pendingRetryReceiptCache$2;->invoke()Lorg/thoughtcrime/securesms/database/PendingRetryReceiptCache;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$pendingRetryReceiptManager$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$pendingRetryReceiptManager$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$pendingRetryReceiptManager$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$pendingRetryReceiptManager$2;->invoke()Lorg/thoughtcrime/securesms/service/PendingRetryReceiptManager;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$recipientCache$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$recipientCache$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$recipientCache$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$recipientCache$2;->invoke()Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$scheduledMessageManager$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$scheduledMessageManager$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$scheduledMessageManager$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$scheduledMessageManager$2;->invoke()Lorg/thoughtcrime/securesms/service/ScheduledMessageManager;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$shakeToReport$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$shakeToReport$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$shakeToReport$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$shakeToReport$2;->invoke()Lorg/thoughtcrime/securesms/shakereport/ShakeToReport;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$signalCallManager$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$signalCallManager$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$trimThreadsByDateManager$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$trimThreadsByDateManager$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$typingStatusRepository$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$typingStatusRepository$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$typingStatusRepository$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$typingStatusRepository$2;->invoke()Lorg/thoughtcrime/securesms/components/TypingStatusRepository;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$typingStatusSender$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$typingStatusSender$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$viewOnceMessageManager$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$viewOnceMessageManager$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$viewOnceMessageManager$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies$viewOnceMessageManager$2;->invoke()Lorg/thoughtcrime/securesms/revealable/ViewOnceMessageManager;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->access$getProvider$p()Lorg/thoughtcrime/securesms/dependencies/AppDependencies$Provider;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->access$get_webSocketObserver$p()Lio/reactivex/rxjava3/subjects/Subject;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getAppForegroundObserver()Lorg/thoughtcrime/securesms/util/AppForegroundObserver;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getApplication()Landroid/app/Application;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getDatabaseObserver()Lorg/thoughtcrime/securesms/database/DatabaseObserver;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getDeadlockDetector()Lorg/signal/core/util/concurrent/DeadlockDetector;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getDeletedCallEventManager()Lorg/thoughtcrime/securesms/service/DeletedCallEventManager;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getDonationsService()Lorg/whispersystems/signalservice/api/services/DonationsService;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getExoPlayerPool()Lorg/thoughtcrime/securesms/video/exo/SimpleExoPlayerPool;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getExpireStoriesManager()Lorg/thoughtcrime/securesms/service/ExpiringStoriesManager;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getExpiringMessageManager()Lorg/thoughtcrime/securesms/service/ExpiringMessageManager;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getFrameRateTracker()Lorg/thoughtcrime/securesms/util/FrameRateTracker;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getGiphyMp4Cache()Lorg/thoughtcrime/securesms/video/exo/GiphyMp4Cache;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getIncomingMessageObserver()Lorg/thoughtcrime/securesms/messages/IncomingMessageObserver;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getJobManager()Lorg/thoughtcrime/securesms/jobmanager/JobManager;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getMegaphoneRepository()Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getMessageNotifier()Lorg/thoughtcrime/securesms/notifications/MessageNotifier;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getNetworkModule()Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getOkHttpClient()Lokhttp3/OkHttpClient;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getPendingRetryReceiptCache()Lorg/thoughtcrime/securesms/database/PendingRetryReceiptCache;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getPendingRetryReceiptManager()Lorg/thoughtcrime/securesms/service/PendingRetryReceiptManager;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getProfileService()Lorg/whispersystems/signalservice/api/services/ProfileService;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getProtocolStore()Lorg/thoughtcrime/securesms/crypto/storage/SignalServiceDataStoreImpl;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getRecipientCache()Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getScheduledMessageManager()Lorg/thoughtcrime/securesms/service/ScheduledMessageManager;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getShakeToReport()Lorg/thoughtcrime/securesms/shakereport/ShakeToReport;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getSignalOkHttpClient()Lokhttp3/OkHttpClient;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getSignalServiceAccountManager()Lorg/whispersystems/signalservice/api/SignalServiceAccountManager;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getSignalServiceMessageReceiver()Lorg/whispersystems/signalservice/api/SignalServiceMessageReceiver;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getSignalServiceNetworkAccess()Lorg/thoughtcrime/securesms/push/SignalServiceNetworkAccess;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getSignalWebSocket()Lorg/whispersystems/signalservice/api/SignalWebSocket;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getTypingStatusRepository()Lorg/thoughtcrime/securesms/components/TypingStatusRepository;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getViewOnceMessageManager()Lorg/thoughtcrime/securesms/revealable/ViewOnceMessageManager;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->getWebSocketObserver()Lio/reactivex/rxjava3/core/Observable;
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->init(Landroid/app/Application;Lorg/thoughtcrime/securesms/dependencies/AppDependencies$Provider;)V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->resetNetwork()V
+HSPLorg/thoughtcrime/securesms/dependencies/AppDependencies;->resetProtocolStores()V
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider$$ExternalSyntheticLambda0;-><init>()V
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider$$ExternalSyntheticLambda0;->get()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider$$ExternalSyntheticLambda1;-><init>()V
@@ -24521,8 +24259,8 @@ HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider$Dynami
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider$DynamicCredentialsProvider;->getDeviceId()I
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider$DynamicCredentialsProvider;->getPassword()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider$DynamicCredentialsProvider;->getUsername()Ljava/lang/String;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;->$r8$lambda$VNTgC0RXnMPisSUiK4mSeMLHXOw()Lorg/signal/libsignal/protocol/IdentityKeyPair;
-HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;->$r8$lambda$ntG5Em2j3-iUZO92wPPwvywN1bg()Lorg/signal/libsignal/protocol/IdentityKeyPair;
+HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;->$r8$lambda$Qe96TWnKT4wrfJbpusKXY_uqLjo()Lorg/signal/libsignal/protocol/IdentityKeyPair;
+HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;->$r8$lambda$lTKH8vQTG9yuw0xJWUlGyUS_oPc()Lorg/signal/libsignal/protocol/IdentityKeyPair;
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;-><init>(Landroid/app/Application;)V
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;->lambda$provideProtocolStore$0()Lorg/signal/libsignal/protocol/IdentityKeyPair;
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;->lambda$provideProtocolStore$1()Lorg/signal/libsignal/protocol/IdentityKeyPair;
@@ -24556,6 +24294,73 @@ HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;->prov
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;->provideTypingStatusRepository()Lorg/thoughtcrime/securesms/components/TypingStatusRepository;
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;->provideViewOnceMessageManager()Lorg/thoughtcrime/securesms/revealable/ViewOnceMessageManager;
 HSPLorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;->provideWebSocketFactory(Lj$/util/function/Supplier;Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;Lj$/util/function/Supplier;Lorg/whispersystems/signalservice/internal/websocket/WebSocketShadowingBridge;)Lorg/whispersystems/signalservice/api/websocket/WebSocketFactory;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$_protocolStore$1;-><init>(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$_protocolStore$1;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$_protocolStore$1;->invoke()Lorg/thoughtcrime/securesms/crypto/storage/SignalServiceDataStoreImpl;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$_signalServiceMessageSender$1;-><init>(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$callLinksService$2;-><init>(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$clientZkReceiptOperations$2;-><init>(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$donationsService$2;-><init>(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$donationsService$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$donationsService$2;->invoke()Lorg/whispersystems/signalservice/api/services/DonationsService;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$groupsV2Authorization$2;-><init>(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$groupsV2Operations$2;-><init>(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$groupsV2Operations$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$groupsV2Operations$2;->invoke()Lorg/whispersystems/signalservice/api/groupsv2/GroupsV2Operations;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$incomingMessageObserver$2;-><init>(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$incomingMessageObserver$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$incomingMessageObserver$2;->invoke()Lorg/thoughtcrime/securesms/messages/IncomingMessageObserver;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$libsignalNetwork$2;-><init>(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$okHttpClient$2;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$okHttpClient$2;-><init>()V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$okHttpClient$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$okHttpClient$2;->invoke()Lokhttp3/OkHttpClient;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$payments$2;-><init>(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$profileService$2;-><init>(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$profileService$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$profileService$2;->invoke()Lorg/whispersystems/signalservice/api/services/ProfileService;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalOkHttpClient$2;-><init>(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalOkHttpClient$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalOkHttpClient$2;->invoke()Lokhttp3/OkHttpClient;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalServiceAccountManager$2;-><init>(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalServiceAccountManager$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalServiceAccountManager$2;->invoke()Lorg/whispersystems/signalservice/api/SignalServiceAccountManager;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalServiceMessageReceiver$2;-><init>(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalServiceMessageReceiver$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalServiceMessageReceiver$2;->invoke()Lorg/whispersystems/signalservice/api/SignalServiceMessageReceiver;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalServiceNetworkAccess$2;-><init>(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalServiceNetworkAccess$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalServiceNetworkAccess$2;->invoke()Lorg/thoughtcrime/securesms/push/SignalServiceNetworkAccess;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalWebSocket$2$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalWebSocket$2$$ExternalSyntheticLambda0;->get()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalWebSocket$2$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalWebSocket$2$3$1;-><init>(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalWebSocket$2$3$1;->accept(Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalWebSocket$2$3$1;->accept(Lorg/whispersystems/signalservice/api/websocket/WebSocketConnectionState;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalWebSocket$2;->$r8$lambda$_cJNjuQU5ItA7NdU7Q6jo60cM-I(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)Lorg/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalWebSocket$2;-><init>(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalWebSocket$2;->invoke$lambda$0(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)Lorg/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalWebSocket$2;->invoke()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalWebSocket$2;->invoke()Lorg/whispersystems/signalservice/api/SignalWebSocket;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;-><init>(Landroid/app/Application;Lorg/thoughtcrime/securesms/dependencies/AppDependencies$Provider;Lio/reactivex/rxjava3/subjects/Subject;)V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;->access$getApplication$p(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)Landroid/app/Application;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;->access$getDisposables$p(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)Lio/reactivex/rxjava3/disposables/CompositeDisposable;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;->access$getProvider$p(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)Lorg/thoughtcrime/securesms/dependencies/AppDependencies$Provider;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;->access$getWebSocketStateSubject$p(Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;)Lio/reactivex/rxjava3/subjects/Subject;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;->closeConnections()V
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;->getDonationsService()Lorg/whispersystems/signalservice/api/services/DonationsService;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;->getGroupsV2Operations()Lorg/whispersystems/signalservice/api/groupsv2/GroupsV2Operations;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;->getIncomingMessageObserver()Lorg/thoughtcrime/securesms/messages/IncomingMessageObserver;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;->getOkHttpClient()Lokhttp3/OkHttpClient;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;->getProfileService()Lorg/whispersystems/signalservice/api/services/ProfileService;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;->getProtocolStore()Lorg/thoughtcrime/securesms/crypto/storage/SignalServiceDataStoreImpl;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;->getSignalOkHttpClient()Lokhttp3/OkHttpClient;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;->getSignalServiceAccountManager()Lorg/whispersystems/signalservice/api/SignalServiceAccountManager;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;->getSignalServiceMessageReceiver()Lorg/whispersystems/signalservice/api/SignalServiceMessageReceiver;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;->getSignalServiceNetworkAccess()Lorg/thoughtcrime/securesms/push/SignalServiceNetworkAccess;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;->getSignalWebSocket()Lorg/whispersystems/signalservice/api/SignalWebSocket;
+HSPLorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;->resetProtocolStores()V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiCategory$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiCategory$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiCategory$Companion;->forKey(Ljava/lang/String;)Lorg/thoughtcrime/securesms/emoji/EmojiCategory;
@@ -24566,17 +24371,17 @@ HSPLorg/thoughtcrime/securesms/emoji/EmojiCategory;->getIcon()I
 HSPLorg/thoughtcrime/securesms/emoji/EmojiCategory;->getKey()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiCategory;->getPriority()I
 HSPLorg/thoughtcrime/securesms/emoji/EmojiCategory;->values()[Lorg/thoughtcrime/securesms/emoji/EmojiCategory;
-HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Version;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader$$ExternalSyntheticLambda0;->produce()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader$$ExternalSyntheticLambda1;-><init>(Ljava/lang/String;)V
+HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Version;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader$$ExternalSyntheticLambda1;->produce()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Version;)V
+HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader$$ExternalSyntheticLambda2;-><init>(Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader$$ExternalSyntheticLambda2;->produce()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader$$ExternalSyntheticLambda3;-><init>()V
+HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Version;)V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader$$ExternalSyntheticLambda3;->produce()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader;->$r8$lambda$RRSUUZoeFNBia9u_rrKE1OVrxDs(Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Version;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Response;
-HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader;->$r8$lambda$XZr-fhskW8DkF5fA6oo9su7-_NI(Ljava/lang/String;)Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Name;
-HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader;->$r8$lambda$rqu2_zX_FPHigEn5_a-Q6EOPsPk(Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Version;)Lokhttp3/Response;
+HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader$$ExternalSyntheticLambda4;-><init>()V
+HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader$$ExternalSyntheticLambda4;->produce()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader;->$r8$lambda$GbcnAY3d2o87JhDCJ5UL7WXYGwA(Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Version;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Response;
+HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader;->$r8$lambda$K3jor3fDLnlzCv9VRfCyd4X7LlM(Ljava/lang/String;)Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Name;
+HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader;->$r8$lambda$_bBnfDvlKcYBxaQKZi_M1mZDJHY(Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Version;)Lokhttp3/Response;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader;->downloadAndVerifyFromRemote(Landroid/content/Context;Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Version;Lorg/thoughtcrime/securesms/emoji/EmojiDownloader$Producer;Lorg/thoughtcrime/securesms/emoji/EmojiDownloader$Producer;)Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Name;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader;->downloadAndVerifyImageFromRemote(Landroid/content/Context;Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Version;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Name;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiDownloader;->downloadAndVerifyJsonFromRemote(Landroid/content/Context;Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Version;)Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Name;
@@ -24665,12 +24470,11 @@ HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser$getDataPages$2;->invoke(Lja
 HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser$getJumboPages$1;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser$getJumboPages$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser$getJumboPages$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser$getJumboPages$1;->invoke(Ljava/util/Map$Entry;)Ljava/util/Map;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser$getJumboPages$2;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser$getJumboPages$2;-><init>()V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser$getJumboPages$2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser$getJumboPages$2;->invoke(Ljava/util/Map;)Ljava/util/Set;
-HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser;->$r8$lambda$HoKfmA52DOuoHc1qmMg75hij_7o(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Ljava/lang/Object;)I
+HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser;->$r8$lambda$R5gFUycOMhaOQKz9ATIIv0KYb1o(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Ljava/lang/Object;)I
 HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser;-><init>()V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser;->access$createPage(Lorg/thoughtcrime/securesms/emoji/EmojiJsonParser;Ljava/lang/String;Ljava/lang/String;Lcom/fasterxml/jackson/databind/JsonNode;Lkotlin/jvm/functions/Function2;)Lorg/thoughtcrime/securesms/components/emoji/EmojiPageModel;
@@ -24678,7 +24482,6 @@ HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser;->buildEmojiSourceFromNode(
 HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser;->createPage(Ljava/lang/String;Ljava/lang/String;Lcom/fasterxml/jackson/databind/JsonNode;Lkotlin/jvm/functions/Function2;)Lorg/thoughtcrime/securesms/components/emoji/EmojiPageModel;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser;->getDataPages$lambda$0(Lkotlin/jvm/functions/Function2;Ljava/lang/Object;Ljava/lang/Object;)I
 HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser;->getDataPages(Ljava/lang/String;Lcom/fasterxml/jackson/databind/JsonNode;Lkotlin/jvm/functions/Function2;)Ljava/util/List;
-HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser;->getJumboPages(Lcom/fasterxml/jackson/databind/JsonNode;)Ljava/util/Map;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser;->mergeToDisplayPages(Ljava/util/List;)Ljava/util/List;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParser;->parse-gIAlu-s(Ljava/io/InputStream;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiJsonParserKt;->access$asCategoryKey(Ljava/lang/String;)Ljava/lang/String;
@@ -24728,9 +24531,9 @@ HSPLorg/thoughtcrime/securesms/emoji/EmojiPageCache$LoadResult$Async;->getTask()
 HSPLorg/thoughtcrime/securesms/emoji/EmojiPageCache$LoadResult;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiPageCache$LoadResult;-><init>()V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiPageCache$LoadResult;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/emoji/EmojiPageCache;->$r8$lambda$5pmSRDnaR963DCXHrEpVIMesZ_o(Lorg/thoughtcrime/securesms/emoji/EmojiPageCache$EmojiPageRequest;Landroid/content/Context;)Landroid/graphics/Bitmap;
-HSPLorg/thoughtcrime/securesms/emoji/EmojiPageCache;->$r8$lambda$NLSLe3cZ9aQvIznbpT-Bcw2aCSY(Lorg/thoughtcrime/securesms/util/ListenableFutureTask;)Lkotlin/Unit;
-HSPLorg/thoughtcrime/securesms/emoji/EmojiPageCache;->$r8$lambda$prHxAb0TF9CtP8w7EJ9vg507J70(Lorg/thoughtcrime/securesms/util/ListenableFutureTask;Lorg/thoughtcrime/securesms/emoji/EmojiPageCache$EmojiPageRequest;Lkotlin/Unit;)V
+HSPLorg/thoughtcrime/securesms/emoji/EmojiPageCache;->$r8$lambda$8KM3RGVxjm4OlcwaRvf38vPEato(Lorg/thoughtcrime/securesms/emoji/EmojiPageCache$EmojiPageRequest;Landroid/content/Context;)Landroid/graphics/Bitmap;
+HSPLorg/thoughtcrime/securesms/emoji/EmojiPageCache;->$r8$lambda$QjAh44baRj0pUOJYB5oNmiUzQh8(Lorg/thoughtcrime/securesms/util/ListenableFutureTask;Lorg/thoughtcrime/securesms/emoji/EmojiPageCache$EmojiPageRequest;Lkotlin/Unit;)V
+HSPLorg/thoughtcrime/securesms/emoji/EmojiPageCache;->$r8$lambda$o71WI6c57zpw_hcmcQKxjiVvR5E(Lorg/thoughtcrime/securesms/util/ListenableFutureTask;)Lkotlin/Unit;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiPageCache;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiPageCache;-><init>()V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiPageCache;->clear()V
@@ -24766,8 +24569,6 @@ HSPLorg/thoughtcrime/securesms/emoji/EmojiSource$emojiTree$2;-><init>(Lorg/thoug
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSource$emojiTree$2;->invoke()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSource$emojiTree$2;->invoke()Lorg/thoughtcrime/securesms/components/emoji/parsing/EmojiTree;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSource$maxEmojiLength$2;-><init>(Lorg/thoughtcrime/securesms/emoji/EmojiSource;)V
-HSPLorg/thoughtcrime/securesms/emoji/EmojiSource$maxEmojiLength$2;->invoke()Ljava/lang/Integer;
-HSPLorg/thoughtcrime/securesms/emoji/EmojiSource$maxEmojiLength$2;->invoke()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSource$variationsToCanonical$2;-><init>(Lorg/thoughtcrime/securesms/emoji/EmojiSource;)V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSource;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSource;-><init>(FLorg/thoughtcrime/securesms/emoji/EmojiData;Lkotlin/jvm/functions/Function1;)V
@@ -24779,22 +24580,19 @@ HSPLorg/thoughtcrime/securesms/emoji/EmojiSource;->getDecodeScale()F
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSource;->getEmojiTree()Lorg/thoughtcrime/securesms/components/emoji/parsing/EmojiTree;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSource;->getJumboPages()Ljava/util/Map;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSource;->getLatest()Lorg/thoughtcrime/securesms/emoji/EmojiSource;
-HSPLorg/thoughtcrime/securesms/emoji/EmojiSource;->getMaxEmojiLength()I
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSource;->getMetrics()Lorg/thoughtcrime/securesms/emoji/EmojiMetrics;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSource;->getObsolete()Ljava/util/List;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSource;->refresh()V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSourceKt;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSourceKt;->access$getAssetsUri(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri;
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSourceKt;->access$getPAGE_EMOTICONS$p()Lorg/thoughtcrime/securesms/components/emoji/EmojiPageModel;
-HSPLorg/thoughtcrime/securesms/emoji/EmojiSourceKt;->access$maxOrZero(Ljava/util/List;)I
 HSPLorg/thoughtcrime/securesms/emoji/EmojiSourceKt;->getAssetsUri(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri;
-HSPLorg/thoughtcrime/securesms/emoji/EmojiSourceKt;->maxOrZero(Ljava/util/List;)I
+HSPLorg/thoughtcrime/securesms/emoji/JumboEmoji$$ExternalSyntheticLambda0;-><init>(Landroid/content/Context;)V
+HSPLorg/thoughtcrime/securesms/emoji/JumboEmoji$$ExternalSyntheticLambda0;->run()V
 HSPLorg/thoughtcrime/securesms/emoji/JumboEmoji$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Version;)V
 HSPLorg/thoughtcrime/securesms/emoji/JumboEmoji$$ExternalSyntheticLambda4;->run()V
-HSPLorg/thoughtcrime/securesms/emoji/JumboEmoji$$ExternalSyntheticLambda5;-><init>(Landroid/content/Context;)V
-HSPLorg/thoughtcrime/securesms/emoji/JumboEmoji$$ExternalSyntheticLambda5;->run()V
-HSPLorg/thoughtcrime/securesms/emoji/JumboEmoji;->$r8$lambda$1MZfAT8L5tWrN2t8lIV1c9aeWgA(Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Version;)V
-HSPLorg/thoughtcrime/securesms/emoji/JumboEmoji;->$r8$lambda$U8tEMIKRjYoTvIByfnS46m01TB0(Landroid/content/Context;)V
+HSPLorg/thoughtcrime/securesms/emoji/JumboEmoji;->$r8$lambda$W7VXIuSXeI4kSsvaFMOZvXCp77s(Landroid/content/Context;)V
+HSPLorg/thoughtcrime/securesms/emoji/JumboEmoji;->$r8$lambda$sfBxlaRoAAH1HVjzwloOv9XRG_U(Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Version;)V
 HSPLorg/thoughtcrime/securesms/emoji/JumboEmoji;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/emoji/JumboEmoji;-><init>()V
 HSPLorg/thoughtcrime/securesms/emoji/JumboEmoji;->updateCurrentVersion$lambda$1$lambda$0(Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Version;)V
@@ -24821,7 +24619,6 @@ HSPLorg/thoughtcrime/securesms/fonts/FontFileMap;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/fonts/FontFileMap;-><init>(Ljava/util/Map;)V
 HSPLorg/thoughtcrime/securesms/fonts/FontFileMap;->access$getObjectMapper$cp()Lcom/fasterxml/jackson/databind/ObjectMapper;
 HSPLorg/thoughtcrime/securesms/fonts/FontFileMap;->access$getTAG$cp()Ljava/lang/String;
-HSPLorg/thoughtcrime/securesms/fonts/FontFileMap;->copy(Ljava/util/Map;)Lorg/thoughtcrime/securesms/fonts/FontFileMap;
 HSPLorg/thoughtcrime/securesms/fonts/FontFileMap;->getMap()Ljava/util/Map;
 HSPLorg/thoughtcrime/securesms/fonts/FontManifest$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/fonts/FontManifest$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -24846,7 +24643,7 @@ HSPLorg/thoughtcrime/securesms/fonts/FontManifest;->access$getTAG$cp()Ljava/lang
 HSPLorg/thoughtcrime/securesms/fonts/FontManifest;->getScripts()Lorg/thoughtcrime/securesms/fonts/FontManifest$FontScripts;
 HSPLorg/thoughtcrime/securesms/fonts/FontVersion$Companion$$ExternalSyntheticLambda0;-><init>(Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/fonts/FontVersion$Companion$$ExternalSyntheticLambda0;->accept(Ljava/io/File;Ljava/lang/String;)Z
-HSPLorg/thoughtcrime/securesms/fonts/FontVersion$Companion;->$r8$lambda$GLcvCCgUNuztOT0sBsTLfRywQ-Y(Ljava/lang/String;Ljava/io/File;Ljava/lang/String;)Z
+HSPLorg/thoughtcrime/securesms/fonts/FontVersion$Companion;->$r8$lambda$AQX6wZ5LWbj6Hl5R4cgAW2eu1h0(Ljava/lang/String;Ljava/io/File;Ljava/lang/String;)Z
 HSPLorg/thoughtcrime/securesms/fonts/FontVersion$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/fonts/FontVersion$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/fonts/FontVersion$Companion;->cleanOldVersions$lambda$3(Ljava/lang/String;Ljava/io/File;Ljava/lang/String;)Z
@@ -24882,7 +24679,7 @@ HSPLorg/thoughtcrime/securesms/fonts/Fonts$FontResult;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/fonts/Fonts$FontResult;-><init>()V
 HSPLorg/thoughtcrime/securesms/fonts/Fonts$FontResult;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/fonts/Fonts$WhenMappings;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/fonts/Fonts;->$r8$lambda$0yxJV4r6u8lXhnhrsFl-yKUnW94(Landroid/content/Context;Lorg/thoughtcrime/securesms/fonts/SupportedScript;Lorg/thoughtcrime/securesms/fonts/TextFont;Lorg/thoughtcrime/securesms/fonts/FontVersion;Lorg/thoughtcrime/securesms/fonts/FontManifest;Lorg/thoughtcrime/securesms/fonts/Fonts$FontResult$Immediate;Lorg/thoughtcrime/securesms/fonts/Fonts$FontDownloadKey;)Landroid/graphics/Typeface;
+HSPLorg/thoughtcrime/securesms/fonts/Fonts;->$r8$lambda$Ys8jj8IljU5q-ahrmjEsUOvcyM8(Landroid/content/Context;Lorg/thoughtcrime/securesms/fonts/SupportedScript;Lorg/thoughtcrime/securesms/fonts/TextFont;Lorg/thoughtcrime/securesms/fonts/FontVersion;Lorg/thoughtcrime/securesms/fonts/FontManifest;Lorg/thoughtcrime/securesms/fonts/Fonts$FontResult$Immediate;Lorg/thoughtcrime/securesms/fonts/Fonts$FontDownloadKey;)Landroid/graphics/Typeface;
 HSPLorg/thoughtcrime/securesms/fonts/Fonts;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/fonts/Fonts;-><init>()V
 HSPLorg/thoughtcrime/securesms/fonts/Fonts;->downloadAndVerifyLatestManifest(Landroid/content/Context;Lorg/thoughtcrime/securesms/fonts/FontVersion;Ljava/lang/String;)Z
@@ -24898,24 +24695,6 @@ HSPLorg/thoughtcrime/securesms/fonts/Fonts;->resolveFontScriptFromScriptName(Lor
 HSPLorg/thoughtcrime/securesms/fonts/ScriptUtil;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/fonts/ScriptUtil;->getScript(Ljava/util/Locale;)Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/fonts/ScriptUtil;->getScriptsMap([Ljava/lang/String;)Ljava/util/Map;
-HSPLorg/thoughtcrime/securesms/fonts/SignalSymbols$CustomTypefaceSpan;-><init>(Landroid/graphics/Typeface;)V
-HSPLorg/thoughtcrime/securesms/fonts/SignalSymbols$CustomTypefaceSpan;->update(Landroid/text/TextPaint;)V
-HSPLorg/thoughtcrime/securesms/fonts/SignalSymbols$CustomTypefaceSpan;->updateDrawState(Landroid/text/TextPaint;)V
-HSPLorg/thoughtcrime/securesms/fonts/SignalSymbols$CustomTypefaceSpan;->updateMeasureState(Landroid/text/TextPaint;)V
-HSPLorg/thoughtcrime/securesms/fonts/SignalSymbols$Glyph;->$values()[Lorg/thoughtcrime/securesms/fonts/SignalSymbols$Glyph;
-HSPLorg/thoughtcrime/securesms/fonts/SignalSymbols$Glyph;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/fonts/SignalSymbols$Glyph;-><init>(Ljava/lang/String;IC)V
-HSPLorg/thoughtcrime/securesms/fonts/SignalSymbols$Glyph;->getUnicode()C
-HSPLorg/thoughtcrime/securesms/fonts/SignalSymbols$Weight;->$values()[Lorg/thoughtcrime/securesms/fonts/SignalSymbols$Weight;
-HSPLorg/thoughtcrime/securesms/fonts/SignalSymbols$Weight;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/fonts/SignalSymbols$Weight;-><init>(Ljava/lang/String;I)V
-HSPLorg/thoughtcrime/securesms/fonts/SignalSymbols$Weight;->values()[Lorg/thoughtcrime/securesms/fonts/SignalSymbols$Weight;
-HSPLorg/thoughtcrime/securesms/fonts/SignalSymbols$WhenMappings;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/fonts/SignalSymbols;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/fonts/SignalSymbols;-><init>()V
-HSPLorg/thoughtcrime/securesms/fonts/SignalSymbols;->getBoldWeightedFont(Landroid/content/Context;)Landroid/graphics/Typeface;
-HSPLorg/thoughtcrime/securesms/fonts/SignalSymbols;->getSpannedString(Landroid/content/Context;Lorg/thoughtcrime/securesms/fonts/SignalSymbols$Weight;Lorg/thoughtcrime/securesms/fonts/SignalSymbols$Glyph;)Ljava/lang/CharSequence;
-HSPLorg/thoughtcrime/securesms/fonts/SignalSymbols;->getTypeface(Landroid/content/Context;Lorg/thoughtcrime/securesms/fonts/SignalSymbols$Weight;)Landroid/graphics/Typeface;
 HSPLorg/thoughtcrime/securesms/fonts/SupportedScript;->$values()[Lorg/thoughtcrime/securesms/fonts/SupportedScript;
 HSPLorg/thoughtcrime/securesms/fonts/SupportedScript;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/fonts/SupportedScript;-><init>(Ljava/lang/String;I)V
@@ -24933,8 +24712,6 @@ HSPLorg/thoughtcrime/securesms/gcm/FcmFetchManager;-><init>()V
 HSPLorg/thoughtcrime/securesms/gcm/FcmFetchManager;->cancelMayHaveMessagesNotification(Landroid/content/Context;)V
 HSPLorg/thoughtcrime/securesms/gcm/FcmFetchManager;->onForeground(Landroid/content/Context;)V
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ItemDecoration$onDraw$1;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
-HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ItemDecoration$onDraw$1;->invoke(Landroid/view/View;)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
-HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ItemDecoration$onDraw$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ItemDecoration;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ItemDecoration;-><init>(Lorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController$Callback;Lkotlin/jvm/functions/Function1;)V
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ItemDecoration;-><init>(Lorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController$Callback;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -24943,8 +24720,6 @@ HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ItemDecoration;->setParentRecycl
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController$$ExternalSyntheticLambda0;-><init>(Ljava/util/Set;)V
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController$RangeComparator;-><init>(II)V
-HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController$RangeComparator;->compare(Ljava/lang/Integer;Ljava/lang/Integer;)I
-HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController$RangeComparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController;-><init>(Lorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController$Callback;I)V
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController;->attach(Landroidx/recyclerview/widget/RecyclerView;Lorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController$Callback;I)V
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController;->findFirstVisibleItemPositions(Landroidx/recyclerview/widget/RecyclerView$LayoutManager;)[I
@@ -24952,7 +24727,6 @@ HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController;->findLastVis
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController;->getPlaybackSet(Ljava/util/Set;II)Ljava/util/Set;
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController;->getPlaybackSetForMaximumDistance(Ljava/util/Set;[I[I)Ljava/util/Set;
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController;->onLayoutChange(Landroid/view/View;IIIIIIII)V
-HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController;->onScrolled(Landroidx/recyclerview/widget/RecyclerView;II)V
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController;->performPlaybackUpdate(Landroidx/recyclerview/widget/RecyclerView;)V
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackPolicy;->maxSimultaneousPlaybackInConversation()I
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionPlayerHolder;-><clinit>()V
@@ -24962,10 +24736,8 @@ HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionPlayerHolder;->onCreat
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionPlayerHolder;->onResume(Landroidx/lifecycle/LifecycleOwner;)V
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionPlayerHolder;->onStart(Landroidx/lifecycle/LifecycleOwner;)V
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionRecycler;-><init>(Ljava/util/List;)V
-HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionRecycler;->getCurrentHolder(I)Lorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionPlayerHolder;
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionRecycler;->stopAndReleaseAssignedVideos(Ljava/util/Set;)V
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionRecycler;->update(Landroidx/recyclerview/widget/RecyclerView;Ljava/util/List;Ljava/util/Set;)V
-HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionRecycler;->updateVideoDisplayPositionAndSize(Landroidx/recyclerview/widget/RecyclerView;Lorg/thoughtcrime/securesms/giph/mp4/GiphyMp4Playable;)V
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4VideoPlayer;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4VideoPlayer;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4VideoPlayer;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
@@ -25036,7 +24808,7 @@ HSPLorg/thoughtcrime/securesms/jobmanager/ConstraintInstantiator;-><init>(Ljava/
 HSPLorg/thoughtcrime/securesms/jobmanager/ConstraintInstantiator;->instantiate(Ljava/lang/String;)Lorg/thoughtcrime/securesms/jobmanager/Constraint;
 HSPLorg/thoughtcrime/securesms/jobmanager/InAppScheduler$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/jobmanager/InAppScheduler;)V
 HSPLorg/thoughtcrime/securesms/jobmanager/InAppScheduler$$ExternalSyntheticLambda0;->run()V
-HSPLorg/thoughtcrime/securesms/jobmanager/InAppScheduler;->$r8$lambda$hBEn_48T9NK-BhOmjEIwF4k281g(Lorg/thoughtcrime/securesms/jobmanager/InAppScheduler;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/InAppScheduler;->$r8$lambda$0KH5iNLdy2DvUxriNkEuWXyJtWM(Lorg/thoughtcrime/securesms/jobmanager/InAppScheduler;)V
 HSPLorg/thoughtcrime/securesms/jobmanager/InAppScheduler;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/jobmanager/InAppScheduler;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobManager;)V
 HSPLorg/thoughtcrime/securesms/jobmanager/InAppScheduler;->lambda$schedule$0()V
@@ -25100,41 +24872,39 @@ HSPLorg/thoughtcrime/securesms/jobmanager/Job;->setLastRunAttemptTime(J)V
 HSPLorg/thoughtcrime/securesms/jobmanager/Job;->setNextBackoffInterval(J)V
 HSPLorg/thoughtcrime/securesms/jobmanager/Job;->setRunAttempt(I)V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda0;-><init>()V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda10;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobController;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda10;->accept(Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda13;-><init>()V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda13;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda14;-><init>(Lorg/thoughtcrime/securesms/jobmanager/persistence/JobStorage;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda14;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda16;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobController;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda13;->accept(Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda14;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobController;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda14;->accept(Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda15;-><init>(Lorg/thoughtcrime/securesms/jobmanager/persistence/JobSpec;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda15;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda16;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobController;Lorg/thoughtcrime/securesms/jobmanager/Job;)V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda16;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda17;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobController;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda17;->accept(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda19;-><init>(Lorg/thoughtcrime/securesms/jobmanager/ConstraintInstantiator;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda19;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobController;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda1;->accept(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda20;-><init>()V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda20;->test(Ljava/lang/Object;)Z
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda22;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobPredicate;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda22;->test(Ljava/lang/Object;)Z
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda23;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobController$Callback;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda23;->run()V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/jobmanager/persistence/JobSpec;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobPredicate;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda20;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobController;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda20;->accept(Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda21;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda21;->test(Ljava/lang/Object;)Z
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda2;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda2;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/jobmanager/ConstraintInstantiator;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda3;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda4;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda4;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda5;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobController;Lorg/thoughtcrime/securesms/jobmanager/Job;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda5;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda6;-><init>()V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda6;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda7;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobController;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda7;->accept(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda8;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda8;-><init>(Lorg/thoughtcrime/securesms/jobmanager/persistence/JobStorage;)V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda8;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController;->$r8$lambda$AFTJhIYz2IJLxa5cdEvspxyDnpk(Lorg/thoughtcrime/securesms/jobmanager/JobController;Lorg/thoughtcrime/securesms/jobmanager/persistence/JobSpec;)Lorg/thoughtcrime/securesms/jobmanager/Job;
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController;->$r8$lambda$FnYUQJ9nqVuTdiLe8l57LDvJzOE(Lorg/thoughtcrime/securesms/jobmanager/JobController;Ljava/util/List;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController;->$r8$lambda$Ka2rmpP3tDCT7kzx5KQlHQUrhA4(Lorg/thoughtcrime/securesms/jobmanager/persistence/JobSpec;Ljava/lang/String;)Lorg/thoughtcrime/securesms/jobmanager/persistence/ConstraintSpec;
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController;->$r8$lambda$YXMN5Ij_rYm1dFbxzMPP4rhbPPI(Lorg/thoughtcrime/securesms/jobmanager/JobController;Lorg/thoughtcrime/securesms/jobmanager/Job;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController;->$r8$lambda$_WG2KEwBlGL1eFDhBUpj1kHB45I(Lorg/thoughtcrime/securesms/jobmanager/JobController;Lorg/thoughtcrime/securesms/jobmanager/Job;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobController;->$r8$lambda$cs0r6RT3Ty9GlYLxMBZkIHg08dM(Lorg/thoughtcrime/securesms/jobmanager/JobController;Lorg/thoughtcrime/securesms/jobmanager/Job;Ljava/lang/String;)Lorg/thoughtcrime/securesms/jobmanager/persistence/DependencySpec;
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda9;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobController;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda9;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController;->$r8$lambda$0i19W6fcB6jDDocTJQHVq_i0UnY(Lorg/thoughtcrime/securesms/jobmanager/persistence/JobSpec;Ljava/lang/String;)Lorg/thoughtcrime/securesms/jobmanager/persistence/ConstraintSpec;
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController;->$r8$lambda$9xLAabFFURvFjKhySiR759DzZjw(Lorg/thoughtcrime/securesms/jobmanager/JobController;Lorg/thoughtcrime/securesms/jobmanager/Job;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController;->$r8$lambda$G1nFaUyRnDKgIne1KJVgzC5hxtQ(Lorg/thoughtcrime/securesms/jobmanager/JobController;Lorg/thoughtcrime/securesms/jobmanager/Job;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController;->$r8$lambda$RD3fCitu1gSVN3UtrLwf0xFo_Ks(Lorg/thoughtcrime/securesms/jobmanager/JobController;Lorg/thoughtcrime/securesms/jobmanager/Job;Ljava/lang/String;)Lorg/thoughtcrime/securesms/jobmanager/persistence/DependencySpec;
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController;->$r8$lambda$bfiF9sdSaLTlCZjIISF7q1pzO98(Lorg/thoughtcrime/securesms/jobmanager/JobController;Lorg/thoughtcrime/securesms/jobmanager/persistence/JobSpec;)Lorg/thoughtcrime/securesms/jobmanager/Job;
+HSPLorg/thoughtcrime/securesms/jobmanager/JobController;->$r8$lambda$uKuw8NnXmjg2NdM_tRNUgYAyeFk(Lorg/thoughtcrime/securesms/jobmanager/JobController;Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobController;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobController;-><init>(Landroid/app/Application;Lorg/thoughtcrime/securesms/jobmanager/persistence/JobStorage;Lorg/thoughtcrime/securesms/jobmanager/JobInstantiator;Lorg/thoughtcrime/securesms/jobmanager/ConstraintInstantiator;Lorg/thoughtcrime/securesms/jobmanager/JobTracker;Lorg/thoughtcrime/securesms/jobmanager/Scheduler;Lorg/thoughtcrime/securesms/util/Debouncer;Lorg/thoughtcrime/securesms/jobmanager/JobController$Callback;)V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobController;->buildFullSpec(Lorg/thoughtcrime/securesms/jobmanager/Job;Ljava/util/Collection;)Lorg/thoughtcrime/securesms/jobmanager/persistence/FullSpec;
@@ -25166,24 +24936,21 @@ HSPLorg/thoughtcrime/securesms/jobmanager/JobLogger;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobLogger;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobLogger;->format(Lorg/thoughtcrime/securesms/jobmanager/Job;Ljava/lang/String;)Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/jobmanager/JobLogger;->format(Lorg/thoughtcrime/securesms/jobmanager/Job;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda10;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobManager;Lorg/thoughtcrime/securesms/jobmanager/JobManager$Configuration;Landroid/app/Application;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda10;->run()V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda11;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobManager;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda11;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobController;)V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda11;->run()V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda16;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobManager;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda16;->run()V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda17;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobManager;Lorg/thoughtcrime/securesms/jobmanager/JobManager$Chain;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda17;->run()V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda19;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobManager;Ljava/lang/Runnable;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda19;->run()V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobController;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda1;->run()V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda6;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobManager;Lorg/thoughtcrime/securesms/jobmanager/JobManager$EmptyQueueListener;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda6;->run()V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda8;-><init>()V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda8;->shouldRunOnExecutor()Z
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda9;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobManager;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda9;->onEmpty()V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda12;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobManager;Lorg/thoughtcrime/securesms/jobmanager/JobManager$EmptyQueueListener;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda12;->run()V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda18;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobManager;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda18;->run()V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobManager;Ljava/lang/Runnable;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda4;->run()V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda6;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda6;->shouldRunOnExecutor()Z
+HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda7;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobManager;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda8;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobManager;Lorg/thoughtcrime/securesms/jobmanager/JobManager$Configuration;Landroid/app/Application;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda8;->run()V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda9;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobManager;Lorg/thoughtcrime/securesms/jobmanager/JobManager$Chain;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda9;->run()V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$Chain;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobManager;Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$Chain;->enqueue()V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$Chain;->getJobListChain()Ljava/util/List;
@@ -25208,13 +24975,11 @@ HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$Configuration;->getJobStora
 HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$Configuration;->getJobThreadCount()I
 HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$Configuration;->getJobTracker()Lorg/thoughtcrime/securesms/jobmanager/JobTracker;
 HSPLorg/thoughtcrime/securesms/jobmanager/JobManager$Configuration;->getReservedJobRunners()Ljava/util/List;
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->$r8$lambda$88wGNi-R9qqqYZRd2q8yENxgty8(Lorg/thoughtcrime/securesms/jobmanager/JobManager;Ljava/lang/Runnable;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->$r8$lambda$B0N_1IwVaEFBHupl4Ii7Rtasq5s(Lorg/thoughtcrime/securesms/jobmanager/JobManager;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->$r8$lambda$LRMTzBAnZzMhc-JGu7V6yfyQyoc(Lorg/thoughtcrime/securesms/jobmanager/JobManager;Lorg/thoughtcrime/securesms/jobmanager/JobManager$EmptyQueueListener;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->$r8$lambda$XT2SMZJxrQFMSviwHBjZhWrZ8u4(Lorg/thoughtcrime/securesms/jobmanager/JobManager;Lorg/thoughtcrime/securesms/jobmanager/JobManager$Configuration;Landroid/app/Application;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->$r8$lambda$f8CXlOogPUV2rL47HPh17prqg70(Lorg/thoughtcrime/securesms/jobmanager/JobManager;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->$r8$lambda$n2_WnBTSP7W-v9B5XsgvQbvhaaA(Lorg/thoughtcrime/securesms/jobmanager/JobManager;Lorg/thoughtcrime/securesms/jobmanager/JobManager$Chain;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->$r8$lambda$sAhOIfgF3Tsjgqk6ejbaAJGNqJA(Lorg/thoughtcrime/securesms/jobmanager/JobManager;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->$r8$lambda$0QNEF3AbnRrfPrntrBm1Bc2uR7U(Lorg/thoughtcrime/securesms/jobmanager/JobManager;Lorg/thoughtcrime/securesms/jobmanager/JobManager$EmptyQueueListener;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->$r8$lambda$Da6t7a4Y7jse4fIRdxpGnSwb1es(Lorg/thoughtcrime/securesms/jobmanager/JobManager;Lorg/thoughtcrime/securesms/jobmanager/JobManager$Configuration;Landroid/app/Application;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->$r8$lambda$U-VUwTiEXqG3RE3w6Ac6i1rCOME(Lorg/thoughtcrime/securesms/jobmanager/JobManager;Lorg/thoughtcrime/securesms/jobmanager/JobManager$Chain;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->$r8$lambda$Zajmwb5RJOHlNXpVIkxJVyVU74I(Lorg/thoughtcrime/securesms/jobmanager/JobManager;)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->$r8$lambda$_bxiL23LiM5uOL4xt_c1zVUc3ic(Lorg/thoughtcrime/securesms/jobmanager/JobManager;Ljava/lang/Runnable;)V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->-$$Nest$menqueueChain(Lorg/thoughtcrime/securesms/jobmanager/JobManager;Lorg/thoughtcrime/securesms/jobmanager/JobManager$Chain;)V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;-><init>(Landroid/app/Application;Lorg/thoughtcrime/securesms/jobmanager/JobManager$Configuration;)V
@@ -25226,10 +24991,8 @@ HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->lambda$addOnEmptyQueueLis
 HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->lambda$beginJobLoop$1()V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->lambda$enqueueChain$13(Lorg/thoughtcrime/securesms/jobmanager/JobManager$Chain;)V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->lambda$new$0(Lorg/thoughtcrime/securesms/jobmanager/JobManager$Configuration;Landroid/app/Application;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->lambda$onEmptyQueue$14()V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->lambda$runOnExecutor$15(Ljava/lang/Runnable;)V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->onConstraintMet(Ljava/lang/String;)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->onEmptyQueue()V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->runOnExecutor(Ljava/lang/Runnable;)V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->startChain(Lorg/thoughtcrime/securesms/jobmanager/Job;)Lorg/thoughtcrime/securesms/jobmanager/JobManager$Chain;
 HSPLorg/thoughtcrime/securesms/jobmanager/JobManager;->waitUntilInitialized()V
@@ -25253,14 +25016,14 @@ HSPLorg/thoughtcrime/securesms/jobmanager/JobRunner;->run()V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobRunner;->run(Lorg/thoughtcrime/securesms/jobmanager/Job;)Lorg/thoughtcrime/securesms/jobmanager/Job$Result;
 HSPLorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/Application;Ljava/lang/Class;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler$$ExternalSyntheticApiModelOutline1;->m(Landroid/app/job/JobScheduler;I)Landroid/app/job/JobInfo;
-HSPLorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler;Ljava/util/List;J)V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler$$ExternalSyntheticLambda2;->run()V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler$$ExternalSyntheticLambda3;-><init>()V
-HSPLorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler$$ExternalSyntheticLambda3;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler$$ExternalSyntheticLambda2;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler$$ExternalSyntheticLambda2;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler;Ljava/util/List;J)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler$$ExternalSyntheticLambda3;->run()V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler$SystemService$1;-><init>(Lorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler$SystemService;Lorg/thoughtcrime/securesms/jobmanager/JobManager;Landroid/app/job/JobParameters;)V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler$SystemService;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler$SystemService;->onStartJob(Landroid/app/job/JobParameters;)Z
-HSPLorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler;->$r8$lambda$Uvvq4WH9N1WnOXNBTfXiqkD-fqA(Lorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler;Ljava/util/List;J)V
+HSPLorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler;->$r8$lambda$_GCEIUHm76H-bzXsTOm9dpFsILM(Lorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler;Ljava/util/List;J)V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler;->-$$Nest$sfgetTAG()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler;-><init>(Landroid/app/Application;)V
@@ -25281,6 +25044,7 @@ HSPLorg/thoughtcrime/securesms/jobmanager/JobTracker;->onStateChange(Lorg/though
 HSPLorg/thoughtcrime/securesms/jobmanager/JsonJobData$Builder;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobmanager/JsonJobData$Builder;->build()Lorg/thoughtcrime/securesms/jobmanager/JsonJobData;
 HSPLorg/thoughtcrime/securesms/jobmanager/JsonJobData$Builder;->putBoolean(Ljava/lang/String;Z)Lorg/thoughtcrime/securesms/jobmanager/JsonJobData$Builder;
+HSPLorg/thoughtcrime/securesms/jobmanager/JsonJobData$Builder;->putInt(Ljava/lang/String;I)Lorg/thoughtcrime/securesms/jobmanager/JsonJobData$Builder;
 HSPLorg/thoughtcrime/securesms/jobmanager/JsonJobData$Builder;->putLong(Ljava/lang/String;J)Lorg/thoughtcrime/securesms/jobmanager/JsonJobData$Builder;
 HSPLorg/thoughtcrime/securesms/jobmanager/JsonJobData$Builder;->putString(Ljava/lang/String;Ljava/lang/String;)Lorg/thoughtcrime/securesms/jobmanager/JsonJobData$Builder;
 HSPLorg/thoughtcrime/securesms/jobmanager/JsonJobData$Builder;->putStringListAsArray(Ljava/lang/String;Ljava/util/List;)Lorg/thoughtcrime/securesms/jobmanager/JsonJobData$Builder;
@@ -25350,7 +25114,7 @@ HSPLorg/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory$$ExternalS
 HSPLorg/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory$$ExternalSyntheticLambda0;->newThread(Ljava/lang/Runnable;)Ljava/lang/Thread;
 HSPLorg/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory$1;-><init>(Lorg/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory;Ljava/lang/Runnable;Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory$1;->run()V
-HSPLorg/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory;->$r8$lambda$kdsUJsXeZAOU8YycB_g5WXLC3bw(Lorg/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory;Ljava/lang/String;Ljava/lang/Runnable;)Ljava/lang/Thread;
+HSPLorg/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory;->$r8$lambda$9zR0QlbnOalHga_tjn6KFeB2G2Q(Lorg/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory;Ljava/lang/String;Ljava/lang/Runnable;)Ljava/lang/Thread;
 HSPLorg/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory;->lambda$newSingleThreadExecutor$0(Ljava/lang/String;Ljava/lang/Runnable;)Ljava/lang/Thread;
 HSPLorg/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory;->newSingleThreadExecutor(Ljava/lang/String;)Ljava/util/concurrent/ExecutorService;
@@ -25500,8 +25264,6 @@ HSPLorg/thoughtcrime/securesms/jobs/BaseJob;-><init>(Lorg/thoughtcrime/securesms
 HSPLorg/thoughtcrime/securesms/jobs/BaseJob;->getNextRunAttemptBackoff(ILjava/lang/Exception;)J
 HSPLorg/thoughtcrime/securesms/jobs/BaseJob;->run()Lorg/thoughtcrime/securesms/jobmanager/Job$Result;
 HSPLorg/thoughtcrime/securesms/jobs/BaseJob;->shouldTrace()Z
-HSPLorg/thoughtcrime/securesms/jobs/BaseJob;->warn(Ljava/lang/String;Ljava/lang/String;)V
-HSPLorg/thoughtcrime/securesms/jobs/BaseJob;->warn(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 HSPLorg/thoughtcrime/securesms/jobs/BoostReceiptRequestResponseJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/CallLinkPeekJob$Factory;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/jobs/CallLinkPeekJob$Factory;-><init>()V
@@ -25577,9 +25339,9 @@ HSPLorg/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob$$ExternalSyntheti
 HSPLorg/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob$Factory;->create(Lorg/thoughtcrime/securesms/jobmanager/Job$Parameters;[B)Lorg/thoughtcrime/securesms/jobmanager/Job;
 HSPLorg/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob$Factory;->create(Lorg/thoughtcrime/securesms/jobmanager/Job$Parameters;[B)Lorg/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob;
-HSPLorg/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob;->$r8$lambda$QoH7dcHnoANVuwa796Z9UVq8P10(Ljava/lang/String;Ljava/io/File;)Z
-HSPLorg/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob;->$r8$lambda$dkoZGu-68WkVhszwd5d_cWNZrJU(ILcom/annimon/stream/IntPair;Lcom/annimon/stream/IntPair;)I
-HSPLorg/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob;->$r8$lambda$svSYKFZ54wbzF4p08Dr861zOX4Y(Ljava/lang/String;Ljava/io/File;)Z
+HSPLorg/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob;->$r8$lambda$9VzPzZDLQUWMSvQWzUANY0wMNng(Ljava/lang/String;Ljava/io/File;)Z
+HSPLorg/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob;->$r8$lambda$NzrmuB5uaNlXXjjP9umX9ruGyaI(Ljava/lang/String;Ljava/io/File;)Z
+HSPLorg/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob;->$r8$lambda$TfVciEf3t2zEuekGJb7iua_9PAU(ILcom/annimon/stream/IntPair;Lcom/annimon/stream/IntPair;)I
 HSPLorg/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob;-><init>(Lorg/thoughtcrime/securesms/jobmanager/Job$Parameters;Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Version;)V
 HSPLorg/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob;-><init>(Z)V
@@ -25616,15 +25378,10 @@ HSPLorg/thoughtcrime/securesms/jobs/EmojiSearchIndexDownloadJob;->onRun()V
 HSPLorg/thoughtcrime/securesms/jobs/EmojiSearchIndexDownloadJob;->scheduleIfNecessary()V
 HSPLorg/thoughtcrime/securesms/jobs/EmojiSearchIndexDownloadJob;->scheduleImmediately()V
 HSPLorg/thoughtcrime/securesms/jobs/EmojiSearchIndexDownloadJob;->serialize()[B
-HSPLorg/thoughtcrime/securesms/jobs/ExternalLaunchDonationJob$Companion;-><init>()V
-HSPLorg/thoughtcrime/securesms/jobs/ExternalLaunchDonationJob$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/jobs/ExternalLaunchDonationJob$Companion;->enqueueIfNecessary()V
 HSPLorg/thoughtcrime/securesms/jobs/ExternalLaunchDonationJob$Factory$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/ExternalLaunchDonationJob$Factory$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/jobs/ExternalLaunchDonationJob$Factory;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/jobs/ExternalLaunchDonationJob$Factory;-><init>()V
-HSPLorg/thoughtcrime/securesms/jobs/ExternalLaunchDonationJob;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/jobs/ExternalLaunchDonationJob;->enqueueIfNecessary()V
 HSPLorg/thoughtcrime/securesms/jobs/FailingJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage$$ExternalSyntheticLambda0;-><init>(Lkotlin/jvm/functions/Function1;)V
 HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z
@@ -25635,7 +25392,8 @@ HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage$getPendingJobsWithNoDependenc
 HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage$getPendingJobsWithNoDependenciesInCreatedOrder$$inlined$sortedByDescending$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage$getPendingJobsWithNoDependenciesInCreatedOrder$$inlined$sortedByDescending$1;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
 HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage$getPendingJobsWithNoDependenciesInCreatedOrder$lambda$8$$inlined$sortedBy$1;-><init>()V
-HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage;->$r8$lambda$Xu-rS-eV7EMHJJ0ct-GtD7_wnkc(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Z
+HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage$getPendingJobsWithNoDependenciesInCreatedOrder$lambda$8$$inlined$sortedBy$1;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
+HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage;->$r8$lambda$EouJSdoQC39lMz7g_6xzezxy_Wo(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Z
 HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage;-><init>(Lorg/thoughtcrime/securesms/database/JobDatabase;)V
 HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage;->deleteJob(Ljava/lang/String;)V
@@ -25646,7 +25404,6 @@ HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage;->getConstraintSpecs(Ljava/la
 HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage;->getDependencySpecsThatDependOnJob(Ljava/lang/String;)Ljava/util/List;
 HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage;->getJobById(Ljava/lang/String;)Lorg/thoughtcrime/securesms/jobmanager/persistence/JobSpec;
 HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage;->getJobCountForFactory(Ljava/lang/String;)I
-HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage;->getJobCountForFactoryAndQueue(Ljava/lang/String;Ljava/lang/String;)I
 HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage;->getJobSpec(Ljava/lang/String;)Lorg/thoughtcrime/securesms/jobmanager/persistence/JobSpec;
 HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage;->getMigrationJob()Lorg/thoughtcrime/securesms/jobmanager/persistence/JobSpec;
 HSPLorg/thoughtcrime/securesms/jobs/FastJobStorage;->getPendingJobsWithNoDependenciesInCreatedOrder(J)Ljava/util/List;
@@ -25703,6 +25460,37 @@ HSPLorg/thoughtcrime/securesms/jobs/GroupRingCleanupJob;->serialize()[B
 HSPLorg/thoughtcrime/securesms/jobs/GroupV2UpdateSelfProfileKeyJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/GroupV2UpdateSelfProfileKeyJob;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/jobs/GroupV2UpdateSelfProfileKeyJob;->enqueueForGroupsIfNecessary()V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentAuthCheckJob$Companion;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentAuthCheckJob$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentAuthCheckJob$Factory;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentAuthCheckJob$Factory;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentAuthCheckJob;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentAuthCheckJob;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentAuthCheckJob;-><init>(Lorg/thoughtcrime/securesms/jobmanager/Job$Parameters;)V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentAuthCheckJob;->getFactoryKey()Ljava/lang/String;
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentAuthCheckJob;->serialize()[B
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentGiftSendJob$Factory;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentGiftSendJob$Factory;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob$Companion;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob$Companion;->create(Lorg/thoughtcrime/securesms/database/model/InAppPaymentSubscriberRecord$Type;)Lorg/thoughtcrime/securesms/jobmanager/Job;
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob$Companion;->enqueueAndTrackTime-LRDsOJo(J)V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob$Companion;->enqueueAndTrackTimeIfNecessary()V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob$Factory;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob$Factory;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob;-><init>(Lorg/thoughtcrime/securesms/jobmanager/Job$Parameters;Lorg/thoughtcrime/securesms/database/model/InAppPaymentSubscriberRecord$Type;)V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob;-><init>(Lorg/thoughtcrime/securesms/jobmanager/Job$Parameters;Lorg/thoughtcrime/securesms/database/model/InAppPaymentSubscriberRecord$Type;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob;->access$getTIMEOUT$cp()J
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob;->enqueueAndTrackTimeIfNecessary()V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob;->getFactoryKey()Ljava/lang/String;
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob;->serialize()[B
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentOneTimeContextJob$Factory;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentOneTimeContextJob$Factory;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentRecurringContextJob$Factory;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentRecurringContextJob$Factory;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentRedemptionJob$Factory;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/jobs/InAppPaymentRedemptionJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/IndividualSendJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/JobManagerFactories$1;-><init>(Landroid/app/Application;)V
 HSPLorg/thoughtcrime/securesms/jobs/JobManagerFactories$2;-><init>(Landroid/app/Application;)V
@@ -25740,6 +25528,8 @@ HSPLorg/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob$Factory;->
 HSPLorg/thoughtcrime/securesms/jobs/MultiDeviceContactSyncJob$Factory;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/jobs/MultiDeviceContactSyncJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob$Factory;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobs/MultiDeviceDeleteSendSyncJob$Factory;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/jobs/MultiDeviceDeleteSendSyncJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/MultiDeviceMessageRequestResponseJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/MultiDeviceOutgoingPaymentSyncJob$Factory;-><init>()V
@@ -25868,6 +25658,8 @@ HSPLorg/thoughtcrime/securesms/jobs/ResetSvrGuessCountJob$Factory;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/jobs/ResetSvrGuessCountJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/RestoreAttachmentJob$Factory;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/jobs/RestoreAttachmentJob$Factory;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobs/RestoreAttachmentThumbnailJob$Factory;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/jobs/RestoreAttachmentThumbnailJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/ResumableUploadSpecJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/RetrieveProfileJob$Companion;-><init>()V
@@ -25920,6 +25712,14 @@ HSPLorg/thoughtcrime/securesms/jobs/SenderKeyDistributionSendJob$Factory;-><init
 HSPLorg/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/StickerDownloadJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/StickerPackDownloadJob$Factory;-><init>()V
+HSPLorg/thoughtcrime/securesms/jobs/StickerPackDownloadJob$Factory;->create(Lorg/thoughtcrime/securesms/jobmanager/Job$Parameters;[B)Lorg/thoughtcrime/securesms/jobmanager/Job;
+HSPLorg/thoughtcrime/securesms/jobs/StickerPackDownloadJob$Factory;->create(Lorg/thoughtcrime/securesms/jobmanager/Job$Parameters;[B)Lorg/thoughtcrime/securesms/jobs/StickerPackDownloadJob;
+HSPLorg/thoughtcrime/securesms/jobs/StickerPackDownloadJob;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/jobs/StickerPackDownloadJob;-><init>(Lorg/thoughtcrime/securesms/jobmanager/Job$Parameters;Ljava/lang/String;Ljava/lang/String;ZZ)V
+HSPLorg/thoughtcrime/securesms/jobs/StickerPackDownloadJob;-><init>(Lorg/thoughtcrime/securesms/jobmanager/Job$Parameters;Ljava/lang/String;Ljava/lang/String;ZZLorg/thoughtcrime/securesms/jobs/StickerPackDownloadJob-IA;)V
+HSPLorg/thoughtcrime/securesms/jobs/StickerPackDownloadJob;->onFailure()V
+HSPLorg/thoughtcrime/securesms/jobs/StickerPackDownloadJob;->onRun()V
+HSPLorg/thoughtcrime/securesms/jobs/StickerPackDownloadJob;->onShouldRetry(Ljava/lang/Exception;)Z
 HSPLorg/thoughtcrime/securesms/jobs/StorageAccountRestoreJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/StorageAccountRestoreJob;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/jobs/StorageForcePushJob$Factory;-><init>()V
@@ -25942,13 +25742,6 @@ HSPLorg/thoughtcrime/securesms/jobs/StoryOnboardingDownloadJob;->onRun()V
 HSPLorg/thoughtcrime/securesms/jobs/StoryOnboardingDownloadJob;->serialize()[B
 HSPLorg/thoughtcrime/securesms/jobs/SubmitRateLimitPushChallengeJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/SubscriptionKeepAliveJob$Factory;-><init>()V
-HSPLorg/thoughtcrime/securesms/jobs/SubscriptionKeepAliveJob;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/jobs/SubscriptionKeepAliveJob;-><init>()V
-HSPLorg/thoughtcrime/securesms/jobs/SubscriptionKeepAliveJob;-><init>(Lorg/thoughtcrime/securesms/jobmanager/Job$Parameters;)V
-HSPLorg/thoughtcrime/securesms/jobs/SubscriptionKeepAliveJob;->enqueueAndTrackTime(J)V
-HSPLorg/thoughtcrime/securesms/jobs/SubscriptionKeepAliveJob;->enqueueAndTrackTimeIfNecessary()V
-HSPLorg/thoughtcrime/securesms/jobs/SubscriptionKeepAliveJob;->getFactoryKey()Ljava/lang/String;
-HSPLorg/thoughtcrime/securesms/jobs/SubscriptionKeepAliveJob;->serialize()[B
 HSPLorg/thoughtcrime/securesms/jobs/SubscriptionReceiptRequestResponseJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/Svr2MirrorJob$Factory;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/jobs/Svr2MirrorJob$Factory;-><init>()V
@@ -25961,7 +25754,7 @@ HSPLorg/thoughtcrime/securesms/jobs/ThreadUpdateJob$$ExternalSyntheticLambda0;->
 HSPLorg/thoughtcrime/securesms/jobs/ThreadUpdateJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/jobs/ThreadUpdateJob$Factory;->create(Lorg/thoughtcrime/securesms/jobmanager/Job$Parameters;[B)Lorg/thoughtcrime/securesms/jobmanager/Job;
 HSPLorg/thoughtcrime/securesms/jobs/ThreadUpdateJob$Factory;->create(Lorg/thoughtcrime/securesms/jobmanager/Job$Parameters;[B)Lorg/thoughtcrime/securesms/jobs/ThreadUpdateJob;
-HSPLorg/thoughtcrime/securesms/jobs/ThreadUpdateJob;->$r8$lambda$JSigGKNJwOMmimqwpu8xPBnW5UQ(J)V
+HSPLorg/thoughtcrime/securesms/jobs/ThreadUpdateJob;->$r8$lambda$k7ITCm383e_HHjlbjw2ZZCooT8Y(J)V
 HSPLorg/thoughtcrime/securesms/jobs/ThreadUpdateJob;-><init>(J)V
 HSPLorg/thoughtcrime/securesms/jobs/ThreadUpdateJob;-><init>(Lorg/thoughtcrime/securesms/jobmanager/Job$Parameters;J)V
 HSPLorg/thoughtcrime/securesms/jobs/ThreadUpdateJob;-><init>(Lorg/thoughtcrime/securesms/jobmanager/Job$Parameters;JLorg/thoughtcrime/securesms/jobs/ThreadUpdateJob-IA;)V
@@ -25988,7 +25781,7 @@ HSPLorg/thoughtcrime/securesms/keyboard/KeyboardPage;-><init>(Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/keyboard/KeyboardPage;->values()[Lorg/thoughtcrime/securesms/keyboard/KeyboardPage;
 HSPLorg/thoughtcrime/securesms/keyboard/KeyboardPagerViewModel$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/keyboard/KeyboardPagerViewModel;)V
 HSPLorg/thoughtcrime/securesms/keyboard/KeyboardPagerViewModel$$ExternalSyntheticLambda0;->onResult(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/keyboard/KeyboardPagerViewModel;->$r8$lambda$XJkrNaIPPzC8wWYTIkWhYRIl3fM(Lorg/thoughtcrime/securesms/keyboard/KeyboardPagerViewModel;Ljava/lang/Boolean;)V
+HSPLorg/thoughtcrime/securesms/keyboard/KeyboardPagerViewModel;->$r8$lambda$AcWTOoApAbMPLvvS848bJFYZkjg(Lorg/thoughtcrime/securesms/keyboard/KeyboardPagerViewModel;Ljava/lang/Boolean;)V
 HSPLorg/thoughtcrime/securesms/keyboard/KeyboardPagerViewModel;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/keyboard/KeyboardPagerViewModel;-><init>()V
 HSPLorg/thoughtcrime/securesms/keyboard/KeyboardPagerViewModel;->_init_$lambda$1(Lorg/thoughtcrime/securesms/keyboard/KeyboardPagerViewModel;Ljava/lang/Boolean;)V
@@ -26071,7 +25864,6 @@ HSPLorg/thoughtcrime/securesms/keyvalue/BackupValues$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/keyvalue/BackupValues$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/keyvalue/BackupValues;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/keyvalue/BackupValues;-><init>(Lorg/thoughtcrime/securesms/keyvalue/KeyValueStore;)V
-HSPLorg/thoughtcrime/securesms/keyvalue/BackupValues;->getAreBackupsEnabled()Z
 HSPLorg/thoughtcrime/securesms/keyvalue/BlobValue;-><init>(Ljava/lang/String;[BLorg/thoughtcrime/securesms/keyvalue/KeyValueStore;)V
 HSPLorg/thoughtcrime/securesms/keyvalue/BooleanValue;-><init>(Ljava/lang/String;ZLorg/thoughtcrime/securesms/keyvalue/KeyValueStore;)V
 HSPLorg/thoughtcrime/securesms/keyvalue/BooleanValue;->getValue$Signal_Android_playProdBenchmark(Lorg/thoughtcrime/securesms/keyvalue/KeyValueStore;)Ljava/lang/Boolean;
@@ -26092,13 +25884,14 @@ HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues$observableOneTimeCurrency$2;-><init>(Lorg/thoughtcrime/securesms/keyvalue/DonationsValues;)V
 HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues$observablePendingOneTimeDonation$2;-><init>(Lorg/thoughtcrime/securesms/keyvalue/DonationsValues;)V
-HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues$observableSubscriptionCurrency$2;-><init>(Lorg/thoughtcrime/securesms/keyvalue/DonationsValues;)V
+HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues$observableRecurringBackupsCurrency$2;-><init>(Lorg/thoughtcrime/securesms/keyvalue/DonationsValues;)V
+HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues$observableRecurringDonationCurrency$2;-><init>(Lorg/thoughtcrime/securesms/keyvalue/DonationsValues;)V
 HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues$oneTimeCurrencyPublisher$2;-><init>(Lorg/thoughtcrime/securesms/keyvalue/DonationsValues;)V
 HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues$pendingOneTimeDonationPublisher$2;-><init>(Lorg/thoughtcrime/securesms/keyvalue/DonationsValues;)V
-HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues$subscriptionCurrencyPublisher$2;-><init>(Lorg/thoughtcrime/securesms/keyvalue/DonationsValues;)V
+HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues$recurringBackupCurrencyPublisher$2;-><init>(Lorg/thoughtcrime/securesms/keyvalue/DonationsValues;)V
+HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues$recurringDonationCurrencyPublisher$2;-><init>(Lorg/thoughtcrime/securesms/keyvalue/DonationsValues;)V
 HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues;-><init>(Lorg/thoughtcrime/securesms/keyvalue/KeyValueStore;)V
-HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues;->consumePending3DSData(J)Lorg/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/Stripe3DSData;
 HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues;->consumeTerminalDonations()Ljava/util/List;
 HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues;->consumeVerifiedSubscription3DSData()Lorg/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/Stripe3DSData;
 HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues;->getExpiredBadge()Lorg/thoughtcrime/securesms/badges/models/Badge;
@@ -26107,7 +25900,6 @@ HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues;->getUnexpectedSubscript
 HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues;->getUnexpectedSubscriptionCancelationTimestamp()J
 HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues;->getUnexpectedSubscriptionCancelationWatermark()J
 HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues;->setLastKeepAliveLaunchTime(J)V
-HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues;->setPending3DSData(Lorg/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/Stripe3DSData;)V
 HSPLorg/thoughtcrime/securesms/keyvalue/DonationsValues;->setVerifiedSubscription3DSData(Lorg/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/Stripe3DSData;)V
 HSPLorg/thoughtcrime/securesms/keyvalue/EmojiValues;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/keyvalue/EmojiValues;-><init>(Lorg/thoughtcrime/securesms/keyvalue/KeyValueStore;)V
@@ -26171,7 +25963,7 @@ HSPLorg/thoughtcrime/securesms/keyvalue/KeyValueStore$Writer;->putInteger(Ljava/
 HSPLorg/thoughtcrime/securesms/keyvalue/KeyValueStore$Writer;->putLong(Ljava/lang/String;J)Lorg/thoughtcrime/securesms/keyvalue/KeyValueStore$Writer;
 HSPLorg/thoughtcrime/securesms/keyvalue/KeyValueStore$Writer;->putString(Ljava/lang/String;Ljava/lang/String;)Lorg/thoughtcrime/securesms/keyvalue/KeyValueStore$Writer;
 HSPLorg/thoughtcrime/securesms/keyvalue/KeyValueStore$Writer;->remove(Ljava/lang/String;)Lorg/thoughtcrime/securesms/keyvalue/KeyValueStore$Writer;
-HSPLorg/thoughtcrime/securesms/keyvalue/KeyValueStore;->$r8$lambda$wULmmd1-PmtZ-SnjAVLz5yExi4k(Lorg/thoughtcrime/securesms/keyvalue/KeyValueStore;Lorg/thoughtcrime/securesms/keyvalue/KeyValueDataSet;Ljava/util/Collection;)V
+HSPLorg/thoughtcrime/securesms/keyvalue/KeyValueStore;->$r8$lambda$rXa4TwYezIJ9Ue6oQWkw3Uia-jc(Lorg/thoughtcrime/securesms/keyvalue/KeyValueStore;Lorg/thoughtcrime/securesms/keyvalue/KeyValueDataSet;Ljava/util/Collection;)V
 HSPLorg/thoughtcrime/securesms/keyvalue/KeyValueStore;->-$$Nest$mwrite(Lorg/thoughtcrime/securesms/keyvalue/KeyValueStore;Lorg/thoughtcrime/securesms/keyvalue/KeyValueDataSet;Ljava/util/Collection;)V
 HSPLorg/thoughtcrime/securesms/keyvalue/KeyValueStore;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/keyvalue/KeyValueStore;-><init>(Lorg/thoughtcrime/securesms/keyvalue/KeyValuePersistentStorage;)V
@@ -26289,7 +26081,6 @@ HSPLorg/thoughtcrime/securesms/keyvalue/SettingsValues;-><init>(Lorg/thoughtcrim
 HSPLorg/thoughtcrime/securesms/keyvalue/SettingsValues;->getCensorshipCircumventionEnabled()Lorg/thoughtcrime/securesms/keyvalue/SettingsValues$CensorshipCircumventionEnabled;
 HSPLorg/thoughtcrime/securesms/keyvalue/SettingsValues;->getKeepMessagesDuration()Lorg/thoughtcrime/securesms/keyvalue/KeepMessagesDuration;
 HSPLorg/thoughtcrime/securesms/keyvalue/SettingsValues;->getLanguage()Ljava/lang/String;
-HSPLorg/thoughtcrime/securesms/keyvalue/SettingsValues;->getMessageFontSize()I
 HSPLorg/thoughtcrime/securesms/keyvalue/SettingsValues;->getMessageLedColor()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/keyvalue/SettingsValues;->getMessageNotificationSound()Landroid/net/Uri;
 HSPLorg/thoughtcrime/securesms/keyvalue/SettingsValues;->getMessageNotificationsPrivacy()Lorg/thoughtcrime/securesms/preferences/widgets/NotificationPrivacyPreference;
@@ -26297,7 +26088,6 @@ HSPLorg/thoughtcrime/securesms/keyvalue/SettingsValues;->getTheme()Lorg/thoughtc
 HSPLorg/thoughtcrime/securesms/keyvalue/SettingsValues;->getUniversalExpireTimer()I
 HSPLorg/thoughtcrime/securesms/keyvalue/SettingsValues;->getUseCompactNavigationBar()Z
 HSPLorg/thoughtcrime/securesms/keyvalue/SettingsValues;->isBackupEnabled()Z
-HSPLorg/thoughtcrime/securesms/keyvalue/SettingsValues;->isEnterKeySends()Z
 HSPLorg/thoughtcrime/securesms/keyvalue/SettingsValues;->isMessageNotificationsEnabled()Z
 HSPLorg/thoughtcrime/securesms/keyvalue/SettingsValues;->isMessageVibrateEnabled()Z
 HSPLorg/thoughtcrime/securesms/keyvalue/SettingsValues;->isPreferSystemContactPhotos()Z
@@ -26389,7 +26179,6 @@ HSPLorg/thoughtcrime/securesms/keyvalue/WallpaperValues;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/keyvalue/WallpaperValues;-><init>(Lorg/thoughtcrime/securesms/keyvalue/KeyValueStore;)V
 HSPLorg/thoughtcrime/securesms/keyvalue/WallpaperValues;->getCurrentWallpaper()Lorg/thoughtcrime/securesms/database/model/databaseprotos/Wallpaper;
 HSPLorg/thoughtcrime/securesms/keyvalue/WallpaperValues;->getWallpaper()Lorg/thoughtcrime/securesms/wallpaper/ChatWallpaper;
-HSPLorg/thoughtcrime/securesms/keyvalue/WallpaperValues;->hasWallpaperSet()Z
 HSPLorg/thoughtcrime/securesms/keyvalue/protos/LeastActiveLinkedDevice$Companion$ADAPTER$1;-><init>(Lcom/squareup/wire/FieldEncoding;Lkotlin/reflect/KClass;Lcom/squareup/wire/Syntax;)V
 HSPLorg/thoughtcrime/securesms/keyvalue/protos/LeastActiveLinkedDevice$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/keyvalue/protos/LeastActiveLinkedDevice$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -26423,13 +26212,14 @@ HSPLorg/thoughtcrime/securesms/logging/PersistentLogger;->getThreadString()Ljava
 HSPLorg/thoughtcrime/securesms/logging/PersistentLogger;->i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Z)V
 HSPLorg/thoughtcrime/securesms/logging/PersistentLogger;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Z)V
 HSPLorg/thoughtcrime/securesms/logging/PersistentLogger;->write(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Z)V
-HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$$ExternalSyntheticLambda0;-><init>()V
-HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$$ExternalSyntheticLambda0;->run()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment;)V
-HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$$ExternalSyntheticLambda1;->run(Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment;)V
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment;)V
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment;)V
+HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$$ExternalSyntheticLambda5;-><init>()V
+HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$$ExternalSyntheticLambda5;->run()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$$ExternalSyntheticLambda6;-><init>(Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment;)V
+HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$$ExternalSyntheticLambda6;->run(Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$$ExternalSyntheticLambda7;-><init>(Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment;)V
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$DestinationChangedListener;-><init>(Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment;)V
@@ -26440,7 +26230,6 @@ HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$conversationLis
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$onViewCreated$3;-><init>(Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment;)V
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$onViewCreated$3;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$onViewCreated$3;->invoke(Lorg/thoughtcrime/securesms/stories/tabs/ConversationListTabsState;)V
-HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$openSettings$1;-><init>(Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment;)V
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$special$$inlined$viewModels$default$1;-><init>(Lkotlin/jvm/functions/Function0;)V
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$special$$inlined$viewModels$default$1;->invoke()Landroidx/lifecycle/ViewModelStoreOwner;
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$special$$inlined$viewModels$default$1;->invoke()Ljava/lang/Object;
@@ -26453,8 +26242,8 @@ HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$special$$inline
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$special$$inlined$viewModels$default$4;-><init>(Landroidx/fragment/app/Fragment;Lkotlin/Lazy;)V
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$special$$inlined$viewModels$default$4;->invoke()Landroidx/lifecycle/ViewModelProvider$Factory;
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment$special$$inlined$viewModels$default$4;->invoke()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment;->$r8$lambda$RjhL0tohKVjq6TqtpBZxQrc84rY()Lorg/thoughtcrime/securesms/recipients/Recipient;
-HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment;->$r8$lambda$ZQZkr5qGm_FH71EZU7zrj1uz5bw(Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
+HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment;->$r8$lambda$7AydzDx5RLQ4evMZ49ZE_wWy2do()Lorg/thoughtcrime/securesms/recipients/Recipient;
+HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment;->$r8$lambda$pPbcUsDUp8NsIUzsdsJLecp8RKI(Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment;-><init>()V
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment;->access$goToStateFromConversationList(Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment;Lorg/thoughtcrime/securesms/stories/tabs/ConversationListTabsState;Landroidx/navigation/NavController;)V
@@ -26467,7 +26256,7 @@ HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment;->goToStateFrom
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment;->initializeProfileIcon(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment;->initializeSettingsTouchTarget()V
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment;->onPause()V
-HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment;->onResume$lambda$2()Lorg/thoughtcrime/securesms/recipients/Recipient;
+HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment;->onResume$lambda$3()Lorg/thoughtcrime/securesms/recipients/Recipient;
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment;->onResume()V
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
 HSPLorg/thoughtcrime/securesms/main/MainActivityListHostFragment;->presentToolbarForConversationListFragment()V
@@ -26505,28 +26294,28 @@ HSPLorg/thoughtcrime/securesms/megaphone/Megaphone;-><init>(Lorg/thoughtcrime/se
 HSPLorg/thoughtcrime/securesms/megaphone/Megaphone;-><init>(Lorg/thoughtcrime/securesms/megaphone/Megaphone$Builder;Lorg/thoughtcrime/securesms/megaphone/Megaphone-IA;)V
 HSPLorg/thoughtcrime/securesms/megaphone/Megaphone;->getEvent()Lorg/thoughtcrime/securesms/megaphone/Megaphones$Event;
 HSPLorg/thoughtcrime/securesms/megaphone/Megaphone;->getStyle()Lorg/thoughtcrime/securesms/megaphone/Megaphone$Style;
-HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;Lorg/thoughtcrime/securesms/megaphone/Megaphones$Event;J)V
-HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda0;->run()V
+HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda0;-><init>()V
+HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda1;-><init>()V
+HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;)V
 HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda2;->run()V
 HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;Lorg/thoughtcrime/securesms/megaphone/Megaphones$Event;Ljava/lang/Runnable;)V
 HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda4;->run()V
-HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda5;-><init>(Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;)V
-HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda5;->run()V
-HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda6;-><init>()V
-HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda6;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda7;-><init>()V
-HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda7;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda8;-><init>(Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$Callback;)V
+HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda6;-><init>(Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;Lorg/thoughtcrime/securesms/megaphone/Megaphones$Event;J)V
+HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda6;->run()V
+HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda7;-><init>(Ljava/util/Set;)V
+HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda7;->test(Ljava/lang/Object;)Z
+HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda8;-><init>(Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;)V
 HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda8;->run()V
-HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda9;-><init>(Ljava/util/Set;)V
-HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda9;->test(Ljava/lang/Object;)Z
-HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;->$r8$lambda$9CK00O2xlGLsFgpbs4EgOVKIumo(Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;Lorg/thoughtcrime/securesms/megaphone/Megaphones$Event;J)V
-HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;->$r8$lambda$N4vh_Tp2O5zwjQgglI8kTjDnN7A(Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$Callback;)V
-HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;->$r8$lambda$T_BQpKugvjYkxCDv7E-wZYoaIX4(Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;)V
-HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;->$r8$lambda$eiY3IINCPvIzYRkkjDfht6ASB_k(Lorg/thoughtcrime/securesms/database/model/MegaphoneRecord;)Lorg/thoughtcrime/securesms/database/model/MegaphoneRecord;
-HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;->$r8$lambda$j32FYpMgFMNTp8xihfng8-_hnDA(Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;)V
-HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;->$r8$lambda$nMRgmCXHW2nK3XRViScoZIXyi10(Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;Lorg/thoughtcrime/securesms/megaphone/Megaphones$Event;Ljava/lang/Runnable;)V
+HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda9;-><init>(Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$Callback;)V
+HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda9;->run()V
+HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;->$r8$lambda$FqvXE6nVWCRDBNrqbtskcGReJYs(Lorg/thoughtcrime/securesms/database/model/MegaphoneRecord;)Lorg/thoughtcrime/securesms/database/model/MegaphoneRecord;
+HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;->$r8$lambda$IhosN-DaI47gNH20J4MttyvVr2M(Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$Callback;)V
+HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;->$r8$lambda$UHGvG3Y5x0hgasUxlcK_-VGJPlc(Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;Lorg/thoughtcrime/securesms/megaphone/Megaphones$Event;Ljava/lang/Runnable;)V
+HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;->$r8$lambda$ZbOb_EnZel-L-lCEJTM-IaqnS48(Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;Lorg/thoughtcrime/securesms/megaphone/Megaphones$Event;J)V
+HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;->$r8$lambda$tnR8zcUVBDzNy8VCCZSCPazWu9M(Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;)V
+HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;->$r8$lambda$wyPrtDX7LURH8-j_qBxkMdvIuQE(Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;)V
 HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;-><init>(Landroid/app/Application;)V
 HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;->getNextMegaphone(Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$Callback;)V
 HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;->getRecord(Lorg/thoughtcrime/securesms/megaphone/Megaphones$Event;)Lorg/thoughtcrime/securesms/database/model/MegaphoneRecord;
@@ -26544,24 +26333,24 @@ HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;->resetDatabaseCach
 HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneViewBuilder$1;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneViewBuilder;->build(Landroid/content/Context;Lorg/thoughtcrime/securesms/megaphone/Megaphone;Lorg/thoughtcrime/securesms/megaphone/MegaphoneActionController;)Landroid/view/View;
 HSPLorg/thoughtcrime/securesms/megaphone/MegaphoneViewBuilder;->buildOnboardingMegaphone(Landroid/content/Context;Lorg/thoughtcrime/securesms/megaphone/Megaphone;Lorg/thoughtcrime/securesms/megaphone/MegaphoneActionController;)Landroid/view/View;
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda21;-><init>(Ljava/util/Map;J)V
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda21;->test(Ljava/lang/Object;)Z
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda22;-><init>()V
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda22;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda23;-><init>(Ljava/util/Map;)V
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda23;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda24;-><init>(Landroid/content/Context;)V
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda24;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda16;-><init>()V
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda16;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda1;-><init>()V
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda25;-><init>(Ljava/util/Map;J)V
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda25;->test(Ljava/lang/Object;)Z
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda26;-><init>()V
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda26;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda27;-><init>(Ljava/util/Map;)V
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda27;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda28;-><init>(Landroid/content/Context;)V
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda28;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/megaphone/Megaphones$Event;)V
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda3;-><init>()V
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda3;->apply(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda4;-><init>()V
 HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda4;->test(Ljava/lang/Object;)Z
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda5;-><init>(Lorg/thoughtcrime/securesms/megaphone/Megaphones$Event;)V
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda5;->test(Ljava/lang/Object;)Z
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda6;-><init>()V
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda6;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda7;-><init>()V
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda7;->test(Ljava/lang/Object;)Z
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda8;-><init>()V
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda8;->apply(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$1;-><init>(Landroid/content/Context;Ljava/util/Map;)V
 HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$3;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$Event;->$values()[Lorg/thoughtcrime/securesms/megaphone/Megaphones$Event;
@@ -26571,12 +26360,12 @@ HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$Event;->fromKey(Ljava/lang/S
 HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$Event;->getKey()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$Event;->hasKey(Ljava/lang/String;)Z
 HSPLorg/thoughtcrime/securesms/megaphone/Megaphones$Event;->values()[Lorg/thoughtcrime/securesms/megaphone/Megaphones$Event;
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones;->$r8$lambda$FDbv6uSpRzHyYNDnZTF-2s_O_3g(Ljava/lang/Long;)Z
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones;->$r8$lambda$_2K77hIOFzrtJ762LZYBsNHIYfw(Lorg/thoughtcrime/securesms/megaphone/Megaphones$Event;Ljava/util/Map$Entry;)Z
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones;->$r8$lambda$jKOYs4kAlzGKOSd0Gb2wil_axMM(Ljava/util/Map;JLjava/util/Map$Entry;)Z
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones;->$r8$lambda$p95meu3kraxrQi7DBKBuyQrZXNc(Ljava/util/Map$Entry;)Ljava/lang/Long;
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones;->$r8$lambda$pta7ncLgHvVO2uhbLUhCHhk1XfM(Ljava/util/Map$Entry;)Z
-HSPLorg/thoughtcrime/securesms/megaphone/Megaphones;->$r8$lambda$ya9b6y2SFOc06_b4NHtqa2lYZ44(Landroid/content/Context;Lorg/thoughtcrime/securesms/database/model/MegaphoneRecord;)Lorg/thoughtcrime/securesms/megaphone/Megaphone;
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones;->$r8$lambda$2TIUX8XWsBb-ST94UNkJf_1Ohbc(Landroid/content/Context;Lorg/thoughtcrime/securesms/database/model/MegaphoneRecord;)Lorg/thoughtcrime/securesms/megaphone/Megaphone;
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones;->$r8$lambda$8VSP4RHw95C6zuN_76hjX8sfUCw(Ljava/util/Map$Entry;)Z
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones;->$r8$lambda$8iNJ-aXZpL9mszmHVVEOQrN-Y1k(Ljava/lang/Long;)Z
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones;->$r8$lambda$K-liLj6EH624VF4eS6i8lTW6EHw(Lorg/thoughtcrime/securesms/megaphone/Megaphones$Event;Ljava/util/Map$Entry;)Z
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones;->$r8$lambda$KEaHb-KR_1SVqnH_zRKxUTeKbps(Ljava/util/Map;JLjava/util/Map$Entry;)Z
+HSPLorg/thoughtcrime/securesms/megaphone/Megaphones;->$r8$lambda$v0bQU8mkoKu2BhQwXTed6dVc-Fk(Ljava/util/Map$Entry;)Ljava/lang/Long;
 HSPLorg/thoughtcrime/securesms/megaphone/Megaphones;->-$$Nest$sfgetALWAYS()Lorg/thoughtcrime/securesms/megaphone/MegaphoneSchedule;
 HSPLorg/thoughtcrime/securesms/megaphone/Megaphones;->-$$Nest$sfgetNEVER()Lorg/thoughtcrime/securesms/megaphone/MegaphoneSchedule;
 HSPLorg/thoughtcrime/securesms/megaphone/Megaphones;->-$$Nest$smshouldShowAddAProfilePhotoMegaphone(Landroid/content/Context;)Z
@@ -26611,10 +26400,31 @@ HSPLorg/thoughtcrime/securesms/megaphone/Megaphones;->shouldShowRemoteMegaphone(
 HSPLorg/thoughtcrime/securesms/megaphone/Megaphones;->shouldShowSetUpYourUsernameMegaphone(Ljava/util/Map;)Z
 HSPLorg/thoughtcrime/securesms/megaphone/Megaphones;->shouldShowTurnOffCircumventionMegaphone()Z
 HSPLorg/thoughtcrime/securesms/megaphone/Megaphones;->timeSinceLastDonatePrompt(Lorg/thoughtcrime/securesms/megaphone/Megaphones$Event;Ljava/util/Map;)J
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$AddPhotoCardViewHolder;-><init>(Landroid/view/View;)V
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$AddPhotoCardViewHolder;->getBackgroundColor()I
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$AddPhotoCardViewHolder;->getButtonStringRes()I
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$AddPhotoCardViewHolder;->getImageRes()I
 HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardAdapter;-><init>(Landroid/content/Context;Lorg/thoughtcrime/securesms/megaphone/MegaphoneActionController;)V
 HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardAdapter;->buildData()Ljava/util/List;
 HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardAdapter;->getItemCount()I
-HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView;->-$$Nest$sfgetTAG()Ljava/lang/String;
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardAdapter;->getItemId(I)J
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardAdapter;->getItemViewType(I)I
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardAdapter;->onBindViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardAdapter;->onBindViewHolder(Lorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardViewHolder;I)V
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Lorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardViewHolder;
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardViewHolder$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardViewHolder;Lorg/thoughtcrime/securesms/megaphone/MegaphoneActionController;Lorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$ActionClickListener;)V
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardViewHolder$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardViewHolder;Lorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$ActionClickListener;)V
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardViewHolder;-><init>(Landroid/view/View;)V
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardViewHolder;->bind(Lorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$ActionClickListener;Lorg/thoughtcrime/securesms/megaphone/MegaphoneActionController;)V
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$GroupCardViewHolder;-><init>(Landroid/view/View;)V
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$GroupCardViewHolder;->getBackgroundColor()I
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$GroupCardViewHolder;->getButtonStringRes()I
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$GroupCardViewHolder;->getImageRes()I
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$InviteCardViewHolder;-><init>(Landroid/view/View;)V
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$InviteCardViewHolder;->getBackgroundColor()I
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$InviteCardViewHolder;->getButtonStringRes()I
+HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$InviteCardViewHolder;->getImageRes()I
 HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView;-><init>(Landroid/content/Context;)V
 HSPLorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView;->initialize(Landroid/content/Context;)V
@@ -26624,12 +26434,10 @@ HSPLorg/thoughtcrime/securesms/megaphone/PinsForAllSchedule;-><init>()V
 HSPLorg/thoughtcrime/securesms/megaphone/PinsForAllSchedule;->isEnabled()Z
 HSPLorg/thoughtcrime/securesms/megaphone/PinsForAllSchedule;->shouldDisplay(IJJJ)Z
 HSPLorg/thoughtcrime/securesms/megaphone/RecurringSchedule;-><init>([J)V
-HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$donate$1;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$donate$1;-><init>()V
-HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$donateForFriend$1;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$donateForFriend$1;-><init>()V
-HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$finish$1;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$finish$1;-><init>()V
+HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$$ExternalSyntheticLambda1;-><init>()V
+HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$$ExternalSyntheticLambda2;-><init>()V
+HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$$ExternalSyntheticLambda3;-><init>()V
+HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$$ExternalSyntheticLambda4;-><init>()V
 HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$getRemoteMegaphoneToShow$1;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$getRemoteMegaphoneToShow$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$getRemoteMegaphoneToShow$2;-><clinit>()V
@@ -26637,8 +26445,6 @@ HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$getRemoteMega
 HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$getRemoteMegaphoneToShow$3;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$getRemoteMegaphoneToShow$3;-><init>()V
 HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$getRemoteMegaphoneToShow$4;-><init>(J)V
-HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$snooze$1;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$snooze$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository;-><init>()V
 HSPLorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository;->getRemoteMegaphoneToShow$default(JILjava/lang/Object;)Lorg/thoughtcrime/securesms/database/model/RemoteMegaphoneRecord;
@@ -26653,13 +26459,8 @@ HSPLorg/thoughtcrime/securesms/messagerequests/GroupInfo$Companion;-><init>(Lkot
 HSPLorg/thoughtcrime/securesms/messagerequests/GroupInfo;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/messagerequests/GroupInfo;-><init>(IILjava/lang/String;Z)V
 HSPLorg/thoughtcrime/securesms/messagerequests/GroupInfo;-><init>(IILjava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/messagerequests/GroupInfo;->getDescription()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/messagerequests/MessageRequestRecipientInfo;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/messagerequests/MessageRequestRecipientInfo;-><init>(Lorg/thoughtcrime/securesms/recipients/Recipient;Lorg/thoughtcrime/securesms/messagerequests/GroupInfo;Ljava/util/List;Lorg/thoughtcrime/securesms/messagerequests/MessageRequestState;)V
-HSPLorg/thoughtcrime/securesms/messagerequests/MessageRequestRecipientInfo;->component1()Lorg/thoughtcrime/securesms/recipients/Recipient;
-HSPLorg/thoughtcrime/securesms/messagerequests/MessageRequestRecipientInfo;->component2()Lorg/thoughtcrime/securesms/messagerequests/GroupInfo;
-HSPLorg/thoughtcrime/securesms/messagerequests/MessageRequestRecipientInfo;->component3()Ljava/util/List;
-HSPLorg/thoughtcrime/securesms/messagerequests/MessageRequestRecipientInfo;->component4()Lorg/thoughtcrime/securesms/messagerequests/MessageRequestState;
 HSPLorg/thoughtcrime/securesms/messagerequests/MessageRequestRepository;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/messagerequests/MessageRequestRepository;-><init>(Landroid/content/Context;)V
 HSPLorg/thoughtcrime/securesms/messagerequests/MessageRequestRepository;->getMessageRequestState(Lorg/thoughtcrime/securesms/recipients/Recipient;J)Lorg/thoughtcrime/securesms/messagerequests/MessageRequestState;
@@ -26701,7 +26502,7 @@ HSPLorg/thoughtcrime/securesms/messages/IncomingMessageObserver$MessageRetrieval
 HSPLorg/thoughtcrime/securesms/messages/IncomingMessageObserver$networkConnectionListener$1;-><init>(Lorg/thoughtcrime/securesms/messages/IncomingMessageObserver;)V
 HSPLorg/thoughtcrime/securesms/messages/IncomingMessageObserver$networkConnectionListener$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/messages/IncomingMessageObserver$networkConnectionListener$1;->invoke(Lkotlin/jvm/functions/Function0;)V
-HSPLorg/thoughtcrime/securesms/messages/IncomingMessageObserver;->$r8$lambda$8cKHpTygjJBaEod3w1sOBkhl4g8(Lorg/thoughtcrime/securesms/messages/IncomingMessageObserver;)V
+HSPLorg/thoughtcrime/securesms/messages/IncomingMessageObserver;->$r8$lambda$Sj1orM23laucxxXzoSjCkFySf2g(Lorg/thoughtcrime/securesms/messages/IncomingMessageObserver;)V
 HSPLorg/thoughtcrime/securesms/messages/IncomingMessageObserver;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/messages/IncomingMessageObserver;-><init>(Landroid/app/Application;)V
 HSPLorg/thoughtcrime/securesms/messages/IncomingMessageObserver;->access$disconnect(Lorg/thoughtcrime/securesms/messages/IncomingMessageObserver;)V
@@ -26766,6 +26567,8 @@ HSPLorg/thoughtcrime/securesms/migrations/BlobStorageLocationMigrationJob$Factor
 HSPLorg/thoughtcrime/securesms/migrations/CachedAttachmentsMigrationJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/migrations/ClearGlideCacheMigrationJob$Factory;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/migrations/ClearGlideCacheMigrationJob$Factory;-><init>()V
+HSPLorg/thoughtcrime/securesms/migrations/ContactLinkRebuildMigrationJob$Factory;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/migrations/ContactLinkRebuildMigrationJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/migrations/CopyUsernameToSignalStoreMigrationJob$Factory;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/migrations/CopyUsernameToSignalStoreMigrationJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/migrations/DatabaseMigrationJob$Factory;-><init>()V
@@ -26808,6 +26611,8 @@ HSPLorg/thoughtcrime/securesms/migrations/StorageServiceMigrationJob$Factory;-><
 HSPLorg/thoughtcrime/securesms/migrations/StorageServiceSystemNameMigrationJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/migrations/StoryViewedReceiptsStateMigrationJob$Factory;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/migrations/StoryViewedReceiptsStateMigrationJob$Factory;-><init>()V
+HSPLorg/thoughtcrime/securesms/migrations/SubscriberIdMigrationJob$Factory;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/migrations/SubscriberIdMigrationJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/migrations/Svr2MirrorMigrationJob$Factory;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/migrations/Svr2MirrorMigrationJob$Factory;-><init>()V
 HSPLorg/thoughtcrime/securesms/migrations/SyncDistributionListsMigrationJob$Factory;-><init>()V
@@ -26825,8 +26630,6 @@ HSPLorg/thoughtcrime/securesms/mms/DecryptableStreamUriLoader$Factory;-><init>(L
 HSPLorg/thoughtcrime/securesms/mms/ImageSlide;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/mms/ImageSlide;-><init>(Lorg/thoughtcrime/securesms/attachments/Attachment;)V
 HSPLorg/thoughtcrime/securesms/mms/ImageSlide;->hasImage()Z
-HSPLorg/thoughtcrime/securesms/mms/ImageSlide;->hasPlaceholder()Z
-HSPLorg/thoughtcrime/securesms/mms/ImageSlide;->isBorderless()Z
 HSPLorg/thoughtcrime/securesms/mms/IncomingMessage$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/mms/IncomingMessage$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/mms/IncomingMessage;-><clinit>()V
@@ -26873,24 +26676,14 @@ HSPLorg/thoughtcrime/securesms/mms/SignalGlideModule;->applyOptions(Landroid/con
 HSPLorg/thoughtcrime/securesms/mms/SignalGlideModule;->registerComponents(Landroid/content/Context;Lcom/bumptech/glide/Glide;Lcom/bumptech/glide/Registry;)V
 HSPLorg/thoughtcrime/securesms/mms/SignalGlideModule;->setRegisterGlideComponents(Lorg/thoughtcrime/securesms/mms/RegisterGlideComponents;)V
 HSPLorg/thoughtcrime/securesms/mms/Slide;-><init>(Lorg/thoughtcrime/securesms/attachments/Attachment;)V
-HSPLorg/thoughtcrime/securesms/mms/Slide;->asAttachment()Lorg/thoughtcrime/securesms/attachments/Attachment;
 HSPLorg/thoughtcrime/securesms/mms/Slide;->getBody()Lj$/util/Optional;
-HSPLorg/thoughtcrime/securesms/mms/Slide;->getCaption()Lj$/util/Optional;
 HSPLorg/thoughtcrime/securesms/mms/Slide;->getContentType()Ljava/lang/String;
-HSPLorg/thoughtcrime/securesms/mms/Slide;->getFileSize()J
-HSPLorg/thoughtcrime/securesms/mms/Slide;->getPlaceholderBlur()Lorg/thoughtcrime/securesms/blurhash/BlurHash;
-HSPLorg/thoughtcrime/securesms/mms/Slide;->getTransferState()I
 HSPLorg/thoughtcrime/securesms/mms/Slide;->getUri()Landroid/net/Uri;
 HSPLorg/thoughtcrime/securesms/mms/Slide;->hasAudio()Z
 HSPLorg/thoughtcrime/securesms/mms/Slide;->hasDocument()Z
 HSPLorg/thoughtcrime/securesms/mms/Slide;->hasSticker()Z
 HSPLorg/thoughtcrime/securesms/mms/Slide;->hasVideo()Z
-HSPLorg/thoughtcrime/securesms/mms/Slide;->hashCode()I
-HSPLorg/thoughtcrime/securesms/mms/Slide;->isInProgress()Z
-HSPLorg/thoughtcrime/securesms/mms/Slide;->isPendingDownload()Z
 HSPLorg/thoughtcrime/securesms/mms/Slide;->isVideoGif()Z
-HSPLorg/thoughtcrime/securesms/mms/SlideDeck$$ExternalSyntheticLambda0;-><init>()V
-HSPLorg/thoughtcrime/securesms/mms/SlideDeck$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z
 HSPLorg/thoughtcrime/securesms/mms/SlideDeck;-><init>(Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/mms/SlideDeck;->getAudioSlide()Lorg/thoughtcrime/securesms/mms/AudioSlide;
 HSPLorg/thoughtcrime/securesms/mms/SlideDeck;->getBody()Ljava/lang/String;
@@ -26899,7 +26692,6 @@ HSPLorg/thoughtcrime/securesms/mms/SlideDeck;->getSlides()Ljava/util/List;
 HSPLorg/thoughtcrime/securesms/mms/SlideDeck;->getStickerSlide()Lorg/thoughtcrime/securesms/mms/StickerSlide;
 HSPLorg/thoughtcrime/securesms/mms/SlideDeck;->getTextSlide()Lorg/thoughtcrime/securesms/mms/TextSlide;
 HSPLorg/thoughtcrime/securesms/mms/SlideDeck;->getThumbnailSlide()Lorg/thoughtcrime/securesms/mms/Slide;
-HSPLorg/thoughtcrime/securesms/mms/SlideDeck;->getThumbnailSlides()Ljava/util/List;
 HSPLorg/thoughtcrime/securesms/mms/SlideFactory$MediaType;->$values()[Lorg/thoughtcrime/securesms/mms/SlideFactory$MediaType;
 HSPLorg/thoughtcrime/securesms/mms/SlideFactory$MediaType;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/mms/SlideFactory$MediaType;-><init>(Ljava/lang/String;ILjava/lang/String;)V
@@ -26928,23 +26720,23 @@ HSPLorg/thoughtcrime/securesms/net/RemoteDeprecationDetectorInterceptor;->interc
 HSPLorg/thoughtcrime/securesms/net/SequentialDns;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/net/SequentialDns;-><init>([Lokhttp3/Dns;)V
 HSPLorg/thoughtcrime/securesms/net/SequentialDns;->lookup(Ljava/lang/String;)Ljava/util/List;
-HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;)V
-HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$$ExternalSyntheticLambda1;->accept(Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;Lorg/whispersystems/signalservice/api/SignalWebSocket;)V
+HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$$ExternalSyntheticLambda0;->run()V
+HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;Lorg/whispersystems/signalservice/api/websocket/WebSocketConnectionState;ZLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$HealthState;)V
+HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$$ExternalSyntheticLambda1;->run()V
 HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;)V
 HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$$ExternalSyntheticLambda2;->accept(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;Lorg/whispersystems/signalservice/api/SignalWebSocket;)V
-HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$$ExternalSyntheticLambda4;->run()V
-HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$$ExternalSyntheticLambda5;-><init>(Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;Lorg/whispersystems/signalservice/api/websocket/WebSocketConnectionState;ZLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$HealthState;)V
-HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$$ExternalSyntheticLambda5;->run()V
+HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;)V
+HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$$ExternalSyntheticLambda3;->accept(Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$1;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$HealthState;->-$$Nest$fgetneedsKeepAlive(Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$HealthState;)Z
 HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$HealthState;->-$$Nest$fputneedsKeepAlive(Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$HealthState;Z)V
 HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$HealthState;-><init>()V
 HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$HealthState;-><init>(Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$HealthState-IA;)V
-HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;->$r8$lambda$8e3bqFLmZ73vjPMsk0ty16bsf44(Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;Lorg/whispersystems/signalservice/api/websocket/WebSocketConnectionState;ZLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$HealthState;)V
-HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;->$r8$lambda$V2bkncf8QKGZGjKZtiXFkKUq6ak(Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;Lorg/whispersystems/signalservice/api/SignalWebSocket;)V
-HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;->$r8$lambda$pNWCZjEd5CWWMpttb6S-aKP1Xqk(Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;Lorg/whispersystems/signalservice/api/websocket/WebSocketConnectionState;)V
-HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;->$r8$lambda$zxDP9pREVOUza6jCvMkWlGZ7Pe8(Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;Lorg/whispersystems/signalservice/api/websocket/WebSocketConnectionState;)V
+HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;->$r8$lambda$dL8hQ2nLLyjk7ansP650uYAgobM(Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;Lorg/whispersystems/signalservice/api/websocket/WebSocketConnectionState;)V
+HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;->$r8$lambda$eCKAGgvQfl4pX18sn8EtpMIdvVo(Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;Lorg/whispersystems/signalservice/api/websocket/WebSocketConnectionState;)V
+HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;->$r8$lambda$fFnH6f223DoWHNqDpa-DZR5syU0(Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;Lorg/whispersystems/signalservice/api/SignalWebSocket;)V
+HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;->$r8$lambda$s4G3167HHQVWl086JDTE1nf9OK0(Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;Lorg/whispersystems/signalservice/api/websocket/WebSocketConnectionState;ZLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$HealthState;)V
 HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;-><init>(Landroid/app/Application;Lorg/whispersystems/signalservice/api/util/SleepTimer;)V
 HSPLorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;->isKeepAliveNecessary()Z
@@ -26968,17 +26760,18 @@ HSPLorg/thoughtcrime/securesms/notifications/Configuration;->getMinimumMessageLa
 HSPLorg/thoughtcrime/securesms/notifications/Configuration;->getMinimumServiceEventCount()I
 HSPLorg/thoughtcrime/securesms/notifications/Configuration;->getServiceStartFailurePercentage()F
 HSPLorg/thoughtcrime/securesms/notifications/Configuration;->getWeeklyFailedQueueDrains()I
-HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/NotificationManager;Ljava/lang/String;)Landroid/app/NotificationChannelGroup;
-HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline1;->m(Landroid/app/NotificationChannelGroup;)Z
-HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline2;->m(Landroid/app/NotificationChannel;)Ljava/lang/String;
+HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/NotificationManager;)Z
+HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline1;->m(Landroid/app/NotificationManager;Ljava/lang/String;)Landroid/app/NotificationChannelGroup;
+HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline2;->m(Landroid/app/NotificationChannelGroup;)Z
+HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline4;->m(Landroid/app/NotificationChannel;)Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline5;->m(Landroid/app/NotificationManager;Landroid/app/NotificationChannelGroup;)V
 HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline6;->m(Landroid/app/NotificationManager;Ljava/util/List;)V
-HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline7;->m(Ljava/lang/String;Ljava/lang/CharSequence;)Landroid/app/NotificationChannelGroup;
-HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline8;->m()V
+HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline8;->m(Ljava/lang/String;Ljava/lang/CharSequence;)Landroid/app/NotificationChannelGroup;
+HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline9;->m()V
 HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticLambda11;-><init>(Lorg/thoughtcrime/securesms/notifications/NotificationChannels;)V
 HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticLambda11;->run()V
-HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticLambda17;-><init>()V
-HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticLambda17;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticLambda12;-><init>()V
+HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticLambda12;->apply(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels;-><init>(Landroid/app/Application;)V
 HSPLorg/thoughtcrime/securesms/notifications/NotificationChannels;->areNotificationsEnabled()Z
@@ -27016,7 +26809,7 @@ HSPLorg/thoughtcrime/securesms/notifications/VitalsViewModel$State;->$values()[L
 HSPLorg/thoughtcrime/securesms/notifications/VitalsViewModel$State;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/notifications/VitalsViewModel$State;-><init>(Ljava/lang/String;I)V
 HSPLorg/thoughtcrime/securesms/notifications/VitalsViewModel$State;->values()[Lorg/thoughtcrime/securesms/notifications/VitalsViewModel$State;
-HSPLorg/thoughtcrime/securesms/notifications/VitalsViewModel;->$r8$lambda$U_V7OZ_aXNSNkBigbMvFTCSaUpQ(Lorg/thoughtcrime/securesms/notifications/VitalsViewModel;)Lorg/thoughtcrime/securesms/notifications/VitalsViewModel$State;
+HSPLorg/thoughtcrime/securesms/notifications/VitalsViewModel;->$r8$lambda$SpsriQ25FR5tf-giOi8MwINrpjM(Lorg/thoughtcrime/securesms/notifications/VitalsViewModel;)Lorg/thoughtcrime/securesms/notifications/VitalsViewModel$State;
 HSPLorg/thoughtcrime/securesms/notifications/VitalsViewModel;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/notifications/VitalsViewModel;-><init>(Landroid/app/Application;)V
 HSPLorg/thoughtcrime/securesms/notifications/VitalsViewModel;->access$checkHeuristics(Lorg/thoughtcrime/securesms/notifications/VitalsViewModel;)Lio/reactivex/rxjava3/core/Single;
@@ -27050,9 +26843,9 @@ HSPLorg/thoughtcrime/securesms/notifications/v2/NotificationState$notificationIt
 HSPLorg/thoughtcrime/securesms/notifications/v2/NotificationState;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/notifications/v2/NotificationState;-><init>(Ljava/util/List;Ljava/util/List;Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/notifications/v2/NotificationState;->access$getEMPTY$cp()Lorg/thoughtcrime/securesms/notifications/v2/NotificationState;
-HSPLorg/thoughtcrime/securesms/permissions/Permissions$$ExternalSyntheticLambda0;-><init>(Landroid/content/Context;)V
-HSPLorg/thoughtcrime/securesms/permissions/Permissions$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z
-HSPLorg/thoughtcrime/securesms/permissions/Permissions;->$r8$lambda$Q0AcdMcPXUgr1QQ_HDTcoSx0sHo(Landroid/content/Context;Ljava/lang/String;)Z
+HSPLorg/thoughtcrime/securesms/permissions/Permissions$$ExternalSyntheticLambda1;-><init>(Landroid/content/Context;)V
+HSPLorg/thoughtcrime/securesms/permissions/Permissions$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z
+HSPLorg/thoughtcrime/securesms/permissions/Permissions;->$r8$lambda$32IV3TWLGtrHXK656vmem2wXhcw(Landroid/content/Context;Ljava/lang/String;)Z
 HSPLorg/thoughtcrime/securesms/permissions/Permissions;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/permissions/Permissions;->hasAll(Landroid/content/Context;[Ljava/lang/String;)Z
 HSPLorg/thoughtcrime/securesms/permissions/Permissions;->isRuntimePermissionsRequired()Z
@@ -27066,6 +26859,7 @@ HSPLorg/thoughtcrime/securesms/profiles/AvatarHelper;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/profiles/AvatarHelper;->getAvatar(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/RecipientId;)Ljava/io/InputStream;
 HSPLorg/thoughtcrime/securesms/profiles/AvatarHelper;->getAvatarDirectory(Landroid/content/Context;)Ljava/io/File;
 HSPLorg/thoughtcrime/securesms/profiles/AvatarHelper;->getAvatarFile(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/RecipientId;)Ljava/io/File;
+HSPLorg/thoughtcrime/securesms/profiles/AvatarHelper;->getAvatarFile(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/RecipientId;Z)Ljava/io/File;
 HSPLorg/thoughtcrime/securesms/profiles/AvatarHelper;->getAvatarFileDetails(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/RecipientId;)Lorg/thoughtcrime/securesms/database/model/ProfileAvatarFileDetails;
 HSPLorg/thoughtcrime/securesms/profiles/AvatarHelper;->getOutputStream(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/RecipientId;Z)Ljava/io/OutputStream;
 HSPLorg/thoughtcrime/securesms/profiles/AvatarHelper;->hasAvatar(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/RecipientId;)Z
@@ -27075,7 +26869,7 @@ HSPLorg/thoughtcrime/securesms/profiles/ProfileName$$ExternalSyntheticLambda0;->
 HSPLorg/thoughtcrime/securesms/profiles/ProfileName$$ExternalSyntheticLambda1;-><init>()V
 HSPLorg/thoughtcrime/securesms/profiles/ProfileName$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/profiles/ProfileName$1;-><init>()V
-HSPLorg/thoughtcrime/securesms/profiles/ProfileName;->$r8$lambda$pNHvm3E5R2_hKbty_0luXfn7Cik(Ljava/lang/Boolean;Ljava/lang/String;)Ljava/lang/Boolean;
+HSPLorg/thoughtcrime/securesms/profiles/ProfileName;->$r8$lambda$89Je_6vi7AmVM-ZlVP_3J4epETQ(Ljava/lang/Boolean;Ljava/lang/String;)Ljava/lang/Boolean;
 HSPLorg/thoughtcrime/securesms/profiles/ProfileName;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/profiles/ProfileName;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/profiles/ProfileName;->asGiven(Ljava/lang/String;)Lorg/thoughtcrime/securesms/profiles/ProfileName;
@@ -27098,13 +26892,13 @@ HSPLorg/thoughtcrime/securesms/providers/BaseContentProvider;->attachInfo(Landro
 HSPLorg/thoughtcrime/securesms/providers/BlobContentProvider;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/providers/BlobContentProvider;-><init>()V
 HSPLorg/thoughtcrime/securesms/providers/BlobContentProvider;->onCreate()Z
-HSPLorg/thoughtcrime/securesms/providers/BlobProvider$$ExternalSyntheticLambda10;-><init>(Lorg/thoughtcrime/securesms/providers/BlobProvider;Landroid/content/Context;J)V
-HSPLorg/thoughtcrime/securesms/providers/BlobProvider$$ExternalSyntheticLambda10;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/providers/BlobProvider$$ExternalSyntheticLambda11;-><init>(Lorg/thoughtcrime/securesms/providers/BlobProvider;Landroid/content/Context;)V
-HSPLorg/thoughtcrime/securesms/providers/BlobProvider$$ExternalSyntheticLambda11;->run()V
-HSPLorg/thoughtcrime/securesms/providers/BlobProvider$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/providers/BlobProvider;Lorg/thoughtcrime/securesms/providers/BlobProvider$BlobSpec;Ljava/io/OutputStream;Landroid/net/Uri;Landroid/content/Context;)V
-HSPLorg/thoughtcrime/securesms/providers/BlobProvider$$ExternalSyntheticLambda1;->call()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/providers/BlobProvider$$ExternalSyntheticLambda9;-><init>(JLandroid/net/Uri;)V
+HSPLorg/thoughtcrime/securesms/providers/BlobProvider$$ExternalSyntheticLambda10;-><init>(JLandroid/net/Uri;)V
+HSPLorg/thoughtcrime/securesms/providers/BlobProvider$$ExternalSyntheticLambda11;-><init>(Lorg/thoughtcrime/securesms/providers/BlobProvider;Landroid/content/Context;J)V
+HSPLorg/thoughtcrime/securesms/providers/BlobProvider$$ExternalSyntheticLambda11;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/providers/BlobProvider$$ExternalSyntheticLambda6;-><init>(Lorg/thoughtcrime/securesms/providers/BlobProvider;Lorg/thoughtcrime/securesms/providers/BlobProvider$BlobSpec;Ljava/io/OutputStream;Landroid/net/Uri;Landroid/content/Context;)V
+HSPLorg/thoughtcrime/securesms/providers/BlobProvider$$ExternalSyntheticLambda6;->call()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/providers/BlobProvider$$ExternalSyntheticLambda7;-><init>(Lorg/thoughtcrime/securesms/providers/BlobProvider;Landroid/content/Context;)V
+HSPLorg/thoughtcrime/securesms/providers/BlobProvider$$ExternalSyntheticLambda7;->run()V
 HSPLorg/thoughtcrime/securesms/providers/BlobProvider$1;-><init>(I)V
 HSPLorg/thoughtcrime/securesms/providers/BlobProvider$2;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/providers/BlobProvider$BlobBuilder;-><init>(Lorg/thoughtcrime/securesms/providers/BlobProvider;Ljava/io/InputStream;J)V
@@ -27136,9 +26930,9 @@ HSPLorg/thoughtcrime/securesms/providers/BlobProvider$StorageType;->decode(Ljava
 HSPLorg/thoughtcrime/securesms/providers/BlobProvider$StorageType;->encode()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/providers/BlobProvider$StorageType;->isMemory()Z
 HSPLorg/thoughtcrime/securesms/providers/BlobProvider$StorageType;->values()[Lorg/thoughtcrime/securesms/providers/BlobProvider$StorageType;
-HSPLorg/thoughtcrime/securesms/providers/BlobProvider;->$r8$lambda$ODJ5xh2VOR1mLM-AV1r-HG7pEAk(Lorg/thoughtcrime/securesms/providers/BlobProvider;Landroid/content/Context;)V
-HSPLorg/thoughtcrime/securesms/providers/BlobProvider;->$r8$lambda$hszeKLE-J5rLAuyYe0jTaWcOLg4(Lorg/thoughtcrime/securesms/providers/BlobProvider;Landroid/content/Context;JLjava/io/File;)Ljava/io/InputStream;
-HSPLorg/thoughtcrime/securesms/providers/BlobProvider;->$r8$lambda$vEFatZFK1evY8Xp8zObuRkcU_8Q(Lorg/thoughtcrime/securesms/providers/BlobProvider;Lorg/thoughtcrime/securesms/providers/BlobProvider$BlobSpec;Ljava/io/OutputStream;Landroid/net/Uri;Landroid/content/Context;)Landroid/net/Uri;
+HSPLorg/thoughtcrime/securesms/providers/BlobProvider;->$r8$lambda$aNcKiDn7Ux97nQi07Okq5MGD_-4(Lorg/thoughtcrime/securesms/providers/BlobProvider;Landroid/content/Context;JLjava/io/File;)Ljava/io/InputStream;
+HSPLorg/thoughtcrime/securesms/providers/BlobProvider;->$r8$lambda$h7HESuzLBsml8o9IDvJXvr8c6ic(Lorg/thoughtcrime/securesms/providers/BlobProvider;Lorg/thoughtcrime/securesms/providers/BlobProvider$BlobSpec;Ljava/io/OutputStream;Landroid/net/Uri;Landroid/content/Context;)Landroid/net/Uri;
+HSPLorg/thoughtcrime/securesms/providers/BlobProvider;->$r8$lambda$mP1YUZOrEsXX6EM4TTdXKKZHTnA(Lorg/thoughtcrime/securesms/providers/BlobProvider;Landroid/content/Context;)V
 HSPLorg/thoughtcrime/securesms/providers/BlobProvider;->-$$Nest$mwriteBlobSpecToDisk(Lorg/thoughtcrime/securesms/providers/BlobProvider;Landroid/content/Context;Lorg/thoughtcrime/securesms/providers/BlobProvider$BlobSpec;)Landroid/net/Uri;
 HSPLorg/thoughtcrime/securesms/providers/BlobProvider;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/providers/BlobProvider;-><init>()V
@@ -27179,6 +26973,8 @@ HSPLorg/thoughtcrime/securesms/push/SignalServiceNetworkAccess$HostConfig;->getC
 HSPLorg/thoughtcrime/securesms/push/SignalServiceNetworkAccess$HostConfig;->getHost()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/push/SignalServiceNetworkAccess$WhenMappings;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/push/SignalServiceNetworkAccess;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/push/SignalServiceNetworkAccess;-><init>(Landroid/content/Context;)V
+HSPLorg/thoughtcrime/securesms/push/SignalServiceNetworkAccess;->buildGConfiguration(Ljava/util/List;)Lorg/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration;
 HSPLorg/thoughtcrime/securesms/push/SignalServiceNetworkAccess;->getConfiguration()Lorg/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration;
 HSPLorg/thoughtcrime/securesms/push/SignalServiceNetworkAccess;->getConfiguration(Ljava/lang/String;)Lorg/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration;
 HSPLorg/thoughtcrime/securesms/push/SignalServiceNetworkAccess;->getUncensoredConfiguration()Lorg/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration;
@@ -27191,15 +26987,13 @@ HSPLorg/thoughtcrime/securesms/ratelimit/RateLimitUtil;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/ratelimit/RateLimitUtil;->retryAllRateLimitedMessages(Landroid/content/Context;)V
 HSPLorg/thoughtcrime/securesms/reactions/ReactionsConversationView;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/reactions/ReactionsConversationView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
-HSPLorg/thoughtcrime/securesms/reactions/ReactionsConversationView;->clear()V
 HSPLorg/thoughtcrime/securesms/reactions/ReactionsConversationView;->init(Landroid/util/AttributeSet;)V
-HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/recipients/LiveRecipient;Lorg/thoughtcrime/securesms/recipients/RecipientForeverObserver;)V
-HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/recipients/LiveRecipient;)V
+HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/recipients/LiveRecipient;)V
+HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda1;-><init>()V
+HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda2;-><init>()V
+HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda2;->apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda3;-><init>()V
-HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda4;-><init>()V
-HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda4;->apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda5;-><init>()V
-HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient;->$r8$lambda$bhowCzW_4HRIO1hvMslBpl08AJE(Lorg/thoughtcrime/securesms/recipients/Recipient;Ljava/lang/Object;)Lorg/thoughtcrime/securesms/recipients/Recipient;
+HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient;->$r8$lambda$RhROEBfnI0QVZITG5MNez2Hdpg4(Lorg/thoughtcrime/securesms/recipients/Recipient;Ljava/lang/Object;)Lorg/thoughtcrime/securesms/recipients/Recipient;
 HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient;-><init>(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
 HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient;->fetchAndCacheRecipientFromDisk(Lorg/thoughtcrime/securesms/recipients/RecipientId;)Lorg/thoughtcrime/securesms/recipients/Recipient;
@@ -27208,25 +27002,24 @@ HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient;->getId()Lorg/thoughtcri
 HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient;->getLiveData()Landroidx/lifecycle/LiveData;
 HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient;->lambda$new$2(Lorg/thoughtcrime/securesms/recipients/Recipient;Ljava/lang/Object;)Lorg/thoughtcrime/securesms/recipients/Recipient;
 HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient;->observable()Lio/reactivex/rxjava3/core/Observable;
-HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient;->observeForever(Lorg/thoughtcrime/securesms/recipients/RecipientForeverObserver;)V
 HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient;->refresh()Lorg/thoughtcrime/securesms/recipients/LiveRecipient;
 HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient;->refresh(Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
 HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient;->resolve()Lorg/thoughtcrime/securesms/recipients/Recipient;
 HSPLorg/thoughtcrime/securesms/recipients/LiveRecipient;->set(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/recipients/LiveRecipient;)V
-HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda1;->run()V
-HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache;)V
-HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z
-HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache;)V
-HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda3;->accept(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache;Lorg/signal/core/util/Stopwatch;)V
+HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache;)V
+HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z
+HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache;)V
+HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda1;->accept(Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda2;-><init>()V
+HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda2;->shouldRunOnExecutor()Z
+HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/recipients/LiveRecipient;)V
 HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda4;->run()V
-HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda5;-><init>()V
-HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda5;->shouldRunOnExecutor()Z
-HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache;->$r8$lambda$cceXA3mBj5bIWxcpmQKG2lkTVmw(Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache;->$r8$lambda$eaOUGOWV39Wv10oT9_SfyjwqSYg(Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache;Lorg/signal/core/util/Stopwatch;)V
-HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache;->$r8$lambda$iWXHfYQp_YOybM7RaMllTuyAFtk(Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache;Lorg/thoughtcrime/securesms/recipients/Recipient;)Z
-HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache;->$r8$lambda$lWZD_Zmvx_YGH1KsNuAOAtMWYA0()Z
+HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda5;-><init>(Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache;Lorg/signal/core/util/Stopwatch;)V
+HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda5;->run()V
+HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache;->$r8$lambda$20yUFQY95u6P3VcYgrCpxFLs9-k(Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache;Lorg/thoughtcrime/securesms/recipients/Recipient;)Z
+HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache;->$r8$lambda$YTpaV0-RlZ_r_tOmgpBFbaJMQEg(Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache;Lorg/signal/core/util/Stopwatch;)V
+HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache;->$r8$lambda$cR9j6o6hx2mm0j9CfjP6T_TSir8(Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
+HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache;->$r8$lambda$jch5wZQ0bRndf4ehQtzpqc6eoII()Z
 HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache;-><init>(Landroid/content/Context;)V
 HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache;-><init>(Landroid/content/Context;Ljava/util/concurrent/Executor;)V
@@ -27239,8 +27032,8 @@ HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache;->lambda$addToCache
 HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache;->lambda$new$0()Z
 HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache;->lambda$warmUp$3(Lorg/signal/core/util/Stopwatch;)V
 HSPLorg/thoughtcrime/securesms/recipients/LiveRecipientCache;->warmUp()V
-HSPLorg/thoughtcrime/securesms/recipients/Recipient$$ExternalSyntheticLambda0;-><init>(Lkotlin/jvm/functions/Function1;)V
 HSPLorg/thoughtcrime/securesms/recipients/Recipient$$ExternalSyntheticLambda1;-><init>(Lkotlin/jvm/functions/Function1;)V
+HSPLorg/thoughtcrime/securesms/recipients/Recipient$$ExternalSyntheticLambda2;-><init>(Lkotlin/jvm/functions/Function1;)V
 HSPLorg/thoughtcrime/securesms/recipients/Recipient$Capability$Companion;-><init>()V
 HSPLorg/thoughtcrime/securesms/recipients/Recipient$Capability$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/recipients/Recipient$Capability$Companion;->deserialize(I)Lorg/thoughtcrime/securesms/recipients/Recipient$Capability;
@@ -27272,8 +27065,6 @@ HSPLorg/thoughtcrime/securesms/recipients/Recipient$HiddenState;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/recipients/Recipient$HiddenState;-><init>(Ljava/lang/String;II)V
 HSPLorg/thoughtcrime/securesms/recipients/Recipient$callRingtone$2;-><init>(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
 HSPLorg/thoughtcrime/securesms/recipients/Recipient$combinedAboutAndEmoji$2;-><init>(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-HSPLorg/thoughtcrime/securesms/recipients/Recipient$combinedAboutAndEmoji$2;->invoke()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/recipients/Recipient$combinedAboutAndEmoji$2;->invoke()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/recipients/Recipient$hasViewedStory$1;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/recipients/Recipient$hasViewedStory$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/recipients/Recipient$messageRingtone$2;-><init>(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
@@ -27284,13 +27075,10 @@ HSPLorg/thoughtcrime/securesms/recipients/Recipient;-><init>(Lorg/thoughtcrime/s
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;-><init>(Lorg/thoughtcrime/securesms/recipients/RecipientId;ZLorg/whispersystems/signalservice/api/push/ServiceId$ACI;Lorg/whispersystems/signalservice/api/push/ServiceId$PNI;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lorg/thoughtcrime/securesms/groups/GroupId;Lorg/thoughtcrime/securesms/database/model/DistributionListId;Ljava/util/List;Lj$/util/Optional;ZZZJLorg/thoughtcrime/securesms/database/RecipientTable$VibrateState;Lorg/thoughtcrime/securesms/database/RecipientTable$VibrateState;Landroid/net/Uri;Landroid/net/Uri;ILorg/thoughtcrime/securesms/database/RecipientTable$RegisteredState;[BLorg/signal/libsignal/zkgroup/profiles/ExpiringProfileKeyCredential;Ljava/lang/String;Landroid/net/Uri;Ljava/lang/String;Landroid/net/Uri;Lorg/thoughtcrime/securesms/profiles/ProfileName;Ljava/lang/String;Lorg/thoughtcrime/securesms/database/model/ProfileAvatarFileDetails;ZLorg/thoughtcrime/securesms/recipients/Recipient$HiddenState;JLjava/lang/String;Lorg/thoughtcrime/securesms/database/RecipientTable$UnidentifiedAccessMode;Lorg/thoughtcrime/securesms/database/model/RecipientRecord$Capabilities;[BLorg/thoughtcrime/securesms/database/RecipientTable$MentionSetting;Lorg/thoughtcrime/securesms/wallpaper/ChatWallpaper;Lorg/thoughtcrime/securesms/conversation/colors/ChatColors;Lorg/thoughtcrime/securesms/conversation/colors/AvatarColor;Ljava/lang/String;Ljava/lang/String;Lorg/thoughtcrime/securesms/profiles/ProfileName;Ljava/lang/String;Lj$/util/Optional;ZLjava/util/List;ZZLorg/thoughtcrime/securesms/service/webrtc/links/CallLinkRoomId;Lj$/util/Optional;Lorg/thoughtcrime/securesms/database/RecipientTable$PhoneNumberSharingState;Lorg/thoughtcrime/securesms/profiles/ProfileName;Ljava/lang/String;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->access$getTAG$cp()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->equals(Ljava/lang/Object;)Z
-HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getAbout()Ljava/lang/String;
-HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getAboutEmoji()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getAutoChatColor()Lorg/thoughtcrime/securesms/conversation/colors/ChatColors;
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getAvatarColor()Lorg/thoughtcrime/securesms/conversation/colors/AvatarColor;
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getBadges()Ljava/util/List;
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getChatColors()Lorg/thoughtcrime/securesms/conversation/colors/ChatColors;
-HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getCombinedAboutAndEmoji()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getContactPhoto()Lorg/thoughtcrime/securesms/contacts/avatars/ContactPhoto;
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getDisplayName(Landroid/content/Context;)Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getE164()Lj$/util/Optional;
@@ -27300,7 +27088,6 @@ HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getFallbackContactPhotoDra
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getGroupName(Landroid/content/Context;)Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getHasE164()Z
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getHasServiceId()Z
-HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getHasWallpaper()Z
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getId()Lorg/thoughtcrime/securesms/recipients/RecipientId;
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getNameFromLocalData(Landroid/content/Context;)Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getProfileAvatar()Ljava/lang/String;
@@ -27312,7 +27099,6 @@ HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getResolved()Lorg/thoughtc
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getServiceId()Lj$/util/Optional;
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getShouldBlurAvatar()Z
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getShouldHideStory()Z
-HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getShouldShowE164()Z
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getShowVerified()Z
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getSmallFallbackContactPhotoDrawable(Landroid/content/Context;ZLorg/thoughtcrime/securesms/recipients/Recipient$FallbackPhotoProvider;I)Landroid/graphics/drawable/Drawable;
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->getWallpaper()Lorg/thoughtcrime/securesms/wallpaper/ChatWallpaper;
@@ -27322,7 +27108,6 @@ HSPLorg/thoughtcrime/securesms/recipients/Recipient;->isBlocked()Z
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->isDistributionList()Z
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->isGroup()Z
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->isHidden()Z
-HSPLorg/thoughtcrime/securesms/recipients/Recipient;->isIndividual()Z
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->isMmsGroup()Z
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->isMuted()Z
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->isMyStory()Z
@@ -27331,7 +27116,6 @@ HSPLorg/thoughtcrime/securesms/recipients/Recipient;->isPushGroup()Z
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->isPushV1Group()Z
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->isPushV2Group()Z
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->isRegistered()Z
-HSPLorg/thoughtcrime/securesms/recipients/Recipient;->isReleaseNotes()Z
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->isResolving()Z
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->isSelf()Z
 HSPLorg/thoughtcrime/securesms/recipients/Recipient;->isSystemContact()Z
@@ -27355,7 +27139,6 @@ HSPLorg/thoughtcrime/securesms/recipients/RecipientCreator;-><init>()V
 HSPLorg/thoughtcrime/securesms/recipients/RecipientCreator;->forId$default(Lorg/thoughtcrime/securesms/recipients/RecipientId;ZILjava/lang/Object;)Lorg/thoughtcrime/securesms/recipients/Recipient;
 HSPLorg/thoughtcrime/securesms/recipients/RecipientCreator;->forId(Lorg/thoughtcrime/securesms/recipients/RecipientId;)Lorg/thoughtcrime/securesms/recipients/Recipient;
 HSPLorg/thoughtcrime/securesms/recipients/RecipientCreator;->forId(Lorg/thoughtcrime/securesms/recipients/RecipientId;Z)Lorg/thoughtcrime/securesms/recipients/Recipient;
-HSPLorg/thoughtcrime/securesms/recipients/RecipientCreator;->forIndividual(Landroid/content/Context;Lorg/thoughtcrime/securesms/database/model/RecipientRecord;)Lorg/thoughtcrime/securesms/recipients/Recipient;
 HSPLorg/thoughtcrime/securesms/recipients/RecipientId$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/recipients/RecipientId$Serializer;-><init>()V
 HSPLorg/thoughtcrime/securesms/recipients/RecipientId$Serializer;-><init>(Lorg/thoughtcrime/securesms/recipients/RecipientId$Serializer-IA;)V
@@ -27394,7 +27177,7 @@ HSPLorg/thoughtcrime/securesms/registration/RegistrationData;->getProfileKey()Lo
 HSPLorg/thoughtcrime/securesms/registration/RegistrationData;->isFcm()Z
 HSPLorg/thoughtcrime/securesms/registration/RegistrationRepository$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/registration/RegistrationRepository;Lorg/thoughtcrime/securesms/registration/RegistrationData;Lorg/thoughtcrime/securesms/registration/VerifyResponse;Z)V
 HSPLorg/thoughtcrime/securesms/registration/RegistrationRepository$$ExternalSyntheticLambda2;->call()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/registration/RegistrationRepository;->$r8$lambda$lfcsXOWCtuhYiXYurvG3WClEhsA(Lorg/thoughtcrime/securesms/registration/RegistrationRepository;Lorg/thoughtcrime/securesms/registration/RegistrationData;Lorg/thoughtcrime/securesms/registration/VerifyResponse;Z)Lorg/whispersystems/signalservice/internal/ServiceResponse;
+HSPLorg/thoughtcrime/securesms/registration/RegistrationRepository;->$r8$lambda$8wte2SI38cWWZ079bVcIwXDBl2w(Lorg/thoughtcrime/securesms/registration/RegistrationRepository;Lorg/thoughtcrime/securesms/registration/RegistrationData;Lorg/thoughtcrime/securesms/registration/VerifyResponse;Z)Lorg/whispersystems/signalservice/internal/ServiceResponse;
 HSPLorg/thoughtcrime/securesms/registration/RegistrationRepository;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/registration/RegistrationRepository;-><init>(Landroid/app/Application;)V
 HSPLorg/thoughtcrime/securesms/registration/RegistrationRepository;->findExistingProfileKey(Ljava/lang/String;)Lorg/signal/libsignal/zkgroup/profiles/ProfileKey;
@@ -27418,8 +27201,8 @@ HSPLorg/thoughtcrime/securesms/registration/VerifyResponse;->getMasterKey()Lorg/
 HSPLorg/thoughtcrime/securesms/registration/VerifyResponse;->getPin()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/registration/VerifyResponse;->getPniPreKeyCollection()Lorg/whispersystems/signalservice/api/account/PreKeyCollection;
 HSPLorg/thoughtcrime/securesms/registration/VerifyResponse;->getVerifyAccountResponse()Lorg/whispersystems/signalservice/internal/push/VerifyAccountResponse;
-HSPLorg/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel$$ExternalSyntheticLambda3;-><init>()V
-HSPLorg/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel$$ExternalSyntheticLambda3;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel$$ExternalSyntheticLambda9;-><init>()V
+HSPLorg/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel$$ExternalSyntheticLambda9;->apply(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/releasechannel/ReleaseChannel;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/releasechannel/ReleaseChannel;-><init>()V
 HSPLorg/thoughtcrime/securesms/releasechannel/ReleaseChannel;->insertReleaseChannelMessage$default(Lorg/thoughtcrime/securesms/releasechannel/ReleaseChannel;Lorg/thoughtcrime/securesms/recipients/RecipientId;Ljava/lang/String;JLjava/lang/String;IILjava/lang/String;Ljava/lang/String;Lorg/thoughtcrime/securesms/database/model/databaseprotos/BodyRangeList;Lorg/thoughtcrime/securesms/database/model/StoryType;ILjava/lang/Object;)Lorg/thoughtcrime/securesms/database/MessageTable$InsertResult;
@@ -27516,9 +27299,9 @@ HSPLorg/thoughtcrime/securesms/service/ScheduledMessageManager;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/service/ScheduledMessageManager;-><init>(Landroid/app/Application;)V
 HSPLorg/thoughtcrime/securesms/service/ScheduledMessageManager;->getNextClosestEvent()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/service/ScheduledMessageManager;->getNextClosestEvent()Lorg/thoughtcrime/securesms/service/ScheduledMessageManager$Event;
-HSPLorg/thoughtcrime/securesms/service/TimedEventManager$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/service/TimedEventManager;)V
-HSPLorg/thoughtcrime/securesms/service/TimedEventManager$$ExternalSyntheticLambda1;->run()V
-HSPLorg/thoughtcrime/securesms/service/TimedEventManager;->$r8$lambda$j5b9IohZrMAuixPGgosKJtGNK94(Lorg/thoughtcrime/securesms/service/TimedEventManager;)V
+HSPLorg/thoughtcrime/securesms/service/TimedEventManager$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/service/TimedEventManager;)V
+HSPLorg/thoughtcrime/securesms/service/TimedEventManager$$ExternalSyntheticLambda0;->run()V
+HSPLorg/thoughtcrime/securesms/service/TimedEventManager;->$r8$lambda$2Jr7kPB0D8tj2QcW7FqF29aPjXM(Lorg/thoughtcrime/securesms/service/TimedEventManager;)V
 HSPLorg/thoughtcrime/securesms/service/TimedEventManager;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/service/TimedEventManager;-><init>(Landroid/app/Application;Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/service/TimedEventManager;->cancelAlarm(Landroid/content/Context;Ljava/lang/Class;)V
@@ -27529,13 +27312,13 @@ HSPLorg/thoughtcrime/securesms/service/webrtc/ActiveCallManager$Companion;-><ini
 HSPLorg/thoughtcrime/securesms/service/webrtc/ActiveCallManager$Companion;->clearNotifications(Landroid/content/Context;)V
 HSPLorg/thoughtcrime/securesms/service/webrtc/ActiveCallManager;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/service/webrtc/ActiveCallManager;->clearNotifications(Landroid/content/Context;)V
-HSPLorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline11;->m(Landroid/content/ComponentName;Ljava/lang/String;Landroid/os/UserHandle;)Landroid/telecom/PhoneAccountHandle;
-HSPLorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline12;->m()V
-HSPLorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline1;->m(Landroid/telecom/PhoneAccount$Builder;I)Landroid/telecom/PhoneAccount$Builder;
-HSPLorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline2;->m(Landroid/telecom/PhoneAccount$Builder;)Landroid/telecom/PhoneAccount;
-HSPLorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline3;->m(Landroid/telecom/TelecomManager;Landroid/telecom/PhoneAccount;)V
-HSPLorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline7;->m(Landroid/telecom/PhoneAccountHandle;Ljava/lang/CharSequence;)Landroid/telecom/PhoneAccount$Builder;
-HSPLorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline8;->m()V
+HSPLorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline12;->m(Landroid/content/ComponentName;Ljava/lang/String;Landroid/os/UserHandle;)Landroid/telecom/PhoneAccountHandle;
+HSPLorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline13;->m()V
+HSPLorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline14;->m(Landroid/telecom/PhoneAccountHandle;Ljava/lang/CharSequence;)Landroid/telecom/PhoneAccount$Builder;
+HSPLorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline15;->m()V
+HSPLorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline5;->m(Landroid/telecom/PhoneAccount$Builder;I)Landroid/telecom/PhoneAccount$Builder;
+HSPLorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline6;->m(Landroid/telecom/PhoneAccount$Builder;)Landroid/telecom/PhoneAccount;
+HSPLorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline7;->m(Landroid/telecom/TelecomManager;Landroid/telecom/PhoneAccount;)V
 HSPLorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil;-><init>()V
 HSPLorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil;->getPhoneAccountHandle()Landroid/telecom/PhoneAccountHandle;
@@ -27544,17 +27327,22 @@ HSPLorg/thoughtcrime/securesms/shakereport/ShakeToReport;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/shakereport/ShakeToReport;-><init>(Landroid/app/Application;)V
 HSPLorg/thoughtcrime/securesms/shakereport/ShakeToReport;->enable()V
 HSPLorg/thoughtcrime/securesms/shakereport/ShakeToReport;->registerActivity(Landroidx/appcompat/app/AppCompatActivity;)V
+HSPLorg/thoughtcrime/securesms/stickers/BlessedPacks$1;-><init>()V
+HSPLorg/thoughtcrime/securesms/stickers/BlessedPacks$Pack;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+HSPLorg/thoughtcrime/securesms/stickers/BlessedPacks$Pack;->getPackId()Ljava/lang/String;
+HSPLorg/thoughtcrime/securesms/stickers/BlessedPacks;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/stickers/BlessedPacks;->contains(Ljava/lang/String;)Z
 HSPLorg/thoughtcrime/securesms/stickers/StickerRemoteUriLoader$Factory;-><init>()V
-HSPLorg/thoughtcrime/securesms/stickers/StickerSearchRepository$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/stickers/StickerSearchRepository;Lorg/thoughtcrime/securesms/stickers/StickerSearchRepository$Callback;)V
-HSPLorg/thoughtcrime/securesms/stickers/StickerSearchRepository$$ExternalSyntheticLambda0;->run()V
-HSPLorg/thoughtcrime/securesms/stickers/StickerSearchRepository;->$r8$lambda$WI32balUk_XG4AC9j0YR1mfsJE0(Lorg/thoughtcrime/securesms/stickers/StickerSearchRepository;Lorg/thoughtcrime/securesms/stickers/StickerSearchRepository$Callback;)V
+HSPLorg/thoughtcrime/securesms/stickers/StickerSearchRepository$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/stickers/StickerSearchRepository;Lorg/thoughtcrime/securesms/stickers/StickerSearchRepository$Callback;)V
+HSPLorg/thoughtcrime/securesms/stickers/StickerSearchRepository$$ExternalSyntheticLambda1;->run()V
+HSPLorg/thoughtcrime/securesms/stickers/StickerSearchRepository;->$r8$lambda$EiXtOahDAsA2l4Wi8nIWoU8V6ZA(Lorg/thoughtcrime/securesms/stickers/StickerSearchRepository;Lorg/thoughtcrime/securesms/stickers/StickerSearchRepository$Callback;)V
 HSPLorg/thoughtcrime/securesms/stickers/StickerSearchRepository;-><init>()V
 HSPLorg/thoughtcrime/securesms/stickers/StickerSearchRepository;->getStickerFeatureAvailability(Lorg/thoughtcrime/securesms/stickers/StickerSearchRepository$Callback;)V
 HSPLorg/thoughtcrime/securesms/stickers/StickerSearchRepository;->getStickerFeatureAvailabilitySync()Ljava/lang/Boolean;
 HSPLorg/thoughtcrime/securesms/stickers/StickerSearchRepository;->lambda$getStickerFeatureAvailability$2(Lorg/thoughtcrime/securesms/stickers/StickerSearchRepository$Callback;)V
-HSPLorg/thoughtcrime/securesms/storage/StorageSyncHelper$$ExternalSyntheticLambda0;-><init>()V
-HSPLorg/thoughtcrime/securesms/storage/StorageSyncHelper$$ExternalSyntheticLambda0;->generate()[B
-HSPLorg/thoughtcrime/securesms/storage/StorageSyncHelper;->$r8$lambda$Qu9GyOxIHYeSe2KLWGmWWrZGbxY()[B
+HSPLorg/thoughtcrime/securesms/storage/StorageSyncHelper$$ExternalSyntheticLambda6;-><init>()V
+HSPLorg/thoughtcrime/securesms/storage/StorageSyncHelper$$ExternalSyntheticLambda6;->generate()[B
+HSPLorg/thoughtcrime/securesms/storage/StorageSyncHelper;->$r8$lambda$XO_E_PadWEngMBMXF1NCp3opn3s()[B
 HSPLorg/thoughtcrime/securesms/storage/StorageSyncHelper;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/storage/StorageSyncHelper;->generateKey()[B
 HSPLorg/thoughtcrime/securesms/storage/StorageSyncHelper;->lambda$static$0()[B
@@ -27622,7 +27410,7 @@ HSPLorg/thoughtcrime/securesms/stories/tabs/ConversationListTabsFragment$special
 HSPLorg/thoughtcrime/securesms/stories/tabs/ConversationListTabsFragment$viewModel$2;-><init>(Lorg/thoughtcrime/securesms/stories/tabs/ConversationListTabsFragment;)V
 HSPLorg/thoughtcrime/securesms/stories/tabs/ConversationListTabsFragment$viewModel$2;->invoke()Landroidx/lifecycle/ViewModelStoreOwner;
 HSPLorg/thoughtcrime/securesms/stories/tabs/ConversationListTabsFragment$viewModel$2;->invoke()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/stories/tabs/ConversationListTabsFragment;->$r8$lambda$TBp2TrKjQUMGDRFlA7TFhznEf6w(Landroid/widget/ImageView;Landroid/animation/ValueAnimator;)V
+HSPLorg/thoughtcrime/securesms/stories/tabs/ConversationListTabsFragment;->$r8$lambda$EqV_OzozfE83foMQx0ExSHfsu20(Landroid/widget/ImageView;Landroid/animation/ValueAnimator;)V
 HSPLorg/thoughtcrime/securesms/stories/tabs/ConversationListTabsFragment;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/stories/tabs/ConversationListTabsFragment;-><init>()V
 HSPLorg/thoughtcrime/securesms/stories/tabs/ConversationListTabsFragment;->access$getShouldBeImmediate$p(Lorg/thoughtcrime/securesms/stories/tabs/ConversationListTabsFragment;)Z
@@ -27743,12 +27531,12 @@ HSPLorg/thoughtcrime/securesms/util/ByteUnit;->$values()[Lorg/thoughtcrime/secur
 HSPLorg/thoughtcrime/securesms/util/ByteUnit;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/ByteUnit;-><init>(Ljava/lang/String;I)V
 HSPLorg/thoughtcrime/securesms/util/ByteUnit;-><init>(Ljava/lang/String;ILorg/thoughtcrime/securesms/util/ByteUnit-IA;)V
-HSPLorg/thoughtcrime/securesms/util/CachedInflater$ViewCache$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/util/CachedInflater$ViewCache;JILandroidx/asynclayoutinflater/view/AsyncLayoutInflater;ILandroid/view/ViewGroup;)V
-HSPLorg/thoughtcrime/securesms/util/CachedInflater$ViewCache$$ExternalSyntheticLambda0;->run()V
-HSPLorg/thoughtcrime/securesms/util/CachedInflater$ViewCache$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/util/CachedInflater$ViewCache;J)V
-HSPLorg/thoughtcrime/securesms/util/CachedInflater$ViewCache$$ExternalSyntheticLambda1;->onInflateFinished(Landroid/view/View;ILandroid/view/ViewGroup;)V
-HSPLorg/thoughtcrime/securesms/util/CachedInflater$ViewCache;->$r8$lambda$H1dyope78-jyrDl4nIsSq308xd0(Lorg/thoughtcrime/securesms/util/CachedInflater$ViewCache;JILandroidx/asynclayoutinflater/view/AsyncLayoutInflater;ILandroid/view/ViewGroup;)V
-HSPLorg/thoughtcrime/securesms/util/CachedInflater$ViewCache;->$r8$lambda$lSDJtG1q2tOMoMYvPlm8kQ1zU5M(Lorg/thoughtcrime/securesms/util/CachedInflater$ViewCache;JLandroid/view/View;ILandroid/view/ViewGroup;)V
+HSPLorg/thoughtcrime/securesms/util/CachedInflater$ViewCache$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/util/CachedInflater$ViewCache;J)V
+HSPLorg/thoughtcrime/securesms/util/CachedInflater$ViewCache$$ExternalSyntheticLambda0;->onInflateFinished(Landroid/view/View;ILandroid/view/ViewGroup;)V
+HSPLorg/thoughtcrime/securesms/util/CachedInflater$ViewCache$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/util/CachedInflater$ViewCache;JILandroidx/asynclayoutinflater/view/AsyncLayoutInflater;ILandroid/view/ViewGroup;)V
+HSPLorg/thoughtcrime/securesms/util/CachedInflater$ViewCache$$ExternalSyntheticLambda1;->run()V
+HSPLorg/thoughtcrime/securesms/util/CachedInflater$ViewCache;->$r8$lambda$MciTHexp9lPHAWsHK_Wk14eraRc(Lorg/thoughtcrime/securesms/util/CachedInflater$ViewCache;JILandroidx/asynclayoutinflater/view/AsyncLayoutInflater;ILandroid/view/ViewGroup;)V
+HSPLorg/thoughtcrime/securesms/util/CachedInflater$ViewCache;->$r8$lambda$TbQbj8g-8T2QtDBAIjY9L9jWrzw(Lorg/thoughtcrime/securesms/util/CachedInflater$ViewCache;JLandroid/view/View;ILandroid/view/ViewGroup;)V
 HSPLorg/thoughtcrime/securesms/util/CachedInflater$ViewCache;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/CachedInflater$ViewCache;-><init>()V
 HSPLorg/thoughtcrime/securesms/util/CachedInflater$ViewCache;->cacheUntilLimit(Landroid/content/Context;ILandroid/view/ViewGroup;I)V
@@ -27771,17 +27559,11 @@ HSPLorg/thoughtcrime/securesms/util/ContextUtil;->requireDrawable(Landroid/conte
 HSPLorg/thoughtcrime/securesms/util/ConversationShortcutPhoto$Loader$Factory;-><init>(Landroid/content/Context;)V
 HSPLorg/thoughtcrime/securesms/util/DateUtils$sameDayDateFormat$2;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/DateUtils$sameDayDateFormat$2;-><init>()V
-HSPLorg/thoughtcrime/securesms/util/DateUtils$sameDayDateFormat$2;->invoke()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/util/DateUtils$sameDayDateFormat$2;->invoke()Ljava/text/SimpleDateFormat;
 HSPLorg/thoughtcrime/securesms/util/DateUtils;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/DateUtils;-><init>()V
 HSPLorg/thoughtcrime/securesms/util/DateUtils;->getBriefRelativeTimeSpanString(Landroid/content/Context;Ljava/util/Locale;J)Ljava/lang/String;
-HSPLorg/thoughtcrime/securesms/util/DateUtils;->getConversationDateHeaderString(Landroid/content/Context;Ljava/util/Locale;J)Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/util/DateUtils;->getDatelessRelativeTimeSpanFormattedDate(Landroid/content/Context;Ljava/util/Locale;J)Lorg/thoughtcrime/securesms/conversation/v2/computed/FormattedDate;
-HSPLorg/thoughtcrime/securesms/util/DateUtils;->getSameDayDateFormat()Ljava/text/SimpleDateFormat;
 HSPLorg/thoughtcrime/securesms/util/DateUtils;->isNow(J)Z
-HSPLorg/thoughtcrime/securesms/util/DateUtils;->isSameDay(JJ)Z
-HSPLorg/thoughtcrime/securesms/util/DateUtils;->isSameExtendedRelativeTimestamp(JJ)Z
 HSPLorg/thoughtcrime/securesms/util/DateUtils;->isWithin-HG0u8IE(JJ)Z
 HSPLorg/thoughtcrime/securesms/util/Debouncer;-><init>(J)V
 HSPLorg/thoughtcrime/securesms/util/Debouncer;-><init>(JLjava/util/concurrent/TimeUnit;)V
@@ -27789,13 +27571,14 @@ HSPLorg/thoughtcrime/securesms/util/Debouncer;->publish(Ljava/lang/Runnable;)V
 HSPLorg/thoughtcrime/securesms/util/DefaultValueLiveData;-><init>(Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/util/DefaultValueLiveData;->getValue()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/util/DefaultValueLiveData;->postValue(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/util/DefaultValueLiveData;->setValue(Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/util/Deferred;-><init>()V
 HSPLorg/thoughtcrime/securesms/util/Deferred;->executeIfNecessary()V
 HSPLorg/thoughtcrime/securesms/util/Deferred;->isDeferred()Z
 HSPLorg/thoughtcrime/securesms/util/Deferred;->setDeferred(Z)V
 HSPLorg/thoughtcrime/securesms/util/DeviceProperties;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/DeviceProperties;->isLowMemoryDevice(Landroid/content/Context;)Z
+HSPLorg/thoughtcrime/securesms/util/DoubleClickDebouncer;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/util/DoubleClickDebouncer;-><init>(J)V
 HSPLorg/thoughtcrime/securesms/util/DrawableUtil;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/DrawableUtil;->tint(Landroid/graphics/drawable/Drawable;I)Landroid/graphics/drawable/Drawable;
 HSPLorg/thoughtcrime/securesms/util/DynamicNoActionBarTheme;-><init>()V
@@ -27806,11 +27589,15 @@ HSPLorg/thoughtcrime/securesms/util/DynamicTheme;->onCreate(Landroid/app/Activit
 HSPLorg/thoughtcrime/securesms/util/DynamicTheme;->onResume(Landroid/app/Activity;)V
 HSPLorg/thoughtcrime/securesms/util/DynamicTheme;->setDefaultDayNightMode(Landroid/content/Context;)V
 HSPLorg/thoughtcrime/securesms/util/DynamicTheme;->systemThemeAvailable()Z
+HSPLorg/thoughtcrime/securesms/util/EditTextExtensionsKt;->setIncognitoFlag(IZ)I
 HSPLorg/thoughtcrime/securesms/util/EditTextExtensionsKt;->setIncognitoKeyboardEnabled(Landroid/widget/EditText;Z)V
 HSPLorg/thoughtcrime/securesms/util/EncryptedStreamUtils;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/EncryptedStreamUtils;-><init>()V
 HSPLorg/thoughtcrime/securesms/util/EncryptedStreamUtils;->getInputStream(Landroid/content/Context;Ljava/io/File;)Ljava/io/InputStream;
 HSPLorg/thoughtcrime/securesms/util/EncryptedStreamUtils;->getOutputStream(Landroid/content/Context;Ljava/io/File;)Ljava/io/OutputStream;
+HSPLorg/thoughtcrime/securesms/util/Environment$Donations;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/util/Environment$Donations;-><init>()V
+HSPLorg/thoughtcrime/securesms/util/Environment$Donations;->getStripeConfiguration()Lorg/signal/donations/StripeApi$Configuration;
 HSPLorg/thoughtcrime/securesms/util/FeatureFlags$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/util/FeatureFlags$2$$ExternalSyntheticLambda0;-><init>()V
 HSPLorg/thoughtcrime/securesms/util/FeatureFlags$2;-><init>()V
@@ -27830,7 +27617,6 @@ HSPLorg/thoughtcrime/securesms/util/FeatureFlags;->getString(Ljava/lang/String;L
 HSPLorg/thoughtcrime/securesms/util/FeatureFlags;->gifSearchAvailable()Z
 HSPLorg/thoughtcrime/securesms/util/FeatureFlags;->groupLimits()Lorg/thoughtcrime/securesms/groups/SelectionLimits;
 HSPLorg/thoughtcrime/securesms/util/FeatureFlags;->init()V
-HSPLorg/thoughtcrime/securesms/util/FeatureFlags;->instantVideoPlayback()Z
 HSPLorg/thoughtcrime/securesms/util/FeatureFlags;->internalUser()Z
 HSPLorg/thoughtcrime/securesms/util/FeatureFlags;->libSignalWebSocketEnabled()Z
 HSPLorg/thoughtcrime/securesms/util/FeatureFlags;->libSignalWebSocketShadowingPercentage()I
@@ -27862,8 +27648,6 @@ HSPLorg/thoughtcrime/securesms/util/FullscreenHelper;-><init>(Landroid/app/Activ
 HSPLorg/thoughtcrime/securesms/util/FullscreenHelper;-><init>(Landroid/app/Activity;Z)V
 HSPLorg/thoughtcrime/securesms/util/FullscreenHelper;->showSystemUI()V
 HSPLorg/thoughtcrime/securesms/util/FullscreenHelper;->showSystemUI(Landroid/view/Window;)V
-HSPLorg/thoughtcrime/securesms/util/JavaTimeExtensionsKt;->toLocalDate$default(JLj$/time/ZoneId;ILjava/lang/Object;)Lj$/time/LocalDate;
-HSPLorg/thoughtcrime/securesms/util/JavaTimeExtensionsKt;->toLocalDate(JLj$/time/ZoneId;)Lj$/time/LocalDate;
 HSPLorg/thoughtcrime/securesms/util/JavaTimeExtensionsKt;->toLocalDateTime(JLj$/time/ZoneId;)Lj$/time/LocalDateTime;
 HSPLorg/thoughtcrime/securesms/util/JavaTimeExtensionsKt;->toMillis$default(Lj$/time/LocalDateTime;Lj$/time/ZoneOffset;ILjava/lang/Object;)J
 HSPLorg/thoughtcrime/securesms/util/JavaTimeExtensionsKt;->toMillis(Lj$/time/LocalDateTime;Lj$/time/ZoneOffset;)J
@@ -27893,27 +27677,27 @@ HSPLorg/thoughtcrime/securesms/util/ListenableFutureTask;->addListener(Lorg/thou
 HSPLorg/thoughtcrime/securesms/util/ListenableFutureTask;->callback()V
 HSPLorg/thoughtcrime/securesms/util/ListenableFutureTask;->callback(Lorg/thoughtcrime/securesms/util/FutureTaskListener;)V
 HSPLorg/thoughtcrime/securesms/util/ListenableFutureTask;->done()V
-HSPLorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda0;-><init>(Ljava/lang/String;)V
-HSPLorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda0;->run()V
-HSPLorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda1;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/util/concurrent/TimeUnit;J)V
-HSPLorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda1;->run()V
+HSPLorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda2;-><init>(Ljava/lang/String;Ljava/lang/String;J)V
+HSPLorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda2;->run()V
 HSPLorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda3;-><init>(Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda3;->run()V
-HSPLorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda5;-><init>(Ljava/lang/String;Ljava/lang/String;J)V
-HSPLorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda5;->run()V
+HSPLorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda4;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/util/concurrent/TimeUnit;J)V
+HSPLorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda4;->run()V
+HSPLorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda6;-><init>(Ljava/lang/String;)V
+HSPLorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda6;->run()V
 HSPLorg/thoughtcrime/securesms/util/LocalMetrics$db$2;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/LocalMetrics$db$2;-><init>()V
 HSPLorg/thoughtcrime/securesms/util/LocalMetrics$db$2;->invoke()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/util/LocalMetrics$db$2;->invoke()Lorg/thoughtcrime/securesms/database/LocalMetricsDatabase;
-HSPLorg/thoughtcrime/securesms/util/LocalMetrics;->$r8$lambda$LWhV70UFs6K1_Kb5_DudMXGygEI(Ljava/lang/String;)V
-HSPLorg/thoughtcrime/securesms/util/LocalMetrics;->$r8$lambda$X9QqPGK6qnW4mm4kaI3cKn_ucLs(Ljava/lang/String;Ljava/lang/String;J)V
-HSPLorg/thoughtcrime/securesms/util/LocalMetrics;->$r8$lambda$lM4JkL7PVbu7o2AIXMs_yu-XRWw(Ljava/lang/String;)V
-HSPLorg/thoughtcrime/securesms/util/LocalMetrics;->$r8$lambda$vhsxodk82Hinv0nlm18PrqpnLhE(Ljava/lang/String;Ljava/lang/String;Ljava/util/concurrent/TimeUnit;J)V
+HSPLorg/thoughtcrime/securesms/util/LocalMetrics;->$r8$lambda$-WmWSp6q9r6n8B4GebDufZGAimY(Ljava/lang/String;Ljava/lang/String;Ljava/util/concurrent/TimeUnit;J)V
+HSPLorg/thoughtcrime/securesms/util/LocalMetrics;->$r8$lambda$hRkBSVM1B82Jtbc71E7_EZxOSFE(Ljava/lang/String;)V
+HSPLorg/thoughtcrime/securesms/util/LocalMetrics;->$r8$lambda$jz0nPhZVkIAQDNrbZmv3GGSn9H4(Ljava/lang/String;Ljava/lang/String;J)V
+HSPLorg/thoughtcrime/securesms/util/LocalMetrics;->$r8$lambda$kiPQXDeVHVhUxrxSyGczAoEYgkQ(Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/util/LocalMetrics;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/LocalMetrics;-><init>()V
-HSPLorg/thoughtcrime/securesms/util/LocalMetrics;->cancel$lambda$5(Ljava/lang/String;)V
+HSPLorg/thoughtcrime/securesms/util/LocalMetrics;->cancel$lambda$6(Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/util/LocalMetrics;->cancel(Ljava/lang/String;)V
-HSPLorg/thoughtcrime/securesms/util/LocalMetrics;->end$lambda$6(Ljava/lang/String;)V
+HSPLorg/thoughtcrime/securesms/util/LocalMetrics;->end$lambda$7(Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/util/LocalMetrics;->end(Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/util/LocalMetrics;->getDb()Lorg/thoughtcrime/securesms/database/LocalMetricsDatabase;
 HSPLorg/thoughtcrime/securesms/util/LocalMetrics;->getInstance()Lorg/thoughtcrime/securesms/util/LocalMetrics;
@@ -27926,11 +27710,6 @@ HSPLorg/thoughtcrime/securesms/util/LocalMetrics;->start(Ljava/lang/String;Ljava
 HSPLorg/thoughtcrime/securesms/util/LocaleUtil;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/LocaleUtil;-><init>()V
 HSPLorg/thoughtcrime/securesms/util/LocaleUtil;->getLocaleDefaults()Ljava/util/List;
-HSPLorg/thoughtcrime/securesms/util/LongClickMovementMethod$1;-><init>(Lorg/thoughtcrime/securesms/util/LongClickMovementMethod;)V
-HSPLorg/thoughtcrime/securesms/util/LongClickMovementMethod;-><init>(Landroid/content/Context;)V
-HSPLorg/thoughtcrime/securesms/util/LongClickMovementMethod;->getInstance(Landroid/content/Context;)Lorg/thoughtcrime/securesms/util/LongClickMovementMethod;
-HSPLorg/thoughtcrime/securesms/util/Material3OnScrollHelper$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/util/Material3OnScrollHelper;IIII)V
-HSPLorg/thoughtcrime/securesms/util/Material3OnScrollHelper$$ExternalSyntheticLambda0;->onAnimationUpdate(Landroid/animation/ValueAnimator;)V
 HSPLorg/thoughtcrime/securesms/util/Material3OnScrollHelper$1;-><init>(Landroid/app/Activity;)V
 HSPLorg/thoughtcrime/securesms/util/Material3OnScrollHelper$1;->invoke(I)V
 HSPLorg/thoughtcrime/securesms/util/Material3OnScrollHelper$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
@@ -27949,7 +27728,6 @@ HSPLorg/thoughtcrime/securesms/util/Material3OnScrollHelper$ColorSet;->getStatus
 HSPLorg/thoughtcrime/securesms/util/Material3OnScrollHelper$ColorSet;->getToolbarColorRes()I
 HSPLorg/thoughtcrime/securesms/util/Material3OnScrollHelper$OnScrollListener;-><init>(Lorg/thoughtcrime/securesms/util/Material3OnScrollHelper;)V
 HSPLorg/thoughtcrime/securesms/util/Material3OnScrollHelper$OnScrollListener;->onScrolled(Landroidx/recyclerview/widget/RecyclerView;II)V
-HSPLorg/thoughtcrime/securesms/util/Material3OnScrollHelper;->$r8$lambda$T0JnL_tDtAWK4RNMpbrK8xUunio(Lorg/thoughtcrime/securesms/util/Material3OnScrollHelper;IIIILandroid/animation/ValueAnimator;)V
 HSPLorg/thoughtcrime/securesms/util/Material3OnScrollHelper;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/Material3OnScrollHelper;-><init>(Landroid/app/Activity;Ljava/util/List;Ljava/util/List;Landroidx/lifecycle/LifecycleOwner;)V
 HSPLorg/thoughtcrime/securesms/util/Material3OnScrollHelper;-><init>(Landroid/app/Activity;Ljava/util/List;Ljava/util/List;Landroidx/lifecycle/LifecycleOwner;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -27960,7 +27738,6 @@ HSPLorg/thoughtcrime/securesms/util/Material3OnScrollHelper;->getActiveColorSet(
 HSPLorg/thoughtcrime/securesms/util/Material3OnScrollHelper;->getInactiveColorSet()Lorg/thoughtcrime/securesms/util/Material3OnScrollHelper$ColorSet;
 HSPLorg/thoughtcrime/securesms/util/Material3OnScrollHelper;->setColorImmediate()V
 HSPLorg/thoughtcrime/securesms/util/Material3OnScrollHelper;->setToolbarColor(I)V
-HSPLorg/thoughtcrime/securesms/util/Material3OnScrollHelper;->updateActiveState$lambda$7$lambda$6(Lorg/thoughtcrime/securesms/util/Material3OnScrollHelper;IIIILandroid/animation/ValueAnimator;)V
 HSPLorg/thoughtcrime/securesms/util/Material3OnScrollHelper;->updateActiveState(Z)V
 HSPLorg/thoughtcrime/securesms/util/MediaUtil$1;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/MediaUtil$SlideType;->$values()[Lorg/thoughtcrime/securesms/util/MediaUtil$SlideType;
@@ -27973,7 +27750,6 @@ HSPLorg/thoughtcrime/securesms/util/MediaUtil;->getSlideTypeFromContentType(Ljav
 HSPLorg/thoughtcrime/securesms/util/MediaUtil;->isAudioType(Ljava/lang/String;)Z
 HSPLorg/thoughtcrime/securesms/util/MediaUtil;->isGif(Ljava/lang/String;)Z
 HSPLorg/thoughtcrime/securesms/util/MediaUtil;->isImageType(Ljava/lang/String;)Z
-HSPLorg/thoughtcrime/securesms/util/MediaUtil;->isInstantVideoSupported(Lorg/thoughtcrime/securesms/mms/Slide;)Z
 HSPLorg/thoughtcrime/securesms/util/MediaUtil;->isLongTextType(Ljava/lang/String;)Z
 HSPLorg/thoughtcrime/securesms/util/MediaUtil;->isVideo(Ljava/lang/String;)Z
 HSPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->hasAudio(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
@@ -27982,15 +27758,11 @@ HSPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->hasExtraText(Lorg/though
 HSPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->hasGiftBadge(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
 HSPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->hasLinkPreview(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
 HSPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->hasLocation(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
-HSPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->hasNoBubble(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Landroid/content/Context;)Z
-HSPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->hasOnlyThumbnail(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Landroid/content/Context;)Z
 HSPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->hasQuote(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
 HSPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->hasSharedContact(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
 HSPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->hasSticker(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
 HSPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->hasThumbnail(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
-HSPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->isBorderless(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Landroid/content/Context;)Z
 HSPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->isCaptionlessMms(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Landroid/content/Context;)Z
-HSPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->isEditMessage(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
 HSPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->isScheduled(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
 HSPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->isStoryReaction(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
 HSPLorg/thoughtcrime/securesms/util/MessageRecordUtil;->isTextOnly(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Landroid/content/Context;)Z
@@ -28003,17 +27775,17 @@ HSPLorg/thoughtcrime/securesms/util/NetworkUtil;->getNetworkInfo(Landroid/conten
 HSPLorg/thoughtcrime/securesms/util/NetworkUtil;->isConnected(Landroid/content/Context;)Z
 HSPLorg/thoughtcrime/securesms/util/NetworkUtil;->isConnectedWifi(Landroid/content/Context;)Z
 HSPLorg/thoughtcrime/securesms/util/NoCrossfadeChangeDefaultAnimator;-><init>()V
-HSPLorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-HSPLorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda2;-><init>()V
-HSPLorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda3;-><init>(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-HSPLorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda3;->call()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda4;-><init>(Lorg/whispersystems/signalservice/api/services/ProfileService;Lj$/util/Optional;Lj$/util/Optional;Lorg/whispersystems/signalservice/api/profiles/SignalServiceProfile$RequestType;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-HSPLorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda4;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda0;-><init>(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
+HSPLorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda0;->call()Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda1;-><init>(Lorg/whispersystems/signalservice/api/services/ProfileService;Lj$/util/Optional;Lj$/util/Optional;Lorg/whispersystems/signalservice/api/profiles/SignalServiceProfile$RequestType;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
+HSPLorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
+HSPLorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda4;-><init>()V
 HSPLorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda5;-><init>(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->$r8$lambda$-c-8Rwy6e64peLv2SUk2gjvq7PE(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/Recipient;)Lorg/whispersystems/signalservice/api/push/SignalServiceAddress;
-HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->$r8$lambda$0JB7ay9SNj5m4iSCvT2_N6rKyuM(Lorg/thoughtcrime/securesms/recipients/Recipient;Lorg/whispersystems/signalservice/internal/ServiceResponse;)Lorg/signal/libsignal/protocol/util/Pair;
-HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->$r8$lambda$Cd53nSsB80_pPTYAR1aj3sUFWaU(Lorg/whispersystems/signalservice/api/services/ProfileService;Lj$/util/Optional;Lj$/util/Optional;Lorg/whispersystems/signalservice/api/profiles/SignalServiceProfile$RequestType;Lorg/thoughtcrime/securesms/recipients/Recipient;Lorg/whispersystems/signalservice/api/push/SignalServiceAddress;)Lio/reactivex/rxjava3/core/SingleSource;
+HSPLorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda5;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->$r8$lambda$7_Qm5SsIePUqABYAfoZaUw7ra_k(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/Recipient;)Lorg/whispersystems/signalservice/api/push/SignalServiceAddress;
+HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->$r8$lambda$QRdEULF9iUMm0IBKkN_dfk_C6cs(Lorg/thoughtcrime/securesms/recipients/Recipient;Lorg/whispersystems/signalservice/internal/ServiceResponse;)Lorg/signal/libsignal/protocol/util/Pair;
+HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->$r8$lambda$irvqkfCFZnKE4-QrHblZc-mq5EU(Lorg/whispersystems/signalservice/api/services/ProfileService;Lj$/util/Optional;Lj$/util/Optional;Lorg/whispersystems/signalservice/api/profiles/SignalServiceProfile$RequestType;Lorg/thoughtcrime/securesms/recipients/Recipient;Lorg/whispersystems/signalservice/api/push/SignalServiceAddress;)Lio/reactivex/rxjava3/core/SingleSource;
 HSPLorg/thoughtcrime/securesms/util/ProfileUtil;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->handleSelfProfileKeyChange()V
 HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->lambda$retrieveProfile$3(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/Recipient;)Lorg/whispersystems/signalservice/api/push/SignalServiceAddress;
@@ -28022,19 +27794,10 @@ HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->lambda$retrieveProfile$5(Lorg/
 HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->retrieveProfile(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/Recipient;Lorg/whispersystems/signalservice/api/profiles/SignalServiceProfile$RequestType;Z)Lio/reactivex/rxjava3/core/Single;
 HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->retrieveProfileSync(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/Recipient;Lorg/whispersystems/signalservice/api/profiles/SignalServiceProfile$RequestType;Z)Lorg/whispersystems/signalservice/api/profiles/ProfileAndCredential;
 HSPLorg/thoughtcrime/securesms/util/ProfileUtil;->toSignalServiceAddress(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/Recipient;)Lorg/whispersystems/signalservice/api/push/SignalServiceAddress;
-HSPLorg/thoughtcrime/securesms/util/Projection$Corners;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/util/Projection$Corners;-><init>(F)V
-HSPLorg/thoughtcrime/securesms/util/Projection$Corners;-><init>(FFFF)V
-HSPLorg/thoughtcrime/securesms/util/Projection$Corners;-><init>([F)V
-HSPLorg/thoughtcrime/securesms/util/Projection$Corners;->toRadii()[F
-HSPLorg/thoughtcrime/securesms/util/Projection$Corners;->toRelativeRadii(Z)[F
 HSPLorg/thoughtcrime/securesms/util/ProjectionList;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/ProjectionList;-><init>()V
 HSPLorg/thoughtcrime/securesms/util/ProjectionList;-><init>(I)V
 HSPLorg/thoughtcrime/securesms/util/ProjectionList;-><init>(IILkotlin/jvm/internal/DefaultConstructorMarker;)V
-HSPLorg/thoughtcrime/securesms/util/ProjectionList;->close()V
-HSPLorg/thoughtcrime/securesms/util/ProjectionList;->getSize()I
-HSPLorg/thoughtcrime/securesms/util/ProjectionList;->size()I
 HSPLorg/thoughtcrime/securesms/util/PushCharacterCalculator$1;-><init>()V
 HSPLorg/thoughtcrime/securesms/util/PushCharacterCalculator;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/PushCharacterCalculator;-><init>()V
@@ -28053,7 +27816,6 @@ HSPLorg/thoughtcrime/securesms/util/ScreenDensity;->get(Landroid/content/Context
 HSPLorg/thoughtcrime/securesms/util/ScreenDensity;->getBucket()Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/util/ScreenDensity;->isKnownDensity()Z
 HSPLorg/thoughtcrime/securesms/util/ScreenDensity;->xhdpiRelativeDensityScaleFactor(Ljava/lang/String;)F
-HSPLorg/thoughtcrime/securesms/util/SearchUtil;->getHighlightedSpan(Ljava/util/Locale;Lorg/thoughtcrime/securesms/util/SearchUtil$StyleFactory;Landroid/text/Spannable;Ljava/lang/String;I)Landroid/text/Spannable;
 HSPLorg/thoughtcrime/securesms/util/ServiceUtil;->getActivityManager(Landroid/content/Context;)Landroid/app/ActivityManager;
 HSPLorg/thoughtcrime/securesms/util/ServiceUtil;->getAlarmManager(Landroid/content/Context;)Landroid/app/AlarmManager;
 HSPLorg/thoughtcrime/securesms/util/ServiceUtil;->getConnectivityManager(Landroid/content/Context;)Landroid/net/ConnectivityManager;
@@ -28068,22 +27830,21 @@ HSPLorg/thoughtcrime/securesms/util/SignalLocalMetrics$ColdStart;->onRenderFinis
 HSPLorg/thoughtcrime/securesms/util/SignalLocalMetrics$ColdStart;->onRenderStart()V
 HSPLorg/thoughtcrime/securesms/util/SignalLocalMetrics$ColdStart;->start()V
 HSPLorg/thoughtcrime/securesms/util/SignalLocalMetrics$ConversationOpen;->onDataLoaded()V
-HSPLorg/thoughtcrime/securesms/util/SignalLocalMetrics$ConversationOpen;->onDataPostedToMain()V
 HSPLorg/thoughtcrime/securesms/util/SignalLocalMetrics$ConversationOpen;->onMetadataLoadStarted()V
 HSPLorg/thoughtcrime/securesms/util/SignalLocalMetrics$ConversationOpen;->onMetadataLoaded()V
 HSPLorg/thoughtcrime/securesms/util/SignalLocalMetrics$ConversationOpen;->start()V
 HSPLorg/thoughtcrime/securesms/util/SignalProxyUtil;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/SignalProxyUtil;->startListeningToWebsocket()V
-HSPLorg/thoughtcrime/securesms/util/SignalTrace$$ExternalSyntheticLambda0;-><init>()V
+HSPLorg/thoughtcrime/securesms/util/SignalTrace$$ExternalSyntheticLambda0;-><init>(Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/util/SignalTrace$$ExternalSyntheticLambda0;->run()V
-HSPLorg/thoughtcrime/securesms/util/SignalTrace$$ExternalSyntheticLambda1;-><init>(Ljava/lang/String;)V
+HSPLorg/thoughtcrime/securesms/util/SignalTrace$$ExternalSyntheticLambda1;-><init>()V
 HSPLorg/thoughtcrime/securesms/util/SignalTrace$$ExternalSyntheticLambda1;->run()V
 HSPLorg/thoughtcrime/securesms/util/SignalTrace$executor$2;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/SignalTrace$executor$2;-><init>()V
 HSPLorg/thoughtcrime/securesms/util/SignalTrace$executor$2;->invoke()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/util/SignalTrace$executor$2;->invoke()Ljava/util/concurrent/ExecutorService;
-HSPLorg/thoughtcrime/securesms/util/SignalTrace;->$r8$lambda$ShoapdlUf6pfxq8nEXjWCRusgUk(Ljava/lang/String;)V
-HSPLorg/thoughtcrime/securesms/util/SignalTrace;->$r8$lambda$Sz0mhg0bzgqcFkCkQIn9k_7cpcQ()V
+HSPLorg/thoughtcrime/securesms/util/SignalTrace;->$r8$lambda$KFaVYyNHHYMYbYAZqUMvrwvgGn4()V
+HSPLorg/thoughtcrime/securesms/util/SignalTrace;->$r8$lambda$hJrmkXc1QT9BnYmeX67ocN7M6Xg(Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/util/SignalTrace;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/SignalTrace;-><init>()V
 HSPLorg/thoughtcrime/securesms/util/SignalTrace;->beginSection$lambda$0(Ljava/lang/String;)V
@@ -28095,7 +27856,7 @@ HSPLorg/thoughtcrime/securesms/util/SignalUncaughtExceptionHandler;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/SignalUncaughtExceptionHandler;-><init>(Ljava/lang/Thread$UncaughtExceptionHandler;)V
 HSPLorg/thoughtcrime/securesms/util/SingleLiveEvent;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/SingleLiveEvent;-><init>()V
-HSPLorg/thoughtcrime/securesms/util/SnapToTopDataObserver$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/util/SnapToTopDataObserver;)V
+HSPLorg/thoughtcrime/securesms/util/SnapToTopDataObserver$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/util/SnapToTopDataObserver;)V
 HSPLorg/thoughtcrime/securesms/util/SnapToTopDataObserver;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/SnapToTopDataObserver;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 HSPLorg/thoughtcrime/securesms/util/SnapToTopDataObserver;-><init>(Landroidx/recyclerview/widget/RecyclerView;Lorg/thoughtcrime/securesms/util/SnapToTopDataObserver$ScrollRequestValidator;Lorg/thoughtcrime/securesms/util/SnapToTopDataObserver$ScrollToTop;)V
@@ -28111,8 +27872,6 @@ HSPLorg/thoughtcrime/securesms/util/SoftHashMap;->get(Ljava/lang/Object;)Ljava/l
 HSPLorg/thoughtcrime/securesms/util/SoftHashMap;->processQueue()V
 HSPLorg/thoughtcrime/securesms/util/SoftHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/util/SoftHashMap;->trimStrongReferencesIfNecessary()V
-HSPLorg/thoughtcrime/securesms/util/SpanUtil;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/util/SpanUtil;->ofSize(Ljava/lang/CharSequence;I)Ljava/lang/CharSequence;
 HSPLorg/thoughtcrime/securesms/util/StorageUtil;->getCleanFileName(Ljava/lang/String;)Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences$MediaKeyboardMode;->$values()[Lorg/thoughtcrime/securesms/util/TextSecurePreferences$MediaKeyboardMode;
 HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences$MediaKeyboardMode;-><clinit>()V
@@ -28135,7 +27894,6 @@ HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->getLastVersionCode(L
 HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->getLongPreference(Landroid/content/Context;Ljava/lang/String;J)J
 HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->getMediaDownloadAllowed(Landroid/content/Context;Ljava/lang/String;I)Ljava/util/Set;
 HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->getMediaKeyboardMode(Landroid/content/Context;)Lorg/thoughtcrime/securesms/util/TextSecurePreferences$MediaKeyboardMode;
-HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->getMessageBodyTextSize(Landroid/content/Context;)I
 HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->getMobileMediaDownloadAllowed(Landroid/content/Context;)Ljava/util/Set;
 HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->getNotificationChannelVersion(Landroid/content/Context;)I
 HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->getNotificationLedColor(Landroid/content/Context;)Ljava/lang/String;
@@ -28154,7 +27912,6 @@ HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->getUnidentifiedAcces
 HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->hasPromptedPushRegistration(Landroid/content/Context;)Z
 HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->hasSeenStickerIntroTooltip(Landroid/content/Context;)Z
 HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->isBackupEnabled(Landroid/content/Context;)Z
-HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->isEnterSendsEnabled(Landroid/content/Context;)Z
 HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->isIncognitoKeyboardEnabled(Landroid/content/Context;)Z
 HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->isNotificationVibrateEnabled(Landroid/content/Context;)Z
 HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->isNotificationsEnabled(Landroid/content/Context;)Z
@@ -28179,9 +27936,7 @@ HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->setPromptedPushRegis
 HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->setSignedPreKeyRotationTime(Landroid/content/Context;J)V
 HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->setUnauthorizedReceived(Landroid/content/Context;Z)V
 HSPLorg/thoughtcrime/securesms/util/TextSecurePreferences;->setUnidentifiedAccessCertificateRotationTime(Landroid/content/Context;J)V
-HSPLorg/thoughtcrime/securesms/util/ThemeUtil;->getAttribute(Landroid/content/Context;ILjava/lang/String;)Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/util/ThemeUtil;->getThemedBoolean(Landroid/content/Context;I)Z
-HSPLorg/thoughtcrime/securesms/util/ThemeUtil;->isDarkTheme(Landroid/content/Context;)Z
 HSPLorg/thoughtcrime/securesms/util/ThrottledDebouncer$OverflowHandler;->-$$Nest$fgetlastRun(Lorg/thoughtcrime/securesms/util/ThrottledDebouncer$OverflowHandler;)J
 HSPLorg/thoughtcrime/securesms/util/ThrottledDebouncer$OverflowHandler;-><init>()V
 HSPLorg/thoughtcrime/securesms/util/ThrottledDebouncer$OverflowHandler;->handleMessage(Landroid/os/Message;)V
@@ -28199,9 +27954,7 @@ HSPLorg/thoughtcrime/securesms/util/Util;->getSecretBytes(I)[B
 HSPLorg/thoughtcrime/securesms/util/Util;->getSecretBytes(Ljava/security/SecureRandom;I)[B
 HSPLorg/thoughtcrime/securesms/util/Util;->getTimeUntilBuildExpiry()J
 HSPLorg/thoughtcrime/securesms/util/Util;->hasItems(Ljava/util/Collection;)Z
-HSPLorg/thoughtcrime/securesms/util/Util;->hashCode([Ljava/lang/Object;)I
 HSPLorg/thoughtcrime/securesms/util/Util;->isEmpty(Ljava/lang/CharSequence;)Z
-HSPLorg/thoughtcrime/securesms/util/Util;->isEmpty(Ljava/util/Collection;)Z
 HSPLorg/thoughtcrime/securesms/util/Util;->join(Ljava/util/Collection;Ljava/lang/String;)Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/util/Util;->join([Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 HSPLorg/thoughtcrime/securesms/util/Util;->uri(Ljava/lang/String;)Landroid/net/Uri;
@@ -28210,10 +27963,7 @@ HSPLorg/thoughtcrime/securesms/util/VersionTracker;-><init>()V
 HSPLorg/thoughtcrime/securesms/util/VersionTracker;->getDaysSinceFirstInstalled(Landroid/content/Context;)J
 HSPLorg/thoughtcrime/securesms/util/VersionTracker;->getLastSeenVersion(Landroid/content/Context;)I
 HSPLorg/thoughtcrime/securesms/util/VersionTracker;->updateLastSeenVersion(Landroid/content/Context;)V
-HSPLorg/thoughtcrime/securesms/util/ViewExtensionsKt;->drawAsTopItemDecoration(Landroid/view/View;Landroid/graphics/Canvas;Landroid/view/View;Landroid/view/View;I)V
 HSPLorg/thoughtcrime/securesms/util/ViewExtensionsKt;->getLifecycle(Landroid/view/View;)Landroidx/lifecycle/Lifecycle;
-HSPLorg/thoughtcrime/securesms/util/ViewExtensionsKt;->getVisible(Landroid/view/View;)Z
-HSPLorg/thoughtcrime/securesms/util/ViewExtensionsKt;->layoutIn(Landroid/view/View;Landroid/view/View;)V
 HSPLorg/thoughtcrime/securesms/util/ViewExtensionsKt;->padding$default(Landroid/view/View;IIIIILjava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/util/ViewExtensionsKt;->padding(Landroid/view/View;IIII)V
 HSPLorg/thoughtcrime/securesms/util/ViewExtensionsKt;->setVisible(Landroid/view/View;Z)V
@@ -28246,25 +27996,12 @@ HSPLorg/thoughtcrime/securesms/util/ViewModelFactoryKt$viewModel$$inlined$viewMo
 HSPLorg/thoughtcrime/securesms/util/ViewModelFactoryKt$viewModel$$inlined$viewModels$default$7;->invoke()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/util/ViewUtil;->dpToPx(I)I
 HSPLorg/thoughtcrime/securesms/util/ViewUtil;->findStubById(Landroid/view/View;I)Lorg/thoughtcrime/securesms/util/views/Stub;
-HSPLorg/thoughtcrime/securesms/util/ViewUtil;->getLeftMargin(Landroid/view/View;)I
-HSPLorg/thoughtcrime/securesms/util/ViewUtil;->getRightMargin(Landroid/view/View;)I
-HSPLorg/thoughtcrime/securesms/util/ViewUtil;->getTopMargin(Landroid/view/View;)I
 HSPLorg/thoughtcrime/securesms/util/ViewUtil;->getWidth(Landroid/view/View;)I
 HSPLorg/thoughtcrime/securesms/util/ViewUtil;->isLtr(Landroid/content/Context;)Z
 HSPLorg/thoughtcrime/securesms/util/ViewUtil;->isLtr(Landroid/view/View;)Z
 HSPLorg/thoughtcrime/securesms/util/ViewUtil;->isRtl(Landroid/content/Context;)Z
-HSPLorg/thoughtcrime/securesms/util/ViewUtil;->isRtl(Landroid/view/View;)Z
 HSPLorg/thoughtcrime/securesms/util/ViewUtil;->mirrorIfRtl(Landroid/view/View;Landroid/content/Context;)V
-HSPLorg/thoughtcrime/securesms/util/ViewUtil;->setPaddingBottom(Landroid/view/View;I)V
-HSPLorg/thoughtcrime/securesms/util/ViewUtil;->setPaddingEnd(Landroid/view/View;I)V
-HSPLorg/thoughtcrime/securesms/util/ViewUtil;->setPaddingStart(Landroid/view/View;I)V
-HSPLorg/thoughtcrime/securesms/util/ViewUtil;->setPaddingTop(Landroid/view/View;I)V
 HSPLorg/thoughtcrime/securesms/util/ViewUtil;->setTextViewGravityStart(Landroid/widget/TextView;Landroid/content/Context;)V
-HSPLorg/thoughtcrime/securesms/util/ViewUtil;->setTopMargin(Landroid/view/View;I)V
-HSPLorg/thoughtcrime/securesms/util/ViewUtil;->setTopMargin(Landroid/view/View;IZ)V
-HSPLorg/thoughtcrime/securesms/util/ViewUtil;->setVisibilityIfNonNull(Landroid/view/View;I)V
-HSPLorg/thoughtcrime/securesms/util/ViewUtil;->updateLayoutParams(Landroid/view/View;II)V
-HSPLorg/thoughtcrime/securesms/util/ViewUtil;->updateLayoutParamsIfNonNull(Landroid/view/View;II)V
 HSPLorg/thoughtcrime/securesms/util/WakeLockUtil;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/WakeLockUtil;->acquire(Landroid/content/Context;IJLjava/lang/String;)Landroid/os/PowerManager$WakeLock;
 HSPLorg/thoughtcrime/securesms/util/WakeLockUtil;->prefixTag(Ljava/lang/String;)Ljava/lang/String;
@@ -28280,31 +28017,17 @@ HSPLorg/thoughtcrime/securesms/util/WindowUtil;->setNavigationBarColor(Landroid/
 HSPLorg/thoughtcrime/securesms/util/WindowUtil;->setStatusBarColor(Landroid/view/Window;I)V
 HSPLorg/thoughtcrime/securesms/util/WindowUtil;->setSystemUiFlags(Landroid/view/Window;I)V
 HSPLorg/thoughtcrime/securesms/util/adapter/mapping/LayoutFactory;-><init>(Lj$/util/function/Function;I)V
-HSPLorg/thoughtcrime/securesms/util/adapter/mapping/LayoutFactory;->createViewHolder(Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;
 HSPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;-><init>()V
 HSPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;-><init>(Z)V
 HSPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->getItemTypes()Ljava/util/Map;
 HSPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->onAttachedToRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
-HSPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->onBindViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;ILjava/util/List;)V
-HSPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->onBindViewHolder(Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;I)V
-HSPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->onBindViewHolder(Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;ILjava/util/List;)V
-HSPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
-HSPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;
-HSPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->onViewAttachedToWindow(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
-HSPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->onViewAttachedToWindow(Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;)V
 HSPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->registerFactory(Ljava/lang/Class;Lj$/util/function/Function;I)V
 HSPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->registerFactory(Ljava/lang/Class;Lorg/thoughtcrime/securesms/util/adapter/mapping/Factory;)V
 HSPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingDiffCallback;-><init>()V
 HSPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingModelList;-><init>(Ljava/util/Collection;)V
-HSPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;-><init>(Landroid/view/View;)V
-HSPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;->onAttachedToWindow()V
-HSPLorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;->setPayload(Ljava/util/List;)V
 HSPLorg/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter$$ExternalSyntheticLambda0;-><init>(II)V
 HSPLorg/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter;-><init>()V
 HSPLorg/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter;-><init>(II)V
-HSPLorg/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter;->getItem(I)Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter;->getItem(I)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingModel;
-HSPLorg/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter;->getItemViewType(I)I
 HSPLorg/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter;->setPagingController(Lorg/signal/paging/PagingController;)V
 HSPLorg/thoughtcrime/securesms/util/cjkv/CJKVUtil;->isCJKV(Ljava/lang/String;)Z
 HSPLorg/thoughtcrime/securesms/util/cjkv/CJKVUtil;->isCodepointCJKV(I)Z
@@ -28312,14 +28035,12 @@ HSPLorg/thoughtcrime/securesms/util/concurrent/FilteredExecutor;-><init>(Ljava/u
 HSPLorg/thoughtcrime/securesms/util/concurrent/FilteredExecutor;->execute(Ljava/lang/Runnable;)V
 HSPLorg/thoughtcrime/securesms/util/concurrent/SerialExecutor$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/util/concurrent/SerialExecutor;Ljava/lang/Runnable;)V
 HSPLorg/thoughtcrime/securesms/util/concurrent/SerialExecutor$$ExternalSyntheticLambda0;->run()V
-HSPLorg/thoughtcrime/securesms/util/concurrent/SerialExecutor;->$r8$lambda$kLQeZ4d8pd_k1T8m9iyxCqxG07k(Lorg/thoughtcrime/securesms/util/concurrent/SerialExecutor;Ljava/lang/Runnable;)V
+HSPLorg/thoughtcrime/securesms/util/concurrent/SerialExecutor;->$r8$lambda$hwbDi3W6J8bDVHwfWyqqgqJ8u-U(Lorg/thoughtcrime/securesms/util/concurrent/SerialExecutor;Ljava/lang/Runnable;)V
 HSPLorg/thoughtcrime/securesms/util/concurrent/SerialExecutor;-><init>(Ljava/util/concurrent/Executor;)V
 HSPLorg/thoughtcrime/securesms/util/concurrent/SerialExecutor;->execute(Ljava/lang/Runnable;)V
 HSPLorg/thoughtcrime/securesms/util/concurrent/SerialExecutor;->lambda$execute$0(Ljava/lang/Runnable;)V
 HSPLorg/thoughtcrime/securesms/util/concurrent/SerialExecutor;->scheduleNext()V
 HSPLorg/thoughtcrime/securesms/util/concurrent/SerialMonoLifoExecutor;-><init>(Ljava/util/concurrent/Executor;)V
-HSPLorg/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat;-><clinit>()V
-HSPLorg/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat;-><init>(Landroid/content/Context;)V
 HSPLorg/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageContextWrapper;->getUsersSelectedLocale(Landroid/content/Context;)Ljava/util/Locale;
 HSPLorg/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageContextWrapper;->prepareOverrideConfiguration(Landroid/content/Context;Landroid/content/res/Configuration;)V
 HSPLorg/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageContextWrapper;->updateContext(Landroid/content/Context;)V
@@ -28329,13 +28050,13 @@ HSPLorg/thoughtcrime/securesms/util/dynamiclanguage/LanguageString;->parseLocale
 HSPLorg/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser;->appSupportsTheExactLocale(Ljava/util/Locale;)Z
 HSPLorg/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser;->findBestMatchingLocaleForLanguage(Ljava/lang/String;)Ljava/util/Locale;
 HSPLorg/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser;->findBestSystemLocale()Ljava/util/Locale;
-HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$$ExternalSyntheticLambda1;-><init>(Landroidx/lifecycle/MediatorLiveData;)V
+HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$$ExternalSyntheticLambda2;-><init>(Landroidx/lifecycle/MediatorLiveData;)V
 HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$$ExternalSyntheticLambda3;-><init>(Landroidx/lifecycle/MediatorLiveData;Landroidx/lifecycle/LiveData;)V
 HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$$ExternalSyntheticLambda3;->onChanged(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$$ExternalSyntheticLambda5;-><init>(Lcom/annimon/stream/function/Predicate;Landroidx/lifecycle/MediatorLiveData;)V
+HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$$ExternalSyntheticLambda4;-><init>(Lcom/annimon/stream/function/Predicate;Landroidx/lifecycle/MediatorLiveData;)V
 HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$2$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$2;Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$2$$ExternalSyntheticLambda0;->run()V
-HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$2;->$r8$lambda$gqoglpxXgFpc8cQElHQkCG53MaA(Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$2;Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$2;->$r8$lambda$uBvmTeTLgCrt9siKd3_oZP86P10(Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$2;Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$2;-><init>(Ljava/lang/Object;J)V
 HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$2;->lambda$onActive$0(Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$2;->onActive()V
@@ -28345,12 +28066,12 @@ HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$CombineLiveData$$Exter
 HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$CombineLiveData$$ExternalSyntheticLambda1;->onChanged(Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$CombineLiveData$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$CombineLiveData;Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$Combine;)V
 HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$CombineLiveData$$ExternalSyntheticLambda2;->onChanged(Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$CombineLiveData;->$r8$lambda$9RTRlZY4jtMPEhFaaAhpgymLE2c(Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$CombineLiveData;Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$Combine;Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$CombineLiveData;->$r8$lambda$lBsgS_4bCo3I_UJVudp_NyYbJ7w(Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$CombineLiveData;Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$Combine;Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$CombineLiveData;->$r8$lambda$OicKrnolYD4HL2SlmVDLZ9LEI0A(Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$CombineLiveData;Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$Combine;Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$CombineLiveData;->$r8$lambda$X-0QEoUjfoIFs2uxrhB6T12UP38(Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$CombineLiveData;Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$Combine;Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$CombineLiveData;-><init>(Landroidx/lifecycle/LiveData;Landroidx/lifecycle/LiveData;Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$Combine;)V
 HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$CombineLiveData;->lambda$new$1(Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$Combine;Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$CombineLiveData;->lambda$new$2(Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$Combine;Ljava/lang/Object;)V
-HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil;->$r8$lambda$gePfArobL0QzeZcPyJsR5u_NUCI(Landroidx/lifecycle/MediatorLiveData;Landroidx/lifecycle/LiveData;Ljava/lang/Object;)V
+HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil;->$r8$lambda$KpDYGIILLsD0m40mpQkHvXfuQ3M(Landroidx/lifecycle/MediatorLiveData;Landroidx/lifecycle/LiveData;Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil;->combineLatest(Landroidx/lifecycle/LiveData;Landroidx/lifecycle/LiveData;Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$Combine;)Landroidx/lifecycle/LiveData;
 HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil;->delay(JLjava/lang/Object;)Landroidx/lifecycle/LiveData;
 HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil;->distinctUntilChanged(Landroidx/lifecycle/LiveData;Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$EqualityChecker;)Landroidx/lifecycle/LiveData;
@@ -28358,9 +28079,9 @@ HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil;->filter(Landroidx/lif
 HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil;->just(Ljava/lang/Object;)Landroidx/lifecycle/LiveData;
 HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil;->lambda$until$4(Landroidx/lifecycle/MediatorLiveData;Landroidx/lifecycle/LiveData;Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/util/livedata/LiveDataUtil;->until(Landroidx/lifecycle/LiveData;Landroidx/lifecycle/LiveData;)Landroidx/lifecycle/LiveData;
-HSPLorg/thoughtcrime/securesms/util/livedata/Store$LiveDataStore$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/util/livedata/Store$LiveDataStore;Lcom/annimon/stream/function/Function;)V
-HSPLorg/thoughtcrime/securesms/util/livedata/Store$LiveDataStore$$ExternalSyntheticLambda0;->run()V
-HSPLorg/thoughtcrime/securesms/util/livedata/Store$LiveDataStore;->$r8$lambda$8Y9FtONBmAHomTw3eq15aikNBkw(Lorg/thoughtcrime/securesms/util/livedata/Store$LiveDataStore;Lcom/annimon/stream/function/Function;)V
+HSPLorg/thoughtcrime/securesms/util/livedata/Store$LiveDataStore$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/util/livedata/Store$LiveDataStore;Lcom/annimon/stream/function/Function;)V
+HSPLorg/thoughtcrime/securesms/util/livedata/Store$LiveDataStore$$ExternalSyntheticLambda2;->run()V
+HSPLorg/thoughtcrime/securesms/util/livedata/Store$LiveDataStore;->$r8$lambda$9r6IH7ZTNiRMDQUowAedyZuhuI8(Lorg/thoughtcrime/securesms/util/livedata/Store$LiveDataStore;Lcom/annimon/stream/function/Function;)V
 HSPLorg/thoughtcrime/securesms/util/livedata/Store$LiveDataStore;-><init>(Lorg/thoughtcrime/securesms/util/livedata/Store;Ljava/lang/Object;)V
 HSPLorg/thoughtcrime/securesms/util/livedata/Store$LiveDataStore;->getState()Ljava/lang/Object;
 HSPLorg/thoughtcrime/securesms/util/livedata/Store$LiveDataStore;->lambda$update$2(Lcom/annimon/stream/function/Function;)V
@@ -28392,15 +28113,14 @@ HSPLorg/thoughtcrime/securesms/util/rx/RxStore;->getStateFlowable()Lio/reactivex
 HSPLorg/thoughtcrime/securesms/util/rx/RxStore;->mapDistinctForUi(Lkotlin/jvm/functions/Function1;)Lio/reactivex/rxjava3/core/Flowable;
 HSPLorg/thoughtcrime/securesms/util/rx/RxStore;->update(Lio/reactivex/rxjava3/core/Flowable;Lkotlin/jvm/functions/Function2;)Lio/reactivex/rxjava3/disposables/Disposable;
 HSPLorg/thoughtcrime/securesms/util/rx/RxStore;->update(Lkotlin/jvm/functions/Function1;)V
-HSPLorg/thoughtcrime/securesms/util/storage/FileStorage$$ExternalSyntheticLambda0;-><init>(Ljava/lang/String;)V
+HSPLorg/thoughtcrime/securesms/util/storage/FileStorage$$ExternalSyntheticLambda1;-><init>(Ljava/lang/String;)V
 HSPLorg/thoughtcrime/securesms/util/storage/FileStorage;->getAllFiles(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;
 HSPLorg/thoughtcrime/securesms/util/views/DarkOverflowToolbar;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/util/views/DarkOverflowToolbar;->init()V
 HSPLorg/thoughtcrime/securesms/util/views/NullableStub;-><init>(Landroid/view/ViewStub;)V
-HSPLorg/thoughtcrime/securesms/util/views/NullableStub;->get()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/util/views/NullableStub;->isResolvable()Z
-HSPLorg/thoughtcrime/securesms/util/views/NullableStub;->require()Ljava/lang/Object;
-HSPLorg/thoughtcrime/securesms/util/views/NullableStub;->resolved()Z
+HSPLorg/thoughtcrime/securesms/util/views/SlideUpWithDependencyBehavior;-><clinit>()V
+HSPLorg/thoughtcrime/securesms/util/views/SlideUpWithDependencyBehavior;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;F)V
+HSPLorg/thoughtcrime/securesms/util/views/SlideUpWithSnackbarBehavior;-><clinit>()V
 HSPLorg/thoughtcrime/securesms/util/views/SlideUpWithSnackbarBehavior;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 HSPLorg/thoughtcrime/securesms/util/views/Stub;-><init>(Landroid/view/ViewStub;)V
 HSPLorg/thoughtcrime/securesms/util/views/Stub;->get()Landroid/view/View;
@@ -28464,6 +28184,7 @@ HSPLorg/whispersystems/signalservice/api/SignalServiceAccountManager;->setAccoun
 HSPLorg/whispersystems/signalservice/api/SignalServiceMessageReceiver$$ExternalSyntheticLambda0;-><init>()V
 HSPLorg/whispersystems/signalservice/api/SignalServiceMessageReceiver;-><init>(Lorg/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration;Lorg/whispersystems/signalservice/api/util/CredentialsProvider;Ljava/lang/String;Lorg/signal/libsignal/zkgroup/profiles/ClientZkProfileOperations;Z)V
 HSPLorg/whispersystems/signalservice/api/SignalServiceMessageReceiver;->retrieveProfile(Lorg/whispersystems/signalservice/api/push/SignalServiceAddress;Lj$/util/Optional;Lj$/util/Optional;Lorg/whispersystems/signalservice/api/profiles/SignalServiceProfile$RequestType;Ljava/util/Locale;)Lorg/signal/core/util/concurrent/ListenableFuture;
+HSPLorg/whispersystems/signalservice/api/SignalServiceMessageReceiver;->retrieveStickerManifest([B[B)Lorg/whispersystems/signalservice/api/messages/SignalServiceStickerManifest;
 HSPLorg/whispersystems/signalservice/api/SignalWebSocket$$ExternalSyntheticLambda0;-><init>(Lio/reactivex/rxjava3/subjects/BehaviorSubject;)V
 HSPLorg/whispersystems/signalservice/api/SignalWebSocket$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;)V
 HSPLorg/whispersystems/signalservice/api/SignalWebSocket;-><clinit>()V
@@ -28600,7 +28321,6 @@ HSPLorg/whispersystems/signalservice/api/push/ServiceId$PNI;->equals(Ljava/lang/
 HSPLorg/whispersystems/signalservice/api/push/ServiceId$PNI;->parseOrThrow(Ljava/lang/String;)Lorg/whispersystems/signalservice/api/push/ServiceId$PNI;
 HSPLorg/whispersystems/signalservice/api/push/ServiceId$PNI;->toString()Ljava/lang/String;
 HSPLorg/whispersystems/signalservice/api/push/ServiceId;-><clinit>()V
-HSPLorg/whispersystems/signalservice/api/push/ServiceId;-><init>(Lorg/signal/libsignal/protocol/ServiceId;)V
 HSPLorg/whispersystems/signalservice/api/push/ServiceId;-><init>(Lorg/signal/libsignal/protocol/ServiceId;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 HSPLorg/whispersystems/signalservice/api/push/ServiceId;->fromLibSignal(Lorg/signal/libsignal/protocol/ServiceId;)Lorg/whispersystems/signalservice/api/push/ServiceId;
 HSPLorg/whispersystems/signalservice/api/push/ServiceId;->isUnknown()Z
@@ -28618,17 +28338,17 @@ HSPLorg/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResponseCo
 HSPLorg/whispersystems/signalservice/api/services/DonationsService;-><clinit>()V
 HSPLorg/whispersystems/signalservice/api/services/DonationsService;-><init>(Lorg/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration;Lorg/whispersystems/signalservice/api/util/CredentialsProvider;Ljava/lang/String;Lorg/whispersystems/signalservice/api/groupsv2/GroupsV2Operations;Z)V
 HSPLorg/whispersystems/signalservice/api/services/DonationsService;-><init>(Lorg/whispersystems/signalservice/internal/push/PushServiceSocket;)V
-HSPLorg/whispersystems/signalservice/api/services/MessagingService$$ExternalSyntheticLambda4;-><init>(Lorg/whispersystems/signalservice/internal/websocket/ResponseMapper;)V
+HSPLorg/whispersystems/signalservice/api/services/MessagingService$$ExternalSyntheticLambda2;-><init>(Lorg/whispersystems/signalservice/internal/websocket/ResponseMapper;)V
+HSPLorg/whispersystems/signalservice/api/services/ProfileService$$ExternalSyntheticLambda0;-><init>(Lorg/whispersystems/signalservice/api/services/ProfileService;Lorg/whispersystems/signalservice/api/push/SignalServiceAddress;Lj$/util/Optional;Lj$/util/Optional;Lorg/whispersystems/signalservice/api/profiles/SignalServiceProfile$RequestType;Ljava/util/Locale;)V
+HSPLorg/whispersystems/signalservice/api/services/ProfileService$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/whispersystems/signalservice/api/services/ProfileService$$ExternalSyntheticLambda1;-><init>(Lorg/whispersystems/signalservice/api/services/ProfileService;Lorg/whispersystems/signalservice/api/push/SignalServiceAddress;Lj$/util/Optional;Lorg/whispersystems/signalservice/api/profiles/SignalServiceProfile$RequestType;Ljava/util/Locale;)V
 HSPLorg/whispersystems/signalservice/api/services/ProfileService$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/whispersystems/signalservice/api/services/ProfileService$$ExternalSyntheticLambda2;-><init>()V
-HSPLorg/whispersystems/signalservice/api/services/ProfileService$$ExternalSyntheticLambda3;-><init>(Lorg/whispersystems/signalservice/api/services/ProfileService;Lorg/whispersystems/signalservice/api/push/SignalServiceAddress;Lj$/util/Optional;Lj$/util/Optional;Lorg/whispersystems/signalservice/api/profiles/SignalServiceProfile$RequestType;Ljava/util/Locale;)V
-HSPLorg/whispersystems/signalservice/api/services/ProfileService$$ExternalSyntheticLambda3;->apply(Ljava/lang/Object;)Ljava/lang/Object;
 HSPLorg/whispersystems/signalservice/api/services/ProfileService$ProfileResponseMapper;-><init>(Lorg/whispersystems/signalservice/api/services/ProfileService;Lorg/whispersystems/signalservice/api/profiles/SignalServiceProfile$RequestType;Lorg/signal/libsignal/zkgroup/profiles/ProfileKeyCredentialRequestContext;)V
 HSPLorg/whispersystems/signalservice/api/services/ProfileService$ProfileResponseProcessor;-><init>(Lorg/whispersystems/signalservice/internal/ServiceResponse;)V
 HSPLorg/whispersystems/signalservice/api/services/ProfileService$ProfileResponseProcessor;->getError()Ljava/lang/Throwable;
-HSPLorg/whispersystems/signalservice/api/services/ProfileService;->$r8$lambda$qreHJhpvwxlLuI7XzIfP9eBBI24(Lorg/whispersystems/signalservice/api/services/ProfileService;Lorg/whispersystems/signalservice/api/push/SignalServiceAddress;Lj$/util/Optional;Lj$/util/Optional;Lorg/whispersystems/signalservice/api/profiles/SignalServiceProfile$RequestType;Ljava/util/Locale;Ljava/lang/Throwable;)Lio/reactivex/rxjava3/core/SingleSource;
-HSPLorg/whispersystems/signalservice/api/services/ProfileService;->$r8$lambda$vXxdyhUGBLq7AFV9vG9NvMDxbNI(Lorg/whispersystems/signalservice/api/services/ProfileService;Lorg/whispersystems/signalservice/api/push/SignalServiceAddress;Lj$/util/Optional;Lorg/whispersystems/signalservice/api/profiles/SignalServiceProfile$RequestType;Ljava/util/Locale;Ljava/lang/Throwable;)Lio/reactivex/rxjava3/core/SingleSource;
+HSPLorg/whispersystems/signalservice/api/services/ProfileService;->$r8$lambda$1haGgLXHxWRAbym8L0KjfTHPjTY(Lorg/whispersystems/signalservice/api/services/ProfileService;Lorg/whispersystems/signalservice/api/push/SignalServiceAddress;Lj$/util/Optional;Lorg/whispersystems/signalservice/api/profiles/SignalServiceProfile$RequestType;Ljava/util/Locale;Ljava/lang/Throwable;)Lio/reactivex/rxjava3/core/SingleSource;
+HSPLorg/whispersystems/signalservice/api/services/ProfileService;->$r8$lambda$62QTfOBNsffJXX6zyLbBRWXA8Sc(Lorg/whispersystems/signalservice/api/services/ProfileService;Lorg/whispersystems/signalservice/api/push/SignalServiceAddress;Lj$/util/Optional;Lj$/util/Optional;Lorg/whispersystems/signalservice/api/profiles/SignalServiceProfile$RequestType;Ljava/util/Locale;Ljava/lang/Throwable;)Lio/reactivex/rxjava3/core/SingleSource;
 HSPLorg/whispersystems/signalservice/api/services/ProfileService;-><clinit>()V
 HSPLorg/whispersystems/signalservice/api/services/ProfileService;-><init>(Lorg/signal/libsignal/zkgroup/profiles/ClientZkProfileOperations;Lorg/whispersystems/signalservice/api/SignalServiceMessageReceiver;Lorg/whispersystems/signalservice/api/SignalWebSocket;)V
 HSPLorg/whispersystems/signalservice/api/services/ProfileService;->getProfile(Lorg/whispersystems/signalservice/api/push/SignalServiceAddress;Lj$/util/Optional;Lj$/util/Optional;Lorg/whispersystems/signalservice/api/profiles/SignalServiceProfile$RequestType;Ljava/util/Locale;)Lio/reactivex/rxjava3/core/Single;
@@ -28703,10 +28423,10 @@ HSPLorg/whispersystems/signalservice/internal/configuration/SignalUrl;->getConne
 HSPLorg/whispersystems/signalservice/internal/configuration/SignalUrl;->getHostHeader()Lj$/util/Optional;
 HSPLorg/whispersystems/signalservice/internal/configuration/SignalUrl;->getTrustStore()Lorg/whispersystems/signalservice/api/push/TrustStore;
 HSPLorg/whispersystems/signalservice/internal/configuration/SignalUrl;->getUrl()Ljava/lang/String;
+HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket$$ExternalSyntheticLambda10;-><init>()V
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket$$ExternalSyntheticLambda11;-><init>()V
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket$$ExternalSyntheticLambda12;-><init>()V
-HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket$$ExternalSyntheticLambda13;-><init>()V
-HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket$$ExternalSyntheticLambda15;-><init>()V
+HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket$$ExternalSyntheticLambda6;-><init>()V
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket$1;-><init>(Lorg/whispersystems/signalservice/internal/push/PushServiceSocket;Lorg/signal/core/util/concurrent/SettableFuture;)V
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket$1;->onResponse(Lokhttp3/Call;Lokhttp3/Response;)V
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket$2;-><init>()V
@@ -28731,6 +28451,7 @@ HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket;->createCdn
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket;->createConnectionClient(Lorg/whispersystems/signalservice/internal/configuration/SignalUrl;Ljava/util/List;Lj$/util/Optional;Lj$/util/Optional;)Lokhttp3/OkHttpClient;
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket;->createConnectionHolders([Lorg/whispersystems/signalservice/internal/configuration/SignalUrl;Ljava/util/List;Lj$/util/Optional;Lj$/util/Optional;)[Lorg/whispersystems/signalservice/internal/push/PushServiceSocket$ConnectionHolder;
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket;->createServiceConnectionHolders([Lorg/whispersystems/signalservice/internal/configuration/SignalUrl;Ljava/util/List;Lj$/util/Optional;Lj$/util/Optional;)[Lorg/whispersystems/signalservice/internal/push/PushServiceSocket$ServiceConnectionHolder;
+HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket;->downloadFromCdn(Ljava/io/OutputStream;JILjava/util/Map;Ljava/lang/String;JLorg/whispersystems/signalservice/api/messages/SignalServiceAttachment$ProgressListener;)V
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket;->getAuthorizationHeader(Lorg/whispersystems/signalservice/api/util/CredentialsProvider;)Ljava/lang/String;
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket;->getAvailablePreKeys(Lorg/whispersystems/signalservice/api/push/ServiceIdType;)Lorg/whispersystems/signalservice/internal/push/OneTimePreKeyCounts;
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket;->getDevices()Ljava/util/List;
@@ -28741,6 +28462,7 @@ HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket;->jsonReque
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket;->makeServiceRequest(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket;->makeServiceRequest(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Lorg/whispersystems/signalservice/internal/push/PushServiceSocket$ResponseCodeHandler;Lj$/util/Optional;)Ljava/lang/String;
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket;->makeServiceRequest(Ljava/lang/String;Ljava/lang/String;Lokhttp3/RequestBody;Ljava/util/Map;Lorg/whispersystems/signalservice/internal/push/PushServiceSocket$ResponseCodeHandler;Lj$/util/Optional;Z)Lokhttp3/Response;
+HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket;->retrieveStickerManifest([B)[B
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket;->retrieveVersionedProfile(Lorg/whispersystems/signalservice/api/push/ServiceId$ACI;Lorg/signal/libsignal/zkgroup/profiles/ProfileKey;Lj$/util/Optional;Ljava/util/Locale;)Lorg/signal/core/util/concurrent/ListenableFuture;
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket;->setAccountAttributes(Lorg/whispersystems/signalservice/api/account/AccountAttributes;)V
 HSPLorg/whispersystems/signalservice/internal/push/PushServiceSocket;->submitServiceRequest(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Lj$/util/Optional;)Lorg/signal/core/util/concurrent/ListenableFuture;
@@ -28760,6 +28482,9 @@ HSPLorg/whispersystems/signalservice/internal/util/BlacklistingTrustManager;->ch
 HSPLorg/whispersystems/signalservice/internal/util/BlacklistingTrustManager;->createFor(Lorg/whispersystems/signalservice/api/push/TrustStore;)[Ljavax/net/ssl/TrustManager;
 HSPLorg/whispersystems/signalservice/internal/util/BlacklistingTrustManager;->createFor([Ljavax/net/ssl/TrustManager;)[Ljavax/net/ssl/TrustManager;
 HSPLorg/whispersystems/signalservice/internal/util/BlacklistingTrustManager;->getAcceptedIssuers()[Ljava/security/cert/X509Certificate;
+HSPLorg/whispersystems/signalservice/internal/util/Hex;-><clinit>()V
+HSPLorg/whispersystems/signalservice/internal/util/Hex;->appendHexChar(Ljava/lang/StringBuffer;I)V
+HSPLorg/whispersystems/signalservice/internal/util/Hex;->toStringCondensed([B)Ljava/lang/String;
 HSPLorg/whispersystems/signalservice/internal/util/JsonUtil;-><clinit>()V
 HSPLorg/whispersystems/signalservice/internal/util/JsonUtil;->fromJson(Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Object;
 HSPLorg/whispersystems/signalservice/internal/util/JsonUtil;->toJson(Ljava/lang/Object;)Ljava/lang/String;
@@ -28804,28 +28529,28 @@ HSPLorg/whispersystems/signalservice/internal/websocket/WebSocketRequestMessage$
 HSPLorg/whispersystems/signalservice/internal/websocket/WebSocketRequestMessage;-><clinit>()V
 HSPLorg/whispersystems/signalservice/internal/websocket/WebSocketRequestMessage;-><init>(Ljava/lang/String;Ljava/lang/String;Lokio/ByteString;Ljava/util/List;Ljava/lang/Long;Lokio/ByteString;)V
 HSPLorg/whispersystems/util/StringUtil;->utf8(Ljava/lang/String;)[B
-HSPLrxdogtag2/DogTagMaybeObserver$$ExternalSyntheticLambda0;-><init>(Lrxdogtag2/DogTagMaybeObserver;)V
-HSPLrxdogtag2/DogTagMaybeObserver$$ExternalSyntheticLambda1;-><init>(Lrxdogtag2/DogTagMaybeObserver;Lio/reactivex/rxjava3/disposables/Disposable;)V
-HSPLrxdogtag2/DogTagMaybeObserver$$ExternalSyntheticLambda1;->run()V
-HSPLrxdogtag2/DogTagMaybeObserver$$ExternalSyntheticLambda4;-><init>(Lrxdogtag2/DogTagMaybeObserver;)V
-HSPLrxdogtag2/DogTagMaybeObserver$$ExternalSyntheticLambda5;-><init>(Lio/reactivex/rxjava3/core/MaybeObserver;)V
-HSPLrxdogtag2/DogTagMaybeObserver$$ExternalSyntheticLambda5;->run()V
-HSPLrxdogtag2/DogTagMaybeObserver;->$r8$lambda$oZbZwTXdH3PbkXhPwGJJZ5hucwc(Lrxdogtag2/DogTagMaybeObserver;Lio/reactivex/rxjava3/disposables/Disposable;)V
+HSPLrxdogtag2/DogTagMaybeObserver$$ExternalSyntheticLambda2;-><init>(Lrxdogtag2/DogTagMaybeObserver;)V
+HSPLrxdogtag2/DogTagMaybeObserver$$ExternalSyntheticLambda3;-><init>(Lio/reactivex/rxjava3/core/MaybeObserver;)V
+HSPLrxdogtag2/DogTagMaybeObserver$$ExternalSyntheticLambda3;->run()V
+HSPLrxdogtag2/DogTagMaybeObserver$$ExternalSyntheticLambda6;-><init>(Lrxdogtag2/DogTagMaybeObserver;)V
+HSPLrxdogtag2/DogTagMaybeObserver$$ExternalSyntheticLambda7;-><init>(Lrxdogtag2/DogTagMaybeObserver;Lio/reactivex/rxjava3/disposables/Disposable;)V
+HSPLrxdogtag2/DogTagMaybeObserver$$ExternalSyntheticLambda7;->run()V
+HSPLrxdogtag2/DogTagMaybeObserver;->$r8$lambda$Bczq4ZPbnBWT0v8FSWxbU1wpxrM(Lrxdogtag2/DogTagMaybeObserver;Lio/reactivex/rxjava3/disposables/Disposable;)V
 HSPLrxdogtag2/DogTagMaybeObserver;-><init>(Lrxdogtag2/RxDogTag$Configuration;Lio/reactivex/rxjava3/core/MaybeObserver;)V
 HSPLrxdogtag2/DogTagMaybeObserver;->lambda$onSubscribe$1(Lio/reactivex/rxjava3/disposables/Disposable;)V
 HSPLrxdogtag2/DogTagMaybeObserver;->onComplete()V
 HSPLrxdogtag2/DogTagMaybeObserver;->onSubscribe(Lio/reactivex/rxjava3/disposables/Disposable;)V
-HSPLrxdogtag2/DogTagObserver$$ExternalSyntheticLambda2;-><init>(Lrxdogtag2/DogTagObserver;)V
-HSPLrxdogtag2/DogTagObserver$$ExternalSyntheticLambda3;-><init>(Lio/reactivex/rxjava3/core/Observer;)V
-HSPLrxdogtag2/DogTagObserver$$ExternalSyntheticLambda3;->run()V
+HSPLrxdogtag2/DogTagObserver$$ExternalSyntheticLambda0;-><init>(Lrxdogtag2/DogTagObserver;)V
+HSPLrxdogtag2/DogTagObserver$$ExternalSyntheticLambda1;-><init>(Lrxdogtag2/DogTagObserver;Lio/reactivex/rxjava3/disposables/Disposable;)V
+HSPLrxdogtag2/DogTagObserver$$ExternalSyntheticLambda1;->run()V
 HSPLrxdogtag2/DogTagObserver$$ExternalSyntheticLambda4;-><init>(Lrxdogtag2/DogTagObserver;)V
-HSPLrxdogtag2/DogTagObserver$$ExternalSyntheticLambda5;-><init>(Lrxdogtag2/DogTagObserver;Lio/reactivex/rxjava3/disposables/Disposable;)V
+HSPLrxdogtag2/DogTagObserver$$ExternalSyntheticLambda5;-><init>(Lrxdogtag2/DogTagObserver;Ljava/lang/Object;)V
 HSPLrxdogtag2/DogTagObserver$$ExternalSyntheticLambda5;->run()V
 HSPLrxdogtag2/DogTagObserver$$ExternalSyntheticLambda6;-><init>(Lrxdogtag2/DogTagObserver;)V
-HSPLrxdogtag2/DogTagObserver$$ExternalSyntheticLambda7;-><init>(Lrxdogtag2/DogTagObserver;Ljava/lang/Object;)V
+HSPLrxdogtag2/DogTagObserver$$ExternalSyntheticLambda7;-><init>(Lio/reactivex/rxjava3/core/Observer;)V
 HSPLrxdogtag2/DogTagObserver$$ExternalSyntheticLambda7;->run()V
-HSPLrxdogtag2/DogTagObserver;->$r8$lambda$H_QNeov4x3pXt2znCyqAzFaM5fE(Lrxdogtag2/DogTagObserver;Ljava/lang/Object;)V
-HSPLrxdogtag2/DogTagObserver;->$r8$lambda$tfuuFW4uJ1e1bE4RxcLKQ9tobZo(Lrxdogtag2/DogTagObserver;Lio/reactivex/rxjava3/disposables/Disposable;)V
+HSPLrxdogtag2/DogTagObserver;->$r8$lambda$I7M1KYJdQHWEQ5r5RZcXLEuX3cM(Lrxdogtag2/DogTagObserver;Ljava/lang/Object;)V
+HSPLrxdogtag2/DogTagObserver;->$r8$lambda$etVb47OpYbzDBwagSfdmNRhEwY0(Lrxdogtag2/DogTagObserver;Lio/reactivex/rxjava3/disposables/Disposable;)V
 HSPLrxdogtag2/DogTagObserver;-><init>(Lrxdogtag2/RxDogTag$Configuration;Lio/reactivex/rxjava3/core/Observer;)V
 HSPLrxdogtag2/DogTagObserver;->lambda$onNext$3(Ljava/lang/Object;)V
 HSPLrxdogtag2/DogTagObserver;->lambda$onSubscribe$1(Lio/reactivex/rxjava3/disposables/Disposable;)V
@@ -28838,8 +28563,8 @@ HSPLrxdogtag2/DogTagSingleObserver$$ExternalSyntheticLambda1;->run()V
 HSPLrxdogtag2/DogTagSingleObserver$$ExternalSyntheticLambda4;-><init>(Lrxdogtag2/DogTagSingleObserver;)V
 HSPLrxdogtag2/DogTagSingleObserver$$ExternalSyntheticLambda5;-><init>(Lrxdogtag2/DogTagSingleObserver;Lio/reactivex/rxjava3/disposables/Disposable;)V
 HSPLrxdogtag2/DogTagSingleObserver$$ExternalSyntheticLambda5;->run()V
-HSPLrxdogtag2/DogTagSingleObserver;->$r8$lambda$XHPr6lQHRHXcw_CKIYStMAqfnNo(Lrxdogtag2/DogTagSingleObserver;Ljava/lang/Object;)V
-HSPLrxdogtag2/DogTagSingleObserver;->$r8$lambda$bu5rZib8qIaCqFy3X5GHmz5VHo0(Lrxdogtag2/DogTagSingleObserver;Lio/reactivex/rxjava3/disposables/Disposable;)V
+HSPLrxdogtag2/DogTagSingleObserver;->$r8$lambda$6Tu3X6ZG96cTv3GAhkWmcnDlQR0(Lrxdogtag2/DogTagSingleObserver;Ljava/lang/Object;)V
+HSPLrxdogtag2/DogTagSingleObserver;->$r8$lambda$eEZRrAPLR73Bb2JUYNQQBZx0N-U(Lrxdogtag2/DogTagSingleObserver;Lio/reactivex/rxjava3/disposables/Disposable;)V
 HSPLrxdogtag2/DogTagSingleObserver;-><init>(Lrxdogtag2/RxDogTag$Configuration;Lio/reactivex/rxjava3/core/SingleObserver;)V
 HSPLrxdogtag2/DogTagSingleObserver;->lambda$onSubscribe$1(Lio/reactivex/rxjava3/disposables/Disposable;)V
 HSPLrxdogtag2/DogTagSingleObserver;->lambda$onSuccess$3(Ljava/lang/Object;)V
@@ -28851,8 +28576,8 @@ HSPLrxdogtag2/DogTagSubscriber$$ExternalSyntheticLambda3;->run()V
 HSPLrxdogtag2/DogTagSubscriber$$ExternalSyntheticLambda4;-><init>(Lrxdogtag2/DogTagSubscriber;)V
 HSPLrxdogtag2/DogTagSubscriber$$ExternalSyntheticLambda5;-><init>(Lrxdogtag2/DogTagSubscriber;Lorg/reactivestreams/Subscription;)V
 HSPLrxdogtag2/DogTagSubscriber$$ExternalSyntheticLambda5;->run()V
-HSPLrxdogtag2/DogTagSubscriber;->$r8$lambda$2zfLu5RX2IvP1ii4ybHL0tD6hpo(Lrxdogtag2/DogTagSubscriber;Lorg/reactivestreams/Subscription;)V
-HSPLrxdogtag2/DogTagSubscriber;->$r8$lambda$FAKufiO9uOSxkNLq0iovS2ks3ic(Lrxdogtag2/DogTagSubscriber;Ljava/lang/Object;)V
+HSPLrxdogtag2/DogTagSubscriber;->$r8$lambda$4_SKUPl92ssGKz56caNfTaQQu8A(Lrxdogtag2/DogTagSubscriber;Lorg/reactivestreams/Subscription;)V
+HSPLrxdogtag2/DogTagSubscriber;->$r8$lambda$ynRG-uvlpD87OeJlKYt_7cyYrbU(Lrxdogtag2/DogTagSubscriber;Ljava/lang/Object;)V
 HSPLrxdogtag2/DogTagSubscriber;-><init>(Lrxdogtag2/RxDogTag$Configuration;Lorg/reactivestreams/Subscriber;)V
 HSPLrxdogtag2/DogTagSubscriber;->lambda$onNext$3(Ljava/lang/Object;)V
 HSPLrxdogtag2/DogTagSubscriber;->lambda$onSubscribe$1(Lorg/reactivestreams/Subscription;)V
@@ -28862,16 +28587,16 @@ HSPLrxdogtag2/ObserverHandler$-CC;->$default$handle(Lrxdogtag2/ObserverHandler;L
 HSPLrxdogtag2/ObserverHandler$-CC;->$default$handle(Lrxdogtag2/ObserverHandler;Lio/reactivex/rxjava3/core/Maybe;Lio/reactivex/rxjava3/core/MaybeObserver;)Lio/reactivex/rxjava3/core/MaybeObserver;
 HSPLrxdogtag2/ObserverHandler$-CC;->$default$handle(Lrxdogtag2/ObserverHandler;Lio/reactivex/rxjava3/core/Observable;Lio/reactivex/rxjava3/core/Observer;)Lio/reactivex/rxjava3/core/Observer;
 HSPLrxdogtag2/ObserverHandler$-CC;->$default$handle(Lrxdogtag2/ObserverHandler;Lio/reactivex/rxjava3/core/Single;Lio/reactivex/rxjava3/core/SingleObserver;)Lio/reactivex/rxjava3/core/SingleObserver;
-HSPLrxdogtag2/RxDogTag$$ExternalSyntheticLambda0;-><init>(Lrxdogtag2/RxDogTag$Configuration;)V
-HSPLrxdogtag2/RxDogTag$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-HSPLrxdogtag2/RxDogTag$$ExternalSyntheticLambda1;-><init>(Lrxdogtag2/RxDogTag$Configuration;)V
-HSPLrxdogtag2/RxDogTag$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+HSPLrxdogtag2/RxDogTag$$ExternalSyntheticLambda0;-><init>(Ljava/lang/Thread$UncaughtExceptionHandler;Lrxdogtag2/RxDogTag$NonCheckingConsumer;)V
 HSPLrxdogtag2/RxDogTag$$ExternalSyntheticLambda2;-><init>(Lrxdogtag2/RxDogTag$Configuration;)V
 HSPLrxdogtag2/RxDogTag$$ExternalSyntheticLambda2;->apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 HSPLrxdogtag2/RxDogTag$$ExternalSyntheticLambda3;-><init>(Lrxdogtag2/RxDogTag$Configuration;)V
 HSPLrxdogtag2/RxDogTag$$ExternalSyntheticLambda3;->apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 HSPLrxdogtag2/RxDogTag$$ExternalSyntheticLambda4;-><init>(Lrxdogtag2/RxDogTag$Configuration;)V
-HSPLrxdogtag2/RxDogTag$$ExternalSyntheticLambda5;-><init>(Ljava/lang/Thread$UncaughtExceptionHandler;Lrxdogtag2/RxDogTag$NonCheckingConsumer;)V
+HSPLrxdogtag2/RxDogTag$$ExternalSyntheticLambda4;->apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+HSPLrxdogtag2/RxDogTag$$ExternalSyntheticLambda5;-><init>(Lrxdogtag2/RxDogTag$Configuration;)V
+HSPLrxdogtag2/RxDogTag$$ExternalSyntheticLambda5;->apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+HSPLrxdogtag2/RxDogTag$$ExternalSyntheticLambda6;-><init>(Lrxdogtag2/RxDogTag$Configuration;)V
 HSPLrxdogtag2/RxDogTag$Builder;-><init>()V
 HSPLrxdogtag2/RxDogTag$Builder;->install()V
 HSPLrxdogtag2/RxDogTag$Configuration$1;-><init>()V
@@ -28881,10 +28606,10 @@ HSPLrxdogtag2/RxDogTag$Configuration$1;->handle(Lio/reactivex/rxjava3/core/Obser
 HSPLrxdogtag2/RxDogTag$Configuration$1;->handle(Lio/reactivex/rxjava3/core/Single;Lio/reactivex/rxjava3/core/SingleObserver;)Lio/reactivex/rxjava3/core/SingleObserver;
 HSPLrxdogtag2/RxDogTag$Configuration;-><clinit>()V
 HSPLrxdogtag2/RxDogTag$Configuration;-><init>(Lrxdogtag2/RxDogTag$Builder;)V
-HSPLrxdogtag2/RxDogTag;->$r8$lambda$G5J9svI7_WWihw7QCY8ugVE_Jmo(Lrxdogtag2/RxDogTag$Configuration;Lio/reactivex/rxjava3/core/Maybe;Lio/reactivex/rxjava3/core/MaybeObserver;)Lio/reactivex/rxjava3/core/MaybeObserver;
-HSPLrxdogtag2/RxDogTag;->$r8$lambda$Lb2Lkgs3_Lyd4he53yEk5j3ezFM(Lrxdogtag2/RxDogTag$Configuration;Lio/reactivex/rxjava3/core/Flowable;Lorg/reactivestreams/Subscriber;)Lorg/reactivestreams/Subscriber;
-HSPLrxdogtag2/RxDogTag;->$r8$lambda$YP26HIb1nhHqbV4QlRgnyBuwHqU(Lrxdogtag2/RxDogTag$Configuration;Lio/reactivex/rxjava3/core/Observable;Lio/reactivex/rxjava3/core/Observer;)Lio/reactivex/rxjava3/core/Observer;
-HSPLrxdogtag2/RxDogTag;->$r8$lambda$gpUPCywIa6QwbpyvYi5dNfOg-gs(Lrxdogtag2/RxDogTag$Configuration;Lio/reactivex/rxjava3/core/Single;Lio/reactivex/rxjava3/core/SingleObserver;)Lio/reactivex/rxjava3/core/SingleObserver;
+HSPLrxdogtag2/RxDogTag;->$r8$lambda$0xERubhI09a2LsNKuf05IBXkPik(Lrxdogtag2/RxDogTag$Configuration;Lio/reactivex/rxjava3/core/Observable;Lio/reactivex/rxjava3/core/Observer;)Lio/reactivex/rxjava3/core/Observer;
+HSPLrxdogtag2/RxDogTag;->$r8$lambda$Pz9roryJcUJbmwCyeILYlbaN7NU(Lrxdogtag2/RxDogTag$Configuration;Lio/reactivex/rxjava3/core/Maybe;Lio/reactivex/rxjava3/core/MaybeObserver;)Lio/reactivex/rxjava3/core/MaybeObserver;
+HSPLrxdogtag2/RxDogTag;->$r8$lambda$fOHHcqH6uirR7mnRakt4tdF4Xmo(Lrxdogtag2/RxDogTag$Configuration;Lio/reactivex/rxjava3/core/Single;Lio/reactivex/rxjava3/core/SingleObserver;)Lio/reactivex/rxjava3/core/SingleObserver;
+HSPLrxdogtag2/RxDogTag;->$r8$lambda$qTY26KO1_73ffkIzwCfOf7MkUVc(Lrxdogtag2/RxDogTag$Configuration;Lio/reactivex/rxjava3/core/Flowable;Lorg/reactivestreams/Subscriber;)Lorg/reactivestreams/Subscriber;
 HSPLrxdogtag2/RxDogTag;->access$000(Lrxdogtag2/RxDogTag$Configuration;)V
 HSPLrxdogtag2/RxDogTag;->guardedDelegateCall(Lrxdogtag2/RxDogTag$NonCheckingConsumer;Ljava/lang/Runnable;)V
 HSPLrxdogtag2/RxDogTag;->install()V
@@ -28912,14 +28637,13 @@ Landroid/support/v4/media/session/MediaSessionCompat$MediaSessionImplApi22$$Exte
 Landroid/support/v4/media/session/MediaSessionCompat$MediaSessionImplApi22;
 Landroid/support/v4/media/session/MediaSessionCompat$MediaSessionImplApi28;
 Landroid/support/v4/media/session/MediaSessionCompat$MediaSessionImplApi29$$ExternalSyntheticApiModelOutline0;
-Landroid/support/v4/media/session/MediaSessionCompat$MediaSessionImplApi29$$ExternalSyntheticApiModelOutline1;
 Landroid/support/v4/media/session/MediaSessionCompat$MediaSessionImplApi29;
 Landroid/support/v4/media/session/MediaSessionCompat$Token$1;
 Landroid/support/v4/media/session/MediaSessionCompat$Token;
 Landroid/support/v4/media/session/MediaSessionCompat;
 Landroid/support/v4/media/session/PlaybackStateCompat$1;
 Landroid/support/v4/media/session/PlaybackStateCompat$Api21Impl;
-Landroid/support/v4/media/session/PlaybackStateCompat$Api22Impl$$ExternalSyntheticApiModelOutline1;
+Landroid/support/v4/media/session/PlaybackStateCompat$Api22Impl$$ExternalSyntheticApiModelOutline0;
 Landroid/support/v4/media/session/PlaybackStateCompat$Api22Impl;
 Landroid/support/v4/media/session/PlaybackStateCompat$Builder;
 Landroid/support/v4/media/session/PlaybackStateCompat;
@@ -28988,8 +28712,8 @@ Landroidx/appcompat/app/AppCompatDelegateImpl$3;
 Landroidx/appcompat/app/AppCompatDelegateImpl$5;
 Landroidx/appcompat/app/AppCompatDelegateImpl$ActionBarMenuCallback;
 Landroidx/appcompat/app/AppCompatDelegateImpl$Api17Impl;
-Landroidx/appcompat/app/AppCompatDelegateImpl$Api24Impl$$ExternalSyntheticApiModelOutline1;
-Landroidx/appcompat/app/AppCompatDelegateImpl$Api24Impl$$ExternalSyntheticApiModelOutline2;
+Landroidx/appcompat/app/AppCompatDelegateImpl$Api24Impl$$ExternalSyntheticApiModelOutline0;
+Landroidx/appcompat/app/AppCompatDelegateImpl$Api24Impl$$ExternalSyntheticApiModelOutline5;
 Landroidx/appcompat/app/AppCompatDelegateImpl$Api24Impl;
 Landroidx/appcompat/app/AppCompatDelegateImpl$AppCompatWindowCallback;
 Landroidx/appcompat/app/AppCompatDelegateImpl$PanelFeatureState;
@@ -29048,14 +28772,12 @@ Landroidx/appcompat/widget/AppCompatDrawableManager;
 Landroidx/appcompat/widget/AppCompatEditText;
 Landroidx/appcompat/widget/AppCompatEmojiEditTextHelper;
 Landroidx/appcompat/widget/AppCompatEmojiTextHelper;
-Landroidx/appcompat/widget/AppCompatHintHelper;
 Landroidx/appcompat/widget/AppCompatImageButton;
 Landroidx/appcompat/widget/AppCompatImageHelper;
 Landroidx/appcompat/widget/AppCompatImageView;
 Landroidx/appcompat/widget/AppCompatProgressBarHelper;
 Landroidx/appcompat/widget/AppCompatSeekBar;
 Landroidx/appcompat/widget/AppCompatSeekBarHelper;
-Landroidx/appcompat/widget/AppCompatTextClassifierHelper$Api26Impl$$ExternalSyntheticApiModelOutline0;
 Landroidx/appcompat/widget/AppCompatTextClassifierHelper;
 Landroidx/appcompat/widget/AppCompatTextHelper$1;
 Landroidx/appcompat/widget/AppCompatTextHelper$Api17Impl;
@@ -29092,7 +28814,7 @@ Landroidx/appcompat/widget/TintContextWrapper;
 Landroidx/appcompat/widget/TintInfo;
 Landroidx/appcompat/widget/TintResources;
 Landroidx/appcompat/widget/TintTypedArray;
-Landroidx/appcompat/widget/Toolbar$$ExternalSyntheticLambda0;
+Landroidx/appcompat/widget/Toolbar$$ExternalSyntheticLambda1;
 Landroidx/appcompat/widget/Toolbar$1;
 Landroidx/appcompat/widget/Toolbar$2;
 Landroidx/appcompat/widget/Toolbar$3;
@@ -29102,7 +28824,6 @@ Landroidx/appcompat/widget/Toolbar$OnMenuItemClickListener;
 Landroidx/appcompat/widget/Toolbar;
 Landroidx/appcompat/widget/ToolbarWidgetWrapper$1;
 Landroidx/appcompat/widget/ToolbarWidgetWrapper;
-Landroidx/appcompat/widget/TooltipCompat$Api26Impl$$ExternalSyntheticApiModelOutline0;
 Landroidx/appcompat/widget/TooltipCompat$Api26Impl;
 Landroidx/appcompat/widget/TooltipCompat;
 Landroidx/appcompat/widget/VectorEnabledTintResources;
@@ -29112,7 +28833,6 @@ Landroidx/arch/core/executor/ArchTaskExecutor$$ExternalSyntheticLambda0;
 Landroidx/arch/core/executor/ArchTaskExecutor$$ExternalSyntheticLambda1;
 Landroidx/arch/core/executor/ArchTaskExecutor;
 Landroidx/arch/core/executor/DefaultTaskExecutor$1;
-Landroidx/arch/core/executor/DefaultTaskExecutor$Api28Impl$$ExternalSyntheticApiModelOutline0;
 Landroidx/arch/core/executor/DefaultTaskExecutor$Api28Impl;
 Landroidx/arch/core/executor/DefaultTaskExecutor;
 Landroidx/arch/core/executor/TaskExecutor;
@@ -29133,8 +28853,16 @@ Landroidx/asynclayoutinflater/view/AsyncLayoutInflater$InflateRequest;
 Landroidx/asynclayoutinflater/view/AsyncLayoutInflater$InflateThread;
 Landroidx/asynclayoutinflater/view/AsyncLayoutInflater$OnInflateFinishedListener;
 Landroidx/asynclayoutinflater/view/AsyncLayoutInflater;
-Landroidx/camera/camera2/internal/compat/params/OutputConfigurationCompatApi24Impl$OutputConfigurationParamsApi24$$ExternalSyntheticBackport1;
+Landroidx/camera/camera2/internal/compat/params/OutputConfigurationCompatApi24Impl$OutputConfigurationParamsApi24$$ExternalSyntheticBackport0;
 Landroidx/camera/view/PreviewView$1$$ExternalSyntheticBackportWithForwarding0;
+Landroidx/cardview/R$style;
+Landroidx/cardview/R$styleable;
+Landroidx/cardview/widget/CardView$1;
+Landroidx/cardview/widget/CardView;
+Landroidx/cardview/widget/CardViewApi21Impl;
+Landroidx/cardview/widget/CardViewDelegate;
+Landroidx/cardview/widget/CardViewImpl;
+Landroidx/cardview/widget/RoundRectDrawable;
 Landroidx/collection/ArrayMap$EntrySet;
 Landroidx/collection/ArrayMap$MapIterator;
 Landroidx/collection/ArrayMap$ValueCollection;
@@ -29150,16 +28878,12 @@ Landroidx/collection/SimpleArrayMap;
 Landroidx/collection/SparseArrayCompat;
 Landroidx/collection/SparseArrayKt$valueIterator$1;
 Landroidx/collection/SparseArrayKt;
-Landroidx/compose/ui/autofill/AndroidAutofill$$ExternalSyntheticApiModelOutline1;
 Landroidx/compose/ui/graphics/AndroidImageBitmap_androidKt$$ExternalSyntheticApiModelOutline0;
 Landroidx/compose/ui/graphics/AndroidImageBitmap_androidKt$$ExternalSyntheticApiModelOutline1;
 Landroidx/compose/ui/platform/AndroidComposeView$$ExternalSyntheticApiModelOutline0;
-Landroidx/compose/ui/platform/coreshims/SoftwareKeyboardControllerCompat$Impl30$$ExternalSyntheticApiModelOutline1;
-Landroidx/compose/ui/text/intl/AndroidLocaleDelegateAPI24$$ExternalSyntheticApiModelOutline0;
+Landroidx/compose/ui/platform/coreshims/SoftwareKeyboardControllerCompat$Impl30$$ExternalSyntheticApiModelOutline3;
 Landroidx/compose/ui/text/intl/AndroidLocaleDelegateAPI24$$ExternalSyntheticApiModelOutline1;
 Landroidx/compose/ui/text/intl/AndroidLocaleDelegateAPI24$$ExternalSyntheticApiModelOutline2;
-Landroidx/compose/ui/text/platform/extensions/LocaleListHelperMethods$$ExternalSyntheticApiModelOutline0;
-Landroidx/compose/ui/text/platform/extensions/LocaleListHelperMethods$$ExternalSyntheticApiModelOutline2;
 Landroidx/concurrent/futures/AbstractResolvableFuture$SafeAtomicHelper$$ExternalSyntheticBackportWithForwarding0;
 Landroidx/constraintlayout/core/ArrayLinkedVariables;
 Landroidx/constraintlayout/core/ArrayRow$ArrayRowVariables;
@@ -29168,7 +28892,6 @@ Landroidx/constraintlayout/core/Cache;
 Landroidx/constraintlayout/core/LinearSystem$Row;
 Landroidx/constraintlayout/core/LinearSystem$ValuesRow;
 Landroidx/constraintlayout/core/LinearSystem;
-Landroidx/constraintlayout/core/Metrics;
 Landroidx/constraintlayout/core/Pools$Pool;
 Landroidx/constraintlayout/core/Pools$SimplePool;
 Landroidx/constraintlayout/core/PriorityGoalRow$1;
@@ -29220,14 +28943,13 @@ Landroidx/constraintlayout/widget/ConstraintSet$Motion;
 Landroidx/constraintlayout/widget/ConstraintSet$PropertySet;
 Landroidx/constraintlayout/widget/ConstraintSet$Transform;
 Landroidx/constraintlayout/widget/ConstraintSet;
-Landroidx/constraintlayout/widget/ConstraintsChangedListener;
 Landroidx/constraintlayout/widget/Guideline;
 Landroidx/constraintlayout/widget/R$id;
 Landroidx/constraintlayout/widget/R$styleable;
-Landroidx/constraintlayout/widget/SharedValues;
 Landroidx/constraintlayout/widget/VirtualLayout;
 Landroidx/coordinatorlayout/R$attr;
 Landroidx/coordinatorlayout/R$styleable;
+Landroidx/coordinatorlayout/widget/CoordinatorLayout$$ExternalSyntheticApiModelOutline0;
 Landroidx/coordinatorlayout/widget/CoordinatorLayout$AttachedBehavior;
 Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
 Landroidx/coordinatorlayout/widget/CoordinatorLayout$HierarchyChangeListener;
@@ -29244,13 +28966,11 @@ Landroidx/core/app/ActivityCompat$Api21Impl;
 Landroidx/core/app/ActivityCompat$OnRequestPermissionsResultCallback;
 Landroidx/core/app/ActivityCompat$RequestPermissionsRequestCodeValidator;
 Landroidx/core/app/ActivityCompat;
-Landroidx/core/app/AppOpsManagerCompat$Api23Impl$$ExternalSyntheticApiModelOutline1;
 Landroidx/core/app/AppOpsManagerCompat$Api23Impl;
 Landroidx/core/app/AppOpsManagerCompat;
 Landroidx/core/app/ComponentActivity;
 Landroidx/core/app/CoreComponentFactory;
 Landroidx/core/app/NavUtils;
-Landroidx/core/app/NotificationManagerCompat$Api24Impl$$ExternalSyntheticApiModelOutline1;
 Landroidx/core/app/NotificationManagerCompat;
 Landroidx/core/app/OnMultiWindowModeChangedProvider;
 Landroidx/core/app/OnPictureInPictureModeChangedProvider;
@@ -29258,10 +28978,8 @@ Landroidx/core/app/SharedElementCallback;
 Landroidx/core/app/TaskStackBuilder$SupportParentable;
 Landroidx/core/content/ContentValuesKt;
 Landroidx/core/content/ContextCompat$Api21Impl;
-Landroidx/core/content/ContextCompat$Api23Impl$$ExternalSyntheticApiModelOutline1;
 Landroidx/core/content/ContextCompat$Api23Impl;
 Landroidx/core/content/ContextCompat$Api26Impl;
-Landroidx/core/content/ContextCompat$Api28Impl$$ExternalSyntheticApiModelOutline0;
 Landroidx/core/content/ContextCompat$Api28Impl;
 Landroidx/core/content/ContextCompat;
 Landroidx/core/content/FileProvider;
@@ -29270,7 +28988,6 @@ Landroidx/core/content/OnTrimMemoryProvider;
 Landroidx/core/content/PermissionChecker;
 Landroidx/core/content/res/ColorStateListInflaterCompat;
 Landroidx/core/content/res/GrowingArrayUtils;
-Landroidx/core/content/res/ResourcesCompat$Api23Impl$$ExternalSyntheticApiModelOutline0;
 Landroidx/core/content/res/ResourcesCompat$Api23Impl;
 Landroidx/core/content/res/ResourcesCompat$ColorStateListCacheEntry;
 Landroidx/core/content/res/ResourcesCompat$ColorStateListCacheKey;
@@ -29283,8 +29000,6 @@ Landroidx/core/graphics/TypefaceCompat;
 Landroidx/core/graphics/TypefaceCompatApi29Impl;
 Landroidx/core/graphics/TypefaceCompatBaseImpl;
 Landroidx/core/graphics/drawable/DrawableCompat$Api21Impl;
-Landroidx/core/graphics/drawable/DrawableCompat$Api23Impl$$ExternalSyntheticApiModelOutline0;
-Landroidx/core/graphics/drawable/DrawableCompat$Api23Impl$$ExternalSyntheticApiModelOutline1;
 Landroidx/core/graphics/drawable/DrawableCompat$Api23Impl;
 Landroidx/core/graphics/drawable/DrawableCompat;
 Landroidx/core/graphics/drawable/TintAwareDrawable;
@@ -29294,7 +29009,6 @@ Landroidx/core/internal/view/SupportMenuItem;
 Landroidx/core/math/MathUtils;
 Landroidx/core/os/CancellationSignal$OnCancelListener;
 Landroidx/core/os/CancellationSignal;
-Landroidx/core/os/ConfigurationCompat$Api24Impl$$ExternalSyntheticApiModelOutline0;
 Landroidx/core/os/ConfigurationCompat$Api24Impl;
 Landroidx/core/os/ConfigurationCompat;
 Landroidx/core/os/LocaleListCompat$Api21Impl;
@@ -29302,14 +29016,12 @@ Landroidx/core/os/LocaleListCompat$Api24Impl;
 Landroidx/core/os/LocaleListCompat;
 Landroidx/core/os/LocaleListInterface;
 Landroidx/core/os/LocaleListPlatformWrapper$$ExternalSyntheticApiModelOutline0;
+Landroidx/core/os/LocaleListPlatformWrapper$$ExternalSyntheticApiModelOutline4;
 Landroidx/core/os/LocaleListPlatformWrapper;
 Landroidx/core/os/TraceCompat$Api18Impl;
 Landroidx/core/os/TraceCompat;
-Landroidx/core/os/UserManagerCompat$Api24Impl$$ExternalSyntheticApiModelOutline0;
 Landroidx/core/os/UserManagerCompat$Api24Impl;
 Landroidx/core/os/UserManagerCompat;
-Landroidx/core/text/util/LinkifyCompat$$ExternalSyntheticLambda0;
-Landroidx/core/text/util/LinkifyCompat;
 Landroidx/core/util/Consumer;
 Landroidx/core/util/ObjectsCompat$Api19Impl;
 Landroidx/core/util/ObjectsCompat;
@@ -29358,25 +29070,13 @@ Landroidx/core/view/ViewCompat$Api19Impl;
 Landroidx/core/view/ViewCompat$Api20Impl;
 Landroidx/core/view/ViewCompat$Api21Impl$1;
 Landroidx/core/view/ViewCompat$Api21Impl;
-Landroidx/core/view/ViewCompat$Api23Impl$$ExternalSyntheticApiModelOutline1;
 Landroidx/core/view/ViewCompat$Api23Impl;
-Landroidx/core/view/ViewCompat$Api26Impl$$ExternalSyntheticApiModelOutline0;
 Landroidx/core/view/ViewCompat$Api26Impl;
-Landroidx/core/view/ViewCompat$Api28Impl$$ExternalSyntheticApiModelOutline0;
-Landroidx/core/view/ViewCompat$Api28Impl$$ExternalSyntheticApiModelOutline10;
-Landroidx/core/view/ViewCompat$Api28Impl$$ExternalSyntheticApiModelOutline2;
-Landroidx/core/view/ViewCompat$Api28Impl$$ExternalSyntheticApiModelOutline4;
 Landroidx/core/view/ViewCompat$Api28Impl;
-Landroidx/core/view/ViewCompat$Api29Impl$$ExternalSyntheticApiModelOutline2;
-Landroidx/core/view/ViewCompat$Api29Impl$$ExternalSyntheticApiModelOutline3;
 Landroidx/core/view/ViewCompat$Api29Impl;
-Landroidx/core/view/ViewCompat$Api30Impl$$ExternalSyntheticApiModelOutline2;
 Landroidx/core/view/ViewCompat$Api30Impl;
 Landroidx/core/view/ViewCompat;
-Landroidx/core/view/ViewConfigurationCompat$Api26Impl$$ExternalSyntheticApiModelOutline0;
-Landroidx/core/view/ViewConfigurationCompat$Api26Impl$$ExternalSyntheticApiModelOutline1;
 Landroidx/core/view/ViewConfigurationCompat$Api26Impl;
-Landroidx/core/view/ViewConfigurationCompat$Api28Impl$$ExternalSyntheticApiModelOutline0;
 Landroidx/core/view/ViewConfigurationCompat$Api28Impl;
 Landroidx/core/view/ViewConfigurationCompat;
 Landroidx/core/view/ViewGroupKt$children$1;
@@ -29386,15 +29086,14 @@ Landroidx/core/view/ViewKt$doOnPreDraw$1;
 Landroidx/core/view/ViewKt;
 Landroidx/core/view/ViewParentCompat;
 Landroidx/core/view/WindowInsetsAnimationCompat$Callback;
-Landroidx/core/view/WindowInsetsAnimationCompat$Impl30$$ExternalSyntheticApiModelOutline2;
+Landroidx/core/view/WindowInsetsAnimationCompat$Impl30$$ExternalSyntheticApiModelOutline4;
 Landroidx/core/view/WindowInsetsAnimationCompat$Impl30$ProxyCallback;
 Landroidx/core/view/WindowInsetsAnimationCompat$Impl30;
 Landroidx/core/view/WindowInsetsAnimationCompat$Impl;
 Landroidx/core/view/WindowInsetsAnimationCompat;
 Landroidx/core/view/WindowInsetsCompat$Builder;
-Landroidx/core/view/WindowInsetsCompat$BuilderImpl29$$ExternalSyntheticApiModelOutline5;
-Landroidx/core/view/WindowInsetsCompat$BuilderImpl29$$ExternalSyntheticApiModelOutline6;
-Landroidx/core/view/WindowInsetsCompat$BuilderImpl29$$ExternalSyntheticApiModelOutline8;
+Landroidx/core/view/WindowInsetsCompat$BuilderImpl29$$ExternalSyntheticApiModelOutline3;
+Landroidx/core/view/WindowInsetsCompat$BuilderImpl29$$ExternalSyntheticApiModelOutline7;
 Landroidx/core/view/WindowInsetsCompat$BuilderImpl29;
 Landroidx/core/view/WindowInsetsCompat$BuilderImpl30;
 Landroidx/core/view/WindowInsetsCompat$BuilderImpl;
@@ -29404,7 +29103,7 @@ Landroidx/core/view/WindowInsetsCompat$Impl28$$ExternalSyntheticApiModelOutline1
 Landroidx/core/view/WindowInsetsCompat$Impl28;
 Landroidx/core/view/WindowInsetsCompat$Impl29;
 Landroidx/core/view/WindowInsetsCompat$Impl30$$ExternalSyntheticApiModelOutline1;
-Landroidx/core/view/WindowInsetsCompat$Impl30$$ExternalSyntheticApiModelOutline3;
+Landroidx/core/view/WindowInsetsCompat$Impl30$$ExternalSyntheticApiModelOutline2;
 Landroidx/core/view/WindowInsetsCompat$Impl30;
 Landroidx/core/view/WindowInsetsCompat$Impl;
 Landroidx/core/view/WindowInsetsCompat$Type;
@@ -29414,12 +29113,11 @@ Landroidx/core/view/WindowInsetsCompat$TypeImpl30$$ExternalSyntheticApiModelOutl
 Landroidx/core/view/WindowInsetsCompat$TypeImpl30$$ExternalSyntheticApiModelOutline6;
 Landroidx/core/view/WindowInsetsCompat$TypeImpl30;
 Landroidx/core/view/WindowInsetsCompat;
-Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$$ExternalSyntheticApiModelOutline11;
 Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$$ExternalSyntheticApiModelOutline3;
-Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$$ExternalSyntheticApiModelOutline6;
+Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$$ExternalSyntheticApiModelOutline4;
+Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$$ExternalSyntheticApiModelOutline5;
 Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline0;
 Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline11;
-Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline13;
 Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline14;
 Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline15;
 Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline16;
@@ -29428,6 +29126,7 @@ Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActio
 Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline19;
 Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline1;
 Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline20;
+Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline21;
 Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline2;
 Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline3;
 Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline4;
@@ -29435,7 +29134,6 @@ Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActio
 Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline6;
 Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat$$ExternalSyntheticApiModelOutline7;
 Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;
-Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$Api30Impl$$ExternalSyntheticApiModelOutline0;
 Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$Api30Impl;
 Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat$CollectionInfoCompat;
 Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;
@@ -29450,17 +29148,11 @@ Landroidx/core/view/accessibility/AccessibilityViewCommand$SetTextArguments;
 Landroidx/core/view/accessibility/AccessibilityViewCommand;
 Landroidx/core/view/animation/PathInterpolatorCompat$Api21Impl;
 Landroidx/core/view/animation/PathInterpolatorCompat;
-Landroidx/core/view/inputmethod/EditorInfoCompat$$ExternalSyntheticApiModelOutline0;
-Landroidx/core/view/inputmethod/EditorInfoCompat;
-Landroidx/core/view/inputmethod/InputConnectionCompat$1;
-Landroidx/core/view/inputmethod/InputConnectionCompat$OnCommitContentListener;
-Landroidx/core/view/inputmethod/InputConnectionCompat;
 Landroidx/core/widget/ImageViewCompat$Api21Impl;
 Landroidx/core/widget/ImageViewCompat;
 Landroidx/core/widget/NestedScrollView$OnScrollChangeListener;
 Landroidx/core/widget/TextViewCompat$Api16Impl;
 Landroidx/core/widget/TextViewCompat$Api17Impl;
-Landroidx/core/widget/TextViewCompat$Api23Impl$$ExternalSyntheticApiModelOutline5;
 Landroidx/core/widget/TextViewCompat$Api23Impl;
 Landroidx/core/widget/TextViewCompat;
 Landroidx/core/widget/TextViewOnReceiveContentListener;
@@ -29474,6 +29166,7 @@ Landroidx/customview/widget/ExploreByTouchHelper;
 Landroidx/customview/widget/FocusStrategy$BoundsAdapter;
 Landroidx/customview/widget/FocusStrategy$CollectionAdapter;
 Landroidx/emoji2/text/ConcurrencyHelpers$$ExternalSyntheticLambda0;
+Landroidx/emoji2/text/ConcurrencyHelpers$Handler28Impl$$ExternalSyntheticApiModelOutline0;
 Landroidx/emoji2/text/ConcurrencyHelpers$Handler28Impl;
 Landroidx/emoji2/text/ConcurrencyHelpers;
 Landroidx/emoji2/text/DefaultEmojiCompatConfig$DefaultEmojiCompatConfigFactory;
@@ -29506,8 +29199,6 @@ Landroidx/emoji2/viewsintegration/EmojiEditTextHelper$HelperInternal19;
 Landroidx/emoji2/viewsintegration/EmojiEditTextHelper$HelperInternal;
 Landroidx/emoji2/viewsintegration/EmojiEditTextHelper;
 Landroidx/emoji2/viewsintegration/EmojiEditableFactory;
-Landroidx/emoji2/viewsintegration/EmojiInputConnection$EmojiCompatDeleteHelper;
-Landroidx/emoji2/viewsintegration/EmojiInputConnection;
 Landroidx/emoji2/viewsintegration/EmojiInputFilter;
 Landroidx/emoji2/viewsintegration/EmojiKeyListener$EmojiCompatHandleKeyDownHelper;
 Landroidx/emoji2/viewsintegration/EmojiKeyListener;
@@ -29636,7 +29327,6 @@ Landroidx/lifecycle/Observer;
 Landroidx/lifecycle/OnLifecycleEvent;
 Landroidx/lifecycle/ProcessLifecycleInitializer;
 Landroidx/lifecycle/ProcessLifecycleOwner$$ExternalSyntheticLambda0;
-Landroidx/lifecycle/ProcessLifecycleOwner$Api29Impl$$ExternalSyntheticApiModelOutline0;
 Landroidx/lifecycle/ProcessLifecycleOwner$Api29Impl;
 Landroidx/lifecycle/ProcessLifecycleOwner$Companion;
 Landroidx/lifecycle/ProcessLifecycleOwner$attach$1$onActivityPreCreated$1;
@@ -29646,6 +29336,7 @@ Landroidx/lifecycle/ProcessLifecycleOwner;
 Landroidx/lifecycle/ReflectiveGenericLifecycleObserver;
 Landroidx/lifecycle/ReportFragment$ActivityInitializationListener;
 Landroidx/lifecycle/ReportFragment$Companion;
+Landroidx/lifecycle/ReportFragment$LifecycleCallbacks$Companion$$ExternalSyntheticApiModelOutline0;
 Landroidx/lifecycle/ReportFragment$LifecycleCallbacks$Companion;
 Landroidx/lifecycle/ReportFragment$LifecycleCallbacks;
 Landroidx/lifecycle/ReportFragment;
@@ -29710,7 +29401,6 @@ Landroidx/media/MediaSessionManager$RemoteUserInfoImpl;
 Landroidx/media/MediaSessionManager;
 Landroidx/media/MediaSessionManagerImplApi21;
 Landroidx/media/MediaSessionManagerImplApi28$RemoteUserInfoImplApi28$$ExternalSyntheticApiModelOutline0;
-Landroidx/media/MediaSessionManagerImplApi28$RemoteUserInfoImplApi28$$ExternalSyntheticApiModelOutline1;
 Landroidx/media/MediaSessionManagerImplApi28$RemoteUserInfoImplApi28;
 Landroidx/media/MediaSessionManagerImplApi28;
 Landroidx/media/MediaSessionManagerImplBase$RemoteUserInfoImplBase;
@@ -29816,7 +29506,7 @@ Landroidx/media3/common/util/Log$Logger$1;
 Landroidx/media3/common/util/Log$Logger;
 Landroidx/media3/common/util/Log;
 Landroidx/media3/common/util/NetworkTypeObserver$$ExternalSyntheticLambda0;
-Landroidx/media3/common/util/NetworkTypeObserver$Api31$$ExternalSyntheticApiModelOutline0;
+Landroidx/media3/common/util/NetworkTypeObserver$Api31$$ExternalSyntheticApiModelOutline1;
 Landroidx/media3/common/util/NetworkTypeObserver$Listener;
 Landroidx/media3/common/util/NetworkTypeObserver$Receiver;
 Landroidx/media3/common/util/NetworkTypeObserver;
@@ -29840,7 +29530,6 @@ Landroidx/media3/datasource/HttpDataSource$RequestProperties;
 Landroidx/media3/datasource/TransferListener;
 Landroidx/media3/decoder/Buffer;
 Landroidx/media3/decoder/CryptoInfo$PatternHolderV24$$ExternalSyntheticApiModelOutline0;
-Landroidx/media3/decoder/CryptoInfo$PatternHolderV24$$ExternalSyntheticApiModelOutline1;
 Landroidx/media3/decoder/CryptoInfo$PatternHolderV24;
 Landroidx/media3/decoder/CryptoInfo;
 Landroidx/media3/decoder/DecoderException;
@@ -29875,10 +29564,10 @@ Landroidx/media3/exoplayer/ExoPlayer$Builder$$ExternalSyntheticLambda8;
 Landroidx/media3/exoplayer/ExoPlayer$Builder;
 Landroidx/media3/exoplayer/ExoPlayer;
 Landroidx/media3/exoplayer/ExoPlayerImpl$$ExternalSyntheticApiModelOutline0;
-Landroidx/media3/exoplayer/ExoPlayerImpl$$ExternalSyntheticLambda16;
-Landroidx/media3/exoplayer/ExoPlayerImpl$$ExternalSyntheticLambda18;
-Landroidx/media3/exoplayer/ExoPlayerImpl$$ExternalSyntheticLambda19;
-Landroidx/media3/exoplayer/ExoPlayerImpl$Api23$$ExternalSyntheticApiModelOutline0;
+Landroidx/media3/exoplayer/ExoPlayerImpl$$ExternalSyntheticLambda7;
+Landroidx/media3/exoplayer/ExoPlayerImpl$$ExternalSyntheticLambda8;
+Landroidx/media3/exoplayer/ExoPlayerImpl$$ExternalSyntheticLambda9;
+Landroidx/media3/exoplayer/ExoPlayerImpl$Api23$$ExternalSyntheticApiModelOutline1;
 Landroidx/media3/exoplayer/ExoPlayerImpl$Api31$$ExternalSyntheticApiModelOutline0;
 Landroidx/media3/exoplayer/ExoPlayerImpl$Api31;
 Landroidx/media3/exoplayer/ExoPlayerImpl$ComponentListener;
@@ -29913,23 +29602,22 @@ Landroidx/media3/exoplayer/analytics/AnalyticsListener$-CC;
 Landroidx/media3/exoplayer/analytics/AnalyticsListener$EventTime;
 Landroidx/media3/exoplayer/analytics/AnalyticsListener$Events;
 Landroidx/media3/exoplayer/analytics/AnalyticsListener;
-Landroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda13;
-Landroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda26;
-Landroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda49;
-Landroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda67;
+Landroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda17;
+Landroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda19;
+Landroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda31;
+Landroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$$ExternalSyntheticLambda66;
 Landroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector$MediaPeriodQueueTracker;
 Landroidx/media3/exoplayer/analytics/DefaultAnalyticsCollector;
 Landroidx/media3/exoplayer/analytics/DefaultPlaybackSessionManager$$ExternalSyntheticLambda0;
 Landroidx/media3/exoplayer/analytics/DefaultPlaybackSessionManager;
-Landroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline10;
-Landroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline11;
-Landroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline50;
-Landroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline51;
-Landroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline52;
-Landroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline53;
-Landroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline54;
-Landroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline8;
-Landroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline9;
+Landroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline1;
+Landroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline23;
+Landroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline24;
+Landroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline25;
+Landroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline26;
+Landroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline49;
+Landroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline5;
+Landroidx/media3/exoplayer/analytics/MediaMetricsListener$$ExternalSyntheticApiModelOutline6;
 Landroidx/media3/exoplayer/analytics/MediaMetricsListener;
 Landroidx/media3/exoplayer/analytics/PlaybackSessionManager$Listener;
 Landroidx/media3/exoplayer/analytics/PlaybackSessionManager;
@@ -30010,8 +29698,8 @@ Landroidx/media3/exoplayer/text/SubtitleDecoderFactory;
 Landroidx/media3/exoplayer/text/TextOutput;
 Landroidx/media3/exoplayer/text/TextRenderer;
 Landroidx/media3/exoplayer/trackselection/AdaptiveTrackSelection$Factory;
-Landroidx/media3/exoplayer/trackselection/DefaultTrackSelector$$ExternalSyntheticLambda6;
-Landroidx/media3/exoplayer/trackselection/DefaultTrackSelector$$ExternalSyntheticLambda7;
+Landroidx/media3/exoplayer/trackselection/DefaultTrackSelector$$ExternalSyntheticLambda0;
+Landroidx/media3/exoplayer/trackselection/DefaultTrackSelector$$ExternalSyntheticLambda1;
 Landroidx/media3/exoplayer/trackselection/DefaultTrackSelector$Parameters$$ExternalSyntheticLambda0;
 Landroidx/media3/exoplayer/trackselection/DefaultTrackSelector$Parameters$Builder;
 Landroidx/media3/exoplayer/trackselection/DefaultTrackSelector$Parameters;
@@ -30086,7 +29774,6 @@ Landroidx/media3/session/DefaultActionFactory;
 Landroidx/media3/session/DefaultMediaNotificationProvider$$ExternalSyntheticApiModelOutline0;
 Landroidx/media3/session/DefaultMediaNotificationProvider$Api26$$ExternalSyntheticApiModelOutline0;
 Landroidx/media3/session/DefaultMediaNotificationProvider$Api26$$ExternalSyntheticApiModelOutline1;
-Landroidx/media3/session/DefaultMediaNotificationProvider$Api26$$ExternalSyntheticApiModelOutline2;
 Landroidx/media3/session/IMediaController$Stub;
 Landroidx/media3/session/IMediaController;
 Landroidx/media3/session/IMediaSession$Stub;
@@ -30106,27 +29793,28 @@ Landroidx/media3/session/MediaControllerHolder$$ExternalSyntheticLambda0;
 Landroidx/media3/session/MediaControllerHolder$$ExternalSyntheticLambda1;
 Landroidx/media3/session/MediaControllerHolder;
 Landroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda104;
-Landroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda108;
+Landroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda109;
 Landroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda114;
-Landroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda38;
+Landroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda23;
 Landroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda39;
-Landroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda41;
+Landroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda40;
 Landroidx/media3/session/MediaControllerImplBase$FlushCommandQueueHandler$$ExternalSyntheticLambda0;
 Landroidx/media3/session/MediaControllerImplBase$FlushCommandQueueHandler;
 Landroidx/media3/session/MediaControllerImplBase$RemoteSessionTask;
 Landroidx/media3/session/MediaControllerImplBase$SessionServiceConnection;
 Landroidx/media3/session/MediaControllerImplBase$SurfaceCallback;
 Landroidx/media3/session/MediaControllerImplBase;
-Landroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda0;
+Landroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda12;
 Landroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda13;
-Landroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda1;
-Landroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda3;
+Landroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda7;
+Landroidx/media3/session/MediaControllerStub$$ExternalSyntheticLambda9;
 Landroidx/media3/session/MediaControllerStub$ControllerTask;
 Landroidx/media3/session/MediaControllerStub;
 Landroidx/media3/session/MediaNotification$ActionFactory;
 Landroidx/media3/session/MediaNotification$Provider;
-Landroidx/media3/session/MediaNotificationManager$$ExternalSyntheticLambda2;
-Landroidx/media3/session/MediaNotificationManager$$ExternalSyntheticLambda5;
+Landroidx/media3/session/MediaNotificationManager$$ExternalSyntheticLambda0;
+Landroidx/media3/session/MediaNotificationManager$$ExternalSyntheticLambda6;
+Landroidx/media3/session/MediaNotificationManager$Api24$$ExternalSyntheticApiModelOutline0;
 Landroidx/media3/session/MediaNotificationManager$Api24;
 Landroidx/media3/session/MediaNotificationManager$MediaControllerListener;
 Landroidx/media3/session/MediaNotificationManager;
@@ -30140,36 +29828,36 @@ Landroidx/media3/session/MediaSession$ControllerCb;
 Landroidx/media3/session/MediaSession$ControllerInfo;
 Landroidx/media3/session/MediaSession$Listener;
 Landroidx/media3/session/MediaSession;
-Landroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda0;
+Landroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda15;
 Landroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda17;
 Landroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda18;
 Landroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda1;
 Landroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda2;
+Landroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda3;
 Landroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda4;
-Landroidx/media3/session/MediaSessionImpl$$ExternalSyntheticLambda6;
 Landroidx/media3/session/MediaSessionImpl$MediaPlayPauseKeyHandler;
 Landroidx/media3/session/MediaSessionImpl$PlayerInfoChangedHandler;
 Landroidx/media3/session/MediaSessionImpl$PlayerListener;
 Landroidx/media3/session/MediaSessionImpl$RemoteControllerTask;
 Landroidx/media3/session/MediaSessionImpl;
-Landroidx/media3/session/MediaSessionLegacyStub$$ExternalSyntheticLambda3;
+Landroidx/media3/session/MediaSessionLegacyStub$$ExternalSyntheticLambda0;
 Landroidx/media3/session/MediaSessionLegacyStub$Api31$$ExternalSyntheticApiModelOutline0;
 Landroidx/media3/session/MediaSessionLegacyStub$Api31;
 Landroidx/media3/session/MediaSessionLegacyStub$ConnectionTimeoutHandler;
 Landroidx/media3/session/MediaSessionLegacyStub$ControllerLegacyCbForBroadcast;
 Landroidx/media3/session/MediaSessionLegacyStub;
-Landroidx/media3/session/MediaSessionService$$ExternalSyntheticLambda0;
+Landroidx/media3/session/MediaSessionService$$ExternalSyntheticLambda3;
 Landroidx/media3/session/MediaSessionService$Listener;
 Landroidx/media3/session/MediaSessionService$MediaSessionListener;
 Landroidx/media3/session/MediaSessionService$MediaSessionServiceStub$$ExternalSyntheticLambda0;
 Landroidx/media3/session/MediaSessionService$MediaSessionServiceStub;
 Landroidx/media3/session/MediaSessionService;
-Landroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda24;
-Landroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda56;
-Landroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda70;
+Landroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda28;
+Landroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda3;
+Landroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda68;
 Landroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda73;
-Landroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda77;
-Landroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda82;
+Landroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda80;
+Landroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda81;
 Landroidx/media3/session/MediaSessionStub$Controller2Cb;
 Landroidx/media3/session/MediaSessionStub$SessionTask;
 Landroidx/media3/session/MediaSessionStub;
@@ -30242,6 +29930,7 @@ Landroidx/navigation/NavGraph$iterator$1;
 Landroidx/navigation/NavGraph;
 Landroidx/navigation/NavGraphNavigator;
 Landroidx/navigation/NavHostController;
+Landroidx/navigation/NavInflater$$ExternalSyntheticDesugaredLibraryBridge0;
 Landroidx/navigation/NavInflater$Companion;
 Landroidx/navigation/NavInflater;
 Landroidx/navigation/NavOptions$Builder;
@@ -30455,19 +30144,19 @@ Landroidx/viewbinding/ViewBinding;
 Landroidx/viewbinding/ViewBindings;
 Lcom/airbnb/lottie/L;
 Lcom/airbnb/lottie/LottieAnimationView$$ExternalSyntheticLambda1;
-Lcom/airbnb/lottie/LottieAnimationView$$ExternalSyntheticLambda2;
+Lcom/airbnb/lottie/LottieAnimationView$$ExternalSyntheticLambda3;
 Lcom/airbnb/lottie/LottieAnimationView$1;
 Lcom/airbnb/lottie/LottieAnimationView$2;
 Lcom/airbnb/lottie/LottieAnimationView$UserActionTaken;
 Lcom/airbnb/lottie/LottieAnimationView;
 Lcom/airbnb/lottie/LottieComposition;
-Lcom/airbnb/lottie/LottieCompositionFactory$$ExternalSyntheticLambda2;
 Lcom/airbnb/lottie/LottieCompositionFactory$$ExternalSyntheticLambda3;
 Lcom/airbnb/lottie/LottieCompositionFactory$$ExternalSyntheticLambda4;
+Lcom/airbnb/lottie/LottieCompositionFactory$$ExternalSyntheticLambda5;
 Lcom/airbnb/lottie/LottieCompositionFactory$$ExternalSyntheticLambda6;
 Lcom/airbnb/lottie/LottieCompositionFactory;
-Lcom/airbnb/lottie/LottieDrawable$$ExternalSyntheticLambda0;
-Lcom/airbnb/lottie/LottieDrawable$$ExternalSyntheticLambda9;
+Lcom/airbnb/lottie/LottieDrawable$$ExternalSyntheticLambda13;
+Lcom/airbnb/lottie/LottieDrawable$$ExternalSyntheticLambda7;
 Lcom/airbnb/lottie/LottieDrawable$1;
 Lcom/airbnb/lottie/LottieDrawable$LazyCompositionTask;
 Lcom/airbnb/lottie/LottieDrawable$OnVisibleAction;
@@ -30510,7 +30199,6 @@ Lcom/airbnb/lottie/animation/keyframe/IntegerKeyframeAnimation;
 Lcom/airbnb/lottie/animation/keyframe/KeyframeAnimation;
 Lcom/airbnb/lottie/animation/keyframe/MaskKeyframeAnimation;
 Lcom/airbnb/lottie/animation/keyframe/PathKeyframe;
-Lcom/airbnb/lottie/animation/keyframe/PathKeyframeAnimation;
 Lcom/airbnb/lottie/animation/keyframe/PointKeyframeAnimation;
 Lcom/airbnb/lottie/animation/keyframe/ScaleKeyframeAnimation;
 Lcom/airbnb/lottie/animation/keyframe/ShapeKeyframeAnimation;
@@ -30616,9 +30304,6 @@ Lcom/annimon/stream/Stream$3;
 Lcom/annimon/stream/Stream;
 Lcom/annimon/stream/function/BiConsumer;
 Lcom/annimon/stream/function/BiFunction;
-Lcom/annimon/stream/function/BinaryOperator$Util$2;
-Lcom/annimon/stream/function/BinaryOperator$Util;
-Lcom/annimon/stream/function/BinaryOperator;
 Lcom/annimon/stream/function/Consumer;
 Lcom/annimon/stream/function/Function;
 Lcom/annimon/stream/function/IndexedFunction;
@@ -30636,7 +30321,6 @@ Lcom/annimon/stream/iterator/LsaExtIterator;
 Lcom/annimon/stream/iterator/LsaIterator;
 Lcom/annimon/stream/iterator/PrimitiveIterator$OfInt;
 Lcom/annimon/stream/operator/IntArray;
-Lcom/annimon/stream/operator/IntRangeClosed;
 Lcom/annimon/stream/operator/ObjArray;
 Lcom/annimon/stream/operator/ObjFilter;
 Lcom/annimon/stream/operator/ObjLimit;
@@ -31169,6 +30853,7 @@ Lcom/fasterxml/jackson/databind/cfg/ConstructorDetector;
 Lcom/fasterxml/jackson/databind/cfg/ContextAttributes$Impl;
 Lcom/fasterxml/jackson/databind/cfg/ContextAttributes;
 Lcom/fasterxml/jackson/databind/cfg/DeserializerFactoryConfig;
+Lcom/fasterxml/jackson/databind/cfg/MapperBuilder;
 Lcom/fasterxml/jackson/databind/cfg/MapperConfig;
 Lcom/fasterxml/jackson/databind/cfg/MapperConfigBase;
 Lcom/fasterxml/jackson/databind/cfg/MutableCoercionConfig;
@@ -31244,6 +30929,7 @@ Lcom/fasterxml/jackson/databind/deser/std/StringArrayDeserializer;
 Lcom/fasterxml/jackson/databind/deser/std/StringCollectionDeserializer;
 Lcom/fasterxml/jackson/databind/deser/std/StringDeserializer;
 Lcom/fasterxml/jackson/databind/deser/std/UUIDDeserializer;
+Lcom/fasterxml/jackson/databind/exc/InvalidDefinitionException;
 Lcom/fasterxml/jackson/databind/ext/Java7Handlers;
 Lcom/fasterxml/jackson/databind/ext/Java7HandlersImpl;
 Lcom/fasterxml/jackson/databind/ext/Java7Support;
@@ -31308,6 +30994,8 @@ Lcom/fasterxml/jackson/databind/introspect/TypeResolutionContext$Empty;
 Lcom/fasterxml/jackson/databind/introspect/TypeResolutionContext;
 Lcom/fasterxml/jackson/databind/introspect/VisibilityChecker$Std;
 Lcom/fasterxml/jackson/databind/introspect/VisibilityChecker;
+Lcom/fasterxml/jackson/databind/json/JsonMapper$Builder;
+Lcom/fasterxml/jackson/databind/json/JsonMapper;
 Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator$Base;
 Lcom/fasterxml/jackson/databind/jsontype/PolymorphicTypeValidator;
 Lcom/fasterxml/jackson/databind/jsontype/SubtypeResolver;
@@ -31321,6 +31009,7 @@ Lcom/fasterxml/jackson/databind/node/ArrayNode;
 Lcom/fasterxml/jackson/databind/node/BaseJsonNode;
 Lcom/fasterxml/jackson/databind/node/ContainerNode;
 Lcom/fasterxml/jackson/databind/node/IntNode;
+Lcom/fasterxml/jackson/databind/node/JsonNodeFactory$$ExternalSyntheticBackportWithForwarding0;
 Lcom/fasterxml/jackson/databind/node/JsonNodeFactory;
 Lcom/fasterxml/jackson/databind/node/NumericNode;
 Lcom/fasterxml/jackson/databind/node/ObjectNode;
@@ -31346,7 +31035,6 @@ Lcom/fasterxml/jackson/databind/ser/Serializers$Base;
 Lcom/fasterxml/jackson/databind/ser/Serializers;
 Lcom/fasterxml/jackson/databind/ser/impl/FailingSerializer;
 Lcom/fasterxml/jackson/databind/ser/impl/IndexedListSerializer;
-Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$Double;
 Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$Empty;
 Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$SerializerAndMapResult;
 Lcom/fasterxml/jackson/databind/ser/impl/PropertySerializerMap$Single;
@@ -31541,8 +31229,8 @@ Lcom/google/android/datatransport/runtime/scheduling/persistence/EventStoreModul
 Lcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda0;
 Lcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda1;
 Lcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda2;
+Lcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda3;
 Lcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda4;
-Lcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda5;
 Lcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$$ExternalSyntheticLambda7;
 Lcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$Function;
 Lcom/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore$Producer;
@@ -31602,9 +31290,11 @@ Lcom/google/android/material/animation/AnimationUtils;
 Lcom/google/android/material/animation/ArgbEvaluatorCompat;
 Lcom/google/android/material/animation/MotionSpec;
 Lcom/google/android/material/animation/MotionTiming;
+Lcom/google/android/material/appbar/AppBarLayout$$ExternalSyntheticApiModelOutline0;
 Lcom/google/android/material/appbar/AppBarLayout$$ExternalSyntheticLambda1;
 Lcom/google/android/material/appbar/AppBarLayout$1;
-Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$$ExternalSyntheticLambda0;
+Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$$ExternalSyntheticApiModelOutline0;
+Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$$ExternalSyntheticLambda1;
 Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$2;
 Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$4;
 Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
@@ -31626,6 +31316,10 @@ Lcom/google/android/material/appbar/ViewOffsetHelper;
 Lcom/google/android/material/appbar/ViewUtilsLollipop;
 Lcom/google/android/material/button/MaterialButton;
 Lcom/google/android/material/button/MaterialButtonHelper;
+Lcom/google/android/material/card/MaterialCardView;
+Lcom/google/android/material/card/MaterialCardViewHelper$$ExternalSyntheticApiModelOutline0;
+Lcom/google/android/material/card/MaterialCardViewHelper$1;
+Lcom/google/android/material/card/MaterialCardViewHelper;
 Lcom/google/android/material/chip/Chip$$ExternalSyntheticLambda0;
 Lcom/google/android/material/chip/Chip$1;
 Lcom/google/android/material/chip/Chip$ChipTouchHelper;
@@ -31742,8 +31436,6 @@ Lcom/google/common/collect/RegularImmutableBiMap;
 Lcom/google/common/collect/RegularImmutableList;
 Lcom/google/common/collect/RegularImmutableMap;
 Lcom/google/common/collect/RegularImmutableSet;
-Lcom/google/common/collect/Sets$2;
-Lcom/google/common/collect/Sets$SetView;
 Lcom/google/common/collect/Sets;
 Lcom/google/common/collect/SingletonImmutableSet;
 Lcom/google/common/collect/UnmodifiableIterator;
@@ -31854,7 +31546,7 @@ Lcom/google/firebase/dynamicloading/ComponentLoader;
 Lcom/google/firebase/events/Publisher;
 Lcom/google/firebase/events/Subscriber;
 Lcom/google/firebase/heartbeatinfo/DefaultHeartBeatController$$ExternalSyntheticLambda0;
-Lcom/google/firebase/heartbeatinfo/DefaultHeartBeatController$$ExternalSyntheticLambda2;
+Lcom/google/firebase/heartbeatinfo/DefaultHeartBeatController$$ExternalSyntheticLambda1;
 Lcom/google/firebase/heartbeatinfo/DefaultHeartBeatController$$ExternalSyntheticLambda3;
 Lcom/google/firebase/heartbeatinfo/DefaultHeartBeatController;
 Lcom/google/firebase/heartbeatinfo/HeartBeatConsumer;
@@ -31866,7 +31558,7 @@ Lcom/google/firebase/heartbeatinfo/HeartBeatInfoStorage;
 Lcom/google/firebase/iid/internal/FirebaseInstanceIdInternal;
 Lcom/google/firebase/inject/Deferred$DeferredHandler;
 Lcom/google/firebase/inject/Provider;
-Lcom/google/firebase/installations/FirebaseInstallations$$ExternalSyntheticLambda1;
+Lcom/google/firebase/installations/FirebaseInstallations$$ExternalSyntheticLambda0;
 Lcom/google/firebase/installations/FirebaseInstallations$1;
 Lcom/google/firebase/installations/FirebaseInstallations;
 Lcom/google/firebase/installations/FirebaseInstallationsApi;
@@ -32320,6 +32012,8 @@ Lio/reactivex/rxjava3/subjects/PublishSubject$PublishDisposable;
 Lio/reactivex/rxjava3/subjects/PublishSubject;
 Lio/reactivex/rxjava3/subjects/SerializedSubject;
 Lio/reactivex/rxjava3/subjects/Subject;
+Lj$/com/android/tools/r8/a;
+Lj$/lang/a;
 Lj$/time/DayOfWeek;
 Lj$/time/Duration;
 Lj$/time/Instant;
@@ -32329,18 +32023,20 @@ Lj$/time/LocalTime;
 Lj$/time/OffsetDateTime;
 Lj$/time/ZoneId;
 Lj$/time/ZoneOffset;
-Lj$/time/ZonedDateTime;
 Lj$/time/a;
 Lj$/time/b;
 Lj$/time/c;
 Lj$/time/chrono/ChronoLocalDateTime;
-Lj$/time/chrono/ChronoZonedDateTime;
 Lj$/time/chrono/a;
 Lj$/time/chrono/b;
+Lj$/time/chrono/c;
+Lj$/time/chrono/d;
 Lj$/time/chrono/e;
-Lj$/time/chrono/f;
-Lj$/time/d;
+Lj$/time/chrono/k;
+Lj$/time/chrono/o;
+Lj$/time/chrono/v;
 Lj$/time/f;
+Lj$/time/format/A;
 Lj$/time/format/B;
 Lj$/time/format/C;
 Lj$/time/format/D;
@@ -32358,15 +32054,14 @@ Lj$/time/format/f;
 Lj$/time/format/g;
 Lj$/time/format/h;
 Lj$/time/format/i;
-Lj$/time/format/j;
+Lj$/time/format/k;
 Lj$/time/format/l;
-Lj$/time/format/m;
+Lj$/time/format/r;
 Lj$/time/format/s;
-Lj$/time/format/t;
-Lj$/time/format/v;
-Lj$/time/format/x;
-Lj$/time/format/z;
-Lj$/time/l;
+Lj$/time/format/u;
+Lj$/time/format/w;
+Lj$/time/format/y;
+Lj$/time/s;
 Lj$/time/temporal/ChronoField;
 Lj$/time/temporal/ChronoUnit;
 Lj$/time/temporal/TemporalAccessor;
@@ -32382,17 +32077,17 @@ Lj$/time/temporal/f;
 Lj$/time/temporal/g;
 Lj$/time/temporal/h;
 Lj$/time/temporal/i;
-Lj$/time/temporal/k;
+Lj$/time/temporal/j;
 Lj$/time/temporal/l;
 Lj$/time/temporal/m;
 Lj$/time/temporal/o;
-Lj$/time/zone/a;
 Lj$/time/zone/b;
-Lj$/time/zone/c;
-Lj$/time/zone/d;
 Lj$/time/zone/e;
 Lj$/time/zone/f;
 Lj$/time/zone/g;
+Lj$/time/zone/h;
+Lj$/time/zone/i;
+Lj$/time/zone/j;
 Lj$/util/C;
 Lj$/util/Collection$-CC;
 Lj$/util/Collection$-EL;
@@ -32455,8 +32150,6 @@ Lj$/util/function/Supplier;
 Lj$/util/function/ToDoubleFunction;
 Lj$/util/function/ToIntFunction;
 Lj$/util/function/ToLongFunction;
-Lj$/util/function/b;
-Lj$/util/function/e0;
 Lj$/util/function/h0;
 Lj$/util/function/h;
 Lj$/util/function/k0;
@@ -32464,60 +32157,54 @@ Lj$/util/function/n0;
 Lj$/util/function/o;
 Lj$/util/function/t;
 Lj$/util/g;
-Lj$/util/m;
-Lj$/util/stream/A1;
-Lj$/util/stream/B0;
 Lj$/util/stream/B2;
+Lj$/util/stream/B3;
 Lj$/util/stream/C0;
 Lj$/util/stream/C2;
+Lj$/util/stream/C3;
 Lj$/util/stream/Collector$Characteristics;
 Lj$/util/stream/Collector;
 Lj$/util/stream/Collectors;
-Lj$/util/stream/D0;
 Lj$/util/stream/E0;
-Lj$/util/stream/E1;
-Lj$/util/stream/F0;
-Lj$/util/stream/F1;
-Lj$/util/stream/F3;
+Lj$/util/stream/G0;
 Lj$/util/stream/G1;
-Lj$/util/stream/G3;
-Lj$/util/stream/H;
-Lj$/util/stream/I;
-Lj$/util/stream/L0;
-Lj$/util/stream/M;
-Lj$/util/stream/N;
-Lj$/util/stream/P1;
+Lj$/util/stream/G;
+Lj$/util/stream/H0;
+Lj$/util/stream/H1;
+Lj$/util/stream/I0;
+Lj$/util/stream/K;
+Lj$/util/stream/L;
 Lj$/util/stream/Q1;
-Lj$/util/stream/S1;
+Lj$/util/stream/Q;
+Lj$/util/stream/R1;
 Lj$/util/stream/S2;
+Lj$/util/stream/S;
 Lj$/util/stream/Stream;
 Lj$/util/stream/T2;
-Lj$/util/stream/T;
-Lj$/util/stream/U1;
 Lj$/util/stream/U2;
-Lj$/util/stream/U;
-Lj$/util/stream/V0;
 Lj$/util/stream/V1;
 Lj$/util/stream/V2;
-Lj$/util/stream/W0;
 Lj$/util/stream/W1;
 Lj$/util/stream/X0;
 Lj$/util/stream/X1;
 Lj$/util/stream/Y0;
 Lj$/util/stream/Y1;
 Lj$/util/stream/Z0;
+Lj$/util/stream/a1;
+Lj$/util/stream/b1;
 Lj$/util/stream/b;
 Lj$/util/stream/c2;
-Lj$/util/stream/c;
 Lj$/util/stream/g2;
-Lj$/util/stream/h2;
-Lj$/util/stream/i2;
-Lj$/util/stream/i;
-Lj$/util/stream/l;
+Lj$/util/stream/h;
+Lj$/util/stream/k;
+Lj$/util/stream/m;
 Lj$/util/stream/n;
+Lj$/util/stream/p;
+Lj$/util/stream/s;
 Lj$/util/stream/u2;
 Lj$/util/stream/w0;
 Lj$/util/stream/w;
+Lj$/util/z;
 Ljavax/inject/Provider;
 Lkotlin/Function;
 Lkotlin/InitializedLazyImpl;
@@ -32621,6 +32308,9 @@ Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
 Lkotlin/coroutines/jvm/internal/DebugProbesKt;
 Lkotlin/coroutines/jvm/internal/RestrictedContinuationImpl;
 Lkotlin/coroutines/jvm/internal/RestrictedSuspendLambda;
+Lkotlin/enums/EnumEntries;
+Lkotlin/enums/EnumEntriesKt;
+Lkotlin/enums/EnumEntriesList;
 Lkotlin/internal/PlatformImplementations;
 Lkotlin/internal/PlatformImplementationsKt;
 Lkotlin/internal/ProgressionUtilKt;
@@ -32747,6 +32437,7 @@ Lkotlin/reflect/jvm/internal/JvmFunctionSignature$KotlinFunction;
 Lkotlin/reflect/jvm/internal/JvmFunctionSignature;
 Lkotlin/reflect/jvm/internal/JvmPropertySignature$KotlinProperty;
 Lkotlin/reflect/jvm/internal/JvmPropertySignature;
+Lkotlin/reflect/jvm/internal/KCallableImpl$_absentArguments$1;
 Lkotlin/reflect/jvm/internal/KCallableImpl$_annotations$1;
 Lkotlin/reflect/jvm/internal/KCallableImpl$_parameters$1$1;
 Lkotlin/reflect/jvm/internal/KCallableImpl$_parameters$1$2;
@@ -32755,6 +32446,7 @@ Lkotlin/reflect/jvm/internal/KCallableImpl$_parameters$1;
 Lkotlin/reflect/jvm/internal/KCallableImpl$_returnType$1$1;
 Lkotlin/reflect/jvm/internal/KCallableImpl$_returnType$1;
 Lkotlin/reflect/jvm/internal/KCallableImpl$_typeParameters$1;
+Lkotlin/reflect/jvm/internal/KCallableImpl$parametersNeedMFVCFlattening$1;
 Lkotlin/reflect/jvm/internal/KCallableImpl;
 Lkotlin/reflect/jvm/internal/KClassImpl$Data$allMembers$2;
 Lkotlin/reflect/jvm/internal/KClassImpl$Data$allNonStaticMembers$2;
@@ -32813,7 +32505,6 @@ Lkotlin/reflect/jvm/internal/KTypeParameterOwnerImpl;
 Lkotlin/reflect/jvm/internal/KotlinReflectionInternalError;
 Lkotlin/reflect/jvm/internal/ModuleByClassLoaderKt;
 Lkotlin/reflect/jvm/internal/ReflectProperties$LazySoftVal;
-Lkotlin/reflect/jvm/internal/ReflectProperties$LazyVal;
 Lkotlin/reflect/jvm/internal/ReflectProperties$Val$1;
 Lkotlin/reflect/jvm/internal/ReflectProperties$Val;
 Lkotlin/reflect/jvm/internal/ReflectProperties;
@@ -32821,7 +32512,6 @@ Lkotlin/reflect/jvm/internal/ReflectionFactoryImpl;
 Lkotlin/reflect/jvm/internal/RuntimeTypeMapper;
 Lkotlin/reflect/jvm/internal/UtilKt;
 Lkotlin/reflect/jvm/internal/WeakClassLoaderBox;
-Lkotlin/reflect/jvm/internal/calls/BoundCaller;
 Lkotlin/reflect/jvm/internal/calls/Caller;
 Lkotlin/reflect/jvm/internal/calls/CallerImpl$Companion;
 Lkotlin/reflect/jvm/internal/calls/CallerImpl$Constructor;
@@ -32830,15 +32520,12 @@ Lkotlin/reflect/jvm/internal/calls/CallerImpl$FieldGetter;
 Lkotlin/reflect/jvm/internal/calls/CallerImpl$Method$Instance;
 Lkotlin/reflect/jvm/internal/calls/CallerImpl$Method;
 Lkotlin/reflect/jvm/internal/calls/CallerImpl;
-Lkotlin/reflect/jvm/internal/calls/InlineClassAwareCallerKt;
+Lkotlin/reflect/jvm/internal/calls/ValueClassAwareCaller$MultiFieldValueClassPrimaryConstructorCaller;
+Lkotlin/reflect/jvm/internal/calls/ValueClassAwareCaller;
+Lkotlin/reflect/jvm/internal/calls/ValueClassAwareCallerKt;
 Lkotlin/reflect/jvm/internal/impl/SpecialJvmAnnotations;
-Lkotlin/reflect/jvm/internal/impl/builtins/BuiltInsLoader$Companion$Instance$2;
-Lkotlin/reflect/jvm/internal/impl/builtins/BuiltInsLoader$Companion;
-Lkotlin/reflect/jvm/internal/impl/builtins/BuiltInsLoader;
 Lkotlin/reflect/jvm/internal/impl/builtins/BuiltInsPackageFragment;
 Lkotlin/reflect/jvm/internal/impl/builtins/CompanionObjectMapping;
-Lkotlin/reflect/jvm/internal/impl/builtins/DefaultBuiltIns$Companion;
-Lkotlin/reflect/jvm/internal/impl/builtins/DefaultBuiltIns;
 Lkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns$1;
 Lkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns$2;
 Lkotlin/reflect/jvm/internal/impl/builtins/KotlinBuiltIns$3;
@@ -32855,8 +32542,11 @@ Lkotlin/reflect/jvm/internal/impl/builtins/ReflectionTypes;
 Lkotlin/reflect/jvm/internal/impl/builtins/StandardNames$FqNames;
 Lkotlin/reflect/jvm/internal/impl/builtins/StandardNames;
 Lkotlin/reflect/jvm/internal/impl/builtins/functions/BuiltInFictitiousFunctionClassFactory;
-Lkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionClassKind$Companion;
-Lkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionClassKind;
+Lkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$Function;
+Lkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$KFunction;
+Lkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$KSuspendFunction;
+Lkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind$SuspendFunction;
+Lkotlin/reflect/jvm/internal/impl/builtins/functions/FunctionTypeKind;
 Lkotlin/reflect/jvm/internal/impl/builtins/jvm/CloneableClassScope$Companion;
 Lkotlin/reflect/jvm/internal/impl/builtins/jvm/CloneableClassScope;
 Lkotlin/reflect/jvm/internal/impl/builtins/jvm/JavaToKotlinClassMap$PlatformMutabilityMapping;
@@ -32876,6 +32566,7 @@ Lkotlin/reflect/jvm/internal/impl/builtins/jvm/JvmBuiltIns;
 Lkotlin/reflect/jvm/internal/impl/builtins/jvm/JvmBuiltInsCustomizer$cloneableType$2;
 Lkotlin/reflect/jvm/internal/impl/builtins/jvm/JvmBuiltInsCustomizer$createMockJavaIoSerializableType$mockJavaIoPackageFragment$1;
 Lkotlin/reflect/jvm/internal/impl/builtins/jvm/JvmBuiltInsCustomizer$createMockJavaIoSerializableType$superTypes$1;
+Lkotlin/reflect/jvm/internal/impl/builtins/jvm/JvmBuiltInsCustomizer$deprecationForSomeOfTheListMethods$1;
 Lkotlin/reflect/jvm/internal/impl/builtins/jvm/JvmBuiltInsCustomizer$getFunctions$2;
 Lkotlin/reflect/jvm/internal/impl/builtins/jvm/JvmBuiltInsCustomizer$notConsideredDeprecation$2;
 Lkotlin/reflect/jvm/internal/impl/builtins/jvm/JvmBuiltInsCustomizer;
@@ -32924,6 +32615,7 @@ Lkotlin/reflect/jvm/internal/impl/descriptors/Modality;
 Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleCapability;
 Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor$DefaultImpls;
 Lkotlin/reflect/jvm/internal/impl/descriptors/ModuleDescriptor;
+Lkotlin/reflect/jvm/internal/impl/descriptors/MultiFieldValueClassRepresentation;
 Lkotlin/reflect/jvm/internal/impl/descriptors/Named;
 Lkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses$MockClassDescriptor;
 Lkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses$classes$1;
@@ -32931,7 +32623,6 @@ Lkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses$packageFragments$1
 Lkotlin/reflect/jvm/internal/impl/descriptors/NotFoundClasses;
 Lkotlin/reflect/jvm/internal/impl/descriptors/PackageFragmentDescriptor;
 Lkotlin/reflect/jvm/internal/impl/descriptors/PackageFragmentProvider;
-Lkotlin/reflect/jvm/internal/impl/descriptors/PackageFragmentProviderImpl;
 Lkotlin/reflect/jvm/internal/impl/descriptors/PackageFragmentProviderKt;
 Lkotlin/reflect/jvm/internal/impl/descriptors/PackageFragmentProviderOptimized;
 Lkotlin/reflect/jvm/internal/impl/descriptors/PackageViewDescriptor;
@@ -32976,13 +32667,9 @@ Lkotlin/reflect/jvm/internal/impl/descriptors/annotations/AnnotationDescriptorIm
 Lkotlin/reflect/jvm/internal/impl/descriptors/annotations/Annotations$Companion$EMPTY$1;
 Lkotlin/reflect/jvm/internal/impl/descriptors/annotations/Annotations$Companion;
 Lkotlin/reflect/jvm/internal/impl/descriptors/annotations/Annotations;
-Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/AdditionalClassPartsProvider$None;
 Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/AdditionalClassPartsProvider;
 Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/ClassDescriptorFactory;
-Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/PlatformDependentDeclarationFilter$NoPlatformDependent;
 Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/PlatformDependentDeclarationFilter;
-Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/PlatformDependentTypeTransformer$None;
-Lkotlin/reflect/jvm/internal/impl/descriptors/deserialization/PlatformDependentTypeTransformer;
 Lkotlin/reflect/jvm/internal/impl/descriptors/impl/AbstractClassDescriptor$1$1;
 Lkotlin/reflect/jvm/internal/impl/descriptors/impl/AbstractClassDescriptor$1;
 Lkotlin/reflect/jvm/internal/impl/descriptors/impl/AbstractClassDescriptor$2;
@@ -33179,17 +32866,19 @@ Lkotlin/reflect/jvm/internal/impl/load/java/structure/JavaTypeParameterListOwner
 Lkotlin/reflect/jvm/internal/impl/load/java/structure/LightClassOriginKind;
 Lkotlin/reflect/jvm/internal/impl/load/java/typeEnhancement/JavaTypeEnhancement;
 Lkotlin/reflect/jvm/internal/impl/load/java/typeEnhancement/SignatureEnhancement;
-Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$AnnotationsContainerWithConstants;
 Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$loadAnnotationsAndInitializers$1$AnnotationVisitorForMethod;
 Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$loadAnnotationsAndInitializers$1$MemberAnnotationVisitor;
 Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$loadAnnotationsAndInitializers$1;
 Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader$storage$1;
 Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader;
 Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader$AnnotationsContainer;
+Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader$Companion;
 Lkotlin/reflect/jvm/internal/impl/load/kotlin/AbstractBinaryClassAnnotationLoader;
+Lkotlin/reflect/jvm/internal/impl/load/kotlin/AnnotationsContainerWithConstants;
 Lkotlin/reflect/jvm/internal/impl/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl$AbstractAnnotationArgumentVisitor;
 Lkotlin/reflect/jvm/internal/impl/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl$loadAnnotation$1;
 Lkotlin/reflect/jvm/internal/impl/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl;
+Lkotlin/reflect/jvm/internal/impl/load/kotlin/BinaryClassAnnotationAndConstantLoaderImplKt;
 Lkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializationComponentsForJava$Companion$ModuleData;
 Lkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializationComponentsForJava$Companion;
 Lkotlin/reflect/jvm/internal/impl/load/kotlin/DeserializationComponentsForJava;
@@ -33255,6 +32944,7 @@ Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Package;
 Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$PackageFragment$1;
 Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$PackageFragment;
 Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$1;
+Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property$Builder;
 Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$Property;
 Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$QualifiedNameTable$1;
 Lkotlin/reflect/jvm/internal/impl/metadata/ProtoBuf$QualifiedNameTable$QualifiedName$1;
@@ -33527,10 +33217,12 @@ Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializedPack
 Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializedPackageFragmentImpl$classDataFinder$1;
 Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializedPackageFragmentImpl$initialize$1;
 Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/DeserializedPackageFragmentImpl;
+Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/EnumEntriesDeserializationSupport;
 Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ErrorReporter$1;
 Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/ErrorReporter;
 Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/FlexibleTypeDeserializer$ThrowException;
 Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/FlexibleTypeDeserializer;
+Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/JvmEnumEntriesDeserializationSupport;
 Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/KotlinMetadataFinder;
 Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/LocalClassifierTypeSettings$Default;
 Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/LocalClassifierTypeSettings;
@@ -33557,8 +33249,6 @@ Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/TypeDeserializer
 Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/TypeDeserializer$typeAliasDescriptors$1;
 Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/TypeDeserializer;
 Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/builtins/BuiltInSerializerProtocol;
-Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/builtins/BuiltInsLoaderImpl$createPackageFragmentProvider$1;
-Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/builtins/BuiltInsLoaderImpl;
 Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/builtins/BuiltInsPackageFragmentImpl$Companion;
 Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/builtins/BuiltInsPackageFragmentImpl;
 Lkotlin/reflect/jvm/internal/impl/serialization/deserialization/builtins/BuiltInsResourceLoader;
@@ -33712,6 +33402,7 @@ Lkotlin/reflect/jvm/internal/impl/types/checker/NewKotlinTypeChecker;
 Lkotlin/reflect/jvm/internal/impl/types/checker/NewKotlinTypeCheckerImpl;
 Lkotlin/reflect/jvm/internal/impl/types/error/ErrorClassDescriptor;
 Lkotlin/reflect/jvm/internal/impl/types/error/ErrorEntity;
+Lkotlin/reflect/jvm/internal/impl/types/error/ErrorModuleDescriptor$builtIns$2;
 Lkotlin/reflect/jvm/internal/impl/types/error/ErrorModuleDescriptor;
 Lkotlin/reflect/jvm/internal/impl/types/error/ErrorPropertyDescriptor;
 Lkotlin/reflect/jvm/internal/impl/types/error/ErrorScope;
@@ -33752,6 +33443,7 @@ Lkotlin/reflect/jvm/internal/impl/utils/DFS$NodeHandler;
 Lkotlin/reflect/jvm/internal/impl/utils/DFS$Visited;
 Lkotlin/reflect/jvm/internal/impl/utils/DFS$VisitedWithSet;
 Lkotlin/reflect/jvm/internal/impl/utils/DFS;
+Lkotlin/reflect/jvm/internal/impl/utils/DeserializationHelpersKt;
 Lkotlin/reflect/jvm/internal/impl/utils/ExceptionUtilsKt;
 Lkotlin/reflect/jvm/internal/impl/utils/SmartList;
 Lkotlin/reflect/jvm/internal/impl/utils/SmartSet$Companion;
@@ -34082,7 +33774,6 @@ Lorg/conscrypt/HandshakeListener;
 Lorg/conscrypt/Java7ExtendedSSLSession;
 Lorg/conscrypt/Java8EngineSocket;
 Lorg/conscrypt/Java8ExtendedSSLSession$$ExternalSyntheticApiModelOutline0;
-Lorg/conscrypt/Java8ExtendedSSLSession$$ExternalSyntheticApiModelOutline1;
 Lorg/conscrypt/Java8ExtendedSSLSession;
 Lorg/conscrypt/KeyGeneratorImpl$AES;
 Lorg/conscrypt/KeyGeneratorImpl$HmacSHA1;
@@ -34142,10 +33833,11 @@ Lorg/conscrypt/OpenSSLX509CertificateFactory$ParsingException;
 Lorg/conscrypt/OpenSSLX509CertificateFactory;
 Lorg/conscrypt/PeerInfoProvider$1;
 Lorg/conscrypt/PeerInfoProvider;
+Lorg/conscrypt/Platform$$ExternalSyntheticApiModelOutline0;
+Lorg/conscrypt/Platform$$ExternalSyntheticApiModelOutline1;
 Lorg/conscrypt/Platform$$ExternalSyntheticApiModelOutline2;
 Lorg/conscrypt/Platform$$ExternalSyntheticApiModelOutline3;
-Lorg/conscrypt/Platform$$ExternalSyntheticApiModelOutline4;
-Lorg/conscrypt/Platform$$ExternalSyntheticApiModelOutline5;
+Lorg/conscrypt/Platform$$ExternalSyntheticApiModelOutline6;
 Lorg/conscrypt/Platform;
 Lorg/conscrypt/Preconditions;
 Lorg/conscrypt/SSLNullSession$DefaultHolder;
@@ -34182,6 +33874,7 @@ Lorg/signal/benchmark/setup/TestMessages;
 Lorg/signal/benchmark/setup/TestUsers;
 Lorg/signal/core/util/Base64;
 Lorg/signal/core/util/Base64Tools;
+Lorg/signal/core/util/BaseSerializer;
 Lorg/signal/core/util/Bitmask;
 Lorg/signal/core/util/BreakIteratorCompat$AndroidIcuBreakIterator$$ExternalSyntheticApiModelOutline0;
 Lorg/signal/core/util/BreakIteratorCompat$AndroidIcuBreakIterator$$ExternalSyntheticApiModelOutline1;
@@ -34220,6 +33913,9 @@ Lorg/signal/core/util/MemoryTracker$AppHeapUsage;
 Lorg/signal/core/util/MemoryTracker;
 Lorg/signal/core/util/OptionalExtensionsKt;
 Lorg/signal/core/util/PendingIntentFlags;
+Lorg/signal/core/util/ResettableLazy$Companion;
+Lorg/signal/core/util/ResettableLazy;
+Lorg/signal/core/util/ResettableLazyKt;
 Lorg/signal/core/util/SQLiteDatabaseExtensionsKt;
 Lorg/signal/core/util/SelectBuilderPart1;
 Lorg/signal/core/util/SelectBuilderPart2;
@@ -34227,7 +33923,6 @@ Lorg/signal/core/util/SelectBuilderPart3;
 Lorg/signal/core/util/SelectBuilderPart4a;
 Lorg/signal/core/util/SelectBuilderPart4b;
 Lorg/signal/core/util/SelectBuilderPart5;
-Lorg/signal/core/util/Serializer;
 Lorg/signal/core/util/SetUtil;
 Lorg/signal/core/util/ShakeDetector$Listener;
 Lorg/signal/core/util/ShakeDetector$SamplePool;
@@ -34328,8 +34023,13 @@ Lorg/signal/core/util/tracing/TrackEvent$Type$Companion;
 Lorg/signal/core/util/tracing/TrackEvent$Type;
 Lorg/signal/core/util/tracing/TrackEvent;
 Lorg/signal/devicetransfer/TransferStatus;
+Lorg/signal/donations/GooglePayApi$Configuration;
+Lorg/signal/donations/StripeApi$Companion;
+Lorg/signal/donations/StripeApi$Configuration;
 Lorg/signal/donations/StripeApi$PaymentIntentFetcher;
 Lorg/signal/donations/StripeApi$SetupIntentHelper;
+Lorg/signal/donations/StripeApi$objectMapper$1;
+Lorg/signal/donations/StripeApi;
 Lorg/signal/glide/Log$Provider$1;
 Lorg/signal/glide/Log$Provider;
 Lorg/signal/glide/SignalGlideCodecs;
@@ -34361,10 +34061,10 @@ Lorg/signal/libsignal/protocol/ecc/ECKeyPair;
 Lorg/signal/libsignal/protocol/ecc/ECPrivateKey$$ExternalSyntheticLambda0;
 Lorg/signal/libsignal/protocol/ecc/ECPrivateKey$$ExternalSyntheticLambda1;
 Lorg/signal/libsignal/protocol/ecc/ECPrivateKey$$ExternalSyntheticLambda2;
-Lorg/signal/libsignal/protocol/ecc/ECPrivateKey$$ExternalSyntheticLambda3;
+Lorg/signal/libsignal/protocol/ecc/ECPrivateKey$$ExternalSyntheticLambda4;
 Lorg/signal/libsignal/protocol/ecc/ECPrivateKey;
-Lorg/signal/libsignal/protocol/ecc/ECPublicKey$$ExternalSyntheticLambda1;
 Lorg/signal/libsignal/protocol/ecc/ECPublicKey$$ExternalSyntheticLambda2;
+Lorg/signal/libsignal/protocol/ecc/ECPublicKey$$ExternalSyntheticLambda4;
 Lorg/signal/libsignal/protocol/ecc/ECPublicKey;
 Lorg/signal/libsignal/protocol/groups/state/SenderKeyStore;
 Lorg/signal/libsignal/protocol/kem/KEMKeyPair;
@@ -34376,14 +34076,14 @@ Lorg/signal/libsignal/protocol/logging/SignalProtocolLogger;
 Lorg/signal/libsignal/protocol/logging/SignalProtocolLoggerProvider;
 Lorg/signal/libsignal/protocol/state/IdentityKeyStore;
 Lorg/signal/libsignal/protocol/state/KyberPreKeyRecord$$ExternalSyntheticLambda1;
-Lorg/signal/libsignal/protocol/state/KyberPreKeyRecord$$ExternalSyntheticLambda2;
 Lorg/signal/libsignal/protocol/state/KyberPreKeyRecord$$ExternalSyntheticLambda3;
+Lorg/signal/libsignal/protocol/state/KyberPreKeyRecord$$ExternalSyntheticLambda4;
 Lorg/signal/libsignal/protocol/state/KyberPreKeyRecord;
 Lorg/signal/libsignal/protocol/state/KyberPreKeyStore;
 Lorg/signal/libsignal/protocol/state/PreKeyStore;
 Lorg/signal/libsignal/protocol/state/SessionStore;
 Lorg/signal/libsignal/protocol/state/SignalProtocolStore;
-Lorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda2;
+Lorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda0;
 Lorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda3;
 Lorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda4;
 Lorg/signal/libsignal/protocol/state/SignedPreKeyRecord$$ExternalSyntheticLambda5;
@@ -34395,7 +34095,7 @@ Lorg/signal/libsignal/protocol/util/Medium;
 Lorg/signal/libsignal/protocol/util/Pair;
 Lorg/signal/libsignal/usernames/BaseUsernameException;
 Lorg/signal/libsignal/zkgroup/InvalidInputException;
-Lorg/signal/libsignal/zkgroup/ServerPublicParams$$ExternalSyntheticLambda0;
+Lorg/signal/libsignal/zkgroup/ServerPublicParams$$ExternalSyntheticLambda1;
 Lorg/signal/libsignal/zkgroup/ServerPublicParams;
 Lorg/signal/libsignal/zkgroup/VerificationFailedException;
 Lorg/signal/libsignal/zkgroup/auth/ClientZkAuthOperations;
@@ -34410,13 +34110,11 @@ Lorg/signal/libsignal/zkgroup/profiles/ProfileKey;
 Lorg/signal/libsignal/zkgroup/profiles/ProfileKeyVersion;
 Lorg/signal/libsignal/zkgroup/receipts/ClientZkReceiptOperations;
 Lorg/signal/paging/BufferedPagingController$$ExternalSyntheticLambda1;
-Lorg/signal/paging/BufferedPagingController$$ExternalSyntheticLambda2;
 Lorg/signal/paging/BufferedPagingController$$ExternalSyntheticLambda3;
 Lorg/signal/paging/BufferedPagingController;
 Lorg/signal/paging/CompressedList;
 Lorg/signal/paging/DataStatus;
 Lorg/signal/paging/DataStream;
-Lorg/signal/paging/FixedSizePagingController$$ExternalSyntheticLambda0;
 Lorg/signal/paging/FixedSizePagingController$$ExternalSyntheticLambda2;
 Lorg/signal/paging/FixedSizePagingController$$ExternalSyntheticLambda3;
 Lorg/signal/paging/FixedSizePagingController;
@@ -34560,13 +34258,14 @@ Lorg/thoughtcrime/securesms/avatar/Avatars$DefaultAvatar;
 Lorg/thoughtcrime/securesms/avatar/Avatars$ForegroundColor;
 Lorg/thoughtcrime/securesms/avatar/Avatars;
 Lorg/thoughtcrime/securesms/avatar/TextAvatarDrawable;
-Lorg/thoughtcrime/securesms/avatar/view/AvatarView$WhenMappings;
 Lorg/thoughtcrime/securesms/avatar/view/AvatarView;
 Lorg/thoughtcrime/securesms/backup/RestoreState$Companion;
 Lorg/thoughtcrime/securesms/backup/RestoreState$Serializer;
 Lorg/thoughtcrime/securesms/backup/RestoreState;
 Lorg/thoughtcrime/securesms/backup/v2/BackupFrequency$Serializer;
 Lorg/thoughtcrime/securesms/backup/v2/BackupFrequency;
+Lorg/thoughtcrime/securesms/backup/v2/MessageBackupTier$Serializer;
+Lorg/thoughtcrime/securesms/backup/v2/MessageBackupTier;
 Lorg/thoughtcrime/securesms/badges/BadgeImageView;
 Lorg/thoughtcrime/securesms/badges/gifts/GiftMessageView$Callback;
 Lorg/thoughtcrime/securesms/badges/gifts/OpenableGift;
@@ -34583,11 +34282,6 @@ Lorg/thoughtcrime/securesms/blurhash/BlurHashModelLoader$Factory;
 Lorg/thoughtcrime/securesms/blurhash/BlurHashResourceDecoder;
 Lorg/thoughtcrime/securesms/calls/log/CallLogFragment$Callback;
 Lorg/thoughtcrime/securesms/color/MaterialColor$UnknownColorException;
-Lorg/thoughtcrime/securesms/components/AlbumThumbnailView$$ExternalSyntheticLambda0;
-Lorg/thoughtcrime/securesms/components/AlbumThumbnailView$$ExternalSyntheticLambda1;
-Lorg/thoughtcrime/securesms/components/AlbumThumbnailView$$ExternalSyntheticLambda2;
-Lorg/thoughtcrime/securesms/components/AlbumThumbnailView$$ExternalSyntheticLambda3;
-Lorg/thoughtcrime/securesms/components/AlbumThumbnailView;
 Lorg/thoughtcrime/securesms/components/AlertView;
 Lorg/thoughtcrime/securesms/components/AnimatingToggle;
 Lorg/thoughtcrime/securesms/components/AudioView$$ExternalSyntheticLambda0;
@@ -34604,24 +34298,15 @@ Lorg/thoughtcrime/securesms/components/AvatarImageView$RecipientContactPhoto;
 Lorg/thoughtcrime/securesms/components/AvatarImageView$RedownloadRequestListener;
 Lorg/thoughtcrime/securesms/components/AvatarImageView;
 Lorg/thoughtcrime/securesms/components/ComposeText$1;
-Lorg/thoughtcrime/securesms/components/ComposeText$CommitContentListener;
 Lorg/thoughtcrime/securesms/components/ComposeText$CursorPositionChangedListener;
 Lorg/thoughtcrime/securesms/components/ComposeText$QueryStart;
 Lorg/thoughtcrime/securesms/components/ComposeText$StylingChangedListener;
 Lorg/thoughtcrime/securesms/components/ComposeText;
 Lorg/thoughtcrime/securesms/components/ComposeTextStyleWatcher;
-Lorg/thoughtcrime/securesms/components/ConversationItemFooter$$ExternalSyntheticLambda0;
+Lorg/thoughtcrime/securesms/components/ConversationItemFooter$$ExternalSyntheticLambda1;
 Lorg/thoughtcrime/securesms/components/ConversationItemFooter$$ExternalSyntheticLambda2;
 Lorg/thoughtcrime/securesms/components/ConversationItemFooter$OnTouchDelegateChangedListener;
 Lorg/thoughtcrime/securesms/components/ConversationItemFooter;
-Lorg/thoughtcrime/securesms/components/ConversationItemThumbnail$Companion;
-Lorg/thoughtcrime/securesms/components/ConversationItemThumbnail;
-Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState$Creator;
-Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;
-Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$Creator;
-Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState$Creator;
-Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;
-Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;
 Lorg/thoughtcrime/securesms/components/ConversationScrollToView;
 Lorg/thoughtcrime/securesms/components/ConversationSearchBottomBar;
 Lorg/thoughtcrime/securesms/components/CornerMask;
@@ -34631,11 +34316,11 @@ Lorg/thoughtcrime/securesms/components/ExpirationTimerView;
 Lorg/thoughtcrime/securesms/components/FromTextView;
 Lorg/thoughtcrime/securesms/components/HidingLinearLayout;
 Lorg/thoughtcrime/securesms/components/InputAwareConstraintLayout;
+Lorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda0;
+Lorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda1;
+Lorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda2;
+Lorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda3;
 Lorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda4;
-Lorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda5;
-Lorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda6;
-Lorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda7;
-Lorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda8;
 Lorg/thoughtcrime/securesms/components/InputPanel$MediaListener;
 Lorg/thoughtcrime/securesms/components/InputPanel$RecordTime;
 Lorg/thoughtcrime/securesms/components/InputPanel$SlideToCancel;
@@ -34672,7 +34357,6 @@ Lorg/thoughtcrime/securesms/components/QuoteView$MessageType;
 Lorg/thoughtcrime/securesms/components/QuoteView;
 Lorg/thoughtcrime/securesms/components/RatingManager;
 Lorg/thoughtcrime/securesms/components/RecyclerViewFastScroller$FastScrollAdapter;
-Lorg/thoughtcrime/securesms/components/RecyclerViewParentTransitionController;
 Lorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$2;
 Lorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$3;
 Lorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$4;
@@ -34685,13 +34369,6 @@ Lorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$scrollPositionRe
 Lorg/thoughtcrime/securesms/components/ScrollToPositionDelegate;
 Lorg/thoughtcrime/securesms/components/SendButton;
 Lorg/thoughtcrime/securesms/components/SharedContactView$EventListener;
-Lorg/thoughtcrime/securesms/components/ThumbnailView$$ExternalSyntheticBackport0;
-Lorg/thoughtcrime/securesms/components/ThumbnailView$$ExternalSyntheticBackport1;
-Lorg/thoughtcrime/securesms/components/ThumbnailView$$ExternalSyntheticBackport2;
-Lorg/thoughtcrime/securesms/components/ThumbnailView$CancelClickDispatcher;
-Lorg/thoughtcrime/securesms/components/ThumbnailView$DownloadClickDispatcher;
-Lorg/thoughtcrime/securesms/components/ThumbnailView$ThumbnailClickDispatcher;
-Lorg/thoughtcrime/securesms/components/ThumbnailView;
 Lorg/thoughtcrime/securesms/components/TypingIndicatorView;
 Lorg/thoughtcrime/securesms/components/TypingStatusRepository;
 Lorg/thoughtcrime/securesms/components/ViewBinderDelegate$1;
@@ -34714,8 +34391,6 @@ Lorg/thoughtcrime/securesms/components/emoji/EmojiProvider;
 Lorg/thoughtcrime/securesms/components/emoji/EmojiSpan;
 Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView$$ExternalSyntheticLambda1;
-Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView$$ExternalSyntheticLambda2;
-Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView$$ExternalSyntheticLambda3;
 Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;
 Lorg/thoughtcrime/securesms/components/emoji/EmojiToggle$1;
 Lorg/thoughtcrime/securesms/components/emoji/EmojiToggle;
@@ -34733,8 +34408,6 @@ Lorg/thoughtcrime/securesms/components/emoji/parsing/EmojiTree$EmojiTreeNode;
 Lorg/thoughtcrime/securesms/components/emoji/parsing/EmojiTree$Matches;
 Lorg/thoughtcrime/securesms/components/emoji/parsing/EmojiTree;
 Lorg/thoughtcrime/securesms/components/emoji/parsing/Fitzpatrick;
-Lorg/thoughtcrime/securesms/components/mention/MentionAnnotation$$ExternalSyntheticLambda1;
-Lorg/thoughtcrime/securesms/components/mention/MentionAnnotation;
 Lorg/thoughtcrime/securesms/components/mention/MentionDeleter;
 Lorg/thoughtcrime/securesms/components/mention/MentionRenderer$MultiLineMentionRenderer;
 Lorg/thoughtcrime/securesms/components/mention/MentionRenderer$SingleLineMentionRenderer;
@@ -34767,6 +34440,8 @@ Lorg/thoughtcrime/securesms/components/reminder/UsernameOutOfSyncReminder;
 Lorg/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesRepository$getProfiles$1;
 Lorg/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesRepository;
 Lorg/thoughtcrime/securesms/components/settings/app/subscription/DonationPaymentComponent;
+Lorg/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate$$ExternalSyntheticLambda0;
+Lorg/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate$handleInAppPaymentSheets$2;
 Lorg/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate;
 Lorg/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationRepository;
 Lorg/thoughtcrime/securesms/components/settings/app/subscription/errors/UnexpectedSubscriptionCancellation$Companion;
@@ -34779,22 +34454,6 @@ Lorg/thoughtcrime/securesms/components/spoiler/SpoilerRendererDelegate$$External
 Lorg/thoughtcrime/securesms/components/spoiler/SpoilerRendererDelegate$1$onViewAttachedToWindow$1;
 Lorg/thoughtcrime/securesms/components/spoiler/SpoilerRendererDelegate$1;
 Lorg/thoughtcrime/securesms/components/spoiler/SpoilerRendererDelegate;
-Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Companion;
-Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Mode;
-Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Progress$Companion;
-Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Progress;
-Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setCancelClickListener$1;
-Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setClickable$1;
-Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setFocusable$1;
-Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setShowSecondaryText$1;
-Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setSlides$2;
-Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setTransferClickListener$1;
-Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setVisible$1;
-Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;
-Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;
-Lorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView$Companion;
-Lorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView$State;
-Lorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView;
 Lorg/thoughtcrime/securesms/components/voice/RetryableInitAudioSink$Companion;
 Lorg/thoughtcrime/securesms/components/voice/RetryableInitAudioSink;
 Lorg/thoughtcrime/securesms/components/voice/VoiceNoteMediaController$1;
@@ -34806,7 +34465,7 @@ Lorg/thoughtcrime/securesms/components/voice/VoiceNoteMediaController;
 Lorg/thoughtcrime/securesms/components/voice/VoiceNoteMediaControllerOwner;
 Lorg/thoughtcrime/securesms/components/voice/VoiceNoteMediaNotificationProvider$Companion;
 Lorg/thoughtcrime/securesms/components/voice/VoiceNoteMediaNotificationProvider;
-Lorg/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService$$ExternalSyntheticLambda0;
+Lorg/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService$$ExternalSyntheticLambda1;
 Lorg/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService$KeyClearedReceiver$1;
 Lorg/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService$KeyClearedReceiver;
 Lorg/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService$MediaSessionServiceListener;
@@ -34901,13 +34560,12 @@ Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchPagedDataSource;
 Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchPagedDataSourceRepository;
 Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchRepository;
 Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchState;
-Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel$$ExternalSyntheticLambda2;
+Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel$$ExternalSyntheticLambda6;
 Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel$Factory;
 Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel$controller$1;
 Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel$data$1;
 Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel$safetyNumberRepository$2;
 Lorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel;
-Lorg/thoughtcrime/securesms/contacts/paged/collections/ContactSearchIterator;
 Lorg/thoughtcrime/securesms/contacts/sync/ContactDiscovery;
 Lorg/thoughtcrime/securesms/contactshare/Contact;
 Lorg/thoughtcrime/securesms/contactshare/ContactUtil;
@@ -34918,15 +34576,11 @@ Lorg/thoughtcrime/securesms/conversation/ConversationAdapterBridge;
 Lorg/thoughtcrime/securesms/conversation/ConversationBottomSheetCallback;
 Lorg/thoughtcrime/securesms/conversation/ConversationData$MessageRequestData;
 Lorg/thoughtcrime/securesms/conversation/ConversationData;
-Lorg/thoughtcrime/securesms/conversation/ConversationHeaderView$$ExternalSyntheticLambda3;
-Lorg/thoughtcrime/securesms/conversation/ConversationHeaderView$FallbackPhotoProvider;
-Lorg/thoughtcrime/securesms/conversation/ConversationHeaderView;
 Lorg/thoughtcrime/securesms/conversation/ConversationIntents$Args;
 Lorg/thoughtcrime/securesms/conversation/ConversationIntents$Builder;
 Lorg/thoughtcrime/securesms/conversation/ConversationIntents$ConversationScreenType;
 Lorg/thoughtcrime/securesms/conversation/ConversationIntents;
-Lorg/thoughtcrime/securesms/conversation/ConversationItem$$ExternalSyntheticLambda4;
-Lorg/thoughtcrime/securesms/conversation/ConversationItem$$ExternalSyntheticLambda7;
+Lorg/thoughtcrime/securesms/conversation/ConversationItem$$ExternalSyntheticLambda14;
 Lorg/thoughtcrime/securesms/conversation/ConversationItem$1;
 Lorg/thoughtcrime/securesms/conversation/ConversationItem$AttachmentDownloadClickListener;
 Lorg/thoughtcrime/securesms/conversation/ConversationItem$ClickListener;
@@ -34934,13 +34588,13 @@ Lorg/thoughtcrime/securesms/conversation/ConversationItem$DoubleTapEditTouchList
 Lorg/thoughtcrime/securesms/conversation/ConversationItem$GiftMessageViewCallback;
 Lorg/thoughtcrime/securesms/conversation/ConversationItem$LinkPreviewClickListener;
 Lorg/thoughtcrime/securesms/conversation/ConversationItem$PassthroughClickListener;
+Lorg/thoughtcrime/securesms/conversation/ConversationItem$PaymentTombstoneClickListener;
 Lorg/thoughtcrime/securesms/conversation/ConversationItem$PlayVideoClickListener;
 Lorg/thoughtcrime/securesms/conversation/ConversationItem$QuotedIndicatorClickListener;
 Lorg/thoughtcrime/securesms/conversation/ConversationItem$ScheduledIndicatorClickListener;
 Lorg/thoughtcrime/securesms/conversation/ConversationItem$SharedContactClickListener;
 Lorg/thoughtcrime/securesms/conversation/ConversationItem$SharedContactEventListener;
 Lorg/thoughtcrime/securesms/conversation/ConversationItem$SlideClickPassthroughListener;
-Lorg/thoughtcrime/securesms/conversation/ConversationItem$ThumbnailClickListener;
 Lorg/thoughtcrime/securesms/conversation/ConversationItem$TouchDelegateChangedListener;
 Lorg/thoughtcrime/securesms/conversation/ConversationItem$UrlClickListener;
 Lorg/thoughtcrime/securesms/conversation/ConversationItem$ViewOnceMessageClickListener;
@@ -34948,11 +34602,6 @@ Lorg/thoughtcrime/securesms/conversation/ConversationItem;
 Lorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble$$ExternalSyntheticBackport0;
 Lorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble$$ExternalSyntheticLambda2;
 Lorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble;
-Lorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode$Condensed;
-Lorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode$Detailed;
-Lorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode$EditHistory;
-Lorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode$Standard;
-Lorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;
 Lorg/thoughtcrime/securesms/conversation/ConversationMessage$ComputedProperties;
 Lorg/thoughtcrime/securesms/conversation/ConversationMessage$ConversationMessageFactory;
 Lorg/thoughtcrime/securesms/conversation/ConversationMessage;
@@ -34968,18 +34617,15 @@ Lorg/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter$Ev
 Lorg/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter;
 Lorg/thoughtcrime/securesms/conversation/ConversationTitleView$$ExternalSyntheticLambda3;
 Lorg/thoughtcrime/securesms/conversation/ConversationTitleView;
-Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$$ExternalSyntheticLambda0;
-Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$$ExternalSyntheticLambda1;
-Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$GroupDataManager$$ExternalSyntheticLambda1;
+Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$$ExternalSyntheticLambda20;
+Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$$ExternalSyntheticLambda21;
+Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$GroupDataManager$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$GroupDataManager;
 Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$InternalClickListener;
 Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$PresentOnChange;
 Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$RecipientObserverManager;
 Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem$UpdateObserver;
 Lorg/thoughtcrime/securesms/conversation/ConversationUpdateItem;
-Lorg/thoughtcrime/securesms/conversation/MarkReadHelper$$ExternalSyntheticLambda0;
-Lorg/thoughtcrime/securesms/conversation/MarkReadHelper$$ExternalSyntheticLambda1;
-Lorg/thoughtcrime/securesms/conversation/MarkReadHelper$$ExternalSyntheticLambda3;
 Lorg/thoughtcrime/securesms/conversation/MarkReadHelper;
 Lorg/thoughtcrime/securesms/conversation/MessageSendType$Companion;
 Lorg/thoughtcrime/securesms/conversation/MessageSendType$SignalMessageSendType$Creator;
@@ -34989,7 +34635,7 @@ Lorg/thoughtcrime/securesms/conversation/MessageSendType;
 Lorg/thoughtcrime/securesms/conversation/MessageStyler$Result$Companion;
 Lorg/thoughtcrime/securesms/conversation/MessageStyler$Result;
 Lorg/thoughtcrime/securesms/conversation/MessageStyler;
-Lorg/thoughtcrime/securesms/conversation/ReenableScheduledMessagesDialogFragment$Companion$$ExternalSyntheticApiModelOutline0;
+Lorg/thoughtcrime/securesms/conversation/ReenableScheduledMessagesDialogFragment$$ExternalSyntheticApiModelOutline0;
 Lorg/thoughtcrime/securesms/conversation/ScheduleMessageDialogCallback;
 Lorg/thoughtcrime/securesms/conversation/ScheduleMessageTimePickerBottomSheet$ScheduleCallback;
 Lorg/thoughtcrime/securesms/conversation/ScheduledMessagesRepository;
@@ -35010,7 +34656,6 @@ Lorg/thoughtcrime/securesms/conversation/colors/ChatColors$Id$Auto;
 Lorg/thoughtcrime/securesms/conversation/colors/ChatColors$Id$BuiltIn;
 Lorg/thoughtcrime/securesms/conversation/colors/ChatColors$Id$Companion$CREATOR$1;
 Lorg/thoughtcrime/securesms/conversation/colors/ChatColors$Id$Companion;
-Lorg/thoughtcrime/securesms/conversation/colors/ChatColors$Id$NotSet;
 Lorg/thoughtcrime/securesms/conversation/colors/ChatColors$Id;
 Lorg/thoughtcrime/securesms/conversation/colors/ChatColors$LinearGradient$Creator;
 Lorg/thoughtcrime/securesms/conversation/colors/ChatColors$LinearGradient;
@@ -35019,22 +34664,18 @@ Lorg/thoughtcrime/securesms/conversation/colors/ChatColorsPalette$Bubbles;
 Lorg/thoughtcrime/securesms/conversation/colors/Colorizable;
 Lorg/thoughtcrime/securesms/conversation/colors/Colorizer$onGroupMembershipChanged$$inlined$sortedBy$1;
 Lorg/thoughtcrime/securesms/conversation/colors/Colorizer;
-Lorg/thoughtcrime/securesms/conversation/colors/NameColor;
 Lorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer$edgeEffectFactory$1;
 Lorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer$itemDecoration$1;
 Lorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer$scrollListener$1;
 Lorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;
 Lorg/thoughtcrime/securesms/conversation/drafts/DraftRepository$ShareOrDraftData;
 Lorg/thoughtcrime/securesms/conversation/drafts/DraftViewModel;
-Lorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator$$ExternalSyntheticLambda1;
 Lorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator$Companion;
 Lorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator;
 Lorg/thoughtcrime/securesms/conversation/mutiselect/Multiselect;
 Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectCollection$Companion;
 Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectCollection$Single;
 Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectCollection;
-Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration$Difference;
-Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration$WhenMappings;
 Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;
 Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectPart$Attachments;
 Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectPart$Text;
@@ -35066,6 +34707,14 @@ Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivity$special$$inline
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivity$special$$inlined$viewModels$default$6;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivity$stripeRepository$2;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;
+Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$$ExternalSyntheticLambda10;
+Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$$ExternalSyntheticLambda11;
+Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$$ExternalSyntheticLambda12;
+Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$$ExternalSyntheticLambda5;
+Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$$ExternalSyntheticLambda6;
+Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$$ExternalSyntheticLambda7;
+Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$$ExternalSyntheticLambda8;
+Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$$ExternalSyntheticLambda9;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$Callbacks;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$Companion;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$ContactShareEditor;
@@ -35076,14 +34725,6 @@ Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$SelectContact;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$SelectFile;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$SelectLocation;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$cameraLauncher$1;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$contactShareLauncher$1;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$gifSearchLauncher$1;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$mediaGalleryLauncher$1;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$mediaSelectionLauncher$1;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$selectContactLauncher$1;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$selectFileLauncher$1;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts$selectLocationLauncher$1;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivityResultContracts;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$$ExternalSyntheticLambda1;
@@ -35092,26 +34733,19 @@ Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$$ExternalSynth
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$$ExternalSyntheticLambda6;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$$ExternalSyntheticLambda7;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$Companion;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder$$ExternalSyntheticLambda0;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder$$ExternalSyntheticLambda1;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder$$ExternalSyntheticLambda2;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder$gestureDetector$1;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$IncomingMediaViewHolder;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$OnScrollStateChangedListener;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ThreadHeaderViewHolder$$ExternalSyntheticLambda0;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ThreadHeaderViewHolder;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationBannerView$reminderStub$2;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationBannerView$reviewBannerStub$2;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationBannerView$unverifiedBannerStub$2;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationBannerView$voiceNotePlayerStub$2;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationBannerView;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda11;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda12;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda13;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda27;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda2;
+Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda15;
+Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda16;
+Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda26;
+Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda3;
+Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda4;
+Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda8;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ActionModeCallback;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ActivityResultCallbacks;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$AttachmentManagerListener;
@@ -35122,8 +34756,6 @@ Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ConversationOpt
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$DataObserver;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$InputPanelMediaListener;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollDateHeaderHelper;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener$$ExternalSyntheticLambda0;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener$onScrolled$1;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ThreadHeaderMarginDecoration;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ToolbarDependentMarginListener;
@@ -35150,13 +34782,9 @@ Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$linkPreviewView
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$messageRequestRepository$2;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$messageRequestViewModel$2;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$motionEventRelay$2;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$moveToStartPosition$1;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$1;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$2;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$3;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4$$ExternalSyntheticLambda0;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4$invoke$lambda$1$$inlined$doAfterNextLayout$1$1;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4$invoke$lambda$1$$inlined$doAfterNextLayout$1;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$onViewCreated$$inlined$createActivityViewModel$1;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$onViewCreated$1;
@@ -35165,7 +34793,6 @@ Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$onViewCreated$c
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$presentStoryRing$1;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$reactionDelegate$2;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$recentEmojis$2;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$registerForResults$1;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$scheduledMessagesStub$2;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$searchViewModel$2;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$special$$inlined$activityViewModels$default$1;
@@ -35186,9 +34813,6 @@ Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$stickerViewMode
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$viewModel$2;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$voiceNotePlayerListener$2;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$DateHeaderViewHolder;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$UnreadState$CompleteUnreadState;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$UnreadState$InitialUnreadState;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$UnreadState$None;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$UnreadState;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;
@@ -35199,8 +34823,8 @@ Lorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$grou
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$groupRecord$2$1;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository$groupRecord$2;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationRecipientRepository;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda12;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda8;
+Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda19;
+Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda5;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$Companion;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$MessageCounts;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$getMessageCounts$1;
@@ -35218,7 +34842,6 @@ Lorg/thoughtcrime/securesms/conversation/v2/ConversationTooltips$special$$inline
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationTooltips$special$$inlined$viewModels$default$5;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationTooltips;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationTypingIndicatorAdapter$State;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationTypingIndicatorAdapter$ViewHolder;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationTypingIndicatorAdapter;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$10;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$11;
@@ -35249,7 +34872,6 @@ Lorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$chatColorsData
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$chatColorsDataObservable$2;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$groupMemberServiceIds$1;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$groupMemberServiceIds$2;
-Lorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$setShowScrollButtonsForScrollPosition$1;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$storyRingState$1;
 Lorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;
 Lorg/thoughtcrime/securesms/conversation/v2/DisabledInputView$inflater$2;
@@ -35267,7 +34889,6 @@ Lorg/thoughtcrime/securesms/conversation/v2/computed/FormattedDate;
 Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource$Companion;
 Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource$threadRecipient$2;
 Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource;
-Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationElementKey$Companion;
 Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationElementKey;
 Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationMessageElement;
 Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationUpdate;
@@ -35310,45 +34931,10 @@ Lorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsD
 Lorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsItemDecoration$onDraw$$inlined$filterIsInstance$1;
 Lorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsItemDecoration$onDraw$1;
 Lorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsItemDecoration;
-Lorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;
 Lorg/thoughtcrime/securesms/conversation/v2/items/InteractiveConversationElement;
 Lorg/thoughtcrime/securesms/conversation/v2/items/ShrinkWrapLinearLayout;
 Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationContext;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout$OnDispatchTouchEventListener;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout$OnMeasureListener;
 Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$Companion;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridgeKt;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda0;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda1;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda2;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda3;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda4;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda5;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda6;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda9;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$Companion;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$PassthroughClickListener;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$ReactionMeasureListener;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$bodyBubbleDrawable$1;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$footerDrawable$1;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$gestureDetector$1;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$replyDelegate$1;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$senderDrawable$1;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme$getBodyTextColor$1;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme$getBodyTextColor$2;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemUtils;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate$DisplayState;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2OnDispatchTouchEventListener$$ExternalSyntheticLambda1;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2OnDispatchTouchEventListener$Companion;
-Lorg/thoughtcrime/securesms/conversation/v2/items/V2OnDispatchTouchEventListener;
 Lorg/thoughtcrime/securesms/conversation/v2/items/V2Payload;
 Lorg/thoughtcrime/securesms/conversationlist/ClearFilterViewHolder$OnClearFilterClickListener;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationFilterBehavior$Callback;
@@ -35364,39 +34950,39 @@ Lorg/thoughtcrime/securesms/conversationlist/ConversationListAdapter;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListArchiveItemDecoration;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListDataSource$UnarchivedConversationListDataSource;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListDataSource;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda10;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda26;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda28;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda29;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda32;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda34;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda35;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda36;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda39;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda0;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda16;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda17;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda18;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda19;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda1;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda20;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda21;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda22;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda23;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda24;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda2;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda3;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda43;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda44;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda45;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda47;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda46;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda48;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda49;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda4;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda50;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda51;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda53;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda55;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda57;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda52;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda54;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda56;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda58;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda5;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda64;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda65;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda69;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda6;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda70;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda71;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda72;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda73;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda74;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda75;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda76;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda77;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda78;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda79;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda7;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda80;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda8;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$$ExternalSyntheticLambda9;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$1;
@@ -35410,11 +34996,11 @@ Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$ArchiveLis
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$Callback;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment$ContactSearchClickCallbacks;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda10;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda13;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda2;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda5;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda6;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda3;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda4;
+Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem$$ExternalSyntheticLambda7;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListItem;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListItemAnimator;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListSearchAdapter$$ExternalSyntheticLambda0;
@@ -35444,7 +35030,6 @@ Lorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$Factory;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$conversationsState$1;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$filterRequestState$1;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$megaphoneState$1;
-Lorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$onMegaphoneCompleted$1;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$onVisible$1$1;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$pagedData$1;
 Lorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel$pagedData$2;
@@ -35504,10 +35089,10 @@ Lorg/thoughtcrime/securesms/crypto/ReentrantSessionLock$$ExternalSyntheticLambda
 Lorg/thoughtcrime/securesms/crypto/ReentrantSessionLock;
 Lorg/thoughtcrime/securesms/crypto/SenderKeyUtil;
 Lorg/thoughtcrime/securesms/crypto/storage/PreKeyMetadataStore;
+Lorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$$ExternalSyntheticLambda1;
 Lorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$$ExternalSyntheticLambda2;
-Lorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$$ExternalSyntheticLambda3;
-Lorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$Cache$$ExternalSyntheticLambda3;
+Lorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$Cache$$ExternalSyntheticLambda2;
 Lorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore$Cache;
 Lorg/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore;
 Lorg/thoughtcrime/securesms/crypto/storage/SignalIdentityKeyStore$SaveResult;
@@ -35521,6 +35106,8 @@ Lorg/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore;
 Lorg/thoughtcrime/securesms/database/AttachmentTable$ArchiveTransferState$Companion;
 Lorg/thoughtcrime/securesms/database/AttachmentTable$ArchiveTransferState;
 Lorg/thoughtcrime/securesms/database/AttachmentTable$Companion;
+Lorg/thoughtcrime/securesms/database/AttachmentTable$ThumbnailRestoreState$Companion;
+Lorg/thoughtcrime/securesms/database/AttachmentTable$ThumbnailRestoreState;
 Lorg/thoughtcrime/securesms/database/AttachmentTable$TransformProperties$Companion;
 Lorg/thoughtcrime/securesms/database/AttachmentTable$TransformProperties$Creator;
 Lorg/thoughtcrime/securesms/database/AttachmentTable$TransformProperties;
@@ -35543,21 +35130,22 @@ Lorg/thoughtcrime/securesms/database/CdsTable;
 Lorg/thoughtcrime/securesms/database/ChatColorsTable$Companion;
 Lorg/thoughtcrime/securesms/database/ChatColorsTable;
 Lorg/thoughtcrime/securesms/database/DatabaseMonitor;
-Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda10;
-Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda11;
-Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda17;
-Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda1;
-Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda20;
+Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda12;
+Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda13;
+Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda15;
+Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda16;
+Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda19;
 Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda22;
-Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda23;
-Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda24;
+Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda25;
 Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda28;
 Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda29;
-Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda30;
-Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda37;
-Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda40;
+Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda31;
+Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda32;
+Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda35;
+Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda39;
+Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda42;
 Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda4;
-Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda5;
+Lorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda9;
 Lorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;
 Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;
 Lorg/thoughtcrime/securesms/database/DatabaseObserver;
@@ -35581,7 +35169,6 @@ Lorg/thoughtcrime/securesms/database/GroupReceiptTable;
 Lorg/thoughtcrime/securesms/database/GroupTable$Companion;
 Lorg/thoughtcrime/securesms/database/GroupTable$MembershipTable$Companion;
 Lorg/thoughtcrime/securesms/database/GroupTable$MembershipTable;
-Lorg/thoughtcrime/securesms/database/GroupTable$Reader;
 Lorg/thoughtcrime/securesms/database/GroupTable$ShowAsStoryState$Companion;
 Lorg/thoughtcrime/securesms/database/GroupTable$ShowAsStoryState;
 Lorg/thoughtcrime/securesms/database/GroupTable;
@@ -35590,10 +35177,18 @@ Lorg/thoughtcrime/securesms/database/IdentityTable$VerifiedStatus$Companion;
 Lorg/thoughtcrime/securesms/database/IdentityTable$VerifiedStatus$WhenMappings;
 Lorg/thoughtcrime/securesms/database/IdentityTable$VerifiedStatus;
 Lorg/thoughtcrime/securesms/database/IdentityTable;
+Lorg/thoughtcrime/securesms/database/InAppPaymentSubscriberTable$Companion;
+Lorg/thoughtcrime/securesms/database/InAppPaymentSubscriberTable;
+Lorg/thoughtcrime/securesms/database/InAppPaymentTable$Companion;
+Lorg/thoughtcrime/securesms/database/InAppPaymentTable$Type$Companion;
+Lorg/thoughtcrime/securesms/database/InAppPaymentTable$Type;
+Lorg/thoughtcrime/securesms/database/InAppPaymentTable$consumeInAppPaymentsToNotifyUser$1;
+Lorg/thoughtcrime/securesms/database/InAppPaymentTable;
 Lorg/thoughtcrime/securesms/database/JobDatabase$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/database/JobDatabase$Companion;
 Lorg/thoughtcrime/securesms/database/JobDatabase$deleteJobs$1;
 Lorg/thoughtcrime/securesms/database/JobDatabase$insertJobs$2;
+Lorg/thoughtcrime/securesms/database/JobDatabase$updateJobs$2;
 Lorg/thoughtcrime/securesms/database/JobDatabase;
 Lorg/thoughtcrime/securesms/database/KeyValueDatabase$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/database/KeyValueDatabase$1;
@@ -35624,7 +35219,7 @@ Lorg/thoughtcrime/securesms/database/MentionTable$Companion;
 Lorg/thoughtcrime/securesms/database/MentionTable$getMentionsForMessages$ids$1;
 Lorg/thoughtcrime/securesms/database/MentionTable$insert$1;
 Lorg/thoughtcrime/securesms/database/MentionTable;
-Lorg/thoughtcrime/securesms/database/MentionUtil$$ExternalSyntheticLambda4;
+Lorg/thoughtcrime/securesms/database/MentionUtil$$ExternalSyntheticLambda3;
 Lorg/thoughtcrime/securesms/database/MentionUtil$UpdatedBodyAndMentions;
 Lorg/thoughtcrime/securesms/database/MentionUtil;
 Lorg/thoughtcrime/securesms/database/MessageSendLogTables$Companion;
@@ -35684,7 +35279,7 @@ Lorg/thoughtcrime/securesms/database/QueryMonitor;
 Lorg/thoughtcrime/securesms/database/ReactionTable$Companion;
 Lorg/thoughtcrime/securesms/database/ReactionTable;
 Lorg/thoughtcrime/securesms/database/RecipientIdDatabaseReference;
-Lorg/thoughtcrime/securesms/database/RecipientTable$$ExternalSyntheticLambda1;
+Lorg/thoughtcrime/securesms/database/RecipientTable$$ExternalSyntheticLambda5;
 Lorg/thoughtcrime/securesms/database/RecipientTable$Companion;
 Lorg/thoughtcrime/securesms/database/RecipientTable$GetOrInsertResult;
 Lorg/thoughtcrime/securesms/database/RecipientTable$MentionSetting$Companion;
@@ -35733,20 +35328,20 @@ Lorg/thoughtcrime/securesms/database/RxDatabaseObserver$notificationProfilesFlow
 Lorg/thoughtcrime/securesms/database/RxDatabaseObserver$notificationProfilesFlowable$2;
 Lorg/thoughtcrime/securesms/database/RxDatabaseObserver;
 Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda0;
-Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda10;
 Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda11;
-Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda12;
 Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda13;
 Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda14;
-Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda15;
+Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda16;
 Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda17;
-Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda18;
-Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda19;
+Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda1;
 Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda21;
+Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda22;
 Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda3;
 Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda4;
 Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda5;
-Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda7;
+Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda6;
+Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda8;
+Lorg/thoughtcrime/securesms/database/SQLiteDatabase$$ExternalSyntheticLambda9;
 Lorg/thoughtcrime/securesms/database/SQLiteDatabase$1;
 Lorg/thoughtcrime/securesms/database/SQLiteDatabase$DedupedRunnable;
 Lorg/thoughtcrime/securesms/database/SQLiteDatabase$Returnable;
@@ -35769,6 +35364,7 @@ Lorg/thoughtcrime/securesms/database/SqlCipherDeletingErrorHandler;
 Lorg/thoughtcrime/securesms/database/SqlCipherErrorHandler$Companion;
 Lorg/thoughtcrime/securesms/database/SqlCipherErrorHandler;
 Lorg/thoughtcrime/securesms/database/SqlCipherLibraryLoader;
+Lorg/thoughtcrime/securesms/database/StickerTable$StickerPackRecordReader;
 Lorg/thoughtcrime/securesms/database/StickerTable;
 Lorg/thoughtcrime/securesms/database/StorySendTable$Companion;
 Lorg/thoughtcrime/securesms/database/StorySendTable;
@@ -35800,6 +35396,7 @@ Lorg/thoughtcrime/securesms/database/helpers/migration/V149_LegacyMigrations$$Ex
 Lorg/thoughtcrime/securesms/database/helpers/migration/V149_LegacyMigrations$$ExternalSyntheticApiModelOutline20;
 Lorg/thoughtcrime/securesms/database/helpers/migration/V149_LegacyMigrations$$ExternalSyntheticApiModelOutline21;
 Lorg/thoughtcrime/securesms/database/helpers/migration/V149_LegacyMigrations$$ExternalSyntheticApiModelOutline22;
+Lorg/thoughtcrime/securesms/database/helpers/migration/V149_LegacyMigrations$$ExternalSyntheticApiModelOutline23;
 Lorg/thoughtcrime/securesms/database/helpers/migration/V149_LegacyMigrations$$ExternalSyntheticApiModelOutline3;
 Lorg/thoughtcrime/securesms/database/helpers/migration/V149_LegacyMigrations$$ExternalSyntheticApiModelOutline6;
 Lorg/thoughtcrime/securesms/database/identity/IdentityRecordList;
@@ -35815,6 +35412,8 @@ Lorg/thoughtcrime/securesms/database/model/EmojiSearchData;
 Lorg/thoughtcrime/securesms/database/model/GroupRecord;
 Lorg/thoughtcrime/securesms/database/model/IdentityRecord;
 Lorg/thoughtcrime/securesms/database/model/IdentityStoreRecord;
+Lorg/thoughtcrime/securesms/database/model/InAppPaymentSubscriberRecord$Type;
+Lorg/thoughtcrime/securesms/database/model/InAppPaymentSubscriberRecord;
 Lorg/thoughtcrime/securesms/database/model/LocalMetricsEvent$WhenMappings;
 Lorg/thoughtcrime/securesms/database/model/LocalMetricsEvent;
 Lorg/thoughtcrime/securesms/database/model/LocalMetricsSplit$WhenMappings;
@@ -35828,8 +35427,8 @@ Lorg/thoughtcrime/securesms/database/model/MessageId;
 Lorg/thoughtcrime/securesms/database/model/MessageRecord$InviteAddState;
 Lorg/thoughtcrime/securesms/database/model/MessageRecord;
 Lorg/thoughtcrime/securesms/database/model/MessageRecordExtensionsKt;
+Lorg/thoughtcrime/securesms/database/model/MmsMessageRecord$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/database/model/MmsMessageRecord$$ExternalSyntheticLambda1;
-Lorg/thoughtcrime/securesms/database/model/MmsMessageRecord$$ExternalSyntheticLambda2;
 Lorg/thoughtcrime/securesms/database/model/MmsMessageRecord$$ExternalSyntheticLambda3;
 Lorg/thoughtcrime/securesms/database/model/MmsMessageRecord$$ExternalSyntheticLambda4;
 Lorg/thoughtcrime/securesms/database/model/MmsMessageRecord$$ExternalSyntheticLambda5;
@@ -35854,8 +35453,8 @@ Lorg/thoughtcrime/securesms/database/model/RemoteMegaphoneRecord;
 Lorg/thoughtcrime/securesms/database/model/StickerRecord;
 Lorg/thoughtcrime/securesms/database/model/StoryType$Companion;
 Lorg/thoughtcrime/securesms/database/model/StoryType;
+Lorg/thoughtcrime/securesms/database/model/StoryViewState$Companion$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/database/model/StoryViewState$Companion$$ExternalSyntheticLambda1;
-Lorg/thoughtcrime/securesms/database/model/StoryViewState$Companion$$ExternalSyntheticLambda2;
 Lorg/thoughtcrime/securesms/database/model/StoryViewState$Companion$$ExternalSyntheticLambda3;
 Lorg/thoughtcrime/securesms/database/model/StoryViewState$Companion;
 Lorg/thoughtcrime/securesms/database/model/StoryViewState;
@@ -35872,31 +35471,72 @@ Lorg/thoughtcrime/securesms/database/model/databaseprotos/PendingOneTimeDonation
 Lorg/thoughtcrime/securesms/database/model/databaseprotos/PendingOneTimeDonation;
 Lorg/thoughtcrime/securesms/database/model/databaseprotos/RecipientExtras;
 Lorg/thoughtcrime/securesms/database/model/databaseprotos/Wallpaper;
-Lorg/thoughtcrime/securesms/databinding/ConversationHeaderViewBinding;
 Lorg/thoughtcrime/securesms/databinding/ConversationInputPanelBinding;
 Lorg/thoughtcrime/securesms/databinding/ConversationListFilterPullViewBinding;
 Lorg/thoughtcrime/securesms/databinding/ConversationListTabsBinding;
 Lorg/thoughtcrime/securesms/databinding/ConversationSearchNavBinding;
 Lorg/thoughtcrime/securesms/databinding/ConversationTitleViewBinding;
-Lorg/thoughtcrime/securesms/databinding/TransferControlsViewBinding;
+Lorg/thoughtcrime/securesms/databinding/OnboardingMegaphoneCardBinding;
 Lorg/thoughtcrime/securesms/databinding/V2ConversationFragmentBinding;
-Lorg/thoughtcrime/securesms/databinding/V2ConversationItemTextOnlyIncomingBinding;
-Lorg/thoughtcrime/securesms/dependencies/ApplicationDependencies$$ExternalSyntheticLambda0;
-Lorg/thoughtcrime/securesms/dependencies/ApplicationDependencies$$ExternalSyntheticLambda1;
-Lorg/thoughtcrime/securesms/dependencies/ApplicationDependencies$Provider;
-Lorg/thoughtcrime/securesms/dependencies/ApplicationDependencies;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$Provider;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$_networkModule$1;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$androidCallAudioManager$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$databaseObserver$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$deadlockDetector$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$deletedCallEventManager$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$earlyMessageCache$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$exoPlayerPool$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$expireStoriesManager$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$expiringMessageManager$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$frameRateTracker$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$giphyMp4Cache$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$jobManager$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$megaphoneRepository$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$messageNotifier$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$pendingRetryReceiptCache$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$pendingRetryReceiptManager$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$recipientCache$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$scheduledMessageManager$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$shakeToReport$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$signalCallManager$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$trimThreadsByDateManager$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$typingStatusRepository$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$typingStatusSender$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies$viewOnceMessageManager$2;
+Lorg/thoughtcrime/securesms/dependencies/AppDependencies;
 Lorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider$$ExternalSyntheticLambda1;
 Lorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider$1;
 Lorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider$DynamicCredentialsProvider;
 Lorg/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$_protocolStore$1;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$_signalServiceMessageSender$1;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$callLinksService$2;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$clientZkReceiptOperations$2;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$donationsService$2;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$groupsV2Authorization$2;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$groupsV2Operations$2;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$incomingMessageObserver$2;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$libsignalNetwork$2;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$okHttpClient$2;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$payments$2;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$profileService$2;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalOkHttpClient$2;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalServiceAccountManager$2;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalServiceMessageReceiver$2;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalServiceNetworkAccess$2;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalWebSocket$2$$ExternalSyntheticLambda0;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalWebSocket$2$$ExternalSyntheticLambda1;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalWebSocket$2$3$1;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule$signalWebSocket$2;
+Lorg/thoughtcrime/securesms/dependencies/NetworkDependenciesModule;
 Lorg/thoughtcrime/securesms/emoji/EmojiCategory$Companion;
 Lorg/thoughtcrime/securesms/emoji/EmojiCategory;
 Lorg/thoughtcrime/securesms/emoji/EmojiData;
-Lorg/thoughtcrime/securesms/emoji/EmojiDownloader$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/emoji/EmojiDownloader$$ExternalSyntheticLambda1;
 Lorg/thoughtcrime/securesms/emoji/EmojiDownloader$$ExternalSyntheticLambda2;
 Lorg/thoughtcrime/securesms/emoji/EmojiDownloader$$ExternalSyntheticLambda3;
+Lorg/thoughtcrime/securesms/emoji/EmojiDownloader$$ExternalSyntheticLambda4;
 Lorg/thoughtcrime/securesms/emoji/EmojiDownloader$Producer;
 Lorg/thoughtcrime/securesms/emoji/EmojiDownloader;
 Lorg/thoughtcrime/securesms/emoji/EmojiFiles$Name$Companion;
@@ -35942,10 +35582,9 @@ Lorg/thoughtcrime/securesms/emoji/EmojiSource$maxEmojiLength$2;
 Lorg/thoughtcrime/securesms/emoji/EmojiSource$variationsToCanonical$2;
 Lorg/thoughtcrime/securesms/emoji/EmojiSource;
 Lorg/thoughtcrime/securesms/emoji/EmojiSourceKt;
+Lorg/thoughtcrime/securesms/emoji/JumboEmoji$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/emoji/JumboEmoji$$ExternalSyntheticLambda4;
-Lorg/thoughtcrime/securesms/emoji/JumboEmoji$$ExternalSyntheticLambda5;
 Lorg/thoughtcrime/securesms/emoji/JumboEmoji;
-Lorg/thoughtcrime/securesms/emoji/ObsoleteEmoji;
 Lorg/thoughtcrime/securesms/emoji/ParsedEmojiData;
 Lorg/thoughtcrime/securesms/events/GroupCallPeekEvent;
 Lorg/thoughtcrime/securesms/events/PartProgressEvent;
@@ -35969,11 +35608,6 @@ Lorg/thoughtcrime/securesms/fonts/Fonts$FontResult;
 Lorg/thoughtcrime/securesms/fonts/Fonts$WhenMappings;
 Lorg/thoughtcrime/securesms/fonts/Fonts;
 Lorg/thoughtcrime/securesms/fonts/ScriptUtil;
-Lorg/thoughtcrime/securesms/fonts/SignalSymbols$CustomTypefaceSpan;
-Lorg/thoughtcrime/securesms/fonts/SignalSymbols$Glyph;
-Lorg/thoughtcrime/securesms/fonts/SignalSymbols$Weight;
-Lorg/thoughtcrime/securesms/fonts/SignalSymbols$WhenMappings;
-Lorg/thoughtcrime/securesms/fonts/SignalSymbols;
 Lorg/thoughtcrime/securesms/fonts/SupportedScript;
 Lorg/thoughtcrime/securesms/fonts/TextFont$Companion;
 Lorg/thoughtcrime/securesms/fonts/TextFont;
@@ -36041,31 +35675,29 @@ Lorg/thoughtcrime/securesms/jobmanager/Job$Result$ResultType;
 Lorg/thoughtcrime/securesms/jobmanager/Job$Result;
 Lorg/thoughtcrime/securesms/jobmanager/Job;
 Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda0;
+Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda10;
 Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda13;
 Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda14;
+Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda15;
 Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda16;
-Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda17;
-Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda19;
 Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda1;
 Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda20;
-Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda22;
-Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda23;
+Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda21;
+Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda2;
+Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda3;
 Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda4;
-Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda5;
-Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda6;
-Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda7;
 Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda8;
+Lorg/thoughtcrime/securesms/jobmanager/JobController$$ExternalSyntheticLambda9;
 Lorg/thoughtcrime/securesms/jobmanager/JobController$Callback;
 Lorg/thoughtcrime/securesms/jobmanager/JobController;
 Lorg/thoughtcrime/securesms/jobmanager/JobInstantiator;
 Lorg/thoughtcrime/securesms/jobmanager/JobLogger;
-Lorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda10;
 Lorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda11;
-Lorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda16;
-Lorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda17;
-Lorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda19;
-Lorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda1;
+Lorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda12;
+Lorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda18;
+Lorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda4;
 Lorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda6;
+Lorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda7;
 Lorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda8;
 Lorg/thoughtcrime/securesms/jobmanager/JobManager$$ExternalSyntheticLambda9;
 Lorg/thoughtcrime/securesms/jobmanager/JobManager$Chain;
@@ -36203,10 +35835,8 @@ Lorg/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob;
 Lorg/thoughtcrime/securesms/jobs/EmojiSearchIndexDownloadJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/EmojiSearchIndexDownloadJob$Manifest;
 Lorg/thoughtcrime/securesms/jobs/EmojiSearchIndexDownloadJob;
-Lorg/thoughtcrime/securesms/jobs/ExternalLaunchDonationJob$Companion;
 Lorg/thoughtcrime/securesms/jobs/ExternalLaunchDonationJob$Factory$Companion;
 Lorg/thoughtcrime/securesms/jobs/ExternalLaunchDonationJob$Factory;
-Lorg/thoughtcrime/securesms/jobs/ExternalLaunchDonationJob;
 Lorg/thoughtcrime/securesms/jobs/FailingJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/FastJobStorage$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/jobs/FastJobStorage$deleteJobs$1;
@@ -36232,6 +35862,16 @@ Lorg/thoughtcrime/securesms/jobs/GroupRingCleanupJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/GroupRingCleanupJob;
 Lorg/thoughtcrime/securesms/jobs/GroupV2UpdateSelfProfileKeyJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/GroupV2UpdateSelfProfileKeyJob;
+Lorg/thoughtcrime/securesms/jobs/InAppPaymentAuthCheckJob$Companion;
+Lorg/thoughtcrime/securesms/jobs/InAppPaymentAuthCheckJob$Factory;
+Lorg/thoughtcrime/securesms/jobs/InAppPaymentAuthCheckJob;
+Lorg/thoughtcrime/securesms/jobs/InAppPaymentGiftSendJob$Factory;
+Lorg/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob$Companion;
+Lorg/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob$Factory;
+Lorg/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob;
+Lorg/thoughtcrime/securesms/jobs/InAppPaymentOneTimeContextJob$Factory;
+Lorg/thoughtcrime/securesms/jobs/InAppPaymentRecurringContextJob$Factory;
+Lorg/thoughtcrime/securesms/jobs/InAppPaymentRedemptionJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/IndividualSendJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/JobManagerFactories$1;
 Lorg/thoughtcrime/securesms/jobs/JobManagerFactories$2;
@@ -36250,6 +35890,7 @@ Lorg/thoughtcrime/securesms/jobs/MultiDeviceCallLinkSyncJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/MultiDeviceContactSyncJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob$Factory;
+Lorg/thoughtcrime/securesms/jobs/MultiDeviceDeleteSendSyncJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/MultiDeviceMessageRequestResponseJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/MultiDeviceOutgoingPaymentSyncJob$Factory;
@@ -36306,6 +35947,7 @@ Lorg/thoughtcrime/securesms/jobs/RequestGroupV2InfoWorkerJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/ResendMessageJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/ResetSvrGuessCountJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/RestoreAttachmentJob$Factory;
+Lorg/thoughtcrime/securesms/jobs/RestoreAttachmentThumbnailJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/ResumableUploadSpecJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/RetrieveProfileJob$Companion;
@@ -36328,6 +35970,7 @@ Lorg/thoughtcrime/securesms/jobs/SenderKeyDistributionSendJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/StickerDownloadJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/StickerPackDownloadJob$Factory;
+Lorg/thoughtcrime/securesms/jobs/StickerPackDownloadJob;
 Lorg/thoughtcrime/securesms/jobs/StorageAccountRestoreJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/StorageAccountRestoreJob;
 Lorg/thoughtcrime/securesms/jobs/StorageForcePushJob$Factory;
@@ -36337,7 +35980,6 @@ Lorg/thoughtcrime/securesms/jobs/StoryOnboardingDownloadJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/StoryOnboardingDownloadJob;
 Lorg/thoughtcrime/securesms/jobs/SubmitRateLimitPushChallengeJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/SubscriptionKeepAliveJob$Factory;
-Lorg/thoughtcrime/securesms/jobs/SubscriptionKeepAliveJob;
 Lorg/thoughtcrime/securesms/jobs/SubscriptionReceiptRequestResponseJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/Svr2MirrorJob$Factory;
 Lorg/thoughtcrime/securesms/jobs/SyncArchivedMediaJob$Factory;
@@ -36378,10 +36020,12 @@ Lorg/thoughtcrime/securesms/keyvalue/ChatColorsValues;
 Lorg/thoughtcrime/securesms/keyvalue/DonationsValues$Companion;
 Lorg/thoughtcrime/securesms/keyvalue/DonationsValues$observableOneTimeCurrency$2;
 Lorg/thoughtcrime/securesms/keyvalue/DonationsValues$observablePendingOneTimeDonation$2;
-Lorg/thoughtcrime/securesms/keyvalue/DonationsValues$observableSubscriptionCurrency$2;
+Lorg/thoughtcrime/securesms/keyvalue/DonationsValues$observableRecurringBackupsCurrency$2;
+Lorg/thoughtcrime/securesms/keyvalue/DonationsValues$observableRecurringDonationCurrency$2;
 Lorg/thoughtcrime/securesms/keyvalue/DonationsValues$oneTimeCurrencyPublisher$2;
 Lorg/thoughtcrime/securesms/keyvalue/DonationsValues$pendingOneTimeDonationPublisher$2;
-Lorg/thoughtcrime/securesms/keyvalue/DonationsValues$subscriptionCurrencyPublisher$2;
+Lorg/thoughtcrime/securesms/keyvalue/DonationsValues$recurringBackupCurrencyPublisher$2;
+Lorg/thoughtcrime/securesms/keyvalue/DonationsValues$recurringDonationCurrencyPublisher$2;
 Lorg/thoughtcrime/securesms/keyvalue/DonationsValues;
 Lorg/thoughtcrime/securesms/keyvalue/EmojiValues;
 Lorg/thoughtcrime/securesms/keyvalue/ImageEditorValues$Companion;
@@ -36448,16 +36092,16 @@ Lorg/thoughtcrime/securesms/logging/PersistentLogger$LogRequest;
 Lorg/thoughtcrime/securesms/logging/PersistentLogger$LogRequests;
 Lorg/thoughtcrime/securesms/logging/PersistentLogger$WriteThread;
 Lorg/thoughtcrime/securesms/logging/PersistentLogger;
-Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment$$ExternalSyntheticLambda0;
-Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment$$ExternalSyntheticLambda1;
 Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment$$ExternalSyntheticLambda2;
 Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment$$ExternalSyntheticLambda3;
 Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment$$ExternalSyntheticLambda4;
+Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment$$ExternalSyntheticLambda5;
+Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment$$ExternalSyntheticLambda6;
+Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment$$ExternalSyntheticLambda7;
 Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment$Companion;
 Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment$DestinationChangedListener;
 Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment$conversationListTabsViewModel$2;
 Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment$onViewCreated$3;
-Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment$openSettings$1;
 Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment$special$$inlined$viewModels$default$1;
 Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment$special$$inlined$viewModels$default$2;
 Lorg/thoughtcrime/securesms/main/MainActivityListHostFragment$special$$inlined$viewModels$default$3;
@@ -36473,9 +36117,9 @@ Lorg/thoughtcrime/securesms/megaphone/Megaphone$Style;
 Lorg/thoughtcrime/securesms/megaphone/Megaphone;
 Lorg/thoughtcrime/securesms/megaphone/MegaphoneActionController;
 Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda0;
+Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda1;
 Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda2;
 Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda4;
-Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda5;
 Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda6;
 Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda7;
 Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository$$ExternalSyntheticLambda8;
@@ -36485,33 +36129,39 @@ Lorg/thoughtcrime/securesms/megaphone/MegaphoneRepository;
 Lorg/thoughtcrime/securesms/megaphone/MegaphoneSchedule;
 Lorg/thoughtcrime/securesms/megaphone/MegaphoneViewBuilder$1;
 Lorg/thoughtcrime/securesms/megaphone/MegaphoneViewBuilder;
-Lorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda21;
-Lorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda22;
-Lorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda23;
-Lorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda24;
+Lorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda16;
+Lorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda1;
+Lorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda25;
+Lorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda26;
+Lorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda27;
+Lorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda28;
+Lorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda2;
+Lorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda3;
 Lorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda4;
-Lorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda5;
-Lorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda6;
-Lorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda7;
-Lorg/thoughtcrime/securesms/megaphone/Megaphones$$ExternalSyntheticLambda8;
 Lorg/thoughtcrime/securesms/megaphone/Megaphones$1;
 Lorg/thoughtcrime/securesms/megaphone/Megaphones$3;
 Lorg/thoughtcrime/securesms/megaphone/Megaphones$Event;
 Lorg/thoughtcrime/securesms/megaphone/Megaphones;
 Lorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$ActionClickListener;
+Lorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$AddPhotoCardViewHolder;
 Lorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardAdapter;
+Lorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardViewHolder$$ExternalSyntheticLambda0;
+Lorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardViewHolder$$ExternalSyntheticLambda1;
+Lorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$CardViewHolder;
+Lorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$GroupCardViewHolder;
+Lorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView$InviteCardViewHolder;
 Lorg/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView;
 Lorg/thoughtcrime/securesms/megaphone/PinsForAllSchedule;
 Lorg/thoughtcrime/securesms/megaphone/RecurringSchedule;
+Lorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$$ExternalSyntheticLambda1;
+Lorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$$ExternalSyntheticLambda2;
+Lorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$$ExternalSyntheticLambda3;
+Lorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$$ExternalSyntheticLambda4;
 Lorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$Action;
-Lorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$donate$1;
-Lorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$donateForFriend$1;
-Lorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$finish$1;
 Lorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$getRemoteMegaphoneToShow$1;
 Lorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$getRemoteMegaphoneToShow$2;
 Lorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$getRemoteMegaphoneToShow$3;
 Lorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$getRemoteMegaphoneToShow$4;
-Lorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository$snooze$1;
 Lorg/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository;
 Lorg/thoughtcrime/securesms/megaphone/SignalPinReminderSchedule;
 Lorg/thoughtcrime/securesms/messageprocessingalarm/RoutineMessageFetchReceiver;
@@ -36554,6 +36204,7 @@ Lorg/thoughtcrime/securesms/migrations/BackupNotificationMigrationJob$Factory;
 Lorg/thoughtcrime/securesms/migrations/BlobStorageLocationMigrationJob$Factory;
 Lorg/thoughtcrime/securesms/migrations/CachedAttachmentsMigrationJob$Factory;
 Lorg/thoughtcrime/securesms/migrations/ClearGlideCacheMigrationJob$Factory;
+Lorg/thoughtcrime/securesms/migrations/ContactLinkRebuildMigrationJob$Factory;
 Lorg/thoughtcrime/securesms/migrations/CopyUsernameToSignalStoreMigrationJob$Factory;
 Lorg/thoughtcrime/securesms/migrations/DatabaseMigrationJob$Factory;
 Lorg/thoughtcrime/securesms/migrations/DeleteDeprecatedLogsMigrationJob$Factory;
@@ -36586,6 +36237,7 @@ Lorg/thoughtcrime/securesms/migrations/StorageFixLocalUnknownMigrationJob$Factor
 Lorg/thoughtcrime/securesms/migrations/StorageServiceMigrationJob$Factory;
 Lorg/thoughtcrime/securesms/migrations/StorageServiceSystemNameMigrationJob$Factory;
 Lorg/thoughtcrime/securesms/migrations/StoryViewedReceiptsStateMigrationJob$Factory;
+Lorg/thoughtcrime/securesms/migrations/SubscriberIdMigrationJob$Factory;
 Lorg/thoughtcrime/securesms/migrations/Svr2MirrorMigrationJob$Factory;
 Lorg/thoughtcrime/securesms/migrations/SyncDistributionListsMigrationJob$Factory;
 Lorg/thoughtcrime/securesms/migrations/SyncKeysMigrationJob$Factory;
@@ -36617,7 +36269,6 @@ Lorg/thoughtcrime/securesms/mms/SignalGlideModule$Companion;
 Lorg/thoughtcrime/securesms/mms/SignalGlideModule;
 Lorg/thoughtcrime/securesms/mms/Slide;
 Lorg/thoughtcrime/securesms/mms/SlideClickListener;
-Lorg/thoughtcrime/securesms/mms/SlideDeck$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/mms/SlideDeck;
 Lorg/thoughtcrime/securesms/mms/SlideFactory$MediaType;
 Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;
@@ -36633,10 +36284,10 @@ Lorg/thoughtcrime/securesms/net/DeviceTransferBlockingInterceptor;
 Lorg/thoughtcrime/securesms/net/HttpErrorTracker;
 Lorg/thoughtcrime/securesms/net/RemoteDeprecationDetectorInterceptor;
 Lorg/thoughtcrime/securesms/net/SequentialDns;
+Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$$ExternalSyntheticLambda1;
 Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$$ExternalSyntheticLambda2;
-Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$$ExternalSyntheticLambda4;
-Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$$ExternalSyntheticLambda5;
+Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$$ExternalSyntheticLambda3;
 Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$1;
 Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor$HealthState;
 Lorg/thoughtcrime/securesms/net/SignalWebSocketHealthMonitor;
@@ -36648,12 +36299,13 @@ Lorg/thoughtcrime/securesms/notifications/MessageNotifier;
 Lorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline0;
 Lorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline1;
 Lorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline2;
+Lorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline4;
 Lorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline5;
 Lorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline6;
-Lorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline7;
 Lorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline8;
+Lorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticApiModelOutline9;
 Lorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticLambda11;
-Lorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticLambda17;
+Lorg/thoughtcrime/securesms/notifications/NotificationChannels$$ExternalSyntheticLambda12;
 Lorg/thoughtcrime/securesms/notifications/NotificationChannels;
 Lorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier;
 Lorg/thoughtcrime/securesms/notifications/SlowNotificationHeuristics;
@@ -36676,7 +36328,7 @@ Lorg/thoughtcrime/securesms/notifications/v2/NotificationState$notificationItems
 Lorg/thoughtcrime/securesms/notifications/v2/NotificationState;
 Lorg/thoughtcrime/securesms/payments/Payment;
 Lorg/thoughtcrime/securesms/payments/PaymentsAddressException;
-Lorg/thoughtcrime/securesms/permissions/Permissions$$ExternalSyntheticLambda0;
+Lorg/thoughtcrime/securesms/permissions/Permissions$$ExternalSyntheticLambda1;
 Lorg/thoughtcrime/securesms/permissions/Permissions;
 Lorg/thoughtcrime/securesms/pin/SvrRepository;
 Lorg/thoughtcrime/securesms/preferences/widgets/NotificationPrivacyPreference;
@@ -36691,8 +36343,8 @@ Lorg/thoughtcrime/securesms/providers/BaseContentProvider;
 Lorg/thoughtcrime/securesms/providers/BlobContentProvider;
 Lorg/thoughtcrime/securesms/providers/BlobProvider$$ExternalSyntheticLambda10;
 Lorg/thoughtcrime/securesms/providers/BlobProvider$$ExternalSyntheticLambda11;
-Lorg/thoughtcrime/securesms/providers/BlobProvider$$ExternalSyntheticLambda1;
-Lorg/thoughtcrime/securesms/providers/BlobProvider$$ExternalSyntheticLambda9;
+Lorg/thoughtcrime/securesms/providers/BlobProvider$$ExternalSyntheticLambda6;
+Lorg/thoughtcrime/securesms/providers/BlobProvider$$ExternalSyntheticLambda7;
 Lorg/thoughtcrime/securesms/providers/BlobProvider$1;
 Lorg/thoughtcrime/securesms/providers/BlobProvider$2;
 Lorg/thoughtcrime/securesms/providers/BlobProvider$BlobBuilder;
@@ -36714,19 +36366,18 @@ Lorg/thoughtcrime/securesms/reactions/ReactionsBottomSheetDialogFragment$Callbac
 Lorg/thoughtcrime/securesms/reactions/ReactionsConversationView;
 Lorg/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiBottomSheetDialogFragment$Callback;
 Lorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda0;
+Lorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda1;
 Lorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda2;
 Lorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda3;
-Lorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda4;
-Lorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda5;
 Lorg/thoughtcrime/securesms/recipients/LiveRecipient;
+Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda1;
 Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda2;
-Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda3;
 Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda4;
 Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache$$ExternalSyntheticLambda5;
 Lorg/thoughtcrime/securesms/recipients/LiveRecipientCache;
-Lorg/thoughtcrime/securesms/recipients/Recipient$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/recipients/Recipient$$ExternalSyntheticLambda1;
+Lorg/thoughtcrime/securesms/recipients/Recipient$$ExternalSyntheticLambda2;
 Lorg/thoughtcrime/securesms/recipients/Recipient$Capability$Companion;
 Lorg/thoughtcrime/securesms/recipients/Recipient$Capability;
 Lorg/thoughtcrime/securesms/recipients/Recipient$Companion;
@@ -36759,7 +36410,7 @@ Lorg/thoughtcrime/securesms/registration/RegistrationRepository;
 Lorg/thoughtcrime/securesms/registration/RegistrationUtil;
 Lorg/thoughtcrime/securesms/registration/VerifyResponse$Companion;
 Lorg/thoughtcrime/securesms/registration/VerifyResponse;
-Lorg/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel$$ExternalSyntheticLambda3;
+Lorg/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel$$ExternalSyntheticLambda9;
 Lorg/thoughtcrime/securesms/releasechannel/ReleaseChannel;
 Lorg/thoughtcrime/securesms/revealable/ViewOnceMessageManager;
 Lorg/thoughtcrime/securesms/ringrtc/RingRtcLogger;
@@ -36789,34 +36440,37 @@ Lorg/thoughtcrime/securesms/service/RotateSignedPreKeyListener;
 Lorg/thoughtcrime/securesms/service/ScheduledMessageManager$Companion;
 Lorg/thoughtcrime/securesms/service/ScheduledMessageManager$ScheduledMessagesAlarm;
 Lorg/thoughtcrime/securesms/service/ScheduledMessageManager;
-Lorg/thoughtcrime/securesms/service/TimedEventManager$$ExternalSyntheticLambda1;
+Lorg/thoughtcrime/securesms/service/TimedEventManager$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/service/TimedEventManager;
 Lorg/thoughtcrime/securesms/service/webrtc/ActiveCallManager$Companion;
 Lorg/thoughtcrime/securesms/service/webrtc/ActiveCallManager;
 Lorg/thoughtcrime/securesms/service/webrtc/AndroidCallConnectionService;
-Lorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline11;
 Lorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline12;
-Lorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline1;
-Lorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline2;
-Lorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline3;
+Lorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline13;
+Lorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline14;
+Lorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline15;
+Lorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline5;
+Lorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline6;
 Lorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline7;
-Lorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil$$ExternalSyntheticApiModelOutline8;
 Lorg/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil;
 Lorg/thoughtcrime/securesms/service/webrtc/links/CallLinkRoomId$DatabaseSerializer;
 Lorg/thoughtcrime/securesms/service/webrtc/links/CallLinkRoomId;
 Lorg/thoughtcrime/securesms/shakereport/ShakeToReport;
 Lorg/thoughtcrime/securesms/sms/GroupV2UpdateMessageUtil;
 Lorg/thoughtcrime/securesms/sms/MessageSender$MessageSentEvent;
+Lorg/thoughtcrime/securesms/stickers/BlessedPacks$1;
+Lorg/thoughtcrime/securesms/stickers/BlessedPacks$Pack;
+Lorg/thoughtcrime/securesms/stickers/BlessedPacks;
 Lorg/thoughtcrime/securesms/stickers/StickerEventListener;
 Lorg/thoughtcrime/securesms/stickers/StickerLocator;
 Lorg/thoughtcrime/securesms/stickers/StickerPackInstallEvent;
 Lorg/thoughtcrime/securesms/stickers/StickerRemoteUri;
 Lorg/thoughtcrime/securesms/stickers/StickerRemoteUriLoader$Factory;
-Lorg/thoughtcrime/securesms/stickers/StickerSearchRepository$$ExternalSyntheticLambda0;
+Lorg/thoughtcrime/securesms/stickers/StickerSearchRepository$$ExternalSyntheticLambda1;
 Lorg/thoughtcrime/securesms/stickers/StickerSearchRepository$Callback;
 Lorg/thoughtcrime/securesms/stickers/StickerSearchRepository;
 Lorg/thoughtcrime/securesms/storage/StorageKeyGenerator;
-Lorg/thoughtcrime/securesms/storage/StorageSyncHelper$$ExternalSyntheticLambda0;
+Lorg/thoughtcrime/securesms/storage/StorageSyncHelper$$ExternalSyntheticLambda6;
 Lorg/thoughtcrime/securesms/storage/StorageSyncHelper;
 Lorg/thoughtcrime/securesms/stories/Stories$MediaTransform$SendRequirements;
 Lorg/thoughtcrime/securesms/stories/Stories;
@@ -36887,11 +36541,13 @@ Lorg/thoughtcrime/securesms/util/Debouncer;
 Lorg/thoughtcrime/securesms/util/DefaultValueLiveData;
 Lorg/thoughtcrime/securesms/util/Deferred;
 Lorg/thoughtcrime/securesms/util/DeviceProperties;
+Lorg/thoughtcrime/securesms/util/DoubleClickDebouncer;
 Lorg/thoughtcrime/securesms/util/DrawableUtil;
 Lorg/thoughtcrime/securesms/util/DynamicNoActionBarTheme;
 Lorg/thoughtcrime/securesms/util/DynamicTheme;
 Lorg/thoughtcrime/securesms/util/EditTextExtensionsKt;
 Lorg/thoughtcrime/securesms/util/EncryptedStreamUtils;
+Lorg/thoughtcrime/securesms/util/Environment$Donations;
 Lorg/thoughtcrime/securesms/util/FeatureFlags$1;
 Lorg/thoughtcrime/securesms/util/FeatureFlags$2$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/util/FeatureFlags$2;
@@ -36910,16 +36566,13 @@ Lorg/thoughtcrime/securesms/util/LRUCache;
 Lorg/thoughtcrime/securesms/util/LeakyBucketLimiter;
 Lorg/thoughtcrime/securesms/util/ListenableFutureTask$2;
 Lorg/thoughtcrime/securesms/util/ListenableFutureTask;
-Lorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda0;
-Lorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda1;
+Lorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda2;
 Lorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda3;
-Lorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda5;
+Lorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda4;
+Lorg/thoughtcrime/securesms/util/LocalMetrics$$ExternalSyntheticLambda6;
 Lorg/thoughtcrime/securesms/util/LocalMetrics$db$2;
 Lorg/thoughtcrime/securesms/util/LocalMetrics;
 Lorg/thoughtcrime/securesms/util/LocaleUtil;
-Lorg/thoughtcrime/securesms/util/LongClickMovementMethod$1;
-Lorg/thoughtcrime/securesms/util/LongClickMovementMethod;
-Lorg/thoughtcrime/securesms/util/Material3OnScrollHelper$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/util/Material3OnScrollHelper$1;
 Lorg/thoughtcrime/securesms/util/Material3OnScrollHelper$2;
 Lorg/thoughtcrime/securesms/util/Material3OnScrollHelper$3;
@@ -36934,12 +36587,11 @@ Lorg/thoughtcrime/securesms/util/NameUtil;
 Lorg/thoughtcrime/securesms/util/NetworkUtil;
 Lorg/thoughtcrime/securesms/util/NoCrossfadeChangeDefaultAnimator;
 Lorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda0;
+Lorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda1;
 Lorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda2;
-Lorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda3;
 Lorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda4;
 Lorg/thoughtcrime/securesms/util/ProfileUtil$$ExternalSyntheticLambda5;
 Lorg/thoughtcrime/securesms/util/ProfileUtil;
-Lorg/thoughtcrime/securesms/util/Projection$Corners;
 Lorg/thoughtcrime/securesms/util/Projection;
 Lorg/thoughtcrime/securesms/util/ProjectionList;
 Lorg/thoughtcrime/securesms/util/PushCharacterCalculator$1;
@@ -36951,7 +36603,6 @@ Lorg/thoughtcrime/securesms/util/SavedStateViewModelFactory;
 Lorg/thoughtcrime/securesms/util/ScreenDensity$1;
 Lorg/thoughtcrime/securesms/util/ScreenDensity;
 Lorg/thoughtcrime/securesms/util/SearchUtil$StyleFactory;
-Lorg/thoughtcrime/securesms/util/SearchUtil;
 Lorg/thoughtcrime/securesms/util/ServiceUtil;
 Lorg/thoughtcrime/securesms/util/SignalLocalMetrics$ColdStart;
 Lorg/thoughtcrime/securesms/util/SignalLocalMetrics$ConversationOpen;
@@ -36962,12 +36613,11 @@ Lorg/thoughtcrime/securesms/util/SignalTrace$executor$2;
 Lorg/thoughtcrime/securesms/util/SignalTrace;
 Lorg/thoughtcrime/securesms/util/SignalUncaughtExceptionHandler;
 Lorg/thoughtcrime/securesms/util/SingleLiveEvent;
-Lorg/thoughtcrime/securesms/util/SnapToTopDataObserver$$ExternalSyntheticLambda0;
+Lorg/thoughtcrime/securesms/util/SnapToTopDataObserver$$ExternalSyntheticLambda1;
 Lorg/thoughtcrime/securesms/util/SnapToTopDataObserver$ScrollToTop;
 Lorg/thoughtcrime/securesms/util/SnapToTopDataObserver;
 Lorg/thoughtcrime/securesms/util/SoftHashMap$SoftValue;
 Lorg/thoughtcrime/securesms/util/SoftHashMap;
-Lorg/thoughtcrime/securesms/util/SpanUtil;
 Lorg/thoughtcrime/securesms/util/StorageUtil;
 Lorg/thoughtcrime/securesms/util/TextSecurePreferences$MediaKeyboardMode;
 Lorg/thoughtcrime/securesms/util/TextSecurePreferences;
@@ -36999,7 +36649,6 @@ Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;
 Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingDiffCallback;
 Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingModel;
 Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingModelList;
-Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;
 Lorg/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter$Placeholder;
 Lorg/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter;
@@ -37009,13 +36658,12 @@ Lorg/thoughtcrime/securesms/util/concurrent/FilteredExecutor;
 Lorg/thoughtcrime/securesms/util/concurrent/SerialExecutor$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/util/concurrent/SerialExecutor;
 Lorg/thoughtcrime/securesms/util/concurrent/SerialMonoLifoExecutor;
-Lorg/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat;
 Lorg/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageContextWrapper;
 Lorg/thoughtcrime/securesms/util/dynamiclanguage/LanguageString;
 Lorg/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser;
-Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$$ExternalSyntheticLambda1;
+Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$$ExternalSyntheticLambda2;
 Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$$ExternalSyntheticLambda3;
-Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$$ExternalSyntheticLambda5;
+Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$$ExternalSyntheticLambda4;
 Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$2$$ExternalSyntheticLambda0;
 Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$2;
 Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$3;
@@ -37025,7 +36673,7 @@ Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$CombineLiveData$$External
 Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$CombineLiveData;
 Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil$EqualityChecker;
 Lorg/thoughtcrime/securesms/util/livedata/LiveDataUtil;
-Lorg/thoughtcrime/securesms/util/livedata/Store$LiveDataStore$$ExternalSyntheticLambda0;
+Lorg/thoughtcrime/securesms/util/livedata/Store$LiveDataStore$$ExternalSyntheticLambda2;
 Lorg/thoughtcrime/securesms/util/livedata/Store$LiveDataStore;
 Lorg/thoughtcrime/securesms/util/livedata/Store;
 Lorg/thoughtcrime/securesms/util/rx/RxStore$actionDisposable$1;
@@ -37034,11 +36682,12 @@ Lorg/thoughtcrime/securesms/util/rx/RxStore$sam$io_reactivex_rxjava3_functions_F
 Lorg/thoughtcrime/securesms/util/rx/RxStore$update$1$1;
 Lorg/thoughtcrime/securesms/util/rx/RxStore$update$1;
 Lorg/thoughtcrime/securesms/util/rx/RxStore;
-Lorg/thoughtcrime/securesms/util/storage/FileStorage$$ExternalSyntheticLambda0;
+Lorg/thoughtcrime/securesms/util/storage/FileStorage$$ExternalSyntheticLambda1;
 Lorg/thoughtcrime/securesms/util/storage/FileStorage;
 Lorg/thoughtcrime/securesms/util/views/DarkOverflowToolbar;
 Lorg/thoughtcrime/securesms/util/views/NullableStub;
 Lorg/thoughtcrime/securesms/util/views/SimpleProgressDialog$DismissibleDialog;
+Lorg/thoughtcrime/securesms/util/views/SlideUpWithDependencyBehavior;
 Lorg/thoughtcrime/securesms/util/views/SlideUpWithSnackbarBehavior;
 Lorg/thoughtcrime/securesms/util/views/Stub;
 Lorg/thoughtcrime/securesms/video/exo/ExoPlayerPool$Companion;
@@ -37127,10 +36776,10 @@ Lorg/whispersystems/signalservice/api/push/exceptions/NotFoundException;
 Lorg/whispersystems/signalservice/api/push/exceptions/PushNetworkException;
 Lorg/whispersystems/signalservice/api/push/exceptions/RangeException;
 Lorg/whispersystems/signalservice/api/services/DonationsService;
-Lorg/whispersystems/signalservice/api/services/MessagingService$$ExternalSyntheticLambda4;
+Lorg/whispersystems/signalservice/api/services/MessagingService$$ExternalSyntheticLambda2;
+Lorg/whispersystems/signalservice/api/services/ProfileService$$ExternalSyntheticLambda0;
 Lorg/whispersystems/signalservice/api/services/ProfileService$$ExternalSyntheticLambda1;
 Lorg/whispersystems/signalservice/api/services/ProfileService$$ExternalSyntheticLambda2;
-Lorg/whispersystems/signalservice/api/services/ProfileService$$ExternalSyntheticLambda3;
 Lorg/whispersystems/signalservice/api/services/ProfileService$ProfileResponseMapper;
 Lorg/whispersystems/signalservice/api/services/ProfileService$ProfileResponseProcessor;
 Lorg/whispersystems/signalservice/api/services/ProfileService;
@@ -37160,10 +36809,10 @@ Lorg/whispersystems/signalservice/internal/configuration/SignalServiceUrl;
 Lorg/whispersystems/signalservice/internal/configuration/SignalStorageUrl;
 Lorg/whispersystems/signalservice/internal/configuration/SignalSvr2Url;
 Lorg/whispersystems/signalservice/internal/configuration/SignalUrl;
+Lorg/whispersystems/signalservice/internal/push/PushServiceSocket$$ExternalSyntheticLambda10;
 Lorg/whispersystems/signalservice/internal/push/PushServiceSocket$$ExternalSyntheticLambda11;
 Lorg/whispersystems/signalservice/internal/push/PushServiceSocket$$ExternalSyntheticLambda12;
-Lorg/whispersystems/signalservice/internal/push/PushServiceSocket$$ExternalSyntheticLambda13;
-Lorg/whispersystems/signalservice/internal/push/PushServiceSocket$$ExternalSyntheticLambda15;
+Lorg/whispersystems/signalservice/internal/push/PushServiceSocket$$ExternalSyntheticLambda6;
 Lorg/whispersystems/signalservice/internal/push/PushServiceSocket$1;
 Lorg/whispersystems/signalservice/internal/push/PushServiceSocket$2;
 Lorg/whispersystems/signalservice/internal/push/PushServiceSocket$ConnectionHolder;
@@ -37177,6 +36826,7 @@ Lorg/whispersystems/signalservice/internal/push/exceptions/GroupPatchNotAccepted
 Lorg/whispersystems/signalservice/internal/push/http/AcceptLanguagesUtil;
 Lorg/whispersystems/signalservice/internal/util/BlacklistingTrustManager$1;
 Lorg/whispersystems/signalservice/internal/util/BlacklistingTrustManager;
+Lorg/whispersystems/signalservice/internal/util/Hex;
 Lorg/whispersystems/signalservice/internal/util/JsonUtil;
 Lorg/whispersystems/signalservice/internal/util/Util;
 Lorg/whispersystems/signalservice/internal/websocket/DefaultErrorMapper$Builder;
@@ -37194,13 +36844,13 @@ Lorg/whispersystems/signalservice/internal/websocket/WebSocketRequestMessage$Com
 Lorg/whispersystems/signalservice/internal/websocket/WebSocketRequestMessage;
 Lorg/whispersystems/signalservice/internal/websocket/WebSocketShadowingBridge;
 Lorg/whispersystems/util/StringUtil;
-Lrxdogtag2/DogTagMaybeObserver$$ExternalSyntheticLambda0;
-Lrxdogtag2/DogTagMaybeObserver$$ExternalSyntheticLambda1;
-Lrxdogtag2/DogTagMaybeObserver$$ExternalSyntheticLambda4;
-Lrxdogtag2/DogTagMaybeObserver$$ExternalSyntheticLambda5;
+Lrxdogtag2/DogTagMaybeObserver$$ExternalSyntheticLambda2;
+Lrxdogtag2/DogTagMaybeObserver$$ExternalSyntheticLambda3;
+Lrxdogtag2/DogTagMaybeObserver$$ExternalSyntheticLambda6;
+Lrxdogtag2/DogTagMaybeObserver$$ExternalSyntheticLambda7;
 Lrxdogtag2/DogTagMaybeObserver;
-Lrxdogtag2/DogTagObserver$$ExternalSyntheticLambda2;
-Lrxdogtag2/DogTagObserver$$ExternalSyntheticLambda3;
+Lrxdogtag2/DogTagObserver$$ExternalSyntheticLambda0;
+Lrxdogtag2/DogTagObserver$$ExternalSyntheticLambda1;
 Lrxdogtag2/DogTagObserver$$ExternalSyntheticLambda4;
 Lrxdogtag2/DogTagObserver$$ExternalSyntheticLambda5;
 Lrxdogtag2/DogTagObserver$$ExternalSyntheticLambda6;
@@ -37219,11 +36869,11 @@ Lrxdogtag2/DogTagSubscriber;
 Lrxdogtag2/ObserverHandler$-CC;
 Lrxdogtag2/ObserverHandler;
 Lrxdogtag2/RxDogTag$$ExternalSyntheticLambda0;
-Lrxdogtag2/RxDogTag$$ExternalSyntheticLambda1;
 Lrxdogtag2/RxDogTag$$ExternalSyntheticLambda2;
 Lrxdogtag2/RxDogTag$$ExternalSyntheticLambda3;
 Lrxdogtag2/RxDogTag$$ExternalSyntheticLambda4;
 Lrxdogtag2/RxDogTag$$ExternalSyntheticLambda5;
+Lrxdogtag2/RxDogTag$$ExternalSyntheticLambda6;
 Lrxdogtag2/RxDogTag$Builder;
 Lrxdogtag2/RxDogTag$Configuration$1;
 Lrxdogtag2/RxDogTag$Configuration;
@@ -37231,7 +36881,7 @@ Lrxdogtag2/RxDogTag$NonCheckingConsumer;
 Lrxdogtag2/RxDogTag;
 Lrxdogtag2/RxDogTagErrorReceiver;
 PLandroidx/activity/ComponentActivity$$ExternalSyntheticLambda2;->saveState()Landroid/os/Bundle;
-PLandroidx/activity/ComponentActivity;->$r8$lambda$OnwlVMZzrLePIRy-6IUDTtLLUV0(Landroidx/activity/ComponentActivity;)Landroid/os/Bundle;
+PLandroidx/activity/ComponentActivity;->$r8$lambda$71Q7mCYu4-mmbn-a-hJ05KgHel0(Landroidx/activity/ComponentActivity;)Landroid/os/Bundle;
 PLandroidx/activity/ComponentActivity;->lambda$new$1()Landroid/os/Bundle;
 PLandroidx/activity/ComponentActivity;->onSaveInstanceState(Landroid/os/Bundle;)V
 PLandroidx/activity/result/ActivityResultRegistry$LifecycleContainer;->clearObservers()V
@@ -37268,7 +36918,12 @@ PLandroidx/appcompat/widget/AppCompatAutoCompleteTextView;-><init>(Landroid/cont
 PLandroidx/appcompat/widget/AppCompatAutoCompleteTextView;->initEmojiKeyListener(Landroidx/appcompat/widget/AppCompatEmojiEditTextHelper;)V
 PLandroidx/appcompat/widget/AppCompatAutoCompleteTextView;->setCompoundDrawables(Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V
 PLandroidx/appcompat/widget/AppCompatDrawableManager$1;->getTintModeForDrawableRes(I)Landroid/graphics/PorterDuff$Mode;
+PLandroidx/appcompat/widget/AppCompatEditText;->onCreateInputConnection(Landroid/view/inputmethod/EditorInfo;)Landroid/view/inputmethod/InputConnection;
+PLandroidx/appcompat/widget/AppCompatEmojiEditTextHelper;->onCreateInputConnection(Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;)Landroid/view/inputmethod/InputConnection;
+PLandroidx/appcompat/widget/AppCompatHintHelper;->onCreateInputConnection(Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;Landroid/view/View;)Landroid/view/inputmethod/InputConnection;
+PLandroidx/appcompat/widget/AppCompatTextHelper;->populateSurroundingTextIfNeeded(Landroid/widget/TextView;Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;)V
 PLandroidx/appcompat/widget/ForwardingListener;->onViewDetachedFromWindow(Landroid/view/View;)V
+PLandroidx/appcompat/widget/LinearLayoutCompat;->getBaseline()I
 PLandroidx/appcompat/widget/ResourceManagerInternal;->addTintListToCache(Landroid/content/Context;ILandroid/content/res/ColorStateList;)V
 PLandroidx/appcompat/widget/ResourceManagerInternal;->getTintMode(I)Landroid/graphics/PorterDuff$Mode;
 PLandroidx/appcompat/widget/SearchView$10;-><init>(Landroidx/appcompat/widget/SearchView;)V
@@ -37337,12 +36992,17 @@ PLandroidx/coordinatorlayout/widget/CoordinatorLayout$SavedState;-><init>(Landro
 PLandroidx/coordinatorlayout/widget/CoordinatorLayout$SavedState;->writeToParcel(Landroid/os/Parcel;I)V
 PLandroidx/coordinatorlayout/widget/CoordinatorLayout;->onDetachedFromWindow()V
 PLandroidx/coordinatorlayout/widget/CoordinatorLayout;->onSaveInstanceState()Landroid/os/Parcelable;
+PLandroidx/core/app/ActivityCompat$Api21Impl;->startPostponedEnterTransition(Landroid/app/Activity;)V
+PLandroidx/core/app/ActivityCompat;->startPostponedEnterTransition(Landroid/app/Activity;)V
 PLandroidx/core/app/ComponentActivity;->onSaveInstanceState(Landroid/os/Bundle;)V
-PLandroidx/core/app/NotificationManagerCompat$Api23Impl$$ExternalSyntheticApiModelOutline1;->m(Landroid/app/NotificationManager;)[Landroid/service/notification/StatusBarNotification;
 PLandroidx/core/os/BundleKt;->bundleOf([Lkotlin/Pair;)Landroid/os/Bundle;
-PLandroidx/core/os/HandlerCompat$Api28Impl$$ExternalSyntheticApiModelOutline0;->m(Landroid/os/Handler;Ljava/lang/Runnable;Ljava/lang/Object;J)Z
 PLandroidx/core/os/HandlerCompat$Api28Impl;->postDelayed(Landroid/os/Handler;Ljava/lang/Runnable;Ljava/lang/Object;J)Z
 PLandroidx/core/os/HandlerCompat;->postDelayed(Landroid/os/Handler;Ljava/lang/Runnable;Ljava/lang/Object;J)Z
+PLandroidx/core/text/util/LinkifyCompat$$ExternalSyntheticLambda0;-><init>()V
+PLandroidx/core/text/util/LinkifyCompat;-><clinit>()V
+PLandroidx/core/text/util/LinkifyCompat;->addLinks(Landroid/text/Spannable;I)Z
+PLandroidx/core/text/util/LinkifyCompat;->shouldAddLinksFallbackToFramework()Z
+PLandroidx/core/view/NestedScrollingChildHelper;->stopNestedScroll()V
 PLandroidx/core/view/ViewCompat$Api16Impl;->hasTransientState(Landroid/view/View;)Z
 PLandroidx/core/view/ViewCompat;->hasTransientState(Landroid/view/View;)Z
 PLandroidx/core/view/ViewGroupKt$descendants$1;-><init>(Landroid/view/ViewGroup;Lkotlin/coroutines/Continuation;)V
@@ -37352,12 +37012,19 @@ PLandroidx/core/view/ViewKt$allViews$1;-><init>(Landroid/view/View;Lkotlin/corou
 PLandroidx/core/view/ViewKt$allViews$1;->create(Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
 PLandroidx/core/view/ViewKt$allViews$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 PLandroidx/core/view/ViewKt;->getAllViews(Landroid/view/View;)Lkotlin/sequences/Sequence;
+PLandroidx/core/view/ViewKt;->isVisible(Landroid/view/View;)Z
 PLandroidx/core/view/accessibility/AccessibilityEventCompat$Api19Impl;->getContentChangeTypes(Landroid/view/accessibility/AccessibilityEvent;)I
 PLandroidx/core/view/accessibility/AccessibilityEventCompat$Api19Impl;->setContentChangeTypes(Landroid/view/accessibility/AccessibilityEvent;I)V
 PLandroidx/core/view/accessibility/AccessibilityEventCompat;->getContentChangeTypes(Landroid/view/accessibility/AccessibilityEvent;)I
 PLandroidx/core/view/accessibility/AccessibilityEventCompat;->setContentChangeTypes(Landroid/view/accessibility/AccessibilityEvent;I)V
+PLandroidx/core/view/inputmethod/EditorInfoCompat$$ExternalSyntheticApiModelOutline0;->m(Landroid/view/inputmethod/EditorInfo;[Ljava/lang/String;)V
+PLandroidx/core/view/inputmethod/EditorInfoCompat;-><clinit>()V
+PLandroidx/core/view/inputmethod/EditorInfoCompat;->setContentMimeTypes(Landroid/view/inputmethod/EditorInfo;[Ljava/lang/String;)V
+PLandroidx/core/view/inputmethod/InputConnectionCompat$1;-><init>(Landroid/view/inputmethod/InputConnection;ZLandroidx/core/view/inputmethod/InputConnectionCompat$OnCommitContentListener;)V
+PLandroidx/core/view/inputmethod/InputConnectionCompat;->createWrapper(Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;Landroidx/core/view/inputmethod/InputConnectionCompat$OnCommitContentListener;)Landroid/view/inputmethod/InputConnection;
+PLandroidx/customview/poolingcontainer/PoolingContainer;->callPoolingContainerOnRelease(Landroid/view/View;)V
+PLandroidx/customview/poolingcontainer/PoolingContainer;->callPoolingContainerOnReleaseForChildren(Landroid/view/ViewGroup;)V
 PLandroidx/customview/poolingcontainer/PoolingContainer;->getPoolingContainerListenerHolder(Landroid/view/View;)Landroidx/customview/poolingcontainer/PoolingContainerListenerHolder;
-PLandroidx/customview/poolingcontainer/PoolingContainerListenerHolder;-><init>()V
 PLandroidx/customview/view/AbsSavedState$1;-><init>()V
 PLandroidx/customview/view/AbsSavedState$2;-><init>()V
 PLandroidx/customview/view/AbsSavedState;-><clinit>()V
@@ -37365,7 +37032,14 @@ PLandroidx/customview/view/AbsSavedState;-><init>()V
 PLandroidx/customview/view/AbsSavedState;-><init>(Landroid/os/Parcelable;)V
 PLandroidx/customview/view/AbsSavedState;-><init>(Landroidx/customview/view/AbsSavedState$1;)V
 PLandroidx/customview/view/AbsSavedState;->writeToParcel(Landroid/os/Parcel;I)V
+PLandroidx/emoji2/text/EmojiCompat;->updateEditorInfo(Landroid/view/inputmethod/EditorInfo;)V
 PLandroidx/emoji2/text/SpannableBuilder;->getSpanEnd(Ljava/lang/Object;)I
+PLandroidx/emoji2/viewsintegration/EmojiEditTextHelper$HelperInternal19;->onCreateInputConnection(Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;)Landroid/view/inputmethod/InputConnection;
+PLandroidx/emoji2/viewsintegration/EmojiEditTextHelper;->onCreateInputConnection(Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;)Landroid/view/inputmethod/InputConnection;
+PLandroidx/emoji2/viewsintegration/EmojiInputConnection$EmojiCompatDeleteHelper;-><init>()V
+PLandroidx/emoji2/viewsintegration/EmojiInputConnection$EmojiCompatDeleteHelper;->updateEditorInfoAttrs(Landroid/view/inputmethod/EditorInfo;)V
+PLandroidx/emoji2/viewsintegration/EmojiInputConnection;-><init>(Landroid/widget/TextView;Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;)V
+PLandroidx/emoji2/viewsintegration/EmojiInputConnection;-><init>(Landroid/widget/TextView;Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;Landroidx/emoji2/viewsintegration/EmojiInputConnection$EmojiCompatDeleteHelper;)V
 PLandroidx/fragment/app/Fragment$Api19Impl;->cancelPendingInputEvents(Landroid/view/View;)V
 PLandroidx/fragment/app/Fragment;->getHost()Ljava/lang/Object;
 PLandroidx/fragment/app/Fragment;->initState()V
@@ -37382,8 +37056,9 @@ PLandroidx/fragment/app/Fragment;->performStop()V
 PLandroidx/fragment/app/FragmentActivity$$ExternalSyntheticLambda0;->saveState()Landroid/os/Bundle;
 PLandroidx/fragment/app/FragmentActivity$HostCallbacks;->onGetHost()Landroidx/fragment/app/FragmentActivity;
 PLandroidx/fragment/app/FragmentActivity$HostCallbacks;->onGetHost()Ljava/lang/Object;
-PLandroidx/fragment/app/FragmentActivity;->$r8$lambda$t3WwJ1XbNlapyNW0l552nMkkXdo(Landroidx/fragment/app/FragmentActivity;)Landroid/os/Bundle;
+PLandroidx/fragment/app/FragmentActivity;->$r8$lambda$PiZLedL0JH1wIOGQM80pCH0fhkU(Landroidx/fragment/app/FragmentActivity;)Landroid/os/Bundle;
 PLandroidx/fragment/app/FragmentActivity;->lambda$init$0()Landroid/os/Bundle;
+PLandroidx/fragment/app/FragmentActivity;->supportStartPostponedEnterTransition()V
 PLandroidx/fragment/app/FragmentContainerView;->addDisappearingFragmentView(Landroid/view/View;)V
 PLandroidx/fragment/app/FragmentContainerView;->removeView(Landroid/view/View;)V
 PLandroidx/fragment/app/FragmentLifecycleCallbacksDispatcher;->dispatchOnFragmentDestroyed(Landroidx/fragment/app/Fragment;Z)V
@@ -37395,7 +37070,7 @@ PLandroidx/fragment/app/FragmentManager$$ExternalSyntheticLambda4;->saveState()L
 PLandroidx/fragment/app/FragmentManager$6;-><init>(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;Landroidx/fragment/app/FragmentResultListener;Landroidx/lifecycle/Lifecycle;)V
 PLandroidx/fragment/app/FragmentManager$6;->onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
 PLandroidx/fragment/app/FragmentManager$LifecycleAwareResultListener;-><init>(Landroidx/lifecycle/Lifecycle;Landroidx/fragment/app/FragmentResultListener;Landroidx/lifecycle/LifecycleEventObserver;)V
-PLandroidx/fragment/app/FragmentManager;->$r8$lambda$sido8p6zuWx0PQxIkv4qM-BRiGM(Landroidx/fragment/app/FragmentManager;)Landroid/os/Bundle;
+PLandroidx/fragment/app/FragmentManager;->$r8$lambda$RiacCGNf6NqHbI3ngibX25mGBMA(Landroidx/fragment/app/FragmentManager;)Landroid/os/Bundle;
 PLandroidx/fragment/app/FragmentManager;->access$000(Landroidx/fragment/app/FragmentManager;)Ljava/util/Map;
 PLandroidx/fragment/app/FragmentManager;->access$100(Landroidx/fragment/app/FragmentManager;)Ljava/util/Map;
 PLandroidx/fragment/app/FragmentManager;->dispatchDestroyView()V
@@ -37475,14 +37150,13 @@ PLandroidx/media3/common/util/ListenerSet$ListenerHolder;->release(Landroidx/med
 PLandroidx/media3/common/util/ListenerSet;->release()V
 PLandroidx/media3/common/util/Util;->createHandlerForCurrentLooper()Landroid/os/Handler;
 PLandroidx/media3/common/util/Util;->createHandlerForCurrentLooper(Landroid/os/Handler$Callback;)Landroid/os/Handler;
-PLandroidx/media3/exoplayer/AudioFocusManager$$ExternalSyntheticApiModelOutline1;->m(I)Landroid/media/AudioFocusRequest$Builder;
-PLandroidx/media3/exoplayer/AudioFocusManager$$ExternalSyntheticApiModelOutline2;->m()V
+PLandroidx/media3/exoplayer/AudioFocusManager$$ExternalSyntheticApiModelOutline0;->m(I)Landroid/media/AudioFocusRequest$Builder;
 PLandroidx/media3/exoplayer/AudioFocusManager$$ExternalSyntheticApiModelOutline3;->m(Landroid/media/AudioFocusRequest$Builder;Landroid/media/AudioAttributes;)Landroid/media/AudioFocusRequest$Builder;
 PLandroidx/media3/exoplayer/AudioFocusManager$$ExternalSyntheticApiModelOutline5;->m(Landroid/media/AudioFocusRequest$Builder;Landroid/media/AudioManager$OnAudioFocusChangeListener;)Landroid/media/AudioFocusRequest$Builder;
 PLandroidx/media3/exoplayer/AudioFocusManager$$ExternalSyntheticApiModelOutline6;->m(Landroid/media/AudioFocusRequest$Builder;)Landroid/media/AudioFocusRequest;
 PLandroidx/media3/session/ConnectedControllersManager$$ExternalSyntheticLambda0;-><init>(Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/MediaSession$ControllerInfo;)V
 PLandroidx/media3/session/ConnectedControllersManager$$ExternalSyntheticLambda0;->run()V
-PLandroidx/media3/session/ConnectedControllersManager;->$r8$lambda$Vom81RksdvuIVXyQfAu6pd1M7BY(Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/MediaSession$ControllerInfo;)V
+PLandroidx/media3/session/ConnectedControllersManager;->$r8$lambda$rzd9vU5j8dPQFbY2HKCFCnRfavQ(Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/MediaSession$ControllerInfo;)V
 PLandroidx/media3/session/ConnectedControllersManager;->lambda$removeController$0(Landroidx/media3/session/MediaSessionImpl;Landroidx/media3/session/MediaSession$ControllerInfo;)V
 PLandroidx/media3/session/ConnectedControllersManager;->removeController(Landroidx/media3/session/MediaSession$ControllerInfo;)V
 PLandroidx/media3/session/ConnectedControllersManager;->removeController(Ljava/lang/Object;)V
@@ -37490,22 +37164,22 @@ PLandroidx/media3/session/MediaController$$ExternalSyntheticLambda0;-><init>(Lan
 PLandroidx/media3/session/MediaController$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;)V
 PLandroidx/media3/session/MediaController$Builder$1;->onDisconnected(Landroidx/media3/session/MediaController;)V
 PLandroidx/media3/session/MediaController$Listener$-CC;->$default$onDisconnected(Landroidx/media3/session/MediaController$Listener;Landroidx/media3/session/MediaController;)V
-PLandroidx/media3/session/MediaController;->$r8$lambda$7Poy_IVrU20FjlOzoqG4RzKma48(Landroidx/media3/session/MediaController;Landroidx/media3/session/MediaController$Listener;)V
+PLandroidx/media3/session/MediaController;->$r8$lambda$-ghnn475jYMB33P99C1oZ7OGehU(Landroidx/media3/session/MediaController;Landroidx/media3/session/MediaController$Listener;)V
 PLandroidx/media3/session/MediaController;->createDisconnectedFuture()Lcom/google/common/util/concurrent/ListenableFuture;
 PLandroidx/media3/session/MediaController;->lambda$release$0(Landroidx/media3/session/MediaController$Listener;)V
 PLandroidx/media3/session/MediaController;->release()V
 PLandroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda103;-><init>(Landroidx/media3/session/MediaControllerImplBase;)V
 PLandroidx/media3/session/MediaControllerImplBase$$ExternalSyntheticLambda103;->run()V
 PLandroidx/media3/session/MediaControllerImplBase$FlushCommandQueueHandler;->release()V
-PLandroidx/media3/session/MediaControllerImplBase;->$r8$lambda$tIEgcrLv3SECRV9I_ggVsbUKXeY(Landroidx/media3/session/MediaControllerImplBase;)V
+PLandroidx/media3/session/MediaControllerImplBase;->$r8$lambda$JozrRlNWXSGbLKKHBURtUrBgq5E(Landroidx/media3/session/MediaControllerImplBase;)V
 PLandroidx/media3/session/MediaControllerImplBase;->lambda$release$4()V
 PLandroidx/media3/session/MediaControllerImplBase;->release()V
 PLandroidx/media3/session/MediaControllerStub;->destroy()V
 PLandroidx/media3/session/MediaSession$Callback$-CC;->$default$onDisconnected(Landroidx/media3/session/MediaSession$Callback;Landroidx/media3/session/MediaSession;Landroidx/media3/session/MediaSession$ControllerInfo;)V
 PLandroidx/media3/session/MediaSessionImpl;->onDisconnectedOnHandler(Landroidx/media3/session/MediaSession$ControllerInfo;)V
-PLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda11;-><init>(Landroidx/media3/session/MediaSessionStub;Landroidx/media3/session/IMediaController;)V
-PLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda11;->run()V
-PLandroidx/media3/session/MediaSessionStub;->$r8$lambda$-z-kXYeUiIo9LEMOQQqDz14Ng0c(Landroidx/media3/session/MediaSessionStub;Landroidx/media3/session/IMediaController;)V
+PLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda12;-><init>(Landroidx/media3/session/MediaSessionStub;Landroidx/media3/session/IMediaController;)V
+PLandroidx/media3/session/MediaSessionStub$$ExternalSyntheticLambda12;->run()V
+PLandroidx/media3/session/MediaSessionStub;->$r8$lambda$1vN0gC2ZaTovIExjX5xTnwlbne8(Landroidx/media3/session/MediaSessionStub;Landroidx/media3/session/IMediaController;)V
 PLandroidx/media3/session/MediaSessionStub;->lambda$release$18(Landroidx/media3/session/IMediaController;)V
 PLandroidx/media3/session/MediaSessionStub;->release(Landroidx/media3/session/IMediaController;I)V
 PLandroidx/media3/session/SequencedFutureManager;->lazyRelease(JLjava/lang/Runnable;)V
@@ -37527,8 +37201,8 @@ PLandroidx/navigation/fragment/FragmentNavigator$sam$androidx_lifecycle_Observer
 PLandroidx/navigation/fragment/FragmentNavigator;->onSaveState()Landroid/os/Bundle;
 PLandroidx/navigation/fragment/NavHostFragment$navHostController$2$$ExternalSyntheticLambda0;->saveState()Landroid/os/Bundle;
 PLandroidx/navigation/fragment/NavHostFragment$navHostController$2$$ExternalSyntheticLambda1;->saveState()Landroid/os/Bundle;
-PLandroidx/navigation/fragment/NavHostFragment$navHostController$2;->$r8$lambda$S8rYz5PdxQ_qmpQw5Wg04g8YyYI(Landroidx/navigation/fragment/NavHostFragment;)Landroid/os/Bundle;
-PLandroidx/navigation/fragment/NavHostFragment$navHostController$2;->$r8$lambda$yvpdz-7lzmuHOSkQDGqC7TUxHHI(Landroidx/navigation/NavHostController;)Landroid/os/Bundle;
+PLandroidx/navigation/fragment/NavHostFragment$navHostController$2;->$r8$lambda$Snlvm-YijRrPtpWtLB8mhNVYvCo(Landroidx/navigation/NavHostController;)Landroid/os/Bundle;
+PLandroidx/navigation/fragment/NavHostFragment$navHostController$2;->$r8$lambda$xJM-NGajPIx0z_M5w2gxGc8Uzlg(Landroidx/navigation/fragment/NavHostFragment;)Landroid/os/Bundle;
 PLandroidx/navigation/fragment/NavHostFragment$navHostController$2;->invoke$lambda$5$lambda$2(Landroidx/navigation/NavHostController;)Landroid/os/Bundle;
 PLandroidx/navigation/fragment/NavHostFragment$navHostController$2;->invoke$lambda$5$lambda$4(Landroidx/navigation/fragment/NavHostFragment;)Landroid/os/Bundle;
 PLandroidx/navigation/fragment/NavHostFragment;->onDestroyView()V
@@ -37545,8 +37219,8 @@ PLandroidx/profileinstaller/ProfileInstaller;->writeProfile(Landroid/content/Con
 PLandroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLambda1;->run()V
 PLandroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLambda2;-><init>(Landroid/content/Context;)V
 PLandroidx/profileinstaller/ProfileInstallerInitializer$$ExternalSyntheticLambda2;->run()V
-PLandroidx/profileinstaller/ProfileInstallerInitializer;->$r8$lambda$nkOIpN4NfyreWbcXjHv0xCvwgTY(Landroid/content/Context;)V
-PLandroidx/profileinstaller/ProfileInstallerInitializer;->$r8$lambda$nvFqT5BztGB-MvszW9GUTUoI9rw(Landroid/content/Context;)V
+PLandroidx/profileinstaller/ProfileInstallerInitializer;->$r8$lambda$NsMAloYpbbNbo7OHskmPQsgaOhM(Landroid/content/Context;)V
+PLandroidx/profileinstaller/ProfileInstallerInitializer;->$r8$lambda$VUbECJrladThvzfJ9dnTNG05Na4(Landroid/content/Context;)V
 PLandroidx/profileinstaller/ProfileInstallerInitializer;->lambda$installAfterDelay$1(Landroid/content/Context;)V
 PLandroidx/profileinstaller/ProfileInstallerInitializer;->lambda$writeInBackground$2(Landroid/content/Context;)V
 PLandroidx/profileinstaller/ProfileInstallerInitializer;->writeInBackground(Landroid/content/Context;)V
@@ -37560,15 +37234,23 @@ PLandroidx/profileinstaller/ProfileVerifier;->writeProfileVerification(Landroid/
 PLandroidx/recyclerview/widget/AdapterListUpdateCallback;->onChanged(IILjava/lang/Object;)V
 PLandroidx/recyclerview/widget/AsyncDifferConfig;->getDiffCallback()Landroidx/recyclerview/widget/DiffUtil$ItemCallback;
 PLandroidx/recyclerview/widget/AsyncListDiffer$1$1;->areContentsTheSame(II)Z
+PLandroidx/recyclerview/widget/AsyncListDiffer$1$1;->areItemsTheSame(II)Z
 PLandroidx/recyclerview/widget/AsyncListDiffer$1$1;->getChangePayload(II)Ljava/lang/Object;
-PLandroidx/recyclerview/widget/BatchingListUpdateCallback;->onChanged(IILjava/lang/Object;)V
 PLandroidx/recyclerview/widget/ChildHelper;->removeViewAt(I)V
+PLandroidx/recyclerview/widget/ConcatAdapter;->onBindViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
+PLandroidx/recyclerview/widget/ConcatAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 PLandroidx/recyclerview/widget/ConcatAdapter;->onDetachedFromRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
+PLandroidx/recyclerview/widget/ConcatAdapter;->onViewAttachedToWindow(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 PLandroidx/recyclerview/widget/ConcatAdapter;->onViewDetachedFromWindow(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 PLandroidx/recyclerview/widget/ConcatAdapter;->onViewRecycled(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+PLandroidx/recyclerview/widget/ConcatAdapterController;->getWrapper(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Landroidx/recyclerview/widget/NestedAdapterWrapper;
+PLandroidx/recyclerview/widget/ConcatAdapterController;->onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 PLandroidx/recyclerview/widget/ConcatAdapterController;->onDetachedFromRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
+PLandroidx/recyclerview/widget/ConcatAdapterController;->onItemRangeInserted(Landroidx/recyclerview/widget/NestedAdapterWrapper;II)V
+PLandroidx/recyclerview/widget/ConcatAdapterController;->onViewAttachedToWindow(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 PLandroidx/recyclerview/widget/ConcatAdapterController;->onViewDetachedFromWindow(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 PLandroidx/recyclerview/widget/ConcatAdapterController;->onViewRecycled(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+PLandroidx/recyclerview/widget/ConversationLayoutManager;->scrollToPositionWithOffset(IILkotlin/jvm/functions/Function0;)V
 PLandroidx/recyclerview/widget/DiffUtil$CenteredArray;->get(I)I
 PLandroidx/recyclerview/widget/DiffUtil$CenteredArray;->set(II)V
 PLandroidx/recyclerview/widget/DiffUtil$Range;-><init>()V
@@ -37579,6 +37261,7 @@ PLandroidx/recyclerview/widget/DiffUtil$Snake;->hasAdditionOrRemoval()Z
 PLandroidx/recyclerview/widget/DiffUtil$Snake;->toDiagonal()Landroidx/recyclerview/widget/DiffUtil$Diagonal;
 PLandroidx/recyclerview/widget/DiffUtil;->forward(Landroidx/recyclerview/widget/DiffUtil$Range;Landroidx/recyclerview/widget/DiffUtil$Callback;Landroidx/recyclerview/widget/DiffUtil$CenteredArray;Landroidx/recyclerview/widget/DiffUtil$CenteredArray;I)Landroidx/recyclerview/widget/DiffUtil$Snake;
 PLandroidx/recyclerview/widget/GapWorker$LayoutPrefetchRegistryImpl;->lastPrefetchIncludedPosition(I)Z
+PLandroidx/recyclerview/widget/GapWorker;->remove(Landroidx/recyclerview/widget/RecyclerView;)V
 PLandroidx/recyclerview/widget/ItemTouchHelper;->endRecoverAnimation(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Z)V
 PLandroidx/recyclerview/widget/ItemTouchHelper;->onChildViewDetachedFromWindow(Landroid/view/View;)V
 PLandroidx/recyclerview/widget/ItemTouchHelper;->removeChildDrawingOrderCallbackIfNecessary(Landroid/view/View;)V
@@ -37589,7 +37272,12 @@ PLandroidx/recyclerview/widget/LinearLayoutManager$SavedState;->invalidateAnchor
 PLandroidx/recyclerview/widget/LinearLayoutManager$SavedState;->writeToParcel(Landroid/os/Parcel;I)V
 PLandroidx/recyclerview/widget/LinearLayoutManager;->getChildClosestToEnd()Landroid/view/View;
 PLandroidx/recyclerview/widget/LinearLayoutManager;->getChildClosestToStart()Landroid/view/View;
+PLandroidx/recyclerview/widget/LinearLayoutManager;->onDetachedFromWindow(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$Recycler;)V
 PLandroidx/recyclerview/widget/LinearLayoutManager;->onSaveInstanceState()Landroid/os/Parcelable;
+PLandroidx/recyclerview/widget/LinearLayoutManager;->scrollToPositionWithOffset(II)V
+PLandroidx/recyclerview/widget/NestedAdapterWrapper$1;->onItemRangeInserted(II)V
+PLandroidx/recyclerview/widget/NestedAdapterWrapper;->onBindViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
+PLandroidx/recyclerview/widget/NestedAdapterWrapper;->onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
 PLandroidx/recyclerview/widget/OrientationHelper;->getTotalSpaceChange()I
 PLandroidx/recyclerview/widget/RecyclerView$5;->removeViewAt(I)V
 PLandroidx/recyclerview/widget/RecyclerView$6;->markViewHoldersUpdated(IILjava/lang/Object;)V
@@ -37601,15 +37289,24 @@ PLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;->buildAdapterChangeFla
 PLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;->canReuseUpdatedViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Z
 PLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;->canReuseUpdatedViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Ljava/util/List;)Z
 PLandroidx/recyclerview/widget/RecyclerView$ItemAnimator;->recordPreLayoutInformation(Landroidx/recyclerview/widget/RecyclerView$State;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;ILjava/util/List;)Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;
-PLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->isMeasurementUpToDate(III)Z
+PLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->dispatchDetachedFromWindow(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$Recycler;)V
+PLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->generateLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
+PLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->getItemCount()I
+PLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onAddFocusables(Landroidx/recyclerview/widget/RecyclerView;Ljava/util/ArrayList;II)Z
+PLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onDetachedFromWindow(Landroidx/recyclerview/widget/RecyclerView;)V
+PLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onDetachedFromWindow(Landroidx/recyclerview/widget/RecyclerView;Landroidx/recyclerview/widget/RecyclerView$Recycler;)V
 PLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onItemsUpdated(Landroidx/recyclerview/widget/RecyclerView;II)V
 PLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->onItemsUpdated(Landroidx/recyclerview/widget/RecyclerView;IILjava/lang/Object;)V
 PLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->removeAndRecycleViewAt(ILandroidx/recyclerview/widget/RecyclerView$Recycler;)V
 PLandroidx/recyclerview/widget/RecyclerView$LayoutManager;->removeViewAt(I)V
+PLandroidx/recyclerview/widget/RecyclerView$LayoutParams;-><init>(Landroid/view/ViewGroup$MarginLayoutParams;)V
+PLandroidx/recyclerview/widget/RecyclerView$OnScrollListener;->onScrolled(Landroidx/recyclerview/widget/RecyclerView;II)V
 PLandroidx/recyclerview/widget/RecyclerView$RecycledViewPool;->detach()V
 PLandroidx/recyclerview/widget/RecyclerView$RecycledViewPool;->putRecycledView(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 PLandroidx/recyclerview/widget/RecyclerView$Recycler;->addViewHolderToRecycledViewPool(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Z)V
 PLandroidx/recyclerview/widget/RecyclerView$Recycler;->dispatchViewRecycled(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+PLandroidx/recyclerview/widget/RecyclerView$Recycler;->onDetachedFromWindow()V
+PLandroidx/recyclerview/widget/RecyclerView$Recycler;->poolingContainerDetach(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 PLandroidx/recyclerview/widget/RecyclerView$Recycler;->recycleCachedViewAt(I)V
 PLandroidx/recyclerview/widget/RecyclerView$Recycler;->recycleView(Landroid/view/View;)V
 PLandroidx/recyclerview/widget/RecyclerView$Recycler;->recycleViewHolderInternal(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
@@ -37622,26 +37319,34 @@ PLandroidx/recyclerview/widget/RecyclerView$SavedState;->writeToParcel(Landroid/
 PLandroidx/recyclerview/widget/RecyclerView$SimpleOnItemTouchListener;-><init>()V
 PLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->addChangePayload(Ljava/lang/Object;)V
 PLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->doesTransientStatePreventRecycling()Z
+PLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->getAbsoluteAdapterPosition()I
 PLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->getOldPosition()I
 PLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->isRecyclable()Z
 PLandroidx/recyclerview/widget/RecyclerView$ViewHolder;->resetInternal()V
 PLandroidx/recyclerview/widget/RecyclerView;->access$300(Landroidx/recyclerview/widget/RecyclerView;Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;)V
 PLandroidx/recyclerview/widget/RecyclerView;->access$400(Landroidx/recyclerview/widget/RecyclerView;Landroid/view/View;)V
+PLandroidx/recyclerview/widget/RecyclerView;->addFocusables(Ljava/util/ArrayList;II)V
 PLandroidx/recyclerview/widget/RecyclerView;->animateChange(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;ZZ)V
 PLandroidx/recyclerview/widget/RecyclerView;->canReuseUpdatedViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Z
 PLandroidx/recyclerview/widget/RecyclerView;->clearNestedRecyclerViewIfNotNested(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 PLandroidx/recyclerview/widget/RecyclerView;->dispatchChildDetached(Landroid/view/View;)V
 PLandroidx/recyclerview/widget/RecyclerView;->dispatchSaveInstanceState(Landroid/util/SparseArray;)V
+PLandroidx/recyclerview/widget/RecyclerView;->generateLayoutParams(Landroid/view/ViewGroup$LayoutParams;)Landroid/view/ViewGroup$LayoutParams;
 PLandroidx/recyclerview/widget/RecyclerView;->onChildDetachedFromWindow(Landroid/view/View;)V
+PLandroidx/recyclerview/widget/RecyclerView;->onDetachedFromWindow()V
 PLandroidx/recyclerview/widget/RecyclerView;->onSaveInstanceState()Landroid/os/Parcelable;
 PLandroidx/recyclerview/widget/RecyclerView;->removeOnScrollListener(Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;)V
-PLandroidx/recyclerview/widget/RecyclerView;->viewRangeUpdate(IILjava/lang/Object;)V
+PLandroidx/recyclerview/widget/RecyclerView;->stopNestedScroll()V
 PLandroidx/recyclerview/widget/RecyclerViewAccessibilityDelegate$ItemDelegate;->getAndRemoveOriginalDelegateForItem(Landroid/view/View;)Landroidx/core/view/AccessibilityDelegateCompat;
+PLandroidx/recyclerview/widget/ViewInfoStore$InfoRecord;->drainCache()V
 PLandroidx/recyclerview/widget/ViewInfoStore;->addToOldChangeHolders(JLandroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
-PLandroidx/recyclerview/widget/ViewInfoStore;->isDisappearing(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Z
+PLandroidx/recyclerview/widget/ViewInfoStore;->onDetach()V
 PLandroidx/recyclerview/widget/ViewInfoStore;->popFromPostLayout(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;
 PLandroidx/recyclerview/widget/ViewInfoStore;->popFromPreLayout(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;
 PLandroidx/recyclerview/widget/ViewInfoStore;->removeViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+PLandroidx/recyclerview/widget/ViewTypeStorage$IsolatedViewTypeStorage$WrapperViewTypeLookup;->globalToLocal(I)I
+PLandroidx/recyclerview/widget/ViewTypeStorage$IsolatedViewTypeStorage;->getWrapperForGlobalType(I)Landroidx/recyclerview/widget/NestedAdapterWrapper;
+PLandroidx/recyclerview/widget/ViewTypeStorage$IsolatedViewTypeStorage;->obtainViewType(Landroidx/recyclerview/widget/NestedAdapterWrapper;)I
 PLandroidx/savedstate/Recreator$SavedStateProvider;-><init>(Landroidx/savedstate/SavedStateRegistry;)V
 PLandroidx/savedstate/Recreator$SavedStateProvider;->add(Ljava/lang/String;)V
 PLandroidx/savedstate/SavedStateRegistry;->runOnNextRecreation(Ljava/lang/Class;)V
@@ -37650,12 +37355,26 @@ PLcom/airbnb/lottie/LottieAnimationView$SavedState$1;-><init>()V
 PLcom/airbnb/lottie/LottieAnimationView$SavedState;-><clinit>()V
 PLcom/airbnb/lottie/LottieAnimationView$SavedState;-><init>(Landroid/os/Parcelable;)V
 PLcom/airbnb/lottie/LottieAnimationView$SavedState;->writeToParcel(Landroid/os/Parcel;I)V
+PLcom/airbnb/lottie/LottieAnimationView;->addValueCallback(Lcom/airbnb/lottie/model/KeyPath;Ljava/lang/Object;Lcom/airbnb/lottie/value/LottieValueCallback;)V
 PLcom/airbnb/lottie/LottieAnimationView;->onSaveInstanceState()Landroid/os/Parcelable;
 PLcom/airbnb/lottie/LottieDrawable;->getImageAssetsFolder()Ljava/lang/String;
 PLcom/airbnb/lottie/LottieDrawable;->getProgress()F
 PLcom/airbnb/lottie/LottieDrawable;->getRepeatCount()I
 PLcom/airbnb/lottie/LottieDrawable;->getRepeatMode()I
 PLcom/airbnb/lottie/LottieDrawable;->isAnimatingOrWillAnimateOnVisible()Z
+PLcom/airbnb/lottie/animation/keyframe/PathKeyframeAnimation;-><init>(Ljava/util/List;)V
+PLcom/airbnb/lottie/model/layer/BaseLayer;->removeAnimation(Lcom/airbnb/lottie/animation/keyframe/BaseKeyframeAnimation;)V
+PLcom/airbnb/lottie/value/LottieValueCallback;-><init>(Ljava/lang/Object;)V
+PLcom/annimon/stream/Optional;->empty()Lcom/annimon/stream/Optional;
+PLcom/annimon/stream/Optional;->orElse(Ljava/lang/Object;)Ljava/lang/Object;
+PLcom/annimon/stream/Stream;->empty()Lcom/annimon/stream/Stream;
+PLcom/annimon/stream/Stream;->max(Ljava/util/Comparator;)Lcom/annimon/stream/Optional;
+PLcom/annimon/stream/Stream;->reduce(Lcom/annimon/stream/function/BiFunction;)Lcom/annimon/stream/Optional;
+PLcom/annimon/stream/function/BinaryOperator$Util$2;-><init>(Ljava/util/Comparator;)V
+PLcom/annimon/stream/function/BinaryOperator$Util;->maxBy(Ljava/util/Comparator;)Lcom/annimon/stream/function/BinaryOperator;
+PLcom/annimon/stream/operator/IntRangeClosed;-><init>(II)V
+PLcom/annimon/stream/operator/IntRangeClosed;->hasNext()Z
+PLcom/annimon/stream/operator/IntRangeClosed;->nextInt()I
 PLcom/bumptech/glide/Glide;->unregisterRequestManager(Lcom/bumptech/glide/RequestManager;)V
 PLcom/bumptech/glide/RequestManager;->onDestroy()V
 PLcom/bumptech/glide/load/Options;->equals(Ljava/lang/Object;)Z
@@ -37706,10 +37425,31 @@ PLcom/google/android/material/expandable/ExpandableWidgetHelper;->onSaveInstance
 PLcom/google/android/material/floatingactionbutton/FloatingActionButton;->onDetachedFromWindow()V
 PLcom/google/android/material/floatingactionbutton/FloatingActionButton;->onSaveInstanceState()Landroid/os/Parcelable;
 PLcom/google/android/material/floatingactionbutton/FloatingActionButtonImpl;->onDetachedFromWindow()V
+PLcom/google/android/material/imageview/ShapeableImageView;->drawStroke(Landroid/graphics/Canvas;)V
+PLcom/google/android/material/imageview/ShapeableImageView;->getContentPaddingBottom()I
+PLcom/google/android/material/imageview/ShapeableImageView;->getContentPaddingLeft()I
+PLcom/google/android/material/imageview/ShapeableImageView;->getContentPaddingRight()I
+PLcom/google/android/material/imageview/ShapeableImageView;->getContentPaddingTop()I
+PLcom/google/android/material/imageview/ShapeableImageView;->getPaddingBottom()I
+PLcom/google/android/material/imageview/ShapeableImageView;->getPaddingLeft()I
+PLcom/google/android/material/imageview/ShapeableImageView;->getPaddingRight()I
+PLcom/google/android/material/imageview/ShapeableImageView;->getPaddingTop()I
+PLcom/google/android/material/imageview/ShapeableImageView;->isContentPaddingRelative()Z
+PLcom/google/android/material/imageview/ShapeableImageView;->onDraw(Landroid/graphics/Canvas;)V
+PLcom/google/android/material/imageview/ShapeableImageView;->onMeasure(II)V
+PLcom/google/android/material/imageview/ShapeableImageView;->onSizeChanged(IIII)V
+PLcom/google/android/material/imageview/ShapeableImageView;->setPadding(IIII)V
+PLcom/google/android/material/imageview/ShapeableImageView;->updateShapeMask(II)V
+PLcom/google/android/material/shape/RelativeCornerSize;->getCornerSize(Landroid/graphics/RectF;)F
+PLcom/google/android/material/shape/RelativeCornerSize;->getMaxCornerSize(Landroid/graphics/RectF;)F
 PLcom/google/android/material/stateful/ExtendableSavedState$1;-><init>()V
 PLcom/google/android/material/stateful/ExtendableSavedState;-><clinit>()V
 PLcom/google/android/material/stateful/ExtendableSavedState;-><init>(Landroid/os/Parcelable;)V
 PLcom/google/android/material/stateful/ExtendableSavedState;->writeToParcel(Landroid/os/Parcel;I)V
+PLcom/google/common/collect/Sets$2;-><init>(Ljava/util/Set;Ljava/util/Set;)V
+PLcom/google/common/collect/Sets$2;->isEmpty()Z
+PLcom/google/common/collect/Sets$SetView;-><init>()V
+PLcom/google/common/collect/Sets$SetView;-><init>(Lcom/google/common/collect/Sets$1;)V
 PLcom/google/firebase/messaging/FcmLifecycleCallbacks;->onActivitySaveInstanceState(Landroid/app/Activity;Landroid/os/Bundle;)V
 PLcom/pnikosis/materialishprogress/ProgressWheel$WheelSavedState$1;-><init>()V
 PLcom/pnikosis/materialishprogress/ProgressWheel$WheelSavedState;-><clinit>()V
@@ -37725,7 +37465,7 @@ PLio/reactivex/rxjava3/core/Maybe;->fromCallable(Ljava/util/concurrent/Callable;
 PLio/reactivex/rxjava3/core/Maybe;->observeOn(Lio/reactivex/rxjava3/core/Scheduler;)Lio/reactivex/rxjava3/core/Maybe;
 PLio/reactivex/rxjava3/core/Observable;->distinctUntilChanged(Lio/reactivex/rxjava3/functions/BiPredicate;)Lio/reactivex/rxjava3/core/Observable;
 PLio/reactivex/rxjava3/core/Scheduler$PeriodicDirectTask;->dispose()V
-PLio/reactivex/rxjava3/disposables/CompositeDisposable;->clear()V
+PLio/reactivex/rxjava3/internal/disposables/CancellableDisposable;->dispose()V
 PLio/reactivex/rxjava3/internal/disposables/EmptyDisposable;->complete(Lio/reactivex/rxjava3/core/MaybeObserver;)V
 PLio/reactivex/rxjava3/internal/disposables/EmptyDisposable;->dispose()V
 PLio/reactivex/rxjava3/internal/disposables/SequentialDisposable;->dispose()V
@@ -37742,7 +37482,6 @@ PLio/reactivex/rxjava3/internal/operators/flowable/FlowableCreate$BaseEmitter;->
 PLio/reactivex/rxjava3/internal/operators/flowable/FlowableCreate$LatestAsyncEmitter;->onUnsubscribed()V
 PLio/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservable$SubscriberObserver;->cancel()V
 PLio/reactivex/rxjava3/internal/operators/flowable/FlowableInterval$IntervalSubscriber;->cancel()V
-PLio/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn$BaseObserveOnSubscriber;->cancel()V
 PLio/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn$BaseObserveOnSubscriber;->clear()V
 PLio/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn$BaseObserveOnSubscriber;->requestFusion(I)I
 PLio/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn$ObserveOnSubscriber;->poll()Ljava/lang/Object;
@@ -37750,6 +37489,8 @@ PLio/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn$ObserveOnSu
 PLio/reactivex/rxjava3/internal/operators/flowable/FlowableRefCount$RefCountSubscriber;->cancel()V
 PLio/reactivex/rxjava3/internal/operators/flowable/FlowableRefCount;->cancel(Lio/reactivex/rxjava3/internal/operators/flowable/FlowableRefCount$RefConnection;)V
 PLio/reactivex/rxjava3/internal/operators/flowable/FlowableRefCount;->timeout(Lio/reactivex/rxjava3/internal/operators/flowable/FlowableRefCount$RefConnection;)V
+PLio/reactivex/rxjava3/internal/operators/flowable/FlowableReplay$BoundedReplayBuffer;->removeFirst()V
+PLio/reactivex/rxjava3/internal/operators/flowable/FlowableReplay$BoundedReplayBuffer;->setFirst(Lio/reactivex/rxjava3/internal/operators/flowable/FlowableReplay$Node;)V
 PLio/reactivex/rxjava3/internal/operators/flowable/FlowableReplay$InnerSubscription;->cancel()V
 PLio/reactivex/rxjava3/internal/operators/flowable/FlowableReplay$InnerSubscription;->dispose()V
 PLio/reactivex/rxjava3/internal/operators/flowable/FlowableReplay$ReplaySubscriber;->dispose()V
@@ -37819,6 +37560,7 @@ PLio/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest$Lat
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest$LatestCoordinator;->dispose()V
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap$ConcatMapDelayErrorObserver$DelayErrorInnerObserver;->dispose()V
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap$ConcatMapDelayErrorObserver;->dispose()V
+PLio/reactivex/rxjava3/internal/operators/observable/ObservableCreate$CreateEmitter;->dispose()V
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEach$DoOnEachObserver;->dispose()V
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe$FlatMapMaybeObserver$InnerObserver;-><init>(Lio/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe$FlatMapMaybeObserver;)V
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe$FlatMapMaybeObserver$InnerObserver;->onSubscribe(Lio/reactivex/rxjava3/disposables/Disposable;)V
@@ -37828,6 +37570,8 @@ PLio/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe$Flat
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe$FlatMapMaybeObserver;->onSubscribe(Lio/reactivex/rxjava3/disposables/Disposable;)V
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe;->subscribeActual(Lio/reactivex/rxjava3/core/Observer;)V
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle$FlatMapSingleObserver;->dispose()V
+PLio/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle$FlatMapSingleObserver;->drainLoop()V
+PLio/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle$FlatMapSingleObserver;->getOrCreateQueue()Lio/reactivex/rxjava3/internal/queue/SpscLinkedArrayQueue;
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableFromArray$FromArrayDisposable;->dispose()V
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableFromPublisher$PublisherSubscriber;-><init>(Lio/reactivex/rxjava3/core/Observer;)V
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableFromPublisher$PublisherSubscriber;->dispose()V
@@ -37838,6 +37582,7 @@ PLio/reactivex/rxjava3/internal/operators/observable/ObservableMap$MapObserver;-
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableObserveOn$ObserveOnObserver;->clear()V
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableObserveOn$ObserveOnObserver;->isEmpty()Z
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableRefCount;->timeout(Lio/reactivex/rxjava3/internal/operators/observable/ObservableRefCount$RefConnection;)V
+PLio/reactivex/rxjava3/internal/operators/observable/ObservableReplay$BoundedReplayBuffer;->setFirst(Lio/reactivex/rxjava3/internal/operators/observable/ObservableReplay$Node;)V
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableReplay$ReplayObserver;->dispose()V
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableReplay;->reset()V
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableSampleTimed$SampleTimedNoLast;->complete()V
@@ -37851,8 +37596,11 @@ PLio/reactivex/rxjava3/internal/operators/observable/ObservableSkip$SkipObserver
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap$SwitchMapObserver;->dispose()V
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap$SwitchMapObserver;->disposeInner()V
 PLio/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed$DebounceTimedObserver;->dispose()V
+PLio/reactivex/rxjava3/internal/queue/MpscLinkedQueue;->isEmpty()Z
+PLio/reactivex/rxjava3/internal/queue/MpscLinkedQueue;->lvConsumerNode()Lio/reactivex/rxjava3/internal/queue/MpscLinkedQueue$LinkedQueueNode;
 PLio/reactivex/rxjava3/internal/queue/SpscArrayQueue;->clear()V
 PLio/reactivex/rxjava3/internal/queue/SpscArrayQueue;->isEmpty()Z
+PLio/reactivex/rxjava3/internal/schedulers/AbstractDirectTask;->cancelFuture(Ljava/util/concurrent/Future;)V
 PLio/reactivex/rxjava3/internal/schedulers/DisposeOnCancel;->cancel(Z)Z
 PLio/reactivex/rxjava3/internal/schedulers/ScheduledRunnable;->dispose()V
 PLio/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriber;->cancel()V
@@ -37878,7 +37626,6 @@ PLio/reactivex/rxjava3/observers/SerializedObserver;->onComplete()V
 PLio/reactivex/rxjava3/processors/BehaviorProcessor$BehaviorSubscription;->cancel()V
 PLio/reactivex/rxjava3/processors/BehaviorProcessor;->remove(Lio/reactivex/rxjava3/processors/BehaviorProcessor$BehaviorSubscription;)V
 PLio/reactivex/rxjava3/processors/PublishProcessor$PublishSubscription;->cancel()V
-PLio/reactivex/rxjava3/processors/PublishProcessor$PublishSubscription;->onNext(Ljava/lang/Object;)V
 PLio/reactivex/rxjava3/processors/PublishProcessor;->remove(Lio/reactivex/rxjava3/processors/PublishProcessor$PublishSubscription;)V
 PLio/reactivex/rxjava3/subjects/BehaviorSubject;->onComplete()V
 PLio/reactivex/rxjava3/subjects/BehaviorSubject;->terminate(Ljava/lang/Object;)[Lio/reactivex/rxjava3/subjects/BehaviorSubject$BehaviorDisposable;
@@ -37886,8 +37633,31 @@ PLio/reactivex/rxjava3/subjects/PublishSubject$PublishDisposable;->dispose()V
 PLio/reactivex/rxjava3/subjects/PublishSubject;->remove(Lio/reactivex/rxjava3/subjects/PublishSubject$PublishDisposable;)V
 PLio/reactivex/rxjava3/subjects/SerializedSubject;->test(Ljava/lang/Object;)Z
 PLj$/util/DesugarCollections;->a()Ljava/lang/reflect/Constructor;
+PLj$/util/Optional;->ifPresent(Lj$/util/function/Consumer;)V
 PLj$/util/d;->a(Ljava/util/Set;Ljava/lang/Object;)Ljava/util/Set;
 PLj$/util/d;->keySet()Ljava/util/Set;
+PLj$/util/function/b;-><init>(Ljava/util/Comparator;I)V
+PLj$/util/stream/B1;-><init>(Lj$/util/stream/V2;Ljava/lang/Object;I)V
+PLj$/util/stream/B1;->d0()Lj$/util/stream/Q1;
+PLj$/util/stream/F1;-><init>(Lj$/util/function/BinaryOperator;)V
+PLj$/util/stream/F1;->accept(Ljava/lang/Object;)V
+PLj$/util/stream/F1;->get()Ljava/lang/Object;
+PLj$/util/stream/F1;->l()V
+PLj$/util/stream/F1;->m(J)V
+PLj$/util/stream/F1;->p()Z
+PLj$/util/stream/Y1;->limit(J)Lj$/util/stream/Stream;
+PLj$/util/stream/Y1;->max(Ljava/util/Comparator;)Lj$/util/Optional;
+PLj$/util/stream/Y1;->n(Lj$/util/function/BinaryOperator;)Lj$/util/Optional;
+PLj$/util/stream/h2;-><init>(Lj$/util/stream/i2;Lj$/util/stream/g2;)V
+PLj$/util/stream/h2;->accept(Ljava/lang/Object;)V
+PLj$/util/stream/h2;->m(J)V
+PLj$/util/stream/h2;->p()Z
+PLj$/util/stream/i2;-><init>(Lj$/util/stream/b;IJJ)V
+PLj$/util/stream/i2;->u0(ILj$/util/stream/g2;)Lj$/util/stream/g2;
+PLj$/util/stream/w0;->M(J)I
+PLj$/util/stream/w0;->c0(Lj$/util/stream/b;JJ)Lj$/util/stream/Stream;
+PLj$/util/stream/w0;->d()I
+PLj$/util/stream/w0;->z(JJJ)J
 PLkotlin/collections/CollectionsKt;->intersect(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/Set;
 PLkotlin/collections/CollectionsKt;->retainAll(Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;)Z
 PLkotlin/collections/CollectionsKt__MutableCollectionsKt;->filterInPlace$CollectionsKt__MutableCollectionsKt(Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;Z)Z
@@ -37899,7 +37669,6 @@ PLkotlin/sequences/SequenceScope;->yieldAll(Lkotlin/sequences/Sequence;Lkotlin/c
 PLkotlin/sequences/SequencesKt;->sequence(Lkotlin/jvm/functions/Function2;)Lkotlin/sequences/Sequence;
 PLkotlin/sequences/SequencesKt__SequenceBuilderKt$sequence$$inlined$Sequence$1;-><init>(Lkotlin/jvm/functions/Function2;)V
 PLkotlin/sequences/SequencesKt__SequenceBuilderKt$sequence$$inlined$Sequence$1;->iterator()Ljava/util/Iterator;
-PLkotlin/sequences/SequencesKt__SequenceBuilderKt;->sequence(Lkotlin/jvm/functions/Function2;)Lkotlin/sequences/Sequence;
 PLme/leolin/shortcutbadger/ShortcutBadgeException;-><init>(Ljava/lang/String;)V
 PLme/leolin/shortcutbadger/ShortcutBadgeException;-><init>(Ljava/lang/String;Ljava/lang/Exception;)V
 PLme/leolin/shortcutbadger/ShortcutBadger;-><clinit>()V
@@ -37940,6 +37709,7 @@ PLme/leolin/shortcutbadger/impl/ZukHomeBadger;->getSupportLaunchers()Ljava/util/
 PLme/leolin/shortcutbadger/util/BroadcastHelper;->resolveBroadcast(Landroid/content/Context;Landroid/content/Intent;)Ljava/util/List;
 PLme/leolin/shortcutbadger/util/BroadcastHelper;->sendDefaultIntentExplicitly(Landroid/content/Context;Landroid/content/Intent;)V
 PLme/leolin/shortcutbadger/util/BroadcastHelper;->sendIntentExplicitly(Landroid/content/Context;Landroid/content/Intent;)V
+PLorg/greenrobot/eventbus/Subscription;->equals(Ljava/lang/Object;)Z
 PLorg/signal/core/util/ByteSize;->getInKibiBytes()F
 PLorg/signal/core/util/ByteSize;->getInMebiBytes()F
 PLorg/signal/core/util/FloatExtensionsKt;->roundedString(FI)Ljava/lang/String;
@@ -37949,29 +37719,44 @@ PLorg/signal/core/util/MemoryTracker$AppHeapUsage;->getUsedBytes()J
 PLorg/signal/core/util/MemoryTracker;->byteDisplay(J)Ljava/lang/String;
 PLorg/signal/core/util/MemoryTracker;->poll()V
 PLorg/signal/core/util/PendingIntentFlags;->cancelCurrent()I
+PLorg/signal/core/util/StringUtil;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
 PLorg/signal/core/util/concurrent/DeadlockDetector$$ExternalSyntheticLambda0;->run()V
 PLorg/signal/core/util/concurrent/DeadlockDetector$Companion;->access$isExecutorFull(Lorg/signal/core/util/concurrent/DeadlockDetector$Companion;Ljava/util/concurrent/ExecutorService;)Z
 PLorg/signal/core/util/concurrent/DeadlockDetector$Companion;->isExecutorFull(Ljava/util/concurrent/ExecutorService;)Z
 PLorg/signal/core/util/concurrent/DeadlockDetector$ExecutorInfo;->getExecutor()Ljava/util/concurrent/ExecutorService;
-PLorg/signal/core/util/concurrent/DeadlockDetector;->$r8$lambda$cvCzVPqdRG5CuUCNRezQN9z8MDY(Lorg/signal/core/util/concurrent/DeadlockDetector;)V
+PLorg/signal/core/util/concurrent/DeadlockDetector;->$r8$lambda$GK1iSs9ASWqRWUe7oMp5-1Ir4Jw(Lorg/signal/core/util/concurrent/DeadlockDetector;)V
+PLorg/signal/core/util/concurrent/DeadlockDetector;->hasPotentialLock([Ljava/lang/StackTraceElement;)Z
 PLorg/signal/core/util/concurrent/DeadlockDetector;->isWaiting(Ljava/lang/Thread$State;)Z
 PLorg/signal/core/util/concurrent/DeadlockDetector;->poll()V
 PLorg/signal/core/util/concurrent/LifecycleDisposable;->onDestroy(Landroidx/lifecycle/LifecycleOwner;)V
 PLorg/signal/core/util/concurrent/LifecycleDisposable;->onStop(Landroidx/lifecycle/LifecycleOwner;)V
 PLorg/signal/core/util/concurrent/MaybeCompat$$ExternalSyntheticLambda0;-><init>(Lkotlin/jvm/functions/Function0;)V
 PLorg/signal/core/util/concurrent/MaybeCompat$$ExternalSyntheticLambda0;->subscribe(Lio/reactivex/rxjava3/core/MaybeEmitter;)V
-PLorg/signal/core/util/concurrent/MaybeCompat;->$r8$lambda$aPKBr0JUhvb1CVWSMT6CNAHU584(Lkotlin/jvm/functions/Function0;Lio/reactivex/rxjava3/core/MaybeEmitter;)V
+PLorg/signal/core/util/concurrent/MaybeCompat;->$r8$lambda$kYZQHfYNI9qNo0Lq31qfOJdTH9o(Lkotlin/jvm/functions/Function0;Lio/reactivex/rxjava3/core/MaybeEmitter;)V
 PLorg/signal/core/util/concurrent/MaybeCompat;-><clinit>()V
 PLorg/signal/core/util/concurrent/MaybeCompat;-><init>()V
 PLorg/signal/core/util/concurrent/MaybeCompat;->fromCallable$lambda$0(Lkotlin/jvm/functions/Function0;Lio/reactivex/rxjava3/core/MaybeEmitter;)V
 PLorg/signal/core/util/concurrent/MaybeCompat;->fromCallable(Lkotlin/jvm/functions/Function0;)Lio/reactivex/rxjava3/core/Maybe;
+PLorg/signal/core/util/concurrent/SettableFuture;->set(Ljava/lang/Object;)Z
+PLorg/signal/core/util/concurrent/SignalExecutors$$ExternalSyntheticLambda0;->rejectedExecution(Ljava/lang/Runnable;Ljava/util/concurrent/ThreadPoolExecutor;)V
+PLorg/signal/core/util/concurrent/SignalExecutors;->$r8$lambda$PuKeoHyTOgRHxCNNBi9u3dUls_w(Ljava/lang/Runnable;Ljava/util/concurrent/ThreadPoolExecutor;)V
 PLorg/signal/core/util/logging/Log$Logger;->i(Ljava/lang/String;Ljava/lang/String;)V
 PLorg/signal/core/util/logging/Log$Logger;->i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 PLorg/signal/core/util/logging/Log;->internal()Lorg/signal/core/util/logging/Log$Logger;
 PLorg/signal/libsignal/protocol/IdentityKey;->equals(Ljava/lang/Object;)Z
 PLorg/signal/libsignal/protocol/IdentityKey;->getPublicKey()Lorg/signal/libsignal/protocol/ecc/ECPublicKey;
-PLorg/signal/libsignal/protocol/ecc/ECPublicKey;->equals(Ljava/lang/Object;)Z
-PLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda60;->isInternal()Z
+PLorg/signal/paging/BufferedPagingController$$ExternalSyntheticLambda0;-><init>(Lorg/signal/paging/BufferedPagingController;Ljava/lang/Object;)V
+PLorg/signal/paging/BufferedPagingController$$ExternalSyntheticLambda0;->run()V
+PLorg/signal/paging/BufferedPagingController;->$r8$lambda$niWJKUo-ehPdOP5P9_O82_NVKlY(Lorg/signal/paging/BufferedPagingController;Ljava/lang/Object;)V
+PLorg/signal/paging/BufferedPagingController;->lambda$onDataItemChanged$2(Ljava/lang/Object;)V
+PLorg/signal/paging/BufferedPagingController;->onDataItemChanged(Ljava/lang/Object;)V
+PLorg/signal/paging/DataStatus;->mark(I)V
+PLorg/signal/paging/FixedSizePagingController$$ExternalSyntheticLambda0;-><init>(Lorg/signal/paging/FixedSizePagingController;Ljava/lang/Object;)V
+PLorg/signal/paging/FixedSizePagingController$$ExternalSyntheticLambda0;->run()V
+PLorg/signal/paging/FixedSizePagingController;->$r8$lambda$1LdP1wmyJub_fd25Xbr1Zuv0_Dw(Lorg/signal/paging/FixedSizePagingController;Ljava/lang/Object;)V
+PLorg/signal/paging/FixedSizePagingController;->onDataItemChanged(Ljava/lang/Object;)V
+PLorg/signal/paging/ProxyPagingController;->onDataItemChanged(Ljava/lang/Object;)V
+PLorg/thoughtcrime/securesms/ApplicationContext$$ExternalSyntheticLambda66;->isInternal()Z
 PLorg/thoughtcrime/securesms/LoggingFragment;->onDestroy()V
 PLorg/thoughtcrime/securesms/LoggingFragment;->onStop()V
 PLorg/thoughtcrime/securesms/MainActivity;->onStop()V
@@ -37980,7 +37765,11 @@ PLorg/thoughtcrime/securesms/PassphraseRequiredActivity;->removeClearKeyReceiver
 PLorg/thoughtcrime/securesms/animation/AnimationStartListener;-><clinit>()V
 PLorg/thoughtcrime/securesms/animation/AnimationStartListener;-><init>()V
 PLorg/thoughtcrime/securesms/animation/AnimationStartListener;->onAnimationEnd(Landroid/animation/Animator;)V
-PLorg/thoughtcrime/securesms/audio/AudioRecorder$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/audio/AudioRecorder;)V
+PLorg/thoughtcrime/securesms/attachments/Attachment;->getDisplayUri()Landroid/net/Uri;
+PLorg/thoughtcrime/securesms/attachments/Attachment;->isInProgress()Z
+PLorg/thoughtcrime/securesms/attachments/Attachment;->isPermanentlyFailed()Z
+PLorg/thoughtcrime/securesms/attachments/DatabaseAttachment;->getThumbnailUri()Landroid/net/Uri;
+PLorg/thoughtcrime/securesms/audio/AudioRecorder$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/audio/AudioRecorder;)V
 PLorg/thoughtcrime/securesms/audio/AudioRecorder;-><clinit>()V
 PLorg/thoughtcrime/securesms/audio/AudioRecorder;-><init>(Landroid/content/Context;Lorg/thoughtcrime/securesms/audio/AudioRecordingHandler;)V
 PLorg/thoughtcrime/securesms/audio/AudioRecorderFocusManager$Companion;-><init>()V
@@ -37990,34 +37779,99 @@ PLorg/thoughtcrime/securesms/audio/AudioRecorderFocusManager26;-><init>(Landroid
 PLorg/thoughtcrime/securesms/audio/AudioRecorderFocusManager;-><clinit>()V
 PLorg/thoughtcrime/securesms/audio/AudioRecorderFocusManager;-><init>(Landroid/content/Context;)V
 PLorg/thoughtcrime/securesms/audio/AudioRecorderFocusManager;->create(Landroid/content/Context;Landroid/media/AudioManager$OnAudioFocusChangeListener;)Lorg/thoughtcrime/securesms/audio/AudioRecorderFocusManager;
+PLorg/thoughtcrime/securesms/avatar/view/AvatarView$WhenMappings;-><clinit>()V
+PLorg/thoughtcrime/securesms/avatar/view/AvatarView;->hideStoryRing()V
+PLorg/thoughtcrime/securesms/avatar/view/AvatarView;->setStoryRingFromState(Lorg/thoughtcrime/securesms/database/model/StoryViewState;)V
+PLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration$onDrawOver$2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration;->access$getAnimationState$p(Lorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration;)Ljava/util/Map;
+PLorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration;->access$getMessageIdsOpenedThisSession$p(Lorg/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration;)Ljava/util/Set;
+PLorg/thoughtcrime/securesms/components/AlbumThumbnailView$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/components/AlbumThumbnailView;)V
+PLorg/thoughtcrime/securesms/components/AlbumThumbnailView$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/components/AlbumThumbnailView;)V
+PLorg/thoughtcrime/securesms/components/AlbumThumbnailView$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/components/AlbumThumbnailView;Ljava/util/List;)V
+PLorg/thoughtcrime/securesms/components/AlbumThumbnailView$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/components/AlbumThumbnailView;Ljava/util/List;)V
+PLorg/thoughtcrime/securesms/components/AlbumThumbnailView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+PLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->inflateLayout(I)V
+PLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->setCancelTransferClickListener(Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;)V
+PLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->setPlayVideoClickListener(Lorg/thoughtcrime/securesms/mms/SlideClickListener;)V
+PLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->setStartTransferClickListener(Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;)V
+PLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->setThumbnailClickListener(Lorg/thoughtcrime/securesms/mms/SlideClickListener;)V
+PLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->showSlides(Lcom/bumptech/glide/RequestManager;Ljava/util/List;)V
+PLorg/thoughtcrime/securesms/components/AlbumThumbnailView;->sizeClass(I)I
 PLorg/thoughtcrime/securesms/components/AnimatingToggle;->display(Landroid/view/View;)V
 PLorg/thoughtcrime/securesms/components/AudioView$$ExternalSyntheticLambda0;->onChanged(Ljava/lang/Object;)V
-PLorg/thoughtcrime/securesms/components/AudioView;->$r8$lambda$70S_ChWvvHg6uKYhRw5m0jX0OG0(Lorg/thoughtcrime/securesms/components/AudioView;Lorg/thoughtcrime/securesms/components/voice/VoiceNotePlaybackState;)V
+PLorg/thoughtcrime/securesms/components/AudioView$$ExternalSyntheticLambda4;->run()V
+PLorg/thoughtcrime/securesms/components/AudioView;->$r8$lambda$TKrJZ0um6aQ5NPjBbSAs84p0ewc(Lorg/thoughtcrime/securesms/components/AudioView;Lorg/thoughtcrime/securesms/components/voice/VoiceNotePlaybackState;)V
+PLorg/thoughtcrime/securesms/components/AudioView;->$r8$lambda$rvvW9cv4crtJm6pyXeeV4scrQ4w(Lorg/thoughtcrime/securesms/components/AudioView;I)V
 PLorg/thoughtcrime/securesms/components/AudioView;->getPlaybackStateObserver()Landroidx/lifecycle/Observer;
 PLorg/thoughtcrime/securesms/components/AudioView;->hasAudioUri()Z
 PLorg/thoughtcrime/securesms/components/AudioView;->isTarget(Landroid/net/Uri;)Z
+PLorg/thoughtcrime/securesms/components/AudioView;->lambda$setTint$3(I)V
 PLorg/thoughtcrime/securesms/components/AudioView;->onDetachedFromWindow()V
 PLorg/thoughtcrime/securesms/components/AudioView;->onDuration(Landroid/net/Uri;J)V
 PLorg/thoughtcrime/securesms/components/AudioView;->onPlaybackState(Lorg/thoughtcrime/securesms/components/voice/VoiceNotePlaybackState;)V
 PLorg/thoughtcrime/securesms/components/AudioView;->onProgress(Landroid/net/Uri;DJ)V
 PLorg/thoughtcrime/securesms/components/AudioView;->onSpeedChanged(Landroid/net/Uri;F)V
 PLorg/thoughtcrime/securesms/components/AudioView;->onStart(Landroid/net/Uri;ZZ)V
+PLorg/thoughtcrime/securesms/components/AvatarImageView;->setFallbackPhotoProvider(Lorg/thoughtcrime/securesms/recipients/Recipient$FallbackPhotoProvider;)V
+PLorg/thoughtcrime/securesms/components/AvatarImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+PLorg/thoughtcrime/securesms/components/ComposeText$CommitContentListener;-><clinit>()V
+PLorg/thoughtcrime/securesms/components/ComposeText$CommitContentListener;-><init>(Lorg/thoughtcrime/securesms/components/InputPanel$MediaListener;)V
+PLorg/thoughtcrime/securesms/components/ComposeText$CommitContentListener;-><init>(Lorg/thoughtcrime/securesms/components/InputPanel$MediaListener;Lorg/thoughtcrime/securesms/components/ComposeText$CommitContentListener-IA;)V
+PLorg/thoughtcrime/securesms/components/ComposeText;->ellipsizeToWidth(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
+PLorg/thoughtcrime/securesms/components/ComposeText;->isLandscape()Z
+PLorg/thoughtcrime/securesms/components/ComposeText;->onCreateInputConnection(Landroid/view/inputmethod/EditorInfo;)Landroid/view/inputmethod/InputConnection;
 PLorg/thoughtcrime/securesms/components/ComposeText;->setCursorPositionChangedListener(Lorg/thoughtcrime/securesms/components/ComposeText$CursorPositionChangedListener;)V
+PLorg/thoughtcrime/securesms/components/ComposeText;->setHint(Ljava/lang/String;)V
+PLorg/thoughtcrime/securesms/components/ComposeText;->setHintWithChecks(Ljava/lang/CharSequence;)V
 PLorg/thoughtcrime/securesms/components/ComposeText;->setInlineQueryChangedListener(Lorg/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryChangedListener;)V
 PLorg/thoughtcrime/securesms/components/ComposeText;->setMentionValidator(Lorg/thoughtcrime/securesms/components/mention/MentionValidatorWatcher$MentionValidator;)V
+PLorg/thoughtcrime/securesms/components/ComposeText;->setMessageSendType(Lorg/thoughtcrime/securesms/conversation/MessageSendType;)V
 PLorg/thoughtcrime/securesms/components/ComposeText;->setStylingChangedListener(Lorg/thoughtcrime/securesms/components/ComposeText$StylingChangedListener;)V
+PLorg/thoughtcrime/securesms/components/ConversationItemFooter$$ExternalSyntheticLambda2;->onLayoutChange(Landroid/view/View;IIIIIIII)V
+PLorg/thoughtcrime/securesms/components/ConversationItemFooter;->$r8$lambda$CdFucBQlKSRye9hVIqrSxi36MGc(Lorg/thoughtcrime/securesms/components/ConversationItemFooter;Landroid/view/View;IIIIIIII)V
+PLorg/thoughtcrime/securesms/components/ConversationItemFooter;->buildMessageId(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)J
+PLorg/thoughtcrime/securesms/components/ConversationItemFooter;->disableBubbleBackground()V
+PLorg/thoughtcrime/securesms/components/ConversationItemFooter;->getDateView()Landroid/view/View;
+PLorg/thoughtcrime/securesms/components/ConversationItemFooter;->getPlaybackSpeedToggleTouchDelegateRect()Landroid/graphics/Rect;
+PLorg/thoughtcrime/securesms/components/ConversationItemFooter;->hideAudioDurationViews()V
+PLorg/thoughtcrime/securesms/components/ConversationItemFooter;->lambda$init$0(Landroid/view/View;IIIIIIII)V
+PLorg/thoughtcrime/securesms/components/ConversationItemFooter;->notifyTouchDelegateChanged(Landroid/graphics/Rect;Landroid/view/View;)V
 PLorg/thoughtcrime/securesms/components/ConversationItemFooter;->onDetachedFromWindow()V
+PLorg/thoughtcrime/securesms/components/ConversationItemFooter;->presentAudioDuration(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)V
+PLorg/thoughtcrime/securesms/components/ConversationItemFooter;->presentInsecureIndicator(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)V
+PLorg/thoughtcrime/securesms/components/ConversationItemFooter;->presentSimInfo(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)V
+PLorg/thoughtcrime/securesms/components/ConversationItemFooter;->presentTimer(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)V
+PLorg/thoughtcrime/securesms/components/ConversationItemFooter;->setMessageRecord(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Ljava/util/Locale;Lorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;)V
+PLorg/thoughtcrime/securesms/components/ConversationItemFooter;->setOnlyShowSendingStatus(ZLorg/thoughtcrime/securesms/database/model/MessageRecord;)V
+PLorg/thoughtcrime/securesms/components/ConversationItemFooter;->setPlaybackSpeedListener(Lorg/thoughtcrime/securesms/components/PlaybackSpeedToggleTextView$PlaybackSpeedListener;)V
+PLorg/thoughtcrime/securesms/components/ConversationItemThumbnail$Companion;-><init>()V
+PLorg/thoughtcrime/securesms/components/ConversationItemThumbnail$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+PLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;-><clinit>()V
+PLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->getFooter()Lorg/thoughtcrime/securesms/util/views/Stub;
+PLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->setBorderless(Z)V
+PLorg/thoughtcrime/securesms/components/ConversationItemThumbnail;->showShade(Z)V
+PLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState$Creator;-><init>()V
+PLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;-><clinit>()V
+PLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;-><init>(ZZLorg/thoughtcrime/securesms/mms/SlideClickListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlideClickListener;Landroid/view/View$OnLongClickListener;IIIIIIILkotlin/jvm/internal/DefaultConstructorMarker;)V
+PLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$Creator;-><init>()V
+PLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState$Creator;-><init>()V
+PLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;-><clinit>()V
+PLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;-><init>(FZZLorg/thoughtcrime/securesms/mms/SlideClickListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;Lorg/thoughtcrime/securesms/mms/SlideClickListener;Landroid/view/View$OnLongClickListener;IIIIIIIIIILkotlin/jvm/internal/DefaultConstructorMarker;)V
+PLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;-><clinit>()V
+PLorg/thoughtcrime/securesms/components/ConversationItemThumbnailState;-><init>(Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$ThumbnailViewState;Lorg/thoughtcrime/securesms/components/ConversationItemThumbnailState$AlbumViewState;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 PLorg/thoughtcrime/securesms/components/ConversationScrollToView;->formatUnreadCount(I)Ljava/lang/CharSequence;
 PLorg/thoughtcrime/securesms/components/ConversationScrollToView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 PLorg/thoughtcrime/securesms/components/ConversationScrollToView;->setShown(Z)V
 PLorg/thoughtcrime/securesms/components/ConversationScrollToView;->setUnreadCount(I)V
 PLorg/thoughtcrime/securesms/components/ConversationSearchBottomBar;->setEventListener(Lorg/thoughtcrime/securesms/components/ConversationSearchBottomBar$EventListener;)V
+PLorg/thoughtcrime/securesms/components/CornerMask;->setRadius(I)V
 PLorg/thoughtcrime/securesms/components/DeliveryStatusView;->isPending()Z
+PLorg/thoughtcrime/securesms/components/ExpirationTimerView;->stopAnimation()V
 PLorg/thoughtcrime/securesms/components/HidingLinearLayout;->hide()V
 PLorg/thoughtcrime/securesms/components/HidingLinearLayout;->show()V
 PLorg/thoughtcrime/securesms/components/InputAwareConstraintLayout;->addInputListener(Lorg/thoughtcrime/securesms/components/InputAwareConstraintLayout$Listener;)V
-PLorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/components/InputPanel$Listener;)V
-PLorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/components/InputPanel$Listener;)V
+PLorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda6;-><init>(Lorg/thoughtcrime/securesms/components/InputPanel$Listener;)V
+PLorg/thoughtcrime/securesms/components/InputPanel$$ExternalSyntheticLambda7;-><init>(Lorg/thoughtcrime/securesms/components/InputPanel$Listener;)V
 PLorg/thoughtcrime/securesms/components/InputPanel$3;-><init>(Lorg/thoughtcrime/securesms/components/InputPanel;Landroid/view/View;)V
 PLorg/thoughtcrime/securesms/components/InputPanel$3;->onAnimationStart(Landroid/animation/Animator;)V
 PLorg/thoughtcrime/securesms/components/InputPanel;->fadeIn(Landroid/view/View;)V
@@ -38027,10 +37881,12 @@ PLorg/thoughtcrime/securesms/components/InputPanel;->inEditMessageMode()Z
 PLorg/thoughtcrime/securesms/components/InputPanel;->isRecordingInLockedMode()Z
 PLorg/thoughtcrime/securesms/components/InputPanel;->onPause()V
 PLorg/thoughtcrime/securesms/components/InputPanel;->readDimen(I)I
+PLorg/thoughtcrime/securesms/components/InputPanel;->setHideForMessageRequestState(Z)V
 PLorg/thoughtcrime/securesms/components/InputPanel;->setLinkPreview(Lcom/bumptech/glide/RequestManager;Lj$/util/Optional;)V
 PLorg/thoughtcrime/securesms/components/InputPanel;->setListener(Lorg/thoughtcrime/securesms/components/InputPanel$Listener;)V
 PLorg/thoughtcrime/securesms/components/InputPanel;->setStickerSuggestions(Ljava/util/List;)V
 PLorg/thoughtcrime/securesms/components/InputPanel;->setVoiceNoteDraft(Lorg/thoughtcrime/securesms/database/DraftTable$Draft;)V
+PLorg/thoughtcrime/securesms/components/InputPanel;->updateVisibility()V
 PLorg/thoughtcrime/securesms/components/InsetAwareConstraintLayout;->addKeyboardStateListener(Lorg/thoughtcrime/securesms/components/InsetAwareConstraintLayout$KeyboardStateListener;)V
 PLorg/thoughtcrime/securesms/components/LinkPreviewView;->onSaveInstanceState()Landroid/os/Parcelable;
 PLorg/thoughtcrime/securesms/components/LinkPreviewView;->setCorners(II)V
@@ -38039,9 +37895,25 @@ PLorg/thoughtcrime/securesms/components/LinkPreviewViewThumbnailState;->copy(III
 PLorg/thoughtcrime/securesms/components/LinkPreviewViewThumbnailState;->getDownloadListener()Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;
 PLorg/thoughtcrime/securesms/components/MicrophoneRecorderView;->cancelAction(Z)V
 PLorg/thoughtcrime/securesms/components/MicrophoneRecorderView;->isRecordingLocked()Z
+PLorg/thoughtcrime/securesms/components/Outliner;->setColor(I)V
+PLorg/thoughtcrime/securesms/components/Outliner;->setRadii(IIII)V
+PLorg/thoughtcrime/securesms/components/Outliner;->setStrokeWidth(F)V
+PLorg/thoughtcrime/securesms/components/PlaybackSpeedToggleTextView;->setPlaybackSpeedListener(Lorg/thoughtcrime/securesms/components/PlaybackSpeedToggleTextView$PlaybackSpeedListener;)V
 PLorg/thoughtcrime/securesms/components/QuoteView;->onDetachedFromWindow()V
+PLorg/thoughtcrime/securesms/components/RecyclerViewParentTransitionController;-><clinit>()V
+PLorg/thoughtcrime/securesms/components/RecyclerViewParentTransitionController;-><init>(Landroid/view/ViewGroup;Landroid/animation/LayoutTransition;)V
+PLorg/thoughtcrime/securesms/components/RecyclerViewParentTransitionController;-><init>(Landroid/view/ViewGroup;Landroid/animation/LayoutTransition;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+PLorg/thoughtcrime/securesms/components/RecyclerViewParentTransitionController;->findRecyclerParent()Landroidx/recyclerview/widget/RecyclerView;
+PLorg/thoughtcrime/securesms/components/RecyclerViewParentTransitionController;->onScrollStateChanged(Landroidx/recyclerview/widget/RecyclerView;I)V
+PLorg/thoughtcrime/securesms/components/RecyclerViewParentTransitionController;->onViewAttachedToWindow(Landroid/view/View;)V
 PLorg/thoughtcrime/securesms/components/RecyclerViewParentTransitionController;->onViewDetachedFromWindow(Landroid/view/View;)V
+PLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$3;->test(Ljava/lang/Object;)Z
+PLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$3;->test(Lorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$ScrollToPositionRequest;)Z
+PLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$ScrollToPositionRequest;->getPosition()I
+PLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$scrollPositionRequests$1;->apply(Ljava/lang/Long;Lorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$ScrollToPositionRequest;)Lorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$ScrollToPositionRequest;
+PLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate$scrollPositionRequests$1;->apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 PLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate;->isListCommitted()Z
+PLorg/thoughtcrime/securesms/components/ScrollToPositionDelegate;->notifyListCommitted()V
 PLorg/thoughtcrime/securesms/components/SearchView;-><init>(Landroid/content/Context;)V
 PLorg/thoughtcrime/securesms/components/SearchView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 PLorg/thoughtcrime/securesms/components/SearchView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
@@ -38049,6 +37921,24 @@ PLorg/thoughtcrime/securesms/components/SearchView;->appendEmojiFilter(Landroid/
 PLorg/thoughtcrime/securesms/components/SearchView;->initEmojiFilter()V
 PLorg/thoughtcrime/securesms/components/SendButton;->setPopupContainer(Landroid/view/ViewGroup;)V
 PLorg/thoughtcrime/securesms/components/SendButton;->setScheduledSendListener(Lorg/thoughtcrime/securesms/components/SendButton$ScheduledSendListener;)V
+PLorg/thoughtcrime/securesms/components/ThumbnailView$$ExternalSyntheticBackport0;->m(Ljava/lang/Object;)Ljava/util/List;
+PLorg/thoughtcrime/securesms/components/ThumbnailView$$ExternalSyntheticBackport1;->m(Ljava/lang/Object;)Ljava/util/List;
+PLorg/thoughtcrime/securesms/components/ThumbnailView$CancelClickDispatcher;-><init>(Lorg/thoughtcrime/securesms/components/ThumbnailView;)V
+PLorg/thoughtcrime/securesms/components/ThumbnailView$CancelClickDispatcher;-><init>(Lorg/thoughtcrime/securesms/components/ThumbnailView;Lorg/thoughtcrime/securesms/components/ThumbnailView$CancelClickDispatcher-IA;)V
+PLorg/thoughtcrime/securesms/components/ThumbnailView$DownloadClickDispatcher;-><init>(Lorg/thoughtcrime/securesms/components/ThumbnailView;)V
+PLorg/thoughtcrime/securesms/components/ThumbnailView$DownloadClickDispatcher;-><init>(Lorg/thoughtcrime/securesms/components/ThumbnailView;Lorg/thoughtcrime/securesms/components/ThumbnailView$DownloadClickDispatcher-IA;)V
+PLorg/thoughtcrime/securesms/components/ThumbnailView$ThumbnailClickDispatcher;-><init>(Lorg/thoughtcrime/securesms/components/ThumbnailView;)V
+PLorg/thoughtcrime/securesms/components/ThumbnailView$ThumbnailClickDispatcher;-><init>(Lorg/thoughtcrime/securesms/components/ThumbnailView;Lorg/thoughtcrime/securesms/components/ThumbnailView$ThumbnailClickDispatcher-IA;)V
+PLorg/thoughtcrime/securesms/components/ThumbnailView;-><clinit>()V
+PLorg/thoughtcrime/securesms/components/ThumbnailView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+PLorg/thoughtcrime/securesms/components/ThumbnailView;->dispatchDraw(Landroid/graphics/Canvas;)V
+PLorg/thoughtcrime/securesms/components/ThumbnailView;->fillTargetDimensions([I[I[I)V
+PLorg/thoughtcrime/securesms/components/ThumbnailView;->getNonZeroCount([I)I
+PLorg/thoughtcrime/securesms/components/ThumbnailView;->onSizeChanged(IIII)V
+PLorg/thoughtcrime/securesms/components/ThumbnailView;->setImageResource(Lcom/bumptech/glide/RequestManager;Lorg/thoughtcrime/securesms/mms/Slide;ZZ)Lorg/signal/core/util/concurrent/ListenableFuture;
+PLorg/thoughtcrime/securesms/components/ThumbnailView;->setPlayVideoClickListener(Lorg/thoughtcrime/securesms/mms/SlideClickListener;)V
+PLorg/thoughtcrime/securesms/components/ThumbnailView;->setStartTransferClickListener(Lorg/thoughtcrime/securesms/mms/SlidesClickedListener;)V
+PLorg/thoughtcrime/securesms/components/ThumbnailView;->showSecondaryText(Z)V
 PLorg/thoughtcrime/securesms/components/TypingStatusRepository;->getTypists(J)Landroidx/lifecycle/LiveData;
 PLorg/thoughtcrime/securesms/components/ViewBinderDelegate$1;->invoke(Landroidx/viewbinding/ViewBinding;)V
 PLorg/thoughtcrime/securesms/components/ViewBinderDelegate$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
@@ -38059,11 +37949,25 @@ PLorg/thoughtcrime/securesms/components/emoji/EmojiEditText;->removeOnFocusChang
 PLorg/thoughtcrime/securesms/components/emoji/EmojiEditText;->setOnFocusChangeListener(Landroid/view/View$OnFocusChangeListener;)V
 PLorg/thoughtcrime/securesms/components/emoji/EmojiProvider$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/components/emoji/EmojiProvider$EmojiDrawable;Lorg/thoughtcrime/securesms/emoji/EmojiPageCache$LoadResult;)V
 PLorg/thoughtcrime/securesms/components/emoji/EmojiProvider$$ExternalSyntheticLambda0;->run()V
-PLorg/thoughtcrime/securesms/components/emoji/EmojiProvider;->$r8$lambda$yWqSXcpiMY6E3k4l81kOhV5ANk4(Lorg/thoughtcrime/securesms/components/emoji/EmojiProvider$EmojiDrawable;Lorg/thoughtcrime/securesms/emoji/EmojiPageCache$LoadResult;)V
+PLorg/thoughtcrime/securesms/components/emoji/EmojiProvider;->$r8$lambda$4hK8wRNraIDACO7SUNJn68QxrCk(Lorg/thoughtcrime/securesms/components/emoji/EmojiProvider$EmojiDrawable;Lorg/thoughtcrime/securesms/emoji/EmojiPageCache$LoadResult;)V
 PLorg/thoughtcrime/securesms/components/emoji/EmojiProvider;->lambda$getEmojiDrawable$0(Lorg/thoughtcrime/securesms/components/emoji/EmojiProvider$EmojiDrawable;Lorg/thoughtcrime/securesms/emoji/EmojiPageCache$LoadResult;)V
+PLorg/thoughtcrime/securesms/components/emoji/EmojiTextView$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;)V
+PLorg/thoughtcrime/securesms/components/emoji/EmojiTextView$$ExternalSyntheticLambda3;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/components/emoji/EmojiTextView$$ExternalSyntheticLambda4;-><init>()V
+PLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->$r8$lambda$MRhTIH_LbA5fNk7pdJVsIs5uSOQ(Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;Ljava/lang/String;)Ljava/lang/Float;
+PLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->ellipsizeAnyTextForMaxLength()V
+PLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->getLastLineWidth()I
+PLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->isJumbomoji()Z
+PLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->lambda$getLongestLineWidth$0(Ljava/lang/String;)Ljava/lang/Float;
+PLorg/thoughtcrime/securesms/components/emoji/EmojiTextView;->setMentionBackgroundTint(I)V
+PLorg/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel;->getEmoji()Ljava/util/List;
+PLorg/thoughtcrime/securesms/components/mention/MentionAnnotation$$ExternalSyntheticLambda0;-><init>()V
+PLorg/thoughtcrime/securesms/components/mention/MentionAnnotation;->getMentionAnnotations(Landroid/text/Spanned;)Ljava/util/List;
+PLorg/thoughtcrime/securesms/components/mention/MentionAnnotation;->getMentionAnnotations(Landroid/text/Spanned;II)Ljava/util/List;
+PLorg/thoughtcrime/securesms/components/mention/MentionRendererDelegate;->setTint(I)V
 PLorg/thoughtcrime/securesms/components/mention/MentionValidatorWatcher;->setMentionValidator(Lorg/thoughtcrime/securesms/components/mention/MentionValidatorWatcher$MentionValidator;)V
 PLorg/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton$1$1$$ExternalSyntheticLambda0;->run()V
-PLorg/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton$1$1;->$r8$lambda$7zbeUa9i765Aa2G9x9qw8f4qjOo(Lorg/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton$1$1;J)V
+PLorg/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton$1$1;->$r8$lambda$rLYFiYAqR2_G83hj4F8rzFqXIOs(Lorg/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton$1$1;J)V
 PLorg/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton$1$1;->lambda$onAnimationEnd$0(J)V
 PLorg/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton;->-$$Nest$mpulse(Lorg/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton;J)V
 PLorg/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate;->onDestroy(Landroidx/lifecycle/LifecycleOwner;)V
@@ -38071,9 +37975,59 @@ PLorg/thoughtcrime/securesms/components/settings/app/subscription/completed/Term
 PLorg/thoughtcrime/securesms/components/spoiler/SpoilerRendererDelegate$1$onViewAttachedToWindow$1;->onDestroy(Landroidx/lifecycle/LifecycleOwner;)V
 PLorg/thoughtcrime/securesms/components/spoiler/SpoilerRendererDelegate$1$onViewAttachedToWindow$1;->onStop(Landroidx/lifecycle/LifecycleOwner;)V
 PLorg/thoughtcrime/securesms/components/spoiler/SpoilerRendererDelegate$1;->onViewDetachedFromWindow(Landroid/view/View;)V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Companion;-><init>()V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Companion;->containsPlayableSlides(Ljava/util/List;)Z
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Mode;->$values()[Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Mode;
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Mode;-><clinit>()V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Mode;-><init>(Ljava/lang/String;I)V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Progress$Companion;-><init>()V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Progress$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Progress;-><clinit>()V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Progress;-><init>(JJ)V
 PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$Progress;->equals(Ljava/lang/Object;)Z
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setCancelClickListener$1;-><init>(Landroid/view/View$OnClickListener;)V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setCancelClickListener$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setCancelClickListener$1;->invoke(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;)Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setShowSecondaryText$1;-><init>(Z)V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setShowSecondaryText$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setShowSecondaryText$1;->invoke(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;)Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setSlides$2;-><init>(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;Ljava/util/List;)V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setSlides$2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setTransferClickListener$1;-><init>(Landroid/view/View$OnClickListener;)V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setTransferClickListener$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setTransferClickListener$1;->invoke(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;)Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setVisible$1;-><init>(Z)V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setVisible$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView$setVisible$1;->invoke(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;)Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;-><clinit>()V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->access$isUpdateToExistingSet(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;Ljava/util/List;)Z
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->access$slidesAsListOfTimestamps(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;Ljava/util/List;)Ljava/lang/String;
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->access$verboseLog(Lorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;Ljava/lang/String;)V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->containsPlayableSlides(Ljava/util/List;)Z
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->getTransferState(Ljava/util/List;)I
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->onAttachedToWindow()V
 PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->onDetachedFromWindow()V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->slidesAsListOfTimestamps(Ljava/util/List;)Ljava/lang/String;
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlView;->verboseLog(Ljava/lang/String;)V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;-><clinit>()V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;-><init>(ZZZLjava/util/List;Landroid/view/View$OnClickListener;Landroid/view/View$OnClickListener;Landroid/view/View$OnClickListener;ZLjava/util/Map;Ljava/util/Map;ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;->getCompressionProgress()Ljava/util/Map;
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;->getNetworkProgress()Ljava/util/Map;
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferControlViewState;->getSlides()Ljava/util/List;
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView$Companion;-><init>()V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView$State;->$values()[Lorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView$State;
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView$State;-><clinit>()V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView$State;-><init>(Ljava/lang/String;I)V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView;-><clinit>()V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IIILkotlin/jvm/internal/DefaultConstructorMarker;)V
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView;->progressPaint(I)Landroid/graphics/Paint;
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView;->stopIconPaint(I)Landroid/graphics/Paint;
+PLorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView;->trackPaint(I)Landroid/graphics/Paint;
 PLorg/thoughtcrime/securesms/components/voice/VoiceNoteMediaController;->getVoiceNotePlaybackState()Landroidx/lifecycle/MutableLiveData;
 PLorg/thoughtcrime/securesms/components/voice/VoiceNoteMediaController;->onDestroy(Landroidx/lifecycle/LifecycleOwner;)V
 PLorg/thoughtcrime/securesms/components/voice/VoiceNoteMediaController;->onStop(Landroidx/lifecycle/LifecycleOwner;)V
@@ -38091,6 +38045,19 @@ PLorg/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto;->equals(Ljava
 PLorg/thoughtcrime/securesms/contacts/paged/ContactSearchMediator$sam$androidx_lifecycle_Observer$0;->equals(Ljava/lang/Object;)Z
 PLorg/thoughtcrime/securesms/contacts/paged/ContactSearchMediator$sam$androidx_lifecycle_Observer$0;->getFunctionDelegate()Lkotlin/Function;
 PLorg/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel;->onCleared()V
+PLorg/thoughtcrime/securesms/conversation/ClipProjectionDrawable;->draw(Landroid/graphics/Canvas;)V
+PLorg/thoughtcrime/securesms/conversation/ConversationHeaderView$$ExternalSyntheticLambda2;-><init>(Ljava/lang/Runnable;)V
+PLorg/thoughtcrime/securesms/conversation/ConversationHeaderView$FallbackPhotoProvider;-><init>()V
+PLorg/thoughtcrime/securesms/conversation/ConversationHeaderView$FallbackPhotoProvider;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationHeaderView$FallbackPhotoProvider-IA;)V
+PLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+PLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
+PLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;->hideButton()V
+PLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;->hideDescription()V
+PLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;->hideSubtitle()V
+PLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;->setAbout(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
+PLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;->setAvatar(Lcom/bumptech/glide/RequestManager;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
+PLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;->setLinkifyDescription(Z)V
+PLorg/thoughtcrime/securesms/conversation/ConversationHeaderView;->showBackgroundBubble(Z)V
 PLorg/thoughtcrime/securesms/conversation/ConversationIntents$Args;->canInitializeFromDatabase()Z
 PLorg/thoughtcrime/securesms/conversation/ConversationIntents$Args;->getDraftContentType()Ljava/lang/String;
 PLorg/thoughtcrime/securesms/conversation/ConversationIntents$Args;->getDraftMedia()Landroid/net/Uri;
@@ -38100,20 +38067,71 @@ PLorg/thoughtcrime/securesms/conversation/ConversationIntents$Args;->getMedia()L
 PLorg/thoughtcrime/securesms/conversation/ConversationIntents$Args;->getShareDataTimestamp()J
 PLorg/thoughtcrime/securesms/conversation/ConversationIntents$Args;->getStickerLocator()Lorg/thoughtcrime/securesms/stickers/StickerLocator;
 PLorg/thoughtcrime/securesms/conversation/ConversationIntents$Args;->isBorderless()Z
+PLorg/thoughtcrime/securesms/conversation/ConversationItem$$ExternalSyntheticLambda7;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;Lorg/thoughtcrime/securesms/recipients/RecipientId;)V
+PLorg/thoughtcrime/securesms/conversation/ConversationItem$ThumbnailClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;)V
+PLorg/thoughtcrime/securesms/conversation/ConversationItem$ThumbnailClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItem;Lorg/thoughtcrime/securesms/conversation/ConversationItem$ThumbnailClickListener-IA;)V
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->canPlayContent()Z
 PLorg/thoughtcrime/securesms/conversation/ConversationItem;->getBadgeImageView()Landroid/view/View;
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->getBodyBubbleCorners(IIII)Lorg/thoughtcrime/securesms/util/Projection$Corners;
 PLorg/thoughtcrime/securesms/conversation/ConversationItem;->getBubbleViews()Ljava/util/List;
 PLorg/thoughtcrime/securesms/conversation/ConversationItem;->getContactPhotoHolderView()Landroid/view/View;
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->getConversationMessage()Lorg/thoughtcrime/securesms/conversation/ConversationMessage;
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->getDefaultBubbleColor(Z)I
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->getDefaultTopMarginForRecord(Lorg/thoughtcrime/securesms/database/model/MessageRecord;II)I
 PLorg/thoughtcrime/securesms/conversation/ConversationItem;->getQuotedIndicatorView()Landroid/view/View;
 PLorg/thoughtcrime/securesms/conversation/ConversationItem;->getReactionsView()Landroid/view/View;
 PLorg/thoughtcrime/securesms/conversation/ConversationItem;->getReactionsView()Lorg/thoughtcrime/securesms/reactions/ReactionsConversationView;
 PLorg/thoughtcrime/securesms/conversation/ConversationItem;->getReplyView()Landroid/view/View;
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->getRoot()Landroid/view/ViewGroup;
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->hasAudio(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->hasDocument(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->hasLinkPreview(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->hasOnlyThumbnail(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->hasQuote(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->hasSharedContact(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->hasSticker(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->hasThumbnail(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->isBorderless(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->isCondensedMode()Z
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->isContentCondensed()Z
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->isGiftMessage(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->isSingularMessage(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lj$/util/Optional;Lj$/util/Optional;Z)Z
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->isStoryReaction(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->isViewOnceMessage(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
 PLorg/thoughtcrime/securesms/conversation/ConversationItem;->onDetachedFromWindow()V
 PLorg/thoughtcrime/securesms/conversation/ConversationItem;->onRecipientChanged(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-PLorg/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback;)V
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->readDimen(Landroid/content/Context;I)I
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->setEventListener(Lorg/thoughtcrime/securesms/BindableConversationItem$EventListener;)V
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->setGroupMessageStatus(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->setHasBeenScheduled(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;)V
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->setOutlinerRadii(Lorg/thoughtcrime/securesms/components/Outliner;IIII)V
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->setParentScrolling(Z)V
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->setStoryReactionLabel(Lorg/thoughtcrime/securesms/database/model/MessageRecord;)V
+PLorg/thoughtcrime/securesms/conversation/ConversationItem;->shouldDrawBodyBubbleOutline(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Z)Z
+PLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble;->onSizeChanged(IIII)V
+PLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble;->setOnSizeChangedListener(Lorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble$OnSizeChangedListener;)V
+PLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble;->setOutliners(Ljava/util/List;)V
+PLorg/thoughtcrime/securesms/conversation/ConversationItemBodyBubble;->setParentScrolling(Z)V
+PLorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode$Detailed;-><clinit>()V
+PLorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode$Detailed;-><init>()V
+PLorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode$EditHistory;-><clinit>()V
+PLorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode$EditHistory;-><init>()V
+PLorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode$Standard;-><clinit>()V
+PLorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode$Standard;-><init>()V
+PLorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;-><clinit>()V
+PLorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;-><init>(Z)V
+PLorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;-><init>(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+PLorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;-><init>(ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
+PLorg/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback;)V
 PLorg/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback;-><clinit>()V
 PLorg/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback$SwipeAvailabilityProvider;Lorg/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback$OnSwipeListener;)V
 PLorg/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback;->attachToRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
 PLorg/thoughtcrime/securesms/conversation/ConversationItemTouchListener;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationItemTouchListener$Callback;)V
+PLorg/thoughtcrime/securesms/conversation/ConversationMessage;->equals(Ljava/lang/Object;)Z
+PLorg/thoughtcrime/securesms/conversation/ConversationMessage;->getDisplayBody(Landroid/content/Context;)Landroid/text/SpannableString;
+PLorg/thoughtcrime/securesms/conversation/ConversationMessage;->getMultiselectCollection()Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectCollection;
+PLorg/thoughtcrime/securesms/conversation/ConversationMessage;->getThreadRecipient()Lorg/thoughtcrime/securesms/recipients/Recipient;
+PLorg/thoughtcrime/securesms/conversation/ConversationMessage;->hasStyleLinks()Z
 PLorg/thoughtcrime/securesms/conversation/ConversationOptionsMenu$Provider$onCreateMenu$1;-><init>(Landroid/view/Menu;Z)V
 PLorg/thoughtcrime/securesms/conversation/ConversationOptionsMenu$Provider$onCreateMenu$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 PLorg/thoughtcrime/securesms/conversation/ConversationOptionsMenu$Provider$onCreateMenu$1;->invoke(Z)V
@@ -38138,6 +38156,7 @@ PLorg/thoughtcrime/securesms/conversation/ConversationSwipeAnimationHelper;->upd
 PLorg/thoughtcrime/securesms/conversation/ConversationSwipeAnimationHelper;->updateReactionsTransition(Landroid/view/View;FF)V
 PLorg/thoughtcrime/securesms/conversation/ConversationSwipeAnimationHelper;->updateReplyIconTransition(Landroid/view/View;FFF)V
 PLorg/thoughtcrime/securesms/conversation/ConversationTitleView;->onSaveInstanceState()Landroid/os/Parcelable;
+PLorg/thoughtcrime/securesms/conversation/ConversationTitleView;->setStoryRingFromState(Lorg/thoughtcrime/securesms/database/model/StoryViewState;)V
 PLorg/thoughtcrime/securesms/conversation/ConversationTitleView;->setVerified(Z)V
 PLorg/thoughtcrime/securesms/conversation/ConversationUpdateTick$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationUpdateTick;)V
 PLorg/thoughtcrime/securesms/conversation/ConversationUpdateTick$1;-><init>(Lkotlin/jvm/functions/Function0;)V
@@ -38152,24 +38171,31 @@ PLorg/thoughtcrime/securesms/conversation/ConversationUpdateTick;->onPause(Landr
 PLorg/thoughtcrime/securesms/conversation/ConversationUpdateTick;->onResume(Landroidx/lifecycle/LifecycleOwner;)V
 PLorg/thoughtcrime/securesms/conversation/ConversationUpdateTick;->onStart(Landroidx/lifecycle/LifecycleOwner;)V
 PLorg/thoughtcrime/securesms/conversation/ConversationUpdateTick;->onStop(Landroidx/lifecycle/LifecycleOwner;)V
-PLorg/thoughtcrime/securesms/conversation/MarkReadHelper$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/conversation/MarkReadHelper;J)V
-PLorg/thoughtcrime/securesms/conversation/MarkReadHelper$$ExternalSyntheticLambda2;->run()V
-PLorg/thoughtcrime/securesms/conversation/MarkReadHelper$$ExternalSyntheticLambda3;->run()V
-PLorg/thoughtcrime/securesms/conversation/MarkReadHelper;->$r8$lambda$gcFI10LhFCaBEmJzQp8t_xBcU8U(Lorg/thoughtcrime/securesms/conversation/MarkReadHelper;J)V
-PLorg/thoughtcrime/securesms/conversation/MarkReadHelper;->$r8$lambda$h27hRrs_Rwv2sGlsmjqcW0dGIZI(Lorg/thoughtcrime/securesms/conversation/MarkReadHelper;J)V
+PLorg/thoughtcrime/securesms/conversation/MarkReadHelper$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/conversation/MarkReadHelper;J)V
+PLorg/thoughtcrime/securesms/conversation/MarkReadHelper$$ExternalSyntheticLambda0;->run()V
+PLorg/thoughtcrime/securesms/conversation/MarkReadHelper$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/conversation/MarkReadHelper;J)V
+PLorg/thoughtcrime/securesms/conversation/MarkReadHelper$$ExternalSyntheticLambda1;->run()V
+PLorg/thoughtcrime/securesms/conversation/MarkReadHelper$$ExternalSyntheticLambda2;-><init>()V
+PLorg/thoughtcrime/securesms/conversation/MarkReadHelper$$ExternalSyntheticLambda3;-><init>()V
+PLorg/thoughtcrime/securesms/conversation/MarkReadHelper;->$r8$lambda$B4EhSn6sRL5I5qd-ty8vyoMfbHo(Lorg/thoughtcrime/securesms/conversation/MarkReadHelper;J)V
+PLorg/thoughtcrime/securesms/conversation/MarkReadHelper;->$r8$lambda$YPq8U_kVkFRbP8hlhcJvFjZCkO0(Lorg/thoughtcrime/securesms/conversation/MarkReadHelper;J)V
 PLorg/thoughtcrime/securesms/conversation/MarkReadHelper;->lambda$onViewsRevealed$0(J)V
 PLorg/thoughtcrime/securesms/conversation/MarkReadHelper;->lambda$onViewsRevealed$1(J)V
+PLorg/thoughtcrime/securesms/conversation/MarkReadHelper;->onViewsRevealed(J)V
+PLorg/thoughtcrime/securesms/conversation/MarkReadHelper;->stopIgnoringViewReveals(Ljava/lang/Long;)V
+PLorg/thoughtcrime/securesms/conversation/MessageSendType;->getComposeHintRes()I
+PLorg/thoughtcrime/securesms/conversation/MessageStyler$Result;->getHasStyleLinks()Z
 PLorg/thoughtcrime/securesms/conversation/MessageStyler;->boldStyle()Landroid/text/style/CharacterStyle;
 PLorg/thoughtcrime/securesms/conversation/MessageStyler;->italicStyle()Landroid/text/style/CharacterStyle;
 PLorg/thoughtcrime/securesms/conversation/MessageStyler;->monoStyle()Landroid/text/style/CharacterStyle;
 PLorg/thoughtcrime/securesms/conversation/MessageStyler;->strikethroughStyle()Landroid/text/style/CharacterStyle;
+PLorg/thoughtcrime/securesms/conversation/ScheduledMessagesRepository$$ExternalSyntheticLambda2;-><init>(J)V
+PLorg/thoughtcrime/securesms/conversation/ScheduledMessagesRepository$$ExternalSyntheticLambda2;->subscribe(Lio/reactivex/rxjava3/core/ObservableEmitter;)V
 PLorg/thoughtcrime/securesms/conversation/ScheduledMessagesRepository$$ExternalSyntheticLambda3;-><init>(Lio/reactivex/rxjava3/core/ObservableEmitter;J)V
 PLorg/thoughtcrime/securesms/conversation/ScheduledMessagesRepository$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
 PLorg/thoughtcrime/securesms/conversation/ScheduledMessagesRepository$$ExternalSyntheticLambda4;->cancel()V
-PLorg/thoughtcrime/securesms/conversation/ScheduledMessagesRepository$$ExternalSyntheticLambda5;-><init>(J)V
-PLorg/thoughtcrime/securesms/conversation/ScheduledMessagesRepository$$ExternalSyntheticLambda5;->subscribe(Lio/reactivex/rxjava3/core/ObservableEmitter;)V
-PLorg/thoughtcrime/securesms/conversation/ScheduledMessagesRepository;->$r8$lambda$2XiX_Dh66c_pIVZzuRFfoiDjp1A(JLio/reactivex/rxjava3/core/ObservableEmitter;)V
-PLorg/thoughtcrime/securesms/conversation/ScheduledMessagesRepository;->$r8$lambda$ej8HJIkF2PUVMbFRXSAuhVdCWz4(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+PLorg/thoughtcrime/securesms/conversation/ScheduledMessagesRepository;->$r8$lambda$1ZS4JYRQcr_HkHAqNiixjSvPZQk(JLio/reactivex/rxjava3/core/ObservableEmitter;)V
+PLorg/thoughtcrime/securesms/conversation/ScheduledMessagesRepository;->$r8$lambda$LJcPhYvTLinB-_Xu8et7lLIjC3Y(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
 PLorg/thoughtcrime/securesms/conversation/ScheduledMessagesRepository;->getScheduledMessageCount$lambda$6$lambda$5(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
 PLorg/thoughtcrime/securesms/conversation/ScheduledMessagesRepository;->getScheduledMessageCount$lambda$6(JLio/reactivex/rxjava3/core/ObservableEmitter;)V
 PLorg/thoughtcrime/securesms/conversation/ScheduledMessagesRepository;->getScheduledMessageCount(J)Lio/reactivex/rxjava3/core/Observable;
@@ -38185,6 +38211,16 @@ PLorg/thoughtcrime/securesms/conversation/VoiceRecorderWakeLock;->onResume(Landr
 PLorg/thoughtcrime/securesms/conversation/VoiceRecorderWakeLock;->onStart(Landroidx/lifecycle/LifecycleOwner;)V
 PLorg/thoughtcrime/securesms/conversation/VoiceRecorderWakeLock;->onStop(Landroidx/lifecycle/LifecycleOwner;)V
 PLorg/thoughtcrime/securesms/conversation/VoiceRecorderWakeLock;->release()V
+PLorg/thoughtcrime/securesms/conversation/colors/ChatColors$Id$NotSet;-><clinit>()V
+PLorg/thoughtcrime/securesms/conversation/colors/ChatColors$Id$NotSet;-><init>()V
+PLorg/thoughtcrime/securesms/conversation/colors/Colorizer;->getDefaultColor(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/Recipient;)I
+PLorg/thoughtcrime/securesms/conversation/colors/Colorizer;->getIncomingFooterIconColor(Landroid/content/Context;Z)I
+PLorg/thoughtcrime/securesms/conversation/colors/Colorizer;->getIncomingFooterTextColor(Landroid/content/Context;Z)I
+PLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer$scrollListener$1;->onScrolled(Landroidx/recyclerview/widget/RecyclerView;II)V
+PLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;->access$getLayerXfermode$p(Lorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;)Landroid/graphics/PorterDuffXfermode;
+PLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;->access$getLayoutManager(Lorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;)Landroidx/recyclerview/widget/LinearLayoutManager;
+PLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;->access$setUseLayer$p(Lorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;Z)V
+PLorg/thoughtcrime/securesms/conversation/colors/RecyclerViewColorizer;->getLayoutManager()Landroidx/recyclerview/widget/LinearLayoutManager;
 PLorg/thoughtcrime/securesms/conversation/drafts/DraftRepository$Companion;-><init>()V
 PLorg/thoughtcrime/securesms/conversation/drafts/DraftRepository$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 PLorg/thoughtcrime/securesms/conversation/drafts/DraftRepository$DatabaseDraft;-><clinit>()V
@@ -38228,11 +38264,19 @@ PLorg/thoughtcrime/securesms/conversation/drafts/DraftViewModel;->getVoiceNoteDr
 PLorg/thoughtcrime/securesms/conversation/drafts/DraftViewModel;->loadShareOrDraftData(J)Lio/reactivex/rxjava3/core/Maybe;
 PLorg/thoughtcrime/securesms/conversation/drafts/DraftViewModel;->onCleared()V
 PLorg/thoughtcrime/securesms/conversation/drafts/DraftViewModel;->saveDraftsIfChanged(Lorg/thoughtcrime/securesms/conversation/drafts/DraftState;Lorg/thoughtcrime/securesms/conversation/drafts/DraftState;)Lorg/thoughtcrime/securesms/conversation/drafts/DraftState;
-PLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator$$ExternalSyntheticLambda1;->run()V
-PLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator;->$r8$lambda$IJ0Uk3eauzGuBkd_D1PotCUrlIQ(Landroidx/recyclerview/widget/RecyclerView;)V
+PLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator$$ExternalSyntheticLambda0;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+PLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator$$ExternalSyntheticLambda0;->run()V
+PLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator;->$r8$lambda$TyXW_OwfpBC2uieSWTtfHVANT-Q(Landroidx/recyclerview/widget/RecyclerView;)V
+PLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator;->animateAppearance(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;Landroidx/recyclerview/widget/RecyclerView$ItemAnimator$ItemHolderInfo;)Z
 PLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator;->endAnimations()V
 PLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator;->endSlideAnimations()V
 PLorg/thoughtcrime/securesms/conversation/mutiselect/ConversationItemAnimator;->onAnimationFinished$lambda$4(Landroidx/recyclerview/widget/RecyclerView;)V
+PLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration$Difference;->$values()[Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration$Difference;
+PLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration$Difference;-><clinit>()V
+PLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration$Difference;-><init>(Ljava/lang/String;I)V
+PLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration$Difference;->values()[Lorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration$Difference;
+PLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration$WhenMappings;-><clinit>()V
+PLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->consumePulseRequest(Lorg/thoughtcrime/securesms/conversation/ConversationAdapterBridge;)V
 PLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->onDestroy(Landroidx/lifecycle/LifecycleOwner;)V
 PLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->onPause(Landroidx/lifecycle/LifecycleOwner;)V
 PLorg/thoughtcrime/securesms/conversation/mutiselect/MultiselectItemDecoration;->onStop(Landroidx/lifecycle/LifecycleOwner;)V
@@ -38250,7 +38294,7 @@ PLorg/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryResultsContr
 PLorg/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryResultsControllerV2$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 PLorg/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryResultsControllerV2$special$$inlined$doOnEachLayout$1;-><init>(Lorg/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryResultsControllerV2;)V
 PLorg/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryResultsControllerV2$special$$inlined$doOnEachLayout$1;->onLayoutChange(Landroid/view/View;IIIIIIII)V
-PLorg/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryResultsControllerV2;->$r8$lambda$GRwMc6fkPK5Q2WrXsl-thUTyAds(Lorg/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryResultsControllerV2;Landroid/view/View;Z)V
+PLorg/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryResultsControllerV2;->$r8$lambda$TkUzRumFxM3IX4Etn-29S-wJ0xI(Lorg/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryResultsControllerV2;Landroid/view/View;Z)V
 PLorg/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryResultsControllerV2;-><clinit>()V
 PLorg/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryResultsControllerV2;-><init>(Landroidx/fragment/app/Fragment;Lorg/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryViewModelV2;Landroid/view/View;Landroid/view/ViewGroup;Lorg/thoughtcrime/securesms/components/ComposeText;)V
 PLorg/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryResultsControllerV2;->_init_$lambda$0(Lorg/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryResultsControllerV2;Landroid/view/View;Z)V
@@ -38266,12 +38310,52 @@ PLorg/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryViewModelV2;
 PLorg/thoughtcrime/securesms/conversation/v2/BubbleLayoutTransitionListener;->onDestroy(Landroidx/lifecycle/LifecycleOwner;)V
 PLorg/thoughtcrime/securesms/conversation/v2/BubbleLayoutTransitionListener;->onPause(Landroidx/lifecycle/LifecycleOwner;)V
 PLorg/thoughtcrime/securesms/conversation/v2/BubbleLayoutTransitionListener;->onStop(Landroidx/lifecycle/LifecycleOwner;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity$$ExternalSyntheticLambda0;->run()V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;->$r8$lambda$33UlEN7T5ht2QWdzbrQ0qzqGu3Y(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;->getVoiceNoteMediaController()Lorg/thoughtcrime/securesms/components/voice/VoiceNoteMediaController;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;->onCreate$lambda$0(Lorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationActivity;->onDestroy()V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$$ExternalSyntheticLambda5;->createViewHolder(Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$$ExternalSyntheticLambda7;->createViewHolder(Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder$gestureDetector$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Landroid/view/View;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;->canPlayContent()Z
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;->getDisplayMode()Lorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ConversationViewHolder;->showProjectionArea()V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$IncomingMediaViewHolder;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Landroid/view/View;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$IncomingMediaViewHolder;->bind(Ljava/lang/Object;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ThreadHeaderViewHolder$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ThreadHeaderViewHolder;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Landroid/view/View;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$ThreadHeaderViewHolder;->bind(Ljava/lang/Object;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$onDetachedFromRecyclerView$$inlined$filterIsInstance$1;-><clinit>()V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$onDetachedFromRecyclerView$$inlined$filterIsInstance$1;-><init>()V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$onDetachedFromRecyclerView$$inlined$filterIsInstance$1;->invoke(Ljava/lang/Object;)Ljava/lang/Boolean;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2$onDetachedFromRecyclerView$$inlined$filterIsInstance$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->$r8$lambda$01kCfDvc0NgFqrC949og9FAUI0M(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->$r8$lambda$Km9l9bhK0V3bnJUbXFbaKrqQDZg(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->_init_$lambda$4(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->_init_$lambda$6(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->access$getColorizer$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;)Lorg/thoughtcrime/securesms/conversation/colors/Colorizer;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->access$getCondensedMode$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;)Lorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->access$getHasWallpaper$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;)Z
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->access$getInlineContent$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;)Lorg/thoughtcrime/securesms/conversation/ConversationMessage;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->access$getLifecycleOwner$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;)Landroidx/lifecycle/LifecycleOwner;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->access$get_selected$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;)Ljava/util/HashSet;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->consumePulseRequest()Lorg/thoughtcrime/securesms/conversation/ConversationAdapterBridge$PulseRequest;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->getClickListener()Lorg/thoughtcrime/securesms/conversation/ConversationAdapter$ItemClickListener;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->getColorizer()Lorg/thoughtcrime/securesms/conversation/colors/Colorizer;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->getDisplayMode()Lorg/thoughtcrime/securesms/conversation/ConversationItemDisplayMode;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->getNextMessage(I)Lorg/thoughtcrime/securesms/database/model/MessageRecord;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->getPreviousMessage(I)Lorg/thoughtcrime/securesms/database/model/MessageRecord;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->getRequestManager()Lcom/bumptech/glide/RequestManager;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->getSearchQuery()Ljava/lang/String;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->hasNoConversationMessages()Z
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->hasWallpaper()Z
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->isParentInScroll()Z
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->onDetachedFromRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->onViewRecycled(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;->onViewRecycled(Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;)V
@@ -38296,19 +38380,19 @@ PLorg/thoughtcrime/securesms/conversation/v2/ConversationBannerView;->getVoiceNo
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationBannerView;->hide(Lorg/thoughtcrime/securesms/util/views/Stub;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationBannerView;->setListener(Lorg/thoughtcrime/securesms/conversation/v2/ConversationBannerView$Listener;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda17;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda19;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda21;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda22;-><init>(Lkotlin/jvm/functions/Function1;)V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda23;-><init>(Lkotlin/jvm/functions/Function1;)V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda24;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda25;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda26;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda31;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda32;-><init>(Lkotlin/jvm/functions/Function1;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda33;-><init>(Lkotlin/jvm/functions/Function1;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda34;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda35;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda36;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$$ExternalSyntheticLambda38;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$AttachmentKeyboardFragmentListener;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$BackPressedDelegate;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ComposeTextEventsListener;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ComposeTextEventsListener;->onFocusChange(Landroid/view/View;Z)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ConversationBannerListener;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ConversationOptionsMenuCallback$onOptionsMenuCreated$1;-><init>(Landroidx/appcompat/widget/SearchView;Landroidx/appcompat/widget/SearchView$OnQueryTextListener;Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Landroid/view/Menu;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ConversationOptionsMenuCallback$onOptionsMenuCreated$1;-><init>(Landroidx/appcompat/widget/SearchView;Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Landroidx/appcompat/widget/SearchView$OnQueryTextListener;Landroid/view/Menu;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ConversationOptionsMenuCallback$onOptionsMenuCreated$queryListener$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ConversationOptionsMenuCallback;->clearExpiring()V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ConversationOptionsMenuCallback;->onOptionsMenuCreated(Landroid/view/Menu;)V
@@ -38325,6 +38409,15 @@ PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$LastScrolledPo
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$LastScrolledPositionUpdater;->onStart(Landroidx/lifecycle/LifecycleOwner;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$LastScrolledPositionUpdater;->onStop(Landroidx/lifecycle/LifecycleOwner;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$MotionEventRelayDrain;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Landroidx/lifecycle/LifecycleOwner;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollDateHeaderHelper;->bind(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener$$ExternalSyntheticLambda0;-><init>(Lkotlin/jvm/functions/Function1;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener$onScrolled$1;-><init>(Ljava/lang/Object;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener$onScrolled$1;->invoke(J)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener$onScrolled$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener;->$r8$lambda$RpLVFJ5W5LCMN7QrbVRwkt2jGG8(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener;->onScrolled$lambda$0(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener;->presentComposeDivider()V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$SearchEventListener;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$SendButtonListener;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$SwipeAvailabilityProvider;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
@@ -38369,7 +38462,11 @@ PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$doAfterFirstRe
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$doAfterFirstRender$conversationUpdateTick$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$draftViewModel$2;->invoke()Ljava/lang/Object;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$draftViewModel$2;->invoke()Lorg/thoughtcrime/securesms/conversation/drafts/DraftViewModel;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$6;->invoke()Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$7;->invoke()Ljava/lang/Object;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$8;->invoke()Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$9;->invoke(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Ljava/lang/Boolean;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeConversationThreadUi$9;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeInlineSearch$1$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeInlineSearch$2;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$initializeLinkPreviews$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
@@ -38388,10 +38485,30 @@ PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$linkPreviewVie
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$linkPreviewViewModel$2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$motionEventRelay$2;->invoke()Landroidx/lifecycle/ViewModelStoreOwner;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$motionEventRelay$2;->invoke()Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$moveToStartPosition$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$moveToStartPosition$1;->invoke()Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$moveToStartPosition$1;->invoke()V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$2;->accept(Ljava/lang/Object;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$2;->accept(Lorg/thoughtcrime/securesms/conversation/v2/ConversationThreadState;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$3;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$3;->apply(Lorg/thoughtcrime/securesms/conversation/v2/ConversationThreadState;)Lio/reactivex/rxjava3/core/ObservableSource;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Ljava/util/List;Lkotlin/jvm/internal/Ref$BooleanRef;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4$$ExternalSyntheticLambda0;->run()V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4$invoke$lambda$1$$inlined$doAfterNextLayout$1$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4$invoke$lambda$1$$inlined$doAfterNextLayout$1$1;->run()V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4$invoke$lambda$1$$inlined$doAfterNextLayout$1;-><init>(Landroid/view/View;Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4$invoke$lambda$1$$inlined$doAfterNextLayout$1;->onLayoutChange(Landroid/view/View;IIIIIIII)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4;->$r8$lambda$GNhLcqxWF8ew7FXcltFsQD0pebI(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Ljava/util/List;Lkotlin/jvm/internal/Ref$BooleanRef;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4;->invoke$lambda$1(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Ljava/util/List;Lkotlin/jvm/internal/Ref$BooleanRef;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$observeConversationThread$4;->invoke(Ljava/util/List;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$onViewCreated$2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$onViewCreated$2;->invoke(Lorg/thoughtcrime/securesms/conversation/v2/InputReadyState;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$presentGroupCallJoinButton$2;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$presentGroupCallJoinButton$2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$presentGroupCallJoinButton$2;->invoke(Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallState;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$presentStoryRing$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$presentStoryRing$1;->invoke(Lorg/thoughtcrime/securesms/database/model/StoryViewState;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$presentTypingIndicator$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$presentTypingIndicator$2;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$sam$androidx_lifecycle_Observer$0;-><init>(Lkotlin/jvm/functions/Function1;)V
@@ -38419,24 +38536,34 @@ PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$special$$inlin
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$stickerViewModel$2;->invoke()Ljava/lang/Object;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$stickerViewModel$2;->invoke()Lorg/thoughtcrime/securesms/conversation/v2/StickerSuggestionsViewModel;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$doAfterFirstRender(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getAdapter$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getAnimationsAllowed$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Z
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getComposeText(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/components/ComposeText;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getComposeTextEventsListener$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ComposeTextEventsListener;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getDataObserver$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$DataObserver;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getInlineQueryViewModel$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryViewModelV2;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getInputPanel(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/components/InputPanel;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getLayoutManager$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Landroidx/recyclerview/widget/ConversationLayoutManager;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getMarkReadHelper$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/conversation/MarkReadHelper;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getScrollListener$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getScrollToPositionDelegate$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/components/ScrollToPositionDelegate;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getSearchMenuItem$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Landroid/view/MenuItem;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$getTextDraftSaveDebouncer$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Lorg/thoughtcrime/securesms/util/Debouncer;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$handleScheduledMessagesCountChange(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;I)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$invalidateOptionsMenu(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$isScrolledToBottom(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Z
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$isSearchRequested$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)Z
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$moveToStartPosition(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Lorg/thoughtcrime/securesms/conversation/ConversationData;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$onRecipientChanged(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$presentIdentityRecordsState(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Lorg/thoughtcrime/securesms/conversation/v2/IdentityRecordsState;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$presentInputReadyState(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Lorg/thoughtcrime/securesms/conversation/v2/InputReadyState;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$presentRequestReviewState(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Lorg/thoughtcrime/securesms/conversation/v2/RequestReviewState;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$presentScrollButtons(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Lorg/thoughtcrime/securesms/conversation/v2/ConversationScrollButtonState;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$setAnimationsAllowed$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Z)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$setScrollListener$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment$ScrollListener;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$setSearchMenuItem$p(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;Landroid/view/MenuItem;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->access$updateToggleButtonState(Lorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->getComposeText()Lorg/thoughtcrime/securesms/components/ComposeText;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->getDraftViewModel()Lorg/thoughtcrime/securesms/conversation/drafts/DraftViewModel;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->getInlineQueryController()Lorg/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryResultsControllerV2;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->getLinkPreviewViewModel()Lorg/thoughtcrime/securesms/linkpreview/LinkPreviewViewModelV2;
@@ -38454,32 +38581,43 @@ PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->initializeIn
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->initializeLinkPreviews()V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->initializeSearch()V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->initializeStickerSuggestions()V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->isScrolledToBottom()Z
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->moveToStartPosition(Lorg/thoughtcrime/securesms/conversation/ConversationData;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->onDestroyView()V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->onPause()V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->onRecipientChanged(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->presentGroupCallJoinButton()V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->presentIdentityRecordsState(Lorg/thoughtcrime/securesms/conversation/v2/IdentityRecordsState;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->presentInputReadyState(Lorg/thoughtcrime/securesms/conversation/v2/InputReadyState;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->presentRequestReviewState(Lorg/thoughtcrime/securesms/conversation/v2/RequestReviewState;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->presentScrollButtons(Lorg/thoughtcrime/securesms/conversation/v2/ConversationScrollButtonState;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->presentTypingIndicator()V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationFragment;->updateToggleButtonState()V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda10;-><init>(J)V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda10;->run()V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda13;-><init>(JJ)V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda13;->run()V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda16;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;Lorg/thoughtcrime/securesms/database/model/GroupRecord;)V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda16;->call()Ljava/lang/Object;
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda21;-><init>(Lorg/thoughtcrime/securesms/database/model/GroupRecord;Lorg/thoughtcrime/securesms/messagerequests/MessageRequestState;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda21;->call()Ljava/lang/Object;
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->$r8$lambda$-gMXe-w-Xm5jHJapWlyQ6eOUlEE(JJ)V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->$r8$lambda$ATtSNJzojyDhPrLSHCNff4Xrn4s(J)V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->$r8$lambda$KdCOHPNqejWN1AhOnsjSsYWIQ1E(Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;Lorg/thoughtcrime/securesms/database/model/GroupRecord;)Lj$/util/Optional;
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->$r8$lambda$jYghkNuRsI_xLxRgZRxsCeMcFTc(Lorg/thoughtcrime/securesms/database/model/GroupRecord;Lorg/thoughtcrime/securesms/messagerequests/MessageRequestState;Lorg/thoughtcrime/securesms/recipients/Recipient;)Lorg/thoughtcrime/securesms/conversation/v2/RequestReviewState;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$DateHeaderViewHolder;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;Landroid/view/View;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$DateHeaderViewHolder;->bind(Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationMessageElement;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$DateHeaderViewHolder;->getHeight()I
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$DateHeaderViewHolder;->getItemView()Landroid/view/View;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations$DateHeaderViewHolder;->updateForWallpaper()V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->access$timestamp(Lorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationMessageElement;)J
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->getHasWallpaper()Z
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->setCurrentItems(Ljava/util/List;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationItemDecorations;->updateUnreadState(Ljava/util/List;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda11;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;Lorg/thoughtcrime/securesms/database/model/GroupRecord;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda11;->call()Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda17;-><init>(J)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda17;->run()V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda20;-><init>(JJ)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda20;->run()V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda25;-><init>(Lorg/thoughtcrime/securesms/database/model/GroupRecord;Lorg/thoughtcrime/securesms/messagerequests/MessageRequestState;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository$$ExternalSyntheticLambda25;->call()Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->$r8$lambda$I7K4X8vxqSEepxzpRUI9xG3eIzU(JJ)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->$r8$lambda$LrVRvh9JJy3gvbVYqajTgocST5g(Lorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;Lorg/thoughtcrime/securesms/database/model/GroupRecord;)Lj$/util/Optional;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->$r8$lambda$a_RXJUeqo5Rev7aEcY7qouLHbso(Lorg/thoughtcrime/securesms/database/model/GroupRecord;Lorg/thoughtcrime/securesms/messagerequests/MessageRequestState;Lorg/thoughtcrime/securesms/recipients/Recipient;)Lorg/thoughtcrime/securesms/conversation/v2/RequestReviewState;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->$r8$lambda$d1AJVyfOkJGYjVNFjCtNLDkLP08(J)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->getReminder(Lorg/thoughtcrime/securesms/database/model/GroupRecord;)Lio/reactivex/rxjava3/core/Maybe;
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->getRequestReviewState$lambda$15(Lorg/thoughtcrime/securesms/database/model/GroupRecord;Lorg/thoughtcrime/securesms/messagerequests/MessageRequestState;Lorg/thoughtcrime/securesms/recipients/Recipient;)Lorg/thoughtcrime/securesms/conversation/v2/RequestReviewState;
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->markLastSeen$lambda$28(J)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->markLastSeen$lambda$30(J)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->markLastSeen(J)V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->setLastVisibleMessageTimestamp$lambda$5(JJ)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->setLastVisibleMessageTimestamp$lambda$7(JJ)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->setLastVisibleMessageTimestamp(JJ)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationRepository;->startExpirationTimeout(Ljava/util/List;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationScrollButtonState;->equals(Ljava/lang/Object;)Z
@@ -38489,19 +38627,23 @@ PLorg/thoughtcrime/securesms/conversation/v2/ConversationScrollButtonState;->get
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationScrollButtonState;->toString()Ljava/lang/String;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$12;->apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$12;->apply(Lkotlin/Unit;Lj$/util/Optional;)Lj$/util/Optional;
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$13;->apply(Lj$/util/Optional;)Lio/reactivex/rxjava3/core/MaybeSource;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$13;->apply(Ljava/lang/Object;)Ljava/lang/Object;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$17;->onComplete()V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$17;->onNext(Ljava/lang/Object;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$17;->onNext(Ljava/util/List;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$4$$ExternalSyntheticLambda4;->cancel()V
-PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$4;->$r8$lambda$DeiphTJKC3SI_gAZ1faGZoiWX80(Lorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$4;->$r8$lambda$AWszOwyua3uqKbcCjneqrub2s94(Lorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$4;->apply$lambda$4$lambda$3(Lorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$7;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$7;->invoke(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$canShowAsBubble$1;->apply(Ljava/lang/Object;)Ljava/lang/Object;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$getRequestReviewState$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;)V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$getRequestReviewState$1;->apply(Ljava/lang/Object;)Ljava/lang/Object;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$groupMemberServiceIds$1;->test(Lj$/util/Optional;)Z
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$groupMemberServiceIds$1;->test(Ljava/lang/Object;)Z
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$setShowScrollButtonsForScrollPosition$1;-><init>(ZZ)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$setShowScrollButtonsForScrollPosition$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel$setShowScrollButtonsForScrollPosition$1;->invoke(Lorg/thoughtcrime/securesms/conversation/v2/ConversationScrollButtonState;)Lorg/thoughtcrime/securesms/conversation/v2/ConversationScrollButtonState;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->getGroupMemberServiceIds()Lio/reactivex/rxjava3/core/Observable;
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->getHasMessageRequestState()Z
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->getIdentityRecordsObservable()Lio/reactivex/rxjava3/core/Observable;
@@ -38514,11 +38656,20 @@ PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->getSearchQu
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->markLastSeen()V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->onCleared()V
 PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->setLastScrolled(J)V
+PLorg/thoughtcrime/securesms/conversation/v2/ConversationViewModel;->setShowScrollButtonsForScrollPosition(ZZ)V
+PLorg/thoughtcrime/securesms/conversation/v2/DisabledInputView;->clear()V
 PLorg/thoughtcrime/securesms/conversation/v2/DisabledInputView;->setListener(Lorg/thoughtcrime/securesms/conversation/v2/DisabledInputView$Listener;)V
 PLorg/thoughtcrime/securesms/conversation/v2/IdentityRecordsState;->isGroup()Z
 PLorg/thoughtcrime/securesms/conversation/v2/IdentityRecordsState;->isUnverified()Z
 PLorg/thoughtcrime/securesms/conversation/v2/IdentityRecordsState;->isVerified()Z
+PLorg/thoughtcrime/securesms/conversation/v2/InputReadyState;->getConversationRecipient()Lorg/thoughtcrime/securesms/recipients/Recipient;
 PLorg/thoughtcrime/securesms/conversation/v2/InputReadyState;->getGroupRecord()Lorg/thoughtcrime/securesms/database/model/GroupRecord;
+PLorg/thoughtcrime/securesms/conversation/v2/InputReadyState;->isActiveGroup()Ljava/lang/Boolean;
+PLorg/thoughtcrime/securesms/conversation/v2/InputReadyState;->isAnnouncementGroup()Ljava/lang/Boolean;
+PLorg/thoughtcrime/securesms/conversation/v2/InputReadyState;->isClientExpired()Z
+PLorg/thoughtcrime/securesms/conversation/v2/InputReadyState;->isRequestingMember()Ljava/lang/Boolean;
+PLorg/thoughtcrime/securesms/conversation/v2/InputReadyState;->isUnauthorized()Z
+PLorg/thoughtcrime/securesms/conversation/v2/InputReadyState;->shouldShowInviteToSignal()Z
 PLorg/thoughtcrime/securesms/conversation/v2/MotionEventRelay;-><clinit>()V
 PLorg/thoughtcrime/securesms/conversation/v2/MotionEventRelay;-><init>()V
 PLorg/thoughtcrime/securesms/conversation/v2/MotionEventRelay;->setDrain(Lorg/thoughtcrime/securesms/conversation/v2/MotionEventRelay$Drain;)V
@@ -38542,6 +38693,13 @@ PLorg/thoughtcrime/securesms/conversation/v2/VoiceMessageRecordingDelegate$Compa
 PLorg/thoughtcrime/securesms/conversation/v2/VoiceMessageRecordingDelegate$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 PLorg/thoughtcrime/securesms/conversation/v2/VoiceMessageRecordingDelegate;-><clinit>()V
 PLorg/thoughtcrime/securesms/conversation/v2/VoiceMessageRecordingDelegate;-><init>(Landroidx/fragment/app/Fragment;Lorg/thoughtcrime/securesms/audio/AudioRecorder;Lorg/thoughtcrime/securesms/conversation/v2/VoiceMessageRecordingDelegate$SessionCallback;)V
+PLorg/thoughtcrime/securesms/conversation/v2/computed/FormattedDate;->getValue()Ljava/lang/String;
+PLorg/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource;->load(Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource;->load(Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationElementKey;)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingModel;
+PLorg/thoughtcrime/securesms/conversation/v2/data/ConversationElementKey$Companion;-><clinit>()V
+PLorg/thoughtcrime/securesms/conversation/v2/data/ConversationElementKey$Companion;-><init>()V
+PLorg/thoughtcrime/securesms/conversation/v2/data/ConversationElementKey$Companion;->getThreadHeader()Lorg/thoughtcrime/securesms/conversation/v2/data/ConversationElementKey;
+PLorg/thoughtcrime/securesms/conversation/v2/data/ConversationElementKey;-><clinit>()V
 PLorg/thoughtcrime/securesms/conversation/v2/data/IncomingMedia;->areContentsTheSame(Ljava/lang/Object;)Z
 PLorg/thoughtcrime/securesms/conversation/v2/data/IncomingMedia;->areContentsTheSame(Lorg/thoughtcrime/securesms/conversation/v2/data/IncomingMedia;)Z
 PLorg/thoughtcrime/securesms/conversation/v2/data/IncomingMedia;->areItemsTheSame(Ljava/lang/Object;)Z
@@ -38557,15 +38715,137 @@ PLorg/thoughtcrime/securesms/conversation/v2/data/ThreadHeader;->areContentsTheS
 PLorg/thoughtcrime/securesms/conversation/v2/data/ThreadHeader;->areItemsTheSame(Ljava/lang/Object;)Z
 PLorg/thoughtcrime/securesms/conversation/v2/data/ThreadHeader;->areItemsTheSame(Lorg/thoughtcrime/securesms/conversation/v2/data/ThreadHeader;)Z
 PLorg/thoughtcrime/securesms/conversation/v2/data/ThreadHeader;->getChangePayload(Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/data/ThreadHeader;->getRecipientInfo()Lorg/thoughtcrime/securesms/messagerequests/MessageRequestRecipientInfo;
 PLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallState;->equals(Ljava/lang/Object;)Z
 PLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallState;->getHasCapacity()Z
-PLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel$2;->apply(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-PLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel$2;->apply(Lkotlin/Unit;Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallState;)Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallState;
-PLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel$3;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-PLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel$3;->invoke(Lorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallState;)V
 PLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel;->getState()Lio/reactivex/rxjava3/core/Flowable;
 PLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel;->onCleared()V
 PLorg/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel;->onCleared()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsData;->getChatColors()Lorg/thoughtcrime/securesms/conversation/colors/ChatColors;
+PLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsData;->getMask()Landroid/graphics/drawable/Drawable;
+PLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsItemDecoration$onDraw$$inlined$filterIsInstance$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;-><clinit>()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;-><init>(Lkotlin/jvm/functions/Function0;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;->getMask()Landroid/graphics/drawable/Drawable;
+PLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;->getOpacity()I
+PLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;->setCorners(Lorg/thoughtcrime/securesms/util/Projection$Corners;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable;->setLocalChatColors(Lorg/thoughtcrime/securesms/conversation/colors/ChatColors;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/ShrinkWrapLinearLayout;->onMeasure(II)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/ShrinkWrapLinearLayout;->shrinkWrapWidthMeasureSpec(I)I
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;->addOnMeasureListener(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout$OnMeasureListener;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;->removeOnMeasureListener(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout$OnMeasureListener;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;->setOnDispatchTouchEventListener(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout$OnDispatchTouchEventListener;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$Companion;-><init>()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;->$values()[Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;-><clinit>()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;-><init>(Ljava/lang/String;IFF)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;->getBottomPadding()F
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;->getTopPadding()F
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;->isEndingShape()Z
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;->isStartingShape()Z
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;-><clinit>()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationContext;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;->access$getCollapsedSpacing$cp()F
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;->access$getDefaultSpacing$cp()F
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;->getCornersLTR()Lorg/thoughtcrime/securesms/util/Projection$Corners;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;->isSingularMessage(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lorg/thoughtcrime/securesms/database/model/MessageRecord;Z)Z
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;->isStartOfMessageCluster(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lorg/thoughtcrime/securesms/database/model/MessageRecord;Z)Z
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;->isWithinClusteringTime(Lorg/thoughtcrime/securesms/database/model/MessageRecord;Lorg/thoughtcrime/securesms/database/model/MessageRecord;)Z
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;->setBodyBubbleCorners(FFFF)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;-><clinit>()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;Lorg/thoughtcrime/securesms/components/AvatarImageView;Lorg/thoughtcrime/securesms/badges/BadgeImageView;Landroid/view/ViewGroup;Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;Lcom/google/android/material/imageview/ShapeableImageView;Lorg/thoughtcrime/securesms/reactions/ReactionsConversationView;Lorg/thoughtcrime/securesms/components/DeliveryStatusView;Landroid/widget/TextView;Lorg/thoughtcrime/securesms/components/ExpirationTimerView;Landroid/view/View;Landroid/widget/Space;Lorg/thoughtcrime/securesms/components/AlertView;Z)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getAlert()Lorg/thoughtcrime/securesms/components/AlertView;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getBody()Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getBodyWrapper()Landroid/view/ViewGroup;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getDeliveryStatus()Lorg/thoughtcrime/securesms/components/DeliveryStatusView;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getFooterBackground()Landroid/view/View;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getFooterDate()Landroid/widget/TextView;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getFooterExpiry()Lorg/thoughtcrime/securesms/components/ExpirationTimerView;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getFooterSpace()Landroid/widget/Space;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getReactions()Lorg/thoughtcrime/securesms/reactions/ReactionsConversationView;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getReply()Lcom/google/android/material/imageview/ShapeableImageView;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getRoot()Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getSenderBadge()Lorg/thoughtcrime/securesms/badges/BadgeImageView;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getSenderName()Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->getSenderPhoto()Lorg/thoughtcrime/securesms/components/AvatarImageView;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;->isIncoming()Z
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridgeKt;->bridge(Lorg/thoughtcrime/securesms/databinding/V2ConversationItemTextOnlyIncomingBinding;)Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda1;-><init>()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/conversation/ConversationAdapter$ItemClickListener;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda3;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda3;->onLayoutChange(Landroid/view/View;IIIIIIII)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda4;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda5;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda6;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda7;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$$ExternalSyntheticLambda8;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$Companion;-><init>()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$PassthroughClickListener;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$ReactionMeasureListener;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$bodyBubbleDrawable$1;-><init>(Ljava/lang/Object;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$bodyBubbleDrawable$1;->invoke()Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$bodyBubbleDrawable$1;->invoke()Lorg/thoughtcrime/securesms/conversation/v2/items/ChatColorsDrawable$ChatColorsData;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$footerDrawable$1;-><init>(Ljava/lang/Object;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$footerDrawable$1;->invoke()Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$gestureDetector$1;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$replyDelegate$1;-><init>()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder$senderDrawable$1;-><init>(Ljava/lang/Object;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->$r8$lambda$NAvN9Ib0ecKjckDQko9FsZRH87U(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;Landroid/view/View;IIIIIIII)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;-><clinit>()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationContext;Lorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->_init_$lambda$0(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;Landroid/view/View;IIIIIIII)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->bind(Ljava/lang/Object;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->canPlayContent()Z
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->getConversationMessage()Lorg/thoughtcrime/securesms/conversation/ConversationMessage;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->getShape()Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->invalidateFooterDrawable(Landroid/view/ViewGroup;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->isContentCondensed()Z
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->isForcedFooter()Z
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentAlert()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentDate()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentDeliveryStatus()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentFooterBackground()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentFooterEndPadding()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentFooterExpiry()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentReactions()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentSenderNameBackground()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->presentSenderNameColor()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->setConversationMessage(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->setShape(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape$MessageShape;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder;->showProjectionArea()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme$getBodyTextColor$1;-><init>(Ljava/lang/Object;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme$getBodyTextColor$2;-><init>(Ljava/lang/Object;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme$getBodyTextColor$2;->invoke(Landroid/content/Context;Z)Ljava/lang/Integer;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme$getBodyTextColor$2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme;-><clinit>()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme;-><init>(Landroid/content/Context;Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationContext;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme;->getBodyBubbleColor(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;)I
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme;->getColor(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)I
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme;->getFooterBubbleColor(Lorg/thoughtcrime/securesms/conversation/ConversationMessage;)I
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme;->getReplyIconBackgroundColor()I
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemUtils;-><clinit>()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemUtils;-><init>()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemUtils;->linkifyUrlLinks(Landroid/text/Spannable;ZLorg/thoughtcrime/securesms/util/UrlClickHandler;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder;-><clinit>()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationContext;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder;->getShapeDelegate()Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShape;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemViewHolder;->getThemeDelegate()Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate$DisplayState;->$values()[Lorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate$DisplayState;
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate$DisplayState;-><clinit>()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate$DisplayState;-><init>(Ljava/lang/String;I)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate;-><clinit>()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;Ljava/util/List;Landroid/view/View;Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;Landroid/widget/Space;Lorg/thoughtcrime/securesms/util/views/Stub;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate;->displayTuckedIntoBody()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate;->getFooterWidth()I
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate;->onPreMeasure()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2OnDispatchTouchEventListener$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2OnDispatchTouchEventListener;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2OnDispatchTouchEventListener$Companion;-><init>()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2OnDispatchTouchEventListener$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2OnDispatchTouchEventListener;-><clinit>()V
+PLorg/thoughtcrime/securesms/conversation/v2/items/V2OnDispatchTouchEventListener;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationContext;Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge;)V
 PLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->onDestroyView()V
 PLorg/thoughtcrime/securesms/conversationlist/ConversationListFragment;->onStop()V
 PLorg/thoughtcrime/securesms/conversationlist/ConversationListViewModel;->onCleared()V
@@ -38574,21 +38854,26 @@ PLorg/thoughtcrime/securesms/database/CallTable$markAllCallEventsWithPeerBeforeT
 PLorg/thoughtcrime/securesms/database/CallTable$markAllCallEventsWithPeerBeforeTimestampRead$latestCallAsOfTimestamp$1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 PLorg/thoughtcrime/securesms/database/CallTable$markAllCallEventsWithPeerBeforeTimestampRead$latestCallAsOfTimestamp$1;->invoke(Lorg/thoughtcrime/securesms/database/SQLiteDatabase;)Lorg/thoughtcrime/securesms/database/CallTable$Call;
 PLorg/thoughtcrime/securesms/database/CallTable;->markAllCallEventsWithPeerBeforeTimestampRead(Lorg/thoughtcrime/securesms/recipients/RecipientId;J)Lorg/thoughtcrime/securesms/database/CallTable$Call;
-PLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda13;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;JLorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
-PLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda13;->run()V
-PLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda26;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;)V
-PLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda26;->run()V
+PLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda18;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;JLorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+PLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda18;->run()V
+PLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda27;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+PLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda27;->run()V
+PLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda40;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;)V
+PLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda40;->run()V
 PLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda6;-><init>(Lorg/thoughtcrime/securesms/database/DatabaseObserver;J)V
 PLorg/thoughtcrime/securesms/database/DatabaseObserver$$ExternalSyntheticLambda6;->run()V
-PLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$2v1Sb-6JCd9xjyyzfbH5tKTRWy8(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;)V
-PLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$8PzBCQMLi_6Y7FOR98cRbpXw-Xk(Lorg/thoughtcrime/securesms/database/DatabaseObserver;JLorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
-PLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$ZjxWKgbWA1SSTmnWoVneQana_Lk(Lorg/thoughtcrime/securesms/database/DatabaseObserver;J)V
-PLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$notifyVerboseConversationListeners$20(J)V
+PLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$26Z6QxYCWTSrTcr8QL4XDsBfrJY(Lorg/thoughtcrime/securesms/database/DatabaseObserver;J)V
+PLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$Et_WjErNBXkp9Pcy6w9KoIB7JY8(Lorg/thoughtcrime/securesms/database/DatabaseObserver;JLorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+PLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$bAbaqo6GH2IUzdKDk9dPStsQvRM(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;)V
+PLorg/thoughtcrime/securesms/database/DatabaseObserver;->$r8$lambda$qdJvMLmOdhZhz5kJ3NCvOc84R1U(Lorg/thoughtcrime/securesms/database/DatabaseObserver;Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+PLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$notifyVerboseConversationListeners$22(J)V
 PLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$registerScheduledMessageObserver$14(JLorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
-PLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$unregisterObserver$18(Lorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;)V
+PLorg/thoughtcrime/securesms/database/DatabaseObserver;->lambda$unregisterObserver$19(Lorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;)V
 PLorg/thoughtcrime/securesms/database/DatabaseObserver;->notifyVerboseConversationListeners(Ljava/util/Set;)V
 PLorg/thoughtcrime/securesms/database/DatabaseObserver;->registerScheduledMessageObserver(JLorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+PLorg/thoughtcrime/securesms/database/DatabaseObserver;->unregisterMapped(Ljava/util/Map;Ljava/lang/Object;)V
 PLorg/thoughtcrime/securesms/database/DatabaseObserver;->unregisterObserver(Lorg/thoughtcrime/securesms/database/DatabaseObserver$MessageObserver;)V
+PLorg/thoughtcrime/securesms/database/DatabaseObserver;->unregisterObserver(Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
 PLorg/thoughtcrime/securesms/database/DatabaseTable;->notifyVerboseConversationListeners(Ljava/util/Set;)V
 PLorg/thoughtcrime/securesms/database/DraftTable$Drafts;->getDraftOfType(Ljava/lang/String;)Lorg/thoughtcrime/securesms/database/DraftTable$Draft;
 PLorg/thoughtcrime/securesms/database/MessageTable$markExpireStarted$1;-><init>(Ljava/util/Collection;)V
@@ -38600,8 +38885,15 @@ PLorg/thoughtcrime/securesms/database/MessageTable;->getScheduledMessageCountFor
 PLorg/thoughtcrime/securesms/database/MessageTable;->markExpireStarted(Ljava/util/Collection;)V
 PLorg/thoughtcrime/securesms/database/MessageTable;->setMessagesReadSince(JJ)Ljava/util/List;
 PLorg/thoughtcrime/securesms/database/MessageTable;->setReactionsSeen(JJ)V
-PLorg/thoughtcrime/securesms/database/RxDatabaseObserver$$ExternalSyntheticLambda1;->cancel()V
-PLorg/thoughtcrime/securesms/database/RxDatabaseObserver;->$r8$lambda$6u1bbd117Cl1h38MfeI7BgZPo1A(Lorg/thoughtcrime/securesms/database/RxDatabaseObserver$RxObserver;)V
+PLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isBundleKeyExchange(J)Z
+PLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isFailedMessageType(J)Z
+PLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isPendingInsecureSmsFallbackType(J)Z
+PLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isPendingMessageType(J)Z
+PLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isPendingSecureSmsFallbackType(J)Z
+PLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isRateLimited(J)Z
+PLorg/thoughtcrime/securesms/database/MessageTypes$-CC;->isSecureType(J)Z
+PLorg/thoughtcrime/securesms/database/RxDatabaseObserver$$ExternalSyntheticLambda0;->cancel()V
+PLorg/thoughtcrime/securesms/database/RxDatabaseObserver;->$r8$lambda$JX6gx807warYDJMIr_W8ljl8Mgs(Lorg/thoughtcrime/securesms/database/RxDatabaseObserver$RxObserver;)V
 PLorg/thoughtcrime/securesms/database/RxDatabaseObserver;->databaseFlowable$lambda$1$lambda$0(Lorg/thoughtcrime/securesms/database/RxDatabaseObserver$RxObserver;)V
 PLorg/thoughtcrime/securesms/database/SignalDatabase;->calls()Lorg/thoughtcrime/securesms/database/CallTable;
 PLorg/thoughtcrime/securesms/database/ThreadTable$setReadSince$1;-><init>(Ljava/util/Map;Lorg/thoughtcrime/securesms/database/ThreadTable;Ljava/util/List;ZLkotlin/jvm/internal/Ref$BooleanRef;)V
@@ -38615,13 +38907,51 @@ PLorg/thoughtcrime/securesms/database/ThreadTable;->setReadSince(JZJ)Ljava/util/
 PLorg/thoughtcrime/securesms/database/ThreadTable;->setReadSince(Ljava/util/Map;Z)Ljava/util/List;
 PLorg/thoughtcrime/securesms/database/ThreadTable;->setReadSince(Lorg/thoughtcrime/securesms/notifications/v2/ConversationId;ZJ)Ljava/util/List;
 PLorg/thoughtcrime/securesms/database/identity/IdentityRecordList;->equals(Ljava/lang/Object;)Z
+PLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isKeyExchange()Z
+PLorg/thoughtcrime/securesms/database/model/DisplayRecord;->isPending()Z
+PLorg/thoughtcrime/securesms/database/model/MessageRecord;->isJumbomoji(Landroid/content/Context;)Z
 PLorg/thoughtcrime/securesms/database/model/ProfileAvatarFileDetails;->equals(Ljava/lang/Object;)Z
+PLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion$$ExternalSyntheticLambda1;->cancel()V
+PLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion;->$r8$lambda$PlfOeWE7_IzZ1bCVuLZWq5IC6OU(Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+PLorg/thoughtcrime/securesms/database/model/StoryViewState$Companion;->getState$lambda$3$lambda$2(Lorg/thoughtcrime/securesms/database/DatabaseObserver$Observer;)V
+PLorg/thoughtcrime/securesms/database/model/StoryViewState;->values()[Lorg/thoughtcrime/securesms/database/model/StoryViewState;
 PLorg/thoughtcrime/securesms/database/model/ThreadRecord;->isForcedUnread()Z
+PLorg/thoughtcrime/securesms/databinding/ConversationHeaderViewBinding;-><init>(Landroid/view/View;Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;Lorg/thoughtcrime/securesms/components/AvatarImageView;Landroid/widget/LinearLayout;Lorg/thoughtcrime/securesms/badges/BadgeImageView;Lcom/google/android/material/button/MaterialButton;Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;Landroid/view/View;Landroidx/constraintlayout/widget/ConstraintLayout;Landroid/view/View;Landroid/widget/TextView;Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;)V
+PLorg/thoughtcrime/securesms/databinding/ConversationHeaderViewBinding;->bind(Landroid/view/View;)Lorg/thoughtcrime/securesms/databinding/ConversationHeaderViewBinding;
 PLorg/thoughtcrime/securesms/databinding/ConversationSearchNavBinding;->getRoot()Lorg/thoughtcrime/securesms/components/ConversationSearchBottomBar;
+PLorg/thoughtcrime/securesms/databinding/TransferControlsViewBinding;-><init>(Landroid/view/View;Landroidx/constraintlayout/widget/Guideline;Landroidx/appcompat/widget/AppCompatImageView;Landroid/view/View;Landroid/widget/TextView;Lorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView;Landroid/view/View;Landroid/widget/TextView;Lorg/thoughtcrime/securesms/components/transfercontrols/TransferProgressView;Landroidx/constraintlayout/widget/Guideline;)V
+PLorg/thoughtcrime/securesms/databinding/TransferControlsViewBinding;->bind(Landroid/view/View;)Lorg/thoughtcrime/securesms/databinding/TransferControlsViewBinding;
+PLorg/thoughtcrime/securesms/databinding/TransferControlsViewBinding;->inflate(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/databinding/TransferControlsViewBinding;
 PLorg/thoughtcrime/securesms/databinding/V2ConversationFragmentBinding;->getRoot()Lorg/thoughtcrime/securesms/components/InputAwareConstraintLayout;
+PLorg/thoughtcrime/securesms/databinding/V2ConversationItemTextOnlyIncomingBinding;-><init>(Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;Lorg/thoughtcrime/securesms/badges/BadgeImageView;Lorg/thoughtcrime/securesms/components/AvatarImageView;Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;Lorg/thoughtcrime/securesms/conversation/v2/items/ShrinkWrapLinearLayout;Lorg/thoughtcrime/securesms/components/ExpirationTimerView;Landroid/view/View;Landroid/widget/TextView;Lorg/thoughtcrime/securesms/reactions/ReactionsConversationView;Lcom/google/android/material/imageview/ShapeableImageView;Landroid/widget/Space;Lorg/thoughtcrime/securesms/components/emoji/EmojiTextView;)V
+PLorg/thoughtcrime/securesms/databinding/V2ConversationItemTextOnlyIncomingBinding;->bind(Landroid/view/View;)Lorg/thoughtcrime/securesms/databinding/V2ConversationItemTextOnlyIncomingBinding;
+PLorg/thoughtcrime/securesms/databinding/V2ConversationItemTextOnlyIncomingBinding;->getRoot()Lorg/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemLayout;
 PLorg/thoughtcrime/securesms/emoji/EmojiPageCache$LoadResult$Immediate;-><clinit>()V
 PLorg/thoughtcrime/securesms/emoji/EmojiPageCache$LoadResult$Immediate;-><init>(Landroid/graphics/Bitmap;)V
 PLorg/thoughtcrime/securesms/emoji/EmojiPageCache$LoadResult$Immediate;->getBitmap()Landroid/graphics/Bitmap;
+PLorg/thoughtcrime/securesms/emoji/EmojiSource$maxEmojiLength$2;->invoke()Ljava/lang/Integer;
+PLorg/thoughtcrime/securesms/emoji/EmojiSource$maxEmojiLength$2;->invoke()Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/emoji/EmojiSource;->getMaxEmojiLength()I
+PLorg/thoughtcrime/securesms/emoji/EmojiSourceKt;->access$maxOrZero(Ljava/util/List;)I
+PLorg/thoughtcrime/securesms/emoji/EmojiSourceKt;->maxOrZero(Ljava/util/List;)I
+PLorg/thoughtcrime/securesms/fonts/SignalSymbols$CustomTypefaceSpan;-><init>(Landroid/graphics/Typeface;)V
+PLorg/thoughtcrime/securesms/fonts/SignalSymbols$CustomTypefaceSpan;->updateDrawState(Landroid/text/TextPaint;)V
+PLorg/thoughtcrime/securesms/fonts/SignalSymbols$CustomTypefaceSpan;->updateMeasureState(Landroid/text/TextPaint;)V
+PLorg/thoughtcrime/securesms/fonts/SignalSymbols$Glyph;->$values()[Lorg/thoughtcrime/securesms/fonts/SignalSymbols$Glyph;
+PLorg/thoughtcrime/securesms/fonts/SignalSymbols$Glyph;-><clinit>()V
+PLorg/thoughtcrime/securesms/fonts/SignalSymbols$Glyph;-><init>(Ljava/lang/String;IC)V
+PLorg/thoughtcrime/securesms/fonts/SignalSymbols$Glyph;->getUnicode()C
+PLorg/thoughtcrime/securesms/fonts/SignalSymbols$Weight;->$values()[Lorg/thoughtcrime/securesms/fonts/SignalSymbols$Weight;
+PLorg/thoughtcrime/securesms/fonts/SignalSymbols$Weight;-><clinit>()V
+PLorg/thoughtcrime/securesms/fonts/SignalSymbols$Weight;-><init>(Ljava/lang/String;I)V
+PLorg/thoughtcrime/securesms/fonts/SignalSymbols$Weight;->values()[Lorg/thoughtcrime/securesms/fonts/SignalSymbols$Weight;
+PLorg/thoughtcrime/securesms/fonts/SignalSymbols$WhenMappings;-><clinit>()V
+PLorg/thoughtcrime/securesms/fonts/SignalSymbols;-><clinit>()V
+PLorg/thoughtcrime/securesms/fonts/SignalSymbols;-><init>()V
+PLorg/thoughtcrime/securesms/fonts/SignalSymbols;->getBoldWeightedFont(Landroid/content/Context;)Landroid/graphics/Typeface;
+PLorg/thoughtcrime/securesms/fonts/SignalSymbols;->getTypeface(Landroid/content/Context;Lorg/thoughtcrime/securesms/fonts/SignalSymbols$Weight;)Landroid/graphics/Typeface;
+PLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController$RangeComparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I
+PLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackController;->onScrolled(Landroidx/recyclerview/widget/RecyclerView;II)V
 PLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionPlayerHolder;->onDestroy(Landroidx/lifecycle/LifecycleOwner;)V
 PLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionPlayerHolder;->onPause(Landroidx/lifecycle/LifecycleOwner;)V
 PLorg/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionPlayerHolder;->onStop(Landroidx/lifecycle/LifecycleOwner;)V
@@ -38634,6 +38964,7 @@ PLorg/thoughtcrime/securesms/jobs/ConversationShortcutUpdateJob;->enqueue()V
 PLorg/thoughtcrime/securesms/jobs/ConversationShortcutUpdateJob;->getFactoryKey()Ljava/lang/String;
 PLorg/thoughtcrime/securesms/jobs/ConversationShortcutUpdateJob;->serialize()[B
 PLorg/thoughtcrime/securesms/keyvalue/SettingsValues$Theme;->values()[Lorg/thoughtcrime/securesms/keyvalue/SettingsValues$Theme;
+PLorg/thoughtcrime/securesms/keyvalue/SettingsValues;->isEnterKeySends()Z
 PLorg/thoughtcrime/securesms/keyvalue/SettingsValues;->isLinkPreviewsEnabled()Z
 PLorg/thoughtcrime/securesms/linkpreview/LinkPreviewRepository;-><clinit>()V
 PLorg/thoughtcrime/securesms/linkpreview/LinkPreviewRepository;-><init>()V
@@ -38665,30 +38996,46 @@ PLorg/thoughtcrime/securesms/linkpreview/LinkPreviewViewModelV2;->onCleared()V
 PLorg/thoughtcrime/securesms/linkpreview/LinkPreviewViewModelV2;->setSavedLinkPreviewState(Lorg/thoughtcrime/securesms/linkpreview/LinkPreviewState;)V
 PLorg/thoughtcrime/securesms/logsubmit/LogSectionNotifications$$ExternalSyntheticApiModelOutline2;->m(Landroid/app/NotificationChannel;)Z
 PLorg/thoughtcrime/securesms/main/MainActivityListHostFragment;->onDestroyView()V
+PLorg/thoughtcrime/securesms/messagerequests/GroupInfo;->getDescription()Ljava/lang/String;
+PLorg/thoughtcrime/securesms/messagerequests/MessageRequestRecipientInfo;->component1()Lorg/thoughtcrime/securesms/recipients/Recipient;
+PLorg/thoughtcrime/securesms/messagerequests/MessageRequestRecipientInfo;->component2()Lorg/thoughtcrime/securesms/messagerequests/GroupInfo;
+PLorg/thoughtcrime/securesms/messagerequests/MessageRequestRecipientInfo;->component3()Ljava/util/List;
+PLorg/thoughtcrime/securesms/messagerequests/MessageRequestRecipientInfo;->component4()Lorg/thoughtcrime/securesms/messagerequests/MessageRequestState;
 PLorg/thoughtcrime/securesms/messagerequests/MessageRequestState;->equals(Ljava/lang/Object;)Z
 PLorg/thoughtcrime/securesms/messagerequests/MessageRequestState;->getState()Lorg/thoughtcrime/securesms/messagerequests/MessageRequestState$State;
 PLorg/thoughtcrime/securesms/mms/AttachmentManager;->isAttachmentPresent()Z
-PLorg/thoughtcrime/securesms/notifications/MarkReadReceiver$$ExternalSyntheticLambda10;-><init>()V
-PLorg/thoughtcrime/securesms/notifications/MarkReadReceiver$$ExternalSyntheticLambda10;->test(Ljava/lang/Object;)Z
-PLorg/thoughtcrime/securesms/notifications/MarkReadReceiver$$ExternalSyntheticLambda11;-><init>()V
-PLorg/thoughtcrime/securesms/notifications/MarkReadReceiver$$ExternalSyntheticLambda11;->apply(Ljava/lang/Object;)Ljava/lang/Object;
-PLorg/thoughtcrime/securesms/notifications/MarkReadReceiver;->$r8$lambda$b_EADC0vZU7XQFn_9g4yupsI8u4(Lorg/thoughtcrime/securesms/notifications/v2/ConversationId;)Z
+PLorg/thoughtcrime/securesms/mms/ImageSlide;->hasPlaceholder()Z
+PLorg/thoughtcrime/securesms/mms/ImageSlide;->isBorderless()Z
+PLorg/thoughtcrime/securesms/mms/Slide;->asAttachment()Lorg/thoughtcrime/securesms/attachments/Attachment;
+PLorg/thoughtcrime/securesms/mms/Slide;->getCaption()Lj$/util/Optional;
+PLorg/thoughtcrime/securesms/mms/Slide;->getDisplayUri()Landroid/net/Uri;
+PLorg/thoughtcrime/securesms/mms/Slide;->getFileSize()J
+PLorg/thoughtcrime/securesms/mms/Slide;->getPlaceholderBlur()Lorg/thoughtcrime/securesms/blurhash/BlurHash;
+PLorg/thoughtcrime/securesms/mms/Slide;->hasThumbnail()Z
+PLorg/thoughtcrime/securesms/mms/SlideDeck$$ExternalSyntheticLambda0;-><init>()V
+PLorg/thoughtcrime/securesms/mms/SlideDeck$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z
+PLorg/thoughtcrime/securesms/notifications/MarkReadReceiver$$ExternalSyntheticLambda5;-><init>()V
+PLorg/thoughtcrime/securesms/notifications/MarkReadReceiver$$ExternalSyntheticLambda5;->test(Ljava/lang/Object;)Z
+PLorg/thoughtcrime/securesms/notifications/MarkReadReceiver$$ExternalSyntheticLambda6;-><init>()V
+PLorg/thoughtcrime/securesms/notifications/MarkReadReceiver$$ExternalSyntheticLambda6;->apply(Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/notifications/MarkReadReceiver;->$r8$lambda$kQCZHNqhnnlu5gwG_XWQWDeIWVQ(Lorg/thoughtcrime/securesms/notifications/v2/ConversationId;)Z
 PLorg/thoughtcrime/securesms/notifications/MarkReadReceiver;-><clinit>()V
 PLorg/thoughtcrime/securesms/notifications/MarkReadReceiver;->lambda$processCallEvents$6(Lorg/thoughtcrime/securesms/notifications/v2/ConversationId;)Z
 PLorg/thoughtcrime/securesms/notifications/MarkReadReceiver;->process(Ljava/util/List;)V
 PLorg/thoughtcrime/securesms/notifications/MarkReadReceiver;->processCallEvents(Ljava/util/List;J)V
+PLorg/thoughtcrime/securesms/notifications/NotificationCancellationHelper$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/NotificationManager;)[Landroid/service/notification/StatusBarNotification;
 PLorg/thoughtcrime/securesms/notifications/NotificationCancellationHelper;-><clinit>()V
 PLorg/thoughtcrime/securesms/notifications/NotificationCancellationHelper;->cancelAllMessageNotifications(Landroid/content/Context;Ljava/util/Set;)V
 PLorg/thoughtcrime/securesms/notifications/NotificationCancellationHelper;->cancelLegacy(Landroid/content/Context;I)V
-PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier$$ExternalSyntheticLambda11;-><init>(Ljava/lang/Runnable;Ljava/lang/Throwable;)V
-PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier$$ExternalSyntheticLambda11;->run()V
-PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier$$ExternalSyntheticLambda6;-><init>(Lorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier;Landroid/content/Context;)V
-PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier$$ExternalSyntheticLambda6;->run()V
-PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier$$ExternalSyntheticLambda7;-><init>(Lorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier;Landroid/content/Context;)V
-PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier$$ExternalSyntheticLambda7;->run()V
-PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier;->$r8$lambda$0MHafWJB8CwezqWVbncoEq_a3Xg(Ljava/lang/Runnable;Ljava/lang/Throwable;)V
-PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier;->$r8$lambda$dClU2s1olLC6PkCR84cT7C2dqfA(Lorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier;Landroid/content/Context;)V
-PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier;->$r8$lambda$mDf5wVelzwBtc0Vgo342P1gCo0c(Lorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier;Landroid/content/Context;)V
+PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier$$ExternalSyntheticLambda1;-><init>(Lorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier;Landroid/content/Context;)V
+PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier$$ExternalSyntheticLambda1;->run()V
+PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier$$ExternalSyntheticLambda2;-><init>(Lorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier;Landroid/content/Context;)V
+PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier$$ExternalSyntheticLambda2;->run()V
+PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier$$ExternalSyntheticLambda5;-><init>(Ljava/lang/Runnable;Ljava/lang/Throwable;)V
+PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier$$ExternalSyntheticLambda5;->run()V
+PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier;->$r8$lambda$-MIjf-WrxGixLkVgJydgA3vAOKE(Ljava/lang/Runnable;Ljava/lang/Throwable;)V
+PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier;->$r8$lambda$O_m6UJUQHLnKTLxjn0iX-aZxV3U(Lorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier;Landroid/content/Context;)V
+PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier;->$r8$lambda$nmbDyST29wFD_F7aVQLtsDi7HQU(Lorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier;Landroid/content/Context;)V
 PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier;->clearVisibleThread()V
 PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier;->lambda$runOnLimiter$11(Ljava/lang/Runnable;Ljava/lang/Throwable;)V
 PLorg/thoughtcrime/securesms/notifications/OptimizedMessageNotifier;->lambda$updateNotification$3(Landroid/content/Context;)V
@@ -38720,24 +39067,31 @@ PLorg/thoughtcrime/securesms/notifications/v2/NotificationStateProvider;-><init>
 PLorg/thoughtcrime/securesms/notifications/v2/NotificationStateProvider;->constructNotificationState(Ljava/util/Map;Lorg/thoughtcrime/securesms/notifications/profiles/NotificationProfile;)Lorg/thoughtcrime/securesms/notifications/v2/NotificationState;
 PLorg/thoughtcrime/securesms/preferences/widgets/NotificationPrivacyPreference;->equals(Ljava/lang/Object;)Z
 PLorg/thoughtcrime/securesms/preferences/widgets/NotificationPrivacyPreference;->isDisplayContact()Z
-PLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda0;->run()V
-PLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda2;->onChanged(Ljava/lang/Object;)V
-PLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda3;->contentsMatch(Ljava/lang/Object;Ljava/lang/Object;)Z
+PLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda0;->onChanged(Ljava/lang/Object;)V
+PLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda1;->contentsMatch(Ljava/lang/Object;Ljava/lang/Object;)Z
+PLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda5;->run()V
 PLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda6;-><init>(Lorg/thoughtcrime/securesms/recipients/LiveRecipient;Lorg/thoughtcrime/securesms/recipients/RecipientForeverObserver;)V
 PLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda6;->run()V
-PLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda9;-><init>(Lorg/thoughtcrime/securesms/recipients/LiveRecipient;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-PLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda9;->run()V
-PLorg/thoughtcrime/securesms/recipients/LiveRecipient;->$r8$lambda$4o-q--s8xb4fbde9teliyQxlyww(Lorg/thoughtcrime/securesms/recipients/LiveRecipient;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-PLorg/thoughtcrime/securesms/recipients/LiveRecipient;->$r8$lambda$CYcq6dHxZW6RfEGMe0s6kvofKaE(Lorg/thoughtcrime/securesms/recipients/LiveRecipient;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
-PLorg/thoughtcrime/securesms/recipients/LiveRecipient;->$r8$lambda$pGM0bNiB06y_fkMUloVDwF8BcLs(Lorg/thoughtcrime/securesms/recipients/LiveRecipient;Lorg/thoughtcrime/securesms/recipients/RecipientForeverObserver;)V
-PLorg/thoughtcrime/securesms/recipients/LiveRecipient;->$r8$lambda$snuajGLvOLM6I1QDJohSseUuY1E(Lorg/thoughtcrime/securesms/recipients/LiveRecipient;Lorg/thoughtcrime/securesms/recipients/RecipientForeverObserver;)V
+PLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda7;-><init>(Lorg/thoughtcrime/securesms/recipients/LiveRecipient;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
+PLorg/thoughtcrime/securesms/recipients/LiveRecipient$$ExternalSyntheticLambda7;->run()V
+PLorg/thoughtcrime/securesms/recipients/LiveRecipient;->$r8$lambda$8PkUEZdGq__CmYcrCzhT_GMx-xI(Lorg/thoughtcrime/securesms/recipients/LiveRecipient;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
+PLorg/thoughtcrime/securesms/recipients/LiveRecipient;->$r8$lambda$B0ajuTDCdGA629im1wXIpLy_DEM(Lorg/thoughtcrime/securesms/recipients/LiveRecipient;Lorg/thoughtcrime/securesms/recipients/RecipientForeverObserver;)V
+PLorg/thoughtcrime/securesms/recipients/LiveRecipient;->$r8$lambda$EhLODs8-fJ6LxfmIL3QQyXYzo8g(Lorg/thoughtcrime/securesms/recipients/LiveRecipient;Lorg/thoughtcrime/securesms/recipients/RecipientForeverObserver;)V
+PLorg/thoughtcrime/securesms/recipients/LiveRecipient;->$r8$lambda$FgHBdoq4SH_azM0vPoDdtMK-nHY(Lorg/thoughtcrime/securesms/recipients/LiveRecipient;Lorg/thoughtcrime/securesms/recipients/Recipient;)V
 PLorg/thoughtcrime/securesms/recipients/LiveRecipient;->lambda$new$0(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
 PLorg/thoughtcrime/securesms/recipients/LiveRecipient;->lambda$new$1(Lorg/thoughtcrime/securesms/recipients/Recipient;)V
 PLorg/thoughtcrime/securesms/recipients/LiveRecipient;->lambda$observeForever$6(Lorg/thoughtcrime/securesms/recipients/RecipientForeverObserver;)V
 PLorg/thoughtcrime/securesms/recipients/LiveRecipient;->lambda$removeForeverObserver$7(Lorg/thoughtcrime/securesms/recipients/RecipientForeverObserver;)V
-PLorg/thoughtcrime/securesms/recipients/LiveRecipient;->removeForeverObserver(Lorg/thoughtcrime/securesms/recipients/RecipientForeverObserver;)V
+PLorg/thoughtcrime/securesms/recipients/LiveRecipient;->observeForever(Lorg/thoughtcrime/securesms/recipients/RecipientForeverObserver;)V
+PLorg/thoughtcrime/securesms/recipients/Recipient$combinedAboutAndEmoji$2;->invoke()Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/recipients/Recipient;->getAbout()Ljava/lang/String;
+PLorg/thoughtcrime/securesms/recipients/Recipient;->getAboutEmoji()Ljava/lang/String;
+PLorg/thoughtcrime/securesms/recipients/Recipient;->getCombinedAboutAndEmoji()Ljava/lang/String;
 PLorg/thoughtcrime/securesms/recipients/Recipient;->getContactUri()Landroid/net/Uri;
 PLorg/thoughtcrime/securesms/recipients/Recipient;->getNotificationChannel()Ljava/lang/String;
+PLorg/thoughtcrime/securesms/recipients/Recipient;->getShouldShowE164()Z
+PLorg/thoughtcrime/securesms/recipients/Recipient;->isIndividual()Z
+PLorg/thoughtcrime/securesms/recipients/Recipient;->isReleaseNotes()Z
 PLorg/thoughtcrime/securesms/service/ExpiringMessageManager$$ExternalSyntheticLambda0;-><init>()V
 PLorg/thoughtcrime/securesms/service/ExpiringMessageManager;->scheduleDeletion(Ljava/util/List;)V
 PLorg/thoughtcrime/securesms/stickers/StickerSearchRepository;->searchByEmoji(Ljava/lang/String;)Lio/reactivex/rxjava3/core/Single;
@@ -38755,6 +39109,10 @@ PLorg/thoughtcrime/securesms/util/ConversationUtil;-><clinit>()V
 PLorg/thoughtcrime/securesms/util/ConversationUtil;->getChannelId(Landroid/content/Context;Lorg/thoughtcrime/securesms/recipients/Recipient;)Ljava/lang/String;
 PLorg/thoughtcrime/securesms/util/ConversationUtil;->getShortcutId(Lorg/thoughtcrime/securesms/recipients/RecipientId;)Ljava/lang/String;
 PLorg/thoughtcrime/securesms/util/ConversationUtil;->refreshRecipientShortcuts()V
+PLorg/thoughtcrime/securesms/util/DateUtils$sameDayDateFormat$2;->invoke()Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/util/DateUtils$sameDayDateFormat$2;->invoke()Ljava/text/SimpleDateFormat;
+PLorg/thoughtcrime/securesms/util/DateUtils;->getConversationDateHeaderString(Landroid/content/Context;Ljava/util/Locale;J)Ljava/lang/String;
+PLorg/thoughtcrime/securesms/util/DateUtils;->isSameExtendedRelativeTimestamp(JJ)Z
 PLorg/thoughtcrime/securesms/util/Debouncer;->clear()V
 PLorg/thoughtcrime/securesms/util/DefaultSavedStateHandleDelegate$lazyDefault$2;-><init>(Lkotlin/jvm/functions/Function0;)V
 PLorg/thoughtcrime/securesms/util/DefaultSavedStateHandleDelegate$lazyDefault$2;->invoke()Ljava/lang/Object;
@@ -38762,17 +39120,30 @@ PLorg/thoughtcrime/securesms/util/DefaultSavedStateHandleDelegate;-><init>(Landr
 PLorg/thoughtcrime/securesms/util/DefaultSavedStateHandleDelegate;->getLazyDefault()Ljava/lang/Object;
 PLorg/thoughtcrime/securesms/util/DefaultSavedStateHandleDelegate;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
 PLorg/thoughtcrime/securesms/util/DefaultSavedStateHandleDelegate;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
+PLorg/thoughtcrime/securesms/util/DefaultValueLiveData;->setValue(Ljava/lang/Object;)V
 PLorg/thoughtcrime/securesms/util/LeakyBucketLimiter$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/util/LeakyBucketLimiter;)V
 PLorg/thoughtcrime/securesms/util/LeakyBucketLimiter$$ExternalSyntheticLambda0;->run()V
-PLorg/thoughtcrime/securesms/util/LeakyBucketLimiter;->$r8$lambda$1L8FIPWGmHakh7u9Krsm8K4DSjQ(Lorg/thoughtcrime/securesms/util/LeakyBucketLimiter;)V
+PLorg/thoughtcrime/securesms/util/LeakyBucketLimiter;->$r8$lambda$zL1Wuf5VYsMZnN1ZPqrznv9xZQw(Lorg/thoughtcrime/securesms/util/LeakyBucketLimiter;)V
 PLorg/thoughtcrime/securesms/util/LeakyBucketLimiter;->drip()V
 PLorg/thoughtcrime/securesms/util/LeakyBucketLimiter;->run(Ljava/lang/Runnable;)V
+PLorg/thoughtcrime/securesms/util/LongClickMovementMethod$1;-><init>(Lorg/thoughtcrime/securesms/util/LongClickMovementMethod;)V
+PLorg/thoughtcrime/securesms/util/LongClickMovementMethod;-><init>(Landroid/content/Context;)V
+PLorg/thoughtcrime/securesms/util/LongClickMovementMethod;->getInstance(Landroid/content/Context;)Lorg/thoughtcrime/securesms/util/LongClickMovementMethod;
+PLorg/thoughtcrime/securesms/util/Material3OnScrollHelper$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/util/Material3OnScrollHelper;IIII)V
+PLorg/thoughtcrime/securesms/util/Material3OnScrollHelper$$ExternalSyntheticLambda0;->onAnimationUpdate(Landroid/animation/ValueAnimator;)V
 PLorg/thoughtcrime/securesms/util/Material3OnScrollHelper$3;->onDestroy(Landroidx/lifecycle/LifecycleOwner;)V
 PLorg/thoughtcrime/securesms/util/Material3OnScrollHelper$3;->onStop(Landroidx/lifecycle/LifecycleOwner;)V
+PLorg/thoughtcrime/securesms/util/Material3OnScrollHelper;->$r8$lambda$Ucnle6dSVMET7Tf-ryAUB0QNOqw(Lorg/thoughtcrime/securesms/util/Material3OnScrollHelper;IIIILandroid/animation/ValueAnimator;)V
 PLorg/thoughtcrime/securesms/util/Material3OnScrollHelper;->access$getAnimator$p(Lorg/thoughtcrime/securesms/util/Material3OnScrollHelper;)Landroid/animation/ValueAnimator;
 PLorg/thoughtcrime/securesms/util/Material3OnScrollHelper;->access$getSetStatusBarColor$p(Lorg/thoughtcrime/securesms/util/Material3OnScrollHelper;)Lkotlin/jvm/functions/Function1;
 PLorg/thoughtcrime/securesms/util/Material3OnScrollHelper;->getPreviousStatusBarColor()I
 PLorg/thoughtcrime/securesms/util/NullableSavedStateHandleDelegate;-><init>(Landroidx/lifecycle/SavedStateHandle;Ljava/lang/String;)V
+PLorg/thoughtcrime/securesms/util/Projection$Corners;-><clinit>()V
+PLorg/thoughtcrime/securesms/util/Projection$Corners;-><init>(F)V
+PLorg/thoughtcrime/securesms/util/Projection$Corners;-><init>([F)V
+PLorg/thoughtcrime/securesms/util/Projection$Corners;->toRelativeRadii(Z)[F
+PLorg/thoughtcrime/securesms/util/ProjectionList;->getSize()I
+PLorg/thoughtcrime/securesms/util/ProjectionList;->size()I
 PLorg/thoughtcrime/securesms/util/SavedStateHandleExtensionsKt$delegate$1;-><init>(Ljava/lang/Object;)V
 PLorg/thoughtcrime/securesms/util/SavedStateHandleExtensionsKt;->delegate(Landroidx/lifecycle/SavedStateHandle;Ljava/lang/String;)Lkotlin/properties/ReadWriteProperty;
 PLorg/thoughtcrime/securesms/util/SavedStateHandleExtensionsKt;->delegate(Landroidx/lifecycle/SavedStateHandle;Ljava/lang/String;Ljava/lang/Object;)Lkotlin/properties/ReadWriteProperty;
@@ -38781,13 +39152,23 @@ PLorg/thoughtcrime/securesms/util/SavedStateViewModelFactory$Companion$factoryPr
 PLorg/thoughtcrime/securesms/util/SavedStateViewModelFactory$Companion$factoryProducer$1;->invoke()Lorg/thoughtcrime/securesms/util/SavedStateViewModelFactory;
 PLorg/thoughtcrime/securesms/util/SavedStateViewModelFactory;-><init>(Lkotlin/jvm/functions/Function1;Landroidx/savedstate/SavedStateRegistryOwner;)V
 PLorg/thoughtcrime/securesms/util/SavedStateViewModelFactory;->create(Ljava/lang/String;Ljava/lang/Class;Landroidx/lifecycle/SavedStateHandle;)Landroidx/lifecycle/ViewModel;
+PLorg/thoughtcrime/securesms/util/SearchUtil;->getHighlightedSpan(Ljava/util/Locale;Lorg/thoughtcrime/securesms/util/SearchUtil$StyleFactory;Landroid/text/Spannable;Ljava/lang/String;I)Landroid/text/Spannable;
 PLorg/thoughtcrime/securesms/util/ServiceUtil;->getAudioManager(Landroid/content/Context;)Landroid/media/AudioManager;
+PLorg/thoughtcrime/securesms/util/SignalLocalMetrics$ConversationOpen;->onDataPostedToMain()V
 PLorg/thoughtcrime/securesms/util/SignalLocalMetrics$ConversationOpen;->onRenderFinished()V
+PLorg/thoughtcrime/securesms/util/SpanUtil;-><clinit>()V
+PLorg/thoughtcrime/securesms/util/SpanUtil;->ofSize(Ljava/lang/CharSequence;I)Ljava/lang/CharSequence;
 PLorg/thoughtcrime/securesms/util/SplashScreenUtil$$ExternalSyntheticApiModelOutline0;->m(Landroid/app/Activity;)Landroid/window/SplashScreen;
 PLorg/thoughtcrime/securesms/util/SplashScreenUtil$$ExternalSyntheticApiModelOutline1;->m(Landroid/window/SplashScreen;I)V
 PLorg/thoughtcrime/securesms/util/SplashScreenUtil$1;-><clinit>()V
 PLorg/thoughtcrime/securesms/util/SplashScreenUtil;->setSplashScreenThemeIfNecessary(Landroid/app/Activity;Lorg/thoughtcrime/securesms/keyvalue/SettingsValues$Theme;)V
+PLorg/thoughtcrime/securesms/util/TextSecurePreferences;->isEnterSendsEnabled(Landroid/content/Context;)Z
+PLorg/thoughtcrime/securesms/util/ThemeUtil;->getAttribute(Landroid/content/Context;ILjava/lang/String;)Ljava/lang/String;
+PLorg/thoughtcrime/securesms/util/ThemeUtil;->isDarkTheme(Landroid/content/Context;)Z
 PLorg/thoughtcrime/securesms/util/Util;->clamp(FFF)F
+PLorg/thoughtcrime/securesms/util/Util;->hashCode([Ljava/lang/Object;)I
+PLorg/thoughtcrime/securesms/util/Util;->isEmpty(Ljava/util/Collection;)Z
+PLorg/thoughtcrime/securesms/util/ViewExtensionsKt;->getVisible(Landroid/view/View;)Z
 PLorg/thoughtcrime/securesms/util/ViewModelFactoryKt$savedStateViewModel$$inlined$viewModels$default$1;->invoke()Landroidx/fragment/app/Fragment;
 PLorg/thoughtcrime/securesms/util/ViewModelFactoryKt$savedStateViewModel$$inlined$viewModels$default$1;->invoke()Ljava/lang/Object;
 PLorg/thoughtcrime/securesms/util/ViewModelFactoryKt$savedStateViewModel$$inlined$viewModels$default$2;->invoke()Landroidx/lifecycle/ViewModelStoreOwner;
@@ -38802,6 +39183,20 @@ PLorg/thoughtcrime/securesms/util/ViewUtil;->animateOut(Landroid/view/View;Landr
 PLorg/thoughtcrime/securesms/util/ViewUtil;->fadeOut(Landroid/view/View;I)Lorg/signal/core/util/concurrent/ListenableFuture;
 PLorg/thoughtcrime/securesms/util/ViewUtil;->fadeOut(Landroid/view/View;II)Lorg/signal/core/util/concurrent/ListenableFuture;
 PLorg/thoughtcrime/securesms/util/ViewUtil;->getAlphaAnimation(FFI)Landroid/view/animation/Animation;
+PLorg/thoughtcrime/securesms/util/ViewUtil;->getLeftMargin(Landroid/view/View;)I
+PLorg/thoughtcrime/securesms/util/ViewUtil;->getRightMargin(Landroid/view/View;)I
+PLorg/thoughtcrime/securesms/util/ViewUtil;->getTopMargin(Landroid/view/View;)I
+PLorg/thoughtcrime/securesms/util/ViewUtil;->setTopMargin(Landroid/view/View;I)V
+PLorg/thoughtcrime/securesms/util/ViewUtil;->setVisibilityIfNonNull(Landroid/view/View;I)V
+PLorg/thoughtcrime/securesms/util/ViewUtil;->updateLayoutParamsIfNonNull(Landroid/view/View;II)V
+PLorg/thoughtcrime/securesms/util/adapter/mapping/LayoutFactory;->createViewHolder(Landroid/view/ViewGroup;)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;
+PLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->onBindViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;ILjava/util/List;)V
+PLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->onBindViewHolder(Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;I)V
+PLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->onBindViewHolder(Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;ILjava/util/List;)V
+PLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+PLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;
+PLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->onViewAttachedToWindow(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+PLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->onViewAttachedToWindow(Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;)V
 PLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->onViewDetachedFromWindow(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
 PLorg/thoughtcrime/securesms/util/adapter/mapping/MappingAdapter;->onViewDetachedFromWindow(Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;)V
 PLorg/thoughtcrime/securesms/util/adapter/mapping/MappingDiffCallback;->areContentsTheSame(Ljava/lang/Object;Ljava/lang/Object;)Z
@@ -38811,14 +39206,21 @@ PLorg/thoughtcrime/securesms/util/adapter/mapping/MappingDiffCallback;->areItems
 PLorg/thoughtcrime/securesms/util/adapter/mapping/MappingDiffCallback;->getChangePayload(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 PLorg/thoughtcrime/securesms/util/adapter/mapping/MappingDiffCallback;->getChangePayload(Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingModel;Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingModel;)Ljava/lang/Object;
 PLorg/thoughtcrime/securesms/util/adapter/mapping/MappingModel$-CC;->$default$getChangePayload(Lorg/thoughtcrime/securesms/util/adapter/mapping/MappingModel;Ljava/lang/Object;)Ljava/lang/Object;
+PLorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;-><init>(Landroid/view/View;)V
+PLorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;->onAttachedToWindow()V
 PLorg/thoughtcrime/securesms/util/adapter/mapping/MappingViewHolder;->onDetachedFromWindow()V
+PLorg/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter;->getItem(I)Ljava/lang/Object;
 PLorg/thoughtcrime/securesms/util/concurrent/SerialMonoLifoExecutor$$ExternalSyntheticLambda0;-><init>(Lorg/thoughtcrime/securesms/util/concurrent/SerialMonoLifoExecutor;Ljava/lang/Runnable;)V
 PLorg/thoughtcrime/securesms/util/concurrent/SerialMonoLifoExecutor$$ExternalSyntheticLambda0;->run()V
-PLorg/thoughtcrime/securesms/util/concurrent/SerialMonoLifoExecutor;->$r8$lambda$axI96jKiGgASw-5DyS1pXfSexxk(Lorg/thoughtcrime/securesms/util/concurrent/SerialMonoLifoExecutor;Ljava/lang/Runnable;)V
+PLorg/thoughtcrime/securesms/util/concurrent/SerialMonoLifoExecutor;->$r8$lambda$DG-JDqK_CQzQ4r7XEovANUj-KMk(Lorg/thoughtcrime/securesms/util/concurrent/SerialMonoLifoExecutor;Ljava/lang/Runnable;)V
 PLorg/thoughtcrime/securesms/util/concurrent/SerialMonoLifoExecutor;->enqueue(Ljava/lang/Runnable;)Z
 PLorg/thoughtcrime/securesms/util/concurrent/SerialMonoLifoExecutor;->execute(Ljava/lang/Runnable;)V
 PLorg/thoughtcrime/securesms/util/concurrent/SerialMonoLifoExecutor;->lambda$enqueue$0(Ljava/lang/Runnable;)V
 PLorg/thoughtcrime/securesms/util/concurrent/SerialMonoLifoExecutor;->scheduleNext()V
+PLorg/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat;-><clinit>()V
+PLorg/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat;-><init>(Landroid/content/Context;)V
 PLorg/thoughtcrime/securesms/util/rx/RxStore;->dispose()V
+PLorg/thoughtcrime/securesms/util/views/NullableStub;->isResolvable()Z
+PLorg/thoughtcrime/securesms/util/views/NullableStub;->resolved()Z
 PLorg/thoughtcrime/securesms/util/views/Stub;->getVisibility()I
 PLorg/thoughtcrime/securesms/util/views/Stub;->isVisible()Z
diff --git a/app/src/main/java/org/signal/glide/common/decode/FrameSeqDecoder.java b/app/src/main/java/org/signal/glide/common/decode/FrameSeqDecoder.java
index fd26e324bc..238797e49a 100644
--- a/app/src/main/java/org/signal/glide/common/decode/FrameSeqDecoder.java
+++ b/app/src/main/java/org/signal/glide/common/decode/FrameSeqDecoder.java
@@ -8,6 +8,7 @@
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Rect;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 
@@ -107,13 +108,23 @@ protected Bitmap obtainBitmap(int width, int height) {
             int reuseSize = width * height * 4;
             ret = iterator.next();
 
-            if (ret != null && ret.getAllocationByteCount() >= reuseSize) {
-                iterator.remove();
-                if (ret.getWidth() != width || ret.getHeight() != height) {
-                    ret.reconfigure(width, height, Bitmap.Config.ARGB_8888);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                if (ret != null && ret.getAllocationByteCount() >= reuseSize) {
+                    iterator.remove();
+                    if (ret.getWidth() != width || ret.getHeight() != height) {
+                        ret.reconfigure(width, height, Bitmap.Config.ARGB_8888);
+                    }
+                    ret.eraseColor(0);
+                    return ret;
+                }
+            } else {
+                if (ret != null && ret.getByteCount() >= reuseSize) {
+                    if (ret.getWidth() == width && ret.getHeight() == height) {
+                        iterator.remove();
+                        ret.eraseColor(0);
+                    }
+                    return ret;
                 }
-                ret.eraseColor(0);
-                return ret;
             }
         }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt b/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt
index b3cc806295..03bfe84e93 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt
@@ -11,13 +11,7 @@ object AppCapabilities {
   fun getCapabilities(storageCapable: Boolean): AccountAttributes.Capabilities {
     return AccountAttributes.Capabilities(
       storage = storageCapable,
-      senderKey = true,
-      announcementGroup = true,
-      changeNumber = true,
-      stories = true,
-      giftBadges = false,
-      pni = true,
-      paymentActivation = false,
+      deleteSync = true
     )
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java b/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java
index 4d03a293db..c66d443977 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java
@@ -5,7 +5,7 @@
 import androidx.annotation.NonNull;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob;
 import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob;
@@ -32,28 +32,28 @@ public static void onFirstEverAppLaunch(@NonNull Context context) {
     TextSecurePreferences.setAppMigrationVersion(context, ApplicationMigrations.CURRENT_VERSION);
     TextSecurePreferences.setJobManagerVersion(context, JobManager.CURRENT_VERSION);
     TextSecurePreferences.setSignalLastVersionCode(context, Util.getSignalCanonicalVersionCode());
-    ApplicationDependencies.getMegaphoneRepository().onFirstEverAppLaunch();
+    AppDependencies.getMegaphoneRepository().onFirstEverAppLaunch();
     SignalStore.onFirstEverAppLaunch();
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.BANDIT.getPackId(), BlessedPacks.BANDIT.getPackKey(), false));
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.DAY_BY_DAY.getPackId(), BlessedPacks.DAY_BY_DAY.getPackKey(), false));
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_HANDS.getPackId(), BlessedPacks.SWOON_HANDS.getPackKey()));
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_FACES.getPackId(), BlessedPacks.SWOON_FACES.getPackKey()));
+    AppDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));
+    AppDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.BANDIT.getPackId(), BlessedPacks.BANDIT.getPackKey(), false));
+    AppDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.DAY_BY_DAY.getPackId(), BlessedPacks.DAY_BY_DAY.getPackKey(), false));
+    AppDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_HANDS.getPackId(), BlessedPacks.SWOON_HANDS.getPackKey()));
+    AppDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_FACES.getPackId(), BlessedPacks.SWOON_FACES.getPackKey()));
   }
 
   public static void onPostBackupRestore(@NonNull Context context) {
     Log.i(TAG, "onPostBackupRestore()");
 
-    ApplicationDependencies.getMegaphoneRepository().onFirstEverAppLaunch();
+    AppDependencies.getMegaphoneRepository().onFirstEverAppLaunch();
     SignalStore.onPostBackupRestore();
     SignalStore.onFirstEverAppLaunch();
     SignalStore.onboarding().clearAll();
     TextSecurePreferences.onPostBackupRestore(context);
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.BANDIT.getPackId(), BlessedPacks.BANDIT.getPackKey(), false));
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.DAY_BY_DAY.getPackId(), BlessedPacks.DAY_BY_DAY.getPackKey(), false));
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_HANDS.getPackId(), BlessedPacks.SWOON_HANDS.getPackKey()));
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_FACES.getPackId(), BlessedPacks.SWOON_FACES.getPackKey()));
+    AppDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));
+    AppDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.BANDIT.getPackId(), BlessedPacks.BANDIT.getPackKey(), false));
+    AppDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.DAY_BY_DAY.getPackId(), BlessedPacks.DAY_BY_DAY.getPackKey(), false));
+    AppDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_HANDS.getPackId(), BlessedPacks.SWOON_HANDS.getPackKey()));
+    AppDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_FACES.getPackId(), BlessedPacks.SWOON_FACES.getPackKey()));
     EmojiSearchIndexDownloadJob.scheduleImmediately();
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
index 15ef16f2cf..99af643c92 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -55,12 +55,13 @@
 import org.thoughtcrime.securesms.database.LogDatabase;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.SqlCipherLibraryLoader;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider;
 import org.thoughtcrime.securesms.emoji.EmojiSource;
 import org.thoughtcrime.securesms.emoji.JumboEmoji;
 import org.thoughtcrime.securesms.gcm.FcmFetchManager;
 import org.thoughtcrime.securesms.jobs.AccountConsistencyWorkerJob;
+import org.thoughtcrime.securesms.jobs.BuildExpirationConfirmationJob;
 import org.thoughtcrime.securesms.jobs.CheckServiceReachabilityJob;
 import org.thoughtcrime.securesms.jobs.DownloadLatestEmojiDataJob;
 import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob;
@@ -70,12 +71,10 @@
 import org.thoughtcrime.securesms.jobs.GroupV2UpdateSelfProfileKeyJob;
 import org.thoughtcrime.securesms.jobs.LinkedDeviceInactiveCheckJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
-import org.thoughtcrime.securesms.jobs.PnpInitializeDevicesJob;
 import org.thoughtcrime.securesms.jobs.PreKeysSyncJob;
 import org.thoughtcrime.securesms.jobs.ProfileUploadJob;
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob;
 import org.thoughtcrime.securesms.jobs.RefreshSvrCredentialsJob;
-import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob;
 import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
 import org.thoughtcrime.securesms.jobs.RetrieveRemoteAnnouncementsJob;
 import org.thoughtcrime.securesms.jobs.StoryOnboardingDownloadJob;
@@ -84,6 +83,7 @@
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger;
 import org.thoughtcrime.securesms.logging.PersistentLogger;
 import org.thoughtcrime.securesms.messageprocessingalarm.RoutineMessageFetchReceiver;
+import org.thoughtcrime.securesms.messages.GroupSendEndorsementInternalNotifier;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
 import org.thoughtcrime.securesms.mms.SignalGlideComponents;
 import org.thoughtcrime.securesms.mms.SignalGlideModule;
@@ -108,9 +108,10 @@
 import org.thoughtcrime.securesms.util.AppForegroundObserver;
 import org.thoughtcrime.securesms.util.AppStartup;
 import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.FileUtils;
 import org.thoughtcrime.securesms.util.PlayServicesUtil;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.SignalLocalMetrics;
 import org.thoughtcrime.securesms.util.SignalUncaughtExceptionHandler;
 import org.thoughtcrime.securesms.util.StorageUtil;
@@ -179,7 +180,7 @@ private void onCreateUnlock() {
 
     long startTime = System.currentTimeMillis();
 
-    if (FeatureFlags.internalUser()) {
+    if (RemoteConfig.internalUser()) {
       Tracer.getInstance().setMaxBufferSize(35_000);
     }
 
@@ -201,10 +202,10 @@ private void onCreateUnlock() {
                             .addBlocking("first-launch", this::initializeFirstEverAppLaunch)
                             .addBlocking("gcm-check", this::initializeFcmCheck)
                             .addBlocking("app-migrations", this::initializeApplicationMigrations)
-                            .addBlocking("lifecycle-observer", () -> ApplicationDependencies.getAppForegroundObserver().addListener(this))
+                            .addBlocking("lifecycle-observer", () -> AppDependencies.getAppForegroundObserver().addListener(this))
                             .addBlocking("message-retriever", this::initializeMessageRetrieval)
                             .addBlocking("blob-provider", this::initializeBlobProvider)
-                            .addBlocking("feature-flags", FeatureFlags::init)
+                            .addBlocking("remote-config", RemoteConfig::init)
                             .addBlocking("ring-rtc", this::initializeRingRtc)
                             .addBlocking("glide", () -> SignalGlideModule.setRegisterGlideComponents(new SignalGlideComponents()))
                             .addNonBlocking(() -> RegistrationUtil.maybeMarkRegistrationComplete())
@@ -221,31 +222,31 @@ private void onCreateUnlock() {
                             .addNonBlocking(StorageSyncHelper::scheduleRoutineSync)
                             .addNonBlocking(this::beginJobLoop)
                             .addNonBlocking(EmojiSource::refresh)
-                            .addNonBlocking(() -> ApplicationDependencies.getGiphyMp4Cache().onAppStart(this))
+                            .addNonBlocking(() -> AppDependencies.getGiphyMp4Cache().onAppStart(this))
                             .addNonBlocking(this::ensureProfileUploaded)
-                            .addNonBlocking(() -> ApplicationDependencies.getExpireStoriesManager().scheduleIfNecessary())
-                            .addPostRender(() -> ApplicationDependencies.getDeletedCallEventManager().scheduleIfNecessary())
+                            .addNonBlocking(() -> AppDependencies.getExpireStoriesManager().scheduleIfNecessary())
+                            .addPostRender(() -> AppDependencies.getDeletedCallEventManager().scheduleIfNecessary())
                             .addPostRender(() -> RateLimitUtil.retryAllRateLimitedMessages(this))
                             .addPostRender(this::initializeExpiringMessageManager)
                             .addPostRender(this::initializeTrimThreadsByDateManager)
                             .addPostRender(RefreshSvrCredentialsJob::enqueueIfNecessary)
                             .addPostRender(() -> DownloadLatestEmojiDataJob.scheduleIfNecessary(this))
                             .addPostRender(EmojiSearchIndexDownloadJob::scheduleIfNecessary)
-                            .addPostRender(() -> SignalDatabase.messageLog().trimOldMessages(System.currentTimeMillis(), FeatureFlags.retryRespondMaxAge()))
+                            .addPostRender(() -> SignalDatabase.messageLog().trimOldMessages(System.currentTimeMillis(), RemoteConfig.retryRespondMaxAge()))
                             .addPostRender(() -> JumboEmoji.updateCurrentVersion(this))
                             .addPostRender(RetrieveRemoteAnnouncementsJob::enqueue)
                             .addPostRender(() -> AndroidTelecomUtil.registerPhoneAccount())
-                            .addPostRender(() -> ApplicationDependencies.getJobManager().add(new FontDownloaderJob()))
+                            .addPostRender(() -> AppDependencies.getJobManager().add(new FontDownloaderJob()))
                             .addPostRender(CheckServiceReachabilityJob::enqueueIfNecessary)
                             .addPostRender(GroupV2UpdateSelfProfileKeyJob::enqueueForGroupsIfNecessary)
                             .addPostRender(StoryOnboardingDownloadJob.Companion::enqueueIfNeeded)
-                            .addPostRender(PnpInitializeDevicesJob::enqueueIfNecessary)
-                            .addPostRender(() -> ApplicationDependencies.getExoPlayerPool().getPoolStats().getMaxUnreserved())
-                            .addPostRender(() -> ApplicationDependencies.getRecipientCache().warmUp())
+                            .addPostRender(() -> AppDependencies.getExoPlayerPool().getPoolStats().getMaxUnreserved())
+                            .addPostRender(() -> AppDependencies.getRecipientCache().warmUp())
                             .addPostRender(AccountConsistencyWorkerJob::enqueueIfNecessary)
                             .addPostRender(GroupRingCleanupJob::enqueue)
                             .addPostRender(LinkedDeviceInactiveCheckJob::enqueueIfNecessary)
                             .addPostRender(() -> ActiveCallManager.clearNotifications(this))
+                            .addPostRender(() -> GroupSendEndorsementInternalNotifier.init())
                             .execute();
 
     Log.d(TAG, "onCreateUnlock() took " + (System.currentTimeMillis() - startTime) + " ms");
@@ -265,13 +266,13 @@ public void onForeground() {
   private void onStartUnlock() {
     long startTime = System.currentTimeMillis();
 
-    ApplicationDependencies.getFrameRateTracker().start();
-    ApplicationDependencies.getMegaphoneRepository().onAppForegrounded();
-    ApplicationDependencies.getDeadlockDetector().start();
+    AppDependencies.getFrameRateTracker().start();
+    AppDependencies.getMegaphoneRepository().onAppForegrounded();
+    AppDependencies.getDeadlockDetector().start();
     FcmFetchManager.onForeground(this);
 
     SignalExecutors.BOUNDED.execute(() -> {
-      FeatureFlags.refreshIfNecessary();
+      RemoteConfig.refreshIfNecessary();
       RetrieveProfileJob.enqueueRoutineFetchIfNecessary();
       executePendingContactSync();
       checkBuildExpiration();
@@ -282,7 +283,7 @@ private void onStartUnlock() {
       long timeDiff           = currentTime - lastForegroundTime;
 
       if (timeDiff < 0) {
-        Log.w(TAG, "Time travel! The system clock has moved backwards. (currentTime: " + currentTime + " ms, lastForegroundTime: " + lastForegroundTime + " ms, diff: " + timeDiff + " ms)");
+        Log.w(TAG, "Time travel! The system clock has moved backwards. (currentTime: " + currentTime + " ms, lastForegroundTime: " + lastForegroundTime + " ms, diff: " + timeDiff + " ms)", true);
       }
 
       SignalStore.misc().setLastForegroundTime(currentTime);
@@ -302,9 +303,9 @@ public void onBackground() {
   }
 
   private void onStopUnlock() {
-    ApplicationDependencies.getMessageNotifier().clearVisibleThread();
-    ApplicationDependencies.getFrameRateTracker().stop();
-    ApplicationDependencies.getDeadlockDetector().stop();
+    AppDependencies.getMessageNotifier().clearVisibleThread();
+    AppDependencies.getFrameRateTracker().stop();
+    AppDependencies.getDeadlockDetector().stop();
     MemoryTracker.stop();
   }
 
@@ -330,7 +331,7 @@ public void onLock(boolean keyExpired) {
     finalizeMessageRetrieval();
     unregisterKeyEventReceiver();
 
-    MessageNotifier messageNotifier = ApplicationDependencies.getMessageNotifier();
+    MessageNotifier messageNotifier = AppDependencies.getMessageNotifier();
     messageNotifier.cancelDelayedNotifications();
     boolean hadActiveNotifications = messageNotifier.clearNotifications(this);
 
@@ -341,16 +342,16 @@ public void onLock(boolean keyExpired) {
     }
 
     ThreadUtil.runOnMainDelayed(() -> {
-      ApplicationDependencies.getJobManager().shutdown(TimeUnit.SECONDS.toMillis(10));
+      AppDependencies.getJobManager().shutdown(TimeUnit.SECONDS.toMillis(10));
       KeyCachingService.clearMasterSecret();
       WipeMemoryService.run(this, true);
     }, TimeUnit.SECONDS.toMillis(1));
   }
 
   public void checkBuildExpiration() {
-    if (Util.getTimeUntilBuildExpiry() <= 0 && !SignalStore.misc().isClientDeprecated()) {
-      Log.w(TAG, "Build expired!");
-      SignalStore.misc().setClientDeprecated(true);
+    if (Util.getTimeUntilBuildExpiry(SignalStore.misc().getEstimatedServerTime()) <= 0 && !SignalStore.misc().isClientDeprecated()) {
+      Log.w(TAG, "Build potentially expired! Enqueing job to check.", true);
+      AppDependencies.getJobManager().add(new BuildExpirationConfirmationJob());
     }
   }
 
@@ -378,9 +379,10 @@ protected void initializeLogging(boolean locked) {
     } else {
       boolean enableLogging = TextSecurePreferences.isLogEnabled(this);
       boolean alwaysRedact  = !BuildConfig.DEBUG;
-      Log.configure(FeatureFlags::internalUser, enableLogging, alwaysRedact, AndroidLogger.INSTANCE, new PersistentLogger(this));
+      Log.configure(RemoteConfig::internalUser, enableLogging, alwaysRedact, AndroidLogger.INSTANCE, new PersistentLogger(this));
 
       SignalProtocolLoggerProvider.setProvider(new CustomSignalProtocolLogger());
+      SignalProtocolLoggerProvider.initializeLogging(BuildConfig.LIBSIGNAL_LOG_LEVEL);
 
       SignalExecutors.UNBOUNDED.execute(() -> {
         Log.blockUntilAllWritesFinished();
@@ -420,15 +422,15 @@ private void initializeRx() {
   }
 
   private void initializeApplicationMigrations() {
-    ApplicationMigrations.onApplicationCreate(this, ApplicationDependencies.getJobManager());
+    ApplicationMigrations.onApplicationCreate(this, AppDependencies.getJobManager());
   }
 
   public void initializeMessageRetrieval() {
-    ApplicationDependencies.getIncomingMessageObserver();
+    AppDependencies.getIncomingMessageObserver();
   }
 
   public void finalizeMessageRetrieval() {
-    ApplicationDependencies.closeConnections();
+    AppDependencies.resetNetwork(false);
   }
 
   private void initializePassphraseLock() {
@@ -454,7 +456,7 @@ private void cleanCacheDir() {
 
   @VisibleForTesting
   void initializeAppDependencies() {
-    ApplicationDependencies.init(this, new ApplicationDependencyProvider(this));
+    AppDependencies.init(this, new ApplicationDependencyProvider(this));
   }
 
   private void initializeFirstEverAppLaunch() {
@@ -472,7 +474,7 @@ private void initializeFirstEverAppLaunch() {
   }
 
   private void initializeNetworkSettings() {
-    NetworkManager nm = ApplicationDependencies.getNetworkManager();
+    NetworkManager nm = AppDependencies.getNetworkManager();
 
     nm.setProxyChoice(TextSecurePreferences.getProxyType(this));
     nm.setProxySocksHost(TextSecurePreferences.getProxySocksHost(this));
@@ -500,7 +502,7 @@ private void initializeFcmCheck() {
         SignalStore.account().setFcmEnabled(false);
         SignalStore.account().setFcmToken(null);
         SignalStore.account().setFcmTokenLastSetTime(-1);
-        ApplicationDependencies.getJobManager().add(new RefreshAttributesJob());
+        AppDependencies.getJobManager().add(new RefreshAttributesJob());
       } else {
         SignalStore.account().setFcmTokenLastSetTime(-1);
       }
@@ -509,42 +511,44 @@ private void initializeFcmCheck() {
                SignalStore.account().getFcmTokenLastSetTime() < 0) {
       Log.i(TAG, "Play Services are newly-available. Updating to use FCM.");
       SignalStore.account().setFcmEnabled(true);
-      ApplicationDependencies.getJobManager().startChain(new FcmRefreshJob())
+      AppDependencies.getJobManager().startChain(new FcmRefreshJob())
                                              .then(new RefreshAttributesJob())
                                              .enqueue();
     } else {
-      long nextSetTime = SignalStore.account().getFcmTokenLastSetTime() + TimeUnit.HOURS.toMillis(6);
+      long lastSetTime = SignalStore.account().getFcmTokenLastSetTime();
+      long nextSetTime = lastSetTime + TimeUnit.HOURS.toMillis(6);
+      long now         = System.currentTimeMillis();
 
-      if (SignalStore.account().getFcmToken() == null || nextSetTime <= System.currentTimeMillis()) {
-        ApplicationDependencies.getJobManager().add(new FcmRefreshJob());
+      if (SignalStore.account().getFcmToken() == null || nextSetTime <= now || lastSetTime > now) {
+        AppDependencies.getJobManager().add(new FcmRefreshJob());
       }
     }
   }
 
   private void initializeExpiringMessageManager() {
-    ApplicationDependencies.getExpiringMessageManager().checkSchedule();
+    AppDependencies.getExpiringMessageManager().checkSchedule();
   }
 
   private void finalizeExpiringMessageManager() {
-    ApplicationDependencies.getExpiringMessageManager().quit();
+    AppDependencies.getExpiringMessageManager().quit();
   }
 
   private void initializeRevealableMessageManager() {
-    ApplicationDependencies.getViewOnceMessageManager().scheduleIfNecessary();
+    AppDependencies.getViewOnceMessageManager().scheduleIfNecessary();
   }
 
   private void initializePendingRetryReceiptManager() {
-    ApplicationDependencies.getPendingRetryReceiptManager().scheduleIfNecessary();
+    AppDependencies.getPendingRetryReceiptManager().scheduleIfNecessary();
   }
 
   private void initializeScheduledMessageManager() {
-    ApplicationDependencies.getScheduledMessageManager().scheduleIfNecessary();
+    AppDependencies.getScheduledMessageManager().scheduleIfNecessary();
   }
 
   private void initializeTrimThreadsByDateManager() {
     KeepMessagesDuration keepMessagesDuration = SignalStore.settings().getKeepMessagesDuration();
     if (keepMessagesDuration != KeepMessagesDuration.FOREVER) {
-      ApplicationDependencies.getTrimThreadsByDateManager().scheduleIfNecessary();
+      AppDependencies.getTrimThreadsByDateManager().scheduleIfNecessary();
     }
   }
 
@@ -565,12 +569,9 @@ private void initializePeriodicTasks() {
   private void initializeRingRtc() {
     try {
       Map<String, String> fieldTrials = new HashMap<>();
-      if (FeatureFlags.callingFieldTrialAnyAddressPortsKillSwitch()) {
+      if (RemoteConfig.callingFieldTrialAnyAddressPortsKillSwitch()) {
         fieldTrials.put("RingRTC-AnyAddressPortsKillSwitch", "Enabled");
       }
-      if (!SignalStore.internalValues().callingDisableLBRed()) {
-        fieldTrials.put("RingRTC-Audio-LBRed-For-Opus", "Enabled,bitrate_pri:22000");
-      }
       CallManager.initialize(this, new RingRtcLogger(), fieldTrials);
     } catch (UnsatisfiedLinkError e) {
       throw new AssertionError("Unable to load ringrtc library", e);
@@ -579,7 +580,7 @@ private void initializeRingRtc() {
 
   @WorkerThread
   private void initializeCircumvention() {
-    if (ApplicationDependencies.getSignalServiceNetworkAccess().isCensored()) {
+    if (AppDependencies.getSignalServiceNetworkAccess().isCensored()) {
       try {
         ProviderInstaller.installIfNeeded(ApplicationContext.this);
       } catch (Throwable t) {
@@ -589,26 +590,21 @@ private void initializeCircumvention() {
   }
 
   private void ensureProfileUploaded() {
-    if (SignalStore.account().isRegistered()) {
-      if (SignalStore.registrationValues().needDownloadProfileOrAvatar()) {
-        Log.w(TAG, "User has linked a device, but has not yet downloaded the profile. Downloading now.");
-        ApplicationDependencies.getJobManager().add(new RefreshOwnProfileJob());
-      } else if (!SignalStore.registrationValues().hasUploadedProfile() && !Recipient.self().getProfileName().isEmpty()) {
-        Log.w(TAG, "User has a profile, but has not uploaded one. Uploading now.");
-        ApplicationDependencies.getJobManager().add(new ProfileUploadJob());
-      }
+    if (SignalStore.account().isRegistered() && !SignalStore.registration().hasUploadedProfile() && !Recipient.self().getProfileName().isEmpty()) {
+      Log.w(TAG, "User has a profile, but has not uploaded one. Uploading now.");
+      AppDependencies.getJobManager().add(new ProfileUploadJob());
     }
   }
 
   private void executePendingContactSync() {
     if (TextSecurePreferences.needsFullContactSync(this)) {
-      ApplicationDependencies.getJobManager().add(new MultiDeviceContactUpdateJob(true));
+      AppDependencies.getJobManager().add(new MultiDeviceContactUpdateJob(true));
     }
   }
 
   @VisibleForTesting
   protected void beginJobLoop() {
-    ApplicationDependencies.getJobManager().beginJobLoop();
+    AppDependencies.getJobManager().beginJobLoop();
   }
 
   @WorkerThread
diff --git a/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java
index 2a4ee7fd03..3f555f7c68 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java
@@ -28,11 +28,11 @@
 import com.bumptech.glide.request.transition.Transition;
 
 import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatar;
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatarDrawable;
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.FullscreenHelper;
@@ -91,16 +91,18 @@ protected void onCreate(Bundle savedInstanceState, boolean ready) {
     Recipient.live(recipientId).observe(this, recipient -> {
       ContactPhoto contactPhoto  = recipient.isSelf() ? new ProfileContactPhoto(recipient)
                                                       : recipient.getContactPhoto();
-      FallbackContactPhoto fallbackPhoto = recipient.isSelf() ? new ResourceContactPhoto(R.drawable.ic_profile_outline_40, R.drawable.ic_profile_outline_20, R.drawable.ic_person_large)
-                                                              : recipient.getFallbackContactPhoto();
+      FallbackAvatar fallbackAvatar = recipient.isSelf() ? new FallbackAvatar.Resource.Person(recipient.getAvatarColor())
+                                                         : recipient.getFallbackAvatar();
+
+      Drawable fallbackDrawable = new FallbackAvatarDrawable(context, fallbackAvatar);
 
       Resources resources = this.getResources();
 
       Glide.with(this)
               .asBitmap()
               .load(contactPhoto)
-              .fallback(fallbackPhoto.asCallCard(this))
-              .error(fallbackPhoto.asCallCard(this))
+              .fallback(fallbackDrawable)
+              .error(fallbackDrawable)
               .diskCacheStrategy(DiskCacheStrategy.ALL)
               .addListener(new RequestListener<Bitmap>() {
                 @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java
index 7bfba91dec..a50171084f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java
@@ -112,6 +112,7 @@ interface EventListener {
     void onInMemoryMessageClicked(@NonNull InMemoryMessageRecord messageRecord);
     void onViewGroupDescriptionChange(@Nullable GroupId groupId, @NonNull String description, boolean isMessageRequestAccepted);
     void onChangeNumberUpdateContact(@NonNull Recipient recipient);
+    void onChangeProfileNameUpdateContact(@NonNull Recipient recipient);
     void onCallToAction(@NonNull String action);
     void onDonateClicked();
     void onBlockJoinRequest(@NonNull Recipient recipient);
@@ -123,12 +124,13 @@ interface EventListener {
     /** @return true if handled, false if you want to let the normal url handling continue */
     boolean onUrlClicked(@NonNull String url);
     void goToMediaPreview(ConversationItem parent, View sharedElement, MediaIntentFactory.MediaPreviewArgs args);
-    void onEditedIndicatorClicked(@NonNull MessageRecord messageRecord);
+    void onEditedIndicatorClicked(@NonNull ConversationMessage conversationMessage);
     void onShowGroupDescriptionClicked(@NonNull String groupName, @NonNull String description, boolean shouldLinkifyWebLinks);
     void onJoinCallLink(@NonNull CallLinkRootKey callLinkRootKey);
     void onShowSafetyTips(boolean forGroup);
     void onReportSpamLearnMoreClicked();
     void onMessageRequestAcceptOptionsClicked();
     void onItemDoubleClick(MultiselectPart multiselectPart);
+    void onPaymentTombstoneClicked();
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/BiometricDeviceAuthentication.kt b/app/src/main/java/org/thoughtcrime/securesms/BiometricDeviceAuthentication.kt
index ffc4363ba7..ea29d878c9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/BiometricDeviceAuthentication.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/BiometricDeviceAuthentication.kt
@@ -35,6 +35,10 @@ class BiometricDeviceAuthentication(
     private val DISALLOWED_BIOMETRIC_VERSIONS = setOf(28, 29)
   }
 
+  fun canAuthenticate(): Boolean {
+    return biometricManager.canAuthenticate(ALLOWED_AUTHENTICATORS) == BiometricManager.BIOMETRIC_SUCCESS
+  }
+
   fun authenticate(context: Context, force: Boolean, showConfirmDeviceCredentialIntent: () -> Unit): Boolean {
     val isKeyGuardSecure = ServiceUtil.getKeyguardManager(context).isKeyguardSecure
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java
index 4d4e033cb0..b03279c122 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java
@@ -29,14 +29,10 @@
 import org.thoughtcrime.securesms.components.ContactFilterView;
 import org.thoughtcrime.securesms.contacts.ContactSelectionDisplayMode;
 import org.thoughtcrime.securesms.contacts.sync.ContactDiscovery;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.DisplayMetricsUtil;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.ServiceUtil;
-import org.thoughtcrime.securesms.util.Util;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
index 924c144454..8e14376469 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
@@ -337,7 +337,6 @@ public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
         selectionLimit,
         new ContactSearchAdapter.DisplayOptions(
             isMulti,
-            ContactSearchAdapter.DisplaySmsTag.DEFAULT,
             ContactSearchAdapter.DisplaySecondaryInformation.ALWAYS,
             newCallCallback != null,
             false
diff --git a/app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java b/app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java
index 822794cd2f..c751b835c2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java
@@ -27,7 +27,7 @@
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.signal.qr.kitkat.ScanListener;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.LinkedDeviceInactiveCheckJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.permissions.Permissions;
@@ -193,7 +193,7 @@ protected Integer doInBackground(Void... params) {
 
         try {
           Context                     context          = DeviceActivity.this;
-          SignalServiceAccountManager accountManager   = ApplicationDependencies.getSignalServiceAccountManager();
+          SignalServiceAccountManager accountManager   = AppDependencies.getSignalServiceAccountManager();
           String                      verificationCode = accountManager.getNewDeviceVerificationCode();
           String                      ephemeralId      = uri.getQueryParameter("uuid");
           String                      publicKeyEncoded = uri.getQueryParameter("pub_key");
diff --git a/app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java
index ceccb0077f..6044898543 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java
@@ -25,7 +25,7 @@
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.loaders.DeviceListLoader;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.devicelist.Device;
 import org.thoughtcrime.securesms.jobs.LinkedDeviceInactiveCheckJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -60,7 +60,7 @@ public void onCreate(Bundle savedInstanceState) {
   @Override
   public void onAttach(@NonNull Context context) {
     super.onAttach(context);
-    this.accountManager = ApplicationDependencies.getSignalServiceAccountManager();
+    this.accountManager = AppDependencies.getSignalServiceAccountManager();
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java b/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java
index 7893516da5..e249c38eb6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java
@@ -28,12 +28,14 @@
 import org.thoughtcrime.securesms.contacts.ContactSelectionDisplayMode;
 import org.thoughtcrime.securesms.contacts.SelectedContact;
 import org.thoughtcrime.securesms.groups.SelectionLimits;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.mms.OutgoingMessage;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarInviteTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
 import org.thoughtcrime.securesms.util.text.AfterTextChanged;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java
index 1af52a7417..66dfc7dfe3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -16,12 +17,17 @@
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import org.signal.core.util.concurrent.LifecycleDisposable;
+import org.signal.donations.StripeApi;
+import org.thoughtcrime.securesms.components.PromptBatterySaverDialogFragment;
+import org.thoughtcrime.securesms.components.DeviceSpecificNotificationBottomSheet;
+import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity;
 import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaController;
 import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaControllerOwner;
 import org.thoughtcrime.securesms.conversationlist.RelinkDevicesReminderBottomSheetFragment;
 import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceExitActivity;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.net.DeviceTransferBlockingInterceptor;
+import org.thoughtcrime.securesms.notifications.VitalsViewModel;
 import org.thoughtcrime.securesms.stories.Stories;
 import org.thoughtcrime.securesms.stories.tabs.ConversationListTab;
 import org.thoughtcrime.securesms.stories.tabs.ConversationListTabRepository;
@@ -44,6 +50,7 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
 
   private VoiceNoteMediaController      mediaController;
   private ConversationListTabsViewModel conversationListTabsViewModel;
+  private VitalsViewModel               vitalsViewModel;
 
   private final LifecycleDisposable lifecycleDisposable = new LifecycleDisposable();
 
@@ -93,6 +100,28 @@ public boolean onPreDraw() {
 
     conversationListTabsViewModel = new ViewModelProvider(this, factory).get(ConversationListTabsViewModel.class);
     updateTabVisibility();
+
+    vitalsViewModel = new ViewModelProvider(this).get(VitalsViewModel.class);
+
+    lifecycleDisposable.add(
+        vitalsViewModel
+            .getVitalsState()
+            .subscribe(this::presentVitalsState)
+    );
+  }
+
+  @SuppressLint("NewApi")
+  private void presentVitalsState(VitalsViewModel.State state) {
+    switch (state) {
+      case NONE:
+        break;
+      case PROMPT_SPECIFIC_BATTERY_SAVER_DIALOG:
+        DeviceSpecificNotificationBottomSheet.show(getSupportFragmentManager());
+        break;
+      case PROMPT_GENERAL_BATTERY_SAVER_DIALOG:
+        PromptBatterySaverDialogFragment.show(getSupportFragmentManager());
+        break;
+    }
   }
 
   @Override
@@ -137,6 +166,8 @@ protected void onResume() {
     }
 
     updateTabVisibility();
+
+    vitalsViewModel.checkSlowNotificationHeuristics();
   }
 
   @Override
@@ -186,6 +217,7 @@ private void handleDeeplinkIntent(Intent intent) {
     handleGroupLinkInIntent(intent);
     handleSignalMeIntent(intent);
     handleCallLinkInIntent(intent);
+    handleDonateReturnIntent(intent);
   }
 
   private void handleGroupLinkInIntent(Intent intent) {
@@ -209,6 +241,13 @@ private void handleCallLinkInIntent(Intent intent) {
     }
   }
 
+  private void handleDonateReturnIntent(Intent intent) {
+    Uri data = intent.getData();
+    if (data != null && data.toString().startsWith(StripeApi.RETURN_URL_IDEAL)) {
+      startActivity(AppSettingsActivity.manageSubscriptions(this));
+    }
+  }
+
   public void onFirstRender() {
     onFirstRender = true;
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/MainNavigator.java b/app/src/main/java/org/thoughtcrime/securesms/MainNavigator.java
index 0d7e28c24e..a0cf5483ef 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MainNavigator.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MainNavigator.java
@@ -72,11 +72,6 @@ public void goToGroupCreation() {
     activity.startActivity(CreateGroupActivity.newIntent(activity));
   }
 
-  public void goToInvite() {
-    Intent intent = new Intent(activity, InviteActivity.class);
-    activity.startActivity(intent);
-  }
-
   private @NonNull FragmentManager getFragmentManager() {
     return activity.getSupportFragmentManager();
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
index fe6b6e0812..2fb6568270 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
@@ -17,9 +17,8 @@
 import org.signal.devicetransfer.TransferStatus;
 import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberLockActivity;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceTransferActivity;
-import org.thoughtcrime.securesms.keyvalue.InternalValues;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.lock.v2.CreateSvrPinActivity;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrationActivity;
@@ -28,12 +27,11 @@
 import org.thoughtcrime.securesms.profiles.edit.CreateProfileActivity;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
-import org.thoughtcrime.securesms.registration.v2.ui.RegistrationV2Activity;
+import org.thoughtcrime.securesms.registration.ui.RegistrationActivity;
 import org.thoughtcrime.securesms.restore.RestoreActivity;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.util.AppStartup;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.util.Locale;
@@ -55,7 +53,7 @@ public abstract class PassphraseRequiredActivity extends PassphraseActivity impl
   private static final int STATE_TRANSFER_ONGOING    = 8;
   private static final int STATE_TRANSFER_LOCKED     = 9;
   private static final int STATE_CHANGE_NUMBER_LOCK  = 10;
-  private static final int STATE_RESTORE_BACKUP      = 11;
+  private static final int STATE_TRANSFER_OR_RESTORE = 11;
 
   private BroadcastReceiver          clearKeyReceiver;
 
@@ -152,7 +150,7 @@ private Intent getIntentForState(int state) {
       case STATE_TRANSFER_ONGOING:    return getOldDeviceTransferIntent();
       case STATE_TRANSFER_LOCKED:     return getOldDeviceTransferLockedIntent();
       case STATE_CHANGE_NUMBER_LOCK:  return getChangeNumberLockIntent();
-      case STATE_RESTORE_BACKUP:      return getRestoreIntent();
+      case STATE_TRANSFER_OR_RESTORE: return getTransferOrRestoreIntent();
       default:                        return null;
     }
   }
@@ -166,12 +164,12 @@ private int getApplicationState(boolean locked) {
       return STATE_UI_BLOCKING_UPGRADE;
     } else if (!TextSecurePreferences.hasPromptedPushRegistration(this)) {
       return STATE_WELCOME_PUSH_SCREEN;
-    } else if (SignalStore.internalValues().enterRestoreV2Flow()) {
-      return STATE_RESTORE_BACKUP;
     } else if (SignalStore.storageService().needsAccountRestore()) {
       return STATE_ENTER_SIGNAL_PIN;
     } else if (userHasSkippedOrForgottenPin()) {
       return STATE_CREATE_SIGNAL_PIN;
+    } else if (userCanTransferOrRestore()) {
+      return STATE_TRANSFER_OR_RESTORE;
     } else if (userMustSetProfileName()) {
       return STATE_CREATE_PROFILE_NAME;
     } else if (userMustCreateSignalPin()) {
@@ -187,16 +185,20 @@ private int getApplicationState(boolean locked) {
     }
   }
 
+  private boolean userCanTransferOrRestore() {
+    return !SignalStore.registration().isRegistrationComplete() && RemoteConfig.restoreAfterRegistration() && !SignalStore.registration().hasSkippedTransferOrRestore();
+  }
+
   private boolean userMustCreateSignalPin() {
-    return !SignalStore.registrationValues().isRegistrationComplete() && !SignalStore.svr().hasPin() && !SignalStore.svr().lastPinCreateFailed() && !SignalStore.svr().hasOptedOut();
+    return !SignalStore.registration().isRegistrationComplete() && !SignalStore.svr().hasPin() && !SignalStore.svr().lastPinCreateFailed() && !SignalStore.svr().hasOptedOut();
   }
 
   private boolean userHasSkippedOrForgottenPin() {
-    return !SignalStore.registrationValues().isRegistrationComplete() && !SignalStore.svr().hasPin() && !SignalStore.svr().hasOptedOut() && SignalStore.svr().isPinForgottenOrSkipped();
+    return !SignalStore.registration().isRegistrationComplete() && !SignalStore.svr().hasPin() && !SignalStore.svr().hasOptedOut() && SignalStore.svr().isPinForgottenOrSkipped();
   }
 
   private boolean userMustSetProfileName() {
-    return !SignalStore.registrationValues().isRegistrationComplete() && Recipient.self().getProfileName().isEmpty();
+    return !SignalStore.registration().isRegistrationComplete() && Recipient.self().getProfileName().isEmpty();
   }
 
   private Intent getCreatePassphraseIntent() {
@@ -212,11 +214,7 @@ private Intent getUiBlockingUpgradeIntent() {
   }
 
   private Intent getPushRegistrationIntent() {
-    if (FeatureFlags.registrationV2()) {
-      return RegistrationV2Activity.newIntentForNewRegistration(this, getIntent());
-    } else {
-      return RegistrationNavigationActivity.newIntentForNewRegistration(this, getIntent());
-    }
+    return RegistrationActivity.newIntentForNewRegistration(this, getIntent());
   }
 
   private Intent getEnterSignalPinIntent() {
@@ -235,8 +233,8 @@ private Intent getCreateSignalPinIntent() {
     return getRoutedIntent(CreateSvrPinActivity.class, intent);
   }
 
-  private Intent getRestoreIntent() {
-    Intent intent = RestoreActivity.getIntentForRestore(this);
+  private Intent getTransferOrRestoreIntent() {
+    Intent intent = RestoreActivity.getIntentForTransferOrRestore(this);
     return getRoutedIntent(intent, getIntent());
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ScreenLockController.kt b/app/src/main/java/org/thoughtcrime/securesms/ScreenLockController.kt
index 60df076fa4..c300a68cce 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ScreenLockController.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ScreenLockController.kt
@@ -11,7 +11,7 @@ import android.view.inspector.WindowInspector
 import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.biometric.BiometricDialogFragment
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations
 import org.thoughtcrime.securesms.util.ServiceUtil
@@ -99,9 +99,9 @@ object ScreenLockController {
       .mapNotNull { it.topActivity }
 
   private fun clearReplyActionFromNotifications(context: Context) {
-    if (!ApplicationMigrations.isUpdate(context) && SignalStore.settings().messageNotificationsPrivacy.isDisplayMessage) {
+    if (!ApplicationMigrations.isUpdate(context) && SignalStore.settings.messageNotificationsPrivacy.isDisplayMessage) {
       SignalExecutors.BOUNDED.execute {
-        ApplicationDependencies.getMessageNotifier().updateNotification(context)
+        AppDependencies.messageNotifier.updateNotification(context)
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
index 1b4adcee97..1b2e66ac61 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
@@ -30,13 +30,14 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Rational;
+import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatDelegate;
-import androidx.core.app.PictureInPictureModeChangedInfo;
 import androidx.core.content.ContextCompat;
 import androidx.core.util.Consumer;
 import androidx.lifecycle.LiveDataReactiveStreams;
@@ -81,7 +82,7 @@
 import org.thoughtcrime.securesms.components.webrtc.participantslist.CallParticipantsListDialog;
 import org.thoughtcrime.securesms.components.webrtc.requests.CallLinkIncomingRequestSheet;
 import org.thoughtcrime.securesms.conversation.ui.error.SafetyNumberChangeDialog;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
 import org.thoughtcrime.securesms.messagerequests.CalleeMustAcceptMessageRequestActivity;
 import org.thoughtcrime.securesms.permissions.Permissions;
@@ -94,7 +95,7 @@
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.util.BottomSheetUtil;
 import org.thoughtcrime.securesms.util.EllapsedTimeFormatter;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.FullscreenHelper;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.ThrottledDebouncer;
@@ -117,6 +118,7 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 
 import static org.thoughtcrime.securesms.components.sensors.Orientation.PORTRAIT_BOTTOM_EDGE;
+import static org.thoughtcrime.securesms.permissions.PermissionDeniedBottomSheet.showPermissionFragment;
 
 public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChangeDialog.Callback, ReactWithAnyEmojiBottomSheetDialogFragment.Callback {
 
@@ -167,7 +169,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   private boolean                          enterPipOnResume;
   private long                             lastProcessedIntentTimestamp;
   private WebRtcViewModel                  previousEvent = null;
-
+  private boolean                          isAskingForPermission;
   private Disposable ephemeralStateDisposable = Disposable.empty();
 
   @Override
@@ -239,6 +241,12 @@ public void onCreate(Bundle savedInstanceState) {
     initializePendingParticipantFragmentListener();
 
     WindowUtil.setNavigationBarColor(this, ContextCompat.getColor(this, R.color.signal_dark_colorSurface));
+
+    if (!hasCameraPermission() & !hasAudioPermission()) {
+      askCameraAudioPermissions(() -> handleSetMuteVideo(false));
+    } else if (!hasAudioPermission()) {
+      askAudioPermissions(() -> {});
+    }
   }
 
   private void registerSystemPipChangeListeners() {
@@ -252,10 +260,10 @@ private void registerSystemPipChangeListeners() {
   protected void onStart() {
     super.onStart();
 
-    ephemeralStateDisposable = ApplicationDependencies.getSignalCallManager()
-                                                      .ephemeralStates()
-                                                      .observeOn(AndroidSchedulers.mainThread())
-                                                      .subscribe(viewModel::updateFromEphemeralState);
+    ephemeralStateDisposable = AppDependencies.getSignalCallManager()
+                                              .ephemeralStates()
+                                              .observeOn(AndroidSchedulers.mainThread())
+                                              .subscribe(viewModel::updateFromEphemeralState);
   }
 
   @Override
@@ -312,7 +320,7 @@ public void onPause() {
     Log.i(TAG, "onPause");
     super.onPause();
 
-    if (!viewModel.isCallStarting()) {
+    if (!isAskingForPermission && !viewModel.isCallStarting()) {
       CallParticipantsState state = viewModel.getCallParticipantsStateSnapshot();
       if (state != null && state.getCallState().isPreJoinOrNetworkUnavailable()) {
         finish();
@@ -332,15 +340,15 @@ protected void onStop() {
       requestNewSizesThrottle.clear();
     }
 
-    ApplicationDependencies.getSignalCallManager().setEnableVideo(false);
+    AppDependencies.getSignalCallManager().setEnableVideo(false);
 
     if (!viewModel.isCallStarting()) {
       CallParticipantsState state = viewModel.getCallParticipantsStateSnapshot();
       if (state != null) {
         if (state.getCallState().isPreJoinOrNetworkUnavailable()) {
-          ApplicationDependencies.getSignalCallManager().cancelPreJoin();
+          AppDependencies.getSignalCallManager().cancelPreJoin();
         } else if (state.getCallState().getInOngoingCall() && isInPipMode()) {
-          ApplicationDependencies.getSignalCallManager().relaunchPipOnForeground();
+          AppDependencies.getSignalCallManager().relaunchPipOnForeground();
         }
       }
     }
@@ -425,7 +433,7 @@ private void processIntent(@NonNull Intent intent) {
   }
 
   private void initializePendingParticipantFragmentListener() {
-    if (!FeatureFlags.adHocCalling()) {
+    if (!RemoteConfig.adHocCalling()) {
       return;
     }
 
@@ -450,7 +458,7 @@ private void initializePendingParticipantFragmentListener() {
                   .setNegativeButton(android.R.string.cancel, null)
                   .setPositiveButton(R.string.WebRtcCallActivity__approve_all, (dialog, which) -> {
                     for (RecipientId id : recipientIds) {
-                      ApplicationDependencies.getSignalCallManager().setCallLinkJoinRequestAccepted(id);
+                      AppDependencies.getSignalCallManager().setCallLinkJoinRequestAccepted(id);
                     }
                   })
                   .show();
@@ -462,7 +470,7 @@ private void initializePendingParticipantFragmentListener() {
                   .setNegativeButton(android.R.string.cancel, null)
                   .setPositiveButton(R.string.WebRtcCallActivity__deny_all, (dialog, which) -> {
                     for (RecipientId id : recipientIds) {
-                      ApplicationDependencies.getSignalCallManager().setCallLinkJoinRequestRejected(id);
+                      AppDependencies.getSignalCallManager().setCallLinkJoinRequestRejected(id);
                     }
                   })
                   .show();
@@ -522,12 +530,12 @@ private void initializeViewModel(boolean isLandscapeEnabled) {
       CallParticipantsState state = viewModel.getCallParticipantsStateSnapshot();
       if (state != null) {
         if (state.needsNewRequestSizes()) {
-          requestNewSizesThrottle.publish(() -> ApplicationDependencies.getSignalCallManager().updateRenderedResolutions());
+          requestNewSizesThrottle.publish(() -> AppDependencies.getSignalCallManager().updateRenderedResolutions());
         }
       }
     });
 
-    viewModel.getOrientationAndLandscapeEnabled().observe(this, pair -> ApplicationDependencies.getSignalCallManager().orientationChanged(pair.second, pair.first.getDegrees()));
+    viewModel.getOrientationAndLandscapeEnabled().observe(this, pair -> AppDependencies.getSignalCallManager().orientationChanged(pair.second, pair.first.getDegrees()));
     viewModel.getControlsRotation().observe(this, callScreen::rotateControls);
 
     addOnPictureInPictureModeChangedListener(info -> {
@@ -653,83 +661,66 @@ private void handleInCallStatus(@NonNull InCallStatus inCallStatus) {
   }
 
   private void handleSetAudioHandset() {
-    ApplicationDependencies.getSignalCallManager().selectAudioDevice(new SignalAudioManager.ChosenAudioDeviceIdentifier(SignalAudioManager.AudioDevice.EARPIECE));
+    AppDependencies.getSignalCallManager().selectAudioDevice(new SignalAudioManager.ChosenAudioDeviceIdentifier(SignalAudioManager.AudioDevice.EARPIECE));
   }
 
   private void handleSetAudioSpeaker() {
-    ApplicationDependencies.getSignalCallManager().selectAudioDevice(new SignalAudioManager.ChosenAudioDeviceIdentifier(SignalAudioManager.AudioDevice.SPEAKER_PHONE));
+    AppDependencies.getSignalCallManager().selectAudioDevice(new SignalAudioManager.ChosenAudioDeviceIdentifier(SignalAudioManager.AudioDevice.SPEAKER_PHONE));
   }
 
   private void handleSetAudioBluetooth() {
-    ApplicationDependencies.getSignalCallManager().selectAudioDevice(new SignalAudioManager.ChosenAudioDeviceIdentifier(SignalAudioManager.AudioDevice.BLUETOOTH));
+    AppDependencies.getSignalCallManager().selectAudioDevice(new SignalAudioManager.ChosenAudioDeviceIdentifier(SignalAudioManager.AudioDevice.BLUETOOTH));
   }
 
   private void handleSetAudioWiredHeadset() {
-    ApplicationDependencies.getSignalCallManager().selectAudioDevice(new SignalAudioManager.ChosenAudioDeviceIdentifier(SignalAudioManager.AudioDevice.WIRED_HEADSET));
+    AppDependencies.getSignalCallManager().selectAudioDevice(new SignalAudioManager.ChosenAudioDeviceIdentifier(SignalAudioManager.AudioDevice.WIRED_HEADSET));
   }
 
   private void handleSetMuteAudio(boolean enabled) {
-    ApplicationDependencies.getSignalCallManager().setMuteAudio(enabled);
+    AppDependencies.getSignalCallManager().setMuteAudio(enabled);
   }
 
   private void handleSetMuteVideo(boolean muted) {
     Recipient recipient = viewModel.getRecipient().get();
 
     if (!recipient.equals(Recipient.UNKNOWN)) {
-      String recipientDisplayName = recipient.getDisplayName(this);
-
-      Permissions.with(this)
-                 .request(Manifest.permission.CAMERA)
-                 .ifNecessary()
-                 .withRationaleDialog(getString(R.string.WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera, recipientDisplayName), R.drawable.ic_video_solid_24_tinted)
-                 .withPermanentDenialDialog(getString(R.string.WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera, recipientDisplayName))
-                 .onAllGranted(() -> ApplicationDependencies.getSignalCallManager().setEnableVideo(!muted))
-                 .execute();
+      Runnable onGranted = () -> AppDependencies.getSignalCallManager().setEnableVideo(!muted);
+      askCameraPermissions(onGranted);
     }
   }
 
   private void handleFlipCamera() {
-    ApplicationDependencies.getSignalCallManager().flipCamera();
+    AppDependencies.getSignalCallManager().flipCamera();
   }
 
   private void handleAnswerWithAudio() {
-    Permissions.with(this)
-               .request(Manifest.permission.RECORD_AUDIO)
-               .ifNecessary()
-               .withRationaleDialog(getString(R.string.WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone),
-                                    R.drawable.ic_mic_solid_24)
-               .withPermanentDenialDialog(getString(R.string.WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls))
-               .onAllGranted(() -> {
-                 callScreen.setStatus(getString(R.string.RedPhone_answering));
-
-                 ApplicationDependencies.getSignalCallManager().acceptCall(false);
-               })
-               .onAnyDenied(this::handleDenyCall)
-               .execute();
+    Runnable onGranted = () -> {
+      callScreen.setStatus(getString(R.string.RedPhone_answering));
+      AppDependencies.getSignalCallManager().acceptCall(false);
+    };
+    askAudioPermissions(onGranted);
   }
 
   private void handleAnswerWithVideo() {
-    Permissions.with(this)
-               .request(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
-               .ifNecessary()
-               .withRationaleDialog(getString(R.string.WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera), R.drawable.ic_mic_solid_24, R.drawable.ic_video_solid_24_tinted)
-               .withPermanentDenialDialog(getString(R.string.WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls))
-               .onAllGranted(() -> {
-                 callScreen.setStatus(getString(R.string.RedPhone_answering));
-
-                 ApplicationDependencies.getSignalCallManager().acceptCall(true);
-
-                 handleSetMuteVideo(false);
-               })
-               .onAnyDenied(this::handleDenyCall)
-               .execute();
+    Runnable onGranted = () -> {
+      callScreen.setStatus(getString(R.string.RedPhone_answering));
+      AppDependencies.getSignalCallManager().acceptCall(true);
+      handleSetMuteVideo(false);
+    };
+    if (!hasCameraPermission() &!hasAudioPermission()) {
+      askCameraAudioPermissions(onGranted);
+    } else if (!hasAudioPermission()) {
+      askAudioPermissions(onGranted);
+    } else {
+      askCameraPermissions(onGranted);
+    }
   }
 
   private void handleDenyCall() {
     Recipient recipient = viewModel.getRecipient().get();
 
     if (!recipient.equals(Recipient.UNKNOWN)) {
-      ApplicationDependencies.getSignalCallManager().denyCall();
+      AppDependencies.getSignalCallManager().denyCall();
 
       callScreen.setRecipient(recipient);
       callScreen.setStatus(getString(R.string.RedPhone_ending_call));
@@ -739,7 +730,7 @@ private void handleDenyCall() {
 
   private void handleEndCall() {
     Log.i(TAG, "Hangup pressed, handling termination now...");
-    ApplicationDependencies.getSignalCallManager().localHangup();
+    AppDependencies.getSignalCallManager().localHangup();
   }
 
   private void handleOutgoingCall(@NonNull WebRtcViewModel event) {
@@ -837,13 +828,13 @@ public void handleSafetyNumberChangeEvent(@NonNull WebRtcCallViewModel.SafetyNum
   }
 
   private void updateGroupMembersForGroupCall() {
-    ApplicationDependencies.getSignalCallManager().requestUpdateGroupMembers();
+    AppDependencies.getSignalCallManager().requestUpdateGroupMembers();
   }
 
   public void handleGroupMemberCountChange(int count) {
-    boolean canRing = count <= FeatureFlags.maxGroupCallRingSize();
+    boolean canRing = count <= RemoteConfig.maxGroupCallRingSize();
     callScreen.enableRingGroup(canRing);
-    ApplicationDependencies.getSignalCallManager().setRingGroup(canRing);
+    AppDependencies.getSignalCallManager().setRingGroup(canRing);
   }
 
   private void updateSpeakerHint(boolean showSpeakerHint) {
@@ -867,7 +858,7 @@ public void onSendAnywayAfterSafetyNumberChange(@NonNull List<RecipientId> chang
     }
 
     if (state.getGroupCallState().isConnected()) {
-      ApplicationDependencies.getSignalCallManager().groupApproveSafetyChange(changedRecipients);
+      AppDependencies.getSignalCallManager().groupApproveSafetyChange(changedRecipients);
     } else {
       viewModel.startCall(state.getLocalParticipant().isVideoEnabled());
     }
@@ -881,7 +872,7 @@ public void onCanceled() {
     CallParticipantsState state = viewModel.getCallParticipantsStateSnapshot();
     if (state != null && state.getGroupCallState().isNotIdle()) {
       if (state.getCallState().isPreJoinOrNetworkUnavailable()) {
-        ApplicationDependencies.getSignalCallManager().cancelPreJoin();
+        AppDependencies.getSignalCallManager().cancelPreJoin();
         finish();
       } else {
         handleEndCall();
@@ -1015,18 +1006,97 @@ private void handleCallPreJoin(@NonNull WebRtcViewModel event) {
       callScreen.setRingGroup(event.shouldRingGroup());
 
       if (event.shouldRingGroup() && event.areRemoteDevicesInCall()) {
-        ApplicationDependencies.getSignalCallManager().setRingGroup(false);
+        AppDependencies.getSignalCallManager().setRingGroup(false);
       }
     }
   }
 
+  private boolean hasCameraPermission() {
+    return Permissions.hasAll(this, Manifest.permission.CAMERA);
+  }
+
+  private boolean hasAudioPermission() {
+    return Permissions.hasAll(this, Manifest.permission.RECORD_AUDIO);
+  }
+
+  private void askCameraPermissions(@NonNull Runnable onGranted) {
+    if (!isAskingForPermission) {
+      isAskingForPermission = true;
+      Permissions.with(this)
+                 .request(Manifest.permission.CAMERA)
+                 .ifNecessary()
+                 .withRationaleDialog(getString(R.string.WebRtcCallActivity__allow_access_camera), getString(R.string.WebRtcCallActivity__to_enable_video_allow_camera), false, R.drawable.symbol_video_24)
+                 .onAnyResult(() -> isAskingForPermission = false)
+                 .onAllGranted(() -> {
+                   onGranted.run();
+                   findViewById(R.id.missing_permissions_container).setVisibility(View.GONE);
+                 })
+                 .onAnyDenied(() -> Toast.makeText(this, R.string.WebRtcCallActivity__signal_needs_camera_access_enable_video, Toast.LENGTH_LONG).show())
+                 .onAnyPermanentlyDenied(() -> showPermissionFragment(R.string.WebRtcCallActivity__allow_access_camera, R.string.WebRtcCallActivity__to_enable_video).show(getSupportFragmentManager(), BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG))
+                 .execute();
+    }
+  }
+
+  private void askAudioPermissions(@NonNull Runnable onGranted) {
+    if (!isAskingForPermission) {
+      isAskingForPermission = true;
+      Permissions.with(this)
+                 .request(Manifest.permission.RECORD_AUDIO)
+                 .ifNecessary()
+                 .withRationaleDialog(getString(R.string.WebRtcCallActivity__allow_access_microphone), getString(R.string.WebRtcCallActivity__to_start_call_microphone), false, R.drawable.ic_mic_24)
+                 .onAnyResult(() -> isAskingForPermission = false)
+                 .onAllGranted(onGranted)
+                 .onAnyDenied(() -> {
+                   Toast.makeText(this, R.string.WebRtcCallActivity__signal_needs_microphone_start_call, Toast.LENGTH_LONG).show();
+                   handleDenyCall();
+                 })
+                 .onAnyPermanentlyDenied(() -> showPermissionFragment(R.string.WebRtcCallActivity__allow_access_microphone, R.string.WebRtcCallActivity__to_start_call).show(getSupportFragmentManager(), BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG))
+                 .execute();
+    }
+  }
+
+  public void askCameraAudioPermissions(@NonNull Runnable onGranted) {
+    if (!isAskingForPermission) {
+      isAskingForPermission = true;
+      Permissions.with(this)
+                 .request(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
+                 .ifNecessary()
+                 .withRationaleDialog(getString(R.string.WebRtcCallActivity__allow_access_camera_microphone), getString(R.string.WebRtcCallActivity__to_start_call_camera_microphone), false, R.drawable.ic_mic_24, R.drawable.symbol_video_24)
+                 .onAnyResult(() -> isAskingForPermission = false)
+                 .onSomePermanentlyDenied(deniedPermissions -> {
+                   if (deniedPermissions.containsAll(List.of(Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO))) {
+                     showPermissionFragment(R.string.WebRtcCallActivity__allow_access_camera_microphone, R.string.WebRtcCallActivity__to_start_call).show(getSupportFragmentManager(), BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG);
+                   } else if (deniedPermissions.contains(Manifest.permission.CAMERA)) {
+                     showPermissionFragment(R.string.WebRtcCallActivity__allow_access_camera, R.string.WebRtcCallActivity__to_enable_video).show(getSupportFragmentManager(), BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG);
+                   } else {
+                     showPermissionFragment(R.string.WebRtcCallActivity__allow_access_microphone, R.string.WebRtcCallActivity__to_start_call).show(getSupportFragmentManager(), BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG);
+                   }
+                 })
+                 .onAllGranted(onGranted)
+                 .onSomeGranted(permissions -> {
+                   if (permissions.contains(Manifest.permission.CAMERA)) {
+                     findViewById(R.id.missing_permissions_container).setVisibility(View.GONE);
+                   }
+                 })
+                 .onSomeDenied(deniedPermissions -> {
+                   if (deniedPermissions.contains(Manifest.permission.RECORD_AUDIO)) {
+                     Toast.makeText(this, R.string.WebRtcCallActivity__signal_needs_microphone_start_call, Toast.LENGTH_LONG).show();
+                     handleDenyCall();
+                   } else {
+                     Toast.makeText(this, R.string.WebRtcCallActivity__signal_needs_camera_access_enable_video, Toast.LENGTH_LONG).show();
+                   }
+                 })
+                 .execute();
+    }
+  }
+
   private void startCall(boolean isVideoCall) {
     enableVideoIfAvailable = isVideoCall;
 
     if (isVideoCall) {
-      ApplicationDependencies.getSignalCallManager().startOutgoingVideoCall(viewModel.getRecipient().get());
+      AppDependencies.getSignalCallManager().startOutgoingVideoCall(viewModel.getRecipient().get());
     } else {
-      ApplicationDependencies.getSignalCallManager().startOutgoingAudioCall(viewModel.getRecipient().get());
+      AppDependencies.getSignalCallManager().startOutgoingAudioCall(viewModel.getRecipient().get());
     }
 
     MessageSender.onMessageSent();
@@ -1037,7 +1107,7 @@ public void onReactWithAnyEmojiDialogDismissed() { /* no-op */ }
 
   @Override
   public void onReactWithAnyEmojiSelected(@NonNull String emoji) {
-    ApplicationDependencies.getSignalCallManager().react(emoji);
+    AppDependencies.getSignalCallManager().react(emoji);
     callOverflowPopupWindow.dismiss();
   }
 
@@ -1056,11 +1126,16 @@ public void onCancelStartCall() {
     @Override
     public void toggleControls() {
       WebRtcControls controlState = viewModel.getWebRtcControls().getValue();
-      if (controlState != null && !controlState.displayIncomingCallButtons()) {
+      if (controlState != null && !controlState.displayIncomingCallButtons() && !controlState.displayErrorControls()) {
         controlsAndInfo.toggleControls();
       }
     }
 
+    @Override
+    public void onAudioPermissionsRequested(Runnable onGranted) {
+      askAudioPermissions(onGranted);
+    }
+
     @Override
     public void onAudioOutputChanged(@NonNull WebRtcAudioOutput audioOutput) {
       maybeDisplaySpeakerphonePopup(audioOutput);
@@ -1086,7 +1161,7 @@ public void onAudioOutputChanged(@NonNull WebRtcAudioOutput audioOutput) {
     @Override
     public void onAudioOutputChanged31(@NonNull WebRtcAudioDevice audioOutput) {
       maybeDisplaySpeakerphonePopup(audioOutput.getWebRtcAudioOutput());
-      ApplicationDependencies.getSignalCallManager().selectAudioDevice(new SignalAudioManager.ChosenAudioDeviceIdentifier(audioOutput.getDeviceId()));
+      AppDependencies.getSignalCallManager().selectAudioDevice(new SignalAudioManager.ChosenAudioDeviceIdentifier(audioOutput.getDeviceId()));
     }
 
     @Override
@@ -1096,9 +1171,12 @@ public void onVideoChanged(boolean isVideoEnabled) {
 
     @Override
     public void onMicChanged(boolean isMicEnabled) {
-      callStateUpdatePopupWindow.onCallStateUpdate(isMicEnabled ? CallStateUpdatePopupWindow.CallStateUpdate.MIC_ON
-                                                                : CallStateUpdatePopupWindow.CallStateUpdate.MIC_OFF);
-      handleSetMuteAudio(!isMicEnabled);
+      Runnable onGranted = () -> {
+        callStateUpdatePopupWindow.onCallStateUpdate(isMicEnabled ? CallStateUpdatePopupWindow.CallStateUpdate.MIC_ON
+                                                                  : CallStateUpdatePopupWindow.CallStateUpdate.MIC_OFF);
+        handleSetMuteAudio(!isMicEnabled);
+      };
+      askAudioPermissions(onGranted);
     }
 
     @Override
@@ -1149,11 +1227,11 @@ public void onLocalPictureInPictureClicked() {
     @Override
     public void onRingGroupChanged(boolean ringGroup, boolean ringingAllowed) {
       if (ringingAllowed) {
-        ApplicationDependencies.getSignalCallManager().setRingGroup(ringGroup);
+        AppDependencies.getSignalCallManager().setRingGroup(ringGroup);
         callStateUpdatePopupWindow.onCallStateUpdate(ringGroup ? CallStateUpdatePopupWindow.CallStateUpdate.RINGING_ON
                                                                : CallStateUpdatePopupWindow.CallStateUpdate.RINGING_OFF);
       } else {
-        ApplicationDependencies.getSignalCallManager().setRingGroup(false);
+        AppDependencies.getSignalCallManager().setRingGroup(false);
         callStateUpdatePopupWindow.onCallStateUpdate(CallStateUpdatePopupWindow.CallStateUpdate.RINGING_DISABLED);
       }
     }
@@ -1182,12 +1260,12 @@ private class PendingParticipantsViewListener implements PendingParticipantsView
 
     @Override
     public void onAllowPendingRecipient(@NonNull Recipient pendingRecipient) {
-      ApplicationDependencies.getSignalCallManager().setCallLinkJoinRequestAccepted(pendingRecipient.getId());
+      AppDependencies.getSignalCallManager().setCallLinkJoinRequestAccepted(pendingRecipient.getId());
     }
 
     @Override
     public void onRejectPendingRecipient(@NonNull Recipient pendingRecipient) {
-      ApplicationDependencies.getSignalCallManager().setCallLinkJoinRequestRejected(pendingRecipient.getId());
+      AppDependencies.getSignalCallManager().setCallLinkJoinRequestRejected(pendingRecipient.getId());
     }
 
     @Override
@@ -1233,9 +1311,12 @@ public void onShown() {
 
     @Override
     public void onHidden() {
-      fullscreenHelper.hideSystemUI();
-      if (videoTooltip != null) {
-        videoTooltip.dismiss();
+      WebRtcControls controlState = viewModel.getWebRtcControls().getValue();
+      if (controlState == null || !controlState.displayErrorControls()) {
+        fullscreenHelper.hideSystemUI();
+        if (videoTooltip != null) {
+          videoTooltip.dismiss();
+        }
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/absbackup/SignalBackupAgent.kt b/app/src/main/java/org/thoughtcrime/securesms/absbackup/SignalBackupAgent.kt
index 43bb72f15e..73840231f5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/absbackup/SignalBackupAgent.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/absbackup/SignalBackupAgent.kt
@@ -21,6 +21,7 @@ class SignalBackupAgent : BackupAgent() {
   )
 
   override fun onBackup(oldState: ParcelFileDescriptor?, data: BackupDataOutput, newState: ParcelFileDescriptor) {
+    Log.i(TAG, "Performing backup to Android Backup Service.")
     val contentsHash = cumulativeHashCode()
     if (oldState == null) {
       performBackup(data)
@@ -36,9 +37,11 @@ class SignalBackupAgent : BackupAgent() {
     }
 
     DataOutputStream(FileOutputStream(newState.fileDescriptor)).use { it.writeInt(contentsHash) }
+    Log.i(TAG, "Backup finished.")
   }
 
   private fun performBackup(data: BackupDataOutput) {
+    Log.i(TAG, "Creating new backup data.")
     items.forEach {
       val backupData = it.getDataForBackup()
       data.writeEntityHeader(it.getKey(), backupData.size)
@@ -54,7 +57,7 @@ class SignalBackupAgent : BackupAgent() {
       items.find { dataInput.key == it.getKey() }?.restoreData(buffer)
     }
     DataOutputStream(FileOutputStream(newState.fileDescriptor)).use { it.writeInt(cumulativeHashCode()) }
-    Log.i(TAG, "Android Backup Service complete.")
+    Log.i(TAG, "Android Backup Service restore complete.")
   }
 
   private fun cumulativeHashCode(): Int {
@@ -62,6 +65,6 @@ class SignalBackupAgent : BackupAgent() {
   }
 
   companion object {
-    private const val TAG = "SignalBackupAgent"
+    private val TAG = Log.tag(SignalBackupAgent::class)
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/absbackup/backupables/SvrAuthTokens.kt b/app/src/main/java/org/thoughtcrime/securesms/absbackup/backupables/SvrAuthTokens.kt
index 94525ea16d..3007c05a16 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/absbackup/backupables/SvrAuthTokens.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/absbackup/backupables/SvrAuthTokens.kt
@@ -17,19 +17,19 @@ object SvrAuthTokens : AndroidBackupItem {
   }
 
   override fun getDataForBackup(): ByteArray {
-    val proto = SvrAuthToken(tokens = SignalStore.svr().authTokenList)
+    val proto = SvrAuthToken(svr2Tokens = SignalStore.svr.svr2AuthTokens)
     return proto.encode()
   }
 
   override fun restoreData(data: ByteArray) {
-    if (SignalStore.svr().authTokenList.isNotEmpty()) {
+    if (SignalStore.svr.svr2AuthTokens.isNotEmpty()) {
       return
     }
 
     try {
       val proto = SvrAuthToken.ADAPTER.decode(data)
 
-      SignalStore.svr().putAuthTokenList(proto.tokens)
+      SignalStore.svr.putSvr2AuthTokens(proto.svr2Tokens)
     } catch (e: IOException) {
       Log.w(TAG, "Cannot restore KbsAuthToken from backup service.")
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateDownloadManagerReceiver.kt b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateDownloadManagerReceiver.kt
index 7a71aa8c56..68b8db440f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateDownloadManagerReceiver.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateDownloadManagerReceiver.kt
@@ -32,7 +32,7 @@ class ApkUpdateDownloadManagerReceiver : BroadcastReceiver() {
     }
 
     val downloadId = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -2)
-    if (downloadId != SignalStore.apkUpdate().downloadId) {
+    if (downloadId != SignalStore.apkUpdate.downloadId) {
       Log.w(TAG, "downloadId doesn't match the one we're waiting for! Ignoring.")
       return
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateInstaller.kt b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateInstaller.kt
index 2fe3f96512..ad026fdb69 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateInstaller.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateInstaller.kt
@@ -9,7 +9,7 @@ import android.content.Context
 import android.net.Uri
 import org.signal.core.util.getDownloadManager
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.ApkUpdateJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.FileUtils
@@ -31,24 +31,24 @@ object ApkUpdateInstaller {
    * [userInitiated] = true, and then everything installs.
    */
   fun installOrPromptForInstall(context: Context, downloadId: Long, userInitiated: Boolean) {
-    if (downloadId != SignalStore.apkUpdate().downloadId) {
-      Log.w(TAG, "DownloadId doesn't match the one we're waiting for (current: $downloadId, expected: ${SignalStore.apkUpdate().downloadId})! We likely have newer data. Ignoring.")
+    if (downloadId != SignalStore.apkUpdate.downloadId) {
+      Log.w(TAG, "DownloadId doesn't match the one we're waiting for (current: $downloadId, expected: ${SignalStore.apkUpdate.downloadId})! We likely have newer data. Ignoring.")
       ApkUpdateNotifications.dismissInstallPrompt(context)
-      ApplicationDependencies.getJobManager().add(ApkUpdateJob())
+      AppDependencies.jobManager.add(ApkUpdateJob())
       return
     }
 
-    val digest = SignalStore.apkUpdate().digest
+    val digest = SignalStore.apkUpdate.digest
     if (digest == null) {
       Log.w(TAG, "DownloadId matches, but digest is null! Inconsistent state. Failing and clearing state.")
-      SignalStore.apkUpdate().clearDownloadAttributes()
+      SignalStore.apkUpdate.clearDownloadAttributes()
       ApkUpdateNotifications.showInstallFailed(context, ApkUpdateNotifications.FailureReason.UNKNOWN)
       return
     }
 
     if (!isMatchingDigest(context, downloadId, digest)) {
       Log.w(TAG, "DownloadId matches, but digest does not! Bad download or inconsistent state. Failing and clearing state.")
-      SignalStore.apkUpdate().clearDownloadAttributes()
+      SignalStore.apkUpdate.clearDownloadAttributes()
       ApkUpdateNotifications.showInstallFailed(context, ApkUpdateNotifications.FailureReason.UNKNOWN)
       return
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateNotifications.kt b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateNotifications.kt
index 36fa0f440d..2b0256d102 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateNotifications.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateNotifications.kt
@@ -15,12 +15,10 @@ import org.signal.core.util.PendingIntentFlags
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.MainActivity
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.notifications.NotificationCancellationHelper
 import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.notifications.NotificationIds
 import org.thoughtcrime.securesms.util.ServiceUtil
 
-
 object ApkUpdateNotifications {
 
   val TAG = Log.tag(ApkUpdateNotifications::class.java)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateRefreshListener.java b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateRefreshListener.java
index cf37b7780e..0885624453 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateRefreshListener.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateRefreshListener.java
@@ -9,10 +9,10 @@
 import android.content.Context;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.BuildConfig;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.ApkUpdateJob;
 import org.thoughtcrime.securesms.service.PersistentAlarmManagerListener;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.util.concurrent.TimeUnit;
@@ -34,7 +34,7 @@ protected long onAlarm(Context context, long scheduledTime) {
 
     if (scheduledTime != 0) {
       Log.i(TAG, "Queueing APK update job...");
-      ApplicationDependencies.getJobManager().add(new ApkUpdateJob());
+      AppDependencies.getJobManager().add(new ApkUpdateJob());
     }
 
     long newTime = System.currentTimeMillis() + INTERVAL;
@@ -44,7 +44,7 @@ protected long onAlarm(Context context, long scheduledTime) {
   }
 
   public static void scheduleIfAllowed(Context context) {
-    if (FeatureFlags.selfUpdater()) {
+    if (BuildConfig.MANAGES_MOLLY_UPDATES) {
       new ApkUpdateRefreshListener().onReceive(context, getScheduleIntent());
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/ArchivedAttachment.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/ArchivedAttachment.kt
index f005e3642d..90fa15aa11 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/ArchivedAttachment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/ArchivedAttachment.kt
@@ -10,6 +10,8 @@ import android.os.Parcel
 import org.signal.core.util.Base64
 import org.thoughtcrime.securesms.blurhash.BlurHash
 import org.thoughtcrime.securesms.database.AttachmentTable
+import org.thoughtcrime.securesms.stickers.StickerLocator
+import java.util.UUID
 
 class ArchivedAttachment : Attachment {
 
@@ -44,8 +46,10 @@ class ArchivedAttachment : Attachment {
     blurHash: String?,
     voiceNote: Boolean,
     borderless: Boolean,
+    stickerLocator: StickerLocator?,
     gif: Boolean,
-    quote: Boolean
+    quote: Boolean,
+    uuid: UUID?
   ) : super(
     contentType = contentType ?: "",
     quote = quote,
@@ -66,10 +70,11 @@ class ArchivedAttachment : Attachment {
     incrementalMacChunkSize = incrementalMacChunkSize ?: 0,
     uploadTimestamp = 0,
     caption = caption,
-    stickerLocator = null,
+    stickerLocator = stickerLocator,
     blurHash = BlurHash.parseOrNull(blurHash),
     audioHash = null,
-    transformProperties = null
+    transformProperties = null,
+    uuid = uuid
   ) {
     this.archiveCdn = archiveCdn ?: Cdn.CDN_3.cdnNumber
     this.archiveMediaName = archiveMediaName
diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.kt
index 784871a778..15d941f560 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.kt
@@ -14,6 +14,8 @@ import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.database.AttachmentTable.TransformProperties
 import org.thoughtcrime.securesms.stickers.StickerLocator
 import org.thoughtcrime.securesms.util.ParcelUtil
+import org.whispersystems.signalservice.api.util.UuidUtil
+import java.util.UUID
 
 /**
  * Note: We have to use our own Parcelable implementation because we need to do custom stuff to preserve
@@ -65,12 +67,16 @@ abstract class Attachment(
   @JvmField
   val audioHash: AudioHash?,
   @JvmField
-  val transformProperties: TransformProperties?
+  val transformProperties: TransformProperties?,
+  @JvmField
+  val uuid: UUID?
 ) : Parcelable {
 
   abstract val uri: Uri?
   abstract val publicUri: Uri?
   abstract val thumbnailUri: Uri?
+  val displayUri: Uri?
+    get() = uri ?: thumbnailUri
 
   protected constructor(parcel: Parcel) : this(
     contentType = parcel.readString()!!,
@@ -95,7 +101,8 @@ abstract class Attachment(
     stickerLocator = ParcelCompat.readParcelable(parcel, StickerLocator::class.java.classLoader, StickerLocator::class.java),
     blurHash = ParcelCompat.readParcelable(parcel, BlurHash::class.java.classLoader, BlurHash::class.java),
     audioHash = ParcelCompat.readParcelable(parcel, AudioHash::class.java.classLoader, AudioHash::class.java),
-    transformProperties = ParcelCompat.readParcelable(parcel, TransformProperties::class.java.classLoader, TransformProperties::class.java)
+    transformProperties = ParcelCompat.readParcelable(parcel, TransformProperties::class.java.classLoader, TransformProperties::class.java),
+    uuid = UuidUtil.parseOrNull(parcel.readString())
   )
 
   override fun writeToParcel(dest: Parcel, flags: Int) {
@@ -123,6 +130,7 @@ abstract class Attachment(
     dest.writeParcelable(blurHash, 0)
     dest.writeParcelable(audioHash, 0)
     dest.writeParcelable(transformProperties, 0)
+    dest.writeString(uuid?.toString())
   }
 
   override fun describeContents(): Int {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentUploadUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentUploadUtil.kt
index 3423a8150a..c74e291b03 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentUploadUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentUploadUtil.kt
@@ -55,6 +55,7 @@ object AttachmentUploadUtil {
       .withResumableUploadSpec(ResumableUploadSpec.from(uploadSpec))
       .withCancelationSignal(cancellationSignal)
       .withListener(progressListener)
+      .withUuid(attachment.uuid)
 
     if (MediaUtil.isImageType(attachment.contentType)) {
       builder.withBlurHash(getImageBlurHash(context, attachment))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.kt
index 0f62be8c04..abedc18b98 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.kt
@@ -5,11 +5,12 @@ import android.os.Parcel
 import androidx.core.os.ParcelCompat
 import org.thoughtcrime.securesms.audio.AudioHash
 import org.thoughtcrime.securesms.blurhash.BlurHash
+import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.database.AttachmentTable.TransformProperties
 import org.thoughtcrime.securesms.mms.PartAuthority
 import org.thoughtcrime.securesms.stickers.StickerLocator
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.ParcelUtil
+import java.util.UUID
 
 class DatabaseAttachment : Attachment {
 
@@ -37,6 +38,9 @@ class DatabaseAttachment : Attachment {
   @JvmField
   val archiveMediaId: String?
 
+  @JvmField
+  val thumbnailRestoreState: AttachmentTable.ThumbnailRestoreState
+
   private val hasArchiveThumbnail: Boolean
   private val hasThumbnail: Boolean
   val displayOrder: Int
@@ -75,7 +79,9 @@ class DatabaseAttachment : Attachment {
     archiveCdn: Int,
     archiveThumbnailCdn: Int,
     archiveMediaName: String?,
-    archiveMediaId: String?
+    archiveMediaId: String?,
+    thumbnailRestoreState: AttachmentTable.ThumbnailRestoreState,
+    uuid: UUID?
   ) : super(
     contentType = contentType!!,
     transferState = transferProgress,
@@ -98,7 +104,8 @@ class DatabaseAttachment : Attachment {
     stickerLocator = stickerLocator,
     blurHash = blurHash,
     audioHash = audioHash,
-    transformProperties = transformProperties
+    transformProperties = transformProperties,
+    uuid = uuid
   ) {
     this.attachmentId = attachmentId
     this.mmsId = mmsId
@@ -111,6 +118,7 @@ class DatabaseAttachment : Attachment {
     this.archiveThumbnailCdn = archiveThumbnailCdn
     this.archiveMediaName = archiveMediaName
     this.archiveMediaId = archiveMediaId
+    this.thumbnailRestoreState = thumbnailRestoreState
   }
 
   constructor(parcel: Parcel) : super(parcel) {
@@ -125,6 +133,7 @@ class DatabaseAttachment : Attachment {
     archiveMediaName = parcel.readString()
     archiveMediaId = parcel.readString()
     hasArchiveThumbnail = ParcelUtil.readBoolean(parcel)
+    thumbnailRestoreState = AttachmentTable.ThumbnailRestoreState.deserialize(parcel.readInt())
   }
 
   override fun writeToParcel(dest: Parcel, flags: Int) {
@@ -140,10 +149,11 @@ class DatabaseAttachment : Attachment {
     dest.writeString(archiveMediaName)
     dest.writeString(archiveMediaId)
     ParcelUtil.writeBoolean(dest, hasArchiveThumbnail)
+    dest.writeInt(thumbnailRestoreState.value)
   }
 
   override val uri: Uri?
-    get() = if (hasData || FeatureFlags.instantVideoPlayback() && getIncrementalDigest() != null) {
+    get() = if (hasData || getIncrementalDigest() != null) {
       PartAuthority.getAttachmentDataUri(attachmentId)
     } else {
       null
@@ -165,7 +175,7 @@ class DatabaseAttachment : Attachment {
 
   override fun equals(other: Any?): Boolean {
     return other != null &&
-      other is DatabaseAttachment && other.attachmentId == attachmentId
+      other is DatabaseAttachment && other.attachmentId == attachmentId && other.uri == uri
   }
 
   override fun hashCode(): Int {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.kt
index e26b32d95f..73e6997cf8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.kt
@@ -12,6 +12,7 @@ import org.whispersystems.signalservice.api.messages.SignalServiceAttachment
 import org.whispersystems.signalservice.api.util.AttachmentPointerUtil
 import org.whispersystems.signalservice.internal.push.DataMessage
 import java.util.Optional
+import java.util.UUID
 
 class PointerAttachment : Attachment {
   @VisibleForTesting
@@ -35,7 +36,8 @@ class PointerAttachment : Attachment {
     uploadTimestamp: Long,
     caption: String?,
     stickerLocator: StickerLocator?,
-    blurHash: BlurHash?
+    blurHash: BlurHash?,
+    uuid: UUID?
   ) : super(
     contentType = contentType,
     transferState = transferState,
@@ -59,7 +61,8 @@ class PointerAttachment : Attachment {
     stickerLocator = stickerLocator,
     blurHash = blurHash,
     audioHash = null,
-    transformProperties = null
+    transformProperties = null,
+    uuid = uuid
   )
 
   constructor(parcel: Parcel) : super(parcel)
@@ -115,7 +118,8 @@ class PointerAttachment : Attachment {
           uploadTimestamp = pointer.get().asPointer().uploadTimestamp,
           caption = pointer.get().asPointer().caption.orElse(null),
           stickerLocator = stickerLocator,
-          blurHash = BlurHash.parseOrNull(pointer.get().asPointer().blurHash.orElse(null))
+          blurHash = BlurHash.parseOrNull(pointer.get().asPointer().blurHash.orElse(null)),
+          uuid = pointer.get().asPointer().uuid
         )
       )
     }
@@ -152,7 +156,8 @@ class PointerAttachment : Attachment {
           uploadTimestamp = thumbnail?.asPointer()?.uploadTimestamp ?: 0,
           caption = thumbnail?.asPointer()?.caption?.orElse(null),
           stickerLocator = null,
-          blurHash = null
+          blurHash = null,
+          uuid = thumbnail?.asPointer()?.uuid
         )
       )
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/TombstoneAttachment.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/TombstoneAttachment.kt
index dd2d0364b4..552a1071bc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/TombstoneAttachment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/TombstoneAttachment.kt
@@ -4,6 +4,7 @@ import android.net.Uri
 import android.os.Parcel
 import org.thoughtcrime.securesms.blurhash.BlurHash
 import org.thoughtcrime.securesms.database.AttachmentTable
+import java.util.UUID
 
 /**
  * An attachment that represents where an attachment used to be. Useful when you need to know that
@@ -35,7 +36,8 @@ class TombstoneAttachment : Attachment {
     stickerLocator = null,
     blurHash = null,
     audioHash = null,
-    transformProperties = null
+    transformProperties = null,
+    uuid = null
   )
 
   constructor(
@@ -49,7 +51,8 @@ class TombstoneAttachment : Attachment {
     voiceNote: Boolean = false,
     borderless: Boolean = false,
     gif: Boolean = false,
-    quote: Boolean
+    quote: Boolean,
+    uuid: UUID?
   ) : super(
     contentType = contentType ?: "",
     quote = quote,
@@ -73,7 +76,8 @@ class TombstoneAttachment : Attachment {
     stickerLocator = null,
     blurHash = BlurHash.parseOrNull(blurHash),
     audioHash = null,
-    transformProperties = null
+    transformProperties = null,
+    uuid = uuid
   )
 
   constructor(parcel: Parcel) : super(parcel)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.kt
index 2de2f818e9..1998161fca 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.kt
@@ -8,6 +8,7 @@ import org.thoughtcrime.securesms.blurhash.BlurHash
 import org.thoughtcrime.securesms.database.AttachmentTable.TransformProperties
 import org.thoughtcrime.securesms.stickers.StickerLocator
 import java.util.Objects
+import java.util.UUID
 
 class UriAttachment : Attachment {
 
@@ -46,6 +47,7 @@ class UriAttachment : Attachment {
     transformProperties = transformProperties
   )
 
+  @JvmOverloads
   constructor(
     dataUri: Uri,
     contentType: String,
@@ -63,7 +65,8 @@ class UriAttachment : Attachment {
     stickerLocator: StickerLocator?,
     blurHash: BlurHash?,
     audioHash: AudioHash?,
-    transformProperties: TransformProperties?
+    transformProperties: TransformProperties?,
+    uuid: UUID? = UUID.randomUUID()
   ) : super(
     contentType = contentType,
     transferState = transferState,
@@ -87,7 +90,8 @@ class UriAttachment : Attachment {
     stickerLocator = stickerLocator,
     blurHash = blurHash,
     audioHash = audioHash,
-    transformProperties = transformProperties
+    transformProperties = transformProperties,
+    uuid = uuid
   ) {
     uri = Objects.requireNonNull(dataUri)
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/BluetoothVoiceNoteUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/audio/BluetoothVoiceNoteUtil.kt
index 61d681b52b..0497847058 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/audio/BluetoothVoiceNoteUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/audio/BluetoothVoiceNoteUtil.kt
@@ -14,7 +14,7 @@ import androidx.annotation.RequiresApi
 import org.signal.core.util.ThreadUtil
 import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.webrtc.audio.SignalAudioHandler
 
 internal const val TAG = "BluetoothVoiceNoteUtil"
@@ -34,7 +34,7 @@ sealed interface BluetoothVoiceNoteUtil {
 @RequiresApi(31)
 private class BluetoothVoiceNoteUtil31(val listener: (Boolean) -> Unit) : BluetoothVoiceNoteUtil {
   override fun connectBluetoothScoConnection() {
-    val audioManager = ApplicationDependencies.getAndroidCallAudioManager()
+    val audioManager = AppDependencies.androidCallAudioManager
     val device: AudioDeviceInfo? = audioManager.connectedBluetoothDevice
     if (device != null) {
       val result: Boolean = audioManager.setCommunicationDevice(device)
@@ -53,7 +53,7 @@ private class BluetoothVoiceNoteUtil31(val listener: (Boolean) -> Unit) : Blueto
 
   override fun disconnectBluetoothScoConnection() {
     Log.d(TAG, "Clearing call manager communication device.")
-    ApplicationDependencies.getAndroidCallAudioManager().clearCommunicationDevice()
+    AppDependencies.androidCallAudioManager.clearCommunicationDevice()
   }
 
   override fun destroy() = Unit
diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/SignalBluetoothManager.kt b/app/src/main/java/org/thoughtcrime/securesms/audio/SignalBluetoothManager.kt
index c03aba182e..aeda6a6f03 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/audio/SignalBluetoothManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/audio/SignalBluetoothManager.kt
@@ -16,7 +16,7 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.media.AudioManager
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.util.safeUnregisterReceiver
 import org.thoughtcrime.securesms.webrtc.audio.SignalAudioHandler
 import java.util.concurrent.TimeUnit
@@ -49,7 +49,7 @@ class SignalBluetoothManager(
   private var bluetoothHeadset: BluetoothHeadset? = null
   private var scoConnectionAttempts = 0
 
-  private val androidAudioManager = ApplicationDependencies.getAndroidCallAudioManager()
+  private val androidAudioManager = AppDependencies.androidCallAudioManager
   private val bluetoothListener = BluetoothServiceListener()
   private var bluetoothReceiver: BluetoothHeadsetBroadcastReceiver? = null
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarRenderer.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarRenderer.kt
index 5cf4cbb616..246f8309c1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarRenderer.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarRenderer.kt
@@ -134,6 +134,6 @@ object AvatarRenderer {
   }
 
   private fun createMedia(uri: Uri, size: Long): Media {
-    return Media(uri, MediaUtil.IMAGE_JPEG, System.currentTimeMillis(), DIMENSIONS, DIMENSIONS, size, 0, false, false, Optional.empty(), Optional.empty(), Optional.empty())
+    return Media(uri, MediaUtil.IMAGE_JPEG, System.currentTimeMillis(), DIMENSIONS, DIMENSIONS, size, 0, false, false, Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty())
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/fallback/FallbackAvatar.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/fallback/FallbackAvatar.kt
new file mode 100644
index 0000000000..601d6bdbf3
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/fallback/FallbackAvatar.kt
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.avatar.fallback
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.Px
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import org.signal.core.util.DimensionUnit
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.conversation.colors.AvatarColor
+import org.thoughtcrime.securesms.util.NameUtil
+
+/**
+ * Specifies what kind of avatar should be generated for a given recipient.
+ */
+sealed interface FallbackAvatar {
+
+  val color: AvatarColor
+
+  /**
+   * Transparent avatar
+   */
+  data object Transparent : FallbackAvatar {
+    override val color: AvatarColor = AvatarColor.UNKNOWN
+  }
+
+  /**
+   * Generated avatars utilize the initials of the given recipient
+   */
+  data class Text(val content: String, override val color: AvatarColor) : FallbackAvatar {
+    init {
+      check(content.isNotEmpty())
+    }
+  }
+
+  /**
+   * Fallback avatars that are backed by resources.
+   */
+  sealed interface Resource : FallbackAvatar {
+
+    @DrawableRes
+    fun getIconBySize(size: Size): Int
+
+    /**
+     * Local user
+     */
+    data class Local(override val color: AvatarColor) : Resource {
+      override fun getIconBySize(size: Size): Int {
+        return when (size) {
+          Size.SMALL -> R.drawable.symbol_note_compact_16
+          Size.MEDIUM -> R.drawable.symbol_note_24
+          Size.LARGE -> R.drawable.symbol_note_display_bold_40
+        }
+      }
+    }
+
+    /**
+     * Individual user without a display name.
+     */
+    data class Person(override val color: AvatarColor) : Resource {
+      override fun getIconBySize(size: Size): Int {
+        return when (size) {
+          Size.SMALL -> R.drawable.symbol_person_compact_16
+          Size.MEDIUM -> R.drawable.symbol_person_24
+          Size.LARGE -> R.drawable.symbol_person_display_bold_40
+        }
+      }
+    }
+
+    /**
+     * A group
+     */
+    data class Group(override val color: AvatarColor) : Resource {
+      override fun getIconBySize(size: Size): Int {
+        return when (size) {
+          Size.SMALL -> R.drawable.symbol_group_compact_16
+          Size.MEDIUM -> R.drawable.symbol_group_24
+          Size.LARGE -> R.drawable.symbol_group_display_bold_40
+        }
+      }
+    }
+
+    /**
+     * Story distribution lists
+     */
+    data class DistributionList(override val color: AvatarColor) : Resource {
+      override fun getIconBySize(size: Size): Int {
+        return when (size) {
+          Size.SMALL -> R.drawable.symbol_stories_compact_16
+          Size.MEDIUM -> R.drawable.symbol_stories_24
+          Size.LARGE -> R.drawable.symbol_stories_display_bold_40
+        }
+      }
+    }
+
+    /**
+     * Call Links
+     */
+    data class CallLink(override val color: AvatarColor) : Resource {
+      override fun getIconBySize(size: Size): Int {
+        return when (size) {
+          Size.SMALL -> R.drawable.symbol_video_compact_16
+          Size.MEDIUM -> R.drawable.symbol_video_24
+          Size.LARGE -> R.drawable.symbol_video_display_bold_40
+        }
+      }
+    }
+  }
+
+  enum class Size {
+    /**
+     * Smaller than 32dp
+     */
+    SMALL,
+
+    /**
+     * 32dp and larger
+     */
+    MEDIUM,
+
+    /**
+     * 80dp and larger
+     */
+    LARGE
+  }
+
+  companion object {
+    const val ICON_TO_BACKGROUND_SCALE = 0.625
+
+    @JvmStatic
+    @JvmOverloads
+    fun forTextOrDefault(text: String, avatarColor: AvatarColor, default: FallbackAvatar = Resource.Person(avatarColor)): FallbackAvatar {
+      val abbreviation = NameUtil.getAbbreviation(text)
+      return if (abbreviation != null) {
+        Text(abbreviation, avatarColor)
+      } else {
+        default
+      }
+    }
+
+    fun getSizeByPx(@Px px: Int): Size {
+      return getSizeByDp(DimensionUnit.PIXELS.toDp(px.toFloat()).dp)
+    }
+
+    fun getSizeByDp(dp: Dp): Size {
+      val rawDp = dp.value
+      return when {
+        rawDp >= 80.0 -> Size.LARGE
+        rawDp < 32.0 -> Size.SMALL
+        else -> Size.MEDIUM
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/fallback/FallbackAvatarDrawable.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/fallback/FallbackAvatarDrawable.kt
new file mode 100644
index 0000000000..d8c22f872d
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/fallback/FallbackAvatarDrawable.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.avatar.fallback
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.graphics.drawable.Drawable
+import androidx.core.content.ContextCompat
+import com.airbnb.lottie.SimpleColorFilter
+import com.google.android.material.shape.MaterialShapeDrawable
+import com.google.android.material.shape.RelativeCornerSize
+import com.google.android.material.shape.RoundedCornerTreatment
+import com.google.android.material.shape.ShapeAppearanceModel
+import org.thoughtcrime.securesms.avatar.Avatar
+import org.thoughtcrime.securesms.avatar.Avatars
+import org.thoughtcrime.securesms.avatar.TextAvatarDrawable
+import org.thoughtcrime.securesms.conversation.colors.AvatarColorPair
+
+class FallbackAvatarDrawable(
+  private val context: Context,
+  private val fallbackAvatar: FallbackAvatar
+) : MaterialShapeDrawable() {
+
+  private val avatarColorPair: AvatarColorPair = AvatarColorPair.create(context, fallbackAvatar.color)
+  private var avatarSize: FallbackAvatar.Size = FallbackAvatar.Size.SMALL
+  private var icon: Drawable? = null
+
+  init {
+    fillColor = ColorStateList.valueOf(avatarColorPair.backgroundColor)
+  }
+
+  fun circleCrop(): FallbackAvatarDrawable {
+    shapeAppearanceModel = ShapeAppearanceModel.builder()
+      .setAllCorners(RoundedCornerTreatment())
+      .setAllCornerSizes(RelativeCornerSize(0.5f))
+      .build()
+    return this
+  }
+
+  override fun onBoundsChange(bounds: Rect) {
+    super.onBoundsChange(bounds)
+
+    avatarSize = FallbackAvatar.getSizeByPx(bounds.width())
+    icon = when (fallbackAvatar) {
+      is FallbackAvatar.Resource -> {
+        val resourceIcon = ContextCompat.getDrawable(context, fallbackAvatar.getIconBySize(avatarSize))!!
+
+        val iconBounds = Rect(bounds)
+        iconBounds.inset(
+          ((bounds.width() - (bounds.width() * FallbackAvatar.ICON_TO_BACKGROUND_SCALE)) / 2f).toInt(),
+          ((bounds.height() - (bounds.height() * FallbackAvatar.ICON_TO_BACKGROUND_SCALE)) / 2f).toInt()
+        )
+
+        resourceIcon.bounds = iconBounds
+        resourceIcon
+      }
+
+      is FallbackAvatar.Text -> TextAvatarDrawable(
+        context = context,
+        avatar = Avatar.Text(
+          fallbackAvatar.content,
+          Avatars.ColorPair(avatarColorPair.backgroundColor, avatarColorPair.foregroundColor, ""),
+          Avatar.DatabaseId.DoNotPersist
+        ),
+        size = bounds.width()
+      )
+
+      FallbackAvatar.Transparent -> null
+    }
+
+    icon?.alpha = alpha
+    icon?.colorFilter = SimpleColorFilter(avatarColorPair.foregroundColor)
+  }
+
+  override fun draw(canvas: Canvas) {
+    if (icon == null) return
+
+    super.draw(canvas)
+    icon?.draw(canvas)
+  }
+
+  override fun setAlpha(alpha: Int) {
+    super.setAlpha(alpha)
+    icon?.alpha = alpha
+    invalidateSelf()
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/fallback/FallbackAvatarImage.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/fallback/FallbackAvatarImage.kt
new file mode 100644
index 0000000000..324ff924dd
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/fallback/FallbackAvatarImage.kt
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.avatar.fallback
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.TextUnitType
+import androidx.compose.ui.unit.dp
+import org.signal.core.ui.Previews
+import org.signal.core.ui.SignalPreview
+import org.signal.core.util.DimensionUnit
+import org.thoughtcrime.securesms.avatar.AvatarRenderer
+import org.thoughtcrime.securesms.avatar.Avatars
+import org.thoughtcrime.securesms.conversation.colors.AvatarColor
+import org.thoughtcrime.securesms.conversation.colors.AvatarColorPair
+
+@Composable
+fun FallbackAvatarImage(
+  fallbackAvatar: FallbackAvatar,
+  modifier: Modifier = Modifier,
+  shape: Shape = CircleShape
+) {
+  if (fallbackAvatar is FallbackAvatar.Transparent) {
+    Box(modifier = modifier)
+    return
+  }
+
+  val context = LocalContext.current
+  val colorPair = remember(fallbackAvatar) {
+    AvatarColorPair.create(context, fallbackAvatar.color)
+  }
+
+  BoxWithConstraints(
+    contentAlignment = Alignment.Center,
+    modifier = modifier
+      .background(Color(colorPair.backgroundColor), shape)
+  ) {
+    when (fallbackAvatar) {
+      is FallbackAvatar.Resource -> {
+        val size = remember(maxWidth) {
+          FallbackAvatar.getSizeByDp(maxWidth)
+        }
+
+        val padding = remember(maxWidth) {
+          ((maxWidth.value - (maxWidth.value * FallbackAvatar.ICON_TO_BACKGROUND_SCALE)) / 2).dp
+        }
+
+        Icon(
+          painter = painterResource(fallbackAvatar.getIconBySize(size)),
+          contentDescription = null,
+          tint = Color(colorPair.foregroundColor),
+          modifier = Modifier
+            .fillMaxSize()
+            .padding(padding)
+        )
+      }
+
+      is FallbackAvatar.Text -> {
+        val size = DimensionUnit.DP.toPixels(maxWidth.value) * 0.8f
+        val textSize = DimensionUnit.PIXELS.toDp(Avatars.getTextSizeForLength(context, fallbackAvatar.content, size, size))
+
+        // TODO [alex] -- Handle emoji
+
+        Text(
+          text = fallbackAvatar.content,
+          color = Color(colorPair.foregroundColor),
+          fontSize = TextUnit(textSize, TextUnitType.Sp),
+          fontFamily = FontFamily(AvatarRenderer.getTypeface(context))
+        )
+      }
+      FallbackAvatar.Transparent -> {}
+    }
+  }
+}
+
+@SignalPreview
+@Composable
+fun FallbackAvatarImagePreview() {
+  Previews.Preview {
+    Column {
+      Text(text = "Compose - Large")
+      FallbackAvatarImage(
+        fallbackAvatar = FallbackAvatar.Text("AE", AvatarColor.A100),
+        modifier = Modifier.size(160.dp)
+      )
+      Text(text = "Compose - Medium")
+      FallbackAvatarImage(
+        fallbackAvatar = FallbackAvatar.Text("AE", AvatarColor.A100),
+        modifier = Modifier.size(64.dp)
+      )
+      Text(text = "Compose - Small")
+      FallbackAvatarImage(
+        fallbackAvatar = FallbackAvatar.Text("AE", AvatarColor.A100),
+        modifier = Modifier.size(24.dp)
+      )
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt
index 7b95255e1a..745a7db6ac 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt
@@ -31,7 +31,6 @@ import org.thoughtcrime.securesms.groups.ParcelableGroupId
 import org.thoughtcrime.securesms.mediasend.AvatarSelectionActivity
 import org.thoughtcrime.securesms.mediasend.Media
 import org.thoughtcrime.securesms.mediasend.camerax.CameraXUtil
-import org.thoughtcrime.securesms.permissions.PermissionCompat
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
@@ -243,18 +242,8 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
 
   @Suppress("DEPRECATION")
   private fun openGallery() {
-    Permissions.with(this)
-      .request(*PermissionCompat.forImages())
-      .ifNecessary()
-      .onAllGranted {
-        val intent = AvatarSelectionActivity.getIntentForGallery(requireContext())
-        startActivityForResult(intent, REQUEST_CODE_SELECT_IMAGE)
-      }
-      .onAnyDenied {
-        Toast.makeText(requireContext(), R.string.AvatarSelectionBottomSheetDialogFragment__viewing_your_gallery_requires_the_storage_permission, Toast.LENGTH_SHORT)
-          .show()
-      }
-      .execute()
+    val intent = AvatarSelectionActivity.getIntentForGallery(requireContext())
+    startActivityForResult(intent, REQUEST_CODE_SELECT_IMAGE)
   }
 
   @Deprecated("Deprecated in Java")
diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/view/AvatarView.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/view/AvatarView.kt
index f44c8ca9e9..66d68f3b9f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/avatar/view/AvatarView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/view/AvatarView.kt
@@ -87,8 +87,8 @@ class AvatarView @JvmOverloads constructor(
     avatar.setRecipient(recipient)
   }
 
-  fun setFallbackPhotoProvider(fallbackPhotoProvider: Recipient.FallbackPhotoProvider) {
-    avatar.setFallbackPhotoProvider(fallbackPhotoProvider)
+  fun setFallbackAvatarProvider(fallbackAvatarProvider: AvatarImageView.FallbackAvatarProvider?) {
+    avatar.setFallbackAvatarProvider(fallbackAvatarProvider)
   }
 
   fun disableQuickContact() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java
index bcd2778ab7..c6eda98411 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java
@@ -28,7 +28,7 @@
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.registration.fragments.RestoreBackupFragment;
+import org.thoughtcrime.securesms.restore.restorelocalbackup.PassphraseAsYouTypeFormatter;
 import org.thoughtcrime.securesms.service.LocalBackupListener;
 import org.thoughtcrime.securesms.util.BackupUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -170,7 +170,7 @@ public static void showVerifyBackupPassphraseDialog(@NonNull Context context) {
     Button positiveButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
     positiveButton.setEnabled(false);
 
-    RestoreBackupFragment.PassphraseAsYouTypeFormatter formatter = new RestoreBackupFragment.PassphraseAsYouTypeFormatter();
+    PassphraseAsYouTypeFormatter formatter = new PassphraseAsYouTypeFormatter();
 
     prompt.addTextChangedListener(new AfterTextChanged(editable -> {
         formatter.afterTextChanged(editable);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java
index 968bb928fc..f4d2382a10 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.backup;
 
 import android.content.Context;
+import android.os.Build;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -23,7 +24,7 @@ private BackupPassphrase() {
     String passphrase          = TextSecurePreferences.getBackupPassphrase(context);
     String encryptedPassphrase = TextSecurePreferences.getEncryptedBackupPassphrase(context);
 
-    if (passphrase == null && encryptedPassphrase == null) {
+    if (Build.VERSION.SDK_INT < 23 || (passphrase == null && encryptedPassphrase == null)) {
       return stripSpaces(passphrase);
     }
 
@@ -39,7 +40,7 @@ private BackupPassphrase() {
   }
 
   public static void set(@NonNull Context context, @Nullable String passphrase) {
-    if (passphrase == null) {
+    if (passphrase == null || Build.VERSION.SDK_INT < 23) {
       TextSecurePreferences.setBackupPassphrase(context, passphrase);
       TextSecurePreferences.setEncryptedBackupPassphrase(context, null);
     } else {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
index 54d9e7fe6f..66e2154385 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
@@ -44,7 +44,7 @@
 import org.thoughtcrime.securesms.database.SignedPreKeyTable;
 import org.thoughtcrime.securesms.database.StickerTable;
 import org.thoughtcrime.securesms.database.model.AvatarPickerDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
@@ -234,7 +234,7 @@ private static long calculateCount(@NonNull Context context, @NonNull SQLiteData
 
     count += TextSecurePreferences.getPreferencesToSaveToBackupCount(context);
 
-    KeyValueDataSet dataSet = KeyValueDatabase.getInstance(ApplicationDependencies.getApplication())
+    KeyValueDataSet dataSet = KeyValueDatabase.getInstance(AppDependencies.getApplication())
                                               .getDataSet();
     for (String key : SignalStore.getKeysToIncludeInBackup()) {
       if (dataSet.containsKey(key)) {
@@ -531,7 +531,7 @@ private static int exportKeyValues(@NonNull BackupFrameOutputStream outputStream
                                      long estimatedCount,
                                      BackupCancellationSignal cancellationSignal) throws IOException
   {
-    KeyValueDataSet dataSet = KeyValueDatabase.getInstance(ApplicationDependencies.getApplication())
+    KeyValueDataSet dataSet = KeyValueDatabase.getInstance(AppDependencies.getApplication())
                                               .getDataSet();
 
     for (String key : keysToIncludeInBackup) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java
index 6cb122097e..87750c3f28 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java
@@ -33,13 +33,12 @@
 import org.thoughtcrime.securesms.database.KeyValueDatabase;
 import org.thoughtcrime.securesms.database.SearchTable;
 import org.thoughtcrime.securesms.database.StickerTable;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.BackupUtil;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.SecurePreferenceManager;
 import org.thoughtcrime.securesms.util.Util;
 
@@ -103,7 +102,7 @@ public static void importFile(@NonNull Context context, @NonNull AttachmentSecre
   {
     int count = 0;
 
-    SQLiteDatabase keyValueDatabase = KeyValueDatabase.getInstance(ApplicationDependencies.getApplication()).getSqlCipherDatabase();
+    SQLiteDatabase keyValueDatabase = KeyValueDatabase.getInstance(AppDependencies.getApplication()).getSqlCipherDatabase();
 
     db.setForeignKeyConstraintsEnabled(false);
     db.beginTransaction();
@@ -292,7 +291,7 @@ private static void processKeyValue(KeyValue keyValue) {
       return;
     }
 
-    KeyValueDatabase.getInstance(ApplicationDependencies.getApplication()).writeDataSet(dataSet, Collections.emptyList());
+    KeyValueDatabase.getInstance(AppDependencies.getApplication()).writeDataSet(dataSet, Collections.emptyList());
   }
 
   private static final List<String> defaultSharedPreferencesFileNames = Arrays.asList(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
index 856956270b..590dde5376 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
@@ -5,20 +5,28 @@
 
 package org.thoughtcrime.securesms.backup.v2
 
+import androidx.annotation.WorkerThread
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.greenrobot.eventbus.EventBus
 import org.signal.core.util.Base64
 import org.signal.core.util.EventTimer
+import org.signal.core.util.fullWalCheckpoint
 import org.signal.core.util.logging.Log
+import org.signal.core.util.money.FiatMoney
 import org.signal.core.util.withinTransaction
 import org.signal.libsignal.messagebackup.MessageBackup
 import org.signal.libsignal.messagebackup.MessageBackup.ValidationResult
 import org.signal.libsignal.messagebackup.MessageBackupKey
 import org.signal.libsignal.protocol.ServiceId.Aci
+import org.signal.libsignal.zkgroup.backups.BackupLevel
 import org.signal.libsignal.zkgroup.profiles.ProfileKey
+import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.attachments.Attachment
 import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.attachments.Cdn
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment
-import org.thoughtcrime.securesms.backup.v2.BackupRepository.getThumbnailMediaName
 import org.thoughtcrime.securesms.backup.v2.database.ChatItemImportInserter
 import org.thoughtcrime.securesms.backup.v2.database.clearAllDataForBackupRestore
 import org.thoughtcrime.securesms.backup.v2.processor.AccountDataProcessor
@@ -26,18 +34,29 @@ import org.thoughtcrime.securesms.backup.v2.processor.AdHocCallBackupProcessor
 import org.thoughtcrime.securesms.backup.v2.processor.ChatBackupProcessor
 import org.thoughtcrime.securesms.backup.v2.processor.ChatItemBackupProcessor
 import org.thoughtcrime.securesms.backup.v2.processor.RecipientBackupProcessor
+import org.thoughtcrime.securesms.backup.v2.processor.StickerBackupProcessor
 import org.thoughtcrime.securesms.backup.v2.proto.BackupInfo
 import org.thoughtcrime.securesms.backup.v2.stream.BackupExportWriter
 import org.thoughtcrime.securesms.backup.v2.stream.EncryptedBackupReader
 import org.thoughtcrime.securesms.backup.v2.stream.EncryptedBackupWriter
 import org.thoughtcrime.securesms.backup.v2.stream.PlainTextBackupReader
 import org.thoughtcrime.securesms.backup.v2.stream.PlainTextBackupWriter
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsType
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsTypeFeature
+import org.thoughtcrime.securesms.components.settings.app.subscription.RecurringInAppPaymentRepository
+import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider
+import org.thoughtcrime.securesms.crypto.DatabaseSecretProvider
+import org.thoughtcrime.securesms.database.DistributionListTables
+import org.thoughtcrime.securesms.database.KeyValueDatabase
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.jobs.RequestGroupV2InfoJob
+import org.thoughtcrime.securesms.keyvalue.KeyValueStore
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.util.toMillis
 import org.whispersystems.signalservice.api.NetworkResult
 import org.whispersystems.signalservice.api.StatusCodeErrorAction
 import org.whispersystems.signalservice.api.archive.ArchiveGetMediaItemsResponse
@@ -53,84 +72,181 @@ import org.whispersystems.signalservice.api.messages.SignalServiceAttachment.Pro
 import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import org.whispersystems.signalservice.internal.crypto.PaddingInputStream
+import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration
 import org.whispersystems.signalservice.internal.push.http.ResumableUploadSpec
 import java.io.ByteArrayOutputStream
 import java.io.File
+import java.io.IOException
 import java.io.InputStream
 import java.io.OutputStream
+import java.math.BigDecimal
+import java.time.ZonedDateTime
+import java.util.Currency
+import java.util.Locale
 import kotlin.time.Duration.Companion.milliseconds
 
 object BackupRepository {
 
   private val TAG = Log.tag(BackupRepository::class.java)
   private const val VERSION = 1L
+  private const val MAIN_DB_SNAPSHOT_NAME = "signal-snapshot.db"
+  private const val KEYVALUE_DB_SNAPSHOT_NAME = "key-value-snapshot.db"
 
   private val resetInitializedStateErrorAction: StatusCodeErrorAction = { error ->
     when (error.code) {
       401 -> {
         Log.i(TAG, "Resetting initialized state due to 401.")
-        SignalStore.backup().backupsInitialized = false
+        SignalStore.backup.backupsInitialized = false
       }
+
       403 -> {
         Log.i(TAG, "Bad auth credential. Clearing stored credentials.")
-        SignalStore.backup().clearAllCredentials()
+        SignalStore.backup.clearAllCredentials()
       }
     }
   }
 
-  fun export(outputStream: OutputStream, append: (ByteArray) -> Unit, plaintext: Boolean = false) {
-    val eventTimer = EventTimer()
-    val writer: BackupExportWriter = if (plaintext) {
-      PlainTextBackupWriter(outputStream)
-    } else {
-      EncryptedBackupWriter(
-        key = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey(),
-        aci = SignalStore.account().aci!!,
-        outputStream = outputStream,
-        append = append
+  @WorkerThread
+  fun turnOffAndDeleteBackup() {
+    RecurringInAppPaymentRepository.cancelActiveSubscriptionSync(InAppPaymentSubscriberRecord.Type.BACKUP)
+    SignalStore.backup.areBackupsEnabled = false
+    SignalStore.backup.backupTier = null
+  }
+
+  private fun createSignalDatabaseSnapshot(): SignalDatabase {
+    // Need to do a WAL checkpoint to ensure that the database file we're copying has all pending writes
+    if (!SignalDatabase.rawDatabase.fullWalCheckpoint()) {
+      Log.w(TAG, "Failed to checkpoint WAL for main database! Not guaranteed to be using the most recent data.")
+    }
+
+    // We make a copy of the database within a transaction to ensure that no writes occur while we're copying the file
+    return SignalDatabase.rawDatabase.withinTransaction {
+      val context = AppDependencies.application
+
+      val existingDbFile = context.getDatabasePath(SignalDatabase.DATABASE_NAME)
+      val targetFile = File(existingDbFile.parentFile, MAIN_DB_SNAPSHOT_NAME)
+
+      try {
+        existingDbFile.copyTo(targetFile, overwrite = true)
+      } catch (e: IOException) {
+        // TODO [backup] Gracefully handle this error
+        throw IllegalStateException("Failed to copy database file!", e)
+      }
+
+      SignalDatabase(
+        context = context,
+        databaseSecret = DatabaseSecretProvider.getOrCreateDatabaseSecret(context),
+        attachmentSecret = AttachmentSecretProvider.getInstance(context).getOrCreateAttachmentSecret(),
+        name = MAIN_DB_SNAPSHOT_NAME
       )
     }
+  }
+
+  private fun createSignalStoreSnapshot(): SignalStore {
+    val context = AppDependencies.application
+
+    // Need to do a WAL checkpoint to ensure that the database file we're copying has all pending writes
+    if (!KeyValueDatabase.getInstance(context).writableDatabase.fullWalCheckpoint()) {
+      Log.w(TAG, "Failed to checkpoint WAL for KeyValueDatabase! Not guaranteed to be using the most recent data.")
+    }
 
-    val exportState = ExportState(backupTime = System.currentTimeMillis(), allowMediaBackup = true)
+    // We make a copy of the database within a transaction to ensure that no writes occur while we're copying the file
+    return KeyValueDatabase.getInstance(context).writableDatabase.withinTransaction {
+      val existingDbFile = context.getDatabasePath(KeyValueDatabase.DATABASE_NAME)
+      val targetFile = File(existingDbFile.parentFile, KEYVALUE_DB_SNAPSHOT_NAME)
 
-    writer.use {
-      writer.write(
-        BackupInfo(
-          version = VERSION,
-          backupTimeMs = exportState.backupTime
+      try {
+        existingDbFile.copyTo(targetFile, overwrite = true)
+      } catch (e: IOException) {
+        // TODO [backup] Gracefully handle this error
+        throw IllegalStateException("Failed to copy database file!", e)
+      }
+
+      val db = KeyValueDatabase.createWithName(context, KEYVALUE_DB_SNAPSHOT_NAME)
+      SignalStore(KeyValueStore(db))
+    }
+  }
+
+  private fun deleteDatabaseSnapshot() {
+    val targetFile = AppDependencies.application.getDatabasePath(MAIN_DB_SNAPSHOT_NAME)
+    if (!targetFile.delete()) {
+      Log.w(TAG, "Failed to delete main database snapshot!")
+    }
+  }
+
+  private fun deleteSignalStoreSnapshot() {
+    val targetFile = AppDependencies.application.getDatabasePath(KEYVALUE_DB_SNAPSHOT_NAME)
+    if (!targetFile.delete()) {
+      Log.w(TAG, "Failed to delete key value database snapshot!")
+    }
+  }
+
+  fun export(outputStream: OutputStream, append: (ByteArray) -> Unit, plaintext: Boolean = false) {
+    val eventTimer = EventTimer()
+    val dbSnapshot: SignalDatabase = createSignalDatabaseSnapshot()
+    val signalStoreSnapshot: SignalStore = createSignalStoreSnapshot()
+
+    try {
+      val writer: BackupExportWriter = if (plaintext) {
+        PlainTextBackupWriter(outputStream)
+      } else {
+        EncryptedBackupWriter(
+          key = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey(),
+          aci = SignalStore.account.aci!!,
+          outputStream = outputStream,
+          append = append
         )
-      )
-      // Note: Without a transaction, we may export inconsistent state. But because we have a transaction,
-      // writes from other threads are blocked. This is something to think more about.
-      SignalDatabase.rawDatabase.withinTransaction {
-        AccountDataProcessor.export {
-          writer.write(it)
-          eventTimer.emit("account")
-        }
+      }
 
-        RecipientBackupProcessor.export(exportState) {
-          writer.write(it)
-          eventTimer.emit("recipient")
-        }
+      val exportState = ExportState(backupTime = System.currentTimeMillis(), allowMediaBackup = SignalStore.backup.backsUpMedia)
 
-        ChatBackupProcessor.export(exportState) { frame ->
-          writer.write(frame)
-          eventTimer.emit("thread")
-        }
+      writer.use {
+        writer.write(
+          BackupInfo(
+            version = VERSION,
+            backupTimeMs = exportState.backupTime
+          )
+        )
+        // Note: Without a transaction, we may export inconsistent state. But because we have a transaction,
+        // writes from other threads are blocked. This is something to think more about.
+        dbSnapshot.rawWritableDatabase.withinTransaction {
+          AccountDataProcessor.export(dbSnapshot, signalStoreSnapshot) {
+            writer.write(it)
+            eventTimer.emit("account")
+          }
 
-        AdHocCallBackupProcessor.export { frame ->
-          writer.write(frame)
-          eventTimer.emit("call")
-        }
+          RecipientBackupProcessor.export(dbSnapshot, signalStoreSnapshot, exportState) {
+            writer.write(it)
+            eventTimer.emit("recipient")
+          }
+
+          ChatBackupProcessor.export(dbSnapshot, exportState) { frame ->
+            writer.write(frame)
+            eventTimer.emit("thread")
+          }
+
+          AdHocCallBackupProcessor.export(dbSnapshot) { frame ->
+            writer.write(frame)
+            eventTimer.emit("call")
+          }
+
+          StickerBackupProcessor.export(dbSnapshot) { frame ->
+            writer.write(frame)
+            eventTimer.emit("sticker-pack")
+          }
 
-        ChatItemBackupProcessor.export(exportState) { frame ->
-          writer.write(frame)
-          eventTimer.emit("message")
+          ChatItemBackupProcessor.export(dbSnapshot, exportState) { frame ->
+            writer.write(frame)
+            eventTimer.emit("message")
+          }
         }
       }
-    }
 
-    Log.d(TAG, "export() ${eventTimer.stop().summary}")
+      Log.d(TAG, "export() ${eventTimer.stop().summary}")
+    } finally {
+      deleteDatabaseSnapshot()
+      deleteSignalStoreSnapshot()
+    }
   }
 
   fun export(plaintext: Boolean = false): ByteArray {
@@ -140,7 +256,7 @@ object BackupRepository {
   }
 
   fun validate(length: Long, inputStreamFactory: () -> InputStream, selfData: SelfData): ValidationResult {
-    val masterKey = SignalStore.svr().getOrCreateMasterKey()
+    val masterKey = SignalStore.svr.getOrCreateMasterKey()
     val key = MessageBackupKey(masterKey.serialize(), Aci.parseFromBinary(selfData.aci.toByteArray()))
 
     return MessageBackup.validate(key, MessageBackup.Purpose.REMOTE_BACKUP, inputStreamFactory, length)
@@ -149,15 +265,15 @@ object BackupRepository {
   fun import(length: Long, inputStreamFactory: () -> InputStream, selfData: SelfData, plaintext: Boolean = false) {
     val eventTimer = EventTimer()
 
-    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
 
     val frameReader = if (plaintext) {
-      PlainTextBackupReader(inputStreamFactory())
+      PlainTextBackupReader(inputStreamFactory(), length)
     } else {
       EncryptedBackupReader(
         key = backupKey,
         aci = selfData.aci,
-        streamLength = length,
+        length = length,
         dataStream = inputStreamFactory
       )
     }
@@ -180,16 +296,21 @@ object BackupRepository {
       SignalDatabase.threads.clearAllDataForBackupRestore()
       SignalDatabase.messages.clearAllDataForBackupRestore()
       SignalDatabase.attachments.clearAllDataForBackupRestore()
+      SignalDatabase.stickers.clearAllDataForBackupRestore()
 
       // Add back self after clearing data
       val selfId: RecipientId = SignalDatabase.recipients.getAndPossiblyMerge(selfData.aci, selfData.pni, selfData.e164, pniVerified = true, changeSelf = true)
       SignalDatabase.recipients.setProfileKey(selfId, selfData.profileKey)
       SignalDatabase.recipients.setProfileSharing(selfId, true)
 
+      // Add back my story after clearing data
+      DistributionListTables.insertInitialDistributionListAtCreationTime(it)
+
       eventTimer.emit("setup")
       val backupState = BackupState(backupKey)
       val chatItemInserter: ChatItemImportInserter = ChatItemBackupProcessor.beginImport(backupState)
 
+      val totalLength = frameReader.getStreamLength()
       for (frame in frameReader) {
         when {
           frame.account != null -> {
@@ -212,6 +333,11 @@ object BackupRepository {
             eventTimer.emit("call")
           }
 
+          frame.stickerPack != null -> {
+            StickerBackupProcessor.import(frame.stickerPack)
+            eventTimer.emit("sticker-pack")
+          }
+
           frame.chatItem != null -> {
             chatItemInserter.insert(frame.chatItem)
             eventTimer.emit("chatItem")
@@ -220,6 +346,7 @@ object BackupRepository {
 
           else -> Log.w(TAG, "Unrecognized frame")
         }
+        EventBus.getDefault().post(RestoreV2Event(RestoreV2Event.Type.PROGRESS_RESTORE, frameReader.getBytesRead(), totalLength))
       }
 
       if (chatItemInserter.flush()) {
@@ -235,7 +362,7 @@ object BackupRepository {
     while (groups.hasNext()) {
       val group = groups.next()
       if (group.id.isV2) {
-        ApplicationDependencies.getJobManager().add(RequestGroupV2InfoJob(group.id as GroupId.V2))
+        AppDependencies.jobManager.add(RequestGroupV2InfoJob(group.id as GroupId.V2))
       }
     }
 
@@ -243,8 +370,8 @@ object BackupRepository {
   }
 
   fun listRemoteMediaObjects(limit: Int, cursor: String? = null): NetworkResult<ArchiveGetMediaItemsResponse> {
-    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
-    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+    val api = AppDependencies.signalServiceAccountManager.archiveApi
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
 
     return initBackupAndFetchAuth(backupKey)
       .then { credential ->
@@ -253,8 +380,8 @@ object BackupRepository {
   }
 
   fun getRemoteBackupUsedSpace(): NetworkResult<Long?> {
-    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
-    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+    val api = AppDependencies.signalServiceAccountManager.archiveApi
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
 
     return initBackupAndFetchAuth(backupKey)
       .then { credential ->
@@ -263,12 +390,27 @@ object BackupRepository {
       }
   }
 
+  private fun getBackupTier(): NetworkResult<MessageBackupTier> {
+    val api = AppDependencies.signalServiceAccountManager.archiveApi
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
+
+    return initBackupAndFetchAuth(backupKey)
+      .map { credential ->
+        val zkCredential = api.getZkCredential(backupKey, credential)
+        if (zkCredential.backupLevel == BackupLevel.MEDIA) {
+          MessageBackupTier.PAID
+        } else {
+          MessageBackupTier.FREE
+        }
+      }
+  }
+
   /**
    * Returns an object with details about the remote backup state.
    */
   fun getRemoteBackupState(): NetworkResult<BackupMetadata> {
-    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
-    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+    val api = AppDependencies.signalServiceAccountManager.archiveApi
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
 
     return initBackupAndFetchAuth(backupKey)
       .then { credential ->
@@ -294,8 +436,8 @@ object BackupRepository {
    * @return True if successful, otherwise false.
    */
   fun uploadBackupFile(backupStream: InputStream, backupStreamLength: Long): Boolean {
-    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
-    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+    val api = AppDependencies.signalServiceAccountManager.archiveApi
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
 
     return initBackupAndFetchAuth(backupKey)
       .then { credential ->
@@ -316,8 +458,8 @@ object BackupRepository {
   }
 
   fun downloadBackupFile(destination: File, listener: ProgressListener? = null): Boolean {
-    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
-    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+    val api = AppDependencies.signalServiceAccountManager.archiveApi
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
 
     return initBackupAndFetchAuth(backupKey)
       .then { credential ->
@@ -326,17 +468,35 @@ object BackupRepository {
       .then { info -> getCdnReadCredentials(info.cdn ?: Cdn.CDN_3.cdnNumber).map { it.headers to info } }
       .map { pair ->
         val (cdnCredentials, info) = pair
-        val messageReceiver = ApplicationDependencies.getSignalServiceMessageReceiver()
+        val messageReceiver = AppDependencies.signalServiceMessageReceiver
         messageReceiver.retrieveBackup(info.cdn!!, cdnCredentials, "backups/${info.backupDir}/${info.backupName}", destination, listener)
       } is NetworkResult.Success
   }
 
+  fun getBackupFileLastModified(): NetworkResult<ZonedDateTime?> {
+    val api = AppDependencies.signalServiceAccountManager.archiveApi
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
+
+    return initBackupAndFetchAuth(backupKey)
+      .then { credential ->
+        api.getBackupInfo(backupKey, credential)
+      }
+      .then { info -> getCdnReadCredentials(info.cdn ?: Cdn.CDN_3.cdnNumber).map { it.headers to info } }
+      .then { pair ->
+        val (cdnCredentials, info) = pair
+        val messageReceiver = AppDependencies.signalServiceMessageReceiver
+        NetworkResult.fromFetch {
+          messageReceiver.getCdnLastModifiedTime(info.cdn!!, cdnCredentials, "backups/${info.backupDir}/${info.backupName}")
+        }
+      }
+  }
+
   /**
    * Returns an object with details about the remote backup state.
    */
   fun debugGetArchivedMediaState(): NetworkResult<List<ArchiveGetMediaItemsResponse.StoredMediaObject>> {
-    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
-    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+    val api = AppDependencies.signalServiceAccountManager.archiveApi
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
 
     return initBackupAndFetchAuth(backupKey)
       .then { credential ->
@@ -348,8 +508,8 @@ object BackupRepository {
    * Retrieves an upload spec that can be used to upload attachment media.
    */
   fun getMediaUploadSpec(secretKey: ByteArray? = null): NetworkResult<ResumableUploadSpec> {
-    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
-    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+    val api = AppDependencies.signalServiceAccountManager.archiveApi
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
 
     return initBackupAndFetchAuth(backupKey)
       .then { credential ->
@@ -361,8 +521,8 @@ object BackupRepository {
   }
 
   fun archiveThumbnail(thumbnailAttachment: Attachment, parentAttachment: DatabaseAttachment): NetworkResult<ArchiveMediaResponse> {
-    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
-    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+    val api = AppDependencies.signalServiceAccountManager.archiveApi
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
     val request = thumbnailAttachment.toArchiveMediaRequest(parentAttachment.getThumbnailMediaName(), backupKey)
 
     return initBackupAndFetchAuth(backupKey)
@@ -376,8 +536,8 @@ object BackupRepository {
   }
 
   fun archiveMedia(attachment: DatabaseAttachment): NetworkResult<Unit> {
-    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
-    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+    val api = AppDependencies.signalServiceAccountManager.archiveApi
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
 
     return initBackupAndFetchAuth(backupKey)
       .then { credential ->
@@ -399,8 +559,8 @@ object BackupRepository {
   }
 
   fun archiveMedia(databaseAttachments: List<DatabaseAttachment>): NetworkResult<BatchArchiveMediaResult> {
-    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
-    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+    val api = AppDependencies.signalServiceAccountManager.archiveApi
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
 
     return initBackupAndFetchAuth(backupKey)
       .then { credential ->
@@ -439,8 +599,8 @@ object BackupRepository {
   }
 
   fun deleteArchivedMedia(attachments: List<DatabaseAttachment>): NetworkResult<Unit> {
-    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
-    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+    val api = AppDependencies.signalServiceAccountManager.archiveApi
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
 
     val mediaToDelete = attachments
       .filter { it.archiveMediaId != null }
@@ -471,8 +631,8 @@ object BackupRepository {
   }
 
   fun deleteAbandonedMediaObjects(mediaObjects: Collection<ArchivedMediaObject>): NetworkResult<Unit> {
-    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
-    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+    val api = AppDependencies.signalServiceAccountManager.archiveApi
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
 
     val mediaToDelete = mediaObjects
       .map {
@@ -499,8 +659,8 @@ object BackupRepository {
   }
 
   fun debugDeleteAllArchivedMedia(): NetworkResult<Unit> {
-    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
-    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+    val api = AppDependencies.signalServiceAccountManager.archiveApi
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
 
     return debugGetArchivedMediaState()
       .then { archivedMedia ->
@@ -536,13 +696,13 @@ object BackupRepository {
    * Retrieve credentials for reading from the backup cdn.
    */
   fun getCdnReadCredentials(cdnNumber: Int): NetworkResult<GetArchiveCdnCredentialsResponse> {
-    val cached = SignalStore.backup().cdnReadCredentials
+    val cached = SignalStore.backup.cdnReadCredentials
     if (cached != null) {
       return NetworkResult.Success(cached)
     }
 
-    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
-    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+    val api = AppDependencies.signalServiceAccountManager.archiveApi
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
 
     return initBackupAndFetchAuth(backupKey)
       .then { credential ->
@@ -554,20 +714,41 @@ object BackupRepository {
       }
       .also {
         if (it is NetworkResult.Success) {
-          SignalStore.backup().cdnReadCredentials = it.result
+          SignalStore.backup.cdnReadCredentials = it.result
         }
       }
       .also { Log.i(TAG, "getCdnReadCredentialsResult: $it") }
   }
 
+  fun restoreBackupTier(): MessageBackupTier? {
+    // TODO: more complete error handling
+    try {
+      val lastModified = getBackupFileLastModified().successOrThrow()
+      if (lastModified != null) {
+        SignalStore.backup.lastBackupTime = lastModified.toMillis()
+      }
+    } catch (e: Exception) {
+      Log.i(TAG, "Could not check for backup file.", e)
+      SignalStore.backup.backupTier = null
+      return null
+    }
+    SignalStore.backup.backupTier = try {
+      getBackupTier().successOrThrow()
+    } catch (e: Exception) {
+      Log.i(TAG, "Could not retrieve backup tier.", e)
+      null
+    }
+    return SignalStore.backup.backupTier
+  }
+
   /**
    * Retrieves backupDir and mediaDir, preferring cached value if available.
    *
    * These will only ever change if the backup expires.
    */
   fun getCdnBackupDirectories(): NetworkResult<BackupDirectories> {
-    val cachedBackupDirectory = SignalStore.backup().cachedBackupDirectory
-    val cachedBackupMediaDirectory = SignalStore.backup().cachedBackupMediaDirectory
+    val cachedBackupDirectory = SignalStore.backup.cachedBackupDirectory
+    val cachedBackupMediaDirectory = SignalStore.backup.cachedBackupMediaDirectory
 
     if (cachedBackupDirectory != null && cachedBackupMediaDirectory != null) {
       return NetworkResult.Success(
@@ -578,39 +759,115 @@ object BackupRepository {
       )
     }
 
-    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
-    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+    val api = AppDependencies.signalServiceAccountManager.archiveApi
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
 
     return initBackupAndFetchAuth(backupKey)
       .then { credential ->
         api.getBackupInfo(backupKey, credential).map {
-          SignalStore.backup().usedBackupMediaSpace = it.usedSpace ?: 0L
+          SignalStore.backup.usedBackupMediaSpace = it.usedSpace ?: 0L
           BackupDirectories(it.backupDir!!, it.mediaDir!!)
         }
       }
       .also {
         if (it is NetworkResult.Success) {
-          SignalStore.backup().cachedBackupDirectory = it.result.backupDir
-          SignalStore.backup().cachedBackupMediaDirectory = it.result.mediaDir
+          SignalStore.backup.cachedBackupDirectory = it.result.backupDir
+          SignalStore.backup.cachedBackupMediaDirectory = it.result.mediaDir
         }
       }
   }
 
+  suspend fun getAvailableBackupsTypes(availableBackupTiers: List<MessageBackupTier>): List<MessageBackupsType> {
+    return availableBackupTiers.map { getBackupsType(it) }
+  }
+
+  suspend fun getBackupsType(tier: MessageBackupTier): MessageBackupsType {
+    val backupCurrency = SignalStore.inAppPayments.getSubscriptionCurrency(InAppPaymentSubscriberRecord.Type.BACKUP)
+    return when (tier) {
+      MessageBackupTier.FREE -> getFreeType(backupCurrency)
+      MessageBackupTier.PAID -> getPaidType(backupCurrency)
+    }
+  }
+
+  private fun getFreeType(currency: Currency): MessageBackupsType {
+    return MessageBackupsType(
+      tier = MessageBackupTier.FREE,
+      pricePerMonth = FiatMoney(BigDecimal.ZERO, currency),
+      title = "Text + 30 days of media", // TODO [message-backups] Finalize text (does this come from server?)
+      features = persistentListOf(
+        MessageBackupsTypeFeature(
+          iconResourceId = R.drawable.symbol_thread_compact_bold_16,
+          label = "Full text message backup" // TODO [message-backups] Finalize text (does this come from server?)
+        ),
+        MessageBackupsTypeFeature(
+          iconResourceId = R.drawable.symbol_album_compact_bold_16,
+          label = "Last 30 days of media" // TODO [message-backups] Finalize text (does this come from server?)
+        )
+      )
+    )
+  }
+
+  private suspend fun getPaidType(currency: Currency): MessageBackupsType {
+    val serviceResponse = withContext(Dispatchers.IO) {
+      AppDependencies
+        .donationsService
+        .getDonationsConfiguration(Locale.getDefault())
+    }
+
+    if (serviceResponse.result.isEmpty) {
+      if (serviceResponse.applicationError.isPresent) {
+        throw serviceResponse.applicationError.get()
+      }
+
+      if (serviceResponse.executionError.isPresent) {
+        throw serviceResponse.executionError.get()
+      }
+
+      error("Unhandled error occurred while downloading configuration.")
+    }
+
+    val config = serviceResponse.result.get()
+
+    return MessageBackupsType(
+      tier = MessageBackupTier.PAID,
+      pricePerMonth = FiatMoney(config.currencies[currency.currencyCode.lowercase()]!!.backupSubscription[SubscriptionsConfiguration.BACKUPS_LEVEL]!!, currency),
+      title = "Text + All your media", // TODO [message-backups] Finalize text (does this come from server?)
+      features = persistentListOf(
+        MessageBackupsTypeFeature(
+          iconResourceId = R.drawable.symbol_thread_compact_bold_16,
+          label = "Full text message backup" // TODO [message-backups] Finalize text (does this come from server?)
+        ),
+        MessageBackupsTypeFeature(
+          iconResourceId = R.drawable.symbol_album_compact_bold_16,
+          label = "Full media backup" // TODO [message-backups] Finalize text (does this come from server?)
+        ),
+        MessageBackupsTypeFeature(
+          iconResourceId = R.drawable.symbol_thread_compact_bold_16,
+          label = "1TB of storage (~250K photos)" // TODO [message-backups] Finalize text (does this come from server?)
+        ),
+        MessageBackupsTypeFeature(
+          iconResourceId = R.drawable.symbol_heart_compact_bold_16,
+          label = "Thanks for supporting Signal!" // TODO [message-backups] Finalize text (does this come from server?)
+        )
+      )
+    )
+  }
+
   /**
    * Ensures that the backupId has been reserved and that your public key has been set, while also returning an auth credential.
    * Should be the basis of all backup operations.
    */
   private fun initBackupAndFetchAuth(backupKey: BackupKey): NetworkResult<ArchiveServiceCredential> {
-    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
+    val api = AppDependencies.signalServiceAccountManager.archiveApi
 
-    return if (SignalStore.backup().backupsInitialized) {
+    return if (SignalStore.backup.backupsInitialized) {
       getAuthCredential().runOnStatusCodeError(resetInitializedStateErrorAction)
     } else {
       return api
         .triggerBackupIdReservation(backupKey)
         .then { getAuthCredential() }
         .then { credential -> api.setPublicKey(backupKey, credential).map { credential } }
-        .runIfSuccessful { SignalStore.backup().backupsInitialized = true }
+        .runIfSuccessful { SignalStore.backup.backupsInitialized = true }
         .runOnStatusCodeError(resetInitializedStateErrorAction)
     }
   }
@@ -621,7 +878,7 @@ object BackupRepository {
   private fun getAuthCredential(): NetworkResult<ArchiveServiceCredential> {
     val currentTime = System.currentTimeMillis()
 
-    val credential = SignalStore.backup().credentialsByDay.getForCurrentTime(currentTime.milliseconds)
+    val credential = SignalStore.backup.credentialsByDay.getForCurrentTime(currentTime.milliseconds)
 
     if (credential != null) {
       return NetworkResult.Success(credential)
@@ -629,10 +886,10 @@ object BackupRepository {
 
     Log.w(TAG, "No credentials found for today, need to fetch new ones! This shouldn't happen under normal circumstances. We should ensure the routine fetch is running properly.")
 
-    return ApplicationDependencies.getSignalServiceAccountManager().archiveApi.getServiceCredentials(currentTime).map { result ->
-      SignalStore.backup().addCredentials(result.credentials.toList())
-      SignalStore.backup().clearCredentialsOlderThan(currentTime)
-      SignalStore.backup().credentialsByDay.getForCurrentTime(currentTime.milliseconds)!!
+    return AppDependencies.signalServiceAccountManager.archiveApi.getServiceCredentials(currentTime).map { result ->
+      SignalStore.backup.addCredentials(result.credentials.toList())
+      SignalStore.backup.clearCredentialsOlderThan(currentTime)
+      SignalStore.backup.credentialsByDay.getForCurrentTime(currentTime.milliseconds)!!
     }
   }
 
@@ -688,8 +945,3 @@ class BackupMetadata(
   val usedSpace: Long,
   val mediaCount: Long
 )
-
-enum class MessageBackupTier {
-  FREE,
-  PAID
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRestoreManager.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRestoreManager.kt
index 0a716f3363..132a978a73 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRestoreManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRestoreManager.kt
@@ -11,7 +11,8 @@ import org.thoughtcrime.securesms.attachments.DatabaseAttachment
 import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
-import org.thoughtcrime.securesms.jobs.RestoreAttachmentJob
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.jobs.RestoreAttachmentThumbnailJob
 
 /**
  * Responsible for managing logic around restore prioritization
@@ -28,17 +29,24 @@ object BackupRestoreManager {
   fun prioritizeAttachmentsIfNeeded(messageRecords: List<MessageRecord>) {
     SignalExecutors.BOUNDED.execute {
       synchronized(this) {
-        val restoringAttachments: List<AttachmentId> = messageRecords
+        val restoringAttachments = messageRecords
           .mapNotNull { (it as? MmsMessageRecord?)?.slideDeck?.slides }
           .flatten()
           .mapNotNull { it.asAttachment() as? DatabaseAttachment }
-          .filter { it.transferState == AttachmentTable.TRANSFER_RESTORE_IN_PROGRESS && !reprioritizedAttachments.contains(it.attachmentId) }
-          .map { it.attachmentId }
+          .filter {
+            val needThumbnail = it.thumbnailRestoreState == AttachmentTable.ThumbnailRestoreState.NEEDS_RESTORE && it.transferState == AttachmentTable.TRANSFER_RESTORE_IN_PROGRESS
+            (needThumbnail || it.thumbnailRestoreState == AttachmentTable.ThumbnailRestoreState.IN_PROGRESS) && !reprioritizedAttachments.contains(it.attachmentId)
+          }
+          .map { it.attachmentId to it.mmsId }
+          .toSet()
 
-        reprioritizedAttachments += restoringAttachments
-
-        if (restoringAttachments.isNotEmpty()) {
-          RestoreAttachmentJob.modifyPriorities(restoringAttachments.toSet(), 1)
+        reprioritizedAttachments += restoringAttachments.map { it.first }
+        val thumbnailJobs = restoringAttachments.map {
+          val (attachmentId, mmsId) = it
+          RestoreAttachmentThumbnailJob(attachmentId = attachmentId, messageId = mmsId, highPriority = true)
+        }
+        if (thumbnailJobs.isNotEmpty()) {
+          AppDependencies.jobManager.addAll(thumbnailJobs)
         }
       }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupV2Event.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupV2Event.kt
index 67b3e3745f..8899d674ab 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupV2Event.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupV2Event.kt
@@ -7,6 +7,8 @@ package org.thoughtcrime.securesms.backup.v2
 
 class BackupV2Event(val type: Type, val count: Long, val estimatedTotalCount: Long) {
   enum class Type {
-    PROGRESS_MESSAGES, PROGRESS_ATTACHMENTS, FINISHED
+    PROGRESS_MESSAGES,
+    PROGRESS_ATTACHMENTS,
+    FINISHED
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/MessageBackupTier.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/MessageBackupTier.kt
new file mode 100644
index 0000000000..9111820986
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/MessageBackupTier.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2
+
+import org.signal.core.util.LongSerializer
+
+/**
+ * Serializable enum value for what we think a user's current backup tier is.
+ *
+ * We should not trust the stored value on its own, we should also verify it
+ * against what the server knows, but it is a useful flag that helps avoid a
+ * network call in some cases.
+ */
+enum class MessageBackupTier(val value: Int) {
+  FREE(0),
+  PAID(1);
+
+  companion object Serializer : LongSerializer<MessageBackupTier?> {
+    override fun serialize(data: MessageBackupTier?): Long {
+      return data?.value?.toLong() ?: -1
+    }
+
+    override fun deserialize(data: Long): MessageBackupTier? {
+      return entries.firstOrNull { it.value == data.toInt() }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/RestoreV2Event.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/RestoreV2Event.kt
new file mode 100644
index 0000000000..8183c5173e
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/RestoreV2Event.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2
+
+class RestoreV2Event(val type: Type, val count: Long, val estimatedTotalCount: Long) {
+  enum class Type {
+    PROGRESS_DOWNLOAD,
+    PROGRESS_RESTORE,
+    PROGRESS_MEDIA_RESTORE,
+    FINISHED
+  }
+
+  fun getProgress(): Float {
+    if (estimatedTotalCount == 0L) {
+      return 0f
+    }
+    return count.toFloat() / estimatedTotalCount.toFloat()
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/CallLinkTableBackupExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/CallLinkTableBackupExtensions.kt
index 0b6923eaa5..1b506d03d7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/CallLinkTableBackupExtensions.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/CallLinkTableBackupExtensions.kt
@@ -6,6 +6,7 @@
 package org.thoughtcrime.securesms.backup.v2.database
 
 import android.database.Cursor
+import okio.ByteString
 import okio.ByteString.Companion.toByteString
 import org.signal.core.util.select
 import org.signal.ringrtc.CallLinkRootKey
@@ -63,8 +64,8 @@ class BackupCallLinkIterator(private val cursor: Cursor) : Iterator<BackupRecipi
     return BackupRecipient(
       id = callLink.recipientId.toLong(),
       callLink = CallLink(
-        rootKey = callLink.credentials!!.linkKeyBytes.toByteString(),
-        adminKey = callLink.credentials.adminPassBytes?.toByteString(),
+        rootKey = callLink.credentials?.linkKeyBytes?.toByteString() ?: ByteString.EMPTY,
+        adminKey = callLink.credentials?.adminPassBytes?.toByteString(),
         name = callLink.state.name,
         expirationMs = callLink.state.expiration.toEpochMilli(),
         restrictions = callLink.state.restrictions.toBackup()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/CallTableBackupExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/CallTableBackupExtensions.kt
index 8e2060df94..defe7c8cec 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/CallTableBackupExtensions.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/CallTableBackupExtensions.kt
@@ -38,7 +38,7 @@ fun CallTable.restoreCallLogFromBackup(call: AdHocCall, backupState: BackupState
     CallTable.TYPE to CallTable.Type.serialize(CallTable.Type.AD_HOC_CALL),
     CallTable.DIRECTION to CallTable.Direction.serialize(CallTable.Direction.OUTGOING),
     CallTable.EVENT to CallTable.Event.serialize(event),
-    CallTable.TIMESTAMP to call.startedCallTimestamp
+    CallTable.TIMESTAMP to call.callTimestamp
   )
 
   writableDatabase.insert(CallTable.TABLE_NAME, SQLiteDatabase.CONFLICT_IGNORE, values)
@@ -64,7 +64,7 @@ class CallLogIterator(private val cursor: Cursor) : Iterator<AdHocCall?>, Closea
       callId = callId,
       recipientId = cursor.requireLong(CallTable.PEER),
       state = AdHocCall.State.GENERIC,
-      startedCallTimestamp = cursor.requireLong(CallTable.TIMESTAMP)
+      callTimestamp = cursor.requireLong(CallTable.TIMESTAMP)
     )
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ChatItemExportIterator.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ChatItemExportIterator.kt
index 65a1d231f6..48f161c08b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ChatItemExportIterator.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ChatItemExportIterator.kt
@@ -7,25 +7,33 @@ package org.thoughtcrime.securesms.backup.v2.database
 
 import android.database.Cursor
 import okio.ByteString.Companion.toByteString
+import org.json.JSONArray
+import org.json.JSONException
 import org.signal.core.util.Base64
-import org.signal.core.util.Base64.decode
-import org.signal.core.util.Base64.decodeOrThrow
+import org.signal.core.util.Hex
 import org.signal.core.util.logging.Log
+import org.signal.core.util.orNull
 import org.signal.core.util.requireBlob
 import org.signal.core.util.requireBoolean
 import org.signal.core.util.requireInt
 import org.signal.core.util.requireLong
+import org.signal.core.util.requireLongOrNull
 import org.signal.core.util.requireString
+import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.attachments.Cdn
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment
 import org.thoughtcrime.securesms.backup.v2.BackupRepository.getMediaName
 import org.thoughtcrime.securesms.backup.v2.proto.ChatItem
 import org.thoughtcrime.securesms.backup.v2.proto.ChatUpdateMessage
+import org.thoughtcrime.securesms.backup.v2.proto.ContactAttachment
+import org.thoughtcrime.securesms.backup.v2.proto.ContactMessage
 import org.thoughtcrime.securesms.backup.v2.proto.ExpirationTimerChatUpdate
 import org.thoughtcrime.securesms.backup.v2.proto.FilePointer
 import org.thoughtcrime.securesms.backup.v2.proto.GroupCall
 import org.thoughtcrime.securesms.backup.v2.proto.IndividualCall
+import org.thoughtcrime.securesms.backup.v2.proto.LearnedProfileChatUpdate
 import org.thoughtcrime.securesms.backup.v2.proto.MessageAttachment
+import org.thoughtcrime.securesms.backup.v2.proto.PaymentNotification
 import org.thoughtcrime.securesms.backup.v2.proto.ProfileChangeChatUpdate
 import org.thoughtcrime.securesms.backup.v2.proto.Quote
 import org.thoughtcrime.securesms.backup.v2.proto.Reaction
@@ -34,15 +42,20 @@ import org.thoughtcrime.securesms.backup.v2.proto.SendStatus
 import org.thoughtcrime.securesms.backup.v2.proto.SessionSwitchoverChatUpdate
 import org.thoughtcrime.securesms.backup.v2.proto.SimpleChatUpdate
 import org.thoughtcrime.securesms.backup.v2.proto.StandardMessage
+import org.thoughtcrime.securesms.backup.v2.proto.Sticker
+import org.thoughtcrime.securesms.backup.v2.proto.StickerMessage
 import org.thoughtcrime.securesms.backup.v2.proto.Text
 import org.thoughtcrime.securesms.backup.v2.proto.ThreadMergeChatUpdate
+import org.thoughtcrime.securesms.contactshare.Contact
 import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.database.CallTable
 import org.thoughtcrime.securesms.database.GroupReceiptTable
 import org.thoughtcrime.securesms.database.MessageTable
 import org.thoughtcrime.securesms.database.MessageTypes
+import org.thoughtcrime.securesms.database.PaymentTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.SignalDatabase.Companion.calls
+import org.thoughtcrime.securesms.database.SignalDatabase.Companion.recipients
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatchSet
 import org.thoughtcrime.securesms.database.documents.NetworkFailureSet
 import org.thoughtcrime.securesms.database.model.GroupCallUpdateDetailsUtil
@@ -51,21 +64,29 @@ import org.thoughtcrime.securesms.database.model.Mention
 import org.thoughtcrime.securesms.database.model.ReactionRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
 import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context
+import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
 import org.thoughtcrime.securesms.database.model.databaseprotos.MessageExtras
 import org.thoughtcrime.securesms.database.model.databaseprotos.ProfileChangeDetails
 import org.thoughtcrime.securesms.database.model.databaseprotos.SessionSwitchoverEvent
 import org.thoughtcrime.securesms.database.model.databaseprotos.ThreadMergeEvent
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.linkpreview.LinkPreview
 import org.thoughtcrime.securesms.mms.QuoteModel
+import org.thoughtcrime.securesms.payments.FailureReason
+import org.thoughtcrime.securesms.payments.State
+import org.thoughtcrime.securesms.payments.proto.PaymentMetaData
 import org.thoughtcrime.securesms.util.JsonUtils
 import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import org.whispersystems.signalservice.api.util.UuidUtil
 import org.whispersystems.signalservice.api.util.toByteArray
 import java.io.Closeable
 import java.io.IOException
+import java.util.HashMap
 import java.util.LinkedList
 import java.util.Queue
+import kotlin.jvm.optionals.getOrNull
 import org.thoughtcrime.securesms.backup.v2.proto.BodyRange as BackupBodyRange
+import org.thoughtcrime.securesms.backup.v2.proto.GiftBadge as BackupGiftBadge
 
 /**
  * An iterator for chat items with a clever performance twist: rather than do the extra queries one at a time (for reactions,
@@ -74,7 +95,7 @@ import org.thoughtcrime.securesms.backup.v2.proto.BodyRange as BackupBodyRange
  *
  * All of this complexity is hidden from the user -- they just get a normal iterator interface.
  */
-class ChatItemExportIterator(private val cursor: Cursor, private val batchSize: Int, private val archiveMedia: Boolean) : Iterator<ChatItem>, Closeable {
+class ChatItemExportIterator(private val cursor: Cursor, private val batchSize: Int, private val archiveMedia: Boolean) : Iterator<ChatItem?>, Closeable {
 
   companion object {
     private val TAG = Log.tag(ChatItemExportIterator::class.java)
@@ -88,11 +109,13 @@ class ChatItemExportIterator(private val cursor: Cursor, private val batchSize:
    */
   private val buffer: Queue<ChatItem> = LinkedList()
 
+  private val revisionMap: HashMap<Long, ArrayList<ChatItem>> = HashMap()
+
   override fun hasNext(): Boolean {
     return buffer.isNotEmpty() || (cursor.count > 0 && !cursor.isLast && !cursor.isAfterLast)
   }
 
-  override fun next(): ChatItem {
+  override fun next(): ChatItem? {
     if (buffer.isNotEmpty()) {
       return buffer.remove()
     }
@@ -117,219 +140,109 @@ class ChatItemExportIterator(private val cursor: Cursor, private val batchSize:
       val builder = record.toBasicChatItemBuilder(groupReceiptsById[id])
 
       when {
-        record.remoteDeleted -> builder.remoteDeletedMessage = RemoteDeletedMessage()
-        MessageTypes.isJoinedType(record.type) -> builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.JOINED_SIGNAL))
-        MessageTypes.isIdentityUpdate(record.type) -> builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.IDENTITY_UPDATE))
-        MessageTypes.isIdentityVerified(record.type) -> builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.IDENTITY_VERIFIED))
-        MessageTypes.isIdentityDefault(record.type) -> builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.IDENTITY_DEFAULT))
+        record.remoteDeleted -> {
+          builder.remoteDeletedMessage = RemoteDeletedMessage()
+        }
+        MessageTypes.isJoinedType(record.type) -> {
+          builder.updateMessage = simpleUpdate(SimpleChatUpdate.Type.JOINED_SIGNAL)
+        }
+        MessageTypes.isIdentityUpdate(record.type) -> {
+          builder.updateMessage = simpleUpdate(SimpleChatUpdate.Type.IDENTITY_UPDATE)
+        }
+        MessageTypes.isIdentityVerified(record.type) -> {
+          builder.updateMessage = simpleUpdate(SimpleChatUpdate.Type.IDENTITY_VERIFIED)
+        }
+        MessageTypes.isIdentityDefault(record.type) -> {
+          builder.updateMessage = simpleUpdate(SimpleChatUpdate.Type.IDENTITY_DEFAULT)
+        }
         MessageTypes.isChangeNumber(record.type) -> {
-          builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.CHANGE_NUMBER))
-          builder.sms = false
+          builder.updateMessage = simpleUpdate(SimpleChatUpdate.Type.CHANGE_NUMBER)
         }
         MessageTypes.isBoostRequest(record.type) -> {
-          builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.BOOST_REQUEST))
-          builder.sms = false
-        }
-        MessageTypes.isEndSessionType(record.type) -> builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.END_SESSION))
-        MessageTypes.isChatSessionRefresh(record.type) -> builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.CHAT_SESSION_REFRESH))
-        MessageTypes.isBadDecryptType(record.type) -> builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.BAD_DECRYPT))
-        MessageTypes.isPaymentsActivated(record.type) -> builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.PAYMENTS_ACTIVATED))
-        MessageTypes.isPaymentsRequestToActivate(record.type) -> builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.PAYMENT_ACTIVATION_REQUEST))
+          builder.updateMessage = simpleUpdate(SimpleChatUpdate.Type.BOOST_REQUEST)
+        }
+        MessageTypes.isEndSessionType(record.type) -> {
+          builder.updateMessage = simpleUpdate(SimpleChatUpdate.Type.END_SESSION)
+        }
+        MessageTypes.isChatSessionRefresh(record.type) -> {
+          builder.updateMessage = simpleUpdate(SimpleChatUpdate.Type.CHAT_SESSION_REFRESH)
+        }
+        MessageTypes.isBadDecryptType(record.type) -> {
+          builder.updateMessage = simpleUpdate(SimpleChatUpdate.Type.BAD_DECRYPT)
+        }
+        MessageTypes.isPaymentsActivated(record.type) -> {
+          builder.updateMessage = simpleUpdate(SimpleChatUpdate.Type.PAYMENTS_ACTIVATED)
+        }
+        MessageTypes.isPaymentsRequestToActivate(record.type) -> {
+          builder.updateMessage = simpleUpdate(SimpleChatUpdate.Type.PAYMENT_ACTIVATION_REQUEST)
+        }
         MessageTypes.isExpirationTimerUpdate(record.type) -> {
           builder.updateMessage = ChatUpdateMessage(expirationTimerChange = ExpirationTimerChatUpdate(record.expiresIn.toInt()))
           builder.expiresInMs = 0
         }
         MessageTypes.isProfileChange(record.type) -> {
-          if (record.body == null) continue
-          builder.updateMessage = ChatUpdateMessage(
-            profileChange = try {
-              val decoded: ByteArray = Base64.decode(record.body!!)
-              val profileChangeDetails = ProfileChangeDetails.ADAPTER.decode(decoded)
-              if (profileChangeDetails.profileNameChange != null) {
-                ProfileChangeChatUpdate(previousName = profileChangeDetails.profileNameChange.previous, newName = profileChangeDetails.profileNameChange.newValue)
-              } else {
-                ProfileChangeChatUpdate()
-              }
-            } catch (e: IOException) {
-              Log.w(TAG, "Profile name change details could not be read", e)
-              ProfileChangeChatUpdate()
-            }
-          )
-          builder.sms = false
+          builder.updateMessage = record.toProfileChangeUpdate()
         }
         MessageTypes.isSessionSwitchoverType(record.type) -> {
-          builder.updateMessage = ChatUpdateMessage(
-            sessionSwitchover = try {
-              val event = SessionSwitchoverEvent.ADAPTER.decode(decodeOrThrow(record.body!!))
-              SessionSwitchoverChatUpdate(event.e164.e164ToLong()!!)
-            } catch (e: Exception) {
-              SessionSwitchoverChatUpdate()
-            }
-          )
+          builder.updateMessage = record.toSessionSwitchoverUpdate()
         }
         MessageTypes.isThreadMergeType(record.type) -> {
-          builder.updateMessage = ChatUpdateMessage(
-            threadMerge = try {
-              val event = ThreadMergeEvent.ADAPTER.decode(decodeOrThrow(record.body!!))
-              ThreadMergeChatUpdate(event.previousE164.e164ToLong()!!)
-            } catch (e: Exception) {
-              ThreadMergeChatUpdate()
-            }
-          )
+          builder.updateMessage = record.toThreadMergeUpdate()
         }
         MessageTypes.isGroupV2(record.type) && MessageTypes.isGroupUpdate(record.type) -> {
-          val groupChange = record.messageExtras?.gv2UpdateDescription?.groupChangeUpdate
-          if (groupChange != null) {
-            builder.updateMessage = ChatUpdateMessage(
-              groupChange = groupChange
-            )
-          } else if (record.body != null) {
-            try {
-              val decoded: ByteArray = decode(record.body)
-              val context = DecryptedGroupV2Context.ADAPTER.decode(decoded)
-              builder.updateMessage = ChatUpdateMessage(
-                groupChange = GroupsV2UpdateMessageConverter.translateDecryptedChange(selfIds = SignalStore.account().getServiceIds(), context)
-              )
-            } catch (e: IOException) {
-              continue
-            }
-          } else {
-            continue
-          }
+          builder.updateMessage = record.toGroupUpdate()
         }
         MessageTypes.isCallLog(record.type) -> {
-          builder.sms = false
-          val call = calls.getCallByMessageId(record.id)
-          if (call != null) {
-            if (call.type == CallTable.Type.GROUP_CALL) {
-              builder.updateMessage = ChatUpdateMessage(
-                groupCall = GroupCall(
-                  callId = record.id,
-                  state = when (call.event) {
-                    CallTable.Event.MISSED -> GroupCall.State.MISSED
-                    CallTable.Event.ONGOING -> GroupCall.State.GENERIC
-                    CallTable.Event.ACCEPTED -> GroupCall.State.ACCEPTED
-                    CallTable.Event.NOT_ACCEPTED -> GroupCall.State.GENERIC
-                    CallTable.Event.MISSED_NOTIFICATION_PROFILE -> GroupCall.State.MISSED_NOTIFICATION_PROFILE
-                    CallTable.Event.DELETE -> continue
-                    CallTable.Event.GENERIC_GROUP_CALL -> GroupCall.State.GENERIC
-                    CallTable.Event.JOINED -> GroupCall.State.JOINED
-                    CallTable.Event.RINGING -> GroupCall.State.RINGING
-                    CallTable.Event.DECLINED -> GroupCall.State.DECLINED
-                    CallTable.Event.OUTGOING_RING -> GroupCall.State.OUTGOING_RING
-                  },
-                  ringerRecipientId = call.ringerRecipient?.toLong(),
-                  startedCallAci = if (call.ringerRecipient != null) SignalDatabase.recipients.getRecord(call.ringerRecipient).aci?.toByteString() else null,
-                  startedCallTimestamp = call.timestamp
-                )
-              )
-            } else if (call.type != CallTable.Type.AD_HOC_CALL) {
-              builder.updateMessage = ChatUpdateMessage(
-                individualCall = IndividualCall(
-                  callId = call.callId,
-                  type = if (call.type == CallTable.Type.VIDEO_CALL) IndividualCall.Type.VIDEO_CALL else IndividualCall.Type.AUDIO_CALL,
-                  direction = if (call.direction == CallTable.Direction.INCOMING) IndividualCall.Direction.INCOMING else IndividualCall.Direction.OUTGOING,
-                  state = when (call.event) {
-                    CallTable.Event.MISSED -> IndividualCall.State.MISSED
-                    CallTable.Event.MISSED_NOTIFICATION_PROFILE -> IndividualCall.State.MISSED_NOTIFICATION_PROFILE
-                    CallTable.Event.ACCEPTED -> IndividualCall.State.ACCEPTED
-                    CallTable.Event.NOT_ACCEPTED -> IndividualCall.State.NOT_ACCEPTED
-                    else -> IndividualCall.State.UNKNOWN_STATE
-                  },
-                  startedCallTimestamp = call.timestamp
-                )
-              )
-            } else {
-              continue
-            }
+          builder.updateMessage = record.toCallUpdate()
+        }
+        MessageTypes.isPaymentsNotification(record.type) -> {
+          builder.paymentNotification = record.toPaymentNotificationUpdate()
+        }
+        MessageTypes.isGiftBadge(record.type) -> {
+          builder.giftBadge = record.toGiftBadgeUpdate()
+        }
+        !record.sharedContacts.isNullOrEmpty() -> {
+          builder.contactMessage = record.toContactMessage(reactionsById[id], attachmentsById[id])
+        }
+        else -> {
+          if (record.body == null && !attachmentsById.containsKey(record.id)) {
+            Log.w(TAG, "Record with ID ${record.id} missing a body and doesn't have attachments. Skipping.")
+            continue
+          }
+
+          val attachments = attachmentsById[record.id]
+          val sticker = attachments?.firstOrNull { dbAttachment ->
+            dbAttachment.isSticker
+          }
+
+          if (sticker?.stickerLocator != null) {
+            builder.stickerMessage = sticker.toStickerMessage(reactionsById[id])
           } else {
-            when {
-              MessageTypes.isMissedAudioCall(record.type) -> {
-                builder.updateMessage = ChatUpdateMessage(
-                  individualCall = IndividualCall(
-                    type = IndividualCall.Type.AUDIO_CALL,
-                    state = IndividualCall.State.MISSED,
-                    direction = IndividualCall.Direction.INCOMING
-                  )
-                )
-              }
-              MessageTypes.isMissedVideoCall(record.type) -> {
-                builder.updateMessage = ChatUpdateMessage(
-                  individualCall = IndividualCall(
-                    type = IndividualCall.Type.VIDEO_CALL,
-                    state = IndividualCall.State.MISSED,
-                    direction = IndividualCall.Direction.INCOMING
-                  )
-                )
-              }
-              MessageTypes.isIncomingAudioCall(record.type) -> {
-                builder.updateMessage = ChatUpdateMessage(
-                  individualCall = IndividualCall(
-                    type = IndividualCall.Type.AUDIO_CALL,
-                    state = IndividualCall.State.ACCEPTED,
-                    direction = IndividualCall.Direction.INCOMING
-                  )
-                )
-              }
-              MessageTypes.isIncomingVideoCall(record.type) -> {
-                builder.updateMessage = ChatUpdateMessage(
-                  individualCall = IndividualCall(
-                    type = IndividualCall.Type.VIDEO_CALL,
-                    state = IndividualCall.State.ACCEPTED,
-                    direction = IndividualCall.Direction.INCOMING
-                  )
-                )
-              }
-              MessageTypes.isOutgoingAudioCall(record.type) -> {
-                builder.updateMessage = ChatUpdateMessage(
-                  individualCall = IndividualCall(
-                    type = IndividualCall.Type.AUDIO_CALL,
-                    state = IndividualCall.State.ACCEPTED,
-                    direction = IndividualCall.Direction.OUTGOING
-                  )
-                )
-              }
-              MessageTypes.isOutgoingVideoCall(record.type) -> {
-                builder.updateMessage = ChatUpdateMessage(
-                  individualCall = IndividualCall(
-                    type = IndividualCall.Type.VIDEO_CALL,
-                    state = IndividualCall.State.ACCEPTED,
-                    direction = IndividualCall.Direction.OUTGOING
-                  )
-                )
-              }
-              MessageTypes.isGroupCall(record.type) -> {
-                try {
-                  val groupCallUpdateDetails = GroupCallUpdateDetailsUtil.parse(record.body)
-                  builder.updateMessage = ChatUpdateMessage(
-                    groupCall = GroupCall(
-                      state = GroupCall.State.GENERIC,
-                      startedCallAci = ACI.from(UuidUtil.parseOrThrow(groupCallUpdateDetails.startedCallUuid)).toByteString(),
-                      startedCallTimestamp = groupCallUpdateDetails.startedCallTimestamp,
-                      endedCallTimestamp = groupCallUpdateDetails.endedCallTimestamp
-                    )
-                  )
-                } catch (exception: java.lang.Exception) {
-                  continue
-                }
-              }
-            }
+            builder.standardMessage = record.toStandardMessage(reactionsById[id], mentions = mentionsById[id], attachments = attachmentsById[record.id])
           }
         }
-        record.body == null && !attachmentsById.containsKey(record.id) -> {
-          Log.w(TAG, "Record missing a body and doesnt have attachments, skipping")
-          continue
-        }
-        else -> builder.standardMessage = record.toStandardMessage(reactionsById[id], mentions = mentionsById[id], attachments = attachmentsById[record.id])
       }
 
-      buffer += builder.build()
+      if (record.latestRevisionId == null) {
+        val previousEdits = revisionMap.remove(record.id)
+        if (previousEdits != null) {
+          builder.revisions = previousEdits
+        }
+        buffer += builder.build()
+      } else {
+        var previousEdits = revisionMap[record.latestRevisionId]
+        if (previousEdits == null) {
+          previousEdits = ArrayList()
+          revisionMap[record.latestRevisionId] = previousEdits
+        }
+        previousEdits += builder.build()
+      }
     }
 
     return if (buffer.isNotEmpty()) {
       buffer.remove()
     } else {
-      throw NoSuchElementException()
+      null
     }
   }
 
@@ -337,14 +250,8 @@ class ChatItemExportIterator(private val cursor: Cursor, private val batchSize:
     cursor.close()
   }
 
-  private fun String.e164ToLong(): Long? {
-    val fixed = if (this.startsWith("+")) {
-      this.substring(1)
-    } else {
-      this
-    }
-
-    return fixed.toLongOrNull()
+  private fun simpleUpdate(type: SimpleChatUpdate.Type): ChatUpdateMessage {
+    return ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = type))
   }
 
   private fun BackupMessageRecord.toBasicChatItemBuilder(groupReceipts: List<GroupReceiptTable.GroupReceiptInfo>?): ChatItem.Builder {
@@ -357,7 +264,7 @@ class ChatItemExportIterator(private val cursor: Cursor, private val batchSize:
       expireStartDate = if (record.expireStarted > 0) record.expireStarted else 0
       expiresInMs = if (record.expiresIn > 0) record.expiresIn else 0
       revisions = emptyList()
-      sms = !MessageTypes.isSecureType(record.type)
+      sms = record.type.isSmsType()
       if (MessageTypes.isCallLog(record.type)) {
         directionless = ChatItem.DirectionlessMessageDetails()
       } else if (MessageTypes.isOutgoingMessageType(record.type)) {
@@ -375,6 +282,385 @@ class ChatItemExportIterator(private val cursor: Cursor, private val batchSize:
     }
   }
 
+  private fun BackupMessageRecord.toProfileChangeUpdate(): ChatUpdateMessage? {
+    val profileChangeDetails = if (this.messageExtras != null) {
+      this.messageExtras.profileChangeDetails
+    } else {
+      Base64.decodeOrNull(this.body)?.let { ProfileChangeDetails.ADAPTER.decode(it) }
+    }
+
+    return if (profileChangeDetails?.profileNameChange != null) {
+      ChatUpdateMessage(profileChange = ProfileChangeChatUpdate(previousName = profileChangeDetails.profileNameChange.previous, newName = profileChangeDetails.profileNameChange.newValue))
+    } else if (profileChangeDetails?.learnedProfileName != null) {
+      ChatUpdateMessage(learnedProfileChange = LearnedProfileChatUpdate(e164 = profileChangeDetails.learnedProfileName.e164?.e164ToLong(), username = profileChangeDetails.learnedProfileName.username))
+    } else {
+      null
+    }
+  }
+
+  private fun BackupMessageRecord.toSessionSwitchoverUpdate(): ChatUpdateMessage {
+    if (this.body == null) {
+      return ChatUpdateMessage(sessionSwitchover = SessionSwitchoverChatUpdate())
+    }
+
+    return ChatUpdateMessage(
+      sessionSwitchover = try {
+        val event = SessionSwitchoverEvent.ADAPTER.decode(Base64.decodeOrThrow(this.body))
+        SessionSwitchoverChatUpdate(event.e164.e164ToLong()!!)
+      } catch (e: IOException) {
+        SessionSwitchoverChatUpdate()
+      }
+    )
+  }
+
+  private fun BackupMessageRecord.toThreadMergeUpdate(): ChatUpdateMessage {
+    if (this.body == null) {
+      return ChatUpdateMessage(threadMerge = ThreadMergeChatUpdate())
+    }
+
+    return ChatUpdateMessage(
+      threadMerge = try {
+        val event = ThreadMergeEvent.ADAPTER.decode(Base64.decodeOrThrow(this.body))
+        ThreadMergeChatUpdate(event.previousE164.e164ToLong()!!)
+      } catch (e: IOException) {
+        ThreadMergeChatUpdate()
+      }
+    )
+  }
+
+  private fun BackupMessageRecord.toGroupUpdate(): ChatUpdateMessage? {
+    val groupChange = this.messageExtras?.gv2UpdateDescription?.groupChangeUpdate
+    return if (groupChange != null) {
+      ChatUpdateMessage(
+        groupChange = groupChange
+      )
+    } else if (this.body != null) {
+      try {
+        val decoded: ByteArray = Base64.decode(this.body)
+        val context = DecryptedGroupV2Context.ADAPTER.decode(decoded)
+        ChatUpdateMessage(
+          groupChange = GroupsV2UpdateMessageConverter.translateDecryptedChange(selfIds = SignalStore.account.getServiceIds(), context)
+        )
+      } catch (e: IOException) {
+        null
+      }
+    } else {
+      null
+    }
+  }
+
+  private fun BackupMessageRecord.toCallUpdate(): ChatUpdateMessage? {
+    val call = calls.getCallByMessageId(this.id)
+
+    return if (call != null) {
+      call.toCallUpdate()
+    } else {
+      when {
+        MessageTypes.isMissedAudioCall(this.type) -> {
+          ChatUpdateMessage(
+            individualCall = IndividualCall(
+              type = IndividualCall.Type.AUDIO_CALL,
+              state = IndividualCall.State.MISSED,
+              direction = IndividualCall.Direction.INCOMING
+            )
+          )
+        }
+        MessageTypes.isMissedVideoCall(this.type) -> {
+          ChatUpdateMessage(
+            individualCall = IndividualCall(
+              type = IndividualCall.Type.VIDEO_CALL,
+              state = IndividualCall.State.MISSED,
+              direction = IndividualCall.Direction.INCOMING
+            )
+          )
+        }
+        MessageTypes.isIncomingAudioCall(this.type) -> {
+          ChatUpdateMessage(
+            individualCall = IndividualCall(
+              type = IndividualCall.Type.AUDIO_CALL,
+              state = IndividualCall.State.ACCEPTED,
+              direction = IndividualCall.Direction.INCOMING
+            )
+          )
+        }
+        MessageTypes.isIncomingVideoCall(this.type) -> {
+          ChatUpdateMessage(
+            individualCall = IndividualCall(
+              type = IndividualCall.Type.VIDEO_CALL,
+              state = IndividualCall.State.ACCEPTED,
+              direction = IndividualCall.Direction.INCOMING
+            )
+          )
+        }
+        MessageTypes.isOutgoingAudioCall(this.type) -> {
+          ChatUpdateMessage(
+            individualCall = IndividualCall(
+              type = IndividualCall.Type.AUDIO_CALL,
+              state = IndividualCall.State.ACCEPTED,
+              direction = IndividualCall.Direction.OUTGOING
+            )
+          )
+        }
+        MessageTypes.isOutgoingVideoCall(this.type) -> {
+          ChatUpdateMessage(
+            individualCall = IndividualCall(
+              type = IndividualCall.Type.VIDEO_CALL,
+              state = IndividualCall.State.ACCEPTED,
+              direction = IndividualCall.Direction.OUTGOING
+            )
+          )
+        }
+        MessageTypes.isGroupCall(this.type) -> {
+          try {
+            val groupCallUpdateDetails = GroupCallUpdateDetailsUtil.parse(this.body)
+            ChatUpdateMessage(
+              groupCall = GroupCall(
+                state = GroupCall.State.GENERIC,
+                startedCallRecipientId = recipients.getByAci(ACI.from(UuidUtil.parseOrThrow(groupCallUpdateDetails.startedCallUuid))).getOrNull()?.toLong(),
+                startedCallTimestamp = groupCallUpdateDetails.startedCallTimestamp,
+                endedCallTimestamp = groupCallUpdateDetails.endedCallTimestamp
+              )
+            )
+          } catch (exception: IOException) {
+            null
+          }
+        }
+        else -> {
+          null
+        }
+      }
+    }
+  }
+
+  private fun CallTable.Call.toCallUpdate(): ChatUpdateMessage? {
+    return if (this.type == CallTable.Type.GROUP_CALL) {
+      ChatUpdateMessage(
+        groupCall = GroupCall(
+          callId = this.messageId,
+          state = when (this.event) {
+            CallTable.Event.MISSED -> GroupCall.State.MISSED
+            CallTable.Event.ONGOING -> GroupCall.State.GENERIC
+            CallTable.Event.ACCEPTED -> GroupCall.State.ACCEPTED
+            CallTable.Event.NOT_ACCEPTED -> GroupCall.State.GENERIC
+            CallTable.Event.MISSED_NOTIFICATION_PROFILE -> GroupCall.State.MISSED_NOTIFICATION_PROFILE
+            CallTable.Event.GENERIC_GROUP_CALL -> GroupCall.State.GENERIC
+            CallTable.Event.JOINED -> GroupCall.State.JOINED
+            CallTable.Event.RINGING -> GroupCall.State.RINGING
+            CallTable.Event.DECLINED -> GroupCall.State.DECLINED
+            CallTable.Event.OUTGOING_RING -> GroupCall.State.OUTGOING_RING
+            CallTable.Event.DELETE -> return null
+          },
+          ringerRecipientId = this.ringerRecipient?.toLong(),
+          startedCallRecipientId = this.ringerRecipient?.toLong(),
+          startedCallTimestamp = this.timestamp
+        )
+      )
+    } else if (this.type != CallTable.Type.AD_HOC_CALL) {
+      ChatUpdateMessage(
+        individualCall = IndividualCall(
+          callId = this.callId,
+          type = if (this.type == CallTable.Type.VIDEO_CALL) IndividualCall.Type.VIDEO_CALL else IndividualCall.Type.AUDIO_CALL,
+          direction = if (this.direction == CallTable.Direction.INCOMING) IndividualCall.Direction.INCOMING else IndividualCall.Direction.OUTGOING,
+          state = when (this.event) {
+            CallTable.Event.MISSED -> IndividualCall.State.MISSED
+            CallTable.Event.MISSED_NOTIFICATION_PROFILE -> IndividualCall.State.MISSED_NOTIFICATION_PROFILE
+            CallTable.Event.ACCEPTED -> IndividualCall.State.ACCEPTED
+            CallTable.Event.NOT_ACCEPTED -> IndividualCall.State.NOT_ACCEPTED
+            else -> IndividualCall.State.UNKNOWN_STATE
+          },
+          startedCallTimestamp = this.timestamp
+        )
+      )
+    } else {
+      null
+    }
+  }
+
+  private fun BackupMessageRecord.toPaymentNotificationUpdate(): PaymentNotification {
+    val paymentUuid = UuidUtil.parseOrNull(this.body)
+    val payment = if (paymentUuid != null) {
+      SignalDatabase.payments.getPayment(paymentUuid)
+    } else {
+      null
+    }
+
+    return if (payment == null) {
+      PaymentNotification()
+    } else {
+      PaymentNotification(
+        amountMob = payment.amount.serializeAmountString(),
+        feeMob = payment.fee.serializeAmountString(),
+        note = payment.note,
+        transactionDetails = payment.getTransactionDetails()
+      )
+    }
+  }
+
+  private fun BackupMessageRecord.parseSharedContacts(attachments: List<DatabaseAttachment>?): List<Contact> {
+    if (this.sharedContacts.isNullOrEmpty()) {
+      return emptyList()
+    }
+
+    val attachmentIdMap: Map<AttachmentId, DatabaseAttachment> = attachments?.associateBy { it.attachmentId } ?: emptyMap()
+
+    try {
+      val contacts: MutableList<Contact> = LinkedList()
+      val jsonContacts = JSONArray(sharedContacts)
+
+      for (i in 0 until jsonContacts.length()) {
+        val contact: Contact = Contact.deserialize(jsonContacts.getJSONObject(i).toString())
+
+        if (contact.avatar != null && contact.avatar!!.attachmentId != null) {
+          val attachment = attachmentIdMap[contact.avatar!!.attachmentId]
+
+          val updatedAvatar = Contact.Avatar(
+            contact.avatar!!.attachmentId,
+            attachment,
+            contact.avatar!!.isProfile
+          )
+
+          contacts += Contact(contact, updatedAvatar)
+        } else {
+          contacts += contact
+        }
+      }
+
+      return contacts
+    } catch (e: JSONException) {
+      Log.w(TAG, "Failed to parse shared contacts.", e)
+    } catch (e: IOException) {
+      Log.w(TAG, "Failed to parse shared contacts.", e)
+    }
+
+    return emptyList()
+  }
+
+  private fun BackupMessageRecord.parseLinkPreviews(attachments: List<DatabaseAttachment>?): List<LinkPreview> {
+    if (linkPreview.isNullOrEmpty()) {
+      return emptyList()
+    }
+    val attachmentIdMap: Map<AttachmentId, DatabaseAttachment> = attachments?.associateBy { it.attachmentId } ?: emptyMap()
+
+    try {
+      val previews: MutableList<LinkPreview> = LinkedList()
+      val jsonPreviews = JSONArray(linkPreview)
+
+      for (i in 0 until jsonPreviews.length()) {
+        val preview = LinkPreview.deserialize(jsonPreviews.getJSONObject(i).toString())
+
+        if (preview.attachmentId != null) {
+          val attachment = attachmentIdMap[preview.attachmentId]
+
+          if (attachment != null) {
+            previews += LinkPreview(preview.url, preview.title, preview.description, preview.date, attachment)
+          } else {
+            previews += preview
+          }
+        } else {
+          previews += preview
+        }
+      }
+
+      return previews
+    } catch (e: JSONException) {
+      Log.w(TAG, "Failed to parse link preview", e)
+    } catch (e: IOException) {
+      Log.w(TAG, "Failed to parse shared contacts.", e)
+    }
+
+    return emptyList()
+  }
+
+  private fun LinkPreview.toBackupLinkPreview(): org.thoughtcrime.securesms.backup.v2.proto.LinkPreview {
+    return org.thoughtcrime.securesms.backup.v2.proto.LinkPreview(
+      url = url,
+      title = title,
+      image = (thumbnail.orNull() as? DatabaseAttachment)?.toBackupAttachment()?.pointer,
+      description = description,
+      date = date
+    )
+  }
+
+  private fun BackupMessageRecord.toContactMessage(reactionRecords: List<ReactionRecord>?, attachments: List<DatabaseAttachment>?): ContactMessage {
+    val sharedContacts = parseSharedContacts(attachments)
+
+    val contacts = sharedContacts.map {
+      ContactAttachment(
+        name = it.name.toBackup(),
+        avatar = (it.avatar?.attachment as? DatabaseAttachment)?.toBackupAttachment()?.pointer,
+        organization = it.organization,
+        number = it.phoneNumbers.map { phone ->
+          ContactAttachment.Phone(
+            value_ = phone.number,
+            type = phone.type.toBackup(),
+            label = phone.label
+          )
+        },
+        email = it.emails.map { email ->
+          ContactAttachment.Email(
+            value_ = email.email,
+            label = email.label,
+            type = email.type.toBackup()
+          )
+        },
+        address = it.postalAddresses.map { address ->
+          ContactAttachment.PostalAddress(
+            type = address.type.toBackup(),
+            label = address.label,
+            street = address.street,
+            pobox = address.poBox,
+            neighborhood = address.neighborhood,
+            city = address.city,
+            region = address.region,
+            postcode = address.postalCode,
+            country = address.country
+          )
+        }
+      )
+    }
+    return ContactMessage(
+      contact = contacts,
+      reactions = reactionRecords.toBackupReactions()
+    )
+  }
+
+  private fun Contact.Name.toBackup(): ContactAttachment.Name {
+    return ContactAttachment.Name(
+      givenName = givenName,
+      familyName = familyName,
+      prefix = prefix,
+      suffix = suffix,
+      middleName = middleName,
+      displayName = displayName
+    )
+  }
+
+  private fun Contact.Phone.Type.toBackup(): ContactAttachment.Phone.Type {
+    return when (this) {
+      Contact.Phone.Type.HOME -> ContactAttachment.Phone.Type.HOME
+      Contact.Phone.Type.MOBILE -> ContactAttachment.Phone.Type.MOBILE
+      Contact.Phone.Type.WORK -> ContactAttachment.Phone.Type.WORK
+      Contact.Phone.Type.CUSTOM -> ContactAttachment.Phone.Type.CUSTOM
+    }
+  }
+
+  private fun Contact.Email.Type.toBackup(): ContactAttachment.Email.Type {
+    return when (this) {
+      Contact.Email.Type.HOME -> ContactAttachment.Email.Type.HOME
+      Contact.Email.Type.MOBILE -> ContactAttachment.Email.Type.MOBILE
+      Contact.Email.Type.WORK -> ContactAttachment.Email.Type.WORK
+      Contact.Email.Type.CUSTOM -> ContactAttachment.Email.Type.CUSTOM
+    }
+  }
+
+  private fun Contact.PostalAddress.Type.toBackup(): ContactAttachment.PostalAddress.Type {
+    return when (this) {
+      Contact.PostalAddress.Type.HOME -> ContactAttachment.PostalAddress.Type.HOME
+      Contact.PostalAddress.Type.WORK -> ContactAttachment.PostalAddress.Type.WORK
+      Contact.PostalAddress.Type.CUSTOM -> ContactAttachment.PostalAddress.Type.CUSTOM
+    }
+  }
+
   private fun BackupMessageRecord.toStandardMessage(reactionRecords: List<ReactionRecord>?, mentions: List<Mention>?, attachments: List<DatabaseAttachment>?): StandardMessage {
     val text = if (body == null) {
       null
@@ -384,14 +670,18 @@ class ChatItemExportIterator(private val cursor: Cursor, private val batchSize:
         bodyRanges = (this.bodyRanges?.toBackupBodyRanges() ?: emptyList()) + (mentions?.toBackupBodyRanges() ?: emptyList())
       )
     }
+    val linkPreviews = parseLinkPreviews(attachments)
+    val linkPreviewAttachments = linkPreviews.mapNotNull { it.thumbnail.orElse(null) }.toSet()
     val quotedAttachments = attachments?.filter { it.quote } ?: emptyList()
-    val messageAttachments = attachments?.filter { !it.quote } ?: emptyList()
+    val messageAttachments = attachments
+      ?.filterNot { it.quote }
+      ?.filterNot { linkPreviewAttachments.contains(it) }
+      ?: emptyList()
     return StandardMessage(
       quote = this.toQuote(quotedAttachments),
       text = text,
       attachments = messageAttachments.toBackupAttachments(),
-      // TODO Link previews!
-      linkPreview = emptyList(),
+      linkPreview = linkPreviews.map { it.toBackupLinkPreview() },
       longText = null,
       reactions = reactionRecords.toBackupReactions()
     )
@@ -416,6 +706,39 @@ class ChatItemExportIterator(private val cursor: Cursor, private val batchSize:
     }
   }
 
+  private fun BackupMessageRecord.toGiftBadgeUpdate(): BackupGiftBadge {
+    val giftBadge = try {
+      GiftBadge.ADAPTER.decode(Base64.decode(this.body ?: ""))
+    } catch (e: IOException) {
+      Log.w(TAG, "Failed to decode GiftBadge!")
+      return BackupGiftBadge()
+    }
+
+    return BackupGiftBadge(
+      receiptCredentialPresentation = giftBadge.redemptionToken,
+      state = when (giftBadge.redemptionState) {
+        GiftBadge.RedemptionState.REDEEMED -> BackupGiftBadge.State.REDEEMED
+        GiftBadge.RedemptionState.FAILED -> BackupGiftBadge.State.FAILED
+        GiftBadge.RedemptionState.PENDING -> BackupGiftBadge.State.UNOPENED
+        GiftBadge.RedemptionState.STARTED -> BackupGiftBadge.State.OPENED
+      }
+    )
+  }
+
+  private fun DatabaseAttachment.toStickerMessage(reactions: List<ReactionRecord>?): StickerMessage {
+    val stickerLocator = this.stickerLocator!!
+    return StickerMessage(
+      sticker = Sticker(
+        packId = Hex.fromStringCondensed(stickerLocator.packId).toByteString(),
+        packKey = Hex.fromStringCondensed(stickerLocator.packKey).toByteString(),
+        stickerId = stickerLocator.stickerId,
+        emoji = stickerLocator.emoji,
+        data_ = this.toBackupAttachment().pointer
+      ),
+      reactions = reactions.toBackupReactions()
+    )
+  }
+
   private fun List<DatabaseAttachment>.toBackupQuoteAttachments(): List<Quote.QuotedAttachment> {
     return this.map { attachment ->
       Quote.QuotedAttachment(
@@ -444,7 +767,7 @@ class ChatItemExportIterator(private val cursor: Cursor, private val batchSize:
         builder.backupLocator = FilePointer.BackupLocator(
           mediaName = archiveMediaName ?: this.getMediaName().toString(),
           cdnNumber = if (archiveMediaName != null) archiveCdn else Cdn.CDN_3.cdnNumber, // TODO (clark): Update when new proto with optional cdn is landed
-          key = decode(remoteKey).toByteString(),
+          key = Base64.decode(remoteKey).toByteString(),
           size = this.size.toInt(),
           digest = remoteDigest.toByteString()
         )
@@ -456,7 +779,7 @@ class ChatItemExportIterator(private val cursor: Cursor, private val batchSize:
             cdnKey = this.remoteLocation,
             cdnNumber = this.cdn.cdnNumber,
             uploadTimestamp = this.uploadTimestamp,
-            key = decode(remoteKey).toByteString(),
+            key = Base64.decode(remoteKey).toByteString(),
             size = this.size.toInt(),
             digest = remoteDigest.toByteString()
           )
@@ -466,7 +789,16 @@ class ChatItemExportIterator(private val cursor: Cursor, private val batchSize:
     return MessageAttachment(
       pointer = builder.build(),
       wasDownloaded = this.transferState == AttachmentTable.TRANSFER_PROGRESS_DONE || this.transferState == AttachmentTable.TRANSFER_NEEDS_RESTORE,
-      flag = if (voiceNote) MessageAttachment.Flag.VOICE_MESSAGE else if (videoGif) MessageAttachment.Flag.GIF else if (borderless) MessageAttachment.Flag.BORDERLESS else MessageAttachment.Flag.NONE
+      flag = if (voiceNote) {
+        MessageAttachment.Flag.VOICE_MESSAGE
+      } else if (videoGif) {
+        MessageAttachment.Flag.GIF
+      } else if (borderless) {
+        MessageAttachment.Flag.BORDERLESS
+      } else {
+        MessageAttachment.Flag.NONE
+      },
+      clientUuid = uuid?.let { UuidUtil.toByteString(uuid) }
     )
   }
 
@@ -476,6 +808,46 @@ class ChatItemExportIterator(private val cursor: Cursor, private val batchSize:
     }
   }
 
+  private fun PaymentTable.PaymentTransaction.getTransactionDetails(): PaymentNotification.TransactionDetails? {
+    if (failureReason != null || state == State.FAILED) {
+      return PaymentNotification.TransactionDetails(failedTransaction = PaymentNotification.TransactionDetails.FailedTransaction(reason = failureReason.toBackupFailureReason()))
+    }
+    return PaymentNotification.TransactionDetails(
+      transaction = PaymentNotification.TransactionDetails.Transaction(
+        status = this.state.toBackupState(),
+        timestamp = timestamp,
+        blockIndex = blockIndex,
+        blockTimestamp = blockTimestamp,
+        mobileCoinIdentification = paymentMetaData.mobileCoinTxoIdentification?.toBackup()
+      )
+    )
+  }
+
+  private fun PaymentMetaData.MobileCoinTxoIdentification.toBackup(): PaymentNotification.TransactionDetails.MobileCoinTxoIdentification {
+    return PaymentNotification.TransactionDetails.MobileCoinTxoIdentification(
+      publicKey = this.publicKey,
+      keyImages = this.keyImages
+    )
+  }
+
+  private fun State.toBackupState(): PaymentNotification.TransactionDetails.Transaction.Status {
+    return when (this) {
+      State.INITIAL -> PaymentNotification.TransactionDetails.Transaction.Status.INITIAL
+      State.SUBMITTED -> PaymentNotification.TransactionDetails.Transaction.Status.SUBMITTED
+      State.SUCCESSFUL -> PaymentNotification.TransactionDetails.Transaction.Status.SUCCESSFUL
+      State.FAILED -> throw IllegalArgumentException("state cannot be failed")
+    }
+  }
+
+  private fun FailureReason?.toBackupFailureReason(): PaymentNotification.TransactionDetails.FailedTransaction.FailureReason {
+    return when (this) {
+      FailureReason.UNKNOWN -> PaymentNotification.TransactionDetails.FailedTransaction.FailureReason.GENERIC
+      FailureReason.INSUFFICIENT_FUNDS -> PaymentNotification.TransactionDetails.FailedTransaction.FailureReason.INSUFFICIENT_FUNDS
+      FailureReason.NETWORK -> PaymentNotification.TransactionDetails.FailedTransaction.FailureReason.NETWORK
+      else -> PaymentNotification.TransactionDetails.FailedTransaction.FailureReason.GENERIC
+    }
+  }
+
   private fun List<Mention>.toBackupBodyRanges(): List<BackupBodyRange> {
     return this.map {
       BackupBodyRange(
@@ -615,6 +987,28 @@ class ChatItemExportIterator(private val cursor: Cursor, private val batchSize:
     }
   }
 
+  private fun Long.isSmsType(): Boolean {
+    if (MessageTypes.isSecureType(this)) {
+      return false
+    }
+
+    if (MessageTypes.isCallLog(this)) {
+      return false
+    }
+
+    return MessageTypes.isOutgoingMessageType(this) || MessageTypes.isInboxType(this)
+  }
+
+  private fun String.e164ToLong(): Long? {
+    val fixed = if (this.startsWith("+")) {
+      this.substring(1)
+    } else {
+      this
+    }
+
+    return fixed.toLongOrNull()
+  }
+
   private fun Cursor.toBackupMessageRecord(): BackupMessageRecord {
     return BackupMessageRecord(
       id = this.requireLong(MessageTable.ID),
@@ -631,14 +1025,16 @@ class ChatItemExportIterator(private val cursor: Cursor, private val batchSize:
       expireStarted = this.requireLong(MessageTable.EXPIRE_STARTED),
       remoteDeleted = this.requireBoolean(MessageTable.REMOTE_DELETED),
       sealedSender = this.requireBoolean(MessageTable.UNIDENTIFIED),
+      linkPreview = this.requireString(MessageTable.LINK_PREVIEWS),
+      sharedContacts = this.requireString(MessageTable.SHARED_CONTACTS),
       quoteTargetSentTimestamp = this.requireLong(MessageTable.QUOTE_ID),
       quoteAuthor = this.requireLong(MessageTable.QUOTE_AUTHOR),
       quoteBody = this.requireString(MessageTable.QUOTE_BODY),
       quoteMissing = this.requireBoolean(MessageTable.QUOTE_MISSING),
       quoteBodyRanges = this.requireBlob(MessageTable.QUOTE_BODY_RANGES),
       quoteType = this.requireInt(MessageTable.QUOTE_TYPE),
-      originalMessageId = this.requireLong(MessageTable.ORIGINAL_MESSAGE_ID),
-      latestRevisionId = this.requireLong(MessageTable.LATEST_REVISION_ID),
+      originalMessageId = this.requireLongOrNull(MessageTable.ORIGINAL_MESSAGE_ID),
+      latestRevisionId = this.requireLongOrNull(MessageTable.LATEST_REVISION_ID),
       hasDeliveryReceipt = this.requireBoolean(MessageTable.HAS_DELIVERY_RECEIPT),
       viewed = this.requireBoolean(MessageTable.VIEWED_COLUMN),
       hasReadReceipt = this.requireBoolean(MessageTable.HAS_READ_RECEIPT),
@@ -666,14 +1062,16 @@ class ChatItemExportIterator(private val cursor: Cursor, private val batchSize:
     val expireStarted: Long,
     val remoteDeleted: Boolean,
     val sealedSender: Boolean,
+    val linkPreview: String?,
+    val sharedContacts: String?,
     val quoteTargetSentTimestamp: Long,
     val quoteAuthor: Long,
     val quoteBody: String?,
     val quoteMissing: Boolean,
     val quoteBodyRanges: ByteArray?,
     val quoteType: Int,
-    val originalMessageId: Long,
-    val latestRevisionId: Long,
+    val originalMessageId: Long?,
+    val latestRevisionId: Long?,
     val hasDeliveryReceipt: Boolean,
     val hasReadReceipt: Boolean,
     val viewed: Boolean,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ChatItemImportInserter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ChatItemImportInserter.kt
index b1116f8dc6..e1b3f8c314 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ChatItemImportInserter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ChatItemImportInserter.kt
@@ -7,7 +7,9 @@ package org.thoughtcrime.securesms.backup.v2.database
 
 import android.content.ContentValues
 import androidx.core.content.contentValuesOf
+import okio.ByteString
 import org.signal.core.util.Base64
+import org.signal.core.util.Hex
 import org.signal.core.util.SqlUtil
 import org.signal.core.util.logging.Log
 import org.signal.core.util.orNull
@@ -22,14 +24,20 @@ import org.thoughtcrime.securesms.backup.v2.BackupState
 import org.thoughtcrime.securesms.backup.v2.proto.BodyRange
 import org.thoughtcrime.securesms.backup.v2.proto.ChatItem
 import org.thoughtcrime.securesms.backup.v2.proto.ChatUpdateMessage
+import org.thoughtcrime.securesms.backup.v2.proto.ContactAttachment
+import org.thoughtcrime.securesms.backup.v2.proto.FilePointer
 import org.thoughtcrime.securesms.backup.v2.proto.GroupCall
 import org.thoughtcrime.securesms.backup.v2.proto.IndividualCall
+import org.thoughtcrime.securesms.backup.v2.proto.LinkPreview
 import org.thoughtcrime.securesms.backup.v2.proto.MessageAttachment
+import org.thoughtcrime.securesms.backup.v2.proto.PaymentNotification
 import org.thoughtcrime.securesms.backup.v2.proto.Quote
 import org.thoughtcrime.securesms.backup.v2.proto.Reaction
 import org.thoughtcrime.securesms.backup.v2.proto.SendStatus
 import org.thoughtcrime.securesms.backup.v2.proto.SimpleChatUpdate
 import org.thoughtcrime.securesms.backup.v2.proto.StandardMessage
+import org.thoughtcrime.securesms.backup.v2.proto.Sticker
+import org.thoughtcrime.securesms.contactshare.Contact
 import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.database.CallTable
 import org.thoughtcrime.securesms.database.GroupReceiptTable
@@ -38,6 +46,7 @@ import org.thoughtcrime.securesms.database.MessageTypes
 import org.thoughtcrime.securesms.database.ReactionTable
 import org.thoughtcrime.securesms.database.SQLiteDatabase
 import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.SignalDatabase.Companion.recipients
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatchSet
 import org.thoughtcrime.securesms.database.documents.NetworkFailure
@@ -45,22 +54,34 @@ import org.thoughtcrime.securesms.database.documents.NetworkFailureSet
 import org.thoughtcrime.securesms.database.model.GroupCallUpdateDetailsUtil
 import org.thoughtcrime.securesms.database.model.Mention
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
+import org.thoughtcrime.securesms.database.model.databaseprotos.CryptoValue
 import org.thoughtcrime.securesms.database.model.databaseprotos.GV2UpdateDescription
+import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
 import org.thoughtcrime.securesms.database.model.databaseprotos.MessageExtras
+import org.thoughtcrime.securesms.database.model.databaseprotos.PaymentTombstone
 import org.thoughtcrime.securesms.database.model.databaseprotos.ProfileChangeDetails
 import org.thoughtcrime.securesms.database.model.databaseprotos.SessionSwitchoverEvent
 import org.thoughtcrime.securesms.database.model.databaseprotos.ThreadMergeEvent
 import org.thoughtcrime.securesms.mms.QuoteModel
+import org.thoughtcrime.securesms.payments.CryptoValueUtil
+import org.thoughtcrime.securesms.payments.Direction
+import org.thoughtcrime.securesms.payments.State
+import org.thoughtcrime.securesms.payments.proto.PaymentMetaData
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.stickers.StickerLocator
 import org.thoughtcrime.securesms.util.JsonUtils
 import org.whispersystems.signalservice.api.backup.MediaName
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId
+import org.whispersystems.signalservice.api.payments.Money
 import org.whispersystems.signalservice.api.push.ServiceId
 import org.whispersystems.signalservice.api.util.UuidUtil
 import org.whispersystems.signalservice.internal.push.DataMessage
+import java.math.BigInteger
 import java.util.Optional
+import java.util.UUID
+import org.thoughtcrime.securesms.backup.v2.proto.GiftBadge as BackupGiftBadge
 
 /**
  * An object that will ingest all fo the [ChatItem]s you want to write, buffer them until hitting a specified batch size, and then batch insert them
@@ -92,7 +113,6 @@ class ChatItemImportInserter(
       MessageTable.EXPIRE_STARTED,
       MessageTable.UNIDENTIFIED,
       MessageTable.REMOTE_DELETED,
-      MessageTable.REMOTE_DELETED,
       MessageTable.NETWORK_FAILURES,
       MessageTable.QUOTE_ID,
       MessageTable.QUOTE_AUTHOR,
@@ -104,7 +124,9 @@ class ChatItemImportInserter(
       MessageTable.LINK_PREVIEWS,
       MessageTable.MESSAGE_RANGES,
       MessageTable.VIEW_ONCE,
-      MessageTable.MESSAGE_EXTRAS
+      MessageTable.MESSAGE_EXTRAS,
+      MessageTable.ORIGINAL_MESSAGE_ID,
+      MessageTable.LATEST_REVISION_ID
     )
 
     private val REACTION_COLUMNS = arrayOf(
@@ -156,8 +178,22 @@ class ChatItemImportInserter(
       Log.w(TAG, "[insert] Could not find a backup recipientId for backup chatId ${chatItem.chatId}! Skipping.")
       return
     }
+    val messageInsert = chatItem.toMessageInsert(fromLocalRecipientId, chatLocalRecipientId, localThreadId)
+    if (chatItem.revisions.isNotEmpty()) {
+      val originalId = messageId
+      val latestRevisionId = originalId + chatItem.revisions.size
+      val sortedRevisions = chatItem.revisions.sortedBy { it.dateSent }.map { it.toMessageInsert(fromLocalRecipientId, chatLocalRecipientId, localThreadId) }
+      for (revision in sortedRevisions) {
+        revision.contentValues.put(MessageTable.ORIGINAL_MESSAGE_ID, originalId)
+        revision.contentValues.put(MessageTable.LATEST_REVISION_ID, latestRevisionId)
+        revision.contentValues.put(MessageTable.REVISION_NUMBER, (messageId - originalId))
+        buffer.messages += revision
+        messageId++
+      }
 
-    buffer.messages += chatItem.toMessageInsert(fromLocalRecipientId, chatLocalRecipientId, localThreadId)
+      messageInsert.contentValues.put(MessageTable.ORIGINAL_MESSAGE_ID, originalId)
+    }
+    buffer.messages += messageInsert
     buffer.reactions += chatItem.toReactionContentValues(messageId)
     buffer.groupReceipts += chatItem.toGroupReceiptContentValues(messageId, chatBackupRecipientId)
 
@@ -266,6 +302,76 @@ class ChatItemImportInserter(
         }
       }
     }
+    if (this.paymentNotification != null) {
+      followUp = { messageRowId ->
+        val uuid = tryRestorePayment(this, chatRecipientId)
+        if (uuid != null) {
+          db.update(
+            MessageTable.TABLE_NAME,
+            contentValuesOf(
+              MessageTable.BODY to uuid.toString(),
+              MessageTable.TYPE to ((contentValues.getAsLong(MessageTable.TYPE) and MessageTypes.SPECIAL_TYPES_MASK.inv()) or MessageTypes.SPECIAL_TYPE_PAYMENTS_NOTIFICATION)
+            ),
+            "${MessageTable.ID}=?",
+            SqlUtil.buildArgs(messageRowId)
+          )
+        }
+      }
+    }
+    if (this.contactMessage != null) {
+      val contacts = this.contactMessage.contact.map { backupContact ->
+        Contact(
+          backupContact.name.toLocal(),
+          backupContact.organization,
+          backupContact.number.map { phone ->
+            Contact.Phone(
+              phone.value_ ?: "",
+              phone.type.toLocal(),
+              phone.label
+            )
+          },
+          backupContact.email.map { email ->
+            Contact.Email(
+              email.value_ ?: "",
+              email.type.toLocal(),
+              email.label
+            )
+          },
+          backupContact.address.map { address ->
+            Contact.PostalAddress(
+              address.type.toLocal(),
+              address.label,
+              address.street,
+              address.pobox,
+              address.neighborhood,
+              address.city,
+              address.region,
+              address.postcode,
+              address.country
+            )
+          },
+          Contact.Avatar(null, backupContact.avatar.toLocalAttachment(voiceNote = false, borderless = false, gif = false, wasDownloaded = true), true)
+        )
+      }
+      val contactAttachments = contacts.mapNotNull { it.avatarAttachment }
+      if (contacts.isNotEmpty()) {
+        followUp = { messageRowId ->
+          val attachmentMap = if (contactAttachments.isNotEmpty()) {
+            SignalDatabase.attachments.insertAttachmentsForMessage(messageRowId, contactAttachments, emptyList())
+          } else {
+            emptyMap()
+          }
+          db.update(
+            MessageTable.TABLE_NAME,
+            contentValuesOf(
+              MessageTable.SHARED_CONTACTS to SignalDatabase.messages.getSerializedSharedContacts(attachmentMap, contacts)
+            ),
+            "${MessageTable.ID} = ?",
+            SqlUtil.buildArgs(messageRowId)
+          )
+        }
+      }
+    }
     if (this.standardMessage != null) {
       val bodyRanges = this.standardMessage.text?.bodyRanges
       if (!bodyRanges.isNullOrEmpty()) {
@@ -286,15 +392,36 @@ class ChatItemImportInserter(
           }
         }
       }
+      val linkPreviews = this.standardMessage.linkPreview.map { it.toLocalLinkPreview() }
+      val linkPreviewAttachments = linkPreviews.mapNotNull { it.thumbnail.orNull() }
       val attachments = this.standardMessage.attachments.mapNotNull { attachment ->
         attachment.toLocalAttachment()
       }
       val quoteAttachments = this.standardMessage.quote?.attachments?.mapNotNull {
         it.toLocalAttachment()
       } ?: emptyList()
-      if (attachments.isNotEmpty()) {
+      if (attachments.isNotEmpty() || linkPreviewAttachments.isNotEmpty() || quoteAttachments.isNotEmpty()) {
         followUp = { messageRowId ->
-          SignalDatabase.attachments.insertAttachmentsForMessage(messageRowId, attachments, quoteAttachments)
+          val attachmentMap = SignalDatabase.attachments.insertAttachmentsForMessage(messageRowId, attachments + linkPreviewAttachments, quoteAttachments)
+          if (linkPreviews.isNotEmpty()) {
+            db.update(
+              MessageTable.TABLE_NAME,
+              contentValuesOf(
+                MessageTable.LINK_PREVIEWS to SignalDatabase.messages.getSerializedLinkPreviews(attachmentMap, linkPreviews)
+              ),
+              "${MessageTable.ID} = ?",
+              SqlUtil.buildArgs(messageRowId)
+            )
+          }
+        }
+      }
+    }
+    if (this.stickerMessage != null) {
+      val sticker = this.stickerMessage.sticker
+      val attachment = sticker.toLocalAttachment()
+      if (attachment != null) {
+        followUp = { messageRowId ->
+          SignalDatabase.attachments.insertAttachmentsForMessage(messageRowId, listOf(attachment), emptyList())
         }
       }
     }
@@ -353,11 +480,43 @@ class ChatItemImportInserter(
       this.standardMessage != null -> contentValues.addStandardMessage(this.standardMessage)
       this.remoteDeletedMessage != null -> contentValues.put(MessageTable.REMOTE_DELETED, 1)
       this.updateMessage != null -> contentValues.addUpdateMessage(this.updateMessage)
+      this.paymentNotification != null -> contentValues.addPaymentNotification(this, chatRecipientId)
+      this.giftBadge != null -> contentValues.addGiftBadge(this.giftBadge)
     }
 
     return contentValues
   }
 
+  private fun tryRestorePayment(chatItem: ChatItem, chatRecipientId: RecipientId): UUID? {
+    val paymentNotification = chatItem.paymentNotification!!
+
+    val amount = paymentNotification.amountMob?.tryParseMoney() ?: return null
+    val fee = paymentNotification.feeMob?.tryParseMoney() ?: return null
+
+    if (paymentNotification.transactionDetails?.failedTransaction != null) {
+      return null
+    }
+
+    val transaction = paymentNotification.transactionDetails?.transaction
+
+    val mobileCoinIdentification = transaction?.mobileCoinIdentification?.toLocal() ?: return null
+
+    return SignalDatabase.payments.restoreFromBackup(
+      chatRecipientId,
+      transaction.timestamp ?: 0,
+      transaction.blockIndex ?: 0,
+      paymentNotification.note ?: "",
+      if (chatItem.outgoing != null) Direction.SENT else Direction.RECEIVED,
+      transaction.status.toLocalStatus(),
+      amount,
+      fee,
+      transaction.transaction?.toByteArray(),
+      transaction.receipt?.toByteArray(),
+      mobileCoinIdentification,
+      chatItem.incoming?.read ?: true
+    )
+  }
+
   private fun ChatItem.toReactionContentValues(messageId: Long): List<ContentValues> {
     val reactions: List<Reaction> = when {
       this.standardMessage != null -> this.standardMessage.reactions
@@ -430,6 +589,10 @@ class ChatItemImportInserter(
       type = type or MessageTypes.SECURE_MESSAGE_BIT or MessageTypes.PUSH_MESSAGE_BIT
     }
 
+    if (this.giftBadge != null) {
+      type = type or MessageTypes.SPECIAL_TYPE_GIFT_BADGE
+    }
+
     return type
   }
 
@@ -465,6 +628,7 @@ class ChatItemImportInserter(
           SimpleChatUpdate.Type.BAD_DECRYPT -> MessageTypes.BAD_DECRYPT_TYPE or typeWithoutBase
           SimpleChatUpdate.Type.PAYMENTS_ACTIVATED -> MessageTypes.SPECIAL_TYPE_PAYMENTS_ACTIVATED or typeWithoutBase
           SimpleChatUpdate.Type.PAYMENT_ACTIVATION_REQUEST -> MessageTypes.SPECIAL_TYPE_PAYMENTS_ACTIVATE_REQUEST or typeWithoutBase
+          SimpleChatUpdate.Type.UNSUPPORTED_PROTOCOL_MESSAGE -> MessageTypes.UNSUPPORTED_MESSAGE_TYPE or typeWithoutBase
         }
       }
       updateMessage.expirationTimerChange != null -> {
@@ -474,8 +638,14 @@ class ChatItemImportInserter(
       updateMessage.profileChange != null -> {
         typeFlags = MessageTypes.PROFILE_CHANGE_TYPE
         val profileChangeDetails = ProfileChangeDetails(profileNameChange = ProfileChangeDetails.StringChange(previous = updateMessage.profileChange.previousName, newValue = updateMessage.profileChange.newName))
-          .encode()
-        put(MessageTable.BODY, Base64.encodeWithPadding(profileChangeDetails))
+        val messageExtras = MessageExtras(profileChangeDetails = profileChangeDetails).encode()
+        put(MessageTable.MESSAGE_EXTRAS, messageExtras)
+      }
+      updateMessage.learnedProfileChange != null -> {
+        typeFlags = MessageTypes.PROFILE_CHANGE_TYPE
+        val profileChangeDetails = ProfileChangeDetails(learnedProfileName = ProfileChangeDetails.LearnedProfileName(e164 = updateMessage.learnedProfileChange.e164?.toString(), username = updateMessage.learnedProfileChange.username))
+        val messageExtras = MessageExtras(profileChangeDetails = profileChangeDetails).encode()
+        put(MessageTable.MESSAGE_EXTRAS, messageExtras)
       }
       updateMessage.sessionSwitchover != null -> {
         typeFlags = MessageTypes.SESSION_SWITCHOVER_TYPE or (getAsLong(MessageTable.TYPE) and MessageTypes.BASE_TYPE_MASK.inv())
@@ -500,7 +670,17 @@ class ChatItemImportInserter(
         this.put(MessageTable.TYPE, typeFlags)
       }
       updateMessage.groupCall != null -> {
-        this.put(MessageTable.BODY, GroupCallUpdateDetailsUtil.createBodyFromBackup(updateMessage.groupCall))
+        val startedCallRecipientId = if (updateMessage.groupCall.startedCallRecipientId != null) {
+          backupState.backupToLocalRecipientId[updateMessage.groupCall.startedCallRecipientId]
+        } else {
+          null
+        }
+        val startedCall = if (startedCallRecipientId != null) {
+          recipients.getRecord(startedCallRecipientId).aci
+        } else {
+          null
+        }
+        this.put(MessageTable.BODY, GroupCallUpdateDetailsUtil.createBodyFromBackup(updateMessage.groupCall, startedCall))
         this.put(MessageTable.TYPE, MessageTypes.GROUP_CALL_TYPE)
       }
       updateMessage.groupChange != null -> {
@@ -518,6 +698,118 @@ class ChatItemImportInserter(
     this.put(MessageTable.TYPE, typeFlags)
   }
 
+  /**
+   * Add the payment notification to the chat item.
+   *
+   * Note we add a tombstone first, then post insertion update it to a proper notification
+   */
+  private fun ContentValues.addPaymentNotification(chatItem: ChatItem, chatRecipientId: RecipientId) {
+    val paymentNotification = chatItem.paymentNotification!!
+    if (chatItem.paymentNotification.amountMob.isNullOrEmpty()) {
+      addPaymentTombstoneNoAmount()
+      return
+    }
+    val amount = paymentNotification.amountMob?.tryParseMoney() ?: return addPaymentTombstoneNoAmount()
+    val fee = paymentNotification.feeMob?.tryParseMoney() ?: return addPaymentTombstoneNoAmount()
+
+    if (chatItem.paymentNotification.transactionDetails?.failedTransaction != null) {
+      addFailedPaymentNotification(chatItem, amount, fee, chatRecipientId)
+      return
+    }
+    addPaymentTombstoneNoMetadata(chatItem.paymentNotification)
+  }
+
+  private fun PaymentNotification.TransactionDetails.MobileCoinTxoIdentification.toLocal(): PaymentMetaData {
+    return PaymentMetaData(
+      mobileCoinTxoIdentification = PaymentMetaData.MobileCoinTxoIdentification(
+        publicKey = this.publicKey,
+        keyImages = this.keyImages
+      )
+    )
+  }
+
+  private fun ContentValues.addFailedPaymentNotification(chatItem: ChatItem, amount: Money, fee: Money, chatRecipientId: RecipientId) {
+    val uuid = SignalDatabase.payments.restoreFromBackup(
+      chatRecipientId,
+      0,
+      0,
+      chatItem.paymentNotification?.note ?: "",
+      if (chatItem.outgoing != null) Direction.SENT else Direction.RECEIVED,
+      State.FAILED,
+      amount,
+      fee,
+      null,
+      null,
+      null,
+      chatItem.incoming?.read ?: true
+    )
+    if (uuid != null) {
+      put(MessageTable.BODY, uuid.toString())
+      put(MessageTable.TYPE, getAsLong(MessageTable.TYPE) or MessageTypes.SPECIAL_TYPE_PAYMENTS_NOTIFICATION)
+    } else {
+      addPaymentTombstoneNoMetadata(chatItem.paymentNotification!!)
+    }
+  }
+
+  private fun ContentValues.addPaymentTombstoneNoAmount() {
+    put(MessageTable.TYPE, getAsLong(MessageTable.TYPE) or MessageTypes.SPECIAL_TYPE_PAYMENTS_TOMBSTONE)
+  }
+
+  private fun ContentValues.addPaymentTombstoneNoMetadata(paymentNotification: PaymentNotification) {
+    put(MessageTable.TYPE, getAsLong(MessageTable.TYPE) or MessageTypes.SPECIAL_TYPE_PAYMENTS_TOMBSTONE)
+    val amount = tryParseCryptoValue(paymentNotification.amountMob)
+    val fee = tryParseCryptoValue(paymentNotification.feeMob)
+    put(
+      MessageTable.MESSAGE_EXTRAS,
+      MessageExtras(
+        paymentTombstone = PaymentTombstone(
+          note = paymentNotification.note,
+          amount = amount,
+          fee = fee
+        )
+      ).encode()
+    )
+  }
+
+  private fun ContentValues.addGiftBadge(giftBadge: BackupGiftBadge) {
+    val dbGiftBadge = GiftBadge(
+      redemptionToken = giftBadge.receiptCredentialPresentation,
+      redemptionState = when (giftBadge.state) {
+        BackupGiftBadge.State.UNOPENED -> GiftBadge.RedemptionState.PENDING
+        BackupGiftBadge.State.OPENED -> GiftBadge.RedemptionState.STARTED
+        BackupGiftBadge.State.REDEEMED -> GiftBadge.RedemptionState.REDEEMED
+        BackupGiftBadge.State.FAILED -> GiftBadge.RedemptionState.FAILED
+      }
+    )
+
+    put(MessageTable.BODY, Base64.encodeWithPadding(GiftBadge.ADAPTER.encode(dbGiftBadge)))
+  }
+
+  private fun String?.tryParseMoney(): Money? {
+    if (this.isNullOrEmpty()) {
+      return null
+    }
+
+    val amountCryptoValue = tryParseCryptoValue(this)
+    return if (amountCryptoValue != null) {
+      CryptoValueUtil.cryptoValueToMoney(amountCryptoValue)
+    } else {
+      null
+    }
+  }
+
+  private fun tryParseCryptoValue(bigIntegerString: String?): CryptoValue? {
+    if (bigIntegerString == null) {
+      return null
+    }
+    val amount = try {
+      BigInteger(bigIntegerString).toString()
+    } catch (e: NumberFormatException) {
+      return null
+    }
+    return CryptoValue(mobileCoinValue = CryptoValue.MobileCoinValue(picoMobileCoin = amount))
+  }
+
   private fun ContentValues.addQuote(quote: Quote) {
     this.put(MessageTable.QUOTE_ID, quote.targetSentTimestamp ?: MessageTable.QUOTE_TARGET_MISSING_ID)
     this.put(MessageTable.QUOTE_AUTHOR, backupState.backupToLocalRecipientId[quote.authorId]!!.serialize())
@@ -528,6 +820,15 @@ class ChatItemImportInserter(
     this.put(MessageTable.QUOTE_MISSING, (quote.targetSentTimestamp == null).toInt())
   }
 
+  private fun PaymentNotification.TransactionDetails.Transaction.Status?.toLocalStatus(): State {
+    return when (this) {
+      PaymentNotification.TransactionDetails.Transaction.Status.INITIAL -> State.INITIAL
+      PaymentNotification.TransactionDetails.Transaction.Status.SUBMITTED -> State.SUBMITTED
+      PaymentNotification.TransactionDetails.Transaction.Status.SUCCESSFUL -> State.SUCCESSFUL
+      else -> State.INITIAL
+    }
+  }
+
   private fun Quote.Type.toLocalQuoteType(): Int {
     return when (this) {
       Quote.Type.UNKNOWN -> QuoteModel.Type.NORMAL.code
@@ -607,80 +908,175 @@ class ChatItemImportInserter(
     }
   }
 
-  private fun MessageAttachment.toLocalAttachment(contentType: String? = pointer?.contentType, fileName: String? = pointer?.fileName): Attachment? {
-    if (pointer == null) return null
-    if (pointer.attachmentLocator != null) {
+  private fun FilePointer?.toLocalAttachment(voiceNote: Boolean, borderless: Boolean, gif: Boolean, wasDownloaded: Boolean, stickerLocator: StickerLocator? = null, contentType: String? = this?.contentType, fileName: String? = this?.fileName, uuid: ByteString? = null): Attachment? {
+    if (this == null) return null
+
+    if (attachmentLocator != null) {
       val signalAttachmentPointer = SignalServiceAttachmentPointer(
-        pointer.attachmentLocator.cdnNumber,
-        SignalServiceAttachmentRemoteId.from(pointer.attachmentLocator.cdnKey),
+        attachmentLocator.cdnNumber,
+        SignalServiceAttachmentRemoteId.from(attachmentLocator.cdnKey),
         contentType,
-        pointer.attachmentLocator.key.toByteArray(),
-        Optional.ofNullable(pointer.attachmentLocator.size),
+        attachmentLocator.key.toByteArray(),
+        Optional.ofNullable(attachmentLocator.size),
         Optional.empty(),
-        pointer.width ?: 0,
-        pointer.height ?: 0,
-        Optional.ofNullable(pointer.attachmentLocator.digest.toByteArray()),
-        Optional.ofNullable(pointer.incrementalMac?.toByteArray()),
-        pointer.incrementalMacChunkSize ?: 0,
+        width ?: 0,
+        height ?: 0,
+        Optional.ofNullable(attachmentLocator.digest.toByteArray()),
+        Optional.ofNullable(incrementalMac?.toByteArray()),
+        incrementalMacChunkSize ?: 0,
         Optional.ofNullable(fileName),
-        flag == MessageAttachment.Flag.VOICE_MESSAGE,
-        flag == MessageAttachment.Flag.BORDERLESS,
-        flag == MessageAttachment.Flag.GIF,
-        Optional.ofNullable(pointer.caption),
-        Optional.ofNullable(pointer.blurHash),
-        pointer.attachmentLocator.uploadTimestamp
+        voiceNote,
+        borderless,
+        gif,
+        Optional.ofNullable(caption),
+        Optional.ofNullable(blurHash),
+        attachmentLocator.uploadTimestamp,
+        UuidUtil.fromByteStringOrNull(uuid)
       )
       return PointerAttachment.forPointer(
         pointer = Optional.of(signalAttachmentPointer),
+        stickerLocator = stickerLocator,
         transferState = if (wasDownloaded) AttachmentTable.TRANSFER_NEEDS_RESTORE else AttachmentTable.TRANSFER_PROGRESS_PENDING
       ).orNull()
-    } else if (pointer.invalidAttachmentLocator != null) {
+    } else if (invalidAttachmentLocator != null) {
       return TombstoneAttachment(
         contentType = contentType,
-        incrementalMac = pointer.incrementalMac?.toByteArray(),
-        incrementalMacChunkSize = pointer.incrementalMacChunkSize,
-        width = pointer.width,
-        height = pointer.height,
-        caption = pointer.caption,
-        blurHash = pointer.blurHash,
-        voiceNote = flag == MessageAttachment.Flag.VOICE_MESSAGE,
-        borderless = flag == MessageAttachment.Flag.BORDERLESS,
-        gif = flag == MessageAttachment.Flag.GIF,
-        quote = false
+        incrementalMac = incrementalMac?.toByteArray(),
+        incrementalMacChunkSize = incrementalMacChunkSize,
+        width = width,
+        height = height,
+        caption = caption,
+        blurHash = blurHash,
+        voiceNote = voiceNote,
+        borderless = borderless,
+        gif = gif,
+        quote = false,
+        uuid = UuidUtil.fromByteStringOrNull(uuid)
       )
-    } else if (pointer.backupLocator != null) {
+    } else if (backupLocator != null) {
       return ArchivedAttachment(
         contentType = contentType,
-        size = pointer.backupLocator.size.toLong(),
-        cdn = pointer.backupLocator.transitCdnNumber ?: Cdn.CDN_0.cdnNumber,
-        key = pointer.backupLocator.key.toByteArray(),
-        cdnKey = pointer.backupLocator.transitCdnKey,
-        archiveCdn = pointer.backupLocator.cdnNumber,
-        archiveMediaName = pointer.backupLocator.mediaName,
-        archiveMediaId = backupState.backupKey.deriveMediaId(MediaName(pointer.backupLocator.mediaName)).encode(),
-        archiveThumbnailMediaId = backupState.backupKey.deriveMediaId(MediaName.forThumbnailFromMediaName(pointer.backupLocator.mediaName)).encode(),
-        digest = pointer.backupLocator.digest.toByteArray(),
-        incrementalMac = pointer.incrementalMac?.toByteArray(),
-        incrementalMacChunkSize = pointer.incrementalMacChunkSize,
-        width = pointer.width,
-        height = pointer.height,
-        caption = pointer.caption,
-        blurHash = pointer.blurHash,
-        voiceNote = flag == MessageAttachment.Flag.VOICE_MESSAGE,
-        borderless = flag == MessageAttachment.Flag.BORDERLESS,
-        gif = flag == MessageAttachment.Flag.GIF,
-        quote = false
+        size = backupLocator.size.toLong(),
+        cdn = backupLocator.transitCdnNumber ?: Cdn.CDN_0.cdnNumber,
+        key = backupLocator.key.toByteArray(),
+        cdnKey = backupLocator.transitCdnKey,
+        archiveCdn = backupLocator.cdnNumber,
+        archiveMediaName = backupLocator.mediaName,
+        archiveMediaId = backupState.backupKey.deriveMediaId(MediaName(backupLocator.mediaName)).encode(),
+        archiveThumbnailMediaId = backupState.backupKey.deriveMediaId(MediaName.forThumbnailFromMediaName(backupLocator.mediaName)).encode(),
+        digest = backupLocator.digest.toByteArray(),
+        incrementalMac = incrementalMac?.toByteArray(),
+        incrementalMacChunkSize = incrementalMacChunkSize,
+        width = width,
+        height = height,
+        caption = caption,
+        blurHash = blurHash,
+        voiceNote = voiceNote,
+        borderless = borderless,
+        gif = gif,
+        quote = false,
+        stickerLocator = stickerLocator,
+        uuid = UuidUtil.fromByteStringOrNull(uuid)
       )
     }
     return null
   }
 
+  private fun Sticker?.toLocalAttachment(): Attachment? {
+    if (this == null) return null
+
+    return data_.toLocalAttachment(
+      voiceNote = false,
+      gif = false,
+      borderless = false,
+      wasDownloaded = true,
+      stickerLocator = StickerLocator(
+        packId = Hex.toStringCondensed(packId.toByteArray()),
+        packKey = Hex.toStringCondensed(packKey.toByteArray()),
+        stickerId = stickerId,
+        emoji = emoji
+      )
+    )
+  }
+
+  private fun LinkPreview.toLocalLinkPreview(): org.thoughtcrime.securesms.linkpreview.LinkPreview {
+    return org.thoughtcrime.securesms.linkpreview.LinkPreview(
+      this.url,
+      this.title ?: "",
+      this.description ?: "",
+      this.date ?: 0,
+      Optional.ofNullable(this.image?.toLocalAttachment(voiceNote = false, borderless = false, gif = false, wasDownloaded = true))
+    )
+  }
+
+  private fun MessageAttachment.toLocalAttachment(): Attachment? {
+    return pointer?.toLocalAttachment(
+      voiceNote = flag == MessageAttachment.Flag.VOICE_MESSAGE,
+      gif = flag == MessageAttachment.Flag.GIF,
+      borderless = flag == MessageAttachment.Flag.BORDERLESS,
+      wasDownloaded = wasDownloaded,
+      uuid = clientUuid
+    )
+  }
+
+  private fun ContactAttachment.Name?.toLocal(): Contact.Name {
+    return Contact.Name(this?.displayName, this?.givenName, this?.familyName, this?.prefix, this?.suffix, this?.middleName)
+  }
+
+  private fun ContactAttachment.Phone.Type?.toLocal(): Contact.Phone.Type {
+    return when (this) {
+      ContactAttachment.Phone.Type.HOME -> Contact.Phone.Type.HOME
+      ContactAttachment.Phone.Type.MOBILE -> Contact.Phone.Type.MOBILE
+      ContactAttachment.Phone.Type.WORK -> Contact.Phone.Type.WORK
+      ContactAttachment.Phone.Type.CUSTOM,
+      ContactAttachment.Phone.Type.UNKNOWN,
+      null -> Contact.Phone.Type.CUSTOM
+    }
+  }
+
+  private fun ContactAttachment.Email.Type?.toLocal(): Contact.Email.Type {
+    return when (this) {
+      ContactAttachment.Email.Type.HOME -> Contact.Email.Type.HOME
+      ContactAttachment.Email.Type.MOBILE -> Contact.Email.Type.MOBILE
+      ContactAttachment.Email.Type.WORK -> Contact.Email.Type.WORK
+      ContactAttachment.Email.Type.CUSTOM,
+      ContactAttachment.Email.Type.UNKNOWN,
+      null -> Contact.Email.Type.CUSTOM
+    }
+  }
+
+  private fun ContactAttachment.PostalAddress.Type?.toLocal(): Contact.PostalAddress.Type {
+    return when (this) {
+      ContactAttachment.PostalAddress.Type.HOME -> Contact.PostalAddress.Type.HOME
+      ContactAttachment.PostalAddress.Type.WORK -> Contact.PostalAddress.Type.WORK
+      ContactAttachment.PostalAddress.Type.CUSTOM,
+      ContactAttachment.PostalAddress.Type.UNKNOWN,
+      null -> Contact.PostalAddress.Type.CUSTOM
+    }
+  }
+
+  private fun MessageAttachment.toLocalAttachment(contentType: String?, fileName: String?): Attachment? {
+    return pointer?.toLocalAttachment(
+      voiceNote = flag == MessageAttachment.Flag.VOICE_MESSAGE,
+      gif = flag == MessageAttachment.Flag.GIF,
+      borderless = flag == MessageAttachment.Flag.BORDERLESS,
+      wasDownloaded = wasDownloaded,
+      contentType = contentType,
+      fileName = fileName,
+      uuid = clientUuid
+    )
+  }
+
   private fun Quote.QuotedAttachment.toLocalAttachment(): Attachment? {
     return thumbnail?.toLocalAttachment(this.contentType, this.fileName)
       ?: if (this.contentType == null) null else PointerAttachment.forPointer(quotedAttachment = DataMessage.Quote.QuotedAttachment(contentType = this.contentType, fileName = this.fileName, thumbnail = null)).orNull()
   }
 
-  private class MessageInsert(val contentValues: ContentValues, val followUp: ((Long) -> Unit)?)
+  private class MessageInsert(
+    val contentValues: ContentValues,
+    val followUp: ((Long) -> Unit)?,
+    val edits: List<MessageInsert>? = null
+  )
 
   private class Buffer(
     val messages: MutableList<MessageInsert> = mutableListOf(),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/DistributionListTablesBackupExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/DistributionListTablesBackupExtensions.kt
index 596b868211..0c8898c204 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/DistributionListTablesBackupExtensions.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/DistributionListTablesBackupExtensions.kt
@@ -15,6 +15,8 @@ import org.signal.core.util.requireNonNullString
 import org.signal.core.util.requireObject
 import org.signal.core.util.select
 import org.thoughtcrime.securesms.backup.v2.BackupState
+import org.thoughtcrime.securesms.backup.v2.proto.DistributionList
+import org.thoughtcrime.securesms.backup.v2.proto.DistributionListItem
 import org.thoughtcrime.securesms.database.DistributionListTables
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.DistributionListId
@@ -60,19 +62,28 @@ fun DistributionListTables.getAllForBackup(): List<BackupRecipient> {
     .map { recipient ->
       BackupRecipient(
         id = recipient.id.toLong(),
-        distributionList = BackupDistributionList(
-          name = recipient.record.name,
-          distributionId = recipient.record.distributionId.asUuid().toByteArray().toByteString(),
-          allowReplies = recipient.record.allowsReplies,
-          deletionTimestamp = recipient.record.deletedAtTimestamp,
-          privacyMode = recipient.record.privacyMode.toBackupPrivacyMode(),
-          memberRecipientIds = recipient.record.members.map { it.toLong() }
-        )
+        distributionList = if (recipient.record.deletedAtTimestamp != 0L) {
+          DistributionListItem(
+            distributionId = recipient.record.distributionId.asUuid().toByteArray().toByteString(),
+            deletionTimestamp = recipient.record.deletedAtTimestamp
+          )
+        } else {
+          DistributionListItem(
+            distributionId = recipient.record.distributionId.asUuid().toByteArray().toByteString(),
+            distributionList = DistributionList(
+              name = recipient.record.name,
+              allowReplies = recipient.record.allowsReplies,
+              privacyMode = recipient.record.privacyMode.toBackupPrivacyMode(),
+              memberRecipientIds = recipient.record.members.map { it.toLong() }
+            )
+          )
+        }
       )
     }
 }
 
-fun DistributionListTables.restoreFromBackup(dlist: BackupDistributionList, backupState: BackupState): RecipientId {
+fun DistributionListTables.restoreFromBackup(dlistItem: DistributionListItem, backupState: BackupState): RecipientId? {
+  val dlist = dlistItem.distributionList ?: return null
   val members: List<RecipientId> = dlist.memberRecipientIds
     .mapNotNull { backupState.backupToLocalRecipientId[it] }
 
@@ -80,15 +91,25 @@ fun DistributionListTables.restoreFromBackup(dlist: BackupDistributionList, back
     Log.w(TAG, "Couldn't find some member recipients! Missing backup recipientIds: ${dlist.memberRecipientIds.toSet() - members.toSet()}")
   }
 
-  val dlistId = this.createList(
-    name = dlist.name,
-    members = members,
-    distributionId = DistributionId.from(UuidUtil.fromByteString(dlist.distributionId)),
-    allowsReplies = dlist.allowReplies,
-    deletionTimestamp = dlist.deletionTimestamp,
-    storageId = null,
-    privacyMode = dlist.privacyMode.toLocalPrivacyMode()
-  )!!
+  val distributionId = DistributionId.from(UuidUtil.fromByteString(dlistItem.distributionId))
+  val privacyMode = dlist.privacyMode.toLocalPrivacyMode()
+
+  val dlistId = if (distributionId == DistributionId.MY_STORY) {
+    setPrivacyMode(DistributionListId.MY_STORY, privacyMode)
+    members.forEach { addMemberToList(DistributionListId.MY_STORY, privacyMode, it) }
+    setAllowsReplies(DistributionListId.MY_STORY, dlist.allowReplies)
+    DistributionListId.MY_STORY
+  } else {
+    createList(
+      name = dlist.name,
+      members = members,
+      distributionId = distributionId,
+      allowsReplies = dlist.allowReplies,
+      deletionTimestamp = dlistItem.deletionTimestamp ?: 0,
+      storageId = null,
+      privacyMode = privacyMode
+    )!!
+  }
 
   return SignalDatabase.distributionLists.getRecipientId(dlistId)!!
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/MessageTableBackupExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/MessageTableBackupExtensions.kt
index f4a6b5cfce..122727b78c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/MessageTableBackupExtensions.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/MessageTableBackupExtensions.kt
@@ -33,6 +33,8 @@ fun MessageTable.getMessagesForBackup(backupTime: Long, archiveMedia: Boolean):
       MessageTable.EXPIRE_STARTED,
       MessageTable.REMOTE_DELETED,
       MessageTable.UNIDENTIFIED,
+      MessageTable.LINK_PREVIEWS,
+      MessageTable.SHARED_CONTACTS,
       MessageTable.QUOTE_ID,
       MessageTable.QUOTE_AUTHOR,
       MessageTable.QUOTE_BODY,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/RecipientTableBackupExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/RecipientTableBackupExtensions.kt
index 6b1a110148..9ab7375132 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/RecipientTableBackupExtensions.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/RecipientTableBackupExtensions.kt
@@ -7,6 +7,7 @@ package org.thoughtcrime.securesms.backup.v2.database
 
 import android.content.ContentValues
 import android.database.Cursor
+import androidx.core.content.contentValuesOf
 import okio.ByteString.Companion.toByteString
 import org.signal.core.util.Base64
 import org.signal.core.util.SqlUtil
@@ -44,13 +45,12 @@ import org.thoughtcrime.securesms.database.RecipientTable
 import org.thoughtcrime.securesms.database.RecipientTableCursorUtil
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.databaseprotos.RecipientExtras
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.groups.v2.processing.GroupsV2StateProcessor
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
 import org.thoughtcrime.securesms.profiles.ProfileName
-import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations
@@ -86,6 +86,8 @@ fun RecipientTable.getContactsForBackup(selfId: Long): BackupContactIterator {
       RecipientTable.PROFILE_FAMILY_NAME,
       RecipientTable.PROFILE_JOINED_NAME,
       RecipientTable.MUTE_UNTIL,
+      RecipientTable.CHAT_COLORS,
+      RecipientTable.CUSTOM_CHAT_COLORS_ID,
       RecipientTable.EXTRAS
     )
     .from(RecipientTable.TABLE_NAME)
@@ -164,8 +166,8 @@ fun RecipientTable.clearAllDataForBackupRestore() {
   SqlUtil.resetAutoIncrementValue(writableDatabase, RecipientTable.TABLE_NAME)
 
   RecipientId.clearCache()
-  ApplicationDependencies.getRecipientCache().clear()
-  ApplicationDependencies.getRecipientCache().clearSelf()
+  AppDependencies.recipientCache.clear()
+  AppDependencies.recipientCache.clearSelf()
 }
 
 fun RecipientTable.restoreContactFromBackup(contact: Contact): RecipientId {
@@ -176,23 +178,30 @@ fun RecipientTable.restoreContactFromBackup(contact: Contact): RecipientId {
   )
 
   val profileKey = contact.profileKey?.toByteArray()
+  val values = contentValuesOf(
+    RecipientTable.BLOCKED to contact.blocked,
+    RecipientTable.HIDDEN to (contact.visibility == Contact.Visibility.HIDDEN),
+    RecipientTable.TYPE to RecipientTable.RecipientType.INDIVIDUAL.id,
+    RecipientTable.PROFILE_FAMILY_NAME to contact.profileFamilyName.nullIfBlank(),
+    RecipientTable.PROFILE_GIVEN_NAME to contact.profileGivenName.nullIfBlank(),
+    RecipientTable.PROFILE_JOINED_NAME to ProfileName.fromParts(contact.profileGivenName.nullIfBlank(), contact.profileFamilyName.nullIfBlank()).toString().nullIfBlank(),
+    RecipientTable.PROFILE_KEY to if (profileKey == null) null else Base64.encodeWithPadding(profileKey),
+    RecipientTable.PROFILE_SHARING to contact.profileSharing.toInt(),
+    RecipientTable.USERNAME to contact.username,
+    RecipientTable.EXTRAS to contact.toLocalExtras().encode()
+  )
+
+  if (contact.registered != null) {
+    values.put(RecipientTable.UNREGISTERED_TIMESTAMP, 0L)
+    values.put(RecipientTable.REGISTERED, RecipientTable.RegisteredState.REGISTERED.id)
+  } else if (contact.notRegistered != null) {
+    values.put(RecipientTable.UNREGISTERED_TIMESTAMP, contact.notRegistered.unregisteredTimestamp)
+    values.put(RecipientTable.REGISTERED, RecipientTable.RegisteredState.NOT_REGISTERED.id)
+  }
 
   writableDatabase
     .update(RecipientTable.TABLE_NAME)
-    .values(
-      RecipientTable.BLOCKED to contact.blocked,
-      RecipientTable.HIDDEN to contact.hidden,
-      RecipientTable.TYPE to RecipientTable.RecipientType.INDIVIDUAL.id,
-      RecipientTable.PROFILE_FAMILY_NAME to contact.profileFamilyName.nullIfBlank(),
-      RecipientTable.PROFILE_GIVEN_NAME to contact.profileGivenName.nullIfBlank(),
-      RecipientTable.PROFILE_JOINED_NAME to ProfileName.fromParts(contact.profileGivenName.nullIfBlank(), contact.profileFamilyName.nullIfBlank()).toString().nullIfBlank(),
-      RecipientTable.PROFILE_KEY to if (profileKey == null) null else Base64.encodeWithPadding(profileKey),
-      RecipientTable.PROFILE_SHARING to contact.profileSharing.toInt(),
-      RecipientTable.REGISTERED to contact.registered.toLocalRegisteredState().id,
-      RecipientTable.USERNAME to contact.username,
-      RecipientTable.UNREGISTERED_TIMESTAMP to contact.unregisteredTimestamp,
-      RecipientTable.EXTRAS to contact.toLocalExtras().encode()
-    )
+    .values(values)
     .where("${RecipientTable.ID} = ?", id)
     .run()
 
@@ -201,7 +210,7 @@ fun RecipientTable.restoreContactFromBackup(contact: Contact): RecipientId {
 
 fun RecipientTable.restoreReleaseNotes(): RecipientId {
   val releaseChannelId: RecipientId = insertReleaseChannelRecipient()
-  SignalStore.releaseChannelValues().setReleaseChannelRecipientId(releaseChannelId)
+  SignalStore.releaseChannel.setReleaseChannelRecipientId(releaseChannelId)
 
   setProfileName(releaseChannelId, ProfileName.asGiven("Signal"))
   setMuted(releaseChannelId, Long.MAX_VALUE)
@@ -212,7 +221,7 @@ fun RecipientTable.restoreGroupFromBackup(group: Group): RecipientId {
   val masterKey = GroupMasterKey(group.masterKey.toByteArray())
   val groupId = GroupId.v2(masterKey)
 
-  val operations = ApplicationDependencies.getGroupsV2Operations().forGroup(GroupSecretParams.deriveFromMasterKey(masterKey))
+  val operations = AppDependencies.groupsV2Operations.forGroup(GroupSecretParams.deriveFromMasterKey(masterKey))
   val decryptedState = if (group.snapshot == null) {
     DecryptedGroup(revision = GroupsV2StateProcessor.RESTORE_PLACEHOLDER_REVISION)
   } else {
@@ -232,7 +241,7 @@ fun RecipientTable.restoreGroupFromBackup(group: Group): RecipientId {
   }
 
   val recipientId = writableDatabase.insert(RecipientTable.TABLE_NAME, null, values)
-  val restoredId = SignalDatabase.groups.create(masterKey, decryptedState)
+  val restoredId = SignalDatabase.groups.create(masterKey, decryptedState, groupSendEndorsements = null)
   if (restoredId != null) {
     SignalDatabase.groups.setShowAsStoryState(restoredId, group.storySendMode.toGroupShowAsStoryState())
   }
@@ -419,23 +428,28 @@ class BackupContactIterator(private val cursor: Cursor, private val selfId: Long
       return null
     }
 
+    val contactBuilder = Contact.Builder()
+      .aci(aci?.rawUuid?.toByteArray()?.toByteString())
+      .pni(pni?.rawUuid?.toByteArray()?.toByteString())
+      .username(cursor.requireString(RecipientTable.USERNAME))
+      .e164(cursor.requireString(RecipientTable.E164)?.e164ToLong())
+      .blocked(cursor.requireBoolean(RecipientTable.BLOCKED))
+      .visibility(if (cursor.requireBoolean(RecipientTable.HIDDEN)) Contact.Visibility.HIDDEN else Contact.Visibility.VISIBLE)
+      .profileKey(if (profileKey != null) Base64.decode(profileKey).toByteString() else null)
+      .profileSharing(cursor.requireBoolean(RecipientTable.PROFILE_SHARING))
+      .profileGivenName(cursor.requireString(RecipientTable.PROFILE_GIVEN_NAME).nullIfBlank())
+      .profileFamilyName(cursor.requireString(RecipientTable.PROFILE_FAMILY_NAME).nullIfBlank())
+      .hideStory(extras?.hideStory() ?: false)
+
+    if (registeredState == RecipientTable.RegisteredState.REGISTERED) {
+      contactBuilder.registered = Contact.Registered()
+    } else {
+      contactBuilder.notRegistered = Contact.NotRegistered(unregisteredTimestamp = cursor.requireLong(RecipientTable.UNREGISTERED_TIMESTAMP))
+    }
+
     return BackupRecipient(
       id = id,
-      contact = Contact(
-        aci = aci?.rawUuid?.toByteArray()?.toByteString(),
-        pni = pni?.rawUuid?.toByteArray()?.toByteString(),
-        username = cursor.requireString(RecipientTable.USERNAME),
-        e164 = cursor.requireString(RecipientTable.E164)?.e164ToLong(),
-        blocked = cursor.requireBoolean(RecipientTable.BLOCKED),
-        hidden = cursor.requireBoolean(RecipientTable.HIDDEN),
-        registered = registeredState.toContactRegisteredState(),
-        unregisteredTimestamp = cursor.requireLong(RecipientTable.UNREGISTERED_TIMESTAMP),
-        profileKey = if (profileKey != null) Base64.decode(profileKey).toByteString() else null,
-        profileSharing = cursor.requireBoolean(RecipientTable.PROFILE_SHARING),
-        profileGivenName = cursor.requireString(RecipientTable.PROFILE_GIVEN_NAME).nullIfBlank(),
-        profileFamilyName = cursor.requireString(RecipientTable.PROFILE_FAMILY_NAME).nullIfBlank(),
-        hideStory = extras?.hideStory() ?: false
-      )
+      contact = contactBuilder.build()
     )
   }
 
@@ -490,22 +504,6 @@ private fun String.e164ToLong(): Long? {
   return fixed.toLongOrNull()
 }
 
-private fun RecipientTable.RegisteredState.toContactRegisteredState(): Contact.Registered {
-  return when (this) {
-    RecipientTable.RegisteredState.REGISTERED -> Contact.Registered.REGISTERED
-    RecipientTable.RegisteredState.NOT_REGISTERED -> Contact.Registered.NOT_REGISTERED
-    RecipientTable.RegisteredState.UNKNOWN -> Contact.Registered.UNKNOWN
-  }
-}
-
-private fun Contact.Registered.toLocalRegisteredState(): RecipientTable.RegisteredState {
-  return when (this) {
-    Contact.Registered.REGISTERED -> RecipientTable.RegisteredState.REGISTERED
-    Contact.Registered.NOT_REGISTERED -> RecipientTable.RegisteredState.NOT_REGISTERED
-    Contact.Registered.UNKNOWN -> RecipientTable.RegisteredState.UNKNOWN
-  }
-}
-
 private fun GroupTable.ShowAsStoryState.toGroupStorySendMode(): Group.StorySendMode {
   return when (this) {
     GroupTable.ShowAsStoryState.ALWAYS -> Group.StorySendMode.ENABLED
@@ -525,6 +523,6 @@ private fun Group.StorySendMode.toGroupShowAsStoryState(): GroupTable.ShowAsStor
 private val Contact.formattedE164: String?
   get() {
     return e164?.let {
-      PhoneNumberFormatter.get(ApplicationDependencies.getApplication()).format(e164.toString())
+      PhoneNumberFormatter.get(AppDependencies.application).format(e164.toString())
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/StickerTableBackupExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/StickerTableBackupExtensions.kt
new file mode 100644
index 0000000000..31f6785eff
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/StickerTableBackupExtensions.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.database
+
+import org.signal.core.util.deleteAll
+import org.thoughtcrime.securesms.database.StickerTable
+
+fun StickerTable.clearAllDataForBackupRestore() {
+  writableDatabase.deleteAll(StickerTable.TABLE_NAME)
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ThreadTableBackupExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ThreadTableBackupExtensions.kt
index 0e8af87cce..1ac87d7907 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ThreadTableBackupExtensions.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ThreadTableBackupExtensions.kt
@@ -7,16 +7,23 @@ package org.thoughtcrime.securesms.backup.v2.database
 
 import android.database.Cursor
 import androidx.core.content.contentValuesOf
+import com.google.protobuf.InvalidProtocolBufferException
 import org.signal.core.util.SqlUtil
 import org.signal.core.util.insertInto
 import org.signal.core.util.logging.Log
+import org.signal.core.util.requireBlob
 import org.signal.core.util.requireBoolean
 import org.signal.core.util.requireInt
 import org.signal.core.util.requireLong
 import org.signal.core.util.toInt
 import org.thoughtcrime.securesms.backup.v2.proto.Chat
+import org.thoughtcrime.securesms.backup.v2.proto.ChatStyle
+import org.thoughtcrime.securesms.conversation.colors.ChatColors
+import org.thoughtcrime.securesms.conversation.colors.ChatColorsPalette
 import org.thoughtcrime.securesms.database.RecipientTable
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.ThreadTable
+import org.thoughtcrime.securesms.database.model.databaseprotos.ChatColor
 import org.thoughtcrime.securesms.recipients.RecipientId
 import java.io.Closeable
 
@@ -33,7 +40,9 @@ fun ThreadTable.getThreadsForBackup(): ChatIterator {
         ${ThreadTable.ARCHIVED},
         ${RecipientTable.TABLE_NAME}.${RecipientTable.MESSAGE_EXPIRATION_TIME},
         ${RecipientTable.TABLE_NAME}.${RecipientTable.MUTE_UNTIL},
-        ${RecipientTable.TABLE_NAME}.${RecipientTable.MENTION_SETTING} 
+        ${RecipientTable.TABLE_NAME}.${RecipientTable.MENTION_SETTING}, 
+        ${RecipientTable.TABLE_NAME}.${RecipientTable.CHAT_COLORS},
+        ${RecipientTable.TABLE_NAME}.${RecipientTable.CUSTOM_CHAT_COLORS_ID}
       FROM ${ThreadTable.TABLE_NAME} 
         LEFT OUTER JOIN ${RecipientTable.TABLE_NAME} ON ${ThreadTable.TABLE_NAME}.${ThreadTable.RECIPIENT_ID} = ${RecipientTable.TABLE_NAME}.${RecipientTable.ID}
     """
@@ -49,6 +58,15 @@ fun ThreadTable.clearAllDataForBackupRestore() {
 }
 
 fun ThreadTable.restoreFromBackup(chat: Chat, recipientId: RecipientId): Long? {
+  val chatColor = chat.style?.parseChatColor()
+  val chatColorWithId = if (chatColor != null && chatColor.id is ChatColors.Id.NotSet) {
+    val savedColors = SignalDatabase.chatColors.getSavedChatColors()
+    val match = savedColors.find { it.matchesWithoutId(chatColor) }
+    match ?: SignalDatabase.chatColors.saveChatColors(chatColor)
+  } else {
+    chatColor
+  }
+
   val threadId = writableDatabase
     .insertInto(ThreadTable.TABLE_NAME)
     .values(
@@ -65,7 +83,9 @@ fun ThreadTable.restoreFromBackup(chat: Chat, recipientId: RecipientId): Long? {
       contentValuesOf(
         RecipientTable.MENTION_SETTING to (if (chat.dontNotifyForMentionsIfMuted) RecipientTable.MentionSetting.DO_NOT_NOTIFY.id else RecipientTable.MentionSetting.ALWAYS_NOTIFY.id),
         RecipientTable.MUTE_UNTIL to chat.muteUntilMs,
-        RecipientTable.MESSAGE_EXPIRATION_TIME to chat.expirationTimerMs
+        RecipientTable.MESSAGE_EXPIRATION_TIME to chat.expirationTimerMs,
+        RecipientTable.CHAT_COLORS to chatColorWithId?.serialize()?.encode(),
+        RecipientTable.CUSTOM_CHAT_COLORS_ID to (chatColorWithId?.id ?: ChatColors.Id.NotSet).longValue
       ),
       "${RecipientTable.ID} = ?",
       SqlUtil.buildArgs(recipientId.toLong())
@@ -84,6 +104,33 @@ class ChatIterator(private val cursor: Cursor) : Iterator<Chat>, Closeable {
       throw NoSuchElementException()
     }
 
+    val serializedChatColors = cursor.requireBlob(RecipientTable.CHAT_COLORS)
+    val customChatColorsId = ChatColors.Id.forLongValue(cursor.requireLong(RecipientTable.CUSTOM_CHAT_COLORS_ID))
+    val chatColors: ChatColors? = if (serializedChatColors != null) {
+      try {
+        ChatColors.forChatColor(customChatColorsId, ChatColor.ADAPTER.decode(serializedChatColors))
+      } catch (e: InvalidProtocolBufferException) {
+        null
+      }
+    } else {
+      null
+    }
+
+    var chatStyleBuilder: ChatStyle.Builder? = null
+    if (chatColors != null) {
+      chatStyleBuilder = ChatStyle.Builder()
+      val presetBubbleColor = chatColors.tryToMapToBackupPreset()
+      if (presetBubbleColor != null) {
+        chatStyleBuilder.bubbleColorPreset = presetBubbleColor
+      } else if (chatColors.isGradient()) {
+        chatStyleBuilder.bubbleGradient = ChatStyle.Gradient(angle = chatColors.getDegrees().toInt(), colors = chatColors.getColors().toList())
+      } else if (customChatColorsId is ChatColors.Id.Auto) {
+        chatStyleBuilder.autoBubbleColor = ChatStyle.AutomaticBubbleColor()
+      } else {
+        chatStyleBuilder.bubbleSolidColor = chatColors.asSingleColor()
+      }
+    }
+
     return Chat(
       id = cursor.requireLong(ThreadTable.ID),
       recipientId = cursor.requireLong(ThreadTable.RECIPIENT_ID),
@@ -92,7 +139,8 @@ class ChatIterator(private val cursor: Cursor) : Iterator<Chat>, Closeable {
       expirationTimerMs = cursor.requireLong(RecipientTable.MESSAGE_EXPIRATION_TIME),
       muteUntilMs = cursor.requireLong(RecipientTable.MUTE_UNTIL),
       markedUnread = ThreadTable.ReadStatus.deserialize(cursor.requireInt(ThreadTable.READ)) == ThreadTable.ReadStatus.FORCED_UNREAD,
-      dontNotifyForMentionsIfMuted = RecipientTable.MentionSetting.DO_NOT_NOTIFY.id == cursor.requireInt(RecipientTable.MENTION_SETTING)
+      dontNotifyForMentionsIfMuted = RecipientTable.MentionSetting.DO_NOT_NOTIFY.id == cursor.requireInt(RecipientTable.MENTION_SETTING),
+      style = chatStyleBuilder?.build()
     )
   }
 
@@ -100,3 +148,79 @@ class ChatIterator(private val cursor: Cursor) : Iterator<Chat>, Closeable {
     cursor.close()
   }
 }
+
+private fun ChatStyle.parseChatColor(): ChatColors? {
+  if (bubbleColorPreset != null) {
+    return when (bubbleColorPreset) {
+      ChatStyle.BubbleColorPreset.SOLID_CRIMSON -> ChatColorsPalette.Bubbles.CRIMSON
+      ChatStyle.BubbleColorPreset.SOLID_VERMILION -> ChatColorsPalette.Bubbles.VERMILION
+      ChatStyle.BubbleColorPreset.SOLID_BURLAP -> ChatColorsPalette.Bubbles.BURLAP
+      ChatStyle.BubbleColorPreset.SOLID_FOREST -> ChatColorsPalette.Bubbles.FOREST
+      ChatStyle.BubbleColorPreset.SOLID_WINTERGREEN -> ChatColorsPalette.Bubbles.WINTERGREEN
+      ChatStyle.BubbleColorPreset.SOLID_TEAL -> ChatColorsPalette.Bubbles.TEAL
+      ChatStyle.BubbleColorPreset.SOLID_BLUE -> ChatColorsPalette.Bubbles.BLUE
+      ChatStyle.BubbleColorPreset.SOLID_INDIGO -> ChatColorsPalette.Bubbles.INDIGO
+      ChatStyle.BubbleColorPreset.SOLID_VIOLET -> ChatColorsPalette.Bubbles.VIOLET
+      ChatStyle.BubbleColorPreset.SOLID_PLUM -> ChatColorsPalette.Bubbles.PLUM
+      ChatStyle.BubbleColorPreset.SOLID_TAUPE -> ChatColorsPalette.Bubbles.TAUPE
+      ChatStyle.BubbleColorPreset.SOLID_STEEL -> ChatColorsPalette.Bubbles.STEEL
+      ChatStyle.BubbleColorPreset.GRADIENT_EMBER -> ChatColorsPalette.Bubbles.EMBER
+      ChatStyle.BubbleColorPreset.GRADIENT_MIDNIGHT -> ChatColorsPalette.Bubbles.MIDNIGHT
+      ChatStyle.BubbleColorPreset.GRADIENT_INFRARED -> ChatColorsPalette.Bubbles.INFRARED
+      ChatStyle.BubbleColorPreset.GRADIENT_LAGOON -> ChatColorsPalette.Bubbles.LAGOON
+      ChatStyle.BubbleColorPreset.GRADIENT_FLUORESCENT -> ChatColorsPalette.Bubbles.FLUORESCENT
+      ChatStyle.BubbleColorPreset.GRADIENT_BASIL -> ChatColorsPalette.Bubbles.BASIL
+      ChatStyle.BubbleColorPreset.GRADIENT_SUBLIME -> ChatColorsPalette.Bubbles.SUBLIME
+      ChatStyle.BubbleColorPreset.GRADIENT_SEA -> ChatColorsPalette.Bubbles.SEA
+      ChatStyle.BubbleColorPreset.GRADIENT_TANGERINE -> ChatColorsPalette.Bubbles.TANGERINE
+      ChatStyle.BubbleColorPreset.UNKNOWN_BUBBLE_COLOR_PRESET, ChatStyle.BubbleColorPreset.SOLID_ULTRAMARINE -> ChatColorsPalette.Bubbles.ULTRAMARINE
+    }
+  }
+  if (autoBubbleColor != null) {
+    return ChatColorsPalette.Bubbles.default.withId(ChatColors.Id.Auto)
+  }
+  if (bubbleSolidColor != null) {
+    return ChatColors(id = ChatColors.Id.NotSet, singleColor = bubbleSolidColor, linearGradient = null)
+  }
+  if (bubbleGradient != null) {
+    return ChatColors(
+      id = ChatColors.Id.NotSet,
+      singleColor = null,
+      linearGradient = ChatColors.LinearGradient(
+        degrees = bubbleGradient.angle.toFloat(),
+        colors = bubbleGradient.colors.toIntArray(),
+        positions = floatArrayOf(0f, 1f)
+      )
+    )
+  }
+  return null
+}
+
+private fun ChatColors.tryToMapToBackupPreset(): ChatStyle.BubbleColorPreset? {
+  when (this) {
+    // Solids
+    ChatColorsPalette.Bubbles.CRIMSON -> return ChatStyle.BubbleColorPreset.SOLID_CRIMSON
+    ChatColorsPalette.Bubbles.VERMILION -> return ChatStyle.BubbleColorPreset.SOLID_VERMILION
+    ChatColorsPalette.Bubbles.BURLAP -> return ChatStyle.BubbleColorPreset.SOLID_BURLAP
+    ChatColorsPalette.Bubbles.FOREST -> return ChatStyle.BubbleColorPreset.SOLID_FOREST
+    ChatColorsPalette.Bubbles.WINTERGREEN -> return ChatStyle.BubbleColorPreset.SOLID_WINTERGREEN
+    ChatColorsPalette.Bubbles.TEAL -> return ChatStyle.BubbleColorPreset.SOLID_TEAL
+    ChatColorsPalette.Bubbles.BLUE -> return ChatStyle.BubbleColorPreset.SOLID_BLUE
+    ChatColorsPalette.Bubbles.INDIGO -> return ChatStyle.BubbleColorPreset.SOLID_INDIGO
+    ChatColorsPalette.Bubbles.VIOLET -> return ChatStyle.BubbleColorPreset.SOLID_VIOLET
+    ChatColorsPalette.Bubbles.PLUM -> return ChatStyle.BubbleColorPreset.SOLID_PLUM
+    ChatColorsPalette.Bubbles.TAUPE -> return ChatStyle.BubbleColorPreset.SOLID_TAUPE
+    ChatColorsPalette.Bubbles.STEEL -> return ChatStyle.BubbleColorPreset.SOLID_STEEL
+    // Gradients
+    ChatColorsPalette.Bubbles.EMBER -> return ChatStyle.BubbleColorPreset.GRADIENT_EMBER
+    ChatColorsPalette.Bubbles.MIDNIGHT -> return ChatStyle.BubbleColorPreset.GRADIENT_MIDNIGHT
+    ChatColorsPalette.Bubbles.INFRARED -> return ChatStyle.BubbleColorPreset.GRADIENT_INFRARED
+    ChatColorsPalette.Bubbles.LAGOON -> return ChatStyle.BubbleColorPreset.GRADIENT_LAGOON
+    ChatColorsPalette.Bubbles.FLUORESCENT -> return ChatStyle.BubbleColorPreset.GRADIENT_FLUORESCENT
+    ChatColorsPalette.Bubbles.BASIL -> return ChatStyle.BubbleColorPreset.GRADIENT_BASIL
+    ChatColorsPalette.Bubbles.SUBLIME -> return ChatStyle.BubbleColorPreset.GRADIENT_SUBLIME
+    ChatColorsPalette.Bubbles.SEA -> return ChatStyle.BubbleColorPreset.GRADIENT_SEA
+    ChatColorsPalette.Bubbles.TANGERINE -> return ChatStyle.BubbleColorPreset.GRADIENT_TANGERINE
+  }
+  return null
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataProcessor.kt
index 984377d089..8821d5d9fb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataProcessor.kt
@@ -11,64 +11,67 @@ import org.thoughtcrime.securesms.backup.v2.database.restoreSelfFromBackup
 import org.thoughtcrime.securesms.backup.v2.proto.AccountData
 import org.thoughtcrime.securesms.backup.v2.proto.Frame
 import org.thoughtcrime.securesms.backup.v2.stream.BackupFrameEmitter
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
 import org.thoughtcrime.securesms.components.settings.app.usernamelinks.UsernameQrCodeColorScheme
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.database.SignalDatabase.Companion.recipients
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob
 import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues
 import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.subscription.Subscriber
 import org.thoughtcrime.securesms.util.ProfileUtil
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.signalservice.api.push.UsernameLinkComponents
 import org.whispersystems.signalservice.api.storage.StorageRecordProtoUtil.defaultAccountRecord
 import org.whispersystems.signalservice.api.subscriptions.SubscriberId
 import org.whispersystems.signalservice.api.util.UuidUtil
-import kotlin.jvm.optionals.getOrNull
+import java.util.Currency
 
 object AccountDataProcessor {
 
-  fun export(emitter: BackupFrameEmitter) {
-    val context = ApplicationDependencies.getApplication()
+  fun export(db: SignalDatabase, signalStore: SignalStore, emitter: BackupFrameEmitter) {
+    val context = AppDependencies.application
 
-    val self = Recipient.self().fresh()
-    val record = recipients.getRecordForSync(self.id)
+    val selfId = db.recipientTable.getByAci(signalStore.accountValues.aci!!).get()
+    val selfRecord = db.recipientTable.getRecordForSync(selfId)!!
 
-    val subscriber: Subscriber? = SignalStore.signalDonationsValues().getSubscriber()
+    val donationCurrency = signalStore.inAppPaymentValues.getSubscriptionCurrency(InAppPaymentSubscriberRecord.Type.DONATION)
+    val donationSubscriber = db.inAppPaymentSubscriberTable.getByCurrencyCode(donationCurrency.currencyCode, InAppPaymentSubscriberRecord.Type.DONATION)
 
     emitter.emit(
       Frame(
         account = AccountData(
-          profileKey = self.profileKey?.toByteString() ?: EMPTY,
-          givenName = self.profileName.givenName,
-          familyName = self.profileName.familyName,
-          avatarUrlPath = self.profileAvatar ?: "",
-          subscriptionManuallyCancelled = SignalStore.signalDonationsValues().isUserManuallyCancelled(),
-          username = self.username.getOrNull(),
-          subscriberId = subscriber?.subscriberId?.bytes?.toByteString() ?: defaultAccountRecord.subscriberId,
-          subscriberCurrencyCode = subscriber?.currencyCode ?: defaultAccountRecord.subscriberCurrencyCode,
+          profileKey = selfRecord.profileKey?.toByteString() ?: EMPTY,
+          givenName = selfRecord.signalProfileName.givenName,
+          familyName = selfRecord.signalProfileName.familyName,
+          avatarUrlPath = selfRecord.signalProfileAvatar ?: "",
+          username = selfRecord.username,
           accountSettings = AccountData.AccountSettings(
-            storyViewReceiptsEnabled = SignalStore.storyValues().viewedReceiptsEnabled,
+            storyViewReceiptsEnabled = signalStore.storyValues.viewedReceiptsEnabled,
             typingIndicators = TextSecurePreferences.isTypingIndicatorsEnabled(context),
             readReceipts = TextSecurePreferences.isReadReceiptsEnabled(context),
             sealedSenderIndicators = TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(context),
-            linkPreviews = SignalStore.settings().isLinkPreviewsEnabled,
-            notDiscoverableByPhoneNumber = SignalStore.phoneNumberPrivacy().phoneNumberDiscoverabilityMode == PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE,
-            phoneNumberSharingMode = SignalStore.phoneNumberPrivacy().phoneNumberSharingMode.toBackupPhoneNumberSharingMode(),
-            preferContactAvatars = SignalStore.settings().isPreferSystemContactPhotos,
-            universalExpireTimer = SignalStore.settings().universalExpireTimer,
-            preferredReactionEmoji = SignalStore.emojiValues().rawReactions,
-            storiesDisabled = SignalStore.storyValues().isFeatureDisabled,
-            hasViewedOnboardingStory = SignalStore.storyValues().userHasViewedOnboardingStory,
-            hasSetMyStoriesPrivacy = SignalStore.storyValues().userHasBeenNotifiedAboutStories,
-            keepMutedChatsArchived = SignalStore.settings().shouldKeepMutedChatsArchived(),
-            displayBadgesOnProfile = SignalStore.signalDonationsValues().getDisplayBadgesOnProfile(),
-            hasSeenGroupStoryEducationSheet = SignalStore.storyValues().userHasSeenGroupStoryEducationSheet,
-            hasCompletedUsernameOnboarding = SignalStore.uiHints().hasCompletedUsernameOnboarding()
+            linkPreviews = signalStore.settingsValues.isLinkPreviewsEnabled,
+            notDiscoverableByPhoneNumber = signalStore.phoneNumberPrivacyValues.phoneNumberDiscoverabilityMode == PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE,
+            phoneNumberSharingMode = signalStore.phoneNumberPrivacyValues.phoneNumberSharingMode.toBackupPhoneNumberSharingMode(),
+            preferContactAvatars = signalStore.settingsValues.isPreferSystemContactPhotos,
+            universalExpireTimer = signalStore.settingsValues.universalExpireTimer,
+            preferredReactionEmoji = signalStore.emojiValues.rawReactions,
+            storiesDisabled = signalStore.storyValues.isFeatureDisabled,
+            hasViewedOnboardingStory = signalStore.storyValues.userHasViewedOnboardingStory,
+            hasSetMyStoriesPrivacy = signalStore.storyValues.userHasBeenNotifiedAboutStories,
+            keepMutedChatsArchived = signalStore.settingsValues.shouldKeepMutedChatsArchived(),
+            displayBadgesOnProfile = signalStore.inAppPaymentValues.getDisplayBadgesOnProfile(),
+            hasSeenGroupStoryEducationSheet = signalStore.storyValues.userHasSeenGroupStoryEducationSheet,
+            hasCompletedUsernameOnboarding = signalStore.uiHintValues.hasCompletedUsernameOnboarding()
+          ),
+          donationSubscriberData = AccountData.SubscriberData(
+            subscriberId = donationSubscriber?.subscriberId?.bytes?.toByteString() ?: defaultAccountRecord.subscriberId,
+            currencyCode = donationSubscriber?.currency?.currencyCode ?: defaultAccountRecord.subscriberCurrencyCode,
+            manuallyCancelled = signalStore.inAppPaymentValues.isDonationSubscriptionManuallyCancelled()
           )
         )
       )
@@ -76,60 +79,70 @@ object AccountDataProcessor {
   }
 
   fun import(accountData: AccountData, selfId: RecipientId) {
-    recipients.restoreSelfFromBackup(accountData, selfId)
+    SignalDatabase.recipients.restoreSelfFromBackup(accountData, selfId)
 
-    SignalStore.account().setRegistered(true)
+    SignalStore.account.setRegistered(true)
 
-    val context = ApplicationDependencies.getApplication()
+    val context = AppDependencies.application
     val settings = accountData.accountSettings
 
     if (settings != null) {
       TextSecurePreferences.setReadReceiptsEnabled(context, settings.readReceipts)
       TextSecurePreferences.setTypingIndicatorsEnabled(context, settings.typingIndicators)
       TextSecurePreferences.setShowUnidentifiedDeliveryIndicatorsEnabled(context, settings.sealedSenderIndicators)
-      SignalStore.settings().isLinkPreviewsEnabled = settings.linkPreviews
-      SignalStore.phoneNumberPrivacy().phoneNumberDiscoverabilityMode = if (settings.notDiscoverableByPhoneNumber) PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE else PhoneNumberDiscoverabilityMode.DISCOVERABLE
-      SignalStore.phoneNumberPrivacy().phoneNumberSharingMode = settings.phoneNumberSharingMode.toLocalPhoneNumberMode()
-      SignalStore.settings().isPreferSystemContactPhotos = settings.preferContactAvatars
-      SignalStore.settings().universalExpireTimer = settings.universalExpireTimer
-      SignalStore.emojiValues().reactions = settings.preferredReactionEmoji
-      SignalStore.signalDonationsValues().setDisplayBadgesOnProfile(settings.displayBadgesOnProfile)
-      SignalStore.settings().setKeepMutedChatsArchived(settings.keepMutedChatsArchived)
-      SignalStore.storyValues().userHasBeenNotifiedAboutStories = settings.hasSetMyStoriesPrivacy
-      SignalStore.storyValues().userHasViewedOnboardingStory = settings.hasViewedOnboardingStory
-      SignalStore.storyValues().isFeatureDisabled = settings.storiesDisabled
-      SignalStore.storyValues().userHasSeenGroupStoryEducationSheet = settings.hasSeenGroupStoryEducationSheet
-      SignalStore.storyValues().viewedReceiptsEnabled = settings.storyViewReceiptsEnabled ?: settings.readReceipts
-
-      if (accountData.subscriptionManuallyCancelled) {
-        SignalStore.signalDonationsValues().updateLocalStateForManualCancellation()
-      } else {
-        SignalStore.signalDonationsValues().clearUserManuallyCancelled()
-      }
+      SignalStore.settings.isLinkPreviewsEnabled = settings.linkPreviews
+      SignalStore.phoneNumberPrivacy.phoneNumberDiscoverabilityMode = if (settings.notDiscoverableByPhoneNumber) PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE else PhoneNumberDiscoverabilityMode.DISCOVERABLE
+      SignalStore.phoneNumberPrivacy.phoneNumberSharingMode = settings.phoneNumberSharingMode.toLocalPhoneNumberMode()
+      SignalStore.settings.isPreferSystemContactPhotos = settings.preferContactAvatars
+      SignalStore.settings.universalExpireTimer = settings.universalExpireTimer
+      SignalStore.emoji.reactions = settings.preferredReactionEmoji
+      SignalStore.inAppPayments.setDisplayBadgesOnProfile(settings.displayBadgesOnProfile)
+      SignalStore.settings.setKeepMutedChatsArchived(settings.keepMutedChatsArchived)
+      SignalStore.story.userHasBeenNotifiedAboutStories = settings.hasSetMyStoriesPrivacy
+      SignalStore.story.userHasViewedOnboardingStory = settings.hasViewedOnboardingStory
+      SignalStore.story.isFeatureDisabled = settings.storiesDisabled
+      SignalStore.story.userHasSeenGroupStoryEducationSheet = settings.hasSeenGroupStoryEducationSheet
+      SignalStore.story.viewedReceiptsEnabled = settings.storyViewReceiptsEnabled ?: settings.readReceipts
+
+      if (accountData.donationSubscriberData != null) {
+        if (accountData.donationSubscriberData.subscriberId.size > 0) {
+          val remoteSubscriberId = SubscriberId.fromBytes(accountData.donationSubscriberData.subscriberId.toByteArray())
+          val localSubscriber = InAppPaymentsRepository.getSubscriber(InAppPaymentSubscriberRecord.Type.DONATION)
+
+          val subscriber = InAppPaymentSubscriberRecord(
+            remoteSubscriberId,
+            Currency.getInstance(accountData.donationSubscriberData.currencyCode),
+            InAppPaymentSubscriberRecord.Type.DONATION,
+            localSubscriber?.requiresCancel ?: accountData.donationSubscriberData.manuallyCancelled,
+            InAppPaymentsRepository.getLatestPaymentMethodType(InAppPaymentSubscriberRecord.Type.DONATION)
+          )
+
+          InAppPaymentsRepository.setSubscriber(subscriber)
+        }
 
-      if (accountData.subscriberId.size > 0) {
-        val subscriber = Subscriber(SubscriberId.fromBytes(accountData.subscriberId.toByteArray()), accountData.subscriberCurrencyCode)
-        SignalStore.signalDonationsValues().setSubscriber(subscriber)
+        if (accountData.donationSubscriberData.manuallyCancelled) {
+          SignalStore.inAppPayments.updateLocalStateForManualCancellation(InAppPaymentSubscriberRecord.Type.DONATION)
+        }
       }
 
       if (accountData.avatarUrlPath.isNotEmpty()) {
-        ApplicationDependencies.getJobManager().add(RetrieveProfileAvatarJob(Recipient.self().fresh(), accountData.avatarUrlPath))
+        AppDependencies.jobManager.add(RetrieveProfileAvatarJob(Recipient.self().fresh(), accountData.avatarUrlPath))
       }
 
       if (accountData.usernameLink != null) {
-        SignalStore.account().usernameLink = UsernameLinkComponents(
+        SignalStore.account.usernameLink = UsernameLinkComponents(
           accountData.usernameLink.entropy.toByteArray(),
           UuidUtil.parseOrThrow(accountData.usernameLink.serverId.toByteArray())
         )
-        SignalStore.misc().usernameQrCodeColorScheme = accountData.usernameLink.color.toLocalUsernameColor()
+        SignalStore.misc.usernameQrCodeColorScheme = accountData.usernameLink.color.toLocalUsernameColor()
       }
 
       if (settings.preferredReactionEmoji.isNotEmpty()) {
-        SignalStore.emojiValues().reactions = settings.preferredReactionEmoji
+        SignalStore.emoji.reactions = settings.preferredReactionEmoji
       }
 
       if (settings.hasCompletedUsernameOnboarding) {
-        SignalStore.uiHints().setHasCompletedUsernameOnboarding(true)
+        SignalStore.uiHints.setHasCompletedUsernameOnboarding(true)
       }
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AdHocCallBackupProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AdHocCallBackupProcessor.kt
index 1d61e5dd08..a4243261cf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AdHocCallBackupProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AdHocCallBackupProcessor.kt
@@ -18,8 +18,8 @@ object AdHocCallBackupProcessor {
 
   val TAG = Log.tag(AdHocCallBackupProcessor::class.java)
 
-  fun export(emitter: BackupFrameEmitter) {
-    SignalDatabase.calls.getAdhocCallsForBackup().use { reader ->
+  fun export(db: SignalDatabase, emitter: BackupFrameEmitter) {
+    db.callTable.getAdhocCallsForBackup().use { reader ->
       for (callLog in reader) {
         if (callLog != null) {
           emitter.emit(Frame(adHocCall = callLog))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/ChatBackupProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/ChatBackupProcessor.kt
index a6e13af11f..88c59a5af5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/ChatBackupProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/ChatBackupProcessor.kt
@@ -19,8 +19,8 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 object ChatBackupProcessor {
   val TAG = Log.tag(ChatBackupProcessor::class.java)
 
-  fun export(exportState: ExportState, emitter: BackupFrameEmitter) {
-    SignalDatabase.threads.getThreadsForBackup().use { reader ->
+  fun export(db: SignalDatabase, exportState: ExportState, emitter: BackupFrameEmitter) {
+    db.threadTable.getThreadsForBackup().use { reader ->
       for (chat in reader) {
         if (exportState.recipientIds.contains(chat.recipientId)) {
           exportState.threadIds.add(chat.id)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/ChatItemBackupProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/ChatItemBackupProcessor.kt
index 9e998fc946..3d70c14783 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/ChatItemBackupProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/ChatItemBackupProcessor.kt
@@ -18,11 +18,14 @@ import org.thoughtcrime.securesms.database.SignalDatabase
 object ChatItemBackupProcessor {
   val TAG = Log.tag(ChatItemBackupProcessor::class.java)
 
-  fun export(exportState: ExportState, emitter: BackupFrameEmitter) {
-    SignalDatabase.messages.getMessagesForBackup(exportState.backupTime, exportState.allowMediaBackup).use { chatItems ->
-      for (chatItem in chatItems) {
-        if (exportState.threadIds.contains(chatItem.chatId)) {
-          emitter.emit(Frame(chatItem = chatItem))
+  fun export(db: SignalDatabase, exportState: ExportState, emitter: BackupFrameEmitter) {
+    db.messageTable.getMessagesForBackup(exportState.backupTime, exportState.allowMediaBackup).use { chatItems ->
+      while (chatItems.hasNext()) {
+        val chatItem = chatItems.next()
+        if (chatItem != null) {
+          if (exportState.threadIds.contains(chatItem.chatId)) {
+            emitter.emit(Frame(chatItem = chatItem))
+          }
         }
       }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/RecipientBackupProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/RecipientBackupProcessor.kt
index 8888f99faa..8ce704c43b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/RecipientBackupProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/RecipientBackupProcessor.kt
@@ -24,15 +24,13 @@ import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 
-typealias BackupRecipient = org.thoughtcrime.securesms.backup.v2.proto.Recipient
-
 object RecipientBackupProcessor {
 
   val TAG = Log.tag(RecipientBackupProcessor::class.java)
 
-  fun export(state: ExportState, emitter: BackupFrameEmitter) {
-    val selfId = Recipient.self().id.toLong()
-    val releaseChannelId = SignalStore.releaseChannelValues().releaseChannelRecipientId
+  fun export(db: SignalDatabase, signalStore: SignalStore, state: ExportState, emitter: BackupFrameEmitter) {
+    val selfId = db.recipientTable.getByAci(signalStore.accountValues.aci!!).get().toLong()
+    val releaseChannelId = signalStore.releaseChannelValues.releaseChannelRecipientId
     if (releaseChannelId != null) {
       emitter.emit(
         Frame(
@@ -44,7 +42,7 @@ object RecipientBackupProcessor {
       )
     }
 
-    SignalDatabase.recipients.getContactsForBackup(selfId).use { reader ->
+    db.recipientTable.getContactsForBackup(selfId).use { reader ->
       for (backupRecipient in reader) {
         if (backupRecipient != null) {
           state.recipientIds.add(backupRecipient.id)
@@ -53,19 +51,19 @@ object RecipientBackupProcessor {
       }
     }
 
-    SignalDatabase.recipients.getGroupsForBackup().use { reader ->
+    db.recipientTable.getGroupsForBackup().use { reader ->
       for (backupRecipient in reader) {
         state.recipientIds.add(backupRecipient.id)
         emitter.emit(Frame(recipient = backupRecipient))
       }
     }
 
-    SignalDatabase.distributionLists.getAllForBackup().forEach {
+    db.distributionListTables.getAllForBackup().forEach {
       state.recipientIds.add(it.id)
       emitter.emit(Frame(recipient = it))
     }
 
-    SignalDatabase.callLinks.getCallLinksForBackup().forEach {
+    db.callLinkTable.getCallLinksForBackup().forEach {
       state.recipientIds.add(it.id)
       emitter.emit(Frame(recipient = it))
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/StickerBackupProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/StickerBackupProcessor.kt
new file mode 100644
index 0000000000..5b87a7c88f
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/StickerBackupProcessor.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.processor
+
+import okio.ByteString.Companion.toByteString
+import org.signal.core.util.Hex
+import org.thoughtcrime.securesms.backup.v2.proto.Frame
+import org.thoughtcrime.securesms.backup.v2.proto.StickerPack
+import org.thoughtcrime.securesms.backup.v2.stream.BackupFrameEmitter
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.StickerTable.StickerPackRecordReader
+import org.thoughtcrime.securesms.database.model.StickerPackRecord
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob
+
+object StickerBackupProcessor {
+  fun export(db: SignalDatabase, emitter: BackupFrameEmitter) {
+    StickerPackRecordReader(db.stickerTable.allStickerPacks).use { reader ->
+      var record: StickerPackRecord? = reader.next
+      while (record != null) {
+        if (record.isInstalled) {
+          val frame = record.toBackupFrame()
+          emitter.emit(frame)
+        }
+        record = reader.next
+      }
+    }
+  }
+
+  fun import(stickerPack: StickerPack) {
+    AppDependencies.jobManager.add(
+      StickerPackDownloadJob.forInstall(Hex.toStringCondensed(stickerPack.packId.toByteArray()), Hex.toStringCondensed(stickerPack.packKey.toByteArray()), false)
+    )
+  }
+}
+
+private fun StickerPackRecord.toBackupFrame(): Frame {
+  val packIdBytes = Hex.fromStringCondensed(packId)
+  val packKey = Hex.fromStringCondensed(packKey)
+  val pack = StickerPack(
+    packId = packIdBytes.toByteString(),
+    packKey = packKey.toByteString()
+  )
+  return Frame(stickerPack = pack)
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/BackupImportReader.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/BackupImportReader.kt
index f5b5e4d24c..80f83893eb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/BackupImportReader.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/BackupImportReader.kt
@@ -10,4 +10,6 @@ import org.thoughtcrime.securesms.backup.v2.proto.Frame
 
 interface BackupImportReader : Iterator<Frame>, AutoCloseable {
   fun getHeader(): BackupInfo?
+  fun getBytesRead(): Long
+  fun getStreamLength(): Long
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/EncryptedBackupReader.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/EncryptedBackupReader.kt
index 7031bca71f..7e8701d898 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/EncryptedBackupReader.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/EncryptedBackupReader.kt
@@ -5,6 +5,7 @@
 
 package org.thoughtcrime.securesms.backup.v2.stream
 
+import com.google.common.io.CountingInputStream
 import org.signal.core.util.readFully
 import org.signal.core.util.readNBytesOrThrow
 import org.signal.core.util.readVarInt32
@@ -32,21 +33,22 @@ import javax.crypto.spec.SecretKeySpec
 class EncryptedBackupReader(
   key: BackupKey,
   aci: ACI,
-  streamLength: Long,
+  val length: Long,
   dataStream: () -> InputStream
 ) : BackupImportReader {
 
   val backupInfo: BackupInfo?
   var next: Frame? = null
   val stream: InputStream
+  val countingStream: CountingInputStream
 
   init {
     val keyMaterial = key.deriveBackupSecrets(aci)
 
-    validateMac(keyMaterial.macKey, streamLength, dataStream())
+    validateMac(keyMaterial.macKey, length, dataStream())
 
-    val inputStream = dataStream()
-    val iv = inputStream.readNBytesOrThrow(16)
+    countingStream = CountingInputStream(dataStream())
+    val iv = countingStream.readNBytesOrThrow(16)
 
     val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding").apply {
       init(Cipher.DECRYPT_MODE, SecretKeySpec(keyMaterial.cipherKey, "AES"), IvParameterSpec(iv))
@@ -55,8 +57,8 @@ class EncryptedBackupReader(
     stream = GZIPInputStream(
       CipherInputStream(
         TruncatingInputStream(
-          wrapped = inputStream,
-          maxBytes = streamLength - MAC_SIZE
+          wrapped = countingStream,
+          maxBytes = length - MAC_SIZE
         ),
         cipher
       )
@@ -69,6 +71,10 @@ class EncryptedBackupReader(
     return backupInfo
   }
 
+  override fun getBytesRead() = countingStream.count
+
+  override fun getStreamLength() = length
+
   override fun hasNext(): Boolean {
     return next != null
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/PlainTextBackupReader.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/PlainTextBackupReader.kt
index 136ee50dd0..8ada418766 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/PlainTextBackupReader.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/PlainTextBackupReader.kt
@@ -5,6 +5,7 @@
 
 package org.thoughtcrime.securesms.backup.v2.stream
 
+import com.google.common.io.CountingInputStream
 import org.signal.core.util.readNBytesOrThrow
 import org.signal.core.util.readVarInt32
 import org.thoughtcrime.securesms.backup.v2.proto.BackupInfo
@@ -15,12 +16,14 @@ import java.io.InputStream
 /**
  * Reads a plaintext backup import stream one frame at a time.
  */
-class PlainTextBackupReader(val inputStream: InputStream) : BackupImportReader {
+class PlainTextBackupReader(val dataStream: InputStream, val length: Long) : BackupImportReader {
 
   val backupInfo: BackupInfo?
   var next: Frame? = null
+  val inputStream: CountingInputStream
 
   init {
+    inputStream = CountingInputStream(dataStream)
     backupInfo = readHeader()
     next = read()
   }
@@ -29,6 +32,10 @@ class PlainTextBackupReader(val inputStream: InputStream) : BackupImportReader {
     return backupInfo
   }
 
+  override fun getBytesRead() = inputStream.count
+
+  override fun getStreamLength() = length
+
   override fun hasNext(): Boolean {
     return next != null
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertBottomSheet.kt
index a0bb482a7d..8a0a3d2280 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertBottomSheet.kt
@@ -25,7 +25,9 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.core.os.BundleCompat
 import androidx.core.os.bundleOf
@@ -37,6 +39,7 @@ import org.signal.core.ui.Previews
 import org.signal.core.ui.SignalPreview
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
 
 /**
  * Notifies the user of an issue with their backup.
@@ -69,18 +72,17 @@ class BackupAlertBottomSheet : ComposeBottomSheetDialogFragment() {
   @Stable
   private fun performPrimaryAction() {
     when (backupAlert) {
-      BackupAlert.GENERIC -> {
+      BackupAlert.COULD_NOT_COMPLETE_BACKUP -> {
         // TODO [message-backups] -- Back up now
       }
-      BackupAlert.PAYMENT_PROCESSING -> {
-        // TODO [message-backups] -- Silence
-      }
+      BackupAlert.PAYMENT_PROCESSING -> Unit
       BackupAlert.MEDIA_BACKUPS_ARE_OFF -> {
         // TODO [message-backups] -- Download media now
       }
       BackupAlert.MEDIA_WILL_BE_DELETED_TODAY -> {
         // TODO [message-backups] -- Download media now
       }
+      BackupAlert.DISK_FULL -> Unit
     }
 
     dismissAllowingStateLoss()
@@ -89,7 +91,7 @@ class BackupAlertBottomSheet : ComposeBottomSheetDialogFragment() {
   @Stable
   private fun performSecondaryAction() {
     when (backupAlert) {
-      BackupAlert.GENERIC -> {
+      BackupAlert.COULD_NOT_COMPLETE_BACKUP -> {
         // TODO [message-backups] - Dismiss and notify later
       }
       BackupAlert.PAYMENT_PROCESSING -> error("PAYMENT_PROCESSING state does not support a secondary action.")
@@ -99,6 +101,7 @@ class BackupAlertBottomSheet : ComposeBottomSheetDialogFragment() {
       BackupAlert.MEDIA_WILL_BE_DELETED_TODAY -> {
         // TODO [message-backups] - Silence forever
       }
+      BackupAlert.DISK_FULL -> Unit
     }
 
     dismissAllowingStateLoss()
@@ -139,10 +142,18 @@ private fun BackupAlertSheetContent(
     )
 
     when (backupAlert) {
-      BackupAlert.GENERIC -> GenericBody()
-      BackupAlert.PAYMENT_PROCESSING -> PaymentProcessingBody()
-      BackupAlert.MEDIA_BACKUPS_ARE_OFF -> MediaBackupsAreOffBody()
+      BackupAlert.COULD_NOT_COMPLETE_BACKUP -> CouldNotCompleteBackup(
+        daysSinceLastBackup = 7 // TODO [message-backups]
+      )
+      BackupAlert.PAYMENT_PROCESSING -> PaymentProcessingBody(
+        paymentMethodType = InAppPaymentData.PaymentMethodType.GOOGLE_PAY // TODO [message-backups] -- Get this data from elsewhere... The active subscription object?
+      )
+      BackupAlert.MEDIA_BACKUPS_ARE_OFF -> MediaBackupsAreOffBody(30) // TODO [message-backups] -- Get this value from backend
       BackupAlert.MEDIA_WILL_BE_DELETED_TODAY -> MediaWillBeDeletedTodayBody()
+      BackupAlert.DISK_FULL -> DiskFullBody(
+        requiredSpace = "12 GB", // TODO [message-backups] Where does this value come from?
+        daysUntilDeletion = 30 // TODO [message-backups] Where does this value come from?
+      )
     }
 
     val secondaryActionResource = rememberSecondaryActionResource(backupAlert = backupAlert)
@@ -152,7 +163,7 @@ private fun BackupAlertSheetContent(
       onClick = onPrimaryActionClick,
       modifier = Modifier
         .defaultMinSize(minWidth = 220.dp)
-        .padding(top = 60.dp, bottom = padBottom)
+        .padding(bottom = padBottom)
     ) {
       Text(text = stringResource(id = rememberPrimaryActionResource(backupAlert = backupAlert)))
     }
@@ -166,30 +177,79 @@ private fun BackupAlertSheetContent(
 }
 
 @Composable
-private fun GenericBody() {
-  Text(text = "TODO")
+private fun CouldNotCompleteBackup(
+  daysSinceLastBackup: Int
+) {
+  Text(
+    text = stringResource(id = R.string.BackupAlertBottomSheet__your_device_hasnt, daysSinceLastBackup),
+    modifier = Modifier.padding(bottom = 60.dp)
+  )
 }
 
 @Composable
-private fun PaymentProcessingBody() {
-  Text(text = "TODO")
+private fun PaymentProcessingBody(paymentMethodType: InAppPaymentData.PaymentMethodType) {
+  Text(
+    text = stringResource(id = R.string.BackupAlertBottomSheet__were_having_trouble_collecting__google_pay),
+    textAlign = TextAlign.Center,
+    modifier = Modifier.padding(bottom = 60.dp)
+  )
 }
 
 @Composable
-private fun MediaBackupsAreOffBody() {
-  Text(text = "TODO")
+private fun MediaBackupsAreOffBody(
+  daysUntilDeletion: Long
+) {
+  Text(
+    text = pluralStringResource(id = R.plurals.BackupAlertBottomSheet__your_signal_media_backup_plan, daysUntilDeletion.toInt(), daysUntilDeletion),
+    textAlign = TextAlign.Center,
+    modifier = Modifier.padding(bottom = 24.dp)
+  )
+
+  Text(
+    text = stringResource(id = R.string.BackupAlertBottomSheet__you_can_begin_paying_for_backups_again),
+    textAlign = TextAlign.Center,
+    modifier = Modifier.padding(bottom = 36.dp)
+  )
 }
 
 @Composable
 private fun MediaWillBeDeletedTodayBody() {
-  Text(text = "TODO")
+  Text(
+    text = stringResource(id = R.string.BackupAlertBottomSheet__your_signal_media_backup_plan_has_been),
+    textAlign = TextAlign.Center,
+    modifier = Modifier.padding(bottom = 24.dp)
+  )
+
+  Text(
+    text = stringResource(id = R.string.BackupAlertBottomSheet__you_can_begin_paying_for_backups_again),
+    textAlign = TextAlign.Center,
+    modifier = Modifier.padding(bottom = 36.dp)
+  )
+}
+
+@Composable
+private fun DiskFullBody(
+  requiredSpace: String,
+  daysUntilDeletion: Long
+) {
+  Text(
+    text = stringResource(id = R.string.BackupAlertBottomSheet__your_device_does_not_have_enough_free_space, requiredSpace),
+    textAlign = TextAlign.Center,
+    modifier = Modifier.padding(bottom = 24.dp)
+  )
+
+  Text(
+    text = pluralStringResource(id = R.plurals.BackupAlertBottomSheet__if_you_choose_skip, daysUntilDeletion.toInt(), daysUntilDeletion), // TODO [message-backups] Learn More link
+    textAlign = TextAlign.Center,
+    modifier = Modifier.padding(bottom = 36.dp)
+  )
 }
 
 @Composable
 private fun rememberBackupsIconColors(backupAlert: BackupAlert): BackupsIconColors {
   return remember(backupAlert) {
     when (backupAlert) {
-      BackupAlert.GENERIC, BackupAlert.PAYMENT_PROCESSING -> BackupsIconColors.Warning
+      BackupAlert.COULD_NOT_COMPLETE_BACKUP, BackupAlert.PAYMENT_PROCESSING, BackupAlert.DISK_FULL -> BackupsIconColors.Warning
       BackupAlert.MEDIA_BACKUPS_ARE_OFF, BackupAlert.MEDIA_WILL_BE_DELETED_TODAY -> BackupsIconColors.Error
     }
   }
@@ -200,10 +260,11 @@ private fun rememberBackupsIconColors(backupAlert: BackupAlert): BackupsIconColo
 private fun rememberTitleResource(backupAlert: BackupAlert): Int {
   return remember(backupAlert) {
     when (backupAlert) {
-      BackupAlert.GENERIC -> R.string.default_error_msg // TODO [message-backups] -- Finalized copy
-      BackupAlert.PAYMENT_PROCESSING -> R.string.default_error_msg // TODO [message-backups] -- Finalized copy
-      BackupAlert.MEDIA_BACKUPS_ARE_OFF -> R.string.default_error_msg // TODO [message-backups] -- Finalized copy
-      BackupAlert.MEDIA_WILL_BE_DELETED_TODAY -> R.string.default_error_msg // TODO [message-backups] -- Finalized copy
+      BackupAlert.COULD_NOT_COMPLETE_BACKUP -> R.string.BackupAlertBottomSheet__couldnt_complete_backup
+      BackupAlert.PAYMENT_PROCESSING -> R.string.BackupAlertBottomSheet__cant_process_backup_payment
+      BackupAlert.MEDIA_BACKUPS_ARE_OFF -> R.string.BackupAlertBottomSheet__media_backups_are_off
+      BackupAlert.MEDIA_WILL_BE_DELETED_TODAY -> R.string.BackupAlertBottomSheet__your_media_will_be_deleted_today
+      BackupAlert.DISK_FULL -> R.string.BackupAlertBottomSheet__cant_complete_download
     }
   }
 }
@@ -212,10 +273,11 @@ private fun rememberTitleResource(backupAlert: BackupAlert): Int {
 private fun rememberPrimaryActionResource(backupAlert: BackupAlert): Int {
   return remember(backupAlert) {
     when (backupAlert) {
-      BackupAlert.GENERIC -> android.R.string.ok // TODO [message-backups] -- Finalized copy
-      BackupAlert.PAYMENT_PROCESSING -> android.R.string.ok // TODO [message-backups] -- Finalized copy
-      BackupAlert.MEDIA_BACKUPS_ARE_OFF -> android.R.string.ok // TODO [message-backups] -- Finalized copy
-      BackupAlert.MEDIA_WILL_BE_DELETED_TODAY -> android.R.string.ok // TODO [message-backups] -- Finalized copy
+      BackupAlert.COULD_NOT_COMPLETE_BACKUP -> android.R.string.ok // TODO [message-backups] -- Finalized copy
+      BackupAlert.PAYMENT_PROCESSING -> android.R.string.ok
+      BackupAlert.MEDIA_BACKUPS_ARE_OFF -> R.string.BackupAlertBottomSheet__download_media_now
+      BackupAlert.MEDIA_WILL_BE_DELETED_TODAY -> R.string.BackupAlertBottomSheet__download_media_now
+      BackupAlert.DISK_FULL -> android.R.string.ok
     }
   }
 }
@@ -224,10 +286,11 @@ private fun rememberPrimaryActionResource(backupAlert: BackupAlert): Int {
 private fun rememberSecondaryActionResource(backupAlert: BackupAlert): Int {
   return remember(backupAlert) {
     when (backupAlert) {
-      BackupAlert.GENERIC -> android.R.string.cancel // TODO [message-backups] -- Finalized copy
+      BackupAlert.COULD_NOT_COMPLETE_BACKUP -> android.R.string.cancel // TODO [message-backups] -- Finalized copy
       BackupAlert.PAYMENT_PROCESSING -> -1
-      BackupAlert.MEDIA_BACKUPS_ARE_OFF -> android.R.string.cancel // TODO [message-backups] -- Finalized copy
-      BackupAlert.MEDIA_WILL_BE_DELETED_TODAY -> android.R.string.cancel // TODO [message-backups] -- Finalized copy
+      BackupAlert.MEDIA_BACKUPS_ARE_OFF -> R.string.BackupAlertBottomSheet__download_later
+      BackupAlert.MEDIA_WILL_BE_DELETED_TODAY -> R.string.BackupAlertBottomSheet__dont_download_media
+      BackupAlert.DISK_FULL -> R.string.BackupAlertBottomSheet__skip
     }
   }
 }
@@ -237,7 +300,7 @@ private fun rememberSecondaryActionResource(backupAlert: BackupAlert): Int {
 private fun BackupAlertSheetContentPreviewGeneric() {
   Previews.BottomSheetPreview {
     BackupAlertSheetContent(
-      backupAlert = BackupAlert.GENERIC,
+      backupAlert = BackupAlert.COULD_NOT_COMPLETE_BACKUP,
       onPrimaryActionClick = {},
       onSecondaryActionClick = {}
     )
@@ -280,10 +343,23 @@ private fun BackupAlertSheetContentPreviewDelete() {
   }
 }
 
+@SignalPreview
+@Composable
+private fun BackupAlertSheetContentPreviewDiskFull() {
+  Previews.BottomSheetPreview {
+    BackupAlertSheetContent(
+      backupAlert = BackupAlert.DISK_FULL,
+      onPrimaryActionClick = {},
+      onSecondaryActionClick = {}
+    )
+  }
+}
+
 @Parcelize
 enum class BackupAlert : Parcelable {
-  GENERIC,
+  COULD_NOT_COMPLETE_BACKUP,
   PAYMENT_PROCESSING,
   MEDIA_BACKUPS_ARE_OFF,
-  MEDIA_WILL_BE_DELETED_TODAY
+  MEDIA_WILL_BE_DELETED_TODAY,
+  DISK_FULL
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertDelegate.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertDelegate.kt
new file mode 100644
index 0000000000..542e9bc6c5
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/BackupAlertDelegate.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.ui
+
+import androidx.fragment.app.FragmentManager
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.coroutineScope
+import androidx.lifecycle.repeatOnLifecycle
+import kotlinx.coroutines.launch
+
+/**
+ * Delegate that controls whether and which backup alert sheet is displayed.
+ */
+object BackupAlertDelegate {
+  @JvmStatic
+  fun delegate(fragmentManager: FragmentManager, lifecycle: Lifecycle) {
+    lifecycle.coroutineScope.launch {
+      lifecycle.repeatOnLifecycle(Lifecycle.State.RESUMED) {
+        // TODO [message-backups]
+        // 1. Get unnotified backup upload failures
+        // 2. Get unnotified backup download failures
+        // 3. Get unnotified backup payment failures
+
+        // Decide which do display
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatus.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatus.kt
index 023b295a46..a40b681d6a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatus.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/status/BackupStatus.kt
@@ -5,7 +5,6 @@
 
 package org.thoughtcrime.securesms.backup.v2.ui.status
 
-import android.content.res.Configuration
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.compose.foundation.background
@@ -27,11 +26,11 @@ import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.signal.core.ui.Buttons
 import org.signal.core.ui.Icons
 import org.signal.core.ui.Previews
+import org.signal.core.ui.SignalPreview
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.backup.v2.ui.BackupsIconColors
 import kotlin.math.max
@@ -71,13 +70,13 @@ fun BackupStatus(
         .weight(1f)
     ) {
       Text(
-        text = stringResource(id = data.titleRes),
+        text = data.title,
         style = MaterialTheme.typography.bodyMedium
       )
 
       if (data.progress >= 0f) {
         LinearProgressIndicator(
-          progress = data.progress,
+          progress = { data.progress },
           strokeCap = StrokeCap.Round,
           modifier = Modifier
             .fillMaxWidth()
@@ -105,8 +104,7 @@ fun BackupStatus(
   }
 }
 
-@Preview
-@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
+@SignalPreview
 @Composable
 fun BackupStatusPreview() {
   Previews.Preview {
@@ -118,7 +116,7 @@ fun BackupStatusPreview() {
       )
 
       BackupStatus(
-        data = BackupStatusData.NotEnoughFreeSpace
+        data = BackupStatusData.NotEnoughFreeSpace("12 GB")
       )
 
       BackupStatus(
@@ -138,8 +136,8 @@ sealed interface BackupStatusData {
   @get:DrawableRes
   val iconRes: Int
 
-  @get:StringRes
-  val titleRes: Int
+  @get:Composable
+  val title: String
 
   val iconColors: BackupsIconColors
 
@@ -154,18 +152,28 @@ sealed interface BackupStatusData {
   /**
    * Generic failure
    */
-  object CouldNotCompleteBackup : BackupStatusData {
+  data object CouldNotCompleteBackup : BackupStatusData {
     override val iconRes: Int = R.drawable.symbol_backup_light
-    override val titleRes: Int = R.string.default_error_msg
+
+    override val title: String
+      @Composable
+      get() = stringResource(R.string.default_error_msg)
+
     override val iconColors: BackupsIconColors = BackupsIconColors.Warning
   }
 
   /**
    * User does not have enough space on their device to complete backup restoration
    */
-  object NotEnoughFreeSpace : BackupStatusData {
+  class NotEnoughFreeSpace(
+    private val requiredSpace: String
+  ) : BackupStatusData {
     override val iconRes: Int = R.drawable.symbol_backup_light
-    override val titleRes: Int = R.string.default_error_msg
+
+    override val title: String
+      @Composable
+      get() = stringResource(R.string.BackupStatus__free_up_s_of_space_to_download_your_media, requiredSpace)
+
     override val iconColors: BackupsIconColors = BackupsIconColors.Warning
     override val actionRes: Int = R.string.registration_activity__skip
   }
@@ -181,13 +189,16 @@ sealed interface BackupStatusData {
     override val iconRes: Int = R.drawable.symbol_backup_light
     override val iconColors: BackupsIconColors = BackupsIconColors.Normal
 
-    override val titleRes: Int = when (status) {
-      Status.NONE -> R.string.default_error_msg
-      Status.LOW_BATTERY -> R.string.default_error_msg
-      Status.WAITING_FOR_INTERNET -> R.string.default_error_msg
-      Status.WAITING_FOR_WIFI -> R.string.default_error_msg
-      Status.FINISHED -> R.string.default_error_msg
-    }
+    override val title: String
+      @Composable get() = stringResource(
+        when (status) {
+          Status.NONE -> R.string.default_error_msg
+          Status.LOW_BATTERY -> R.string.default_error_msg
+          Status.WAITING_FOR_INTERNET -> R.string.default_error_msg
+          Status.WAITING_FOR_WIFI -> R.string.default_error_msg
+          Status.FINISHED -> R.string.default_error_msg
+        }
+      )
 
     override val statusRes: Int = when (status) {
       Status.NONE -> R.string.default_error_msg
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/ConfirmBackupCancellationDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/ConfirmBackupCancellationDialog.kt
new file mode 100644
index 0000000000..3363b35a09
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/ConfirmBackupCancellationDialog.kt
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.ui.subscription
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.AlertDialogDefaults
+import androidx.compose.material3.BasicAlertDialog
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import org.signal.core.ui.Previews
+import org.signal.core.ui.SignalPreview
+import org.thoughtcrime.securesms.R
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ConfirmBackupCancellationDialog(
+  onConfirmAndDownloadNow: () -> Unit,
+  onConfirmAndDownloadLater: () -> Unit,
+  onKeepSubscriptionClick: () -> Unit
+) {
+  BasicAlertDialog(onDismissRequest = onKeepSubscriptionClick) {
+    Surface(
+      shape = AlertDialogDefaults.shape,
+      color = AlertDialogDefaults.containerColor
+    ) {
+      Column {
+        Text(
+          text = stringResource(id = R.string.ConfirmBackupCancellationDialog__confirm_cancellation),
+          color = AlertDialogDefaults.titleContentColor,
+          style = MaterialTheme.typography.headlineSmall,
+          modifier = Modifier
+            .padding(top = 24.dp)
+            .padding(horizontal = 24.dp)
+        )
+
+        Text(
+          text = stringResource(id = R.string.ConfirmBackupCancellationDialog__you_wont_be_charged_again),
+          color = AlertDialogDefaults.textContentColor,
+          style = MaterialTheme.typography.bodyMedium,
+          modifier = Modifier
+            .padding(top = 16.dp)
+            .padding(horizontal = 24.dp)
+        )
+
+        TextButton(
+          onClick = onConfirmAndDownloadNow,
+          modifier = Modifier
+            .align(Alignment.End)
+            .padding(end = 12.dp)
+        ) {
+          Text(
+            text = stringResource(id = R.string.ConfirmBackupCancellationDialog__confirm_and_download_now)
+          )
+        }
+
+        TextButton(
+          onClick = onConfirmAndDownloadLater,
+          modifier = Modifier
+            .align(Alignment.End)
+            .padding(end = 12.dp)
+        ) {
+          Text(
+            text = stringResource(id = R.string.ConfirmBackupCancellationDialog__confirm_and_download_later)
+          )
+        }
+
+        TextButton(
+          onClick = onKeepSubscriptionClick,
+          modifier = Modifier
+            .align(Alignment.End)
+            .padding(end = 12.dp, bottom = 12.dp)
+        ) {
+          Text(
+            text = stringResource(id = R.string.ConfirmBackupCancellationDialog__keep_subscription)
+          )
+        }
+      }
+    }
+  }
+}
+
+@SignalPreview
+@Composable
+private fun ConfirmCancellationDialogPreview() {
+  Previews.Preview {
+    ConfirmBackupCancellationDialog(
+      onKeepSubscriptionClick = {},
+      onConfirmAndDownloadNow = {},
+      onConfirmAndDownloadLater = {}
+    )
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsCheckoutSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsCheckoutSheet.kt
index 3f85ab3043..a1980d4803 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsCheckoutSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsCheckoutSheet.kt
@@ -11,12 +11,14 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement.Absolute.spacedBy
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.SheetState
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
@@ -30,49 +32,59 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.view.updateLayoutParams
+import kotlinx.collections.immutable.persistentListOf
 import org.signal.core.ui.BottomSheets
 import org.signal.core.ui.Buttons
 import org.signal.core.ui.Previews
+import org.signal.core.util.money.FiatMoney
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
-//import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewayResponse
-//import org.thoughtcrime.securesms.components.settings.app.subscription.models.GooglePayButton
+import org.thoughtcrime.securesms.components.settings.app.subscription.models.GooglePayButton
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
 import org.thoughtcrime.securesms.databinding.PaypalButtonBinding
 import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import java.math.BigDecimal
+import java.util.Currency
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MessageBackupsCheckoutSheet(
-  messageBackupTier: MessageBackupTier,
-//  availablePaymentGateways: List<GatewayResponse.Gateway>,
+  messageBackupsType: MessageBackupsType,
+  availablePaymentMethods: List<InAppPaymentData.PaymentMethodType>,
+  sheetState: SheetState,
   onDismissRequest: () -> Unit,
-//  onPaymentGatewaySelected: (GatewayResponse.Gateway) -> Unit
+  onPaymentMethodSelected: (InAppPaymentData.PaymentMethodType) -> Unit
 ) {
   ModalBottomSheet(
     onDismissRequest = onDismissRequest,
+    sheetState = sheetState,
     dragHandle = { BottomSheets.Handle() },
-    modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+    modifier = Modifier.padding()
   ) {
-    SheetContent(
-      messageBackupTier = messageBackupTier,
-//      availablePaymentGateways = availablePaymentGateways,
-//      onPaymentGatewaySelected = onPaymentGatewaySelected
-    )
+    Column(
+      horizontalAlignment = Alignment.CenterHorizontally,
+      modifier = Modifier
+        .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+        .navigationBarsPadding()
+    ) {
+      SheetContent(
+        messageBackupsType = messageBackupsType,
+        availablePaymentGateways = availablePaymentMethods,
+        onPaymentGatewaySelected = onPaymentMethodSelected
+      )
+    }
   }
 }
 
 @Composable
 private fun SheetContent(
-  messageBackupTier: MessageBackupTier,
-//  availablePaymentGateways: List<GatewayResponse.Gateway>,
-//  onPaymentGatewaySelected: (GatewayResponse.Gateway) -> Unit
+  messageBackupsType: MessageBackupsType,
+  availablePaymentGateways: List<InAppPaymentData.PaymentMethodType>,
+  onPaymentGatewaySelected: (InAppPaymentData.PaymentMethodType) -> Unit
 ) {
   val resources = LocalContext.current.resources
-  val backupTypeDetails = remember(messageBackupTier) {
-    getTierDetails(messageBackupTier)
-  }
-  val formattedPrice = remember(backupTypeDetails.pricePerMonth) {
-    FiatMoneyUtil.format(resources, backupTypeDetails.pricePerMonth, FiatMoneyUtil.formatOptions().trimZerosAfterDecimal())
+  val formattedPrice = remember(messageBackupsType.pricePerMonth) {
+    FiatMoneyUtil.format(resources, messageBackupsType.pricePerMonth, FiatMoneyUtil.formatOptions().trimZerosAfterDecimal())
   }
 
   Text(
@@ -88,41 +100,44 @@ private fun SheetContent(
   )
 
   MessageBackupsTypeBlock(
-    messageBackupsType = backupTypeDetails,
+    messageBackupsType = messageBackupsType,
+    isCurrent = false,
     isSelected = false,
     onSelected = {},
     enabled = false,
     modifier = Modifier.padding(top = 24.dp)
   )
 
-//  Column(
-//    verticalArrangement = spacedBy(12.dp),
-//    modifier = Modifier.padding(top = 48.dp, bottom = 24.dp)
-//  ) {
-//    availablePaymentGateways.forEach {
-//      when (it) {
-//        GatewayResponse.Gateway.GOOGLE_PAY -> GooglePayButton {
-//          onPaymentGatewaySelected(GatewayResponse.Gateway.GOOGLE_PAY)
-//        }
-//
-//        GatewayResponse.Gateway.PAYPAL -> PayPalButton {
-//          onPaymentGatewaySelected(GatewayResponse.Gateway.PAYPAL)
-//        }
-//
-//        GatewayResponse.Gateway.CREDIT_CARD -> CreditOrDebitCardButton {
-//          onPaymentGatewaySelected(GatewayResponse.Gateway.CREDIT_CARD)
-//        }
-//
-//        GatewayResponse.Gateway.SEPA_DEBIT -> SepaButton {
-//          onPaymentGatewaySelected(GatewayResponse.Gateway.SEPA_DEBIT)
-//        }
-//
-//        GatewayResponse.Gateway.IDEAL -> IdealButton {
-//          onPaymentGatewaySelected(GatewayResponse.Gateway.IDEAL)
-//        }
-//      }
-//    }
-//  }
+  Column(
+    verticalArrangement = spacedBy(12.dp),
+    modifier = Modifier.padding(top = 48.dp, bottom = 24.dp)
+  ) {
+    availablePaymentGateways.forEach {
+      when (it) {
+        InAppPaymentData.PaymentMethodType.GOOGLE_PAY -> GooglePayButton {
+          onPaymentGatewaySelected(InAppPaymentData.PaymentMethodType.GOOGLE_PAY)
+        }
+
+        InAppPaymentData.PaymentMethodType.PAYPAL -> PayPalButton {
+          onPaymentGatewaySelected(InAppPaymentData.PaymentMethodType.PAYPAL)
+        }
+
+        InAppPaymentData.PaymentMethodType.CARD -> CreditOrDebitCardButton {
+          onPaymentGatewaySelected(InAppPaymentData.PaymentMethodType.CARD)
+        }
+
+        InAppPaymentData.PaymentMethodType.SEPA_DEBIT -> SepaButton {
+          onPaymentGatewaySelected(InAppPaymentData.PaymentMethodType.SEPA_DEBIT)
+        }
+
+        InAppPaymentData.PaymentMethodType.IDEAL -> IdealButton {
+          onPaymentGatewaySelected(InAppPaymentData.PaymentMethodType.IDEAL)
+        }
+
+        InAppPaymentData.PaymentMethodType.UNKNOWN -> error("Unsupported payment method type $it")
+      }
+    }
+  }
 }
 
 @Composable
@@ -146,19 +161,19 @@ private fun PayPalButton(
   }
 }
 
-//@Composable
-//private fun GooglePayButton(
-//  onClick: () -> Unit
-//) {
-//  val model = GooglePayButton.Model(onClick, true)
-//
-//  AndroidView(factory = {
-//    LayoutInflater.from(it).inflate(R.layout.google_pay_button_pref, null)
-//  }) {
-//    val holder = GooglePayButton.ViewHolder(it)
-//    holder.bind(model)
-//  }
-//}
+@Composable
+private fun GooglePayButton(
+  onClick: () -> Unit
+) {
+  val model = GooglePayButton.Model(onClick, true)
+
+  AndroidView(factory = {
+    LayoutInflater.from(it).inflate(R.layout.google_pay_button_pref, null)
+  }) {
+    val holder = GooglePayButton.ViewHolder(it)
+    holder.bind(model)
+  }
+}
 
 @Composable
 private fun SepaButton(
@@ -221,7 +236,7 @@ private fun CreditOrDebitCardButton(
 @Preview
 @Composable
 private fun MessageBackupsCheckoutSheetPreview() {
-//  val availablePaymentGateways = GatewayResponse.Gateway.values().toList()
+  val availablePaymentGateways = InAppPaymentData.PaymentMethodType.values().toList() - InAppPaymentData.PaymentMethodType.UNKNOWN
 
   Previews.Preview {
     Column(
@@ -229,9 +244,14 @@ private fun MessageBackupsCheckoutSheetPreview() {
       modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
     ) {
       SheetContent(
-        messageBackupTier = MessageBackupTier.PAID,
-//        availablePaymentGateways = availablePaymentGateways,
-//        onPaymentGatewaySelected = {}
+        messageBackupsType = MessageBackupsType(
+          tier = MessageBackupTier.FREE,
+          title = "Free",
+          pricePerMonth = FiatMoney(BigDecimal.ZERO, Currency.getInstance("USD")),
+          features = persistentListOf()
+        ),
+        availablePaymentGateways = availablePaymentGateways,
+        onPaymentGatewaySelected = {}
       )
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowActivity.kt
deleted file mode 100644
index bdd8452ac2..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowActivity.kt
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.backup.v2.ui.subscription
-
-import android.os.Bundle
-import androidx.activity.compose.setContent
-import androidx.compose.animation.slideInHorizontally
-import androidx.compose.animation.slideOutHorizontally
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.navigation.NavController
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.dialog
-import androidx.navigation.compose.rememberNavController
-import org.signal.core.ui.theme.SignalTheme
-import org.thoughtcrime.securesms.PassphraseRequiredActivity
-import org.thoughtcrime.securesms.util.viewModel
-
-class MessageBackupsFlowActivity : PassphraseRequiredActivity() {
-
-  private val viewModel: MessageBackupsFlowViewModel by viewModel { MessageBackupsFlowViewModel() }
-
-  override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
-    setContent {
-      SignalTheme {
-        val state by viewModel.state
-        val navController = rememberNavController()
-
-        fun MessageBackupsScreen.next() {
-          val nextScreen = viewModel.goToNextScreen(this)
-          if (nextScreen == MessageBackupsScreen.COMPLETED) {
-            finishAfterTransition()
-            return
-          }
-          if (nextScreen != this) {
-            navController.navigate(nextScreen.name)
-          }
-        }
-
-        fun NavController.popOrFinish() {
-          if (popBackStack()) {
-            return
-          }
-
-          finishAfterTransition()
-        }
-
-        LaunchedEffect(Unit) {
-          navController.setLifecycleOwner(this@MessageBackupsFlowActivity)
-          navController.setOnBackPressedDispatcher(this@MessageBackupsFlowActivity.onBackPressedDispatcher)
-          navController.enableOnBackPressed(true)
-        }
-
-        NavHost(
-          navController = navController,
-          startDestination = if (state.currentMessageBackupTier == null) MessageBackupsScreen.EDUCATION.name else MessageBackupsScreen.TYPE_SELECTION.name,
-          enterTransition = { slideInHorizontally(initialOffsetX = { it }) },
-          exitTransition = { slideOutHorizontally(targetOffsetX = { -it }) },
-          popEnterTransition = { slideInHorizontally(initialOffsetX = { -it }) },
-          popExitTransition = { slideOutHorizontally(targetOffsetX = { it }) }
-        ) {
-          composable(route = MessageBackupsScreen.EDUCATION.name) {
-            MessageBackupsEducationScreen(
-              onNavigationClick = navController::popOrFinish,
-              onEnableBackups = { MessageBackupsScreen.EDUCATION.next() },
-              onLearnMore = {}
-            )
-          }
-
-          composable(route = MessageBackupsScreen.PIN_EDUCATION.name) {
-            MessageBackupsPinEducationScreen(
-              onNavigationClick = navController::popOrFinish,
-              onGeneratePinClick = {},
-              onUseCurrentPinClick = { MessageBackupsScreen.PIN_EDUCATION.next() },
-              recommendedPinSize = 16 // TODO [message-backups] This value should come from some kind of config
-            )
-          }
-
-          composable(route = MessageBackupsScreen.PIN_CONFIRMATION.name) {
-            MessageBackupsPinConfirmationScreen(
-              pin = state.pin,
-              onPinChanged = viewModel::onPinEntryUpdated,
-              pinKeyboardType = state.pinKeyboardType,
-              onPinKeyboardTypeSelected = viewModel::onPinKeyboardTypeUpdated,
-              onNextClick = { MessageBackupsScreen.PIN_CONFIRMATION.next() }
-            )
-          }
-
-          composable(route = MessageBackupsScreen.TYPE_SELECTION.name) {
-            MessageBackupsTypeSelectionScreen(
-              selectedBackupTier = state.selectedMessageBackupTier,
-              availableBackupTiers = state.availableBackupTiers,
-              onMessageBackupsTierSelected = viewModel::onMessageBackupTierUpdated,
-              onNavigationClick = navController::popOrFinish,
-              onReadMoreClicked = {},
-              onNextClicked = { MessageBackupsScreen.TYPE_SELECTION.next() }
-            )
-          }
-
-          dialog(route = MessageBackupsScreen.CHECKOUT_SHEET.name) {
-            MessageBackupsCheckoutSheet(
-              messageBackupTier = state.selectedMessageBackupTier!!,
-//              availablePaymentGateways = state.availablePaymentGateways,
-              onDismissRequest = navController::popOrFinish,
-//              onPaymentGatewaySelected = {
-//                viewModel.onPaymentGatewayUpdated(it)
-//                MessageBackupsScreen.CHECKOUT_SHEET.next()
-//              }
-            )
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowFragment.kt
new file mode 100644
index 0000000000..ea07db4c00
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowFragment.kt
@@ -0,0 +1,254 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.ui.subscription
+
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import androidx.navigation.fragment.findNavController
+import io.reactivex.rxjava3.processors.PublishProcessor
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentCheckoutDelegate
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentProcessorAction
+import org.thoughtcrime.securesms.compose.ComposeFragment
+import org.thoughtcrime.securesms.compose.Nav
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
+import org.thoughtcrime.securesms.util.viewModel
+
+/**
+ * Handles the selection, payment, and changing of a user's backup tier.
+ */
+class MessageBackupsFlowFragment : ComposeFragment(), InAppPaymentCheckoutDelegate.Callback {
+
+  private val viewModel: MessageBackupsFlowViewModel by viewModel { MessageBackupsFlowViewModel() }
+
+  private val inAppPaymentIdProcessor = PublishProcessor.create<InAppPaymentTable.InAppPaymentId>()
+
+  @OptIn(ExperimentalMaterial3Api::class)
+  @Composable
+  override fun FragmentContent() {
+    val state by viewModel.stateFlow.collectAsState()
+    val navController = rememberNavController()
+
+    val checkoutDelegate = remember {
+      InAppPaymentCheckoutDelegate(this, this, inAppPaymentIdProcessor)
+    }
+
+    LaunchedEffect(state.inAppPayment?.id) {
+      val inAppPaymentId = state.inAppPayment?.id
+      if (inAppPaymentId != null) {
+        inAppPaymentIdProcessor.onNext(inAppPaymentId)
+      }
+    }
+
+    val checkoutSheetState = rememberModalBottomSheetState(
+      skipPartiallyExpanded = true
+    )
+
+    LaunchedEffect(Unit) {
+      navController.setLifecycleOwner(this@MessageBackupsFlowFragment)
+      navController.setOnBackPressedDispatcher(requireActivity().onBackPressedDispatcher)
+      navController.enableOnBackPressed(true)
+    }
+
+    Nav.Host(
+      navController = navController,
+      startDestination = state.startScreen.name
+    ) {
+      composable(route = MessageBackupsScreen.EDUCATION.name) {
+        MessageBackupsEducationScreen(
+          onNavigationClick = viewModel::goToPreviousScreen,
+          onEnableBackups = viewModel::goToNextScreen,
+          onLearnMore = {}
+        )
+      }
+
+      composable(route = MessageBackupsScreen.PIN_EDUCATION.name) {
+        MessageBackupsPinEducationScreen(
+          onNavigationClick = viewModel::goToPreviousScreen,
+          onGeneratePinClick = {},
+          onUseCurrentPinClick = viewModel::goToNextScreen,
+          recommendedPinSize = 16 // TODO [message-backups] This value should come from some kind of config
+        )
+      }
+
+      composable(route = MessageBackupsScreen.PIN_CONFIRMATION.name) {
+        MessageBackupsPinConfirmationScreen(
+          pin = state.pin,
+          onPinChanged = viewModel::onPinEntryUpdated,
+          pinKeyboardType = state.pinKeyboardType,
+          onPinKeyboardTypeSelected = viewModel::onPinKeyboardTypeUpdated,
+          onNextClick = viewModel::goToNextScreen
+        )
+      }
+
+      composable(route = MessageBackupsScreen.TYPE_SELECTION.name) {
+        MessageBackupsTypeSelectionScreen(
+          currentBackupTier = state.currentMessageBackupTier,
+          selectedBackupTier = state.selectedMessageBackupTier,
+          availableBackupTypes = state.availableBackupTypes,
+          onMessageBackupsTierSelected = viewModel::onMessageBackupTierUpdated,
+          onNavigationClick = viewModel::goToPreviousScreen,
+          onReadMoreClicked = {},
+          onCancelSubscriptionClicked = viewModel::displayCancellationDialog,
+          onNextClicked = viewModel::goToNextScreen
+        )
+
+        if (state.screen == MessageBackupsScreen.CHECKOUT_SHEET) {
+          MessageBackupsCheckoutSheet(
+            messageBackupsType = state.availableBackupTypes.first { it.tier == state.selectedMessageBackupTier!! },
+            availablePaymentMethods = state.availablePaymentMethods,
+            sheetState = checkoutSheetState,
+            onDismissRequest = {
+              viewModel.goToPreviousScreen()
+            },
+            onPaymentMethodSelected = {
+              viewModel.onPaymentMethodUpdated(it)
+              viewModel.goToNextScreen()
+            }
+          )
+        }
+
+        if (state.screen == MessageBackupsScreen.CANCELLATION_DIALOG) {
+          ConfirmBackupCancellationDialog(
+            onConfirmAndDownloadNow = {
+              // TODO [message-backups] Set appropriate state to handle post-cancellation action.
+              viewModel.goToNextScreen()
+            },
+            onConfirmAndDownloadLater = {
+              // TODO [message-backups] Set appropriate state to handle post-cancellation action.
+              viewModel.goToNextScreen()
+            },
+            onKeepSubscriptionClick = viewModel::goToPreviousScreen
+          )
+        }
+      }
+    }
+
+    LaunchedEffect(state.screen) {
+      val route = navController.currentDestination?.route ?: return@LaunchedEffect
+      if (route == state.screen.name) {
+        return@LaunchedEffect
+      }
+
+      if (state.screen == MessageBackupsScreen.COMPLETED) {
+        if (!findNavController().popBackStack()) {
+          requireActivity().finishAfterTransition()
+        }
+        return@LaunchedEffect
+      }
+
+      if (state.screen == MessageBackupsScreen.CREATING_IN_APP_PAYMENT) {
+        return@LaunchedEffect
+      }
+
+      if (state.screen == MessageBackupsScreen.PROCESS_PAYMENT) {
+        checkoutDelegate.handleGatewaySelectionResponse(state.inAppPayment!!)
+        viewModel.goToPreviousScreen()
+        return@LaunchedEffect
+      }
+
+      if (state.screen == MessageBackupsScreen.PROCESS_CANCELLATION) {
+        cancelSubscription()
+        viewModel.goToPreviousScreen()
+        return@LaunchedEffect
+      }
+
+      if (state.screen == MessageBackupsScreen.CHECKOUT_SHEET) {
+        return@LaunchedEffect
+      }
+
+      if (state.screen == MessageBackupsScreen.CANCELLATION_DIALOG) {
+        return@LaunchedEffect
+      }
+
+      val routeScreen = MessageBackupsScreen.valueOf(route)
+      if (routeScreen.isAfter(state.screen)) {
+        navController.popBackStack()
+      } else {
+        navController.navigate(state.screen.name)
+      }
+    }
+  }
+
+  private fun cancelSubscription() {
+    findNavController().safeNavigate(
+      MessageBackupsFlowFragmentDirections.actionDonateToSignalFragmentToStripePaymentInProgressFragment(
+        InAppPaymentProcessorAction.CANCEL_SUBSCRIPTION,
+        null,
+        InAppPaymentType.RECURRING_BACKUP
+      )
+    )
+  }
+
+  override fun navigateToStripePaymentInProgress(inAppPayment: InAppPaymentTable.InAppPayment) {
+    findNavController().safeNavigate(
+      MessageBackupsFlowFragmentDirections.actionDonateToSignalFragmentToStripePaymentInProgressFragment(
+        InAppPaymentProcessorAction.PROCESS_NEW_IN_APP_PAYMENT,
+        inAppPayment,
+        inAppPayment.type
+      )
+    )
+  }
+
+  override fun navigateToPayPalPaymentInProgress(inAppPayment: InAppPaymentTable.InAppPayment) {
+    findNavController().safeNavigate(
+      MessageBackupsFlowFragmentDirections.actionDonateToSignalFragmentToPaypalPaymentInProgressFragment(
+        InAppPaymentProcessorAction.PROCESS_NEW_IN_APP_PAYMENT,
+        inAppPayment,
+        inAppPayment.type
+      )
+    )
+  }
+
+  override fun navigateToCreditCardForm(inAppPayment: InAppPaymentTable.InAppPayment) {
+    findNavController().safeNavigate(
+      MessageBackupsFlowFragmentDirections.actionDonateToSignalFragmentToCreditCardFragment(inAppPayment)
+    )
+  }
+
+  override fun navigateToIdealDetailsFragment(inAppPayment: InAppPaymentTable.InAppPayment) {
+    findNavController().safeNavigate(
+      MessageBackupsFlowFragmentDirections.actionDonateToSignalFragmentToIdealTransferDetailsFragment(inAppPayment)
+    )
+  }
+
+  override fun navigateToBankTransferMandate(inAppPayment: InAppPaymentTable.InAppPayment) {
+    findNavController().safeNavigate(
+      MessageBackupsFlowFragmentDirections.actionDonateToSignalFragmentToBankTransferMandateFragment(inAppPayment)
+    )
+  }
+
+  override fun onPaymentComplete(inAppPayment: InAppPaymentTable.InAppPayment) {
+    // TODO [message-backups] What do? probably some kind of success thing?
+    if (!findNavController().popBackStack()) {
+      requireActivity().finishAfterTransition()
+    }
+  }
+
+  override fun onSubscriptionCancelled(inAppPaymentType: InAppPaymentType) {
+    if (!findNavController().popBackStack()) {
+      requireActivity().finishAfterTransition()
+    }
+  }
+
+  override fun onProcessorActionProcessed() = Unit
+
+  override fun onUserLaunchedAnExternalApplication() {
+    // TODO [message-backups] What do? Are we even supporting bank transfers?
+  }
+
+  override fun navigateToDonationPending(inAppPayment: InAppPaymentTable.InAppPayment) {
+    // TODO [message-backups] What do? Are we even supporting bank transfers?
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowRepository.kt
deleted file mode 100644
index 791b352f3f..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowRepository.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.backup.v2.ui.subscription
-
-class MessageBackupsFlowRepository
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowState.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowState.kt
index 126430ef2e..9608c57d40 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowState.kt
@@ -6,16 +6,20 @@
 package org.thoughtcrime.securesms.backup.v2.ui.subscription
 
 import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
-//import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewayResponse
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.lock.v2.PinKeyboardType
 
 data class MessageBackupsFlowState(
-  val selectedMessageBackupTier: MessageBackupTier? = null,
-  val currentMessageBackupTier: MessageBackupTier? = null,
-  val availableBackupTiers: List<MessageBackupTier> = emptyList(),
-//  val selectedPaymentGateway: GatewayResponse.Gateway? = null,
-//  val availablePaymentGateways: List<GatewayResponse.Gateway> = emptyList(),
+  val selectedMessageBackupTier: MessageBackupTier? = SignalStore.backup.backupTier,
+  val currentMessageBackupTier: MessageBackupTier? = SignalStore.backup.backupTier,
+  val availableBackupTypes: List<MessageBackupsType> = emptyList(),
+  val selectedPaymentMethod: InAppPaymentData.PaymentMethodType? = null,
+  val availablePaymentMethods: List<InAppPaymentData.PaymentMethodType> = emptyList(),
   val pin: String = "",
-  val pinKeyboardType: PinKeyboardType = SignalStore.pinValues().keyboardType
+  val pinKeyboardType: PinKeyboardType = SignalStore.pin.keyboardType,
+  val inAppPayment: InAppPaymentTable.InAppPayment? = null,
+  val startScreen: MessageBackupsScreen,
+  val screen: MessageBackupsScreen = startScreen
 )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowViewModel.kt
index 53fbd08dc0..74d6e7db4f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowViewModel.kt
@@ -7,61 +7,126 @@ package org.thoughtcrime.securesms.backup.v2.ui.subscription
 
 import android.text.TextUtils
 import androidx.compose.runtime.State
-import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
-//import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewayResponse
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatValue
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppDonations
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toPaymentSourceType
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewayOrderStrategy
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.lock.v2.PinKeyboardType
 import org.thoughtcrime.securesms.lock.v2.SvrConstants
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.whispersystems.signalservice.api.kbs.PinHashUtil.verifyLocalPinHash
+import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration
 
 class MessageBackupsFlowViewModel : ViewModel() {
-  private val internalState = mutableStateOf(
+  private val internalStateFlow = MutableStateFlow(
     MessageBackupsFlowState(
-      availableBackupTiers = if (!FeatureFlags.messageBackups()) {
-        emptyList()
-      } else {
-        listOf(MessageBackupTier.FREE, MessageBackupTier.PAID)
-      },
-      selectedMessageBackupTier = SignalStore.backup().backupTier
+      availableBackupTypes = emptyList(),
+      selectedMessageBackupTier = SignalStore.backup.backupTier,
+      availablePaymentMethods = GatewayOrderStrategy.getStrategy().orderedGateways.filter { InAppDonations.isPaymentSourceAvailable(it.toPaymentSourceType(), InAppPaymentType.RECURRING_BACKUP) },
+      startScreen = if (SignalStore.backup.backupTier == null) MessageBackupsScreen.EDUCATION else MessageBackupsScreen.TYPE_SELECTION
     )
   )
 
-  val state: State<MessageBackupsFlowState> = internalState
-
-  fun goToNextScreen(currentScreen: MessageBackupsScreen): MessageBackupsScreen {
-    return when (currentScreen) {
-      MessageBackupsScreen.EDUCATION -> MessageBackupsScreen.PIN_EDUCATION
-      MessageBackupsScreen.PIN_EDUCATION -> MessageBackupsScreen.PIN_CONFIRMATION
-      MessageBackupsScreen.PIN_CONFIRMATION -> validatePinAndUpdateState()
-      MessageBackupsScreen.TYPE_SELECTION -> validateTypeAndUpdateState()
-      MessageBackupsScreen.CHECKOUT_SHEET -> validateGatewayAndUpdateState()
-      MessageBackupsScreen.PROCESS_PAYMENT -> MessageBackupsScreen.COMPLETED
-      MessageBackupsScreen.COMPLETED -> error("Unsupported state transition from terminal state COMPLETED")
+  val stateFlow: StateFlow<MessageBackupsFlowState> = internalStateFlow
+
+  init {
+    viewModelScope.launch {
+      internalStateFlow.update {
+        it.copy(
+          availableBackupTypes = BackupRepository.getAvailableBackupsTypes(
+            if (!RemoteConfig.messageBackups) emptyList() else listOf(MessageBackupTier.FREE, MessageBackupTier.PAID)
+          )
+        )
+      }
+    }
+  }
+
+  fun goToNextScreen() {
+    internalStateFlow.update {
+      val nextScreen = when (it.screen) {
+        MessageBackupsScreen.EDUCATION -> MessageBackupsScreen.PIN_EDUCATION
+        MessageBackupsScreen.PIN_EDUCATION -> MessageBackupsScreen.PIN_CONFIRMATION
+        MessageBackupsScreen.PIN_CONFIRMATION -> validatePinAndUpdateState(it.pin)
+        MessageBackupsScreen.TYPE_SELECTION -> validateTypeAndUpdateState(it.selectedMessageBackupTier!!)
+        MessageBackupsScreen.CHECKOUT_SHEET -> validateGatewayAndUpdateState(it)
+        MessageBackupsScreen.CREATING_IN_APP_PAYMENT -> error("This is driven by an async coroutine.")
+        MessageBackupsScreen.CANCELLATION_DIALOG -> MessageBackupsScreen.PROCESS_CANCELLATION
+        MessageBackupsScreen.PROCESS_PAYMENT -> MessageBackupsScreen.COMPLETED
+        MessageBackupsScreen.PROCESS_CANCELLATION -> MessageBackupsScreen.COMPLETED
+        MessageBackupsScreen.COMPLETED -> error("Unsupported state transition from terminal state COMPLETED")
+      }
+
+      it.copy(screen = nextScreen)
+    }
+  }
+
+  fun goToPreviousScreen() {
+    internalStateFlow.update {
+      if (it.screen == it.startScreen) {
+        it.copy(screen = MessageBackupsScreen.COMPLETED)
+      } else {
+        val previousScreen = when (it.screen) {
+          MessageBackupsScreen.EDUCATION -> MessageBackupsScreen.COMPLETED
+          MessageBackupsScreen.PIN_EDUCATION -> MessageBackupsScreen.EDUCATION
+          MessageBackupsScreen.PIN_CONFIRMATION -> MessageBackupsScreen.PIN_EDUCATION
+          MessageBackupsScreen.TYPE_SELECTION -> MessageBackupsScreen.PIN_CONFIRMATION
+          MessageBackupsScreen.CHECKOUT_SHEET -> MessageBackupsScreen.TYPE_SELECTION
+          MessageBackupsScreen.CREATING_IN_APP_PAYMENT -> MessageBackupsScreen.TYPE_SELECTION
+          MessageBackupsScreen.PROCESS_PAYMENT -> MessageBackupsScreen.TYPE_SELECTION
+          MessageBackupsScreen.PROCESS_CANCELLATION -> MessageBackupsScreen.TYPE_SELECTION
+          MessageBackupsScreen.CANCELLATION_DIALOG -> MessageBackupsScreen.TYPE_SELECTION
+          MessageBackupsScreen.COMPLETED -> error("Unsupported state transition from terminal state COMPLETED")
+        }
+
+        it.copy(screen = previousScreen)
+      }
+    }
+  }
+
+  fun displayCancellationDialog() {
+    internalStateFlow.update {
+      check(it.screen == MessageBackupsScreen.TYPE_SELECTION)
+      it.copy(screen = MessageBackupsScreen.CANCELLATION_DIALOG)
     }
   }
 
   fun onPinEntryUpdated(pin: String) {
-    internalState.value = state.value.copy(pin = pin)
+    // TODO [alex] -- shouldn't store this in a flow
+    internalStateFlow.update {
+      it.copy(pin = pin)
+    }
   }
 
   fun onPinKeyboardTypeUpdated(pinKeyboardType: PinKeyboardType) {
-    internalState.value = state.value.copy(pinKeyboardType = pinKeyboardType)
+    internalStateFlow.update { it.copy(pinKeyboardType = pinKeyboardType) }
   }
 
-//  fun onPaymentGatewayUpdated(gateway: GatewayResponse.Gateway) {
-//    internalState.value = state.value.copy(selectedPaymentGateway = gateway)
-//  }
+  fun onPaymentMethodUpdated(paymentMethod: InAppPaymentData.PaymentMethodType) {
+    internalStateFlow.update { it.copy(selectedPaymentMethod = paymentMethod) }
+  }
 
   fun onMessageBackupTierUpdated(messageBackupTier: MessageBackupTier) {
-    internalState.value = state.value.copy(selectedMessageBackupTier = messageBackupTier)
+    internalStateFlow.update { it.copy(selectedMessageBackupTier = messageBackupTier) }
   }
 
-  private fun validatePinAndUpdateState(): MessageBackupsScreen {
-    val pinHash = SignalStore.svr().localPinHash
-    val pin = state.value.pin
+  private fun validatePinAndUpdateState(pin: String): MessageBackupsScreen {
+    val pinHash = SignalStore.svr.localPinHash
 
     if (pinHash == null || TextUtils.isEmpty(pin) || pin.length < SvrConstants.MINIMUM_PIN_LENGTH) return MessageBackupsScreen.PIN_CONFIRMATION
 
@@ -71,13 +136,52 @@ class MessageBackupsFlowViewModel : ViewModel() {
     return MessageBackupsScreen.TYPE_SELECTION
   }
 
-  private fun validateTypeAndUpdateState(): MessageBackupsScreen {
-    SignalStore.backup().areBackupsEnabled = true
-    return MessageBackupsScreen.COMPLETED
-    // return MessageBackupsScreen.CHECKOUT_SHEET TODO [message-backups] Switch back to payment flow
+  private fun validateTypeAndUpdateState(tier: MessageBackupTier): MessageBackupsScreen {
+    SignalStore.backup.areBackupsEnabled = true
+    SignalStore.backup.backupTier = tier
+
+    // TODO [message-backups] - Does anything need to be kicked off?
+
+    return when (tier) {
+      MessageBackupTier.FREE -> MessageBackupsScreen.COMPLETED
+      MessageBackupTier.PAID -> MessageBackupsScreen.CHECKOUT_SHEET
+    }
   }
 
-  private fun validateGatewayAndUpdateState(): MessageBackupsScreen {
-    return MessageBackupsScreen.PROCESS_PAYMENT
+  private fun validateGatewayAndUpdateState(state: MessageBackupsFlowState): MessageBackupsScreen {
+    val backupsType = state.availableBackupTypes.first { it.tier == state.selectedMessageBackupTier }
+
+    viewModelScope.launch(Dispatchers.IO) {
+      withContext(Dispatchers.Main) {
+        internalStateFlow.update { it.copy(inAppPayment = null) }
+      }
+
+      SignalDatabase.inAppPayments.clearCreated()
+      val id = SignalDatabase.inAppPayments.insert(
+        type = InAppPaymentType.RECURRING_BACKUP,
+        state = InAppPaymentTable.State.CREATED,
+        subscriberId = null,
+        endOfPeriod = null,
+        inAppPaymentData = InAppPaymentData(
+          badge = null,
+          label = backupsType.title,
+          amount = backupsType.pricePerMonth.toFiatValue(),
+          level = SubscriptionsConfiguration.BACKUPS_LEVEL.toLong(),
+          recipientId = Recipient.self().id.serialize(),
+          paymentMethodType = state.selectedPaymentMethod!!,
+          redemption = InAppPaymentData.RedemptionState(
+            stage = InAppPaymentData.RedemptionState.Stage.INIT
+          )
+        )
+      )
+
+      val inAppPayment = SignalDatabase.inAppPayments.getById(id)!!
+
+      withContext(Dispatchers.Main) {
+        internalStateFlow.update { it.copy(inAppPayment = inAppPayment, screen = MessageBackupsScreen.PROCESS_PAYMENT) }
+      }
+    }
+
+    return MessageBackupsScreen.CREATING_IN_APP_PAYMENT
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsScreen.kt
index 994f180ffd..eb9fb847c8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsScreen.kt
@@ -10,7 +10,12 @@ enum class MessageBackupsScreen {
   PIN_EDUCATION,
   PIN_CONFIRMATION,
   TYPE_SELECTION,
+  CANCELLATION_DIALOG,
   CHECKOUT_SHEET,
+  CREATING_IN_APP_PAYMENT,
   PROCESS_PAYMENT,
-  COMPLETED
+  PROCESS_CANCELLATION,
+  COMPLETED;
+
+  fun isAfter(other: MessageBackupsScreen): Boolean = ordinal > other.ordinal
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTestRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTestRestoreActivity.kt
deleted file mode 100644
index 065af0c3ec..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTestRestoreActivity.kt
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.backup.v2.ui.subscription
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import android.widget.Toast
-import androidx.activity.compose.setContent
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.activity.viewModels
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Switch
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import org.signal.core.ui.Buttons
-import org.signal.core.ui.Dividers
-import org.signal.core.util.getLength
-import org.thoughtcrime.securesms.BaseActivity
-import org.thoughtcrime.securesms.MainActivity
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.jobs.ProfileUploadJob
-import org.thoughtcrime.securesms.profiles.AvatarHelper
-import org.thoughtcrime.securesms.profiles.edit.CreateProfileActivity
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.registration.RegistrationUtil
-
-class MessageBackupsTestRestoreActivity : BaseActivity() {
-  companion object {
-    fun getIntent(context: Context): Intent {
-      return Intent(context, MessageBackupsTestRestoreActivity::class.java)
-    }
-  }
-
-  private val viewModel: MessageBackupsTestRestoreViewModel by viewModels()
-  private lateinit var importFileLauncher: ActivityResultLauncher<Intent>
-
-  private fun onPlaintextClicked() {
-    viewModel.onPlaintextToggled()
-  }
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-
-    importFileLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-      if (result.resultCode == RESULT_OK) {
-        result.data?.data?.let { uri ->
-          contentResolver.getLength(uri)?.let { length ->
-            viewModel.import(length) { contentResolver.openInputStream(uri)!! }
-          }
-        } ?: Toast.makeText(this, "No URI selected", Toast.LENGTH_SHORT).show()
-      }
-    }
-
-    setContent {
-      val state by viewModel.state
-      Surface {
-        Column(
-          horizontalAlignment = Alignment.CenterHorizontally,
-          verticalArrangement = Arrangement.Center,
-          modifier = Modifier
-            .fillMaxSize()
-            .padding(16.dp)
-        ) {
-          Buttons.LargePrimary(
-            onClick = this@MessageBackupsTestRestoreActivity::restoreFromServer,
-            enabled = !state.importState.inProgress
-          ) {
-            Text("Restore")
-          }
-
-          Spacer(modifier = Modifier.height(8.dp))
-
-          Row(
-            verticalAlignment = Alignment.CenterVertically
-          ) {
-            StateLabel(text = "Plaintext?")
-            Spacer(modifier = Modifier.width(8.dp))
-            Switch(
-              checked = state.plaintext,
-              onCheckedChange = { onPlaintextClicked() }
-            )
-          }
-
-          Spacer(modifier = Modifier.height(8.dp))
-
-          Buttons.LargePrimary(
-            onClick = {
-              val intent = Intent().apply {
-                action = Intent.ACTION_GET_CONTENT
-                type = "application/octet-stream"
-                addCategory(Intent.CATEGORY_OPENABLE)
-              }
-
-              importFileLauncher.launch(intent)
-            },
-            enabled = !state.importState.inProgress
-          ) {
-            Text("Import from file")
-          }
-
-          Spacer(modifier = Modifier.height(8.dp))
-
-          Dividers.Default()
-
-          Buttons.LargeTonal(
-            onClick = { continueRegistration() },
-            enabled = !state.importState.inProgress
-          ) {
-            Text("Continue Reg Flow")
-          }
-        }
-      }
-      if (state.importState == MessageBackupsTestRestoreViewModel.ImportState.RESTORED) {
-        SideEffect {
-          RegistrationUtil.maybeMarkRegistrationComplete()
-          ApplicationDependencies.getJobManager().add(ProfileUploadJob())
-          startActivity(MainActivity.clearTop(this))
-        }
-      }
-    }
-  }
-
-  private fun restoreFromServer() {
-    viewModel.restore()
-  }
-
-  private fun continueRegistration() {
-    if (Recipient.self().profileName.isEmpty || !AvatarHelper.hasAvatar(this, Recipient.self().id)) {
-      val main = MainActivity.clearTop(this)
-      val profile = CreateProfileActivity.getIntentForUserProfile(this)
-      profile.putExtra("next_intent", main)
-      startActivity(profile)
-    } else {
-      RegistrationUtil.maybeMarkRegistrationComplete()
-      ApplicationDependencies.getJobManager().add(ProfileUploadJob())
-      startActivity(MainActivity.clearTop(this))
-    }
-    finish()
-  }
-
-  @Composable
-  private fun StateLabel(text: String) {
-    Text(
-      text = text,
-      style = MaterialTheme.typography.labelSmall,
-      textAlign = TextAlign.Center
-    )
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsType.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsType.kt
new file mode 100644
index 0000000000..e808a72b4c
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsType.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.ui.subscription
+
+import androidx.compose.runtime.Stable
+import kotlinx.collections.immutable.ImmutableList
+import org.signal.core.util.money.FiatMoney
+import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
+
+/**
+ * Represents a type of backup a user can select.
+ */
+@Stable
+data class MessageBackupsType(
+  val tier: MessageBackupTier,
+  val pricePerMonth: FiatMoney,
+  val title: String,
+  val features: ImmutableList<MessageBackupsTypeFeature>
+)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeSelectionScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeSelectionScreen.kt
index 859588215f..1b7478ee29 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeSelectionScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeSelectionScreen.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement.Absolute.spacedBy
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -18,10 +19,11 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.ClickableText
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -33,6 +35,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.ExperimentalTextApi
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
@@ -40,7 +43,6 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.withAnnotation
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
-import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import org.signal.core.ui.Buttons
 import org.signal.core.ui.Previews
@@ -60,12 +62,14 @@ import java.util.Currency
 @OptIn(ExperimentalTextApi::class)
 @Composable
 fun MessageBackupsTypeSelectionScreen(
+  currentBackupTier: MessageBackupTier?,
   selectedBackupTier: MessageBackupTier?,
-  availableBackupTiers: List<MessageBackupTier>,
+  availableBackupTypes: List<MessageBackupsType>,
   onMessageBackupsTierSelected: (MessageBackupTier) -> Unit,
   onNavigationClick: () -> Unit,
   onReadMoreClicked: () -> Unit,
-  onNextClicked: () -> Unit
+  onNextClicked: () -> Unit,
+  onCancelSubscriptionClicked: () -> Unit
 ) {
   Scaffolds.Settings(
     title = "",
@@ -118,7 +122,7 @@ fun MessageBackupsTypeSelectionScreen(
 
           ClickableText(
             text = readMoreString,
-            style = MaterialTheme.typography.bodyLarge.copy(textAlign = TextAlign.Center),
+            style = MaterialTheme.typography.bodyLarge.copy(textAlign = TextAlign.Center, color = MaterialTheme.colorScheme.onSurface),
             onClick = { offset ->
               readMoreString
                 .getStringAnnotations(tag = "URL", start = offset, end = offset)
@@ -129,31 +133,49 @@ fun MessageBackupsTypeSelectionScreen(
         }
 
         itemsIndexed(
-          availableBackupTiers,
-          { _, item -> item }
+          availableBackupTypes,
+          { _, item -> item.tier }
         ) { index, item ->
-          val type = remember(item) {
-            getTierDetails(item)
-          }
           MessageBackupsTypeBlock(
-            messageBackupsType = type,
-            isSelected = item == selectedBackupTier,
-            onSelected = { onMessageBackupsTierSelected(item) },
+            messageBackupsType = item,
+            isCurrent = item.tier == currentBackupTier,
+            isSelected = item.tier == selectedBackupTier,
+            onSelected = { onMessageBackupsTierSelected(item.tier) },
             modifier = Modifier.padding(top = if (index == 0) 20.dp else 18.dp)
           )
         }
       }
 
+      val hasSelectedBackupTier = currentBackupTier != null
+
       Buttons.LargePrimary(
         onClick = onNextClicked,
+        enabled = selectedBackupTier != null,
         modifier = Modifier
           .fillMaxWidth()
-          .padding(vertical = 16.dp)
+          .padding(vertical = if (hasSelectedBackupTier) 10.dp else 16.dp)
       ) {
         Text(
-          text = "Next" // TODO [message-backups] Finalized copy
+          text = stringResource(
+            id = if (currentBackupTier == null) {
+              R.string.MessageBackupsTypeSelectionScreen__next
+            } else {
+              R.string.MessageBackupsTypeSelectionScreen__change_backup_type
+            }
+          )
         )
       }
+
+      if (hasSelectedBackupTier) {
+        TextButton(
+          onClick = onCancelSubscriptionClicked,
+          modifier = Modifier
+            .fillMaxWidth()
+            .padding(bottom = 14.dp)
+        ) {
+          Text(text = stringResource(id = R.string.MessageBackupsTypeSelectionScreen__cancel_subscription))
+        }
+      }
     }
   }
 }
@@ -166,11 +188,32 @@ private fun MessageBackupsTypeSelectionScreenPreview() {
   Previews.Preview {
     MessageBackupsTypeSelectionScreen(
       selectedBackupTier = MessageBackupTier.FREE,
-      availableBackupTiers = listOf(MessageBackupTier.FREE, MessageBackupTier.PAID),
+      availableBackupTypes = testBackupTypes(),
       onMessageBackupsTierSelected = { selectedBackupsType = it },
       onNavigationClick = {},
       onReadMoreClicked = {},
-      onNextClicked = {}
+      onNextClicked = {},
+      onCancelSubscriptionClicked = {},
+      currentBackupTier = null
+    )
+  }
+}
+
+@SignalPreview
+@Composable
+private fun MessageBackupsTypeSelectionScreenWithCurrentTierPreview() {
+  var selectedBackupsType by remember { mutableStateOf(MessageBackupTier.FREE) }
+
+  Previews.Preview {
+    MessageBackupsTypeSelectionScreen(
+      selectedBackupTier = MessageBackupTier.FREE,
+      availableBackupTypes = testBackupTypes(),
+      onMessageBackupsTierSelected = { selectedBackupsType = it },
+      onNavigationClick = {},
+      onReadMoreClicked = {},
+      onNextClicked = {},
+      onCancelSubscriptionClicked = {},
+      currentBackupTier = MessageBackupTier.PAID
     )
   }
 }
@@ -178,6 +221,7 @@ private fun MessageBackupsTypeSelectionScreenPreview() {
 @Composable
 fun MessageBackupsTypeBlock(
   messageBackupsType: MessageBackupsType,
+  isCurrent: Boolean,
   isSelected: Boolean,
   onSelected: () -> Unit,
   modifier: Modifier = Modifier,
@@ -195,7 +239,7 @@ fun MessageBackupsTypeBlock(
     SignalTheme.colors.colorSurface2
   }
 
-  Column(
+  Box(
     modifier = modifier
       .fillMaxWidth()
       .background(color = background, shape = RoundedCornerShape(18.dp))
@@ -204,26 +248,36 @@ fun MessageBackupsTypeBlock(
       .clickable(onClick = onSelected, enabled = enabled)
       .padding(vertical = 16.dp, horizontal = 20.dp)
   ) {
-    Text(
-      text = formatCostPerMonth(messageBackupsType.pricePerMonth),
-      style = MaterialTheme.typography.titleSmall
-    )
+    Column {
+      Text(
+        text = formatCostPerMonth(messageBackupsType.pricePerMonth),
+        style = MaterialTheme.typography.titleSmall
+      )
 
-    Text(
-      text = messageBackupsType.title,
-      style = MaterialTheme.typography.titleMedium
-    )
+      Text(
+        text = messageBackupsType.title,
+        style = MaterialTheme.typography.titleMedium
+      )
 
-    Column(
-      verticalArrangement = spacedBy(4.dp),
-      modifier = Modifier
-        .padding(top = 8.dp)
-        .padding(horizontal = 16.dp)
-    ) {
-      messageBackupsType.features.forEach {
-        MessageBackupsTypeFeatureRow(messageBackupsTypeFeature = it)
+      Column(
+        verticalArrangement = spacedBy(4.dp),
+        modifier = Modifier
+          .padding(top = 8.dp)
+          .padding(horizontal = 16.dp)
+      ) {
+        messageBackupsType.features.forEach {
+          MessageBackupsTypeFeatureRow(messageBackupsTypeFeature = it)
+        }
       }
     }
+
+    if (isCurrent) {
+      Icon(
+        painter = painterResource(id = R.drawable.symbol_check_24),
+        contentDescription = null,
+        modifier = Modifier.align(Alignment.TopEnd)
+      )
+    }
   }
 }
 
@@ -236,17 +290,9 @@ private fun formatCostPerMonth(pricePerMonth: FiatMoney): String {
   }
 }
 
-@Stable
-data class MessageBackupsType(
-  val tier: MessageBackupTier,
-  val pricePerMonth: FiatMoney,
-  val title: String,
-  val features: ImmutableList<MessageBackupsTypeFeature>
-)
-
-fun getTierDetails(tier: MessageBackupTier): MessageBackupsType {
-  return when (tier) {
-    MessageBackupTier.FREE -> MessageBackupsType(
+private fun testBackupTypes(): List<MessageBackupsType> {
+  return listOf(
+    MessageBackupsType(
       tier = MessageBackupTier.FREE,
       pricePerMonth = FiatMoney(BigDecimal.ZERO, Currency.getInstance("USD")),
       title = "Text + 30 days of media",
@@ -260,10 +306,10 @@ fun getTierDetails(tier: MessageBackupTier): MessageBackupsType {
           label = "Last 30 days of media"
         )
       )
-    )
-    MessageBackupTier.PAID -> MessageBackupsType(
+    ),
+    MessageBackupsType(
       tier = MessageBackupTier.PAID,
-      pricePerMonth = FiatMoney(BigDecimal.valueOf(3), Currency.getInstance("USD")),
+      pricePerMonth = FiatMoney(BigDecimal.ONE, Currency.getInstance("USD")),
       title = "Text + All your media",
       features = persistentListOf(
         MessageBackupsTypeFeature(
@@ -284,5 +330,5 @@ fun getTierDetails(tier: MessageBackupTier): MessageBackupsType {
         )
       )
     )
-  }
+  )
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTestRestoreViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/RemoteRestoreViewModel.kt
similarity index 71%
rename from app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTestRestoreViewModel.kt
rename to app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/RemoteRestoreViewModel.kt
index 66578fea19..ba8d637f04 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTestRestoreViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/RemoteRestoreViewModel.kt
@@ -17,18 +17,30 @@ import io.reactivex.rxjava3.kotlin.subscribeBy
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.libsignal.zkgroup.profiles.ProfileKey
 import org.thoughtcrime.securesms.backup.v2.BackupRepository
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
+import org.thoughtcrime.securesms.backup.v2.RestoreV2Event
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.BackupRestoreJob
 import org.thoughtcrime.securesms.jobs.BackupRestoreMediaJob
 import org.thoughtcrime.securesms.jobs.SyncArchivedMediaJob
+import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.registration.RegistrationUtil
 import java.io.InputStream
 import kotlin.time.Duration.Companion.seconds
 
-class MessageBackupsTestRestoreViewModel : ViewModel() {
+class RemoteRestoreViewModel : ViewModel() {
   val disposables = CompositeDisposable()
 
-  private val _state: MutableState<ScreenState> = mutableStateOf(ScreenState(importState = ImportState.NONE, plaintext = false))
+  private val _state: MutableState<ScreenState> = mutableStateOf(
+    ScreenState(
+      backupTier = SignalStore.backup.backupTier,
+      backupTime = SignalStore.backup.lastBackupTime,
+      importState = ImportState.NONE,
+      restoreProgress = null
+    )
+  )
+
   val state: State<ScreenState> = _state
 
   fun import(length: Long, inputStreamFactory: () -> InputStream) {
@@ -37,7 +49,7 @@ class MessageBackupsTestRestoreViewModel : ViewModel() {
     val self = Recipient.self()
     val selfData = BackupRepository.SelfData(self.aci.get(), self.pni.get(), self.e164.get(), ProfileKey(self.profileKey))
 
-    disposables += Single.fromCallable { BackupRepository.import(length, inputStreamFactory, selfData, plaintext = _state.value.plaintext) }
+    disposables += Single.fromCallable { BackupRepository.import(length, inputStreamFactory, selfData) }
       .subscribeOn(Schedulers.io())
       .observeOn(AndroidSchedulers.mainThread())
       .subscribeBy {
@@ -48,12 +60,13 @@ class MessageBackupsTestRestoreViewModel : ViewModel() {
   fun restore() {
     _state.value = _state.value.copy(importState = ImportState.IN_PROGRESS)
     disposables += Single.fromCallable {
-      ApplicationDependencies
-        .getJobManager()
+      AppDependencies
+        .jobManager
         .startChain(BackupRestoreJob())
         .then(SyncArchivedMediaJob())
         .then(BackupRestoreMediaJob())
         .enqueueAndBlockUntilCompletion(120.seconds.inWholeMilliseconds)
+      RegistrationUtil.maybeMarkRegistrationComplete()
     }
       .subscribeOn(Schedulers.io())
       .observeOn(AndroidSchedulers.mainThread())
@@ -62,8 +75,8 @@ class MessageBackupsTestRestoreViewModel : ViewModel() {
       }
   }
 
-  fun onPlaintextToggled() {
-    _state.value = _state.value.copy(plaintext = !_state.value.plaintext)
+  fun updateRestoreProgress(restoreEvent: RestoreV2Event) {
+    _state.value = _state.value.copy(restoreProgress = restoreEvent)
   }
 
   override fun onCleared() {
@@ -71,11 +84,15 @@ class MessageBackupsTestRestoreViewModel : ViewModel() {
   }
 
   data class ScreenState(
+    val backupTier: MessageBackupTier?,
+    val backupTime: Long,
     val importState: ImportState,
-    val plaintext: Boolean
+    val restoreProgress: RestoreV2Event?
   )
 
   enum class ImportState(val inProgress: Boolean = false) {
-    NONE, IN_PROGRESS(true), RESTORED
+    NONE,
+    IN_PROGRESS(true),
+    RESTORED
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt
index f2d4dc0dbc..f7b413d380 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt
@@ -3,12 +3,18 @@ package org.thoughtcrime.securesms.badges
 import android.content.Context
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatImageView
+import androidx.core.content.res.use
 import com.bumptech.glide.Glide
 import com.bumptech.glide.RequestManager
 import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy
+import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.glide.BadgeSpriteTransformation
 import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.app.subscription.BadgeImageSize
+import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
+import org.thoughtcrime.securesms.glide.GiftBadgeModel
 import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.util.ScreenDensity
 import org.thoughtcrime.securesms.util.ThemeUtil
 import org.thoughtcrime.securesms.util.visible
 
@@ -20,9 +26,17 @@ class BadgeImageView @JvmOverloads constructor(
   private var badgeSize: Int = 0
 
   init {
+    context.obtainStyledAttributes(attrs, R.styleable.BadgeImageView).use {
+      badgeSize = it.getInt(R.styleable.BadgeImageView_badge_size, 0)
+    }
+
     isClickable = false
   }
 
+  constructor(context: Context, badgeImageSize: BadgeImageSize) : this(context) {
+    badgeSize = badgeImageSize.sizeCode
+  }
+
   override fun setOnClickListener(l: OnClickListener?) {
     val wasClickable = isClickable
     super.setOnClickListener(l)
@@ -72,6 +86,20 @@ class BadgeImageView @JvmOverloads constructor(
     }
   }
 
+  fun setGiftBadge(badge: GiftBadge?, requestManager: RequestManager) {
+    if (badge != null) {
+      requestManager
+        .load(GiftBadgeModel(badge))
+        .downsample(DownsampleStrategy.NONE)
+        .transform(BadgeSpriteTransformation(BadgeSpriteTransformation.Size.fromInteger(badgeSize), ScreenDensity.getBestDensityBucketForDevice(), ThemeUtil.isDarkTheme(context)))
+        .into(this)
+    } else {
+      requestManager
+        .clear(this)
+      clearDrawable()
+    }
+  }
+
   fun isShowingBadge(): Boolean {
     return drawable != null
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt
index 1882e2d291..2ba4b355b2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt
@@ -41,6 +41,9 @@ data class Badge(
 ) : Parcelable, Key {
 
   fun isExpired(): Boolean = expirationTimestamp < System.currentTimeMillis() && expirationTimestamp > 0
+  fun isBoost(): Boolean = id == BOOST_BADGE_ID
+  fun isGift(): Boolean = id == GIFT_BADGE_ID
+  fun isSubscription(): Boolean = !isBoost() && !isGift()
 
   override fun updateDiskCacheKey(messageDigest: MessageDigest) {
     messageDigest.update(id.toByteArray(Key.CHARSET))
@@ -163,6 +166,9 @@ data class Badge(
   }
 
   companion object {
+    const val BOOST_BADGE_ID = "BOOST"
+    const val GIFT_BADGE_ID = "GIFT"
+
     private val SELECTION_CHANGED = Any()
 
     fun register(mappingAdapter: MappingAdapter, onBadgeClicked: OnBadgeClicked) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/models/BadgeDisplay112.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/models/BadgeDisplay112.kt
new file mode 100644
index 0000000000..a2013387dd
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/models/BadgeDisplay112.kt
@@ -0,0 +1,55 @@
+package org.thoughtcrime.securesms.badges.models
+
+import android.view.View
+import android.widget.TextView
+import com.bumptech.glide.Glide
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.BadgeImageView
+import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
+import org.thoughtcrime.securesms.util.visible
+
+/**
+ * Displays a 112dp badge.
+ */
+object BadgeDisplay112 {
+  fun register(mappingAdapter: MappingAdapter) {
+    mappingAdapter.registerFactory(Model::class.java, LayoutFactory(::ViewHolder, R.layout.badge_display_112))
+    mappingAdapter.registerFactory(GiftModel::class.java, LayoutFactory(::GiftViewHolder, R.layout.badge_display_112))
+  }
+
+  class Model(val badge: Badge, val withDisplayText: Boolean = true) : MappingModel<Model> {
+    override fun areItemsTheSame(newItem: Model): Boolean = badge.id == newItem.badge.id
+
+    override fun areContentsTheSame(newItem: Model): Boolean = badge == newItem.badge && withDisplayText == newItem.withDisplayText
+  }
+
+  class GiftModel(val giftBadge: GiftBadge) : MappingModel<GiftModel> {
+    override fun areItemsTheSame(newItem: GiftModel): Boolean = giftBadge.redemptionToken == newItem.giftBadge.redemptionToken
+    override fun areContentsTheSame(newItem: GiftModel): Boolean = giftBadge == newItem.giftBadge
+  }
+
+  class ViewHolder(itemView: View) : MappingViewHolder<Model>(itemView) {
+    private val badgeImageView: BadgeImageView = itemView.findViewById(R.id.badge)
+    private val titleView: TextView = itemView.findViewById(R.id.name)
+
+    override fun bind(model: Model) {
+      titleView.text = model.badge.name
+      titleView.visible = model.withDisplayText
+      badgeImageView.setBadge(model.badge)
+    }
+  }
+
+  class GiftViewHolder(itemView: View) : MappingViewHolder<GiftModel>(itemView) {
+    private val badgeImageView: BadgeImageView = itemView.findViewById(R.id.badge)
+    private val titleView: TextView = itemView.findViewById(R.id.name)
+
+    override fun bind(model: GiftModel) {
+      titleView.visible = false
+      badgeImageView.setGiftBadge(model.giftBadge, Glide.with(badgeImageView))
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/models/BadgeDisplay160.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/models/BadgeDisplay160.kt
new file mode 100644
index 0000000000..a34a8f0a64
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/models/BadgeDisplay160.kt
@@ -0,0 +1,35 @@
+package org.thoughtcrime.securesms.badges.models
+
+import android.view.View
+import android.widget.TextView
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.BadgeImageView
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
+
+/**
+ * Displays a 160dp badge.
+ */
+object BadgeDisplay160 {
+  fun register(mappingAdapter: MappingAdapter) {
+    mappingAdapter.registerFactory(Model::class.java, LayoutFactory(::ViewHolder, R.layout.badge_display_160))
+  }
+
+  class Model(val badge: Badge) : MappingModel<Model> {
+    override fun areItemsTheSame(newItem: Model): Boolean = badge.id == newItem.badge.id
+
+    override fun areContentsTheSame(newItem: Model): Boolean = badge == newItem.badge
+  }
+
+  class ViewHolder(itemView: View) : MappingViewHolder<Model>(itemView) {
+    private val badgeImageView: BadgeImageView = itemView.findViewById(R.id.badge)
+    private val titleView: TextView = itemView.findViewById(R.id.name)
+
+    override fun bind(model: Model) {
+      titleView.text = model.badge.name
+      badgeImageView.setBadge(model.badge)
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/models/BadgePreview.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/models/BadgePreview.kt
new file mode 100644
index 0000000000..7df8948934
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/models/BadgePreview.kt
@@ -0,0 +1,74 @@
+package org.thoughtcrime.securesms.badges.models
+
+import android.view.View
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.BadgeImageView
+import org.thoughtcrime.securesms.components.AvatarImageView
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
+
+/**
+ * "Hero Image" for displaying an Avatar and badge. Allows the user to see what their profile will look like with a particular badge applied.
+ */
+object BadgePreview {
+
+  fun register(mappingAdapter: MappingAdapter) {
+    mappingAdapter.registerFactory(BadgeModel.FeaturedModel::class.java, LayoutFactory({ ViewHolder(it) }, R.layout.featured_badge_preview_preference))
+    mappingAdapter.registerFactory(BadgeModel.SubscriptionModel::class.java, LayoutFactory({ ViewHolder(it) }, R.layout.subscription_flow_badge_preview_preference))
+    mappingAdapter.registerFactory(BadgeModel.GiftedBadgeModel::class.java, LayoutFactory({ ViewHolder(it) }, R.layout.gift_badge_preview_preference))
+  }
+
+  sealed class BadgeModel<T : BadgeModel<T>> : MappingModel<T> {
+
+    companion object {
+      const val PAYLOAD_BADGE = "badge"
+    }
+
+    abstract val badge: Badge?
+    abstract val recipient: Recipient
+
+    data class FeaturedModel(override val badge: Badge?) : BadgeModel<FeaturedModel>() {
+      override val recipient: Recipient = Recipient.self()
+    }
+
+    data class SubscriptionModel(override val badge: Badge?) : BadgeModel<SubscriptionModel>() {
+      override val recipient: Recipient = Recipient.self()
+    }
+
+    data class GiftedBadgeModel(override val badge: Badge?, override val recipient: Recipient) : BadgeModel<GiftedBadgeModel>()
+
+    override fun areItemsTheSame(newItem: T): Boolean {
+      return recipient.id == newItem.recipient.id
+    }
+
+    override fun areContentsTheSame(newItem: T): Boolean {
+      return badge == newItem.badge && recipient.hasSameContent(newItem.recipient)
+    }
+
+    override fun getChangePayload(newItem: T): Any? {
+      return if (recipient.hasSameContent(newItem.recipient) && badge != newItem.badge) {
+        PAYLOAD_BADGE
+      } else {
+        null
+      }
+    }
+  }
+
+  class ViewHolder<T : BadgeModel<T>>(itemView: View) : MappingViewHolder<T>(itemView) {
+
+    private val avatar: AvatarImageView = itemView.findViewById(R.id.avatar)
+    private val badge: BadgeImageView = itemView.findViewById(R.id.badge)
+
+    override fun bind(model: T) {
+      if (payload.isEmpty()) {
+        avatar.setRecipient(model.recipient)
+        avatar.disableQuickContact()
+      }
+
+      badge.setBadge(model.badge)
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/MonthlyDonationCanceledBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/MonthlyDonationCanceledBottomSheetDialogFragment.kt
new file mode 100644
index 0000000000..123ebbcafb
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/MonthlyDonationCanceledBottomSheetDialogFragment.kt
@@ -0,0 +1,205 @@
+package org.thoughtcrime.securesms.badges.self.expired
+
+import android.content.res.Configuration
+import android.net.Uri
+import androidx.annotation.StringRes
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.core.os.bundleOf
+import androidx.fragment.app.FragmentManager
+import org.signal.core.ui.BottomSheets
+import org.signal.core.ui.Buttons
+import org.signal.core.ui.Texts
+import org.signal.core.ui.theme.SignalTheme
+import org.signal.core.util.getParcelableCompat
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
+import org.thoughtcrime.securesms.components.settings.app.subscription.BadgeImage112
+import org.thoughtcrime.securesms.components.settings.app.subscription.manage.ManageDonationsFragment
+import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.util.BottomSheetUtil
+import org.thoughtcrime.securesms.util.CommunicationActions
+import org.thoughtcrime.securesms.util.SpanUtil
+import org.thoughtcrime.securesms.util.viewModel
+
+class MonthlyDonationCanceledBottomSheetDialogFragment : ComposeBottomSheetDialogFragment() {
+
+  companion object {
+
+    private const val ARG_IN_APP_PAYMENT_ID = "arg.inAppPaymentId"
+
+    @JvmStatic
+    @JvmOverloads
+    fun show(fragmentManager: FragmentManager, inAppPaymentId: InAppPaymentTable.InAppPaymentId? = null) {
+      val fragment = MonthlyDonationCanceledBottomSheetDialogFragment()
+      fragment.arguments = bundleOf(
+        ARG_IN_APP_PAYMENT_ID to inAppPaymentId
+      )
+      fragment.show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)
+    }
+  }
+
+  override val peekHeightPercentage: Float = 1f
+
+  private val viewModel by viewModel {
+    MonthlyDonationCanceledViewModel(arguments?.getParcelableCompat(ARG_IN_APP_PAYMENT_ID, InAppPaymentTable.InAppPaymentId::class.java))
+  }
+
+  @Composable
+  override fun SheetContent() {
+    val state by viewModel.state
+
+    if (state.loadState == MonthlyDonationCanceledState.LoadState.LOADING) {
+      return
+    }
+
+    if (state.loadState == MonthlyDonationCanceledState.LoadState.FAILED) {
+      LaunchedEffect(Unit) {
+        dismissAllowingStateLoss()
+      }
+
+      return
+    }
+
+    MonthlyDonationCanceled(
+      badge = state.badge,
+      errorMessageRes = state.errorMessage,
+      onRenewClicked = {
+        startActivity(AppSettingsActivity.subscriptions(requireContext()))
+        dismissAllowingStateLoss()
+      },
+      onNotNowClicked = {
+        SignalStore.inAppPayments.showMonthlyDonationCanceledDialog = false
+        dismissAllowingStateLoss()
+      }
+    )
+  }
+}
+
+@Preview(name = "Light Theme", group = "ShortName", uiMode = Configuration.UI_MODE_NIGHT_NO)
+@Preview(name = "Dark Theme", group = "ShortName", uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+fun MonthlyDonationCanceledPreview() {
+  SignalTheme {
+    Surface {
+      MonthlyDonationCanceled(
+        badge = Badge(
+          id = "",
+          category = Badge.Category.Donor,
+          name = "Signal Star",
+          description = "",
+          imageUrl = Uri.EMPTY,
+          imageDensity = "",
+          expirationTimestamp = 0L,
+          visible = true,
+          duration = 0L
+        ),
+        errorMessageRes = R.string.StripeFailureCode__verify_your_bank_details_are_correct,
+        onRenewClicked = {},
+        onNotNowClicked = {}
+      )
+    }
+  }
+}
+
+@Composable
+private fun MonthlyDonationCanceled(
+  badge: Badge?,
+  @StringRes errorMessageRes: Int,
+  onRenewClicked: () -> Unit,
+  onNotNowClicked: () -> Unit
+) {
+  Column(
+    horizontalAlignment = Alignment.CenterHorizontally,
+    modifier = Modifier.padding(horizontal = 34.dp)
+  ) {
+    BottomSheets.Handle()
+
+    if (badge != null) {
+      Box(modifier = Modifier.padding(top = 21.dp, bottom = 16.dp)) {
+        BadgeImage112(
+          badge = badge,
+          modifier = Modifier
+            .size(80.dp)
+        )
+
+        Image(
+          imageVector = ImageVector.vectorResource(id = R.drawable.symbol_error_circle_fill_24),
+          contentScale = ContentScale.Inside,
+          contentDescription = null,
+          colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.error),
+          modifier = Modifier
+            .size(24.dp)
+            .align(Alignment.TopEnd)
+            .background(
+              color = SignalTheme.colors.colorSurface1,
+              shape = CircleShape
+            )
+        )
+      }
+    }
+
+    Text(
+      text = stringResource(id = R.string.MonthlyDonationCanceled__title),
+      style = MaterialTheme.typography.titleLarge.copy(textAlign = TextAlign.Center, color = MaterialTheme.colorScheme.onSurface),
+      modifier = Modifier.padding(bottom = 20.dp)
+    )
+
+    val context = LocalContext.current
+    val learnMore = stringResource(id = R.string.MonthlyDonationCanceled__learn_more)
+    val errorMessage = stringResource(id = errorMessageRes)
+    val fullString = stringResource(id = R.string.MonthlyDonationCanceled__message, errorMessage, learnMore)
+    val spanned = SpanUtil.urlSubsequence(fullString, learnMore, ManageDonationsFragment.DONATE_TROUBLESHOOTING_URL)
+    Texts.LinkifiedText(
+      textWithUrlSpans = spanned,
+      onUrlClick = { CommunicationActions.openBrowserLink(context, it) },
+      style = MaterialTheme.typography.bodyLarge.copy(textAlign = TextAlign.Center, color = MaterialTheme.colorScheme.onSurfaceVariant),
+      modifier = Modifier.padding(bottom = 36.dp)
+    )
+
+    Buttons.LargeTonal(
+      onClick = onRenewClicked,
+      modifier = Modifier
+        .defaultMinSize(minWidth = 220.dp)
+        .padding(bottom = 16.dp)
+    ) {
+      Text(text = stringResource(id = R.string.MonthlyDonationCanceled__renew_button))
+    }
+
+    TextButton(
+      onClick = onNotNowClicked,
+      modifier = Modifier
+        .defaultMinSize(minWidth = 220.dp)
+        .padding(bottom = 56.dp)
+    ) {
+      Text(text = stringResource(id = R.string.MonthlyDonationCanceled__not_now_button))
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/MonthlyDonationCanceledState.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/MonthlyDonationCanceledState.kt
new file mode 100644
index 0000000000..6ec7111fcc
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/MonthlyDonationCanceledState.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.badges.self.expired
+
+import androidx.annotation.StringRes
+import org.thoughtcrime.securesms.badges.models.Badge
+
+data class MonthlyDonationCanceledState(
+  val loadState: LoadState = LoadState.LOADING,
+  val badge: Badge? = null,
+  @StringRes val errorMessage: Int = -1
+) {
+  enum class LoadState {
+    LOADING,
+    READY,
+    FAILED
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/MonthlyDonationCanceledViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/MonthlyDonationCanceledViewModel.kt
new file mode 100644
index 0000000000..7cdec89ad2
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/MonthlyDonationCanceledViewModel.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.badges.self.expired
+
+import androidx.annotation.StringRes
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.signal.donations.StripeDeclineCode
+import org.signal.donations.StripeFailureCode
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toActiveSubscriptionChargeFailure
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.mapToErrorStringResource
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.ChargeFailure
+
+class MonthlyDonationCanceledViewModel(
+  inAppPaymentId: InAppPaymentTable.InAppPaymentId?
+) : ViewModel() {
+  private val internalState = mutableStateOf(MonthlyDonationCanceledState())
+  val state: State<MonthlyDonationCanceledState> = internalState
+
+  init {
+    if (inAppPaymentId != null) {
+      initializeFromInAppPaymentId(inAppPaymentId)
+    } else {
+      initializeFromSignalStore()
+    }
+  }
+
+  private fun initializeFromInAppPaymentId(inAppPaymentId: InAppPaymentTable.InAppPaymentId) {
+    viewModelScope.launch {
+      val inAppPayment = withContext(Dispatchers.IO) {
+        SignalDatabase.inAppPayments.getById(inAppPaymentId)
+      }
+
+      if (inAppPayment != null) {
+        internalState.value = MonthlyDonationCanceledState(
+          loadState = MonthlyDonationCanceledState.LoadState.READY,
+          badge = Badges.fromDatabaseBadge(inAppPayment.data.badge!!),
+          errorMessage = getErrorMessage(inAppPayment.data.cancellation?.chargeFailure?.toActiveSubscriptionChargeFailure())
+        )
+      } else {
+        internalState.value = internalState.value.copy(loadState = MonthlyDonationCanceledState.LoadState.FAILED)
+      }
+    }
+  }
+
+  private fun initializeFromSignalStore() {
+    internalState.value = MonthlyDonationCanceledState(
+      loadState = MonthlyDonationCanceledState.LoadState.READY,
+      badge = SignalStore.inAppPayments.getExpiredBadge(),
+      errorMessage = getErrorMessage(SignalStore.inAppPayments.getUnexpectedSubscriptionCancelationChargeFailure())
+    )
+  }
+
+  @StringRes
+  private fun getErrorMessage(chargeFailure: ChargeFailure?): Int {
+    val declineCode: StripeDeclineCode = StripeDeclineCode.getFromCode(chargeFailure?.outcomeNetworkReason)
+    val failureCode: StripeFailureCode = StripeFailureCode.getFromCode(chargeFailure?.code)
+
+    return if (declineCode.isKnown()) {
+      declineCode.mapToErrorStringResource()
+    } else if (failureCode.isKnown) {
+      failureCode.mapToErrorStringResource()
+    } else {
+      declineCode.mapToErrorStringResource()
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/biometric/BiometricDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/biometric/BiometricDialogFragment.java
index 9792cf8793..212c485d52 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/biometric/BiometricDialogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/biometric/BiometricDialogFragment.java
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.biometric;
 
+import android.annotation.SuppressLint;
 import android.content.DialogInterface;
 import android.graphics.ColorMatrix;
 import android.graphics.ColorMatrixColorFilter;
@@ -81,6 +82,7 @@ public static BiometricDialogFragment newInstance(boolean fullScreen) {
     return instance;
   }
 
+  @SuppressLint("DiscouragedApi")
   public static boolean isDialogViewAttachedTo(@Nullable View container) {
     if (!(container instanceof ViewGroup)) {
       return false;
@@ -93,7 +95,7 @@ public static boolean isDialogViewAttachedTo(@Nullable View container) {
         alertTitleId   = container.getResources().getIdentifier("alertTitle", "id", container.getContext().getPackageName());
         alertTitleText = container.getResources().getText(R.string.BiometricDialogFragment__biometric_verification).toString();
       }
-      if (!(layout instanceof AlertDialogLayout)) {
+      if (!(layout instanceof ViewGroup)) {
         return false;
       }
       TextView alertTitle = layout.findViewById(alertTitleId);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/links/CallLinks.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/links/CallLinks.kt
index 9f86e5c2de..cc5cc3ea99 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/CallLinks.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/links/CallLinks.kt
@@ -12,9 +12,9 @@ import org.signal.ringrtc.CallLinkRootKey
 import org.thoughtcrime.securesms.database.CallLinkTable
 import org.thoughtcrime.securesms.database.DatabaseObserver
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import java.net.URLDecoder
 
 /**
@@ -43,9 +43,9 @@ object CallLinks {
         refresh()
       }
 
-      ApplicationDependencies.getDatabaseObserver().registerCallLinkObserver(roomId, observer)
+      AppDependencies.databaseObserver.registerCallLinkObserver(roomId, observer)
       emitter.setCancellable {
-        ApplicationDependencies.getDatabaseObserver().unregisterObserver(observer)
+        AppDependencies.databaseObserver.unregisterObserver(observer)
       }
 
       refresh()
@@ -54,7 +54,7 @@ object CallLinks {
 
   @JvmStatic
   fun isCallLink(url: String): Boolean {
-    if (!FeatureFlags.adHocCalling()) {
+    if (!RemoteConfig.adHocCalling) {
       return false
     }
 
@@ -67,7 +67,7 @@ object CallLinks {
 
   @JvmStatic
   fun parseUrl(url: String): CallLinkRootKey? {
-    if (!FeatureFlags.adHocCalling()) {
+    if (!RemoteConfig.adHocCalling) {
       return null
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/links/UpdateCallLinkRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/links/UpdateCallLinkRepository.kt
index 88d04130af..eb525629e7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/UpdateCallLinkRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/links/UpdateCallLinkRepository.kt
@@ -9,7 +9,7 @@ import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.ringrtc.CallLinkState
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.CallLinkUpdateSendJob
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkCredentials
 import org.thoughtcrime.securesms.service.webrtc.links.SignalCallLinkManager
@@ -26,7 +26,7 @@ import org.thoughtcrime.securesms.service.webrtc.links.UpdateCallLinkResult
  * All of these will delegate to the [SignalCallLinkManager] but will additionally update the database state.
  */
 class UpdateCallLinkRepository(
-  private val callLinkManager: SignalCallLinkManager = ApplicationDependencies.getSignalCallManager().callLinkManager
+  private val callLinkManager: SignalCallLinkManager = AppDependencies.signalCallManager.callLinkManager
 ) {
   fun setCallName(credentials: CallLinkCredentials, name: String): Single<UpdateCallLinkResult> {
     return callLinkManager
@@ -60,11 +60,11 @@ class UpdateCallLinkRepository(
       when (result) {
         is UpdateCallLinkResult.Update -> {
           SignalDatabase.callLinks.updateCallLinkState(credentials.roomId, result.state)
-          ApplicationDependencies.getJobManager().add(CallLinkUpdateSendJob(credentials.roomId))
+          AppDependencies.jobManager.add(CallLinkUpdateSendJob(credentials.roomId))
         }
         is UpdateCallLinkResult.Delete -> {
           SignalDatabase.callLinks.markRevoked(credentials.roomId)
-          ApplicationDependencies.getJobManager().add(CallLinkUpdateSendJob(credentials.roomId))
+          AppDependencies.jobManager.add(CallLinkUpdateSendJob(credentials.roomId))
         }
         else -> {}
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkRepository.kt
index af39062092..237c65dfc1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkRepository.kt
@@ -9,7 +9,7 @@ import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.thoughtcrime.securesms.database.CallLinkTable
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.CallLinkUpdateSendJob
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -23,7 +23,7 @@ import org.whispersystems.signalservice.internal.push.SyncMessage
  * but will also ensure the database is updated.
  */
 class CreateCallLinkRepository(
-  private val callLinkManager: SignalCallLinkManager = ApplicationDependencies.getSignalCallManager().callLinkManager
+  private val callLinkManager: SignalCallLinkManager = AppDependencies.signalCallManager.callLinkManager
 ) {
   fun ensureCallLinkCreated(credentials: CallLinkCredentials): Single<EnsureCallLinkCreatedResult> {
     val callLinkRecipientId = Single.fromCallable {
@@ -46,7 +46,7 @@ class CreateCallLinkRepository(
                 )
               )
 
-              ApplicationDependencies.getJobManager().add(
+              AppDependencies.jobManager.add(
                 CallLinkUpdateSendJob(
                   credentials.roomId,
                   SyncMessage.CallLinkUpdate.Type.UPDATE
diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsRepository.kt
index 0be11cfcb5..d59eea1cbc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsRepository.kt
@@ -12,14 +12,14 @@ import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.core.util.concurrent.MaybeCompat
 import org.signal.core.util.orNull
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId
 import org.thoughtcrime.securesms.service.webrtc.links.ReadCallLinkResult
 import org.thoughtcrime.securesms.service.webrtc.links.SignalCallLinkManager
 
 class CallLinkDetailsRepository(
-  private val callLinkManager: SignalCallLinkManager = ApplicationDependencies.getSignalCallManager().callLinkManager
+  private val callLinkManager: SignalCallLinkManager = AppDependencies.signalCallManager.callLinkManager
 ) {
   fun refreshCallLinkState(callLinkRoomId: CallLinkRoomId): Disposable {
     return MaybeCompat.fromCallable { SignalDatabase.callLinks.getCallLinkByRoomId(callLinkRoomId) }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt
index f6fdbcf204..7084fd39b4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt
@@ -55,14 +55,14 @@ import org.thoughtcrime.securesms.conversationlist.chatfilter.ConversationListFi
 import org.thoughtcrime.securesms.conversationlist.chatfilter.FilterLerp
 import org.thoughtcrime.securesms.conversationlist.chatfilter.FilterPullState
 import org.thoughtcrime.securesms.databinding.CallLogFragmentBinding
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.main.Material3OnScrollHelperBinder
 import org.thoughtcrime.securesms.main.SearchBinder
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.stories.tabs.ConversationListTab
 import org.thoughtcrime.securesms.stories.tabs.ConversationListTabsViewModel
 import org.thoughtcrime.securesms.util.CommunicationActions
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.doAfterNextLayout
 import org.thoughtcrime.securesms.util.fragments.requireListener
@@ -212,7 +212,7 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal
   override fun onResume() {
     super.onResume()
     initializeSearchAction()
-    ApplicationDependencies.getDeletedCallEventManager().scheduleIfNecessary()
+    AppDependencies.deletedCallEventManager.scheduleIfNecessary()
     viewModel.markAllCallEventsRead()
   }
 
@@ -253,7 +253,7 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal
     MaterialAlertDialogBuilder(requireContext())
       .setTitle(resources.getQuantityString(R.plurals.CallLogFragment__delete_d_calls, count, count))
       .setMessage(
-        if (FeatureFlags.adHocCalling()) {
+        if (RemoteConfig.adHocCalling) {
           getString(R.string.CallLogFragment__call_links_youve_created)
         } else {
           null
@@ -305,7 +305,7 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal
         }
 
         FilterPullState.OPEN_APEX -> if (source === ConversationFilterSource.DRAG) {
-          // TODO[alex] -- hint here? SignalStore.uiHints().incrementNeverDisplayPullToFilterTip()
+          // TODO[alex] -- hint here? SignalStore.uiHints.incrementNeverDisplayPullToFilterTip()
         }
 
         FilterPullState.CLOSE_APEX -> ViewUtil.setMinimumHeight(collapsingToolbarLayout, 0)
@@ -403,7 +403,7 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal
     MaterialAlertDialogBuilder(requireContext())
       .setTitle(resources.getQuantityString(R.plurals.CallLogFragment__delete_d_calls, 1, 1))
       .setMessage(
-        if (FeatureFlags.adHocCalling()) {
+        if (RemoteConfig.adHocCalling) {
           getString(R.string.CallLogFragment__call_links_youve_created)
         } else {
           null
diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogPagedDataSource.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogPagedDataSource.kt
index bb1830cb2d..635ce62046 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogPagedDataSource.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogPagedDataSource.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.calls.log
 
 import org.signal.paging.PagedDataSource
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 
 class CallLogPagedDataSource(
   private val query: String?,
@@ -10,7 +10,7 @@ class CallLogPagedDataSource(
 ) : PagedDataSource<CallLogRow.Id, CallLogRow> {
 
   private val hasFilter = filter == CallLogFilter.MISSED
-  private val hasCallLinkRow = FeatureFlags.adHocCalling() && filter == CallLogFilter.ALL && query.isNullOrEmpty()
+  private val hasCallLinkRow = RemoteConfig.adHocCalling && filter == CallLogFilter.ALL && query.isNullOrEmpty()
 
   private var callEventsCount = 0
   private var callLinksCount = 0
diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogPeekHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogPeekHelper.kt
index 6af8dd3392..a132f2164a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogPeekHelper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogPeekHelper.kt
@@ -9,7 +9,7 @@ import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId
 import org.thoughtcrime.securesms.util.ThrottledDebouncer
@@ -157,8 +157,8 @@ class CallLogPeekHelper : DefaultLifecycleObserver {
 
       items.forEach {
         when (it.identifier.peekEntryType) {
-          PeekEntryType.CALL_LINK -> ApplicationDependencies.getSignalCallManager().peekCallLinkCall(it.recipientId)
-          PeekEntryType.GROUP_CALL -> ApplicationDependencies.getSignalCallManager().peekGroupCall(it.recipientId)
+          PeekEntryType.CALL_LINK -> AppDependencies.signalCallManager.peekCallLinkCall(it.recipientId)
+          PeekEntryType.GROUP_CALL -> AppDependencies.signalCallManager.peekGroupCall(it.recipientId)
         }
       }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogRepository.kt
index b67474599e..c9790465a7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogRepository.kt
@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.calls.links.UpdateCallLinkRepository
 import org.thoughtcrime.securesms.database.CallLinkTable
 import org.thoughtcrime.securesms.database.DatabaseObserver
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.CallLinkPeekJob
 import org.thoughtcrime.securesms.jobs.CallLogEventSendJob
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId
@@ -52,7 +52,7 @@ class CallLogRepository(
     SignalExecutors.BOUNDED_IO.execute {
       val latestCall = SignalDatabase.calls.getLatestCall() ?: return@execute
       SignalDatabase.calls.markAllCallEventsRead()
-      ApplicationDependencies.getJobManager().add(CallLogEventSendJob.forMarkedAsRead(latestCall))
+      AppDependencies.jobManager.add(CallLogEventSendJob.forMarkedAsRead(latestCall))
     }
   }
 
@@ -66,11 +66,11 @@ class CallLogRepository(
         refresh()
       }
 
-      ApplicationDependencies.getDatabaseObserver().registerConversationListObserver(databaseObserver)
-      ApplicationDependencies.getDatabaseObserver().registerCallUpdateObserver(databaseObserver)
+      AppDependencies.databaseObserver.registerConversationListObserver(databaseObserver)
+      AppDependencies.databaseObserver.registerCallUpdateObserver(databaseObserver)
 
       emitter.setCancellable {
-        ApplicationDependencies.getDatabaseObserver().unregisterObserver(databaseObserver)
+        AppDependencies.databaseObserver.unregisterObserver(databaseObserver)
       }
     }
   }
@@ -106,7 +106,7 @@ class CallLogRepository(
         val latestCall = SignalDatabase.calls.getLatestCall() ?: return@withinTransaction
         SignalDatabase.calls.deleteNonAdHocCallEventsOnOrBefore(latestCall.timestamp)
         SignalDatabase.callLinks.deleteNonAdminCallLinksOnOrBefore(latestCall.timestamp)
-        ApplicationDependencies.getJobManager().add(CallLogEventSendJob.forClearHistory(latestCall))
+        AppDependencies.jobManager.add(CallLogEventSendJob.forClearHistory(latestCall))
       }
 
       SignalDatabase.callLinks.getAllAdminCallLinksExcept(emptySet())
@@ -180,7 +180,7 @@ class CallLogRepository(
         CallLinkPeekJob(it.id)
       }
 
-      ApplicationDependencies.getJobManager().addAll(jobs)
+      AppDependencies.jobManager.addAll(jobs)
     }.subscribeOn(Schedulers.io())
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogViewModel.kt
index 2180ebaf20..91818b88dd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogViewModel.kt
@@ -15,8 +15,8 @@ import org.signal.paging.ObservablePagedData
 import org.signal.paging.PagedData
 import org.signal.paging.PagingConfig
 import org.signal.paging.ProxyPagingController
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.rx.RxStore
 import java.util.concurrent.TimeUnit
 
@@ -82,14 +82,14 @@ class CallLogViewModel(
       controller.onDataInvalidated()
     }
 
-    if (FeatureFlags.adHocCalling()) {
+    if (RemoteConfig.adHocCalling) {
       disposables += Observable
         .interval(30, TimeUnit.SECONDS, Schedulers.computation())
         .flatMapCompletable { callLogRepository.peekCallLinks() }
         .subscribe()
 
-      disposables += ApplicationDependencies
-        .getSignalCallManager()
+      disposables += AppDependencies
+        .signalCallManager
         .peekInfoCache
         .observeOn(Schedulers.computation())
         .distinctUntilChanged()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallActivity.kt
index 224dc8fed9..61d06369d0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallActivity.kt
@@ -42,7 +42,7 @@ class NewCallActivity : ContactSelectionActivity(), ContactSelectionListFragment
       launch(Recipient.resolved(recipientId.get()))
     } else {
       Log.i(TAG, "[onContactSelected] Maybe creating a new recipient.")
-      if (SignalStore.account().isRegistered) {
+      if (SignalStore.account.isRegistered) {
         Log.i(TAG, "[onContactSelected] Doing contact refresh.")
 
         val progress = SimpleProgressDialog.show(this)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
index 89644cf78c..e0b67a3705 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
@@ -29,24 +29,27 @@
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.target.Target;
 import com.bumptech.glide.request.transition.Transition;
+import com.google.android.material.imageview.ShapeableImageView;
+import com.google.android.material.shape.RelativeCornerSize;
+import com.google.android.material.shape.RoundedCornerTreatment;
+import com.google.android.material.shape.ShapeAppearanceModel;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatar;
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatarDrawable;
 import org.thoughtcrime.securesms.components.settings.conversation.ConversationSettingsActivity;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
 import org.thoughtcrime.securesms.conversation.colors.AvatarColor;
 import org.thoughtcrime.securesms.conversation.colors.ChatColors;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.ui.bottomsheet.RecipientBottomSheetDialogFragment;
 import org.thoughtcrime.securesms.util.AvatarUtil;
 import org.thoughtcrime.securesms.util.BlurTransformation;
 import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.ViewUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -65,22 +68,25 @@ public final class AvatarImageView extends AppCompatImageView {
   private int                             size;
   private boolean                         inverted;
   private OnClickListener                 listener;
-  private Recipient.FallbackPhotoProvider fallbackPhotoProvider;
   private boolean                         blurred;
   private ChatColors                      chatColors;
   private FixedSizeTarget                 fixedSizeTarget;
 
-  private @Nullable RecipientContactPhoto recipientContactPhoto;
-  private @NonNull  Drawable              unknownRecipientDrawable;
-  private @Nullable AvatarColor           fallbackPhotoColor;
+  private @Nullable RecipientContactPhoto  recipientContactPhoto;
+  private @NonNull  Drawable               unknownRecipientDrawable;
+  private @NonNull  FallbackAvatarProvider fallbackAvatarProvider = new DefaultFallbackAvatarProvider();
+
 
   public AvatarImageView(Context context) {
-    super(context);
-    initialize(context, null);
+    this(context, null);
   }
 
   public AvatarImageView(Context context, AttributeSet attrs) {
-    super(context, attrs);
+    this(context, attrs, 0);
+  }
+
+  public AvatarImageView(Context context, @Nullable AttributeSet attrs, int defStyle) {
+    super(context, attrs, defStyle);
     initialize(context, attrs);
   }
 
@@ -94,28 +100,19 @@ public void initialize(@NonNull Context context, @Nullable AttributeSet attrs) {
       typedArray.recycle();
     }
 
-    unknownRecipientDrawable = new ResourceContactPhoto(R.drawable.ic_profile_outline_40, R.drawable.ic_profile_outline_20).asDrawable(context, AvatarColor.UNKNOWN, inverted);
+    unknownRecipientDrawable = new FallbackAvatarDrawable(context, new FallbackAvatar.Resource.Person(AvatarColor.UNKNOWN)).circleCrop();
     blurred                  = false;
     chatColors               = null;
   }
 
-  @Override
-  public void setClipBounds(Rect clipBounds) {
-    super.setClipBounds(clipBounds);
-  }
-
   @Override
   public void setOnClickListener(OnClickListener listener) {
     this.listener = listener;
     super.setOnClickListener(listener);
   }
 
-  public void setFallbackPhotoProvider(Recipient.FallbackPhotoProvider fallbackPhotoProvider) {
-    this.fallbackPhotoProvider = fallbackPhotoProvider;
-  }
-
-  public void setFallbackPhotoColor(@Nullable AvatarColor fallbackPhotoColor) {
-    this.fallbackPhotoColor = fallbackPhotoColor;
+  public void setFallbackAvatarProvider(@Nullable FallbackAvatarProvider fallbackAvatarProvider) {
+    this.fallbackAvatarProvider = fallbackAvatarProvider != null ? fallbackAvatarProvider : new DefaultFallbackAvatarProvider();
   }
 
   /**
@@ -184,18 +181,21 @@ private void setAvatar(@NonNull RequestManager requestManager, @Nullable Recipie
         this.chatColors       = chatColors;
         recipientContactPhoto = photo;
 
-        Recipient.FallbackPhotoProvider activeFallbackPhotoProvider = this.fallbackPhotoProvider;
+        FallbackAvatarProvider activeFallbackPhotoProvider = this.fallbackAvatarProvider;
         if (recipient.isSelf() && avatarOptions.useSelfProfileAvatar) {
-          activeFallbackPhotoProvider = new Recipient.FallbackPhotoProvider() {
+          activeFallbackPhotoProvider = new FallbackAvatarProvider() {
             @Override
-            public @NonNull FallbackContactPhoto getPhotoForLocalNumber() {
-              return super.getPhotoForRecipientWithName(recipient.getDisplayName(getContext()), ViewUtil.getWidth(AvatarImageView.this));
+            public @NonNull FallbackAvatar getFallbackAvatar(@NonNull Recipient recipient) {
+              if (recipient.isSelf()) {
+                return new FallbackAvatar.Resource.Person(recipient.getAvatarColor());
+              }
+
+              return FallbackAvatarProvider.super.getFallbackAvatar(recipient);
             }
           };
         }
 
-        Drawable fallbackContactPhotoDrawable = size == SIZE_SMALL ? photo.recipient.getSmallFallbackContactPhotoDrawable(getContext(), inverted, activeFallbackPhotoProvider, ViewUtil.getWidth(this))
-                                                                   : photo.recipient.getFallbackContactPhotoDrawable(getContext(), inverted, activeFallbackPhotoProvider, ViewUtil.getWidth(this));
+        Drawable fallback = new FallbackAvatarDrawable(getContext(), activeFallbackPhotoProvider.getFallbackAvatar(recipient)).circleCrop();
 
         if (fixedSizeTarget != null) {
           requestManager.clear(fixedSizeTarget);
@@ -205,15 +205,15 @@ private void setAvatar(@NonNull RequestManager requestManager, @Nullable Recipie
 
           List<Transformation<Bitmap>> transforms = new ArrayList<>();
           if (shouldBlur) {
-            transforms.add(new BlurTransformation(ApplicationDependencies.getApplication(), 0.25f, BlurTransformation.MAX_RADIUS));
+            transforms.add(new BlurTransformation(AppDependencies.getApplication(), 0.25f, BlurTransformation.MAX_RADIUS));
           }
           transforms.add(new CircleCrop());
           blurred = shouldBlur;
 
           RequestBuilder<Drawable> request = requestManager.load(photo.contactPhoto)
                                                          .dontAnimate()
-                                                         .fallback(fallbackContactPhotoDrawable)
-                                                         .error(fallbackContactPhotoDrawable)
+                                                         .fallback(fallback)
+                                                         .error(fallback)
                                                          .diskCacheStrategy(DiskCacheStrategy.ALL)
                                                          .downsample(DownsampleStrategy.CENTER_INSIDE)
                                                          .transform(new MultiTransformation<>(transforms))
@@ -227,7 +227,7 @@ private void setAvatar(@NonNull RequestManager requestManager, @Nullable Recipie
           }
 
         } else {
-          setImageDrawable(fallbackContactPhotoDrawable);
+          setImageDrawable(fallback);
         }
       }
 
@@ -235,12 +235,7 @@ private void setAvatar(@NonNull RequestManager requestManager, @Nullable Recipie
     } else {
       recipientContactPhoto = null;
       requestManager.clear(this);
-      if (fallbackPhotoProvider != null) {
-        setImageDrawable(fallbackPhotoProvider.getPhotoForRecipientWithoutName()
-                                              .asDrawable(getContext(), Util.firstNonNull(fallbackPhotoColor, AvatarColor.UNKNOWN), inverted));
-      } else {
-        setImageDrawable(unknownRecipientDrawable);
-      }
+      setImageDrawable(unknownRecipientDrawable);
 
       disableQuickContact();
     }
@@ -267,13 +262,9 @@ private void setAvatarClickHandler(@NonNull final Recipient recipient, boolean q
     }
   }
 
-  public void setImageBytesForGroup(@Nullable byte[] avatarBytes,
-                                    @Nullable Recipient.FallbackPhotoProvider fallbackPhotoProvider,
-                                    @NonNull AvatarColor color)
+  public void setImageBytesForGroup(@Nullable byte[] avatarBytes, @NonNull AvatarColor color)
   {
-    Drawable fallback = Util.firstNonNull(fallbackPhotoProvider, Recipient.DEFAULT_FALLBACK_PHOTO_PROVIDER)
-                            .getPhotoForGroup()
-                            .asDrawable(getContext(), color);
+    Drawable fallback = new FallbackAvatarDrawable(getContext(), new FallbackAvatar.Resource.Group(color)).circleCrop();
 
     Glide.with(this)
             .load(avatarBytes)
@@ -295,6 +286,14 @@ public void disableQuickContact() {
     setClickable(listener != null);
   }
 
+  public interface FallbackAvatarProvider {
+    default @NonNull FallbackAvatar getFallbackAvatar(@NonNull Recipient recipient) {
+      return recipient.getFallbackAvatar();
+    }
+  }
+
+  private static class DefaultFallbackAvatarProvider implements FallbackAvatarProvider {}
+
   private static class RecipientContactPhoto {
 
     private final @NonNull  Recipient    recipient;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java b/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
index 80a3ad3e8d..129241bac7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
@@ -169,7 +169,7 @@ public void setHint(@NonNull String hint) {
   }
 
   public void setDraftText(@Nullable CharSequence draftText) {
-    setText("");
+    setText("", BufferType.EDITABLE);
 
     if (draftText != null) {
       append(draftText);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
index a33a3b21b0..451d57d2c0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
@@ -1,8 +1,6 @@
 package org.thoughtcrime.securesms.components;
 
-import android.Manifest;
 import android.animation.Animator;
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.PorterDuff;
@@ -33,8 +31,7 @@
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.permissions.Permissions;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.MessageRecordUtil;
@@ -355,7 +352,7 @@ static public void presentTimer(@NonNull final MessageRecord messageRecord, @Non
         timerView.startAnimation();
 
         if (timerView.isExpired()) {
-          ApplicationDependencies.getExpiringMessageManager().checkSchedule();
+          AppDependencies.getExpiringMessageManager().checkSchedule();
         }
       } else if (!messageRecord.isOutgoing() && !messageRecord.isMediaPending()) {
         SignalExecutors.BOUNDED.execute(() -> {
@@ -363,7 +360,7 @@ static public void presentTimer(@NonNull final MessageRecord messageRecord, @Non
           long    now = System.currentTimeMillis();
 
           SignalDatabase.messages().markExpireStarted(id, now);
-          ApplicationDependencies.getExpiringMessageManager().scheduleDeletion(id, true, now, messageRecord.getExpiresIn());
+          AppDependencies.getExpiringMessageManager().scheduleDeletion(id, true, now, messageRecord.getExpiresIn());
         });
       }
     } else {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/DeleteSyncEducationDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/components/DeleteSyncEducationDialog.kt
new file mode 100644
index 0000000000..2fe390a88c
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/DeleteSyncEducationDialog.kt
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components
+
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.View
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.fragment.app.FragmentManager
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.subjects.CompletableSubject
+import org.signal.core.ui.Buttons
+import org.signal.core.ui.Previews
+import org.signal.core.ui.SignalPreview
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+
+/**
+ * Show educational info about delete syncing to linked devices. This dialog uses a subject to convey when
+ * it completes and will dismiss itself if that subject is null aka dialog is recreated by OS instead of being
+ * shown by our code.
+ */
+class DeleteSyncEducationDialog : ComposeBottomSheetDialogFragment() {
+
+  companion object {
+
+    @JvmStatic
+    fun shouldShow(): Boolean {
+      return TextSecurePreferences.isMultiDevice(AppDependencies.application) &&
+        !SignalStore.uiHints.hasSeenDeleteSyncEducationSheet &&
+        Recipient.self().deleteSyncCapability.isSupported
+    }
+
+    @JvmStatic
+    fun show(fragmentManager: FragmentManager): Completable {
+      val dialog = DeleteSyncEducationDialog()
+
+      dialog.show(fragmentManager, null)
+      SignalStore.uiHints.hasSeenDeleteSyncEducationSheet = true
+
+      val subject = CompletableSubject.create()
+      dialog.subject = subject
+
+      return subject
+        .onErrorComplete()
+        .observeOn(AndroidSchedulers.mainThread())
+    }
+  }
+
+  override val peekHeightPercentage: Float = 1f
+
+  private var subject: CompletableSubject? = null
+
+  @Composable
+  override fun SheetContent() {
+    Sheet(dismiss = this::dismissAllowingStateLoss)
+  }
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+    if (subject == null || savedInstanceState != null) {
+      dismissAllowingStateLoss()
+    }
+  }
+
+  override fun onDismiss(dialog: DialogInterface) {
+    super.onDismiss(dialog)
+    subject?.onComplete()
+  }
+}
+
+@Composable
+private fun Sheet(
+  dismiss: () -> Unit = {}
+) {
+  Column(
+    horizontalAlignment = Alignment.CenterHorizontally,
+    modifier = Modifier
+      .padding(24.dp)
+  ) {
+    Image(
+      painter = painterResource(id = R.drawable.delete_sync),
+      contentDescription = null,
+      modifier = Modifier
+        .padding(top = 48.dp)
+    )
+
+    Text(
+      text = stringResource(id = R.string.DeleteSyncEducation_title),
+      style = MaterialTheme.typography.titleLarge,
+      textAlign = TextAlign.Center,
+      modifier = Modifier
+        .padding(top = 24.dp, bottom = 12.dp)
+    )
+
+    Text(
+      text = stringResource(id = R.string.DeleteSyncEducation_message),
+      style = MaterialTheme.typography.bodyLarge,
+      textAlign = TextAlign.Center,
+      color = MaterialTheme.colorScheme.secondary
+    )
+
+    Buttons.LargeTonal(
+      onClick = dismiss,
+      modifier = Modifier
+        .padding(top = 64.dp)
+        .defaultMinSize(minWidth = 132.dp)
+    ) {
+      Text(text = stringResource(id = R.string.DeleteSyncEducation_acknowledge_button))
+    }
+  }
+}
+
+@SignalPreview
+@Composable
+private fun SheetPreview() {
+  Previews.Preview {
+    Sheet()
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/DeviceSpecificNotificationBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/DeviceSpecificNotificationBottomSheet.kt
new file mode 100644
index 0000000000..0ffcea076a
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/DeviceSpecificNotificationBottomSheet.kt
@@ -0,0 +1,118 @@
+package org.thoughtcrime.securesms.components
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.core.os.bundleOf
+import androidx.fragment.app.FragmentManager
+import org.signal.core.ui.BottomSheets
+import org.signal.core.ui.Buttons
+import org.signal.core.ui.Previews
+import org.signal.core.ui.SignalPreview
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.notifications.DeviceSpecificNotificationConfig
+import org.thoughtcrime.securesms.util.BottomSheetUtil
+import org.thoughtcrime.securesms.util.CommunicationActions
+
+class DeviceSpecificNotificationBottomSheet : ComposeBottomSheetDialogFragment() {
+
+  override val peekHeightPercentage: Float = 0.66f
+
+  companion object {
+    private const val ARG_LINK = "arg.link"
+    private const val ARG_LINK_VERSION = "arg.link.version"
+
+    @JvmStatic
+    fun show(fragmentManager: FragmentManager) {
+      if (fragmentManager.findFragmentByTag(BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG) == null) {
+        DeviceSpecificNotificationBottomSheet().apply {
+          arguments = bundleOf(
+            ARG_LINK to DeviceSpecificNotificationConfig.currentConfig.link,
+            ARG_LINK_VERSION to DeviceSpecificNotificationConfig.currentConfig.version
+          )
+        }.show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)
+        SignalStore.uiHints.lastSupportVersionSeen = DeviceSpecificNotificationConfig.currentConfig.version
+      }
+    }
+  }
+
+  @Composable
+  override fun SheetContent() {
+    DeviceSpecificSheet(this::onContinue, this::dismissAllowingStateLoss)
+  }
+
+  private fun onContinue() {
+    val link = arguments?.getString(ARG_LINK) ?: getString(R.string.PromptBatterySaverBottomSheet__learn_more_url)
+    CommunicationActions.openBrowserLink(requireContext(), link)
+  }
+}
+
+@Composable
+fun DeviceSpecificSheet(onContinue: () -> Unit = {}, onDismiss: () -> Unit = {}) {
+  return Column(
+    horizontalAlignment = Alignment.CenterHorizontally,
+    modifier = Modifier.fillMaxWidth().wrapContentSize(Alignment.Center)
+  ) {
+    BottomSheets.Handle()
+    Icon(
+      painterResource(id = R.drawable.ic_troubleshoot_notification),
+      contentDescription = null,
+      tint = Color.Unspecified,
+      modifier = Modifier.padding(top = 32.dp, bottom = 8.dp)
+    )
+    Text(
+      text = stringResource(id = R.string.DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed),
+      style = MaterialTheme.typography.headlineSmall,
+      textAlign = TextAlign.Center,
+      color = MaterialTheme.colorScheme.onSurface,
+      modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp)
+    )
+    Text(
+      text = stringResource(id = R.string.DeviceSpecificNotificationBottomSheet__disable_battery_optimizations),
+      style = MaterialTheme.typography.bodyLarge,
+      textAlign = TextAlign.Center,
+      color = MaterialTheme.colorScheme.onSurfaceVariant,
+      modifier = Modifier.padding(horizontal = 24.dp)
+    )
+    Row(
+      modifier = Modifier.padding(top = 60.dp, bottom = 24.dp, start = 24.dp, end = 24.dp)
+    ) {
+      Buttons.MediumTonal(
+        onClick = onDismiss,
+        modifier = Modifier.padding(end = 12.dp).weight(1f)
+      ) {
+        Text(stringResource(id = R.string.DeviceSpecificNotificationBottomSheet__no_thanks))
+      }
+      Buttons.MediumTonal(
+        onClick = onContinue,
+        modifier = Modifier.padding(start = 12.dp).weight(1f)
+      ) {
+        Icon(painterResource(id = R.drawable.ic_open_20), contentDescription = null, modifier = Modifier.padding(end = 4.dp))
+        Text(stringResource(id = R.string.DeviceSpecificNotificationBottomSheet__continue))
+      }
+    }
+  }
+}
+
+@SignalPreview
+@Composable
+fun DeviceSpecificSheetPreview() {
+  Previews.BottomSheetPreview {
+    DeviceSpecificSheet()
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
index 569ff4bb74..462ad45110 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
@@ -17,6 +17,7 @@
 import android.view.animation.AnimationSet;
 import android.view.animation.Interpolator;
 import android.view.animation.TranslateAnimation;
+import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -105,11 +106,13 @@ public class InputPanel extends ConstraintLayout
   private View            editMessageCancel;
   private ImageView       editMessageThumbnail;
   private View            editMessageTitle;
+  private FrameLayout     composeTextContainer;
 
   private MicrophoneRecorderView microphoneRecorderView;
   private SlideToCancel          slideToCancel;
   private RecordTime             recordTime;
   private ValueAnimator          quoteAnimator;
+  private ValueAnimator          editMessageAnimator;
   private VoiceNoteDraftView     voiceNoteDraftView;
 
   private @Nullable Listener listener;
@@ -148,6 +151,7 @@ public void onFinishInflate() {
     this.linkPreview            = findViewById(R.id.link_preview);
     this.mediaKeyboard          = findViewById(R.id.emoji_toggle);
     this.composeText            = findViewById(R.id.embedded_text_editor);
+    this.composeTextContainer   = findViewById(R.id.embedded_text_editor_container);
     this.quickCameraToggle      = findViewById(R.id.quick_camera_toggle);
     this.quickAudioToggle       = findViewById(R.id.quick_audio_toggle);
     this.buttonToggle           = findViewById(R.id.button_toggle);
@@ -404,22 +408,47 @@ public void setWallpaperEnabled(boolean enabled) {
     quoteView.setWallpaperEnabled(enabled);
   }
 
-  public void enterEditMessageMode(@NonNull RequestManager requestManager, @NonNull ConversationMessage conversationMessageToEdit, boolean fromDraft) {
+  public void enterEditMessageMode(@NonNull RequestManager requestManager, @NonNull ConversationMessage conversationMessageToEdit, boolean fromDraft, boolean clearQuote) {
+    int originalHeight         = composeTextContainer.getMeasuredHeight();
     SpannableString textToEdit = conversationMessageToEdit.getDisplayBody(getContext());
+
     if (!fromDraft) {
       MessageStyler.convertSpoilersToComposeMode(textToEdit);
       composeText.setText(textToEdit);
       composeText.setSelection(textToEdit.length());
     }
+
     Quote quote = MessageRecordUtil.getQuote(conversationMessageToEdit.getMessageRecord());
-    if (quote == null) {
+    if (quote == null || clearQuote) {
       clearQuote();
     } else {
       setQuote(requestManager, quote.getId(), Recipient.resolved(quote.getAuthor()), quote.getDisplayText(), quote.getAttachment(), quote.getQuoteType());
     }
+
     this.messageToEdit = conversationMessageToEdit.getMessageRecord();
     updateEditModeThumbnail(requestManager);
-    updateEditModeUi();
+
+    int maxWidth = composeContainer.getWidth();
+    if (composeContainer.getLayoutParams() instanceof MarginLayoutParams) {
+      MarginLayoutParams layoutParams = (MarginLayoutParams) composeContainer.getLayoutParams();
+      maxWidth -= layoutParams.leftMargin + layoutParams.rightMargin;
+    }
+    composeTextContainer.measure(MeasureSpec.makeMeasureSpec(maxWidth, MeasureSpec.AT_MOST), MeasureSpec.UNSPECIFIED);
+    int finalHeight = (inEditMessageMode()) ? composeTextContainer.getMeasuredHeight() : composeTextContainer.getMeasuredHeight() + editMessageTitle.getMeasuredHeight();
+
+    if (editMessageAnimator != null) {
+     editMessageAnimator.cancel();
+    }
+    editMessageAnimator = createHeightAnimator(composeTextContainer, originalHeight, finalHeight, new AnimationCompleteListener() {
+      @Override
+      public void onAnimationEnd(Animator animation) {
+        ViewGroup.LayoutParams params = composeTextContainer.getLayoutParams();
+        params.height = ViewGroup.LayoutParams.WRAP_CONTENT;
+        composeTextContainer.setLayoutParams(params);
+        updateEditModeUi();
+      }
+    });
+    editMessageAnimator.start();
   }
 
   private void updateEditModeThumbnail(@NonNull RequestManager requestManager) {
@@ -443,6 +472,7 @@ private void updateEditModeThumbnail(@NonNull RequestManager requestManager) {
   }
 
   public void exitEditMessageMode() {
+    int originalHeight = composeTextContainer.getMeasuredHeight();
     if (messageToEdit != null) {
       composeText.setText("");
       messageToEdit = null;
@@ -450,6 +480,21 @@ public void exitEditMessageMode() {
       clearQuote();
     }
     updateEditModeUi();
+
+    composeTextContainer.measure(0, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
+
+    if (editMessageAnimator != null) {
+     editMessageAnimator.cancel();
+    }
+    editMessageAnimator = createHeightAnimator(composeTextContainer, originalHeight, composeTextContainer.getMeasuredHeight(), new AnimationCompleteListener() {
+      @Override
+      public void onAnimationEnd(Animator animation) {
+        ViewGroup.LayoutParams params = composeTextContainer.getLayoutParams();
+        params.height = ViewGroup.LayoutParams.WRAP_CONTENT;
+        composeTextContainer.setLayoutParams(params);
+      }
+    });
+    editMessageAnimator.start();
   }
 
   private void updateEditModeUi() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/InsetAwareConstraintLayout.kt b/app/src/main/java/org/thoughtcrime/securesms/components/InsetAwareConstraintLayout.kt
index 8bf08a29cc..7feca1e674 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/InsetAwareConstraintLayout.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/InsetAwareConstraintLayout.kt
@@ -157,9 +157,9 @@ open class InsetAwareConstraintLayout @JvmOverloads constructor(
 
   private fun getKeyboardHeight(): Int {
     val height = if (isLandscape()) {
-      SignalStore.misc().keyboardLandscapeHeight
+      SignalStore.misc.keyboardLandscapeHeight
     } else {
-      SignalStore.misc().keyboardPortraitHeight
+      SignalStore.misc.keyboardPortraitHeight
     }
 
     val minHeight = resources.getDimensionPixelSize(R.dimen.default_custom_keyboard_size)
@@ -173,9 +173,9 @@ open class InsetAwareConstraintLayout @JvmOverloads constructor(
 
   private fun setKeyboardHeight(height: Int) {
     if (isLandscape()) {
-      SignalStore.misc().keyboardLandscapeHeight = height
+      SignalStore.misc.keyboardLandscapeHeight = height
     } else {
-      SignalStore.misc().keyboardPortraitHeight = height
+      SignalStore.misc.keyboardPortraitHeight = height
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java b/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java
index 8866f223f3..c7527c5953 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java
@@ -20,13 +20,14 @@
 
 import org.signal.ringrtc.CallLinkRootKey;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatar;
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatarDrawable;
 import org.thoughtcrime.securesms.calls.links.CallLinks;
 import org.thoughtcrime.securesms.conversation.colors.AvatarColorHash;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewRepository;
 import org.thoughtcrime.securesms.mms.ImageSlide;
 import org.thoughtcrime.securesms.mms.SlidesClickedListener;
-import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.views.Stub;
@@ -224,10 +225,10 @@ public void setLinkPreview(@NonNull RequestManager requestManager, @NonNull Link
       thumbnailState.applyState(thumbnail);
       thumbnail.get().setImageDrawable(
           requestManager,
-          Recipient.DEFAULT_FALLBACK_PHOTO_PROVIDER
-                   .getPhotoForCallLink()
-                   .asDrawable(getContext(),
-                               AvatarColorHash.forCallLink(callLinkRootKey.getKeyBytes()))
+          new FallbackAvatarDrawable(
+              getContext(),
+              new FallbackAvatar.Resource.CallLink(AvatarColorHash.forCallLink(callLinkRootKey.getKeyBytes()))
+          )
       );
       thumbnail.get().showSecondaryText(false);
     } else {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/PromptBatterySaverDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/PromptBatterySaverDialogFragment.kt
new file mode 100644
index 0000000000..5536a7d167
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/PromptBatterySaverDialogFragment.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.RequiresApi
+import androidx.core.content.ContextCompat
+import androidx.core.os.bundleOf
+import androidx.fragment.app.FragmentManager
+import org.signal.core.util.concurrent.LifecycleDisposable
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.databinding.PromptBatterySaverBottomSheetBinding
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.notifications.DeviceSpecificNotificationConfig
+import org.thoughtcrime.securesms.util.BottomSheetUtil
+import org.thoughtcrime.securesms.util.LocalMetrics
+import org.thoughtcrime.securesms.util.PowerManagerCompat
+
+@RequiresApi(23)
+class PromptBatterySaverDialogFragment : FixedRoundedCornerBottomSheetDialogFragment() {
+
+  companion object {
+    private val TAG = Log.tag(PromptBatterySaverDialogFragment::class.java)
+    private const val ARG_LEARN_MORE_LINK = "arg.learn.more.link"
+
+    @JvmStatic
+    fun show(fragmentManager: FragmentManager) {
+      if (fragmentManager.findFragmentByTag(BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG) == null) {
+        PromptBatterySaverDialogFragment().apply {
+          arguments = bundleOf(
+            ARG_LEARN_MORE_LINK to DeviceSpecificNotificationConfig.currentConfig.link
+          )
+        }.show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)
+        SignalStore.uiHints.lastBatterySaverPrompt = System.currentTimeMillis()
+      }
+    }
+  }
+
+  override val peekHeightPercentage: Float = 0.66f
+  override val themeResId: Int = R.style.Widget_Signal_FixedRoundedCorners_Messages
+
+  private val binding by ViewBinderDelegate(PromptBatterySaverBottomSheetBinding::bind)
+
+  private val disposables: LifecycleDisposable = LifecycleDisposable()
+
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+    return inflater.inflate(R.layout.prompt_battery_saver_bottom_sheet, container, false)
+  }
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    disposables.bindTo(viewLifecycleOwner)
+
+    val learnMoreLink = arguments?.getString(ARG_LEARN_MORE_LINK) ?: getString(R.string.PromptBatterySaverBottomSheet__learn_more_url)
+    binding.message.setLearnMoreVisible(true)
+    binding.message.setLinkColor(ContextCompat.getColor(requireContext(), R.color.signal_colorPrimary))
+    binding.message.setLink(learnMoreLink)
+
+    binding.continueButton.setOnClickListener {
+      PowerManagerCompat.requestIgnoreBatteryOptimizations(requireContext())
+      Log.i(TAG, "Requested to ignore battery optimizations, clearing local metrics.")
+      LocalMetrics.clear()
+    }
+    binding.dismissButton.setOnClickListener {
+      Log.i(TAG, "User denied request to ignore battery optimizations.")
+      SignalStore.uiHints.markDismissedBatterySaverPrompt()
+      dismiss()
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
index 75d817d51d..790687c82b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java
@@ -325,8 +325,10 @@ private void setQuoteText(@Nullable CharSequence body,
 
     // Given that most types have images, we specifically check images last
     if (viewOnceSlide != null) {
+      mediaDescriptionText.setPadding(0, mediaDescriptionText.getPaddingTop(), 0, (int) DimensionUnit.DP.toPixels(8));
       mediaDescriptionText.setText(R.string.QuoteView_view_once_media);
     } else if (audioSlide != null) {
+      mediaDescriptionText.setPadding(0, mediaDescriptionText.getPaddingTop(), 0, (int) DimensionUnit.DP.toPixels(8));
       mediaDescriptionText.setText(R.string.QuoteView_audio);
     } else if (documentSlide != null) {
       mediaDescriptionText.setVisibility(GONE);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java b/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
index ff728131bc..950edd5af4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
@@ -4,6 +4,7 @@
 import android.animation.Animator;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/SharedContactView.java b/app/src/main/java/org/thoughtcrime/securesms/components/SharedContactView.java
index 883ee18093..96e00cabf7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/SharedContactView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/SharedContactView.java
@@ -5,6 +5,7 @@
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.net.Uri;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
@@ -69,7 +70,7 @@ public SharedContactView(Context context, @Nullable AttributeSet attrs, int defS
     initialize(attrs);
   }
 
-  @RequiresApi(api = 21)
+  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
   public SharedContactView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
     super(context, attrs, defStyleAttr, defStyleRes);
     initialize(attrs);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/SignalProgressDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/components/SignalProgressDialog.kt
index 272787e15c..00ded55dd7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/SignalProgressDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/SignalProgressDialog.kt
@@ -2,24 +2,54 @@
 
 package org.thoughtcrime.securesms.components
 
-import android.app.ProgressDialog
 import android.content.Context
 import android.content.DialogInterface
+import android.os.Build
+import android.view.LayoutInflater
+import android.view.WindowManager
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.progressindicator.CircularProgressIndicator
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.util.ViewUtil
 
 /**
  * Wraps a normal progress dialog for showing blocking in-progress UI.
  */
-class SignalProgressDialog private constructor(val progressDialog: ProgressDialog) {
+class SignalProgressDialog private constructor(
+  private val dialog: AlertDialog,
+  private val titleView: TextView,
+  private val messageView: TextView,
+  private val progressBar: CircularProgressIndicator
+) {
 
   val isShowing: Boolean
-    get() = progressDialog.isShowing
+    get() = dialog.isShowing
+
+  var isIndeterminate: Boolean
+    get() = progressBar.isIndeterminate
+    set(value) = progressBar.setIndeterminate(value)
+
+  var progress: Int
+    get() = progressBar.progress
+    set(value) = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+      progressBar.setProgress(value, true)
+    } else {
+      progressBar.setProgress(value)
+    }
+
+  fun setMessage(message: CharSequence?) {
+    messageView.text = message
+  }
 
   fun hide() {
-    progressDialog.hide()
+    dialog.hide()
   }
 
   fun dismiss() {
-    progressDialog.dismiss()
+    dialog.dismiss()
   }
 
   companion object {
@@ -33,7 +63,31 @@ class SignalProgressDialog private constructor(val progressDialog: ProgressDialo
       cancelable: Boolean = false,
       cancelListener: DialogInterface.OnCancelListener? = null
     ): SignalProgressDialog {
-      return SignalProgressDialog(ProgressDialog.show(context, title, message, indeterminate, cancelable, cancelListener))
+      val builder = MaterialAlertDialogBuilder(context).apply {
+        setTitle(null)
+        setMessage(null)
+        setCancelable(cancelable)
+        setOnCancelListener(cancelListener)
+      }
+
+      val customView = LayoutInflater.from(context).inflate(R.layout.signal_progress_dialog, null) as ConstraintLayout
+      val titleView: TextView = customView.findViewById(R.id.progress_dialog_title)
+      val messageView: TextView = customView.findViewById(R.id.progress_dialog_message)
+      val progressView: CircularProgressIndicator = customView.findViewById(R.id.progress_dialog_progressbar)
+
+      titleView.text = title
+      messageView.text = message
+      progressView.isIndeterminate = indeterminate
+
+      builder.setView(customView)
+      val dialog = builder.show()
+
+      val layoutParams = WindowManager.LayoutParams()
+      layoutParams.copyFrom(dialog.window?.attributes)
+      layoutParams.width = ViewUtil.dpToPx(context, 260)
+      dialog.window?.attributes = layoutParams
+
+      return SignalProgressDialog(dialog, titleView, messageView, progressView)
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
index cfc0414e52..53ae540541 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -48,6 +48,7 @@
 import org.thoughtcrime.securesms.mms.SlidesClickedListener;
 import org.thoughtcrime.securesms.mms.VideoSlide;
 import org.thoughtcrime.securesms.stories.StoryTextPostModel;
+import org.thoughtcrime.securesms.util.AttachmentUtil;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.views.Stub;
@@ -370,7 +371,16 @@ public ListenableFuture<Boolean> setImageResource(@NonNull RequestManager reques
       transferControlViewStub.get().setSlides(List.of(slide));
     }
     int transferState = TransferControlView.getTransferState(List.of(slide));
-    transferControlViewStub.get().setVisible(showControls && transferState != AttachmentTable.TRANSFER_PROGRESS_DONE && transferState != AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE);
+    boolean isOffloadedImage = (transferState == AttachmentTable.TRANSFER_RESTORE_OFFLOADED && MediaUtil.isImageType(slide.getContentType())) && AttachmentUtil.isRestoreOnOpenPermitted(getContext(), slide.asAttachment());
+
+    if (!showControls ||
+        transferState == AttachmentTable.TRANSFER_PROGRESS_DONE ||
+        transferState == AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE ||
+        isOffloadedImage) {
+      transferControlViewStub.get().setVisible(false);
+    } else {
+      transferControlViewStub.get().setVisible(true);
+    }
 
     if (slide.getUri() != null && slide.hasPlayOverlay() &&
         (slide.getTransferState() == AttachmentTable.TRANSFER_PROGRESS_DONE || isPreview))
@@ -412,7 +422,10 @@ public ListenableFuture<Boolean> setImageResource(@NonNull RequestManager reques
     SettableFuture<Boolean> result        = new SettableFuture<>();
     boolean                 resultHandled = false;
 
-    if (slide.hasPlaceholder() && (previousBlurHash == null || !Objects.equals(slide.getPlaceholderBlur(), previousBlurHash))) {
+    if (slide.hasThumbnail()) {
+      buildArchiveThumbnailRequestBuilder(requestManager, slide).into(new GlideBitmapListeningTarget(blurHash, result));
+      resultHandled = true;
+    } else if (slide.hasPlaceholder() && (previousBlurHash == null || !Objects.equals(slide.getPlaceholderBlur(), previousBlurHash))) {
       buildPlaceholderRequestBuilder(requestManager, slide).into(new GlideBitmapListeningTarget(blurHash, result));
       resultHandled = true;
     } else if (!slide.hasPlaceholder()) {
@@ -420,7 +433,7 @@ public ListenableFuture<Boolean> setImageResource(@NonNull RequestManager reques
       blurHash.setImageDrawable(null);
     }
 
-    if (slide.getUri() != null) {
+    if (slide.getDisplayUri() != null) {
       if (!MediaUtil.isJpegType(slide.getContentType()) && !MediaUtil.isVideoType(slide.getContentType())) {
         SettableFuture<Boolean> thumbnailFuture = new SettableFuture<>();
         thumbnailFuture.deferTo(result);
@@ -542,7 +555,7 @@ private static boolean hasSameContents(@Nullable Slide slide, @Nullable Slide ot
   }
 
   private RequestBuilder<Drawable> buildThumbnailRequestBuilder(@NonNull RequestManager requestManager, @NonNull Slide slide) {
-    RequestBuilder<Drawable> requestBuilder = applySizing(requestManager.load(new DecryptableUri(Objects.requireNonNull(slide.getUri())))
+    RequestBuilder<Drawable> requestBuilder = applySizing(requestManager.load(new DecryptableUri(Objects.requireNonNull(slide.getDisplayUri())))
                                                               .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
                                                               .downsample(SignalDownsampleStrategy.CENTER_OUTSIDE_NO_UPSCALE)
                                                               .transition(withCrossFade()));
@@ -611,6 +624,25 @@ private RequestBuilder<Bitmap> buildPlaceholderRequestBuilder(@NonNull RequestMa
     }
   }
 
+  private RequestBuilder<Bitmap> buildArchiveThumbnailRequestBuilder(@NonNull RequestManager requestManager, @NonNull Slide slide) {
+    RequestBuilder<Bitmap> bitmap = requestManager.asBitmap();
+
+    Uri thumbnailUri = slide.getThumbnailUri();
+
+    if (thumbnailUri != null) {
+      bitmap = bitmap.load(slide.getThumbnailUri());
+    } else {
+      bitmap = bitmap.load(slide.getPlaceholderRes(getContext().getTheme()));
+    }
+
+    final RequestBuilder<Bitmap> resizedRequest = applySizing(bitmap.diskCacheStrategy(DiskCacheStrategy.NONE));
+    if (thumbnailUri != null) {
+      return resizedRequest.centerCrop();
+    } else {
+      return resizedRequest;
+    }
+  }
+
   private <TranscodeType> RequestBuilder<TranscodeType> applySizing(@NonNull RequestBuilder<TranscodeType> request) {
     int[] size = new int[2];
     fillTargetDimensions(size, dimens, bounds);
@@ -648,13 +680,8 @@ public interface ThumbnailRequestListener extends RequestListener<Drawable> {
   private class ThumbnailClickDispatcher implements View.OnClickListener {
     @Override
     public void onClick(View view) {
-      boolean validThumbnail = slide != null &&
-                               slide.asAttachment().getUri() != null &&
-                               slide.getTransferState() == AttachmentTable.TRANSFER_PROGRESS_DONE;
-
-      boolean permanentFailure = slide != null && slide.asAttachment().isPermanentlyFailed();
-
-      if (thumbnailClickListener != null && (validThumbnail || permanentFailure)) {
+      boolean controlsVisible = transferControlViewStub.getVisibility() == View.VISIBLE && !transferControlViewStub.get().isGone();
+      if (thumbnailClickListener != null && !controlsVisible) {
         thumbnailClickListener.onClick(view, slide);
       } else if (parentClickListener != null) {
         parentClickListener.onClick(view);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java b/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java
index bc6fb79fe5..2d94ed4e58 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java
@@ -4,7 +4,7 @@
 
 import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.TypingSendJob;
 import org.thoughtcrime.securesms.util.Util;
 
@@ -76,7 +76,7 @@ private synchronized void onTypingStopped(long threadId, boolean notify) {
   }
 
   private void sendTyping(long threadId, boolean typingStarted) {
-    ApplicationDependencies.getJobManager().add(new TypingSendJob(threadId, typingStarted));
+    AppDependencies.getJobManager().add(new TypingSendJob(threadId, typingStarted));
   }
 
   private class StartRunnable implements Runnable {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java
index eee2ad1d67..9f4305228b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java
@@ -50,7 +50,7 @@ public class ZoomingImageView extends FrameLayout {
   private static final float SMALL_IMAGES_ZOOM_LEVEL_MID = 3.0f;
   private static final float SMALL_IMAGES_ZOOM_LEVEL_MAX = 8.0f;
 
-  private final PhotoView                 photoView;
+  private final PhotoView                 gifView;
   private final SubsamplingScaleImageView subsamplingImageView;
 
   public ZoomingImageView(Context context) {
@@ -66,54 +66,34 @@ public ZoomingImageView(Context context, AttributeSet attrs, int defStyleAttr) {
 
     inflate(context, R.layout.zooming_image_view, this);
 
-    this.photoView            = findViewById(R.id.image_view);
+    this.gifView              = findViewById(R.id.image_view);
     this.subsamplingImageView = findViewById(R.id.subsampling_image_view);
 
-    this.photoView.setZoomTransitionDuration(ZOOM_TRANSITION_DURATION);
-    this.photoView.setScaleLevels(ZOOM_LEVEL_MIN, SMALL_IMAGES_ZOOM_LEVEL_MID, SMALL_IMAGES_ZOOM_LEVEL_MAX);
+    this.gifView.setZoomTransitionDuration(ZOOM_TRANSITION_DURATION);
+    this.gifView.setScaleLevels(ZOOM_LEVEL_MIN, SMALL_IMAGES_ZOOM_LEVEL_MID, SMALL_IMAGES_ZOOM_LEVEL_MAX);
 
     this.subsamplingImageView.setDoubleTapZoomDuration(ZOOM_TRANSITION_DURATION);
     this.subsamplingImageView.setDoubleTapZoomScale(LARGE_IMAGES_ZOOM_LEVEL_MID);
     this.subsamplingImageView.setMaxScale(LARGE_IMAGES_ZOOM_LEVEL_MAX);
 
-    this.photoView.setOnClickListener(v -> ZoomingImageView.this.callOnClick());
+    this.gifView.setOnClickListener(v -> ZoomingImageView.this.callOnClick());
     this.subsamplingImageView.setOnClickListener(v -> ZoomingImageView.this.callOnClick());
   }
 
   @SuppressLint("StaticFieldLeak")
-  public void setImageUri(@NonNull RequestManager requestManager, @NonNull Uri uri, @NonNull String contentType, @NonNull Runnable onMediaReady)
-  {
-    final Context context        = getContext();
-    final int     maxTextureSize = BitmapUtil.getMaxTextureSize();
-
-    Log.i(TAG, "Max texture size: " + maxTextureSize);
-
-    SimpleTask.run(ViewUtil.getActivityLifecycle(this), () -> {
-      if (MediaUtil.isGif(contentType)) return null;
-
-      try {
-        InputStream inputStream = PartAuthority.getAttachmentStream(context, uri);
-        return BitmapUtil.getDimensions(inputStream);
-      } catch (IOException | BitmapDecodingException e) {
-        Log.w(TAG, e);
-        return null;
-      }
-    }, dimensions -> {
-      Log.i(TAG, "Dimensions: " + (dimensions == null ? "(null)" : dimensions.first + ", " + dimensions.second));
-
-      if (dimensions == null || (dimensions.first <= maxTextureSize && dimensions.second <= maxTextureSize)) {
-        Log.i(TAG, "Loading in standard image view...");
-        setImageViewUri(requestManager, uri, onMediaReady);
-      } else {
-        Log.i(TAG, "Loading in subsampling image view...");
-        setSubsamplingImageViewUri(uri);
-        onMediaReady.run();
-      }
-    });
+  public void setImageUri(@NonNull RequestManager requestManager, @NonNull Uri uri, @NonNull String contentType, @NonNull Runnable onMediaReady) {
+    if (MediaUtil.isGif(contentType)) {
+      Log.i(TAG, "Loading in gif image view...");
+      setImageViewUri(requestManager, uri, onMediaReady);
+    } else {
+      Log.i(TAG, "Loading in subsampling image view...");
+      setSubsamplingImageViewUri(uri);
+      onMediaReady.run();
+    }
   }
 
   private void setImageViewUri(@NonNull RequestManager requestManager, @NonNull Uri uri, @NonNull Runnable onMediaReady) {
-    photoView.setVisibility(View.VISIBLE);
+    gifView.setVisibility(View.VISIBLE);
     subsamplingImageView.setVisibility(View.GONE);
 
     requestManager.load(new DecryptableUri(uri))
@@ -121,7 +101,7 @@ private void setImageViewUri(@NonNull RequestManager requestManager, @NonNull Ur
                  .dontTransform()
                  .override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
                  .addListener(ActionRequestListener.onEither(onMediaReady))
-                 .into(photoView);
+                 .into(gifView);
   }
 
   private void setSubsamplingImageViewUri(@NonNull Uri uri) {
@@ -129,7 +109,7 @@ private void setSubsamplingImageViewUri(@NonNull Uri uri) {
     subsamplingImageView.setRegionDecoderFactory(new AttachmentRegionDecoderFactory());
 
     subsamplingImageView.setVisibility(View.VISIBLE);
-    photoView.setVisibility(View.GONE);
+    gifView.setVisibility(View.GONE);
 
     // We manually set the orientation ourselves because using
     // SubsamplingScaleImageView.ORIENTATION_USE_EXIF is unreliable:
@@ -155,7 +135,7 @@ private void setSubsamplingImageViewUri(@NonNull Uri uri) {
   }
 
   public void cleanup() {
-    photoView.setImageDrawable(null);
+    gifView.setImageDrawable(null);
     subsamplingImageView.recycle();
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
index b62ed01e03..b77a98f5fa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
@@ -42,11 +42,10 @@ public EmojiEditText(Context context, AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
 
     TypedArray a           = context.getTheme().obtainStyledAttributes(attrs, R.styleable.EmojiTextView, 0, 0);
-    boolean    forceCustom = a.getBoolean(R.styleable.EmojiTextView_emoji_forceCustom, false);
     boolean    jumboEmoji  = a.getBoolean(R.styleable.EmojiTextView_emoji_forceJumbo, false);
     a.recycle();
 
-    if (!isInEditMode() && (forceCustom || !SignalStore.settings().isPreferSystemEmoji())) {
+    if (!isInEditMode() && !SignalStore.settings().isPreferSystemEmoji()) {
       setFilters(appendEmojiFilter(this.getFilters(), jumboEmoji));
       setEmojiCompatEnabled(false);
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
index b617522d40..431dcf226d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
@@ -23,6 +23,7 @@
 import org.thoughtcrime.securesms.emoji.EmojiPageCache;
 import org.thoughtcrime.securesms.emoji.EmojiSource;
 import org.thoughtcrime.securesms.emoji.JumboEmoji;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.util.DeviceProperties;
 import org.thoughtcrime.securesms.util.FutureTaskListener;
 
@@ -121,6 +122,10 @@ public class EmojiProvider {
       return null;
     }
 
+    if (SignalStore.settings().isPreferSystemEmoji()) {
+      return new SystemEmojiDrawable(drawInfo.getEmoji());
+    }
+
     final int           lowMemoryDecodeScale = DeviceProperties.isLowMemoryDevice(context) ? 2 : 1;
     final EmojiSource   source               = EmojiSource.getLatest();
     final EmojiDrawable drawable             = new EmojiDrawable(source, drawInfo, lowMemoryDecodeScale);
@@ -202,6 +207,10 @@ public void onFailure(ExecutionException exception) {
       return null;
     }
 
+    if (SignalStore.settings().isPreferSystemEmoji()) {
+      return new SystemEmojiDrawable(drawInfo.getEmoji());
+    }
+
     final int           lowMemoryDecodeScale = DeviceProperties.isLowMemoryDevice(context) ? 2 : 1;
     final EmojiSource   source               = EmojiSource.getLatest();
     final EmojiDrawable drawable             = new EmojiDrawable(source, drawInfo, lowMemoryDecodeScale);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
index d44efa9c37..e18ca73878 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
@@ -57,7 +57,6 @@ public class EmojiTextView extends AppCompatTextView {
   private static final char  ELLIPSIS        = '…';
   private static final float JUMBOMOJI_SCALE = 0.8f;
 
-  private boolean                forceCustom;
   private CharSequence           previousText;
   private BufferType             previousBufferType;
   private TransformationMethod   previousTransformationMethod;
@@ -93,7 +92,6 @@ public EmojiTextView(Context context, AttributeSet attrs, int defStyleAttr) {
     TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.EmojiTextView, 0, 0);
     scaleEmojis     = a.getBoolean(R.styleable.EmojiTextView_scaleEmojis, false);
     maxLength       = a.getInteger(R.styleable.EmojiTextView_emoji_maxLength, -1);
-    forceCustom     = a.getBoolean(R.styleable.EmojiTextView_emoji_forceCustom, false);
     renderMentions  = a.getBoolean(R.styleable.EmojiTextView_emoji_renderMentions, true);
     measureLastLine = a.getBoolean(R.styleable.EmojiTextView_measureLastLine, false);
     forceJumboEmoji = a.getBoolean(R.styleable.EmojiTextView_emoji_forceJumbo, false);
@@ -445,7 +443,7 @@ private boolean unchanged(CharSequence text, CharSequence overflowText, BufferTy
   }
 
   private boolean useSystemEmoji() {
-    return isInEditMode() || (!forceCustom && SignalStore.settings().isPreferSystemEmoji());
+    return isInEditMode() || SignalStore.settings().isPreferSystemEmoji();
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java
index c1f9379375..6c63240923 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.components.emoji;
 
 import android.content.Context;
+import android.os.Build;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.widget.ImageView;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView.kt
index 2d6f36803a..bda9337983 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView.kt
@@ -22,7 +22,7 @@ open class SimpleEmojiTextView @JvmOverloads constructor(
   private val spoilerRendererDelegate: SpoilerRendererDelegate
 
   init {
-    isEmojiCompatEnabled = isInEditMode || SignalStore.settings().isPreferSystemEmoji
+    isEmojiCompatEnabled = isInEditMode || SignalStore.settings.isPreferSystemEmoji
     spoilerRendererDelegate = SpoilerRendererDelegate(this)
   }
 
@@ -43,7 +43,7 @@ open class SimpleEmojiTextView @JvmOverloads constructor(
   override fun setText(text: CharSequence?, type: BufferType?) {
     bufferType = type
     val candidates = if (isInEditMode) null else EmojiProvider.getCandidates(text)
-    if (SignalStore.settings().isPreferSystemEmoji || candidates == null || candidates.size() == 0) {
+    if (SignalStore.settings.isPreferSystemEmoji || candidates == null || candidates.size() == 0) {
       super.setText(Optional.ofNullable(text).orElse(""), type)
     } else {
       val startDrawableSize: Int = compoundDrawables[0]?.let { it.intrinsicWidth + compoundDrawablePadding } ?: 0
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/SystemEmojiDrawable.kt b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/SystemEmojiDrawable.kt
new file mode 100644
index 0000000000..d4a5b43116
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/SystemEmojiDrawable.kt
@@ -0,0 +1,69 @@
+package org.thoughtcrime.securesms.components.emoji
+
+import android.graphics.Canvas
+import android.graphics.ColorFilter
+import android.graphics.Matrix
+import android.graphics.PixelFormat
+import android.graphics.Rect
+import android.graphics.RectF
+import android.graphics.drawable.Drawable
+import android.os.Build
+import android.text.Layout
+import android.text.StaticLayout
+import android.text.TextPaint
+import androidx.core.graphics.toRectF
+import androidx.core.graphics.withMatrix
+import androidx.emoji2.text.EmojiCompat
+
+/**
+ * [Drawable] that renders an emoji via the system font for available glyphs and EmojiCompat for
+ * missing glyphs.
+ */
+class SystemEmojiDrawable(emoji: CharSequence) : Drawable() {
+
+  private val emojiLayout: StaticLayout = getStaticLayout(getProcessedEmoji(emoji))
+  private val transform: Matrix = Matrix()
+
+  override fun onBoundsChange(bounds: Rect) {
+    super.onBoundsChange(bounds)
+    transform.setRectToRect(emojiLayout.getBounds(), bounds.toRectF(), Matrix.ScaleToFit.CENTER)
+  }
+
+  override fun draw(canvas: Canvas) {
+    canvas.withMatrix(transform) {
+      emojiLayout.draw(canvas)
+    }
+  }
+
+  override fun setAlpha(alpha: Int) {}
+
+  override fun setColorFilter(colorFilter: ColorFilter?) {}
+
+  @Deprecated(
+    "Deprecated in Java",
+    ReplaceWith("PixelFormat.TRANSLUCENT", "android.graphics.PixelFormat")
+  )
+  override fun getOpacity(): Int = PixelFormat.TRANSLUCENT
+
+  companion object {
+    private val textPaint: TextPaint = TextPaint()
+
+    private fun getStaticLayout(emoji: CharSequence): StaticLayout =
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        StaticLayout.Builder.obtain(emoji, 0, emoji.length, textPaint, Int.MAX_VALUE).build()
+      } else {
+        @Suppress("DEPRECATION")
+        StaticLayout(emoji, textPaint, Int.MAX_VALUE, Layout.Alignment.ALIGN_NORMAL, 0f, 0f, true)
+      }
+
+    private fun getProcessedEmoji(emoji: CharSequence): CharSequence =
+      try {
+        EmojiCompat.get().process(emoji) ?: emoji
+      } catch (e: IllegalStateException) {
+        emoji
+      }
+
+    private fun StaticLayout.getBounds(): RectF =
+      RectF(getLineLeft(0), 0f, getLineRight(0), getLineDescent(0) - getLineAscent(0).toFloat())
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.kt b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.kt
index 28de3aca78..76978f5212 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.kt
@@ -2,4 +2,4 @@ package org.thoughtcrime.securesms.components.emoji.parsing
 
 import org.thoughtcrime.securesms.emoji.EmojiPage
 
-data class EmojiDrawInfo(val page: EmojiPage, val index: Int, private val emoji: String, val rawEmoji: String?, val jumboSheet: String?)
+data class EmojiDrawInfo(val page: EmojiPage, val index: Int, val emoji: String, val rawEmoji: String?, val jumboSheet: String?)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java
index c540c86ff3..4914a4bcb9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java
@@ -11,7 +11,7 @@
 import org.thoughtcrime.securesms.crypto.ReentrantSessionLock;
 import org.thoughtcrime.securesms.crypto.storage.SignalIdentityKeyStore;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.signal.core.util.concurrent.SimpleTask;
 import org.whispersystems.signalservice.api.SignalSessionLock;
 
@@ -40,7 +40,7 @@ public UntrustedSendDialog(@NonNull Context context,
 
   @Override
   public void onClick(DialogInterface dialog, int which) {
-    final SignalIdentityKeyStore identityStore = ApplicationDependencies.getProtocolStore().aci().identities();
+    final SignalIdentityKeyStore identityStore = AppDependencies.getProtocolStore().aci().identities();
 
     SimpleTask.run(() -> {
       try(SignalSessionLock.Lock unused = ReentrantSessionLock.INSTANCE.acquire()) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java
index 5216663fb3..3212ebd566 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java
@@ -10,7 +10,7 @@
 import org.thoughtcrime.securesms.crypto.ReentrantSessionLock;
 import org.thoughtcrime.securesms.database.IdentityTable;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.signal.core.util.concurrent.SimpleTask;
 import org.whispersystems.signalservice.api.SignalSessionLock;
 
@@ -42,9 +42,9 @@ public void onClick(DialogInterface dialog, int which) {
     SimpleTask.run(() -> {
       try(SignalSessionLock.Lock unused = ReentrantSessionLock.INSTANCE.acquire()) {
         for (IdentityRecord identityRecord : untrustedRecords) {
-          ApplicationDependencies.getProtocolStore().aci().identities().setVerified(identityRecord.getRecipientId(),
-                                                                                    identityRecord.getIdentityKey(),
-                                                                                    IdentityTable.VerifiedStatus.DEFAULT);
+          AppDependencies.getProtocolStore().aci().identities().setVerified(identityRecord.getRecipientId(),
+                                                                            identityRecord.getIdentityKey(),
+                                                                            IdentityTable.VerifiedStatus.DEFAULT);
         }
       }
       return null;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/location/SignalMapView.java b/app/src/main/java/org/thoughtcrime/securesms/components/location/SignalMapView.java
index 2a1cea56d0..1ba0e7f0df 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/location/SignalMapView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/location/SignalMapView.java
@@ -20,7 +20,7 @@
 import org.signal.core.util.concurrent.ListenableFuture;
 import org.signal.core.util.concurrent.SettableFuture;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.util.concurrent.ExecutionException;
@@ -55,7 +55,7 @@ private void initialize(Context context) {
   }
 
   static public void setGoogleMapType(GoogleMap googleMap) {
-    String mapType = TextSecurePreferences.getGoogleMapType(ApplicationDependencies.getApplication());
+    String mapType = TextSecurePreferences.getGoogleMapType(AppDependencies.getApplication());
     if (googleMap != null) {
       if (mapType.equals("hybrid"))         { googleMap.setMapType(GoogleMap.MAP_TYPE_HYBRID); }
       else if (mapType.equals("satellite")) { googleMap.setMapType(GoogleMap.MAP_TYPE_SATELLITE); }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt b/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt
index 4d5e01f759..7fbfb2a6bb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt
@@ -60,7 +60,10 @@ class ContextMenuList(recyclerView: RecyclerView, onItemClick: () -> Unit) {
   }
 
   private enum class DisplayType {
-    TOP, BOTTOM, MIDDLE, ONLY
+    TOP,
+    BOTTOM,
+    MIDDLE,
+    ONLY
   }
 
   private class ItemViewHolder(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalContextMenu.kt b/app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalContextMenu.kt
index b01a3acc93..391341462f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalContextMenu.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalContextMenu.kt
@@ -114,11 +114,13 @@ class SignalContextMenu private constructor(
   }
 
   enum class HorizontalPosition {
-    START, END
+    START,
+    END
   }
 
   enum class VerticalPosition {
-    ABOVE, BELOW
+    ABOVE,
+    BELOW
   }
 
   /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java b/app/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java
index f53ffd4786..f9b72eb034 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java
@@ -49,7 +49,7 @@ public VerificationPinKeyboard(@NonNull Context context, @Nullable AttributeSet
     initialize();
   }
 
-  @RequiresApi(api = 21)
+  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
   public VerificationPinKeyboard(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
     super(context, attrs, defStyleAttr, defStyleRes);
     initialize();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/reminder/CdsPermanentErrorReminder.kt b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/CdsPermanentErrorReminder.kt
index 90fbb69532..4b1e3193ad 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/reminder/CdsPermanentErrorReminder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/CdsPermanentErrorReminder.kt
@@ -35,8 +35,8 @@ class CdsPermanentErrorReminder : Reminder(R.string.reminder_cds_permanent_error
 
     @JvmStatic
     fun isEligible(): Boolean {
-      val timeUntilUnblock = SignalStore.misc().cdsBlockedUtil - System.currentTimeMillis()
-      return SignalStore.misc().isCdsBlocked && timeUntilUnblock >= PERMANENT_TIME_CUTOFF
+      val timeUntilUnblock = SignalStore.misc.cdsBlockedUtil - System.currentTimeMillis()
+      return SignalStore.misc.isCdsBlocked && timeUntilUnblock >= PERMANENT_TIME_CUTOFF
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/reminder/CdsTemporaryErrorReminder.kt b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/CdsTemporaryErrorReminder.kt
index 98c61c7c2a..d9a11dba03 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/reminder/CdsTemporaryErrorReminder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/CdsTemporaryErrorReminder.kt
@@ -28,8 +28,8 @@ class CdsTemporaryErrorReminder : Reminder(R.string.reminder_cds_warning_body) {
   companion object {
     @JvmStatic
     fun isEligible(): Boolean {
-      val timeUntilUnblock = SignalStore.misc().cdsBlockedUtil - System.currentTimeMillis()
-      return SignalStore.misc().isCdsBlocked && timeUntilUnblock < CdsPermanentErrorReminder.PERMANENT_TIME_CUTOFF
+      val timeUntilUnblock = SignalStore.misc.cdsBlockedUtil - System.currentTimeMillis()
+      return SignalStore.misc.isCdsBlocked && timeUntilUnblock < CdsPermanentErrorReminder.PERMANENT_TIME_CUTOFF
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java
index eef2b70eb2..d21b9f255a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java
@@ -5,6 +5,7 @@
 import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.util.PlayStoreUtil;
 import org.thoughtcrime.securesms.util.Util;
 
@@ -42,6 +43,6 @@ public static boolean isEligible() {
   }
 
   private static int getDaysUntilExpiry() {
-    return (int) TimeUnit.MILLISECONDS.toDays(Util.getTimeUntilBuildExpiry());
+    return (int) TimeUnit.MILLISECONDS.toDays(Util.getTimeUntilBuildExpiry(SignalStore.misc().getEstimatedServerTime()));
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/reminder/UnauthorizedReminder.java b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/UnauthorizedReminder.java
index a11d3ec59a..307daa4024 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/reminder/UnauthorizedReminder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/UnauthorizedReminder.java
@@ -6,7 +6,6 @@
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 public class UnauthorizedReminder extends Reminder {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/reminder/UsernameOutOfSyncReminder.kt b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/UsernameOutOfSyncReminder.kt
index 574350c7b1..ff61af3915 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/reminder/UsernameOutOfSyncReminder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/UsernameOutOfSyncReminder.kt
@@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 class UsernameOutOfSyncReminder : Reminder(NO_RESOURCE) {
 
   init {
-    val action = if (SignalStore.account().usernameSyncState == UsernameSyncState.USERNAME_AND_LINK_CORRUPTED) {
+    val action = if (SignalStore.account.usernameSyncState == UsernameSyncState.USERNAME_AND_LINK_CORRUPTED) {
       R.id.reminder_action_fix_username_and_link
     } else {
       R.id.reminder_action_fix_username_link
@@ -27,7 +27,7 @@ class UsernameOutOfSyncReminder : Reminder(NO_RESOURCE) {
   }
 
   override fun getText(context: Context): CharSequence {
-    return if (SignalStore.account().usernameSyncState == UsernameSyncState.USERNAME_AND_LINK_CORRUPTED) {
+    return if (SignalStore.account.usernameSyncState == UsernameSyncState.USERNAME_AND_LINK_CORRUPTED) {
       context.getString(R.string.UsernameOutOfSyncReminder__username_and_link_corrupt)
     } else {
       context.getString(R.string.UsernameOutOfSyncReminder__link_corrupt)
@@ -41,7 +41,7 @@ class UsernameOutOfSyncReminder : Reminder(NO_RESOURCE) {
   companion object {
     @JvmStatic
     fun isEligible(): Boolean {
-      return when (SignalStore.account().usernameSyncState) {
+      return when (SignalStore.account.usernameSyncState) {
         UsernameSyncState.USERNAME_AND_LINK_CORRUPTED -> true
         UsernameSyncState.LINK_CORRUPTED -> true
         UsernameSyncState.IN_SYNC -> false
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt
index 3e138583bf..bd05a35a1b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt
@@ -117,7 +117,7 @@ class ClickPreferenceViewHolder(itemView: View) : PreferenceViewHolder<ClickPref
 class LongClickPreferenceViewHolder(itemView: View) : PreferenceViewHolder<LongClickPreference>(itemView) {
   override fun bind(model: LongClickPreference) {
     super.bind(model)
-    itemView.setOnLongClickListener() {
+    itemView.setOnLongClickListener {
       model.onLongClick()
       true
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsBottomSheetFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsBottomSheetFragment.kt
index 6a69b7abb4..ba9d5d4b97 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsBottomSheetFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsBottomSheetFragment.kt
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.components.settings
 
 import android.content.Context
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -49,8 +50,10 @@ abstract class DSLSettingsBottomSheetFragment(
   private class EdgeEffectFactory : RecyclerView.EdgeEffectFactory() {
     override fun createEdgeEffect(view: RecyclerView, direction: Int): EdgeEffect {
       return super.createEdgeEffect(view, direction).apply {
-        color =
-          requireNotNull(ContextCompat.getColor(view.context, R.color.settings_ripple_color))
+        if (Build.VERSION.SDK_INT > 21) {
+          color =
+            requireNotNull(ContextCompat.getColor(view.context, R.color.settings_ripple_color))
+        }
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsFragment.kt
index 154d5ee37b..99868096a2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsFragment.kt
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.components.settings
 
 import android.content.Context
+import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.widget.EdgeEffect
@@ -118,8 +119,10 @@ abstract class DSLSettingsFragment(
   private class EdgeEffectFactory : RecyclerView.EdgeEffectFactory() {
     override fun createEdgeEffect(view: RecyclerView, direction: Int): EdgeEffect {
       return super.createEdgeEffect(view, direction).apply {
-        color =
-          requireNotNull(ContextCompat.getColor(view.context, R.color.settings_ripple_color))
+        if (Build.VERSION.SDK_INT > 21) {
+          color =
+            requireNotNull(ContextCompat.getColor(view.context, R.color.settings_ripple_color))
+        }
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt
index a3fc18e504..51bc9f5f38 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt
@@ -5,10 +5,15 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.navigation.NavDirections
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import io.reactivex.rxjava3.subjects.PublishSubject
+import io.reactivex.rxjava3.subjects.Subject
+import org.signal.donations.InAppPaymentType
 import org.thoughtcrime.securesms.MainActivity
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.DSLSettingsActivity
 import org.thoughtcrime.securesms.components.settings.app.notifications.profiles.EditNotificationProfileScheduleFragmentArgs
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentComponent
+import org.thoughtcrime.securesms.components.settings.app.subscription.StripeRepository
 import org.thoughtcrime.securesms.help.HelpFragment
 import org.thoughtcrime.securesms.keyvalue.SettingsValues
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -25,13 +30,16 @@ private const val NOTIFICATION_CATEGORY = "android.intent.category.NOTIFICATION_
 private const val STATE_WAS_CONFIGURATION_UPDATED = "app.settings.state.configuration.updated"
 private const val EXTRA_PERFORM_ACTION_ON_CREATE = "extra_perform_action_on_create"
 
-class AppSettingsActivity : DSLSettingsActivity() {
+class AppSettingsActivity : DSLSettingsActivity(), InAppPaymentComponent {
 
   private var wasConfigurationUpdated = false
 
+  override val stripeRepository: StripeRepository by lazy { StripeRepository(this) }
+  override val googlePayResultPublisher: Subject<InAppPaymentComponent.GooglePayResult> = PublishSubject.create()
+
   override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
     if (intent?.hasExtra(ARG_NAV_GRAPH) != true) {
-      intent?.putExtra(ARG_NAV_GRAPH, R.navigation.app_settings)
+      intent?.putExtra(ARG_NAV_GRAPH, R.navigation.app_settings_with_change_number)
     }
 
     super.onCreate(savedInstanceState, ready)
@@ -47,6 +55,8 @@ class AppSettingsActivity : DSLSettingsActivity() {
         StartLocation.PROXY -> AppSettingsFragmentDirections.actionDirectToNetworkPreferenceFragment()
         StartLocation.NOTIFICATIONS -> AppSettingsFragmentDirections.actionDirectToNotificationsSettingsFragment()
         StartLocation.CHANGE_NUMBER -> AppSettingsFragmentDirections.actionDirectToChangeNumberFragment()
+        StartLocation.SUBSCRIPTIONS -> AppSettingsFragmentDirections.actionDirectToCheckout(InAppPaymentType.RECURRING_DONATION)
+        StartLocation.MANAGE_SUBSCRIPTIONS -> AppSettingsFragmentDirections.actionDirectToManageDonations()
         StartLocation.NOTIFICATION_PROFILES -> AppSettingsFragmentDirections.actionDirectToNotificationProfiles()
         StartLocation.CREATE_NOTIFICATION_PROFILE -> AppSettingsFragmentDirections.actionDirectToCreateNotificationProfiles()
         StartLocation.NOTIFICATION_PROFILE_DETAILS -> AppSettingsFragmentDirections.actionDirectToNotificationProfileDetails(
@@ -69,7 +79,7 @@ class AppSettingsActivity : DSLSettingsActivity() {
       navController.safeNavigate(it)
     }
 
-    SignalStore.settings().onConfigurationSettingChanged.observe(this) { key ->
+    SignalStore.settings.onConfigurationSettingChanged.observe(this) { key ->
       if (key == SettingsValues.THEME) {
         DynamicTheme.setDefaultDayNightMode(this)
         recreate()
@@ -115,6 +125,7 @@ class AppSettingsActivity : DSLSettingsActivity() {
   @Suppress("DEPRECATION")
   override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
     super.onActivityResult(requestCode, resultCode, data)
+    googlePayResultPublisher.onNext(InAppPaymentComponent.GooglePayResult(requestCode, resultCode, data))
   }
 
   companion object {
@@ -145,6 +156,12 @@ class AppSettingsActivity : DSLSettingsActivity() {
     @JvmStatic
     fun changeNumber(context: Context): Intent = getIntentForStartLocation(context, StartLocation.CHANGE_NUMBER)
 
+    @JvmStatic
+    fun subscriptions(context: Context): Intent = getIntentForStartLocation(context, StartLocation.SUBSCRIPTIONS)
+
+    @JvmStatic
+    fun manageSubscriptions(context: Context): Intent = getIntentForStartLocation(context, StartLocation.MANAGE_SUBSCRIPTIONS)
+
     @JvmStatic
     fun notificationProfiles(context: Context): Intent = getIntentForStartLocation(context, StartLocation.NOTIFICATION_PROFILES)
 
@@ -175,7 +192,7 @@ class AppSettingsActivity : DSLSettingsActivity() {
 
     private fun getIntentForStartLocation(context: Context, startLocation: StartLocation): Intent {
       return Intent(context, AppSettingsActivity::class.java)
-        .putExtra(ARG_NAV_GRAPH, R.navigation.app_settings)
+        .putExtra(ARG_NAV_GRAPH, R.navigation.app_settings_with_change_number)
         .putExtra(START_LOCATION, startLocation.code)
     }
   }
@@ -187,9 +204,9 @@ class AppSettingsActivity : DSLSettingsActivity() {
     PROXY(3),
     NOTIFICATIONS(4),
     CHANGE_NUMBER(5),
-    // SUBSCRIPTIONS(6),
+    SUBSCRIPTIONS(6),
     // BOOST(7),
-    // MANAGE_SUBSCRIPTIONS(8),
+    MANAGE_SUBSCRIPTIONS(8),
     NOTIFICATION_PROFILES(9),
     CREATE_NOTIFICATION_PROFILE(10),
     NOTIFICATION_PROFILE_DETAILS(11),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
index b5f69d4973..4c61ec2507 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.components.settings.app
 import android.os.Bundle
 import android.view.View
 import android.widget.TextView
+import android.widget.Toast
 import androidx.annotation.IdRes
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -10,6 +11,7 @@ import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import org.signal.core.util.isNotNullOrBlank
+import org.thoughtcrime.securesms.BuildConfig
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.BadgeImageView
 import org.thoughtcrime.securesms.components.AvatarImageView
@@ -24,14 +26,18 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsIcon
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.PreferenceModel
 import org.thoughtcrime.securesms.components.settings.PreferenceViewHolder
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.completed.TerminalDonationDelegate
 import org.thoughtcrime.securesms.components.settings.configure
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
 import org.thoughtcrime.securesms.events.ReminderUpdateEvent
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.registration.ui.RegistrationActivity
 import org.thoughtcrime.securesms.util.PlayStoreUtil
+import org.thoughtcrime.securesms.util.RemoteConfig
+import org.thoughtcrime.securesms.util.Util
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
@@ -50,6 +56,8 @@ class AppSettingsFragment : DSLSettingsFragment(
   private lateinit var reminderView: Stub<ReminderView>
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    viewLifecycleOwner.lifecycle.addObserver(TerminalDonationDelegate(childFragmentManager, viewLifecycleOwner))
+
     super.onViewCreated(view, savedInstanceState)
     reminderView = ViewUtil.findStubById(view, R.id.reminder_stub)
 
@@ -59,6 +67,7 @@ class AppSettingsFragment : DSLSettingsFragment(
   override fun bindAdapter(adapter: MappingAdapter) {
     adapter.registerFactory(BioPreference::class.java, LayoutFactory(::BioPreferenceViewHolder, R.layout.bio_preference_item))
     adapter.registerFactory(PaymentsPreference::class.java, LayoutFactory(::PaymentsPreferenceViewHolder, R.layout.dsl_payments_preference))
+    adapter.registerFactory(SubscriptionPreference::class.java, LayoutFactory(::SubscriptionPreferenceViewHolder, R.layout.dsl_preference_item))
 
     viewModel.state.observe(viewLifecycleOwner) { state ->
       adapter.submitList(getConfiguration(state).toMappingModelList())
@@ -105,7 +114,7 @@ class AppSettingsFragment : DSLSettingsFragment(
         PlayStoreUtil.openPlayStoreOrOurApkDownloadPage(requireContext())
       }
       R.id.reminder_action_re_register -> {
-        startActivity(RegistrationNavigationActivity.newIntentForReRegistration(requireContext()))
+        startActivity(RegistrationActivity.newIntentForReRegistration(requireContext()))
       }
     }
   }
@@ -129,7 +138,7 @@ class AppSettingsFragment : DSLSettingsFragment(
             findNavController().safeNavigate(R.id.action_appSettingsFragment_to_manageProfileActivity)
           },
           onQrButtonClicked = {
-            if (SignalStore.account().username != null) {
+            if (SignalStore.account.username != null) {
               findNavController().safeNavigate(R.id.action_appSettingsFragment_to_usernameLinkSettingsFragment)
             } else {
               findNavController().safeNavigate(R.id.action_appSettingsFragment_to_usernameEducationFragment)
@@ -149,9 +158,7 @@ class AppSettingsFragment : DSLSettingsFragment(
       clickPref(
         title = DSLSettingsText.from(R.string.preferences__linked_devices),
         icon = DSLSettingsIcon.from(R.drawable.symbol_devices_24),
-        onClick = {
-          findNavController().safeNavigate(R.id.action_appSettingsFragment_to_deviceActivity)
-        },
+        onClick = { findNavController().safeNavigate(R.id.action_appSettingsFragment_to_linkDeviceFragment) },
         isEnabled = state.isRegisteredAndUpToDate()
       )
 
@@ -223,9 +230,19 @@ class AppSettingsFragment : DSLSettingsFragment(
         }
       )
 
+      if (BuildConfig.MANAGES_MOLLY_UPDATES) {
+        clickPref(
+          title = DSLSettingsText.from("App updates"),
+          icon = DSLSettingsIcon.from(R.drawable.symbol_calendar_24),
+          onClick = {
+            findNavController().safeNavigate(R.id.action_appSettingsFragment_to_appUpdatesSettingsFragment)
+          }
+        )
+      }
+
       dividerPref()
 
-      if (SignalStore.paymentsValues().paymentsAvailability.showPaymentsMenu()) {
+      if (SignalStore.payments.paymentsAvailability.showPaymentsMenu()) {
         customPref(
           PaymentsPreference(
             unreadCount = state.unreadPaymentsCount
@@ -245,15 +262,7 @@ class AppSettingsFragment : DSLSettingsFragment(
         }
       )
 
-      clickPref(
-        title = DSLSettingsText.from(R.string.AppSettingsFragment__invite_your_friends),
-        icon = DSLSettingsIcon.from(R.drawable.symbol_invite_24),
-        onClick = {
-          findNavController().safeNavigate(R.id.action_appSettingsFragment_to_inviteActivity)
-        }
-      )
-
-      if (FeatureFlags.internalUser()) {
+      if (RemoteConfig.internalUser) {
         dividerPref()
 
         clickPref(
@@ -266,6 +275,44 @@ class AppSettingsFragment : DSLSettingsFragment(
     }
   }
 
+  private fun copySubscriberIdToClipboard(): Boolean {
+    // TODO [alex] -- db access on main thread!
+    val subscriber = InAppPaymentsRepository.getSubscriber(InAppPaymentSubscriberRecord.Type.DONATION)
+    return if (subscriber == null) {
+      false
+    } else {
+      Toast.makeText(requireContext(), R.string.AppSettingsFragment__copied_subscriber_id_to_clipboard, Toast.LENGTH_LONG).show()
+      Util.copyToClipboard(requireContext(), subscriber.subscriberId.serialize())
+      true
+    }
+  }
+
+  private class SubscriptionPreference(
+    override val title: DSLSettingsText,
+    override val summary: DSLSettingsText? = null,
+    override val icon: DSLSettingsIcon? = null,
+    override val isEnabled: Boolean = true,
+    val isActive: Boolean = false,
+    val onClick: (Boolean) -> Unit,
+    val onLongClick: () -> Boolean
+  ) : PreferenceModel<SubscriptionPreference>() {
+    override fun areItemsTheSame(newItem: SubscriptionPreference): Boolean {
+      return true
+    }
+
+    override fun areContentsTheSame(newItem: SubscriptionPreference): Boolean {
+      return super.areContentsTheSame(newItem) && isActive == newItem.isActive
+    }
+  }
+
+  private class SubscriptionPreferenceViewHolder(itemView: View) : PreferenceViewHolder<SubscriptionPreference>(itemView) {
+    override fun bind(model: SubscriptionPreference) {
+      super.bind(model)
+      itemView.setOnClickListener { model.onClick(model.isActive) }
+      itemView.setOnLongClickListener { model.onLongClick() }
+    }
+  }
+
   private class BioPreference(val recipient: Recipient, val onRowClicked: () -> Unit, val onQrButtonClicked: () -> Unit) : PreferenceModel<BioPreference>() {
     override fun areContentsTheSame(newItem: BioPreference): Boolean {
       return super.areContentsTheSame(newItem) && recipient.hasSameContent(newItem.recipient)
@@ -304,7 +351,7 @@ class AppSettingsFragment : DSLSettingsFragment(
       summaryView.visibility = View.VISIBLE
       avatarView.visibility = View.VISIBLE
 
-      if (SignalStore.account().username.isNotNullOrBlank()) {
+      if (SignalStore.account.username.isNotNullOrBlank()) {
         qrButton.visibility = View.VISIBLE
         qrButton.isClickable = true
         qrButton.setOnClickListener { model.onQrButtonClicked() }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsState.kt
index 0b9cdc27ae..05c60f814f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsState.kt
@@ -5,6 +5,7 @@ import org.thoughtcrime.securesms.recipients.Recipient
 data class AppSettingsState(
   val self: Recipient,
   val unreadPaymentsCount: Int,
+  val allowUserToGoToDonationManagementScreen: Boolean,
   val userUnregistered: Boolean,
   val clientDeprecated: Boolean
 ) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsViewModel.kt
index fb8e251639..bf4985f6d0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsViewModel.kt
@@ -3,8 +3,13 @@ package org.thoughtcrime.securesms.components.settings.app
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.subscribeBy
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppDonations
+import org.thoughtcrime.securesms.components.settings.app.subscription.RecurringInAppPaymentRepository
 import org.thoughtcrime.securesms.conversationlist.model.UnreadPaymentsLiveData
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.TextSecurePreferences
@@ -16,8 +21,9 @@ class AppSettingsViewModel : ViewModel() {
     AppSettingsState(
       Recipient.self(),
       0,
-      TextSecurePreferences.isUnauthorizedReceived(ApplicationDependencies.getApplication()) || !SignalStore.account().isRegistered,
-      SignalStore.misc().isClientDeprecated
+      SignalStore.inAppPayments.isLikelyASustainer() || InAppDonations.hasAtLeastOnePaymentMethodAvailable(),
+      TextSecurePreferences.isUnauthorizedReceived(AppDependencies.application) || !SignalStore.account.isRegistered,
+      SignalStore.misc.isClientDeprecated
     )
   )
 
@@ -30,6 +36,15 @@ class AppSettingsViewModel : ViewModel() {
   init {
     store.update(unreadPaymentsLiveData) { payments, state -> state.copy(unreadPaymentsCount = payments.map { it.unreadCount }.orElse(0)) }
     store.update(selfLiveData) { self, state -> state.copy(self = self) }
+
+    disposables += RecurringInAppPaymentRepository.getActiveSubscription(InAppPaymentSubscriberRecord.Type.DONATION).subscribeBy(
+      onSuccess = { activeSubscription ->
+        store.update { state ->
+          state.copy(allowUserToGoToDonationManagementScreen = activeSubscription.isActive || InAppDonations.hasAtLeastOnePaymentMethodAvailable())
+        }
+      },
+      onError = {}
+    )
   }
 
   override fun onCleared() {
@@ -39,8 +54,8 @@ class AppSettingsViewModel : ViewModel() {
   fun refreshDeprecatedOrUnregistered() {
     store.update {
       it.copy(
-        clientDeprecated = SignalStore.misc().isClientDeprecated,
-        userUnregistered = TextSecurePreferences.isUnauthorizedReceived(ApplicationDependencies.getApplication()) || !SignalStore.account().isRegistered
+        clientDeprecated = SignalStore.misc.isClientDeprecated,
+        userUnregistered = TextSecurePreferences.isUnauthorizedReceived(AppDependencies.application) || !SignalStore.account.isRegistered
       )
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt
index 037ed3696e..94f97a56e2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt
@@ -6,7 +6,6 @@ import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.Navigation
-import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import org.thoughtcrime.securesms.R
@@ -14,11 +13,11 @@ import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.configure
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.lock.v2.CreateSvrPinActivity
 import org.thoughtcrime.securesms.pin.RegistrationLockV2Dialog
-import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity
+import org.thoughtcrime.securesms.registration.ui.RegistrationActivity
 import org.thoughtcrime.securesms.util.PlayStoreUtil
 import org.thoughtcrime.securesms.util.ServiceUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
@@ -102,7 +101,7 @@ class AccountSettingsFragment : DSLSettingsFragment(R.string.AccountSettingsFrag
 
       sectionHeaderPref(R.string.AccountSettingsFragment__account)
 
-      if (SignalStore.account().isRegistered) {
+      if (SignalStore.account.isRegistered) {
         clickPref(
           title = DSLSettingsText.from(R.string.AccountSettingsFragment__change_phone_number),
           isEnabled = state.isDeprecatedOrUnregistered() && !state.isLinkedDevice,
@@ -115,7 +114,7 @@ class AccountSettingsFragment : DSLSettingsFragment(R.string.AccountSettingsFrag
       clickPref(
         title = DSLSettingsText.from(R.string.preferences_chats__transfer_account),
         summary = DSLSettingsText.from(R.string.preferences_chats__transfer_account_to_a_new_android_device),
-        isEnabled = state.isDeprecatedOrUnregistered(),
+        isEnabled = state.isDeprecatedOrUnregistered() && !state.isLinkedDevice,
         onClick = {
           Navigation.findNavController(requireView()).safeNavigate(R.id.action_accountSettingsFragment_to_oldDeviceTransferActivity)
         }
@@ -141,7 +140,7 @@ class AccountSettingsFragment : DSLSettingsFragment(R.string.AccountSettingsFrag
           clickPref(
             title = DSLSettingsText.from(R.string.preferences_account_reregister),
             onClick = {
-              startActivity(RegistrationNavigationActivity.newIntentForReRegistration(requireContext()))
+              startActivity(RegistrationActivity.newIntentForReRegistration(requireContext()))
             }
           )
         }
@@ -153,7 +152,7 @@ class AccountSettingsFragment : DSLSettingsFragment(R.string.AccountSettingsFrag
               .setTitle(R.string.preferences_account_delete_all_data_confirmation_title)
               .setMessage(R.string.preferences_account_delete_all_data_confirmation_message)
               .setPositiveButton(R.string.preferences_account_delete_all_data_confirmation_proceed) { _: DialogInterface, _: Int ->
-                if (!ServiceUtil.getActivityManager(ApplicationDependencies.getApplication()).clearApplicationUserData()) {
+                if (!ServiceUtil.getActivityManager(AppDependencies.application).clearApplicationUserData()) {
                   Toast.makeText(requireContext(), R.string.preferences_account_delete_all_data_failed, Toast.LENGTH_LONG).show()
                 }
               }
@@ -182,7 +181,7 @@ class AccountSettingsFragment : DSLSettingsFragment(R.string.AccountSettingsFrag
   }
 
   private fun setPinRemindersEnabled(enabled: Boolean) {
-    SignalStore.pinValues().setPinRemindersEnabled(enabled)
+    SignalStore.pin.setPinRemindersEnabled(enabled)
     viewModel.refreshState()
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsViewModel.kt
index fb2648a089..046d2e82ca 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsViewModel.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components.settings.app.account
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.livedata.Store
@@ -18,12 +18,12 @@ class AccountSettingsViewModel : ViewModel() {
 
   private fun getCurrentState(): AccountSettingsState {
     return AccountSettingsState(
-      isLinkedDevice = SignalStore.account().isLinkedDevice,
-      hasPin = SignalStore.svr().hasPin() && !SignalStore.svr().hasOptedOut(),
-      pinRemindersEnabled = SignalStore.pinValues().arePinRemindersEnabled(),
-      registrationLockEnabled = SignalStore.svr().isRegistrationLockEnabled,
-      userUnregistered = TextSecurePreferences.isUnauthorizedReceived(ApplicationDependencies.getApplication()),
-      clientDeprecated = SignalStore.misc().isClientDeprecated
+      isLinkedDevice = SignalStore.account.isLinkedDevice,
+      hasPin = SignalStore.svr.hasPin() && !SignalStore.svr.hasOptedOut(),
+      pinRemindersEnabled = SignalStore.pin.arePinRemindersEnabled(),
+      registrationLockEnabled = SignalStore.svr.isRegistrationLockEnabled,
+      userUnregistered = TextSecurePreferences.isUnauthorizedReceived(AppDependencies.application),
+      clientDeprecated = SignalStore.misc.isClientDeprecated
     )
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataRepository.kt
index 4f12bded0d..7e2063618f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataRepository.kt
@@ -5,14 +5,14 @@ import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.node.ObjectNode
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.util.JsonUtils
 import org.whispersystems.signalservice.api.SignalServiceAccountManager
 import java.io.IOException
 
 class ExportAccountDataRepository(
-  private val accountManager: SignalServiceAccountManager = ApplicationDependencies.getSignalServiceAccountManager()
+  private val accountManager: SignalServiceAccountManager = AppDependencies.signalServiceAccountManager
 ) {
 
   fun downloadAccountDataReport(exportAsJson: Boolean): Single<ExportedReport> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsViewModel.kt
index 9b5114d85a..84943b447e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/AppearanceSettingsViewModel.kt
@@ -4,7 +4,7 @@ import android.app.Activity
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import io.reactivex.rxjava3.core.Flowable
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob
 import org.thoughtcrime.securesms.keyvalue.SettingsValues.Theme
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -27,33 +27,33 @@ class AppearanceSettingsViewModel : ViewModel() {
 
   fun setTheme(activity: Activity?, theme: Theme) {
     store.update { it.copy(theme = theme) }
-    SignalStore.settings().theme = theme
+    SignalStore.settings.theme = theme
     SplashScreenUtil.setSplashScreenThemeIfNecessary(activity, theme)
   }
 
   fun setLanguage(language: String) {
     store.update { it.copy(language = language) }
-    SignalStore.settings().language = language
+    SignalStore.settings.language = language
     EmojiSearchIndexDownloadJob.scheduleImmediately()
   }
 
   fun setMessageFontSize(size: Int) {
     store.update { it.copy(messageFontSize = size) }
-    SignalStore.settings().messageFontSize = size
+    SignalStore.settings.messageFontSize = size
   }
 
   fun setNavbarShowCalls(value: Boolean) {
     store.update { it.copy(navbarShowCalls = value) }
-    TextSecurePreferences.setNavbarShowCalls(ApplicationDependencies.getApplication(), value)
+    TextSecurePreferences.setNavbarShowCalls(AppDependencies.application, value)
   }
 
   private fun getState(): AppearanceSettingsState {
     return AppearanceSettingsState(
-      SignalStore.settings().theme,
-      SignalStore.settings().messageFontSize,
-      SignalStore.settings().language,
-      navbarShowCalls = TextSecurePreferences.getNavbarShowCalls(ApplicationDependencies.getApplication()),
-      SignalStore.settings().useCompactNavigationBar
+      SignalStore.settings.theme,
+      SignalStore.settings.messageFontSize,
+      SignalStore.settings.language,
+      navbarShowCalls = TextSecurePreferences.getNavbarShowCalls(AppDependencies.application),
+      SignalStore.settings.useCompactNavigationBar
     )
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/navbar/ChooseNavigationBarStyleFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/navbar/ChooseNavigationBarStyleFragment.kt
index 3d4b6e5cc2..8bf27085dc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/navbar/ChooseNavigationBarStyleFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/navbar/ChooseNavigationBarStyleFragment.kt
@@ -28,7 +28,7 @@ class ChooseNavigationBarStyleFragment : DialogFragment(R.layout.choose_navigati
   }
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    presentToggleState(SignalStore.settings().useCompactNavigationBar)
+    presentToggleState(SignalStore.settings.useCompactNavigationBar)
 
     binding.toggle.addOnButtonCheckedListener { group, checkedId, isChecked ->
       if (isChecked) {
@@ -38,7 +38,7 @@ class ChooseNavigationBarStyleFragment : DialogFragment(R.layout.choose_navigati
 
     binding.ok.setOnClickListener {
       val isCompact = binding.toggle.checkedButtonId == R.id.compact
-      SignalStore.settings().useCompactNavigationBar = isCompact
+      SignalStore.settings.useCompactNavigationBar = isCompact
       dismissAllowingStateLoss()
       setFragmentResult(REQUEST_KEY, bundleOf(REQUEST_KEY to true))
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberAccountLockedFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberAccountLockedFragment.kt
index f17ca452e2..f9e4ea245b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberAccountLockedFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberAccountLockedFragment.kt
@@ -1,27 +1,74 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 package org.thoughtcrime.securesms.components.settings.app.changenumber
 
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.View
-import androidx.appcompat.widget.Toolbar
+import android.widget.TextView
+import androidx.activity.OnBackPressedCallback
+import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.registration.fragments.BaseAccountLockedFragment
-import org.thoughtcrime.securesms.registration.viewmodel.BaseRegistrationViewModel
+import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView
+import java.util.concurrent.TimeUnit
+
+/**
+ * Screen visible to the user when they are registration locked and have no SVR data.
+ */
+class ChangeNumberAccountLockedFragment : LoggingFragment(R.layout.fragment_change_number_account_locked) {
+
+  companion object {
+    private val TAG = Log.tag(ChangeNumberAccountLockedFragment::class.java)
+  }
 
-class ChangeNumberAccountLockedFragment : BaseAccountLockedFragment(R.layout.fragment_change_number_account_locked) {
+  private val viewModel by activityViewModels<ChangeNumberViewModel>()
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
 
-    val toolbar: Toolbar = view.findViewById(R.id.toolbar)
-    toolbar.setNavigationOnClickListener { findNavController().navigateUp() }
+    setDebugLogSubmitMultiTapView(view.findViewById(R.id.account_locked_title))
+
+    val description = view.findViewById<TextView>(R.id.account_locked_description)
+
+    viewModel.liveLockedTimeRemaining.observe(viewLifecycleOwner) { t: Long ->
+      description.text = getString(R.string.AccountLockedFragment__your_account_has_been_locked_to_protect_your_privacy, durationToDays(t))
+    }
+
+    view.findViewById<View>(R.id.account_locked_next).setOnClickListener { onNext() }
+    view.findViewById<View>(R.id.account_locked_learn_more).setOnClickListener { learnMore() }
+
+    requireActivity().onBackPressedDispatcher.addCallback(
+      viewLifecycleOwner,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          onNext()
+        }
+      }
+    )
+  }
+
+  private fun learnMore() {
+    val intent = Intent(Intent.ACTION_VIEW)
+    intent.setData(Uri.parse(getString(R.string.AccountLockedFragment__learn_more_url)))
+    startActivity(intent)
+  }
+
+  private fun durationToDays(duration: Long): Long {
+    return if (duration != 0L) getLockoutDays(duration).toLong() else 7
   }
 
-  override fun getViewModel(): BaseRegistrationViewModel {
-    return ChangeNumberUtil.getViewModel(this)
+  private fun getLockoutDays(timeRemainingMs: Long): Int {
+    return TimeUnit.MILLISECONDS.toDays(timeRemainingMs).toInt() + 1
   }
 
-  override fun onNext() {
+  fun onNext() {
     findNavController().navigateUp()
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberCaptchaFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberCaptchaFragment.kt
new file mode 100644
index 0000000000..3e1672f371
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberCaptchaFragment.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.changenumber
+
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.activityViewModels
+import org.thoughtcrime.securesms.registration.data.network.Challenge
+import org.thoughtcrime.securesms.registration.ui.captcha.CaptchaFragment
+
+/**
+ * Screen visible to the user when they are to solve a captcha. @see [CaptchaFragment]
+ */
+class ChangeNumberCaptchaFragment : CaptchaFragment() {
+  private val viewModel by activityViewModels<ChangeNumberViewModel>()
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+    viewModel.addPresentedChallenge(Challenge.CAPTCHA)
+  }
+
+  override fun handleCaptchaToken(token: String) {
+    viewModel.setCaptchaResponse(token)
+  }
+
+  override fun handleUserExit() {
+    viewModel.removePresentedChallenge(Challenge.CAPTCHA)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberConfirmFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberConfirmFragment.kt
index 5b3b6326ad..8c0fcc56b7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberConfirmFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberConfirmFragment.kt
@@ -1,24 +1,33 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 package org.thoughtcrime.securesms.components.settings.app.changenumber
 
 import android.os.Bundle
 import android.view.View
 import android.widget.TextView
 import androidx.appcompat.widget.Toolbar
+import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
-import com.google.android.gms.auth.api.phone.SmsRetriever
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.util.PlayServicesUtil
-import org.thoughtcrime.securesms.util.PlayServicesUtil.PlayServicesStatus
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
+/**
+ * Screen visible to the user for them to confirm their new phone number was entered correctly.
+ */
 class ChangeNumberConfirmFragment : LoggingFragment(R.layout.fragment_change_number_confirm) {
-  private lateinit var viewModel: ChangeNumberViewModel
 
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    viewModel = ChangeNumberUtil.getViewModel(this)
+  companion object {
+    private val TAG = Log.tag(ChangeNumberConfirmFragment::class.java)
+  }
 
+  private val viewModel by activityViewModels<ChangeNumberViewModel>()
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     val toolbar: Toolbar = view.findViewById(R.id.toolbar)
     toolbar.setTitle(R.string.ChangeNumberEnterPhoneNumberFragment__change_number)
     toolbar.setNavigationOnClickListener { findNavController().navigateUp() }
@@ -33,35 +42,14 @@ class ChangeNumberConfirmFragment : LoggingFragment(R.layout.fragment_change_num
     editNumber.setOnClickListener { findNavController().navigateUp() }
 
     val changeNumber: View = view.findViewById(R.id.change_number_confirm_change_number)
-    changeNumber.setOnClickListener { onConfirm() }
-  }
-
-  private fun onConfirm() {
-    val playServicesAvailable = PlayServicesUtil.getPlayServicesStatus(context) == PlayServicesStatus.SUCCESS
-
-    if (playServicesAvailable) {
-      val client = SmsRetriever.getClient(requireContext())
-      val task = client.startSmsRetriever()
-
-      task.addOnSuccessListener {
-        Log.i(TAG, "Successfully registered SMS listener.")
-        navigateToVerify(smsListenerEnabled = true)
-      }
-
-      task.addOnFailureListener { e ->
-        Log.w(TAG, "Failed to register SMS listener.", e)
-        navigateToVerify()
+    changeNumber.setOnClickListener {
+      viewModel.registerSmsListenerWithCompletionListener(requireContext()) {
+        navigateToVerify(it)
       }
-    } else {
-      navigateToVerify()
     }
   }
 
   private fun navigateToVerify(smsListenerEnabled: Boolean = false) {
-    findNavController().safeNavigate(R.id.action_changePhoneNumberConfirmFragment_to_changePhoneNumberVerifyFragment, ChangeNumberVerifyFragmentArgs.Builder().setSmsListenerEnabled(smsListenerEnabled).build().toBundle())
-  }
-
-  companion object {
-    private val TAG = Log.tag(ChangeNumberConfirmFragment::class.java)
+    findNavController().safeNavigate(ChangeNumberConfirmFragmentDirections.actionChangePhoneNumberConfirmFragmentToChangePhoneNumberVerifyFragment(smsListenerEnabled))
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterCodeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterCodeFragment.kt
new file mode 100644
index 0000000000..585e732248
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterCodeFragment.kt
@@ -0,0 +1,303 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.changenumber
+
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.View
+import android.widget.Toast
+import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.widget.Toolbar
+import androidx.fragment.app.activityViewModels
+import androidx.navigation.fragment.findNavController
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.LoggingFragment
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.ViewBinderDelegate
+import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.changeNumberSuccess
+import org.thoughtcrime.securesms.databinding.FragmentChangeNumberEnterCodeBinding
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.registration.ReceivedSmsEvent
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository
+import org.thoughtcrime.securesms.registration.data.network.RegistrationResult
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult
+import org.thoughtcrime.securesms.registration.fragments.ContactSupportBottomSheetFragment
+import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate
+import org.thoughtcrime.securesms.registration.fragments.SignalStrengthPhoneStateListener
+import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
+import org.thoughtcrime.securesms.util.visible
+
+/**
+ * Screen used to enter the registration code provided by the service.
+ */
+class ChangeNumberEnterCodeFragment : LoggingFragment(R.layout.fragment_change_number_enter_code) {
+
+  companion object {
+    private val TAG: String = Log.tag(ChangeNumberEnterCodeFragment::class.java)
+    private const val BOTTOM_SHEET_TAG = "support_bottom_sheet"
+  }
+
+  private val viewModel by activityViewModels<ChangeNumberViewModel>()
+  private val binding: FragmentChangeNumberEnterCodeBinding by ViewBinderDelegate(FragmentChangeNumberEnterCodeBinding::bind)
+  private lateinit var phoneStateListener: SignalStrengthPhoneStateListener
+
+  private var autopilotCodeEntryActive = false
+
+  private val bottomSheet = ContactSupportBottomSheetFragment()
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+    val toolbar: Toolbar = view.findViewById(R.id.toolbar)
+    toolbar.title = viewModel.number.fullFormattedNumber
+    toolbar.setNavigationOnClickListener {
+      Log.d(TAG, "Toolbar navigation clicked.")
+      navigateUp()
+    }
+
+    binding.codeEntryLayout.verifyHeader.setOnClickListener(null)
+
+    requireActivity().onBackPressedDispatcher.addCallback(
+      viewLifecycleOwner,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          Log.d(TAG, "onBackPressed")
+          navigateUp()
+        }
+      }
+    )
+
+    RegistrationViewDelegate.setDebugLogSubmitMultiTapView(binding.codeEntryLayout.verifyHeader)
+
+    phoneStateListener = SignalStrengthPhoneStateListener(this, PhoneStateCallback())
+
+    requireActivity().onBackPressedDispatcher.addCallback(
+      viewLifecycleOwner,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          navigateUp()
+        }
+      }
+    )
+
+    binding.codeEntryLayout.wrongNumber.setOnClickListener {
+      navigateUp()
+    }
+
+    binding.codeEntryLayout.code.setOnCompleteListener {
+      viewModel.verifyCodeWithoutRegistrationLock(requireContext(), it, ::handleSessionErrorResponse, ::handleChangeNumberErrorResponse)
+    }
+
+    binding.codeEntryLayout.havingTroubleButton.setOnClickListener {
+      bottomSheet.showSafely(childFragmentManager, BOTTOM_SHEET_TAG)
+    }
+
+    binding.codeEntryLayout.callMeCountDown.apply {
+      setTextResources(R.string.RegistrationActivity_call, R.string.RegistrationActivity_call_me_instead_available_in)
+      setOnClickListener {
+        viewModel.initiateChangeNumberSession(requireContext(), RegistrationRepository.Mode.PHONE_CALL)
+      }
+    }
+
+    binding.codeEntryLayout.resendSmsCountDown.apply {
+      setTextResources(R.string.RegistrationActivity_resend_code, R.string.RegistrationActivity_resend_sms_available_in)
+      setOnClickListener {
+        viewModel.initiateChangeNumberSession(requireContext(), RegistrationRepository.Mode.SMS_WITHOUT_LISTENER)
+      }
+    }
+
+    binding.codeEntryLayout.keyboard.setOnKeyPressListener { key ->
+      if (!autopilotCodeEntryActive) {
+        if (key >= 0) {
+          binding.codeEntryLayout.code.append(key)
+        } else {
+          binding.codeEntryLayout.code.delete()
+        }
+      }
+    }
+
+    viewModel.incorrectCodeAttempts.observe(viewLifecycleOwner) { attempts: Int ->
+      if (attempts >= 3) {
+        binding.codeEntryLayout.havingTroubleButton.visible = true
+      }
+    }
+
+    viewModel.uiState.observe(viewLifecycleOwner, ::onStateUpdate)
+  }
+
+  private fun onStateUpdate(state: ChangeNumberState) {
+    binding.codeEntryLayout.resendSmsCountDown.startCountDownTo(state.nextSmsTimestamp)
+    binding.codeEntryLayout.callMeCountDown.startCountDownTo(state.nextCallTimestamp)
+    when (val outcome = state.changeNumberOutcome) {
+      is ChangeNumberOutcome.RecoveryPasswordWorked,
+      is ChangeNumberOutcome.VerificationCodeWorked -> changeNumberSuccess()
+
+      is ChangeNumberOutcome.ChangeNumberRequestOutcome -> if (!state.inProgress && !outcome.result.isSuccess()) {
+        presentGenericError(outcome.result)
+      }
+
+      null -> Unit
+    }
+    if (state.inProgress) {
+      binding.codeEntryLayout.keyboard.displayProgress()
+    } else {
+      binding.codeEntryLayout.keyboard.displayKeyboard()
+    }
+  }
+
+  private fun navigateUp() {
+    if (SignalStore.misc.isChangeNumberLocked) {
+      Log.d(TAG, "Change number locked, navigateUp")
+      startActivity(ChangeNumberLockActivity.createIntent(requireContext()))
+    } else {
+      Log.d(TAG, "navigateUp")
+      findNavController().navigateUp()
+    }
+  }
+
+  private fun handleSessionErrorResponse(result: VerificationCodeRequestResult) {
+    when (result) {
+      is VerificationCodeRequestResult.Success -> binding.codeEntryLayout.keyboard.displaySuccess()
+      is VerificationCodeRequestResult.RateLimited -> presentRateLimitedDialog()
+      is VerificationCodeRequestResult.AttemptsExhausted -> presentAccountLocked()
+      is VerificationCodeRequestResult.RegistrationLocked -> presentRegistrationLocked(result.timeRemaining)
+      else -> presentGenericError(result)
+    }
+  }
+
+  private fun handleChangeNumberErrorResponse(result: ChangeNumberResult) {
+    when (result) {
+      is ChangeNumberResult.Success -> binding.codeEntryLayout.keyboard.displaySuccess()
+      is ChangeNumberResult.RegistrationLocked -> presentRegistrationLocked(result.timeRemaining)
+      is ChangeNumberResult.AuthorizationFailed -> presentIncorrectCodeDialog()
+      is ChangeNumberResult.AttemptsExhausted -> presentAccountLocked()
+      is ChangeNumberResult.RateLimited -> presentRateLimitedDialog()
+
+      else -> presentGenericError(result)
+    }
+  }
+
+  private fun presentAccountLocked() {
+    binding.codeEntryLayout.keyboard.displayLocked().addListener(
+      object : AssertedSuccessListener<Boolean>() {
+        override fun onSuccess(result: Boolean?) {
+          findNavController().safeNavigate(ChangeNumberEnterCodeFragmentDirections.actionChangeNumberEnterCodeFragmentToChangeNumberAccountLocked())
+        }
+      }
+    )
+  }
+
+  private fun presentRegistrationLocked(timeRemaining: Long) {
+    binding.codeEntryLayout.keyboard.displayLocked().addListener(
+      object : AssertedSuccessListener<Boolean>() {
+        override fun onSuccess(result: Boolean?) {
+          Log.i(TAG, "Account is registration locked, cannot register.")
+          findNavController().safeNavigate(ChangeNumberEnterCodeFragmentDirections.actionChangeNumberEnterCodeFragmentToChangeNumberRegistrationLock(timeRemaining))
+        }
+      }
+    )
+  }
+
+  private fun presentRateLimitedDialog() {
+    binding.codeEntryLayout.keyboard.displayFailure().addListener(
+      object : AssertedSuccessListener<Boolean?>() {
+        override fun onSuccess(result: Boolean?) {
+          MaterialAlertDialogBuilder(requireContext()).apply {
+            setTitle(R.string.RegistrationActivity_too_many_attempts)
+            setMessage(R.string.RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later)
+            setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int ->
+              binding.codeEntryLayout.callMeCountDown.visibility = View.VISIBLE
+              binding.codeEntryLayout.resendSmsCountDown.visibility = View.VISIBLE
+              binding.codeEntryLayout.wrongNumber.visibility = View.VISIBLE
+              binding.codeEntryLayout.code.clear()
+              binding.codeEntryLayout.keyboard.displayKeyboard()
+            }
+            show()
+          }
+        }
+      }
+    )
+  }
+
+  private fun presentIncorrectCodeDialog() {
+    viewModel.incrementIncorrectCodeAttempts()
+
+    Toast.makeText(requireContext(), R.string.RegistrationActivity_incorrect_code, Toast.LENGTH_LONG).show()
+    binding.codeEntryLayout.keyboard.displayFailure().addListener(object : AssertedSuccessListener<Boolean?>() {
+      override fun onSuccess(result: Boolean?) {
+        binding.codeEntryLayout.callMeCountDown.setVisibility(View.VISIBLE)
+        binding.codeEntryLayout.resendSmsCountDown.setVisibility(View.VISIBLE)
+        binding.codeEntryLayout.wrongNumber.setVisibility(View.VISIBLE)
+        binding.codeEntryLayout.code.clear()
+        binding.codeEntryLayout.keyboard.displayKeyboard()
+      }
+    })
+  }
+
+  private fun presentGenericError(requestResult: RegistrationResult) {
+    binding.codeEntryLayout.keyboard.displayFailure().addListener(
+      object : AssertedSuccessListener<Boolean>() {
+        override fun onSuccess(result: Boolean?) {
+          Log.w(TAG, "Encountered unexpected error!", requestResult.getCause())
+          MaterialAlertDialogBuilder(requireContext()).apply {
+            null?.let<String, MaterialAlertDialogBuilder> {
+              setTitle(it)
+            }
+            setMessage(getString(R.string.RegistrationActivity_error_connecting_to_service))
+            setPositiveButton(android.R.string.ok) { _, _ ->
+              navigateUp()
+              viewModel.resetLocalSessionState()
+            }
+            show()
+          }
+        }
+      }
+    )
+  }
+
+  @Subscribe(threadMode = ThreadMode.MAIN)
+  fun onVerificationCodeReceived(event: ReceivedSmsEvent) {
+    binding.codeEntryLayout.code.clear()
+
+    if (event.code.isBlank() || event.code.length != ReceivedSmsEvent.CODE_LENGTH) {
+      Log.i(TAG, "Received invalid code of length ${event.code.length}. Ignoring.")
+      return
+    }
+
+    val finalIndex = ReceivedSmsEvent.CODE_LENGTH - 1
+    autopilotCodeEntryActive = true
+    try {
+      event.code
+        .map { it.digitToInt() }
+        .forEachIndexed { i, digit ->
+          binding.codeEntryLayout.code.postDelayed({
+            binding.codeEntryLayout.code.append(digit)
+            if (i == finalIndex) {
+              autopilotCodeEntryActive = false
+            }
+          }, i * 200L)
+        }
+    } catch (notADigit: IllegalArgumentException) {
+      Log.w(TAG, "Failed to convert code into digits.", notADigit)
+      autopilotCodeEntryActive = false
+    }
+  }
+
+  private inner class PhoneStateCallback : SignalStrengthPhoneStateListener.Callback {
+    override fun onNoCellSignalPresent() {
+      bottomSheet.showSafely(childFragmentManager, BOTTOM_SHEET_TAG)
+    }
+
+    override fun onCellSignalPresent() {
+      if (bottomSheet.isResumed) {
+        bottomSheet.dismiss()
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterPhoneNumberFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterPhoneNumberFragment.kt
index f7f32563b9..1d253ba86d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterPhoneNumberFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterPhoneNumberFragment.kt
@@ -1,86 +1,71 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 package org.thoughtcrime.securesms.components.settings.app.changenumber
 
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.View
-import android.widget.ScrollView
-import android.widget.Spinner
 import android.widget.Toast
 import androidx.appcompat.widget.Toolbar
+import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.components.LabeledEditText
-import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.getViewModel
-import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberViewModel.ContinueStatus
+import org.thoughtcrime.securesms.components.ViewBinderDelegate
 import org.thoughtcrime.securesms.databinding.FragmentChangeNumberEnterPhoneNumberBinding
 import org.thoughtcrime.securesms.registration.fragments.CountryPickerFragment
-import org.thoughtcrime.securesms.registration.fragments.CountryPickerFragmentArgs
 import org.thoughtcrime.securesms.registration.util.ChangeNumberInputController
 import org.thoughtcrime.securesms.util.Dialogs
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
-private const val OLD_NUMBER_COUNTRY_SELECT = "old_number_country"
-private const val NEW_NUMBER_COUNTRY_SELECT = "new_number_country"
-
+/**
+ * Screen for the user to enter their old and new phone numbers.
+ */
 class ChangeNumberEnterPhoneNumberFragment : LoggingFragment(R.layout.fragment_change_number_enter_phone_number) {
 
-  private var binding: FragmentChangeNumberEnterPhoneNumberBinding? = null
-
-  private val scrollView: ScrollView
-    get() = binding!!.changeNumberEnterPhoneNumberScroll
+  companion object {
+    private val TAG: String = Log.tag(ChangeNumberEnterPhoneNumberFragment::class.java)
 
-  private val oldNumberCountrySpinner: Spinner
-    get() = binding!!.changeNumberEnterPhoneNumberOldNumberSpinner
-  private val oldNumberCountryCode: LabeledEditText
-    get() = binding!!.changeNumberEnterPhoneNumberOldNumberCountryCode
-  private val oldNumber: LabeledEditText
-    get() = binding!!.changeNumberEnterPhoneNumberOldNumberNumber
-
-  private val newNumberCountrySpinner: Spinner
-    get() = binding!!.changeNumberEnterPhoneNumberNewNumberSpinner
-  private val newNumberCountryCode: LabeledEditText
-    get() = binding!!.changeNumberEnterPhoneNumberNewNumberCountryCode
-  private val newNumber: LabeledEditText
-    get() = binding!!.changeNumberEnterPhoneNumberNewNumberNumber
+    private const val OLD_NUMBER_COUNTRY_SELECT = "old_number_country"
+    private const val NEW_NUMBER_COUNTRY_SELECT = "new_number_country"
+  }
 
-  private lateinit var viewModel: ChangeNumberViewModel
+  private val binding: FragmentChangeNumberEnterPhoneNumberBinding by ViewBinderDelegate(FragmentChangeNumberEnterPhoneNumberBinding::bind)
+  private val viewModel by activityViewModels<ChangeNumberViewModel>()
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    binding = FragmentChangeNumberEnterPhoneNumberBinding.bind(view)
-
-    viewModel = getViewModel(this)
-
     val toolbar: Toolbar = view.findViewById(R.id.toolbar)
     toolbar.setTitle(R.string.ChangeNumberEnterPhoneNumberFragment__change_number)
     toolbar.setNavigationOnClickListener { findNavController().navigateUp() }
 
-    view.findViewById<View>(R.id.change_number_enter_phone_number_continue).setOnClickListener {
+    binding.changeNumberEnterPhoneNumberContinue.setOnClickListener {
       onContinue()
     }
 
     val oldController = ChangeNumberInputController(
       requireContext(),
-      oldNumberCountryCode,
-      oldNumber,
-      oldNumberCountrySpinner,
+      binding.changeNumberEnterPhoneNumberOldNumberCountryCode,
+      binding.changeNumberEnterPhoneNumberOldNumberNumber,
+      binding.changeNumberEnterPhoneNumberOldNumberSpinner,
       false,
       object : ChangeNumberInputController.Callbacks {
         override fun onNumberFocused() {
-          scrollView.postDelayed({ scrollView.smoothScrollTo(0, oldNumber.bottom) }, 250)
+          binding.changeNumberEnterPhoneNumberScroll.postDelayed({ binding.changeNumberEnterPhoneNumberScroll.smoothScrollTo(0, binding.changeNumberEnterPhoneNumberOldNumberNumber.bottom) }, 250)
         }
 
         override fun onNumberInputNext(view: View) {
-          newNumberCountryCode.requestFocus()
+          binding.changeNumberEnterPhoneNumberNewNumberCountryCode.requestFocus()
         }
 
         override fun onNumberInputDone(view: View) = Unit
 
         override fun onPickCountry(view: View) {
-          val arguments: CountryPickerFragmentArgs = CountryPickerFragmentArgs.Builder().setResultKey(OLD_NUMBER_COUNTRY_SELECT).build()
-
-          findNavController().safeNavigate(R.id.action_enterPhoneNumberChangeFragment_to_countryPickerFragment, arguments.toBundle())
+          findNavController().safeNavigate(ChangeNumberEnterPhoneNumberFragmentDirections.actionEnterPhoneNumberChangeFragmentToCountryPickerFragment(OLD_NUMBER_COUNTRY_SELECT))
         }
 
         override fun setNationalNumber(number: String) {
@@ -95,13 +80,13 @@ class ChangeNumberEnterPhoneNumberFragment : LoggingFragment(R.layout.fragment_c
 
     val newController = ChangeNumberInputController(
       requireContext(),
-      newNumberCountryCode,
-      newNumber,
-      newNumberCountrySpinner,
+      binding.changeNumberEnterPhoneNumberNewNumberCountryCode,
+      binding.changeNumberEnterPhoneNumberNewNumberNumber,
+      binding.changeNumberEnterPhoneNumberNewNumberSpinner,
       true,
       object : ChangeNumberInputController.Callbacks {
         override fun onNumberFocused() {
-          scrollView.postDelayed({ scrollView.smoothScrollTo(0, newNumber.bottom) }, 250)
+          binding.changeNumberEnterPhoneNumberScroll.postDelayed({ binding.changeNumberEnterPhoneNumberScroll.smoothScrollTo(0, binding.changeNumberEnterPhoneNumberNewNumberNumber.bottom) }, 250)
         }
 
         override fun onNumberInputNext(view: View) = Unit
@@ -111,9 +96,7 @@ class ChangeNumberEnterPhoneNumberFragment : LoggingFragment(R.layout.fragment_c
         }
 
         override fun onPickCountry(view: View) {
-          val arguments: CountryPickerFragmentArgs = CountryPickerFragmentArgs.Builder().setResultKey(NEW_NUMBER_COUNTRY_SELECT).build()
-
-          findNavController().safeNavigate(R.id.action_enterPhoneNumberChangeFragment_to_countryPickerFragment, arguments.toBundle())
+          findNavController().safeNavigate(ChangeNumberEnterPhoneNumberFragmentDirections.actionEnterPhoneNumberChangeFragmentToCountryPickerFragment(NEW_NUMBER_COUNTRY_SELECT))
         }
 
         override fun setNationalNumber(number: String) {
@@ -126,54 +109,49 @@ class ChangeNumberEnterPhoneNumberFragment : LoggingFragment(R.layout.fragment_c
       }
     )
 
-    parentFragmentManager.setFragmentResultListener(OLD_NUMBER_COUNTRY_SELECT, this) { _, bundle ->
+    parentFragmentManager.setFragmentResultListener(OLD_NUMBER_COUNTRY_SELECT, this) { _: String, bundle: Bundle ->
       viewModel.setOldCountry(bundle.getInt(CountryPickerFragment.KEY_COUNTRY_CODE), bundle.getString(CountryPickerFragment.KEY_COUNTRY))
     }
 
-    parentFragmentManager.setFragmentResultListener(NEW_NUMBER_COUNTRY_SELECT, this) { _, bundle ->
+    parentFragmentManager.setFragmentResultListener(NEW_NUMBER_COUNTRY_SELECT, this) { _: String, bundle: Bundle ->
       viewModel.setNewCountry(bundle.getInt(CountryPickerFragment.KEY_COUNTRY_CODE), bundle.getString(CountryPickerFragment.KEY_COUNTRY))
     }
 
-    viewModel.getLiveOldNumber().observe(viewLifecycleOwner, oldController::updateNumber)
-    viewModel.getLiveNewNumber().observe(viewLifecycleOwner, newController::updateNumber)
-  }
-
-  override fun onDestroyView() {
-    binding = null
-    super.onDestroyView()
+    viewModel.liveOldNumberState.observe(viewLifecycleOwner, oldController::updateNumber)
+    viewModel.liveNewNumberState.observe(viewLifecycleOwner, newController::updateNumber)
   }
 
   private fun onContinue() {
-    if (TextUtils.isEmpty(oldNumberCountryCode.text)) {
+    if (TextUtils.isEmpty(binding.changeNumberEnterPhoneNumberOldNumberCountryCode.text)) {
       Toast.makeText(context, getString(R.string.ChangeNumberEnterPhoneNumberFragment__you_must_specify_your_old_number_country_code), Toast.LENGTH_LONG).show()
       return
     }
 
-    if (TextUtils.isEmpty(oldNumber.text)) {
+    if (TextUtils.isEmpty(binding.changeNumberEnterPhoneNumberOldNumberNumber.text)) {
       Toast.makeText(context, getString(R.string.ChangeNumberEnterPhoneNumberFragment__you_must_specify_your_old_phone_number), Toast.LENGTH_LONG).show()
       return
     }
 
-    if (TextUtils.isEmpty(newNumberCountryCode.text)) {
+    if (TextUtils.isEmpty(binding.changeNumberEnterPhoneNumberNewNumberCountryCode.text)) {
       Toast.makeText(context, getString(R.string.ChangeNumberEnterPhoneNumberFragment__you_must_specify_your_new_number_country_code), Toast.LENGTH_LONG).show()
       return
     }
 
-    if (TextUtils.isEmpty(newNumber.text)) {
+    if (TextUtils.isEmpty(binding.changeNumberEnterPhoneNumberNewNumberNumber.text)) {
       Toast.makeText(context, getString(R.string.ChangeNumberEnterPhoneNumberFragment__you_must_specify_your_new_phone_number), Toast.LENGTH_LONG).show()
       return
     }
 
     when (viewModel.canContinue()) {
-      ContinueStatus.CAN_CONTINUE -> findNavController().safeNavigate(R.id.action_enterPhoneNumberChangeFragment_to_changePhoneNumberConfirmFragment)
-      ContinueStatus.INVALID_NUMBER -> {
+      ChangeNumberViewModel.ContinueStatus.CAN_CONTINUE -> findNavController().safeNavigate(ChangeNumberEnterPhoneNumberFragmentDirections.actionEnterPhoneNumberChangeFragmentToChangePhoneNumberConfirmFragment())
+      ChangeNumberViewModel.ContinueStatus.INVALID_NUMBER -> {
         Dialogs.showAlertDialog(
           context,
           getString(R.string.RegistrationActivity_invalid_number),
           String.format(getString(R.string.RegistrationActivity_the_number_you_specified_s_is_invalid), viewModel.number.e164Number)
         )
       }
-      ContinueStatus.OLD_NUMBER_DOESNT_MATCH -> {
+      ChangeNumberViewModel.ContinueStatus.OLD_NUMBER_DOESNT_MATCH -> {
         MaterialAlertDialogBuilder(requireContext())
           .setMessage(R.string.ChangeNumberEnterPhoneNumberFragment__the_phone_number_you_entered_doesnt_match_your_accounts)
           .setPositiveButton(android.R.string.ok, null)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterSmsCodeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterSmsCodeFragment.kt
deleted file mode 100644
index 710307fa54..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterSmsCodeFragment.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.thoughtcrime.securesms.components.settings.app.changenumber
-
-import android.os.Bundle
-import android.view.View
-import androidx.activity.OnBackPressedCallback
-import androidx.appcompat.widget.Toolbar
-import androidx.navigation.fragment.findNavController
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.changeNumberSuccess
-import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.getCaptchaArguments
-import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.getViewModel
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.registration.fragments.BaseEnterSmsCodeFragment
-import org.thoughtcrime.securesms.util.navigation.safeNavigate
-
-private val TAG: String = Log.tag(ChangeNumberEnterSmsCodeFragment::class.java)
-
-class ChangeNumberEnterSmsCodeFragment : BaseEnterSmsCodeFragment<ChangeNumberViewModel>(R.layout.fragment_change_number_enter_code) {
-
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    super.onViewCreated(view, savedInstanceState)
-
-    val toolbar: Toolbar = view.findViewById(R.id.toolbar)
-    toolbar.title = viewModel.number.fullFormattedNumber
-    toolbar.setNavigationOnClickListener {
-      Log.d(TAG, "Toolbar navigation clicked.")
-      navigateUp()
-    }
-
-    view.findViewById<View>(R.id.verify_header).setOnClickListener(null)
-
-    requireActivity().onBackPressedDispatcher.addCallback(
-      viewLifecycleOwner,
-      object : OnBackPressedCallback(true) {
-        override fun handleOnBackPressed() {
-          Log.d(TAG, "onBackPressed")
-          navigateUp()
-        }
-      }
-    )
-  }
-
-  private fun navigateUp() {
-    if (SignalStore.misc().isChangeNumberLocked) {
-      Log.d(TAG, "Change number locked, navigateUp")
-      startActivity(ChangeNumberLockActivity.createIntent(requireContext()))
-    } else {
-      Log.d(TAG, "navigateUp")
-      findNavController().navigateUp()
-    }
-  }
-
-  override fun getViewModel(): ChangeNumberViewModel {
-    return getViewModel(this)
-  }
-
-  override fun handleSuccessfulVerify() {
-    Log.d(TAG, "handleSuccessfulVerify")
-    displaySuccess { changeNumberSuccess() }
-  }
-
-  override fun navigateToCaptcha() {
-    Log.d(TAG, "navigateToCaptcha")
-    findNavController().safeNavigate(R.id.action_changeNumberEnterCodeFragment_to_captchaFragment, getCaptchaArguments())
-  }
-
-  override fun navigateToRegistrationLock(timeRemaining: Long) {
-    Log.d(TAG, "navigateToRegistrationLock")
-    findNavController().safeNavigate(ChangeNumberEnterSmsCodeFragmentDirections.actionChangeNumberEnterCodeFragmentToChangeNumberRegistrationLock(timeRemaining))
-  }
-
-  override fun navigateToKbsAccountLocked() {
-    Log.d(TAG, "navigateToKbsAccountLocked")
-    findNavController().safeNavigate(ChangeNumberEnterSmsCodeFragmentDirections.actionChangeNumberEnterCodeFragmentToChangeNumberAccountLocked())
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberFragment.kt
index be135d09f2..dd67139ef5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberFragment.kt
@@ -1,20 +1,38 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 package org.thoughtcrime.securesms.components.settings.app.changenumber
 
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.widget.Toolbar
 import androidx.navigation.fragment.findNavController
+import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.ViewBinderDelegate
+import org.thoughtcrime.securesms.databinding.FragmentChangePhoneNumberBinding
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
+/**
+ * Screen used to educate the user about what they're about to do (change their phone number)
+ */
 class ChangeNumberFragment : LoggingFragment(R.layout.fragment_change_phone_number) {
+
+  companion object {
+    private val TAG = Log.tag(ChangeNumberFragment::class.java)
+  }
+
+  private val binding: FragmentChangePhoneNumberBinding by ViewBinderDelegate(FragmentChangePhoneNumberBinding::bind)
+
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     val toolbar: Toolbar = view.findViewById(R.id.toolbar)
     toolbar.setNavigationOnClickListener { findNavController().navigateUp() }
 
-    view.findViewById<View>(R.id.change_phone_number_continue).setOnClickListener {
-      findNavController().safeNavigate(R.id.action_changePhoneNumberFragment_to_enterPhoneNumberChangeFragment)
+    binding.changePhoneNumberContinue.setOnClickListener {
+      findNavController().safeNavigate(ChangeNumberFragmentDirections.actionChangePhoneNumberFragmentToEnterPhoneNumberChangeFragment())
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberLockActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberLockActivity.kt
index 83bb063b79..04432b3d94 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberLockActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberLockActivity.kt
@@ -1,14 +1,16 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 package org.thoughtcrime.securesms.components.settings.app.changenumber
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.viewModels
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Single
-import io.reactivex.rxjava3.kotlin.subscribeBy
-import org.signal.core.util.concurrent.LifecycleDisposable
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.MainActivity
 import org.thoughtcrime.securesms.PassphraseRequiredActivity
@@ -18,10 +20,6 @@ import org.thoughtcrime.securesms.logsubmit.SubmitDebugLogActivity
 import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
 import org.thoughtcrime.securesms.util.DynamicTheme
-import org.whispersystems.signalservice.api.push.ServiceId.PNI
-import java.util.Objects
-
-private val TAG: String = Log.tag(ChangeNumberLockActivity::class.java)
 
 /**
  * A captive activity that can determine if an interrupted/erred change number request
@@ -29,17 +27,34 @@ private val TAG: String = Log.tag(ChangeNumberLockActivity::class.java)
  */
 class ChangeNumberLockActivity : PassphraseRequiredActivity() {
 
+  companion object {
+    private val TAG: String = Log.tag(ChangeNumberLockActivity::class.java)
+
+    @JvmStatic
+    fun createIntent(context: Context): Intent {
+      return Intent(context, ChangeNumberLockActivity::class.java).apply {
+        flags = Intent.FLAG_ACTIVITY_SINGLE_TOP
+      }
+    }
+  }
+
+  private val viewModel: ChangeNumberViewModel by viewModels()
   private val dynamicTheme: DynamicTheme = DynamicNoActionBarTheme()
-  private val disposables: LifecycleDisposable = LifecycleDisposable()
-  private lateinit var changeNumberRepository: ChangeNumberRepository
 
   override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
     dynamicTheme.onCreate(this)
-    disposables.bindTo(lifecycle)
+
+    onBackPressedDispatcher.addCallback(
+      this,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          Log.d(TAG, "Back button press swallowed.")
+        }
+      }
+    )
 
     setContentView(R.layout.activity_change_number_lock)
 
-    changeNumberRepository = ChangeNumberRepository()
     checkWhoAmI()
   }
 
@@ -48,36 +63,16 @@ class ChangeNumberLockActivity : PassphraseRequiredActivity() {
     dynamicTheme.onResume(this)
   }
 
-  @SuppressLint("MissingSuperCall")
-  override fun onBackPressed() = Unit
-
   private fun checkWhoAmI() {
-    disposables += changeNumberRepository
-      .whoAmI()
-      .flatMap { whoAmI ->
-        if (Objects.equals(whoAmI.number, SignalStore.account().e164)) {
-          Log.i(TAG, "Local and remote numbers match, nothing needs to be done.")
-          Single.just(false)
-        } else {
-          Log.i(TAG, "Local (${SignalStore.account().e164}) and remote (${whoAmI.number}) numbers do not match, updating local.")
-          Single
-            .just(true)
-            .flatMap { changeNumberRepository.changeLocalNumber(whoAmI.number, PNI.parseOrThrow(whoAmI.pni)) }
-            .compose(ChangeNumberRepository::acquireReleaseChangeNumberLock)
-            .map { true }
-        }
-      }
-      .observeOn(AndroidSchedulers.mainThread())
-      .subscribeBy(onSuccess = { onChangeStatusConfirmed() }, onError = this::onFailedToGetChangeNumberStatus)
+    viewModel.checkWhoAmI(::onChangeStatusConfirmed, ::onFailedToGetChangeNumberStatus)
   }
 
   private fun onChangeStatusConfirmed() {
-    SignalStore.misc().unlockChangeNumber()
-    SignalStore.misc().clearPendingChangeNumberMetadata()
+    SignalStore.misc.clearPendingChangeNumberMetadata()
 
     MaterialAlertDialogBuilder(this)
       .setTitle(R.string.ChangeNumberLockActivity__change_status_confirmed)
-      .setMessage(getString(R.string.ChangeNumberLockActivity__your_number_has_been_confirmed_as_s, PhoneNumberFormatter.prettyPrint(SignalStore.account().e164!!)))
+      .setMessage(getString(R.string.ChangeNumberLockActivity__your_number_has_been_confirmed_as_s, PhoneNumberFormatter.prettyPrint(SignalStore.account.e164!!)))
       .setPositiveButton(android.R.string.ok) { _, _ ->
         startActivity(MainActivity.clearTop(this))
         finish()
@@ -101,13 +96,4 @@ class ChangeNumberLockActivity : PassphraseRequiredActivity() {
       .setCancelable(false)
       .show()
   }
-
-  companion object {
-    @JvmStatic
-    fun createIntent(context: Context): Intent {
-      return Intent(context, ChangeNumberLockActivity::class.java).apply {
-        flags = Intent.FLAG_ACTIVITY_SINGLE_TOP
-      }
-    }
-  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberPinDiffersFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberPinDiffersFragment.kt
index b8a0b92ef8..1db5e28081 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberPinDiffersFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberPinDiffersFragment.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 package org.thoughtcrime.securesms.components.settings.app.changenumber
 
 import android.os.Bundle
@@ -5,13 +10,31 @@ import android.view.View
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.contract.ActivityResultContracts
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.changeNumberSuccess
 import org.thoughtcrime.securesms.lock.v2.CreateSvrPinActivity
 
+/**
+ * A screen to educate the user if their PIN differs from old number to new number.
+ */
 class ChangeNumberPinDiffersFragment : LoggingFragment(R.layout.fragment_change_number_pin_differs) {
 
+  companion object {
+    private val TAG = Log.tag(ChangeNumberPinDiffersFragment::class.java)
+  }
+
+  private val confirmCancelDialog = object : OnBackPressedCallback(true) {
+    override fun handleOnBackPressed() {
+      MaterialAlertDialogBuilder(requireContext())
+        .setMessage(R.string.ChangeNumberPinDiffersFragment__keep_old_pin_question)
+        .setPositiveButton(android.R.string.ok) { _, _ -> changeNumberSuccess() }
+        .setNegativeButton(android.R.string.cancel, null)
+        .show()
+    }
+  }
+
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     view.findViewById<View>(R.id.change_number_pin_differs_keep_old_pin).setOnClickListener {
       changeNumberSuccess()
@@ -27,17 +50,6 @@ class ChangeNumberPinDiffersFragment : LoggingFragment(R.layout.fragment_change_
       changePin.launch(CreateSvrPinActivity.getIntentForPinChangeFromSettings(requireContext()))
     }
 
-    requireActivity().onBackPressedDispatcher.addCallback(
-      viewLifecycleOwner,
-      object : OnBackPressedCallback(true) {
-        override fun handleOnBackPressed() {
-          MaterialAlertDialogBuilder(requireContext())
-            .setMessage(R.string.ChangeNumberPinDiffersFragment__keep_old_pin_question)
-            .setPositiveButton(android.R.string.ok) { _, _ -> changeNumberSuccess() }
-            .setNegativeButton(android.R.string.cancel, null)
-            .show()
-        }
-      }
-    )
+    requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, confirmCancelDialog)
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRegistrationLockFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRegistrationLockFragment.kt
index 0b2ef0a7c7..4f0db0cbbd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRegistrationLockFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRegistrationLockFragment.kt
@@ -1,25 +1,60 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 package org.thoughtcrime.securesms.components.settings.app.changenumber
 
 import android.os.Bundle
+import android.text.InputType
+import android.view.KeyEvent
 import android.view.View
+import android.view.inputmethod.EditorInfo
+import android.widget.TextView
+import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.widget.Toolbar
+import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.ViewBinderDelegate
 import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.changeNumberSuccess
+import org.thoughtcrime.securesms.databinding.FragmentRegistrationLockBinding
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.registration.fragments.BaseRegistrationLockFragment
-import org.thoughtcrime.securesms.registration.viewmodel.BaseRegistrationViewModel
+import org.thoughtcrime.securesms.lock.v2.PinKeyboardType
+import org.thoughtcrime.securesms.lock.v2.SvrConstants
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult
+import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate
+import org.thoughtcrime.securesms.registration.ui.registrationlock.RegistrationLockFragment
+import org.thoughtcrime.securesms.registration.ui.registrationlock.RegistrationLockFragmentArgs
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.SupportEmailUtil
+import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import org.whispersystems.signalservice.api.kbs.PinHashUtil
+import java.util.concurrent.TimeUnit
+
+/**
+ * Screen presented to the user if the new account is registration locked, and allows them to enter their PIN.
+ */
+class ChangeNumberRegistrationLockFragment : LoggingFragment(R.layout.fragment_change_number_registration_lock) {
+
+  companion object {
+    private val TAG = Log.tag(RegistrationLockFragment::class.java)
+  }
+
+  private val binding: FragmentRegistrationLockBinding by ViewBinderDelegate(FragmentRegistrationLockBinding::bind)
+
+  private val viewModel by activityViewModels<ChangeNumberViewModel>()
 
-class ChangeNumberRegistrationLockFragment : BaseRegistrationLockFragment(R.layout.fragment_change_number_registration_lock) {
+  private var timeRemaining: Long = 0
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
-
+    RegistrationViewDelegate.setDebugLogSubmitMultiTapView(view.findViewById(R.id.kbs_lock_pin_title))
     val toolbar: Toolbar = view.findViewById(R.id.toolbar)
     toolbar.setNavigationOnClickListener { navigateUp() }
 
@@ -31,20 +66,242 @@ class ChangeNumberRegistrationLockFragment : BaseRegistrationLockFragment(R.layo
         }
       }
     )
+
+    val args: RegistrationLockFragmentArgs = RegistrationLockFragmentArgs.fromBundle(requireArguments())
+
+    timeRemaining = args.getTimeRemaining()
+
+    binding.kbsLockForgotPin.visibility = View.GONE
+    binding.kbsLockForgotPin.setOnClickListener { handleForgottenPin(timeRemaining) }
+
+    binding.kbsLockPinInput.setImeOptions(EditorInfo.IME_ACTION_DONE)
+    binding.kbsLockPinInput.setOnEditorActionListener { v: TextView?, actionId: Int, _: KeyEvent? ->
+      if (actionId == EditorInfo.IME_ACTION_DONE) {
+        ViewUtil.hideKeyboard(requireContext(), v!!)
+        handlePinEntry()
+        return@setOnEditorActionListener true
+      }
+      false
+    }
+
+    enableAndFocusPinEntry()
+
+    binding.kbsLockPinConfirm.setOnClickListener {
+      ViewUtil.hideKeyboard(requireContext(), binding.kbsLockPinInput)
+      handlePinEntry()
+    }
+
+    binding.kbsLockKeyboardToggle.setOnClickListener {
+      val keyboardType: PinKeyboardType = getPinEntryKeyboardType()
+      updateKeyboard(keyboardType.other)
+      binding.kbsLockKeyboardToggle.setIconResource(keyboardType.iconResource)
+    }
+
+    val keyboardType: PinKeyboardType = getPinEntryKeyboardType().getOther()
+    binding.kbsLockKeyboardToggle.setIconResource(keyboardType.iconResource)
+
+    viewModel.liveLockedTimeRemaining.observe(viewLifecycleOwner) { t: Long -> timeRemaining = t }
+
+    val triesRemaining: Int = viewModel.svrTriesRemaining
+
+    if (triesRemaining <= 3) {
+      val daysRemaining = getLockoutDays(timeRemaining)
+
+      MaterialAlertDialogBuilder(requireContext()).setTitle(R.string.RegistrationLockFragment__not_many_tries_left)
+        .setMessage(getTriesRemainingDialogMessage(triesRemaining, daysRemaining))
+        .setPositiveButton(android.R.string.ok, null)
+        .setNeutralButton(R.string.PinRestoreEntryFragment_contact_support) { _, _ -> sendEmailToSupport() }
+        .show()
+    }
+
+    if (triesRemaining < 5) {
+      binding.kbsLockPinInputLabel.text = requireContext().resources.getQuantityString(R.plurals.RegistrationLockFragment__d_attempts_remaining, triesRemaining, triesRemaining)
+    }
+
+    viewModel.uiState.observe(viewLifecycleOwner, ::onStateUpdate)
+  }
+
+  private fun onStateUpdate(state: ChangeNumberState) {
+    if (state.changeNumberOutcome == ChangeNumberOutcome.VerificationCodeWorked) {
+      handleSuccessfulPinEntry(state.enteredPin)
+    }
+  }
+
+  private fun handlePinEntry() {
+    binding.kbsLockPinInput.setEnabled(false)
+
+    val pin: String = binding.kbsLockPinInput.getText().toString()
+
+    val trimmedLength = pin.replace(" ", "").length
+    if (trimmedLength == 0) {
+      Toast.makeText(requireContext(), R.string.RegistrationActivity_you_must_enter_your_registration_lock_PIN, Toast.LENGTH_LONG).show()
+      enableAndFocusPinEntry()
+      return
+    }
+
+    if (trimmedLength < SvrConstants.MINIMUM_PIN_LENGTH) {
+      Toast.makeText(requireContext(), getString(R.string.RegistrationActivity_your_pin_has_at_least_d_digits_or_characters, SvrConstants.MINIMUM_PIN_LENGTH), Toast.LENGTH_LONG).show()
+      enableAndFocusPinEntry()
+      return
+    }
+
+    viewModel.setEnteredPin(pin)
+
+    binding.kbsLockPinConfirm.setSpinning()
+    viewModel.verifyCodeAndRegisterAccountWithRegistrationLock(requireContext(), pin, ::handleSessionErrorResponse, ::handleChangeNumberErrorResponse)
   }
 
-  override fun getViewModel(): BaseRegistrationViewModel {
-    return ChangeNumberUtil.getViewModel(this)
+  private fun handleSessionErrorResponse(requestResult: VerificationCodeRequestResult) {
+    when (requestResult) {
+      is VerificationCodeRequestResult.Success -> Unit
+      is VerificationCodeRequestResult.RateLimited -> onRateLimited()
+      is VerificationCodeRequestResult.AttemptsExhausted,
+      is VerificationCodeRequestResult.RegistrationLocked -> {
+        navigateToAccountLocked()
+      }
+
+      is VerificationCodeRequestResult.AlreadyVerified,
+      is VerificationCodeRequestResult.ChallengeRequired,
+      is VerificationCodeRequestResult.ExternalServiceFailure,
+      is VerificationCodeRequestResult.ImpossibleNumber,
+      is VerificationCodeRequestResult.InvalidTransportModeFailure,
+      is VerificationCodeRequestResult.MalformedRequest,
+      is VerificationCodeRequestResult.MustRetry,
+      is VerificationCodeRequestResult.NoSuchSession,
+      is VerificationCodeRequestResult.NonNormalizedNumber,
+      is VerificationCodeRequestResult.TokenNotAccepted,
+      is VerificationCodeRequestResult.UnknownError -> {
+        Log.w(TAG, "Unable to verify code with registration lock", requestResult.getCause())
+        onError()
+      }
+    }
   }
 
-  override fun navigateToAccountLocked() {
+  private fun handleChangeNumberErrorResponse(result: ChangeNumberResult) {
+    when (result) {
+      is ChangeNumberResult.Success -> Unit
+      is ChangeNumberResult.RateLimited -> onRateLimited()
+      is ChangeNumberResult.AttemptsExhausted -> navigateToAccountLocked()
+
+      is ChangeNumberResult.SvrWrongPin -> {
+        Log.i(TAG, "SVR returned a WrongPinException.")
+        onIncorrectKbsRegistrationLockPin(result.triesRemaining)
+      }
+
+      is ChangeNumberResult.SvrNoData -> {
+        Log.i(TAG, "SVR returned a NoDataException.")
+        navigateToAccountLocked()
+      }
+
+      is ChangeNumberResult.AuthorizationFailed,
+      is ChangeNumberResult.IncorrectRecoveryPassword,
+      is ChangeNumberResult.MalformedRequest,
+      is ChangeNumberResult.RegistrationLocked,
+      is ChangeNumberResult.UnknownError,
+      is ChangeNumberResult.ValidationError -> {
+        Log.w(TAG, "Unable to register account with registration lock", result.getCause())
+        onError()
+      }
+    }
+  }
+
+  private fun onIncorrectKbsRegistrationLockPin(svrTriesRemaining: Int) {
+    binding.kbsLockPinConfirm.cancelSpinning()
+    binding.kbsLockPinInput.getText().clear()
+    enableAndFocusPinEntry()
+
+    if (svrTriesRemaining == 0) {
+      Log.w(TAG, "Account locked. User out of attempts on KBS.")
+      navigateToAccountLocked()
+      return
+    }
+
+    if (svrTriesRemaining == 3) {
+      val daysRemaining = getLockoutDays(timeRemaining)
+
+      MaterialAlertDialogBuilder(requireContext()).setTitle(R.string.RegistrationLockFragment__incorrect_pin)
+        .setMessage(getTriesRemainingDialogMessage(svrTriesRemaining, daysRemaining))
+        .setPositiveButton(android.R.string.ok, null)
+        .show()
+    }
+
+    if (svrTriesRemaining > 5) {
+      binding.kbsLockPinInputLabel.setText(R.string.RegistrationLockFragment__incorrect_pin_try_again)
+    } else {
+      binding.kbsLockPinInputLabel.text = requireContext().resources.getQuantityString(R.plurals.RegistrationLockFragment__incorrect_pin_d_attempts_remaining, svrTriesRemaining, svrTriesRemaining)
+      binding.kbsLockForgotPin.visibility = View.VISIBLE
+    }
+  }
+
+  private fun onRateLimited() {
+    binding.kbsLockPinConfirm.cancelSpinning()
+    enableAndFocusPinEntry()
+
+    MaterialAlertDialogBuilder(requireContext()).setTitle(R.string.RegistrationActivity_too_many_attempts)
+      .setMessage(R.string.RegistrationActivity_you_have_made_too_many_incorrect_registration_lock_pin_attempts_please_try_again_in_a_day)
+      .setPositiveButton(android.R.string.ok, null)
+      .show()
+  }
+
+  fun onError() {
+    binding.kbsLockPinConfirm.cancelSpinning()
+    enableAndFocusPinEntry()
+
+    Toast.makeText(requireContext(), R.string.RegistrationActivity_error_connecting_to_service, Toast.LENGTH_LONG).show()
+  }
+
+  private fun handleForgottenPin(timeRemainingMs: Long) {
+    val lockoutDays = getLockoutDays(timeRemainingMs)
+    MaterialAlertDialogBuilder(requireContext()).setTitle(R.string.RegistrationLockFragment__forgot_your_pin)
+      .setMessage(requireContext().resources.getQuantityString(R.plurals.RegistrationLockFragment__for_your_privacy_and_security_there_is_no_way_to_recover, lockoutDays, lockoutDays))
+      .setPositiveButton(android.R.string.ok, null)
+      .setNeutralButton(R.string.PinRestoreEntryFragment_contact_support) { _, which -> sendEmailToSupport() }
+      .show()
+  }
+
+  private fun getLockoutDays(timeRemainingMs: Long): Int {
+    return TimeUnit.MILLISECONDS.toDays(timeRemainingMs).toInt() + 1
+  }
+
+  private fun getTriesRemainingDialogMessage(triesRemaining: Int, daysRemaining: Int): String {
+    val resources = requireContext().resources
+    val tries = resources.getQuantityString(R.plurals.RegistrationLockFragment__you_have_d_attempts_remaining, triesRemaining, triesRemaining)
+    val days = resources.getQuantityString(R.plurals.RegistrationLockFragment__if_you_run_out_of_attempts_your_account_will_be_locked_for_d_days, daysRemaining, daysRemaining)
+
+    return "$tries $days"
+  }
+
+  private fun enableAndFocusPinEntry() {
+    binding.kbsLockPinInput.setEnabled(true)
+    binding.kbsLockPinInput.setFocusable(true)
+    ViewUtil.focusAndShowKeyboard(binding.kbsLockPinInput)
+  }
+
+  private fun getPinEntryKeyboardType(): PinKeyboardType {
+    val isNumeric = (binding.kbsLockPinInput.inputType and InputType.TYPE_MASK_CLASS) == InputType.TYPE_CLASS_NUMBER
+
+    return if (isNumeric) PinKeyboardType.NUMERIC else PinKeyboardType.ALPHA_NUMERIC
+  }
+
+  private fun updateKeyboard(keyboard: PinKeyboardType) {
+    val isAlphaNumeric = keyboard == PinKeyboardType.ALPHA_NUMERIC
+
+    binding.kbsLockPinInput.setInputType(
+      if (isAlphaNumeric) InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
+      else InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_VARIATION_PASSWORD
+    )
+
+    binding.kbsLockPinInput.getText().clear()
+  }
+
+  private fun navigateToAccountLocked() {
     findNavController().safeNavigate(ChangeNumberRegistrationLockFragmentDirections.actionChangeNumberRegistrationLockToChangeNumberAccountLocked())
   }
 
-  override fun handleSuccessfulPinEntry(pin: String) {
-    val pinsDiffer: Boolean = SignalStore.svr().localPinHash?.let { !PinHashUtil.verifyLocalPinHash(it, pin) } ?: false
+  private fun handleSuccessfulPinEntry(pin: String) {
+    val pinsDiffer: Boolean = SignalStore.svr.localPinHash?.let { !PinHashUtil.verifyLocalPinHash(it, pin) } ?: false
 
-    pinButton.cancelSpinning()
+    binding.kbsLockPinConfirm.cancelSpinning()
 
     if (pinsDiffer) {
       findNavController().safeNavigate(ChangeNumberRegistrationLockFragmentDirections.actionChangeNumberRegistrationLockToChangeNumberPinDiffers())
@@ -53,26 +310,16 @@ class ChangeNumberRegistrationLockFragment : BaseRegistrationLockFragment(R.layo
     }
   }
 
-  override fun sendEmailToSupport() {
+  private fun sendEmailToSupport() {
     val subject = R.string.ChangeNumberRegistrationLockFragment__signal_change_number_need_help_with_pin_for_android_v2_pin
 
-    val body: String = SupportEmailUtil.generateSupportEmailBody(
-      requireContext(),
-      subject,
-      null,
-      null
-    )
+    val body: String = SupportEmailUtil.generateSupportEmailBody(requireContext(), subject, null, null)
 
-    CommunicationActions.openEmail(
-      requireContext(),
-      SupportEmailUtil.getSupportEmailAddress(requireContext()),
-      getString(subject),
-      body
-    )
+    CommunicationActions.openEmail(requireContext(), SupportEmailUtil.getSupportEmailAddress(requireContext()), getString(subject), body)
   }
 
   private fun navigateUp() {
-    if (SignalStore.misc().isChangeNumberLocked) {
+    if (SignalStore.misc.isChangeNumberLocked) {
       startActivity(ChangeNumberLockActivity.createIntent(requireContext()))
     } else {
       findNavController().navigateUp()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt
index 5b13917821..18eb833b79 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt
@@ -1,9 +1,15 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 package org.thoughtcrime.securesms.components.settings.app.changenumber
 
 import androidx.annotation.WorkerThread
-import io.reactivex.rxjava3.core.Completable
-import io.reactivex.rxjava3.core.Single
-import io.reactivex.rxjava3.schedulers.Schedulers
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeoutOrNull
 import okio.ByteString.Companion.toByteString
 import org.signal.core.util.logging.Log
 import org.signal.libsignal.protocol.IdentityKeyPair
@@ -18,30 +24,28 @@ import org.thoughtcrime.securesms.crypto.PreKeyUtil
 import org.thoughtcrime.securesms.database.IdentityTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.databaseprotos.PendingChangeNumberMetadata
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob
 import org.thoughtcrime.securesms.keyvalue.CertificateType
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.pin.SvrRepository
 import org.thoughtcrime.securesms.pin.SvrWrongPinException
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.registration.VerifyResponse
 import org.thoughtcrime.securesms.registration.viewmodel.SvrAuthCredentialSet
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
+import org.whispersystems.signalservice.api.NetworkResult
 import org.whispersystems.signalservice.api.SignalServiceAccountManager
 import org.whispersystems.signalservice.api.SignalServiceMessageSender
 import org.whispersystems.signalservice.api.SvrNoDataException
 import org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest
 import org.whispersystems.signalservice.api.account.PreKeyUpload
 import org.whispersystems.signalservice.api.kbs.MasterKey
-import org.whispersystems.signalservice.api.push.ServiceId.PNI
+import org.whispersystems.signalservice.api.push.ServiceId
 import org.whispersystems.signalservice.api.push.ServiceIdType
 import org.whispersystems.signalservice.api.push.SignalServiceAddress
 import org.whispersystems.signalservice.api.push.SignedPreKeyEntity
-import org.whispersystems.signalservice.internal.ServiceResponse
 import org.whispersystems.signalservice.internal.push.KyberPreKeyEntity
 import org.whispersystems.signalservice.internal.push.OutgoingPushMessage
-import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse
 import org.whispersystems.signalservice.internal.push.SyncMessage
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
 import org.whispersystems.signalservice.internal.push.WhoAmIResponse
@@ -49,177 +53,62 @@ import org.whispersystems.signalservice.internal.push.exceptions.MismatchedDevic
 import java.io.IOException
 import java.security.MessageDigest
 import java.security.SecureRandom
-import java.util.concurrent.TimeUnit
-import java.util.concurrent.locks.ReentrantLock
-
-private val TAG: String = Log.tag(ChangeNumberRepository::class.java)
+import kotlin.coroutines.resume
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
 
 /**
- * Provides various change number operations. All operations must run on [Schedulers.single] to support
- * the global "I am changing the number" lock exclusivity.
+ * Repository to perform data operations during change number.
+ *
+ * @see [org.thoughtcrime.securesms.registration.data.RegistrationRepository]
  */
 class ChangeNumberRepository(
-  private val accountManager: SignalServiceAccountManager = ApplicationDependencies.getSignalServiceAccountManager(),
-  private val messageSender: SignalServiceMessageSender = ApplicationDependencies.getSignalServiceMessageSender()
+  private val accountManager: SignalServiceAccountManager = AppDependencies.signalServiceAccountManager,
+  private val messageSender: SignalServiceMessageSender = AppDependencies.signalServiceMessageSender
 ) {
 
   companion object {
-    /**
-     * This lock should be held by anyone who is performing a change number operation, so that two different parties cannot change the user's number
-     * at the same time.
-     */
-    val CHANGE_NUMBER_LOCK = ReentrantLock()
-
-    /**
-     * Adds Rx operators to chain to acquire and release the [CHANGE_NUMBER_LOCK] on subscribe and on finish.
-     */
-    fun <T : Any> acquireReleaseChangeNumberLock(upstream: Single<T>): Single<T> {
-      return upstream.doOnSubscribe {
-        CHANGE_NUMBER_LOCK.lock()
-        SignalStore.misc().lockChangeNumber()
-      }
-        .subscribeOn(Schedulers.single())
-        .observeOn(Schedulers.single())
-        .doFinally {
-          if (CHANGE_NUMBER_LOCK.isHeldByCurrentThread) {
-            CHANGE_NUMBER_LOCK.unlock()
-          }
-        }
-    }
+    private val TAG = Log.tag(ChangeNumberRepository::class.java)
   }
 
-  fun ensureDecryptionsDrained(): Completable {
-    return Completable.create { emitter ->
-      val drainedListener = object : Runnable {
-        override fun run() {
-          emitter.onComplete()
-          ApplicationDependencies
-            .getIncomingMessageObserver()
-            .removeDecryptionDrainedListener(this)
-        }
-      }
-
-      emitter.setCancellable {
-        ApplicationDependencies
-          .getIncomingMessageObserver()
-          .removeDecryptionDrainedListener(drainedListener)
-      }
-
-      ApplicationDependencies
-        .getIncomingMessageObserver()
-        .addDecryptionDrainedListener(drainedListener)
-    }.subscribeOn(Schedulers.single())
-      .timeout(15, TimeUnit.SECONDS)
+  fun whoAmI(): WhoAmIResponse {
+    return accountManager.whoAmI
   }
 
-  fun changeNumber(sessionId: String? = null, recoveryPassword: String? = null, newE164: String): Single<ServiceResponse<VerifyResponse>> {
-    check((sessionId != null && recoveryPassword == null) || (sessionId == null && recoveryPassword != null))
-
-    return Single.fromCallable {
-      var completed = false
-      var attempts = 0
-      lateinit var changeNumberResponse: ServiceResponse<VerifyAccountResponse>
-
-      while (!completed && attempts < 5) {
-        val (request: ChangePhoneNumberRequest, metadata: PendingChangeNumberMetadata) = createChangeNumberRequest(
-          sessionId = sessionId,
-          recoveryPassword = recoveryPassword,
-          newE164 = newE164
-        )
-
-        SignalStore.misc().setPendingChangeNumberMetadata(metadata)
-
-        changeNumberResponse = accountManager.changeNumber(request)
-
-        val possibleError: Throwable? = changeNumberResponse.applicationError.orElse(null)
-        if (possibleError is MismatchedDevicesException) {
-          messageSender.handleChangeNumberMismatchDevices(possibleError.mismatchedDevices)
-          attempts++
-        } else {
-          completed = true
+  suspend fun ensureDecryptionsDrained(timeout: Duration = 15.seconds) =
+    withTimeoutOrNull(timeout) {
+      suspendCancellableCoroutine {
+        val drainedListener = object : Runnable {
+          override fun run() {
+            AppDependencies
+              .incomingMessageObserver
+              .removeDecryptionDrainedListener(this)
+            Log.d(TAG, "Decryptions drained.")
+            it.resume(true)
+          }
         }
-      }
-
-      VerifyResponse.from(
-        response = changeNumberResponse,
-        masterKey = null,
-        pin = null,
-        aciPreKeyCollection = null,
-        pniPreKeyCollection = null
-      )
-    }.subscribeOn(Schedulers.single())
-      .onErrorReturn { t -> ServiceResponse.forExecutionError(t) }
-  }
-
-  fun changeNumber(
-    sessionId: String,
-    newE164: String,
-    pin: String,
-    svrAuthCredentials: SvrAuthCredentialSet
-  ): Single<ServiceResponse<VerifyResponse>> {
-    return Single.fromCallable {
-      val masterKey: MasterKey
-      val registrationLock: String
-
-      try {
-        masterKey = SvrRepository.restoreMasterKeyPreRegistration(svrAuthCredentials, pin)
-        registrationLock = masterKey.deriveRegistrationLock()
-      } catch (e: SvrWrongPinException) {
-        return@fromCallable ServiceResponse.forExecutionError(e)
-      } catch (e: SvrNoDataException) {
-        return@fromCallable ServiceResponse.forExecutionError(e)
-      } catch (e: IOException) {
-        return@fromCallable ServiceResponse.forExecutionError(e)
-      }
 
-      var completed = false
-      var attempts = 0
-      lateinit var changeNumberResponse: ServiceResponse<VerifyAccountResponse>
-
-      while (!completed && attempts < 5) {
-        val (request: ChangePhoneNumberRequest, metadata: PendingChangeNumberMetadata) = createChangeNumberRequest(
-          sessionId = sessionId,
-          newE164 = newE164,
-          registrationLock = registrationLock
-        )
-
-        SignalStore.misc().setPendingChangeNumberMetadata(metadata)
-
-        changeNumberResponse = accountManager.changeNumber(request)
-
-        val possibleError: Throwable? = changeNumberResponse.applicationError.orElse(null)
-        if (possibleError is MismatchedDevicesException) {
-          messageSender.handleChangeNumberMismatchDevices(possibleError.mismatchedDevices)
-          attempts++
-        } else {
-          completed = true
+        it.invokeOnCancellation { cancellationCause ->
+          AppDependencies
+            .incomingMessageObserver
+            .removeDecryptionDrainedListener(drainedListener)
+          Log.d(TAG, "Decryptions draining canceled.", cancellationCause)
         }
-      }
 
-      VerifyResponse.from(
-        response = changeNumberResponse,
-        masterKey = masterKey,
-        pin = pin,
-        aciPreKeyCollection = null,
-        pniPreKeyCollection = null
-      )
-    }.subscribeOn(Schedulers.single())
-      .onErrorReturn { t -> ServiceResponse.forExecutionError(t) }
-  }
-
-  @Suppress("UsePropertyAccessSyntax")
-  fun whoAmI(): Single<WhoAmIResponse> {
-    return Single.fromCallable { ApplicationDependencies.getSignalServiceAccountManager().getWhoAmI() }
-      .subscribeOn(Schedulers.single())
-  }
+        AppDependencies
+          .incomingMessageObserver
+          .addDecryptionDrainedListener(drainedListener)
+        Log.d(TAG, "Waiting for decryption drain.")
+      }
+    }
 
   @WorkerThread
-  fun changeLocalNumber(e164: String, pni: PNI): Single<Unit> {
+  fun changeLocalNumber(e164: String, pni: ServiceId.PNI) {
     val oldStorageId: ByteArray? = Recipient.self().storageId
     SignalDatabase.recipients.updateSelfE164(e164, pni)
     val newStorageId: ByteArray? = Recipient.self().storageId
 
-    if (e164 != SignalStore.account().requireE164() && MessageDigest.isEqual(oldStorageId, newStorageId)) {
+    if (e164 != SignalStore.account.requireE164() && MessageDigest.isEqual(oldStorageId, newStorageId)) {
       Log.w(TAG, "Self storage id was not rotated, attempting to rotate again")
       SignalDatabase.recipients.rotateStorageId(Recipient.self().id)
       StorageSyncHelper.scheduleSyncForDataChange()
@@ -229,21 +118,21 @@ class ChangeNumberRepository(
       }
     }
 
-    ApplicationDependencies.getRecipientCache().clear()
+    AppDependencies.recipientCache.clear()
 
-    SignalStore.account().setE164(e164)
-    SignalStore.account().setPni(pni)
-    ApplicationDependencies.resetProtocolStores()
+    SignalStore.account.setE164(e164)
+    SignalStore.account.setPni(pni)
+    AppDependencies.resetProtocolStores()
 
-    ApplicationDependencies.getGroupsV2Authorization().clear()
+    AppDependencies.groupsV2Authorization.clear()
 
-    val metadata: PendingChangeNumberMetadata? = SignalStore.misc().pendingChangeNumberMetadata
+    val metadata: PendingChangeNumberMetadata? = SignalStore.misc.pendingChangeNumberMetadata
     if (metadata == null) {
       Log.w(TAG, "No change number metadata, this shouldn't happen")
       throw AssertionError("No change number metadata")
     }
 
-    val originalPni = PNI.parseOrThrow(metadata.previousPni)
+    val originalPni = ServiceId.PNI.parseOrThrow(metadata.previousPni)
 
     if (originalPni == pni) {
       Log.i(TAG, "No change has occurred, PNI is unchanged: $pni")
@@ -253,11 +142,11 @@ class ChangeNumberRepository(
       val pniSignedPreyKeyId = metadata.pniSignedPreKeyId
       val pniLastResortKyberPreKeyId = metadata.pniLastResortKyberPreKeyId
 
-      val pniProtocolStore = ApplicationDependencies.getProtocolStore().pni()
-      val pniMetadataStore = SignalStore.account().pniPreKeys
+      val pniProtocolStore = AppDependencies.protocolStore.pni()
+      val pniMetadataStore = SignalStore.account.pniPreKeys
 
-      SignalStore.account().pniRegistrationId = pniRegistrationId
-      SignalStore.account().setPniIdentityKeyAfterChangeNumber(pniIdentityKeyPair)
+      SignalStore.account.pniRegistrationId = pniRegistrationId
+      SignalStore.account.setPniIdentityKeyAfterChangeNumber(pniIdentityKeyPair)
 
       val signedPreKey = pniProtocolStore.loadSignedPreKey(pniSignedPreyKeyId)
       val oneTimeEcPreKeys = PreKeyUtil.generateAndStoreOneTimeEcPreKeys(pniProtocolStore, pniMetadataStore)
@@ -269,6 +158,8 @@ class ChangeNumberRepository(
       }
 
       pniMetadataStore.activeSignedPreKeyId = signedPreKey.id
+      Log.i(TAG, "Submitting prekeys with PNI identity key: ${pniIdentityKeyPair.publicKey.fingerprint}")
+
       accountManager.setPreKeys(
         PreKeyUpload(
           serviceIdType = ServiceIdType.PNI,
@@ -291,40 +182,110 @@ class ChangeNumberRepository(
         true
       )
 
-      SignalStore.misc().hasPniInitializedDevices = true
-      ApplicationDependencies.getGroupsV2Authorization().clear()
+      AppDependencies.groupsV2Authorization.clear()
     }
 
     Recipient.self().live().refresh()
     StorageSyncHelper.scheduleSyncForDataChange()
 
-    ApplicationDependencies.closeConnections()
-    ApplicationDependencies.getIncomingMessageObserver()
+    AppDependencies.resetNetwork(restartMessageObserver = true)
 
-    ApplicationDependencies.getJobManager().add(RefreshAttributesJob())
+    AppDependencies.jobManager.add(RefreshAttributesJob())
 
-    return rotateCertificates()
+    rotateCertificates()
   }
 
-  @Suppress("UsePropertyAccessSyntax")
-  private fun rotateCertificates(): Single<Unit> {
-    val certificateTypes = SignalStore.phoneNumberPrivacy().allCertificateTypes
+  @WorkerThread
+  private fun rotateCertificates() {
+    val certificateTypes = SignalStore.phoneNumberPrivacy.allCertificateTypes
 
     Log.i(TAG, "Rotating these certificates $certificateTypes")
 
-    return Single.fromCallable {
-      for (certificateType in certificateTypes) {
-        val certificate: ByteArray? = when (certificateType) {
-          CertificateType.ACI_AND_E164 -> accountManager.getSenderCertificate()
-          CertificateType.ACI_ONLY -> accountManager.getSenderCertificateForPhoneNumberPrivacy()
-          else -> throw AssertionError()
-        }
+    for (certificateType in certificateTypes) {
+      val certificate: ByteArray? = when (certificateType) {
+        CertificateType.ACI_AND_E164 -> accountManager.senderCertificate
+        CertificateType.ACI_ONLY -> accountManager.senderCertificateForPhoneNumberPrivacy
+        else -> throw AssertionError()
+      }
+
+      Log.i(TAG, "Successfully got $certificateType certificate")
+
+      SignalStore.certificate.setUnidentifiedAccessCertificate(certificateType, certificate)
+    }
+  }
+
+  suspend fun changeNumberWithRecoveryPassword(recoveryPassword: String, newE164: String): ChangeNumberResult {
+    return changeNumberInternal(recoveryPassword = recoveryPassword, newE164 = newE164)
+  }
+
+  suspend fun changeNumberWithoutRegistrationLock(sessionId: String, newE164: String): ChangeNumberResult {
+    return changeNumberInternal(sessionId = sessionId, newE164 = newE164)
+  }
+
+  suspend fun changeNumberWithRegistrationLock(
+    sessionId: String,
+    newE164: String,
+    pin: String,
+    svrAuthCredentials: SvrAuthCredentialSet
+  ): ChangeNumberResult {
+    val masterKey: MasterKey
+
+    try {
+      masterKey = SvrRepository.restoreMasterKeyPreRegistration(svrAuthCredentials, pin)
+    } catch (e: SvrWrongPinException) {
+      return ChangeNumberResult.SvrWrongPin(e)
+    } catch (e: SvrNoDataException) {
+      return ChangeNumberResult.SvrNoData(e)
+    } catch (e: IOException) {
+      return ChangeNumberResult.UnknownError(e)
+    }
+
+    val registrationLock = masterKey.deriveRegistrationLock()
+    return changeNumberInternal(sessionId = sessionId, registrationLock = registrationLock, newE164 = newE164)
+  }
 
-        Log.i(TAG, "Successfully got $certificateType certificate")
+  /**
+   * Sends a request to the service to change the phone number associated with this account.
+   */
+  private suspend fun changeNumberInternal(sessionId: String? = null, recoveryPassword: String? = null, registrationLock: String? = null, newE164: String): ChangeNumberResult {
+    check((sessionId != null && recoveryPassword == null) || (sessionId == null && recoveryPassword != null))
+    var completed = false
+    var attempts = 0
+    lateinit var result: NetworkResult<VerifyAccountResponse>
+
+    while (!completed && attempts < 5) {
+      Log.i(TAG, "Attempt #$attempts")
+      val (request: ChangePhoneNumberRequest, metadata: PendingChangeNumberMetadata) = createChangeNumberRequest(
+        sessionId = sessionId,
+        recoveryPassword = recoveryPassword,
+        newE164 = newE164,
+        registrationLock = registrationLock
+      )
 
-        SignalStore.certificateValues().setUnidentifiedAccessCertificate(certificateType, certificate)
+      SignalStore.misc.setPendingChangeNumberMetadata(metadata)
+      withContext(Dispatchers.IO) {
+        result = accountManager.registrationApi.changeNumber(request)
       }
-    }.subscribeOn(Schedulers.single())
+
+      val possibleError = result.getCause() as? MismatchedDevicesException
+      if (possibleError != null) {
+        messageSender.handleChangeNumberMismatchDevices(possibleError.mismatchedDevices)
+        attempts++
+      } else {
+        completed = true
+      }
+    }
+    Log.i(TAG, "Returning change number network result.")
+    return ChangeNumberResult.from(
+      result.map { accountRegistrationResponse: VerifyAccountResponse ->
+        NumberChangeResult(
+          uuid = accountRegistrationResponse.uuid,
+          pni = accountRegistrationResponse.pni,
+          storageCapable = accountRegistrationResponse.storageCapable,
+          number = accountRegistrationResponse.number
+        )
+      }
+    )
   }
 
   @WorkerThread
@@ -334,8 +295,8 @@ class ChangeNumberRepository(
     newE164: String,
     registrationLock: String? = null
   ): ChangeNumberRequestData {
-    val selfIdentifier: String = SignalStore.account().requireAci().toString()
-    val aciProtocolStore: SignalProtocolStore = ApplicationDependencies.getProtocolStore().aci()
+    val selfIdentifier: String = SignalStore.account.requireAci().toString()
+    val aciProtocolStore: SignalProtocolStore = AppDependencies.protocolStore.aci()
 
     val pniIdentity: IdentityKeyPair = IdentityKeyUtil.generateIdentityKeyPair()
     val deviceMessages = mutableListOf<OutgoingPushMessage>()
@@ -351,7 +312,7 @@ class ChangeNumberRepository(
       .forEach { deviceId ->
         // Signed Prekeys
         val signedPreKeyRecord: SignedPreKeyRecord = if (deviceId == primaryDeviceId) {
-          PreKeyUtil.generateAndStoreSignedPreKey(ApplicationDependencies.getProtocolStore().pni(), SignalStore.account().pniPreKeys, pniIdentity.privateKey)
+          PreKeyUtil.generateAndStoreSignedPreKey(AppDependencies.protocolStore.pni(), SignalStore.account.pniPreKeys, pniIdentity.privateKey)
         } else {
           PreKeyUtil.generateSignedPreKey(SecureRandom().nextInt(Medium.MAX_VALUE), pniIdentity.privateKey)
         }
@@ -359,7 +320,7 @@ class ChangeNumberRepository(
 
         // Last-resort kyber prekeys
         val lastResortKyberPreKeyRecord: KyberPreKeyRecord = if (deviceId == primaryDeviceId) {
-          PreKeyUtil.generateAndStoreLastResortKyberPreKey(ApplicationDependencies.getProtocolStore().pni(), SignalStore.account().pniPreKeys, pniIdentity.privateKey)
+          PreKeyUtil.generateAndStoreLastResortKyberPreKey(AppDependencies.protocolStore.pni(), SignalStore.account.pniPreKeys, pniIdentity.privateKey)
         } else {
           PreKeyUtil.generateLastResortKyberPreKey(SecureRandom().nextInt(Medium.MAX_VALUE), pniIdentity.privateKey)
         }
@@ -400,7 +361,7 @@ class ChangeNumberRepository(
     )
 
     val metadata = PendingChangeNumberMetadata(
-      previousPni = SignalStore.account().pni!!.toByteString(),
+      previousPni = SignalStore.account.pni!!.toByteString(),
       pniIdentityKeyPair = pniIdentity.serialize().toByteString(),
       pniRegistrationId = pniRegistrationIds[primaryDeviceId]!!,
       pniSignedPreKeyId = devicePniSignedPreKeys[primaryDeviceId]!!.keyId,
@@ -410,11 +371,12 @@ class ChangeNumberRepository(
     return ChangeNumberRequestData(request, metadata)
   }
 
-  fun verifyAccount(sessionId: String, code: String): Single<ServiceResponse<RegistrationSessionMetadataResponse>> {
-    return Single.fromCallable {
-      accountManager.verifyAccount(code, sessionId)
-    }.subscribeOn(Schedulers.io())
-  }
+  private data class ChangeNumberRequestData(val changeNumberRequest: ChangePhoneNumberRequest, val pendingChangeNumberMetadata: PendingChangeNumberMetadata)
 
-  data class ChangeNumberRequestData(val changeNumberRequest: ChangePhoneNumberRequest, val pendingChangeNumberMetadata: PendingChangeNumberMetadata)
+  data class NumberChangeResult(
+    val uuid: String,
+    val pni: String,
+    val storageCapable: Boolean,
+    val number: String
+  )
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberResult.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberResult.kt
new file mode 100644
index 0000000000..65aaee7e62
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberResult.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.changenumber
+
+import org.thoughtcrime.securesms.pin.SvrWrongPinException
+import org.thoughtcrime.securesms.registration.data.network.RegistrationResult
+import org.whispersystems.signalservice.api.NetworkResult
+import org.whispersystems.signalservice.api.SvrNoDataException
+import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException
+import org.whispersystems.signalservice.api.push.exceptions.IncorrectRegistrationRecoveryPasswordException
+import org.whispersystems.signalservice.api.push.exceptions.MalformedRequestException
+import org.whispersystems.signalservice.api.push.exceptions.RateLimitException
+import org.whispersystems.signalservice.api.svr.Svr3Credentials
+import org.whispersystems.signalservice.internal.push.AuthCredentials
+import org.whispersystems.signalservice.internal.push.LockedException
+import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
+
+/**
+ * This is a processor to map a [VerifyAccountResponse] to all the known outcomes.
+ */
+sealed class ChangeNumberResult(cause: Throwable?) : RegistrationResult(cause) {
+  companion object {
+    fun from(networkResult: NetworkResult<ChangeNumberRepository.NumberChangeResult>): ChangeNumberResult {
+      return when (networkResult) {
+        is NetworkResult.Success -> Success(networkResult.result)
+        is NetworkResult.ApplicationError -> UnknownError(networkResult.throwable)
+        is NetworkResult.NetworkError -> UnknownError(networkResult.exception)
+        is NetworkResult.StatusCodeError -> {
+          when (val cause = networkResult.exception) {
+            is IncorrectRegistrationRecoveryPasswordException -> IncorrectRecoveryPassword(cause)
+            is AuthorizationFailedException -> AuthorizationFailed(cause)
+            is MalformedRequestException -> MalformedRequest(cause)
+            is RateLimitException -> createRateLimitProcessor(cause)
+            is LockedException -> RegistrationLocked(cause = cause, timeRemaining = cause.timeRemaining, svr2Credentials = cause.svr2Credentials, svr3Credentials = cause.svr3Credentials)
+            else -> {
+              if (networkResult.code == 422) {
+                ValidationError(cause)
+              } else {
+                UnknownError(cause)
+              }
+            }
+          }
+        }
+      }
+    }
+
+    private fun createRateLimitProcessor(exception: RateLimitException): ChangeNumberResult {
+      return if (exception.retryAfterMilliseconds.isPresent) {
+        RateLimited(exception, exception.retryAfterMilliseconds.get())
+      } else {
+        AttemptsExhausted(exception)
+      }
+    }
+  }
+
+  class Success(val numberChangeResult: ChangeNumberRepository.NumberChangeResult) : ChangeNumberResult(null)
+  class IncorrectRecoveryPassword(cause: Throwable) : ChangeNumberResult(cause)
+  class AuthorizationFailed(cause: Throwable) : ChangeNumberResult(cause)
+  class MalformedRequest(cause: Throwable) : ChangeNumberResult(cause)
+  class ValidationError(cause: Throwable) : ChangeNumberResult(cause)
+  class RateLimited(cause: Throwable, val timeRemaining: Long) : ChangeNumberResult(cause)
+  class AttemptsExhausted(cause: Throwable) : ChangeNumberResult(cause)
+  class RegistrationLocked(cause: Throwable, val timeRemaining: Long, val svr2Credentials: AuthCredentials?, val svr3Credentials: Svr3Credentials?) : ChangeNumberResult(cause)
+  class UnknownError(cause: Throwable) : ChangeNumberResult(cause)
+
+  class SvrNoData(cause: SvrNoDataException) : ChangeNumberResult(cause)
+  class SvrWrongPin(cause: SvrWrongPinException) : ChangeNumberResult(cause) {
+    val triesRemaining = cause.triesRemaining
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberState.kt
new file mode 100644
index 0000000000..0ef529aaa2
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberState.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.changenumber
+
+import org.thoughtcrime.securesms.registration.data.network.Challenge
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult
+import org.thoughtcrime.securesms.registration.viewmodel.NumberViewState
+import org.whispersystems.signalservice.api.svr.Svr3Credentials
+import org.whispersystems.signalservice.internal.push.AuthCredentials
+
+/**
+ * State holder for [ChangeNumberViewModel]
+ */
+data class ChangeNumberState(
+  val number: NumberViewState = NumberViewState.INITIAL,
+  val enteredCode: String? = null,
+  val enteredPin: String = "",
+  val oldPhoneNumber: NumberViewState = NumberViewState.INITIAL,
+  val sessionId: String? = null,
+  val changeNumberOutcome: ChangeNumberOutcome? = null,
+  val lockedTimeRemaining: Long = 0L,
+  val svr2Credentials: AuthCredentials? = null,
+  val svr3Credentials: Svr3Credentials? = null,
+  val svrTriesRemaining: Int = 10,
+  val incorrectCodeAttempts: Int = 0,
+  val nextSmsTimestamp: Long = 0L,
+  val nextCallTimestamp: Long = 0L,
+  val inProgress: Boolean = false,
+  val captchaToken: String? = null,
+  val challengesRequested: List<Challenge> = emptyList(),
+  val challengesPresented: Set<Challenge> = emptySet(),
+  val allowedToRequestCode: Boolean = false
+) {
+  val challengesRemaining: List<Challenge> = challengesRequested.filterNot { it in challengesPresented }
+}
+
+sealed interface ChangeNumberOutcome {
+  data object RecoveryPasswordWorked : ChangeNumberOutcome
+  data object VerificationCodeWorked : ChangeNumberOutcome
+  class ChangeNumberRequestOutcome(val result: VerificationCodeRequestResult) : ChangeNumberOutcome
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberUtil.kt
index 6e3bb010f0..6929cd05b9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberUtil.kt
@@ -1,37 +1,12 @@
 package org.thoughtcrime.securesms.components.settings.app.changenumber
 
-import android.os.Bundle
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.fragment.NavHostFragment
-import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
-import org.thoughtcrime.securesms.registration.fragments.CaptchaFragment
-import org.thoughtcrime.securesms.registration.viewmodel.BaseRegistrationViewModel
 
 /**
  * Helpers for various aspects of the change number flow.
  */
 object ChangeNumberUtil {
-  @JvmStatic
-  fun getViewModel(fragment: Fragment): ChangeNumberViewModel {
-    val navController = NavHostFragment.findNavController(fragment)
-    return ViewModelProvider(
-      navController.getViewModelStoreOwner(R.id.app_settings_change_number),
-      ChangeNumberViewModel.Factory(navController.getBackStackEntry(R.id.app_settings_change_number))
-    ).get(ChangeNumberViewModel::class.java)
-  }
-
-  fun getCaptchaArguments(): Bundle {
-    return Bundle().apply {
-      putSerializable(
-        CaptchaFragment.EXTRA_VIEW_MODEL_PROVIDER,
-        object : CaptchaFragment.CaptchaViewModelProvider {
-          override fun get(fragment: CaptchaFragment): BaseRegistrationViewModel = getViewModel(fragment)
-        }
-      )
-    }
-  }
 
   fun Fragment.changeNumberSuccess() {
     requireActivity().finish()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberVerifyFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberVerifyFragment.kt
index 7b74607152..1b0332830f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberVerifyFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberVerifyFragment.kt
@@ -1,109 +1,148 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 package org.thoughtcrime.securesms.components.settings.app.changenumber
 
-import android.content.Context
-import android.content.DialogInterface.OnClickListener
 import android.os.Bundle
 import android.view.View
 import android.widget.TextView
-import android.widget.Toast
 import androidx.annotation.StringRes
 import androidx.appcompat.widget.Toolbar
+import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Single
-import org.signal.core.util.concurrent.LifecycleDisposable
+import org.signal.core.util.isNotNullOrBlank
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.changeNumberSuccess
-import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.getCaptchaArguments
-import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.getViewModel
-import org.thoughtcrime.securesms.registration.RegistrationSessionProcessor
-import org.thoughtcrime.securesms.registration.VerifyAccountRepository
-import org.thoughtcrime.securesms.util.dualsim.MccMncProducer
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository
+import org.thoughtcrime.securesms.registration.data.network.Challenge
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
-private val TAG: String = Log.tag(ChangeNumberVerifyFragment::class.java)
-
+/**
+ * Screen to show while the change number is in-progress.
+ */
 class ChangeNumberVerifyFragment : LoggingFragment(R.layout.fragment_change_phone_number_verify) {
-  private lateinit var viewModel: ChangeNumberViewModel
-
-  private var requestingCaptcha: Boolean = false
-
-  private val lifecycleDisposable: LifecycleDisposable = LifecycleDisposable()
 
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    lifecycleDisposable.bindTo(lifecycle)
-    viewModel = getViewModel(this)
+  companion object {
+    private val TAG: String = Log.tag(ChangeNumberVerifyFragment::class.java)
   }
 
+  private val viewModel by activityViewModels<ChangeNumberViewModel>()
+  private var dialogVisible: Boolean = false
+
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     val toolbar: Toolbar = view.findViewById(R.id.toolbar)
     toolbar.setTitle(R.string.ChangeNumberVerifyFragment__change_number)
-    toolbar.setNavigationOnClickListener { findNavController().navigateUp() }
+    toolbar.setNavigationOnClickListener {
+      findNavController().navigateUp()
+      viewModel.resetLocalSessionState()
+    }
 
     val status: TextView = view.findViewById(R.id.change_phone_number_verify_status)
     status.text = getString(R.string.ChangeNumberVerifyFragment__verifying_s, viewModel.number.fullFormattedNumber)
 
-    if (!requestingCaptcha || viewModel.hasCaptchaToken()) {
-      requestCode()
-    } else {
-      Log.d(TAG, "Captcha required.")
-      Toast.makeText(requireContext(), R.string.ChangeNumberVerifyFragment__captcha_required, Toast.LENGTH_SHORT).show()
-      findNavController().navigateUp()
+    viewModel.uiState.observe(viewLifecycleOwner, ::onStateUpdate)
+
+    requestCode()
+  }
+
+  private fun onStateUpdate(state: ChangeNumberState) {
+    if (state.challengesRequested.contains(Challenge.CAPTCHA) && state.captchaToken.isNotNullOrBlank()) {
+      viewModel.submitCaptchaToken(requireContext())
+    } else if (state.challengesRemaining.isNotEmpty()) {
+      handleChallenges(state.challengesRemaining)
+    } else if (state.changeNumberOutcome != null) {
+      handleRequestCodeResult(state.changeNumberOutcome)
+    } else if (!state.inProgress) {
+      Log.d(TAG, "Not in progress, navigating up.")
+      if (state.allowedToRequestCode) {
+        requestCode()
+      } else if (!dialogVisible) {
+        showErrorDialog(R.string.RegistrationActivity_unable_to_request_verification_code)
+      }
     }
   }
 
   private fun requestCode() {
-    val mode = if (ChangeNumberVerifyFragmentArgs.fromBundle(requireArguments()).smsListenerEnabled) VerifyAccountRepository.Mode.SMS_WITH_LISTENER else VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER
-    val mccMncProducer = MccMncProducer(requireContext())
-    lifecycleDisposable += viewModel
-      .ensureDecryptionsDrained()
-      .onErrorComplete()
-      .andThen(viewModel.changeNumberWithRecoveryPassword())
-      .flatMap { changed ->
-        if (changed) {
-          Log.d(TAG, "Successfully changed number using recovery password.")
-          Single.just(RequestCodeResult.RecoveryPasswordWorked)
-        } else {
-          viewModel.requestVerificationCode(mode, mccMncProducer.mcc, mccMncProducer.mnc)
-            .map { p -> RequestCodeResult.RequestedVerificationCode(p) }
-        }
+    val mode = if (ChangeNumberVerifyFragmentArgs.fromBundle(requireArguments()).smsListenerEnabled) RegistrationRepository.Mode.SMS_WITH_LISTENER else RegistrationRepository.Mode.SMS_WITHOUT_LISTENER
+    viewModel.initiateChangeNumberSession(requireContext(), mode)
+  }
+
+  private fun handleRequestCodeResult(changeNumberOutcome: ChangeNumberOutcome) {
+    Log.d(TAG, "Handling request code result: ${changeNumberOutcome.javaClass.name}")
+    when (changeNumberOutcome) {
+      is ChangeNumberOutcome.RecoveryPasswordWorked -> {
+        Log.i(TAG, "Successfully changed number with recovery password.")
+        changeNumberSuccess()
       }
-      .observeOn(AndroidSchedulers.mainThread())
-      .subscribe { result ->
-        if (result is RequestCodeResult.RecoveryPasswordWorked) {
-          changeNumberSuccess()
-          return@subscribe
-        }
 
-        val processor: RegistrationSessionProcessor = (result as RequestCodeResult.RequestedVerificationCode).processor
-
-        if (processor.verificationCodeRequestSuccess()) {
-          Log.i(TAG, "Successfully requested SMS code.")
-          findNavController().safeNavigate(R.id.action_changePhoneNumberVerifyFragment_to_changeNumberEnterCodeFragment)
-        } else if (processor.captchaRequired(viewModel.excludedChallenges)) {
-          Log.i(TAG, "Unable to request sms code due to captcha required")
-          findNavController().safeNavigate(R.id.action_changePhoneNumberVerifyFragment_to_captchaFragment, getCaptchaArguments())
-          requestingCaptcha = true
-        } else if (processor.rateLimit()) {
-          Log.i(TAG, "Unable to request sms code due to rate limit")
-          showErrorDialog(requireContext(), R.string.RegistrationActivity_rate_limited_to_service) { _, _ -> findNavController().navigateUp() }
-        } else {
-          Log.w(TAG, "Unable to request sms code", processor.error)
-          showErrorDialog(requireContext(), R.string.RegistrationActivity_unable_to_request_verification_code) { _, _ -> findNavController().navigateUp() }
+      is ChangeNumberOutcome.ChangeNumberRequestOutcome -> {
+        when (val castResult = changeNumberOutcome.result) {
+          is VerificationCodeRequestResult.Success -> {
+            Log.i(TAG, "Successfully requested SMS code.")
+            findNavController().safeNavigate(ChangeNumberVerifyFragmentDirections.actionChangePhoneNumberVerifyFragmentToChangeNumberEnterCodeFragment())
+          }
+
+          is VerificationCodeRequestResult.ChallengeRequired -> {
+            Log.i(TAG, "Unable to request sms code due to challenges required: ${castResult.challenges.joinToString { it.key }}")
+          }
+
+          is VerificationCodeRequestResult.RateLimited -> {
+            Log.i(TAG, "Unable to request sms code due to rate limit")
+            showErrorDialog(R.string.RegistrationActivity_rate_limited_to_service)
+          }
+
+          is VerificationCodeRequestResult.TokenNotAccepted -> {
+            Log.i(TAG, "Token was not accepted.")
+            showErrorDialog(R.string.RegistrationActivity_additional_verification_required)
+          }
+
+          else -> {
+            Log.w(TAG, "Unable to request sms code", castResult.getCause())
+            showErrorDialog(R.string.RegistrationActivity_unable_to_request_verification_code)
+          }
         }
       }
+
+      is ChangeNumberOutcome.VerificationCodeWorked -> {
+        Log.i(TAG, "Successfully changed number with verification code.")
+        changeNumberSuccess()
+      }
+    }
   }
 
-  private fun showErrorDialog(context: Context, @StringRes message: Int, onPositiveButtonClickListener: OnClickListener?) {
-    MaterialAlertDialogBuilder(context).setMessage(message).setPositiveButton(android.R.string.ok, onPositiveButtonClickListener).show()
+  private fun handleChallenges(remainingChallenges: List<Challenge>) {
+    Log.i(TAG, "Handling challenge(s): ${remainingChallenges.joinToString { it.key }}")
+    when (remainingChallenges.first()) {
+      Challenge.CAPTCHA -> {
+        findNavController().safeNavigate(ChangeNumberVerifyFragmentDirections.actionChangePhoneNumberVerifyFragmentToCaptchaFragment())
+      }
+
+      Challenge.PUSH -> {
+        viewModel.requestAndSubmitPushToken(requireContext())
+      }
+    }
   }
 
-  private sealed interface RequestCodeResult {
-    object RecoveryPasswordWorked : RequestCodeResult
-    class RequestedVerificationCode(val processor: RegistrationSessionProcessor) : RequestCodeResult
+  private fun showErrorDialog(@StringRes message: Int) {
+    if (dialogVisible) {
+      Log.i(TAG, "Dialog already being shown, failed to display dialog with message ${getString(message)}")
+      return
+    }
+
+    MaterialAlertDialogBuilder(requireContext()).apply {
+      setMessage(message)
+      setPositiveButton(android.R.string.ok) { _, _ ->
+        findNavController().navigateUp()
+        viewModel.resetLocalSessionState()
+      }
+      show()
+      dialogVisible = true
+    }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt
index ba752d8279..6b93cb5cdd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt
@@ -1,62 +1,82 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 package org.thoughtcrime.securesms.components.settings.app.changenumber
 
-import android.app.Application
-import androidx.annotation.WorkerThread
-import androidx.lifecycle.AbstractSavedStateViewModelFactory
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.SavedStateHandle
+import android.content.Context
 import androidx.lifecycle.ViewModel
-import androidx.savedstate.SavedStateRegistryOwner
+import androidx.lifecycle.asLiveData
+import androidx.lifecycle.viewModelScope
 import com.google.i18n.phonenumbers.NumberParseException
 import com.google.i18n.phonenumbers.PhoneNumberUtil
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Completable
-import io.reactivex.rxjava3.core.Single
-import io.reactivex.rxjava3.schedulers.Schedulers
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.registration.RegistrationSessionProcessor
+import org.thoughtcrime.securesms.registration.RegistrationData
 import org.thoughtcrime.securesms.registration.SmsRetrieverReceiver
-import org.thoughtcrime.securesms.registration.VerifyAccountRepository
-import org.thoughtcrime.securesms.registration.VerifyResponse
-import org.thoughtcrime.securesms.registration.VerifyResponseProcessor
-import org.thoughtcrime.securesms.registration.VerifyResponseWithRegistrationLockProcessor
-import org.thoughtcrime.securesms.registration.VerifyResponseWithoutKbs
-import org.thoughtcrime.securesms.registration.viewmodel.BaseRegistrationViewModel
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository
+import org.thoughtcrime.securesms.registration.data.network.Challenge
+import org.thoughtcrime.securesms.registration.data.network.RegistrationSessionCreationResult
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
 import org.thoughtcrime.securesms.registration.viewmodel.NumberViewState
 import org.thoughtcrime.securesms.registration.viewmodel.SvrAuthCredentialSet
-import org.thoughtcrime.securesms.util.DefaultValueLiveData
-import org.whispersystems.signalservice.api.push.ServiceId.PNI
-import org.whispersystems.signalservice.api.push.exceptions.IncorrectCodeException
-import org.whispersystems.signalservice.internal.ServiceResponse
-import java.util.Objects
-
-private val TAG: String = Log.tag(ChangeNumberViewModel::class.java)
+import org.thoughtcrime.securesms.util.dualsim.MccMncProducer
+import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse
+import java.io.IOException
+import java.util.concurrent.locks.ReentrantLock
+import kotlin.concurrent.withLock
+
+/**
+ * [ViewModel] for the change number flow.
+ *
+ * @see [RegistrationViewModel], from which this is derived.
+ */
+class ChangeNumberViewModel : ViewModel() {
+
+  companion object {
+    private val TAG = Log.tag(ChangeNumberViewModel::class.java)
+
+    val CHANGE_NUMBER_LOCK = ReentrantLock()
+  }
 
-class ChangeNumberViewModel(
-  private val localNumber: String,
-  private val changeNumberRepository: ChangeNumberRepository,
-  savedState: SavedStateHandle,
-  password: String,
-  verifyAccountRepository: VerifyAccountRepository,
-  private val smsRetrieverReceiver: SmsRetrieverReceiver = SmsRetrieverReceiver(ApplicationDependencies.getApplication())
-) : BaseRegistrationViewModel(savedState, verifyAccountRepository, password) {
+  private val repository = ChangeNumberRepository()
+  private val store = MutableStateFlow(ChangeNumberState())
+  private val serialContext = SignalExecutors.SERIAL.asCoroutineDispatcher()
+  private val smsRetrieverReceiver: SmsRetrieverReceiver = SmsRetrieverReceiver(AppDependencies.application)
 
-  var oldNumberState: NumberViewState = NumberViewState.Builder().build()
-    private set
+  private val initialLocalNumber = SignalStore.account.e164
+  private val password = SignalStore.account.servicePassword!!
 
-  private val liveOldNumberState = DefaultValueLiveData(oldNumberState)
-  private val liveNewNumberState = DefaultValueLiveData(number)
+  val uiState = store.asLiveData()
+  val liveOldNumberState = store.map { it.oldPhoneNumber }.asLiveData()
+  val liveNewNumberState = store.map { it.number }.asLiveData()
+  val liveLockedTimeRemaining = store.map { it.lockedTimeRemaining }.asLiveData()
+  val incorrectCodeAttempts = store.map { it.incorrectCodeAttempts }.asLiveData()
 
   init {
     try {
       val countryCode: Int = PhoneNumberUtil.getInstance()
-        .parse(localNumber, null)
+        .parse(SignalStore.account.e164!!, null)
         .countryCode
 
-      setOldCountry(countryCode)
-      setNewCountry(countryCode)
+      store.update {
+        it.copy(
+          number = it.number.toBuilder().countryCode(countryCode).build(),
+          oldPhoneNumber = it.oldPhoneNumber.toBuilder().countryCode(countryCode).build()
+        )
+      }
     } catch (e: NumberParseException) {
       Log.i(TAG, "Unable to parse number for default country code")
     }
@@ -69,45 +89,83 @@ class ChangeNumberViewModel(
     smsRetrieverReceiver.unregisterReceiver()
   }
 
-  fun getLiveOldNumber(): LiveData<NumberViewState> {
-    return liveOldNumberState
+  // region Public Getters and Setters
+
+  val number: NumberViewState
+    get() = store.value.number
+
+  val oldNumberState: NumberViewState
+    get() = store.value.oldPhoneNumber
+
+  val svrTriesRemaining: Int
+    get() = store.value.svrTriesRemaining
+
+  fun setOldNationalNumber(updatedNumber: String) {
+    store.update {
+      it.copy(oldPhoneNumber = oldNumberState.toBuilder().nationalNumber(updatedNumber).build())
+    }
   }
 
-  fun getLiveNewNumber(): LiveData<NumberViewState> {
-    return liveNewNumberState
+  fun setOldCountry(countryCode: Int, country: String? = null) {
+    store.update {
+      it.copy(oldPhoneNumber = oldNumberState.toBuilder().selectedCountryDisplayName(country).countryCode(countryCode).build())
+    }
   }
 
-  fun setOldNationalNumber(number: String) {
-    oldNumberState = oldNumberState.toBuilder()
-      .nationalNumber(number)
-      .build()
+  fun setNewNationalNumber(updatedNumber: String) {
+    store.update {
+      it.copy(number = number.toBuilder().nationalNumber(updatedNumber).build())
+    }
+  }
 
-    liveOldNumberState.value = oldNumberState
+  fun setNewCountry(countryCode: Int, country: String? = null) {
+    store.update {
+      it.copy(number = number.toBuilder().selectedCountryDisplayName(country).countryCode(countryCode).build())
+    }
   }
 
-  fun setOldCountry(countryCode: Int, country: String? = null) {
-    oldNumberState = oldNumberState.toBuilder()
-      .selectedCountryDisplayName(country)
-      .countryCode(countryCode)
-      .build()
+  fun setCaptchaResponse(token: String) {
+    Log.v(TAG, "setCaptchaResponse()")
+    store.update {
+      it.copy(captchaToken = token)
+    }
+  }
 
-    liveOldNumberState.value = oldNumberState
+  fun setEnteredPin(pin: String) {
+    store.update {
+      it.copy(enteredPin = pin)
+    }
   }
 
-  fun setNewNationalNumber(number: String) {
-    setNationalNumber(number)
+  fun incrementIncorrectCodeAttempts() {
+    store.update {
+      it.copy(incorrectCodeAttempts = it.incorrectCodeAttempts + 1)
+    }
+  }
 
-    liveNewNumberState.value = this.number
+  fun addPresentedChallenge(challenge: Challenge) {
+    Log.v(TAG, "addPresentedChallenge()")
+    store.update {
+      it.copy(challengesPresented = it.challengesPresented.plus(challenge))
+    }
   }
 
-  fun setNewCountry(countryCode: Int, country: String? = null) {
-    onCountrySelected(country, countryCode)
+  fun removePresentedChallenge(challenge: Challenge) {
+    Log.v(TAG, "addPresentedChallenge()")
+    store.update {
+      it.copy(challengesPresented = it.challengesPresented.minus(challenge))
+    }
+  }
 
-    liveNewNumberState.value = this.number
+  fun resetLocalSessionState() {
+    Log.v(TAG, "resetLocalSessionState()")
+    store.update {
+      it.copy(inProgress = false, changeNumberOutcome = null, captchaToken = null, challengesRequested = emptyList(), allowedToRequestCode = false)
+    }
   }
 
   fun canContinue(): ContinueStatus {
-    return if (oldNumberState.e164Number == localNumber) {
+    return if (oldNumberState.e164Number == initialLocalNumber) {
       if (number.isValid) {
         ContinueStatus.CAN_CONTINUE
       } else {
@@ -118,129 +176,378 @@ class ChangeNumberViewModel(
     }
   }
 
-  fun ensureDecryptionsDrained(): Completable {
-    return changeNumberRepository.ensureDecryptionsDrained()
+  // endregion
+
+  // region Public actions
+
+  fun checkWhoAmI(onSuccess: () -> Unit, onError: (Throwable) -> Unit) {
+    Log.v(TAG, "checkWhoAmI()")
+    viewModelScope.launch(Dispatchers.IO) {
+      try {
+        val whoAmI = repository.whoAmI()
+
+        if (whoAmI.number == SignalStore.account.e164) {
+          return@launch bail { Log.i(TAG, "Local and remote numbers match, nothing needs to be done.") }
+        }
+
+        Log.i(TAG, "Local (${SignalStore.account.e164}) and remote (${whoAmI.number}) numbers do not match, updating local.")
+
+        withLockOnSerialExecutor {
+          repository.changeLocalNumber(whoAmI.number, ServiceId.PNI.parseOrThrow(whoAmI.pni))
+        }
+
+        withContext(Dispatchers.Main) {
+          onSuccess()
+        }
+      } catch (ioException: IOException) {
+        Log.w(TAG, "Encountered an exception when requesting whoAmI()", ioException)
+        withContext(Dispatchers.Main) {
+          onError(ioException)
+        }
+      }
+    }
   }
 
-  override fun verifyCodeWithoutRegistrationLock(code: String): Single<VerifyResponseProcessor> {
-    return super.verifyCodeWithoutRegistrationLock(code)
-      .compose(ChangeNumberRepository::acquireReleaseChangeNumberLock)
-      .flatMap(this::attemptToUnlockChangeNumber)
+  fun registerSmsListenerWithCompletionListener(context: Context, onComplete: (Boolean) -> Unit) {
+    Log.v(TAG, "registerSmsListenerWithCompletionListener()")
+    viewModelScope.launch {
+      val listenerRegistered = RegistrationRepository.registerSmsListener(context)
+      onComplete(listenerRegistered)
+    }
   }
 
-  override fun verifyCodeAndRegisterAccountWithRegistrationLock(pin: String): Single<VerifyResponseWithRegistrationLockProcessor> {
-    return super.verifyCodeAndRegisterAccountWithRegistrationLock(pin)
-      .compose(ChangeNumberRepository::acquireReleaseChangeNumberLock)
-      .flatMap(this::attemptToUnlockChangeNumber)
+  fun verifyCodeWithoutRegistrationLock(context: Context, code: String, verificationErrorHandler: (VerificationCodeRequestResult) -> Unit, numberChangeErrorHandler: (ChangeNumberResult) -> Unit) {
+    Log.v(TAG, "verifyCodeWithoutRegistrationLock()")
+    store.update {
+      it.copy(
+        inProgress = true,
+        enteredCode = code
+      )
+    }
+
+    viewModelScope.launch {
+      verifyCodeInternal(context = context, pin = null, verificationErrorHandler = verificationErrorHandler, numberChangeErrorHandler = numberChangeErrorHandler)
+    }
+  }
+
+  fun verifyCodeAndRegisterAccountWithRegistrationLock(context: Context, pin: String, verificationErrorHandler: (VerificationCodeRequestResult) -> Unit, numberChangeErrorHandler: (ChangeNumberResult) -> Unit) {
+    Log.v(TAG, "verifyCodeAndRegisterAccountWithRegistrationLock()")
+    store.update { it.copy(inProgress = true) }
+
+    viewModelScope.launch {
+      verifyCodeInternal(context = context, pin = pin, verificationErrorHandler = verificationErrorHandler, numberChangeErrorHandler = numberChangeErrorHandler)
+    }
   }
 
-  private fun <T : VerifyResponseProcessor> attemptToUnlockChangeNumber(processor: T): Single<T> {
-    return if (processor.hasResult() || processor.isServerSentError()) {
-      SignalStore.misc().unlockChangeNumber()
-      SignalStore.misc().clearPendingChangeNumberMetadata()
-      Single.just(processor)
+  private suspend fun verifyCodeInternal(context: Context, pin: String?, verificationErrorHandler: (VerificationCodeRequestResult) -> Unit, numberChangeErrorHandler: (ChangeNumberResult) -> Unit) {
+    val sessionId = getOrCreateValidSession(context)?.body?.id ?: return bail { Log.i(TAG, "Bailing from code verification due to invalid session.") }
+    val registrationData = getRegistrationData(context)
+
+    val verificationResponse = RegistrationRepository.submitVerificationCode(context, sessionId, registrationData)
+
+    if (verificationResponse !is VerificationCodeRequestResult.Success && verificationResponse !is VerificationCodeRequestResult.AlreadyVerified) {
+      handleVerificationError(verificationResponse, verificationErrorHandler)
+      return bail { Log.i(TAG, "Bailing from code verification due to non-successful response.") }
+    }
+
+    val result: ChangeNumberResult = if (pin == null) {
+      repository.changeNumberWithoutRegistrationLock(sessionId = sessionId, newE164 = number.e164Number)
     } else {
-      changeNumberRepository.whoAmI()
-        .map { whoAmI ->
-          if (Objects.equals(whoAmI.number, localNumber)) {
-            Log.i(TAG, "Local and remote numbers match, we can unlock.")
-            SignalStore.misc().unlockChangeNumber()
-            SignalStore.misc().clearPendingChangeNumberMetadata()
-          }
-          processor
-        }
-        .onErrorReturn { processor }
+      repository.changeNumberWithRegistrationLock(
+        sessionId = sessionId,
+        newE164 = number.e164Number,
+        pin = pin,
+        svrAuthCredentials = SvrAuthCredentialSet(
+          svr2Credentials = store.value.svr2Credentials,
+          svr3Credentials = store.value.svr3Credentials
+        )
+      )
+    }
+
+    if (result is ChangeNumberResult.Success) {
+      handleSuccessfulChangedRemoteNumber(e164 = result.numberChangeResult.number, pni = ServiceId.PNI.parseOrThrow(result.numberChangeResult.pni), changeNumberOutcome = ChangeNumberOutcome.RecoveryPasswordWorked)
+    } else {
+      handleChangeNumberError(result, numberChangeErrorHandler)
     }
   }
 
-  override fun verifyAccountWithoutRegistrationLock(): Single<ServiceResponse<VerifyResponse>> {
-    val sessionId = sessionId ?: throw IllegalStateException("No valid registration session")
+  fun submitCaptchaToken(context: Context) {
+    Log.v(TAG, "submitCaptchaToken()")
+    val e164 = number.e164Number
+    val captchaToken = store.value.captchaToken ?: throw IllegalStateException("Can't submit captcha token if no captcha token is set!")
+    store.update {
+      it.copy(
+        captchaToken = null,
+        inProgress = true,
+        changeNumberOutcome = null
+      )
+    }
 
-    return changeNumberRepository.verifyAccount(sessionId, textCodeEntered)
-      .map { RegistrationSessionProcessor.RegistrationSessionProcessorForVerification(it) }
-      .observeOn(AndroidSchedulers.mainThread())
-      .doOnSuccess {
-        if (it.hasResult()) {
-          setCanSmsAtTime(it.getNextCodeViaSmsAttempt())
-          setCanCallAtTime(it.getNextCodeViaCallAttempt())
+    viewModelScope.launch {
+      Log.d(TAG, "Getting session in order to submit captcha token…")
+      val session = getOrCreateValidSession(context) ?: return@launch bail { Log.i(TAG, "Bailing captcha token submission due to invalid session.") }
+      if (!Challenge.parse(session.body.requestedInformation).contains(Challenge.CAPTCHA)) {
+        Log.d(TAG, "Captcha submission no longer necessary, bailing.")
+        store.update {
+          it.copy(
+            inProgress = false,
+            changeNumberOutcome = null
+          )
         }
+        return@launch
       }
-      .observeOn(Schedulers.io())
-      .flatMap { processor ->
-        if (processor.isAlreadyVerified() || processor.hasResult() && processor.isVerified()) {
-          changeNumberRepository.changeNumber(sessionId = sessionId, newE164 = number.e164Number)
-        } else if (processor.error == null) {
-          Single.just<ServiceResponse<VerifyResponse>>(ServiceResponse.forApplicationError(IncorrectCodeException(), 403, null))
-        } else {
-          Single.just<ServiceResponse<VerifyResponse>>(ServiceResponse.coerceError(processor.response))
+      Log.d(TAG, "Submitting captcha token…")
+      val captchaSubmissionResult = RegistrationRepository.submitCaptchaToken(context, e164, password, session.body.id, captchaToken)
+      Log.d(TAG, "Captcha token submitted.")
+      store.update {
+        it.copy(inProgress = false, changeNumberOutcome = ChangeNumberOutcome.ChangeNumberRequestOutcome(captchaSubmissionResult))
+      }
+    }
+  }
+
+  fun requestAndSubmitPushToken(context: Context) {
+    Log.v(TAG, "validatePushToken()")
+
+    addPresentedChallenge(Challenge.PUSH)
+
+    val e164 = number.e164Number
+
+    viewModelScope.launch {
+      Log.d(TAG, "Getting session in order to perform push token verification…")
+      val session = getOrCreateValidSession(context) ?: return@launch bail { Log.i(TAG, "Bailing from push token verification due to invalid session.") }
+
+      if (!Challenge.parse(session.body.requestedInformation).contains(Challenge.PUSH)) {
+        Log.d(TAG, "Push submission no longer necessary, bailing.")
+        store.update {
+          it.copy(
+            inProgress = false,
+            changeNumberOutcome = null
+          )
         }
+        return@launch
+      }
+
+      Log.d(TAG, "Requesting push challenge token…")
+      val pushSubmissionResult = RegistrationRepository.requestAndVerifyPushToken(context, session.body.id, e164, password)
+      Log.d(TAG, "Push challenge token submitted.")
+      store.update {
+        it.copy(inProgress = false, changeNumberOutcome = ChangeNumberOutcome.ChangeNumberRequestOutcome(pushSubmissionResult))
       }
+    }
   }
 
-  override fun verifyAccountWithRegistrationLock(pin: String, svrAuthCredentials: SvrAuthCredentialSet): Single<ServiceResponse<VerifyResponse>> {
-    val sessionId = sessionId ?: throw IllegalStateException("No valid registration session")
-    return changeNumberRepository.changeNumber(sessionId, number.e164Number, pin, svrAuthCredentials)
+  fun initiateChangeNumberSession(context: Context, mode: RegistrationRepository.Mode) {
+    Log.v(TAG, "changeNumber()")
+    store.update { it.copy(inProgress = true) }
+    viewModelScope.launch {
+      val encryptionDrained = repository.ensureDecryptionsDrained() ?: false
+
+      if (!encryptionDrained) {
+        return@launch bail { Log.i(TAG, "Failed to drain encryption.") }
+      }
+
+      val changed = changeNumberWithRecoveryPassword()
+
+      if (changed) {
+        Log.d(TAG, "Successfully changed number using recovery password, which cleaned up after itself.")
+        return@launch
+      }
+
+      requestVerificationCode(context, mode)
+    }
   }
 
-  @WorkerThread
-  override fun onVerifySuccess(processor: VerifyResponseProcessor): Single<VerifyResponseProcessor> {
-    return changeNumberRepository.changeLocalNumber(number.e164Number, PNI.parseOrThrow(processor.result.verifyAccountResponse.pni))
-      .map { processor }
-      .onErrorReturn { t ->
-        Log.w(TAG, "Error attempting to change local number", t)
-        VerifyResponseWithoutKbs(ServiceResponse.forUnknownError(t))
+  // endregion
+
+  // region Private actions
+
+  private fun updateLocalStateFromSession(response: RegistrationSessionMetadataResponse) {
+    Log.v(TAG, "updateLocalStateFromSession()")
+    store.update {
+      it.copy(sessionId = response.body.id, challengesRequested = Challenge.parse(response.body.requestedInformation), allowedToRequestCode = response.body.allowedToRequestCode)
+    }
+  }
+
+  private suspend fun getOrCreateValidSession(context: Context): RegistrationSessionMetadataResponse? {
+    Log.v(TAG, "getOrCreateValidSession()")
+    val e164 = number.e164Number
+    val mccMncProducer = MccMncProducer(context)
+    val existingSessionId = store.value.sessionId
+    return RegistrationViewModel.getOrCreateValidSession(context = context, existingSessionId = existingSessionId, e164 = e164, password = password, mcc = mccMncProducer.mcc, mnc = mccMncProducer.mnc, successListener = { freshMetadata ->
+      Log.v(TAG, "Valid session received, updating local state.")
+      updateLocalStateFromSession(freshMetadata)
+    }, errorHandler = { result ->
+      val requestCode: VerificationCodeRequestResult = when (result) {
+        is RegistrationSessionCreationResult.RateLimited -> VerificationCodeRequestResult.RateLimited(result.getCause(), result.timeRemaining)
+        is RegistrationSessionCreationResult.MalformedRequest -> VerificationCodeRequestResult.MalformedRequest(result.getCause())
+        else -> VerificationCodeRequestResult.UnknownError(result.getCause())
       }
+
+      store.update {
+        it.copy(changeNumberOutcome = ChangeNumberOutcome.ChangeNumberRequestOutcome(requestCode))
+      }
+    })
   }
 
-  override fun onVerifySuccessWithRegistrationLock(processor: VerifyResponseWithRegistrationLockProcessor, pin: String): Single<VerifyResponseWithRegistrationLockProcessor> {
-    return changeNumberRepository.changeLocalNumber(number.e164Number, PNI.parseOrThrow(processor.result.verifyAccountResponse.pni))
-      .map { processor }
-      .onErrorReturn { t ->
-        Log.w(TAG, "Error attempting to change local number", t)
-        VerifyResponseWithRegistrationLockProcessor(ServiceResponse.forUnknownError(t), processor.svrAuthCredentials)
+  private suspend fun changeNumberWithRecoveryPassword(): Boolean {
+    Log.v(TAG, "changeNumberWithRecoveryPassword()")
+    SignalStore.svr.recoveryPassword?.let { recoveryPassword ->
+      if (SignalStore.svr.hasPin()) {
+        val result = repository.changeNumberWithRecoveryPassword(recoveryPassword = recoveryPassword, newE164 = number.e164Number)
+
+        if (result is ChangeNumberResult.Success) {
+          handleSuccessfulChangedRemoteNumber(e164 = result.numberChangeResult.number, pni = ServiceId.PNI.parseOrThrow(result.numberChangeResult.pni), changeNumberOutcome = ChangeNumberOutcome.RecoveryPasswordWorked)
+          return true
+        }
+
+        Log.d(TAG, "Encountered error while trying to change number with recovery password.", result.getCause())
       }
+    }
+    return false
   }
 
-  fun changeNumberWithRecoveryPassword(): Single<Boolean> {
-    val recoveryPassword = SignalStore.svr().recoveryPassword
+  private suspend fun handleSuccessfulChangedRemoteNumber(e164: String, pni: ServiceId.PNI, changeNumberOutcome: ChangeNumberOutcome) {
+    var result = changeNumberOutcome
+    Log.v(TAG, "handleSuccessfulChangedRemoteNumber(${result.javaClass.simpleName}")
+    try {
+      withLockOnSerialExecutor {
+        repository.changeLocalNumber(e164, pni)
+      }
+    } catch (ioException: IOException) {
+      Log.w(TAG, "Failed to change local number!", ioException)
+      result = ChangeNumberOutcome.ChangeNumberRequestOutcome(VerificationCodeRequestResult.UnknownError(ioException))
+    }
 
-    return if (SignalStore.svr().hasPin() && recoveryPassword != null) {
-      changeNumberRepository.changeNumber(recoveryPassword = recoveryPassword, newE164 = number.e164Number)
-        .map { r -> VerifyResponseWithoutKbs(r) }
-        .flatMap { p ->
-          if (p.hasResult()) {
-            onVerifySuccess(p).map { true }
-          } else {
-            Single.just(false)
-          }
+    store.update {
+      it.copy(inProgress = false, changeNumberOutcome = result)
+    }
+  }
+
+  private fun handleVerificationError(result: VerificationCodeRequestResult, verificationErrorHandler: (VerificationCodeRequestResult) -> Unit) {
+    Log.v(TAG, "handleVerificationError(${result.javaClass.simpleName}")
+    when (result) {
+      is VerificationCodeRequestResult.Success -> Unit
+      is VerificationCodeRequestResult.RegistrationLocked ->
+        store.update {
+          it.copy(
+            svr2Credentials = result.svr2Credentials,
+            svr3Credentials = result.svr3Credentials
+          )
+        }
+      else -> Log.i(TAG, "Received exception during verification.", result.getCause())
+    }
+
+    verificationErrorHandler(result)
+  }
+
+  private fun handleChangeNumberError(result: ChangeNumberResult, numberChangeErrorHandler: (ChangeNumberResult) -> Unit) {
+    Log.v(TAG, "handleChangeNumberError(${result.javaClass.simpleName}")
+    when (result) {
+      is ChangeNumberResult.Success -> Unit
+      is ChangeNumberResult.RegistrationLocked ->
+        store.update {
+          it.copy(
+            svr2Credentials = result.svr2Credentials,
+            svr3Credentials = result.svr3Credentials
+          )
         }
+      is ChangeNumberResult.SvrWrongPin -> {
+        store.update {
+          it.copy(
+            svrTriesRemaining = result.triesRemaining
+          )
+        }
+      }
+      else -> Log.i(TAG, "Received exception during change number.", result.getCause())
+    }
+
+    numberChangeErrorHandler(result)
+  }
+
+  private suspend fun requestVerificationCode(context: Context, mode: RegistrationRepository.Mode) {
+    Log.v(TAG, "requestVerificationCode()")
+    val e164 = number.e164Number
+
+    val validSession = getOrCreateValidSession(context)
+
+    if (validSession == null) {
+      Log.w(TAG, "Bailing on requesting verification code because could not create a session!")
+      resetLocalSessionState()
+      return
+    }
+
+    val result = if (!validSession.body.allowedToRequestCode) {
+      val challenges = validSession.body.requestedInformation.joinToString()
+      Log.i(TAG, "Not allowed to request code! Remaining challenges: $challenges")
+      VerificationCodeRequestResult.ChallengeRequired(Challenge.parse(validSession.body.requestedInformation))
+    } else {
+      store.update {
+        it.copy(changeNumberOutcome = null, challengesRequested = emptyList())
+      }
+      val response = RegistrationRepository.requestSmsCode(context = context, sessionId = validSession.body.id, e164 = e164, password = password, mode = mode)
+      Log.d(TAG, "SMS code request submitted")
+      response
+    }
+
+    val challengesRequested = if (result is VerificationCodeRequestResult.ChallengeRequired) {
+      result.challenges
     } else {
-      Single.just(false)
+      emptyList()
+    }
+
+    Log.d(TAG, "Received result: ${result.javaClass.canonicalName}\nwith challenges: ${challengesRequested.joinToString { it.key }}")
+
+    store.update {
+      it.copy(changeNumberOutcome = ChangeNumberOutcome.ChangeNumberRequestOutcome(result), challengesRequested = challengesRequested, inProgress = false)
     }
   }
 
-  class Factory(owner: SavedStateRegistryOwner) : AbstractSavedStateViewModelFactory(owner, null) {
+  private suspend fun getRegistrationData(context: Context): RegistrationData {
+    val currentState = store.value
+    val code = currentState.enteredCode ?: throw IllegalStateException("Can't construct registration data without entered code!")
+    val e164: String = number.e164Number ?: throw IllegalStateException("Can't construct registration data without E164!")
+    val recoveryPassword = if (currentState.sessionId == null) SignalStore.svr.getRecoveryPassword() else null
+    val fcmToken = RegistrationRepository.getFcmToken(context)
+    return RegistrationData(code, e164, password, RegistrationRepository.getRegistrationId(), RegistrationRepository.getProfileKey(e164), fcmToken, RegistrationRepository.getPniRegistrationId(), recoveryPassword)
+  }
 
-    override fun <T : ViewModel> create(key: String, modelClass: Class<T>, handle: SavedStateHandle): T {
-      val context: Application = ApplicationDependencies.getApplication()
-      val localNumber: String = SignalStore.account().e164!!
-      val password: String = SignalStore.account().servicePassword!!
+  // endregion
 
-      val viewModel = ChangeNumberViewModel(
-        localNumber = localNumber,
-        changeNumberRepository = ChangeNumberRepository(),
-        savedState = handle,
-        password = password,
-        verifyAccountRepository = VerifyAccountRepository(context)
-      )
+  // region Utility Functions
 
-      return requireNotNull(modelClass.cast(viewModel))
+  /**
+   * Used for early returns in order to end the in-progress visual state, as well as print a log message explaining what happened.
+   *
+   * @param logMessage Logging code is wrapped in lambda so that our automated tools detect the various [Log] calls with their accompanying messages.
+   */
+  private fun bail(logMessage: () -> Unit) {
+    logMessage()
+    store.update {
+      it.copy(inProgress = false)
     }
   }
 
+  /**
+   * Anything that runs through this will be run serially, with locks.
+   */
+  private suspend fun <T> withLockOnSerialExecutor(action: () -> T): T = withContext(serialContext) {
+    Log.v(TAG, "withLock()")
+    val result = CHANGE_NUMBER_LOCK.withLock {
+      SignalStore.misc.lockChangeNumber()
+      Log.v(TAG, "Change number lock acquired.")
+      try {
+        action()
+      } finally {
+        SignalStore.misc.unlockChangeNumber()
+      }
+    }
+    Log.v(TAG, "Change number lock released.")
+    return@withContext result
+  }
+
+  // endregion
+
   enum class ContinueStatus {
-    CAN_CONTINUE,
-    INVALID_NUMBER,
-    OLD_NUMBER_DOESNT_MATCH
+    CAN_CONTINUE, INVALID_NUMBER, OLD_NUMBER_DOESNT_MATCH
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt
index f67762179b..2cf39c5aff 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt
@@ -1,16 +1,16 @@
 package org.thoughtcrime.securesms.components.settings.app.chats
 
-import android.content.Intent
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.Navigation
+import org.signal.donations.InAppPaymentType
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsFlowActivity
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.CheckoutFlowActivity
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
@@ -37,7 +37,7 @@ class ChatsSettingsFragment : DSLSettingsFragment(R.string.preferences_chats__ch
         title = DSLSettingsText.from(R.string.preferences__generate_link_previews),
         summary = DSLSettingsText.from(R.string.preferences__retrieve_link_previews_from_websites_for_messages),
         isChecked = state.generateLinkPreviews,
-        isEnabled = SignalStore.account().isPrimaryDevice,
+        isEnabled = SignalStore.account.isPrimaryDevice,
         onClick = {
           viewModel.setGenerateLinkPreviewsEnabled(!state.generateLinkPreviews)
         }
@@ -85,7 +85,7 @@ class ChatsSettingsFragment : DSLSettingsFragment(R.string.preferences_chats__ch
 
       sectionHeaderPref(R.string.preferences_chats__backups)
 
-      if (FeatureFlags.messageBackups() || state.remoteBackupsEnabled) {
+      if (RemoteConfig.messageBackups || state.remoteBackupsEnabled) {
         clickPref(
           title = DSLSettingsText.from("Signal Backups"), // TODO [message-backups] -- Finalized copy
           summary = DSLSettingsText.from(if (state.remoteBackupsEnabled) R.string.arrays__enabled else R.string.arrays__disabled),
@@ -93,7 +93,7 @@ class ChatsSettingsFragment : DSLSettingsFragment(R.string.preferences_chats__ch
             if (state.remoteBackupsEnabled) {
               Navigation.findNavController(requireView()).safeNavigate(R.id.action_chatsSettingsFragment_to_remoteBackupsSettingsFragment)
             } else {
-              startActivity(Intent(requireContext(), MessageBackupsFlowActivity::class.java))
+              startActivity(CheckoutFlowActivity.createIntent(requireContext(), InAppPaymentType.RECURRING_BACKUP))
             }
           }
         )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsRepository.kt
index 3378ba14cc..abb424721e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsRepository.kt
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.components.settings.app.chats
 import android.content.Context
 import org.signal.core.util.concurrent.SignalExecutors
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -13,15 +13,15 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences
 
 class ChatsSettingsRepository {
 
-  private val context: Context = ApplicationDependencies.getApplication()
+  private val context: Context = AppDependencies.application
 
   fun syncLinkPreviewsState() {
     SignalExecutors.BOUNDED.execute {
-      val isLinkPreviewsEnabled = SignalStore.settings().isLinkPreviewsEnabled
+      val isLinkPreviewsEnabled = SignalStore.settings.isLinkPreviewsEnabled
 
       SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
       StorageSyncHelper.scheduleSyncForDataChange()
-      ApplicationDependencies.getJobManager().add(
+      AppDependencies.jobManager.add(
         MultiDeviceConfigurationUpdateJob(
           TextSecurePreferences.isReadReceiptsEnabled(context),
           TextSecurePreferences.isTypingIndicatorsEnabled(context),
@@ -35,7 +35,7 @@ class ChatsSettingsRepository {
   fun syncPreferSystemContactPhotos() {
     SignalExecutors.BOUNDED.execute {
       SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
-      ApplicationDependencies.getJobManager().add(MultiDeviceContactUpdateJob(true))
+      AppDependencies.jobManager.add(MultiDeviceContactUpdateJob(true))
       StorageSyncHelper.scheduleSyncForDataChange()
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsViewModel.kt
index 36d9a2a180..3ec136e1f8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsViewModel.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components.settings.app.chats
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.BackupUtil
 import org.thoughtcrime.securesms.util.ConversationUtil
@@ -17,53 +17,50 @@ class ChatsSettingsViewModel @JvmOverloads constructor(
 
   private val store: Store<ChatsSettingsState> = Store(
     ChatsSettingsState(
-      generateLinkPreviews = SignalStore.settings().isLinkPreviewsEnabled,
-      useAddressBook = SignalStore.settings().isPreferSystemContactPhotos,
-      keepMutedChatsArchived = SignalStore.settings().shouldKeepMutedChatsArchived(),
-      useSystemEmoji = SignalStore.settings().isPreferSystemEmoji,
-      enterKeySends = SignalStore.settings().isEnterKeySends,
-      localBackupsEnabled = SignalStore.settings().isBackupEnabled && BackupUtil.canUserAccessBackupDirectory(ApplicationDependencies.getApplication()),
-      remoteBackupsEnabled = SignalStore.backup().areBackupsEnabled
+      generateLinkPreviews = SignalStore.settings.isLinkPreviewsEnabled,
+      useAddressBook = SignalStore.settings.isPreferSystemContactPhotos,
+      keepMutedChatsArchived = SignalStore.settings.shouldKeepMutedChatsArchived(),
+      useSystemEmoji = SignalStore.settings.isPreferSystemEmoji,
+      enterKeySends = SignalStore.settings.isEnterKeySends,
+      localBackupsEnabled = SignalStore.settings.isBackupEnabled && BackupUtil.canUserAccessBackupDirectory(AppDependencies.application),
+      remoteBackupsEnabled = SignalStore.backup.areBackupsEnabled
     )
   )
 
   val state: LiveData<ChatsSettingsState> = store.stateLiveData
 
   fun setGenerateLinkPreviewsEnabled(enabled: Boolean) {
-    if (SignalStore.account().isLinkedDevice) {
-      return
-    }
     store.update { it.copy(generateLinkPreviews = enabled) }
-    SignalStore.settings().isLinkPreviewsEnabled = enabled
+    SignalStore.settings.isLinkPreviewsEnabled = enabled
     repository.syncLinkPreviewsState()
   }
 
   fun setUseAddressBook(enabled: Boolean) {
     store.update { it.copy(useAddressBook = enabled) }
     refreshDebouncer.publish { ConversationUtil.refreshRecipientShortcuts() }
-    SignalStore.settings().isPreferSystemContactPhotos = enabled
+    SignalStore.settings.isPreferSystemContactPhotos = enabled
     repository.syncPreferSystemContactPhotos()
   }
 
   fun setKeepMutedChatsArchived(enabled: Boolean) {
     store.update { it.copy(keepMutedChatsArchived = enabled) }
-    SignalStore.settings().setKeepMutedChatsArchived(enabled)
+    SignalStore.settings.setKeepMutedChatsArchived(enabled)
     repository.syncKeepMutedChatsArchivedState()
   }
 
   fun setUseSystemEmoji(enabled: Boolean) {
     store.update { it.copy(useSystemEmoji = enabled) }
-    SignalStore.settings().isPreferSystemEmoji = enabled
+    SignalStore.settings.isPreferSystemEmoji = enabled
   }
 
   fun setEnterKeySends(enabled: Boolean) {
     store.update { it.copy(enterKeySends = enabled) }
-    SignalStore.settings().isEnterKeySends = enabled
+    SignalStore.settings.isEnterKeySends = enabled
   }
 
   fun refresh() {
-    val backupsEnabled = SignalStore.settings().isBackupEnabled && BackupUtil.canUserAccessBackupDirectory(ApplicationDependencies.getApplication())
-    val remoteBackupsEnabled = SignalStore.backup().areBackupsEnabled
+    val backupsEnabled = SignalStore.settings.isBackupEnabled && BackupUtil.canUserAccessBackupDirectory(AppDependencies.application)
+    val remoteBackupsEnabled = SignalStore.backup.areBackupsEnabled
 
     if (store.state.localBackupsEnabled != backupsEnabled ||
       store.state.remoteBackupsEnabled != remoteBackupsEnabled
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/RemoteBackupsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/RemoteBackupsSettingsFragment.kt
index 000eaa3b4b..08e7347845 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/RemoteBackupsSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/RemoteBackupsSettingsFragment.kt
@@ -5,7 +5,6 @@
 
 package org.thoughtcrime.securesms.components.settings.app.chats.backups
 
-import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import androidx.compose.foundation.background
@@ -13,12 +12,17 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.AlertDialogDefaults
+import androidx.compose.material3.BasicAlertDialog
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SnackbarHostState
@@ -28,16 +32,20 @@ import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.DialogProperties
 import androidx.navigation.fragment.findNavController
+import kotlinx.collections.immutable.persistentListOf
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -50,12 +58,14 @@ import org.signal.core.ui.Scaffolds
 import org.signal.core.ui.SignalPreview
 import org.signal.core.ui.Snackbars
 import org.signal.core.ui.Texts
+import org.signal.core.util.money.FiatMoney
+import org.signal.donations.InAppPaymentType
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.backup.v2.BackupFrequency
 import org.thoughtcrime.securesms.backup.v2.BackupV2Event
 import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
-import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsFlowActivity
-import org.thoughtcrime.securesms.backup.v2.ui.subscription.getTierDetails
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsType
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.CheckoutFlowActivity
 import org.thoughtcrime.securesms.compose.ComposeFragment
 import org.thoughtcrime.securesms.conversation.v2.registerForLifecycle
 import org.thoughtcrime.securesms.payments.FiatMoneyUtil
@@ -63,12 +73,12 @@ import org.thoughtcrime.securesms.util.DateUtils
 import org.thoughtcrime.securesms.util.Util
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import org.thoughtcrime.securesms.util.viewModel
+import java.math.BigDecimal
+import java.util.Currency
 import java.util.Locale
 
 /**
  * Remote backups settings fragment.
- *
- * TODO [message-backups] -- All copy in this file is non-final
  */
 class RemoteBackupsSettingsFragment : ComposeFragment() {
 
@@ -78,11 +88,11 @@ class RemoteBackupsSettingsFragment : ComposeFragment() {
 
   @Composable
   override fun FragmentContent() {
-    val state by viewModel.state
+    val state by viewModel.state.collectAsState()
     val callbacks = remember { Callbacks() }
 
     RemoteBackupsSettingsContent(
-      messageBackupTier = state.messageBackupsTier,
+      messageBackupsType = state.messageBackupsType,
       lastBackupTimestamp = state.lastBackupTimestamp,
       canBackUpUsingCellular = state.canBackUpUsingCellular,
       backupsFrequency = state.backupsFrequency,
@@ -101,7 +111,7 @@ class RemoteBackupsSettingsFragment : ComposeFragment() {
     }
 
     override fun onEnableBackupsClick() {
-      startActivity(Intent(requireContext(), MessageBackupsFlowActivity::class.java))
+      startActivity(CheckoutFlowActivity.createIntent(requireContext(), InAppPaymentType.RECURRING_BACKUP))
     }
 
     override fun onBackUpUsingCellularClick(canUseCellular: Boolean) {
@@ -109,7 +119,7 @@ class RemoteBackupsSettingsFragment : ComposeFragment() {
     }
 
     override fun onViewPaymentHistory() {
-      // TODO [message-backups] Navigate to payment history
+      findNavController().safeNavigate(R.id.action_remoteBackupsSettingsFragment_to_remoteBackupsPaymentHistoryFragment)
     }
 
     override fun onBackupNowClick() {
@@ -154,6 +164,11 @@ class RemoteBackupsSettingsFragment : ComposeFragment() {
     super.onViewCreated(view, savedInstanceState)
     EventBus.getDefault().registerForLifecycle(subscriber = this, lifecycleOwner = viewLifecycleOwner)
   }
+
+  override fun onResume() {
+    super.onResume()
+    viewModel.refresh()
+  }
 }
 
 /**
@@ -176,7 +191,7 @@ private interface ContentCallbacks {
 
 @Composable
 private fun RemoteBackupsSettingsContent(
-  messageBackupTier: MessageBackupTier?,
+  messageBackupsType: MessageBackupsType?,
   lastBackupTimestamp: Long,
   canBackUpUsingCellular: Boolean,
   backupsFrequency: BackupFrequency,
@@ -191,7 +206,7 @@ private fun RemoteBackupsSettingsContent(
   }
 
   Scaffolds.Settings(
-    title = "Signal Backups",
+    title = stringResource(id = R.string.RemoteBackupsSettingsFragment__signal_backups),
     onNavigationClick = contentCallbacks::onNavigationClick,
     navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_left_24),
     snackbarHost = {
@@ -204,16 +219,16 @@ private fun RemoteBackupsSettingsContent(
     ) {
       item {
         BackupTypeRow(
-          messageBackupTier = messageBackupTier,
+          messageBackupsType = messageBackupsType,
           onEnableBackupsClick = contentCallbacks::onEnableBackupsClick,
           onChangeBackupsTypeClick = contentCallbacks::onBackupsTypeClick
         )
       }
 
-      if (messageBackupTier == null) {
+      if (messageBackupsType == null) {
         item {
           Rows.TextRow(
-            text = "Payment history",
+            text = stringResource(id = R.string.RemoteBackupsSettingsFragment__payment_history),
             onClick = contentCallbacks::onViewPaymentHistory
           )
         }
@@ -223,7 +238,7 @@ private fun RemoteBackupsSettingsContent(
         }
 
         item {
-          Texts.SectionHeader(text = "Backup Details")
+          Texts.SectionHeader(text = stringResource(id = R.string.RemoteBackupsSettingsFragment__backup_details))
         }
 
         if (backupProgress == null || backupProgress.type == BackupV2Event.Type.FINISHED) {
@@ -243,12 +258,12 @@ private fun RemoteBackupsSettingsContent(
           Rows.TextRow(text = {
             Column {
               Text(
-                text = "Backup size",
+                text = stringResource(id = R.string.RemoteBackupsSettingsFragment__backup_size),
                 style = MaterialTheme.typography.bodyLarge,
                 color = MaterialTheme.colorScheme.onSurface
               )
               Text(
-                text = Util.getPrettyFileSize(backupSize ?: 0),
+                text = Util.getPrettyFileSize(backupSize),
                 style = MaterialTheme.typography.bodyMedium,
                 color = MaterialTheme.colorScheme.onSurfaceVariant
               )
@@ -261,7 +276,7 @@ private fun RemoteBackupsSettingsContent(
             text = {
               Column {
                 Text(
-                  text = "Backup frequency",
+                  text = stringResource(id = R.string.RemoteBackupsSettingsFragment__backup_frequency),
                   style = MaterialTheme.typography.bodyLarge,
                   color = MaterialTheme.colorScheme.onSurface
                 )
@@ -279,7 +294,7 @@ private fun RemoteBackupsSettingsContent(
         item {
           Rows.ToggleRow(
             checked = canBackUpUsingCellular,
-            text = "Back up using cellular",
+            text = stringResource(id = R.string.RemoteBackupsSettingsFragment__back_up_using_cellular),
             onCheckChanged = contentCallbacks::onBackUpUsingCellularClick
           )
         }
@@ -290,7 +305,7 @@ private fun RemoteBackupsSettingsContent(
 
         item {
           Rows.TextRow(
-            text = "Turn off and delete backup",
+            text = stringResource(id = R.string.RemoteBackupsSettingsFragment__turn_off_and_delete_backup),
             foregroundTint = MaterialTheme.colorScheme.error,
             onClick = contentCallbacks::onTurnOffAndDeleteBackupsClick
           )
@@ -315,36 +330,35 @@ private fun RemoteBackupsSettingsContent(
         onDismiss = contentCallbacks::onDialogDismissed
       )
     }
+
+    RemoteBackupsSettingsState.Dialog.DELETING_BACKUP, RemoteBackupsSettingsState.Dialog.BACKUP_DELETED -> {
+      DeletingBackupDialog(
+        backupDeleted = requestedDialog == RemoteBackupsSettingsState.Dialog.BACKUP_DELETED,
+        onDismiss = contentCallbacks::onDialogDismissed
+      )
+    }
   }
 
+  val snackbarMessageId = remember(requestedSnackbar) {
+    when (requestedSnackbar) {
+      RemoteBackupsSettingsState.Snackbar.NONE -> -1
+      RemoteBackupsSettingsState.Snackbar.BACKUP_DELETED_AND_TURNED_OFF -> R.string.RemoteBackupsSettingsFragment__backup_deleted_and_turned_off
+      RemoteBackupsSettingsState.Snackbar.BACKUP_TYPE_CHANGED_AND_SUBSCRIPTION_CANCELLED -> R.string.RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted
+      RemoteBackupsSettingsState.Snackbar.SUBSCRIPTION_CANCELLED -> R.string.RemoteBackupsSettingsFragment__subscription_cancelled
+      RemoteBackupsSettingsState.Snackbar.DOWNLOAD_COMPLETE -> R.string.RemoteBackupsSettingsFragment__download_complete
+    }
+  }
+
+  val snackbarText = if (snackbarMessageId == -1) "" else stringResource(id = snackbarMessageId)
+
   LaunchedEffect(requestedSnackbar) {
     when (requestedSnackbar) {
       RemoteBackupsSettingsState.Snackbar.NONE -> {
         snackbarHostState.currentSnackbarData?.dismiss()
       }
 
-      RemoteBackupsSettingsState.Snackbar.BACKUP_DELETED_AND_TURNED_OFF -> {
-        snackbarHostState.showSnackbar(
-          "Backup deleted and turned off"
-        )
-      }
-
-      RemoteBackupsSettingsState.Snackbar.BACKUP_TYPE_CHANGED_AND_SUBSCRIPTION_CANCELLED -> {
-        snackbarHostState.showSnackbar(
-          "Backup type changed and subscription cancelled"
-        )
-      }
-
-      RemoteBackupsSettingsState.Snackbar.SUBSCRIPTION_CANCELLED -> {
-        snackbarHostState.showSnackbar(
-          "Subscription cancelled"
-        )
-      }
-
-      RemoteBackupsSettingsState.Snackbar.DOWNLOAD_COMPLETE -> {
-        snackbarHostState.showSnackbar(
-          "Download complete"
-        )
+      else -> {
+        snackbarHostState.showSnackbar(snackbarText)
       }
     }
     contentCallbacks.onSnackbarDismissed()
@@ -353,16 +367,14 @@ private fun RemoteBackupsSettingsContent(
 
 @Composable
 private fun BackupTypeRow(
-  messageBackupTier: MessageBackupTier?,
+  messageBackupsType: MessageBackupsType?,
   onEnableBackupsClick: () -> Unit,
   onChangeBackupsTypeClick: () -> Unit
 ) {
-  val messageBackupsType = if (messageBackupTier != null) getTierDetails(messageBackupTier) else null
-
   Row(
     modifier = Modifier
       .fillMaxWidth()
-      .clickable(enabled = messageBackupTier != null, onClick = onChangeBackupsTypeClick)
+      .clickable(enabled = messageBackupsType != null, onClick = onChangeBackupsTypeClick)
       .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
       .padding(top = 16.dp, bottom = 14.dp)
   ) {
@@ -370,14 +382,14 @@ private fun BackupTypeRow(
       modifier = Modifier.weight(1f)
     ) {
       Text(
-        text = "Backup type",
+        text = stringResource(id = R.string.RemoteBackupsSettingsFragment__backup_type),
         style = MaterialTheme.typography.bodyLarge,
         color = MaterialTheme.colorScheme.onSurface
       )
 
       if (messageBackupsType == null) {
         Text(
-          text = "Backups disabled",
+          text = stringResource(id = R.string.RemoteBackupsSettingsFragment__backups_disabled),
           style = MaterialTheme.typography.bodyMedium,
           color = MaterialTheme.colorScheme.onSurfaceVariant
         )
@@ -388,14 +400,14 @@ private fun BackupTypeRow(
         }
 
         Text(
-          text = "${messageBackupsType.title} · $formattedCurrency/month"
+          text = stringResource(id = R.string.RemoteBackupsSettingsFragment__s_dot_s_per_month, messageBackupsType.title, formattedCurrency)
         )
       }
     }
 
     if (messageBackupsType == null) {
       Buttons.Small(onClick = onEnableBackupsClick) {
-        Text(text = "Enable backups")
+        Text(text = stringResource(id = R.string.RemoteBackupsSettingsFragment__enable_backups))
       }
     }
   }
@@ -417,11 +429,14 @@ private fun InProgressBackupRow(
       if (totalProgress == null || totalProgress == 0) {
         LinearProgressIndicator(modifier = Modifier.fillMaxWidth())
       } else {
-        LinearProgressIndicator(modifier = Modifier.fillMaxWidth(), progress = ((progress ?: 0) / totalProgress).toFloat())
+        LinearProgressIndicator(
+          modifier = Modifier.fillMaxWidth(),
+          progress = { ((progress ?: 0) / totalProgress).toFloat() }
+        )
       }
 
       Text(
-        text = "$progress/$totalProgress",
+        text = stringResource(R.string.RemoteBackupsSettingsFragment__d_slash_d, progress ?: 0, totalProgress ?: 0),
         style = MaterialTheme.typography.bodyMedium,
         color = MaterialTheme.colorScheme.onSurfaceVariant
       )
@@ -443,7 +458,7 @@ private fun LastBackupRow(
       modifier = Modifier.weight(1f)
     ) {
       Text(
-        text = "Last backup",
+        text = stringResource(id = R.string.RemoteBackupsSettingsFragment__last_backup),
         style = MaterialTheme.typography.bodyLarge,
         color = MaterialTheme.colorScheme.onSurface
       )
@@ -460,13 +475,13 @@ private fun LastBackupRow(
         }
 
         Text(
-          text = "$day at $time",
+          text = stringResource(id = R.string.RemoteBackupsSettingsFragment__s_at_s, day, time),
           style = MaterialTheme.typography.bodyMedium,
           color = MaterialTheme.colorScheme.onSurfaceVariant
         )
       } else {
         Text(
-          text = "Never",
+          text = stringResource(id = R.string.RemoteBackupsSettingsFragment__never),
           style = MaterialTheme.typography.bodyMedium,
           color = MaterialTheme.colorScheme.onSurfaceVariant
         )
@@ -474,7 +489,7 @@ private fun LastBackupRow(
     }
 
     Buttons.Small(onClick = onBackupNowClick) {
-      Text(text = "Back up now")
+      Text(text = stringResource(id = R.string.RemoteBackupsSettingsFragment__back_up_now))
     }
   }
 }
@@ -485,9 +500,9 @@ private fun TurnOffAndDeleteBackupsDialog(
   onDismiss: () -> Unit
 ) {
   Dialogs.SimpleAlertDialog(
-    title = "Turn off and delete backups?",
-    body = "You will not be charged again. Your backup will be deleted and no new backups will be created.",
-    confirm = "Turn off and delete",
+    title = stringResource(id = R.string.RemoteBackupsSettingsFragment__turn_off_and_delete_backups),
+    body = stringResource(id = R.string.RemoteBackupsSettingsFragment__you_will_not_be_charged_again),
+    confirm = stringResource(id = R.string.RemoteBackupsSettingsFragment__turn_off_and_delete),
     dismiss = stringResource(id = android.R.string.cancel),
     confirmColor = MaterialTheme.colorScheme.error,
     onConfirm = onConfirm,
@@ -495,6 +510,60 @@ private fun TurnOffAndDeleteBackupsDialog(
   )
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun DeletingBackupDialog(
+  backupDeleted: Boolean,
+  onDismiss: () -> Unit
+) {
+  BasicAlertDialog(
+    onDismissRequest = onDismiss,
+    properties = DialogProperties(
+      dismissOnBackPress = false,
+      dismissOnClickOutside = false
+    )
+  ) {
+    Surface(
+      shape = AlertDialogDefaults.shape,
+      color = AlertDialogDefaults.containerColor
+    ) {
+      Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = Modifier
+          .defaultMinSize(minWidth = 232.dp)
+          .padding(bottom = 60.dp)
+      ) {
+        if (backupDeleted) {
+          Icon(
+            painter = painterResource(id = R.drawable.symbol_check_light_24),
+            contentDescription = null,
+            tint = Color(0xFF09B37B),
+            modifier = Modifier
+              .padding(top = 58.dp, bottom = 9.dp)
+              .size(48.dp)
+          )
+          Text(
+            text = stringResource(id = R.string.RemoteBackupsSettingsFragment__backup_deleted),
+            style = MaterialTheme.typography.bodyLarge,
+            color = MaterialTheme.colorScheme.onSurfaceVariant
+          )
+        } else {
+          CircularProgressIndicator(
+            modifier = Modifier
+              .padding(top = 64.dp, bottom = 20.dp)
+              .size(48.dp)
+          )
+          Text(
+            text = stringResource(id = R.string.RemoteBackupsSettingsFragment__deleting_backup),
+            style = MaterialTheme.typography.bodyLarge,
+            color = MaterialTheme.colorScheme.onSurfaceVariant
+          )
+        }
+      }
+    }
+  }
+}
+
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun BackupFrequencyDialog(
@@ -515,7 +584,7 @@ private fun BackupFrequencyDialog(
           .fillMaxWidth()
       ) {
         Text(
-          text = "Backup frequency",
+          text = stringResource(id = R.string.RemoteBackupsSettingsFragment__backup_frequency),
           style = MaterialTheme.typography.headlineMedium,
           modifier = Modifier.padding(24.dp)
         )
@@ -525,7 +594,7 @@ private fun BackupFrequencyDialog(
             selected = selected == it,
             text = getTextForFrequency(backupsFrequency = it),
             label = when (it) {
-              BackupFrequency.MANUAL -> "By tapping \"Back up now\""
+              BackupFrequency.MANUAL -> stringResource(id = R.string.RemoteBackupsSettingsFragment__by_tapping_back_up_now)
               else -> null
             },
             modifier = Modifier
@@ -556,10 +625,10 @@ private fun BackupFrequencyDialog(
 @Composable
 private fun getTextForFrequency(backupsFrequency: BackupFrequency): String {
   return when (backupsFrequency) {
-    BackupFrequency.DAILY -> "Daily"
-    BackupFrequency.WEEKLY -> "Weekly"
-    BackupFrequency.MONTHLY -> "Monthly"
-    BackupFrequency.MANUAL -> "Manually back up"
+    BackupFrequency.DAILY -> stringResource(id = R.string.RemoteBackupsSettingsFragment__daily)
+    BackupFrequency.WEEKLY -> stringResource(id = R.string.RemoteBackupsSettingsFragment__weekly)
+    BackupFrequency.MONTHLY -> stringResource(id = R.string.RemoteBackupsSettingsFragment__monthly)
+    BackupFrequency.MANUAL -> stringResource(id = R.string.RemoteBackupsSettingsFragment__manually_back_up)
   }
 }
 
@@ -568,7 +637,7 @@ private fun getTextForFrequency(backupsFrequency: BackupFrequency): String {
 private fun RemoteBackupsSettingsContentPreview() {
   Previews.Preview {
     RemoteBackupsSettingsContent(
-      messageBackupTier = null,
+      messageBackupsType = null,
       lastBackupTimestamp = -1,
       canBackUpUsingCellular = false,
       backupsFrequency = BackupFrequency.MANUAL,
@@ -586,7 +655,12 @@ private fun RemoteBackupsSettingsContentPreview() {
 private fun BackupTypeRowPreview() {
   Previews.Preview {
     BackupTypeRow(
-      messageBackupTier = MessageBackupTier.PAID,
+      messageBackupsType = MessageBackupsType(
+        tier = MessageBackupTier.FREE,
+        title = "Free",
+        pricePerMonth = FiatMoney(BigDecimal.ZERO, Currency.getInstance("USD")),
+        features = persistentListOf()
+      ),
       onChangeBackupsTypeClick = {},
       onEnableBackupsClick = {}
     )
@@ -623,6 +697,17 @@ private fun TurnOffAndDeleteBackupsDialogPreview() {
   }
 }
 
+@SignalPreview
+@Composable
+private fun DeleteBackupDialogPreview() {
+  Previews.Preview {
+    DeletingBackupDialog(
+      backupDeleted = true,
+      onDismiss = {}
+    )
+  }
+}
+
 @SignalPreview
 @Composable
 private fun BackupFrequencyDialogPreview() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/RemoteBackupsSettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/RemoteBackupsSettingsState.kt
index a25ab14b30..f037d8a08d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/RemoteBackupsSettingsState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/RemoteBackupsSettingsState.kt
@@ -7,10 +7,10 @@ package org.thoughtcrime.securesms.components.settings.app.chats.backups
 
 import org.thoughtcrime.securesms.backup.v2.BackupFrequency
 import org.thoughtcrime.securesms.backup.v2.BackupV2Event
-import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsType
 
 data class RemoteBackupsSettingsState(
-  val messageBackupsTier: MessageBackupTier? = null,
+  val messageBackupsType: MessageBackupsType? = null,
   val canBackUpUsingCellular: Boolean = false,
   val backupSize: Long = 0,
   val backupsFrequency: BackupFrequency = BackupFrequency.DAILY,
@@ -22,7 +22,9 @@ data class RemoteBackupsSettingsState(
   enum class Dialog {
     NONE,
     TURN_OFF_AND_DELETE_BACKUPS,
-    BACKUP_FREQUENCY
+    BACKUP_FREQUENCY,
+    DELETING_BACKUP,
+    BACKUP_DELETED
   }
 
   enum class Snackbar {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/RemoteBackupsSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/RemoteBackupsSettingsViewModel.kt
index 56e986b11c..69a476aeea 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/RemoteBackupsSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/RemoteBackupsSettingsViewModel.kt
@@ -5,71 +5,112 @@
 
 package org.thoughtcrime.securesms.components.settings.app.chats.backups
 
-import androidx.compose.runtime.State
-import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.thoughtcrime.securesms.backup.v2.BackupFrequency
+import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.backup.v2.BackupV2Event
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.BackupMessagesJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.service.MessageBackupListener
+import kotlin.time.Duration.Companion.milliseconds
 
 /**
  * ViewModel for state management of RemoteBackupsSettingsFragment
  */
 class RemoteBackupsSettingsViewModel : ViewModel() {
-  private val internalState = mutableStateOf(
+  private val internalState = MutableStateFlow(
     RemoteBackupsSettingsState(
-      messageBackupsTier = SignalStore.backup().backupTier,
-      lastBackupTimestamp = SignalStore.backup().lastBackupTime,
-      backupSize = SignalStore.backup().totalBackupSize,
-      backupsFrequency = SignalStore.backup().backupFrequency
+      messageBackupsType = null,
+      lastBackupTimestamp = SignalStore.backup.lastBackupTime,
+      backupSize = SignalStore.backup.totalBackupSize,
+      backupsFrequency = SignalStore.backup.backupFrequency
     )
   )
 
-  val state: State<RemoteBackupsSettingsState> = internalState
+  val state: StateFlow<RemoteBackupsSettingsState> = internalState
+
+  init {
+    refresh()
+  }
 
   fun setCanBackUpUsingCellular(canBackUpUsingCellular: Boolean) {
-    SignalStore.backup().backupWithCellular = canBackUpUsingCellular
-    internalState.value = state.value.copy(canBackUpUsingCellular = canBackUpUsingCellular)
+    SignalStore.backup.backupWithCellular = canBackUpUsingCellular
+    internalState.update { it.copy(canBackUpUsingCellular = canBackUpUsingCellular) }
   }
 
   fun setBackupsFrequency(backupsFrequency: BackupFrequency) {
-    SignalStore.backup().backupFrequency = backupsFrequency
-    internalState.value = state.value.copy(backupsFrequency = backupsFrequency)
+    SignalStore.backup.backupFrequency = backupsFrequency
+    internalState.update { it.copy(backupsFrequency = backupsFrequency) }
     MessageBackupListener.setNextBackupTimeToIntervalFromNow()
-    MessageBackupListener.schedule(ApplicationDependencies.getApplication())
+    MessageBackupListener.schedule(AppDependencies.application)
   }
 
   fun requestDialog(dialog: RemoteBackupsSettingsState.Dialog) {
-    internalState.value = state.value.copy(dialog = dialog)
+    internalState.update { it.copy(dialog = dialog) }
   }
 
   fun requestSnackbar(snackbar: RemoteBackupsSettingsState.Snackbar) {
-    internalState.value = state.value.copy(snackbar = snackbar)
+    internalState.update { it.copy(snackbar = snackbar) }
+  }
+
+  fun refresh() {
+    viewModelScope.launch {
+      val tier = SignalStore.backup.backupTier
+      val backupType = if (tier != null) BackupRepository.getBackupsType(tier) else null
+
+      internalState.update {
+        it.copy(
+          messageBackupsType = backupType,
+          lastBackupTimestamp = SignalStore.backup.lastBackupTime,
+          backupSize = SignalStore.backup.totalBackupSize,
+          backupsFrequency = SignalStore.backup.backupFrequency
+        )
+      }
+    }
   }
 
   fun turnOffAndDeleteBackups() {
-    // TODO [message-backups] -- Delete.
-    SignalStore.backup().areBackupsEnabled = false
-    internalState.value = state.value.copy(snackbar = RemoteBackupsSettingsState.Snackbar.BACKUP_DELETED_AND_TURNED_OFF)
+    viewModelScope.launch {
+      requestDialog(RemoteBackupsSettingsState.Dialog.DELETING_BACKUP)
+
+      withContext(Dispatchers.IO) {
+        BackupRepository.turnOffAndDeleteBackup()
+      }
+
+      if (isActive) {
+        requestDialog(RemoteBackupsSettingsState.Dialog.BACKUP_DELETED)
+        delay(2000.milliseconds)
+        requestDialog(RemoteBackupsSettingsState.Dialog.NONE)
+      }
+    }
   }
 
   fun updateBackupProgress(backupEvent: BackupV2Event?) {
-    internalState.value = state.value.copy(backupProgress = backupEvent)
+    internalState.update { it.copy(backupProgress = backupEvent) }
     refreshBackupState()
   }
 
   private fun refreshBackupState() {
-    internalState.value = state.value.copy(
-      lastBackupTimestamp = SignalStore.backup().lastBackupTime,
-      backupSize = SignalStore.backup().totalBackupSize
-    )
+    internalState.update {
+      it.copy(
+        lastBackupTimestamp = SignalStore.backup.lastBackupTime,
+        backupSize = SignalStore.backup.totalBackupSize
+      )
+    }
   }
 
   fun onBackupNowClick() {
-    if (state.value.backupProgress == null || state.value.backupProgress?.type == BackupV2Event.Type.FINISHED) {
+    if (internalState.value.backupProgress == null || internalState.value.backupProgress?.type == BackupV2Event.Type.FINISHED) {
       BackupMessagesJob.enqueue()
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/history/RemoteBackupsPaymentHistoryFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/history/RemoteBackupsPaymentHistoryFragment.kt
new file mode 100644
index 0000000000..cbd753bb49
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/history/RemoteBackupsPaymentHistoryFragment.kt
@@ -0,0 +1,311 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.chats.backups.history
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.fragment.app.viewModels
+import androidx.navigation.NavType
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.navArgument
+import kotlinx.collections.immutable.persistentMapOf
+import kotlinx.collections.immutable.toPersistentList
+import org.signal.core.ui.Buttons
+import org.signal.core.ui.Dividers
+import org.signal.core.ui.Previews
+import org.signal.core.ui.Rows
+import org.signal.core.ui.Scaffolds
+import org.signal.core.ui.SignalPreview
+import org.signal.core.ui.Texts
+import org.signal.core.util.money.FiatMoney
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.compose.ComposeFragment
+import org.thoughtcrime.securesms.compose.Nav
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import org.thoughtcrime.securesms.util.DateUtils
+import java.math.BigDecimal
+import java.util.Calendar
+import java.util.Currency
+import java.util.Locale
+
+/**
+ * Displays a list or detail view of in-app-payment receipts related to
+ * backups.
+ */
+class RemoteBackupsPaymentHistoryFragment : ComposeFragment() {
+
+  private val viewModel: RemoteBackupsPaymentHistoryViewModel by viewModels()
+
+  @Composable
+  override fun FragmentContent() {
+    val state by viewModel.state.collectAsState()
+    val navController = rememberNavController()
+
+    LaunchedEffect(Unit) {
+      navController.setOnBackPressedDispatcher(requireActivity().onBackPressedDispatcher)
+      navController.enableOnBackPressed(true)
+    }
+
+    val onNavigationClick = remember {
+      {
+        if (!navController.popBackStack()) {
+          findNavController().popBackStack()
+        }
+      }
+    }
+
+    Nav.Host(navController = navController, startDestination = "list") {
+      composable("list") {
+        PaymentHistoryContent(
+          state = state,
+          onNavigationClick = onNavigationClick,
+          onRecordClick = { navController.navigate("detail/${it.id}") }
+        )
+      }
+
+      composable("detail/{recordId}", listOf(navArgument("recordId") { type = NavType.LongType })) { backStackEntry ->
+        val recordId = backStackEntry.arguments?.getLong("recordId")!!
+        val record = state.records[recordId]!!
+
+        PaymentHistoryDetails(
+          record = record,
+          onNavigationClick = onNavigationClick,
+          onShareClick = {} // TODO [message-backups] Generate shareable png
+        )
+      }
+    }
+  }
+}
+
+@Composable
+private fun PaymentHistoryContent(
+  state: RemoteBackupsPaymentHistoryState,
+  onNavigationClick: () -> Unit,
+  onRecordClick: (DonationReceiptRecord) -> Unit
+) {
+  Scaffolds.Settings(
+    title = stringResource(id = R.string.RemoteBackupsPaymentHistoryFragment__payment_history),
+    navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_left_24),
+    onNavigationClick = onNavigationClick
+  ) {
+    val itemList = remember(state.records) { state.records.values.toPersistentList() }
+
+    LazyColumn(
+      modifier = Modifier
+        .fillMaxSize()
+        .padding(it)
+    ) {
+      itemsIndexed(
+        items = itemList,
+        key = { _, item -> item.id }
+      ) { idx, item ->
+        val previous = itemList.getOrNull(idx - 1)
+        val previousYear = rememberYear(timestamp = previous?.timestamp ?: 0)
+        val ourYear = rememberYear(timestamp = item.timestamp)
+
+        if (previousYear != ourYear) {
+          Texts.SectionHeader(text = "$ourYear")
+        }
+
+        PaymentHistoryRow(item, onRecordClick)
+      }
+    }
+  }
+}
+
+@Composable
+private fun rememberYear(timestamp: Long): Int {
+  if (timestamp == 0L) {
+    return -1
+  }
+
+  val calendar = remember {
+    Calendar.getInstance()
+  }
+
+  return remember(timestamp) {
+    calendar.timeInMillis = timestamp
+    calendar.get(Calendar.YEAR)
+  }
+}
+
+@Composable
+private fun PaymentHistoryRow(
+  record: DonationReceiptRecord,
+  onRecordClick: (DonationReceiptRecord) -> Unit
+) {
+  val date = remember(record.timestamp) {
+    DateUtils.formatDateWithYear(Locale.getDefault(), record.timestamp)
+  }
+
+  val onClick = remember(record) {
+    { onRecordClick(record) }
+  }
+
+  Rows.TextRow(text = {
+    Column(
+      modifier = Modifier.weight(1f)
+    ) {
+      Text(
+        text = date,
+        style = MaterialTheme.typography.bodyLarge
+      )
+
+      Text(
+        text = stringResource(id = R.string.RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup),
+        style = MaterialTheme.typography.bodyMedium,
+        color = MaterialTheme.colorScheme.onSurfaceVariant
+      )
+    }
+
+    val resources = LocalContext.current.resources
+    val fiat = remember(record.amount) {
+      FiatMoneyUtil.format(resources, record.amount, FiatMoneyUtil.formatOptions().trimZerosAfterDecimal())
+    }
+
+    Text(text = fiat)
+  }, onClick = onClick)
+}
+
+@Composable
+private fun PaymentHistoryDetails(
+  record: DonationReceiptRecord,
+  onNavigationClick: () -> Unit,
+  onShareClick: () -> Unit
+) {
+  Scaffolds.Settings(
+    title = stringResource(id = R.string.RemoteBackupsPaymentHistoryFragment__payment_details),
+    onNavigationClick = onNavigationClick,
+    navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_left_24)
+  ) {
+    Column(
+      modifier = Modifier
+        .fillMaxSize()
+        .padding(it)
+    ) {
+      val resources = LocalContext.current.resources
+      val formattedAmount = remember(record.amount) {
+        FiatMoneyUtil.format(resources, record.amount, FiatMoneyUtil.formatOptions().trimZerosAfterDecimal())
+      }
+
+      Image(
+        painter = painterResource(id = R.drawable.ic_molly_logo),
+        contentDescription = null,
+        modifier = Modifier
+          .align(alignment = Alignment.CenterHorizontally)
+          .padding(top = 24.dp, bottom = 16.dp)
+      )
+
+      Text(
+        text = formattedAmount,
+        style = MaterialTheme.typography.displayMedium,
+        textAlign = TextAlign.Center,
+        modifier = Modifier.fillMaxWidth()
+      )
+
+      Dividers.Default()
+
+      Rows.TextRow(
+        text = stringResource(id = R.string.RemoteBackupsPaymentHistoryFragment__backup_type),
+        label = stringResource(id = R.string.RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup)
+      )
+
+      val formattedDate = remember(record.timestamp) {
+        DateUtils.formatDateWithYear(Locale.getDefault(), record.timestamp)
+      }
+
+      Rows.TextRow(
+        text = stringResource(id = R.string.RemoteBackupsPaymentHistoryFragment__date_paid),
+        label = formattedDate
+      )
+
+      Spacer(modifier = Modifier.weight(1f))
+
+      Buttons.LargePrimary(
+        onClick = onShareClick,
+        modifier = Modifier
+          .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+          .padding(bottom = 24.dp)
+          .fillMaxWidth()
+      ) {
+        Text(text = stringResource(id = R.string.RemoteBackupsPaymentHistoryFragment__share))
+      }
+    }
+  }
+}
+
+@SignalPreview
+@Composable
+private fun PaymentHistoryContentPreview() {
+  Previews.Preview {
+    PaymentHistoryContent(
+      state = RemoteBackupsPaymentHistoryState(
+        records = persistentMapOf(
+          1L to testRecord()
+        )
+      ),
+      onNavigationClick = {},
+      onRecordClick = {}
+    )
+  }
+}
+
+@SignalPreview
+@Composable
+private fun PaymentHistoryRowPreview() {
+  Previews.Preview {
+    PaymentHistoryRow(
+      record = testRecord(),
+      onRecordClick = {}
+    )
+  }
+}
+
+@SignalPreview
+@Composable
+private fun PaymentDetailsContentPreview() {
+  Previews.Preview {
+    PaymentHistoryDetails(
+      record = testRecord(),
+      onNavigationClick = {},
+      onShareClick = {}
+    )
+  }
+}
+
+private fun testRecord(): DonationReceiptRecord {
+  return DonationReceiptRecord(
+    id = 1,
+    amount = FiatMoney(BigDecimal.ONE, Currency.getInstance("USD")),
+    timestamp = 1718739691000,
+    type = DonationReceiptRecord.Type.RECURRING_BACKUP,
+    subscriptionLevel = 201
+  )
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/history/RemoteBackupsPaymentHistoryRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/history/RemoteBackupsPaymentHistoryRepository.kt
new file mode 100644
index 0000000000..5c30b35b09
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/history/RemoteBackupsPaymentHistoryRepository.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.chats.backups.history
+
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+
+object RemoteBackupsPaymentHistoryRepository {
+
+  fun getReceipts(): List<DonationReceiptRecord> {
+    return SignalDatabase.donationReceipts.getReceipts(DonationReceiptRecord.Type.RECURRING_BACKUP)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/history/RemoteBackupsPaymentHistoryState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/history/RemoteBackupsPaymentHistoryState.kt
new file mode 100644
index 0000000000..1123025cd6
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/history/RemoteBackupsPaymentHistoryState.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.chats.backups.history
+
+import androidx.compose.runtime.Stable
+import kotlinx.collections.immutable.PersistentMap
+import kotlinx.collections.immutable.persistentMapOf
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+
+@Stable
+data class RemoteBackupsPaymentHistoryState(
+  val records: PersistentMap<Long, DonationReceiptRecord> = persistentMapOf()
+)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/history/RemoteBackupsPaymentHistoryViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/history/RemoteBackupsPaymentHistoryViewModel.kt
new file mode 100644
index 0000000000..02ac79cc67
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/history/RemoteBackupsPaymentHistoryViewModel.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.chats.backups.history
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.collections.immutable.toPersistentMap
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+class RemoteBackupsPaymentHistoryViewModel : ViewModel() {
+
+  private val internalStateFlow = MutableStateFlow(RemoteBackupsPaymentHistoryState())
+  val state: StateFlow<RemoteBackupsPaymentHistoryState> = internalStateFlow
+
+  init {
+    viewModelScope.launch {
+      val receipts = withContext(Dispatchers.IO) {
+        RemoteBackupsPaymentHistoryRepository.getReceipts()
+      }
+
+      internalStateFlow.update { state -> state.copy(records = receipts.associateBy { it.id }.toPersistentMap()) }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/type/BackupsTypeSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/type/BackupsTypeSettingsFragment.kt
index e91df29f5e..69665f266d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/type/BackupsTypeSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/type/BackupsTypeSettingsFragment.kt
@@ -5,13 +5,13 @@
 
 package org.thoughtcrime.securesms.components.settings.app.chats.backups.type
 
-import android.content.Intent
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
@@ -19,19 +19,25 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.navigation.fragment.findNavController
+import kotlinx.collections.immutable.persistentListOf
 import org.signal.core.ui.Previews
 import org.signal.core.ui.Rows
 import org.signal.core.ui.Scaffolds
 import org.signal.core.ui.SignalPreview
-//import org.signal.donations.PaymentSourceType
+import org.signal.core.util.money.FiatMoney
+import org.signal.donations.InAppPaymentType
+import org.signal.donations.PaymentSourceType
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
-import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsFlowActivity
-import org.thoughtcrime.securesms.backup.v2.ui.subscription.getTierDetails
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsType
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.CheckoutFlowActivity
 import org.thoughtcrime.securesms.compose.ComposeFragment
 import org.thoughtcrime.securesms.payments.FiatMoneyUtil
 import org.thoughtcrime.securesms.util.DateUtils
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import org.thoughtcrime.securesms.util.viewModel
+import java.math.BigDecimal
+import java.util.Currency
 import java.util.Locale
 
 /**
@@ -49,7 +55,7 @@ class BackupsTypeSettingsFragment : ComposeFragment() {
       Callbacks()
     }
 
-    val state by viewModel.state
+    val state by viewModel.state.collectAsState()
 
     BackupsTypeSettingsContent(
       state = state,
@@ -63,13 +69,18 @@ class BackupsTypeSettingsFragment : ComposeFragment() {
     }
 
     override fun onPaymentHistoryClick() {
-      // TODO [message-backups] Navigate to payment history
+      findNavController().safeNavigate(R.id.action_backupsTypeSettingsFragment_to_remoteBackupsPaymentHistoryFragment)
     }
 
     override fun onChangeOrCancelSubscriptionClick() {
-      startActivity(Intent(requireContext(), MessageBackupsFlowActivity::class.java))
+      startActivity(CheckoutFlowActivity.createIntent(requireContext(), InAppPaymentType.RECURRING_BACKUP))
     }
   }
+
+  override fun onResume() {
+    super.onResume()
+    viewModel.refresh()
+  }
 }
 
 private interface ContentCallbacks {
@@ -83,7 +94,7 @@ private fun BackupsTypeSettingsContent(
   state: BackupsTypeSettingsState,
   contentCallbacks: ContentCallbacks
 ) {
-  if (state.backupsTier == null) {
+  if (state.messageBackupsType == null) {
     return
   }
 
@@ -97,15 +108,15 @@ private fun BackupsTypeSettingsContent(
     ) {
       item {
         BackupsTypeRow(
-          backupsTier = state.backupsTier,
+          messageBackupsType = state.messageBackupsType,
           nextRenewalTimestamp = state.nextRenewalTimestamp
         )
       }
 
       item {
-//        PaymentSourceRow(
-//          paymentSourceType = state.paymentSourceType
-//        )
+        PaymentSourceRow(
+          paymentSourceType = state.paymentSourceType
+        )
       }
 
       item {
@@ -117,7 +128,7 @@ private fun BackupsTypeSettingsContent(
 
       item {
         Rows.TextRow(
-          text = "Payment history", // TODO [message-backups] final copy
+          text = stringResource(id = R.string.BackupsTypeSettingsFragment__payment_history),
           onClick = contentCallbacks::onPaymentHistoryClick
         )
       }
@@ -127,13 +138,9 @@ private fun BackupsTypeSettingsContent(
 
 @Composable
 private fun BackupsTypeRow(
-  backupsTier: MessageBackupTier,
+  messageBackupsType: MessageBackupsType,
   nextRenewalTimestamp: Long
 ) {
-  val messageBackupsType = remember {
-    getTierDetails(backupsTier)
-  }
-
   val resources = LocalContext.current.resources
   val formattedAmount = remember(messageBackupsType.pricePerMonth) {
     FiatMoneyUtil.format(resources, messageBackupsType.pricePerMonth, FiatMoneyUtil.formatOptions().trimZerosAfterDecimal())
@@ -155,30 +162,30 @@ private fun BackupsTypeRow(
   })
 }
 
-//@Composable
-//private fun PaymentSourceRow(paymentSourceType: PaymentSourceType) {
-//  val paymentSourceTextResId = remember(paymentSourceType) {
-//    when (paymentSourceType) {
-//      is PaymentSourceType.Stripe.CreditCard -> R.string.BackupsTypeSettingsFragment__credit_or_debit_card
-//      is PaymentSourceType.Stripe.IDEAL -> R.string.BackupsTypeSettingsFragment__iDEAL
-//      is PaymentSourceType.Stripe.GooglePay -> R.string.BackupsTypeSettingsFragment__google_pay
-//      is PaymentSourceType.Stripe.SEPADebit -> R.string.BackupsTypeSettingsFragment__bank_transfer
-//      is PaymentSourceType.PayPal -> R.string.BackupsTypeSettingsFragment__paypal
-//      is PaymentSourceType.Unknown -> R.string.BackupsTypeSettingsFragment__unknown
-//    }
-//  }
-//
-//  Rows.TextRow(text = {
-//    Column {
-//      Text(text = "Payment method") // TOD [message-backups] Final copy
-//      Text(
-//        text = stringResource(id = paymentSourceTextResId),
-//        style = MaterialTheme.typography.bodyMedium,
-//        color = MaterialTheme.colorScheme.onSurfaceVariant
-//      )
-//    }
-//  })
-//}
+@Composable
+private fun PaymentSourceRow(paymentSourceType: PaymentSourceType) {
+  val paymentSourceTextResId = remember(paymentSourceType) {
+    when (paymentSourceType) {
+      is PaymentSourceType.Stripe.CreditCard -> R.string.BackupsTypeSettingsFragment__credit_or_debit_card
+      is PaymentSourceType.Stripe.IDEAL -> R.string.BackupsTypeSettingsFragment__iDEAL
+      is PaymentSourceType.Stripe.GooglePay -> R.string.BackupsTypeSettingsFragment__google_pay
+      is PaymentSourceType.Stripe.SEPADebit -> R.string.BackupsTypeSettingsFragment__bank_transfer
+      is PaymentSourceType.PayPal -> R.string.BackupsTypeSettingsFragment__paypal
+      is PaymentSourceType.Unknown -> R.string.BackupsTypeSettingsFragment__unknown
+    }
+  }
+
+  Rows.TextRow(text = {
+    Column {
+      Text(text = "Payment method") // TOD [message-backups] Final copy
+      Text(
+        text = stringResource(id = paymentSourceTextResId),
+        style = MaterialTheme.typography.bodyMedium,
+        color = MaterialTheme.colorScheme.onSurfaceVariant
+      )
+    }
+  })
+}
 
 @SignalPreview
 @Composable
@@ -186,7 +193,12 @@ private fun BackupsTypeSettingsContentPreview() {
   Previews.Preview {
     BackupsTypeSettingsContent(
       state = BackupsTypeSettingsState(
-        backupsTier = MessageBackupTier.PAID
+        messageBackupsType = MessageBackupsType(
+          tier = MessageBackupTier.FREE,
+          pricePerMonth = FiatMoney(BigDecimal.ZERO, Currency.getInstance("USD")),
+          title = "Free",
+          features = persistentListOf()
+        )
       ),
       contentCallbacks = object : ContentCallbacks {}
     )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/type/BackupsTypeSettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/type/BackupsTypeSettingsState.kt
index 7d953a8593..3c77c1e305 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/type/BackupsTypeSettingsState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/type/BackupsTypeSettingsState.kt
@@ -6,12 +6,12 @@
 package org.thoughtcrime.securesms.components.settings.app.chats.backups.type
 
 import androidx.compose.runtime.Stable
-//import org.signal.donations.PaymentSourceType
-import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
+import org.signal.donations.PaymentSourceType
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsType
 
 @Stable
 data class BackupsTypeSettingsState(
-  val backupsTier: MessageBackupTier? = null,
-//  val paymentSourceType: PaymentSourceType = PaymentSourceType.Unknown,
+  val messageBackupsType: MessageBackupsType? = null,
+  val paymentSourceType: PaymentSourceType = PaymentSourceType.Unknown,
   val nextRenewalTimestamp: Long = 0
 )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/type/BackupsTypeSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/type/BackupsTypeSettingsViewModel.kt
index 1f69fa6ad5..02c477d36c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/type/BackupsTypeSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/backups/type/BackupsTypeSettingsViewModel.kt
@@ -5,17 +5,42 @@
 
 package org.thoughtcrime.securesms.components.settings.app.chats.backups.type
 
-import androidx.compose.runtime.State
-import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.thoughtcrime.securesms.backup.v2.BackupRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toPaymentSourceType
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 
 class BackupsTypeSettingsViewModel : ViewModel() {
-  private val internalState = mutableStateOf(
-    BackupsTypeSettingsState(
-      backupsTier = SignalStore.backup().backupTier
-    )
-  )
+  private val internalState = MutableStateFlow(BackupsTypeSettingsState())
 
-  val state: State<BackupsTypeSettingsState> = internalState
+  val state: StateFlow<BackupsTypeSettingsState> = internalState
+
+  init {
+    refresh()
+  }
+
+  fun refresh() {
+    viewModelScope.launch {
+      val tier = SignalStore.backup.backupTier
+      val paymentMethod = withContext(Dispatchers.IO) {
+        InAppPaymentsRepository.getLatestPaymentMethodType(InAppPaymentSubscriberRecord.Type.BACKUP)
+      }
+
+      internalState.update {
+        it.copy(
+          messageBackupsType = if (tier != null) BackupRepository.getBackupsType(tier) else null,
+          paymentSourceType = paymentMethod.toPaymentSourceType()
+        )
+      }
+    }
+  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsRepository.kt
index 66a6262b5c..266ee141e7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsRepository.kt
@@ -3,11 +3,11 @@ package org.thoughtcrime.securesms.components.settings.app.data
 import android.content.Context
 import org.signal.core.util.concurrent.SignalExecutors
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 
 class DataAndStorageSettingsRepository {
 
-  private val context: Context = ApplicationDependencies.getApplication()
+  private val context: Context = AppDependencies.application
 
   fun getTotalStorageUse(consumer: (Long) -> Unit) {
     SignalExecutors.BOUNDED.execute {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsViewModel.kt
index 4e8b7982b9..875f54b44b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/data/DataAndStorageSettingsViewModel.kt
@@ -4,7 +4,7 @@ import android.content.SharedPreferences
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.SentMediaQuality
 import org.thoughtcrime.securesms.util.TextSecurePreferences
@@ -42,13 +42,13 @@ class DataAndStorageSettingsViewModel(
   }
 
   fun setCallDataMode(callDataMode: CallDataMode) {
-    SignalStore.settings().callDataMode = callDataMode
-    ApplicationDependencies.getSignalCallManager().dataModeUpdate()
+    SignalStore.settings.callDataMode = callDataMode
+    AppDependencies.signalCallManager.dataModeUpdate()
     getStateAndCopyStorageUsage()
   }
 
   fun setSentMediaQuality(sentMediaQuality: SentMediaQuality) {
-    SignalStore.settings().sentMediaQuality = sentMediaQuality
+    SignalStore.settings.sentMediaQuality = sentMediaQuality
     getStateAndCopyStorageUsage()
   }
 
@@ -59,16 +59,16 @@ class DataAndStorageSettingsViewModel(
   private fun getState() = DataAndStorageSettingsState(
     totalStorageUse = 0,
     mobileAutoDownloadValues = TextSecurePreferences.getMobileMediaDownloadAllowed(
-      ApplicationDependencies.getApplication()
+      AppDependencies.application
     ),
     wifiAutoDownloadValues = TextSecurePreferences.getWifiMediaDownloadAllowed(
-      ApplicationDependencies.getApplication()
+      AppDependencies.application
     ),
     roamingAutoDownloadValues = TextSecurePreferences.getRoamingMediaDownloadAllowed(
-      ApplicationDependencies.getApplication()
+      AppDependencies.application
     ),
-    callDataMode = SignalStore.settings().callDataMode,
-    sentMediaQuality = SignalStore.settings().sentMediaQuality
+    callDataMode = SignalStore.settings.callDataMode,
+    sentMediaQuality = SignalStore.settings.sentMediaQuality
   )
 
   class Factory(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsFragment.kt
index fa0c3d8f0a..0aff02bc08 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsFragment.kt
@@ -1,15 +1,16 @@
 package org.thoughtcrime.securesms.components.settings.app.help
 
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.viewModels
 import androidx.navigation.Navigation
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.signal.core.util.dp
 import org.thoughtcrime.securesms.BuildConfig
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.configure
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
@@ -49,25 +50,16 @@ class HelpSettingsFragment : DSLSettingsFragment(R.string.preferences__help) {
         summary = DSLSettingsText.from(BuildConfig.VERSION_NAME)
       )
 
-      if (FeatureFlags.selfUpdater()) {
-        switchPref(
-          title = DSLSettingsText.from(R.string.preferences__autoupdate_molly),
-          summary = DSLSettingsText.from(R.string.preferences__periodically_check_for_new_releases_and_ask_to_install_them),
-          isChecked = state.updateApkEnabled,
-          onClick = {
-            viewModel.setUpdateApkEnabled(!state.updateApkEnabled)
-          }
+      if (!BuildConfig.MANAGES_MOLLY_UPDATES) {
+        noPadTextPref(
+          title = DSLSettingsText.from(
+            R.string.HelpSettingsFragment_for_updates_please_check_your_app_store,
+            DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_BodyMedium),
+            DSLSettingsText.ColorModifier(ContextCompat.getColor(requireContext(), R.color.signal_colorOnSurfaceVariant))
+          )
         )
 
-        switchPref(
-          title = DSLSettingsText.from(R.string.preferences__include_beta_updates),
-          summary = DSLSettingsText.from(R.string.preferences__beta_versions_are_intended_for_testing_purposes_and_may_contain_bugs),
-          isChecked = state.includeBetaEnabled,
-          isEnabled = state.updateApkEnabled,
-          onClick = {
-            viewModel.setIncludeBetaEnabled(!state.includeBetaEnabled)
-          }
-        )
+        space(16.dp)
       }
 
       switchPref(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsViewModel.kt
index 3ad23190ba..ec14b14880 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/HelpSettingsViewModel.kt
@@ -6,14 +6,14 @@ import androidx.lifecycle.ViewModel
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.apkupdate.ApkUpdateNotifications
 import org.thoughtcrime.securesms.apkupdate.ApkUpdateRefreshListener
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.ApkUpdateJob
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.livedata.Store
 
 class HelpSettingsViewModel : ViewModel() {
 
-  private val application: Application = ApplicationDependencies.getApplication()
+  private val application: Application = AppDependencies.application
 
   private val store: Store<HelpSettingsState> = Store(getCurrentState())
 
@@ -34,9 +34,9 @@ class HelpSettingsViewModel : ViewModel() {
     refreshState()
   }
 
-  private fun checkForUpdates() {
+  fun checkForUpdates() {
     ApkUpdateRefreshListener.scheduleIfAllowed(application)
-    ApplicationDependencies.getJobManager().add(ApkUpdateJob())
+    AppDependencies.jobManager.add(ApkUpdateJob())
   }
 
   fun setLogEnabled(enabled: Boolean) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/LicenseFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/LicenseFragment.kt
index d4b692c951..7ac873bf2f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/LicenseFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/LicenseFragment.kt
@@ -26,6 +26,7 @@ import org.signal.core.ui.Scaffolds
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeFragment
+import java.io.InputStream
 
 class LicenseFragment : ComposeFragment() {
   private val TAG = Log.tag(LicenseFragment::class.java)
@@ -34,9 +35,9 @@ class LicenseFragment : ComposeFragment() {
   override fun FragmentContent() {
     val textState: State<List<String>> = Single
       .fromCallable {
-        requireContext().resources.openRawResource(R.raw.third_party_licenses).bufferedReader().use {
-          it.readText().split("\n")
-        }
+        requireContext().resources.openRawResource(R.raw.third_party_licenses).readToLines() +
+          requireContext().assets.open("acknowledgments/libsignal.md").readToLines() +
+          requireContext().assets.open("acknowledgments/ringrtc.md").readToLines()
       }
       .subscribeOn(Schedulers.io())
       .observeOn(AndroidSchedulers.mainThread())
@@ -74,3 +75,7 @@ fun LicenseScreen(licenseTextLines: List<String>, modifier: Modifier = Modifier)
 fun LicenseFragmentPreview() {
   LicenseScreen(listOf("Lorem ipsum", "Delor"))
 }
+
+private fun InputStream.readToLines(): List<String> {
+  return this.bufferedReader().use { it.readText().split("\n") }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalPendingOneTimeDonationConfigurationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalPendingOneTimeDonationConfigurationFragment.kt
new file mode 100644
index 0000000000..5da2a6fb7c
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalPendingOneTimeDonationConfigurationFragment.kt
@@ -0,0 +1,199 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.internal
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExposedDropdownMenuBox
+import androidx.compose.material3.ExposedDropdownMenuDefaults
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment.Companion.CenterHorizontally
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import org.signal.core.ui.Buttons
+import org.signal.core.ui.Rows
+import org.signal.core.ui.Scaffolds
+import org.signal.core.ui.theme.SignalTheme
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.app.internal.donor.DonationErrorValueCodeSelector
+import org.thoughtcrime.securesms.components.settings.app.internal.donor.DonationErrorValueTypeSelector
+import org.thoughtcrime.securesms.compose.ComposeFragment
+import org.thoughtcrime.securesms.database.model.databaseprotos.DonationErrorValue
+import org.thoughtcrime.securesms.database.model.databaseprotos.PendingOneTimeDonation
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+
+/**
+ * Allows configuration of a PendingOneTimeDonation object to display different
+ * states in the donation settings screen.
+ */
+class InternalPendingOneTimeDonationConfigurationFragment : ComposeFragment() {
+
+  private val viewModel: InternalPendingOneTimeDonationConfigurationViewModel by viewModels()
+
+  @Composable
+  override fun FragmentContent() {
+    val state by viewModel.state
+    Content(
+      state,
+      onNavigationClick = {
+        findNavController().popBackStack()
+      },
+      onAddError = {
+        viewModel.state.value = viewModel.state.value.copy(error = DonationErrorValue())
+      },
+      onClearError = {
+        viewModel.state.value = viewModel.state.value.copy(error = null)
+      },
+      onPaymentMethodTypeSelected = {
+        viewModel.state.value = viewModel.state.value.copy(paymentMethodType = it, error = null)
+      },
+      onErrorTypeSelected = {
+        viewModel.state.value = viewModel.state.value.copy(error = viewModel.state.value.error!!.copy(type = it))
+      },
+      onErrorCodeChanged = {
+        viewModel.state.value = viewModel.state.value.copy(error = viewModel.state.value.error!!.copy(code = it))
+      },
+      onSave = {
+        SignalStore.inAppPayments.setPendingOneTimeDonation(viewModel.state.value)
+        findNavController().popBackStack()
+      }
+    )
+  }
+}
+
+@Preview
+@Composable
+private fun ContentPreview() {
+  SignalTheme {
+    Surface {
+      Content(
+        state = PendingOneTimeDonation.Builder().error(DonationErrorValue()).build(),
+        onNavigationClick = {},
+        onClearError = {},
+        onAddError = {},
+        onPaymentMethodTypeSelected = {},
+        onErrorTypeSelected = {},
+        onErrorCodeChanged = {},
+        onSave = {}
+      )
+    }
+  }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun Content(
+  state: PendingOneTimeDonation,
+  onNavigationClick: () -> Unit,
+  onAddError: () -> Unit,
+  onClearError: () -> Unit,
+  onPaymentMethodTypeSelected: (PendingOneTimeDonation.PaymentMethodType) -> Unit,
+  onErrorTypeSelected: (DonationErrorValue.Type) -> Unit,
+  onErrorCodeChanged: (String) -> Unit,
+  onSave: () -> Unit
+) {
+  Scaffolds.Settings(
+    title = "One-time donation state",
+    navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_left_24),
+    navigationContentDescription = null,
+    onNavigationClick = onNavigationClick
+  ) {
+    LazyColumn(
+      horizontalAlignment = CenterHorizontally,
+      modifier = Modifier.padding(it)
+    ) {
+      item {
+        var expanded by remember {
+          mutableStateOf(false)
+        }
+
+        ExposedDropdownMenuBox(
+          expanded = expanded,
+          onExpandedChange = {
+            expanded = !expanded
+          }
+        ) {
+          TextField(
+            value = state.paymentMethodType.name,
+            onValueChange = {},
+            readOnly = true,
+            trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
+            modifier = Modifier.menuAnchor()
+          )
+
+          ExposedDropdownMenu(
+            expanded = expanded,
+            onDismissRequest = { expanded = false }
+          ) {
+            PendingOneTimeDonation.PaymentMethodType.values().forEach { item ->
+              DropdownMenuItem(
+                text = { Text(text = item.name) },
+                onClick = {
+                  onPaymentMethodTypeSelected(item)
+                  expanded = false
+                }
+              )
+            }
+          }
+        }
+      }
+
+      item {
+        Rows.ToggleRow(
+          checked = state.error != null,
+          text = "Enable error",
+          onCheckChanged = {
+            if (it) {
+              onAddError()
+            } else {
+              onClearError()
+            }
+          }
+        )
+      }
+
+      if (state.error != null) {
+        item {
+          DonationErrorValueTypeSelector(
+            selectedPaymentMethodType = state.paymentMethodType,
+            selectedErrorType = state.error.type,
+            onErrorTypeSelected = onErrorTypeSelected
+          )
+        }
+
+        item {
+          DonationErrorValueCodeSelector(
+            selectedPaymentMethodType = state.paymentMethodType,
+            selectedErrorType = state.error.type,
+            selectedErrorCode = state.error.code,
+            onErrorCodeSelected = onErrorCodeChanged
+          )
+        }
+      }
+
+      item {
+        Buttons.LargeTonal(
+          enabled = state.badge != null,
+          onClick = onSave
+        ) {
+          Text(text = "Save")
+        }
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalPendingOneTimeDonationConfigurationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalPendingOneTimeDonationConfigurationViewModel.kt
new file mode 100644
index 0000000000..e0c1144b0a
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalPendingOneTimeDonationConfigurationViewModel.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.internal
+
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.disposables.Disposable
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.util.money.FiatMoney
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatValue
+import org.thoughtcrime.securesms.database.model.databaseprotos.PendingOneTimeDonation
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import java.math.BigDecimal
+import java.util.Currency
+import java.util.Locale
+
+/**
+ * Fetches a badge for our pending donation, which requires downloading the donation config.
+ */
+class InternalPendingOneTimeDonationConfigurationViewModel : ViewModel() {
+
+  val state: MutableState<PendingOneTimeDonation> = mutableStateOf(
+    PendingOneTimeDonation(
+      timestamp = System.currentTimeMillis(),
+      amount = FiatMoney(BigDecimal.valueOf(20), Currency.getInstance("EUR")).toFiatValue()
+    )
+  )
+
+  val disposable: Disposable = Single
+    .fromCallable {
+      AppDependencies.donationsService
+        .getDonationsConfiguration(Locale.getDefault())
+    }
+    .flatMap { it.flattenResult() }
+    .subscribeOn(Schedulers.io())
+    .observeOn(AndroidSchedulers.mainThread())
+    .subscribe { config ->
+      val badge = Badges.fromServiceBadge(config.levels.values.first().badge)
+      state.value = state.value.copy(badge = Badges.toDatabaseBadge(badge))
+    }
+
+  override fun onCleared() {
+    super.onCleared()
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt
index 11fc36fe3f..5061379f48 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt
@@ -33,11 +33,10 @@ import org.thoughtcrime.securesms.database.LogDatabase
 import org.thoughtcrime.securesms.database.MegaphoneDatabase
 import org.thoughtcrime.securesms.database.OneTimePreKeyTable
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.JobTracker
 import org.thoughtcrime.securesms.jobs.DownloadLatestEmojiDataJob
 import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob
-import org.thoughtcrime.securesms.jobs.PnpInitializeDevicesJob
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob
 import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob
 import org.thoughtcrime.securesms.jobs.RemoteConfigRefreshJob
@@ -60,7 +59,7 @@ import java.util.UUID
 import java.util.concurrent.TimeUnit
 import kotlin.math.max
 import kotlin.random.Random
-import kotlin.random.nextInt
+import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
 class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__internal_preferences) {
@@ -79,13 +78,13 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
     super.onPause()
     val firstVisiblePosition: Int? = layoutManager?.findFirstVisibleItemPosition()
     if (firstVisiblePosition != null) {
-      SignalStore.internalValues().lastScrollPosition = firstVisiblePosition
+      SignalStore.internal.lastScrollPosition = firstVisiblePosition
     }
   }
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
-    scrollToPosition = SignalStore.internalValues().lastScrollPosition
+    scrollToPosition = SignalStore.internal.lastScrollPosition
   }
 
   override fun bindAdapter(adapter: MappingAdapter) {
@@ -196,7 +195,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
         summary = DSLSettingsText.from("Clear backoff intervals, app will restart"),
         onClick = {
           SimpleTask.run({
-            JobDatabase.getInstance(ApplicationDependencies.getApplication()).debugResetBackoffInterval()
+            JobDatabase.getInstance(AppDependencies.application).debugResetBackoffInterval()
           }) {
             AppUtil.restart(requireContext())
           }
@@ -328,15 +327,6 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
         }
       )
 
-      switchPref(
-        title = DSLSettingsText.from("Ignore server changes"),
-        summary = DSLSettingsText.from("Changes in server's response will be ignored, causing passive voice update messages if P2P is also ignored."),
-        isChecked = state.gv2ignoreServerChanges,
-        onClick = {
-          viewModel.setGv2IgnoreServerChanges(!state.gv2ignoreServerChanges)
-        }
-      )
-
       switchPref(
         title = DSLSettingsText.from("Ignore P2P changes"),
         summary = DSLSettingsText.from("Changes sent P2P will be ignored. In conjunction with ignoring server changes, will cause passive voice."),
@@ -357,7 +347,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
         onClick = {
           viewModel.setForceWebsocketMode(!state.forceWebsocketMode)
           SimpleTask.run({
-            val jobState = ApplicationDependencies.getJobManager().runSynchronously(RefreshAttributesJob(), 10.seconds.inWholeMilliseconds)
+            val jobState = AppDependencies.jobManager.runSynchronously(RefreshAttributesJob(), 10.seconds.inWholeMilliseconds)
             return@run jobState.isPresent && jobState.get().isComplete
           }, { success ->
             if (success) {
@@ -413,7 +403,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
         title = DSLSettingsText.from("Force emoji download"),
         summary = DSLSettingsText.from("Download the latest emoji set if it\\'s newer than what we have."),
         onClick = {
-          ApplicationDependencies.getJobManager().add(DownloadLatestEmojiDataJob(true))
+          AppDependencies.jobManager.add(DownloadLatestEmojiDataJob(true))
         }
       )
 
@@ -523,7 +513,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
       clickPref(
         title = DSLSettingsText.from("Set last version seen back 10 versions"),
         onClick = {
-          SignalStore.releaseChannelValues().highestVersionNoteReceived = max(SignalStore.releaseChannelValues().highestVersionNoteReceived - 10, 0)
+          SignalStore.releaseChannel.highestVersionNoteReceived = max(SignalStore.releaseChannel.highestVersionNoteReceived - 10, 0)
         }
       )
 
@@ -531,19 +521,19 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
         title = DSLSettingsText.from("Reset donation megaphone"),
         onClick = {
           SignalDatabase.remoteMegaphones.debugRemoveAll()
-          MegaphoneDatabase.getInstance(ApplicationDependencies.getApplication()).let {
+          MegaphoneDatabase.getInstance(AppDependencies.application).let {
             it.delete(Megaphones.Event.REMOTE_MEGAPHONE)
             it.markFirstVisible(Megaphones.Event.DONATE_MOLLY, System.currentTimeMillis() - TimeUnit.DAYS.toMillis(31))
           }
           // Force repository database cache refresh
-          MegaphoneRepository(ApplicationDependencies.getApplication()).onFirstEverAppLaunch()
+          MegaphoneRepository(AppDependencies.application).onFirstEverAppLaunch()
         }
       )
 
       clickPref(
         title = DSLSettingsText.from("Fetch release channel"),
         onClick = {
-          SignalStore.releaseChannelValues().previousManifestMd5 = ByteArray(0)
+          SignalStore.releaseChannel.previousManifestMd5 = ByteArray(0)
           RetrieveRemoteAnnouncementsJob.enqueue(force = true)
         }
       )
@@ -607,7 +597,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
         title = DSLSettingsText.from("Clear choose initial my story privacy state"),
         isEnabled = true,
         onClick = {
-          SignalStore.storyValues().userHasBeenNotifiedAboutStories = false
+          SignalStore.story.userHasBeenNotifiedAboutStories = false
         }
       )
 
@@ -615,7 +605,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
         title = DSLSettingsText.from("Clear first time navigation state"),
         isEnabled = true,
         onClick = {
-          SignalStore.storyValues().userHasSeenFirstNavView = false
+          SignalStore.story.userHasSeenFirstNavView = false
         }
       )
 
@@ -630,32 +620,6 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
 
       sectionHeaderPref(DSLSettingsText.from("PNP"))
 
-      clickPref(
-        title = DSLSettingsText.from("Trigger 'Hello World' event"),
-        isEnabled = true,
-        onClick = {
-          SimpleTask.run(viewLifecycleOwner.lifecycle, {
-            ApplicationDependencies.getJobManager().runSynchronously(PnpInitializeDevicesJob(), 10.seconds.inWholeMilliseconds)
-          }, { state ->
-            if (state.isPresent) {
-              Toast.makeText(context, "Job finished with result: ${state.get()}!", Toast.LENGTH_SHORT).show()
-              viewModel.refresh()
-            } else {
-              Toast.makeText(context, "Job timed out after 10 seconds!", Toast.LENGTH_SHORT).show()
-            }
-          })
-        }
-      )
-
-      clickPref(
-        title = DSLSettingsText.from("Reset 'PNP initialized' state"),
-        summary = DSLSettingsText.from("Current initialized state: ${state.pnpInitialized}"),
-        isEnabled = state.pnpInitialized,
-        onClick = {
-          viewModel.resetPnpInitializedState()
-        }
-      )
-
       clickPref(
         title = DSLSettingsText.from("Corrupt username"),
         summary = DSLSettingsText.from("Changes our local username without telling the server so it falls out of sync. Refresh profile afterwards to trigger corruption."),
@@ -666,7 +630,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
             .setPositiveButton(android.R.string.ok) { _, _ ->
               val random = "${(1..5).map { ('a'..'z').random() }.joinToString(separator = "") }.${Random.nextInt(10, 100)}"
 
-              SignalStore.account().username = random
+              SignalStore.account.username = random
               SignalDatabase.recipients.setUsername(Recipient.self().id, random)
               StorageSyncHelper.scheduleSyncForDataChange()
 
@@ -685,9 +649,9 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
             .setTitle("Corrupt your username link?")
             .setMessage("Are you sure? You'll have to reset your link.")
             .setPositiveButton(android.R.string.ok) { _, _ ->
-              SignalStore.account().usernameLink = UsernameLinkComponents(
+              SignalStore.account.usernameLink = UsernameLinkComponents(
                 entropy = Util.getSecretBytes(32),
-                serverId = SignalStore.account().usernameLink?.serverId ?: UUID.randomUUID()
+                serverId = SignalStore.account.usernameLink?.serverId ?: UUID.randomUUID()
               )
               StorageSyncHelper.scheduleSyncForDataChange()
               Toast.makeText(context, "Done", Toast.LENGTH_SHORT).show()
@@ -702,7 +666,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
       clickPref(
         title = DSLSettingsText.from("Reset pull to refresh tip count"),
         onClick = {
-          SignalStore.uiHints().resetNeverDisplayPullToRefreshCount()
+          SignalStore.uiHints.resetNeverDisplayPullToRefreshCount()
         }
       )
 
@@ -733,9 +697,10 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
           ThreadUtil.runOnMain {
             when (it) {
               AdvancedPrivacySettingsRepository.DisablePushMessagesResult.SUCCESS -> {
-                SignalStore.account().setRegistered(false)
-                SignalStore.registrationValues().clearRegistrationComplete()
-                SignalStore.registrationValues().clearHasUploadedProfile()
+                SignalStore.account.setRegistered(false)
+                SignalStore.registration.clearRegistrationComplete()
+                SignalStore.registration.clearHasUploadedProfile()
+                SignalStore.registration.clearSkippedTransferOrRestore()
                 Toast.makeText(context, "Unregistered!", Toast.LENGTH_SHORT).show()
               }
 
@@ -762,7 +727,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
       .setPositiveButton(
         "Copy"
       ) { _: DialogInterface?, _: Int ->
-        val context: Context = ApplicationDependencies.getApplication()
+        val context: Context = AppDependencies.application
         val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
 
         SimpleTask.run<Any?>(
@@ -787,7 +752,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
   }
 
   private fun refreshAttributes() {
-    ApplicationDependencies.getJobManager()
+    AppDependencies.jobManager
       .startChain(RefreshAttributesJob())
       .then(RefreshOwnProfileJob())
       .enqueue()
@@ -795,19 +760,19 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
   }
 
   private fun refreshProfile() {
-    ApplicationDependencies.getJobManager().add(RefreshOwnProfileJob())
+    AppDependencies.jobManager.add(RefreshOwnProfileJob())
     Toast.makeText(context, "Scheduled profile refresh", Toast.LENGTH_SHORT).show()
   }
 
   private fun rotateProfileKey() {
-    ApplicationDependencies.getJobManager().add(RotateProfileKeyJob())
+    AppDependencies.jobManager.add(RotateProfileKeyJob())
     Toast.makeText(context, "Scheduled profile key rotation", Toast.LENGTH_SHORT).show()
   }
 
   private fun refreshRemoteValues() {
     Toast.makeText(context, "Running remote config refresh, app will restart after completion.", Toast.LENGTH_LONG).show()
     SignalExecutors.BOUNDED.execute {
-      val result: Optional<JobTracker.JobState> = ApplicationDependencies.getJobManager().runSynchronously(RemoteConfigRefreshJob(), TimeUnit.SECONDS.toMillis(10))
+      val result: Optional<JobTracker.JobState> = AppDependencies.jobManager.runSynchronously(RemoteConfigRefreshJob(), TimeUnit.SECONDS.toMillis(10))
 
       if (result.isPresent && result.get() == JobTracker.JobState.SUCCESS) {
         AppUtil.restart(requireContext())
@@ -823,7 +788,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
   }
 
   private fun enqueueStorageServiceForcePush() {
-    ApplicationDependencies.getJobManager().add(StorageForcePushJob())
+    AppDependencies.jobManager.add(StorageForcePushJob())
     Toast.makeText(context, "Scheduled storage force push", Toast.LENGTH_SHORT).show()
   }
 
@@ -844,13 +809,13 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
   }
 
   private fun clearAllLocalMetricsState() {
-    LocalMetricsDatabase.getInstance(ApplicationDependencies.getApplication()).clear()
+    LocalMetricsDatabase.getInstance(AppDependencies.application).clear()
     Toast.makeText(context, "Cleared all local metrics state.", Toast.LENGTH_SHORT).show()
   }
 
   private fun clearCdsHistory() {
     SignalDatabase.cds.clearAll()
-    SignalStore.misc().cdsToken = null
+    SignalStore.misc.cdsToken = null
     Toast.makeText(context, "Cleared all CDS history.", Toast.LENGTH_SHORT).show()
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsRepository.kt
index bb61b1943c..52a29f571c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsRepository.kt
@@ -3,16 +3,18 @@ package org.thoughtcrime.securesms.components.settings.app.internal
 import android.content.Context
 import org.json.JSONObject
 import org.signal.core.util.concurrent.SignalExecutors
+import org.signal.donations.InAppPaymentType
 import org.thoughtcrime.securesms.database.MessageTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.RemoteMegaphoneRecord
 import org.thoughtcrime.securesms.database.model.addStyle
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.emoji.EmojiFiles
 import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob
 import org.thoughtcrime.securesms.jobs.CreateReleaseChannelJob
 import org.thoughtcrime.securesms.jobs.FetchRemoteMegaphoneImageJob
+import org.thoughtcrime.securesms.jobs.InAppPaymentRecurringContextJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.notifications.v2.ConversationId
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -30,9 +32,18 @@ class InternalSettingsRepository(context: Context) {
     }
   }
 
+  fun enqueueSubscriptionRedemption() {
+    SignalExecutors.BOUNDED.execute {
+      val latest = SignalDatabase.inAppPayments.getByLatestEndOfPeriod(InAppPaymentType.RECURRING_DONATION)
+      if (latest != null) {
+        InAppPaymentRecurringContextJob.createJobChain(latest).enqueue()
+      }
+    }
+  }
+
   fun addSampleReleaseNote() {
     SignalExecutors.UNBOUNDED.execute {
-      ApplicationDependencies.getJobManager().runSynchronously(CreateReleaseChannelJob.create(), 5000)
+      AppDependencies.jobManager.runSynchronously(CreateReleaseChannelJob.create(), 5000)
 
       val title = "Release Note Title"
       val bodyText = "Release note body. Aren't I awesome?"
@@ -40,7 +51,7 @@ class InternalSettingsRepository(context: Context) {
       val bodyRangeList = BodyRangeList.Builder()
         .addStyle(BodyRangeList.BodyRange.Style.BOLD, 0, title.length)
 
-      val recipientId = SignalStore.releaseChannelValues().releaseChannelRecipientId!!
+      val recipientId = SignalStore.releaseChannel.releaseChannelRecipientId!!
       val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
 
       val insertResult: MessageTable.InsertResult? = ReleaseChannel.insertReleaseChannelMessage(
@@ -57,9 +68,9 @@ class InternalSettingsRepository(context: Context) {
 
       if (insertResult != null) {
         SignalDatabase.attachments.getAttachmentsForMessage(insertResult.messageId)
-          .forEach { ApplicationDependencies.getJobManager().add(AttachmentDownloadJob(insertResult.messageId, it.attachmentId, false)) }
+          .forEach { AppDependencies.jobManager.add(AttachmentDownloadJob(insertResult.messageId, it.attachmentId, false)) }
 
-        ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(insertResult.threadId))
+        AppDependencies.messageNotifier.updateNotification(context, ConversationId.forConversation(insertResult.threadId))
       }
     }
   }
@@ -89,7 +100,7 @@ class InternalSettingsRepository(context: Context) {
       SignalDatabase.remoteMegaphones.insert(record)
 
       if (record.imageUrl != null) {
-        ApplicationDependencies.getJobManager().add(FetchRemoteMegaphoneImageJob(record.uuid, record.imageUrl))
+        AppDependencies.jobManager.add(FetchRemoteMegaphoneImageJob(record.uuid, record.imageUrl))
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsState.kt
index 5bfb0ce1eb..e2c45c74b6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsState.kt
@@ -6,7 +6,6 @@ import org.thoughtcrime.securesms.emoji.EmojiFiles
 data class InternalSettingsState(
   val seeMoreUserDetails: Boolean,
   val gv2forceInvites: Boolean,
-  val gv2ignoreServerChanges: Boolean,
   val gv2ignoreP2PChanges: Boolean,
   val allowCensorshipSetting: Boolean,
   val forceWebsocketMode: Boolean,
@@ -14,13 +13,12 @@ data class InternalSettingsState(
   val callingAudioProcessingMethod: CallManager.AudioProcessingMethod,
   val callingDataMode: CallManager.DataMode,
   val callingDisableTelecom: Boolean,
-  val callingDisableLBRed: Boolean,
+  val callingEnableOboeAdm: Boolean,
   val useBuiltInEmojiSet: Boolean,
   val emojiVersion: EmojiFiles.Version?,
   val removeSenderKeyMinimium: Boolean,
   val delayResends: Boolean,
   val disableStorageService: Boolean,
   val canClearOnboardingState: Boolean,
-  val pnpInitialized: Boolean,
   val useConversationItemV2ForMedia: Boolean,
 )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsViewModel.kt
index 171d045a2e..112753f344 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsViewModel.kt
@@ -40,11 +40,6 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
     refresh()
   }
 
-  fun setGv2IgnoreServerChanges(enabled: Boolean) {
-    preferenceDataStore.putBoolean(InternalValues.GV2_IGNORE_SERVER_CHANGES, enabled)
-    refresh()
-  }
-
   fun setGv2IgnoreP2PChanges(enabled: Boolean) {
     preferenceDataStore.putBoolean(InternalValues.GV2_IGNORE_P2P_CHANGES, enabled)
     refresh()
@@ -60,11 +55,6 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
     refresh()
   }
 
-  fun resetPnpInitializedState() {
-    SignalStore.misc().hasPniInitializedDevices = false
-    refresh()
-  }
-
   fun setUseBuiltInEmoji(enabled: Boolean) {
     preferenceDataStore.putBoolean(InternalValues.FORCE_BUILT_IN_EMOJI, enabled)
     refresh()
@@ -100,13 +90,13 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
     refresh()
   }
 
-  fun setInternalCallingDisableLBRed(enabled: Boolean) {
-    preferenceDataStore.putBoolean(InternalValues.CALLING_DISABLE_LBRED, enabled)
+  fun setInternalCallingEnableOboeAdm(enabled: Boolean) {
+    preferenceDataStore.putBoolean(InternalValues.CALLING_ENABLE_OBOE_ADM, enabled)
     refresh()
   }
 
   fun setUseConversationItemV2Media(enabled: Boolean) {
-    SignalStore.internalValues().setUseConversationItemV2Media(enabled)
+    SignalStore.internal.setUseConversationItemV2Media(enabled)
     refresh()
   }
 
@@ -123,30 +113,28 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
   }
 
   private fun getState() = InternalSettingsState(
-    seeMoreUserDetails = SignalStore.internalValues().recipientDetails(),
-    gv2forceInvites = SignalStore.internalValues().gv2ForceInvites(),
-    gv2ignoreServerChanges = SignalStore.internalValues().gv2IgnoreServerChanges(),
-    gv2ignoreP2PChanges = SignalStore.internalValues().gv2IgnoreP2PChanges(),
-    allowCensorshipSetting = SignalStore.internalValues().allowChangingCensorshipSetting(),
-    forceWebsocketMode = SignalStore.internalValues().isWebsocketModeForced,
-    callingServer = SignalStore.internalValues().groupCallingServer(),
-    callingAudioProcessingMethod = SignalStore.internalValues().callingAudioProcessingMethod(),
-    callingDataMode = SignalStore.internalValues().callingDataMode(),
-    callingDisableTelecom = SignalStore.internalValues().callingDisableTelecom(),
-    callingDisableLBRed = SignalStore.internalValues().callingDisableLBRed(),
-    useBuiltInEmojiSet = SignalStore.internalValues().forceBuiltInEmoji(),
+    seeMoreUserDetails = SignalStore.internal.recipientDetails(),
+    gv2forceInvites = SignalStore.internal.gv2ForceInvites(),
+    gv2ignoreP2PChanges = SignalStore.internal.gv2IgnoreP2PChanges(),
+    allowCensorshipSetting = SignalStore.internal.allowChangingCensorshipSetting(),
+    forceWebsocketMode = SignalStore.internal.isWebsocketModeForced,
+    callingServer = SignalStore.internal.groupCallingServer(),
+    callingAudioProcessingMethod = SignalStore.internal.callingAudioProcessingMethod(),
+    callingDataMode = SignalStore.internal.callingDataMode(),
+    callingDisableTelecom = SignalStore.internal.callingDisableTelecom(),
+    callingEnableOboeAdm = SignalStore.internal.callingEnableOboeAdm(),
+    useBuiltInEmojiSet = SignalStore.internal.forceBuiltInEmoji(),
     emojiVersion = null,
-    removeSenderKeyMinimium = SignalStore.internalValues().removeSenderKeyMinimum(),
-    delayResends = SignalStore.internalValues().delayResends(),
-    disableStorageService = SignalStore.internalValues().storageServiceDisabled(),
-    canClearOnboardingState = SignalStore.storyValues().hasDownloadedOnboardingStory && Stories.isFeatureEnabled(),
-    pnpInitialized = SignalStore.misc().hasPniInitializedDevices,
-    useConversationItemV2ForMedia = SignalStore.internalValues().useConversationItemV2Media(),
+    removeSenderKeyMinimium = SignalStore.internal.removeSenderKeyMinimum(),
+    delayResends = SignalStore.internal.delayResends(),
+    disableStorageService = SignalStore.internal.storageServiceDisabled(),
+    canClearOnboardingState = SignalStore.story.hasDownloadedOnboardingStory && Stories.isFeatureEnabled(),
+    useConversationItemV2ForMedia = SignalStore.internal.useConversationItemV2Media(),
   )
 
   fun onClearOnboardingState() {
-    SignalStore.storyValues().hasDownloadedOnboardingStory = false
-    SignalStore.storyValues().userHasViewedOnboardingStory = false
+    SignalStore.story.hasDownloadedOnboardingStory = false
+    SignalStore.story.userHasViewedOnboardingStory = false
     Stories.onStorySettingsChanged(Recipient.self().id)
     refresh()
     StoryOnboardingDownloadJob.enqueueIfNeeded()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalTerminalDonationConfigurationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalTerminalDonationConfigurationFragment.kt
new file mode 100644
index 0000000000..30680c563b
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalTerminalDonationConfigurationFragment.kt
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.internal
+
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.navigation.fragment.findNavController
+import org.signal.core.ui.Buttons
+import org.signal.core.ui.Rows
+import org.signal.core.ui.theme.SignalTheme
+import org.thoughtcrime.securesms.components.settings.app.internal.donor.DonationErrorValueCodeSelector
+import org.thoughtcrime.securesms.components.settings.app.internal.donor.DonationErrorValueTypeSelector
+import org.thoughtcrime.securesms.compose.ComposeFragment
+import org.thoughtcrime.securesms.database.model.databaseprotos.DonationErrorValue
+import org.thoughtcrime.securesms.database.model.databaseprotos.PendingOneTimeDonation
+import org.thoughtcrime.securesms.database.model.databaseprotos.TerminalDonationQueue
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+
+/**
+ * Configuration fragment for [TerminalDonationQueue.TerminalDonation]
+ */
+class InternalTerminalDonationConfigurationFragment : ComposeFragment() {
+
+  @Composable
+  override fun FragmentContent() {
+    InternalTerminalDonationConfigurationContent(
+      onAddClick = {
+        SignalStore.inAppPayments.appendToTerminalDonationQueue(it)
+        findNavController().popBackStack()
+      }
+    )
+  }
+}
+
+@Preview
+@Composable
+private fun InternalTerminalDonationConfigurationContentPreview() {
+  SignalTheme {
+    Surface {
+      InternalTerminalDonationConfigurationContent(
+        onAddClick = {}
+      )
+    }
+  }
+}
+
+@Composable
+private fun InternalTerminalDonationConfigurationContent(
+  onAddClick: (TerminalDonationQueue.TerminalDonation) -> Unit
+) {
+  val terminalDonationState: MutableState<TerminalDonationQueue.TerminalDonation> = remember {
+    mutableStateOf(
+      TerminalDonationQueue.TerminalDonation(
+        level = 1000L,
+        isLongRunningPaymentMethod = true
+      )
+    )
+  }
+
+  val paymentMethodType = remember(terminalDonationState.value.isLongRunningPaymentMethod) {
+    if (terminalDonationState.value.isLongRunningPaymentMethod) PendingOneTimeDonation.PaymentMethodType.SEPA_DEBIT else PendingOneTimeDonation.PaymentMethodType.CARD
+  }
+
+  LazyColumn(
+    horizontalAlignment = Alignment.CenterHorizontally
+  ) {
+    item {
+      Rows.ToggleRow(
+        checked = terminalDonationState.value.isLongRunningPaymentMethod,
+        text = "Long-running payment method",
+        onCheckChanged = {
+          terminalDonationState.value = terminalDonationState.value.copy(isLongRunningPaymentMethod = it)
+        }
+      )
+    }
+
+    item {
+      Rows.ToggleRow(
+        checked = terminalDonationState.value.error != null,
+        text = "Enable error",
+        onCheckChanged = {
+          val error = if (it) {
+            DonationErrorValue()
+          } else {
+            null
+          }
+
+          terminalDonationState.value = terminalDonationState.value.copy(error = error)
+        }
+      )
+    }
+
+    val error = terminalDonationState.value.error
+    if (error != null) {
+      item {
+        DonationErrorValueTypeSelector(
+          selectedPaymentMethodType = paymentMethodType,
+          selectedErrorType = error.type,
+          onErrorTypeSelected = {
+            terminalDonationState.value = terminalDonationState.value.copy(
+              error = error.copy(
+                type = it,
+                code = ""
+              )
+            )
+          }
+        )
+      }
+
+      item {
+        DonationErrorValueCodeSelector(
+          selectedPaymentMethodType = paymentMethodType,
+          selectedErrorType = error.type,
+          selectedErrorCode = error.code,
+          onErrorCodeSelected = {
+            terminalDonationState.value = terminalDonationState.value.copy(
+              error = error.copy(
+                code = it
+              )
+            )
+          }
+        )
+      }
+    }
+
+    item {
+      Buttons.LargeTonal(
+        onClick = { onAddClick(terminalDonationState.value) },
+        modifier = Modifier.defaultMinSize(minWidth = 220.dp)
+      ) {
+        Text(text = "Confirm")
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundFragment.kt
index cf433df35a..38d418a736 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundFragment.kt
@@ -170,7 +170,7 @@ class InternalBackupPlaygroundFragment : ComposeFragment() {
       },
       mediaContent = { snackbarHostState ->
         MediaList(
-          enabled = SignalStore.backup().backsUpMedia,
+          enabled = SignalStore.backup.backsUpMedia,
           state = mediaState,
           snackbarHostState = snackbarHostState,
           archiveAttachmentMedia = { viewModel.archiveAttachmentMedia(it) },
@@ -215,7 +215,7 @@ fun Tabs(
             }
           },
           actions = {
-            if (tabIndex == 1 && SignalStore.backup().backsUpMedia) {
+            if (tabIndex == 1 && SignalStore.backup.backsUpMedia) {
               TextButton(onClick = onDeleteAllArchivedMedia) {
                 Text(text = "Delete All")
               }
@@ -429,7 +429,7 @@ fun MediaList(
 ) {
   if (!enabled) {
     Text(
-      text = "You do not have read/write to archive cdn enabled via SignalStore.backup()",
+      text = "You do not have read/write to archive cdn enabled via SignalStore.backup",
       modifier = Modifier
         .padding(16.dp)
     )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundViewModel.kt
index 63787909a0..fc17946092 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/backup/InternalBackupPlaygroundViewModel.kt
@@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.backup.v2.BackupMetadata
 import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.database.MessageType
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.ArchiveAttachmentJob
 import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob
 import org.thoughtcrime.securesms.jobs.AttachmentUploadJob
@@ -69,7 +69,7 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
   fun triggerBackupJob() {
     _state.value = _state.value.copy(backupState = BackupState.EXPORT_IN_PROGRESS)
 
-    disposables += Single.fromCallable { ApplicationDependencies.getJobManager().runSynchronously(BackupMessagesJob(), 120_000) }
+    disposables += Single.fromCallable { AppDependencies.jobManager.runSynchronously(BackupMessagesJob(), 120_000) }
       .subscribeOn(Schedulers.io())
       .observeOn(AndroidSchedulers.mainThread())
       .subscribeBy {
@@ -143,7 +143,10 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
     _state.value = _state.value.copy(remoteBackupState = RemoteBackupState.Unknown)
 
     disposables += Single
-      .fromCallable { BackupRepository.getRemoteBackupState() }
+      .fromCallable {
+        BackupRepository.restoreBackupTier()
+        BackupRepository.getRemoteBackupState()
+      }
       .subscribeOn(Schedulers.io())
       .subscribe { result ->
         when {
@@ -166,8 +169,8 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
     _state.value = _state.value.copy(backupState = BackupState.IMPORT_IN_PROGRESS)
 
     disposables += Single.fromCallable {
-      ApplicationDependencies
-        .getJobManager()
+      AppDependencies
+        .jobManager
         .startChain(BackupRestoreJob())
         .then(SyncArchivedMediaJob())
         .then(BackupRestoreMediaJob())
@@ -245,8 +248,8 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
   private fun reUploadAndArchiveMedia(attachmentId: AttachmentId) {
     disposables += Single
       .fromCallable {
-        ApplicationDependencies
-          .getJobManager()
+        AppDependencies
+          .jobManager
           .startChain(AttachmentUploadJob(attachmentId))
           .then(ArchiveAttachmentJob(attachmentId))
           .enqueueAndBlockUntilCompletion(15.seconds.inWholeMilliseconds)
@@ -303,7 +306,7 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
   fun restoreArchivedMedia(attachment: BackupAttachment) {
     disposables += Completable
       .fromCallable {
-        val recipientId = SignalStore.releaseChannelValues().releaseChannelRecipientId!!
+        val recipientId = SignalStore.releaseChannel.releaseChannelRecipientId!!
         val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
 
         val message = IncomingMessage(
@@ -325,7 +328,7 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
 
         val archivedAttachment = SignalDatabase.attachments.getAttachmentsForMessage(insertMessage.messageId).first()
 
-        ApplicationDependencies.getJobManager().add(
+        AppDependencies.jobManager.add(
           AttachmentDownloadJob(
             messageId = insertMessage.messageId,
             attachmentId = archivedAttachment.attachmentId,
@@ -355,11 +358,18 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
   )
 
   enum class BackupState(val inProgress: Boolean = false) {
-    NONE, EXPORT_IN_PROGRESS(true), EXPORT_DONE, BACKUP_JOB_DONE, IMPORT_IN_PROGRESS(true)
+    NONE,
+    EXPORT_IN_PROGRESS(true),
+    EXPORT_DONE,
+    BACKUP_JOB_DONE,
+    IMPORT_IN_PROGRESS(true)
   }
 
   enum class BackupUploadState(val inProgress: Boolean = false) {
-    NONE, UPLOAD_IN_PROGRESS(true), UPLOAD_DONE, UPLOAD_FAILED
+    NONE,
+    UPLOAD_IN_PROGRESS(true),
+    UPLOAD_DONE,
+    UPLOAD_FAILED
   }
 
   sealed class RemoteBackupState {
@@ -378,7 +388,7 @@ class InternalBackupPlaygroundViewModel : ViewModel() {
       attachments: List<BackupAttachment> = this.attachments,
       inProgress: Set<AttachmentId> = this.inProgressMediaIds
     ): MediaState {
-      val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+      val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
 
       val updatedAttachments = attachments.map {
         val state = if (inProgress.contains(it.dbAttachment.attachmentId)) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonationErrorValues.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonationErrorValues.kt
new file mode 100644
index 0000000000..7d1c42b120
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonationErrorValues.kt
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.internal.donor
+
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExposedDropdownMenuBox
+import androidx.compose.material3.ExposedDropdownMenuDefaults
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import org.signal.donations.StripeDeclineCode
+import org.signal.donations.StripeFailureCode
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.PayPalDeclineCode
+import org.thoughtcrime.securesms.database.model.databaseprotos.DonationErrorValue
+import org.thoughtcrime.securesms.database.model.databaseprotos.PendingOneTimeDonation
+
+/**
+ * Displays a dropdown widget for selecting an error type.
+ */
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun DonationErrorValueTypeSelector(
+  selectedPaymentMethodType: PendingOneTimeDonation.PaymentMethodType,
+  selectedErrorType: DonationErrorValue.Type,
+  onErrorTypeSelected: (DonationErrorValue.Type) -> Unit
+) {
+  var expanded by remember {
+    mutableStateOf(false)
+  }
+
+  ExposedDropdownMenuBox(
+    expanded = expanded,
+    onExpandedChange = {
+      expanded = !expanded
+    }
+  ) {
+    TextField(
+      value = selectedErrorType.name,
+      onValueChange = {},
+      readOnly = true,
+      trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
+      modifier = Modifier.menuAnchor()
+    )
+
+    ExposedDropdownMenu(
+      expanded = expanded,
+      onDismissRequest = { expanded = false }
+    ) {
+      DonationErrorValue.Type.values().filterNot {
+        selectedPaymentMethodType == PendingOneTimeDonation.PaymentMethodType.PAYPAL && it == DonationErrorValue.Type.FAILURE_CODE
+      }.forEach { item ->
+        DropdownMenuItem(
+          text = { Text(text = item.name) },
+          onClick = {
+            onErrorTypeSelected(item)
+            expanded = false
+          }
+        )
+      }
+    }
+  }
+}
+
+/**
+ * Displays a dropdown widget for selecting an error code, if the corresponding type
+ * allows for such things.
+ */
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun DonationErrorValueCodeSelector(
+  selectedPaymentMethodType: PendingOneTimeDonation.PaymentMethodType,
+  selectedErrorType: DonationErrorValue.Type,
+  selectedErrorCode: String,
+  onErrorCodeSelected: (String) -> Unit
+) {
+  val isCodedError = remember(selectedErrorType) {
+    selectedErrorType in setOf(DonationErrorValue.Type.PROCESSOR_CODE, DonationErrorValue.Type.DECLINE_CODE, DonationErrorValue.Type.FAILURE_CODE)
+  }
+
+  var expanded by remember {
+    mutableStateOf(false)
+  }
+
+  if (isCodedError) {
+    ExposedDropdownMenuBox(
+      expanded = expanded,
+      onExpandedChange = {
+        expanded = !expanded
+      }
+    ) {
+      TextField(
+        value = selectedErrorCode,
+        onValueChange = {},
+        readOnly = true,
+        trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
+        modifier = Modifier.menuAnchor()
+      )
+
+      ExposedDropdownMenu(
+        expanded = expanded,
+        onDismissRequest = { expanded = false }
+      ) {
+        when (selectedErrorType) {
+          DonationErrorValue.Type.PROCESSOR_CODE -> {
+            ProcessorErrorsDropdown(selectedPaymentMethodType, onErrorCodeSelected)
+          }
+
+          DonationErrorValue.Type.DECLINE_CODE -> {
+            DeclineCodeErrorsDropdown(selectedPaymentMethodType, onErrorCodeSelected)
+          }
+
+          DonationErrorValue.Type.FAILURE_CODE -> {
+            FailureCodeErrorsDropdown(onErrorCodeSelected)
+          }
+
+          else -> error("This should never happen")
+        }
+      }
+    }
+  }
+}
+
+@Composable
+private fun ProcessorErrorsDropdown(
+  paymentMethodType: PendingOneTimeDonation.PaymentMethodType,
+  onErrorCodeSelected: (String) -> Unit
+) {
+  val values = when (paymentMethodType) {
+    PendingOneTimeDonation.PaymentMethodType.PAYPAL -> arrayOf("2046", "2074")
+    else -> arrayOf("currency_not_supported", "call_issuer")
+  }
+
+  ValuesDropdown(values = values, onErrorCodeSelected = onErrorCodeSelected)
+}
+
+@Composable
+private fun DeclineCodeErrorsDropdown(
+  paymentMethodType: PendingOneTimeDonation.PaymentMethodType,
+  onErrorCodeSelected: (String) -> Unit
+) {
+  val values = remember(paymentMethodType) {
+    when (paymentMethodType) {
+      PendingOneTimeDonation.PaymentMethodType.PAYPAL -> PayPalDeclineCode.KnownCode.values()
+      else -> StripeDeclineCode.Code.values()
+    }.map { it.name }.toTypedArray()
+  }
+
+  ValuesDropdown(values = values, onErrorCodeSelected = onErrorCodeSelected)
+}
+
+@Composable
+private fun FailureCodeErrorsDropdown(
+  onErrorCodeSelected: (String) -> Unit
+) {
+  val values = remember {
+    StripeFailureCode.Code.values().map { it.name }.toTypedArray()
+  }
+
+  ValuesDropdown(values = values, onErrorCodeSelected = onErrorCodeSelected)
+}
+
+@Composable
+private fun ValuesDropdown(values: Array<String>, onErrorCodeSelected: (String) -> Unit) {
+  values.forEach { item ->
+    DropdownMenuItem(
+      text = { Text(text = item) },
+      onClick = {
+        onErrorCodeSelected(item)
+      }
+    )
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationFragment.kt
new file mode 100644
index 0000000000..db768533a8
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationFragment.kt
@@ -0,0 +1,65 @@
+package org.thoughtcrime.securesms.components.settings.app.internal.donor
+
+import androidx.fragment.app.viewModels
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import org.signal.core.util.concurrent.LifecycleDisposable
+import org.signal.donations.StripeDeclineCode
+import org.thoughtcrime.securesms.components.settings.DSLConfiguration
+import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
+import org.thoughtcrime.securesms.components.settings.DSLSettingsText
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.UnexpectedSubscriptionCancellation
+import org.thoughtcrime.securesms.components.settings.configure
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+
+class InternalDonorErrorConfigurationFragment : DSLSettingsFragment() {
+
+  private val viewModel: InternalDonorErrorConfigurationViewModel by viewModels()
+  private val lifecycleDisposable = LifecycleDisposable()
+
+  override fun bindAdapter(adapter: MappingAdapter) {
+    lifecycleDisposable += viewModel.state.observeOn(AndroidSchedulers.mainThread()).subscribe { state ->
+      adapter.submitList(getConfiguration(state).toMappingModelList())
+    }
+  }
+
+  private fun getConfiguration(state: InternalDonorErrorConfigurationState): DSLConfiguration {
+    return configure {
+      radioListPref(
+        title = DSLSettingsText.from("Expired Badge"),
+        selected = state.badges.indexOf(state.selectedBadge),
+        listItems = state.badges.map { it.name }.toTypedArray(),
+        onSelected = { viewModel.setSelectedBadge(it) }
+      )
+
+      radioListPref(
+        title = DSLSettingsText.from("Cancellation Reason"),
+        selected = UnexpectedSubscriptionCancellation.values().indexOf(state.selectedUnexpectedSubscriptionCancellation),
+        listItems = UnexpectedSubscriptionCancellation.values().map { it.status }.toTypedArray(),
+        onSelected = { viewModel.setSelectedUnexpectedSubscriptionCancellation(it) },
+        isEnabled = state.selectedBadge == null || state.selectedBadge.isSubscription()
+      )
+
+      radioListPref(
+        title = DSLSettingsText.from("Charge Failure"),
+        selected = StripeDeclineCode.Code.values().indexOf(state.selectedStripeDeclineCode),
+        listItems = StripeDeclineCode.Code.values().map { it.code }.toTypedArray(),
+        onSelected = { viewModel.setStripeDeclineCode(it) },
+        isEnabled = state.selectedBadge == null || state.selectedBadge.isSubscription()
+      )
+
+      primaryButton(
+        text = DSLSettingsText.from("Save and Finish"),
+        onClick = {
+          lifecycleDisposable += viewModel.save().subscribe { requireActivity().finish() }
+        }
+      )
+
+      secondaryButtonNoOutline(
+        text = DSLSettingsText.from("Clear"),
+        onClick = {
+          lifecycleDisposable += viewModel.clearErrorState().subscribe()
+        }
+      )
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationState.kt
new file mode 100644
index 0000000000..7fc46335e5
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationState.kt
@@ -0,0 +1,12 @@
+package org.thoughtcrime.securesms.components.settings.app.internal.donor
+
+import org.signal.donations.StripeDeclineCode
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.UnexpectedSubscriptionCancellation
+
+data class InternalDonorErrorConfigurationState(
+  val badges: List<Badge> = emptyList(),
+  val selectedBadge: Badge? = null,
+  val selectedUnexpectedSubscriptionCancellation: UnexpectedSubscriptionCancellation? = null,
+  val selectedStripeDeclineCode: StripeDeclineCode.Code? = null
+)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationViewModel.kt
new file mode 100644
index 0000000000..8a605357e8
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/InternalDonorErrorConfigurationViewModel.kt
@@ -0,0 +1,162 @@
+package org.thoughtcrime.securesms.components.settings.app.internal.donor
+
+import androidx.lifecycle.ViewModel
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.donations.StripeDeclineCode
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.UnexpectedSubscriptionCancellation
+import org.thoughtcrime.securesms.components.settings.app.subscription.getBoostBadges
+import org.thoughtcrime.securesms.components.settings.app.subscription.getGiftBadges
+import org.thoughtcrime.securesms.components.settings.app.subscription.getSubscriptionLevels
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.util.rx.RxStore
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
+import java.util.Locale
+
+class InternalDonorErrorConfigurationViewModel : ViewModel() {
+
+  private val store = RxStore(InternalDonorErrorConfigurationState())
+  private val disposables = CompositeDisposable()
+
+  val state: Flowable<InternalDonorErrorConfigurationState> = store.stateFlowable
+
+  init {
+    val giftBadges: Single<List<Badge>> = Single
+      .fromCallable {
+        AppDependencies.donationsService
+          .getDonationsConfiguration(Locale.getDefault())
+      }
+      .flatMap { it.flattenResult() }
+      .map { it.getGiftBadges() }
+      .subscribeOn(Schedulers.io())
+
+    val boostBadges: Single<List<Badge>> = Single
+      .fromCallable {
+        AppDependencies.donationsService
+          .getDonationsConfiguration(Locale.getDefault())
+      }
+      .flatMap { it.flattenResult() }
+      .map { it.getBoostBadges() }
+      .subscribeOn(Schedulers.io())
+
+    val subscriptionBadges: Single<List<Badge>> = Single
+      .fromCallable {
+        AppDependencies.donationsService
+          .getDonationsConfiguration(Locale.getDefault())
+      }
+      .flatMap { it.flattenResult() }
+      .map { config -> config.getSubscriptionLevels().values.map { Badges.fromServiceBadge(it.badge) } }
+      .subscribeOn(Schedulers.io())
+
+    disposables += Single.zip(giftBadges, boostBadges, subscriptionBadges) { g, b, s ->
+      g + b + s
+    }.subscribe { badges ->
+      store.update { it.copy(badges = badges) }
+    }
+  }
+
+  override fun onCleared() {
+    disposables.clear()
+    store.dispose()
+  }
+
+  fun setSelectedBadge(badgeIndex: Int) {
+    store.update {
+      it.copy(selectedBadge = if (badgeIndex in it.badges.indices) it.badges[badgeIndex] else null)
+    }
+  }
+
+  fun setSelectedUnexpectedSubscriptionCancellation(unexpectedSubscriptionCancellationIndex: Int) {
+    store.update {
+      it.copy(
+        selectedUnexpectedSubscriptionCancellation = if (unexpectedSubscriptionCancellationIndex in UnexpectedSubscriptionCancellation.values().indices) {
+          UnexpectedSubscriptionCancellation.values()[unexpectedSubscriptionCancellationIndex]
+        } else {
+          null
+        }
+      )
+    }
+  }
+
+  fun setStripeDeclineCode(stripeDeclineCodeIndex: Int) {
+    store.update {
+      it.copy(
+        selectedStripeDeclineCode = if (stripeDeclineCodeIndex in StripeDeclineCode.Code.values().indices) {
+          StripeDeclineCode.Code.values()[stripeDeclineCodeIndex]
+        } else {
+          null
+        }
+      )
+    }
+  }
+
+  fun save(): Completable {
+    val snapshot = store.state
+    val saveState = Completable.fromAction {
+      synchronized(InAppPaymentSubscriberRecord.Type.DONATION) {
+        when {
+          snapshot.selectedBadge?.isGift() == true -> {}
+          snapshot.selectedBadge?.isBoost() == true -> handleBoostExpiration(snapshot)
+          snapshot.selectedBadge?.isSubscription() == true -> handleSubscriptionExpiration(snapshot)
+          else -> handleSubscriptionPaymentFailure(snapshot)
+        }
+      }
+    }.subscribeOn(Schedulers.io())
+
+    return clearErrorState().andThen(saveState)
+  }
+
+  fun clearErrorState(): Completable {
+    return Completable.fromAction {
+      synchronized(InAppPaymentSubscriberRecord.Type.DONATION) {
+        SignalStore.inAppPayments.setExpiredBadge(null)
+        SignalStore.inAppPayments.unexpectedSubscriptionCancelationReason = null
+        SignalStore.inAppPayments.unexpectedSubscriptionCancelationTimestamp = 0L
+        SignalStore.inAppPayments.setUnexpectedSubscriptionCancelationChargeFailure(null)
+      }
+
+      store.update {
+        it.copy(
+          selectedStripeDeclineCode = null,
+          selectedUnexpectedSubscriptionCancellation = null,
+          selectedBadge = null
+        )
+      }
+    }
+  }
+
+  private fun handleBoostExpiration(state: InternalDonorErrorConfigurationState) {
+    SignalStore.inAppPayments.setExpiredBadge(state.selectedBadge)
+  }
+
+  private fun handleSubscriptionExpiration(state: InternalDonorErrorConfigurationState) {
+    SignalStore.inAppPayments.updateLocalStateForLocalSubscribe(InAppPaymentSubscriberRecord.Type.DONATION)
+    SignalStore.inAppPayments.setExpiredBadge(state.selectedBadge)
+    handleSubscriptionPaymentFailure(state)
+  }
+
+  private fun handleSubscriptionPaymentFailure(state: InternalDonorErrorConfigurationState) {
+    SignalStore.inAppPayments.unexpectedSubscriptionCancelationReason = state.selectedUnexpectedSubscriptionCancellation?.status
+    SignalStore.inAppPayments.unexpectedSubscriptionCancelationTimestamp = System.currentTimeMillis()
+    SignalStore.inAppPayments.showMonthlyDonationCanceledDialog = true
+    SignalStore.inAppPayments.setUnexpectedSubscriptionCancelationChargeFailure(
+      state.selectedStripeDeclineCode?.let {
+        ActiveSubscription.ChargeFailure(
+          it.code,
+          "Test Charge Failure",
+          "Test Network Status",
+          it.code,
+          "Test"
+        )
+      }
+    )
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/svr/InternalSvrPlaygroundFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/svr/InternalSvrPlaygroundFragment.kt
index 569beda01b..6c60d1fc1a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/svr/InternalSvrPlaygroundFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/svr/InternalSvrPlaygroundFragment.kt
@@ -21,7 +21,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.input.key.Key.Companion.Tab
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.fragment.app.viewModels
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/svr/InternalSvrPlaygroundViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/svr/InternalSvrPlaygroundViewModel.kt
index b9bbb77957..72fed8590b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/svr/InternalSvrPlaygroundViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/svr/InternalSvrPlaygroundViewModel.kt
@@ -16,10 +16,9 @@ import io.reactivex.rxjava3.kotlin.plusAssign
 import io.reactivex.rxjava3.schedulers.Schedulers
 import kotlinx.collections.immutable.persistentListOf
 import org.thoughtcrime.securesms.BuildConfig
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery
-import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV3
 
 class InternalSvrPlaygroundViewModel : ViewModel() {
 
@@ -53,7 +52,7 @@ class InternalSvrPlaygroundViewModel : ViewModel() {
     disposables += Single
       .fromCallable {
         _state.value.selected.toImplementation()
-          .setPin(_state.value.userPin, SignalStore.svr().getOrCreateMasterKey())
+          .setPin(_state.value.userPin, SignalStore.svr.getOrCreateMasterKey())
           .execute()
       }
       .subscribeOn(Schedulers.io())
@@ -104,23 +103,8 @@ class InternalSvrPlaygroundViewModel : ViewModel() {
 
   private fun SvrImplementation.toImplementation(): SecureValueRecovery {
     return when (this) {
-      SvrImplementation.SVR2 -> ApplicationDependencies.getSignalServiceAccountManager().getSecureValueRecoveryV2(BuildConfig.SVR2_MRENCLAVE)
-      SvrImplementation.SVR3 -> ApplicationDependencies.getSignalServiceAccountManager().getSecureValueRecoveryV3(ApplicationDependencies.getLibsignalNetwork().network, TestShareSetStorage())
-    }
-  }
-
-  /**
-   * Temporary implementation of share set storage. Only useful for testing.
-   */
-  private class TestShareSetStorage : SecureValueRecoveryV3.ShareSetStorage {
-    private var shareSet: ByteArray? = null
-
-    override fun write(data: ByteArray) {
-      shareSet = data
-    }
-
-    override fun read(): ByteArray? {
-      return shareSet
+      SvrImplementation.SVR2 -> AppDependencies.signalServiceAccountManager.getSecureValueRecoveryV2(BuildConfig.SVR2_MRENCLAVE)
+      SvrImplementation.SVR3 -> AppDependencies.signalServiceAccountManager.getSecureValueRecoveryV3(AppDependencies.libsignalNetwork)
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt
index 6fd7be9775..ce38f777c0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsFragment.kt
@@ -22,6 +22,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.signal.core.util.getParcelableExtraCompat
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.PromptBatterySaverDialogFragment
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
@@ -208,6 +209,16 @@ class NotificationsSettingsFragment : DSLSettingsFragment(R.string.preferences__
         }
       )
 
+      if (Build.VERSION.SDK_INT >= 23 && state.messageNotificationsState.troubleshootNotifications) {
+        clickPref(
+          title = DSLSettingsText.from(R.string.preferences_notifications__troubleshoot),
+          isEnabled = true,
+          onClick = {
+            PromptBatterySaverDialogFragment.show(childFragmentManager)
+          }
+        )
+      }
+
       if (Build.VERSION.SDK_INT < 30) {
         if (NotificationChannels.supported()) {
           clickPref(
@@ -325,7 +336,7 @@ class NotificationsSettingsFragment : DSLSettingsFragment(R.string.preferences__
   }
 
   private fun launchMessageSoundSelectionIntent() {
-    val current = SignalStore.settings().messageNotificationSound
+    val current = SignalStore.settings.messageNotificationSound
 
     val intent = Intent(RingtoneManager.ACTION_RINGTONE_PICKER)
     intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true)
@@ -352,7 +363,7 @@ class NotificationsSettingsFragment : DSLSettingsFragment(R.string.preferences__
   }
 
   private fun launchCallRingtoneSelectionIntent() {
-    val current = SignalStore.settings().callRingtone
+    val current = SignalStore.settings.callRingtone
 
     val intent = Intent(RingtoneManager.ACTION_RINGTONE_PICKER)
     intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsState.kt
index f4a18d7d9a..c090260f75 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsState.kt
@@ -21,6 +21,7 @@ data class MessageNotificationsState(
   val repeatAlerts: Int,
   val messagePrivacy: String,
   val priority: Int,
+  val troubleshootNotifications: Boolean
 )
 
 data class CallNotificationsState(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsViewModel.kt
index 2840341443..badaa589a9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/NotificationsSettingsViewModel.kt
@@ -1,15 +1,16 @@
 package org.thoughtcrime.securesms.components.settings.app.notifications
 
-import android.app.Application
 import android.content.SharedPreferences
 import android.net.Uri
 import android.os.Build
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.notifications.DeviceSpecificNotificationConfig
 import org.thoughtcrime.securesms.notifications.NotificationChannels
+import org.thoughtcrime.securesms.notifications.SlowNotificationHeuristics
 import org.thoughtcrime.securesms.preferences.widgets.NotificationPrivacyPreference
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.livedata.Store
@@ -18,14 +19,12 @@ class NotificationsSettingsViewModel(private val sharedPreferences: SharedPrefer
 
   private val store = Store(getState())
 
-  private val application: Application = ApplicationDependencies.getApplication()
-
   val state: LiveData<NotificationsSettingsState> = store.stateLiveData
 
   init {
     if (NotificationChannels.supported()) {
-      SignalStore.settings().messageNotificationSound = NotificationChannels.getInstance().messageRingtone
-      SignalStore.settings().isMessageVibrateEnabled = NotificationChannels.getInstance().messageVibrate
+      SignalStore.settings.messageNotificationSound = NotificationChannels.getInstance().messageRingtone
+      SignalStore.settings.isMessageVibrateEnabled = NotificationChannels.getInstance().messageVibrate
     }
 
     store.update { getState(calculateSlowNotifications = true) }
@@ -36,46 +35,46 @@ class NotificationsSettingsViewModel(private val sharedPreferences: SharedPrefer
   }
 
   fun setMessageNotificationsEnabled(enabled: Boolean) {
-    SignalStore.settings().isMessageNotificationsEnabled = enabled
+    SignalStore.settings.isMessageNotificationsEnabled = enabled
     refresh()
   }
 
   fun setMessageNotificationsSound(sound: Uri?) {
     val messageSound = sound ?: Uri.EMPTY
-    SignalStore.settings().messageNotificationSound = messageSound
+    SignalStore.settings.messageNotificationSound = messageSound
     NotificationChannels.getInstance().updateMessageRingtone(messageSound)
     refresh()
   }
 
   fun setMessageNotificationVibration(enabled: Boolean) {
-    SignalStore.settings().isMessageVibrateEnabled = enabled
+    SignalStore.settings.isMessageVibrateEnabled = enabled
     NotificationChannels.getInstance().updateMessageVibrate(enabled)
     refresh()
   }
 
   fun setMessageNotificationLedColor(color: String) {
-    SignalStore.settings().messageLedColor = color
+    SignalStore.settings.messageLedColor = color
     NotificationChannels.getInstance().updateMessagesLedColor(color)
     refresh()
   }
 
   fun setMessageNotificationLedBlink(blink: String) {
-    SignalStore.settings().messageLedBlinkPattern = blink
+    SignalStore.settings.messageLedBlinkPattern = blink
     refresh()
   }
 
   fun setMessageNotificationInChatSoundsEnabled(enabled: Boolean) {
-    SignalStore.settings().isMessageNotificationsInChatSoundsEnabled = enabled
+    SignalStore.settings.isMessageNotificationsInChatSoundsEnabled = enabled
     refresh()
   }
 
   fun setMessageRepeatAlerts(repeats: Int) {
-    SignalStore.settings().messageNotificationsRepeatAlerts = repeats
+    SignalStore.settings.messageNotificationsRepeatAlerts = repeats
     refresh()
   }
 
   fun setMessageNotificationPrivacy(preference: String) {
-    SignalStore.settings().messageNotificationsPrivacy = NotificationPrivacyPreference(preference)
+    SignalStore.settings.messageNotificationsPrivacy = NotificationPrivacyPreference(preference)
     refresh()
   }
 
@@ -85,27 +84,27 @@ class NotificationsSettingsViewModel(private val sharedPreferences: SharedPrefer
   }
 
   fun setCallNotificationsEnabled(enabled: Boolean) {
-    SignalStore.settings().isCallNotificationsEnabled = enabled
+    SignalStore.settings.isCallNotificationsEnabled = enabled
     refresh()
   }
 
   fun setCallRingtone(ringtone: Uri?) {
-    SignalStore.settings().callRingtone = ringtone ?: Uri.EMPTY
+    SignalStore.settings.callRingtone = ringtone ?: Uri.EMPTY
     refresh()
   }
 
   fun setCallVibrateEnabled(enabled: Boolean) {
-    SignalStore.settings().isCallVibrateEnabled = enabled
+    SignalStore.settings.isCallVibrateEnabled = enabled
     refresh()
   }
 
   fun setNotifyWhileLocked(enabled: Boolean) {
-    TextSecurePreferences.setPassphraseLockNotificationsEnabled(application, enabled)
+    TextSecurePreferences.setPassphraseLockNotificationsEnabled(AppDependencies.application, enabled)
     refresh()
   }
 
   fun setNotifyWhenContactJoinsSignal(enabled: Boolean) {
-    SignalStore.settings().isNotifyWhenContactJoinsSignal = enabled
+    SignalStore.settings.isNotifyWhenContactJoinsSignal = enabled
     refresh()
   }
 
@@ -116,26 +115,34 @@ class NotificationsSettingsViewModel(private val sharedPreferences: SharedPrefer
    */
   private fun getState(currentState: NotificationsSettingsState? = null, calculateSlowNotifications: Boolean = false): NotificationsSettingsState = NotificationsSettingsState(
     messageNotificationsState = MessageNotificationsState(
-      notificationsEnabled = SignalStore.settings().isMessageNotificationsEnabled && canEnableNotifications(),
+      notificationsEnabled = SignalStore.settings.isMessageNotificationsEnabled && canEnableNotifications(),
       canEnableNotifications = canEnableNotifications(),
-      sound = SignalStore.settings().messageNotificationSound,
-      vibrateEnabled = SignalStore.settings().isMessageVibrateEnabled,
-      ledColor = SignalStore.settings().messageLedColor,
-      ledBlink = SignalStore.settings().messageLedBlinkPattern,
-      inChatSoundsEnabled = SignalStore.settings().isMessageNotificationsInChatSoundsEnabled,
-      repeatAlerts = SignalStore.settings().messageNotificationsRepeatAlerts,
-      messagePrivacy = SignalStore.settings().messageNotificationsPrivacy.toString(),
-      priority = TextSecurePreferences.getNotificationPriority(application),
+      sound = SignalStore.settings.messageNotificationSound,
+      vibrateEnabled = SignalStore.settings.isMessageVibrateEnabled,
+      ledColor = SignalStore.settings.messageLedColor,
+      ledBlink = SignalStore.settings.messageLedBlinkPattern,
+      inChatSoundsEnabled = SignalStore.settings.isMessageNotificationsInChatSoundsEnabled,
+      repeatAlerts = SignalStore.settings.messageNotificationsRepeatAlerts,
+      messagePrivacy = SignalStore.settings.messageNotificationsPrivacy.toString(),
+      priority = TextSecurePreferences.getNotificationPriority(AppDependencies.application),
+      troubleshootNotifications = if (calculateSlowNotifications) {
+        (SlowNotificationHeuristics.isBatteryOptimizationsOn() && SlowNotificationHeuristics.isHavingDelayedNotifications()) ||
+          SlowNotificationHeuristics.showCondition() == DeviceSpecificNotificationConfig.ShowCondition.ALWAYS
+      } else if (currentState != null) {
+        currentState.messageNotificationsState.troubleshootNotifications
+      } else {
+        false
+      }
     ),
     callNotificationsState = CallNotificationsState(
-      notificationsEnabled = SignalStore.settings().isCallNotificationsEnabled && canEnableNotifications(),
+      notificationsEnabled = SignalStore.settings.isCallNotificationsEnabled && canEnableNotifications(),
       canEnableNotifications = canEnableNotifications(),
-      ringtone = SignalStore.settings().callRingtone,
-      vibrateEnabled = SignalStore.settings().isCallVibrateEnabled
+      ringtone = SignalStore.settings.callRingtone,
+      vibrateEnabled = SignalStore.settings.isCallVibrateEnabled
     ),
-    notifyWhileLocked = TextSecurePreferences.isPassphraseLockNotificationsEnabled(application) && SignalStore.account().pushAvailable,
-    canEnableNotifyWhileLocked = SignalStore.account().pushAvailable,
-    notifyWhenContactJoinsSignal = SignalStore.settings().isNotifyWhenContactJoinsSignal
+    notifyWhileLocked = TextSecurePreferences.isPassphraseLockNotificationsEnabled(AppDependencies.application) && SignalStore.account.pushAvailable,
+    canEnableNotifyWhileLocked = SignalStore.account.pushAvailable,
+    notifyWhenContactJoinsSignal = SignalStore.settings.isNotifyWhenContactJoinsSignal
   )
 
   private fun canEnableNotifications(): Boolean {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesRepository.kt
index 7279c842f8..7937647951 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/notifications/profiles/NotificationProfilesRepository.kt
@@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.database.DatabaseObserver
 import org.thoughtcrime.securesms.database.NotificationProfileDatabase
 import org.thoughtcrime.securesms.database.RxDatabaseObserver
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.notifications.profiles.NotificationProfile
 import org.thoughtcrime.securesms.notifications.profiles.NotificationProfileSchedule
@@ -44,7 +44,7 @@ class NotificationProfilesRepository {
         }
       }
 
-      val databaseObserver: DatabaseObserver = ApplicationDependencies.getDatabaseObserver()
+      val databaseObserver: DatabaseObserver = AppDependencies.databaseObserver
       val profileObserver = DatabaseObserver.Observer { emitProfile() }
 
       databaseObserver.registerNotificationProfileObserver(profileObserver)
@@ -120,40 +120,40 @@ class NotificationProfilesRepository {
       val activeProfile = NotificationProfiles.getActiveProfile(profiles, now)
 
       if (profileId == activeProfile?.id) {
-        SignalStore.notificationProfileValues().manuallyEnabledProfile = 0
-        SignalStore.notificationProfileValues().manuallyEnabledUntil = 0
-        SignalStore.notificationProfileValues().manuallyDisabledAt = now
-        SignalStore.notificationProfileValues().lastProfilePopup = 0
-        SignalStore.notificationProfileValues().lastProfilePopupTime = 0
+        SignalStore.notificationProfile.manuallyEnabledProfile = 0
+        SignalStore.notificationProfile.manuallyEnabledUntil = 0
+        SignalStore.notificationProfile.manuallyDisabledAt = now
+        SignalStore.notificationProfile.lastProfilePopup = 0
+        SignalStore.notificationProfile.lastProfilePopupTime = 0
       } else {
         val inScheduledWindow = schedule.isCurrentlyActive(now)
-        SignalStore.notificationProfileValues().manuallyEnabledProfile = profileId
-        SignalStore.notificationProfileValues().manuallyEnabledUntil = if (inScheduledWindow) schedule.endDateTime(now.toLocalDateTime()).toMillis() else Long.MAX_VALUE
-        SignalStore.notificationProfileValues().manuallyDisabledAt = now
+        SignalStore.notificationProfile.manuallyEnabledProfile = profileId
+        SignalStore.notificationProfile.manuallyEnabledUntil = if (inScheduledWindow) schedule.endDateTime(now.toLocalDateTime()).toMillis() else Long.MAX_VALUE
+        SignalStore.notificationProfile.manuallyDisabledAt = now
       }
     }
-      .doOnComplete { ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers() }
+      .doOnComplete { AppDependencies.databaseObserver.notifyNotificationProfileObservers() }
       .subscribeOn(Schedulers.io())
   }
 
   fun manuallyEnableProfileForDuration(profileId: Long, enableUntil: Long, now: Long = System.currentTimeMillis()): Completable {
     return Completable.fromAction {
-      SignalStore.notificationProfileValues().manuallyEnabledProfile = profileId
-      SignalStore.notificationProfileValues().manuallyEnabledUntil = enableUntil
-      SignalStore.notificationProfileValues().manuallyDisabledAt = now
+      SignalStore.notificationProfile.manuallyEnabledProfile = profileId
+      SignalStore.notificationProfile.manuallyEnabledUntil = enableUntil
+      SignalStore.notificationProfile.manuallyDisabledAt = now
     }
-      .doOnComplete { ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers() }
+      .doOnComplete { AppDependencies.databaseObserver.notifyNotificationProfileObservers() }
       .subscribeOn(Schedulers.io())
   }
 
   fun manuallyEnableProfileForSchedule(profileId: Long, schedule: NotificationProfileSchedule, now: Long = System.currentTimeMillis()): Completable {
     return Completable.fromAction {
       val inScheduledWindow = schedule.isCurrentlyActive(now)
-      SignalStore.notificationProfileValues().manuallyEnabledProfile = if (inScheduledWindow) profileId else 0
-      SignalStore.notificationProfileValues().manuallyEnabledUntil = if (inScheduledWindow) schedule.endDateTime(now.toLocalDateTime()).toMillis() else Long.MAX_VALUE
-      SignalStore.notificationProfileValues().manuallyDisabledAt = if (inScheduledWindow) now else 0
+      SignalStore.notificationProfile.manuallyEnabledProfile = if (inScheduledWindow) profileId else 0
+      SignalStore.notificationProfile.manuallyEnabledUntil = if (inScheduledWindow) schedule.endDateTime(now.toLocalDateTime()).toMillis() else Long.MAX_VALUE
+      SignalStore.notificationProfile.manuallyDisabledAt = if (inScheduledWindow) now else 0
     }
-      .doOnComplete { ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers() }
+      .doOnComplete { AppDependencies.databaseObserver.notifyNotificationProfileObservers() }
       .subscribeOn(Schedulers.io())
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt
index 10b24cfb5b..430ceb5f60 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt
@@ -99,7 +99,7 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
         title = DSLSettingsText.from(R.string.preferences__read_receipts),
         summary = DSLSettingsText.from(R.string.preferences__if_read_receipts_are_disabled_you_wont_be_able_to_see_read_receipts),
         isChecked = state.readReceipts,
-        isEnabled = SignalStore.account().isPrimaryDevice,
+        isEnabled = SignalStore.account.isPrimaryDevice,
         onClick = {
           viewModel.setReadReceiptsEnabled(!state.readReceipts)
         }
@@ -109,7 +109,7 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
         title = DSLSettingsText.from(R.string.preferences__typing_indicators),
         summary = DSLSettingsText.from(R.string.preferences__if_typing_indicators_are_disabled_you_wont_be_able_to_see_typing_indicators),
         isChecked = state.typingIndicators,
-        isEnabled = SignalStore.account().isPrimaryDevice,
+        isEnabled = SignalStore.account.isPrimaryDevice,
         onClick = {
           viewModel.setTypingIndicatorsEnabled(!state.typingIndicators)
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsRepository.kt
index a955ca8e9c..0b9fdd4751 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsRepository.kt
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.components.settings.app.privacy
 import android.content.Context
 import org.signal.core.util.concurrent.SignalExecutors
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences
 
 class PrivacySettingsRepository {
 
-  private val context: Context = ApplicationDependencies.getApplication()
+  private val context: Context = AppDependencies.application
 
   fun getBlockedCount(consumer: (Int) -> Unit) {
     SignalExecutors.BOUNDED.execute {
@@ -26,12 +26,12 @@ class PrivacySettingsRepository {
     SignalExecutors.BOUNDED.execute {
       SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
       StorageSyncHelper.scheduleSyncForDataChange()
-      ApplicationDependencies.getJobManager().add(
+      AppDependencies.jobManager.add(
         MultiDeviceConfigurationUpdateJob(
           TextSecurePreferences.isReadReceiptsEnabled(context),
           TextSecurePreferences.isTypingIndicatorsEnabled(context),
           TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(context),
-          SignalStore.settings().isLinkPreviewsEnabled
+          SignalStore.settings.isLinkPreviewsEnabled
         )
       )
     }
@@ -42,17 +42,17 @@ class PrivacySettingsRepository {
 
     SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
     StorageSyncHelper.scheduleSyncForDataChange()
-    ApplicationDependencies.getJobManager().add(
+    AppDependencies.jobManager.add(
       MultiDeviceConfigurationUpdateJob(
         TextSecurePreferences.isReadReceiptsEnabled(context),
         enabled,
         TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(context),
-        SignalStore.settings().isLinkPreviewsEnabled
+        SignalStore.settings.isLinkPreviewsEnabled
       )
     )
 
     if (!enabled) {
-      ApplicationDependencies.getTypingStatusRepository().clear()
+      AppDependencies.typingStatusRepository.clear()
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsViewModel.kt
index fe2eb4c0be..b20afdb0a0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsViewModel.kt
@@ -6,7 +6,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import org.thoughtcrime.securesms.ScreenLockController
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.livedata.Store
@@ -16,7 +16,7 @@ class PrivacySettingsViewModel(
   private val repository: PrivacySettingsRepository
 ) : ViewModel() {
 
-  private val application: Application = ApplicationDependencies.getApplication()
+  private val application: Application = AppDependencies.application
 
   private val store = Store(getState())
 
@@ -94,7 +94,7 @@ class PrivacySettingsViewModel(
       biometricScreenLock = TextSecurePreferences.isBiometricScreenLockEnabled(application),
       screenSecurity = TextSecurePreferences.isScreenSecurityEnabled(application),
       incognitoKeyboard = TextSecurePreferences.isIncognitoKeyboardEnabled(application),
-      universalExpireTimer = SignalStore.settings().universalExpireTimer
+      universalExpireTimer = SignalStore.settings.universalExpireTimer
     )
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt
index fcfe0cf644..a22f5bc7fd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsFragment.kt
@@ -144,7 +144,7 @@ class AdvancedPrivacySettingsFragment : DSLSettingsFragment(R.string.preferences
             .append(statusIcon)
         ),
         summary = DSLSettingsText.from(R.string.AdvancedPrivacySettingsFragment__show_an_icon),
-        isEnabled = SignalStore.account().isPrimaryDevice,
+        isEnabled = SignalStore.account.isPrimaryDevice,
         isChecked = state.showSealedSenderStatusIcon
       ) {
         viewModel.setShowStatusIconForSealedSender(!state.showSealedSenderStatusIcon)
@@ -166,7 +166,7 @@ class AdvancedPrivacySettingsFragment : DSLSettingsFragment(R.string.preferences
 
   private fun getPushToggleSummary(isPushEnabled: Boolean): String {
     return if (isPushEnabled) {
-      PhoneNumberFormatter.prettyPrint(SignalStore.account().e164!!)
+      PhoneNumberFormatter.prettyPrint(SignalStore.account.e164!!)
     } else {
       getString(R.string.preferences__free_private_messages_and_calls)
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsRepository.kt
index 86e0807d04..3d6606998b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsRepository.kt
@@ -6,7 +6,7 @@ import com.google.firebase.installations.FirebaseInstallations
 import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -24,13 +24,13 @@ class AdvancedPrivacySettingsRepository(private val context: Context) {
   fun disablePushMessages(consumer: (DisablePushMessagesResult) -> Unit) {
     SignalExecutors.BOUNDED.execute {
       val result = try {
-        val accountManager = ApplicationDependencies.getSignalServiceAccountManager()
+        val accountManager = AppDependencies.signalServiceAccountManager
         try {
           accountManager.setGcmId(Optional.empty())
         } catch (e: AuthorizationFailedException) {
           Log.w(TAG, e)
         }
-        if (SignalStore.account().fcmEnabled) {
+        if (SignalStore.account.fcmEnabled) {
           Tasks.await(FirebaseInstallations.getInstance().delete())
         }
         DisablePushMessagesResult.SUCCESS
@@ -53,12 +53,12 @@ class AdvancedPrivacySettingsRepository(private val context: Context) {
     SignalExecutors.BOUNDED.execute {
       SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
       StorageSyncHelper.scheduleSyncForDataChange()
-      ApplicationDependencies.getJobManager().add(
+      AppDependencies.jobManager.add(
         MultiDeviceConfigurationUpdateJob(
           TextSecurePreferences.isReadReceiptsEnabled(context),
           TextSecurePreferences.isTypingIndicatorsEnabled(context),
           TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(context),
-          SignalStore.settings().isLinkPreviewsEnabled
+          SignalStore.settings.isLinkPreviewsEnabled
         )
       )
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsViewModel.kt
index 4f7b07d9de..dc503ee6ee 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsViewModel.kt
@@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.disposables.CompositeDisposable
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob
 import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob
@@ -32,7 +32,7 @@ class AdvancedPrivacySettingsViewModel(
 
   init {
     disposables.add(
-      ApplicationDependencies.getSignalWebSocket().webSocketState
+      AppDependencies.webSocketObserver
         .observeOn(AndroidSchedulers.mainThread())
         .subscribe { refresh() }
     )
@@ -51,14 +51,14 @@ class AdvancedPrivacySettingsViewModel(
 
   fun setAllowSealedSenderFromAnyone(enabled: Boolean) {
     sharedPreferences.edit().putBoolean(TextSecurePreferences.UNIVERSAL_UNIDENTIFIED_ACCESS, enabled).apply()
-    ApplicationDependencies.getJobManager().startChain(RefreshAttributesJob()).then(RefreshOwnProfileJob()).enqueue()
+    AppDependencies.jobManager.startChain(RefreshAttributesJob()).then(RefreshOwnProfileJob()).enqueue()
     refresh()
   }
 
   fun setCensorshipCircumventionEnabled(enabled: Boolean) {
-    SignalStore.settings().setCensorshipCircumventionEnabled(enabled)
-    SignalStore.misc().isServiceReachableWithoutCircumvention = false
-    ApplicationDependencies.restartAllNetworkConnections()
+    SignalStore.settings.setCensorshipCircumventionEnabled(enabled)
+    SignalStore.misc.isServiceReachableWithoutCircumvention = false
+    AppDependencies.resetNetwork(restartMessageObserver = true)
     refresh()
   }
 
@@ -74,16 +74,16 @@ class AdvancedPrivacySettingsViewModel(
     val censorshipCircumventionState = getCensorshipCircumventionState()
 
     return AdvancedPrivacySettingsState(
-      isPushEnabled = SignalStore.account().isRegistered,
-      alwaysRelayCalls = TextSecurePreferences.isTurnOnly(ApplicationDependencies.getApplication()),
-      proxyEnabled = ApplicationDependencies.getNetworkManager().isProxyEnabled,
+      isPushEnabled = SignalStore.account.isRegistered,
+      alwaysRelayCalls = TextSecurePreferences.isTurnOnly(AppDependencies.application),
+      proxyEnabled = AppDependencies.networkManager.isProxyEnabled,
       censorshipCircumventionState = censorshipCircumventionState,
       censorshipCircumventionEnabled = getCensorshipCircumventionEnabled(censorshipCircumventionState),
       showSealedSenderStatusIcon = TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(
-        ApplicationDependencies.getApplication()
+        AppDependencies.application
       ),
       allowSealedSenderFromAnyone = TextSecurePreferences.isUniversalUnidentifiedAccess(
-        ApplicationDependencies.getApplication()
+        AppDependencies.application
       ),
       false
     )
@@ -91,13 +91,13 @@ class AdvancedPrivacySettingsViewModel(
 
   private fun getCensorshipCircumventionState(): CensorshipCircumventionState {
     val countryCode: Int = PhoneNumberFormatter.getLocalCountryCode()
-    val isCountryCodeCensoredByDefault: Boolean = ApplicationDependencies.getSignalServiceNetworkAccess().isCountryCodeCensoredByDefault(countryCode)
-    val enabledState: SettingsValues.CensorshipCircumventionEnabled = SignalStore.settings().censorshipCircumventionEnabled
-    val hasInternet: Boolean = NetworkConstraint.isMet(ApplicationDependencies.getApplication())
-    val websocketConnected: Boolean = ApplicationDependencies.getSignalWebSocket().webSocketState.firstOrError().blockingGet() == WebSocketConnectionState.CONNECTED
+    val isCountryCodeCensoredByDefault: Boolean = AppDependencies.signalServiceNetworkAccess.isCountryCodeCensoredByDefault(countryCode)
+    val enabledState: SettingsValues.CensorshipCircumventionEnabled = SignalStore.settings.censorshipCircumventionEnabled
+    val hasInternet: Boolean = NetworkConstraint.isMet(AppDependencies.application)
+    val websocketConnected: Boolean = AppDependencies.signalWebSocket.webSocketState.firstOrError().blockingGet() == WebSocketConnectionState.CONNECTED
 
     return when {
-      SignalStore.internalValues().allowChangingCensorshipSetting() -> {
+      SignalStore.internal.allowChangingCensorshipSetting() -> {
         CensorshipCircumventionState.AVAILABLE
       }
       isCountryCodeCensoredByDefault && enabledState == SettingsValues.CensorshipCircumventionEnabled.DISABLED -> {
@@ -129,7 +129,7 @@ class AdvancedPrivacySettingsViewModel(
         true
       }
       else -> {
-        SignalStore.settings().censorshipCircumventionEnabled == SettingsValues.CensorshipCircumventionEnabled.ENABLED
+        SignalStore.settings.censorshipCircumventionEnabled == SettingsValues.CensorshipCircumventionEnabled.ENABLED
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/ExpireTimerSettingsRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/ExpireTimerSettingsRepository.kt
index 30d5f08556..0661bb40b6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/ExpireTimerSettingsRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/ExpireTimerSettingsRepository.kt
@@ -48,7 +48,7 @@ class ExpireTimerSettingsRepository(val context: Context) {
 
   fun setUniversalExpireTimerSeconds(newExpirationTime: Int, onDone: () -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      SignalStore.settings().universalExpireTimer = newExpirationTime
+      SignalStore.settings.universalExpireTimer = newExpirationTime
       SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
       StorageSyncHelper.scheduleSyncForDataChange()
       onDone.invoke()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/ExpireTimerSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/ExpireTimerSettingsViewModel.kt
index 04b7b9cdfd..21b8befddd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/ExpireTimerSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/expire/ExpireTimerSettingsViewModel.kt
@@ -21,7 +21,7 @@ class ExpireTimerSettingsViewModel(val config: Config, private val repository: E
     if (recipientId != null) {
       store.update(Recipient.live(recipientId).liveData) { r, s -> s.copy(initialTimer = r.expiresInSeconds, isForRecipient = true) }
     } else {
-      store.update { it.copy(initialTimer = config.initialValue ?: SignalStore.settings().universalExpireTimer) }
+      store.update { it.copy(initialTimer = config.initialValue ?: SignalStore.settings.universalExpireTimer) }
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/pnp/PhoneNumberPrivacySettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/pnp/PhoneNumberPrivacySettingsViewModel.kt
index 8ddc73e187..2b0a5ff785 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/pnp/PhoneNumberPrivacySettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/pnp/PhoneNumberPrivacySettingsViewModel.kt
@@ -4,7 +4,7 @@ import androidx.compose.runtime.State
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.ProfileUploadJob
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob
 import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob
@@ -18,8 +18,8 @@ class PhoneNumberPrivacySettingsViewModel : ViewModel() {
 
   private val _state = mutableStateOf(
     PhoneNumberPrivacySettingsState(
-      phoneNumberSharing = SignalStore.phoneNumberPrivacy().isPhoneNumberSharingEnabled,
-      discoverableByPhoneNumber = SignalStore.phoneNumberPrivacy().phoneNumberDiscoverabilityMode != PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE
+      phoneNumberSharing = SignalStore.phoneNumberPrivacy.isPhoneNumberSharingEnabled,
+      discoverableByPhoneNumber = SignalStore.phoneNumberPrivacy.phoneNumberDiscoverabilityMode != PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE
     )
   )
 
@@ -43,24 +43,24 @@ class PhoneNumberPrivacySettingsViewModel : ViewModel() {
   }
 
   private fun setPhoneNumberSharingEnabled(phoneNumberSharingEnabled: Boolean) {
-    SignalStore.phoneNumberPrivacy().phoneNumberSharingMode = if (phoneNumberSharingEnabled) PhoneNumberSharingMode.EVERYBODY else PhoneNumberSharingMode.NOBODY
+    SignalStore.phoneNumberPrivacy.phoneNumberSharingMode = if (phoneNumberSharingEnabled) PhoneNumberSharingMode.EVERYBODY else PhoneNumberSharingMode.NOBODY
     SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
     StorageSyncHelper.scheduleSyncForDataChange()
-    ApplicationDependencies.getJobManager().add(ProfileUploadJob())
+    AppDependencies.jobManager.add(ProfileUploadJob())
     refresh()
   }
 
   private fun setDiscoverableByPhoneNumber(discoverable: Boolean) {
-    SignalStore.phoneNumberPrivacy().phoneNumberDiscoverabilityMode = if (discoverable) PhoneNumberDiscoverabilityMode.DISCOVERABLE else PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE
+    SignalStore.phoneNumberPrivacy.phoneNumberDiscoverabilityMode = if (discoverable) PhoneNumberDiscoverabilityMode.DISCOVERABLE else PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE
     StorageSyncHelper.scheduleSyncForDataChange()
-    ApplicationDependencies.getJobManager().startChain(RefreshAttributesJob()).then(RefreshOwnProfileJob()).enqueue()
+    AppDependencies.jobManager.startChain(RefreshAttributesJob()).then(RefreshOwnProfileJob()).enqueue()
     refresh()
   }
 
   fun refresh() {
     _state.value = PhoneNumberPrivacySettingsState(
-      phoneNumberSharing = SignalStore.phoneNumberPrivacy().isPhoneNumberSharingEnabled,
-      discoverableByPhoneNumber = SignalStore.phoneNumberPrivacy().phoneNumberDiscoverabilityMode != PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE
+      phoneNumberSharing = SignalStore.phoneNumberPrivacy.isPhoneNumberSharingEnabled,
+      discoverableByPhoneNumber = SignalStore.phoneNumberPrivacy.phoneNumberDiscoverabilityMode != PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE
     )
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsFragment.kt
index 87552a8f2c..faa109bad1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsFragment.kt
@@ -31,6 +31,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.integerArrayResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.pluralStringResource
@@ -65,6 +66,8 @@ import org.thoughtcrime.securesms.database.MediaTable
 import org.thoughtcrime.securesms.keyvalue.KeepMessagesDuration
 import org.thoughtcrime.securesms.mediaoverview.MediaOverviewActivity
 import org.thoughtcrime.securesms.preferences.widgets.StorageGraphView
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.Util
 import org.thoughtcrime.securesms.util.viewModel
 import java.text.NumberFormat
@@ -98,6 +101,7 @@ class ManageStorageSettingsFragment : ComposeFragment() {
             onReviewStorage = { startActivity(MediaOverviewActivity.forAll(requireContext())) },
             onSetKeepMessages = { navController.navigate("set-keep-messages") },
             onSetChatLengthLimit = { navController.navigate("set-chat-length-limit") },
+            onSyncTrimThreadDeletes = { viewModel.setSyncTrimDeletes(it) },
             onDeleteChatHistory = { navController.navigate("confirm-delete-chat-history") }
           )
         }
@@ -134,7 +138,11 @@ class ManageStorageSettingsFragment : ComposeFragment() {
         dialog("confirm-delete-chat-history") {
           Dialogs.SimpleAlertDialog(
             title = stringResource(id = R.string.preferences_storage__delete_message_history),
-            body = stringResource(id = R.string.preferences_storage__this_will_delete_all_message_history_and_media_from_your_device),
+            body = if (TextSecurePreferences.isMultiDevice(LocalContext.current) && Recipient.self().deleteSyncCapability.isSupported) {
+              stringResource(id = R.string.preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device)
+            } else {
+              stringResource(id = R.string.preferences_storage__this_will_delete_all_message_history_and_media_from_your_device)
+            },
             confirm = stringResource(id = R.string.delete),
             confirmColor = MaterialTheme.colorScheme.error,
             dismiss = stringResource(id = android.R.string.cancel),
@@ -146,7 +154,11 @@ class ManageStorageSettingsFragment : ComposeFragment() {
         dialog("double-confirm-delete-chat-history", dialogProperties = DialogProperties(dismissOnBackPress = true, dismissOnClickOutside = true)) {
           Dialogs.SimpleAlertDialog(
             title = stringResource(id = R.string.preferences_storage__are_you_sure_you_want_to_delete_all_message_history),
-            body = stringResource(id = R.string.preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone),
+            body = if (TextSecurePreferences.isMultiDevice(LocalContext.current) && Recipient.self().deleteSyncCapability.isSupported) {
+              stringResource(id = R.string.preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device)
+            } else {
+              stringResource(id = R.string.preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone)
+            },
             confirm = stringResource(id = R.string.preferences_storage__delete_all_now),
             confirmColor = MaterialTheme.colorScheme.error,
             dismiss = stringResource(id = android.R.string.cancel),
@@ -223,6 +235,7 @@ private fun ManageStorageSettingsScreen(
   onReviewStorage: () -> Unit = {},
   onSetKeepMessages: () -> Unit = {},
   onSetChatLengthLimit: () -> Unit = {},
+  onSyncTrimThreadDeletes: (Boolean) -> Unit = {},
   onDeleteChatHistory: () -> Unit = {}
 ) {
   Scaffolds.Settings(
@@ -263,6 +276,13 @@ private fun ManageStorageSettingsScreen(
         onClick = onSetChatLengthLimit
       )
 
+      Rows.ToggleRow(
+        text = stringResource(id = R.string.ManageStorageSettingsFragment_apply_limits_title),
+        label = stringResource(id = R.string.ManageStorageSettingsFragment_apply_limits_description),
+        checked = state.syncTrimDeletes,
+        onCheckChanged = onSyncTrimThreadDeletes
+      )
+
       Dividers.Default()
 
       Rows.TextRow(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsViewModel.kt
index e5f16f296b..437633a201 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/storage/ManageStorageSettingsViewModel.kt
@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.database.MediaTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.SignalDatabase.Companion.media
 import org.thoughtcrime.securesms.database.ThreadTable
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.KeepMessagesDuration
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 
@@ -25,8 +25,9 @@ class ManageStorageSettingsViewModel : ViewModel() {
 
   private val store = MutableStateFlow(
     ManageStorageState(
-      keepMessagesDuration = SignalStore.settings().keepMessagesDuration,
-      lengthLimit = if (SignalStore.settings().isTrimByLengthEnabled) SignalStore.settings().threadTrimLength else ManageStorageState.NO_LIMIT
+      keepMessagesDuration = SignalStore.settings.keepMessagesDuration,
+      lengthLimit = if (SignalStore.settings.isTrimByLengthEnabled) SignalStore.settings.threadTrimLength else ManageStorageState.NO_LIMIT,
+      syncTrimDeletes = SignalStore.settings.shouldSyncThreadTrimDeletes()
     )
   )
   val state = store.asStateFlow()
@@ -41,13 +42,13 @@ class ManageStorageSettingsViewModel : ViewModel() {
   fun deleteChatHistory() {
     viewModelScope.launch {
       SignalDatabase.threads.deleteAllConversations()
-      ApplicationDependencies.getMessageNotifier().updateNotification(ApplicationDependencies.getApplication())
+      AppDependencies.messageNotifier.updateNotification(AppDependencies.application)
     }
   }
 
   fun setKeepMessagesDuration(newDuration: KeepMessagesDuration) {
-    SignalStore.settings().setKeepMessagesForDuration(newDuration)
-    ApplicationDependencies.getTrimThreadsByDateManager().scheduleIfNecessary()
+    SignalStore.settings.setKeepMessagesForDuration(newDuration)
+    AppDependencies.trimThreadsByDateManager.scheduleIfNecessary()
 
     store.update { it.copy(keepMessagesDuration = newDuration) }
   }
@@ -59,13 +60,13 @@ class ManageStorageSettingsViewModel : ViewModel() {
   fun setChatLengthLimit(newLimit: Int) {
     val restrictingChange = isRestrictingLengthLimitChange(newLimit)
 
-    SignalStore.settings().setThreadTrimByLengthEnabled(newLimit != ManageStorageState.NO_LIMIT)
-    SignalStore.settings().threadTrimLength = newLimit
+    SignalStore.settings.setThreadTrimByLengthEnabled(newLimit != ManageStorageState.NO_LIMIT)
+    SignalStore.settings.threadTrimLength = newLimit
     store.update { it.copy(lengthLimit = newLimit) }
 
-    if (SignalStore.settings().isTrimByLengthEnabled && restrictingChange) {
+    if (SignalStore.settings.isTrimByLengthEnabled && restrictingChange) {
       SignalExecutors.BOUNDED.execute {
-        val keepMessagesDuration = SignalStore.settings().keepMessagesDuration
+        val keepMessagesDuration = SignalStore.settings.keepMessagesDuration
 
         val trimBeforeDate = if (keepMessagesDuration != KeepMessagesDuration.FOREVER) {
           System.currentTimeMillis() - keepMessagesDuration.duration
@@ -82,6 +83,11 @@ class ManageStorageSettingsViewModel : ViewModel() {
     return isRestrictingLengthLimitChange(newLimit)
   }
 
+  fun setSyncTrimDeletes(syncTrimDeletes: Boolean) {
+    SignalStore.settings.setSyncThreadTrimDeletes(syncTrimDeletes)
+    store.update { it.copy(syncTrimDeletes = syncTrimDeletes) }
+  }
+
   private fun isRestrictingLengthLimitChange(newLimit: Int): Boolean {
     return state.value.lengthLimit == ManageStorageState.NO_LIMIT || (newLimit != ManageStorageState.NO_LIMIT && newLimit < state.value.lengthLimit)
   }
@@ -90,6 +96,7 @@ class ManageStorageSettingsViewModel : ViewModel() {
   data class ManageStorageState(
     val keepMessagesDuration: KeepMessagesDuration = KeepMessagesDuration.FOREVER,
     val lengthLimit: Int = NO_LIMIT,
+    val syncTrimDeletes: Boolean = true,
     val breakdown: MediaTable.StorageBreakdown? = null
   ) {
     companion object {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/BadgeImage.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/BadgeImage.kt
new file mode 100644
index 0000000000..c090ec401b
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/BadgeImage.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.viewinterop.AndroidView
+import org.thoughtcrime.securesms.badges.BadgeImageView
+import org.thoughtcrime.securesms.badges.models.Badge
+
+enum class BadgeImageSize(val sizeCode: Int) {
+  SMALL(0),
+  MEDIUM(1),
+  LARGE(2),
+  X_LARGE(3),
+  BADGE_64(4),
+  BADGE_112(5)
+}
+
+@Composable
+fun BadgeImage112(
+  badge: Badge?,
+  modifier: Modifier = Modifier
+) {
+  if (LocalInspectionMode.current) {
+    Box(modifier = modifier.background(color = Color.Black, shape = CircleShape))
+  } else {
+    AndroidView(
+      factory = {
+        BadgeImageView(it, BadgeImageSize.BADGE_112)
+      },
+      update = {
+        it.setBadge(badge)
+      },
+      modifier = modifier
+    )
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationEvent.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationEvent.kt
new file mode 100644
index 0000000000..a7042b847f
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationEvent.kt
@@ -0,0 +1,13 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription
+
+import org.thoughtcrime.securesms.badges.models.Badge
+
+/**
+ * Events that can arise from use of the donations apis.
+ */
+sealed class DonationEvent {
+  object RequestTokenSuccess : DonationEvent()
+  class PaymentConfirmationSuccess(val badge: Badge) : DonationEvent()
+  class SubscriptionCancellationFailed(val throwable: Throwable) : DonationEvent()
+  object SubscriptionCancelled : DonationEvent()
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPendingBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPendingBottomSheet.kt
new file mode 100644
index 0000000000..380be4f8f8
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPendingBottomSheet.kt
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription
+
+import android.content.DialogInterface
+import android.net.Uri
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.LocalTextStyle
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
+import org.signal.core.ui.BottomSheets
+import org.signal.core.ui.Buttons
+import org.signal.core.ui.Texts
+import org.signal.core.ui.theme.SignalTheme
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
+import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
+import org.thoughtcrime.securesms.util.CommunicationActions
+import org.thoughtcrime.securesms.util.SpanUtil
+
+/**
+ * Displayed after the user completes the donation flow for a bank transfer.
+ */
+class DonationPendingBottomSheet : ComposeBottomSheetDialogFragment() {
+
+  private val args: DonationPendingBottomSheetArgs by navArgs()
+
+  @Composable
+  override fun SheetContent() {
+    DonationPendingBottomSheetContent(
+      badge = Badges.fromDatabaseBadge(args.inAppPayment.data.badge!!),
+      onDoneClick = this::onDoneClick
+    )
+  }
+
+  private fun onDoneClick() {
+    dismissAllowingStateLoss()
+  }
+
+  override fun onDismiss(dialog: DialogInterface) {
+    super.onDismiss(dialog)
+
+    if (!args.inAppPayment.type.recurring) {
+      findNavController().popBackStack()
+    } else {
+      requireActivity().finish()
+      requireActivity().startActivity(AppSettingsActivity.manageSubscriptions(requireContext()))
+    }
+  }
+}
+
+@Preview
+@Composable
+fun DonationPendingBottomSheetContentPreview() {
+  SignalTheme {
+    Surface {
+      DonationPendingBottomSheetContent(
+        badge = Badge(
+          id = "",
+          category = Badge.Category.Donor,
+          name = "Signal Star",
+          description = "",
+          imageUrl = Uri.EMPTY,
+          imageDensity = "",
+          expirationTimestamp = 0L,
+          visible = true,
+          duration = 0L
+        ),
+        onDoneClick = {}
+      )
+    }
+  }
+}
+
+@Composable
+private fun DonationPendingBottomSheetContent(
+  badge: Badge,
+  onDoneClick: () -> Unit
+) {
+  Column(
+    horizontalAlignment = Alignment.CenterHorizontally,
+    modifier = Modifier.padding(horizontal = 44.dp)
+  ) {
+    BottomSheets.Handle()
+
+    BadgeImage112(
+      badge = badge,
+      modifier = Modifier
+        .padding(top = 21.dp, bottom = 16.dp)
+        .size(80.dp)
+    )
+
+    Text(
+      text = stringResource(id = R.string.DonationPendingBottomSheet__donation_pending),
+      textAlign = TextAlign.Center,
+      style = MaterialTheme.typography.titleLarge,
+      color = MaterialTheme.colorScheme.onSurface,
+      modifier = Modifier.padding(bottom = 8.dp)
+    )
+
+    val textResource = if (badge.isSubscription()) {
+      R.string.DonationPendingBottomSheet__your_monthly_donation_is_pending
+    } else {
+      R.string.DonationPendingBottomSheet__your_one_time_donation_is_pending
+    }
+
+    Text(
+      text = stringResource(id = textResource, badge.name),
+      textAlign = TextAlign.Center,
+      color = MaterialTheme.colorScheme.onSurfaceVariant,
+      modifier = Modifier.padding(bottom = 20.dp)
+    )
+
+    val context = LocalContext.current
+    val learnMore = stringResource(id = R.string.DonationPendingBottomSheet__learn_more)
+    val fullString = stringResource(id = R.string.DonationPendingBottomSheet__bank_transfers_usually_take, learnMore)
+    val spanned = SpanUtil.urlSubsequence(fullString, learnMore, stringResource(id = R.string.pending_transfer_url))
+    Texts.LinkifiedText(
+      textWithUrlSpans = spanned,
+      onUrlClick = { CommunicationActions.openBrowserLink(context, it) },
+      style = LocalTextStyle.current.copy(textAlign = TextAlign.Center, color = MaterialTheme.colorScheme.onSurfaceVariant),
+      modifier = Modifier.padding(bottom = 48.dp)
+    )
+
+    Buttons.LargeTonal(
+      onClick = onDoneClick,
+      modifier = Modifier
+        .defaultMinSize(minWidth = 220.dp)
+        .padding(bottom = 56.dp)
+    ) {
+      Text(text = stringResource(id = R.string.DonationPendingBottomSheet__done))
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationSerializationHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationSerializationHelper.kt
new file mode 100644
index 0000000000..516b228fd1
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationSerializationHelper.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription
+
+import okio.ByteString
+import org.signal.core.util.money.FiatMoney
+import org.signal.donations.PaymentSourceType
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.database.model.databaseprotos.DecimalValue
+import org.thoughtcrime.securesms.database.model.databaseprotos.FiatValue
+import org.thoughtcrime.securesms.database.model.databaseprotos.PendingOneTimeDonation
+import java.math.BigDecimal
+import java.math.BigInteger
+import java.math.MathContext
+import java.util.Currency
+
+object DonationSerializationHelper {
+  fun createPendingOneTimeDonationProto(
+    badge: Badge,
+    paymentSourceType: PaymentSourceType,
+    amount: FiatMoney
+  ): PendingOneTimeDonation {
+    return PendingOneTimeDonation(
+      badge = Badges.toDatabaseBadge(badge),
+      paymentMethodType = when (paymentSourceType) {
+        PaymentSourceType.PayPal -> PendingOneTimeDonation.PaymentMethodType.PAYPAL
+        PaymentSourceType.Stripe.CreditCard, PaymentSourceType.Stripe.GooglePay, PaymentSourceType.Unknown -> PendingOneTimeDonation.PaymentMethodType.CARD
+        PaymentSourceType.Stripe.SEPADebit -> PendingOneTimeDonation.PaymentMethodType.SEPA_DEBIT
+        PaymentSourceType.Stripe.IDEAL -> PendingOneTimeDonation.PaymentMethodType.IDEAL
+      },
+      amount = amount.toFiatValue(),
+      timestamp = System.currentTimeMillis()
+    )
+  }
+
+  fun FiatValue.toFiatMoney(): FiatMoney {
+    return FiatMoney(
+      amount!!.toBigDecimal(),
+      Currency.getInstance(currencyCode)
+    )
+  }
+
+  fun DecimalValue.toBigDecimal(): BigDecimal {
+    return BigDecimal(
+      BigInteger(value_.toByteArray()),
+      scale,
+      MathContext(precision)
+    )
+  }
+
+  fun FiatMoney.toFiatValue(): FiatValue {
+    return FiatValue(
+      currencyCode = currency.currencyCode,
+      amount = amount.toDecimalValue()
+    )
+  }
+
+  fun BigDecimal.toDecimalValue(): DecimalValue {
+    return DecimalValue(
+      scale = scale(),
+      precision = precision(),
+      value_ = ByteString.of(*this.unscaledValue().toByteArray())
+    )
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationsConfigurationExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationsConfigurationExtensions.kt
new file mode 100644
index 0000000000..54f1f27265
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationsConfigurationExtensions.kt
@@ -0,0 +1,144 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription
+
+import org.signal.core.util.money.FiatMoney
+import org.signal.core.util.money.PlatformCurrencyUtil
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration
+import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration.BOOST_LEVEL
+import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration.GIFT_LEVEL
+import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration.LevelConfiguration
+import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration.SUBSCRIPTION_LEVELS
+import java.math.BigDecimal
+import java.util.Currency
+
+private const val CARD = "CARD"
+private const val PAYPAL = "PAYPAL"
+private const val SEPA_DEBIT = "SEPA_DEBIT"
+
+/**
+ * Transforms the DonationsConfiguration into a Set<FiatMoney> which has been properly filtered
+ * for available currencies on the platform and based off user device availability.
+ *
+ * CARD   - Google Pay & Credit Card
+ * PAYPAL - PayPal
+ *
+ * @param level                    The subscription level to get amounts for
+ * @param paymentMethodAvailability Predicate object which checks whether different payment methods are availble.
+ */
+fun SubscriptionsConfiguration.getSubscriptionAmounts(
+  level: Int,
+  paymentMethodAvailability: PaymentMethodAvailability = DefaultPaymentMethodAvailability
+): Set<FiatMoney> {
+  require(SUBSCRIPTION_LEVELS.contains(level))
+
+  return getFilteredCurrencies(paymentMethodAvailability).map { (code, config) ->
+    val amount: BigDecimal = config.subscription[level]!!
+    FiatMoney(amount, Currency.getInstance(code.uppercase()))
+  }.toSet()
+}
+
+/**
+ * Currently, we only support a single gift badge at level GIFT_LEVEL
+ */
+fun SubscriptionsConfiguration.getGiftBadges(): List<Badge> {
+  val configuration = levels[GIFT_LEVEL]
+  return listOfNotNull(configuration?.badge?.let { Badges.fromServiceBadge(it) })
+}
+
+/**
+ * Currently, we only support a single gift badge amount per currency
+ */
+fun SubscriptionsConfiguration.getGiftBadgeAmounts(paymentMethodAvailability: PaymentMethodAvailability = DefaultPaymentMethodAvailability): Map<Currency, FiatMoney> {
+  return getFilteredCurrencies(paymentMethodAvailability).filter {
+    it.value.oneTime[GIFT_LEVEL]?.isNotEmpty() == true
+  }.mapKeys {
+    Currency.getInstance(it.key.uppercase())
+  }.mapValues {
+    FiatMoney(it.value.oneTime[GIFT_LEVEL]!!.first(), it.key)
+  }
+}
+
+/**
+ * Currently, we only support a single boost badge at level BOOST_LEVEL
+ */
+fun SubscriptionsConfiguration.getBoostBadges(): List<Badge> {
+  val configuration = levels[BOOST_LEVEL]
+  return listOfNotNull(configuration?.badge?.let { Badges.fromServiceBadge(it) })
+}
+
+fun SubscriptionsConfiguration.getBoostAmounts(paymentMethodAvailability: PaymentMethodAvailability = DefaultPaymentMethodAvailability): Map<Currency, List<FiatMoney>> {
+  return getFilteredCurrencies(paymentMethodAvailability).filter {
+    it.value.oneTime[BOOST_LEVEL]?.isNotEmpty() == true
+  }.mapKeys {
+    Currency.getInstance(it.key.uppercase())
+  }.mapValues { (currency, config) ->
+    config.oneTime[BOOST_LEVEL]!!.map { FiatMoney(it, currency) }
+  }
+}
+
+fun SubscriptionsConfiguration.getBadge(level: Int): Badge {
+  require(level == GIFT_LEVEL || level == BOOST_LEVEL || SUBSCRIPTION_LEVELS.contains(level))
+  return Badges.fromServiceBadge(levels[level]!!.badge)
+}
+
+fun SubscriptionsConfiguration.getSubscriptionLevels(): Map<Int, LevelConfiguration> {
+  return levels.filterKeys { SUBSCRIPTION_LEVELS.contains(it) }.toSortedMap()
+}
+
+/**
+ * Get a map describing the minimum donation amounts per currency.
+ * This returns only the currencies available to the user.
+ */
+fun SubscriptionsConfiguration.getMinimumDonationAmounts(paymentMethodAvailability: PaymentMethodAvailability = DefaultPaymentMethodAvailability): Map<Currency, FiatMoney> {
+  return getFilteredCurrencies(paymentMethodAvailability)
+    .mapKeys { Currency.getInstance(it.key.uppercase()) }
+    .mapValues { FiatMoney(it.value.minimum, it.key) }
+}
+
+fun SubscriptionsConfiguration.getAvailablePaymentMethods(currencyCode: String): Set<String> {
+  return currencies[currencyCode.lowercase()]?.supportedPaymentMethods ?: emptySet()
+}
+
+private fun SubscriptionsConfiguration.getFilteredCurrencies(paymentMethodAvailability: PaymentMethodAvailability): Map<String, SubscriptionsConfiguration.CurrencyConfiguration> {
+  val userPaymentMethods = paymentMethodAvailability.toSet()
+  val availableCurrencyCodes = PlatformCurrencyUtil.getAvailableCurrencyCodes()
+  return currencies.filter { (code, config) ->
+    val areAllMethodsAvailable = config.supportedPaymentMethods.any { it in userPaymentMethods }
+    availableCurrencyCodes.contains(code.uppercase()) && areAllMethodsAvailable
+  }
+}
+
+/**
+ * This interface is available to ease unit testing of the extension methods in
+ * this file. In all normal situations, you can just allow the methods to use the
+ * default value.
+ */
+interface PaymentMethodAvailability {
+  fun isPayPalAvailable(): Boolean
+  fun isGooglePayOrCreditCardAvailable(): Boolean
+  fun isSEPADebitAvailable(): Boolean
+
+  fun toSet(): Set<String> {
+    val set = mutableSetOf<String>()
+    if (isPayPalAvailable()) {
+      set.add(PAYPAL)
+    }
+
+    if (isGooglePayOrCreditCardAvailable()) {
+      set.add(CARD)
+    }
+
+    if (isSEPADebitAvailable()) {
+      set.add(SEPA_DEBIT)
+    }
+
+    return set
+  }
+}
+
+private object DefaultPaymentMethodAvailability : PaymentMethodAvailability {
+  override fun isPayPalAvailable(): Boolean = InAppDonations.isPayPalAvailable()
+  override fun isGooglePayOrCreditCardAvailable(): Boolean = InAppDonations.isCreditCardAvailable() || InAppDonations.isGooglePayAvailable()
+  override fun isSEPADebitAvailable(): Boolean = InAppDonations.isSEPADebitAvailable()
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/InAppDonations.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/InAppDonations.kt
new file mode 100644
index 0000000000..c1ce4e8d31
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/InAppDonations.kt
@@ -0,0 +1,97 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription
+
+import org.signal.donations.InAppPaymentType
+import org.signal.donations.PaymentSourceType
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.util.Environment
+import org.thoughtcrime.securesms.util.LocaleRemoteConfig
+import org.thoughtcrime.securesms.util.RemoteConfig
+
+/**
+ * Helper object to determine in-app donations availability.
+ */
+object InAppDonations {
+
+  /**
+   * The user is:
+   *
+   * - Able to use Credit Cards and is in a region where they are able to be accepted.
+   * - Able to access Google Play services (and thus possibly able to use Google Pay).
+   * - Able to use SEPA Debit and is in a region where they are able to be accepted.
+   * - Able to use PayPal and is in a region where it is able to be accepted.
+   */
+  fun hasAtLeastOnePaymentMethodAvailable(): Boolean {
+    return isCreditCardAvailable() || isPayPalAvailable() || isGooglePayAvailable() || isSEPADebitAvailable() || isIDEALAvailable()
+  }
+
+  fun isPaymentSourceAvailable(paymentSourceType: PaymentSourceType, inAppPaymentType: InAppPaymentType): Boolean {
+    return when (paymentSourceType) {
+      PaymentSourceType.PayPal -> isPayPalAvailableForDonateToSignalType(inAppPaymentType)
+      PaymentSourceType.Stripe.CreditCard -> isCreditCardAvailable()
+      PaymentSourceType.Stripe.GooglePay -> isGooglePayAvailable()
+      PaymentSourceType.Stripe.SEPADebit -> isSEPADebitAvailableForDonateToSignalType(inAppPaymentType)
+      PaymentSourceType.Stripe.IDEAL -> isIDEALAvailbleForDonateToSignalType(inAppPaymentType)
+      PaymentSourceType.Unknown -> false
+    }
+  }
+
+  private fun isPayPalAvailableForDonateToSignalType(inAppPaymentType: InAppPaymentType): Boolean {
+    return when (inAppPaymentType) {
+      InAppPaymentType.UNKNOWN -> error("Unsupported type UNKNOWN")
+      InAppPaymentType.ONE_TIME_DONATION, InAppPaymentType.ONE_TIME_GIFT -> RemoteConfig.paypalOneTimeDonations
+      InAppPaymentType.RECURRING_DONATION -> RemoteConfig.paypalRecurringDonations
+      InAppPaymentType.RECURRING_BACKUP -> RemoteConfig.messageBackups && RemoteConfig.paypalRecurringDonations
+    } && !LocaleRemoteConfig.isPayPalDisabled()
+  }
+
+  /**
+   * Whether the user is in a region that supports credit cards, based off local phone number.
+   */
+  fun isCreditCardAvailable(): Boolean {
+    return !LocaleRemoteConfig.isCreditCardDisabled()
+  }
+
+  /**
+   * Whether the user is in a region that supports PayPal, based off local phone number.
+   */
+  fun isPayPalAvailable(): Boolean {
+    return (RemoteConfig.paypalOneTimeDonations || RemoteConfig.paypalRecurringDonations) && !LocaleRemoteConfig.isPayPalDisabled()
+  }
+
+  /**
+   * Whether the user is using a device that supports GooglePay, based off Wallet API and phone number.
+   */
+  fun isGooglePayAvailable(): Boolean {
+    return SignalStore.inAppPayments.isGooglePayReady && !LocaleRemoteConfig.isGooglePayDisabled()
+  }
+
+  /**
+   * Whether the user is in a region which supports SEPA Debit transfers, based off local phone number.
+   */
+  fun isSEPADebitAvailable(): Boolean {
+    return Environment.IS_STAGING || (RemoteConfig.sepaDebitDonations && LocaleRemoteConfig.isSepaEnabled())
+  }
+
+  /**
+   * Whether the user is in a region which supports IDEAL transfers, based off local phone number.
+   */
+  fun isIDEALAvailable(): Boolean {
+    return Environment.IS_STAGING || (RemoteConfig.idealDonations && LocaleRemoteConfig.isIdealEnabled())
+  }
+
+  /**
+   * Whether the user is in a region which supports SEPA Debit transfers, based off local phone number
+   * and donation type.
+   */
+  fun isSEPADebitAvailableForDonateToSignalType(inAppPaymentType: InAppPaymentType): Boolean {
+    return inAppPaymentType != InAppPaymentType.ONE_TIME_GIFT && isSEPADebitAvailable()
+  }
+
+  /**
+   * Whether the user is in a region which suports IDEAL transfers, based off local phone number and
+   * donation type
+   */
+  fun isIDEALAvailbleForDonateToSignalType(inAppPaymentType: InAppPaymentType): Boolean {
+    return inAppPaymentType != InAppPaymentType.ONE_TIME_GIFT && isIDEALAvailable()
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/InAppPaymentComponent.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/InAppPaymentComponent.kt
new file mode 100644
index 0000000000..7ef70220ca
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/InAppPaymentComponent.kt
@@ -0,0 +1,14 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription
+
+import android.content.Intent
+import android.os.Parcelable
+import io.reactivex.rxjava3.subjects.Subject
+import kotlinx.parcelize.Parcelize
+
+interface InAppPaymentComponent {
+  val stripeRepository: StripeRepository
+  val googlePayResultPublisher: Subject<GooglePayResult>
+
+  @Parcelize
+  class GooglePayResult(val requestCode: Int, val resultCode: Int, val data: Intent?) : Parcelable
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/InAppPaymentsRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/InAppPaymentsRepository.kt
new file mode 100644
index 0000000000..7e33b1b5db
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/InAppPaymentsRepository.kt
@@ -0,0 +1,625 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription
+
+import android.annotation.SuppressLint
+import androidx.annotation.WorkerThread
+import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.processors.PublishProcessor
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.util.concurrent.SignalExecutors
+import org.signal.core.util.logging.Log
+import org.signal.donations.InAppPaymentType
+import org.signal.donations.PaymentSourceType
+import org.signal.donations.StripeDeclineCode
+import org.signal.donations.StripeFailureCode
+import org.signal.libsignal.zkgroup.InvalidInputException
+import org.signal.libsignal.zkgroup.VerificationFailedException
+import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialRequestContext
+import org.signal.libsignal.zkgroup.receipts.ReceiptSerial
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatMoney
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentError
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.toDonationError
+import org.thoughtcrime.securesms.components.settings.app.subscription.manage.DonationRedemptionJobStatus
+import org.thoughtcrime.securesms.components.settings.app.subscription.manage.NonVerifiedMonthlyDonation
+import org.thoughtcrime.securesms.database.DatabaseObserver.InAppPaymentObserver
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.database.model.databaseprotos.PendingOneTimeDonation
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.storage.StorageSyncHelper
+import org.thoughtcrime.securesms.util.Util
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
+import org.whispersystems.signalservice.api.subscriptions.SubscriberId
+import org.whispersystems.signalservice.internal.push.DonationProcessor
+import org.whispersystems.signalservice.internal.push.exceptions.DonationProcessorError
+import java.security.SecureRandom
+import java.util.Currency
+import java.util.Optional
+import kotlin.jvm.optionals.getOrNull
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.days
+import kotlin.time.Duration.Companion.seconds
+
+/**
+ * Unifies legacy access and new access to in app payment data.
+ */
+object InAppPaymentsRepository {
+
+  private const val JOB_PREFIX = "InAppPayments__"
+  private val TAG = Log.tag(InAppPaymentsRepository::class.java)
+
+  private val temporaryErrorProcessor = PublishProcessor.create<Pair<InAppPaymentTable.InAppPaymentId, Throwable>>()
+
+  /**
+   * Wraps an in-app-payment update in a completable.
+   */
+  fun updateInAppPayment(inAppPayment: InAppPaymentTable.InAppPayment): Completable {
+    return Completable.fromAction {
+      SignalDatabase.inAppPayments.update(inAppPayment)
+    }.subscribeOn(Schedulers.io())
+  }
+
+  /**
+   * Common logic for handling errors coming from the Rx chains that handle payments. These errors
+   * are analyzed and then either written to the database or dispatched to the temporary error processor.
+   */
+  fun handlePipelineError(
+    inAppPaymentId: InAppPaymentTable.InAppPaymentId,
+    donationErrorSource: DonationErrorSource,
+    paymentSourceType: PaymentSourceType,
+    error: Throwable
+  ) {
+    if (error is InAppPaymentError) {
+      setErrorIfNotPresent(inAppPaymentId, error.inAppPaymentDataError)
+      return
+    }
+
+    val donationError: DonationError = when (error) {
+      is DonationError -> error
+      is DonationProcessorError -> error.toDonationError(donationErrorSource, paymentSourceType)
+      else -> DonationError.genericBadgeRedemptionFailure(donationErrorSource)
+    }
+
+    val inAppPaymentError = InAppPaymentError.fromDonationError(donationError)?.inAppPaymentDataError
+    if (inAppPaymentError != null) {
+      Log.w(TAG, "Detected a terminal error.")
+      setErrorIfNotPresent(inAppPaymentId, inAppPaymentError).subscribe()
+    } else {
+      Log.w(TAG, "Detected a temporary error.")
+      temporaryErrorProcessor.onNext(inAppPaymentId to donationError)
+    }
+  }
+
+  /**
+   * Observe a stream of "temporary errors". These are situations in which either the user cancelled out, opened an external application,
+   * or needs to wait a longer time period than 10s for the completion of their payment.
+   */
+  fun observeTemporaryErrors(inAppPaymentId: InAppPaymentTable.InAppPaymentId): Flowable<Pair<InAppPaymentTable.InAppPaymentId, Throwable>> {
+    return temporaryErrorProcessor.filter { (id, _) -> id == inAppPaymentId }
+  }
+
+  /**
+   * Writes the given error to the database, if and only if there is not already an error set.
+   */
+  private fun setErrorIfNotPresent(inAppPaymentId: InAppPaymentTable.InAppPaymentId, error: InAppPaymentData.Error?): Completable {
+    return Completable.fromAction {
+      val inAppPayment = SignalDatabase.inAppPayments.getById(inAppPaymentId)!!
+      if (inAppPayment.data.error == null) {
+        SignalDatabase.inAppPayments.update(
+          inAppPayment.copy(
+            notified = false,
+            state = InAppPaymentTable.State.END,
+            data = inAppPayment.data.copy(error = error)
+          )
+        )
+      }
+    }.subscribeOn(Schedulers.io())
+  }
+
+  /**
+   * Returns a Single that can give a snapshot of the given payment, and will throw if it is not found.
+   */
+  fun requireInAppPayment(inAppPaymentId: InAppPaymentTable.InAppPaymentId): Single<InAppPaymentTable.InAppPayment> {
+    return Single.fromCallable {
+      SignalDatabase.inAppPayments.getById(inAppPaymentId) ?: throw Exception("Not found.")
+    }.subscribeOn(Schedulers.io())
+  }
+
+  /**
+   * Returns a Flowable source of InAppPayments that emits whenever the payment with the given id is updated. This
+   * flowable is primed with the current state.
+   */
+  fun observeUpdates(inAppPaymentId: InAppPaymentTable.InAppPaymentId): Flowable<InAppPaymentTable.InAppPayment> {
+    return Flowable.create({ emitter ->
+      val observer = InAppPaymentObserver {
+        if (it.id == inAppPaymentId) {
+          emitter.onNext(it)
+        }
+      }
+
+      AppDependencies.databaseObserver.registerInAppPaymentObserver(observer)
+      emitter.setCancellable {
+        AppDependencies.databaseObserver.unregisterObserver(observer)
+      }
+
+      SignalDatabase.inAppPayments.getById(inAppPaymentId)?.also {
+        observer.onInAppPaymentChanged(it)
+      }
+    }, BackpressureStrategy.LATEST)
+  }
+
+  /**
+   * For one-time:
+   *  - Each job chain is serialized with respect to the in-app-payment ID
+   *
+   * For recurring:
+   *  - Each job chain is serialized with respect to the in-app-payment type
+   */
+  fun resolveJobQueueKey(inAppPayment: InAppPaymentTable.InAppPayment): String {
+    return when (inAppPayment.type) {
+      InAppPaymentType.UNKNOWN -> error("Unsupported type UNKNOWN.")
+      InAppPaymentType.ONE_TIME_GIFT, InAppPaymentType.ONE_TIME_DONATION -> "$JOB_PREFIX${inAppPayment.id.serialize()}"
+      InAppPaymentType.RECURRING_DONATION, InAppPaymentType.RECURRING_BACKUP -> "$JOB_PREFIX${inAppPayment.type.code}"
+    }
+  }
+
+  /**
+   * Returns a duration to utilize for jobs tied to different payment methods. For long running bank transfers, we need to
+   * allow extra time for completion.
+   */
+  fun resolveContextJobLifespan(inAppPayment: InAppPaymentTable.InAppPayment): Duration {
+    return when (inAppPayment.data.paymentMethodType) {
+      InAppPaymentData.PaymentMethodType.SEPA_DEBIT, InAppPaymentData.PaymentMethodType.IDEAL -> 30.days
+      else -> 1.days
+    }
+  }
+
+  /**
+   * Returns the object to utilize as a mutex for recurring subscriptions.
+   */
+  fun resolveMutex(inAppPaymentId: InAppPaymentTable.InAppPaymentId): Any {
+    val payment = SignalDatabase.inAppPayments.getById(inAppPaymentId) ?: error("Not found")
+
+    return payment.type.requireSubscriberType()
+  }
+
+  /**
+   * Maps a payment type into a request code for grabbing a Google Pay token.
+   */
+  fun getGooglePayRequestCode(inAppPaymentType: InAppPaymentType): Int {
+    return when (inAppPaymentType) {
+      InAppPaymentType.UNKNOWN -> error("Unsupported type UNKNOWN")
+      InAppPaymentType.ONE_TIME_GIFT -> 16143
+      InAppPaymentType.ONE_TIME_DONATION -> 16141
+      InAppPaymentType.RECURRING_DONATION -> 16142
+      InAppPaymentType.RECURRING_BACKUP -> 16144
+    }
+  }
+
+  /**
+   * Converts an error source to a persistable type. For types that don't map,
+   * UNKNOWN is returned.
+   */
+  fun DonationErrorSource.toInAppPaymentType(): InAppPaymentType {
+    return when (this) {
+      DonationErrorSource.ONE_TIME -> InAppPaymentType.ONE_TIME_DONATION
+      DonationErrorSource.MONTHLY -> InAppPaymentType.RECURRING_DONATION
+      DonationErrorSource.GIFT -> InAppPaymentType.ONE_TIME_GIFT
+      DonationErrorSource.GIFT_REDEMPTION -> InAppPaymentType.UNKNOWN
+      DonationErrorSource.KEEP_ALIVE -> InAppPaymentType.UNKNOWN
+      DonationErrorSource.UNKNOWN -> InAppPaymentType.UNKNOWN
+    }
+  }
+
+  /**
+   * Converts the structured payment source type into a type we can write to the database.
+   */
+  fun PaymentSourceType.toPaymentMethodType(): InAppPaymentData.PaymentMethodType {
+    return when (this) {
+      PaymentSourceType.PayPal -> InAppPaymentData.PaymentMethodType.PAYPAL
+      PaymentSourceType.Stripe.CreditCard -> InAppPaymentData.PaymentMethodType.CARD
+      PaymentSourceType.Stripe.GooglePay -> InAppPaymentData.PaymentMethodType.GOOGLE_PAY
+      PaymentSourceType.Stripe.IDEAL -> InAppPaymentData.PaymentMethodType.IDEAL
+      PaymentSourceType.Stripe.SEPADebit -> InAppPaymentData.PaymentMethodType.SEPA_DEBIT
+      PaymentSourceType.Unknown -> InAppPaymentData.PaymentMethodType.UNKNOWN
+    }
+  }
+
+  /**
+   * Converts the database payment method type to the structured sealed type
+   */
+  fun InAppPaymentData.PaymentMethodType.toPaymentSourceType(): PaymentSourceType {
+    return when (this) {
+      InAppPaymentData.PaymentMethodType.PAYPAL -> PaymentSourceType.PayPal
+      InAppPaymentData.PaymentMethodType.CARD -> PaymentSourceType.Stripe.CreditCard
+      InAppPaymentData.PaymentMethodType.GOOGLE_PAY -> PaymentSourceType.Stripe.GooglePay
+      InAppPaymentData.PaymentMethodType.IDEAL -> PaymentSourceType.Stripe.IDEAL
+      InAppPaymentData.PaymentMethodType.SEPA_DEBIT -> PaymentSourceType.Stripe.SEPADebit
+      InAppPaymentData.PaymentMethodType.UNKNOWN -> PaymentSourceType.Unknown
+    }
+  }
+
+  fun InAppPaymentType.toErrorSource(): DonationErrorSource {
+    return when (this) {
+      InAppPaymentType.UNKNOWN -> DonationErrorSource.UNKNOWN
+      InAppPaymentType.ONE_TIME_GIFT -> DonationErrorSource.GIFT
+      InAppPaymentType.ONE_TIME_DONATION -> DonationErrorSource.ONE_TIME
+      InAppPaymentType.RECURRING_DONATION -> DonationErrorSource.MONTHLY
+      InAppPaymentType.RECURRING_BACKUP -> DonationErrorSource.UNKNOWN // TODO [message-backups] error handling
+    }
+  }
+
+  fun InAppPaymentType.toSubscriberType(): InAppPaymentSubscriberRecord.Type? {
+    return when (this) {
+      InAppPaymentType.RECURRING_BACKUP -> InAppPaymentSubscriberRecord.Type.BACKUP
+      InAppPaymentType.RECURRING_DONATION -> InAppPaymentSubscriberRecord.Type.DONATION
+      else -> null
+    }
+  }
+
+  fun InAppPaymentType.requireSubscriberType(): InAppPaymentSubscriberRecord.Type {
+    return requireNotNull(toSubscriberType())
+  }
+
+  /**
+   * Converts network ChargeFailure objects into the form we can persist in the database.
+   */
+  fun ActiveSubscription.ChargeFailure.toInAppPaymentDataChargeFailure(): InAppPaymentData.ChargeFailure {
+    return InAppPaymentData.ChargeFailure(
+      code = this.code ?: "",
+      message = this.message ?: "",
+      outcomeNetworkStatus = outcomeNetworkStatus ?: "",
+      outcomeNetworkReason = outcomeNetworkReason ?: "",
+      outcomeType = outcomeType ?: ""
+    )
+  }
+
+  /**
+   * Converts our database persistable ChargeFailure objects into the form we expect from the network.
+   */
+  fun InAppPaymentData.ChargeFailure.toActiveSubscriptionChargeFailure(): ActiveSubscription.ChargeFailure {
+    return ActiveSubscription.ChargeFailure(
+      code,
+      message,
+      outcomeNetworkStatus,
+      outcomeNetworkReason,
+      outcomeType
+    )
+  }
+
+  /**
+   * Retrieves the latest payment method type, biasing the result towards what is available in the database and falling
+   * back on information in SignalStore. This information is utilized in some error presentation as well as in subscription
+   * updates.
+   */
+  @WorkerThread
+  fun getLatestPaymentMethodType(subscriberType: InAppPaymentSubscriberRecord.Type): InAppPaymentData.PaymentMethodType {
+    val paymentMethodType = getSubscriber(subscriberType)?.paymentMethodType ?: InAppPaymentData.PaymentMethodType.UNKNOWN
+    return if (paymentMethodType != InAppPaymentData.PaymentMethodType.UNKNOWN) {
+      paymentMethodType
+    } else if (subscriberType == InAppPaymentSubscriberRecord.Type.DONATION) {
+      SignalStore.inAppPayments.getSubscriptionPaymentSourceType().toPaymentMethodType()
+    } else {
+      return InAppPaymentData.PaymentMethodType.UNKNOWN
+    }
+  }
+
+  /**
+   * Checks whether the user marked subscriptions of the given type as manually cancelled.
+   */
+  @JvmStatic
+  fun isUserManuallyCancelled(subscriberType: InAppPaymentSubscriberRecord.Type): Boolean {
+    return if (subscriberType == InAppPaymentSubscriberRecord.Type.DONATION) {
+      SignalStore.inAppPayments.isDonationSubscriptionManuallyCancelled()
+    } else {
+      SignalStore.inAppPayments.isBackupSubscriptionManuallyCancelled()
+    }
+  }
+
+  /**
+   * Returns the last end of period stored in the key-value store for donations, 0 for backups, used by the keep-alive job.
+   *
+   * This is safe because, at worse, we'll end up getting a 409 and skipping redemption for a badge or backups.
+   * During the keep-alive, we will insert a new InAppPayment record that will contain the proper end-of-period from the active
+   * subscription, so the next time it runs calling this method will be avoided entirely.
+   */
+  @JvmStatic
+  fun getFallbackLastEndOfPeriod(subscriberType: InAppPaymentSubscriberRecord.Type): Duration {
+    return if (subscriberType == InAppPaymentSubscriberRecord.Type.DONATION) {
+      SignalStore.inAppPayments.getLastEndOfPeriod().seconds
+    } else {
+      0.seconds
+    }
+  }
+
+  @JvmStatic
+  @WorkerThread
+  fun setShouldCancelSubscriptionBeforeNextSubscribeAttempt(subscriber: InAppPaymentSubscriberRecord, shouldCancel: Boolean) {
+    setShouldCancelSubscriptionBeforeNextSubscribeAttempt(subscriber.type, subscriber.subscriberId, shouldCancel)
+  }
+
+  /**
+   * Sets whether we should force a cancellation before our next subscription attempt. This is to help clean up
+   * bad state in some edge cases.
+   */
+  @JvmStatic
+  @WorkerThread
+  fun setShouldCancelSubscriptionBeforeNextSubscribeAttempt(subscriberType: InAppPaymentSubscriberRecord.Type, subscriberId: SubscriberId?, shouldCancel: Boolean) {
+    if (subscriberType == InAppPaymentSubscriberRecord.Type.DONATION) {
+      SignalStore.inAppPayments.shouldCancelSubscriptionBeforeNextSubscribeAttempt = shouldCancel
+    }
+
+    if (subscriberId == null) {
+      return
+    }
+
+    SignalDatabase.inAppPaymentSubscribers.setRequiresCancel(
+      subscriberId = subscriberId,
+      requiresCancel = shouldCancel
+    )
+  }
+
+  /**
+   * Retrieves whether or not we should force a cancel before next subscribe attempt for in app payments of the given
+   * type. This method will first check the database, and then fall back on the deprecated SignalStore value.
+   */
+  @JvmStatic
+  @WorkerThread
+  fun getShouldCancelSubscriptionBeforeNextSubscribeAttempt(subscriberType: InAppPaymentSubscriberRecord.Type): Boolean {
+    val latestSubscriber = getSubscriber(subscriberType)
+
+    return latestSubscriber?.requiresCancel ?: if (subscriberType == InAppPaymentSubscriberRecord.Type.DONATION) {
+      SignalStore.inAppPayments.shouldCancelSubscriptionBeforeNextSubscribeAttempt
+    } else {
+      false
+    }
+  }
+
+  /**
+   * Grabs a subscriber based off the type and currency
+   */
+  @JvmStatic
+  @Suppress("DEPRECATION")
+  @SuppressLint("DiscouragedApi")
+  @WorkerThread
+  fun getSubscriber(currency: Currency, type: InAppPaymentSubscriberRecord.Type): InAppPaymentSubscriberRecord? {
+    val subscriber = SignalDatabase.inAppPaymentSubscribers.getByCurrencyCode(currency.currencyCode, type)
+
+    return if (subscriber == null && type == InAppPaymentSubscriberRecord.Type.DONATION) {
+      SignalStore.inAppPayments.getSubscriber(currency)
+    } else {
+      subscriber
+    }
+  }
+
+  /**
+   * Grabs the "active" subscriber according to the selected currency in the value store.
+   */
+  @JvmStatic
+  @WorkerThread
+  fun getSubscriber(type: InAppPaymentSubscriberRecord.Type): InAppPaymentSubscriberRecord? {
+    val currency = SignalStore.inAppPayments.getSubscriptionCurrency(type)
+    Log.d(TAG, "Attempting to retrieve subscriber of type $type for ${currency.currencyCode}")
+
+    return getSubscriber(currency, type)
+  }
+
+  /**
+   * Gets a non-null subscriber for the given type, or throws.
+   */
+  @JvmStatic
+  @WorkerThread
+  fun requireSubscriber(type: InAppPaymentSubscriberRecord.Type): InAppPaymentSubscriberRecord {
+    return requireNotNull(getSubscriber(type))
+  }
+
+  /**
+   * Sets the subscriber, writing them to the database.
+   */
+  @JvmStatic
+  @WorkerThread
+  fun setSubscriber(subscriber: InAppPaymentSubscriberRecord) {
+    SignalDatabase.inAppPaymentSubscribers.insertOrReplace(subscriber)
+  }
+
+  /**
+   * Checks whether or not a pending donation exists either in the database or via the legacy job watcher.
+   */
+  @WorkerThread
+  fun hasPendingDonation(): Boolean {
+    return SignalDatabase.inAppPayments.hasPendingDonation()
+  }
+
+  /**
+   * Emits a stream of status updates for donations of the given type. Only One-time donations and recurring donations are currently supported.
+   */
+  fun observeInAppPaymentRedemption(type: InAppPaymentType): Observable<DonationRedemptionJobStatus> {
+    val jobStatusObservable: Observable<DonationRedemptionJobStatus> = when (type) {
+      InAppPaymentType.UNKNOWN -> Observable.empty()
+      InAppPaymentType.ONE_TIME_GIFT -> Observable.empty()
+      InAppPaymentType.ONE_TIME_DONATION -> Observable.empty()
+      InAppPaymentType.RECURRING_DONATION -> Observable.empty()
+      InAppPaymentType.RECURRING_BACKUP -> Observable.empty()
+    }
+
+    val fromDatabase: Observable<DonationRedemptionJobStatus> = Observable.create { emitter ->
+      val observer = InAppPaymentObserver {
+        val latestInAppPayment = SignalDatabase.inAppPayments.getLatestInAppPaymentByType(type)
+
+        emitter.onNext(Optional.ofNullable(latestInAppPayment))
+      }
+
+      AppDependencies.databaseObserver.registerInAppPaymentObserver(observer)
+      emitter.setCancellable { AppDependencies.databaseObserver.unregisterObserver(observer) }
+    }.switchMap { inAppPaymentOptional ->
+      val inAppPayment = inAppPaymentOptional.getOrNull() ?: return@switchMap jobStatusObservable
+
+      val value = when (inAppPayment.state) {
+        InAppPaymentTable.State.CREATED -> error("This should have been filtered out.")
+        InAppPaymentTable.State.WAITING_FOR_AUTHORIZATION -> {
+          DonationRedemptionJobStatus.PendingExternalVerification(
+            pendingOneTimeDonation = inAppPayment.toPendingOneTimeDonation(),
+            nonVerifiedMonthlyDonation = inAppPayment.toNonVerifiedMonthlyDonation()
+          )
+        }
+        InAppPaymentTable.State.PENDING -> {
+          if (inAppPayment.data.redemption?.stage == InAppPaymentData.RedemptionState.Stage.REDEMPTION_STARTED) {
+            DonationRedemptionJobStatus.PendingReceiptRedemption
+          } else {
+            DonationRedemptionJobStatus.PendingReceiptRequest
+          }
+        }
+        InAppPaymentTable.State.END -> {
+          if (type.recurring && inAppPayment.data.error != null) {
+            DonationRedemptionJobStatus.FailedSubscription
+          } else {
+            DonationRedemptionJobStatus.None
+          }
+        }
+      }
+
+      Observable.just(value)
+    }
+
+    return fromDatabase
+      .switchMap {
+        if (it == DonationRedemptionJobStatus.None) {
+          jobStatusObservable
+        } else {
+          Observable.just(it)
+        }
+      }
+      .distinctUntilChanged()
+  }
+
+  fun scheduleSyncForAccountRecordChange() {
+    SignalExecutors.BOUNDED.execute {
+      scheduleSyncForAccountRecordChangeSync()
+    }
+  }
+
+  private fun scheduleSyncForAccountRecordChangeSync() {
+    SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
+    StorageSyncHelper.scheduleSyncForDataChange()
+  }
+
+  private fun InAppPaymentTable.InAppPayment.toPendingOneTimeDonation(): PendingOneTimeDonation? {
+    if (type.recurring) {
+      return null
+    }
+
+    return PendingOneTimeDonation(
+      paymentMethodType = when (data.paymentMethodType) {
+        InAppPaymentData.PaymentMethodType.UNKNOWN -> PendingOneTimeDonation.PaymentMethodType.CARD
+        InAppPaymentData.PaymentMethodType.GOOGLE_PAY -> PendingOneTimeDonation.PaymentMethodType.CARD
+        InAppPaymentData.PaymentMethodType.CARD -> PendingOneTimeDonation.PaymentMethodType.CARD
+        InAppPaymentData.PaymentMethodType.SEPA_DEBIT -> PendingOneTimeDonation.PaymentMethodType.SEPA_DEBIT
+        InAppPaymentData.PaymentMethodType.IDEAL -> PendingOneTimeDonation.PaymentMethodType.IDEAL
+        InAppPaymentData.PaymentMethodType.PAYPAL -> PendingOneTimeDonation.PaymentMethodType.PAYPAL
+      },
+      amount = data.amount!!,
+      badge = data.badge!!,
+      timestamp = insertedAt.inWholeMilliseconds,
+      error = null,
+      pendingVerification = true,
+      checkedVerification = data.waitForAuth!!.checkedVerification
+    )
+  }
+
+  private fun InAppPaymentTable.InAppPayment.toNonVerifiedMonthlyDonation(): NonVerifiedMonthlyDonation? {
+    if (!type.recurring) {
+      return null
+    }
+
+    return NonVerifiedMonthlyDonation(
+      timestamp = insertedAt.inWholeMilliseconds,
+      price = data.amount!!.toFiatMoney(),
+      level = data.level.toInt(),
+      checkedVerification = data.waitForAuth!!.checkedVerification
+    )
+  }
+
+  /**
+   * Generates a new request credential that can be used to retrieve a presentation that can be submitted to get a badge or backup.
+   */
+  fun generateRequestCredential(): ReceiptCredentialRequestContext {
+    Log.d(TAG, "Generating request credentials context for token redemption...", true)
+    val secureRandom = SecureRandom()
+    val randomBytes = Util.getSecretBytes(ReceiptSerial.SIZE)
+
+    return try {
+      val receiptSerial = ReceiptSerial(randomBytes)
+      val operations = AppDependencies.clientZkReceiptOperations
+      operations.createReceiptCredentialRequestContext(secureRandom, receiptSerial)
+    } catch (e: InvalidInputException) {
+      Log.e(TAG, "Failed to create credential.", e)
+      throw AssertionError(e)
+    } catch (e: VerificationFailedException) {
+      Log.e(TAG, "Failed to create credential.", e)
+      throw AssertionError(e)
+    }
+  }
+
+  /**
+   * Common logic for building failures based off payment failure state.
+   */
+  fun buildPaymentFailure(inAppPayment: InAppPaymentTable.InAppPayment, chargeFailure: ActiveSubscription.ChargeFailure?): InAppPaymentData.Error {
+    val builder = InAppPaymentData.Error.Builder()
+
+    if (chargeFailure == null) {
+      builder.type = InAppPaymentData.Error.Type.PAYMENT_PROCESSING
+
+      return builder.build()
+    }
+
+    val donationProcessor = inAppPayment.data.paymentMethodType.toDonationProcessor()
+    if (donationProcessor == DonationProcessor.PAYPAL) {
+      builder.type = InAppPaymentData.Error.Type.PAYPAL_CODED_ERROR
+      builder.data_ = chargeFailure.code
+    } else {
+      val declineCode = StripeDeclineCode.getFromCode(chargeFailure.outcomeNetworkReason)
+      val failureCode = StripeFailureCode.getFromCode(chargeFailure.code)
+
+      if (failureCode.isKnown) {
+        builder.type = InAppPaymentData.Error.Type.STRIPE_FAILURE
+        builder.data_ = failureCode.toString()
+      } else if (declineCode.isKnown()) {
+        builder.type = InAppPaymentData.Error.Type.STRIPE_DECLINED_ERROR
+        builder.data_ = declineCode.toString()
+      } else {
+        builder.type = InAppPaymentData.Error.Type.STRIPE_CODED_ERROR
+        builder.data_ = chargeFailure.code
+      }
+    }
+
+    return builder.build()
+  }
+
+  /**
+   * Converts a payment method type into the processor that manages it, either Stripe or PayPal.
+   */
+  fun InAppPaymentData.PaymentMethodType.toDonationProcessor(): DonationProcessor {
+    return when (this) {
+      InAppPaymentData.PaymentMethodType.UNKNOWN -> DonationProcessor.STRIPE
+      InAppPaymentData.PaymentMethodType.GOOGLE_PAY -> DonationProcessor.STRIPE
+      InAppPaymentData.PaymentMethodType.CARD -> DonationProcessor.STRIPE
+      InAppPaymentData.PaymentMethodType.SEPA_DEBIT -> DonationProcessor.STRIPE
+      InAppPaymentData.PaymentMethodType.IDEAL -> DonationProcessor.STRIPE
+      InAppPaymentData.PaymentMethodType.PAYPAL -> DonationProcessor.PAYPAL
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/OneTimeInAppPaymentRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/OneTimeInAppPaymentRepository.kt
new file mode 100644
index 0000000000..ced2d5bd7a
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/OneTimeInAppPaymentRepository.kt
@@ -0,0 +1,146 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription
+
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.util.logging.Log
+import org.signal.core.util.money.FiatMoney
+import org.signal.donations.PaymentSourceType
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatMoney
+import org.thoughtcrime.securesms.components.settings.app.subscription.boost.Boost
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError.BadgeRedemptionError
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.RecipientTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.jobs.InAppPaymentOneTimeContextJob
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.whispersystems.signalservice.api.services.DonationsService
+import java.util.Currency
+import java.util.Locale
+import java.util.concurrent.TimeUnit
+
+class OneTimeInAppPaymentRepository(private val donationsService: DonationsService) {
+
+  companion object {
+    private val TAG = Log.tag(OneTimeInAppPaymentRepository::class.java)
+
+    fun <T : Any> handleCreatePaymentIntentError(throwable: Throwable, badgeRecipient: RecipientId, paymentSourceType: PaymentSourceType): Single<T> {
+      return if (throwable is DonationError) {
+        Single.error(throwable)
+      } else {
+        val recipient = Recipient.resolved(badgeRecipient)
+        val errorSource = if (recipient.isSelf) DonationErrorSource.ONE_TIME else DonationErrorSource.GIFT
+        Single.error(DonationError.getPaymentSetupError(errorSource, throwable, paymentSourceType))
+      }
+    }
+
+    fun verifyRecipientIsAllowedToReceiveAGift(badgeRecipient: RecipientId): Completable {
+      return Completable.fromAction {
+        Log.d(TAG, "Verifying badge recipient $badgeRecipient", true)
+        val recipient = Recipient.resolved(badgeRecipient)
+
+        if (recipient.isSelf) {
+          Log.d(TAG, "Cannot send a gift to self.", true)
+          throw DonationError.GiftRecipientVerificationError.SelectedRecipientIsInvalid
+        }
+
+        if (recipient.isGroup || recipient.isDistributionList || recipient.registered != RecipientTable.RegisteredState.REGISTERED) {
+          Log.w(TAG, "Invalid badge recipient $badgeRecipient. Verification failed.", true)
+          throw DonationError.GiftRecipientVerificationError.SelectedRecipientIsInvalid
+        }
+      }.subscribeOn(Schedulers.io())
+    }
+  }
+
+  fun getBoosts(): Single<Map<Currency, List<Boost>>> {
+    return Single.fromCallable { donationsService.getDonationsConfiguration(Locale.getDefault()) }
+      .subscribeOn(Schedulers.io())
+      .flatMap { it.flattenResult() }
+      .map { config ->
+        config.getBoostAmounts().mapValues { (_, value) ->
+          value.map {
+            Boost(it)
+          }
+        }
+      }
+  }
+
+  fun getBoostBadge(): Single<Badge> {
+    return Single
+      .fromCallable {
+        AppDependencies.donationsService
+          .getDonationsConfiguration(Locale.getDefault())
+      }
+      .subscribeOn(Schedulers.io())
+      .flatMap { it.flattenResult() }
+      .map { it.getBoostBadges().first() }
+  }
+
+  fun getMinimumDonationAmounts(): Single<Map<Currency, FiatMoney>> {
+    return Single.fromCallable { donationsService.getDonationsConfiguration(Locale.getDefault()) }
+      .flatMap { it.flattenResult() }
+      .subscribeOn(Schedulers.io())
+      .map { it.getMinimumDonationAmounts() }
+  }
+
+  fun waitForOneTimeRedemption(
+    inAppPayment: InAppPaymentTable.InAppPayment,
+    paymentIntentId: String,
+    paymentSourceType: PaymentSourceType
+  ): Completable {
+    val isLongRunning = paymentSourceType == PaymentSourceType.Stripe.SEPADebit
+    val isBoost = inAppPayment.data.recipientId?.let { RecipientId.from(it) } == Recipient.self().id
+    val donationErrorSource: DonationErrorSource = if (isBoost) DonationErrorSource.ONE_TIME else DonationErrorSource.GIFT
+
+    val timeoutError: DonationError = if (isLongRunning) {
+      BadgeRedemptionError.DonationPending(donationErrorSource, inAppPayment)
+    } else {
+      BadgeRedemptionError.TimeoutWaitingForTokenError(donationErrorSource)
+    }
+
+    return Single.fromCallable {
+      val donationReceiptRecord = if (isBoost) {
+        DonationReceiptRecord.createForBoost(inAppPayment.data.amount!!.toFiatMoney())
+      } else {
+        DonationReceiptRecord.createForGift(inAppPayment.data.amount!!.toFiatMoney())
+      }
+
+      val donationTypeLabel = donationReceiptRecord.type.code.replaceFirstChar { c -> if (c.isLowerCase()) c.titlecase(Locale.US) else c.toString() }
+
+      Log.d(TAG, "Confirmed payment intent. Recording $donationTypeLabel receipt and submitting badge reimbursement job chain.", true)
+      SignalDatabase.donationReceipts.addReceipt(donationReceiptRecord)
+
+      SignalDatabase.inAppPayments.update(
+        inAppPayment = inAppPayment.copy(
+          data = inAppPayment.data.copy(
+            redemption = InAppPaymentData.RedemptionState(
+              stage = InAppPaymentData.RedemptionState.Stage.INIT,
+              paymentIntentId = paymentIntentId
+            )
+          )
+        )
+      )
+
+      InAppPaymentOneTimeContextJob.createJobChain(inAppPayment).enqueue()
+      inAppPayment.id
+    }.flatMap { inAppPaymentId ->
+      Log.d(TAG, "Awaiting completion of redemption chain for up to 10 seconds.", true)
+      InAppPaymentsRepository.observeUpdates(inAppPaymentId).filter {
+        it.state == InAppPaymentTable.State.END
+      }.take(1).firstOrError().timeout(10, TimeUnit.SECONDS, Single.error(timeoutError))
+    }.map {
+      if (it.data.error != null) {
+        Log.d(TAG, "Failure during redemption chain.", true)
+        throw DonationError.genericBadgeRedemptionFailure(DonationErrorSource.MONTHLY)
+      }
+      it
+    }.ignoreElement()
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/PayPalRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/PayPalRepository.kt
new file mode 100644
index 0000000000..44ae1c86dd
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/PayPalRepository.kt
@@ -0,0 +1,117 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription
+
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.util.logging.Log
+import org.signal.core.util.money.FiatMoney
+import org.signal.donations.PaymentSourceType
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.paypal.PayPalConfirmationResult
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.whispersystems.signalservice.api.services.DonationsService
+import org.whispersystems.signalservice.api.subscriptions.PayPalConfirmPaymentIntentResponse
+import org.whispersystems.signalservice.api.subscriptions.PayPalCreatePaymentIntentResponse
+import org.whispersystems.signalservice.api.subscriptions.PayPalCreatePaymentMethodResponse
+import java.util.Locale
+
+/**
+ * Repository that deals directly with PayPal API calls. Since we don't interact with the PayPal APIs directly (yet)
+ * we can do everything here in one place.
+ */
+class PayPalRepository(private val donationsService: DonationsService) {
+
+  companion object {
+    const val ONE_TIME_RETURN_URL = "https://signaldonations.org/return/onetime"
+    const val MONTHLY_RETURN_URL = "https://signaldonations.org/return/monthly"
+    const val CANCEL_URL = "https://signaldonations.org/cancel"
+
+    private val TAG = Log.tag(PayPalRepository::class.java)
+  }
+
+  fun createOneTimePaymentIntent(
+    amount: FiatMoney,
+    badgeRecipient: RecipientId,
+    badgeLevel: Long
+  ): Single<PayPalCreatePaymentIntentResponse> {
+    return Single.fromCallable {
+      donationsService
+        .createPayPalOneTimePaymentIntent(
+          Locale.getDefault(),
+          amount.currency.currencyCode,
+          amount.minimumUnitPrecisionString,
+          badgeLevel,
+          ONE_TIME_RETURN_URL,
+          CANCEL_URL
+        )
+    }
+      .flatMap { it.flattenResult() }
+      .onErrorResumeNext { OneTimeInAppPaymentRepository.handleCreatePaymentIntentError(it, badgeRecipient, PaymentSourceType.PayPal) }
+      .subscribeOn(Schedulers.io())
+  }
+
+  fun confirmOneTimePaymentIntent(
+    amount: FiatMoney,
+    badgeLevel: Long,
+    paypalConfirmationResult: PayPalConfirmationResult
+  ): Single<PayPalConfirmPaymentIntentResponse> {
+    return Single.fromCallable {
+      Log.d(TAG, "Confirming one-time payment intent...", true)
+      donationsService
+        .confirmPayPalOneTimePaymentIntent(
+          amount.currency.currencyCode,
+          amount.minimumUnitPrecisionString,
+          badgeLevel,
+          paypalConfirmationResult.payerId,
+          paypalConfirmationResult.paymentId,
+          paypalConfirmationResult.paymentToken
+        )
+    }.flatMap { it.flattenResult() }.subscribeOn(Schedulers.io())
+  }
+
+  /**
+   * Creates the PaymentMethod via the Signal Service. Note that if the operation fails with a 409,
+   * it means that the PaymentMethod is already tied to a Stripe account. We can retry in this
+   * situation by simply deleting the old subscriber id on the service and replacing it.
+   */
+  fun createPaymentMethod(subscriberType: InAppPaymentSubscriberRecord.Type, retryOn409: Boolean = true): Single<PayPalCreatePaymentMethodResponse> {
+    return Single.fromCallable {
+      donationsService.createPayPalPaymentMethod(
+        Locale.getDefault(),
+        InAppPaymentsRepository.requireSubscriber(subscriberType).subscriberId,
+        MONTHLY_RETURN_URL,
+        CANCEL_URL
+      )
+    }.flatMap { serviceResponse ->
+      if (retryOn409 && serviceResponse.status == 409) {
+        RecurringInAppPaymentRepository.rotateSubscriberId(subscriberType).andThen(createPaymentMethod(subscriberType, retryOn409 = false))
+      } else {
+        serviceResponse.flattenResult()
+      }
+    }.subscribeOn(Schedulers.io())
+  }
+
+  fun setDefaultPaymentMethod(subscriberType: InAppPaymentSubscriberRecord.Type, paymentMethodId: String): Completable {
+    return Single
+      .fromCallable { InAppPaymentsRepository.requireSubscriber(subscriberType) }
+      .flatMapCompletable { subscriberRecord ->
+        Single.fromCallable {
+          Log.d(TAG, "Setting default payment method...", true)
+          donationsService.setDefaultPayPalPaymentMethod(
+            subscriberRecord.subscriberId,
+            paymentMethodId
+          )
+        }.flatMap { it.flattenResult() }.ignoreElement().doOnComplete {
+          Log.d(TAG, "Set default payment method.", true)
+          Log.d(TAG, "Storing the subscription payment source type locally.", true)
+
+          SignalDatabase.inAppPaymentSubscribers.setPaymentMethod(
+            subscriberRecord.subscriberId,
+            InAppPaymentData.PaymentMethodType.PAYPAL
+          )
+        }
+      }.subscribeOn(Schedulers.io())
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/RecurringInAppPaymentRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/RecurringInAppPaymentRepository.kt
new file mode 100644
index 0000000000..42f7d88310
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/RecurringInAppPaymentRepository.kt
@@ -0,0 +1,290 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription
+
+import androidx.annotation.CheckResult
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.util.logging.Log
+import org.signal.donations.PaymentSourceType
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.requireSubscriberType
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toErrorSource
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toPaymentSourceType
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError.BadgeRedemptionError
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.jobs.InAppPaymentKeepAliveJob
+import org.thoughtcrime.securesms.jobs.InAppPaymentRecurringContextJob
+import org.thoughtcrime.securesms.jobs.MultiDeviceSubscriptionSyncRequestJob
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.storage.StorageSyncHelper
+import org.thoughtcrime.securesms.subscription.LevelUpdate
+import org.thoughtcrime.securesms.subscription.LevelUpdateOperation
+import org.thoughtcrime.securesms.subscription.Subscription
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
+import org.whispersystems.signalservice.api.subscriptions.IdempotencyKey
+import org.whispersystems.signalservice.api.subscriptions.SubscriberId
+import org.whispersystems.signalservice.internal.EmptyResponse
+import org.whispersystems.signalservice.internal.ServiceResponse
+import java.util.Locale
+import java.util.concurrent.TimeUnit
+import kotlin.time.Duration.Companion.milliseconds
+
+/**
+ * Repository which can query for the user's active subscription as well as a list of available subscriptions,
+ * in the currency indicated.
+ */
+object RecurringInAppPaymentRepository {
+
+  private val TAG = Log.tag(RecurringInAppPaymentRepository::class.java)
+
+  private val donationsService = AppDependencies.donationsService
+
+  fun getActiveSubscription(type: InAppPaymentSubscriberRecord.Type): Single<ActiveSubscription> {
+    val localSubscription = InAppPaymentsRepository.getSubscriber(type)
+    return if (localSubscription != null) {
+      Single.fromCallable { donationsService.getSubscription(localSubscription.subscriberId) }
+        .subscribeOn(Schedulers.io())
+        .flatMap(ServiceResponse<ActiveSubscription>::flattenResult)
+        .doOnSuccess { activeSubscription ->
+          if (activeSubscription.isActive && activeSubscription.activeSubscription.endOfCurrentPeriod > SignalStore.inAppPayments.getLastEndOfPeriod()) {
+            InAppPaymentKeepAliveJob.enqueueAndTrackTime(System.currentTimeMillis().milliseconds)
+          }
+        }
+    } else {
+      Single.just(ActiveSubscription.EMPTY)
+    }
+  }
+
+  fun getSubscriptions(): Single<List<Subscription>> {
+    return Single
+      .fromCallable { donationsService.getDonationsConfiguration(Locale.getDefault()) }
+      .subscribeOn(Schedulers.io())
+      .flatMap { it.flattenResult() }
+      .map { config ->
+        config.getSubscriptionLevels().map { (level, levelConfig) ->
+          Subscription(
+            id = level.toString(),
+            level = level,
+            name = levelConfig.name,
+            badge = Badges.fromServiceBadge(levelConfig.badge),
+            prices = config.getSubscriptionAmounts(level)
+          )
+        }
+      }
+  }
+
+  fun syncAccountRecord(): Completable {
+    return Completable.fromAction {
+      SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
+      StorageSyncHelper.scheduleSyncForDataChange()
+    }.subscribeOn(Schedulers.io())
+  }
+
+  /**
+   * Since PayPal and Stripe can't interoperate, we need to be able to rotate the subscriber ID
+   * in case of failures.
+   */
+  fun rotateSubscriberId(subscriberType: InAppPaymentSubscriberRecord.Type): Completable {
+    Log.d(TAG, "Rotating SubscriberId due to alternate payment processor...", true)
+    val cancelCompletable: Completable = if (InAppPaymentsRepository.getSubscriber(subscriberType) != null) {
+      cancelActiveSubscription(subscriberType).andThen(updateLocalSubscriptionStateAndScheduleDataSync(subscriberType))
+    } else {
+      Completable.complete()
+    }
+
+    return cancelCompletable.andThen(ensureSubscriberId(subscriberType, isRotation = true))
+  }
+
+  fun ensureSubscriberId(subscriberType: InAppPaymentSubscriberRecord.Type, isRotation: Boolean = false): Completable {
+    Log.d(TAG, "Ensuring SubscriberId for type $subscriberType exists on Signal service {isRotation?$isRotation}...", true)
+    val subscriberId: SubscriberId = if (isRotation) {
+      SubscriberId.generate()
+    } else {
+      InAppPaymentsRepository.getSubscriber(subscriberType)?.subscriberId ?: SubscriberId.generate()
+    }
+
+    return Single
+      .fromCallable {
+        donationsService.putSubscription(subscriberId)
+      }
+      .subscribeOn(Schedulers.io())
+      .flatMap(ServiceResponse<EmptyResponse>::flattenResult).ignoreElement()
+      .doOnComplete {
+        Log.d(TAG, "Successfully set SubscriberId exists on Signal service.", true)
+
+        InAppPaymentsRepository.setSubscriber(
+          InAppPaymentSubscriberRecord(
+            subscriberId = subscriberId,
+            currency = SignalStore.inAppPayments.getSubscriptionCurrency(subscriberType),
+            type = subscriberType,
+            requiresCancel = false,
+            paymentMethodType = InAppPaymentData.PaymentMethodType.UNKNOWN
+          )
+        )
+
+        SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
+        StorageSyncHelper.scheduleSyncForDataChange()
+      }
+  }
+
+  fun cancelActiveSubscriptionSync(subscriberType: InAppPaymentSubscriberRecord.Type) {
+    Log.d(TAG, "Canceling active subscription...", true)
+    val localSubscriber = InAppPaymentsRepository.requireSubscriber(subscriberType)
+
+    val serviceResponse: ServiceResponse<EmptyResponse> = donationsService.cancelSubscription(localSubscriber.subscriberId)
+    serviceResponse.resultOrThrow
+
+    Log.d(TAG, "Cancelled active subscription.", true)
+    SignalStore.inAppPayments.updateLocalStateForManualCancellation(subscriberType)
+    MultiDeviceSubscriptionSyncRequestJob.enqueue()
+    InAppPaymentsRepository.scheduleSyncForAccountRecordChange()
+  }
+
+  @CheckResult
+  fun cancelActiveSubscription(subscriberType: InAppPaymentSubscriberRecord.Type): Completable {
+    return Completable
+      .fromAction { cancelActiveSubscriptionSync(subscriberType) }
+      .subscribeOn(Schedulers.io())
+  }
+
+  fun cancelActiveSubscriptionIfNecessary(subscriberType: InAppPaymentSubscriberRecord.Type): Completable {
+    return Single.fromCallable { InAppPaymentsRepository.getShouldCancelSubscriptionBeforeNextSubscribeAttempt(subscriberType) }.flatMapCompletable {
+      if (it) {
+        cancelActiveSubscription(subscriberType).doOnComplete {
+          SignalStore.inAppPayments.updateLocalStateForManualCancellation(subscriberType)
+          MultiDeviceSubscriptionSyncRequestJob.enqueue()
+        }
+      } else {
+        Completable.complete()
+      }
+    }
+  }
+
+  fun getPaymentSourceTypeOfLatestSubscription(subscriberType: InAppPaymentSubscriberRecord.Type): Single<PaymentSourceType> {
+    return Single.fromCallable {
+      InAppPaymentsRepository.getLatestPaymentMethodType(subscriberType).toPaymentSourceType()
+    }
+  }
+
+  fun setSubscriptionLevel(inAppPayment: InAppPaymentTable.InAppPayment, paymentSourceType: PaymentSourceType): Completable {
+    val subscriptionLevel = inAppPayment.data.level.toString()
+    val isLongRunning = paymentSourceType.isBankTransfer
+    val subscriberType = inAppPayment.type.requireSubscriberType()
+    val errorSource = subscriberType.inAppPaymentType.toErrorSource()
+
+    return getOrCreateLevelUpdateOperation(subscriptionLevel)
+      .flatMapCompletable { levelUpdateOperation ->
+        val subscriber = InAppPaymentsRepository.requireSubscriber(subscriberType)
+        SignalDatabase.inAppPayments.update(
+          inAppPayment = inAppPayment.copy(
+            subscriberId = subscriber.subscriberId,
+            data = inAppPayment.data.copy(
+              redemption = InAppPaymentData.RedemptionState(
+                stage = InAppPaymentData.RedemptionState.Stage.INIT
+              )
+            )
+          )
+        )
+
+        val timeoutError = if (isLongRunning) {
+          BadgeRedemptionError.DonationPending(errorSource, inAppPayment)
+        } else {
+          BadgeRedemptionError.TimeoutWaitingForTokenError(errorSource)
+        }
+
+        Log.d(TAG, "Attempting to set user subscription level to $subscriptionLevel", true)
+        Single
+          .fromCallable {
+            AppDependencies.donationsService.updateSubscriptionLevel(
+              subscriber.subscriberId,
+              subscriptionLevel,
+              subscriber.currency.currencyCode,
+              levelUpdateOperation.idempotencyKey.serialize(),
+              subscriberType
+            )
+          }
+          .flatMapCompletable {
+            if (it.status == 200 || it.status == 204) {
+              Log.d(TAG, "Successfully set user subscription to level $subscriptionLevel with response code ${it.status}", true)
+              SignalStore.inAppPayments.updateLocalStateForLocalSubscribe(subscriberType)
+              syncAccountRecord().subscribe()
+              LevelUpdate.updateProcessingState(false)
+              Completable.complete()
+            } else {
+              if (it.applicationError.isPresent) {
+                Log.w(TAG, "Failed to set user subscription to level $subscriptionLevel with response code ${it.status}", it.applicationError.get(), true)
+                SignalStore.inAppPayments.clearLevelOperations()
+              } else {
+                Log.w(TAG, "Failed to set user subscription to level $subscriptionLevel", it.executionError.orElse(null), true)
+              }
+
+              LevelUpdate.updateProcessingState(false)
+              it.flattenResult().ignoreElement()
+            }
+          }.andThen(
+            Single.fromCallable {
+              Log.d(TAG, "Enqueuing request response job chain.", true)
+              val freshPayment = SignalDatabase.inAppPayments.getById(inAppPayment.id)!!
+              InAppPaymentRecurringContextJob.createJobChain(freshPayment).enqueue()
+            }.flatMap {
+              Log.d(TAG, "Awaiting completion of redemption chain for up to 10 seconds.", true)
+              InAppPaymentsRepository.observeUpdates(inAppPayment.id).filter {
+                it.state == InAppPaymentTable.State.END
+              }.take(1).map {
+                if (it.data.error != null) {
+                  Log.d(TAG, "Failure during redemption chain.", true)
+                  throw DonationError.genericBadgeRedemptionFailure(errorSource)
+                }
+                it
+              }.firstOrError()
+            }.timeout(10, TimeUnit.SECONDS, Single.error(timeoutError)).ignoreElement()
+          )
+      }.doOnError {
+        LevelUpdate.updateProcessingState(false)
+      }.subscribeOn(Schedulers.io())
+  }
+
+  private fun getOrCreateLevelUpdateOperation(subscriptionLevel: String): Single<LevelUpdateOperation> = Single.fromCallable {
+    getOrCreateLevelUpdateOperation(TAG, subscriptionLevel)
+  }
+
+  fun getOrCreateLevelUpdateOperation(tag: String, subscriptionLevel: String): LevelUpdateOperation {
+    Log.d(tag, "Retrieving level update operation for $subscriptionLevel")
+    val levelUpdateOperation = SignalStore.inAppPayments.getLevelOperation(subscriptionLevel)
+    return if (levelUpdateOperation == null) {
+      val newOperation = LevelUpdateOperation(
+        idempotencyKey = IdempotencyKey.generate(),
+        level = subscriptionLevel
+      )
+
+      SignalStore.inAppPayments.setLevelOperation(newOperation)
+      LevelUpdate.updateProcessingState(true)
+      Log.d(tag, "Created a new operation for $subscriptionLevel")
+      newOperation
+    } else {
+      LevelUpdate.updateProcessingState(true)
+      Log.d(tag, "Reusing operation for $subscriptionLevel")
+      levelUpdateOperation
+    }
+  }
+
+  /**
+   * Update local state information and schedule a storage sync for the change. This method
+   * assumes you've already properly called the DELETE method for the stored ID on the server.
+   */
+  private fun updateLocalSubscriptionStateAndScheduleDataSync(subscriberType: InAppPaymentSubscriberRecord.Type): Completable {
+    return Completable.fromAction {
+      Log.d(TAG, "Marking subscription cancelled...", true)
+      SignalStore.inAppPayments.updateLocalStateForManualCancellation(subscriberType)
+      MultiDeviceSubscriptionSyncRequestJob.enqueue()
+      SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
+      StorageSyncHelper.scheduleSyncForDataChange()
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/StripeRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/StripeRepository.kt
new file mode 100644
index 0000000000..70fa147c5f
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/StripeRepository.kt
@@ -0,0 +1,277 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription
+
+import android.app.Activity
+import android.content.Intent
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.util.logging.Log
+import org.signal.core.util.money.FiatMoney
+import org.signal.donations.GooglePayApi
+import org.signal.donations.InAppPaymentType
+import org.signal.donations.PaymentSourceType
+import org.signal.donations.StripeApi
+import org.signal.donations.StripeIntentAccessor
+import org.signal.donations.json.StripeIntentStatus
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.requireSubscriberType
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toPaymentMethodType
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError.OneTimeDonationError
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.util.Environment
+import org.whispersystems.signalservice.api.subscriptions.StripeClientSecret
+import org.whispersystems.signalservice.internal.EmptyResponse
+import org.whispersystems.signalservice.internal.ServiceResponse
+
+/**
+ * Manages bindings with payment APIs
+ *
+ * Steps for setting up payments for a subscription:
+ * 1. Ask GooglePay for a payment token. This will pop up the Google Pay Sheet, which allows the user to select a payment method.
+ * 1. Generate and send a SubscriberId, which is a 32 byte ID representing this user, to Signal Service, which creates a Stripe Customer
+ * 1. Create a SetupIntent via the Stripe API
+ * 1. Create a PaymentMethod vai the Stripe API, utilizing the token from Google Pay
+ * 1. Confirm the SetupIntent via the Stripe API
+ * 1. Set the default PaymentMethod for the customer, using the PaymentMethod id, via the Signal service
+ *
+ * For Boosts and Gifts:
+ * 1. Ask GooglePay for a payment token. This will pop up the Google Pay Sheet, which allows the user to select a payment method.
+ * 1. Create a PaymentIntent via the Stripe API
+ * 1. Create a PaymentMethod vai the Stripe API, utilizing the token from Google Pay
+ * 1. Confirm the PaymentIntent via the Stripe API
+ */
+class StripeRepository(
+  activity: Activity
+) : StripeApi.PaymentIntentFetcher, StripeApi.SetupIntentHelper {
+
+  private val googlePayApi = GooglePayApi(activity, StripeApi.Gateway(Environment.Donations.STRIPE_CONFIGURATION), Environment.Donations.GOOGLE_PAY_CONFIGURATION)
+  private val stripeApi = StripeApi(Environment.Donations.STRIPE_CONFIGURATION, this, this, AppDependencies.okHttpClient)
+
+  fun isGooglePayAvailable(): Completable {
+    return googlePayApi.queryIsReadyToPay()
+  }
+
+  fun requestTokenFromGooglePay(price: FiatMoney, label: String, requestCode: Int) {
+    Log.d(TAG, "Requesting a token from google pay...")
+    googlePayApi.requestPayment(price, label, requestCode)
+  }
+
+  fun onActivityResult(
+    requestCode: Int,
+    resultCode: Int,
+    data: Intent?,
+    expectedRequestCode: Int,
+    paymentsRequestCallback: GooglePayApi.PaymentRequestCallback
+  ) {
+    Log.d(TAG, "Processing possible google pay result...")
+    googlePayApi.onActivityResult(requestCode, resultCode, data, expectedRequestCode, paymentsRequestCallback)
+  }
+
+  /**
+   * @param price             The amount to charce the local user
+   * @param badgeRecipient    Who will be getting the badge
+   */
+  fun continuePayment(
+    price: FiatMoney,
+    badgeRecipient: RecipientId,
+    badgeLevel: Long,
+    paymentSourceType: PaymentSourceType
+  ): Single<StripeIntentAccessor> {
+    check(paymentSourceType is PaymentSourceType.Stripe)
+
+    Log.d(TAG, "Creating payment intent for $price...", true)
+
+    return stripeApi.createPaymentIntent(price, badgeLevel, paymentSourceType)
+      .onErrorResumeNext {
+        OneTimeInAppPaymentRepository.handleCreatePaymentIntentError(it, badgeRecipient, paymentSourceType)
+      }
+      .flatMap { result ->
+        val recipient = Recipient.resolved(badgeRecipient)
+        val errorSource = if (recipient.isSelf) DonationErrorSource.ONE_TIME else DonationErrorSource.GIFT
+
+        Log.d(TAG, "Created payment intent for $price.", true)
+        when (result) {
+          is StripeApi.CreatePaymentIntentResult.AmountIsTooSmall -> Single.error(OneTimeDonationError.AmountTooSmallError(errorSource))
+          is StripeApi.CreatePaymentIntentResult.AmountIsTooLarge -> Single.error(OneTimeDonationError.AmountTooLargeError(errorSource))
+          is StripeApi.CreatePaymentIntentResult.CurrencyIsNotSupported -> Single.error(OneTimeDonationError.InvalidCurrencyError(errorSource))
+          is StripeApi.CreatePaymentIntentResult.Success -> Single.just(result.paymentIntent)
+        }
+      }.subscribeOn(Schedulers.io())
+  }
+
+  fun createAndConfirmSetupIntent(
+    inAppPaymentType: InAppPaymentType,
+    paymentSource: StripeApi.PaymentSource,
+    paymentSourceType: PaymentSourceType.Stripe
+  ): Single<StripeApi.Secure3DSAction> {
+    Log.d(TAG, "Continuing subscription setup...", true)
+    return stripeApi.createSetupIntent(inAppPaymentType, paymentSourceType)
+      .flatMap { result ->
+        Log.d(TAG, "Retrieved SetupIntent, confirming...", true)
+        stripeApi.confirmSetupIntent(paymentSource, result.setupIntent)
+      }
+  }
+
+  fun confirmPayment(
+    paymentSource: StripeApi.PaymentSource,
+    paymentIntent: StripeIntentAccessor,
+    badgeRecipient: RecipientId
+  ): Single<StripeApi.Secure3DSAction> {
+    val isBoost = badgeRecipient == Recipient.self().id
+    val donationErrorSource: DonationErrorSource = if (isBoost) DonationErrorSource.ONE_TIME else DonationErrorSource.GIFT
+
+    Log.d(TAG, "Confirming payment intent...", true)
+    return stripeApi.confirmPaymentIntent(paymentSource, paymentIntent)
+      .onErrorResumeNext {
+        Single.error(DonationError.getPaymentSetupError(donationErrorSource, it, paymentSource.type))
+      }
+  }
+
+  override fun fetchPaymentIntent(price: FiatMoney, level: Long, sourceType: PaymentSourceType.Stripe): Single<StripeIntentAccessor> {
+    Log.d(TAG, "Fetching payment intent from Signal service for $price... (Locale.US minimum precision: ${price.minimumUnitPrecisionString})")
+    return Single
+      .fromCallable {
+        AppDependencies
+          .donationsService
+          .createDonationIntentWithAmount(price.minimumUnitPrecisionString, price.currency.currencyCode, level, sourceType.paymentMethod)
+      }
+      .flatMap(ServiceResponse<StripeClientSecret>::flattenResult)
+      .map {
+        StripeIntentAccessor(
+          objectType = StripeIntentAccessor.ObjectType.PAYMENT_INTENT,
+          intentId = it.id,
+          intentClientSecret = it.clientSecret
+        )
+      }.doOnSuccess {
+        Log.d(TAG, "Got payment intent from Signal service!")
+      }
+  }
+
+  /**
+   * Creates the PaymentMethod via the Signal Service. Note that if the operation fails with a 409,
+   * it means that the PaymentMethod is already tied to a PayPal account. We can retry in this
+   * situation by simply deleting the old subscriber id on the service and replacing it.
+   */
+  private fun createPaymentMethod(subscriberType: InAppPaymentSubscriberRecord.Type, paymentSourceType: PaymentSourceType.Stripe, retryOn409: Boolean = true): Single<StripeClientSecret> {
+    return Single.fromCallable { InAppPaymentsRepository.requireSubscriber(subscriberType) }
+      .flatMap {
+        Single.fromCallable {
+          AppDependencies
+            .donationsService
+            .createStripeSubscriptionPaymentMethod(it.subscriberId, paymentSourceType.paymentMethod)
+        }
+      }
+      .flatMap { serviceResponse ->
+        if (retryOn409 && serviceResponse.status == 409) {
+          RecurringInAppPaymentRepository.rotateSubscriberId(subscriberType).andThen(createPaymentMethod(subscriberType, paymentSourceType, retryOn409 = false))
+        } else {
+          serviceResponse.flattenResult()
+        }
+      }
+  }
+
+  override fun fetchSetupIntent(inAppPaymentType: InAppPaymentType, sourceType: PaymentSourceType.Stripe): Single<StripeIntentAccessor> {
+    Log.d(TAG, "Fetching setup intent from Signal service...")
+    return createPaymentMethod(inAppPaymentType.requireSubscriberType(), sourceType)
+      .map {
+        StripeIntentAccessor(
+          objectType = StripeIntentAccessor.ObjectType.SETUP_INTENT,
+          intentId = it.id,
+          intentClientSecret = it.clientSecret
+        )
+      }
+      .doOnSuccess {
+        Log.d(TAG, "Got setup intent from Signal service!")
+      }
+  }
+
+  /**
+   * Note: There seem to be times when PaymentIntent does not return a status. In these cases, we assume
+   *       that we are successful and proceed as normal. If the payment didn't actually succeed, then we
+   *       expect an error later in the chain to inform us of this.
+   */
+  fun getStatusAndPaymentMethodId(
+    stripeIntentAccessor: StripeIntentAccessor,
+    paymentMethodId: String?
+  ): Single<StatusAndPaymentMethodId> {
+    return Single.fromCallable {
+      when (stripeIntentAccessor.objectType) {
+        StripeIntentAccessor.ObjectType.NONE -> StatusAndPaymentMethodId(stripeIntentAccessor.intentId, StripeIntentStatus.SUCCEEDED, paymentMethodId)
+        StripeIntentAccessor.ObjectType.PAYMENT_INTENT -> stripeApi.getPaymentIntent(stripeIntentAccessor).let {
+          if (it.status == null) {
+            Log.d(TAG, "Returned payment intent had a null status.", true)
+          }
+          StatusAndPaymentMethodId(stripeIntentAccessor.intentId, it.status ?: StripeIntentStatus.SUCCEEDED, it.paymentMethod)
+        }
+
+        StripeIntentAccessor.ObjectType.SETUP_INTENT -> stripeApi.getSetupIntent(stripeIntentAccessor).let {
+          StatusAndPaymentMethodId(stripeIntentAccessor.intentId, it.status, it.paymentMethod)
+        }
+      }
+    }
+  }
+
+  fun setDefaultPaymentMethod(
+    paymentMethodId: String,
+    setupIntentId: String,
+    subscriberType: InAppPaymentSubscriberRecord.Type,
+    paymentSourceType: PaymentSourceType
+  ): Completable {
+    return Single.fromCallable {
+      Log.d(TAG, "Getting the subscriber...")
+      InAppPaymentsRepository.requireSubscriber(subscriberType)
+    }.flatMapCompletable { subscriberRecord ->
+      Log.d(TAG, "Setting default payment method via Signal service...")
+      Single.fromCallable {
+        if (paymentSourceType == PaymentSourceType.Stripe.IDEAL) {
+          AppDependencies
+            .donationsService
+            .setDefaultIdealPaymentMethod(subscriberRecord.subscriberId, setupIntentId)
+        } else {
+          AppDependencies
+            .donationsService
+            .setDefaultStripePaymentMethod(subscriberRecord.subscriberId, paymentMethodId)
+        }
+      }.flatMap(ServiceResponse<EmptyResponse>::flattenResult).ignoreElement().doOnComplete {
+        Log.d(TAG, "Set default payment method via Signal service!")
+        Log.d(TAG, "Storing the subscription payment source type locally.")
+        SignalDatabase.inAppPaymentSubscribers.setPaymentMethod(subscriberRecord.subscriberId, paymentSourceType.toPaymentMethodType())
+      }
+    }
+  }
+
+  fun createCreditCardPaymentSource(donationErrorSource: DonationErrorSource, cardData: StripeApi.CardData): Single<StripeApi.PaymentSource> {
+    Log.d(TAG, "Creating credit card payment source via Stripe api...")
+    return stripeApi.createPaymentSourceFromCardData(cardData).map {
+      when (it) {
+        is StripeApi.CreatePaymentSourceFromCardDataResult.Failure -> throw DonationError.getPaymentSetupError(donationErrorSource, it.reason, PaymentSourceType.Stripe.CreditCard)
+        is StripeApi.CreatePaymentSourceFromCardDataResult.Success -> it.paymentSource
+      }
+    }
+  }
+
+  fun createSEPADebitPaymentSource(sepaDebitData: StripeApi.SEPADebitData): Single<StripeApi.PaymentSource> {
+    Log.d(TAG, "Creating SEPA Debit payment source via Stripe api...")
+    return stripeApi.createPaymentSourceFromSEPADebitData(sepaDebitData)
+  }
+
+  fun createIdealPaymentSource(idealData: StripeApi.IDEALData): Single<StripeApi.PaymentSource> {
+    Log.d(TAG, "Creating iDEAL payment source via Stripe api...")
+    return stripeApi.createPaymentSourceFromIDEALData(idealData)
+  }
+
+  data class StatusAndPaymentMethodId(
+    val intentId: String,
+    val status: StripeIntentStatus,
+    val paymentMethod: String?
+  )
+
+  companion object {
+    private val TAG = Log.tag(StripeRepository::class.java)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/Boost.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/Boost.kt
new file mode 100644
index 0000000000..2a4a31bad3
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/Boost.kt
@@ -0,0 +1,347 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.boost
+
+import android.animation.Animator
+import android.animation.AnimatorSet
+import android.animation.ObjectAnimator
+import android.graphics.Typeface
+import android.os.Build
+import android.text.Editable
+import android.text.Spanned
+import android.text.TextWatcher
+import android.text.method.DigitsKeyListener
+import android.view.View
+import android.widget.TextView
+import androidx.annotation.VisibleForTesting
+import androidx.appcompat.widget.AppCompatEditText
+import androidx.core.animation.doOnEnd
+import androidx.core.text.isDigitsOnly
+import com.google.android.material.button.MaterialButton
+import org.signal.core.util.StringUtil
+import org.signal.core.util.money.FiatMoney
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.BadgeImageView
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.PreferenceModel
+import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import org.thoughtcrime.securesms.util.ViewUtil
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
+import org.thoughtcrime.securesms.util.visible
+import java.lang.Integer.min
+import java.text.DecimalFormatSymbols
+import java.text.NumberFormat
+import java.util.Currency
+import java.util.Locale
+import java.util.regex.Pattern
+
+/**
+ * A Signal Boost is a one-time ephemeral show of support. Each boost level
+ * can unlock a corresponding badge for a time determined by the server.
+ */
+data class Boost(
+  val price: FiatMoney
+) {
+
+  /**
+   * A heading containing a 96dp rendering of the boost's badge.
+   */
+  class HeadingModel(
+    val boostBadge: Badge
+  ) : PreferenceModel<HeadingModel>() {
+    override fun areItemsTheSame(newItem: HeadingModel): Boolean = true
+
+    override fun areContentsTheSame(newItem: HeadingModel): Boolean {
+      return super.areContentsTheSame(newItem) && newItem.boostBadge == boostBadge
+    }
+  }
+
+  class LoadingModel : PreferenceModel<LoadingModel>() {
+    override fun areItemsTheSame(newItem: LoadingModel): Boolean = true
+  }
+
+  class LoadingViewHolder(itemView: View) : MappingViewHolder<LoadingModel>(itemView) {
+
+    private val animator: Animator = AnimatorSet().apply {
+      val fadeTo25Animator = ObjectAnimator.ofFloat(itemView, "alpha", 0.8f, 0.25f).apply {
+        duration = 1000L
+      }
+
+      val fadeTo80Animator = ObjectAnimator.ofFloat(itemView, "alpha", 0.25f, 0.8f).apply {
+        duration = 300L
+      }
+
+      playSequentially(fadeTo25Animator, fadeTo80Animator)
+      doOnEnd {
+        if (itemView.isAttachedToWindow) {
+          start()
+        }
+      }
+    }
+
+    override fun bind(model: LoadingModel) {
+    }
+
+    override fun onAttachedToWindow() {
+      if (animator.isStarted) {
+        animator.resume()
+      } else {
+        animator.start()
+      }
+    }
+
+    override fun onDetachedFromWindow() {
+      animator.pause()
+    }
+  }
+
+  /**
+   * A widget that allows a user to select from six different amounts, or enter a custom amount.
+   */
+  class SelectionModel(
+    val boosts: List<Boost>,
+    val selectedBoost: Boost?,
+    val currency: Currency,
+    override val isEnabled: Boolean,
+    val onBoostClick: (View, Boost) -> Unit,
+    val minimumAmount: FiatMoney,
+    val isCustomAmountFocused: Boolean,
+    val isCustomAmountTooSmall: Boolean,
+    val onCustomAmountChanged: (String) -> Unit,
+    val onCustomAmountFocusChanged: (Boolean) -> Unit
+  ) : PreferenceModel<SelectionModel>(isEnabled = isEnabled) {
+    override fun areItemsTheSame(newItem: SelectionModel): Boolean = true
+
+    override fun areContentsTheSame(newItem: SelectionModel): Boolean {
+      return super.areContentsTheSame(newItem) &&
+        newItem.boosts == boosts &&
+        newItem.selectedBoost == selectedBoost &&
+        newItem.currency == currency &&
+        newItem.isCustomAmountFocused == isCustomAmountFocused &&
+        newItem.isCustomAmountTooSmall == isCustomAmountTooSmall &&
+        newItem.minimumAmount.amount == minimumAmount.amount &&
+        newItem.minimumAmount.currency == minimumAmount.currency
+    }
+  }
+
+  private class SelectionViewHolder(itemView: View) : MappingViewHolder<SelectionModel>(itemView) {
+
+    private val boost1: MaterialButton = itemView.findViewById(R.id.boost_1)
+    private val boost2: MaterialButton = itemView.findViewById(R.id.boost_2)
+    private val boost3: MaterialButton = itemView.findViewById(R.id.boost_3)
+    private val boost4: MaterialButton = itemView.findViewById(R.id.boost_4)
+    private val boost5: MaterialButton = itemView.findViewById(R.id.boost_5)
+    private val boost6: MaterialButton = itemView.findViewById(R.id.boost_6)
+    private val custom: AppCompatEditText = itemView.findViewById(R.id.boost_custom)
+    private val error: TextView = itemView.findViewById(R.id.boost_custom_too_small)
+
+    private val boostButtons: List<MaterialButton>
+      get() {
+        return if (ViewUtil.isLtr(context)) {
+          listOf(boost1, boost2, boost3, boost4, boost5, boost6)
+        } else {
+          listOf(boost3, boost2, boost1, boost6, boost5, boost4)
+        }
+      }
+
+    private var filter: MoneyFilter? = null
+
+    init {
+      custom.filters = emptyArray()
+    }
+
+    override fun bind(model: SelectionModel) {
+      itemView.isEnabled = model.isEnabled
+
+      error.text = context.getString(
+        R.string.Boost__the_minimum_amount_you_can_donate_is_s,
+        FiatMoneyUtil.format(
+          context.resources,
+          model.minimumAmount,
+          FiatMoneyUtil.formatOptions().trimZerosAfterDecimal()
+        )
+      )
+
+      error.visible = model.isCustomAmountTooSmall
+
+      model.boosts.zip(boostButtons).forEach { (boost, button) ->
+        val isSelected = boost == model.selectedBoost && !model.isCustomAmountFocused
+        button.isSelected = isSelected
+        button.text = FiatMoneyUtil.format(
+          context.resources,
+          boost.price,
+          FiatMoneyUtil
+            .formatOptions()
+            .trimZerosAfterDecimal()
+        )
+        button.setOnClickListener {
+          model.onBoostClick(it, boost)
+          custom.clearFocus()
+        }
+
+        if (Build.VERSION.SDK_INT >= 28) {
+          val weight = if (isSelected) 500 else 400
+          button.typeface = Typeface.create(null, weight, false)
+        } else {
+          button.typeface = if (isSelected) Typeface.DEFAULT_BOLD else Typeface.DEFAULT
+        }
+      }
+
+      if (filter == null || filter?.currency != model.currency) {
+        custom.removeTextChangedListener(filter)
+
+        filter = MoneyFilter(model.currency, custom) {
+          model.onCustomAmountChanged(it)
+        }
+
+        custom.keyListener = filter
+        custom.addTextChangedListener(filter)
+
+        custom.setText("")
+      }
+
+      custom.isSelected = model.isCustomAmountFocused
+      custom.setOnFocusChangeListener { _, hasFocus ->
+        model.onCustomAmountFocusChanged(hasFocus)
+      }
+
+      if (model.isCustomAmountFocused && !custom.hasFocus()) {
+        ViewUtil.focusAndShowKeyboard(custom)
+      } else if (!model.isCustomAmountFocused && custom.hasFocus()) {
+        ViewUtil.hideKeyboard(context, custom)
+        custom.clearFocus()
+      }
+    }
+  }
+
+  private class HeadingViewHolder(itemView: View) : MappingViewHolder<HeadingModel>(itemView) {
+
+    private val badgeImageView: BadgeImageView = itemView as BadgeImageView
+
+    override fun bind(model: HeadingModel) {
+      badgeImageView.setBadge(model.boostBadge)
+    }
+  }
+
+  @VisibleForTesting
+  class MoneyFilter(val currency: Currency, private val text: AppCompatEditText? = null, private val onCustomAmountChanged: (String) -> Unit = {}) : DigitsKeyListener(false, true), TextWatcher {
+
+    val separator = DecimalFormatSymbols.getInstance().decimalSeparator
+    val separatorCount = min(1, currency.defaultFractionDigits)
+    val symbol: String = currency.getSymbol(Locale.getDefault())
+
+    /**
+     * From Character.isDigit:
+     *
+     * * '\u0030' through '\u0039', ISO-LATIN-1 digits ('0' through '9')
+     * * '\u0660' through '\u0669', Arabic-Indic digits
+     * * '\u06F0' through '\u06F9', Extended Arabic-Indic digits
+     * * '\u0966' through '\u096F', Devanagari digits
+     * * '\uFF10' through '\uFF19', Fullwidth digits
+     */
+    val digitsGroup: String = "[\\u0030-\\u0039]|[\\u0660-\\u0669]|[\\u06F0-\\u06F9]|[\\u0966-\\u096F]|[\\uFF10-\\uFF19]"
+    val zeros: String = "\\u0030|\\u0660|\\u06F0|\\u0966|\\uFF10"
+
+    val pattern: Pattern = "($digitsGroup)*([$separator]){0,$separatorCount}($digitsGroup){0,${currency.defaultFractionDigits}}".toPattern()
+    val symbolPattern: Regex = """\s*${Regex.escape(symbol)}\s*""".toRegex()
+    val leadingZeroesPattern: Regex = """^($zeros)*""".toRegex()
+
+    override fun filter(
+      source: CharSequence,
+      start: Int,
+      end: Int,
+      dest: Spanned,
+      dstart: Int,
+      dend: Int
+    ): CharSequence? {
+      val result = dest.subSequence(0, dstart).toString() + source.toString() + dest.subSequence(dend, dest.length)
+      val resultWithoutCurrencyPrefix = StringUtil.stripBidiIndicator(result.removePrefix(symbol).removeSuffix(symbol).trim())
+
+      if (resultWithoutCurrencyPrefix.length == 1 && !resultWithoutCurrencyPrefix.isDigitsOnly() && resultWithoutCurrencyPrefix != separator.toString()) {
+        return dest.subSequence(dstart, dend)
+      }
+
+      val matcher = pattern.matcher(resultWithoutCurrencyPrefix)
+
+      if (!matcher.matches()) {
+        return dest.subSequence(dstart, dend)
+      }
+
+      return null
+    }
+
+    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit
+
+    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) = Unit
+
+    override fun afterTextChanged(s: Editable?) {
+      if (s.isNullOrEmpty()) return
+
+      val hasSymbol = s.startsWith(symbol) || s.endsWith(symbol)
+      if (hasSymbol && symbolPattern.matchEntire(s.toString()) != null) {
+        s.clear()
+      } else if (!hasSymbol) {
+        val formatter = NumberFormat.getCurrencyInstance()
+        formatter.currency = currency
+
+        if (s.contains(separator)) {
+          formatter.minimumFractionDigits = s.split(separator).last().length
+        } else {
+          formatter.minimumFractionDigits = 0
+        }
+
+        formatter.maximumFractionDigits = currency.defaultFractionDigits
+
+        val value = s.toString().toDoubleOrNull()
+
+        if (value != null) {
+          val formatted = formatter.format(value)
+
+          text?.removeTextChangedListener(this)
+
+          s.replace(0, s.length, formatted)
+          if (formatted.endsWith(symbol)) {
+            val result: MatchResult? = symbolPattern.find(formatted)
+            if (result != null && result.range.first < s.length) {
+              text?.setSelection(result.range.first)
+            }
+          }
+
+          text?.addTextChangedListener(this)
+        }
+      }
+
+      val withoutSymbol = s.removePrefix(symbol).removeSuffix(symbol).trim().toString()
+      val withoutLeadingZeroes: String = try {
+        NumberFormat.getInstance().apply {
+          isGroupingUsed = false
+
+          if (s.contains(separator)) {
+            minimumFractionDigits = s.split(separator).last().length
+          }
+        }.format(withoutSymbol.toBigDecimal()) + (if (withoutSymbol.endsWith(separator)) separator else "")
+      } catch (e: NumberFormatException) {
+        withoutSymbol
+      }
+
+      if (withoutSymbol != withoutLeadingZeroes) {
+        text?.removeTextChangedListener(this)
+
+        val start = s.indexOf(withoutSymbol)
+        s.replace(start, start + withoutSymbol.length, withoutLeadingZeroes)
+
+        text?.addTextChangedListener(this)
+      }
+
+      onCustomAmountChanged(s.removePrefix(symbol).removeSuffix(symbol).trim().toString())
+    }
+  }
+
+  companion object {
+    fun register(adapter: MappingAdapter) {
+      adapter.registerFactory(SelectionModel::class.java, LayoutFactory({ SelectionViewHolder(it) }, R.layout.boost_preference))
+      adapter.registerFactory(HeadingModel::class.java, LayoutFactory({ HeadingViewHolder(it) }, R.layout.boost_preview_preference))
+      adapter.registerFactory(LoadingModel::class.java, LayoutFactory({ LoadingViewHolder(it) }, R.layout.boost_loading_preference))
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationBottomSheet.kt
new file mode 100644
index 0000000000..9b342ae244
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationBottomSheet.kt
@@ -0,0 +1,336 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.completed
+
+import android.content.DialogInterface
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.core.os.bundleOf
+import androidx.fragment.app.FragmentManager
+import org.signal.core.ui.BottomSheets
+import org.signal.core.ui.Buttons
+import org.signal.core.ui.theme.SignalTheme
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
+import org.thoughtcrime.securesms.components.settings.app.subscription.BadgeImage112
+import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
+import org.thoughtcrime.securesms.database.model.databaseprotos.TerminalDonationQueue
+import org.thoughtcrime.securesms.util.viewModel
+
+/**
+ * Bottom Sheet displayed when the app notices that a long-running donation has
+ * completed.
+ */
+class TerminalDonationBottomSheet : ComposeBottomSheetDialogFragment() {
+
+  companion object {
+
+    private const val ARG_DONATION_COMPLETED = "arg.donation.completed"
+
+    @JvmStatic
+    fun show(fragmentManager: FragmentManager, terminalDonation: TerminalDonationQueue.TerminalDonation) {
+      TerminalDonationBottomSheet().apply {
+        arguments = bundleOf(
+          ARG_DONATION_COMPLETED to terminalDonation.encode()
+        )
+
+        show(fragmentManager, null)
+      }
+    }
+  }
+
+  override val peekHeightPercentage: Float = 1f
+
+  private val terminalDonation: TerminalDonationQueue.TerminalDonation by lazy(LazyThreadSafetyMode.NONE) {
+    TerminalDonationQueue.TerminalDonation.ADAPTER.decode(requireArguments().getByteArray(ARG_DONATION_COMPLETED)!!)
+  }
+
+  private val viewModel: TerminalDonationViewModel by viewModel {
+    TerminalDonationViewModel(terminalDonation)
+  }
+
+  @Composable
+  override fun SheetContent() {
+    if (terminalDonation.error != null) {
+      PaymentFailureBottomSheet()
+    } else {
+      CompletedSheet()
+    }
+  }
+
+  @Composable
+  private fun PaymentFailureBottomSheet() {
+    val badge by viewModel.badge
+
+    DonationPaymentFailureBottomSheet(
+      badge = badge,
+      onTryAgainClick = {
+        startActivity(AppSettingsActivity.manageSubscriptions(requireContext()))
+      },
+      onNotNowClick = {
+        dismissAllowingStateLoss()
+      }
+    )
+  }
+
+  @Composable
+  private fun CompletedSheet() {
+    val badge by viewModel.badge
+    val isToggleChecked by viewModel.isToggleChecked
+    val toggleType by viewModel.toggleType
+
+    DonationCompletedSheetContent(
+      badge = badge,
+      isToggleChecked = isToggleChecked,
+      toggleType = toggleType,
+      onCheckChanged = viewModel::onToggleCheckChanged,
+      onDoneClick = { dismissAllowingStateLoss() }
+    )
+  }
+
+  override fun onDismiss(dialog: DialogInterface) {
+    super.onDismiss(dialog)
+
+    viewModel.commitToggleState()
+  }
+}
+
+@Preview
+@Composable
+private fun DonationPaymentFailureBottomSheet() {
+  SignalTheme {
+    Surface {
+      DonationPaymentFailureBottomSheet(
+        badge = null,
+        onTryAgainClick = {},
+        onNotNowClick = {}
+      )
+    }
+  }
+}
+
+@Composable
+private fun DonationPaymentFailureBottomSheet(
+  badge: Badge?,
+  onTryAgainClick: () -> Unit,
+  onNotNowClick: () -> Unit
+) {
+  Column(
+    horizontalAlignment = Alignment.CenterHorizontally
+  ) {
+    BottomSheets.Handle()
+
+    Box(
+      modifier = Modifier
+        .padding(top = 21.dp, bottom = 16.dp)
+    ) {
+      BadgeImage112(
+        badge = badge,
+        modifier = Modifier
+          .size(80.dp)
+      )
+
+      Box(
+        modifier = Modifier
+          .size(24.dp)
+          .padding(2.dp)
+          .background(
+            color = MaterialTheme.colorScheme.background,
+            shape = CircleShape
+          )
+          .align(Alignment.TopEnd)
+      )
+
+      Icon(
+        painter = painterResource(id = R.drawable.symbol_error_circle_fill_24),
+        tint = MaterialTheme.colorScheme.error,
+        contentDescription = null,
+        modifier = Modifier.align(Alignment.TopEnd)
+      )
+    }
+
+    Text(
+      text = stringResource(id = R.string.DonationErrorBottomSheet__donation_couldnt_be_processed),
+      style = MaterialTheme.typography.titleLarge,
+      textAlign = TextAlign.Center,
+      color = MaterialTheme.colorScheme.onSurface,
+      modifier = Modifier
+        .fillMaxWidth()
+        .padding(horizontal = 45.dp)
+    )
+
+    Text(
+      text = stringResource(id = R.string.DonationErrorBottomSheet__were_having_trouble),
+      color = MaterialTheme.colorScheme.onSurfaceVariant,
+      textAlign = TextAlign.Center,
+      modifier = Modifier
+        .fillMaxWidth()
+        .padding(top = 12.dp, bottom = 24.dp)
+        .padding(horizontal = 45.dp)
+    )
+
+    Buttons.LargeTonal(
+      onClick = onTryAgainClick,
+      modifier = Modifier
+        .defaultMinSize(minWidth = 220.dp)
+        .padding(top = 32.dp, bottom = 16.dp)
+    ) {
+      Text(
+        text = stringResource(id = R.string.DonationErrorBottomSheet__try_again)
+      )
+    }
+
+    TextButton(
+      onClick = onNotNowClick,
+      modifier = Modifier
+        .defaultMinSize(minWidth = 220.dp)
+        .padding(bottom = 56.dp)
+    ) {
+      Text(
+        text = stringResource(id = R.string.DonationErrorBottomSheet__not_now)
+      )
+    }
+  }
+}
+
+@Preview
+@Composable
+private fun DonationCompletedSheetContentPreview() {
+  SignalTheme {
+    Surface {
+      DonationCompletedSheetContent(
+        badge = null,
+        isToggleChecked = false,
+        toggleType = TerminalDonationViewModel.ToggleType.NONE,
+        onCheckChanged = {},
+        onDoneClick = {}
+      )
+    }
+  }
+}
+
+@Composable
+private fun DonationCompletedSheetContent(
+  badge: Badge?,
+  isToggleChecked: Boolean,
+  toggleType: TerminalDonationViewModel.ToggleType,
+  onCheckChanged: (Boolean) -> Unit,
+  onDoneClick: () -> Unit
+) {
+  Column(
+    horizontalAlignment = Alignment.CenterHorizontally
+  ) {
+    BottomSheets.Handle()
+
+    BadgeImage112(
+      badge = badge,
+      modifier = Modifier
+        .padding(top = 21.dp, bottom = 16.dp)
+        .size(80.dp)
+    )
+
+    Text(
+      text = stringResource(id = R.string.DonationCompletedBottomSheet__donation_complete),
+      style = MaterialTheme.typography.titleLarge,
+      textAlign = TextAlign.Center,
+      color = MaterialTheme.colorScheme.onSurface,
+      modifier = Modifier
+        .fillMaxWidth()
+        .padding(horizontal = 45.dp)
+    )
+
+    Text(
+      text = stringResource(id = R.string.DonationCompleteBottomSheet__your_bank_transfer_was_received),
+      color = MaterialTheme.colorScheme.onSurfaceVariant,
+      textAlign = TextAlign.Center,
+      modifier = Modifier
+        .fillMaxWidth()
+        .padding(top = 12.dp, bottom = 24.dp)
+        .padding(horizontal = 45.dp)
+    )
+
+    if (toggleType == TerminalDonationViewModel.ToggleType.NONE) {
+      CircularProgressIndicator()
+    } else {
+      DonationToggleRow(
+        checked = isToggleChecked,
+        text = stringResource(id = toggleType.copyId),
+        onCheckChanged = onCheckChanged
+      )
+    }
+
+    Buttons.LargeTonal(
+      onClick = onDoneClick,
+      modifier = Modifier
+        .defaultMinSize(minWidth = 220.dp)
+        .padding(top = 48.dp, bottom = 56.dp)
+    ) {
+      Text(
+        text = stringResource(id = R.string.DonationPendingBottomSheet__done)
+      )
+    }
+  }
+}
+
+@Composable
+private fun DonationToggleRow(
+  checked: Boolean,
+  text: String,
+  onCheckChanged: (Boolean) -> Unit
+) {
+  Row(
+    modifier = Modifier
+      .fillMaxWidth()
+      .padding(horizontal = 24.dp)
+      .border(
+        width = 1.dp,
+        color = MaterialTheme.colorScheme.outlineVariant,
+        shape = RoundedCornerShape(12.dp)
+      )
+      .padding(horizontal = 16.dp)
+  ) {
+    Text(
+      text = text,
+      color = MaterialTheme.colorScheme.onSurface,
+      modifier = Modifier
+        .weight(1f)
+        .align(Alignment.CenterVertically)
+        .padding(vertical = 16.dp)
+    )
+
+    Switch(
+      checked = checked,
+      onCheckedChange = onCheckChanged,
+      modifier = Modifier.align(Alignment.CenterVertically)
+    )
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate.kt
new file mode 100644
index 0000000000..a475a2b87d
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationDelegate.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.completed
+
+import androidx.fragment.app.FragmentManager
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.kotlin.subscribeBy
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.util.concurrent.LifecycleDisposable
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.badges.self.expired.MonthlyDonationCanceledBottomSheetDialogFragment
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPendingBottomSheet
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPendingBottomSheetArgs
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.Stripe3DSData
+import org.thoughtcrime.securesms.components.settings.app.subscription.thanks.ThanksForYourSupportBottomSheetDialogFragment
+import org.thoughtcrime.securesms.components.settings.app.subscription.thanks.ThanksForYourSupportBottomSheetDialogFragmentArgs
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.databaseprotos.DonationErrorValue
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+
+/**
+ * Handles displaying the "Thank You" or "Donation completed" sheet when the user navigates to an appropriate screen.
+ * These sheets are one-shot.
+ */
+class TerminalDonationDelegate(
+  private val fragmentManager: FragmentManager,
+  private val lifecycleOwner: LifecycleOwner
+) : DefaultLifecycleObserver {
+
+  private val lifecycleDisposable = LifecycleDisposable().apply {
+    bindTo(lifecycleOwner)
+  }
+
+  private val badgeRepository = TerminalDonationRepository()
+
+  override fun onResume(owner: LifecycleOwner) {
+    val donations = SignalStore.inAppPayments.consumeTerminalDonations()
+    for (donation in donations) {
+      if (donation.isLongRunningPaymentMethod && (donation.error == null || donation.error.type != DonationErrorValue.Type.REDEMPTION)) {
+        TerminalDonationBottomSheet.show(fragmentManager, donation)
+      } else if (donation.error != null) {
+        lifecycleDisposable += badgeRepository.getBadge(donation).observeOn(AndroidSchedulers.mainThread()).subscribe { badge ->
+          val args = ThanksForYourSupportBottomSheetDialogFragmentArgs.Builder(badge).build().toBundle()
+          val sheet = ThanksForYourSupportBottomSheetDialogFragment()
+
+          sheet.arguments = args
+          sheet.show(fragmentManager, null)
+        }
+      }
+    }
+
+    val verifiedMonthlyDonation: Stripe3DSData? = SignalStore.inAppPayments.consumeVerifiedSubscription3DSData()
+    if (verifiedMonthlyDonation != null) {
+      DonationPendingBottomSheet().apply {
+        arguments = DonationPendingBottomSheetArgs.Builder(verifiedMonthlyDonation.inAppPayment).build().toBundle()
+      }.show(fragmentManager, null)
+    }
+
+    handleInAppPaymentSheets()
+  }
+
+  private fun handleInAppPaymentSheets() {
+    lifecycleDisposable += Single.fromCallable {
+      SignalDatabase.inAppPayments.consumeDonationPaymentsToNotifyUser()
+    }.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribeBy { inAppPayments ->
+      for (payment in inAppPayments) {
+        if (payment.data.error == null && payment.state == InAppPaymentTable.State.END) {
+          ThanksForYourSupportBottomSheetDialogFragment()
+            .apply { arguments = ThanksForYourSupportBottomSheetDialogFragmentArgs.Builder(Badges.fromDatabaseBadge(payment.data.badge!!)).build().toBundle() }
+            .show(fragmentManager, null)
+        } else if (payment.data.error != null && payment.state == InAppPaymentTable.State.PENDING) {
+          DonationPendingBottomSheet().apply {
+            arguments = DonationPendingBottomSheetArgs.Builder(payment).build().toBundle()
+          }.show(fragmentManager, null)
+        } else if (payment.data.error != null && payment.data.cancellation != null && payment.data.cancellation.reason != InAppPaymentData.Cancellation.Reason.MANUAL && SignalStore.inAppPayments.showMonthlyDonationCanceledDialog) {
+          MonthlyDonationCanceledBottomSheetDialogFragment.show(fragmentManager)
+        }
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationRepository.kt
new file mode 100644
index 0000000000..4ea597ea44
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationRepository.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.completed
+
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.database.model.databaseprotos.TerminalDonationQueue
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.whispersystems.signalservice.api.services.DonationsService
+import java.util.Locale
+
+class TerminalDonationRepository(
+  private val donationsService: DonationsService = AppDependencies.donationsService
+) {
+  fun getBadge(terminalDonation: TerminalDonationQueue.TerminalDonation): Single<Badge> {
+    return Single
+      .fromCallable { donationsService.getDonationsConfiguration(Locale.getDefault()) }
+      .flatMap { it.flattenResult() }
+      .map { it.levels[terminalDonation.level.toInt()]!! }
+      .map { Badges.fromServiceBadge(it.badge) }
+      .subscribeOn(Schedulers.io())
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationViewModel.kt
new file mode 100644
index 0000000000..56f1d398e3
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/completed/TerminalDonationViewModel.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.completed
+
+import android.annotation.SuppressLint
+import androidx.annotation.StringRes
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.subscribeBy
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.database.model.databaseprotos.TerminalDonationQueue
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.recipients.Recipient
+
+class TerminalDonationViewModel(
+  donationCompleted: TerminalDonationQueue.TerminalDonation,
+  repository: TerminalDonationRepository = TerminalDonationRepository(),
+) : ViewModel() {
+
+  companion object {
+    private val TAG = Log.tag(TerminalDonationViewModel::class.java)
+  }
+
+  private val disposables = CompositeDisposable()
+
+  private val internalBadge = mutableStateOf<Badge?>(null)
+  private val internalToggleChecked = mutableStateOf(false)
+  private val internalToggleType = mutableStateOf(ToggleType.NONE)
+
+  val badge: State<Badge?> = internalBadge
+  val isToggleChecked: State<Boolean> = internalToggleChecked
+  val toggleType: State<ToggleType> = internalToggleType
+
+  init {
+    disposables += repository.getBadge(donationCompleted)
+      .map { badge ->
+        val hasOtherBadges = Recipient.self().badges.filterNot { it.id == badge.id }.isNotEmpty()
+        val isDisplayingBadges = SignalStore.inAppPayments.getDisplayBadgesOnProfile()
+
+        val toggleType = when {
+          hasOtherBadges && isDisplayingBadges -> ToggleType.MAKE_FEATURED_BADGE
+          else -> ToggleType.DISPLAY_ON_PROFILE
+        }
+
+        badge to toggleType
+      }
+      .observeOn(AndroidSchedulers.mainThread())
+      .subscribeBy(
+        onSuccess = { (badge, toggleType) ->
+          internalBadge.value = badge
+          internalToggleType.value = toggleType
+        }
+      )
+  }
+
+  fun onToggleCheckChanged(isChecked: Boolean) {
+    internalToggleChecked.value = isChecked
+  }
+
+  /**
+   * Note that the intention here is that these are able to complete outside of the scope of the ViewModel's lifecycle.
+   */
+  @SuppressLint("CheckResult")
+  fun commitToggleState() {
+    when (toggleType.value) {
+      ToggleType.NONE -> Unit
+      ToggleType.MAKE_FEATURED_BADGE -> {
+        // MOLLY: TODO
+        // badgeRepository.setVisibilityForAllBadges(isToggleChecked.value).subscribeBy(
+        //   onError = {
+        //     Log.w(TAG, "Failure while updating badge visibility", it)
+        //   }
+        // )
+      }
+
+      ToggleType.DISPLAY_ON_PROFILE -> {
+        val badge = this.badge.value
+        if (badge == null) {
+          Log.w(TAG, "No badge!")
+          return
+        }
+
+        // MOLLY: TODO
+        // badgeRepository.setFeaturedBadge(badge).subscribeBy(
+        //   onError = {
+        //     Log.w(TAG, "Failure while updating featured badge", it)
+        //   }
+        // )
+      }
+    }
+  }
+
+  override fun onCleared() {
+    disposables.clear()
+  }
+
+  enum class ToggleType(@StringRes val copyId: Int) {
+    NONE(-1),
+    MAKE_FEATURED_BADGE(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__make_featured_badge),
+    DISPLAY_ON_PROFILE(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__display_on_profile)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyFragment.kt
new file mode 100644
index 0000000000..18fd88f7fd
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyFragment.kt
@@ -0,0 +1,45 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.currency
+
+import androidx.fragment.app.viewModels
+import org.thoughtcrime.securesms.components.settings.DSLConfiguration
+import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
+import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFragment
+import org.thoughtcrime.securesms.components.settings.DSLSettingsText
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
+import org.thoughtcrime.securesms.components.settings.configure
+import java.util.Locale
+
+/**
+ * Simple fragment for selecting a currency for Donations
+ */
+class SetCurrencyFragment : DSLSettingsBottomSheetFragment() {
+
+  private val viewModel: SetCurrencyViewModel by viewModels(
+    factoryProducer = {
+      val args = SetCurrencyFragmentArgs.fromBundle(requireArguments())
+      SetCurrencyViewModel.Factory(args.inAppPaymentType, args.supportedCurrencyCodes.toList())
+    }
+  )
+
+  override fun bindAdapter(adapter: DSLSettingsAdapter) {
+    viewModel.state.observe(viewLifecycleOwner) { state ->
+      adapter.submitList(getConfiguration(state).toMappingModelList())
+    }
+  }
+
+  private fun getConfiguration(state: SetCurrencyState): DSLConfiguration {
+    return configure {
+      state.currencies.forEach { currency ->
+        clickPref(
+          title = DSLSettingsText.from(currency.getDisplayName(Locale.getDefault())),
+          summary = DSLSettingsText.from(currency.currencyCode),
+          onClick = {
+            viewModel.setSelectedCurrency(currency.currencyCode)
+            InAppPaymentsRepository.scheduleSyncForAccountRecordChange()
+            dismissAllowingStateLoss()
+          }
+        )
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyState.kt
new file mode 100644
index 0000000000..db9b25e2fa
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyState.kt
@@ -0,0 +1,8 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.currency
+
+import java.util.Currency
+
+data class SetCurrencyState(
+  val selectedCurrencyCode: String = "",
+  val currencies: List<Currency> = listOf()
+)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyViewModel.kt
new file mode 100644
index 0000000000..c9143115eb
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyViewModel.kt
@@ -0,0 +1,98 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.currency
+
+import androidx.annotation.VisibleForTesting
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.BuildConfig
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.requireSubscriberType
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.util.livedata.Store
+import org.whispersystems.signalservice.api.subscriptions.SubscriberId
+import java.util.Currency
+import java.util.Locale
+
+class SetCurrencyViewModel(
+  private val inAppPaymentType: InAppPaymentType,
+  supportedCurrencyCodes: List<String>
+) : ViewModel() {
+
+  private val store = Store(
+    SetCurrencyState(
+      selectedCurrencyCode = if (inAppPaymentType.recurring) {
+        SignalStore.inAppPayments.getSubscriptionCurrency(inAppPaymentType.requireSubscriberType()).currencyCode
+      } else {
+        SignalStore.inAppPayments.getOneTimeCurrency().currencyCode
+      },
+      currencies = supportedCurrencyCodes
+        .map(Currency::getInstance)
+        .sortedWith(CurrencyComparator(BuildConfig.DEFAULT_CURRENCIES.split(",")))
+    )
+  )
+
+  val state: LiveData<SetCurrencyState> = store.stateLiveData
+
+  fun setSelectedCurrency(selectedCurrencyCode: String) {
+    store.update { it.copy(selectedCurrencyCode = selectedCurrencyCode) }
+
+    if (!inAppPaymentType.recurring) {
+      SignalStore.inAppPayments.setOneTimeCurrency(Currency.getInstance(selectedCurrencyCode))
+    } else {
+      val currency = Currency.getInstance(selectedCurrencyCode)
+      val subscriber = InAppPaymentsRepository.getSubscriber(currency, inAppPaymentType.requireSubscriberType())
+
+      if (subscriber != null) {
+        InAppPaymentsRepository.setSubscriber(subscriber)
+      } else {
+        InAppPaymentsRepository.setSubscriber(
+          InAppPaymentSubscriberRecord(
+            subscriberId = SubscriberId.generate(),
+            currency = currency,
+            type = inAppPaymentType.requireSubscriberType(),
+            requiresCancel = false,
+            paymentMethodType = InAppPaymentData.PaymentMethodType.UNKNOWN
+          )
+        )
+      }
+    }
+  }
+
+  @VisibleForTesting
+  class CurrencyComparator(private val defaults: List<String>) : Comparator<Currency> {
+
+    companion object {
+      private const val USD = "USD"
+    }
+
+    override fun compare(o1: Currency, o2: Currency): Int {
+      val isO1Default = o1.currencyCode in defaults
+      val isO2Default = o2.currencyCode in defaults
+
+      return if (o1.currencyCode == o2.currencyCode) {
+        0
+      } else if (o1.currencyCode == USD) {
+        -1
+      } else if (o2.currencyCode == USD) {
+        1
+      } else if (isO1Default && isO2Default) {
+        o1.getDisplayName(Locale.getDefault()).compareTo(o2.getDisplayName(Locale.getDefault()))
+      } else if (isO1Default) {
+        -1
+      } else if (isO2Default) {
+        1
+      } else {
+        o1.getDisplayName(Locale.getDefault()).compareTo(o2.getDisplayName(Locale.getDefault()))
+      }
+    }
+  }
+
+  class Factory(private val inAppPaymentType: InAppPaymentType, private val supportedCurrencyCodes: List<String>) : ViewModelProvider.Factory {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+      return modelClass.cast(SetCurrencyViewModel(inAppPaymentType, supportedCurrencyCodes))!!
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/CheckoutFlowActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/CheckoutFlowActivity.kt
new file mode 100644
index 0000000000..91fa3b6857
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/CheckoutFlowActivity.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+import android.content.Context
+import android.content.Intent
+import androidx.fragment.app.Fragment
+import androidx.navigation.navArgs
+import io.reactivex.rxjava3.subjects.PublishSubject
+import io.reactivex.rxjava3.subjects.Subject
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.components.FragmentWrapperActivity
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentComponent
+import org.thoughtcrime.securesms.components.settings.app.subscription.StripeRepository
+
+/**
+ * Home base for all checkout flows.
+ */
+class CheckoutFlowActivity : FragmentWrapperActivity(), InAppPaymentComponent {
+
+  companion object {
+    fun createIntent(context: Context, inAppPaymentType: InAppPaymentType): Intent {
+      return Intent(context, CheckoutFlowActivity::class.java).putExtras(
+        CheckoutFlowActivityArgs.Builder(inAppPaymentType).build().toBundle()
+      )
+    }
+  }
+
+  override val stripeRepository: StripeRepository by lazy { StripeRepository(this) }
+  override val googlePayResultPublisher: Subject<InAppPaymentComponent.GooglePayResult> = PublishSubject.create()
+
+  private val args by navArgs<CheckoutFlowActivityArgs>()
+
+  override fun getFragment(): Fragment {
+    return CheckoutNavHostFragment.create(args.inAppPaymentType)
+  }
+
+  @Suppress("DEPRECATION")
+  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+    super.onActivityResult(requestCode, resultCode, data)
+    googlePayResultPublisher.onNext(InAppPaymentComponent.GooglePayResult(requestCode, resultCode, data))
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/CheckoutNavHostFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/CheckoutNavHostFragment.kt
new file mode 100644
index 0000000000..71cdb5f944
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/CheckoutNavHostFragment.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+import android.os.Bundle
+import androidx.core.os.bundleOf
+import androidx.navigation.fragment.NavHostFragment
+import org.signal.core.util.getSerializableCompat
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.R
+
+class CheckoutNavHostFragment : NavHostFragment() {
+
+  companion object {
+    private const val ARG_TYPE = "host_in_app_payment_type"
+
+    @JvmStatic
+    fun create(inAppPaymentType: InAppPaymentType): CheckoutNavHostFragment {
+      val actual = CheckoutNavHostFragment()
+      actual.arguments = bundleOf(ARG_TYPE to inAppPaymentType)
+
+      return actual
+    }
+  }
+
+  private val inAppPaymentType: InAppPaymentType
+    get() = requireArguments().getSerializableCompat(ARG_TYPE, InAppPaymentType::class.java)!!
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    if (savedInstanceState == null) {
+      val navGraph = navController.navInflater.inflate(R.navigation.checkout)
+      navGraph.setStartDestination(
+        when (inAppPaymentType) {
+          InAppPaymentType.UNKNOWN -> error("Unsupported start destination")
+          InAppPaymentType.ONE_TIME_GIFT -> error("Unsupported start destination")
+          InAppPaymentType.ONE_TIME_DONATION, InAppPaymentType.RECURRING_DONATION -> R.id.donateToSignalFragment
+          InAppPaymentType.RECURRING_BACKUP -> R.id.messageBackupsFlowFragment
+        }
+      )
+
+      val startBundle = when (inAppPaymentType) {
+        InAppPaymentType.UNKNOWN -> error("Unknown payment type")
+        InAppPaymentType.ONE_TIME_GIFT, InAppPaymentType.RECURRING_BACKUP -> null
+        InAppPaymentType.ONE_TIME_DONATION, InAppPaymentType.RECURRING_DONATION -> DonateToSignalFragmentArgs.Builder(inAppPaymentType).build().toBundle()
+      }
+
+      navController.setGraph(navGraph, startBundle)
+    }
+
+    super.onCreate(savedInstanceState)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalAction.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalAction.kt
new file mode 100644
index 0000000000..c9f56cdebb
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalAction.kt
@@ -0,0 +1,11 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+
+sealed class DonateToSignalAction {
+  data class DisplayCurrencySelectionDialog(val inAppPaymentType: InAppPaymentType, val supportedCurrencies: List<String>) : DonateToSignalAction()
+  data class DisplayGatewaySelectorDialog(val inAppPayment: InAppPaymentTable.InAppPayment) : DonateToSignalAction()
+  object CancelSubscription : DonateToSignalAction()
+  data class UpdateSubscription(val inAppPayment: InAppPaymentTable.InAppPayment, val isLongRunning: Boolean) : DonateToSignalAction()
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalFragment.kt
new file mode 100644
index 0000000000..4045686aee
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalFragment.kt
@@ -0,0 +1,524 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+import android.text.SpannableStringBuilder
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.Toolbar
+import androidx.core.content.ContextCompat
+import androidx.core.os.bundleOf
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.setFragmentResultListener
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
+import androidx.recyclerview.widget.RecyclerView
+import com.airbnb.lottie.LottieAnimationView
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.snackbar.Snackbar
+import org.signal.core.util.concurrent.LifecycleDisposable
+import org.signal.core.util.dp
+import org.signal.core.util.getParcelableCompat
+import org.signal.core.util.getSerializableCompat
+import org.signal.core.util.logging.Log
+import org.signal.core.util.money.FiatMoney
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.badges.models.BadgePreview
+import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout
+import org.thoughtcrime.securesms.components.ViewBinderDelegate
+import org.thoughtcrime.securesms.components.WrapperDialogFragment
+import org.thoughtcrime.securesms.components.settings.DSLConfiguration
+import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
+import org.thoughtcrime.securesms.components.settings.DSLSettingsText
+import org.thoughtcrime.securesms.components.settings.app.subscription.boost.Boost
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewaySelectorBottomSheet
+import org.thoughtcrime.securesms.components.settings.app.subscription.models.CurrencySelection
+import org.thoughtcrime.securesms.components.settings.app.subscription.models.NetworkFailure
+import org.thoughtcrime.securesms.components.settings.app.subscription.thanks.ThanksForYourSupportBottomSheetDialogFragment
+import org.thoughtcrime.securesms.components.settings.configure
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.databinding.DonateToSignalFragmentBinding
+import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import org.thoughtcrime.securesms.payments.currency.CurrencyUtil
+import org.thoughtcrime.securesms.subscription.Subscription
+import org.thoughtcrime.securesms.util.Material3OnScrollHelper
+import org.thoughtcrime.securesms.util.Projection
+import org.thoughtcrime.securesms.util.SpanUtil
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
+import java.math.BigDecimal
+import java.util.Currency
+
+/**
+ * Unified donation fragment which allows users to choose between monthly or one-time donations.
+ */
+class DonateToSignalFragment :
+  DSLSettingsFragment(
+    layoutId = R.layout.donate_to_signal_fragment
+  ),
+  ThanksForYourSupportBottomSheetDialogFragment.Callback,
+  InAppPaymentCheckoutDelegate.Callback {
+
+  companion object {
+    private val TAG = Log.tag(DonateToSignalFragment::class.java)
+  }
+
+  class Dialog : WrapperDialogFragment() {
+
+    override fun getWrappedFragment(): Fragment {
+      return CheckoutNavHostFragment.create(
+        requireArguments().getSerializableCompat(ARG, InAppPaymentType::class.java)!!
+      )
+    }
+
+    companion object {
+
+      private const val ARG = "in_app_payment_type"
+
+      @JvmStatic
+      fun create(inAppPaymentType: InAppPaymentType): DialogFragment {
+        return Dialog().apply {
+          arguments = bundleOf(ARG to inAppPaymentType)
+        }
+      }
+    }
+  }
+
+  private val args: DonateToSignalFragmentArgs by navArgs()
+  private val viewModel: DonateToSignalViewModel by viewModels(factoryProducer = {
+    DonateToSignalViewModel.Factory(args.startType)
+  })
+
+  private val disposables = LifecycleDisposable()
+  private val binding by ViewBinderDelegate(DonateToSignalFragmentBinding::bind)
+
+  private val supportTechSummary: CharSequence by lazy {
+    SpannableStringBuilder(SpanUtil.color(ContextCompat.getColor(requireContext(), R.color.signal_colorOnSurfaceVariant), requireContext().getString(R.string.DonateToSignalFragment__private_messaging)))
+      .append(" ")
+      .append(
+        SpanUtil.readMore(requireContext(), ContextCompat.getColor(requireContext(), R.color.signal_colorPrimary)) {
+          findNavController().safeNavigate(DonateToSignalFragmentDirections.actionDonateToSignalFragmentToSubscribeLearnMoreBottomSheetDialog())
+        }
+      )
+  }
+
+  override fun onToolbarNavigationClicked() {
+    requireActivity().onBackPressedDispatcher.onBackPressed()
+  }
+
+  override fun getMaterial3OnScrollHelper(toolbar: Toolbar?): Material3OnScrollHelper {
+    return object : Material3OnScrollHelper(requireActivity(), toolbar!!, viewLifecycleOwner) {
+      override val activeColorSet: ColorSet = ColorSet(R.color.transparent, R.color.signal_colorBackground)
+      override val inactiveColorSet: ColorSet = ColorSet(R.color.transparent, R.color.signal_colorBackground)
+    }
+  }
+
+  override fun bindAdapter(adapter: MappingAdapter) {
+    val checkoutDelegate = InAppPaymentCheckoutDelegate(this, this, viewModel.inAppPaymentId)
+
+    val recyclerView = this.recyclerView!!
+    recyclerView.overScrollMode = RecyclerView.OVER_SCROLL_IF_CONTENT_SCROLLS
+
+    KeyboardAwareLinearLayout(requireContext()).apply {
+      addOnKeyboardHiddenListener {
+        recyclerView.post { recyclerView.requestLayout() }
+      }
+
+      addOnKeyboardShownListener {
+        recyclerView.post { recyclerView.scrollToPosition(adapter.itemCount - 1) }
+      }
+
+      (view as ViewGroup).addView(this)
+    }
+
+    Boost.register(adapter)
+    Subscription.register(adapter)
+    NetworkFailure.register(adapter)
+    BadgePreview.register(adapter)
+    CurrencySelection.register(adapter)
+    DonationPillToggle.register(adapter)
+
+    setFragmentResultListener(GatewaySelectorBottomSheet.REQUEST_KEY) { _, bundle ->
+      if (bundle.containsKey(GatewaySelectorBottomSheet.FAILURE_KEY)) {
+        showSepaEuroMaximumDialog(FiatMoney(bundle.getSerializable(GatewaySelectorBottomSheet.SEPA_EURO_MAX) as BigDecimal, CurrencyUtil.EURO))
+      } else {
+        val inAppPayment: InAppPaymentTable.InAppPayment = bundle.getParcelableCompat(GatewaySelectorBottomSheet.REQUEST_KEY, InAppPaymentTable.InAppPayment::class.java)!!
+        checkoutDelegate.handleGatewaySelectionResponse(inAppPayment)
+      }
+    }
+
+    disposables.bindTo(viewLifecycleOwner)
+    disposables += viewModel.actions.subscribe { action ->
+      when (action) {
+        is DonateToSignalAction.DisplayCurrencySelectionDialog -> {
+          val navAction = DonateToSignalFragmentDirections.actionDonateToSignalFragmentToSetCurrencyFragment(
+            action.inAppPaymentType,
+            action.supportedCurrencies.toTypedArray()
+          )
+
+          findNavController().safeNavigate(navAction)
+        }
+
+        is DonateToSignalAction.DisplayGatewaySelectorDialog -> {
+          Log.d(TAG, "Presenting gateway selector for ${action.inAppPayment.id}")
+          val navAction = DonateToSignalFragmentDirections.actionDonateToSignalFragmentToGatewaySelectorBottomSheetDialog(action.inAppPayment)
+
+          findNavController().safeNavigate(navAction)
+        }
+
+        is DonateToSignalAction.CancelSubscription -> {
+          DonateToSignalFragmentDirections.actionDonateToSignalFragmentToStripePaymentInProgressFragment(
+            InAppPaymentProcessorAction.CANCEL_SUBSCRIPTION,
+            null,
+            InAppPaymentType.RECURRING_DONATION
+          )
+        }
+
+        is DonateToSignalAction.UpdateSubscription -> {
+          if (action.inAppPayment.data.paymentMethodType == InAppPaymentData.PaymentMethodType.PAYPAL) {
+            DonateToSignalFragmentDirections.actionDonateToSignalFragmentToPaypalPaymentInProgressFragment(
+              InAppPaymentProcessorAction.UPDATE_SUBSCRIPTION,
+              action.inAppPayment,
+              action.inAppPayment.type
+            )
+          } else {
+            DonateToSignalFragmentDirections.actionDonateToSignalFragmentToStripePaymentInProgressFragment(
+              InAppPaymentProcessorAction.UPDATE_SUBSCRIPTION,
+              action.inAppPayment,
+              action.inAppPayment.type
+            )
+          }
+        }
+      }
+    }
+
+    disposables += viewModel.state.subscribe { state ->
+      adapter.submitList(getConfiguration(state).toMappingModelList())
+    }
+  }
+
+  override fun onStop() {
+    super.onStop()
+
+    listOf(
+      binding.boost1Animation,
+      binding.boost2Animation,
+      binding.boost3Animation,
+      binding.boost4Animation,
+      binding.boost5Animation,
+      binding.boost6Animation
+    ).forEach {
+      it.cancelAnimation()
+    }
+  }
+
+  private fun getConfiguration(state: DonateToSignalState): DSLConfiguration {
+    return configure {
+      space(36.dp)
+
+      customPref(BadgePreview.BadgeModel.SubscriptionModel(state.badge))
+
+      space(12.dp)
+
+      noPadTextPref(
+        title = DSLSettingsText.from(
+          R.string.DonateToSignalFragment__privacy_over_profit,
+          DSLSettingsText.CenterModifier,
+          DSLSettingsText.TitleLargeModifier
+        )
+      )
+
+      space(8.dp)
+
+      noPadTextPref(
+        title = DSLSettingsText.from(supportTechSummary, DSLSettingsText.CenterModifier)
+      )
+
+      space(24.dp)
+
+      customPref(
+        CurrencySelection.Model(
+          selectedCurrency = state.selectedCurrency,
+          isEnabled = state.canSetCurrency,
+          onClick = {
+            viewModel.requestChangeCurrency()
+          }
+        )
+      )
+
+      space(16.dp)
+
+      customPref(
+        DonationPillToggle.Model(
+          selected = state.inAppPaymentType,
+          onClick = {
+            viewModel.toggleDonationType()
+          }
+        )
+      )
+
+      space(10.dp)
+
+      when (state.inAppPaymentType) {
+        InAppPaymentType.ONE_TIME_DONATION -> displayOneTimeSelection(state.areFieldsEnabled, state.oneTimeDonationState)
+        InAppPaymentType.RECURRING_DONATION -> displayMonthlySelection(state.areFieldsEnabled, state.monthlyDonationState)
+        else -> error("This fragment does not support ${state.inAppPaymentType}.")
+      }
+
+      space(20.dp)
+
+      if (state.inAppPaymentType == InAppPaymentType.RECURRING_DONATION && state.monthlyDonationState.isSubscriptionActive) {
+        primaryButton(
+          text = DSLSettingsText.from(R.string.SubscribeFragment__update_subscription),
+          isEnabled = state.canUpdate,
+          onClick = {
+            if (state.monthlyDonationState.transactionState.isTransactionJobPending) {
+              showDonationPendingDialog(state)
+            } else {
+              MaterialAlertDialogBuilder(requireContext())
+                .setTitle(R.string.SubscribeFragment__update_subscription_question)
+                .setMessage(
+                  getString(
+                    R.string.SubscribeFragment__you_will_be_charged_the_full_amount_s_of,
+                    FiatMoneyUtil.format(
+                      requireContext().resources,
+                      viewModel.getSelectedSubscriptionCost(),
+                      FiatMoneyUtil.formatOptions().trimZerosAfterDecimal()
+                    )
+                  )
+                )
+                .setPositiveButton(R.string.SubscribeFragment__update) { _, _ ->
+                  viewModel.updateSubscription()
+                }
+                .setNegativeButton(android.R.string.cancel) { _, _ -> }
+                .show()
+            }
+          }
+        )
+
+        space(4.dp)
+
+        secondaryButtonNoOutline(
+          text = DSLSettingsText.from(R.string.SubscribeFragment__cancel_subscription),
+          isEnabled = state.areFieldsEnabled,
+          onClick = {
+            if (state.monthlyDonationState.transactionState.isTransactionJobPending) {
+              showDonationPendingDialog(state)
+            } else {
+              MaterialAlertDialogBuilder(requireContext())
+                .setTitle(R.string.SubscribeFragment__confirm_cancellation)
+                .setMessage(R.string.SubscribeFragment__you_wont_be_charged_again)
+                .setPositiveButton(R.string.SubscribeFragment__confirm) { _, _ ->
+                  viewModel.cancelSubscription()
+                }
+                .setNegativeButton(R.string.SubscribeFragment__not_now) { _, _ -> }
+                .show()
+            }
+          }
+        )
+      } else {
+        primaryButton(
+          text = DSLSettingsText.from(R.string.DonateToSignalFragment__continue),
+          isEnabled = state.continueEnabled,
+          onClick = {
+            if (state.canContinue) {
+              viewModel.requestSelectGateway()
+            } else {
+              showDonationPendingDialog(state)
+            }
+          }
+        )
+      }
+    }
+  }
+
+  private fun showDonationPendingDialog(state: DonateToSignalState) {
+    val message = if (state.inAppPaymentType == InAppPaymentType.ONE_TIME_DONATION) {
+      if (state.oneTimeDonationState.isOneTimeDonationLongRunning) {
+        R.string.DonateToSignalFragment__bank_transfers_usually_take_1_business_day_to_process_onetime
+      } else if (state.oneTimeDonationState.isNonVerifiedIdeal) {
+        R.string.DonateToSignalFragment__your_ideal_payment_is_still_processing
+      } else {
+        R.string.DonateToSignalFragment__your_payment_is_still_being_processed_onetime
+      }
+    } else {
+      if (state.monthlyDonationState.activeSubscription?.paymentMethod == ActiveSubscription.PAYMENT_METHOD_SEPA_DEBIT) {
+        R.string.DonateToSignalFragment__bank_transfers_usually_take_1_business_day_to_process_monthly
+      } else if (state.monthlyDonationState.nonVerifiedMonthlyDonation != null) {
+        R.string.DonateToSignalFragment__your_ideal_payment_is_still_processing
+      } else {
+        R.string.DonateToSignalFragment__your_payment_is_still_being_processed_monthly
+      }
+    }
+
+    MaterialAlertDialogBuilder(requireContext())
+      .setTitle(R.string.DonateToSignalFragment__you_have_a_donation_pending)
+      .setMessage(message)
+      .setPositiveButton(android.R.string.ok, null)
+      .show()
+  }
+
+  private fun DSLConfiguration.displayOneTimeSelection(areFieldsEnabled: Boolean, state: DonateToSignalState.OneTimeDonationState) {
+    when (state.donationStage) {
+      DonateToSignalState.DonationStage.INIT -> customPref(Boost.LoadingModel())
+      DonateToSignalState.DonationStage.FAILURE -> customPref(NetworkFailure.Model { viewModel.retryOneTimeDonationState() })
+      DonateToSignalState.DonationStage.READY -> {
+        customPref(
+          Boost.SelectionModel(
+            boosts = state.boosts,
+            selectedBoost = state.selectedBoost,
+            currency = state.customAmount.currency,
+            isCustomAmountFocused = state.isCustomAmountFocused,
+            isCustomAmountTooSmall = state.shouldDisplayCustomAmountTooSmallError,
+            minimumAmount = state.minimumDonationAmountOfSelectedCurrency,
+            isEnabled = areFieldsEnabled,
+            onBoostClick = { view, boost ->
+              startAnimationAboveSelectedBoost(view)
+              viewModel.setSelectedBoost(boost)
+            },
+            onCustomAmountChanged = {
+              viewModel.setCustomAmount(it)
+            },
+            onCustomAmountFocusChanged = {
+              if (it) {
+                viewModel.setCustomAmountFocused()
+              }
+            }
+          )
+        )
+      }
+    }
+  }
+
+  private fun DSLConfiguration.displayMonthlySelection(areFieldsEnabled: Boolean, state: DonateToSignalState.MonthlyDonationState) {
+    when (state.donationStage) {
+      DonateToSignalState.DonationStage.INIT -> customPref(Subscription.LoaderModel())
+      DonateToSignalState.DonationStage.FAILURE -> customPref(NetworkFailure.Model { viewModel.retryMonthlyDonationState() })
+      else -> {
+        state.subscriptions.forEach { subscription ->
+
+          val isActive = state.activeLevel == subscription.level && state.isSubscriptionActive
+
+          val activePrice = state.activeSubscription?.let { sub ->
+            val activeCurrency = Currency.getInstance(sub.currency)
+            val activeAmount = sub.amount.movePointLeft(activeCurrency.defaultFractionDigits)
+
+            FiatMoney(activeAmount, activeCurrency)
+          }
+
+          customPref(
+            Subscription.Model(
+              activePrice = if (isActive) activePrice else null,
+              subscription = subscription,
+              isSelected = state.selectedSubscription == subscription,
+              isEnabled = areFieldsEnabled,
+              isActive = isActive,
+              willRenew = isActive && !state.isActiveSubscriptionEnding,
+              onClick = { viewModel.setSelectedSubscription(it) },
+              renewalTimestamp = state.renewalTimestamp,
+              selectedCurrency = state.selectedCurrency
+            )
+          )
+        }
+      }
+    }
+  }
+
+  private fun startAnimationAboveSelectedBoost(view: View) {
+    val animationView = getAnimationContainer(view)
+    val viewProjection = Projection.relativeToViewRoot(view, null)
+    val animationProjection = Projection.relativeToViewRoot(animationView, null)
+    val viewHorizontalCenter = viewProjection.x + viewProjection.width / 2f
+    val animationHorizontalCenter = animationProjection.x + animationProjection.width / 2f
+    val animationBottom = animationProjection.y + animationProjection.height
+
+    animationView.translationY = -(animationBottom - viewProjection.y) + (viewProjection.height / 2f)
+    animationView.translationX = viewHorizontalCenter - animationHorizontalCenter
+
+    animationView.playAnimation()
+
+    viewProjection.release()
+    animationProjection.release()
+  }
+
+  private fun getAnimationContainer(view: View): LottieAnimationView {
+    return when (view.id) {
+      R.id.boost_1 -> binding.boost1Animation
+      R.id.boost_2 -> binding.boost2Animation
+      R.id.boost_3 -> binding.boost3Animation
+      R.id.boost_4 -> binding.boost4Animation
+      R.id.boost_5 -> binding.boost5Animation
+      R.id.boost_6 -> binding.boost6Animation
+      else -> throw AssertionError()
+    }
+  }
+
+  private fun showSepaEuroMaximumDialog(sepaEuroMaximum: FiatMoney) {
+    val max = FiatMoneyUtil.format(resources, sepaEuroMaximum, FiatMoneyUtil.formatOptions().trimZerosAfterDecimal())
+    MaterialAlertDialogBuilder(requireContext())
+      .setTitle(R.string.DonateToSignal__donation_amount_too_high)
+      .setMessage(getString(R.string.DonateToSignalFragment__you_can_send_up_to_s_via_bank_transfer, max))
+      .setPositiveButton(android.R.string.ok, null)
+      .show()
+  }
+
+  override fun onBoostThanksSheetDismissed() {
+    findNavController().popBackStack()
+  }
+
+  override fun navigateToStripePaymentInProgress(inAppPayment: InAppPaymentTable.InAppPayment) {
+    findNavController().safeNavigate(
+      DonateToSignalFragmentDirections.actionDonateToSignalFragmentToStripePaymentInProgressFragment(
+        InAppPaymentProcessorAction.PROCESS_NEW_IN_APP_PAYMENT,
+        inAppPayment,
+        inAppPayment.type
+      )
+    )
+  }
+
+  override fun navigateToPayPalPaymentInProgress(inAppPayment: InAppPaymentTable.InAppPayment) {
+    findNavController().safeNavigate(
+      DonateToSignalFragmentDirections.actionDonateToSignalFragmentToPaypalPaymentInProgressFragment(
+        InAppPaymentProcessorAction.PROCESS_NEW_IN_APP_PAYMENT,
+        inAppPayment,
+        inAppPayment.type
+      )
+    )
+  }
+
+  override fun navigateToCreditCardForm(inAppPayment: InAppPaymentTable.InAppPayment) {
+    findNavController().safeNavigate(DonateToSignalFragmentDirections.actionDonateToSignalFragmentToCreditCardFragment(inAppPayment))
+  }
+
+  override fun navigateToIdealDetailsFragment(inAppPayment: InAppPaymentTable.InAppPayment) {
+    findNavController().safeNavigate(DonateToSignalFragmentDirections.actionDonateToSignalFragmentToIdealTransferDetailsFragment(inAppPayment))
+  }
+
+  override fun navigateToBankTransferMandate(inAppPayment: InAppPaymentTable.InAppPayment) {
+    findNavController().safeNavigate(DonateToSignalFragmentDirections.actionDonateToSignalFragmentToBankTransferMandateFragment(inAppPayment))
+  }
+
+  override fun onPaymentComplete(inAppPayment: InAppPaymentTable.InAppPayment) {
+    findNavController().safeNavigate(DonateToSignalFragmentDirections.actionDonateToSignalFragmentToThanksForYourSupportBottomSheetDialog(Badges.fromDatabaseBadge(inAppPayment.data.badge!!)))
+  }
+
+  override fun onSubscriptionCancelled(inAppPaymentType: InAppPaymentType) {
+    Snackbar.make(requireView(), R.string.SubscribeFragment__your_subscription_has_been_cancelled, Snackbar.LENGTH_LONG).show()
+  }
+
+  override fun onProcessorActionProcessed() {
+    // TODO [alex] - what did this used to do?
+  }
+
+  override fun onUserLaunchedAnExternalApplication() {
+    // TODO [alex] - what did this used to do?
+  }
+
+  override fun navigateToDonationPending(inAppPayment: InAppPaymentTable.InAppPayment) {
+    findNavController().safeNavigate(DonateToSignalFragmentDirections.actionDonateToSignalFragmentToDonationPendingBottomSheet(inAppPayment))
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalState.kt
new file mode 100644
index 0000000000..ebc49aee02
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalState.kt
@@ -0,0 +1,146 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+import org.signal.core.util.money.FiatMoney
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppDonations
+import org.thoughtcrime.securesms.components.settings.app.subscription.boost.Boost
+import org.thoughtcrime.securesms.components.settings.app.subscription.manage.NonVerifiedMonthlyDonation
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.database.model.databaseprotos.PendingOneTimeDonation
+import org.thoughtcrime.securesms.database.model.isLongRunning
+import org.thoughtcrime.securesms.database.model.isPending
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.subscription.Subscription
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
+import java.math.BigDecimal
+import java.util.Currency
+import java.util.concurrent.TimeUnit
+
+data class DonateToSignalState(
+  val inAppPaymentType: InAppPaymentType,
+  val oneTimeDonationState: OneTimeDonationState = OneTimeDonationState(),
+  val monthlyDonationState: MonthlyDonationState = MonthlyDonationState()
+) {
+
+  val areFieldsEnabled: Boolean
+    get() = when (inAppPaymentType) {
+      InAppPaymentType.ONE_TIME_DONATION -> oneTimeDonationState.donationStage == DonationStage.READY
+      InAppPaymentType.RECURRING_DONATION -> monthlyDonationState.donationStage == DonationStage.READY
+      else -> error("This flow does not support $inAppPaymentType")
+    }
+
+  val badge: Badge?
+    get() = when (inAppPaymentType) {
+      InAppPaymentType.ONE_TIME_DONATION -> oneTimeDonationState.badge
+      InAppPaymentType.RECURRING_DONATION -> monthlyDonationState.selectedSubscription?.badge
+      else -> error("This flow does not support $inAppPaymentType")
+    }
+
+  val canSetCurrency: Boolean
+    get() = when (inAppPaymentType) {
+      InAppPaymentType.ONE_TIME_DONATION -> areFieldsEnabled && !oneTimeDonationState.isOneTimeDonationPending
+      InAppPaymentType.RECURRING_DONATION -> areFieldsEnabled && !monthlyDonationState.isSubscriptionActive
+      else -> error("This flow does not support $inAppPaymentType")
+    }
+
+  val selectedCurrency: Currency
+    get() = when (inAppPaymentType) {
+      InAppPaymentType.ONE_TIME_DONATION -> oneTimeDonationState.selectedCurrency
+      InAppPaymentType.RECURRING_DONATION -> monthlyDonationState.selectedCurrency
+      else -> error("This flow does not support $inAppPaymentType")
+    }
+
+  val selectableCurrencyCodes: List<String>
+    get() = when (inAppPaymentType) {
+      InAppPaymentType.ONE_TIME_DONATION -> oneTimeDonationState.selectableCurrencyCodes
+      InAppPaymentType.RECURRING_DONATION -> monthlyDonationState.selectableCurrencyCodes
+      else -> error("This flow does not support $inAppPaymentType")
+    }
+
+  val level: Int
+    get() = when (inAppPaymentType) {
+      InAppPaymentType.ONE_TIME_DONATION -> 1
+      InAppPaymentType.RECURRING_DONATION -> monthlyDonationState.selectedSubscription!!.level
+      else -> error("This flow does not support $inAppPaymentType")
+    }
+
+  val continueEnabled: Boolean
+    get() = when (inAppPaymentType) {
+      InAppPaymentType.ONE_TIME_DONATION -> areFieldsEnabled && oneTimeDonationState.isSelectionValid && InAppDonations.hasAtLeastOnePaymentMethodAvailable()
+      InAppPaymentType.RECURRING_DONATION -> areFieldsEnabled && monthlyDonationState.isSelectionValid && InAppDonations.hasAtLeastOnePaymentMethodAvailable()
+      else -> error("This flow does not support $inAppPaymentType")
+    }
+
+  val canContinue: Boolean
+    get() = when (inAppPaymentType) {
+      InAppPaymentType.ONE_TIME_DONATION -> continueEnabled && !oneTimeDonationState.isOneTimeDonationPending
+      InAppPaymentType.RECURRING_DONATION -> continueEnabled && !monthlyDonationState.isSubscriptionActive && !monthlyDonationState.transactionState.isInProgress
+      else -> error("This flow does not support $inAppPaymentType")
+    }
+
+  val canUpdate: Boolean
+    get() = when (inAppPaymentType) {
+      InAppPaymentType.ONE_TIME_DONATION -> false
+      InAppPaymentType.RECURRING_DONATION -> areFieldsEnabled && monthlyDonationState.isSelectionValid
+      else -> error("This flow does not support $inAppPaymentType")
+    }
+
+  val isUpdateLongRunning: Boolean
+    get() = monthlyDonationState.activeSubscription?.paymentMethod == ActiveSubscription.PAYMENT_METHOD_SEPA_DEBIT
+
+  data class OneTimeDonationState(
+    val badge: Badge? = null,
+    val selectedCurrency: Currency = SignalStore.inAppPayments.getOneTimeCurrency(),
+    val boosts: List<Boost> = emptyList(),
+    val selectedBoost: Boost? = null,
+    val customAmount: FiatMoney = FiatMoney(BigDecimal.ZERO, selectedCurrency),
+    val isCustomAmountFocused: Boolean = false,
+    val donationStage: DonationStage = DonationStage.INIT,
+    val selectableCurrencyCodes: List<String> = emptyList(),
+    private val pendingOneTimeDonation: PendingOneTimeDonation? = null,
+    private val minimumDonationAmounts: Map<Currency, FiatMoney> = emptyMap()
+  ) {
+    val isOneTimeDonationPending: Boolean = pendingOneTimeDonation.isPending()
+    val isOneTimeDonationLongRunning: Boolean = pendingOneTimeDonation.isLongRunning()
+    val isNonVerifiedIdeal = pendingOneTimeDonation?.pendingVerification == true
+
+    val minimumDonationAmountOfSelectedCurrency: FiatMoney = minimumDonationAmounts[selectedCurrency] ?: FiatMoney(BigDecimal.ZERO, selectedCurrency)
+    private val isCustomAmountTooSmall: Boolean = if (isCustomAmountFocused) customAmount.amount < minimumDonationAmountOfSelectedCurrency.amount else false
+    private val isCustomAmountZero: Boolean = customAmount.amount == BigDecimal.ZERO
+
+    val isSelectionValid: Boolean = if (isCustomAmountFocused) !isCustomAmountTooSmall else selectedBoost != null
+    val shouldDisplayCustomAmountTooSmallError: Boolean = isCustomAmountTooSmall && !isCustomAmountZero
+  }
+
+  data class MonthlyDonationState(
+    val selectedCurrency: Currency = SignalStore.inAppPayments.getSubscriptionCurrency(InAppPaymentSubscriberRecord.Type.DONATION),
+    val subscriptions: List<Subscription> = emptyList(),
+    private val _activeSubscription: ActiveSubscription? = null,
+    val selectedSubscription: Subscription? = null,
+    val donationStage: DonationStage = DonationStage.INIT,
+    val selectableCurrencyCodes: List<String> = emptyList(),
+    val nonVerifiedMonthlyDonation: NonVerifiedMonthlyDonation? = null,
+    val transactionState: TransactionState = TransactionState()
+  ) {
+    val isSubscriptionActive: Boolean = _activeSubscription?.isActive == true
+    val activeLevel: Int? = _activeSubscription?.activeSubscription?.level
+    val activeSubscription: ActiveSubscription.Subscription? = _activeSubscription?.activeSubscription
+    val isActiveSubscriptionEnding: Boolean = _activeSubscription?.isActive == true && _activeSubscription.activeSubscription.willCancelAtPeriodEnd()
+    val renewalTimestamp = TimeUnit.SECONDS.toMillis(activeSubscription?.endOfCurrentPeriod ?: 0L)
+    val isSelectionValid = selectedSubscription != null && (!isSubscriptionActive || selectedSubscription.level != activeSubscription?.level)
+  }
+
+  enum class DonationStage {
+    INIT,
+    READY,
+    FAILURE
+  }
+
+  data class TransactionState(
+    val isTransactionJobPending: Boolean = false,
+    val isLevelUpdateInProgress: Boolean = false
+  ) {
+    val isInProgress: Boolean = isTransactionJobPending || isLevelUpdateInProgress
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalViewModel.kt
new file mode 100644
index 0000000000..bb74b6aeb0
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonateToSignalViewModel.kt
@@ -0,0 +1,430 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.subscribeBy
+import io.reactivex.rxjava3.processors.BehaviorProcessor
+import io.reactivex.rxjava3.subjects.PublishSubject
+import org.signal.core.util.StringUtil
+import org.signal.core.util.logging.Log
+import org.signal.core.util.money.FiatMoney
+import org.signal.core.util.money.PlatformCurrencyUtil
+import org.signal.core.util.orNull
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatValue
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.OneTimeInAppPaymentRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.RecurringInAppPaymentRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.boost.Boost
+import org.thoughtcrime.securesms.components.settings.app.subscription.manage.DonationRedemptionJobStatus
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.database.model.databaseprotos.PendingOneTimeDonation
+import org.thoughtcrime.securesms.database.model.isExpired
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.subscription.LevelUpdate
+import org.thoughtcrime.securesms.subscription.Subscription
+import org.thoughtcrime.securesms.util.InternetConnectionObserver
+import org.thoughtcrime.securesms.util.rx.RxStore
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
+import org.whispersystems.signalservice.api.subscriptions.SubscriberId
+import java.math.BigDecimal
+import java.text.DecimalFormat
+import java.text.DecimalFormatSymbols
+import java.util.Currency
+import java.util.Optional
+
+/**
+ * Contains the logic to manage the UI of the unified donations screen.
+ * Does not directly deal with performing payments, this ViewModel is
+ * only in charge of rendering our "current view of the world."
+ */
+class DonateToSignalViewModel(
+  startType: InAppPaymentType,
+  private val oneTimeInAppPaymentRepository: OneTimeInAppPaymentRepository
+) : ViewModel() {
+
+  companion object {
+    private val TAG = Log.tag(DonateToSignalViewModel::class.java)
+  }
+
+  private val store = RxStore(DonateToSignalState(inAppPaymentType = startType))
+  private val oneTimeDonationDisposables = CompositeDisposable()
+  private val monthlyDonationDisposables = CompositeDisposable()
+  private val networkDisposable = CompositeDisposable()
+  private val actionDisposable = CompositeDisposable()
+  private val _actions = PublishSubject.create<DonateToSignalAction>()
+  private val _activeSubscription = PublishSubject.create<ActiveSubscription>()
+  private val _inAppPaymentId = BehaviorProcessor.create<InAppPaymentTable.InAppPaymentId>()
+
+  val state = store.stateFlowable.observeOn(AndroidSchedulers.mainThread())
+  val actions: Observable<DonateToSignalAction> = _actions.observeOn(AndroidSchedulers.mainThread())
+  val inAppPaymentId: Flowable<InAppPaymentTable.InAppPaymentId> = _inAppPaymentId.onBackpressureLatest().distinctUntilChanged()
+
+  init {
+    initializeOneTimeDonationState(oneTimeInAppPaymentRepository)
+    initializeMonthlyDonationState(RecurringInAppPaymentRepository)
+
+    networkDisposable += InternetConnectionObserver
+      .observe()
+      .distinctUntilChanged()
+      .subscribe { isConnected ->
+        if (isConnected) {
+          retryMonthlyDonationState()
+          retryOneTimeDonationState()
+        }
+      }
+  }
+
+  fun retryMonthlyDonationState() {
+    if (!monthlyDonationDisposables.isDisposed && store.state.monthlyDonationState.donationStage == DonateToSignalState.DonationStage.FAILURE) {
+      store.update { it.copy(monthlyDonationState = it.monthlyDonationState.copy(donationStage = DonateToSignalState.DonationStage.INIT)) }
+      initializeMonthlyDonationState(RecurringInAppPaymentRepository)
+    }
+  }
+
+  fun retryOneTimeDonationState() {
+    if (!oneTimeDonationDisposables.isDisposed && store.state.oneTimeDonationState.donationStage == DonateToSignalState.DonationStage.FAILURE) {
+      store.update { it.copy(oneTimeDonationState = it.oneTimeDonationState.copy(donationStage = DonateToSignalState.DonationStage.INIT)) }
+      initializeOneTimeDonationState(oneTimeInAppPaymentRepository)
+    }
+  }
+
+  fun requestChangeCurrency() {
+    val snapshot = store.state
+    if (snapshot.canSetCurrency) {
+      _actions.onNext(DonateToSignalAction.DisplayCurrencySelectionDialog(snapshot.inAppPaymentType, snapshot.selectableCurrencyCodes))
+    }
+  }
+
+  fun requestSelectGateway() {
+    val snapshot = store.state
+    if (snapshot.areFieldsEnabled) {
+      actionDisposable += createInAppPayment(snapshot).subscribeBy {
+        _actions.onNext(DonateToSignalAction.DisplayGatewaySelectorDialog(it))
+      }
+    }
+  }
+
+  fun updateSubscription() {
+    val snapshot = store.state
+    if (snapshot.areFieldsEnabled) {
+      actionDisposable += createInAppPayment(snapshot).subscribeBy {
+        _actions.onNext(DonateToSignalAction.UpdateSubscription(it, snapshot.isUpdateLongRunning))
+      }
+    }
+  }
+
+  fun cancelSubscription() {
+    val snapshot = store.state
+    if (snapshot.areFieldsEnabled) {
+      _actions.onNext(DonateToSignalAction.CancelSubscription)
+    }
+  }
+
+  fun toggleDonationType() {
+    store.update {
+      it.copy(
+        inAppPaymentType = when (it.inAppPaymentType) {
+          InAppPaymentType.ONE_TIME_DONATION -> InAppPaymentType.RECURRING_DONATION
+          InAppPaymentType.RECURRING_DONATION -> InAppPaymentType.ONE_TIME_DONATION
+          else -> error("Should never get here.")
+        }
+      )
+    }
+  }
+
+  fun setSelectedSubscription(subscription: Subscription) {
+    store.update { it.copy(monthlyDonationState = it.monthlyDonationState.copy(selectedSubscription = subscription)) }
+  }
+
+  fun setSelectedBoost(boost: Boost) {
+    store.update { it.copy(oneTimeDonationState = it.oneTimeDonationState.copy(selectedBoost = boost, isCustomAmountFocused = false)) }
+  }
+
+  fun setCustomAmountFocused() {
+    store.update { it.copy(oneTimeDonationState = it.oneTimeDonationState.copy(isCustomAmountFocused = true)) }
+  }
+
+  fun setCustomAmount(rawAmount: String) {
+    val amount = StringUtil.stripBidiIndicator(rawAmount)
+    val bigDecimalAmount: BigDecimal = if (amount.isEmpty() || amount == DecimalFormatSymbols.getInstance().decimalSeparator.toString()) {
+      BigDecimal.ZERO
+    } else {
+      val decimalFormat = DecimalFormat.getInstance() as DecimalFormat
+      decimalFormat.isParseBigDecimal = true
+
+      try {
+        decimalFormat.parse(amount) as BigDecimal
+      } catch (e: NumberFormatException) {
+        BigDecimal.ZERO
+      }
+    }
+
+    store.update { it.copy(oneTimeDonationState = it.oneTimeDonationState.copy(customAmount = FiatMoney(bigDecimalAmount, it.oneTimeDonationState.customAmount.currency))) }
+  }
+
+  fun getSelectedSubscriptionCost(): FiatMoney {
+    return store.state.monthlyDonationState.selectedSubscription!!.prices.first { it.currency == store.state.selectedCurrency }
+  }
+
+  fun refreshActiveSubscription() {
+    RecurringInAppPaymentRepository
+      .getActiveSubscription(InAppPaymentSubscriberRecord.Type.DONATION)
+      .subscribeBy(
+        onSuccess = {
+          _activeSubscription.onNext(it)
+        },
+        onError = {
+          _activeSubscription.onNext(ActiveSubscription.EMPTY)
+        }
+      )
+  }
+
+  private fun createInAppPayment(snapshot: DonateToSignalState): Single<InAppPaymentTable.InAppPayment> {
+    val amount = getAmount(snapshot)
+
+    return Single.fromCallable {
+      SignalDatabase.inAppPayments.clearCreated()
+      val id = SignalDatabase.inAppPayments.insert(
+        type = snapshot.inAppPaymentType,
+        state = InAppPaymentTable.State.CREATED,
+        subscriberId = null,
+        endOfPeriod = null,
+        inAppPaymentData = InAppPaymentData(
+          badge = snapshot.badge?.let { Badges.toDatabaseBadge(it) },
+          label = snapshot.badge?.description ?: "",
+          amount = amount.toFiatValue(),
+          level = snapshot.level.toLong(),
+          recipientId = Recipient.self().id.serialize(),
+          paymentMethodType = InAppPaymentData.PaymentMethodType.UNKNOWN,
+          redemption = InAppPaymentData.RedemptionState(
+            stage = InAppPaymentData.RedemptionState.Stage.INIT
+          )
+        )
+      )
+
+      _inAppPaymentId.onNext(id)
+      SignalDatabase.inAppPayments.getById(id)!!
+    }
+  }
+
+  private fun getAmount(snapshot: DonateToSignalState): FiatMoney {
+    return when (snapshot.inAppPaymentType) {
+      InAppPaymentType.ONE_TIME_DONATION -> getOneTimeAmount(snapshot.oneTimeDonationState)
+      InAppPaymentType.RECURRING_DONATION -> getSelectedSubscriptionCost()
+      else -> error("This ViewModel does not support ${snapshot.inAppPaymentType}.")
+    }
+  }
+
+  private fun getOneTimeAmount(snapshot: DonateToSignalState.OneTimeDonationState): FiatMoney {
+    return if (snapshot.isCustomAmountFocused) {
+      snapshot.customAmount
+    } else {
+      snapshot.selectedBoost!!.price
+    }
+  }
+
+  private fun initializeOneTimeDonationState(oneTimeInAppPaymentRepository: OneTimeInAppPaymentRepository) {
+    val oneTimeDonationFromJob: Observable<Optional<PendingOneTimeDonation>> = InAppPaymentsRepository.observeInAppPaymentRedemption(InAppPaymentType.ONE_TIME_DONATION).map {
+      when (it) {
+        is DonationRedemptionJobStatus.PendingExternalVerification -> Optional.ofNullable(it.pendingOneTimeDonation)
+
+        DonationRedemptionJobStatus.PendingReceiptRedemption,
+        DonationRedemptionJobStatus.PendingReceiptRequest,
+        DonationRedemptionJobStatus.FailedSubscription,
+        DonationRedemptionJobStatus.None -> Optional.empty()
+      }
+    }.distinctUntilChanged()
+
+    val oneTimeDonationFromStore: Observable<Optional<PendingOneTimeDonation>> = SignalStore.inAppPayments.observablePendingOneTimeDonation
+      .map { pending -> pending.filter { !it.isExpired } }
+      .distinctUntilChanged()
+
+    oneTimeDonationDisposables += Observable
+      .combineLatest(oneTimeDonationFromJob, oneTimeDonationFromStore) { job, store ->
+        if (store.isPresent) {
+          store
+        } else {
+          job
+        }
+      }
+      .subscribe { pendingOneTimeDonation: Optional<PendingOneTimeDonation> ->
+        store.update { it.copy(oneTimeDonationState = it.oneTimeDonationState.copy(pendingOneTimeDonation = pendingOneTimeDonation.orNull())) }
+      }
+
+    oneTimeDonationDisposables += oneTimeInAppPaymentRepository.getBoostBadge().subscribeBy(
+      onSuccess = { badge ->
+        store.update { it.copy(oneTimeDonationState = it.oneTimeDonationState.copy(badge = badge)) }
+      },
+      onError = {
+        Log.w(TAG, "Could not load boost badge", it)
+      }
+    )
+
+    oneTimeDonationDisposables += oneTimeInAppPaymentRepository.getMinimumDonationAmounts().subscribeBy(
+      onSuccess = { amountMap ->
+        store.update { it.copy(oneTimeDonationState = it.oneTimeDonationState.copy(minimumDonationAmounts = amountMap)) }
+      },
+      onError = {
+        Log.w(TAG, "Could not load minimum custom donation amounts.", it)
+      }
+    )
+
+    val boosts: Observable<Map<Currency, List<Boost>>> = oneTimeInAppPaymentRepository.getBoosts().toObservable()
+    val oneTimeCurrency: Observable<Currency> = SignalStore.inAppPayments.observableOneTimeCurrency
+
+    oneTimeDonationDisposables += Observable.combineLatest(boosts, oneTimeCurrency) { boostMap, currency ->
+      val boostList = if (currency in boostMap) {
+        boostMap[currency]!!
+      } else {
+        SignalStore.inAppPayments.setOneTimeCurrency(PlatformCurrencyUtil.USD)
+        listOf()
+      }
+
+      Triple(boostList, currency, boostMap.keys)
+    }.subscribeBy(
+      onNext = { (boostList, currency, availableCurrencies) ->
+        store.update { state ->
+          state.copy(
+            oneTimeDonationState = state.oneTimeDonationState.copy(
+              boosts = boostList,
+              selectedBoost = null,
+              selectedCurrency = currency,
+              donationStage = DonateToSignalState.DonationStage.READY,
+              selectableCurrencyCodes = availableCurrencies.map(Currency::getCurrencyCode),
+              isCustomAmountFocused = false,
+              customAmount = FiatMoney(
+                BigDecimal.ZERO,
+                currency
+              )
+            )
+          )
+        }
+      },
+      onError = {
+        Log.w(TAG, "Could not load boost information", it)
+        store.update { it.copy(oneTimeDonationState = it.oneTimeDonationState.copy(donationStage = DonateToSignalState.DonationStage.FAILURE)) }
+      }
+    )
+  }
+
+  private fun initializeMonthlyDonationState(subscriptionsRepository: RecurringInAppPaymentRepository) {
+    monitorLevelUpdateProcessing()
+
+    val allSubscriptions = subscriptionsRepository.getSubscriptions()
+    ensureValidSubscriptionCurrency(allSubscriptions)
+    monitorSubscriptionCurrency()
+    monitorSubscriptionState(allSubscriptions)
+    refreshActiveSubscription()
+  }
+
+  private fun monitorLevelUpdateProcessing() {
+    val redemptionJobStatus: Observable<DonationRedemptionJobStatus> = InAppPaymentsRepository.observeInAppPaymentRedemption(InAppPaymentType.RECURRING_DONATION)
+
+    monthlyDonationDisposables += Observable
+      .combineLatest(redemptionJobStatus, LevelUpdate.isProcessing, ::Pair)
+      .subscribeBy { (jobStatus, levelUpdateProcessing) ->
+        store.update { state ->
+          state.copy(
+            monthlyDonationState = state.monthlyDonationState.copy(
+              nonVerifiedMonthlyDonation = if (jobStatus is DonationRedemptionJobStatus.PendingExternalVerification) jobStatus.nonVerifiedMonthlyDonation else null,
+              transactionState = DonateToSignalState.TransactionState(jobStatus.isInProgress(), levelUpdateProcessing)
+            )
+          )
+        }
+      }
+  }
+
+  private fun monitorSubscriptionState(allSubscriptions: Single<List<Subscription>>) {
+    monthlyDonationDisposables += Observable.combineLatest(allSubscriptions.toObservable(), _activeSubscription, ::Pair).subscribeBy(
+      onNext = { (subs, active) ->
+        store.update { state ->
+          state.copy(
+            monthlyDonationState = state.monthlyDonationState.copy(
+              subscriptions = subs,
+              selectedSubscription = state.monthlyDonationState.selectedSubscription ?: resolveSelectedSubscription(active, subs),
+              _activeSubscription = active,
+              donationStage = DonateToSignalState.DonationStage.READY,
+              selectableCurrencyCodes = subs.firstOrNull()?.prices?.map { it.currency.currencyCode } ?: emptyList()
+            )
+          )
+        }
+      },
+      onError = {
+        store.update { state ->
+          state.copy(
+            monthlyDonationState = state.monthlyDonationState.copy(
+              donationStage = DonateToSignalState.DonationStage.FAILURE
+            )
+          )
+        }
+      }
+    )
+  }
+
+  private fun resolveSelectedSubscription(activeSubscription: ActiveSubscription, subscriptions: List<Subscription>): Subscription? {
+    return if (activeSubscription.isActive) {
+      subscriptions.firstOrNull { it.level == activeSubscription.activeSubscription.level }
+    } else {
+      subscriptions.firstOrNull()
+    }
+  }
+
+  private fun ensureValidSubscriptionCurrency(allSubscriptions: Single<List<Subscription>>) {
+    monthlyDonationDisposables += allSubscriptions.subscribeBy(
+      onSuccess = { subscriptions ->
+        if (subscriptions.isNotEmpty()) {
+          val priceCurrencies = subscriptions[0].prices.map { it.currency }
+          val selectedCurrency = SignalStore.inAppPayments.getSubscriptionCurrency(InAppPaymentSubscriberRecord.Type.DONATION)
+
+          if (selectedCurrency !in priceCurrencies) {
+            Log.w(TAG, "Unsupported currency selection. Defaulting to USD. $selectedCurrency isn't supported.")
+            val usd = PlatformCurrencyUtil.USD
+            val newSubscriber = InAppPaymentsRepository.getSubscriber(usd, InAppPaymentSubscriberRecord.Type.DONATION) ?: InAppPaymentSubscriberRecord(SubscriberId.generate(), usd, InAppPaymentSubscriberRecord.Type.DONATION, false, InAppPaymentData.PaymentMethodType.UNKNOWN)
+            InAppPaymentsRepository.setSubscriber(newSubscriber)
+            RecurringInAppPaymentRepository.syncAccountRecord().subscribe()
+          }
+        }
+      },
+      onError = {}
+    )
+  }
+
+  private fun monitorSubscriptionCurrency() {
+    monthlyDonationDisposables += SignalStore.inAppPayments.observableRecurringDonationCurrency.subscribe {
+      store.update { state ->
+        state.copy(monthlyDonationState = state.monthlyDonationState.copy(selectedCurrency = it))
+      }
+    }
+  }
+
+  override fun onCleared() {
+    super.onCleared()
+    oneTimeDonationDisposables.clear()
+    monthlyDonationDisposables.clear()
+    networkDisposable.clear()
+    actionDisposable.clear()
+    store.dispose()
+  }
+
+  class Factory(
+    private val startType: InAppPaymentType,
+    private val oneTimeInAppPaymentRepository: OneTimeInAppPaymentRepository = OneTimeInAppPaymentRepository(AppDependencies.donationsService)
+  ) : ViewModelProvider.Factory {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+      return modelClass.cast(DonateToSignalViewModel(startType, oneTimeInAppPaymentRepository)) as T
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationCheckoutViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationCheckoutViewModel.kt
new file mode 100644
index 0000000000..6a9314ef05
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationCheckoutViewModel.kt
@@ -0,0 +1,30 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+import androidx.lifecycle.ViewModel
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.whispersystems.signalservice.api.util.Preconditions
+
+/**
+ * State holder for the checkout flow when utilizing Google Pay.
+ */
+class DonationCheckoutViewModel : ViewModel() {
+
+  companion object {
+    private val TAG = Log.tag(DonationCheckoutViewModel::class.java)
+  }
+
+  private var inAppPayment: InAppPaymentTable.InAppPayment? = null
+
+  fun provideGatewayRequestForGooglePay(inAppPayment: InAppPaymentTable.InAppPayment) {
+    Log.d(TAG, "Provided with a gateway request.")
+    Preconditions.checkState(this.inAppPayment == null)
+    this.inAppPayment = inAppPayment
+  }
+
+  fun consumeGatewayRequestForGooglePay(): InAppPaymentTable.InAppPayment? {
+    val request = inAppPayment
+    inAppPayment = null
+    return request
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationPillToggle.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationPillToggle.kt
new file mode 100644
index 0000000000..dda417756c
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationPillToggle.kt
@@ -0,0 +1,53 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+import com.google.android.material.button.MaterialButton
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.databinding.DonationPillToggleBinding
+import org.thoughtcrime.securesms.util.adapter.mapping.BindingFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.BindingViewHolder
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
+
+object DonationPillToggle {
+
+  fun register(mappingAdapter: MappingAdapter) {
+    mappingAdapter.registerFactory(Model::class.java, BindingFactory(::ViewHolder, DonationPillToggleBinding::inflate))
+  }
+
+  class Model(
+    val selected: InAppPaymentType,
+    val onClick: () -> Unit
+  ) : MappingModel<Model> {
+    override fun areItemsTheSame(newItem: Model): Boolean = true
+
+    override fun areContentsTheSame(newItem: Model): Boolean {
+      return selected == newItem.selected
+    }
+  }
+
+  private class ViewHolder(binding: DonationPillToggleBinding) : BindingViewHolder<Model, DonationPillToggleBinding>(binding) {
+    override fun bind(model: Model) {
+      when (model.selected) {
+        InAppPaymentType.ONE_TIME_DONATION -> {
+          presentButtons(model, binding.oneTime, binding.monthly)
+        }
+        InAppPaymentType.RECURRING_DONATION -> {
+          presentButtons(model, binding.monthly, binding.oneTime)
+        }
+        else -> {
+          error("Unsupported donation type.")
+        }
+      }
+    }
+
+    private fun presentButtons(model: Model, selected: MaterialButton, notSelected: MaterialButton) {
+      selected.setOnClickListener(null)
+      notSelected.setOnClickListener { model.onClick() }
+      selected.isSelected = true
+      notSelected.isSelected = false
+      selected.setIconResource(R.drawable.ic_check_24)
+      notSelected.icon = null
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationWebViewOnBackPressedCallback.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationWebViewOnBackPressedCallback.kt
new file mode 100644
index 0000000000..0128cdc8ed
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationWebViewOnBackPressedCallback.kt
@@ -0,0 +1,20 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+import android.webkit.WebView
+import androidx.activity.OnBackPressedCallback
+
+/**
+ * Utilized in the 3DS and PayPal WebView fragments to handle WebView back navigation.
+ */
+class DonationWebViewOnBackPressedCallback(
+  private val dismissAllowingStateLoss: () -> Unit,
+  private val webView: WebView
+) : OnBackPressedCallback(true) {
+  override fun handleOnBackPressed() {
+    if (webView.canGoBack()) {
+      webView.goBack()
+    } else {
+      dismissAllowingStateLoss()
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/InAppPaymentCheckoutDelegate.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/InAppPaymentCheckoutDelegate.kt
new file mode 100644
index 0000000000..8cb92d5837
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/InAppPaymentCheckoutDelegate.kt
@@ -0,0 +1,375 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+import android.content.Context
+import android.content.DialogInterface
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.setFragmentResultListener
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.navGraphViewModels
+import com.google.android.gms.wallet.PaymentData
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.kotlin.subscribeBy
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.util.concurrent.LifecycleDisposable
+import org.signal.core.util.getParcelableCompat
+import org.signal.core.util.logging.Log
+import org.signal.donations.GooglePayApi
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatMoney
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppDonations
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentComponent
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toPaymentSourceType
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.card.CreditCardFragment
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.paypal.PayPalPaymentInProgressFragment
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.StripePaymentInProgressFragment
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.StripePaymentInProgressViewModel
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.BankTransferRequestKeys
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorDialogs
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorParams
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.util.fragments.requireListener
+
+/**
+ * Abstracts out some common UI-level interactions between gift flow and normal donate flow.
+ */
+class InAppPaymentCheckoutDelegate(
+  private val fragment: Fragment,
+  private val callback: Callback,
+  inAppPaymentIdSource: Flowable<InAppPaymentTable.InAppPaymentId>
+) : DefaultLifecycleObserver {
+
+  companion object {
+    private val TAG = Log.tag(InAppPaymentCheckoutDelegate::class.java)
+  }
+
+  private val inAppPaymentComponent: InAppPaymentComponent by lazy { fragment.requireListener() }
+  private val disposables = LifecycleDisposable()
+  private val viewModel: DonationCheckoutViewModel by fragment.viewModels()
+
+  private val stripePaymentViewModel: StripePaymentInProgressViewModel by fragment.navGraphViewModels(
+    R.id.checkout_flow,
+    factoryProducer = {
+      StripePaymentInProgressViewModel.Factory(inAppPaymentComponent.stripeRepository)
+    }
+  )
+
+  init {
+    fragment.viewLifecycleOwner.lifecycle.addObserver(this)
+    ErrorHandler().attach(fragment, callback, inAppPaymentIdSource)
+  }
+
+  override fun onCreate(owner: LifecycleOwner) {
+    disposables.bindTo(fragment.viewLifecycleOwner)
+    registerGooglePayCallback()
+
+    fragment.setFragmentResultListener(StripePaymentInProgressFragment.REQUEST_KEY) { _, bundle ->
+      val result: InAppPaymentProcessorActionResult = bundle.getParcelableCompat(StripePaymentInProgressFragment.REQUEST_KEY, InAppPaymentProcessorActionResult::class.java)!!
+      handleDonationProcessorActionResult(result)
+    }
+
+    fragment.setFragmentResultListener(CreditCardFragment.REQUEST_KEY) { _, bundle ->
+      val result: InAppPaymentProcessorActionResult = bundle.getParcelableCompat(StripePaymentInProgressFragment.REQUEST_KEY, InAppPaymentProcessorActionResult::class.java)!!
+      handleDonationProcessorActionResult(result)
+    }
+
+    fragment.setFragmentResultListener(BankTransferRequestKeys.REQUEST_KEY) { _, bundle ->
+      val result: InAppPaymentProcessorActionResult = bundle.getParcelableCompat(StripePaymentInProgressFragment.REQUEST_KEY, InAppPaymentProcessorActionResult::class.java)!!
+      handleDonationProcessorActionResult(result)
+    }
+
+    fragment.setFragmentResultListener(BankTransferRequestKeys.PENDING_KEY) { _, bundle ->
+      val request: InAppPaymentTable.InAppPayment = bundle.getParcelableCompat(BankTransferRequestKeys.PENDING_KEY, InAppPaymentTable.InAppPayment::class.java)!!
+      callback.navigateToDonationPending(inAppPayment = request)
+    }
+
+    fragment.setFragmentResultListener(PayPalPaymentInProgressFragment.REQUEST_KEY) { _, bundle ->
+      val result: InAppPaymentProcessorActionResult = bundle.getParcelableCompat(PayPalPaymentInProgressFragment.REQUEST_KEY, InAppPaymentProcessorActionResult::class.java)!!
+      handleDonationProcessorActionResult(result)
+    }
+  }
+
+  fun handleGatewaySelectionResponse(inAppPayment: InAppPaymentTable.InAppPayment) {
+    if (InAppDonations.isPaymentSourceAvailable(inAppPayment.data.paymentMethodType.toPaymentSourceType(), inAppPayment.type)) {
+      when (inAppPayment.data.paymentMethodType) {
+        InAppPaymentData.PaymentMethodType.GOOGLE_PAY -> launchGooglePay(inAppPayment)
+        InAppPaymentData.PaymentMethodType.PAYPAL -> launchPayPal(inAppPayment)
+        InAppPaymentData.PaymentMethodType.CARD -> launchCreditCard(inAppPayment)
+        InAppPaymentData.PaymentMethodType.SEPA_DEBIT -> launchBankTransfer(inAppPayment)
+        InAppPaymentData.PaymentMethodType.IDEAL -> launchBankTransfer(inAppPayment)
+        else -> error("Unsupported payment method type")
+      }
+    } else {
+      error("Unsupported combination! ${inAppPayment.data.paymentMethodType} ${inAppPayment.type}")
+    }
+  }
+
+  private fun handleDonationProcessorActionResult(result: InAppPaymentProcessorActionResult) {
+    when (result.status) {
+      InAppPaymentProcessorActionResult.Status.SUCCESS -> handleSuccessfulDonationProcessorActionResult(result)
+      InAppPaymentProcessorActionResult.Status.FAILURE -> handleFailedDonationProcessorActionResult(result)
+    }
+
+    callback.onProcessorActionProcessed()
+  }
+
+  private fun handleSuccessfulDonationProcessorActionResult(result: InAppPaymentProcessorActionResult) {
+    if (result.action == InAppPaymentProcessorAction.CANCEL_SUBSCRIPTION) {
+      callback.onSubscriptionCancelled(result.inAppPaymentType)
+    } else {
+      callback.onPaymentComplete(result.inAppPayment!!)
+    }
+  }
+
+  private fun handleFailedDonationProcessorActionResult(result: InAppPaymentProcessorActionResult) {
+    if (result.action == InAppPaymentProcessorAction.CANCEL_SUBSCRIPTION) {
+      MaterialAlertDialogBuilder(fragment.requireContext())
+        .setTitle(R.string.DonationsErrors__failed_to_cancel_subscription)
+        .setMessage(R.string.DonationsErrors__subscription_cancellation_requires_an_internet_connection)
+        .setPositiveButton(android.R.string.ok) { _, _ ->
+          fragment.findNavController().popBackStack(R.id.checkout_flow, true)
+        }
+        .show()
+    } else {
+      Log.w(TAG, "Processor action failed: ${result.action}")
+    }
+  }
+
+  private fun launchPayPal(inAppPayment: InAppPaymentTable.InAppPayment) {
+    callback.navigateToPayPalPaymentInProgress(inAppPayment)
+  }
+
+  private fun launchGooglePay(inAppPayment: InAppPaymentTable.InAppPayment) {
+    viewModel.provideGatewayRequestForGooglePay(inAppPayment)
+    inAppPaymentComponent.stripeRepository.requestTokenFromGooglePay(
+      price = inAppPayment.data.amount!!.toFiatMoney(),
+      label = inAppPayment.data.label,
+      requestCode = InAppPaymentsRepository.getGooglePayRequestCode(inAppPayment.type)
+    )
+  }
+
+  private fun launchCreditCard(inAppPayment: InAppPaymentTable.InAppPayment) {
+    callback.navigateToCreditCardForm(inAppPayment)
+  }
+
+  private fun launchBankTransfer(inAppPayment: InAppPaymentTable.InAppPayment) {
+    if (!inAppPayment.type.recurring && inAppPayment.data.paymentMethodType == InAppPaymentData.PaymentMethodType.IDEAL) {
+      callback.navigateToIdealDetailsFragment(inAppPayment)
+    } else {
+      callback.navigateToBankTransferMandate(inAppPayment)
+    }
+  }
+
+  private fun registerGooglePayCallback() {
+    disposables += inAppPaymentComponent.googlePayResultPublisher.subscribeBy(
+      onNext = { paymentResult ->
+        viewModel.consumeGatewayRequestForGooglePay()?.let {
+          inAppPaymentComponent.stripeRepository.onActivityResult(
+            paymentResult.requestCode,
+            paymentResult.resultCode,
+            paymentResult.data,
+            paymentResult.requestCode,
+            GooglePayRequestCallback(it)
+          )
+        }
+      }
+    )
+  }
+
+  inner class GooglePayRequestCallback(private val inAppPayment: InAppPaymentTable.InAppPayment) : GooglePayApi.PaymentRequestCallback {
+    override fun onSuccess(paymentData: PaymentData) {
+      Log.d(TAG, "Successfully retrieved payment data from Google Pay", true)
+      stripePaymentViewModel.providePaymentData(paymentData)
+      callback.navigateToStripePaymentInProgress(inAppPayment)
+    }
+
+    override fun onError(googlePayException: GooglePayApi.GooglePayException) {
+      Log.w(TAG, "Failed to retrieve payment data from Google Pay", googlePayException, true)
+
+      InAppPaymentsRepository.updateInAppPayment(
+        inAppPayment.copy(
+          notified = false,
+          data = inAppPayment.data.copy(
+            error = InAppPaymentData.Error(
+              type = InAppPaymentData.Error.Type.GOOGLE_PAY_REQUEST_TOKEN
+            )
+          )
+        )
+      ).subscribe()
+    }
+
+    override fun onCancelled() {
+      Log.d(TAG, "Cancelled Google Pay.", true)
+    }
+  }
+
+  /**
+   * Shared logic for handling checkout errors.
+   */
+  class ErrorHandler : DefaultLifecycleObserver {
+
+    private var fragment: Fragment? = null
+    private var errorDialog: DialogInterface? = null
+    private var errorHandlerCallback: ErrorHandlerCallback? = null
+
+    fun attach(
+      fragment: Fragment,
+      errorHandlerCallback: ErrorHandlerCallback?,
+      inAppPaymentId: InAppPaymentTable.InAppPaymentId
+    ) {
+      attach(fragment, errorHandlerCallback, Flowable.just(inAppPaymentId))
+    }
+
+    fun attach(
+      fragment: Fragment,
+      errorHandlerCallback: ErrorHandlerCallback?,
+      inAppPaymentIdSource: Flowable<InAppPaymentTable.InAppPaymentId>
+    ) {
+      this.fragment = fragment
+      this.errorHandlerCallback = errorHandlerCallback
+
+      val disposables = LifecycleDisposable()
+      fragment.viewLifecycleOwner.lifecycle.addObserver(this)
+
+      disposables.bindTo(fragment.viewLifecycleOwner)
+      disposables += inAppPaymentIdSource
+        .switchMap { filterUnnotifiedErrors(it) }
+        .doOnNext {
+          SignalDatabase.inAppPayments.update(it.copy(notified = true))
+        }
+        .subscribeOn(Schedulers.io())
+        .observeOn(AndroidSchedulers.mainThread())
+        .subscribeBy {
+          showErrorDialog(it)
+        }
+
+      disposables += inAppPaymentIdSource
+        .switchMap { InAppPaymentsRepository.observeTemporaryErrors(it) }
+        .onBackpressureLatest()
+        .concatMapSingle { (id, err) -> Single.fromCallable { SignalDatabase.inAppPayments.getById(id)!! to err } }
+        .subscribeOn(Schedulers.io())
+        .observeOn(AndroidSchedulers.mainThread())
+        .subscribeBy { (inAppPayment, error) ->
+          handleTemporaryError(inAppPayment, error)
+        }
+    }
+
+    override fun onDestroy(owner: LifecycleOwner) {
+      errorDialog?.dismiss()
+      fragment = null
+      errorHandlerCallback = null
+    }
+
+    private fun filterUnnotifiedErrors(inAppPaymentId: InAppPaymentTable.InAppPaymentId): Flowable<InAppPaymentTable.InAppPayment> {
+      return InAppPaymentsRepository.observeUpdates(inAppPaymentId)
+        .subscribeOn(Schedulers.io())
+        .filter {
+          !it.notified && it.data.error != null
+        }
+    }
+
+    private fun handleTemporaryError(inAppPayment: InAppPaymentTable.InAppPayment, throwable: Throwable) {
+      when (throwable) {
+        is DonationError.UserCancelledPaymentError -> {
+          Log.d(TAG, "User cancelled out of payment flow.", true)
+        }
+        is DonationError.BadgeRedemptionError.DonationPending -> {
+          Log.d(TAG, "User launched an external application.", true)
+          errorHandlerCallback?.onUserLaunchedAnExternalApplication()
+        }
+        is DonationError.UserLaunchedExternalApplication -> {
+          Log.d(TAG, "Long-running donation is still pending.", true)
+          errorHandlerCallback?.navigateToDonationPending(inAppPayment)
+        }
+        else -> {
+          Log.d(TAG, "Displaying donation error dialog.", true)
+          errorDialog = DonationErrorDialogs.show(
+            fragment!!.requireContext(),
+            throwable,
+            DialogHandler()
+          )
+        }
+      }
+    }
+
+    private fun showErrorDialog(inAppPayment: InAppPaymentTable.InAppPayment) {
+      if (errorDialog != null) {
+        Log.d(TAG, "Already displaying an error dialog. Skipping. ${inAppPayment.data.error}", true)
+        return
+      }
+
+      val error = inAppPayment.data.error
+      if (error == null) {
+        Log.d(TAG, "InAppPayment does not contain an error. Skipping.", true)
+        return
+      }
+
+      when (error.type) {
+        else -> {
+          Log.d(TAG, "Displaying donation error dialog.", true)
+          errorDialog = DonationErrorDialogs.show(
+            fragment!!.requireContext(),
+            inAppPayment,
+            DialogHandler()
+          )
+        }
+      }
+    }
+
+    private inner class DialogHandler : DonationErrorDialogs.DialogCallback() {
+      var tryAgain = false
+
+      override fun onTryCreditCardAgain(context: Context): DonationErrorParams.ErrorAction<Unit> {
+        return DonationErrorParams.ErrorAction(
+          label = R.string.DeclineCode__try,
+          action = {
+            tryAgain = true
+          }
+        )
+      }
+
+      override fun onTryBankTransferAgain(context: Context): DonationErrorParams.ErrorAction<Unit> {
+        return DonationErrorParams.ErrorAction(
+          label = R.string.DeclineCode__try,
+          action = {
+            tryAgain = true
+          }
+        )
+      }
+
+      override fun onDialogDismissed() {
+        errorDialog = null
+        if (!tryAgain) {
+          tryAgain = false
+          fragment?.findNavController()?.popBackStack(R.id.checkout_flow, true)
+        }
+      }
+    }
+  }
+
+  interface ErrorHandlerCallback {
+    fun onUserLaunchedAnExternalApplication()
+    fun navigateToDonationPending(inAppPayment: InAppPaymentTable.InAppPayment)
+  }
+
+  interface Callback : ErrorHandlerCallback {
+    fun navigateToStripePaymentInProgress(inAppPayment: InAppPaymentTable.InAppPayment)
+    fun navigateToPayPalPaymentInProgress(inAppPayment: InAppPaymentTable.InAppPayment)
+    fun navigateToCreditCardForm(inAppPayment: InAppPaymentTable.InAppPayment)
+    fun navigateToIdealDetailsFragment(inAppPayment: InAppPaymentTable.InAppPayment)
+    fun navigateToBankTransferMandate(inAppPayment: InAppPaymentTable.InAppPayment)
+    fun onPaymentComplete(inAppPayment: InAppPaymentTable.InAppPayment)
+    fun onSubscriptionCancelled(inAppPaymentType: InAppPaymentType)
+    fun onProcessorActionProcessed()
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/InAppPaymentError.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/InAppPaymentError.kt
new file mode 100644
index 0000000000..302269f2c3
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/InAppPaymentError.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+
+/**
+ * Wraps an InAppPaymentData.Error in a throwable.
+ */
+class InAppPaymentError(
+  val inAppPaymentDataError: InAppPaymentData.Error
+) : Exception() {
+  companion object {
+    fun fromDonationError(donationError: DonationError): InAppPaymentError? {
+      val inAppPaymentDataError: InAppPaymentData.Error? = when (donationError) {
+        is DonationError.BadgeRedemptionError.DonationPending -> null
+        is DonationError.BadgeRedemptionError.FailedToValidateCredentialError -> InAppPaymentData.Error(type = InAppPaymentData.Error.Type.CREDENTIAL_VALIDATION)
+        is DonationError.BadgeRedemptionError.GenericError -> InAppPaymentData.Error(type = InAppPaymentData.Error.Type.REDEMPTION)
+        is DonationError.BadgeRedemptionError.TimeoutWaitingForTokenError -> null
+        is DonationError.PaymentProcessingError.GenericError -> InAppPaymentData.Error(type = InAppPaymentData.Error.Type.PAYMENT_PROCESSING)
+        DonationError.GiftRecipientVerificationError.SelectedRecipientIsInvalid -> InAppPaymentData.Error(type = InAppPaymentData.Error.Type.INVALID_GIFT_RECIPIENT)
+        is DonationError.GooglePayError.RequestTokenError -> InAppPaymentData.Error(type = InAppPaymentData.Error.Type.GOOGLE_PAY_REQUEST_TOKEN)
+        is DonationError.OneTimeDonationError.AmountTooLargeError -> InAppPaymentData.Error(type = InAppPaymentData.Error.Type.ONE_TIME_AMOUNT_TOO_LARGE)
+        is DonationError.OneTimeDonationError.AmountTooSmallError -> InAppPaymentData.Error(type = InAppPaymentData.Error.Type.ONE_TIME_AMOUNT_TOO_SMALL)
+        is DonationError.OneTimeDonationError.InvalidCurrencyError -> InAppPaymentData.Error(type = InAppPaymentData.Error.Type.INVALID_CURRENCY)
+        is DonationError.PaymentSetupError.GenericError -> InAppPaymentData.Error(type = InAppPaymentData.Error.Type.PAYMENT_SETUP)
+        is DonationError.PaymentSetupError.PayPalCodedError -> InAppPaymentData.Error(type = InAppPaymentData.Error.Type.PAYPAL_CODED_ERROR, data_ = donationError.errorCode.toString())
+        is DonationError.PaymentSetupError.PayPalDeclinedError -> InAppPaymentData.Error(type = InAppPaymentData.Error.Type.PAYPAL_DECLINED_ERROR, data_ = donationError.code.code.toString())
+        is DonationError.PaymentSetupError.StripeCodedError -> InAppPaymentData.Error(type = InAppPaymentData.Error.Type.STRIPE_CODED_ERROR, data_ = donationError.errorCode)
+        is DonationError.PaymentSetupError.StripeDeclinedError -> InAppPaymentData.Error(type = InAppPaymentData.Error.Type.STRIPE_DECLINED_ERROR, data_ = donationError.declineCode.rawCode)
+        is DonationError.PaymentSetupError.StripeFailureCodeError -> InAppPaymentData.Error(type = InAppPaymentData.Error.Type.STRIPE_FAILURE, data_ = donationError.failureCode.rawCode)
+        is DonationError.UserCancelledPaymentError -> null
+        is DonationError.UserLaunchedExternalApplication -> null
+      }
+
+      return inAppPaymentDataError?.let { InAppPaymentError(it) }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/InAppPaymentProcessorAction.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/InAppPaymentProcessorAction.kt
new file mode 100644
index 0000000000..c1b73268bf
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/InAppPaymentProcessorAction.kt
@@ -0,0 +1,11 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+enum class InAppPaymentProcessorAction : Parcelable {
+  PROCESS_NEW_IN_APP_PAYMENT,
+  UPDATE_SUBSCRIPTION,
+  CANCEL_SUBSCRIPTION
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/InAppPaymentProcessorActionResult.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/InAppPaymentProcessorActionResult.kt
new file mode 100644
index 0000000000..1033041fcd
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/InAppPaymentProcessorActionResult.kt
@@ -0,0 +1,19 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+
+@Parcelize
+class InAppPaymentProcessorActionResult(
+  val action: InAppPaymentProcessorAction,
+  val inAppPayment: InAppPaymentTable.InAppPayment?,
+  val inAppPaymentType: InAppPaymentType,
+  val status: Status
+) : Parcelable {
+  enum class Status {
+    SUCCESS,
+    FAILURE
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/InAppPaymentProcessorStage.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/InAppPaymentProcessorStage.kt
new file mode 100644
index 0000000000..aab69d183e
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/InAppPaymentProcessorStage.kt
@@ -0,0 +1,12 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+enum class InAppPaymentProcessorStage {
+  INIT,
+  PAYMENT_PIPELINE,
+  CANCELLING,
+  FAILED,
+  COMPLETE;
+
+  val isInProgress: Boolean get() = this == PAYMENT_PIPELINE || this == CANCELLING
+  val isTerminal: Boolean get() = this == FAILED || this == COMPLETE
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardCodeValidator.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardCodeValidator.kt
new file mode 100644
index 0000000000..37344df7ea
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardCodeValidator.kt
@@ -0,0 +1,31 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import androidx.core.text.isDigitsOnly
+
+object CreditCardCodeValidator {
+
+  fun getValidity(code: String, cardType: CreditCardType, isFocused: Boolean): Validity {
+    val validLength = if (cardType == CreditCardType.AMERICAN_EXPRESS) {
+      4
+    } else {
+      3
+    }
+
+    return when {
+      !code.isDigitsOnly() -> Validity.INVALID_CHARACTERS
+      code.length > validLength -> Validity.TOO_LONG
+      code.length < validLength && isFocused -> Validity.POTENTIALLY_VALID
+      code.isEmpty() -> Validity.POTENTIALLY_VALID
+      code.length < validLength -> Validity.TOO_SHORT
+      else -> Validity.FULLY_VALID
+    }
+  }
+
+  enum class Validity {
+    TOO_LONG,
+    TOO_SHORT,
+    INVALID_CHARACTERS,
+    POTENTIALLY_VALID,
+    FULLY_VALID
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardExpiration.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardExpiration.kt
new file mode 100644
index 0000000000..e7c74f04a4
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardExpiration.kt
@@ -0,0 +1,21 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+data class CreditCardExpiration(
+  val month: String = "",
+  val year: String = ""
+) {
+
+  fun isEmpty(): Boolean {
+    return month.isEmpty() && year.isEmpty()
+  }
+
+  companion object {
+    fun fromInput(expiration: String): CreditCardExpiration {
+      val expirationParts = expiration.split("/", limit = 2)
+      val month = expirationParts.first()
+      val year = expirationParts.drop(1).firstOrNull() ?: ""
+
+      return CreditCardExpiration(month, year)
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardExpirationTextWatcher.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardExpirationTextWatcher.kt
new file mode 100644
index 0000000000..27395f3feb
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardExpirationTextWatcher.kt
@@ -0,0 +1,52 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import android.text.Editable
+import android.text.TextWatcher
+
+class CreditCardExpirationTextWatcher : TextWatcher {
+
+  private var isBackspace = false
+
+  override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit
+
+  override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+    isBackspace = count == 0
+  }
+
+  override fun afterTextChanged(s: Editable) {
+    val text = s.toString()
+    val formattedText = when (text.length) {
+      1 -> formatForSingleCharacter(text)
+      2 -> formatForTwoCharacters(text)
+      else -> text
+    }
+
+    val finalText = if (isBackspace && text.length < formattedText.length && formattedText.endsWith("/")) {
+      formattedText.dropLast(2)
+    } else {
+      formattedText
+    }
+
+    if (finalText != text) {
+      s.replace(0, s.length, finalText)
+    }
+  }
+
+  private fun formatForSingleCharacter(text: String): String {
+    val number = text.toIntOrNull() ?: return text
+    return if (number > 1) {
+      "0$number/"
+    } else {
+      text
+    }
+  }
+
+  private fun formatForTwoCharacters(text: String): String {
+    val number = text.toIntOrNull() ?: return text
+    return if (number <= 12) {
+      "%02d/".format(number)
+    } else {
+      text
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardExpirationValidator.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardExpirationValidator.kt
new file mode 100644
index 0000000000..b1a559837f
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardExpirationValidator.kt
@@ -0,0 +1,98 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import androidx.core.text.isDigitsOnly
+
+object CreditCardExpirationValidator {
+
+  fun getValidity(creditCardExpiration: CreditCardExpiration, currentMonth: Int, currentYear: Int, isFocused: Boolean): Validity {
+    if (creditCardExpiration.isEmpty()) {
+      return Validity.POTENTIALLY_VALID
+    }
+
+    val monthValidity = isExpirationMonthValid(creditCardExpiration.month, isFocused)
+    val yearValidity = isExpirationYearValid(creditCardExpiration.year, isFocused)
+
+    if (monthValidity.isInvalid) {
+      return monthValidity
+    }
+
+    if (yearValidity.isInvalid) {
+      return yearValidity
+    }
+
+    if (Validity.POTENTIALLY_VALID in listOf(monthValidity, yearValidity)) {
+      return Validity.POTENTIALLY_VALID
+    }
+
+    val inputMonthInt = creditCardExpiration.month.toInt()
+    val inputYearIntTwoDigits = creditCardExpiration.year.toInt()
+    val century = currentYear.floorDiv(100) * 100
+    var inputYearInt = inputYearIntTwoDigits + century
+    if (inputYearInt < currentYear) {
+      // This is for edge-of-century scenarios. If the year is 2099 and the user inputs '01' for the year, this lets us interpret that as 2101.
+      inputYearInt += 100
+    }
+
+    return if (inputYearInt == currentYear) {
+      if (inputMonthInt < currentMonth) {
+        Validity.INVALID_EXPIRED
+      } else {
+        Validity.FULLY_VALID
+      }
+    } else {
+      if (inputYearInt > currentYear + 20) {
+        Validity.INVALID_EXPIRED
+      } else {
+        Validity.FULLY_VALID
+      }
+    }
+  }
+
+  private fun isExpirationMonthValid(inputMonth: String, isFocused: Boolean): Validity {
+    if (inputMonth.length > 2 || !inputMonth.isDigitsOnly()) {
+      return Validity.INVALID_MONTH
+    }
+
+    if (inputMonth in listOf("", "0")) {
+      return if (isFocused) {
+        Validity.POTENTIALLY_VALID
+      } else {
+        Validity.INVALID_MONTH
+      }
+    }
+
+    val month = inputMonth.toInt()
+    if (month in 1..12) {
+      return Validity.FULLY_VALID
+    }
+
+    return Validity.INVALID_MONTH
+  }
+
+  private fun isExpirationYearValid(inputYear: String, isFocused: Boolean): Validity {
+    if (inputYear.length > 2 || !inputYear.isDigitsOnly()) {
+      return Validity.INVALID_YEAR
+    }
+
+    if (inputYear.length < 2) {
+      return if (isFocused) {
+        Validity.POTENTIALLY_VALID
+      } else if (inputYear.isEmpty()) {
+        Validity.INVALID_MISSING_YEAR
+      } else {
+        Validity.INVALID_YEAR
+      }
+    }
+
+    return Validity.FULLY_VALID
+  }
+
+  enum class Validity(val isInvalid: Boolean) {
+    INVALID_EXPIRED(true),
+    INVALID_MISSING_YEAR(true),
+    INVALID_MONTH(true),
+    INVALID_YEAR(true),
+    POTENTIALLY_VALID(false),
+    FULLY_VALID(false)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardFormState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardFormState.kt
new file mode 100644
index 0000000000..1970ae3479
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardFormState.kt
@@ -0,0 +1,26 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import org.signal.donations.StripeApi
+
+data class CreditCardFormState(
+  val focusedField: FocusedField = FocusedField.NONE,
+  val number: String = "",
+  val expiration: CreditCardExpiration = CreditCardExpiration(),
+  val code: String = ""
+) {
+  enum class FocusedField {
+    NONE,
+    NUMBER,
+    EXPIRATION,
+    CODE
+  }
+
+  fun toCardData(): StripeApi.CardData {
+    return StripeApi.CardData(
+      number,
+      expiration.month.toInt(),
+      expiration.year.toInt(),
+      code
+    )
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardFragment.kt
new file mode 100644
index 0000000000..dfd6fe358e
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardFragment.kt
@@ -0,0 +1,213 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import android.content.Context
+import android.os.Bundle
+import android.view.View
+import android.view.inputmethod.EditorInfo
+import androidx.annotation.StringRes
+import androidx.core.content.ContextCompat
+import androidx.core.widget.addTextChangedListener
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.setFragmentResult
+import androidx.fragment.app.setFragmentResultListener
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
+import androidx.navigation.navGraphViewModels
+import org.signal.core.util.concurrent.LifecycleDisposable
+import org.signal.core.util.getParcelableCompat
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.TemporaryScreenshotSecurity
+import org.thoughtcrime.securesms.components.ViewBinderDelegate
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatMoney
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentComponent
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentCheckoutDelegate
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentProcessorAction
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentProcessorActionResult
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.StripePaymentInProgressFragment
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.StripePaymentInProgressViewModel
+import org.thoughtcrime.securesms.databinding.CreditCardFragmentBinding
+import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import org.thoughtcrime.securesms.util.ViewUtil
+import org.thoughtcrime.securesms.util.fragments.requireListener
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
+
+class CreditCardFragment : Fragment(R.layout.credit_card_fragment) {
+
+  private val binding by ViewBinderDelegate(CreditCardFragmentBinding::bind)
+  private val args: CreditCardFragmentArgs by navArgs()
+  private val viewModel: CreditCardViewModel by viewModels()
+  private val lifecycleDisposable = LifecycleDisposable()
+  private val stripePaymentViewModel: StripePaymentInProgressViewModel by navGraphViewModels(
+    R.id.checkout_flow,
+    factoryProducer = {
+      StripePaymentInProgressViewModel.Factory(requireListener<InAppPaymentComponent>().stripeRepository)
+    }
+  )
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    TemporaryScreenshotSecurity.bindToViewLifecycleOwner(this)
+    InAppPaymentCheckoutDelegate.ErrorHandler().attach(this, null, args.inAppPayment.id)
+
+    setFragmentResultListener(StripePaymentInProgressFragment.REQUEST_KEY) { _, bundle ->
+      val result: InAppPaymentProcessorActionResult = bundle.getParcelableCompat(StripePaymentInProgressFragment.REQUEST_KEY, InAppPaymentProcessorActionResult::class.java)!!
+      if (result.status == InAppPaymentProcessorActionResult.Status.SUCCESS) {
+        findNavController().popBackStack()
+        setFragmentResult(REQUEST_KEY, bundle)
+      }
+    }
+
+    // TODO [message-backups] Copy for this button in backups checkout flow.
+    binding.continueButton.text = if (args.inAppPayment.type == InAppPaymentType.RECURRING_DONATION) {
+      getString(
+        R.string.CreditCardFragment__donate_s_month,
+        FiatMoneyUtil.format(resources, args.inAppPayment.data.amount!!.toFiatMoney(), FiatMoneyUtil.formatOptions().trimZerosAfterDecimal())
+      )
+    } else {
+      getString(R.string.CreditCardFragment__donate_s, FiatMoneyUtil.format(resources, args.inAppPayment.data.amount!!.toFiatMoney()))
+    }
+
+    binding.description.setLinkColor(ContextCompat.getColor(requireContext(), R.color.signal_colorPrimary))
+    binding.description.setLearnMoreVisible(true)
+    binding.description.setOnLinkClickListener {
+      findNavController().safeNavigate(CreditCardFragmentDirections.actionCreditCardFragmentToYourInformationIsPrivateBottomSheet())
+    }
+
+    binding.cardNumber.addTextChangedListener(afterTextChanged = {
+      viewModel.onNumberChanged(it?.toString()?.filter { it != ' ' } ?: "")
+    })
+
+    binding.cardNumber.addTextChangedListener(CreditCardTextWatcher())
+
+    binding.cardNumber.setOnFocusChangeListener { _, hasFocus ->
+      viewModel.onNumberFocusChanged(hasFocus)
+    }
+
+    binding.cardCvv.addTextChangedListener(afterTextChanged = {
+      viewModel.onCodeChanged(it?.toString() ?: "")
+    })
+
+    binding.cardCvv.setOnFocusChangeListener { _, hasFocus ->
+      viewModel.onCodeFocusChanged(hasFocus)
+    }
+
+    binding.cardCvv.setOnEditorActionListener { _, actionId, _ ->
+      if (actionId == EditorInfo.IME_ACTION_DONE && binding.continueButton.isEnabled) {
+        binding.continueButton.performClick()
+        true
+      } else {
+        false
+      }
+    }
+
+    binding.cardExpiry.addTextChangedListener(afterTextChanged = {
+      viewModel.onExpirationChanged(it?.toString() ?: "")
+    })
+
+    binding.cardExpiry.addTextChangedListener(CreditCardExpirationTextWatcher())
+
+    binding.cardExpiry.setOnFocusChangeListener { _, hasFocus ->
+      viewModel.onExpirationFocusChanged(hasFocus)
+    }
+
+    binding.continueButton.setOnClickListener {
+      stripePaymentViewModel.provideCardData(viewModel.getCardData())
+      findNavController().safeNavigate(
+        CreditCardFragmentDirections.actionCreditCardFragmentToStripePaymentInProgressFragment(
+          InAppPaymentProcessorAction.PROCESS_NEW_IN_APP_PAYMENT,
+          args.inAppPayment,
+          args.inAppPayment.type
+        )
+      )
+    }
+
+    binding.toolbar.setNavigationOnClickListener {
+      findNavController().popBackStack()
+    }
+
+    lifecycleDisposable.bindTo(viewLifecycleOwner)
+    lifecycleDisposable += viewModel.state.subscribe {
+      // TODO [alex] -- type
+      presentContinue(it)
+      presentCardNumberWrapper(it.numberValidity)
+      presentCardExpiryWrapper(it.expirationValidity)
+      presentCardCodeWrapper(it.codeValidity)
+    }
+  }
+
+  override fun onResume() {
+    super.onResume()
+
+    when (viewModel.currentFocusField) {
+      CreditCardFormState.FocusedField.NONE -> ViewUtil.focusAndShowKeyboard(binding.cardNumber)
+      CreditCardFormState.FocusedField.NUMBER -> ViewUtil.focusAndShowKeyboard(binding.cardNumber)
+      CreditCardFormState.FocusedField.EXPIRATION -> ViewUtil.focusAndShowKeyboard(binding.cardExpiry)
+      CreditCardFormState.FocusedField.CODE -> ViewUtil.focusAndShowKeyboard(binding.cardCvv)
+    }
+  }
+
+  private fun presentContinue(state: CreditCardValidationState) {
+    binding.continueButton.isEnabled = state.isValid
+  }
+
+  private fun presentCardNumberWrapper(validity: CreditCardNumberValidator.Validity) {
+    val errorState = when (validity) {
+      CreditCardNumberValidator.Validity.INVALID -> ErrorState(messageResId = R.string.CreditCardFragment__invalid_card_number)
+      CreditCardNumberValidator.Validity.POTENTIALLY_VALID -> NO_ERROR
+      CreditCardNumberValidator.Validity.FULLY_VALID -> NO_ERROR
+    }
+
+    binding.cardNumberWrapper.error = errorState.resolveErrorText(requireContext())
+  }
+
+  private fun presentCardExpiryWrapper(validity: CreditCardExpirationValidator.Validity) {
+    val errorState = when (validity) {
+      CreditCardExpirationValidator.Validity.INVALID_EXPIRED -> ErrorState(messageResId = R.string.CreditCardFragment__card_has_expired)
+      CreditCardExpirationValidator.Validity.INVALID_MISSING_YEAR -> ErrorState(messageResId = R.string.CreditCardFragment__year_required)
+      CreditCardExpirationValidator.Validity.INVALID_MONTH -> ErrorState(messageResId = R.string.CreditCardFragment__invalid_month)
+      CreditCardExpirationValidator.Validity.INVALID_YEAR -> ErrorState(messageResId = R.string.CreditCardFragment__invalid_year)
+      CreditCardExpirationValidator.Validity.POTENTIALLY_VALID -> NO_ERROR
+      CreditCardExpirationValidator.Validity.FULLY_VALID -> {
+        if (binding.cardExpiry.isFocused) {
+          binding.cardCvv.requestFocus()
+        }
+
+        NO_ERROR
+      }
+    }
+
+    binding.cardExpiryWrapper.error = errorState.resolveErrorText(requireContext())
+  }
+
+  private fun presentCardCodeWrapper(validity: CreditCardCodeValidator.Validity) {
+    val errorState = when (validity) {
+      CreditCardCodeValidator.Validity.TOO_LONG -> ErrorState(messageResId = R.string.CreditCardFragment__code_is_too_long)
+      CreditCardCodeValidator.Validity.TOO_SHORT -> ErrorState(messageResId = R.string.CreditCardFragment__code_is_too_short)
+      CreditCardCodeValidator.Validity.INVALID_CHARACTERS -> ErrorState(messageResId = R.string.CreditCardFragment__invalid_code)
+      CreditCardCodeValidator.Validity.POTENTIALLY_VALID -> NO_ERROR
+      CreditCardCodeValidator.Validity.FULLY_VALID -> NO_ERROR
+    }
+
+    binding.cardCvvWrapper.error = errorState.resolveErrorText(requireContext())
+  }
+
+  private data class ErrorState(
+    private val isEnabled: Boolean = true,
+    @StringRes private val messageResId: Int
+  ) {
+    fun resolveErrorText(context: Context): String? {
+      return if (isEnabled) {
+        context.getString(messageResId)
+      } else {
+        null
+      }
+    }
+  }
+
+  companion object {
+    const val REQUEST_KEY = "card.result"
+
+    private val NO_ERROR = ErrorState(false, -1)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardNumberValidator.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardNumberValidator.kt
new file mode 100644
index 0000000000..b1bace1431
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardNumberValidator.kt
@@ -0,0 +1,56 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import androidx.core.text.isDigitsOnly
+
+object CreditCardNumberValidator {
+
+  private const val MAX_CARD_NUMBER_LENGTH = 19
+  private const val MIN_CARD_NUMBER_LENGTH = 12
+
+  fun getValidity(cardNumber: String, isCardNumberFieldFocused: Boolean): Validity {
+    if (cardNumber.length > MAX_CARD_NUMBER_LENGTH || !cardNumber.isDigitsOnly()) {
+      return Validity.INVALID
+    }
+
+    if (cardNumber.length < MIN_CARD_NUMBER_LENGTH) {
+      return Validity.POTENTIALLY_VALID
+    }
+
+    val isValid = CreditCardType.fromCardNumber(cardNumber) == CreditCardType.UNIONPAY || isLuhnValid(cardNumber)
+
+    return when {
+      isValid -> Validity.FULLY_VALID
+      isCardNumberFieldFocused -> Validity.POTENTIALLY_VALID
+      else -> Validity.INVALID
+    }
+  }
+
+  /**
+   * An implementation of the [Luhn Algorithm](https://en.wikipedia.org/wiki/Luhn_algorithm) which
+   * performs a checksum to check for validity of non-Unionpay cards.
+   */
+  private fun isLuhnValid(cardNumber: String): Boolean {
+    var checksum = 0
+    var double = false
+
+    cardNumber.reversed().forEach { char ->
+      var digit = char.digitToInt()
+      if (double) {
+        digit *= 2
+      }
+      double = !double
+      if (digit >= 10) {
+        digit -= 9
+      }
+      checksum += digit
+    }
+
+    return checksum % 10 == 0
+  }
+
+  enum class Validity {
+    INVALID,
+    POTENTIALLY_VALID,
+    FULLY_VALID
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardResult.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardResult.kt
new file mode 100644
index 0000000000..c49658c416
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardResult.kt
@@ -0,0 +1,16 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+import org.signal.donations.StripeApi
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+
+/**
+ * Encapsulates data returned from the credit card form that can be used
+ * for a credit card based donation payment.
+ */
+@Parcelize
+data class CreditCardResult(
+  val inAppPayment: InAppPaymentTable.InAppPayment,
+  val creditCardData: StripeApi.CardData
+) : Parcelable
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTextWatcher.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTextWatcher.kt
new file mode 100644
index 0000000000..395a994ee1
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTextWatcher.kt
@@ -0,0 +1,75 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import android.text.Editable
+import android.text.TextWatcher
+
+/**
+ * Formats a credit card by type as the user modifies it.
+ */
+class CreditCardTextWatcher : TextWatcher {
+
+  private var isBackspace: Boolean = false
+
+  override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit
+
+  override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+    isBackspace = count == 0
+  }
+
+  override fun afterTextChanged(s: Editable) {
+    val userInput = s.toString()
+    val normalizedNumber = userInput.filter { it != ' ' }
+
+    val formattedNumber = when (CreditCardType.fromCardNumber(normalizedNumber)) {
+      CreditCardType.AMERICAN_EXPRESS -> applyAmexFormatting(normalizedNumber)
+      CreditCardType.UNIONPAY -> applyUnionPayFormatting(normalizedNumber)
+      CreditCardType.OTHER -> applyOtherFormatting(normalizedNumber)
+    }
+
+    val backspaceHandled = if (isBackspace && formattedNumber.endsWith(' ') && formattedNumber.length > userInput.length) {
+      formattedNumber.dropLast(2)
+    } else {
+      formattedNumber
+    }
+
+    if (userInput != backspaceHandled) {
+      s.replace(0, s.length, backspaceHandled)
+    }
+  }
+
+  private fun applyAmexFormatting(normalizedNumber: String): String {
+    return applyGrouping(normalizedNumber, listOf(4, 6, 5))
+  }
+
+  private fun applyUnionPayFormatting(normalizedNumber: String): String {
+    return when {
+      normalizedNumber.length <= 13 -> applyGrouping(normalizedNumber, listOf(4, 4, 5))
+      normalizedNumber.length <= 16 -> applyGrouping(normalizedNumber, listOf(4, 4, 4, 4))
+      else -> applyGrouping(normalizedNumber, listOf(5, 5, 5, 4))
+    }
+  }
+
+  private fun applyOtherFormatting(normalizedNumber: String): String {
+    return if (normalizedNumber.length <= 16) {
+      applyGrouping(normalizedNumber, listOf(4, 4, 4, 4))
+    } else {
+      applyGrouping(normalizedNumber, listOf(5, 5, 5, 4))
+    }
+  }
+
+  private fun applyGrouping(normalizedNumber: String, groups: List<Int>): String {
+    val maxCardLength = groups.sum()
+
+    return groups.fold(0 to emptyList<String>()) { acc, limit ->
+      val offset = acc.first
+      val section = normalizedNumber.drop(offset).take(limit)
+      val segment = if (limit == section.length && offset + limit != maxCardLength) {
+        "$section "
+      } else {
+        section
+      }
+
+      (offset + limit) to acc.second + segment
+    }.second.filter { it.isNotEmpty() }.joinToString("")
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardType.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardType.kt
new file mode 100644
index 0000000000..a0f08c6859
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardType.kt
@@ -0,0 +1,20 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+enum class CreditCardType {
+  AMERICAN_EXPRESS,
+  UNIONPAY,
+  OTHER;
+
+  companion object {
+    private val AMERICAN_EXPRESS_PREFIXES = listOf("34", "37")
+    private val UNIONPAY_PREFIXES = listOf("62", "81")
+
+    fun fromCardNumber(cardNumber: String): CreditCardType {
+      return when {
+        AMERICAN_EXPRESS_PREFIXES.any { cardNumber.startsWith(it) } -> AMERICAN_EXPRESS
+        UNIONPAY_PREFIXES.any { cardNumber.startsWith(it) } -> UNIONPAY
+        else -> OTHER
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardValidationState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardValidationState.kt
new file mode 100644
index 0000000000..e575ca9121
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardValidationState.kt
@@ -0,0 +1,13 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+data class CreditCardValidationState(
+  val type: CreditCardType,
+  val numberValidity: CreditCardNumberValidator.Validity,
+  val expirationValidity: CreditCardExpirationValidator.Validity,
+  val codeValidity: CreditCardCodeValidator.Validity
+) {
+  val isValid: Boolean =
+    numberValidity == CreditCardNumberValidator.Validity.FULLY_VALID &&
+      expirationValidity == CreditCardExpirationValidator.Validity.FULLY_VALID &&
+      codeValidity == CreditCardCodeValidator.Validity.FULLY_VALID
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardViewModel.kt
new file mode 100644
index 0000000000..16db84b6b9
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardViewModel.kt
@@ -0,0 +1,106 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import androidx.lifecycle.ViewModel
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.processors.BehaviorProcessor
+import org.signal.donations.StripeApi
+import org.thoughtcrime.securesms.util.rx.RxStore
+import java.util.Calendar
+
+class CreditCardViewModel : ViewModel() {
+
+  private val formStore = RxStore(CreditCardFormState())
+  private val validationProcessor: BehaviorProcessor<CreditCardValidationState> = BehaviorProcessor.create()
+  private val currentYear: Int
+  private val currentMonth: Int
+
+  private val disposables = CompositeDisposable()
+
+  init {
+    val calendar = Calendar.getInstance()
+
+    currentYear = calendar.get(Calendar.YEAR)
+    currentMonth = calendar.get(Calendar.MONTH) + 1
+
+    disposables += formStore.stateFlowable.subscribe { formState ->
+      val type = CreditCardType.fromCardNumber(formState.number)
+      validationProcessor.onNext(
+        CreditCardValidationState(
+          type = type,
+          numberValidity = CreditCardNumberValidator.getValidity(formState.number, formState.focusedField == CreditCardFormState.FocusedField.NUMBER),
+          expirationValidity = CreditCardExpirationValidator.getValidity(formState.expiration, currentMonth, currentYear, formState.focusedField == CreditCardFormState.FocusedField.EXPIRATION),
+          codeValidity = CreditCardCodeValidator.getValidity(formState.code, type, formState.focusedField == CreditCardFormState.FocusedField.CODE)
+        )
+      )
+    }
+  }
+
+  val state: Flowable<CreditCardValidationState> = validationProcessor.distinctUntilChanged().observeOn(AndroidSchedulers.mainThread())
+  val currentFocusField: CreditCardFormState.FocusedField
+    get() = formStore.state.focusedField
+
+  override fun onCleared() {
+    disposables.clear()
+    formStore.dispose()
+  }
+
+  fun onNumberChanged(number: String) {
+    formStore.update {
+      it.copy(number = number)
+    }
+  }
+
+  fun onNumberFocusChanged(isFocused: Boolean) {
+    updateFocus(CreditCardFormState.FocusedField.NUMBER, isFocused)
+  }
+
+  fun onExpirationChanged(expiration: String) {
+    formStore.update {
+      it.copy(expiration = CreditCardExpiration.fromInput(expiration))
+    }
+  }
+
+  fun onExpirationFocusChanged(isFocused: Boolean) {
+    updateFocus(CreditCardFormState.FocusedField.EXPIRATION, isFocused)
+  }
+
+  fun onCodeChanged(code: String) {
+    formStore.update {
+      it.copy(code = code)
+    }
+  }
+
+  fun onCodeFocusChanged(isFocused: Boolean) {
+    updateFocus(CreditCardFormState.FocusedField.CODE, isFocused)
+  }
+
+  fun getCardData(): StripeApi.CardData {
+    return formStore.state.toCardData()
+  }
+
+  private fun updateFocus(
+    newFocusedField: CreditCardFormState.FocusedField,
+    isFocused: Boolean
+  ) {
+    formStore.update {
+      it.copy(focusedField = getUpdatedFocus(it.focusedField, newFocusedField, isFocused))
+    }
+  }
+
+  private fun getUpdatedFocus(
+    currentFocusedField: CreditCardFormState.FocusedField,
+    newFocusedField: CreditCardFormState.FocusedField,
+    isFocused: Boolean
+  ): CreditCardFormState.FocusedField {
+    return if (currentFocusedField == newFocusedField && !isFocused) {
+      CreditCardFormState.FocusedField.NONE
+    } else if (isFocused) {
+      newFocusedField
+    } else {
+      currentFocusedField
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/YourInformationIsPrivateBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/YourInformationIsPrivateBottomSheet.kt
new file mode 100644
index 0000000000..f99563dd3b
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/YourInformationIsPrivateBottomSheet.kt
@@ -0,0 +1,71 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import org.signal.core.util.dp
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.DSLConfiguration
+import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
+import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFragment
+import org.thoughtcrime.securesms.components.settings.DSLSettingsText
+import org.thoughtcrime.securesms.components.settings.configure
+
+/**
+ * Displays information about how Signal keeps card details private and how
+ * Signal does not link donation information to your Signal account.
+ */
+class YourInformationIsPrivateBottomSheet : DSLSettingsBottomSheetFragment() {
+  override fun bindAdapter(adapter: DSLSettingsAdapter) {
+    adapter.submitList(getConfiguration().toMappingModelList())
+  }
+
+  private fun getConfiguration(): DSLConfiguration {
+    return configure {
+      space(10.dp)
+
+      noPadTextPref(
+        title = DSLSettingsText.from(
+          R.string.YourInformationIsPrivateBottomSheet__your_information_is_private,
+          DSLSettingsText.CenterModifier,
+          DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_HeadlineMedium)
+        )
+      )
+
+      space(24.dp)
+
+      noPadTextPref(
+        title = DSLSettingsText.from(
+          R.string.YourInformationIsPrivateBottomSheet__signal_does_not_collect,
+          DSLSettingsText.BodyLargeModifier
+        )
+      )
+
+      space(24.dp)
+
+      noPadTextPref(
+        title = DSLSettingsText.from(
+          R.string.YourInformationIsPrivateBottomSheet__we_use_stripe,
+          DSLSettingsText.BodyLargeModifier
+        )
+      )
+
+      space(24.dp)
+
+      noPadTextPref(
+        title = DSLSettingsText.from(
+          R.string.YourInformationIsPrivateBottomSheet__signal_does_not_and_cannot,
+          DSLSettingsText.BodyLargeModifier
+        )
+      )
+
+      space(24.dp)
+
+      noPadTextPref(
+        title = DSLSettingsText.from(
+          R.string.YourInformationIsPrivateBottomSheet__thank_you,
+          DSLSettingsText.BodyLargeModifier
+        )
+      )
+
+      space(56.dp)
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewayOrderStrategy.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewayOrderStrategy.kt
new file mode 100644
index 0000000000..04c0fc51d9
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewayOrderStrategy.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway
+
+import com.google.i18n.phonenumbers.PhoneNumberUtil
+import org.signal.core.util.orNull
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppDonations
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.recipients.Recipient
+
+sealed interface GatewayOrderStrategy {
+
+  val orderedGateways: Set<InAppPaymentData.PaymentMethodType>
+
+  private object Default : GatewayOrderStrategy {
+    override val orderedGateways: Set<InAppPaymentData.PaymentMethodType> = setOf(
+      InAppPaymentData.PaymentMethodType.CARD,
+      InAppPaymentData.PaymentMethodType.PAYPAL,
+      InAppPaymentData.PaymentMethodType.GOOGLE_PAY,
+      InAppPaymentData.PaymentMethodType.SEPA_DEBIT,
+      InAppPaymentData.PaymentMethodType.IDEAL
+    )
+  }
+
+  private object NorthAmerica : GatewayOrderStrategy {
+    override val orderedGateways: Set<InAppPaymentData.PaymentMethodType> = setOf(
+      InAppPaymentData.PaymentMethodType.GOOGLE_PAY,
+      InAppPaymentData.PaymentMethodType.PAYPAL,
+      InAppPaymentData.PaymentMethodType.CARD,
+      InAppPaymentData.PaymentMethodType.SEPA_DEBIT,
+      InAppPaymentData.PaymentMethodType.IDEAL
+    )
+  }
+
+  private object Netherlands : GatewayOrderStrategy {
+    override val orderedGateways: Set<InAppPaymentData.PaymentMethodType> = setOf(
+      InAppPaymentData.PaymentMethodType.IDEAL,
+      InAppPaymentData.PaymentMethodType.PAYPAL,
+      InAppPaymentData.PaymentMethodType.GOOGLE_PAY,
+      InAppPaymentData.PaymentMethodType.CARD,
+      InAppPaymentData.PaymentMethodType.SEPA_DEBIT
+    )
+  }
+
+  companion object {
+    fun getStrategy(): GatewayOrderStrategy {
+      val self = Recipient.self()
+      val e164 = self.e164.orNull() ?: return Default
+
+      return if (PhoneNumberUtil.getInstance().parse(e164, "").countryCode == 1) {
+        NorthAmerica
+      } else if (InAppDonations.isIDEALAvailable()) {
+        Netherlands
+      } else {
+        Default
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorBottomSheet.kt
new file mode 100644
index 0000000000..a6614e38c4
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorBottomSheet.kt
@@ -0,0 +1,275 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway
+
+import android.content.Context
+import androidx.core.content.ContextCompat
+import androidx.core.os.bundleOf
+import androidx.fragment.app.setFragmentResult
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
+import io.reactivex.rxjava3.kotlin.subscribeBy
+import org.signal.core.util.concurrent.LifecycleDisposable
+import org.signal.core.util.dp
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.badges.models.BadgeDisplay112
+import org.thoughtcrime.securesms.components.settings.DSLConfiguration
+import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
+import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFragment
+import org.thoughtcrime.securesms.components.settings.DSLSettingsIcon
+import org.thoughtcrime.securesms.components.settings.DSLSettingsText
+import org.thoughtcrime.securesms.components.settings.NO_TINT
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatMoney
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentComponent
+import org.thoughtcrime.securesms.components.settings.app.subscription.models.GooglePayButton
+import org.thoughtcrime.securesms.components.settings.app.subscription.models.PayPalButton
+import org.thoughtcrime.securesms.components.settings.configure
+import org.thoughtcrime.securesms.components.settings.models.IndeterminateLoadingCircle
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import org.thoughtcrime.securesms.payments.currency.CurrencyUtil
+import org.thoughtcrime.securesms.util.fragments.requireListener
+
+/**
+ * Entry point to capturing the necessary payment token to pay for a donation
+ */
+class GatewaySelectorBottomSheet : DSLSettingsBottomSheetFragment() {
+
+  private val lifecycleDisposable = LifecycleDisposable()
+
+  private val args: GatewaySelectorBottomSheetArgs by navArgs()
+
+  private val viewModel: GatewaySelectorViewModel by viewModels(factoryProducer = {
+    GatewaySelectorViewModel.Factory(args, requireListener<InAppPaymentComponent>().stripeRepository)
+  })
+
+  override fun bindAdapter(adapter: DSLSettingsAdapter) {
+    BadgeDisplay112.register(adapter)
+    GooglePayButton.register(adapter)
+    PayPalButton.register(adapter)
+    IndeterminateLoadingCircle.register(adapter)
+
+    lifecycleDisposable.bindTo(viewLifecycleOwner)
+
+    lifecycleDisposable += viewModel.state.subscribe { state ->
+      adapter.submitList(getConfiguration(state).toMappingModelList())
+    }
+  }
+
+  private fun getConfiguration(state: GatewaySelectorState): DSLConfiguration {
+    return configure {
+      // TODO [message-backups] -- No badge on message backups.
+      customPref(
+        BadgeDisplay112.Model(
+          badge = state.inAppPayment.data.badge!!.let { Badges.fromDatabaseBadge(it) },
+          withDisplayText = false
+        )
+      )
+
+      space(12.dp)
+
+      presentTitleAndSubtitle(requireContext(), state.inAppPayment)
+
+      space(16.dp)
+
+      if (state.loading) {
+        space(16.dp)
+        customPref(IndeterminateLoadingCircle)
+        space(16.dp)
+        return@configure
+      }
+
+      state.gatewayOrderStrategy.orderedGateways.forEach { gateway ->
+        when (gateway) {
+          InAppPaymentData.PaymentMethodType.GOOGLE_PAY -> renderGooglePayButton(state)
+          InAppPaymentData.PaymentMethodType.PAYPAL -> renderPayPalButton(state)
+          InAppPaymentData.PaymentMethodType.CARD -> renderCreditCardButton(state)
+          InAppPaymentData.PaymentMethodType.SEPA_DEBIT -> renderSEPADebitButton(state)
+          InAppPaymentData.PaymentMethodType.IDEAL -> renderIDEALButton(state)
+          InAppPaymentData.PaymentMethodType.UNKNOWN -> error("Unsupported payment method.")
+        }
+      }
+
+      space(16.dp)
+    }
+  }
+
+  private fun DSLConfiguration.renderGooglePayButton(state: GatewaySelectorState) {
+    if (state.isGooglePayAvailable) {
+      space(16.dp)
+
+      customPref(
+        GooglePayButton.Model(
+          isEnabled = true,
+          onClick = {
+            lifecycleDisposable += viewModel.updateInAppPaymentMethod(InAppPaymentData.PaymentMethodType.GOOGLE_PAY)
+              .subscribeBy {
+                findNavController().popBackStack()
+                setFragmentResult(REQUEST_KEY, bundleOf(REQUEST_KEY to it))
+              }
+          }
+        )
+      )
+    }
+  }
+
+  private fun DSLConfiguration.renderPayPalButton(state: GatewaySelectorState) {
+    if (state.isPayPalAvailable) {
+      space(16.dp)
+
+      customPref(
+        PayPalButton.Model(
+          onClick = {
+            lifecycleDisposable += viewModel.updateInAppPaymentMethod(InAppPaymentData.PaymentMethodType.PAYPAL)
+              .subscribeBy {
+                findNavController().popBackStack()
+                setFragmentResult(REQUEST_KEY, bundleOf(REQUEST_KEY to it))
+              }
+          },
+          isEnabled = true
+        )
+      )
+    }
+  }
+
+  private fun DSLConfiguration.renderCreditCardButton(state: GatewaySelectorState) {
+    if (state.isCreditCardAvailable) {
+      space(16.dp)
+
+      primaryButton(
+        text = DSLSettingsText.from(R.string.GatewaySelectorBottomSheet__credit_or_debit_card),
+        icon = DSLSettingsIcon.from(R.drawable.credit_card, R.color.signal_colorOnCustom),
+        disableOnClick = true,
+        onClick = {
+          lifecycleDisposable += viewModel.updateInAppPaymentMethod(InAppPaymentData.PaymentMethodType.CARD)
+            .subscribeBy {
+              findNavController().popBackStack()
+              setFragmentResult(REQUEST_KEY, bundleOf(REQUEST_KEY to it))
+            }
+        }
+      )
+    }
+  }
+
+  private fun DSLConfiguration.renderSEPADebitButton(state: GatewaySelectorState) {
+    if (state.isSEPADebitAvailable) {
+      space(16.dp)
+
+      tonalButton(
+        text = DSLSettingsText.from(R.string.GatewaySelectorBottomSheet__bank_transfer),
+        icon = DSLSettingsIcon.from(R.drawable.bank_transfer),
+        disableOnClick = true,
+        onClick = {
+          val price = args.inAppPayment.data.amount!!.toFiatMoney()
+          if (state.sepaEuroMaximum != null &&
+            price.currency == CurrencyUtil.EURO &&
+            price.amount > state.sepaEuroMaximum.amount
+          ) {
+            findNavController().popBackStack()
+            setFragmentResult(REQUEST_KEY, bundleOf(FAILURE_KEY to true, SEPA_EURO_MAX to state.sepaEuroMaximum.amount))
+          } else {
+            lifecycleDisposable += viewModel.updateInAppPaymentMethod(InAppPaymentData.PaymentMethodType.SEPA_DEBIT)
+              .subscribeBy {
+                findNavController().popBackStack()
+                setFragmentResult(REQUEST_KEY, bundleOf(REQUEST_KEY to it))
+              }
+          }
+        }
+      )
+    }
+  }
+
+  private fun DSLConfiguration.renderIDEALButton(state: GatewaySelectorState) {
+    if (state.isIDEALAvailable) {
+      space(16.dp)
+
+      tonalButton(
+        text = DSLSettingsText.from(R.string.GatewaySelectorBottomSheet__ideal),
+        icon = DSLSettingsIcon.from(R.drawable.logo_ideal, NO_TINT),
+        disableOnClick = true,
+        onClick = {
+          lifecycleDisposable += viewModel.updateInAppPaymentMethod(InAppPaymentData.PaymentMethodType.IDEAL)
+            .subscribeBy {
+              findNavController().popBackStack()
+              setFragmentResult(REQUEST_KEY, bundleOf(REQUEST_KEY to it))
+            }
+        }
+      )
+    }
+  }
+
+  companion object {
+    const val REQUEST_KEY = "payment_checkout_mode"
+    const val FAILURE_KEY = "gateway_failure"
+    const val SEPA_EURO_MAX = "sepa_euro_max"
+
+    fun DSLConfiguration.presentTitleAndSubtitle(context: Context, inAppPayment: InAppPaymentTable.InAppPayment) {
+      when (inAppPayment.type) {
+        InAppPaymentType.UNKNOWN -> error("Unsupported type UNKNOWN")
+        InAppPaymentType.RECURRING_BACKUP -> error("This type is not supported") // TODO [message-backups] necessary?
+        InAppPaymentType.RECURRING_DONATION -> presentMonthlyText(context, inAppPayment)
+        InAppPaymentType.ONE_TIME_DONATION -> presentOneTimeText(context, inAppPayment)
+        InAppPaymentType.ONE_TIME_GIFT -> presentGiftText(context, inAppPayment)
+      }
+    }
+
+    private fun DSLConfiguration.presentMonthlyText(context: Context, inAppPayment: InAppPaymentTable.InAppPayment) {
+      noPadTextPref(
+        title = DSLSettingsText.from(
+          context.getString(R.string.GatewaySelectorBottomSheet__donate_s_month_to_signal, FiatMoneyUtil.format(context.resources, inAppPayment.data.amount!!.toFiatMoney())),
+          DSLSettingsText.CenterModifier,
+          DSLSettingsText.TitleLargeModifier
+        )
+      )
+      space(6.dp)
+      noPadTextPref(
+        title = DSLSettingsText.from(
+          context.getString(R.string.GatewaySelectorBottomSheet__get_a_s_badge, inAppPayment.data.badge!!.name),
+          DSLSettingsText.CenterModifier,
+          DSLSettingsText.BodyLargeModifier,
+          DSLSettingsText.ColorModifier(ContextCompat.getColor(context, R.color.signal_colorOnSurfaceVariant))
+        )
+      )
+    }
+
+    private fun DSLConfiguration.presentOneTimeText(context: Context, inAppPayment: InAppPaymentTable.InAppPayment) {
+      noPadTextPref(
+        title = DSLSettingsText.from(
+          context.getString(R.string.GatewaySelectorBottomSheet__donate_s_to_signal, FiatMoneyUtil.format(context.resources, inAppPayment.data.amount!!.toFiatMoney())),
+          DSLSettingsText.CenterModifier,
+          DSLSettingsText.TitleLargeModifier
+        )
+      )
+      space(6.dp)
+      noPadTextPref(
+        title = DSLSettingsText.from(
+          context.resources.getQuantityString(R.plurals.GatewaySelectorBottomSheet__get_a_s_badge_for_d_days, 30, inAppPayment.data.badge!!.name, 30),
+          DSLSettingsText.CenterModifier,
+          DSLSettingsText.BodyLargeModifier,
+          DSLSettingsText.ColorModifier(ContextCompat.getColor(context, R.color.signal_colorOnSurfaceVariant))
+        )
+      )
+    }
+
+    private fun DSLConfiguration.presentGiftText(context: Context, inAppPayment: InAppPaymentTable.InAppPayment) {
+      noPadTextPref(
+        title = DSLSettingsText.from(
+          context.getString(R.string.GatewaySelectorBottomSheet__donate_s_to_signal, FiatMoneyUtil.format(context.resources, inAppPayment.data.amount!!.toFiatMoney())),
+          DSLSettingsText.CenterModifier,
+          DSLSettingsText.TitleLargeModifier
+        )
+      )
+      space(6.dp)
+      noPadTextPref(
+        title = DSLSettingsText.from(
+          R.string.GatewaySelectorBottomSheet__donate_for_a_friend,
+          DSLSettingsText.CenterModifier,
+          DSLSettingsText.BodyLargeModifier,
+          DSLSettingsText.ColorModifier(ContextCompat.getColor(context, R.color.signal_colorOnSurfaceVariant))
+        )
+      )
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorRepository.kt
new file mode 100644
index 0000000000..ba2022cbd3
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorRepository.kt
@@ -0,0 +1,56 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway
+
+import io.reactivex.rxjava3.core.Single
+import org.signal.core.util.money.FiatMoney
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.getAvailablePaymentMethods
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.payments.currency.CurrencyUtil
+import org.whispersystems.signalservice.api.services.DonationsService
+import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration
+import java.util.Locale
+
+class GatewaySelectorRepository(
+  private val donationsService: DonationsService
+) {
+  fun getAvailableGatewayConfiguration(currencyCode: String): Single<GatewayConfiguration> {
+    return Single.fromCallable {
+      donationsService.getDonationsConfiguration(Locale.getDefault())
+    }.flatMap { it.flattenResult() }
+      .map { configuration ->
+        val available = configuration.getAvailablePaymentMethods(currencyCode).map {
+          when (it) {
+            SubscriptionsConfiguration.PAYPAL -> listOf(InAppPaymentData.PaymentMethodType.PAYPAL)
+            SubscriptionsConfiguration.CARD -> listOf(InAppPaymentData.PaymentMethodType.CARD, InAppPaymentData.PaymentMethodType.GOOGLE_PAY)
+            SubscriptionsConfiguration.SEPA_DEBIT -> listOf(InAppPaymentData.PaymentMethodType.SEPA_DEBIT)
+            SubscriptionsConfiguration.IDEAL -> listOf(InAppPaymentData.PaymentMethodType.IDEAL)
+            else -> listOf()
+          }
+        }.flatten().toSet()
+
+        GatewayConfiguration(
+          availableGateways = available,
+          sepaEuroMaximum = if (configuration.sepaMaximumEuros != null) FiatMoney(configuration.sepaMaximumEuros, CurrencyUtil.EURO) else null
+        )
+      }
+  }
+
+  fun setInAppPaymentMethodType(inAppPayment: InAppPaymentTable.InAppPayment, paymentMethodType: InAppPaymentData.PaymentMethodType): Single<InAppPaymentTable.InAppPayment> {
+    return Single.fromCallable {
+      SignalDatabase.inAppPayments.update(
+        inAppPayment.copy(
+          data = inAppPayment.data.copy(
+            paymentMethodType = paymentMethodType
+          )
+        )
+      )
+    }.flatMap { InAppPaymentsRepository.requireInAppPayment(inAppPayment.id) }
+  }
+
+  data class GatewayConfiguration(
+    val availableGateways: Set<InAppPaymentData.PaymentMethodType>,
+    val sepaEuroMaximum: FiatMoney?
+  )
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorState.kt
new file mode 100644
index 0000000000..c46b983b1f
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorState.kt
@@ -0,0 +1,16 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway
+
+import org.signal.core.util.money.FiatMoney
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+
+data class GatewaySelectorState(
+  val gatewayOrderStrategy: GatewayOrderStrategy,
+  val inAppPayment: InAppPaymentTable.InAppPayment,
+  val loading: Boolean = true,
+  val isGooglePayAvailable: Boolean = false,
+  val isPayPalAvailable: Boolean = false,
+  val isCreditCardAvailable: Boolean = false,
+  val isSEPADebitAvailable: Boolean = false,
+  val isIDEALAvailable: Boolean = false,
+  val sepaEuroMaximum: FiatMoney? = null
+)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorViewModel.kt
new file mode 100644
index 0000000000..82d756d0fe
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/gateway/GatewaySelectorViewModel.kt
@@ -0,0 +1,78 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.subscribeBy
+import org.signal.donations.PaymentSourceType
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppDonations
+import org.thoughtcrime.securesms.components.settings.app.subscription.StripeRepository
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.util.rx.RxStore
+
+class GatewaySelectorViewModel(
+  args: GatewaySelectorBottomSheetArgs,
+  repository: StripeRepository,
+  private val gatewaySelectorRepository: GatewaySelectorRepository
+) : ViewModel() {
+
+  private val store = RxStore(
+    GatewaySelectorState(
+      gatewayOrderStrategy = GatewayOrderStrategy.getStrategy(),
+      inAppPayment = args.inAppPayment,
+      isCreditCardAvailable = InAppDonations.isPaymentSourceAvailable(PaymentSourceType.Stripe.CreditCard, args.inAppPayment.type),
+      isGooglePayAvailable = InAppDonations.isPaymentSourceAvailable(PaymentSourceType.Stripe.GooglePay, args.inAppPayment.type),
+      isPayPalAvailable = InAppDonations.isPaymentSourceAvailable(PaymentSourceType.PayPal, args.inAppPayment.type),
+      isSEPADebitAvailable = InAppDonations.isPaymentSourceAvailable(PaymentSourceType.Stripe.SEPADebit, args.inAppPayment.type),
+      isIDEALAvailable = InAppDonations.isPaymentSourceAvailable(PaymentSourceType.Stripe.IDEAL, args.inAppPayment.type)
+    )
+  )
+  private val disposables = CompositeDisposable()
+
+  val state = store.stateFlowable
+
+  init {
+    val isGooglePayAvailable = repository.isGooglePayAvailable().toSingleDefault(true).onErrorReturnItem(false)
+    val gatewayConfiguration = gatewaySelectorRepository.getAvailableGatewayConfiguration(currencyCode = args.inAppPayment.data.amount!!.currencyCode)
+
+    disposables += Single.zip(isGooglePayAvailable, gatewayConfiguration, ::Pair).subscribeBy { (googlePayAvailable, gatewayConfiguration) ->
+      SignalStore.inAppPayments.isGooglePayReady = googlePayAvailable
+      store.update {
+        it.copy(
+          loading = false,
+          isCreditCardAvailable = it.isCreditCardAvailable && gatewayConfiguration.availableGateways.contains(InAppPaymentData.PaymentMethodType.CARD),
+          isGooglePayAvailable = it.isGooglePayAvailable && googlePayAvailable && gatewayConfiguration.availableGateways.contains(InAppPaymentData.PaymentMethodType.GOOGLE_PAY),
+          isPayPalAvailable = it.isPayPalAvailable && gatewayConfiguration.availableGateways.contains(InAppPaymentData.PaymentMethodType.PAYPAL),
+          isSEPADebitAvailable = it.isSEPADebitAvailable && gatewayConfiguration.availableGateways.contains(InAppPaymentData.PaymentMethodType.SEPA_DEBIT),
+          isIDEALAvailable = it.isIDEALAvailable && gatewayConfiguration.availableGateways.contains(InAppPaymentData.PaymentMethodType.IDEAL),
+          sepaEuroMaximum = gatewayConfiguration.sepaEuroMaximum
+        )
+      }
+    }
+  }
+
+  override fun onCleared() {
+    store.dispose()
+    disposables.clear()
+  }
+
+  fun updateInAppPaymentMethod(inAppPaymentMethodType: InAppPaymentData.PaymentMethodType): Single<InAppPaymentTable.InAppPayment> {
+    return gatewaySelectorRepository.setInAppPaymentMethodType(store.state.inAppPayment, inAppPaymentMethodType).observeOn(AndroidSchedulers.mainThread())
+  }
+
+  class Factory(
+    private val args: GatewaySelectorBottomSheetArgs,
+    private val repository: StripeRepository,
+    private val gatewaySelectorRepository: GatewaySelectorRepository = GatewaySelectorRepository(AppDependencies.donationsService)
+  ) : ViewModelProvider.Factory {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+      return modelClass.cast(GatewaySelectorViewModel(args, repository, gatewaySelectorRepository)) as T
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalCompleteOrderBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalCompleteOrderBottomSheet.kt
new file mode 100644
index 0000000000..26c6bc6f9a
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalCompleteOrderBottomSheet.kt
@@ -0,0 +1,80 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.paypal
+
+import android.content.DialogInterface
+import androidx.core.os.bundleOf
+import androidx.fragment.app.setFragmentResult
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
+import org.signal.core.util.dp
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.badges.models.BadgeDisplay112
+import org.thoughtcrime.securesms.components.settings.DSLConfiguration
+import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
+import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFragment
+import org.thoughtcrime.securesms.components.settings.DSLSettingsText
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewaySelectorBottomSheet.Companion.presentTitleAndSubtitle
+import org.thoughtcrime.securesms.components.settings.configure
+
+/**
+ * Bottom sheet for final order confirmation from PayPal
+ */
+class PayPalCompleteOrderBottomSheet : DSLSettingsBottomSheetFragment() {
+
+  companion object {
+    const val REQUEST_KEY = "complete_order"
+  }
+
+  private var didConfirmOrder = false
+  private val args: PayPalCompleteOrderBottomSheetArgs by navArgs()
+
+  override fun bindAdapter(adapter: DSLSettingsAdapter) {
+    BadgeDisplay112.register(adapter)
+    PayPalCompleteOrderPaymentItem.register(adapter)
+
+    adapter.submitList(getConfiguration().toMappingModelList())
+  }
+
+  override fun onDismiss(dialog: DialogInterface) {
+    super.onDismiss(dialog)
+    setFragmentResult(REQUEST_KEY, bundleOf(REQUEST_KEY to didConfirmOrder))
+  }
+
+  private fun getConfiguration(): DSLConfiguration {
+    return configure {
+      customPref(
+        BadgeDisplay112.Model(
+          badge = Badges.fromDatabaseBadge(args.inAppPayment.data.badge!!),
+          withDisplayText = false
+        )
+      )
+
+      space(12.dp)
+
+      presentTitleAndSubtitle(requireContext(), args.inAppPayment)
+
+      space(24.dp)
+
+      customPref(PayPalCompleteOrderPaymentItem.Model())
+
+      space(82.dp)
+
+      primaryButton(
+        text = DSLSettingsText.from(R.string.PaypalCompleteOrderBottomSheet__donate),
+        onClick = {
+          didConfirmOrder = true
+          findNavController().popBackStack()
+        }
+      )
+
+      secondaryButtonNoOutline(
+        text = DSLSettingsText.from(android.R.string.cancel),
+        onClick = {
+          findNavController().popBackStack()
+        }
+      )
+
+      space(16.dp)
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalCompleteOrderPaymentItem.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalCompleteOrderPaymentItem.kt
new file mode 100644
index 0000000000..cf6eb8c886
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalCompleteOrderPaymentItem.kt
@@ -0,0 +1,22 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.paypal
+
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder.SimpleViewHolder
+
+/**
+ * Line item on the PayPal order confirmation screen.
+ */
+object PayPalCompleteOrderPaymentItem {
+  fun register(mappingAdapter: MappingAdapter) {
+    mappingAdapter.registerFactory(Model::class.java, LayoutFactory(::SimpleViewHolder, R.layout.paypal_complete_order_payment_item))
+  }
+
+  class Model : MappingModel<Model> {
+    override fun areItemsTheSame(newItem: Model): Boolean = true
+
+    override fun areContentsTheSame(newItem: Model): Boolean = true
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalConfirmationDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalConfirmationDialogFragment.kt
new file mode 100644
index 0000000000..e494eac9fd
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalConfirmationDialogFragment.kt
@@ -0,0 +1,126 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.paypal
+
+import android.annotation.SuppressLint
+import android.content.DialogInterface
+import android.graphics.Bitmap
+import android.os.Bundle
+import android.view.View
+import android.webkit.WebSettings
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import androidx.activity.ComponentDialog
+import androidx.core.os.bundleOf
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.setFragmentResult
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.navigation.fragment.navArgs
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.ViewBinderDelegate
+import org.thoughtcrime.securesms.components.settings.app.subscription.PayPalRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.DonationWebViewOnBackPressedCallback
+import org.thoughtcrime.securesms.databinding.DonationWebviewFragmentBinding
+import org.thoughtcrime.securesms.util.visible
+
+/**
+ * Full-screen dialog for displaying PayPal confirmation.
+ */
+class PayPalConfirmationDialogFragment : DialogFragment(R.layout.donation_webview_fragment) {
+
+  companion object {
+    private val TAG = Log.tag(PayPalConfirmationDialogFragment::class.java)
+
+    const val REQUEST_KEY = "paypal_confirmation_dialog_fragment"
+  }
+
+  private val binding by ViewBinderDelegate(DonationWebviewFragmentBinding::bind) {
+    it.webView.clearCache(true)
+    it.webView.clearHistory()
+  }
+
+  private val args: PayPalConfirmationDialogFragmentArgs by navArgs()
+
+  private var result: Bundle? = null
+  private var isFinished = false
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setStyle(STYLE_NO_FRAME, R.style.Signal_DayNight_Dialog_FullScreen)
+  }
+
+  @SuppressLint("SetJavaScriptEnabled")
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    val client = PayPalWebClient()
+    viewLifecycleOwner.lifecycle.addObserver(client)
+    binding.webView.webViewClient = client
+    binding.webView.settings.javaScriptEnabled = true
+    binding.webView.settings.cacheMode = WebSettings.LOAD_NO_CACHE
+    binding.webView.loadUrl(args.uri.toString())
+
+    (requireDialog() as ComponentDialog).onBackPressedDispatcher.addCallback(
+      viewLifecycleOwner,
+      DonationWebViewOnBackPressedCallback(
+        this::dismissAllowingStateLoss,
+        binding.webView
+      )
+    )
+  }
+
+  override fun onDismiss(dialog: DialogInterface) {
+    super.onDismiss(dialog)
+    val result = this.result
+    this.result = null
+    setFragmentResult(REQUEST_KEY, result ?: Bundle())
+  }
+
+  private inner class PayPalWebClient : WebViewClient(), DefaultLifecycleObserver {
+
+    private var isDestroyed = false
+
+    override fun onDestroy(owner: LifecycleOwner) {
+      isDestroyed = true
+    }
+
+    override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
+      if (!isDestroyed) {
+        binding.progress.visible = true
+      }
+    }
+
+    override fun onPageCommitVisible(view: WebView?, url: String?) {
+      if (!isDestroyed) {
+        binding.progress.visible = false
+      }
+    }
+
+    override fun onPageFinished(view: WebView?, url: String?) {
+      if (isDestroyed) {
+        return
+      }
+
+      if (url?.startsWith(PayPalRepository.ONE_TIME_RETURN_URL) == true) {
+        val confirmationResult = PayPalConfirmationResult.fromUrl(url)
+        if (confirmationResult != null) {
+          Log.d(TAG, "Setting confirmation result on request key...")
+          result = bundleOf(REQUEST_KEY to confirmationResult)
+        } else {
+          Log.w(TAG, "One-Time return URL was missing a required parameter.", false)
+          result = null
+        }
+        isFinished = true
+        dismissAllowingStateLoss()
+      } else if (url?.startsWith(PayPalRepository.CANCEL_URL) == true) {
+        Log.d(TAG, "User cancelled.")
+        result = null
+        isFinished = true
+        dismissAllowingStateLoss()
+      } else if (url?.startsWith(PayPalRepository.MONTHLY_RETURN_URL) == true) {
+        Log.d(TAG, "User confirmed monthly subscription.")
+        result = bundleOf(REQUEST_KEY to true)
+        isFinished = true
+        dismissAllowingStateLoss()
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalConfirmationResult.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalConfirmationResult.kt
new file mode 100644
index 0000000000..35a3619654
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalConfirmationResult.kt
@@ -0,0 +1,26 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.paypal
+
+import android.net.Uri
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class PayPalConfirmationResult(
+  val payerId: String,
+  val paymentId: String?,
+  val paymentToken: String
+) : Parcelable {
+  companion object {
+    private const val KEY_PAYER_ID = "PayerID"
+    private const val KEY_PAYMENT_TOKEN = "token"
+
+    fun fromUrl(url: String): PayPalConfirmationResult? {
+      val uri = Uri.parse(url)
+      return PayPalConfirmationResult(
+        payerId = uri.getQueryParameter(KEY_PAYER_ID) ?: return null,
+        paymentId = null,
+        paymentToken = uri.getQueryParameter(KEY_PAYMENT_TOKEN) ?: return null
+      )
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalPaymentInProgressFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalPaymentInProgressFragment.kt
new file mode 100644
index 0000000000..d4672e028e
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalPaymentInProgressFragment.kt
@@ -0,0 +1,186 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.paypal
+
+import android.app.Dialog
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.net.Uri
+import android.os.Bundle
+import android.view.View
+import androidx.core.os.bundleOf
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.FragmentResultListener
+import androidx.fragment.app.setFragmentResult
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
+import androidx.navigation.navGraphViewModels
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.kotlin.subscribeBy
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.util.concurrent.LifecycleDisposable
+import org.signal.core.util.getParcelableCompat
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.ViewBinderDelegate
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toErrorSource
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentProcessorAction
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentProcessorActionResult
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentProcessorStage
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.databinding.DonationInProgressFragmentBinding
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
+import org.whispersystems.signalservice.api.subscriptions.PayPalCreatePaymentIntentResponse
+import org.whispersystems.signalservice.api.subscriptions.PayPalCreatePaymentMethodResponse
+
+class PayPalPaymentInProgressFragment : DialogFragment(R.layout.donation_in_progress_fragment) {
+
+  companion object {
+    private val TAG = Log.tag(PayPalPaymentInProgressFragment::class.java)
+
+    const val REQUEST_KEY = "REQUEST_KEY"
+  }
+
+  private val disposables = LifecycleDisposable()
+  private val binding by ViewBinderDelegate(DonationInProgressFragmentBinding::bind)
+  private val args: PayPalPaymentInProgressFragmentArgs by navArgs()
+
+  private val viewModel: PayPalPaymentInProgressViewModel by navGraphViewModels(R.id.checkout_flow, factoryProducer = {
+    PayPalPaymentInProgressViewModel.Factory()
+  })
+
+  override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    isCancelable = false
+    return super.onCreateDialog(savedInstanceState).apply {
+      window!!.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+    }
+  }
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    if (savedInstanceState == null) {
+      viewModel.onBeginNewAction()
+      when (args.action) {
+        InAppPaymentProcessorAction.PROCESS_NEW_IN_APP_PAYMENT -> {
+          viewModel.processNewDonation(args.inAppPayment!!, this::oneTimeConfirmationPipeline, this::monthlyConfirmationPipeline)
+        }
+
+        InAppPaymentProcessorAction.UPDATE_SUBSCRIPTION -> {
+          viewModel.updateSubscription(args.inAppPayment!!)
+        }
+
+        InAppPaymentProcessorAction.CANCEL_SUBSCRIPTION -> {
+          viewModel.cancelSubscription(InAppPaymentSubscriberRecord.Type.DONATION) // TODO [message-backups] Remove hardcode
+        }
+      }
+    }
+
+    disposables.bindTo(viewLifecycleOwner)
+    disposables += viewModel.state.subscribeBy { stage ->
+      presentUiState(stage)
+    }
+  }
+
+  private fun presentUiState(stage: InAppPaymentProcessorStage) {
+    when (stage) {
+      InAppPaymentProcessorStage.INIT -> binding.progressCardStatus.setText(R.string.SubscribeFragment__processing_payment)
+      InAppPaymentProcessorStage.PAYMENT_PIPELINE -> binding.progressCardStatus.setText(R.string.SubscribeFragment__processing_payment)
+      InAppPaymentProcessorStage.FAILED -> {
+        viewModel.onEndAction()
+        findNavController().popBackStack()
+        setFragmentResult(
+          REQUEST_KEY,
+          bundleOf(
+            REQUEST_KEY to InAppPaymentProcessorActionResult(
+              action = args.action,
+              inAppPayment = args.inAppPayment,
+              inAppPaymentType = args.inAppPaymentType,
+              status = InAppPaymentProcessorActionResult.Status.FAILURE
+            )
+          )
+        )
+      }
+
+      InAppPaymentProcessorStage.COMPLETE -> {
+        viewModel.onEndAction()
+        findNavController().popBackStack()
+        setFragmentResult(
+          REQUEST_KEY,
+          bundleOf(
+            REQUEST_KEY to InAppPaymentProcessorActionResult(
+              action = args.action,
+              inAppPayment = args.inAppPayment,
+              inAppPaymentType = args.inAppPaymentType,
+              status = InAppPaymentProcessorActionResult.Status.SUCCESS
+            )
+          )
+        )
+      }
+
+      InAppPaymentProcessorStage.CANCELLING -> binding.progressCardStatus.setText(R.string.StripePaymentInProgressFragment__cancelling)
+    }
+  }
+
+  private fun oneTimeConfirmationPipeline(createPaymentIntentResponse: PayPalCreatePaymentIntentResponse): Single<PayPalConfirmationResult> {
+    return routeToOneTimeConfirmation(createPaymentIntentResponse)
+  }
+
+  private fun monthlyConfirmationPipeline(createPaymentIntentResponse: PayPalCreatePaymentMethodResponse): Single<PayPalPaymentMethodId> {
+    return routeToMonthlyConfirmation(createPaymentIntentResponse)
+  }
+
+  private fun routeToOneTimeConfirmation(createPaymentIntentResponse: PayPalCreatePaymentIntentResponse): Single<PayPalConfirmationResult> {
+    return Single.create { emitter ->
+      val listener = FragmentResultListener { _, bundle ->
+        val result: PayPalConfirmationResult? = bundle.getParcelableCompat(PayPalConfirmationDialogFragment.REQUEST_KEY, PayPalConfirmationResult::class.java)
+        if (result != null) {
+          emitter.onSuccess(result.copy(paymentId = createPaymentIntentResponse.paymentId))
+        } else {
+          emitter.onError(DonationError.UserCancelledPaymentError(args.inAppPaymentType.toErrorSource()))
+        }
+      }
+
+      parentFragmentManager.clearFragmentResult(PayPalConfirmationDialogFragment.REQUEST_KEY)
+      parentFragmentManager.setFragmentResultListener(PayPalConfirmationDialogFragment.REQUEST_KEY, this, listener)
+
+      findNavController().safeNavigate(
+        PayPalPaymentInProgressFragmentDirections.actionPaypalPaymentInProgressFragmentToPaypalConfirmationFragment(
+          Uri.parse(createPaymentIntentResponse.approvalUrl)
+        )
+      )
+
+      emitter.setCancellable {
+        Log.d(TAG, "Clearing one-time confirmation result listener.")
+        parentFragmentManager.clearFragmentResult(PayPalConfirmationDialogFragment.REQUEST_KEY)
+        parentFragmentManager.clearFragmentResultListener(PayPalConfirmationDialogFragment.REQUEST_KEY)
+      }
+    }.subscribeOn(AndroidSchedulers.mainThread()).observeOn(Schedulers.io())
+  }
+
+  private fun routeToMonthlyConfirmation(createPaymentIntentResponse: PayPalCreatePaymentMethodResponse): Single<PayPalPaymentMethodId> {
+    return Single.create { emitter ->
+      val listener = FragmentResultListener { _, bundle ->
+        val result: Boolean = bundle.getBoolean(PayPalConfirmationDialogFragment.REQUEST_KEY)
+        if (result) {
+          emitter.onSuccess(PayPalPaymentMethodId(createPaymentIntentResponse.token))
+        } else {
+          emitter.onError(DonationError.UserCancelledPaymentError(args.inAppPaymentType.toErrorSource()))
+        }
+      }
+
+      parentFragmentManager.clearFragmentResult(PayPalConfirmationDialogFragment.REQUEST_KEY)
+      parentFragmentManager.setFragmentResultListener(PayPalConfirmationDialogFragment.REQUEST_KEY, this, listener)
+
+      findNavController().safeNavigate(
+        PayPalPaymentInProgressFragmentDirections.actionPaypalPaymentInProgressFragmentToPaypalConfirmationFragment(
+          Uri.parse(createPaymentIntentResponse.approvalUrl)
+        )
+      )
+
+      emitter.setCancellable {
+        Log.d(TAG, "Clearing monthly confirmation result listener.")
+        parentFragmentManager.clearFragmentResult(PayPalConfirmationDialogFragment.REQUEST_KEY)
+        parentFragmentManager.clearFragmentResultListener(PayPalConfirmationDialogFragment.REQUEST_KEY)
+      }
+    }.subscribeOn(AndroidSchedulers.mainThread()).observeOn(Schedulers.io())
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalPaymentInProgressViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalPaymentInProgressViewModel.kt
new file mode 100644
index 0000000000..80d01a6b78
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalPaymentInProgressViewModel.kt
@@ -0,0 +1,203 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.paypal
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.subscribeBy
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.util.logging.Log
+import org.signal.donations.InAppPaymentType
+import org.signal.donations.PaymentSourceType
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatMoney
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.requireSubscriberType
+import org.thoughtcrime.securesms.components.settings.app.subscription.OneTimeInAppPaymentRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.PayPalRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.RecurringInAppPaymentRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentProcessorStage
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.jobs.MultiDeviceSubscriptionSyncRequestJob
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.util.rx.RxStore
+import org.whispersystems.signalservice.api.subscriptions.PayPalCreatePaymentIntentResponse
+import org.whispersystems.signalservice.api.subscriptions.PayPalCreatePaymentMethodResponse
+import org.whispersystems.signalservice.api.util.Preconditions
+
+class PayPalPaymentInProgressViewModel(
+  private val payPalRepository: PayPalRepository,
+  private val oneTimeInAppPaymentRepository: OneTimeInAppPaymentRepository
+) : ViewModel() {
+
+  companion object {
+    private val TAG = Log.tag(PayPalPaymentInProgressViewModel::class.java)
+  }
+
+  private val store = RxStore(InAppPaymentProcessorStage.INIT)
+  val state: Flowable<InAppPaymentProcessorStage> = store.stateFlowable.observeOn(AndroidSchedulers.mainThread())
+
+  private val disposables = CompositeDisposable()
+  override fun onCleared() {
+    store.dispose()
+    disposables.clear()
+  }
+
+  fun onBeginNewAction() {
+    Preconditions.checkState(!store.state.isInProgress)
+
+    Log.d(TAG, "Beginning a new action. Ensuring cleared state.", true)
+    disposables.clear()
+  }
+
+  fun onEndAction() {
+    Preconditions.checkState(store.state.isTerminal)
+
+    Log.d(TAG, "Ending current state. Clearing state and setting stage to INIT", true)
+    store.update { InAppPaymentProcessorStage.INIT }
+    disposables.clear()
+  }
+
+  fun processNewDonation(
+    inAppPayment: InAppPaymentTable.InAppPayment,
+    routeToOneTimeConfirmation: (PayPalCreatePaymentIntentResponse) -> Single<PayPalConfirmationResult>,
+    routeToMonthlyConfirmation: (PayPalCreatePaymentMethodResponse) -> Single<PayPalPaymentMethodId>
+  ) {
+    Log.d(TAG, "Proceeding with donation...", true)
+
+    return if (inAppPayment.type.recurring) {
+      proceedMonthly(inAppPayment, routeToMonthlyConfirmation)
+    } else {
+      proceedOneTime(inAppPayment, routeToOneTimeConfirmation)
+    }
+  }
+
+  fun updateSubscription(inAppPayment: InAppPaymentTable.InAppPayment) {
+    Log.d(TAG, "Beginning subscription update...", true)
+
+    store.update { InAppPaymentProcessorStage.PAYMENT_PIPELINE }
+    disposables += RecurringInAppPaymentRepository.cancelActiveSubscriptionIfNecessary(inAppPayment.type.requireSubscriberType()).andThen(RecurringInAppPaymentRepository.setSubscriptionLevel(inAppPayment, PaymentSourceType.PayPal))
+      .subscribeBy(
+        onComplete = {
+          Log.w(TAG, "Completed subscription update", true)
+          store.update { InAppPaymentProcessorStage.COMPLETE }
+        },
+        onError = { throwable ->
+          Log.w(TAG, "Failed to update subscription", throwable, true)
+          store.update { InAppPaymentProcessorStage.FAILED }
+          InAppPaymentsRepository.handlePipelineError(inAppPayment.id, DonationErrorSource.MONTHLY, PaymentSourceType.PayPal, throwable)
+        }
+      )
+  }
+
+  fun cancelSubscription(subscriberType: InAppPaymentSubscriberRecord.Type) {
+    Log.d(TAG, "Beginning cancellation...", true)
+
+    store.update { InAppPaymentProcessorStage.CANCELLING }
+    disposables += RecurringInAppPaymentRepository.cancelActiveSubscription(subscriberType).subscribeBy(
+      onComplete = {
+        Log.d(TAG, "Cancellation succeeded", true)
+        SignalStore.inAppPayments.updateLocalStateForManualCancellation(subscriberType)
+        MultiDeviceSubscriptionSyncRequestJob.enqueue()
+        RecurringInAppPaymentRepository.syncAccountRecord().subscribe()
+        store.update { InAppPaymentProcessorStage.COMPLETE }
+      },
+      onError = { throwable ->
+        Log.w(TAG, "Cancellation failed", throwable, true)
+        store.update { InAppPaymentProcessorStage.FAILED }
+      }
+    )
+  }
+
+  private fun proceedOneTime(
+    inAppPayment: InAppPaymentTable.InAppPayment,
+    routeToPaypalConfirmation: (PayPalCreatePaymentIntentResponse) -> Single<PayPalConfirmationResult>
+  ) {
+    Log.d(TAG, "Proceeding with one-time payment pipeline...", true)
+    store.update { InAppPaymentProcessorStage.PAYMENT_PIPELINE }
+    val verifyUser = if (inAppPayment.type == InAppPaymentType.ONE_TIME_GIFT) {
+      OneTimeInAppPaymentRepository.verifyRecipientIsAllowedToReceiveAGift(RecipientId.from(inAppPayment.data.recipientId!!))
+    } else {
+      Completable.complete()
+    }
+
+    disposables += verifyUser
+      .andThen(
+        payPalRepository
+          .createOneTimePaymentIntent(
+            amount = inAppPayment.data.amount!!.toFiatMoney(),
+            badgeRecipient = inAppPayment.data.recipientId?.let { RecipientId.from(it) } ?: Recipient.self().id,
+            badgeLevel = inAppPayment.data.level
+          )
+      )
+      .flatMap(routeToPaypalConfirmation)
+      .flatMap { result ->
+        payPalRepository.confirmOneTimePaymentIntent(
+          amount = inAppPayment.data.amount.toFiatMoney(),
+          badgeLevel = inAppPayment.data.level,
+          paypalConfirmationResult = result
+        )
+      }
+      .flatMapCompletable { response ->
+        oneTimeInAppPaymentRepository.waitForOneTimeRedemption(
+          inAppPayment = inAppPayment,
+          paymentIntentId = response.paymentId,
+          paymentSourceType = PaymentSourceType.PayPal
+        )
+      }
+      .subscribeOn(Schedulers.io())
+      .subscribeBy(
+        onError = { throwable ->
+          Log.w(TAG, "Failure in one-time payment pipeline...", throwable, true)
+          store.update { InAppPaymentProcessorStage.FAILED }
+          InAppPaymentsRepository.handlePipelineError(inAppPayment.id, DonationErrorSource.ONE_TIME, PaymentSourceType.PayPal, throwable)
+        },
+        onComplete = {
+          Log.d(TAG, "Finished one-time payment pipeline...", true)
+          store.update { InAppPaymentProcessorStage.COMPLETE }
+        }
+      )
+  }
+
+  private fun proceedMonthly(inAppPayment: InAppPaymentTable.InAppPayment, routeToPaypalConfirmation: (PayPalCreatePaymentMethodResponse) -> Single<PayPalPaymentMethodId>) {
+    Log.d(TAG, "Proceeding with monthly payment pipeline for InAppPayment::${inAppPayment.id} of type ${inAppPayment.type}...", true)
+
+    val setup = RecurringInAppPaymentRepository.ensureSubscriberId(inAppPayment.type.requireSubscriberType())
+      .andThen(RecurringInAppPaymentRepository.cancelActiveSubscriptionIfNecessary(inAppPayment.type.requireSubscriberType()))
+      .andThen(payPalRepository.createPaymentMethod(inAppPayment.type.requireSubscriberType()))
+      .flatMap(routeToPaypalConfirmation)
+      .flatMapCompletable { payPalRepository.setDefaultPaymentMethod(inAppPayment.type.requireSubscriberType(), it.paymentId) }
+      .onErrorResumeNext { Completable.error(DonationError.getPaymentSetupError(DonationErrorSource.MONTHLY, it, PaymentSourceType.PayPal)) }
+
+    disposables += setup.andThen(RecurringInAppPaymentRepository.setSubscriptionLevel(inAppPayment, PaymentSourceType.PayPal))
+      .subscribeBy(
+        onError = { throwable ->
+          Log.w(TAG, "Failure in monthly payment pipeline...", throwable, true)
+          store.update { InAppPaymentProcessorStage.FAILED }
+          InAppPaymentsRepository.handlePipelineError(inAppPayment.id, DonationErrorSource.MONTHLY, PaymentSourceType.PayPal, throwable)
+        },
+        onComplete = {
+          Log.d(TAG, "Finished subscription payment pipeline...", true)
+          store.update { InAppPaymentProcessorStage.COMPLETE }
+        }
+      )
+  }
+
+  class Factory(
+    private val payPalRepository: PayPalRepository = PayPalRepository(AppDependencies.donationsService),
+    private val oneTimeInAppPaymentRepository: OneTimeInAppPaymentRepository = OneTimeInAppPaymentRepository(AppDependencies.donationsService)
+  ) : ViewModelProvider.Factory {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+      return modelClass.cast(PayPalPaymentInProgressViewModel(payPalRepository, oneTimeInAppPaymentRepository)) as T
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalPaymentMethodId.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalPaymentMethodId.kt
new file mode 100644
index 0000000000..71e195f1be
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalPaymentMethodId.kt
@@ -0,0 +1,8 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.paypal
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+@JvmInline
+value class PayPalPaymentMethodId(val paymentId: String) : Parcelable
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/ExternalNavigationHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/ExternalNavigationHelper.kt
new file mode 100644
index 0000000000..7de194f189
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/ExternalNavigationHelper.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe
+
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.widget.Toast
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.signal.donations.StripeApi
+import org.thoughtcrime.securesms.R
+
+/**
+ * Encapsulates the logic for navigating a user to a deeplink from within a webview or parsing out the fallback
+ * or play store parameters to launch them into the market.
+ */
+object ExternalNavigationHelper {
+
+  fun maybeLaunchExternalNavigationIntent(context: Context, webRequestUri: Uri?, launchIntent: (Intent) -> Unit): Boolean {
+    val url = webRequestUri ?: return false
+    if (url.scheme?.startsWith("http") == true || url.scheme == StripeApi.RETURN_URL_SCHEME) {
+      return false
+    }
+
+    MaterialAlertDialogBuilder(context)
+      .setTitle(R.string.ExternalNavigationHelper__leave_signal_to_confirm_payment)
+      .setMessage(R.string.ExternalNavigationHelper__once_this_payment_is_confirmed)
+      .setPositiveButton(android.R.string.ok) { _, _ -> attemptIntentLaunch(context, url, launchIntent) }
+      .setNegativeButton(android.R.string.cancel, null)
+      .show()
+
+    return true
+  }
+
+  private fun attemptIntentLaunch(context: Context, url: Uri, launchIntent: (Intent) -> Unit) {
+    val intent = Intent(Intent.ACTION_VIEW, url)
+    try {
+      launchIntent(intent)
+    } catch (e: ActivityNotFoundException) {
+      // Parses intent:// schema uris according to https://developer.chrome.com/docs/multidevice/android/intents/
+
+      if (url.scheme?.equals("intent") == true) {
+        val fragmentParts: Map<String, String?> = url.fragment
+          ?.split(";")
+          ?.associate {
+            val parts = it.split('=', limit = 2)
+
+            if (parts.size > 1) {
+              parts[0] to parts[1]
+            } else {
+              parts[0] to null
+            }
+          } ?: emptyMap()
+
+        val fallbackUri = fragmentParts["S.browser_fallback_url"]?.let { Uri.parse(it) }
+
+        val packageId: String? = if (looksLikeAMarketLink(fallbackUri)) {
+          fallbackUri!!.getQueryParameter("id")
+        } else {
+          fragmentParts["package"]
+        }
+
+        if (!packageId.isNullOrBlank()) {
+          try {
+            launchIntent(
+              Intent(
+                Intent.ACTION_VIEW,
+                Uri.parse("market://details?id=$packageId")
+              )
+            )
+          } catch (e: ActivityNotFoundException) {
+            toastOnActivityNotFound(context)
+          }
+        } else if (fallbackUri != null) {
+          try {
+            launchIntent(
+              Intent(
+                Intent.ACTION_VIEW,
+                fallbackUri
+              )
+            )
+          } catch (e: ActivityNotFoundException) {
+            toastOnActivityNotFound(context)
+          }
+        }
+      }
+    }
+  }
+
+  private fun toastOnActivityNotFound(context: Context) {
+    Toast.makeText(context, R.string.CommunicationActions_no_browser_found, Toast.LENGTH_SHORT).show()
+  }
+
+  private fun looksLikeAMarketLink(uri: Uri?): Boolean {
+    return uri != null && uri.host == "play.google.com" && uri.getQueryParameter("id") != null
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/Stripe3DSData.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/Stripe3DSData.kt
new file mode 100644
index 0000000000..33cc4dfeef
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/Stripe3DSData.kt
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe
+
+import android.os.Parcelable
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
+import org.signal.donations.InAppPaymentType
+import org.signal.donations.PaymentSourceType
+import org.signal.donations.StripeIntentAccessor
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toPaymentMethodType
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.model.databaseprotos.ExternalLaunchTransactionState
+import org.thoughtcrime.securesms.database.model.databaseprotos.FiatValue
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.recipients.Recipient
+import kotlin.time.Duration.Companion.milliseconds
+
+/**
+ * Encapsulates the data required to complete a pending external transaction
+ */
+@Parcelize
+data class Stripe3DSData(
+  val stripeIntentAccessor: StripeIntentAccessor,
+  val inAppPayment: InAppPaymentTable.InAppPayment,
+  private val rawPaymentSourceType: String
+) : Parcelable {
+  @IgnoredOnParcel
+  val paymentSourceType: PaymentSourceType = PaymentSourceType.fromCode(rawPaymentSourceType)
+
+  @IgnoredOnParcel
+  val isLongRunning: Boolean = paymentSourceType == PaymentSourceType.Stripe.SEPADebit || (inAppPayment.type.recurring && paymentSourceType.isBankTransfer)
+
+  fun toProtoBytes(): ByteArray {
+    return ExternalLaunchTransactionState(
+      stripeIntentAccessor = ExternalLaunchTransactionState.StripeIntentAccessor(
+        type = when (stripeIntentAccessor.objectType) {
+          StripeIntentAccessor.ObjectType.NONE, StripeIntentAccessor.ObjectType.PAYMENT_INTENT -> ExternalLaunchTransactionState.StripeIntentAccessor.Type.PAYMENT_INTENT
+          StripeIntentAccessor.ObjectType.SETUP_INTENT -> ExternalLaunchTransactionState.StripeIntentAccessor.Type.SETUP_INTENT
+        },
+        intentId = stripeIntentAccessor.intentId,
+        intentClientSecret = stripeIntentAccessor.intentClientSecret
+      ),
+      gatewayRequest = ExternalLaunchTransactionState.GatewayRequest(
+        inAppPaymentType = when (inAppPayment.type) {
+          InAppPaymentType.UNKNOWN -> error("Unsupported type UNKNOWN")
+          InAppPaymentType.ONE_TIME_DONATION -> ExternalLaunchTransactionState.GatewayRequest.InAppPaymentType.ONE_TIME_DONATION
+          InAppPaymentType.RECURRING_DONATION -> ExternalLaunchTransactionState.GatewayRequest.InAppPaymentType.RECURRING_DONATION
+          InAppPaymentType.ONE_TIME_GIFT -> ExternalLaunchTransactionState.GatewayRequest.InAppPaymentType.ONE_TIME_GIFT
+          InAppPaymentType.RECURRING_BACKUP -> ExternalLaunchTransactionState.GatewayRequest.InAppPaymentType.RECURRING_BACKUPS
+        },
+        badge = inAppPayment.data.badge,
+        label = inAppPayment.data.label,
+        price = inAppPayment.data.amount!!.amount,
+        currencyCode = inAppPayment.data.amount.currencyCode,
+        level = inAppPayment.data.level,
+        recipient_id = inAppPayment.data.recipientId?.toLong() ?: Recipient.self().id.toLong(),
+        additionalMessage = inAppPayment.data.additionalMessage ?: ""
+      ),
+      paymentSourceType = paymentSourceType.code
+    ).encode()
+  }
+
+  companion object {
+    fun fromProtoBytes(byteArray: ByteArray): Stripe3DSData {
+      val proto = ExternalLaunchTransactionState.ADAPTER.decode(byteArray)
+      return Stripe3DSData(
+        stripeIntentAccessor = StripeIntentAccessor(
+          objectType = when (proto.stripeIntentAccessor!!.type) {
+            ExternalLaunchTransactionState.StripeIntentAccessor.Type.PAYMENT_INTENT -> StripeIntentAccessor.ObjectType.PAYMENT_INTENT
+            ExternalLaunchTransactionState.StripeIntentAccessor.Type.SETUP_INTENT -> StripeIntentAccessor.ObjectType.SETUP_INTENT
+          },
+          intentId = proto.stripeIntentAccessor.intentId,
+          intentClientSecret = proto.stripeIntentAccessor.intentClientSecret
+        ),
+        inAppPayment = InAppPaymentTable.InAppPayment(
+          id = InAppPaymentTable.InAppPaymentId(-1), // TODO [alex] -- can we start writing this in for new transactions?
+          type = when (proto.gatewayRequest!!.inAppPaymentType) {
+            ExternalLaunchTransactionState.GatewayRequest.InAppPaymentType.RECURRING_DONATION -> InAppPaymentType.RECURRING_DONATION
+            ExternalLaunchTransactionState.GatewayRequest.InAppPaymentType.ONE_TIME_DONATION -> InAppPaymentType.ONE_TIME_DONATION
+            ExternalLaunchTransactionState.GatewayRequest.InAppPaymentType.ONE_TIME_GIFT -> InAppPaymentType.ONE_TIME_GIFT
+            ExternalLaunchTransactionState.GatewayRequest.InAppPaymentType.RECURRING_BACKUPS -> InAppPaymentType.RECURRING_BACKUP
+          },
+          endOfPeriod = 0.milliseconds,
+          updatedAt = 0.milliseconds,
+          insertedAt = 0.milliseconds,
+          notified = true,
+          state = InAppPaymentTable.State.WAITING_FOR_AUTHORIZATION,
+          subscriberId = null,
+          data = InAppPaymentData(
+            paymentMethodType = PaymentSourceType.fromCode(proto.paymentSourceType).toPaymentMethodType(),
+            badge = proto.gatewayRequest.badge,
+            label = proto.gatewayRequest.label,
+            amount = FiatValue(amount = proto.gatewayRequest.price, currencyCode = proto.gatewayRequest.currencyCode),
+            level = proto.gatewayRequest.level,
+            recipientId = null,
+            additionalMessage = "",
+            waitForAuth = InAppPaymentData.WaitingForAuthorizationState(
+              stripeClientSecret = proto.stripeIntentAccessor.intentClientSecret,
+              stripeIntentId = proto.stripeIntentAccessor.intentId
+            )
+          )
+        ),
+        rawPaymentSourceType = proto.paymentSourceType
+      )
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/Stripe3DSDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/Stripe3DSDialogFragment.kt
new file mode 100644
index 0000000000..3243d78264
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/Stripe3DSDialogFragment.kt
@@ -0,0 +1,148 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe
+
+import android.annotation.SuppressLint
+import android.content.DialogInterface
+import android.content.Intent
+import android.graphics.Bitmap
+import android.os.Bundle
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import android.webkit.WebResourceRequest
+import android.webkit.WebSettings
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import android.widget.FrameLayout
+import androidx.activity.ComponentDialog
+import androidx.core.os.bundleOf
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.setFragmentResult
+import androidx.navigation.fragment.navArgs
+import com.google.android.material.button.MaterialButton
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.util.concurrent.LifecycleDisposable
+import org.signal.donations.StripeIntentAccessor
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.ViewBinderDelegate
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.DonationWebViewOnBackPressedCallback
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.databinding.DonationWebviewFragmentBinding
+import org.thoughtcrime.securesms.util.RemoteConfig
+import org.thoughtcrime.securesms.util.visible
+
+/**
+ * Full-screen dialog for displaying Stripe 3DS confirmation.
+ */
+class Stripe3DSDialogFragment : DialogFragment(R.layout.donation_webview_fragment) {
+
+  companion object {
+    const val REQUEST_KEY = "stripe_3ds_dialog_fragment"
+    const val LAUNCHED_EXTERNAL = "stripe_3ds_dialog_fragment.pending"
+  }
+
+  val binding by ViewBinderDelegate(DonationWebviewFragmentBinding::bind) {
+    it.webView.webViewClient = WebViewClient()
+    it.webView.clearCache(true)
+    it.webView.clearHistory()
+  }
+
+  val args: Stripe3DSDialogFragmentArgs by navArgs()
+
+  var result: Bundle? = null
+
+  private val lifecycleDisposable = LifecycleDisposable()
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setStyle(STYLE_NO_FRAME, R.style.Signal_DayNight_Dialog_FullScreen)
+  }
+
+  @SuppressLint("SetJavaScriptEnabled", "SetTextI18n")
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    lifecycleDisposable.bindTo(viewLifecycleOwner)
+
+    dialog!!.window!!.setFlags(
+      WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED,
+      WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED
+    )
+
+    binding.webView.webViewClient = Stripe3DSWebClient()
+    binding.webView.settings.javaScriptEnabled = true
+    binding.webView.settings.domStorageEnabled = true
+    binding.webView.settings.cacheMode = WebSettings.LOAD_NO_CACHE
+    binding.webView.loadUrl(args.uri.toString())
+
+    (requireDialog() as ComponentDialog).onBackPressedDispatcher.addCallback(
+      viewLifecycleOwner,
+      DonationWebViewOnBackPressedCallback(
+        this::dismissAllowingStateLoss,
+        binding.webView
+      )
+    )
+
+    if (RemoteConfig.internalUser && args.inAppPayment.data.paymentMethodType == InAppPaymentData.PaymentMethodType.IDEAL) {
+      val openApp = MaterialButton(requireContext()).apply {
+        text = "Open App"
+        layoutParams = FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply {
+          gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL
+        }
+        setOnClickListener {
+          handleLaunchExternal(Intent(Intent.ACTION_VIEW, args.uri))
+        }
+      }
+      binding.root.addView(openApp)
+    }
+  }
+
+  override fun onDismiss(dialog: DialogInterface) {
+    super.onDismiss(dialog)
+    val result = this.result
+    this.result = null
+    setFragmentResult(REQUEST_KEY, result ?: Bundle())
+  }
+
+  private fun handleLaunchExternal(intent: Intent) {
+    lifecycleDisposable += Completable
+      .fromAction {
+        SignalDatabase.inAppPayments.update(args.inAppPayment)
+      }
+      .subscribeOn(Schedulers.io())
+      .observeOn(AndroidSchedulers.mainThread())
+      .subscribe {
+        result = bundleOf(
+          LAUNCHED_EXTERNAL to true
+        )
+
+        startActivity(intent)
+        dismissAllowingStateLoss()
+      }
+  }
+
+  private inner class Stripe3DSWebClient : WebViewClient() {
+
+    override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
+      return ExternalNavigationHelper.maybeLaunchExternalNavigationIntent(requireContext(), request?.url, this@Stripe3DSDialogFragment::handleLaunchExternal)
+    }
+
+    override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
+      binding.progress.visible = true
+    }
+
+    override fun onPageCommitVisible(view: WebView?, url: String?) {
+      binding.progress.visible = false
+    }
+
+    override fun onPageFinished(view: WebView?, url: String?) {
+      if (url?.startsWith(args.returnUri.toString()) == true) {
+        val stripeIntentAccessor = StripeIntentAccessor.fromUri(url)
+
+        result = bundleOf(REQUEST_KEY to stripeIntentAccessor)
+        dismissAllowingStateLoss()
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripeNextActionHandler.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripeNextActionHandler.kt
new file mode 100644
index 0000000000..d670ae2d08
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripeNextActionHandler.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe
+
+import io.reactivex.rxjava3.core.Single
+import org.signal.donations.StripeApi
+import org.signal.donations.StripeIntentAccessor
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+
+fun interface StripeNextActionHandler {
+  fun handle(
+    action: StripeApi.Secure3DSAction,
+    inAppPayment: InAppPaymentTable.InAppPayment
+  ): Single<StripeIntentAccessor>
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressFragment.kt
new file mode 100644
index 0000000000..34b7225e2c
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressFragment.kt
@@ -0,0 +1,158 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe
+
+import android.app.Dialog
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.view.View
+import androidx.core.os.bundleOf
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.FragmentResultListener
+import androidx.fragment.app.setFragmentResult
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
+import androidx.navigation.navGraphViewModels
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.kotlin.subscribeBy
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.util.concurrent.LifecycleDisposable
+import org.signal.core.util.getParcelableCompat
+import org.signal.core.util.logging.Log
+import org.signal.donations.StripeApi
+import org.signal.donations.StripeIntentAccessor
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.ViewBinderDelegate
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentComponent
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.requireSubscriberType
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toErrorSource
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentProcessorAction
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentProcessorActionResult
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentProcessorStage
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.databinding.DonationInProgressFragmentBinding
+import org.thoughtcrime.securesms.util.fragments.requireListener
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
+
+class StripePaymentInProgressFragment : DialogFragment(R.layout.donation_in_progress_fragment) {
+
+  companion object {
+    private val TAG = Log.tag(StripePaymentInProgressFragment::class.java)
+
+    const val REQUEST_KEY = "REQUEST_KEY"
+  }
+
+  private val binding by ViewBinderDelegate(DonationInProgressFragmentBinding::bind)
+  private val args: StripePaymentInProgressFragmentArgs by navArgs()
+  private val disposables = LifecycleDisposable()
+
+  private val viewModel: StripePaymentInProgressViewModel by navGraphViewModels(
+    R.id.checkout_flow,
+    factoryProducer = {
+      StripePaymentInProgressViewModel.Factory(requireListener<InAppPaymentComponent>().stripeRepository)
+    }
+  )
+
+  override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    isCancelable = false
+    return super.onCreateDialog(savedInstanceState).apply {
+      window!!.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+    }
+  }
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    if (savedInstanceState == null) {
+      viewModel.onBeginNewAction()
+      when (args.action) {
+        InAppPaymentProcessorAction.PROCESS_NEW_IN_APP_PAYMENT -> {
+          viewModel.processNewDonation(args.inAppPayment!!, this::handleSecure3dsAction)
+        }
+        InAppPaymentProcessorAction.UPDATE_SUBSCRIPTION -> {
+          viewModel.updateSubscription(args.inAppPayment!!)
+        }
+        InAppPaymentProcessorAction.CANCEL_SUBSCRIPTION -> {
+          viewModel.cancelSubscription(args.inAppPaymentType.requireSubscriberType())
+        }
+      }
+    }
+
+    disposables.bindTo(viewLifecycleOwner)
+    disposables += viewModel.state.subscribeBy { stage ->
+      presentUiState(stage)
+    }
+  }
+
+  private fun presentUiState(stage: InAppPaymentProcessorStage) {
+    when (stage) {
+      InAppPaymentProcessorStage.INIT -> binding.progressCardStatus.setText(R.string.SubscribeFragment__processing_payment)
+      InAppPaymentProcessorStage.PAYMENT_PIPELINE -> binding.progressCardStatus.setText(R.string.SubscribeFragment__processing_payment)
+      InAppPaymentProcessorStage.FAILED -> {
+        viewModel.onEndAction()
+        findNavController().popBackStack()
+        setFragmentResult(
+          REQUEST_KEY,
+          bundleOf(
+            REQUEST_KEY to InAppPaymentProcessorActionResult(
+              action = args.action,
+              inAppPayment = args.inAppPayment,
+              inAppPaymentType = args.inAppPaymentType,
+              status = InAppPaymentProcessorActionResult.Status.FAILURE
+            )
+          )
+        )
+      }
+      InAppPaymentProcessorStage.COMPLETE -> {
+        viewModel.onEndAction()
+        findNavController().popBackStack()
+        setFragmentResult(
+          REQUEST_KEY,
+          bundleOf(
+            REQUEST_KEY to InAppPaymentProcessorActionResult(
+              action = args.action,
+              inAppPayment = args.inAppPayment,
+              inAppPaymentType = args.inAppPaymentType,
+              status = InAppPaymentProcessorActionResult.Status.SUCCESS
+            )
+          )
+        )
+      }
+      InAppPaymentProcessorStage.CANCELLING -> binding.progressCardStatus.setText(R.string.StripePaymentInProgressFragment__cancelling)
+    }
+  }
+
+  private fun handleSecure3dsAction(secure3dsAction: StripeApi.Secure3DSAction, inAppPayment: InAppPaymentTable.InAppPayment): Single<StripeIntentAccessor> {
+    return when (secure3dsAction) {
+      is StripeApi.Secure3DSAction.NotNeeded -> {
+        Log.d(TAG, "No 3DS action required.")
+        Single.just(StripeIntentAccessor.NO_ACTION_REQUIRED)
+      }
+      is StripeApi.Secure3DSAction.ConfirmRequired -> {
+        Log.d(TAG, "3DS action required. Displaying dialog...")
+        Single.create { emitter ->
+          val listener = FragmentResultListener { _, bundle ->
+            val result: StripeIntentAccessor? = bundle.getParcelableCompat(Stripe3DSDialogFragment.REQUEST_KEY, StripeIntentAccessor::class.java)
+            if (result != null) {
+              emitter.onSuccess(result)
+            } else {
+              val didLaunchExternal = bundle.getBoolean(Stripe3DSDialogFragment.LAUNCHED_EXTERNAL, false)
+              if (didLaunchExternal) {
+                emitter.onError(DonationError.UserLaunchedExternalApplication(args.inAppPaymentType.toErrorSource()))
+              } else {
+                emitter.onError(DonationError.UserCancelledPaymentError(args.inAppPaymentType.toErrorSource()))
+              }
+            }
+          }
+
+          parentFragmentManager.setFragmentResultListener(Stripe3DSDialogFragment.REQUEST_KEY, this, listener)
+
+          findNavController().safeNavigate(StripePaymentInProgressFragmentDirections.actionStripePaymentInProgressFragmentToStripe3dsDialogFragment(secure3dsAction.uri, secure3dsAction.returnUri, inAppPayment))
+
+          emitter.setCancellable {
+            parentFragmentManager.clearFragmentResultListener(Stripe3DSDialogFragment.REQUEST_KEY)
+          }
+        }.subscribeOn(AndroidSchedulers.mainThread()).observeOn(Schedulers.io())
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressViewModel.kt
new file mode 100644
index 0000000000..2f91a565fc
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/stripe/StripePaymentInProgressViewModel.kt
@@ -0,0 +1,312 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import com.google.android.gms.wallet.PaymentData
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.subscribeBy
+import org.signal.core.util.concurrent.SignalExecutors
+import org.signal.core.util.logging.Log
+import org.signal.donations.GooglePayPaymentSource
+import org.signal.donations.InAppPaymentType
+import org.signal.donations.PaymentSourceType
+import org.signal.donations.StripeApi
+import org.signal.donations.StripeIntentAccessor
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatMoney
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.requireSubscriberType
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toErrorSource
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toPaymentSourceType
+import org.thoughtcrime.securesms.components.settings.app.subscription.OneTimeInAppPaymentRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.RecurringInAppPaymentRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.StripeRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentProcessorStage
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.toDonationError
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.util.rx.RxStore
+import org.whispersystems.signalservice.api.util.Preconditions
+import org.whispersystems.signalservice.internal.push.exceptions.DonationProcessorError
+
+class StripePaymentInProgressViewModel(
+  private val stripeRepository: StripeRepository,
+  private val oneTimeInAppPaymentRepository: OneTimeInAppPaymentRepository
+) : ViewModel() {
+
+  companion object {
+    private val TAG = Log.tag(StripePaymentInProgressViewModel::class.java)
+  }
+
+  private val store = RxStore(InAppPaymentProcessorStage.INIT)
+  val state: Flowable<InAppPaymentProcessorStage> = store.stateFlowable.observeOn(AndroidSchedulers.mainThread())
+
+  private val disposables = CompositeDisposable()
+  private var stripePaymentData: StripePaymentData? = null
+
+  override fun onCleared() {
+    disposables.clear()
+    store.dispose()
+    clearPaymentInformation()
+  }
+
+  fun onBeginNewAction() {
+    Preconditions.checkState(!store.state.isInProgress)
+
+    Log.d(TAG, "Beginning a new action. Ensuring cleared state.", true)
+    disposables.clear()
+  }
+
+  fun onEndAction() {
+    Preconditions.checkState(store.state.isTerminal)
+
+    Log.d(TAG, "Ending current state. Clearing state and setting stage to INIT", true)
+    store.update { InAppPaymentProcessorStage.INIT }
+    disposables.clear()
+  }
+
+  fun processNewDonation(inAppPayment: InAppPaymentTable.InAppPayment, nextActionHandler: StripeNextActionHandler) {
+    Log.d(TAG, "Proceeding with InAppPayment::${inAppPayment.id} of type ${inAppPayment.type}...", true)
+
+    val paymentSourceProvider: PaymentSourceProvider = resolvePaymentSourceProvider(inAppPayment.type.toErrorSource())
+
+    return if (inAppPayment.type.recurring) {
+      proceedMonthly(inAppPayment, paymentSourceProvider, nextActionHandler)
+    } else {
+      proceedOneTime(inAppPayment, paymentSourceProvider, nextActionHandler)
+    }
+  }
+
+  private fun resolvePaymentSourceProvider(errorSource: DonationErrorSource): PaymentSourceProvider {
+    return when (val data = stripePaymentData) {
+      is StripePaymentData.GooglePay -> PaymentSourceProvider(
+        PaymentSourceType.Stripe.GooglePay,
+        Single.just<StripeApi.PaymentSource>(GooglePayPaymentSource(data.paymentData)).doAfterTerminate { clearPaymentInformation() }
+      )
+
+      is StripePaymentData.CreditCard -> PaymentSourceProvider(
+        PaymentSourceType.Stripe.CreditCard,
+        stripeRepository.createCreditCardPaymentSource(errorSource, data.cardData).doAfterTerminate { clearPaymentInformation() }
+      )
+
+      is StripePaymentData.SEPADebit -> PaymentSourceProvider(
+        PaymentSourceType.Stripe.SEPADebit,
+        stripeRepository.createSEPADebitPaymentSource(data.sepaDebitData).doAfterTerminate { clearPaymentInformation() }
+      )
+
+      is StripePaymentData.IDEAL -> PaymentSourceProvider(
+        PaymentSourceType.Stripe.IDEAL,
+        stripeRepository.createIdealPaymentSource(data.idealData).doAfterTerminate { clearPaymentInformation() }
+      )
+
+      else -> error("This should never happen.")
+    }
+  }
+
+  fun providePaymentData(paymentData: PaymentData) {
+    requireNoPaymentInformation()
+    this.stripePaymentData = StripePaymentData.GooglePay(paymentData)
+  }
+
+  fun provideCardData(cardData: StripeApi.CardData) {
+    requireNoPaymentInformation()
+    this.stripePaymentData = StripePaymentData.CreditCard(cardData)
+  }
+
+  fun provideSEPADebitData(bankData: StripeApi.SEPADebitData) {
+    requireNoPaymentInformation()
+    this.stripePaymentData = StripePaymentData.SEPADebit(bankData)
+  }
+
+  fun provideIDEALData(bankData: StripeApi.IDEALData) {
+    requireNoPaymentInformation()
+    this.stripePaymentData = StripePaymentData.IDEAL(bankData)
+  }
+
+  private fun requireNoPaymentInformation() {
+    require(stripePaymentData == null)
+  }
+
+  private fun clearPaymentInformation() {
+    Log.d(TAG, "Cleared payment information.", true)
+    stripePaymentData = null
+  }
+
+  private fun proceedMonthly(inAppPayment: InAppPaymentTable.InAppPayment, paymentSourceProvider: PaymentSourceProvider, nextActionHandler: StripeNextActionHandler) {
+    val ensureSubscriberId: Completable = RecurringInAppPaymentRepository.ensureSubscriberId(inAppPayment.type.requireSubscriberType())
+    val createAndConfirmSetupIntent: Single<StripeApi.Secure3DSAction> = paymentSourceProvider.paymentSource.flatMap {
+      stripeRepository.createAndConfirmSetupIntent(inAppPayment.type, it, paymentSourceProvider.paymentSourceType as PaymentSourceType.Stripe)
+    }
+
+    val setLevel: Completable = RecurringInAppPaymentRepository.setSubscriptionLevel(inAppPayment, paymentSourceProvider.paymentSourceType)
+
+    Log.d(TAG, "Starting subscription payment pipeline...", true)
+    store.update { InAppPaymentProcessorStage.PAYMENT_PIPELINE }
+
+    val setup: Completable = ensureSubscriberId
+      .andThen(RecurringInAppPaymentRepository.cancelActiveSubscriptionIfNecessary(inAppPayment.type.requireSubscriberType()))
+      .andThen(createAndConfirmSetupIntent)
+      .flatMap { secure3DSAction ->
+        nextActionHandler.handle(
+          action = secure3DSAction,
+          inAppPayment = inAppPayment.copy(
+            data = inAppPayment.data.copy(
+              redemption = null,
+              waitForAuth = InAppPaymentData.WaitingForAuthorizationState(
+                stripeIntentId = secure3DSAction.stripeIntentAccessor.intentId,
+                stripeClientSecret = secure3DSAction.stripeIntentAccessor.intentClientSecret
+              )
+            )
+          )
+        )
+          .flatMap { secure3DSResult -> stripeRepository.getStatusAndPaymentMethodId(secure3DSResult, secure3DSAction.paymentMethodId) }
+      }
+      .flatMapCompletable { stripeRepository.setDefaultPaymentMethod(it.paymentMethod!!, it.intentId, inAppPayment.type.requireSubscriberType(), paymentSourceProvider.paymentSourceType) }
+      .onErrorResumeNext {
+        when (it) {
+          is DonationError -> Completable.error(it)
+          is DonationProcessorError -> Completable.error(it.toDonationError(DonationErrorSource.MONTHLY, paymentSourceProvider.paymentSourceType))
+          else -> Completable.error(DonationError.getPaymentSetupError(DonationErrorSource.MONTHLY, it, paymentSourceProvider.paymentSourceType))
+        }
+      }
+
+    disposables += setup.andThen(setLevel).subscribeBy(
+      onError = { throwable ->
+        Log.w(TAG, "Failure in subscription payment pipeline...", throwable, true)
+        store.update { InAppPaymentProcessorStage.FAILED }
+        InAppPaymentsRepository.handlePipelineError(inAppPayment.id, DonationErrorSource.MONTHLY, paymentSourceProvider.paymentSourceType, throwable)
+      },
+      onComplete = {
+        Log.d(TAG, "Finished subscription payment pipeline...", true)
+        store.update { InAppPaymentProcessorStage.COMPLETE }
+      }
+    )
+  }
+
+  private fun proceedOneTime(
+    inAppPayment: InAppPaymentTable.InAppPayment,
+    paymentSourceProvider: PaymentSourceProvider,
+    nextActionHandler: StripeNextActionHandler
+  ) {
+    Log.w(TAG, "Beginning one-time payment pipeline...", true)
+
+    val amount = inAppPayment.data.amount!!.toFiatMoney()
+    val recipientId = inAppPayment.data.recipientId?.let { RecipientId.from(it) } ?: Recipient.self().id
+    val verifyUser = if (inAppPayment.type == InAppPaymentType.ONE_TIME_GIFT) {
+      OneTimeInAppPaymentRepository.verifyRecipientIsAllowedToReceiveAGift(recipientId)
+    } else {
+      Completable.complete()
+    }
+
+    val continuePayment: Single<StripeIntentAccessor> = verifyUser.andThen(stripeRepository.continuePayment(amount, recipientId, inAppPayment.data.level, paymentSourceProvider.paymentSourceType))
+    val intentAndSource: Single<Pair<StripeIntentAccessor, StripeApi.PaymentSource>> = Single.zip(continuePayment, paymentSourceProvider.paymentSource, ::Pair)
+
+    disposables += intentAndSource.flatMapCompletable { (paymentIntent, paymentSource) ->
+      stripeRepository.confirmPayment(paymentSource, paymentIntent, recipientId)
+        .flatMap { action ->
+          nextActionHandler
+            .handle(
+              action = action,
+              inAppPayment = inAppPayment.copy(
+                state = InAppPaymentTable.State.WAITING_FOR_AUTHORIZATION,
+                data = inAppPayment.data.copy(
+                  redemption = null,
+                  waitForAuth = InAppPaymentData.WaitingForAuthorizationState(
+                    stripeIntentId = action.stripeIntentAccessor.intentId,
+                    stripeClientSecret = action.stripeIntentAccessor.intentClientSecret
+                  )
+                )
+              )
+            )
+            .flatMap { stripeRepository.getStatusAndPaymentMethodId(it, action.paymentMethodId) }
+        }
+        .flatMapCompletable {
+          oneTimeInAppPaymentRepository.waitForOneTimeRedemption(
+            inAppPayment = inAppPayment,
+            paymentIntentId = paymentIntent.intentId,
+            paymentSourceType = paymentSource.type
+          )
+        }
+    }.subscribeBy(
+      onError = { throwable ->
+        Log.w(TAG, "Failure in one-time payment pipeline...", throwable, true)
+        store.update { InAppPaymentProcessorStage.FAILED }
+        InAppPaymentsRepository.handlePipelineError(inAppPayment.id, DonationErrorSource.ONE_TIME, paymentSourceProvider.paymentSourceType, throwable)
+      },
+      onComplete = {
+        Log.w(TAG, "Completed one-time payment pipeline...", true)
+        store.update { InAppPaymentProcessorStage.COMPLETE }
+      }
+    )
+  }
+
+  fun cancelSubscription(subscriberType: InAppPaymentSubscriberRecord.Type) {
+    Log.d(TAG, "Beginning cancellation...", true)
+
+    store.update { InAppPaymentProcessorStage.CANCELLING }
+    disposables += RecurringInAppPaymentRepository.cancelActiveSubscription(subscriberType).subscribeBy(
+      onComplete = {
+        Log.d(TAG, "Cancellation succeeded", true)
+        store.update { InAppPaymentProcessorStage.COMPLETE }
+      },
+      onError = { throwable ->
+        Log.w(TAG, "Cancellation failed", throwable, true)
+        store.update { InAppPaymentProcessorStage.FAILED }
+      }
+    )
+  }
+
+  fun updateSubscription(inAppPayment: InAppPaymentTable.InAppPayment) {
+    Log.d(TAG, "Beginning subscription update...", true)
+    store.update { InAppPaymentProcessorStage.PAYMENT_PIPELINE }
+    disposables += RecurringInAppPaymentRepository
+      .cancelActiveSubscriptionIfNecessary(inAppPayment.type.requireSubscriberType())
+      .andThen(RecurringInAppPaymentRepository.getPaymentSourceTypeOfLatestSubscription(inAppPayment.type.requireSubscriberType()))
+      .flatMapCompletable { paymentSourceType -> RecurringInAppPaymentRepository.setSubscriptionLevel(inAppPayment, paymentSourceType) }
+      .subscribeBy(
+        onComplete = {
+          Log.w(TAG, "Completed subscription update", true)
+          store.update { InAppPaymentProcessorStage.COMPLETE }
+        },
+        onError = { throwable ->
+          Log.w(TAG, "Failed to update subscription", throwable, true)
+          store.update { InAppPaymentProcessorStage.FAILED }
+          SignalExecutors.BOUNDED_IO.execute {
+            val paymentSourceType = InAppPaymentsRepository.getLatestPaymentMethodType(inAppPayment.type.requireSubscriberType()).toPaymentSourceType()
+            InAppPaymentsRepository.handlePipelineError(inAppPayment.id, DonationErrorSource.MONTHLY, paymentSourceType, throwable)
+          }
+        }
+      )
+  }
+
+  private data class PaymentSourceProvider(
+    val paymentSourceType: PaymentSourceType,
+    val paymentSource: Single<StripeApi.PaymentSource>
+  )
+
+  private sealed interface StripePaymentData {
+    class GooglePay(val paymentData: PaymentData) : StripePaymentData
+    class CreditCard(val cardData: StripeApi.CardData) : StripePaymentData
+    class SEPADebit(val sepaDebitData: StripeApi.SEPADebitData) : StripePaymentData
+    class IDEAL(val idealData: StripeApi.IDEALData) : StripePaymentData
+  }
+
+  class Factory(
+    private val stripeRepository: StripeRepository,
+    private val oneTimeInAppPaymentRepository: OneTimeInAppPaymentRepository = OneTimeInAppPaymentRepository(AppDependencies.donationsService)
+  ) : ViewModelProvider.Factory {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+      return modelClass.cast(StripePaymentInProgressViewModel(stripeRepository, oneTimeInAppPaymentRepository)) as T
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/BankDetailsValidator.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/BankDetailsValidator.kt
new file mode 100644
index 0000000000..628c7ac142
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/BankDetailsValidator.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer
+
+object BankDetailsValidator {
+
+  private val EMAIL_REGEX: Regex = ".+@.+\\..+".toRegex()
+
+  fun validName(name: String): Boolean {
+    return name.length >= 2
+  }
+
+  fun validEmail(email: String): Boolean {
+    return email.length >= 3 && email.matches(EMAIL_REGEX)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/BankTransferRequestKeys.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/BankTransferRequestKeys.kt
new file mode 100644
index 0000000000..8338a1cb95
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/BankTransferRequestKeys.kt
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer
+
+object BankTransferRequestKeys {
+  const val REQUEST_KEY = "bank.transfer.result"
+  const val PENDING_KEY = "bank.transfer.pending"
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/BankTransferDetailsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/BankTransferDetailsFragment.kt
new file mode 100644
index 0000000000..064ba35d5d
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/BankTransferDetailsFragment.kt
@@ -0,0 +1,369 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.details
+
+import android.os.Bundle
+import android.view.View
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment.Companion.Center
+import androidx.compose.ui.Alignment.Companion.CenterHorizontally
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusDirection
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.core.os.bundleOf
+import androidx.fragment.app.setFragmentResult
+import androidx.fragment.app.setFragmentResultListener
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
+import androidx.navigation.navGraphViewModels
+import org.signal.core.ui.Buttons
+import org.signal.core.ui.Scaffolds
+import org.signal.core.ui.Texts
+import org.signal.core.ui.theme.SignalTheme
+import org.signal.core.util.getParcelableCompat
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.TemporaryScreenshotSecurity
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatMoney
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentComponent
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentCheckoutDelegate
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentProcessorAction
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentProcessorActionResult
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.StripePaymentInProgressFragment
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.StripePaymentInProgressViewModel
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.BankTransferRequestKeys
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.details.BankTransferDetailsViewModel.Field
+import org.thoughtcrime.securesms.compose.ComposeFragment
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import org.thoughtcrime.securesms.util.SpanUtil
+import org.thoughtcrime.securesms.util.fragments.requireListener
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
+
+/**
+ * Collects SEPA Debit bank transfer details from the user to proceed with donation.
+ */
+class BankTransferDetailsFragment : ComposeFragment(), InAppPaymentCheckoutDelegate.ErrorHandlerCallback {
+
+  private val args: BankTransferDetailsFragmentArgs by navArgs()
+  private val viewModel: BankTransferDetailsViewModel by viewModels()
+
+  private val stripePaymentViewModel: StripePaymentInProgressViewModel by navGraphViewModels(
+    R.id.checkout_flow,
+    factoryProducer = {
+      StripePaymentInProgressViewModel.Factory(requireListener<InAppPaymentComponent>().stripeRepository)
+    }
+  )
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    TemporaryScreenshotSecurity.bindToViewLifecycleOwner(this)
+
+    InAppPaymentCheckoutDelegate.ErrorHandler().attach(this, this, args.inAppPayment.id)
+
+    setFragmentResultListener(StripePaymentInProgressFragment.REQUEST_KEY) { _, bundle ->
+      val result: InAppPaymentProcessorActionResult = bundle.getParcelableCompat(StripePaymentInProgressFragment.REQUEST_KEY, InAppPaymentProcessorActionResult::class.java)!!
+      if (result.status == InAppPaymentProcessorActionResult.Status.SUCCESS) {
+        findNavController().popBackStack(R.id.donateToSignalFragment, false)
+        setFragmentResult(BankTransferRequestKeys.REQUEST_KEY, bundle)
+      }
+    }
+  }
+
+  @Composable
+  override fun FragmentContent() {
+    val state: BankTransferDetailsState by viewModel.state
+
+    val donateLabel = remember(args.inAppPayment) {
+      if (args.inAppPayment.type.recurring) { // TODO [message-requests] backups copy
+        getString(
+          R.string.BankTransferDetailsFragment__donate_s_month,
+          FiatMoneyUtil.format(resources, args.inAppPayment.data.amount!!.toFiatMoney(), FiatMoneyUtil.formatOptions().trimZerosAfterDecimal())
+        )
+      } else {
+        getString(
+          R.string.BankTransferDetailsFragment__donate_s,
+          FiatMoneyUtil.format(resources, args.inAppPayment.data.amount!!.toFiatMoney())
+        )
+      }
+    }
+
+    BankTransferDetailsContent(
+      state = state,
+      onNavigationClick = this::onNavigationClick,
+      onNameChanged = viewModel::onNameChanged,
+      onIBANChanged = viewModel::onIBANChanged,
+      onEmailChanged = viewModel::onEmailChanged,
+      setDisplayFindAccountInfoSheet = viewModel::setDisplayFindAccountInfoSheet,
+      onLearnMoreClick = this::onLearnMoreClick,
+      onDonateClick = this::onDonateClick,
+      onFocusChanged = viewModel::onFocusChanged,
+      donateLabel = donateLabel
+    )
+  }
+
+  private fun onNavigationClick() {
+    findNavController().popBackStack()
+  }
+
+  private fun onLearnMoreClick() {
+    findNavController().safeNavigate(
+      BankTransferDetailsFragmentDirections.actionBankTransferDetailsFragmentToYourInformationIsPrivateBottomSheet()
+    )
+  }
+
+  private fun onDonateClick() {
+    stripePaymentViewModel.provideSEPADebitData(viewModel.state.value.asSEPADebitData())
+    findNavController().safeNavigate(
+      BankTransferDetailsFragmentDirections.actionBankTransferDetailsFragmentToStripePaymentInProgressFragment(
+        InAppPaymentProcessorAction.PROCESS_NEW_IN_APP_PAYMENT,
+        args.inAppPayment,
+        args.inAppPayment.type
+      )
+    )
+  }
+
+  override fun onUserLaunchedAnExternalApplication() = Unit
+
+  override fun navigateToDonationPending(inAppPayment: InAppPaymentTable.InAppPayment) {
+    setFragmentResult(BankTransferRequestKeys.PENDING_KEY, bundleOf(BankTransferRequestKeys.PENDING_KEY to inAppPayment))
+    viewLifecycleOwner.lifecycle.addObserver(object : DefaultLifecycleObserver {
+      override fun onResume(owner: LifecycleOwner) {
+        findNavController().popBackStack(R.id.donateToSignalFragment, false)
+      }
+    })
+  }
+}
+
+@Preview
+@Composable
+private fun BankTransferDetailsContentPreview() {
+  SignalTheme {
+    BankTransferDetailsContent(
+      state = BankTransferDetailsState(
+        name = "Miles Morales",
+        displayFindAccountInfoSheet = true
+      ),
+      onNavigationClick = {},
+      onNameChanged = {},
+      onIBANChanged = {},
+      onEmailChanged = {},
+      setDisplayFindAccountInfoSheet = {},
+      onLearnMoreClick = {},
+      onDonateClick = {},
+      onFocusChanged = { _, _ -> },
+      donateLabel = "Donate $5/month"
+    )
+  }
+}
+
+@Composable
+private fun BankTransferDetailsContent(
+  state: BankTransferDetailsState,
+  onNavigationClick: () -> Unit,
+  onNameChanged: (String) -> Unit,
+  onIBANChanged: (String) -> Unit,
+  onEmailChanged: (String) -> Unit,
+  setDisplayFindAccountInfoSheet: (Boolean) -> Unit,
+  onLearnMoreClick: () -> Unit,
+  onDonateClick: () -> Unit,
+  onFocusChanged: (Field, Boolean) -> Unit,
+  donateLabel: String
+) {
+  Scaffolds.Settings(
+    title = "Bank transfer",
+    onNavigationClick = onNavigationClick,
+    navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_left_24)
+  ) {
+    Column(
+      horizontalAlignment = CenterHorizontally,
+      modifier = Modifier
+        .fillMaxWidth()
+        .fillMaxHeight()
+        .padding(it)
+    ) {
+      val focusManager = LocalFocusManager.current
+      val focusRequester = remember { FocusRequester() }
+
+      LazyColumn(
+        modifier = Modifier
+          .weight(1f)
+          .padding(horizontal = 24.dp)
+      ) {
+        item {
+          val learnMore = stringResource(id = R.string.BankTransferDetailsFragment__learn_more)
+          val fullString = stringResource(id = R.string.BankTransferDetailsFragment__enter_your_bank_details, learnMore)
+
+          Texts.LinkifiedText(
+            textWithUrlSpans = SpanUtil.urlSubsequence(fullString, learnMore, stringResource(id = R.string.donate_faq_url)),
+            onUrlClick = {
+              onLearnMoreClick()
+            },
+            style = MaterialTheme.typography.bodyMedium.copy(
+              color = MaterialTheme.colorScheme.onSurfaceVariant
+            ),
+            modifier = Modifier.padding(vertical = 12.dp)
+          )
+        }
+
+        item {
+          TextField(
+            value = state.iban,
+            onValueChange = onIBANChanged,
+            label = {
+              Text(text = stringResource(id = R.string.BankTransferDetailsFragment__iban))
+            },
+            keyboardOptions = KeyboardOptions(
+              capitalization = KeyboardCapitalization.Characters,
+              imeAction = ImeAction.Next
+            ),
+            keyboardActions = KeyboardActions(
+              onNext = { focusManager.moveFocus(FocusDirection.Down) }
+            ),
+            isError = state.ibanValidity.isError,
+            supportingText = {
+              if (state.ibanValidity.isError) {
+                Text(
+                  text = when (state.ibanValidity) {
+                    IBANValidator.Validity.TOO_SHORT -> stringResource(id = R.string.BankTransferDetailsFragment__iban_is_too_short)
+                    IBANValidator.Validity.TOO_LONG -> stringResource(id = R.string.BankTransferDetailsFragment__iban_is_too_long)
+                    IBANValidator.Validity.INVALID_COUNTRY -> stringResource(id = R.string.BankTransferDetailsFragment__iban_country_code_is_not_supported)
+                    IBANValidator.Validity.INVALID_CHARACTERS -> stringResource(id = R.string.BankTransferDetailsFragment__invalid_iban)
+                    IBANValidator.Validity.INVALID_MOD_97 -> stringResource(id = R.string.BankTransferDetailsFragment__invalid_iban)
+                    else -> error("Unexpected error.")
+                  }
+                )
+              }
+            },
+            visualTransformation = IBANVisualTransformation,
+            modifier = Modifier
+              .fillMaxWidth()
+              .padding(top = 12.dp)
+              .defaultMinSize(minHeight = 78.dp)
+              .onFocusChanged { onFocusChanged(Field.IBAN, it.hasFocus) }
+              .focusRequester(focusRequester)
+          )
+        }
+
+        item {
+          TextField(
+            value = state.name,
+            onValueChange = onNameChanged,
+            label = {
+              Text(text = stringResource(id = R.string.BankTransferDetailsFragment__name_on_bank_account))
+            },
+            keyboardOptions = KeyboardOptions(
+              capitalization = KeyboardCapitalization.Words,
+              imeAction = ImeAction.Next
+            ),
+            keyboardActions = KeyboardActions(
+              onNext = { focusManager.moveFocus(FocusDirection.Down) }
+            ),
+            isError = state.showNameError(),
+            supportingText = {
+              if (state.showNameError()) {
+                Text(text = stringResource(id = R.string.BankTransferDetailsFragment__minimum_2_characters))
+              }
+            },
+            modifier = Modifier
+              .fillMaxWidth()
+              .padding(top = 16.dp)
+              .defaultMinSize(minHeight = 78.dp)
+              .onFocusChanged { onFocusChanged(Field.NAME, it.hasFocus) }
+          )
+        }
+
+        item {
+          TextField(
+            value = state.email,
+            onValueChange = onEmailChanged,
+            label = {
+              Text(text = stringResource(id = R.string.BankTransferDetailsFragment__email))
+            },
+            keyboardOptions = KeyboardOptions(
+              keyboardType = KeyboardType.Email,
+              imeAction = ImeAction.Done
+            ),
+            keyboardActions = KeyboardActions(
+              onDone = { onDonateClick() }
+            ),
+            isError = state.showEmailError(),
+            supportingText = {
+              if (state.showEmailError()) {
+                Text(text = stringResource(id = R.string.BankTransferDetailsFragment__invalid_email_address))
+              }
+            },
+            modifier = Modifier
+              .fillMaxWidth()
+              .padding(top = 16.dp)
+              .defaultMinSize(minHeight = 78.dp)
+              .onFocusChanged { onFocusChanged(Field.EMAIL, it.hasFocus) }
+          )
+        }
+
+        item {
+          Box(
+            contentAlignment = Center,
+            modifier = Modifier
+              .fillMaxWidth()
+              .padding(top = 8.dp)
+          ) {
+            TextButton(
+              onClick = { setDisplayFindAccountInfoSheet(true) }
+            ) {
+              Text(text = stringResource(id = R.string.BankTransferDetailsFragment__find_account_info))
+            }
+          }
+        }
+      }
+
+      Buttons.LargeTonal(
+        enabled = state.canProceed,
+        onClick = onDonateClick,
+        modifier = Modifier
+          .defaultMinSize(minWidth = 220.dp)
+          .padding(vertical = 16.dp)
+      ) {
+        Text(text = donateLabel)
+      }
+
+      if (state.displayFindAccountInfoSheet) {
+        FindAccountInfoSheet { setDisplayFindAccountInfoSheet(false) }
+      }
+
+      LaunchedEffect(Unit) {
+        focusRequester.requestFocus()
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/BankTransferDetailsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/BankTransferDetailsState.kt
new file mode 100644
index 0000000000..9332ad217e
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/BankTransferDetailsState.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.details
+
+import org.signal.donations.StripeApi
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.BankDetailsValidator
+
+data class BankTransferDetailsState(
+  val name: String = "",
+  val nameFocusState: FocusState = FocusState.NOT_FOCUSED,
+  val iban: String = "",
+  val email: String = "",
+  val emailFocusState: FocusState = FocusState.NOT_FOCUSED,
+  val ibanValidity: IBANValidator.Validity = IBANValidator.Validity.POTENTIALLY_VALID,
+  val displayFindAccountInfoSheet: Boolean = false
+) {
+  val canProceed = BankDetailsValidator.validName(name) && BankDetailsValidator.validEmail(email) && ibanValidity == IBANValidator.Validity.COMPLETELY_VALID
+
+  fun showNameError(): Boolean {
+    return nameFocusState == FocusState.LOST_FOCUS && !BankDetailsValidator.validName(name)
+  }
+
+  fun showEmailError(): Boolean {
+    return emailFocusState == FocusState.LOST_FOCUS && !BankDetailsValidator.validEmail(email)
+  }
+
+  fun asSEPADebitData(): StripeApi.SEPADebitData {
+    return StripeApi.SEPADebitData(
+      iban = iban.trim(),
+      name = name.trim(),
+      email = email.trim()
+    )
+  }
+
+  enum class FocusState {
+    NOT_FOCUSED,
+    FOCUSED,
+    LOST_FOCUS
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/BankTransferDetailsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/BankTransferDetailsViewModel.kt
new file mode 100644
index 0000000000..604b80699d
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/BankTransferDetailsViewModel.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.details
+
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.details.BankTransferDetailsState.FocusState
+
+class BankTransferDetailsViewModel : ViewModel() {
+
+  companion object {
+    private const val IBAN_MAX_CHARACTER_COUNT = 34
+  }
+
+  private val internalState = mutableStateOf(BankTransferDetailsState())
+  val state: State<BankTransferDetailsState> = internalState
+
+  fun setDisplayFindAccountInfoSheet(displayFindAccountInfoSheet: Boolean) {
+    internalState.value = internalState.value.copy(
+      displayFindAccountInfoSheet = displayFindAccountInfoSheet
+    )
+  }
+
+  fun onNameChanged(name: String) {
+    internalState.value = internalState.value.copy(
+      name = name
+    )
+  }
+
+  fun onFocusChanged(field: Field, isFocused: Boolean) {
+    when (field) {
+      Field.IBAN -> {
+        internalState.value = internalState.value.copy(
+          ibanValidity = IBANValidator.validate(internalState.value.iban, isFocused)
+        )
+      }
+
+      Field.NAME -> {
+        if (isFocused && internalState.value.nameFocusState == FocusState.NOT_FOCUSED) {
+          internalState.value = internalState.value.copy(nameFocusState = FocusState.FOCUSED)
+        } else if (!isFocused && internalState.value.nameFocusState == FocusState.FOCUSED) {
+          internalState.value = internalState.value.copy(nameFocusState = FocusState.LOST_FOCUS)
+        }
+      }
+
+      Field.EMAIL -> {
+        if (isFocused && internalState.value.emailFocusState == FocusState.NOT_FOCUSED) {
+          internalState.value = internalState.value.copy(emailFocusState = FocusState.FOCUSED)
+        } else if (!isFocused && internalState.value.emailFocusState == FocusState.FOCUSED) {
+          internalState.value = internalState.value.copy(emailFocusState = FocusState.LOST_FOCUS)
+        }
+      }
+    }
+  }
+
+  fun onIBANChanged(iban: String) {
+    internalState.value = internalState.value.copy(
+      iban = iban.take(IBAN_MAX_CHARACTER_COUNT).uppercase(),
+      ibanValidity = IBANValidator.validate(internalState.value.iban, true)
+    )
+  }
+
+  fun onEmailChanged(email: String) {
+    internalState.value = internalState.value.copy(
+      email = email
+    )
+  }
+
+  enum class Field {
+    IBAN,
+    NAME,
+    EMAIL
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/FindAccountInfoSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/FindAccountInfoSheet.kt
new file mode 100644
index 0000000000..6f8525798b
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/FindAccountInfoSheet.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.details
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment.Companion.CenterHorizontally
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import org.signal.core.ui.BottomSheets
+import org.thoughtcrime.securesms.R
+
+/**
+ * Displays a modal bottom sheet that explains where to find the information necessary to perform
+ * a bank transfer.
+ */
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+fun FindAccountInfoSheet(
+  onDismissRequest: () -> Unit
+) {
+  ModalBottomSheet(
+    onDismissRequest = onDismissRequest,
+    dragHandle = { BottomSheets.Handle() }
+  ) {
+    Image(
+      painter = painterResource(id = R.drawable.find_account_info),
+      contentDescription = null,
+      modifier = Modifier
+        .align(CenterHorizontally)
+        .padding(vertical = 32.dp)
+    )
+
+    Text(
+      text = stringResource(id = R.string.FindAccountInfoSheet__find_your_account_information),
+      style = MaterialTheme.typography.titleLarge,
+      textAlign = TextAlign.Center,
+      modifier = Modifier
+        .fillMaxWidth()
+        .padding(horizontal = 60.dp)
+        .align(CenterHorizontally)
+    )
+
+    Text(
+      text = stringResource(id = R.string.FindAccountInfoSheet__look_for_your_iban_at),
+      style = MaterialTheme.typography.bodyMedium,
+      color = MaterialTheme.colorScheme.onSurfaceVariant,
+      textAlign = TextAlign.Center,
+      modifier = Modifier
+        .fillMaxWidth()
+        .padding(top = 12.dp, bottom = 48.dp, start = 60.dp, end = 60.dp)
+        .align(CenterHorizontally)
+    )
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/IBANValidator.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/IBANValidator.kt
new file mode 100644
index 0000000000..83de82e23b
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/IBANValidator.kt
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.details
+
+import java.math.BigInteger
+
+object IBANValidator {
+
+  private val countryCodeToLength: Map<String, Int> by lazy {
+    mapOf(
+      "AL" to 28,
+      "AD" to 24,
+      "AT" to 20,
+      "AZ" to 28,
+      "BH" to 22,
+      "BY" to 28,
+      "BE" to 16,
+      "BA" to 20,
+      "BR" to 29,
+      "BG" to 22,
+      "CR" to 22,
+      "HR" to 21,
+      "CY" to 28,
+      "CZ" to 24,
+      "DK" to 18,
+      "DO" to 28,
+      "TL" to 23,
+      "EG" to 29,
+      "SV" to 28,
+      "EE" to 20,
+      "FO" to 18,
+      "FI" to 18,
+      "FR" to 27,
+      "GE" to 22,
+      "DE" to 22,
+      "GI" to 23,
+      "GR" to 27,
+      "GL" to 18,
+      "GT" to 28,
+      "HU" to 28,
+      "IS" to 26,
+      "IQ" to 23,
+      "IE" to 22,
+      "IL" to 23,
+      "IT" to 27,
+      "JO" to 30,
+      "KZ" to 20,
+      "XK" to 20,
+      "KW" to 30,
+      "LV" to 21,
+      "LB" to 28,
+      "LY" to 25,
+      "LI" to 21,
+      "LT" to 20,
+      "LU" to 20,
+      "MT" to 31,
+      "MR" to 27,
+      "MU" to 30,
+      "MC" to 27,
+      "MD" to 24,
+      "ME" to 22,
+      "NL" to 18,
+      "MK" to 19,
+      "NO" to 15,
+      "PK" to 24,
+      "PS" to 29,
+      "PL" to 28,
+      "PT" to 25,
+      "QA" to 29,
+      "RO" to 24,
+      "RU" to 33,
+      "LC" to 32,
+      "SM" to 27,
+      "ST" to 25,
+      "SA" to 24,
+      "RS" to 22,
+      "SC" to 31,
+      "SK" to 24,
+      "SI" to 19,
+      "ES" to 24,
+      "SD" to 18,
+      "SE" to 24,
+      "CH" to 21,
+      "TN" to 24,
+      "TR" to 26,
+      "UA" to 29,
+      "AE" to 23,
+      "GB" to 22,
+      "VA" to 22,
+      "VG" to 24
+    )
+  }
+
+  fun validate(iban: String, isIBANFieldFocused: Boolean): Validity {
+    val trimmedIban = iban.trim()
+
+    if (trimmedIban.isEmpty()) {
+      return Validity.POTENTIALLY_VALID
+    }
+
+    val lengthValidity = validateLength(trimmedIban, isIBANFieldFocused)
+    if (lengthValidity != Validity.COMPLETELY_VALID) {
+      return lengthValidity
+    }
+
+    val countryAndCheck = trimmedIban.take(4)
+    val rearranged = trimmedIban.drop(4) + countryAndCheck
+    val expanded = rearranged.map {
+      if (it.isLetter()) {
+        (it - 'A') + 10
+      } else if (it.isDigit()) {
+        it.digitToInt()
+      } else {
+        return Validity.INVALID_CHARACTERS
+      }
+    }.joinToString("")
+    val bigInteger = BigInteger(expanded)
+    if (bigInteger.mod(BigInteger.valueOf(97L)) == BigInteger.ONE) {
+      return Validity.COMPLETELY_VALID
+    }
+
+    return Validity.INVALID_MOD_97
+  }
+
+  private fun validateLength(iban: String, isIBANFieldFocused: Boolean): Validity {
+    if (iban.length < 2) {
+      return if (isIBANFieldFocused) {
+        Validity.POTENTIALLY_VALID
+      } else {
+        Validity.TOO_SHORT
+      }
+    }
+
+    val countryCode = iban.take(2)
+    val requiredLength = countryCodeToLength[countryCode] ?: -1
+    if (requiredLength == -1) {
+      return Validity.INVALID_COUNTRY
+    }
+
+    if (requiredLength > iban.length) {
+      return if (isIBANFieldFocused) Validity.POTENTIALLY_VALID else Validity.TOO_SHORT
+    }
+
+    if (requiredLength < iban.length) {
+      return Validity.TOO_LONG
+    }
+
+    return Validity.COMPLETELY_VALID
+  }
+
+  enum class Validity(val isError: Boolean) {
+    TOO_SHORT(true),
+    TOO_LONG(true),
+    INVALID_COUNTRY(true),
+    INVALID_CHARACTERS(true),
+    INVALID_MOD_97(true),
+    POTENTIALLY_VALID(false),
+    COMPLETELY_VALID(false)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/IBANVisualTransformation.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/IBANVisualTransformation.kt
new file mode 100644
index 0000000000..12bd098d49
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/IBANVisualTransformation.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.details
+
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.input.OffsetMapping
+import androidx.compose.ui.text.input.TransformedText
+import androidx.compose.ui.text.input.VisualTransformation
+
+/**
+ * Transforms the given input string to an IBAN representative format:
+ *
+ * AB1234567890 becomes AB12 3456 7890
+ */
+object IBANVisualTransformation : VisualTransformation {
+  override fun filter(text: AnnotatedString): TransformedText {
+    var output = ""
+    for (i in text.take(34).indices) {
+      output += text[i]
+      if (i % 4 == 3) {
+        output += " "
+      }
+    }
+
+    return TransformedText(
+      text = AnnotatedString(output),
+      offsetMapping = IBANOffsetMapping
+    )
+  }
+
+  private object IBANOffsetMapping : OffsetMapping {
+    override fun originalToTransformed(offset: Int): Int {
+      return offset + (offset / 4)
+    }
+
+    override fun transformedToOriginal(offset: Int): Int {
+      return offset - (offset / 4)
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealBank.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealBank.kt
new file mode 100644
index 0000000000..bc69f3f77d
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealBank.kt
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.ideal
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import org.thoughtcrime.securesms.R
+import java.util.EnumMap
+
+/**
+ * Set of banks that are supported for iDEAL transfers, as listed here:
+ * https://stripe.com/docs/api/payment_methods/object#payment_method_object-ideal-bank
+ */
+enum class IdealBank(
+  val code: String
+) {
+  ABN_AMRO("abn_amro"),
+  ASN_BANK("asn_bank"),
+  BUNQ("bunq"),
+  ING("ing"),
+  KNAB("knab"),
+  N26("n26"),
+  RABOBANK("rabobank"),
+  REGIOBANK("regiobank"),
+  REVOLUT("revolut"),
+  SNS_BANK("sns_bank"),
+  TRIODOS_BANK("triodos_bank"),
+  VAN_LANSCHOT("van_lanschot"),
+  YOURSAFE("yoursafe");
+
+  fun getUIValues(): UIValues = bankToUIValues[this]!!
+
+  companion object {
+
+    private val bankToUIValues: Map<IdealBank, UIValues> by lazy {
+      EnumMap<IdealBank, UIValues>(IdealBank::class.java).apply {
+        putAll(
+          arrayOf(
+            ABN_AMRO to UIValues(
+              name = R.string.IdealBank__abn_amro,
+              icon = R.drawable.ideal_abn_amro
+            ),
+            ASN_BANK to UIValues(
+              name = R.string.IdealBank__asn_bank,
+              icon = R.drawable.ideal_asn
+            ),
+            BUNQ to UIValues(
+              name = R.string.IdealBank__bunq,
+              icon = R.drawable.ideal_bunq
+            ),
+            ING to UIValues(
+              name = R.string.IdealBank__ing,
+              icon = R.drawable.ideal_ing
+            ),
+            KNAB to UIValues(
+              name = R.string.IdealBank__knab,
+              icon = R.drawable.ideal_knab
+            ),
+            N26 to UIValues(
+              name = R.string.IdealBank__n26,
+              icon = R.drawable.ideal_n26
+            ),
+            RABOBANK to UIValues(
+              name = R.string.IdealBank__rabobank,
+              icon = R.drawable.ideal_rabobank
+            ),
+            REGIOBANK to UIValues(
+              name = R.string.IdealBank__regiobank,
+              icon = R.drawable.ideal_regiobank
+            ),
+            REVOLUT to UIValues(
+              name = R.string.IdealBank__revolut,
+              icon = R.drawable.ideal_revolut
+            ),
+            SNS_BANK to UIValues(
+              name = R.string.IdealBank__sns_bank,
+              icon = R.drawable.ideal_sns
+            ),
+            TRIODOS_BANK to UIValues(
+              name = R.string.IdealBank__triodos_bank,
+              icon = R.drawable.ideal_triodos_bank
+            ),
+            VAN_LANSCHOT to UIValues(
+              name = R.string.IdealBank__van_lanschot,
+              icon = R.drawable.ideal_van_lanschot
+            ),
+            YOURSAFE to UIValues(
+              name = R.string.IdealBank__yoursafe,
+              icon = R.drawable.ideal_yoursafe
+            )
+          )
+        )
+      }
+    }
+
+    fun fromCode(code: String): IdealBank {
+      return values().first { it.code == code }
+    }
+  }
+
+  data class UIValues(
+    @StringRes val name: Int,
+    @DrawableRes val icon: Int
+  )
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsBankSelectionDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsBankSelectionDialogFragment.kt
new file mode 100644
index 0000000000..e17cea02ed
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsBankSelectionDialogFragment.kt
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.ideal
+
+import android.os.Bundle
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment.Companion.CenterVertically
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.core.os.bundleOf
+import androidx.fragment.app.setFragmentResult
+import androidx.navigation.fragment.findNavController
+import org.signal.core.ui.Scaffolds
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.compose.ComposeDialogFragment
+
+/**
+ * Dialog fragment for selecting the bank for the iDEAL donation.
+ */
+class IdealTransferDetailsBankSelectionDialogFragment : ComposeDialogFragment() {
+
+  companion object {
+    const val IDEAL_SELECTED_BANK = "ideal.selected.bank"
+  }
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+
+    setStyle(STYLE_NO_FRAME, R.style.Signal_DayNight_Dialog_FullScreen)
+  }
+
+  @Composable
+  override fun DialogContent() {
+    BankSelectionContent(
+      onNavigationClick = { findNavController().popBackStack() },
+      onBankSelected = {
+        dismissAllowingStateLoss()
+
+        setFragmentResult(
+          IDEAL_SELECTED_BANK,
+          bundleOf(
+            IDEAL_SELECTED_BANK to it.code
+          )
+        )
+      }
+    )
+  }
+}
+
+@Preview
+@Composable
+private fun BankSelectionContentPreview() {
+  BankSelectionContent(
+    onNavigationClick = {},
+    onBankSelected = {}
+  )
+}
+
+@Composable
+private fun BankSelectionContent(
+  onNavigationClick: () -> Unit,
+  onBankSelected: (IdealBank) -> Unit
+) {
+  Scaffolds.Settings(
+    title = stringResource(R.string.IdealTransferDetailsBankSelectionDialogFragment__choose_your_bank),
+    onNavigationClick = onNavigationClick,
+    navigationIconPainter = painterResource(id = R.drawable.symbol_x_24)
+  ) { paddingValues ->
+    LazyColumn(modifier = Modifier.padding(paddingValues)) {
+      items(IdealBank.values()) {
+        val uiValues = it.getUIValues()
+
+        Row(
+          verticalAlignment = CenterVertically,
+          modifier = Modifier
+            .clickable { onBankSelected(it) }
+            .fillMaxWidth()
+            .defaultMinSize(minHeight = 56.dp)
+            .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter), vertical = 8.dp)
+        ) {
+          Image(
+            painter = painterResource(id = uiValues.icon),
+            contentDescription = null,
+            modifier = Modifier
+              .size(40.dp)
+          )
+
+          Text(
+            text = stringResource(uiValues.name),
+            modifier = Modifier.padding(start = 24.dp)
+          )
+        }
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsFragment.kt
new file mode 100644
index 0000000000..932555dae5
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsFragment.kt
@@ -0,0 +1,401 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.ideal
+
+import android.os.Bundle
+import android.view.View
+import androidx.annotation.StringRes
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment.Companion.CenterHorizontally
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusDirection
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.core.os.bundleOf
+import androidx.fragment.app.setFragmentResult
+import androidx.fragment.app.setFragmentResultListener
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
+import androidx.navigation.navGraphViewModels
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.signal.core.ui.Buttons
+import org.signal.core.ui.Scaffolds
+import org.signal.core.ui.Texts
+import org.signal.core.util.getParcelableCompat
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.TemporaryScreenshotSecurity
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatMoney
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentComponent
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentCheckoutDelegate
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentProcessorAction
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentProcessorActionResult
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.StripePaymentInProgressFragment
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.StripePaymentInProgressViewModel
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.BankTransferRequestKeys
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.ideal.IdealTransferDetailsViewModel.Field
+import org.thoughtcrime.securesms.compose.ComposeFragment
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import org.thoughtcrime.securesms.util.SpanUtil
+import org.thoughtcrime.securesms.util.fragments.requireListener
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
+import org.thoughtcrime.securesms.util.viewModel
+
+/**
+ * Fragment for inputting necessary bank transfer information for iDEAL donation
+ */
+class IdealTransferDetailsFragment : ComposeFragment(), InAppPaymentCheckoutDelegate.ErrorHandlerCallback {
+
+  private val args: IdealTransferDetailsFragmentArgs by navArgs()
+  private val viewModel: IdealTransferDetailsViewModel by viewModel {
+    IdealTransferDetailsViewModel(args.inAppPayment.type.recurring)
+  }
+
+  private val stripePaymentViewModel: StripePaymentInProgressViewModel by navGraphViewModels(
+    R.id.checkout_flow,
+    factoryProducer = {
+      StripePaymentInProgressViewModel.Factory(requireListener<InAppPaymentComponent>().stripeRepository)
+    }
+  )
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    TemporaryScreenshotSecurity.bindToViewLifecycleOwner(this)
+
+    InAppPaymentCheckoutDelegate.ErrorHandler().attach(this, this, args.inAppPayment.id)
+
+    setFragmentResultListener(StripePaymentInProgressFragment.REQUEST_KEY) { _, bundle ->
+      val result: InAppPaymentProcessorActionResult = bundle.getParcelableCompat(StripePaymentInProgressFragment.REQUEST_KEY, InAppPaymentProcessorActionResult::class.java)!!
+      if (result.status == InAppPaymentProcessorActionResult.Status.SUCCESS) {
+        findNavController().popBackStack(R.id.donateToSignalFragment, false)
+        setFragmentResult(BankTransferRequestKeys.REQUEST_KEY, bundle)
+      }
+    }
+
+    setFragmentResultListener(IdealTransferDetailsBankSelectionDialogFragment.IDEAL_SELECTED_BANK) { _, bundle ->
+      val bankCode = bundle.getString(IdealTransferDetailsBankSelectionDialogFragment.IDEAL_SELECTED_BANK)!!
+      viewModel.onBankSelected(IdealBank.fromCode(bankCode))
+    }
+  }
+
+  @Composable
+  override fun FragmentContent() {
+    val state by viewModel.state
+
+    val donateLabel = remember(args.inAppPayment) {
+      if (args.inAppPayment.type.recurring) { // TODO [message-request] -- Handle backups
+        getString(
+          R.string.BankTransferDetailsFragment__donate_s_month,
+          FiatMoneyUtil.format(resources, args.inAppPayment.data.amount!!.toFiatMoney(), FiatMoneyUtil.formatOptions().trimZerosAfterDecimal())
+        )
+      } else {
+        getString(
+          R.string.BankTransferDetailsFragment__donate_s,
+          FiatMoneyUtil.format(resources, args.inAppPayment.data.amount!!.toFiatMoney())
+        )
+      }
+    }
+
+    val idealDirections = remember(args.inAppPayment) {
+      if (args.inAppPayment.type.recurring) { // TODO [message-request] -- Handle backups
+        R.string.IdealTransferDetailsFragment__enter_your_bank
+      } else {
+        R.string.IdealTransferDetailsFragment__enter_your_bank_details_one_time
+      }
+    }
+
+    IdealTransferDetailsContent(
+      state = state,
+      idealDirections = idealDirections,
+      donateLabel = donateLabel,
+      onNavigationClick = { findNavController().popBackStack() },
+      onLearnMoreClick = { findNavController().navigate(IdealTransferDetailsFragmentDirections.actionBankTransferDetailsFragmentToYourInformationIsPrivateBottomSheet()) },
+      onSelectBankClick = { findNavController().navigate(IdealTransferDetailsFragmentDirections.actionIdealTransferDetailsFragmentToIdealTransferBankSelectionDialogFragment()) },
+      onNameChanged = viewModel::onNameChanged,
+      onEmailChanged = viewModel::onEmailChanged,
+      onFocusChanged = viewModel::onFocusChanged,
+      onDonateClick = this::onDonateClick
+    )
+  }
+
+  private fun onDonateClick() {
+    val state = viewModel.state.value
+
+    val continueTransfer = {
+      stripePaymentViewModel.provideIDEALData(state.asIDEALData())
+      findNavController().safeNavigate(
+        IdealTransferDetailsFragmentDirections.actionBankTransferDetailsFragmentToStripePaymentInProgressFragment(
+          InAppPaymentProcessorAction.PROCESS_NEW_IN_APP_PAYMENT,
+          args.inAppPayment,
+          args.inAppPayment.type
+        )
+      )
+    }
+
+    if (args.inAppPayment.type.recurring) { // TODO [message-requests] -- handle backup
+      val formattedMoney = FiatMoneyUtil.format(requireContext().resources, args.inAppPayment.data.amount!!.toFiatMoney(), FiatMoneyUtil.formatOptions().trimZerosAfterDecimal())
+      MaterialAlertDialogBuilder(requireContext())
+        .setTitle(getString(R.string.IdealTransferDetailsFragment__confirm_your_donation_with_s, getString(state.idealBank!!.getUIValues().name)))
+        .setMessage(getString(R.string.IdealTransferDetailsFragment__to_setup_your_recurring_donation, formattedMoney))
+        .setPositiveButton(R.string.IdealTransferDetailsFragment__continue) { _, _ ->
+          continueTransfer()
+        }
+        .setNegativeButton(android.R.string.cancel, null)
+        .show()
+    } else {
+      continueTransfer()
+    }
+  }
+
+  override fun onUserLaunchedAnExternalApplication() {
+    viewLifecycleOwner.lifecycle.addObserver(object : DefaultLifecycleObserver {
+      override fun onResume(owner: LifecycleOwner) {
+        findNavController().popBackStack(R.id.donateToSignalFragment, true)
+      }
+    })
+  }
+
+  override fun navigateToDonationPending(inAppPayment: InAppPaymentTable.InAppPayment) {
+    setFragmentResult(BankTransferRequestKeys.PENDING_KEY, bundleOf(BankTransferRequestKeys.PENDING_KEY to inAppPayment))
+    viewLifecycleOwner.lifecycle.addObserver(object : DefaultLifecycleObserver {
+      override fun onResume(owner: LifecycleOwner) {
+        findNavController().popBackStack(R.id.donateToSignalFragment, false)
+      }
+    })
+  }
+}
+
+@Preview
+@Composable
+private fun IdealTransferDetailsContentPreview() {
+  IdealTransferDetailsContent(
+    state = IdealTransferDetailsState(isMonthly = true),
+    idealDirections = R.string.IdealTransferDetailsFragment__enter_your_bank,
+    donateLabel = "Donate $5/month",
+    onNavigationClick = {},
+    onLearnMoreClick = {},
+    onSelectBankClick = {},
+    onNameChanged = {},
+    onEmailChanged = {},
+    onFocusChanged = { _, _ -> },
+    onDonateClick = {}
+  )
+}
+
+@Composable
+private fun IdealTransferDetailsContent(
+  state: IdealTransferDetailsState,
+  @StringRes idealDirections: Int,
+  donateLabel: String,
+  onNavigationClick: () -> Unit,
+  onLearnMoreClick: () -> Unit,
+  onSelectBankClick: () -> Unit,
+  onNameChanged: (String) -> Unit,
+  onEmailChanged: (String) -> Unit,
+  onFocusChanged: (Field, Boolean) -> Unit,
+  onDonateClick: () -> Unit
+) {
+  Scaffolds.Settings(
+    title = stringResource(id = R.string.GatewaySelectorBottomSheet__ideal),
+    onNavigationClick = onNavigationClick,
+    navigationIconPainter = painterResource(id = R.drawable.symbol_arrow_left_24)
+  ) {
+    val focusManager = LocalFocusManager.current
+
+    Column(
+      horizontalAlignment = CenterHorizontally,
+      modifier = Modifier.padding(it)
+    ) {
+      LazyColumn(
+        modifier = Modifier
+          .weight(1f)
+          .padding(horizontal = 24.dp)
+      ) {
+        item {
+          val learnMore = stringResource(id = R.string.IdealTransferDetailsFragment__learn_more)
+          val fullString = stringResource(id = idealDirections, learnMore)
+
+          Texts.LinkifiedText(
+            textWithUrlSpans = SpanUtil.urlSubsequence(fullString, learnMore, stringResource(id = R.string.donate_faq_url)),
+            onUrlClick = {
+              onLearnMoreClick()
+            },
+            style = MaterialTheme.typography.bodyMedium.copy(
+              color = MaterialTheme.colorScheme.onSurfaceVariant
+            ),
+            modifier = Modifier.padding(vertical = 12.dp)
+          )
+        }
+
+        item {
+          IdealBankSelector(
+            idealBank = state.idealBank,
+            onSelectBankClick = onSelectBankClick,
+            modifier = Modifier
+              .fillMaxWidth()
+          )
+        }
+
+        item {
+          TextField(
+            value = state.name,
+            onValueChange = onNameChanged,
+            label = {
+              Text(text = stringResource(id = R.string.IdealTransferDetailsFragment__name_on_bank_account))
+            },
+            keyboardOptions = KeyboardOptions(
+              capitalization = KeyboardCapitalization.Words,
+              imeAction = ImeAction.Next
+            ),
+            keyboardActions = KeyboardActions(
+              onNext = { focusManager.moveFocus(FocusDirection.Down) }
+            ),
+            isError = state.showNameError(),
+            supportingText = {
+              if (state.showNameError()) {
+                Text(text = stringResource(id = R.string.BankTransferDetailsFragment__minimum_2_characters))
+              }
+            },
+            modifier = Modifier
+              .fillMaxWidth()
+              .padding(top = 16.dp)
+              .defaultMinSize(minHeight = 78.dp)
+              .onFocusChanged { onFocusChanged(Field.NAME, it.hasFocus) }
+          )
+        }
+
+        if (state.isMonthly) {
+          item {
+            TextField(
+              value = state.email,
+              onValueChange = onEmailChanged,
+              label = {
+                Text(text = stringResource(id = R.string.IdealTransferDetailsFragment__email))
+              },
+              keyboardOptions = KeyboardOptions(
+                keyboardType = KeyboardType.Email,
+                imeAction = ImeAction.Done
+              ),
+              keyboardActions = KeyboardActions(
+                onDone = {
+                  if (state.canProceed()) {
+                    onDonateClick()
+                  }
+                }
+              ),
+              isError = state.showEmailError(),
+              supportingText = {
+                if (state.showEmailError()) {
+                  Text(text = stringResource(id = R.string.BankTransferDetailsFragment__invalid_email_address))
+                }
+              },
+              modifier = Modifier
+                .fillMaxWidth()
+                .padding(top = 16.dp)
+                .defaultMinSize(minHeight = 78.dp)
+                .onFocusChanged { onFocusChanged(Field.EMAIL, it.hasFocus) }
+            )
+          }
+        }
+      }
+
+      Buttons.LargeTonal(
+        enabled = state.canProceed(),
+        onClick = onDonateClick,
+        modifier = Modifier
+          .defaultMinSize(minWidth = 220.dp)
+          .padding(bottom = 16.dp)
+      ) {
+        Text(text = donateLabel)
+      }
+    }
+  }
+}
+
+@Preview
+@Composable
+private fun IdealBankSelectorPreview() {
+  IdealBankSelector(
+    idealBank = null,
+    onSelectBankClick = {}
+  )
+}
+
+@Composable
+private fun IdealBankSelector(
+  idealBank: IdealBank?,
+  onSelectBankClick: () -> Unit,
+  modifier: Modifier = Modifier
+) {
+  val uiValues: IdealBank.UIValues? = remember(idealBank) { idealBank?.getUIValues() }
+  val imagePadding: Dp = if (idealBank == null) 4.dp else 0.dp
+
+  TextField(
+    value = stringResource(id = uiValues?.name ?: R.string.IdealTransferDetailsFragment__choose_your_bank),
+    textStyle = MaterialTheme.typography.bodyLarge,
+    onValueChange = {},
+    enabled = false,
+    readOnly = true,
+    leadingIcon = {
+      Image(
+        painter = painterResource(id = uiValues?.icon ?: R.drawable.bank_transfer),
+        contentDescription = null,
+        colorFilter = if (uiValues?.icon == null) ColorFilter.tint(MaterialTheme.colorScheme.onSurface) else null,
+        modifier = Modifier
+          .padding(start = 16.dp, end = 12.dp)
+          .size(32.dp)
+          .padding(imagePadding)
+      )
+    },
+    trailingIcon = {
+      Icon(
+        painter = painterResource(id = R.drawable.symbol_dropdown_triangle_compat_bold_16),
+        contentDescription = null
+      )
+    },
+    colors = TextFieldDefaults.colors(
+      disabledTextColor = MaterialTheme.colorScheme.onSurface,
+      disabledTrailingIconColor = MaterialTheme.colorScheme.onSurface,
+      disabledContainerColor = MaterialTheme.colorScheme.surfaceVariant,
+      disabledIndicatorColor = MaterialTheme.colorScheme.onSurface
+    ),
+    supportingText = {},
+    modifier = modifier
+      .defaultMinSize(minHeight = 78.dp)
+      .clickable(
+        onClick = onSelectBankClick,
+        role = Role.Button
+      )
+  )
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsState.kt
new file mode 100644
index 0000000000..627b6bfc30
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsState.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.ideal
+
+import org.signal.donations.StripeApi
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.BankDetailsValidator
+
+data class IdealTransferDetailsState(
+  val isMonthly: Boolean,
+  val idealBank: IdealBank? = null,
+  val name: String = "",
+  val nameFocusState: FocusState = FocusState.NOT_FOCUSED,
+  val email: String = "",
+  val emailFocusState: FocusState = FocusState.NOT_FOCUSED
+) {
+
+  fun showNameError(): Boolean {
+    return nameFocusState == FocusState.LOST_FOCUS && !BankDetailsValidator.validName(name)
+  }
+
+  fun showEmailError(): Boolean {
+    return emailFocusState == FocusState.LOST_FOCUS && !BankDetailsValidator.validEmail(email)
+  }
+
+  fun asIDEALData(): StripeApi.IDEALData {
+    return StripeApi.IDEALData(
+      bank = idealBank!!.code,
+      name = name.trim(),
+      email = email.trim()
+    )
+  }
+
+  fun canProceed(): Boolean {
+    return idealBank != null && BankDetailsValidator.validName(name) && (!isMonthly || BankDetailsValidator.validEmail(email))
+  }
+
+  enum class FocusState {
+    NOT_FOCUSED,
+    FOCUSED,
+    LOST_FOCUS
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsViewModel.kt
new file mode 100644
index 0000000000..18a0592855
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/ideal/IdealTransferDetailsViewModel.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.ideal
+
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+
+class IdealTransferDetailsViewModel(isMonthly: Boolean) : ViewModel() {
+
+  private val internalState = mutableStateOf(IdealTransferDetailsState(isMonthly = isMonthly))
+  var state: State<IdealTransferDetailsState> = internalState
+
+  fun onNameChanged(name: String) {
+    internalState.value = internalState.value.copy(
+      name = name
+    )
+  }
+
+  fun onEmailChanged(email: String) {
+    internalState.value = internalState.value.copy(
+      email = email
+    )
+  }
+
+  fun onFocusChanged(field: Field, isFocused: Boolean) {
+    when (field) {
+      Field.NAME -> {
+        if (isFocused && internalState.value.nameFocusState == IdealTransferDetailsState.FocusState.NOT_FOCUSED) {
+          internalState.value = internalState.value.copy(nameFocusState = IdealTransferDetailsState.FocusState.FOCUSED)
+        } else if (!isFocused && internalState.value.nameFocusState == IdealTransferDetailsState.FocusState.FOCUSED) {
+          internalState.value = internalState.value.copy(nameFocusState = IdealTransferDetailsState.FocusState.LOST_FOCUS)
+        }
+      }
+
+      Field.EMAIL -> {
+        if (isFocused && internalState.value.emailFocusState == IdealTransferDetailsState.FocusState.NOT_FOCUSED) {
+          internalState.value = internalState.value.copy(emailFocusState = IdealTransferDetailsState.FocusState.FOCUSED)
+        } else if (!isFocused && internalState.value.emailFocusState == IdealTransferDetailsState.FocusState.FOCUSED) {
+          internalState.value = internalState.value.copy(emailFocusState = IdealTransferDetailsState.FocusState.LOST_FOCUS)
+        }
+      }
+    }
+  }
+
+  fun onBankSelected(idealBank: IdealBank) {
+    internalState.value = internalState.value.copy(
+      idealBank = idealBank
+    )
+  }
+
+  enum class Field {
+    NAME,
+    EMAIL
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/mandate/BankTransferMandateFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/mandate/BankTransferMandateFragment.kt
new file mode 100644
index 0000000000..e8d4bf54af
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/mandate/BankTransferMandateFragment.kt
@@ -0,0 +1,276 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.mandate
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.view.View
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.animateScrollBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment.Companion.CenterHorizontally
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
+import kotlinx.coroutines.launch
+import org.signal.core.ui.Buttons
+import org.signal.core.ui.Dividers
+import org.signal.core.ui.Texts
+import org.signal.core.ui.theme.SignalTheme
+import org.signal.donations.PaymentSourceType
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.compose.ComposeFragment
+import org.thoughtcrime.securesms.compose.StatusBarColorAnimator
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.util.SpanUtil
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
+import org.thoughtcrime.securesms.util.viewModel
+
+/**
+ * Displays Bank Transfer legal mandate users must agree to to move forward.
+ */
+class BankTransferMandateFragment : ComposeFragment() {
+
+  private val args: BankTransferMandateFragmentArgs by navArgs()
+  private val viewModel: BankTransferMandateViewModel by viewModel {
+    BankTransferMandateViewModel(PaymentSourceType.Stripe.SEPADebit)
+  }
+
+  private lateinit var statusBarColorAnimator: StatusBarColorAnimator
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    statusBarColorAnimator = StatusBarColorAnimator(requireActivity())
+  }
+
+  override fun onResume() {
+    super.onResume()
+    statusBarColorAnimator.setColorImmediate()
+  }
+
+  @Composable
+  override fun FragmentContent() {
+    val mandate by viewModel.mandate
+    val failedToLoadMandate by viewModel.failedToLoadMandate
+
+    BankTransferScreen(
+      bankMandate = mandate,
+      failedToLoadMandate = failedToLoadMandate,
+      onNavigationClick = this::onNavigationClick,
+      onContinueClick = this::onContinueClick,
+      onLearnMoreClick = this::onLearnMoreClick,
+      onCanScrollUp = statusBarColorAnimator::setCanScrollUp
+    )
+  }
+
+  private fun onLearnMoreClick() {
+    findNavController().safeNavigate(
+      BankTransferMandateFragmentDirections.actionBankTransferMandateFragmentToYourInformationIsPrivateBottomSheet()
+    )
+  }
+
+  private fun onNavigationClick() {
+    findNavController().popBackStack()
+  }
+
+  private fun onContinueClick() {
+    if (args.inAppPayment.data.paymentMethodType == InAppPaymentData.PaymentMethodType.SEPA_DEBIT) {
+      findNavController().safeNavigate(
+        BankTransferMandateFragmentDirections.actionBankTransferMandateFragmentToBankTransferDetailsFragment(args.inAppPayment)
+      )
+    } else {
+      findNavController().safeNavigate(
+        BankTransferMandateFragmentDirections.actionBankTransferMandateFragmentToIdealTransferDetailsFragment(args.inAppPayment)
+      )
+    }
+  }
+}
+
+@Preview
+@Composable
+fun BankTransferScreenPreview() {
+  SignalTheme {
+    BankTransferScreen(
+      bankMandate = "Test ".repeat(500),
+      failedToLoadMandate = false,
+      onNavigationClick = {},
+      onContinueClick = {},
+      onLearnMoreClick = {},
+      onCanScrollUp = {}
+    )
+  }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
+@Composable
+fun BankTransferScreen(
+  bankMandate: String,
+  failedToLoadMandate: Boolean,
+  onNavigationClick: () -> Unit,
+  onContinueClick: () -> Unit,
+  onLearnMoreClick: () -> Unit,
+  onCanScrollUp: (Boolean) -> Unit
+) {
+  val listState = rememberLazyListState()
+  val scope = rememberCoroutineScope()
+
+  Scaffold(
+    topBar = {
+      TopAppBar(
+        title = {
+          AnimatedVisibility(
+            visible = listState.canScrollBackward,
+            enter = fadeIn(),
+            exit = fadeOut()
+          ) {
+            Text(text = stringResource(id = R.string.BankTransferMandateFragment__bank_transfer), style = MaterialTheme.typography.titleLarge)
+          }
+        },
+        navigationIcon = {
+          IconButton(
+            onClick = onNavigationClick,
+            Modifier.padding(end = 16.dp)
+          ) {
+            Icon(
+              painter = rememberVectorPainter(ImageVector.vectorResource(id = R.drawable.symbol_arrow_left_24)),
+              contentDescription = null
+            )
+          }
+        },
+        colors = if (listState.canScrollBackward) TopAppBarDefaults.topAppBarColors(containerColor = SignalTheme.colors.colorSurface2) else TopAppBarDefaults.topAppBarColors()
+      )
+    }
+  ) {
+    onCanScrollUp(listState.canScrollBackward)
+
+    Column(horizontalAlignment = CenterHorizontally, modifier = Modifier.fillMaxSize()) {
+      LazyColumn(
+        state = listState,
+        horizontalAlignment = CenterHorizontally,
+        modifier = Modifier
+          .fillMaxWidth()
+          .weight(1f, true)
+          .padding(top = 64.dp)
+      ) {
+        item {
+          Image(
+            painter = painterResource(id = R.drawable.bank_transfer),
+            contentScale = ContentScale.FillBounds,
+            contentDescription = null,
+            colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface),
+            modifier = Modifier
+              .size(72.dp)
+              .background(
+                SignalTheme.colors.colorSurface2,
+                CircleShape
+              )
+              .padding(18.dp)
+          )
+        }
+
+        item {
+          Text(
+            text = stringResource(id = R.string.BankTransferMandateFragment__bank_transfer),
+            style = MaterialTheme.typography.headlineMedium,
+            modifier = Modifier.padding(top = 12.dp, bottom = 15.dp)
+          )
+        }
+
+        item {
+          val learnMore = stringResource(id = R.string.BankTransferMandateFragment__learn_more)
+          val fullString = stringResource(id = R.string.BankTransferMandateFragment__stripe_processes_donations, learnMore)
+
+          Texts.LinkifiedText(
+            textWithUrlSpans = SpanUtil.urlSubsequence(fullString, learnMore, ""),
+            onUrlClick = {
+              onLearnMoreClick()
+            },
+            style = MaterialTheme.typography.bodyLarge.copy(
+              color = MaterialTheme.colorScheme.onSurfaceVariant,
+              textAlign = TextAlign.Center
+            ),
+            modifier = Modifier
+              .padding(bottom = 12.dp)
+              .padding(horizontal = dimensionResource(id = R.dimen.bank_transfer_mandate_gutter))
+          )
+        }
+
+        item {
+          Dividers.Default()
+        }
+
+        item {
+          Text(
+            text = if (failedToLoadMandate) stringResource(id = R.string.BankTransferMandateFragment__failed_to_load_mandate) else bankMandate,
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            modifier = Modifier.padding(horizontal = dimensionResource(id = R.dimen.bank_transfer_mandate_gutter), vertical = 16.dp)
+          )
+        }
+      }
+
+      if (!failedToLoadMandate) {
+        Surface(
+          shadowElevation = if (listState.canScrollForward) 8.dp else 0.dp,
+          modifier = Modifier.fillMaxWidth()
+        ) {
+          Buttons.LargeTonal(
+            onClick = {
+              if (!listState.canScrollForward) {
+                onContinueClick()
+              } else {
+                scope.launch {
+                  listState.animateScrollBy(value = 1000f)
+                }
+              }
+            },
+            modifier = Modifier
+              .wrapContentWidth()
+              .padding(top = 16.dp, bottom = 16.dp)
+              .defaultMinSize(minWidth = 220.dp)
+          ) {
+            Text(text = if (listState.canScrollForward) stringResource(id = R.string.BankTransferMandateFragment__read_more) else stringResource(id = R.string.BankTransferMandateFragment__agree))
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/mandate/BankTransferMandateRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/mandate/BankTransferMandateRepository.kt
new file mode 100644
index 0000000000..e3100be824
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/mandate/BankTransferMandateRepository.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.mandate
+
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.donations.PaymentSourceType
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import java.util.Locale
+
+class BankTransferMandateRepository {
+
+  fun getMandate(paymentSourceType: PaymentSourceType.Stripe): Single<String> {
+    return Single
+      .fromCallable { AppDependencies.donationsService.getBankMandate(Locale.getDefault(), paymentSourceType.paymentMethod) }
+      .flatMap { it.flattenResult() }
+      .map { it.mandate }
+      .subscribeOn(Schedulers.io())
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/mandate/BankTransferMandateViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/mandate/BankTransferMandateViewModel.kt
new file mode 100644
index 0000000000..2d9e5efe57
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/mandate/BankTransferMandateViewModel.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.mandate
+
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.subscribeBy
+import org.signal.donations.PaymentSourceType
+
+class BankTransferMandateViewModel(
+  paymentSourceType: PaymentSourceType,
+  repository: BankTransferMandateRepository = BankTransferMandateRepository()
+) : ViewModel() {
+
+  private val disposables = CompositeDisposable()
+  private val internalMandate = mutableStateOf("")
+  private val internalFailedToLoadMandate = mutableStateOf(false)
+
+  val mandate: State<String> = internalMandate
+  val failedToLoadMandate: State<Boolean> = internalFailedToLoadMandate
+
+  init {
+    disposables += repository.getMandate(paymentSourceType as PaymentSourceType.Stripe)
+      .observeOn(AndroidSchedulers.mainThread())
+      .subscribeBy(
+        onSuccess = { internalMandate.value = it },
+        onError = { internalFailedToLoadMandate.value = true }
+      )
+  }
+
+  override fun onCleared() {
+    disposables.clear()
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationError.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationError.kt
new file mode 100644
index 0000000000..3f9475fe08
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationError.kt
@@ -0,0 +1,253 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.errors
+
+import android.content.Context
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.subjects.PublishSubject
+import io.reactivex.rxjava3.subjects.Subject
+import org.signal.core.util.logging.Log
+import org.signal.donations.PaymentSourceType
+import org.signal.donations.StripeDeclineCode
+import org.signal.donations.StripeError
+import org.signal.donations.StripeFailureCode
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.model.databaseprotos.DonationErrorValue
+
+/**
+ * @deprecated Replaced with InAppDonationData.Error
+ *
+ * This needs to remain until all the old jobs are through people's systems (90 days from release + timeout)
+ */
+sealed class DonationError(val source: DonationErrorSource, cause: Throwable) : Exception(cause) {
+
+  /**
+   * Google Pay errors, which happen well before a user would ever be charged.
+   */
+  sealed class GooglePayError(source: DonationErrorSource, cause: Throwable) : DonationError(source, cause) {
+    class RequestTokenError(source: DonationErrorSource, cause: Throwable) : GooglePayError(source, cause)
+  }
+
+  /**
+   * Utilized when the user cancels the payment flow, by either exiting a WebView or not confirming on the complete order sheet.
+   */
+  class UserCancelledPaymentError(source: DonationErrorSource) : DonationError(source, Exception("User cancelled payment."))
+
+  /**
+   * Utilized when the user launches into an external application while viewing the WebView. This should kick us back to the donations
+   * screen and await user processing.
+   */
+  class UserLaunchedExternalApplication(source: DonationErrorSource) : DonationError(source, Exception("User launched external application."))
+
+  /**
+   * Gifting recipient validation errors, which occur before the user could be charged for a gift.
+   */
+  sealed class GiftRecipientVerificationError(cause: Throwable) : DonationError(DonationErrorSource.GIFT, cause) {
+    object SelectedRecipientIsInvalid : GiftRecipientVerificationError(Exception("Selected recipient is invalid."))
+  }
+
+  /**
+   * One-time donation validation errors, which occur before the user could be charged.
+   */
+  sealed class OneTimeDonationError(source: DonationErrorSource, message: String) : DonationError(source, Exception(message)) {
+    class AmountTooSmallError(source: DonationErrorSource) : OneTimeDonationError(source, "Amount is too small")
+    class AmountTooLargeError(source: DonationErrorSource) : OneTimeDonationError(source, "Amount is too large")
+    class InvalidCurrencyError(source: DonationErrorSource) : OneTimeDonationError(source, "Currency is not supported")
+  }
+
+  /**
+   * Stripe setup errors, which occur before the user could be charged. These are either
+   * payment processing handed to Stripe from the CC company (in the case of a Boost payment
+   * intent confirmation error) or other generic error from Stripe.
+   */
+  sealed class PaymentSetupError(source: DonationErrorSource, cause: Throwable) : DonationError(source, cause) {
+    /**
+     * Payment setup failed in some generic fashion.
+     */
+    class GenericError(source: DonationErrorSource, cause: Throwable) : PaymentSetupError(source, cause)
+
+    /**
+     * Payment setup failed in some way, which we are told about by Stripe.
+     */
+    class StripeCodedError(source: DonationErrorSource, cause: Throwable, val errorCode: String) : PaymentSetupError(source, cause)
+
+    /**
+     * Payment failed by the credit card processor, with a specific reason told to us by Stripe.
+     */
+    class StripeDeclinedError(source: DonationErrorSource, cause: Throwable, val declineCode: StripeDeclineCode, val method: PaymentSourceType.Stripe) : PaymentSetupError(source, cause)
+
+    /**
+     * Bank Transfer failed, with a specific reason told to us by Stripe
+     */
+    class StripeFailureCodeError(source: DonationErrorSource, cause: Throwable, val failureCode: StripeFailureCode, val method: PaymentSourceType.Stripe) : PaymentSetupError(source, cause)
+
+    /**
+     * Payment setup failed in some way, which we are told about by PayPal.
+     */
+    class PayPalCodedError(source: DonationErrorSource, cause: Throwable, val errorCode: Int) : PaymentSetupError(source, cause)
+
+    /**
+     * Payment failed by the credit card processor, with a specific reason told to us by PayPal.
+     */
+    class PayPalDeclinedError(source: DonationErrorSource, cause: Throwable, val code: PayPalDeclineCode.KnownCode) : PaymentSetupError(source, cause)
+  }
+
+  /**
+   * Errors that can be thrown after we submit a payment to Stripe. It is
+   * assumed that at this point, anything we submit *could* happen, so we can no
+   * longer safely assume a user has not been charged. Payment errors explicitly
+   * originate from Signal service.
+   */
+  sealed class PaymentProcessingError(source: DonationErrorSource, cause: Throwable) : DonationError(source, cause) {
+    class GenericError(source: DonationErrorSource) : DonationError(source, Exception("Generic Payment Error"))
+  }
+
+  /**
+   * Errors that can occur during the badge redemption process.
+   */
+  sealed class BadgeRedemptionError(source: DonationErrorSource, cause: Throwable) : DonationError(source, cause) {
+    /**
+     * Timeout elapsed while the user was waiting for badge redemption to complete for a long-running payment.
+     * This is not an indication that redemption failed, just that it could take a few days to process the payment.
+     */
+    class DonationPending(source: DonationErrorSource, val inAppPayment: InAppPaymentTable.InAppPayment) : BadgeRedemptionError(source, Exception("Long-running donation is still pending."))
+
+    /**
+     * Timeout elapsed while the user was waiting for badge redemption to complete. This is not an indication that
+     * redemption failed, just that it is taking longer than we can reasonably show a spinner.
+     */
+    class TimeoutWaitingForTokenError(source: DonationErrorSource) : BadgeRedemptionError(source, Exception("Timed out waiting for badge redemption to complete."))
+
+    /**
+     * Verification of request credentials object failed
+     */
+    class FailedToValidateCredentialError(source: DonationErrorSource) : BadgeRedemptionError(source, Exception("Failed to validate credential from server."))
+
+    /**
+     * Some generic error not otherwise accounted for occurred during the redemption process.
+     */
+    class GenericError(source: DonationErrorSource) : BadgeRedemptionError(source, Exception("Failed to add badge to account."))
+  }
+
+  companion object {
+
+    private val TAG = Log.tag(DonationError::class.java)
+
+    private val donationErrorSubjectSourceMap: Map<DonationErrorSource, Subject<DonationError>> = DonationErrorSource.values().associate { source ->
+      source to PublishSubject.create()
+    }
+
+    @JvmStatic
+    fun getErrorsForSource(donationErrorSource: DonationErrorSource): Observable<DonationError> {
+      return donationErrorSubjectSourceMap[donationErrorSource]!!
+    }
+
+    @JvmStatic
+    fun DonationError.toDonationErrorValue(): DonationErrorValue {
+      return when (this) {
+        is PaymentSetupError.GenericError -> DonationErrorValue(
+          type = DonationErrorValue.Type.PAYMENT,
+          code = ""
+        )
+        is PaymentSetupError.StripeCodedError -> DonationErrorValue(
+          type = DonationErrorValue.Type.PROCESSOR_CODE,
+          code = this.errorCode
+        )
+        is PaymentSetupError.StripeDeclinedError -> DonationErrorValue(
+          type = DonationErrorValue.Type.DECLINE_CODE,
+          code = this.declineCode.rawCode
+        )
+        is PaymentSetupError.StripeFailureCodeError -> DonationErrorValue(
+          type = DonationErrorValue.Type.FAILURE_CODE,
+          code = this.failureCode.rawCode
+        )
+        is PaymentSetupError.PayPalCodedError -> DonationErrorValue(
+          type = DonationErrorValue.Type.PROCESSOR_CODE,
+          code = this.errorCode.toString()
+        )
+        is PaymentSetupError.PayPalDeclinedError -> DonationErrorValue(
+          type = DonationErrorValue.Type.DECLINE_CODE,
+          code = this.code.code.toString()
+        )
+        else -> error("Don't know how to convert error $this")
+      }
+    }
+
+    @JvmStatic
+    @JvmOverloads
+    fun routeBackgroundError(
+      context: Context,
+      error: DonationError,
+      suppressNotification: Boolean = true
+    ) {
+      if (error.source == DonationErrorSource.GIFT_REDEMPTION) {
+        routeDonationError(context, error)
+        return
+      }
+
+      when {
+        suppressNotification -> {
+          Log.i(TAG, "Suppressing notification for error.", error)
+        }
+        else -> {
+          Log.i(TAG, "Routing background donation error to notification", error)
+          DonationErrorNotifications.displayErrorNotification(context, error)
+        }
+      }
+    }
+
+    /**
+     * Route a given donation error, which will either pipe it out to an appropriate subject
+     * or, if the subject has no observers, post it as a notification.
+     */
+    private fun routeDonationError(context: Context, error: DonationError) {
+      val subject: Subject<DonationError> = donationErrorSubjectSourceMap[error.source]!!
+      when {
+        subject.hasObservers() -> {
+          Log.i(TAG, "Routing donation error to subject ${error.source} dialog", error)
+          subject.onNext(error)
+        }
+        else -> {
+          Log.i(TAG, "Routing donation error to subject ${error.source} notification", error)
+          DonationErrorNotifications.displayErrorNotification(context, error)
+        }
+      }
+    }
+
+    /**
+     * Converts a throwable into a payment setup error. This should only be used when
+     * handling errors handed back via the Stripe API or via PayPal, when we know for sure that no
+     * charge has occurred.
+     */
+    @JvmStatic
+    fun getPaymentSetupError(source: DonationErrorSource, throwable: Throwable, method: PaymentSourceType): DonationError {
+      return when (throwable) {
+        is StripeError.PostError.Generic -> {
+          val errorCode: String? = throwable.errorCode
+          if (errorCode != null) {
+            PaymentSetupError.StripeCodedError(source, throwable, errorCode)
+          } else {
+            PaymentSetupError.GenericError(source, throwable)
+          }
+        }
+        is StripeError.PostError.Declined -> PaymentSetupError.StripeDeclinedError(source, throwable, throwable.declineCode, method as PaymentSourceType.Stripe)
+        is StripeError.PostError.Failed -> PaymentSetupError.StripeFailureCodeError(source, throwable, throwable.failureCode, method as PaymentSourceType.Stripe)
+
+        is UserCancelledPaymentError -> {
+          return throwable
+        }
+
+        else -> {
+          PaymentSetupError.GenericError(source, throwable)
+        }
+      }
+    }
+
+    @JvmStatic
+    fun genericBadgeRedemptionFailure(source: DonationErrorSource): DonationError = BadgeRedemptionError.GenericError(source)
+
+    @JvmStatic
+    fun badgeCredentialVerificationFailure(source: DonationErrorSource): DonationError = BadgeRedemptionError.FailedToValidateCredentialError(source)
+
+    @JvmStatic
+    fun genericPaymentFailure(source: DonationErrorSource): DonationError = PaymentProcessingError.GenericError(source)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorDialogs.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorDialogs.kt
new file mode 100644
index 0000000000..77608de853
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorDialogs.kt
@@ -0,0 +1,124 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.errors
+
+import android.content.Context
+import android.content.DialogInterface
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.help.HelpFragment
+import org.thoughtcrime.securesms.util.CommunicationActions
+
+/**
+ * Donation Error Dialogs.
+ */
+object DonationErrorDialogs {
+
+  /**
+   * Displays a dialog, and returns a handle to it for dismissal.
+   */
+  fun show(context: Context, throwable: Throwable?, callback: DialogCallback): DialogInterface {
+    val builder = MaterialAlertDialogBuilder(context)
+
+    builder.setOnDismissListener { callback.onDialogDismissed() }
+
+    val params = DonationErrorParams.create(context, throwable, callback)
+
+    builder.setTitle(params.title)
+      .setMessage(params.message)
+
+    if (params.positiveAction != null) {
+      builder.setPositiveButton(params.positiveAction.label) { _, _ -> params.positiveAction.action() }
+    }
+
+    if (params.negativeAction != null) {
+      builder.setNegativeButton(params.negativeAction.label) { _, _ -> params.negativeAction.action() }
+    }
+
+    return builder.show()
+  }
+
+  /**
+   * Displays a dialog, and returns a handle to it for dismissal.
+   */
+  fun show(context: Context, inAppPayment: InAppPaymentTable.InAppPayment, callback: DialogCallback): DialogInterface {
+    val builder = MaterialAlertDialogBuilder(context)
+
+    builder.setOnDismissListener { callback.onDialogDismissed() }
+
+    val params = DonationErrorParams.create(context, inAppPayment, callback)
+
+    builder.setTitle(params.title)
+      .setMessage(params.message)
+
+    if (params.positiveAction != null) {
+      builder.setPositiveButton(params.positiveAction.label) { _, _ -> params.positiveAction.action() }
+    }
+
+    if (params.negativeAction != null) {
+      builder.setNegativeButton(params.negativeAction.label) { _, _ -> params.negativeAction.action() }
+    }
+
+    return builder.show()
+  }
+
+  abstract class DialogCallback : DonationErrorParams.Callback<Unit> {
+
+    override fun onCancel(context: Context): DonationErrorParams.ErrorAction<Unit>? {
+      return DonationErrorParams.ErrorAction(
+        label = android.R.string.cancel,
+        action = {}
+      )
+    }
+
+    override fun onOk(context: Context): DonationErrorParams.ErrorAction<Unit>? {
+      return DonationErrorParams.ErrorAction(
+        label = android.R.string.ok,
+        action = {}
+      )
+    }
+
+    override fun onGoToGooglePay(context: Context): DonationErrorParams.ErrorAction<Unit>? {
+      return DonationErrorParams.ErrorAction(
+        label = R.string.DeclineCode__go_to_google_pay,
+        action = {
+          CommunicationActions.openBrowserLink(context, context.getString(R.string.google_pay_url))
+        }
+      )
+    }
+
+    override fun onTryCreditCardAgain(context: Context): DonationErrorParams.ErrorAction<Unit>? {
+      return DonationErrorParams.ErrorAction(
+        label = R.string.DeclineCode__try,
+        action = {}
+      )
+    }
+
+    override fun onTryBankTransferAgain(context: Context): DonationErrorParams.ErrorAction<Unit>? {
+      return DonationErrorParams.ErrorAction(
+        label = R.string.DeclineCode__try,
+        action = {}
+      )
+    }
+
+    override fun onLearnMore(context: Context): DonationErrorParams.ErrorAction<Unit>? {
+      return DonationErrorParams.ErrorAction(
+        label = R.string.DeclineCode__learn_more,
+        action = {
+          CommunicationActions.openBrowserLink(context, context.getString(R.string.donation_decline_code_error_url))
+        }
+      )
+    }
+
+    override fun onContactSupport(context: Context): DonationErrorParams.ErrorAction<Unit> {
+      return DonationErrorParams.ErrorAction(
+        label = R.string.Subscription__contact_support,
+        action = {
+          context.startActivity(AppSettingsActivity.help(context, HelpFragment.DONATION_INDEX))
+        }
+      )
+    }
+
+    open fun onDialogDismissed() = Unit
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorNotifications.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorNotifications.kt
new file mode 100644
index 0000000000..5366f394e2
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorNotifications.kt
@@ -0,0 +1,103 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.errors
+
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import org.signal.core.util.PendingIntentFlags
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
+import org.thoughtcrime.securesms.help.HelpFragment
+import org.thoughtcrime.securesms.notifications.NotificationChannels
+import org.thoughtcrime.securesms.notifications.NotificationIds
+
+/**
+ * Donation-related push notifications.
+ */
+object DonationErrorNotifications {
+  fun displayErrorNotification(context: Context, donationError: DonationError) {
+    val parameters = DonationErrorParams.create(context, donationError, NotificationCallback)
+    val notification = NotificationCompat.Builder(context, NotificationChannels.getInstance().FAILURES)
+      .setSmallIcon(R.drawable.ic_notification)
+      .setContentTitle(context.getString(parameters.title))
+      .setContentText(context.getString(parameters.message)).apply {
+        if (parameters.positiveAction != null) {
+          addAction(context, parameters.positiveAction)
+        }
+
+        if (parameters.negativeAction != null) {
+          addAction(context, parameters.negativeAction)
+        }
+      }
+      .build()
+
+    NotificationManagerCompat
+      .from(context)
+      .notify(NotificationIds.DONOR_BADGE_FAILURE, notification)
+  }
+
+  private fun NotificationCompat.Builder.addAction(context: Context, errorAction: DonationErrorParams.ErrorAction<PendingIntent>) {
+    addAction(
+      NotificationCompat.Action.Builder(
+        null,
+        context.getString(errorAction.label),
+        errorAction.action.invoke()
+      ).build()
+    )
+  }
+
+  private object NotificationCallback : DonationErrorParams.Callback<PendingIntent> {
+
+    override fun onCancel(context: Context): DonationErrorParams.ErrorAction<PendingIntent>? = null
+
+    override fun onOk(context: Context): DonationErrorParams.ErrorAction<PendingIntent>? = null
+
+    override fun onLearnMore(context: Context): DonationErrorParams.ErrorAction<PendingIntent> {
+      return createAction(
+        context = context,
+        label = R.string.DeclineCode__learn_more,
+        actionIntent = Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.donation_decline_code_error_url)))
+      )
+    }
+
+    override fun onTryCreditCardAgain(context: Context): DonationErrorParams.ErrorAction<PendingIntent>? = null
+    override fun onTryBankTransferAgain(context: Context): DonationErrorParams.ErrorAction<PendingIntent>? = null
+
+    override fun onGoToGooglePay(context: Context): DonationErrorParams.ErrorAction<PendingIntent> {
+      return createAction(
+        context = context,
+        label = R.string.DeclineCode__go_to_google_pay,
+        actionIntent = Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.google_pay_url)))
+      )
+    }
+
+    override fun onContactSupport(context: Context): DonationErrorParams.ErrorAction<PendingIntent> {
+      return createAction(
+        context = context,
+        label = R.string.Subscription__contact_support,
+        actionIntent = AppSettingsActivity.help(context, HelpFragment.DONATION_INDEX)
+      )
+    }
+
+    private fun createAction(
+      context: Context,
+      label: Int,
+      actionIntent: Intent
+    ): DonationErrorParams.ErrorAction<PendingIntent> {
+      return DonationErrorParams.ErrorAction(
+        label = label,
+        action = {
+          PendingIntent.getActivity(
+            context,
+            0,
+            actionIntent,
+            if (Build.VERSION.SDK_INT >= 23) PendingIntentFlags.oneShot() else PendingIntentFlags.mutable()
+          )
+        }
+      )
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorParams.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorParams.kt
new file mode 100644
index 0000000000..98497fd5e9
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorParams.kt
@@ -0,0 +1,354 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.errors
+
+import android.content.Context
+import androidx.annotation.StringRes
+import org.signal.donations.InAppPaymentType
+import org.signal.donations.PaymentSourceType
+import org.signal.donations.StripeDeclineCode
+import org.signal.donations.StripeFailureCode
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toInAppPaymentType
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toPaymentSourceType
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+
+class DonationErrorParams<V> private constructor(
+  @StringRes val title: Int,
+  @StringRes val message: Int,
+  val positiveAction: ErrorAction<V>?,
+  val negativeAction: ErrorAction<V>?
+) {
+  class ErrorAction<V>(
+    @StringRes val label: Int,
+    val action: () -> V
+  )
+
+  companion object {
+    fun <V> create(
+      context: Context,
+      throwable: Throwable?,
+      callback: Callback<V>
+    ): DonationErrorParams<V> {
+      return when (throwable) {
+        is DonationError.GiftRecipientVerificationError -> getVerificationErrorParams(context, callback)
+        is DonationError.PaymentSetupError.StripeDeclinedError -> getStripeDeclinedErrorParams(context, throwable.method, throwable.declineCode, callback)
+        is DonationError.PaymentSetupError.StripeFailureCodeError -> getStripeFailureCodeErrorParams(context, throwable.method, throwable.failureCode, callback)
+        is DonationError.PaymentSetupError.PayPalDeclinedError -> getPayPalDeclinedErrorParams(context, throwable.code, callback)
+        is DonationError.PaymentSetupError -> getGenericPaymentSetupErrorParams(context, callback)
+        is DonationError.BadgeRedemptionError.DonationPending -> getStillProcessingErrorParams(context, callback)
+        is DonationError.BadgeRedemptionError.TimeoutWaitingForTokenError -> getStillProcessingErrorParams(context, callback)
+        is DonationError.BadgeRedemptionError.FailedToValidateCredentialError -> getBadgeCredentialValidationErrorParams(context, callback)
+        is DonationError.BadgeRedemptionError.GenericError -> getGenericRedemptionError(context, throwable.source.toInAppPaymentType(), callback)
+        else -> getGenericRedemptionError(context, InAppPaymentType.ONE_TIME_DONATION, callback)
+      }
+    }
+
+    fun <V> create(
+      context: Context,
+      inAppPayment: InAppPaymentTable.InAppPayment,
+      callback: Callback<V>
+    ): DonationErrorParams<V> {
+      return when (inAppPayment.data.error?.type) {
+        InAppPaymentData.Error.Type.UNKNOWN -> getGenericRedemptionError(context, inAppPayment.type, callback)
+        InAppPaymentData.Error.Type.GOOGLE_PAY_REQUEST_TOKEN -> getGenericPaymentSetupErrorParams(context, callback)
+        InAppPaymentData.Error.Type.INVALID_GIFT_RECIPIENT -> getVerificationErrorParams(context, callback)
+        InAppPaymentData.Error.Type.ONE_TIME_AMOUNT_TOO_SMALL -> getGenericPaymentSetupErrorParams(context, callback)
+        InAppPaymentData.Error.Type.ONE_TIME_AMOUNT_TOO_LARGE -> getGenericPaymentSetupErrorParams(context, callback)
+        InAppPaymentData.Error.Type.INVALID_CURRENCY -> getGenericPaymentSetupErrorParams(context, callback)
+        InAppPaymentData.Error.Type.PAYMENT_SETUP -> getGenericPaymentSetupErrorParams(context, callback)
+        InAppPaymentData.Error.Type.STRIPE_CODED_ERROR -> getGenericPaymentSetupErrorParams(context, callback)
+        InAppPaymentData.Error.Type.STRIPE_DECLINED_ERROR -> getStripeDeclinedErrorParams(
+          context = context,
+          paymentSourceType = inAppPayment.data.paymentMethodType.toPaymentSourceType() as PaymentSourceType.Stripe,
+          declineCode = StripeDeclineCode.getFromCode(inAppPayment.data.error.data_),
+          callback = callback
+        )
+        InAppPaymentData.Error.Type.STRIPE_FAILURE -> getStripeFailureCodeErrorParams(
+          context = context,
+          paymentSourceType = inAppPayment.data.paymentMethodType.toPaymentSourceType() as PaymentSourceType.Stripe,
+          failureCode = StripeFailureCode.getFromCode(inAppPayment.data.error.data_),
+          callback = callback
+        )
+        InAppPaymentData.Error.Type.PAYPAL_CODED_ERROR -> getGenericPaymentSetupErrorParams(context, callback)
+        InAppPaymentData.Error.Type.PAYPAL_DECLINED_ERROR -> getPayPalDeclinedErrorParams(
+          context = context,
+          payPalDeclineCode = PayPalDeclineCode.KnownCode.fromCode(inAppPayment.data.error.data_!!.toInt())!!,
+          callback = callback
+        )
+        InAppPaymentData.Error.Type.PAYMENT_PROCESSING -> getGenericRedemptionError(context, inAppPayment.type, callback)
+        InAppPaymentData.Error.Type.CREDENTIAL_VALIDATION -> getBadgeCredentialValidationErrorParams(context, callback)
+        InAppPaymentData.Error.Type.REDEMPTION -> getGenericRedemptionError(context, inAppPayment.type, callback)
+        null -> error("No error in data!")
+      }
+    }
+
+    private fun <V> getGenericRedemptionError(context: Context, type: InAppPaymentType, callback: Callback<V>): DonationErrorParams<V> {
+      return when (type) {
+        InAppPaymentType.ONE_TIME_GIFT -> DonationErrorParams(
+          title = R.string.DonationsErrors__donation_failed,
+          message = R.string.DonationsErrors__your_payment_was_processed_but,
+          positiveAction = callback.onContactSupport(context),
+          negativeAction = null
+        )
+
+        else -> DonationErrorParams(
+          title = R.string.DonationsErrors__couldnt_add_badge,
+          message = R.string.DonationsErrors__your_badge_could_not,
+          positiveAction = callback.onContactSupport(context),
+          negativeAction = null
+        )
+      }
+    }
+
+    private fun <V> getVerificationErrorParams(context: Context, callback: Callback<V>): DonationErrorParams<V> {
+      return DonationErrorParams(
+        title = R.string.DonationsErrors__cannot_send_donation,
+        message = R.string.DonationsErrors__this_user_cant_receive_donations_until,
+        positiveAction = callback.onOk(context),
+        negativeAction = null
+      )
+    }
+
+    private fun <V> getPayPalDeclinedErrorParams(
+      context: Context,
+      payPalDeclineCode: PayPalDeclineCode.KnownCode,
+      callback: Callback<V>
+    ): DonationErrorParams<V> {
+      return when (payPalDeclineCode) {
+        PayPalDeclineCode.KnownCode.DECLINED -> getLearnMoreParams(context, callback, R.string.DeclineCode__try_another_payment_method_or_contact_your_bank_for_more_information_if_this_was_a_paypal)
+        else -> getLearnMoreParams(context, callback, R.string.DeclineCode__try_another_payment_method_or_contact_your_bank)
+      }
+    }
+
+    private fun <V> getStripeDeclinedErrorParams(
+      context: Context,
+      paymentSourceType: PaymentSourceType.Stripe,
+      declineCode: StripeDeclineCode,
+      callback: Callback<V>
+    ): DonationErrorParams<V> {
+      if (!paymentSourceType.hasDeclineCodeSupport()) {
+        return getGenericPaymentSetupErrorParams(context, callback)
+      }
+
+      fun unexpectedDeclinedError(declineCode: StripeDeclineCode, paymentSourceType: PaymentSourceType.Stripe): Nothing {
+        error("Unexpected declined error: $declineCode during $paymentSourceType processing.")
+      }
+
+      val getStripeDeclineCodePositiveActionParams: (Context, Callback<V>, Int) -> DonationErrorParams<V> = when (paymentSourceType) {
+        PaymentSourceType.Stripe.CreditCard -> this::getTryCreditCardAgainParams
+        PaymentSourceType.Stripe.GooglePay -> this::getGoToGooglePayParams
+        else -> this::getLearnMoreParams
+      }
+
+      return when (declineCode) {
+        is StripeDeclineCode.Known -> when (declineCode.code) {
+          StripeDeclineCode.Code.APPROVE_WITH_ID -> getStripeDeclineCodePositiveActionParams(
+            context,
+            callback,
+            when (paymentSourceType) {
+              PaymentSourceType.Stripe.CreditCard -> R.string.DeclineCode__verify_your_card_details_are_correct_and_try_again
+              PaymentSourceType.Stripe.GooglePay -> R.string.DeclineCode__verify_your_payment_method_is_up_to_date_in_google_pay_and_try_again
+              else -> unexpectedDeclinedError(declineCode, paymentSourceType)
+            }
+          )
+
+          StripeDeclineCode.Code.CALL_ISSUER -> getStripeDeclineCodePositiveActionParams(
+            context,
+            callback,
+            when (paymentSourceType) {
+              PaymentSourceType.Stripe.CreditCard -> R.string.DeclineCode__verify_your_card_details_are_correct_and_try_again_if_the_problem_continues
+              PaymentSourceType.Stripe.GooglePay -> R.string.DeclineCode__verify_your_payment_method_is_up_to_date_in_google_pay_and_try_again_if_the_problem
+              else -> unexpectedDeclinedError(declineCode, paymentSourceType)
+            }
+          )
+
+          StripeDeclineCode.Code.CARD_NOT_SUPPORTED -> getLearnMoreParams(context, callback, R.string.DeclineCode__your_card_does_not_support_this_type_of_purchase)
+          StripeDeclineCode.Code.EXPIRED_CARD -> getStripeDeclineCodePositiveActionParams(
+            context,
+            callback,
+            when (paymentSourceType) {
+              PaymentSourceType.Stripe.CreditCard -> R.string.DeclineCode__your_card_has_expired_verify_your_card_details
+              PaymentSourceType.Stripe.GooglePay -> R.string.DeclineCode__your_card_has_expired
+              else -> unexpectedDeclinedError(declineCode, paymentSourceType)
+            }
+          )
+
+          StripeDeclineCode.Code.INCORRECT_NUMBER -> getStripeDeclineCodePositiveActionParams(
+            context,
+            callback,
+            when (paymentSourceType) {
+              PaymentSourceType.Stripe.CreditCard -> R.string.DeclineCode__your_card_number_is_incorrect_verify_your_card_details
+              PaymentSourceType.Stripe.GooglePay -> R.string.DeclineCode__your_card_number_is_incorrect
+              else -> unexpectedDeclinedError(declineCode, paymentSourceType)
+            }
+          )
+
+          StripeDeclineCode.Code.INCORRECT_CVC -> getStripeDeclineCodePositiveActionParams(
+            context,
+            callback,
+            when (paymentSourceType) {
+              PaymentSourceType.Stripe.CreditCard -> R.string.DeclineCode__your_cards_cvc_number_is_incorrect_verify_your_card_details
+              PaymentSourceType.Stripe.GooglePay -> R.string.DeclineCode__your_cards_cvc_number_is_incorrect
+              else -> unexpectedDeclinedError(declineCode, paymentSourceType)
+            }
+          )
+
+          StripeDeclineCode.Code.INSUFFICIENT_FUNDS -> getLearnMoreParams(context, callback, R.string.DeclineCode__your_card_does_not_have_sufficient_funds)
+          StripeDeclineCode.Code.INVALID_CVC -> getStripeDeclineCodePositiveActionParams(
+            context,
+            callback,
+            when (paymentSourceType) {
+              PaymentSourceType.Stripe.CreditCard -> R.string.DeclineCode__your_cards_cvc_number_is_incorrect_verify_your_card_details
+              PaymentSourceType.Stripe.GooglePay -> R.string.DeclineCode__your_cards_cvc_number_is_incorrect
+              else -> unexpectedDeclinedError(declineCode, paymentSourceType)
+            }
+          )
+
+          StripeDeclineCode.Code.INVALID_EXPIRY_MONTH -> getStripeDeclineCodePositiveActionParams(
+            context,
+            callback,
+            when (paymentSourceType) {
+              PaymentSourceType.Stripe.CreditCard -> R.string.DeclineCode__the_expiration_month_on_your_card_is_incorrect
+              PaymentSourceType.Stripe.GooglePay -> R.string.DeclineCode__the_expiration_month
+              else -> unexpectedDeclinedError(declineCode, paymentSourceType)
+            }
+          )
+
+          StripeDeclineCode.Code.INVALID_EXPIRY_YEAR -> getStripeDeclineCodePositiveActionParams(
+            context,
+            callback,
+            when (paymentSourceType) {
+              PaymentSourceType.Stripe.CreditCard -> R.string.DeclineCode__the_expiration_year_on_your_card_is_incorrect
+              PaymentSourceType.Stripe.GooglePay -> R.string.DeclineCode__the_expiration_year
+              else -> unexpectedDeclinedError(declineCode, paymentSourceType)
+            }
+          )
+
+          StripeDeclineCode.Code.INVALID_NUMBER -> getStripeDeclineCodePositiveActionParams(
+            context,
+            callback,
+            when (paymentSourceType) {
+              PaymentSourceType.Stripe.CreditCard -> R.string.DeclineCode__your_card_number_is_incorrect_verify_your_card_details
+              PaymentSourceType.Stripe.GooglePay -> R.string.DeclineCode__your_card_number_is_incorrect
+              else -> unexpectedDeclinedError(declineCode, paymentSourceType)
+            }
+          )
+
+          StripeDeclineCode.Code.ISSUER_NOT_AVAILABLE -> getLearnMoreParams(context, callback, R.string.DeclineCode__try_completing_the_payment_again)
+          StripeDeclineCode.Code.PROCESSING_ERROR -> getLearnMoreParams(context, callback, R.string.DeclineCode__try_again)
+          StripeDeclineCode.Code.REENTER_TRANSACTION -> getLearnMoreParams(context, callback, R.string.DeclineCode__try_again)
+          else -> getLearnMoreParams(context, callback, R.string.DeclineCode__try_another_payment_method_or_contact_your_bank)
+        }
+
+        else -> getLearnMoreParams(context, callback, R.string.DeclineCode__try_another_payment_method_or_contact_your_bank)
+      }
+    }
+
+    private fun <V> getStripeFailureCodeErrorParams(
+      context: Context,
+      paymentSourceType: PaymentSourceType.Stripe,
+      failureCode: StripeFailureCode,
+      callback: Callback<V>
+    ): DonationErrorParams<V> {
+      if (!paymentSourceType.hasFailureCodeSupport()) {
+        return getGenericPaymentSetupErrorParams(context, callback)
+      }
+
+      return when (failureCode) {
+        is StripeFailureCode.Known -> {
+          val errorText = failureCode.mapToErrorStringResource()
+          when (failureCode.code) {
+            StripeFailureCode.Code.REFER_TO_CUSTOMER -> getTryBankTransferAgainParams(context, callback, errorText)
+            StripeFailureCode.Code.INSUFFICIENT_FUNDS -> getLearnMoreParams(context, callback, errorText)
+            StripeFailureCode.Code.DEBIT_DISPUTED -> getLearnMoreParams(context, callback, errorText)
+            StripeFailureCode.Code.AUTHORIZATION_REVOKED -> getLearnMoreParams(context, callback, errorText)
+            StripeFailureCode.Code.DEBIT_NOT_AUTHORIZED -> getLearnMoreParams(context, callback, errorText)
+            StripeFailureCode.Code.ACCOUNT_CLOSED -> getLearnMoreParams(context, callback, errorText)
+            StripeFailureCode.Code.BANK_ACCOUNT_RESTRICTED -> getLearnMoreParams(context, callback, errorText)
+            StripeFailureCode.Code.DEBIT_AUTHORIZATION_NOT_MATCH -> getLearnMoreParams(context, callback, errorText)
+            StripeFailureCode.Code.RECIPIENT_DECEASED -> getLearnMoreParams(context, callback, errorText)
+            StripeFailureCode.Code.BRANCH_DOES_NOT_EXIST -> getTryBankTransferAgainParams(context, callback, errorText)
+            StripeFailureCode.Code.INCORRECT_ACCOUNT_HOLDER_NAME -> getTryBankTransferAgainParams(context, callback, errorText)
+            StripeFailureCode.Code.INVALID_ACCOUNT_NUMBER -> getTryBankTransferAgainParams(context, callback, errorText)
+            StripeFailureCode.Code.GENERIC_COULD_NOT_PROCESS -> getTryBankTransferAgainParams(context, callback, errorText)
+          }
+        }
+
+        is StripeFailureCode.Unknown -> getGenericPaymentSetupErrorParams(context, callback)
+      }
+    }
+
+    private fun <V> getStillProcessingErrorParams(context: Context, callback: Callback<V>): DonationErrorParams<V> {
+      return DonationErrorParams(
+        title = R.string.DonationsErrors__still_processing,
+        message = R.string.DonationsErrors__your_payment_is_still,
+        positiveAction = callback.onOk(context),
+        negativeAction = null
+      )
+    }
+
+    private fun <V> getBadgeCredentialValidationErrorParams(context: Context, callback: Callback<V>): DonationErrorParams<V> {
+      return DonationErrorParams(
+        title = R.string.DonationsErrors__failed_to_validate_badge,
+        message = R.string.DonationsErrors__could_not_validate,
+        positiveAction = callback.onContactSupport(context),
+        negativeAction = null
+      )
+    }
+
+    private fun <V> getGenericPaymentSetupErrorParams(context: Context, callback: Callback<V>): DonationErrorParams<V> {
+      return DonationErrorParams(
+        title = R.string.DonationsErrors__error_processing_payment,
+        message = R.string.DonationsErrors__your_payment,
+        positiveAction = callback.onOk(context),
+        negativeAction = null
+      )
+    }
+
+    private fun <V> getLearnMoreParams(context: Context, callback: Callback<V>, message: Int): DonationErrorParams<V> {
+      return DonationErrorParams(
+        title = R.string.DonationsErrors__error_processing_payment,
+        message = message,
+        positiveAction = callback.onOk(context),
+        negativeAction = callback.onLearnMore(context)
+      )
+    }
+
+    private fun <V> getGoToGooglePayParams(context: Context, callback: Callback<V>, message: Int): DonationErrorParams<V> {
+      return DonationErrorParams(
+        title = R.string.DonationsErrors__error_processing_payment,
+        message = message,
+        positiveAction = callback.onGoToGooglePay(context),
+        negativeAction = callback.onCancel(context)
+      )
+    }
+
+    private fun <V> getTryCreditCardAgainParams(context: Context, callback: Callback<V>, message: Int): DonationErrorParams<V> {
+      return DonationErrorParams(
+        title = R.string.DonationsErrors__error_processing_payment,
+        message = message,
+        positiveAction = callback.onTryCreditCardAgain(context),
+        negativeAction = callback.onCancel(context)
+      )
+    }
+
+    private fun <V> getTryBankTransferAgainParams(context: Context, callback: Callback<V>, message: Int): DonationErrorParams<V> {
+      return DonationErrorParams(
+        title = R.string.DonationsErrors__error_processing_payment,
+        message = message,
+        positiveAction = callback.onTryBankTransferAgain(context),
+        negativeAction = callback.onCancel(context)
+      )
+    }
+  }
+
+  interface Callback<V> {
+    fun onOk(context: Context): ErrorAction<V>?
+    fun onCancel(context: Context): ErrorAction<V>?
+    fun onLearnMore(context: Context): ErrorAction<V>?
+    fun onContactSupport(context: Context): ErrorAction<V>?
+    fun onGoToGooglePay(context: Context): ErrorAction<V>?
+    fun onTryCreditCardAgain(context: Context): ErrorAction<V>?
+    fun onTryBankTransferAgain(context: Context): ErrorAction<V>?
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorSource.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorSource.kt
new file mode 100644
index 0000000000..e45ade8806
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrorSource.kt
@@ -0,0 +1,44 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.errors
+
+/**
+ * Descriptor of where an error originated from.
+ */
+enum class DonationErrorSource(private val code: String) {
+  /**
+   * Refers to a one-time donation where the user paying receives a badge immediately.
+   */
+  ONE_TIME("boost"),
+
+  /**
+   * Refers to a recurring monthly donation where the user paying receives a badge immediately
+   * and upon each renewal period.
+   */
+  MONTHLY("subscription"),
+
+  /**
+   * Refers to a one-time donation where the user pays to send a badge to another individual.
+   */
+  GIFT("gift"),
+
+  /**
+   * Refers to when the individual who received a gift token is redeeming it for a badge.
+   */
+  GIFT_REDEMPTION("gift-redemption"),
+
+  /**
+   * Refers to the monthly keep-alive job for an active monthly subscriber, which is started in
+   * the background as needed.
+   */
+  KEEP_ALIVE("keep-alive"),
+
+  UNKNOWN("unknown");
+
+  fun serialize(): String = code
+
+  companion object {
+    @JvmStatic
+    fun deserialize(code: String): DonationErrorSource {
+      return values().firstOrNull { it.code == code } ?: UNKNOWN
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrors.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrors.kt
new file mode 100644
index 0000000000..0c1137cc66
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationErrors.kt
@@ -0,0 +1,52 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.errors
+
+import androidx.annotation.StringRes
+import org.signal.donations.StripeDeclineCode
+import org.signal.donations.StripeFailureCode
+import org.thoughtcrime.securesms.R
+
+@StringRes
+fun StripeFailureCode.mapToErrorStringResource(): Int {
+  return when (this) {
+    is StripeFailureCode.Known -> when (this.code) {
+      StripeFailureCode.Code.REFER_TO_CUSTOMER -> R.string.StripeFailureCode__verify_your_bank_details_are_correct
+      StripeFailureCode.Code.INSUFFICIENT_FUNDS -> R.string.StripeFailureCode__the_bank_account_provided
+      StripeFailureCode.Code.DEBIT_DISPUTED -> R.string.StripeFailureCode__verify_your_bank_details_are_correct
+      StripeFailureCode.Code.AUTHORIZATION_REVOKED -> R.string.StripeFailureCode__this_payment_was_revoked
+      StripeFailureCode.Code.DEBIT_NOT_AUTHORIZED -> R.string.StripeFailureCode__this_payment_was_revoked
+      StripeFailureCode.Code.ACCOUNT_CLOSED -> R.string.StripeFailureCode__the_bank_details_provided_could_not_be_processed
+      StripeFailureCode.Code.BANK_ACCOUNT_RESTRICTED -> R.string.StripeFailureCode__the_bank_details_provided_could_not_be_processed
+      StripeFailureCode.Code.DEBIT_AUTHORIZATION_NOT_MATCH -> R.string.StripeFailureCode__an_error_occurred_while_processing_this_payment
+      StripeFailureCode.Code.RECIPIENT_DECEASED -> R.string.StripeFailureCode__the_bank_details_provided_could_not_be_processed
+      StripeFailureCode.Code.BRANCH_DOES_NOT_EXIST -> R.string.StripeFailureCode__verify_your_bank_details_are_correct
+      StripeFailureCode.Code.INCORRECT_ACCOUNT_HOLDER_NAME -> R.string.StripeFailureCode__verify_your_bank_details_are_correct
+      StripeFailureCode.Code.INVALID_ACCOUNT_NUMBER -> R.string.StripeFailureCode__verify_your_bank_details_are_correct
+      StripeFailureCode.Code.GENERIC_COULD_NOT_PROCESS -> R.string.StripeFailureCode__verify_your_bank_details_are_correct
+    }
+    is StripeFailureCode.Unknown -> R.string.StripeFailureCode__verify_your_bank_details_are_correct
+  }
+}
+
+@StringRes
+fun StripeDeclineCode.mapToErrorStringResource(): Int {
+  return when (this) {
+    is StripeDeclineCode.Known -> when (this.code) {
+      StripeDeclineCode.Code.APPROVE_WITH_ID -> R.string.DeclineCode__verify_your_card_details_are_correct_and_try_again
+      StripeDeclineCode.Code.CALL_ISSUER -> R.string.DeclineCode__verify_your_card_details_are_correct_and_try_again_if_the_problem_continues
+      StripeDeclineCode.Code.CARD_NOT_SUPPORTED -> R.string.DeclineCode__your_card_does_not_support_this_type_of_purchase
+      StripeDeclineCode.Code.EXPIRED_CARD -> R.string.DeclineCode__your_card_has_expired_verify_your_card_details
+      StripeDeclineCode.Code.INCORRECT_NUMBER -> R.string.DeclineCode__your_card_number_is_incorrect_verify_your_card_details
+      StripeDeclineCode.Code.INCORRECT_CVC -> R.string.DeclineCode__your_cards_cvc_number_is_incorrect_verify_your_card_details
+      StripeDeclineCode.Code.INSUFFICIENT_FUNDS -> R.string.DeclineCode__your_card_does_not_have_sufficient_funds
+      StripeDeclineCode.Code.INVALID_CVC -> R.string.DeclineCode__your_cards_cvc_number_is_incorrect_verify_your_card_details
+      StripeDeclineCode.Code.INVALID_EXPIRY_MONTH -> R.string.DeclineCode__the_expiration_month_on_your_card_is_incorrect
+      StripeDeclineCode.Code.INVALID_EXPIRY_YEAR -> R.string.DeclineCode__the_expiration_year_on_your_card_is_incorrect
+      StripeDeclineCode.Code.INVALID_NUMBER -> R.string.DeclineCode__your_card_number_is_incorrect_verify_your_card_details
+      StripeDeclineCode.Code.ISSUER_NOT_AVAILABLE -> R.string.DeclineCode__try_completing_the_payment_again
+      StripeDeclineCode.Code.PROCESSING_ERROR -> R.string.DeclineCode__try_again
+      StripeDeclineCode.Code.REENTER_TRANSACTION -> R.string.DeclineCode__try_again
+      else -> R.string.DeclineCode__try_another_payment_method_or_contact_your_bank
+    }
+    else -> R.string.DeclineCode__try_another_payment_method_or_contact_your_bank
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationProcessorErrorExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationProcessorErrorExtensions.kt
new file mode 100644
index 0000000000..3a0ae18141
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/DonationProcessorErrorExtensions.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.errors
+
+import org.signal.donations.PaymentSourceType
+import org.signal.donations.StripeDeclineCode
+import org.signal.donations.StripeFailureCode
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
+import org.whispersystems.signalservice.internal.push.exceptions.DonationProcessorError
+
+fun DonationProcessorError.toDonationError(
+  source: DonationErrorSource,
+  method: PaymentSourceType
+): DonationError {
+  return when (processor) {
+    ActiveSubscription.Processor.STRIPE -> {
+      check(method is PaymentSourceType.Stripe)
+      val declineCode = StripeDeclineCode.getFromCode(chargeFailure.code)
+      val failureCode = StripeFailureCode.getFromCode(chargeFailure.code)
+      if (declineCode.isKnown()) {
+        DonationError.PaymentSetupError.StripeDeclinedError(source, this, declineCode, method)
+      } else if (failureCode.isKnown) {
+        DonationError.PaymentSetupError.StripeFailureCodeError(source, this, failureCode, method)
+      } else if (chargeFailure.code != null) {
+        DonationError.PaymentSetupError.StripeCodedError(source, this, chargeFailure.code)
+      } else {
+        DonationError.PaymentSetupError.GenericError(source, this)
+      }
+    }
+    ActiveSubscription.Processor.BRAINTREE -> {
+      check(method is PaymentSourceType.PayPal)
+      val code = chargeFailure.code
+      if (code == null) {
+        DonationError.PaymentSetupError.GenericError(source, this)
+      } else {
+        val declineCode = PayPalDeclineCode.KnownCode.fromCode(code.toInt())
+        if (declineCode != null) {
+          DonationError.PaymentSetupError.PayPalDeclinedError(source, this, declineCode)
+        } else {
+          DonationError.PaymentSetupError.PayPalCodedError(source, this, code.toInt())
+        }
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/PayPalDeclineCode.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/PayPalDeclineCode.kt
new file mode 100644
index 0000000000..1cefcb49e2
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/PayPalDeclineCode.kt
@@ -0,0 +1,128 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.errors
+
+/**
+ * From: https://developer.paypal.com/braintree/docs/reference/general/processor-responses/authorization-responses#decline-codes
+ */
+data class PayPalDeclineCode(
+  val code: Int
+) {
+
+  val knownCode: KnownCode? = KnownCode.fromCode(code)
+
+  enum class KnownCode(val code: Int) {
+    DO_NOT_HONOR(2000),
+    INSUFFICIENT_FUNDS(2001),
+    LIMIT_EXCEEDED(2002),
+    CARDHOLDER_ACTIVITY_LIMIT_EXCEEDED(2003),
+    EXPIRED_CARD(2004),
+    INVALID_CREDIT_CARD(2005),
+    INVALID_EXPIRATION_DATE(2006),
+    NO_ACCOUNT(2007),
+    CARD_ACCOUNT_LENGTH_ERROR(2008),
+    NO_SUCH_ISSUER(2009),
+    CARD_ISSUER_DECLINED_CVV(2010),
+    VOICE_AUTHORIZATION_REQUIRED(2011),
+    PROCESSOR_DECLINED_POSSIBLE_LOST_CARD(2012),
+    PROCESSOR_DECLINED_POSSIBLE_STOLEN_CARD(2013),
+    PROCESSOR_DECLINED_FRAUD_SUSPECTED(2014),
+    TRANSACTION_NOT_ALLOWED(2015),
+    DUPLICATE_TRANSACTION(2016),
+    CARDHOLDER_STOPPED_BILLING(2017),
+    CARDHOLDER_STOPPED_ALL_BILLING(2018),
+    INVALID_TRANSACTION(2019),
+    VIOLATION(2020),
+    SECURITY_VIOLATION(2021),
+    DECLINED_UPDATED_CARDHOLDER_AVAILABLE(2022),
+    PROCESSOR_DOES_NOT_SUPPORT_THIS_FEATURE(2023),
+    CARD_TYPE_NOT_ENABLED(2024),
+    SET_UP_ERROR_MERCHANT(2025),
+    INVALID_MERCHANT_ID(2026),
+    SET_UP_ERROR_AMOUNT(2027),
+    SET_UP_ERROR_HIERARCHY(2028),
+    SET_UP_ERROR_CARD(2029),
+    SET_UP_ERROR_TERMINAL(2030),
+    ENCRYPTION_ERROR(2031),
+    SURCHARGE_NOT_PERMITTED(2032),
+    INCONSISTENT_DATA(2033),
+    NO_ACTION_TAKEN(2034),
+    PARTIAL_APPROVAL_FOR_AMOUNT_IN_GROUP_3_VERSION(2035),
+    AUTHORIZATION_COULD_NOT_BE_FOUND(2036),
+    ALREADY_REVERSED(2037),
+    PROCESSOR_DECLINED(2038),
+    INVALID_AUTHORIZATION_CODE(2039),
+    INVALID_STORE(2040),
+    DECLINED_CALL_FOR_APPROVAL(2041),
+    INVALID_CLIENT_ID(2042),
+    ERROR_DO_NOT_RETRY_CALL_ISSUER(2043),
+    DECLINED_CALL_ISSUER(2044),
+    INVALID_MERCHANT_NUMBER(2045),
+    DECLINED(2046),
+    CALL_ISSUER_PICK_UP_CARD(2047),
+    INVALID_AMOUNT(2048),
+    INVALID_SKU_NUMBER(2049),
+    INVALID_CREDIT_PLAN(2050),
+    CREDIT_CARD_NUMBER_DOES_NOT_MATCH_METHOD_OF_PAYMENT(2051),
+    INVALID_LEVEL_3_PURCHASE(2052),
+    CARD_REPORTED_AS_LOST_OR_STOLEN(2053),
+    REVERSAL_AMOUNT_DOES_NOT_MATCH_AUTHORIZATION_AMOUNT(2054),
+    INVALID_TRANSACTION_DIVISION_NUMBER(2055),
+    TRANSACTION_AMOUNT_EXCEEDS_THE_TRANSACTION_DIVISION_LIMIT(2056),
+    ISSUER_OR_CARDHOLDER_HAS_PUT_A_RESTRICTION_ON_THE_CARD(2057),
+    MERCHANT_NOT_MASTERCARD_SECURECODE_ENABLED(2058),
+    ADDRESS_VERIFICATION_FAILED(2059),
+    ADDRESS_VERIFICATION_AND_CARD_SECURITY_CODE_FAILED(2060),
+    INVALID_TRANSACTION_DATA(2061),
+    INVALID_TAX_AMOUNT(2062),
+    PAYPAL_BUSINESS_ACCOUNT_PREFERENCE_RESULTED_IN_THE_TRANSACTION_FAILING(2063),
+    INVALID_CURRENCY_CODE(2064),
+    REFUND_TIME_LIMIT_EXCEEDED(2065),
+    PAYPAL_BUSINESS_ACCOUNT_RESTRICTED(2066),
+    AUTHORIZATION_EXPIRED(2067),
+    PAYPAL_BUSINESS_ACCOUNT_LOCKED_OR_CLOSED(2068),
+    PAYPAL_BLOCKING_DUPLICATE_ORDER_IDS(2069),
+    PAYPAL_BUYER_REVOKED_PRE_APPROVED_PAYMENT_AUTHORIZATION(2070),
+    PAYPAL_PAYEE_ACCOUNT_INVALID_OR_DOES_NOT_HAVE_A_VERIFIED_EMAIL(2071),
+    PAYPAL_PAYEE_EMAIL_INCORRECTLY_FORMATTED(2072),
+    PAYPAL_VALIDATION_ERROR(2073),
+    FUNDING_INSTRUMENT_IN_THE_PAYPAL_ACCOUNT_WAS_DECLINED_BY_THE_PROCESSR_OR_BANK_OR_IT_CANT_BE_USED_FOR_THIS_PAYMENT(2074),
+    PAYER_ACCOUNT_IS_LOCKED_OR_CLOSED(2075),
+    PAYER_CANNOT_PAY_FOR_THIS_TRANSACTION_WITH_PAYPAL(2076),
+    TRANSACTION_REFUSED_DUE_TO_PAYPAL_RISK_MODEL(2077),
+    INVALID_SECURE_PAYMENT_DATA(2078),
+    PAYPAL_MERCHANT_ACCOUNT_CONFIGURATION_ERROR(2079),
+    INVALID_USER_CREDENTIALS(2080),
+    PAYPAL_PENDING_PAYMENTS_ARE_NOT_SUPPORTED(2081),
+    PAYPAL_DOMESTIC_TRANSACTION_REQUIRED(2082),
+    PAYPAL_PHONE_NUMBER_REQUIRED(2083),
+    PAYPAL_TAX_INFO_REQUIRED(2084),
+    PAYPAL_PAYEE_BLOCKED_TRANSACTION(2085),
+    PAYPAL_TRANSACTION_LIMIT_EXCEEDED(2086),
+    PAYPAL_REFERENCE_TRANSACTIONS_ARE_NOT_ENABLED_FOR_YOUR_ACCOUNT(2087),
+    CURRENCY_NOT_ENABLED_FOR_YOUR_PAYPAL_SELLER_ACCOUNT(2088),
+    PAYPAL_PAYEE_EMAIL_PERMISSION_DENIED_FOR_THIS_REQUEST(2089),
+    PAYPAL_OR_VENMO_ACCOUNT_NOT_CONFIGURED_TO_REFUND_MORE_THAN_SETTLED_AMOUNT(2090),
+    CURRENCY_OF_THIS_TRANSACTION_MUST_MATCH_CURRENCY_OF_YOUR_PAYPAL_ACCOUNT(2091),
+    NO_DATA_FOUND_TRY_ANOTHER_VERIFICATION_METHOD(2092),
+    PAYPAL_PAYMENT_METHOD_IS_INVALID(2093),
+    PAYPAL_PAYMENT_HAS_ALREADY_BEEN_COMPLETED(2094),
+    PAYPAL_REFUND_IS_NOT_ALLOWED_AFTER_PARTIAL_REFUND(2095),
+    PAYPAL_BUYER_ACCOUNT_CANT_BE_THE_SAME_AS_THE_SELLER_ACCOUNT(2096),
+    PAYPAL_AUTHORIZATION_AMOUNT_LIMIT_EXCEEDED(2097),
+    PAYPAL_AUTHORIZATION_COUNT_LIMIT_EXCEEDED(2098),
+    CARDHOLDER_AUTHORIZATION_REQUIRED(2099),
+    PAYPAL_CHANNEL_INITIATED_BILLING_NOT_ENABLED_FOR_YOUR_ACCOUNT(2100),
+    ADDITIONAL_AUTHORIZATION_REQUIRED(2101),
+    INCORRECT_PIN(2102),
+    PIN_TRY_EXCEEDED(2103),
+    OFFLINE_ISSUER_DECLINED(2104),
+    CANNOT_AUTHORIZE_AT_THIS_TIME_LIFE_CYCLE(2105),
+    CANNOT_AUTHORIZE_AT_THIS_TIME_POLICY(2106),
+    CARD_NOT_ACTIVATED(2107),
+    CLOSED_CARD(2108),
+    PROCESSOR_NETWORK_UNAVAILABLE_TRY_AGAIN(3000);
+
+    companion object {
+      fun fromCode(code: Int): KnownCode? = values().firstOrNull { it.code == code }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/UnexpectedSubscriptionCancellation.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/UnexpectedSubscriptionCancellation.kt
new file mode 100644
index 0000000000..9727d546f2
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/errors/UnexpectedSubscriptionCancellation.kt
@@ -0,0 +1,22 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.errors
+
+/**
+ * Error states that can occur if we detect that a user's subscription has been cancelled and the manual
+ * cancellation flag is not set.
+ *
+ * This status is taken directly from the ActiveSubscription object, and is set in the Subscription's
+ * keep-alive and subscription receipt redemption jobs.
+ */
+enum class UnexpectedSubscriptionCancellation(val status: String) {
+  PAST_DUE("past_due"),
+  CANCELED("canceled"),
+  UNPAID("unpaid"),
+  INACTIVE("user-was-inactive");
+
+  companion object {
+    @JvmStatic
+    fun fromStatus(status: String?): UnexpectedSubscriptionCancellation? {
+      return values().firstOrNull { it.status == status }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ActiveSubscriptionPreference.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ActiveSubscriptionPreference.kt
new file mode 100644
index 0000000000..8d82fddf07
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ActiveSubscriptionPreference.kt
@@ -0,0 +1,150 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.manage
+
+import android.text.method.LinkMovementMethod
+import android.widget.ProgressBar
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import org.signal.core.util.money.FiatMoney
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.BadgeImageView
+import org.thoughtcrime.securesms.components.settings.PreferenceModel
+import org.thoughtcrime.securesms.databinding.MySupportPreferenceBinding
+import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import org.thoughtcrime.securesms.subscription.Subscription
+import org.thoughtcrime.securesms.util.DateUtils
+import org.thoughtcrime.securesms.util.SpanUtil
+import org.thoughtcrime.securesms.util.adapter.mapping.BindingFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.BindingViewHolder
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.visible
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
+import java.util.Locale
+
+/**
+ * DSL renderable item that displays active subscription information on the user's
+ * manage donations page.
+ */
+object ActiveSubscriptionPreference {
+
+  class Model(
+    val price: FiatMoney,
+    val subscription: Subscription,
+    val renewalTimestamp: Long = -1L,
+    val redemptionState: ManageDonationsState.RedemptionState,
+    val activeSubscription: ActiveSubscription.Subscription?,
+    val subscriberRequiresCancel: Boolean,
+    val onContactSupport: () -> Unit,
+    val onPendingClick: (FiatMoney) -> Unit,
+    val onRowClick: (ManageDonationsState.RedemptionState) -> Unit
+  ) : PreferenceModel<Model>() {
+    override fun areItemsTheSame(newItem: Model): Boolean {
+      return subscription.id == newItem.subscription.id
+    }
+
+    override fun areContentsTheSame(newItem: Model): Boolean {
+      return super.areContentsTheSame(newItem) &&
+        subscription == newItem.subscription &&
+        renewalTimestamp == newItem.renewalTimestamp &&
+        redemptionState == newItem.redemptionState &&
+        FiatMoney.equals(price, newItem.price) &&
+        activeSubscription == newItem.activeSubscription
+    }
+  }
+
+  class ViewHolder(binding: MySupportPreferenceBinding) : BindingViewHolder<Model, MySupportPreferenceBinding>(binding) {
+
+    val badge: BadgeImageView = binding.mySupportBadge
+    val title: TextView = binding.mySupportTitle
+    val expiry: TextView = binding.mySupportExpiry
+    val progress: ProgressBar = binding.mySupportProgress
+
+    override fun bind(model: Model) {
+      itemView.setOnClickListener(null)
+
+      badge.setBadge(model.subscription.badge)
+
+      title.text = context.getString(
+        R.string.MySupportPreference__s_per_month,
+        FiatMoneyUtil.format(
+          context.resources,
+          model.price,
+          FiatMoneyUtil.formatOptions()
+        )
+      )
+
+      expiry.movementMethod = LinkMovementMethod.getInstance()
+
+      itemView.setOnClickListener { model.onRowClick(model.redemptionState) }
+      itemView.isClickable = model.redemptionState != ManageDonationsState.RedemptionState.IN_PROGRESS
+
+      when (model.redemptionState) {
+        ManageDonationsState.RedemptionState.NONE -> presentRenewalState(model)
+        ManageDonationsState.RedemptionState.IS_PENDING_BANK_TRANSFER -> presentPendingBankTransferState(model)
+        ManageDonationsState.RedemptionState.IN_PROGRESS -> presentInProgressState()
+        ManageDonationsState.RedemptionState.FAILED -> presentFailureState(model)
+      }
+    }
+
+    private fun presentRenewalState(model: Model) {
+      expiry.text = context.getString(
+        R.string.MySupportPreference__renews_s,
+        DateUtils.formatDateWithYear(
+          Locale.getDefault(),
+          model.renewalTimestamp
+        )
+      )
+      progress.visible = false
+    }
+
+    private fun presentPendingBankTransferState(model: Model) {
+      expiry.text = context.getString(R.string.MySupportPreference__payment_pending)
+      progress.visible = true
+      itemView.setOnClickListener { model.onPendingClick(model.price) }
+    }
+
+    private fun presentInProgressState() {
+      expiry.text = context.getString(R.string.MySupportPreference__processing_transaction)
+      progress.visible = true
+    }
+
+    private fun presentFailureState(model: Model) {
+      if (model.activeSubscription?.isFailedPayment == true || model.subscriberRequiresCancel) {
+        presentPaymentFailureState(model)
+      } else {
+        presentRedemptionFailureState(model)
+      }
+    }
+
+    private fun presentPaymentFailureState(model: Model) {
+      val contactString = context.getString(R.string.MySupportPreference__please_contact_support)
+
+      expiry.text = SpanUtil.clickSubstring(
+        context.getString(R.string.DonationsErrors__error_processing_payment_s, contactString),
+        contactString,
+        {
+          model.onContactSupport()
+        },
+        ContextCompat.getColor(context, R.color.signal_accent_primary)
+      )
+      progress.visible = false
+    }
+
+    private fun presentRedemptionFailureState(model: Model) {
+      val contactString = context.getString(R.string.MySupportPreference__please_contact_support)
+
+      expiry.text = SpanUtil.clickSubstring(
+        context.getString(R.string.MySupportPreference__couldnt_add_badge_s, contactString),
+        contactString,
+        {
+          model.onContactSupport()
+        },
+        ContextCompat.getColor(context, R.color.signal_accent_primary)
+      )
+      progress.visible = false
+    }
+  }
+
+  fun register(adapter: MappingAdapter) {
+    adapter.registerFactory(Model::class.java, BindingFactory(::ViewHolder, MySupportPreferenceBinding::inflate))
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/DonationRedemptionJobStatus.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/DonationRedemptionJobStatus.kt
new file mode 100644
index 0000000000..d4ac1683e2
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/DonationRedemptionJobStatus.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.manage
+
+import org.thoughtcrime.securesms.database.model.databaseprotos.PendingOneTimeDonation
+
+/**
+ * Represent the status of a donation as represented in the job system.
+ */
+sealed class DonationRedemptionJobStatus {
+  /**
+   * No pending/running jobs for a donation type.
+   */
+  object None : DonationRedemptionJobStatus()
+
+  /**
+   * Donation is pending external user verification (e.g., iDEAL).
+   *
+   * For one-time, pending donation data is provided via the job data as it is not in the store yet.
+   */
+  class PendingExternalVerification(
+    val pendingOneTimeDonation: PendingOneTimeDonation? = null,
+    val nonVerifiedMonthlyDonation: NonVerifiedMonthlyDonation? = null
+  ) : DonationRedemptionJobStatus()
+
+  /**
+   * Donation is at the receipt request status.
+   *
+   * For one-time donations, pending donation data available via the store.
+   */
+  object PendingReceiptRequest : DonationRedemptionJobStatus()
+
+  /**
+   * Donation is at the receipt redemption status.
+   *
+   * For one-time donations, pending donation data available via the store.
+   */
+  object PendingReceiptRedemption : DonationRedemptionJobStatus()
+
+  /**
+   * Representation of a failed subscription job chain derived from no pending/running jobs and
+   * a failure state in the store.
+   */
+  object FailedSubscription : DonationRedemptionJobStatus()
+
+  fun isInProgress(): Boolean {
+    return when (this) {
+      is PendingExternalVerification,
+      PendingReceiptRedemption,
+      PendingReceiptRequest -> true
+
+      FailedSubscription,
+      None -> false
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt
new file mode 100644
index 0000000000..0bd3c88d71
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt
@@ -0,0 +1,433 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.manage
+
+import android.os.Bundle
+import android.text.SpannableStringBuilder
+import android.view.View
+import androidx.appcompat.widget.Toolbar
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.signal.core.util.dp
+import org.signal.core.util.money.FiatMoney
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.models.BadgePreview
+import org.thoughtcrime.securesms.components.settings.DSLConfiguration
+import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
+import org.thoughtcrime.securesms.components.settings.DSLSettingsIcon
+import org.thoughtcrime.securesms.components.settings.DSLSettingsText
+import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatMoney
+import org.thoughtcrime.securesms.components.settings.app.subscription.completed.TerminalDonationDelegate
+import org.thoughtcrime.securesms.components.settings.app.subscription.models.NetworkFailure
+import org.thoughtcrime.securesms.components.settings.configure
+import org.thoughtcrime.securesms.components.settings.models.IndeterminateLoadingCircle
+import org.thoughtcrime.securesms.database.model.databaseprotos.DonationErrorValue
+import org.thoughtcrime.securesms.database.model.databaseprotos.PendingOneTimeDonation
+import org.thoughtcrime.securesms.help.HelpFragment
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import org.thoughtcrime.securesms.subscription.Subscription
+import org.thoughtcrime.securesms.util.CommunicationActions
+import org.thoughtcrime.securesms.util.Material3OnScrollHelper
+import org.thoughtcrime.securesms.util.SpanUtil
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
+import java.util.Currency
+import java.util.concurrent.TimeUnit
+
+/**
+ * Fragment displayed when a user enters "Subscriptions" via app settings but is already
+ * a subscriber. Used to manage their current subscription, view badges, and boost.
+ */
+class ManageDonationsFragment :
+  DSLSettingsFragment(
+    layoutId = R.layout.manage_donations_fragment
+  ) {
+
+  companion object {
+    private val alertedIdealDonations = mutableSetOf<Long>()
+    const val DONATE_TROUBLESHOOTING_URL = "https://support.signal.org/hc/articles/360031949872#fix"
+  }
+
+  private val supportTechSummary: CharSequence by lazy {
+    SpannableStringBuilder(SpanUtil.color(ContextCompat.getColor(requireContext(), R.color.signal_colorOnSurfaceVariant), requireContext().getString(R.string.DonateToSignalFragment__private_messaging)))
+      .append(" ")
+      .append(
+        SpanUtil.readMore(requireContext(), ContextCompat.getColor(requireContext(), R.color.signal_colorPrimary)) {
+          findNavController().safeNavigate(ManageDonationsFragmentDirections.actionManageDonationsFragmentToSubscribeLearnMoreBottomSheetDialog())
+        }
+      )
+  }
+
+  private val viewModel: ManageDonationsViewModel by viewModels()
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    viewLifecycleOwner.lifecycle.addObserver(TerminalDonationDelegate(childFragmentManager, viewLifecycleOwner))
+    super.onViewCreated(view, savedInstanceState)
+  }
+
+  override fun onResume() {
+    super.onResume()
+    viewModel.refresh()
+  }
+
+  override fun bindAdapter(adapter: MappingAdapter) {
+    ActiveSubscriptionPreference.register(adapter)
+    OneTimeDonationPreference.register(adapter)
+    IndeterminateLoadingCircle.register(adapter)
+    BadgePreview.register(adapter)
+    NetworkFailure.register(adapter)
+
+    viewModel.state.observe(viewLifecycleOwner) { state ->
+      adapter.submitList(getConfiguration(state).toMappingModelList())
+
+      if (state.nonVerifiedMonthlyDonation?.checkedVerification == true &&
+        !alertedIdealDonations.contains(state.nonVerifiedMonthlyDonation.timestamp)
+      ) {
+        alertedIdealDonations += state.nonVerifiedMonthlyDonation.timestamp
+
+        val amount = FiatMoneyUtil.format(resources, state.nonVerifiedMonthlyDonation.price)
+
+        MaterialAlertDialogBuilder(requireContext())
+          .setTitle(R.string.ManageDonationsFragment__couldnt_confirm_donation)
+          .setMessage(getString(R.string.ManageDonationsFragment__your_monthly_s_donation_couldnt_be_confirmed, amount))
+          .setPositiveButton(android.R.string.ok, null)
+          .show()
+      } else if (state.pendingOneTimeDonation?.pendingVerification == true &&
+        state.pendingOneTimeDonation.checkedVerification &&
+        !alertedIdealDonations.contains(state.pendingOneTimeDonation.timestamp)
+      ) {
+        alertedIdealDonations += state.pendingOneTimeDonation.timestamp
+
+        val amount = FiatMoneyUtil.format(resources, state.pendingOneTimeDonation.amount!!.toFiatMoney(), FiatMoneyUtil.formatOptions().trimZerosAfterDecimal())
+
+        MaterialAlertDialogBuilder(requireContext())
+          .setTitle(R.string.ManageDonationsFragment__couldnt_confirm_donation)
+          .setMessage(getString(R.string.ManageDonationsFragment__your_one_time_s_donation_couldnt_be_confirmed, amount))
+          .setPositiveButton(android.R.string.ok, null)
+          .show()
+      }
+    }
+  }
+
+  override fun getMaterial3OnScrollHelper(toolbar: Toolbar?): Material3OnScrollHelper {
+    return object : Material3OnScrollHelper(requireActivity(), toolbar!!, viewLifecycleOwner) {
+      override val activeColorSet: ColorSet = ColorSet(R.color.transparent, R.color.signal_colorBackground)
+      override val inactiveColorSet: ColorSet = ColorSet(R.color.transparent, R.color.signal_colorBackground)
+    }
+  }
+
+  private fun getConfiguration(state: ManageDonationsState): DSLConfiguration {
+    return configure {
+      space(36.dp)
+
+      customPref(
+        BadgePreview.BadgeModel.SubscriptionModel(
+          badge = state.featuredBadge
+        )
+      )
+
+      space(12.dp)
+
+      noPadTextPref(
+        title = DSLSettingsText.from(
+          R.string.DonateToSignalFragment__privacy_over_profit,
+          DSLSettingsText.CenterModifier,
+          DSLSettingsText.TitleLargeModifier
+        )
+      )
+
+      space(8.dp)
+
+      noPadTextPref(
+        title = DSLSettingsText.from(supportTechSummary, DSLSettingsText.CenterModifier)
+      )
+
+      space(24.dp)
+
+      primaryWrappedButton(
+        text = DSLSettingsText.from(R.string.ManageDonationsFragment__donate_to_signal),
+        onClick = {
+          findNavController().safeNavigate(ManageDonationsFragmentDirections.actionManageDonationsFragmentToDonateToSignalFragment(InAppPaymentType.ONE_TIME_DONATION))
+        }
+      )
+
+      space(16.dp)
+
+      if (state.subscriptionTransactionState is ManageDonationsState.TransactionState.NotInTransaction) {
+        val activeSubscription = state.subscriptionTransactionState.activeSubscription.activeSubscription
+
+        if (activeSubscription != null) {
+          val subscription: Subscription? = state.availableSubscriptions.firstOrNull { it.level == activeSubscription.level }
+          if (subscription != null) {
+            presentSubscriptionSettings(activeSubscription, subscription, state)
+          } else {
+            customPref(IndeterminateLoadingCircle)
+          }
+        } else if (state.nonVerifiedMonthlyDonation != null) {
+          val subscription: Subscription? = state.availableSubscriptions.firstOrNull { it.level == state.nonVerifiedMonthlyDonation.level }
+          if (subscription != null) {
+            presentNonVerifiedSubscriptionSettings(state.nonVerifiedMonthlyDonation, subscription, state)
+          } else {
+            customPref(IndeterminateLoadingCircle)
+          }
+        } else if (state.hasOneTimeBadge || state.pendingOneTimeDonation != null) {
+          presentActiveOneTimeDonorSettings(state)
+        } else {
+          presentNotADonorSettings(state.hasReceipts)
+        }
+      } else if (state.subscriptionTransactionState == ManageDonationsState.TransactionState.NetworkFailure) {
+        presentNetworkFailureSettings(state, state.hasReceipts)
+      } else {
+        customPref(IndeterminateLoadingCircle)
+      }
+    }
+  }
+
+  private fun DSLConfiguration.presentActiveOneTimeDonorSettings(state: ManageDonationsState) {
+    dividerPref()
+
+    sectionHeaderPref(R.string.ManageDonationsFragment__my_support)
+
+    presentPendingOrProcessingOneTimeDonationState(state)
+
+    // MOLLY: TODO
+    // presentBadges()
+
+    presentOtherWaysToGive()
+
+    presentMore()
+  }
+
+  private fun DSLConfiguration.presentPendingOrProcessingOneTimeDonationState(state: ManageDonationsState) {
+    val pendingOneTimeDonation = state.pendingOneTimeDonation
+    if (pendingOneTimeDonation != null) {
+      customPref(
+        OneTimeDonationPreference.Model(
+          pendingOneTimeDonation = pendingOneTimeDonation,
+          onPendingClick = {
+            displayPendingDialog(it)
+          },
+          onErrorClick = {
+            displayPendingOneTimeDonationErrorDialog(it, pendingOneTimeDonation.paymentMethodType == PendingOneTimeDonation.PaymentMethodType.IDEAL)
+          }
+        )
+      )
+    }
+  }
+
+  private fun DSLConfiguration.presentNetworkFailureSettings(state: ManageDonationsState, hasReceipts: Boolean) {
+    if (SignalStore.inAppPayments.isLikelyASustainer()) {
+      presentSubscriptionSettingsWithNetworkError(state)
+    } else {
+      presentNotADonorSettings(hasReceipts)
+    }
+  }
+
+  private fun DSLConfiguration.presentSubscriptionSettingsWithNetworkError(state: ManageDonationsState) {
+    presentSubscriptionSettingsWithState(state) {
+      customPref(
+        NetworkFailure.Model(
+          onRetryClick = {
+            viewModel.retry()
+          }
+        )
+      )
+    }
+  }
+
+  private fun DSLConfiguration.presentSubscriptionSettings(
+    activeSubscription: ActiveSubscription.Subscription,
+    subscription: Subscription,
+    state: ManageDonationsState
+  ) {
+    presentSubscriptionSettingsWithState(state) {
+      val activeCurrency = Currency.getInstance(activeSubscription.currency)
+      val activeAmount = activeSubscription.amount.movePointLeft(activeCurrency.defaultFractionDigits)
+
+      customPref(
+        ActiveSubscriptionPreference.Model(
+          price = FiatMoney(activeAmount, activeCurrency),
+          subscription = subscription,
+          renewalTimestamp = TimeUnit.SECONDS.toMillis(activeSubscription.endOfCurrentPeriod),
+          redemptionState = state.getMonthlyDonorRedemptionState(),
+          onContactSupport = {
+            requireActivity().finish()
+            requireActivity().startActivity(AppSettingsActivity.help(requireContext(), HelpFragment.DONATION_INDEX))
+          },
+          activeSubscription = activeSubscription,
+          subscriberRequiresCancel = state.subscriberRequiresCancel,
+          onRowClick = {
+            if (it != ManageDonationsState.RedemptionState.IN_PROGRESS) {
+              findNavController().safeNavigate(ManageDonationsFragmentDirections.actionManageDonationsFragmentToDonateToSignalFragment(InAppPaymentType.RECURRING_DONATION))
+            }
+          },
+          onPendingClick = {
+            displayPendingDialog(it)
+          }
+        )
+      )
+    }
+  }
+
+  private fun DSLConfiguration.presentNonVerifiedSubscriptionSettings(
+    nonVerifiedMonthlyDonation: NonVerifiedMonthlyDonation,
+    subscription: Subscription,
+    state: ManageDonationsState
+  ) {
+    presentSubscriptionSettingsWithState(state) {
+      customPref(
+        ActiveSubscriptionPreference.Model(
+          price = nonVerifiedMonthlyDonation.price,
+          subscription = subscription,
+          redemptionState = ManageDonationsState.RedemptionState.IN_PROGRESS,
+          onContactSupport = {},
+          activeSubscription = null,
+          subscriberRequiresCancel = state.subscriberRequiresCancel,
+          onPendingClick = {},
+          onRowClick = {}
+        )
+      )
+    }
+  }
+
+  private fun DSLConfiguration.presentSubscriptionSettingsWithState(
+    state: ManageDonationsState,
+    subscriptionBlock: DSLConfiguration.() -> Unit
+  ) {
+    dividerPref()
+
+    sectionHeaderPref(R.string.ManageDonationsFragment__my_support)
+
+    subscriptionBlock()
+
+    presentPendingOrProcessingOneTimeDonationState(state)
+
+    // MOLLY: TODO
+    // presentBadges()
+
+    presentOtherWaysToGive()
+
+    presentMore()
+  }
+
+  private fun DSLConfiguration.presentNotADonorSettings(hasReceipts: Boolean) {
+    presentOtherWaysToGive()
+
+    if (hasReceipts) {
+      presentMore()
+    }
+  }
+
+  private fun DSLConfiguration.presentOtherWaysToGive() {
+    dividerPref()
+
+    sectionHeaderPref(R.string.ManageDonationsFragment__other_ways_to_give)
+
+    clickPref(
+      title = DSLSettingsText.from(R.string.ManageDonationsFragment__donate_for_a_friend),
+      icon = DSLSettingsIcon.from(R.drawable.symbol_gift_24),
+      onClick = {
+        findNavController().safeNavigate(ManageDonationsFragmentDirections.actionManageDonationsFragmentToDonateToSignalFragment(InAppPaymentType.ONE_TIME_GIFT))
+      }
+    )
+  }
+
+  // MOLLY: TODO
+  // private fun DSLConfiguration.presentBadges() {
+  //   clickPref(
+  //     title = DSLSettingsText.from(R.string.ManageDonationsFragment__badges),
+  //     icon = DSLSettingsIcon.from(R.drawable.symbol_badge_multi_24),
+  //     onClick = {
+  //       findNavController().safeNavigate(ManageDonationsFragmentDirections.actionManageDonationsFragmentToManageBadges())
+  //     }
+  //   )
+  // }
+
+  private fun DSLConfiguration.presentReceipts() {
+    clickPref(
+      title = DSLSettingsText.from(R.string.ManageDonationsFragment__donation_receipts),
+      icon = DSLSettingsIcon.from(R.drawable.symbol_receipt_24),
+      onClick = {
+        findNavController().safeNavigate(ManageDonationsFragmentDirections.actionManageDonationsFragmentToDonationReceiptListFragment())
+      }
+    )
+  }
+
+  private fun DSLConfiguration.presentMore() {
+    dividerPref()
+
+    sectionHeaderPref(R.string.ManageDonationsFragment__more)
+
+    presentReceipts()
+
+    externalLinkPref(
+      title = DSLSettingsText.from(R.string.ManageDonationsFragment__subscription_faq),
+      icon = DSLSettingsIcon.from(R.drawable.symbol_help_24),
+      linkId = R.string.donate_faq_url
+    )
+  }
+
+  private fun displayPendingDialog(fiatMoney: FiatMoney) {
+    MaterialAlertDialogBuilder(requireContext())
+      .setTitle(R.string.MySupportPreference__payment_pending)
+      .setMessage(
+        getString(
+          R.string.MySupportPreference__your_bank_transfer_of_s,
+          FiatMoneyUtil.format(resources, fiatMoney, FiatMoneyUtil.formatOptions().trimZerosAfterDecimal())
+        )
+      )
+      .setPositiveButton(android.R.string.ok) { _, _ -> }
+      .setNegativeButton(R.string.MySupportPreference__learn_more) { _, _ ->
+        CommunicationActions.openBrowserLink(
+          requireContext(),
+          getString(R.string.pending_transfer_url)
+        )
+      }
+      .show()
+  }
+
+  private fun displayPendingOneTimeDonationErrorDialog(error: DonationErrorValue, isIdeal: Boolean) {
+    when (error.type) {
+      DonationErrorValue.Type.REDEMPTION -> {
+        MaterialAlertDialogBuilder(requireContext())
+          .setTitle(R.string.DonationsErrors__couldnt_add_badge)
+          .setMessage(R.string.DonationsErrors__your_badge_could_not)
+          .setNegativeButton(R.string.DonationsErrors__learn_more) { _, _ ->
+            CommunicationActions.openBrowserLink(requireContext(), DONATE_TROUBLESHOOTING_URL)
+          }
+          .setPositiveButton(R.string.Subscription__contact_support) { _, _ ->
+            requireActivity().finish()
+            startActivity(AppSettingsActivity.help(requireContext(), HelpFragment.DONATION_INDEX))
+          }
+          .setOnDismissListener {
+            SignalStore.inAppPayments.setPendingOneTimeDonation(null)
+          }
+          .show()
+      }
+
+      else -> {
+        val message = if (isIdeal) {
+          R.string.DonationsErrors__your_ideal_couldnt_be_processed
+        } else {
+          R.string.DonationsErrors__try_another_payment_method
+        }
+
+        MaterialAlertDialogBuilder(requireContext())
+          .setTitle(R.string.DonationsErrors__error_processing_payment)
+          .setMessage(message)
+          .setNegativeButton(R.string.DonationsErrors__learn_more) { _, _ ->
+            CommunicationActions.openBrowserLink(requireContext(), DONATE_TROUBLESHOOTING_URL)
+          }
+          .setPositiveButton(android.R.string.ok, null)
+          .setOnDismissListener {
+            SignalStore.inAppPayments.setPendingOneTimeDonation(null)
+          }
+          .show()
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsState.kt
new file mode 100644
index 0000000000..d212f09c37
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsState.kt
@@ -0,0 +1,51 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.manage
+
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.database.model.databaseprotos.PendingOneTimeDonation
+import org.thoughtcrime.securesms.subscription.Subscription
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
+
+data class ManageDonationsState(
+  val hasOneTimeBadge: Boolean = false,
+  val hasReceipts: Boolean = false,
+  val featuredBadge: Badge? = null,
+  val subscriptionTransactionState: TransactionState = TransactionState.Init,
+  val availableSubscriptions: List<Subscription> = emptyList(),
+  val pendingOneTimeDonation: PendingOneTimeDonation? = null,
+  val nonVerifiedMonthlyDonation: NonVerifiedMonthlyDonation? = null,
+  val subscriberRequiresCancel: Boolean = false,
+  private val subscriptionRedemptionState: RedemptionState = RedemptionState.NONE
+) {
+
+  fun getMonthlyDonorRedemptionState(): RedemptionState {
+    return when (subscriptionTransactionState) {
+      TransactionState.Init -> subscriptionRedemptionState
+      TransactionState.NetworkFailure -> subscriptionRedemptionState
+      TransactionState.InTransaction -> RedemptionState.IN_PROGRESS
+      is TransactionState.NotInTransaction -> getStateFromActiveSubscription(subscriptionTransactionState.activeSubscription) ?: subscriptionRedemptionState
+    }
+  }
+
+  private fun getStateFromActiveSubscription(activeSubscription: ActiveSubscription): RedemptionState? {
+    return when {
+      activeSubscription.isFailedPayment && !activeSubscription.isPastDue -> RedemptionState.FAILED
+      activeSubscription.isPendingBankTransfer -> RedemptionState.IS_PENDING_BANK_TRANSFER
+      activeSubscription.isInProgress -> RedemptionState.IN_PROGRESS
+      else -> null
+    }
+  }
+
+  sealed class TransactionState {
+    object Init : TransactionState()
+    object NetworkFailure : TransactionState()
+    object InTransaction : TransactionState()
+    class NotInTransaction(val activeSubscription: ActiveSubscription) : TransactionState()
+  }
+
+  enum class RedemptionState {
+    NONE,
+    IN_PROGRESS,
+    IS_PENDING_BANK_TRANSFER,
+    FAILED
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsViewModel.kt
new file mode 100644
index 0000000000..41e8e5d8bb
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsViewModel.kt
@@ -0,0 +1,158 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.manage
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.ViewModel
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.Disposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.kotlin.subscribeBy
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.util.logging.Log
+import org.signal.core.util.orNull
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.RecurringInAppPaymentRepository
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.subscription.LevelUpdate
+import org.thoughtcrime.securesms.util.InternetConnectionObserver
+import org.thoughtcrime.securesms.util.livedata.Store
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
+import java.util.Optional
+
+class ManageDonationsViewModel : ViewModel() {
+
+  private val store = Store(ManageDonationsState())
+  private val disposables = CompositeDisposable()
+  private val networkDisposable: Disposable
+
+  val state: LiveData<ManageDonationsState> = store.stateLiveData
+
+  init {
+    store.update(Recipient.self().live().liveDataResolved) { self, state ->
+      state.copy(featuredBadge = self.featuredBadge)
+    }
+
+    networkDisposable = InternetConnectionObserver
+      .observe()
+      .distinctUntilChanged()
+      .subscribe { isConnected ->
+        if (isConnected) {
+          retry()
+        }
+      }
+  }
+
+  override fun onCleared() {
+    disposables.clear()
+  }
+
+  fun retry() {
+    if (!disposables.isDisposed && store.state.subscriptionTransactionState == ManageDonationsState.TransactionState.NetworkFailure) {
+      store.update { it.copy(subscriptionTransactionState = ManageDonationsState.TransactionState.Init) }
+      refresh()
+    }
+  }
+
+  fun refresh() {
+    disposables.clear()
+
+    val levelUpdateOperationEdges: Observable<Boolean> = LevelUpdate.isProcessing.distinctUntilChanged()
+    val activeSubscription: Single<ActiveSubscription> = RecurringInAppPaymentRepository.getActiveSubscription(InAppPaymentSubscriberRecord.Type.DONATION)
+
+    disposables += Single.fromCallable {
+      InAppPaymentsRepository.getShouldCancelSubscriptionBeforeNextSubscribeAttempt(InAppPaymentSubscriberRecord.Type.DONATION)
+    }.subscribeBy { requiresCancel ->
+      store.update {
+        it.copy(subscriberRequiresCancel = requiresCancel)
+      }
+    }
+
+    disposables += Recipient.observable(Recipient.self().id).map { it.badges }.subscribeBy { badges ->
+      store.update { state ->
+        state.copy(
+          hasOneTimeBadge = badges.any { it.isBoost() }
+        )
+      }
+    }
+
+    disposables += Single.fromCallable { SignalDatabase.donationReceipts.hasReceipts() }.subscribeOn(Schedulers.io()).subscribe { hasReceipts ->
+      store.update { it.copy(hasReceipts = hasReceipts) }
+    }
+
+    disposables += InAppPaymentsRepository.observeInAppPaymentRedemption(InAppPaymentType.RECURRING_DONATION).subscribeBy { redemptionStatus ->
+      store.update { manageDonationsState ->
+        manageDonationsState.copy(
+          nonVerifiedMonthlyDonation = if (redemptionStatus is DonationRedemptionJobStatus.PendingExternalVerification) redemptionStatus.nonVerifiedMonthlyDonation else null,
+          subscriptionRedemptionState = mapStatusToRedemptionState(redemptionStatus)
+        )
+      }
+    }
+
+    disposables += Observable.combineLatest(
+      SignalStore.inAppPayments.observablePendingOneTimeDonation,
+      InAppPaymentsRepository.observeInAppPaymentRedemption(InAppPaymentType.ONE_TIME_DONATION)
+    ) { pendingFromStore, pendingFromJob ->
+      if (pendingFromStore.isPresent) {
+        pendingFromStore
+      } else if (pendingFromJob is DonationRedemptionJobStatus.PendingExternalVerification) {
+        Optional.ofNullable(pendingFromJob.pendingOneTimeDonation)
+      } else {
+        Optional.empty()
+      }
+    }
+      .distinctUntilChanged()
+      .subscribeBy { pending ->
+        store.update { it.copy(pendingOneTimeDonation = pending.orNull()) }
+      }
+
+    disposables += levelUpdateOperationEdges.switchMapSingle { isProcessing ->
+      if (isProcessing) {
+        Single.just(ManageDonationsState.TransactionState.InTransaction)
+      } else {
+        activeSubscription.map { ManageDonationsState.TransactionState.NotInTransaction(it) }
+      }
+    }.subscribeBy(
+      onNext = { transactionState ->
+        store.update {
+          it.copy(subscriptionTransactionState = transactionState)
+        }
+      },
+      onError = { throwable ->
+        Log.w(TAG, "Error retrieving subscription transaction state", throwable)
+
+        store.update {
+          it.copy(subscriptionTransactionState = ManageDonationsState.TransactionState.NetworkFailure)
+        }
+      }
+    )
+
+    disposables += RecurringInAppPaymentRepository.getSubscriptions().subscribeBy(
+      onSuccess = { subs ->
+        store.update { it.copy(availableSubscriptions = subs) }
+      },
+      onError = {
+        Log.w(TAG, "Error retrieving subscriptions data", it)
+      }
+    )
+  }
+
+  private fun mapStatusToRedemptionState(status: DonationRedemptionJobStatus): ManageDonationsState.RedemptionState {
+    return when (status) {
+      DonationRedemptionJobStatus.FailedSubscription -> ManageDonationsState.RedemptionState.FAILED
+      DonationRedemptionJobStatus.None -> ManageDonationsState.RedemptionState.NONE
+
+      is DonationRedemptionJobStatus.PendingExternalVerification,
+      DonationRedemptionJobStatus.PendingReceiptRedemption,
+      DonationRedemptionJobStatus.PendingReceiptRequest -> ManageDonationsState.RedemptionState.IN_PROGRESS
+    }
+  }
+
+  companion object {
+    private val TAG = Log.tag(ManageDonationsViewModel::class.java)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/NonVerifiedMonthlyDonation.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/NonVerifiedMonthlyDonation.kt
new file mode 100644
index 0000000000..3f4e6e64d9
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/NonVerifiedMonthlyDonation.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.manage
+
+import org.signal.core.util.money.FiatMoney
+
+/**
+ * Represents a monthly donation via iDEAL that is still pending user verification in
+ * their 3rd party app.
+ */
+data class NonVerifiedMonthlyDonation(
+  val timestamp: Long,
+  val price: FiatMoney,
+  val level: Int,
+  val checkedVerification: Boolean
+)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/OneTimeDonationPreference.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/OneTimeDonationPreference.kt
new file mode 100644
index 0000000000..45dcafd9eb
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/OneTimeDonationPreference.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.manage
+
+import android.widget.ProgressBar
+import android.widget.TextView
+import org.signal.core.util.money.FiatMoney
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.BadgeImageView
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatMoney
+import org.thoughtcrime.securesms.database.model.databaseprotos.DonationErrorValue
+import org.thoughtcrime.securesms.database.model.databaseprotos.PendingOneTimeDonation
+import org.thoughtcrime.securesms.databinding.MySupportPreferenceBinding
+import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import org.thoughtcrime.securesms.util.adapter.mapping.BindingFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.BindingViewHolder
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
+import org.thoughtcrime.securesms.util.visible
+
+/**
+ * Holds state information about pending one-time donations.
+ */
+object OneTimeDonationPreference {
+
+  fun register(adapter: MappingAdapter) {
+    adapter.registerFactory(Model::class.java, BindingFactory(::ViewHolder, MySupportPreferenceBinding::inflate))
+  }
+
+  class Model(
+    val pendingOneTimeDonation: PendingOneTimeDonation,
+    val onPendingClick: (FiatMoney) -> Unit,
+    val onErrorClick: (DonationErrorValue) -> Unit
+  ) : MappingModel<Model> {
+    override fun areItemsTheSame(newItem: Model): Boolean = true
+
+    override fun areContentsTheSame(newItem: Model): Boolean {
+      return this.pendingOneTimeDonation == newItem.pendingOneTimeDonation
+    }
+  }
+
+  class ViewHolder(binding: MySupportPreferenceBinding) : BindingViewHolder<Model, MySupportPreferenceBinding>(binding) {
+
+    val badge: BadgeImageView = binding.mySupportBadge
+    val title: TextView = binding.mySupportTitle
+    val expiry: TextView = binding.mySupportExpiry
+    val progress: ProgressBar = binding.mySupportProgress
+
+    override fun bind(model: Model) {
+      badge.setBadge(Badges.fromDatabaseBadge(model.pendingOneTimeDonation.badge!!))
+      title.text = context.getString(
+        R.string.OneTimeDonationPreference__one_time_s,
+        FiatMoneyUtil.format(context.resources, model.pendingOneTimeDonation.amount!!.toFiatMoney(), FiatMoneyUtil.formatOptions().trimZerosAfterDecimal())
+      )
+
+      if (model.pendingOneTimeDonation.error != null) {
+        presentErrorState(model, model.pendingOneTimeDonation.error)
+      } else {
+        presentPendingState(model)
+      }
+    }
+
+    private fun presentErrorState(model: Model, error: DonationErrorValue) {
+      expiry.text = getErrorSubtitle(error)
+
+      itemView.setOnClickListener { model.onErrorClick(error) }
+
+      progress.visible = false
+    }
+
+    private fun presentPendingState(model: Model) {
+      expiry.text = getPendingSubtitle(model.pendingOneTimeDonation.paymentMethodType)
+
+      if (model.pendingOneTimeDonation.paymentMethodType == PendingOneTimeDonation.PaymentMethodType.SEPA_DEBIT) {
+        itemView.setOnClickListener { model.onPendingClick(model.pendingOneTimeDonation.amount!!.toFiatMoney()) }
+      }
+
+      progress.visible = model.pendingOneTimeDonation.paymentMethodType != PendingOneTimeDonation.PaymentMethodType.SEPA_DEBIT
+    }
+
+    private fun getErrorSubtitle(error: DonationErrorValue): String {
+      return when (error.type) {
+        DonationErrorValue.Type.REDEMPTION -> context.getString(R.string.DonationsErrors__couldnt_add_badge)
+        else -> context.getString(R.string.DonationsErrors__donation_failed)
+      }
+    }
+
+    private fun getPendingSubtitle(paymentMethodType: PendingOneTimeDonation.PaymentMethodType): String {
+      return when (paymentMethodType) {
+        PendingOneTimeDonation.PaymentMethodType.CARD -> context.getString(R.string.OneTimeDonationPreference__donation_processing)
+        PendingOneTimeDonation.PaymentMethodType.SEPA_DEBIT -> context.getString(R.string.OneTimeDonationPreference__donation_pending)
+        PendingOneTimeDonation.PaymentMethodType.PAYPAL -> context.getString(R.string.OneTimeDonationPreference__donation_processing)
+        PendingOneTimeDonation.PaymentMethodType.IDEAL -> context.getString(R.string.OneTimeDonationPreference__donation_pending)
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/models/CurrencySelection.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/models/CurrencySelection.kt
new file mode 100644
index 0000000000..02da2fd88c
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/models/CurrencySelection.kt
@@ -0,0 +1,47 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.models
+
+import android.view.View
+import android.widget.TextView
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.PreferenceModel
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
+import java.util.Currency
+
+object CurrencySelection {
+
+  fun register(adapter: MappingAdapter) {
+    adapter.registerFactory(Model::class.java, LayoutFactory({ ViewHolder(it) }, R.layout.subscription_currency_selection))
+  }
+
+  class Model(
+    val selectedCurrency: Currency,
+    override val isEnabled: Boolean,
+    val onClick: () -> Unit
+  ) : PreferenceModel<Model>(isEnabled = isEnabled) {
+    override fun areItemsTheSame(newItem: Model): Boolean {
+      return true
+    }
+
+    override fun areContentsTheSame(newItem: Model): Boolean {
+      return super.areContentsTheSame(newItem) &&
+        newItem.selectedCurrency == selectedCurrency
+    }
+  }
+
+  class ViewHolder(itemView: View) : MappingViewHolder<Model>(itemView) {
+
+    private val spinner: TextView = itemView.findViewById(R.id.subscription_currency_selection_spinner)
+
+    override fun bind(model: Model) {
+      spinner.text = model.selectedCurrency.currencyCode
+      spinner.isEnabled = model.isEnabled
+
+      itemView.setOnClickListener { model.onClick() }
+
+      itemView.isEnabled = model.isEnabled
+      itemView.isClickable = model.isEnabled
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/models/GooglePayButton.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/models/GooglePayButton.kt
new file mode 100644
index 0000000000..54dd0648fc
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/models/GooglePayButton.kt
@@ -0,0 +1,32 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.models
+
+import android.view.View
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.PreferenceModel
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
+
+object GooglePayButton {
+
+  class Model(val onClick: () -> Unit, override val isEnabled: Boolean) : PreferenceModel<Model>(isEnabled = isEnabled) {
+    override fun areItemsTheSame(newItem: Model): Boolean = true
+  }
+
+  class ViewHolder(itemView: View) : MappingViewHolder<Model>(itemView) {
+
+    private val googlePayButton: View = findViewById(R.id.googlepay_button)
+
+    override fun bind(model: Model) {
+      googlePayButton.isEnabled = model.isEnabled
+      googlePayButton.setOnClickListener {
+        googlePayButton.isEnabled = false
+        model.onClick()
+      }
+    }
+  }
+
+  fun register(adapter: MappingAdapter) {
+    adapter.registerFactory(Model::class.java, LayoutFactory({ ViewHolder(it) }, R.layout.google_pay_button_pref))
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/models/NetworkFailure.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/models/NetworkFailure.kt
new file mode 100644
index 0000000000..092b098c87
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/models/NetworkFailure.kt
@@ -0,0 +1,35 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.models
+
+import android.view.View
+import com.google.android.material.button.MaterialButton
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.PreferenceModel
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
+
+/**
+ * NetworkFailure will display a "card" to the user informing them that there
+ * was a failure and give them a button which allows them to retry fetching data.
+ */
+object NetworkFailure {
+
+  class Model(
+    val onRetryClick: () -> Unit
+  ) : PreferenceModel<Model>() {
+    override fun areItemsTheSame(newItem: Model): Boolean = true
+  }
+
+  class ViewHolder(itemView: View) : MappingViewHolder<Model>(itemView) {
+
+    private val retryButton = itemView.findViewById<MaterialButton>(R.id.retry_button)
+
+    override fun bind(model: Model) {
+      retryButton.setOnClickListener { model.onRetryClick() }
+    }
+  }
+
+  fun register(mappingAdapter: MappingAdapter) {
+    mappingAdapter.registerFactory(Model::class.java, LayoutFactory({ ViewHolder(it) }, R.layout.network_failure_pref))
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/models/PayPalButton.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/models/PayPalButton.kt
new file mode 100644
index 0000000000..035fb5e67f
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/models/PayPalButton.kt
@@ -0,0 +1,28 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.models
+
+import org.thoughtcrime.securesms.databinding.PaypalButtonBinding
+import org.thoughtcrime.securesms.util.adapter.mapping.BindingFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.BindingViewHolder
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
+
+object PayPalButton {
+  fun register(mappingAdapter: MappingAdapter) {
+    mappingAdapter.registerFactory(Model::class.java, BindingFactory(::ViewHolder, PaypalButtonBinding::inflate))
+  }
+
+  class Model(val onClick: () -> Unit, val isEnabled: Boolean) : MappingModel<Model> {
+    override fun areItemsTheSame(newItem: Model): Boolean = true
+    override fun areContentsTheSame(newItem: Model): Boolean = isEnabled == newItem.isEnabled
+  }
+
+  class ViewHolder(binding: PaypalButtonBinding) : BindingViewHolder<Model, PaypalButtonBinding>(binding) {
+    override fun bind(model: Model) {
+      binding.paypalButton.isEnabled = model.isEnabled
+      binding.paypalButton.setOnClickListener {
+        binding.paypalButton.isEnabled = false
+        model.onClick()
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailFragment.kt
new file mode 100644
index 0000000000..3e399b9351
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailFragment.kt
@@ -0,0 +1,164 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.detail
+
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.graphics.Bitmap
+import android.net.Uri
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.TextView
+import android.widget.Toast
+import androidx.core.app.ShareCompat
+import androidx.core.view.drawToBitmap
+import androidx.fragment.app.viewModels
+import com.google.android.material.button.MaterialButton
+import org.signal.core.util.concurrent.SimpleTask
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.SignalProgressDialog
+import org.thoughtcrime.securesms.components.settings.DSLConfiguration
+import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
+import org.thoughtcrime.securesms.components.settings.DSLSettingsText
+import org.thoughtcrime.securesms.components.settings.configure
+import org.thoughtcrime.securesms.components.settings.models.SplashImage
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import org.thoughtcrime.securesms.providers.BlobProvider
+import org.thoughtcrime.securesms.util.DateUtils
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import java.io.ByteArrayOutputStream
+import java.util.Locale
+
+class DonationReceiptDetailFragment : DSLSettingsFragment(layoutId = R.layout.donation_receipt_detail_fragment) {
+
+  private lateinit var progressDialog: SignalProgressDialog
+
+  private val viewModel: DonationReceiptDetailViewModel by viewModels(
+    factoryProducer = {
+      DonationReceiptDetailViewModel.Factory(
+        DonationReceiptDetailFragmentArgs.fromBundle(requireArguments()).id,
+        DonationReceiptDetailRepository()
+      )
+    }
+  )
+
+  override fun bindAdapter(adapter: MappingAdapter) {
+    SplashImage.register(adapter)
+
+    val sharePngButton: MaterialButton = requireView().findViewById(R.id.share_png)
+    sharePngButton.isEnabled = false
+
+    viewModel.state.observe(viewLifecycleOwner) { state ->
+      if (state.donationReceiptRecord != null) {
+        adapter.submitList(getConfiguration(state.donationReceiptRecord, state.subscriptionName).toMappingModelList())
+      }
+
+      if (state.donationReceiptRecord != null && state.subscriptionName != null) {
+        sharePngButton.isEnabled = true
+        sharePngButton.setOnClickListener {
+          renderPng(state.donationReceiptRecord, state.subscriptionName)
+        }
+      }
+    }
+  }
+
+  private fun renderPng(record: DonationReceiptRecord, subscriptionName: String) {
+    progressDialog = SignalProgressDialog.show(requireContext())
+
+    val today: String = DateUtils.formatDateWithDayOfWeek(Locale.getDefault(), System.currentTimeMillis())
+    val amount: String = FiatMoneyUtil.format(resources, record.amount)
+    val type: String = when (record.type) {
+      DonationReceiptRecord.Type.RECURRING_DONATION -> getString(R.string.DonationReceiptDetailsFragment__s_dash_s, subscriptionName, getString(R.string.DonationReceiptListFragment__recurring))
+      DonationReceiptRecord.Type.ONE_TIME_DONATION -> getString(R.string.DonationReceiptListFragment__one_time)
+      DonationReceiptRecord.Type.ONE_TIME_GIFT -> getString(R.string.DonationReceiptListFragment__donation_for_a_friend)
+      DonationReceiptRecord.Type.RECURRING_BACKUP -> error("Not supported in this fragment")
+    }
+    val datePaid: String = DateUtils.formatDate(Locale.getDefault(), record.timestamp)
+
+    SimpleTask.run(viewLifecycleOwner.lifecycle, {
+      val outputStream = ByteArrayOutputStream()
+      val view = LayoutInflater
+        .from(requireContext())
+        .inflate(R.layout.donation_receipt_png, null)
+
+      view.findViewById<TextView>(R.id.date).text = today
+      view.findViewById<TextView>(R.id.amount).text = amount
+      view.findViewById<TextView>(R.id.donation_type).text = type
+      view.findViewById<TextView>(R.id.date_paid).text = datePaid
+
+      view.measure(View.MeasureSpec.makeMeasureSpec(DONATION_RECEIPT_WIDTH, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED))
+      view.layout(0, 0, view.measuredWidth, view.measuredHeight)
+
+      val bitmap = view.drawToBitmap()
+      bitmap.compress(Bitmap.CompressFormat.PNG, 0, outputStream)
+
+      BlobProvider.getInstance()
+        .forData(outputStream.toByteArray())
+        .withMimeType("image/png")
+        .withFileName("Signal-Donation-Receipt.png")
+        .createForSingleSessionInMemory()
+    }, {
+      progressDialog.dismiss()
+      openShareSheet(it)
+    })
+  }
+
+  private fun openShareSheet(uri: Uri) {
+    val mimeType = Intent.normalizeMimeType("image/png")
+    val shareIntent = ShareCompat.IntentBuilder(requireContext())
+      .setStream(uri)
+      .setType(mimeType)
+      .createChooserIntent()
+      .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+
+    try {
+      startActivity(shareIntent)
+    } catch (e: ActivityNotFoundException) {
+      Log.w(TAG, "No activity existed to share the media.", e)
+      Toast.makeText(requireContext(), R.string.MediaPreviewActivity_cant_find_an_app_able_to_share_this_media, Toast.LENGTH_LONG).show()
+    }
+  }
+
+  private fun getConfiguration(record: DonationReceiptRecord, subscriptionName: String?): DSLConfiguration {
+    return configure {
+      customPref(
+        SplashImage.Model(
+          splashImageResId = R.drawable.ic_molly_logo
+        )
+      )
+
+      textPref(
+        title = DSLSettingsText.from(
+          charSequence = FiatMoneyUtil.format(resources, record.amount),
+          DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_Giant),
+          DSLSettingsText.CenterModifier
+        )
+      )
+
+      dividerPref()
+
+      textPref(
+        title = DSLSettingsText.from(R.string.DonationReceiptDetailsFragment__donation_type),
+        summary = DSLSettingsText.from(
+          when (record.type) {
+            DonationReceiptRecord.Type.RECURRING_DONATION -> getString(R.string.DonationReceiptDetailsFragment__s_dash_s, subscriptionName, getString(R.string.DonationReceiptListFragment__recurring))
+            DonationReceiptRecord.Type.ONE_TIME_DONATION -> getString(R.string.DonationReceiptListFragment__one_time)
+            DonationReceiptRecord.Type.ONE_TIME_GIFT -> getString(R.string.DonationReceiptListFragment__donation_for_a_friend)
+            DonationReceiptRecord.Type.RECURRING_BACKUP -> error("Not supported in this fragment.")
+          }
+        )
+      )
+
+      textPref(
+        title = DSLSettingsText.from(R.string.DonationReceiptDetailsFragment__date_paid),
+        summary = record.let { DSLSettingsText.from(DateUtils.formatDateWithYear(Locale.getDefault(), it.timestamp)) }
+      )
+    }
+  }
+
+  companion object {
+    private const val DONATION_RECEIPT_WIDTH = 1916
+
+    private val TAG = Log.tag(DonationReceiptDetailFragment::class.java)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailRepository.kt
new file mode 100644
index 0000000000..44dd54d09e
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailRepository.kt
@@ -0,0 +1,30 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.detail
+
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.thoughtcrime.securesms.components.settings.app.subscription.getSubscriptionLevels
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import java.util.Locale
+
+class DonationReceiptDetailRepository {
+  fun getSubscriptionLevelName(subscriptionLevel: Int): Single<String> {
+    return Single
+      .fromCallable {
+        AppDependencies
+          .donationsService
+          .getDonationsConfiguration(Locale.getDefault())
+      }
+      .flatMap { it.flattenResult() }
+      .map { it.getSubscriptionLevels()[subscriptionLevel] ?: throw Exception("Subscription level $subscriptionLevel not found") }
+      .map { it.name }
+      .subscribeOn(Schedulers.io())
+  }
+
+  fun getDonationReceiptRecord(id: Long): Single<DonationReceiptRecord> {
+    return Single.fromCallable<DonationReceiptRecord> {
+      SignalDatabase.donationReceipts.getReceipt(id)!!
+    }.subscribeOn(Schedulers.io())
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailState.kt
new file mode 100644
index 0000000000..4f33b592f9
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailState.kt
@@ -0,0 +1,8 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.detail
+
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+
+data class DonationReceiptDetailState(
+  val donationReceiptRecord: DonationReceiptRecord? = null,
+  val subscriptionName: String? = null
+)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailViewModel.kt
new file mode 100644
index 0000000000..36165d40b5
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailViewModel.kt
@@ -0,0 +1,70 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.detail
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.Disposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+import org.thoughtcrime.securesms.util.InternetConnectionObserver
+import org.thoughtcrime.securesms.util.livedata.Store
+
+class DonationReceiptDetailViewModel(id: Long, private val repository: DonationReceiptDetailRepository) : ViewModel() {
+
+  private val store = Store(DonationReceiptDetailState())
+  private val disposables = CompositeDisposable()
+  private var networkDisposable: Disposable
+  private val cachedRecord: Single<DonationReceiptRecord> = repository.getDonationReceiptRecord(id).cache()
+
+  val state: LiveData<DonationReceiptDetailState> = store.stateLiveData
+
+  init {
+    networkDisposable = InternetConnectionObserver
+      .observe()
+      .distinctUntilChanged()
+      .subscribe { isConnected ->
+        if (isConnected) {
+          retry()
+        }
+      }
+
+    refresh()
+  }
+
+  private fun retry() {
+    if (store.state.subscriptionName == null) {
+      refresh()
+    }
+  }
+
+  private fun refresh() {
+    disposables.clear()
+
+    disposables += cachedRecord.subscribe { record ->
+      store.update { it.copy(donationReceiptRecord = record) }
+    }
+
+    disposables += cachedRecord.flatMap {
+      if (it.subscriptionLevel > 0) {
+        repository.getSubscriptionLevelName(it.subscriptionLevel)
+      } else {
+        Single.just("")
+      }
+    }.subscribe { name ->
+      store.update { it.copy(subscriptionName = name) }
+    }
+  }
+
+  override fun onCleared() {
+    disposables.clear()
+    networkDisposable.dispose()
+  }
+
+  class Factory(private val id: Long, private val repository: DonationReceiptDetailRepository) : ViewModelProvider.Factory {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+      return modelClass.cast(DonationReceiptDetailViewModel(id, repository)) as T
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptBadge.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptBadge.kt
new file mode 100644
index 0000000000..e706e23cb8
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptBadge.kt
@@ -0,0 +1,10 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+
+data class DonationReceiptBadge(
+  val type: DonationReceiptRecord.Type,
+  val level: Int,
+  val badge: Badge
+)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListAdapter.kt
new file mode 100644
index 0000000000..8ea193fa22
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListAdapter.kt
@@ -0,0 +1,43 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.DSLSettingsText
+import org.thoughtcrime.securesms.components.settings.SectionHeaderPreference
+import org.thoughtcrime.securesms.components.settings.SectionHeaderPreferenceViewHolder
+import org.thoughtcrime.securesms.components.settings.TextPreference
+import org.thoughtcrime.securesms.components.settings.TextPreferenceViewHolder
+import org.thoughtcrime.securesms.util.StickyHeaderDecoration
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.toLocalDateTime
+
+class DonationReceiptListAdapter(onModelClick: (DonationReceiptListItem.Model) -> Unit) : MappingAdapter(), StickyHeaderDecoration.StickyHeaderAdapter<SectionHeaderPreferenceViewHolder> {
+
+  init {
+    registerFactory(TextPreference::class.java, LayoutFactory({ TextPreferenceViewHolder(it) }, R.layout.dsl_preference_item))
+    DonationReceiptListItem.register(this, onModelClick)
+  }
+
+  override fun getHeaderId(position: Int): Long {
+    return when (val item = getItem(position)) {
+      is DonationReceiptListItem.Model -> item.record.timestamp.toLocalDateTime().year.toLong()
+      else -> StickyHeaderDecoration.StickyHeaderAdapter.NO_HEADER_ID
+    }
+  }
+
+  override fun onCreateHeaderViewHolder(parent: ViewGroup?, position: Int, type: Int): SectionHeaderPreferenceViewHolder {
+    return SectionHeaderPreferenceViewHolder(LayoutInflater.from(parent!!.context).inflate(R.layout.dsl_section_header, parent, false))
+  }
+
+  override fun onBindHeaderViewHolder(viewHolder: SectionHeaderPreferenceViewHolder?, position: Int, type: Int) {
+    viewHolder?.itemView?.run {
+      val color = ContextCompat.getColor(context, R.color.signal_colorBackground)
+      setBackgroundColor(color)
+    }
+
+    viewHolder?.bind(SectionHeaderPreference(DSLSettingsText.from(getHeaderId(position).toString())))
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListFragment.kt
new file mode 100644
index 0000000000..ea120bcd90
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListFragment.kt
@@ -0,0 +1,41 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.widget.Toolbar
+import androidx.fragment.app.Fragment
+import androidx.navigation.fragment.findNavController
+import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.tabs.TabLayoutMediator
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.BoldSelectionTabItem
+import org.thoughtcrime.securesms.components.ControllableTabLayout
+
+class DonationReceiptListFragment : Fragment(R.layout.donation_receipt_list_fragment) {
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    val pager: ViewPager2 = view.findViewById(R.id.pager)
+    val tabs: ControllableTabLayout = view.findViewById(R.id.tabs)
+    val toolbar: Toolbar = view.findViewById(R.id.toolbar)
+
+    toolbar.setNavigationOnClickListener {
+      findNavController().popBackStack()
+    }
+
+    pager.adapter = DonationReceiptListPageAdapter(this)
+
+    BoldSelectionTabItem.registerListeners(tabs)
+
+    TabLayoutMediator(tabs, pager) { tab, position ->
+      tab.setText(
+        when (position) {
+          0 -> R.string.DonationReceiptListFragment__all
+          1 -> R.string.DonationReceiptListFragment__recurring
+          2 -> R.string.DonationReceiptListFragment__one_time
+          3 -> R.string.DonationReceiptListFragment__for_a_friend
+          else -> error("Unsupported index $position")
+        }
+      )
+    }.attach()
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListItem.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListItem.kt
new file mode 100644
index 0000000000..2d2427beb3
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListItem.kt
@@ -0,0 +1,54 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import android.view.View
+import android.widget.TextView
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.BadgeImageView
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import org.thoughtcrime.securesms.util.DateUtils
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
+import java.util.Locale
+
+object DonationReceiptListItem {
+
+  fun register(adapter: MappingAdapter, onClick: (Model) -> Unit) {
+    adapter.registerFactory(Model::class.java, LayoutFactory({ ViewHolder(it, onClick) }, R.layout.donation_receipt_list_item))
+  }
+
+  class Model(
+    val record: DonationReceiptRecord,
+    val badge: Badge?
+  ) : MappingModel<Model> {
+    override fun areContentsTheSame(newItem: Model): Boolean = record == newItem.record && badge == newItem.badge
+
+    override fun areItemsTheSame(newItem: Model): Boolean = record.id == newItem.record.id
+  }
+
+  private class ViewHolder(itemView: View, private val onClick: (Model) -> Unit) : MappingViewHolder<Model>(itemView) {
+
+    private val badgeView: BadgeImageView = itemView.findViewById(R.id.badge)
+    private val dateView: TextView = itemView.findViewById(R.id.date)
+    private val typeView: TextView = itemView.findViewById(R.id.type)
+    private val moneyView: TextView = itemView.findViewById(R.id.money)
+
+    override fun bind(model: Model) {
+      itemView.setOnClickListener { onClick(model) }
+      badgeView.setBadge(model.badge)
+      dateView.text = DateUtils.formatDate(Locale.getDefault(), model.record.timestamp)
+      typeView.setText(
+        when (model.record.type) {
+          DonationReceiptRecord.Type.RECURRING_DONATION -> R.string.DonationReceiptListFragment__recurring
+          DonationReceiptRecord.Type.ONE_TIME_DONATION -> R.string.DonationReceiptListFragment__one_time
+          DonationReceiptRecord.Type.ONE_TIME_GIFT -> R.string.DonationReceiptListFragment__donation_for_a_friend
+          DonationReceiptRecord.Type.RECURRING_BACKUP -> error("Not supported in this fragment")
+        }
+      )
+      moneyView.text = FiatMoneyUtil.format(context.resources, model.record.amount)
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageAdapter.kt
new file mode 100644
index 0000000000..121cd06800
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageAdapter.kt
@@ -0,0 +1,19 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import androidx.fragment.app.Fragment
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+
+class DonationReceiptListPageAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) {
+  override fun getItemCount(): Int = 4
+
+  override fun createFragment(position: Int): Fragment {
+    return when (position) {
+      0 -> DonationReceiptListPageFragment.create(null)
+      1 -> DonationReceiptListPageFragment.create(DonationReceiptRecord.Type.RECURRING_DONATION)
+      2 -> DonationReceiptListPageFragment.create(DonationReceiptRecord.Type.ONE_TIME_DONATION)
+      3 -> DonationReceiptListPageFragment.create(DonationReceiptRecord.Type.ONE_TIME_GIFT)
+      else -> error("Unsupported position $position")
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageFragment.kt
new file mode 100644
index 0000000000..615b02ae27
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageFragment.kt
@@ -0,0 +1,94 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import android.os.Bundle
+import android.view.View
+import androidx.constraintlayout.widget.Group
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.RecyclerView
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.DSLSettingsText
+import org.thoughtcrime.securesms.components.settings.TextPreference
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+import org.thoughtcrime.securesms.util.StickyHeaderDecoration
+import org.thoughtcrime.securesms.util.livedata.LiveDataUtil
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
+import org.thoughtcrime.securesms.util.visible
+
+class DonationReceiptListPageFragment : Fragment(R.layout.donation_receipt_list_page_fragment) {
+
+  private val viewModel: DonationReceiptListPageViewModel by viewModels(factoryProducer = {
+    DonationReceiptListPageViewModel.Factory(type, DonationReceiptListPageRepository())
+  })
+
+  private val sharedViewModel: DonationReceiptListViewModel by viewModels(
+    ownerProducer = { requireParentFragment() },
+    factoryProducer = {
+      DonationReceiptListViewModel.Factory(DonationReceiptListRepository())
+    }
+  )
+
+  private val type: DonationReceiptRecord.Type?
+    get() = requireArguments().getString(ARG_TYPE)?.let { DonationReceiptRecord.Type.fromCode(it) }
+
+  private lateinit var emptyStateGroup: Group
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    val adapter = DonationReceiptListAdapter { model ->
+      findNavController().safeNavigate(DonationReceiptListFragmentDirections.actionDonationReceiptListFragmentToDonationReceiptDetailFragment(model.record.id))
+    }
+
+    view.findViewById<RecyclerView>(R.id.recycler).apply {
+      this.adapter = adapter
+      addItemDecoration(StickyHeaderDecoration(adapter, false, true, 0))
+    }
+
+    emptyStateGroup = view.findViewById(R.id.empty_state)
+
+    LiveDataUtil.combineLatest(
+      viewModel.state,
+      sharedViewModel.state
+    ) { state, badges ->
+      state.isLoaded to state.records.map { DonationReceiptListItem.Model(it, getBadgeForRecord(it, badges)) }
+    }.observe(viewLifecycleOwner) { (isLoaded, records) ->
+      if (records.isNotEmpty()) {
+        emptyStateGroup.visible = false
+        adapter.submitList(
+          records +
+            TextPreference(
+              title = null,
+              summary = DSLSettingsText.from(
+                R.string.DonationReceiptListFragment__if_you_have,
+                DSLSettingsText.TextAppearanceModifier(R.style.TextAppearance_Signal_Subtitle)
+              )
+            )
+        )
+      } else {
+        emptyStateGroup.visible = isLoaded
+      }
+    }
+  }
+
+  private fun getBadgeForRecord(record: DonationReceiptRecord, badges: List<DonationReceiptBadge>): Badge? {
+    return when (record.type) {
+      DonationReceiptRecord.Type.ONE_TIME_DONATION -> badges.firstOrNull { it.type == DonationReceiptRecord.Type.ONE_TIME_DONATION }?.badge
+      DonationReceiptRecord.Type.ONE_TIME_GIFT -> badges.firstOrNull { it.type == DonationReceiptRecord.Type.ONE_TIME_GIFT }?.badge
+      else -> badges.firstOrNull { it.level == record.subscriptionLevel }?.badge
+    }
+  }
+
+  companion object {
+
+    private const val ARG_TYPE = "arg_type"
+
+    fun create(type: DonationReceiptRecord.Type?): Fragment {
+      return DonationReceiptListPageFragment().apply {
+        arguments = Bundle().apply {
+          putString(ARG_TYPE, type?.code)
+        }
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageRepository.kt
new file mode 100644
index 0000000000..5a72ac62a7
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageRepository.kt
@@ -0,0 +1,14 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+
+class DonationReceiptListPageRepository {
+  fun getRecords(type: DonationReceiptRecord.Type?): Single<List<DonationReceiptRecord>> {
+    return Single.fromCallable {
+      SignalDatabase.donationReceipts.getReceipts(type)
+    }.subscribeOn(Schedulers.io())
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageState.kt
new file mode 100644
index 0000000000..93af10dbd1
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageState.kt
@@ -0,0 +1,8 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+
+data class DonationReceiptListPageState(
+  val records: List<DonationReceiptRecord> = emptyList(),
+  val isLoaded: Boolean = false
+)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageViewModel.kt
new file mode 100644
index 0000000000..ecabf9a86c
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListPageViewModel.kt
@@ -0,0 +1,39 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+import org.thoughtcrime.securesms.util.livedata.Store
+
+class DonationReceiptListPageViewModel(type: DonationReceiptRecord.Type?, repository: DonationReceiptListPageRepository) : ViewModel() {
+
+  private val disposables = CompositeDisposable()
+  private val store = Store(DonationReceiptListPageState())
+
+  val state: LiveData<DonationReceiptListPageState> = store.stateLiveData
+
+  init {
+    disposables += repository.getRecords(type)
+      .subscribe { records ->
+        store.update {
+          it.copy(
+            records = records,
+            isLoaded = true
+          )
+        }
+      }
+  }
+
+  override fun onCleared() {
+    disposables.clear()
+  }
+
+  class Factory(private val type: DonationReceiptRecord.Type?, private val repository: DonationReceiptListPageRepository) : ViewModelProvider.Factory {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+      return modelClass.cast(DonationReceiptListPageViewModel(type, repository)) as T
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListRepository.kt
new file mode 100644
index 0000000000..e23c96550d
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListRepository.kt
@@ -0,0 +1,35 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import io.reactivex.rxjava3.core.Single
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.components.settings.app.subscription.getBoostBadges
+import org.thoughtcrime.securesms.components.settings.app.subscription.getGiftBadges
+import org.thoughtcrime.securesms.components.settings.app.subscription.getSubscriptionLevels
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import java.util.Locale
+
+class DonationReceiptListRepository {
+  fun getBadges(): Single<List<DonationReceiptBadge>> {
+    return Single.fromCallable {
+      AppDependencies.donationsService
+        .getDonationsConfiguration(Locale.getDefault())
+    }.map { response ->
+      if (response.result.isPresent) {
+        val config = response.result.get()
+        val boostBadge = DonationReceiptBadge(DonationReceiptRecord.Type.ONE_TIME_DONATION, -1, config.getBoostBadges().first())
+        val giftBadge = DonationReceiptBadge(DonationReceiptRecord.Type.ONE_TIME_GIFT, -1, config.getGiftBadges().first())
+        val subBadges = config.getSubscriptionLevels().map {
+          DonationReceiptBadge(
+            level = it.key,
+            badge = Badges.fromServiceBadge(it.value.badge),
+            type = DonationReceiptRecord.Type.RECURRING_DONATION
+          )
+        }
+        subBadges + boostBadge + giftBadge
+      } else {
+        emptyList()
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListViewModel.kt
new file mode 100644
index 0000000000..72603a53cd
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListViewModel.kt
@@ -0,0 +1,56 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.Disposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import org.thoughtcrime.securesms.util.InternetConnectionObserver
+
+class DonationReceiptListViewModel(private val repository: DonationReceiptListRepository) : ViewModel() {
+
+  private val disposables = CompositeDisposable()
+  private val internalState = MutableLiveData<List<DonationReceiptBadge>>(emptyList())
+  private var networkDisposable: Disposable
+
+  val state: LiveData<List<DonationReceiptBadge>> = internalState
+
+  init {
+    networkDisposable = InternetConnectionObserver
+      .observe()
+      .distinctUntilChanged()
+      .subscribe { isConnected ->
+        if (isConnected) {
+          retry()
+        }
+      }
+
+    refresh()
+  }
+
+  private fun retry() {
+    if (internalState.value?.isEmpty() == true) {
+      refresh()
+    }
+  }
+
+  private fun refresh() {
+    disposables.clear()
+    disposables += repository.getBadges().subscribe { badges ->
+      internalState.postValue(badges)
+    }
+  }
+
+  override fun onCleared() {
+    disposables.clear()
+    networkDisposable.dispose()
+  }
+
+  class Factory(private val repository: DonationReceiptListRepository) : ViewModelProvider.Factory {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+      return modelClass.cast(DonationReceiptListViewModel(repository)) as T
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeLearnMoreBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeLearnMoreBottomSheetDialogFragment.kt
new file mode 100644
index 0000000000..e6f545cec3
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeLearnMoreBottomSheetDialogFragment.kt
@@ -0,0 +1,17 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.subscribe
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.FixedRoundedCornerBottomSheetDialogFragment
+
+class SubscribeLearnMoreBottomSheetDialogFragment : FixedRoundedCornerBottomSheetDialogFragment() {
+
+  override val peekHeightPercentage: Float = 1f
+
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    return inflater.inflate(R.layout.subscribe_learn_more_bottom_sheet_dialog_fragment, container, false)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/thanks/ThanksForYourSupportBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/thanks/ThanksForYourSupportBottomSheetDialogFragment.kt
new file mode 100644
index 0000000000..122c949e7d
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/thanks/ThanksForYourSupportBottomSheetDialogFragment.kt
@@ -0,0 +1,163 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.thanks
+
+import android.animation.Animator
+import android.content.DialogInterface
+import android.os.Bundle
+import android.text.SpannableStringBuilder
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.text.method.LinkMovementMethodCompat
+import com.airbnb.lottie.LottieAnimationView
+import com.airbnb.lottie.LottieDrawable
+import com.google.android.material.button.MaterialButton
+import com.google.android.material.materialswitch.MaterialSwitch
+import io.reactivex.rxjava3.kotlin.subscribeBy
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.animation.AnimationCompleteListener
+import org.thoughtcrime.securesms.badges.BadgeImageView
+import org.thoughtcrime.securesms.components.FixedRoundedCornerBottomSheetDialogFragment
+import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.util.SpanUtil
+import org.thoughtcrime.securesms.util.fragments.findListener
+import org.thoughtcrime.securesms.util.visible
+
+class ThanksForYourSupportBottomSheetDialogFragment : FixedRoundedCornerBottomSheetDialogFragment() {
+
+  override val peekHeightPercentage: Float = 1f
+
+  private lateinit var switch: MaterialSwitch
+  private lateinit var heading: TextView
+
+  private lateinit var controlState: ControlState
+
+  private enum class ControlState {
+    FEATURE,
+    DISPLAY
+  }
+
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    return inflater.inflate(R.layout.thanks_for_your_support_bottom_sheet_dialog_fragment, container, false)
+  }
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    val badgeView: BadgeImageView = view.findViewById(R.id.thanks_bottom_sheet_badge)
+    val lottie: LottieAnimationView = view.findViewById(R.id.thanks_bottom_sheet_lottie)
+    val done: MaterialButton = view.findViewById(R.id.thanks_bottom_sheet_done)
+    val controlText: TextView = view.findViewById(R.id.thanks_bottom_sheet_control_text)
+    val controlNote: View = view.findViewById(R.id.thanks_bottom_sheet_featured_note)
+    val subhead: TextView = view.findViewById(R.id.thanks_bottom_sheet_subhead)
+
+    heading = view.findViewById(R.id.thanks_bottom_sheet_heading)
+    switch = view.findViewById(R.id.thanks_bottom_sheet_switch)
+
+    val args = ThanksForYourSupportBottomSheetDialogFragmentArgs.fromBundle(requireArguments())
+
+    badgeView.setBadge(args.badge)
+
+    if (args.badge.isBoost()) {
+      if (Recipient.self().badges.any { !it.isBoost() }) {
+        subhead.setText(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_donor_badge)
+      } else {
+        subhead.movementMethod = LinkMovementMethodCompat.getInstance()
+        subhead.text = SpannableStringBuilder(getString(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_donor_badge))
+          .append(" ")
+          .append(getString(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__you_can_also))
+          .append(" ")
+          .append(
+            SpanUtil.clickable(
+              getString(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__become_a_montly_sustainer),
+              ContextCompat.getColor(requireContext(), R.color.signal_accent_primary)
+            ) {
+              requireActivity().finish()
+              requireActivity().startActivity(AppSettingsActivity.subscriptions(requireContext()))
+            }
+          )
+      }
+    } else {
+      subhead.text = getString(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_donor_badge)
+    }
+
+    val otherBadges = Recipient.self().badges.filterNot { it.id == args.badge.id }
+    val hasOtherBadges = otherBadges.isNotEmpty()
+    val displayingBadges = SignalStore.inAppPayments.getDisplayBadgesOnProfile()
+
+    if (hasOtherBadges && displayingBadges) {
+      switch.isChecked = false
+      controlText.setText(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__make_featured_badge)
+      controlNote.visible = true
+      controlState = ControlState.FEATURE
+    } else if (hasOtherBadges) {
+      switch.isChecked = false
+      controlText.setText(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__display_on_profile)
+      controlNote.visible = false
+      controlState = ControlState.DISPLAY
+    } else {
+      switch.isChecked = true
+      controlText.setText(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__display_on_profile)
+      controlNote.visible = false
+      controlState = ControlState.DISPLAY
+    }
+
+    if (args.badge.isBoost()) {
+      badgeView.visibility = View.INVISIBLE
+      lottie.visible = true
+      lottie.playAnimation()
+      lottie.addAnimatorListener(object : AnimationCompleteListener() {
+        override fun onAnimationEnd(animation: Animator) {
+          lottie.removeAnimatorListener(this)
+          lottie.setMinAndMaxFrame(30, 91)
+          lottie.repeatMode = LottieDrawable.RESTART
+          lottie.repeatCount = LottieDrawable.INFINITE
+          lottie.frame = 30
+          lottie.playAnimation()
+        }
+      })
+    } else {
+      lottie.visible = false
+    }
+
+    done.setOnClickListener { dismissAllowingStateLoss() }
+  }
+
+  override fun onDismiss(dialog: DialogInterface) {
+    super.onDismiss(dialog)
+    val controlChecked = switch.isChecked
+    val args = ThanksForYourSupportBottomSheetDialogFragmentArgs.fromBundle(requireArguments())
+
+    // MOLLY: TODO
+    // if (controlState == ControlState.DISPLAY) {
+    //   badgeRepository.setVisibilityForAllBadges(controlChecked).subscribeBy(
+    //     onError = {
+    //       Log.w(TAG, "Failure while updating badge visibility", it)
+    //     }
+    //   )
+    // } else if (controlChecked) {
+    //   badgeRepository.setFeaturedBadge(args.badge).subscribeBy(
+    //     onError = {
+    //       Log.w(TAG, "Failure while updating featured badge", it)
+    //     }
+    //   )
+    // }
+
+    if (args.badge.isSubscription()) {
+      requireActivity().finish()
+      requireActivity().startActivity(AppSettingsActivity.manageSubscriptions(requireContext()))
+    } else {
+      findListener<Callback>()?.onBoostThanksSheetDismissed()
+    }
+  }
+
+  companion object {
+    private val TAG = Log.tag(ThanksForYourSupportBottomSheetDialogFragment::class.java)
+  }
+
+  interface Callback {
+    fun onBoostThanksSheetDismissed()
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/updates/AppUpdatesSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/updates/AppUpdatesSettingsFragment.kt
new file mode 100644
index 0000000000..0a1711a9eb
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/updates/AppUpdatesSettingsFragment.kt
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.updates
+
+import androidx.fragment.app.viewModels
+import org.thoughtcrime.securesms.BuildConfig
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.DSLConfiguration
+import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
+import org.thoughtcrime.securesms.components.settings.DSLSettingsText
+import org.thoughtcrime.securesms.components.settings.app.help.HelpSettingsState
+import org.thoughtcrime.securesms.components.settings.app.help.HelpSettingsViewModel
+import org.thoughtcrime.securesms.components.settings.configure
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.util.DateUtils
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import java.util.Locale
+
+/**
+ * Settings around app updates. Only shown for builds that manage their own app updates.
+ */
+class AppUpdatesSettingsFragment : DSLSettingsFragment(R.string.preferences_app_updates__title) {
+
+  private val viewModel: HelpSettingsViewModel by viewModels()
+
+  override fun bindAdapter(adapter: MappingAdapter) {
+    viewModel.state.observe(viewLifecycleOwner) { state ->
+      adapter.submitList(getConfiguration(state).toMappingModelList())
+    }
+  }
+
+  private fun getConfiguration(state: HelpSettingsState): DSLConfiguration {
+    return configure {
+      textPref(
+        title = DSLSettingsText.from(R.string.HelpSettingsFragment__version),
+        summary = DSLSettingsText.from(BuildConfig.VERSION_NAME)
+      )
+
+      switchPref(
+        title = DSLSettingsText.from(R.string.preferences__autoupdate_molly),
+        summary = DSLSettingsText.from(R.string.preferences__periodically_check_for_new_releases_and_ask_to_install_them),
+        isChecked = state.updateApkEnabled,
+        onClick = {
+          viewModel.setUpdateApkEnabled(!state.updateApkEnabled)
+        }
+      )
+
+      switchPref(
+        title = DSLSettingsText.from(R.string.preferences__include_beta_updates),
+        summary = DSLSettingsText.from(R.string.preferences__beta_versions_are_intended_for_testing_purposes_and_may_contain_bugs),
+        isChecked = state.includeBetaEnabled,
+        isEnabled = state.updateApkEnabled,
+        onClick = {
+          viewModel.setIncludeBetaEnabled(!state.includeBetaEnabled)
+        }
+      )
+
+      clickPref(
+        title = DSLSettingsText.from(R.string.EnableAppUpdatesMegaphone_check_for_updates),
+        summary = DSLSettingsText.from(getString(R.string.AppUpdatesSettingsFragment__last_checked_s, lastSuccessfulUpdateString)),
+        isEnabled = state.updateApkEnabled,
+        onClick = {
+          viewModel.checkForUpdates()
+        }
+      )
+    }
+  }
+
+  private val lastSuccessfulUpdateString: String
+    get() {
+      val lastUpdateTime = SignalStore.apkUpdate.lastSuccessfulCheck
+
+      return if (lastUpdateTime > 0) {
+        DateUtils.getExtendedRelativeTimeSpanString(requireContext(), Locale.getDefault(), lastUpdateTime)
+      } else {
+        getString(R.string.preferences__never)
+      }
+    }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/colorpicker/UsernameLinkQrColorPickerViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/colorpicker/UsernameLinkQrColorPickerViewModel.kt
index 8a1273df90..433875ffd1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/colorpicker/UsernameLinkQrColorPickerViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/colorpicker/UsernameLinkQrColorPickerViewModel.kt
@@ -23,10 +23,10 @@ class UsernameLinkQrColorPickerViewModel : ViewModel() {
 
   private val _state = mutableStateOf(
     UsernameLinkQrColorPickerState(
-      username = SignalStore.account().username!!,
+      username = SignalStore.account.username!!,
       qrCodeData = QrCodeState.Loading,
       colorSchemes = UsernameQrCodeColorScheme.values().asList().toImmutableList(),
-      selectedColorScheme = SignalStore.misc().usernameQrCodeColorScheme
+      selectedColorScheme = SignalStore.misc.usernameQrCodeColorScheme
     )
   )
 
@@ -35,7 +35,7 @@ class UsernameLinkQrColorPickerViewModel : ViewModel() {
   private val disposable: CompositeDisposable = CompositeDisposable()
 
   init {
-    val usernameLink = SignalStore.account().usernameLink
+    val usernameLink = SignalStore.account.usernameLink
 
     if (usernameLink != null) {
       disposable += Single
@@ -59,7 +59,7 @@ class UsernameLinkQrColorPickerViewModel : ViewModel() {
   }
 
   fun onColorSelected(color: UsernameQrCodeColorScheme) {
-    SignalStore.misc().usernameQrCodeColorScheme = color
+    SignalStore.misc.usernameQrCodeColorScheme = color
     SignalExecutors.BOUNDED.run {
       SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
       StorageSyncHelper.scheduleSyncForDataChange()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrImageSelectionActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/QrImageSelectionActivity.kt
similarity index 87%
rename from app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrImageSelectionActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/QrImageSelectionActivity.kt
index 773d957e65..4ae8ed625b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrImageSelectionActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/QrImageSelectionActivity.kt
@@ -19,9 +19,9 @@ import org.thoughtcrime.securesms.mediasend.Media
 import org.thoughtcrime.securesms.mediasend.v2.gallery.MediaGalleryFragment
 
 /**
- * Select username qr code from gallery instead of using camera.
+ * Select qr code from gallery instead of using camera. Used in usernames and when linking devices
  */
-class UsernameQrImageSelectionActivity : AppCompatActivity(), MediaGalleryFragment.Callbacks {
+class QrImageSelectionActivity : AppCompatActivity(), MediaGalleryFragment.Callbacks {
 
   override fun attachBaseContext(newBase: Context) {
     delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_YES
@@ -50,7 +50,7 @@ class UsernameQrImageSelectionActivity : AppCompatActivity(), MediaGalleryFragme
 
   class Contract : ActivityResultContract<Unit, Uri?>() {
     override fun createIntent(context: Context, input: Unit): Intent {
-      return Intent(context, UsernameQrImageSelectionActivity::class.java)
+      return Intent(context, QrImageSelectionActivity::class.java)
     }
 
     override fun parseResult(resultCode: Int, intent: Intent?): Uri? {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkSettingsFragment.kt
index 47216c2353..faff325671 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkSettingsFragment.kt
@@ -2,6 +2,7 @@
 
 package org.thoughtcrime.securesms.components.settings.app.usernamelinks.main
 
+import android.Manifest
 import android.app.Activity
 import android.content.Intent
 import android.content.res.Configuration
@@ -56,11 +57,9 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
-import com.google.accompanist.permissions.MultiplePermissionsState
 import com.google.accompanist.permissions.PermissionState
 import com.google.accompanist.permissions.PermissionStatus
 import com.google.accompanist.permissions.isGranted
-import com.google.accompanist.permissions.rememberMultiplePermissionsState
 import com.google.accompanist.permissions.rememberPermissionState
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import kotlinx.coroutines.CoroutineScope
@@ -76,7 +75,7 @@ import org.thoughtcrime.securesms.components.settings.app.usernamelinks.QrCodeSt
 import org.thoughtcrime.securesms.components.settings.app.usernamelinks.UsernameQrCodeColorScheme
 import org.thoughtcrime.securesms.components.settings.app.usernamelinks.main.UsernameLinkSettingsState.ActiveTab
 import org.thoughtcrime.securesms.compose.ComposeFragment
-import org.thoughtcrime.securesms.permissions.PermissionCompat
+import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.util.CommunicationActions
 import java.io.ByteArrayOutputStream
@@ -93,7 +92,7 @@ class UsernameLinkSettingsFragment : ComposeFragment() {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
 
-    galleryLauncher = registerForActivityResult(UsernameQrImageSelectionActivity.Contract()) { uri ->
+    galleryLauncher = registerForActivityResult(QrImageSelectionActivity.Contract()) { uri ->
       if (uri != null) {
         viewModel.scanImage(requireContext(), uri)
       }
@@ -116,18 +115,10 @@ class UsernameLinkSettingsFragment : ComposeFragment() {
     val linkCopiedEvent: UUID? by viewModel.linkCopiedEvent
     val helpText = stringResource(id = R.string.UsernameLinkSettings_scan_this_qr_code)
 
-    val cameraPermissionState: PermissionState = rememberPermissionState(permission = android.Manifest.permission.CAMERA) {
+    val cameraPermissionState: PermissionState = rememberPermissionState(permission = Manifest.permission.CAMERA) {
       viewModel.onTabSelected(ActiveTab.Scan)
     }
 
-    val galleryPermissionState: MultiplePermissionsState = rememberMultiplePermissionsState(permissions = PermissionCompat.forImages().toList()) { grants ->
-      if (grants.values.all { it }) {
-        galleryLauncher.launch(Unit)
-      } else {
-        Toast.makeText(requireContext(), R.string.ChatWallpaperPreviewActivity__viewing_your_gallery_requires_the_storage_permission, Toast.LENGTH_SHORT).show()
-      }
-    }
-
     MainScreen(
       state = state,
       navController = navController,
@@ -140,19 +131,18 @@ class UsernameLinkSettingsFragment : ComposeFragment() {
       onShareBadge = { shareQrBadge(requireActivity(), viewModel.generateQrCodeImage(helpText)) },
       onQrCodeScanned = { data -> viewModel.onQrCodeScanned(data) },
       onQrResultHandled = { viewModel.onQrResultHandled() },
-      onOpenGalleryClicked = {
-        if (galleryPermissionState.allPermissionsGranted) {
-          galleryLauncher.launch(Unit)
-        } else {
-          galleryPermissionState.launchMultiplePermissionRequest()
-        }
-      },
+      onOpenCameraClicked = { askCameraPermissions() },
+      onOpenGalleryClicked = { galleryLauncher.launch(Unit) },
       onLinkReset = { viewModel.onUsernameLinkReset() },
       onBackNavigationPressed = { requireActivity().onBackPressed() },
       linkCopiedEvent = linkCopiedEvent
     )
   }
 
+  override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults)
+  }
+
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     disposables.bindTo(viewLifecycleOwner)
   }
@@ -161,6 +151,15 @@ class UsernameLinkSettingsFragment : ComposeFragment() {
     super.onResume()
     viewModel.onResume()
   }
+
+  private fun askCameraPermissions() {
+    Permissions.with(this)
+      .request(Manifest.permission.CAMERA)
+      .ifNecessary()
+      .withPermanentDenialDialog(getString(R.string.CameraXFragment_signal_needs_camera_access_scan_qr_code), null, R.string.CameraXFragment_allow_access_camera, R.string.CameraXFragment_to_scan_qr_codes, parentFragmentManager)
+      .onAnyDenied { Toast.makeText(requireContext(), R.string.CameraXFragment_signal_needs_camera_access_scan_qr_code, Toast.LENGTH_LONG).show() }
+      .execute()
+  }
 }
 
 @OptIn(ExperimentalPermissionsApi::class)
@@ -177,6 +176,7 @@ private fun MainScreen(
   onShareBadge: () -> Unit = {},
   onQrCodeScanned: (String) -> Unit = {},
   onQrResultHandled: () -> Unit = {},
+  onOpenCameraClicked: () -> Unit = {},
   onOpenGalleryClicked: () -> Unit = {},
   onLinkReset: () -> Unit = {},
   onBackNavigationPressed: () -> Unit = {},
@@ -205,7 +205,6 @@ private fun MainScreen(
         scrollBehavior = scrollBehavior,
         onCodeTabSelected = onCodeTabSelected,
         onScanTabSelected = onScanTabSelected,
-        cameraPermissionState = cameraPermissionState,
         onBackNavigationPressed = onBackNavigationPressed
       )
     },
@@ -244,7 +243,9 @@ private fun MainScreen(
         qrScanResult = state.qrScanResult,
         onQrCodeScanned = onQrCodeScanned,
         onQrResultHandled = onQrResultHandled,
+        onOpenCameraClicked = onOpenCameraClicked,
         onOpenGalleryClicked = onOpenGalleryClicked,
+        hasCameraPermission = cameraPermissionState.status.isGranted,
         modifier = Modifier.padding(contentPadding),
         onRecipientFound = { recipient ->
           val taskStack = TaskStackBuilder
@@ -274,7 +275,6 @@ private fun TopAppBarContent(
   scrollBehavior: TopAppBarScrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(),
   onCodeTabSelected: () -> Unit = {},
   onScanTabSelected: () -> Unit = {},
-  cameraPermissionState: PermissionState = previewPermissionState(),
   onBackNavigationPressed: () -> Unit = {}
 ) {
   CenterAlignedTopAppBar(
@@ -296,13 +296,7 @@ private fun TopAppBarContent(
         TabButton(
           label = stringResource(R.string.UsernameLinkSettings_scan_tab_name),
           active = activeTab == ActiveTab.Scan,
-          onClick = {
-            if (cameraPermissionState.status.isGranted) {
-              onScanTabSelected()
-            } else {
-              cameraPermissionState.launchPermissionRequest()
-            }
-          },
+          onClick = { onScanTabSelected() },
           modifier = Modifier.padding(end = 8.dp)
         )
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkSettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkSettingsState.kt
index 0e2189b99d..8895d52601 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkSettingsState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkSettingsState.kt
@@ -17,6 +17,7 @@ data class UsernameLinkSettingsState(
   val indeterminateProgress: Boolean = false
 ) {
   enum class ActiveTab {
-    Code, Scan
+    Code,
+    Scan
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkSettingsViewModel.kt
index 1630ee32a8..9eea657560 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkSettingsViewModel.kt
@@ -40,7 +40,7 @@ import org.thoughtcrime.securesms.components.settings.app.usernamelinks.QrCodeDa
 import org.thoughtcrime.securesms.components.settings.app.usernamelinks.QrCodeState
 import org.thoughtcrime.securesms.components.settings.app.usernamelinks.drawQr
 import org.thoughtcrime.securesms.components.settings.app.usernamelinks.main.UsernameLinkSettingsState.ActiveTab
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.profiles.manage.UsernameRepository
 import org.thoughtcrime.securesms.profiles.manage.UsernameRepository.toLink
@@ -56,16 +56,16 @@ class UsernameLinkSettingsViewModel : ViewModel() {
   private val _state = mutableStateOf(
     UsernameLinkSettingsState(
       activeTab = ActiveTab.Code,
-      username = SignalStore.account().username!!,
-      usernameLinkState = SignalStore.account().usernameLink?.let { UsernameLinkState.Present(it.toLink()) } ?: UsernameLinkState.NotSet,
+      username = SignalStore.account.username!!,
+      usernameLinkState = SignalStore.account.usernameLink?.let { UsernameLinkState.Present(it.toLink()) } ?: UsernameLinkState.NotSet,
       qrCodeState = QrCodeState.Loading,
-      qrCodeColorScheme = SignalStore.misc().usernameQrCodeColorScheme
+      qrCodeColorScheme = SignalStore.misc.usernameQrCodeColorScheme
     )
   )
   val state: State<UsernameLinkSettingsState> = _state
 
   private val disposable: CompositeDisposable = CompositeDisposable()
-  private val usernameLink: BehaviorSubject<Optional<UsernameLinkComponents>> = BehaviorSubject.createDefault(Optional.ofNullable(SignalStore.account().usernameLink))
+  private val usernameLink: BehaviorSubject<Optional<UsernameLinkComponents>> = BehaviorSubject.createDefault(Optional.ofNullable(SignalStore.account.usernameLink))
 
   private val _linkCopiedEvent: MutableState<UUID?> = mutableStateOf(null)
   val linkCopiedEvent: State<UUID?> get() = _linkCopiedEvent
@@ -82,7 +82,7 @@ class UsernameLinkSettingsViewModel : ViewModel() {
         )
       }
 
-    if (SignalStore.account().usernameLink == null) {
+    if (SignalStore.account.usernameLink == null) {
       onUsernameLinkReset()
     }
   }
@@ -93,7 +93,7 @@ class UsernameLinkSettingsViewModel : ViewModel() {
 
   fun onResume() {
     _state.value = _state.value.copy(
-      qrCodeColorScheme = SignalStore.misc().usernameQrCodeColorScheme
+      qrCodeColorScheme = SignalStore.misc.usernameQrCodeColorScheme
     )
   }
 
@@ -104,7 +104,7 @@ class UsernameLinkSettingsViewModel : ViewModel() {
   }
 
   fun onUsernameLinkReset() {
-    if (!NetworkUtil.isConnected(ApplicationDependencies.getApplication())) {
+    if (!NetworkUtil.isConnected(AppDependencies.application)) {
       _state.value = _state.value.copy(
         usernameLinkResetResult = UsernameLinkResetResult.NetworkUnavailable
       )
@@ -298,7 +298,7 @@ class UsernameLinkSettingsViewModel : ViewModel() {
     }
 
     // Draw the signal logo -- unfortunately can't have the normal QR code drawing handle it because it requires a composable ImageBitmap
-    BitmapFactory.decodeResource(ApplicationDependencies.getApplication().resources, R.drawable.qrcode_logo).also { logoBitmap ->
+    BitmapFactory.decodeResource(AppDependencies.application.resources, R.drawable.qrcode_logo).also { logoBitmap ->
       val tintedPaint = Paint().apply {
         colorFilter = PorterDuffColorFilter(state.qrCodeColorScheme.foregroundColor.toArgb(), PorterDuff.Mode.SRC_IN)
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareBottomSheet.kt
index 4df81db77d..438d6027b2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareBottomSheet.kt
@@ -55,7 +55,7 @@ class UsernameLinkShareBottomSheet : ComposeBottomSheetDialogFragment() {
   @Composable
   override fun SheetContent() {
     Content(
-      usernameLink = SignalStore.account().usernameLink?.toLink() ?: "",
+      usernameLink = SignalStore.account.usernameLink?.toLink() ?: "",
       dismissDialog = { didCopy ->
         setFragmentResult(REQUEST_KEY, bundleOf(KEY_COPY to didCopy))
         dismiss()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScanScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScanScreen.kt
index 16d2e4b1ce..3cf46e951a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScanScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScanScreen.kt
@@ -13,21 +13,12 @@ import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawWithContent
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.graphics.Path
-import androidx.compose.ui.graphics.PathEffect
-import androidx.compose.ui.graphics.drawscope.DrawScope
-import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.viewinterop.AndroidView
 import androidx.lifecycle.LifecycleOwner
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
@@ -36,6 +27,7 @@ import org.signal.core.ui.theme.SignalTheme
 import org.signal.qr.QrScannerView
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.mediasend.camerax.CameraXModelBlocklist
+import org.thoughtcrime.securesms.qr.QrScanScreens
 import org.thoughtcrime.securesms.recipients.Recipient
 import java.util.concurrent.TimeUnit
 
@@ -49,12 +41,12 @@ fun UsernameQrScanScreen(
   qrScanResult: QrScanResult?,
   onQrCodeScanned: (String) -> Unit,
   onQrResultHandled: () -> Unit,
+  onOpenCameraClicked: () -> Unit,
   onOpenGalleryClicked: () -> Unit,
   onRecipientFound: (Recipient) -> Unit,
+  hasCameraPermission: Boolean,
   modifier: Modifier = Modifier
 ) {
-  val path = remember { Path() }
-
   when (qrScanResult) {
     QrScanResult.InvalidData -> {
       QrScanResultDialog(message = stringResource(R.string.UsernameLinkSettings_qr_result_invalid), onDismiss = onQrResultHandled)
@@ -97,7 +89,7 @@ fun UsernameQrScanScreen(
         .fillMaxWidth()
         .weight(1f, true)
     ) {
-      AndroidView(
+      QrScanScreens.QrScanScreen(
         factory = { context ->
           val view = QrScannerView(context)
           disposables += view.qrData.throttleFirst(3000, TimeUnit.MILLISECONDS).subscribe { data ->
@@ -108,21 +100,14 @@ fun UsernameQrScanScreen(
         update = { view ->
           view.start(lifecycleOwner = lifecycleOwner, forceLegacy = CameraXModelBlocklist.isBlocklisted())
         },
-        modifier = Modifier
-          .fillMaxWidth()
-          .fillMaxHeight()
-          .drawWithContent {
-            drawContent()
-            drawQrCrosshair(path)
-          }
+        hasPermission = hasCameraPermission,
+        onRequestPermissions = onOpenCameraClicked,
+        qrHeaderLabelString = ""
       )
-
       FloatingActionButton(
         shape = CircleShape,
         containerColor = SignalTheme.colors.colorSurface1,
-        modifier = Modifier
-          .align(Alignment.BottomCenter)
-          .padding(bottom = 24.dp),
+        modifier = Modifier.align(Alignment.BottomCenter).padding(bottom = 24.dp),
         onClick = onOpenGalleryClicked
       ) {
         Image(
@@ -158,40 +143,3 @@ private fun QrScanResultDialog(title: String? = null, message: String, onDismiss
     onDismiss = onDismiss
   )
 }
-
-private fun DrawScope.drawQrCrosshair(path: Path) {
-  val crosshairWidth: Float = size.minDimension * 0.6f
-  val crosshairLineLength = crosshairWidth * 0.125f
-
-  val topLeft = center - Offset(crosshairWidth / 2, crosshairWidth / 2)
-  val topRight = center + Offset(crosshairWidth / 2, -crosshairWidth / 2)
-  val bottomRight = center + Offset(crosshairWidth / 2, crosshairWidth / 2)
-  val bottomLeft = center + Offset(-crosshairWidth / 2, crosshairWidth / 2)
-
-  path.reset()
-
-  drawPath(
-    path = path.apply {
-      moveTo(topLeft.x, topLeft.y + crosshairLineLength)
-      lineTo(topLeft.x, topLeft.y)
-      lineTo(topLeft.x + crosshairLineLength, topLeft.y)
-
-      moveTo(topRight.x - crosshairLineLength, topRight.y)
-      lineTo(topRight.x, topRight.y)
-      lineTo(topRight.x, topRight.y + crosshairLineLength)
-
-      moveTo(bottomRight.x, bottomRight.y - crosshairLineLength)
-      lineTo(bottomRight.x, bottomRight.y)
-      lineTo(bottomRight.x - crosshairLineLength, bottomRight.y)
-
-      moveTo(bottomLeft.x + crosshairLineLength, bottomLeft.y)
-      lineTo(bottomLeft.x, bottomLeft.y)
-      lineTo(bottomLeft.x, bottomLeft.y - crosshairLineLength)
-    },
-    color = Color.White,
-    style = Stroke(
-      width = 3.dp.toPx(),
-      pathEffect = PathEffect.cornerPathEffect(10.dp.toPx())
-    )
-  )
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScannerActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScannerActivity.kt
index ebcc11a95e..5746bd0c20 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScannerActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameQrScannerActivity.kt
@@ -7,6 +7,8 @@
 
 package org.thoughtcrime.securesms.components.settings.app.usernamelinks.main
 
+import android.Manifest
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
@@ -30,14 +32,19 @@ import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.LifecycleOwner
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.MultiplePermissionsState
+import com.google.accompanist.permissions.PermissionState
+import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
+import com.google.accompanist.permissions.rememberPermissionState
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import org.signal.core.ui.Dialogs
 import org.signal.core.ui.theme.SignalTheme
 import org.signal.core.util.concurrent.LifecycleDisposable
 import org.signal.core.util.getParcelableExtraCompat
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.app.usernamelinks.main.UsernameQrScannerActivity.Contract
 import org.thoughtcrime.securesms.permissions.PermissionCompat
+import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.DynamicTheme
@@ -55,11 +62,16 @@ class UsernameQrScannerActivity : AppCompatActivity() {
   private val viewModel: UsernameQrScannerViewModel by viewModels()
   private val disposables = LifecycleDisposable()
 
+  @SuppressLint("MissingSuperCall")
+  override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults)
+  }
+
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     disposables.bindTo(this)
 
-    val galleryLauncher = registerForActivityResult(UsernameQrImageSelectionActivity.Contract()) { uri ->
+    val galleryLauncher = registerForActivityResult(QrImageSelectionActivity.Contract()) { uri ->
       if (uri != null) {
         viewModel.onQrImageSelected(this, uri)
       }
@@ -74,6 +86,7 @@ class UsernameQrScannerActivity : AppCompatActivity() {
         }
       }
 
+      val cameraPermissionState: PermissionState = rememberPermissionState(permission = Manifest.permission.CAMERA)
       val state by viewModel.state
 
       SignalTheme(isDarkMode = DynamicTheme.isDarkTheme(LocalContext.current)) {
@@ -82,10 +95,12 @@ class UsernameQrScannerActivity : AppCompatActivity() {
           diposables = disposables.disposables,
           state = state,
           galleryPermissionsState = galleryPermissionState,
+          cameraPermissionState = cameraPermissionState,
           onQrScanned = { url -> viewModel.onQrScanned(url) },
           onQrResultHandled = {
             finish()
           },
+          onOpenCameraClicked = { askCameraPermissions() },
           onOpenGalleryClicked = {
             if (galleryPermissionState.allPermissionsGranted) {
               galleryLauncher.launch(Unit)
@@ -108,6 +123,15 @@ class UsernameQrScannerActivity : AppCompatActivity() {
     }
   }
 
+  private fun askCameraPermissions() {
+    Permissions.with(this)
+      .request(Manifest.permission.CAMERA)
+      .ifNecessary()
+      .withPermanentDenialDialog(getString(R.string.CameraXFragment_signal_needs_camera_access_scan_qr_code), null, R.string.CameraXFragment_allow_access_camera, R.string.CameraXFragment_to_scan_qr_codes, supportFragmentManager)
+      .onAnyDenied { Toast.makeText(this, R.string.CameraXFragment_signal_needs_camera_access_scan_qr_code, Toast.LENGTH_LONG).show() }
+      .execute()
+  }
+
   class Contract : ActivityResultContract<Unit, RecipientId?>() {
     override fun createIntent(context: Context, input: Unit): Intent {
       return Intent(context, UsernameQrScannerActivity::class.java)
@@ -126,8 +150,10 @@ fun Content(
   diposables: CompositeDisposable,
   state: UsernameQrScannerViewModel.ScannerState,
   galleryPermissionsState: MultiplePermissionsState,
+  cameraPermissionState: PermissionState,
   onQrScanned: (String) -> Unit,
   onQrResultHandled: () -> Unit,
+  onOpenCameraClicked: () -> Unit,
   onOpenGalleryClicked: () -> Unit,
   onRecipientFound: (Recipient) -> Unit,
   onBackNavigationPressed: () -> Unit
@@ -155,8 +181,10 @@ fun Content(
       qrScanResult = state.qrScanResult,
       onQrCodeScanned = onQrScanned,
       onQrResultHandled = onQrResultHandled,
+      onOpenCameraClicked = onOpenCameraClicked,
       onOpenGalleryClicked = onOpenGalleryClicked,
       onRecipientFound = onRecipientFound,
+      hasCameraPermission = cameraPermissionState.status.isGranted,
       modifier = Modifier.padding(contentPadding)
     )
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
index 6e730cd01c..5d34621210 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
@@ -812,7 +812,13 @@ class ConversationSettingsFragment : DSLSettingsFragment(
           else -> R.string.ConversationSettingsFragment__block
         }
 
-        val titleTint = if (isBlocked) null else if (state.isDeprecatedOrUnregistered) alertDisabledTint else alertTint
+        val titleTint = if (isBlocked) {
+          null
+        } else if (state.isDeprecatedOrUnregistered) {
+          alertDisabledTint
+        } else {
+          alertTint
+        }
 
         clickPref(
           title = if (titleTint != null) DSLSettingsText.from(title, titleTint) else DSLSettingsText.from(title),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsRepository.kt
index ae48fef267..e7ce084c48 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsRepository.kt
@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.database.model.GroupRecord
 import org.thoughtcrime.securesms.database.model.IdentityRecord
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.StoryViewState
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.groups.GroupProtoUtil
 import org.thoughtcrime.securesms.groups.LiveGroup
@@ -28,7 +28,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.recipients.RecipientUtil
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import java.io.IOException
 
 private val TAG = Log.tag(ConversationSettingsRepository::class.java)
@@ -84,7 +84,7 @@ class ConversationSettingsRepository(
     }
   }
 
-  fun isInternalRecipientDetailsEnabled(): Boolean = SignalStore.internalValues().recipientDetails()
+  fun isInternalRecipientDetailsEnabled(): Boolean = SignalStore.internal.recipientDetails()
 
   fun hasGroups(consumer: (Boolean) -> Unit) {
     SignalExecutors.BOUNDED.execute { consumer(SignalDatabase.groups.getActiveGroupCount() > 0) }
@@ -92,8 +92,8 @@ class ConversationSettingsRepository(
 
   fun getIdentity(recipientId: RecipientId, consumer: (IdentityRecord?) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      if (SignalStore.account().aci != null && SignalStore.account().pni != null) {
-        consumer(ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecord(recipientId).orElse(null))
+      if (SignalStore.account.aci != null && SignalStore.account.pni != null) {
+        consumer(AppDependencies.protocolStore.aci().identities().getIdentityRecord(recipientId).orElse(null))
       } else {
         consumer(null)
       }
@@ -159,9 +159,9 @@ class ConversationSettingsRepository(
           members.addAll(groupRecord.members)
           members.addAll(pendingMembers)
 
-          GroupCapacityResult(Recipient.self().id, members, FeatureFlags.groupLimits(), groupRecord.isAnnouncementGroup)
+          GroupCapacityResult(Recipient.self().id, members, RemoteConfig.groupLimits, groupRecord.isAnnouncementGroup)
         } else {
-          GroupCapacityResult(Recipient.self().id, groupRecord.members, FeatureFlags.groupLimits(), false)
+          GroupCapacityResult(Recipient.self().id, groupRecord.members, RemoteConfig.groupLimits, false)
         }
       )
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt
index 4277d3a48f..0b8a1baf03 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt
@@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.components.settings.conversation.preferences.L
 import org.thoughtcrime.securesms.database.MediaTable
 import org.thoughtcrime.securesms.database.RecipientTable
 import org.thoughtcrime.securesms.database.model.StoryViewState
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.groups.LiveGroup
 import org.thoughtcrime.securesms.groups.ui.GroupChangeFailureReason
@@ -50,7 +50,7 @@ sealed class ConversationSettingsViewModel(
   protected val store = Store(
     ConversationSettingsState(
       specificSettingsState = specificSettingsState,
-      isDeprecatedOrUnregistered = SignalStore.misc().isClientDeprecated || TextSecurePreferences.isUnauthorizedReceived(ApplicationDependencies.getApplication())
+      isDeprecatedOrUnregistered = SignalStore.misc.isClientDeprecated || TextSecurePreferences.isUnauthorizedReceived(AppDependencies.application)
     )
   )
   protected val internalEvents: Subject<ConversationSettingsEvent> = PublishSubject.create()
@@ -296,7 +296,7 @@ sealed class ConversationSettingsViewModel(
             isMuted = recipient.isMuted,
             isMuteAvailable = true,
             isSearchAvailable = callMessageIds.isEmpty(),
-            isAddToStoryAvailable = recipient.isPushV2Group && !recipient.isBlocked && isActive && !SignalStore.storyValues().isFeatureDisabled
+            isAddToStoryAvailable = recipient.isPushV2Group && !recipient.isBlocked && isActive && !SignalStore.story.isFeatureDisabled
           ),
           canModifyBlockedState = RecipientUtil.isBlockable(recipient),
           specificSettingsState = state.requireGroupSettingsState().copy(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt
index 02f8b4d4fe..6a4ffada0f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/InternalConversationSettingsFragment.kt
@@ -18,17 +18,18 @@ import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
 import org.thoughtcrime.securesms.database.model.RecipientRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.OutgoingMessage
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientForeverObserver
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.subscription.Subscriber
 import org.thoughtcrime.securesms.util.SpanUtil
 import org.thoughtcrime.securesms.util.Util
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
@@ -128,7 +129,7 @@ class InternalConversationSettingsFragment : DSLSettingsFragment(
 
         textPref(
           title = DSLSettingsText.from("Sealed Sender Mode"),
-          summary = DSLSettingsText.from(recipient.unidentifiedAccessMode.toString())
+          summary = DSLSettingsText.from(recipient.sealedSenderAccessMode.toString())
         )
 
         textPref(
@@ -189,10 +190,10 @@ class InternalConversationSettingsFragment : DSLSettingsFragment(
               .setNegativeButton(android.R.string.cancel) { d, _ -> d.dismiss() }
               .setPositiveButton(android.R.string.ok) { _, _ ->
                 if (recipient.hasAci) {
-                  SignalDatabase.sessions.deleteAllFor(serviceId = SignalStore.account().requireAci(), addressName = recipient.requireAci().toString())
+                  SignalDatabase.sessions.deleteAllFor(serviceId = SignalStore.account.requireAci(), addressName = recipient.requireAci().toString())
                 }
                 if (recipient.hasPni) {
-                  SignalDatabase.sessions.deleteAllFor(serviceId = SignalStore.account().requireAci(), addressName = recipient.requirePni().toString())
+                  SignalDatabase.sessions.deleteAllFor(serviceId = SignalStore.account.requireAci(), addressName = recipient.requirePni().toString())
                 }
               }
               .show()
@@ -216,15 +217,15 @@ class InternalConversationSettingsFragment : DSLSettingsFragment(
               }
 
               if (recipient.hasAci) {
-                SignalDatabase.sessions.deleteAllFor(serviceId = SignalStore.account().requireAci(), addressName = recipient.requireAci().toString())
-                SignalDatabase.sessions.deleteAllFor(serviceId = SignalStore.account().requirePni(), addressName = recipient.requireAci().toString())
-                ApplicationDependencies.getProtocolStore().aci().identities().delete(recipient.requireAci().toString())
+                SignalDatabase.sessions.deleteAllFor(serviceId = SignalStore.account.requireAci(), addressName = recipient.requireAci().toString())
+                SignalDatabase.sessions.deleteAllFor(serviceId = SignalStore.account.requirePni(), addressName = recipient.requireAci().toString())
+                AppDependencies.protocolStore.aci().identities().delete(recipient.requireAci().toString())
               }
 
               if (recipient.hasPni) {
-                SignalDatabase.sessions.deleteAllFor(serviceId = SignalStore.account().requireAci(), addressName = recipient.requirePni().toString())
-                SignalDatabase.sessions.deleteAllFor(serviceId = SignalStore.account().requirePni(), addressName = recipient.requirePni().toString())
-                ApplicationDependencies.getProtocolStore().aci().identities().delete(recipient.requirePni().toString())
+                SignalDatabase.sessions.deleteAllFor(serviceId = SignalStore.account.requireAci(), addressName = recipient.requirePni().toString())
+                SignalDatabase.sessions.deleteAllFor(serviceId = SignalStore.account.requirePni(), addressName = recipient.requirePni().toString())
+                AppDependencies.protocolStore.aci().identities().delete(recipient.requirePni().toString())
               }
 
               startActivity(MainActivity.clearTop(requireContext()))
@@ -236,9 +237,10 @@ class InternalConversationSettingsFragment : DSLSettingsFragment(
       if (recipient.isSelf) {
         sectionHeaderPref(DSLSettingsText.from("Donations"))
 
-        val subscriber: Subscriber? = SignalStore.signalDonationsValues().getSubscriber()
+        // TODO [alex] - DB on main thread!
+        val subscriber: InAppPaymentSubscriberRecord? = InAppPaymentsRepository.getSubscriber(InAppPaymentSubscriberRecord.Type.DONATION)
         val summary = if (subscriber != null) {
-          """currency code: ${subscriber.currencyCode}
+          """currency code: ${subscriber.currency.currencyCode}
             |subscriber id: ${subscriber.subscriberId.serialize()}
           """.trimMargin()
         } else {
@@ -339,7 +341,8 @@ class InternalConversationSettingsFragment : DSLSettingsFragment(
 
     return if (capabilities != null) {
       TextUtils.concat(
-        colorize("PaymentActivation", capabilities.paymentActivation)
+        ", ",
+        colorize("DeleteSync", capabilities.deleteSync)
       )
     } else {
       "Recipient not found!"
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/AvatarPreference.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/AvatarPreference.kt
index 3a8446a21d..3ff63e0512 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/AvatarPreference.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/AvatarPreference.kt
@@ -7,11 +7,8 @@ import org.thoughtcrime.securesms.avatar.view.AvatarView
 import org.thoughtcrime.securesms.badges.BadgeImageView
 import org.thoughtcrime.securesms.badges.models.Badge
 import org.thoughtcrime.securesms.components.settings.PreferenceModel
-import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto
-import org.thoughtcrime.securesms.contacts.avatars.FallbackPhoto
 import org.thoughtcrime.securesms.database.model.StoryViewState
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
@@ -43,9 +40,7 @@ object AvatarPreference {
   }
 
   private class ViewHolder(itemView: View) : MappingViewHolder<Model>(itemView) {
-    private val avatar: AvatarView = itemView.findViewById<AvatarView>(R.id.bio_preference_avatar).apply {
-      setFallbackPhotoProvider(AvatarPreferenceFallbackPhotoProvider())
-    }
+    private val avatar: AvatarView = itemView.findViewById<AvatarView>(R.id.bio_preference_avatar)
 
     private val badge: BadgeImageView = itemView.findViewById(R.id.bio_preference_badge)
 
@@ -73,9 +68,4 @@ object AvatarPreference {
       avatar.setOnClickListener { model.onAvatarClick(avatar) }
     }
   }
-
-  private class AvatarPreferenceFallbackPhotoProvider : Recipient.FallbackPhotoProvider() {
-    override val photoForGroup: FallbackContactPhoto
-      get() = FallbackPhoto(R.drawable.ic_group_outline_40, ViewUtil.dpToPx(8))
-  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsRepository.kt
index d838b78e30..93b5945fda 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsRepository.kt
@@ -63,7 +63,7 @@ class CustomNotificationsSettingsRepository(context: Context) {
   fun setMessageSound(recipientId: RecipientId, sound: Uri?) {
     executor.execute {
       val recipient: Recipient = Recipient.resolved(recipientId)
-      val defaultValue = SignalStore.settings().messageNotificationSound
+      val defaultValue = SignalStore.settings.messageNotificationSound
       val newValue: Uri? = if (defaultValue == sound) null else sound ?: Uri.EMPTY
 
       SignalDatabase.recipients.setMessageRingtone(recipient.id, newValue)
@@ -73,7 +73,7 @@ class CustomNotificationsSettingsRepository(context: Context) {
 
   fun setCallSound(recipientId: RecipientId, sound: Uri?) {
     executor.execute {
-      val defaultValue = SignalStore.settings().callRingtone
+      val defaultValue = SignalStore.settings.callRingtone
       val newValue: Uri? = if (defaultValue == sound) null else sound ?: Uri.EMPTY
 
       SignalDatabase.recipients.setCallRingtone(recipientId, newValue)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsViewModel.kt
index fa7e12416f..c3952e7da6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsViewModel.kt
@@ -30,7 +30,7 @@ class CustomNotificationsSettingsViewModel(
         messageSound = recipient.messageRingtone,
         messageVibrateState = recipient.messageVibrate,
         messageVibrateEnabled = when (recipient.messageVibrate) {
-          RecipientTable.VibrateState.DEFAULT -> SignalStore.settings().isMessageVibrateEnabled
+          RecipientTable.VibrateState.DEFAULT -> SignalStore.settings.isMessageVibrateEnabled
           RecipientTable.VibrateState.ENABLED -> true
           RecipientTable.VibrateState.DISABLED -> false
         },
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/dsl.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/dsl.kt
index 558eba0e35..5a77b39e5a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/dsl.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/dsl.kt
@@ -1,4 +1,4 @@
-@file:Suppress("ktlint:filename")
+@file:Suppress("ktlint:standard:filename")
 
 package org.thoughtcrime.securesms.components.settings
 
@@ -161,18 +161,20 @@ class DSLConfiguration {
     text: DSLSettingsText,
     icon: DSLSettingsIcon? = null,
     isEnabled: Boolean = true,
+    disableOnClick: Boolean = false,
     onClick: () -> Unit
   ) {
-    val preference = Button.Model.Primary(text, icon, isEnabled, onClick)
+    val preference = Button.Model.Primary(text, icon, isEnabled, disableOnClick, onClick)
     children.add(preference)
   }
 
   fun primaryWrappedButton(
     text: DSLSettingsText,
     isEnabled: Boolean = true,
+    disableOnClick: Boolean = false,
     onClick: () -> Unit
   ) {
-    val preference = Button.Model.PrimaryWrapped(text, null, isEnabled, onClick)
+    val preference = Button.Model.PrimaryWrapped(text, null, isEnabled, disableOnClick, onClick)
     children.add(preference)
   }
 
@@ -180,9 +182,10 @@ class DSLConfiguration {
     text: DSLSettingsText,
     icon: DSLSettingsIcon? = null,
     isEnabled: Boolean = true,
+    disableOnClick: Boolean = false,
     onClick: () -> Unit
   ) {
-    val preference = Button.Model.Tonal(text, icon, isEnabled, onClick)
+    val preference = Button.Model.Tonal(text, icon, isEnabled, disableOnClick, onClick)
     children.add(preference)
   }
 
@@ -190,9 +193,10 @@ class DSLConfiguration {
     text: DSLSettingsText,
     icon: DSLSettingsIcon? = null,
     isEnabled: Boolean = true,
+    disableOnClick: Boolean = false,
     onClick: () -> Unit
   ) {
-    val preference = Button.Model.TonalWrapped(text, icon, isEnabled, onClick)
+    val preference = Button.Model.TonalWrapped(text, icon, isEnabled, disableOnClick, onClick)
     children.add(preference)
   }
 
@@ -200,9 +204,10 @@ class DSLConfiguration {
     text: DSLSettingsText,
     icon: DSLSettingsIcon? = null,
     isEnabled: Boolean = true,
+    disableOnClick: Boolean = false,
     onClick: () -> Unit
   ) {
-    val preference = Button.Model.SecondaryNoOutline(text, icon, isEnabled, onClick)
+    val preference = Button.Model.SecondaryNoOutline(text, icon, isEnabled, disableOnClick, onClick)
     children.add(preference)
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/models/Button.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/models/Button.kt
index da5b54fc7c..8c6070f7f0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/models/Button.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/models/Button.kt
@@ -24,6 +24,7 @@ object Button {
     title: DSLSettingsText?,
     icon: DSLSettingsIcon?,
     isEnabled: Boolean,
+    val disableOnClick: Boolean,
     val onClick: () -> Unit
   ) : PreferenceModel<T>(
     title = title,
@@ -37,8 +38,9 @@ object Button {
       title: DSLSettingsText?,
       icon: DSLSettingsIcon?,
       isEnabled: Boolean,
+      disableOnClick: Boolean,
       onClick: () -> Unit
-    ) : Model<Primary>(title, icon, isEnabled, onClick)
+    ) : Model<Primary>(title, icon, isEnabled, disableOnClick, onClick)
 
     /**
      * Large primary button with width set to wrap_content
@@ -47,29 +49,33 @@ object Button {
       title: DSLSettingsText?,
       icon: DSLSettingsIcon?,
       isEnabled: Boolean,
+      disableOnClick: Boolean,
       onClick: () -> Unit
-    ) : Model<PrimaryWrapped>(title, icon, isEnabled, onClick)
+    ) : Model<PrimaryWrapped>(title, icon, isEnabled, disableOnClick, onClick)
 
     class Tonal(
       title: DSLSettingsText?,
       icon: DSLSettingsIcon?,
       isEnabled: Boolean,
+      disableOnClick: Boolean,
       onClick: () -> Unit
-    ) : Model<Tonal>(title, icon, isEnabled, onClick)
+    ) : Model<Tonal>(title, icon, isEnabled, disableOnClick, onClick)
 
     class TonalWrapped(
       title: DSLSettingsText?,
       icon: DSLSettingsIcon?,
       isEnabled: Boolean,
+      disableOnClick: Boolean,
       onClick: () -> Unit
-    ) : Model<TonalWrapped>(title, icon, isEnabled, onClick)
+    ) : Model<TonalWrapped>(title, icon, isEnabled, disableOnClick, onClick)
 
     class SecondaryNoOutline(
       title: DSLSettingsText?,
       icon: DSLSettingsIcon?,
       isEnabled: Boolean,
+      disableOnClick: Boolean,
       onClick: () -> Unit
-    ) : Model<SecondaryNoOutline>(title, icon, isEnabled, onClick)
+    ) : Model<SecondaryNoOutline>(title, icon, isEnabled, disableOnClick, onClick)
   }
 
   class ViewHolder<T : Model<T>>(itemView: View) : MappingViewHolder<T>(itemView) {
@@ -79,6 +85,7 @@ object Button {
     override fun bind(model: T) {
       button.text = model.title?.resolve(context)
       button.setOnClickListener {
+        button.isEnabled = model.isEnabled && !model.disableOnClick
         model.onClick()
       }
       button.icon = model.icon?.resolve(context)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/spoiler/SpoilerPaint.kt b/app/src/main/java/org/thoughtcrime/securesms/components/spoiler/SpoilerPaint.kt
index a6f9782a4b..2644868b07 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/spoiler/SpoilerPaint.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/spoiler/SpoilerPaint.kt
@@ -11,7 +11,7 @@ import androidx.annotation.MainThread
 import org.signal.core.util.DimensionUnit
 import org.signal.core.util.dp
 import org.thoughtcrime.securesms.components.spoiler.SpoilerPaint.update
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.util.Util
 import kotlin.random.Random
 
@@ -28,9 +28,9 @@ object SpoilerPaint {
    */
   var shader: BitmapShader? = null
 
-  private val WIDTH = if (Util.isLowMemory(ApplicationDependencies.getApplication())) 50.dp else 100.dp
-  private val HEIGHT = if (Util.isLowMemory(ApplicationDependencies.getApplication())) 20.dp else 40.dp
-  private val PARTICLES_PER_PIXEL = if (Util.isLowMemory(ApplicationDependencies.getApplication())) 0.001f else 0.002f
+  private val WIDTH = if (Util.isLowMemory(AppDependencies.application)) 50.dp else 100.dp
+  private val HEIGHT = if (Util.isLowMemory(AppDependencies.application)) 20.dp else 40.dp
+  private val PARTICLES_PER_PIXEL = if (Util.isLowMemory(AppDependencies.application)) 0.001f else 0.002f
 
   private var shaderBitmap: Bitmap = Bitmap.createBitmap(WIDTH, HEIGHT, Bitmap.Config.ALPHA_8)
   private var bufferBitmap: Bitmap = Bitmap.createBitmap(WIDTH, HEIGHT, Bitmap.Config.ALPHA_8)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/transfercontrols/TransferControlView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/transfercontrols/TransferControlView.kt
index b6cd842532..6a4d1c8816 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/transfercontrols/TransferControlView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/transfercontrols/TransferControlView.kt
@@ -41,6 +41,8 @@ class TransferControlView @JvmOverloads constructor(context: Context, attrs: Att
   private var state = TransferControlViewState()
   private val progressUpdateDebouncer: ThrottledDebouncer = ThrottledDebouncer(100)
 
+  private var mode: Mode = Mode.GONE
+
   init {
     tag = uuid
     binding = TransferControlsViewBinding.inflate(LayoutInflater.from(context), this)
@@ -70,6 +72,10 @@ class TransferControlView @JvmOverloads constructor(context: Context, attrs: Att
     state = newState
   }
 
+  fun isGone(): Boolean {
+    return mode == Mode.GONE
+  }
+
   private fun applyState(currentState: TransferControlViewState) {
     val mode = deriveMode(currentState)
     verboseLog("New state applying, mode = $mode")
@@ -92,6 +98,7 @@ class TransferControlView @JvmOverloads constructor(context: Context, attrs: Att
       Mode.RETRY_UPLOADING -> displayRetry(currentState, true)
       Mode.GONE -> displayChildrenAsGone()
     }
+    this.mode = mode
   }
 
   private fun deriveMode(currentState: TransferControlViewState): Mode {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaNotificationProvider.kt b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaNotificationProvider.kt
index 8b5e7aeaa0..ca1d8a3d6f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaNotificationProvider.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaNotificationProvider.kt
@@ -263,7 +263,7 @@ class VoiceNoteMediaNotificationProvider(val context: Context) : MediaNotificati
    * OR it will set a callback to update the notification once the bitmap is fetched by [AvatarUtil]
    */
   private fun addLargeIcon(builder: NotificationCompat.Builder, extras: Bundle?, callback: MediaNotification.Provider.Callback) {
-    if (extras == null || !SignalStore.settings().messageNotificationsPrivacy.isDisplayContact) {
+    if (extras == null || !SignalStore.settings.messageNotificationsPrivacy.isDisplayContact) {
       cachedBitmap = null
       cachedRecipientId = null
       return
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService.java b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService.java
index 196b56a578..a739ad748d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService.java
@@ -40,7 +40,7 @@
 import org.thoughtcrime.securesms.database.MessageTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.MessageId;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.MultiDeviceViewedUpdateJob;
 import org.thoughtcrime.securesms.jobs.SendViewedReceiptJob;
 import org.thoughtcrime.securesms.mms.PartUriParser;
@@ -91,7 +91,7 @@ public void onCreate() {
 
     setMediaNotificationProvider(new VoiceNoteMediaNotificationProvider(this));
     setListener(new MediaSessionServiceListener());
-    ApplicationDependencies.getDatabaseObserver().registerAttachmentObserver(attachmentDeletionObserver);
+    AppDependencies.getDatabaseObserver().registerAttachmentObserver(attachmentDeletionObserver);
   }
 
   @Override
@@ -106,7 +106,7 @@ public void onTaskRemoved(Intent rootIntent) {
   public void onDestroy() {
     player.removeListener(playerEventListener);
     if (mediaSession != null) {
-      ApplicationDependencies.getDatabaseObserver().unregisterObserver(attachmentDeletionObserver);
+      AppDependencies.getDatabaseObserver().unregisterObserver(attachmentDeletionObserver);
       keyClearedReceiver.unregister();
       player.release();
       mediaSession.release();
@@ -330,10 +330,10 @@ private void sendViewedReceiptForCurrentWindowIndex() {
         MessageTable.MarkedMessageInfo markedMessageInfo = messageDatabase.setIncomingMessageViewed(messageId);
 
         if (markedMessageInfo != null) {
-          ApplicationDependencies.getJobManager().add(new SendViewedReceiptJob(markedMessageInfo.getThreadId(),
-                                                                               recipientId,
-                                                                               markedMessageInfo.getSyncMessageId().getTimetamp(),
-                                                                               new MessageId(messageId)));
+          AppDependencies.getJobManager().add(new SendViewedReceiptJob(markedMessageInfo.getThreadId(),
+                                                                       recipientId,
+                                                                       markedMessageInfo.getSyncMessageId().getTimetamp(),
+                                                                       new MessageId(messageId)));
           MultiDeviceViewedUpdateJob.enqueue(Collections.singletonList(markedMessageInfo.getSyncMessageId()));
         }
       });
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/AudioIndicatorView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/AudioIndicatorView.kt
index 3dc9af4c31..04d530d5be 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/AudioIndicatorView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/AudioIndicatorView.kt
@@ -54,6 +54,8 @@ class AudioIndicatorView(context: Context, attrs: AttributeSet) : FrameLayout(co
   fun bind(microphoneEnabled: Boolean, level: CallParticipant.AudioLevel?) {
     setBackgroundResource(R.drawable.circle_tintable)
 
+    this.visible = !microphoneEnabled || level != null
+
     micMuted.visible = !microphoneEnabled
 
     val wasShowingAudioLevel = showAudioLevel
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallLinkProfileKeySender.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallLinkProfileKeySender.kt
index d23d985857..8bb277b011 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallLinkProfileKeySender.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallLinkProfileKeySender.kt
@@ -7,7 +7,7 @@ package org.thoughtcrime.securesms.components.webrtc
 
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.database.identity.IdentityRecordList
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.ProfileKeySendJob
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -34,7 +34,7 @@ object CallLinkProfileKeySender {
     if (toSendMessagesTo.isNotEmpty()) {
       Log.i(TAG, "Sending profile key to $toSendMessagesTo users.")
       val job = ProfileKeySendJob.createForCallLinks(toSendMessagesTo.toList())
-      ApplicationDependencies.getJobManager().add(job)
+      AppDependencies.jobManager.add(job)
     } else {
       Log.i(TAG, "No users to send profile key to.")
     }
@@ -46,8 +46,8 @@ object CallLinkProfileKeySender {
   fun onRecipientsUpdated(recipients: Set<Recipient>) {
     val nonBlockedNonSelfRecipients: List<Recipient> = recipients.filterNot { it.isBlocked || it.isSelf }
 
-    val identityRecords: IdentityRecordList = ApplicationDependencies
-      .getProtocolStore()
+    val identityRecords: IdentityRecordList = AppDependencies
+      .protocolStore
       .aci()
       .identities()
       .getIdentityRecords(nonBlockedNonSelfRecipients)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallOverflowPopupWindow.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallOverflowPopupWindow.kt
index c5d3aad54f..f79ded7a80 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallOverflowPopupWindow.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallOverflowPopupWindow.kt
@@ -17,8 +17,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.widget.PopupWindowCompat
 import androidx.fragment.app.FragmentActivity
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.util.visible
 
 /**
@@ -36,16 +35,14 @@ class CallOverflowPopupWindow(private val activity: FragmentActivity, parentView
     val root = (contentView as LinearLayout)
     val reactionScrubber = root.findViewById<CallReactionScrubber>(R.id.reaction_scrubber)
     reactionScrubber.initialize(activity.supportFragmentManager) {
-      ApplicationDependencies.getSignalCallManager().react(it)
+      AppDependencies.signalCallManager.react(it)
       dismiss()
     }
-    if (FeatureFlags.groupCallRaiseHand()) {
-      val raiseHand = root.findViewById<ConstraintLayout>(R.id.raise_hand_layout_parent)
-      raiseHand.visible = true
-      raiseHand.setOnClickListener {
-        ApplicationDependencies.getSignalCallManager().raiseHand(!raisedHandDelegate.isSelfHandRaised())
-        dismiss()
-      }
+    val raiseHand = root.findViewById<ConstraintLayout>(R.id.raise_hand_layout_parent)
+    raiseHand.visible = true
+    raiseHand.setOnClickListener {
+      AppDependencies.signalCallManager.raiseHand(!raisedHandDelegate.isSelfHandRaised())
+      dismiss()
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantView.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantView.java
index b650e586c6..bc75c45973 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantView.java
@@ -25,19 +25,17 @@
 
 import org.signal.core.util.ThreadUtil;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatarDrawable;
 import org.thoughtcrime.securesms.badges.BadgeImageView;
 import org.thoughtcrime.securesms.components.AvatarImageView;
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
 import org.thoughtcrime.securesms.conversation.colors.ChatColors;
 import org.thoughtcrime.securesms.events.CallParticipant;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.AvatarUtil;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.webrtc.RendererCommon;
 import org.whispersystems.signalservice.api.util.Preconditions;
@@ -51,8 +49,6 @@
  */
 public class CallParticipantView extends ConstraintLayout {
 
-  private static final FallbackPhotoProvider FALLBACK_PHOTO_PROVIDER = new FallbackPhotoProvider();
-
   private static final long DELAY_SHOWING_MISSING_MEDIA_KEYS = TimeUnit.SECONDS.toMillis(5);
   private static final int  SMALL_AVATAR                     = ViewUtil.dpToPx(96);
   private static final int  LARGE_AVATAR                     = ViewUtil.dpToPx(112);
@@ -117,7 +113,6 @@ protected void onFinishInflate() {
     raiseHandIcon         = findViewById(R.id.call_participant_raise_hand_icon);
     nameLabel             = findViewById(R.id.call_participant_name_label);
 
-    avatar.setFallbackPhotoProvider(FALLBACK_PHOTO_PROVIDER);
     useLargeAvatar();
   }
 
@@ -182,7 +177,7 @@ void setCallParticipant(@NonNull CallParticipant participant) {
       audioIndicator.setVisibility(View.VISIBLE);
       audioIndicator.bind(participant.isMicrophoneEnabled(), participant.getAudioLevel());
       final String shortRecipientDisplayName = participant.getShortRecipientDisplayName(getContext());
-      if (FeatureFlags.groupCallRaiseHand() && raiseHandAllowed && participant.isHandRaised()) {
+      if (raiseHandAllowed && participant.isHandRaised()) {
         raiseHandIcon.setVisibility(View.VISIBLE);
         nameLabel.setVisibility(View.VISIBLE);
         nameLabel.setText(shortRecipientDisplayName);
@@ -423,12 +418,13 @@ private void changeAvatarParams(int dimension) {
   private void setPipAvatar(@NonNull Recipient recipient) {
     ContactPhoto         contactPhoto  = recipient.isSelf() ? new ProfileContactPhoto(Recipient.self())
                                                             : recipient.getContactPhoto();
-    FallbackContactPhoto fallbackPhoto = recipient.getFallbackContactPhoto(FALLBACK_PHOTO_PROVIDER);
+
+    FallbackAvatarDrawable fallbackAvatarDrawable = new FallbackAvatarDrawable(getContext(), recipient.getFallbackAvatar());
 
     Glide.with(this)
             .load(contactPhoto)
-            .fallback(fallbackPhoto.asCallCard(getContext()))
-            .error(fallbackPhoto.asCallCard(getContext()))
+            .fallback(fallbackAvatarDrawable)
+            .error(fallbackAvatarDrawable)
             .diskCacheStrategy(DiskCacheStrategy.ALL)
             .fitCenter()
             .into(pipAvatar);
@@ -456,20 +452,6 @@ private void showNoMediaKeysDialog(@NonNull Recipient recipient) {
                    .show();
   }
 
-  private static final class FallbackPhotoProvider extends Recipient.FallbackPhotoProvider {
-    @Override
-    public @NonNull FallbackContactPhoto getPhotoForLocalNumber() {
-      return super.getPhotoForRecipientWithoutName();
-    }
-
-    @Override
-    public @NonNull FallbackContactPhoto getPhotoForRecipientWithoutName() {
-      ResourceContactPhoto photo = new ResourceContactPhoto(R.drawable.ic_profile_outline_120);
-      photo.setScaleType(ImageView.ScaleType.CENTER_CROP);
-      return photo;
-    }
-  }
-
   public enum SelfPipMode {
     NOT_SELF_PIP,
     NORMAL_SELF_PIP,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.kt
index 9906fae4bd..513ded5015 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.kt
@@ -55,13 +55,11 @@ data class CallParticipantsState(
     get() {
       val results = allRemoteParticipants.asSequence()
         .filter { it.isHandRaised }
-        .distinctBy { it.recipient.id }
-        .map { GroupCallRaiseHandEvent(it.recipient, it.handRaisedTimestamp) }
+        .map { GroupCallRaiseHandEvent(it, it.handRaisedTimestamp) }
         .sortedBy { it.timestamp }
         .toMutableList()
       if (localParticipant.isHandRaised) {
-        results.removeIf { it.sender.id == localParticipant.recipient.id }
-        results.add(GroupCallRaiseHandEvent(localParticipant.recipient, localParticipant.handRaisedTimestamp))
+        results.add(GroupCallRaiseHandEvent(localParticipant, localParticipant.handRaisedTimestamp))
       }
       return results.toImmutableList()
     }
@@ -376,6 +374,7 @@ data class CallParticipantsState(
   }
 
   enum class SelectedPage {
-    GRID, FOCUSED
+    GRID,
+    FOCUSED
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallReactionScrubber.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallReactionScrubber.kt
index d071003e0a..4c456f6b26 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallReactionScrubber.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallReactionScrubber.kt
@@ -50,7 +50,7 @@ class CallReactionScrubber @JvmOverloads constructor(
   }
 
   fun initialize(fragmentManager: FragmentManager, listener: (String) -> Unit) {
-    val emojis = SignalStore.emojiValues().reactions
+    val emojis = SignalStore.emoji.reactions
     for (i in emojiViews.indices) {
       val view = emojiViews[i]
       val isAtCustomIndex = i == customEmojiIndex
@@ -61,7 +61,7 @@ class CallReactionScrubber @JvmOverloads constructor(
           bottomSheet.show(fragmentManager, CUSTOM_REACTION_BOTTOM_SHEET_TAG)
         }
       } else {
-        val preferredVariation = SignalStore.emojiValues().getPreferredVariation(emojis[i])
+        val preferredVariation = SignalStore.emoji.getPreferredVariation(emojis[i])
         view.setImageEmoji(preferredVariation)
         view.setOnClickListener { listener(preferredVariation) }
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PendingParticipantsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PendingParticipantsBottomSheet.kt
index 15b87d897f..4cd1827d92 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PendingParticipantsBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PendingParticipantsBottomSheet.kt
@@ -48,7 +48,7 @@ import org.signal.core.ui.theme.SignalTheme
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.AvatarImageView
 import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.service.webrtc.PendingParticipantCollection
 import org.thoughtcrime.securesms.util.activityViewModel
@@ -96,11 +96,11 @@ class PendingParticipantsBottomSheet : ComposeBottomSheetDialogFragment() {
   }
 
   private fun onApprove(recipient: Recipient) {
-    ApplicationDependencies.getSignalCallManager().setCallLinkJoinRequestAccepted(recipient.id)
+    AppDependencies.signalCallManager.setCallLinkJoinRequestAccepted(recipient.id)
   }
 
   private fun onDeny(recipient: Recipient) {
-    ApplicationDependencies.getSignalCallManager().setCallLinkJoinRequestRejected(recipient.id)
+    AppDependencies.signalCallManager.setCallLinkJoinRequestRejected(recipient.id)
   }
 
   private fun onApproveAll() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/SlideUpWithCallControlsBehavior.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/SlideUpWithCallControlsBehavior.kt
new file mode 100644
index 0000000000..369599c1ab
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/SlideUpWithCallControlsBehavior.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.webrtc
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.constraintlayout.widget.Barrier
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.util.views.SlideUpWithDependencyBehavior
+import kotlin.math.max
+
+/**
+ * Coordinator Layout Behavior which allows us to "pin" UI Elements to the top of the controls sheet.
+ */
+class SlideUpWithCallControlsBehavior(
+  context: Context,
+  attributeSet: AttributeSet?
+) : SlideUpWithDependencyBehavior(context, attributeSet, offsetY = 0f) {
+
+  private var minTranslationY: Float = 0f
+
+  var onTopOfControlsChangedListener: OnTopOfControlsChangedListener? = null
+
+  override fun onDependentViewChanged(parent: CoordinatorLayout, child: View, dependency: View): Boolean {
+    super.onDependentViewChanged(parent, child, dependency)
+
+    val bottomSheetBehavior = (dependency.layoutParams as CoordinatorLayout.LayoutParams).behavior as BottomSheetBehavior<*>
+    val slideOffset = bottomSheetBehavior.calculateSlideOffset()
+    if (slideOffset == 0f) {
+      minTranslationY = child.translationY
+    } else {
+      child.translationY = max(child.translationY, minTranslationY)
+    }
+
+    emitViewChanged(child)
+    return true
+  }
+
+  override fun onLayoutChild(parent: CoordinatorLayout, child: View, layoutDirection: Int): Boolean {
+    emitViewChanged(child)
+    return false
+  }
+
+  override fun layoutDependsOn(parent: CoordinatorLayout, child: View, dependency: View): Boolean {
+    return dependency.id == R.id.call_controls_info_parent
+  }
+
+  private fun emitViewChanged(child: View) {
+    val barrier = child.findViewById<Barrier>(R.id.call_screen_above_controls_barrier)
+    onTopOfControlsChangedListener?.onTopOfControlsChanged(barrier.bottom + child.translationY.toInt())
+  }
+
+  interface OnTopOfControlsChangedListener {
+    fun onTopOfControlsChanged(topOfControls: Int)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioPicker31.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioPicker31.kt
index b679ad0db8..98c5fd7226 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioPicker31.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioPicker31.kt
@@ -8,7 +8,7 @@ import androidx.annotation.RequiresApi
 import androidx.fragment.app.FragmentActivity
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.webrtc.audio.AudioDeviceMapping
 import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager
 
@@ -24,7 +24,7 @@ class WebRtcAudioPicker31(private val audioOutputChangedListener: OnAudioOutputC
   }
 
   fun showPicker(fragmentActivity: FragmentActivity, threshold: Int, onDismiss: (DialogInterface) -> Unit): DialogInterface? {
-    val am = ApplicationDependencies.getAndroidCallAudioManager()
+    val am = AppDependencies.androidCallAudioManager
     if (am.availableCommunicationDevices.isEmpty()) {
       Toast.makeText(fragmentActivity, R.string.WebRtcAudioOutputToggleButton_no_eligible_audio_i_o_detected, Toast.LENGTH_LONG).show()
       return null
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallRepository.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallRepository.java
index 0274cd71c0..738ba18e2a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallRepository.java
@@ -10,7 +10,7 @@
 import org.thoughtcrime.securesms.database.GroupTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.identity.IdentityRecordList;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
 
 import java.util.Collections;
@@ -35,7 +35,7 @@ void getIdentityRecords(@NonNull Recipient recipient, @NonNull Consumer<Identity
         recipients = Collections.singletonList(recipient);
       }
 
-      consumer.accept(ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecords(recipients));
+      consumer.accept(AppDependencies.getProtocolStore().aci().identities().getIdentityRecords(recipients));
     });
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
index ea190d0996..9a13e20ccd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
@@ -5,6 +5,7 @@
 
 package org.thoughtcrime.securesms.components.webrtc;
 
+import android.Manifest;
 import android.content.Context;
 import android.graphics.ColorMatrix;
 import android.graphics.ColorMatrixColorFilter;
@@ -25,10 +26,10 @@
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.Toolbar;
 import androidx.compose.ui.platform.ComposeView;
-import androidx.constraintlayout.widget.Barrier;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
 import androidx.constraintlayout.widget.Guideline;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.util.Consumer;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.recyclerview.widget.DefaultItemAnimator;
@@ -54,6 +55,7 @@
 import org.thoughtcrime.securesms.events.CallParticipant;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.ringrtc.CameraState;
@@ -70,6 +72,7 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 public class WebRtcCallView extends InsetAwareConstraintLayout {
@@ -126,9 +129,8 @@ public class WebRtcCallView extends InsetAwareConstraintLayout {
   private RecyclerView                  groupReactionsFeed;
   private MultiReactionBurstLayout      reactionViews;
   private ComposeView                   raiseHandSnackbar;
-  private Barrier                       pipBottomBoundaryBarrier;
-
-
+  private View                          missingPermissionContainer;
+  private MaterialButton                allowAccessButton;
 
   private WebRtcCallParticipantsPagerAdapter    pagerAdapter;
   private WebRtcCallParticipantsRecyclerAdapter recyclerAdapter;
@@ -206,7 +208,8 @@ protected void onFinishInflate() {
     groupReactionsFeed            = findViewById(R.id.call_screen_reactions_feed);
     reactionViews                 = findViewById(R.id.call_screen_reactions_container);
     raiseHandSnackbar             = findViewById(R.id.call_screen_raise_hand_view);
-    pipBottomBoundaryBarrier      = findViewById(R.id.pip_bottom_boundary_barrier);
+    missingPermissionContainer    = findViewById(R.id.missing_permissions_container);
+    allowAccessButton             = findViewById(R.id.allow_access_button);
 
     View decline      = findViewById(R.id.call_screen_decline_call);
     View answerLabel  = findViewById(R.id.call_screen_answer_call_label);
@@ -262,10 +265,16 @@ public void onPageSelected(int position) {
     });
 
     videoToggle.setOnCheckedChangeListener((v, isOn) -> {
+      if (!hasCameraPermission()) {
+        videoToggle.setChecked(false);
+      }
       runIfNonNull(controlsListener, listener -> listener.onVideoChanged(isOn));
     });
 
     micToggle.setOnCheckedChangeListener((v, isOn) -> {
+      if (!hasAudioPermission()) {
+        micToggle.setChecked(false);
+      }
       runIfNonNull(controlsListener, listener -> listener.onMicChanged(isOn));
     });
 
@@ -301,10 +310,13 @@ public void onPageSelected(int position) {
     ViewUtil.setBottomMargin(smallLocalAudioIndicator, audioIndicatorMargin);
 
     startCall.setOnClickListener(v -> {
-      if (controlsListener != null) {
-        startCall.setEnabled(false);
-        controlsListener.onStartCall(videoToggle.isChecked());
-      }
+      Runnable onGranted = () -> {
+        if (controlsListener != null) {
+          startCall.setEnabled(false);
+          controlsListener.onStartCall(videoToggle.isChecked());
+        }
+      };
+      runIfNonNull(controlsListener, listener -> listener.onAudioPermissionsRequested(onGranted));
     });
 
     ColorMatrix greyScaleMatrix = new ColorMatrix();
@@ -360,10 +372,16 @@ public void onPageSelected(int position) {
     rotatableControls.add(smallLocalAudioIndicator);
     rotatableControls.add(ringToggle);
 
-    pipBottomBoundaryBarrier.addOnLayoutChangeListener((v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
-      if (bottom != oldBottom) {
-        onBarrierBottomChanged(bottom);
-      }
+    missingPermissionContainer.setVisibility(hasCameraPermission() ? View.GONE : View.VISIBLE);
+
+    allowAccessButton.setOnClickListener(v -> {
+      runIfNonNull(controlsListener, listener -> listener.onVideoChanged(videoToggle.isEnabled()));
+    });
+
+    ConstraintLayout aboveControls = findViewById(R.id.call_controls_floating_parent);
+    SlideUpWithCallControlsBehavior behavior = (SlideUpWithCallControlsBehavior) ((CoordinatorLayout.LayoutParams) aboveControls.getLayoutParams()).getBehavior();
+    Objects.requireNonNull(behavior).setOnTopOfControlsChangedListener(topOfControls -> {
+      pictureInPictureGestureHelper.setBottomVerticalBoundary(topOfControls);
     });
   }
 
@@ -405,7 +423,7 @@ public void maybeDismissAudioPicker() {
   }
 
   public void setMicEnabled(boolean isMicEnabled) {
-    micToggle.setChecked(isMicEnabled, false);
+    micToggle.setChecked(hasAudioPermission() && isMicEnabled, false);
   }
 
   public void setPendingParticipantsViewListener(@Nullable PendingParticipantsView.Listener listener) {
@@ -424,6 +442,14 @@ public void updatePendingParticipantsList(@NonNull PendingParticipantCollection
     }
   }
 
+  private boolean hasCameraPermission() {
+    return Permissions.hasAll(getContext(), Manifest.permission.CAMERA);
+  }
+
+  private boolean hasAudioPermission() {
+    return Permissions.hasAll(getContext(), Manifest.permission.RECORD_AUDIO);
+  }
+
   public void updateCallParticipants(@NonNull CallParticipantsViewState callParticipantsViewState) {
     lastState = callParticipantsViewState;
 
@@ -432,12 +458,14 @@ public void updateCallParticipants(@NonNull CallParticipantsViewState callPartic
     boolean                          isLandscapeEnabled = callParticipantsViewState.isLandscapeEnabled();
     List<WebRtcCallParticipantsPage> pages              = new ArrayList<>(2);
 
-    if (!state.getGridParticipants().isEmpty()) {
-      pages.add(WebRtcCallParticipantsPage.forMultipleParticipants(state.getGridParticipants(), state.getFocusedParticipant(), state.isInPipMode(), isPortrait, isLandscapeEnabled, state.getHideAvatar(), navBarBottomInset));
-    }
+    if (!state.getCallState().isErrorState()) {
+      if (!state.getGridParticipants().isEmpty()) {
+        pages.add(WebRtcCallParticipantsPage.forMultipleParticipants(state.getGridParticipants(), state.getFocusedParticipant(), state.isInPipMode(), isPortrait, isLandscapeEnabled, state.getHideAvatar(), navBarBottomInset));
+      }
 
-    if (state.getFocusedParticipant() != CallParticipant.EMPTY && state.getAllRemoteParticipants().size() > 1) {
-      pages.add(WebRtcCallParticipantsPage.forSingleParticipant(state.getFocusedParticipant(), state.isInPipMode(), isPortrait, isLandscapeEnabled));
+      if (state.getFocusedParticipant() != CallParticipant.EMPTY && state.getAllRemoteParticipants().size() > 1) {
+        pages.add(WebRtcCallParticipantsPage.forSingleParticipant(state.getFocusedParticipant(), state.isInPipMode(), isPortrait, isLandscapeEnabled));
+      }
     }
 
     if (state.getGroupCallState().isNotIdle()) {
@@ -503,7 +531,7 @@ public void updateLocalCallParticipant(@NonNull WebRtcLocalRenderState state,
     });
 
 
-    videoToggle.setChecked(localCallParticipant.isVideoEnabled(), false);
+    videoToggle.setChecked(hasCameraPermission() && localCallParticipant.isVideoEnabled(), false);
     smallLocalRender.setRenderInPip(true);
     smallLocalRender.setCallParticipant(localCallParticipant);
     smallLocalRender.setMirror(localCallParticipant.getCameraDirection() == CameraState.Direction.FRONT);
@@ -957,11 +985,6 @@ public void enableRingGroup(boolean enabled) {
   }
 
   public void onControlTopChanged() {
-    onBarrierBottomChanged(pipBottomBoundaryBarrier.getBottom());
-  }
-
-  private void onBarrierBottomChanged(int barrierBottom) {
-    pictureInPictureGestureHelper.setBottomVerticalBoundary(barrierBottom);
   }
 
   public interface ControlsListener {
@@ -984,5 +1007,6 @@ public interface ControlsListener {
     void onCallInfoClicked();
     void onNavigateUpClicked();
     void toggleControls();
+    void onAudioPermissionsRequested(Runnable onGranted);
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallViewModel.java
index a180777503..453a5d02ff 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallViewModel.java
@@ -20,7 +20,7 @@
 import org.thoughtcrime.securesms.components.sensors.DeviceOrientationMonitor;
 import org.thoughtcrime.securesms.components.sensors.Orientation;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.events.CallParticipant;
 import org.thoughtcrime.securesms.events.CallParticipantId;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
@@ -32,7 +32,6 @@
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.service.webrtc.PendingParticipantCollection;
 import org.thoughtcrime.securesms.service.webrtc.state.WebRtcEphemeralState;
-import org.thoughtcrime.securesms.util.DefaultValueLiveData;
 import org.thoughtcrime.securesms.util.NetworkUtil;
 import org.thoughtcrime.securesms.util.SingleLiveEvent;
 import org.thoughtcrime.securesms.util.Util;
@@ -94,7 +93,7 @@ public class WebRtcCallViewModel extends ViewModel {
   private boolean               switchOnFirstScreenShare              = true;
   private boolean               showScreenShareTip                    = true;
 
-  private final WebRtcCallRepository repository = new WebRtcCallRepository(ApplicationDependencies.getApplication());
+  private final WebRtcCallRepository repository = new WebRtcCallRepository(AppDependencies.getApplication());
 
   private WebRtcCallViewModel(@NonNull DeviceOrientationMonitor deviceOrientationMonitor) {
     orientation      = deviceOrientationMonitor.getOrientation();
@@ -342,7 +341,7 @@ public void updateFromWebRtcViewModel(@NonNull WebRtcViewModel webRtcViewModel,
       events.setValue(new Event.ShowVideoTooltip());
     }
 
-    if (canDisplayPopupIfNeeded && webRtcViewModel.isCellularConnection() && NetworkUtil.isConnectedWifi(ApplicationDependencies.getApplication())) {
+    if (canDisplayPopupIfNeeded && webRtcViewModel.isCellularConnection() && NetworkUtil.isConnectedWifi(AppDependencies.getApplication())) {
       canDisplayPopupIfNeeded = false;
       events.setValue(new Event.ShowWifiToCellularPopup());
     } else if (!webRtcViewModel.isCellularConnection()) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcControls.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcControls.java
index 3fce3a64ce..bf94fe21bf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcControls.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcControls.java
@@ -8,7 +8,6 @@
 import androidx.annotation.StringRes;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager;
 
 import java.util.Set;
@@ -219,7 +218,7 @@ public boolean displayReactions() {
   }
 
   public boolean displayRaiseHand() {
-    return FeatureFlags.groupCallRaiseHand() && !isInPipMode;
+    return !isInPipMode;
   }
 
   public @NonNull WebRtcAudioOutput getAudioOutput() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/CallInfoView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/CallInfoView.kt
index 8b8dfd8f21..b8e7f21d4a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/CallInfoView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/CallInfoView.kt
@@ -53,7 +53,7 @@ import org.signal.ringrtc.CallLinkState
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.AvatarImageView
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallViewModel
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.events.CallParticipant
 import org.thoughtcrime.securesms.events.GroupCallRaiseHandEvent
 import org.thoughtcrime.securesms.events.WebRtcViewModel
@@ -130,7 +130,7 @@ private fun CallInfoPreview() {
     Surface {
       val remoteParticipants = listOf(CallParticipant(recipient = Recipient.UNKNOWN))
       CallInfo(
-        participantsState = ParticipantsState(remoteParticipants = remoteParticipants, raisedHands = remoteParticipants.map { GroupCallRaiseHandEvent(it.recipient, System.currentTimeMillis()) }),
+        participantsState = ParticipantsState(remoteParticipants = remoteParticipants, raisedHands = remoteParticipants.map { GroupCallRaiseHandEvent(it, System.currentTimeMillis()) }),
         controlAndInfoState = ControlAndInfoState(),
         onShareLinkClicked = { },
         onEditNameClicked = { },
@@ -216,11 +216,13 @@ private fun CallInfo(
       }
 
       items(
-        items = participantsState.raisedHands,
-        key = { it.sender.id },
-        contentType = { null }
+        items = participantsState.raisedHands.map { it.sender },
+        key = {
+          val key: Long = it.callParticipantId.demuxId // Due to a bug in how the Compose toolchain inlines saveable states, this Long needs to be set into its own variable within the lambda before being returned.
+          key
+        }
       ) {
-        HandRaisedRow(recipient = it.sender)
+        HandRaisedRow(recipient = it.recipient, it.getShortRecipientDisplayName(LocalContext.current), it.isSelf && it.isPrimary)
       }
 
       item {
@@ -346,7 +348,7 @@ private fun CallParticipantRowPreview() {
 private fun HandRaisedRowPreview() {
   SignalTheme(isDarkMode = true) {
     Surface {
-      HandRaisedRow(Recipient.UNKNOWN, canLowerHand = true)
+      HandRaisedRow(Recipient.UNKNOWN, "Peter Parker", canLowerHand = true)
     }
   }
 }
@@ -371,10 +373,10 @@ private fun CallParticipantRow(
 }
 
 @Composable
-private fun HandRaisedRow(recipient: Recipient, canLowerHand: Boolean = recipient.isSelf) {
+private fun HandRaisedRow(recipient: Recipient, name: String, canLowerHand: Boolean) {
   CallParticipantRow(
     initialRecipient = recipient,
-    name = recipient.getShortDisplayName(LocalContext.current),
+    name = name,
     showIcons = true,
     isVideoEnabled = true,
     isMicrophoneEnabled = true,
@@ -492,7 +494,7 @@ private fun showLowerHandDialog(context: Context) {
     .setTitle(R.string.CallOverflowPopupWindow__lower_your_hand)
     .setPositiveButton(
       R.string.CallOverflowPopupWindow__lower_hand
-    ) { _, _ -> ApplicationDependencies.getSignalCallManager().raiseHand(false) }
+    ) { _, _ -> AppDependencies.signalCallManager.raiseHand(false) }
     .setNegativeButton(R.string.CallOverflowPopupWindow__cancel, null)
     .show()
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/ControlsAndInfoController.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/ControlsAndInfoController.kt
index 4a3fed6ee7..6568ae5c58 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/ControlsAndInfoController.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/ControlsAndInfoController.kt
@@ -52,7 +52,7 @@ import org.thoughtcrime.securesms.components.webrtc.CallOverflowPopupWindow
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallView
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallViewModel
 import org.thoughtcrime.securesms.components.webrtc.WebRtcControls
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.events.CallParticipant
 import org.thoughtcrime.securesms.service.webrtc.links.UpdateCallLinkResult
 import org.thoughtcrime.securesms.util.padding
@@ -94,6 +94,8 @@ class ControlsAndInfoController(
   private val aboveControlsGuideline: Guideline
   private val bottomSheetVisibilityListeners = mutableSetOf<BottomSheetVisibilityListener>()
   private val scheduleHideControlsRunnable: Runnable = Runnable { onScheduledHide() }
+  private val toggleCameraDirectionView: View
+
   private val handler: Handler?
     get() = webRtcCallView.handler
 
@@ -110,6 +112,7 @@ class ControlsAndInfoController(
     callControls = webRtcCallView.findViewById(R.id.call_controls_constraint_layout)
     raiseHandComposeView = webRtcCallView.findViewById(R.id.call_screen_raise_hand_view)
     aboveControlsGuideline = webRtcCallView.findViewById(R.id.call_screen_above_controls_guideline)
+    toggleCameraDirectionView = webRtcCallView.findViewById(R.id.call_screen_camera_direction_toggle)
 
     callInfoComposeView.apply {
       setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
@@ -235,7 +238,7 @@ class ControlsAndInfoController(
 
   private fun hide(delay: Long = 0L) {
     if (delay == 0L) {
-      if (controlState.isFadeOutEnabled || controlState == WebRtcControls.PIP) {
+      if (controlState.isFadeOutEnabled || controlState == WebRtcControls.PIP || controlState.displayErrorControls()) {
         behavior.isHideable = true
         behavior.state = BottomSheetBehavior.STATE_HIDDEN
 
@@ -280,7 +283,7 @@ class ControlsAndInfoController(
   }
 
   private fun showOrHideControlsOnUpdate(previousState: WebRtcControls) {
-    if (controlState == WebRtcControls.PIP) {
+    if (controlState == WebRtcControls.PIP || controlState.displayErrorControls()) {
       hide()
       return
     }
@@ -321,7 +324,6 @@ class ControlsAndInfoController(
       val margin = if (controlState.displaySmallCallButtons()) 4.dp else 8.dp
 
       setControlConstraints(R.id.call_screen_speaker_toggle, controlState.displayAudioToggle(), margin)
-      setControlConstraints(R.id.call_screen_camera_direction_toggle, controlState.displayCameraToggle(), margin)
       setControlConstraints(R.id.call_screen_video_toggle, controlState.displayVideoToggle(), margin)
       setControlConstraints(R.id.call_screen_audio_mic_toggle, controlState.displayMuteAudio(), margin)
       setControlConstraints(R.id.call_screen_audio_ring_toggle, controlState.displayRingToggle(), margin)
@@ -330,6 +332,8 @@ class ControlsAndInfoController(
     }
 
     constraints.applyTo(callControls)
+
+    toggleCameraDirectionView.visible = controlState.displayCameraToggle()
   }
 
   private fun onScheduledHide() {
@@ -407,10 +411,10 @@ class ControlsAndInfoController(
       .setNegativeButton(android.R.string.cancel, null)
       .setMessage(webRtcCallView.resources.getString(R.string.CallLinkInfoSheet__remove_s_from_the_call, callParticipant.recipient.getShortDisplayName(webRtcCallActivity)))
       .setPositiveButton(R.string.CallLinkInfoSheet__remove) { _, _ ->
-        ApplicationDependencies.getSignalCallManager().removeFromCallLink(callParticipant)
+        AppDependencies.signalCallManager.removeFromCallLink(callParticipant)
       }
       .setNeutralButton(R.string.CallLinkInfoSheet__block_from_call) { _, _ ->
-        ApplicationDependencies.getSignalCallManager().blockFromCallLink(callParticipant)
+        AppDependencies.signalCallManager.blockFromCallLink(callParticipant)
       }
       .show()
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/RaiseHandSnackbar.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/RaiseHandSnackbar.kt
index 9f64fa0f9e..39d90a21f8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/RaiseHandSnackbar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/RaiseHandSnackbar.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Signal Messenger, LLC
+ * Copyright 2024 Signal Messenger, LLC
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
@@ -48,9 +48,9 @@ import kotlinx.coroutines.delay
 import org.signal.core.ui.theme.SignalTheme
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallViewModel
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.events.CallParticipant
 import org.thoughtcrime.securesms.events.GroupCallRaiseHandEvent
-import org.thoughtcrime.securesms.recipients.Recipient
 import java.util.concurrent.TimeUnit
 
 /**
@@ -65,10 +65,20 @@ object RaiseHandSnackbar {
   fun View(webRtcCallViewModel: WebRtcCallViewModel, showCallInfoListener: () -> Unit, modifier: Modifier = Modifier) {
     var expansionState by remember { mutableStateOf(ExpansionState(shouldExpand = false, forced = false)) }
 
-    val webRtcState by webRtcCallViewModel.callParticipantsState
+    val raisedHandsState by webRtcCallViewModel.callParticipantsState
       .toFlowable(BackpressureStrategy.LATEST)
       .map { state ->
-        val raisedHands = state.raisedHands.sortedByDescending { it.timestamp }
+        val raisedHands = state.raisedHands.sortedBy {
+          if (it.sender.isSelf) {
+            if (it.sender.isPrimary) {
+              0
+            } else {
+              1
+            }
+          } else {
+            it.timestamp
+          }
+        }
         val shouldExpand = RaiseHandState.shouldExpand(raisedHands)
         if (!expansionState.forced) {
           expansionState = ExpansionState(shouldExpand, false)
@@ -78,7 +88,7 @@ object RaiseHandSnackbar {
 
     val state by remember {
       derivedStateOf {
-        RaiseHandState(raisedHands = webRtcState, expansionState = expansionState)
+        RaiseHandState(raisedHands = raisedHandsState, expansionState = expansionState)
       }
     }
 
@@ -95,7 +105,7 @@ object RaiseHandSnackbar {
 @Composable
 private fun RaiseHandSnackbarPreview() {
   RaiseHand(
-    state = RaiseHandState(listOf(GroupCallRaiseHandEvent(Recipient.UNKNOWN, System.currentTimeMillis())))
+    state = RaiseHandState(listOf(GroupCallRaiseHandEvent(CallParticipant.EMPTY, System.currentTimeMillis())))
   )
 }
 
@@ -141,7 +151,9 @@ private fun RaiseHand(
             Icon(
               imageVector = ImageVector.vectorResource(id = R.drawable.symbol_raise_hand_24),
               contentDescription = null,
-              modifier = Modifier.align(Alignment.CenterVertically).padding(vertical = 8.dp)
+              modifier = Modifier
+                .align(Alignment.CenterVertically)
+                .padding(vertical = 8.dp)
             )
 
             Text(
@@ -154,11 +166,10 @@ private fun RaiseHand(
                 .padding(vertical = 16.dp)
             )
             if (state.isExpanded) {
-              if (state.raisedHands.first().sender.isSelf) {
-                val context = LocalContext.current
+              if (state.raisedHands.any { it.sender.isSelf && it.sender.isPrimary }) {
                 TextButton(
                   onClick = {
-                    ApplicationDependencies.getSignalCallManager().raiseHand(false)
+                    AppDependencies.signalCallManager.raiseHand(false)
                   },
                   modifier = Modifier.wrapContentWidth(Alignment.End)
                 ) {
@@ -185,25 +196,43 @@ private fun getSnackbarText(state: RaiseHandState): String {
   if (state.isEmpty) {
     return ""
   }
+
+  val displayedName = getShortDisplayName(raisedHands = state.raisedHands)
+  val additionalHandsCount = state.raisedHands.size - 1
   return if (!state.isExpanded) {
-    pluralStringResource(id = R.plurals.CallRaiseHandSnackbar_raised_hands, count = state.raisedHands.size, getShortDisplayName(state.raisedHands), state.raisedHands.size - 1)
+    if (state.raisedHands.size == 1) {
+      if (state.raisedHands.first().sender.isSelf) {
+        stringResource(id = R.string.CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single, displayedName)
+      } else {
+        stringResource(id = R.string.CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular, displayedName)
+      }
+    } else {
+      if (state.raisedHands.first().sender.isSelf) {
+        pluralStringResource(id = R.plurals.CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple, count = additionalHandsCount, displayedName, additionalHandsCount)
+      } else {
+        pluralStringResource(id = R.plurals.CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple, count = additionalHandsCount, displayedName, additionalHandsCount)
+      }
+    }
   } else {
-    if (state.raisedHands.size == 1 && state.raisedHands.first().sender.isSelf) {
-      stringResource(id = R.string.CallOverflowPopupWindow__you_raised_your_hand)
+    if (state.raisedHands.size == 1) {
+      if (state.raisedHands.first().sender.isSelf) {
+        stringResource(id = R.string.CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single, displayedName)
+      } else {
+        stringResource(id = R.string.CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single, displayedName)
+      }
     } else {
-      pluralStringResource(id = R.plurals.CallOverflowPopupWindow__raised_a_hand, count = state.raisedHands.size, state.raisedHands.first().sender.getShortDisplayName(LocalContext.current), state.raisedHands.size - 1)
+      if (state.raisedHands.first().sender.isSelf) {
+        pluralStringResource(id = R.plurals.CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple, count = additionalHandsCount, displayedName, additionalHandsCount)
+      } else {
+        pluralStringResource(id = R.plurals.CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple, count = additionalHandsCount, displayedName, additionalHandsCount)
+      }
     }
   }
 }
 
 @Composable
 private fun getShortDisplayName(raisedHands: List<GroupCallRaiseHandEvent>): String {
-  val recipient = raisedHands.first().sender
-  return if (recipient.isSelf) {
-    stringResource(id = R.string.CallParticipant__you)
-  } else {
-    recipient.getShortDisplayName(LocalContext.current)
-  }
+  return raisedHands.first().sender.getShortRecipientDisplayName(LocalContext.current)
 }
 
 private data class RaiseHandState(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/requests/CallLinkIncomingRequestSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/requests/CallLinkIncomingRequestSheet.kt
index 10aea686a8..b6bb8aab6b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/requests/CallLinkIncomingRequestSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/requests/CallLinkIncomingRequestSheet.kt
@@ -40,7 +40,7 @@ import org.signal.core.util.getParcelableCompat
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.AvatarImageView
 import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.BottomSheetUtil
@@ -90,12 +90,12 @@ class CallLinkIncomingRequestSheet : ComposeBottomSheetDialogFragment() {
   }
 
   private fun onApproveEntry() {
-    ApplicationDependencies.getSignalCallManager().setCallLinkJoinRequestAccepted(recipientId)
+    AppDependencies.signalCallManager.setCallLinkJoinRequestAccepted(recipientId)
     dismissAllowingStateLoss()
   }
 
   private fun onDenyEntry() {
-    ApplicationDependencies.getSignalCallManager().setCallLinkJoinRequestRejected(recipientId)
+    AppDependencies.signalCallManager.setCallLinkJoinRequestRejected(recipientId)
     dismissAllowingStateLoss()
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/compose/Nav.kt b/app/src/main/java/org/thoughtcrime/securesms/compose/Nav.kt
new file mode 100644
index 0000000000..1413f1f059
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/compose/Nav.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.compose
+
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.navigation.NavBackStackEntry
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.NavHost
+
+/**
+ * Default Navigation utilities for compose.
+ */
+object Nav {
+
+  @Composable
+  fun Host(
+    navController: NavHostController,
+    startDestination: String,
+    modifier: Modifier = Modifier,
+    route: String? = null,
+    enterTransition: (AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition) = { slideInHorizontally(initialOffsetX = { it }) },
+    exitTransition: (AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition) = { slideOutHorizontally(targetOffsetX = { -it }) },
+    popEnterTransition: (AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition) = { slideInHorizontally(initialOffsetX = { -it }) },
+    popExitTransition: (AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition) = { slideOutHorizontally(targetOffsetX = { it }) },
+    builder: NavGraphBuilder.() -> Unit
+  ) {
+    NavHost(
+      navController = navController,
+      startDestination = startDestination,
+      modifier = modifier,
+      route = route,
+      enterTransition = enterTransition,
+      exitTransition = exitTransition,
+      popEnterTransition = popEnterTransition,
+      popExitTransition = popExitTransition,
+      builder = builder
+    )
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactChip.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactChip.java
index 731e3ddb34..d678d971d9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactChip.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactChip.java
@@ -16,7 +16,13 @@
 import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.transition.Transition;
 import com.google.android.material.chip.Chip;
+import com.google.android.material.shape.MaterialShapeDrawable;
+import com.google.android.material.shape.RelativeCornerSize;
+import com.google.android.material.shape.RoundedCornerTreatment;
+import com.google.android.material.shape.ShapeAppearanceModel;
+import com.google.android.material.shape.Shapeable;
 
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatarDrawable;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
 import org.thoughtcrime.securesms.recipients.Recipient;
 
@@ -48,10 +54,16 @@ public void setAvatar(@NonNull RequestManager requestManager, @Nullable Recipien
     if (recipient != null) {
       requestManager.clear(this);
 
-      Drawable     fallbackContactPhotoDrawable = new HalfScaleDrawable(recipient.getFallbackContactPhotoDrawable(getContext(), false));
-      ContactPhoto contactPhoto                 = recipient.getContactPhoto();
+      FallbackAvatarDrawable fallbackContactPhotoDrawable = new FallbackAvatarDrawable(getContext(), recipient.getFallbackAvatar());
+      ContactPhoto           contactPhoto                 = recipient.getContactPhoto();
 
       if (contactPhoto == null) {
+        fallbackContactPhotoDrawable.setShapeAppearanceModel(
+            ShapeAppearanceModel.builder()
+                .setAllCorners(new RoundedCornerTreatment())
+                .setAllCornerSizes(new RelativeCornerSize(0.5f)).build()
+        );
+
         setChipIcon(fallbackContactPhotoDrawable);
         if (onAvatarSet != null) {
           onAvatarSet.run();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactChipViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactChipViewModel.kt
index 23c7ef21cd..191df68b2b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactChipViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactChipViewModel.kt
@@ -9,7 +9,7 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.disposables.Disposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import io.reactivex.rxjava3.schedulers.Schedulers
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.rx.RxStore
@@ -67,7 +67,7 @@ class ContactChipViewModel : ViewModel() {
 
   private fun getOrCreateRecipientId(selectedContact: SelectedContact): Single<RecipientId> {
     return Single.fromCallable {
-      selectedContact.getOrCreateRecipientId(ApplicationDependencies.getApplication())
+      selectedContact.getOrCreateRecipientId(AppDependencies.application)
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java
index ce8fa608c4..60df9910e5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java
@@ -14,7 +14,7 @@
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.contacts.sync.ContactDiscovery;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter;
@@ -88,7 +88,7 @@ public void onPerformSync(Account account, Bundle extras, String authority,
         ContactDiscovery.refresh(context, recipients, true);
       } catch (IOException e) {
         Log.w(TAG, "Failed to refresh! Scheduling for later.", e);
-        ApplicationDependencies.getJobManager().add(new DirectoryRefreshJob(true));
+        AppDependencies.getJobManager().add(new DirectoryRefreshJob(true));
       }
     } else {
       Log.i(TAG, "No new contacts. Just syncing system contact data.");
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/TurnOffContactJoinedNotificationsActivity.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/TurnOffContactJoinedNotificationsActivity.java
index b4a21ad87d..e8f37976cf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/TurnOffContactJoinedNotificationsActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/TurnOffContactJoinedNotificationsActivity.java
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.contacts;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -14,7 +13,7 @@
 import org.thoughtcrime.securesms.database.MessageTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.ThreadTable;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.notifications.MarkReadReceiver;
 import org.signal.core.util.concurrent.SimpleTask;
@@ -60,7 +59,7 @@ private void handlePositiveAction(@NonNull DialogInterface dialog) {
       MarkReadReceiver.process(marked);
 
       SignalStore.settings().setNotifyWhenContactJoinsSignal(false);
-      ApplicationDependencies.getMessageNotifier().updateNotification(this);
+      AppDependencies.getMessageNotifier().updateNotification(this);
 
       return null;
     }, unused -> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/FallbackContactPhoto.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/FallbackContactPhoto.java
deleted file mode 100644
index 6ee00d7fd0..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/FallbackContactPhoto.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.thoughtcrime.securesms.contacts.avatars;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-
-import androidx.annotation.NonNull;
-
-import org.thoughtcrime.securesms.conversation.colors.AvatarColor;
-
-public interface FallbackContactPhoto {
-
- Drawable asDrawable(@NonNull Context context, @NonNull AvatarColor color);
- Drawable asDrawable(@NonNull Context context, @NonNull AvatarColor color, boolean inverted);
- Drawable asSmallDrawable(@NonNull Context context, @NonNull AvatarColor color, boolean inverted);
- Drawable asCallCard(@NonNull Context context);
-
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/FallbackPhoto.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/FallbackPhoto.java
deleted file mode 100644
index eec617576a..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/FallbackPhoto.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.thoughtcrime.securesms.contacts.avatars;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
-
-import androidx.annotation.DrawableRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Px;
-import androidx.appcompat.content.res.AppCompatResources;
-import androidx.core.graphics.drawable.DrawableCompat;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.avatar.Avatars;
-import org.thoughtcrime.securesms.conversation.colors.AvatarColor;
-
-import java.util.Objects;
-
-/**
- * Fallback resource based contact photo with a 20dp icon
- */
-public final class FallbackPhoto implements FallbackContactPhoto {
-
-  @DrawableRes private final int drawableResource;
-  @Px          private final int foregroundInset;
-
-  public FallbackPhoto(@DrawableRes int drawableResource, @Px int foregroundInset) {
-    this.drawableResource = drawableResource;
-    this.foregroundInset  = foregroundInset;
-  }
-
-  @Override
-  public Drawable asDrawable(@NonNull Context context, @NonNull AvatarColor color) {
-    return buildDrawable(context, color);
-  }
-
-  @Override
-  public Drawable asDrawable(@NonNull Context context, @NonNull AvatarColor color, boolean inverted) {
-    return buildDrawable(context, color);
-  }
-
-  @Override
-  public Drawable asSmallDrawable(@NonNull Context context, @NonNull AvatarColor color, boolean inverted) {
-    return buildDrawable(context, color);
-  }
-
-  @Override
-  public Drawable asCallCard(@NonNull Context context) {
-    throw new UnsupportedOperationException();
-  }
-
-  private @NonNull Drawable buildDrawable(@NonNull Context context, @NonNull AvatarColor color) {
-    Drawable      background      = DrawableCompat.wrap(Objects.requireNonNull(AppCompatResources.getDrawable(context, R.drawable.circle_tintable))).mutate();
-    Drawable      foreground      = Objects.requireNonNull(AppCompatResources.getDrawable(context, drawableResource));
-    LayerDrawable drawable        = new LayerDrawable(new Drawable[]{background, foreground});
-
-    DrawableCompat.setTint(background, color.colorInt());
-    DrawableCompat.setTint(foreground, Avatars.getForegroundColor(color).getColorInt());
-
-    drawable.setLayerInset(1, foregroundInset, foregroundInset, foregroundInset, foregroundInset);
-
-    return drawable;
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/FallbackPhoto20dp.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/FallbackPhoto20dp.java
deleted file mode 100644
index fe2630b73e..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/FallbackPhoto20dp.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.thoughtcrime.securesms.contacts.avatars;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
-
-import androidx.annotation.DrawableRes;
-import androidx.annotation.NonNull;
-import androidx.appcompat.content.res.AppCompatResources;
-import androidx.core.graphics.drawable.DrawableCompat;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.avatar.Avatars;
-import org.thoughtcrime.securesms.conversation.colors.AvatarColor;
-import org.thoughtcrime.securesms.util.ViewUtil;
-
-import java.util.Objects;
-
-/**
- * Fallback resource based contact photo with a 20dp icon
- */
-public final class FallbackPhoto20dp implements FallbackContactPhoto {
-
-  @DrawableRes private final int drawable20dp;
-
-  public FallbackPhoto20dp(@DrawableRes int drawable20dp) {
-    this.drawable20dp = drawable20dp;
-  }
-
-  @Override
-  public Drawable asDrawable(@NonNull Context context, @NonNull AvatarColor color) {
-    return buildDrawable(context, color);
-  }
-
-  @Override
-  public Drawable asDrawable(@NonNull Context context, @NonNull AvatarColor color, boolean inverted) {
-    return buildDrawable(context, color);
-  }
-
-  @Override
-  public Drawable asSmallDrawable(@NonNull Context context, @NonNull AvatarColor color, boolean inverted) {
-    return buildDrawable(context, color);
-  }
-
-  @Override
-  public Drawable asCallCard(@NonNull Context context) {
-    throw new UnsupportedOperationException();
-  }
-
-  private @NonNull Drawable buildDrawable(@NonNull Context context, @NonNull AvatarColor color) {
-    Drawable      background      = DrawableCompat.wrap(Objects.requireNonNull(AppCompatResources.getDrawable(context, R.drawable.circle_tintable))).mutate();
-    Drawable      foreground      = Objects.requireNonNull(AppCompatResources.getDrawable(context, drawable20dp));
-    LayerDrawable drawable        = new LayerDrawable(new Drawable[]{background, foreground});
-    int           foregroundInset = ViewUtil.dpToPx(2);
-
-    DrawableCompat.setTint(background, color.colorInt());
-    DrawableCompat.setTint(foreground, Avatars.getForegroundColor(color).getColorInt());
-
-    drawable.setLayerInset(1, foregroundInset, foregroundInset, foregroundInset, foregroundInset);
-
-    return drawable;
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/FallbackPhoto80dp.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/FallbackPhoto80dp.java
deleted file mode 100644
index 4d19fe5fcf..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/FallbackPhoto80dp.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.thoughtcrime.securesms.contacts.avatars;
-
-import android.content.Context;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
-
-import androidx.annotation.DrawableRes;
-import androidx.annotation.NonNull;
-import androidx.appcompat.content.res.AppCompatResources;
-import androidx.core.graphics.drawable.DrawableCompat;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.avatar.Avatars;
-import org.thoughtcrime.securesms.conversation.colors.AvatarColor;
-import org.thoughtcrime.securesms.util.ViewUtil;
-
-import java.util.Objects;
-
-public final class FallbackPhoto80dp implements FallbackContactPhoto {
-
-  @DrawableRes private final int         drawable80dp;
-               private final AvatarColor color;
-
-  public FallbackPhoto80dp(@DrawableRes int drawable80dp, @NonNull AvatarColor color) {
-    this.drawable80dp = drawable80dp;
-    this.color        = color;
-  }
-
-  @Override
-  public Drawable asDrawable(@NonNull Context context, @NonNull AvatarColor color) {
-    return buildDrawable(context);
-  }
-
-  @Override
-  public Drawable asDrawable(@NonNull Context context, @NonNull AvatarColor color, boolean inverted) {
-    return buildDrawable(context);
-  }
-
-  @Override
-  public Drawable asSmallDrawable(@NonNull Context context, @NonNull AvatarColor color, boolean inverted) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public Drawable asCallCard(@NonNull Context context) {
-    Drawable      background      = new ColorDrawable(color.colorInt());
-    Drawable      foreground      = Objects.requireNonNull(AppCompatResources.getDrawable(context, drawable80dp));
-    LayerDrawable drawable        = new LayerDrawable(new Drawable[]{background, foreground});
-    int           foregroundInset = ViewUtil.dpToPx(24);
-
-    DrawableCompat.setTint(foreground, Avatars.getForegroundColor(color).getColorInt());
-    drawable.setLayerInset(1, foregroundInset, foregroundInset, foregroundInset, foregroundInset);
-
-    return drawable;
-  }
-
-  private @NonNull Drawable buildDrawable(@NonNull Context context) {
-    Drawable      background      = DrawableCompat.wrap(Objects.requireNonNull(AppCompatResources.getDrawable(context, R.drawable.circle_tintable))).mutate();
-    Drawable      foreground      = Objects.requireNonNull(AppCompatResources.getDrawable(context, drawable80dp));
-    LayerDrawable drawable        = new LayerDrawable(new Drawable[]{background, foreground});
-    int           foregroundInset = ViewUtil.dpToPx(24);
-
-    DrawableCompat.setTint(background, color.colorInt());
-    DrawableCompat.setTint(foreground, Avatars.getForegroundColor(color).getColorInt());
-
-    drawable.setLayerInset(1, foregroundInset, foregroundInset, foregroundInset, foregroundInset);
-
-    return drawable;
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java
deleted file mode 100644
index 1812801b1a..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.thoughtcrime.securesms.contacts.avatars;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
-import android.text.TextUtils;
-
-import androidx.annotation.DrawableRes;
-import androidx.annotation.NonNull;
-import androidx.appcompat.content.res.AppCompatResources;
-import androidx.core.content.ContextCompat;
-
-import com.airbnb.lottie.SimpleColorFilter;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.avatar.Avatar;
-import org.thoughtcrime.securesms.avatar.AvatarRenderer;
-import org.thoughtcrime.securesms.avatar.Avatars;
-import org.thoughtcrime.securesms.conversation.colors.AvatarColor;
-import org.thoughtcrime.securesms.util.NameUtil;
-
-import java.util.Objects;
-
-public class GeneratedContactPhoto implements FallbackContactPhoto {
-
-  private final String name;
-  private final int    fallbackResId;
-  private final int    targetSize;
-
-  public GeneratedContactPhoto(@NonNull String name, @DrawableRes int fallbackResId) {
-    this(name, fallbackResId, -1);
-  }
-
-  public GeneratedContactPhoto(@NonNull String name, @DrawableRes int fallbackResId, int targetSize) {
-    this.name          = name;
-    this.fallbackResId = fallbackResId;
-    this.targetSize    = targetSize;
-  }
-
-  @Override
-  public Drawable asDrawable(@NonNull Context context, @NonNull AvatarColor color) {
-    return asDrawable(context, color,false);
-  }
-
-  @Override
-  public Drawable asDrawable(@NonNull Context context, @NonNull AvatarColor color, boolean inverted) {
-    int targetSize = this.targetSize > 0
-                     ? this.targetSize
-                     : context.getResources().getDimensionPixelSize(R.dimen.contact_photo_target_size);
-
-    String character = NameUtil.getAbbreviation(name);
-
-    if (!TextUtils.isEmpty(character)) {
-      Avatars.ForegroundColor foregroundColor = Avatars.getForegroundColor(color);
-      Avatar.Text             avatar          = new Avatar.Text(character, new Avatars.ColorPair(color, foregroundColor), Avatar.DatabaseId.DoNotPersist.INSTANCE);
-      Drawable                foreground      = AvatarRenderer.createTextDrawable(context, avatar, inverted, targetSize, false);
-      Drawable                background      = Objects.requireNonNull(ContextCompat.getDrawable(context, R.drawable.circle_tintable));
-
-      background.setColorFilter(new SimpleColorFilter(inverted ? foregroundColor.getColorInt() : color.colorInt()));
-
-      return new LayerDrawable(new Drawable[] { background, foreground });
-    }
-
-    return newFallbackDrawable(context, color, inverted);
-  }
-
-  @Override
-  public Drawable asSmallDrawable(@NonNull Context context, @NonNull AvatarColor color, boolean inverted) {
-    return asDrawable(context, color, inverted);
-  }
-
-  protected @DrawableRes int getFallbackResId() {
-    return fallbackResId;
-  }
-
-  protected Drawable newFallbackDrawable(@NonNull Context context, @NonNull AvatarColor color, boolean inverted) {
-    return new ResourceContactPhoto(fallbackResId).asDrawable(context, color, inverted);
-  }
-
-  @Override
-  public Drawable asCallCard(@NonNull Context context) {
-    return AppCompatResources.getDrawable(context, R.drawable.ic_person_large);
-
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java
index e2183bfc12..3834a11b0a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java
@@ -7,9 +7,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.signal.libsignal.protocol.util.ByteUtil;
 import org.thoughtcrime.securesms.database.model.ProfileAvatarFileDetails;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
 import org.thoughtcrime.securesms.recipients.Recipient;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java
deleted file mode 100644
index 500c43b14e..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.thoughtcrime.securesms.contacts.avatars;
-
-import android.content.Context;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
-import android.widget.ImageView;
-
-import androidx.annotation.DrawableRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.content.res.AppCompatResources;
-import androidx.core.content.ContextCompat;
-
-import com.makeramen.roundedimageview.RoundedDrawable;
-
-import org.jetbrains.annotations.NotNull;
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.conversation.colors.AvatarColor;
-import org.thoughtcrime.securesms.conversation.colors.AvatarColorPair;
-
-import java.util.Objects;
-
-public class ResourceContactPhoto implements FallbackContactPhoto {
-
-  private final int resourceId;
-  private final int smallResourceId;
-  private final int callCardResourceId;
-
-  private ImageView.ScaleType scaleType = ImageView.ScaleType.CENTER;
-
-  public ResourceContactPhoto(@DrawableRes int resourceId) {
-    this(resourceId, resourceId, resourceId);
-  }
-
-  public ResourceContactPhoto(@DrawableRes int resourceId, @DrawableRes int smallResourceId) {
-    this(resourceId, smallResourceId, resourceId);
-  }
-
-  public ResourceContactPhoto(@DrawableRes int resourceId, @DrawableRes int smallResourceId, @DrawableRes int callCardResourceId) {
-    this.resourceId         = resourceId;
-    this.callCardResourceId = callCardResourceId;
-    this.smallResourceId    = smallResourceId;
-  }
-
-  public void setScaleType(@NonNull ImageView.ScaleType scaleType) {
-    this.scaleType = scaleType;
-  }
-
-  @Override
-  public @NonNull Drawable asDrawable(@NonNull Context context, @NonNull AvatarColor color) {
-    return asDrawable(context, color, false);
-  }
-
-  @Override
-  public @NonNull Drawable asDrawable(@NonNull Context context, @NonNull AvatarColor color, boolean inverted) {
-    return buildDrawable(context, resourceId, color, inverted);
-  }
-
-  @Override
-  public @NonNull Drawable asSmallDrawable(@NonNull Context context, @NonNull AvatarColor color, boolean inverted) {
-    return buildDrawable(context, smallResourceId, color, inverted);
-  }
-
-  private @NonNull Drawable buildDrawable(@NonNull Context context, int resourceId, @NonNull AvatarColor color, boolean inverted) {
-    AvatarColorPair avatarColorPair = AvatarColorPair.create(context, color);
-
-    final int backgroundColor = avatarColorPair.getBackgroundColor();
-    final int foregroundColor = avatarColorPair.getForegroundColor();
-
-    Drawable        background = Objects.requireNonNull(ContextCompat.getDrawable(context, R.drawable.circle_tintable));
-    RoundedDrawable foreground = (RoundedDrawable) RoundedDrawable.fromDrawable(AppCompatResources.getDrawable(context, resourceId));
-
-    //noinspection ConstantConditions
-    foreground.setScaleType(scaleType);
-    background.setColorFilter(inverted ? foregroundColor : backgroundColor, PorterDuff.Mode.SRC_IN);
-    foreground.setColorFilter(inverted ? backgroundColor : foregroundColor, PorterDuff.Mode.SRC_ATOP);
-
-    return new ExpandingLayerDrawable(new Drawable[] {background, foreground});
-  }
-
-  @Override
-  public @Nullable Drawable asCallCard(@NotNull @NonNull Context context) {
-    return AppCompatResources.getDrawable(context, callCardResourceId);
-  }
-
-  private static class ExpandingLayerDrawable extends LayerDrawable {
-    public ExpandingLayerDrawable(@NonNull Drawable[] layers) {
-      super(layers);
-    }
-
-    @Override
-    public int getIntrinsicWidth() {
-      return -1;
-    }
-
-    @Override
-    public int getIntrinsicHeight() {
-      return -1;
-    }
-  }
-
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java
deleted file mode 100644
index 2a452af5e1..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.thoughtcrime.securesms.contacts.avatars;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-
-import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
-
-import com.makeramen.roundedimageview.RoundedDrawable;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.conversation.colors.AvatarColor;
-
-public class TransparentContactPhoto implements FallbackContactPhoto {
-
-  public TransparentContactPhoto() {}
-
-  @Override
-  public Drawable asDrawable(@NonNull Context context, @NonNull AvatarColor color) {
-    return asDrawable(context, color, false);
-  }
-
-  @Override
-  public Drawable asDrawable(@NonNull Context context, @NonNull AvatarColor color, boolean inverted) {
-    return RoundedDrawable.fromDrawable(context.getResources().getDrawable(android.R.color.transparent));
-  }
-
-  @Override
-  public Drawable asSmallDrawable(@NonNull Context context, @NonNull AvatarColor color, boolean inverted) {
-    return asDrawable(context, color, inverted);
-  }
-
-  @Override
-  public Drawable asCallCard(@NonNull Context context) {
-    return ContextCompat.getDrawable(context, R.drawable.symbol_person_display_40);
-  }
-
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/management/ContactsManagementRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/management/ContactsManagementRepository.kt
index 4b73367c85..4c2a8c9472 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/management/ContactsManagementRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/management/ContactsManagementRepository.kt
@@ -5,7 +5,7 @@ import androidx.annotation.CheckResult
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.RotateProfileKeyJob
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientUtil
@@ -36,7 +36,7 @@ class ContactsManagementRepository(context: Context) {
       val rotateProfileKey = !recipient.hasGroupsInCommon
       SignalDatabase.recipients.markHidden(recipient.id, rotateProfileKey, false)
       if (rotateProfileKey) {
-        ApplicationDependencies.getJobManager().add(RotateProfileKeyJob())
+        AppDependencies.jobManager.add(RotateProfileKeyJob())
       }
     }.subscribeOn(Schedulers.io())
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter.kt
index dea414d827..193d622fed 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchAdapter.kt
@@ -13,8 +13,8 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.disposables.Disposable
 import org.signal.core.util.BreakIteratorCompat
-import org.signal.core.util.dp
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatar
 import org.thoughtcrime.securesms.avatar.view.AvatarView
 import org.thoughtcrime.securesms.badges.BadgeImageView
 import org.thoughtcrime.securesms.components.AvatarImageView
@@ -24,8 +24,6 @@ import org.thoughtcrime.securesms.components.emoji.EmojiUtil
 import org.thoughtcrime.securesms.components.menu.ActionItem
 import org.thoughtcrime.securesms.components.menu.SignalContextMenu
 import org.thoughtcrime.securesms.contacts.LetterHeaderDecoration
-import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto
-import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto
 import org.thoughtcrime.securesms.database.model.DistributionListPrivacyMode
 import org.thoughtcrime.securesms.database.model.StoryViewState
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -123,7 +121,7 @@ open class ContactSearchAdapter(
       return MappingModelList(
         contactSearchData.filterNotNull().map {
           when (it) {
-            is ContactSearchData.Story -> StoryModel(it, selection.contains(it.contactSearchKey), SignalStore.storyValues().userHasBeenNotifiedAboutStories)
+            is ContactSearchData.Story -> StoryModel(it, selection.contains(it.contactSearchKey), SignalStore.story.userHasBeenNotifiedAboutStories)
             is ContactSearchData.KnownRecipient -> RecipientModel(it, selection.contains(it.contactSearchKey), it.shortSummary)
             is ContactSearchData.Expand -> ExpandModel(it)
             is ContactSearchData.Header -> HeaderModel(it)
@@ -243,10 +241,10 @@ open class ContactSearchAdapter(
 
     fun bindAvatar(model: StoryModel) {
       if (model.story.recipient.isMyStory) {
-        avatar.setFallbackPhotoProvider(MyStoryFallbackPhotoProvider(Recipient.self().getDisplayName(context), 40.dp))
+        avatar.setFallbackAvatarProvider(MyStoryFallbackAvatarProvider)
         avatar.displayProfileAvatar(Recipient.self())
       } else {
-        avatar.setFallbackPhotoProvider(Recipient.DEFAULT_FALLBACK_PHOTO_PROVIDER)
+        avatar.setFallbackAvatarProvider(null)
         avatar.displayChatAvatar(getRecipient(model))
       }
       groupStoryIndicator.visible = showStoryRing && model.story.recipient.isGroup
@@ -308,9 +306,14 @@ open class ContactSearchAdapter(
       }
     }
 
-    private class MyStoryFallbackPhotoProvider(private val name: String, private val targetSize: Int) : Recipient.FallbackPhotoProvider() {
-      override val photoForLocalNumber: FallbackContactPhoto
-        get() = GeneratedContactPhoto(name, R.drawable.symbol_person_40, targetSize)
+    private object MyStoryFallbackAvatarProvider : AvatarImageView.FallbackAvatarProvider {
+      override fun getFallbackAvatar(recipient: Recipient): FallbackAvatar {
+        if (recipient.isSelf) {
+          return FallbackAvatar.Resource.Person(recipient.avatarColor)
+        }
+
+        return super.getFallbackAvatar(recipient)
+      }
     }
 
     override fun onAttachedToWindow() {
@@ -507,7 +510,6 @@ open class ContactSearchAdapter(
     protected val name: FromTextView = itemView.findViewById(R.id.name)
     protected val number: TextView = itemView.findViewById(R.id.number)
     protected val label: TextView = itemView.findViewById(R.id.label)
-    protected val smsTag: View = itemView.findViewById(R.id.sms_tag)
     private val startAudio: View = itemView.findViewById(R.id.start_audio)
     private val startVideo: View = itemView.findViewById(R.id.start_video)
 
@@ -543,7 +545,6 @@ open class ContactSearchAdapter(
       bindAvatar(model)
       bindNumberField(model)
       bindLabelField(model)
-      bindSmsTagField(model)
       bindCallButtons(model)
     }
 
@@ -578,14 +579,6 @@ open class ContactSearchAdapter(
       label.visible = false
     }
 
-    protected open fun bindSmsTagField(model: T) {
-      smsTag.visible = when (displayOptions.displaySmsTag) {
-        DisplaySmsTag.DEFAULT -> isSmsContact(model)
-        DisplaySmsTag.IF_NOT_REGISTERED -> isNotRegistered(model)
-        DisplaySmsTag.NEVER -> false
-      }
-    }
-
     protected open fun bindLongPress(model: T) = Unit
 
     private fun bindCallButtons(model: T) {
@@ -607,14 +600,6 @@ open class ContactSearchAdapter(
       }
     }
 
-    private fun isSmsContact(model: T): Boolean {
-      return getRecipient(model).isUnregistered && !getRecipient(model).isDistributionList
-    }
-
-    private fun isNotRegistered(model: T): Boolean {
-      return getRecipient(model).isUnregistered && !getRecipient(model).isDistributionList
-    }
-
     abstract fun isSelected(model: T): Boolean
     abstract fun getData(model: T): D
     abstract fun getRecipient(model: T): Recipient
@@ -732,7 +717,13 @@ open class ContactSearchAdapter(
       val isLeftSelf = lhs?.isSelf == true
       val isRightSelf = rhs?.isSelf == true
 
-      return if (isLeftSelf == isRightSelf) 0 else if (isLeftSelf) 1 else -1
+      return if (isLeftSelf == isRightSelf) {
+        0
+      } else if (isLeftSelf) {
+        1
+      } else {
+        -1
+      }
     }
   }
 
@@ -742,12 +733,6 @@ open class ContactSearchAdapter(
     fun onDeletePrivateStory(story: ContactSearchData.Story, isSelected: Boolean)
   }
 
-  enum class DisplaySmsTag {
-    DEFAULT,
-    IF_NOT_REGISTERED,
-    NEVER
-  }
-
   /**
    * Whether or not we should display a recipient's 'about' or e164, if either are
    * available.
@@ -759,7 +744,6 @@ open class ContactSearchAdapter(
 
   data class DisplayOptions(
     val displayCheckBox: Boolean = false,
-    val displaySmsTag: DisplaySmsTag = DisplaySmsTag.NEVER,
     val displaySecondaryInformation: DisplaySecondaryInformation = DisplaySecondaryInformation.NEVER,
     val displayCallButtons: Boolean = false,
     val displayStoryRing: Boolean = false
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchMediator.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchMediator.kt
index 6731304e36..4ec13532f3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchMediator.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchMediator.kt
@@ -31,7 +31,6 @@ import java.util.concurrent.TimeUnit
  * @param fixedContacts Contacts which are "pre-selected" (for example, already a member of a group we're adding to)
  * @param selectionLimits [SelectionLimits] describing how large the result set can be.
  * @param displayCheckBox Whether or not to display checkboxes on items.
- * @param displaySmsTag   Whether or not to display the SMS tag on items.
  * @param displaySecondaryInformation Whether or not to display phone numbers on known contacts.
  * @param mapStateToConfiguration Maps a [ContactSearchState] to a [ContactSearchConfiguration]
  * @param callbacks Hooks to help process, filter, and react to selection
@@ -171,7 +170,7 @@ class ContactSearchMediator(
   }
 
   private fun toggleStorySelection(view: View, contactSearchData: ContactSearchData.Story, isSelected: Boolean) {
-    if (contactSearchData.recipient.isMyStory && !SignalStore.storyValues().userHasBeenNotifiedAboutStories) {
+    if (contactSearchData.recipient.isMyStory && !SignalStore.story.userHasBeenNotifiedAboutStories) {
       ChooseInitialMyStoryMembershipBottomSheetDialogFragment.show(fragment.childFragmentManager)
     } else {
       toggleSelection(view, contactSearchData, isSelected)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchPagedDataSourceRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchPagedDataSourceRepository.kt
index fc6978783c..b0541632d2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchPagedDataSourceRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchPagedDataSourceRepository.kt
@@ -30,7 +30,7 @@ open class ContactSearchPagedDataSourceRepository(
   private val context = context.applicationContext
 
   open fun getLatestStorySends(activeStoryCutoffDuration: Long): List<StorySend> {
-    return SignalStore.storyValues()
+    return SignalStore.story
       .getLatestActiveStorySendTimestamps(System.currentTimeMillis() - activeStoryCutoffDuration)
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/SafetyNumberRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/SafetyNumberRepository.kt
index cd4141c470..5ba1778e1f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/SafetyNumberRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/SafetyNumberRepository.kt
@@ -7,7 +7,7 @@ import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.concurrent.safeBlockingGet
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.crypto.storage.SignalIdentityKeyStore
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.IdentityUtil
@@ -20,8 +20,8 @@ import java.util.concurrent.TimeUnit
  * Generic repository for interacting with safety numbers and fetch new ones.
  */
 class SafetyNumberRepository(
-  private val profileService: ProfileService = ApplicationDependencies.getProfileService(),
-  private val aciIdentityStore: SignalIdentityKeyStore = ApplicationDependencies.getProtocolStore().aci().identities()
+  private val profileService: ProfileService = AppDependencies.profileService,
+  private val aciIdentityStore: SignalIdentityKeyStore = AppDependencies.protocolStore.aci().identities()
 ) {
 
   private val recentlyFetched: MutableMap<RecipientId, Long> = HashMap()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/CdsTemporaryErrorBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/CdsTemporaryErrorBottomSheet.kt
index 94ec589cd0..07c39f1145 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/CdsTemporaryErrorBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/CdsTemporaryErrorBottomSheet.kt
@@ -32,7 +32,7 @@ class CdsTemporaryErrorBottomSheet : FixedRoundedCornerBottomSheetDialogFragment
   }
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    val days: Int = (SignalStore.misc().cdsBlockedUtil - System.currentTimeMillis()).milliseconds.inWholeDays.toInt()
+    val days: Int = (SignalStore.misc.cdsBlockedUtil - System.currentTimeMillis()).milliseconds.inWholeDays.toInt()
     binding.timeText.text = resources.getQuantityString(R.plurals.CdsTemporaryErrorBottomSheet_body1, days, days)
 
     binding.learnMoreButton.setOnClickListener {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt
index ce85a6016e..8e492a41b5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt
@@ -12,7 +12,7 @@ import org.signal.core.util.StringUtil
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.database.RecipientTable
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.SyncSystemContactLinksJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.IncomingMessage
@@ -46,7 +46,7 @@ object ContactDiscovery {
   @Throws(IOException::class)
   @WorkerThread
   fun refreshAll(context: Context, notifyOfNewUsers: Boolean) {
-    if (TextUtils.isEmpty(SignalStore.account().e164)) {
+    if (TextUtils.isEmpty(SignalStore.account.e164)) {
       Log.w(TAG, "Have not yet set our own local number. Skipping.")
       return
     }
@@ -56,8 +56,8 @@ object ContactDiscovery {
       return
     }
 
-    if (!SignalStore.registrationValues().isRegistrationComplete) {
-      if (SignalStore.account().isRegistered && SignalStore.svr().lastPinCreateFailed()) {
+    if (!SignalStore.registration.isRegistrationComplete) {
+      if (SignalStore.account.isRegistered && SignalStore.svr.lastPinCreateFailed()) {
         Log.w(TAG, "Registration isn't complete, but only because PIN creation failed. Allowing CDS to continue.")
       } else {
         Log.w(TAG, "Registration is not yet complete. Skipping, but running a routine to possibly mark it complete.")
@@ -162,7 +162,7 @@ object ContactDiscovery {
     stopwatch.split("cds")
 
     if (hasContactsPermissions(context)) {
-      ApplicationDependencies.getJobManager().add(SyncSystemContactLinksJob())
+      AppDependencies.jobManager.add(SyncSystemContactLinksJob())
 
       val useFullSync = forceFullSystemContactSync || (removeSystemContactLinksIfMissing && result.registeredIds.size > FULL_SYSTEM_CONTACT_SYNC_THRESHOLD)
       syncRecipientsWithSystemContacts(
@@ -204,7 +204,7 @@ object ContactDiscovery {
   }
 
   private fun notifyNewUsers(context: Context, newUserIds: Collection<RecipientId>) {
-    if (!SignalStore.settings().isNotifyWhenContactJoinsSignal) return
+    if (!SignalStore.settings.isNotifyWhenContactJoinsSignal) return
 
     Recipient.resolvedList(newUserIds)
       .filter { !it.isSelf && it.hasAUserSetDisplayName(context) && !hasSession(it.id) && it.hasE164 }
@@ -218,7 +218,7 @@ object ContactDiscovery {
       .forEach { result ->
         val hour = Calendar.getInstance()[Calendar.HOUR_OF_DAY]
         if (hour in 9..22) {
-          ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(result.threadId))
+          AppDependencies.messageNotifier.updateNotification(context, ConversationId.forConversation(result.threadId))
         } else {
           Log.i(TAG, "Not notifying of a new user due to the time of day. (Hour: $hour)")
         }
@@ -238,7 +238,7 @@ object ContactDiscovery {
     contactsProvider: () -> ContactIterator = { SystemContactsRepository.getAllSystemContacts(context, phoneNumberFormatter(context)) },
     clearInfoForMissingContacts: Boolean
   ) {
-    val localNumber: String = SignalStore.account().e164 ?: ""
+    val localNumber: String = SignalStore.account.e164 ?: ""
     val handle = SignalDatabase.recipients.beginBulkSystemContactUpdate(clearInfoForMissingContacts)
     try {
       contactsProvider().use { iterator ->
@@ -301,8 +301,8 @@ object ContactDiscovery {
 
     val protocolAddress = Recipient.resolved(id).requireServiceId().toProtocolAddress(SignalServiceAddress.DEFAULT_DEVICE_ID)
 
-    return ApplicationDependencies.getProtocolStore().aci().containsSession(protocolAddress) ||
-      ApplicationDependencies.getProtocolStore().pni().containsSession(protocolAddress)
+    return AppDependencies.protocolStore.aci().containsSession(protocolAddress) ||
+      AppDependencies.protocolStore.pni().containsSession(protocolAddress)
   }
 
   class RefreshResult(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt
index 4036d3f6d2..f4f283ea21 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt
@@ -10,12 +10,12 @@ import org.thoughtcrime.securesms.contacts.sync.FuzzyPhoneNumberHelper.InputResu
 import org.thoughtcrime.securesms.contacts.sync.FuzzyPhoneNumberHelper.OutputResult
 import org.thoughtcrime.securesms.database.RecipientTable.CdsV2Result
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.whispersystems.signalservice.api.push.exceptions.CdsiInvalidTokenException
 import org.whispersystems.signalservice.api.push.exceptions.CdsiResourceExhaustedException
 import org.whispersystems.signalservice.api.services.CdsiV2Service
@@ -91,20 +91,20 @@ object ContactDiscoveryRefreshV2 {
   @Synchronized
   fun lookupE164(e164: String): ContactDiscovery.LookupResult? {
     val response: CdsiV2Service.Response = try {
-      ApplicationDependencies.getSignalServiceAccountManager().getRegisteredUsersWithCdsi(
+      AppDependencies.signalServiceAccountManager.getRegisteredUsersWithCdsi(
         emptySet(),
         setOf(e164),
         SignalDatabase.recipients.getAllServiceIdProfileKeyPairs(),
         Optional.empty(),
         BuildConfig.CDSI_MRENCLAVE,
         10_000,
-        if (FeatureFlags.useLibsignalNetForCdsiLookup()) ApplicationDependencies.getLibsignalNetwork() else null
+        if (RemoteConfig.useLibsignalNetForCdsiLookup) AppDependencies.libsignalNetwork else null
       ) {
         Log.i(TAG, "Ignoring token for one-off lookup.")
       }
     } catch (e: CdsiResourceExhaustedException) {
       Log.w(TAG, "CDS resource exhausted! Can try again in ${e.retryAfterSeconds} seconds.")
-      SignalStore.misc().cdsBlockedUtil = System.currentTimeMillis() + e.retryAfterSeconds.seconds.inWholeMilliseconds
+      SignalStore.misc.cdsBlockedUtil = System.currentTimeMillis() + e.retryAfterSeconds.seconds.inWholeMilliseconds
       throw e
     } catch (e: CdsiInvalidTokenException) {
       Log.w(TAG, "We did not provide a token, but still got a token error! Unexpected, but ignoring.")
@@ -133,7 +133,7 @@ object ContactDiscoveryRefreshV2 {
     val tag = "refreshInternal-v2"
     val stopwatch = Stopwatch(tag)
 
-    val previousE164s: Set<String> = if (SignalStore.misc().cdsToken != null && !isPartialRefresh) inputPreviousE164s else emptySet()
+    val previousE164s: Set<String> = if (SignalStore.misc.cdsToken != null && !isPartialRefresh) inputPreviousE164s else emptySet()
 
     val allE164s: Set<String> = recipientE164s + systemE164s
     val newRawE164s: Set<String> = allE164s - previousE164s
@@ -145,29 +145,29 @@ object ContactDiscoveryRefreshV2 {
       return ContactDiscovery.RefreshResult(emptySet(), emptyMap())
     }
 
-    if (newE164s.size > FeatureFlags.cdsHardLimit()) {
-      Log.w(TAG, "[$tag] Number of new contacts (${newE164s.size.roundedString()} > hard limit (${FeatureFlags.cdsHardLimit()}! Failing and marking ourselves as permanently blocked.")
-      SignalStore.misc().markCdsPermanentlyBlocked()
+    if (newE164s.size > RemoteConfig.cdsHardLimit) {
+      Log.w(TAG, "[$tag] Number of new contacts (${newE164s.size.roundedString()} > hard limit (${RemoteConfig.cdsHardLimit}! Failing and marking ourselves as permanently blocked.")
+      SignalStore.misc.markCdsPermanentlyBlocked()
       throw IOException("New contacts over the CDS hard limit!")
     }
 
-    val token: ByteArray? = if (previousE164s.isNotEmpty() && !isPartialRefresh) SignalStore.misc().cdsToken else null
+    val token: ByteArray? = if (previousE164s.isNotEmpty() && !isPartialRefresh) SignalStore.misc.cdsToken else null
 
     stopwatch.split("preamble")
 
     val response: CdsiV2Service.Response = try {
-      ApplicationDependencies.getSignalServiceAccountManager().getRegisteredUsersWithCdsi(
+      AppDependencies.signalServiceAccountManager.getRegisteredUsersWithCdsi(
         previousE164s,
         newE164s,
         SignalDatabase.recipients.getAllServiceIdProfileKeyPairs(),
         Optional.ofNullable(token),
         BuildConfig.CDSI_MRENCLAVE,
         timeoutMs,
-        if (FeatureFlags.useLibsignalNetForCdsiLookup()) ApplicationDependencies.getLibsignalNetwork() else null
+        if (RemoteConfig.useLibsignalNetForCdsiLookup) AppDependencies.libsignalNetwork else null
       ) { tokenToSave ->
         stopwatch.split("network-pre-token")
         if (!isPartialRefresh) {
-          SignalStore.misc().cdsToken = tokenToSave
+          SignalStore.misc.cdsToken = tokenToSave
           SignalDatabase.cds.updateAfterFullCdsQuery(previousE164s + newE164s, allE164s + newE164s)
           Log.d(TAG, "Token saved!")
         } else {
@@ -178,18 +178,18 @@ object ContactDiscoveryRefreshV2 {
       }
     } catch (e: CdsiResourceExhaustedException) {
       Log.w(TAG, "CDS resource exhausted! Can try again in ${e.retryAfterSeconds} seconds.")
-      SignalStore.misc().cdsBlockedUtil = System.currentTimeMillis() + e.retryAfterSeconds.seconds.inWholeMilliseconds
+      SignalStore.misc.cdsBlockedUtil = System.currentTimeMillis() + e.retryAfterSeconds.seconds.inWholeMilliseconds
       throw e
     } catch (e: CdsiInvalidTokenException) {
       Log.w(TAG, "Our token was invalid! Only thing we can do now is clear our local state :(")
-      SignalStore.misc().cdsToken = null
+      SignalStore.misc.cdsToken = null
       SignalDatabase.cds.clearAll()
       throw e
     }
 
-    if (!isPartialRefresh && SignalStore.misc().isCdsBlocked) {
+    if (!isPartialRefresh && SignalStore.misc.isCdsBlocked) {
       Log.i(TAG, "Successfully made a request while blocked -- clearing blocked state.")
-      SignalStore.misc().clearCdsBlocked()
+      SignalStore.misc.clearCdsBlocked()
     }
 
     Log.d(TAG, "[$tag] Used ${response.quotaUsedDebugOnly} quota.")
@@ -226,7 +226,7 @@ object ContactDiscoveryRefreshV2 {
   }
 
   private fun hasCommunicatedWith(recipient: Recipient): Boolean {
-    val localAci = SignalStore.account().requireAci()
+    val localAci = SignalStore.account.requireAci()
     return SignalDatabase.threads.hasActiveThread(recipient.id) || (recipient.hasServiceId && SignalDatabase.sessions.hasSessionFor(localAci, recipient.requireServiceId().toString()))
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java
index 2d61ec3b68..36f50ab5fd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java
@@ -160,7 +160,7 @@ public static class Name implements Parcelable {
     @JsonProperty
     private final String middleName;
 
-    Name(@JsonProperty("displayName") @Nullable String displayName,
+    public Name(@JsonProperty("displayName") @Nullable String displayName,
          @JsonProperty("givenName")   @Nullable String givenName,
          @JsonProperty("familyName")  @Nullable String familyName,
          @JsonProperty("prefix")      @Nullable String prefix,
@@ -254,9 +254,9 @@ public static class Phone implements Selectable, Parcelable {
     @JsonIgnore
     private boolean selected;
 
-    Phone(@JsonProperty("number") @NonNull  String number,
-          @JsonProperty("type")   @NonNull  Type   type,
-          @JsonProperty("label")  @Nullable String label)
+    public Phone(@JsonProperty("number") @NonNull  String number,
+                 @JsonProperty("type")   @NonNull  Type   type,
+                 @JsonProperty("label")  @Nullable String label)
     {
       this.number   = number;
       this.type     = type;
@@ -333,9 +333,9 @@ public static class Email implements Selectable, Parcelable {
     @JsonIgnore
     private boolean selected;
 
-    Email(@JsonProperty("email") @NonNull  String email,
-          @JsonProperty("type")  @NonNull  Type   type,
-          @JsonProperty("label") @Nullable String label)
+    public Email(@JsonProperty("email") @NonNull  String email,
+                 @JsonProperty("type")  @NonNull  Type   type,
+                 @JsonProperty("label") @Nullable String label)
     {
       this.email    = email;
       this.type     = type;
@@ -430,15 +430,15 @@ public static class PostalAddress implements Selectable, Parcelable {
     @JsonIgnore
     private boolean selected;
 
-    PostalAddress(@JsonProperty("type")         @NonNull  Type   type,
-                  @JsonProperty("label")        @Nullable String label,
-                  @JsonProperty("street")       @Nullable String street,
-                  @JsonProperty("poBox")        @Nullable String poBox,
-                  @JsonProperty("neighborhood") @Nullable String neighborhood,
-                  @JsonProperty("city")         @Nullable String city,
-                  @JsonProperty("region")       @Nullable String region,
-                  @JsonProperty("postalCode")   @Nullable String postalCode,
-                  @JsonProperty("country")      @Nullable String country)
+    public PostalAddress(@JsonProperty("type")         @NonNull  Type   type,
+                         @JsonProperty("label")        @Nullable String label,
+                         @JsonProperty("street")       @Nullable String street,
+                         @JsonProperty("poBox")        @Nullable String poBox,
+                         @JsonProperty("neighborhood") @Nullable String neighborhood,
+                         @JsonProperty("city")         @Nullable String city,
+                         @JsonProperty("region")       @Nullable String region,
+                         @JsonProperty("postalCode")   @Nullable String postalCode,
+                         @JsonProperty("country")      @Nullable String country)
     {
       this.type         = type;
       this.label        = label;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java
index 7e3a31cf45..5b2c32f5f9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java
@@ -25,7 +25,7 @@
 import org.thoughtcrime.securesms.PassphraseRequiredActivity;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.RecipientTable;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
 import org.thoughtcrime.securesms.recipients.LiveRecipient;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -243,7 +243,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     super.onActivityResult(requestCode, resultCode, data);
 
     if (requestCode == CODE_ADD_EDIT_CONTACT && contact != null) {
-      ApplicationDependencies.getJobManager().add(new DirectoryRefreshJob(false));
+      AppDependencies.getJobManager().add(new DirectoryRefreshJob(false));
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationHeaderView.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationHeaderView.java
index 6c8b804dfe..1c158eddb5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationHeaderView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationHeaderView.java
@@ -21,8 +21,6 @@
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
-import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.databinding.ConversationHeaderViewBinding;
 import org.thoughtcrime.securesms.fonts.SignalSymbols;
@@ -50,8 +48,6 @@ public ConversationHeaderView(Context context, AttributeSet attrs, int defStyleA
     inflate(getContext(), R.layout.conversation_header_view, this);
 
     binding = ConversationHeaderViewBinding.bind(this);
-
-    binding.messageRequestAvatar.setFallbackPhotoProvider(new FallbackPhotoProvider());
   }
 
   public void setBadge(@Nullable Recipient recipient) {
@@ -197,21 +193,4 @@ private void updateOutlineVisibility() {
         .append(SpanUtil.space(8, DimensionUnit.SP))
         .append(input);
   }
-
-  private static final class FallbackPhotoProvider extends Recipient.FallbackPhotoProvider {
-    @Override
-    public @NonNull FallbackContactPhoto getPhotoForRecipientWithoutName() {
-      return new ResourceContactPhoto(R.drawable.ic_profile_64);
-    }
-
-    @Override
-    public @NonNull FallbackContactPhoto getPhotoForGroup() {
-      return new ResourceContactPhoto(R.drawable.ic_group_64);
-    }
-
-    @Override
-    public @NonNull FallbackContactPhoto getPhotoForLocalNumber() {
-      return new ResourceContactPhoto(R.drawable.ic_note_64);
-    }
-  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
index a44dbd1395..b27d29b423 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -72,7 +72,6 @@
 import org.thoughtcrime.securesms.BindableConversationItem;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.attachments.Attachment;
-import org.thoughtcrime.securesms.attachments.AttachmentId;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.badges.BadgeImageView;
 import org.thoughtcrime.securesms.calls.links.CallLinkJoinButton;
@@ -106,11 +105,11 @@
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.Quote;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.database.model.databaseprotos.MessageExtras;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.events.PartProgressEvent;
 import org.thoughtcrime.securesms.giph.mp4.GiphyMp4PlaybackPolicy;
 import org.thoughtcrime.securesms.giph.mp4.GiphyMp4PlaybackPolicyEnforcer;
-import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
@@ -132,7 +131,7 @@
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.revealable.ViewOnceMessageView;
 import org.thoughtcrime.securesms.util.DateUtils;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.InterceptableLongClickCopyLinkSpan;
 import org.thoughtcrime.securesms.util.LongClickMovementMethod;
 import org.thoughtcrime.securesms.util.MediaUtil;
@@ -250,6 +249,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
   private final Rect                            thumbnailMaskingRect            = new Rect();
   private final TouchDelegateChangedListener    touchDelegateChangedListener    = new TouchDelegateChangedListener();
   private final DoubleTapEditTouchListener      doubleTapEditTouchListener      = new DoubleTapEditTouchListener();
+  private final PaymentTombstoneClickListener   paymentTombstoneClickListener   = new PaymentTombstoneClickListener();
 
   private final Context context;
 
@@ -1026,7 +1026,7 @@ private void setBodyText(@NonNull MessageRecord messageRecord,
       bodyText.setText(italics);
       bodyText.setVisibility(View.VISIBLE);
       bodyText.setOverflowText(null);
-    } else if (isCaptionlessMms(messageRecord) || isStoryReaction(messageRecord) || isGiftMessage(messageRecord) || messageRecord.isPaymentNotification()) {
+    } else if (isCaptionlessMms(messageRecord) || isStoryReaction(messageRecord) || isGiftMessage(messageRecord) || messageRecord.isPaymentNotification() || messageRecord.isPaymentTombstone()) {
       bodyText.setText(null);
       bodyText.setOverflowText(null);
       bodyText.setVisibility(View.GONE);
@@ -1148,7 +1148,7 @@ private void setMediaAttributes(@NonNull MessageRecord messageRecord,
       //noinspection ConstantConditions
       LinkPreview linkPreview = ((MmsMessageRecord) messageRecord).getLinkPreviews().get(0);
 
-      if (FeatureFlags.adHocCalling()) {
+      if (RemoteConfig.adHocCalling()) {
         CallLinkRootKey callLinkRootKey = CallLinks.parseUrl(linkPreview.getUrl());
         if (callLinkRootKey != null) {
           joinCallLinkStub.setVisibility(View.VISIBLE);
@@ -1372,8 +1372,28 @@ private void setMediaAttributes(@NonNull MessageRecord messageRecord,
       MmsMessageRecord mediaMmsMessageRecord = (MmsMessageRecord) messageRecord;
 
       paymentViewStub.setVisibility(View.VISIBLE);
+      paymentViewStub.get().setOnTombstoneClickListener(paymentTombstoneClickListener);
       paymentViewStub.get().bindPayment(conversationRecipient.get(), Objects.requireNonNull(mediaMmsMessageRecord.getPayment()), colorizer);
 
+      footer.setVisibility(VISIBLE);
+    } else if (messageRecord.isPaymentTombstone()) {
+      if (mediaThumbnailStub.resolved()) mediaThumbnailStub.require().setVisibility(GONE);
+      if (audioViewStub.resolved()) audioViewStub.get().setVisibility(GONE);
+      if (documentViewStub.resolved()) documentViewStub.get().setVisibility(GONE);
+      if (sharedContactStub.resolved()) sharedContactStub.get().setVisibility(GONE);
+      if (linkPreviewStub.resolved()) linkPreviewStub.get().setVisibility(GONE);
+      if (stickerStub.resolved()) stickerStub.get().setVisibility(GONE);
+      if (revealableStub.resolved()) revealableStub.get().setVisibility(GONE);
+      if (joinCallLinkStub.resolved()) joinCallLinkStub.get().setVisibility(View.GONE);
+
+      MmsMessageRecord mediaMmsMessageRecord = (MmsMessageRecord) messageRecord;
+
+      paymentViewStub.setVisibility(View.VISIBLE);
+      paymentViewStub.get().setOnTombstoneClickListener(paymentTombstoneClickListener);
+      MessageExtras messageExtras = mediaMmsMessageRecord.getMessageExtras();
+
+      paymentViewStub.get().bindPaymentTombstone(mediaMmsMessageRecord.isOutgoing(), conversationRecipient.get(), messageExtras == null ? null : messageExtras.paymentTombstone, colorizer);
+
       footer.setVisibility(VISIBLE);
     } else {
       if (mediaThumbnailStub.resolved()) mediaThumbnailStub.require().setVisibility(View.GONE);
@@ -1705,7 +1725,7 @@ private void setFooter(@NonNull MessageRecord current, @NonNull Optional<Message
       if (MessageRecordUtil.isEditMessage(current)) {
         activeFooter.getDateView().setOnClickListener(v -> {
           if (eventListener != null) {
-            eventListener.onEditedIndicatorClicked(current);
+            eventListener.onEditedIndicatorClicked(conversationMessage);
           }
         });
       } else {
@@ -2283,6 +2303,16 @@ public void invalidateChatColorsDrawable(@NonNull ViewGroup coordinateRoot) {
     return null;
   }
 
+  private class PaymentTombstoneClickListener implements View.OnClickListener {
+    @Override
+    public void onClick(View v) {
+      if (eventListener != null) {
+        eventListener.onPaymentTombstoneClicked();
+      } else {
+        passthroughClickListener.onClick(v);
+      }
+    }
+  }
   private class SharedContactEventListener implements SharedContactView.EventListener {
     @Override
     public void onAddToContactsClicked(@NonNull Contact contact) {
@@ -2399,10 +2429,7 @@ public void onClick(View v, final List<Slide> slides) {
         Log.i(TAG, "Scheduling push attachment downloads for " + slides.size() + " items");
 
         for (Slide slide : slides) {
-          ApplicationDependencies.getJobManager().add(new AttachmentDownloadJob(messageRecord.getId(),
-                                                                                ((DatabaseAttachment) slide.asAttachment()).attachmentId,
-                                                                                true,
-                                                                                false));
+          AttachmentDownloadJob.downloadAttachmentIfNeeded((DatabaseAttachment) slide.asAttachment());
         }
       }
     }
@@ -2415,22 +2442,12 @@ private class PlayVideoClickListener implements SlideClickListener {
 
     @Override
     public void onClick(View v, Slide slide) {
-      if (messageRecord.isOutgoing()) {
-        Log.d(TAG, "Video player button for outgoing slide clicked.");
-        return;
-      }
       if (MediaUtil.isInstantVideoSupported(slide)) {
         final DatabaseAttachment databaseAttachment = (DatabaseAttachment) slide.asAttachment();
-        if (databaseAttachment.transferState != AttachmentTable.TRANSFER_PROGRESS_STARTED) {
-          final AttachmentId attachmentId = databaseAttachment.attachmentId;
-          final JobManager   jobManager   = ApplicationDependencies.getJobManager();
-          final String       queue        = AttachmentDownloadJob.constructQueueString(attachmentId);
+        String jobId = AttachmentDownloadJob.downloadAttachmentIfNeeded(databaseAttachment);
+        if (jobId != null) {
           setup(v, slide);
-          jobManager.add(new AttachmentDownloadJob(messageRecord.getId(),
-                                                   attachmentId,
-                                                   true,
-                                                   false));
-          jobManager.addListener(queue, (job, jobState) -> {
+          AppDependencies.getJobManager().addListener(jobId, (job, jobState) -> {
             if (jobState.isComplete()) {
               cleanup();
             }
@@ -2506,7 +2523,8 @@ public void onClick(final View v, final Slide slide) {
         performClick();
       } else if (!canPlayContent && mediaItem != null && eventListener != null) {
         eventListener.onPlayInlineContent(conversationMessage);
-      } else if (MediaPreviewV2Fragment.isContentTypeSupported(slide.getContentType()) && slide.getUri() != null) {
+      } else if (MediaPreviewV2Fragment.isContentTypeSupported(slide.getContentType()) && slide.getDisplayUri() != null) {
+        AttachmentDownloadJob.downloadAttachmentIfNeeded((DatabaseAttachment) slide.asAttachment());
         launchMediaPreview(v, slide);
       } else if (slide.getUri() != null) {
         Log.i(TAG, "Clicked: " + slide.getUri() + " , " + slide.getContentType());
@@ -2550,8 +2568,7 @@ private void launchMediaPreview(View v, Slide slide) {
       return;
     }
 
-    Uri mediaUri = slide.getUri();
-
+    Uri mediaUri = slide.getDisplayUri();
     if (mediaUri == null) {
       Log.w(TAG, "Could not launch media preview for item: uri was null");
       return;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
index baba788dec..bd58587348 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
@@ -565,7 +565,7 @@ public boolean applyTouchEvent(@NonNull MotionEvent motionEvent) {
   }
 
   private void setupSelectedEmoji() {
-    final List<String> emojis   = SignalStore.emojiValues().getReactions();
+    final List<String> emojis   = SignalStore.emoji().getReactions();
     final String       oldEmoji = getOldEmoji(messageRecord);
 
     if (oldEmoji == null) {
@@ -603,13 +603,13 @@ private void setupSelectedEmoji() {
           view.setImageEmoji(oldEmoji);
           view.setTag(oldEmoji);
         } else {
-          view.setImageEmoji(SignalStore.emojiValues().getPreferredVariation(emojis.get(i)));
+          view.setImageEmoji(SignalStore.emoji().getPreferredVariation(emojis.get(i)));
         }
       } else if (isAtCustomIndex) {
         view.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_any_emoji_32));
         view.setTag(null);
       } else {
-        view.setImageEmoji(SignalStore.emojiValues().getPreferredVariation(emojis.get(i)));
+        view.setImageEmoji(SignalStore.emoji().getPreferredVariation(emojis.get(i)));
       }
     }
   }
@@ -675,7 +675,7 @@ private void handleUpEvent() {
       if (selected == customEmojiIndex) {
         onReactionSelectedListener.onCustomReactionSelected(messageRecord, emojiViews[selected].getTag() != null);
       } else {
-        onReactionSelectedListener.onReactionSelected(messageRecord, SignalStore.emojiValues().getPreferredVariation(SignalStore.emojiValues().getReactions().get(selected)));
+        onReactionSelectedListener.onReactionSelected(messageRecord, SignalStore.emoji().getPreferredVariation(SignalStore.emoji().getReactions().get(selected)));
       }
     } else {
       hide();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationRepository.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationRepository.java
index 763efeefd8..780541a71b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationRepository.java
@@ -13,7 +13,7 @@
 import org.thoughtcrime.securesms.database.ThreadTable;
 import org.thoughtcrime.securesms.database.model.GroupRecord;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.MultiDeviceViewedUpdateJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.mms.PartAuthority;
@@ -41,7 +41,7 @@ public class ConversationRepository {
   private final Context  context;
 
   public ConversationRepository() {
-    this.context = ApplicationDependencies.getApplication();
+    this.context = AppDependencies.getApplication();
   }
 
   @WorkerThread
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
index 233629c16d..e04a2a9698 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
@@ -15,8 +15,6 @@
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 
-import com.annimon.stream.Collectors;
-import com.annimon.stream.Stream;
 import com.bumptech.glide.RequestManager;
 
 import org.thoughtcrime.securesms.R;
@@ -176,6 +174,11 @@ public void setVerified(boolean verified) {
     updateVerifiedSubtitleVisibility();
   }
 
+  public void setGroupRecipientSubtitle(@Nullable String members) {
+    this.subtitle.setText(members);
+    updateSubtitleVisibility();
+  }
+
   private void setComposeTitle() {
     this.title.setText(R.string.ConversationActivity_compose_message);
     this.subtitle.setText(null);
@@ -190,15 +193,6 @@ private void setRecipientTitle(@NonNull Recipient recipient) {
 
   private void setGroupRecipientTitle(@NonNull Recipient recipient) {
     this.title.setText(recipient.getDisplayName(getContext()));
-    this.subtitle.setText(Stream.of(recipient.getParticipantIds())
-                                .limit(10)
-                                .map(Recipient::resolved)
-                                .sorted((a, b) -> Boolean.compare(a.isSelf(), b.isSelf()))
-                                .map(r -> r.isSelf() ? getResources().getString(R.string.ConversationTitleView_you)
-                                                     : r.getDisplayName(getContext()))
-                                .collect(Collectors.joining(", ")));
-
-    updateSubtitleVisibility();
   }
 
   private void setSelfTitle() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
index 5c696cdc85..bc2fbf0fc3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
@@ -550,7 +550,7 @@ private void present(@NonNull ConversationMessage conversationMessage,
           eventListener.onBlockJoinRequest(conversationMessage.getMessageRecord().getFromRecipient());
         }
       });
-    } else if (conversationMessage.getMessageRecord().isPaymentsRequestToActivate() && !conversationMessage.getMessageRecord().isOutgoing() && !SignalStore.paymentsValues().mobileCoinPaymentsEnabled()) {
+    } else if (conversationMessage.getMessageRecord().isPaymentsRequestToActivate() && !conversationMessage.getMessageRecord().isOutgoing() && !SignalStore.payments().mobileCoinPaymentsEnabled()) {
       actionButton.setText(R.string.ConversationUpdateItem_activate_payments);
       actionButton.setVisibility(VISIBLE);
       actionButton.setOnClickListener(v -> {
@@ -574,6 +574,14 @@ private void present(@NonNull ConversationMessage conversationMessage,
           eventListener.onReportSpamLearnMoreClicked();
         }
       });
+    } else if (conversationMessage.getMessageRecord().isProfileChange() && !conversationMessage.getMessageRecord().getFromRecipient().isSelf()) {
+      actionButton.setText(R.string.ConversationUpdateItem_update);
+      actionButton.setVisibility(VISIBLE);
+      actionButton.setOnClickListener(v -> {
+        if (batchSelected.isEmpty() && eventListener != null) {
+          eventListener.onChangeProfileNameUpdateContact(conversationMessage.getMessageRecord().getFromRecipient());
+        }
+      });
     } else if (conversationMessage.getMessageRecord().isMessageRequestAccepted()) {
       actionButton.setText(R.string.ConversationUpdateItem_options);
       actionButton.setVisibility(VISIBLE);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/MarkReadHelper.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/MarkReadHelper.java
index b2d747cca3..f6bdc55b64 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/MarkReadHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/MarkReadHelper.java
@@ -22,7 +22,7 @@
 import org.thoughtcrime.securesms.database.ThreadTable;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.ReactionRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.notifications.MarkReadReceiver;
 import org.thoughtcrime.securesms.notifications.v2.ConversationId;
 import org.thoughtcrime.securesms.util.Debouncer;
@@ -66,7 +66,7 @@ public void onViewsRevealed(long timestamp) {
 
         Log.d(TAG, "Marking " + infos.size() + " messages as read.");
 
-        ApplicationDependencies.getMessageNotifier().updateNotification(context);
+        AppDependencies.getMessageNotifier().updateNotification(context);
         MarkReadReceiver.process(infos);
         MarkReadReceiver.processCallEvents(Collections.singletonList(conversationId), timestamp);
       });
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/MenuState.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/MenuState.java
index 7ae2eb2fce..ce2f24e7ca 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/MenuState.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/MenuState.java
@@ -135,7 +135,7 @@ public static MenuState getMenuState(@NonNull Recipient conversationRecipient,
         hasGift = true;
       }
 
-      if (messageRecord.isPaymentNotification()) {
+      if (messageRecord.isPaymentNotification() || messageRecord.isPaymentTombstone()) {
         hasPayment = true;
       }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/MessageSendType.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/MessageSendType.kt
index 46e39b49cb..5474e289ed 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/MessageSendType.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/MessageSendType.kt
@@ -57,7 +57,8 @@ sealed class MessageSendType(
   )
 
   enum class TransportType {
-    SIGNAL, SMS
+    SIGNAL,
+    SMS
   }
 
   companion object {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ReenableScheduledMessagesDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ReenableScheduledMessagesDialogFragment.kt
index 84ead84578..715ca01633 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ReenableScheduledMessagesDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ReenableScheduledMessagesDialogFragment.kt
@@ -54,7 +54,7 @@ class ReenableScheduledMessagesDialogFragment : FixedRoundedCornerBottomSheetDia
     fun showIfNeeded(context: Context, fragmentManager: FragmentManager, metricId: String?, scheduledDate: Long): Boolean {
       val hasPermission = Build.VERSION.SDK_INT < 31 || ServiceUtil.getAlarmManager(context).canScheduleExactAlarms()
 
-      val fragment = if (!SignalStore.uiHints().hasSeenScheduledMessagesInfoSheet()) {
+      val fragment = if (!SignalStore.uiHints.hasSeenScheduledMessagesInfoSheet()) {
         ScheduleMessageFtuxBottomSheetDialog()
       } else if (!hasPermission) {
         ReenableScheduledMessagesDialogFragment()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduleMessageFtuxBottomSheetDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduleMessageFtuxBottomSheetDialog.kt
index 135b26bb45..f3f972bf35 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduleMessageFtuxBottomSheetDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduleMessageFtuxBottomSheetDialog.kt
@@ -40,7 +40,7 @@ class ScheduleMessageFtuxBottomSheetDialog : FixedRoundedCornerBottomSheetDialog
       }
 
       binding.enableScheduledMessagesGoToSettings.setOnClickListener {
-        SignalStore.uiHints().markHasSeenScheduledMessagesInfoSheet()
+        SignalStore.uiHints.markHasSeenScheduledMessagesInfoSheet()
         launcher.launch(Intent(Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM, Uri.parse("package:" + requireContext().packageName)))
       }
     } else {
@@ -51,7 +51,7 @@ class ScheduleMessageFtuxBottomSheetDialog : FixedRoundedCornerBottomSheetDialog
   }
 
   private fun proceedWithScheduledSend() {
-    SignalStore.uiHints().markHasSeenScheduledMessagesInfoSheet()
+    SignalStore.uiHints.markHasSeenScheduledMessagesInfoSheet()
     findListener<ScheduleMessageDialogCallback>()?.onSchedulePermissionsGranted(
       requireArguments().getString(ScheduleMessageDialogCallback.ARGUMENT_METRIC_ID),
       requireArguments().getLong(ScheduleMessageDialogCallback.ARGUMENT_SCHEDULED_DATE)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesBottomSheet.kt
index 7a392466ce..d5646c9f5b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesBottomSheet.kt
@@ -272,7 +272,7 @@ class ScheduledMessagesBottomSheet : FixedRoundedCornerBottomSheetDialogFragment
     override fun onRecipientNameClicked(target: RecipientId) = Unit
     override fun onActivatePaymentsClicked() = Unit
     override fun onSendPaymentClicked(recipientId: RecipientId) = Unit
-    override fun onEditedIndicatorClicked(messageRecord: MessageRecord) = Unit
+    override fun onEditedIndicatorClicked(conversationMessage: ConversationMessage) = Unit
     override fun onShowSafetyTips(forGroup: Boolean) = Unit
     override fun onReportSpamLearnMoreClicked() = Unit
     override fun onMessageRequestAcceptOptionsClicked() = Unit
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesRepository.kt
index 11ca7b6703..17b224c097 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesRepository.kt
@@ -8,7 +8,7 @@ import org.thoughtcrime.securesms.conversation.v2.data.AttachmentHelper
 import org.thoughtcrime.securesms.database.DatabaseObserver
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.MessageRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 
 /**
@@ -21,7 +21,7 @@ class ScheduledMessagesRepository {
    */
   fun getScheduledMessages(context: Context, threadId: Long): Observable<List<ConversationMessage>> {
     return Observable.create { emitter ->
-      val databaseObserver: DatabaseObserver = ApplicationDependencies.getDatabaseObserver()
+      val databaseObserver: DatabaseObserver = AppDependencies.databaseObserver
       val observer = DatabaseObserver.Observer { emitter.onNext(getScheduledMessagesSync(context, threadId)) }
 
       databaseObserver.registerScheduledMessageObserver(threadId, observer)
@@ -42,7 +42,7 @@ class ScheduledMessagesRepository {
 
     attachmentHelper.fetchAttachments()
 
-    scheduledMessages = attachmentHelper.buildUpdatedModels(ApplicationDependencies.getApplication(), scheduledMessages)
+    scheduledMessages = attachmentHelper.buildUpdatedModels(AppDependencies.application, scheduledMessages)
 
     val replies: List<ConversationMessage> = scheduledMessages
       .map { ConversationMessage.ConversationMessageFactory.createWithUnresolvedData(context, it, threadRecipient) }
@@ -55,7 +55,7 @@ class ScheduledMessagesRepository {
    */
   fun getScheduledMessageCount(threadId: Long): Observable<Int> {
     return Observable.create { emitter ->
-      val databaseObserver: DatabaseObserver = ApplicationDependencies.getDatabaseObserver()
+      val databaseObserver: DatabaseObserver = AppDependencies.databaseObserver
       val observer = DatabaseObserver.Observer { emitter.onNext(SignalDatabase.messages.getScheduledMessageCountForThread(threadId)) }
 
       databaseObserver.registerScheduledMessageObserver(threadId, observer)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/clicklisteners/AttachmentCancelClickListener.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/clicklisteners/AttachmentCancelClickListener.kt
index 4cbda4fdd4..0a1c612243 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/clicklisteners/AttachmentCancelClickListener.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/clicklisteners/AttachmentCancelClickListener.kt
@@ -7,7 +7,7 @@ package org.thoughtcrime.securesms.conversation.clicklisteners
 import android.view.View
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.AttachmentCompressionJob
 import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob
 import org.thoughtcrime.securesms.jobs.AttachmentUploadJob
@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.mms.SlidesClickedListener
 internal class AttachmentCancelClickListener : SlidesClickedListener {
   override fun onClick(v: View, slides: List<Slide>) {
     Log.i(TAG, "Canceling compression/upload/download jobs for ${slides.size} items")
-    val jobManager = ApplicationDependencies.getJobManager()
+    val jobManager = AppDependencies.jobManager
     var cancelCount = 0
     for (slide in slides) {
       val attachmentId = (slide.asAttachment() as DatabaseAttachment).attachmentId
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ChatColors.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ChatColors.kt
index 8d0c92a187..1004ff9300 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ChatColors.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ChatColors.kt
@@ -125,6 +125,13 @@ class ChatColors(
 
   fun withId(id: Id): ChatColors = ChatColors(id, linearGradient, singleColor)
 
+  fun matchesWithoutId(other: ChatColors): Boolean {
+    if (linearGradient != other.linearGradient) return false
+    if (singleColor != other.singleColor) return false
+
+    return true
+  }
+
   override fun equals(other: Any?): Boolean {
     val otherChatColors: ChatColors = (other as? ChatColors) ?: return false
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ChatColorsPalette.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ChatColorsPalette.kt
index a5cca2322b..e61f230f3e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ChatColorsPalette.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ChatColorsPalette.kt
@@ -163,6 +163,9 @@ object ChatColorsPalette {
     @JvmStatic
     val default = ULTRAMARINE
 
+    /*
+     * If updating this list of colors, make sure to update the backup import/export colors as well.
+     */
     val solids = listOf(
       CRIMSON,
       VERMILION,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionAdapter.kt
index 57a67219ad..b71d510361 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionAdapter.kt
@@ -89,8 +89,8 @@ class ChatColorSelectionAdapter(
       val mask = model.chatColors.asCircle()
       preview.setImageDrawable(mask.withFixedSize(ViewUtil.dpToPx(56)))
 
-      if (model.isAuto && SignalStore.chatColorsValues().shouldShowAutoTooltip) {
-        SignalStore.chatColorsValues().shouldShowAutoTooltip = false
+      if (model.isAuto && SignalStore.chatColors.shouldShowAutoTooltip) {
+        SignalStore.chatColors.shouldShowAutoTooltip = false
         TooltipPopup.forTarget(itemView)
           .setText(R.string.ChatColorSelectionFragment__auto_matches_the_color_to_the_wallpaper)
           .setBackgroundTint(ContextCompat.getColor(context, R.color.signal_accent_primary))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionRepository.kt
index 6c0864462e..c0ec05fbd1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionRepository.kt
@@ -40,12 +40,12 @@ sealed class ChatColorSelectionRepository(context: Context) {
 
   private class Global(context: Context) : ChatColorSelectionRepository(context) {
     override fun getWallpaper(consumer: (ChatWallpaper?) -> Unit) {
-      consumer(SignalStore.wallpaper().wallpaper)
+      consumer(SignalStore.wallpaper.wallpaper)
     }
 
     override fun getChatColors(consumer: (ChatColors) -> Unit) {
-      if (SignalStore.chatColorsValues().hasChatColors) {
-        consumer(requireNotNull(SignalStore.chatColorsValues().chatColors))
+      if (SignalStore.chatColors.hasChatColors) {
+        consumer(requireNotNull(SignalStore.chatColors.chatColors))
       } else {
         getWallpaper { wallpaper ->
           if (wallpaper != null) {
@@ -59,9 +59,9 @@ sealed class ChatColorSelectionRepository(context: Context) {
 
     override fun save(chatColors: ChatColors, onSaved: () -> Unit) {
       if (chatColors.id == ChatColors.Id.Auto) {
-        SignalStore.chatColorsValues().chatColors = null
+        SignalStore.chatColors.chatColors = null
       } else {
-        SignalStore.chatColorsValues().chatColors = chatColors
+        SignalStore.chatColors.chatColors = chatColors
       }
       onSaved()
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorsOptionsLiveData.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorsOptionsLiveData.kt
index 8691b6b30e..09711f1e8a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorsOptionsLiveData.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorsOptionsLiveData.kt
@@ -7,7 +7,7 @@ import org.thoughtcrime.securesms.conversation.colors.ChatColorsPalette
 import org.thoughtcrime.securesms.database.ChatColorsTable
 import org.thoughtcrime.securesms.database.DatabaseObserver
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.util.concurrent.SerialMonoLifoExecutor
 import java.util.concurrent.Executor
 
@@ -18,11 +18,11 @@ class ChatColorsOptionsLiveData : LiveData<List<ChatColors>>() {
 
   override fun onActive() {
     refreshChatColors()
-    ApplicationDependencies.getDatabaseObserver().registerChatColorsObserver(observer)
+    AppDependencies.databaseObserver.registerChatColorsObserver(observer)
   }
 
   override fun onInactive() {
-    ApplicationDependencies.getDatabaseObserver().unregisterObserver(observer)
+    AppDependencies.databaseObserver.unregisterObserver(observer)
   }
 
   private fun refreshChatColors() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorCreatorPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorCreatorPageFragment.kt
index fa68ea800b..1f655b3545 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorCreatorPageFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorCreatorPageFragment.kt
@@ -11,6 +11,7 @@ import android.graphics.PointF
 import android.graphics.RectF
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
+import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
@@ -201,16 +202,18 @@ class CustomChatColorCreatorPageFragment :
       }
     }
 
-    if (page == 1 && SignalStore.chatColorsValues().shouldShowGradientTooltip) {
+    if (page == 1 && SignalStore.chatColors.shouldShowGradientTooltip) {
       view.post {
-        SignalStore.chatColorsValues().shouldShowGradientTooltip = false
+        SignalStore.chatColors.shouldShowGradientTooltip = false
         val contentView = layoutInflater.inflate(R.layout.gradient_tool_tooltip, view as ViewGroup, false)
         val popupWindow = PopupWindow(contentView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
 
         popupWindow.isOutsideTouchable = false
         popupWindow.isFocusable = true
 
-        popupWindow.elevation = ViewUtil.dpToPx(8).toFloat()
+        if (Build.VERSION.SDK_INT > 21) {
+          popupWindow.elevation = ViewUtil.dpToPx(8).toFloat()
+        }
 
         popupWindow.showAsDropDown(gradientTool, 0, -gradientTool.measuredHeight + ViewUtil.dpToPx(48))
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorCreatorRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorCreatorRepository.kt
index 9932932acd..cc03e6712a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorCreatorRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorCreatorRepository.kt
@@ -23,7 +23,7 @@ class CustomChatColorCreatorRepository(private val context: Context) {
         val recipient = Recipient.resolved(recipientId)
         consumer(recipient.wallpaper)
       } else {
-        consumer(SignalStore.wallpaper().wallpaper)
+        consumer(SignalStore.wallpaper.wallpaper)
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorEdge.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorEdge.kt
index 900943c880..07c5ff049b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorEdge.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorEdge.kt
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.conversation.colors.ui.custom
 
 enum class CustomChatColorEdge {
-  TOP, BOTTOM
+  TOP,
+  BOTTOM
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/drafts/DraftRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/drafts/DraftRepository.kt
index 34e9f3b417..aa85ac769f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/drafts/DraftRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/drafts/DraftRepository.kt
@@ -30,7 +30,7 @@ import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyboard.KeyboardUtil
 import org.thoughtcrime.securesms.mediasend.Media
 import org.thoughtcrime.securesms.mms.GifSlide
@@ -50,7 +50,7 @@ import java.io.IOException
 import java.util.concurrent.Executor
 
 class DraftRepository(
-  private val context: Context = ApplicationDependencies.getApplication(),
+  private val context: Context = AppDependencies.application,
   private val threadTable: ThreadTable = SignalDatabase.threads,
   private val draftTable: DraftTable = SignalDatabase.drafts,
   private val saveDraftsExecutor: Executor = SerialMonoLifoExecutor(SignalExecutors.BOUNDED),
@@ -132,6 +132,11 @@ class DraftRepository(
 
       val draftText: CharSequence? = drafts.firstOrNull { it.type == DraftTable.Draft.TEXT }?.let { updatedText ?: it.value }
 
+      val messageEdit: ConversationMessage? = drafts.firstOrNull { it.type == DraftTable.Draft.MESSAGE_EDIT }?.let { loadDraftMessageEditInternal(it.value) }
+      if (messageEdit != null) {
+        return ShareOrDraftData.SetEditMessage(messageEdit, draftText, clearQuote = drafts.none { it.type == DraftTable.Draft.QUOTE }) to drafts
+      }
+
       val location: SignalPlace? = drafts.firstOrNull { it.type == DraftTable.Draft.LOCATION }?.let { SignalPlace.deserialize(it.value) }
       if (location != null) {
         return ShareOrDraftData.SetLocation(location, draftText) to drafts
@@ -142,11 +147,6 @@ class DraftRepository(
         return ShareOrDraftData.SetQuote(quote, draftText) to drafts
       }
 
-      val messageEdit: ConversationMessage? = drafts.firstOrNull { it.type == DraftTable.Draft.MESSAGE_EDIT }?.let { loadDraftMessageEditInternal(it.value) }
-      if (messageEdit != null) {
-        return ShareOrDraftData.SetEditMessage(messageEdit, draftText) to drafts
-      }
-
       if (draftText != null) {
         return ShareOrDraftData.SetText(draftText) to drafts
       }
@@ -248,6 +248,6 @@ class DraftRepository(
     data class SetText(val text: CharSequence) : ShareOrDraftData
     data class SetLocation(val location: SignalPlace, val draftText: CharSequence?) : ShareOrDraftData
     data class SetQuote(val quote: ConversationMessage, val draftText: CharSequence?) : ShareOrDraftData
-    data class SetEditMessage(val messageEdit: ConversationMessage, val draftText: CharSequence?) : ShareOrDraftData
+    data class SetEditMessage(val messageEdit: ConversationMessage, val draftText: CharSequence?, val clearQuote: Boolean) : ShareOrDraftData
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt
index c4caea1777..02cc5d2e9a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt
@@ -57,8 +57,8 @@ import org.thoughtcrime.securesms.stories.settings.create.CreateStoryFlowDialogF
 import org.thoughtcrime.securesms.stories.settings.create.CreateStoryWithViewersFragment
 import org.thoughtcrime.securesms.stories.settings.privacy.ChooseInitialMyStoryMembershipBottomSheetDialogFragment
 import org.thoughtcrime.securesms.util.BottomSheetUtil
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.FullscreenHelper
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.fragments.findListener
 import org.thoughtcrime.securesms.util.fragments.requireListener
@@ -124,10 +124,9 @@ class MultiselectForwardFragment :
     contactSearchMediator = ContactSearchMediator(
       this,
       emptySet(),
-      FeatureFlags.shareSelectionLimit(),
+      RemoteConfig.shareSelectionLimit,
       ContactSearchAdapter.DisplayOptions(
         displayCheckBox = !args.selectSingleRecipient,
-        displaySmsTag = ContactSearchAdapter.DisplaySmsTag.DEFAULT,
         displaySecondaryInformation = ContactSearchAdapter.DisplaySecondaryInformation.NEVER,
         displayStoryRing = true
       ),
@@ -231,7 +230,7 @@ class MultiselectForwardFragment :
         val message: Int = when (it) {
           ContactSearchError.CONTACT_NOT_SELECTABLE -> R.string.MultiselectForwardFragment__only_admins_can_send_messages_to_this_group
           ContactSearchError.RECOMMENDED_LIMIT_REACHED -> R.string.ContactSelectionListFragment_recommended_member_limit_reached
-          ContactSearchError.HARD_LIMIT_REACHED -> R.string.MultiselectForwardFragment__limit_reached
+          ContactSearchError.HARD_LIMIT_REACHED -> R.string.MultiselectForwardFragment__you_cant_select_more_chats
         }
 
         Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
@@ -308,7 +307,7 @@ class MultiselectForwardFragment :
   }
 
   private fun displayFirstSendConfirmation() {
-    SignalStore.tooltips().markMultiForwardDialogSeen()
+    SignalStore.tooltips.markMultiForwardDialogSeen()
 
     val messageCount = getMessageCount()
 
@@ -500,7 +499,7 @@ class MultiselectForwardFragment :
   }
 
   override fun onGroupStoryClicked() {
-    if (SignalStore.storyValues().userHasSeenGroupStoryEducationSheet) {
+    if (SignalStore.story.userHasSeenGroupStoryEducationSheet) {
       onGroupStoryEducationSheetNext()
     } else {
       GroupStoryEducationSheet().show(childFragmentManager, GroupStoryEducationSheet.KEY)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragmentArgs.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragmentArgs.kt
index 7309384c98..0aca847a74 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragmentArgs.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragmentArgs.kt
@@ -199,7 +199,8 @@ data class MultiselectForwardFragmentArgs @JvmOverloads constructor(
         videoGif,
         Optional.empty(),
         Optional.ofNullable(caption),
-        Optional.ofNullable(transformProperties)
+        Optional.ofNullable(transformProperties),
+        Optional.ofNullable(fileName)
       )
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardViewModel.kt
index 68f2147fc1..a6dcbfe70c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardViewModel.kt
@@ -44,8 +44,8 @@ class MultiselectForwardViewModel(
   }
 
   fun send(additionalMessage: String, selectedContacts: Set<ContactSearchKey>) {
-    if (SignalStore.tooltips().showMultiForwardDialog()) {
-      SignalStore.tooltips().markMultiForwardDialogSeen()
+    if (SignalStore.tooltips.showMultiForwardDialog()) {
+      SignalStore.tooltips.markMultiForwardDialogSeen()
       store.update { it.copy(stage = MultiselectForwardState.Stage.FirstConfirmation) }
     } else {
       store.update { it.copy(stage = MultiselectForwardState.Stage.LoadingIdentities) }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/quotes/MessageQuotesBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/quotes/MessageQuotesBottomSheet.kt
index a0bebf4333..676694c390 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/quotes/MessageQuotesBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/quotes/MessageQuotesBottomSheet.kt
@@ -21,13 +21,14 @@ import org.thoughtcrime.securesms.conversation.ConversationAdapter
 import org.thoughtcrime.securesms.conversation.ConversationAdapterBridge
 import org.thoughtcrime.securesms.conversation.ConversationBottomSheetCallback
 import org.thoughtcrime.securesms.conversation.ConversationItemDisplayMode
+import org.thoughtcrime.securesms.conversation.ConversationMessage
 import org.thoughtcrime.securesms.conversation.colors.Colorizer
 import org.thoughtcrime.securesms.conversation.colors.RecyclerViewColorizer
 import org.thoughtcrime.securesms.conversation.mutiselect.MultiselectPart
 import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.giph.mp4.GiphyMp4ItemDecoration
 import org.thoughtcrime.securesms.giph.mp4.GiphyMp4PlaybackController
 import org.thoughtcrime.securesms.giph.mp4.GiphyMp4PlaybackPolicy
@@ -53,7 +54,7 @@ class MessageQuotesBottomSheet : FixedRoundedCornerBottomSheetDialogFragment() {
     factoryProducer = {
       val messageId = MessageId.deserialize(arguments?.getString(KEY_MESSAGE_ID, null) ?: throw IllegalArgumentException())
       val conversationRecipientId = RecipientId.from(arguments?.getString(KEY_CONVERSATION_RECIPIENT_ID, null) ?: throw IllegalArgumentException())
-      MessageQuotesViewModel.Factory(ApplicationDependencies.getApplication(), messageId, conversationRecipientId)
+      MessageQuotesViewModel.Factory(AppDependencies.application, messageId, conversationRecipientId)
     }
   )
 
@@ -248,9 +249,9 @@ class MessageQuotesBottomSheet : FixedRoundedCornerBottomSheetDialogFragment() {
       getAdapterListener().onSendPaymentClicked(recipientId)
     }
 
-    override fun onEditedIndicatorClicked(messageRecord: MessageRecord) {
+    override fun onEditedIndicatorClicked(conversationMessage: ConversationMessage) {
       dismiss()
-      getAdapterListener().onEditedIndicatorClicked(messageRecord)
+      getAdapterListener().onEditedIndicatorClicked(conversationMessage)
     }
 
     override fun onShowSafetyTips(forGroup: Boolean) = Unit
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/quotes/MessageQuotesRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/quotes/MessageQuotesRepository.kt
index bbbe72a897..cc76a9106f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/quotes/MessageQuotesRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/quotes/MessageQuotesRepository.kt
@@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.database.model.Quote
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.util.getQuote
 
 class MessageQuotesRepository {
@@ -35,7 +35,7 @@ class MessageQuotesRepository {
         return@create
       }
 
-      val databaseObserver: DatabaseObserver = ApplicationDependencies.getDatabaseObserver()
+      val databaseObserver: DatabaseObserver = AppDependencies.databaseObserver
       val observer = DatabaseObserver.Observer { emitter.onNext(getMessagesInQuoteChainSync(application, messageId)) }
 
       databaseObserver.registerConversationObserver(threadId, observer)
@@ -68,7 +68,7 @@ class MessageQuotesRepository {
     attachmentHelper.fetchAttachments()
 
     replyRecords = reactionHelper.buildUpdatedModels(replyRecords)
-    replyRecords = attachmentHelper.buildUpdatedModels(ApplicationDependencies.getApplication(), replyRecords)
+    replyRecords = attachmentHelper.buildUpdatedModels(AppDependencies.application, replyRecords)
 
     val replies: List<ConversationMessage> = replyRecords
       .map { replyRecord ->
@@ -98,7 +98,7 @@ class MessageQuotesRepository {
         add(originalRecord)
         fetchAttachments()
       }
-      .buildUpdatedModels(ApplicationDependencies.getApplication(), listOf(originalRecord))
+      .buildUpdatedModels(AppDependencies.application, listOf(originalRecord))
       .get(0)
 
     val originalMessage: ConversationMessage = ConversationMessageFactory.createWithUnresolvedData(application, originalRecord, false, threadRecipient)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/edit/EditMessageHistoryDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/edit/EditMessageHistoryDialog.kt
index e5a7b416dc..55301edb8b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/edit/EditMessageHistoryDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/edit/EditMessageHistoryDialog.kt
@@ -163,7 +163,7 @@ class EditMessageHistoryDialog : FixedRoundedCornerBottomSheetDialogFragment() {
     override fun onRecipientNameClicked(target: RecipientId) = Unit
     override fun onActivatePaymentsClicked() = Unit
     override fun onSendPaymentClicked(recipientId: RecipientId) = Unit
-    override fun onEditedIndicatorClicked(messageRecord: MessageRecord) = Unit
+    override fun onEditedIndicatorClicked(conversationMessage: ConversationMessage) = Unit
     override fun onShowSafetyTips(forGroup: Boolean) = Unit
     override fun onReportSpamLearnMoreClicked() = Unit
     override fun onMessageRequestAcceptOptionsClicked() = Unit
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/edit/EditMessageHistoryRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/edit/EditMessageHistoryRepository.kt
index 661542fca8..ab3119a686 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/edit/EditMessageHistoryRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/edit/EditMessageHistoryRepository.kt
@@ -7,7 +7,7 @@ import org.thoughtcrime.securesms.conversation.ConversationMessage
 import org.thoughtcrime.securesms.conversation.v2.data.AttachmentHelper
 import org.thoughtcrime.securesms.database.DatabaseObserver
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.notifications.MarkReadReceiver
 import org.thoughtcrime.securesms.recipients.Recipient
 
@@ -21,7 +21,7 @@ object EditMessageHistoryRepository {
         return@create
       }
 
-      val databaseObserver: DatabaseObserver = ApplicationDependencies.getDatabaseObserver()
+      val databaseObserver: DatabaseObserver = AppDependencies.databaseObserver
       val observer = DatabaseObserver.Observer { emitter.onNext(getEditHistorySync(messageId)) }
 
       databaseObserver.registerConversationObserver(threadId, observer)
@@ -38,7 +38,7 @@ object EditMessageHistoryRepository {
   }
 
   private fun getEditHistorySync(messageId: Long): List<ConversationMessage> {
-    val context = ApplicationDependencies.getApplication()
+    val context = AppDependencies.application
     val records = SignalDatabase
       .messages
       .getMessageEditHistory(messageId)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeRepository.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeRepository.java
index cb385292c1..69e2e87916 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeRepository.java
@@ -23,7 +23,7 @@
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
 import org.thoughtcrime.securesms.database.model.MessageId;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.safety.SafetyNumberRecipient;
@@ -91,7 +91,7 @@ public Single<TrustAndVerifyResult> trustOrVerifyChangedRecipientsAndResendRx(@N
 
     List<Recipient> recipients = Stream.of(recipientIds).map(Recipient::resolved).toList();
 
-    List<ChangedRecipient> changedRecipients = Stream.of(ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecords(recipients).getIdentityRecords())
+    List<ChangedRecipient> changedRecipients = Stream.of(AppDependencies.getProtocolStore().aci().identities().getIdentityRecords(recipients).getIdentityRecords())
                                                      .map(record -> new ChangedRecipient(Recipient.resolved(record.getRecipientId()), record))
                                                      .toList();
 
@@ -120,7 +120,7 @@ public Single<TrustAndVerifyResult> trustOrVerifyChangedRecipientsAndResendRx(@N
 
   @WorkerThread
   private TrustAndVerifyResult trustOrVerifyChangedRecipientsInternal(@NonNull List<ChangedRecipient> changedRecipients) {
-    SignalIdentityKeyStore identityStore = ApplicationDependencies.getProtocolStore().aci().identities();
+    SignalIdentityKeyStore identityStore = AppDependencies.getProtocolStore().aci().identities();
 
     try (SignalSessionLock.Lock unused = ReentrantSessionLock.INSTANCE.acquire()) {
       for (ChangedRecipient changedRecipient : changedRecipients) {
@@ -128,9 +128,9 @@ private TrustAndVerifyResult trustOrVerifyChangedRecipientsInternal(@NonNull Lis
 
         if (changedRecipient.isUnverified()) {
           Log.d(TAG, "Setting " + identityRecord.getRecipientId() + " as verified");
-          ApplicationDependencies.getProtocolStore().aci().identities().setVerified(identityRecord.getRecipientId(),
-                                                                                    identityRecord.getIdentityKey(),
-                                                                                    IdentityTable.VerifiedStatus.DEFAULT);
+          AppDependencies.getProtocolStore().aci().identities().setVerified(identityRecord.getRecipientId(),
+                                                                            identityRecord.getIdentityKey(),
+                                                                            IdentityTable.VerifiedStatus.DEFAULT);
         } else {
           Log.d(TAG, "Setting " + identityRecord.getRecipientId() + " as approved");
           identityStore.setApproval(identityRecord.getRecipientId(), true);
@@ -171,13 +171,13 @@ private TrustAndVerifyResult trustOrVerifyChangedRecipientsAndResendInternal(@No
         }
 
         Log.d(TAG, "Saving identity for: " + changedRecipient.getRecipient().getId() + " " + newIdentityKey.hashCode());
-        SignalIdentityKeyStore.SaveResult result = ApplicationDependencies.getProtocolStore().aci().identities().saveIdentity(mismatchAddress, newIdentityKey, true);
+        SignalIdentityKeyStore.SaveResult result = AppDependencies.getProtocolStore().aci().identities().saveIdentity(mismatchAddress, newIdentityKey, true);
 
         Log.d(TAG, "Saving identity result: " + result);
         if (result == SignalIdentityKeyStore.SaveResult.NO_CHANGE) {
           Log.i(TAG, "Archiving sessions explicitly as they appear to be out of sync.");
-          ApplicationDependencies.getProtocolStore().aci().sessions().archiveSessions(changedRecipient.getRecipient().getId(), SignalServiceAddress.DEFAULT_DEVICE_ID);
-          ApplicationDependencies.getProtocolStore().aci().sessions().archiveSiblingSessions(mismatchAddress);
+          AppDependencies.getProtocolStore().aci().sessions().archiveSessions(changedRecipient.getRecipient().getId(), SignalServiceAddress.DEFAULT_DEVICE_ID);
+          AppDependencies.getProtocolStore().aci().sessions().archiveSiblingSessions(mismatchAddress);
           SignalDatabase.senderKeyShared().deleteAllFor(changedRecipient.getRecipient().getId());
         }
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeViewModel.java
index d6df0a9141..dccb9ec388 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeViewModel.java
@@ -9,7 +9,7 @@
 import androidx.lifecycle.ViewModelProvider;
 
 import org.thoughtcrime.securesms.conversation.ui.error.SafetyNumberChangeRepository.SafetyNumberChangeState;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
 
@@ -71,7 +71,7 @@ public Factory(@NonNull List<RecipientId> recipientIds, @Nullable Long messageId
 
     @Override
     public @NonNull <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
-      SafetyNumberChangeRepository repo = new SafetyNumberChangeRepository(ApplicationDependencies.getApplication());
+      SafetyNumberChangeRepository repo = new SafetyNumberChangeRepository(AppDependencies.getApplication());
       return Objects.requireNonNull(modelClass.cast(new SafetyNumberChangeViewModel(recipientIds, messageId, messageType, repo)));
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryViewModel.kt
index dd4343d2bf..cdc7e97e3c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryViewModel.kt
@@ -5,7 +5,7 @@ import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.schedulers.Schedulers
 import io.reactivex.rxjava3.subjects.PublishSubject
 import org.thoughtcrime.securesms.components.emoji.RecentEmojiPageModel
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyboard.emoji.search.EmojiSearchRepository
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.TextSecurePreferences
@@ -17,8 +17,8 @@ import org.thoughtcrime.securesms.util.adapter.mapping.AnyMappingModel
  * the results.
  */
 class InlineQueryViewModel(
-  private val emojiSearchRepository: EmojiSearchRepository = EmojiSearchRepository(ApplicationDependencies.getApplication()),
-  private val recentEmojis: RecentEmojiPageModel = RecentEmojiPageModel(ApplicationDependencies.getApplication(), TextSecurePreferences.RECENT_STORAGE_KEY)
+  private val emojiSearchRepository: EmojiSearchRepository = EmojiSearchRepository(AppDependencies.application),
+  private val recentEmojis: RecentEmojiPageModel = RecentEmojiPageModel(AppDependencies.application, TextSecurePreferences.RECENT_STORAGE_KEY)
 ) : ViewModel() {
 
   private val querySubject: PublishSubject<InlineQuery> = PublishSubject.create()
@@ -59,7 +59,7 @@ class InlineQueryViewModel(
 
   companion object {
     fun toMappingModels(emojiWithLabels: List<String>): List<AnyMappingModel> {
-      val emojiValues = SignalStore.emojiValues()
+      val emojiValues = SignalStore.emoji
       return emojiWithLabels
         .distinct()
         .map { emoji ->
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryViewModelV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryViewModelV2.kt
index 48a247bdb8..d1d821350f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryViewModelV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/inlinequery/InlineQueryViewModelV2.kt
@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.components.emoji.RecentEmojiPageModel
 import org.thoughtcrime.securesms.conversation.ui.mentions.MentionViewState
 import org.thoughtcrime.securesms.conversation.ui.mentions.MentionsPickerRepositoryV2
 import org.thoughtcrime.securesms.conversation.v2.ConversationRecipientRepository
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyboard.emoji.search.EmojiSearchRepository
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.TextSecurePreferences
@@ -23,8 +23,8 @@ import org.thoughtcrime.securesms.util.adapter.mapping.AnyMappingModel
 class InlineQueryViewModelV2(
   private val recipientRepository: ConversationRecipientRepository,
   private val mentionsPickerRepository: MentionsPickerRepositoryV2 = MentionsPickerRepositoryV2(),
-  private val emojiSearchRepository: EmojiSearchRepository = EmojiSearchRepository(ApplicationDependencies.getApplication()),
-  private val recentEmojis: RecentEmojiPageModel = RecentEmojiPageModel(ApplicationDependencies.getApplication(), TextSecurePreferences.RECENT_STORAGE_KEY)
+  private val emojiSearchRepository: EmojiSearchRepository = EmojiSearchRepository(AppDependencies.application),
+  private val recentEmojis: RecentEmojiPageModel = RecentEmojiPageModel(AppDependencies.application, TextSecurePreferences.RECENT_STORAGE_KEY)
 ) : ViewModel() {
 
   private val querySubject: PublishSubject<InlineQuery> = PublishSubject.create()
@@ -91,7 +91,7 @@ class InlineQueryViewModelV2(
 
   companion object {
     fun toMappingModels(emojiWithLabels: List<String>): List<AnyMappingModel> {
-      val emojiValues = SignalStore.emojiValues()
+      val emojiValues = SignalStore.emoji
       return emojiWithLabels
         .distinct()
         .map { emoji ->
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/payment/PaymentMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/payment/PaymentMessageView.kt
index bee6c5ebef..131b0f163a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/payment/PaymentMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/payment/PaymentMessageView.kt
@@ -14,11 +14,14 @@ import org.signal.core.util.dp
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.quotes.QuoteViewColorTheme
 import org.thoughtcrime.securesms.conversation.colors.Colorizer
+import org.thoughtcrime.securesms.database.model.databaseprotos.PaymentTombstone
 import org.thoughtcrime.securesms.databinding.PaymentMessageViewBinding
+import org.thoughtcrime.securesms.payments.CryptoValueUtil
 import org.thoughtcrime.securesms.payments.Direction
 import org.thoughtcrime.securesms.payments.Payment
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.visible
+import org.whispersystems.signalservice.api.payments.Money
 
 /**
  * Showing payment information in conversation.
@@ -30,11 +33,25 @@ class PaymentMessageView @JvmOverloads constructor(
 
   private val binding: PaymentMessageViewBinding
 
+  private var onTombstoneClickListener: OnClickListener? = null
+
   init {
     binding = PaymentMessageViewBinding.inflate(LayoutInflater.from(context), this, true)
   }
 
-  fun bindPayment(recipient: Recipient, payment: Payment, colorizer: Colorizer) {
+  fun bindPayment(recipient: Recipient, payment: Payment?, colorizer: Colorizer) {
+    if (payment == null) {
+      binding.paymentTombstone.visible = true
+      binding.paymentAmount.visible = false
+      binding.paymentInprogress.visible = false
+      binding.paymentAmountLayout.setOnClickListener {
+        onTombstoneClickListener?.onClick(it)
+      }
+      return
+    }
+
+    binding.paymentAmountLayout.setOnClickListener(null)
+    binding.paymentTombstone.visible = false
     val outgoing = payment.direction == Direction.SENT
 
     binding.paymentDirection.apply {
@@ -69,6 +86,51 @@ class PaymentMessageView @JvmOverloads constructor(
     ViewCompat.setBackgroundTintList(binding.paymentAmountLayout, ColorStateList.valueOf(quoteViewColorTheme.getBackgroundColor(context)))
   }
 
+  fun bindPaymentTombstone(outgoing: Boolean, recipient: Recipient, paymentTombstone: PaymentTombstone?, colorizer: Colorizer) {
+    val amount: Money? = if (paymentTombstone?.amount != null) {
+      CryptoValueUtil.cryptoValueToMoney(paymentTombstone.amount)
+    } else {
+      null
+    }
+
+    binding.paymentDirection.apply {
+      if (outgoing) {
+        text = context.getString(R.string.PaymentMessageView_you_sent_s, recipient.getShortDisplayName(context))
+        setTextColor(colorizer.getOutgoingFooterTextColor(context))
+      } else {
+        text = context.getString(R.string.PaymentMessageView_s_sent_you, recipient.getShortDisplayName(context))
+        setTextColor(colorizer.getIncomingFooterTextColor(context, recipient.hasWallpaper))
+      }
+    }
+    if (amount == null) {
+      binding.paymentTombstone.visible = true
+      binding.paymentAmount.visible = false
+      binding.paymentInprogress.visible = false
+      binding.paymentAmountLayout.setOnClickListener {
+        onTombstoneClickListener?.onClick(it)
+      }
+      return
+    }
+    val note = paymentTombstone?.note ?: ""
+    binding.paymentAmountLayout.setOnClickListener(null)
+    binding.paymentTombstone.visible = false
+
+    binding.paymentNote.apply {
+      text = note
+      visible = note.isNotEmpty()
+      setTextColor(if (outgoing) colorizer.getOutgoingBodyTextColor(context) else colorizer.getIncomingBodyTextColor(context, recipient.hasWallpaper))
+    }
+
+    val quoteViewColorTheme = QuoteViewColorTheme.resolveTheme(outgoing, false, recipient.hasWallpaper)
+
+    binding.paymentAmount.visible = true
+    binding.paymentInprogress.visible = false
+    binding.paymentAmount.setTextColor(quoteViewColorTheme.getForegroundColor(context))
+    binding.paymentAmount.setMoney(amount, 0L, currencyTypefaceSpan)
+
+    ViewCompat.setBackgroundTintList(binding.paymentAmountLayout, ColorStateList.valueOf(quoteViewColorTheme.getBackgroundColor(context)))
+  }
+
   private fun getInProgressDrawable(@ColorInt color: Int): IndeterminateDrawable<CircularProgressIndicatorSpec> {
     val spec = CircularProgressIndicatorSpec(context, null).apply {
       indicatorInset = 0
@@ -82,6 +144,10 @@ class PaymentMessageView @JvmOverloads constructor(
     return drawable
   }
 
+  fun setOnTombstoneClickListener(listener: OnClickListener?) {
+    this.onTombstoneClickListener = listener
+  }
+
   companion object {
     private val currencyTypefaceSpan = TypefaceSpan("sans-serif-light")
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/AddToContactsContract.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/AddToContactsContract.kt
index df69e0972b..784a690220 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/AddToContactsContract.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/AddToContactsContract.kt
@@ -16,7 +16,7 @@ import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.contactshare.Contact
 import org.thoughtcrime.securesms.contactshare.ContactUtil
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientExporter
@@ -33,7 +33,7 @@ class AddToContactsContract : ActivityResultContract<Intent, Unit>() {
   override fun createIntent(context: Context, input: Intent): Intent = input
 
   override fun parseResult(resultCode: Int, intent: Intent?) {
-    ApplicationDependencies.getJobManager().add(DirectoryRefreshJob(false))
+    AppDependencies.jobManager.add(DirectoryRefreshJob(false))
   }
 
   companion object {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt
index 8e9fd1fe1c..d54a484b7c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt
@@ -107,7 +107,7 @@ class ConversationAdapterV2(
       ConversationUpdateViewHolder(view)
     }
 
-    if (SignalStore.internalValues().useConversationItemV2Media()) {
+    if (SignalStore.internal.useConversationItemV2Media()) {
       registerFactory(OutgoingMedia::class.java) { parent ->
         val view = CachedInflater.from(parent.context).inflate<View>(R.layout.v2_conversation_item_media_outgoing, parent, false)
         V2ConversationItemMediaViewHolder(V2ConversationItemMediaOutgoingBinding.bind(view).bridge(), this)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationDialogs.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationDialogs.kt
index c99f0b53ea..64daf77bf6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationDialogs.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationDialogs.kt
@@ -11,7 +11,7 @@ import org.signal.core.util.concurrent.SimpleTask
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
 import org.thoughtcrime.securesms.database.model.MessageRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.sms.MessageSender
 import org.thoughtcrime.securesms.verify.VerifyIdentityActivity
@@ -50,7 +50,7 @@ object ConversationDialogs {
       .setPositiveButton(R.string.ConversationFragment_verify) { d, _ ->
         SimpleTask.run(
           fragment.lifecycle,
-          { ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecord(recipient.id) },
+          { AppDependencies.protocolStore.aci().identities().getIdentityRecord(recipient.id) },
           { identityRecord ->
             identityRecord.ifPresent {
               VerifyIdentityActivity.startOrShowExchangeMessagesDialog(fragment.requireContext(), identityRecord.get())
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index bab58eda4c..b01d69ec95 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -22,6 +22,7 @@ import android.graphics.Rect
 import android.net.Uri
 import android.os.Bundle
 import android.provider.Browser
+import android.provider.ContactsContract
 import android.provider.Settings
 import android.text.Editable
 import android.text.TextWatcher
@@ -92,6 +93,7 @@ import org.signal.core.util.dp
 import org.signal.core.util.logging.Log
 import org.signal.core.util.orNull
 import org.signal.core.util.setActionItemTint
+import org.signal.donations.InAppPaymentType
 import org.signal.ringrtc.CallLinkRootKey
 import org.thoughtcrime.securesms.BlockUnblockDialog
 import org.thoughtcrime.securesms.GroupMembersDialog
@@ -103,6 +105,7 @@ import org.thoughtcrime.securesms.audio.AudioRecorder
 import org.thoughtcrime.securesms.components.AnimatingToggle
 import org.thoughtcrime.securesms.components.ComposeText
 import org.thoughtcrime.securesms.components.ConversationSearchBottomBar
+import org.thoughtcrime.securesms.components.DeleteSyncEducationDialog
 import org.thoughtcrime.securesms.components.HidingLinearLayout
 import org.thoughtcrime.securesms.components.InputAwareConstraintLayout
 import org.thoughtcrime.securesms.components.InputPanel
@@ -199,7 +202,7 @@ import org.thoughtcrime.securesms.database.model.Quote
 import org.thoughtcrime.securesms.database.model.StickerRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
 import org.thoughtcrime.securesms.databinding.V2ConversationFragmentBinding
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.events.GroupCallPeekEvent
 import org.thoughtcrime.securesms.events.ReminderUpdateEvent
 import org.thoughtcrime.securesms.giph.mp4.GiphyMp4ItemDecoration
@@ -241,6 +244,7 @@ import org.thoughtcrime.securesms.messagedetails.MessageDetailsFragment
 import org.thoughtcrime.securesms.messagerequests.MessageRequestRepository
 import org.thoughtcrime.securesms.mms.AttachmentManager
 import org.thoughtcrime.securesms.mms.AudioSlide
+import org.thoughtcrime.securesms.mms.DocumentSlide
 import org.thoughtcrime.securesms.mms.GifSlide
 import org.thoughtcrime.securesms.mms.ImageSlide
 import org.thoughtcrime.securesms.mms.MediaConstraints
@@ -250,6 +254,7 @@ import org.thoughtcrime.securesms.mms.SlideDeck
 import org.thoughtcrime.securesms.mms.SlideFactory
 import org.thoughtcrime.securesms.mms.StickerSlide
 import org.thoughtcrime.securesms.mms.VideoSlide
+import org.thoughtcrime.securesms.nicknames.NicknameActivity
 import org.thoughtcrime.securesms.notifications.v2.ConversationId
 import org.thoughtcrime.securesms.payments.preferences.PaymentsActivity
 import org.thoughtcrime.securesms.permissions.Permissions
@@ -265,7 +270,7 @@ import org.thoughtcrime.securesms.recipients.RecipientExporter
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.recipients.ui.bottomsheet.RecipientBottomSheetDialogFragment
 import org.thoughtcrime.securesms.recipients.ui.disappearingmessages.RecipientDisappearingMessagesActivity
-import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity
+import org.thoughtcrime.securesms.registration.ui.RegistrationActivity
 import org.thoughtcrime.securesms.revealable.ViewOnceMessageActivity
 import org.thoughtcrime.securesms.revealable.ViewOnceUtil
 import org.thoughtcrime.securesms.safety.SafetyNumberBottomSheet
@@ -286,14 +291,15 @@ import org.thoughtcrime.securesms.util.DateUtils
 import org.thoughtcrime.securesms.util.Debouncer
 import org.thoughtcrime.securesms.util.DeleteDialog
 import org.thoughtcrime.securesms.util.Dialogs
+import org.thoughtcrime.securesms.util.DoubleClickDebouncer
 import org.thoughtcrime.securesms.util.DrawableUtil
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.FullscreenHelper
 import org.thoughtcrime.securesms.util.MediaUtil
 import org.thoughtcrime.securesms.util.MessageConstraintsUtil
 import org.thoughtcrime.securesms.util.MessageConstraintsUtil.getEditMessageThresholdHours
 import org.thoughtcrime.securesms.util.MessageConstraintsUtil.isValidEditMessageSend
 import org.thoughtcrime.securesms.util.PlayStoreUtil
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.SaveAttachmentUtil
 import org.thoughtcrime.securesms.util.SignalLocalMetrics
 import org.thoughtcrime.securesms.util.StorageUtil
@@ -461,7 +467,9 @@ class ConversationFragment :
   private val conversationTooltips = ConversationTooltips(this)
   private val colorizer = Colorizer()
   private val textDraftSaveDebouncer = Debouncer(500)
-  private val recentEmojis: RecentEmojiPageModel by lazy { RecentEmojiPageModel(ApplicationDependencies.getApplication(), TextSecurePreferences.RECENT_STORAGE_KEY) }
+  private val doubleTapToEditDebouncer = DoubleClickDebouncer(200)
+  private val recentEmojis: RecentEmojiPageModel by lazy { RecentEmojiPageModel(AppDependencies.application, TextSecurePreferences.RECENT_STORAGE_KEY) }
+  private val nicknameEditActivityLauncher = registerForActivityResult(NicknameActivity.Contract()) {}
 
   private lateinit var layoutManager: ConversationLayoutManager
   private lateinit var markReadHelper: MarkReadHelper
@@ -567,6 +575,7 @@ class ConversationFragment :
     presentWallpaper(args.wallpaper)
     presentChatColors(args.chatColors)
     presentConversationTitle(viewModel.recipientSnapshot)
+    presentGroupConversationSubtitle(createGroupSubtitleString(viewModel.titleViewParticipantsSnapshot))
     presentActionBarMenu()
     presentStoryRing()
 
@@ -627,7 +636,7 @@ class ConversationFragment :
     groupCallViewModel.peekGroupCall()
 
     if (!args.conversationScreenType.isInBubble) {
-      ApplicationDependencies.getMessageNotifier().setVisibleThread(ConversationId.forConversation(args.threadId))
+      AppDependencies.messageNotifier.setVisibleThread(ConversationId.forConversation(args.threadId))
     }
 
     viewModel.updateIdentityRecordsInBackground()
@@ -646,7 +655,7 @@ class ConversationFragment :
       updateToggleButtonState()
     }
 
-    if (SignalStore.rateLimit().needsRecaptcha()) {
+    if (SignalStore.rateLimit.needsRecaptcha()) {
       RecaptchaProofBottomSheetFragment.show(childFragmentManager)
     }
   }
@@ -657,7 +666,7 @@ class ConversationFragment :
     ConversationUtil.refreshRecipientShortcuts()
 
     if (!args.conversationScreenType.isInBubble) {
-      ApplicationDependencies.getMessageNotifier().clearVisibleThread()
+      AppDependencies.messageNotifier.clearVisibleThread()
     }
 
     if (activity?.isFinishing == true) {
@@ -851,6 +860,10 @@ class ConversationFragment :
 
   //endregion
 
+  private fun createGroupSubtitleString(members: List<Recipient>): String {
+    return members.joinToString(", ") { r -> if (r.isSelf) getString(R.string.ConversationTitleView_you) else r.getDisplayName(requireContext()) }
+  }
+
   private fun observeConversationThread() {
     var firstRender = true
     disposables += viewModel
@@ -910,6 +923,12 @@ class ConversationFragment :
       .distinctUntilChanged { r1, r2 -> r1 === r2 || r1.hasSameContent(r2) }
       .subscribeBy(onNext = this::onRecipientChanged)
 
+    disposables += viewModel.titleViewParticipants
+      .map { createGroupSubtitleString(it) }
+      .distinctUntilChanged()
+      .observeOn(AndroidSchedulers.mainThread())
+      .subscribeBy(onNext = this::presentGroupConversationSubtitle)
+
     disposables += viewModel.scrollButtonState
       .subscribeBy(onNext = this::presentScrollButtons)
 
@@ -1109,7 +1128,7 @@ class ConversationFragment :
       }
     })
 
-    ApplicationDependencies.getTypingStatusRepository().getTypists(args.threadId).observe(viewLifecycleOwner) {
+    AppDependencies.typingStatusRepository.getTypists(args.threadId).observe(viewLifecycleOwner) {
       val recipient = viewModel.recipientSnapshot ?: return@observe
 
       typingIndicatorAdapter.setState(
@@ -1124,7 +1143,7 @@ class ConversationFragment :
   }
 
   private fun presentStoryRing() {
-    if (SignalStore.storyValues().isFeatureDisabled) {
+    if (SignalStore.story.isFeatureDisabled) {
       return
     }
 
@@ -1195,7 +1214,7 @@ class ConversationFragment :
 
     if (mediaType == SlideFactory.MediaType.VCARD) {
       conversationActivityResultContracts.launchContactShareEditor(uri, viewModel.recipientSnapshot!!.chatColors)
-    } else if (mediaType == SlideFactory.MediaType.IMAGE || mediaType == SlideFactory.MediaType.GIF || mediaType == SlideFactory.MediaType.VIDEO) {
+    } else {
       val mimeType = MediaUtil.getMimeType(requireContext(), uri) ?: mediaType.toFallbackMimeType()
       val media = Media(
         uri,
@@ -1209,11 +1228,10 @@ class ConversationFragment :
         videoGif,
         Optional.empty(),
         Optional.empty(),
+        Optional.empty(),
         Optional.empty()
       )
       conversationActivityResultContracts.launchMediaEditor(listOf(media), recipientId, composeText.textTrimmed)
-    } else {
-      attachmentManager.setMedia(Glide.with(this), uri, mediaType, MediaConstraints.getPushMediaConstraints(), width, height)
     }
   }
 
@@ -1302,6 +1320,17 @@ class ConversationFragment :
     }
   }
 
+  private fun presentGroupConversationSubtitle(subtitle: String) {
+    val titleView = binding.conversationTitleView.root
+
+    if (subtitle.isBlank()) {
+      titleView.setGroupRecipientSubtitle(null)
+      return
+    }
+
+    titleView.setGroupRecipientSubtitle(subtitle)
+  }
+
   private fun presentConversationTitle(recipient: Recipient?) {
     if (recipient == null) {
       return
@@ -1310,6 +1339,7 @@ class ConversationFragment :
     val titleView = binding.conversationTitleView.root
 
     titleView.setTitle(Glide.with(this), recipient)
+
     if (recipient.expiresInSeconds > 0) {
       titleView.showExpiring(recipient)
     } else {
@@ -1460,7 +1490,7 @@ class ConversationFragment :
       is ShareOrDraftData.SetLocation -> attachmentManager.setLocation(data.location, MediaConstraints.getPushMediaConstraints())
       is ShareOrDraftData.SetEditMessage -> {
         composeText.setDraftText(data.draftText)
-        inputPanel.enterEditMessageMode(Glide.with(this), data.messageEdit, true)
+        inputPanel.enterEditMessageMode(Glide.with(this), data.messageEdit, true, data.clearQuote)
       }
 
       is ShareOrDraftData.SetMedia -> {
@@ -1509,7 +1539,7 @@ class ConversationFragment :
       return
     }
 
-    if (SignalStore.uiHints().hasNotSeenEditMessageBetaAlert()) {
+    if (SignalStore.uiHints.hasNotSeenEditMessageBetaAlert()) {
       Dialogs.showEditMessageBetaDialog(requireContext()) { handleSendEditMessage() }
       return
     }
@@ -1521,12 +1551,6 @@ class ConversationFragment :
       return
     }
 
-    if (!MessageConstraintsUtil.isWithinMaxEdits(editMessage)) {
-      Log.i(TAG, "Too many edits to the message")
-      Dialogs.showAlertDialog(requireContext(), null, resources.getQuantityString(R.plurals.ConversationActivity_edit_message_too_many_edits, MessageConstraintsUtil.MAX_EDIT_COUNT, MessageConstraintsUtil.MAX_EDIT_COUNT))
-      return
-    }
-
     if (!isValidEditMessageSend(editMessage, System.currentTimeMillis())) {
       Log.i(TAG, "Edit message no longer valid")
       val editDurationHours = getEditMessageThresholdHours()
@@ -1664,7 +1688,7 @@ class ConversationFragment :
   }
 
   private fun initializeMediaKeyboard() {
-    val isSystemEmojiPreferred = SignalStore.settings().isPreferSystemEmoji
+    val isSystemEmojiPreferred = SignalStore.settings.isPreferSystemEmoji
     val keyboardMode: TextSecurePreferences.MediaKeyboardMode = TextSecurePreferences.getMediaKeyboardMode(requireContext())
 
     inputPanel.showMediaKeyboardToggle(true)
@@ -1672,7 +1696,7 @@ class ConversationFragment :
     val keyboardPage = when (keyboardMode) {
       TextSecurePreferences.MediaKeyboardMode.EMOJI -> if (isSystemEmojiPreferred) KeyboardPage.STICKER else KeyboardPage.EMOJI
       TextSecurePreferences.MediaKeyboardMode.STICKER -> KeyboardPage.STICKER
-      TextSecurePreferences.MediaKeyboardMode.GIF -> if (FeatureFlags.gifSearchAvailable()) KeyboardPage.GIF else KeyboardPage.STICKER
+      TextSecurePreferences.MediaKeyboardMode.GIF -> if (RemoteConfig.gifSearchAvailable) KeyboardPage.GIF else KeyboardPage.STICKER
     }
 
     inputPanel.setMediaKeyboardToggleMode(keyboardPage)
@@ -1803,7 +1827,7 @@ class ConversationFragment :
       return
     }
 
-    if (SignalStore.uiHints().hasNotSeenTextFormattingAlert() && bodyRanges != null && bodyRanges.ranges.isNotEmpty()) {
+    if (SignalStore.uiHints.hasNotSeenTextFormattingAlert() && bodyRanges != null && bodyRanges.ranges.isNotEmpty()) {
       Dialogs.showFormattedTextDialog(requireContext()) {
         sendMessage(body, mentions, bodyRanges, messageToEdit, quote, scheduledDate, slideDeck, contacts, clearCompose, linkPreviews, preUploadResults, bypassPreSendSafetyNumberCheck, isViewOnce, afterSendComplete)
       }
@@ -2196,6 +2220,7 @@ class ConversationFragment :
     ConversationDialogs.displayDeleteDialog(requireContext(), recipient) {
       messageRequestViewModel
         .onDelete()
+        .doAfterSuccess { activity?.finish() }
         .subscribeWithShowProgress("delete message request")
     }
   }
@@ -2259,13 +2284,20 @@ class ConversationFragment :
   }
 
   private fun handleEditMessage(conversationMessage: ConversationMessage) {
+    if (!MessageConstraintsUtil.isWithinMaxEdits(conversationMessage.messageRecord)) {
+      Log.i(TAG, "Too many edits to the message")
+      Dialogs.showAlertDialog(requireContext(), null, resources.getQuantityString(R.plurals.ConversationActivity_edit_message_too_many_edits, MessageConstraintsUtil.MAX_EDIT_COUNT, MessageConstraintsUtil.MAX_EDIT_COUNT))
+
+      return
+    }
+
     if (isSearchRequested) {
       searchMenuItem?.collapseActionView()
     }
 
     viewModel.resolveMessageToEdit(conversationMessage)
       .subscribeBy { updatedMessage ->
-        inputPanel.enterEditMessageMode(Glide.with(this), updatedMessage, false)
+        inputPanel.enterEditMessageMode(Glide.with(this), updatedMessage, false, false)
       }
       .addTo(disposables)
   }
@@ -2332,19 +2364,43 @@ class ConversationFragment :
 
   private fun handleViewPaymentDetails(conversationMessage: ConversationMessage) {
     val record: MmsMessageRecord = conversationMessage.messageRecord as? MmsMessageRecord ?: return
-    val payment = record.payment ?: return
+    val payment = record.payment
+    if (payment == null || record.isPaymentTombstone) {
+      showPaymentTombstoneLearnMoreDialog()
+      return
+    }
     if (record.isPaymentNotification) {
       startActivity(PaymentsActivity.navigateToPaymentDetails(requireContext(), payment.uuid))
     }
   }
 
+  private fun showPaymentTombstoneLearnMoreDialog() {
+    val dialogBuilder = MaterialAlertDialogBuilder(requireContext())
+    dialogBuilder
+      .setTitle(R.string.PaymentTombstoneLearnMoreDialog_title)
+      .setMessage(R.string.PaymentTombstoneLearnMoreDialog_message)
+      .setPositiveButton(android.R.string.ok, null)
+
+    dialogBuilder.show()
+  }
+
   private fun handleDisplayDetails(conversationMessage: ConversationMessage) {
     val recipientSnapshot = viewModel.recipientSnapshot ?: return
     MessageDetailsFragment.create(conversationMessage.messageRecord, recipientSnapshot.id).show(childFragmentManager, null)
   }
 
   private fun handleDeleteMessages(messageParts: Set<MultiselectPart>) {
+    if (DeleteSyncEducationDialog.shouldShow()) {
+      DeleteSyncEducationDialog
+        .show(childFragmentManager)
+        .subscribe { handleDeleteMessages(messageParts) }
+        .addTo(disposables)
+
+      return
+    }
+
     val records = messageParts.map(MultiselectPart::getMessageRecord).toSet()
+
     disposables += DeleteDialog.show(
       context = requireContext(),
       messageRecords = records
@@ -2734,16 +2790,24 @@ class ConversationFragment :
 
     override fun onItemDoubleClick(item: MultiselectPart) {
       Log.d(TAG, "onItemDoubleClick")
-      if (!isValidEditMessageSend(item.getMessageRecord(), System.currentTimeMillis())) {
+      onDoubleTapToEdit(item.conversationMessage)
+    }
+
+    private fun onDoubleTapToEdit(conversationMessage: ConversationMessage) {
+      if (!isValidEditMessageSend(conversationMessage.getMessageRecord(), System.currentTimeMillis())) {
         return
       }
 
-      if (SignalStore.uiHints().hasSeenDoubleTapEditEducationSheet) {
-        onDoubleTapEditEducationSheetNext(item.conversationMessage)
+      if (SignalStore.uiHints.hasSeenDoubleTapEditEducationSheet) {
+        onDoubleTapEditEducationSheetNext(conversationMessage)
         return
       }
 
-      DoubleTapEditEducationSheet(item).show(childFragmentManager, DoubleTapEditEducationSheet.KEY)
+      DoubleTapEditEducationSheet(conversationMessage).show(childFragmentManager, DoubleTapEditEducationSheet.KEY)
+    }
+
+    override fun onPaymentTombstoneClicked() {
+      this@ConversationFragment.showPaymentTombstoneLearnMoreDialog()
     }
 
     override fun onMessageWithErrorClicked(messageRecord: MessageRecord) {
@@ -2851,8 +2915,21 @@ class ConversationFragment :
       startActivity(RecipientExporter.export(recipient).asAddContactIntent())
     }
 
+    override fun onChangeProfileNameUpdateContact(recipient: Recipient) {
+      if (recipient.isSystemContact) {
+        startActivity(
+          Intent(Intent.ACTION_EDIT).apply {
+            setDataAndType(recipient.contactUri, ContactsContract.Contacts.CONTENT_ITEM_TYPE)
+          }
+        )
+      } else {
+        nicknameEditActivityLauncher.launch(NicknameActivity.Args(recipientId = recipient.id, focusNoteFirst = false))
+      }
+    }
+
     override fun onCallToAction(action: String) {
-      if ("username_edit" == action) {
+      if ("gift_badge" == action) {
+      } else if ("username_edit" == action) {
         startActivity(EditProfileActivity.getIntentForUsernameEdit(requireContext()))
       }
     }
@@ -2930,9 +3007,12 @@ class ConversationFragment :
       requireActivity().startActivity(MediaIntentFactory.create(requireActivity(), args), options.toBundle())
     }
 
-    override fun onEditedIndicatorClicked(messageRecord: MessageRecord) {
-      if (messageRecord.isOutgoing) {
-        EditMessageHistoryDialog.show(childFragmentManager, messageRecord.toRecipient.id, messageRecord)
+    override fun onEditedIndicatorClicked(conversationMessage: ConversationMessage) {
+      val messageRecord = conversationMessage.messageRecord
+      if (conversationMessage.messageRecord.isOutgoing) {
+        if (!doubleTapToEditDebouncer.onClick { EditMessageHistoryDialog.show(childFragmentManager, messageRecord.toRecipient.id, messageRecord) }) {
+          onDoubleTapToEdit(conversationMessage)
+        }
       } else {
         EditMessageHistoryDialog.show(childFragmentManager, messageRecord.fromRecipient.id, messageRecord)
       }
@@ -3515,6 +3595,7 @@ class ConversationFragment :
           MediaUtil.isVideoType(it.mimeType) -> VideoSlide(requireContext(), it.uri, it.size, it.isVideoGif, it.width, it.height, it.caption.orNull(), it.transformProperties.orNull())
           MediaUtil.isGif(it.mimeType) -> GifSlide(requireContext(), it.uri, it.size, it.width, it.height, it.isBorderless, it.caption.orNull())
           MediaUtil.isImageType(it.mimeType) -> ImageSlide(requireContext(), it.uri, it.mimeType, it.size, it.width, it.height, it.isBorderless, it.caption.orNull(), null, it.transformProperties.orNull())
+          MediaUtil.isDocumentType(it.mimeType) -> { DocumentSlide(requireContext(), it.uri, it.mimeType, it.size, it.fileName.orNull()) }
           else -> {
             Log.w(TAG, "Asked to send an unexpected mimeType: '${it.mimeType}'. Skipping.")
             null
@@ -3607,7 +3688,7 @@ class ConversationFragment :
     }
 
     override fun reRegisterAction() {
-      startActivity(RegistrationNavigationActivity.newIntentForReRegistration(requireContext()))
+      startActivity(RegistrationActivity.newIntentForReRegistration(requireContext()))
     }
 
     override fun reviewJoinRequestsAction() {
@@ -3629,7 +3710,7 @@ class ConversationFragment :
 
     @SuppressLint("InlinedApi")
     override fun changeBubbleSettingAction(disableSetting: Boolean) {
-      SignalStore.tooltips().markBubbleOptOutTooltipSeen()
+      SignalStore.tooltips.markBubbleOptOutTooltipSeen()
 
       if (disableSetting) {
         val intent = Intent(Settings.ACTION_APP_NOTIFICATION_BUBBLE_SETTINGS)
@@ -3682,7 +3763,7 @@ class ConversationFragment :
     }
 
     override fun onReRegisterClicked() {
-      startActivity(RegistrationNavigationActivity.newIntentForReRegistration(requireContext()))
+      startActivity(RegistrationActivity.newIntentForReRegistration(requireContext()))
     }
 
     override fun onCancelGroupRequestClicked() {
@@ -3790,7 +3871,7 @@ class ConversationFragment :
     override fun onKey(v: View, keyCode: Int, event: KeyEvent): Boolean {
       if (event.action == KeyEvent.ACTION_DOWN) {
         if (keyCode == KeyEvent.KEYCODE_ENTER) {
-          if (SignalStore.settings().isEnterKeySends || event.isCtrlPressed) {
+          if (SignalStore.settings.isEnterKeySends || event.isCtrlPressed) {
             sendButton.dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER))
             sendButton.dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_ENTER))
             return true
@@ -3857,7 +3938,7 @@ class ConversationFragment :
         return
       }
 
-      val typingStatusSender = ApplicationDependencies.getTypingStatusSender()
+      val typingStatusSender = AppDependencies.typingStatusSender
       if (text.length == 0) {
         typingStatusSender.onTypingStoppedWithNotify(args.threadId)
       } else if (text.length < previousText.length && previousText.contains(text)) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt
index 1826355165..e8a8f2bd68 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt
@@ -13,6 +13,7 @@ import android.os.Build
 import android.text.SpannableStringBuilder
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.graphics.drawable.IconCompat
+import androidx.core.graphics.drawable.toBitmap
 import com.bumptech.glide.Glide
 import com.bumptech.glide.RequestManager
 import com.bumptech.glide.request.target.CustomTarget
@@ -35,6 +36,7 @@ import org.signal.paging.PagingConfig
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.ShortcutLauncherActivity
 import org.thoughtcrime.securesms.attachments.TombstoneAttachment
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatarDrawable
 import org.thoughtcrime.securesms.components.emoji.EmojiStrings
 import org.thoughtcrime.securesms.components.reminder.BubbleOptOutReminder
 import org.thoughtcrime.securesms.components.reminder.ExpiredBuildReminder
@@ -70,7 +72,7 @@ import org.thoughtcrime.securesms.database.model.Quote
 import org.thoughtcrime.securesms.database.model.ReactionRecord
 import org.thoughtcrime.securesms.database.model.StickerRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.MultiDeviceViewOnceOpenJob
 import org.thoughtcrime.securesms.jobs.ServiceOutageDetectionJob
 import org.thoughtcrime.securesms.keyboard.KeyboardUtil
@@ -88,7 +90,6 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.sms.MessageSender
 import org.thoughtcrime.securesms.sms.MessageSender.PreUploadResult
-import org.thoughtcrime.securesms.util.BitmapUtil
 import org.thoughtcrime.securesms.util.DrawableUtil
 import org.thoughtcrime.securesms.util.MediaUtil
 import org.thoughtcrime.securesms.util.MessageUtil
@@ -226,7 +227,7 @@ class ConversationRepository(
 
       if (preUploadResults.isEmpty()) {
         MessageSender.send(
-          ApplicationDependencies.getApplication(),
+          AppDependencies.application,
           message,
           threadId,
           MessageSender.SendType.SIGNAL,
@@ -236,7 +237,7 @@ class ConversationRepository(
         }
       } else {
         MessageSender.sendPushWithPreUploadedMedia(
-          ApplicationDependencies.getApplication(),
+          AppDependencies.application,
           message,
           preUploadResults,
           threadId
@@ -308,7 +309,7 @@ class ConversationRepository(
         ExpiredBuildReminder.isEligible() -> ExpiredBuildReminder(applicationContext)
         UnauthorizedReminder.isEligible(applicationContext) -> UnauthorizedReminder()
         ServiceOutageReminder.isEligible(applicationContext) -> {
-          ApplicationDependencies.getJobManager().add(ServiceOutageDetectionJob())
+          AppDependencies.jobManager.add(ServiceOutageDetectionJob())
           ServiceOutageReminder()
         }
 
@@ -320,7 +321,7 @@ class ConversationRepository(
           GroupsV1MigrationSuggestionsReminder(groupRecord.gv1MigrationSuggestions)
         }
 
-        isInBubble && !SignalStore.tooltips().hasSeenBubbleOptOutTooltip() && Build.VERSION.SDK_INT > 29 -> {
+        isInBubble && !SignalStore.tooltips.hasSeenBubbleOptOutTooltip() && Build.VERSION.SDK_INT > 29 -> {
           BubbleOptOutReminder()
         }
 
@@ -342,7 +343,7 @@ class ConversationRepository(
         emptyList()
       }
 
-      val records = ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecords(recipients)
+      val records = AppDependencies.protocolStore.aci().identities().getIdentityRecords(recipients)
       val isVerified = recipient.registered == RecipientTable.RegisteredState.REGISTERED &&
         Recipient.self().isRegistered &&
         records.isVerified &&
@@ -355,7 +356,7 @@ class ConversationRepository(
   fun resetVerifiedStatusToDefault(unverifiedIdentities: List<IdentityRecord>): Completable {
     return Completable.fromCallable {
       ReentrantSessionLock.INSTANCE.acquire().use {
-        val identityStore = ApplicationDependencies.getProtocolStore().aci().identities()
+        val identityStore = AppDependencies.protocolStore.aci().identities()
         for ((recipientId, identityKey) in unverifiedIdentities) {
           identityStore.setVerified(recipientId, identityKey, VerifiedStatus.DEFAULT)
         }
@@ -421,8 +422,8 @@ class ConversationRepository(
           .createForSingleSessionOnDisk(applicationContext)
 
         attachments.deleteAttachmentFilesForViewOnceMessage(mmsMessageRecord.id)
-        ApplicationDependencies.getViewOnceMessageManager().scheduleIfNecessary()
-        ApplicationDependencies.getJobManager().add(MultiDeviceViewOnceOpenJob(MessageTable.SyncMessageId(mmsMessageRecord.fromRecipient.id, mmsMessageRecord.dateSent)))
+        AppDependencies.viewOnceMessageManager.scheduleIfNecessary()
+        AppDependencies.jobManager.add(MultiDeviceViewOnceOpenJob(MessageTable.SyncMessageId(mmsMessageRecord.fromRecipient.id, mmsMessageRecord.dateSent)))
 
         tempUri
       } catch (e: IOException) {
@@ -489,7 +490,7 @@ class ConversationRepository(
   }
 
   fun getRecipientContactPhotoBitmap(context: Context, requestManager: RequestManager, recipient: Recipient): Single<ShortcutInfoCompat> {
-    val fallback = recipient.fallbackContactPhoto.asDrawable(context, recipient.avatarColor, false)
+    val fallback = FallbackAvatarDrawable(context, recipient.getFallbackAvatar())
 
     return Single
       .create { emitter ->
@@ -576,7 +577,7 @@ class ConversationRepository(
 
   fun startExpirationTimeout(expirationInfos: List<MessageTable.ExpirationInfo>) {
     SignalDatabase.messages.markExpireStarted(expirationInfos.map { it.id to it.expireStarted })
-    ApplicationDependencies.getExpiringMessageManager().scheduleDeletion(expirationInfos)
+    AppDependencies.expiringMessageManager.scheduleDeletion(expirationInfos)
   }
 
   fun markLastSeen(threadId: Long) {
@@ -618,7 +619,7 @@ class ConversationRepository(
    * The result of the Glide load to get a user's contact photo. This can then be transformed into
    * something that the Android system likes via [transformToFinalBitmap]
    */
-  sealed interface ContactPhotoResult {
+  private sealed interface ContactPhotoResult {
 
     companion object {
       private val SHORTCUT_ICON_SIZE = if (Build.VERSION.SDK_INT >= 26) 72.dp else (48 + 16 * 2).dp
@@ -627,7 +628,7 @@ class ConversationRepository(
     class DrawableResult(private val drawable: Drawable) : ContactPhotoResult {
       override fun transformToFinalBitmap(): Single<Bitmap> {
         return Single.create {
-          val bitmap = DrawableUtil.toBitmap(drawable, SHORTCUT_ICON_SIZE, SHORTCUT_ICON_SIZE)
+          val bitmap = DrawableUtil.wrapBitmapForShortcutInfo(drawable.toBitmap(SHORTCUT_ICON_SIZE, SHORTCUT_ICON_SIZE))
           it.setCancellable {
             bitmap.recycle()
           }
@@ -639,7 +640,7 @@ class ConversationRepository(
     class BitmapResult(private val bitmap: Bitmap) : ContactPhotoResult {
       override fun transformToFinalBitmap(): Single<Bitmap> {
         return Single.create {
-          val bitmap = BitmapUtil.createScaledBitmap(bitmap, SHORTCUT_ICON_SIZE, SHORTCUT_ICON_SIZE)
+          val bitmap = DrawableUtil.wrapBitmapForShortcutInfo(bitmap)
           it.setCancellable {
             bitmap.recycle()
           }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
index bc91752ae3..4e8142e107 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
@@ -52,7 +52,7 @@ import org.thoughtcrime.securesms.database.model.ReactionRecord
 import org.thoughtcrime.securesms.database.model.StickerRecord
 import org.thoughtcrime.securesms.database.model.StoryViewState
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.RetrieveProfileJob
 import org.thoughtcrime.securesms.keyboard.KeyboardUtil
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -101,6 +101,17 @@ class ConversationViewModel(
     get() = scrollButtonStateStore.state.unreadCount
 
   val recipient: Observable<Recipient> = recipientRepository.conversationRecipient
+  val titleViewParticipants: Observable<List<Recipient>> = recipient.filter { it.isGroup }.switchMap { groupRecipient ->
+    val firstTenIds = groupRecipient.participantIds
+      .take(10)
+      .sortedBy { it == Recipient.self().id }
+
+    Observable.combineLatest(
+      firstTenIds.map { Recipient.observable(it) }
+    ) { objects ->
+      objects.toList() as List<Recipient>
+    }
+  }
 
   private val _conversationThreadState: Subject<ConversationThreadState> = BehaviorSubject.create()
   val conversationThreadState: Single<ConversationThreadState> = _conversationThreadState.firstOrError()
@@ -122,6 +133,10 @@ class ConversationViewModel(
   var recipientSnapshot: Recipient? = null
     private set
 
+  @Volatile
+  var titleViewParticipantsSnapshot: List<Recipient> = emptyList()
+    private set
+
   val isPushAvailable: Boolean
     get() = recipientSnapshot?.isRegistered == true && Recipient.self().isRegistered
 
@@ -167,6 +182,11 @@ class ConversationViewModel(
         recipientSnapshot = it
       }
 
+    disposables += titleViewParticipants
+      .subscribeBy {
+        titleViewParticipantsSnapshot = it
+      }
+
     val chatColorsDataObservable: Observable<ChatColorsDrawable.ChatColorsData> = Observable.combineLatest(
       recipient.map { it.chatColors }.distinctUntilChanged(),
       chatBounds.distinctUntilChanged()
@@ -199,14 +219,14 @@ class ConversationViewModel(
           controller.onDataInvalidated()
         }
 
-        ApplicationDependencies.getDatabaseObserver().registerMessageUpdateObserver(messageUpdateObserver)
-        ApplicationDependencies.getDatabaseObserver().registerMessageInsertObserver(threadId, messageInsertObserver)
-        ApplicationDependencies.getDatabaseObserver().registerConversationObserver(threadId, conversationObserver)
+        AppDependencies.databaseObserver.registerMessageUpdateObserver(messageUpdateObserver)
+        AppDependencies.databaseObserver.registerMessageInsertObserver(threadId, messageInsertObserver)
+        AppDependencies.databaseObserver.registerConversationObserver(threadId, conversationObserver)
 
         emitter.setCancellable {
-          ApplicationDependencies.getDatabaseObserver().unregisterObserver(messageUpdateObserver)
-          ApplicationDependencies.getDatabaseObserver().unregisterObserver(messageInsertObserver)
-          ApplicationDependencies.getDatabaseObserver().unregisterObserver(conversationObserver)
+          AppDependencies.databaseObserver.unregisterObserver(messageUpdateObserver)
+          AppDependencies.databaseObserver.unregisterObserver(messageInsertObserver)
+          AppDependencies.databaseObserver.unregisterObserver(conversationObserver)
         }
       }
     }.subscribeOn(Schedulers.io()).subscribe()
@@ -240,8 +260,8 @@ class ConversationViewModel(
         conversationRecipient = recipient,
         messageRequestState = messageRequestRepository.getMessageRequestState(recipient, threadId),
         groupRecord = groupRecord.orNull(),
-        isClientExpired = SignalStore.misc().isClientDeprecated,
-        isUnauthorized = TextSecurePreferences.isUnauthorizedReceived(ApplicationDependencies.getApplication()),
+        isClientExpired = SignalStore.misc.isClientDeprecated,
+        isUnauthorized = TextSecurePreferences.isUnauthorizedReceived(AppDependencies.application),
       )
     }.doOnNext {
       hasMessageRequestStateSubject.onNext(it.messageRequestState)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/DoubleTapEditEducationSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/DoubleTapEditEducationSheet.kt
index 95a82a7b74..435a12f44c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/DoubleTapEditEducationSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/DoubleTapEditEducationSheet.kt
@@ -9,14 +9,13 @@ import com.google.android.material.button.MaterialButton
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.FixedRoundedCornerBottomSheetDialogFragment
 import org.thoughtcrime.securesms.conversation.ConversationMessage
-import org.thoughtcrime.securesms.conversation.mutiselect.MultiselectPart
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.fragments.requireListener
 
 /**
  * Shows an education sheet to users explaining how double tapping a sent message within 24hrs will allow them to edit it
  */
-class DoubleTapEditEducationSheet(private val item: MultiselectPart) : FixedRoundedCornerBottomSheetDialogFragment() {
+class DoubleTapEditEducationSheet(private val conversationMessage: ConversationMessage) : FixedRoundedCornerBottomSheetDialogFragment() {
 
   companion object {
     const val KEY = "DOUBLE_TAP_EDIT_EDU"
@@ -29,17 +28,17 @@ class DoubleTapEditEducationSheet(private val item: MultiselectPart) : FixedRoun
   }
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    SignalStore.uiHints().hasSeenDoubleTapEditEducationSheet = true
+    SignalStore.uiHints.hasSeenDoubleTapEditEducationSheet = true
 
     view.findViewById<MaterialButton>(R.id.got_it).setOnClickListener {
-      requireListener<Callback>().onDoubleTapEditEducationSheetNext(item.conversationMessage)
+      requireListener<Callback>().onDoubleTapEditEducationSheetNext(conversationMessage)
       dismissAllowingStateLoss()
     }
   }
 
   override fun onCancel(dialog: DialogInterface) {
     super.onCancel(dialog)
-    requireListener<Callback>().onDoubleTapEditEducationSheetNext(item.conversationMessage)
+    requireListener<Callback>().onDoubleTapEditEducationSheetNext(conversationMessage)
   }
 
   interface Callback {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource.kt
index c2411d314a..577116fa0a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/data/ConversationDataSource.kt
@@ -20,11 +20,11 @@ import org.thoughtcrime.securesms.database.model.InMemoryMessageRecord.RemovedCo
 import org.thoughtcrime.securesms.database.model.InMemoryMessageRecord.UniversalExpireTimerUpdate
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.messagerequests.MessageRequestRepository
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
 
 private typealias ConversationElement = MappingModel<*>
@@ -125,7 +125,7 @@ class ConversationDataSource(
     records = MessageDataFetcher.updateModelsWithData(records, extraData).toMutableList()
     stopwatch.split("models")
 
-    if (FeatureFlags.messageBackups() && SignalStore.backup().restoreState.inProgress) {
+    if (RemoteConfig.messageBackups && SignalStore.backup.restoreState.inProgress) {
       BackupRestoreManager.prioritizeAttachmentsIfNeeded(records)
       stopwatch.split("restore")
     }
@@ -196,7 +196,7 @@ class ConversationDataSource(
         return ConversationMessageFactory.createWithUnresolvedData(
           localContext,
           record,
-          record.getDisplayBody(ApplicationDependencies.getApplication()),
+          record.getDisplayBody(AppDependencies.application),
           extraData.mentionsById[record.id],
           extraData.hasBeenQuoted.contains(record.id),
           threadRecipient
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher.kt
index 9a0efc0084..7c55a87208 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/data/MessageDataFetcher.kt
@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.database.model.withAttachments
 import org.thoughtcrime.securesms.database.model.withCall
 import org.thoughtcrime.securesms.database.model.withPayment
 import org.thoughtcrime.securesms.database.model.withReactions
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.payments.Payment
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -52,7 +52,7 @@ object MessageDataFetcher {
   @WorkerThread
   fun fetch(messageRecords: List<MessageRecord>): ExtraMessageData {
     val startTimeNanos = System.nanoTime()
-    val context = ApplicationDependencies.getApplication()
+    val context = AppDependencies.application
 
     val messageIds: List<Long> = messageRecords.map { it.id }
     val executor = SignalExecutors.BOUNDED
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel.kt
index d2b15aeafa..491eebecaa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupCallViewModel.kt
@@ -10,7 +10,7 @@ import io.reactivex.rxjava3.processors.PublishProcessor
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.conversation.v2.ConversationRecipientRepository
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.events.GroupCallPeekEvent
 import org.thoughtcrime.securesms.util.rx.RxStore
 
@@ -60,7 +60,7 @@ class ConversationGroupCallViewModel(
       .subscribeBy { s: ConversationGroupCallState ->
         if (s.recipientId != null && s.activeV2Group) {
           Log.i(TAG, "Peek call for ${s.recipientId}")
-          ApplicationDependencies.getSignalCallManager().peekGroupCall(s.recipientId)
+          AppDependencies.signalCallManager.peekGroupCall(s.recipientId)
         }
       }
       .addTo(disposables)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel.kt
index 4c965aaf3d..688ec2a40d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/groups/ConversationGroupViewModel.kt
@@ -16,7 +16,7 @@ import org.signal.core.util.concurrent.subscribeWithSubject
 import org.thoughtcrime.securesms.conversation.v2.ConversationRecipientRepository
 import org.thoughtcrime.securesms.database.GroupTable
 import org.thoughtcrime.securesms.database.model.GroupRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.groups.ui.GroupChangeFailureReason
 import org.thoughtcrime.securesms.groups.v2.GroupBlockJoinRequestResult
@@ -123,7 +123,7 @@ class ConversationGroupViewModel(
       .filter { it.isPushV2Group && !it.isBlocked }
       .subscribe {
         val groupId = it.requireGroupId().requireV2()
-        ApplicationDependencies.getJobManager()
+        AppDependencies.jobManager
           .startChain(RequestGroupV2InfoJob(groupId))
           .then(GroupV2UpdateSelfProfileKeyJob.withoutLimits(groupId))
           .enqueue()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemMediaViewHolder.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemMediaViewHolder.kt
index 418a8204f8..671d69316f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemMediaViewHolder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemMediaViewHolder.kt
@@ -97,7 +97,7 @@ class V2ConversationItemMediaViewHolder<Model : MappingModel<Model>>(
     )
 
     quoteView.setWallpaperEnabled(conversationContext.hasWallpaper())
-    quoteView.setTextSize(TypedValue.COMPLEX_UNIT_SP, SignalStore.settings().getMessageQuoteFontSize(context).toFloat())
+    quoteView.setTextSize(TypedValue.COMPLEX_UNIT_SP, SignalStore.settings.getMessageQuoteFontSize(context).toFloat())
 
     val isOutgoing = conversationMessage.messageRecord.isOutgoing
     when (shape) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt
index 732609e6c8..58a96be3b1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt
@@ -42,7 +42,7 @@ import org.thoughtcrime.securesms.conversation.v2.computed.FormattedDate
 import org.thoughtcrime.securesms.conversation.v2.data.ConversationMessageElement
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -168,7 +168,7 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
     binding.body.setOnLongClickListener(passthroughClickListener)
 
     binding.body.isFocusable = false
-    binding.body.setTextSize(TypedValue.COMPLEX_UNIT_SP, SignalStore.settings().messageFontSize.toFloat())
+    binding.body.setTextSize(TypedValue.COMPLEX_UNIT_SP, SignalStore.settings.messageFontSize.toFloat())
     binding.body.movementMethod = LongClickMovementMethod.getInstance(context)
 
     if (binding.isIncoming) {
@@ -506,7 +506,7 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
         timer.startAnimation()
 
         if (record.expireStarted + record.expiresIn <= System.currentTimeMillis()) {
-          ApplicationDependencies.getExpiringMessageManager().checkSchedule()
+          AppDependencies.expiringMessageManager.checkSchedule()
         }
       } else if (!record.isOutgoing && !record.isMediaPending) {
         conversationContext.onStartExpirationTimeout(record)
@@ -677,7 +677,7 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
         }
 
         binding.footerDate.setOnClickListener {
-          conversationContext.clickListener.onEditedIndicatorClicked(record)
+          conversationContext.clickListener.onEditedIndicatorClicked(conversationMessage)
         }
       }
 
@@ -747,7 +747,7 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
       messageRecord.isFailed -> {
         conversationContext.clickListener.onMessageWithErrorClicked(messageRecord)
       }
-      messageRecord.isRateLimited && SignalStore.rateLimit().needsRecaptcha() -> {
+      messageRecord.isRateLimited && SignalStore.rateLimit.needsRecaptcha() -> {
         conversationContext.clickListener.onMessageWithRecaptchaNeededClicked(messageRecord)
       }
       messageRecord.isOutgoing && messageRecord.isIdentityMismatchFailure -> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/keyboard/AttachmentKeyboardFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/keyboard/AttachmentKeyboardFragment.kt
index 86dfd09caf..08a309faa6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/keyboard/AttachmentKeyboardFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/keyboard/AttachmentKeyboardFragment.kt
@@ -56,7 +56,7 @@ class AttachmentKeyboardFragment : LoggingFragment(R.layout.attachment_keyboard_
     attachmentKeyboardView = view.findViewById(R.id.attachment_keyboard)
     attachmentKeyboardView.apply {
       setCallback(this@AttachmentKeyboardFragment)
-      if (!SignalStore.paymentsValues().paymentsAvailability.isSendAllowed) {
+      if (!SignalStore.payments.paymentsAvailability.isSendAllowed) {
         filterAttachmentKeyboardButtons(removePaymentFilter)
       }
     }
@@ -103,7 +103,7 @@ class AttachmentKeyboardFragment : LoggingFragment(R.layout.attachment_keyboard_
   }
 
   private fun updatePaymentsAvailable(recipient: Recipient) {
-    val paymentsValues = SignalStore.paymentsValues()
+    val paymentsValues = SignalStore.payments
     if (paymentsValues.paymentsAvailability.isSendAllowed &&
       !recipient.isSelf &&
       !recipient.isGroup &&
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListDataSource.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListDataSource.java
index 12d0e9cbc6..a6b1eed2e6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListDataSource.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListDataSource.java
@@ -20,7 +20,7 @@
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.database.model.UpdateDescription;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.SignalTrace;
@@ -86,9 +86,9 @@ public int size() {
         } else if (MessageTypes.isGroupUpdate(record.getType())) {
           UpdateDescription description;
           if (record.getMessageExtras() != null) {
-            description = MessageRecord.getGv2ChangeDescription(ApplicationDependencies.getApplication(), record.getMessageExtras(), null);
+            description = MessageRecord.getGv2ChangeDescription(AppDependencies.getApplication(), record.getMessageExtras(), null);
           } else {
-            description = MessageRecord.getGv2ChangeDescription(ApplicationDependencies.getApplication(), record.getBody(), null);
+            description = MessageRecord.getGv2ChangeDescription(AppDependencies.getApplication(), record.getBody(), null);
           }
           needsResolve.addAll(description.getMentioned().stream().map(RecipientId::from).collect(Collectors.toList()));
         }
@@ -97,7 +97,7 @@ public int size() {
 
     stopwatch.split("cursor");
 
-    ApplicationDependencies.getRecipientCache().addToCache(recipients);
+    AppDependencies.getRecipientCache().addToCache(recipients);
     stopwatch.split("cache-recipients");
 
     Recipient.resolvedList(needsResolve);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
index b1968b0427..6871637539 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -90,6 +90,8 @@
 import org.thoughtcrime.securesms.MuteDialog;
 import org.thoughtcrime.securesms.NewConversationActivity;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.backup.v2.ui.BackupAlertDelegate;
+import org.thoughtcrime.securesms.components.DeleteSyncEducationDialog;
 import org.thoughtcrime.securesms.components.Material3SearchToolbar;
 import org.thoughtcrime.securesms.components.SignalProgressDialog;
 import org.thoughtcrime.securesms.components.menu.ActionItem;
@@ -129,7 +131,7 @@
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.ThreadTable;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.events.ReminderUpdateEvent;
 import org.thoughtcrime.securesms.groups.SelectionLimits;
 import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob;
@@ -151,7 +153,7 @@
 import org.thoughtcrime.securesms.ratelimit.RecaptchaProofBottomSheetFragment;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
+import org.thoughtcrime.securesms.registration.ui.RegistrationActivity;
 import org.thoughtcrime.securesms.search.MessageResult;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.sms.MessageSender;
@@ -195,7 +197,8 @@
 
 public class ConversationListFragment extends MainFragment implements ActionMode.Callback,
                                                                       ConversationListAdapter.OnConversationClickListener,
-                                                                      MegaphoneActionController, ClearFilterViewHolder.OnClearFilterClickListener
+                                                                      MegaphoneActionController,
+                                                                      ClearFilterViewHolder.OnClearFilterClickListener
 {
   public static final short MESSAGE_REQUESTS_REQUEST_CODE_CREATE_NAME = 32562;
   public static final short SMS_ROLE_REQUEST_CODE                     = 32563;
@@ -267,6 +270,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
 
   @Override
   public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+    BackupAlertDelegate.delegate(getParentFragmentManager(), getViewLifecycleOwner().getLifecycle());
+
     lifecycleDisposable = new LifecycleDisposable();
     lifecycleDisposable.bindTo(getViewLifecycleOwner());
 
@@ -289,7 +294,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
                                                       SelectionLimits.NO_LIMITS,
                                                       new ContactSearchAdapter.DisplayOptions(
                                                           false,
-                                                          ContactSearchAdapter.DisplaySmsTag.DEFAULT,
                                                           ContactSearchAdapter.DisplaySecondaryInformation.NEVER,
                                                           false,
                                                           false
@@ -481,7 +485,7 @@ public void onResume() {
   @Override
   public void onStart() {
     super.onStart();
-    ApplicationDependencies.getAppForegroundObserver().addListener(appForegroundObserver);
+    AppDependencies.getAppForegroundObserver().addListener(appForegroundObserver);
     itemAnimator.disable();
   }
 
@@ -498,7 +502,7 @@ public void onPause() {
   @Override
   public void onStop() {
     super.onStop();
-    ApplicationDependencies.getAppForegroundObserver().removeListener(appForegroundObserver);
+    AppDependencies.getAppForegroundObserver().removeListener(appForegroundObserver);
   }
 
   @Override
@@ -536,9 +540,6 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
     } else if (itemId == R.id.menu_mark_all_read) {
       handleMarkAllRead();
       return true;
-    } else if (itemId == R.id.menu_invite) {
-      handleInvite();
-      return true;
     } else if (itemId == R.id.menu_notification_profile) {
       handleNotificationProfile();
       return true;
@@ -746,7 +747,7 @@ private void onReminderAction(@IdRes int reminderActionId) {
     } else if (reminderActionId == R.id.reminder_action_fix_username_link) {
       startActivity(AppSettingsActivity.usernameLinkSettings(requireContext()));
     } else if (reminderActionId == R.id.reminder_action_re_register) {
-      startActivity(RegistrationNavigationActivity.newIntentForReRegistration(requireContext()));
+      startActivity(RegistrationActivity.newIntentForReRegistration(requireContext()));
     }
   }
 
@@ -880,7 +881,7 @@ private void setAdapter(@NonNull RecyclerView.Adapter adapter) {
   }
 
   private void initializeTypingObserver() {
-    ApplicationDependencies.getTypingStatusRepository().getTypingThreads().observe(getViewLifecycleOwner(), threadIds -> {
+    AppDependencies.getTypingStatusRepository().getTypingThreads().observe(getViewLifecycleOwner(), threadIds -> {
       if (threadIds == null) {
         threadIds = Collections.emptySet();
       }
@@ -1000,7 +1001,7 @@ private void updateReminders() {
       } else if (UnauthorizedReminder.isEligible(context)) {
         return Optional.of(new UnauthorizedReminder());
       } else if (ServiceOutageReminder.isEligible(context)) {
-        ApplicationDependencies.getJobManager().add(new ServiceOutageDetectionJob());
+        AppDependencies.getJobManager().add(new ServiceOutageDetectionJob());
         return Optional.of(new ServiceOutageReminder());
       } else if (OutdatedBuildReminder.isEligible()) {
         return Optional.of(new OutdatedBuildReminder(context));
@@ -1011,7 +1012,7 @@ private void updateReminders() {
       } else if (CdsPermanentErrorReminder.isEligible()) {
         return Optional.of(new CdsPermanentErrorReminder());
       } else if (UsernameOutOfSyncReminder.isEligible()) {
-        ApplicationDependencies.getJobManager().add(new RefreshOwnProfileJob());
+        AppDependencies.getJobManager().add(new RefreshOwnProfileJob());
         return Optional.of(new UsernameOutOfSyncReminder());
       } else {
         return Optional.<Reminder>empty();
@@ -1048,7 +1049,7 @@ private void handleMarkAllRead() {
     SignalExecutors.BOUNDED.execute(() -> {
       List<MarkedMessageInfo> messageIds = SignalDatabase.threads().setAllThreadsRead();
 
-      ApplicationDependencies.getMessageNotifier().updateNotification(context);
+      AppDependencies.getMessageNotifier().updateNotification(context);
       MarkReadReceiver.process(messageIds);
     });
   }
@@ -1063,7 +1064,7 @@ private void handleMarkAsRead(@NonNull Collection<Long> ids) {
       List<MarkedMessageInfo> messageIds = SignalDatabase.threads().setRead(ids, false);
       stopwatch.split("db");
 
-      ApplicationDependencies.getMessageNotifier().updateNotification(context);
+      AppDependencies.getMessageNotifier().updateNotification(context);
       stopwatch.split("notification");
 
       MarkReadReceiver.process(messageIds);
@@ -1089,10 +1090,6 @@ private void handleMarkAsUnread(@NonNull Collection<Long> ids) {
     });
   }
 
-  private void handleInvite() {
-    getNavigator().goToInvite();
-  }
-
   private void handleNotificationProfile() {
     NotificationProfileSelectionFragment.show(getParentFragmentManager());
   }
@@ -1137,14 +1134,30 @@ protected void reverseAction(@Nullable Void parameter) {
 
   @SuppressLint("StaticFieldLeak")
   private void handleDelete(@NonNull Collection<Long> ids) {
+    if (DeleteSyncEducationDialog.shouldShow()) {
+      lifecycleDisposable.add(
+          DeleteSyncEducationDialog.show(getChildFragmentManager())
+                                   .subscribe(() -> handleDelete(ids))
+      );
+
+      return;
+    }
+
     int                        conversationsCount = ids.size();
     MaterialAlertDialogBuilder alert              = new MaterialAlertDialogBuilder(requireActivity());
     Context                    context            = requireContext();
 
     alert.setTitle(context.getResources().getQuantityString(R.plurals.ConversationListFragment_delete_selected_conversations,
                                                             conversationsCount, conversationsCount));
-    alert.setMessage(context.getResources().getQuantityString(R.plurals.ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations,
-                                                              conversationsCount, conversationsCount));
+
+    if (TextSecurePreferences.isMultiDevice(context) && Recipient.self().getDeleteSyncCapability().isSupported()) {
+      alert.setMessage(context.getResources().getQuantityString(R.plurals.ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device,
+                                                                conversationsCount, conversationsCount));
+    } else {
+      alert.setMessage(context.getResources().getQuantityString(R.plurals.ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations,
+                                                                conversationsCount, conversationsCount));
+    }
+
     alert.setCancelable(true);
 
     alert.setPositiveButton(R.string.delete, (dialog, which) -> {
@@ -1165,8 +1178,8 @@ protected void onPreExecute() {
 
           @Override
           protected Void doInBackground(Void... params) {
-            SignalDatabase.threads().deleteConversations(selectedConversations);
-            ApplicationDependencies.getMessageNotifier().updateNotification(requireActivity());
+            SignalDatabase.threads().deleteConversations(selectedConversations, true);
+            AppDependencies.getMessageNotifier().updateNotification(requireActivity());
             return null;
           }
 
@@ -1561,7 +1574,7 @@ protected void executeAction(@Nullable Long parameter) {
 
         if (unreadCount > 0) {
           List<MarkedMessageInfo> messageIds = threadTable.setRead(threadId, false);
-          ApplicationDependencies.getMessageNotifier().updateNotification(context);
+          AppDependencies.getMessageNotifier().updateNotification(context);
           MarkReadReceiver.process(messageIds);
         }
 
@@ -1577,7 +1590,7 @@ protected void reverseAction(@Nullable Long parameter) {
 
         if (unreadCount > 0) {
           threadTable.incrementUnread(threadId, unreadCount, unreadSelfMentionsCount);
-          ApplicationDependencies.getMessageNotifier().updateNotification(context);
+          AppDependencies.getMessageNotifier().updateNotification(context);
         }
 
         ConversationUtil.refreshRecipientShortcuts();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListViewModel.kt
index 23b772c583..09ed179957 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListViewModel.kt
@@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.conversationlist.model.ConversationFilter
 import org.thoughtcrime.securesms.conversationlist.model.ConversationSet
 import org.thoughtcrime.securesms.database.RxDatabaseObserver
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.megaphone.Megaphone
 import org.thoughtcrime.securesms.megaphone.MegaphoneRepository
@@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit
 
 class ConversationListViewModel(
   private val isArchived: Boolean,
-  private val megaphoneRepository: MegaphoneRepository = ApplicationDependencies.getMegaphoneRepository(),
+  private val megaphoneRepository: MegaphoneRepository = AppDependencies.megaphoneRepository,
   private val notificationProfilesRepository: NotificationProfilesRepository = NotificationProfilesRepository()
 ) : ViewModel() {
 
@@ -64,7 +64,7 @@ class ConversationListViewModel(
   val pinnedCount: Int
     get() = store.state.pinnedCount
   val webSocketState: Observable<WebSocketConnectionState>
-    get() = ApplicationDependencies.getSignalWebSocket().webSocketState.observeOn(AndroidSchedulers.mainThread())
+    get() = AppDependencies.webSocketObserver.observeOn(AndroidSchedulers.mainThread())
 
   @get:JvmName("currentSelectedConversations")
   val currentSelectedConversations: Set<Conversation>
@@ -80,7 +80,7 @@ class ConversationListViewModel(
         ConversationListDataSource.create(
           it.filter,
           isArchived,
-          SignalStore.uiHints().canDisplayPullToFilterTip() && it.source === ConversationFilterSource.OVERFLOW
+          SignalStore.uiHints.canDisplayPullToFilterTip() && it.source === ConversationFilterSource.OVERFLOW
         )
       }
       .replay(1)
@@ -134,7 +134,7 @@ class ConversationListViewModel(
     }
 
     if (!coldStart) {
-      ApplicationDependencies.getDatabaseObserver().notifyConversationListListeners()
+      AppDependencies.databaseObserver.notifyConversationListListeners()
     }
     coldStart = false
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/model/ConversationReader.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/model/ConversationReader.java
index cdea1718bc..4915cfd0cf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/model/ConversationReader.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/model/ConversationReader.java
@@ -6,7 +6,7 @@
 
 import org.thoughtcrime.securesms.database.ThreadTable;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.signal.core.util.CursorUtil;
 
@@ -24,7 +24,7 @@ public class ConversationReader extends ThreadTable.StaticReader {
   private final Cursor cursor;
 
   public ConversationReader(@NonNull Cursor cursor) {
-    super(cursor, ApplicationDependencies.getApplication());
+    super(cursor, AppDependencies.getApplication());
     this.cursor = cursor;
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/model/UnreadPaymentsLiveData.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/model/UnreadPaymentsLiveData.java
index 78f8c52e1e..2305851640 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/model/UnreadPaymentsLiveData.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/model/UnreadPaymentsLiveData.java
@@ -8,7 +8,7 @@
 import org.thoughtcrime.securesms.database.DatabaseObserver;
 import org.thoughtcrime.securesms.database.PaymentTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.concurrent.SerialMonoLifoExecutor;
 
@@ -36,12 +36,12 @@ public UnreadPaymentsLiveData() {
   @Override
   protected void onActive() {
     refreshUnreadPayments();
-    ApplicationDependencies.getDatabaseObserver().registerAllPaymentsObserver(observer);
+    AppDependencies.getDatabaseObserver().registerAllPaymentsObserver(observer);
   }
 
   @Override
   protected void onInactive() {
-    ApplicationDependencies.getDatabaseObserver().unregisterObserver(observer);
+    AppDependencies.getDatabaseObserver().unregisterObserver(observer);
   }
 
   private void refreshUnreadPayments() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/EncryptedPreferences.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/EncryptedPreferences.java
index 4fc540a526..ac9092100e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/crypto/EncryptedPreferences.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/EncryptedPreferences.java
@@ -7,7 +7,6 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.Base64;
-import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.util.LRUCache;
 
@@ -26,8 +25,6 @@
 
 public class EncryptedPreferences implements SharedPreferences {
 
-  private static final String TAG = Log.tag(EncryptedPreferences.class);
-
   private static final String NULL_VALUE = "__NULL__";
 
   private static final int MAX_CACHE_SIZE = 50;
@@ -374,14 +371,7 @@ private Object getDecryptedObject(String key) {
     synchronized (cache) {
       String encryptedValue = sharedPreferences.getString(key, null);
       if (encryptedValue != null) {
-        byte[] bytes;
-        try {
-          bytes = decrypt(key, encryptedValue, masterCipher);
-        } catch (SecurityException se) {
-          Log.e(TAG, "'" + key + "' reset to default: " + se);
-          cache.put(cacheKey, null);
-          return null;
-        }
+        byte[] bytes = decrypt(key, encryptedValue, masterCipher);
         ByteBuffer buffer = ByteBuffer.wrap(bytes);
         buffer.position(0);
         int typeId = buffer.getInt();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/SealedSenderAccessUtil.java
similarity index 53%
rename from app/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java
rename to app/src/main/java/org/thoughtcrime/securesms/crypto/SealedSenderAccessUtil.java
index fe7c1b9540..213104bbd8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/SealedSenderAccessUtil.java
@@ -1,17 +1,17 @@
 package org.thoughtcrime.securesms.crypto;
 
 
-import android.content.Context;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
 import com.annimon.stream.Stream;
 
+import org.signal.core.util.Base64;
 import org.signal.core.util.logging.Log;
 import org.signal.libsignal.metadata.certificate.CertificateValidator;
 import org.signal.libsignal.metadata.certificate.InvalidCertificateException;
+import org.signal.libsignal.metadata.certificate.SenderCertificate;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
@@ -21,10 +21,8 @@
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.signal.core.util.Base64;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -35,9 +33,9 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-public class UnidentifiedAccessUtil {
+public class SealedSenderAccessUtil {
 
-  private static final String TAG = Log.tag(UnidentifiedAccessUtil.class);
+  private static final String TAG = Log.tag(SealedSenderAccessUtil.class);
 
   private static final byte[] UNRESTRICTED_KEY = new byte[16];
 
@@ -46,28 +44,34 @@ public static CertificateValidator getCertificateValidator() {
   }
 
   @WorkerThread
-  public static Optional<UnidentifiedAccessPair> getAccessFor(@NonNull Context context, @NonNull Recipient recipient) {
-    return getAccessFor(context, recipient, true);
+  public static @Nullable SealedSenderAccess getSealedSenderAccessFor(@NonNull Recipient recipient) {
+    return getSealedSenderAccessFor(recipient, true);
   }
 
   @WorkerThread
-  public static Optional<UnidentifiedAccessPair> getAccessFor(@NonNull Context context, @NonNull Recipient recipient, boolean log) {
-    return getAccessFor(context, Collections.singletonList(recipient), log).get(0);
+  public static @Nullable SealedSenderAccess getSealedSenderAccessFor(@NonNull Recipient recipient, boolean log) {
+    return SealedSenderAccess.forIndividual(getAccessFor(recipient, log));
+  }
+
+  public static @Nullable SealedSenderAccess getSealedSenderAccessFor(@NonNull Recipient recipient, @Nullable SealedSenderAccess.CreateGroupSendToken createGroupSendToken) {
+    return SealedSenderAccess.forIndividualWithGroupFallback(getAccessFor(recipient, true), getSealedSenderCertificate(), createGroupSendToken);
   }
 
   @WorkerThread
-  public static List<Optional<UnidentifiedAccessPair>> getAccessFor(@NonNull Context context, @NonNull List<Recipient> recipients) {
-    return getAccessFor(context, recipients, true);
+  private static @Nullable UnidentifiedAccess getAccessFor(@NonNull Recipient recipient, boolean log) {
+    return getAccessFor(Collections.singletonList(recipient), false, log)
+        .get(0)
+        .orElse(null);
   }
 
   @WorkerThread
-  public static Map<RecipientId, Optional<UnidentifiedAccessPair>> getAccessMapFor(@NonNull Context context, @NonNull List<Recipient> recipients, boolean isForStory) {
-    List<Optional<UnidentifiedAccessPair>> accessList = getAccessFor(context, recipients, isForStory, true);
+  public static Map<RecipientId, Optional<UnidentifiedAccess>> getAccessMapFor(@NonNull List<Recipient> recipients, boolean isForStory) {
+    List<Optional<UnidentifiedAccess>> accessList = getAccessFor(recipients, isForStory, true);
 
-    Iterator<Recipient>                        recipientIterator = recipients.iterator();
-    Iterator<Optional<UnidentifiedAccessPair>> accessIterator    = accessList.iterator();
+    Iterator<Recipient>                    recipientIterator = recipients.iterator();
+    Iterator<Optional<UnidentifiedAccess>> accessIterator    = accessList.iterator();
 
-    Map<RecipientId, Optional<UnidentifiedAccessPair>> accessMap = new HashMap<>(recipients.size());
+    Map<RecipientId, Optional<UnidentifiedAccess>> accessMap = new HashMap<>(recipients.size());
 
     while (recipientIterator.hasNext()) {
       accessMap.put(recipientIterator.next().getId(), accessIterator.next());
@@ -77,40 +81,22 @@ public static Map<RecipientId, Optional<UnidentifiedAccessPair>> getAccessMapFor
   }
 
   @WorkerThread
-  public static List<Optional<UnidentifiedAccessPair>> getAccessFor(@NonNull Context context, @NonNull List<Recipient> recipients, boolean log) {
-    return getAccessFor(context, recipients, false, log);
-  }
-
-  @WorkerThread
-  public static List<Optional<UnidentifiedAccessPair>> getAccessFor(@NonNull Context context, @NonNull List<Recipient> recipients, boolean isForStory, boolean log) {
-    final byte[] ourUnidentifiedAccessKey;
-
-    if (TextSecurePreferences.isUniversalUnidentifiedAccess(context)) {
-      ourUnidentifiedAccessKey = UNRESTRICTED_KEY;
-    } else {
-      ourUnidentifiedAccessKey = ProfileKeyUtil.getSelfProfileKey().deriveAccessKey();
-    }
-
+  private static List<Optional<UnidentifiedAccess>> getAccessFor(@NonNull List<Recipient> recipients, boolean isForStory, boolean log) {
     CertificateType certificateType                  = getUnidentifiedAccessCertificateType();
-    byte[]          ourUnidentifiedAccessCertificate = SignalStore.certificateValues().getUnidentifiedAccessCertificate(certificateType);
+    byte[]          ourUnidentifiedAccessCertificate = SignalStore.certificate().getUnidentifiedAccessCertificate(certificateType);
 
-    List<Optional<UnidentifiedAccessPair>> access = recipients.parallelStream().map(recipient -> {
-      UnidentifiedAccessPair unidentifiedAccessPair = null;
+    List<Optional<UnidentifiedAccess>> access = recipients.parallelStream().map(recipient -> {
+      UnidentifiedAccess unidentifiedAccess = null;
       if (ourUnidentifiedAccessCertificate != null) {
         try {
-          UnidentifiedAccess theirAccess = getTargetUnidentifiedAccess(recipient, ourUnidentifiedAccessCertificate, isForStory);
-          UnidentifiedAccess ourAccess   = new UnidentifiedAccess(ourUnidentifiedAccessKey, ourUnidentifiedAccessCertificate, false);
-
-          if (theirAccess != null) {
-            unidentifiedAccessPair = new UnidentifiedAccessPair(theirAccess, ourAccess);
-          }
+          unidentifiedAccess = getTargetUnidentifiedAccess(recipient, ourUnidentifiedAccessCertificate, isForStory);
         } catch (InvalidCertificateException e) {
           Log.w(TAG, "Invalid unidentified access certificate!", e);
         }
       } else {
-        Log.w(TAG, "Missing unidentified access certificate!");
+        Log.w(TAG, "Missing our unidentified access certificate!");
       }
-      return Optional.ofNullable(unidentifiedAccessPair);
+      return Optional.ofNullable(unidentifiedAccess);
     }).collect(Collectors.toList());
 
     int unidentifiedCount = Stream.of(access).filter(Optional::isPresent).toList().size();
@@ -123,28 +109,17 @@ public static List<Optional<UnidentifiedAccessPair>> getAccessFor(@NonNull Conte
     return access;
   }
 
-  public static Optional<UnidentifiedAccessPair> getAccessForSync(@NonNull Context context) {
-    try {
-      byte[] ourUnidentifiedAccessKey         = UnidentifiedAccess.deriveAccessKeyFrom(ProfileKeyUtil.getSelfProfileKey());
-      byte[] ourUnidentifiedAccessCertificate = getUnidentifiedAccessCertificate();
-
-      if (TextSecurePreferences.isUniversalUnidentifiedAccess(context)) {
-        ourUnidentifiedAccessKey = UNRESTRICTED_KEY;
-      }
-
-      if (ourUnidentifiedAccessCertificate != null) {
-        return Optional.of(new UnidentifiedAccessPair(new UnidentifiedAccess(ourUnidentifiedAccessKey,
-                                                                             ourUnidentifiedAccessCertificate,
-                                                                             false),
-                                                      new UnidentifiedAccess(ourUnidentifiedAccessKey,
-                                                                             ourUnidentifiedAccessCertificate,
-                                                                             false)));
-      }
+  public static @Nullable SenderCertificate getSealedSenderCertificate() {
+    byte[] unidentifiedAccessCertificate = getUnidentifiedAccessCertificate();
+    if (unidentifiedAccessCertificate == null) {
+      return null;
+    }
 
-      return Optional.empty();
+    try {
+      return new SenderCertificate(unidentifiedAccessCertificate);
     } catch (InvalidCertificateException e) {
       Log.w(TAG, e);
-      return Optional.empty();
+      return null;
     }
   }
 
@@ -157,7 +132,7 @@ public static Optional<UnidentifiedAccessPair> getAccessForSync(@NonNull Context
   }
 
   private static byte[] getUnidentifiedAccessCertificate() {
-    return SignalStore.certificateValues()
+    return SignalStore.certificate()
                       .getUnidentifiedAccessCertificate(getUnidentifiedAccessCertificateType());
   }
 
@@ -166,7 +141,7 @@ private static byte[] getUnidentifiedAccessCertificate() {
 
     byte[] accessKey;
 
-    switch (recipient.resolve().getUnidentifiedAccessMode()) {
+    switch (recipient.resolve().getSealedSenderAccessMode()) {
       case UNKNOWN:
         if (theirProfileKey == null) {
           if (isForStory) {
@@ -192,7 +167,7 @@ private static byte[] getUnidentifiedAccessCertificate() {
         accessKey = UNRESTRICTED_KEY;
         break;
       default:
-        throw new AssertionError("Unknown mode: " + recipient.getUnidentifiedAccessMode().getMode());
+        throw new AssertionError("Unknown mode: " + recipient.getSealedSenderAccessMode().getMode());
     }
 
     if (accessKey == null && isForStory) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/SenderKeyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/SenderKeyUtil.java
index 6cf1507b1a..19c8a23944 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/crypto/SenderKeyUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/SenderKeyUtil.java
@@ -4,7 +4,7 @@
 
 import org.signal.libsignal.protocol.SignalProtocolAddress;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.whispersystems.signalservice.api.SignalSessionLock;
 import org.whispersystems.signalservice.api.push.DistributionId;
@@ -17,7 +17,7 @@ private SenderKeyUtil() {}
    */
   public static void rotateOurKey(@NonNull DistributionId distributionId) {
     try (SignalSessionLock.Lock unused = ReentrantSessionLock.INSTANCE.acquire()) {
-      ApplicationDependencies.getProtocolStore().aci().senderKeys().deleteAllFor(SignalStore.account().requireAci().toString(), distributionId);
+      AppDependencies.getProtocolStore().aci().senderKeys().deleteAllFor(SignalStore.account().requireAci().toString(), distributionId);
       SignalDatabase.senderKeyShared().deleteAllFor(distributionId);
     }
   }
@@ -35,7 +35,7 @@ public static long getCreateTimeForOurKey(@NonNull DistributionId distributionId
    */
   public static void clearAllState() {
     try (SignalSessionLock.Lock unused = ReentrantSessionLock.INSTANCE.acquire()) {
-      ApplicationDependencies.getProtocolStore().aci().senderKeys().deleteAll();
+      AppDependencies.getProtocolStore().aci().senderKeys().deleteAll();
       SignalDatabase.senderKeyShared().deleteAll();
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore.java
index 5e5d5d5015..7eebcb0731 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore.java
@@ -19,7 +19,7 @@
 import org.thoughtcrime.securesms.database.identity.IdentityRecordList;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
 import org.thoughtcrime.securesms.database.model.IdentityStoreRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -96,7 +96,7 @@ public boolean saveIdentity(SignalProtocolAddress address, IdentityKey identityK
 
         cache.save(address.getName(), recipientId, identityKey, verifiedStatus, false, System.currentTimeMillis(), nonBlockingApproval);
         IdentityUtil.markIdentityUpdate(context, recipientId);
-        ApplicationDependencies.getProtocolStore().aci().sessions().archiveSiblingSessions(address);
+        AppDependencies.getProtocolStore().aci().sessions().archiveSiblingSessions(address);
         SignalDatabase.senderKeyShared().deleteAllFor(recipientId);
         return SaveResult.UPDATE;
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
index 0fdfdd927f..2bad9e8604 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
@@ -68,11 +68,12 @@ import org.thoughtcrime.securesms.blurhash.BlurHash
 import org.thoughtcrime.securesms.crypto.AttachmentSecret
 import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream
 import org.thoughtcrime.securesms.crypto.ModernEncryptingPartOutputStream
+import org.thoughtcrime.securesms.database.MessageTable.SyncMessageId
 import org.thoughtcrime.securesms.database.SignalDatabase.Companion.messages
 import org.thoughtcrime.securesms.database.SignalDatabase.Companion.stickers
 import org.thoughtcrime.securesms.database.SignalDatabase.Companion.threads
 import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob
 import org.thoughtcrime.securesms.jobs.AttachmentUploadJob
 import org.thoughtcrime.securesms.jobs.GenerateAudioWaveFormJob
@@ -86,6 +87,7 @@ import org.thoughtcrime.securesms.util.JsonUtils.SaneJSONObject
 import org.thoughtcrime.securesms.util.MediaUtil
 import org.thoughtcrime.securesms.util.StorageUtil
 import org.thoughtcrime.securesms.video.EncryptedMediaDataSource
+import org.whispersystems.signalservice.api.util.UuidUtil
 import org.whispersystems.signalservice.internal.util.JsonUtil
 import java.io.File
 import java.io.FileNotFoundException
@@ -150,6 +152,8 @@ class AttachmentTable(
     const val ARCHIVE_THUMBNAIL_CDN = "archive_thumbnail_cdn"
     const val ARCHIVE_TRANSFER_FILE = "archive_transfer_file"
     const val ARCHIVE_TRANSFER_STATE = "archive_transfer_state"
+    const val THUMBNAIL_RESTORE_STATE = "thumbnail_restore_state"
+    const val ATTACHMENT_UUID = "attachment_uuid"
 
     const val ATTACHMENT_JSON_ALIAS = "attachment_json"
 
@@ -204,7 +208,9 @@ class AttachmentTable(
       ARCHIVE_MEDIA_NAME,
       ARCHIVE_MEDIA_ID,
       ARCHIVE_TRANSFER_FILE,
-      THUMBNAIL_FILE
+      THUMBNAIL_FILE,
+      THUMBNAIL_RESTORE_STATE,
+      ATTACHMENT_UUID
     )
 
     @JvmField
@@ -246,12 +252,14 @@ class AttachmentTable(
         $ARCHIVE_CDN INTEGER DEFAULT 0,
         $ARCHIVE_MEDIA_NAME TEXT DEFAULT NULL,
         $ARCHIVE_MEDIA_ID TEXT DEFAULT NULL,
-        $ARCHIVE_THUMBNAIL_MEDIA_ID TEXT DEFAULT NULL,
-        $ARCHIVE_THUMBNAIL_CDN INTEGER DEFAULT 0,
         $ARCHIVE_TRANSFER_FILE TEXT DEFAULT NULL,
         $ARCHIVE_TRANSFER_STATE INTEGER DEFAULT ${ArchiveTransferState.NONE.value},
+        $ARCHIVE_THUMBNAIL_CDN INTEGER DEFAULT 0,
+        $ARCHIVE_THUMBNAIL_MEDIA_ID TEXT DEFAULT NULL,
         $THUMBNAIL_FILE TEXT DEFAULT NULL,
-        $THUMBNAIL_RANDOM BLOB DEFAULT NULL
+        $THUMBNAIL_RANDOM BLOB DEFAULT NULL,
+        $THUMBNAIL_RESTORE_STATE INTEGER DEFAULT ${ThumbnailRestoreState.NONE.value},
+        $ATTACHMENT_UUID TEXT DEFAULT NULL
       )
       """
 
@@ -528,7 +536,7 @@ class AttachmentTable(
         .forEach { cursor ->
           val attachmentId = AttachmentId(cursor.requireLong(ID))
 
-          ApplicationDependencies.getJobManager().cancelAllInQueue(AttachmentDownloadJob.constructQueueString(attachmentId))
+          AppDependencies.jobManager.cancelAllInQueue(AttachmentDownloadJob.constructQueueString(attachmentId))
 
           deleteDataFileIfPossible(
             filePath = cursor.requireString(DATA_FILE),
@@ -647,6 +655,47 @@ class AttachmentTable(
     }
   }
 
+  fun deleteAttachments(toDelete: List<SyncAttachmentId>): List<SyncMessageId> {
+    val unhandled = mutableListOf<SyncMessageId>()
+    for (syncAttachmentId in toDelete) {
+      val messageId = SignalDatabase.messages.getMessageIdOrNull(syncAttachmentId.syncMessageId)
+      if (messageId != null) {
+        val attachments = readableDatabase
+          .select(ID, ATTACHMENT_UUID, REMOTE_DIGEST, DATA_HASH_END)
+          .from(TABLE_NAME)
+          .where("$MESSAGE_ID = ?", messageId)
+          .run()
+          .readToList {
+            SyncAttachment(
+              id = AttachmentId(it.requireLong(ID)),
+              uuid = UuidUtil.parseOrNull(it.requireString(ATTACHMENT_UUID)),
+              digest = it.requireBlob(REMOTE_DIGEST),
+              plaintextHash = it.requireString(DATA_HASH_END)
+            )
+          }
+
+        val byUuid: SyncAttachment? by lazy { attachments.firstOrNull { it.uuid != null && it.uuid == syncAttachmentId.uuid } }
+        val byDigest: SyncAttachment? by lazy { attachments.firstOrNull { it.digest != null && it.digest.contentEquals(syncAttachmentId.digest) } }
+        val byPlaintext: SyncAttachment? by lazy { attachments.firstOrNull { it.plaintextHash != null && it.plaintextHash == syncAttachmentId.plaintextHash } }
+
+        val attachmentToDelete = (byUuid ?: byDigest ?: byPlaintext)?.id
+        if (attachmentToDelete != null) {
+          if (attachments.size == 1) {
+            SignalDatabase.messages.deleteMessage(messageId)
+          } else {
+            deleteAttachment(attachmentToDelete)
+          }
+        } else {
+          Log.i(TAG, "Unable to locate sync attachment to delete for message:$messageId")
+        }
+      } else {
+        unhandled += syncAttachmentId.syncMessageId
+      }
+    }
+
+    return unhandled
+  }
+
   fun trimAllAbandonedAttachments() {
     val deleteCount = writableDatabase
       .delete(TABLE_NAME)
@@ -735,6 +784,17 @@ class AttachmentTable(
     notifyConversationListeners(threadId)
   }
 
+  fun setThumbnailTransferState(messageId: Long, attachmentId: AttachmentId, thumbnailRestoreState: ThumbnailRestoreState) {
+    writableDatabase
+      .update(TABLE_NAME)
+      .values(THUMBNAIL_RESTORE_STATE to thumbnailRestoreState.value)
+      .where("$ID = ?", attachmentId.id)
+      .run()
+
+    val threadId = messages.getThreadIdForMessage(messageId)
+    notifyConversationListeners(threadId)
+  }
+
   @Throws(MmsException::class)
   fun setTransferProgressFailed(attachmentId: AttachmentId, mmsId: Long) {
     writableDatabase
@@ -746,6 +806,17 @@ class AttachmentTable(
     notifyConversationListeners(messages.getThreadIdForMessage(mmsId))
   }
 
+  @Throws(MmsException::class)
+  fun setThumbnailRestoreProgressFailed(attachmentId: AttachmentId, mmsId: Long) {
+    writableDatabase
+      .update(TABLE_NAME)
+      .values(THUMBNAIL_RESTORE_STATE to ThumbnailRestoreState.PERMANENT_FAILURE.value)
+      .where("$ID = ? AND $THUMBNAIL_RESTORE_STATE != ?", attachmentId.id, ThumbnailRestoreState.FINISHED)
+      .run()
+
+    notifyConversationListeners(messages.getThreadIdForMessage(mmsId))
+  }
+
   @Throws(MmsException::class)
   fun setTransferProgressPermanentFailure(attachmentId: AttachmentId, mmsId: Long) {
     writableDatabase
@@ -776,7 +847,7 @@ class AttachmentTable(
       // We don't look at hash_start here because that could result in us matching on a file that got compressed down to something smaller, effectively lowering
       // the quality of the attachment we received.
       val hashMatch: DataFileInfo? = readableDatabase
-        .select(ID, DATA_FILE, DATA_SIZE, DATA_RANDOM, DATA_HASH_START, DATA_HASH_END, TRANSFORM_PROPERTIES, UPLOAD_TIMESTAMP)
+        .select(ID, DATA_FILE, DATA_SIZE, DATA_RANDOM, DATA_HASH_START, DATA_HASH_END, TRANSFORM_PROPERTIES, UPLOAD_TIMESTAMP, ARCHIVE_CDN, ARCHIVE_MEDIA_NAME, ARCHIVE_MEDIA_ID)
         .from(TABLE_NAME)
         .where("$DATA_HASH_END = ? AND $DATA_HASH_END NOT NULL AND $TRANSFER_STATE = $TRANSFER_PROGRESS_DONE AND $DATA_FILE NOT NULL", fileWriteResult.hash)
         .run()
@@ -792,6 +863,9 @@ class AttachmentTable(
         values.put(DATA_RANDOM, hashMatch.random)
         values.put(DATA_HASH_START, hashMatch.hashEnd)
         values.put(DATA_HASH_END, hashMatch.hashEnd)
+        values.put(ARCHIVE_CDN, hashMatch.archiveCdn)
+        values.put(ARCHIVE_MEDIA_NAME, hashMatch.archiveMediaName)
+        values.put(ARCHIVE_MEDIA_ID, hashMatch.archiveMediaId)
       } else {
         values.put(DATA_FILE, fileWriteResult.file.absolutePath)
         values.put(DATA_SIZE, fileWriteResult.length)
@@ -853,18 +927,14 @@ class AttachmentTable(
     writableDatabase.withinTransaction { db ->
       val values = contentValuesOf(
         THUMBNAIL_FILE to fileWriteResult.file.absolutePath,
-        THUMBNAIL_RANDOM to fileWriteResult.random
+        THUMBNAIL_RANDOM to fileWriteResult.random,
+        THUMBNAIL_RESTORE_STATE to ThumbnailRestoreState.FINISHED.value
       )
 
       db.update(TABLE_NAME)
         .values(values)
         .where("$ARCHIVE_MEDIA_ID = ?", archiveMediaId)
         .run()
-
-      db.update(TABLE_NAME)
-        .values(TRANSFER_STATE to TRANSFER_RESTORE_OFFLOADED)
-        .where("$ID = ?", attachmentId.id)
-        .run()
     }
 
     notifyConversationListListeners()
@@ -1213,7 +1283,7 @@ class AttachmentTable(
 
   fun getDataFileInfo(attachmentId: AttachmentId): DataFileInfo? {
     return readableDatabase
-      .select(ID, DATA_FILE, DATA_SIZE, DATA_RANDOM, DATA_HASH_START, DATA_HASH_END, TRANSFORM_PROPERTIES, UPLOAD_TIMESTAMP)
+      .select(ID, DATA_FILE, DATA_SIZE, DATA_RANDOM, DATA_HASH_START, DATA_HASH_END, TRANSFORM_PROPERTIES, UPLOAD_TIMESTAMP, ARCHIVE_CDN, ARCHIVE_MEDIA_NAME, ARCHIVE_MEDIA_ID)
       .from(TABLE_NAME)
       .where("$ID = ?", attachmentId.id)
       .run()
@@ -1391,7 +1461,9 @@ class AttachmentTable(
               archiveThumbnailCdn = jsonObject.getInt(ARCHIVE_THUMBNAIL_CDN),
               archiveMediaName = jsonObject.getString(ARCHIVE_MEDIA_NAME),
               archiveMediaId = jsonObject.getString(ARCHIVE_MEDIA_ID),
-              hasArchiveThumbnail = !TextUtils.isEmpty(jsonObject.getString(THUMBNAIL_FILE))
+              hasArchiveThumbnail = !TextUtils.isEmpty(jsonObject.getString(THUMBNAIL_FILE)),
+              thumbnailRestoreState = ThumbnailRestoreState.deserialize(jsonObject.getInt(THUMBNAIL_RESTORE_STATE)),
+              uuid = UuidUtil.parseOrNull(jsonObject.getString(ATTACHMENT_UUID))
             )
           }
         }
@@ -1431,18 +1503,34 @@ class AttachmentTable(
     return readableDatabase.rawQuery(query, null)
   }
 
+  /**
+   * Sets the archive data for the specific attachment, as well as for any attachments that use the same underlying file.
+   */
   fun setArchiveData(attachmentId: AttachmentId, archiveCdn: Int, archiveMediaName: String, archiveMediaId: String, archiveThumbnailMediaId: String) {
-    writableDatabase
-      .update(TABLE_NAME)
-      .values(
-        ARCHIVE_CDN to archiveCdn,
-        ARCHIVE_MEDIA_ID to archiveMediaId,
-        ARCHIVE_MEDIA_NAME to archiveMediaName,
-        ARCHIVE_THUMBNAIL_MEDIA_ID to archiveThumbnailMediaId,
-        ARCHIVE_TRANSFER_STATE to ArchiveTransferState.FINISHED.value
-      )
-      .where("$ID = ?", attachmentId.id)
-      .run()
+    writableDatabase.withinTransaction { db ->
+      val dataFile = db
+        .select(DATA_FILE)
+        .from(TABLE_NAME)
+        .where("$ID = ?", attachmentId.id)
+        .run()
+        .readToSingleObject { it.requireString(DATA_FILE) }
+
+      if (dataFile == null) {
+        Log.w(TAG, "No data file found for attachment $attachmentId. Can't set archive data.")
+        return@withinTransaction
+      }
+
+      db.update(TABLE_NAME)
+        .values(
+          ARCHIVE_CDN to archiveCdn,
+          ARCHIVE_MEDIA_ID to archiveMediaId,
+          ARCHIVE_MEDIA_NAME to archiveMediaName,
+          ARCHIVE_THUMBNAIL_MEDIA_ID to archiveThumbnailMediaId,
+          ARCHIVE_TRANSFER_STATE to ArchiveTransferState.FINISHED.value
+        )
+        .where("$DATA_FILE = ?", dataFile)
+        .run()
+    }
   }
 
   fun updateArchiveCdnByMediaId(archiveMediaId: String, archiveCdn: Int): Int {
@@ -1692,6 +1780,7 @@ class AttachmentTable(
         put(CAPTION, attachment.caption)
         put(UPLOAD_TIMESTAMP, attachment.uploadTimestamp)
         put(BLUR_HASH, attachment.blurHash?.hash)
+        put(ATTACHMENT_UUID, attachment.uuid?.toString())
 
         attachment.stickerLocator?.let { sticker ->
           put(STICKER_PACK_ID, sticker.packId)
@@ -1746,6 +1835,8 @@ class AttachmentTable(
         put(ARCHIVE_MEDIA_NAME, attachment.archiveMediaName)
         put(ARCHIVE_MEDIA_ID, attachment.archiveMediaId)
         put(ARCHIVE_THUMBNAIL_MEDIA_ID, attachment.archiveThumbnailMediaId)
+        put(THUMBNAIL_RESTORE_STATE, ThumbnailRestoreState.NEEDS_RESTORE.value)
+        put(ATTACHMENT_UUID, attachment.uuid?.toString())
 
         attachment.stickerLocator?.let { sticker ->
           put(STICKER_PACK_ID, sticker.packId)
@@ -1789,7 +1880,7 @@ class AttachmentTable(
       // First we'll check if our file hash matches the starting or ending hash of any other attachments and has compatible transform properties.
       // We'll prefer the match with the most recent upload timestamp.
       val hashMatch: DataFileInfo? = readableDatabase
-        .select(ID, DATA_FILE, DATA_SIZE, DATA_RANDOM, DATA_HASH_START, DATA_HASH_END, TRANSFORM_PROPERTIES, UPLOAD_TIMESTAMP)
+        .select(ID, DATA_FILE, DATA_SIZE, DATA_RANDOM, DATA_HASH_START, DATA_HASH_END, TRANSFORM_PROPERTIES, UPLOAD_TIMESTAMP, ARCHIVE_CDN, ARCHIVE_MEDIA_NAME, ARCHIVE_MEDIA_ID)
         .from(TABLE_NAME)
         .where("$DATA_FILE NOT NULL AND ($DATA_HASH_START = ? OR $DATA_HASH_END = ?)", fileWriteResult.hash, fileWriteResult.hash)
         .run()
@@ -1819,6 +1910,9 @@ class AttachmentTable(
         contentValues.put(DATA_RANDOM, hashMatch.random)
         contentValues.put(DATA_HASH_START, fileWriteResult.hash)
         contentValues.put(DATA_HASH_END, hashMatch.hashEnd)
+        contentValues.put(ARCHIVE_CDN, hashMatch.archiveCdn)
+        contentValues.put(ARCHIVE_MEDIA_NAME, hashMatch.archiveMediaName)
+        contentValues.put(ARCHIVE_MEDIA_ID, hashMatch.archiveMediaId)
 
         if (hashMatch.transformProperties.skipTransform) {
           Log.i(TAG, "[insertAttachmentWithData] The hash match has a DATA_HASH_END and skipTransform=true, so skipping transform of the new file as well. (MessageId: $messageId, ${attachment.uri})")
@@ -1869,6 +1963,7 @@ class AttachmentTable(
       contentValues.put(CAPTION, attachment.caption)
       contentValues.put(UPLOAD_TIMESTAMP, uploadTemplate?.uploadTimestamp ?: 0)
       contentValues.put(TRANSFORM_PROPERTIES, transformProperties.serialize())
+      contentValues.put(ATTACHMENT_UUID, attachment.uuid?.toString())
 
       if (attachment.transformProperties?.videoEdited == true) {
         contentValues.putNull(BLUR_HASH)
@@ -1959,7 +2054,9 @@ class AttachmentTable(
       archiveThumbnailCdn = cursor.requireInt(ARCHIVE_THUMBNAIL_CDN),
       archiveMediaName = cursor.requireString(ARCHIVE_MEDIA_NAME),
       archiveMediaId = cursor.requireString(ARCHIVE_MEDIA_ID),
-      hasArchiveThumbnail = !cursor.isNull(THUMBNAIL_FILE)
+      hasArchiveThumbnail = !cursor.isNull(THUMBNAIL_FILE),
+      thumbnailRestoreState = ThumbnailRestoreState.deserialize(cursor.requireInt(THUMBNAIL_RESTORE_STATE)),
+      uuid = UuidUtil.parseOrNull(cursor.requireString(ATTACHMENT_UUID))
     )
   }
 
@@ -1980,7 +2077,10 @@ class AttachmentTable(
       hashStart = this.requireString(DATA_HASH_START),
       hashEnd = this.requireString(DATA_HASH_END),
       transformProperties = TransformProperties.parse(this.requireString(TRANSFORM_PROPERTIES)),
-      uploadTimestamp = this.requireLong(UPLOAD_TIMESTAMP)
+      uploadTimestamp = this.requireLong(UPLOAD_TIMESTAMP),
+      archiveCdn = this.requireInt(ARCHIVE_CDN),
+      archiveMediaName = this.requireString(ARCHIVE_MEDIA_NAME),
+      archiveMediaId = this.requireString(ARCHIVE_MEDIA_ID)
     )
   }
 
@@ -2043,7 +2143,10 @@ class AttachmentTable(
     val hashStart: String?,
     val hashEnd: String?,
     val transformProperties: TransformProperties,
-    val uploadTimestamp: Long
+    val uploadTimestamp: Long,
+    val archiveCdn: Int,
+    val archiveMediaName: String?,
+    val archiveMediaId: String?
   )
 
   @VisibleForTesting
@@ -2075,8 +2178,7 @@ class AttachmentTable(
     @JvmField
     val sentMediaQuality: Int = SentMediaQuality.STANDARD.code,
 
-    @field:JsonProperty("mp4Faststart")
-    @param:JsonProperty("mp4Faststart")
+    @JsonProperty("mp4Faststart")
     @JvmField
     val mp4FastStart: Boolean = false
   ) : Parcelable {
@@ -2166,6 +2268,29 @@ class AttachmentTable(
     }
   }
 
+  enum class ThumbnailRestoreState(val value: Int) {
+    /** No thumbnail downloaded. */
+    NONE(0),
+
+    /** The thumbnail needs to be restored still. */
+    NEEDS_RESTORE(1),
+
+    /** The restore of the thumbnail is in progress */
+    IN_PROGRESS(2),
+
+    /** Completely restored the thumbnail. */
+    FINISHED(3),
+
+    /** It is impossible to restore the thumbnail. */
+    PERMANENT_FAILURE(4);
+
+    companion object {
+      fun deserialize(value: Int): ThumbnailRestoreState {
+        return values().firstOrNull { it.value == value } ?: NONE
+      }
+    }
+  }
+
   /**
    * This maintains two different state paths for uploading attachments to the archive.
    *
@@ -2205,4 +2330,8 @@ class AttachmentTable(
       }
     }
   }
+
+  class SyncAttachmentId(val syncMessageId: SyncMessageId, val uuid: UUID?, val digest: ByteArray?, val plaintextHash: String?)
+
+  class SyncAttachment(val id: AttachmentId, val uuid: UUID?, val digest: ByteArray?, val plaintextHash: String?)
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/CallLinkTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/CallLinkTable.kt
index 401e44bd14..8d5c7c11fd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/CallLinkTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/CallLinkTable.kt
@@ -28,7 +28,7 @@ import org.signal.ringrtc.CallLinkState.Restrictions
 import org.thoughtcrime.securesms.calls.log.CallLogRow
 import org.thoughtcrime.securesms.conversation.colors.AvatarColor
 import org.thoughtcrime.securesms.conversation.colors.AvatarColorHash
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkCredentials
@@ -103,8 +103,8 @@ class CallLinkTable(context: Context, databaseHelper: SignalDatabase) : Database
       recipientId
     }
 
-    ApplicationDependencies.getDatabaseObserver().notifyCallLinkObservers(callLink.roomId)
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.databaseObserver.notifyCallLinkObservers(callLink.roomId)
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
 
     return recipientId!!
   }
@@ -124,8 +124,8 @@ class CallLinkTable(context: Context, databaseHelper: SignalDatabase) : Database
       .where("$ROOM_ID = ?", roomId.serialize())
       .run()
 
-    ApplicationDependencies.getDatabaseObserver().notifyCallLinkObservers(roomId)
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.databaseObserver.notifyCallLinkObservers(roomId)
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
   }
 
   fun updateCallLinkState(
@@ -151,8 +151,8 @@ class CallLinkTable(context: Context, databaseHelper: SignalDatabase) : Database
     }
 
     Recipient.live(recipientId).refresh()
-    ApplicationDependencies.getDatabaseObserver().notifyCallLinkObservers(roomId)
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.databaseObserver.notifyCallLinkObservers(roomId)
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
   }
 
   fun callLinkExists(
@@ -230,7 +230,7 @@ class CallLinkTable(context: Context, databaseHelper: SignalDatabase) : Database
         record = callLink,
         recipient = peer,
         searchQuery = query,
-        callLinkPeekInfo = ApplicationDependencies.getSignalCallManager().peekInfoSnapshot[peer.id]
+        callLinkPeekInfo = AppDependencies.signalCallManager.peekInfoSnapshot[peer.id]
       )
     }
   }
@@ -415,10 +415,12 @@ class CallLinkTable(context: Context, databaseHelper: SignalDatabase) : Database
       return CallLink(
         recipientId = data.requireLong(RECIPIENT_ID).let { if (it > 0) RecipientId.from(it) else RecipientId.UNKNOWN },
         roomId = CallLinkRoomId.DatabaseSerializer.deserialize(data.requireNonNullString(ROOM_ID)),
-        credentials = CallLinkCredentials(
-          linkKeyBytes = data.requireNonNullBlob(ROOT_KEY),
-          adminPassBytes = data.requireBlob(ADMIN_KEY)
-        ),
+        credentials = data.requireBlob(ROOT_KEY)?.let { linkKey ->
+          CallLinkCredentials(
+            linkKeyBytes = linkKey,
+            adminPassBytes = data.requireBlob(ADMIN_KEY)
+          )
+        },
         state = SignalCallLinkState(
           name = data.requireNonNullString(NAME),
           restrictions = data.requireInt(RESTRICTIONS).mapToRestrictions(),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/CallTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/CallTable.kt
index 606522606d..2f7ece97bd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/CallTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/CallTable.kt
@@ -10,6 +10,7 @@ import org.signal.core.util.SqlUtil
 import org.signal.core.util.count
 import org.signal.core.util.delete
 import org.signal.core.util.deleteAll
+import org.signal.core.util.exists
 import org.signal.core.util.flatten
 import org.signal.core.util.insertInto
 import org.signal.core.util.isAbsent
@@ -34,7 +35,7 @@ import org.thoughtcrime.securesms.calls.log.CallLogFilter
 import org.thoughtcrime.securesms.calls.log.CallLogRow
 import org.thoughtcrime.securesms.database.model.GroupCallUpdateDetailsUtil
 import org.thoughtcrime.securesms.database.model.MessageId
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.CallSyncEventJob
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -173,12 +174,12 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
 
       if (!unread && expiresIn > 0) {
         SignalDatabase.messages.markExpireStarted(result.messageId, timestamp)
-        ApplicationDependencies.getExpiringMessageManager().scheduleDeletion(result.messageId, true, timestamp, expiresIn)
+        AppDependencies.expiringMessageManager.scheduleDeletion(result.messageId, true, timestamp, expiresIn)
       }
     }
 
-    ApplicationDependencies.getMessageNotifier().updateNotification(context)
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.messageNotifier.updateNotification(context)
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
 
     Log.i(TAG, "Inserted call: $callId type: $type direction: $direction event:$event")
   }
@@ -214,7 +215,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
           if (expiresIn > 0) {
             val timestampOrNow = timestamp ?: System.currentTimeMillis()
             SignalDatabase.messages.markExpireStarted(call.messageId, timestampOrNow)
-            ApplicationDependencies.getExpiringMessageManager().scheduleDeletion(call.messageId, true, timestampOrNow, expiresIn)
+            AppDependencies.expiringMessageManager.scheduleDeletion(call.messageId, true, timestampOrNow, expiresIn)
           }
         }
       }
@@ -222,8 +223,8 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
       call
     }
 
-    ApplicationDependencies.getMessageNotifier().updateNotification(context)
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.messageNotifier.updateNotification(context)
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
 
     return call
   }
@@ -341,8 +342,8 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
       CallSyncEventJob.enqueueDeleteSyncEvents(toSync)
     }
 
-    ApplicationDependencies.getDeletedCallEventManager().scheduleIfNecessary()
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.deletedCallEventManager.scheduleIfNecessary()
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
   }
 
   /**
@@ -380,14 +381,16 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
       CallSyncEventJob.enqueueDeleteSyncEvents(toSync)
     }
 
-    ApplicationDependencies.getDeletedCallEventManager().scheduleIfNecessary()
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.deletedCallEventManager.scheduleIfNecessary()
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
   }
 
-  // region Group / Ad-Hoc Calling
-  fun deleteGroupCall(call: Call) {
-    checkIsGroupOrAdHocCall(call)
-
+  /**
+   * Marks the given call event DELETED. This deletes the associated message, but
+   * keeps the call event around for several hours to ensure out of order messages
+   * do not bring it back.
+   */
+  fun markCallDeletedFromSyncEvent(call: Call) {
     val filter: SqlUtil.Query = getCallSelectionQuery(call.callId, call.peer)
 
     writableDatabase.withinTransaction { db ->
@@ -405,20 +408,23 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
       }
     }
 
-    ApplicationDependencies.getMessageNotifier().updateNotification(context)
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
-    Log.d(TAG, "Marked group call event for deletion: ${call.callId}")
+    AppDependencies.messageNotifier.updateNotification(context)
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
+    Log.d(TAG, "Marked call event for deletion: ${call.callId}")
   }
 
-  fun insertDeletedGroupCallFromSyncEvent(
+  /**
+   * Inserts a call event in the DELETED state with the corresponding data.
+   * Deleted calls are kept around for several hours to ensure they don't reappear
+   * due to out of order messages.
+   */
+  fun insertDeletedCallFromSyncEvent(
     callId: Long,
     recipientId: RecipientId,
+    type: Type,
     direction: Direction,
     timestamp: Long
   ) {
-    val recipient = Recipient.resolved(recipientId)
-    val type = if (recipient.isCallLink) Type.AD_HOC_CALL else Type.GROUP_CALL
-
     writableDatabase
       .insertInto(TABLE_NAME)
       .values(
@@ -433,9 +439,12 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
       )
       .run(SQLiteDatabase.CONFLICT_ABORT)
 
-    ApplicationDependencies.getDeletedCallEventManager().scheduleIfNecessary()
+    AppDependencies.deletedCallEventManager.scheduleIfNecessary()
+    Log.d(TAG, "Inserted deleted call event: $callId, $type, $direction, $timestamp")
   }
 
+  // region Group / Ad-Hoc Calling
+
   fun acceptIncomingGroupCall(call: Call) {
     checkIsGroupOrAdHocCall(call)
 
@@ -454,8 +463,8 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
       .where("$CALL_ID = ?", call.callId)
       .run()
 
-    ApplicationDependencies.getMessageNotifier().updateNotification(context)
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.messageNotifier.updateNotification(context)
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
     Log.d(TAG, "[acceptIncomingGroupCall] Transitioned group call ${call.callId} from ${call.event} to $newEvent")
   }
 
@@ -481,8 +490,8 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
       .where("$CALL_ID = ?", call.callId)
       .run()
 
-    ApplicationDependencies.getMessageNotifier().updateNotification(context)
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.messageNotifier.updateNotification(context)
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
     Log.d(TAG, "[acceptOutgoingGroupCall] Transitioned group call ${call.callId} from ${call.event} to $newEvent")
   }
 
@@ -505,8 +514,8 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
       .where("$CALL_ID = ?", call.callId)
       .run()
 
-    ApplicationDependencies.getMessageNotifier().updateNotification(context)
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.messageNotifier.updateNotification(context)
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
     Log.d(TAG, "Transitioned group call ${call.callId} from ${call.event} to $newEvent")
   }
 
@@ -552,7 +561,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
         .run(SQLiteDatabase.CONFLICT_ABORT)
     }
 
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
   }
 
   fun insertDeclinedGroupCall(
@@ -594,7 +603,23 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
         .run(SQLiteDatabase.CONFLICT_ABORT)
     }
 
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
+  }
+
+  fun insertOrUpdateAdHocCallFromObserveEvent(
+    callRecipient: Recipient,
+    timestamp: Long,
+    callId: Long
+  ) {
+    handleCallLinkUpdate(callRecipient, timestamp, CallId(callId), Direction.INCOMING)
+  }
+
+  fun insertAdHocCallFromObserveEvent(
+    callRecipient: Recipient,
+    timestamp: Long,
+    eraId: String
+  ): Boolean {
+    return handleCallLinkUpdate(callRecipient, timestamp, CallId.fromEra(eraId), Direction.INCOMING)
   }
 
   fun insertOrUpdateGroupCallFromExternalEvent(
@@ -623,7 +648,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
   ) {
     val recipient = Recipient.resolved(groupRecipientId)
     if (recipient.isCallLink) {
-      handleCallLinkUpdate(recipient, timestamp, peekGroupCallEraId)
+      handleCallLinkUpdate(recipient, timestamp, peekGroupCallEraId?.let { CallId.fromEra(it) })
     } else {
       handleGroupUpdate(recipient, sender, timestamp, peekGroupCallEraId, peekJoinedUuids, isCallFull)
     }
@@ -693,35 +718,53 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
     }
   }
 
+  /**
+   * @return Whether or not a new row was inserted.
+   */
   private fun handleCallLinkUpdate(
     callLinkRecipient: Recipient,
     timestamp: Long,
-    peekGroupCallEraId: String?
-  ) {
+    callId: CallId?,
+    direction: Direction = Direction.OUTGOING,
+    skipTimestampUpdate: Boolean = false
+  ): Boolean {
     check(callLinkRecipient.isCallLink)
 
-    val callId = peekGroupCallEraId?.let { CallId.fromEra(it).longValue() } ?: return
+    if (callId == null) {
+      return false
+    }
 
-    writableDatabase.withinTransaction { db ->
-      db.delete(TABLE_NAME)
-        .where("$PEER = ?", callLinkRecipient.id.serialize())
+    val didInsert = writableDatabase.withinTransaction { db ->
+      val exists = db.exists(TABLE_NAME)
+        .where("$PEER = ? AND $CALL_ID = ?", callLinkRecipient.id.serialize(), callId.longValue())
         .run()
 
-      db.insertInto(TABLE_NAME)
-        .values(
-          CALL_ID to callId,
-          MESSAGE_ID to null,
-          PEER to callLinkRecipient.id.toLong(),
-          EVENT to Event.serialize(Event.GENERIC_GROUP_CALL),
-          TYPE to Type.serialize(Type.AD_HOC_CALL),
-          DIRECTION to Direction.serialize(Direction.OUTGOING),
-          TIMESTAMP to timestamp,
-          RINGER to null
-        ).run(SQLiteDatabase.CONFLICT_ABORT)
+      if (exists && !skipTimestampUpdate) {
+        db.update(TABLE_NAME)
+          .values(TIMESTAMP to timestamp)
+          .where("$PEER = ? AND $CALL_ID = ? AND $TIMESTAMP < ?", callLinkRecipient.id.serialize(), callId.longValue(), timestamp)
+          .run()
+        false
+      } else if (!exists) {
+        db.insertInto(TABLE_NAME)
+          .values(
+            CALL_ID to callId.longValue(),
+            MESSAGE_ID to null,
+            PEER to callLinkRecipient.id.toLong(),
+            EVENT to Event.serialize(Event.GENERIC_GROUP_CALL),
+            TYPE to Type.serialize(Type.AD_HOC_CALL),
+            DIRECTION to Direction.serialize(direction),
+            TIMESTAMP to timestamp,
+            RINGER to null
+          ).run(SQLiteDatabase.CONFLICT_ABORT)
+
+        Log.d(TAG, "Inserted new call event for call link. Call Id: $callId")
+        true
+      } else false
     }
 
-    Log.d(TAG, "Inserted new call event for call link. Call Id: $callId")
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
+    return didInsert
   }
 
   private fun insertCallEventFromGroupUpdate(
@@ -772,7 +815,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
       Log.d(TAG, "Skipping call event processing for null era id.")
     }
 
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
   }
 
   /**
@@ -806,7 +849,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
       updateGroupCallState(call, peekJoinedUuids)
     }
 
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
     return sameEraId
   }
 
@@ -964,7 +1007,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
       }
     }
 
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
   }
 
   private fun updateEventFromRingState(
@@ -1059,7 +1102,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
       }
     }
 
-    ApplicationDependencies.getDatabaseObserver().notifyCallUpdateObservers()
+    AppDependencies.databaseObserver.notifyCallUpdateObservers()
   }
 
   private fun setMessageId(callId: Long, messageId: MessageId) {
@@ -1425,7 +1468,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
         groupCallState = CallLogRow.GroupCallState.fromDetails(groupCallDetails),
         children = actualChildren.toSet(),
         searchQuery = searchTerm,
-        callLinkPeekInfo = ApplicationDependencies.getSignalCallManager().peekInfoSnapshot[peer.id],
+        callLinkPeekInfo = AppDependencies.signalCallManager.peekInfoSnapshot[peer.id],
         canUserBeginCall = canUserBeginCall
       )
     }
@@ -1667,7 +1710,7 @@ class CallTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTabl
       @JvmStatic
       fun from(event: CallEvent.Event?): Event? {
         return when (event) {
-          null, CallEvent.Event.UNKNOWN_ACTION -> null
+          null, CallEvent.Event.UNKNOWN_ACTION, CallEvent.Event.OBSERVED -> null
           CallEvent.Event.ACCEPTED -> ACCEPTED
           CallEvent.Event.NOT_ACCEPTED -> NOT_ACCEPTED
           CallEvent.Event.DELETE -> DELETE
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ChatColorsTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/ChatColorsTable.kt
index 829f3581bb..da522e4e0a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ChatColorsTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ChatColorsTable.kt
@@ -7,7 +7,7 @@ import org.signal.core.util.CursorUtil
 import org.signal.core.util.SqlUtil
 import org.thoughtcrime.securesms.conversation.colors.ChatColors
 import org.thoughtcrime.securesms.database.model.databaseprotos.ChatColor
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 
 class ChatColorsTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTable(context, databaseHelper) {
@@ -98,8 +98,8 @@ class ChatColorsTable(context: Context, databaseHelper: SignalDatabase) : Databa
       throw IllegalStateException("Failed to update ChatColor in database")
     }
 
-    if (SignalStore.chatColorsValues().chatColors?.id == chatColors.id) {
-      SignalStore.chatColorsValues().chatColors = chatColors
+    if (SignalStore.chatColors.chatColors?.id == chatColors.id) {
+      SignalStore.chatColors.chatColors = chatColors
     }
 
     SignalDatabase.recipients.onUpdatedChatColors(chatColors)
@@ -116,8 +116,8 @@ class ChatColorsTable(context: Context, databaseHelper: SignalDatabase) : Databa
     val db: SQLiteDatabase = databaseHelper.signalWritableDatabase
     db.delete(TABLE_NAME, ID_WHERE, SqlUtil.buildArgs(chatColors.id.longValue))
 
-    if (SignalStore.chatColorsValues().chatColors?.id == chatColors.id) {
-      SignalStore.chatColorsValues().chatColors = null
+    if (SignalStore.chatColors.chatColors?.id == chatColors.id) {
+      SignalStore.chatColors.chatColors = null
     }
 
     SignalDatabase.recipients.onDeletedChatColors(chatColors)
@@ -125,7 +125,7 @@ class ChatColorsTable(context: Context, databaseHelper: SignalDatabase) : Databa
   }
 
   private fun notifyListeners() {
-    ApplicationDependencies.getDatabaseObserver().notifyChatColorsListeners()
+    AppDependencies.databaseObserver.notifyChatColorsListeners()
   }
 
   private fun Cursor.getId(): Long = CursorUtil.requireLong(this, ID)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseObserver.java b/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseObserver.java
index 02599ce569..f56a4f6f73 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseObserver.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseObserver.java
@@ -48,6 +48,7 @@ public class DatabaseObserver {
 
   private static final String KEY_CALL_UPDATES          = "CallUpdates";
   private static final String KEY_CALL_LINK_UPDATES     = "CallLinkUpdates";
+  private static final String KEY_IN_APP_PAYMENTS       = "InAppPayments";
 
   private final Application application;
   private final Executor    executor;
@@ -69,6 +70,7 @@ public class DatabaseObserver {
   private final Map<RecipientId, Set<Observer>>    storyObservers;
   private final Set<Observer>                      callUpdateObservers;
   private final Map<CallLinkRoomId, Set<Observer>> callLinkObservers;
+  private final Set<InAppPaymentObserver>          inAppPaymentObservers;
 
   public DatabaseObserver(Application application) {
     this.application                  = application;
@@ -90,6 +92,7 @@ public DatabaseObserver(Application application) {
     this.scheduledMessageObservers    = new HashMap<>();
     this.callUpdateObservers          = new HashSet<>();
     this.callLinkObservers            = new HashMap<>();
+    this.inAppPaymentObservers        = new HashSet<>();
   }
 
   public void registerConversationListObserver(@NonNull Observer listener) {
@@ -195,6 +198,10 @@ public void registerCallLinkObserver(@NonNull CallLinkRoomId callLinkRoomId, @No
     });
   }
 
+  public void registerInAppPaymentObserver(@NonNull InAppPaymentObserver observer) {
+    executor.execute(() -> inAppPaymentObservers.add(observer));
+  }
+
   public void unregisterObserver(@NonNull Observer listener) {
     executor.execute(() -> {
       conversationListObservers.remove(listener);
@@ -221,6 +228,12 @@ public void unregisterObserver(@NonNull MessageObserver listener) {
     });
   }
 
+  public void unregisterObserver(@NonNull InAppPaymentObserver listener) {
+    executor.execute(() -> {
+      inAppPaymentObservers.remove(listener);
+    });
+  }
+
   public void notifyConversationListeners(Set<Long> threadIds) {
     for (long threadId : threadIds) {
       notifyConversationListeners(threadId);
@@ -356,6 +369,12 @@ public void notifyCallLinkObservers(@NonNull CallLinkRoomId callLinkRoomId) {
     runPostSuccessfulTransaction(KEY_CALL_LINK_UPDATES, () -> notifyMapped(callLinkObservers, callLinkRoomId));
   }
 
+  public void notifyInAppPaymentsObservers(@NonNull InAppPaymentTable.InAppPayment inAppPayment) {
+    runPostSuccessfulTransaction(KEY_IN_APP_PAYMENTS, () -> {
+      inAppPaymentObservers.forEach(item -> item.onInAppPaymentChanged(inAppPayment));
+    });
+  }
+
   private void runPostSuccessfulTransaction(@NonNull String dedupeKey, @NonNull Runnable runnable) {
     SignalDatabase.runPostSuccessfulTransaction(dedupeKey, () -> {
       executor.execute(runnable);
@@ -421,4 +440,8 @@ public interface Observer {
   public interface MessageObserver {
     void onMessageChanged(@NonNull MessageId messageId);
   }
+
+  public interface InAppPaymentObserver {
+    void onInAppPaymentChanged(@NonNull InAppPaymentTable.InAppPayment inAppPayment);
+  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseTable.java b/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseTable.java
index 25afaa5eb2..a39f0950d1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseTable.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseTable.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -48,31 +48,31 @@ public DatabaseTable(Context context, SignalDatabase databaseHelper) {
   }
 
   protected void notifyConversationListeners(Set<Long> threadIds) {
-    ApplicationDependencies.getDatabaseObserver().notifyConversationListeners(threadIds);
+    AppDependencies.getDatabaseObserver().notifyConversationListeners(threadIds);
   }
 
   protected void notifyConversationListeners(long threadId) {
-    ApplicationDependencies.getDatabaseObserver().notifyConversationListeners(threadId);
+    AppDependencies.getDatabaseObserver().notifyConversationListeners(threadId);
   }
 
   protected void notifyVerboseConversationListeners(Set<Long> threadIds) {
-    ApplicationDependencies.getDatabaseObserver().notifyVerboseConversationListeners(threadIds);
+    AppDependencies.getDatabaseObserver().notifyVerboseConversationListeners(threadIds);
   }
 
   protected void notifyConversationListListeners() {
-    ApplicationDependencies.getDatabaseObserver().notifyConversationListListeners();
+    AppDependencies.getDatabaseObserver().notifyConversationListListeners();
   }
 
   protected void notifyStickerPackListeners() {
-    ApplicationDependencies.getDatabaseObserver().notifyStickerPackObservers();
+    AppDependencies.getDatabaseObserver().notifyStickerPackObservers();
   }
 
   protected void notifyStickerListeners() {
-    ApplicationDependencies.getDatabaseObserver().notifyStickerObservers();
+    AppDependencies.getDatabaseObserver().notifyStickerObservers();
   }
 
   protected void notifyAttachmentListeners() {
-    ApplicationDependencies.getDatabaseObserver().notifyAttachmentObservers();
+    AppDependencies.getDatabaseObserver().notifyAttachmentObservers();
   }
 
   public void reset(SignalDatabase databaseHelper) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/DonationReceiptTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/DonationReceiptTable.kt
index 3f478d725d..161e8dde9d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/DonationReceiptTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/DonationReceiptTable.kt
@@ -74,7 +74,7 @@ class DonationReceiptTable(context: Context, databaseHelper: SignalDatabase) : D
     val (where, whereArgs) = if (type != null) {
       "$TYPE = ?" to SqlUtil.buildArgs(type.code)
     } else {
-      null to null
+      "$TYPE != ?" to SqlUtil.buildArgs(DonationReceiptRecord.Type.RECURRING_DONATION)
     }
 
     readableDatabase.query(TABLE_NAME, null, where, whereArgs, null, null, "$DATE DESC").use { cursor ->
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.kt
index e8c6dc09df..53f58215c2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupTable.kt
@@ -19,7 +19,9 @@ import org.signal.core.util.isAbsent
 import org.signal.core.util.logging.Log
 import org.signal.core.util.optionalString
 import org.signal.core.util.readToList
+import org.signal.core.util.readToMap
 import org.signal.core.util.readToSingleInt
+import org.signal.core.util.readToSingleLong
 import org.signal.core.util.readToSingleObject
 import org.signal.core.util.requireBlob
 import org.signal.core.util.requireBoolean
@@ -30,7 +32,11 @@ import org.signal.core.util.requireString
 import org.signal.core.util.select
 import org.signal.core.util.update
 import org.signal.core.util.withinTransaction
+import org.signal.libsignal.zkgroup.InvalidInputException
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey
+import org.signal.libsignal.zkgroup.groups.GroupSecretParams
+import org.signal.libsignal.zkgroup.groupsend.GroupSendEndorsement
+import org.signal.libsignal.zkgroup.groupsend.GroupSendFullToken
 import org.signal.storageservice.protos.groups.Member
 import org.signal.storageservice.protos.groups.local.DecryptedGroup
 import org.signal.storageservice.protos.groups.local.DecryptedPendingMember
@@ -39,7 +45,8 @@ import org.thoughtcrime.securesms.contacts.paged.collections.ContactSearchIterat
 import org.thoughtcrime.securesms.crypto.SenderKeyUtil
 import org.thoughtcrime.securesms.database.SignalDatabase.Companion.recipients
 import org.thoughtcrime.securesms.database.model.GroupRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.database.model.GroupSendEndorsementRecords
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.BadGroupIdException
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.groups.GroupId.Push
@@ -50,6 +57,7 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil
 import org.whispersystems.signalservice.api.groupsv2.GroupChangeReconstruct
+import org.whispersystems.signalservice.api.groupsv2.ReceivedGroupSendEndorsements
 import org.whispersystems.signalservice.api.groupsv2.findMemberByAci
 import org.whispersystems.signalservice.api.groupsv2.findPendingByServiceId
 import org.whispersystems.signalservice.api.groupsv2.findRequestingByAci
@@ -63,6 +71,7 @@ import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import java.io.Closeable
 import java.security.SecureRandom
+import java.time.Instant
 import java.util.Optional
 import java.util.stream.Collectors
 import javax.annotation.CheckReturnValue
@@ -74,6 +83,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
     private val TAG = Log.tag(GroupTable::class.java)
 
     const val MEMBER_GROUP_CONCAT = "member_group_concat"
+    const val TITLE_SEARCH_RANK = "title_search_rank"
     const val THREAD_DATE = "thread_date"
 
     const val TABLE_NAME = "groups"
@@ -93,6 +103,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
     const val DISTRIBUTION_ID = "distribution_id"
     const val SHOW_AS_STORY_STATE = "show_as_story_state"
     const val LAST_FORCE_UPDATE_TIMESTAMP = "last_force_update_timestamp"
+    const val GROUP_SEND_ENDORSEMENTS_EXPIRATION = "group_send_endorsements_expiration"
 
     /** 32 bytes serialized [GroupMasterKey]  */
     const val V2_MASTER_KEY = "master_key"
@@ -124,12 +135,13 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
         $UNMIGRATED_V1_MEMBERS TEXT DEFAULT NULL, 
         $DISTRIBUTION_ID TEXT UNIQUE DEFAULT NULL, 
         $SHOW_AS_STORY_STATE INTEGER DEFAULT ${ShowAsStoryState.IF_ACTIVE.code}, 
-        $LAST_FORCE_UPDATE_TIMESTAMP INTEGER DEFAULT 0
+        $LAST_FORCE_UPDATE_TIMESTAMP INTEGER DEFAULT 0,
+        $GROUP_SEND_ENDORSEMENTS_EXPIRATION INTEGER DEFAULT 0
       )
     """
 
     @JvmField
-    val CREATE_INDEXS = MembershipTable.CREATE_INDEXES
+    val CREATE_INDEXS: Array<String> = MembershipTable.CREATE_INDEXES
 
     private val GROUP_PROJECTION = arrayOf(
       GROUP_ID,
@@ -146,7 +158,8 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
       V2_MASTER_KEY,
       V2_REVISION,
       V2_DECRYPTED_GROUP,
-      LAST_FORCE_UPDATE_TIMESTAMP
+      LAST_FORCE_UPDATE_TIMESTAMP,
+      GROUP_SEND_ENDORSEMENTS_EXPIRATION
     )
 
     val TYPED_GROUP_PROJECTION = GROUP_PROJECTION
@@ -154,18 +167,6 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
       .map { columnName: String -> "$TABLE_NAME.$columnName" }
       .toList()
 
-    //language=sql
-    private const val JOINED_GROUP_SELECT = """
-      SELECT 
-        DISTINCT $TABLE_NAME.*, 
-        (
-            SELECT GROUP_CONCAT(${MembershipTable.TABLE_NAME}.${MembershipTable.RECIPIENT_ID})
-            FROM ${MembershipTable.TABLE_NAME} 
-            WHERE ${MembershipTable.TABLE_NAME}.${MembershipTable.GROUP_ID} = $TABLE_NAME.$GROUP_ID
-        ) as $MEMBER_GROUP_CONCAT
-      FROM $TABLE_NAME          
-    """
-
     val CREATE_TABLES = arrayOf(CREATE_TABLE, MembershipTable.CREATE_TABLE)
   }
 
@@ -176,6 +177,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
       const val ID = "_id"
       const val GROUP_ID = "group_id"
       const val RECIPIENT_ID = "recipient_id"
+      const val ENDORSEMENT = "endorsement"
 
       //language=sql
       const val CREATE_TABLE = """
@@ -183,6 +185,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
             $ID INTEGER PRIMARY KEY,
             $GROUP_ID TEXT NOT NULL REFERENCES ${GroupTable.TABLE_NAME} (${GroupTable.GROUP_ID}) ON DELETE CASCADE,
             $RECIPIENT_ID INTEGER NOT NULL REFERENCES ${RecipientTable.TABLE_NAME} (${RecipientTable.ID}) ON DELETE CASCADE,
+            $ENDORSEMENT BLOB DEFAULT NULL,
             UNIQUE($GROUP_ID, $RECIPIENT_ID)
         )
       """
@@ -203,7 +206,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
 
   private fun getGroup(query: SqlUtil.Query): Optional<GroupRecord> {
     //language=sql
-    val select = "$JOINED_GROUP_SELECT WHERE ${query.where}"
+    val select = "${joinedGroupSelect()} WHERE ${query.where}"
 
     readableDatabase
       .query(select, query.whereArgs)
@@ -356,9 +359,9 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
     val query = getGroupQueryWhereStatement(inputQuery, includeInactive, excludeV1, excludeMms)
     //language=sql
     val statement = """
-      $JOINED_GROUP_SELECT
+      ${joinedGroupSelect(inputQuery)}
       WHERE ${query.where}
-      ORDER BY $TITLE COLLATE NOCASE ASC
+      ORDER BY $TITLE_SEARCH_RANK DESC, $TITLE COLLATE NOCASE ASC
     """
 
     val cursor = databaseHelper.signalReadableDatabase.query(statement, query.whereArgs)
@@ -368,10 +371,10 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
   private fun queryGroupsByRecency(groupQuery: GroupQuery): Reader {
     val query = getGroupQueryWhereStatement(groupQuery.searchQuery, groupQuery.includeInactive, !groupQuery.includeV1, !groupQuery.includeMms)
     val sql = """
-      $JOINED_GROUP_SELECT
+      ${joinedGroupSelect(groupQuery.searchQuery)}
       INNER JOIN ${ThreadTable.TABLE_NAME} ON ${ThreadTable.TABLE_NAME}.${ThreadTable.RECIPIENT_ID} = $TABLE_NAME.$RECIPIENT_ID
       WHERE ${query.where} 
-      ORDER BY ${ThreadTable.TABLE_NAME}.${ThreadTable.DATE} DESC
+      ORDER BY  $TITLE_SEARCH_RANK DESC, ${ThreadTable.TABLE_NAME}.${ThreadTable.DATE} DESC
     """
 
     return Reader(databaseHelper.signalReadableDatabase.rawQuery(sql, query.whereArgs))
@@ -388,16 +391,25 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
   private fun getGroupQueryWhereStatement(inputQuery: String, includeInactive: Boolean, excludeV1: Boolean, excludeMms: Boolean): SqlUtil.Query {
     var query: String
     val queryArgs: Array<String>
-    val caseInsensitiveQuery = buildCaseInsensitiveGlobPattern(inputQuery)
+    val tokens = inputQuery.split(" ").filter { it.isNotEmpty() }.map { buildCaseInsensitiveGlobPattern(it) }
+    val tokenSearchQuery = tokens.joinToString(" AND ") { "$TITLE GLOB ?" }
+
+    val searchQuery = tokenSearchQuery.ifEmpty {
+      "$TITLE GLOB ?"
+    }
+
+    val searchTokens = tokens.ifEmpty {
+      listOf(buildCaseInsensitiveGlobPattern(inputQuery))
+    }
 
-    if (includeInactive) {
-      query = "$TITLE GLOB ? AND ($TABLE_NAME.$ACTIVE = ? OR $TABLE_NAME.$RECIPIENT_ID IN (SELECT ${ThreadTable.RECIPIENT_ID} FROM ${ThreadTable.TABLE_NAME} WHERE ${ThreadTable.TABLE_NAME}.${ThreadTable.ACTIVE} = 1))"
-      queryArgs = buildArgs(caseInsensitiveQuery, 1)
+    query = if (includeInactive) {
+      "($searchQuery) AND ($TABLE_NAME.$ACTIVE = ? OR $TABLE_NAME.$RECIPIENT_ID IN (SELECT ${ThreadTable.RECIPIENT_ID} FROM ${ThreadTable.TABLE_NAME} WHERE ${ThreadTable.TABLE_NAME}.${ThreadTable.ACTIVE} = 1))"
     } else {
-      query = "$TITLE GLOB ? AND $TABLE_NAME.$ACTIVE = ?"
-      queryArgs = buildArgs(caseInsensitiveQuery, 1)
+      "($searchQuery) AND $TABLE_NAME.$ACTIVE = ?"
     }
 
+    queryArgs = buildArgs(*searchTokens.toTypedArray(), 1)
+
     if (excludeV1) {
       query += " AND $EXPECTED_V2_ID IS NULL"
     }
@@ -494,7 +506,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
   }
 
   fun getGroups(): Reader {
-    val cursor = readableDatabase.query(JOINED_GROUP_SELECT)
+    val cursor = readableDatabase.query(joinedGroupSelect())
     return Reader(cursor)
   }
 
@@ -570,19 +582,19 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
       throw LegacyGroupInsertException(groupId)
     }
 
-    return create(groupId, title, members, avatar, null, null)
+    return create(groupId, title, members, avatar, null, null, null)
   }
 
   @CheckReturnValue
   fun create(groupId: GroupId.Mms, title: String?, members: Collection<RecipientId>): Boolean {
-    return create(groupId, if (title.isNullOrEmpty()) null else title, members, null, null, null)
+    return create(groupId, if (title.isNullOrEmpty()) null else title, members, null, null, null, null)
   }
 
   @CheckReturnValue
-  fun create(groupMasterKey: GroupMasterKey, groupState: DecryptedGroup): GroupId.V2? {
+  fun create(groupMasterKey: GroupMasterKey, groupState: DecryptedGroup, groupSendEndorsements: ReceivedGroupSendEndorsements?): GroupId.V2? {
     val groupId = GroupId.v2(groupMasterKey)
 
-    return if (create(groupId = groupId, title = groupState.title, memberCollection = emptyList(), avatar = null, groupMasterKey = groupMasterKey, groupState = groupState)) {
+    return if (create(groupId = groupId, title = groupState.title, memberCollection = emptyList(), avatar = null, groupMasterKey = groupMasterKey, groupState = groupState, receivedGroupSendEndorsements = groupSendEndorsements)) {
       groupId
     } else {
       null
@@ -606,10 +618,9 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
       if (updated < 1) {
         Log.w(TAG, "No group entry. Creating restore placeholder for $groupId")
         create(
-          groupMasterKey,
-          DecryptedGroup.Builder()
-            .revision(GroupsV2StateProcessor.RESTORE_PLACEHOLDER_REVISION)
-            .build()
+          groupMasterKey = groupMasterKey,
+          groupState = DecryptedGroup(revision = GroupsV2StateProcessor.RESTORE_PLACEHOLDER_REVISION),
+          groupSendEndorsements = null
         )
       } else {
         Log.w(TAG, "Had a group entry, but it was missing a master key. Updated.")
@@ -617,7 +628,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
     }
 
     Log.w(TAG, "Scheduling request for latest group info for $groupId")
-    ApplicationDependencies.getJobManager().add(RequestGroupV2InfoJob(groupId))
+    AppDependencies.jobManager.add(RequestGroupV2InfoJob(groupId))
   }
 
   /**
@@ -630,7 +641,8 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
     memberCollection: Collection<RecipientId>,
     avatar: SignalServiceAttachmentPointer?,
     groupMasterKey: GroupMasterKey?,
-    groupState: DecryptedGroup?
+    groupState: DecryptedGroup?,
+    receivedGroupSendEndorsements: ReceivedGroupSendEndorsements?
   ): Boolean {
     val membershipValues = mutableListOf<ContentValues>()
     val groupRecipientId = recipients.getOrInsertFromGroupId(groupId)
@@ -642,7 +654,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
     values.put(RECIPIENT_ID, groupRecipientId.serialize())
     values.put(GROUP_ID, groupId.toString())
     values.put(TITLE, title)
-    membershipValues.addAll(members.toContentValues(groupId))
+    membershipValues.addAll(members.toContentValues(groupId, receivedGroupSendEndorsements?.toGroupSendEndorsementRecords()))
     values.put(MMS, groupId.isMms)
 
     if (avatar != null) {
@@ -659,6 +671,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
     if (groupId.isV2) {
       values.put(ACTIVE, if (groupState != null && gv2GroupActive(groupState)) 1 else 0)
       values.put(DISTRIBUTION_ID, DistributionId.create().toString())
+      values.put(GROUP_SEND_ENDORSEMENTS_EXPIRATION, receivedGroupSendEndorsements?.expirationMs ?: 0)
     } else if (groupId.isV1) {
       values.put(ACTIVE, 1)
       values.put(EXPECTED_V2_ID, groupId.requireV1().deriveV2MigrationGroupId().toString())
@@ -678,7 +691,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
       values.put(V2_REVISION, groupState.revision)
       values.put(V2_DECRYPTED_GROUP, groupState.encode())
       membershipValues.clear()
-      membershipValues.addAll(groupMembers.toContentValues(groupId))
+      membershipValues.addAll(groupMembers.toContentValues(groupId, receivedGroupSendEndorsements?.toGroupSendEndorsementRecords()))
     } else {
       if (groupId.isV2) {
         throw AssertionError("V2 group id but no master key")
@@ -693,9 +706,10 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
         return false
       }
 
-      for (query in SqlUtil.buildBulkInsert(MembershipTable.TABLE_NAME, arrayOf(MembershipTable.GROUP_ID, MembershipTable.RECIPIENT_ID), membershipValues)) {
+      for (query in SqlUtil.buildBulkInsert(MembershipTable.TABLE_NAME, arrayOf(MembershipTable.GROUP_ID, MembershipTable.RECIPIENT_ID, MembershipTable.ENDORSEMENT), membershipValues)) {
         writableDatabase.execSQL(query.where, query.whereArgs)
       }
+
       writableDatabase.setTransactionSuccessful()
     } finally {
       writableDatabase.endTransaction()
@@ -747,11 +761,11 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
     notifyConversationListListeners()
   }
 
-  fun update(groupMasterKey: GroupMasterKey, decryptedGroup: DecryptedGroup) {
-    update(GroupId.v2(groupMasterKey), decryptedGroup)
+  fun update(groupMasterKey: GroupMasterKey, decryptedGroup: DecryptedGroup, groupSendEndorsements: ReceivedGroupSendEndorsements?) {
+    update(GroupId.v2(groupMasterKey), decryptedGroup, groupSendEndorsements)
   }
 
-  fun update(groupId: GroupId.V2, decryptedGroup: DecryptedGroup) {
+  fun update(groupId: GroupId.V2, decryptedGroup: DecryptedGroup, receivedGroupSendEndorsements: ReceivedGroupSendEndorsements?) {
     val groupRecipientId: RecipientId = recipients.getOrInsertFromGroupId(groupId)
     val existingGroup: Optional<GroupRecord> = getGroup(groupId)
     val title: String = decryptedGroup.title
@@ -762,6 +776,10 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
     contentValues.put(V2_DECRYPTED_GROUP, decryptedGroup.encode())
     contentValues.put(ACTIVE, if (gv2GroupActive(decryptedGroup)) 1 else 0)
 
+    if (receivedGroupSendEndorsements != null) {
+      contentValues.put(GROUP_SEND_ENDORSEMENTS_EXPIRATION, receivedGroupSendEndorsements.expirationMs)
+    }
+
     if (existingGroup.isPresent && existingGroup.get().unmigratedV1Members.isNotEmpty() && existingGroup.get().isV2Group) {
       val unmigratedV1Members: MutableSet<RecipientId> = existingGroup.get().unmigratedV1Members.toMutableSet()
 
@@ -783,6 +801,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
     }
 
     val groupMembers = getV2GroupMembers(decryptedGroup, true)
+    var groupSendEndorsementRecords: GroupSendEndorsementRecords? = receivedGroupSendEndorsements?.toGroupSendEndorsementRecords() ?: getGroupSendEndorsements(groupId)
 
     val addedMembers: List<RecipientId> = if (existingGroup.isPresent && existingGroup.get().isV2Group) {
       val change = GroupChangeReconstruct.reconstructGroupChange(existingGroup.get().requireV2GroupProperties().decryptedGroup, decryptedGroup)
@@ -802,6 +821,12 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
         )
       }
 
+      if (receivedGroupSendEndorsements == null && (removed.isNotEmpty() || change.newMembers.isNotEmpty())) {
+        Log.v(TAG, "Members were removed or added, and no new endorsements, clearing endorsements and GSE expiration")
+        contentValues.put(GROUP_SEND_ENDORSEMENTS_EXPIRATION, 0)
+        groupSendEndorsementRecords = null
+      }
+
       change.newMembers.toAciList().toRecipientIds()
     } else {
       groupMembers
@@ -814,7 +839,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
         .where("$GROUP_ID = ?", groupId.toString())
         .run()
 
-      performMembershipUpdate(database, groupId, groupMembers)
+      performMembershipUpdate(database, groupId, groupMembers, groupSendEndorsementRecords)
     }
 
     if (decryptedGroup.disappearingMessagesTimer != null) {
@@ -869,7 +894,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
       .toMutableList()
   }
 
-  private fun performMembershipUpdate(database: SQLiteDatabase, groupId: GroupId, members: Collection<RecipientId>) {
+  private fun performMembershipUpdate(database: SQLiteDatabase, groupId: GroupId, members: Collection<RecipientId>, groupSendEndorsementRecords: GroupSendEndorsementRecords?) {
     check(database.inTransaction())
     database
       .delete(MembershipTable.TABLE_NAME)
@@ -878,8 +903,8 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
 
     val inserts = SqlUtil.buildBulkInsert(
       MembershipTable.TABLE_NAME,
-      arrayOf(MembershipTable.GROUP_ID, MembershipTable.RECIPIENT_ID),
-      members.toSet().toContentValues(groupId)
+      arrayOf(MembershipTable.GROUP_ID, MembershipTable.RECIPIENT_ID, MembershipTable.ENDORSEMENT),
+      members.toSet().toContentValues(groupId, groupSendEndorsementRecords)
     )
 
     inserts.forEach {
@@ -908,6 +933,94 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
       .run()
   }
 
+  fun getGroupSendEndorsementsExpiration(groupId: GroupId): Long {
+    return writableDatabase
+      .select(GROUP_SEND_ENDORSEMENTS_EXPIRATION)
+      .from(TABLE_NAME)
+      .where("$GROUP_ID = ?", groupId)
+      .run()
+      .readToSingleLong(0L)
+  }
+
+  fun updateGroupSendEndorsements(groupId: GroupId.V2, receivedGroupSendEndorsements: ReceivedGroupSendEndorsements) {
+    val endorsements: Map<RecipientId, GroupSendEndorsement?> = receivedGroupSendEndorsements.toGroupSendEndorsementRecords().endorsements
+
+    writableDatabase.withinTransaction { db ->
+      db.update(MembershipTable.TABLE_NAME, contentValuesOf(MembershipTable.ENDORSEMENT to null), "${MembershipTable.GROUP_ID} = ?", arrayOf(groupId.serialize()))
+
+      for ((recipientId, endorsement) in endorsements) {
+        db.update(MembershipTable.TABLE_NAME)
+          .values(MembershipTable.ENDORSEMENT to endorsement?.serialize())
+          .where("${MembershipTable.GROUP_ID} = ? AND ${MembershipTable.RECIPIENT_ID} = ?", groupId, recipientId)
+          .run()
+      }
+
+      writableDatabase
+        .update(TABLE_NAME)
+        .values(GROUP_SEND_ENDORSEMENTS_EXPIRATION to receivedGroupSendEndorsements.expirationMs)
+        .where("$GROUP_ID = ?", groupId)
+        .run()
+    }
+  }
+
+  fun getGroupSendEndorsements(groupId: GroupId): GroupSendEndorsementRecords {
+    val allEndorsements: Map<RecipientId, GroupSendEndorsement?> = readableDatabase
+      .select(MembershipTable.RECIPIENT_ID, MembershipTable.ENDORSEMENT)
+      .from(MembershipTable.TABLE_NAME)
+      .where("${MembershipTable.GROUP_ID} = ?", groupId)
+      .run()
+      .readToMap { cursor ->
+        val recipientId = RecipientId.from(cursor.requireLong(MembershipTable.RECIPIENT_ID))
+        val endorsement = cursor.requireBlob(MembershipTable.ENDORSEMENT)?.let { endorsementBlob ->
+          try {
+            GroupSendEndorsement(endorsementBlob)
+          } catch (e: InvalidInputException) {
+            Log.w(TAG, "Unable to parse group send endorsement for $recipientId", e)
+            null
+          }
+        }
+
+        recipientId to endorsement
+      }
+
+    return GroupSendEndorsementRecords(allEndorsements)
+  }
+
+  fun getGroupSendFullToken(threadId: Long, recipientId: RecipientId): GroupSendFullToken? {
+    val threadRecipient = SignalDatabase.threads.getRecipientForThreadId(threadId)
+    if (threadRecipient == null || !threadRecipient.isGroup) {
+      return null
+    }
+
+    return getGroupSendFullToken(threadRecipient.requireGroupId().requireV2(), recipientId)
+  }
+
+  fun getGroupSendFullToken(groupId: GroupId.V2, recipientId: RecipientId): GroupSendFullToken? {
+    val groupRecord = SignalDatabase.groups.getGroup(groupId).orElse(null) ?: return null
+    val endorsement = SignalDatabase.groups.getGroupSendEndorsement(groupId, recipientId) ?: return null
+
+    val groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupRecord.requireV2GroupProperties().groupMasterKey)
+    return endorsement.toFullToken(groupSecretParams, Instant.ofEpochMilli(groupRecord.groupSendEndorsementExpiration))
+  }
+
+  private fun getGroupSendEndorsement(groupId: GroupId, recipientId: RecipientId): GroupSendEndorsement? {
+    return readableDatabase
+      .select(MembershipTable.ENDORSEMENT)
+      .from(MembershipTable.TABLE_NAME)
+      .where("${MembershipTable.GROUP_ID} = ? AND ${MembershipTable.RECIPIENT_ID} = ?", groupId, recipientId)
+      .run()
+      .readToSingleObject { c ->
+        c.requireBlob(MembershipTable.ENDORSEMENT)?.let { endorsementBlob ->
+          try {
+            GroupSendEndorsement(endorsementBlob)
+          } catch (e: InvalidInputException) {
+            Log.w(TAG, "Unable to parse group send endorsement for $recipientId", e)
+            null
+          }
+        }
+      }
+  }
+
   @WorkerThread
   fun isCurrentMember(groupId: Push, recipientId: RecipientId): Boolean {
     return readableDatabase
@@ -1010,7 +1123,8 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
           groupRevision = cursor.requireInt(V2_REVISION),
           decryptedGroupBytes = cursor.requireBlob(V2_DECRYPTED_GROUP),
           distributionId = cursor.optionalString(DISTRIBUTION_ID).map { id -> DistributionId.from(id) }.orElse(null),
-          lastForceUpdateTimestamp = cursor.requireLong(LAST_FORCE_UPDATE_TIMESTAMP)
+          lastForceUpdateTimestamp = cursor.requireLong(LAST_FORCE_UPDATE_TIMESTAMP),
+          groupSendEndorsementExpiration = cursor.requireLong(GROUP_SEND_ENDORSEMENTS_EXPIRATION)
         )
       }
     }
@@ -1099,7 +1213,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
 
     fun getMemberRecipientIds(memberSet: MemberSet): List<RecipientId> {
       val includeSelf = memberSet.includeSelf
-      val selfAci = SignalStore.account().requireAci()
+      val selfAci = SignalStore.account.requireAci()
       val recipients: MutableList<RecipientId> = ArrayList(decryptedGroup.members.size + decryptedGroup.pendingMembers.size)
 
       var unknownMembers = 0
@@ -1208,7 +1322,7 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
   }
 
   private fun gv2GroupActive(decryptedGroup: DecryptedGroup): Boolean {
-    val aci = SignalStore.account().requireAci()
+    val aci = SignalStore.account.requireAci()
 
     return decryptedGroup.members.findMemberByAci(aci).isPresent ||
       DecryptedGroupUtil.findPendingByServiceId(decryptedGroup.pendingMembers, aci).isPresent
@@ -1222,15 +1336,20 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
     return RecipientId.toSerializedList(this)
   }
 
-  private fun Collection<RecipientId>.toContentValues(groupId: GroupId): List<ContentValues> {
+  private fun Collection<RecipientId>.toContentValues(groupId: GroupId, groupSendEndorsementRecords: GroupSendEndorsementRecords?): List<ContentValues> {
     return map {
       contentValuesOf(
         MembershipTable.GROUP_ID to groupId.serialize(),
-        MembershipTable.RECIPIENT_ID to it.serialize()
+        MembershipTable.RECIPIENT_ID to it.serialize(),
+        MembershipTable.ENDORSEMENT to groupSendEndorsementRecords?.endorsements?.get(it)?.serialize()
       )
     }
   }
 
+  private fun ReceivedGroupSendEndorsements.toGroupSendEndorsementRecords(): GroupSendEndorsementRecords {
+    return GroupSendEndorsementRecords(endorsements.map { (aci, endorsement) -> RecipientId.from(aci) to endorsement }.toMap())
+  }
+
   private fun serviceIdsToRecipientIds(serviceIds: Sequence<ServiceId>): MutableList<RecipientId> {
     return serviceIds
       .map { serviceId ->
@@ -1270,8 +1389,30 @@ class GroupTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
     }
   }
 
+  //language=sql
+  private fun joinedGroupSelect(titleSearchQuery: String? = null): String {
+    val titleSearchRankColumn = if (titleSearchQuery == null) {
+      ""
+    } else {
+      val glob = buildCaseInsensitiveGlobPattern(titleSearchQuery)
+      ", ($TITLE GLOB \"$glob\") as $TITLE_SEARCH_RANK"
+    }
+
+    return """
+        SELECT 
+        DISTINCT $TABLE_NAME.*, 
+        (
+            SELECT GROUP_CONCAT(${MembershipTable.TABLE_NAME}.${MembershipTable.RECIPIENT_ID})
+            FROM ${MembershipTable.TABLE_NAME} 
+            WHERE ${MembershipTable.TABLE_NAME}.${MembershipTable.GROUP_ID} = $TABLE_NAME.$GROUP_ID
+        ) as $MEMBER_GROUP_CONCAT $titleSearchRankColumn
+        FROM $TABLE_NAME          
+      """
+  }
+
   enum class MemberSet(val includeSelf: Boolean, val includePending: Boolean) {
-    FULL_MEMBERS_INCLUDING_SELF(true, false), FULL_MEMBERS_EXCLUDING_SELF(false, false)
+    FULL_MEMBERS_INCLUDING_SELF(true, false),
+    FULL_MEMBERS_EXCLUDING_SELF(false, false)
   }
 
   /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/IdentityTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/IdentityTable.kt
index 08280f1262..ebdd5b949a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/IdentityTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/IdentityTable.kt
@@ -35,7 +35,7 @@ import org.signal.libsignal.protocol.IdentityKey
 import org.thoughtcrime.securesms.database.SignalDatabase.Companion.recipients
 import org.thoughtcrime.securesms.database.model.IdentityRecord
 import org.thoughtcrime.securesms.database.model.IdentityStoreRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
@@ -173,7 +173,7 @@ class IdentityTable internal constructor(context: Context?, databaseHelper: Sign
         EventBus.getDefault().post(record.get())
       }
 
-      ApplicationDependencies.getProtocolStore().aci().identities().invalidate(addressName)
+      AppDependencies.protocolStore.aci().identities().invalidate(addressName)
     }
 
     if (hadEntry && !keyMatches) {
@@ -244,7 +244,9 @@ class IdentityTable internal constructor(context: Context?, databaseHelper: Sign
   }
 
   enum class VerifiedStatus {
-    DEFAULT, VERIFIED, UNVERIFIED;
+    DEFAULT,
+    VERIFIED,
+    UNVERIFIED;
 
     fun toInt(): Int {
       return when (this) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentSubscriberTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentSubscriberTable.kt
new file mode 100644
index 0000000000..3d0e0450db
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentSubscriberTable.kt
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.database
+
+import android.content.ContentValues
+import android.content.Context
+import android.database.Cursor
+import androidx.annotation.VisibleForTesting
+import androidx.core.content.contentValuesOf
+import org.signal.core.util.DatabaseSerializer
+import org.signal.core.util.Serializer
+import org.signal.core.util.insertInto
+import org.signal.core.util.logging.Log
+import org.signal.core.util.readToSingleObject
+import org.signal.core.util.requireBoolean
+import org.signal.core.util.requireInt
+import org.signal.core.util.requireNonNullString
+import org.signal.core.util.select
+import org.signal.core.util.update
+import org.signal.core.util.withinTransaction
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.whispersystems.signalservice.api.subscriptions.SubscriberId
+import java.util.Currency
+
+/**
+ * A table matching up SubscriptionIds to currency codes and type
+ */
+class InAppPaymentSubscriberTable(
+  context: Context,
+  databaseHelper: SignalDatabase
+) : DatabaseTable(context, databaseHelper) {
+
+  companion object {
+    private val TAG = Log.tag(InAppPaymentSubscriberRecord::class.java)
+
+    @VisibleForTesting
+    const val TABLE_NAME = "in_app_payment_subscriber"
+
+    /** Row ID */
+    private const val ID = "_id"
+
+    /** The serialized subscriber id */
+    @VisibleForTesting
+    const val SUBSCRIBER_ID = "subscriber_id"
+
+    /** The currency code for this subscriber id */
+    @VisibleForTesting
+    const val CURRENCY_CODE = "currency_code"
+
+    /** The type of subscription used by this subscriber id */
+    private const val TYPE = "type"
+
+    /** Specifies whether we should try to cancel any current subscription before starting a new one with this ID */
+    private const val REQUIRES_CANCEL = "requires_cancel"
+
+    /** Specifies which payment method was utilized for the latest transaction with this id */
+    private const val PAYMENT_METHOD_TYPE = "payment_method_type"
+
+    const val CREATE_TABLE = """
+      CREATE TABLE $TABLE_NAME (
+        $ID INTEGER PRIMARY KEY,
+        $SUBSCRIBER_ID TEXT NOT NULL UNIQUE,
+        $CURRENCY_CODE TEXT NOT NULL,
+        $TYPE INTEGER NOT NULL,
+        $REQUIRES_CANCEL INTEGER DEFAULT 0,
+        $PAYMENT_METHOD_TYPE INTEGER DEFAULT 0,
+        UNIQUE($CURRENCY_CODE, $TYPE)
+      )
+    """
+  }
+
+  /**
+   * Inserts this subscriber, replacing any that it conflicts with.
+   *
+   * This is a destructive, mutating operation. For setting specific values, prefer the alternative setters available on this table class.
+   */
+  fun insertOrReplace(inAppPaymentSubscriberRecord: InAppPaymentSubscriberRecord) {
+    Log.i(TAG, "Setting subscriber for currency ${inAppPaymentSubscriberRecord.currency.currencyCode}", Exception(), true)
+
+    writableDatabase.withinTransaction { db ->
+      db.insertInto(TABLE_NAME)
+        .values(InAppPaymentSubscriberSerializer.serialize(inAppPaymentSubscriberRecord))
+        .run(conflictStrategy = SQLiteDatabase.CONFLICT_REPLACE)
+
+      SignalStore.inAppPayments.setSubscriberCurrency(
+        inAppPaymentSubscriberRecord.currency,
+        inAppPaymentSubscriberRecord.type
+      )
+    }
+  }
+
+  /**
+   * Sets whether the subscriber in question requires a cancellation before a new subscription can be created.
+   */
+  fun setRequiresCancel(subscriberId: SubscriberId, requiresCancel: Boolean) {
+    writableDatabase.update(TABLE_NAME)
+      .values(REQUIRES_CANCEL to requiresCancel)
+      .where("$SUBSCRIBER_ID = ?", subscriberId.serialize())
+      .run()
+  }
+
+  /**
+   * Updates the payment method on a subscriber.
+   */
+  fun setPaymentMethod(subscriberId: SubscriberId, paymentMethodType: InAppPaymentData.PaymentMethodType) {
+    writableDatabase.update(TABLE_NAME)
+      .values(PAYMENT_METHOD_TYPE to paymentMethodType.value)
+      .where("$SUBSCRIBER_ID = ?", subscriberId.serialize())
+      .run()
+  }
+
+  /**
+   * Retrieves a subscriber for the given type by the currency code.
+   */
+  fun getByCurrencyCode(currencyCode: String, type: InAppPaymentSubscriberRecord.Type): InAppPaymentSubscriberRecord? {
+    return readableDatabase.select()
+      .from(TABLE_NAME)
+      .where("$TYPE = ? AND $CURRENCY_CODE = ?", TypeSerializer.serialize(type), currencyCode.uppercase())
+      .run()
+      .readToSingleObject(InAppPaymentSubscriberSerializer)
+  }
+
+  /**
+   * Retrieves a subscriber by SubscriberId
+   */
+  fun getBySubscriberId(subscriberId: SubscriberId): InAppPaymentSubscriberRecord? {
+    return readableDatabase.select()
+      .from(TABLE_NAME)
+      .where("$SUBSCRIBER_ID = ?", subscriberId.serialize())
+      .run()
+      .readToSingleObject(InAppPaymentSubscriberSerializer)
+  }
+
+  object InAppPaymentSubscriberSerializer : DatabaseSerializer<InAppPaymentSubscriberRecord> {
+    override fun serialize(data: InAppPaymentSubscriberRecord): ContentValues {
+      return contentValuesOf(
+        SUBSCRIBER_ID to data.subscriberId.serialize(),
+        CURRENCY_CODE to data.currency.currencyCode.uppercase(),
+        TYPE to TypeSerializer.serialize(data.type),
+        REQUIRES_CANCEL to data.requiresCancel,
+        PAYMENT_METHOD_TYPE to data.paymentMethodType.value
+      )
+    }
+
+    override fun deserialize(input: Cursor): InAppPaymentSubscriberRecord {
+      val type = TypeSerializer.deserialize(input.requireInt(TYPE))
+      val currencyCode = input.requireNonNullString(CURRENCY_CODE).takeIf { it.isNotEmpty() }
+      return InAppPaymentSubscriberRecord(
+        subscriberId = SubscriberId.deserialize(input.requireNonNullString(SUBSCRIBER_ID)),
+        currency = currencyCode?.let { Currency.getInstance(it) } ?: SignalStore.inAppPayments.getSubscriptionCurrency(type),
+        type = type,
+        requiresCancel = input.requireBoolean(REQUIRES_CANCEL) || currencyCode.isNullOrBlank(),
+        paymentMethodType = InAppPaymentData.PaymentMethodType.fromValue(input.requireInt(PAYMENT_METHOD_TYPE)) ?: InAppPaymentData.PaymentMethodType.UNKNOWN
+      )
+    }
+  }
+
+  object TypeSerializer : Serializer<InAppPaymentSubscriberRecord.Type, Int> {
+    override fun serialize(data: InAppPaymentSubscriberRecord.Type): Int = data.code
+    override fun deserialize(input: Int): InAppPaymentSubscriberRecord.Type = InAppPaymentSubscriberRecord.Type.values().first { it.code == input }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentTable.kt
new file mode 100644
index 0000000000..f3c5ac2ecd
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/InAppPaymentTable.kt
@@ -0,0 +1,433 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.database
+
+import android.content.ContentValues
+import android.content.Context
+import android.database.Cursor
+import android.os.Parcelable
+import androidx.core.content.contentValuesOf
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
+import kotlinx.parcelize.TypeParceler
+import org.signal.core.util.DatabaseId
+import org.signal.core.util.DatabaseSerializer
+import org.signal.core.util.Serializer
+import org.signal.core.util.delete
+import org.signal.core.util.exists
+import org.signal.core.util.insertInto
+import org.signal.core.util.readToList
+import org.signal.core.util.readToSingleObject
+import org.signal.core.util.requireBoolean
+import org.signal.core.util.requireInt
+import org.signal.core.util.requireLong
+import org.signal.core.util.requireNonNullBlob
+import org.signal.core.util.requireString
+import org.signal.core.util.select
+import org.signal.core.util.update
+import org.signal.core.util.withinTransaction
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.util.parcelers.MillisecondDurationParceler
+import org.thoughtcrime.securesms.util.parcelers.NullableSubscriberIdParceler
+import org.whispersystems.signalservice.api.subscriptions.SubscriberId
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
+
+/**
+ * Centralizes state information for donations and backups payments and redemption.
+ *
+ * Each entry in this database has a 1:1 relationship with a redeemable token, which can be for one of the following:
+ * * A Gift Badge
+ * * A Boost Badge
+ * * A Subscription Badge
+ * * A Backup Subscription
+ */
+class InAppPaymentTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTable(context, databaseHelper) {
+
+  companion object {
+    private const val TABLE_NAME = "in_app_payment"
+
+    /**
+     * Row ID
+     */
+    private const val ID = "_id"
+
+    /**
+     * What kind of payment this row represents
+     */
+    private const val TYPE = "type"
+
+    /**
+     * The current state of the given payment
+     */
+    private const val STATE = "state"
+
+    /**
+     * When the payment was first inserted into the database
+     */
+    private const val INSERTED_AT = "inserted_at"
+
+    /**
+     * The last time the payment was updated
+     */
+    private const val UPDATED_AT = "updated_at"
+
+    /**
+     * Whether the user has been notified of the payment's terminal state.
+     */
+    private const val NOTIFIED = "notified"
+
+    /**
+     * The subscriber id associated with the payment.
+     */
+    private const val SUBSCRIBER_ID = "subscriber_id"
+
+    /**
+     * The end of period related to the subscription, if this column represents a recurring payment.
+     * A zero here indicates that we do not have an end of period yet for this recurring payment, OR
+     * that this row does not represent a recurring payment.
+     */
+    private const val END_OF_PERIOD = "end_of_period"
+
+    /**
+     * Extraneous data that may or may not be common among payments
+     */
+    private const val DATA = "data"
+
+    val CREATE_TABLE = """
+      CREATE TABLE $TABLE_NAME (
+        $ID INTEGER PRIMARY KEY,
+        $TYPE INTEGER NOT NULL,
+        $STATE INTEGER NOT NULL,
+        $INSERTED_AT INTEGER NOT NULL,
+        $UPDATED_AT INTEGER NOT NULL,
+        $NOTIFIED INTEGER DEFAULT 1,
+        $SUBSCRIBER_ID TEXT,
+        $END_OF_PERIOD INTEGER DEFAULT 0,
+        $DATA BLOB NOT NULL
+      )
+    """.trimIndent()
+  }
+
+  /**
+   * Called when we create a new InAppPayment while in the checkout screen. At this point in
+   * the flow, we know that there should not be any other InAppPayment objects currently in this
+   * state.
+   */
+  fun clearCreated() {
+    writableDatabase.delete(TABLE_NAME)
+      .where("$STATE = ?", State.serialize(State.CREATED))
+      .run()
+  }
+
+  fun insert(
+    type: InAppPaymentType,
+    state: State,
+    subscriberId: SubscriberId?,
+    endOfPeriod: Duration?,
+    inAppPaymentData: InAppPaymentData
+  ): InAppPaymentId {
+    val now = System.currentTimeMillis()
+    return writableDatabase.insertInto(TABLE_NAME)
+      .values(
+        TYPE to type.code,
+        STATE to state.code,
+        INSERTED_AT to now,
+        UPDATED_AT to now,
+        SUBSCRIBER_ID to subscriberId?.serialize(),
+        END_OF_PERIOD to (endOfPeriod?.inWholeSeconds ?: 0L),
+        DATA to InAppPaymentData.ADAPTER.encode(inAppPaymentData),
+        NOTIFIED to 1
+      )
+      .run()
+      .let { InAppPaymentId(it) }
+  }
+
+  fun update(
+    inAppPayment: InAppPayment
+  ) {
+    val updated = inAppPayment.copy(updatedAt = System.currentTimeMillis().milliseconds)
+    writableDatabase.update(TABLE_NAME)
+      .values(InAppPayment.serialize(updated))
+      .where(ID_WHERE, inAppPayment.id)
+      .run()
+
+    AppDependencies.databaseObserver.notifyInAppPaymentsObservers(inAppPayment)
+  }
+
+  fun hasWaitingForAuth(): Boolean {
+    return readableDatabase
+      .exists(TABLE_NAME)
+      .where("$STATE = ?", State.serialize(State.WAITING_FOR_AUTHORIZATION))
+      .run()
+  }
+
+  fun getAllWaitingForAuth(): List<InAppPayment> {
+    return readableDatabase.select()
+      .from(TABLE_NAME)
+      .where("$STATE = ?", State.serialize(State.WAITING_FOR_AUTHORIZATION))
+      .run()
+      .readToList { InAppPayment.deserialize(it) }
+  }
+
+  /**
+   * Retrieves all InAppPayment objects for donations that have been marked NOTIFIED = 0, and then marks them
+   * all as notified.
+   */
+  fun consumeDonationPaymentsToNotifyUser(): List<InAppPayment> {
+    return writableDatabase.withinTransaction { db ->
+      val payments = db.select()
+        .from(TABLE_NAME)
+        .where("$NOTIFIED = ? AND $TYPE != ?", 0, InAppPaymentType.serialize(InAppPaymentType.RECURRING_BACKUP))
+        .run()
+        .readToList(mapper = { InAppPayment.deserialize(it) })
+
+      db.update(TABLE_NAME).values(NOTIFIED to 1)
+        .where("$TYPE != ?", InAppPaymentType.serialize(InAppPaymentType.RECURRING_BACKUP))
+        .run()
+
+      payments
+    }
+  }
+
+  /**
+   * Retrieves all InAppPayment objects for backups that have been marked NOTIFIED = 0, and then marks them
+   * all as notified.
+   */
+  fun consumeBackupPaymentsToNotifyUser(): List<InAppPayment> {
+    return writableDatabase.withinTransaction { db ->
+      val payments = db.select()
+        .from(TABLE_NAME)
+        .where("$NOTIFIED = ? AND $TYPE = ?", 0, InAppPaymentType.serialize(InAppPaymentType.RECURRING_BACKUP))
+        .run()
+        .readToList(mapper = { InAppPayment.deserialize(it) })
+
+      db.update(TABLE_NAME).values(NOTIFIED to 1)
+        .where("$TYPE = ?", InAppPaymentType.serialize(InAppPaymentType.RECURRING_BACKUP))
+        .run()
+
+      payments
+    }
+  }
+
+  fun getById(id: InAppPaymentId): InAppPayment? {
+    return readableDatabase.select()
+      .from(TABLE_NAME)
+      .where(ID_WHERE, id)
+      .run()
+      .readToSingleObject(InAppPayment.Companion)
+  }
+
+  fun getByEndOfPeriod(type: InAppPaymentType, endOfPeriod: Duration): InAppPayment? {
+    return readableDatabase.select()
+      .from(TABLE_NAME)
+      .where("$TYPE = ? AND $END_OF_PERIOD = ?", InAppPaymentType.serialize(type), endOfPeriod.inWholeSeconds)
+      .run()
+      .readToSingleObject(InAppPayment.Companion)
+  }
+
+  fun getByLatestEndOfPeriod(type: InAppPaymentType): InAppPayment? {
+    return readableDatabase.select()
+      .from(TABLE_NAME)
+      .where("$TYPE = ? AND $END_OF_PERIOD > 0", InAppPaymentType.serialize(type))
+      .orderBy("$END_OF_PERIOD DESC")
+      .limit(1)
+      .run()
+      .readToSingleObject(InAppPayment.Companion)
+  }
+
+  /**
+   * Returns the latest entry in the table for the given subscriber id.
+   */
+  fun getLatestBySubscriberId(subscriberId: SubscriberId): InAppPayment? {
+    return readableDatabase.select()
+      .from(TABLE_NAME)
+      .where("$SUBSCRIBER_ID = ?", subscriberId.serialize())
+      .orderBy("$END_OF_PERIOD DESC")
+      .limit(1)
+      .run()
+      .readToSingleObject(InAppPayment.Companion)
+  }
+
+  fun markSubscriptionManuallyCanceled(subscriberId: SubscriberId) {
+    writableDatabase.withinTransaction {
+      val inAppPayment = getLatestBySubscriberId(subscriberId) ?: return@withinTransaction
+
+      update(
+        inAppPayment.copy(
+          data = inAppPayment.data.copy(
+            cancellation = InAppPaymentData.Cancellation(
+              reason = InAppPaymentData.Cancellation.Reason.MANUAL
+            )
+          )
+        )
+      )
+    }
+  }
+
+  /**
+   * Returns whether there are any pending donations in the database.
+   */
+  fun hasPendingDonation(): Boolean {
+    return readableDatabase.exists(TABLE_NAME)
+      .where(
+        "$STATE = ? AND ($TYPE = ? OR $TYPE = ? OR $TYPE = ?)",
+        State.serialize(State.PENDING),
+        InAppPaymentType.serialize(InAppPaymentType.RECURRING_DONATION),
+        InAppPaymentType.serialize(InAppPaymentType.ONE_TIME_DONATION),
+        InAppPaymentType.serialize(InAppPaymentType.ONE_TIME_GIFT)
+      )
+      .run()
+  }
+
+  /**
+   * Returns whether there are any pending donations in the database.
+   */
+  fun hasPending(type: InAppPaymentType): Boolean {
+    return readableDatabase.exists(TABLE_NAME)
+      .where(
+        "$STATE = ? AND $TYPE = ?",
+        State.serialize(State.PENDING),
+        InAppPaymentType.serialize(type)
+      )
+      .run()
+  }
+
+  /**
+   * Retrieves from the database the latest payment of the given type that is either in the PENDING or WAITING_FOR_AUTHORIZATION state.
+   */
+  fun getLatestInAppPaymentByType(type: InAppPaymentType): InAppPayment? {
+    return readableDatabase.select()
+      .from(TABLE_NAME)
+      .where(
+        "($STATE = ? OR $STATE = ? OR $STATE = ?) AND $TYPE = ?",
+        State.serialize(State.PENDING),
+        State.serialize(State.WAITING_FOR_AUTHORIZATION),
+        State.serialize(State.END),
+        InAppPaymentType.serialize(type)
+      )
+      .orderBy("$INSERTED_AT DESC")
+      .limit(1)
+      .run()
+      .readToSingleObject(InAppPayment.Companion)
+  }
+
+  /**
+   * Represents a database row. Nicer than returning a raw value.
+   */
+  @Parcelize
+  data class InAppPaymentId(
+    val rowId: Long
+  ) : DatabaseId, Parcelable {
+    init {
+      check(rowId > 0)
+    }
+
+    override fun serialize(): String = rowId.toString()
+
+    override fun toString(): String = serialize()
+  }
+
+  /**
+   * Represents a single token payment.
+   */
+  @Parcelize
+  @TypeParceler<Duration, MillisecondDurationParceler>
+  @TypeParceler<SubscriberId?, NullableSubscriberIdParceler>
+  data class InAppPayment(
+    val id: InAppPaymentId,
+    val type: InAppPaymentType,
+    val state: State,
+    val insertedAt: Duration,
+    val updatedAt: Duration,
+    val notified: Boolean,
+    val subscriberId: SubscriberId?,
+    val endOfPeriod: Duration,
+    val data: InAppPaymentData
+  ) : Parcelable {
+
+    @IgnoredOnParcel
+    val endOfPeriodSeconds: Long = endOfPeriod.inWholeSeconds
+
+    companion object : DatabaseSerializer<InAppPayment> {
+
+      override fun serialize(data: InAppPayment): ContentValues {
+        return contentValuesOf(
+          ID to data.id.serialize(),
+          TYPE to data.type.apply { check(this != InAppPaymentType.UNKNOWN) }.code,
+          STATE to data.state.code,
+          INSERTED_AT to data.insertedAt.inWholeSeconds,
+          UPDATED_AT to data.updatedAt.inWholeSeconds,
+          NOTIFIED to data.notified,
+          SUBSCRIBER_ID to data.subscriberId?.serialize(),
+          END_OF_PERIOD to data.endOfPeriod.inWholeSeconds,
+          DATA to data.data.encode()
+        )
+      }
+
+      override fun deserialize(input: Cursor): InAppPayment {
+        return InAppPayment(
+          id = InAppPaymentId(input.requireLong(ID)),
+          type = InAppPaymentType.deserialize(input.requireInt(TYPE)),
+          state = State.deserialize(input.requireInt(STATE)),
+          insertedAt = input.requireLong(INSERTED_AT).seconds,
+          updatedAt = input.requireLong(UPDATED_AT).seconds,
+          notified = input.requireBoolean(NOTIFIED),
+          subscriberId = input.requireString(SUBSCRIBER_ID)?.let { SubscriberId.deserialize(it) },
+          endOfPeriod = input.requireLong(END_OF_PERIOD).seconds,
+          data = InAppPaymentData.ADAPTER.decode(input.requireNonNullBlob(DATA))
+        )
+      }
+    }
+  }
+
+  /**
+   * Represents the payment pipeline state for a given in-app payment
+   *
+   * ```mermaid
+   * flowchart TD
+   *     CREATED -- Auth required --> WAITING_FOR_AUTHORIZATION
+   *     CREATED -- Auth not required --> PENDING
+   *     WAITING_FOR_AUTHORIZATION -- User completes auth --> PENDING
+   *     WAITING_FOR_AUTHORIZATION -- User does not complete auth --> END
+   *     PENDING --> END
+   *     PENDING --> RETRY
+   *     PENDING --> END
+   *     RETRY --> PENDING
+   *     RETRY --> END
+   * ```
+   */
+  enum class State(val code: Int) {
+    /**
+     * This payment has been created, but not submitted for processing yet.
+     */
+    CREATED(0),
+
+    /**
+     * This payment is awaiting the user to return from an external authorization2
+     * such as a 3DS flow or IDEAL confirmation.
+     */
+    WAITING_FOR_AUTHORIZATION(1),
+
+    /**
+     * This payment is authorized and is waiting to be processed.
+     */
+    PENDING(2),
+
+    /**
+     * This payment pipeline has been completed. Check the data to see the state.
+     */
+    END(3);
+
+    companion object : Serializer<State, Int> {
+      override fun serialize(data: State): Int = data.code
+      override fun deserialize(input: Int): State = State.values().first { it.code == input }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/KeyValueDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/KeyValueDatabase.java
index 238f540cc0..0e61379133 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/KeyValueDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/KeyValueDatabase.java
@@ -32,7 +32,7 @@ public class KeyValueDatabase extends SQLiteOpenHelper implements SignalDatabase
   private static final String TAG = Log.tag(KeyValueDatabase.class);
 
   private static final int    DATABASE_VERSION = 1;
-  private static final String DATABASE_NAME    = "signal-key-value.db";
+  public  static final String DATABASE_NAME    = "signal-key-value.db";
 
   private static final String TABLE_NAME = "key_value";
   private static final String ID         = "_id";
@@ -65,9 +65,16 @@ public static boolean exists(Context context) {
     return context.getDatabasePath(DATABASE_NAME).exists();
   }
 
+  public static KeyValueDatabase createWithName(@NonNull Application application, @NonNull String name) {
+    return new KeyValueDatabase(application, DatabaseSecretProvider.getOrCreateDatabaseSecret(application), name);
+  }
 
   private KeyValueDatabase(@NonNull Application application, @NonNull DatabaseSecret databaseSecret) {
-    super(application, DATABASE_NAME, databaseSecret.asString(), null, DATABASE_VERSION, 0,new SqlCipherErrorHandler(DATABASE_NAME), new SqlCipherDatabaseHook(), true);
+    this(application, databaseSecret, DATABASE_NAME);
+  }
+
+  private KeyValueDatabase(@NonNull Application application, @NonNull DatabaseSecret databaseSecret, @NonNull String name) {
+    super(application, name, databaseSecret.asString(), null, DATABASE_VERSION, 0, new SqlCipherErrorHandler(name), new SqlCipherDatabaseHook(), true);
 
     this.application = application;
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MediaTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/MediaTable.kt
index 773bb7975d..9ea66d9086 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MediaTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MediaTable.kt
@@ -9,9 +9,9 @@ import org.signal.core.util.requireLong
 import org.signal.core.util.requireNonNullString
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.MediaUtil
 import org.thoughtcrime.securesms.util.MediaUtil.SlideType
+import org.thoughtcrime.securesms.util.RemoteConfig
 
 @SuppressLint("RecipientIdDatabaseReferenceUsage", "ThreadIdDatabaseReferenceUsage") // Not a real table, just a view
 class MediaTable internal constructor(context: Context?, databaseHelper: SignalDatabase?) : DatabaseTable(context, databaseHelper) {
@@ -56,6 +56,8 @@ class MediaTable internal constructor(context: Context?, databaseHelper: SignalD
         ${AttachmentTable.TABLE_NAME}.${AttachmentTable.ARCHIVE_MEDIA_NAME},
         ${AttachmentTable.TABLE_NAME}.${AttachmentTable.ARCHIVE_MEDIA_ID},
         ${AttachmentTable.TABLE_NAME}.${AttachmentTable.ARCHIVE_THUMBNAIL_CDN},
+        ${AttachmentTable.TABLE_NAME}.${AttachmentTable.THUMBNAIL_RESTORE_STATE},
+        ${AttachmentTable.TABLE_NAME}.${AttachmentTable.ATTACHMENT_UUID},
         ${MessageTable.TABLE_NAME}.${MessageTable.TYPE}, 
         ${MessageTable.TABLE_NAME}.${MessageTable.DATE_SENT}, 
         ${MessageTable.TABLE_NAME}.${MessageTable.DATE_RECEIVED}, 
@@ -115,6 +117,16 @@ class MediaTable internal constructor(context: Context?, databaseHelper: SignalD
       """
     )
 
+    private val GALLERY_MEDIA_QUERY_INCLUDING_TEMP_VIDEOS_AND_THUMBNAILS = String.format(
+      BASE_MEDIA_QUERY,
+      """
+        (${AttachmentTable.DATA_FILE} IS NOT NULL OR (${AttachmentTable.CONTENT_TYPE} LIKE 'video/%' AND ${AttachmentTable.REMOTE_INCREMENTAL_DIGEST} IS NOT NULL) OR (${AttachmentTable.THUMBNAIL_FILE} IS NOT NULL)) AND
+        ${AttachmentTable.CONTENT_TYPE} NOT LIKE 'image/svg%' AND 
+        (${AttachmentTable.CONTENT_TYPE} LIKE 'image/%' OR ${AttachmentTable.CONTENT_TYPE} LIKE 'video/%') AND
+        ${MessageTable.LINK_PREVIEWS} IS NULL
+      """
+    )
+
     private val AUDIO_MEDIA_QUERY = String.format(
       BASE_MEDIA_QUERY,
       """
@@ -153,10 +165,10 @@ class MediaTable internal constructor(context: Context?, databaseHelper: SignalD
 
   @JvmOverloads
   fun getGalleryMediaForThread(threadId: Long, sorting: Sorting, limit: Int = 0): Cursor {
-    var query = if (FeatureFlags.instantVideoPlayback()) {
-      sorting.applyToQuery(applyEqualityOperator(threadId, GALLERY_MEDIA_QUERY_INCLUDING_TEMP_VIDEOS))
+    var query = if (RemoteConfig.messageBackups) {
+      sorting.applyToQuery(applyEqualityOperator(threadId, GALLERY_MEDIA_QUERY_INCLUDING_TEMP_VIDEOS_AND_THUMBNAILS))
     } else {
-      sorting.applyToQuery(applyEqualityOperator(threadId, GALLERY_MEDIA_QUERY))
+      sorting.applyToQuery(applyEqualityOperator(threadId, GALLERY_MEDIA_QUERY_INCLUDING_TEMP_VIDEOS))
     }
     val args = arrayOf(threadId.toString() + "")
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageSendLogTables.kt b/app/src/main/java/org/thoughtcrime/securesms/database/MessageSendLogTables.kt
index 338f8d47a0..eeeadb7701 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageSendLogTables.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageSendLogTables.kt
@@ -15,8 +15,8 @@ import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.MessageLogEntry
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.RecipientAccessList
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.whispersystems.signalservice.api.crypto.ContentHint
 import org.whispersystems.signalservice.api.messages.SendMessageResult
 import org.whispersystems.signalservice.internal.push.Content
@@ -153,7 +153,7 @@ class MessageSendLogTables constructor(context: Context?, databaseHelper: Signal
 
   /** @return The ID of the inserted entry, or -1 if none was inserted. Can be used with [addRecipientToExistingEntryIfPossible] */
   fun insertIfPossible(recipientId: RecipientId, sentTimestamp: Long, sendMessageResult: SendMessageResult, contentHint: ContentHint, messageId: MessageId, urgent: Boolean): Long {
-    if (!FeatureFlags.retryReceipts()) return -1
+    if (!RemoteConfig.retryReceipts) return -1
 
     if (sendMessageResult.isSuccess && sendMessageResult.success.content.isPresent) {
       val recipientDevice = listOf(RecipientDevice(recipientId, sendMessageResult.success.devices))
@@ -165,7 +165,7 @@ class MessageSendLogTables constructor(context: Context?, databaseHelper: Signal
 
   /** @return The ID of the inserted entry, or -1 if none was inserted. Can be used with [addRecipientToExistingEntryIfPossible] */
   fun insertIfPossible(recipientId: RecipientId, sentTimestamp: Long, sendMessageResult: SendMessageResult, contentHint: ContentHint, messageIds: List<MessageId>, urgent: Boolean): Long {
-    if (!FeatureFlags.retryReceipts()) return -1
+    if (!RemoteConfig.retryReceipts) return -1
 
     if (sendMessageResult.isSuccess && sendMessageResult.success.content.isPresent) {
       val recipientDevice = listOf(RecipientDevice(recipientId, sendMessageResult.success.devices))
@@ -177,7 +177,7 @@ class MessageSendLogTables constructor(context: Context?, databaseHelper: Signal
 
   /** @return The ID of the inserted entry, or -1 if none was inserted. Can be used with [addRecipientToExistingEntryIfPossible] */
   fun insertIfPossible(sentTimestamp: Long, possibleRecipients: List<Recipient>, results: List<SendMessageResult>, contentHint: ContentHint, messageId: MessageId, urgent: Boolean): Long {
-    if (!FeatureFlags.retryReceipts()) return -1
+    if (!RemoteConfig.retryReceipts) return -1
 
     val accessList = RecipientAccessList(possibleRecipients)
 
@@ -198,7 +198,7 @@ class MessageSendLogTables constructor(context: Context?, databaseHelper: Signal
   }
 
   fun addRecipientToExistingEntryIfPossible(payloadId: Long, recipientId: RecipientId, sentTimestamp: Long, sendMessageResult: SendMessageResult, contentHint: ContentHint, messageId: MessageId, urgent: Boolean): Long {
-    if (!FeatureFlags.retryReceipts()) return payloadId
+    if (!RemoteConfig.retryReceipts) return payloadId
 
     if (sendMessageResult.isSuccess && sendMessageResult.success.content.isPresent) {
       val db = databaseHelper.signalWritableDatabase
@@ -274,9 +274,9 @@ class MessageSendLogTables constructor(context: Context?, databaseHelper: Signal
   }
 
   fun getLogEntry(recipientId: RecipientId, device: Int, dateSent: Long): MessageLogEntry? {
-    if (!FeatureFlags.retryReceipts()) return null
+    if (!RemoteConfig.retryReceipts) return null
 
-    trimOldMessages(System.currentTimeMillis(), FeatureFlags.retryRespondMaxAge())
+    trimOldMessages(System.currentTimeMillis(), RemoteConfig.retryRespondMaxAge)
 
     val db = databaseHelper.signalReadableDatabase
     val table = "${MslPayloadTable.TABLE_NAME} LEFT JOIN ${MslRecipientTable.TABLE_NAME} ON ${MslPayloadTable.TABLE_NAME}.${MslPayloadTable.ID} = ${MslRecipientTable.TABLE_NAME}.${MslRecipientTable.PAYLOAD_ID}"
@@ -356,7 +356,7 @@ class MessageSendLogTables constructor(context: Context?, databaseHelper: Signal
   }
 
   fun deleteAllForRecipient(recipientId: RecipientId) {
-    if (!FeatureFlags.retryReceipts()) return
+    if (!RemoteConfig.retryReceipts) return
 
     writableDatabase
       .delete(MslRecipientTable.TABLE_NAME)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
index b320a6791f..77a752d965 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
@@ -46,6 +46,7 @@ import org.signal.core.util.readToList
 import org.signal.core.util.readToSet
 import org.signal.core.util.readToSingleInt
 import org.signal.core.util.readToSingleLong
+import org.signal.core.util.readToSingleLongOrNull
 import org.signal.core.util.readToSingleObject
 import org.signal.core.util.requireBlob
 import org.signal.core.util.requireBoolean
@@ -109,7 +110,7 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.MessageExtras
 import org.thoughtcrime.securesms.database.model.databaseprotos.ProfileChangeDetails
 import org.thoughtcrime.securesms.database.model.databaseprotos.SessionSwitchoverEvent
 import org.thoughtcrime.securesms.database.model.databaseprotos.ThreadMergeEvent
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupMigrationMembershipChange
 import org.thoughtcrime.securesms.jobs.OptimizeMessageSearchIndexJob
 import org.thoughtcrime.securesms.jobs.ThreadUpdateJob
@@ -208,6 +209,8 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     const val QUOTE_NOT_PRESENT_ID = 0L
     const val QUOTE_TARGET_MISSING_ID = -1L
 
+    const val ADDRESSABLE_MESSAGE_LIMIT = 5
+
     const val CREATE_TABLE = """
       CREATE TABLE $TABLE_NAME (
         $ID INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -384,7 +387,9 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
             '${AttachmentTable.ARCHIVE_CDN}', ${AttachmentTable.TABLE_NAME}.${AttachmentTable.ARCHIVE_CDN},
             '${AttachmentTable.ARCHIVE_THUMBNAIL_CDN}', ${AttachmentTable.TABLE_NAME}.${AttachmentTable.ARCHIVE_THUMBNAIL_CDN},
             '${AttachmentTable.ARCHIVE_MEDIA_NAME}', ${AttachmentTable.TABLE_NAME}.${AttachmentTable.ARCHIVE_MEDIA_NAME},
-            '${AttachmentTable.ARCHIVE_MEDIA_ID}', ${AttachmentTable.TABLE_NAME}.${AttachmentTable.ARCHIVE_MEDIA_ID}
+            '${AttachmentTable.ARCHIVE_MEDIA_ID}', ${AttachmentTable.TABLE_NAME}.${AttachmentTable.ARCHIVE_MEDIA_ID},
+            '${AttachmentTable.THUMBNAIL_RESTORE_STATE}', ${AttachmentTable.TABLE_NAME}.${AttachmentTable.THUMBNAIL_RESTORE_STATE},
+            '${AttachmentTable.ATTACHMENT_UUID}', ${AttachmentTable.TABLE_NAME}.${AttachmentTable.ATTACHMENT_UUID}
           )
         ) AS ${AttachmentTable.ATTACHMENT_JSON_ALIAS}
       """.toSingleLine()
@@ -449,6 +454,36 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
         .joinToString(" OR ")
     }
 
+    /**
+     * A message that can be correctly identified with an author/sent timestamp across devices.
+     *
+     * Must be:
+     * - Incoming or sent outgoing
+     * - Secure or push
+     * - Not a group update
+     * - Not a key exchange message
+     * - Not an encryption message
+     * - Not a report spam message
+     * - Not a message rqeuest accepted message
+     * - Not be a story
+     * - Have a valid sent timestamp
+     * - Be a normal message or direct (1:1) story reply
+     *
+     * Changes should be reflected in [MmsMessageRecord.canDeleteSync].
+     */
+    private const val IS_ADDRESSABLE_CLAUSE = """
+      (($TYPE & ${MessageTypes.BASE_TYPE_MASK}) = ${MessageTypes.BASE_SENT_TYPE} OR ($TYPE & ${MessageTypes.BASE_TYPE_MASK}) = ${MessageTypes.BASE_INBOX_TYPE}) AND 
+      ($TYPE & (${MessageTypes.SECURE_MESSAGE_BIT} | ${MessageTypes.PUSH_MESSAGE_BIT})) != 0 AND 
+      ($TYPE & ${MessageTypes.GROUP_MASK}) = 0 AND 
+      ($TYPE & ${MessageTypes.KEY_EXCHANGE_MASK}) = 0 AND 
+      ($TYPE & ${MessageTypes.ENCRYPTION_MASK}) = 0 AND
+      ($TYPE & ${MessageTypes.SPECIAL_TYPES_MASK}) != ${MessageTypes.SPECIAL_TYPE_REPORTED_SPAM} AND
+      ($TYPE & ${MessageTypes.SPECIAL_TYPES_MASK}) != ${MessageTypes.SPECIAL_TYPE_MESSAGE_REQUEST_ACCEPTED} AND
+      $STORY_TYPE = 0 AND
+      $DATE_SENT > 0 AND
+      $PARENT_STORY_ID <= 0
+    """
+
     @JvmStatic
     fun mmsReaderFor(cursor: Cursor): MmsReader {
       return MmsReader(cursor)
@@ -653,8 +688,8 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
       threads.updateSnippetTypeSilently(threadId)
     }
 
-    ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(id))
-    ApplicationDependencies.getDatabaseObserver().notifyConversationListListeners()
+    AppDependencies.databaseObserver.notifyMessageUpdateObservers(MessageId(id))
+    AppDependencies.databaseObserver.notifyConversationListListeners()
   }
 
   private fun updateMessageBodyAndType(messageId: Long, body: String, maskOff: Long, maskOn: Long): InsertResult {
@@ -749,7 +784,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
 
     notifyConversationListeners(threadsUpdated)
     notifyConversationListListeners()
-    ApplicationDependencies.getDatabaseObserver().notifyStoryObservers(storyRecipientsUpdated)
+    AppDependencies.databaseObserver.notifyStoryObservers(storyRecipientsUpdated)
 
     return results
   }
@@ -830,7 +865,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     threads.update(threadId, true)
 
     notifyConversationListeners(threadId)
-    ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(messageId))
+    AppDependencies.databaseObserver.notifyMessageUpdateObservers(MessageId(messageId))
   }
 
   fun insertGroupCall(
@@ -956,14 +991,15 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
       }
 
       val updateDetail = GroupCallUpdateDetailsUtil.parse(message.body)
-      val containsSelf = joinedUuids.contains(SignalStore.account().requireAci().rawUuid)
+      val containsSelf = joinedUuids.contains(SignalStore.account.requireAci().rawUuid)
       val sameEraId = updateDetail.eraId == eraId && !Util.isEmpty(eraId)
       val inCallUuids = if (sameEraId) joinedUuids.map { it.toString() } else emptyList()
+      val body = GroupCallUpdateDetailsUtil.createUpdatedBody(updateDetail, inCallUuids, isCallFull, isRingingOnLocalDevice)
       val contentValues = contentValuesOf(
-        BODY to GroupCallUpdateDetailsUtil.createUpdatedBody(updateDetail, inCallUuids, isCallFull, isRingingOnLocalDevice)
+        BODY to body
       )
 
-      if (sameEraId && containsSelf) {
+      if (sameEraId && (containsSelf || updateDetail.localUserJoined)) {
         contentValues.put(READ, 1)
       }
 
@@ -998,7 +1034,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
       MmsReader(cursor).use { reader ->
         val record = reader.getNext() ?: return@withinTransaction false
         val groupCallUpdateDetails = GroupCallUpdateDetailsUtil.parse(record.body)
-        val containsSelf = peekJoinedUuids.contains(SignalStore.account().requireAci().rawUuid)
+        val containsSelf = peekJoinedUuids.contains(SignalStore.account.requireAci().rawUuid)
         val sameEraId = groupCallUpdateDetails.eraId == peekGroupCallEraId && !Util.isEmpty(peekGroupCallEraId)
 
         val inCallUuids = if (sameEraId) {
@@ -1020,7 +1056,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
           contentValues.put(EXPIRE_STARTED, 0)
         }
 
-        if (sameEraId && containsSelf) {
+        if (sameEraId && (containsSelf || groupCallUpdateDetails.localUserJoined)) {
           contentValues.put(READ, 1)
         }
 
@@ -1101,12 +1137,17 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     }
   }
 
-  fun insertLearnedProfileNameChangeMessage(recipient: Recipient, previousDisplayName: String) {
+  fun insertLearnedProfileNameChangeMessage(recipient: Recipient, e164: String?, username: String?) {
+    if ((e164 == null && username == null) || (e164 != null && username != null)) {
+      Log.w(TAG, "Learn profile event expects an e164 or username")
+      return
+    }
+
     val threadId: Long? = SignalDatabase.threads.getThreadIdFor(recipient.id)
 
     if (threadId != null) {
       val extras = MessageExtras(
-        profileChangeDetails = ProfileChangeDetails(learnedProfileName = ProfileChangeDetails.StringChange(previous = previousDisplayName))
+        profileChangeDetails = ProfileChangeDetails(learnedProfileName = ProfileChangeDetails.LearnedProfileName(e164 = e164, username = username))
       )
 
       writableDatabase
@@ -1229,7 +1270,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
         BODY to Base64.encodeWithPadding(event.encode())
       )
       .run()
-    ApplicationDependencies.getDatabaseObserver().notifyConversationListeners(threadId)
+    AppDependencies.databaseObserver.notifyConversationListeners(threadId)
   }
 
   fun insertSessionSwitchoverEvent(recipientId: RecipientId, threadId: Long, event: SessionSwitchoverEvent) {
@@ -1247,7 +1288,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
         BODY to Base64.encodeWithPadding(event.encode())
       )
       .run()
-    ApplicationDependencies.getDatabaseObserver().notifyConversationListeners(threadId)
+    AppDependencies.databaseObserver.notifyConversationListeners(threadId)
   }
 
   fun insertSmsExportMessage(recipientId: RecipientId, threadId: Long) {
@@ -1273,7 +1314,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     }
 
     if (updated) {
-      ApplicationDependencies.getDatabaseObserver().notifyConversationListeners(threadId)
+      AppDependencies.databaseObserver.notifyConversationListeners(threadId)
     }
   }
 
@@ -1345,7 +1386,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
   }
 
   fun markOnboardingStoryRead() {
-    val recipientId = SignalStore.releaseChannelValues().releaseChannelRecipientId ?: return
+    val recipientId = SignalStore.releaseChannel.releaseChannelRecipientId ?: return
     val where = "$IS_STORY_CLAUSE AND NOT ($outgoingTypeClause) AND $READ = 0 AND $FROM_RECIPIENT_ID = ?"
     val markedMessageInfos = setMessagesRead(where, buildArgs(recipientId))
 
@@ -1619,7 +1660,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
         .where(storiesBeforeTimestampWhere, sharedArgs)
         .run()
         .readToList { RecipientId.from(it.requireLong(FROM_RECIPIENT_ID)) }
-        .forEach { id -> ApplicationDependencies.getDatabaseObserver().notifyStoryObservers(id) }
+        .forEach { id -> AppDependencies.databaseObserver.notifyStoryObservers(id) }
 
       val deletedStoryCount = db.select(ID)
         .from(TABLE_NAME)
@@ -1678,7 +1719,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
       db.execSQL(deleteStoryRepliesQuery, sharedArgs)
       db.execSQL(disassociateQuoteQuery, sharedArgs)
 
-      ApplicationDependencies.getDatabaseObserver().notifyStoryObservers(recipientId)
+      AppDependencies.databaseObserver.notifyStoryObservers(recipientId)
 
       val deletedStoryCount = db.select(ID)
         .from(TABLE_NAME)
@@ -1733,6 +1774,33 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
       .readToSingleLong(-1)
   }
 
+  fun getLatestReceivedAt(threadId: Long, messages: List<SyncMessageId>): Long? {
+    if (messages.isEmpty()) {
+      return null
+    }
+
+    val args: List<Array<String>> = messages.map { arrayOf(it.timetamp.toString(), it.recipientId.serialize(), threadId.toString()) }
+    val queries = SqlUtil.buildCustomCollectionQuery("$DATE_SENT = ? AND $FROM_RECIPIENT_ID = ? AND $THREAD_ID = ?", args)
+
+    var overallLatestReceivedAt: Long? = null
+    for (query in queries) {
+      val latestReceivedAt: Long? = readableDatabase
+        .select("MAX($DATE_RECEIVED)")
+        .from(TABLE_NAME)
+        .where(query.where, query.whereArgs)
+        .run()
+        .readToSingleLongOrNull()
+
+      if (overallLatestReceivedAt == null) {
+        overallLatestReceivedAt = latestReceivedAt
+      } else if (latestReceivedAt != null) {
+        overallLatestReceivedAt = max(overallLatestReceivedAt, latestReceivedAt)
+      }
+    }
+
+    return overallLatestReceivedAt
+  }
+
   fun getScheduledMessageCountForThread(threadId: Long): Int {
     return readableDatabase
       .select("COUNT(*)")
@@ -1961,7 +2029,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
   fun markAsRateLimited(messageId: Long) {
     val threadId = getThreadIdForMessage(messageId)
     updateMailboxBitmask(messageId, 0, MessageTypes.MESSAGE_RATE_LIMITED_BIT, Optional.of(threadId))
-    ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(messageId))
+    AppDependencies.databaseObserver.notifyMessageUpdateObservers(MessageId(messageId))
   }
 
   fun clearRateLimitStatus(ids: Collection<Long>) {
@@ -1976,22 +2044,22 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
   fun markAsSending(messageId: Long) {
     val threadId = getThreadIdForMessage(messageId)
     updateMailboxBitmask(messageId, MessageTypes.BASE_TYPE_MASK, MessageTypes.BASE_SENDING_TYPE, Optional.of(threadId))
-    ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(messageId))
-    ApplicationDependencies.getDatabaseObserver().notifyConversationListListeners()
+    AppDependencies.databaseObserver.notifyMessageUpdateObservers(MessageId(messageId))
+    AppDependencies.databaseObserver.notifyConversationListListeners()
   }
 
   fun markAsSentFailed(messageId: Long) {
     val threadId = getThreadIdForMessage(messageId)
     updateMailboxBitmask(messageId, MessageTypes.BASE_TYPE_MASK, MessageTypes.BASE_SENT_FAILED_TYPE, Optional.of(threadId))
-    ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(messageId))
-    ApplicationDependencies.getDatabaseObserver().notifyConversationListListeners()
+    AppDependencies.databaseObserver.notifyMessageUpdateObservers(MessageId(messageId))
+    AppDependencies.databaseObserver.notifyConversationListListeners()
   }
 
   fun markAsSent(messageId: Long, secure: Boolean) {
     val threadId = getThreadIdForMessage(messageId)
     updateMailboxBitmask(messageId, MessageTypes.BASE_TYPE_MASK, MessageTypes.BASE_SENT_TYPE or if (secure) MessageTypes.PUSH_MESSAGE_BIT or MessageTypes.SECURE_MESSAGE_BIT else 0, Optional.of(threadId))
-    ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(messageId))
-    ApplicationDependencies.getDatabaseObserver().notifyConversationListListeners()
+    AppDependencies.databaseObserver.notifyMessageUpdateObservers(MessageId(messageId))
+    AppDependencies.databaseObserver.notifyConversationListListeners()
   }
 
   fun markAsRemoteDelete(targetMessage: MessageRecord) {
@@ -2051,11 +2119,11 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     }
 
     OptimizeMessageSearchIndexJob.enqueue()
-    ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(messageId))
-    ApplicationDependencies.getDatabaseObserver().notifyConversationListListeners()
+    AppDependencies.databaseObserver.notifyMessageUpdateObservers(MessageId(messageId))
+    AppDependencies.databaseObserver.notifyConversationListListeners()
 
     if (deletedAttachments) {
-      ApplicationDependencies.getDatabaseObserver().notifyAttachmentObservers()
+      AppDependencies.databaseObserver.notifyAttachmentObservers()
     }
   }
 
@@ -2066,7 +2134,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
       .where("$ID = ?", messageId)
       .run()
 
-    ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(messageId))
+    AppDependencies.databaseObserver.notifyMessageUpdateObservers(MessageId(messageId))
   }
 
   fun clearScheduledStatus(threadId: Long, messageId: Long, expiresIn: Long): Boolean {
@@ -2081,8 +2149,8 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
       .where("$ID = ? AND $SCHEDULED_DATE != ?", messageId, -1)
       .run()
 
-    ApplicationDependencies.getDatabaseObserver().notifyMessageInsertObservers(threadId, MessageId(messageId))
-    ApplicationDependencies.getDatabaseObserver().notifyScheduledMessageObservers(threadId)
+    AppDependencies.databaseObserver.notifyMessageInsertObservers(threadId, MessageId(messageId))
+    AppDependencies.databaseObserver.notifyScheduledMessageObservers(threadId)
 
     return rowsUpdated > 0
   }
@@ -2094,8 +2162,8 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
       .where("$ID = ? AND $SCHEDULED_DATE != ?", messageId, -1)
       .run()
 
-    ApplicationDependencies.getDatabaseObserver().notifyScheduledMessageObservers(threadId)
-    ApplicationDependencies.getScheduledMessageManager().scheduleIfNecessary()
+    AppDependencies.databaseObserver.notifyScheduledMessageObservers(threadId)
+    AppDependencies.scheduledMessageManager.scheduleIfNecessary()
 
     if (rowsUpdated == 0) {
       Log.w(TAG, "Failed to reschedule messageId=$messageId to new time $time. may have been sent already")
@@ -2126,7 +2194,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
           .values(EXPIRE_STARTED to startedAtTimestamp)
           .where("$ID = ? AND ($EXPIRE_STARTED = 0 OR $EXPIRE_STARTED > ?)", id, startedAtTimestamp)
           .run()
-        ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(id))
+        AppDependencies.databaseObserver.notifyMessageUpdateObservers(MessageId(id))
       }
     }
   }
@@ -2258,7 +2326,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
   }
 
   private fun setMessagesRead(where: String, arguments: Array<String>?): List<MarkedMessageInfo> {
-    val releaseChannelId = SignalStore.releaseChannelValues().releaseChannelRecipientId
+    val releaseChannelId = SignalStore.releaseChannel.releaseChannelRecipientId
     return writableDatabase.rawQuery(
       """
           UPDATE $TABLE_NAME INDEXED BY $INDEX_THREAD_STORY_SCHEDULED_DATE_LATEST_REVISION_ID
@@ -2542,7 +2610,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
       }
     }
 
-    val silent = MessageTypes.isGroupUpdate(type) ||
+    val silent = (MessageTypes.isGroupUpdate(type) && !retrieved.isGroupAdd) ||
       retrieved.type == MessageType.IDENTITY_DEFAULT ||
       retrieved.type == MessageType.IDENTITY_VERIFIED ||
       retrieved.type == MessageType.IDENTITY_UPDATE
@@ -2654,7 +2722,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     }
 
     if (retrieved.storyType.isStory) {
-      ApplicationDependencies.getDatabaseObserver().notifyStoryObservers(threads.getRecipientIdForThreadId(threadId)!!)
+      AppDependencies.databaseObserver.notifyStoryObservers(threads.getRecipientIdForThreadId(threadId)!!)
     }
 
     return Optional.of(
@@ -2764,7 +2832,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     }
 
     if (updated) {
-      ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(MessageId(messageId))
+      AppDependencies.databaseObserver.notifyMessageUpdateObservers(MessageId(messageId))
       notifyConversationListeners(threadId)
     }
   }
@@ -2919,7 +2987,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     contentValues.put(EXPIRES_IN, editedMessage?.expiresIn ?: message.expiresIn)
     contentValues.put(VIEW_ONCE, message.isViewOnce)
     contentValues.put(FROM_RECIPIENT_ID, Recipient.self().id.serialize())
-    contentValues.put(FROM_DEVICE_ID, SignalStore.account().deviceId)
+    contentValues.put(FROM_DEVICE_ID, SignalStore.account.deviceId)
     contentValues.put(TO_RECIPIENT_ID, message.threadRecipient.id.serialize())
     contentValues.put(HAS_DELIVERY_RECEIPT, earlyDeliveryReceipts.values.sumOf { it.count })
     contentValues.put(RECEIPT_TIMESTAMP, earlyDeliveryReceipts.values.map { it.timestamp }.maxOrNull() ?: -1L)
@@ -3042,16 +3110,16 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
 
     if (!message.storyType.isStory) {
       if (message.outgoingQuote == null && editedMessage == null) {
-        ApplicationDependencies.getDatabaseObserver().notifyMessageInsertObservers(threadId, MessageId(messageId))
+        AppDependencies.databaseObserver.notifyMessageInsertObservers(threadId, MessageId(messageId))
       } else {
-        ApplicationDependencies.getDatabaseObserver().notifyConversationListeners(threadId)
+        AppDependencies.databaseObserver.notifyConversationListeners(threadId)
       }
 
       if (message.scheduledDate != -1L) {
-        ApplicationDependencies.getDatabaseObserver().notifyScheduledMessageObservers(threadId)
+        AppDependencies.databaseObserver.notifyScheduledMessageObservers(threadId)
       }
     } else {
-      ApplicationDependencies.getDatabaseObserver().notifyStoryObservers(message.threadRecipient.id)
+      AppDependencies.databaseObserver.notifyStoryObservers(message.threadRecipient.id)
     }
 
     if (!message.isIdentityVerified && !message.isIdentityDefault) {
@@ -3206,16 +3274,22 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     return rowsDeleted
   }
 
-  fun deleteExpiringMessage(messageId: Long): Boolean =
-    deleteMessage(messageId, isExpiring = true)
+  fun deleteMessage(messageId: Long): Boolean {
+    val threadId = getThreadIdForMessage(messageId)
+    return deleteMessage(messageId, isExpiring = false, threadId)
+  }
 
-  fun deleteMessage(messageId: Long): Boolean =
-    deleteMessage(messageId, isExpiring = false)
+  fun deleteMessage(messageId: Long, threadId: Long): Boolean {
+    return deleteMessage(messageId, isExpiring = false, threadId)
+  }
 
-  private fun deleteMessage(messageId: Long, threadId: Long = getThreadIdForMessage(messageId)): Boolean =
-    deleteMessage(messageId, isExpiring = false, threadId)
+  fun deleteExpiringMessage(messageId: Long): Boolean {
+    val threadId = getThreadIdForMessage(messageId)
+    return deleteMessage(messageId, isExpiring = true, threadId)
+  }
 
-  private fun deleteMessage(messageId: Long, isExpiring: Boolean = false, threadId: Long = getThreadIdForMessage(messageId), notify: Boolean = true, updateThread: Boolean = true): Boolean {
+  @VisibleForTesting
+  fun deleteMessage(messageId: Long, isExpiring: Boolean = false, threadId: Long, notify: Boolean = true, updateThread: Boolean = true): Boolean {
     Log.d(TAG, "deleteMessage($messageId)")
 
     attachments.deleteAttachmentsForMessage(messageId)
@@ -3231,7 +3305,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     threads.setLastScrolled(threadId, 0)
 
     val threadDeleted = if (updateThread) {
-      threads.update(threadId, false)
+      threads.update(threadId, unarchive = false, syncThreadDelete = false)
     } else {
       false
     }
@@ -3269,8 +3343,8 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
       }
     }
 
-    ApplicationDependencies.getScheduledMessageManager().scheduleIfNecessary()
-    ApplicationDependencies.getDatabaseObserver().notifyScheduledMessageObservers(threadId)
+    AppDependencies.scheduledMessageManager.scheduleIfNecessary()
+    AppDependencies.databaseObserver.notifyScheduledMessageObservers(threadId)
   }
 
   fun deleteScheduledMessages(recipientId: RecipientId) {
@@ -3286,12 +3360,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     }
   }
 
-  fun deleteThread(threadId: Long) {
-    Log.d(TAG, "deleteThread($threadId)")
-    deleteThreads(setOf(threadId))
-  }
-
-  private fun getSerializedSharedContacts(insertedAttachmentIds: Map<Attachment, AttachmentId>, contacts: List<Contact>): String? {
+  fun getSerializedSharedContacts(insertedAttachmentIds: Map<Attachment, AttachmentId>, contacts: List<Contact>): String? {
     if (contacts.isEmpty()) {
       return null
     }
@@ -3325,7 +3394,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     return sharedContactJson.toString()
   }
 
-  private fun getSerializedLinkPreviews(insertedAttachmentIds: Map<Attachment, AttachmentId>, previews: List<LinkPreview>): String? {
+  fun getSerializedLinkPreviews(insertedAttachmentIds: Map<Attachment, AttachmentId>, previews: List<LinkPreview>): String? {
     if (previews.isEmpty()) {
       return null
     }
@@ -3388,31 +3457,12 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     return ids
   }
 
-  private fun deleteThreads(threadIds: Set<Long>) {
-    Log.d(TAG, "deleteThreads(count: ${threadIds.size})")
+  fun deleteMessagesInThreadBeforeDate(threadId: Long, date: Long, inclusive: Boolean): Int {
+    val condition = if (inclusive) "<=" else "<"
 
-    writableDatabase.withinTransaction { db ->
-      SqlUtil.buildCollectionQuery(THREAD_ID, threadIds).forEach { query ->
-        db.select(ID)
-          .from(TABLE_NAME)
-          .where(query.where, query.whereArgs)
-          .run()
-          .forEach { cursor ->
-            deleteMessage(cursor.requireLong(ID), notify = false, updateThread = false)
-          }
-      }
-    }
-
-    notifyConversationListeners(threadIds)
-    notifyStickerListeners()
-    notifyStickerPackListeners()
-    OptimizeMessageSearchIndexJob.enqueue()
-  }
-
-  fun deleteMessagesInThreadBeforeDate(threadId: Long, date: Long): Int {
     return writableDatabase
       .delete(TABLE_NAME)
-      .where("$THREAD_ID = ? AND $DATE_RECEIVED < $date", threadId)
+      .where("$THREAD_ID = ? AND $DATE_RECEIVED $condition $date", threadId)
       .run()
   }
 
@@ -3438,6 +3488,57 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     }
   }
 
+  fun getMessageIdOrNull(message: SyncMessageId): Long? {
+    return readableDatabase
+      .select(ID)
+      .from(TABLE_NAME)
+      .where("$DATE_SENT = ? AND $FROM_RECIPIENT_ID = ?", message.timetamp, message.recipientId)
+      .run()
+      .readToSingleLongOrNull()
+  }
+
+  fun deleteMessages(messagesToDelete: List<MessageTable.SyncMessageId>): List<SyncMessageId> {
+    val threads = mutableSetOf<Long>()
+    val unhandled = mutableListOf<SyncMessageId>()
+
+    for (message in messagesToDelete) {
+      readableDatabase
+        .select(ID, THREAD_ID)
+        .from(TABLE_NAME)
+        .where("$DATE_SENT = ? AND $FROM_RECIPIENT_ID = ?", message.timetamp, message.recipientId)
+        .run()
+        .use {
+          if (it.moveToFirst()) {
+            val messageId = it.requireLong(ID)
+            val threadId = it.requireLong(THREAD_ID)
+
+            deleteMessage(
+              messageId = messageId,
+              threadId = threadId,
+              notify = false,
+              updateThread = false
+            )
+            threads += threadId
+          } else {
+            unhandled += message
+          }
+        }
+    }
+
+    threads
+      .forEach { threadId ->
+        SignalDatabase.threads.update(threadId, unarchive = false)
+        notifyConversationListeners(threadId)
+      }
+
+    notifyConversationListListeners()
+    notifyStickerListeners()
+    notifyStickerPackListeners()
+    OptimizeMessageSearchIndexJob.enqueue()
+
+    return unhandled
+  }
+
   private fun getMessagesInThreadAfterInclusive(threadId: Long, timestamp: Long, limit: Long): List<MessageRecord> {
     val where = "$TABLE_NAME.$THREAD_ID = ? AND $TABLE_NAME.$DATE_RECEIVED >= ? AND $TABLE_NAME.$SCHEDULED_DATE = -1 AND $TABLE_NAME.$LATEST_REVISION_ID IS NULL"
     val args = buildArgs(threadId, timestamp)
@@ -4232,8 +4333,8 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     }
 
     for (update in messageUpdates) {
-      ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(update.messageId)
-      ApplicationDependencies.getDatabaseObserver().notifyVerboseConversationListeners(setOf(update.threadId))
+      AppDependencies.databaseObserver.notifyMessageUpdateObservers(update.messageId)
+      AppDependencies.databaseObserver.notifyVerboseConversationListeners(setOf(update.threadId))
     }
 
     if (messageUpdates.isNotEmpty()) {
@@ -4260,7 +4361,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     }
 
     for (threadUpdate in messageUpdates) {
-      ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(threadUpdate.messageId)
+      AppDependencies.databaseObserver.notifyMessageUpdateObservers(threadUpdate.messageId)
     }
 
     return messageUpdates.isNotEmpty()
@@ -4293,11 +4394,11 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     }
 
     for (update in messageUpdates) {
-      ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(update.messageId)
-      ApplicationDependencies.getDatabaseObserver().notifyVerboseConversationListeners(setOf(update.threadId))
+      AppDependencies.databaseObserver.notifyMessageUpdateObservers(update.messageId)
+      AppDependencies.databaseObserver.notifyVerboseConversationListeners(setOf(update.threadId))
 
       if (messageQualifier == MessageQualifier.STORY) {
-        ApplicationDependencies.getDatabaseObserver().notifyStoryObservers(threads.getRecipientIdForThreadId(update.threadId)!!)
+        AppDependencies.databaseObserver.notifyStoryObservers(threads.getRecipientIdForThreadId(update.threadId)!!)
       }
     }
 
@@ -4428,7 +4529,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     }
 
     for (expiringMessage in expiringMessages) {
-      ApplicationDependencies.getExpiringMessageManager().scheduleDeletion(expiringMessage.first(), true, proposedExpireStarted, expiringMessage.second())
+      AppDependencies.expiringMessageManager.scheduleDeletion(expiringMessage.first(), true, proposedExpireStarted, expiringMessage.second())
     }
 
     for (threadId in updatedThreads) {
@@ -4812,7 +4913,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
       return -1L
     }
 
-    val releaseChannelRecipientId = SignalStore.releaseChannelValues().releaseChannelRecipientId ?: return -1L
+    val releaseChannelRecipientId = SignalStore.releaseChannel.releaseChannelRecipientId ?: return -1L
     return threads.getThreadIdFor(releaseChannelRecipientId) ?: return -1L
   }
 
@@ -4878,6 +4979,48 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
       .run()
   }
 
+  fun threadContainsAddressableMessages(threadId: Long): Boolean {
+    return readableDatabase
+      .exists(TABLE_NAME)
+      .where("$IS_ADDRESSABLE_CLAUSE AND $THREAD_ID = ?", threadId)
+      .run()
+  }
+
+  fun threadIsEmpty(threadId: Long): Boolean {
+    val hasMessages = readableDatabase
+      .exists(TABLE_NAME)
+      .where("$THREAD_ID = ?", threadId)
+      .run()
+
+    return !hasMessages
+  }
+
+  fun getMostRecentAddressableMessages(threadId: Long, excludeExpiring: Boolean): Set<MessageRecord> {
+    return readableDatabase
+      .select(*MMS_PROJECTION)
+      .from(TABLE_NAME)
+      .where("$IS_ADDRESSABLE_CLAUSE AND $THREAD_ID = ? ${if (excludeExpiring) "AND $EXPIRES_IN = 0" else ""}", threadId)
+      .orderBy("$DATE_RECEIVED DESC")
+      .limit(ADDRESSABLE_MESSAGE_LIMIT)
+      .run()
+      .use {
+        MmsReader(it).toSet()
+      }
+  }
+
+  fun getAddressableMessagesBefore(threadId: Long, beforeTimestamp: Long, excludeExpiring: Boolean): Set<MessageRecord> {
+    return readableDatabase
+      .select(*MMS_PROJECTION)
+      .from(TABLE_NAME)
+      .where("$IS_ADDRESSABLE_CLAUSE AND $THREAD_ID = ? AND $DATE_RECEIVED < ? ${if (excludeExpiring) "AND $EXPIRES_IN = 0" else ""}", threadId, beforeTimestamp)
+      .orderBy("$DATE_RECEIVED DESC")
+      .limit(ADDRESSABLE_MESSAGE_LIMIT)
+      .run()
+      .use {
+        MmsReader(it).toSet()
+      }
+  }
+
   protected enum class ReceiptType(val columnName: String, val groupStatus: Int) {
     READ(HAS_READ_RECEIPT, GroupReceiptTable.STATUS_READ),
     DELIVERY(HAS_DELIVERY_RECEIPT, GroupReceiptTable.STATUS_DELIVERED),
@@ -4899,7 +5042,12 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
   )
 
   enum class MessageStatus {
-    PENDING, SENT, DELIVERED, READ, VIEWED, FAILED
+    PENDING,
+    SENT,
+    DELIVERED,
+    READ,
+    VIEWED,
+    FAILED
   }
 
   data class SyncMessageId(
@@ -5034,7 +5182,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
     private val context: Context
 
     init {
-      context = ApplicationDependencies.getApplication()
+      context = AppDependencies.application
     }
 
     override fun getNext(): MessageRecord? {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTypes.java b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTypes.java
index 97608092f4..d196429f42 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTypes.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTypes.java
@@ -90,6 +90,7 @@ public interface MessageTypes {
   long PUSH_MESSAGE_BIT   = 0x200000;
 
   // Group Message Information
+  long GROUP_MASK                  = 0xF0000;
   long GROUP_UPDATE_BIT            = 0x10000;
   // Note: Leave bit was previous QUIT bit for GV1, now also general member leave for GV2
   long GROUP_LEAVE_BIT             = 0x20000;
@@ -116,6 +117,7 @@ public interface MessageTypes {
   long SPECIAL_TYPE_REPORTED_SPAM             = 0x500000000L;
   long SPECIAL_TYPE_MESSAGE_REQUEST_ACCEPTED  = 0x600000000L;
   long SPECIAL_TYPE_PAYMENTS_ACTIVATED        = 0x800000000L;
+  long SPECIAL_TYPE_PAYMENTS_TOMBSTONE        = 0x900000000L;
 
   long IGNORABLE_TYPESMASK_WHEN_COUNTING = END_SESSION_BIT | KEY_EXCHANGE_IDENTITY_UPDATE_BIT | KEY_EXCHANGE_IDENTITY_VERIFIED_BIT;
 
@@ -131,6 +133,10 @@ static boolean isPaymentsNotification(long type) {
     return (type & SPECIAL_TYPES_MASK) == SPECIAL_TYPE_PAYMENTS_NOTIFICATION;
   }
 
+  static boolean isPaymentTombstone(long type) {
+    return (type & SPECIAL_TYPES_MASK) == SPECIAL_TYPE_PAYMENTS_TOMBSTONE;
+  }
+
   static boolean isPaymentsRequestToActivate(long type) {
     return (type & SPECIAL_TYPES_MASK) == SPECIAL_TYPE_PAYMENTS_ACTIVATE_REQUEST;
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/NotificationProfileTables.kt b/app/src/main/java/org/thoughtcrime/securesms/database/NotificationProfileTables.kt
index 422445c8ee..efe3ce6b44 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/NotificationProfileTables.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/NotificationProfileTables.kt
@@ -1,4 +1,4 @@
-@file:Suppress("ktlint:filename")
+@file:Suppress("ktlint:standard:filename")
 
 package org.thoughtcrime.securesms.database
 
@@ -13,7 +13,7 @@ import org.signal.core.util.requireLong
 import org.signal.core.util.requireString
 import org.signal.core.util.toInt
 import org.thoughtcrime.securesms.conversation.colors.AvatarColor
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.notifications.profiles.NotificationProfile
 import org.thoughtcrime.securesms.notifications.profiles.NotificationProfileSchedule
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -141,7 +141,7 @@ class NotificationProfileDatabase(context: Context, databaseHelper: SignalDataba
       )
     } finally {
       db.endTransaction()
-      ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers()
+      AppDependencies.databaseObserver.notifyNotificationProfileObservers()
     }
   }
 
@@ -156,7 +156,7 @@ class NotificationProfileDatabase(context: Context, databaseHelper: SignalDataba
     return try {
       val count = writableDatabase.update(NotificationProfileTable.TABLE_NAME, profileValues, updateQuery.where, updateQuery.whereArgs)
       if (count > 0) {
-        ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers()
+        AppDependencies.databaseObserver.notifyNotificationProfileObservers()
       }
 
       NotificationProfileChangeResult.Success(getProfile(profileId)!!)
@@ -202,7 +202,7 @@ class NotificationProfileDatabase(context: Context, databaseHelper: SignalDataba
       return NotificationProfileChangeResult.Success(getProfile(profile.id)!!)
     } finally {
       db.endTransaction()
-      ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers()
+      AppDependencies.databaseObserver.notifyNotificationProfileObservers()
     }
   }
 
@@ -218,7 +218,7 @@ class NotificationProfileDatabase(context: Context, databaseHelper: SignalDataba
     writableDatabase.update(NotificationProfileScheduleTable.TABLE_NAME, scheduleValues, updateQuery.where, updateQuery.whereArgs)
 
     if (!silent) {
-      ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers()
+      AppDependencies.databaseObserver.notifyNotificationProfileObservers()
     }
   }
 
@@ -243,7 +243,7 @@ class NotificationProfileDatabase(context: Context, databaseHelper: SignalDataba
     } finally {
       db.endTransaction()
 
-      ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers()
+      AppDependencies.databaseObserver.notifyNotificationProfileObservers()
     }
   }
 
@@ -254,7 +254,7 @@ class NotificationProfileDatabase(context: Context, databaseHelper: SignalDataba
     }
     writableDatabase.insert(NotificationProfileAllowedMembersTable.TABLE_NAME, null, allowedValues)
 
-    ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers()
+    AppDependencies.databaseObserver.notifyNotificationProfileObservers()
     return getProfile(profileId)!!
   }
 
@@ -265,7 +265,7 @@ class NotificationProfileDatabase(context: Context, databaseHelper: SignalDataba
       SqlUtil.buildArgs(profileId, recipientId)
     )
 
-    ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers()
+    AppDependencies.databaseObserver.notifyNotificationProfileObservers()
     return getProfile(profileId)!!
   }
 
@@ -293,7 +293,7 @@ class NotificationProfileDatabase(context: Context, databaseHelper: SignalDataba
 
   fun deleteProfile(profileId: Long) {
     writableDatabase.delete(NotificationProfileTable.TABLE_NAME, ID_WHERE, SqlUtil.buildArgs(profileId))
-    ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers()
+    AppDependencies.databaseObserver.notifyNotificationProfileObservers()
   }
 
   override fun remapRecipient(oldId: RecipientId, newId: RecipientId) {
@@ -305,7 +305,7 @@ class NotificationProfileDatabase(context: Context, databaseHelper: SignalDataba
 
     databaseHelper.signalWritableDatabase.update(NotificationProfileAllowedMembersTable.TABLE_NAME, values, query, args)
 
-    ApplicationDependencies.getDatabaseObserver().notifyNotificationProfileObservers()
+    AppDependencies.databaseObserver.notifyNotificationProfileObservers()
   }
 
   private fun getProfile(cursor: Cursor): NotificationProfile {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/PaymentTable.java b/app/src/main/java/org/thoughtcrime/securesms/database/PaymentTable.java
index f222622d91..2e4cb1ed89 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/PaymentTable.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/PaymentTable.java
@@ -22,7 +22,7 @@
 import org.thoughtcrime.securesms.database.model.MessageId;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.databaseprotos.CryptoValue;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.payments.CryptoValueUtil;
 import org.thoughtcrime.securesms.payments.Direction;
 import org.thoughtcrime.securesms.payments.FailureReason;
@@ -182,6 +182,28 @@ public void createDefrag(@NonNull UUID uuid,
     }
   }
 
+  @WorkerThread
+  public UUID restoreFromBackup(@NonNull RecipientId recipientId,
+                                long timestamp,
+                                long blockIndex,
+                                @NonNull String note,
+                                @NonNull Direction direction,
+                                @NonNull State state,
+                                @NonNull Money amount,
+                                @NonNull Money fee,
+                                @Nullable byte[] transaction,
+                                @Nullable byte[] receipt,
+                                @Nullable PaymentMetaData metaData,
+                                boolean seen) {
+    UUID uuid = UUID.randomUUID();
+    try {
+      create(uuid, recipientId, null, timestamp, blockIndex, note, direction, state, amount, fee, transaction, receipt, metaData, seen);
+    } catch (SerializationException | PublicKeyConflictException e) {
+      return null;
+    }
+    return uuid;
+  }
+
   @WorkerThread
   private void create(@NonNull UUID uuid,
                       @Nullable RecipientId recipientId,
@@ -439,7 +461,7 @@ public void markPaymentSeen(@NonNull UUID uuid) {
       if (payment != null && record instanceof MmsMessageRecord) {
         return ((MmsMessageRecord) record).withPayment(payment);
       } else {
-        throw new AssertionError("Payment not found for message");
+        Log.w(TAG, "Payment not found for message");
       }
     }
     return record;
@@ -648,7 +670,7 @@ private void notifyChanged(@Nullable UUID uuid) {
    */
   private void notifyChanged() {
     changeSignal.postValue(new Object());
-    ApplicationDependencies.getDatabaseObserver().notifyAllPaymentsListeners();
+    AppDependencies.getDatabaseObserver().notifyAllPaymentsListeners();
   }
 
   /**
@@ -657,10 +679,10 @@ private void notifyChanged() {
    */
   private void notifyUuidChanged(@Nullable UUID uuid) {
     if (uuid != null) {
-      ApplicationDependencies.getDatabaseObserver().notifyPaymentListeners(uuid);
+      AppDependencies.getDatabaseObserver().notifyPaymentListeners(uuid);
       MessageId messageId = SignalDatabase.messages().getPaymentMessage(uuid);
       if (messageId != null) {
-        ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(messageId);
+        AppDependencies.getDatabaseObserver().notifyMessageUpdateObservers(messageId);
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/PendingRetryReceiptCache.kt b/app/src/main/java/org/thoughtcrime/securesms/database/PendingRetryReceiptCache.kt
index 65b6f7dc57..da192eb9de 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/PendingRetryReceiptCache.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/PendingRetryReceiptCache.kt
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.database
 import androidx.annotation.VisibleForTesting
 import org.thoughtcrime.securesms.database.model.PendingRetryReceiptModel
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 
 /**
  * A write-through cache for [PendingRetryReceiptTable].
@@ -21,7 +21,7 @@ class PendingRetryReceiptCache @VisibleForTesting constructor(
   private var populated: Boolean = false
 
   fun insert(author: RecipientId, authorDevice: Int, sentTimestamp: Long, receivedTimestamp: Long, threadId: Long) {
-    if (!FeatureFlags.retryReceipts()) return
+    if (!RemoteConfig.retryReceipts) return
     ensurePopulated()
     val model: PendingRetryReceiptModel = database.insert(author, authorDevice, sentTimestamp, receivedTimestamp, threadId)
     synchronized(pendingRetries) {
@@ -36,7 +36,7 @@ class PendingRetryReceiptCache @VisibleForTesting constructor(
   }
 
   fun get(author: RecipientId, sentTimestamp: Long): PendingRetryReceiptModel? {
-    if (!FeatureFlags.retryReceipts()) return null
+    if (!RemoteConfig.retryReceipts) return null
     ensurePopulated()
 
     synchronized(pendingRetries) {
@@ -45,7 +45,7 @@ class PendingRetryReceiptCache @VisibleForTesting constructor(
   }
 
   fun getOldest(): PendingRetryReceiptModel? {
-    if (!FeatureFlags.retryReceipts()) return null
+    if (!RemoteConfig.retryReceipts) return null
     ensurePopulated()
 
     synchronized(pendingRetries) {
@@ -54,7 +54,7 @@ class PendingRetryReceiptCache @VisibleForTesting constructor(
   }
 
   fun delete(model: PendingRetryReceiptModel) {
-    if (!FeatureFlags.retryReceipts()) return
+    if (!RemoteConfig.retryReceipts) return
     ensurePopulated()
 
     synchronized(pendingRetries) {
@@ -64,7 +64,7 @@ class PendingRetryReceiptCache @VisibleForTesting constructor(
   }
 
   fun clear() {
-    if (!FeatureFlags.retryReceipts()) return
+    if (!RemoteConfig.retryReceipts) return
 
     synchronized(pendingRetries) {
       pendingRetries.clear()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/PendingRetryReceiptTable.java b/app/src/main/java/org/thoughtcrime/securesms/database/PendingRetryReceiptTable.java
index f3bfd9e6fb..3940645d09 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/PendingRetryReceiptTable.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/PendingRetryReceiptTable.java
@@ -9,7 +9,7 @@
 import net.zetetic.database.sqlcipher.SQLiteDatabase;
 
 import org.thoughtcrime.securesms.database.model.PendingRetryReceiptModel;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.signal.core.util.CursorUtil;
 import org.signal.core.util.SqlUtil;
@@ -89,7 +89,7 @@ public void remapRecipient(@NonNull RecipientId fromId, @NonNull RecipientId toI
     values.put(AUTHOR, toId.serialize());
     getWritableDatabase().update(TABLE_NAME, values, AUTHOR + " = ?", SqlUtil.buildArgs(fromId));
     
-    ApplicationDependencies.getPendingRetryReceiptCache().clear();
+    AppDependencies.getPendingRetryReceiptCache().clear();
   }
 
   @Override
@@ -98,6 +98,6 @@ public void remapThread(long fromId, long toId) {
     values.put(THREAD_ID, toId);
     getWritableDatabase().update(TABLE_NAME, values, THREAD_ID + " = ?", SqlUtil.buildArgs(fromId));
 
-    ApplicationDependencies.getPendingRetryReceiptCache().clear();
+    AppDependencies.getPendingRetryReceiptCache().clear();
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ReactionTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/ReactionTable.kt
index 0d1b0e5363..c5992a77fc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ReactionTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ReactionTable.kt
@@ -9,7 +9,7 @@ import org.signal.core.util.delete
 import org.signal.core.util.update
 import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.ReactionRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.RecipientId
 
 /**
@@ -119,7 +119,7 @@ class ReactionTable(context: Context, databaseHelper: SignalDatabase) : Database
       writableDatabase.endTransaction()
     }
 
-    ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(messageId)
+    AppDependencies.databaseObserver.notifyMessageUpdateObservers(messageId)
   }
 
   fun deleteReaction(messageId: MessageId, recipientId: RecipientId) {
@@ -137,7 +137,7 @@ class ReactionTable(context: Context, databaseHelper: SignalDatabase) : Database
       writableDatabase.endTransaction()
     }
 
-    ApplicationDependencies.getDatabaseObserver().notifyMessageUpdateObservers(messageId)
+    AppDependencies.databaseObserver.notifyMessageUpdateObservers(messageId)
   }
 
   fun deleteReactions(messageId: MessageId) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
index 3074132ed2..d0348e8870 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
@@ -72,7 +72,7 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.RecipientExtras
 import org.thoughtcrime.securesms.database.model.databaseprotos.SessionSwitchoverEvent
 import org.thoughtcrime.securesms.database.model.databaseprotos.ThreadMergeEvent
 import org.thoughtcrime.securesms.database.model.databaseprotos.Wallpaper
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.BadGroupIdException
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.groups.GroupId.V1
@@ -90,9 +90,9 @@ import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId
 import org.thoughtcrime.securesms.storage.StorageRecordUpdate
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
 import org.thoughtcrime.securesms.storage.StorageSyncModels
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.IdentityUtil
 import org.thoughtcrime.securesms.util.ProfileUtil
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.Util
 import org.thoughtcrime.securesms.wallpaper.ChatWallpaper
 import org.thoughtcrime.securesms.wallpaper.WallpaperStorage
@@ -407,7 +407,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     @JvmStatic
     fun maskCapabilitiesToLong(capabilities: SignalServiceProfile.Capabilities): Long {
       var value: Long = 0
-      value = Bitmask.update(value, Capabilities.PAYMENT_ACTIVATION, Capabilities.BIT_LENGTH, Recipient.Capability.fromBoolean(capabilities.isPaymentActivation).serialize().toLong())
+      value = Bitmask.update(value, Capabilities.DELETE_SYNC, Capabilities.BIT_LENGTH, Recipient.Capability.fromBoolean(capabilities.isDeleteSync).serialize().toLong())
       return value
     }
   }
@@ -498,14 +498,14 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
 
       db.runPostSuccessfulTransaction {
         if (result.affectedIds.isNotEmpty()) {
-          result.affectedIds.forEach { ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(it) }
+          result.affectedIds.forEach { AppDependencies.databaseObserver.notifyRecipientChanged(it) }
           RetrieveProfileJob.enqueue(result.affectedIds)
         }
 
         if (result.oldIds.isNotEmpty()) {
           result.oldIds.forEach { oldId ->
             Recipient.live(oldId).refresh(result.finalId)
-            ApplicationDependencies.getRecipientCache().remap(oldId, result.finalId)
+            AppDependencies.recipientCache.remap(oldId, result.finalId)
           }
         }
 
@@ -801,7 +801,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
 
   fun markNeedsSync(recipientId: RecipientId) {
     rotateStorageId(recipientId)
-    ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(recipientId)
+    AppDependencies.databaseObserver.notifyRecipientChanged(recipientId)
   }
 
   fun markAllSystemContactsNeedsSync() {
@@ -836,7 +836,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     }
 
     for (id in storageIds.keys) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -874,7 +874,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
 
   fun applyStorageSyncContactUpdate(update: StorageRecordUpdate<SignalContactRecord>) {
     val db = writableDatabase
-    val identityStore = ApplicationDependencies.getProtocolStore().aci().identities()
+    val identityStore = AppDependencies.protocolStore.aci().identities()
     val values = getValuesForStorageContact(update.new, false)
 
     try {
@@ -923,7 +923,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     }
 
     threads.applyStorageSyncUpdate(recipientId, update.new)
-    ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(recipientId)
+    AppDependencies.databaseObserver.notifyRecipientChanged(recipientId)
   }
 
   fun applyStorageSyncGroupV1Insert(insert: SignalGroupV1Record) {
@@ -931,7 +931,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
 
     val recipientId = RecipientId.from(id)
     threads.applyStorageSyncUpdate(recipientId, insert)
-    ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(recipientId)
+    AppDependencies.databaseObserver.notifyRecipientChanged(recipientId)
   }
 
   fun applyStorageSyncGroupV1Update(update: StorageRecordUpdate<SignalGroupV1Record>) {
@@ -956,10 +956,9 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
 
     Log.i(TAG, "Creating restore placeholder for $groupId")
     val createdId = groups.create(
-      masterKey,
-      DecryptedGroup.Builder()
-        .revision(GroupsV2StateProcessor.RESTORE_PLACEHOLDER_REVISION)
-        .build()
+      groupMasterKey = masterKey,
+      groupState = DecryptedGroup(revision = GroupsV2StateProcessor.RESTORE_PLACEHOLDER_REVISION),
+      groupSendEndorsements = null
     )
 
     if (createdId == null) {
@@ -975,7 +974,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     }
 
     Log.i(TAG, "Scheduling request for latest group info for $groupId")
-    ApplicationDependencies.getJobManager().add(RequestGroupV2InfoJob(groupId))
+    AppDependencies.jobManager.add(RequestGroupV2InfoJob(groupId))
     threads.applyStorageSyncUpdate(recipient.id, insert)
     recipient.live().refresh()
   }
@@ -1280,7 +1279,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       writableDatabase.update(TABLE_NAME, values, where, args)
 
       for (recipientId in updated) {
-        ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(recipientId)
+        AppDependencies.databaseObserver.notifyRecipientChanged(recipientId)
       }
     }
   }
@@ -1307,7 +1306,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       writableDatabase.update(TABLE_NAME, values, where, args)
 
       for (recipientId in updated) {
-        ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(recipientId)
+        AppDependencies.databaseObserver.notifyRecipientChanged(recipientId)
       }
     }
   }
@@ -1348,7 +1347,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     database.update(TABLE_NAME, values, where, args)
 
     for (id in toUpdate) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -1358,7 +1357,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       put(CUSTOM_CHAT_COLORS_ID, ChatColors.Id.NotSet.longValue)
     }
     if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -1368,7 +1367,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       put(CUSTOM_CHAT_COLORS_ID, color.id.longValue)
     }
     if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -1378,7 +1377,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     }
     if (update(id, values)) {
       rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -1387,7 +1386,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       put(MESSAGE_RINGTONE, notification?.toString())
     }
     if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -1396,7 +1395,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       put(CALL_RINGTONE, ringtone?.toString())
     }
     if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -1405,7 +1404,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       put(MESSAGE_VIBRATE, enabled.id)
     }
     if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -1414,7 +1413,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       put(CALL_VIBRATE, enabled.id)
     }
     if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -1425,7 +1424,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
 
     if (update(id, values)) {
       rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
 
     StorageSyncHelper.scheduleSyncForDataChange()
@@ -1452,7 +1451,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     }
 
     for (id in ids) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
 
     StorageSyncHelper.scheduleSyncForDataChange()
@@ -1463,16 +1462,16 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       put(MESSAGE_EXPIRATION_TIME, expiration)
     }
     if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
-  fun setUnidentifiedAccessMode(id: RecipientId, unidentifiedAccessMode: UnidentifiedAccessMode) {
+  fun setSealedSenderAccessMode(id: RecipientId, sealedSenderAccessMode: SealedSenderAccessMode) {
     val values = ContentValues(1).apply {
-      put(SEALED_SENDER_MODE, unidentifiedAccessMode.mode)
+      put(SEALED_SENDER_MODE, sealedSenderAccessMode.mode)
     }
     if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -1511,7 +1510,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     }
 
     if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -1521,7 +1520,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     }
 
     if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -1531,7 +1530,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     }
     if (update(id, values)) {
       rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
       StorageSyncHelper.scheduleSyncForDataChange()
     }
   }
@@ -1552,14 +1551,14 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     val valuesToSet = ContentValues(3).apply {
       put(PROFILE_KEY, encodedProfileKey)
       putNull(EXPIRING_PROFILE_KEY_CREDENTIAL)
-      put(SEALED_SENDER_MODE, UnidentifiedAccessMode.UNKNOWN.mode)
+      put(SEALED_SENDER_MODE, SealedSenderAccessMode.UNKNOWN.mode)
     }
 
     val updateQuery = SqlUtil.buildTrueUpdateQuery(selection, args, valuesToCompare)
 
     if (update(updateQuery, valuesToSet)) {
       rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
       StorageSyncHelper.scheduleSyncForDataChange()
 
       if (id == Recipient.self().id) {
@@ -1584,12 +1583,12 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     val valuesToSet = ContentValues(3).apply {
       put(PROFILE_KEY, Base64.encodeWithPadding(profileKey.serialize()))
       putNull(EXPIRING_PROFILE_KEY_CREDENTIAL)
-      put(SEALED_SENDER_MODE, UnidentifiedAccessMode.UNKNOWN.mode)
+      put(SEALED_SENDER_MODE, SealedSenderAccessMode.UNKNOWN.mode)
     }
 
     if (writableDatabase.update(TABLE_NAME, valuesToSet, selection, args) > 0) {
       rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
       return true
     } else {
       return false
@@ -1617,7 +1616,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
 
     val updated = update(updateQuery, values)
     if (updated) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
 
     return updated
@@ -1627,7 +1626,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     val values = ContentValues(1)
     values.putNull(EXPIRING_PROFILE_KEY_CREDENTIAL)
     if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -1694,7 +1693,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     }
 
     if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -1746,7 +1745,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       put(SYSTEM_JOINED_NAME, systemContactName)
     }
     if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -1759,7 +1758,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     )
     if (update(id, contentValues)) {
       rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
       StorageSyncHelper.scheduleSyncForDataChange()
     }
   }
@@ -1772,7 +1771,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     }
     if (update(id, contentValues)) {
       rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
       StorageSyncHelper.scheduleSyncForDataChange()
     }
   }
@@ -1782,7 +1781,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       put(PROFILE_AVATAR, profileAvatar)
     }
     if (update(id, contentValues)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
       if (id == Recipient.self().id) {
         rotateStorageId(id)
         StorageSyncHelper.scheduleSyncForDataChange()
@@ -1797,7 +1796,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     }
 
     if (update(id, contentValues)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -1820,7 +1819,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       SignalDatabase.distributionLists.removeMemberFromAllLists(id)
       SignalDatabase.messages.deleteStoriesForRecipient(id)
       rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
       StorageSyncHelper.scheduleSyncForDataChange()
     } else {
       Log.w(TAG, "Failed to hide recipient $id")
@@ -1847,7 +1846,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
 
     if (profiledUpdated) {
       rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
       StorageSyncHelper.scheduleSyncForDataChange()
     }
   }
@@ -1857,7 +1856,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       put(NOTIFICATION_CHANNEL, notificationChannel)
     }
     if (update(id, contentValues)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -1866,7 +1865,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       PHONE_NUMBER_SHARING to phoneNumberSharing.id
     )
     if (update(id, contentValues)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -1901,7 +1900,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       val rowsUpdated = database.update(TABLE_NAME, values, where, null)
       if (rowsUpdated == idWithWallpaper.size) {
         for (pair in idWithWallpaper) {
-          ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(pair.first)
+          AppDependencies.databaseObserver.notifyRecipientChanged(pair.first)
           if (pair.second != null) {
             WallpaperStorage.onWallpaperDeselected(context, Uri.parse(pair.second))
           }
@@ -1931,7 +1930,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     }
 
     if (update(id, values)) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
 
     if (existingWallpaperUri != null) {
@@ -2045,7 +2044,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     }
     if (update(id, contentValues)) {
       rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
       StorageSyncHelper.scheduleSyncForDataChange()
     }
   }
@@ -2077,7 +2076,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     db.beginTransaction()
     try {
       val id = Recipient.self().id
-      val newId = getAndPossiblyMerge(aci = SignalStore.account().requireAci(), pni = pni, e164 = e164, pniVerified = true, changeSelf = true)
+      val newId = getAndPossiblyMerge(aci = SignalStore.account.requireAci(), pni = pni, e164 = e164, pniVerified = true, changeSelf = true)
 
       if (id == newId) {
         Log.i(TAG, "[updateSelfPhone] Phone updated for self")
@@ -2118,7 +2117,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       }
 
       if (update(id, contentValuesOf(USERNAME to username))) {
-        ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+        AppDependencies.databaseObserver.notifyRecipientChanged(id)
         rotateStorageId(id)
         StorageSyncHelper.scheduleSyncForDataChange()
       }
@@ -2135,13 +2134,6 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     updateExtras(id) { it.lastStoryView(System.currentTimeMillis()) }
   }
 
-  fun clearUsernameIfExists(username: String) {
-    val existingUsername = getByUsername(username)
-    if (existingUsername.isPresent) {
-      setUsername(existingUsername.get(), null)
-    }
-  }
-
   fun getAllE164s(): Set<String> {
     val results: MutableSet<String> = HashSet()
     readableDatabase.query(TABLE_NAME, arrayOf(E164), null, null, null, null, null).use { cursor ->
@@ -2237,7 +2229,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     if (update(id, contentValues)) {
       Log.i(TAG, "Newly marked $id as registered.")
       setStorageIdIfNotSet(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -2268,7 +2260,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     if (update(id, contentValues)) {
       Log.i(TAG, "[WithSplit] Newly marked $id as unregistered.")
       markNeedsSync(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
 
     val splitId = getAndPossiblyMerge(null, record.pni, record.e164)
@@ -2287,7 +2279,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     if (update(id, contentValues)) {
       Log.i(TAG, "[WithoutSplit] Newly marked $id as unregistered.")
       markNeedsSync(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -2361,7 +2353,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
         if (update(id, registeredValues)) {
           newlyRegistered += id
           setStorageIdIfNotSet(id)
-          ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+          AppDependencies.databaseObserver.notifyRecipientChanged(id)
         }
       }
 
@@ -2379,7 +2371,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       for (id in unregistered) {
         if (update(id, unregisteredValues)) {
           newlyUnregistered += id
-          ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+          AppDependencies.databaseObserver.notifyRecipientChanged(id)
         }
       }
 
@@ -2520,24 +2512,24 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
                 val record = getRecord(operation.recipientId)
                 Log.e(TAG, "ID: ${record.id}, E164: ${record.e164}, ACI: ${record.aci}, PNI: ${record.pni}, Registered: ${record.registered}", true)
 
-                if (record.aci != null && record.aci == SignalStore.account().aci) {
-                  if (pnisWithSessions.contains(SignalStore.account().pni!!)) {
+                if (record.aci != null && record.aci == SignalStore.account.aci) {
+                  if (pnisWithSessions.contains(SignalStore.account.pni!!)) {
                     throw SseWithSelfAci(e)
                   } else {
                     throw SseWithSelfAciNoSession(e)
                   }
                 }
 
-                if (record.pni != null && record.pni == SignalStore.account().pni) {
-                  if (pnisWithSessions.contains(SignalStore.account().pni!!)) {
+                if (record.pni != null && record.pni == SignalStore.account.pni) {
+                  if (pnisWithSessions.contains(SignalStore.account.pni!!)) {
                     throw SseWithSelfPni(e)
                   } else {
                     throw SseWithSelfPniNoSession(e)
                   }
                 }
 
-                if (record.e164 != null && record.e164 == SignalStore.account().e164) {
-                  if (pnisWithSessions.contains(SignalStore.account().pni!!)) {
+                if (record.e164 != null && record.e164 == SignalStore.account.e164) {
+                  if (pnisWithSessions.contains(SignalStore.account.pni!!)) {
                     throw SseWithSelfE164(e)
                   } else {
                     throw SseWithSelfE164NoSession(e)
@@ -2547,7 +2539,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
                 if (pnisWithSessions.isEmpty()) {
                   throw SseWithNoPniSessionsException(e)
                 } else if (pnisWithSessions.size == 1) {
-                  if (pnisWithSessions.first() == SignalStore.account().pni) {
+                  if (pnisWithSessions.first() == SignalStore.account.pni) {
                     throw SseWithASinglePniSessionForSelfException(e)
                   } else {
                     throw SseWithASinglePniSessionException(e)
@@ -2786,9 +2778,9 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
   }
 
   private fun notSelf(e164: String?, pni: PNI?, aci: ACI?): Boolean {
-    return (e164 == null || e164 != SignalStore.account().e164) &&
-      (pni == null || pni != SignalStore.account().pni) &&
-      (aci == null || aci != SignalStore.account().aci)
+    return (e164 == null || e164 != SignalStore.account.e164) &&
+      (pni == null || pni != SignalStore.account.pni) &&
+      (aci == null || aci != SignalStore.account.aci)
   }
 
   private fun isSelf(data: PnpDataSet): Boolean {
@@ -2796,9 +2788,9 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
   }
 
   private fun isSelf(e164: String?, pni: PNI?, aci: ACI?): Boolean {
-    return (e164 != null && e164 == SignalStore.account().e164) ||
-      (pni != null && pni == SignalStore.account().pni) ||
-      (aci != null && aci == SignalStore.account().aci)
+    return (e164 != null && e164 == SignalStore.account.e164) ||
+      (pni != null && pni == SignalStore.account.pni) ||
+      (aci != null && aci == SignalStore.account.aci)
   }
 
   private fun processNonMergePnpUpdate(e164: String?, pni: PNI?, aci: ACI?, pniVerified: Boolean, changeSelf: Boolean, commonId: RecipientId, breadCrumbs: MutableList<String>): PnpChangeSet {
@@ -3581,7 +3573,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       db.endTransaction()
     }
 
-    ApplicationDependencies.getRecipientCache().clear()
+    AppDependencies.recipientCache.clear()
   }
 
   fun updateStorageId(recipientId: RecipientId, id: ByteArray?) {
@@ -3604,7 +3596,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     }
 
     for (id in ids.keys) {
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -3638,7 +3630,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       writableDatabase.update(TABLE_NAME, values, query.where, query.whereArgs)
 
       for (id in idsToUpdate) {
-        ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(RecipientId.from(id))
+        AppDependencies.databaseObserver.notifyRecipientChanged(RecipientId.from(id))
       }
     }
   }
@@ -3686,7 +3678,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
         val count = db.update(TABLE_NAME, values, query.where, query.whereArgs)
         if (count > 0) {
           for (id in idsToUpdate) {
-            ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(RecipientId.from(id))
+            AppDependencies.databaseObserver.notifyRecipientChanged(RecipientId.from(id))
           }
         }
       }
@@ -3749,7 +3741,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     } finally {
       db.endTransaction()
     }
-    ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(recipientId)
+    AppDependencies.databaseObserver.notifyRecipientChanged(recipientId)
   }
 
   /**
@@ -3799,7 +3791,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     if (update(query, values)) {
       val id = getByGroupId(v2Id).get()
       rotateStorageId(id)
-      ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+      AppDependencies.databaseObserver.notifyRecipientChanged(id)
     }
   }
 
@@ -3880,7 +3872,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
 
     // Clean up any E164-based identities (legacy stuff)
     if (secondaryRecord.e164 != null) {
-      ApplicationDependencies.getProtocolStore().aci().identities().delete(secondaryRecord.e164)
+      AppDependencies.protocolStore.aci().identities().delete(secondaryRecord.e164)
     }
 
     // Threads
@@ -4101,7 +4093,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    * get them back through CDS).
    */
   fun debugClearServiceIds(recipientId: RecipientId? = null) {
-    check(FeatureFlags.internalUser())
+    check(RemoteConfig.internalUser)
 
     writableDatabase
       .update(TABLE_NAME)
@@ -4118,7 +4110,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       }
       .run()
 
-    ApplicationDependencies.getRecipientCache().clear()
+    AppDependencies.recipientCache.clear()
     RecipientId.clearCache()
   }
 
@@ -4126,7 +4118,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    * Should only be used for debugging! A very destructive action that clears all known profile keys and credentials.
    */
   fun debugClearProfileData(recipientId: RecipientId? = null) {
-    check(FeatureFlags.internalUser())
+    check(RemoteConfig.internalUser)
 
     writableDatabase
       .update(TABLE_NAME)
@@ -4149,7 +4141,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       }
       .run()
 
-    ApplicationDependencies.getRecipientCache().clear()
+    AppDependencies.recipientCache.clear()
     RecipientId.clearCache()
   }
 
@@ -4157,7 +4149,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    * Should only be used for debugging! Clears the E164 and PNI from a recipient.
    */
   fun debugClearE164AndPni(recipientId: RecipientId) {
-    check(FeatureFlags.internalUser())
+    check(RemoteConfig.internalUser)
 
     writableDatabase
       .update(TABLE_NAME)
@@ -4168,7 +4160,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       .where(ID_WHERE, recipientId)
       .run()
 
-    ApplicationDependencies.getRecipientCache().clear()
+    AppDependencies.recipientCache.clear()
     RecipientId.clearCache()
   }
 
@@ -4177,7 +4169,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
    * Only works if the recipient has a PNI.
    */
   fun debugRemoveAci(recipientId: RecipientId) {
-    check(FeatureFlags.internalUser())
+    check(RemoteConfig.internalUser)
 
     writableDatabase.execSQL(
       """
@@ -4188,7 +4180,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       SqlUtil.buildArgs(recipientId)
     )
 
-    ApplicationDependencies.getRecipientCache().clear()
+    AppDependencies.recipientCache.clear()
     RecipientId.clearCache()
   }
 
@@ -4262,7 +4254,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       clearSystemDataForPendingInfo()
       database.setTransactionSuccessful()
       database.endTransaction()
-      pendingRecipients.forEach { id -> ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id) }
+      pendingRecipients.forEach { id -> AppDependencies.databaseObserver.notifyRecipientChanged(id) }
     }
 
     private fun markAllRelevantEntriesDirty() {
@@ -4297,7 +4289,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
         null
       ).forEach { cursor ->
         val id = RecipientId.from(cursor.requireLong(ID))
-        ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(id)
+        AppDependencies.databaseObserver.notifyRecipientChanged(id)
       }
     }
   }
@@ -4525,11 +4517,16 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
 //    const val STORIES = 5
 //    const val GIFT_BADGES = 6
 //    const val PNP = 7
-    const val PAYMENT_ACTIVATION = 8
+//    const val PAYMENT_ACTIVATION = 8
+    const val DELETE_SYNC = 9
+
+    // IMPORTANT: We cannot sore more than 32 capabilities in the bitmask.
   }
 
   enum class VibrateState(val id: Int) {
-    DEFAULT(0), ENABLED(1), DISABLED(2);
+    DEFAULT(0),
+    ENABLED(1),
+    DISABLED(2);
 
     companion object {
       fun fromId(id: Int): VibrateState {
@@ -4543,7 +4540,9 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
   }
 
   enum class RegisteredState(val id: Int) {
-    UNKNOWN(0), REGISTERED(1), NOT_REGISTERED(2);
+    UNKNOWN(0),
+    REGISTERED(1),
+    NOT_REGISTERED(2);
 
     companion object {
       fun fromId(id: Int): RegisteredState {
@@ -4552,18 +4551,23 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     }
   }
 
-  enum class UnidentifiedAccessMode(val mode: Int) {
-    UNKNOWN(0), DISABLED(1), ENABLED(2), UNRESTRICTED(3);
+  enum class SealedSenderAccessMode(val mode: Int) {
+    UNKNOWN(0),
+    DISABLED(1),
+    ENABLED(2),
+    UNRESTRICTED(3);
 
     companion object {
-      fun fromMode(mode: Int): UnidentifiedAccessMode {
+      fun fromMode(mode: Int): SealedSenderAccessMode {
         return values()[mode]
       }
     }
   }
 
   enum class InsightsBannerTier(val id: Int) {
-    NO_TIER(0), TIER_ONE(1), TIER_TWO(2);
+    NO_TIER(0),
+    TIER_ONE(1),
+    TIER_TWO(2);
 
     fun seen(tier: InsightsBannerTier): Boolean {
       return tier.id <= id
@@ -4577,7 +4581,12 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
   }
 
   enum class RecipientType(val id: Int) {
-    INDIVIDUAL(0), MMS(1), GV1(2), GV2(3), DISTRIBUTION_LIST(4), CALL_LINK(5);
+    INDIVIDUAL(0),
+    MMS(1),
+    GV1(2),
+    GV2(3),
+    DISTRIBUTION_LIST(4),
+    CALL_LINK(5);
 
     companion object {
       fun fromId(id: Int): RecipientType {
@@ -4587,7 +4596,8 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
   }
 
   enum class MentionSetting(val id: Int) {
-    ALWAYS_NOTIFY(0), DO_NOT_NOTIFY(1);
+    ALWAYS_NOTIFY(0),
+    DO_NOT_NOTIFY(1);
 
     companion object {
       fun fromId(id: Int): MentionSetting {
@@ -4597,7 +4607,9 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
   }
 
   enum class PhoneNumberSharingState(val id: Int) {
-    UNKNOWN(0), ENABLED(1), DISABLED(2);
+    UNKNOWN(0),
+    ENABLED(1),
+    DISABLED(2);
 
     val enabled
       get() = this == ENABLED || this == UNKNOWN
@@ -4610,7 +4622,9 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
   }
 
   enum class PhoneNumberDiscoverableState(val id: Int) {
-    UNKNOWN(0), DISCOVERABLE(1), NOT_DISCOVERABLE(2);
+    UNKNOWN(0),
+    DISCOVERABLE(1),
+    NOT_DISCOVERABLE(2);
 
     companion object {
       fun fromId(id: Int): PhoneNumberDiscoverableState {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTableCursorUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTableCursorUtil.kt
index 1adccfca35..e5630d5667 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTableCursorUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTableCursorUtil.kt
@@ -149,7 +149,7 @@ object RecipientTableCursorUtil {
       profileSharing = cursor.requireBoolean(RecipientTable.PROFILE_SHARING),
       lastProfileFetch = cursor.requireLong(RecipientTable.LAST_PROFILE_FETCH),
       notificationChannel = cursor.requireString(RecipientTable.NOTIFICATION_CHANNEL),
-      unidentifiedAccessMode = RecipientTable.UnidentifiedAccessMode.fromMode(cursor.requireInt(RecipientTable.SEALED_SENDER_MODE)),
+      sealedSenderAccessMode = RecipientTable.SealedSenderAccessMode.fromMode(cursor.requireInt(RecipientTable.SEALED_SENDER_MODE)),
       capabilities = readCapabilities(cursor),
       storageId = Base64.decodeNullableOrThrow(cursor.requireString(RecipientTable.STORAGE_SERVICE_ID)),
       mentionSetting = RecipientTable.MentionSetting.fromId(cursor.requireInt(RecipientTable.MENTION_SETTING)),
@@ -175,7 +175,7 @@ object RecipientTableCursorUtil {
     val capabilities = cursor.requireLong(RecipientTable.CAPABILITIES)
     return RecipientRecord.Capabilities(
       rawBits = capabilities,
-      paymentActivation = Recipient.Capability.deserialize(Bitmask.read(capabilities, Capabilities.PAYMENT_ACTIVATION, Capabilities.BIT_LENGTH).toInt())
+      deleteSync = Recipient.Capability.deserialize(Bitmask.read(capabilities, Capabilities.DELETE_SYNC, Capabilities.BIT_LENGTH).toInt())
     )
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RxDatabaseObserver.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RxDatabaseObserver.kt
index 65d8d517c2..ae8555ad96 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RxDatabaseObserver.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RxDatabaseObserver.kt
@@ -4,7 +4,7 @@ import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Emitter
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.schedulers.Schedulers
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import java.util.concurrent.TimeUnit
 
 /**
@@ -18,13 +18,13 @@ object RxDatabaseObserver {
 
   private fun conversationListFlowable(): Flowable<Unit> {
     return databaseFlowable { listener ->
-      ApplicationDependencies.getDatabaseObserver().registerConversationListObserver(listener)
+      AppDependencies.databaseObserver.registerConversationListObserver(listener)
     }
   }
 
   fun conversation(threadId: Long): Flowable<Unit> {
     return databaseFlowable { listener ->
-      ApplicationDependencies.getDatabaseObserver().registerVerboseConversationObserver(threadId, listener)
+      AppDependencies.databaseObserver.registerVerboseConversationObserver(threadId, listener)
     }
   }
 
@@ -32,7 +32,7 @@ object RxDatabaseObserver {
   private fun notificationProfilesFlowable(): Flowable<Unit> {
     return Flowable.combineLatest(
       Flowable.interval(0, 30, TimeUnit.SECONDS),
-      databaseFlowable { ApplicationDependencies.getDatabaseObserver().registerNotificationProfileObserver(it) }
+      databaseFlowable { AppDependencies.databaseObserver.registerNotificationProfileObserver(it) }
     ) { _, _ -> Unit }
   }
 
@@ -42,7 +42,7 @@ object RxDatabaseObserver {
         val listener = RxObserver(it)
 
         registerObserver(listener)
-        it.setCancellable { ApplicationDependencies.getDatabaseObserver().unregisterObserver(listener) }
+        it.setCancellable { AppDependencies.databaseObserver.unregisterObserver(listener) }
 
         listener.prime()
       },
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SenderKeyTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/SenderKeyTable.kt
index f45310f1e6..19a6d6a9f4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SenderKeyTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SenderKeyTable.kt
@@ -115,7 +115,7 @@ class SenderKeyTable internal constructor(context: Context?, databaseHelper: Sig
     return readableDatabase
       .select(ID, DISTRIBUTION_ID, CREATED_AT)
       .from(TABLE_NAME)
-      .where("$ADDRESS = ?", SignalStore.account().requireAci())
+      .where("$ADDRESS = ?", SignalStore.account.requireAci())
       .orderBy("$CREATED_AT DESC")
       .run()
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt
index 1c886fd536..e06173c81f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt
@@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.database.model.AvatarPickerDatabase
 import java.io.File
 import java.lang.AssertionError
 
-open class SignalDatabase(private val context: Application, databaseSecret: DatabaseSecret, attachmentSecret: AttachmentSecret) :
+open class SignalDatabase(private val context: Application, databaseSecret: DatabaseSecret, attachmentSecret: AttachmentSecret, private val name: String = DATABASE_NAME) :
   SQLiteOpenHelper(
     context,
     DATABASE_NAME,
@@ -55,7 +55,7 @@ open class SignalDatabase(private val context: Application, databaseSecret: Data
   val avatarPickerDatabase: AvatarPickerDatabase = AvatarPickerDatabase(context, this)
   val reactionTable: ReactionTable = ReactionTable(context, this)
   val notificationProfileDatabase: NotificationProfileDatabase = NotificationProfileDatabase(context, this)
-  val signalDonationReceiptTable: DonationReceiptTable = DonationReceiptTable(context, this)
+  val donationReceiptTable: DonationReceiptTable = DonationReceiptTable(context, this)
   val distributionListTables: DistributionListTables = DistributionListTables(context, this)
   val storySendTable: StorySendTable = StorySendTable(context, this)
   val cdsTable: CdsTable = CdsTable(context, this)
@@ -65,6 +65,8 @@ open class SignalDatabase(private val context: Application, databaseSecret: Data
   val kyberPreKeyTable: KyberPreKeyTable = KyberPreKeyTable(context, this)
   val callLinkTable: CallLinkTable = CallLinkTable(context, this)
   val nameCollisionTables: NameCollisionTables = NameCollisionTables(context, this)
+  val inAppPaymentTable: InAppPaymentTable = InAppPaymentTable(context, this)
+  val inAppPaymentSubscriberTable: InAppPaymentSubscriberTable = InAppPaymentSubscriberTable(context, this)
 
   override fun onOpen(db: net.zetetic.database.sqlcipher.SQLiteDatabase) {
     db.setForeignKeyConstraintsEnabled(true)
@@ -102,6 +104,8 @@ open class SignalDatabase(private val context: Application, databaseSecret: Data
     db.execSQL(CallTable.CREATE_TABLE)
     db.execSQL(KyberPreKeyTable.CREATE_TABLE)
     NameCollisionTables.createTables(db)
+    db.execSQL(InAppPaymentTable.CREATE_TABLE)
+    db.execSQL(InAppPaymentSubscriberTable.CREATE_TABLE)
     executeStatements(db, SearchTable.CREATE_TABLE)
     executeStatements(db, RemappedRecordTables.CREATE_TABLE)
     executeStatements(db, MessageSendLogTables.CREATE_TABLE)
@@ -197,7 +201,7 @@ open class SignalDatabase(private val context: Application, databaseSecret: Data
 
   companion object {
     private val TAG = Log.tag(SignalDatabase::class.java)
-    private const val DATABASE_NAME = "signal.db"
+    const val DATABASE_NAME = "signal.db"
 
     @JvmStatic
     @Volatile
@@ -330,8 +334,8 @@ open class SignalDatabase(private val context: Application, databaseSecret: Data
 
     @get:JvmStatic
     @get:JvmName("donationReceipts")
-    val signalDonationReceipts: DonationReceiptTable
-      get() = instance!!.signalDonationReceiptTable
+    val donationReceipts: DonationReceiptTable
+      get() = instance!!.donationReceiptTable
 
     @get:JvmStatic
     @get:JvmName("drafts")
@@ -487,5 +491,15 @@ open class SignalDatabase(private val context: Application, databaseSecret: Data
     @get:JvmName("nameCollisions")
     val nameCollisions: NameCollisionTables
       get() = instance!!.nameCollisionTables
+
+    @get:JvmStatic
+    @get:JvmName("inAppPayments")
+    val inAppPayments: InAppPaymentTable
+      get() = instance!!.inAppPaymentTable
+
+    @get:JvmStatic
+    @get:JvmName("inAppPaymentSubscribers")
+    val inAppPaymentSubscribers: InAppPaymentSubscriberTable
+      get() = instance!!.inAppPaymentSubscriberTable
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherDeletingErrorHandler.java b/app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherDeletingErrorHandler.java
index 6633e3630b..799f4c6c70 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherDeletingErrorHandler.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherDeletingErrorHandler.java
@@ -8,7 +8,7 @@
 import net.zetetic.database.sqlcipher.SQLiteDatabase;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.signal.core.util.CursorUtil;
 
 /**
@@ -52,7 +52,7 @@ public void onCorruption(SQLiteDatabase db, String message) {
       Log.e(TAG, "Failed to run diagnostics!", t);
     } finally {
       Log.w(TAG, "Deleting database " + databaseName);
-      ApplicationDependencies.getApplication().deleteDatabase(databaseName);
+      AppDependencies.getApplication().deleteDatabase(databaseName);
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherErrorHandler.kt b/app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherErrorHandler.kt
index 9802ae5d8c..b82f4b32a3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherErrorHandler.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SqlCipherErrorHandler.kt
@@ -9,7 +9,7 @@ import org.signal.core.util.CursorUtil
 import org.signal.core.util.ExceptionUtil
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.crypto.DatabaseSecretProvider
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicReference
@@ -32,7 +32,7 @@ class SqlCipherErrorHandler(private val databaseName: String) : DatabaseErrorHan
     }
 
     try {
-      val result: DiagnosticResults = runDiagnostics(ApplicationDependencies.getApplication(), db)
+      val result: DiagnosticResults = runDiagnostics(AppDependencies.application, db)
       var lines: List<String> = result.logs.split("\n")
       lines = listOf("Database '$databaseName' corrupted!", "[sqlite] $message", "Diagnostics results:") + lines
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadBodyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadBodyUtil.java
index 5ffa864c02..c6af632efe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadBodyUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadBodyUtil.java
@@ -61,7 +61,7 @@ private ThreadBodyUtil() {
       return format(EmojiStrings.GIFT, getGiftSummary(context, record), null);
     } else if (MessageRecordUtil.isStoryReaction(record)) {
       return new ThreadBody(getStoryReactionSummary(context, record));
-    } else if (record.isPaymentNotification()) {
+    } else if (record.isPaymentNotification() || record.isPaymentTombstone()) {
       return format(EmojiStrings.CARD, context.getString(R.string.ThreadRecord_payment), null);
     } else if (record.isPaymentsRequestToActivate()) {
       return format(EmojiStrings.CARD, getPaymentActivationRequestSummary(context, record), null);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt
index 5260a71755..b12ac9ab8b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt
@@ -8,6 +8,7 @@ import android.database.MergeCursor
 import android.net.Uri
 import androidx.core.content.contentValuesOf
 import com.fasterxml.jackson.annotation.JsonProperty
+import org.json.JSONObject
 import org.jsoup.helper.StringUtil
 import org.signal.core.util.CursorUtil
 import org.signal.core.util.SqlUtil
@@ -46,9 +47,10 @@ import org.thoughtcrime.securesms.database.model.ThreadRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
 import org.thoughtcrime.securesms.database.model.databaseprotos.MessageExtras
 import org.thoughtcrime.securesms.database.model.serialize
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.BadGroupIdException
 import org.thoughtcrime.securesms.groups.GroupId
+import org.thoughtcrime.securesms.jobs.MultiDeviceDeleteSyncJob
 import org.thoughtcrime.securesms.jobs.OptimizeMessageSearchIndexJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.SlideDeck
@@ -61,6 +63,7 @@ import org.thoughtcrime.securesms.recipients.RecipientUtil
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
 import org.thoughtcrime.securesms.util.ConversationUtil
 import org.thoughtcrime.securesms.util.JsonUtils
+import org.thoughtcrime.securesms.util.JsonUtils.SaneJSONObject
 import org.thoughtcrime.securesms.util.LRUCache
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.isScheduled
@@ -273,7 +276,7 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
   }
 
   private fun allowedToUnarchive(threadId: Long): Boolean {
-    if (!SignalStore.settings().shouldKeepMutedChatsArchived()) {
+    if (!SignalStore.settings.shouldKeepMutedChatsArchived()) {
       return true
     }
 
@@ -322,13 +325,23 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
       return
     }
 
+    val syncThreadTrimDeletes = SignalStore.settings.shouldSyncThreadTrimDeletes() && Recipient.self().deleteSyncCapability.isSupported
+    val threadTrimsToSync = mutableListOf<ThreadDeleteSyncInfo>()
+
     readableDatabase
       .select(ID)
       .from(TABLE_NAME)
       .run()
       .use { cursor ->
         while (cursor.moveToNext()) {
-          trimThreadInternal(cursor.requireLong(ID), length, trimBeforeDate)
+          trimThreadInternal(
+            threadId = cursor.requireLong(ID),
+            syncThreadTrimDeletes = syncThreadTrimDeletes,
+            length = length,
+            trimBeforeDate = trimBeforeDate
+          )?.also {
+            threadTrimsToSync += it
+          }
         }
       }
 
@@ -344,18 +357,29 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
       Log.i(TAG, "Trim all threads caused $deletes attachments to be deleted.")
     }
 
+    if (syncThreadTrimDeletes && threadTrimsToSync.isNotEmpty()) {
+      MultiDeviceDeleteSyncJob.enqueueThreadDeletes(threadTrimsToSync, isFullDelete = false)
+    }
+
     notifyAttachmentListeners()
     notifyStickerPackListeners()
     OptimizeMessageSearchIndexJob.enqueue()
   }
 
-  fun trimThread(threadId: Long, length: Int, trimBeforeDate: Long) {
+  fun trimThread(
+    threadId: Long,
+    syncThreadTrimDeletes: Boolean,
+    length: Int = NO_TRIM_MESSAGE_COUNT_SET,
+    trimBeforeDate: Long = NO_TRIM_BEFORE_DATE_SET,
+    inclusive: Boolean = false
+  ) {
     if (length == NO_TRIM_MESSAGE_COUNT_SET && trimBeforeDate == NO_TRIM_BEFORE_DATE_SET) {
       return
     }
 
+    var threadTrimToSync: ThreadDeleteSyncInfo? = null
     val deletes = writableDatabase.withinTransaction {
-      trimThreadInternal(threadId, length, trimBeforeDate)
+      threadTrimToSync = trimThreadInternal(threadId, syncThreadTrimDeletes, length, trimBeforeDate, inclusive)
       messages.deleteAbandonedMessages()
       attachments.trimAllAbandonedAttachments()
       groupReceipts.deleteAbandonedRows()
@@ -367,14 +391,24 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
       Log.i(TAG, "Trim thread $threadId caused $deletes attachments to be deleted.")
     }
 
+    if (syncThreadTrimDeletes && threadTrimToSync != null) {
+      MultiDeviceDeleteSyncJob.enqueueThreadDeletes(listOf(threadTrimToSync!!), isFullDelete = false)
+    }
+
     notifyAttachmentListeners()
     notifyStickerPackListeners()
     OptimizeMessageSearchIndexJob.enqueue()
   }
 
-  private fun trimThreadInternal(threadId: Long, length: Int, trimBeforeDate: Long) {
+  private fun trimThreadInternal(
+    threadId: Long,
+    syncThreadTrimDeletes: Boolean,
+    length: Int,
+    trimBeforeDate: Long,
+    inclusive: Boolean = false
+  ): ThreadDeleteSyncInfo? {
     if (length == NO_TRIM_MESSAGE_COUNT_SET && trimBeforeDate == NO_TRIM_BEFORE_DATE_SET) {
-      return
+      return null
     }
 
     val finalTrimBeforeDate = if (length != NO_TRIM_MESSAGE_COUNT_SET && length > 0) {
@@ -391,19 +425,40 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
     }
 
     if (finalTrimBeforeDate != NO_TRIM_BEFORE_DATE_SET) {
-      Log.i(TAG, "Trimming thread: $threadId before: $finalTrimBeforeDate")
+      Log.i(TAG, "Trimming thread: $threadId before: $finalTrimBeforeDate inclusive: $inclusive")
+
+      val addressableMessages: Set<MessageRecord> = if (syncThreadTrimDeletes) {
+        messages.getAddressableMessagesBefore(threadId, finalTrimBeforeDate, excludeExpiring = false)
+      } else {
+        emptySet()
+      }
+
+      val nonExpiringAddressableMessages: Set<MessageRecord> = if (syncThreadTrimDeletes && addressableMessages.size == MessageTable.ADDRESSABLE_MESSAGE_LIMIT && addressableMessages.any { it.expiresIn > 0 }) {
+        messages.getAddressableMessagesBefore(threadId, finalTrimBeforeDate, excludeExpiring = true)
+      } else {
+        emptySet()
+      }
+
+      val deletes = messages.deleteMessagesInThreadBeforeDate(threadId, finalTrimBeforeDate, inclusive)
 
-      val deletes = messages.deleteMessagesInThreadBeforeDate(threadId, finalTrimBeforeDate)
       if (deletes > 0) {
         Log.i(TAG, "Trimming deleted $deletes messages thread: $threadId")
         setLastScrolled(threadId, 0)
-        update(threadId, false)
+        val threadDeleted = update(threadId = threadId, unarchive = false, syncThreadDelete = syncThreadTrimDeletes)
         notifyConversationListeners(threadId)
         SignalDatabase.calls.updateCallEventDeletionTimestamps()
+
+        return if (syncThreadTrimDeletes && (threadDeleted || addressableMessages.isNotEmpty())) {
+          ThreadDeleteSyncInfo(threadId, addressableMessages, nonExpiringAddressableMessages)
+        } else {
+          null
+        }
       } else {
         Log.i(TAG, "Trimming deleted no messages thread: $threadId")
       }
     }
+
+    return null
   }
 
   fun setAllThreadsRead(): List<MarkedMessageInfo> {
@@ -754,8 +809,8 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
     where += " AND $ARCHIVED = 0"
     where += " AND ${RecipientTable.TABLE_NAME}.${RecipientTable.BLOCKED} = 0"
 
-    if (SignalStore.releaseChannelValues().releaseChannelRecipientId != null) {
-      where += " AND $TABLE_NAME.$RECIPIENT_ID != ${SignalStore.releaseChannelValues().releaseChannelRecipientId!!.toLong()}"
+    if (SignalStore.releaseChannel.releaseChannelRecipientId != null) {
+      where += " AND $TABLE_NAME.$RECIPIENT_ID != ${SignalStore.releaseChannel.releaseChannelRecipientId!!.toLong()}"
     }
 
     val query = createQuery(
@@ -1066,29 +1121,45 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
       }
   }
 
-  fun deleteConversation(threadId: Long) {
-    val recipientIdForThreadId = getRecipientIdForThreadId(threadId)
+  fun deleteConversationIfContainsOnlyLocal(threadId: Long): Boolean {
+    return writableDatabase.withinTransaction {
+      val containsAddressable = messages.threadContainsAddressableMessages(threadId)
+      val isEmpty = messages.threadIsEmpty(threadId)
 
-    writableDatabase.withinTransaction { db ->
-      messages.deleteThread(threadId)
-      drafts.clearDrafts(threadId)
-      db.deactivateThread(threadId)
-      synchronized(threadIdCache) {
-        threadIdCache.remove(recipientIdForThreadId)
+      if (containsAddressable || isEmpty) {
+        false
+      } else {
+        deleteConversation(threadId, syncThreadDelete = false)
+        true
       }
     }
+  }
 
-    notifyConversationListListeners()
-    notifyConversationListeners(threadId)
-    ApplicationDependencies.getDatabaseObserver().notifyConversationDeleteListeners(threadId)
-    ConversationUtil.clearShortcuts(context, setOf(recipientIdForThreadId))
+  @JvmOverloads
+  fun deleteConversation(threadId: Long, syncThreadDelete: Boolean = true) {
+    deleteConversations(setOf(threadId), syncThreadDelete)
   }
 
-  fun deleteConversations(selectedConversations: Set<Long>) {
+  fun deleteConversations(selectedConversations: Set<Long>, syncThreadDeletes: Boolean = true) {
     val recipientIds = getRecipientIdsForThreadIds(selectedConversations)
 
+    val addressableMessages = mutableListOf<ThreadDeleteSyncInfo>()
+
     val queries: List<SqlUtil.Query> = SqlUtil.buildCollectionQuery(ID, selectedConversations)
     writableDatabase.withinTransaction { db ->
+      if (syncThreadDeletes && Recipient.self().deleteSyncCapability.isSupported) {
+        for (threadId in selectedConversations) {
+          val mostRecentMessages = messages.getMostRecentAddressableMessages(threadId, excludeExpiring = false)
+          val mostRecentNonExpiring = if (mostRecentMessages.size == MessageTable.ADDRESSABLE_MESSAGE_LIMIT && mostRecentMessages.any { it.expiresIn > 0 }) {
+            messages.getMostRecentAddressableMessages(threadId, excludeExpiring = true)
+          } else {
+            emptySet()
+          }
+
+          addressableMessages += ThreadDeleteSyncInfo(threadId, mostRecentMessages, mostRecentNonExpiring)
+        }
+      }
+
       for (query in queries) {
         db.deactivateThread(query)
       }
@@ -1106,10 +1177,19 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
       }
     }
 
+    if (syncThreadDeletes) {
+      MultiDeviceDeleteSyncJob.enqueueThreadDeletes(addressableMessages, isFullDelete = true)
+    }
+
     notifyConversationListListeners()
     notifyConversationListeners(selectedConversations)
-    ApplicationDependencies.getDatabaseObserver().notifyConversationDeleteListeners(selectedConversations)
+    notifyStickerListeners()
+    notifyStickerPackListeners()
+    AppDependencies.databaseObserver.notifyConversationDeleteListeners(selectedConversations)
+
     ConversationUtil.clearShortcuts(context, recipientIds)
+
+    OptimizeMessageSearchIndexJob.enqueue()
   }
 
   @SuppressLint("DiscouragedApi")
@@ -1406,12 +1486,13 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
       .run()
   }
 
-  fun update(threadId: Long, unarchive: Boolean): Boolean {
+  fun update(threadId: Long, unarchive: Boolean, syncThreadDelete: Boolean = true): Boolean {
     return update(
       threadId = threadId,
       unarchive = unarchive,
       allowDeletion = true,
-      notifyListeners = true
+      notifyListeners = true,
+      syncThreadDelete = syncThreadDelete
     )
   }
 
@@ -1420,16 +1501,18 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
       threadId = threadId,
       unarchive = unarchive,
       allowDeletion = true,
-      notifyListeners = false
+      notifyListeners = false,
+      syncThreadDelete = true
     )
   }
 
-  fun update(threadId: Long, unarchive: Boolean, allowDeletion: Boolean): Boolean {
+  fun update(threadId: Long, unarchive: Boolean, allowDeletion: Boolean, syncThreadDelete: Boolean = true): Boolean {
     return update(
       threadId = threadId,
       unarchive = unarchive,
       allowDeletion = allowDeletion,
-      notifyListeners = true
+      notifyListeners = true,
+      syncThreadDelete = syncThreadDelete
     )
   }
 
@@ -1464,7 +1547,7 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
     stopwatch?.split("thread-update")
   }
 
-  private fun update(threadId: Long, unarchive: Boolean, allowDeletion: Boolean, notifyListeners: Boolean): Boolean {
+  private fun update(threadId: Long, unarchive: Boolean, allowDeletion: Boolean, notifyListeners: Boolean, syncThreadDelete: Boolean): Boolean {
     if (threadId == -1L) {
       Log.d(TAG, "Skipping update for threadId -1")
       return false
@@ -1479,7 +1562,7 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
       if (!meaningfulMessages) {
         if (shouldDelete) {
           Log.d(TAG, "Deleting thread $threadId because it has no meaningful messages.")
-          deleteConversation(threadId)
+          deleteConversation(threadId, syncThreadDelete = syncThreadDelete)
           return@withinTransaction true
         } else if (!isPinned) {
           return@withinTransaction false
@@ -1956,9 +2039,22 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
       val messageExtras = if (messageExtraBytes != null) MessageExtras.ADAPTER.decode(messageExtraBytes) else null
       val extra: Extra? = if (extraString != null) {
         try {
-          JsonUtils.fromJson(extraString, Extra::class.java)
-        } catch (e: IOException) {
-          Log.w(TAG, "Failed to decode extras!")
+          val jsonObject = SaneJSONObject(JSONObject(extraString))
+          Extra(
+            isViewOnce = jsonObject.getBoolean("isRevealable"),
+            isSticker = jsonObject.getBoolean("isSticker"),
+            stickerEmoji = jsonObject.getString("stickerEmoji"),
+            isAlbum = jsonObject.getBoolean("isAlbum"),
+            isRemoteDelete = jsonObject.getBoolean("isRemoteDelete"),
+            isMessageRequestAccepted = jsonObject.getBoolean("isMessageRequestAccepted"),
+            isGv2Invite = jsonObject.getBoolean("isGv2Invite"),
+            groupAddedBy = jsonObject.getString("groupAddedBy"),
+            individualRecipientId = jsonObject.getString("individualRecipientId")!!,
+            bodyRanges = jsonObject.getString("bodyRanges"),
+            isScheduled = jsonObject.getBoolean("isScheduled"),
+            isRecipientHidden = jsonObject.getBoolean("isRecipientHidden")
+          )
+        } catch (exception: Exception) {
           null
         }
       } else {
@@ -2008,52 +2104,40 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
   }
 
   data class Extra(
-    @field:JsonProperty("isRevealable")
-    @get:JsonProperty("isRevealable")
+    @field:JsonProperty
     @param:JsonProperty("isRevealable")
     val isViewOnce: Boolean = false,
-    @field:JsonProperty("isSticker")
-    @get:JsonProperty("isSticker")
+    @field:JsonProperty
     @param:JsonProperty("isSticker")
     val isSticker: Boolean = false,
-    @field:JsonProperty("stickerEmoji")
-    @get:JsonProperty("stickerEmoji")
+    @field:JsonProperty
     @param:JsonProperty("stickerEmoji")
     val stickerEmoji: String? = null,
-    @field:JsonProperty("isAlbum")
-    @get:JsonProperty("isAlbum")
+    @field:JsonProperty
     @param:JsonProperty("isAlbum")
     val isAlbum: Boolean = false,
-    @field:JsonProperty("isRemoteDelete")
-    @get:JsonProperty("isRemoteDelete")
+    @field:JsonProperty
     @param:JsonProperty("isRemoteDelete")
     val isRemoteDelete: Boolean = false,
-    @field:JsonProperty("isMessageRequestAccepted")
-    @get:JsonProperty("isMessageRequestAccepted")
+    @field:JsonProperty
     @param:JsonProperty("isMessageRequestAccepted")
     val isMessageRequestAccepted: Boolean = true,
-    @field:JsonProperty("isGv2Invite")
-    @get:JsonProperty("isGv2Invite")
+    @field:JsonProperty
     @param:JsonProperty("isGv2Invite")
     val isGv2Invite: Boolean = false,
-    @field:JsonProperty("groupAddedBy")
-    @get:JsonProperty("groupAddedBy")
+    @field:JsonProperty
     @param:JsonProperty("groupAddedBy")
     val groupAddedBy: String? = null,
-    @field:JsonProperty("individualRecipientId")
-    @get:JsonProperty("individualRecipientId")
+    @field:JsonProperty
     @param:JsonProperty("individualRecipientId")
     val individualRecipientId: String,
-    @field:JsonProperty("bodyRanges")
-    @get:JsonProperty("bodyRanges")
+    @field:JsonProperty
     @param:JsonProperty("bodyRanges")
     val bodyRanges: String? = null,
-    @field:JsonProperty("isScheduled")
-    @get:JsonProperty("isScheduled")
+    @field:JsonProperty
     @param:JsonProperty("isScheduled")
     val isScheduled: Boolean = false,
-    @field:JsonProperty("isRecipientHidden")
-    @get:JsonProperty("isRecipientHidden")
+    @field:JsonProperty
     @param:JsonProperty("isRecipientHidden")
     val isRecipientHidden: Boolean = false
   ) {
@@ -2102,7 +2186,9 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
   }
 
   internal enum class ReadStatus(private val value: Int) {
-    READ(1), UNREAD(0), FORCED_UNREAD(2);
+    READ(1),
+    UNREAD(0),
+    FORCED_UNREAD(2);
 
     fun serialize(): Int {
       return value
@@ -2134,4 +2220,6 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
     val threadId: Long,
     val newlyCreated: Boolean
   )
+
+  data class ThreadDeleteSyncInfo(val threadId: Long, val addressableMessages: Set<MessageRecord>, val nonExpiringAddressableMessages: Set<MessageRecord>)
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java b/app/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java
index c573939380..aced0f253d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java
@@ -1,10 +1,7 @@
 package org.thoughtcrime.securesms.database.documents;
 
-import android.content.Context;
 import android.text.TextUtils;
 
-import androidx.annotation.NonNull;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -19,7 +16,7 @@
 import org.signal.core.util.logging.Log;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.InvalidKeyException;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.signal.core.util.Base64;
@@ -56,7 +53,7 @@ public RecipientId getRecipientId() {
     if (!TextUtils.isEmpty(recipientId)) {
       return RecipientId.from(recipientId);
     } else {
-      return Recipient.external(ApplicationDependencies.getApplication(), address).getId();
+      return Recipient.external(AppDependencies.getApplication(), address).getId();
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/documents/NetworkFailure.java b/app/src/main/java/org/thoughtcrime/securesms/database/documents/NetworkFailure.java
index b83ab2a7ac..6a501c45c1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/documents/NetworkFailure.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/documents/NetworkFailure.java
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.database.documents;
 
-import android.content.Context;
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
@@ -8,8 +7,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import org.thoughtcrime.securesms.ApplicationContext;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 
@@ -36,7 +34,7 @@ public RecipientId getRecipientId() {
     if (!TextUtils.isEmpty(recipientId)) {
       return RecipientId.from(recipientId);
     } else {
-      return Recipient.external(ApplicationDependencies.getApplication(), address).getId();
+      return Recipient.external(AppDependencies.getApplication(), address).getId();
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt
index 7b9c81aeab..cc2170b762 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SignalDatabaseMigrations.kt
@@ -89,6 +89,13 @@ import org.thoughtcrime.securesms.database.helpers.migration.V228_AddNameCollisi
 import org.thoughtcrime.securesms.database.helpers.migration.V229_MarkMissedCallEventsNotified
 import org.thoughtcrime.securesms.database.helpers.migration.V230_UnreadCountIndices
 import org.thoughtcrime.securesms.database.helpers.migration.V231_ArchiveThumbnailColumns
+import org.thoughtcrime.securesms.database.helpers.migration.V232_CreateInAppPaymentTable
+import org.thoughtcrime.securesms.database.helpers.migration.V233_FixInAppPaymentTableDefaultNotifiedValue
+import org.thoughtcrime.securesms.database.helpers.migration.V234_ThumbnailRestoreStateColumn
+import org.thoughtcrime.securesms.database.helpers.migration.V235_AttachmentUuidColumn
+import org.thoughtcrime.securesms.database.helpers.migration.V236_FixInAppSubscriberCurrencyIfAble
+import org.thoughtcrime.securesms.database.helpers.migration.V237_ResetGroupForceUpdateTimestamps
+import org.thoughtcrime.securesms.database.helpers.migration.V238_AddGroupSendEndorsementsColumns
 
 /**
  * Contains all of the database migrations for [SignalDatabase]. Broken into a separate file for cleanliness.
@@ -181,10 +188,17 @@ object SignalDatabaseMigrations {
     228 to V228_AddNameCollisionTables,
     229 to V229_MarkMissedCallEventsNotified,
     230 to V230_UnreadCountIndices,
-    231 to V231_ArchiveThumbnailColumns
+    231 to V231_ArchiveThumbnailColumns,
+    232 to V232_CreateInAppPaymentTable,
+    233 to V233_FixInAppPaymentTableDefaultNotifiedValue,
+    234 to V234_ThumbnailRestoreStateColumn,
+    235 to V235_AttachmentUuidColumn,
+    236 to V236_FixInAppSubscriberCurrencyIfAble,
+    237 to V237_ResetGroupForceUpdateTimestamps,
+    238 to V238_AddGroupSendEndorsementsColumns
   )
 
-  const val DATABASE_VERSION = 231
+  const val DATABASE_VERSION = 238
 
   @JvmStatic
   fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V168_SingleMessageTableMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V168_SingleMessageTableMigration.kt
index 317ff73d5c..d944328a62 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V168_SingleMessageTableMigration.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V168_SingleMessageTableMigration.kt
@@ -89,7 +89,7 @@ object V168_SingleMessageTableMigration : SignalDatabaseMigration {
 
     stopwatch.stop(TAG)
 
-    SignalStore.plaintext().smsMigrationIdOffset = nextMmsId
+    SignalStore.plaintext.smsMigrationIdOffset = nextMmsId
   }
 
   private fun copySmsToMms(db: SQLiteDatabase, idOffset: Long) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V185_MessageRecipientsAndEditMessageMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V185_MessageRecipientsAndEditMessageMigration.kt
index 3d441267b8..06c0a3fb18 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V185_MessageRecipientsAndEditMessageMigration.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V185_MessageRecipientsAndEditMessageMigration.kt
@@ -13,7 +13,7 @@ import org.signal.core.util.requireLong
 import org.signal.core.util.requireNonNullString
 import org.signal.core.util.requireString
 import org.thoughtcrime.securesms.database.KeyValueDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.SecurePreferenceManager
 import org.whispersystems.signalservice.api.push.ServiceId.ACI
@@ -248,7 +248,7 @@ object V185_MessageRecipientsAndEditMessageMigration : SignalDatabaseMigration {
   }
 
   private fun getSelfId(db: SQLiteDatabase): RecipientId? {
-    val idByAci: RecipientId? = getLocalAci(ApplicationDependencies.getApplication())?.let { aci ->
+    val idByAci: RecipientId? = getLocalAci(AppDependencies.application)?.let { aci ->
       db.rawQuery("SELECT _id FROM recipient WHERE uuid = ?", SqlUtil.buildArgs(aci))
         .readToSingleObject { RecipientId.from(it.requireLong("_id")) }
     }
@@ -259,7 +259,7 @@ object V185_MessageRecipientsAndEditMessageMigration : SignalDatabaseMigration {
 
     Log.w(TAG, "Failed to find by ACI! Will try by E164.")
 
-    val idByE164: RecipientId? = getLocalE164(ApplicationDependencies.getApplication())?.let { e164 ->
+    val idByE164: RecipientId? = getLocalE164(AppDependencies.application)?.let { e164 ->
       db.rawQuery("SELECT _id FROM recipient WHERE phone = ?", SqlUtil.buildArgs(e164))
         .readToSingleObject { RecipientId.from(it.requireLong("_id")) }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V188_FixMessageRecipientsAndEditMessageMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V188_FixMessageRecipientsAndEditMessageMigration.kt
index 7fa3479665..308732bfcf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V188_FixMessageRecipientsAndEditMessageMigration.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V188_FixMessageRecipientsAndEditMessageMigration.kt
@@ -13,7 +13,7 @@ import org.signal.core.util.requireLong
 import org.signal.core.util.requireNonNullString
 import org.signal.core.util.requireString
 import org.thoughtcrime.securesms.database.KeyValueDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.SecurePreferenceManager
 import org.whispersystems.signalservice.api.push.ServiceId.ACI
@@ -274,7 +274,7 @@ object V188_FixMessageRecipientsAndEditMessageMigration : SignalDatabaseMigratio
   }
 
   private fun getSelfId(db: SQLiteDatabase): RecipientId? {
-    val idByAci: RecipientId? = getLocalAci(ApplicationDependencies.getApplication())?.let { aci ->
+    val idByAci: RecipientId? = getLocalAci(AppDependencies.application)?.let { aci ->
       db.rawQuery("SELECT _id FROM recipient WHERE uuid = ?", SqlUtil.buildArgs(aci))
         .readToSingleObject { RecipientId.from(it.requireLong("_id")) }
     }
@@ -285,7 +285,7 @@ object V188_FixMessageRecipientsAndEditMessageMigration : SignalDatabaseMigratio
 
     Log.w(TAG, "Failed to find by ACI! Will try by E164.")
 
-    val idByE164: RecipientId? = getLocalE164(ApplicationDependencies.getApplication())?.let { e164 ->
+    val idByE164: RecipientId? = getLocalE164(AppDependencies.application)?.let { e164 ->
       db.rawQuery("SELECT _id FROM recipient WHERE phone = ?", SqlUtil.buildArgs(e164))
         .readToSingleObject { RecipientId.from(it.requireLong("_id")) }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V190_UpdatePendingSelfDataMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V190_UpdatePendingSelfDataMigration.kt
index 0fb5aa7cbf..7310c59261 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V190_UpdatePendingSelfDataMigration.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V190_UpdatePendingSelfDataMigration.kt
@@ -10,7 +10,7 @@ import org.signal.core.util.requireString
 import org.signal.core.util.update
 import org.thoughtcrime.securesms.database.KeyValueDatabase
 import org.thoughtcrime.securesms.database.ThreadTable
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.JsonUtils
 import org.thoughtcrime.securesms.util.SecurePreferenceManager
@@ -83,7 +83,7 @@ object V190_UpdatePendingSelfDataMigration : SignalDatabaseMigration {
   }
 
   private fun getSelfId(db: SQLiteDatabase): RecipientId? {
-    val idByAci: RecipientId? = getLocalAci(ApplicationDependencies.getApplication())?.let { aci ->
+    val idByAci: RecipientId? = getLocalAci(AppDependencies.application)?.let { aci ->
       db.rawQuery("SELECT _id FROM recipient WHERE uuid = ?", SqlUtil.buildArgs(aci))
         .readToSingleObject { RecipientId.from(it.requireLong("_id")) }
     }
@@ -94,7 +94,7 @@ object V190_UpdatePendingSelfDataMigration : SignalDatabaseMigration {
 
     Log.w(TAG, "Failed to find by ACI! Will try by E164.")
 
-    val idByE164: RecipientId? = getLocalE164(ApplicationDependencies.getApplication())?.let { e164 ->
+    val idByE164: RecipientId? = getLocalE164(AppDependencies.application)?.let { e164 ->
       db.rawQuery("SELECT _id FROM recipient WHERE phone = ?", SqlUtil.buildArgs(e164))
         .readToSingleObject { RecipientId.from(it.requireLong("_id")) }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V220_PreKeyConstraints.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V220_PreKeyConstraints.kt
index 04c8a764d0..aa66037b05 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V220_PreKeyConstraints.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V220_PreKeyConstraints.kt
@@ -101,5 +101,6 @@ object V220_PreKeyConstraints : SignalDatabaseMigration {
 
     db.execSQL("DROP TABLE one_time_prekeys")
 
-    db.execSQL("ALTER TABLE one_time_prekeys_temp RENAME TO one_time_prekeys") }
+    db.execSQL("ALTER TABLE one_time_prekeys_temp RENAME TO one_time_prekeys")
+  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V231_ArchiveThumbnailColumns.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V231_ArchiveThumbnailColumns.kt
index dda3d63074..68d1776f83 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V231_ArchiveThumbnailColumns.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V231_ArchiveThumbnailColumns.kt
@@ -10,9 +10,9 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase
 
 object V231_ArchiveThumbnailColumns : SignalDatabaseMigration {
   override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
-    db.execSQL("ALTER TABLE attachment ADD COLUMN thumbnail_file TEXT DEFAULT NULL")
-    db.execSQL("ALTER TABLE attachment ADD COLUMN thumbnail_random BLOB DEFAULT NULL")
     db.execSQL("ALTER TABLE attachment ADD COLUMN archive_thumbnail_cdn INTEGER DEFAULT 0")
     db.execSQL("ALTER TABLE attachment ADD COLUMN archive_thumbnail_media_id TEXT DEFAULT NULL")
+    db.execSQL("ALTER TABLE attachment ADD COLUMN thumbnail_file TEXT DEFAULT NULL")
+    db.execSQL("ALTER TABLE attachment ADD COLUMN thumbnail_random BLOB DEFAULT NULL")
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V232_CreateInAppPaymentTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V232_CreateInAppPaymentTable.kt
new file mode 100644
index 0000000000..294b7137dc
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V232_CreateInAppPaymentTable.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.database.helpers.migration
+
+import android.app.Application
+import net.zetetic.database.sqlcipher.SQLiteDatabase
+
+/**
+ * Create the table and migrate necessary data.
+ */
+@Suppress("ClassName")
+object V232_CreateInAppPaymentTable : SignalDatabaseMigration {
+  override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+    db.execSQL(
+      """
+      CREATE TABLE in_app_payment (
+        _id INTEGER PRIMARY KEY,
+        type INTEGER NOT NULL,
+        state INTEGER NOT NULL,
+        inserted_at INTEGER NOT NULL,
+        updated_at INTEGER NOT NULL,
+        notified INTEGER DEFAULT 0,
+        subscriber_id TEXT,
+        end_of_period INTEGER DEFAULT 0,
+        data BLOB NOT NULL
+      )
+      """.trimIndent()
+    )
+
+    db.execSQL(
+      """
+      CREATE TABLE in_app_payment_subscriber (
+        _id INTEGER PRIMARY KEY,
+        subscriber_id TEXT NOT NULL UNIQUE,
+        currency_code TEXT NOT NULL,
+        type INTEGER NOT NULL,
+        requires_cancel INTEGER DEFAULT 0,
+        payment_method_type INTEGER DEFAULT 0,
+        UNIQUE(currency_code, type)
+      )
+      """.trimIndent()
+    )
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V233_FixInAppPaymentTableDefaultNotifiedValue.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V233_FixInAppPaymentTableDefaultNotifiedValue.kt
new file mode 100644
index 0000000000..217cfb03b1
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V233_FixInAppPaymentTableDefaultNotifiedValue.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.database.helpers.migration
+
+import android.app.Application
+import net.zetetic.database.sqlcipher.SQLiteDatabase
+
+/**
+ * Updates notified default value from 0 to 1
+ */
+@Suppress("ClassName")
+object V233_FixInAppPaymentTableDefaultNotifiedValue : SignalDatabaseMigration {
+  override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+    db.execSQL(
+      """
+      CREATE TABLE in_app_payment_tmp (
+        _id INTEGER PRIMARY KEY,
+        type INTEGER NOT NULL,
+        state INTEGER NOT NULL,
+        inserted_at INTEGER NOT NULL,
+        updated_at INTEGER NOT NULL,
+        notified INTEGER DEFAULT 1,
+        subscriber_id TEXT,
+        end_of_period INTEGER DEFAULT 0,
+        data BLOB NOT NULL
+      )
+      """.trimIndent()
+    )
+
+    db.execSQL(
+      """
+        INSERT INTO in_app_payment_tmp
+        SELECT
+            _id,
+            type,
+            state,
+            inserted_at,
+            updated_at,
+            notified,
+            subscriber_id,
+            end_of_period,
+            data
+        FROM in_app_payment
+      """.trimIndent()
+    )
+
+    db.execSQL("DROP TABLE in_app_payment")
+    db.execSQL("ALTER TABLE in_app_payment_tmp RENAME TO in_app_payment")
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V234_ThumbnailRestoreStateColumn.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V234_ThumbnailRestoreStateColumn.kt
new file mode 100644
index 0000000000..2a4951aeb2
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V234_ThumbnailRestoreStateColumn.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.database.helpers.migration
+
+import android.app.Application
+import net.zetetic.database.sqlcipher.SQLiteDatabase
+
+/**
+ * Add a separate column to track thumbnail restore state
+ */
+object V234_ThumbnailRestoreStateColumn : SignalDatabaseMigration {
+  override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+    db.execSQL("ALTER TABLE attachment ADD COLUMN thumbnail_restore_state INTEGER DEFAULT 0")
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V235_AttachmentUuidColumn.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V235_AttachmentUuidColumn.kt
new file mode 100644
index 0000000000..fad43460f8
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V235_AttachmentUuidColumn.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.database.helpers.migration
+
+import android.app.Application
+import net.zetetic.database.sqlcipher.SQLiteDatabase
+
+/**
+ * Add a column for attachment uuids
+ */
+@Suppress("ClassName")
+object V235_AttachmentUuidColumn : SignalDatabaseMigration {
+  override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+    db.execSQL("ALTER TABLE attachment ADD COLUMN attachment_uuid TEXT DEFAULT NULL")
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V236_FixInAppSubscriberCurrencyIfAble.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V236_FixInAppSubscriberCurrencyIfAble.kt
new file mode 100644
index 0000000000..3f33e9b865
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V236_FixInAppSubscriberCurrencyIfAble.kt
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.database.helpers.migration
+
+import android.app.Application
+import androidx.core.content.contentValuesOf
+import net.zetetic.database.sqlcipher.SQLiteDatabase
+import org.signal.core.util.logging.Log
+import org.signal.core.util.update
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+
+/**
+ * Fixes a bug in storage sync where we could end up overwriting a subscriber's currency code with
+ * an empty string. This can't happen anymore, as we now require a Currency on the InAppPaymentSubscriberRecord
+ * instead of just a currency code string.
+ *
+ * If a subscriber has a null or empty currency code, we try to load the code from the
+ * in app payments table. We utilize CONFLICT_IGNORE because if there's already a new subscriber id
+ * created, we don't want to impact it.
+ *
+ * Because the data column is a protobuf encoded blob, we cannot do a raw query here.
+ */
+@Suppress("ClassName")
+object V236_FixInAppSubscriberCurrencyIfAble : SignalDatabaseMigration {
+
+  private val TAG = Log.tag(V236_FixInAppSubscriberCurrencyIfAble::class)
+
+  override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+    val subscriberIds: List<String> = db.query(
+      "in_app_payment_subscriber",
+      arrayOf("subscriber_id"),
+      "currency_code = ?",
+      arrayOf(""),
+      null,
+      null,
+      "_id DESC"
+    ).use { cursor ->
+      val ids = mutableListOf<String>()
+      val columnIndex = cursor.getColumnIndexOrThrow("subscriber_id")
+      while (cursor.moveToNext()) {
+        ids.add(cursor.getString(columnIndex))
+      }
+
+      ids
+    }
+
+    for (id in subscriberIds) {
+      val currencyCode: String? = db.query(
+        "in_app_payment",
+        arrayOf("data"),
+        "subscriber_id = ?",
+        arrayOf(id),
+        null,
+        null,
+        "inserted_at DESC",
+        "1"
+      ).use { cursor ->
+        if (cursor.moveToFirst()) {
+          val columnIndex = cursor.getColumnIndexOrThrow("data")
+          val rawData = cursor.getBlob(columnIndex)
+          val data = InAppPaymentData.ADAPTER.decode(rawData)
+
+          data.amount?.currencyCode
+        } else {
+          null
+        }
+      }
+
+      if (currencyCode != null) {
+        Log.d(TAG, "Found and attempting to heal subscriber of currency $currencyCode")
+        db.update(
+          "in_app_payment_subscriber",
+          SQLiteDatabase.CONFLICT_IGNORE,
+          contentValuesOf("currency_code" to currencyCode),
+          "subscriber_id = ?",
+          arrayOf(id)
+        )
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V237_ResetGroupForceUpdateTimestamps.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V237_ResetGroupForceUpdateTimestamps.kt
new file mode 100644
index 0000000000..45f8209b87
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V237_ResetGroupForceUpdateTimestamps.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.database.helpers.migration
+
+import android.app.Application
+import net.zetetic.database.sqlcipher.SQLiteDatabase
+
+/**
+ * Reset last forced update timestamp for groups to fix a local group state bug.
+ */
+@Suppress("ClassName")
+object V237_ResetGroupForceUpdateTimestamps : SignalDatabaseMigration {
+  override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+    db.execSQL("UPDATE groups SET last_force_update_timestamp = 0")
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V238_AddGroupSendEndorsementsColumns.kt b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V238_AddGroupSendEndorsementsColumns.kt
new file mode 100644
index 0000000000..1214560604
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/migration/V238_AddGroupSendEndorsementsColumns.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.database.helpers.migration
+
+import android.app.Application
+import net.zetetic.database.sqlcipher.SQLiteDatabase
+
+/**
+ * Add columns to group and group membership tables needed for group send endorsements.
+ */
+@Suppress("ClassName")
+object V238_AddGroupSendEndorsementsColumns : SignalDatabaseMigration {
+
+  override fun migrate(context: Application, db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+    db.execSQL("ALTER TABLE groups ADD COLUMN group_send_endorsements_expiration INTEGER DEFAULT 0")
+    db.execSQL("ALTER TABLE group_membership ADD COLUMN endorsement BLOB DEFAULT NULL")
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/GroupedThreadMediaLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/GroupedThreadMediaLoader.java
index 4d4d683e56..9d7f4af504 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/GroupedThreadMediaLoader.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/GroupedThreadMediaLoader.java
@@ -12,7 +12,7 @@
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.DatabaseObserver;
 import org.thoughtcrime.securesms.database.MediaTable;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.util.CalendarDateOnly;
 
 import java.text.SimpleDateFormat;
@@ -59,7 +59,7 @@ protected void onStopLoading() {
 
   @Override
   protected void onAbandon() {
-    ApplicationDependencies.getDatabaseObserver().unregisterObserver(observer);
+    AppDependencies.getDatabaseObserver().unregisterObserver(observer);
   }
 
   @Override
@@ -71,7 +71,7 @@ public GroupedThreadMedia loadInBackground() {
 
     PopulatedGroupedThreadMedia mediaGrouping = new PopulatedGroupedThreadMedia(groupingMethod);
 
-    ApplicationDependencies.getDatabaseObserver().registerAttachmentObserver(observer);
+    AppDependencies.getDatabaseObserver().registerAttachmentObserver(observer);
 
     try (Cursor cursor = ThreadMediaLoader.createThreadMediaCursor(context, threadId, mediaType, sorting)) {
       while (cursor != null && cursor.moveToNext()) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java
index 26a64611de..8fe6112984 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java
@@ -15,7 +15,7 @@
 import org.thoughtcrime.securesms.database.DatabaseObserver;
 import org.thoughtcrime.securesms.database.MediaTable.Sorting;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.util.AsyncLoader;
 
@@ -43,7 +43,7 @@ public PagingMediaLoader(@NonNull Context context, long threadId, @NonNull Uri u
 
   @Override
   public @Nullable Pair<Cursor, Integer> loadInBackground() {
-    ApplicationDependencies.getDatabaseObserver().registerAttachmentObserver(observer);
+    AppDependencies.getDatabaseObserver().registerAttachmentObserver(observer);
 
     Cursor cursor = SignalDatabase.media().getGalleryMediaForThread(threadId, sorting);
 
@@ -61,6 +61,6 @@ public PagingMediaLoader(@NonNull Context context, long threadId, @NonNull Uri u
 
   @Override
   protected void onAbandon() {
-    ApplicationDependencies.getDatabaseObserver().unregisterObserver(observer);
+    AppDependencies.getDatabaseObserver().unregisterObserver(observer);
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
index 58d2acbcd0..54c58da417 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
@@ -229,6 +229,10 @@ public boolean isPaymentNotification() {
     return MessageTypes.isPaymentsNotification(type);
   }
 
+  public boolean isPaymentTombstone() {
+    return MessageTypes.isPaymentTombstone(type);
+  }
+
   public boolean isPaymentsRequestToActivate() {
     return MessageTypes.isPaymentsRequestToActivate(type);
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/DonationReceiptRecord.kt b/app/src/main/java/org/thoughtcrime/securesms/database/model/DonationReceiptRecord.kt
index ee81accca7..858bbd76b7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/DonationReceiptRecord.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/DonationReceiptRecord.kt
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.database.model
 
 import org.signal.core.util.money.FiatMoney
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
+import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration
 import java.util.Currency
 
 data class DonationReceiptRecord(
@@ -12,9 +13,10 @@ data class DonationReceiptRecord(
   val subscriptionLevel: Int
 ) {
   enum class Type(val code: String) {
-    RECURRING("recurring"),
-    BOOST("boost"),
-    GIFT("gift");
+    RECURRING_BACKUP("recurring_backup"),
+    RECURRING_DONATION("recurring"),
+    ONE_TIME_DONATION("boost"),
+    ONE_TIME_GIFT("gift");
 
     companion object {
       fun fromCode(code: String): Type {
@@ -34,7 +36,7 @@ data class DonationReceiptRecord(
         amount = FiatMoney(activeAmount, activeCurrency),
         timestamp = System.currentTimeMillis(),
         subscriptionLevel = subscription.level,
-        type = Type.RECURRING
+        type = if (subscription.level == SubscriptionsConfiguration.BACKUPS_LEVEL) Type.RECURRING_BACKUP else Type.RECURRING_DONATION
       )
     }
 
@@ -44,7 +46,7 @@ data class DonationReceiptRecord(
         amount = amount,
         timestamp = System.currentTimeMillis(),
         subscriptionLevel = -1,
-        type = Type.BOOST
+        type = Type.ONE_TIME_DONATION
       )
     }
 
@@ -54,7 +56,7 @@ data class DonationReceiptRecord(
         amount = amount,
         timestamp = System.currentTimeMillis(),
         subscriptionLevel = -1,
-        type = Type.GIFT
+        type = Type.ONE_TIME_GIFT
       )
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupCallUpdateDetailsUtil.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupCallUpdateDetailsUtil.java
index 2264893a89..dfae412e4b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupCallUpdateDetailsUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupCallUpdateDetailsUtil.java
@@ -6,8 +6,10 @@
 import org.signal.core.util.Base64;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.backup.v2.proto.GroupCall;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.databaseprotos.GroupCallUpdateDetails;
 import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.whispersystems.signalservice.api.push.ServiceId;
 
 import java.io.IOException;
@@ -28,11 +30,9 @@ private GroupCallUpdateDetailsUtil() {
   /**
    * Generates a group chat update message body from backup data
    */
-  public static @NonNull String createBodyFromBackup(@NonNull GroupCall groupCallChatUpdate) {
-    ServiceId.ACI startedCall = groupCallChatUpdate.startedCallAci != null ? ServiceId.ACI.parseOrNull(groupCallChatUpdate.startedCallAci) : null;
-
+  public static @NonNull String createBodyFromBackup(@NonNull GroupCall groupCallChatUpdate, ServiceId.ACI startedCallAci) {
     GroupCallUpdateDetails details = new GroupCallUpdateDetails.Builder()
-        .startedCallUuid(Objects.toString(startedCall, null))
+        .startedCallUuid(Objects.toString(startedCallAci, null))
         .startedCallTimestamp(groupCallChatUpdate.startedCallTimestamp)
         .endedCallTimestamp(groupCallChatUpdate.endedCallTimestamp)
         .isCallFull(false)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupRecord.kt b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupRecord.kt
index f99e255bab..3bc40bee70 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupRecord.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupRecord.kt
@@ -31,7 +31,8 @@ class GroupRecord(
   groupRevision: Int,
   decryptedGroupBytes: ByteArray?,
   val distributionId: DistributionId?,
-  val lastForceUpdateTimestamp: Long
+  val lastForceUpdateTimestamp: Long,
+  val groupSendEndorsementExpiration: Long
 ) {
 
   val members: List<RecipientId> by lazy {
@@ -155,7 +156,7 @@ class GroupRecord(
     return if (isV2Group) {
       val memberLevel = requireV2GroupProperties().memberLevel(recipient.serviceId)
       if (recipient.isSelf && memberLevel == GroupTable.MemberLevel.NOT_A_MEMBER) {
-        requireV2GroupProperties().memberLevel(Optional.ofNullable(SignalStore.account().pni))
+        requireV2GroupProperties().memberLevel(Optional.ofNullable(SignalStore.account.pni))
       } else {
         memberLevel
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupSendEndorsementRecords.kt b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupSendEndorsementRecords.kt
new file mode 100644
index 0000000000..edb4e8298b
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupSendEndorsementRecords.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.database.model
+
+import org.signal.libsignal.zkgroup.groupsend.GroupSendEndorsement
+import org.thoughtcrime.securesms.recipients.RecipientId
+
+/**
+ * Contains the individual group send endorsements for a specific group
+ * source from our local db.
+ */
+data class GroupSendEndorsementRecords(val endorsements: Map<RecipientId, GroupSendEndorsement?>) {
+  fun getEndorsement(recipientId: RecipientId): GroupSendEndorsement? {
+    return endorsements[recipientId]
+  }
+
+  fun isMissingAnyEndorsements(): Boolean {
+    return endorsements.values.any { it == null }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/InAppPaymentSubscriberRecord.kt b/app/src/main/java/org/thoughtcrime/securesms/database/model/InAppPaymentSubscriberRecord.kt
new file mode 100644
index 0000000000..522ee8f552
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/InAppPaymentSubscriberRecord.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.database.model
+
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.whispersystems.signalservice.api.subscriptions.SubscriberId
+import java.util.Currency
+
+/**
+ * Represents a SubscriberId and metadata that can be used for a recurring
+ * subscription of the given type. Stored in InAppPaymentSubscriberTable
+ */
+data class InAppPaymentSubscriberRecord(
+  val subscriberId: SubscriberId,
+  val currency: Currency,
+  val type: Type,
+  val requiresCancel: Boolean,
+  val paymentMethodType: InAppPaymentData.PaymentMethodType
+) {
+  /**
+   * Serves as the mutex by which to perform mutations to subscriptions.
+   */
+  enum class Type(val code: Int, val jobQueue: String, val inAppPaymentType: InAppPaymentType) {
+    /**
+     * A recurring donation
+     */
+    DONATION(0, "recurring-donations", InAppPaymentType.RECURRING_DONATION),
+
+    /**
+     * A recurring backups subscription
+     */
+    BACKUP(1, "recurring-backups", InAppPaymentType.RECURRING_BACKUP)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
index 6f13a41c82..c5a4da9301 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.text.Spannable;
 import android.text.SpannableString;
+import android.text.TextUtils;
 import android.text.style.RelativeSizeSpan;
 import android.text.style.StyleSpan;
 
@@ -32,6 +33,7 @@
 
 import com.annimon.stream.Stream;
 
+import org.signal.core.util.Base64;
 import org.signal.core.util.StringUtil;
 import org.signal.core.util.logging.Log;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;
@@ -57,7 +59,6 @@
 import org.thoughtcrime.securesms.profiles.ProfileName;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.signal.core.util.Base64;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.ExpirationUtil;
 import org.thoughtcrime.securesms.util.GroupUtil;
@@ -72,6 +73,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -269,7 +271,7 @@ public SpannableString getDisplayBody(@NonNull Context context, @Nullable Consum
       int messageResource = R.string.MessageRecord__you_can_no_longer_send_sms_messages_in_signal;
       return fromRecipient(getFromRecipient(), r -> context.getString(messageResource, r.getDisplayName(context)), R.drawable.ic_update_info_16);
     } else if (isPaymentsRequestToActivate()) {
-      return isOutgoing() ? fromRecipient(getFromRecipient(), r -> context.getString(R.string.MessageRecord_you_sent_request, r.getShortDisplayName(context)), R.drawable.ic_card_activate_payments)
+      return isOutgoing() ? fromRecipient(getToRecipient(), r -> context.getString(R.string.MessageRecord_you_sent_request, r.getShortDisplayName(context)), R.drawable.ic_card_activate_payments)
                           : fromRecipient(getFromRecipient(), r -> context.getString(R.string.MessageRecord_wants_you_to_activate_payments, r.getShortDisplayName(context)), R.drawable.ic_card_activate_payments);
    } else if (isPaymentsActivated()) {
       return isOutgoing() ? staticUpdateDescription(context.getString(R.string.MessageRecord_you_activated_payments), R.drawable.ic_card_activate_payments)
@@ -308,6 +310,14 @@ public boolean isSelfCreatedGroup() {
       return null;
     }
 
+    if (messageExtras != null && messageExtras.gv2UpdateDescription != null) {
+      return messageExtras.gv2UpdateDescription.gv2ChangeDescription;
+    }
+
+    if (TextUtils.isEmpty(getBody())) {
+      return null;
+    }
+
     DecryptedGroupV2Context decryptedGroupV2Context;
     try {
       byte[] decoded = Base64.decode(getBody());
@@ -460,8 +470,19 @@ private static boolean selfCreatedGroup(@Nullable DecryptedGroupChange change) {
         }
 
         return staticUpdateDescription(updateMessage, R.drawable.ic_update_profile_16);
+      } else if (profileChangeDetails.deprecatedLearnedProfileName != null) {
+        return staticUpdateDescription(context.getString(R.string.MessageRecord_started_this_chat, profileChangeDetails.deprecatedLearnedProfileName.previous), R.drawable.symbol_thread_16);
       } else if (profileChangeDetails.learnedProfileName != null) {
-        return staticUpdateDescription(context.getString(R.string.MessageRecord_started_this_chat, profileChangeDetails.learnedProfileName.previous), R.drawable.symbol_thread_16);
+        String previouslyKnownAs;
+        if (!Util.isEmpty(profileChangeDetails.learnedProfileName.e164)) {
+          previouslyKnownAs = PhoneNumberFormatter.prettyPrint(profileChangeDetails.learnedProfileName.e164);
+        } else {
+          previouslyKnownAs = profileChangeDetails.learnedProfileName.username;
+        }
+
+        if (!Util.isEmpty(previouslyKnownAs)) {
+          return staticUpdateDescription(context.getString(R.string.MessageRecord_started_this_chat, previouslyKnownAs), R.drawable.symbol_thread_16);
+        }
       }
     }
 
@@ -707,7 +728,7 @@ public boolean equals(Object other) {
   }
 
   public int hashCode() {
-    return (int)getId();
+    return Objects.hash(id, isMms());
   }
 
   public int getSubscriptionId() {
@@ -802,6 +823,13 @@ public int getRevisionNumber() {
     return revisionNumber;
   }
 
+  /**
+   * A message that can be correctly identified and delete sync'd across devices.
+   */
+  public boolean canDeleteSync() {
+    return false;
+  }
+
   public static final class InviteAddState {
 
     private final boolean invited;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java
index ff41ee8e08..04e495083c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java
@@ -25,16 +25,20 @@
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
 import org.thoughtcrime.securesms.database.documents.NetworkFailure;
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList;
+import org.thoughtcrime.securesms.database.model.databaseprotos.CryptoValue;
 import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge;
 import org.thoughtcrime.securesms.database.model.databaseprotos.MessageExtras;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideDeck;
+import org.thoughtcrime.securesms.payments.CryptoValueUtil;
 import org.thoughtcrime.securesms.payments.Payment;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.whispersystems.signalservice.api.payments.FormatterOptions;
+import org.whispersystems.signalservice.api.payments.Money;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -219,6 +223,18 @@ public SpannableString getDisplayBody(@NonNull Context context) {
       return emphasisAdded(context.getString(R.string.MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported));
     } else if (isPaymentNotification() && payment != null) {
       return new SpannableString(context.getString(R.string.MessageRecord__payment_s, payment.getAmount().toString(FormatterOptions.defaults())));
+    } else if (isPaymentTombstone() || isPaymentNotification()) {
+      MessageExtras extras = getMessageExtras();
+
+      Money amount = null;
+      if (extras != null && extras.paymentTombstone != null && extras.paymentTombstone.amount != null) {
+        amount = CryptoValueUtil.cryptoValueToMoney(extras.paymentTombstone.amount);
+      }
+      if (amount == null) {
+        return new SpannableString(context.getString(R.string.MessageRecord__payment_tombstone));
+      } else {
+        return new SpannableString(context.getString(R.string.MessageRecord__payment_s, amount.toString(FormatterOptions.defaults())));
+      }
     }
 
     return super.getDisplayBody(context);
@@ -292,6 +308,19 @@ public long getScheduledDate() {
     return latestRevisionId;
   }
 
+  @Override
+  public boolean canDeleteSync() {
+    return (isSent() || MessageTypes.isInboxType(type)) &&
+           (isSecure() || isPush()) &&
+           (type & MessageTypes.GROUP_MASK) == 0 &&
+           (type & MessageTypes.KEY_EXCHANGE_MASK) == 0 &&
+           !isReportedSpam() &&
+           !isMessageRequestAccepted() &&
+           storyType == StoryType.NONE &&
+           getDateSent() > 0 &&
+           (parentStoryId == null || parentStoryId.isDirectReply());
+  }
+
   public @NonNull MmsMessageRecord withReactions(@NonNull List<ReactionRecord> reactions) {
     return new MmsMessageRecord(getId(), getFromRecipient(), getFromDeviceId(), getToRecipient(), getDateSent(), getDateReceived(), getServerTimestamp(), hasDeliveryReceipt(), getThreadId(), getBody(), getSlideDeck(),
                                 getType(), getIdentityKeyMismatches(), getNetworkFailures(), getSubscriptionId(), getExpiresIn(), getExpireStarted(), isViewOnce(),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/RecipientRecord.kt b/app/src/main/java/org/thoughtcrime/securesms/database/model/RecipientRecord.kt
index a42d8ee116..7d6953c650 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/RecipientRecord.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/RecipientRecord.kt
@@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.database.RecipientTable
 import org.thoughtcrime.securesms.database.RecipientTable.MentionSetting
 import org.thoughtcrime.securesms.database.RecipientTable.PhoneNumberSharingState
 import org.thoughtcrime.securesms.database.RecipientTable.RegisteredState
-import org.thoughtcrime.securesms.database.RecipientTable.UnidentifiedAccessMode
+import org.thoughtcrime.securesms.database.RecipientTable.SealedSenderAccessMode
 import org.thoughtcrime.securesms.database.RecipientTable.VibrateState
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.profiles.ProfileName
@@ -60,7 +60,7 @@ data class RecipientRecord(
   val profileSharing: Boolean,
   val lastProfileFetch: Long,
   val notificationChannel: String?,
-  val unidentifiedAccessMode: UnidentifiedAccessMode,
+  val sealedSenderAccessMode: SealedSenderAccessMode,
   val capabilities: Capabilities,
   val storageId: ByteArray?,
   val mentionSetting: MentionSetting,
@@ -119,7 +119,7 @@ data class RecipientRecord(
 
   data class Capabilities(
     val rawBits: Long,
-    val paymentActivation: Recipient.Capability
+    val deleteSync: Recipient.Capability
   ) {
     companion object {
       @JvmField
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/StoryViewState.kt b/app/src/main/java/org/thoughtcrime/securesms/database/model/StoryViewState.kt
index 8f6ee7de91..aede7ba98b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/StoryViewState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/StoryViewState.kt
@@ -4,7 +4,7 @@ import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.thoughtcrime.securesms.database.DatabaseObserver
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 
@@ -52,9 +52,9 @@ enum class StoryViewState {
           refresh()
         }
 
-        ApplicationDependencies.getDatabaseObserver().registerStoryObserver(recipientId, storyObserver)
+        AppDependencies.databaseObserver.registerStoryObserver(recipientId, storyObserver)
         emitter.setCancellable {
-          ApplicationDependencies.getDatabaseObserver().unregisterObserver(storyObserver)
+          AppDependencies.databaseObserver.unregisterObserver(storyObserver)
         }
 
         refresh()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountRepository.java b/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountRepository.java
index b421a2a3ea..0f4994fad3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountRepository.java
@@ -8,13 +8,13 @@
 
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository;
 import org.thoughtcrime.securesms.database.GroupTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.GroupRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupManager;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.subscription.Subscriber;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.whispersystems.signalservice.internal.EmptyResponse;
@@ -45,13 +45,13 @@ int getRegionCountryCode(@NonNull String region) {
 
   void deleteAccount(@NonNull Consumer<DeleteAccountEvent> onDeleteAccountEvent) {
     SignalExecutors.BOUNDED.execute(() -> {
-      if (SignalStore.signalDonationsValues().getSubscriber() != null) {
+      if (InAppPaymentsRepository.getSubscriber(InAppPaymentSubscriberRecord.Type.DONATION) != null) {
         Log.i(TAG, "deleteAccount: attempting to cancel subscription");
         onDeleteAccountEvent.accept(DeleteAccountEvent.CancelingSubscription.INSTANCE);
 
-        Subscriber                     subscriber                 = SignalStore.signalDonationsValues().requireSubscriber();
-        ServiceResponse<EmptyResponse> cancelSubscriptionResponse = ApplicationDependencies.getSignalDonationsService()
-                                                                                           .cancelSubscription(subscriber.getSubscriberId());
+        InAppPaymentSubscriberRecord subscriber = InAppPaymentsRepository.requireSubscriber(InAppPaymentSubscriberRecord.Type.DONATION);
+        ServiceResponse<EmptyResponse> cancelSubscriptionResponse = AppDependencies.getDonationsService()
+                                                                                   .cancelSubscription(subscriber.getSubscriberId());
 
         if (cancelSubscriptionResponse.getExecutionError().isPresent()) {
           Log.w(TAG, "deleteAccount: failed attempt to cancel subscription");
@@ -84,7 +84,7 @@ void deleteAccount(@NonNull Consumer<DeleteAccountEvent> onDeleteAccountEvent) {
         while (groupRecord != null) {
           if (groupRecord.getId().isPush() && groupRecord.isActive()) {
             if (!groupRecord.isV1Group()) {
-              GroupManager.leaveGroup(ApplicationDependencies.getApplication(), groupRecord.getId().requirePush(), true);
+              GroupManager.leaveGroup(AppDependencies.getApplication(), groupRecord.getId().requirePush(), true);
             }
             onDeleteAccountEvent.accept(new DeleteAccountEvent.LeaveGroupsProgress(groups.getCount(), ++groupsLeft));
           }
@@ -103,7 +103,7 @@ void deleteAccount(@NonNull Consumer<DeleteAccountEvent> onDeleteAccountEvent) {
       Log.i(TAG, "deleteAccount: attempting to delete account from server...");
 
       try {
-        ApplicationDependencies.getSignalServiceAccountManager().deleteAccount();
+        AppDependencies.getSignalServiceAccountManager().deleteAccount();
       } catch (IOException e) {
         Log.w(TAG, "deleteAccount: failed to delete account from signal service", e);
         onDeleteAccountEvent.accept(DeleteAccountEvent.ServerDeletionFailed.INSTANCE);
@@ -113,7 +113,7 @@ void deleteAccount(@NonNull Consumer<DeleteAccountEvent> onDeleteAccountEvent) {
       Log.i(TAG, "deleteAccount: successfully removed account from server");
       Log.i(TAG, "deleteAccount: attempting to delete user data and close process...");
 
-      if (!ServiceUtil.getActivityManager(ApplicationDependencies.getApplication()).clearApplicationUserData()) {
+      if (!ServiceUtil.getActivityManager(AppDependencies.getApplication()).clearApplicationUserData()) {
         Log.w(TAG, "deleteAccount: failed to delete user data");
         onDeleteAccountEvent.accept(DeleteAccountEvent.LocalDataDeletionFailed.INSTANCE);
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountViewModel.java
index ce4990059d..6b92a441f8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/delete/DeleteAccountViewModel.java
@@ -47,7 +47,7 @@ public DeleteAccountViewModel(@NonNull DeleteAccountRepository repository) {
     this.countryDisplayName = Transformations.map(regionCode, repository::getRegionDisplayName);
     this.filteredCountries  = Transformations.map(query, q -> Stream.of(allCountries).filter(country -> isMatch(q, country)).toList());
     this.events             = new SingleLiveEvent<>();
-    this.walletBalance      = Transformations.map(SignalStore.paymentsValues().liveMobileCoinBalance(),
+    this.walletBalance      = Transformations.map(SignalStore.payments().liveMobileCoinBalance(),
                                                   DeleteAccountViewModel::getFormattedWalletBalance);
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/dependencies/AppDependencies.kt b/app/src/main/java/org/thoughtcrime/securesms/dependencies/AppDependencies.kt
new file mode 100644
index 0000000000..16eac6b252
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/dependencies/AppDependencies.kt
@@ -0,0 +1,350 @@
+package org.thoughtcrime.securesms.dependencies
+
+import android.annotation.SuppressLint
+import android.app.Application
+import androidx.annotation.MainThread
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.subjects.BehaviorSubject
+import io.reactivex.rxjava3.subjects.Subject
+import okhttp3.OkHttpClient
+import org.signal.core.util.concurrent.DeadlockDetector
+import org.signal.core.util.resettableLazy
+import org.signal.libsignal.net.Network
+import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations
+import org.signal.libsignal.zkgroup.receipts.ClientZkReceiptOperations
+import org.thoughtcrime.securesms.ApplicationContext
+import org.thoughtcrime.securesms.components.TypingStatusRepository
+import org.thoughtcrime.securesms.components.TypingStatusSender
+import org.thoughtcrime.securesms.crypto.storage.SignalServiceDataStoreImpl
+import org.thoughtcrime.securesms.database.DatabaseObserver
+import org.thoughtcrime.securesms.database.PendingRetryReceiptCache
+import org.thoughtcrime.securesms.groups.GroupsV2Authorization
+import org.thoughtcrime.securesms.jobmanager.JobManager
+import org.thoughtcrime.securesms.megaphone.MegaphoneRepository
+import org.thoughtcrime.securesms.messages.IncomingMessageObserver
+import org.thoughtcrime.securesms.net.NetworkManager
+import org.thoughtcrime.securesms.notifications.MessageNotifier
+import org.thoughtcrime.securesms.payments.Payments
+import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess
+import org.thoughtcrime.securesms.recipients.LiveRecipientCache
+import org.thoughtcrime.securesms.revealable.ViewOnceMessageManager
+import org.thoughtcrime.securesms.service.DeletedCallEventManager
+import org.thoughtcrime.securesms.service.ExpiringMessageManager
+import org.thoughtcrime.securesms.service.ExpiringStoriesManager
+import org.thoughtcrime.securesms.service.PendingRetryReceiptManager
+import org.thoughtcrime.securesms.service.ScheduledMessageManager
+import org.thoughtcrime.securesms.service.TrimThreadsByDateManager
+import org.thoughtcrime.securesms.service.webrtc.SignalCallManager
+import org.thoughtcrime.securesms.util.AppForegroundObserver
+import org.thoughtcrime.securesms.util.EarlyMessageCache
+import org.thoughtcrime.securesms.util.FrameRateTracker
+import org.thoughtcrime.securesms.video.exo.GiphyMp4Cache
+import org.thoughtcrime.securesms.video.exo.SimpleExoPlayerPool
+import org.thoughtcrime.securesms.webrtc.audio.AudioManagerCompat
+import org.whispersystems.signalservice.api.SignalServiceAccountManager
+import org.whispersystems.signalservice.api.SignalServiceDataStore
+import org.whispersystems.signalservice.api.SignalServiceMessageReceiver
+import org.whispersystems.signalservice.api.SignalServiceMessageSender
+import org.whispersystems.signalservice.api.SignalWebSocket
+import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations
+import org.whispersystems.signalservice.api.services.CallLinksService
+import org.whispersystems.signalservice.api.services.DonationsService
+import org.whispersystems.signalservice.api.services.ProfileService
+import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState
+import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration
+import java.util.function.Supplier
+
+/**
+ * Location for storing and retrieving application-scoped singletons. Users must call
+ * [.init] before using any of the methods, preferably early on in
+ * [Application.onCreate].
+ *
+ * All future application-scoped singletons should be written as normal objects, then placed here
+ * to manage their singleton-ness.
+ */
+@SuppressLint("StaticFieldLeak")
+object AppDependencies {
+  // MOLLY: Ensure the app instance is always available for non-test runs, even before init() is called
+  private var _application: Application? = ApplicationContext.getInstance()
+  private lateinit var provider: Provider
+
+  // Needs special initialization because it needs to be created on the main thread
+  private lateinit var _appForegroundObserver: AppForegroundObserver
+
+  @JvmStatic
+  @MainThread
+  fun init(application: Application, provider: Provider) {
+    if (isInitialized) {
+      throw IllegalStateException("Already initialized!")
+    }
+
+    _application = application
+    AppDependencies.provider = provider
+
+    _appForegroundObserver = provider.provideAppForegroundObserver()
+    _appForegroundObserver.begin()
+  }
+
+  @JvmStatic
+  val isInitialized: Boolean
+    get() = this::provider.isInitialized
+
+  @JvmStatic
+  val application: Application
+    get() = _application!!
+
+  @JvmStatic
+  val appForegroundObserver: AppForegroundObserver
+    get() = _appForegroundObserver
+
+  @JvmStatic
+  val recipientCache: LiveRecipientCache by lazy {
+    provider.provideRecipientCache()
+  }
+
+  @JvmStatic
+  val jobManager: JobManager by lazy {
+    provider.provideJobManager()
+  }
+
+  @JvmStatic
+  val frameRateTracker: FrameRateTracker by lazy {
+    provider.provideFrameRateTracker()
+  }
+
+  @JvmStatic
+  val megaphoneRepository: MegaphoneRepository by lazy {
+    provider.provideMegaphoneRepository()
+  }
+
+  @JvmStatic
+  val earlyMessageCache: EarlyMessageCache by lazy {
+    provider.provideEarlyMessageCache()
+  }
+
+  @JvmStatic
+  val typingStatusRepository: TypingStatusRepository by lazy {
+    provider.provideTypingStatusRepository()
+  }
+
+  @JvmStatic
+  val typingStatusSender: TypingStatusSender by lazy {
+    provider.provideTypingStatusSender()
+  }
+
+  @JvmStatic
+  val databaseObserver: DatabaseObserver by lazy {
+    provider.provideDatabaseObserver()
+  }
+
+  @JvmStatic
+  val trimThreadsByDateManager: TrimThreadsByDateManager by lazy {
+    provider.provideTrimThreadsByDateManager()
+  }
+
+  @JvmStatic
+  val viewOnceMessageManager: ViewOnceMessageManager by lazy {
+    provider.provideViewOnceMessageManager()
+  }
+
+  @JvmStatic
+  val expiringMessageManager: ExpiringMessageManager by lazy {
+    provider.provideExpiringMessageManager()
+  }
+
+  @JvmStatic
+  val deletedCallEventManager: DeletedCallEventManager by lazy {
+    provider.provideDeletedCallEventManager()
+  }
+
+  @JvmStatic
+  val signalCallManager: SignalCallManager by lazy {
+    provider.provideSignalCallManager()
+  }
+
+  @JvmStatic
+  val pendingRetryReceiptManager: PendingRetryReceiptManager by lazy {
+    provider.providePendingRetryReceiptManager()
+  }
+
+  @JvmStatic
+  val pendingRetryReceiptCache: PendingRetryReceiptCache by lazy {
+    provider.providePendingRetryReceiptCache()
+  }
+
+  @JvmStatic
+  val messageNotifier: MessageNotifier by lazy {
+    provider.provideMessageNotifier()
+  }
+
+  @JvmStatic
+  val giphyMp4Cache: GiphyMp4Cache by lazy {
+    provider.provideGiphyMp4Cache()
+  }
+
+  @JvmStatic
+  val exoPlayerPool: SimpleExoPlayerPool by lazy {
+    provider.provideExoPlayerPool()
+  }
+
+  @JvmStatic
+  val deadlockDetector: DeadlockDetector by lazy {
+    provider.provideDeadlockDetector()
+  }
+
+  @JvmStatic
+  val expireStoriesManager: ExpiringStoriesManager by lazy {
+    provider.provideExpiringStoriesManager()
+  }
+
+  @JvmStatic
+  val scheduledMessageManager: ScheduledMessageManager by lazy {
+    provider.provideScheduledMessageManager()
+  }
+
+  @JvmStatic
+  val androidCallAudioManager: AudioManagerCompat by lazy {
+    provider.provideAndroidCallAudioManager()
+  }
+
+  private val _webSocketObserver: Subject<WebSocketConnectionState> = BehaviorSubject.create()
+
+  /**
+   * An observable that emits the current state of the WebSocket connection across the various lifecycles
+   * of the [signalWebSocket].
+   */
+  @JvmStatic
+  val webSocketObserver: Observable<WebSocketConnectionState> = _webSocketObserver
+
+  @JvmStatic
+  val networkManager: NetworkManager
+    get() = provider.provideNetworkManager()
+
+  private val _networkModule = resettableLazy {
+    NetworkDependenciesModule(application, provider, _webSocketObserver)
+  }
+  private val networkModule by _networkModule
+
+  @JvmStatic
+  val signalServiceNetworkAccess: SignalServiceNetworkAccess
+    get() = networkModule.signalServiceNetworkAccess
+
+  @JvmStatic
+  val protocolStore: SignalServiceDataStoreImpl
+    get() = networkModule.protocolStore
+
+  @JvmStatic
+  val signalServiceMessageSender: SignalServiceMessageSender
+    get() = networkModule.signalServiceMessageSender
+
+  @JvmStatic
+  val signalServiceAccountManager: SignalServiceAccountManager
+    get() = networkModule.signalServiceAccountManager
+
+  @JvmStatic
+  val signalServiceMessageReceiver: SignalServiceMessageReceiver
+    get() = networkModule.signalServiceMessageReceiver
+
+  @JvmStatic
+  val incomingMessageObserver: IncomingMessageObserver
+    get() = networkModule.incomingMessageObserver
+
+  @JvmStatic
+  val libsignalNetwork: Network
+    get() = networkModule.libsignalNetwork
+
+  @JvmStatic
+  val signalWebSocket: SignalWebSocket
+    get() = networkModule.signalWebSocket
+
+  @JvmStatic
+  val groupsV2Authorization: GroupsV2Authorization
+    get() = networkModule.groupsV2Authorization
+
+  @JvmStatic
+  val groupsV2Operations: GroupsV2Operations
+    get() = networkModule.groupsV2Operations
+
+  @JvmStatic
+  val clientZkReceiptOperations
+    get() = networkModule.clientZkReceiptOperations
+
+  @JvmStatic
+  val payments: Payments
+    get() = networkModule.payments
+
+  @JvmStatic
+  val callLinksService: CallLinksService
+    get() = networkModule.callLinksService
+
+  @JvmStatic
+  val profileService: ProfileService
+    get() = networkModule.profileService
+
+  @JvmStatic
+  val donationsService: DonationsService
+    get() = networkModule.donationsService
+
+  @JvmStatic
+  val okHttpClient: OkHttpClient
+    get() = networkModule.okHttpClient
+
+  @JvmStatic
+  val signalOkHttpClient: OkHttpClient
+    get() = networkModule.signalOkHttpClient
+
+  @JvmStatic
+  fun resetProtocolStores() {
+    networkModule.resetProtocolStores()
+  }
+
+  @JvmStatic
+  fun resetNetwork(restartMessageObserver: Boolean) {
+    networkModule.closeConnections()
+    _networkModule.reset()
+    if (restartMessageObserver) {
+      incomingMessageObserver
+    }
+  }
+
+  interface Provider {
+    fun provideGroupsV2Operations(signalServiceConfiguration: SignalServiceConfiguration): GroupsV2Operations
+    fun provideSignalServiceAccountManager(signalServiceConfiguration: SignalServiceConfiguration, groupsV2Operations: GroupsV2Operations): SignalServiceAccountManager
+    fun provideSignalServiceMessageSender(signalWebSocket: SignalWebSocket, protocolStore: SignalServiceDataStore, signalServiceConfiguration: SignalServiceConfiguration): SignalServiceMessageSender
+    fun provideSignalServiceMessageReceiver(signalServiceConfiguration: SignalServiceConfiguration): SignalServiceMessageReceiver
+    fun provideSignalServiceNetworkAccess(): SignalServiceNetworkAccess
+    fun provideRecipientCache(): LiveRecipientCache
+    fun provideJobManager(): JobManager
+    fun provideFrameRateTracker(): FrameRateTracker
+    fun provideMegaphoneRepository(): MegaphoneRepository
+    fun provideEarlyMessageCache(): EarlyMessageCache
+    fun provideMessageNotifier(): MessageNotifier
+    fun provideIncomingMessageObserver(): IncomingMessageObserver
+    fun provideTrimThreadsByDateManager(): TrimThreadsByDateManager
+    fun provideViewOnceMessageManager(): ViewOnceMessageManager
+    fun provideExpiringStoriesManager(): ExpiringStoriesManager
+    fun provideExpiringMessageManager(): ExpiringMessageManager
+    fun provideDeletedCallEventManager(): DeletedCallEventManager
+    fun provideTypingStatusRepository(): TypingStatusRepository
+    fun provideTypingStatusSender(): TypingStatusSender
+    fun provideDatabaseObserver(): DatabaseObserver
+    fun providePayments(signalServiceAccountManager: SignalServiceAccountManager): Payments
+    fun provideAppForegroundObserver(): AppForegroundObserver
+    fun provideSignalCallManager(): SignalCallManager
+    fun providePendingRetryReceiptManager(): PendingRetryReceiptManager
+    fun providePendingRetryReceiptCache(): PendingRetryReceiptCache
+    fun provideSignalWebSocket(signalServiceConfigurationSupplier: Supplier<SignalServiceConfiguration>, libSignalNetworkSupplier: Supplier<Network>): SignalWebSocket
+    fun provideProtocolStore(): SignalServiceDataStoreImpl
+    fun provideGiphyMp4Cache(): GiphyMp4Cache
+    fun provideExoPlayerPool(): SimpleExoPlayerPool
+    fun provideAndroidCallAudioManager(): AudioManagerCompat
+    fun provideDonationsService(signalServiceConfiguration: SignalServiceConfiguration, groupsV2Operations: GroupsV2Operations): DonationsService
+    fun provideCallLinksService(signalServiceConfiguration: SignalServiceConfiguration, groupsV2Operations: GroupsV2Operations): CallLinksService
+    fun provideProfileService(profileOperations: ClientZkProfileOperations, signalServiceMessageReceiver: SignalServiceMessageReceiver, signalWebSocket: SignalWebSocket): ProfileService
+    fun provideDeadlockDetector(): DeadlockDetector
+    fun provideClientZkReceiptOperations(signalServiceConfiguration: SignalServiceConfiguration): ClientZkReceiptOperations
+    fun provideScheduledMessageManager(): ScheduledMessageManager
+    fun provideNetworkManager(): NetworkManager
+    fun provideLibsignalNetwork(config: SignalServiceConfiguration): Network
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java
deleted file mode 100644
index 32dee80964..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java
+++ /dev/null
@@ -1,747 +0,0 @@
-package org.thoughtcrime.securesms.dependencies;
-
-import android.annotation.SuppressLint;
-import android.app.Application;
-
-import androidx.annotation.MainThread;
-import androidx.annotation.NonNull;
-
-import org.signal.core.util.concurrent.DeadlockDetector;
-import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations;
-import org.signal.libsignal.zkgroup.receipts.ClientZkReceiptOperations;
-import org.thoughtcrime.securesms.ApplicationContext;
-import org.thoughtcrime.securesms.components.TypingStatusRepository;
-import org.thoughtcrime.securesms.components.TypingStatusSender;
-import org.thoughtcrime.securesms.crypto.storage.SignalServiceDataStoreImpl;
-import org.thoughtcrime.securesms.database.DatabaseObserver;
-import org.thoughtcrime.securesms.database.PendingRetryReceiptCache;
-import org.thoughtcrime.securesms.groups.GroupsV2Authorization;
-import org.thoughtcrime.securesms.groups.GroupsV2AuthorizationMemoryValueCache;
-import org.thoughtcrime.securesms.jobmanager.JobManager;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.megaphone.MegaphoneRepository;
-import org.thoughtcrime.securesms.messages.IncomingMessageObserver;
-import org.thoughtcrime.securesms.net.NetworkManager;
-import org.thoughtcrime.securesms.net.Networking;
-import org.thoughtcrime.securesms.net.StandardUserAgentInterceptor;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
-import org.thoughtcrime.securesms.payments.Payments;
-import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
-import org.thoughtcrime.securesms.push.SignalServiceTrustStore;
-import org.thoughtcrime.securesms.recipients.LiveRecipientCache;
-import org.thoughtcrime.securesms.revealable.ViewOnceMessageManager;
-import org.thoughtcrime.securesms.service.DeletedCallEventManager;
-import org.thoughtcrime.securesms.service.ExpiringMessageManager;
-import org.thoughtcrime.securesms.service.ExpiringStoriesManager;
-import org.thoughtcrime.securesms.service.PendingRetryReceiptManager;
-import org.thoughtcrime.securesms.service.ScheduledMessageManager;
-import org.thoughtcrime.securesms.service.TrimThreadsByDateManager;
-import org.thoughtcrime.securesms.service.webrtc.SignalCallManager;
-import org.thoughtcrime.securesms.util.AppForegroundObserver;
-import org.thoughtcrime.securesms.util.EarlyMessageCache;
-import org.thoughtcrime.securesms.util.FrameRateTracker;
-import org.thoughtcrime.securesms.video.exo.ExoPlayerPool;
-import org.thoughtcrime.securesms.video.exo.GiphyMp4Cache;
-import org.thoughtcrime.securesms.video.exo.SimpleExoPlayerPool;
-import org.thoughtcrime.securesms.webrtc.audio.AudioManagerCompat;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
-import org.whispersystems.signalservice.api.SignalServiceDataStore;
-import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
-import org.whispersystems.signalservice.api.SignalServiceMessageSender;
-import org.whispersystems.signalservice.api.SignalWebSocket;
-import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
-import org.whispersystems.signalservice.api.push.TrustStore;
-import org.whispersystems.signalservice.api.services.CallLinksService;
-import org.whispersystems.signalservice.api.services.DonationsService;
-import org.whispersystems.signalservice.api.services.ProfileService;
-import org.whispersystems.signalservice.api.util.Tls12SocketFactory;
-import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
-import org.whispersystems.signalservice.internal.util.BlacklistingTrustManager;
-import org.whispersystems.signalservice.internal.util.Util;
-import org.whispersystems.signalservice.internal.websocket.LibSignalNetwork;
-
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-import java.util.function.Supplier;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-
-import okhttp3.ConnectionSpec;
-import okhttp3.OkHttpClient;
-
-/**
- * Location for storing and retrieving application-scoped singletons. Users must call
- * {@link #init(Application, Provider)} before using any of the methods, preferably early on in
- * {@link Application#onCreate()}.
- *
- * All future application-scoped singletons should be written as normal objects, then placed here
- * to manage their singleton-ness.
- */
-@SuppressLint("StaticFieldLeak")
-public class ApplicationDependencies {
-
-  private static final Object LOCK                    = new Object();
-  private static final Object FRAME_RATE_TRACKER_LOCK = new Object();
-  private static final Object JOB_MANAGER_LOCK        = new Object();
-  private static final Object SIGNAL_HTTP_CLIENT_LOCK = new Object();
-  private static final Object LIBSIGNAL_NETWORK_LOCK  = new Object();
-
-  private static Application           application;
-  // MOLLY: Rename provider to dependencyProvider
-  private static Provider              dependencyProvider;
-  private static AppForegroundObserver appForegroundObserver;
-
-  private static volatile SignalServiceAccountManager  accountManager;
-  private static volatile SignalServiceMessageSender   messageSender;
-  private static volatile SignalServiceMessageReceiver messageReceiver;
-  private static volatile NetworkManager               networkManager;
-  private static volatile IncomingMessageObserver      incomingMessageObserver;
-  private static volatile LiveRecipientCache           recipientCache;
-  private static volatile JobManager                   jobManager;
-  private static volatile FrameRateTracker             frameRateTracker;
-  private static volatile MegaphoneRepository          megaphoneRepository;
-  private static volatile GroupsV2Authorization        groupsV2Authorization;
-  private static volatile GroupsV2Operations           groupsV2Operations;
-  private static volatile EarlyMessageCache            earlyMessageCache;
-  private static volatile TypingStatusRepository       typingStatusRepository;
-  private static volatile TypingStatusSender           typingStatusSender;
-  private static volatile DatabaseObserver             databaseObserver;
-  private static volatile TrimThreadsByDateManager     trimThreadsByDateManager;
-  private static volatile ViewOnceMessageManager       viewOnceMessageManager;
-  private static volatile ExpiringStoriesManager       expiringStoriesManager;
-  private static volatile ExpiringMessageManager       expiringMessageManager;
-  private static volatile DeletedCallEventManager      deletedCallEventManager;
-  private static volatile Payments                     payments;
-  private static volatile SignalCallManager            signalCallManager;
-  private static volatile OkHttpClient                 okHttpClient;
-  private static volatile OkHttpClient                 signalOkHttpClient;
-  private static volatile PendingRetryReceiptManager   pendingRetryReceiptManager;
-  private static volatile PendingRetryReceiptCache     pendingRetryReceiptCache;
-  private static volatile SignalWebSocket              signalWebSocket;
-  private static volatile MessageNotifier              messageNotifier;
-  private static volatile SignalServiceDataStoreImpl   protocolStore;
-  private static volatile GiphyMp4Cache                giphyMp4Cache;
-  private static volatile SimpleExoPlayerPool          exoPlayerPool;
-  private static volatile AudioManagerCompat           audioManagerCompat;
-  private static volatile DonationsService             donationsService;
-  private static volatile CallLinksService             callLinksService;
-  private static volatile ProfileService               profileService;
-  private static volatile DeadlockDetector             deadlockDetector;
-  private static volatile ClientZkReceiptOperations    clientZkReceiptOperations;
-  private static volatile ScheduledMessageManager      scheduledMessagesManager;
-  private static volatile LibSignalNetwork             libsignalNetwork;
-
-  @MainThread
-  public static void init(@NonNull Application application, @NonNull Provider provider) {
-    synchronized (LOCK) {
-      if (ApplicationDependencies.dependencyProvider != null) {
-        throw new IllegalStateException("Already initialized!");
-      }
-
-      ApplicationDependencies.application           = application;
-      ApplicationDependencies.dependencyProvider    = provider;
-      ApplicationDependencies.appForegroundObserver = provider.provideAppForegroundObserver();
-
-      ApplicationDependencies.appForegroundObserver.begin();
-    }
-  }
-
-  public static boolean isInitialized() {
-    return ApplicationDependencies.dependencyProvider != null;
-  }
-
-  public static @NonNull Application getApplication() {
-    if (application == null) {
-      // MOLLY: Always returns the app instance for non-test runs,
-      // even before ApplicationDependencies is initialized
-      return ApplicationContext.getInstance();
-    }
-    return application;
-  }
-
-  public static @NonNull Provider getProvider() {
-    if (dependencyProvider == null) {
-      throw new IllegalStateException("ApplicationDependencies not initialized yet");
-    }
-    return dependencyProvider;
-  }
-
-  public static @NonNull SignalServiceAccountManager getSignalServiceAccountManager() {
-    SignalServiceAccountManager local = accountManager;
-
-    if (local != null) {
-      return local;
-    }
-
-    synchronized (LOCK) {
-      if (accountManager == null) {
-        accountManager = getProvider().provideSignalServiceAccountManager(getSignalServiceNetworkAccess().getConfiguration(), getGroupsV2Operations());
-      }
-      return accountManager;
-    }
-  }
-
-  public static @NonNull GroupsV2Authorization getGroupsV2Authorization() {
-    if (groupsV2Authorization == null) {
-      synchronized (LOCK) {
-        if (groupsV2Authorization == null) {
-          GroupsV2Authorization.ValueCache authCache = new GroupsV2AuthorizationMemoryValueCache(SignalStore.groupsV2AciAuthorizationCache());
-
-          groupsV2Authorization = new GroupsV2Authorization(getSignalServiceAccountManager().getGroupsV2Api(), authCache);
-        }
-      }
-    }
-
-    return groupsV2Authorization;
-  }
-
-  public static @NonNull GroupsV2Operations getGroupsV2Operations() {
-    if (groupsV2Operations == null) {
-      synchronized (LOCK) {
-        if (groupsV2Operations == null) {
-          groupsV2Operations = getProvider().provideGroupsV2Operations(getSignalServiceNetworkAccess().getConfiguration());
-        }
-      }
-    }
-
-    return groupsV2Operations;
-  }
-
-  public static @NonNull SignalServiceMessageSender getSignalServiceMessageSender() {
-    SignalServiceMessageSender local = messageSender;
-
-    if (local != null) {
-      return local;
-    }
-
-    synchronized (LOCK) {
-      if (messageSender == null) {
-        messageSender = getProvider().provideSignalServiceMessageSender(getSignalWebSocket(), getProtocolStore(), getSignalServiceNetworkAccess().getConfiguration());
-      }
-      return messageSender;
-    }
-  }
-
-  public static @NonNull SignalServiceMessageReceiver getSignalServiceMessageReceiver() {
-    synchronized (LOCK) {
-      if (messageReceiver == null) {
-        messageReceiver = getProvider().provideSignalServiceMessageReceiver(getSignalServiceNetworkAccess().getConfiguration());
-      }
-      return messageReceiver;
-    }
-  }
-
-  public static void resetSignalServiceMessageReceiver() {
-    synchronized (LOCK) {
-      messageReceiver = null;
-    }
-  }
-
-  public static void closeConnections() {
-    synchronized (LOCK) {
-      if (incomingMessageObserver != null) {
-        incomingMessageObserver.terminateAsync();
-      }
-
-      if (messageSender != null) {
-        messageSender.cancelInFlightRequests();
-      }
-
-      incomingMessageObserver = null;
-      messageReceiver         = null;
-      accountManager          = null;
-      messageSender           = null;
-    }
-  }
-
-  public static void restartAllNetworkConnections() {
-    synchronized (LOCK) {
-      closeConnections();
-      if (libsignalNetwork != null) {
-        libsignalNetwork.resetSettings(getSignalServiceNetworkAccess().getConfiguration());
-      }
-      if (signalWebSocket != null) {
-        signalWebSocket.forceNewWebSockets();
-      }
-    }
-    getIncomingMessageObserver();
-  }
-
-  public static @NonNull SignalServiceNetworkAccess getSignalServiceNetworkAccess() {
-    return getProvider().provideSignalServiceNetworkAccess();
-  }
-
-  public static @NonNull NetworkManager getNetworkManager() {
-    if (networkManager == null) {
-      synchronized (LOCK) {
-        if (networkManager == null) {
-          networkManager = getProvider().provideNetworkManager();
-        }
-      }
-    }
-
-    return networkManager;
-  }
-
-  public static @NonNull LiveRecipientCache getRecipientCache() {
-    if (recipientCache == null) {
-      synchronized (LOCK) {
-        if (recipientCache == null) {
-          recipientCache = getProvider().provideRecipientCache();
-        }
-      }
-    }
-
-    return recipientCache;
-  }
-
-  public static @NonNull JobManager getJobManager() {
-    if (jobManager == null) {
-      synchronized (JOB_MANAGER_LOCK) {
-        if (jobManager == null) {
-          jobManager = getProvider().provideJobManager();
-        }
-      }
-    }
-
-    return jobManager;
-  }
-
-  public static @NonNull FrameRateTracker getFrameRateTracker() {
-    if (frameRateTracker == null) {
-      synchronized (FRAME_RATE_TRACKER_LOCK) {
-        if (frameRateTracker == null) {
-          frameRateTracker = getProvider().provideFrameRateTracker();
-        }
-      }
-    }
-
-    return frameRateTracker;
-  }
-
-  public static @NonNull MegaphoneRepository getMegaphoneRepository() {
-    if (megaphoneRepository == null) {
-      synchronized (LOCK) {
-        if (megaphoneRepository == null) {
-          megaphoneRepository = getProvider().provideMegaphoneRepository();
-        }
-      }
-    }
-
-    return megaphoneRepository;
-  }
-
-  public static @NonNull EarlyMessageCache getEarlyMessageCache() {
-    if (earlyMessageCache == null) {
-      synchronized (LOCK) {
-        if (earlyMessageCache == null) {
-          earlyMessageCache = getProvider().provideEarlyMessageCache();
-        }
-      }
-    }
-
-    return earlyMessageCache;
-  }
-
-  public static @NonNull MessageNotifier getMessageNotifier() {
-    if (messageNotifier == null) {
-      synchronized (LOCK) {
-        if (messageNotifier == null) {
-          messageNotifier = getProvider().provideMessageNotifier();
-        }
-      }
-    }
-    return messageNotifier;
-  }
-
-  public static @NonNull IncomingMessageObserver getIncomingMessageObserver() {
-    IncomingMessageObserver local = incomingMessageObserver;
-
-    if (local != null) {
-      return local;
-    }
-
-    synchronized (LOCK) {
-      if (incomingMessageObserver == null) {
-        incomingMessageObserver = getProvider().provideIncomingMessageObserver();
-      }
-      return incomingMessageObserver;
-    }
-  }
-
-  public static @NonNull TrimThreadsByDateManager getTrimThreadsByDateManager() {
-    if (trimThreadsByDateManager == null) {
-      synchronized (LOCK) {
-        if (trimThreadsByDateManager == null) {
-          trimThreadsByDateManager = getProvider().provideTrimThreadsByDateManager();
-        }
-      }
-    }
-
-    return trimThreadsByDateManager;
-  }
-
-  public static @NonNull ViewOnceMessageManager getViewOnceMessageManager() {
-    if (viewOnceMessageManager == null) {
-      synchronized (LOCK) {
-        if (viewOnceMessageManager == null) {
-          viewOnceMessageManager = getProvider().provideViewOnceMessageManager();
-        }
-      }
-    }
-
-    return viewOnceMessageManager;
-  }
-
-  public static @NonNull ExpiringStoriesManager getExpireStoriesManager() {
-    if (expiringStoriesManager == null) {
-      synchronized (LOCK) {
-        if (expiringStoriesManager == null) {
-          expiringStoriesManager = getProvider().provideExpiringStoriesManager();
-        }
-      }
-    }
-
-    return expiringStoriesManager;
-  }
-
-  public static @NonNull PendingRetryReceiptManager getPendingRetryReceiptManager() {
-    if (pendingRetryReceiptManager == null) {
-      synchronized (LOCK) {
-        if (pendingRetryReceiptManager == null) {
-          pendingRetryReceiptManager = getProvider().providePendingRetryReceiptManager();
-        }
-      }
-    }
-
-    return pendingRetryReceiptManager;
-  }
-
-  public static @NonNull ExpiringMessageManager getExpiringMessageManager() {
-    if (expiringMessageManager == null) {
-      synchronized (LOCK) {
-        if (expiringMessageManager == null) {
-          expiringMessageManager = getProvider().provideExpiringMessageManager();
-        }
-      }
-    }
-
-    return expiringMessageManager;
-  }
-
-  public static @NonNull DeletedCallEventManager getDeletedCallEventManager() {
-    if (deletedCallEventManager == null) {
-      synchronized (LOCK) {
-        if (deletedCallEventManager == null) {
-          deletedCallEventManager = getProvider().provideDeletedCallEventManager();
-        }
-      }
-    }
-
-    return deletedCallEventManager;
-  }
-
-  public static @NonNull ScheduledMessageManager getScheduledMessageManager() {
-    if (scheduledMessagesManager == null) {
-      synchronized (LOCK) {
-        if (scheduledMessagesManager == null) {
-          scheduledMessagesManager = getProvider().provideScheduledMessageManager();
-        }
-      }
-    }
-
-    return scheduledMessagesManager;
-  }
-
-  public static TypingStatusRepository getTypingStatusRepository() {
-    if (typingStatusRepository == null) {
-      synchronized (LOCK) {
-        if (typingStatusRepository == null) {
-          typingStatusRepository = getProvider().provideTypingStatusRepository();
-        }
-      }
-    }
-
-    return typingStatusRepository;
-  }
-
-  public static TypingStatusSender getTypingStatusSender() {
-    if (typingStatusSender == null) {
-      synchronized (LOCK) {
-        if (typingStatusSender == null) {
-          typingStatusSender = getProvider().provideTypingStatusSender();
-        }
-      }
-    }
-
-    return typingStatusSender;
-  }
-
-  public static @NonNull DatabaseObserver getDatabaseObserver() {
-    if (databaseObserver == null) {
-      synchronized (LOCK) {
-        if (databaseObserver == null) {
-          databaseObserver = getProvider().provideDatabaseObserver();
-        }
-      }
-    }
-
-    return databaseObserver;
-  }
-
-  public static @NonNull Payments getPayments() {
-    if (payments == null) {
-      synchronized (LOCK) {
-        if (payments == null) {
-          payments = getProvider().providePayments(getSignalServiceAccountManager());
-        }
-      }
-    }
-
-    return payments;
-  }
-
-  public static @NonNull SignalCallManager getSignalCallManager() {
-    if (signalCallManager == null) {
-      synchronized (LOCK) {
-        if (signalCallManager == null) {
-          signalCallManager = getProvider().provideSignalCallManager();
-        }
-      }
-    }
-
-    return signalCallManager;
-  }
-
-  public static @NonNull OkHttpClient getOkHttpClient() {
-    if (okHttpClient == null) {
-      synchronized (LOCK) {
-        if (okHttpClient == null) {
-          okHttpClient = new OkHttpClient.Builder()
-              .socketFactory(Networking.getSocketFactory())
-              .proxySelector(Networking.getProxySelectorForSocks())
-              .dns(Networking.getDns())
-              .addInterceptor(new StandardUserAgentInterceptor())
-              .build();
-        }
-      }
-    }
-
-    return okHttpClient;
-  }
-
-  public static @NonNull OkHttpClient getSignalOkHttpClient() {
-    if (signalOkHttpClient == null) {
-      synchronized (SIGNAL_HTTP_CLIENT_LOCK) {
-        if (signalOkHttpClient == null) {
-          try {
-            OkHttpClient   baseClient    = ApplicationDependencies.getOkHttpClient();
-            SSLContext     sslContext    = SSLContext.getInstance("TLS");
-            TrustStore     trustStore    = new SignalServiceTrustStore(ApplicationDependencies.getApplication());
-            TrustManager[] trustManagers = BlacklistingTrustManager.createFor(trustStore);
-
-            sslContext.init(null, trustManagers, null);
-
-            signalOkHttpClient = baseClient.newBuilder()
-                                           .sslSocketFactory(new Tls12SocketFactory(sslContext.getSocketFactory()), (X509TrustManager) trustManagers[0])
-                                           .connectionSpecs(Util.immutableList(ConnectionSpec.RESTRICTED_TLS))
-                                           .build();
-          } catch (NoSuchAlgorithmException | KeyManagementException e) {
-            throw new AssertionError(e);
-          }
-        }
-      }
-    }
-
-    return signalOkHttpClient;
-  }
-
-  public static @NonNull AppForegroundObserver getAppForegroundObserver() {
-    return appForegroundObserver;
-  }
-
-  public static @NonNull PendingRetryReceiptCache getPendingRetryReceiptCache() {
-    if (pendingRetryReceiptCache == null) {
-      synchronized (LOCK) {
-        if (pendingRetryReceiptCache == null) {
-          pendingRetryReceiptCache = getProvider().providePendingRetryReceiptCache();
-        }
-      }
-    }
-
-    return pendingRetryReceiptCache;
-  }
-
-  public static @NonNull SignalWebSocket getSignalWebSocket() {
-    if (signalWebSocket == null) {
-      synchronized (LOCK) {
-        if (signalWebSocket == null) {
-          signalWebSocket = getProvider().provideSignalWebSocket(() -> getSignalServiceNetworkAccess().getConfiguration(), ApplicationDependencies::getLibsignalNetwork);
-        }
-      }
-    }
-    return signalWebSocket;
-  }
-
-  public static @NonNull SignalServiceDataStoreImpl getProtocolStore() {
-    if (protocolStore == null) {
-      synchronized (LOCK) {
-        if (protocolStore == null) {
-          protocolStore = getProvider().provideProtocolStore();
-        }
-      }
-    }
-
-    return protocolStore;
-  }
-
-  public static void resetProtocolStores() {
-    synchronized (LOCK) {
-      protocolStore = null;
-    }
-  }
-
-  public static @NonNull GiphyMp4Cache getGiphyMp4Cache() {
-    if (giphyMp4Cache == null) {
-      synchronized (LOCK) {
-        if (giphyMp4Cache == null) {
-          giphyMp4Cache = getProvider().provideGiphyMp4Cache();
-        }
-      }
-    }
-    return giphyMp4Cache;
-  }
-
-  public static @NonNull ExoPlayerPool getExoPlayerPool() {
-    if (exoPlayerPool == null) {
-      synchronized (LOCK) {
-        if (exoPlayerPool == null) {
-          exoPlayerPool = getProvider().provideExoPlayerPool();
-        }
-      }
-    }
-    return exoPlayerPool;
-  }
-
-  public static @NonNull AudioManagerCompat getAndroidCallAudioManager() {
-    if (audioManagerCompat == null) {
-      synchronized (LOCK) {
-        if (audioManagerCompat == null) {
-          audioManagerCompat = getProvider().provideAndroidCallAudioManager();
-        }
-      }
-    }
-    return audioManagerCompat;
-  }
-
-  public static @NonNull DonationsService getSignalDonationsService() {
-    if (donationsService == null) {
-      synchronized (LOCK) {
-        if (donationsService == null) {
-          donationsService = getProvider().provideSignalDonationsService(getSignalServiceNetworkAccess().getConfiguration(), getGroupsV2Operations());
-        }
-      }
-    }
-    return donationsService;
-  }
-
-  public static @NonNull CallLinksService getCallLinksService() {
-    if (callLinksService == null) {
-      synchronized (LOCK) {
-        if (callLinksService == null) {
-          callLinksService = getProvider().provideCallLinksService(getSignalServiceNetworkAccess().getConfiguration(), getGroupsV2Operations());
-        }
-      }
-    }
-    return callLinksService;
-  }
-
-  public static @NonNull ProfileService getProfileService() {
-    if (profileService == null) {
-      synchronized (LOCK) {
-        if (profileService == null) {
-          profileService = getProvider().provideProfileService(ApplicationDependencies.getGroupsV2Operations().getProfileOperations(),
-                                                          ApplicationDependencies.getSignalServiceMessageReceiver(),
-                                                          ApplicationDependencies.getSignalWebSocket());
-        }
-      }
-    }
-    return profileService;
-  }
-
-  public static @NonNull ClientZkReceiptOperations getClientZkReceiptOperations() {
-    if (clientZkReceiptOperations == null) {
-      synchronized (LOCK) {
-        if (clientZkReceiptOperations == null) {
-          clientZkReceiptOperations = getProvider().provideClientZkReceiptOperations(getSignalServiceNetworkAccess().getConfiguration());
-        }
-      }
-    }
-    return clientZkReceiptOperations;
-  }
-
-  public static @NonNull DeadlockDetector getDeadlockDetector() {
-    if (deadlockDetector == null) {
-      synchronized (LOCK) {
-        if (deadlockDetector == null) {
-          deadlockDetector = getProvider().provideDeadlockDetector();
-        }
-      }
-    }
-    return deadlockDetector;
-  }
-
-  public static @NonNull LibSignalNetwork getLibsignalNetwork() {
-    if (libsignalNetwork == null) {
-      synchronized (LIBSIGNAL_NETWORK_LOCK) {
-        if (libsignalNetwork == null) {
-          libsignalNetwork = getProvider().provideLibsignalNetwork(getSignalServiceNetworkAccess().getConfiguration());
-        }
-      }
-    }
-    return libsignalNetwork;
-  }
-
-  public interface Provider {
-    @NonNull GroupsV2Operations provideGroupsV2Operations(@NonNull SignalServiceConfiguration signalServiceConfiguration);
-    @NonNull SignalServiceAccountManager provideSignalServiceAccountManager(@NonNull SignalServiceConfiguration signalServiceConfiguration, @NonNull GroupsV2Operations groupsV2Operations);
-    @NonNull SignalServiceMessageSender provideSignalServiceMessageSender(@NonNull SignalWebSocket signalWebSocket, @NonNull SignalServiceDataStore protocolStore, @NonNull SignalServiceConfiguration signalServiceConfiguration);
-    @NonNull SignalServiceMessageReceiver provideSignalServiceMessageReceiver(@NonNull SignalServiceConfiguration signalServiceConfiguration);
-    @NonNull SignalServiceNetworkAccess provideSignalServiceNetworkAccess();
-    @NonNull NetworkManager provideNetworkManager();
-    @NonNull LiveRecipientCache provideRecipientCache();
-    @NonNull JobManager provideJobManager();
-    @NonNull FrameRateTracker provideFrameRateTracker();
-    @NonNull MegaphoneRepository provideMegaphoneRepository();
-    @NonNull EarlyMessageCache provideEarlyMessageCache();
-    @NonNull MessageNotifier provideMessageNotifier();
-    @NonNull IncomingMessageObserver provideIncomingMessageObserver();
-    @NonNull TrimThreadsByDateManager provideTrimThreadsByDateManager();
-    @NonNull ViewOnceMessageManager provideViewOnceMessageManager();
-    @NonNull ExpiringStoriesManager provideExpiringStoriesManager();
-    @NonNull ExpiringMessageManager provideExpiringMessageManager();
-    @NonNull DeletedCallEventManager provideDeletedCallEventManager();
-    @NonNull TypingStatusRepository provideTypingStatusRepository();
-    @NonNull TypingStatusSender provideTypingStatusSender();
-    @NonNull DatabaseObserver provideDatabaseObserver();
-    @NonNull Payments providePayments(@NonNull SignalServiceAccountManager signalServiceAccountManager);
-    @NonNull AppForegroundObserver provideAppForegroundObserver();
-    @NonNull SignalCallManager provideSignalCallManager();
-    @NonNull PendingRetryReceiptManager providePendingRetryReceiptManager();
-    @NonNull PendingRetryReceiptCache providePendingRetryReceiptCache();
-    @NonNull SignalWebSocket provideSignalWebSocket(@NonNull Supplier<SignalServiceConfiguration> signalServiceConfigurationSupplier, @NonNull Supplier<LibSignalNetwork> libSignalNetworkSupplier);
-    @NonNull SignalServiceDataStoreImpl provideProtocolStore();
-    @NonNull GiphyMp4Cache provideGiphyMp4Cache();
-    @NonNull SimpleExoPlayerPool provideExoPlayerPool();
-    @NonNull AudioManagerCompat provideAndroidCallAudioManager();
-    @NonNull DonationsService provideSignalDonationsService(@NonNull SignalServiceConfiguration signalServiceConfiguration, @NonNull GroupsV2Operations groupsV2Operations);
-    @NonNull CallLinksService provideCallLinksService(@NonNull SignalServiceConfiguration signalServiceConfiguration, @NonNull GroupsV2Operations groupsV2Operations);
-    @NonNull ProfileService provideProfileService(@NonNull ClientZkProfileOperations profileOperations, @NonNull SignalServiceMessageReceiver signalServiceMessageReceiver, @NonNull SignalWebSocket signalWebSocket);
-    @NonNull DeadlockDetector provideDeadlockDetector();
-    @NonNull ClientZkReceiptOperations provideClientZkReceiptOperations(@NonNull SignalServiceConfiguration signalServiceConfiguration);
-    @NonNull ScheduledMessageManager provideScheduledMessageManager();
-    @NonNull LibSignalNetwork provideLibsignalNetwork(@NonNull SignalServiceConfiguration config);
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java
index a8d384ce75..5f89c16c84 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java
@@ -69,7 +69,7 @@
 import org.thoughtcrime.securesms.util.AppForegroundObserver;
 import org.thoughtcrime.securesms.util.ByteUnit;
 import org.thoughtcrime.securesms.util.EarlyMessageCache;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.FrameRateTracker;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.video.exo.GiphyMp4Cache;
@@ -92,7 +92,7 @@
 import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
 import org.whispersystems.signalservice.api.websocket.WebSocketFactory;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
-import org.whispersystems.signalservice.internal.websocket.LibSignalNetwork;
+import org.whispersystems.signalservice.internal.websocket.LibSignalNetworkExtensions;
 import org.whispersystems.signalservice.internal.websocket.ShadowingWebSocketConnection;
 import org.whispersystems.signalservice.internal.websocket.WebSocketConnection;
 import org.whispersystems.signalservice.internal.websocket.LibSignalChatConnection;
@@ -104,9 +104,9 @@
 import java.util.function.Supplier;
 
 /**
- * Implementation of {@link ApplicationDependencies.Provider} that provides real app dependencies.
+ * Implementation of {@link AppDependencies.Provider} that provides real app dependencies.
  */
-public class ApplicationDependencyProvider implements ApplicationDependencies.Provider {
+public class ApplicationDependencyProvider implements AppDependencies.Provider {
 
   private final Application context;
 
@@ -120,7 +120,7 @@ public ApplicationDependencyProvider(@NonNull Application context) {
 
   @Override
   public @NonNull GroupsV2Operations provideGroupsV2Operations(@NonNull SignalServiceConfiguration signalServiceConfiguration) {
-    return new GroupsV2Operations(provideClientZkOperations(signalServiceConfiguration), FeatureFlags.groupLimits().getHardLimit());
+    return new GroupsV2Operations(provideClientZkOperations(signalServiceConfiguration), RemoteConfig.groupLimits().getHardLimit());
   }
 
   @Override
@@ -129,7 +129,7 @@ public ApplicationDependencyProvider(@NonNull Application context) {
                                            new DynamicCredentialsProvider(),
                                            BuildConfig.SIGNAL_AGENT,
                                            groupsV2Operations,
-                                           FeatureFlags.okHttpAutomaticRetry());
+                                           RemoteConfig.okHttpAutomaticRetry());
   }
 
   @Override
@@ -144,8 +144,7 @@ public ApplicationDependencyProvider(@NonNull Application context) {
                                             provideGroupsV2Operations(signalServiceConfiguration).getProfileOperations(),
                                             SignalExecutors.newCachedBoundedExecutor("signal-messages", ThreadUtil.PRIORITY_IMPORTANT_BACKGROUND_THREAD, 1, 16, 30),
                                             ByteUnit.KILOBYTES.toBytes(256),
-                                            FeatureFlags.okHttpAutomaticRetry(),
-                                            FeatureFlags.useRxMessageSending());
+                                            RemoteConfig.okHttpAutomaticRetry());
   }
 
   @Override
@@ -154,7 +153,7 @@ public ApplicationDependencyProvider(@NonNull Application context) {
                                             new DynamicCredentialsProvider(),
                                             BuildConfig.SIGNAL_AGENT,
                                             provideGroupsV2Operations(signalServiceConfiguration).getProfileOperations(),
-                                            FeatureFlags.okHttpAutomaticRetry());
+                                            RemoteConfig.okHttpAutomaticRetry());
   }
 
   @Override
@@ -242,8 +241,10 @@ public ApplicationDependencyProvider(@NonNull Application context) {
   }
 
   @Override
-  public @NonNull LibSignalNetwork provideLibsignalNetwork(@NonNull SignalServiceConfiguration config) {
-    return new LibSignalNetwork(new Network(BuildConfig.LIBSIGNAL_NET_ENV, StandardUserAgentInterceptor.USER_AGENT), config);
+  public @NonNull Network provideLibsignalNetwork(@NonNull SignalServiceConfiguration config) {
+    Network network = new Network(BuildConfig.LIBSIGNAL_NET_ENV, StandardUserAgentInterceptor.USER_AGENT);
+    LibSignalNetworkExtensions.applyConfiguration(network, config);
+    return network;
   }
 
   @Override
@@ -294,8 +295,8 @@ public ApplicationDependencyProvider(@NonNull Application context) {
   }
 
   @Override
-  public @NonNull SignalWebSocket provideSignalWebSocket(@NonNull Supplier<SignalServiceConfiguration> signalServiceConfigurationSupplier, @NonNull Supplier<LibSignalNetwork> libSignalNetworkSupplier) {
-    SleepTimer                   sleepTimer      = !SignalStore.account().isPushAvailable() || SignalStore.internalValues().isWebsocketModeForced() ? new AlarmSleepTimer(context) : new UptimeSleepTimer() ;
+  public @NonNull SignalWebSocket provideSignalWebSocket(@NonNull Supplier<SignalServiceConfiguration> signalServiceConfigurationSupplier, @NonNull Supplier<Network> libSignalNetworkSupplier) {
+    SleepTimer                   sleepTimer      = !SignalStore.account().isPushAvailable() || SignalStore.internal().isWebsocketModeForced() ? new AlarmSleepTimer(context) : new UptimeSleepTimer() ;
     SignalWebSocketHealthMonitor healthMonitor   = new SignalWebSocketHealthMonitor(context, sleepTimer);
     WebSocketShadowingBridge     bridge          = new DefaultWebSocketShadowingBridge(context);
     SignalWebSocket              signalWebSocket = new SignalWebSocket(provideWebSocketFactory(signalServiceConfigurationSupplier, healthMonitor, libSignalNetworkSupplier, bridge));
@@ -368,12 +369,12 @@ public ApplicationDependencyProvider(@NonNull Application context) {
   }
 
   @Override
-  public @NonNull DonationsService provideSignalDonationsService(@NonNull SignalServiceConfiguration signalServiceConfiguration, @NonNull GroupsV2Operations groupsV2Operations) {
+  public @NonNull DonationsService provideDonationsService(@NonNull SignalServiceConfiguration signalServiceConfiguration, @NonNull GroupsV2Operations groupsV2Operations) {
     return new DonationsService(signalServiceConfiguration,
                                 new DynamicCredentialsProvider(),
                                 BuildConfig.SIGNAL_AGENT,
                                 groupsV2Operations,
-                                FeatureFlags.okHttpAutomaticRetry());
+                                RemoteConfig.okHttpAutomaticRetry());
   }
 
   @Override
@@ -382,7 +383,7 @@ public ApplicationDependencyProvider(@NonNull Application context) {
                                 new DynamicCredentialsProvider(),
                                 BuildConfig.SIGNAL_AGENT,
                                 groupsV2Operations,
-                                FeatureFlags.okHttpAutomaticRetry());
+                                RemoteConfig.okHttpAutomaticRetry());
   }
 
   @Override
@@ -407,7 +408,7 @@ public ApplicationDependencyProvider(@NonNull Application context) {
 
   @NonNull WebSocketFactory provideWebSocketFactory(@NonNull Supplier<SignalServiceConfiguration> signalServiceConfigurationSupplier,
                                                     @NonNull SignalWebSocketHealthMonitor healthMonitor,
-                                                    @NonNull Supplier<LibSignalNetwork> libSignalNetworkSupplier,
+                                                    @NonNull Supplier<Network> libSignalNetworkSupplier,
                                                     @NonNull WebSocketShadowingBridge bridge)
   {
     return new WebSocketFactory() {
@@ -423,7 +424,7 @@ public WebSocketConnection createWebSocket() {
 
       @Override
       public WebSocketConnection createUnidentifiedWebSocket() {
-        int shadowPercentage = FeatureFlags.libSignalWebSocketShadowingPercentage();
+        int shadowPercentage = RemoteConfig.libSignalWebSocketShadowingPercentage();
         if (shadowPercentage > 0) {
           return new ShadowingWebSocketConnection(
               "unauth-shadow",
@@ -432,16 +433,16 @@ public WebSocketConnection createUnidentifiedWebSocket() {
               BuildConfig.SIGNAL_AGENT,
               healthMonitor,
               Stories.isFeatureEnabled(),
-              libSignalNetworkSupplier.get().createChatService(null),
+              LibSignalNetworkExtensions.createChatService(libSignalNetworkSupplier.get(), null),
               shadowPercentage,
               bridge
           );
         }
-        if (FeatureFlags.libSignalWebSocketEnabled()) {
-          LibSignalNetwork network = libSignalNetworkSupplier.get();
+        if (RemoteConfig.libSignalWebSocketEnabled()) {
+          Network network = libSignalNetworkSupplier.get();
           return new LibSignalChatConnection(
               "libsignal-unauth",
-              network.createChatService(null),
+              LibSignalNetworkExtensions.createChatService(network, null),
               healthMonitor,
               false);
         } else {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/dependencies/NetworkDependenciesModule.kt b/app/src/main/java/org/thoughtcrime/securesms/dependencies/NetworkDependenciesModule.kt
new file mode 100644
index 0000000000..81a013dd34
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/dependencies/NetworkDependenciesModule.kt
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.dependencies
+
+import android.app.Application
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.plusAssign
+import io.reactivex.rxjava3.subjects.Subject
+import okhttp3.ConnectionSpec
+import okhttp3.OkHttpClient
+import org.signal.core.util.resettableLazy
+import org.signal.libsignal.net.Network
+import org.signal.libsignal.zkgroup.receipts.ClientZkReceiptOperations
+import org.thoughtcrime.securesms.crypto.storage.SignalServiceDataStoreImpl
+import org.thoughtcrime.securesms.groups.GroupsV2Authorization
+import org.thoughtcrime.securesms.groups.GroupsV2AuthorizationMemoryValueCache
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.messages.IncomingMessageObserver
+import org.thoughtcrime.securesms.net.Networking
+import org.thoughtcrime.securesms.net.StandardUserAgentInterceptor
+import org.thoughtcrime.securesms.payments.Payments
+import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess
+import org.thoughtcrime.securesms.push.SignalServiceTrustStore
+import org.whispersystems.signalservice.api.SignalServiceAccountManager
+import org.whispersystems.signalservice.api.SignalServiceMessageReceiver
+import org.whispersystems.signalservice.api.SignalServiceMessageSender
+import org.whispersystems.signalservice.api.SignalWebSocket
+import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations
+import org.whispersystems.signalservice.api.push.TrustStore
+import org.whispersystems.signalservice.api.services.CallLinksService
+import org.whispersystems.signalservice.api.services.DonationsService
+import org.whispersystems.signalservice.api.services.ProfileService
+import org.whispersystems.signalservice.api.util.Tls12SocketFactory
+import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState
+import org.whispersystems.signalservice.internal.util.BlacklistingTrustManager
+import org.whispersystems.signalservice.internal.util.Util
+import java.security.KeyManagementException
+import java.security.NoSuchAlgorithmException
+import javax.net.ssl.SSLContext
+import javax.net.ssl.X509TrustManager
+
+/**
+ * A subset of [AppDependencies] that relies on the network. We bundle them together because when the network
+ * needs to get reset, we just throw out the whole thing and recreate it.
+ */
+class NetworkDependenciesModule(
+  private val application: Application,
+  private val provider: AppDependencies.Provider,
+  private val webSocketStateSubject: Subject<WebSocketConnectionState>
+) {
+
+  private val disposables: CompositeDisposable = CompositeDisposable()
+
+  val signalServiceNetworkAccess: SignalServiceNetworkAccess by lazy {
+    provider.provideSignalServiceNetworkAccess()
+  }
+
+  private val _protocolStore = resettableLazy {
+    provider.provideProtocolStore()
+  }
+  val protocolStore: SignalServiceDataStoreImpl by _protocolStore
+
+  private val _signalServiceMessageSender = resettableLazy {
+    provider.provideSignalServiceMessageSender(signalWebSocket, protocolStore, signalServiceNetworkAccess.getConfiguration())
+  }
+  val signalServiceMessageSender: SignalServiceMessageSender by _signalServiceMessageSender
+
+  val incomingMessageObserver: IncomingMessageObserver by lazy {
+    provider.provideIncomingMessageObserver()
+  }
+
+  val signalServiceAccountManager: SignalServiceAccountManager by lazy {
+    provider.provideSignalServiceAccountManager(signalServiceNetworkAccess.getConfiguration(), groupsV2Operations)
+  }
+
+  val libsignalNetwork: Network by lazy {
+    provider.provideLibsignalNetwork(signalServiceNetworkAccess.getConfiguration())
+  }
+
+  val signalWebSocket: SignalWebSocket by lazy {
+    provider.provideSignalWebSocket({ signalServiceNetworkAccess.getConfiguration() }, { libsignalNetwork }).also {
+      disposables += it.webSocketState.subscribe { webSocketStateSubject.onNext(it) }
+    }
+  }
+
+  val groupsV2Authorization: GroupsV2Authorization by lazy {
+    val authCache: GroupsV2Authorization.ValueCache = GroupsV2AuthorizationMemoryValueCache(SignalStore.groupsV2AciAuthorizationCache)
+    GroupsV2Authorization(signalServiceAccountManager.groupsV2Api, authCache)
+  }
+
+  val groupsV2Operations: GroupsV2Operations by lazy {
+    provider.provideGroupsV2Operations(signalServiceNetworkAccess.getConfiguration())
+  }
+
+  val clientZkReceiptOperations: ClientZkReceiptOperations by lazy {
+    provider.provideClientZkReceiptOperations(signalServiceNetworkAccess.getConfiguration())
+  }
+
+  val signalServiceMessageReceiver: SignalServiceMessageReceiver by lazy {
+    provider.provideSignalServiceMessageReceiver(signalServiceNetworkAccess.getConfiguration())
+  }
+
+  val payments: Payments by lazy {
+    provider.providePayments(signalServiceAccountManager)
+  }
+
+  val callLinksService: CallLinksService by lazy {
+    provider.provideCallLinksService(signalServiceNetworkAccess.getConfiguration(), groupsV2Operations)
+  }
+
+  val profileService: ProfileService by lazy {
+    provider.provideProfileService(groupsV2Operations.profileOperations, signalServiceMessageReceiver, signalWebSocket)
+  }
+
+  val donationsService: DonationsService by lazy {
+    provider.provideDonationsService(signalServiceNetworkAccess.getConfiguration(), groupsV2Operations)
+  }
+
+  val okHttpClient: OkHttpClient by lazy {
+    OkHttpClient.Builder()
+      .socketFactory(Networking.socketFactory)
+      .proxySelector(Networking.proxySelectorForSocks)
+      .dns(Networking.dns)
+      .addInterceptor(StandardUserAgentInterceptor())
+      .build()
+  }
+
+  val signalOkHttpClient: OkHttpClient by lazy {
+    try {
+      val baseClient = okHttpClient
+      val sslContext = SSLContext.getInstance("TLS")
+      val trustStore: TrustStore = SignalServiceTrustStore(application)
+      val trustManagers = BlacklistingTrustManager.createFor(trustStore)
+
+      sslContext.init(null, trustManagers, null)
+
+      baseClient.newBuilder()
+        .sslSocketFactory(Tls12SocketFactory(sslContext.socketFactory), trustManagers[0] as X509TrustManager)
+        .connectionSpecs(Util.immutableList(ConnectionSpec.RESTRICTED_TLS))
+        .build()
+    } catch (e: NoSuchAlgorithmException) {
+      throw AssertionError(e)
+    } catch (e: KeyManagementException) {
+      throw AssertionError(e)
+    }
+  }
+
+  fun closeConnections() {
+    incomingMessageObserver.terminateAsync()
+    if (_signalServiceMessageSender.isInitialized()) {
+      signalServiceMessageSender.cancelInFlightRequests()
+    }
+    disposables.clear()
+  }
+
+  fun resetProtocolStores() {
+    _protocolStore.reset()
+    _signalServiceMessageSender.reset()
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/DeviceTransferFragment.java b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/DeviceTransferFragment.java
index ee9e22e84e..e165e36fb0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/DeviceTransferFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/DeviceTransferFragment.java
@@ -42,7 +42,7 @@ public abstract class DeviceTransferFragment extends LoggingFragment {
   protected boolean  transferFinished;
 
   public DeviceTransferFragment() {
-    super(R.layout.device_transfer_fragment);
+    super(R.layout.fragment_device_transfer);
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/newdevice/NewDeviceTransferFragment.java b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/newdevice/NewDeviceTransferFragment.java
index 5da93e0c4e..045d44b6dd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/newdevice/NewDeviceTransferFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/newdevice/NewDeviceTransferFragment.java
@@ -37,18 +37,18 @@ public void onDestroyView() {
 
   @Override
   protected void navigateToRestartTransfer() {
-    SafeNavigation.safeNavigate(NavHostFragment.findNavController(this), R.id.action_newDeviceTransfer_to_newDeviceTransferInstructions);
+    SafeNavigation.safeNavigate(NavHostFragment.findNavController(this), NewDeviceTransferFragmentDirections.actionNewDeviceTransferToNewDeviceTransferInstructions());
   }
 
   @Override
   protected void navigateAwayFromTransfer() {
     EventBus.getDefault().unregister(serverTaskListener);
-    SafeNavigation.safeNavigate(NavHostFragment.findNavController(this), R.id.action_restart_to_welcomeFragment);
+    requireActivity().finish();
   }
 
   @Override
   protected void navigateToTransferComplete() {
-    SafeNavigation.safeNavigate(NavHostFragment.findNavController(this), R.id.action_newDeviceTransfer_to_newDeviceTransferComplete);
+    SafeNavigation.safeNavigate(NavHostFragment.findNavController(this), NewDeviceTransferFragmentDirections.actionNewDeviceTransferToNewDeviceTransferComplete());
   }
 
   private class ServerTaskListener {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/newdevice/TransferOrRestoreFragment.java b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/newdevice/TransferOrRestoreFragment.java
index 257990f890..686cb9cc8b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/newdevice/TransferOrRestoreFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/newdevice/TransferOrRestoreFragment.java
@@ -12,7 +12,7 @@
 import org.thoughtcrime.securesms.LoggingFragment;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.databinding.FragmentTransferRestoreBinding;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.SpanUtil;
 import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
 
@@ -41,7 +41,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     binding.transferOrRestoreFragmentNext.setOnClickListener(v -> launchSelection(viewModel.getStateSnapshot()));
     binding.transferOrRestoreFragmentMoreOptions.setOnClickListener(v -> SafeNavigation.safeNavigate(Navigation.findNavController(requireView()), R.id.action_transferOrRestore_to_moreOptions));
 
-    int visibility = FeatureFlags.messageBackups() ? View.VISIBLE : View.GONE;
+    int visibility = RemoteConfig.messageBackups() ? View.VISIBLE : View.GONE;
     binding.transferOrRestoreFragmentRestoreRemoteCard.setVisibility(visibility);
     binding.transferOrRestoreFragmentMoreOptions.setVisibility(visibility);
 
@@ -63,7 +63,7 @@ private void updateSelection(BackupRestorationType restorationType) {
   private void launchSelection(BackupRestorationType restorationType) {
     switch (restorationType) {
       case DEVICE_TRANSFER -> SafeNavigation.safeNavigate(Navigation.findNavController(requireView()), R.id.action_new_device_transfer_instructions);
-      case LOCAL_BACKUP -> SafeNavigation.safeNavigate(Navigation.findNavController(requireView()), R.id.action_choose_backup);
+      case LOCAL_BACKUP -> SafeNavigation.safeNavigate(Navigation.findNavController(requireView()), R.id.action_transfer_or_restore_to_local_restore);
       case REMOTE_BACKUP -> {}
       default -> throw new IllegalArgumentException();
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceExitActivity.java b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceExitActivity.java
index 476375b431..7afc98f62d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceExitActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceExitActivity.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferSetupFragment.java b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferSetupFragment.java
index 4d630bf956..231baf1339 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferSetupFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/olddevice/OldDeviceTransferSetupFragment.java
@@ -14,7 +14,7 @@
 import org.signal.devicetransfer.DeviceToDeviceTransferService;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.devicetransfer.DeviceTransferSetupFragment;
 import org.thoughtcrime.securesms.devicetransfer.SetupStep;
 import org.thoughtcrime.securesms.jobs.LocalBackupJob;
@@ -33,7 +33,7 @@ public final class OldDeviceTransferSetupFragment extends DeviceTransferSetupFra
   @Override
   public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
     super.onViewCreated(view, savedInstanceState);
-    ApplicationDependencies.getJobManager().cancelAllInQueue(LocalBackupJob.QUEUE);
+    AppDependencies.getJobManager().cancelAllInQueue(LocalBackupJob.QUEUE);
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiFiles.kt b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiFiles.kt
index f5049d4333..0838206e25 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiFiles.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiFiles.kt
@@ -6,6 +6,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
+import com.fasterxml.jackson.module.kotlin.registerKotlinModule
 import okio.HashingSink
 import okio.blackholeSink
 import okio.buffer
@@ -134,14 +136,14 @@ object EmojiFiles {
     }
   }
 
-  class Version(@JsonProperty("version") val version: Int, @JsonProperty("uuid") val uuid: UUID, @JsonProperty("density") val density: String) {
+  class Version(@JsonProperty val version: Int, @JsonProperty val uuid: UUID, @JsonProperty val density: String) {
 
     fun getFile(context: Context, uuid: UUID): File = File(getDirectory(context), uuid.toString())
 
     private fun getDirectory(context: Context): File = File(context.getEmojiDirectory(), this.uuid.toString()).apply { mkdir() }
 
     companion object {
-      private val objectMapper = ObjectMapper()
+      private val objectMapper = ObjectMapper().registerKotlinModule()
 
       @JvmStatic
       @JvmOverloads
@@ -210,17 +212,17 @@ object EmojiFiles {
     }
   }
 
-  class Name(@JsonProperty("name") val name: String, @JsonProperty("uuid") val uuid: UUID) {
+  class Name(@JsonProperty val name: String, @JsonProperty val uuid: UUID) {
     companion object {
       @JvmStatic
       fun forEmojiDataJson(): Name = Name(EMOJI_JSON, UUID.randomUUID())
     }
   }
 
-  class NameCollection(@JsonProperty("versionUuid") val versionUuid: UUID, @JsonProperty("names") val names: List<Name>) {
+  class NameCollection(@JsonProperty val versionUuid: UUID, @JsonProperty val names: List<Name>) {
     companion object {
 
-      private val objectMapper = ObjectMapper()
+      private val objectMapper = ObjectMapper().registerKotlinModule()
 
       @JvmStatic
       fun read(context: Context, version: Version): NameCollection {
@@ -257,16 +259,16 @@ object EmojiFiles {
     fun getUUIDForName(name: String): UUID? = names.firstOrNull { it.name == name }?.uuid
   }
 
-  class JumboCollection(@JsonProperty("versionUuid") val versionUuid: UUID, @JsonProperty("names") val names: List<Name>) {
+  class JumboCollection(@JsonProperty val versionUuid: UUID, @JsonProperty val names: List<Name>) {
     companion object {
 
-      private val objectMapper = ObjectMapper()
+      private val objectMapper = ObjectMapper().registerKotlinModule()
 
       @JvmStatic
       fun read(context: Context, version: Version): JumboCollection {
         try {
           getInputStream(context, context.getJumboFile(version.uuid)).use {
-            return objectMapper.readValue(it, JumboCollection::class.java)
+            return objectMapper.readValue(it)
           }
         } catch (e: Exception) {
           return JumboCollection(version.uuid, listOf())
diff --git a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiSource.kt b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiSource.kt
index 91d8f09187..f7f312c997 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiSource.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiSource.kt
@@ -7,7 +7,7 @@ import org.thoughtcrime.securesms.components.emoji.EmojiPageModel
 import org.thoughtcrime.securesms.components.emoji.StaticEmojiPageModel
 import org.thoughtcrime.securesms.components.emoji.parsing.EmojiDrawInfo
 import org.thoughtcrime.securesms.components.emoji.parsing.EmojiTree
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.ScreenDensity
 import java.io.InputStream
@@ -103,11 +103,11 @@ class EmojiSource(
     }
 
     private fun loadRemoteBasedEmojis(): EmojiSource? {
-      if (SignalStore.internalValues().forceBuiltInEmoji()) {
+      if (SignalStore.internal.forceBuiltInEmoji()) {
         return null
       }
 
-      val context = ApplicationDependencies.getApplication()
+      val context = AppDependencies.application
       val version = EmojiFiles.Version.readVersion(context) ?: return null
       val emojiData = EmojiFiles.getLatestEmojiData(context, version)?.let {
         it.copy(
@@ -123,7 +123,7 @@ class EmojiSource(
     }
 
     private fun loadAssetBasedEmojis(): EmojiSource {
-      val emojiData: InputStream = ApplicationDependencies.getApplication().assets.open("emoji/emoji_data.json")
+      val emojiData: InputStream = AppDependencies.application.assets.open("emoji/emoji_data.json")
 
       emojiData.use {
         val parsedData: ParsedEmojiData = EmojiJsonParser.parse(it, ::getAssetsUri).getOrThrow()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/emoji/JumboEmoji.kt b/app/src/main/java/org/thoughtcrime/securesms/emoji/JumboEmoji.kt
index dbe23f0832..0a43bc6606 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/emoji/JumboEmoji.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/emoji/JumboEmoji.kt
@@ -52,7 +52,7 @@ object JumboEmoji {
 
       if (EmojiFiles.getLatestEmojiData(context, version)?.format != null) {
         currentVersion = version.version
-        ThreadUtil.runOnMain { downloadedJumbos.addAll(SignalStore.emojiValues().getJumboEmojiSheets(version.version)) }
+        ThreadUtil.runOnMain { downloadedJumbos.addAll(SignalStore.emoji.getJumboEmojiSheets(version.version)) }
       }
     }
   }
@@ -129,7 +129,7 @@ object JumboEmoji {
           }
         }
 
-        SignalStore.emojiValues().addJumboEmojiSheet(version.version, drawInfo.jumboSheet)
+        SignalStore.emoji.addJumboEmojiSheet(version.version, drawInfo.jumboSheet)
       }
 
       EmojiFiles.openForReadingJumbo(applicationContext, version, jumbos, emojiName).use { BitmapFactory.decodeStream(it, null, BitmapFactory.Options()) }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/events/CallParticipant.kt b/app/src/main/java/org/thoughtcrime/securesms/events/CallParticipant.kt
index 456697e703..418aa08201 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/events/CallParticipant.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/events/CallParticipant.kt
@@ -84,7 +84,8 @@ data class CallParticipant(
   }
 
   enum class DeviceOrdinal {
-    PRIMARY, SECONDARY
+    PRIMARY,
+    SECONDARY
   }
 
   enum class AudioLevel {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/events/GroupCallRaiseHandEvent.kt b/app/src/main/java/org/thoughtcrime/securesms/events/GroupCallRaiseHandEvent.kt
index 3356117f08..2996f4abf5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/events/GroupCallRaiseHandEvent.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/events/GroupCallRaiseHandEvent.kt
@@ -5,10 +5,10 @@
 
 package org.thoughtcrime.securesms.events
 
-import org.thoughtcrime.securesms.recipients.Recipient
 import java.util.concurrent.TimeUnit
 
-data class GroupCallRaiseHandEvent(val sender: Recipient, val timestamp: Long) {
+data class GroupCallRaiseHandEvent(val sender: CallParticipant, val timestamp: Long) {
+
   fun getCollapseTimestamp(): Long {
     return timestamp + TimeUnit.SECONDS.toMillis(LIFESPAN_SECONDS)
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/fonts/FontFileMap.kt b/app/src/main/java/org/thoughtcrime/securesms/fonts/FontFileMap.kt
index 983ff6699e..10fa1efd70 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/fonts/FontFileMap.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/fonts/FontFileMap.kt
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.fonts
 
 import android.content.Context
 import androidx.annotation.WorkerThread
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.module.kotlin.registerKotlinModule
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.util.EncryptedStreamUtils
 import java.io.File
@@ -12,13 +12,13 @@ import java.io.File
  * FontFileMap links a network font name (e.g. Inter-Bold.ttf) to a UUID used as an on-disk filename.
  * These mappings are encoded into JSON and stored on disk in a file called .map
  */
-data class FontFileMap(@JsonProperty("map") val map: Map<String, String>) {
+data class FontFileMap(val map: Map<String, String>) {
 
   companion object {
 
     private val TAG = Log.tag(FontFileMap::class.java)
     private const val PATH = ".map"
-    private val objectMapper = ObjectMapper()
+    private val objectMapper = ObjectMapper().registerKotlinModule()
 
     /**
      * Adds the given mapping to the .map file.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/fonts/FontManifest.kt b/app/src/main/java/org/thoughtcrime/securesms/fonts/FontManifest.kt
index 3349e6eaec..82ba02e5d0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/fonts/FontManifest.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/fonts/FontManifest.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import androidx.annotation.WorkerThread
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.module.kotlin.registerKotlinModule
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.util.EncryptedStreamUtils
 import java.io.File
@@ -14,7 +15,7 @@ import java.io.File
  * @param scripts A collection of supported scripts
  */
 data class FontManifest(
-  @JsonProperty("scripts") val scripts: FontScripts
+  val scripts: FontScripts
 ) {
   /**
    * A collection of supported scripts
@@ -29,23 +30,23 @@ data class FontManifest(
   data class FontScripts(
     @JsonProperty("latin-extended") val latinExtended: FontScript?,
     @JsonProperty("cyrillic-extended") val cyrillicExtended: FontScript?,
-    @JsonProperty("devanagari") val devanagari: FontScript?,
+    val devanagari: FontScript?,
     @JsonProperty("chinese-traditional-hk") val chineseTraditionalHk: FontScript?,
     @JsonProperty("chinese-traditional") val chineseTraditional: FontScript?,
     @JsonProperty("chinese-simplified") val chineseSimplified: FontScript?,
-    @JsonProperty("arabic") val arabic: FontScript?,
-    @JsonProperty("japanese") val japanese: FontScript?
+    val arabic: FontScript?,
+    val japanese: FontScript?
   )
 
   /**
    * A collection of fonts for a specific script
    */
   data class FontScript(
-    @JsonProperty("regular") val regular: String?,
-    @JsonProperty("bold") val bold: String?,
-    @JsonProperty("serif") val serif: String?,
-    @JsonProperty("script") val script: String?,
-    @JsonProperty("condensed") val condensed: String?,
+    val regular: String?,
+    val bold: String?,
+    val serif: String?,
+    val script: String?,
+    val condensed: String?
   )
 
   companion object {
@@ -53,7 +54,7 @@ data class FontManifest(
     private val TAG = Log.tag(FontManifest::class.java)
     private const val PATH = ".manifest"
 
-    private val objectMapper = ObjectMapper()
+    private val objectMapper = ObjectMapper().registerKotlinModule()
 
     /**
      * Gets the latest manifest object for the given version. This may hit the network, disk, or both, depending on whether we have
diff --git a/app/src/main/java/org/thoughtcrime/securesms/fonts/FontVersion.kt b/app/src/main/java/org/thoughtcrime/securesms/fonts/FontVersion.kt
index b63d6be733..1e3a227ad7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/fonts/FontVersion.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/fonts/FontVersion.kt
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.fonts
 
 import android.content.Context
 import androidx.annotation.WorkerThread
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.module.kotlin.registerKotlinModule
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.EncryptedStreamUtils
@@ -17,7 +17,7 @@ import java.util.concurrent.TimeUnit
  * @param id The numeric ID of this version, retrieved from the server
  * @param path The UUID path of this version on disk, where supporting files will be stored.
  */
-data class FontVersion(@JsonProperty("id") val id: Long, @JsonProperty("path") val path: String) {
+data class FontVersion(val id: Long, val path: String) {
 
   companion object {
     val NONE = FontVersion(-1, "")
@@ -27,7 +27,7 @@ data class FontVersion(@JsonProperty("id") val id: Long, @JsonProperty("path") v
 
     private const val PATH = ".version"
 
-    private val objectMapper = ObjectMapper()
+    private val objectMapper = ObjectMapper().registerKotlinModule()
 
     /**
      * Retrieves the latest font version. This may hit the disk, network, or both, depending on when we last checked for a font version.
@@ -35,7 +35,7 @@ data class FontVersion(@JsonProperty("id") val id: Long, @JsonProperty("path") v
     @WorkerThread
     fun get(context: Context): FontVersion {
       val fromDisk = fromDisk(context)
-      val version: FontVersion = if (System.currentTimeMillis() - SignalStore.storyValues().lastFontVersionCheck > VERSION_CHECK_INTERVAL) {
+      val version: FontVersion = if (System.currentTimeMillis() - SignalStore.story.lastFontVersionCheck > VERSION_CHECK_INTERVAL) {
         Log.i(TAG, "Timeout interval exceeded, checking network for new font version.")
 
         val fromNetwork = fromNetwork()
@@ -51,7 +51,7 @@ data class FontVersion(@JsonProperty("id") val id: Long, @JsonProperty("path") v
             writeVersionToDisk(context, fromNetwork) ?: NONE
           } else {
             Log.i(TAG, "Network version is the same as our local version.")
-            SignalStore.storyValues().lastFontVersionCheck = System.currentTimeMillis()
+            SignalStore.story.lastFontVersionCheck = System.currentTimeMillis()
             fromDisk
           }
         } else {
@@ -82,7 +82,7 @@ data class FontVersion(@JsonProperty("id") val id: Long, @JsonProperty("path") v
         File(Fonts.getDirectory(context), fontVersion.path).mkdir()
 
         Log.i(TAG, "Wrote version ${fontVersion.id} to disk.")
-        SignalStore.storyValues().lastFontVersionCheck = System.currentTimeMillis()
+        SignalStore.story.lastFontVersionCheck = System.currentTimeMillis()
         fontVersion
       } catch (e: Exception) {
         Log.e(TAG, "Failed to write new font version to disk", e)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt
index 124ecadab6..f84e7e1177 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt
@@ -13,12 +13,11 @@ import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.MainActivity
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.MessageFetchJob
 import org.thoughtcrime.securesms.messages.WebSocketDrainer
 import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.notifications.NotificationIds
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.SignalLocalMetrics
 import org.thoughtcrime.securesms.util.concurrent.SerialMonoLifoExecutor
 import kotlin.time.Duration.Companion.minutes
@@ -153,7 +152,7 @@ object FcmFetchManager {
         FcmJobService.schedule(context)
       } else {
         Log.w(TAG, "[API ${Build.VERSION.SDK_INT}] Failed to retrieve messages. Scheduling on JobManager (API " + Build.VERSION.SDK_INT + ").")
-        ApplicationDependencies.getJobManager().add(MessageFetchJob())
+        AppDependencies.jobManager.add(MessageFetchJob())
       }
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmJobService.java b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmJobService.java
index 53fc6fd256..f7cd3093c2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmJobService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmJobService.java
@@ -11,7 +11,7 @@
 
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.messages.WebSocketDrainer;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 
@@ -39,7 +39,7 @@ public static void schedule(@NonNull Context context) {
   public boolean onStartJob(JobParameters params) {
     Log.d(TAG, "onStartJob()");
 
-    if (ApplicationDependencies.getAppForegroundObserver().isForegrounded()) {
+    if (AppDependencies.getAppForegroundObserver().isForegrounded()) {
       Log.i(TAG, "App is foregrounded. No need to run.");
       return false;
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java
index 206b912446..da71680ff6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java
@@ -10,7 +10,7 @@
 import com.google.firebase.messaging.RemoteMessage;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
 import org.thoughtcrime.securesms.jobs.SubmitRateLimitPushChallengeJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -54,7 +54,7 @@ public void onMessageReceived(@NonNull RemoteMessage remoteMessage) {
     } else if (rateLimitChallenge != null) {
       handleRateLimitPushChallenge(rateLimitChallenge);
     } else {
-      handleReceivedNotification(ApplicationDependencies.getApplication(), remoteMessage);
+      handleReceivedNotification(AppDependencies.getApplication(), remoteMessage);
     }
   }
 
@@ -65,7 +65,7 @@ public void onDeletedMessages() {
     }
 
     Log.w(TAG, "onDeleteMessages() -- Messages may have been dropped. Doing a normal message fetch.");
-    handleReceivedNotification(ApplicationDependencies.getApplication(), null);
+    handleReceivedNotification(AppDependencies.getApplication(), null);
   }
 
   @Override
@@ -81,7 +81,7 @@ public void onNewToken(@NonNull String token) {
       return;
     }
 
-    ApplicationDependencies.getJobManager().add(new FcmRefreshJob());
+    AppDependencies.getJobManager().add(new FcmRefreshJob());
   }
 
   @Override
@@ -119,6 +119,6 @@ private static void handleRegistrationPushChallenge(@NonNull String challenge) {
 
   private static void handleRateLimitPushChallenge(@NonNull String challenge) {
     Log.d(TAG, "Got a rate limit push challenge.");
-    ApplicationDependencies.getJobManager().add(new SubmitRateLimitPushChallengeJob(challenge));
+    AppDependencies.getJobManager().add(new SubmitRateLimitPushChallengeJob(challenge));
   }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4PagedDataSource.java b/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4PagedDataSource.java
index 788a82994a..7711feda52 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4PagedDataSource.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4PagedDataSource.java
@@ -9,7 +9,7 @@
 import org.signal.core.util.logging.Log;
 import org.signal.paging.PagedDataSource;
 import org.thoughtcrime.securesms.BuildConfig;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.giph.model.GiphyImage;
 import org.thoughtcrime.securesms.giph.model.GiphyResponse;
 import org.thoughtcrime.securesms.net.ContentProxySelector;
@@ -50,7 +50,7 @@ final class GiphyMp4PagedDataSource implements PagedDataSource<String, GiphyImag
 
   GiphyMp4PagedDataSource(@Nullable String searchQuery) {
     this.searchString = Optional.ofNullable(searchQuery).map(String::trim).orElse("");
-    this.client       = ApplicationDependencies.getOkHttpClient().newBuilder().proxySelector(new ContentProxySelector()).build();
+    this.client       = AppDependencies.getOkHttpClient().newBuilder().proxySelector(new ContentProxySelector()).build();
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackPolicy.java b/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackPolicy.java
index d9706a4a3e..2a6bed6cd2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackPolicy.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4PlaybackPolicy.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.giph.mp4;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.util.DeviceProperties;
 
 import java.util.concurrent.TimeUnit;
@@ -13,7 +13,7 @@ public final class GiphyMp4PlaybackPolicy {
   private GiphyMp4PlaybackPolicy() { }
 
   public static boolean autoplay() {
-    return !DeviceProperties.isLowMemoryDevice(ApplicationDependencies.getApplication());
+    return !DeviceProperties.isLowMemoryDevice(AppDependencies.getApplication());
   }
 
   public static int maxRepeatsOfSinglePlayback() {
@@ -25,10 +25,10 @@ public static long maxDurationOfSinglePlayback() {
   }
 
   public static int maxSimultaneousPlaybackInSearchResults() {
-    return ApplicationDependencies.getExoPlayerPool().getPoolStats().getMaxUnreserved();
+    return AppDependencies.getExoPlayerPool().getPoolStats().getMaxUnreserved();
   }
 
   public static int maxSimultaneousPlaybackInConversation() {
-    return ApplicationDependencies.getExoPlayerPool().getPoolStats().getMaxUnreserved() / 3;
+    return AppDependencies.getExoPlayerPool().getPoolStats().getMaxUnreserved() / 3;
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionPlayerHolder.java b/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionPlayerHolder.java
index 34cccb9bb3..e0f5516e00 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionPlayerHolder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4ProjectionPlayerHolder.java
@@ -23,7 +23,7 @@
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.util.Projection;
 import org.thoughtcrime.securesms.video.exo.ExoPlayerKt;
 
@@ -58,7 +58,7 @@ public void playContent(@NonNull MediaItem mediaItem, @Nullable GiphyMp4Playback
     this.policyEnforcer = policyEnforcer;
 
     if (player.getExoPlayer() == null) {
-      ExoPlayer fromPool = ApplicationDependencies.getExoPlayerPool().get(TAG);
+      ExoPlayer fromPool = AppDependencies.getExoPlayerPool().get(TAG);
 
       if (fromPool == null) {
         Log.i(TAG, "Could not get exoplayer from pool.");
@@ -84,7 +84,7 @@ public void clearMedia() {
       player.stop();
       player.setExoPlayer(null);
       exoPlayer.removeListener(this);
-      ApplicationDependencies.getExoPlayerPool().pool(exoPlayer);
+      AppDependencies.getExoPlayerPool().pool(exoPlayer);
     }
   }
 
@@ -146,7 +146,7 @@ public void onPositionDiscontinuity(@NonNull Player.PositionInfo oldPosition,
   @Override
   public void onResume(@NonNull LifecycleOwner owner) {
     if (mediaItem != null) {
-      ExoPlayer fromPool = ApplicationDependencies.getExoPlayerPool().get(TAG);
+      ExoPlayer fromPool = AppDependencies.getExoPlayerPool().get(TAG);
       if (fromPool != null) {
         ExoPlayerKt.configureForGifPlayback(fromPool);
         fromPool.addListener(this);
@@ -163,7 +163,7 @@ public void onPause(@NonNull LifecycleOwner owner) {
       player.getExoPlayer().stop();
       player.getExoPlayer().clearMediaItems();
       player.getExoPlayer().removeListener(this);
-      ApplicationDependencies.getExoPlayerPool().pool(player.getExoPlayer());
+      AppDependencies.getExoPlayerPool().pool(player.getExoPlayer());
       player.setExoPlayer(null);
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4Repository.java b/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4Repository.java
index 04460d9242..f36650a0d7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4Repository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4Repository.java
@@ -7,7 +7,7 @@
 import androidx.core.util.Consumer;
 
 import org.signal.core.util.concurrent.SignalExecutors;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.giph.model.GiphyImage;
 import org.thoughtcrime.securesms.net.ContentProxySelector;
 import org.thoughtcrime.securesms.providers.BlobProvider;
@@ -30,7 +30,7 @@ final class GiphyMp4Repository {
   private final OkHttpClient client;
 
   GiphyMp4Repository() {
-    this.client = ApplicationDependencies.getOkHttpClient().newBuilder().proxySelector(new ContentProxySelector()).build();
+    this.client = AppDependencies.getOkHttpClient().newBuilder().proxySelector(new ContentProxySelector()).build();
   }
 
   void saveToBlob(@NonNull GiphyImage giphyImage, boolean isForMms, @NonNull Consumer<GiphyMp4SaveResult> resultConsumer) {
@@ -64,7 +64,7 @@ void saveToBlob(@NonNull GiphyImage giphyImage, boolean isForMms, @NonNull Consu
         return BlobProvider.getInstance()
                            .forData(response.body().byteStream(), response.body().contentLength())
                            .withMimeType(mime)
-                           .createForSingleSessionOnDisk(ApplicationDependencies.getApplication());
+                           .createForSingleSessionOnDisk(AppDependencies.getApplication());
       } else {
         throw new IOException("Unexpected response code: " + response.code());
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java
index 15afefc9bc..283e64be36 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java
@@ -26,7 +26,7 @@
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
@@ -60,7 +60,7 @@ public void onPreCreate() {
   @SuppressLint("MissingInflatedId")
   @Override
   public void onCreate(Bundle bundle, boolean ready) {
-    if (!FeatureFlags.gifSearchAvailable()) {
+    if (!RemoteConfig.gifSearchAvailable()) {
       finish();
     }
     setContentView(R.layout.giphy_activity);
@@ -126,7 +126,7 @@ private void handleGiphyMp4SuccessfulResult(@NonNull GiphyMp4SaveResult.Success
       mimeType = mediaType.toFallbackMimeType();
     }
 
-    Media media = new Media(success.getBlobUri(), mimeType, 0, success.getWidth(), success.getHeight(), 0, 0, false, true, Optional.empty(), Optional.empty(), Optional.empty());
+    Media media = new Media(success.getBlobUri(), mimeType, 0, success.getWidth(), success.getHeight(), 0, 0, false, true, Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
     startActivityForResult(MediaSelectionActivity.editor(this, sendType, Collections.singletonList(media), recipientId, text), MEDIA_SENDER);
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/BadgeLoader.java b/app/src/main/java/org/thoughtcrime/securesms/glide/BadgeLoader.java
index 5b8232bbf5..dd5e07315c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/glide/BadgeLoader.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/glide/BadgeLoader.java
@@ -10,7 +10,7 @@
 import com.bumptech.glide.load.model.MultiModelLoaderFactory;
 
 import org.thoughtcrime.securesms.badges.models.Badge;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 
 import java.io.InputStream;
 
@@ -38,7 +38,7 @@ public boolean handles(@NonNull Badge badgeSpriteSheetRequest) {
   }
 
   public static Factory createFactory() {
-    return new Factory(ApplicationDependencies.getSignalOkHttpClient());
+    return new Factory(AppDependencies.getSignalOkHttpClient());
   }
 
   public static class Factory implements ModelLoaderFactory<Badge, InputStream> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/GiftBadgeModel.kt b/app/src/main/java/org/thoughtcrime/securesms/glide/GiftBadgeModel.kt
new file mode 100644
index 0000000000..5292299a9a
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/glide/GiftBadgeModel.kt
@@ -0,0 +1,97 @@
+package org.thoughtcrime.securesms.glide
+
+import com.bumptech.glide.Priority
+import com.bumptech.glide.load.DataSource
+import com.bumptech.glide.load.Key
+import com.bumptech.glide.load.Options
+import com.bumptech.glide.load.data.DataFetcher
+import com.bumptech.glide.load.model.GlideUrl
+import com.bumptech.glide.load.model.ModelLoader
+import com.bumptech.glide.load.model.ModelLoaderFactory
+import com.bumptech.glide.load.model.MultiModelLoaderFactory
+import okhttp3.OkHttpClient
+import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation
+import org.thoughtcrime.securesms.components.settings.app.subscription.getBadge
+import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import java.io.InputStream
+import java.security.MessageDigest
+import java.util.Locale
+
+/**
+ * Glide Model allowing the direct loading of a GiftBadge.
+ *
+ * This model will first resolve a GiftBadge into a Badge, and then it will delegate to the Badge loader.
+ */
+data class GiftBadgeModel(val giftBadge: GiftBadge) : Key {
+  class Loader(val client: OkHttpClient) : ModelLoader<GiftBadgeModel, InputStream> {
+    override fun buildLoadData(model: GiftBadgeModel, width: Int, height: Int, options: Options): ModelLoader.LoadData<InputStream>? {
+      return ModelLoader.LoadData(model, Fetcher(client, model))
+    }
+
+    override fun handles(model: GiftBadgeModel): Boolean = true
+  }
+
+  override fun updateDiskCacheKey(messageDigest: MessageDigest) {
+    messageDigest.update(giftBadge.encode())
+  }
+
+  class Fetcher(
+    private val client: OkHttpClient,
+    private val giftBadge: GiftBadgeModel
+  ) : DataFetcher<InputStream> {
+
+    private var okHttpStreamFetcher: OkHttpStreamFetcher? = null
+
+    override fun loadData(priority: Priority, callback: DataFetcher.DataCallback<in InputStream>) {
+      try {
+        val receiptCredentialPresentation = ReceiptCredentialPresentation(giftBadge.giftBadge.redemptionToken.toByteArray())
+        val giftBadgeResponse = AppDependencies.donationsService.getDonationsConfiguration(Locale.getDefault())
+        if (giftBadgeResponse.result.isPresent) {
+          val badge = giftBadgeResponse.result.get().getBadge(receiptCredentialPresentation.receiptLevel.toInt())
+          okHttpStreamFetcher = OkHttpStreamFetcher(client, GlideUrl(badge.imageUrl.toString()))
+          okHttpStreamFetcher?.loadData(priority, callback)
+        } else if (giftBadgeResponse.applicationError.isPresent) {
+          callback.onLoadFailed(Exception(giftBadgeResponse.applicationError.get()))
+        } else if (giftBadgeResponse.executionError.isPresent) {
+          callback.onLoadFailed(Exception(giftBadgeResponse.executionError.get()))
+        } else {
+          callback.onLoadFailed(Exception("No result or error in service response."))
+        }
+      } catch (e: Exception) {
+        callback.onLoadFailed(e)
+      }
+    }
+
+    override fun cleanup() {
+      okHttpStreamFetcher?.cleanup()
+    }
+
+    override fun cancel() {
+      okHttpStreamFetcher?.cancel()
+    }
+
+    override fun getDataClass(): Class<InputStream> {
+      return InputStream::class.java
+    }
+
+    override fun getDataSource(): DataSource {
+      return DataSource.REMOTE
+    }
+  }
+
+  class Factory(private val client: OkHttpClient) : ModelLoaderFactory<GiftBadgeModel, InputStream> {
+    override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<GiftBadgeModel, InputStream> {
+      return Loader(client)
+    }
+
+    override fun teardown() {}
+  }
+
+  companion object {
+    @JvmStatic
+    fun createFactory(): Factory {
+      return Factory(AppDependencies.signalOkHttpClient)
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java
index 53d9c9927c..3ecb17bb75 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java
@@ -18,7 +18,7 @@
 import org.thoughtcrime.securesms.database.model.GroupRecord;
 import org.thoughtcrime.securesms.groups.v2.GroupInviteLinkUrl;
 import org.thoughtcrime.securesms.groups.v2.GroupLinkPassword;
-import org.thoughtcrime.securesms.groups.v2.processing.GroupsV2StateProcessor;
+import org.thoughtcrime.securesms.groups.v2.processing.GroupUpdateResult;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
@@ -146,14 +146,14 @@ public static void updateGroupFromServer(@NonNull Context context,
   }
 
   @WorkerThread
-  public static GroupsV2StateProcessor.GroupUpdateResult updateGroupFromServer(@NonNull Context context,
-                                                                               @NonNull GroupMasterKey groupMasterKey,
-                                                                               @NonNull Optional<GroupRecord> groupRecord,
-                                                                               @Nullable GroupSecretParams groupSecretParams,
-                                                                               int revision,
-                                                                               long timestamp,
-                                                                               @Nullable byte[] signedGroupChange,
-                                                                               @Nullable String serverGuid)
+  public static GroupUpdateResult updateGroupFromServer(@NonNull Context context,
+                                                        @NonNull GroupMasterKey groupMasterKey,
+                                                        @NonNull Optional<GroupRecord> groupRecord,
+                                                        @Nullable GroupSecretParams groupSecretParams,
+                                                        int revision,
+                                                        long timestamp,
+                                                        @Nullable byte[] signedGroupChange,
+                                                        @Nullable String serverGuid)
       throws GroupChangeBusyException, IOException, GroupNotAMemberException
   {
     try (GroupManagerV2.GroupUpdater updater = new GroupManagerV2(context).updater(groupMasterKey)) {
@@ -172,6 +172,16 @@ public static void forceSanityUpdateFromServer(@NonNull Context context,
     }
   }
 
+  @WorkerThread
+  public static void updateGroupSendEndorsements(@NonNull Context context,
+                                                 @NonNull GroupMasterKey groupMasterKey)
+      throws GroupChangeBusyException, IOException, GroupNotAMemberException
+  {
+    try (GroupManagerV2.GroupUpdater updater = new GroupManagerV2(context).updater(groupMasterKey)) {
+      updater.updateGroupSendEndorsements();
+    }
+  }
+
   @WorkerThread
   public static void setMemberAdmin(@NonNull Context context,
                                     @NonNull GroupId.V2 groupId,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java
index acd65337e3..6f5eee8186 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java
@@ -18,6 +18,7 @@
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.signal.storageservice.protos.groups.AccessControl;
 import org.signal.storageservice.protos.groups.GroupChange;
+import org.signal.storageservice.protos.groups.GroupChangeResponse;
 import org.signal.storageservice.protos.groups.GroupExternalCredential;
 import org.signal.storageservice.protos.groups.Member;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;
@@ -32,10 +33,11 @@
 import org.thoughtcrime.securesms.database.ThreadTable;
 import org.thoughtcrime.securesms.database.model.GroupRecord;
 import org.thoughtcrime.securesms.database.model.databaseprotos.GV2UpdateDescription;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.v2.GroupCandidateHelper;
 import org.thoughtcrime.securesms.groups.v2.GroupInviteLinkUrl;
 import org.thoughtcrime.securesms.groups.v2.GroupLinkPassword;
+import org.thoughtcrime.securesms.groups.v2.processing.GroupUpdateResult;
 import org.thoughtcrime.securesms.groups.v2.processing.GroupsV2StateProcessor;
 import org.thoughtcrime.securesms.jobs.ProfileUploadJob;
 import org.thoughtcrime.securesms.jobs.PushGroupSilentUpdateSendJob;
@@ -48,6 +50,8 @@
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.util.ProfileUtil;
+import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupResponse;
+import org.whispersystems.signalservice.api.groupsv2.ReceivedGroupSendEndorsements;
 import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil;
 import org.whispersystems.signalservice.api.groupsv2.GroupCandidate;
 import org.whispersystems.signalservice.api.groupsv2.GroupChangeReconstruct;
@@ -105,9 +109,9 @@ final class GroupManagerV2 {
   GroupManagerV2(@NonNull Context context) {
     this(context,
          SignalDatabase.groups(),
-         ApplicationDependencies.getSignalServiceAccountManager().getGroupsV2Api(),
-         ApplicationDependencies.getGroupsV2Operations(),
-         ApplicationDependencies.getGroupsV2Authorization(),
+         AppDependencies.getSignalServiceAccountManager().getGroupsV2Api(),
+         AppDependencies.getGroupsV2Operations(),
+         AppDependencies.getGroupsV2Authorization(),
          SignalStore.account().getServiceIds(),
          new GroupCandidateHelper(),
          new SendGroupUpdateHelper(context));
@@ -218,16 +222,18 @@ final class GroupCreator extends LockOwner {
         throws GroupChangeFailedException, IOException, MembershipNotSuitableForV2Exception
     {
       GroupSecretParams groupSecretParams = GroupSecretParams.generate();
-      DecryptedGroup    decryptedGroup;
+      DecryptedGroupResponse createGroupResponse;
 
       try {
-        decryptedGroup = createGroupOnServer(groupSecretParams, name, avatar, members, disappearingMessagesTimer);
+        createGroupResponse = createGroupOnServer(groupSecretParams, name, avatar, members, disappearingMessagesTimer);
       } catch (GroupAlreadyExistsException e) {
         throw new GroupChangeFailedException(e);
       }
 
-      GroupMasterKey masterKey = groupSecretParams.getMasterKey();
-      GroupId.V2     groupId   = groupDatabase.create(masterKey, decryptedGroup);
+      DecryptedGroup                decryptedGroup        = createGroupResponse.getGroup();
+      GroupMasterKey                masterKey             = groupSecretParams.getMasterKey();
+      ReceivedGroupSendEndorsements groupSendEndorsements = groupsV2Operations.forGroup(groupSecretParams).receiveGroupSendEndorsements(selfAci, decryptedGroup, createGroupResponse.getGroupSendEndorsementsResponse());
+      GroupId.V2                    groupId               = groupDatabase.create(masterKey, decryptedGroup, groupSendEndorsements);
 
       if (groupId == null) {
         throw new GroupChangeFailedException("Unable to create group, group already exists");
@@ -285,7 +291,7 @@ final class GroupEditor extends LockOwner {
 
       Set<GroupCandidate> groupCandidates = groupCandidateHelper.recipientIdsToCandidates(new HashSet<>(newMembers));
 
-      if (SignalStore.internalValues().gv2ForceInvites()) {
+      if (SignalStore.internal().gv2ForceInvites()) {
         groupCandidates = GroupCandidate.withoutExpiringProfileKeyCredentials(groupCandidates);
       }
 
@@ -468,7 +474,7 @@ void leaveGroup(boolean sendToMembers)
 
       if (!groupCandidate.hasValidProfileKeyCredential()) {
         Log.w(TAG, "[updateSelfProfileKeyInGroup] No credential available, repairing");
-        ApplicationDependencies.getJobManager().add(new ProfileUploadJob());
+        AppDependencies.getJobManager().add(new ProfileUploadJob());
         return null;
       }
 
@@ -494,7 +500,7 @@ void leaveGroup(boolean sendToMembers)
 
       if (!groupCandidate.hasValidProfileKeyCredential()) {
         Log.w(TAG, "[AcceptInvite] No credential available, repairing");
-        ApplicationDependencies.getJobManager().add(new ProfileUploadJob());
+        AppDependencies.getJobManager().add(new ProfileUploadJob());
         return null;
       }
 
@@ -603,15 +609,15 @@ public GroupManager.GroupActionResult cycleGroupLinkPassword()
     private GroupChange.Actions.Builder resolveConflict(@NonNull ServiceId authServiceId, @NonNull GroupChange.Actions.Builder change)
           throws IOException, GroupNotAMemberException, GroupChangeFailedException
     {
-      GroupsV2StateProcessor.GroupUpdateResult groupUpdateResult = GroupsV2StateProcessor.forGroup(serviceIds, groupMasterKey)
-                                                                                         .updateLocalGroupToRevision(GroupsV2StateProcessor.LATEST, System.currentTimeMillis(), null);
+      GroupUpdateResult groupUpdateResult = GroupsV2StateProcessor.forGroup(serviceIds, groupMasterKey)
+                                                                  .updateLocalGroupToRevision(GroupsV2StateProcessor.LATEST, System.currentTimeMillis());
 
       if (groupUpdateResult.getLatestServer() == null) {
         Log.w(TAG, "Latest server state null.");
         throw new GroupChangeFailedException();
       }
 
-      if (groupUpdateResult.getGroupState() != GroupsV2StateProcessor.GroupState.GROUP_UPDATED) {
+      if (groupUpdateResult.getUpdateStatus() != GroupUpdateResult.UpdateStatus.GROUP_UPDATED) {
         int serverRevision = groupUpdateResult.getLatestServer().revision;
         int localRevision  = groupDatabase.requireGroup(groupId).requireV2GroupProperties().getGroupRevision();
         int revisionDelta  = serverRevision - localRevision;
@@ -669,7 +675,8 @@ private GroupManager.GroupActionResult commitChange(@NonNull GroupChange.Actions
 
       previousGroupState  = v2GroupProperties.getDecryptedGroup();
 
-      GroupChange signedGroupChange = commitToServer(changeActions);
+      GroupChangeResponse changeResponse    = commitToServer(changeActions);
+      GroupChange         signedGroupChange = changeResponse.groupChange;
       try {
         //noinspection OptionalGetWithoutIsPresent
         decryptedChange     = groupOperations.decryptChange(signedGroupChange, false).get();
@@ -679,7 +686,7 @@ private GroupManager.GroupActionResult commitChange(@NonNull GroupChange.Actions
         throw new IOException(e);
       }
 
-      groupDatabase.update(groupId, decryptedGroupState);
+      groupDatabase.update(groupId, decryptedGroupState, groupsV2Operations.forGroup(groupSecretParams).receiveGroupSendEndorsements(selfAci, decryptedGroupState, changeResponse.groupSendEndorsementsResponse));
 
       GroupMutation      groupMutation      = new GroupMutation(previousGroupState, decryptedChange, decryptedGroupState);
       RecipientAndThread recipientAndThread = sendGroupUpdateHelper.sendGroupUpdate(groupMasterKey, groupMutation, signedGroupChange, sendToMembers);
@@ -689,7 +696,7 @@ private GroupManager.GroupActionResult commitChange(@NonNull GroupChange.Actions
       return new GroupManager.GroupActionResult(recipientAndThread.groupRecipient, recipientAndThread.threadId, newMembersCount, newPendingMembers);
     }
 
-    private @NonNull GroupChange commitToServer(@NonNull GroupChange.Actions change)
+    private @NonNull GroupChangeResponse commitToServer(@NonNull GroupChange.Actions change)
         throws GroupNotAMemberException, GroupChangeFailedException, IOException, GroupInsufficientRightsException
     {
       try {
@@ -722,20 +729,20 @@ void updateLocalToServerRevision(int revision, long timestamp)
         throws IOException, GroupNotAMemberException
     {
       GroupsV2StateProcessor.forGroup(serviceIds, groupMasterKey)
-                            .updateLocalGroupToRevision(revision, timestamp, null);
+                            .updateLocalGroupToRevision(revision, timestamp);
     }
 
     @WorkerThread
-    GroupsV2StateProcessor.GroupUpdateResult updateLocalToServerRevision(int revision,
-                                                                         long timestamp,
-                                                                         @NonNull Optional<GroupRecord> localRecord,
-                                                                         @Nullable GroupSecretParams groupSecretParams,
-                                                                         @Nullable byte[] signedGroupChange,
-                                                                         @Nullable String serverGuid)
+    GroupUpdateResult updateLocalToServerRevision(int revision,
+                                                  long timestamp,
+                                                  @NonNull Optional<GroupRecord> localRecord,
+                                                  @Nullable GroupSecretParams groupSecretParams,
+                                                  @Nullable byte[] signedGroupChange,
+                                                  @Nullable String serverGuid)
         throws IOException, GroupNotAMemberException
     {
       return GroupsV2StateProcessor.forGroup(serviceIds, groupMasterKey, groupSecretParams)
-                                   .updateLocalGroupToRevision(revision, timestamp, localRecord, getDecryptedGroupChange(signedGroupChange), serverGuid);
+                                   .updateLocalGroupToRevision(revision, timestamp, getDecryptedGroupChange(signedGroupChange), localRecord, serverGuid);
     }
 
     @WorkerThread
@@ -746,6 +753,14 @@ void forceSanityUpdateFromServer(long timestamp)
                             .forceSanityUpdateFromServer(timestamp);
     }
 
+    @WorkerThread
+    void updateGroupSendEndorsements()
+        throws IOException, GroupNotAMemberException
+    {
+      GroupsV2StateProcessor.forGroup(serviceIds, groupMasterKey)
+                            .updateGroupSendEndorsements();
+    }
+
     private DecryptedGroupChange getDecryptedGroupChange(@Nullable byte[] signedGroupChange) {
       if (signedGroupChange != null && signedGroupChange.length > 0) {
         GroupsV2Operations.GroupOperations groupOperations = groupsV2Operations.forGroup(GroupSecretParams.deriveFromMasterKey(groupMasterKey));
@@ -763,11 +778,11 @@ private DecryptedGroupChange getDecryptedGroupChange(@Nullable byte[] signedGrou
   }
 
   @WorkerThread
-  private @NonNull DecryptedGroup createGroupOnServer(@NonNull GroupSecretParams groupSecretParams,
-                                                      @Nullable String name,
-                                                      @Nullable byte[] avatar,
-                                                      @NonNull Collection<RecipientId> members,
-                                                      int disappearingMessageTimerSeconds)
+  private @NonNull DecryptedGroupResponse createGroupOnServer(@NonNull GroupSecretParams groupSecretParams,
+                                                              @Nullable String name,
+                                                              @Nullable byte[] avatar,
+                                                              @NonNull Collection<RecipientId> members,
+                                                              int disappearingMessageTimerSeconds)
       throws GroupChangeFailedException, IOException, MembershipNotSuitableForV2Exception, GroupAlreadyExistsException
   {
     if (!GroupsV2CapabilityChecker.allAndSelfHaveServiceId(members)) {
@@ -777,7 +792,7 @@ private DecryptedGroupChange getDecryptedGroupChange(@Nullable byte[] signedGrou
     GroupCandidate      self       = groupCandidateHelper.recipientIdToCandidate(Recipient.self().getId());
     Set<GroupCandidate> candidates = new HashSet<>(groupCandidateHelper.recipientIdsToCandidates(members));
 
-    if (SignalStore.internalValues().gv2ForceInvites()) {
+    if (SignalStore.internal().gv2ForceInvites()) {
       Log.w(TAG, "Forcing GV2 invites due to internal setting");
       candidates = GroupCandidate.withoutExpiringProfileKeyCredentials(candidates);
     }
@@ -796,15 +811,10 @@ private DecryptedGroupChange getDecryptedGroupChange(@Nullable byte[] signedGrou
                                                                              disappearingMessageTimerSeconds);
 
     try {
-      groupsV2Api.putNewGroup(newGroup, authorization.getAuthorizationForToday(serviceIds, groupSecretParams));
+      DecryptedGroupResponse groupResponse = groupsV2Api.putNewGroup(newGroup, authorization.getAuthorizationForToday(serviceIds, groupSecretParams));
 
-      DecryptedGroup decryptedGroup = groupsV2Api.getGroup(groupSecretParams, ApplicationDependencies.getGroupsV2Authorization().getAuthorizationForToday(serviceIds, groupSecretParams));
-      if (decryptedGroup == null) {
-        throw new GroupChangeFailedException();
-      }
-
-      return decryptedGroup;
-    } catch (VerificationFailedException | InvalidGroupStateException e) {
+      return groupResponse;
+    } catch (VerificationFailedException | InvalidGroupStateException | InvalidInputException e) {
       throw new GroupChangeFailedException(e);
     } catch (GroupExistsException e) {
       throw new GroupAlreadyExistsException(e);
@@ -836,8 +846,9 @@ public GroupManager.GroupActionResult joinGroup(@NonNull DecryptedGroupJoinInfo
                                                     @Nullable byte[] avatar)
         throws GroupChangeFailedException, IOException, MembershipNotSuitableForV2Exception, GroupLinkNotActiveException
     {
-      boolean requestToJoin  = joinInfo.addFromInviteLink == AccessControl.AccessRequired.ADMINISTRATOR;
-      boolean alreadyAMember = false;
+      boolean requestToJoin      = joinInfo.addFromInviteLink == AccessControl.AccessRequired.ADMINISTRATOR;
+      boolean alreadyAMember     = false;
+      boolean groupAlreadyExists = false;
 
       if (requestToJoin) {
         Log.i(TAG, "Requesting to join " + groupId);
@@ -845,10 +856,13 @@ public GroupManager.GroupActionResult joinGroup(@NonNull DecryptedGroupJoinInfo
         Log.i(TAG, "Joining " + groupId);
       }
 
-      GroupChange          signedGroupChange = null;
-      DecryptedGroupChange decryptedChange   = null;
+      GroupChangeResponse  groupChangeResponse = null;
+      GroupChange          signedGroupChange   = null;
+      DecryptedGroupChange decryptedChange     = null;
+
       try {
-        signedGroupChange = joinGroupOnServer(requestToJoin, joinInfo.revision);
+        groupChangeResponse = joinGroupOnServer(requestToJoin, joinInfo.revision);
+        signedGroupChange   = groupChangeResponse.groupChange;
 
         if (requestToJoin) {
           Log.i(TAG, String.format("Successfully requested to join %s on server", groupId));
@@ -856,7 +870,7 @@ public GroupManager.GroupActionResult joinGroup(@NonNull DecryptedGroupJoinInfo
           Log.i(TAG, String.format("Successfully added self to %s on server", groupId));
         }
 
-        decryptedChange = decryptChange(signedGroupChange);
+        decryptedChange = decryptChange(Objects.requireNonNull(signedGroupChange));
       } catch (GroupJoinAlreadyAMemberException e) {
         Log.i(TAG, "Server reports that we are already a member of " + groupId);
         alreadyAMember = true;
@@ -868,28 +882,37 @@ public GroupManager.GroupActionResult joinGroup(@NonNull DecryptedGroupJoinInfo
 
       if (group.isPresent()) {
         Log.i(TAG, "Group already present locally");
-        if (decryptedChange != null) {
-          try {
-            GroupsV2StateProcessor.forGroup(SignalStore.account().getServiceIds(), groupMasterKey)
-                                  .updateLocalGroupToRevision(decryptedChange.revision, System.currentTimeMillis(), decryptedChange);
-          } catch (GroupNotAMemberException e) {
-            Log.w(TAG, "Unable to apply join change to existing group", e);
-          }
-        }
+        groupAlreadyExists = true;
       } else {
-        GroupId.V2 groupId = groupDatabase.create(groupMasterKey, decryptedGroup);
+        GroupId.V2 groupId = groupDatabase.create(groupMasterKey, decryptedGroup, null);
+
         if (groupId != null) {
           Log.i(TAG, "Created local group with placeholder");
         } else {
-          Log.i(TAG, "Create placeholder failed, group suddenly present locally, attempting to apply change");
-          if (decryptedChange != null) {
-            try {
-              GroupsV2StateProcessor.forGroup(SignalStore.account().getServiceIds(), groupMasterKey)
-                                    .updateLocalGroupToRevision(decryptedChange.revision, System.currentTimeMillis(), decryptedChange);
-            } catch (GroupNotAMemberException e) {
-              Log.w(TAG, "Unable to apply join change to existing group", e);
-            }
-          }
+          Log.i(TAG, "Create placeholder failed, group suddenly present locally");
+          groupAlreadyExists = true;
+        }
+      }
+
+      if (groupAlreadyExists) {
+        Log.i(TAG, "Attempting to update local group with change/server");
+        try {
+          GroupsV2StateProcessor.forGroup(SignalStore.account().getServiceIds(), groupMasterKey)
+                                .updateLocalGroupToRevision(decryptedChange != null ? decryptedChange.revision : GroupsV2StateProcessor.LATEST, System.currentTimeMillis(), decryptedChange);
+        } catch (GroupNotAMemberException e) {
+          Log.w(TAG, "Despite adding self to group, change/server says we are not a member, scheduling refresh of group info " + groupId, e);
+
+          AppDependencies.getJobManager()
+                         .add(new RequestGroupV2InfoJob(groupId));
+
+          throw new GroupChangeFailedException(e);
+        } catch (IOException e) {
+          Log.w(TAG, "Group data fetch failed, scheduling refresh of group info " + groupId, e);
+
+          AppDependencies.getJobManager()
+                         .add(new RequestGroupV2InfoJob(groupId));
+
+          throw e;
         }
       }
 
@@ -947,15 +970,15 @@ private GroupManager.GroupActionResult fetchGroupStateAndSendUpdate(@NonNull Rec
       } catch (GroupNotAMemberException e) {
         Log.w(TAG, "Despite adding self to group, server says we are not a member, scheduling refresh of group info " + groupId, e);
 
-        ApplicationDependencies.getJobManager()
-                               .add(new RequestGroupV2InfoJob(groupId));
+        AppDependencies.getJobManager()
+                       .add(new RequestGroupV2InfoJob(groupId));
 
         throw new GroupChangeFailedException(e);
       } catch (IOException e) {
         Log.w(TAG, "Group data fetch failed, scheduling refresh of group info " + groupId, e);
 
-        ApplicationDependencies.getJobManager()
-                               .add(new RequestGroupV2InfoJob(groupId));
+        AppDependencies.getJobManager()
+                       .add(new RequestGroupV2InfoJob(groupId));
 
         throw e;
       }
@@ -1005,7 +1028,7 @@ private DecryptedGroup createPlaceholderGroup(@NonNull DecryptedGroupJoinInfo jo
       return group.build();
     }
 
-    private @NonNull GroupChange joinGroupOnServer(boolean requestToJoin, int currentRevision)
+    private @NonNull GroupChangeResponse joinGroupOnServer(boolean requestToJoin, int currentRevision)
         throws GroupChangeFailedException, IOException, MembershipNotSuitableForV2Exception, GroupLinkNotActiveException, GroupJoinAlreadyAMemberException
     {
       if (!GroupsV2CapabilityChecker.allAndSelfHaveServiceId(Collections.singleton(Recipient.self().getId()))) {
@@ -1028,7 +1051,7 @@ private DecryptedGroup createPlaceholderGroup(@NonNull DecryptedGroupJoinInfo jo
       return commitJoinChangeWithConflictResolution(currentRevision, change);
     }
 
-    private @NonNull GroupChange commitJoinChangeWithConflictResolution(int currentRevision, @NonNull GroupChange.Actions.Builder change)
+    private @NonNull GroupChangeResponse commitJoinChangeWithConflictResolution(int currentRevision, @NonNull GroupChange.Actions.Builder change)
         throws GroupChangeFailedException, IOException, GroupLinkNotActiveException, GroupJoinAlreadyAMemberException
     {
       for (int attempt = 0; attempt < 5; attempt++) {
@@ -1037,10 +1060,10 @@ private DecryptedGroup createPlaceholderGroup(@NonNull DecryptedGroupJoinInfo jo
                                                     .build();
 
           Log.i(TAG, "Trying to join group at V" + changeActions.revision);
-          GroupChange signedGroupChange = commitJoinToServer(changeActions);
+          GroupChangeResponse changeResponse = commitJoinToServer(changeActions);
 
           Log.i(TAG, "Successfully joined group at V" + changeActions.revision);
-          return signedGroupChange;
+          return changeResponse;
         } catch (GroupPatchNotAcceptedException e) {
           Log.w(TAG, "Patch not accepted", e);
 
@@ -1050,7 +1073,7 @@ private DecryptedGroup createPlaceholderGroup(@NonNull DecryptedGroupJoinInfo jo
             } else {
               throw new GroupChangeFailedException(e);
             }
-          } catch (VerificationFailedException | InvalidGroupStateException ex) {
+          } catch (VerificationFailedException | InvalidGroupStateException | InvalidInputException ex) {
             throw new GroupChangeFailedException(ex);
           }
         } catch (ConflictException e) {
@@ -1063,7 +1086,7 @@ private DecryptedGroup createPlaceholderGroup(@NonNull DecryptedGroupJoinInfo jo
       throw new GroupChangeFailedException("Unable to join group after conflicts");
     }
 
-    private @NonNull GroupChange commitJoinToServer(@NonNull GroupChange.Actions change)
+    private @NonNull GroupChangeResponse commitJoinToServer(@NonNull GroupChange.Actions change)
       throws GroupChangeFailedException, IOException, GroupLinkNotActiveException
     {
       try {
@@ -1108,7 +1131,7 @@ private boolean alreadyPendingAdminApproval()
     }
 
     private boolean testGroupMembership()
-      throws IOException, VerificationFailedException, InvalidGroupStateException
+        throws IOException, VerificationFailedException, InvalidGroupStateException, InvalidInputException
     {
       try {
         groupsV2Api.getGroup(groupSecretParams, authorization.getAuthorizationForToday(serviceIds, groupSecretParams));
@@ -1139,7 +1162,7 @@ void cancelJoinRequest()
         DecryptedGroupChange decryptedChange = groupOperations.decryptChange(signedGroupChange, false).get();
         DecryptedGroup       newGroup        = DecryptedGroupUtil.applyWithoutRevisionCheck(decryptedGroup, decryptedChange);
 
-        groupDatabase.update(groupId, resetRevision(newGroup, decryptedGroup.revision));
+        groupDatabase.update(groupId, resetRevision(newGroup, decryptedGroup.revision), null);
 
         sendGroupUpdateHelper.sendGroupUpdate(groupMasterKey, new GroupMutation(decryptedGroup, decryptedChange, newGroup), signedGroupChange, false);
       } catch (VerificationFailedException | InvalidGroupStateException | NotAbleToApplyGroupV2ChangeException e) {
@@ -1164,7 +1187,7 @@ private DecryptedGroup resetRevision(DecryptedGroup newGroup, int revision) {
                                                     .build();
 
           Log.i(TAG, "Trying to cancel request group at V" + changeActions.revision);
-          GroupChange signedGroupChange = commitJoinToServer(changeActions);
+          GroupChange signedGroupChange = commitJoinToServer(changeActions).groupChange;
 
           Log.i(TAG, "Successfully cancelled group join at V" + changeActions.revision);
           return signedGroupChange;
@@ -1225,7 +1248,7 @@ static class SendGroupUpdateHelper {
 
       if (plainGroupChange != null && DecryptedGroupUtil.changeIsSilent(plainGroupChange)) {
         if (sendToMembers) {
-          ApplicationDependencies.getJobManager().add(PushGroupSilentUpdateSendJob.create(context, groupId, groupMutation.getNewGroupState(), outgoingMessage));
+          AppDependencies.getJobManager().add(PushGroupSilentUpdateSendJob.create(context, groupId, groupMutation.getNewGroupState(), outgoingMessage));
         }
 
         return new RecipientAndThread(groupRecipient, -1);
@@ -1239,7 +1262,7 @@ static class SendGroupUpdateHelper {
           try {
             long messageId = SignalDatabase.messages().insertMessageOutbox(outgoingMessage, threadId, false, null);
             SignalDatabase.messages().markAsSent(messageId, true);
-            SignalDatabase.threads().update(threadId, true);
+            SignalDatabase.threads().update(threadId, true, true);
           } catch (MmsException e) {
             throw new AssertionError(e);
           }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupNotAMemberException.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupNotAMemberException.java
deleted file mode 100644
index 5c8bc02157..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupNotAMemberException.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.thoughtcrime.securesms.groups;
-
-public final class GroupNotAMemberException extends GroupChangeException {
-
-  private final boolean likelyPendingMember;
-
-  public GroupNotAMemberException(Throwable throwable) {
-    super(throwable);
-    this.likelyPendingMember = false;
-  }
-
-  public GroupNotAMemberException(GroupNotAMemberException throwable, boolean likelyPendingMember) {
-    super(throwable.getCause() != null ? throwable.getCause() : throwable);
-    this.likelyPendingMember = likelyPendingMember;
-  }
-
-  GroupNotAMemberException() {
-    this.likelyPendingMember = false;
-  }
-
-  public boolean isLikelyPendingMember() {
-    return likelyPendingMember;
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupNotAMemberException.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupNotAMemberException.kt
new file mode 100644
index 0000000000..a7f0918d04
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupNotAMemberException.kt
@@ -0,0 +1,7 @@
+package org.thoughtcrime.securesms.groups
+
+class GroupNotAMemberException : GroupChangeException {
+  constructor()
+  constructor(throwable: Throwable) : super(throwable)
+  constructor(throwable: GroupNotAMemberException) : super(throwable.cause ?: throwable)
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupProtoUtil.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupProtoUtil.java
index fe6ef4edf1..4ddfa07e96 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupProtoUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupProtoUtil.java
@@ -11,15 +11,12 @@
 import org.signal.storageservice.protos.groups.local.DecryptedMember;
 import org.signal.storageservice.protos.groups.local.DecryptedPendingMember;
 import org.thoughtcrime.securesms.backup.v2.proto.GroupChangeChatUpdate;
-import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.GroupsV2UpdateMessageConverter;
 import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context;
 import org.thoughtcrime.securesms.database.model.databaseprotos.GV2UpdateDescription;
-import org.thoughtcrime.securesms.database.model.databaseprotos.MessageExtras;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.whispersystems.signalservice.api.groupsv2.PartialDecryptedGroup;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.internal.push.GroupContextV2;
@@ -33,24 +30,6 @@ public final class GroupProtoUtil {
   private GroupProtoUtil() {
   }
 
-  public static int findRevisionWeWereAdded(@NonNull PartialDecryptedGroup partialDecryptedGroup, @NonNull ACI self)
-      throws GroupNotAMemberException
-  {
-    ByteString bytes = self.toByteString();
-    for (DecryptedMember decryptedMember : partialDecryptedGroup.getMembersList()) {
-      if (decryptedMember.aciBytes.equals(bytes)) {
-        return decryptedMember.joinedAtRevision;
-      }
-    }
-    for (DecryptedPendingMember decryptedMember : partialDecryptedGroup.getPendingMembersList()) {
-      if (decryptedMember.serviceIdBytes.equals(bytes)) {
-        // Assume latest, we don't have any information about when pending members were invited
-        return partialDecryptedGroup.getRevision();
-      }
-    }
-    throw new GroupNotAMemberException();
-  }
-
   public static GV2UpdateDescription createOutgoingGroupV2UpdateDescription(@NonNull GroupMasterKey masterKey,
                                                                             @NonNull GroupMutation groupMutation,
                                                                             @Nullable GroupChange signedServerChange)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/LiveGroup.java b/app/src/main/java/org/thoughtcrime/securesms/groups/LiveGroup.java
index fa3209e380..3de4b93203 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/LiveGroup.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/LiveGroup.java
@@ -20,7 +20,7 @@
 import org.thoughtcrime.securesms.database.GroupTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.GroupRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.ui.GroupMemberEntry;
 import org.thoughtcrime.securesms.groups.v2.GroupInviteLinkUrl;
 import org.thoughtcrime.securesms.groups.v2.GroupLinkUrlAndStatus;
@@ -39,8 +39,8 @@ public final class LiveGroup {
 
   private static final Comparator<GroupMemberEntry.FullMember>         LOCAL_FIRST       = (m1, m2) -> Boolean.compare(m2.getMember().isSelf(), m1.getMember().isSelf());
   private static final Comparator<GroupMemberEntry.FullMember>         ADMIN_FIRST       = (m1, m2) -> Boolean.compare(m2.isAdmin(), m1.isAdmin());
-  private static final Comparator<GroupMemberEntry.FullMember>         HAS_DISPLAY_NAME  = (m1, m2) -> Boolean.compare(m2.getMember().hasAUserSetDisplayName(ApplicationDependencies.getApplication()), m1.getMember().hasAUserSetDisplayName(ApplicationDependencies.getApplication()));
-  private static final Comparator<GroupMemberEntry.FullMember>         ALPHABETICAL      = (m1, m2) -> m1.getMember().getDisplayName(ApplicationDependencies.getApplication()).compareToIgnoreCase(m2.getMember().getDisplayName(ApplicationDependencies.getApplication()));
+  private static final Comparator<GroupMemberEntry.FullMember>         HAS_DISPLAY_NAME  = (m1, m2) -> Boolean.compare(m2.getMember().hasAUserSetDisplayName(AppDependencies.getApplication()), m1.getMember().hasAUserSetDisplayName(AppDependencies.getApplication()));
+  private static final Comparator<GroupMemberEntry.FullMember>         ALPHABETICAL      = (m1, m2) -> m1.getMember().getDisplayName(AppDependencies.getApplication()).compareToIgnoreCase(m2.getMember().getDisplayName(AppDependencies.getApplication()));
   private static final Comparator<? super GroupMemberEntry.FullMember> MEMBER_ORDER      = ComparatorCompat.chain(LOCAL_FIRST)
                                                                                                            .thenComparing(ADMIN_FIRST)
                                                                                                            .thenComparing(HAS_DISPLAY_NAME)
@@ -54,7 +54,7 @@ public final class LiveGroup {
   private final LiveData<GroupLinkUrlAndStatus>                   groupLink;
 
   public LiveGroup(@NonNull GroupId groupId) {
-    Context                        context       = ApplicationDependencies.getApplication();
+    Context                        context       = AppDependencies.getApplication();
     MutableLiveData<LiveRecipient> liveRecipient = new MutableLiveData<>();
 
     this.groupDatabase     = SignalDatabase.groups();
@@ -123,7 +123,7 @@ public LiveData<String> getTitle() {
       if (!TextUtils.isEmpty(title)) {
         return title;
       }
-      return recipient.getDisplayName(ApplicationDependencies.getApplication());
+      return recipient.getDisplayName(AppDependencies.getApplication());
     });
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupLimitDialog.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupLimitDialog.java
index add3f708ea..c5c7790c5b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupLimitDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupLimitDialog.java
@@ -7,14 +7,14 @@
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 
 public final class GroupLimitDialog {
 
   public static void showHardLimitMessage(@NonNull Context context) {
     new MaterialAlertDialogBuilder(context)
                    .setTitle(R.string.ContactSelectionListFragment_maximum_group_size_reached)
-                   .setMessage(context.getString(R.string.ContactSelectionListFragment_signal_groups_can_have_a_maximum_of_d_members, FeatureFlags.groupLimits().getHardLimit()))
+                   .setMessage(context.getString(R.string.ContactSelectionListFragment_signal_groups_can_have_a_maximum_of_d_members, RemoteConfig.groupLimits().getHardLimit()))
                    .setPositiveButton(android.R.string.ok, null)
                    .show();
   }
@@ -22,7 +22,7 @@ public static void showHardLimitMessage(@NonNull Context context) {
   public static void showRecommendedLimitMessage(@NonNull Context context) {
     new MaterialAlertDialogBuilder(context)
                    .setTitle(R.string.ContactSelectionListFragment_recommended_member_limit_reached)
-                   .setMessage(context.getString(R.string.ContactSelectionListFragment_signal_groups_perform_best_with_d_members_or_fewer, FeatureFlags.groupLimits().getRecommendedLimit()))
+                   .setMessage(context.getString(R.string.ContactSelectionListFragment_signal_groups_perform_best_with_d_members_or_fewer, RemoteConfig.groupLimits().getRecommendedLimit()))
                    .setPositiveButton(android.R.string.ok, null)
                    .show();
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersRepository.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersRepository.java
index 13cd9ca28d..e1b7073607 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersRepository.java
@@ -7,7 +7,7 @@
 
 import org.thoughtcrime.securesms.contacts.SelectedContact;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 
@@ -18,7 +18,7 @@ final class AddMembersRepository {
 
   AddMembersRepository(@NonNull GroupId groupId) {
     this.groupId = groupId;
-    this.context = ApplicationDependencies.getApplication();
+    this.context = AppDependencies.getApplication();
   }
 
   @WorkerThread
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersViewModel.java
index b84cb81340..4e2e5a3b8f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersViewModel.java
@@ -11,7 +11,7 @@
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.contacts.SelectedContact;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -54,7 +54,7 @@ private AddMemberDialogMessageStatePartial getDialogStateForMultipleRecipients(i
   }
 
   private static @NonNull String titleOrDefault(@Nullable String title) {
-    return TextUtils.isEmpty(title) ? ApplicationDependencies.getApplication().getString(R.string.Recipient_unknown)
+    return TextUtils.isEmpty(title) ? AppDependencies.getApplication().getString(R.string.Recipient_unknown)
                                     : Objects.requireNonNull(title);
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupViewModel.java
index 7d35384a09..66b439c611 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupViewModel.java
@@ -8,7 +8,7 @@
 
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.ui.GroupChangeFailureReason;
 import org.thoughtcrime.securesms.groups.ui.GroupErrors;
 import org.thoughtcrime.securesms.groups.v2.GroupAddMembersResult;
@@ -21,8 +21,6 @@
 import java.util.List;
 import java.util.Objects;
 
-import kotlin.Unit;
-
 public final class AddToGroupViewModel extends ViewModel {
 
   private final Application               context;
@@ -31,7 +29,7 @@ public final class AddToGroupViewModel extends ViewModel {
   private final SingleLiveEvent<Event> events      = new SingleLiveEvent<>();
 
   private AddToGroupViewModel(@NonNull RecipientId recipientId) {
-    this.context     = ApplicationDependencies.getApplication();
+    this.context     = AppDependencies.getApplication();
     this.recipientId = recipientId;
     this.repository  = new GroupManagementRepository();
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/chooseadmin/ChooseNewAdminViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/chooseadmin/ChooseNewAdminViewModel.java
index d786dc2337..8d5f520c4d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/chooseadmin/ChooseNewAdminViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/chooseadmin/ChooseNewAdminViewModel.java
@@ -9,7 +9,7 @@
 
 import com.annimon.stream.Stream;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.groups.LiveGroup;
 import org.thoughtcrime.securesms.groups.ui.GroupChangeResult;
@@ -65,7 +65,7 @@ static final class Factory implements ViewModelProvider.Factory {
     @Override
     public @NonNull <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
       //noinspection ConstantConditions
-      return modelClass.cast(new ChooseNewAdminViewModel(groupId, new ChooseNewAdminRepository(ApplicationDependencies.getApplication())));
+      return modelClass.cast(new ChooseNewAdminViewModel(groupId, new ChooseNewAdminRepository(AppDependencies.getApplication())));
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.java
index 84aec05ff9..51bf453d5a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.java
@@ -25,13 +25,12 @@
 import org.thoughtcrime.securesms.contacts.ContactSelectionDisplayMode;
 import org.thoughtcrime.securesms.contacts.sync.ContactDiscovery;
 import org.thoughtcrime.securesms.groups.ui.creategroup.details.AddGroupDetailsActivity;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.recipients.RecipientRepository;
 import org.thoughtcrime.securesms.recipients.ui.findby.FindByActivity;
 import org.thoughtcrime.securesms.recipients.ui.findby.FindByMode;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 
 import java.io.IOException;
@@ -62,7 +61,7 @@ public static Intent newIntent(@NonNull Context context) {
     int displayMode = ContactSelectionDisplayMode.FLAG_PUSH;
 
     intent.putExtra(ContactSelectionListFragment.DISPLAY_MODE, displayMode);
-    intent.putExtra(ContactSelectionListFragment.SELECTION_LIMITS, FeatureFlags.groupLimits().excludingSelf());
+    intent.putExtra(ContactSelectionListFragment.SELECTION_LIMITS, RemoteConfig.groupLimits().excludingSelf());
     intent.putExtra(ContactSelectionListFragment.RV_PADDING_BOTTOM, (int) DimensionUnit.DP.toPixels(64f));
     intent.putExtra(ContactSelectionListFragment.RV_CLIP, false);
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsFragment.java
index 39b06acb7f..f37da889f1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsFragment.java
@@ -46,7 +46,7 @@
 import org.thoughtcrime.securesms.recipients.ui.disappearingmessages.RecipientDisappearingMessagesActivity;
 import org.thoughtcrime.securesms.util.BitmapUtil;
 import org.thoughtcrime.securesms.util.ExpirationUtil;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
 import org.thoughtcrime.securesms.util.text.AfterTextChanged;
@@ -116,7 +116,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
     avatar.setOnClickListener(v -> showAvatarPicker());
     members.setRecipientClickListener(this::handleRecipientClick);
-    EditTextUtil.addGraphemeClusterLimitFilter(name, FeatureFlags.getMaxGroupNameGraphemeLength());
+    EditTextUtil.addGraphemeClusterLimitFilter(name, RemoteConfig.getMaxGroupNameGraphemeLength());
     name.addTextChangedListener(new AfterTextChanged(editable -> viewModel.setName(editable.toString())));
     toolbar.setNavigationOnClickListener(unused -> callback.onNavigationButtonPressed());
     create.setOnClickListener(v -> handleCreateClicked());
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinBottomSheetDialogFragment.java
index ff23ee3c69..e7385ba7ac 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinBottomSheetDialogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinBottomSheetDialogFragment.java
@@ -23,14 +23,11 @@
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.AvatarImageView;
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
-import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
 import org.thoughtcrime.securesms.conversation.ConversationIntents;
 import org.thoughtcrime.securesms.conversation.colors.AvatarColor;
 import org.thoughtcrime.securesms.groups.ui.managegroup.dialogs.GroupDescriptionDialog;
 import org.thoughtcrime.securesms.groups.v2.GroupDescriptionUtil;
 import org.thoughtcrime.securesms.groups.v2.GroupInviteLinkUrl;
-import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.BottomSheetUtil;
 import org.thoughtcrime.securesms.util.LongClickMovementMethod;
 import org.thoughtcrime.securesms.util.ThemeUtil;
@@ -87,7 +84,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
 
     groupCancelButton.setOnClickListener(v -> dismiss());
 
-    avatar.setImageBytesForGroup(null, new FallbackPhotoProvider(), AvatarColor.UNKNOWN);
+    avatar.setImageBytesForGroup(null, AvatarColor.UNKNOWN);
 
     return view;
   }
@@ -118,7 +115,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
       });
       groupJoinButton.setVisibility(View.VISIBLE);
 
-      avatar.setImageBytesForGroup(details.getAvatarBytes(), new FallbackPhotoProvider(), AvatarColor.UNKNOWN);
+      avatar.setImageBytesForGroup(details.getAvatarBytes(), AvatarColor.UNKNOWN);
 
       groupCancelButton.setVisibility(View.VISIBLE);
     });
@@ -204,10 +201,4 @@ public void show(@NonNull FragmentManager manager, @Nullable String tag) {
     BottomSheetUtil.show(manager, tag, this);
   }
 
-  private static final class FallbackPhotoProvider extends Recipient.FallbackPhotoProvider {
-    @Override
-    public @NonNull FallbackContactPhoto getPhotoForGroup() {
-      return new ResourceContactPhoto(R.drawable.ic_group_outline_48);
-    }
-  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinRepository.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinRepository.java
index c135f1d0b1..52bf4c92a8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/joining/GroupJoinRepository.java
@@ -60,12 +60,16 @@ void joinGroup(@NonNull GroupDetails groupDetails,
 
         callback.onComplete(new JoinGroupSuccess(groupActionResult.getGroupRecipient(), groupActionResult.getThreadId()));
       } catch (IOException e) {
+        Log.w(TAG, "Network error", e);
         callback.onError(JoinGroupError.NETWORK_ERROR);
       } catch (GroupChangeBusyException e) {
+        Log.w(TAG, "Change error", e);
         callback.onError(JoinGroupError.BUSY);
       } catch (GroupLinkNotActiveException e) {
+        Log.w(TAG, "Inactive group error", e);
         callback.onError(e.getReason() == GroupLinkNotActiveException.Reason.BANNED ? JoinGroupError.BANNED : JoinGroupError.GROUP_LINK_NOT_ACTIVE);
       } catch (GroupChangeFailedException | MembershipNotSuitableForV2Exception e) {
+        Log.w(TAG, "Change failed", e);
         callback.onError(JoinGroupError.FAILED);
       }
     });
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupCandidateHelper.java b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupCandidateHelper.java
index 8421819cf5..ae7144c0ad 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupCandidateHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupCandidateHelper.java
@@ -7,7 +7,7 @@
 import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential;
 import org.thoughtcrime.securesms.database.RecipientTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.ProfileUtil;
@@ -28,7 +28,7 @@ public class GroupCandidateHelper {
   private final RecipientTable              recipientTable;
 
   public GroupCandidateHelper() {
-    signalServiceAccountManager = ApplicationDependencies.getSignalServiceAccountManager();
+    signalServiceAccountManager = AppDependencies.getSignalServiceAccountManager();
     recipientTable              = SignalDatabase.recipients();
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupManagementRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupManagementRepository.kt
index a51780c7dc..15841215d9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupManagementRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupManagementRepository.kt
@@ -10,7 +10,7 @@ import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.contacts.sync.ContactDiscovery
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupChangeBusyException
 import org.thoughtcrime.securesms.groups.GroupChangeException
 import org.thoughtcrime.securesms.groups.GroupChangeFailedException
@@ -26,7 +26,7 @@ private val TAG: String = Log.tag(GroupManagementRepository::class.java)
 /**
  * Single source repository for managing GV2 groups.
  */
-class GroupManagementRepository @JvmOverloads constructor(private val context: Context = ApplicationDependencies.getApplication()) {
+class GroupManagementRepository @JvmOverloads constructor(private val context: Context = AppDependencies.application) {
 
   fun addMembers(groupRecipient: Recipient, selected: List<RecipientId>, consumer: Consumer<GroupAddMembersResult>) {
     addMembers(null, groupRecipient, selected, consumer)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/AdvanceGroupStateResult.java b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/AdvanceGroupStateResult.java
deleted file mode 100644
index d0a9c4509c..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/AdvanceGroupStateResult.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.thoughtcrime.securesms.groups.v2.processing;
-
-import androidx.annotation.NonNull;
-
-import java.util.Collection;
-
-/**
- * Pair of log entries applied and a new {@link GlobalGroupState}.
- */
-final class AdvanceGroupStateResult {
-
-  @NonNull private final Collection<LocalGroupLogEntry> processedLogEntries;
-  @NonNull private final GlobalGroupState               newGlobalGroupState;
-
-  AdvanceGroupStateResult(@NonNull Collection<LocalGroupLogEntry> processedLogEntries,
-                          @NonNull GlobalGroupState newGlobalGroupState)
-  {
-    this.processedLogEntries = processedLogEntries;
-    this.newGlobalGroupState = newGlobalGroupState;
-  }
-
-  @NonNull Collection<LocalGroupLogEntry> getProcessedLogEntries() {
-    return processedLogEntries;
-  }
-
-  @NonNull GlobalGroupState getNewGlobalGroupState() {
-    return newGlobalGroupState;
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/AdvanceGroupStateResult.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/AdvanceGroupStateResult.kt
new file mode 100644
index 0000000000..014efdc425
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/AdvanceGroupStateResult.kt
@@ -0,0 +1,17 @@
+package org.thoughtcrime.securesms.groups.v2.processing
+
+import org.signal.storageservice.protos.groups.local.DecryptedGroup
+import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupChangeLog
+
+/**
+ * Result of applying group state changes to a local group state.
+ *
+ * @param updatedGroupState cumulative result of applying changes to the input group state
+ * @param processedLogEntries Local view of logs/changes applied from input group state to [updatedGroupState]
+ * @param remainingRemoteGroupChanges Remote view of logs/changes yet to be applied to the local [updatedGroupState]
+ */
+data class AdvanceGroupStateResult @JvmOverloads constructor(
+  val updatedGroupState: DecryptedGroup?,
+  val processedLogEntries: Collection<AppliedGroupChangeLog> = emptyList(),
+  val remainingRemoteGroupChanges: List<DecryptedGroupChangeLog> = emptyList()
+)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/AppliedGroupChangeLog.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/AppliedGroupChangeLog.kt
new file mode 100644
index 0000000000..a67c6effbe
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/AppliedGroupChangeLog.kt
@@ -0,0 +1,19 @@
+package org.thoughtcrime.securesms.groups.v2.processing
+
+import org.signal.storageservice.protos.groups.local.DecryptedGroup
+import org.signal.storageservice.protos.groups.local.DecryptedGroupChange
+
+/**
+ * Pair of a group state and optionally the corresponding change.
+ *
+ * Similar to [org.whispersystems.signalservice.api.groupsv2.DecryptedGroupChangeLog] but guaranteed to have a group state.
+ *
+ * Changes are typically not available for pending members.
+ */
+data class AppliedGroupChangeLog internal constructor(val group: DecryptedGroup, val change: DecryptedGroupChange?) {
+  init {
+    if (change != null && group.revision != change.revision) {
+      throw AssertionError()
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GlobalGroupState.java b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GlobalGroupState.java
deleted file mode 100644
index 800775a088..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GlobalGroupState.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.thoughtcrime.securesms.groups.v2.processing;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.signal.storageservice.protos.groups.local.DecryptedGroup;
-import org.whispersystems.signalservice.api.groupsv2.GroupHistoryPage;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Combination of Local and Server group state.
- */
-final class GlobalGroupState {
-
-  @Nullable private final DecryptedGroup              localState;
-  @NonNull  private final List<ServerGroupLogEntry>   serverHistory;
-  @NonNull  private final GroupHistoryPage.PagingData pagingData;
-
-  GlobalGroupState(@Nullable DecryptedGroup localState,
-                   @NonNull List<ServerGroupLogEntry> serverHistory,
-                   @NonNull GroupHistoryPage.PagingData pagingData)
-  {
-    this.localState    = localState;
-    this.serverHistory = serverHistory;
-    this.pagingData    = pagingData;
-  }
-
-  GlobalGroupState(@Nullable DecryptedGroup localState,
-                   @NonNull List<ServerGroupLogEntry> serverHistory)
-  {
-    this(localState, serverHistory, GroupHistoryPage.PagingData.NONE);
-  }
-
-  @Nullable DecryptedGroup getLocalState() {
-    return localState;
-  }
-
-  @NonNull Collection<ServerGroupLogEntry> getServerHistory() {
-    return serverHistory;
-  }
-
-  int getEarliestRevisionNumber() {
-    if (localState != null) {
-      return localState.revision;
-    } else {
-      if (serverHistory.isEmpty()) {
-        throw new AssertionError();
-      }
-      return serverHistory.get(0).getRevision();
-    }
-  }
-
-  int getLatestRevisionNumber() {
-    if (serverHistory.isEmpty()) {
-      if (localState == null) {
-        throw new AssertionError();
-      }
-      return localState.revision;
-    }
-    return serverHistory.get(serverHistory.size() - 1).getRevision();
-  }
-
-  public boolean hasMore() {
-    return pagingData.hasMorePages();
-  }
-
-  public int getNextPageRevision() {
-    if (!pagingData.hasMorePages()) {
-      throw new AssertionError("No paging data available");
-    }
-    return pagingData.getNextPageRevision();
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStateDiff.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStateDiff.kt
new file mode 100644
index 0000000000..96a9973852
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStateDiff.kt
@@ -0,0 +1,45 @@
+package org.thoughtcrime.securesms.groups.v2.processing
+
+import org.signal.libsignal.zkgroup.groupsend.GroupSendEndorsementsResponse
+import org.signal.storageservice.protos.groups.local.DecryptedGroup
+import org.signal.storageservice.protos.groups.local.DecryptedGroupChange
+import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupChangeLog
+
+/**
+ * Combination of Local and Server group state.
+ */
+class GroupStateDiff(
+  val previousGroupState: DecryptedGroup?,
+  val serverHistory: List<DecryptedGroupChangeLog>,
+  val groupSendEndorsementsResponse: GroupSendEndorsementsResponse?
+) {
+
+  constructor(
+    previousGroupState: DecryptedGroup?,
+    changedGroupState: DecryptedGroup?,
+    change: DecryptedGroupChange?
+  ) : this(previousGroupState, listOf(DecryptedGroupChangeLog(changedGroupState, change)), null)
+
+  val earliestRevisionNumber: Int
+    get() {
+      if (previousGroupState != null) {
+        return previousGroupState.revision
+      } else {
+        if (serverHistory.isEmpty()) {
+          throw AssertionError()
+        }
+        return serverHistory[0].revision
+      }
+    }
+
+  val latestRevisionNumber: Int
+    get() {
+      if (serverHistory.isEmpty()) {
+        if (previousGroupState == null) {
+          throw AssertionError()
+        }
+        return previousGroupState.revision
+      }
+      return serverHistory[serverHistory.size - 1].revision
+    }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStateMapper.java b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStatePatcher.java
similarity index 72%
rename from app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStateMapper.java
rename to app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStatePatcher.java
index 874ddea4fc..c586e96604 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStateMapper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStatePatcher.java
@@ -6,6 +6,7 @@
 import org.signal.core.util.logging.Log;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;
 import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
+import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupChangeLog;
 import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil;
 import org.whispersystems.signalservice.api.groupsv2.GroupChangeReconstruct;
 import org.whispersystems.signalservice.api.groupsv2.GroupChangeUtil;
@@ -17,47 +18,47 @@
 import java.util.HashMap;
 import java.util.List;
 
-final class GroupStateMapper {
+final class GroupStatePatcher {
 
-  private static final String TAG = Log.tag(GroupStateMapper.class);
+  private static final String TAG = Log.tag(GroupStatePatcher.class);
 
   static final int LATEST                       = Integer.MAX_VALUE;
   static final int PLACEHOLDER_REVISION         = -1;
   static final int RESTORE_PLACEHOLDER_REVISION = -2;
 
-  private static final Comparator<ServerGroupLogEntry> BY_REVISION = (o1, o2) -> Integer.compare(o1.getRevision(), o2.getRevision());
+  private static final Comparator<DecryptedGroupChangeLog> BY_REVISION = (o1, o2) -> Integer.compare(o1.getRevision(), o2.getRevision());
 
-  private GroupStateMapper() {
+  private GroupStatePatcher() {
   }
 
   /**
-   * Given an input {@link GlobalGroupState} and a {@param maximumRevisionToApply}, returns a result
+   * Given an input {@link GroupStateDiff} and a {@param maximumRevisionToApply}, returns a result
    * containing what the new local group state should be, and any remaining revision history to apply.
    * <p>
    * Function is pure.
    * @param maximumRevisionToApply Use {@link #LATEST} to apply the very latest.
    */
-  static @NonNull AdvanceGroupStateResult partiallyAdvanceGroupState(@NonNull GlobalGroupState inputState,
-                                                                     int maximumRevisionToApply)
+  static @NonNull AdvanceGroupStateResult applyGroupStateDiff(@NonNull GroupStateDiff inputState,
+                                                              int maximumRevisionToApply)
   {
     AdvanceGroupStateResult groupStateResult = processChanges(inputState, maximumRevisionToApply);
 
-    return cleanDuplicatedChanges(groupStateResult, inputState.getLocalState());
+    return cleanDuplicatedChanges(groupStateResult, inputState.getPreviousGroupState());
   }
 
-  private static @NonNull AdvanceGroupStateResult processChanges(@NonNull GlobalGroupState inputState,
+  private static @NonNull AdvanceGroupStateResult processChanges(@NonNull GroupStateDiff inputState,
                                                                  int maximumRevisionToApply)
   {
-    HashMap<Integer, ServerGroupLogEntry>            statesToApplyNow   = new HashMap<>(inputState.getServerHistory().size());
-    ArrayList<ServerGroupLogEntry>                   statesToApplyLater = new ArrayList<>(inputState.getServerHistory().size());
-    DecryptedGroup                                   current            = inputState.getLocalState();
+    HashMap<Integer, DecryptedGroupChangeLog>        statesToApplyNow   = new HashMap<>(inputState.getServerHistory().size());
+    ArrayList<DecryptedGroupChangeLog>               statesToApplyLater = new ArrayList<>(inputState.getServerHistory().size());
+    DecryptedGroup                                   current            = inputState.getPreviousGroupState();
     StateChain<DecryptedGroup, DecryptedGroupChange> stateChain         = createNewMapper();
 
     if (inputState.getServerHistory().isEmpty()) {
-      return new AdvanceGroupStateResult(Collections.emptyList(), new GlobalGroupState(current, Collections.emptyList()));
+      return new AdvanceGroupStateResult(current);
     }
 
-    for (ServerGroupLogEntry entry : inputState.getServerHistory()) {
+    for (DecryptedGroupChangeLog entry : inputState.getServerHistory()) {
       if (entry.getRevision() > maximumRevisionToApply) {
         statesToApplyLater.add(entry);
       } else {
@@ -77,7 +78,7 @@ private GroupStateMapper() {
     }
 
     for (int revision = from; revision >= 0 && revision <= to; revision++) {
-      ServerGroupLogEntry entry = statesToApplyNow.get(revision);
+      DecryptedGroupChangeLog entry = statesToApplyNow.get(revision);
       if (entry == null) {
         Log.w(TAG, "Could not find group log on server V" + revision);
         continue;
@@ -96,15 +97,15 @@ private GroupStateMapper() {
     }
 
     List<StateChain.Pair<DecryptedGroup, DecryptedGroupChange>> mapperList     = stateChain.getList();
-    List<LocalGroupLogEntry>                                    appliedChanges = new ArrayList<>(mapperList.size());
+    List<AppliedGroupChangeLog>                                 appliedChanges = new ArrayList<>(mapperList.size());
 
     for (StateChain.Pair<DecryptedGroup, DecryptedGroupChange> entry : mapperList) {
       if (current == null || entry.getDelta() != null) {
-        appliedChanges.add(new LocalGroupLogEntry(entry.getState(), entry.getDelta()));
+        appliedChanges.add(new AppliedGroupChangeLog(entry.getState(), entry.getDelta()));
       }
     }
 
-    return new AdvanceGroupStateResult(appliedChanges, new GlobalGroupState(stateChain.getLatestState(), statesToApplyLater));
+    return new AdvanceGroupStateResult(stateChain.getLatestState(), appliedChanges, statesToApplyLater);
   }
 
   private static AdvanceGroupStateResult cleanDuplicatedChanges(@NonNull AdvanceGroupStateResult groupStateResult,
@@ -112,21 +113,21 @@ private static AdvanceGroupStateResult cleanDuplicatedChanges(@NonNull AdvanceGr
   {
     if (previousGroupState == null) return groupStateResult;
 
-    ArrayList<LocalGroupLogEntry> appliedChanges = new ArrayList<>(groupStateResult.getProcessedLogEntries().size());
+    ArrayList<AppliedGroupChangeLog> appliedChanges = new ArrayList<>(groupStateResult.getProcessedLogEntries().size());
 
-    for (LocalGroupLogEntry entry : groupStateResult.getProcessedLogEntries()) {
+    for (AppliedGroupChangeLog entry : groupStateResult.getProcessedLogEntries()) {
       DecryptedGroupChange change = entry.getChange();
 
       if (change != null) {
         change = GroupChangeUtil.resolveConflict(previousGroupState, change).build();
       }
 
-      appliedChanges.add(new LocalGroupLogEntry(entry.getGroup(), change));
+      appliedChanges.add(new AppliedGroupChangeLog(entry.getGroup(), change));
 
       previousGroupState = entry.getGroup();
     }
 
-    return new AdvanceGroupStateResult(appliedChanges, groupStateResult.getNewGlobalGroupState());
+    return new AdvanceGroupStateResult(groupStateResult.getUpdatedGroupState(), appliedChanges, groupStateResult.getRemainingRemoteGroupChanges());
   }
 
   private static StateChain<DecryptedGroup, DecryptedGroupChange> createNewMapper() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupUpdateResult.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupUpdateResult.kt
new file mode 100644
index 0000000000..30eac77de9
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupUpdateResult.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+package org.thoughtcrime.securesms.groups.v2.processing
+
+import org.signal.storageservice.protos.groups.local.DecryptedGroup
+
+/**
+ * Result of updating a local group state via P2P group change or a server pull.
+ */
+data class GroupUpdateResult(val updateStatus: UpdateStatus, val latestServer: DecryptedGroup?) {
+
+  companion object {
+    val CONSISTENT_OR_AHEAD = GroupUpdateResult(UpdateStatus.GROUP_CONSISTENT_OR_AHEAD, null)
+
+    fun updated(updatedGroupState: DecryptedGroup): GroupUpdateResult {
+      return GroupUpdateResult(UpdateStatus.GROUP_UPDATED, updatedGroupState)
+    }
+  }
+
+  enum class UpdateStatus {
+    /** The local group was successfully updated to be consistent with the message revision */
+    GROUP_UPDATED,
+
+    /** The local group is already consistent with the message revision or is ahead of the message revision */
+    GROUP_CONSISTENT_OR_AHEAD
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.java
deleted file mode 100644
index b7e87faa6b..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.java
+++ /dev/null
@@ -1,799 +0,0 @@
-package org.thoughtcrime.securesms.groups.v2.processing;
-
-import android.text.TextUtils;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import androidx.annotation.WorkerThread;
-
-import org.signal.core.util.logging.Log;
-import org.signal.libsignal.zkgroup.VerificationFailedException;
-import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
-import org.signal.libsignal.zkgroup.groups.GroupSecretParams;
-import org.signal.storageservice.protos.groups.local.DecryptedGroup;
-import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
-import org.signal.storageservice.protos.groups.local.DecryptedMember;
-import org.signal.storageservice.protos.groups.local.DecryptedPendingMember;
-import org.thoughtcrime.securesms.database.GroupTable;
-import org.thoughtcrime.securesms.database.MessageTable;
-import org.thoughtcrime.securesms.database.RecipientTable;
-import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.database.ThreadTable;
-import org.thoughtcrime.securesms.database.model.GroupRecord;
-import org.thoughtcrime.securesms.database.model.GroupsV2UpdateMessageConverter;
-import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context;
-import org.thoughtcrime.securesms.database.model.databaseprotos.GV2UpdateDescription;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.groups.GroupId;
-import org.thoughtcrime.securesms.groups.GroupMutation;
-import org.thoughtcrime.securesms.groups.GroupNotAMemberException;
-import org.thoughtcrime.securesms.groups.GroupProtoUtil;
-import org.thoughtcrime.securesms.groups.GroupsV2Authorization;
-import org.thoughtcrime.securesms.groups.v2.ProfileKeySet;
-import org.thoughtcrime.securesms.jobmanager.Job;
-import org.thoughtcrime.securesms.jobs.AvatarGroupsV2DownloadJob;
-import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
-import org.thoughtcrime.securesms.jobs.LeaveGroupV2Job;
-import org.thoughtcrime.securesms.jobs.RequestGroupV2InfoJob;
-import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.mms.IncomingMessage;
-import org.thoughtcrime.securesms.mms.MmsException;
-import org.thoughtcrime.securesms.mms.OutgoingMessage;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupHistoryEntry;
-import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil;
-import org.whispersystems.signalservice.api.groupsv2.GroupChangeReconstruct;
-import org.whispersystems.signalservice.api.groupsv2.GroupHistoryPage;
-import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api;
-import org.whispersystems.signalservice.api.groupsv2.InvalidGroupStateException;
-import org.whispersystems.signalservice.api.groupsv2.NotAbleToApplyGroupV2ChangeException;
-import org.whispersystems.signalservice.api.groupsv2.PartialDecryptedGroup;
-import org.whispersystems.signalservice.api.push.ServiceId;
-import org.whispersystems.signalservice.api.push.ServiceId.ACI;
-import org.whispersystems.signalservice.api.push.ServiceIds;
-import org.whispersystems.signalservice.api.util.UuidUtil;
-import org.whispersystems.signalservice.internal.push.exceptions.GroupNotFoundException;
-import org.whispersystems.signalservice.internal.push.exceptions.NotInGroupException;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-
-/**
- * Advances a groups state to a specified revision.
- */
-public class GroupsV2StateProcessor {
-
-  private static final String TAG = Log.tag(GroupsV2StateProcessor.class);
-
-  public static final int LATEST = GroupStateMapper.LATEST;
-
-  /**
-   * Used to mark a group state as a placeholder when there is partial knowledge (title and avater)
-   * gathered from a group join link.
-   */
-  public static final int PLACEHOLDER_REVISION = GroupStateMapper.PLACEHOLDER_REVISION;
-
-  /**
-   * Used to mark a group state as a placeholder when you have no knowledge at all of the group
-   * e.g. from a group master key from a storage service restore.
-   */
-  public static final int RESTORE_PLACEHOLDER_REVISION = GroupStateMapper.RESTORE_PLACEHOLDER_REVISION;
-
-  private GroupsV2StateProcessor() {
-  }
-
-  public static StateProcessorForGroup forGroup(@NonNull ServiceIds serviceIds, @NonNull GroupMasterKey groupMasterKey) {
-    return forGroup(serviceIds, groupMasterKey, null);
-  }
-
-  public static StateProcessorForGroup forGroup(@NonNull ServiceIds serviceIds, @NonNull GroupMasterKey groupMasterKey, @Nullable GroupSecretParams groupSecretParams) {
-    groupSecretParams = groupSecretParams != null ? groupSecretParams : GroupSecretParams.deriveFromMasterKey(groupMasterKey);
-
-    return new StateProcessorForGroup(
-        serviceIds,
-        SignalDatabase.groups(),
-        ApplicationDependencies.getSignalServiceAccountManager().getGroupsV2Api(),
-        ApplicationDependencies.getGroupsV2Authorization(),
-        groupMasterKey,
-        groupSecretParams,
-        SignalDatabase.recipients()
-    );
-  }
-
-  public enum GroupState {
-    /**
-     * The local group was successfully updated to be consistent with the message revision
-     */
-    GROUP_UPDATED,
-
-    /**
-     * The local group is already consistent with the message revision or is ahead of the message revision
-     */
-    GROUP_CONSISTENT_OR_AHEAD
-  }
-
-  public static class GroupUpdateResult {
-    private final GroupState     groupState;
-    private final DecryptedGroup latestServer;
-
-    GroupUpdateResult(@NonNull GroupState groupState, @Nullable DecryptedGroup latestServer) {
-      this.groupState   = groupState;
-      this.latestServer = latestServer;
-    }
-
-    public @NonNull GroupState getGroupState() {
-      return groupState;
-    }
-
-    public @Nullable DecryptedGroup getLatestServer() {
-      return latestServer;
-    }
-  }
-
-  public static final class StateProcessorForGroup {
-    private final ServiceIds              serviceIds;
-    private final GroupTable              groupDatabase;
-    private final GroupsV2Api             groupsV2Api;
-    private final GroupsV2Authorization   groupsV2Authorization;
-    private final GroupMasterKey          masterKey;
-    private final GroupId.V2              groupId;
-    private final GroupSecretParams       groupSecretParams;
-    private final ProfileAndMessageHelper profileAndMessageHelper;
-
-    private StateProcessorForGroup(@NonNull ServiceIds serviceIds,
-                                   @NonNull GroupTable groupDatabase,
-                                   @NonNull GroupsV2Api groupsV2Api,
-                                   @NonNull GroupsV2Authorization groupsV2Authorization,
-                                   @NonNull GroupMasterKey groupMasterKey,
-                                   @NonNull GroupSecretParams groupSecretParams,
-                                   @NonNull RecipientTable recipientTable)
-    {
-      this.serviceIds              = serviceIds;
-      this.groupDatabase           = groupDatabase;
-      this.groupsV2Api             = groupsV2Api;
-      this.groupsV2Authorization   = groupsV2Authorization;
-      this.masterKey               = groupMasterKey;
-      this.groupSecretParams       = groupSecretParams;
-      this.groupId                 = GroupId.v2(groupSecretParams.getPublicParams().getGroupIdentifier());
-      this.profileAndMessageHelper = new ProfileAndMessageHelper(serviceIds.getAci(), groupMasterKey, groupId, recipientTable);
-    }
-
-    @VisibleForTesting StateProcessorForGroup(@NonNull ServiceIds serviceIds,
-                                              @NonNull GroupTable groupDatabase,
-                                              @NonNull GroupsV2Api groupsV2Api,
-                                              @NonNull GroupsV2Authorization groupsV2Authorization,
-                                              @NonNull GroupMasterKey groupMasterKey,
-                                              @NonNull ProfileAndMessageHelper profileAndMessageHelper)
-    {
-      this.serviceIds              = serviceIds;
-      this.groupDatabase           = groupDatabase;
-      this.groupsV2Api             = groupsV2Api;
-      this.groupsV2Authorization   = groupsV2Authorization;
-      this.masterKey               = groupMasterKey;
-      this.groupSecretParams       = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
-      this.groupId                 = GroupId.v2(groupSecretParams.getPublicParams().getGroupIdentifier());
-      this.profileAndMessageHelper = profileAndMessageHelper;
-    }
-
-    @WorkerThread
-    public GroupUpdateResult forceSanityUpdateFromServer(long timestamp)
-        throws IOException, GroupNotAMemberException
-    {
-      Optional<GroupRecord> localRecord = groupDatabase.getGroup(groupId);
-      DecryptedGroup        localState  = localRecord.map(g -> g.requireV2GroupProperties().getDecryptedGroup()).orElse(null);
-      DecryptedGroup        serverState;
-
-      if (localState == null) {
-        info("No local state to force update");
-        return new GroupUpdateResult(GroupState.GROUP_CONSISTENT_OR_AHEAD, null);
-      }
-
-      try {
-        serverState = groupsV2Api.getGroup(groupSecretParams, groupsV2Authorization.getAuthorizationForToday(serviceIds, groupSecretParams));
-      } catch (NotInGroupException | GroupNotFoundException e) {
-        throw new GroupNotAMemberException(e);
-      } catch (VerificationFailedException | InvalidGroupStateException e) {
-        throw new IOException(e);
-      }
-
-      DecryptedGroupChange    decryptedGroupChange    = GroupChangeReconstruct.reconstructGroupChange(localState, serverState);
-      GlobalGroupState        inputGroupState         = new GlobalGroupState(localState, Collections.singletonList(new ServerGroupLogEntry(serverState, decryptedGroupChange)));
-      AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(inputGroupState, serverState.revision);
-      DecryptedGroup          newLocalState           = advanceGroupStateResult.getNewGlobalGroupState().getLocalState();
-
-      if (newLocalState == null || newLocalState == inputGroupState.getLocalState()) {
-        info("Local state and server state are equal");
-        return new GroupUpdateResult(GroupState.GROUP_CONSISTENT_OR_AHEAD, null);
-      } else {
-        info("Local state (revision: " + localState.revision + ") does not match server state (revision: " + serverState.revision + "), updating");
-      }
-
-      updateLocalDatabaseGroupState(inputGroupState, newLocalState);
-      if (localState.revision == GroupsV2StateProcessor.RESTORE_PLACEHOLDER_REVISION) {
-        info("Inserting single update message for restore placeholder");
-        profileAndMessageHelper.insertUpdateMessages(timestamp, null, Collections.singleton(new LocalGroupLogEntry(newLocalState, null)), null);
-      } else {
-        info("Inserting force update messages");
-        profileAndMessageHelper.insertUpdateMessages(timestamp, localState, advanceGroupStateResult.getProcessedLogEntries(), null);
-      }
-      profileAndMessageHelper.persistLearnedProfileKeys(inputGroupState);
-
-      return new GroupUpdateResult(GroupState.GROUP_UPDATED, newLocalState);
-    }
-
-    /**
-     * Using network where required, will attempt to bring the local copy of the group up to the revision specified.
-     *
-     * @param revision use {@link #LATEST} to get latest.
-     */
-    @WorkerThread
-    public GroupUpdateResult updateLocalGroupToRevision(final int revision,
-                                                        final long timestamp,
-                                                        @Nullable DecryptedGroupChange signedGroupChange)
-        throws IOException, GroupNotAMemberException
-    {
-      return updateLocalGroupToRevision(revision, timestamp, groupDatabase.getGroup(groupId), signedGroupChange, null);
-    }
-
-    /**
-     * Using network where required, will attempt to bring the local copy of the group up to the revision specified.
-     *
-     * @param revision use {@link #LATEST} to get latest.
-     */
-    @WorkerThread
-    public GroupUpdateResult updateLocalGroupToRevision(final int revision,
-                                                        final long timestamp,
-                                                        @NonNull Optional<GroupRecord> localRecord,
-                                                        @Nullable DecryptedGroupChange signedGroupChange,
-                                                        @Nullable String serverGuid)
-        throws IOException, GroupNotAMemberException
-    {
-      if (localIsAtLeast(localRecord, revision)) {
-        return new GroupUpdateResult(GroupState.GROUP_CONSISTENT_OR_AHEAD, null);
-      }
-
-      GlobalGroupState inputGroupState = null;
-
-      DecryptedGroup        localState  = localRecord.map(g -> g.requireV2GroupProperties().getDecryptedGroup()).orElse(null);
-
-      if (signedGroupChange != null &&
-          localState != null &&
-          localState.revision + 1 == signedGroupChange.revision &&
-          revision == signedGroupChange.revision)
-      {
-        if (notInGroupAndNotBeingAdded(localRecord, signedGroupChange) && notHavingInviteRevoked(signedGroupChange)) {
-          warn("Ignoring P2P group change because we're not currently in the group and this change doesn't add us in. Falling back to a server fetch.");
-        } else if (SignalStore.internalValues().gv2IgnoreP2PChanges()) {
-          warn( "Ignoring P2P group change by setting");
-        } else {
-          try {
-            info("Applying P2P group change");
-            DecryptedGroup newState = DecryptedGroupUtil.apply(localState, signedGroupChange);
-
-            inputGroupState = new GlobalGroupState(localState, Collections.singletonList(new ServerGroupLogEntry(newState, signedGroupChange)));
-          } catch (NotAbleToApplyGroupV2ChangeException e) {
-            warn( "Unable to apply P2P group change", e);
-          }
-        }
-      }
-
-      if (inputGroupState == null) {
-        try {
-          return updateLocalGroupFromServerPaged(revision, localState, timestamp, false, serverGuid);
-        } catch (GroupNotAMemberException e) {
-          if (localState != null && signedGroupChange != null) {
-            try {
-              if (notInGroupAndNotBeingAdded(localRecord, signedGroupChange)) {
-                warn( "Server says we're not a member. Ignoring P2P group change because we're not currently in the group and this change doesn't add us in.");
-              } else {
-                info("Server says we're not a member. Applying P2P group change.");
-                DecryptedGroup newState = DecryptedGroupUtil.applyWithoutRevisionCheck(localState, signedGroupChange);
-
-                inputGroupState = new GlobalGroupState(localState, Collections.singletonList(new ServerGroupLogEntry(newState, signedGroupChange)));
-              }
-            } catch (NotAbleToApplyGroupV2ChangeException failed) {
-              warn( "Unable to apply P2P group change when not a member", failed);
-            }
-          }
-
-          if (inputGroupState == null) {
-            if (localState != null && DecryptedGroupUtil.isPendingOrRequesting(localState, serviceIds)) {
-              warn( "Unable to query server for group " + groupId + " server says we're not in group, but we think we are a pending or requesting member");
-              throw new GroupNotAMemberException(e, true);
-            } else {
-              warn( "Unable to query server for group " + groupId + " server says we're not in group, inserting leave message");
-              insertGroupLeave();
-            }
-            throw e;
-          }
-        }
-      }
-
-      AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(inputGroupState, revision);
-      DecryptedGroup          newLocalState           = advanceGroupStateResult.getNewGlobalGroupState().getLocalState();
-
-      if (newLocalState == null || newLocalState == inputGroupState.getLocalState()) {
-        return new GroupUpdateResult(GroupState.GROUP_CONSISTENT_OR_AHEAD, null);
-      }
-
-      updateLocalDatabaseGroupState(inputGroupState, newLocalState);
-      if (localState != null && localState.revision == GroupsV2StateProcessor.RESTORE_PLACEHOLDER_REVISION) {
-        info("Inserting single update message for restore placeholder");
-        profileAndMessageHelper.insertUpdateMessages(timestamp, null, Collections.singleton(new LocalGroupLogEntry(newLocalState, null)), null);
-      } else {
-        profileAndMessageHelper.insertUpdateMessages(timestamp, localState, advanceGroupStateResult.getProcessedLogEntries(), serverGuid);
-      }
-      profileAndMessageHelper.persistLearnedProfileKeys(inputGroupState);
-
-      if (!signedGroupChange.promotePendingPniAciMembers.isEmpty()) {
-        ApplicationDependencies.getJobManager().add(new DirectoryRefreshJob(false));
-      }
-
-      GlobalGroupState remainingWork = advanceGroupStateResult.getNewGlobalGroupState();
-      if (remainingWork.getServerHistory().size() > 0) {
-        info(String.format(Locale.US, "There are more revisions on the server for this group, scheduling for later, V[%d..%d]", newLocalState.revision + 1, remainingWork.getLatestRevisionNumber()));
-        ApplicationDependencies.getJobManager().add(new RequestGroupV2InfoJob(groupId, remainingWork.getLatestRevisionNumber()));
-      }
-
-      return new GroupUpdateResult(GroupState.GROUP_UPDATED, newLocalState);
-    }
-
-    private boolean notInGroupAndNotBeingAdded(@NonNull Optional<GroupRecord> localRecord, @NonNull DecryptedGroupChange signedGroupChange) {
-      boolean currentlyInGroup = localRecord.isPresent() && localRecord.get().isActive();
-
-      boolean addedAsMember = signedGroupChange.newMembers
-                                               .stream()
-                                               .map(m -> m.aciBytes)
-                                               .map(ACI::parseOrNull)
-                                               .filter(Objects::nonNull)
-                                               .anyMatch(serviceIds::matches);
-
-      boolean addedAsPendingMember = signedGroupChange.newPendingMembers
-                                                      .stream()
-                                                      .map(m -> m.serviceIdBytes)
-                                                      .anyMatch(serviceIds::matches);
-
-      boolean addedAsRequestingMember = signedGroupChange.newRequestingMembers
-                                                         .stream()
-                                                         .map(m -> m.aciBytes)
-                                                         .map(ACI::parseOrNull)
-                                                         .filter(Objects::nonNull)
-                                                         .anyMatch(serviceIds::matches);
-
-      return !currentlyInGroup && !addedAsMember && !addedAsPendingMember && !addedAsRequestingMember;
-    }
-
-    private boolean notHavingInviteRevoked(@NonNull DecryptedGroupChange signedGroupChange) {
-      boolean havingInviteRevoked = signedGroupChange.deletePendingMembers
-                                                     .stream()
-                                                     .map(m -> m.serviceIdBytes)
-                                                     .anyMatch(serviceIds::matches);
-
-      return !havingInviteRevoked;
-    }
-
-    /**
-     * Using network, attempt to bring the local copy of the group up to the revision specified via paging.
-     */
-    private GroupUpdateResult updateLocalGroupFromServerPaged(int revision, DecryptedGroup localState, long timestamp, boolean forceIncludeFirst, @Nullable String serverGuid) throws IOException, GroupNotAMemberException {
-      boolean latestRevisionOnly = revision == LATEST && (localState == null || localState.revision == GroupsV2StateProcessor.RESTORE_PLACEHOLDER_REVISION);
-
-      info("Paging from server revision: " + (revision == LATEST ? "latest" : revision) + ", latestOnly: " + latestRevisionOnly);
-
-      PartialDecryptedGroup latestServerGroup;
-      GlobalGroupState      inputGroupState;
-
-      try {
-        latestServerGroup = groupsV2Api.getPartialDecryptedGroup(groupSecretParams, groupsV2Authorization.getAuthorizationForToday(serviceIds, groupSecretParams));
-      } catch (NotInGroupException | GroupNotFoundException e) {
-        throw new GroupNotAMemberException(e);
-      } catch (VerificationFailedException | InvalidGroupStateException e) {
-        throw new IOException(e);
-      }
-
-      if (localState != null && localState.revision >= latestServerGroup.getRevision() && GroupProtoUtil.isMember(serviceIds.getAci(), localState.members)) {
-        info("Local state is at or later than server");
-        return new GroupUpdateResult(GroupState.GROUP_CONSISTENT_OR_AHEAD, null);
-      }
-
-      if (latestRevisionOnly || !GroupProtoUtil.isMember(serviceIds.getAci(), latestServerGroup.getMembersList())) {
-        info("Latest revision or not a member, use latest only");
-        inputGroupState = new GlobalGroupState(localState, Collections.singletonList(new ServerGroupLogEntry(latestServerGroup.getFullyDecryptedGroup(), null)));
-      } else {
-        int revisionWeWereAdded = GroupProtoUtil.findRevisionWeWereAdded(latestServerGroup, serviceIds.getAci());
-        int logsNeededFrom      = localState != null ? Math.max(localState.revision, revisionWeWereAdded) : revisionWeWereAdded;
-
-        boolean includeFirstState = forceIncludeFirst ||
-                                    localState == null ||
-                                    localState.revision < 0 ||
-                                    localState.revision == revisionWeWereAdded ||
-                                    !GroupProtoUtil.isMember(serviceIds.getAci(), localState.members) ||
-                                    (revision == LATEST && localState.revision + 1 < latestServerGroup.getRevision());
-
-        info("Requesting from server currentRevision: " + (localState != null ? localState.revision : "null") +
-             " logsNeededFrom: " + logsNeededFrom +
-             " includeFirstState: " + includeFirstState +
-             " forceIncludeFirst: " + forceIncludeFirst);
-        inputGroupState = getFullMemberHistoryPage(localState, logsNeededFrom, includeFirstState);
-      }
-
-      ProfileKeySet    profileKeys           = new ProfileKeySet();
-      DecryptedGroup   finalState            = localState;
-      GlobalGroupState finalGlobalGroupState = inputGroupState;
-      boolean          performCdsLookup      = false;
-
-      boolean hasMore = true;
-
-      while (hasMore) {
-        AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(inputGroupState, revision);
-        DecryptedGroup          newLocalState           = advanceGroupStateResult.getNewGlobalGroupState().getLocalState();
-        info("Advanced group to revision: " + (newLocalState != null ? newLocalState.revision : "null"));
-
-        if (newLocalState != null && !inputGroupState.hasMore() && !forceIncludeFirst) {
-          int newLocalRevision = newLocalState.revision;
-          int requestRevision  = (revision == LATEST) ? latestServerGroup.getRevision() : revision;
-          if (newLocalRevision < requestRevision) {
-            warn( "Paging again with force first snapshot enabled due to error processing changes. New local revision [" + newLocalRevision + "] hasn't reached our desired level [" + requestRevision + "]");
-            return updateLocalGroupFromServerPaged(revision, localState, timestamp, true, serverGuid);
-          }
-        }
-
-        if (newLocalState == null || newLocalState == inputGroupState.getLocalState()) {
-          return new GroupUpdateResult(GroupState.GROUP_CONSISTENT_OR_AHEAD, null);
-        }
-
-        updateLocalDatabaseGroupState(inputGroupState, newLocalState);
-
-        if (localState == null || localState.revision != GroupsV2StateProcessor.RESTORE_PLACEHOLDER_REVISION) {
-          timestamp = profileAndMessageHelper.insertUpdateMessages(timestamp, localState, advanceGroupStateResult.getProcessedLogEntries(), serverGuid);
-        }
-
-        for (ServerGroupLogEntry entry : inputGroupState.getServerHistory()) {
-          if (entry.getGroup() != null) {
-            profileKeys.addKeysFromGroupState(entry.getGroup());
-          }
-
-          if (entry.getChange() != null) {
-            profileKeys.addKeysFromGroupChange(entry.getChange());
-
-            if (!entry.getChange().promotePendingPniAciMembers.isEmpty()) {
-              performCdsLookup = true;
-            }
-          }
-        }
-
-        finalState            = newLocalState;
-        finalGlobalGroupState = advanceGroupStateResult.getNewGlobalGroupState();
-        hasMore               = inputGroupState.hasMore();
-
-        if (hasMore) {
-          info("Request next page from server revision: " + finalState.revision + " nextPageRevision: " + inputGroupState.getNextPageRevision());
-          inputGroupState = getFullMemberHistoryPage(finalState, inputGroupState.getNextPageRevision(), false);
-        }
-      }
-
-      if (localState != null && localState.revision == GroupsV2StateProcessor.RESTORE_PLACEHOLDER_REVISION) {
-        info("Inserting single update message for restore placeholder");
-        profileAndMessageHelper.insertUpdateMessages(timestamp, null, Collections.singleton(new LocalGroupLogEntry(finalState, null)), serverGuid);
-      }
-
-      profileAndMessageHelper.persistLearnedProfileKeys(profileKeys);
-
-      if (performCdsLookup) {
-        ApplicationDependencies.getJobManager().add(new DirectoryRefreshJob(false));
-      }
-
-      if (finalGlobalGroupState.getServerHistory().size() > 0) {
-        info(String.format(Locale.US, "There are more revisions on the server for this group, scheduling for later, V[%d..%d]", finalState.revision + 1, finalGlobalGroupState.getLatestRevisionNumber()));
-        ApplicationDependencies.getJobManager().add(new RequestGroupV2InfoJob(groupId, finalGlobalGroupState.getLatestRevisionNumber()));
-      }
-
-      return new GroupUpdateResult(GroupState.GROUP_UPDATED, finalState);
-    }
-
-    private void insertGroupLeave() {
-      if (!groupDatabase.isActive(groupId)) {
-        warn("Group has already been left.");
-        return;
-      }
-
-      Recipient groupRecipient = Recipient.externalGroupExact(groupId);
-
-      DecryptedGroup decryptedGroup = groupDatabase.requireGroup(groupId)
-                                                   .requireV2GroupProperties()
-                                                   .getDecryptedGroup();
-
-      DecryptedGroup simulatedGroupState = DecryptedGroupUtil.removeMember(decryptedGroup, serviceIds.getAci(), decryptedGroup.revision + 1);
-
-      DecryptedGroupChange simulatedGroupChange = new DecryptedGroupChange.Builder()
-                                                                          .editorServiceIdBytes(ACI.UNKNOWN.toByteString())
-                                                                          .revision(simulatedGroupState.revision)
-                                                                          .deleteMembers(Collections.singletonList(serviceIds.getAci().toByteString()))
-                                                                          .build();
-
-      GV2UpdateDescription updateDescription = GroupProtoUtil.createOutgoingGroupV2UpdateDescription(masterKey, new GroupMutation(decryptedGroup, simulatedGroupChange, simulatedGroupState), null);
-      OutgoingMessage      leaveMessage      = OutgoingMessage.groupUpdateMessage(groupRecipient, updateDescription, System.currentTimeMillis());
-
-      try {
-        MessageTable mmsDatabase = SignalDatabase.messages();
-        ThreadTable  threadTable = SignalDatabase.threads();
-        long         threadId    = threadTable.getOrCreateThreadIdFor(groupRecipient);
-        long         id          = mmsDatabase.insertMessageOutbox(leaveMessage, threadId, false, null);
-        mmsDatabase.markAsSent(id, true);
-        threadTable.update(threadId, false, false);
-      } catch (MmsException e) {
-        warn( "Failed to insert leave message.", e);
-      }
-
-      groupDatabase.setActive(groupId, false);
-      groupDatabase.remove(groupId, Recipient.self().getId());
-    }
-
-    /**
-     * @return true iff group exists locally and is at least the specified revision.
-     */
-    private boolean localIsAtLeast(Optional<GroupRecord> localRecord, int revision) {
-      if (revision == LATEST || localRecord.isEmpty() || groupDatabase.isUnknownGroup(localRecord)) {
-        return false;
-      }
-      int dbRevision = localRecord.get().requireV2GroupProperties().getGroupRevision();
-      return revision <= dbRevision;
-    }
-
-    private void updateLocalDatabaseGroupState(@NonNull GlobalGroupState inputGroupState,
-                                               @NonNull DecryptedGroup newLocalState)
-    {
-      boolean needsAvatarFetch;
-
-      if (inputGroupState.getLocalState() == null) {
-        GroupId.V2 groupId = groupDatabase.create(masterKey, newLocalState);
-        if (groupId == null) {
-          Log.w(TAG, "Group create failed, trying to update");
-          groupDatabase.update(masterKey, newLocalState);
-        }
-        needsAvatarFetch = !TextUtils.isEmpty(newLocalState.avatar);
-      } else {
-        groupDatabase.update(masterKey, newLocalState);
-        needsAvatarFetch = !newLocalState.avatar.equals(inputGroupState.getLocalState().avatar);
-      }
-
-      if (needsAvatarFetch) {
-        ApplicationDependencies.getJobManager().add(new AvatarGroupsV2DownloadJob(groupId, newLocalState.avatar));
-      }
-
-      profileAndMessageHelper.determineProfileSharing(inputGroupState, newLocalState);
-    }
-
-    private GlobalGroupState getFullMemberHistoryPage(DecryptedGroup localState, int logsNeededFromRevision, boolean includeFirstState) throws IOException {
-      try {
-        GroupHistoryPage               groupHistoryPage    = groupsV2Api.getGroupHistoryPage(groupSecretParams, logsNeededFromRevision, groupsV2Authorization.getAuthorizationForToday(serviceIds, groupSecretParams), includeFirstState);
-        ArrayList<ServerGroupLogEntry> history             = new ArrayList<>(groupHistoryPage.getResults().size());
-        boolean                        ignoreServerChanges = SignalStore.internalValues().gv2IgnoreServerChanges();
-
-        if (ignoreServerChanges) {
-          warn( "Server change logs are ignored by setting");
-        }
-
-        for (DecryptedGroupHistoryEntry entry : groupHistoryPage.getResults()) {
-          DecryptedGroup       group  = entry.getGroup().orElse(null);
-          DecryptedGroupChange change = ignoreServerChanges ? null : entry.getChange().orElse(null);
-
-          if (group != null || change != null) {
-            history.add(new ServerGroupLogEntry(group, change));
-          }
-        }
-
-        return new GlobalGroupState(localState, history, groupHistoryPage.getPagingData());
-      } catch (InvalidGroupStateException | VerificationFailedException e) {
-        throw new IOException(e);
-      }
-    }
-
-    private void info(String message) {
-      Log.i(TAG, "[" + groupId.toString() + "] " + message);
-    }
-
-    private void warn(String message) {
-      warn(message, null);
-    }
-
-    private void warn(String message, Throwable e) {
-      Log.w(TAG, "[" + groupId.toString() + "] " + message, e);
-    }
-  }
-
-  @VisibleForTesting
-  static class ProfileAndMessageHelper {
-
-    private final ACI            aci;
-    private final GroupId.V2     groupId;
-    private final RecipientTable recipientTable;
-
-    @VisibleForTesting
-    GroupMasterKey masterKey;
-
-    ProfileAndMessageHelper(@NonNull ACI aci, @NonNull GroupMasterKey masterKey, @NonNull GroupId.V2 groupId, @NonNull RecipientTable recipientTable) {
-      this.aci            = aci;
-      this.masterKey      = masterKey;
-      this.groupId        = groupId;
-      this.recipientTable = recipientTable;
-    }
-
-    void determineProfileSharing(@NonNull GlobalGroupState inputGroupState, @NonNull DecryptedGroup newLocalState) {
-      if (inputGroupState.getLocalState() != null) {
-        boolean wasAMemberAlready = DecryptedGroupUtil.findMemberByAci(inputGroupState.getLocalState().members, aci).isPresent();
-
-        if (wasAMemberAlready) {
-          return;
-        }
-      }
-
-      Optional<DecryptedMember>        selfAsMemberOptional  = DecryptedGroupUtil.findMemberByAci(newLocalState.members, aci);
-      Optional<DecryptedPendingMember> selfAsPendingOptional = DecryptedGroupUtil.findPendingByServiceId(newLocalState.pendingMembers, aci);
-
-      if (selfAsMemberOptional.isPresent()) {
-        DecryptedMember selfAsMember     = selfAsMemberOptional.get();
-        int             revisionJoinedAt = selfAsMember.joinedAtRevision;
-
-        Optional<Recipient> addedByOptional = inputGroupState.getServerHistory()
-                                                             .stream()
-                                                             .map(ServerGroupLogEntry::getChange)
-                                                             .filter(c -> c != null && c.revision == revisionJoinedAt)
-                                                             .findFirst()
-                                                             .flatMap(c -> Optional.ofNullable(ServiceId.parseOrNull(c.editorServiceIdBytes))
-                                                                                   .map(Recipient::externalPush));
-
-        if (addedByOptional.isPresent()) {
-          Recipient addedBy = addedByOptional.get();
-
-          Log.i(TAG, String.format("Added as a full member of %s by %s", groupId, addedBy.getId()));
-
-          if (addedBy.isBlocked() && (inputGroupState.getLocalState() == null || !DecryptedGroupUtil.isRequesting(inputGroupState.getLocalState(), aci))) {
-            Log.i(TAG, "Added by a blocked user. Leaving group.");
-            ApplicationDependencies.getJobManager().add(new LeaveGroupV2Job(groupId));
-            //noinspection UnnecessaryReturnStatement
-            return;
-          } else if ((addedBy.isSystemContact() || addedBy.isProfileSharing()) && !addedBy.isHidden()) {
-            Log.i(TAG, "Group 'adder' is trusted. contact: " + addedBy.isSystemContact() + ", profileSharing: " + addedBy.isProfileSharing());
-            Log.i(TAG, "Added to a group and auto-enabling profile sharing");
-            recipientTable.setProfileSharing(Recipient.externalGroupExact(groupId).getId(), true);
-          } else {
-            Log.i(TAG, "Added to a group, but not enabling profile sharing, as 'adder' is not trusted");
-          }
-        } else {
-          Log.w(TAG, "Could not find founding member during gv2 create. Not enabling profile sharing.");
-        }
-      } else if (selfAsPendingOptional.isPresent()) {
-        Optional<Recipient> addedBy = selfAsPendingOptional.flatMap(adder -> Optional.ofNullable(UuidUtil.fromByteStringOrNull(adder.addedByAci))
-                                                                                     .map(uuid -> Recipient.externalPush(ACI.from(uuid))));
-
-        if (addedBy.isPresent() && addedBy.get().isBlocked()) {
-          Log.i(TAG, String.format("Added to group %s by a blocked user %s. Leaving group.", groupId, addedBy.get().getId()));
-          ApplicationDependencies.getJobManager().add(new LeaveGroupV2Job(groupId));
-          //noinspection UnnecessaryReturnStatement
-          return;
-        } else {
-          Log.i(TAG, String.format("Added to %s, but not enabling profile sharing as we are a pending member.", groupId));
-        }
-      } else {
-        Log.i(TAG, String.format("Added to %s, but not enabling profile sharing as not a fullMember.", groupId));
-      }
-    }
-
-    long insertUpdateMessages(long timestamp,
-                              @Nullable DecryptedGroup previousGroupState,
-                              Collection<LocalGroupLogEntry> processedLogEntries,
-                              @Nullable String serverGuid)
-    {
-      for (LocalGroupLogEntry entry : processedLogEntries) {
-        if (entry.getChange() != null && DecryptedGroupUtil.changeIsEmptyExceptForProfileKeyChanges(entry.getChange()) && !DecryptedGroupUtil.changeIsEmpty(entry.getChange())) {
-          Log.d(TAG, "Skipping profile key changes only update message");
-        } else if (entry.getChange() != null && DecryptedGroupUtil.changeIsEmptyExceptForBanChangesAndOptionalProfileKeyChanges(entry.getChange())) {
-          Log.d(TAG, "Skipping ban changes only update message");
-        } else {
-          if (entry.getChange() != null && DecryptedGroupUtil.changeIsEmpty(entry.getChange()) && previousGroupState != null) {
-            Log.w(TAG, "Empty group update message seen. Not inserting.");
-          } else {
-            storeMessage(GroupProtoUtil.createDecryptedGroupV2Context(masterKey, new GroupMutation(previousGroupState, entry.getChange(), entry.getGroup()), null), timestamp, serverGuid);
-            timestamp++;
-          }
-        }
-        previousGroupState = entry.getGroup();
-      }
-      return timestamp;
-    }
-
-    void persistLearnedProfileKeys(@NonNull GlobalGroupState globalGroupState) {
-      final ProfileKeySet profileKeys = new ProfileKeySet();
-
-      for (ServerGroupLogEntry entry : globalGroupState.getServerHistory()) {
-        if (entry.getGroup() != null) {
-          profileKeys.addKeysFromGroupState(entry.getGroup());
-        }
-        if (entry.getChange() != null) {
-          profileKeys.addKeysFromGroupChange(entry.getChange());
-        }
-      }
-
-      persistLearnedProfileKeys(profileKeys);
-    }
-
-    void persistLearnedProfileKeys(@NonNull ProfileKeySet profileKeys) {
-      Set<RecipientId> updated = recipientTable.persistProfileKeySet(profileKeys);
-
-      if (!updated.isEmpty()) {
-        Log.i(TAG, String.format(Locale.US, "Learned %d new profile keys, fetching profiles", updated.size()));
-
-        for (Job job : RetrieveProfileJob.forRecipients(updated)) {
-          ApplicationDependencies.getJobManager().runSynchronously(job, 5000);
-        }
-      }
-    }
-
-    void storeMessage(@NonNull DecryptedGroupV2Context decryptedGroupV2Context, long timestamp, @Nullable String serverGuid) {
-      Optional<ServiceId> editor = getEditor(decryptedGroupV2Context);
-
-      boolean outgoing = editor.isEmpty() || aci.equals(editor.get());
-
-      GV2UpdateDescription updateDescription = new GV2UpdateDescription.Builder()
-          .gv2ChangeDescription(decryptedGroupV2Context)
-          .groupChangeUpdate(GroupsV2UpdateMessageConverter.translateDecryptedChange(SignalStore.account().getServiceIds(), decryptedGroupV2Context))
-          .build();
-
-      if (outgoing) {
-        try {
-          MessageTable    mmsDatabase     = SignalDatabase.messages();
-          ThreadTable     threadTable     = SignalDatabase.threads();
-          RecipientId     recipientId     = recipientTable.getOrInsertFromGroupId(groupId);
-          Recipient       recipient       = Recipient.resolved(recipientId);
-          OutgoingMessage outgoingMessage = OutgoingMessage.groupUpdateMessage(recipient, updateDescription, timestamp);
-          long            threadId        = threadTable.getOrCreateThreadIdFor(recipient);
-          long            messageId       = mmsDatabase.insertMessageOutbox(outgoingMessage, threadId, false, null);
-
-          mmsDatabase.markAsSent(messageId, true);
-          threadTable.update(threadId, false, false);
-        } catch (MmsException e) {
-          Log.w(TAG, "Failed to insert outgoing update message!", e);
-        }
-      } else {
-        try {
-          MessageTable                        smsDatabase  = SignalDatabase.messages();
-          RecipientId                         sender       = RecipientId.from(editor.get());
-          IncomingMessage                     groupMessage = IncomingMessage.groupUpdate(sender, timestamp, groupId, decryptedGroupV2Context, serverGuid);
-          Optional<MessageTable.InsertResult> insertResult = smsDatabase.insertMessageInbox(groupMessage);
-
-          if (insertResult.isPresent()) {
-            SignalDatabase.threads().update(insertResult.get().getThreadId(), false, false);
-          } else {
-            Log.w(TAG, "Could not insert update message");
-          }
-        } catch (MmsException e) {
-          Log.w(TAG, "Failed to insert incoming update message!", e);
-        }
-      }
-    }
-
-    private Optional<ServiceId> getEditor(@NonNull DecryptedGroupV2Context decryptedGroupV2Context) {
-      DecryptedGroupChange change       = decryptedGroupV2Context.change;
-      Optional<ServiceId>  changeEditor = DecryptedGroupUtil.editorServiceId(change);
-      if (changeEditor.isPresent()) {
-        return changeEditor;
-      } else {
-        Optional<DecryptedPendingMember> pending = DecryptedGroupUtil.findPendingByServiceId(decryptedGroupV2Context.groupState.pendingMembers, aci);
-        if (pending.isPresent()) {
-          return Optional.ofNullable(ACI.parseOrNull(pending.get().addedByAci));
-        }
-      }
-      return Optional.empty();
-    }
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.kt
new file mode 100644
index 0000000000..f4ea6c8b13
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.kt
@@ -0,0 +1,797 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.groups.v2.processing
+
+import androidx.annotation.VisibleForTesting
+import androidx.annotation.WorkerThread
+import org.signal.core.util.logging.Log
+import org.signal.core.util.orNull
+import org.signal.libsignal.zkgroup.InvalidInputException
+import org.signal.libsignal.zkgroup.VerificationFailedException
+import org.signal.libsignal.zkgroup.groups.GroupMasterKey
+import org.signal.libsignal.zkgroup.groups.GroupSecretParams
+import org.signal.storageservice.protos.groups.local.DecryptedGroup
+import org.signal.storageservice.protos.groups.local.DecryptedGroupChange
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.GroupRecord
+import org.thoughtcrime.securesms.database.model.GroupsV2UpdateMessageConverter
+import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context
+import org.thoughtcrime.securesms.database.model.databaseprotos.GV2UpdateDescription
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.groups.GroupId
+import org.thoughtcrime.securesms.groups.GroupMutation
+import org.thoughtcrime.securesms.groups.GroupNotAMemberException
+import org.thoughtcrime.securesms.groups.GroupProtoUtil
+import org.thoughtcrime.securesms.groups.v2.ProfileKeySet
+import org.thoughtcrime.securesms.groups.v2.processing.GroupsV2StateProcessor.Companion.LATEST
+import org.thoughtcrime.securesms.jobs.AvatarGroupsV2DownloadJob
+import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob
+import org.thoughtcrime.securesms.jobs.LeaveGroupV2Job
+import org.thoughtcrime.securesms.jobs.RequestGroupV2InfoJob
+import org.thoughtcrime.securesms.jobs.RetrieveProfileJob
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.mms.IncomingMessage
+import org.thoughtcrime.securesms.mms.MmsException
+import org.thoughtcrime.securesms.mms.OutgoingMessage
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.whispersystems.signalservice.api.NetworkResult
+import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil
+import org.whispersystems.signalservice.api.groupsv2.GroupChangeReconstruct
+import org.whispersystems.signalservice.api.groupsv2.GroupHistoryPage
+import org.whispersystems.signalservice.api.groupsv2.InvalidGroupStateException
+import org.whispersystems.signalservice.api.groupsv2.NotAbleToApplyGroupV2ChangeException
+import org.whispersystems.signalservice.api.groupsv2.ReceivedGroupSendEndorsements
+import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceIds
+import org.whispersystems.signalservice.api.util.UuidUtil
+import org.whispersystems.signalservice.internal.push.exceptions.GroupNotFoundException
+import org.whispersystems.signalservice.internal.push.exceptions.NotInGroupException
+import java.io.IOException
+import java.util.Optional
+import kotlin.math.max
+
+/**
+ * Given a group, provide various state operations to update from the current local revision to a
+ * specific number or [LATEST] revision via a P2P update and/or by fetching changes from the server.
+ */
+class GroupsV2StateProcessor private constructor(
+  private val serviceIds: ServiceIds,
+  private val groupMasterKey: GroupMasterKey,
+  private val groupSecretParams: GroupSecretParams
+) {
+
+  companion object {
+    private val TAG = Log.tag(GroupsV2StateProcessor::class.java)
+
+    const val LATEST = GroupStatePatcher.LATEST
+
+    /**
+     * Used to mark a group state as a placeholder when there is partial knowledge (title and avater)
+     * gathered from a group join link.
+     */
+    const val PLACEHOLDER_REVISION = GroupStatePatcher.PLACEHOLDER_REVISION
+
+    /**
+     * Used to mark a group state as a placeholder when you have no knowledge at all of the group
+     * e.g. from a group master key from a storage service restore.
+     */
+    const val RESTORE_PLACEHOLDER_REVISION = GroupStatePatcher.RESTORE_PLACEHOLDER_REVISION
+
+    @JvmStatic
+    @JvmOverloads
+    fun forGroup(
+      serviceIds: ServiceIds,
+      groupMasterKey: GroupMasterKey,
+      groupSecretParams: GroupSecretParams? = null
+    ): GroupsV2StateProcessor {
+      return GroupsV2StateProcessor(
+        serviceIds = serviceIds,
+        groupMasterKey = groupMasterKey,
+        groupSecretParams = groupSecretParams ?: GroupSecretParams.deriveFromMasterKey(groupMasterKey)
+      )
+    }
+  }
+
+  private val groupsApi = AppDependencies.signalServiceAccountManager.getGroupsV2Api()
+  private val groupsV2Authorization = AppDependencies.groupsV2Authorization
+  private val groupOperations = AppDependencies.groupsV2Operations.forGroup(groupSecretParams)
+  private val groupId = GroupId.v2(groupSecretParams.getPublicParams().getGroupIdentifier())
+  private val profileAndMessageHelper = ProfileAndMessageHelper.create(serviceIds.aci, groupMasterKey, groupId)
+
+  private val logPrefix = "[$groupId]"
+
+  /**
+   * Forces the local state to be updated directly to the latest available from the server without
+   * processing individual changes and instead inserting one large change to go from local to server.
+   */
+  @WorkerThread
+  @Throws(IOException::class, GroupNotAMemberException::class)
+  fun forceSanityUpdateFromServer(timestamp: Long): GroupUpdateResult {
+    val currentLocalState: DecryptedGroup? = SignalDatabase.groups.getGroup(groupId).map { it.requireV2GroupProperties().decryptedGroup }.orNull()
+
+    if (currentLocalState == null) {
+      Log.i(TAG, "$logPrefix No local state to force update")
+      return GroupUpdateResult.CONSISTENT_OR_AHEAD
+    }
+
+    return when (val result = updateToLatestViaServer(timestamp, currentLocalState, reconstructChange = true)) {
+      InternalUpdateResult.NoUpdateNeeded -> GroupUpdateResult.CONSISTENT_OR_AHEAD
+      is InternalUpdateResult.Updated -> GroupUpdateResult(GroupUpdateResult.UpdateStatus.GROUP_UPDATED, result.updatedLocalState)
+      is InternalUpdateResult.NotAMember -> throw result.exception
+      is InternalUpdateResult.UpdateFailed -> throw result.throwable
+    }
+  }
+
+  /**
+   * Fetch and save the latest group send endorsements from the server. This endorsements returned may
+   * not match our local view of the membership if the membership has changed on the server and we haven't updated the
+   * group state yet. This is only an issue when trying to send to a group member that has been removed and should be handled
+   * gracefully as a fallback in the sending flow.
+   */
+  @WorkerThread
+  @Throws(IOException::class, GroupNotAMemberException::class)
+  fun updateGroupSendEndorsements() {
+    val result = groupsApi.getGroupAsResult(groupSecretParams, groupsV2Authorization.getAuthorizationForToday(serviceIds, groupSecretParams))
+
+    val groupResponse = when (result) {
+      is NetworkResult.Success -> result.result
+      else -> when (val cause = result.getCause()!!) {
+        is NotInGroupException, is GroupNotFoundException -> throw GroupNotAMemberException(cause)
+        is IOException -> throw cause
+        else -> throw IOException(cause)
+      }
+    }
+
+    val receivedGroupSendEndorsements = groupOperations.receiveGroupSendEndorsements(serviceIds.aci, groupResponse.group, groupResponse.groupSendEndorsementsResponse)
+
+    if (receivedGroupSendEndorsements != null) {
+      Log.i(TAG, "$logPrefix Updating group send endorsements")
+      SignalDatabase.groups.updateGroupSendEndorsements(groupId, receivedGroupSendEndorsements)
+    } else {
+      Log.w(TAG, "$logPrefix No group send endorsements on response")
+    }
+  }
+
+  /**
+   * Using network where required, will attempt to bring the local copy of the group up to the revision specified.
+   *
+   * @param targetRevision use [.LATEST] to get latest.
+   */
+  @JvmOverloads
+  @WorkerThread
+  @Throws(IOException::class, GroupNotAMemberException::class)
+  fun updateLocalGroupToRevision(
+    targetRevision: Int,
+    timestamp: Long,
+    signedGroupChange: DecryptedGroupChange? = null,
+    groupRecord: Optional<GroupRecord> = SignalDatabase.groups.getGroup(groupId),
+    serverGuid: String? = null
+  ): GroupUpdateResult {
+    if (localIsAtLeast(groupRecord, targetRevision)) {
+      return GroupUpdateResult(GroupUpdateResult.UpdateStatus.GROUP_CONSISTENT_OR_AHEAD, null)
+    }
+
+    val currentLocalState: DecryptedGroup? = groupRecord.map { it.requireV2GroupProperties().decryptedGroup }.orNull()
+
+    if (signedGroupChange != null && canApplyP2pChange(targetRevision, signedGroupChange, currentLocalState, groupRecord)) {
+      when (val p2pUpdateResult = updateViaPeerGroupChange(timestamp, serverGuid, signedGroupChange, currentLocalState!!, forceApply = false)) {
+        InternalUpdateResult.NoUpdateNeeded -> return GroupUpdateResult.CONSISTENT_OR_AHEAD
+        is InternalUpdateResult.Updated -> return GroupUpdateResult.updated(p2pUpdateResult.updatedLocalState)
+        else -> Log.w(TAG, "$logPrefix P2P update was not successfully processed, falling back to server update")
+      }
+    }
+
+    val serverUpdateResult = updateViaServer(targetRevision, timestamp, serverGuid, groupRecord)
+
+    when (serverUpdateResult) {
+      InternalUpdateResult.NoUpdateNeeded -> return GroupUpdateResult.CONSISTENT_OR_AHEAD
+      is InternalUpdateResult.Updated -> return GroupUpdateResult.updated(serverUpdateResult.updatedLocalState)
+      is InternalUpdateResult.UpdateFailed -> throw serverUpdateResult.throwable
+      is InternalUpdateResult.NotAMember -> Unit
+    }
+
+    Log.w(TAG, "$logPrefix Unable to query server for group, says we're not in group, trying to resolve locally")
+
+    if (currentLocalState != null && signedGroupChange != null) {
+      if (notInGroupAndNotBeingAdded(groupRecord, signedGroupChange)) {
+        Log.w(TAG, "$logPrefix Server says we're not a member. Ignoring P2P group change because we're not currently in the group and this change doesn't add us in.")
+      } else {
+        Log.i(TAG, "$logPrefix Server says we're not a member. Force applying P2P group change.")
+        when (val forcedP2pUpdateResult = updateViaPeerGroupChange(timestamp, serverGuid, signedGroupChange, currentLocalState, forceApply = true)) {
+          is InternalUpdateResult.Updated -> return GroupUpdateResult.updated(forcedP2pUpdateResult.updatedLocalState)
+          InternalUpdateResult.NoUpdateNeeded -> return GroupUpdateResult.CONSISTENT_OR_AHEAD
+          is InternalUpdateResult.NotAMember, is InternalUpdateResult.UpdateFailed -> Log.w(TAG, "$logPrefix Unable to apply P2P group change when not a member: $forcedP2pUpdateResult")
+        }
+      }
+    }
+
+    if (currentLocalState != null && DecryptedGroupUtil.isPendingOrRequesting(currentLocalState, serviceIds)) {
+      Log.w(TAG, "$logPrefix Unable to query server for group. Server says we're not in group, but we think we are a pending or requesting member")
+    } else {
+      Log.w(TAG, "$logPrefix Unable to query server for group $groupId server says we're not in group, we agree, inserting leave message")
+      profileAndMessageHelper.leaveGroupLocally(serviceIds)
+    }
+
+    throw GroupNotAMemberException(serverUpdateResult.exception)
+  }
+
+  private fun canApplyP2pChange(
+    targetRevision: Int,
+    signedGroupChange: DecryptedGroupChange,
+    currentLocalState: DecryptedGroup?,
+    groupRecord: Optional<GroupRecord>
+  ): Boolean {
+    if (SignalStore.internal.gv2IgnoreP2PChanges()) {
+      Log.w(TAG, "$logPrefix Ignoring P2P group change by setting")
+      return false
+    }
+
+    if (currentLocalState == null || currentLocalState.revision + 1 != signedGroupChange.revision || targetRevision != signedGroupChange.revision) {
+      return false
+    }
+
+    if (notInGroupAndNotBeingAdded(groupRecord, signedGroupChange) && notHavingInviteRevoked(signedGroupChange)) {
+      Log.w(TAG, "$logPrefix Ignoring P2P group change because we're not currently in the group and this change doesn't add us in.")
+      return false
+    }
+
+    return true
+  }
+
+  private fun updateViaPeerGroupChange(
+    timestamp: Long,
+    serverGuid: String?,
+    signedGroupChange: DecryptedGroupChange,
+    currentLocalState: DecryptedGroup,
+    forceApply: Boolean
+  ): InternalUpdateResult {
+    val updatedGroupState = try {
+      if (forceApply) {
+        DecryptedGroupUtil.applyWithoutRevisionCheck(currentLocalState, signedGroupChange)
+      } else {
+        DecryptedGroupUtil.apply(currentLocalState, signedGroupChange)
+      }
+    } catch (e: NotAbleToApplyGroupV2ChangeException) {
+      Log.w(TAG, "$logPrefix Unable to apply P2P group change", e)
+      return InternalUpdateResult.UpdateFailed(e)
+    }
+
+    val groupStateDiff = GroupStateDiff(currentLocalState, updatedGroupState, signedGroupChange)
+
+    return saveGroupUpdate(
+      timestamp = timestamp,
+      serverGuid = serverGuid,
+      groupStateDiff = groupStateDiff,
+      groupSendEndorsements = null
+    )
+  }
+
+  private fun updateViaServer(
+    targetRevision: Int,
+    timestamp: Long,
+    serverGuid: String?,
+    groupRecord: Optional<GroupRecord> = SignalDatabase.groups.getGroup(groupId)
+  ): InternalUpdateResult {
+    var currentLocalState: DecryptedGroup? = groupRecord.map { it.requireV2GroupProperties().decryptedGroup }.orNull()
+
+    if (targetRevision == LATEST && (currentLocalState == null || currentLocalState.revision == RESTORE_PLACEHOLDER_REVISION)) {
+      Log.i(TAG, "$logPrefix Latest revision only, update to latest directly")
+      return updateToLatestViaServer(timestamp, currentLocalState, reconstructChange = false)
+    }
+
+    Log.i(TAG, "$logPrefix Paging from server targetRevision: ${if (targetRevision == LATEST) "latest" else targetRevision}")
+
+    val joinedAtResult = groupsApi.getGroupJoinedAt(groupsV2Authorization.getAuthorizationForToday(serviceIds, groupSecretParams))
+
+    if (joinedAtResult !is NetworkResult.Success) {
+      val joinedAtFailure = InternalUpdateResult.from(joinedAtResult.getCause()!!)
+      if (joinedAtFailure is InternalUpdateResult.NotAMember) {
+        Log.i(TAG, "$logPrefix Not a member, try to update to latest directly")
+        return updateToLatestViaServer(timestamp, currentLocalState, reconstructChange = currentLocalState != null)
+      } else {
+        return joinedAtFailure
+      }
+    }
+
+    val joinedAtRevision = joinedAtResult.result
+
+    val sendEndorsementExpiration = groupRecord.map { it.groupSendEndorsementExpiration }.orElse(0L)
+
+    var includeFirstState = currentLocalState == null ||
+      currentLocalState.revision < 0 ||
+      currentLocalState.revision == joinedAtRevision ||
+      !GroupProtoUtil.isMember(serviceIds.aci, currentLocalState.members)
+
+    val profileKeys = ProfileKeySet()
+    val addMessagesForAllUpdates = currentLocalState == null || currentLocalState.revision != RESTORE_PLACEHOLDER_REVISION
+    var logsNeededFrom = if (currentLocalState != null) max(currentLocalState.revision, joinedAtRevision) else joinedAtRevision
+    var hasMore = true
+    var runningTimestamp = timestamp
+    var performCdsLookup = false
+    var hasRemainingRemoteChanges = false
+
+    while (hasMore) {
+      Log.i(TAG, "$logPrefix Requesting change logs from server, currentRevision=${currentLocalState?.revision ?: "null"} logsNeededFrom=$logsNeededFrom includeFirstState=$includeFirstState sendEndorsementExpiration=${sendEndorsementExpiration > 0}")
+
+      val (remoteGroupStateDiff, pagingData) = getGroupChangeLogs(currentLocalState, logsNeededFrom, includeFirstState, sendEndorsementExpiration)
+      val applyGroupStateDiffResult: AdvanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(remoteGroupStateDiff, targetRevision)
+      val updatedGroupState: DecryptedGroup? = applyGroupStateDiffResult.updatedGroupState
+
+      if (updatedGroupState == null || updatedGroupState == remoteGroupStateDiff.previousGroupState) {
+        Log.i(TAG, "$logPrefix Local state is at or later than server revision: ${currentLocalState?.revision ?: "null"}")
+
+        if (currentLocalState != null) {
+          val endorsements = groupOperations.receiveGroupSendEndorsements(serviceIds.aci, currentLocalState, remoteGroupStateDiff.groupSendEndorsementsResponse)
+
+          if (endorsements != null) {
+            Log.i(TAG, "$logPrefix Received updated send endorsements, saving")
+            SignalDatabase.groups.updateGroupSendEndorsements(groupId, endorsements)
+          }
+        }
+
+        return InternalUpdateResult.NoUpdateNeeded
+      }
+
+      Log.i(TAG, "$logPrefix Saving updated group state at revision: ${updatedGroupState.revision}")
+
+      saveGroupState(remoteGroupStateDiff, updatedGroupState, groupOperations.receiveGroupSendEndorsements(serviceIds.aci, updatedGroupState, remoteGroupStateDiff.groupSendEndorsementsResponse))
+
+      if (addMessagesForAllUpdates) {
+        Log.d(TAG, "$logPrefix Inserting group changes into chat history")
+        runningTimestamp = profileAndMessageHelper.insertUpdateMessages(runningTimestamp, currentLocalState, applyGroupStateDiffResult.processedLogEntries, serverGuid)
+      }
+
+      remoteGroupStateDiff
+        .serverHistory
+        .forEach { entry ->
+          entry.group?.let { profileKeys.addKeysFromGroupState(it) }
+
+          entry.change?.let { change ->
+            profileKeys.addKeysFromGroupChange(change)
+            if (change.promotePendingPniAciMembers.isNotEmpty()) {
+              performCdsLookup = true
+            }
+          }
+        }
+
+      currentLocalState = updatedGroupState
+      hasMore = pagingData.hasMorePages
+
+      if (hasMore) {
+        includeFirstState = false
+        logsNeededFrom = pagingData.nextPageRevision
+      } else {
+        if (applyGroupStateDiffResult.remainingRemoteGroupChanges.isNotEmpty()) {
+          hasRemainingRemoteChanges = true
+        }
+      }
+    }
+
+    if (!addMessagesForAllUpdates) {
+      Log.i(TAG, "$logPrefix Inserting single update message for restore placeholder")
+      profileAndMessageHelper.insertUpdateMessages(runningTimestamp, null, setOf(AppliedGroupChangeLog(currentLocalState!!, null)), serverGuid)
+    }
+
+    profileAndMessageHelper.persistLearnedProfileKeys(profileKeys)
+
+    if (performCdsLookup) {
+      AppDependencies.jobManager.add(DirectoryRefreshJob(false))
+    }
+
+    if (hasRemainingRemoteChanges) {
+      Log.i(TAG, "$logPrefix There are more revisions on the server for this group, scheduling for later")
+      AppDependencies.jobManager.add(RequestGroupV2InfoJob(groupId))
+    }
+
+    return InternalUpdateResult.Updated(currentLocalState!!)
+  }
+
+  private fun updateToLatestViaServer(timestamp: Long, currentLocalState: DecryptedGroup?, reconstructChange: Boolean): InternalUpdateResult {
+    val result = groupsApi.getGroupAsResult(groupSecretParams, groupsV2Authorization.getAuthorizationForToday(serviceIds, groupSecretParams))
+
+    val groupResponse = if (result is NetworkResult.Success) {
+      result.result
+    } else {
+      return InternalUpdateResult.from(result.getCause()!!)
+    }
+
+    val completeGroupChange = if (reconstructChange) GroupChangeReconstruct.reconstructGroupChange(currentLocalState, groupResponse.group) else null
+    val remoteGroupStateDiff = GroupStateDiff(currentLocalState, groupResponse.group, completeGroupChange)
+
+    return saveGroupUpdate(
+      timestamp = timestamp,
+      serverGuid = null,
+      groupStateDiff = remoteGroupStateDiff,
+      groupSendEndorsements = groupOperations.receiveGroupSendEndorsements(serviceIds.aci, groupResponse.group, groupResponse.groupSendEndorsementsResponse)
+    )
+  }
+
+  /**
+   * @return true iff group exists locally and is at least the specified revision.
+   */
+  private fun localIsAtLeast(groupRecord: Optional<GroupRecord>, revision: Int): Boolean {
+    if (revision == LATEST || groupRecord.isEmpty || SignalDatabase.groups.isUnknownGroup(groupRecord)) {
+      return false
+    }
+
+    return revision <= groupRecord.get().requireV2GroupProperties().groupRevision
+  }
+
+  private fun notInGroupAndNotBeingAdded(groupRecord: Optional<GroupRecord>, signedGroupChange: DecryptedGroupChange): Boolean {
+    val currentlyInGroup = groupRecord.isPresent && groupRecord.get().isActive
+
+    val addedAsMember = signedGroupChange
+      .newMembers
+      .asSequence()
+      .mapNotNull { ACI.parseOrNull(it.aciBytes) }
+      .any { serviceIds.matches(it) }
+
+    val addedAsPendingMember = signedGroupChange
+      .newPendingMembers
+      .asSequence()
+      .map { it.serviceIdBytes }
+      .any { serviceIds.matches(it) }
+
+    val addedAsRequestingMember = signedGroupChange
+      .newRequestingMembers
+      .asSequence()
+      .mapNotNull { ACI.parseOrNull(it.aciBytes) }
+      .any { serviceIds.matches(it) }
+
+    return !currentlyInGroup && !addedAsMember && !addedAsPendingMember && !addedAsRequestingMember
+  }
+
+  private fun notHavingInviteRevoked(signedGroupChange: DecryptedGroupChange): Boolean {
+    val havingInviteRevoked = signedGroupChange
+      .deletePendingMembers
+      .asSequence()
+      .map { it.serviceIdBytes }
+      .any { serviceIds.matches(it) }
+
+    return !havingInviteRevoked
+  }
+
+  @Throws(IOException::class)
+  private fun getGroupChangeLogs(
+    localState: DecryptedGroup?,
+    logsNeededFromRevision: Int,
+    includeFirstState: Boolean,
+    sendEndorsementsExpirationMs: Long
+  ): Pair<GroupStateDiff, GroupHistoryPage.PagingData> {
+    try {
+      val groupHistoryPage = groupsApi.getGroupHistoryPage(groupSecretParams, logsNeededFromRevision, groupsV2Authorization.getAuthorizationForToday(serviceIds, groupSecretParams), includeFirstState, sendEndorsementsExpirationMs)
+
+      return GroupStateDiff(localState, groupHistoryPage.changeLogs, groupHistoryPage.groupSendEndorsementsResponse) to groupHistoryPage.pagingData
+    } catch (e: InvalidGroupStateException) {
+      throw IOException(e)
+    } catch (e: VerificationFailedException) {
+      throw IOException(e)
+    } catch (e: InvalidInputException) {
+      throw IOException(e)
+    }
+  }
+
+  private fun saveGroupUpdate(
+    timestamp: Long,
+    serverGuid: String?,
+    groupStateDiff: GroupStateDiff,
+    groupSendEndorsements: ReceivedGroupSendEndorsements?
+  ): InternalUpdateResult {
+    val currentLocalState: DecryptedGroup? = groupStateDiff.previousGroupState
+    val applyGroupStateDiffResult = GroupStatePatcher.applyGroupStateDiff(groupStateDiff, GroupStatePatcher.LATEST)
+    val updatedGroupState = applyGroupStateDiffResult.updatedGroupState
+
+    if (updatedGroupState == null || updatedGroupState == groupStateDiff.previousGroupState) {
+      Log.i(TAG, "$logPrefix Local state and server state are equal")
+
+      if (groupSendEndorsements != null) {
+        Log.i(TAG, "$logPrefix Saving new send endorsements")
+        SignalDatabase.groups.updateGroupSendEndorsements(groupId, groupSendEndorsements)
+      }
+
+      return InternalUpdateResult.NoUpdateNeeded
+    } else {
+      Log.i(TAG, "$logPrefix Local state (revision: ${currentLocalState?.revision}) does not match, updating to ${updatedGroupState.revision}")
+    }
+
+    saveGroupState(groupStateDiff, updatedGroupState, groupSendEndorsements)
+
+    if (currentLocalState == null || currentLocalState.revision == RESTORE_PLACEHOLDER_REVISION) {
+      Log.i(TAG, "$logPrefix Inserting single update message for no local state or restore placeholder")
+      profileAndMessageHelper.insertUpdateMessages(timestamp, null, setOf(AppliedGroupChangeLog(updatedGroupState, null)), null)
+    } else {
+      profileAndMessageHelper.insertUpdateMessages(timestamp, currentLocalState, applyGroupStateDiffResult.processedLogEntries, serverGuid)
+    }
+    profileAndMessageHelper.persistLearnedProfileKeys(groupStateDiff)
+
+    val performCdsLookup = groupStateDiff
+      .serverHistory
+      .mapNotNull { it.change }
+      .any { it.promotePendingPniAciMembers.isNotEmpty() }
+
+    if (performCdsLookup) {
+      AppDependencies.jobManager.add(DirectoryRefreshJob(false))
+    }
+
+    return InternalUpdateResult.Updated(updatedGroupState)
+  }
+
+  private fun saveGroupState(groupStateDiff: GroupStateDiff, updatedGroupState: DecryptedGroup, groupSendEndorsements: ReceivedGroupSendEndorsements?) {
+    val previousGroupState = groupStateDiff.previousGroupState
+
+    if (groupSendEndorsements != null) {
+      Log.i(TAG, "$logPrefix Updating send endorsements")
+    }
+
+    val needsAvatarFetch = if (previousGroupState == null) {
+      val groupId = SignalDatabase.groups.create(groupMasterKey, updatedGroupState, groupSendEndorsements)
+
+      if (groupId == null) {
+        Log.w(TAG, "$logPrefix Group create failed, trying to update")
+        SignalDatabase.groups.update(groupMasterKey, updatedGroupState, groupSendEndorsements)
+      }
+
+      updatedGroupState.avatar.isNotEmpty()
+    } else {
+      SignalDatabase.groups.update(groupMasterKey, updatedGroupState, groupSendEndorsements)
+
+      updatedGroupState.avatar != previousGroupState.avatar
+    }
+
+    if (needsAvatarFetch) {
+      AppDependencies.jobManager.add(AvatarGroupsV2DownloadJob(groupId, updatedGroupState.avatar))
+    }
+
+    profileAndMessageHelper.setProfileSharing(groupStateDiff, updatedGroupState)
+  }
+
+  @VisibleForTesting
+  internal class ProfileAndMessageHelper(private val aci: ACI, private val masterKey: GroupMasterKey, private val groupId: GroupId.V2) {
+
+    fun setProfileSharing(groupStateDiff: GroupStateDiff, newLocalState: DecryptedGroup) {
+      val previousGroupState = groupStateDiff.previousGroupState
+
+      if (previousGroupState != null && DecryptedGroupUtil.findMemberByAci(previousGroupState.members, aci).isPresent) {
+        // Was already a member before update, profile sharing state previously determined
+        return
+      }
+
+      val selfAsMember = DecryptedGroupUtil.findMemberByAci(newLocalState.members, aci).orNull()
+      val selfAsPending = DecryptedGroupUtil.findPendingByServiceId(newLocalState.pendingMembers, aci).orNull()
+
+      if (selfAsMember != null) {
+        val revisionJoinedAt = selfAsMember.joinedAtRevision
+
+        val addedAtChange = groupStateDiff
+          .serverHistory
+          .mapNotNull { it.change }
+          .firstOrNull { it.revision == revisionJoinedAt }
+
+        val addedBy = ServiceId.parseOrNull(addedAtChange?.editorServiceIdBytes)?.let { Recipient.externalPush(it) }
+
+        if (addedBy != null) {
+          Log.i(TAG, "Added as a full member of $groupId by ${addedBy.id}")
+
+          if (addedBy.isBlocked && (previousGroupState == null || !DecryptedGroupUtil.isRequesting(previousGroupState, aci))) {
+            Log.i(TAG, "Added by a blocked user. Leaving group.")
+            AppDependencies.jobManager.add(LeaveGroupV2Job(groupId))
+            return
+          } else if ((addedBy.isSystemContact || addedBy.isProfileSharing) && !addedBy.isHidden) {
+            Log.i(TAG, "Group 'adder' is trusted. contact: " + addedBy.isSystemContact + ", profileSharing: " + addedBy.isProfileSharing)
+            Log.i(TAG, "Added to a group and auto-enabling profile sharing")
+            SignalDatabase.recipients.setProfileSharing(Recipient.externalGroupExact(groupId).id, true)
+          } else {
+            Log.i(TAG, "Added to a group, but not enabling profile sharing, as 'adder' is not trusted")
+          }
+        } else {
+          Log.w(TAG, "Could not find founding member during gv2 create. Not enabling profile sharing.")
+        }
+      } else if (selfAsPending != null) {
+        val addedBy = UuidUtil.fromByteStringOrNull(selfAsPending.addedByAci)?.let { Recipient.externalPush(ACI.from(it)) }
+
+        if (addedBy?.isBlocked == true) {
+          Log.i(TAG, "Added to group $groupId by a blocked user ${addedBy.id}. Leaving group.")
+          AppDependencies.jobManager.add(LeaveGroupV2Job(groupId))
+          return
+        } else {
+          Log.i(TAG, "Added to $groupId, but not enabling profile sharing as we are a pending member.")
+        }
+      } else {
+        Log.i(TAG, "Added to $groupId, but not enabling profile sharing as not a fullMember.")
+      }
+    }
+
+    fun insertUpdateMessages(
+      timestamp: Long,
+      previousGroupState: DecryptedGroup?,
+      processedLogEntries: Collection<AppliedGroupChangeLog>,
+      serverGuid: String?
+    ): Long {
+      var runningTimestamp = timestamp
+      var runningGroupState = previousGroupState
+
+      for (entry in processedLogEntries) {
+        if (entry.change != null && DecryptedGroupUtil.changeIsEmptyExceptForProfileKeyChanges(entry.change) && !DecryptedGroupUtil.changeIsEmpty(entry.change)) {
+          Log.d(TAG, "Skipping profile key changes only update message")
+        } else if (entry.change != null && DecryptedGroupUtil.changeIsEmptyExceptForBanChangesAndOptionalProfileKeyChanges(entry.change)) {
+          Log.d(TAG, "Skipping ban changes only update message")
+        } else {
+          if (entry.change != null && DecryptedGroupUtil.changeIsEmpty(entry.change) && runningGroupState != null) {
+            Log.w(TAG, "Empty group update message seen. Not inserting.")
+          } else {
+            storeMessage(GroupProtoUtil.createDecryptedGroupV2Context(masterKey, GroupMutation(runningGroupState, entry.change, entry.group), null), runningTimestamp, serverGuid)
+            runningTimestamp++
+          }
+        }
+
+        runningGroupState = entry.group
+      }
+
+      return runningTimestamp
+    }
+
+    fun leaveGroupLocally(serviceIds: ServiceIds) {
+      if (!SignalDatabase.groups.isActive(groupId)) {
+        Log.w(TAG, "Group $groupId has already been left.")
+        return
+      }
+
+      val groupRecipient = Recipient.externalGroupExact(groupId)
+
+      val decryptedGroup = SignalDatabase
+        .groups
+        .requireGroup(groupId)
+        .requireV2GroupProperties()
+        .decryptedGroup
+
+      val simulatedGroupState = DecryptedGroupUtil.removeMember(decryptedGroup, serviceIds.aci, decryptedGroup.revision + 1)
+
+      val simulatedGroupChange = DecryptedGroupChange(
+        editorServiceIdBytes = ACI.UNKNOWN.toByteString(),
+        revision = simulatedGroupState.revision,
+        deleteMembers = listOf(serviceIds.aci.toByteString())
+      )
+
+      val updateDescription = GroupProtoUtil.createOutgoingGroupV2UpdateDescription(masterKey, GroupMutation(decryptedGroup, simulatedGroupChange, simulatedGroupState), null)
+      val leaveMessage = OutgoingMessage.groupUpdateMessage(groupRecipient, updateDescription, System.currentTimeMillis())
+
+      try {
+        val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(groupRecipient)
+        val id = SignalDatabase.messages.insertMessageOutbox(leaveMessage, threadId, false, null)
+        SignalDatabase.messages.markAsSent(id, true)
+        SignalDatabase.threads.update(threadId, unarchive = false, allowDeletion = false)
+      } catch (e: MmsException) {
+        Log.w(TAG, "Failed to insert leave message for $groupId", e)
+      }
+
+      SignalDatabase.groups.setActive(groupId, false)
+      SignalDatabase.groups.remove(groupId, Recipient.self().id)
+    }
+
+    fun persistLearnedProfileKeys(groupStateDiff: GroupStateDiff) {
+      val profileKeys = ProfileKeySet()
+
+      for (entry in groupStateDiff.serverHistory) {
+        if (entry.group != null) {
+          profileKeys.addKeysFromGroupState(entry.group!!)
+        }
+        if (entry.change != null) {
+          profileKeys.addKeysFromGroupChange(entry.change!!)
+        }
+      }
+
+      persistLearnedProfileKeys(profileKeys)
+    }
+
+    fun persistLearnedProfileKeys(profileKeys: ProfileKeySet) {
+      val updated = SignalDatabase.recipients.persistProfileKeySet(profileKeys)
+
+      if (updated.isNotEmpty()) {
+        Log.i(TAG, "Learned ${updated.size} new profile keys, fetching profiles")
+
+        for (job in RetrieveProfileJob.forRecipients(updated)) {
+          AppDependencies.jobManager.runSynchronously(job, 5000)
+        }
+      }
+    }
+
+    @VisibleForTesting
+    fun storeMessage(decryptedGroupV2Context: DecryptedGroupV2Context, timestamp: Long, serverGuid: String?) {
+      val editor: Optional<ServiceId> = getEditor(decryptedGroupV2Context)
+
+      val serviceIds = SignalStore.account.getServiceIds()
+      val outgoing = editor.isEmpty || aci == editor.get()
+
+      val updateDescription = GV2UpdateDescription(
+        gv2ChangeDescription = decryptedGroupV2Context,
+        groupChangeUpdate = GroupsV2UpdateMessageConverter.translateDecryptedChange(serviceIds, decryptedGroupV2Context)
+      )
+
+      if (outgoing) {
+        try {
+          val recipientId = SignalDatabase.recipients.getOrInsertFromGroupId(groupId)
+          val recipient = Recipient.resolved(recipientId)
+          val outgoingMessage = OutgoingMessage.groupUpdateMessage(recipient, updateDescription, timestamp)
+          val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
+          val messageId = SignalDatabase.messages.insertMessageOutbox(outgoingMessage, threadId, false, null)
+
+          SignalDatabase.messages.markAsSent(messageId, true)
+          SignalDatabase.threads.update(threadId, unarchive = false, allowDeletion = false)
+        } catch (e: MmsException) {
+          Log.w(TAG, "Failed to insert outgoing update message!", e)
+        }
+      } else {
+        try {
+          val isGroupAdd = updateDescription
+            .groupChangeUpdate!!
+            .updates
+            .asSequence()
+            .mapNotNull { it.groupMemberAddedUpdate }
+            .any { serviceIds.matches(it.newMemberAci) }
+
+          val groupMessage = IncomingMessage.groupUpdate(RecipientId.from(editor.get()), timestamp, groupId, updateDescription, isGroupAdd, serverGuid)
+          val insertResult = SignalDatabase.messages.insertMessageInbox(groupMessage)
+
+          if (insertResult.isPresent) {
+            SignalDatabase.threads.update(insertResult.get().threadId, unarchive = false, allowDeletion = false)
+
+            if (isGroupAdd) {
+              AppDependencies.messageNotifier.updateNotification(AppDependencies.application)
+            }
+          } else {
+            Log.w(TAG, "Could not insert update message")
+          }
+        } catch (e: MmsException) {
+          Log.w(TAG, "Failed to insert incoming update message!", e)
+        }
+      }
+    }
+
+    private fun getEditor(decryptedGroupV2Context: DecryptedGroupV2Context): Optional<ServiceId> {
+      val changeEditor = DecryptedGroupUtil.editorServiceId(decryptedGroupV2Context.change)
+
+      if (changeEditor.isPresent) {
+        return changeEditor
+      } else {
+        val pending = DecryptedGroupUtil.findPendingByServiceId(decryptedGroupV2Context.groupState?.pendingMembers ?: emptyList(), aci)
+
+        if (pending.isPresent) {
+          return Optional.ofNullable(ACI.parseOrNull(pending.get().addedByAci))
+        }
+      }
+
+      return Optional.empty()
+    }
+
+    companion object {
+      @VisibleForTesting
+      fun create(aci: ACI, masterKey: GroupMasterKey, groupId: GroupId.V2): ProfileAndMessageHelper {
+        return ProfileAndMessageHelper(aci, masterKey, groupId)
+      }
+    }
+  }
+
+  private sealed interface InternalUpdateResult {
+    class Updated(val updatedLocalState: DecryptedGroup) : InternalUpdateResult
+    object NoUpdateNeeded : InternalUpdateResult
+    class NotAMember(val exception: GroupNotAMemberException) : InternalUpdateResult
+    class UpdateFailed(val throwable: Throwable) : InternalUpdateResult
+
+    companion object {
+      fun from(cause: Throwable): InternalUpdateResult {
+        return when (cause) {
+          is NotInGroupException,
+          is GroupNotFoundException -> NotAMember(GroupNotAMemberException(cause))
+
+          is IOException -> UpdateFailed(cause)
+          else -> UpdateFailed(IOException(cause))
+        }
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/LocalGroupLogEntry.java b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/LocalGroupLogEntry.java
deleted file mode 100644
index 3e31884dce..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/LocalGroupLogEntry.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.thoughtcrime.securesms.groups.v2.processing;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.signal.storageservice.protos.groups.local.DecryptedGroup;
-import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
-
-import java.util.Objects;
-
-/**
- * Pair of a group state and optionally the corresponding change.
- * <p>
- * Similar to {@link ServerGroupLogEntry} but guaranteed to have a group state.
- * <p>
- * Changes are typically not available for pending members.
- */
-final class LocalGroupLogEntry {
-
-  @NonNull  private final DecryptedGroup       group;
-  @Nullable private final DecryptedGroupChange change;
-
-  LocalGroupLogEntry(@NonNull DecryptedGroup group, @Nullable DecryptedGroupChange change) {
-    if (change != null && group.revision != change.revision) {
-      throw new AssertionError();
-    }
-
-    this.group  = group;
-    this.change = change;
-  }
-
-  @NonNull DecryptedGroup getGroup() {
-    return group;
-  }
-
-  @Nullable DecryptedGroupChange getChange() {
-    return change;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (!(o instanceof LocalGroupLogEntry)) return false;
-
-    LocalGroupLogEntry other = (LocalGroupLogEntry) o;
-
-    return group.equals(other.group) && Objects.equals(change, other.change);
-  }
-
-  @Override
-  public int hashCode() {
-    int result = group.hashCode();
-    result = 31 * result + (change != null ? change.hashCode() : 0);
-    return result;
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/ServerGroupLogEntry.java b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/ServerGroupLogEntry.java
deleted file mode 100644
index 28479bf1ca..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/ServerGroupLogEntry.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.thoughtcrime.securesms.groups.v2.processing;
-
-import androidx.annotation.Nullable;
-
-import org.signal.core.util.logging.Log;
-import org.signal.storageservice.protos.groups.local.DecryptedGroup;
-import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
-
-/**
- * Pair of a group state and optionally the corresponding change from the server.
- * <p>
- * Either the group or change may be empty.
- * <p>
- * Changes are typically not available for pending members.
- */
-final class ServerGroupLogEntry {
-
-  private static final String TAG = Log.tag(ServerGroupLogEntry.class);
-
-  @Nullable private final DecryptedGroup       group;
-  @Nullable private final DecryptedGroupChange change;
-
-  ServerGroupLogEntry(@Nullable DecryptedGroup group, @Nullable DecryptedGroupChange change) {
-    if (change != null && group != null && group.revision != change.revision) {
-      Log.w(TAG, "Ignoring change with revision number not matching group");
-      change = null;
-    }
-
-    if (change == null && group == null) {
-      throw new AssertionError();
-    }
-
-    this.group  = group;
-    this.change = change;
-  }
-
-  @Nullable DecryptedGroup getGroup() {
-    return group;
-  }
-
-  @Nullable DecryptedGroupChange getChange() {
-    return change;
-  }
-
-  int getRevision() {
-         if (group  != null) return group.revision;
-    else if (change != null) return change.revision;
-    else                     throw new AssertionError();
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/help/HelpFragment.java b/app/src/main/java/org/thoughtcrime/securesms/help/HelpFragment.java
index b037ea17c5..ec03eac77c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/help/HelpFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/help/HelpFragment.java
@@ -39,7 +39,7 @@ public class HelpFragment extends LoggingFragment {
 
   public static final String START_CATEGORY_INDEX = "start_category_index";
   public static final int    PAYMENT_INDEX        = 6;
-  //public static final int  DONATION_INDEX       = 7;
+  public static final int    DONATION_INDEX       = 7;
   //public static final int  SMS_EXPORT_INDEX     = 8;
 
   private EditText                       problem;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java
index 0d28244fef..60ce934001 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java
@@ -13,7 +13,7 @@
 import org.signal.core.util.PendingIntentFlags;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.BuildConfig;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.service.ExportedBroadcastReceiver;
 
 import java.util.List;
@@ -63,7 +63,7 @@ public static class RetryReceiver extends ExportedBroadcastReceiver {
     @Override
     public void onReceiveUnlock(Context context, Intent intent) {
       Log.i(TAG, "Received an alarm to retry a job.");
-      ApplicationDependencies.getJobManager().wakeUp();
+      AppDependencies.getJobManager().wakeUp();
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java
index f1da3970e2..b4dfea8e12 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java
@@ -4,12 +4,11 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
 import androidx.annotation.WorkerThread;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.jobmanager.impl.BackoffUtil;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -17,8 +16,6 @@
 import java.util.Objects;
 import java.util.UUID;
 
-import static androidx.annotation.VisibleForTesting.PACKAGE_PRIVATE;
-
 /**
  * A durable unit of work.
  *
@@ -107,7 +104,7 @@ final void cancel() {
 
   /** Provides a default exponential backoff given the current run attempt. */
   protected final long defaultBackoff() {
-    return BackoffUtil.exponentialBackoff(runAttempt + 1, FeatureFlags.getDefaultMaxBackoff());
+    return BackoffUtil.exponentialBackoff(runAttempt + 1, RemoteConfig.getDefaultMaxBackoff());
   }
 
 
@@ -218,12 +215,10 @@ public boolean isSuccess() {
       return resultType == ResultType.SUCCESS;
     }
 
-    @VisibleForTesting(otherwise = PACKAGE_PRIVATE)
     public boolean isRetry() {
       return resultType == ResultType.RETRY;
     }
 
-    @VisibleForTesting(otherwise = PACKAGE_PRIVATE)
     public boolean isFailure() {
       return resultType == ResultType.FAILURE;
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java
index 4973874a35..45e866a874 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java
@@ -83,12 +83,15 @@ private Job.Result run(@NonNull Job job) {
 
     try {
       wakeLock = WakeLockUtil.acquire(application, PowerManager.PARTIAL_WAKE_LOCK, WAKE_LOCK_TIMEOUT, job.getId());
-      result = job.run();
+      result   = job.run();
 
       if (job.isCanceled()) {
         Log.w(TAG, JobLogger.format(job, String.valueOf(id), "Failing because the job was canceled."));
         result = Job.Result.failure();
       }
+    } catch (RuntimeException e) {
+      Log.w(TAG, JobLogger.format(job, String.valueOf(id), "Failing fatally due to an unexpected runtime exception."), e);
+      return Job.Result.fatalFailure(e);
     } catch (Exception e) {
       Log.w(TAG, JobLogger.format(job, String.valueOf(id), "Failing due to an unexpected exception."), e);
       return Job.Result.failure();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java
index 69f4512e4e..b997812aed 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java
@@ -15,7 +15,7 @@
 
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 
 import java.util.List;
@@ -75,7 +75,7 @@ public boolean onStartJob(JobParameters params) {
         return false;
       }
 
-      JobManager jobManager = ApplicationDependencies.getJobManager();
+      JobManager jobManager = AppDependencies.getJobManager();
 
       Log.i(TAG, "Waking due to job: " + params.getJobId());
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/ChangeNumberConstraint.kt b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/ChangeNumberConstraint.kt
index 0f30bb708d..a73a14819d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/ChangeNumberConstraint.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/ChangeNumberConstraint.kt
@@ -12,7 +12,7 @@ object ChangeNumberConstraint : Constraint {
   const val KEY = "ChangeNumberConstraint"
 
   override fun isMet(): Boolean {
-    return !SignalStore.misc().isChangeNumberLocked
+    return !SignalStore.misc.isChangeNumberLocked
   }
 
   override fun getFactoryKey(): String = KEY
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/DecryptionsDrainedConstraint.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/DecryptionsDrainedConstraint.java
index 54231054eb..d250cd567f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/DecryptionsDrainedConstraint.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/DecryptionsDrainedConstraint.java
@@ -5,7 +5,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Constraint;
 
 /**
@@ -21,7 +21,7 @@ private DecryptionsDrainedConstraint() {
 
   @Override
   public boolean isMet() {
-    return ApplicationDependencies.getIncomingMessageObserver().getDecryptionDrained();
+    return AppDependencies.getIncomingMessageObserver().getDecryptionDrained();
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/DecryptionsDrainedConstraintObserver.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/DecryptionsDrainedConstraintObserver.java
index 5539f13374..f95084daae 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/DecryptionsDrainedConstraintObserver.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/DecryptionsDrainedConstraintObserver.java
@@ -3,7 +3,7 @@
 import androidx.annotation.NonNull;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.ConstraintObserver;
 
 /**
@@ -16,7 +16,7 @@ public class DecryptionsDrainedConstraintObserver implements ConstraintObserver
 
   @Override
   public void register(@NonNull Notifier notifier) {
-    ApplicationDependencies.getIncomingMessageObserver().addDecryptionDrainedListener(() -> {
+    AppDependencies.getIncomingMessageObserver().addDecryptionDrainedListener(() -> {
       notifier.onConstraintMet(REASON);
     });
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.kt b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.kt
index b8049cece2..498b49d342 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.kt
@@ -47,11 +47,15 @@ data class JobSpec(
     if (serializedData != null) {
       if (other.serializedData == null) return false
       if (!serializedData.contentEquals(other.serializedData)) return false
-    } else if (other.serializedData != null) return false
+    } else if (other.serializedData != null) {
+      return false
+    }
     if (serializedInputData != null) {
       if (other.serializedInputData == null) return false
       if (!serializedInputData.contentEquals(other.serializedInputData)) return false
-    } else if (other.serializedInputData != null) return false
+    } else if (other.serializedInputData != null) {
+      return false
+    }
     if (isRunning != other.isRunning) return false
     if (isMemoryOnly != other.isMemoryOnly) return false
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AccountConsistencyWorkerJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/AccountConsistencyWorkerJob.kt
index 59dc62346f..3f1b9a2ad1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AccountConsistencyWorkerJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AccountConsistencyWorkerJob.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs
 
 import org.signal.core.util.Base64
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -24,8 +24,8 @@ class AccountConsistencyWorkerJob private constructor(parameters: Parameters) :
 
     @JvmStatic
     fun enqueueIfNecessary() {
-      if (System.currentTimeMillis() - SignalStore.misc().lastConsistencyCheckTime > 3.days.inWholeMilliseconds) {
-        ApplicationDependencies.getJobManager().add(AccountConsistencyWorkerJob())
+      if (System.currentTimeMillis() - SignalStore.misc.lastConsistencyCheckTime > 3.days.inWholeMilliseconds) {
+        AppDependencies.jobManager.add(AccountConsistencyWorkerJob())
       }
     }
   }
@@ -46,45 +46,45 @@ class AccountConsistencyWorkerJob private constructor(parameters: Parameters) :
   override fun onFailure() = Unit
 
   override fun onRun() {
-    if (!SignalStore.account().hasAciIdentityKey()) {
+    if (!SignalStore.account.hasAciIdentityKey()) {
       Log.i(TAG, "No identity set yet, skipping.")
       return
     }
 
-    if (!SignalStore.account().isRegistered || SignalStore.account().aci == null) {
+    if (!SignalStore.account.isRegistered || SignalStore.account.aci == null) {
       Log.i(TAG, "Not yet registered, skipping.")
       return
     }
 
     val aciProfile: SignalServiceProfile = ProfileUtil.retrieveProfileSync(context, Recipient.self(), SignalServiceProfile.RequestType.PROFILE, false).profile
-    val encodedAciPublicKey = Base64.encodeWithPadding(SignalStore.account().aciIdentityKey.publicKey.serialize())
+    val encodedAciPublicKey = Base64.encodeWithPadding(SignalStore.account.aciIdentityKey.publicKey.serialize())
 
     if (aciProfile.identityKey != encodedAciPublicKey) {
       Log.w(TAG, "ACI identity key on profile differed from the one we have locally! Marking ourselves unregistered.")
 
-      SignalStore.account().setRegistered(false)
-      SignalStore.registrationValues().clearRegistrationComplete()
-      SignalStore.registrationValues().clearHasUploadedProfile()
+      SignalStore.account.setRegistered(false)
+      SignalStore.registration.clearRegistrationComplete()
+      SignalStore.registration.clearHasUploadedProfile()
 
-      SignalStore.misc().lastConsistencyCheckTime = System.currentTimeMillis()
+      SignalStore.misc.lastConsistencyCheckTime = System.currentTimeMillis()
       return
     }
 
-    val pniProfile: SignalServiceProfile = ProfileUtil.retrieveProfileSync(SignalStore.account().pni!!, SignalServiceProfile.RequestType.PROFILE).profile
-    val encodedPniPublicKey = Base64.encodeWithPadding(SignalStore.account().pniIdentityKey.publicKey.serialize())
+    val pniProfile: SignalServiceProfile = ProfileUtil.retrieveProfileSync(SignalStore.account.pni!!, SignalServiceProfile.RequestType.PROFILE).profile
+    val encodedPniPublicKey = Base64.encodeWithPadding(SignalStore.account.pniIdentityKey.publicKey.serialize())
 
     if (pniProfile.identityKey != encodedPniPublicKey) {
       Log.w(TAG, "PNI identity key on profile differed from the one we have locally!")
 
-      SignalStore.account().setRegistered(false)
-      SignalStore.registrationValues().clearRegistrationComplete()
-      SignalStore.registrationValues().clearHasUploadedProfile()
+      SignalStore.account.setRegistered(false)
+      SignalStore.registration.clearRegistrationComplete()
+      SignalStore.registration.clearHasUploadedProfile()
       return
     }
 
     Log.i(TAG, "Everything matched.")
 
-    SignalStore.misc().lastConsistencyCheckTime = System.currentTimeMillis()
+    SignalStore.misc.lastConsistencyCheckTime = System.currentTimeMillis()
   }
 
   override fun onShouldRetry(e: Exception): Boolean {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AllDataSyncRequestJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AllDataSyncRequestJob.java
deleted file mode 100644
index 9fb9785218..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AllDataSyncRequestJob.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.thoughtcrime.securesms.jobs;
-
-import androidx.annotation.NonNull;
-
-import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobmanager.Job;
-import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
-import org.whispersystems.signalservice.api.SignalServiceMessageSender;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
-import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
-import org.whispersystems.signalservice.api.messages.multidevice.RequestMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
-import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
-import org.whispersystems.signalservice.internal.push.SyncMessage.Request;
-
-import java.io.IOException;
-import java.util.Optional;
-
-public class AllDataSyncRequestJob extends BaseJob {
-
-  public static final String KEY = "AllDataSyncRequestJob";
-
-  private static final String TAG = Log.tag(AllDataSyncRequestJob.class);
-
-  public AllDataSyncRequestJob()
-  {
-    this(new Job.Parameters.Builder()
-                           .setQueue("AllDataSyncRequestJob")
-                           .addConstraint(NetworkConstraint.KEY)
-                           .setMaxAttempts(10)
-                           .build());
-  }
-
-  private AllDataSyncRequestJob(@NonNull Job.Parameters parameters) {
-    super(parameters);
-  }
-
-  @Override
-  public @NonNull byte[] serialize() {
-    return null;
-  }
-
-  @Override
-  public @NonNull String getFactoryKey() {
-    return KEY;
-  }
-
-  @Override
-  public void onRun() throws IOException, UntrustedIdentityException {
-    SignalServiceMessageSender signalServiceMessageSender = ApplicationDependencies.getSignalServiceMessageSender();
-    Optional<UnidentifiedAccessPair> accessForSync = UnidentifiedAccessUtil.getAccessForSync(context);
-    signalServiceMessageSender.sendSyncMessage(SignalServiceSyncMessage.forRequest(RequestMessage.forType(Request.Type.CONTACTS)), accessForSync);
-    signalServiceMessageSender.sendSyncMessage(SignalServiceSyncMessage.forRequest(RequestMessage.forType(Request.Type.BLOCKED)), accessForSync);
-    signalServiceMessageSender.sendSyncMessage(SignalServiceSyncMessage.forRequest(RequestMessage.forType(Request.Type.CONFIGURATION)), accessForSync);
-    signalServiceMessageSender.sendSyncMessage(SignalServiceSyncMessage.forRequest(RequestMessage.forType(Request.Type.KEYS)), accessForSync);
-  }
-
-  @Override
-  public boolean onShouldRetry(@NonNull Exception exception) {
-    return exception instanceof PushNetworkException;
-  }
-
-  @Override
-  public void onFailure() {}
-
-  public static final class Factory implements Job.Factory<AllDataSyncRequestJob> {
-    @Override
-    public @NonNull AllDataSyncRequestJob create(@NonNull Parameters parameters, @NonNull byte[] serializedData) {
-      return new AllDataSyncRequestJob(parameters);
-    }
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ApkUpdateJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/ApkUpdateJob.kt
index cb7070e8be..3093e9467d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ApkUpdateJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ApkUpdateJob.kt
@@ -22,7 +22,6 @@ import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.net.Networking
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.FileUtils
 import org.thoughtcrime.securesms.util.JsonUtils
 import org.thoughtcrime.securesms.util.TextSecurePreferences
@@ -61,7 +60,7 @@ class ApkUpdateJob private constructor(parameters: Parameters) : BaseJob(paramet
 
   @Throws(IOException::class)
   public override fun onRun() {
-    if (!FeatureFlags.selfUpdater() || !TextSecurePreferences.isUpdateApkEnabled(context)) {
+    if (!BuildConfig.MANAGES_MOLLY_UPDATES || !TextSecurePreferences.isUpdateApkEnabled(context)) {
       Log.i(TAG, "In-app updater disabled! Exiting.")
       return
     }
@@ -80,10 +79,10 @@ class ApkUpdateJob private constructor(parameters: Parameters) : BaseJob(paramet
     val request = Request.Builder().url(url).build()
 
     val responseBody: String = client.newCall(request).execute().use { response ->
-      if (!response.isSuccessful || response.body() == null) {
-        throw IOException("Failed to download F-droid repo index: " + response.message())
+      if (!response.isSuccessful || response.body == null) {
+        throw IOException("Failed to download F-droid repo index: " + response.message)
       }
-      response.body()!!.string()
+      response.body!!.string()
     }
 
     val repoIndex: RepoIndex = JsonUtils.fromJson(responseBody, RepoIndex::class.java)
@@ -122,6 +121,8 @@ class ApkUpdateJob private constructor(parameters: Parameters) : BaseJob(paramet
     } else {
       Log.i(TAG, "No update needed. Current version ($currentVersionCode) is up to date.")
     }
+
+    SignalStore.apkUpdate.lastSuccessfulCheck = System.currentTimeMillis()
   }
 
   public override fun onShouldRetry(e: Exception): Boolean {
@@ -140,11 +141,11 @@ class ApkUpdateJob private constructor(parameters: Parameters) : BaseJob(paramet
   }
 
   private fun getDownloadStatus(uri: Uri, remoteDigest: ByteArray): DownloadStatus {
-    val pendingDownloadId: Long = SignalStore.apkUpdate().downloadId
-    val pendingDigest: ByteArray? = SignalStore.apkUpdate().digest
+    val pendingDownloadId: Long = SignalStore.apkUpdate.downloadId
+    val pendingDigest: ByteArray? = SignalStore.apkUpdate.digest
 
     if (pendingDownloadId == -1L || pendingDigest == null || !MessageDigest.isEqual(pendingDigest, remoteDigest)) {
-      SignalStore.apkUpdate().clearDownloadAttributes()
+      SignalStore.apkUpdate.clearDownloadAttributes()
       return DownloadStatus(DownloadStatus.Status.MISSING, -1)
     }
 
@@ -165,7 +166,7 @@ class ApkUpdateJob private constructor(parameters: Parameters) : BaseJob(paramet
             DownloadStatus(DownloadStatus.Status.COMPLETE, downloadId)
           } else {
             Log.w(TAG, "Found downloadId $downloadId, but the digest doesn't match! Considering it missing.")
-            SignalStore.apkUpdate().clearDownloadAttributes()
+            SignalStore.apkUpdate.clearDownloadAttributes()
             DownloadStatus(DownloadStatus.Status.MISSING, downloadId)
           }
         } else {
@@ -191,7 +192,7 @@ class ApkUpdateJob private constructor(parameters: Parameters) : BaseJob(paramet
     val downloadId = context.getDownloadManager().enqueue(downloadRequest)
     // DownloadManager will trigger [UpdateApkReadyListener] when finished via a broadcast
 
-    SignalStore.apkUpdate().setDownloadAttributes(downloadId, digest)
+    SignalStore.apkUpdate.setDownloadAttributes(downloadId, digest)
   }
 
   private fun handleDownloadComplete(downloadId: Long) {
@@ -252,7 +253,9 @@ class ApkUpdateJob private constructor(parameters: Parameters) : BaseJob(paramet
 
   private class DownloadStatus(val status: Status, val downloadId: Long) {
     enum class Status {
-      PENDING, COMPLETE, MISSING
+      PENDING,
+      COMPLETE,
+      MISSING
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentBackfillJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentBackfillJob.kt
index ef2995690a..30766d8e36 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentBackfillJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentBackfillJob.kt
@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.backup.v2.BackupV2Event
 import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.jobs.protos.ArchiveAttachmentBackfillJobData
@@ -91,7 +91,7 @@ class ArchiveAttachmentBackfillJob private constructor(
       val resetCount = SignalDatabase.attachments.resetPendingArchiveBackfills()
       if (resetCount > 0) {
         Log.w(TAG, "We thought we were done, but $resetCount items were still in progress! Need to run again to retry.")
-        ApplicationDependencies.getJobManager().add(
+        AppDependencies.jobManager.add(
           ArchiveAttachmentBackfillJob(
             progress = (totalCount ?: resetCount) - resetCount,
             totalCount = totalCount ?: resetCount
@@ -160,7 +160,7 @@ class ArchiveAttachmentBackfillJob private constructor(
 
       Log.d(TAG, "Beginning upload...")
       val remoteAttachment: SignalServiceAttachmentPointer = try {
-        ApplicationDependencies.getSignalServiceMessageSender().uploadAttachment(attachmentStream)
+        AppDependencies.signalServiceMessageSender.uploadAttachment(attachmentStream)
       } catch (e: IOException) {
         Log.w(TAG, "Failed to upload $attachmentId", e)
         return Result.retry(defaultBackoff())
@@ -226,7 +226,7 @@ class ArchiveAttachmentBackfillJob private constructor(
   }
 
   private fun reenqueueWithIncrementedProgress() {
-    ApplicationDependencies.getJobManager().add(
+    AppDependencies.jobManager.add(
       ArchiveAttachmentBackfillJob(
         totalCount = totalCount,
         progress = progress?.inc()?.coerceAtMost(totalCount ?: 0)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentJob.kt
index 8304a91e81..f487523cd3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentJob.kt
@@ -4,7 +4,7 @@ import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.jobs.protos.ArchiveAttachmentJobData
@@ -26,11 +26,11 @@ class ArchiveAttachmentJob private constructor(private val attachmentId: Attachm
     const val KEY = "ArchiveAttachmentJob"
 
     fun enqueueIfPossible(attachmentId: AttachmentId) {
-      if (!SignalStore.backup().backsUpMedia) {
+      if (!SignalStore.backup.backsUpMedia) {
         return
       }
 
-      ApplicationDependencies.getJobManager().add(ArchiveAttachmentJob(attachmentId))
+      AppDependencies.jobManager.add(ArchiveAttachmentJob(attachmentId))
     }
   }
 
@@ -48,7 +48,7 @@ class ArchiveAttachmentJob private constructor(private val attachmentId: Attachm
   override fun getFactoryKey(): String = KEY
 
   override fun onRun() {
-    if (!SignalStore.backup().backsUpMedia) {
+    if (!SignalStore.backup.backsUpMedia) {
       Log.w(TAG, "Do not have permission to read/write to archive cdn")
       return
     }
@@ -63,7 +63,7 @@ class ArchiveAttachmentJob private constructor(private val attachmentId: Attachm
     BackupRepository.archiveMedia(attachment).successOrThrow()
     ArchiveThumbnailUploadJob.enqueueIfNecessary(attachmentId)
 
-    SignalStore.backup().usedBackupMediaSpace += attachment.size
+    SignalStore.backup.usedBackupMediaSpace += attachment.size
   }
 
   override fun onShouldRetry(e: Exception): Boolean {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveThumbnailUploadJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveThumbnailUploadJob.kt
index 91b57e91f9..9e74165ae0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveThumbnailUploadJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveThumbnailUploadJob.kt
@@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.attachments.PointerAttachment
 import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.backup.v2.BackupRepository.getThumbnailMediaName
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.jobs.protos.ArchiveThumbnailUploadJobData
@@ -46,8 +46,8 @@ class ArchiveThumbnailUploadJob private constructor(
     private val TAG = Log.tag(ArchiveThumbnailUploadJob::class.java)
 
     fun enqueueIfNecessary(attachmentId: AttachmentId) {
-      if (SignalStore.backup().backsUpMedia) {
-        ApplicationDependencies.getJobManager().add(ArchiveThumbnailUploadJob(attachmentId))
+      if (SignalStore.backup.backsUpMedia) {
+        AppDependencies.jobManager.add(ArchiveThumbnailUploadJob(attachmentId))
       }
     }
   }
@@ -87,7 +87,7 @@ class ArchiveThumbnailUploadJob private constructor(
       Log.w(TAG, "Unable to generate a thumbnail result for $attachmentId")
       return Result.success()
     }
-    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
 
     val resumableUpload = when (val result = BackupRepository.getMediaUploadSpec(secretKey = backupKey.deriveThumbnailTransitKey(attachment.getThumbnailMediaName()))) {
       is NetworkResult.Success -> {
@@ -111,7 +111,7 @@ class ArchiveThumbnailUploadJob private constructor(
     val stream = buildSignalServiceAttachmentStream(thumbnailResult, resumableUpload)
 
     val attachmentPointer: Attachment = try {
-      val pointer = ApplicationDependencies.getSignalServiceMessageSender().uploadAttachment(stream)
+      val pointer = AppDependencies.signalServiceMessageSender.uploadAttachment(stream)
       PointerAttachment.forPointer(Optional.of(pointer)).get()
     } catch (e: IOException) {
       Log.w(TAG, "Failed to upload attachment", e)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java
index 1968050b23..7bddf19967 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java
@@ -34,7 +34,7 @@
 import org.thoughtcrime.securesms.service.AttachmentProgressService;
 import org.thoughtcrime.securesms.transport.UndeliverableMessageException;
 import org.thoughtcrime.securesms.util.BitmapDecodingException;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.ImageCompressionUtil;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.MemoryFileDescriptor.MemoryFileException;
@@ -256,8 +256,8 @@ private void compress(@NonNull AttachmentTable attachmentDatabase,
           }
         }
 
-        if (FeatureFlags.useStreamingVideoMuxer()) {
-          StreamingTranscoder transcoder = new StreamingTranscoder(dataSource, options, constraints.getVideoTranscodingSettings(), constraints.getCompressedVideoMaxSize(context), FeatureFlags.allowAudioRemuxing());
+        if (RemoteConfig.useStreamingVideoMuxer()) {
+          StreamingTranscoder transcoder = new StreamingTranscoder(dataSource, options, constraints.getVideoTranscodingSettings(), constraints.getCompressedVideoMaxSize(context), RemoteConfig.allowAudioRemuxing());
 
           if (transcoder.isTranscodeRequired()) {
             Log.i(TAG, "Compressing with streaming muxer");
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.kt
index 4698ecac23..3b21c4c2a1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.kt
@@ -21,7 +21,7 @@ import org.thoughtcrime.securesms.attachments.DatabaseAttachment
 import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.events.PartProgressEvent
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.JobLogger.format
@@ -34,7 +34,7 @@ import org.thoughtcrime.securesms.notifications.v2.ConversationId.Companion.forC
 import org.thoughtcrime.securesms.s3.S3
 import org.thoughtcrime.securesms.transport.RetryLaterException
 import org.thoughtcrime.securesms.util.AttachmentUtil
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.Util
 import org.whispersystems.signalservice.api.backup.MediaName
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment
@@ -84,6 +84,26 @@ class AttachmentDownloadJob private constructor(
       val parsed = AttachmentId(data.getLong(KEY_ATTACHMENT_ID))
       return attachmentId == parsed
     }
+
+    @JvmStatic
+    fun downloadAttachmentIfNeeded(databaseAttachment: DatabaseAttachment): String? {
+      if (databaseAttachment.transferState == AttachmentTable.TRANSFER_RESTORE_OFFLOADED) {
+        return RestoreAttachmentJob.restoreOffloadedAttachment(databaseAttachment)
+      } else if (databaseAttachment.transferState != AttachmentTable.TRANSFER_PROGRESS_STARTED &&
+        databaseAttachment.transferState != AttachmentTable.TRANSFER_PROGRESS_DONE &&
+        databaseAttachment.transferState != AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE
+      ) {
+        val downloadJob = AttachmentDownloadJob(
+          messageId = databaseAttachment.mmsId,
+          attachmentId = databaseAttachment.attachmentId,
+          manual = true,
+          forceArchiveDownload = false
+        )
+        AppDependencies.jobManager.add(downloadJob)
+        return downloadJob.id
+      }
+      return null
+    }
   }
 
   private val attachmentId: Long
@@ -136,7 +156,7 @@ class AttachmentDownloadJob private constructor(
     doWork()
 
     if (!SignalDatabase.messages.isStory(messageId)) {
-      ApplicationDependencies.getMessageNotifier().updateNotification(context, forConversation(0))
+      AppDependencies.messageNotifier.updateNotification(context, forConversation(0))
     }
   }
 
@@ -178,9 +198,9 @@ class AttachmentDownloadJob private constructor(
 
     if ((attachment.cdn == Cdn.CDN_2 || attachment.cdn == Cdn.CDN_3) &&
       attachment.archiveMediaId == null &&
-      SignalStore.backup().backsUpMedia
+      SignalStore.backup.backsUpMedia
     ) {
-      ApplicationDependencies.getJobManager().add(ArchiveAttachmentJob(attachmentId))
+      AppDependencies.jobManager.add(ArchiveAttachmentJob(attachmentId))
     }
   }
 
@@ -202,7 +222,7 @@ class AttachmentDownloadJob private constructor(
     attachmentId: AttachmentId,
     attachment: DatabaseAttachment
   ) {
-    val maxReceiveSize: Long = FeatureFlags.maxAttachmentReceiveSizeBytes()
+    val maxReceiveSize: Long = RemoteConfig.maxAttachmentReceiveSizeBytes
     val attachmentFile: File = SignalDatabase.attachments.getOrCreateTransferFile(attachmentId)
     var archiveFile: File? = null
     var useArchiveCdn = false
@@ -212,7 +232,7 @@ class AttachmentDownloadJob private constructor(
         throw MmsException("Attachment too large, failing download")
       }
 
-      useArchiveCdn = if (SignalStore.backup().backsUpMedia && (forceArchiveDownload || attachment.remoteLocation == null)) {
+      useArchiveCdn = if (SignalStore.backup.backsUpMedia && (forceArchiveDownload || attachment.remoteLocation == null)) {
         if (attachment.archiveMediaName.isNullOrEmpty()) {
           throw InvalidPartException("Invalid attachment configuration")
         }
@@ -221,7 +241,7 @@ class AttachmentDownloadJob private constructor(
         false
       }
 
-      val messageReceiver = ApplicationDependencies.getSignalServiceMessageReceiver()
+      val messageReceiver = AppDependencies.signalServiceMessageReceiver
       val pointer = createAttachmentPointer(attachment, useArchiveCdn)
 
       val progressListener = object : SignalServiceAttachment.ProgressListener {
@@ -240,12 +260,13 @@ class AttachmentDownloadJob private constructor(
 
         messageReceiver
           .retrieveArchivedAttachment(
-            SignalStore.svr().getOrCreateMasterKey().deriveBackupKey().deriveMediaSecrets(MediaName(attachment.archiveMediaName!!)),
+            SignalStore.svr.getOrCreateMasterKey().deriveBackupKey().deriveMediaSecrets(MediaName(attachment.archiveMediaName!!)),
             cdnCredentials,
             archiveFile,
             pointer,
             attachmentFile,
             maxReceiveSize,
+            false,
             progressListener
           )
       } else {
@@ -272,14 +293,14 @@ class AttachmentDownloadJob private constructor(
       Log.w(TAG, "Experienced exception while trying to download an attachment.", e)
       markFailed(messageId, attachmentId)
     } catch (e: NonSuccessfulResponseCodeException) {
-      if (SignalStore.backup().backsUpMedia) {
+      if (SignalStore.backup.backsUpMedia) {
         if (e.code == 404 && !useArchiveCdn && attachment.archiveMediaName?.isNotEmpty() == true) {
           Log.i(TAG, "Retrying download from archive CDN")
           forceArchiveDownload = true
           retrieveAttachment(messageId, attachmentId, attachment)
           return
         } else if (e.code == 401 && useArchiveCdn) {
-          SignalStore.backup().cdnReadCredentials = null
+          SignalStore.backup.cdnReadCredentials = null
           throw RetryLaterException(e)
         }
       }
@@ -311,7 +332,7 @@ class AttachmentDownloadJob private constructor(
 
     return try {
       val remoteData: RemoteData = if (useArchiveCdn) {
-        val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+        val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
         val backupDirectories = BackupRepository.getCdnBackupDirectories().successOrThrow()
 
         RemoteData(
@@ -338,7 +359,7 @@ class AttachmentDownloadJob private constructor(
       if (attachment.remoteDigest != null) {
         Log.i(TAG, "Downloading attachment with digest: " + Hex.toString(attachment.remoteDigest))
       } else {
-        Log.i(TAG, "Downloading attachment with no digest...")
+        throw InvalidPartException("Null remote digest for $attachmentId")
       }
 
       SignalServiceAttachmentPointer(
@@ -359,7 +380,8 @@ class AttachmentDownloadJob private constructor(
         attachment.videoGif,
         Optional.empty(),
         Optional.ofNullable(attachment.blurHash).map { it.hash },
-        attachment.uploadTimestamp
+        attachment.uploadTimestamp,
+        attachment.uuid
       )
     } catch (e: IOException) {
       Log.w(TAG, e)
@@ -378,9 +400,9 @@ class AttachmentDownloadJob private constructor(
   ) {
     try {
       S3.getObject(attachment.fileName!!).use { response ->
-        val body = response.body()
+        val body = response.body
         if (body != null) {
-          if (body.contentLength() > FeatureFlags.maxAttachmentReceiveSizeBytes()) {
+          if (body.contentLength() > RemoteConfig.maxAttachmentReceiveSizeBytes) {
             throw MmsException("Attachment too large, failing download")
           }
           SignalDatabase.attachments.finalizeAttachmentAfterDownload(messageId, attachmentId, (body.source() as Source).buffer().inputStream())
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentHashBackfillJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentHashBackfillJob.kt
index be32017fe2..295eb0e976 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentHashBackfillJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentHashBackfillJob.kt
@@ -10,7 +10,7 @@ import org.signal.core.util.drain
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import java.io.File
 import java.io.FileNotFoundException
@@ -58,7 +58,7 @@ class AttachmentHashBackfillJob private constructor(parameters: Parameters) : Jo
     if (!file.exists()) {
       Log.w(TAG, "File does not exist! Clearing all usages.", true)
       SignalDatabase.attachments.clearUsagesOfDataFile(file)
-      ApplicationDependencies.getJobManager().add(AttachmentHashBackfillJob())
+      AppDependencies.jobManager.add(AttachmentHashBackfillJob())
       return Result.success()
     }
 
@@ -90,7 +90,7 @@ class AttachmentHashBackfillJob private constructor(parameters: Parameters) : Jo
     // Sleep just so we don't hammer the device with hash calculations and disk I/O
     ThreadUtil.sleep(1000)
 
-    ApplicationDependencies.getJobManager().add(AttachmentHashBackfillJob())
+    AppDependencies.jobManager.add(AttachmentHashBackfillJob())
     return Result.success()
   }
 
@@ -100,7 +100,7 @@ class AttachmentHashBackfillJob private constructor(parameters: Parameters) : Jo
       SignalDatabase.attachments.markDataFileAsUnhashable(file)
     } ?: Log.w(TAG, "Job failed, but no active file is set!")
 
-    ApplicationDependencies.getJobManager().add(AttachmentHashBackfillJob())
+    AppDependencies.jobManager.add(AttachmentHashBackfillJob())
   }
 
   class Factory : Job.Factory<AttachmentHashBackfillJob> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.kt
index 19f0147a0c..14087abe91 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.kt
@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.attachments.AttachmentUploadUtil
 import org.thoughtcrime.securesms.attachments.PointerAttachment
 import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.events.PartProgressEvent
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
@@ -27,7 +27,7 @@ import org.thoughtcrime.securesms.mms.MmsException
 import org.thoughtcrime.securesms.net.NotPushRegisteredException
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.service.AttachmentProgressService
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.whispersystems.signalservice.api.crypto.AttachmentCipherStreamUtil
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream
@@ -66,7 +66,7 @@ class AttachmentUploadJob private constructor(
     @JvmStatic
     val maxPlaintextSize: Long
       get() {
-        val maxCipherTextSize = FeatureFlags.maxAttachmentSizeBytes()
+        val maxCipherTextSize = RemoteConfig.maxAttachmentSizeBytes
         val maxPaddedSize = AttachmentCipherStreamUtil.getPlaintextLength(maxCipherTextSize)
         return PaddingInputStream.getMaxUnpaddedSize(maxPaddedSize)
       }
@@ -129,7 +129,7 @@ class AttachmentUploadJob private constructor(
       throw NotPushRegisteredException()
     }
 
-    val messageSender = ApplicationDependencies.getSignalServiceMessageSender()
+    val messageSender = AppDependencies.signalServiceMessageSender
     val databaseAttachment = SignalDatabase.attachments.getAttachment(attachmentId) ?: throw InvalidAttachmentException("Cannot find the specified attachment.")
 
     val timeSinceUpload = System.currentTimeMillis() - databaseAttachment.uploadTimestamp
@@ -147,7 +147,7 @@ class AttachmentUploadJob private constructor(
 
     if (uploadSpec == null) {
       Log.d(TAG, "Need an upload spec. Fetching...")
-      uploadSpec = ApplicationDependencies.getSignalServiceMessageSender().getResumableUploadSpec().toProto()
+      uploadSpec = AppDependencies.signalServiceMessageSender.getResumableUploadSpec().toProto()
     } else {
       Log.d(TAG, "Re-using existing upload spec.")
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AutomaticSessionResetJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AutomaticSessionResetJob.java
index 6f6934d5a2..416b6d89f1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AutomaticSessionResetJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AutomaticSessionResetJob.java
@@ -4,11 +4,11 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
+import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil;
 import org.thoughtcrime.securesms.database.MessageTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.databaseprotos.DeviceLastResetTime;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.impl.DecryptionsDrainedConstraint;
@@ -16,16 +16,14 @@
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -87,12 +85,12 @@ private AutomaticSessionResetJob(@NonNull Parameters parameters,
 
   @Override
   protected void onRun() throws Exception {
-    ApplicationDependencies.getProtocolStore().aci().sessions().archiveSessions(recipientId, deviceId);
+    AppDependencies.getProtocolStore().aci().sessions().archiveSessions(recipientId, deviceId);
     SignalDatabase.senderKeyShared().deleteAllFor(recipientId);
     insertLocalMessage();
 
-    if (FeatureFlags.automaticSessionReset()) {
-      long                resetInterval      = TimeUnit.SECONDS.toMillis(FeatureFlags.automaticSessionResetIntervalSeconds());
+    if (RemoteConfig.automaticSessionReset()) {
+      long                resetInterval      = TimeUnit.SECONDS.toMillis(RemoteConfig.automaticSessionResetIntervalSeconds());
       DeviceLastResetTime resetTimes         = SignalDatabase.recipients().getLastSessionResetTimes(recipientId);
       long                timeSinceLastReset = System.currentTimeMillis() - getLastResetTime(resetTimes, deviceId);
 
@@ -125,7 +123,7 @@ public void onFailure() {
 
   private void insertLocalMessage() {
     MessageTable.InsertResult result = SignalDatabase.messages().insertChatSessionRefreshedMessage(recipientId, deviceId, sentTimestamp - 1);
-    ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(result.getThreadId()));
+    AppDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(result.getThreadId()));
   }
 
   private void sendNullMessage() throws IOException {
@@ -136,12 +134,11 @@ private void sendNullMessage() throws IOException {
       return;
     }
 
-    SignalServiceMessageSender       messageSender      = ApplicationDependencies.getSignalServiceMessageSender();
-    SignalServiceAddress             address            = RecipientUtil.toSignalServiceAddress(context, recipient);
-    Optional<UnidentifiedAccessPair> unidentifiedAccess = UnidentifiedAccessUtil.getAccessFor(context, recipient);
+    SignalServiceMessageSender messageSender = AppDependencies.getSignalServiceMessageSender();
+    SignalServiceAddress       address       = RecipientUtil.toSignalServiceAddress(context, recipient);
 
     try {
-      messageSender.sendNullMessage(address, unidentifiedAccess);
+      messageSender.sendNullMessage(address, SealedSenderAccessUtil.getSealedSenderAccessFor(recipient));
     } catch (UntrustedIdentityException e) {
       Log.w(TAG, "Unable to send null message.");
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV1DownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV1DownloadJob.java
index 76b9dec005..3fa961e527 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV1DownloadJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV1DownloadJob.java
@@ -8,7 +8,7 @@
 import org.thoughtcrime.securesms.database.GroupTable;
 import org.thoughtcrime.securesms.database.model.GroupRecord;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
@@ -84,8 +84,8 @@ public void onRun() throws IOException {
         attachment = File.createTempFile("avatar", "tmp", context.getCacheDir());
         attachment.deleteOnExit();
 
-        SignalServiceMessageReceiver   receiver    = ApplicationDependencies.getSignalServiceMessageReceiver();
-        SignalServiceAttachmentPointer pointer     = new SignalServiceAttachmentPointer(0, new SignalServiceAttachmentRemoteId.V2(avatarId), contentType, key, Optional.of(0), Optional.empty(), 0, 0, digest, Optional.empty(), 0, fileName, false, false, false, Optional.empty(), Optional.empty(), System.currentTimeMillis());
+        SignalServiceMessageReceiver   receiver    = AppDependencies.getSignalServiceMessageReceiver();
+        SignalServiceAttachmentPointer pointer     = new SignalServiceAttachmentPointer(0, new SignalServiceAttachmentRemoteId.V2(avatarId), contentType, key, Optional.of(0), Optional.empty(), 0, 0, digest, Optional.empty(), 0, fileName, false, false, false, Optional.empty(), Optional.empty(), System.currentTimeMillis(), null);
         InputStream                    inputStream = receiver.retrieveAttachment(pointer, attachment, AvatarHelper.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE);
 
         AvatarHelper.setAvatar(context, record.get().getRecipientId(), inputStream);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV2DownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV2DownloadJob.java
index 36621c3962..5a47eb8d80 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV2DownloadJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarGroupsV2DownloadJob.java
@@ -12,7 +12,7 @@
 import org.thoughtcrime.securesms.database.GroupTable;
 import org.thoughtcrime.securesms.database.model.GroupRecord;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
@@ -115,7 +115,7 @@ public void onRun() throws IOException {
     File              attachment        = File.createTempFile("avatar", "gv2", context.getCacheDir());
     attachment.deleteOnExit();
 
-    SignalServiceMessageReceiver receiver      = ApplicationDependencies.getSignalServiceMessageReceiver();
+    SignalServiceMessageReceiver receiver      = AppDependencies.getSignalServiceMessageReceiver();
     byte[]                       encryptedData;
 
     try (FileInputStream inputStream = receiver.retrieveGroupsV2ProfileAvatar(cdnKey, attachment, AVATAR_DOWNLOAD_FAIL_SAFE_MAX_SIZE)) {
@@ -123,7 +123,7 @@ public void onRun() throws IOException {
 
       StreamUtil.readFully(inputStream, encryptedData);
 
-      GroupsV2Operations                 operations      = ApplicationDependencies.getGroupsV2Operations();
+      GroupsV2Operations                 operations      = AppDependencies.getGroupsV2Operations();
       GroupsV2Operations.GroupOperations groupOperations = operations.forGroup(groupSecretParams);
 
       return groupOperations.decryptAvatar(encryptedData);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupMessagesJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupMessagesJob.kt
index d2d25c2e2a..11e579d2b4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupMessagesJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupMessagesJob.kt
@@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.attachments.DatabaseAttachment
 import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.backup.v2.BackupV2Event
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.jobmanager.impl.WifiConstraint
@@ -36,15 +36,26 @@ class BackupMessagesJob private constructor(parameters: Parameters) : BaseJob(pa
 
     const val QUEUE = "BackupMessagesQueue"
 
-    fun enqueue() {
-      val jobManager = ApplicationDependencies.getJobManager()
-      jobManager.add(BackupMessagesJob())
+    /**
+     * Pruning abandoned remote media is relatively expensive, so we should
+     * not do this every time we backup.
+     */
+    fun enqueue(pruneAbandonedRemoteMedia: Boolean = false) {
+      val jobManager = AppDependencies.jobManager
+      if (pruneAbandonedRemoteMedia) {
+        jobManager
+          .startChain(BackupMessagesJob())
+          .then(SyncArchivedMediaJob())
+          .enqueue()
+      } else {
+        jobManager.add(BackupMessagesJob())
+      }
     }
   }
 
   constructor() : this(
     Parameters.Builder()
-      .addConstraint(if (SignalStore.backup().backupWithCellular) NetworkConstraint.KEY else WifiConstraint.KEY)
+      .addConstraint(if (SignalStore.backup.backupWithCellular) NetworkConstraint.KEY else WifiConstraint.KEY)
       .setMaxAttempts(3)
       .setMaxInstancesForFactory(1)
       .setQueue(QUEUE)
@@ -58,7 +69,7 @@ class BackupMessagesJob private constructor(parameters: Parameters) : BaseJob(pa
   override fun onFailure() = Unit
 
   private fun archiveAttachments(): Boolean {
-    if (!SignalStore.backup().backsUpMedia) return false
+    if (!SignalStore.backup.backsUpMedia) return false
 
     val batchSize = 100
     var needToBackfill = 0
@@ -92,7 +103,7 @@ class BackupMessagesJob private constructor(parameters: Parameters) : BaseJob(pa
       }
     }
     if (needToBackfill > 0) {
-      ApplicationDependencies.getJobManager().add(ArchiveAttachmentBackfillJob(totalCount = totalCount, progress = progress - needToBackfill))
+      AppDependencies.jobManager.add(ArchiveAttachmentBackfillJob(totalCount = totalCount, progress = progress - needToBackfill))
       return true
     }
     return false
@@ -112,7 +123,7 @@ class BackupMessagesJob private constructor(parameters: Parameters) : BaseJob(pa
 
   override fun onRun() {
     EventBus.getDefault().postSticky(BackupV2Event(type = BackupV2Event.Type.PROGRESS_MESSAGES, count = 0, estimatedTotalCount = 0))
-    val tempBackupFile = BlobProvider.getInstance().forNonAutoEncryptingSingleSessionOnDisk(ApplicationDependencies.getApplication())
+    val tempBackupFile = BlobProvider.getInstance().forNonAutoEncryptingSingleSessionOnDisk(AppDependencies.application)
 
     val outputStream = FileOutputStream(tempBackupFile)
     BackupRepository.export(outputStream = outputStream, append = { tempBackupFile.appendBytes(it) }, plaintext = false)
@@ -121,15 +132,15 @@ class BackupMessagesJob private constructor(parameters: Parameters) : BaseJob(pa
       BackupRepository.uploadBackupFile(it, tempBackupFile.length())
     }
     val needBackfill = archiveAttachments()
-    SignalStore.backup().lastBackupProtoSize = tempBackupFile.length()
+    SignalStore.backup.lastBackupProtoSize = tempBackupFile.length()
     if (!tempBackupFile.delete()) {
       Log.e(TAG, "Failed to delete temp backup file")
     }
-    SignalStore.backup().lastBackupTime = System.currentTimeMillis()
+    SignalStore.backup.lastBackupTime = System.currentTimeMillis()
     if (!needBackfill) {
       EventBus.getDefault().postSticky(BackupV2Event(BackupV2Event.Type.FINISHED, 0, 0))
       try {
-        SignalStore.backup().usedBackupMediaSpace = (BackupRepository.getRemoteBackupUsedSpace().successOrThrow() ?: 0)
+        SignalStore.backup.usedBackupMediaSpace = (BackupRepository.getRemoteBackupUsedSpace().successOrThrow() ?: 0)
       } catch (e: IOException) {
         Log.e(TAG, "Failed to update used space")
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRestoreJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRestoreJob.kt
index 274795e7ba..1235c22a76 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRestoreJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRestoreJob.kt
@@ -5,12 +5,14 @@
 
 package org.thoughtcrime.securesms.jobs
 
+import org.greenrobot.eventbus.EventBus
 import org.signal.core.util.logging.Log
 import org.signal.libsignal.zkgroup.profiles.ProfileKey
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.backup.RestoreState
 import org.thoughtcrime.securesms.backup.v2.BackupRepository
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.backup.v2.RestoreV2Event
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -47,11 +49,11 @@ class BackupRestoreJob private constructor(parameters: Parameters) : BaseJob(par
   override fun onFailure() = Unit
 
   override fun onAdded() {
-    SignalStore.backup().restoreState = RestoreState.PENDING
+    SignalStore.backup.restoreState = RestoreState.PENDING
   }
 
   override fun onRun() {
-    if (!SignalStore.account().isRegistered) {
+    if (!SignalStore.account.isRegistered) {
       Log.e(TAG, "Not registered, cannot restore!")
       throw NotPushRegisteredException()
     }
@@ -62,7 +64,7 @@ class BackupRestoreJob private constructor(parameters: Parameters) : BaseJob(par
   }
 
   private fun restore(controller: BackupProgressService.Controller) {
-    SignalStore.backup().restoreState = RestoreState.RESTORING_DB
+    SignalStore.backup.restoreState = RestoreState.RESTORING_DB
 
     val progressListener = object : ProgressListener {
       override fun onAttachmentProgress(total: Long, progress: Long) {
@@ -71,12 +73,13 @@ class BackupRestoreJob private constructor(parameters: Parameters) : BaseJob(par
           progress = progress.toFloat() / total.toFloat(),
           indeterminate = false
         )
+        EventBus.getDefault().post(RestoreV2Event(RestoreV2Event.Type.PROGRESS_DOWNLOAD, progress, total))
       }
 
       override fun shouldCancel() = isCanceled
     }
 
-    val tempBackupFile = BlobProvider.getInstance().forNonAutoEncryptingSingleSessionOnDisk(ApplicationDependencies.getApplication())
+    val tempBackupFile = BlobProvider.getInstance().forNonAutoEncryptingSingleSessionOnDisk(AppDependencies.application)
     if (!BackupRepository.downloadBackupFile(tempBackupFile, progressListener)) {
       Log.e(TAG, "Failed to download backup file")
       throw IOException()
@@ -92,7 +95,7 @@ class BackupRestoreJob private constructor(parameters: Parameters) : BaseJob(par
     val selfData = BackupRepository.SelfData(self.aci.get(), self.pni.get(), self.e164.get(), ProfileKey(self.profileKey))
     BackupRepository.import(length = tempBackupFile.length(), inputStreamFactory = tempBackupFile::inputStream, selfData = selfData, plaintext = false)
 
-    SignalStore.backup().restoreState = RestoreState.RESTORING_MEDIA
+    SignalStore.backup.restoreState = RestoreState.RESTORING_MEDIA
   }
 
   override fun onShouldRetry(e: Exception): Boolean = false
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRestoreMediaJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRestoreMediaJob.kt
index 37ea9f3420..8dbb398265 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRestoreMediaJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupRestoreMediaJob.kt
@@ -6,9 +6,10 @@
 package org.thoughtcrime.securesms.jobs
 
 import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -42,32 +43,41 @@ class BackupRestoreMediaJob private constructor(parameters: Parameters) : BaseJo
   override fun onFailure() = Unit
 
   override fun onRun() {
-    if (!SignalStore.account().isRegistered) {
+    if (!SignalStore.account.isRegistered) {
       Log.e(TAG, "Not registered, cannot restore!")
       throw NotPushRegisteredException()
     }
 
-    val jobManager = ApplicationDependencies.getJobManager()
+    val jobManager = AppDependencies.jobManager
     val batchSize = 100
     val restoreTime = System.currentTimeMillis()
-    var restoreJobBatch: List<RestoreAttachmentJob>
+    var restoreJobBatch: List<Job>
     do {
       val attachmentBatch = SignalDatabase.attachments.getRestorableAttachments(batchSize)
       val messageIds = attachmentBatch.map { it.mmsId }.toSet()
       val messageMap = SignalDatabase.messages.getMessages(messageIds).associate { it.id to (it as MmsMessageRecord) }
       restoreJobBatch = SignalDatabase.attachments.getRestorableAttachments(batchSize).map { attachment ->
         val message = messageMap[attachment.mmsId]!!
-        RestoreAttachmentJob(
-          messageId = attachment.mmsId,
-          attachmentId = attachment.attachmentId,
-          manual = false,
-          forceArchiveDownload = true,
-          restoreMode = if (shouldRestoreFullSize(message, restoreTime, optimizeStorage = SignalStore.backup().optimizeStorage)) {
-            RestoreAttachmentJob.RestoreMode.ORIGINAL
-          } else {
-            RestoreAttachmentJob.RestoreMode.THUMBNAIL
-          }
-        )
+        if (shouldRestoreFullSize(message, restoreTime, SignalStore.backup.optimizeStorage)) {
+          RestoreAttachmentJob(
+            messageId = attachment.mmsId,
+            attachmentId = attachment.attachmentId,
+            manual = false,
+            forceArchiveDownload = true,
+            restoreMode = RestoreAttachmentJob.RestoreMode.ORIGINAL
+          )
+        } else {
+          SignalDatabase.attachments.setTransferState(
+            messageId = attachment.mmsId,
+            attachmentId = attachment.attachmentId,
+            transferState = AttachmentTable.TRANSFER_RESTORE_OFFLOADED
+          )
+          RestoreAttachmentThumbnailJob(
+            messageId = attachment.mmsId,
+            attachmentId = attachment.attachmentId,
+            highPriority = false
+          )
+        }
       }
       jobManager.addAll(restoreJobBatch)
     } while (restoreJobBatch.isNotEmpty())
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java
index 8bfa760a15..fb13f7a8a1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java
@@ -9,7 +9,7 @@
 import org.thoughtcrime.securesms.jobmanager.JobLogger;
 import org.thoughtcrime.securesms.jobmanager.JobManager.Chain;
 import org.thoughtcrime.securesms.jobmanager.impl.BackoffUtil;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 
 public abstract class BaseJob extends MasterSecretJob {
 
@@ -57,7 +57,7 @@ public BaseJob(@NonNull Parameters parameters) {
    * override this behavior to define custom backoff behavior.
    */
   public long getNextRunAttemptBackoff(int pastAttemptCount, @NonNull Exception exception) {
-    return BackoffUtil.exponentialBackoff(pastAttemptCount, FeatureFlags.getDefaultMaxBackoff());
+    return BackoffUtil.exponentialBackoff(pastAttemptCount, RemoteConfig.getDefaultMaxBackoff());
   }
 
   protected abstract void onRun() throws Exception;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BuildExpirationConfirmationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/BuildExpirationConfirmationJob.kt
new file mode 100644
index 0000000000..3d30bc330f
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BuildExpirationConfirmationJob.kt
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.jobs
+
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.BuildConfig
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.jobmanager.Job
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.util.Util
+import org.whispersystems.signalservice.api.NetworkResult
+import org.whispersystems.signalservice.api.RemoteConfigResult
+import kotlin.time.Duration.Companion.days
+import kotlin.time.Duration.Companion.seconds
+
+/**
+ * If we have reason to believe a build is expired, we run this job to double-check by fetching the server time. This prevents false positives from people
+ * moving their clock forward in time.
+ */
+class BuildExpirationConfirmationJob private constructor(params: Parameters) : Job(params) {
+  companion object {
+    const val KEY = "BuildExpirationConfirmationJob"
+    private val TAG = Log.tag(BuildExpirationConfirmationJob::class.java)
+  }
+
+  constructor() : this(
+    Parameters.Builder()
+      .addConstraint(NetworkConstraint.KEY)
+      .setMaxInstancesForFactory(2)
+      .setMaxAttempts(Parameters.UNLIMITED)
+      .setLifespan(1.days.inWholeMilliseconds)
+      .build()
+  )
+
+  override fun serialize(): ByteArray? = null
+
+  override fun getFactoryKey(): String = KEY
+
+  override fun run(): Result {
+    if (Util.getTimeUntilBuildExpiry(SignalStore.misc.estimatedServerTime) > 0) {
+      Log.i(TAG, "Build not expired.", true)
+      return Result.success()
+    }
+
+    if (SignalStore.misc.isClientDeprecated) {
+      Log.i(TAG, "Build already marked expired. Nothing to do.", true)
+      return Result.success()
+    }
+
+    if (!SignalStore.account.isRegistered) {
+      Log.w(TAG, "Not registered. Can't check the server time, so assuming deprecated.", true)
+      SignalStore.misc.isClientDeprecated = true
+      return Result.success()
+    }
+
+    val result: NetworkResult<RemoteConfigResult> = NetworkResult.fromFetch {
+      AppDependencies.signalServiceAccountManager.remoteConfig
+    }
+
+    return when (result) {
+      is NetworkResult.Success -> {
+        val serverTimeMs = result.result.serverEpochTimeSeconds.seconds.inWholeMilliseconds
+        SignalStore.misc.setLastKnownServerTime(serverTimeMs, System.currentTimeMillis())
+
+        if (Util.getTimeUntilBuildExpiry(serverTimeMs) <= 0) {
+          Log.w(TAG, "Build confirmed expired! Server time: $serverTimeMs, Local time: ${System.currentTimeMillis()}, Build time: ${BuildConfig.BUILD_TIMESTAMP}, Time since expiry: ${serverTimeMs - BuildConfig.BUILD_TIMESTAMP}", true)
+          SignalStore.misc.isClientDeprecated = true
+        } else {
+          Log.w(TAG, "Build not actually expired! Likely bad local clock. Server time: $serverTimeMs, Local time: ${System.currentTimeMillis()}, Build time: ${BuildConfig.BUILD_TIMESTAMP}")
+        }
+        Result.success()
+      }
+      is NetworkResult.ApplicationError -> Result.retry(defaultBackoff())
+      is NetworkResult.NetworkError -> Result.retry(defaultBackoff())
+      is NetworkResult.StatusCodeError -> if (result.code < 500) Result.retry(defaultBackoff()) else Result.success()
+    }
+  }
+
+  override fun onFailure() {
+  }
+
+  class Factory : Job.Factory<BuildExpirationConfirmationJob> {
+    override fun create(params: Parameters, bytes: ByteArray?): BuildExpirationConfirmationJob {
+      return BuildExpirationConfirmationJob(params)
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLinkPeekJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLinkPeekJob.kt
index 8793c7c534..57b8586ffb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLinkPeekJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLinkPeekJob.kt
@@ -6,13 +6,13 @@
 package org.thoughtcrime.securesms.jobs
 
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.JsonJobData
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import java.util.concurrent.TimeUnit
 
 /**
@@ -46,7 +46,7 @@ internal class CallLinkPeekJob private constructor(
   )
 
   override fun onRun() {
-    if (!FeatureFlags.adHocCalling()) {
+    if (!RemoteConfig.adHocCalling) {
       Log.i(TAG, "Ad hoc calling is disabled. Dropping peek for call link.")
       return
     }
@@ -57,7 +57,7 @@ internal class CallLinkPeekJob private constructor(
       return
     }
 
-    ApplicationDependencies.getSignalCallManager().peekCallLinkCall(callLinkRecipientId)
+    AppDependencies.signalCallManager.peekCallLinkCall(callLinkRecipientId)
   }
 
   override fun onShouldRetry(e: Exception): Boolean = false
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLinkUpdateSendJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLinkUpdateSendJob.kt
index dee97ce24d..0d09dc8280 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLinkUpdateSendJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLinkUpdateSendJob.kt
@@ -8,17 +8,16 @@ package org.thoughtcrime.securesms.jobs
 import okio.ByteString.Companion.toByteString
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.jobs.protos.CallLinkUpdateSendJobData
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage
 import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException
 import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException
 import org.whispersystems.signalservice.internal.push.SyncMessage.CallLinkUpdate
-import java.util.Optional
 import java.util.concurrent.TimeUnit
 
 /**
@@ -65,7 +64,7 @@ class CallLinkUpdateSendJob private constructor(
   override fun onFailure() = Unit
 
   override fun onRun() {
-    if (!FeatureFlags.adHocCalling()) {
+    if (!RemoteConfig.adHocCalling) {
       Log.i(TAG, "Call links are not enabled. Exiting.")
       return
     }
@@ -82,8 +81,8 @@ class CallLinkUpdateSendJob private constructor(
       type = callLinkUpdateType
     )
 
-    ApplicationDependencies.getSignalServiceMessageSender()
-      .sendSyncMessage(SignalServiceSyncMessage.forCallLinkUpdate(callLinkUpdate), Optional.empty())
+    AppDependencies.signalServiceMessageSender
+      .sendSyncMessage(SignalServiceSyncMessage.forCallLinkUpdate(callLinkUpdate))
 
     if (callLinkUpdateType == CallLinkUpdate.Type.DELETE) {
       SignalDatabase.callLinks.deleteCallLink(callLinkRoomId)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLogEventSendJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLogEventSendJob.kt
index 81de40c107..804fd54232 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLogEventSendJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CallLogEventSendJob.kt
@@ -8,7 +8,7 @@ package org.thoughtcrime.securesms.jobs
 import androidx.annotation.WorkerThread
 import okio.ByteString.Companion.toByteString
 import org.thoughtcrime.securesms.database.CallTable
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.jobs.protos.CallLogEventSendJobData
@@ -17,7 +17,6 @@ import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSy
 import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException
 import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException
 import org.whispersystems.signalservice.internal.push.SyncMessage
-import java.util.Optional
 import java.util.concurrent.TimeUnit
 
 /**
@@ -97,11 +96,8 @@ class CallLogEventSendJob private constructor(
   override fun onFailure() = Unit
 
   override fun onRun() {
-    ApplicationDependencies.getSignalServiceMessageSender()
-      .sendSyncMessage(
-        SignalServiceSyncMessage.forCallLogEvent(callLogEvent),
-        Optional.empty()
-      )
+    AppDependencies.signalServiceMessageSender
+      .sendSyncMessage(SignalServiceSyncMessage.forCallLogEvent(callLogEvent))
   }
 
   override fun onShouldRetry(e: Exception): Boolean {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CallSyncEventJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/CallSyncEventJob.kt
index 493f140230..ca94d33af7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CallSyncEventJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CallSyncEventJob.kt
@@ -4,7 +4,7 @@ import org.signal.core.util.logging.Log
 import org.signal.ringrtc.CallId
 import org.thoughtcrime.securesms.database.CallTable
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.JsonJobData
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
@@ -15,7 +15,6 @@ import org.thoughtcrime.securesms.ringrtc.RemotePeer
 import org.thoughtcrime.securesms.service.webrtc.CallEventSyncMessageUtil
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage
 import org.whispersystems.signalservice.internal.push.SyncMessage
-import java.util.Optional
 import java.util.concurrent.TimeUnit
 
 /**
@@ -40,7 +39,7 @@ class CallSyncEventJob private constructor(
             recipientId = conversationRecipientId.toLong(),
             callId = callId,
             direction = CallTable.Direction.serialize(if (isIncoming) CallTable.Direction.INCOMING else CallTable.Direction.OUTGOING),
-            event = CallTable.Event.serialize(CallTable.Event.ACCEPTED)
+            callEvent = CallSyncEventJobRecord.Event.ACCEPTED
           )
         )
       )
@@ -55,7 +54,22 @@ class CallSyncEventJob private constructor(
             recipientId = conversationRecipientId.toLong(),
             callId = callId,
             direction = CallTable.Direction.serialize(if (isIncoming) CallTable.Direction.INCOMING else CallTable.Direction.OUTGOING),
-            event = CallTable.Event.serialize(CallTable.Event.NOT_ACCEPTED)
+            callEvent = CallSyncEventJobRecord.Event.NOT_ACCEPTED
+          )
+        )
+      )
+    }
+
+    @JvmStatic
+    fun createForObserved(conversationRecipientId: RecipientId, callId: Long): CallSyncEventJob {
+      return CallSyncEventJob(
+        getParameters(),
+        listOf(
+          CallSyncEventJobRecord(
+            recipientId = conversationRecipientId.toLong(),
+            callId = callId,
+            direction = CallTable.Direction.serialize(CallTable.Direction.INCOMING),
+            callEvent = CallSyncEventJobRecord.Event.OBSERVED
           )
         )
       )
@@ -69,7 +83,7 @@ class CallSyncEventJob private constructor(
             recipientId = it.peer.toLong(),
             callId = it.callId,
             direction = CallTable.Direction.serialize(it.direction),
-            event = CallTable.Event.serialize(CallTable.Event.DELETE)
+            callEvent = CallSyncEventJobRecord.Event.DELETE
           )
         }
       )
@@ -77,7 +91,7 @@ class CallSyncEventJob private constructor(
 
     fun enqueueDeleteSyncEvents(deletedCalls: Set<CallTable.Call>) {
       deletedCalls.chunked(50).forEach {
-        ApplicationDependencies.getJobManager().add(
+        AppDependencies.jobManager.add(
           createForDelete(it)
         )
       }
@@ -127,7 +141,7 @@ class CallSyncEventJob private constructor(
     val syncMessage = createSyncMessage(syncTimestamp, callSyncEvent, call.type)
 
     return try {
-      ApplicationDependencies.getSignalServiceMessageSender().sendSyncMessage(SignalServiceSyncMessage.forCallEvent(syncMessage), Optional.empty())
+      AppDependencies.signalServiceMessageSender.sendSyncMessage(SignalServiceSyncMessage.forCallEvent(syncMessage))
       null
     } catch (e: Exception) {
       Log.w(TAG, "Unable to send call event sync message for ${callSyncEvent.callId}", e)
@@ -136,29 +150,36 @@ class CallSyncEventJob private constructor(
   }
 
   private fun createSyncMessage(syncTimestamp: Long, callSyncEvent: CallSyncEventJobRecord, callType: CallTable.Type): SyncMessage.CallEvent {
-    return when (callSyncEvent.deserializeEvent()) {
-      CallTable.Event.ACCEPTED -> CallEventSyncMessageUtil.createAcceptedSyncMessage(
+    return when (callSyncEvent.resolveEvent()) {
+      CallSyncEventJobRecord.Event.ACCEPTED -> CallEventSyncMessageUtil.createAcceptedSyncMessage(
         remotePeer = RemotePeer(callSyncEvent.deserializeRecipientId(), CallId(callSyncEvent.callId)),
         timestamp = syncTimestamp,
         isOutgoing = callSyncEvent.deserializeDirection() == CallTable.Direction.OUTGOING,
         isVideoCall = callType != CallTable.Type.AUDIO_CALL
       )
 
-      CallTable.Event.NOT_ACCEPTED -> CallEventSyncMessageUtil.createNotAcceptedSyncMessage(
+      CallSyncEventJobRecord.Event.NOT_ACCEPTED -> CallEventSyncMessageUtil.createNotAcceptedSyncMessage(
         remotePeer = RemotePeer(callSyncEvent.deserializeRecipientId(), CallId(callSyncEvent.callId)),
         timestamp = syncTimestamp,
         isOutgoing = callSyncEvent.deserializeDirection() == CallTable.Direction.OUTGOING,
         isVideoCall = callType != CallTable.Type.AUDIO_CALL
       )
 
-      CallTable.Event.DELETE -> CallEventSyncMessageUtil.createDeleteCallEvent(
+      CallSyncEventJobRecord.Event.DELETE -> CallEventSyncMessageUtil.createDeleteCallEvent(
         remotePeer = RemotePeer(callSyncEvent.deserializeRecipientId(), CallId(callSyncEvent.callId)),
         timestamp = syncTimestamp,
         isOutgoing = callSyncEvent.deserializeDirection() == CallTable.Direction.OUTGOING,
         isVideoCall = callType != CallTable.Type.AUDIO_CALL
       )
 
-      else -> throw Exception("Unsupported event: ${callSyncEvent.event}")
+      CallSyncEventJobRecord.Event.OBSERVED -> CallEventSyncMessageUtil.createObservedCallEvent(
+        remotePeer = RemotePeer(callSyncEvent.deserializeRecipientId(), CallId(callSyncEvent.callId)),
+        timestamp = syncTimestamp,
+        isOutgoing = false,
+        isVideoCall = callType != CallTable.Type.AUDIO_CALL
+      )
+
+      else -> throw Exception("Unsupported event: ${callSyncEvent.deprecatedEvent}")
     }
   }
 
@@ -166,7 +187,18 @@ class CallSyncEventJob private constructor(
 
   private fun CallSyncEventJobRecord.deserializeDirection(): CallTable.Direction = CallTable.Direction.deserialize(direction)
 
-  private fun CallSyncEventJobRecord.deserializeEvent(): CallTable.Event = CallTable.Event.deserialize(event)
+  private fun CallSyncEventJobRecord.resolveEvent(): CallSyncEventJobRecord.Event {
+    return if (callEvent != CallSyncEventJobRecord.Event.UNKNOWN_ACTION) {
+      callEvent
+    } else {
+      when (CallTable.Event.deserialize(deprecatedEvent)) {
+        CallTable.Event.ACCEPTED -> CallSyncEventJobRecord.Event.ACCEPTED
+        CallTable.Event.NOT_ACCEPTED -> CallSyncEventJobRecord.Event.NOT_ACCEPTED
+        CallTable.Event.DELETE -> CallSyncEventJobRecord.Event.DELETE
+        else -> CallSyncEventJobRecord.Event.UNKNOWN_ACTION
+      }
+    }
+  }
 
   class Factory : Job.Factory<CallSyncEventJob> {
     override fun create(parameters: Parameters, serializedData: ByteArray?): CallSyncEventJob {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CheckServiceReachabilityJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/CheckServiceReachabilityJob.kt
index 8a98a9c46f..43f81f7729 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CheckServiceReachabilityJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CheckServiceReachabilityJob.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs
 
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.BuildConfig
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -33,10 +33,10 @@ class CheckServiceReachabilityJob private constructor(params: Parameters) : Base
 
     @JvmStatic
     fun enqueueIfNecessary() {
-      val isCensored = ApplicationDependencies.getSignalServiceNetworkAccess().isCensored()
-      val timeSinceLastCheck = System.currentTimeMillis() - SignalStore.misc().lastCensorshipServiceReachabilityCheckTime
-      if (SignalStore.account().isRegistered && isCensored && timeSinceLastCheck > TimeUnit.DAYS.toMillis(1)) {
-        ApplicationDependencies.getJobManager().add(CheckServiceReachabilityJob())
+      val isCensored = AppDependencies.signalServiceNetworkAccess.isCensored()
+      val timeSinceLastCheck = System.currentTimeMillis() - SignalStore.misc.lastCensorshipServiceReachabilityCheckTime
+      if (SignalStore.account.isRegistered && isCensored && timeSinceLastCheck > TimeUnit.DAYS.toMillis(1)) {
+        AppDependencies.jobManager.add(CheckServiceReachabilityJob())
       }
     }
   }
@@ -50,30 +50,30 @@ class CheckServiceReachabilityJob private constructor(params: Parameters) : Base
   }
 
   override fun onRun() {
-    if (!SignalStore.account().isRegistered) {
+    if (!SignalStore.account.isRegistered) {
       Log.w(TAG, "Not registered, skipping.")
-      SignalStore.misc().lastCensorshipServiceReachabilityCheckTime = System.currentTimeMillis()
+      SignalStore.misc.lastCensorshipServiceReachabilityCheckTime = System.currentTimeMillis()
       return
     }
 
-    if (!ApplicationDependencies.getSignalServiceNetworkAccess().isCensored()) {
+    if (!AppDependencies.signalServiceNetworkAccess.isCensored()) {
       Log.w(TAG, "Not currently censored, skipping.")
-      SignalStore.misc().lastCensorshipServiceReachabilityCheckTime = System.currentTimeMillis()
+      SignalStore.misc.lastCensorshipServiceReachabilityCheckTime = System.currentTimeMillis()
       return
     }
 
-    SignalStore.misc().lastCensorshipServiceReachabilityCheckTime = System.currentTimeMillis()
+    SignalStore.misc.lastCensorshipServiceReachabilityCheckTime = System.currentTimeMillis()
 
     val uncensoredWebsocket = OkHttpWebSocketConnection(
       "uncensored-test",
-      ApplicationDependencies.getSignalServiceNetworkAccess().uncensoredConfiguration,
+      AppDependencies.signalServiceNetworkAccess.uncensoredConfiguration,
       Optional.of(
         StaticCredentialsProvider(
-          SignalStore.account().aci,
-          SignalStore.account().pni,
-          SignalStore.account().e164,
-          SignalStore.account().deviceId,
-          SignalStore.account().servicePassword
+          SignalStore.account.aci,
+          SignalStore.account.pni,
+          SignalStore.account.e164,
+          SignalStore.account.deviceId,
+          SignalStore.account.servicePassword
         )
       ),
       BuildConfig.SIGNAL_AGENT,
@@ -92,14 +92,14 @@ class CheckServiceReachabilityJob private constructor(params: Parameters) : Base
 
       if (state == WebSocketConnectionState.CONNECTED) {
         Log.i(TAG, "Established connection in ${System.currentTimeMillis() - startTime} ms! Service is reachable!")
-        SignalStore.misc().isServiceReachableWithoutCircumvention = true
+        SignalStore.misc.isServiceReachableWithoutCircumvention = true
       } else {
         Log.w(TAG, "Failed to establish a connection in ${System.currentTimeMillis() - startTime} ms.")
-        SignalStore.misc().isServiceReachableWithoutCircumvention = false
+        SignalStore.misc.isServiceReachableWithoutCircumvention = false
       }
     } catch (exception: Exception) {
       Log.w(TAG, "Failed to connect to the websocket.", exception)
-      SignalStore.misc().isServiceReachableWithoutCircumvention = false
+      SignalStore.misc.isServiceReachableWithoutCircumvention = false
     } finally {
       uncensoredWebsocket.disconnect()
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
index 88175b2079..ed9bf54699 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
@@ -7,7 +7,7 @@
 import org.signal.libsignal.protocol.state.SignalProtocolStore;
 import org.thoughtcrime.securesms.crypto.PreKeyUtil;
 import org.thoughtcrime.securesms.crypto.storage.PreKeyMetadataStore;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 
@@ -38,8 +38,8 @@ private CleanPreKeysJob(@NonNull Job.Parameters parameters) {
 
   @Override
   public void onRun() {
-    PreKeyUtil.cleanSignedPreKeys(ApplicationDependencies.getProtocolStore().aci(), SignalStore.account().aciPreKeys());
-    PreKeyUtil.cleanSignedPreKeys(ApplicationDependencies.getProtocolStore().pni(), SignalStore.account().pniPreKeys());
+    PreKeyUtil.cleanSignedPreKeys(AppDependencies.getProtocolStore().aci(), SignalStore.account().aciPreKeys());
+    PreKeyUtil.cleanSignedPreKeys(AppDependencies.getProtocolStore().pni(), SignalStore.account().pniPreKeys());
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ConversationShortcutRankingUpdateJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/ConversationShortcutRankingUpdateJob.kt
index 85d277858c..0c3939888d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ConversationShortcutRankingUpdateJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ConversationShortcutRankingUpdateJob.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs
 
 import android.os.Build
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.JsonJobData
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -33,14 +33,14 @@ class ConversationShortcutRankingUpdateJob private constructor(
     @JvmStatic
     fun enqueueForOutgoingIfNecessary(recipient: Recipient) {
       if (Build.VERSION.SDK_INT >= 34) {
-        ApplicationDependencies.getJobManager().add(ConversationShortcutRankingUpdateJob(recipient, Direction.OUTGOING))
+        AppDependencies.jobManager.add(ConversationShortcutRankingUpdateJob(recipient, Direction.OUTGOING))
       }
     }
 
     @JvmStatic
     fun enqueueForIncomingIfNecessary(recipient: Recipient) {
       if (Build.VERSION.SDK_INT >= 34) {
-        ApplicationDependencies.getJobManager().add(ConversationShortcutRankingUpdateJob(recipient, Direction.INCOMING))
+        AppDependencies.jobManager.add(ConversationShortcutRankingUpdateJob(recipient, Direction.INCOMING))
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ConversationShortcutUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ConversationShortcutUpdateJob.java
index e5b24d752f..5fe016f92f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ConversationShortcutUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ConversationShortcutUpdateJob.java
@@ -7,13 +7,12 @@
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.ThreadTable;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.transport.RetryLaterException;
 import org.thoughtcrime.securesms.util.ConversationUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.Util;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,7 +30,7 @@ public class ConversationShortcutUpdateJob extends BaseJob {
   public static final String KEY = "ConversationShortcutUpdateJob";
 
   public static void enqueue() {
-    ApplicationDependencies.getJobManager().add(new ConversationShortcutUpdateJob());
+    AppDependencies.getJobManager().add(new ConversationShortcutUpdateJob());
   }
 
   private ConversationShortcutUpdateJob() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateReleaseChannelJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateReleaseChannelJob.kt
index 0012cbade6..990ac33d4d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateReleaseChannelJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateReleaseChannelJob.kt
@@ -45,15 +45,15 @@ class CreateReleaseChannelJob private constructor(parameters: Parameters) : Base
   override fun onFailure() = Unit
 
   override fun onRun() {
-    if (!SignalStore.account().isRegistered) {
+    if (!SignalStore.account.isRegistered) {
       Log.i(TAG, "Not registered, skipping.")
       return
     }
 
-    if (SignalStore.releaseChannelValues().releaseChannelRecipientId != null) {
-      Log.i(TAG, "Already created Release Channel recipient ${SignalStore.releaseChannelValues().releaseChannelRecipientId}")
+    if (SignalStore.releaseChannel.releaseChannelRecipientId != null) {
+      Log.i(TAG, "Already created Release Channel recipient ${SignalStore.releaseChannel.releaseChannelRecipientId}")
 
-      val recipient = Recipient.resolved(SignalStore.releaseChannelValues().releaseChannelRecipientId!!)
+      val recipient = Recipient.resolved(SignalStore.releaseChannel.releaseChannelRecipientId!!)
       if (recipient.profileAvatar == null || recipient.profileAvatar?.isEmpty() == true) {
         setAvatar(recipient.id)
       }
@@ -61,7 +61,7 @@ class CreateReleaseChannelJob private constructor(parameters: Parameters) : Base
       val recipients = SignalDatabase.recipients
 
       val releaseChannelId: RecipientId = recipients.insertReleaseChannelRecipient()
-      SignalStore.releaseChannelValues().setReleaseChannelRecipientId(releaseChannelId)
+      SignalStore.releaseChannel.setReleaseChannelRecipientId(releaseChannelId)
 
       recipients.setProfileName(releaseChannelId, ProfileName.asGiven("Signal"))
       recipients.setMuted(releaseChannelId, Long.MAX_VALUE)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob.java
index dcaf8de96e..fb91a701ee 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/DownloadLatestEmojiDataJob.java
@@ -11,7 +11,7 @@
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.emoji.EmojiPageModel;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.emoji.EmojiData;
 import org.thoughtcrime.securesms.emoji.EmojiDownloader;
 import org.thoughtcrime.securesms.emoji.EmojiFiles;
@@ -56,11 +56,11 @@ public class DownloadLatestEmojiDataJob extends BaseJob {
   private EmojiFiles.Version targetVersion;
 
   public static void scheduleIfNecessary(@NonNull Context context) {
-    long nextScheduledCheck = SignalStore.emojiValues().getNextScheduledImageCheck();
+    long nextScheduledCheck = SignalStore.emoji().getNextScheduledImageCheck();
 
     if (nextScheduledCheck <= System.currentTimeMillis()) {
       Log.i(TAG, "Scheduling DownloadLatestEmojiDataJob.");
-      ApplicationDependencies.getJobManager().add(new DownloadLatestEmojiDataJob(false));
+      AppDependencies.getJobManager().add(new DownloadLatestEmojiDataJob(false));
 
       EmojiFiles.Version version = EmojiFiles.Version.readVersion(context);
 
@@ -71,7 +71,7 @@ public static void scheduleIfNecessary(@NonNull Context context) {
         interval = INTERVAL_WITHOUT_REMOTE_DOWNLOAD;
       }
 
-      SignalStore.emojiValues().setNextScheduledImageCheck(System.currentTimeMillis() + interval);
+      SignalStore.emoji().setNextScheduledImageCheck(System.currentTimeMillis() + interval);
     }
   }
 
@@ -353,7 +353,7 @@ private static void clearOldEmojiData(@NonNull Context context, @Nullable EmojiF
     EmojiPageCache.INSTANCE.clear();
 
     if (version != null) {
-      SignalStore.emojiValues().clearJumboEmojiSheets(version.getVersion());
+      SignalStore.emoji().clearJumboEmojiSheets(version.getVersion());
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/EmojiSearchIndexDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/EmojiSearchIndexDownloadJob.java
index 43b139a00a..1533fa582d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/EmojiSearchIndexDownloadJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/EmojiSearchIndexDownloadJob.java
@@ -8,7 +8,7 @@
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.EmojiSearchData;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.keyvalue.EmojiValues;
@@ -52,14 +52,14 @@ private EmojiSearchIndexDownloadJob(@NonNull Parameters parameters) {
   }
 
   public static void scheduleImmediately() {
-    ApplicationDependencies.getJobManager().add(new EmojiSearchIndexDownloadJob());
+    AppDependencies.getJobManager().add(new EmojiSearchIndexDownloadJob());
   }
 
   public static void scheduleIfNecessary() {
-    long    timeSinceCheck = System.currentTimeMillis() - SignalStore.emojiValues().getLastSearchIndexCheck();
+    long    timeSinceCheck = System.currentTimeMillis() - SignalStore.emoji().getLastSearchIndexCheck();
     boolean needsCheck     = false;
 
-    if (SignalStore.emojiValues().hasSearchIndex()) {
+    if (SignalStore.emoji().hasSearchIndex()) {
       needsCheck = timeSinceCheck > INTERVAL_WITH_INDEX;
     } else {
       needsCheck = timeSinceCheck > INTERVAL_WITHOUT_INDEX;
@@ -90,11 +90,11 @@ protected void onRun() throws Exception {
     Locale locale         = DynamicLanguageContextWrapper.getUsersSelectedLocale(context);
     String remoteLanguage = findMatchingLanguage(locale, manifest.getLanguages());
 
-    if (manifest.getVersion() == SignalStore.emojiValues().getSearchVersion() &&
-        remoteLanguage.equals(SignalStore.emojiValues().getSearchLanguage()))
+    if (manifest.getVersion() == SignalStore.emoji().getSearchVersion() &&
+        remoteLanguage.equals(SignalStore.emoji().getSearchLanguage()))
     {
       Log.i(TAG, "Already using the latest version of " + manifest.getVersion() + " with the correct language " + remoteLanguage);
-      SignalStore.emojiValues().setLastSearchIndexCheck(System.currentTimeMillis());
+      SignalStore.emoji().setLastSearchIndexCheck(System.currentTimeMillis());
       return;
     }
 
@@ -107,8 +107,8 @@ protected void onRun() throws Exception {
     }
 
     SignalDatabase.emojiSearch().setSearchIndex(searchIndex);
-    SignalStore.emojiValues().onSearchIndexUpdated(manifest.getVersion(), remoteLanguage);
-    SignalStore.emojiValues().setLastSearchIndexCheck(System.currentTimeMillis());
+    SignalStore.emoji().onSearchIndexUpdated(manifest.getVersion(), remoteLanguage);
+    SignalStore.emoji().setLastSearchIndexCheck(System.currentTimeMillis());
 
     Log.i(TAG, "Success! Now at version: " + manifest.getVersion() + ", language: " + remoteLanguage);
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java
index 6eb15f6804..5d7e3c1a93 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java
@@ -33,7 +33,7 @@
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.PlayServicesProblemActivity;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.gcm.FcmUtil;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
@@ -100,7 +100,7 @@ public void onRun() throws Exception {
           Log.i(TAG, "Token didn't change.");
         }
 
-        ApplicationDependencies.getSignalServiceAccountManager().setGcmId(token);
+        AppDependencies.getSignalServiceAccountManager().setGcmId(token);
         SignalStore.account().setFcmToken(token.get());
       } else {
         throw new RetryLaterException(new IOException("Failed to retrieve a token."));
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/FetchRemoteMegaphoneImageJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/FetchRemoteMegaphoneImageJob.kt
index 7e8e23660c..34ccbc9aca 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/FetchRemoteMegaphoneImageJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/FetchRemoteMegaphoneImageJob.kt
@@ -42,7 +42,7 @@ class FetchRemoteMegaphoneImageJob(parameters: Parameters, private val uuid: Str
   override fun onRun() {
     try {
       S3.getObject(imageUrl).use { response ->
-        val body: ResponseBody? = response.body()
+        val body: ResponseBody? = response.body
         if (body != null) {
           val uri = BlobProvider.getInstance()
             .forData(body.byteStream(), body.contentLength())
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ForceUpdateGroupV2Job.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ForceUpdateGroupV2Job.java
index 12117f855f..0a73929fd0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ForceUpdateGroupV2Job.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ForceUpdateGroupV2Job.java
@@ -6,7 +6,7 @@
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.GroupRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
@@ -34,7 +34,7 @@ public static void enqueueIfNecessary(@NonNull GroupId.V2 groupId) {
           group.get().isV2Group() &&
           group.get().getLastForceUpdateTimestamp() + FORCE_UPDATE_INTERVAL < System.currentTimeMillis()
       ) {
-        ApplicationDependencies.getJobManager().add(new ForceUpdateGroupV2Job(groupId));
+        AppDependencies.getJobManager().add(new ForceUpdateGroupV2Job(groupId));
       }
     });
   }
@@ -65,7 +65,7 @@ private ForceUpdateGroupV2Job(@NonNull Parameters parameters, @NonNull GroupId.V
 
   @Override
   public void onRun() {
-    ApplicationDependencies.getJobManager().add(new ForceUpdateGroupV2WorkerJob(groupId));
+    AppDependencies.getJobManager().add(new ForceUpdateGroupV2WorkerJob(groupId));
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ForegroundServiceUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/ForegroundServiceUtil.kt
index f9cadd24ca..9db7227a7c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ForegroundServiceUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ForegroundServiceUtil.kt
@@ -12,7 +12,7 @@ import androidx.annotation.WorkerThread
 import androidx.core.content.ContextCompat
 import org.signal.core.util.PendingIntentFlags
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.service.GenericForegroundService
 import org.thoughtcrime.securesms.service.NotificationController
 import org.thoughtcrime.securesms.util.ServiceUtil
@@ -137,7 +137,7 @@ object ForegroundServiceUtil {
   private fun blockUntilCapable(context: Context, timeout: Long = DEFAULT_TIMEOUT): Boolean {
     val alarmManager = ServiceUtil.getAlarmManager(context)
 
-    if (Build.VERSION.SDK_INT < 31 || ApplicationDependencies.getAppForegroundObserver().isForegrounded) {
+    if (Build.VERSION.SDK_INT < 31 || AppDependencies.appForegroundObserver.isForegrounded) {
       return true
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/GenerateAudioWaveFormJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/GenerateAudioWaveFormJob.kt
index ae0b3cea19..125deed6e7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/GenerateAudioWaveFormJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/GenerateAudioWaveFormJob.kt
@@ -8,7 +8,7 @@ import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment
 import org.thoughtcrime.securesms.audio.AudioWaveForms
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.JsonJobData
 import org.thoughtcrime.securesms.util.MediaUtil
@@ -31,7 +31,7 @@ class GenerateAudioWaveFormJob private constructor(private val attachmentId: Att
       if (Build.VERSION.SDK_INT < 23) {
         Log.i(TAG, "Unable to generate waveform on this version of Android")
       } else {
-        ApplicationDependencies.getJobManager().add(GenerateAudioWaveFormJob(attachmentId))
+        AppDependencies.jobManager.add(GenerateAudioWaveFormJob(attachmentId))
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallPeekJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallPeekJob.java
index bb723cac02..6212301ff1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallPeekJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallPeekJob.java
@@ -3,7 +3,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
@@ -24,7 +24,7 @@ public final class GroupCallPeekJob extends BaseJob {
   @NonNull private final RecipientId groupRecipientId;
 
   public static void enqueue(@NonNull RecipientId groupRecipientId) {
-    JobManager         jobManager = ApplicationDependencies.getJobManager();
+    JobManager         jobManager = AppDependencies.getJobManager();
     String             queue      = QUEUE + groupRecipientId.serialize();
     Parameters.Builder parameters = new Parameters.Builder()
                                                   .setQueue(queue)
@@ -44,7 +44,7 @@ private GroupCallPeekJob(@NonNull Parameters parameters,
 
   @Override
   protected void onRun() {
-    ApplicationDependencies.getJobManager().add(new GroupCallPeekWorkerJob(groupRecipientId));
+    AppDependencies.getJobManager().add(new GroupCallPeekWorkerJob(groupRecipientId));
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallPeekWorkerJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallPeekWorkerJob.java
index 226687a5b0..a3bf355912 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallPeekWorkerJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallPeekWorkerJob.java
@@ -3,7 +3,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -34,7 +34,7 @@ private GroupCallPeekWorkerJob(@NonNull Parameters parameters, @NonNull Recipien
 
   @Override
   protected void onRun() {
-    ApplicationDependencies.getSignalCallManager().peekGroupCall(groupRecipientId);
+    AppDependencies.getSignalCallManager().peekGroupCall(groupRecipientId);
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallUpdateSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallUpdateSendJob.java
index 4847e82e14..60882161eb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallUpdateSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallUpdateSendJob.java
@@ -7,7 +7,7 @@
 import com.annimon.stream.Stream;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.messages.GroupSendUtil;
@@ -176,7 +176,7 @@ public void onFailure() {
                                                                                              false);
 
     if (includesSelf) {
-      results.add(ApplicationDependencies.getSignalServiceMessageSender().sendSyncMessage(dataMessage));
+      results.add(AppDependencies.getSignalServiceMessageSender().sendSyncMessage(dataMessage));
       syncTimestamp = dataMessage.getTimestamp();
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupRingCleanupJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupRingCleanupJob.kt
index 5f6139e458..5250053a19 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupRingCleanupJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupRingCleanupJob.kt
@@ -6,7 +6,7 @@
 package org.thoughtcrime.securesms.jobs
 
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import java.util.concurrent.TimeUnit
@@ -21,7 +21,7 @@ class GroupRingCleanupJob private constructor(parameters: Parameters) : BaseJob(
 
     @JvmStatic
     fun enqueue() {
-      ApplicationDependencies.getJobManager().add(
+      AppDependencies.jobManager.add(
         GroupRingCleanupJob(
           Parameters.Builder()
             .addConstraint(NetworkConstraint.KEY)
@@ -42,7 +42,7 @@ class GroupRingCleanupJob private constructor(parameters: Parameters) : BaseJob(
 
   override fun onRun() {
     SignalDatabase.calls.getLatestRingingCalls().forEach {
-      ApplicationDependencies.getSignalCallManager().peekGroupCall(it.peer)
+      AppDependencies.signalCallManager.peekGroupCall(it.peer)
     }
 
     SignalDatabase.calls.markRingingCallsAsMissed()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupV2UpdateSelfProfileKeyJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupV2UpdateSelfProfileKeyJob.java
index a9d8fa1194..c697b36531 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupV2UpdateSelfProfileKeyJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/GroupV2UpdateSelfProfileKeyJob.java
@@ -9,7 +9,7 @@
 import org.signal.storageservice.protos.groups.local.DecryptedMember;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.GroupRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupChangeBusyException;
 import org.thoughtcrime.securesms.groups.GroupChangeFailedException;
 import org.thoughtcrime.securesms.groups.GroupId;
@@ -128,7 +128,7 @@ public static void enqueueForGroupsIfNecessary() {
         if (selfMember != null && !selfMember.profileKey.equals(selfProfileKey)) {
           Log.w(TAG, "Profile key mismatch for group " + id + " -- enqueueing job");
           foundMismatch = true;
-          ApplicationDependencies.getJobManager().add(GroupV2UpdateSelfProfileKeyJob.withQueueLimits(id));
+          AppDependencies.getJobManager().add(GroupV2UpdateSelfProfileKeyJob.withQueueLimits(id));
         }
       }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentAuthCheckJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentAuthCheckJob.kt
new file mode 100644
index 0000000000..976322fbf3
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentAuthCheckJob.kt
@@ -0,0 +1,379 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.jobs
+
+import io.reactivex.rxjava3.core.Single
+import org.signal.core.util.logging.Log
+import org.signal.core.util.money.FiatMoney
+import org.signal.donations.InAppPaymentType
+import org.signal.donations.PaymentSourceType
+import org.signal.donations.StripeApi
+import org.signal.donations.StripeIntentAccessor
+import org.signal.donations.json.StripeIntentStatus
+import org.signal.donations.json.StripePaymentIntent
+import org.signal.donations.json.StripeSetupIntent
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatMoney
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.requireSubscriberType
+import org.thoughtcrime.securesms.components.settings.app.subscription.RecurringInAppPaymentRepository
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.jobmanager.Job
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.subscription.LevelUpdate
+import org.thoughtcrime.securesms.subscription.LevelUpdateOperation
+import org.thoughtcrime.securesms.util.Environment
+import org.whispersystems.signalservice.internal.ServiceResponse
+import kotlin.time.Duration.Companion.days
+
+/**
+ * Responsible for checking payment state after an external launch, such as for iDEAL
+ */
+class InAppPaymentAuthCheckJob private constructor(parameters: Parameters) : BaseJob(parameters), StripeApi.PaymentIntentFetcher, StripeApi.SetupIntentHelper {
+
+  private constructor() : this(
+    Parameters.Builder()
+      .addConstraint(NetworkConstraint.KEY)
+      .setMaxAttempts(Parameters.UNLIMITED)
+      .setLifespan(1.days.inWholeMilliseconds)
+      .setMaxInstancesForFactory(1)
+      .build()
+  )
+
+  companion object {
+    private val TAG = Log.tag(InAppPaymentAuthCheckJob::class.java)
+    const val KEY = "InAppPaymentAuthCheckJob"
+
+    @JvmStatic
+    fun enqueueIfNeeded() {
+      if (SignalDatabase.inAppPayments.hasWaitingForAuth()) {
+        AppDependencies.jobManager.add(InAppPaymentAuthCheckJob())
+      }
+    }
+  }
+
+  private val stripeApi = StripeApi(Environment.Donations.STRIPE_CONFIGURATION, this, this, AppDependencies.okHttpClient)
+
+  override fun serialize(): ByteArray? = null
+
+  override fun getFactoryKey(): String = KEY
+
+  override fun onFailure() = Unit
+
+  override fun onRun() {
+    migrateLegacyData()
+
+    val unauthorizedInAppPayments = SignalDatabase.inAppPayments.getAllWaitingForAuth()
+    Log.i(TAG, "Found ${unauthorizedInAppPayments.size} payments awaiting authorization.", true)
+
+    var hasRetry = false
+    for (payment in unauthorizedInAppPayments) {
+      val verificationStatus: CheckResult<Unit> = if (payment.type.recurring) {
+        synchronized(payment.type.requireSubscriberType().inAppPaymentType) {
+          checkRecurringPayment(payment)
+        }
+      } else {
+        checkOneTimePayment(payment)
+      }
+
+      when (verificationStatus) {
+        is CheckResult.Failure -> {
+          markFailed(payment, verificationStatus.errorData)
+        }
+
+        CheckResult.Retry -> {
+          markChecked(payment)
+          hasRetry = true
+        }
+
+        is CheckResult.Success -> Unit
+      }
+    }
+
+    if (hasRetry) {
+      throw InAppPaymentRetryException()
+    }
+  }
+
+  private fun migrateLegacyData() {
+    val pending3DSData = SignalStore.inAppPayments.consumePending3DSData()
+    if (pending3DSData != null) {
+      Log.i(TAG, "Found legacy data. Performing migration.", true)
+
+      SignalDatabase.inAppPayments.insert(
+        type = pending3DSData.inAppPayment.type,
+        state = InAppPaymentTable.State.WAITING_FOR_AUTHORIZATION,
+        subscriberId = if (pending3DSData.inAppPayment.type == InAppPaymentType.RECURRING_DONATION) {
+          InAppPaymentsRepository.requireSubscriber(InAppPaymentSubscriberRecord.Type.DONATION).subscriberId
+        } else {
+          null
+        },
+        endOfPeriod = null,
+        inAppPaymentData = pending3DSData.inAppPayment.data
+      )
+    }
+  }
+
+  private fun checkOneTimePayment(inAppPayment: InAppPaymentTable.InAppPayment): CheckResult<Unit> {
+    if (inAppPayment.data.waitForAuth == null) {
+      Log.d(TAG, "Could not check one-time payment without data.waitForAuth", true)
+      return CheckResult.Failure()
+    }
+
+    Log.d(TAG, "Downloading payment intent.")
+    val stripeIntentData: StripePaymentIntent = stripeApi.getPaymentIntent(
+      StripeIntentAccessor(
+        objectType = StripeIntentAccessor.ObjectType.PAYMENT_INTENT,
+        intentId = inAppPayment.data.waitForAuth.stripeIntentId,
+        intentClientSecret = inAppPayment.data.waitForAuth.stripeClientSecret
+      )
+    )
+
+    checkIntentStatus(stripeIntentData.status)
+
+    Log.i(TAG, "Creating and inserting receipt.", true)
+    val receipt = when (inAppPayment.type) {
+      InAppPaymentType.ONE_TIME_DONATION -> DonationReceiptRecord.createForBoost(inAppPayment.data.amount!!.toFiatMoney())
+      InAppPaymentType.ONE_TIME_GIFT -> DonationReceiptRecord.createForGift(inAppPayment.data.amount!!.toFiatMoney())
+      else -> {
+        Log.e(TAG, "Unexpected type ${inAppPayment.type}", true)
+        return CheckResult.Failure()
+      }
+    }
+
+    SignalDatabase.donationReceipts.addReceipt(receipt)
+
+    Log.i(TAG, "Verified payment. Updating InAppPayment::${inAppPayment.id.serialize()}")
+    SignalDatabase.inAppPayments.update(
+      inAppPayment = inAppPayment.copy(
+        state = InAppPaymentTable.State.PENDING,
+        data = inAppPayment.data.copy(
+          waitForAuth = null,
+          redemption = InAppPaymentData.RedemptionState(
+            stage = InAppPaymentData.RedemptionState.Stage.INIT,
+            paymentIntentId = inAppPayment.data.waitForAuth.stripeIntentId
+          )
+        )
+      )
+    )
+
+    Log.i(TAG, "Enqueuing job chain.")
+    val updatedPayment = SignalDatabase.inAppPayments.getById(inAppPayment.id)
+    InAppPaymentOneTimeContextJob.createJobChain(updatedPayment!!).enqueue()
+    return CheckResult.Success(Unit)
+  }
+
+  private fun checkRecurringPayment(inAppPayment: InAppPaymentTable.InAppPayment): CheckResult<Unit> {
+    if (inAppPayment.data.waitForAuth == null) {
+      Log.d(TAG, "Could not check recurring payment without data.waitForAuth", true)
+      return CheckResult.Failure()
+    }
+
+    Log.d(TAG, "Downloading setup intent.")
+    val stripeSetupIntent: StripeSetupIntent = stripeApi.getSetupIntent(
+      StripeIntentAccessor(
+        objectType = StripeIntentAccessor.ObjectType.SETUP_INTENT,
+        intentId = inAppPayment.data.waitForAuth.stripeIntentId,
+        intentClientSecret = inAppPayment.data.waitForAuth.stripeClientSecret
+      )
+    )
+
+    val checkIntentStatusResult = checkIntentStatus(stripeSetupIntent.status)
+    if (checkIntentStatusResult !is CheckResult.Success) {
+      return checkIntentStatusResult
+    }
+
+    val subscriber = InAppPaymentsRepository.requireSubscriber(
+      when (inAppPayment.type) {
+        InAppPaymentType.RECURRING_DONATION -> InAppPaymentSubscriberRecord.Type.DONATION
+        InAppPaymentType.RECURRING_BACKUP -> InAppPaymentSubscriberRecord.Type.BACKUP
+        else -> {
+          Log.e(TAG, "Expected recurring type but found ${inAppPayment.type}", true)
+          return CheckResult.Failure()
+        }
+      }
+    )
+
+    if (subscriber.subscriberId != inAppPayment.subscriberId) {
+      Log.w(TAG, "Found an old subscription with a subscriber id mismatch. Dropping.", true)
+
+      SignalDatabase.inAppPayments.update(
+        inAppPayment = inAppPayment.copy(
+          state = InAppPaymentTable.State.END,
+          notified = true,
+          data = InAppPaymentData(
+            waitForAuth = InAppPaymentData.WaitingForAuthorizationState("", "")
+          )
+        )
+      )
+
+      return CheckResult.Failure()
+    }
+
+    Log.i(TAG, "Setting default payment method...", true)
+    val setPaymentMethodResponse = if (inAppPayment.data.paymentMethodType == InAppPaymentData.PaymentMethodType.IDEAL) {
+      AppDependencies.donationsService.setDefaultIdealPaymentMethod(subscriber.subscriberId, stripeSetupIntent.id)
+    } else {
+      AppDependencies.donationsService.setDefaultStripePaymentMethod(subscriber.subscriberId, stripeSetupIntent.paymentMethod)
+    }
+
+    when (val result = checkResult(setPaymentMethodResponse)) {
+      is CheckResult.Failure -> return CheckResult.Failure(result.errorData)
+      is CheckResult.Retry -> return CheckResult.Retry
+      else -> Unit
+    }
+
+    Log.d(TAG, "Set default payment method via Signal service.", true)
+
+    val level = inAppPayment.data.level.toString()
+
+    try {
+      val updateOperation: LevelUpdateOperation = RecurringInAppPaymentRepository.getOrCreateLevelUpdateOperation(TAG, level)
+      Log.d(TAG, "Attempting to set user subscription level to $level", true)
+
+      val updateLevelResponse = AppDependencies.donationsService.updateSubscriptionLevel(
+        subscriber.subscriberId,
+        level,
+        subscriber.currency.currencyCode,
+        updateOperation.idempotencyKey.serialize(),
+        subscriber.type
+      )
+
+      val updateLevelResult = checkResult(updateLevelResponse)
+      if (updateLevelResult is CheckResult.Failure) {
+        SignalStore.inAppPayments.clearLevelOperations()
+        return CheckResult.Failure(updateLevelResult.errorData)
+      }
+
+      if (updateLevelResult == CheckResult.Retry) {
+        return CheckResult.Retry
+      }
+
+      if (updateLevelResponse.status in listOf(200, 204)) {
+        Log.d(TAG, "Successfully set user subscription to level $level with response code ${updateLevelResponse.status}", true)
+        SignalDatabase.inAppPayments.update(
+          inAppPayment = inAppPayment.copy(
+            state = InAppPaymentTable.State.PENDING,
+            data = inAppPayment.data.copy(
+              waitForAuth = null,
+              redemption = InAppPaymentData.RedemptionState(
+                stage = InAppPaymentData.RedemptionState.Stage.INIT
+              )
+            )
+          )
+        )
+
+        Log.d(TAG, "Reading fresh InAppPayment and enqueueing redemption chain.")
+        with(SignalDatabase.inAppPayments.getById(inAppPayment.id)!!) {
+          InAppPaymentRecurringContextJob.createJobChain(this).enqueue()
+        }
+
+        return CheckResult.Success(Unit)
+      } else {
+        Log.e(TAG, "Unexpected status code ${updateLevelResponse.status} without an application error or execution error.")
+        return CheckResult.Failure(errorData = updateLevelResponse.status.toString())
+      }
+    } finally {
+      LevelUpdate.updateProcessingState(false)
+    }
+  }
+
+  private fun <Result> checkResult(
+    serviceResponse: ServiceResponse<Result>
+  ): CheckResult<Result> {
+    if (serviceResponse.result.isPresent) {
+      return CheckResult.Success(serviceResponse.result.get())
+    } else if (serviceResponse.applicationError.isPresent) {
+      Log.w(TAG, "An application error was present. ${serviceResponse.status}", serviceResponse.applicationError.get(), true)
+      return CheckResult.Failure(errorData = serviceResponse.status.toString())
+    } else if (serviceResponse.executionError.isPresent) {
+      Log.w(TAG, "An execution error was present. ${serviceResponse.status}", serviceResponse.executionError.get(), true)
+      return CheckResult.Retry
+    }
+
+    error("Should never get here.")
+  }
+
+  private fun checkIntentStatus(stripeIntentStatus: StripeIntentStatus?): CheckResult<Unit> {
+    when (stripeIntentStatus) {
+      null, StripeIntentStatus.SUCCEEDED -> {
+        Log.i(TAG, "Stripe intent is in the SUCCEEDED state, we can proceed.", true)
+        return CheckResult.Success(Unit)
+      }
+
+      StripeIntentStatus.CANCELED -> {
+        Log.i(TAG, "Stripe intent is in the cancelled state, we cannot proceed.", true)
+        return CheckResult.Failure()
+      }
+
+      StripeIntentStatus.REQUIRES_PAYMENT_METHOD -> {
+        Log.i(TAG, "Stripe intent payment failed, we cannot proceed.", true)
+        return CheckResult.Failure()
+      }
+
+      else -> {
+        Log.i(TAG, "Stripe intent is still processing, retry later", true)
+        return CheckResult.Retry
+      }
+    }
+  }
+
+  private fun markFailed(inAppPayment: InAppPaymentTable.InAppPayment, errorData: String?) {
+    SignalDatabase.inAppPayments.update(
+      inAppPayment = inAppPayment.copy(
+        state = InAppPaymentTable.State.END,
+        notified = true,
+        data = inAppPayment.data.copy(
+          error = InAppPaymentData.Error(
+            type = InAppPaymentData.Error.Type.PAYMENT_SETUP,
+            data_ = errorData
+          ),
+          waitForAuth = InAppPaymentData.WaitingForAuthorizationState("", ""),
+          redemption = null
+        )
+      )
+    )
+  }
+
+  private fun markChecked(inAppPayment: InAppPaymentTable.InAppPayment) {
+    val fresh = SignalDatabase.inAppPayments.getById(inAppPayment.id)
+    SignalDatabase.inAppPayments.update(
+      inAppPayment = fresh!!.copy(
+        data = fresh.data.copy(
+          waitForAuth = fresh.data.waitForAuth!!.copy(
+            checkedVerification = true
+          )
+        )
+      )
+    )
+  }
+
+  override fun onShouldRetry(e: Exception): Boolean = e is InAppPaymentRetryException
+  override fun fetchPaymentIntent(price: FiatMoney, level: Long, sourceType: PaymentSourceType.Stripe): Single<StripeIntentAccessor> {
+    error("Not needed, this job should not be creating intents.")
+  }
+
+  override fun fetchSetupIntent(inAppPaymentType: InAppPaymentType, sourceType: PaymentSourceType.Stripe): Single<StripeIntentAccessor> {
+    error("Not needed, this job should not be creating intents.")
+  }
+
+  private sealed interface CheckResult<out T> {
+    data class Success<T>(val data: T) : CheckResult<T>
+    data class Failure(val errorData: String? = null) : CheckResult<Nothing>
+    object Retry : CheckResult<Nothing>
+  }
+
+  class Factory : Job.Factory<InAppPaymentAuthCheckJob> {
+    override fun create(parameters: Parameters, serializedData: ByteArray?): InAppPaymentAuthCheckJob {
+      return InAppPaymentAuthCheckJob(parameters)
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob.kt
new file mode 100644
index 0000000000..f2717d66f9
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentKeepAliveJob.kt
@@ -0,0 +1,290 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.jobs
+
+import okio.ByteString.Companion.toByteString
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toDecimalValue
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.manage.DonationRedemptionJobStatus
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.database.model.databaseprotos.FiatValue
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.jobmanager.Job
+import org.thoughtcrime.securesms.jobmanager.JsonJobData
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
+import org.whispersystems.signalservice.internal.EmptyResponse
+import org.whispersystems.signalservice.internal.ServiceResponse
+import java.util.Locale
+import kotlin.jvm.optionals.getOrNull
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.days
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
+
+/**
+ * Checks whether we need to create and process a new InAppPurchase for a new month
+ */
+class InAppPaymentKeepAliveJob private constructor(
+  parameters: Parameters,
+  val type: InAppPaymentSubscriberRecord.Type
+) : BaseJob(parameters) {
+
+  companion object {
+    private val TAG = Log.tag(InAppPaymentKeepAliveJob::class.java)
+
+    const val KEY = "InAppPurchaseRecurringKeepAliveJob"
+
+    private val TIMEOUT = 3.days
+
+    private const val DATA_TYPE = "type"
+
+    fun create(type: InAppPaymentSubscriberRecord.Type): Job {
+      return InAppPaymentKeepAliveJob(
+        parameters = Parameters.Builder()
+          .setQueue(type.jobQueue)
+          .addConstraint(NetworkConstraint.KEY)
+          .setMaxInstancesForQueue(1)
+          .setMaxAttempts(Parameters.UNLIMITED)
+          .setLifespan(TIMEOUT.inWholeSeconds)
+          .build(),
+        type = type
+      )
+    }
+
+    @JvmStatic
+    fun enqueueAndTrackTimeIfNecessary() {
+      // TODO -- This should only be enqueued if we are completely drained of old subscription jobs. (No pending, no runnning)
+      val lastKeepAliveTime = SignalStore.inAppPayments.getLastKeepAliveLaunchTime().milliseconds
+      val now = System.currentTimeMillis().milliseconds
+
+      if (lastKeepAliveTime > now) {
+        enqueueAndTrackTime(now)
+        return
+      }
+
+      val nextLaunchTime = lastKeepAliveTime + 3.days
+      if (nextLaunchTime <= now) {
+        enqueueAndTrackTime(now)
+      }
+    }
+
+    @JvmStatic
+    fun enqueueAndTrackTime(now: Duration) {
+      AppDependencies.jobManager.add(create(InAppPaymentSubscriberRecord.Type.DONATION))
+      AppDependencies.jobManager.add(create(InAppPaymentSubscriberRecord.Type.BACKUP))
+      SignalStore.inAppPayments.setLastKeepAliveLaunchTime(now.inWholeMilliseconds)
+    }
+  }
+
+  override fun onRun() {
+    synchronized(type) {
+      doRun()
+    }
+  }
+
+  private fun doRun() {
+    val subscriber: InAppPaymentSubscriberRecord? = InAppPaymentsRepository.getSubscriber(type)
+    if (subscriber == null) {
+      info(type, "Subscriber not present. Skipping.")
+      return
+    }
+
+    val response: ServiceResponse<EmptyResponse> = AppDependencies.donationsService.putSubscription(subscriber.subscriberId)
+
+    verifyResponse(response)
+    info(type, "Successful call to putSubscription")
+
+    val activeSubscriptionResponse: ServiceResponse<ActiveSubscription> = AppDependencies.donationsService.getSubscription(subscriber.subscriberId)
+
+    verifyResponse(activeSubscriptionResponse)
+    info(type, "Successful call to GET active subscription")
+
+    val activeSubscription: ActiveSubscription? = activeSubscriptionResponse.result.getOrNull()
+    if (activeSubscription == null) {
+      warn(type, "Failed to parse active subscription from response body. Exiting.")
+      return
+    }
+
+    val subscription: ActiveSubscription.Subscription? = activeSubscription.activeSubscription
+    if (subscription == null) {
+      info(type, "User does not have a subscription. Exiting.")
+      return
+    }
+
+    if (SignalDatabase.inAppPayments.hasPending(type.inAppPaymentType)) {
+      info(type, "Already trying to redeem $type. Exiting.")
+      return
+    }
+
+    val activeInAppPayment = getActiveInAppPayment(subscriber, subscription)
+    if (activeInAppPayment == null) {
+      warn(type, "Failed to generate active in-app payment. Exiting")
+      return
+    }
+
+    info(type, "Processing id: ${activeInAppPayment.id}")
+
+    when (activeInAppPayment.data.redemption?.stage) {
+      InAppPaymentData.RedemptionState.Stage.INIT -> {
+        info(type, "Transitioning payment from INIT to CONVERSION_STARTED and generating a request credential")
+        val payment = activeInAppPayment.copy(
+          data = activeInAppPayment.data.copy(
+            redemption = activeInAppPayment.data.redemption.copy(
+              stage = InAppPaymentData.RedemptionState.Stage.CONVERSION_STARTED,
+              receiptCredentialRequestContext = InAppPaymentsRepository.generateRequestCredential().serialize().toByteString()
+            )
+          )
+        )
+
+        SignalDatabase.inAppPayments.update(payment)
+        InAppPaymentRecurringContextJob.createJobChain(payment).enqueue()
+      }
+      InAppPaymentData.RedemptionState.Stage.CONVERSION_STARTED -> {
+        if (activeInAppPayment.data.redemption.receiptCredentialRequestContext == null) {
+          warn(type, "We are in the CONVERSION_STARTED state without a request credential. Exiting.")
+          return
+        }
+
+        info(type, "We have a request credential we have not turned into a token.")
+        InAppPaymentRecurringContextJob.createJobChain(activeInAppPayment).enqueue()
+      }
+      InAppPaymentData.RedemptionState.Stage.REDEMPTION_STARTED -> {
+        if (activeInAppPayment.data.redemption.receiptCredentialPresentation == null) {
+          warn(type, "We are in the REDEMPTION_STARTED state without a request credential. Exiting.")
+          return
+        }
+
+        info(type, "We have a receipt credential presentation but have not yet redeemed it.")
+        InAppPaymentRedemptionJob.enqueueJobChainForRecurringKeepAlive(activeInAppPayment)
+      }
+      else -> info(type, "Nothing to do. Exiting.")
+    }
+  }
+
+  private fun <T> verifyResponse(serviceResponse: ServiceResponse<T>) {
+    if (serviceResponse.executionError.isPresent) {
+      val error = serviceResponse.executionError.get()
+      warn(type, "Failed with an execution error. Scheduling retry.", error)
+      throw InAppPaymentRetryException(error)
+    }
+
+    if (serviceResponse.applicationError.isPresent) {
+      val error = serviceResponse.applicationError.get()
+      when (serviceResponse.status) {
+        403, 404 -> {
+          warn(type, "Invalid or malformed subscriber id. Status: ${serviceResponse.status}", error)
+        }
+        else -> {
+          warn(type, "An unknown server error occurred: ${serviceResponse.status}", error)
+          throw InAppPaymentRetryException(error)
+        }
+      }
+    }
+  }
+
+  private fun getActiveInAppPayment(
+    subscriber: InAppPaymentSubscriberRecord,
+    subscription: ActiveSubscription.Subscription
+  ): InAppPaymentTable.InAppPayment? {
+    val endOfCurrentPeriod = subscription.endOfCurrentPeriod.seconds
+    val type = subscriber.type
+    val current: InAppPaymentTable.InAppPayment? = SignalDatabase.inAppPayments.getByEndOfPeriod(type.inAppPaymentType, endOfCurrentPeriod)
+
+    return if (current == null) {
+      val oldInAppPayment = SignalDatabase.inAppPayments.getByLatestEndOfPeriod(type.inAppPaymentType)
+      val oldEndOfPeriod = oldInAppPayment?.endOfPeriod ?: InAppPaymentsRepository.getFallbackLastEndOfPeriod(type)
+      if (oldEndOfPeriod > endOfCurrentPeriod) {
+        warn(type, "Active subscription returned an old end-of-period. Exiting. (old: $oldEndOfPeriod, new: $endOfCurrentPeriod)")
+        return null
+      }
+
+      val (badge, label) = if (oldInAppPayment == null) {
+        info(type, "Old payment not found in database. Loading badge / label information from donations configuration.")
+        val configuration = AppDependencies.donationsService.getDonationsConfiguration(Locale.getDefault())
+        if (configuration.result.isPresent) {
+          val subscriptionConfig = configuration.result.get().levels[subscription.level]
+          if (subscriptionConfig == null) {
+            info(type, "Failed to load subscription configuration for level ${subscription.level} for type $type")
+            null to ""
+          } else {
+            Badges.toDatabaseBadge(Badges.fromServiceBadge(subscriptionConfig.badge)) to subscriptionConfig.name
+          }
+        } else {
+          warn(TAG, "Failed to load configuration while processing $type")
+          null to ""
+        }
+      } else {
+        oldInAppPayment.data.badge to oldInAppPayment.data.label
+      }
+
+      info(type, "End of period has changed. Requesting receipt refresh. (old: $oldEndOfPeriod, new: $endOfCurrentPeriod)")
+      if (type == InAppPaymentSubscriberRecord.Type.DONATION) {
+        SignalStore.inAppPayments.setLastEndOfPeriod(endOfCurrentPeriod.inWholeSeconds)
+      }
+
+      val inAppPaymentId = SignalDatabase.inAppPayments.insert(
+        type = type.inAppPaymentType,
+        state = InAppPaymentTable.State.PENDING,
+        subscriberId = subscriber.subscriberId,
+        endOfPeriod = endOfCurrentPeriod,
+        inAppPaymentData = InAppPaymentData(
+          badge = badge,
+          amount = FiatValue(
+            currencyCode = subscriber.currency.currencyCode,
+            amount = subscription.amount.toDecimalValue()
+          ),
+          error = null,
+          level = subscription.level.toLong(),
+          cancellation = null,
+          label = label,
+          recipientId = null,
+          additionalMessage = null,
+          redemption = InAppPaymentData.RedemptionState(
+            stage = InAppPaymentData.RedemptionState.Stage.INIT,
+            keepAlive = true
+          )
+        )
+      )
+
+      MultiDeviceSubscriptionSyncRequestJob.enqueue()
+      SignalDatabase.inAppPayments.getById(inAppPaymentId)
+    } else {
+      current
+    }
+  }
+
+  private fun info(type: InAppPaymentSubscriberRecord.Type, message: String) {
+    Log.i(TAG, "[$type] $message", true)
+  }
+
+  private fun warn(type: InAppPaymentSubscriberRecord.Type, message: String, throwable: Throwable? = null) {
+    Log.w(TAG, "[$type] $message", throwable, true)
+  }
+
+  override fun serialize(): ByteArray? = JsonJobData.Builder().putInt(DATA_TYPE, type.code).build().serialize()
+
+  override fun getFactoryKey(): String = KEY
+
+  override fun onFailure() = Unit
+
+  override fun onShouldRetry(e: Exception): Boolean = e is InAppPaymentRetryException
+
+  class Factory : Job.Factory<InAppPaymentKeepAliveJob> {
+    override fun create(parameters: Parameters, serializedData: ByteArray?): InAppPaymentKeepAliveJob {
+      return InAppPaymentKeepAliveJob(
+        parameters,
+        InAppPaymentSubscriberRecord.Type.values().first { it.code == JsonJobData.deserialize(serializedData).getInt(DATA_TYPE) }
+      )
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentOneTimeContextJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentOneTimeContextJob.kt
new file mode 100644
index 0000000000..622d7af0de
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentOneTimeContextJob.kt
@@ -0,0 +1,313 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.jobs
+
+import okio.ByteString.Companion.toByteString
+import org.signal.core.util.logging.Log
+import org.signal.core.util.orNull
+import org.signal.donations.InAppPaymentType
+import org.signal.libsignal.zkgroup.VerificationFailedException
+import org.signal.libsignal.zkgroup.receipts.ReceiptCredential
+import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialRequestContext
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toDonationProcessor
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.jobmanager.Job
+import org.thoughtcrime.securesms.jobmanager.JobManager.Chain
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
+import org.whispersystems.signalservice.internal.ServiceResponse
+import org.whispersystems.signalservice.internal.push.exceptions.DonationReceiptCredentialError
+import java.io.IOException
+import kotlin.time.Duration.Companion.days
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
+
+/**
+ * Handles processing and validation of one-time payments. This involves
+ * generating and submitting a receipt request context to the server and
+ * processing its returned parameters.
+ */
+class InAppPaymentOneTimeContextJob private constructor(
+  private val inAppPaymentId: InAppPaymentTable.InAppPaymentId,
+  parameters: Parameters
+) : BaseJob(parameters) {
+
+  companion object {
+    private val TAG = Log.tag(InAppPaymentOneTimeContextJob::class.java)
+
+    const val KEY = "InAppPurchaseOneTimeContextJob"
+
+    private fun create(inAppPayment: InAppPaymentTable.InAppPayment): Job {
+      return InAppPaymentOneTimeContextJob(
+        inAppPayment.id,
+        parameters = Parameters.Builder()
+          .addConstraint(NetworkConstraint.KEY)
+          .setQueue(InAppPaymentsRepository.resolveJobQueueKey(inAppPayment))
+          .setLifespan(InAppPaymentsRepository.resolveContextJobLifespan(inAppPayment).inWholeMilliseconds)
+          .setMaxAttempts(Parameters.UNLIMITED)
+          .build()
+      )
+    }
+
+    fun createJobChain(inAppPayment: InAppPaymentTable.InAppPayment, makePrimary: Boolean = false): Chain {
+      return when (inAppPayment.type) {
+        InAppPaymentType.ONE_TIME_DONATION -> {
+          AppDependencies.jobManager
+            .startChain(create(inAppPayment))
+            .then(InAppPaymentRedemptionJob.create(inAppPayment, makePrimary))
+            .then(RefreshOwnProfileJob())
+            .then(MultiDeviceProfileContentUpdateJob())
+        }
+        // MOLLY: TODO
+        // InAppPaymentType.ONE_TIME_GIFT -> {
+        //   AppDependencies.jobManager
+        //     .startChain(create(inAppPayment))
+        //     .then(InAppPaymentGiftSendJob.create(inAppPayment))
+        // }
+        else -> error("Unsupported type: ${inAppPayment.type}")
+      }
+    }
+  }
+
+  override fun serialize(): ByteArray = inAppPaymentId.serialize().toByteArray()
+
+  override fun getFactoryKey(): String = KEY
+
+  override fun onFailure() {
+    warning("A permanent failure occurred.")
+
+    val inAppPayment = SignalDatabase.inAppPayments.getById(inAppPaymentId)
+    if (inAppPayment != null && inAppPayment.data.error == null) {
+      SignalDatabase.inAppPayments.update(
+        inAppPayment.copy(
+          notified = false,
+          state = InAppPaymentTable.State.END,
+          data = inAppPayment.data.copy(
+            error = InAppPaymentData.Error(
+              type = InAppPaymentData.Error.Type.REDEMPTION
+            )
+          )
+        )
+      )
+    }
+  }
+
+  override fun onAdded() {
+    val inAppPayment = SignalDatabase.inAppPayments.getById(inAppPaymentId)
+    if (inAppPayment?.state == InAppPaymentTable.State.CREATED) {
+      SignalDatabase.inAppPayments.update(
+        inAppPayment.copy(
+          state = InAppPaymentTable.State.PENDING
+        )
+      )
+    }
+  }
+
+  override fun onRun() {
+    val (inAppPayment, requestContext) = getAndValidateInAppPayment()
+
+    info("Submitting request context to server...")
+    val serviceResponse = AppDependencies.donationsService.submitBoostReceiptCredentialRequestSync(
+      inAppPayment.data.redemption!!.paymentIntentId,
+      requestContext.request,
+      inAppPayment.data.paymentMethodType.toDonationProcessor()
+    )
+
+    if (serviceResponse.applicationError.isPresent) {
+      handleApplicationError(inAppPayment, serviceResponse)
+    } else if (serviceResponse.result.isPresent) {
+      val receiptCredential = try {
+        AppDependencies.clientZkReceiptOperations.receiveReceiptCredential(requestContext, serviceResponse.result.get())
+      } catch (e: VerificationFailedException) {
+        warning("Failed to receive credential.", e)
+        throw InAppPaymentRetryException(e)
+      }
+
+      if (isCredentialValid(inAppPayment, receiptCredential)) {
+        info("Validated credential. Getting presentation.")
+        val receiptCredentialPresentation = try {
+          AppDependencies.clientZkReceiptOperations.createReceiptCredentialPresentation(receiptCredential)
+        } catch (e: VerificationFailedException) {
+          warning("Failed to get presentation from credential.")
+          throw InAppPaymentRetryException(e)
+        }
+
+        info("Got presentation. Updating state and completing.")
+        SignalDatabase.inAppPayments.update(
+          inAppPayment.copy(
+            data = inAppPayment.data.copy(
+              redemption = InAppPaymentData.RedemptionState(
+                stage = InAppPaymentData.RedemptionState.Stage.REDEMPTION_STARTED,
+                receiptCredentialPresentation = receiptCredentialPresentation.serialize().toByteString()
+              )
+            )
+          )
+        )
+      } else {
+        warning("Failed to validate credential.")
+        SignalDatabase.inAppPayments.update(
+          inAppPayment.copy(
+            notified = false,
+            state = InAppPaymentTable.State.END,
+            data = inAppPayment.data.copy(
+              error = InAppPaymentData.Error(
+                type = InAppPaymentData.Error.Type.CREDENTIAL_VALIDATION
+              )
+            )
+          )
+        )
+        throw IOException("Could not validate credential.")
+      }
+    } else {
+      info("Encountered a retryable error", serviceResponse.executionError.orNull())
+    }
+  }
+
+  override fun onShouldRetry(e: Exception): Boolean = e is InAppPaymentRetryException
+
+  private fun getAndValidateInAppPayment(): Pair<InAppPaymentTable.InAppPayment, ReceiptCredentialRequestContext> {
+    val inAppPayment = SignalDatabase.inAppPayments.getById(inAppPaymentId)
+    if (inAppPayment == null) {
+      warning("Not found in database.")
+      throw IOException("InAppPayment not found in database")
+    }
+
+    if (inAppPayment.type.recurring) {
+      warning("Invalid type: ${inAppPayment.type}")
+      throw IOException("InAppPayment is of unexpected type")
+    }
+
+    if (inAppPayment.state != InAppPaymentTable.State.PENDING) {
+      warning("Invalid state: ${inAppPayment.state} but expected PENDING")
+      throw IOException("InAppPayment is in an invalid state")
+    }
+
+    if (inAppPayment.data.redemption == null) {
+      warning("Invalid data: not in redemption state.")
+      throw IOException("InAppPayment does not have a redemption state. Still awaiting auth?")
+    }
+
+    if (inAppPayment.data.redemption.stage != InAppPaymentData.RedemptionState.Stage.INIT && inAppPayment.data.redemption.stage != InAppPaymentData.RedemptionState.Stage.CONVERSION_STARTED) {
+      warning("Invalid stage: Expected INIT or CONVERSION_STARTED, but got ${inAppPayment.data.redemption.stage}")
+      throw IOException("InAppPayment is in an invalid stage.")
+    }
+
+    if (inAppPayment.data.redemption.paymentIntentId == null) {
+      warning("No payment id present on one-time redemption data. Exiting.")
+      throw IOException("InAppPayment has no paymentIntentId.")
+    }
+
+    val requestContext: ReceiptCredentialRequestContext = inAppPayment.data.redemption.receiptCredentialRequestContext?.let {
+      ReceiptCredentialRequestContext(it.toByteArray())
+    } ?: InAppPaymentsRepository.generateRequestCredential()
+
+    val updatedPayment = inAppPayment.copy(
+      data = inAppPayment.data.copy(
+        redemption = inAppPayment.data.redemption.copy(
+          stage = InAppPaymentData.RedemptionState.Stage.CONVERSION_STARTED,
+          receiptCredentialRequestContext = requestContext.serialize().toByteString()
+        )
+      )
+    )
+
+    SignalDatabase.inAppPayments.update(updatedPayment)
+    return updatedPayment to requestContext
+  }
+
+  private fun <T> handleApplicationError(inAppPayment: InAppPaymentTable.InAppPayment, serviceResponse: ServiceResponse<T>) {
+    val applicationError = serviceResponse.applicationError.get()
+    when (serviceResponse.status) {
+      204 -> {
+        warning("Payment may not be completed yet. Retry later.", applicationError)
+        throw InAppPaymentRetryException(applicationError)
+      }
+
+      400 -> {
+        warning("Receipt credential failed to validate.", applicationError)
+      }
+
+      402 -> {
+        warning("Payment has failed", applicationError)
+        SignalDatabase.inAppPayments.update(
+          inAppPayment.copy(
+            notified = false,
+            state = InAppPaymentTable.State.END,
+            data = inAppPayment.data.copy(
+              error = InAppPaymentsRepository.buildPaymentFailure(inAppPayment, (applicationError as? DonationReceiptCredentialError)?.chargeFailure)
+            )
+          )
+        )
+
+        throw IOException(applicationError)
+      }
+
+      409 -> {
+        warning("Receipt already redeemed with a different request credential", applicationError)
+        SignalDatabase.inAppPayments.update(
+          inAppPayment.copy(
+            notified = false,
+            state = InAppPaymentTable.State.END,
+            data = inAppPayment.data.copy(
+              error = InAppPaymentData.Error(
+                type = InAppPaymentData.Error.Type.REDEMPTION,
+                data_ = "409"
+              )
+            )
+          )
+        )
+
+        throw IOException(applicationError)
+      }
+
+      else -> {
+        warning("Encountered a server failure. Retry later", applicationError)
+        throw InAppPaymentRetryException(applicationError)
+      }
+    }
+  }
+
+  private fun isCredentialValid(inAppPayment: InAppPaymentTable.InAppPayment, receiptCredential: ReceiptCredential): Boolean {
+    val now = System.currentTimeMillis().milliseconds
+    val maxExpirationTime = now + 90.days
+    val isCorrectLevel = receiptCredential.receiptLevel == inAppPayment.data.level
+    val isExpiration86400 = receiptCredential.receiptExpirationTime % 86400 == 0L
+    val isExpirationInTheFuture = receiptCredential.receiptExpirationTime.seconds > now
+    val isExpirationWithinMax = receiptCredential.receiptExpirationTime.seconds <= maxExpirationTime
+
+    info(
+      """
+      Credential Validation
+      -
+      isCorrectLevel $isCorrectLevel actual: ${receiptCredential.receiptLevel} expected: ${inAppPayment.data.level}
+      isExpiration86400 $isExpiration86400
+      isExpirationInTheFuture $isExpirationInTheFuture
+      isExpirationWithinMax $isExpirationWithinMax
+      """.trimIndent()
+    )
+
+    return isCorrectLevel && isExpiration86400 && isExpirationInTheFuture && isExpirationWithinMax
+  }
+
+  private fun info(message: String, throwable: Throwable? = null) {
+    Log.i(TAG, "InAppPayment[$inAppPaymentId]: $message", throwable, true)
+  }
+
+  private fun warning(message: String, throwable: Throwable? = null) {
+    Log.w(TAG, "InAppPayment[$inAppPaymentId]: $message", throwable, true)
+  }
+
+  class Factory : Job.Factory<InAppPaymentOneTimeContextJob> {
+    override fun create(parameters: Parameters, serializedData: ByteArray?): InAppPaymentOneTimeContextJob {
+      return InAppPaymentOneTimeContextJob(
+        InAppPaymentTable.InAppPaymentId(serializedData!!.decodeToString().toLong()),
+        parameters
+      )
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentRecurringContextJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentRecurringContextJob.kt
new file mode 100644
index 0000000000..93b36f8c67
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentRecurringContextJob.kt
@@ -0,0 +1,526 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.jobs
+
+import okio.ByteString.Companion.toByteString
+import org.signal.core.util.logging.Log
+import org.signal.libsignal.zkgroup.VerificationFailedException
+import org.signal.libsignal.zkgroup.receipts.ReceiptCredential
+import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation
+import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialRequestContext
+import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialResponse
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.requireSubscriberType
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toInAppPaymentDataChargeFailure
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.jobmanager.Job
+import org.thoughtcrime.securesms.jobmanager.JobManager.Chain
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.ChargeFailure
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.Subscription
+import org.whispersystems.signalservice.internal.ServiceResponse
+import java.io.IOException
+import java.util.Currency
+import kotlin.time.Duration.Companion.days
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
+
+/**
+ * Given an inAppPaymentId, we want to take it's unconverted receipt context and
+ * turn it into a receipt presentation.
+ */
+class InAppPaymentRecurringContextJob private constructor(
+  private val inAppPaymentId: InAppPaymentTable.InAppPaymentId,
+  parameters: Parameters
+) : BaseJob(parameters) {
+  companion object {
+    private val TAG = Log.tag(InAppPaymentRecurringContextJob::class.java)
+
+    const val KEY = "InAppPurchaseRecurringContextJob"
+
+    private fun create(inAppPayment: InAppPaymentTable.InAppPayment): Job {
+      return InAppPaymentRecurringContextJob(
+        inAppPaymentId = inAppPayment.id,
+        parameters = Parameters.Builder()
+          .addConstraint(NetworkConstraint.KEY)
+          .setQueue(InAppPaymentsRepository.resolveJobQueueKey(inAppPayment))
+          .setLifespan(InAppPaymentsRepository.resolveContextJobLifespan(inAppPayment).inWholeMilliseconds)
+          .setMaxAttempts(Parameters.UNLIMITED)
+          .build()
+      )
+    }
+
+    fun createJobChain(inAppPayment: InAppPaymentTable.InAppPayment, makePrimary: Boolean = false): Chain {
+      return AppDependencies.jobManager
+        .startChain(create(inAppPayment))
+        .then(InAppPaymentRedemptionJob.create(inAppPayment, makePrimary))
+        .then(RefreshOwnProfileJob())
+        .then(MultiDeviceProfileContentUpdateJob())
+    }
+  }
+
+  override fun onAdded() {
+    val inAppPayment = SignalDatabase.inAppPayments.getById(inAppPaymentId)
+    info("Added context job for payment with state ${inAppPayment?.state}")
+    if (inAppPayment?.state == InAppPaymentTable.State.CREATED) {
+      SignalDatabase.inAppPayments.update(
+        inAppPayment.copy(
+          state = InAppPaymentTable.State.PENDING
+        )
+      )
+    }
+  }
+
+  override fun serialize(): ByteArray = inAppPaymentId.serialize().toByteArray()
+
+  override fun getFactoryKey(): String = KEY
+
+  override fun onFailure() {
+    warning("A permanent failure occurred.")
+
+    val inAppPayment = SignalDatabase.inAppPayments.getById(inAppPaymentId)
+    if (inAppPayment != null && inAppPayment.data.error == null) {
+      SignalDatabase.inAppPayments.update(
+        inAppPayment.copy(
+          notified = false,
+          state = InAppPaymentTable.State.END,
+          data = inAppPayment.data.copy(
+            error = InAppPaymentData.Error(
+              type = InAppPaymentData.Error.Type.REDEMPTION
+            )
+          )
+        )
+      )
+    }
+  }
+
+  override fun getNextRunAttemptBackoff(pastAttemptCount: Int, exception: java.lang.Exception): Long {
+    val inAppPayment = SignalDatabase.inAppPayments.getById(inAppPaymentId)
+    return if (inAppPayment != null) {
+      when (inAppPayment.data.paymentMethodType) {
+        InAppPaymentData.PaymentMethodType.SEPA_DEBIT, InAppPaymentData.PaymentMethodType.IDEAL -> 1.days.inWholeMilliseconds
+        else -> super.getNextRunAttemptBackoff(pastAttemptCount, exception)
+      }
+    } else {
+      super.getNextRunAttemptBackoff(pastAttemptCount, exception)
+    }
+  }
+
+  override fun onRun() {
+    synchronized(InAppPaymentsRepository.resolveMutex(inAppPaymentId)) {
+      doRun()
+    }
+  }
+
+  private fun doRun() {
+    val (inAppPayment, requestContext) = getAndValidateInAppPayment()
+    val activeSubscription = getActiveSubscription(inAppPayment)
+    val subscription = activeSubscription.activeSubscription
+
+    if (subscription == null) {
+      warning("Subscription is null. Retrying later.")
+      throw InAppPaymentRetryException()
+    }
+
+    handlePossibleFailedPayment(inAppPayment, activeSubscription, subscription)
+    handlePossibleInactiveSubscription(inAppPayment, activeSubscription, subscription)
+
+    info("Subscription is valid, proceeding with request for ReceiptCredentialResponse")
+
+    val updatedInAppPayment: InAppPaymentTable.InAppPayment = if (inAppPayment.data.redemption!!.stage != InAppPaymentData.RedemptionState.Stage.CONVERSION_STARTED || inAppPayment.endOfPeriod.inWholeMilliseconds <= 0) {
+      info("Updating payment state with endOfCurrentPeriod and proper stage.")
+
+      if (inAppPayment.type.requireSubscriberType() == InAppPaymentSubscriberRecord.Type.DONATION) {
+        info("Recording last end of period.")
+        SignalStore.inAppPayments.setLastEndOfPeriod(subscription.endOfCurrentPeriod)
+      }
+
+      SignalDatabase.inAppPayments.update(
+        inAppPayment.copy(
+          endOfPeriod = subscription.endOfCurrentPeriod.seconds,
+          data = inAppPayment.data.copy(
+            redemption = inAppPayment.data.redemption.copy(
+              stage = InAppPaymentData.RedemptionState.Stage.CONVERSION_STARTED
+            )
+          )
+        )
+      )
+
+      requireNotNull(SignalDatabase.inAppPayments.getById(inAppPaymentId))
+    } else {
+      inAppPayment
+    }
+
+    submitAndValidateCredentials(updatedInAppPayment, subscription, requestContext)
+  }
+
+  private fun getAndValidateInAppPayment(): Pair<InAppPaymentTable.InAppPayment, ReceiptCredentialRequestContext> {
+    val inAppPayment = SignalDatabase.inAppPayments.getById(inAppPaymentId)
+    if (inAppPayment == null) {
+      warning("Not found")
+      throw IOException("InAppPayment for given ID not found.")
+    }
+
+    if (inAppPayment.state != InAppPaymentTable.State.PENDING) {
+      warning("Unexpected state. Got ${inAppPayment.state} but expected PENDING")
+      throw IOException("InAppPayment in unexpected state.")
+    }
+
+    if (!inAppPayment.type.recurring) {
+      warning("Unexpected type. Got ${inAppPayment.type} but expected a recurring type.")
+      throw IOException("InAppPayment is an unexpected type.")
+    }
+
+    if (inAppPayment.subscriberId == null) {
+      warning("Expected a subscriber id.")
+      throw IOException("InAppPayment is missing its subscriber id")
+    }
+
+    if (inAppPayment.data.redemption == null) {
+      warning("Expected redemption state.")
+      throw IOException("InAppPayment has no redemption state. Waiting for authorization?")
+    }
+
+    if (inAppPayment.data.redemption.stage == InAppPaymentData.RedemptionState.Stage.REDEMPTION_STARTED || inAppPayment.data.redemption.stage == InAppPaymentData.RedemptionState.Stage.REDEEMED) {
+      warning("Already began redemption.")
+      throw IOException("InAppPayment has already started redemption.")
+    }
+
+    return if (inAppPayment.data.redemption.receiptCredentialRequestContext == null) {
+      val requestContext = InAppPaymentsRepository.generateRequestCredential()
+      val updatedPayment = inAppPayment.copy(
+        data = inAppPayment.data.copy(
+          redemption = inAppPayment.data.redemption.copy(
+            stage = InAppPaymentData.RedemptionState.Stage.CONVERSION_STARTED,
+            receiptCredentialRequestContext = requestContext.serialize().toByteString()
+          )
+        )
+      )
+
+      SignalDatabase.inAppPayments.update(updatedPayment)
+      updatedPayment to requestContext
+    } else {
+      inAppPayment to ReceiptCredentialRequestContext(inAppPayment.data.redemption.receiptCredentialRequestContext.toByteArray())
+    }
+  }
+
+  private fun getActiveSubscription(inAppPayment: InAppPaymentTable.InAppPayment): ActiveSubscription {
+    val activeSubscriptionResponse = AppDependencies.donationsService.getSubscription(inAppPayment.subscriberId)
+    return if (activeSubscriptionResponse.result.isPresent) {
+      activeSubscriptionResponse.result.get()
+    } else if (activeSubscriptionResponse.applicationError.isPresent) {
+      warning("An application error occurred while trying to get the active subscription. Failing.", activeSubscriptionResponse.applicationError.get())
+      throw IOException(activeSubscriptionResponse.applicationError.get())
+    } else {
+      warning("An execution error occurred. Retrying later.", activeSubscriptionResponse.executionError.get())
+      throw InAppPaymentRetryException(activeSubscriptionResponse.executionError.get())
+    }
+  }
+
+  private fun handlePossibleFailedPayment(
+    inAppPayment: InAppPaymentTable.InAppPayment,
+    activeSubscription: ActiveSubscription,
+    subscription: Subscription
+  ) {
+    if (subscription.isFailedPayment) {
+      val chargeFailure = activeSubscription.chargeFailure
+      if (chargeFailure != null) {
+        warning("Charge failure detected on active subscription: ${chargeFailure.code}: ${chargeFailure.message}")
+      }
+
+      if (inAppPayment.data.redemption!!.keepAlive == true) {
+        warning("Payment failure during keep-alive, allow keep-alive to retry later.")
+
+        SignalDatabase.inAppPayments.update(
+          inAppPayment.copy(
+            notified = true,
+            data = inAppPayment.data.copy(
+              error = InAppPaymentData.Error(
+                type = InAppPaymentData.Error.Type.PAYMENT_PROCESSING,
+                data_ = "keep-alive"
+              )
+            )
+          )
+        )
+
+        throw Exception("Payment renewal is in keep-alive state, let keep-alive process retry later.")
+      } else {
+        handlePaymentFailure(inAppPayment, subscription, chargeFailure)
+        throw Exception("New subscription has a payment failure: ${subscription.status}")
+      }
+    }
+  }
+
+  private fun handlePossibleInactiveSubscription(
+    inAppPayment: InAppPaymentTable.InAppPayment,
+    activeSubscription: ActiveSubscription,
+    subscription: Subscription
+  ) {
+    val isForKeepAlive = inAppPayment.data.redemption!!.keepAlive == true
+    if (!subscription.isActive) {
+      val chargeFailure = activeSubscription.chargeFailure
+      if (chargeFailure != null) {
+        warning("Subscription payment charge failure code: ${chargeFailure.code}, message: ${chargeFailure.message}")
+
+        if (!isForKeepAlive) {
+          warning("Initial subscription payment failed, treating as a permanent failure.")
+          handlePaymentFailure(inAppPayment, subscription, chargeFailure)
+          throw Exception("New subscription has hit a payment failure.")
+        }
+      }
+
+      if (isForKeepAlive && subscription.isCanceled) {
+        warning("Permanent payment failure in renewing subscription. Status: ${subscription.status}")
+        handlePaymentFailure(inAppPayment, subscription, chargeFailure)
+        throw Exception()
+      }
+
+      warning("Subscription is not yet active. Status: ${subscription.status}")
+      throw InAppPaymentRetryException()
+    }
+  }
+
+  private fun handlePaymentFailure(inAppPayment: InAppPaymentTable.InAppPayment, subscription: Subscription, chargeFailure: ChargeFailure?) {
+    SignalDatabase.inAppPaymentSubscribers.insertOrReplace(
+      InAppPaymentSubscriberRecord(
+        subscriberId = inAppPayment.subscriberId!!,
+        currency = Currency.getInstance(inAppPayment.data.amount!!.currencyCode),
+        type = inAppPayment.type.requireSubscriberType(),
+        requiresCancel = true,
+        paymentMethodType = inAppPayment.data.paymentMethodType
+      )
+    )
+
+    if (inAppPayment.data.redemption?.keepAlive == true) {
+      info("Cancellation occurred during keep-alive. Setting cancellation state.")
+
+      SignalDatabase.inAppPayments.update(
+        inAppPayment.copy(
+          notified = false,
+          state = InAppPaymentTable.State.END,
+          data = inAppPayment.data.copy(
+            cancellation = InAppPaymentData.Cancellation(
+              reason = when (subscription.status) {
+                "past_due" -> InAppPaymentData.Cancellation.Reason.PAST_DUE
+                "canceled" -> InAppPaymentData.Cancellation.Reason.CANCELED
+                "unpaid" -> InAppPaymentData.Cancellation.Reason.UNPAID
+                else -> InAppPaymentData.Cancellation.Reason.UNKNOWN
+              },
+              chargeFailure = chargeFailure?.toInAppPaymentDataChargeFailure()
+            )
+          )
+        )
+      )
+
+      MultiDeviceSubscriptionSyncRequestJob.enqueue()
+    } else if (chargeFailure != null) {
+      info("Charge failure detected: $chargeFailure")
+
+      SignalDatabase.inAppPayments.update(
+        inAppPayment.copy(
+          notified = false,
+          state = InAppPaymentTable.State.END,
+          data = inAppPayment.data.copy(
+            error = InAppPaymentsRepository.buildPaymentFailure(inAppPayment, chargeFailure)
+          )
+        )
+      )
+    } else {
+      info("Generic payment failure detected.")
+
+      SignalDatabase.inAppPayments.update(
+        inAppPayment.copy(
+          notified = false,
+          state = InAppPaymentTable.State.END,
+          data = inAppPayment.data.copy(
+            error = InAppPaymentData.Error(
+              type = InAppPaymentData.Error.Type.PAYMENT_PROCESSING,
+              data_ = subscription.status
+            )
+          )
+        )
+      )
+    }
+  }
+
+  private fun submitAndValidateCredentials(
+    inAppPayment: InAppPaymentTable.InAppPayment,
+    subscription: Subscription,
+    requestContext: ReceiptCredentialRequestContext
+  ) {
+    info("Submitting receipt credential request")
+    val response: ServiceResponse<ReceiptCredentialResponse> = AppDependencies.donationsService.submitReceiptCredentialRequestSync(inAppPayment.subscriberId!!, requestContext.request)
+
+    if (response.applicationError.isPresent) {
+      handleApplicationError(inAppPayment, response)
+    } else if (response.result.isPresent) {
+      handleResult(inAppPayment, subscription, requestContext, response.result.get())
+    } else {
+      warning("Encountered a retryable exception.", response.executionError.get())
+      throw InAppPaymentRetryException(response.executionError.get())
+    }
+  }
+
+  private fun handleApplicationError(
+    inAppPayment: InAppPaymentTable.InAppPayment,
+    serviceResponse: ServiceResponse<ReceiptCredentialResponse>
+  ) {
+    val isForKeepAlive = inAppPayment.data.redemption!!.keepAlive == true
+    val applicationError = serviceResponse.applicationError.get()
+    when (serviceResponse.status) {
+      204 -> {
+        warning("Payment is still processing. Try again later.", applicationError)
+        throw InAppPaymentRetryException(applicationError)
+      }
+
+      400 -> {
+        warning("Receipt credential request failed to validate.", applicationError)
+        updateInAppPaymentWithGenericRedemptionError(inAppPayment)
+        throw Exception(applicationError)
+      }
+
+      402 -> {
+        warning("Payment looks like a failure but may be retried", applicationError)
+        throw InAppPaymentRetryException(applicationError)
+      }
+
+      403 -> {
+        warning("SubscriberId password mismatch or account auth was present", applicationError)
+        updateInAppPaymentWithGenericRedemptionError(inAppPayment)
+        throw Exception(applicationError)
+      }
+
+      404 -> {
+        warning("SubscriberId not found or malformed.", applicationError)
+        updateInAppPaymentWithGenericRedemptionError(inAppPayment)
+        throw Exception(applicationError)
+      }
+
+      409 -> {
+        if (isForKeepAlive) {
+          warning("Already redeemed this token during keep-alive, ignoring.", applicationError)
+          SignalDatabase.inAppPayments.update(
+            inAppPayment.copy(
+              state = InAppPaymentTable.State.END,
+              data = inAppPayment.data.copy(redemption = inAppPayment.data.redemption.copy(stage = InAppPaymentData.RedemptionState.Stage.REDEEMED))
+            )
+          )
+        } else {
+          warning("Already redeemed this token during new subscription. Failing.", applicationError)
+          updateInAppPaymentWithGenericRedemptionError(inAppPayment)
+        }
+      }
+
+      else -> {
+        warning("Encountered a server error.", applicationError)
+
+        throw InAppPaymentRetryException(applicationError)
+      }
+    }
+  }
+
+  private fun handleResult(
+    inAppPayment: InAppPaymentTable.InAppPayment,
+    subscription: Subscription,
+    requestContext: ReceiptCredentialRequestContext,
+    response: ReceiptCredentialResponse
+  ) {
+    val operations = AppDependencies.clientZkReceiptOperations
+    val receiptCredential: ReceiptCredential = try {
+      operations.receiveReceiptCredential(requestContext, response)
+    } catch (e: VerificationFailedException) {
+      warning("Encountered an exception when receiving receipt credential from zk.", e)
+      throw InAppPaymentRetryException(e)
+    }
+
+    if (!isCredentialValid(subscription, receiptCredential)) {
+      updateInAppPaymentWithGenericRedemptionError(inAppPayment)
+      throw IOException("Could not validate receipt credential")
+    }
+
+    val receiptCredentialPresentation: ReceiptCredentialPresentation = try {
+      operations.createReceiptCredentialPresentation(receiptCredential)
+    } catch (e: VerificationFailedException) {
+      warning("Encountered an exception when creating receipt credential presentation via zk.", e)
+      throw InAppPaymentRetryException(e)
+    }
+
+    info("Validated credential. Recording receipt and handing off to redemption job.")
+    SignalDatabase.donationReceipts.addReceipt(DonationReceiptRecord.createForSubscription(subscription))
+    SignalDatabase.inAppPayments.update(
+      inAppPayment = inAppPayment.copy(
+        data = inAppPayment.data.copy(
+          redemption = inAppPayment.data.redemption!!.copy(
+            stage = InAppPaymentData.RedemptionState.Stage.REDEMPTION_STARTED,
+            receiptCredentialPresentation = receiptCredentialPresentation.serialize().toByteString()
+          )
+        )
+      )
+    )
+  }
+
+  private fun isCredentialValid(subscription: Subscription, receiptCredential: ReceiptCredential): Boolean {
+    val now = System.currentTimeMillis().milliseconds
+    val maxExpirationTime = now + 90.days
+    val isSameLevel = subscription.level.toLong() == receiptCredential.receiptLevel
+    val isExpirationAfterSub = subscription.endOfCurrentPeriod < receiptCredential.receiptExpirationTime
+    val isExpiration86400 = receiptCredential.receiptExpirationTime % 86400L == 0L
+    val isExpirationInTheFuture = receiptCredential.receiptExpirationTime.seconds > now
+    val isExpirationWithinMax = receiptCredential.receiptExpirationTime.seconds <= maxExpirationTime
+
+    info(
+      """
+      Credential Validation
+      isSameLevel $isSameLevel
+      isExpirationAfterSub $isExpirationAfterSub
+      isExpiration86400 $isExpiration86400
+      isExpirationInTheFuture $isExpirationInTheFuture
+      isExpirationWithinMax $isExpirationWithinMax
+      """.trimIndent()
+    )
+
+    return isSameLevel && isExpirationAfterSub && isExpiration86400 && isExpirationInTheFuture && isExpirationWithinMax
+  }
+
+  private fun updateInAppPaymentWithGenericRedemptionError(inAppPayment: InAppPaymentTable.InAppPayment) {
+    SignalDatabase.inAppPayments.update(
+      inAppPayment = inAppPayment.copy(
+        state = InAppPaymentTable.State.END,
+        data = inAppPayment.data.copy(
+          error = InAppPaymentData.Error(
+            type = InAppPaymentData.Error.Type.REDEMPTION
+          )
+        )
+      )
+    )
+  }
+
+  override fun onShouldRetry(e: Exception): Boolean = e is InAppPaymentRetryException
+
+  private fun info(message: String, throwable: Throwable? = null) {
+    Log.i(TAG, "InAppPayment[$inAppPaymentId]: $message", throwable, true)
+  }
+
+  private fun warning(message: String, throwable: Throwable? = null) {
+    Log.w(TAG, "InAppPayment[$inAppPaymentId]: $message", throwable, true)
+  }
+
+  class Factory : Job.Factory<InAppPaymentRecurringContextJob> {
+    override fun create(parameters: Parameters, serializedData: ByteArray?): InAppPaymentRecurringContextJob {
+      return InAppPaymentRecurringContextJob(
+        InAppPaymentTable.InAppPaymentId(serializedData!!.decodeToString().toLong()),
+        parameters
+      )
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentRedemptionJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentRedemptionJob.kt
new file mode 100644
index 0000000000..7cc8b218f4
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentRedemptionJob.kt
@@ -0,0 +1,288 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.jobs
+
+import org.signal.core.util.logging.Log
+import org.signal.donations.InAppPaymentType
+import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.requireSubscriberType
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.MessageId
+import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.jobmanager.Job
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
+import org.thoughtcrime.securesms.jobs.protos.InAppPaymentRedemptionJobData
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.util.hasGiftBadge
+import org.thoughtcrime.securesms.util.requireGiftBadge
+import org.whispersystems.signalservice.internal.ServiceResponse
+import java.io.IOException
+
+/**
+ * Takes a ReceiptCredentialResponse and submits it to the server for redemption.
+ *
+ * Redemption is fairly straight forward:
+ * 1. Verify we have all the peices of data we need and haven't already redeemed the token
+ * 2. Attempt to redeem the token
+ * 3. Either mark down the error or the success
+ */
+class InAppPaymentRedemptionJob private constructor(
+  private val jobData: InAppPaymentRedemptionJobData,
+  parameters: Parameters
+) : BaseJob(parameters) {
+
+  companion object {
+    private val TAG = Log.tag(InAppPaymentRedemptionJob::class.java)
+    const val KEY = "InAppPurchaseRedemptionJob"
+
+    private const val MAX_RETRIES = 1500
+
+    /**
+     * Utilized when active subscription is in the REDEMPTION_STARTED stage of the redemption pipeline
+     */
+    fun enqueueJobChainForRecurringKeepAlive(inAppPayment: InAppPaymentTable.InAppPayment) {
+      AppDependencies.jobManager
+        .startChain(create(inAppPayment, makePrimary = false))
+        .then(RefreshOwnProfileJob())
+        .then(MultiDeviceProfileContentUpdateJob())
+        .enqueue()
+    }
+
+    fun create(
+      inAppPayment: InAppPaymentTable.InAppPayment? = null,
+      makePrimary: Boolean = false
+    ): Job {
+      return create(
+        inAppPayment = inAppPayment,
+        giftMessageId = null,
+        makePrimary = makePrimary
+      )
+    }
+
+    fun create(
+      giftMessageId: MessageId,
+      makePrimary: Boolean
+    ): Job {
+      return create(
+        inAppPayment = null,
+        giftMessageId = giftMessageId,
+        makePrimary = makePrimary
+      )
+    }
+
+    private fun create(
+      inAppPayment: InAppPaymentTable.InAppPayment? = null,
+      makePrimary: Boolean = false,
+      giftMessageId: MessageId? = null
+    ): Job {
+      return InAppPaymentRedemptionJob(
+        jobData = InAppPaymentRedemptionJobData(
+          inAppPaymentId = inAppPayment?.id?.rowId,
+          giftMessageId = giftMessageId?.id,
+          makePrimary = makePrimary
+        ),
+        parameters = Parameters.Builder()
+          .addConstraint(NetworkConstraint.KEY)
+          .setQueue(inAppPayment?.let { InAppPaymentsRepository.resolveJobQueueKey(it) } ?: "InAppGiftReceiptRedemption-$giftMessageId")
+          .setMaxAttempts(MAX_RETRIES)
+          .setLifespan(Parameters.IMMORTAL)
+          .build()
+      )
+    }
+  }
+
+  override fun serialize(): ByteArray = jobData.encode()
+
+  override fun getFactoryKey(): String = KEY
+
+  override fun onAdded() {
+    if (jobData.giftMessageId != null) {
+      Log.d(TAG, "GiftMessage with ID ${jobData.giftMessageId} will be marked as started")
+      SignalDatabase.messages.markGiftRedemptionStarted(jobData.giftMessageId)
+    }
+  }
+
+  override fun onFailure() {
+    if (jobData.giftMessageId != null) {
+      Log.d(TAG, "GiftMessage with ID ${jobData.giftMessageId} will be marked as a failure")
+      SignalDatabase.messages.markGiftRedemptionFailed(jobData.giftMessageId)
+    }
+
+    if (jobData.inAppPaymentId != null) {
+      Log.w(TAG, "A permanent failure occurred.")
+
+      val inAppPayment = SignalDatabase.inAppPayments.getById(InAppPaymentTable.InAppPaymentId(jobData.inAppPaymentId))
+      if (inAppPayment != null && inAppPayment.data.error == null) {
+        SignalDatabase.inAppPayments.update(
+          inAppPayment.copy(
+            notified = false,
+            state = InAppPaymentTable.State.END,
+            data = inAppPayment.data.copy(
+              error = InAppPaymentData.Error(
+                type = InAppPaymentData.Error.Type.REDEMPTION
+              )
+            )
+          )
+        )
+      }
+    }
+  }
+
+  override fun onRun() {
+    if (jobData.inAppPaymentId != null) {
+      onRunForInAppPayment(InAppPaymentTable.InAppPaymentId(jobData.inAppPaymentId))
+    } else {
+      onRunForGiftMessageId(jobData.giftMessageId!!)
+    }
+  }
+
+  private fun onRunForGiftMessageId(messageId: Long) {
+    val giftBadge = SignalDatabase.messages.getMessageRecord(messageId)
+    if (!giftBadge.hasGiftBadge()) {
+      Log.w(TAG, "GiftMessage with ID $messageId not found. Failing.", true)
+      return
+    }
+
+    if (giftBadge.requireGiftBadge().redemptionState == GiftBadge.RedemptionState.REDEEMED) {
+      Log.w(TAG, "GiftMessage with ID $messageId has already been redeemed. Exiting.", true)
+    }
+
+    val credentialBytes = giftBadge.requireGiftBadge().redemptionToken.toByteArray()
+    val receiptCredentialPresentation = ReceiptCredentialPresentation(credentialBytes)
+
+    Log.d(TAG, "Attempting to redeem receipt credential presentation...", true)
+    val serviceResponse = AppDependencies
+      .donationsService
+      .redeemDonationReceipt(
+        receiptCredentialPresentation,
+        SignalStore.inAppPayments.getDisplayBadgesOnProfile(),
+        jobData.makePrimary
+      )
+
+    verifyServiceResponse(serviceResponse)
+
+    Log.d(TAG, "GiftMessage with ID $messageId has been redeemed.")
+    SignalDatabase.messages.markGiftRedemptionCompleted(messageId)
+  }
+
+  private fun onRunForInAppPayment(inAppPaymentId: InAppPaymentTable.InAppPaymentId) {
+    val inAppPayment = SignalDatabase.inAppPayments.getById(inAppPaymentId)
+    if (inAppPayment == null) {
+      Log.w(TAG, "InAppPayment with ID $inAppPaymentId not found. Failing.", true)
+      return
+    }
+
+    if (inAppPayment.type.recurring) {
+      synchronized(inAppPayment.type.requireSubscriberType()) {
+        performInAppPaymentRedemption(inAppPayment)
+      }
+    } else {
+      performInAppPaymentRedemption(inAppPayment)
+    }
+  }
+
+  private fun performInAppPaymentRedemption(inAppPayment: InAppPaymentTable.InAppPayment) {
+    val inAppPaymentId = inAppPayment.id
+    if (inAppPayment.state != InAppPaymentTable.State.PENDING) {
+      Log.w(TAG, "InAppPayment with ID $inAppPaymentId is in state ${inAppPayment.state}, expected PENDING. Exiting.", true)
+      return
+    }
+
+    if (inAppPayment.data.redemption == null || inAppPayment.data.redemption.stage != InAppPaymentData.RedemptionState.Stage.REDEMPTION_STARTED) {
+      Log.w(TAG, "Recurring InAppPayment with ID $inAppPaymentId is in stage ${inAppPayment.data.redemption?.stage}. Expected REDEMPTION_STARTED. Exiting.", true)
+      return
+    }
+
+    val credentialBytes = inAppPayment.data.redemption.receiptCredentialPresentation
+    if (credentialBytes == null) {
+      Log.w(TAG, "InAppPayment with ID $inAppPaymentId does not have a receipt credential presentation. Nothing to redeem. Exiting.", true)
+      return
+    }
+
+    val receiptCredentialPresentation = ReceiptCredentialPresentation(credentialBytes.toByteArray())
+
+    val serviceResponse = if (inAppPayment.type == InAppPaymentType.RECURRING_BACKUP) {
+      Log.d(TAG, "Attempting to redeem archive receipt credential presentation...", true)
+      AppDependencies
+        .donationsService
+        .redeemArchivesReceipt(
+          receiptCredentialPresentation
+        )
+    } else {
+      Log.d(TAG, "Attempting to redeem donation receipt credential presentation...", true)
+      AppDependencies
+        .donationsService
+        .redeemDonationReceipt(
+          receiptCredentialPresentation,
+          SignalStore.inAppPayments.getDisplayBadgesOnProfile(),
+          jobData.makePrimary
+        )
+    }
+
+    verifyServiceResponse(serviceResponse) {
+      val protoError = InAppPaymentData.Error(
+        type = InAppPaymentData.Error.Type.REDEMPTION,
+        data_ = serviceResponse.status.toString()
+      )
+
+      SignalDatabase.inAppPayments.update(
+        inAppPayment = inAppPayment.copy(
+          data = inAppPayment.data.copy(
+            error = protoError
+          )
+        )
+      )
+    }
+
+    Log.i(TAG, "InAppPayment with ID $inAppPaymentId was successfully redeemed. Response code: ${serviceResponse.status}")
+    SignalDatabase.inAppPayments.update(
+      inAppPayment = inAppPayment.copy(
+        state = InAppPaymentTable.State.END,
+        data = inAppPayment.data.copy(
+          redemption = inAppPayment.data.redemption.copy(
+            stage = InAppPaymentData.RedemptionState.Stage.REDEEMED
+          )
+        )
+      )
+    )
+  }
+
+  private fun <T> verifyServiceResponse(serviceResponse: ServiceResponse<T>, onFatalError: (Int) -> Unit = {}) {
+    if (serviceResponse.executionError.isPresent) {
+      val error = serviceResponse.executionError.get()
+      Log.w(TAG, "Encountered a retryable error.", error, true)
+      throw InAppPaymentRetryException(error)
+    }
+
+    if (serviceResponse.applicationError.isPresent) {
+      val error = serviceResponse.applicationError.get()
+      if (serviceResponse.status >= 500) {
+        Log.w(TAG, "Encountered a retryable service error", error, true)
+        throw InAppPaymentRetryException(error)
+      } else {
+        Log.w(TAG, "Encountered a non-recoverable error", error, true)
+        onFatalError(serviceResponse.status)
+
+        throw IOException(error)
+      }
+    }
+  }
+
+  override fun onShouldRetry(e: Exception): Boolean = e is InAppPaymentRetryException
+
+  class Factory : Job.Factory<InAppPaymentRedemptionJob> {
+    override fun create(parameters: Parameters, serializedData: ByteArray?): InAppPaymentRedemptionJob {
+      return InAppPaymentRedemptionJob(
+        InAppPaymentRedemptionJobData.ADAPTER.decode(serializedData!!),
+        parameters
+      )
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentRetryException.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentRetryException.kt
new file mode 100644
index 0000000000..9d07225e57
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentRetryException.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.jobs
+
+/**
+ * Denotes that a thrown exception can be retried
+ */
+class InAppPaymentRetryException(
+  cause: Throwable? = null
+) : Exception(cause)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/IndividualSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/IndividualSendJob.java
index c45e9c2ae2..ce570b87f4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/IndividualSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/IndividualSendJob.java
@@ -10,15 +10,15 @@
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.attachments.Attachment;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
+import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil;
 import org.thoughtcrime.securesms.database.MessageTable;
 import org.thoughtcrime.securesms.database.NoSuchMessageException;
 import org.thoughtcrime.securesms.database.PaymentTable;
-import org.thoughtcrime.securesms.database.RecipientTable.UnidentifiedAccessMode;
+import org.thoughtcrime.securesms.database.RecipientTable.SealedSenderAccessMode;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.MessageId;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
@@ -37,7 +37,6 @@
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender.IndividualSendEvents;
 import org.whispersystems.signalservice.api.crypto.ContentHint;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
@@ -103,7 +102,7 @@ public static void enqueue(@NonNull Context context, @NonNull JobManager jobMana
     try {
       OutgoingMessage message = SignalDatabase.messages().getOutgoingMessage(messageId);
       if (message.getScheduledDate() != -1) {
-        ApplicationDependencies.getScheduledMessageManager().scheduleIfNecessary();
+        AppDependencies.getScheduledMessageManager().scheduleIfNecessary();
         return;
       }
 
@@ -142,7 +141,7 @@ public void onPushSend()
   {
     SignalLocalMetrics.IndividualMessageSend.onJobStarted(messageId);
 
-    ExpiringMessageManager expirationManager = ApplicationDependencies.getExpiringMessageManager();
+    ExpiringMessageManager expirationManager = AppDependencies.getExpiringMessageManager();
     MessageTable    database              = SignalDatabase.messages();
     OutgoingMessage message               = database.getOutgoingMessage(messageId);
     long            threadId              = database.getMessageRecord(messageId).getThreadId();
@@ -160,7 +159,7 @@ public void onPushSend()
 
       Recipient              recipient  = message.getThreadRecipient().fresh();
       byte[]                 profileKey = recipient.getProfileKey();
-      UnidentifiedAccessMode accessMode = recipient.getUnidentifiedAccessMode();
+      SealedSenderAccessMode accessMode = recipient.getSealedSenderAccessMode();
 
       boolean unidentified = deliver(message, originalEditedMessage);
 
@@ -177,15 +176,15 @@ public void onPushSend()
         SignalDatabase.messages().incrementViewedReceiptCount(message.getSentTimeMillis(), recipient.getId(), System.currentTimeMillis());
       }
 
-      if (unidentified && accessMode == UnidentifiedAccessMode.UNKNOWN && profileKey == null) {
+      if (unidentified && accessMode == SealedSenderAccessMode.UNKNOWN && profileKey == null) {
         log(TAG, String.valueOf(message.getSentTimeMillis()), "Marking recipient as UD-unrestricted following a UD send.");
-        SignalDatabase.recipients().setUnidentifiedAccessMode(recipient.getId(), UnidentifiedAccessMode.UNRESTRICTED);
-      } else if (unidentified && accessMode == UnidentifiedAccessMode.UNKNOWN) {
+        SignalDatabase.recipients().setSealedSenderAccessMode(recipient.getId(), SealedSenderAccessMode.UNRESTRICTED);
+      } else if (unidentified && accessMode == SealedSenderAccessMode.UNKNOWN) {
         log(TAG, String.valueOf(message.getSentTimeMillis()), "Marking recipient as UD-enabled following a UD send.");
-        SignalDatabase.recipients().setUnidentifiedAccessMode(recipient.getId(), UnidentifiedAccessMode.ENABLED);
-      } else if (!unidentified && accessMode != UnidentifiedAccessMode.DISABLED) {
+        SignalDatabase.recipients().setSealedSenderAccessMode(recipient.getId(), SealedSenderAccessMode.ENABLED);
+      } else if (!unidentified && accessMode != SealedSenderAccessMode.DISABLED) {
         log(TAG, String.valueOf(message.getSentTimeMillis()), "Marking recipient as UD-disabled following a non-UD send.");
-        SignalDatabase.recipients().setUnidentifiedAccessMode(recipient.getId(), UnidentifiedAccessMode.DISABLED);
+        SignalDatabase.recipients().setSealedSenderAccessMode(recipient.getId(), SealedSenderAccessMode.DISABLED);
       }
 
       if (originalEditedMessage != null && originalEditedMessage.getExpireStarted() > 0) {
@@ -208,7 +207,7 @@ public void onPushSend()
       warn(TAG, "Failure", uue);
       database.markAsSentFailed(messageId);
       notifyMediaMessageDeliveryFailed(context, messageId);
-      ApplicationDependencies.getJobManager().add(new DirectoryRefreshJob(false));
+      AppDependencies.getJobManager().add(new DirectoryRefreshJob(false));
     } catch (UntrustedIdentityException uie) {
       warn(TAG, "Failure", uie);
       RecipientId recipientId = Recipient.external(context, uie.getIdentifier()).getId();
@@ -251,7 +250,7 @@ private boolean deliver(OutgoingMessage message, MessageRecord originalEditedMes
         throw new UndeliverableMessageException(messageRecipient.getId() + " not registered!");
       }
 
-      SignalServiceMessageSender                 messageSender       = ApplicationDependencies.getSignalServiceMessageSender();
+      SignalServiceMessageSender                 messageSender       = AppDependencies.getSignalServiceMessageSender();
       SignalServiceAddress                       address             = RecipientUtil.toSignalServiceAddress(context, messageRecipient);
       List<Attachment>                           attachments         = Stream.of(message.getAttachments()).filterNot(Attachment::isSticker).toList();
       List<SignalServiceAttachment>              serviceAttachments  = getAttachmentPointersFor(attachments);
@@ -306,25 +305,35 @@ private boolean deliver(OutgoingMessage message, MessageRecord originalEditedMes
 
       if (originalEditedMessage != null) {
         if (Util.equals(SignalStore.account().getAci(), address.getServiceId())) {
-          Optional<UnidentifiedAccessPair> syncAccess = UnidentifiedAccessUtil.getAccessForSync(context);
           SendMessageResult                result     = messageSender.sendSelfSyncEditMessage(new SignalServiceEditMessage(originalEditedMessage.getDateSent(), mediaMessage));
           SignalDatabase.messageLog().insertIfPossible(messageRecipient.getId(), message.getSentTimeMillis(), result, ContentHint.RESENDABLE, new MessageId(messageId), false);
 
-          return syncAccess.isPresent();
+          return SealedSenderAccessUtil.getSealedSenderCertificate() != null;
         } else {
-          SendMessageResult result = messageSender.sendEditMessage(address, UnidentifiedAccessUtil.getAccessFor(context, messageRecipient), ContentHint.RESENDABLE, mediaMessage, IndividualSendEvents.EMPTY, message.isUrgent(), originalEditedMessage.getDateSent());
+          SendMessageResult result = messageSender.sendEditMessage(address,
+                                                                   SealedSenderAccessUtil.getSealedSenderAccessFor(messageRecipient),
+                                                                   ContentHint.RESENDABLE,
+                                                                   mediaMessage,
+                                                                   IndividualSendEvents.EMPTY,
+                                                                   message.isUrgent(),
+                                                                   originalEditedMessage.getDateSent());
           SignalDatabase.messageLog().insertIfPossible(messageRecipient.getId(), message.getSentTimeMillis(), result, ContentHint.RESENDABLE, new MessageId(messageId), false);
 
           return result.getSuccess().isUnidentified();
         }
       } else if (Util.equals(SignalStore.account().getAci(), address.getServiceId())) {
-        Optional<UnidentifiedAccessPair> syncAccess = UnidentifiedAccessUtil.getAccessForSync(context);
         SendMessageResult                result     = messageSender.sendSyncMessage(mediaMessage);
         SignalDatabase.messageLog().insertIfPossible(messageRecipient.getId(), message.getSentTimeMillis(), result, ContentHint.RESENDABLE, new MessageId(messageId), false);
-        return syncAccess.isPresent();
+        return SealedSenderAccessUtil.getSealedSenderCertificate() != null;
       } else {
         SignalLocalMetrics.IndividualMessageSend.onDeliveryStarted(messageId, message.getSentTimeMillis());
-        SendMessageResult result = messageSender.sendDataMessage(address, UnidentifiedAccessUtil.getAccessFor(context, messageRecipient), ContentHint.RESENDABLE, mediaMessage, new MetricEventListener(messageId), message.isUrgent(), messageRecipient.getNeedsPniSignature());
+        SendMessageResult result = messageSender.sendDataMessage(address,
+                                                                 SealedSenderAccessUtil.getSealedSenderAccessFor(messageRecipient),
+                                                                 ContentHint.RESENDABLE,
+                                                                 mediaMessage,
+                                                                 new MetricEventListener(messageId),
+                                                                 message.isUrgent(),
+                                                                 messageRecipient.getNeedsPniSignature());
 
         SignalDatabase.messageLog().insertIfPossible(messageRecipient.getId(), message.getSentTimeMillis(), result, ContentHint.RESENDABLE, new MessageId(messageId), message.isUrgent());
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
index 94f818bf19..e952f78fbf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
@@ -46,6 +46,7 @@
 import org.thoughtcrime.securesms.migrations.BackupNotificationMigrationJob;
 import org.thoughtcrime.securesms.migrations.BlobStorageLocationMigrationJob;
 import org.thoughtcrime.securesms.migrations.ClearGlideCacheMigrationJob;
+import org.thoughtcrime.securesms.migrations.ContactLinkRebuildMigrationJob;
 import org.thoughtcrime.securesms.migrations.CopyUsernameToSignalStoreMigrationJob;
 import org.thoughtcrime.securesms.migrations.DatabaseMigrationJob;
 import org.thoughtcrime.securesms.migrations.DeleteDeprecatedLogsMigrationJob;
@@ -75,6 +76,7 @@
 import org.thoughtcrime.securesms.migrations.StorageServiceMigrationJob;
 import org.thoughtcrime.securesms.migrations.StorageServiceSystemNameMigrationJob;
 import org.thoughtcrime.securesms.migrations.StoryViewedReceiptsStateMigrationJob;
+import org.thoughtcrime.securesms.migrations.SubscriberIdMigrationJob;
 import org.thoughtcrime.securesms.migrations.Svr2MirrorMigrationJob;
 import org.thoughtcrime.securesms.migrations.SyncDistributionListsMigrationJob;
 import org.thoughtcrime.securesms.migrations.SyncKeysMigrationJob;
@@ -93,7 +95,7 @@ public final class JobManagerFactories {
   public static Map<String, Job.Factory> getJobFactories(@NonNull Application application) {
     return new HashMap<String, Job.Factory>() {{
       put(AccountConsistencyWorkerJob.KEY,           new AccountConsistencyWorkerJob.Factory());
-      put(AllDataSyncRequestJob.KEY,                 new AllDataSyncRequestJob.Factory());
+      put("AllDataSyncRequestJob",                   new FailingJob.Factory());
       put(AnalyzeDatabaseJob.KEY,                    new AnalyzeDatabaseJob.Factory());
       put(ArchiveAttachmentJob.KEY,                  new ArchiveAttachmentJob.Factory());
       put(ArchiveAttachmentBackfillJob.KEY,          new ArchiveAttachmentBackfillJob.Factory());
@@ -111,12 +113,14 @@ public static Map<String, Job.Factory> getJobFactories(@NonNull Application appl
       put(BackupRestoreJob.KEY,                      new BackupRestoreJob.Factory());
       put(BackupRestoreMediaJob.KEY,                 new BackupRestoreMediaJob.Factory());
       put("BoostReceiptCredentialsSubmissionJob",    new FailingJob.Factory());
+      put(BuildExpirationConfirmationJob.KEY,        new BuildExpirationConfirmationJob.Factory());
       put(CallLinkPeekJob.KEY,                       new CallLinkPeekJob.Factory());
       put(CallLinkUpdateSendJob.KEY,                 new CallLinkUpdateSendJob.Factory());
       put(CallLogEventSendJob.KEY,                   new CallLogEventSendJob.Factory());
       put(CallSyncEventJob.KEY,                      new CallSyncEventJob.Factory());
       put(CheckServiceReachabilityJob.KEY,           new CheckServiceReachabilityJob.Factory());
       put(CleanPreKeysJob.KEY,                       new CleanPreKeysJob.Factory());
+      put(ContactLinkRebuildMigrationJob.KEY,        new ContactLinkRebuildMigrationJob.Factory());
       put(ConversationShortcutRankingUpdateJob.KEY,  new ConversationShortcutRankingUpdateJob.Factory());
       put(ConversationShortcutUpdateJob.KEY,         new ConversationShortcutUpdateJob.Factory());
       put(CreateReleaseChannelJob.KEY,               new CreateReleaseChannelJob.Factory());
@@ -136,6 +140,12 @@ public static Map<String, Job.Factory> getJobFactories(@NonNull Application appl
       put(GroupCallPeekWorkerJob.KEY,                new GroupCallPeekWorkerJob.Factory());
       put(GroupRingCleanupJob.KEY,                   new GroupRingCleanupJob.Factory());
       put(GroupV2UpdateSelfProfileKeyJob.KEY,        new GroupV2UpdateSelfProfileKeyJob.Factory());
+      put(InAppPaymentAuthCheckJob.KEY,              new InAppPaymentAuthCheckJob.Factory());
+      put("InAppPaymentGiftSendJob",                 new FailingJob.Factory());
+      put(InAppPaymentKeepAliveJob.KEY,              new InAppPaymentKeepAliveJob.Factory());
+      put(InAppPaymentRecurringContextJob.KEY,       new InAppPaymentRecurringContextJob.Factory());
+      put(InAppPaymentOneTimeContextJob.KEY,         new InAppPaymentOneTimeContextJob.Factory());
+      put(InAppPaymentRedemptionJob.KEY,             new InAppPaymentRedemptionJob.Factory());
       put(IndividualSendJob.KEY,                     new IndividualSendJob.Factory());
       put(LeaveGroupV2Job.KEY,                       new LeaveGroupV2Job.Factory());
       put(LeaveGroupV2WorkerJob.KEY,                 new LeaveGroupV2WorkerJob.Factory());
@@ -148,6 +158,7 @@ public static Map<String, Job.Factory> getJobFactories(@NonNull Application appl
       put(MultiDeviceConfigurationUpdateJob.KEY,     new MultiDeviceConfigurationUpdateJob.Factory());
       put(MultiDeviceContactSyncJob.KEY,             new MultiDeviceContactSyncJob.Factory());
       put(MultiDeviceContactUpdateJob.KEY,           new MultiDeviceContactUpdateJob.Factory());
+      put(MultiDeviceDeleteSyncJob.KEY,              new MultiDeviceDeleteSyncJob.Factory());
       put(MultiDeviceKeysUpdateJob.KEY,              new MultiDeviceKeysUpdateJob.Factory());
       put(MultiDeviceMessageRequestResponseJob.KEY,  new MultiDeviceMessageRequestResponseJob.Factory());
       put(MultiDeviceOutgoingPaymentSyncJob.KEY,     new MultiDeviceOutgoingPaymentSyncJob.Factory());
@@ -168,7 +179,7 @@ public static Map<String, Job.Factory> getJobFactories(@NonNull Application appl
       put(PaymentNotificationSendJobV2.KEY,          new PaymentNotificationSendJobV2.Factory());
       put(PaymentSendJob.KEY,                        new PaymentSendJob.Factory());
       put(PaymentTransactionCheckJob.KEY,            new PaymentTransactionCheckJob.Factory());
-      put(PnpInitializeDevicesJob.KEY,               new PnpInitializeDevicesJob.Factory());
+      put("PnpInitializeDevicesJob",                 new FailingJob.Factory());
       put(PreKeysSyncJob.KEY,                        new PreKeysSyncJob.Factory());
       put("ExternalLaunchDonationJob",               new FailingJob.Factory());
       put(ProfileKeySendJob.KEY,                     new ProfileKeySendJob.Factory());
@@ -195,6 +206,7 @@ public static Map<String, Job.Factory> getJobFactories(@NonNull Application appl
       put(RequestGroupV2InfoWorkerJob.KEY,           new RequestGroupV2InfoWorkerJob.Factory());
       put(RequestGroupV2InfoJob.KEY,                 new RequestGroupV2InfoJob.Factory());
       put(RestoreAttachmentJob.KEY,                  new RestoreAttachmentJob.Factory());
+      put(RestoreAttachmentThumbnailJob.KEY,         new RestoreAttachmentThumbnailJob.Factory());
       put(RetrieveProfileAvatarJob.KEY,              new RetrieveProfileAvatarJob.Factory());
       put(RetrieveProfileJob.KEY,                    new RetrieveProfileJob.Factory());
       put(RetrieveRemoteAnnouncementsJob.KEY,        new RetrieveRemoteAnnouncementsJob.Factory());
@@ -216,10 +228,12 @@ public static Map<String, Job.Factory> getJobFactories(@NonNull Application appl
       put(StorageForcePushJob.KEY,                   new StorageForcePushJob.Factory());
       put(StorageSyncJob.KEY,                        new StorageSyncJob.Factory());
       put("SubscriptionKeepAliveJob",                new FailingJob.Factory());
-      put("SubscriptionReceiptCredentialsSubmissionJob", new FailingJob.Factory());
+      put("SubscriptionReceiptCredentialsSubmissionJob", new FailingJob.Factory()); // SubscriptionReceiptRequestResponseJob.java
+      put(SubscriberIdMigrationJob.KEY,              new SubscriberIdMigrationJob.Factory());
       put(StoryOnboardingDownloadJob.KEY,            new StoryOnboardingDownloadJob.Factory());
       put(SubmitRateLimitPushChallengeJob.KEY,       new SubmitRateLimitPushChallengeJob.Factory());
       put(Svr2MirrorJob.KEY,                         new Svr2MirrorJob.Factory());
+      put(Svr3MirrorJob.KEY,                         new Svr3MirrorJob.Factory());
       put(SyncArchivedMediaJob.KEY,                  new SyncArchivedMediaJob.Factory());
       put(ThreadUpdateJob.KEY,                       new ThreadUpdateJob.Factory());
       put(TrimThreadJob.KEY,                         new TrimThreadJob.Factory());
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/LeaveGroupV2Job.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/LeaveGroupV2Job.kt
index fd469d6a6c..5879bee802 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/LeaveGroupV2Job.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/LeaveGroupV2Job.kt
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobs
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.JsonJobData
@@ -34,7 +34,7 @@ class LeaveGroupV2Job(parameters: Parameters, private val groupId: GroupId.V2) :
   }
 
   override fun onRun() {
-    ApplicationDependencies.getJobManager().add(LeaveGroupV2WorkerJob(groupId))
+    AppDependencies.jobManager.add(LeaveGroupV2WorkerJob(groupId))
   }
 
   override fun onShouldRetry(e: Exception): Boolean = false
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/LeaveGroupV2WorkerJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/LeaveGroupV2WorkerJob.kt
index 1226917b93..15c4f2edef 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/LeaveGroupV2WorkerJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/LeaveGroupV2WorkerJob.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs
 
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupChangeBusyException
 import org.thoughtcrime.securesms.groups.GroupChangeFailedException
 import org.thoughtcrime.securesms.groups.GroupId
@@ -50,7 +50,7 @@ class LeaveGroupV2WorkerJob(parameters: Parameters, private val groupId: GroupId
       SignalDatabase.recipients.setProfileSharing(groupRecipient.id, enabled = false)
       SignalDatabase.threads.setEntireThreadRead(threadId)
       SignalDatabase.threads.update(threadId, unarchive = false, allowDeletion = false)
-      ApplicationDependencies.getMessageNotifier().updateNotification(context)
+      AppDependencies.messageNotifier.updateNotification(context)
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/LinkedDeviceInactiveCheckJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/LinkedDeviceInactiveCheckJob.kt
index 78d573535d..4d8f8e856c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/LinkedDeviceInactiveCheckJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/LinkedDeviceInactiveCheckJob.kt
@@ -8,7 +8,7 @@ package org.thoughtcrime.securesms.jobs
 import org.signal.core.util.Base64
 import org.signal.core.util.logging.Log
 import org.signal.core.util.roundedString
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.devicelist.protos.DeviceName
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
@@ -40,14 +40,14 @@ class LinkedDeviceInactiveCheckJob private constructor(
 
     @JvmStatic
     fun enqueue() {
-      ApplicationDependencies.getJobManager().add(LinkedDeviceInactiveCheckJob())
+      AppDependencies.jobManager.add(LinkedDeviceInactiveCheckJob())
     }
 
     @JvmStatic
     fun enqueueIfNecessary() {
-      val timeSinceLastCheck = System.currentTimeMillis() - SignalStore.misc().linkedDeviceLastActiveCheckTime
+      val timeSinceLastCheck = System.currentTimeMillis() - SignalStore.misc.linkedDeviceLastActiveCheckTime
       if (timeSinceLastCheck > 1.days.inWholeMilliseconds || timeSinceLastCheck < 0) {
-        ApplicationDependencies.getJobManager().add(LinkedDeviceInactiveCheckJob())
+        AppDependencies.jobManager.add(LinkedDeviceInactiveCheckJob())
       }
     }
   }
@@ -58,7 +58,7 @@ class LinkedDeviceInactiveCheckJob private constructor(
 
   override fun run(): Result {
     val devices = try {
-      ApplicationDependencies.getSignalServiceAccountManager().devices
+      AppDependencies.signalServiceAccountManager.devices
     } catch (e: IOException) {
       return Result.retry(defaultBackoff())
     }
@@ -66,9 +66,9 @@ class LinkedDeviceInactiveCheckJob private constructor(
     if (devices.isEmpty()) {
       Log.i(TAG, "No linked devices found.")
 
-      SignalStore.misc().hasLinkedDevices = false
-      SignalStore.misc().leastActiveLinkedDevice = null
-      SignalStore.misc().linkedDeviceLastActiveCheckTime = System.currentTimeMillis()
+      SignalStore.misc.hasLinkedDevices = false
+      SignalStore.misc.leastActiveLinkedDevice = null
+      SignalStore.misc.linkedDeviceLastActiveCheckTime = System.currentTimeMillis()
 
       return Result.success()
     }
@@ -76,10 +76,10 @@ class LinkedDeviceInactiveCheckJob private constructor(
     val leastActiveDevice: LeastActiveLinkedDevice? = devices
       .filter { it.id != SignalServiceAddress.DEFAULT_DEVICE_ID }
       .filter { it.name != null }
-      .minBy { it.lastSeen }
-      .let {
+      .minByOrNull { it.lastSeen }
+      ?.let {
         val nameProto = DeviceName.ADAPTER.decode(Base64.decode(it.getName()))
-        val decryptedBytes = DeviceNameCipher.decryptDeviceName(nameProto, ApplicationDependencies.getProtocolStore().aci().identityKeyPair) ?: return@let null
+        val decryptedBytes = DeviceNameCipher.decryptDeviceName(nameProto, AppDependencies.protocolStore.aci().identityKeyPair) ?: return@let null
         val name = String(decryptedBytes)
 
         LeastActiveLinkedDevice(
@@ -90,18 +90,18 @@ class LinkedDeviceInactiveCheckJob private constructor(
 
     if (leastActiveDevice == null) {
       Log.w(TAG, "Failed to decrypt linked device name.")
-      SignalStore.misc().hasLinkedDevices = true
-      SignalStore.misc().leastActiveLinkedDevice = null
-      SignalStore.misc().linkedDeviceLastActiveCheckTime = System.currentTimeMillis()
+      SignalStore.misc.hasLinkedDevices = true
+      SignalStore.misc.leastActiveLinkedDevice = null
+      SignalStore.misc.linkedDeviceLastActiveCheckTime = System.currentTimeMillis()
       return Result.success()
     }
 
     val timeSinceActive = System.currentTimeMillis() - leastActiveDevice.lastActiveTimestamp
     Log.i(TAG, "Least active linked device was last active ${timeSinceActive.milliseconds.toDouble(DurationUnit.DAYS).roundedString(2)} days ago ($timeSinceActive ms).")
 
-    SignalStore.misc().hasLinkedDevices = true
-    SignalStore.misc().leastActiveLinkedDevice = leastActiveDevice
-    SignalStore.misc().linkedDeviceLastActiveCheckTime = System.currentTimeMillis()
+    SignalStore.misc.hasLinkedDevices = true
+    SignalStore.misc.leastActiveLinkedDevice = leastActiveDevice
+    SignalStore.misc.linkedDeviceLastActiveCheckTime = System.currentTimeMillis()
 
     return Result.success()
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
index 0641703c42..6a12f54fd2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
@@ -21,7 +21,7 @@
 import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
 import org.thoughtcrime.securesms.database.NoExternalStorageException;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
@@ -50,7 +50,7 @@ public final class LocalBackupJob extends BaseJob {
   public static final String TEMP_BACKUP_FILE_SUFFIX = ".tmp";
 
   public static void enqueue(boolean force) {
-    JobManager         jobManager = ApplicationDependencies.getJobManager();
+    JobManager         jobManager = AppDependencies.getJobManager();
     Parameters.Builder parameters = new Parameters.Builder()
                                                   .setQueue(QUEUE)
                                                   .setMaxInstancesForFactory(1)
@@ -59,7 +59,7 @@ public static void enqueue(boolean force) {
       jobManager.cancelAllInQueue(QUEUE);
     }
 
-    if (BackupUtil.isUserSelectionRequired(ApplicationDependencies.getApplication())) {
+    if (BackupUtil.isUserSelectionRequired(AppDependencies.getApplication())) {
       jobManager.add(new LocalBackupJobApi29(parameters.build()));
     } else {
       jobManager.add(new LocalBackupJob(parameters.build()));
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MessageFetchJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MessageFetchJob.java
index c0315b1238..93b734654f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MessageFetchJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MessageFetchJob.java
@@ -8,7 +8,7 @@
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.messages.WebSocketDrainer;
@@ -125,7 +125,7 @@ public void onBackground() {
 
     @Override
     public void close() {
-      ApplicationDependencies.getAppForegroundObserver().removeListener(this);
+      AppDependencies.getAppForegroundObserver().removeListener(this);
       closeNotificationController();
     }
 
@@ -157,7 +157,7 @@ private void closeNotificationController() {
 
     static ForegroundServiceController create(@NonNull Context context) {
       ForegroundServiceController instance = new ForegroundServiceController(context);
-      ApplicationDependencies.getAppForegroundObserver().addListener(instance);
+      AppDependencies.getAppForegroundObserver().addListener(instance);
 
       return instance;
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java
index 0d51b806d6..925ab0989b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java
@@ -4,11 +4,10 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.RecipientTable;
 import org.thoughtcrime.securesms.database.RecipientTable.RecipientReader;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.net.NotPushRegisteredException;
@@ -87,9 +86,9 @@ public void onRun()
         }
       }
 
-      SignalServiceMessageSender messageSender = ApplicationDependencies.getSignalServiceMessageSender();
-      messageSender.sendSyncMessage(SignalServiceSyncMessage.forBlocked(new BlockedListMessage(blockedIndividuals, blockedGroups)),
-                                    UnidentifiedAccessUtil.getAccessForSync(context));
+      SignalServiceMessageSender messageSender = AppDependencies.getSignalServiceMessageSender();
+      messageSender.sendSyncMessage(SignalServiceSyncMessage.forBlocked(new BlockedListMessage(blockedIndividuals, blockedGroups))
+      );
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceCallLinkSyncJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceCallLinkSyncJob.kt
index 7add42ad57..f3d7be2e73 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceCallLinkSyncJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceCallLinkSyncJob.kt
@@ -7,14 +7,13 @@ package org.thoughtcrime.securesms.jobs
 
 import okio.ByteString.Companion.toByteString
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkCredentials
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage
 import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException
 import org.whispersystems.signalservice.internal.push.SyncMessage.CallLinkUpdate
-import java.util.Optional
 import kotlin.time.Duration.Companion.days
 
 /**
@@ -57,7 +56,7 @@ class MultiDeviceCallLinkSyncJob private constructor(
     val syncMessage = SignalServiceSyncMessage.forCallLinkUpdate(callLinkUpdate)
 
     try {
-      ApplicationDependencies.getSignalServiceMessageSender().sendSyncMessage(syncMessage, Optional.empty())
+      AppDependencies.signalServiceMessageSender.sendSyncMessage(syncMessage)
     } catch (e: Exception) {
       Log.w(TAG, "Unable to send call link update message.", e)
       throw e
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java
index ec93751ce1..35f4d6d26d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java
@@ -5,10 +5,9 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobmanager.JsonJobData;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.net.NotPushRegisteredException;
@@ -26,7 +25,8 @@
 
 public class MultiDeviceConfigurationUpdateJob extends BaseJob {
 
-  public static final String KEY = "MultiDeviceConfigurationUpdateJob";
+  public static final String KEY   = "MultiDeviceConfigurationUpdateJob";
+  public static final String QUEUE = "__MULTI_DEVICE_CONFIGURATION_UPDATE_JOB__";
 
   private static final String TAG = Log.tag(MultiDeviceConfigurationUpdateJob.class);
 
@@ -46,7 +46,7 @@ public MultiDeviceConfigurationUpdateJob(boolean readReceiptsEnabled,
                                            boolean linkPreviewsEnabled)
   {
     this(new Job.Parameters.Builder()
-                           .setQueue("__MULTI_DEVICE_CONFIGURATION_UPDATE_JOB__")
+                           .setQueue(QUEUE)
                            .addConstraint(NetworkConstraint.KEY)
                            .setMaxAttempts(10)
                            .build(),
@@ -101,12 +101,12 @@ public void onRun() throws IOException, UntrustedIdentityException {
       return;
     }
 
-    SignalServiceMessageSender messageSender = ApplicationDependencies.getSignalServiceMessageSender();
+    SignalServiceMessageSender messageSender = AppDependencies.getSignalServiceMessageSender();
     messageSender.sendSyncMessage(SignalServiceSyncMessage.forConfiguration(new ConfigurationMessage(Optional.of(readReceiptsEnabled),
                                                                                                      Optional.of(unidentifiedDeliveryIndicatorsEnabled),
                                                                                                      Optional.of(typingIndicatorsEnabled),
-                                                                                                     Optional.of(linkPreviewsEnabled))),
-                              UnidentifiedAccessUtil.getAccessForSync(context));
+                                                                                                     Optional.of(linkPreviewsEnabled)))
+    );
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactSyncJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactSyncJob.kt
index 23f8c4f1f5..b0e0293f22 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactSyncJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactSyncJob.kt
@@ -4,7 +4,7 @@ import org.signal.core.util.logging.Log
 import org.signal.libsignal.protocol.InvalidMessageException
 import org.thoughtcrime.securesms.database.IdentityTable.VerifiedStatus
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.JsonJobData
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -50,7 +50,7 @@ class MultiDeviceContactSyncJob(parameters: Parameters, private val attachmentPo
       throw NotPushRegisteredException()
     }
 
-    if (SignalStore.account().isPrimaryDevice) {
+    if (SignalStore.account.isPrimaryDevice) {
       Log.i(TAG, "Not linked device, aborting...")
       return
     }
@@ -59,7 +59,7 @@ class MultiDeviceContactSyncJob(parameters: Parameters, private val attachmentPo
 
     try {
       val contactsFile: File = BlobProvider.getInstance().forNonAutoEncryptingSingleSessionOnDisk(context)
-      ApplicationDependencies.getSignalServiceMessageReceiver()
+      AppDependencies.signalServiceMessageReceiver
         .retrieveAttachment(contactAttachment, contactsFile, MAX_ATTACHMENT_SIZE)
         .use(this::processContactFile)
     } catch (e: MissingConfigurationException) {
@@ -108,7 +108,7 @@ class MultiDeviceContactSyncJob(parameters: Parameters, private val attachmentPo
         }
 
         if (recipient.serviceId.isPresent) {
-          ApplicationDependencies.getProtocolStore().aci().identities().saveIdentityWithoutSideEffects(
+          AppDependencies.protocolStore.aci().identities().saveIdentityWithoutSideEffects(
             recipient.id,
             recipient.serviceId.get(),
             contact.verified.get().identityKey,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
index fe6f025dc2..458ea90049 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
@@ -15,13 +15,12 @@
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.thoughtcrime.securesms.conversation.colors.ChatColorsMapper;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.RecipientTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobmanager.JsonJobData;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.net.NotPushRegisteredException;
@@ -156,7 +155,7 @@ private void generateSingleContactUpdate(@NonNull RecipientId recipientId)
         return;
       }
 
-      Optional<IdentityRecord>  identityRecord  = ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecord(recipient.getId());
+      Optional<IdentityRecord>  identityRecord  = AppDependencies.getProtocolStore().aci().identities().getIdentityRecord(recipient.getId());
       Optional<VerifiedMessage> verifiedMessage = getVerifiedMessage(recipient, identityRecord);
       Map<RecipientId, Integer> inboxPositions  = SignalDatabase.threads().getInboxPositions();
       Set<RecipientId>          archived        = SignalDatabase.threads().getArchivedRecipients();
@@ -178,7 +177,7 @@ private void generateSingleContactUpdate(@NonNull RecipientId recipientId)
 
       long length = BlobProvider.getInstance().calculateFileSize(context, updateUri);
 
-      sendUpdate(ApplicationDependencies.getSignalServiceMessageSender(),
+      sendUpdate(AppDependencies.getSignalServiceMessageSender(),
                  BlobProvider.getInstance().getStream(context, updateUri),
                  length,
                  false);
@@ -195,7 +194,7 @@ private void generateSingleContactUpdate(@NonNull RecipientId recipientId)
   private void generateFullContactUpdate()
       throws IOException, UntrustedIdentityException, NetworkException
   {
-    boolean isAppVisible      = ApplicationDependencies.getAppForegroundObserver().isForegrounded();
+    boolean isAppVisible      = AppDependencies.getAppForegroundObserver().isForegrounded();
     long    timeSinceLastSync = System.currentTimeMillis() - TextSecurePreferences.getLastFullContactSyncTime(context);
 
     Log.d(TAG, "Requesting a full contact sync. forced = " + forceSync + ", appVisible = " + isAppVisible + ", timeSinceLastSync = " + timeSinceLastSync + " ms");
@@ -219,7 +218,7 @@ private void generateFullContactUpdate()
       Set<RecipientId>           archived       = SignalDatabase.threads().getArchivedRecipients();
 
       for (Recipient recipient : recipients) {
-        Optional<IdentityRecord>  identity      = ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecord(recipient.getId());
+        Optional<IdentityRecord>  identity      = AppDependencies.getProtocolStore().aci().identities().getIdentityRecord(recipient.getId());
         Optional<VerifiedMessage> verified      = getVerifiedMessage(recipient, identity);
         Optional<String>          name          = Optional.ofNullable(recipient.isSystemContact() ? recipient.getDisplayName(context) : recipient.getGroupName(context));
         Optional<ProfileKey>      profileKey    = ProfileKeyUtil.profileKeyOptional(recipient.getProfileKey());
@@ -262,7 +261,7 @@ private void generateFullContactUpdate()
 
       long length = BlobProvider.getInstance().calculateFileSize(context, updateUri);
 
-      sendUpdate(ApplicationDependencies.getSignalServiceMessageSender(),
+      sendUpdate(AppDependencies.getSignalServiceMessageSender(),
                  BlobProvider.getInstance().getStream(context, updateUri),
                  length,
                  true);
@@ -298,8 +297,8 @@ private void sendUpdate(SignalServiceMessageSender messageSender, InputStream st
                                                                                         .withLength(length)
                                                                                         .withResumableUploadSpec(messageSender.getResumableUploadSpec());
 
-        messageSender.sendSyncMessage(SignalServiceSyncMessage.forContacts(new ContactsMessage(attachmentStream.build(), complete)),
-                                      UnidentifiedAccessUtil.getAccessForSync(context));
+        messageSender.sendSyncMessage(SignalServiceSyncMessage.forContacts(new ContactsMessage(attachmentStream.build(), complete))
+        );
       } catch (IOException ioe) {
         throw new NetworkException(ioe);
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceDeleteSyncJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceDeleteSyncJob.kt
new file mode 100644
index 0000000000..8c51487e14
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceDeleteSyncJob.kt
@@ -0,0 +1,424 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.jobs
+
+import androidx.annotation.VisibleForTesting
+import androidx.annotation.WorkerThread
+import okio.ByteString.Companion.toByteString
+import org.signal.core.util.Base64
+import org.signal.core.util.logging.Log
+import org.signal.core.util.orNull
+import org.thoughtcrime.securesms.attachments.DatabaseAttachment
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.ThreadTable
+import org.thoughtcrime.securesms.database.model.MessageRecord
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.jobmanager.Job
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
+import org.thoughtcrime.securesms.jobs.protos.DeleteSyncJobData
+import org.thoughtcrime.securesms.jobs.protos.DeleteSyncJobData.AddressableMessage
+import org.thoughtcrime.securesms.jobs.protos.DeleteSyncJobData.AttachmentDelete
+import org.thoughtcrime.securesms.jobs.protos.DeleteSyncJobData.ThreadDelete
+import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.pad
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException
+import org.whispersystems.signalservice.api.util.UuidUtil
+import org.whispersystems.signalservice.internal.push.Content
+import org.whispersystems.signalservice.internal.push.SyncMessage
+import org.whispersystems.signalservice.internal.push.SyncMessage.DeleteForMe
+import java.io.IOException
+import java.util.Optional
+import kotlin.time.Duration.Companion.days
+
+/**
+ * Send delete for me sync messages for the various type of delete syncs.
+ */
+class MultiDeviceDeleteSyncJob private constructor(
+  private var data: DeleteSyncJobData,
+  parameters: Parameters = Parameters.Builder()
+    .addConstraint(NetworkConstraint.KEY)
+    .setMaxAttempts(Parameters.UNLIMITED)
+    .setLifespan(1.days.inWholeMilliseconds)
+    .build()
+) : Job(parameters) {
+
+  companion object {
+    const val KEY = "MultiDeviceDeleteSendSyncJob"
+    private val TAG = Log.tag(MultiDeviceDeleteSyncJob::class.java)
+
+    private const val CHUNK_SIZE = 500
+    private const val THREAD_CHUNK_SIZE = CHUNK_SIZE / 5
+
+    @WorkerThread
+    @JvmStatic
+    fun enqueueMessageDeletes(messageRecords: Set<MessageRecord>) {
+      if (!TextSecurePreferences.isMultiDevice(AppDependencies.application)) {
+        return
+      }
+
+      if (!Recipient.self().deleteSyncCapability.isSupported) {
+        Log.i(TAG, "Delete sync support not enabled.")
+        return
+      }
+
+      messageRecords.chunked(CHUNK_SIZE).forEach { chunk ->
+        val deletes = createMessageDeletes(chunk)
+        if (deletes.isNotEmpty()) {
+          AppDependencies.jobManager.add(MultiDeviceDeleteSyncJob(messages = deletes))
+        } else {
+          Log.i(TAG, "No valid message deletes to sync")
+        }
+      }
+    }
+
+    @WorkerThread
+    @JvmStatic
+    fun enqueueAttachmentDelete(message: MessageRecord?, attachment: DatabaseAttachment) {
+      if (!TextSecurePreferences.isMultiDevice(AppDependencies.application)) {
+        return
+      }
+
+      if (!Recipient.self().deleteSyncCapability.isSupported) {
+        Log.i(TAG, "Delete sync support not enabled.")
+        return
+      }
+
+      val delete = createAttachmentDelete(message, attachment)
+      if (delete != null) {
+        AppDependencies.jobManager.add(MultiDeviceDeleteSyncJob(attachments = listOf(delete)))
+      } else {
+        Log.i(TAG, "No valid attachment deletes to sync attachment:${attachment.attachmentId}")
+      }
+    }
+
+    @WorkerThread
+    fun enqueueThreadDeletes(threads: List<ThreadTable.ThreadDeleteSyncInfo>, isFullDelete: Boolean) {
+      if (!TextSecurePreferences.isMultiDevice(AppDependencies.application)) {
+        return
+      }
+
+      if (!Recipient.self().deleteSyncCapability.isSupported) {
+        Log.i(TAG, "Delete sync support not enabled.")
+        return
+      }
+
+      threads.chunked(THREAD_CHUNK_SIZE).forEach { chunk ->
+        val threadDeletes = createThreadDeletes(chunk, isFullDelete)
+        if (threadDeletes.isNotEmpty()) {
+          AppDependencies.jobManager.add(
+            MultiDeviceDeleteSyncJob(
+              threads = threadDeletes.filter { it.messages.isNotEmpty() },
+              localOnlyThreads = threadDeletes.filter { it.messages.isEmpty() }
+            )
+          )
+        } else {
+          Log.i(TAG, "No valid thread deletes to sync")
+        }
+      }
+    }
+
+    @WorkerThread
+    private fun createMessageDeletes(messageRecords: Collection<MessageRecord>): List<AddressableMessage> {
+      return messageRecords.mapNotNull { message ->
+        val threadRecipient = SignalDatabase.threads.getRecipientForThreadId(message.threadId)
+        if (threadRecipient == null) {
+          Log.w(TAG, "Unable to find thread recipient for message: ${message.id} thread: ${message.threadId}")
+          null
+        } else if (threadRecipient.isReleaseNotes) {
+          Log.w(TAG, "Syncing release channel deletes are not currently supported")
+          null
+        } else if (threadRecipient.isDistributionList || !message.canDeleteSync()) {
+          null
+        } else {
+          AddressableMessage(
+            threadRecipientId = threadRecipient.id.toLong(),
+            sentTimestamp = message.dateSent,
+            authorRecipientId = message.fromRecipient.id.toLong()
+          )
+        }
+      }
+    }
+
+    @WorkerThread
+    private fun createAttachmentDelete(message: MessageRecord?, attachment: DatabaseAttachment): AttachmentDelete? {
+      if (message == null) {
+        return null
+      }
+
+      val threadRecipient = SignalDatabase.threads.getRecipientForThreadId(message.threadId)
+      val addressableMessage = if (threadRecipient == null) {
+        Log.w(TAG, "Unable to find thread recipient for message: ${message.id} thread: ${message.threadId} attachment: ${attachment.attachmentId}")
+        null
+      } else if (threadRecipient.isReleaseNotes) {
+        Log.w(TAG, "Syncing release channel deletes are not currently supported")
+        null
+      } else if (threadRecipient.isDistributionList || !message.canDeleteSync()) {
+        null
+      } else {
+        AddressableMessage(
+          threadRecipientId = threadRecipient.id.toLong(),
+          sentTimestamp = message.dateSent,
+          authorRecipientId = message.fromRecipient.id.toLong()
+        )
+      }
+
+      if (addressableMessage == null) {
+        return null
+      }
+
+      val delete = AttachmentDelete(
+        targetMessage = addressableMessage,
+        uuid = attachment.uuid?.let { UuidUtil.toByteString(it) },
+        digest = attachment.remoteDigest?.toByteString(),
+        plaintextHash = attachment.dataHash?.let { Base64.decodeOrNull(it)?.toByteString() }
+      )
+
+      return if (delete.uuid == null && delete.digest == null && delete.plaintextHash == null) {
+        Log.w(TAG, "Unable to find uuid, digest, or plain text hash for attachment: ${attachment.attachmentId}")
+        null
+      } else {
+        delete
+      }
+    }
+
+    @WorkerThread
+    private fun createThreadDeletes(threads: List<ThreadTable.ThreadDeleteSyncInfo>, isFullDelete: Boolean): List<ThreadDelete> {
+      return threads.mapNotNull { (threadId, messages, nonExpiringMessages) ->
+        val threadRecipient = SignalDatabase.threads.getRecipientForThreadId(threadId)
+        if (threadRecipient == null) {
+          Log.w(TAG, "Unable to find thread recipient for thread: $threadId")
+          null
+        } else if (threadRecipient.isReleaseNotes) {
+          Log.w(TAG, "Syncing release channel delete is not currently supported")
+          null
+        } else if (threadRecipient.isDistributionList) {
+          null
+        } else {
+          ThreadDelete(
+            threadRecipientId = threadRecipient.id.toLong(),
+            isFullDelete = isFullDelete,
+            messages = messages.map {
+              AddressableMessage(
+                sentTimestamp = it.dateSent,
+                authorRecipientId = it.fromRecipient.id.toLong()
+              )
+            },
+            nonExpiringMessages = nonExpiringMessages.map {
+              AddressableMessage(
+                sentTimestamp = it.dateSent,
+                authorRecipientId = it.fromRecipient.id.toLong()
+              )
+            }
+          )
+        }
+      }
+    }
+  }
+
+  @VisibleForTesting
+  constructor(
+    messages: List<AddressableMessage> = emptyList(),
+    threads: List<ThreadDelete> = emptyList(),
+    localOnlyThreads: List<ThreadDelete> = emptyList(),
+    attachments: List<AttachmentDelete> = emptyList()
+  ) : this(
+    DeleteSyncJobData(
+      messageDeletes = messages,
+      threadDeletes = threads,
+      localOnlyThreadDeletes = localOnlyThreads,
+      attachmentDeletes = attachments
+    )
+  )
+
+  override fun serialize(): ByteArray = data.encode()
+
+  override fun getFactoryKey(): String = KEY
+
+  override fun run(): Result {
+    if (!Recipient.self().isRegistered) {
+      Log.w(TAG, "Not registered")
+      return Result.failure()
+    }
+
+    if (!TextSecurePreferences.isMultiDevice(context)) {
+      Log.w(TAG, "Not multi-device")
+      return Result.failure()
+    }
+
+    if (data.messageDeletes.isNotEmpty()) {
+      val success = syncDelete(
+        DeleteForMe(
+          messageDeletes = data.messageDeletes.groupBy { it.threadRecipientId }.mapNotNull { (threadRecipientId, messages) ->
+            val conversation = Recipient.resolved(RecipientId.from(threadRecipientId)).toDeleteSyncConversationId()
+            if (conversation != null) {
+              DeleteForMe.MessageDeletes(
+                conversation = conversation,
+                messages = messages.mapNotNull { it.toDeleteSyncMessage() }
+              )
+            } else {
+              Log.w(TAG, "Unable to resolve $threadRecipientId to conversation id")
+              null
+            }
+          }
+        )
+      )
+
+      if (!success) {
+        return Result.retry(defaultBackoff())
+      }
+    }
+
+    if (data.threadDeletes.isNotEmpty()) {
+      val success = syncDelete(
+        DeleteForMe(
+          conversationDeletes = data.threadDeletes.mapNotNull { threadDelete ->
+            val conversation = Recipient.resolved(RecipientId.from(threadDelete.threadRecipientId)).toDeleteSyncConversationId()
+            if (conversation != null) {
+              DeleteForMe.ConversationDelete(
+                conversation = conversation,
+                mostRecentMessages = threadDelete.messages.mapNotNull { it.toDeleteSyncMessage() },
+                isFullDelete = threadDelete.isFullDelete,
+                mostRecentNonExpiringMessages = threadDelete.messages.mapNotNull { it.toDeleteSyncMessage() }
+              )
+            } else {
+              Log.w(TAG, "Unable to resolve ${threadDelete.threadRecipientId} to conversation id")
+              null
+            }
+          }
+        )
+      )
+
+      if (!success) {
+        return Result.retry(defaultBackoff())
+      }
+    }
+
+    if (data.localOnlyThreadDeletes.isNotEmpty()) {
+      val success = syncDelete(
+        DeleteForMe(
+          localOnlyConversationDeletes = data.localOnlyThreadDeletes.mapNotNull {
+            val conversation = Recipient.resolved(RecipientId.from(it.threadRecipientId)).toDeleteSyncConversationId()
+            if (conversation != null) {
+              DeleteForMe.LocalOnlyConversationDelete(
+                conversation = conversation
+              )
+            } else {
+              Log.w(TAG, "Unable to resolve ${it.threadRecipientId} to conversation id")
+              null
+            }
+          }
+        )
+      )
+
+      if (!success) {
+        return Result.retry(defaultBackoff())
+      }
+    }
+
+    if (data.attachmentDeletes.isNotEmpty()) {
+      val success = syncDelete(
+        DeleteForMe(
+          attachmentDeletes = data.attachmentDeletes.mapNotNull {
+            val conversation = Recipient.resolved(RecipientId.from(it.targetMessage!!.threadRecipientId)).toDeleteSyncConversationId()
+            val targetMessage = it.targetMessage.toDeleteSyncMessage()
+
+            if (conversation != null && targetMessage != null) {
+              DeleteForMe.AttachmentDelete(
+                conversation = conversation,
+                targetMessage = targetMessage,
+                uuid = it.uuid,
+                fallbackDigest = it.digest,
+                fallbackPlaintextHash = it.plaintextHash
+              )
+            } else {
+              Log.w(TAG, "Unable to resolve ${it.targetMessage.threadRecipientId} to conversation id or resolve target message data")
+              null
+            }
+          }
+        )
+      )
+
+      if (!success) {
+        return Result.retry(defaultBackoff())
+      }
+    }
+
+    return Result.success()
+  }
+
+  override fun onFailure() = Unit
+
+  private fun syncDelete(deleteForMe: DeleteForMe): Boolean {
+    if (deleteForMe.conversationDeletes.isEmpty() &&
+      deleteForMe.messageDeletes.isEmpty() &&
+      deleteForMe.localOnlyConversationDeletes.isEmpty() &&
+      deleteForMe.attachmentDeletes.isEmpty()
+    ) {
+      Log.i(TAG, "No valid deletes, nothing to send, skipping")
+      return true
+    }
+
+    val syncMessageContent = deleteForMeContent(deleteForMe)
+
+    return try {
+      Log.d(TAG, "Sending delete sync messageDeletes=${deleteForMe.messageDeletes.size} conversationDeletes=${deleteForMe.conversationDeletes.size} localOnlyConversationDeletes=${deleteForMe.localOnlyConversationDeletes.size} attachmentDeletes=${deleteForMe.attachmentDeletes.size}")
+      AppDependencies.signalServiceMessageSender.sendSyncMessage(syncMessageContent, true, Optional.empty()).isSuccess
+    } catch (e: IOException) {
+      Log.w(TAG, "Unable to send message delete sync", e)
+      false
+    } catch (e: UntrustedIdentityException) {
+      Log.w(TAG, "Unable to send message delete sync", e)
+      false
+    }
+  }
+
+  private fun deleteForMeContent(deleteForMe: DeleteForMe): Content {
+    val syncMessage = SyncMessage.Builder()
+      .pad()
+      .deleteForMe(deleteForMe)
+
+    return Content(syncMessage = syncMessage.build())
+  }
+
+  private fun Recipient.toDeleteSyncConversationId(): DeleteForMe.ConversationIdentifier? {
+    return when {
+      isGroup -> DeleteForMe.ConversationIdentifier(threadGroupId = requireGroupId().decodedId.toByteString())
+      hasAci -> DeleteForMe.ConversationIdentifier(threadServiceId = requireAci().toString())
+      hasPni -> DeleteForMe.ConversationIdentifier(threadServiceId = requirePni().toString())
+      hasE164 -> DeleteForMe.ConversationIdentifier(threadE164 = requireE164())
+      else -> null
+    }
+  }
+
+  private fun AddressableMessage.toDeleteSyncMessage(): DeleteForMe.AddressableMessage? {
+    val author: Recipient = Recipient.resolved(RecipientId.from(authorRecipientId))
+    val authorServiceId: String? = author.aci.orNull()?.toString() ?: author.pni.orNull()?.toString()
+    val authorE164: String? = if (authorServiceId == null) {
+      author.e164.orNull()
+    } else {
+      null
+    }
+
+    return if (authorServiceId == null && authorE164 == null) {
+      Log.w(TAG, "Unable to send sync message without serviceId or e164 recipient: ${author.id}")
+      null
+    } else {
+      DeleteForMe.AddressableMessage(
+        authorServiceId = authorServiceId,
+        authorE164 = authorE164,
+        sentTimestamp = sentTimestamp
+      )
+    }
+  }
+
+  class Factory : Job.Factory<MultiDeviceDeleteSyncJob> {
+    override fun create(parameters: Parameters, serializedData: ByteArray?): MultiDeviceDeleteSyncJob {
+      return MultiDeviceDeleteSyncJob(DeleteSyncJobData.ADAPTER.decode(serializedData!!), parameters)
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.java
index f7acf6d1d2..e122e936d2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.java
@@ -5,8 +5,7 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -70,11 +69,11 @@ public void onRun() throws IOException, UntrustedIdentityException {
       return;
     }
 
-    SignalServiceMessageSender messageSender     = ApplicationDependencies.getSignalServiceMessageSender();
+    SignalServiceMessageSender messageSender     = AppDependencies.getSignalServiceMessageSender();
     StorageKey                 storageServiceKey = SignalStore.storageService().getOrCreateStorageKey();
 
-    messageSender.sendSyncMessage(SignalServiceSyncMessage.forKeys(new KeysMessage(Optional.ofNullable(storageServiceKey), Optional.of(SignalStore.svr().getOrCreateMasterKey()))),
-                                  UnidentifiedAccessUtil.getAccessForSync(context));
+    messageSender.sendSyncMessage(SignalServiceSyncMessage.forKeys(new KeysMessage(Optional.ofNullable(storageServiceKey), Optional.of(SignalStore.svr().getOrCreateMasterKey())))
+    );
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceMessageRequestResponseJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceMessageRequestResponseJob.java
index 2f199d2758..3fc50ca7ee 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceMessageRequestResponseJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceMessageRequestResponseJob.java
@@ -5,10 +5,9 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobmanager.JsonJobData;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.net.NotPushRegisteredException;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -103,7 +102,7 @@ public void onRun() throws IOException, UntrustedIdentityException {
       return;
     }
 
-    SignalServiceMessageSender messageSender = ApplicationDependencies.getSignalServiceMessageSender();
+    SignalServiceMessageSender messageSender = AppDependencies.getSignalServiceMessageSender();
     Recipient                  recipient     = Recipient.resolved(threadRecipient);
 
     if (!recipient.isGroup() && !recipient.getHasServiceId()) {
@@ -122,8 +121,8 @@ public void onRun() throws IOException, UntrustedIdentityException {
     }
 
     if (response != null) {
-      messageSender.sendSyncMessage(SignalServiceSyncMessage.forMessageRequestResponse(response),
-                                    UnidentifiedAccessUtil.getAccessForSync(context));
+      messageSender.sendSyncMessage(SignalServiceSyncMessage.forMessageRequestResponse(response)
+      );
     } else {
       Log.w(TAG, recipient.getId() + " not registered!");
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceOutgoingPaymentSyncJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceOutgoingPaymentSyncJob.java
index c17eac8cc5..e9d2fd0ce1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceOutgoingPaymentSyncJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceOutgoingPaymentSyncJob.java
@@ -4,10 +4,9 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.PaymentTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
@@ -116,9 +115,9 @@ protected void onRun() throws Exception {
                                                                                txoIdentification.keyImages);
 
 
-    ApplicationDependencies.getSignalServiceMessageSender()
-                           .sendSyncMessage(SignalServiceSyncMessage.forOutgoingPayment(outgoingPaymentMessage),
-                                            UnidentifiedAccessUtil.getAccessForSync(context));
+    AppDependencies.getSignalServiceMessageSender()
+                   .sendSyncMessage(SignalServiceSyncMessage.forOutgoingPayment(outgoingPaymentMessage)
+                   );
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileContentUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileContentUpdateJob.java
index 174420b76f..a44de92d20 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileContentUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileContentUpdateJob.java
@@ -4,8 +4,7 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.net.NotPushRegisteredException;
@@ -56,10 +55,10 @@ protected void onRun() throws Exception {
       return;
     }
 
-    SignalServiceMessageSender messageSender = ApplicationDependencies.getSignalServiceMessageSender();
+    SignalServiceMessageSender messageSender = AppDependencies.getSignalServiceMessageSender();
 
-    messageSender.sendSyncMessage(SignalServiceSyncMessage.forFetchLatest(SignalServiceSyncMessage.FetchType.LOCAL_PROFILE),
-                                  UnidentifiedAccessUtil.getAccessForSync(context));
+    messageSender.sendSyncMessage(SignalServiceSyncMessage.forFetchLatest(SignalServiceSyncMessage.FetchType.LOCAL_PROFILE)
+    );
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java
index 511cea5064..16b7c21ab8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java
@@ -7,14 +7,12 @@
 import org.signal.core.util.logging.Log;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.net.NotPushRegisteredException;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
@@ -90,7 +88,7 @@ public void onRun() throws IOException, UntrustedIdentityException {
 
     out.close();
 
-    SignalServiceMessageSender    messageSender    = ApplicationDependencies.getSignalServiceMessageSender();
+    SignalServiceMessageSender    messageSender    = AppDependencies.getSignalServiceMessageSender();
     SignalServiceAttachmentStream attachmentStream = SignalServiceAttachment.newStreamBuilder()
                                                                             .withStream(new ByteArrayInputStream(baos.toByteArray()))
                                                                             .withContentType("application/octet-stream")
@@ -99,7 +97,7 @@ public void onRun() throws IOException, UntrustedIdentityException {
 
     SignalServiceSyncMessage      syncMessage      = SignalServiceSyncMessage.forContacts(new ContactsMessage(attachmentStream, false));
 
-    messageSender.sendSyncMessage(syncMessage, UnidentifiedAccessUtil.getAccessForSync(context));
+    messageSender.sendSyncMessage(syncMessage);
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java
index 77dc5546a6..76eeb9a69d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java
@@ -8,12 +8,11 @@
 
 import org.signal.core.util.ListUtil;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.MessageTable.SyncMessageId;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobmanager.JsonJobData;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
+import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.net.NotPushRegisteredException;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -68,7 +67,7 @@ private MultiDeviceReadUpdateJob(@NonNull Job.Parameters parameters, @NonNull Li
    * maximum size.
    */
   public static void enqueue(@NonNull List<SyncMessageId> messageIds) {
-    JobManager                jobManager      = ApplicationDependencies.getJobManager();
+    JobManager                jobManager      = AppDependencies.getJobManager();
     List<List<SyncMessageId>> messageIdChunks = ListUtil.chunk(messageIds, SendReadReceiptJob.MAX_TIMESTAMPS);
 
     if (messageIdChunks.size() > 1) {
@@ -120,8 +119,8 @@ public void onRun() throws IOException, UntrustedIdentityException {
       }
     }
 
-    SignalServiceMessageSender messageSender = ApplicationDependencies.getSignalServiceMessageSender();
-    messageSender.sendSyncMessage(SignalServiceSyncMessage.forRead(readMessages), UnidentifiedAccessUtil.getAccessForSync(context));
+    SignalServiceMessageSender messageSender = AppDependencies.getSignalServiceMessageSender();
+    messageSender.sendSyncMessage(SignalServiceSyncMessage.forRead(readMessages));
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java
index 1cab0aea43..b673612a18 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java
@@ -3,13 +3,12 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.signal.core.util.Hex;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobmanager.JsonJobData;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
-import org.signal.core.util.Hex;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
@@ -90,11 +89,11 @@ protected void onRun() throws Exception {
       default:      throw new AssertionError("No matching type?");
     }
 
-    SignalServiceMessageSender  messageSender        = ApplicationDependencies.getSignalServiceMessageSender();
+    SignalServiceMessageSender  messageSender        = AppDependencies.getSignalServiceMessageSender();
     StickerPackOperationMessage stickerPackOperation = new StickerPackOperationMessage(packIdBytes, packKeyBytes, remoteType);
 
-    messageSender.sendSyncMessage(SignalServiceSyncMessage.forStickerPackOperations(Collections.singletonList(stickerPackOperation)),
-                                  UnidentifiedAccessUtil.getAccessForSync(context));
+    messageSender.sendSyncMessage(SignalServiceSyncMessage.forStickerPackOperations(Collections.singletonList(stickerPackOperation))
+    );
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java
index 4779d431af..fcbf3d253b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java
@@ -3,17 +3,16 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.signal.core.util.Hex;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.StickerTable.StickerPackRecordReader;
 import org.thoughtcrime.securesms.database.model.StickerPackRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.net.NotPushRegisteredException;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.signal.core.util.Hex;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
@@ -79,9 +78,9 @@ protected void onRun() throws Exception {
       }
     }
 
-    SignalServiceMessageSender messageSender = ApplicationDependencies.getSignalServiceMessageSender();
-    messageSender.sendSyncMessage(SignalServiceSyncMessage.forStickerPackOperations(operations),
-                                  UnidentifiedAccessUtil.getAccessForSync(context));
+    SignalServiceMessageSender messageSender = AppDependencies.getSignalServiceMessageSender();
+    messageSender.sendSyncMessage(SignalServiceSyncMessage.forStickerPackOperations(operations)
+    );
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStorageSyncRequestJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStorageSyncRequestJob.java
index cce2ad1267..81da6276a7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStorageSyncRequestJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStorageSyncRequestJob.java
@@ -4,8 +4,7 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.net.NotPushRegisteredException;
@@ -56,10 +55,9 @@ protected void onRun() throws Exception {
       return;
     }
 
-    SignalServiceMessageSender messageSender = ApplicationDependencies.getSignalServiceMessageSender();
+    SignalServiceMessageSender messageSender = AppDependencies.getSignalServiceMessageSender();
 
-    messageSender.sendSyncMessage(SignalServiceSyncMessage.forFetchLatest(SignalServiceSyncMessage.FetchType.STORAGE_MANIFEST),
-                                  UnidentifiedAccessUtil.getAccessForSync(context));
+    messageSender.sendSyncMessage(SignalServiceSyncMessage.forFetchLatest(SignalServiceSyncMessage.FetchType.STORAGE_MANIFEST));
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStorySendSyncJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStorySendSyncJob.kt
index f97c9dea16..0764592c7d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStorySendSyncJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStorySendSyncJob.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs
 
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.JsonJobData
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
@@ -11,7 +11,6 @@ import org.whispersystems.signalservice.api.messages.SignalServiceStoryMessageRe
 import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage
 import org.whispersystems.signalservice.api.push.SignalServiceAddress
-import java.lang.Exception
 import java.util.Optional
 import java.util.concurrent.TimeUnit
 
@@ -57,7 +56,7 @@ class MultiDeviceStorySendSyncJob private constructor(parameters: Parameters, pr
     val updateManifest = SignalDatabase.storySends.getLocalManifest(sentTimestamp)
     val recipientsSet: Set<SignalServiceStoryMessageRecipient> = updateManifest.toRecipientsSet()
     val transcriptMessage: SignalServiceSyncMessage = SignalServiceSyncMessage.forSentTranscript(buildSentTranscript(recipientsSet))
-    val sendMessageResult = ApplicationDependencies.getSignalServiceMessageSender().sendSyncMessage(transcriptMessage, Optional.empty())
+    val sendMessageResult = AppDependencies.signalServiceMessageSender.sendSyncMessage(transcriptMessage)
 
     Log.i(TAG, "Sent transcript message with ${recipientsSet.size} recipients")
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceSubscriptionSyncRequestJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceSubscriptionSyncRequestJob.kt
index 4d329bf8fa..b6e6ca1df7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceSubscriptionSyncRequestJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceSubscriptionSyncRequestJob.kt
@@ -1,8 +1,7 @@
 package org.thoughtcrime.securesms.jobs
 
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.net.NotPushRegisteredException
@@ -33,7 +32,7 @@ class MultiDeviceSubscriptionSyncRequestJob private constructor(parameters: Para
           .build()
       )
 
-      ApplicationDependencies.getJobManager().add(job)
+      AppDependencies.jobManager.add(job)
     }
   }
 
@@ -55,12 +54,9 @@ class MultiDeviceSubscriptionSyncRequestJob private constructor(parameters: Para
       return
     }
 
-    val messageSender = ApplicationDependencies.getSignalServiceMessageSender()
+    val messageSender = AppDependencies.signalServiceMessageSender
 
-    messageSender.sendSyncMessage(
-      SignalServiceSyncMessage.forFetchLatest(SignalServiceSyncMessage.FetchType.SUBSCRIPTION_STATUS),
-      UnidentifiedAccessUtil.getAccessForSync(context)
-    )
+    messageSender.sendSyncMessage(SignalServiceSyncMessage.forFetchLatest(SignalServiceSyncMessage.FetchType.SUBSCRIPTION_STATUS))
   }
 
   override fun onShouldRetry(e: Exception): Boolean {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java
index 687c09dad9..37f2522cd9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java
@@ -4,20 +4,19 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.signal.core.util.Base64;
 import org.signal.core.util.logging.Log;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.InvalidKeyException;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.IdentityTable.VerifiedStatus;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobmanager.JsonJobData;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.net.NotPushRegisteredException;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
-import org.signal.core.util.Base64;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
@@ -104,7 +103,7 @@ public void onRun() throws IOException, UntrustedIdentityException {
         return;
       }
 
-      SignalServiceMessageSender messageSender = ApplicationDependencies.getSignalServiceMessageSender();
+      SignalServiceMessageSender messageSender = AppDependencies.getSignalServiceMessageSender();
       Recipient                  recipient     = Recipient.resolved(destination);
 
       if (recipient.isUnregistered()) {
@@ -116,8 +115,8 @@ public void onRun() throws IOException, UntrustedIdentityException {
       SignalServiceAddress          verifiedAddress = RecipientUtil.toSignalServiceAddress(context, recipient);
       VerifiedMessage               verifiedMessage = new VerifiedMessage(verifiedAddress, new IdentityKey(identityKey, 0), verifiedState, timestamp);
 
-      messageSender.sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessage),
-                                    UnidentifiedAccessUtil.getAccessFor(context, recipient));
+      messageSender.sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessage)
+      );
     } catch (InvalidKeyException e) {
       throw new IOException(e);
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewOnceOpenJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewOnceOpenJob.java
index 52570ea04e..b8acf0e402 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewOnceOpenJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewOnceOpenJob.java
@@ -6,11 +6,10 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.MessageTable.SyncMessageId;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobmanager.JsonJobData;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.net.NotPushRegisteredException;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -82,7 +81,7 @@ public void onRun() throws IOException, UntrustedIdentityException {
       return;
     }
 
-    SignalServiceMessageSender messageSender = ApplicationDependencies.getSignalServiceMessageSender();
+    SignalServiceMessageSender messageSender = AppDependencies.getSignalServiceMessageSender();
     Recipient                  recipient     = Recipient.resolved(RecipientId.from(messageId.recipientId));
 
     if (recipient.isUnregistered()) {
@@ -92,7 +91,7 @@ public void onRun() throws IOException, UntrustedIdentityException {
 
     ViewOnceOpenMessage openMessage = new ViewOnceOpenMessage(RecipientUtil.getOrFetchServiceId(context, recipient), messageId.timestamp);
 
-    messageSender.sendSyncMessage(SignalServiceSyncMessage.forViewOnceOpen(openMessage), UnidentifiedAccessUtil.getAccessForSync(context));
+    messageSender.sendSyncMessage(SignalServiceSyncMessage.forViewOnceOpen(openMessage));
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewedUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewedUpdateJob.java
index 788ee76db2..02d6231e18 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewedUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceViewedUpdateJob.java
@@ -8,12 +8,11 @@
 
 import org.signal.core.util.ListUtil;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.MessageTable.SyncMessageId;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobmanager.JsonJobData;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
+import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.net.NotPushRegisteredException;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -68,7 +67,7 @@ private MultiDeviceViewedUpdateJob(@NonNull Parameters parameters, @NonNull List
    * maximum size.
    */
   public static void enqueue(@NonNull List<SyncMessageId> messageIds) {
-    JobManager                jobManager      = ApplicationDependencies.getJobManager();
+    JobManager                jobManager      = AppDependencies.getJobManager();
     List<List<SyncMessageId>> messageIdChunks = ListUtil.chunk(messageIds, SendReadReceiptJob.MAX_TIMESTAMPS);
 
     if (messageIdChunks.size() > 1) {
@@ -120,8 +119,8 @@ public void onRun() throws IOException, UntrustedIdentityException {
       }
     }
 
-    SignalServiceMessageSender messageSender = ApplicationDependencies.getSignalServiceMessageSender();
-    messageSender.sendSyncMessage(SignalServiceSyncMessage.forViewed(viewedMessages), UnidentifiedAccessUtil.getAccessForSync(context));
+    SignalServiceMessageSender messageSender = AppDependencies.getSignalServiceMessageSender();
+    messageSender.sendSyncMessage(SignalServiceSyncMessage.forViewed(viewedMessages));
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/NullMessageSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/NullMessageSendJob.java
index c1deb83d50..9e710ad6ce 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/NullMessageSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/NullMessageSendJob.java
@@ -4,21 +4,19 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobmanager.JsonJobData;
+import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
 
-import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -72,12 +70,11 @@ protected void onRun() throws Exception {
       Log.w(TAG, recipient.getId() + " not registered!");
     }
 
-    SignalServiceMessageSender       messageSender      = ApplicationDependencies.getSignalServiceMessageSender();
-    SignalServiceAddress             address            = RecipientUtil.toSignalServiceAddress(context, recipient);
-    Optional<UnidentifiedAccessPair> unidentifiedAccess = UnidentifiedAccessUtil.getAccessFor(context, recipient);
+    SignalServiceMessageSender messageSender = AppDependencies.getSignalServiceMessageSender();
+    SignalServiceAddress       address       = RecipientUtil.toSignalServiceAddress(context, recipient);
 
     try {
-      messageSender.sendNullMessage(address, unidentifiedAccess);
+      messageSender.sendNullMessage(address, SealedSenderAccessUtil.getSealedSenderAccessFor(recipient));
     } catch (UntrustedIdentityException e) {
       Log.w(TAG, "Unable to send null message.");
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/OptimizeMessageSearchIndexJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/OptimizeMessageSearchIndexJob.kt
index 427bcfe311..56393ec209 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/OptimizeMessageSearchIndexJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/OptimizeMessageSearchIndexJob.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs
 
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.transport.RetryLaterException
@@ -21,7 +21,7 @@ class OptimizeMessageSearchIndexJob private constructor(parameters: Parameters)
 
     @JvmStatic
     fun enqueue() {
-      ApplicationDependencies.getJobManager().add(OptimizeMessageSearchIndexJob())
+      AppDependencies.jobManager.add(OptimizeMessageSearchIndexJob())
     }
   }
 
@@ -40,7 +40,7 @@ class OptimizeMessageSearchIndexJob private constructor(parameters: Parameters)
   override fun getNextRunAttemptBackoff(pastAttemptCount: Int, exception: Exception): Long = 30.seconds.inWholeMilliseconds
 
   override fun onRun() {
-    if (!SignalStore.registrationValues().isRegistrationComplete || SignalStore.account().aci == null) {
+    if (!SignalStore.registration.isRegistrationComplete || SignalStore.account.aci == null) {
       Log.w(TAG, "Registration not finished yet! Skipping.")
       return
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PaymentLedgerUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PaymentLedgerUpdateJob.java
index df9dd46b0c..889e0026a3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PaymentLedgerUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PaymentLedgerUpdateJob.java
@@ -8,7 +8,7 @@
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.PaymentTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -57,7 +57,7 @@ private PaymentLedgerUpdateJob(@NonNull Parameters parameters,
 
   @Override
   protected void onRun() throws IOException, RetryLaterException, FogSyncException {
-    if (!SignalStore.paymentsValues().mobileCoinPaymentsEnabled()) {
+    if (!SignalStore.payments().mobileCoinPaymentsEnabled()) {
       Log.w(TAG, "Payments are not enabled");
       return;
     }
@@ -75,9 +75,9 @@ protected void onRun() throws IOException, RetryLaterException, FogSyncException
       }
     }
 
-    MobileCoinLedgerWrapper ledger = ApplicationDependencies.getPayments()
-                                                            .getWallet()
-                                                            .tryGetFullLedger(minimumBlockIndex);
+    MobileCoinLedgerWrapper ledger = AppDependencies.getPayments()
+                                                    .getWallet()
+                                                    .tryGetFullLedger(minimumBlockIndex);
 
     if (ledger == null) {
       Log.i(TAG, "Ledger not updated yet, waiting for a minimum block index");
@@ -86,7 +86,7 @@ protected void onRun() throws IOException, RetryLaterException, FogSyncException
 
     Log.i(TAG, "Ledger fetched successfully");
 
-    SignalStore.paymentsValues()
+    SignalStore.payments()
                .setMobileCoinFullLedger(ledger);
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PaymentNotificationSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PaymentNotificationSendJob.java
index 18764d8cf3..83bcbc0630 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PaymentNotificationSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PaymentNotificationSendJob.java
@@ -4,12 +4,12 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
+import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil;
 import org.thoughtcrime.securesms.database.PaymentTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobmanager.JsonJobData;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.net.NotPushRegisteredException;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -18,14 +18,12 @@
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender.IndividualSendEvents;
 import org.whispersystems.signalservice.api.crypto.ContentHint;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException;
 
 import java.io.IOException;
-import java.util.Optional;
 import java.util.UUID;
 
 public final class PaymentNotificationSendJob extends BaseJob {
@@ -81,9 +79,8 @@ protected void onRun() throws Exception {
       return;
     }
 
-    SignalServiceMessageSender       messageSender      = ApplicationDependencies.getSignalServiceMessageSender();
-    SignalServiceAddress             address            = RecipientUtil.toSignalServiceAddress(context, recipient);
-    Optional<UnidentifiedAccessPair> unidentifiedAccess = UnidentifiedAccessUtil.getAccessFor(context, recipient);
+    SignalServiceMessageSender messageSender = AppDependencies.getSignalServiceMessageSender();
+    SignalServiceAddress       address       = RecipientUtil.toSignalServiceAddress(context, recipient);
 
     PaymentTable.PaymentTransaction payment = paymentDatabase.getPayment(uuid);
 
@@ -101,7 +98,13 @@ protected void onRun() throws Exception {
                                                                    .withPayment(new SignalServiceDataMessage.Payment(new SignalServiceDataMessage.PaymentNotification(payment.getReceipt(), payment.getNote()), null))
                                                                    .build();
 
-    SendMessageResult sendMessageResult = messageSender.sendDataMessage(address, unidentifiedAccess, ContentHint.DEFAULT, dataMessage, IndividualSendEvents.EMPTY, false, recipient.getNeedsPniSignature());
+    SendMessageResult sendMessageResult = messageSender.sendDataMessage(address,
+                                                                        SealedSenderAccessUtil.getSealedSenderAccessFor(recipient),
+                                                                        ContentHint.DEFAULT,
+                                                                        dataMessage,
+                                                                        IndividualSendEvents.EMPTY,
+                                                                        false,
+                                                                        recipient.getNeedsPniSignature());
 
     if (recipient.getNeedsPniSignature()) {
       SignalDatabase.pendingPniSignatureMessages().insertIfNecessary(recipientId, dataMessage.getTimestamp(), sendMessageResult);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PaymentSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PaymentSendJob.java
index 4922ea507b..869e270446 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PaymentSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PaymentSendJob.java
@@ -7,7 +7,7 @@
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.PaymentTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
@@ -79,10 +79,10 @@ public final class PaymentSendJob extends BaseJob {
                                      amount,
                                      totalFee);
 
-    JobManager.Chain chain = ApplicationDependencies.getJobManager()
-                                                    .startChain(sendJob)
-                                                    .then(new PaymentTransactionCheckJob(uuid, QUEUE))
-                                                    .then(new MultiDeviceOutgoingPaymentSyncJob(uuid));
+    JobManager.Chain chain = AppDependencies.getJobManager()
+                                            .startChain(sendJob)
+                                            .then(new PaymentTransactionCheckJob(uuid, QUEUE))
+                                            .then(new MultiDeviceOutgoingPaymentSyncJob(uuid));
 
     if (recipientId != null) {
       chain.then(PaymentNotificationSendJob.create(recipientId, uuid, recipientId.toQueueKey(true)));
@@ -128,14 +128,14 @@ protected void onRun() throws Exception {
       throw new NotPushRegisteredException();
     }
 
-    if (!SignalStore.paymentsValues().mobileCoinPaymentsEnabled()) {
+    if (!SignalStore.payments().mobileCoinPaymentsEnabled()) {
       Log.w(TAG, "Payments are not enabled");
       return;
     }
 
     Stopwatch stopwatch = new Stopwatch("Payment submission");
 
-    Wallet       wallet          = ApplicationDependencies.getPayments().getWallet();
+    Wallet       wallet          = AppDependencies.getPayments().getWallet();
     PaymentTable paymentDatabase = SignalDatabase.payments();
 
     paymentDatabase.createOutgoingPayment(uuid,
@@ -165,10 +165,10 @@ protected void onRun() throws Exception {
                                        mobileCoinTransaction.getFee(),
                                        mobileCoinTransaction.getTransaction(), mobileCoinTransaction.getReceipt());
           Log.i(TAG, "Defrag entered with id " + defragUuid);
-          ApplicationDependencies.getJobManager()
-                                 .startChain(new PaymentTransactionCheckJob(defragUuid, QUEUE))
-                                 .then(new MultiDeviceOutgoingPaymentSyncJob(defragUuid))
-                                 .enqueue();
+          AppDependencies.getJobManager()
+                         .startChain(new PaymentTransactionCheckJob(defragUuid, QUEUE))
+                         .then(new MultiDeviceOutgoingPaymentSyncJob(defragUuid))
+                         .enqueue();
         }
         stopwatch.split("Defrag");
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PaymentTransactionCheckJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PaymentTransactionCheckJob.java
index aee9be4f9f..2a6ef98378 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PaymentTransactionCheckJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PaymentTransactionCheckJob.java
@@ -6,7 +6,7 @@
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.PaymentTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.BackoffUtil;
@@ -15,7 +15,7 @@
 import org.thoughtcrime.securesms.payments.PaymentTransactionId;
 import org.thoughtcrime.securesms.payments.Payments;
 import org.thoughtcrime.securesms.payments.Wallet;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
 
 import java.io.IOException;
@@ -62,7 +62,7 @@ protected void onRun() throws Exception {
       return;
     }
 
-    Payments payments = ApplicationDependencies.getPayments();
+    Payments payments = AppDependencies.getPayments();
 
     switch (payment.getDirection()) {
       case SENT: {
@@ -118,7 +118,7 @@ protected void onRun() throws Exception {
   public long getNextRunAttemptBackoff(int pastAttemptCount, @NonNull Exception exception) {
     if (exception instanceof NonSuccessfulResponseCodeException) {
       if (((NonSuccessfulResponseCodeException) exception).is5xx()) {
-        return BackoffUtil.exponentialBackoff(pastAttemptCount, FeatureFlags.getServerErrorMaxBackoff());
+        return BackoffUtil.exponentialBackoff(pastAttemptCount, RemoteConfig.getServerErrorMaxBackoff());
       }
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PnpInitializeDevicesJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/PnpInitializeDevicesJob.kt
deleted file mode 100644
index 2c9f6b3d78..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PnpInitializeDevicesJob.kt
+++ /dev/null
@@ -1,237 +0,0 @@
-package org.thoughtcrime.securesms.jobs
-
-import androidx.annotation.WorkerThread
-import io.reactivex.rxjava3.core.Single
-import io.reactivex.rxjava3.schedulers.Schedulers
-import okio.ByteString.Companion.toByteString
-import org.signal.core.util.concurrent.safeBlockingGet
-import org.signal.core.util.logging.Log
-import org.signal.core.util.orNull
-import org.signal.libsignal.protocol.IdentityKeyPair
-import org.signal.libsignal.protocol.SignalProtocolAddress
-import org.signal.libsignal.protocol.state.KyberPreKeyRecord
-import org.signal.libsignal.protocol.state.SignalProtocolStore
-import org.signal.libsignal.protocol.state.SignedPreKeyRecord
-import org.signal.libsignal.protocol.util.KeyHelper
-import org.signal.libsignal.protocol.util.Medium
-import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberRepository
-import org.thoughtcrime.securesms.crypto.PreKeyUtil
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.jobmanager.Job
-import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.registration.VerifyResponse
-import org.thoughtcrime.securesms.registration.VerifyResponseWithoutKbs
-import org.thoughtcrime.securesms.util.TextSecurePreferences
-import org.whispersystems.signalservice.api.account.PniKeyDistributionRequest
-import org.whispersystems.signalservice.api.push.SignalServiceAddress
-import org.whispersystems.signalservice.api.push.SignedPreKeyEntity
-import org.whispersystems.signalservice.internal.ServiceResponse
-import org.whispersystems.signalservice.internal.push.KyberPreKeyEntity
-import org.whispersystems.signalservice.internal.push.OutgoingPushMessage
-import org.whispersystems.signalservice.internal.push.SyncMessage
-import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
-import org.whispersystems.signalservice.internal.push.exceptions.MismatchedDevicesException
-import java.io.IOException
-import java.security.SecureRandom
-
-/**
- * To be run when all clients support PNP and we need to initialize all linked devices with appropriate PNP data.
- *
- * We reuse the change number flow as it already support distributing the necessary data in a way linked devices can understand.
- */
-class PnpInitializeDevicesJob private constructor(parameters: Parameters) : BaseJob(parameters) {
-
-  companion object {
-    const val KEY = "PnpInitializeDevicesJob"
-    private val TAG = Log.tag(PnpInitializeDevicesJob::class.java)
-
-    @JvmStatic
-    fun enqueueIfNecessary() {
-      if (SignalStore.misc().hasPniInitializedDevices || !SignalStore.account().isRegistered || SignalStore.account().aci == null) {
-        return
-      }
-
-      ApplicationDependencies.getJobManager().add(PnpInitializeDevicesJob())
-    }
-  }
-
-  constructor() : this(Parameters.Builder().addConstraint(NetworkConstraint.KEY).build())
-
-  override fun serialize(): ByteArray? {
-    return null
-  }
-
-  override fun getFactoryKey(): String {
-    return KEY
-  }
-
-  override fun onFailure() = Unit
-
-  @Throws(Exception::class)
-  public override fun onRun() {
-    if (!SignalStore.account().isRegistered || SignalStore.account().aci == null) {
-      Log.w(TAG, "Not registered! Skipping, as it wouldn't do anything.")
-      return
-    }
-
-    if (!TextSecurePreferences.isMultiDevice(context)) {
-      Log.i(TAG, "Not multi device, aborting...")
-      SignalStore.misc().hasPniInitializedDevices = true
-      return
-    }
-
-    if (SignalStore.account().isLinkedDevice) {
-      Log.i(TAG, "Not primary device, aborting...")
-      SignalStore.misc().hasPniInitializedDevices = true
-      return
-    }
-
-    ChangeNumberRepository.CHANGE_NUMBER_LOCK.lock()
-    try {
-      if (SignalStore.misc().hasPniInitializedDevices) {
-        Log.w(TAG, "We found out that things have been initialized after we got the lock! No need to do anything else.")
-        return
-      }
-
-      val e164 = SignalStore.account().requireE164()
-
-      try {
-        Log.i(TAG, "Initializing PNI for linked devices")
-        val result: VerifyResponseWithoutKbs = initializeDevices(e164)
-          .map(::VerifyResponseWithoutKbs)
-          .safeBlockingGet()
-
-        result.error?.let { throw it }
-      } catch (e: InterruptedException) {
-        throw IOException("Retry", e)
-      } catch (t: Throwable) {
-        Log.w(TAG, "Unable to initialize PNI for linked devices", t)
-        throw t
-      }
-
-      SignalStore.misc().hasPniInitializedDevices = true
-    } finally {
-      ChangeNumberRepository.CHANGE_NUMBER_LOCK.unlock()
-    }
-  }
-
-  private fun initializeDevices(newE164: String): Single<ServiceResponse<VerifyResponse>> {
-    val accountManager = ApplicationDependencies.getSignalServiceAccountManager()
-    val messageSender = ApplicationDependencies.getSignalServiceMessageSender()
-
-    return Single.fromCallable {
-      var completed = false
-      var attempts = 0
-      lateinit var distributionResponse: ServiceResponse<VerifyAccountResponse>
-
-      while (!completed && attempts < 5) {
-        val request = createInitializeDevicesRequest(
-          newE164 = newE164
-        )
-
-        distributionResponse = accountManager.distributePniKeys(request)
-
-        val possibleError: Throwable? = distributionResponse.applicationError.orNull()
-        if (possibleError is MismatchedDevicesException) {
-          messageSender.handleChangeNumberMismatchDevices(possibleError.mismatchedDevices)
-          attempts++
-        } else {
-          completed = true
-        }
-      }
-
-      VerifyResponse.from(
-        response = distributionResponse,
-        masterKey = null,
-        pin = null,
-        aciPreKeyCollection = null,
-        pniPreKeyCollection = null
-      )
-    }.subscribeOn(Schedulers.single())
-      .onErrorReturn { t -> ServiceResponse.forExecutionError(t) }
-  }
-
-  @WorkerThread
-  private fun createInitializeDevicesRequest(
-    newE164: String
-  ): PniKeyDistributionRequest {
-    val selfIdentifier: String = SignalStore.account().requireAci().toString()
-    val aciProtocolStore: SignalProtocolStore = ApplicationDependencies.getProtocolStore().aci()
-    val pniProtocolStore: SignalProtocolStore = ApplicationDependencies.getProtocolStore().pni()
-    val messageSender = ApplicationDependencies.getSignalServiceMessageSender()
-
-    val pniIdentity: IdentityKeyPair = SignalStore.account().pniIdentityKey
-    val deviceMessages = mutableListOf<OutgoingPushMessage>()
-    val devicePniSignedPreKeys = mutableMapOf<Int, SignedPreKeyEntity>()
-    val devicePniLastResortKyberPreKeys = mutableMapOf<Int, KyberPreKeyEntity>()
-    val pniRegistrationIds = mutableMapOf<Int, Int>()
-    val primaryDeviceId: Int = SignalServiceAddress.DEFAULT_DEVICE_ID
-
-    val devices: List<Int> = listOf(primaryDeviceId) + aciProtocolStore.getSubDeviceSessions(selfIdentifier)
-
-    devices
-      .filter { it == primaryDeviceId || aciProtocolStore.containsSession(SignalProtocolAddress(selfIdentifier, it)) }
-      .forEach { deviceId ->
-        // Signed Prekeys
-        val signedPreKeyRecord: SignedPreKeyRecord = if (deviceId == primaryDeviceId) {
-          pniProtocolStore.loadSignedPreKey(SignalStore.account().pniPreKeys.activeSignedPreKeyId)
-        } else {
-          PreKeyUtil.generateSignedPreKey(SecureRandom().nextInt(Medium.MAX_VALUE), pniIdentity.privateKey)
-        }
-        devicePniSignedPreKeys[deviceId] = SignedPreKeyEntity(signedPreKeyRecord.id, signedPreKeyRecord.keyPair.publicKey, signedPreKeyRecord.signature)
-
-        // Last-resort kyber prekeys
-        val lastResortKyberPreKeyRecord: KyberPreKeyRecord = if (deviceId == primaryDeviceId) {
-          pniProtocolStore.loadKyberPreKey(SignalStore.account().pniPreKeys.lastResortKyberPreKeyId)
-        } else {
-          PreKeyUtil.generateLastResortKyberPreKey(SecureRandom().nextInt(Medium.MAX_VALUE), pniIdentity.privateKey)
-        }
-        devicePniLastResortKyberPreKeys[deviceId] = KyberPreKeyEntity(lastResortKyberPreKeyRecord.id, lastResortKyberPreKeyRecord.keyPair.publicKey, lastResortKyberPreKeyRecord.signature)
-
-        // Registration Ids
-        var pniRegistrationId = if (deviceId == primaryDeviceId) {
-          SignalStore.account().pniRegistrationId
-        } else {
-          -1
-        }
-
-        while (pniRegistrationId < 0 || pniRegistrationIds.values.contains(pniRegistrationId)) {
-          pniRegistrationId = KeyHelper.generateRegistrationId(false)
-        }
-        pniRegistrationIds[deviceId] = pniRegistrationId
-
-        // Device Messages
-        if (deviceId != primaryDeviceId) {
-          val pniChangeNumber = SyncMessage.PniChangeNumber(
-            identityKeyPair = pniIdentity.serialize().toByteString(),
-            signedPreKey = signedPreKeyRecord.serialize().toByteString(),
-            lastResortKyberPreKey = lastResortKyberPreKeyRecord.serialize().toByteString(),
-            registrationId = pniRegistrationId,
-            newE164 = newE164
-          )
-
-          deviceMessages += messageSender.getEncryptedSyncPniInitializeDeviceMessage(deviceId, pniChangeNumber)
-        }
-      }
-
-    return PniKeyDistributionRequest(
-      pniIdentity.publicKey,
-      deviceMessages,
-      devicePniSignedPreKeys.mapKeys { it.key.toString() },
-      devicePniLastResortKyberPreKeys.mapKeys { it.key.toString() },
-      pniRegistrationIds.mapKeys { it.key.toString() },
-      true
-    )
-  }
-
-  override fun onShouldRetry(e: Exception): Boolean {
-    return e is IOException
-  }
-
-  class Factory : Job.Factory<PnpInitializeDevicesJob?> {
-    override fun create(parameters: Parameters, serializedData: ByteArray?): PnpInitializeDevicesJob {
-      return PnpInitializeDevicesJob(parameters)
-    }
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJob.kt
index fb79eda0d5..251bfa37db 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJob.kt
@@ -9,12 +9,12 @@ import org.signal.libsignal.protocol.state.SignalProtocolStore
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord
 import org.thoughtcrime.securesms.crypto.PreKeyUtil
 import org.thoughtcrime.securesms.crypto.storage.PreKeyMetadataStore
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.jobs.protos.PreKeysSyncJobData
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.whispersystems.signalservice.api.NetworkResult
 import org.whispersystems.signalservice.api.SignalServiceAccountDataStore
 import org.whispersystems.signalservice.api.account.PreKeyUpload
@@ -72,26 +72,26 @@ class PreKeysSyncJob private constructor(
 
     @JvmStatic
     fun enqueue() {
-      ApplicationDependencies.getJobManager().add(create())
+      AppDependencies.jobManager.add(create())
     }
 
     @JvmStatic
     fun enqueueIfNeeded() {
-      if (!SignalStore.account().aciPreKeys.isSignedPreKeyRegistered || !SignalStore.account().pniPreKeys.isSignedPreKeyRegistered) {
-        Log.i(TAG, "Some signed/last-resort prekeys aren't registered yet. Enqueuing a job. ACI: ${SignalStore.account().aciPreKeys.isSignedPreKeyRegistered} PNI: ${SignalStore.account().pniPreKeys.isSignedPreKeyRegistered}")
-        ApplicationDependencies.getJobManager().add(PreKeysSyncJob())
-      } else if (SignalStore.account().aciPreKeys.activeSignedPreKeyId < 0 || SignalStore.account().pniPreKeys.activeSignedPreKeyId < 0) {
-        Log.i(TAG, "Some signed prekeys aren't active yet. Enqueuing a job. ACI: ${SignalStore.account().aciPreKeys.activeSignedPreKeyId >= 0} PNI: ${SignalStore.account().pniPreKeys.activeSignedPreKeyId >= 0}")
-        ApplicationDependencies.getJobManager().add(PreKeysSyncJob())
-      } else if (SignalStore.account().aciPreKeys.lastResortKyberPreKeyId < 0 || SignalStore.account().pniPreKeys.lastResortKyberPreKeyId < 0) {
-        Log.i(TAG, "Some last-resort kyber prekeys aren't active yet. Enqueuing a job. ACI: ${SignalStore.account().aciPreKeys.lastResortKyberPreKeyId >= 0} PNI: ${SignalStore.account().pniPreKeys.lastResortKyberPreKeyId >= 0}")
-        ApplicationDependencies.getJobManager().add(PreKeysSyncJob())
+      if (!SignalStore.account.aciPreKeys.isSignedPreKeyRegistered || !SignalStore.account.pniPreKeys.isSignedPreKeyRegistered) {
+        Log.i(TAG, "Some signed/last-resort prekeys aren't registered yet. Enqueuing a job. ACI: ${SignalStore.account.aciPreKeys.isSignedPreKeyRegistered} PNI: ${SignalStore.account.pniPreKeys.isSignedPreKeyRegistered}")
+        AppDependencies.jobManager.add(PreKeysSyncJob())
+      } else if (SignalStore.account.aciPreKeys.activeSignedPreKeyId < 0 || SignalStore.account.pniPreKeys.activeSignedPreKeyId < 0) {
+        Log.i(TAG, "Some signed prekeys aren't active yet. Enqueuing a job. ACI: ${SignalStore.account.aciPreKeys.activeSignedPreKeyId >= 0} PNI: ${SignalStore.account.pniPreKeys.activeSignedPreKeyId >= 0}")
+        AppDependencies.jobManager.add(PreKeysSyncJob())
+      } else if (SignalStore.account.aciPreKeys.lastResortKyberPreKeyId < 0 || SignalStore.account.pniPreKeys.lastResortKyberPreKeyId < 0) {
+        Log.i(TAG, "Some last-resort kyber prekeys aren't active yet. Enqueuing a job. ACI: ${SignalStore.account.aciPreKeys.lastResortKyberPreKeyId >= 0} PNI: ${SignalStore.account.pniPreKeys.lastResortKyberPreKeyId >= 0}")
+        AppDependencies.jobManager.add(PreKeysSyncJob())
       } else {
-        val timeSinceLastFullRefresh = System.currentTimeMillis() - SignalStore.misc().lastFullPrekeyRefreshTime
+        val timeSinceLastFullRefresh = System.currentTimeMillis() - SignalStore.misc.lastFullPrekeyRefreshTime
 
         if (timeSinceLastFullRefresh >= REFRESH_INTERVAL || timeSinceLastFullRefresh < 0) {
           Log.i(TAG, "Scheduling a prekey refresh. Time since last full refresh: $timeSinceLastFullRefresh ms")
-          ApplicationDependencies.getJobManager().add(PreKeysSyncJob())
+          AppDependencies.jobManager.add(PreKeysSyncJob())
         } else {
           Log.d(TAG, "No prekey job needed. Time since last full refresh: $timeSinceLastFullRefresh ms")
         }
@@ -118,27 +118,27 @@ class PreKeysSyncJob private constructor(
   }
 
   override fun onRun() {
-    if (!SignalStore.account().isRegistered || SignalStore.account().aci == null || SignalStore.account().pni == null) {
+    if (!SignalStore.account.isRegistered || SignalStore.account.aci == null || SignalStore.account.pni == null) {
       warn(TAG, "Not yet registered")
       return
     }
 
     val forceRotation = if (forceRotationRequested) {
       warn(TAG, "Forced rotation was requested.")
-      warn(TAG, ServiceIdType.ACI, "Active Signed EC: ${SignalStore.account().aciPreKeys.activeSignedPreKeyId}, Last Resort Kyber: ${SignalStore.account().aciPreKeys.lastResortKyberPreKeyId}")
-      warn(TAG, ServiceIdType.PNI, "Active Signed EC: ${SignalStore.account().pniPreKeys.activeSignedPreKeyId}, Last Resort Kyber: ${SignalStore.account().pniPreKeys.lastResortKyberPreKeyId}")
+      warn(TAG, ServiceIdType.ACI, "Active Signed EC: ${SignalStore.account.aciPreKeys.activeSignedPreKeyId}, Last Resort Kyber: ${SignalStore.account.aciPreKeys.lastResortKyberPreKeyId}")
+      warn(TAG, ServiceIdType.PNI, "Active Signed EC: ${SignalStore.account.pniPreKeys.activeSignedPreKeyId}, Last Resort Kyber: ${SignalStore.account.pniPreKeys.lastResortKyberPreKeyId}")
 
-      if (!checkPreKeyConsistency(ServiceIdType.ACI, ApplicationDependencies.getProtocolStore().aci(), SignalStore.account().aciPreKeys)) {
+      if (!checkPreKeyConsistency(ServiceIdType.ACI, AppDependencies.protocolStore.aci(), SignalStore.account.aciPreKeys)) {
         warn(TAG, ServiceIdType.ACI, "Prekey consistency check failed! Must rotate keys!")
         true
-      } else if (!checkPreKeyConsistency(ServiceIdType.PNI, ApplicationDependencies.getProtocolStore().pni(), SignalStore.account().pniPreKeys)) {
+      } else if (!checkPreKeyConsistency(ServiceIdType.PNI, AppDependencies.protocolStore.pni(), SignalStore.account.pniPreKeys)) {
         warn(TAG, ServiceIdType.PNI, "Prekey consistency check failed! Must rotate keys! (ACI consistency check must have passed)")
         true
       } else {
         warn(TAG, "Forced rotation was requested, but the consistency checks passed!")
-        val timeSinceLastForcedRotation = System.currentTimeMillis() - SignalStore.misc().lastForcedPreKeyRefresh
+        val timeSinceLastForcedRotation = System.currentTimeMillis() - SignalStore.misc.lastForcedPreKeyRefresh
         // We check < 0 in case someone changed their clock and had a bad value set
-        timeSinceLastForcedRotation > FeatureFlags.preKeyForceRefreshInterval() || timeSinceLastForcedRotation < 0
+        timeSinceLastForcedRotation > RemoteConfig.preKeyForceRefreshInterval || timeSinceLastForcedRotation < 0
       }
     } else {
       false
@@ -147,15 +147,15 @@ class PreKeysSyncJob private constructor(
     if (forceRotation) {
       warn(TAG, "Forcing prekey rotation.")
     } else if (forceRotationRequested) {
-      warn(TAG, "Forced prekey rotation was requested, but we already did a forced refresh ${System.currentTimeMillis() - SignalStore.misc().lastForcedPreKeyRefresh} ms ago. Ignoring.")
+      warn(TAG, "Forced prekey rotation was requested, but we already did a forced refresh ${System.currentTimeMillis() - SignalStore.misc.lastForcedPreKeyRefresh} ms ago. Ignoring.")
     }
 
-    syncPreKeys(ServiceIdType.ACI, SignalStore.account().aci, ApplicationDependencies.getProtocolStore().aci(), SignalStore.account().aciPreKeys, forceRotation)
-    syncPreKeys(ServiceIdType.PNI, SignalStore.account().pni, ApplicationDependencies.getProtocolStore().pni(), SignalStore.account().pniPreKeys, forceRotation)
-    SignalStore.misc().lastFullPrekeyRefreshTime = System.currentTimeMillis()
+    syncPreKeys(ServiceIdType.ACI, SignalStore.account.aci, AppDependencies.protocolStore.aci(), SignalStore.account.aciPreKeys, forceRotation)
+    syncPreKeys(ServiceIdType.PNI, SignalStore.account.pni, AppDependencies.protocolStore.pni(), SignalStore.account.pniPreKeys, forceRotation)
+    SignalStore.misc.lastFullPrekeyRefreshTime = System.currentTimeMillis()
 
     if (forceRotation) {
-      SignalStore.misc().lastForcedPreKeyRefresh = System.currentTimeMillis()
+      SignalStore.misc.lastForcedPreKeyRefresh = System.currentTimeMillis()
     }
   }
 
@@ -165,7 +165,7 @@ class PreKeysSyncJob private constructor(
       return
     }
 
-    val accountManager = ApplicationDependencies.getSignalServiceAccountManager()
+    val accountManager = AppDependencies.signalServiceAccountManager
     val availablePreKeyCounts: OneTimePreKeyCounts = accountManager.getPreKeyCounts(serviceIdType)
 
     val signedPreKeyToUpload: SignedPreKeyRecord? = signedPreKeyUploadIfNeeded(serviceIdType, protocolStore, metadataStore, forceRotation)
@@ -258,7 +258,7 @@ class PreKeysSyncJob private constructor(
 
   @Throws(IOException::class)
   private fun checkPreKeyConsistency(serviceIdType: ServiceIdType, protocolStore: SignalServiceAccountDataStore, metadataStore: PreKeyMetadataStore): Boolean {
-    val result: NetworkResult<Unit> = ApplicationDependencies.getSignalServiceAccountManager().keysApi.checkRepeatedUseKeys(
+    val result: NetworkResult<Unit> = AppDependencies.signalServiceAccountManager.keysApi.checkRepeatedUseKeys(
       serviceIdType = serviceIdType,
       identityKey = protocolStore.identityKeyPair.publicKey,
       signedPreKeyId = metadataStore.activeSignedPreKeyId,
@@ -289,7 +289,7 @@ class PreKeysSyncJob private constructor(
 
   override fun onFailure() {
     Log.w(TAG, "Failed to sync prekeys. Enqueuing an account consistency check.")
-    ApplicationDependencies.getJobManager().add(AccountConsistencyWorkerJob())
+    AppDependencies.jobManager.add(AccountConsistencyWorkerJob())
   }
 
   private fun log(serviceIdType: ServiceIdType, message: String) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
index c478c57489..f6981d9970 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
@@ -25,7 +25,7 @@
 import org.thoughtcrime.securesms.database.model.GroupRecord;
 import org.thoughtcrime.securesms.database.model.MessageId;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobLogger;
@@ -124,7 +124,7 @@ public static void enqueue(@NonNull Context context,
         if (!filterAddresses.isEmpty()) {
           throw new MmsException("Cannot schedule a group message with filter addresses!");
         }
-        ApplicationDependencies.getScheduledMessageManager().scheduleIfNecessary();
+        AppDependencies.getScheduledMessageManager().scheduleIfNecessary();
         return;
       }
 
@@ -188,7 +188,7 @@ public void onPushSend()
 
     SignalLocalMetrics.GroupMessageSend.setSentTimestamp(messageId, message.getSentTimeMillis());
 
-    ApplicationDependencies.getJobManager().cancelAllInQueue(TypingSendJob.getQueue(threadId));
+    AppDependencies.getJobManager().cancelAllInQueue(TypingSendJob.getQueue(threadId));
 
     if (database.isSent(messageId)) {
       log(TAG, String.valueOf(message.getSentTimeMillis()), "Message " + messageId + " was already sent. Ignoring.");
@@ -470,8 +470,8 @@ static void processGroupMessageResults(@NonNull Context context,
 
       if (message.getExpiresIn() > 0 && !message.isExpirationUpdate()) {
         database.markExpireStarted(messageId);
-        ApplicationDependencies.getExpiringMessageManager()
-                               .scheduleDeletion(messageId, true, message.getExpiresIn());
+        AppDependencies.getExpiringMessageManager()
+                       .scheduleDeletion(messageId, true, message.getExpiresIn());
       }
 
       if (message.isViewOnce()) {
@@ -479,7 +479,7 @@ static void processGroupMessageResults(@NonNull Context context,
       }
 
       if (message.getStoryType().isStory()) {
-        ApplicationDependencies.getExpireStoriesManager().scheduleIfNecessary();
+        AppDependencies.getExpireStoriesManager().scheduleIfNecessary();
       }
     } else if (!existingIdentityMismatches.isEmpty()) {
       Log.w(TAG, "Failing because there were " + existingIdentityMismatches.size() + " identity mismatches.");
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessEarlyMessagesJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessEarlyMessagesJob.kt
index 536ea23288..4a0a40b302 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessEarlyMessagesJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessEarlyMessagesJob.kt
@@ -4,7 +4,7 @@ import org.signal.core.util.logging.Log
 import org.signal.core.util.orNull
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.ServiceMessageId
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.messages.MessageContentProcessor
 import org.thoughtcrime.securesms.util.EarlyMessageCacheEntry
@@ -33,7 +33,7 @@ class PushProcessEarlyMessagesJob private constructor(parameters: Parameters) :
   }
 
   override fun onRun() {
-    val earlyIds: List<ServiceMessageId> = ApplicationDependencies.getEarlyMessageCache().allReferencedIds
+    val earlyIds: List<ServiceMessageId> = AppDependencies.earlyMessageCache.allReferencedIds
       .filter { SignalDatabase.messages.getMessageFor(it.sentTimestamp, it.sender) != null }
       .sortedBy { it.sentTimestamp }
 
@@ -41,7 +41,7 @@ class PushProcessEarlyMessagesJob private constructor(parameters: Parameters) :
       Log.i(TAG, "There are ${earlyIds.size} items in the early message cache with matches.")
 
       for (id: ServiceMessageId in earlyIds) {
-        val earlyEntries: List<EarlyMessageCacheEntry>? = ApplicationDependencies.getEarlyMessageCache().retrieve(id.sender, id.sentTimestamp).orNull()
+        val earlyEntries: List<EarlyMessageCacheEntry>? = AppDependencies.earlyMessageCache.retrieve(id.sender, id.sentTimestamp).orNull()
 
         if (earlyEntries != null) {
           for (entry in earlyEntries) {
@@ -80,7 +80,7 @@ class PushProcessEarlyMessagesJob private constructor(parameters: Parameters) :
      */
     @JvmStatic
     fun enqueue() {
-      val jobManger = ApplicationDependencies.getJobManager()
+      val jobManger = AppDependencies.jobManager
 
       val youngestProcessJobId: String? = jobManger.find { it.factoryKey == PushProcessMessageJob.KEY }
         .maxByOrNull { it.createTime }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageErrorJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageErrorJob.kt
index 200bc63ecc..1a6ae7d416 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageErrorJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageErrorJob.kt
@@ -8,7 +8,7 @@ package org.thoughtcrime.securesms.jobs
 import android.content.Context
 import androidx.annotation.WorkerThread
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.JsonJobData
@@ -92,7 +92,7 @@ class PushProcessMessageErrorJob private constructor(
 
     @WorkerThread
     private fun createParameters(exceptionMetadata: ExceptionMetadata): Parameters {
-      val context: Context = ApplicationDependencies.getApplication()
+      val context: Context = AppDependencies.application
 
       val recipient = exceptionMetadata.groupId?.let { Recipient.externalPossiblyMigratedGroup(it) } ?: Recipient.external(context, exceptionMetadata.sender)
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.kt
index d172d5082b..7acf736236 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.kt
@@ -4,7 +4,7 @@ import okio.ByteString
 import okio.ByteString.Companion.toByteString
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.database.SignalDatabase.Companion.groups
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupChangeBusyException
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.ChangeNumberConstraint
@@ -156,7 +156,7 @@ class PushProcessMessageJob private constructor(
       if (!isGroup && empty1to1QueueCache.contains(queueName)) {
         return true
       }
-      val queueEmpty = ApplicationDependencies.getJobManager().isQueueEmpty(queueName)
+      val queueEmpty = AppDependencies.jobManager.isQueueEmpty(queueName)
       if (!isGroup && queueEmpty) {
         empty1to1QueueCache.add(queueName)
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
index 4ab7e6dba1..ec3c0b59e6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
@@ -40,7 +40,7 @@
 import org.thoughtcrime.securesms.database.model.StickerRecord;
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList;
 import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.events.PartProgressEvent;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
@@ -62,7 +62,7 @@
 import org.thoughtcrime.securesms.transport.UndeliverableMessageException;
 import org.signal.core.util.Base64;
 import org.thoughtcrime.securesms.util.BitmapDecodingException;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.ImageCompressionUtil;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.Util;
@@ -89,6 +89,7 @@
 import java.util.Locale;
 import java.util.Optional;
 import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -115,7 +116,7 @@ protected final void onSend() throws Exception {
     ) {
       warn(TAG, "It's been too long since rotating our signed prekeys (ACI: " + timeSinceAciSignedPreKeyRotation + " ms, PNI: " + timeSincePniSignedPreKeyRotation + " ms)! Attempting to rotate now.");
 
-      Optional<JobTracker.JobState> state = ApplicationDependencies.getJobManager().runSynchronously(PreKeysSyncJob.create(), TimeUnit.SECONDS.toMillis(30));
+      Optional<JobTracker.JobState> state = AppDependencies.getJobManager().runSynchronously(PreKeysSyncJob.create(), TimeUnit.SECONDS.toMillis(30));
 
       if (state.isPresent() && state.get() == JobTracker.JobState.SUCCESS) {
         log(TAG, "Successfully refreshed prekeys. Continuing.");
@@ -142,7 +143,7 @@ public void onRetry() {
 
     if (getRunAttempt() > 1) {
       Log.i(TAG, "Scheduling service outage detection job.");
-      ApplicationDependencies.getJobManager().add(new ServiceOutageDetectionJob());
+      AppDependencies.getJobManager().add(new ServiceOutageDetectionJob());
     }
   }
 
@@ -176,7 +177,7 @@ public long getNextRunAttemptBackoff(int pastAttemptCount, @NonNull Exception ex
       }
     } else if (exception instanceof NonSuccessfulResponseCodeException) {
       if (((NonSuccessfulResponseCodeException) exception).is5xx()) {
-        return BackoffUtil.exponentialBackoff(pastAttemptCount, FeatureFlags.getServerErrorMaxBackoff());
+        return BackoffUtil.exponentialBackoff(pastAttemptCount, RemoteConfig.getServerErrorMaxBackoff());
       }
     } else if (exception instanceof RetryLaterException) {
       long backoff = ((RetryLaterException) exception).getBackoff();
@@ -212,6 +213,7 @@ protected SignalServiceAttachment getAttachmentFor(Attachment attachment) {
                                     .withWidth(attachment.width)
                                     .withHeight(attachment.height)
                                     .withCaption(attachment.caption)
+                                    .withUuid(attachment.uuid)
                                     .withListener(new SignalServiceAttachment.ProgressListener() {
                                       @Override
                                       public void onAttachmentProgress(long total, long progress) {
@@ -306,7 +308,8 @@ protected static Set<String> enqueueCompressingAndUploadAttachmentsChains(@NonNu
                                                 attachment.videoGif,
                                                 Optional.ofNullable(attachment.caption),
                                                 Optional.ofNullable(attachment.blurHash).map(BlurHash::getHash),
-                                                attachment.uploadTimestamp);
+                                                attachment.uploadTimestamp,
+                                                attachment.uuid);
     } catch (IOException | ArithmeticException e) {
       Log.w(TAG, e);
       return null;
@@ -331,9 +334,9 @@ protected static void notifyMediaMessageDeliveryFailed(Context context, long mes
     if (threadId != -1 && recipient != null) {
       if (isStory) {
         SignalDatabase.messages().markAsNotNotified(messageId);
-        ApplicationDependencies.getMessageNotifier().notifyStoryDeliveryFailed(context, recipient, ConversationId.forConversation(threadId));
+        AppDependencies.getMessageNotifier().notifyStoryDeliveryFailed(context, recipient, ConversationId.forConversation(threadId));
       } else {
-        ApplicationDependencies.getMessageNotifier().notifyMessageDeliveryFailed(context, recipient, ConversationId.fromThreadAndReply(threadId, groupReplyStoryId));
+        AppDependencies.getMessageNotifier().notifyMessageDeliveryFailed(context, recipient, ConversationId.fromThreadAndReply(threadId, groupReplyStoryId));
       }
     }
   }
@@ -381,7 +384,8 @@ protected Optional<SignalServiceDataMessage.Quote> getQuoteFor(OutgoingMessage m
                                                                            .withHeight(thumbnailData.getHeight())
                                                                            .withLength(thumbnailData.getData().length)
                                                                            .withStream(new ByteArrayInputStream(thumbnailData.getData()))
-                                                                           .withResumableUploadSpec(ApplicationDependencies.getSignalServiceMessageSender().getResumableUploadSpec());
+                                                                           .withResumableUploadSpec(AppDependencies.getSignalServiceMessageSender().getResumableUploadSpec())
+                                                                           .withUuid(UUID.randomUUID());
 
           thumbnail = builder.build();
         }
@@ -542,7 +546,7 @@ protected void rotateSenderCertificateIfNecessary() throws IOException {
 
       for (CertificateType certificateType : requiredCertificateTypes) {
 
-        byte[] certificateBytes = SignalStore.certificateValues()
+        byte[] certificateBytes = SignalStore.certificate()
                                              .getUnidentifiedAccessCertificate(certificateType);
 
         if (certificateBytes == null) {
@@ -560,7 +564,7 @@ protected void rotateSenderCertificateIfNecessary() throws IOException {
       Log.d(TAG, "All certificates are valid.");
     } catch (InvalidCertificateException e) {
       Log.w(TAG, "A certificate was invalid at send time. Fetching new ones.", e);
-      if (!ApplicationDependencies.getJobManager().runSynchronously(new RotateCertificateJob(), 5000).isPresent()) {
+      if (!AppDependencies.getJobManager().runSynchronously(new RotateCertificateJob(), 5000).isPresent()) {
         throw new IOException("Timeout rotating certificate");
       }
     }
@@ -573,7 +577,7 @@ protected static void handleProofRequiredException(@NonNull Context context, @No
 
     try {
       if (proofRequired.getOptions().contains(ProofRequiredException.Option.PUSH_CHALLENGE)) {
-        ApplicationDependencies.getSignalServiceAccountManager().requestRateLimitPushChallenge();
+        AppDependencies.getSignalServiceAccountManager().requestRateLimitPushChallenge();
         Log.i(TAG, "[Proof Required] Successfully requested a challenge. Waiting up to " + PUSH_CHALLENGE_TIMEOUT + " ms.");
 
         boolean success = new PushChallengeRequest(PUSH_CHALLENGE_TIMEOUT).blockUntilSuccess();
@@ -599,18 +603,13 @@ protected static void handleProofRequiredException(@NonNull Context context, @No
       SignalDatabase.messages().markAsRateLimited(messageId);
     }
 
-    final Optional<ProofRequiredException.Option> captchaRequired =
-        proofRequired.getOptions().stream()
-                     .filter(option -> option.equals(ProofRequiredException.Option.RECAPTCHA) || option.equals(ProofRequiredException.Option.CAPTCHA))
-                     .findFirst();
-
-    if (captchaRequired.isPresent()) {
-      Log.i(TAG, "[Proof Required] " + captchaRequired.get() + " required.");
+    if (proofRequired.getOptions().contains(ProofRequiredException.Option.CAPTCHA)) {
+      Log.i(TAG, "[Proof Required] CAPTCHA required.");
       SignalStore.rateLimit().markNeedsRecaptcha(proofRequired.getToken());
 
       if (recipient != null) {
         ParentStoryId.GroupReply groupReply = SignalDatabase.messages().getParentStoryIdForGroupReply(messageId);
-        ApplicationDependencies.getMessageNotifier().notifyProofRequired(context, recipient, ConversationId.fromThreadAndReply(threadId, groupReply));
+        AppDependencies.getMessageNotifier().notifyProofRequired(context, recipient, ConversationId.fromThreadAndReply(threadId, groupReply));
       } else {
         Log.w(TAG, "[Proof Required] No recipient! Couldn't notify.");
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ReactionSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ReactionSendJob.java
index 2a8b54d3f1..118877d6e0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ReactionSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ReactionSendJob.java
@@ -13,7 +13,7 @@
 import org.thoughtcrime.securesms.database.model.MessageId;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.ReactionRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
@@ -142,7 +142,7 @@ protected void onRun() throws Exception {
     Recipient targetAuthor        = message.getFromRecipient();
     long      targetSentTimestamp = message.getDateSent();
 
-    if (targetAuthor.getId().equals(SignalStore.releaseChannelValues().getReleaseChannelRecipientId())) {
+    if (targetAuthor.getId().equals(SignalStore.releaseChannel().getReleaseChannelRecipientId())) {
       return;
     }
 
@@ -240,7 +240,7 @@ public void onFailure() {
                                                                                            null);
 
     if (includesSelf) {
-      results.add(ApplicationDependencies.getSignalServiceMessageSender().sendSyncMessage(dataMessage));
+      results.add(AppDependencies.getSignalServiceMessageSender().sendSyncMessage(dataMessage));
     }
 
     GroupSendJobHelper.SendResult groupResult = GroupSendJobHelper.getCompletedSends(destinations, results);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RebuildMessageSearchIndexJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/RebuildMessageSearchIndexJob.kt
index f393801670..3b03a7483e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RebuildMessageSearchIndexJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RebuildMessageSearchIndexJob.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs
 
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.DataRestoreConstraint
 import org.thoughtcrime.securesms.transport.RetryLaterException
@@ -18,7 +18,7 @@ class RebuildMessageSearchIndexJob private constructor(params: Parameters) : Bas
     const val KEY = "RebuildMessageSearchIndexJob"
 
     fun enqueue() {
-      ApplicationDependencies.getJobManager().add(RebuildMessageSearchIndexJob())
+      AppDependencies.jobManager.add(RebuildMessageSearchIndexJob())
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ReclaimUsernameAndLinkJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/ReclaimUsernameAndLinkJob.kt
index b9d02a3f2a..c93638a49a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ReclaimUsernameAndLinkJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ReclaimUsernameAndLinkJob.kt
@@ -9,7 +9,7 @@ import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.BackoffUtil
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.profiles.manage.UsernameRepository
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import kotlin.time.Duration.Companion.days
 
 /**
@@ -48,7 +48,7 @@ class ReclaimUsernameAndLinkJob private constructor(parameters: Parameters) : Jo
     return when (UsernameRepository.reclaimUsernameIfNecessary()) {
       UsernameRepository.UsernameReclaimResult.SUCCESS -> Result.success()
       UsernameRepository.UsernameReclaimResult.PERMANENT_ERROR -> Result.success()
-      UsernameRepository.UsernameReclaimResult.NETWORK_ERROR -> Result.retry(BackoffUtil.exponentialBackoff(runAttempt + 1, FeatureFlags.getDefaultMaxBackoff()))
+      UsernameRepository.UsernameReclaimResult.NETWORK_ERROR -> Result.retry(BackoffUtil.exponentialBackoff(runAttempt + 1, RemoteConfig.defaultMaxBackoff))
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
index 6f29347c66..2643fe124f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
@@ -8,11 +8,10 @@
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.AppCapabilities;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
-import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues;
 import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode;
 import org.thoughtcrime.securesms.keyvalue.SvrValues;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -87,12 +86,12 @@ public void onRun() throws IOException {
     }
 
     int       registrationId              = SignalStore.account().getRegistrationId();
-    boolean   fetchesMessages             = !SignalStore.account().isFcmEnabled() || SignalStore.internalValues().isWebsocketModeForced();
+    boolean   fetchesMessages             = !SignalStore.account().isFcmEnabled() || SignalStore.internal().isWebsocketModeForced();
     byte[]    unidentifiedAccessKey       = UnidentifiedAccess.deriveAccessKeyFrom(ProfileKeyUtil.getSelfProfileKey());
     boolean   universalUnidentifiedAccess = TextSecurePreferences.isUniversalUnidentifiedAccess(context);
     String    registrationLockV2          = null;
     SvrValues svrValues                   = SignalStore.svr();
-    int       pniRegistrationId           = new RegistrationRepository(ApplicationDependencies.getApplication()).getPniRegistrationId();
+    int       pniRegistrationId           = new RegistrationRepository(AppDependencies.getApplication()).getPniRegistrationId();
     String    recoveryPassword            = svrValues.getRecoveryPassword();
 
     if (svrValues.isRegistrationLockEnabled()) {
@@ -125,7 +124,7 @@ public void onRun() throws IOException {
         recoveryPassword
     );
 
-    ApplicationDependencies.getSignalServiceAccountManager().setAccountAttributes(accountAttributes);
+    AppDependencies.getSignalServiceAccountManager().setAccountAttributes(accountAttributes);
 
     hasRefreshedThisAppCycle = true;
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshCallLinkDetailsJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshCallLinkDetailsJob.kt
index 49589ef120..d0dc447ceb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshCallLinkDetailsJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshCallLinkDetailsJob.kt
@@ -7,7 +7,7 @@ package org.thoughtcrime.securesms.jobs
 
 import org.signal.core.util.concurrent.safeBlockingGet
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkCredentials
@@ -45,7 +45,7 @@ class RefreshCallLinkDetailsJob private constructor(
   override fun onFailure() = Unit
 
   override fun onRun() {
-    val manager: SignalCallLinkManager = ApplicationDependencies.getSignalCallManager().callLinkManager
+    val manager: SignalCallLinkManager = AppDependencies.signalCallManager.callLinkManager
     val credentials = CallLinkCredentials(
       linkKeyBytes = callLinkUpdate.rootKey!!.toByteArray(),
       adminPassBytes = callLinkUpdate.adminPassKey?.toByteArray()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java
index 1df7fb75a4..f264d1ef4a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob.java
@@ -14,16 +14,13 @@
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
 import org.thoughtcrime.securesms.database.RecipientTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
-import org.thoughtcrime.securesms.keyvalue.AccountValues;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.profiles.ProfileName;
 import org.thoughtcrime.securesms.profiles.manage.UsernameRepository;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.storage.StorageSyncHelper;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.ProfileUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
@@ -32,15 +29,11 @@
 import org.whispersystems.signalservice.api.profiles.ProfileAndCredential;
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
 import org.whispersystems.signalservice.api.push.UsernameLinkComponents;
-import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
 import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
 import org.whispersystems.signalservice.api.util.ExpiringProfileCredentialUtil;
-import org.whispersystems.signalservice.internal.push.ReserveUsernameResponse;
 import org.whispersystems.signalservice.internal.push.WhoAmIResponse;
 
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.Objects;
 
 
@@ -94,7 +87,7 @@ protected void onRun() throws Exception {
       return;
     }
 
-    if (!SignalStore.registrationValues().hasUploadedProfile() && SignalStore.account().isPrimaryDevice()) {
+    if (!SignalStore.registration().hasUploadedProfile() && SignalStore.account().isPrimaryDevice()) {
       Log.i(TAG, "Registered but haven't uploaded profile yet.");
       return;
     }
@@ -103,8 +96,6 @@ protected void onRun() throws Exception {
     ProfileAndCredential profileAndCredential = ProfileUtil.retrieveProfileSync(context, self, getRequestType(self), false);
     SignalServiceProfile profile              = profileAndCredential.getProfile();
 
-    SignalStore.registrationValues().clearNeedDownloadProfile();
-
     if (Util.isEmpty(profile.getName()) &&
         Util.isEmpty(profile.getAvatar()) &&
         Util.isEmpty(profile.getAbout()) &&
@@ -114,12 +105,11 @@ protected void onRun() throws Exception {
 
       if (!self.getProfileName().isEmpty()) {
         Log.w(TAG, "We have a name locally. Scheduling a profile upload.");
-        ApplicationDependencies.getJobManager().add(new ProfileUploadJob());
+        AppDependencies.getJobManager().add(new ProfileUploadJob());
       } else {
         Log.w(TAG, "We don't have a name locally, either!");
       }
 
-      SignalStore.registrationValues().clearNeedDownloadProfileAvatar();
       return;
     }
 
@@ -194,7 +184,7 @@ private void setProfileAbout(@Nullable String encryptedAbout, @Nullable String e
 
   private static void setProfileAvatar(@Nullable String avatar) {
     Log.d(TAG, "Saving " + (!Util.isEmpty(avatar) ? "non-" : "") + "empty avatar.");
-    ApplicationDependencies.getJobManager().add(new RetrieveProfileAvatarJob(Recipient.self(), avatar));
+    AppDependencies.getJobManager().add(new RetrieveProfileAvatarJob(Recipient.self(), avatar));
   }
 
   private void setProfileCapabilities(@Nullable SignalServiceProfile.Capabilities capabilities) {
@@ -202,19 +192,24 @@ private void setProfileCapabilities(@Nullable SignalServiceProfile.Capabilities
       return;
     }
 
+    if (!Recipient.self().getDeleteSyncCapability().isSupported() && capabilities.isDeleteSync()) {
+      Log.d(TAG, "Transitioned to delete sync capable, notify linked devices in case we were the last one");
+      AppDependencies.getJobManager().add(new MultiDeviceProfileContentUpdateJob());
+    }
+
     SignalDatabase.recipients().setCapabilities(Recipient.self().getId(), capabilities);
   }
 
   private void ensureUnidentifiedAccessCorrect(@Nullable String unidentifiedAccessVerifier, boolean universalUnidentifiedAccess) {
     if (unidentifiedAccessVerifier == null) {
       Log.w(TAG, "No unidentified access is set remotely! Refreshing attributes.");
-      ApplicationDependencies.getJobManager().add(new RefreshAttributesJob());
+      AppDependencies.getJobManager().add(new RefreshAttributesJob());
       return;
     }
 
     if (TextSecurePreferences.isUniversalUnidentifiedAccess(context) != universalUnidentifiedAccess) {
       Log.w(TAG, "The universal access flag doesn't match our local value (local: " + TextSecurePreferences.isUniversalUnidentifiedAccess(context) + ", remote: " + universalUnidentifiedAccess + ")! Refreshing attributes.");
-      ApplicationDependencies.getJobManager().add(new RefreshAttributesJob());
+      AppDependencies.getJobManager().add(new RefreshAttributesJob());
       return;
     }
 
@@ -231,7 +226,7 @@ private void ensureUnidentifiedAccessCorrect(@Nullable String unidentifiedAccess
 
     if (!verified) {
       Log.w(TAG, "Unidentified access failed to verify! Refreshing attributes.");
-      ApplicationDependencies.getJobManager().add(new RefreshAttributesJob());
+      AppDependencies.getJobManager().add(new RefreshAttributesJob());
     }
   }
 
@@ -268,10 +263,10 @@ private void ensurePhoneNumberSharingIsCorrect(@Nullable String phoneNumberShari
   }
 
   private void syncWithStorageServiceThenUploadProfile() {
-    ApplicationDependencies.getJobManager()
-                           .startChain(new StorageSyncJob())
-                           .then(new ProfileUploadJob())
-                           .enqueue();
+    AppDependencies.getJobManager()
+                   .startChain(new StorageSyncJob())
+                   .then(new ProfileUploadJob())
+                   .enqueue();
   }
 
   private static void checkUsernameIsInSync() {
@@ -280,7 +275,7 @@ private static void checkUsernameIsInSync() {
     try {
       String localUsername = SignalStore.account().getUsername();
 
-      WhoAmIResponse whoAmIResponse     = ApplicationDependencies.getSignalServiceAccountManager().getWhoAmI();
+      WhoAmIResponse whoAmIResponse     = AppDependencies.getSignalServiceAccountManager().getWhoAmI();
       String         remoteUsernameHash = whoAmIResponse.getUsernameHash();
       String         localUsernameHash  = localUsername != null ? Base64.encodeUrlSafeWithoutPadding(new Username(localUsername).getHash()) : null;
 
@@ -306,7 +301,7 @@ private static void checkUsernameIsInSync() {
       UsernameLinkComponents localUsernameLink = SignalStore.account().getUsernameLink();
 
       if (localUsernameLink != null) {
-        byte[]                remoteEncryptedUsername = ApplicationDependencies.getSignalServiceAccountManager().getEncryptedUsernameFromLinkServerId(localUsernameLink.getServerId());
+        byte[]                remoteEncryptedUsername = AppDependencies.getSignalServiceAccountManager().getEncryptedUsernameFromLinkServerId(localUsernameLink.getServerId());
         Username.UsernameLink combinedLink            = new Username.UsernameLink(localUsernameLink.getEntropy(), remoteEncryptedUsername);
         Username              remoteUsername          = Username.fromLink(combinedLink);
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshSvrCredentialsJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshSvrCredentialsJob.kt
index 397f1c9cab..40175201a7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshSvrCredentialsJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshSvrCredentialsJob.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs
 
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -24,10 +24,10 @@ class RefreshSvrCredentialsJob private constructor(parameters: Parameters) : Bas
 
     @JvmStatic
     fun enqueueIfNecessary() {
-      if (SignalStore.svr().hasPin() && SignalStore.account().isRegistered) {
-        val lastTimestamp = SignalStore.svr().lastRefreshAuthTimestamp
+      if (SignalStore.svr.hasPin() && SignalStore.account.isRegistered) {
+        val lastTimestamp = SignalStore.svr.lastRefreshAuthTimestamp
         if (lastTimestamp + FREQUENCY.inWholeMilliseconds < System.currentTimeMillis() || lastTimestamp > System.currentTimeMillis()) {
-          ApplicationDependencies.getJobManager().add(RefreshSvrCredentialsJob())
+          AppDependencies.jobManager.add(RefreshSvrCredentialsJob())
         } else {
           Log.d(TAG, "Do not need to refresh credentials. Last refresh: $lastTimestamp")
         }
@@ -50,7 +50,7 @@ class RefreshSvrCredentialsJob private constructor(parameters: Parameters) : Bas
   override fun getFactoryKey(): String = KEY
 
   override fun onRun() {
-    if (!SignalStore.account().isRegistered) {
+    if (!SignalStore.account.isRegistered) {
       Log.w(TAG, "Not registered! Skipping.")
       return
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RemoteConfigRefreshJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RemoteConfigRefreshJob.java
index 313ef1e5e8..277859d613 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RemoteConfigRefreshJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RemoteConfigRefreshJob.java
@@ -4,11 +4,11 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.whispersystems.signalservice.api.RemoteConfigResult;
 import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
 
@@ -51,8 +51,8 @@ protected void onRun() throws Exception {
       return;
     }
 
-    RemoteConfigResult result = ApplicationDependencies.getSignalServiceAccountManager().getRemoteConfig();
-    FeatureFlags.update(result.getConfig());
+    RemoteConfigResult result = AppDependencies.getSignalServiceAccountManager().getRemoteConfig();
+    RemoteConfig.update(result.getConfig());
     SignalStore.misc().setLastKnownServerTime(TimeUnit.SECONDS.toMillis(result.getServerEpochTimeSeconds()), System.currentTimeMillis());
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RemoteDeleteSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RemoteDeleteSendJob.java
index 3110804339..5f5b8de94b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RemoteDeleteSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RemoteDeleteSendJob.java
@@ -15,7 +15,7 @@
 import org.thoughtcrime.securesms.database.model.MessageId;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
@@ -69,7 +69,7 @@ public class RemoteDeleteSendJob extends BaseJob {
     if (conversationRecipient.isDistributionList()) {
       recipients = SignalDatabase.storySends().getRemoteDeleteRecipients(message.getId(), message.getTimestamp());
       if (recipients.isEmpty()) {
-        return ApplicationDependencies.getJobManager().startChain(MultiDeviceStorySendSyncJob.create(message.getDateSent(), messageId));
+        return AppDependencies.getJobManager().startChain(MultiDeviceStorySendSyncJob.create(message.getDateSent(), messageId));
       }
     } else {
       recipients = conversationRecipient.isGroup() ? Stream.of(conversationRecipient.getParticipantIds()).toList()
@@ -88,11 +88,11 @@ public class RemoteDeleteSendJob extends BaseJob {
                                                                         .build());
 
     if (conversationRecipient.isDistributionList()) {
-      return ApplicationDependencies.getJobManager()
-                                    .startChain(sendJob)
-                                    .then(MultiDeviceStorySendSyncJob.create(message.getDateSent(), messageId));
+      return AppDependencies.getJobManager()
+                            .startChain(sendJob)
+                            .then(MultiDeviceStorySendSyncJob.create(message.getDateSent(), messageId));
     } else {
-      return ApplicationDependencies.getJobManager().startChain(sendJob);
+      return AppDependencies.getJobManager().startChain(sendJob);
     }
   }
 
@@ -225,7 +225,7 @@ public void onFailure() {
                                                                                    null);
 
     if (conversationRecipient.isSelf()) {
-      ApplicationDependencies.getSignalServiceMessageSender().sendSyncMessage(dataMessage);
+      AppDependencies.getSignalServiceMessageSender().sendSyncMessage(dataMessage);
     }
 
     return GroupSendJobHelper.getCompletedSends(destinations, results);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ReportSpamJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ReportSpamJob.java
index 53069b4f9b..d183342f20 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ReportSpamJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ReportSpamJob.java
@@ -6,7 +6,7 @@
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.MessageTable.ReportSpamData;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
@@ -20,7 +20,6 @@
 import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -94,7 +93,7 @@ public void onRun() throws IOException {
     }
 
     int                         count                       = 0;
-    SignalServiceAccountManager signalServiceAccountManager = ApplicationDependencies.getSignalServiceAccountManager();
+    SignalServiceAccountManager signalServiceAccountManager = AppDependencies.getSignalServiceAccountManager();
 
     for (ReportSpamData data : reportSpamData) {
       RecipientId         recipientId = data.getRecipientId();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupV2InfoJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupV2InfoJob.java
index 48a3038e30..9f2c9d9825 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupV2InfoJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupV2InfoJob.java
@@ -4,7 +4,7 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.groups.v2.processing.GroupsV2StateProcessor;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
@@ -68,7 +68,7 @@ private RequestGroupV2InfoJob(@NonNull Parameters parameters, @NonNull GroupId.V
 
   @Override
   public void onRun() {
-    ApplicationDependencies.getJobManager().add(new RequestGroupV2InfoWorkerJob(groupId, toRevision));
+    AppDependencies.getJobManager().add(new RequestGroupV2InfoWorkerJob(groupId, toRevision));
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ResendMessageJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ResendMessageJob.java
index a60d2ecbcd..76ccd84351 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ResendMessageJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ResendMessageJob.java
@@ -7,11 +7,11 @@
 import org.signal.core.util.logging.Log;
 import org.signal.libsignal.protocol.SignalProtocolAddress;
 import org.signal.libsignal.protocol.message.SenderKeyDistributionMessage;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
+import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.DistributionListRecord;
 import org.thoughtcrime.securesms.database.model.GroupRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
@@ -22,7 +22,7 @@
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.crypto.ContentHint;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.push.DistributionId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
@@ -126,14 +126,14 @@ private ResendMessageJob(@NonNull RecipientId recipientId,
 
   @Override
   protected void onRun() throws Exception {
-    if (SignalStore.internalValues().delayResends()) {
+    if (SignalStore.internal().delayResends()) {
       Log.w(TAG, "Delaying resend by 10 sec because of an internal preference.");
       ThreadUtil.sleep(10000);
     }
 
     Log.i(TAG, "[" + sentTimestamp + " ] Resending message to " + recipientId + " (urgent: " + urgent + ", contentHint: " + contentHint.name() + ", groupId: " + groupId + ", distributionId: " + distributionId + ")");
 
-    SignalServiceMessageSender messageSender = ApplicationDependencies.getSignalServiceMessageSender();
+    SignalServiceMessageSender messageSender = AppDependencies.getSignalServiceMessageSender();
     Recipient                  recipient     = Recipient.resolved(recipientId);
 
     if (recipient.isUnregistered()) {
@@ -141,9 +141,9 @@ protected void onRun() throws Exception {
       return;
     }
 
-    SignalServiceAddress             address       = RecipientUtil.toSignalServiceAddress(context, recipient);
-    Optional<UnidentifiedAccessPair> access        = UnidentifiedAccessUtil.getAccessFor(context, recipient);
-    Content                          contentToSend = content;
+    SignalServiceAddress                    address              = RecipientUtil.toSignalServiceAddress(context, recipient);
+    Content                                 contentToSend        = content;
+    SealedSenderAccess.CreateGroupSendToken createGroupSendToken = null;
 
     if (distributionId != null) {
       if (groupId != null) {
@@ -157,6 +157,8 @@ protected void onRun() throws Exception {
           Log.w(TAG, "The target user is no longer in the group! Skipping message send.");
           return;
         }
+
+        createGroupSendToken = () -> SignalDatabase.groups().getGroupSendFullToken(groupId, recipientId);
       } else {
         Log.d(TAG, "GroupId is not present. Assuming this is a message for a distribution list.");
         DistributionListRecord listRecord = SignalDatabase.distributionLists().getListByDistributionId(distributionId);
@@ -178,14 +180,16 @@ protected void onRun() throws Exception {
 
     SendMessageResult result;
 
+    SealedSenderAccess access = SealedSenderAccessUtil.getSealedSenderAccessFor(recipient, createGroupSendToken);
+
     try {
       result = messageSender.resendContent(address, access, sentTimestamp, contentToSend, contentHint, Optional.ofNullable(groupId).map(GroupId::getDecodedId), urgent);
     } catch (IllegalStateException e) {
       Log.w(TAG, "Failed to resend content. Archiving session and trying again.", e);
-      ApplicationDependencies.getProtocolStore().aci().sessions().archiveSessions(recipientId, SignalServiceAddress.DEFAULT_DEVICE_ID);
-      ApplicationDependencies.getProtocolStore().aci().sessions().archiveSiblingSessions(recipient.requireServiceId().toProtocolAddress(SignalServiceAddress.DEFAULT_DEVICE_ID));
-      ApplicationDependencies.getProtocolStore().pni().sessions().archiveSessions(recipientId, SignalServiceAddress.DEFAULT_DEVICE_ID);
-      ApplicationDependencies.getProtocolStore().pni().sessions().archiveSiblingSessions(recipient.requireServiceId().toProtocolAddress(SignalServiceAddress.DEFAULT_DEVICE_ID));
+      AppDependencies.getProtocolStore().aci().sessions().archiveSessions(recipientId, SignalServiceAddress.DEFAULT_DEVICE_ID);
+      AppDependencies.getProtocolStore().aci().sessions().archiveSiblingSessions(recipient.requireServiceId().toProtocolAddress(SignalServiceAddress.DEFAULT_DEVICE_ID));
+      AppDependencies.getProtocolStore().pni().sessions().archiveSessions(recipientId, SignalServiceAddress.DEFAULT_DEVICE_ID);
+      AppDependencies.getProtocolStore().pni().sessions().archiveSiblingSessions(recipient.requireServiceId().toProtocolAddress(SignalServiceAddress.DEFAULT_DEVICE_ID));
       SignalDatabase.senderKeyShared().deleteAllFor(recipientId);
 
       result = messageSender.resendContent(address, access, sentTimestamp, contentToSend, contentHint, Optional.ofNullable(groupId).map(GroupId::getDecodedId), urgent);
@@ -198,7 +202,7 @@ protected void onRun() throws Exception {
                                                     .map(device -> recipient.requireServiceId().toProtocolAddress(device))
                                                     .collect(Collectors.toList());
 
-      ApplicationDependencies.getProtocolStore().aci().markSenderKeySharedWith(distributionId, addresses);
+      AppDependencies.getProtocolStore().aci().markSenderKeySharedWith(distributionId, addresses);
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ResetSvrGuessCountJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/ResetSvrGuessCountJob.kt
index 91a8bfcc54..ebd3379c4a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ResetSvrGuessCountJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ResetSvrGuessCountJob.kt
@@ -6,16 +6,18 @@ package org.thoughtcrime.securesms.jobs
 
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.BuildConfig
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.JsonJobData
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.pin.Svr3Migration
 import org.thoughtcrime.securesms.pin.SvrRepository
 import org.whispersystems.signalservice.api.kbs.MasterKey
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery.BackupResponse
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery.PinChangeSession
+import org.whispersystems.signalservice.internal.push.AuthCredentials
 import kotlin.concurrent.withLock
 import kotlin.time.Duration.Companion.days
 
@@ -24,8 +26,10 @@ import kotlin.time.Duration.Companion.days
  */
 class ResetSvrGuessCountJob private constructor(
   parameters: Parameters,
-  private val serializedChangeSession: String?,
-  private var svr2Complete: Boolean
+  private var serializedChangeSessionV2: String?,
+  private var serializedChangeSessionV3: String?,
+  private var svr2Complete: Boolean,
+  private var svr3Complete: Boolean
 ) : Job(parameters) {
 
   companion object {
@@ -33,8 +37,10 @@ class ResetSvrGuessCountJob private constructor(
 
     private val TAG = Log.tag(ResetSvrGuessCountJob::class.java)
 
-    private const val KEY_CHANGE_SESSION = "change_session"
+    private const val KEY_CHANGE_SESSION_V2 = "change_session"
+    private const val KEY_CHANGE_SESSION_V3 = "change_session_v3"
     private const val KEY_SVR2_COMPLETE = "svr2_complete"
+    private const val KEY_SVR3_COMPLETE = "svr3_complete"
   }
 
   constructor() : this(
@@ -46,13 +52,17 @@ class ResetSvrGuessCountJob private constructor(
       .setMaxInstancesForFactory(1)
       .build(),
     null,
+    null,
+    false,
     false
   )
 
   override fun serialize(): ByteArray? {
     return JsonJobData.Builder()
-      .putString(KEY_CHANGE_SESSION, serializedChangeSession)
+      .putString(KEY_CHANGE_SESSION_V2, serializedChangeSessionV2)
+      .putString(KEY_CHANGE_SESSION_V3, serializedChangeSessionV3)
       .putBoolean(KEY_SVR2_COMPLETE, svr2Complete)
+      .putBoolean(KEY_SVR3_COMPLETE, svr3Complete)
       .build()
       .serialize()
   }
@@ -61,9 +71,9 @@ class ResetSvrGuessCountJob private constructor(
 
   override fun run(): Result {
     SvrRepository.operationLock.withLock {
-      val pin = SignalStore.svr().pin
+      val pin = SignalStore.svr.pin
 
-      if (SignalStore.svr().hasOptedOut()) {
+      if (SignalStore.svr.hasOptedOut()) {
         Log.w(TAG, "Opted out of SVR! Nothing to migrate.")
         return Result.success()
       }
@@ -73,32 +83,72 @@ class ResetSvrGuessCountJob private constructor(
         return Result.success()
       }
 
-      val masterKey: MasterKey = SignalStore.svr().getOrCreateMasterKey()
+      val masterKey: MasterKey = SignalStore.svr.getOrCreateMasterKey()
 
-      val svr2Result = if (!svr2Complete) {
-        resetGuessCount(ApplicationDependencies.getSignalServiceAccountManager().getSecureValueRecoveryV2(BuildConfig.SVR2_MRENCLAVE), pin, masterKey)
+      val svr3Result = if (svr3Complete) {
+        Log.d(TAG, "Already reset guess count on SVR3. Skipping.")
+        Result.success()
+      } else if (!Svr3Migration.shouldWriteToSvr3) {
+        Log.d(TAG, "SVR3 writes disabled. Skipping.")
+        Result.success()
       } else {
+        Log.d(TAG, "Resetting count on SVR3...")
+        resetGuessCount(
+          svr = AppDependencies.signalServiceAccountManager.getSecureValueRecoveryV3(AppDependencies.libsignalNetwork),
+          serializedChangeSession = serializedChangeSessionV3,
+          pin = pin,
+          masterKey = masterKey,
+          changeSessionSaver = { serializedChangeSessionV3 = it.serialize() },
+          authTokenSaver = { SignalStore.svr.appendSvr3AuthTokenToList(it.asBasic()) }
+        )
+      }
+
+      if (svr3Result.isRetry) {
+        return svr3Result
+      }
+
+      return if (svr2Complete) {
         Log.d(TAG, "Already reset guess count on SVR2. Skipping.")
         Result.success()
+      } else if (!Svr3Migration.shouldWriteToSvr2) {
+        Log.d(TAG, "SVR2 writes disabled. Skipping.")
+        Result.success()
+      } else {
+        Log.d(TAG, "Resetting count on SVR2...")
+        resetGuessCount(
+          svr = AppDependencies.signalServiceAccountManager.getSecureValueRecoveryV2(BuildConfig.SVR2_MRENCLAVE),
+          serializedChangeSession = serializedChangeSessionV2,
+          pin = pin,
+          masterKey = masterKey,
+          changeSessionSaver = { serializedChangeSessionV2 = it.serialize() },
+          authTokenSaver = { SignalStore.svr.appendSvr2AuthTokenToList(it.asBasic()) }
+        )
       }
-
-      return svr2Result
     }
   }
 
   override fun onFailure() = Unit
 
-  private fun resetGuessCount(svr: SecureValueRecovery, pin: String, masterKey: MasterKey): Result {
+  private fun resetGuessCount(
+    svr: SecureValueRecovery,
+    serializedChangeSession: String?,
+    pin: String,
+    masterKey: MasterKey,
+    changeSessionSaver: (PinChangeSession) -> Unit,
+    authTokenSaver: (AuthCredentials) -> Unit
+  ): Result {
     val session: PinChangeSession = if (serializedChangeSession != null) {
-      svr.resumePinChangeSession(pin, SignalStore.svr().getOrCreateMasterKey(), serializedChangeSession)
+      svr.resumePinChangeSession(pin, SignalStore.svr.getOrCreateMasterKey(), serializedChangeSession)
     } else {
       svr.setPin(pin, masterKey)
     }
 
+    changeSessionSaver(session)
+
     return when (val response: BackupResponse = session.execute()) {
       is BackupResponse.Success -> {
         Log.i(TAG, "Successfully reset guess count. $svr")
-        SignalStore.svr().appendAuthTokenToList(response.authorization.asBasic())
+        authTokenSaver(response.authorization)
         Result.success()
       }
       is BackupResponse.ApplicationError -> {
@@ -130,8 +180,10 @@ class ResetSvrGuessCountJob private constructor(
 
       return ResetSvrGuessCountJob(
         parameters,
-        data.getString(KEY_CHANGE_SESSION),
-        data.getBoolean(KEY_SVR2_COMPLETE)
+        data.getString(KEY_CHANGE_SESSION_V2),
+        data.getStringOrDefault(KEY_CHANGE_SESSION_V3, null),
+        data.getBoolean(KEY_SVR2_COMPLETE),
+        data.getBooleanOrDefault(KEY_SVR3_COMPLETE, false)
       )
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentJob.kt
index 162fbf0197..26cc89944b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentJob.kt
@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.backup.v2.BackupRepository.getThumbnailMediaName
 import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.events.PartProgressEvent
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.JobLogger.format
@@ -29,7 +29,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.MmsException
 import org.thoughtcrime.securesms.notifications.v2.ConversationId.Companion.forConversation
 import org.thoughtcrime.securesms.transport.RetryLaterException
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.Util
 import org.whispersystems.signalservice.api.backup.MediaName
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment
@@ -89,22 +89,17 @@ class RestoreAttachmentJob private constructor(
       return ids.contains(parsed)
     }
 
-    fun modifyPriorities(ids: Set<AttachmentId>, priority: Int) {
-      val jobManager = ApplicationDependencies.getJobManager()
-      jobManager.update { spec ->
-        val jobData = getJsonJobData(spec)
-        if (jobSpecMatchesAnyAttachmentId(jobData, ids) && spec.priority != priority) {
-          val restoreMode = RestoreMode.deserialize(jobData!!.getIntOrDefault(KEY_RESTORE_MODE, RestoreMode.ORIGINAL.value))
-          val modifiedJobData = if (restoreMode == RestoreMode.ORIGINAL) {
-            jobData.buildUpon().putInt(KEY_RESTORE_MODE, RestoreMode.BOTH.value).build()
-          } else {
-            jobData
-          }
-          spec.copy(priority = priority, serializedData = modifiedJobData.serialize())
-        } else {
-          spec
-        }
-      }
+    @JvmStatic
+    fun restoreOffloadedAttachment(attachment: DatabaseAttachment): String {
+      val restoreJob = RestoreAttachmentJob(
+        messageId = attachment.mmsId,
+        attachmentId = attachment.attachmentId,
+        manual = false,
+        forceArchiveDownload = true,
+        restoreMode = RestoreAttachmentJob.RestoreMode.ORIGINAL
+      )
+      AppDependencies.jobManager.add(restoreJob)
+      return restoreJob.id
     }
   }
 
@@ -148,7 +143,7 @@ class RestoreAttachmentJob private constructor(
     val attachmentId = AttachmentId(attachmentId)
     val attachment = SignalDatabase.attachments.getAttachment(attachmentId)
     val pending = attachment != null && attachment.transferState != AttachmentTable.TRANSFER_PROGRESS_DONE && attachment.transferState != AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE
-    if (attachment?.transferState == AttachmentTable.TRANSFER_NEEDS_RESTORE) {
+    if (attachment?.transferState == AttachmentTable.TRANSFER_NEEDS_RESTORE || attachment?.transferState == AttachmentTable.TRANSFER_RESTORE_OFFLOADED) {
       Log.i(TAG, "onAdded() Marking attachment restore progress as 'started'")
       SignalDatabase.attachments.setTransferState(messageId, attachmentId, AttachmentTable.TRANSFER_RESTORE_IN_PROGRESS)
     }
@@ -159,7 +154,7 @@ class RestoreAttachmentJob private constructor(
     doWork()
 
     if (!SignalDatabase.messages.isStory(messageId)) {
-      ApplicationDependencies.getMessageNotifier().updateNotification(context, forConversation(0))
+      AppDependencies.messageNotifier.updateNotification(context, forConversation(0))
     }
   }
 
@@ -213,7 +208,7 @@ class RestoreAttachmentJob private constructor(
     attachmentId: AttachmentId,
     attachment: DatabaseAttachment
   ) {
-    val maxReceiveSize: Long = FeatureFlags.maxAttachmentReceiveSizeBytes()
+    val maxReceiveSize: Long = RemoteConfig.maxAttachmentReceiveSizeBytes
     val attachmentFile: File = SignalDatabase.attachments.getOrCreateTransferFile(attachmentId)
     var archiveFile: File? = null
     var useArchiveCdn = false
@@ -223,7 +218,7 @@ class RestoreAttachmentJob private constructor(
         throw MmsException("Attachment too large, failing download")
       }
 
-      useArchiveCdn = if (SignalStore.backup().backsUpMedia && (forceArchiveDownload || attachment.remoteLocation == null)) {
+      useArchiveCdn = if (SignalStore.backup.backsUpMedia && (forceArchiveDownload || attachment.remoteLocation == null)) {
         if (attachment.archiveMediaName.isNullOrEmpty()) {
           throw InvalidPartException("Invalid attachment configuration")
         }
@@ -232,7 +227,7 @@ class RestoreAttachmentJob private constructor(
         false
       }
 
-      val messageReceiver = ApplicationDependencies.getSignalServiceMessageReceiver()
+      val messageReceiver = AppDependencies.signalServiceMessageReceiver
       val pointer = createAttachmentPointer(attachment, useArchiveCdn)
 
       val progressListener = object : SignalServiceAttachment.ProgressListener {
@@ -251,12 +246,13 @@ class RestoreAttachmentJob private constructor(
 
         messageReceiver
           .retrieveArchivedAttachment(
-            SignalStore.svr().getOrCreateMasterKey().deriveBackupKey().deriveMediaSecrets(MediaName(attachment.archiveMediaName!!)),
+            SignalStore.svr.getOrCreateMasterKey().deriveBackupKey().deriveMediaSecrets(MediaName(attachment.archiveMediaName!!)),
             cdnCredentials,
             archiveFile,
             pointer,
             attachmentFile,
             maxReceiveSize,
+            false,
             progressListener
           )
       } else {
@@ -283,14 +279,14 @@ class RestoreAttachmentJob private constructor(
       Log.w(TAG, "Experienced exception while trying to download an attachment.", e)
       markFailed(messageId, attachmentId)
     } catch (e: NonSuccessfulResponseCodeException) {
-      if (SignalStore.backup().backsUpMedia) {
+      if (SignalStore.backup.backsUpMedia) {
         if (e.code == 404 && !useArchiveCdn && attachment.archiveMediaName?.isNotEmpty() == true) {
           Log.i(TAG, "Retrying download from archive CDN")
           forceArchiveDownload = true
           retrieveAttachment(messageId, attachmentId, attachment)
           return
         } else if (e.code == 401 && useArchiveCdn) {
-          SignalStore.backup().cdnReadCredentials = null
+          SignalStore.backup.cdnReadCredentials = null
           throw RetryLaterException(e)
         }
       }
@@ -322,7 +318,7 @@ class RestoreAttachmentJob private constructor(
 
     return try {
       val remoteData: RemoteData = if (useArchiveCdn) {
-        val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+        val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
         val backupDirectories = BackupRepository.getCdnBackupDirectories().successOrThrow()
 
         RemoteData(
@@ -370,7 +366,8 @@ class RestoreAttachmentJob private constructor(
         attachment.videoGif,
         Optional.empty(),
         Optional.ofNullable(attachment.blurHash).map { it.hash },
-        attachment.uploadTimestamp
+        attachment.uploadTimestamp,
+        attachment.uuid
       )
     } catch (e: IOException) {
       Log.w(TAG, e)
@@ -387,20 +384,11 @@ class RestoreAttachmentJob private constructor(
       throw InvalidPartException("empty encrypted key")
     }
 
-    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
     val backupDirectories = BackupRepository.getCdnBackupDirectories().successOrThrow()
     return try {
       val key = backupKey.deriveThumbnailTransitKey(attachment.getThumbnailMediaName())
-
-      if (attachment.remoteDigest != null) {
-        Log.i(TAG, "Downloading attachment with digest: " + Hex.toString(attachment.remoteDigest))
-      } else {
-        Log.i(TAG, "Downloading attachment with no digest...")
-      }
-
       val mediaId = backupKey.deriveMediaId(attachment.getThumbnailMediaName()).encode()
-      Log.i(TAG, "Restore: Thumbnail mediaId=$mediaId backupDir=${backupDirectories.backupDir} mediaDir=${backupDirectories.mediaDir}")
-
       SignalServiceAttachmentPointer(
         attachment.archiveThumbnailCdn,
         SignalServiceAttachmentRemoteId.Backup(
@@ -414,7 +402,7 @@ class RestoreAttachmentJob private constructor(
         Optional.empty(),
         0,
         0,
-        Optional.ofNullable(attachment.remoteDigest),
+        Optional.empty(),
         Optional.empty(),
         attachment.incrementalMacChunkSize,
         Optional.empty(),
@@ -423,7 +411,8 @@ class RestoreAttachmentJob private constructor(
         attachment.videoGif,
         Optional.empty(),
         Optional.ofNullable(attachment.blurHash).map { it.hash },
-        attachment.uploadTimestamp
+        attachment.uploadTimestamp,
+        attachment.uuid
       )
     } catch (e: IOException) {
       Log.w(TAG, e)
@@ -435,22 +424,29 @@ class RestoreAttachmentJob private constructor(
   }
 
   private fun downloadThumbnail(attachmentId: AttachmentId, attachment: DatabaseAttachment) {
-    if (attachment.transferState == AttachmentTable.TRANSFER_RESTORE_OFFLOADED) {
+    if (attachment.thumbnailRestoreState == AttachmentTable.ThumbnailRestoreState.FINISHED) {
       Log.w(TAG, "$attachmentId already has thumbnail downloaded")
       return
     }
+    if (attachment.thumbnailRestoreState == AttachmentTable.ThumbnailRestoreState.NONE) {
+      Log.w(TAG, "$attachmentId has no thumbnail state")
+      return
+    }
+    if (attachment.thumbnailRestoreState == AttachmentTable.ThumbnailRestoreState.PERMANENT_FAILURE) {
+      Log.w(TAG, "$attachmentId thumbnail permanently failed")
+      return
+    }
     if (attachment.archiveMediaName == null) {
       Log.w(TAG, "$attachmentId was never archived! Cannot proceed.")
       return
     }
 
-    val maxThumbnailSize: Long = FeatureFlags.maxAttachmentReceiveSizeBytes()
+    val maxThumbnailSize: Long = RemoteConfig.maxAttachmentReceiveSizeBytes
     val thumbnailTransferFile: File = SignalDatabase.attachments.createArchiveThumbnailTransferFile()
     val thumbnailFile: File = SignalDatabase.attachments.createArchiveThumbnailTransferFile()
 
     val progressListener = object : SignalServiceAttachment.ProgressListener {
       override fun onAttachmentProgress(total: Long, progress: Long) {
-        EventBus.getDefault().postSticky(PartProgressEvent(attachment, PartProgressEvent.Type.NETWORK, total, progress))
       }
 
       override fun shouldCancel(): Boolean {
@@ -459,18 +455,19 @@ class RestoreAttachmentJob private constructor(
     }
 
     val cdnCredentials = BackupRepository.getCdnReadCredentials(attachment.archiveCdn).successOrThrow().headers
-    val messageReceiver = ApplicationDependencies.getSignalServiceMessageReceiver()
+    val messageReceiver = AppDependencies.signalServiceMessageReceiver
     val pointer = createThumbnailPointer(attachment)
 
     Log.w(TAG, "Downloading thumbnail for $attachmentId mediaName=${attachment.getThumbnailMediaName()}")
     val stream = messageReceiver
       .retrieveArchivedAttachment(
-        SignalStore.svr().getOrCreateMasterKey().deriveBackupKey().deriveMediaSecrets(attachment.getThumbnailMediaName()),
+        SignalStore.svr.getOrCreateMasterKey().deriveBackupKey().deriveMediaSecrets(attachment.getThumbnailMediaName()),
         cdnCredentials,
         thumbnailTransferFile,
         pointer,
         thumbnailFile,
         maxThumbnailSize,
+        true,
         progressListener
       )
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentThumbnailJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentThumbnailJob.kt
new file mode 100644
index 0000000000..fb94e63bea
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RestoreAttachmentThumbnailJob.kt
@@ -0,0 +1,258 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+package org.thoughtcrime.securesms.jobs
+
+import android.text.TextUtils
+import androidx.annotation.VisibleForTesting
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.attachments.AttachmentId
+import org.thoughtcrime.securesms.attachments.DatabaseAttachment
+import org.thoughtcrime.securesms.backup.v2.BackupRepository
+import org.thoughtcrime.securesms.backup.v2.BackupRepository.getThumbnailMediaName
+import org.thoughtcrime.securesms.database.AttachmentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.jobmanager.Job
+import org.thoughtcrime.securesms.jobmanager.JobLogger.format
+import org.thoughtcrime.securesms.jobmanager.JsonJobData
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.mms.MmsException
+import org.thoughtcrime.securesms.notifications.v2.ConversationId.Companion.forConversation
+import org.thoughtcrime.securesms.transport.RetryLaterException
+import org.thoughtcrime.securesms.util.RemoteConfig
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachment
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId
+import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException
+import java.io.File
+import java.io.IOException
+import java.util.Optional
+import java.util.concurrent.TimeUnit
+
+/**
+ * Download attachment from locations as specified in their record.
+ */
+class RestoreAttachmentThumbnailJob private constructor(
+  parameters: Parameters,
+  private val messageId: Long,
+  attachmentId: AttachmentId
+) : BaseJob(parameters) {
+
+  companion object {
+    const val KEY = "RestoreAttachmentThumbnailJob"
+    val TAG = Log.tag(RestoreAttachmentThumbnailJob::class.java)
+
+    private const val KEY_MESSAGE_ID = "message_id"
+    private const val KEY_ATTACHMENT_ID = "part_row_id"
+
+    @JvmStatic
+    fun constructQueueString(attachmentId: AttachmentId): String {
+      // TODO: decide how many queues
+      return "RestoreAttachmentThumbnailJob"
+    }
+  }
+
+  private val attachmentId: Long
+
+  constructor(messageId: Long, attachmentId: AttachmentId, highPriority: Boolean = false) : this(
+    Parameters.Builder()
+      .setQueue(constructQueueString(attachmentId))
+      .addConstraint(NetworkConstraint.KEY)
+      .setLifespan(TimeUnit.DAYS.toMillis(1))
+      .setMaxAttempts(Parameters.UNLIMITED)
+      .setPriority(if (highPriority) Parameters.PRIORITY_HIGH else Parameters.PRIORITY_DEFAULT)
+      .build(),
+    messageId,
+    attachmentId
+  )
+
+  init {
+    this.attachmentId = attachmentId.id
+  }
+
+  override fun serialize(): ByteArray? {
+    return JsonJobData.Builder()
+      .putLong(KEY_MESSAGE_ID, messageId)
+      .putLong(KEY_ATTACHMENT_ID, attachmentId)
+      .serialize()
+  }
+
+  override fun getFactoryKey(): String {
+    return KEY
+  }
+
+  override fun onAdded() {
+    Log.i(TAG, "onAdded() messageId: $messageId  attachmentId: $attachmentId")
+
+    val attachmentId = AttachmentId(attachmentId)
+    val attachment = SignalDatabase.attachments.getAttachment(attachmentId)
+    val pending = attachment != null &&
+      attachment.thumbnailRestoreState != AttachmentTable.ThumbnailRestoreState.FINISHED &&
+      attachment.thumbnailRestoreState != AttachmentTable.ThumbnailRestoreState.PERMANENT_FAILURE &&
+      attachment.thumbnailRestoreState != AttachmentTable.ThumbnailRestoreState.NONE
+    if (pending) {
+      Log.i(TAG, "onAdded() Marking thumbnail restore progress as 'started'")
+      SignalDatabase.attachments.setThumbnailTransferState(messageId, attachmentId, AttachmentTable.ThumbnailRestoreState.IN_PROGRESS)
+    }
+  }
+
+  @Throws(Exception::class)
+  public override fun onRun() {
+    doWork()
+
+    if (!SignalDatabase.messages.isStory(messageId)) {
+      AppDependencies.messageNotifier.updateNotification(context, forConversation(0))
+    }
+  }
+
+  @Throws(IOException::class, RetryLaterException::class)
+  fun doWork() {
+    Log.i(TAG, "onRun() messageId: $messageId  attachmentId: $attachmentId")
+
+    val attachmentId = AttachmentId(attachmentId)
+    val attachment = SignalDatabase.attachments.getAttachment(attachmentId)
+
+    if (attachment == null) {
+      Log.w(TAG, "attachment no longer exists.")
+      return
+    }
+
+    downloadThumbnail(attachmentId, attachment)
+  }
+
+  override fun onFailure() {
+    Log.w(TAG, format(this, "onFailure() thumbnail messageId: $messageId  attachmentId: $attachmentId "))
+
+    val attachmentId = AttachmentId(attachmentId)
+    markFailed(messageId, attachmentId)
+  }
+
+  override fun onShouldRetry(exception: Exception): Boolean {
+    return exception is PushNetworkException ||
+      exception is RetryLaterException
+  }
+
+  @Throws(InvalidPartException::class)
+  private fun createThumbnailPointer(attachment: DatabaseAttachment): SignalServiceAttachmentPointer {
+    if (TextUtils.isEmpty(attachment.remoteKey)) {
+      throw InvalidPartException("empty encrypted key")
+    }
+
+    val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()
+    val backupDirectories = BackupRepository.getCdnBackupDirectories().successOrThrow()
+    return try {
+      val key = backupKey.deriveThumbnailTransitKey(attachment.getThumbnailMediaName())
+      val mediaId = backupKey.deriveMediaId(attachment.getThumbnailMediaName()).encode()
+      SignalServiceAttachmentPointer(
+        attachment.archiveThumbnailCdn,
+        SignalServiceAttachmentRemoteId.Backup(
+          backupDir = backupDirectories.backupDir,
+          mediaDir = backupDirectories.mediaDir,
+          mediaId = mediaId
+        ),
+        null,
+        key,
+        Optional.empty(),
+        Optional.empty(),
+        0,
+        0,
+        Optional.empty(),
+        Optional.empty(),
+        attachment.incrementalMacChunkSize,
+        Optional.empty(),
+        attachment.voiceNote,
+        attachment.borderless,
+        attachment.videoGif,
+        Optional.empty(),
+        Optional.ofNullable(attachment.blurHash).map { it.hash },
+        attachment.uploadTimestamp,
+        attachment.uuid
+      )
+    } catch (e: IOException) {
+      Log.w(TAG, e)
+      throw InvalidPartException(e)
+    } catch (e: ArithmeticException) {
+      Log.w(TAG, e)
+      throw InvalidPartException(e)
+    }
+  }
+
+  private fun downloadThumbnail(attachmentId: AttachmentId, attachment: DatabaseAttachment) {
+    if (attachment.thumbnailRestoreState == AttachmentTable.ThumbnailRestoreState.FINISHED) {
+      Log.w(TAG, "$attachmentId already has thumbnail downloaded")
+      return
+    }
+    if (attachment.thumbnailRestoreState == AttachmentTable.ThumbnailRestoreState.NONE) {
+      Log.w(TAG, "$attachmentId has no thumbnail state")
+      return
+    }
+    if (attachment.thumbnailRestoreState == AttachmentTable.ThumbnailRestoreState.PERMANENT_FAILURE) {
+      Log.w(TAG, "$attachmentId thumbnail permanently failed")
+      return
+    }
+    if (attachment.archiveMediaName == null) {
+      Log.w(TAG, "$attachmentId was never archived! Cannot proceed.")
+      return
+    }
+
+    val maxThumbnailSize: Long = RemoteConfig.maxAttachmentReceiveSizeBytes
+    val thumbnailTransferFile: File = SignalDatabase.attachments.createArchiveThumbnailTransferFile()
+    val thumbnailFile: File = SignalDatabase.attachments.createArchiveThumbnailTransferFile()
+
+    val progressListener = object : SignalServiceAttachment.ProgressListener {
+      override fun onAttachmentProgress(total: Long, progress: Long) {
+      }
+
+      override fun shouldCancel(): Boolean {
+        return this@RestoreAttachmentThumbnailJob.isCanceled
+      }
+    }
+
+    val cdnCredentials = BackupRepository.getCdnReadCredentials(attachment.archiveCdn).successOrThrow().headers
+    val messageReceiver = AppDependencies.signalServiceMessageReceiver
+    val pointer = createThumbnailPointer(attachment)
+
+    Log.w(TAG, "Downloading thumbnail for $attachmentId")
+    val stream = messageReceiver
+      .retrieveArchivedAttachment(
+        SignalStore.svr.getOrCreateMasterKey().deriveBackupKey().deriveMediaSecrets(attachment.getThumbnailMediaName()),
+        cdnCredentials,
+        thumbnailTransferFile,
+        pointer,
+        thumbnailFile,
+        maxThumbnailSize,
+        true,
+        progressListener
+      )
+
+    SignalDatabase.attachments.finalizeAttachmentThumbnailAfterDownload(attachmentId, attachment.archiveMediaId!!, stream, thumbnailTransferFile)
+  }
+
+  private fun markFailed(messageId: Long, attachmentId: AttachmentId) {
+    try {
+      SignalDatabase.attachments.setThumbnailRestoreProgressFailed(attachmentId, messageId)
+    } catch (e: MmsException) {
+      Log.w(TAG, e)
+    }
+  }
+
+  @VisibleForTesting
+  internal class InvalidPartException : Exception {
+    constructor(s: String?) : super(s)
+    constructor(e: Exception?) : super(e)
+  }
+
+  class Factory : Job.Factory<RestoreAttachmentThumbnailJob?> {
+    override fun create(parameters: Parameters, serializedData: ByteArray?): RestoreAttachmentThumbnailJob {
+      val data = JsonJobData.deserialize(serializedData)
+      return RestoreAttachmentThumbnailJob(
+        parameters = parameters,
+        messageId = data.getLong(KEY_MESSAGE_ID),
+        attachmentId = AttachmentId(data.getLong(KEY_ATTACHMENT_ID))
+      )
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ResumableUploadSpecJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ResumableUploadSpecJob.java
index 47147ff4a5..c0763a5a96 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ResumableUploadSpecJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ResumableUploadSpecJob.java
@@ -4,14 +4,12 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
-import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.whispersystems.signalservice.internal.push.http.ResumableUploadSpec;
 
 import java.io.IOException;
-import java.util.concurrent.TimeUnit;
 
 /**
  * No longer used. Functionality has been merged into {@link AttachmentUploadJob}.
@@ -31,8 +29,8 @@ private ResumableUploadSpecJob(@NonNull Parameters parameters) {
 
   @Override
   protected void onRun() throws Exception {
-    ResumableUploadSpec resumableUploadSpec = ApplicationDependencies.getSignalServiceMessageSender()
-                                                                     .getResumableUploadSpec();
+    ResumableUploadSpec resumableUploadSpec = AppDependencies.getSignalServiceMessageSender()
+                                                             .getResumableUploadSpec();
 
     setOutputData(new JsonJobData.Builder()
                           .putString(KEY_RESUME_SPEC, resumableUploadSpec.serialize())
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
index 545df2360d..49a411c0b8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
@@ -13,7 +13,7 @@
 import org.thoughtcrime.securesms.database.RecipientTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.ProfileAvatarFileDetails;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
@@ -47,7 +47,7 @@ public class RetrieveProfileAvatarJob extends BaseJob {
   private final boolean   forceUpdate;
 
   public static void enqueueForceUpdate(Recipient recipient) {
-    SignalExecutors.BOUNDED.execute(() -> ApplicationDependencies.getJobManager().add(new RetrieveProfileAvatarJob(recipient, recipient.resolve().getProfileAvatar(), true)));
+    SignalExecutors.BOUNDED.execute(() -> AppDependencies.getJobManager().add(new RetrieveProfileAvatarJob(recipient, recipient.resolve().getProfileAvatar(), true)));
   }
 
   public RetrieveProfileAvatarJob(Recipient recipient, String profileAvatar) {
@@ -105,7 +105,6 @@ public void onRun() throws IOException {
       }
     } else if (profileAvatar != null && profileAvatar.equals(recipient.resolve().getProfileAvatar())) {
       Log.w(TAG, "Already retrieved profile avatar: " + profileAvatar);
-      SignalStore.registrationValues().clearNeedDownloadProfileAvatar();
       return;
     }
 
@@ -116,14 +115,13 @@ public void onRun() throws IOException {
         database.setProfileAvatar(recipient.getId(), profileAvatar);
       }
 
-      SignalStore.registrationValues().clearNeedDownloadProfileAvatar();
       return;
     }
 
     File downloadDestination = File.createTempFile("avatar", "jpg", context.getCacheDir());
 
     try {
-      SignalServiceMessageReceiver receiver = ApplicationDependencies.getSignalServiceMessageReceiver();
+      SignalServiceMessageReceiver receiver = AppDependencies.getSignalServiceMessageReceiver();
 
       try (InputStream avatarStream = receiver.retrieveProfileAvatar(profileAvatar, downloadDestination, profileKey, AvatarHelper.AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE)) {
         AvatarHelper.setAvatar(context, recipient.getId(), avatarStream);
@@ -146,7 +144,6 @@ public void onRun() throws IOException {
     }
 
     database.setProfileAvatar(recipient.getId(), profileAvatar);
-    SignalStore.registrationValues().clearNeedDownloadProfileAvatar();
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.kt
index 37dd5a5f97..c7dab68e9b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.kt
@@ -19,10 +19,10 @@ import org.thoughtcrime.securesms.database.GroupTable
 import org.thoughtcrime.securesms.database.RecipientTable
 import org.thoughtcrime.securesms.database.RecipientTable.Companion.maskCapabilitiesToLong
 import org.thoughtcrime.securesms.database.RecipientTable.PhoneNumberSharingState
-import org.thoughtcrime.securesms.database.RecipientTable.UnidentifiedAccessMode
+import org.thoughtcrime.securesms.database.RecipientTable.SealedSenderAccessMode
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.RecipientRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.JsonJobData
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
@@ -77,7 +77,7 @@ class RetrieveProfileJob private constructor(parameters: Parameters, private val
 
   @Throws(IOException::class, RetryLaterException::class)
   public override fun onRun() {
-    if (!SignalStore.account().isRegistered) {
+    if (!SignalStore.account.isRegistered) {
       Log.w(TAG, "Unregistered. Skipping.")
       return
     }
@@ -222,7 +222,7 @@ class RetrieveProfileJob private constructor(parameters: Parameters, private val
       unrestrictedUnidentifiedAccess = remoteProfile.isUnrestrictedUnidentifiedAccess
     )
 
-    if (localRecipientRecord.unidentifiedAccessMode != accessMode) {
+    if (localRecipientRecord.sealedSenderAccessMode != accessMode) {
       return true
     }
 
@@ -291,7 +291,7 @@ class RetrieveProfileJob private constructor(parameters: Parameters, private val
       }
 
       val identityKey = IdentityKey(decode(identityKeyValue), 0)
-      if (!ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecord(recipient.id).isPresent) {
+      if (!AppDependencies.protocolStore.aci().identities().getIdentityRecord(recipient.id).isPresent) {
         Log.w(TAG, "Still first use for ${recipient.id}")
         return
       }
@@ -308,8 +308,8 @@ class RetrieveProfileJob private constructor(parameters: Parameters, private val
     val profileKey = ProfileKeyUtil.profileKeyOrNull(recipient.profileKey)
     val newMode = deriveUnidentifiedAccessMode(profileKey, unidentifiedAccessVerifier, unrestrictedUnidentifiedAccess)
 
-    if (recipient.unidentifiedAccessMode !== newMode) {
-      if (newMode === UnidentifiedAccessMode.UNRESTRICTED) {
+    if (recipient.sealedSenderAccessMode !== newMode) {
+      if (newMode === SealedSenderAccessMode.UNRESTRICTED) {
         Log.i(TAG, "Marking recipient UD status as unrestricted.")
       } else if (profileKey == null || unidentifiedAccessVerifier == null) {
         Log.i(TAG, "Marking recipient UD status as disabled.")
@@ -317,15 +317,15 @@ class RetrieveProfileJob private constructor(parameters: Parameters, private val
         Log.i(TAG, "Marking recipient UD status as " + newMode.name + " after verification.")
       }
 
-      SignalDatabase.recipients.setUnidentifiedAccessMode(recipient.id, newMode)
+      SignalDatabase.recipients.setSealedSenderAccessMode(recipient.id, newMode)
     }
   }
 
-  private fun deriveUnidentifiedAccessMode(profileKey: ProfileKey?, unidentifiedAccessVerifier: String?, unrestrictedUnidentifiedAccess: Boolean): UnidentifiedAccessMode {
+  private fun deriveUnidentifiedAccessMode(profileKey: ProfileKey?, unidentifiedAccessVerifier: String?, unrestrictedUnidentifiedAccess: Boolean): SealedSenderAccessMode {
     return if (unrestrictedUnidentifiedAccess && unidentifiedAccessVerifier != null) {
-      UnidentifiedAccessMode.UNRESTRICTED
+      SealedSenderAccessMode.UNRESTRICTED
     } else if (profileKey == null || unidentifiedAccessVerifier == null) {
-      UnidentifiedAccessMode.DISABLED
+      SealedSenderAccessMode.DISABLED
     } else {
       val profileCipher = ProfileCipher(profileKey)
       val verifiedUnidentifiedAccess: Boolean = try {
@@ -336,9 +336,9 @@ class RetrieveProfileJob private constructor(parameters: Parameters, private val
       }
 
       if (verifiedUnidentifiedAccess) {
-        UnidentifiedAccessMode.ENABLED
+        SealedSenderAccessMode.ENABLED
       } else {
-        UnidentifiedAccessMode.DISABLED
+        SealedSenderAccessMode.DISABLED
       }
     }
   }
@@ -362,8 +362,15 @@ class RetrieveProfileJob private constructor(parameters: Parameters, private val
         !recipient.isGroup &&
         !recipient.isSelf
       ) {
-        Log.i(TAG, "Learned profile name for first time, insert event")
-        SignalDatabase.messages.insertLearnedProfileNameChangeMessage(recipient, recipient.getDisplayName(context))
+        val username = SignalDatabase.recipients.getUsername(recipient.id)
+        val e164 = if (username == null) SignalDatabase.recipients.getE164sForIds(listOf(recipient.id)).firstOrNull() else null
+
+        if (username != null || e164 != null) {
+          Log.i(TAG, "Learned profile name for first time, inserting event")
+          SignalDatabase.messages.insertLearnedProfileNameChangeMessage(recipient, e164, username)
+        } else {
+          Log.w(TAG, "Learned profile name for first time, but do not have username or e164 for ${recipient.id}")
+        }
       }
 
       if (remoteProfileName != localProfileName) {
@@ -400,11 +407,11 @@ class RetrieveProfileJob private constructor(parameters: Parameters, private val
         }
 
         if (writeChangeEvent || localDisplayName.isEmpty()) {
-          ApplicationDependencies.getDatabaseObserver().notifyConversationListListeners()
+          AppDependencies.databaseObserver.notifyConversationListListeners()
           val threadId = SignalDatabase.threads.getThreadIdFor(recipient.id)
           if (threadId != null) {
             SignalDatabase.runPostSuccessfulTransaction {
-              ApplicationDependencies.getMessageNotifier().updateNotification(context, forConversation(threadId))
+              AppDependencies.messageNotifier.updateNotification(context, forConversation(threadId))
             }
           }
         }
@@ -473,7 +480,7 @@ class RetrieveProfileJob private constructor(parameters: Parameters, private val
     if (profileAvatar != recipient.profileAvatar) {
       SignalDatabase.runPostSuccessfulTransaction(DEDUPE_KEY_RETRIEVE_AVATAR + recipient.id) {
         SignalExecutors.BOUNDED.execute {
-          ApplicationDependencies.getJobManager().add(RetrieveProfileAvatarJob(recipient, profileAvatar))
+          AppDependencies.jobManager.add(RetrieveProfileAvatarJob(recipient, profileAvatar))
         }
       }
     }
@@ -519,7 +526,7 @@ class RetrieveProfileJob private constructor(parameters: Parameters, private val
     @WorkerThread
     fun enqueue(recipientId: RecipientId) {
       forRecipients(setOf(recipientId)).firstOrNull()?.let { job ->
-        ApplicationDependencies.getJobManager().add(job)
+        AppDependencies.jobManager.add(job)
       }
     }
 
@@ -530,7 +537,7 @@ class RetrieveProfileJob private constructor(parameters: Parameters, private val
     @JvmStatic
     @WorkerThread
     fun enqueue(recipientIds: Set<RecipientId>) {
-      val jobManager = ApplicationDependencies.getJobManager()
+      val jobManager = AppDependencies.jobManager
       for (job in forRecipients(recipientIds)) {
         jobManager.add(job)
       }
@@ -572,12 +579,12 @@ class RetrieveProfileJob private constructor(parameters: Parameters, private val
      */
     @JvmStatic
     fun enqueueRoutineFetchIfNecessary() {
-      if (!SignalStore.registrationValues().isRegistrationComplete || !SignalStore.account().isRegistered || SignalStore.account().aci == null) {
+      if (!SignalStore.registration.isRegistrationComplete || !SignalStore.account.isRegistered || SignalStore.account.aci == null) {
         Log.i(TAG, "Registration not complete. Skipping.")
         return
       }
 
-      val timeSinceRefresh = System.currentTimeMillis() - SignalStore.misc().lastProfileRefreshTime
+      val timeSinceRefresh = System.currentTimeMillis() - SignalStore.misc.lastProfileRefreshTime
       if (timeSinceRefresh < TimeUnit.HOURS.toMillis(12)) {
         Log.i(TAG, "Too soon to refresh. Did the last refresh $timeSinceRefresh ms ago.")
         return
@@ -598,7 +605,7 @@ class RetrieveProfileJob private constructor(parameters: Parameters, private val
           Log.i(TAG, "No recipients to refresh.")
         }
 
-        SignalStore.misc().lastProfileRefreshTime = System.currentTimeMillis()
+        SignalStore.misc.lastProfileRefreshTime = System.currentTimeMillis()
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveRemoteAnnouncementsJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveRemoteAnnouncementsJob.kt
index af0c82ca93..28ce98f21f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveRemoteAnnouncementsJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveRemoteAnnouncementsJob.kt
@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.database.model.addButton
 import org.thoughtcrime.securesms.database.model.addLink
 import org.thoughtcrime.securesms.database.model.addStyle
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.JsonJobData
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
@@ -29,7 +29,8 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.releasechannel.ReleaseChannel
 import org.thoughtcrime.securesms.s3.S3
 import org.thoughtcrime.securesms.transport.RetryLaterException
-import org.thoughtcrime.securesms.util.LocaleFeatureFlags
+import org.thoughtcrime.securesms.util.LocaleRemoteConfig
+import org.whispersystems.signalservice.api.util.UuidUtil
 import org.whispersystems.signalservice.internal.ServiceResponse
 import java.io.IOException
 import java.lang.Integer.max
@@ -54,12 +55,12 @@ class RetrieveRemoteAnnouncementsJob private constructor(private val force: Bool
     @JvmStatic
     @JvmOverloads
     fun enqueue(force: Boolean = false) {
-      if (!SignalStore.account().isRegistered) {
+      if (!SignalStore.account.isRegistered) {
         Log.i(TAG, "Not registered, skipping.")
         return
       }
 
-      if (!force && System.currentTimeMillis() < SignalStore.releaseChannelValues().nextScheduledCheck) {
+      if (!force && System.currentTimeMillis() < SignalStore.releaseChannel.nextScheduledCheck) {
         Log.i(TAG, "Too soon to check for updated release notes")
         return
       }
@@ -74,7 +75,7 @@ class RetrieveRemoteAnnouncementsJob private constructor(private val force: Bool
           .build()
       )
 
-      ApplicationDependencies.getJobManager()
+      AppDependencies.jobManager
         .startChain(CreateReleaseChannelJob.create())
         .then(job)
         .enqueue()
@@ -88,12 +89,12 @@ class RetrieveRemoteAnnouncementsJob private constructor(private val force: Bool
   override fun onFailure() = Unit
 
   override fun onRun() {
-    if (!SignalStore.account().isRegistered) {
+    if (!SignalStore.account.isRegistered) {
       Log.i(TAG, "Not registered, skipping.")
       return
     }
 
-    val values = SignalStore.releaseChannelValues()
+    val values = SignalStore.releaseChannel
 
     if (values.releaseChannelRecipientId == null) {
       Log.w(TAG, "Release Channel recipient is null, this shouldn't happen, will try to create on next run")
@@ -142,7 +143,7 @@ class RetrieveRemoteAnnouncementsJob private constructor(private val force: Bool
 
   @Suppress("UsePropertyAccessSyntax")
   private fun updateReleaseNotes(announcements: List<ReleaseNote>) {
-    val values = SignalStore.releaseChannelValues()
+    val values = SignalStore.releaseChannel
 
     if (Recipient.resolved(values.releaseChannelRecipientId!!).isBlocked) {
       Log.i(TAG, "Release channel is blocked, do not bother with updates")
@@ -170,7 +171,7 @@ class RetrieveRemoteAnnouncementsJob private constructor(private val force: Bool
           false
         }
       }
-      .filter { it.countries == null || LocaleFeatureFlags.shouldShowReleaseNote(it.uuid, it.countries) }
+      .filter { it.countries == null || LocaleRemoteConfig.shouldShowReleaseNote(it.uuid, it.countries) }
       .sortedBy { it.androidMinVersion!!.toInt() }
       .map { resolveReleaseNote(it) }
       .toList()
@@ -232,15 +233,16 @@ class RetrieveRemoteAnnouncementsJob private constructor(private val force: Bool
           media = note.translation.media,
           mediaWidth = note.translation.mediaWidth?.toIntOrNull() ?: 0,
           mediaHeight = note.translation.mediaHeight?.toIntOrNull() ?: 0,
-          mediaType = note.translation.mediaContentType ?: "image/webp"
+          mediaType = note.translation.mediaContentType ?: "image/webp",
+          mediaAttachmentUuid = UuidUtil.parseOrNull(note.releaseNote.uuid)
         )
 
         if (insertResult != null) {
           addedNewNotes = addedNewNotes || (note.releaseNote.includeBoostMessage ?: true)
           SignalDatabase.attachments.getAttachmentsForMessage(insertResult.messageId)
-            .forEach { ApplicationDependencies.getJobManager().add(AttachmentDownloadJob(insertResult.messageId, it.attachmentId, false)) }
+            .forEach { AppDependencies.jobManager.add(AttachmentDownloadJob(insertResult.messageId, it.attachmentId, false)) }
 
-          ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(insertResult.threadId))
+          AppDependencies.messageNotifier.updateNotification(context, ConversationId.forConversation(insertResult.threadId))
           TrimThreadJob.enqueueAsync(insertResult.threadId)
 
           highestVersion = max(highestVersion, note.releaseNote.androidMinVersion!!.toInt())
@@ -309,7 +311,7 @@ class RetrieveRemoteAnnouncementsJob private constructor(private val force: Bool
           SignalDatabase.remoteMegaphones.insert(record)
 
           if (record.imageUrl != null) {
-            ApplicationDependencies.getJobManager().add(FetchRemoteMegaphoneImageJob(record.uuid, record.imageUrl))
+            AppDependencies.jobManager.add(FetchRemoteMegaphoneImageJob(record.uuid, record.imageUrl))
           }
         }
       }
@@ -368,8 +370,8 @@ class RetrieveRemoteAnnouncementsJob private constructor(private val force: Bool
 
     val potentialNoteUrls = mutableListOf<String>()
 
-    if (SignalStore.settings().language != "zz") {
-      potentialNoteUrls += "$this/${SignalStore.settings().language}.json"
+    if (SignalStore.settings.language != "zz") {
+      potentialNoteUrls += "$this/${SignalStore.settings.language}.json"
     }
 
     for (index in 0 until localeList.size()) {
@@ -391,58 +393,58 @@ class RetrieveRemoteAnnouncementsJob private constructor(private val force: Bool
 
   data class FullRemoteMegaphone(val remoteMegaphone: RemoteMegaphone, val translation: TranslatedRemoteMegaphone)
 
-  class ReleaseNotes(@JsonProperty("announcements") val announcements: List<ReleaseNote>, @JsonProperty("megaphones") val megaphones: List<RemoteMegaphone>?)
+  data class ReleaseNotes(@JsonProperty val announcements: List<ReleaseNote>, @JsonProperty val megaphones: List<RemoteMegaphone>?)
 
-  class ReleaseNote(
-    @JsonProperty("uuid") val uuid: String,
-    @JsonProperty("countries") val countries: String?,
-    @JsonProperty("androidMinVersion") val androidMinVersion: String?,
-    @JsonProperty("link") val link: String?,
-    @JsonProperty("ctaId") val ctaId: String?,
-    @JsonProperty("includeBoostMessage") val includeBoostMessage: Boolean?
+  data class ReleaseNote(
+    @JsonProperty val uuid: String,
+    @JsonProperty val countries: String?,
+    @JsonProperty val androidMinVersion: String?,
+    @JsonProperty val link: String?,
+    @JsonProperty val ctaId: String?,
+    @JsonProperty val includeBoostMessage: Boolean?
   )
 
-  class RemoteMegaphone(
-    @JsonProperty("uuid") val uuid: String,
-    @JsonProperty("priority") val priority: Long,
-    @JsonProperty("countries") val countries: String?,
-    @JsonProperty("androidMinVersion") val androidMinVersion: String?,
-    @JsonProperty("dontShowBeforeEpochSeconds") val dontShowBeforeEpochSeconds: Long?,
-    @JsonProperty("dontShowAfterEpochSeconds") val dontShowAfterEpochSeconds: Long?,
-    @JsonProperty("showForNumberOfDays") val showForNumberOfDays: Long?,
-    @JsonProperty("conditionalId") val conditionalId: String?,
-    @JsonProperty("primaryCtaId") val primaryCtaId: String?,
-    @JsonProperty("secondaryCtaId") val secondaryCtaId: String?,
-    @JsonProperty("primaryCtaData") val primaryCtaData: JsonNode?,
-    @JsonProperty("secondaryCtaData") val secondaryCtaData: JsonNode?
+  data class RemoteMegaphone(
+    @JsonProperty val uuid: String,
+    @JsonProperty val priority: Long,
+    @JsonProperty val countries: String?,
+    @JsonProperty val androidMinVersion: String?,
+    @JsonProperty val dontShowBeforeEpochSeconds: Long?,
+    @JsonProperty val dontShowAfterEpochSeconds: Long?,
+    @JsonProperty val showForNumberOfDays: Long?,
+    @JsonProperty val conditionalId: String?,
+    @JsonProperty val primaryCtaId: String?,
+    @JsonProperty val secondaryCtaId: String?,
+    @JsonProperty val primaryCtaData: JsonNode?,
+    @JsonProperty val secondaryCtaData: JsonNode?
   )
 
-  class TranslatedReleaseNote(
-    @JsonProperty("uuid") val uuid: String,
-    @JsonProperty("media") val media: String?,
-    @JsonProperty("mediaWidth") val mediaWidth: String?,
-    @JsonProperty("mediaHeight") val mediaHeight: String?,
-    @JsonProperty("mediaContentType") val mediaContentType: String?,
-    @JsonProperty("linkText") val linkText: String?,
-    @JsonProperty("title") val title: String,
-    @JsonProperty("body") val body: String,
-    @JsonProperty("callToActionText") val callToActionText: String?,
-    @JsonProperty("bodyRanges") val bodyRanges: List<ReleaseNoteBodyRange>?
+  data class TranslatedReleaseNote(
+    @JsonProperty val uuid: String,
+    @JsonProperty val media: String?,
+    @JsonProperty val mediaWidth: String?,
+    @JsonProperty val mediaHeight: String?,
+    @JsonProperty val mediaContentType: String?,
+    @JsonProperty val linkText: String?,
+    @JsonProperty val title: String,
+    @JsonProperty val body: String,
+    @JsonProperty val callToActionText: String?,
+    @JsonProperty val bodyRanges: List<ReleaseNoteBodyRange>?
   )
 
   data class ReleaseNoteBodyRange(
-    @JsonProperty("style") val style: String?,
-    @JsonProperty("start") val start: Int?,
-    @JsonProperty("length") val length: Int?
+    @JsonProperty val style: String?,
+    @JsonProperty val start: Int?,
+    @JsonProperty val length: Int?
   )
 
-  class TranslatedRemoteMegaphone(
-    @JsonProperty("uuid") val uuid: String,
-    @JsonProperty("image") val image: String?,
-    @JsonProperty("title") val title: String,
-    @JsonProperty("body") val body: String,
-    @JsonProperty("primaryCtaText") val primaryCtaText: String?,
-    @JsonProperty("secondaryCtaText") val secondaryCtaText: String?
+  data class TranslatedRemoteMegaphone(
+    @JsonProperty val uuid: String,
+    @JsonProperty val image: String?,
+    @JsonProperty val title: String,
+    @JsonProperty val body: String,
+    @JsonProperty val primaryCtaText: String?,
+    @JsonProperty val secondaryCtaText: String?
   )
 
   class Factory : Job.Factory<RetrieveRemoteAnnouncementsJob> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java
index 0eb39c5f29..243067eb66 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java
@@ -4,7 +4,7 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.keyvalue.CertificateType;
@@ -56,7 +56,7 @@ public void onRun() throws IOException {
     }
 
     synchronized (RotateCertificateJob.class) {
-      SignalServiceAccountManager accountManager   = ApplicationDependencies.getSignalServiceAccountManager();
+      SignalServiceAccountManager accountManager   = AppDependencies.getSignalServiceAccountManager();
       Collection<CertificateType> certificateTypes = SignalStore.phoneNumberPrivacy()
                                                                 .getAllCertificateTypes();
 
@@ -72,7 +72,7 @@ public void onRun() throws IOException {
         }
 
         Log.i(TAG, String.format("Successfully got %s certificate", certificateType));
-        SignalStore.certificateValues()
+        SignalStore.certificate()
                    .setUnidentifiedAccessCertificate(certificateType, certificate);
       }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java
index f33eab6023..a435164545 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java
@@ -5,12 +5,13 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
+import org.signal.libsignal.zkgroup.groupsend.GroupSendFullToken;
+import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.MessageId;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobmanager.JsonJobData;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.net.NotPushRegisteredException;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -99,7 +100,7 @@ public void onRun() throws IOException, UntrustedIdentityException, Undeliverabl
       throw new NotPushRegisteredException();
     }
 
-    SignalServiceMessageSender  messageSender  = ApplicationDependencies.getSignalServiceMessageSender();
+    SignalServiceMessageSender  messageSender  = AppDependencies.getSignalServiceMessageSender();
     Recipient                   recipient      = Recipient.resolved(recipientId);
 
     if (recipient.isSelf()) {
@@ -123,7 +124,7 @@ public void onRun() throws IOException, UntrustedIdentityException, Undeliverabl
                                                                                  timestamp);
 
     SendMessageResult result = messageSender.sendReceipt(remoteAddress,
-                                                         UnidentifiedAccessUtil.getAccessFor(context, recipient),
+                                                         SealedSenderAccessUtil.getSealedSenderAccessFor(recipient, this::getGroupSendFullToken),
                                                          receiptMessage,
                                                          recipient.getNeedsPniSignature());
 
@@ -132,6 +133,19 @@ public void onRun() throws IOException, UntrustedIdentityException, Undeliverabl
     }
   }
 
+  private @Nullable GroupSendFullToken getGroupSendFullToken() {
+    if (messageId == null) {
+      return null;
+    }
+
+    long threadId = SignalDatabase.messages().getThreadIdForMessage(messageId.getId());
+    if (threadId == -1) {
+      return null;
+    }
+
+    return SignalDatabase.groups().getGroupSendFullToken(threadId, recipientId);
+  }
+
   @Override
   public boolean onShouldRetry(@NonNull Exception e) {
     if (e instanceof ServerRejectedException) return false;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendPaymentsActivatedJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendPaymentsActivatedJob.kt
index 207ba1e19b..64a663d3e8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendPaymentsActivatedJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendPaymentsActivatedJob.kt
@@ -32,7 +32,7 @@ class SendPaymentsActivatedJob(parameters: Parameters) : BaseJob(parameters) {
       throw NotPushRegisteredException()
     }
 
-    if (!SignalStore.paymentsValues().mobileCoinPaymentsEnabled()) {
+    if (!SignalStore.payments.mobileCoinPaymentsEnabled()) {
       Log.w(TAG, "Payments aren't enabled, not going to attempt to send activation messages.")
       return
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java
index 552feaaad4..66e6d7ea36 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java
@@ -9,15 +9,15 @@
 
 import org.signal.core.util.ListUtil;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
+import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil;
 import org.thoughtcrime.securesms.database.MessageTable.MarkedMessageInfo;
 import org.thoughtcrime.securesms.database.RecipientTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.MessageId;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobmanager.JsonJobData;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
+import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.net.NotPushRegisteredException;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -103,7 +103,7 @@ public static void enqueue(long threadId, @NonNull RecipientId recipientId, List
       return;
     }
 
-    JobManager                    jobManager      = ApplicationDependencies.getJobManager();
+    JobManager                    jobManager      = AppDependencies.getJobManager();
     List<List<MarkedMessageInfo>> messageIdChunks = ListUtil.chunk(markedMessageInfos, MAX_TIMESTAMPS);
 
     if (messageIdChunks.size() > 1) {
@@ -189,12 +189,13 @@ public void onRun() throws IOException, UntrustedIdentityException, Undeliverabl
       return;
     }
 
-    SignalServiceMessageSender  messageSender  = ApplicationDependencies.getSignalServiceMessageSender();
+    SignalServiceMessageSender  messageSender  = AppDependencies.getSignalServiceMessageSender();
     SignalServiceAddress        remoteAddress  = RecipientUtil.toSignalServiceAddress(context, recipient);
     SignalServiceReceiptMessage receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.READ, messageSentTimestamps, timestamp);
 
     SendMessageResult result = messageSender.sendReceipt(remoteAddress,
-                                                         UnidentifiedAccessUtil.getAccessFor(context, Recipient.resolved(recipientId)),
+                                                         SealedSenderAccessUtil.getSealedSenderAccessFor(recipient,
+                                                                                                         () -> SignalDatabase.groups().getGroupSendFullToken(threadId, recipientId)),
                                                          receiptMessage,
                                                          recipient.getNeedsPniSignature());
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendRetryReceiptJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendRetryReceiptJob.java
index b2f60f08f8..37cec0fa99 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendRetryReceiptJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendRetryReceiptJob.java
@@ -4,19 +4,18 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.signal.libsignal.protocol.InvalidMessageException;
 import org.signal.libsignal.protocol.InvalidKeyException;
+import org.signal.libsignal.protocol.InvalidMessageException;
 import org.signal.libsignal.protocol.message.DecryptionErrorMessage;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
-import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
 
@@ -87,12 +86,11 @@ protected void onRun() throws Exception {
       return;
     }
 
-    SignalServiceAddress             address   = RecipientUtil.toSignalServiceAddress(context, recipient);
-    Optional<UnidentifiedAccessPair> access    = UnidentifiedAccessUtil.getAccessFor(context, recipient);
-    Optional<byte[]>                 group     = groupId.map(GroupId::getDecodedId);
+    SignalServiceAddress address = RecipientUtil.toSignalServiceAddress(context, recipient);
+    Optional<byte[]>     group   = groupId.map(GroupId::getDecodedId);
 
     Log.i(TAG, "Sending retry receipt for " + errorMessage.getTimestamp() + " to " + recipientId + ", device: " + errorMessage.getDeviceId());
-    ApplicationDependencies.getSignalServiceMessageSender().sendRetryReceipt(address, access, group, errorMessage);
+    AppDependencies.getSignalServiceMessageSender().sendRetryReceipt(address, SealedSenderAccessUtil.getSealedSenderAccessFor(recipient), group, errorMessage);
   }
 
   @Override
@@ -102,7 +100,7 @@ protected boolean onShouldRetry(@NonNull Exception e) {
 
   @Override
   public void onFailure() {
-    ApplicationDependencies.getJobManager().add(new AutomaticSessionResetJob(recipientId, errorMessage.getDeviceId(), System.currentTimeMillis()));
+    AppDependencies.getJobManager().add(new AutomaticSessionResetJob(recipientId, errorMessage.getDeviceId(), System.currentTimeMillis()));
   }
 
   public static final class Factory implements Job.Factory<SendRetryReceiptJob> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendViewedReceiptJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendViewedReceiptJob.java
index b8cb662b57..6d9cd00862 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendViewedReceiptJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendViewedReceiptJob.java
@@ -8,15 +8,15 @@
 
 import org.signal.core.util.ListUtil;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
+import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil;
 import org.thoughtcrime.securesms.database.MessageTable.MarkedMessageInfo;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.MessageId;
 import org.thoughtcrime.securesms.database.model.StoryType;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobmanager.JsonJobData;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
+import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.net.NotPushRegisteredException;
@@ -100,7 +100,7 @@ private SendViewedReceiptJob(@NonNull Parameters parameters,
    * maximum size.
    */
   public static void enqueue(long threadId, @NonNull RecipientId recipientId, List<MarkedMessageInfo> markedMessageInfos) {
-    JobManager                    jobManager      = ApplicationDependencies.getJobManager();
+    JobManager                    jobManager      = AppDependencies.getJobManager();
     List<List<MarkedMessageInfo>> messageIdChunks = ListUtil.chunk(markedMessageInfos, MAX_TIMESTAMPS);
 
     if (messageIdChunks.size() > 1) {
@@ -136,7 +136,7 @@ public static void enqueue(long threadId, @NonNull RecipientId recipientId, List
   public void onRun() throws IOException, UntrustedIdentityException {
 
     boolean canSendNonStoryReceipts = TextSecurePreferences.isReadReceiptsEnabled(context);
-    boolean canSendStoryReceipts    = SignalStore.storyValues().getViewedReceiptsEnabled();
+    boolean canSendStoryReceipts    = SignalStore.story().getViewedReceiptsEnabled();
 
     List<MessageId> foundMessageIds       = new LinkedList<>();
     List<Long>      messageSentTimestamps = new LinkedList<>();
@@ -201,14 +201,15 @@ public void onRun() throws IOException, UntrustedIdentityException {
       return;
     }
 
-    SignalServiceMessageSender  messageSender  = ApplicationDependencies.getSignalServiceMessageSender();
+    SignalServiceMessageSender  messageSender  = AppDependencies.getSignalServiceMessageSender();
     SignalServiceAddress        remoteAddress  = RecipientUtil.toSignalServiceAddress(context, recipient);
     SignalServiceReceiptMessage receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.VIEWED,
                                                                                  messageSentTimestamps,
                                                                                  timestamp);
 
     SendMessageResult result = messageSender.sendReceipt(remoteAddress,
-                                                         UnidentifiedAccessUtil.getAccessFor(context, Recipient.resolved(recipientId)),
+                                                         SealedSenderAccessUtil.getSealedSenderAccessFor(recipient,
+                                                                                                         () -> SignalDatabase.groups().getGroupSendFullToken(threadId, recipientId)),
                                                          receiptMessage,
                                                          recipient.getNeedsPniSignature());
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SenderKeyDistributionSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SenderKeyDistributionSendJob.java
index e6e59a54a9..1bd0f8db24 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SenderKeyDistributionSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SenderKeyDistributionSendJob.java
@@ -6,19 +6,19 @@
 import org.signal.core.util.logging.Log;
 import org.signal.libsignal.protocol.SignalProtocolAddress;
 import org.signal.libsignal.protocol.message.SenderKeyDistributionMessage;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
+import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.DistributionListRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
-import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.push.DistributionId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
@@ -85,12 +85,14 @@ protected void onRun() throws Exception {
       return;
     }
 
-    GroupId.V2     groupId;
-    DistributionId distributionId;
+    GroupId.V2                              groupId;
+    DistributionId                          distributionId;
+    SealedSenderAccess.CreateGroupSendToken createGroupSendFullToken = null;
 
     if (threadRecipient.isPushV2Group()) {
-      groupId = threadRecipient.requireGroupId().requireV2();
-      distributionId = SignalDatabase.groups().getOrCreateDistributionId(groupId);
+      groupId                  = threadRecipient.requireGroupId().requireV2();
+      distributionId           = SignalDatabase.groups().getOrCreateDistributionId(groupId);
+      createGroupSendFullToken = () -> SignalDatabase.groups().getGroupSendFullToken(groupId, targetRecipientId);
     } else if (threadRecipient.isDistributionList()) {
       groupId        = null;
       distributionId = SignalDatabase.distributionLists().getDistributionId(threadRecipientId);
@@ -116,10 +118,10 @@ protected void onRun() throws Exception {
       }
     }
 
-    SignalServiceMessageSender             messageSender  = ApplicationDependencies.getSignalServiceMessageSender();
-    List<SignalServiceAddress>             address        = Collections.singletonList(RecipientUtil.toSignalServiceAddress(context, targetRecipient));
-    SenderKeyDistributionMessage           message        = messageSender.getOrCreateNewGroupSession(distributionId);
-    List<Optional<UnidentifiedAccessPair>> access         = UnidentifiedAccessUtil.getAccessFor(context, Collections.singletonList(targetRecipient));
+    SignalServiceMessageSender   messageSender = AppDependencies.getSignalServiceMessageSender();
+    List<SignalServiceAddress>   address       = Collections.singletonList(RecipientUtil.toSignalServiceAddress(context, targetRecipient));
+    SenderKeyDistributionMessage message       = messageSender.getOrCreateNewGroupSession(distributionId);
+    List<SealedSenderAccess>     access        = Collections.singletonList(SealedSenderAccessUtil.getSealedSenderAccessFor(targetRecipient, createGroupSendFullToken));
 
     SendMessageResult result = messageSender.sendSenderKeyDistributionMessage(distributionId, address, access, message, Optional.ofNullable(groupId).map(GroupId::getDecodedId), false, false).get(0);
 
@@ -130,7 +132,7 @@ protected void onRun() throws Exception {
                                                     .map(device -> targetRecipient.requireServiceId().toProtocolAddress(device))
                                                     .collect(Collectors.toList());
 
-      ApplicationDependencies.getProtocolStore().aci().markSenderKeySharedWith(distributionId, addresses);
+      AppDependencies.getProtocolStore().aci().markSenderKeySharedWith(distributionId, addresses);
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java
index a1dbbf8fcd..6947949264 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java
@@ -8,7 +8,7 @@
 import org.thoughtcrime.securesms.database.StickerTable;
 import org.thoughtcrime.securesms.database.model.IncomingSticker;
 import org.thoughtcrime.securesms.database.model.StickerRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
@@ -97,7 +97,7 @@ protected void onRun() throws Exception {
       return;
     }
 
-    SignalServiceMessageReceiver receiver     = ApplicationDependencies.getSignalServiceMessageReceiver();
+    SignalServiceMessageReceiver receiver     = AppDependencies.getSignalServiceMessageReceiver();
     byte[]                       packIdBytes  = Hex.fromStringCondensed(sticker.getPackId ());
     byte[]                       packKeyBytes = Hex.fromStringCondensed(sticker.getPackKey());
     InputStream                  stream       = receiver.retrieveSticker(packIdBytes, packKeyBytes, sticker.getStickerId());
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java
index ed59f43653..05674297d9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java
@@ -9,7 +9,7 @@
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.StickerTable;
 import org.thoughtcrime.securesms.database.model.IncomingSticker;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
@@ -113,8 +113,8 @@ protected void onRun() throws IOException, InvalidMessageException {
       return;
     }
 
-    SignalServiceMessageReceiver receiver        = ApplicationDependencies.getSignalServiceMessageReceiver();
-    JobManager   jobManager      = ApplicationDependencies.getJobManager();
+    SignalServiceMessageReceiver receiver        = AppDependencies.getSignalServiceMessageReceiver();
+    JobManager   jobManager      = AppDependencies.getJobManager();
     StickerTable stickerDatabase = SignalDatabase.stickers();
     byte[]       packIdBytes     = Hex.fromStringCondensed(packId);
     byte[]                       packKeyBytes    = Hex.fromStringCondensed(packKey);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageAccountRestoreJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageAccountRestoreJob.java
index 5f9c553843..99e77bea83 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageAccountRestoreJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageAccountRestoreJob.java
@@ -4,15 +4,12 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.signal.libsignal.usernames.BaseUsernameException;
-import org.signal.libsignal.usernames.Username;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.jobmanager.JobTracker;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
-import org.thoughtcrime.securesms.keyvalue.AccountValues;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.profiles.manage.UsernameRepository;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -68,7 +65,7 @@ private StorageAccountRestoreJob(@NonNull Parameters parameters) {
 
   @Override
   protected void onRun() throws Exception {
-    SignalServiceAccountManager accountManager    = ApplicationDependencies.getSignalServiceAccountManager();
+    SignalServiceAccountManager accountManager    = AppDependencies.getSignalServiceAccountManager();
     StorageKey                  storageServiceKey = SignalStore.storageService().getOrCreateStorageKey();
 
     Log.i(TAG, "Retrieving manifest...");
@@ -76,7 +73,7 @@ protected void onRun() throws Exception {
 
     if (!manifest.isPresent()) {
       Log.w(TAG, "Manifest did not exist or was undecryptable (bad key). Not restoring. Force-pushing.");
-      ApplicationDependencies.getJobManager().add(new StorageForcePushJob());
+      AppDependencies.getJobManager().add(new StorageForcePushJob());
       return;
     }
 
@@ -125,7 +122,7 @@ protected void onRun() throws Exception {
       Log.i(TAG, "No username to reclaim.");
     }
 
-    JobManager jobManager = ApplicationDependencies.getJobManager();
+    JobManager jobManager = AppDependencies.getJobManager();
 
     if (accountRecord.getAvatarUrlPath().isPresent()) {
       Log.i(TAG,  "Fetching avatar...");
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java
index be128bac95..ec78f4f7c4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java
@@ -10,7 +10,7 @@
 import org.thoughtcrime.securesms.database.RecipientTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.UnknownStorageIdTable;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -87,7 +87,7 @@ protected void onRun() throws IOException, RetryLaterException {
     }
 
     StorageKey                  storageServiceKey = SignalStore.storageService().getOrCreateStorageKey();
-    SignalServiceAccountManager accountManager    = ApplicationDependencies.getSignalServiceAccountManager();
+    SignalServiceAccountManager accountManager    = AppDependencies.getSignalServiceAccountManager();
     RecipientTable              recipientTable    = SignalDatabase.recipients();
     UnknownStorageIdTable       storageIdTable    = SignalDatabase.unknownStorageIds();
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
index 8274944460..079c2209d8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
@@ -12,12 +12,11 @@
 import org.signal.core.util.Stopwatch;
 import org.signal.core.util.logging.Log;
 import org.signal.libsignal.protocol.InvalidKeyException;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.RecipientTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.UnknownStorageIdTable;
 import org.thoughtcrime.securesms.database.model.RecipientRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -185,7 +184,7 @@ protected void onRun() throws IOException, RetryLaterException, UntrustedIdentit
       return;
     }
 
-    if (SignalStore.internalValues().storageServiceDisabled()) {
+    if (SignalStore.internal().storageServiceDisabled()) {
       Log.w(TAG, "Storage service has been manually disabled. Skipping.");
       return;
     }
@@ -194,7 +193,7 @@ protected void onRun() throws IOException, RetryLaterException, UntrustedIdentit
       boolean needsMultiDeviceSync = performSync();
 
       if (TextSecurePreferences.isMultiDevice(context) && needsMultiDeviceSync) {
-        ApplicationDependencies.getJobManager().add(new MultiDeviceStorageSyncRequestJob());
+        AppDependencies.getJobManager().add(new MultiDeviceStorageSyncRequestJob());
       }
 
       SignalStore.storageService().onSyncCompleted();
@@ -202,14 +201,14 @@ protected void onRun() throws IOException, RetryLaterException, UntrustedIdentit
       if (SignalStore.account().isPrimaryDevice()) {
         Log.w(TAG, "Failed to decrypt remote storage! Force-pushing and syncing the storage key to linked devices.", e);
 
-        ApplicationDependencies.getJobManager().startChain(new MultiDeviceKeysUpdateJob())
-                               .then(new StorageForcePushJob())
-                               .then(new MultiDeviceStorageSyncRequestJob())
-                               .enqueue();
+        AppDependencies.getJobManager().startChain(new MultiDeviceKeysUpdateJob())
+                       .then(new StorageForcePushJob())
+                       .then(new MultiDeviceStorageSyncRequestJob())
+                       .enqueue();
       } else {
         Log.w(TAG, "Failed to decrypt remote storage! Requesting new keys from primary.", e);
         SignalStore.storageService().clearStorageKeyFromPrimary();
-        ApplicationDependencies.getSignalServiceMessageSender().sendSyncMessage(SignalServiceSyncMessage.forRequest(RequestMessage.forType(SyncMessage.Request.Type.KEYS)), UnidentifiedAccessUtil.getAccessForSync(context));
+        AppDependencies.getSignalServiceMessageSender().sendSyncMessage(SignalServiceSyncMessage.forRequest(RequestMessage.forType(SyncMessage.Request.Type.KEYS)));
       }
     }
   }
@@ -226,7 +225,7 @@ public void onFailure() {
   private boolean performSync() throws IOException, RetryLaterException, InvalidKeyException {
     final Stopwatch                   stopwatch         = new Stopwatch("StorageSync");
     final SQLiteDatabase              db                = SignalDatabase.getRawDatabase();
-    final SignalServiceAccountManager accountManager    = ApplicationDependencies.getSignalServiceAccountManager();
+    final SignalServiceAccountManager accountManager    = AppDependencies.getSignalServiceAccountManager();
     final UnknownStorageIdTable       storageIdDatabase = SignalDatabase.unknownStorageIds();
     final StorageKey                  storageServiceKey = SignalStore.storageService().getOrCreateStorageKey();
 
@@ -303,7 +302,7 @@ private boolean performSync() throws IOException, RetryLaterException, InvalidKe
           db.setTransactionSuccessful();
         } finally {
           db.endTransaction();
-          ApplicationDependencies.getDatabaseObserver().notifyConversationListListeners();
+          AppDependencies.getDatabaseObserver().notifyConversationListListeners();
           stopwatch.split("remote-merge-transaction");
         }
       } else {
@@ -392,14 +391,14 @@ private boolean performSync() throws IOException, RetryLaterException, InvalidKe
       }
 
       Log.i(TAG, "Enqueueing a storage sync job to handle any possible merges after applying unknown records.");
-      ApplicationDependencies.getJobManager().add(new StorageSyncJob());
+      AppDependencies.getJobManager().add(new StorageSyncJob());
     }
 
     stopwatch.split("known-unknowns");
 
     if (needsForcePush && SignalStore.account().isPrimaryDevice()) {
       Log.w(TAG, "Scheduling a force push.");
-      ApplicationDependencies.getJobManager().add(new StorageForcePushJob());
+      AppDependencies.getJobManager().add(new StorageForcePushJob());
     }
 
     stopwatch.stop(TAG);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StoryOnboardingDownloadJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/StoryOnboardingDownloadJob.kt
index ee4d2b2b6b..6a45336cff 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StoryOnboardingDownloadJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StoryOnboardingDownloadJob.kt
@@ -8,7 +8,7 @@ import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.database.MessageTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.StoryType
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -49,12 +49,12 @@ class StoryOnboardingDownloadJob private constructor(parameters: Parameters) : B
     }
 
     fun enqueueIfNeeded() {
-      if (SignalStore.storyValues().hasDownloadedOnboardingStory) {
+      if (SignalStore.story.hasDownloadedOnboardingStory) {
         return
       }
 
       Log.d(TAG, "Attempting to enqueue StoryOnboardingDownloadJob...")
-      ApplicationDependencies.getJobManager()
+      AppDependencies.jobManager
         .startChain(CreateReleaseChannelJob.create())
         .then(create())
         .enqueue()
@@ -66,17 +66,17 @@ class StoryOnboardingDownloadJob private constructor(parameters: Parameters) : B
   override fun onFailure() = Unit
 
   override fun onRun() {
-    if (!SignalStore.account().isRegistered) {
+    if (!SignalStore.account.isRegistered) {
       Log.i(TAG, "Not registered, skipping.")
       return
     }
 
-    if (SignalStore.storyValues().hasDownloadedOnboardingStory) {
+    if (SignalStore.story.hasDownloadedOnboardingStory) {
       Log.i(TAG, "Already downloaded onboarding story. Exiting.")
       return
     }
 
-    val releaseChannelRecipientId = SignalStore.releaseChannelValues().releaseChannelRecipientId
+    val releaseChannelRecipientId = SignalStore.releaseChannel.releaseChannelRecipientId
     if (releaseChannelRecipientId == null) {
       Log.w(TAG, "Cannot create story onboarding without release channel recipient.")
       throw Exception("No release channel recipient.")
@@ -155,12 +155,12 @@ class StoryOnboardingDownloadJob private constructor(parameters: Parameters) : B
     }
 
     Log.d(TAG, "Marking onboarding story downloaded.")
-    SignalStore.storyValues().hasDownloadedOnboardingStory = true
+    SignalStore.story.hasDownloadedOnboardingStory = true
 
     Log.i(TAG, "Enqueueing download jobs...")
     insertResults.forEach { insertResult ->
       SignalDatabase.attachments.getAttachmentsForMessage(insertResult.messageId).forEach {
-        ApplicationDependencies.getJobManager().add(AttachmentDownloadJob(insertResult.messageId, it.attachmentId, true))
+        AppDependencies.jobManager.add(AttachmentDownloadJob(insertResult.messageId, it.attachmentId, true))
       }
     }
   }
@@ -172,8 +172,8 @@ class StoryOnboardingDownloadJob private constructor(parameters: Parameters) : B
 
     val potentialOnboardingUrlLanguages = mutableListOf<String>()
 
-    if (SignalStore.settings().language != "zz") {
-      potentialOnboardingUrlLanguages += SignalStore.settings().language
+    if (SignalStore.settings.language != "zz") {
+      potentialOnboardingUrlLanguages += SignalStore.settings.language
     }
 
     for (index in 0 until localeList.size()) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SubmitRateLimitPushChallengeJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SubmitRateLimitPushChallengeJob.java
index b3c3fb1e56..f0d117b8d7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SubmitRateLimitPushChallengeJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SubmitRateLimitPushChallengeJob.java
@@ -4,7 +4,7 @@
 import androidx.annotation.Nullable;
 
 import org.greenrobot.eventbus.EventBus;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
@@ -51,7 +51,7 @@ private SubmitRateLimitPushChallengeJob(@NonNull Parameters parameters, @NonNull
 
   @Override
   protected void onRun() throws Exception {
-    ApplicationDependencies.getSignalServiceAccountManager().submitRateLimitPushChallenge(challenge);
+    AppDependencies.getSignalServiceAccountManager().submitRateLimitPushChallenge(challenge);
     SignalStore.rateLimit().onProofAccepted();
     EventBus.getDefault().post(new SuccessEvent());
     RateLimitUtil.retryAllRateLimitedMessages(context);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/Svr2MirrorJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/Svr2MirrorJob.kt
index 86a34c5bd6..7f00abf526 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/Svr2MirrorJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/Svr2MirrorJob.kt
@@ -6,13 +6,13 @@ package org.thoughtcrime.securesms.jobs
 
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.BuildConfig
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.JsonJobData
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.pin.Svr3Migration
 import org.thoughtcrime.securesms.pin.SvrRepository
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery.BackupResponse
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery.PinChangeSession
@@ -54,10 +54,15 @@ class Svr2MirrorJob private constructor(parameters: Parameters, private var seri
   override fun getFactoryKey(): String = KEY
 
   override fun run(): Result {
+    if (!Svr3Migration.shouldWriteToSvr2) {
+      Log.w(TAG, "Writes to SVR2 are disabled. Skipping.")
+      return Result.success()
+    }
+
     SvrRepository.operationLock.withLock {
-      val pin = SignalStore.svr().pin
+      val pin = SignalStore.svr.pin
 
-      if (SignalStore.svr().hasOptedOut()) {
+      if (SignalStore.svr.hasOptedOut()) {
         Log.w(TAG, "Opted out of SVR! Nothing to migrate.")
         return Result.success()
       }
@@ -67,24 +72,19 @@ class Svr2MirrorJob private constructor(parameters: Parameters, private var seri
         return Result.success()
       }
 
-      if (!FeatureFlags.svr2()) {
-        Log.w(TAG, "SVR2 was disabled! SKipping.")
-        return Result.success()
-      }
-
-      val svr2: SecureValueRecoveryV2 = ApplicationDependencies.getSignalServiceAccountManager().getSecureValueRecoveryV2(BuildConfig.SVR2_MRENCLAVE)
+      val svr2: SecureValueRecoveryV2 = AppDependencies.signalServiceAccountManager.getSecureValueRecoveryV2(BuildConfig.SVR2_MRENCLAVE)
 
       val session: PinChangeSession = serializedChangeSession?.let { session ->
-        svr2.resumePinChangeSession(pin, SignalStore.svr().getOrCreateMasterKey(), session)
-      } ?: svr2.setPin(pin, SignalStore.svr().getOrCreateMasterKey())
+        svr2.resumePinChangeSession(pin, SignalStore.svr.getOrCreateMasterKey(), session)
+      } ?: svr2.setPin(pin, SignalStore.svr.getOrCreateMasterKey())
 
       serializedChangeSession = session.serialize()
 
       return when (val response: BackupResponse = session.execute()) {
         is BackupResponse.Success -> {
           Log.i(TAG, "Successfully migrated to SVR2! $svr2")
-          SignalStore.svr().appendAuthTokenToList(response.authorization.asBasic())
-          ApplicationDependencies.getJobManager().add(RefreshAttributesJob())
+          SignalStore.svr.appendSvr2AuthTokenToList(response.authorization.asBasic())
+          AppDependencies.jobManager.add(RefreshAttributesJob())
           Result.success()
         }
         is BackupResponse.ApplicationError -> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/Svr3MirrorJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/Svr3MirrorJob.kt
new file mode 100644
index 0000000000..3f11c63350
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/Svr3MirrorJob.kt
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+package org.thoughtcrime.securesms.jobs
+
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.jobmanager.Job
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
+import org.thoughtcrime.securesms.jobs.protos.Svr3MirrorJobData
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.pin.Svr3Migration
+import org.thoughtcrime.securesms.pin.SvrRepository
+import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException
+import org.whispersystems.signalservice.api.svr.SecureValueRecovery.BackupResponse
+import org.whispersystems.signalservice.api.svr.SecureValueRecovery.PinChangeSession
+import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV3
+import kotlin.concurrent.withLock
+import kotlin.time.Duration.Companion.days
+
+/**
+ * Ensures a user's SVR data is written to SVR3.
+ */
+class Svr3MirrorJob private constructor(parameters: Parameters, private var serializedChangeSession: String?) : Job(parameters) {
+
+  companion object {
+    const val KEY = "Svr3MirrorJob"
+
+    private val TAG = Log.tag(Svr3MirrorJob::class.java)
+    private const val KEY_CHANGE_SESSION = "change_session"
+  }
+
+  constructor() : this(
+    Parameters.Builder()
+      .addConstraint(NetworkConstraint.KEY)
+      .setLifespan(30.days.inWholeMilliseconds)
+      .setMaxAttempts(Parameters.UNLIMITED)
+      .setQueue("Svr3MirrorJob")
+      .setMaxInstancesForFactory(1)
+      .build(),
+    null
+  )
+
+  override fun serialize(): ByteArray? {
+    return Svr3MirrorJobData(
+      serializedChangeSession = serializedChangeSession
+    ).encode()
+  }
+
+  override fun getFactoryKey(): String = KEY
+
+  override fun run(): Result {
+    if (!Svr3Migration.shouldWriteToSvr3) {
+      Log.w(TAG, "Writes to SVR3 are disabled. Skipping.")
+      return Result.success()
+    }
+
+    SvrRepository.operationLock.withLock {
+      val pin = SignalStore.svr.pin
+
+      if (SignalStore.svr.hasOptedOut()) {
+        Log.w(TAG, "Opted out of SVR! Nothing to migrate.")
+        return Result.success()
+      }
+
+      if (pin == null) {
+        Log.w(TAG, "No PIN available! Can't migrate!")
+        return Result.success()
+      }
+
+      val svr3: SecureValueRecoveryV3 = AppDependencies.signalServiceAccountManager.getSecureValueRecoveryV3(AppDependencies.libsignalNetwork)
+
+      val session: PinChangeSession = serializedChangeSession?.let { session ->
+        svr3.resumePinChangeSession(pin, SignalStore.svr.getOrCreateMasterKey(), session)
+      } ?: svr3.setPin(pin, SignalStore.svr.getOrCreateMasterKey())
+
+      serializedChangeSession = session.serialize()
+
+      return when (val response: BackupResponse = session.execute()) {
+        is BackupResponse.Success -> {
+          Log.i(TAG, "Successfully migrated to SVR3! $svr3")
+          SignalStore.svr.appendSvr3AuthTokenToList(response.authorization.asBasic())
+          AppDependencies.jobManager.add(RefreshAttributesJob())
+          Result.success()
+        }
+        is BackupResponse.ApplicationError -> {
+          if (response.exception.isUnauthorized()) {
+            Log.w(TAG, "Unauthorized! Giving up.", response.exception)
+            Result.success()
+          } else {
+            Log.w(TAG, "Hit an application error. Retrying.", response.exception)
+            Result.retry(defaultBackoff())
+          }
+        }
+        BackupResponse.EnclaveNotFound -> {
+          Log.w(TAG, "Could not find the enclave. Giving up.")
+          Result.success()
+        }
+        BackupResponse.ExposeFailure -> {
+          Log.w(TAG, "Failed to expose the backup. Giving up.")
+          Result.success()
+        }
+        is BackupResponse.NetworkError -> {
+          Log.w(TAG, "Hit a network error. Retrying.", response.exception)
+          Result.retry(defaultBackoff())
+        }
+        BackupResponse.ServerRejected -> {
+          Log.w(TAG, "Server told us to stop trying. Giving up.")
+          Result.success()
+        }
+      }
+    }
+  }
+
+  private fun Throwable.isUnauthorized(): Boolean {
+    return this is NonSuccessfulResponseCodeException && this.code == 401
+  }
+
+  override fun onFailure() = Unit
+
+  class Factory : Job.Factory<Svr3MirrorJob> {
+    override fun create(parameters: Parameters, serializedData: ByteArray?): Svr3MirrorJob {
+      val jobData: Svr3MirrorJobData? = serializedData?.let { Svr3MirrorJobData.ADAPTER.decode(serializedData) }
+      return Svr3MirrorJob(parameters, jobData?.serializedChangeSession)
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SyncArchivedMediaJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/SyncArchivedMediaJob.kt
index 45fd928d09..a32b4e39a9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SyncArchivedMediaJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SyncArchivedMediaJob.kt
@@ -12,6 +12,7 @@ import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.JsonJobData
+import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.whispersystems.signalservice.api.archive.ArchiveGetMediaItemsResponse
 import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException
 import java.lang.Exception
@@ -75,6 +76,7 @@ class SyncArchivedMediaJob private constructor(
       BackupRepository.deleteAbandonedMediaObjects(attachmentsToDelete)
       Log.i(TAG, "Deleted ${attachmentsToDelete.size} attachments off CDN")
     }
+    SignalStore.backup.lastMediaSyncTime = System.currentTimeMillis()
   }
 
   /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ThreadUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ThreadUpdateJob.java
index b1fde980ec..ce32d9c34a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ThreadUpdateJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ThreadUpdateJob.java
@@ -5,7 +5,7 @@
 
 import org.signal.core.util.ThreadUtil;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
 
@@ -39,7 +39,7 @@ private ThreadUpdateJob(@NonNull Parameters  parameters, long threadId) {
 
   public static void enqueue(long threadId) {
     SignalDatabase.runPostSuccessfulTransaction(KEY + threadId, () -> {
-      ApplicationDependencies.getJobManager().add(new ThreadUpdateJob(threadId));
+      AppDependencies.getJobManager().add(new ThreadUpdateJob(threadId));
     });
   }
 
@@ -55,8 +55,8 @@ public static void enqueue(long threadId) {
 
   @Override
   protected void onRun() throws Exception {
-    SignalDatabase.threads().update(threadId, true);
-    if (!ApplicationDependencies.getIncomingMessageObserver().getDecryptionDrained()) {
+    SignalDatabase.threads().update(threadId, true, true);
+    if (!AppDependencies.getIncomingMessageObserver().getDecryptionDrained()) {
       ThreadUtil.sleep(DEBOUNCE_INTERVAL_WITH_BACKLOG);
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java
index 4d251be672..1c9aeef5ae 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java
@@ -23,11 +23,12 @@
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.ThreadTable;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobmanager.JsonJobData;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.keyvalue.KeepMessagesDuration;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.recipients.Recipient;
 
 public class TrimThreadJob extends BaseJob {
 
@@ -41,7 +42,7 @@ public class TrimThreadJob extends BaseJob {
 
   public static void enqueueAsync(long threadId) {
     if (SignalStore.settings().getKeepMessagesDuration() != KeepMessagesDuration.FOREVER || SignalStore.settings().isTrimByLengthEnabled()) {
-      SignalExecutors.BOUNDED.execute(() -> ApplicationDependencies.getJobManager().add(new TrimThreadJob(threadId)));
+      SignalExecutors.BOUNDED.execute(() -> AppDependencies.getJobManager().add(new TrimThreadJob(threadId)));
     }
   }
 
@@ -77,7 +78,7 @@ public void onRun() {
     long trimBeforeDate = keepMessagesDuration != KeepMessagesDuration.FOREVER ? System.currentTimeMillis() - keepMessagesDuration.getDuration()
                                                                                : ThreadTable.NO_TRIM_BEFORE_DATE_SET;
 
-    SignalDatabase.threads().trimThread(threadId, trimLength, trimBeforeDate);
+    SignalDatabase.threads().trimThread(threadId, SignalStore.settings().shouldSyncThreadTrimDeletes() && Recipient.self().getDeleteSyncCapability().isSupported(), trimLength, trimBeforeDate, false);
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyboard/KeyboardPagerViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/keyboard/KeyboardPagerViewModel.kt
index 6acba01de6..c15120ebb9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyboard/KeyboardPagerViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyboard/KeyboardPagerViewModel.kt
@@ -7,7 +7,7 @@ import org.signal.core.util.ThreadUtil
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.stickers.StickerSearchRepository
 import org.thoughtcrime.securesms.util.DefaultValueLiveData
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 
 class KeyboardPagerViewModel : ViewModel() {
 
@@ -16,11 +16,11 @@ class KeyboardPagerViewModel : ViewModel() {
 
   init {
     val startingPages: MutableSet<KeyboardPage> = KeyboardPage.values().toMutableSet()
-    if (SignalStore.settings().isPreferSystemEmoji) {
+    if (SignalStore.settings.isPreferSystemEmoji) {
       startingPages.remove(KeyboardPage.EMOJI)
     }
 
-    if (!FeatureFlags.gifSearchAvailable()) {
+    if (!RemoteConfig.gifSearchAvailable) {
       startingPages.remove(KeyboardPage.GIF)
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/EmojiKeyboardPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/EmojiKeyboardPageFragment.kt
index 4e6be7ab47..b5f4005383 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/EmojiKeyboardPageFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/EmojiKeyboardPageFragment.kt
@@ -128,7 +128,7 @@ class EmojiKeyboardPageFragment : Fragment(), EmojiEventListener, EmojiPageViewG
   }
 
   override fun onEmojiSelected(emoji: String) {
-    SignalStore.emojiValues().setPreferredVariation(emoji)
+    SignalStore.emoji.setPreferredVariation(emoji)
     eventListener.onEmojiSelected(emoji)
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/EmojiKeyboardPageViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/EmojiKeyboardPageViewModel.kt
index 4372d8f322..9dfc3d0dae 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/EmojiKeyboardPageViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyboard/emoji/EmojiKeyboardPageViewModel.kt
@@ -9,7 +9,7 @@ import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.emoji.EmojiPageModel
 import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.EmojiHeader
 import org.thoughtcrime.securesms.components.emoji.RecentEmojiPageModel
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.emoji.EmojiCategory
 import org.thoughtcrime.securesms.util.DefaultValueLiveData
 import org.thoughtcrime.securesms.util.TextSecurePreferences
@@ -68,7 +68,7 @@ class EmojiKeyboardPageViewModel(private val repository: EmojiKeyboardPageReposi
 
   companion object {
     fun getStartingTab(): String {
-      return if (RecentEmojiPageModel.hasRecents(ApplicationDependencies.getApplication(), TextSecurePreferences.RECENT_STORAGE_KEY)) {
+      return if (RecentEmojiPageModel.hasRecents(AppDependencies.application, TextSecurePreferences.RECENT_STORAGE_KEY)) {
         RecentEmojiPageModel.KEY
       } else {
         EmojiCategory.PEOPLE.key
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerKeyboardPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerKeyboardPageFragment.kt
index bb39c6655a..77978b2054 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerKeyboardPageFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyboard/sticker/StickerKeyboardPageFragment.kt
@@ -15,7 +15,7 @@ import org.signal.libsignal.protocol.util.Pair
 import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.database.DatabaseObserver
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyboard.emoji.KeyboardPageSearchView
 import org.thoughtcrime.securesms.stickers.StickerEventListener
 import org.thoughtcrime.securesms.stickers.StickerRolloverTouchListener
@@ -98,14 +98,14 @@ open class StickerKeyboardPageFragment :
 
     view.findViewById<View>(R.id.sticker_manage).setOnClickListener { findListener<StickerEventListener>()?.onStickerManagementClicked() }
 
-    ApplicationDependencies.getDatabaseObserver().registerStickerObserver(this)
-    ApplicationDependencies.getDatabaseObserver().registerStickerPackObserver(this)
+    AppDependencies.databaseObserver.registerStickerObserver(this)
+    AppDependencies.databaseObserver.registerStickerPackObserver(this)
 
     view.addOnLayoutChangeListener(this)
   }
 
   override fun onDestroyView() {
-    ApplicationDependencies.getDatabaseObserver().unregisterObserver(this)
+    AppDependencies.databaseObserver.unregisterObserver(this)
     requireView().removeOnLayoutChangeListener(this)
     super.onDestroyView()
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/AccountValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/AccountValues.kt
index 070819cb69..9f2e7bc677 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/AccountValues.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/AccountValues.kt
@@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
 import org.thoughtcrime.securesms.crypto.storage.PreKeyMetadataStore
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.PreKeysSyncJob
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.SecurePreferenceManager
@@ -26,7 +26,7 @@ import org.whispersystems.signalservice.api.util.UuidUtil
 import org.whispersystems.signalservice.api.util.toByteArray
 import java.security.SecureRandom
 
-internal class AccountValues internal constructor(store: KeyValueStore) : SignalStoreValues(store) {
+class AccountValues internal constructor(store: KeyValueStore) : SignalStoreValues(store) {
 
   companion object {
     private val TAG = Log.tag(AccountValues::class.java)
@@ -100,6 +100,7 @@ internal class AccountValues internal constructor(store: KeyValueStore) : Signal
       KEY_PNI_IDENTITY_PUBLIC_KEY,
       KEY_PNI_IDENTITY_PRIVATE_KEY,
       KEY_USERNAME,
+      KEY_USERNAME_LINK_ENTROPY,
       KEY_USERNAME_LINK_SERVER_ID
     )
   }
@@ -354,7 +355,7 @@ internal class AccountValues internal constructor(store: KeyValueStore) : Signal
 
     putBoolean(KEY_IS_REGISTERED, registered)
 
-    ApplicationDependencies.getIncomingMessageObserver().notifyRegistrationChanged()
+    AppDependencies.incomingMessageObserver.notifyRegistrationChanged()
 
     if (previous != registered) {
       Recipient.self().live().refresh()
@@ -372,7 +373,7 @@ internal class AccountValues internal constructor(store: KeyValueStore) : Signal
   fun clearRegistrationButKeepCredentials() {
     putBoolean(KEY_IS_REGISTERED, false)
 
-    ApplicationDependencies.getIncomingMessageObserver().notifyRegistrationChanged()
+    AppDependencies.incomingMessageObserver.notifyRegistrationChanged()
 
     Recipient.self().live().refresh()
   }
@@ -446,13 +447,13 @@ internal class AccountValues internal constructor(store: KeyValueStore) : Signal
     val self = Recipient.self()
 
     SignalDatabase.recipients.setProfileKey(self.id, newProfileKey)
-    ApplicationDependencies.getGroupsV2Authorization().clear()
+    AppDependencies.groupsV2Authorization.clear()
   }
 
   private fun migrateFromSharedPrefs() {
     Log.i(TAG, "Migrating account values from shared prefs:")
 
-    val context = ApplicationDependencies.getApplication()
+    val context = AppDependencies.application
     val sharedPrefs = SecurePreferenceManager.getSecurePreferences(context)
     val identitySharedPrefs = EncryptedPreferences.create(context, "SecureSMS-Preferences")
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/ApkUpdateValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/ApkUpdateValues.kt
index 88bc59dc71..11f94c6d0a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/ApkUpdateValues.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/ApkUpdateValues.kt
@@ -7,12 +7,13 @@ package org.thoughtcrime.securesms.keyvalue
 
 import org.signal.core.util.logging.Log
 
-internal class ApkUpdateValues(store: KeyValueStore) : SignalStoreValues(store) {
+class ApkUpdateValues(store: KeyValueStore) : SignalStoreValues(store) {
   companion object {
     private val TAG = Log.tag(ApkUpdateValues::class.java)
 
     private const val DOWNLOAD_ID = "apk_update.download_id"
     private const val DIGEST = "apk_update.digest"
+    private const val LAST_SUCCESSFUL_CHECK = "apk_update.last_successful_check"
   }
 
   override fun onFirstEverAppLaunch() = Unit
@@ -20,6 +21,7 @@ internal class ApkUpdateValues(store: KeyValueStore) : SignalStoreValues(store)
 
   val downloadId: Long by longValue(DOWNLOAD_ID, -2)
   val digest: ByteArray? get() = store.getBlob(DIGEST, null)
+  var lastSuccessfulCheck: Long by longValue(LAST_SUCCESSFUL_CHECK, 0)
 
   fun setDownloadAttributes(id: Long, digest: ByteArray?) {
     Log.d(TAG, "Saving download attributes. id: $id")
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt
index 429e603076..8609be2412 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt
@@ -13,19 +13,20 @@ import kotlin.time.Duration
 import kotlin.time.Duration.Companion.days
 import kotlin.time.Duration.Companion.hours
 
-internal class BackupValues(store: KeyValueStore) : SignalStoreValues(store) {
+class BackupValues(store: KeyValueStore) : SignalStoreValues(store) {
   companion object {
     val TAG = Log.tag(BackupValues::class.java)
     private const val KEY_CREDENTIALS = "backup.credentials"
-    private const val KEY_CDN_CAN_READ_WRITE = "backup.cdn.canReadWrite"
     private const val KEY_CDN_READ_CREDENTIALS = "backup.cdn.readCredentials"
     private const val KEY_CDN_READ_CREDENTIALS_TIMESTAMP = "backup.cdn.readCredentials.timestamp"
     private const val KEY_RESTORE_STATE = "backup.restoreState"
     private const val KEY_BACKUP_USED_MEDIA_SPACE = "backup.usedMediaSpace"
     private const val KEY_BACKUP_LAST_PROTO_SIZE = "backup.lastProtoSize"
+    private const val KEY_BACKUP_TIER = "backup.backupTier"
 
     private const val KEY_NEXT_BACKUP_TIME = "backup.nextBackupTime"
     private const val KEY_LAST_BACKUP_TIME = "backup.lastBackupTime"
+    private const val KEY_LAST_BACKUP_MEDIA_SYNC_TIME = "backup.lastBackupMediaSyncTime"
     private const val KEY_BACKUP_FREQUENCY = "backup.backupFrequency"
 
     private const val KEY_CDN_BACKUP_DIRECTORY = "backup.cdn.directory"
@@ -59,7 +60,9 @@ internal class BackupValues(store: KeyValueStore) : SignalStoreValues(store) {
 
   var nextBackupTime: Long by longValue(KEY_NEXT_BACKUP_TIME, -1)
   var lastBackupTime: Long by longValue(KEY_LAST_BACKUP_TIME, -1)
+  var lastMediaSyncTime: Long by longValue(KEY_LAST_BACKUP_MEDIA_SYNC_TIME, -1)
   var backupFrequency: BackupFrequency by enumValue(KEY_BACKUP_FREQUENCY, BackupFrequency.MANUAL, BackupFrequency.Serializer)
+  var backupTier: MessageBackupTier? by enumValue(KEY_BACKUP_TIER, null, MessageBackupTier.Serializer)
 
   val totalBackupSize: Long get() = lastBackupProtoSize + usedBackupMediaSpace
 
@@ -81,16 +84,6 @@ internal class BackupValues(store: KeyValueStore) : SignalStoreValues(store) {
         .apply()
     }
 
-  val backupTier: MessageBackupTier? = if (areBackupsEnabled) {
-    if (backsUpMedia) {
-      MessageBackupTier.PAID
-    } else {
-      MessageBackupTier.FREE
-    }
-  } else {
-    null
-  }
-
   var backupsInitialized: Boolean by booleanValue(KEY_BACKUPS_INITIALIZED, false)
 
   /**
@@ -157,7 +150,7 @@ internal class BackupValues(store: KeyValueStore) : SignalStoreValues(store) {
   }
 
   class SerializedCredentials(
-    @JsonProperty("credentialsByDay")
+    @JsonProperty
     val credentialsByDay: Map<Long, ArchiveServiceCredential>
   )
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/ChatColorsValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/ChatColorsValues.kt
index ce41c15a34..8c49847422 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/ChatColorsValues.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/ChatColorsValues.kt
@@ -4,7 +4,7 @@ import org.thoughtcrime.securesms.conversation.colors.ChatColors
 import org.thoughtcrime.securesms.database.model.databaseprotos.ChatColor
 import java.io.IOException
 
-internal class ChatColorsValues internal constructor(store: KeyValueStore) : SignalStoreValues(store) {
+class ChatColorsValues internal constructor(store: KeyValueStore) : SignalStoreValues(store) {
 
   companion object {
     private const val KEY_CHAT_COLORS = "chat_colors.chat_colors"
@@ -13,9 +13,9 @@ internal class ChatColorsValues internal constructor(store: KeyValueStore) : Sig
     private const val KEY_CHAT_COLORS_GRADIENT_TOOLTIP = "chat_colors.gradient.tooltip"
   }
 
-  override fun onFirstEverAppLaunch() = Unit
+  public override fun onFirstEverAppLaunch() = Unit
 
-  override fun getKeysToIncludeInBackup(): MutableList<String> = mutableListOf(
+  public override fun getKeysToIncludeInBackup(): MutableList<String> = mutableListOf(
     KEY_CHAT_COLORS,
     KEY_CHAT_COLORS_ID,
     KEY_CHAT_COLORS_AUTO_TOOLTIP,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/DonationsValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/DonationsValues.kt
deleted file mode 100644
index 3c6d6c85ba..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/DonationsValues.kt
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.thoughtcrime.securesms.keyvalue
-
-import androidx.annotation.WorkerThread
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.payments.currency.CurrencyUtil
-import org.thoughtcrime.securesms.subscription.Subscriber
-import org.whispersystems.signalservice.api.subscriptions.SubscriberId
-import java.util.Currency
-
-internal class DonationsValues internal constructor(store: KeyValueStore) : SignalStoreValues(store) {
-
-  companion object {
-    private val TAG = Log.tag(DonationsValues::class.java)
-
-    private const val KEY_SUBSCRIPTION_CURRENCY_CODE = "donation.currency.code"
-    private const val KEY_CURRENCY_CODE_ONE_TIME = "donation.currency.code.boost"
-    private const val KEY_SUBSCRIBER_ID_PREFIX = "donation.subscriber.id."
-    private const val KEY_LAST_KEEP_ALIVE_LAUNCH = "donation.last.successful.ping"
-
-    /**
-     * Our last known "end of period" for a subscription. This value is used to determine
-     * when a user should try to redeem a badge for their subscription, and as a hint that
-     * a user has an active subscription.
-     */
-    private const val KEY_LAST_END_OF_PERIOD_SECONDS = "donation.last.end.of.period"
-
-    private const val USER_MANUALLY_CANCELLED = "donation.user.manually.cancelled"
-    private const val DISPLAY_BADGES_ON_PROFILE = "donation.display.badges.on.profile"
-  }
-
-  override fun onFirstEverAppLaunch() = Unit
-
-  override fun getKeysToIncludeInBackup(): MutableList<String> = mutableListOf(
-    KEY_CURRENCY_CODE_ONE_TIME,
-    KEY_LAST_KEEP_ALIVE_LAUNCH,
-    KEY_LAST_END_OF_PERIOD_SECONDS,
-  )
-
-  private fun getSubscriptionCurrency(): Currency {
-    val currencyCode = getString(KEY_SUBSCRIPTION_CURRENCY_CODE, null)
-    val currency: Currency? = if (currencyCode == null) {
-      null
-    } else {
-      CurrencyUtil.getCurrencyByCurrencyCode(currencyCode)
-    }
-
-    return currency ?: Currency.getInstance("USD")
-  }
-
-  private fun getSubscriber(currency: Currency): Subscriber? {
-    val currencyCode = currency.currencyCode
-    val subscriberIdBytes = getBlob("$KEY_SUBSCRIBER_ID_PREFIX$currencyCode", null)
-
-    return if (subscriberIdBytes == null) {
-      null
-    } else {
-      Subscriber(SubscriberId.fromBytes(subscriberIdBytes), currencyCode)
-    }
-  }
-
-  // MOLLY: Functions below are only required for storage sync and account deletion
-
-  fun getSubscriber(): Subscriber? {
-    return getSubscriber(getSubscriptionCurrency())
-  }
-
-  fun requireSubscriber(): Subscriber {
-    return getSubscriber() ?: throw Exception("Subscriber ID is not set.")
-  }
-
-  fun setSubscriber(subscriber: Subscriber) {
-    Log.i(TAG, "Setting subscriber for currency ${subscriber.currencyCode}", Exception(), true)
-    val currencyCode = subscriber.currencyCode
-    store.beginWrite()
-      .putBlob("$KEY_SUBSCRIBER_ID_PREFIX$currencyCode", subscriber.subscriberId.bytes)
-      .putString(KEY_SUBSCRIPTION_CURRENCY_CODE, currencyCode)
-      .apply()
-  }
-
-  fun isUserManuallyCancelled(): Boolean {
-    return getBoolean(USER_MANUALLY_CANCELLED, false)
-  }
-
-  fun markUserManuallyCancelled() {
-    putBoolean(USER_MANUALLY_CANCELLED, true)
-  }
-
-  fun clearUserManuallyCancelled() {
-    remove(USER_MANUALLY_CANCELLED)
-  }
-
-  fun setDisplayBadgesOnProfile(enabled: Boolean) {
-    putBoolean(DISPLAY_BADGES_ON_PROFILE, enabled)
-  }
-
-  fun getDisplayBadgesOnProfile(): Boolean {
-    return getBoolean(DISPLAY_BADGES_ON_PROFILE, false)
-  }
-
-  @WorkerThread
-  fun updateLocalStateForManualCancellation() {
-    Log.d(TAG, "[updateLocalStateForManualCancellation] Clearing donation values.")
-
-    markUserManuallyCancelled()
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/ImageEditorValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/ImageEditorValues.kt
index 9510b4d4f5..30de63b682 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/ImageEditorValues.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/ImageEditorValues.kt
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.keyvalue
 
-internal class ImageEditorValues internal constructor(store: KeyValueStore) : SignalStoreValues(store) {
+class ImageEditorValues internal constructor(store: KeyValueStore) : SignalStoreValues(store) {
 
   companion object {
     private const val KEY_IMAGE_EDITOR_MARKER_WIDTH = "image.editor.marker.width"
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InAppPaymentValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InAppPaymentValues.kt
new file mode 100644
index 0000000000..5098bc6e75
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InAppPaymentValues.kt
@@ -0,0 +1,657 @@
+package org.thoughtcrime.securesms.keyvalue
+
+import androidx.annotation.VisibleForTesting
+import androidx.annotation.WorkerThread
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.subjects.BehaviorSubject
+import io.reactivex.rxjava3.subjects.Subject
+import org.signal.core.util.logging.Log
+import org.signal.donations.PaymentSourceType
+import org.signal.donations.StripeApi
+import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation
+import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialRequestContext
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toPaymentMethodType
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.Stripe3DSData
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.database.model.databaseprotos.BadgeList
+import org.thoughtcrime.securesms.database.model.databaseprotos.DonationErrorValue
+import org.thoughtcrime.securesms.database.model.databaseprotos.PendingOneTimeDonation
+import org.thoughtcrime.securesms.database.model.databaseprotos.TerminalDonationQueue
+import org.thoughtcrime.securesms.database.model.isExpired
+import org.thoughtcrime.securesms.payments.currency.CurrencyUtil
+import org.thoughtcrime.securesms.subscription.LevelUpdateOperation
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
+import org.whispersystems.signalservice.api.subscriptions.IdempotencyKey
+import org.whispersystems.signalservice.api.subscriptions.SubscriberId
+import org.whispersystems.signalservice.internal.util.JsonUtil
+import java.util.Currency
+import java.util.Locale
+import java.util.Optional
+import java.util.concurrent.TimeUnit
+
+/**
+ * Key-Value store for in app payment related values. Note that most of this file will be deprecated after the release of
+ * InAppPayments (90day rollout window + 30day max job lifespan window)
+ */
+class InAppPaymentValues internal constructor(store: KeyValueStore) : SignalStoreValues(store) {
+
+  companion object {
+    private val TAG = Log.tag(InAppPaymentValues::class.java)
+
+    private const val KEY_DONATION_SUBSCRIPTION_CURRENCY_CODE = "donation.currency.code"
+    private const val KEY_BACKUPS_SUBSCRIPTION_CURRENCY_CODE = "donation.backups.currency.code"
+    private const val KEY_CURRENCY_CODE_ONE_TIME = "donation.currency.code.boost"
+    private const val KEY_SUBSCRIBER_ID_PREFIX = "donation.subscriber.id."
+    private const val KEY_LAST_KEEP_ALIVE_LAUNCH = "donation.last.successful.ping"
+
+    /**
+     * Our last known "end of period" for a subscription. This value is used to determine
+     * when a user should try to redeem a badge for their subscription, and as a hint that
+     * a user has an active subscription.
+     */
+    private const val KEY_LAST_END_OF_PERIOD_SECONDS = "donation.last.end.of.period"
+
+    private const val EXPIRED_BADGE = "donation.expired.badge"
+    private const val EXPIRED_GIFT_BADGE = "donation.expired.gift.badge"
+    private const val USER_MANUALLY_CANCELLED_DONATION = "donation.user.manually.cancelled"
+    private const val USER_MANUALLY_CANCELLED_BACKUPS = "donation.user.manually.cancelled.backups"
+    private const val KEY_LEVEL_OPERATION_PREFIX = "donation.level.operation."
+    private const val KEY_LEVEL_HISTORY = "donation.level.history"
+    private const val DISPLAY_BADGES_ON_PROFILE = "donation.display.badges.on.profile"
+    private const val SUBSCRIPTION_REDEMPTION_FAILED = "donation.subscription.redemption.failed"
+    private const val SHOULD_CANCEL_SUBSCRIPTION_BEFORE_NEXT_SUBSCRIBE_ATTEMPT = "donation.should.cancel.subscription.before.next.subscribe.attempt"
+    private const val SUBSCRIPTION_CANCELATION_CHARGE_FAILURE = "donation.subscription.cancelation.charge.failure"
+    private const val SUBSCRIPTION_CANCELATION_REASON = "donation.subscription.cancelation.reason"
+    private const val SUBSCRIPTION_CANCELATION_TIMESTAMP = "donation.subscription.cancelation.timestamp"
+    private const val SUBSCRIPTION_CANCELATION_WATERMARK = "donation.subscription.cancelation.watermark"
+    private const val SHOW_CANT_PROCESS_DIALOG = "show.cant.process.dialog"
+
+    /**
+     * The current request context for subscription. This should be stored until either
+     * it is successfully converted into a response, the end of period changes, or the user
+     * manually cancels the subscription.
+     */
+    private const val SUBSCRIPTION_CREDENTIAL_REQUEST = "subscription.credential.request"
+
+    /**
+     * The current response presentation that can be submitted for a badge. This should be
+     * stored until it is successfully redeemed, the end of period changes, or the user
+     * manually cancels their subscription.
+     */
+    private const val SUBSCRIPTION_CREDENTIAL_RECEIPT = "subscription.credential.receipt"
+
+    /**
+     * Notes the "end of period" time for the latest subscription that we have started
+     * to get a response presentation for. When this is equal to the latest "end of period"
+     * it can be assumed that we have a request context that can be safely reused.
+     */
+    private const val SUBSCRIPTION_EOP_STARTED_TO_CONVERT = "subscription.eop.convert"
+
+    /**
+     * Notes the "end of period" time for the latest subscription that we have started
+     * to redeem a response presentation for. When this is equal to the latest "end of
+     * period" it can be assumed that we have a response presentation that we can submit
+     * to get an active token for.
+     */
+    private const val SUBSCRIPTION_EOP_STARTED_TO_REDEEM = "subscription.eop.redeem"
+
+    /**
+     * Notes the "end of period" time for the latest subscription that we have successfully
+     * and fully redeemed a token for. If this is equal to the latest "end of period" it is
+     * assumed that there is no work to be done.
+     */
+    private const val SUBSCRIPTION_EOP_REDEEMED = "subscription.eop.redeemed"
+
+    /**
+     * Notes the type of payment the user utilized for the latest subscription. This is useful
+     * in determining which error messaging they should see if something goes wrong.
+     */
+    private const val SUBSCRIPTION_PAYMENT_SOURCE_TYPE = "subscription.payment.source.type"
+
+    /**
+     * Marked whenever we check for Google Pay availability, to help make decisions without
+     * awaiting the background task.
+     */
+    private const val IS_GOOGLE_PAY_READY = "subscription.is.google.pay.ready"
+
+    /**
+     * Appended to whenever we complete a donation redemption (or gift send) for a bank transfer.
+     * Popped from whenever we enter the conversation list.
+     */
+    private const val DONATION_COMPLETE_QUEUE = "donation.complete.queue"
+
+    /**
+     * The current one-time donation we are processing, if we are doing so. This is used for showing
+     * the donation processing / donation pending state in the ManageDonationsFragment.
+     */
+    private const val PENDING_ONE_TIME_DONATION = "pending.one.time.donation"
+
+    /**
+     * Current pending 3DS data, set when the user launches an intent to an external source for
+     * completing a 3DS prompt or iDEAL prompt.
+     */
+    private const val PENDING_3DS_DATA = "pending.3ds.data"
+
+    /**
+     * Data about a monthly donation that required external verification and said verification was successful.
+     * Needed to show donation pending sheet after returning to Signal.
+     */
+    private const val VERIFIED_IDEAL_SUBSCRIPTION_3DS_DATA = "donation.verified_ideal_subscription_3ds_data"
+  }
+
+  public override fun onFirstEverAppLaunch() = Unit
+
+  public override fun getKeysToIncludeInBackup(): MutableList<String> = mutableListOf(
+    KEY_CURRENCY_CODE_ONE_TIME,
+    KEY_LAST_KEEP_ALIVE_LAUNCH,
+    KEY_LAST_END_OF_PERIOD_SECONDS,
+    SHOULD_CANCEL_SUBSCRIPTION_BEFORE_NEXT_SUBSCRIBE_ATTEMPT,
+    SUBSCRIPTION_CANCELATION_REASON,
+    SUBSCRIPTION_CANCELATION_TIMESTAMP,
+    SUBSCRIPTION_CANCELATION_WATERMARK,
+    SHOW_CANT_PROCESS_DIALOG,
+    SUBSCRIPTION_CREDENTIAL_REQUEST,
+    SUBSCRIPTION_CREDENTIAL_RECEIPT,
+    SUBSCRIPTION_EOP_STARTED_TO_CONVERT,
+    SUBSCRIPTION_EOP_STARTED_TO_REDEEM,
+    SUBSCRIPTION_EOP_REDEEMED,
+    SUBSCRIPTION_PAYMENT_SOURCE_TYPE
+  )
+
+  private val recurringDonationCurrencyPublisher: Subject<Currency> by lazy { BehaviorSubject.createDefault(getSubscriptionCurrency(InAppPaymentSubscriberRecord.Type.DONATION)) }
+  val observableRecurringDonationCurrency: Observable<Currency> by lazy { recurringDonationCurrencyPublisher }
+
+  private val recurringBackupCurrencyPublisher: Subject<Currency> by lazy { BehaviorSubject.createDefault(getSubscriptionCurrency(InAppPaymentSubscriberRecord.Type.BACKUP)) }
+  val observableRecurringBackupsCurrency: Observable<Currency> by lazy { recurringBackupCurrencyPublisher }
+
+  private val oneTimeCurrencyPublisher: Subject<Currency> by lazy { BehaviorSubject.createDefault(getOneTimeCurrency()) }
+  val observableOneTimeCurrency: Observable<Currency> by lazy { oneTimeCurrencyPublisher }
+
+  private var _pendingOneTimeDonation: PendingOneTimeDonation? by protoValue(PENDING_ONE_TIME_DONATION, PendingOneTimeDonation.ADAPTER)
+  private val pendingOneTimeDonationPublisher: Subject<Optional<PendingOneTimeDonation>> by lazy { BehaviorSubject.createDefault(Optional.ofNullable(_pendingOneTimeDonation)) }
+
+  /**
+   * Returns a stream of PendingOneTimeDonation, filtering out expired donations that do not have an error attached to them.
+   */
+  val observablePendingOneTimeDonation: Observable<Optional<PendingOneTimeDonation>> by lazy {
+    pendingOneTimeDonationPublisher.map { optionalPendingOneTimeDonation ->
+      optionalPendingOneTimeDonation.filter { (it.error != null) || !it.isExpired }
+    }
+  }
+
+  fun getSubscriptionCurrency(subscriberType: InAppPaymentSubscriberRecord.Type): Currency {
+    val currencyCode = if (subscriberType == InAppPaymentSubscriberRecord.Type.DONATION) {
+      getString(KEY_DONATION_SUBSCRIPTION_CURRENCY_CODE, null)
+    } else {
+      getString(KEY_BACKUPS_SUBSCRIPTION_CURRENCY_CODE, null)
+    }
+
+    val currency: Currency? = if (currencyCode == null) {
+      val localeCurrency = CurrencyUtil.getCurrencyByLocale(Locale.getDefault())
+      if (localeCurrency == null) {
+        val e164: String? = SignalStore.account.e164
+        if (e164 == null) {
+          null
+        } else {
+          CurrencyUtil.getCurrencyByE164(e164)
+        }
+      } else {
+        localeCurrency
+      }
+    } else {
+      CurrencyUtil.getCurrencyByCurrencyCode(currencyCode)
+    }
+
+    return if (currency != null && StripeApi.Validation.supportedCurrencyCodes.contains(currency.currencyCode.uppercase(Locale.ROOT))) {
+      currency
+    } else {
+      Currency.getInstance("USD")
+    }
+  }
+
+  fun getOneTimeCurrency(): Currency {
+    val oneTimeCurrency = getString(KEY_CURRENCY_CODE_ONE_TIME, null)
+    return if (oneTimeCurrency == null) {
+      val currency = getSubscriptionCurrency(InAppPaymentSubscriberRecord.Type.DONATION)
+      setOneTimeCurrency(currency)
+      currency
+    } else {
+      Currency.getInstance(oneTimeCurrency)
+    }
+  }
+
+  fun setOneTimeCurrency(currency: Currency) {
+    putString(KEY_CURRENCY_CODE_ONE_TIME, currency.currencyCode)
+    oneTimeCurrencyPublisher.onNext(currency)
+  }
+
+  @VisibleForTesting
+  fun setSubscriber(currencyCode: String, subscriberId: SubscriberId) {
+    val subscriberIdBytes = subscriberId.bytes
+
+    putBlob("$KEY_SUBSCRIBER_ID_PREFIX$currencyCode", subscriberIdBytes)
+  }
+
+  @Deprecated("Replaced with InAppPaymentSubscriberTable")
+  fun getSubscriber(currency: Currency): InAppPaymentSubscriberRecord? {
+    val currencyCode = currency.currencyCode
+    val subscriberIdBytes = getBlob("$KEY_SUBSCRIBER_ID_PREFIX$currencyCode", null)
+
+    return if (subscriberIdBytes == null) {
+      null
+    } else {
+      InAppPaymentSubscriberRecord(
+        SubscriberId.fromBytes(subscriberIdBytes),
+        currency,
+        InAppPaymentSubscriberRecord.Type.DONATION,
+        shouldCancelSubscriptionBeforeNextSubscribeAttempt,
+        getSubscriptionPaymentSourceType().toPaymentMethodType()
+      )
+    }
+  }
+
+  fun setSubscriberCurrency(currency: Currency, type: InAppPaymentSubscriberRecord.Type) {
+    if (type == InAppPaymentSubscriberRecord.Type.DONATION) {
+      store.beginWrite()
+        .putString(KEY_DONATION_SUBSCRIPTION_CURRENCY_CODE, currency.currencyCode)
+        .apply()
+
+      recurringDonationCurrencyPublisher.onNext(currency)
+    } else {
+      store.beginWrite()
+        .putString(KEY_BACKUPS_SUBSCRIPTION_CURRENCY_CODE, currency.currencyCode)
+        .apply()
+
+      recurringBackupCurrencyPublisher.onNext(currency)
+    }
+  }
+
+  fun getLevelOperation(level: String): LevelUpdateOperation? {
+    val idempotencyKey = getBlob("${KEY_LEVEL_OPERATION_PREFIX}$level", null)
+    return if (idempotencyKey != null) {
+      LevelUpdateOperation(IdempotencyKey.fromBytes(idempotencyKey), level)
+    } else {
+      null
+    }
+  }
+
+  fun setLevelOperation(levelUpdateOperation: LevelUpdateOperation) {
+    addLevelToHistory(levelUpdateOperation.level)
+    putBlob("$KEY_LEVEL_OPERATION_PREFIX${levelUpdateOperation.level}", levelUpdateOperation.idempotencyKey.bytes)
+  }
+
+  private fun getLevelHistory(): Set<String> {
+    return getString(KEY_LEVEL_HISTORY, "").split(",").toSet()
+  }
+
+  private fun addLevelToHistory(level: String) {
+    val levels = getLevelHistory() + level
+    putString(KEY_LEVEL_HISTORY, levels.joinToString(","))
+  }
+
+  fun clearLevelOperations() {
+    val levelHistory = getLevelHistory()
+    val write = store.beginWrite()
+    for (level in levelHistory) {
+      write.remove("${KEY_LEVEL_OPERATION_PREFIX}$level")
+    }
+    write.apply()
+  }
+
+  fun setExpiredBadge(badge: Badge?) {
+    if (badge != null) {
+      putBlob(EXPIRED_BADGE, Badges.toDatabaseBadge(badge).encode())
+    } else {
+      remove(EXPIRED_BADGE)
+    }
+  }
+
+  fun getExpiredBadge(): Badge? {
+    val badgeBytes = getBlob(EXPIRED_BADGE, null) ?: return null
+
+    return Badges.fromDatabaseBadge(BadgeList.Badge.ADAPTER.decode(badgeBytes))
+  }
+
+  // MOLLY: TODO
+  // fun setExpiredGiftBadge(badge: Badge?) {
+  //   if (badge != null) {
+  //     putBlob(EXPIRED_GIFT_BADGE, Badges.toDatabaseBadge(badge).encode())
+  //   } else {
+  //     remove(EXPIRED_GIFT_BADGE)
+  //   }
+  // }
+
+  // MOLLY: TODO
+  // fun getExpiredGiftBadge(): Badge? {
+  //   val badgeBytes = getBlob(EXPIRED_GIFT_BADGE, null) ?: return null
+  //
+  //   return Badges.fromDatabaseBadge(BadgeList.Badge.ADAPTER.decode(badgeBytes))
+  // }
+
+  fun getLastKeepAliveLaunchTime(): Long {
+    return getLong(KEY_LAST_KEEP_ALIVE_LAUNCH, 0L)
+  }
+
+  fun setLastKeepAliveLaunchTime(timestamp: Long) {
+    putLong(KEY_LAST_KEEP_ALIVE_LAUNCH, timestamp)
+  }
+
+  /**
+   * Returns the last end-of-period we have tried to redeem for a badge subscription
+   */
+  fun getLastEndOfPeriod(): Long {
+    return getLong(KEY_LAST_END_OF_PERIOD_SECONDS, 0L)
+  }
+
+  fun setLastEndOfPeriod(timestamp: Long) {
+    putLong(KEY_LAST_END_OF_PERIOD_SECONDS, timestamp)
+  }
+
+  /**
+   * True if the local user is likely a sustainer, otherwise false. Note the term 'likely', because this is based on cached data. Any serious decisions that
+   * rely on this should make a network request to determine subscription status.
+   */
+  fun isLikelyASustainer(): Boolean {
+    return TimeUnit.SECONDS.toMillis(getLastEndOfPeriod()) > System.currentTimeMillis()
+  }
+
+  fun isDonationSubscriptionManuallyCancelled(): Boolean {
+    return getBoolean(USER_MANUALLY_CANCELLED_DONATION, false)
+  }
+
+  fun isBackupSubscriptionManuallyCancelled(): Boolean {
+    return getBoolean(USER_MANUALLY_CANCELLED_BACKUPS, false)
+  }
+
+  fun setDisplayBadgesOnProfile(enabled: Boolean) {
+    putBoolean(DISPLAY_BADGES_ON_PROFILE, enabled)
+  }
+
+  fun getDisplayBadgesOnProfile(): Boolean {
+    return getBoolean(DISPLAY_BADGES_ON_PROFILE, false)
+  }
+
+  fun getSubscriptionRedemptionFailed(): Boolean {
+    return getBoolean(SUBSCRIPTION_REDEMPTION_FAILED, false)
+  }
+
+  fun markSubscriptionRedemptionFailed() {
+    Log.w(TAG, "markSubscriptionRedemptionFailed()", Throwable(), true)
+    putBoolean(SUBSCRIPTION_REDEMPTION_FAILED, true)
+  }
+
+  fun clearSubscriptionRedemptionFailed() {
+    putBoolean(SUBSCRIPTION_REDEMPTION_FAILED, false)
+  }
+
+  @Deprecated("Cancellation status is now stored in InAppPaymentTable")
+  fun setUnexpectedSubscriptionCancelationChargeFailure(chargeFailure: ActiveSubscription.ChargeFailure?) {
+    if (chargeFailure == null) {
+      remove(SUBSCRIPTION_CANCELATION_CHARGE_FAILURE)
+    } else {
+      putString(SUBSCRIPTION_CANCELATION_CHARGE_FAILURE, JsonUtil.toJson(chargeFailure))
+    }
+  }
+
+  fun getUnexpectedSubscriptionCancelationChargeFailure(): ActiveSubscription.ChargeFailure? {
+    val json = getString(SUBSCRIPTION_CANCELATION_CHARGE_FAILURE, null)
+    return if (json.isNullOrEmpty()) {
+      null
+    } else {
+      JsonUtil.fromJson(json, ActiveSubscription.ChargeFailure::class.java)
+    }
+  }
+
+  @Deprecated("Cancellation status is now tracked in InAppPaymentTable")
+  var unexpectedSubscriptionCancelationReason: String? by stringValue(SUBSCRIPTION_CANCELATION_REASON, null)
+
+  @Deprecated("Cancellation status is now tracked in InAppPaymentTable")
+  var unexpectedSubscriptionCancelationTimestamp: Long by longValue(SUBSCRIPTION_CANCELATION_TIMESTAMP, 0L)
+
+  @Deprecated("Cancellation status is now tracked in InAppPaymentTable")
+  var unexpectedSubscriptionCancelationWatermark: Long by longValue(SUBSCRIPTION_CANCELATION_WATERMARK, 0L)
+
+  @get:JvmName("showCantProcessDialog")
+  var showMonthlyDonationCanceledDialog: Boolean by booleanValue(SHOW_CANT_PROCESS_DIALOG, true)
+
+  /**
+   * Denotes that the previous attempt to subscribe failed in some way. Either an
+   * automatic renewal failed resulting in an unexpected expiration, or payment failed
+   * on Stripe's end.
+   *
+   * Before trying to resubscribe, we should first ensure there are no subscriptions set
+   * on the server. Otherwise, we could get into a situation where the user is unable to
+   * resubscribe.
+   */
+  var shouldCancelSubscriptionBeforeNextSubscribeAttempt: Boolean
+    get() = getBoolean(SHOULD_CANCEL_SUBSCRIPTION_BEFORE_NEXT_SUBSCRIBE_ATTEMPT, false)
+    set(value) = putBoolean(SHOULD_CANCEL_SUBSCRIPTION_BEFORE_NEXT_SUBSCRIBE_ATTEMPT, value)
+
+  var isGooglePayReady: Boolean by booleanValue(IS_GOOGLE_PAY_READY, false)
+
+  /**
+   * Consolidates a bunch of data clears that should occur whenever a user manually cancels their
+   * subscription:
+   *
+   * 1. Clears keep-alive flag
+   * 1. Clears level operation
+   * 1. Marks the user as manually cancelled
+   * 1. Clears out unexpected cancelation state
+   * 1. Clears expired badge if it is for a subscription
+   */
+  @WorkerThread
+  fun updateLocalStateForManualCancellation(subscriberType: InAppPaymentSubscriberRecord.Type) {
+    synchronized(subscriberType) {
+      Log.d(TAG, "[updateLocalStateForManualCancellation] Clearing donation values.")
+      clearLevelOperations()
+
+      if (subscriberType == InAppPaymentSubscriberRecord.Type.DONATION) {
+        setLastEndOfPeriod(0L)
+        setUnexpectedSubscriptionCancelationChargeFailure(null)
+        unexpectedSubscriptionCancelationReason = null
+        unexpectedSubscriptionCancelationTimestamp = 0L
+
+        clearSubscriptionRequestCredential()
+        clearSubscriptionReceiptCredential()
+
+        val expiredBadge = getExpiredBadge()
+        if (expiredBadge != null && expiredBadge.isSubscription()) {
+          Log.d(TAG, "[updateLocalStateForManualCancellation] Clearing expired badge.")
+          setExpiredBadge(null)
+        }
+        markDonationManuallyCancelled()
+      } else {
+        markBackupSubscriptionpManuallyCancelled()
+      }
+
+      val subscriber = InAppPaymentsRepository.getSubscriber(subscriberType)
+      InAppPaymentsRepository.setShouldCancelSubscriptionBeforeNextSubscribeAttempt(subscriberType, subscriber?.subscriberId, true)
+      if (subscriber != null) {
+        SignalDatabase.inAppPayments.markSubscriptionManuallyCanceled(subscriberId = subscriber.subscriberId)
+      }
+    }
+  }
+
+  /**
+   * Consolidates a bunch of data clears that should occur whenever a user begins a new subscription:
+   *
+   * 1. Manual cancellation marker
+   * 1. Any set level operations
+   * 1. Unexpected cancelation flags
+   * 1. Expired badge, if it is of a subscription
+   */
+  @WorkerThread
+  fun updateLocalStateForLocalSubscribe(subscriberType: InAppPaymentSubscriberRecord.Type) {
+    synchronized(subscriberType) {
+      clearLevelOperations()
+
+      if (subscriberType == InAppPaymentSubscriberRecord.Type.DONATION) {
+        Log.d(TAG, "[updateLocalStateForLocalSubscribe] Clearing donation values.")
+
+        clearDonationManuallyCancelled()
+        setUnexpectedSubscriptionCancelationChargeFailure(null)
+        unexpectedSubscriptionCancelationReason = null
+        unexpectedSubscriptionCancelationTimestamp = 0L
+        refreshSubscriptionRequestCredential()
+        clearSubscriptionReceiptCredential()
+
+        val expiredBadge = getExpiredBadge()
+        if (expiredBadge != null && expiredBadge.isSubscription()) {
+          Log.d(TAG, "[updateLocalStateForLocalSubscribe] Clearing expired badge.")
+          setExpiredBadge(null)
+        }
+      } else {
+        clearBackupSubscriptionManuallyCancelled()
+      }
+
+      val subscriber = InAppPaymentsRepository.requireSubscriber(subscriberType)
+      InAppPaymentsRepository.setShouldCancelSubscriptionBeforeNextSubscribeAttempt(subscriber, false)
+    }
+  }
+
+  fun refreshSubscriptionRequestCredential() {
+    putBlob(SUBSCRIPTION_CREDENTIAL_REQUEST, InAppPaymentsRepository.generateRequestCredential().serialize())
+  }
+
+  fun setSubscriptionRequestCredential(requestContext: ReceiptCredentialRequestContext) {
+    putBlob(SUBSCRIPTION_CREDENTIAL_REQUEST, requestContext.serialize())
+  }
+
+  fun getSubscriptionRequestCredential(): ReceiptCredentialRequestContext? {
+    val bytes = getBlob(SUBSCRIPTION_CREDENTIAL_REQUEST, null) ?: return null
+
+    return ReceiptCredentialRequestContext(bytes)
+  }
+
+  fun clearSubscriptionRequestCredential() {
+    remove(SUBSCRIPTION_CREDENTIAL_REQUEST)
+  }
+
+  fun setSubscriptionReceiptCredential(receiptCredentialPresentation: ReceiptCredentialPresentation) {
+    putBlob(SUBSCRIPTION_CREDENTIAL_RECEIPT, receiptCredentialPresentation.serialize())
+  }
+
+  fun getSubscriptionReceiptCredential(): ReceiptCredentialPresentation? {
+    val bytes = getBlob(SUBSCRIPTION_CREDENTIAL_RECEIPT, null) ?: return null
+
+    return ReceiptCredentialPresentation(bytes)
+  }
+
+  fun clearSubscriptionReceiptCredential() {
+    remove(SUBSCRIPTION_CREDENTIAL_RECEIPT)
+  }
+
+  @Deprecated("This information is now stored in InAppPaymentTable")
+  fun setSubscriptionPaymentSourceType(paymentSourceType: PaymentSourceType) {
+    putString(SUBSCRIPTION_PAYMENT_SOURCE_TYPE, paymentSourceType.code)
+  }
+
+  @Deprecated("This information is now stored in InAppPaymentTable")
+  fun getSubscriptionPaymentSourceType(): PaymentSourceType {
+    return PaymentSourceType.fromCode(getString(SUBSCRIPTION_PAYMENT_SOURCE_TYPE, null))
+  }
+
+  var subscriptionEndOfPeriodConversionStarted by longValue(SUBSCRIPTION_EOP_STARTED_TO_CONVERT, 0L)
+  var subscriptionEndOfPeriodRedemptionStarted by longValue(SUBSCRIPTION_EOP_STARTED_TO_REDEEM, 0L)
+  var subscriptionEndOfPeriodRedeemed by longValue(SUBSCRIPTION_EOP_REDEEMED, 0L)
+
+  fun appendToTerminalDonationQueue(terminalDonation: TerminalDonationQueue.TerminalDonation) {
+    synchronized(this) {
+      val pendingBytes = getBlob(DONATION_COMPLETE_QUEUE, null)
+      val queue: TerminalDonationQueue = pendingBytes?.let { TerminalDonationQueue.ADAPTER.decode(pendingBytes) } ?: TerminalDonationQueue()
+      val newQueue: TerminalDonationQueue = queue.copy(terminalDonations = queue.terminalDonations + terminalDonation)
+
+      putBlob(DONATION_COMPLETE_QUEUE, newQueue.encode())
+    }
+  }
+
+  fun consumeTerminalDonations(): List<TerminalDonationQueue.TerminalDonation> {
+    synchronized(this) {
+      val pendingBytes = getBlob(DONATION_COMPLETE_QUEUE, null)
+      if (pendingBytes == null) {
+        return emptyList()
+      } else {
+        val queue: TerminalDonationQueue = TerminalDonationQueue.ADAPTER.decode(pendingBytes)
+        remove(DONATION_COMPLETE_QUEUE)
+
+        return queue.terminalDonations
+      }
+    }
+  }
+
+  fun getPendingOneTimeDonation(): PendingOneTimeDonation? {
+    return synchronized(this) {
+      _pendingOneTimeDonation.takeUnless { it?.isExpired == true }
+    }
+  }
+
+  fun setPendingOneTimeDonation(pendingOneTimeDonation: PendingOneTimeDonation?) {
+    synchronized(this) {
+      this._pendingOneTimeDonation = pendingOneTimeDonation
+      pendingOneTimeDonationPublisher.onNext(Optional.ofNullable(pendingOneTimeDonation))
+    }
+  }
+
+  fun setPendingOneTimeDonationError(error: DonationErrorValue) {
+    synchronized(this) {
+      val pendingOneTimeDonation = getPendingOneTimeDonation()
+      if (pendingOneTimeDonation != null) {
+        setPendingOneTimeDonation(pendingOneTimeDonation.newBuilder().error(error).build())
+      } else {
+        Log.w(TAG, "PendingOneTimeDonation was null, ignoring error.")
+      }
+    }
+  }
+
+  fun consumePending3DSData(): Stripe3DSData? {
+    synchronized(this) {
+      val data = getBlob(PENDING_3DS_DATA, null)?.let {
+        Stripe3DSData.fromProtoBytes(it)
+      }
+
+      remove(PENDING_3DS_DATA)
+      return data
+    }
+  }
+
+  fun consumeVerifiedSubscription3DSData(): Stripe3DSData? {
+    synchronized(this) {
+      val data = getBlob(VERIFIED_IDEAL_SUBSCRIPTION_3DS_DATA, null)?.let {
+        Stripe3DSData.fromProtoBytes(it)
+      }
+
+      setVerifiedSubscription3DSData(null)
+      return data
+    }
+  }
+
+  fun setVerifiedSubscription3DSData(stripe3DSData: Stripe3DSData?) {
+    synchronized(this) {
+      if (stripe3DSData != null) {
+        putBlob(VERIFIED_IDEAL_SUBSCRIPTION_3DS_DATA, stripe3DSData.toProtoBytes())
+      } else {
+        remove(VERIFIED_IDEAL_SUBSCRIPTION_3DS_DATA)
+      }
+    }
+  }
+
+  private fun markBackupSubscriptionpManuallyCancelled() {
+    return putBoolean(USER_MANUALLY_CANCELLED_BACKUPS, true)
+  }
+
+  private fun clearBackupSubscriptionManuallyCancelled() {
+    remove(USER_MANUALLY_CANCELLED_BACKUPS)
+  }
+
+  private fun markDonationManuallyCancelled() {
+    return putBoolean(USER_MANUALLY_CANCELLED_DONATION, true)
+  }
+
+  private fun clearDonationManuallyCancelled() {
+    remove(USER_MANUALLY_CANCELLED_DONATION)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InternalValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InternalValues.java
index e2cfd6dc0a..8b79177c82 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InternalValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InternalValues.java
@@ -5,7 +5,7 @@
 import org.signal.ringrtc.CallManager;
 import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.util.Environment;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -14,7 +14,6 @@
 public final class InternalValues extends SignalStoreValues {
 
   public static final String GV2_FORCE_INVITES                    = "internal.gv2.force_invites";
-  public static final String GV2_IGNORE_SERVER_CHANGES            = "internal.gv2.ignore_server_changes";
   public static final String GV2_IGNORE_P2P_CHANGES               = "internal.gv2.ignore_p2p_changes";
   public static final String RECIPIENT_DETAILS                    = "internal.recipient_details";
   public static final String ALLOW_CENSORSHIP_SETTING             = "internal.force_censorship";
@@ -25,7 +24,7 @@ public final class InternalValues extends SignalStoreValues {
   public static final String CALLING_AUDIO_PROCESSING_METHOD      = "internal.calling_audio_processing_method";
   public static final String CALLING_DATA_MODE                    = "internal.calling_bandwidth_mode";
   public static final String CALLING_DISABLE_TELECOM              = "internal.calling_disable_telecom";
-  public static final String CALLING_DISABLE_LBRED                = "internal.calling_disable_lbred";
+  public static final String CALLING_ENABLE_OBOE_ADM              = "internal.calling_enable_oboe_adm";
   public static final String DISABLE_STORAGE_SERVICE              = "internal.disable_storage_service";
   public static final String FORCE_WEBSOCKET_MODE                 = "internal.force_websocket_mode";
   public static final String LAST_SCROLL_POSITION                 = "internal.last_scroll_position";
@@ -50,20 +49,7 @@ void onFirstEverAppLaunch() {
    * Members will not be added directly to a GV2 even if they could be.
    */
   public synchronized boolean gv2ForceInvites() {
-    return FeatureFlags.internalUser() && getBoolean(GV2_FORCE_INVITES, false);
-  }
-
-  /**
-   * The Server will leave out changes that can only be described by a future protocol level that
-   * an older client cannot understand. Ignoring those changes by nulling them out simulates that
-   * scenario for testing.
-   * <p>
-   * In conjunction with {@link #gv2IgnoreP2PChanges()} it means no group changes are coming into
-   * the client and it will generate changes by group state comparison, and those changes will not
-   * have an editor and so will be in the passive voice.
-   */
-  public synchronized boolean gv2IgnoreServerChanges() {
-    return FeatureFlags.internalUser() && getBoolean(GV2_IGNORE_SERVER_CHANGES, false);
+    return RemoteConfig.internalUser() && getBoolean(GV2_FORCE_INVITES, false);
   }
 
   /**
@@ -71,49 +57,49 @@ public synchronized boolean gv2IgnoreServerChanges() {
    * directly which allows testing of certain testing scenarios.
    */
   public synchronized boolean gv2IgnoreP2PChanges() {
-    return FeatureFlags.internalUser() && getBoolean(GV2_IGNORE_P2P_CHANGES, false);
+    return RemoteConfig.internalUser() && getBoolean(GV2_IGNORE_P2P_CHANGES, false);
   }
 
   /**
    * Show detailed recipient info in the {@link org.thoughtcrime.securesms.components.settings.conversation.InternalConversationSettingsFragment}.
    */
   public synchronized boolean recipientDetails() {
-    return FeatureFlags.internalUser() && getBoolean(RECIPIENT_DETAILS, true);
+    return RemoteConfig.internalUser() && getBoolean(RECIPIENT_DETAILS, true);
   }
 
   /**
    * Allow changing the censorship circumvention setting regardless of network status.
    */
   public synchronized boolean allowChangingCensorshipSetting() {
-    return FeatureFlags.internalUser() && getBoolean(ALLOW_CENSORSHIP_SETTING, false);
+    return RemoteConfig.internalUser() && getBoolean(ALLOW_CENSORSHIP_SETTING, false);
   }
 
   /**
    * Force the app to use the emoji that ship with the app, as opposed to the ones that were downloaded.
    */
   public synchronized boolean forceBuiltInEmoji() {
-    return FeatureFlags.internalUser() && getBoolean(FORCE_BUILT_IN_EMOJI, false);
+    return RemoteConfig.internalUser() && getBoolean(FORCE_BUILT_IN_EMOJI, false);
   }
 
   /**
    * Remove the requirement that there must be two sender-key-capable recipients to use sender key
    */
   public synchronized boolean removeSenderKeyMinimum() {
-    return FeatureFlags.internalUser() && getBoolean(REMOVE_SENDER_KEY_MINIMUM, false);
+    return RemoteConfig.internalUser() && getBoolean(REMOVE_SENDER_KEY_MINIMUM, false);
   }
 
   /**
    * Delay resending messages in response to retry receipts by 10 seconds.
    */
   public synchronized boolean delayResends() {
-    return FeatureFlags.internalUser() && getBoolean(DELAY_RESENDS, false);
+    return RemoteConfig.internalUser() && getBoolean(DELAY_RESENDS, false);
   }
 
   /**
    * Whether or not storage service is manually disabled.
    */
   public synchronized boolean storageServiceDisabled() {
-    return FeatureFlags.internalUser() && getBoolean(DISABLE_STORAGE_SERVICE, false);
+    return RemoteConfig.internalUser() && getBoolean(DISABLE_STORAGE_SERVICE, false);
   }
 
   /**
@@ -124,7 +110,7 @@ public synchronized boolean storageServiceDisabled() {
    * internal users cannot be left on old servers.
    */
   public synchronized @NonNull String groupCallingServer() {
-    String internalServer = FeatureFlags.internalUser() ? getString(CALLING_SERVER, Environment.Calling.defaultSfuUrl()) : null;
+    String internalServer = RemoteConfig.internalUser() ? getString(CALLING_SERVER, Environment.Calling.defaultSfuUrl()) : null;
     if (internalServer != null && !Arrays.asList(BuildConfig.SIGNAL_SFU_INTERNAL_URLS).contains(internalServer)) {
       internalServer = null;
     }
@@ -135,7 +121,7 @@ public synchronized boolean storageServiceDisabled() {
    * Setting to override the default handling of hardware/software AEC.
    */
   public synchronized CallManager.AudioProcessingMethod callingAudioProcessingMethod() {
-    if (FeatureFlags.internalUser()) {
+    if (RemoteConfig.internalUser()) {
       return CallManager.AudioProcessingMethod.values()[getInteger(CALLING_AUDIO_PROCESSING_METHOD, CallManager.AudioProcessingMethod.Default.ordinal())];
     } else {
       return CallManager.AudioProcessingMethod.Default;
@@ -146,7 +132,7 @@ public synchronized CallManager.AudioProcessingMethod callingAudioProcessingMeth
    * Setting to override the default calling bandwidth mode.
    */
   public synchronized CallManager.DataMode callingDataMode() {
-    if (FeatureFlags.internalUser()) {
+    if (RemoteConfig.internalUser()) {
       int                    index = getInteger(CALLING_DATA_MODE, CallManager.DataMode.NORMAL.ordinal());
       CallManager.DataMode[] modes = CallManager.DataMode.values();
 
@@ -160,7 +146,7 @@ public synchronized CallManager.DataMode callingDataMode() {
    * Whether or not Telecom integration is manually disabled.
    */
   public synchronized boolean callingDisableTelecom() {
-    if (FeatureFlags.internalUser()) {
+    if (RemoteConfig.internalUser()) {
       return getBoolean(CALLING_DISABLE_TELECOM, true);
     } else {
       return false;
@@ -168,13 +154,13 @@ public synchronized boolean callingDisableTelecom() {
   }
 
   /**
-   * Whether or not LBRed for Opus is manually disabled.
+   * Whether or not the Oboe ADM is used.
    */
-  public synchronized boolean callingDisableLBRed() {
-    if (FeatureFlags.internalUser()) {
-      return getBoolean(CALLING_DISABLE_LBRED, false);
+  public synchronized boolean callingEnableOboeAdm() {
+    if (RemoteConfig.internalUser()) {
+      return getBoolean(CALLING_ENABLE_OBOE_ADM, true);
     } else {
-      return true;
+      return false;
     }
   }
 
@@ -182,7 +168,7 @@ public synchronized boolean callingDisableLBRed() {
    * Whether or not the system is forced to be in 'websocket mode', where FCM is ignored and we use a foreground service to keep the app alive.
    */
   public boolean isWebsocketModeForced() {
-    if (FeatureFlags.internalUser()) {
+    if (RemoteConfig.internalUser()) {
       return getBoolean(FORCE_WEBSOCKET_MODE, false);
     } else {
       return false;
@@ -202,15 +188,7 @@ public void setUseConversationItemV2Media(boolean useConversationFragmentV2Media
   }
 
   public boolean useConversationItemV2Media() {
-    return FeatureFlags.internalUser() && getBoolean(CONVERSATION_ITEM_V2_MEDIA, false);
-  }
-
-  public void setForceEnterRestoreV2Flow(boolean enter) {
-    putBoolean(FORCE_ENTER_RESTORE_V2_FLOW, enter);
-  }
-
-  public boolean enterRestoreV2Flow() {
-    return FeatureFlags.restoreAfterRegistration() && getBoolean(FORCE_ENTER_RESTORE_V2_FLOW, false);
+    return RemoteConfig.internalUser() && getBoolean(CONVERSATION_ITEM_V2_MEDIA, false);
   }
 
   public synchronized void setWebSocketShadowingStats(byte[] bytes) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/MiscellaneousValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/MiscellaneousValues.kt
index 9a2aaecfaa..386e66a6c0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/MiscellaneousValues.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/MiscellaneousValues.kt
@@ -5,7 +5,7 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.PendingChangeNum
 import org.thoughtcrime.securesms.jobmanager.impl.ChangeNumberConstraintObserver
 import org.thoughtcrime.securesms.keyvalue.protos.LeastActiveLinkedDevice
 
-internal class MiscellaneousValues internal constructor(store: KeyValueStore) : SignalStoreValues(store) {
+class MiscellaneousValues internal constructor(store: KeyValueStore) : SignalStoreValues(store) {
   companion object {
     private const val LAST_PREKEY_REFRESH_TIME = "last_prekey_refresh_time"
     private const val MESSAGE_REQUEST_ENABLE_TIME = "message_request_enable_time"
@@ -153,11 +153,6 @@ internal class MiscellaneousValues internal constructor(store: KeyValueStore) :
    */
   var lastForegroundTime by longValue(LAST_FOREGROUND_TIME, 0)
 
-  /**
-   * Whether or not we've done the initial "PNP Hello World" dance.
-   */
-  var hasPniInitializedDevices by booleanValue(PNI_INITIALIZED_DEVICES, false)
-
   /**
    * Whether or not the user has linked devices.
    */
@@ -198,10 +193,16 @@ internal class MiscellaneousValues internal constructor(store: KeyValueStore) :
   /**
    * The last-known offset between our local clock and the server. To get an estimate of the server time, take your current time and subtract this offset. e.g.
    *
-   * estimatedServerTime = System.currentTimeMillis() - SignalStore.misc().getLastKnownServerTimeOffset()
+   * estimatedServerTime = System.currentTimeMillis() - SignalStore.misc.getLastKnownServerTimeOffset()
    */
   val lastKnownServerTimeOffset by longValue(SERVER_TIME_OFFSET, 0)
 
+  /**
+   * An estimate of the server time, based on the last-known server time offset.
+   */
+  val estimatedServerTime: Long
+    get() = System.currentTimeMillis() - lastKnownServerTimeOffset
+
   /**
    * The last time (using our local clock) we updated the server time offset returned by [.getLastKnownServerTimeOffset]}.
    */
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/NotificationProfileValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/NotificationProfileValues.kt
index 45fc47b1d3..f79dac6543 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/NotificationProfileValues.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/NotificationProfileValues.kt
@@ -5,7 +5,7 @@ import androidx.annotation.VisibleForTesting
 /**
  * Values for managing enable/disable state and corresponding alerts for Notification Profiles.
  */
-internal class NotificationProfileValues(store: KeyValueStore) : SignalStoreValues(store) {
+class NotificationProfileValues(store: KeyValueStore) : SignalStoreValues(store) {
 
   companion object {
     private const val KEY_LAST_PROFILE_POPUP = "np.last_profile_popup"
@@ -22,9 +22,9 @@ internal class NotificationProfileValues(store: KeyValueStore) : SignalStoreValu
     const val KEY_MANUALLY_DISABLED_AT = "np.manually_disabled_at"
   }
 
-  override fun onFirstEverAppLaunch() = Unit
+  public override fun onFirstEverAppLaunch() = Unit
 
-  override fun getKeysToIncludeInBackup(): MutableList<String> {
+  public override fun getKeysToIncludeInBackup(): MutableList<String> {
     return mutableListOf(KEY_SEEN_TOOLTIP)
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/OnboardingValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/OnboardingValues.java
index 32e49fa66f..3384332e65 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/OnboardingValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/OnboardingValues.java
@@ -10,7 +10,6 @@
 public final class OnboardingValues extends SignalStoreValues {
 
   private static final String SHOW_STORIES        = "onboarding.stories_molly";
-  private static final String SHOW_INVITE_FRIENDS = "onboarding.invite_friends";
   private static final String SHOW_APPEARANCE     = "onboarding.appearance";
   private static final String SHOW_ADD_PHOTO      = "onboarding.add_photo";
 
@@ -21,7 +20,6 @@ public final class OnboardingValues extends SignalStoreValues {
   @Override
   void onFirstEverAppLaunch() {
     putBoolean(SHOW_STORIES, true);
-    putBoolean(SHOW_INVITE_FRIENDS, true);
     putBoolean(SHOW_APPEARANCE, true);
     putBoolean(SHOW_ADD_PHOTO, true);
   }
@@ -33,14 +31,12 @@ void onFirstEverAppLaunch() {
 
   public void clearAll() {
     setShowStories(false);
-    setShowInviteFriends(false);
     setShowAppearance(false);
     setShowAddPhoto(false);
   }
 
   public boolean hasOnboarding(@NonNull Context context) {
     return shouldShowStories()       ||
-           shouldShowInviteFriends() ||
            shouldShowAppearance()    ||
            shouldShowAddPhoto();
   }
@@ -53,14 +49,6 @@ public boolean shouldShowStories(){
     return getBoolean(SHOW_STORIES, false);
   }
 
-  public void setShowInviteFriends(boolean value) {
-    putBoolean(SHOW_INVITE_FRIENDS, value);
-  }
-
-  public boolean shouldShowInviteFriends() {
-    return getBoolean(SHOW_INVITE_FRIENDS, false);
-  }
-
   public void setShowAppearance(boolean value) {
     putBoolean(SHOW_APPEARANCE, value);
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PaymentsValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PaymentsValues.kt
index 1298b1e5a5..76678b3e9a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PaymentsValues.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PaymentsValues.kt
@@ -26,7 +26,7 @@ import java.util.Arrays
 import java.util.Currency
 import java.util.Locale
 
-internal class PaymentsValues internal constructor(store: KeyValueStore) : SignalStoreValues(store) {
+class PaymentsValues internal constructor(store: KeyValueStore) : SignalStoreValues(store) {
 
   companion object {
     private val TAG = Log.tag(PaymentsValues::class.java)
@@ -219,8 +219,8 @@ internal class PaymentsValues internal constructor(store: KeyValueStore) : Signa
 
   fun showUpdatePinInfoCard(): Boolean {
     return if (userHasLargeBalance() &&
-      SignalStore.svr().hasPin() &&
-      !SignalStore.svr().hasOptedOut() && SignalStore.pinValues().keyboardType == PinKeyboardType.NUMERIC
+      SignalStore.svr.hasPin() &&
+      !SignalStore.svr.hasOptedOut() && SignalStore.pin.keyboardType == PinKeyboardType.NUMERIC
     ) {
       store.getBoolean(SHOW_CASHING_OUT_INFO_CARD, true)
     } else {
@@ -277,7 +277,7 @@ internal class PaymentsValues internal constructor(store: KeyValueStore) : Signa
   }
 
   private fun determineCurrency(): Currency {
-    val localE164: String = SignalStore.account().e164 ?: ""
+    val localE164: String = SignalStore.account.e164 ?: ""
 
     return Util.firstNonNull(
       CurrencyUtil.getCurrencyByE164(localE164),
@@ -332,7 +332,9 @@ internal class PaymentsValues internal constructor(store: KeyValueStore) : Signa
   }
 
   enum class WalletRestoreResult {
-    ENTROPY_CHANGED, ENTROPY_UNCHANGED, MNEMONIC_ERROR
+    ENTROPY_CHANGED,
+    ENTROPY_UNCHANGED,
+    MNEMONIC_ERROR
   }
 
   private fun userHasLargeBalance(): Boolean {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PinValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PinValues.java
index e5f7c607ee..8a140cb773 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PinValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PinValues.java
@@ -3,7 +3,7 @@
 import androidx.annotation.NonNull;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.lock.SignalPinReminders;
 import org.thoughtcrime.securesms.lock.v2.PinKeyboardType;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -78,11 +78,11 @@ public void resetPinReminders() {
   }
 
   public long getCurrentInterval() {
-    return getLong(NEXT_INTERVAL, TextSecurePreferences.getRegistrationLockNextReminderInterval(ApplicationDependencies.getApplication()));
+    return getLong(NEXT_INTERVAL, TextSecurePreferences.getRegistrationLockNextReminderInterval(AppDependencies.getApplication()));
   }
 
   public long getLastSuccessfulEntryTime() {
-    return getLong(LAST_SUCCESSFUL_ENTRY, TextSecurePreferences.getRegistrationLockLastReminderTime(ApplicationDependencies.getApplication()));
+    return getLong(LAST_SUCCESSFUL_ENTRY, TextSecurePreferences.getRegistrationLockLastReminderTime(AppDependencies.getApplication()));
   }
 
   public void setKeyboardType(@NonNull PinKeyboardType keyboardType) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PlainTextSharedPrefsDataStore.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PlainTextSharedPrefsDataStore.kt
index 250411029a..e2840c23da 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PlainTextSharedPrefsDataStore.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/PlainTextSharedPrefsDataStore.kt
@@ -9,7 +9,7 @@ import org.thoughtcrime.securesms.util.SecurePreferenceManager
  * Usually, it's because the value your storing is _related to_ the database. Regardless, this is just a normal
  * shared-prefs-backed class. Do not put anything in here that you wouldn't be comfortable storing in plain text.
  *
- * A good rule of thumb might be: if you're not comforable logging it, then you shouldn't be comfortable putting
+ * A good rule of thumb might be: if you're not comfortable logging it, then you shouldn't be comfortable putting
  * it in here.
  */
 class PlainTextSharedPrefsDataStore(private val context: Context) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/RegistrationValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/RegistrationValues.java
index 0d7afce490..0e116e10c9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/RegistrationValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/RegistrationValues.java
@@ -9,13 +9,12 @@
 
 public final class RegistrationValues extends SignalStoreValues {
 
-  private static final String REGISTRATION_COMPLETE = "registration.complete";
-  private static final String PIN_REQUIRED          = "registration.pin_required";
-  private static final String HAS_UPLOADED_PROFILE  = "registration.has_uploaded_profile";
-  private static final String SESSION_E164          = "registration.session_e164";
-  private static final String SESSION_ID            = "registration.session_id";
-  private static final String NEED_DOWNLOAD_PROFILE        = "registration.need_download_profile";
-  private static final String NEED_DOWNLOAD_PROFILE_AVATAR = "registration.need_download_profile_avatar";
+  private static final String REGISTRATION_COMPLETE       = "registration.complete";
+  private static final String PIN_REQUIRED                = "registration.pin_required";
+  private static final String HAS_UPLOADED_PROFILE        = "registration.has_uploaded_profile";
+  private static final String SESSION_E164                = "registration.session_e164";
+  private static final String SESSION_ID                  = "registration.session_id";
+  private static final String SKIPPED_TRANSFER_OR_RESTORE = "registration.has_skipped_transfer_or_restore";
 
   RegistrationValues(@NonNull KeyValueStore store) {
     super(store);
@@ -24,10 +23,9 @@ public final class RegistrationValues extends SignalStoreValues {
   public synchronized void onFirstEverAppLaunch() {
     getStore().beginWrite()
               .putBoolean(HAS_UPLOADED_PROFILE, false)
-              .putBoolean(NEED_DOWNLOAD_PROFILE, false)
-              .putBoolean(NEED_DOWNLOAD_PROFILE_AVATAR, false)
               .putBoolean(REGISTRATION_COMPLETE, false)
               .putBoolean(PIN_REQUIRED, true)
+              .putBoolean(SKIPPED_TRANSFER_OR_RESTORE, false)
               .commit();
   }
 
@@ -72,6 +70,18 @@ public void setSessionId(String sessionId) {
     putString(SESSION_ID, sessionId);
   }
 
+  public boolean hasSkippedTransferOrRestore() {
+    return getBoolean(SKIPPED_TRANSFER_OR_RESTORE, false);
+  }
+
+  public void markSkippedTransferOrRestore() {
+    putBoolean(SKIPPED_TRANSFER_OR_RESTORE, true);
+  }
+
+  public void clearSkippedTransferOrRestore() {
+    putBoolean(SKIPPED_TRANSFER_OR_RESTORE, false);
+  }
+
   @Nullable
   public String getSessionId() {
     return getString(SESSION_ID, null);
@@ -85,21 +95,4 @@ public void setSessionE164(String sessionE164) {
   public String getSessionE164() {
     return getString(SESSION_E164, null);
   }
-
-  public void markNeedDownloadProfileAndAvatar() {
-    putBoolean(NEED_DOWNLOAD_PROFILE, true);
-    putBoolean(NEED_DOWNLOAD_PROFILE_AVATAR, true);
-  }
-
-  public boolean needDownloadProfileOrAvatar() {
-    return getBoolean(NEED_DOWNLOAD_PROFILE, true) || getBoolean(NEED_DOWNLOAD_PROFILE_AVATAR, true);
-  }
-
-  public void clearNeedDownloadProfile() {
-    putBoolean(NEED_DOWNLOAD_PROFILE, false);
-  }
-
-  public void clearNeedDownloadProfileAvatar() {
-    putBoolean(NEED_DOWNLOAD_PROFILE_AVATAR, false);
-  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/ReleaseChannelValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/ReleaseChannelValues.kt
index f9a500b3ff..c428308e68 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/ReleaseChannelValues.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/ReleaseChannelValues.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.keyvalue
 
 import org.thoughtcrime.securesms.recipients.RecipientId
 
-internal class ReleaseChannelValues(store: KeyValueStore) : SignalStoreValues(store) {
+class ReleaseChannelValues(store: KeyValueStore) : SignalStoreValues(store) {
 
   companion object {
     private const val KEY_RELEASE_CHANNEL_RECIPIENT_ID = "releasechannel.recipient_id"
@@ -12,9 +12,9 @@ internal class ReleaseChannelValues(store: KeyValueStore) : SignalStoreValues(st
     private const val KEY_MET_CONVERSATION_REQUIREMENT = "releasechannel.met_conversation_requirement"
   }
 
-  override fun onFirstEverAppLaunch() = Unit
+  public override fun onFirstEverAppLaunch() = Unit
 
-  override fun getKeysToIncludeInBackup(): List<String> = listOf(
+  public override fun getKeysToIncludeInBackup(): List<String> = listOf(
     KEY_RELEASE_CHANNEL_RECIPIENT_ID
   )
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java
index 9097492148..367f6a94b4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java
@@ -11,7 +11,7 @@
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.mms.SentMediaQuality;
 import org.thoughtcrime.securesms.preferences.widgets.NotificationPrivacyPreference;
 import org.thoughtcrime.securesms.util.SingleLiveEvent;
@@ -66,6 +66,7 @@ public final class SettingsValues extends SignalStoreValues {
   private static final String CENSORSHIP_CIRCUMVENTION_ENABLED        = "settings.censorshipCircumventionEnabled";
   private static final String KEEP_MUTED_CHATS_ARCHIVED               = "settings.keepMutedChatsArchived";
   private static final String USE_COMPACT_NAVIGATION_BAR              = "settings.useCompactNavigationBar";
+  private static final String THREAD_TRIM_SYNC_TO_LINKED_DEVICES      = "settings.storage.syncThreadTrimDeletes";
 
   public static final int BACKUP_DEFAULT_HOUR   = 2;
   public static final int BACKUP_DEFAULT_MINUTE = 0;
@@ -129,7 +130,8 @@ void onFirstEverAppLaunch() {
                          UNIVERSAL_EXPIRE_TIMER,
                          SENT_MEDIA_QUALITY,
                          KEEP_MUTED_CHATS_ARCHIVED,
-                         USE_COMPACT_NAVIGATION_BAR);
+                         USE_COMPACT_NAVIGATION_BAR,
+                         THREAD_TRIM_SYNC_TO_LINKED_DEVICES);
   }
 
   public @NonNull LiveData<String> getOnConfigurationSettingChanged() {
@@ -168,6 +170,18 @@ public void setThreadTrimLength(int length) {
     putInteger(THREAD_TRIM_LENGTH, length);
   }
 
+  public boolean shouldSyncThreadTrimDeletes() {
+    if (!getStore().containsKey(THREAD_TRIM_SYNC_TO_LINKED_DEVICES)) {
+      setSyncThreadTrimDeletes(!isTrimByLengthEnabled() && getKeepMessagesDuration() == KeepMessagesDuration.FOREVER);
+    }
+
+    return getBoolean(THREAD_TRIM_SYNC_TO_LINKED_DEVICES, true);
+  }
+
+  public void setSyncThreadTrimDeletes(boolean syncDeletes) {
+    putBoolean(THREAD_TRIM_SYNC_TO_LINKED_DEVICES, syncDeletes);
+  }
+
   public void setSignalBackupDirectory(@NonNull Uri uri) {
     putString(SIGNAL_BACKUP_DIRECTORY, uri.toString());
     putString(SIGNAL_LATEST_BACKUP_DIRECTORY, uri.toString());
@@ -202,18 +216,18 @@ public void setCallDataMode(@NonNull CallDataMode callDataMode) {
   }
 
   public @NonNull Theme getTheme() {
-    return Theme.deserialize(TextSecurePreferences.getTheme(ApplicationDependencies.getApplication()));
+    return Theme.deserialize(TextSecurePreferences.getTheme(AppDependencies.getApplication()));
   }
 
   public void setTheme(@NonNull Theme theme) {
     putString(THEME, theme.serialize());
     // MOLLY: Store the value unencrypted to be able to read it back when app is locked
-    TextSecurePreferences.setTheme(ApplicationDependencies.getApplication(), theme.serialize());
+    TextSecurePreferences.setTheme(AppDependencies.getApplication(), theme.serialize());
     onConfigurationSettingChanged.postValue(THEME);
   }
 
   public int getMessageFontSize() {
-    return getInteger(MESSAGE_FONT_SIZE, TextSecurePreferences.getMessageBodyTextSize(ApplicationDependencies.getApplication()));
+    return getInteger(MESSAGE_FONT_SIZE, TextSecurePreferences.getMessageBodyTextSize(AppDependencies.getApplication()));
   }
 
   public int getMessageQuoteFontSize(@NonNull Context context) {
@@ -249,27 +263,27 @@ public void setMessageFontSize(int messageFontSize) {
   }
 
   public @NonNull String getLanguage() {
-    return TextSecurePreferences.getLanguage(ApplicationDependencies.getApplication());
+    return TextSecurePreferences.getLanguage(AppDependencies.getApplication());
   }
 
   public void setLanguage(@NonNull String language) {
     // MOLLY: Keep language setting in SharedPreferences
-    TextSecurePreferences.setLanguage(ApplicationDependencies.getApplication(), language);
+    TextSecurePreferences.setLanguage(AppDependencies.getApplication(), language);
     onConfigurationSettingChanged.postValue(LANGUAGE);
   }
 
   public boolean isPreferSystemEmoji() {
-    return TextSecurePreferences.isSystemEmojiPreferred(ApplicationDependencies.getApplication());
+    return TextSecurePreferences.isSystemEmojiPreferred(AppDependencies.getApplication());
   }
 
   public void setPreferSystemEmoji(boolean useSystemEmoji) {
     putBoolean(PREFER_SYSTEM_EMOJI, useSystemEmoji);
     // MOLLY: Store the value unencrypted to be able to read it back when app is locked
-    TextSecurePreferences.setSystemEmojiPreferred(ApplicationDependencies.getApplication(), useSystemEmoji);
+    TextSecurePreferences.setSystemEmojiPreferred(AppDependencies.getApplication(), useSystemEmoji);
   }
 
   public boolean isEnterKeySends() {
-    return getBoolean(ENTER_KEY_SENDS, TextSecurePreferences.isEnterSendsEnabled(ApplicationDependencies.getApplication()));
+    return getBoolean(ENTER_KEY_SENDS, TextSecurePreferences.isEnterSendsEnabled(AppDependencies.getApplication()));
   }
 
   public void setEnterKeySends(boolean enterKeySends) {
@@ -277,7 +291,7 @@ public void setEnterKeySends(boolean enterKeySends) {
   }
 
   public boolean isBackupEnabled() {
-    return getBoolean(BACKUPS_ENABLED, TextSecurePreferences.isBackupEnabled(ApplicationDependencies.getApplication()));
+    return getBoolean(BACKUPS_ENABLED, TextSecurePreferences.isBackupEnabled(AppDependencies.getApplication()));
   }
 
   public void setBackupEnabled(boolean backupEnabled) {
@@ -318,7 +332,7 @@ public void setMessageNotificationsEnabled(boolean messageNotificationsEnabled)
   }
 
   public boolean isMessageNotificationsEnabled() {
-    return getBoolean(MESSAGE_NOTIFICATIONS_ENABLED, TextSecurePreferences.isNotificationsEnabled(ApplicationDependencies.getApplication()));
+    return getBoolean(MESSAGE_NOTIFICATIONS_ENABLED, TextSecurePreferences.isNotificationsEnabled(AppDependencies.getApplication()));
   }
 
   public void setMessageNotificationSound(@NonNull Uri sound) {
@@ -326,7 +340,7 @@ public void setMessageNotificationSound(@NonNull Uri sound) {
   }
 
   public @NonNull Uri getMessageNotificationSound() {
-    String result = getString(MESSAGE_NOTIFICATION_SOUND, TextSecurePreferences.getNotificationRingtone(ApplicationDependencies.getApplication()).toString());
+    String result = getString(MESSAGE_NOTIFICATION_SOUND, TextSecurePreferences.getNotificationRingtone(AppDependencies.getApplication()).toString());
 
     if (result.startsWith("file:")) {
       result = Settings.System.DEFAULT_NOTIFICATION_URI.toString();
@@ -336,7 +350,7 @@ public void setMessageNotificationSound(@NonNull Uri sound) {
   }
 
   public boolean isMessageVibrateEnabled() {
-    return getBoolean(MESSAGE_VIBRATE_ENABLED, TextSecurePreferences.isNotificationVibrateEnabled(ApplicationDependencies.getApplication()));
+    return getBoolean(MESSAGE_VIBRATE_ENABLED, TextSecurePreferences.isNotificationVibrateEnabled(AppDependencies.getApplication()));
   }
 
   public void setMessageVibrateEnabled(boolean messageVibrateEnabled) {
@@ -344,7 +358,7 @@ public void setMessageVibrateEnabled(boolean messageVibrateEnabled) {
   }
 
   public @NonNull String getMessageLedColor() {
-    return getString(MESSAGE_LED_COLOR, TextSecurePreferences.getNotificationLedColor(ApplicationDependencies.getApplication()));
+    return getString(MESSAGE_LED_COLOR, TextSecurePreferences.getNotificationLedColor(AppDependencies.getApplication()));
   }
 
   public void setMessageLedColor(@NonNull String ledColor) {
@@ -352,7 +366,7 @@ public void setMessageLedColor(@NonNull String ledColor) {
   }
 
   public @NonNull String getMessageLedBlinkPattern() {
-    return getString(MESSAGE_LED_BLINK_PATTERN, TextSecurePreferences.getNotificationLedPattern(ApplicationDependencies.getApplication()));
+    return getString(MESSAGE_LED_BLINK_PATTERN, TextSecurePreferences.getNotificationLedPattern(AppDependencies.getApplication()));
   }
 
   public void setMessageLedBlinkPattern(@NonNull String blinkPattern) {
@@ -360,7 +374,7 @@ public void setMessageLedBlinkPattern(@NonNull String blinkPattern) {
   }
 
   public boolean isMessageNotificationsInChatSoundsEnabled() {
-    return getBoolean(MESSAGE_IN_CHAT_SOUNDS_ENABLED, TextSecurePreferences.isInThreadNotifications(ApplicationDependencies.getApplication()));
+    return getBoolean(MESSAGE_IN_CHAT_SOUNDS_ENABLED, TextSecurePreferences.isInThreadNotifications(AppDependencies.getApplication()));
   }
 
   public void setMessageNotificationsInChatSoundsEnabled(boolean inChatSoundsEnabled) {
@@ -368,7 +382,7 @@ public void setMessageNotificationsInChatSoundsEnabled(boolean inChatSoundsEnabl
   }
 
   public int getMessageNotificationsRepeatAlerts() {
-    return getInteger(MESSAGE_REPEAT_ALERTS, TextSecurePreferences.getRepeatAlertsCount(ApplicationDependencies.getApplication()));
+    return getInteger(MESSAGE_REPEAT_ALERTS, TextSecurePreferences.getRepeatAlertsCount(AppDependencies.getApplication()));
   }
 
   public void setMessageNotificationsRepeatAlerts(int count) {
@@ -376,7 +390,7 @@ public void setMessageNotificationsRepeatAlerts(int count) {
   }
 
   public @NonNull NotificationPrivacyPreference getMessageNotificationsPrivacy() {
-    return new NotificationPrivacyPreference(getString(MESSAGE_NOTIFICATION_PRIVACY, TextSecurePreferences.getNotificationPrivacy(ApplicationDependencies.getApplication()).toString()));
+    return new NotificationPrivacyPreference(getString(MESSAGE_NOTIFICATION_PRIVACY, TextSecurePreferences.getNotificationPrivacy(AppDependencies.getApplication()).toString()));
   }
 
   public void setMessageNotificationsPrivacy(@NonNull NotificationPrivacyPreference messageNotificationsPrivacy) {
@@ -384,7 +398,7 @@ public void setMessageNotificationsPrivacy(@NonNull NotificationPrivacyPreferenc
   }
 
   public boolean isCallNotificationsEnabled() {
-    return getBoolean(CALL_NOTIFICATIONS_ENABLED, TextSecurePreferences.isCallNotificationsEnabled(ApplicationDependencies.getApplication()));
+    return getBoolean(CALL_NOTIFICATIONS_ENABLED, TextSecurePreferences.isCallNotificationsEnabled(AppDependencies.getApplication()));
   }
 
   public void setCallNotificationsEnabled(boolean callNotificationsEnabled) {
@@ -392,7 +406,7 @@ public void setCallNotificationsEnabled(boolean callNotificationsEnabled) {
   }
 
   public @NonNull Uri getCallRingtone() {
-    String result = getString(CALL_RINGTONE, TextSecurePreferences.getCallNotificationRingtone(ApplicationDependencies.getApplication()).toString());
+    String result = getString(CALL_RINGTONE, TextSecurePreferences.getCallNotificationRingtone(AppDependencies.getApplication()).toString());
 
     if (result != null && result.startsWith("file:")) {
       result = Settings.System.DEFAULT_RINGTONE_URI.toString();
@@ -406,7 +420,7 @@ public void setCallRingtone(@NonNull Uri ringtone) {
   }
 
   public boolean isCallVibrateEnabled() {
-    return getBoolean(CALL_VIBRATE_ENABLED, TextSecurePreferences.isCallNotificationVibrateEnabled(ApplicationDependencies.getApplication()));
+    return getBoolean(CALL_VIBRATE_ENABLED, TextSecurePreferences.isCallNotificationVibrateEnabled(AppDependencies.getApplication()));
   }
 
   public void setCallVibrateEnabled(boolean callVibrateEnabled) {
@@ -414,7 +428,7 @@ public void setCallVibrateEnabled(boolean callVibrateEnabled) {
   }
 
   public boolean isNotifyWhenContactJoinsSignal() {
-    return getBoolean(NOTIFY_WHEN_CONTACT_JOINS_SIGNAL, TextSecurePreferences.isNewContactsNotificationEnabled(ApplicationDependencies.getApplication()));
+    return getBoolean(NOTIFY_WHEN_CONTACT_JOINS_SIGNAL, TextSecurePreferences.isNewContactsNotificationEnabled(AppDependencies.getApplication()));
   }
 
   public void setNotifyWhenContactJoinsSignal(boolean notifyWhenContactJoinsSignal) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStore.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStore.java
deleted file mode 100644
index 596c5761d8..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStore.java
+++ /dev/null
@@ -1,315 +0,0 @@
-package org.thoughtcrime.securesms.keyvalue;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceDataStore;
-
-import org.thoughtcrime.securesms.database.KeyValueDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.util.SignalUncaughtExceptionHandler;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Simple, encrypted key-value store.
- */
-public final class SignalStore {
-
-  private KeyValueStore store;
-
-  private final AccountValues             accountValues;
-  private final SvrValues                 svrValues;
-  private final RegistrationValues        registrationValues;
-  private final PinValues                 pinValues;
-  private final RemoteConfigValues        remoteConfigValues;
-  private final StorageServiceValues      storageServiceValues;
-  private final UiHints                   uiHints;
-  private final TooltipValues             tooltipValues;
-  private final MiscellaneousValues       misc;
-  private final InternalValues            internalValues;
-  private final EmojiValues               emojiValues;
-  private final SettingsValues            settingsValues;
-  private final CertificateValues         certificateValues;
-  private final PhoneNumberPrivacyValues  phoneNumberPrivacyValues;
-  private final OnboardingValues          onboardingValues;
-  private final WallpaperValues           wallpaperValues;
-  private final PaymentsValues            paymentsValues;
-  private final DonationsValues           signalDonationsValues;
-  private final ProxyValues               proxyValues;
-  private final RateLimitValues           rateLimitValues;
-  private final ChatColorsValues          chatColorsValues;
-  private final ImageEditorValues         imageEditorValues;
-  private final NotificationProfileValues notificationProfileValues;
-  private final ReleaseChannelValues      releaseChannelValues;
-  private final StoryValues               storyValues;
-  private final ApkUpdateValues           apkUpdate;
-  private final BackupValues              backupValues;
-
-  private final PlainTextSharedPrefsDataStore plainTextValues;
-
-  private static volatile SignalStore instance;
-
-  private static @NonNull SignalStore getInstance() {
-    if (instance == null) {
-      synchronized (SignalStore.class) {
-        if (instance == null) {
-          instance = new SignalStore(new KeyValueStore(KeyValueDatabase.getInstance(ApplicationDependencies.getApplication())));
-        }
-      }
-    }
-
-    return instance;
-  }
-
-  private SignalStore(@NonNull KeyValueStore store) {
-    this.store                     = store;
-    this.accountValues             = new AccountValues(store);
-    this.svrValues                 = new SvrValues(store);
-    this.registrationValues        = new RegistrationValues(store);
-    this.pinValues                 = new PinValues(store);
-    this.remoteConfigValues        = new RemoteConfigValues(store);
-    this.storageServiceValues      = new StorageServiceValues(store);
-    this.uiHints                   = new UiHints(store);
-    this.tooltipValues             = new TooltipValues(store);
-    this.misc                      = new MiscellaneousValues(store);
-    this.internalValues            = new InternalValues(store);
-    this.emojiValues               = new EmojiValues(store);
-    this.settingsValues            = new SettingsValues(store);
-    this.certificateValues         = new CertificateValues(store);
-    this.phoneNumberPrivacyValues  = new PhoneNumberPrivacyValues(store);
-    this.onboardingValues          = new OnboardingValues(store);
-    this.wallpaperValues           = new WallpaperValues(store);
-    this.paymentsValues            = new PaymentsValues(store);
-    this.signalDonationsValues     = new DonationsValues(store);
-    this.proxyValues               = new ProxyValues(store);
-    this.rateLimitValues           = new RateLimitValues(store);
-    this.chatColorsValues          = new ChatColorsValues(store);
-    this.imageEditorValues         = new ImageEditorValues(store);
-    this.notificationProfileValues = new NotificationProfileValues(store);
-    this.releaseChannelValues      = new ReleaseChannelValues(store);
-    this.storyValues               = new StoryValues(store);
-    this.apkUpdate                 = new ApkUpdateValues(store);
-    this.backupValues              = new BackupValues(store);
-    this.plainTextValues           = new PlainTextSharedPrefsDataStore(ApplicationDependencies.getApplication());
-  }
-
-  public static void onFirstEverAppLaunch() {
-    account().onFirstEverAppLaunch();
-    svr().onFirstEverAppLaunch();
-    registrationValues().onFirstEverAppLaunch();
-    pinValues().onFirstEverAppLaunch();
-    remoteConfigValues().onFirstEverAppLaunch();
-    storageService().onFirstEverAppLaunch();
-    uiHints().onFirstEverAppLaunch();
-    tooltips().onFirstEverAppLaunch();
-    misc().onFirstEverAppLaunch();
-    internalValues().onFirstEverAppLaunch();
-    emojiValues().onFirstEverAppLaunch();
-    settings().onFirstEverAppLaunch();
-    certificateValues().onFirstEverAppLaunch();
-    phoneNumberPrivacy().onFirstEverAppLaunch();
-    onboarding().onFirstEverAppLaunch();
-    wallpaper().onFirstEverAppLaunch();
-    paymentsValues().onFirstEverAppLaunch();
-    signalDonationsValues().onFirstEverAppLaunch();
-    proxy().onFirstEverAppLaunch();
-    rateLimit().onFirstEverAppLaunch();
-    chatColorsValues().onFirstEverAppLaunch();
-    imageEditorValues().onFirstEverAppLaunch();
-    notificationProfileValues().onFirstEverAppLaunch();
-    releaseChannelValues().onFirstEverAppLaunch();
-    storyValues().onFirstEverAppLaunch();
-  }
-
-  public static List<String> getKeysToIncludeInBackup() {
-    List<String> keys = new ArrayList<>();
-    keys.addAll(account().getKeysToIncludeInBackup());
-    keys.addAll(svr().getKeysToIncludeInBackup());
-    keys.addAll(registrationValues().getKeysToIncludeInBackup());
-    keys.addAll(pinValues().getKeysToIncludeInBackup());
-    keys.addAll(remoteConfigValues().getKeysToIncludeInBackup());
-    keys.addAll(storageService().getKeysToIncludeInBackup());
-    keys.addAll(uiHints().getKeysToIncludeInBackup());
-    keys.addAll(tooltips().getKeysToIncludeInBackup());
-    keys.addAll(misc().getKeysToIncludeInBackup());
-    keys.addAll(internalValues().getKeysToIncludeInBackup());
-    keys.addAll(emojiValues().getKeysToIncludeInBackup());
-    keys.addAll(settings().getKeysToIncludeInBackup());
-    keys.addAll(certificateValues().getKeysToIncludeInBackup());
-    keys.addAll(phoneNumberPrivacy().getKeysToIncludeInBackup());
-    keys.addAll(onboarding().getKeysToIncludeInBackup());
-    keys.addAll(wallpaper().getKeysToIncludeInBackup());
-    keys.addAll(paymentsValues().getKeysToIncludeInBackup());
-    keys.addAll(signalDonationsValues().getKeysToIncludeInBackup());
-    keys.addAll(proxy().getKeysToIncludeInBackup());
-    keys.addAll(rateLimit().getKeysToIncludeInBackup());
-    keys.addAll(chatColorsValues().getKeysToIncludeInBackup());
-    keys.addAll(imageEditorValues().getKeysToIncludeInBackup());
-    keys.addAll(notificationProfileValues().getKeysToIncludeInBackup());
-    keys.addAll(releaseChannelValues().getKeysToIncludeInBackup());
-    keys.addAll(storyValues().getKeysToIncludeInBackup());
-    return keys;
-  }
-
-  /**
-   * Forces the store to re-fetch all of it's data from the database.
-   * Should only be used for testing!
-   */
-  @VisibleForTesting
-  public static void resetCache() {
-    getInstance().store.resetCache();
-  }
-
-  /**
-   * Restoring a backup changes the underlying disk values, so the cache needs to be reset.
-   */
-  public static void onPostBackupRestore() {
-    getInstance().store.resetCache();
-  }
-
-  public static @NonNull AccountValues account() {
-    return getInstance().accountValues;
-  }
-
-  public static @NonNull SvrValues svr() {
-    return getInstance().svrValues;
-  }
-
-  public static @NonNull RegistrationValues registrationValues() {
-    return getInstance().registrationValues;
-  }
-
-  public static @NonNull PinValues pinValues() {
-    return getInstance().pinValues;
-  }
-
-  public static @NonNull RemoteConfigValues remoteConfigValues() {
-    return getInstance().remoteConfigValues;
-  }
-
-  public static @NonNull StorageServiceValues storageService() {
-    return getInstance().storageServiceValues;
-  }
-
-  public static @NonNull UiHints uiHints() {
-    return getInstance().uiHints;
-  }
-
-  public static @NonNull TooltipValues tooltips() {
-    return getInstance().tooltipValues;
-  }
-
-  public static @NonNull MiscellaneousValues misc() {
-    return getInstance().misc;
-  }
-
-  public static @NonNull InternalValues internalValues() {
-    return getInstance().internalValues;
-  }
-
-  public static @NonNull EmojiValues emojiValues() {
-    return getInstance().emojiValues;
-  }
-
-  public static @NonNull SettingsValues settings() {
-    return getInstance().settingsValues;
-  }
-
-  public static @NonNull CertificateValues certificateValues() {
-    return getInstance().certificateValues;
-  }
-
-  public static @NonNull PhoneNumberPrivacyValues phoneNumberPrivacy() {
-    return getInstance().phoneNumberPrivacyValues;
-  }
-
-  public static @NonNull OnboardingValues onboarding() {
-    return getInstance().onboardingValues;
-  }
-
-  public static @NonNull WallpaperValues wallpaper() {
-    return getInstance().wallpaperValues;
-  }
-
-  public static @NonNull PaymentsValues paymentsValues() {
-    return getInstance().paymentsValues;
-  }
-
-  public static @NonNull DonationsValues signalDonationsValues() {
-    return getInstance().signalDonationsValues;
-  }
-
-  public static @NonNull ProxyValues proxy() {
-    return getInstance().proxyValues;
-  }
-
-  public static @NonNull RateLimitValues rateLimit() {
-    return getInstance().rateLimitValues;
-  }
-
-  public static @NonNull ChatColorsValues chatColorsValues() {
-    return getInstance().chatColorsValues;
-  }
-
-  public static @NonNull ImageEditorValues imageEditorValues() {
-    return getInstance().imageEditorValues;
-  }
-
-  public static @NonNull NotificationProfileValues notificationProfileValues() {
-    return getInstance().notificationProfileValues;
-  }
-
-  public static @NonNull ReleaseChannelValues releaseChannelValues() {
-    return getInstance().releaseChannelValues;
-  }
-
-  public static @NonNull StoryValues storyValues() {
-    return getInstance().storyValues;
-  }
-
-  public static @NonNull ApkUpdateValues apkUpdate() {
-    return getInstance().apkUpdate;
-  }
-
-  public static @NonNull BackupValues backup() {
-    return getInstance().backupValues;
-  }
-
-  public static @NonNull GroupsV2AuthorizationSignalStoreCache groupsV2AciAuthorizationCache() {
-    return GroupsV2AuthorizationSignalStoreCache.createAciCache(getStore());
-  }
-
-  public static @NonNull PreferenceDataStore getPreferenceDataStore() {
-    return new SignalPreferenceDataStore(getStore());
-  }
-
-  public static @NonNull PlainTextSharedPrefsDataStore plaintext() {
-    return getInstance().plainTextValues;
-  }
-
-  /**
-   * Ensures any pending writes are finished. Only intended to be called by
-   * {@link SignalUncaughtExceptionHandler}.
-   */
-  public static void blockUntilAllWritesFinished() {
-    getStore().blockUntilAllWritesFinished();
-  }
-
-  private static @NonNull KeyValueStore getStore() {
-    return getInstance().store;
-  }
-
-  /**
-   * Allows you to set a custom KeyValueStore to read from. Only for testing!
-   */
-  @VisibleForTesting
-  public static void inject(@NonNull KeyValueStore store) {
-    instance = new SignalStore(store);
-  }
-
-  public static void clearAllDataForBackupRestore() {
-    releaseChannelValues().clearReleaseChannelRecipientId();
-    account().clearRegistrationButKeepCredentials();
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStore.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStore.kt
new file mode 100644
index 0000000000..986e0abbb4
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStore.kt
@@ -0,0 +1,297 @@
+package org.thoughtcrime.securesms.keyvalue
+
+import androidx.annotation.VisibleForTesting
+import androidx.preference.PreferenceDataStore
+import org.signal.core.util.ResettableLazy
+import org.thoughtcrime.securesms.database.KeyValueDatabase
+import org.thoughtcrime.securesms.dependencies.AppDependencies.application
+
+/**
+ * Simple, encrypted key-value store.
+ */
+class SignalStore(private val store: KeyValueStore) {
+
+  val accountValues = AccountValues(store)
+  val svrValues = SvrValues(store)
+  val registrationValues = RegistrationValues(store)
+  val pinValues = PinValues(store)
+  val remoteConfigValues = RemoteConfigValues(store)
+  val storageServiceValues = StorageServiceValues(store)
+  val uiHintValues = UiHintValues(store)
+  val tooltipValues = TooltipValues(store)
+  val miscValues = MiscellaneousValues(store)
+  val internalValues = InternalValues(store)
+  val emojiValues = EmojiValues(store)
+  val settingsValues = SettingsValues(store)
+  val certificateValues = CertificateValues(store)
+  val phoneNumberPrivacyValues = PhoneNumberPrivacyValues(store)
+  val onboardingValues = OnboardingValues(store)
+  val wallpaperValues = WallpaperValues(store)
+  val paymentsValues = PaymentsValues(store)
+  val inAppPaymentValues = InAppPaymentValues(store)
+  val proxyValues = ProxyValues(store)
+  val rateLimitValues = RateLimitValues(store)
+  val chatColorsValues = ChatColorsValues(store)
+  val imageEditorValues = ImageEditorValues(store)
+  val notificationProfileValues = NotificationProfileValues(store)
+  val releaseChannelValues = ReleaseChannelValues(store)
+  val storyValues = StoryValues(store)
+  val apkUpdateValues = ApkUpdateValues(store)
+  val backupValues = BackupValues(store)
+
+  val plainTextValues = PlainTextSharedPrefsDataStore(application)
+
+  companion object {
+
+    private var instanceOverride: SignalStore? = null
+    private val _instance = ResettableLazy {
+      instanceOverride ?: SignalStore(KeyValueStore(KeyValueDatabase.getInstance(application)))
+    }
+    private val instance by _instance
+
+    @JvmStatic
+    fun onFirstEverAppLaunch() {
+      account.onFirstEverAppLaunch()
+      svr.onFirstEverAppLaunch()
+      registration.onFirstEverAppLaunch()
+      pin.onFirstEverAppLaunch()
+      remoteConfig.onFirstEverAppLaunch()
+      storageService.onFirstEverAppLaunch()
+      uiHints.onFirstEverAppLaunch()
+      tooltips.onFirstEverAppLaunch()
+      misc.onFirstEverAppLaunch()
+      internal.onFirstEverAppLaunch()
+      emoji.onFirstEverAppLaunch()
+      settings.onFirstEverAppLaunch()
+      certificate.onFirstEverAppLaunch()
+      phoneNumberPrivacy.onFirstEverAppLaunch()
+      onboarding.onFirstEverAppLaunch()
+      wallpaper.onFirstEverAppLaunch()
+      payments.onFirstEverAppLaunch()
+      inAppPayments.onFirstEverAppLaunch()
+      proxy.onFirstEverAppLaunch()
+      rateLimit.onFirstEverAppLaunch()
+      chatColors.onFirstEverAppLaunch()
+      imageEditor.onFirstEverAppLaunch()
+      notificationProfile.onFirstEverAppLaunch()
+      releaseChannel.onFirstEverAppLaunch()
+      story.onFirstEverAppLaunch()
+    }
+
+    @JvmStatic
+    val keysToIncludeInBackup: List<String>
+      get() {
+        return account.keysToIncludeInBackup +
+          svr.keysToIncludeInBackup +
+          registration.keysToIncludeInBackup +
+          pin.keysToIncludeInBackup +
+          remoteConfig.keysToIncludeInBackup +
+          storageService.keysToIncludeInBackup +
+          uiHints.keysToIncludeInBackup +
+          tooltips.keysToIncludeInBackup +
+          misc.keysToIncludeInBackup +
+          internal.keysToIncludeInBackup +
+          emoji.keysToIncludeInBackup +
+          settings.keysToIncludeInBackup +
+          certificate.keysToIncludeInBackup +
+          phoneNumberPrivacy.keysToIncludeInBackup +
+          onboarding.keysToIncludeInBackup +
+          wallpaper.keysToIncludeInBackup +
+          payments.keysToIncludeInBackup +
+          inAppPayments.keysToIncludeInBackup +
+          proxy.keysToIncludeInBackup +
+          rateLimit.keysToIncludeInBackup +
+          chatColors.keysToIncludeInBackup +
+          imageEditor.keysToIncludeInBackup +
+          notificationProfile.keysToIncludeInBackup +
+          releaseChannel.keysToIncludeInBackup +
+          story.keysToIncludeInBackup
+      }
+
+    /**
+     * Forces the store to re-fetch all of it's data from the database.
+     * Should only be used for testing!
+     */
+    @VisibleForTesting
+    fun resetCache() {
+      instance.store.resetCache()
+    }
+
+    /**
+     * Restoring a backup changes the underlying disk values, so the cache needs to be reset.
+     */
+    @JvmStatic
+    fun onPostBackupRestore() {
+      instance.store.resetCache()
+    }
+
+    @JvmStatic
+    @get:JvmName("account")
+    val account: AccountValues
+      get() = instance.accountValues
+
+    @JvmStatic
+    @get:JvmName("svr")
+    val svr: SvrValues
+      get() = instance.svrValues
+
+    @JvmStatic
+    @get:JvmName("registration")
+    val registration: RegistrationValues
+      get() = instance.registrationValues
+
+    @JvmStatic
+    @get:JvmName("pin")
+    val pin: PinValues
+      get() = instance.pinValues
+
+    val remoteConfig: RemoteConfigValues
+      get() = instance.remoteConfigValues
+
+    @JvmStatic
+    @get:JvmName("storageService")
+    val storageService: StorageServiceValues
+      get() = instance.storageServiceValues
+
+    @JvmStatic
+    @get:JvmName("uiHints")
+    val uiHints: UiHintValues
+      get() = instance.uiHintValues
+
+    @JvmStatic
+    @get:JvmName("tooltips")
+    val tooltips: TooltipValues
+      get() = instance.tooltipValues
+
+    @JvmStatic
+    @get:JvmName("misc")
+    val misc: MiscellaneousValues
+      get() = instance.miscValues
+
+    @JvmStatic
+    @get:JvmName("internal")
+    val internal: InternalValues
+      get() = instance.internalValues
+
+    @JvmStatic
+    @get:JvmName("emoji")
+    val emoji: EmojiValues
+      get() = instance.emojiValues
+
+    @JvmStatic
+    @get:JvmName("settings")
+    val settings: SettingsValues
+      get() = instance.settingsValues
+
+    @JvmStatic
+    @get:JvmName("certificate")
+    val certificate: CertificateValues
+      get() = instance.certificateValues
+
+    @JvmStatic
+    @get:JvmName("phoneNumberPrivacy")
+    val phoneNumberPrivacy: PhoneNumberPrivacyValues
+      get() = instance.phoneNumberPrivacyValues
+
+    @JvmStatic
+    @get:JvmName("onboarding")
+    val onboarding: OnboardingValues
+      get() = instance.onboardingValues
+
+    @JvmStatic
+    @get:JvmName("wallpaper")
+    val wallpaper: WallpaperValues
+      get() = instance.wallpaperValues
+
+    @JvmStatic
+    @get:JvmName("payments")
+    val payments: PaymentsValues
+      get() = instance.paymentsValues
+
+    @JvmStatic
+    @get:JvmName("inAppPayments")
+    val inAppPayments: InAppPaymentValues
+      get() = instance.inAppPaymentValues
+
+    @JvmStatic
+    @get:JvmName("proxy")
+    val proxy: ProxyValues
+      get() = instance.proxyValues
+
+    @JvmStatic
+    @get:JvmName("rateLimit")
+    val rateLimit: RateLimitValues
+      get() = instance.rateLimitValues
+
+    @JvmStatic
+    @get:JvmName("chatColors")
+    val chatColors: ChatColorsValues
+      get() = instance.chatColorsValues
+
+    val imageEditor: ImageEditorValues
+      get() = instance.imageEditorValues
+
+    val notificationProfile: NotificationProfileValues
+      get() = instance.notificationProfileValues
+
+    @JvmStatic
+    @get:JvmName("releaseChannel")
+    val releaseChannel: ReleaseChannelValues
+      get() = instance.releaseChannelValues
+
+    @JvmStatic
+    @get:JvmName("story")
+    val story: StoryValues
+      get() = instance.storyValues
+
+    val apkUpdate: ApkUpdateValues
+      get() = instance.apkUpdateValues
+
+    @JvmStatic
+    @get:JvmName("backup")
+    val backup: BackupValues
+      get() = instance.backupValues
+
+    val groupsV2AciAuthorizationCache: GroupsV2AuthorizationSignalStoreCache
+      get() = GroupsV2AuthorizationSignalStoreCache.createAciCache(instance.store)
+
+    val plaintext: PlainTextSharedPrefsDataStore
+      get() = instance.plainTextValues
+
+    fun getPreferenceDataStore(): PreferenceDataStore {
+      return SignalPreferenceDataStore(instance.store)
+    }
+
+    /**
+     * Ensures any pending writes are finished. Only intended to be called by
+     * [SignalUncaughtExceptionHandler].
+     */
+    @JvmStatic
+    fun blockUntilAllWritesFinished() {
+      instance.store.blockUntilAllWritesFinished()
+    }
+
+    /**
+     * Allows you to set a custom KeyValueStore to read from. Only for testing!
+     */
+    @VisibleForTesting
+    fun testInject(store: KeyValueStore) {
+      instanceOverride = SignalStore(store)
+      _instance.reset()
+    }
+
+    /**
+     * Allows you to set a custom SignalStore to read from. Only for testing!
+     */
+    @VisibleForTesting
+    fun testInject(store: SignalStore) {
+      instanceOverride = store
+      _instance.reset()
+    }
+
+    fun clearAllDataForBackupRestore() {
+      releaseChannel.clearReleaseChannelRecipientId()
+      account.clearRegistrationButKeepCredentials()
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStoreValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStoreValues.java
index 165ea737ef..056909882d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStoreValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SignalStoreValues.java
@@ -12,7 +12,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-abstract class SignalStoreValues {
+public abstract class SignalStoreValues {
 
   private final KeyValueStore store;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/StoryValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/StoryValues.kt
index 890ee3e92d..837ade73a9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/StoryValues.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/StoryValues.kt
@@ -5,7 +5,7 @@ import org.signal.core.util.StringSerializer
 import org.thoughtcrime.securesms.database.model.DistributionListId
 import org.thoughtcrime.securesms.groups.GroupId
 
-internal class StoryValues(store: KeyValueStore) : SignalStoreValues(store) {
+class StoryValues(store: KeyValueStore) : SignalStoreValues(store) {
 
   companion object {
     /*
@@ -51,9 +51,9 @@ internal class StoryValues(store: KeyValueStore) : SignalStoreValues(store) {
     private const val USER_HAS_SEEN_GROUP_STORY_EDUCATION_SHEET = "stories.user.has.seen.group.story.education.sheet"
   }
 
-  override fun onFirstEverAppLaunch() = Unit
+  public override fun onFirstEverAppLaunch() = Unit
 
-  override fun getKeysToIncludeInBackup(): MutableList<String> = mutableListOf(
+  public override fun getKeysToIncludeInBackup(): MutableList<String> = mutableListOf(
     MANUAL_FEATURE_DISABLE,
     USER_HAS_ADDED_TO_A_STORY,
     USER_HAS_SEEN_FIRST_NAV_VIEW,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SvrValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SvrValues.java
index 16ec15fc68..8f40ede5b5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SvrValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SvrValues.java
@@ -26,8 +26,9 @@ public final class SvrValues extends SignalStoreValues {
   private static final String LAST_CREATE_FAILED_TIMESTAMP    = "kbs.last_create_failed_timestamp";
   public static final  String OPTED_OUT                       = "kbs.opted_out";
   private static final String PIN_FORGOTTEN_OR_SKIPPED        = "kbs.pin.forgotten.or.skipped";
-  private static final String SVR_AUTH_TOKENS                 = "kbs.kbs_auth_tokens";
+  private static final String SVR2_AUTH_TOKENS                = "kbs.kbs_auth_tokens";
   private static final String SVR_LAST_AUTH_REFRESH_TIMESTAMP = "kbs.kbs_auth_tokens.last_refresh_timestamp";
+  private static final String SVR3_AUTH_TOKENS                = "kbs.svr3_auth_tokens";
 
   SvrValues(KeyValueStore store) {
     super(store);
@@ -40,7 +41,10 @@ void onFirstEverAppLaunch() {
   @Override
   @NonNull
   List<String> getKeysToIncludeInBackup() {
-    return List.of(SVR_AUTH_TOKENS);
+    return List.of(
+        SVR2_AUTH_TOKENS,
+        SVR3_AUTH_TOKENS
+    );
   }
 
   /**
@@ -54,7 +58,7 @@ public void clearRegistrationLockAndPin() {
               .remove(PIN)
               .remove(LAST_CREATE_FAILED_TIMESTAMP)
               .remove(OPTED_OUT)
-              .remove(SVR_AUTH_TOKENS)
+              .remove(SVR2_AUTH_TOKENS)
               .remove(SVR_LAST_AUTH_REFRESH_TIMESTAMP)
               .commit();
   }
@@ -167,13 +171,22 @@ public synchronized void setPinForgottenOrSkipped(boolean value) {
     putBoolean(PIN_FORGOTTEN_OR_SKIPPED, value);
   }
 
-  public synchronized void putAuthTokenList(List<String> tokens) {
-    putList(SVR_AUTH_TOKENS, tokens, StringStringSerializer.INSTANCE);
+  public synchronized void putSvr2AuthTokens(List<String> tokens) {
+    putList(SVR2_AUTH_TOKENS, tokens, StringStringSerializer.INSTANCE);
     setLastRefreshAuthTimestamp(System.currentTimeMillis());
   }
 
-  public synchronized List<String> getAuthTokenList() {
-    return getList(SVR_AUTH_TOKENS, StringStringSerializer.INSTANCE);
+  public synchronized void putSvr3AuthTokens(List<String> tokens) {
+    putList(SVR3_AUTH_TOKENS, tokens, StringStringSerializer.INSTANCE);
+    setLastRefreshAuthTimestamp(System.currentTimeMillis());
+  }
+
+  public synchronized List<String> getSvr2AuthTokens() {
+    return getList(SVR2_AUTH_TOKENS, StringStringSerializer.INSTANCE);
+  }
+
+  public synchronized List<String> getSvr3AuthTokens() {
+    return getList(SVR3_AUTH_TOKENS, StringStringSerializer.INSTANCE);
   }
 
   /**
@@ -181,21 +194,47 @@ public synchronized List<String> getAuthTokenList() {
    * @param token
    * @return whether the token was added (new) or ignored (already existed)
    */
-  public synchronized boolean appendAuthTokenToList(String token) {
-    List<String> tokens = getAuthTokenList();
+  public synchronized boolean appendSvr2AuthTokenToList(String token) {
+    List<String> tokens = getSvr2AuthTokens();
+    if (tokens.contains(token)) {
+      return false;
+    } else {
+      final List<String> result = Stream.concat(Stream.of(token), tokens.stream()).limit(10).collect(Collectors.toList());
+      putSvr2AuthTokens(result);
+      return true;
+    }
+  }
+
+  /**
+   * Keeps the 10 most recent SVR3 auth tokens.
+   * @param token
+   * @return whether the token was added (new) or ignored (already existed)
+   */
+  public synchronized boolean appendSvr3AuthTokenToList(String token) {
+    List<String> tokens = getSvr3AuthTokens();
     if (tokens.contains(token)) {
       return false;
     } else {
       final List<String> result = Stream.concat(Stream.of(token), tokens.stream()).limit(10).collect(Collectors.toList());
-      putAuthTokenList(result);
+      putSvr3AuthTokens(result);
+      return true;
+    }
+  }
+
+  public boolean removeSvr2AuthTokens(@NonNull List<String> invalid) {
+    List<String> tokens = new ArrayList<>(getSvr2AuthTokens());
+    if (tokens.removeAll(invalid)) {
+      putSvr2AuthTokens(tokens);
       return true;
     }
+
+    return false;
   }
 
-  public boolean removeAuthTokens(@NonNull List<String> invalid) {
-    List<String> tokens = new ArrayList<>(getAuthTokenList());
+  public boolean removeSvr3AuthTokens(@NonNull List<String> invalid) {
+    List<String> tokens = new ArrayList<>(getSvr3AuthTokens());
     if (tokens.removeAll(invalid)) {
-      putAuthTokenList(tokens);
+      putSvr3AuthTokens(tokens);
       return true;
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/UiHints.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/UiHintValues.java
similarity index 66%
rename from app/src/main/java/org/thoughtcrime/securesms/keyvalue/UiHints.java
rename to app/src/main/java/org/thoughtcrime/securesms/keyvalue/UiHintValues.java
index 7a01b36ca9..cc59c7c49a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/UiHints.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/UiHintValues.java
@@ -5,23 +5,27 @@
 import java.util.Arrays;
 import java.util.List;
 
-public class UiHints extends SignalStoreValues {
+public class UiHintValues extends SignalStoreValues {
 
   private static final int NEVER_DISPLAY_PULL_TO_FILTER_TIP_THRESHOLD = 3;
 
-  private static final String HAS_SEEN_GROUP_SETTINGS_MENU_TOAST     = "uihints.has_seen_group_settings_menu_toast";
-  private static final String HAS_CONFIRMED_DELETE_FOR_EVERYONE_ONCE = "uihints.has_confirmed_delete_for_everyone_once";
-  private static final String HAS_SET_OR_SKIPPED_USERNAME_CREATION   = "uihints.has_set_or_skipped_username_creation";
-  private static final String NEVER_DISPLAY_PULL_TO_FILTER_TIP       = "uihints.never_display_pull_to_filter_tip";
-  private static final String HAS_SEEN_SCHEDULED_MESSAGES_INFO_ONCE  = "uihints.has_seen_scheduled_messages_info_once";
-  private static final String HAS_SEEN_TEXT_FORMATTING_ALERT         = "uihints.text_formatting.has_seen_alert";
-  private static final String HAS_NOT_SEEN_EDIT_MESSAGE_BETA_ALERT   = "uihints.edit_message.has_not_seen_beta_alert";
-  private static final String HAS_SEEN_SAFETY_NUMBER_NUX             = "uihints.has_seen_safety_number_nux";
-  private static final String HAS_COMPLETED_USERNAME_ONBOARDING      = "uihints.has_completed_username_onboarding";
+  private static final String HAS_SEEN_GROUP_SETTINGS_MENU_TOAST       = "uihints.has_seen_group_settings_menu_toast";
+  private static final String HAS_CONFIRMED_DELETE_FOR_EVERYONE_ONCE   = "uihints.has_confirmed_delete_for_everyone_once";
+  private static final String HAS_SET_OR_SKIPPED_USERNAME_CREATION     = "uihints.has_set_or_skipped_username_creation";
+  private static final String NEVER_DISPLAY_PULL_TO_FILTER_TIP         = "uihints.never_display_pull_to_filter_tip";
+  private static final String HAS_SEEN_SCHEDULED_MESSAGES_INFO_ONCE    = "uihints.has_seen_scheduled_messages_info_once";
+  private static final String HAS_SEEN_TEXT_FORMATTING_ALERT           = "uihints.text_formatting.has_seen_alert";
+  private static final String HAS_NOT_SEEN_EDIT_MESSAGE_BETA_ALERT     = "uihints.edit_message.has_not_seen_beta_alert";
+  private static final String HAS_SEEN_SAFETY_NUMBER_NUX               = "uihints.has_seen_safety_number_nux";
+  private static final String DISMISSED_BATTERY_SAVER_PROMPT           = "uihints.declined_battery_saver_prompt";
+  private static final String LAST_BATTERY_SAVER_PROMPT                = "uihints.last_battery_saver_prompt";
+  private static final String HAS_COMPLETED_USERNAME_ONBOARDING        = "uihints.has_completed_username_onboarding";
   private static final String HAS_SEEN_DOUBLE_TAP_EDIT_EDUCATION_SHEET = "uihints.has_seen_double_tap_edit_education_sheet";
   private static final String DISMISSED_CONTACTS_PERMISSION_BANNER     = "uihints.dismissed_contacts_permission_banner";
+  private static final String HAS_SEEN_DELETE_SYNC_EDUCATION_SHEET     = "uihints.has_seen_delete_sync_education_sheet";
+  private static final String LAST_SUPPORT_VERSION_SEEN                = "uihints.last_support_version_seen";
 
-  UiHints(@NonNull KeyValueStore store) {
+  UiHintValues(@NonNull KeyValueStore store) {
     super(store);
   }
 
@@ -116,6 +120,22 @@ public void markHasSeenSafetyNumberUpdateNux() {
     putBoolean(HAS_SEEN_SAFETY_NUMBER_NUX, true);
   }
 
+  public void markDismissedBatterySaverPrompt() {
+    putBoolean(DISMISSED_BATTERY_SAVER_PROMPT, true);
+  }
+
+  public boolean hasDismissedBatterySaverPrompt() {
+    return getBoolean(DISMISSED_BATTERY_SAVER_PROMPT, false);
+  }
+
+  public long getLastBatterySaverPrompt() {
+    return getLong(LAST_BATTERY_SAVER_PROMPT, 0);
+  }
+
+  public void setLastBatterySaverPrompt(long time) {
+    putLong(LAST_BATTERY_SAVER_PROMPT, time);
+  }
+
   public void setHasSeenDoubleTapEditEducationSheet(boolean seen) {
     putBoolean(HAS_SEEN_DOUBLE_TAP_EDIT_EDUCATION_SHEET, seen);
   }
@@ -131,4 +151,26 @@ public void markDismissedContactsPermissionBanner() {
   public boolean getDismissedContactsPermissionBanner() {
     return getBoolean(DISMISSED_CONTACTS_PERMISSION_BANNER, false);
   }
+
+  public void setHasSeenDeleteSyncEducationSheet(boolean seen) {
+    putBoolean(HAS_SEEN_DELETE_SYNC_EDUCATION_SHEET, seen);
+  }
+
+  public boolean getHasSeenDeleteSyncEducationSheet() {
+    return getBoolean(HAS_SEEN_DELETE_SYNC_EDUCATION_SHEET, false);
+  }
+
+  /**
+   * @return the last version of the support article for delayed notifications that users have seen. Versions are increased in a remote config.
+   */
+  public int getLastSupportVersionSeen() {
+    return getInteger(LAST_SUPPORT_VERSION_SEEN, 0);
+  }
+
+  /**
+   * Sets the version number of the support article that users see if they have device-specific notifications issues
+   */
+  public void setLastSupportVersionSeen(int version) {
+    putLong(LAST_SUPPORT_VERSION_SEEN, version);
+  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/AddLinkDeviceFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/AddLinkDeviceFragment.kt
new file mode 100644
index 0000000000..e0ef86cc8f
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/AddLinkDeviceFragment.kt
@@ -0,0 +1,140 @@
+package org.thoughtcrime.securesms.linkdevice
+
+import android.Manifest
+import android.annotation.SuppressLint
+import android.widget.Toast
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.fragment.app.activityViewModels
+import androidx.navigation.NavController
+import androidx.navigation.fragment.findNavController
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.PermissionState
+import com.google.accompanist.permissions.isGranted
+import com.google.accompanist.permissions.rememberPermissionState
+import org.signal.core.ui.Previews
+import org.signal.core.ui.Scaffolds
+import org.signal.core.ui.SignalPreview
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.compose.ComposeFragment
+import org.thoughtcrime.securesms.permissions.Permissions
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
+
+/**
+ * Fragment that allows users to scan a QR code from their camera to link a device
+ */
+class AddLinkDeviceFragment : ComposeFragment() {
+
+  private val viewModel: LinkDeviceViewModel by activityViewModels()
+
+  @OptIn(ExperimentalPermissionsApi::class)
+  @Composable
+  override fun FragmentContent() {
+    val state by viewModel.state.collectAsState()
+    val navController: NavController by remember { mutableStateOf(findNavController()) }
+    val cameraPermissionState: PermissionState = rememberPermissionState(permission = Manifest.permission.CAMERA)
+
+    if (!state.seenIntroSheet) {
+      navController.safeNavigate(R.id.action_addLinkDeviceFragment_to_linkDeviceIntroBottomSheet)
+      viewModel.markIntroSheetSeen()
+    }
+
+    if ((state.qrCodeFound || state.qrCodeInvalid) && navController.currentDestination?.id == R.id.linkDeviceIntroBottomSheet) {
+      navController.popBackStack()
+    }
+
+    MainScreen(
+      state = state,
+      navController = navController,
+      hasPermissions = cameraPermissionState.status.isGranted,
+      onRequestPermissions = { askPermissions() },
+      onShowFrontCamera = { viewModel.showFrontCamera() },
+      onQrCodeScanned = { data -> viewModel.onQrCodeScanned(data) },
+      onQrCodeApproved = { viewModel.addDevice() },
+      onQrCodeDismissed = { viewModel.onQrCodeDismissed() },
+      onQrCodeRetry = { viewModel.onQrCodeScanned(state.url) },
+      onLinkDeviceSuccess = {
+        viewModel.onLinkDeviceResult(true)
+        navController.popBackStack()
+      },
+      onLinkDeviceFailure = { viewModel.onLinkDeviceResult(false) }
+    )
+  }
+
+  private fun askPermissions() {
+    Permissions.with(this)
+      .request(Manifest.permission.CAMERA)
+      .ifNecessary()
+      .withPermanentDenialDialog(getString(R.string.CameraXFragment_signal_needs_camera_access_scan_qr_code), null, R.string.CameraXFragment_allow_access_camera, R.string.CameraXFragment_to_scan_qr_codes, parentFragmentManager)
+      .onAnyDenied { Toast.makeText(requireContext(), R.string.CameraXFragment_signal_needs_camera_access_scan_qr_code, Toast.LENGTH_LONG).show() }
+      .execute()
+  }
+
+  @SuppressLint("MissingSuperCall")
+  override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults)
+  }
+}
+
+@Composable
+private fun MainScreen(
+  state: LinkDeviceSettingsState,
+  navController: NavController? = null,
+  hasPermissions: Boolean = false,
+  onRequestPermissions: () -> Unit = {},
+  onShowFrontCamera: () -> Unit = {},
+  onQrCodeScanned: (String) -> Unit = {},
+  onQrCodeApproved: () -> Unit = {},
+  onQrCodeDismissed: () -> Unit = {},
+  onQrCodeRetry: () -> Unit = {},
+  onLinkDeviceSuccess: () -> Unit = {},
+  onLinkDeviceFailure: () -> Unit = {}
+) {
+  Scaffolds.Settings(
+    title = "",
+    onNavigationClick = { navController?.popBackStack() },
+    navigationIconPainter = painterResource(id = R.drawable.ic_x),
+    navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close),
+    actions = {
+      IconButton(onClick = { onShowFrontCamera() }) {
+        Icon(painterResource(id = R.drawable.symbol_switch_24), contentDescription = null)
+      }
+    }
+  ) { contentPadding: PaddingValues ->
+    LinkDeviceQrScanScreen(
+      hasPermission = hasPermissions,
+      onRequestPermissions = onRequestPermissions,
+      showFrontCamera = state.showFrontCamera,
+      qrCodeFound = state.qrCodeFound,
+      qrCodeInvalid = state.qrCodeInvalid,
+      onQrCodeScanned = onQrCodeScanned,
+      onQrCodeAccepted = onQrCodeApproved,
+      onQrCodeDismissed = onQrCodeDismissed,
+      onQrCodeRetry = onQrCodeRetry,
+      linkDeviceResult = state.linkDeviceResult,
+      onLinkDeviceSuccess = onLinkDeviceSuccess,
+      onLinkDeviceFailure = onLinkDeviceFailure,
+      modifier = Modifier.padding(contentPadding)
+    )
+  }
+}
+
+@SignalPreview
+@Composable
+private fun LinkDeviceAddScreenPreview() {
+  Previews.Preview {
+    MainScreen(
+      state = LinkDeviceSettingsState()
+    )
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/Device.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/Device.kt
new file mode 100644
index 0000000000..509eee6343
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/Device.kt
@@ -0,0 +1,6 @@
+package org.thoughtcrime.securesms.linkdevice
+
+/**
+ * Class that represents a linked device
+ */
+data class Device(val id: Long, val name: String?, val createdMillis: Long, val lastSeenMillis: Long)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFinishedBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFinishedBottomSheet.kt
new file mode 100644
index 0000000000..b295f17310
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFinishedBottomSheet.kt
@@ -0,0 +1,78 @@
+package org.thoughtcrime.securesms.linkdevice
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import org.signal.core.ui.BottomSheets
+import org.signal.core.ui.Buttons
+import org.signal.core.ui.Previews
+import org.signal.core.ui.SignalPreview
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
+
+/**
+ * Bottom sheet dialog prompting users to name their newly linked device
+ */
+class LinkDeviceFinishedSheet : ComposeBottomSheetDialogFragment() {
+  @Composable
+  override fun SheetContent() {
+    FinishedSheet(this::dismissAllowingStateLoss)
+  }
+}
+
+@Composable
+fun FinishedSheet(onClick: () -> Unit) {
+  return Column(
+    horizontalAlignment = Alignment.CenterHorizontally,
+    modifier = Modifier
+      .fillMaxWidth()
+      .wrapContentSize(Alignment.Center)
+      .padding(16.dp)
+  ) {
+    BottomSheets.Handle()
+    Icon(
+      painter = painterResource(R.drawable.ic_devices),
+      contentDescription = null,
+      tint = Color.Unspecified
+    )
+    Text(
+      text = stringResource(R.string.AddLinkDeviceFragment__finish_linking_on_other_device),
+      style = MaterialTheme.typography.titleLarge,
+      textAlign = TextAlign.Center,
+      modifier = Modifier.padding(vertical = 12.dp, horizontal = 12.dp)
+    )
+    Text(
+      text = stringResource(R.string.AddLinkDeviceFragment__finish_linking_signal),
+      textAlign = TextAlign.Center,
+      style = MaterialTheme.typography.bodyMedium,
+      modifier = Modifier.padding(horizontal = 12.dp)
+    )
+    Buttons.LargeTonal(
+      onClick = onClick,
+      modifier = Modifier.defaultMinSize(minWidth = 220.dp).padding(vertical = 20.dp, horizontal = 12.dp)
+    ) {
+      Text(stringResource(id = R.string.AddLinkDeviceFragment__okay))
+    }
+  }
+}
+
+@SignalPreview
+@Composable
+fun FinishedSheetSheetPreview() {
+  Previews.BottomSheetPreview {
+    FinishedSheet(onClick = {})
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt
new file mode 100644
index 0000000000..f0f42a0265
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceFragment.kt
@@ -0,0 +1,360 @@
+package org.thoughtcrime.securesms.linkdevice
+
+import android.os.Bundle
+import android.view.View
+import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
+import androidx.biometric.BiometricManager
+import androidx.biometric.BiometricPrompt
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.text.ClickableText
+import androidx.compose.foundation.text.InlineTextContent
+import androidx.compose.foundation.text.appendInlineContent
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LocalTextStyle
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.Placeholder
+import androidx.compose.ui.text.PlaceholderVerticalAlign
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.fragment.app.activityViewModels
+import androidx.navigation.NavController
+import androidx.navigation.fragment.findNavController
+import org.signal.core.ui.Buttons
+import org.signal.core.ui.Dialogs
+import org.signal.core.ui.Dividers
+import org.signal.core.ui.Previews
+import org.signal.core.ui.Scaffolds
+import org.signal.core.ui.SignalPreview
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.BiometricDeviceAuthentication
+import org.thoughtcrime.securesms.BiometricDeviceLockContract
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.compose.ComposeFragment
+import org.thoughtcrime.securesms.util.DateUtils
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
+import java.util.Locale
+
+private const val PLACEHOLDER = "__ICON_PLACEHOLDER__"
+
+/**
+ * Fragment that shows current linked devices
+ */
+class LinkDeviceFragment : ComposeFragment() {
+
+  companion object {
+    private val TAG = Log.tag(LinkDeviceFragment::class)
+  }
+
+  private val viewModel: LinkDeviceViewModel by activityViewModels()
+  private lateinit var biometricAuth: BiometricDeviceAuthentication
+  private lateinit var biometricDeviceLockLauncher: ActivityResultLauncher<String>
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+
+    viewModel.initialize(requireContext())
+
+    biometricDeviceLockLauncher = registerForActivityResult(BiometricDeviceLockContract()) { result: Int ->
+      if (result == BiometricDeviceAuthentication.AUTHENTICATED) {
+        findNavController().safeNavigate(R.id.action_linkDeviceFragment_to_addLinkDeviceFragment)
+      }
+    }
+
+    val promptInfo = BiometricPrompt.PromptInfo.Builder()
+      .setAllowedAuthenticators(BiometricDeviceAuthentication.ALLOWED_AUTHENTICATORS)
+      .setTitle(requireContext().getString(R.string.LinkDeviceFragment__unlock_to_link))
+      .setConfirmationRequired(true)
+      .build()
+    biometricAuth = BiometricDeviceAuthentication(
+      BiometricManager.from(requireActivity()),
+      BiometricPrompt(requireActivity(), BiometricAuthenticationListener()),
+      promptInfo
+    )
+  }
+
+  override fun onPause() {
+    super.onPause()
+    biometricAuth.cancelAuthentication()
+  }
+
+  @Composable
+  override fun FragmentContent() {
+    val state by viewModel.state.collectAsState()
+    val navController: NavController by remember { mutableStateOf(findNavController()) }
+
+    LaunchedEffect(state.toastDialog) {
+      if (state.toastDialog.isNotEmpty()) {
+        Toast.makeText(requireContext(), state.toastDialog, Toast.LENGTH_LONG).show()
+        viewModel.clearToast()
+      }
+    }
+
+    LaunchedEffect(state.showFinishedSheet) {
+      if (state.showFinishedSheet) {
+        navController.safeNavigate(R.id.action_linkDeviceFragment_to_linkDeviceFinishedSheet)
+        viewModel.markFinishedSheetSeen()
+      }
+    }
+
+    Scaffolds.Settings(
+      title = stringResource(id = R.string.preferences__linked_devices),
+      onNavigationClick = { navController.popOrFinish() },
+      navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
+      navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
+    ) { contentPadding: PaddingValues ->
+      DeviceDescriptionScreen(
+        state = state,
+        navController = navController,
+        modifier = Modifier.padding(contentPadding),
+        onLearnMore = { navController.safeNavigate(R.id.action_linkDeviceFragment_to_linkDeviceLearnMoreBottomSheet) },
+        onLinkDevice = {
+          if (biometricAuth.canAuthenticate()) {
+            biometricAuth.authenticate(requireContext(), true) { biometricDeviceLockLauncher.launch(getString(R.string.LinkDeviceFragment__unlock_to_link)) }
+          } else {
+            navController.safeNavigate(R.id.action_linkDeviceFragment_to_addLinkDeviceFragment)
+          }
+        },
+        setDeviceToRemove = { device -> viewModel.setDeviceToRemove(device) },
+        onRemoveDevice = { device -> viewModel.removeDevice(requireContext(), device) }
+      )
+    }
+  }
+
+  private fun NavController.popOrFinish() {
+    if (!popBackStack()) {
+      requireActivity().finishAfterTransition()
+    }
+  }
+
+  private inner class BiometricAuthenticationListener : BiometricPrompt.AuthenticationCallback() {
+    override fun onAuthenticationError(errorCode: Int, errorString: CharSequence) {
+      Log.w(TAG, "Authentication error: $errorCode")
+      onAuthenticationFailed()
+    }
+
+    override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
+      Log.i(TAG, "Authentication succeeded")
+      findNavController().safeNavigate(R.id.action_linkDeviceFragment_to_addLinkDeviceFragment)
+    }
+
+    override fun onAuthenticationFailed() {
+      Log.w(TAG, "Unable to authenticate")
+    }
+  }
+}
+
+@Composable
+fun DeviceDescriptionScreen(
+  state: LinkDeviceSettingsState,
+  navController: NavController? = null,
+  modifier: Modifier = Modifier,
+  onLearnMore: () -> Unit = {},
+  onLinkDevice: () -> Unit = {},
+  setDeviceToRemove: (Device?) -> Unit = {},
+  onRemoveDevice: (Device) -> Unit = {}
+) {
+  if (state.progressDialogMessage != -1 && state.progressDialogMessage != R.string.LinkDeviceFragment__loading) {
+    if (navController?.currentDestination?.id == R.id.linkDeviceFinishedSheet &&
+      state.progressDialogMessage == R.string.LinkDeviceFragment__linking_device
+    ) {
+      navController.popBackStack()
+    }
+    Dialogs.IndeterminateProgressDialog(stringResource(id = state.progressDialogMessage))
+  }
+  if (state.deviceToRemove != null) {
+    val device: Device = state.deviceToRemove
+    val name = if (device.name.isNullOrEmpty()) stringResource(R.string.DeviceListItem_unnamed_device) else device.name
+    Dialogs.SimpleAlertDialog(
+      title = stringResource(id = R.string.DeviceListActivity_unlink_s, name),
+      body = stringResource(id = R.string.DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive),
+      confirm = stringResource(R.string.LinkDeviceFragment__unlink),
+      dismiss = stringResource(android.R.string.cancel),
+      onConfirm = { onRemoveDevice(device) },
+      onDismiss = { setDeviceToRemove(null) }
+    )
+  }
+
+  Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = modifier.verticalScroll(rememberScrollState())) {
+    Icon(
+      painter = painterResource(R.drawable.ic_devices_intro),
+      contentDescription = stringResource(R.string.preferences__linked_devices),
+      tint = Color.Unspecified
+    )
+    Text(
+      text = stringResource(id = R.string.LinkDeviceFragment__use_signal_on_desktop_ipad),
+      textAlign = TextAlign.Center,
+      modifier = Modifier.padding(start = 20.dp, end = 20.dp, top = 12.dp, bottom = 4.dp)
+    )
+    ClickableText(
+      text = AnnotatedString(stringResource(id = R.string.LearnMoreTextView_learn_more)),
+      style = LocalTextStyle.current.copy(color = MaterialTheme.colorScheme.primary)
+    ) {
+      onLearnMore()
+    }
+
+    Spacer(modifier = Modifier.size(20.dp))
+
+    Buttons.LargeTonal(
+      onClick = onLinkDevice,
+      modifier = Modifier.defaultMinSize(300.dp).padding(bottom = 8.dp)
+    ) {
+      Text(stringResource(id = R.string.LinkDeviceFragment__link_a_new_device))
+    }
+
+    Dividers.Default()
+
+    Column(modifier = Modifier.fillMaxWidth()) {
+      Text(
+        text = stringResource(R.string.LinkDeviceFragment__my_linked_devices),
+        style = MaterialTheme.typography.titleMedium,
+        modifier = Modifier.padding(start = 24.dp, top = 12.dp, bottom = 12.dp)
+      )
+      if (state.progressDialogMessage == R.string.LinkDeviceFragment__loading) {
+        Spacer(modifier = Modifier.size(30.dp))
+        CircularProgressIndicator(
+          modifier = Modifier
+            .size(36.dp)
+            .align(Alignment.CenterHorizontally),
+          color = MaterialTheme.colorScheme.primary
+        )
+        Spacer(modifier = Modifier.size(30.dp))
+      } else if (state.devices.isEmpty()) {
+        Text(
+          text = stringResource(R.string.LinkDeviceFragment__no_linked_devices),
+          textAlign = TextAlign.Center,
+          style = MaterialTheme.typography.bodyMedium,
+          color = MaterialTheme.colorScheme.onSurfaceVariant,
+          modifier = Modifier
+            .fillMaxWidth()
+            .defaultMinSize(minHeight = 96.dp)
+            .wrapContentHeight(align = Alignment.CenterVertically)
+        )
+      } else {
+        state.devices.forEach { device ->
+          DeviceRow(device, setDeviceToRemove)
+        }
+      }
+    }
+
+    Row(
+      modifier = Modifier.padding(horizontal = 40.dp, vertical = 12.dp),
+      verticalAlignment = Alignment.CenterVertically
+    ) {
+      val message = stringResource(id = R.string.LinkDeviceFragment__messages_and_chat_info_are_protected, PLACEHOLDER)
+      val (messageText, messageInline) = remember(message) {
+        val parts = message.split(PLACEHOLDER)
+        val annotatedString = buildAnnotatedString {
+          append(parts[0])
+          appendInlineContent("icon")
+          append(parts[1])
+        }
+
+        val inlineContentMap = mapOf(
+          "icon" to InlineTextContent(Placeholder(16.sp, 16.sp, PlaceholderVerticalAlign.Center)) {
+            Image(
+              imageVector = ImageVector.vectorResource(id = R.drawable.symbol_lock_24),
+              contentDescription = null,
+              modifier = Modifier.fillMaxSize(),
+              colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface)
+            )
+          }
+        )
+
+        annotatedString to inlineContentMap
+      }
+
+      Text(
+        text = messageText,
+        inlineContent = messageInline,
+        style = MaterialTheme.typography.bodySmall,
+        textAlign = TextAlign.Center,
+        color = MaterialTheme.colorScheme.onSurfaceVariant
+      )
+    }
+  }
+}
+
+@Composable
+fun DeviceRow(device: Device, setDeviceToRemove: (Device) -> Unit) {
+  val titleString = if (device.name.isNullOrEmpty()) stringResource(R.string.DeviceListItem_unnamed_device) else device.name
+  val linkedDate = DateUtils.getDayPrecisionTimeSpanString(LocalContext.current, Locale.getDefault(), device.createdMillis)
+  val lastActive = DateUtils.getDayPrecisionTimeSpanString(LocalContext.current, Locale.getDefault(), device.lastSeenMillis)
+
+  Row(
+    modifier = Modifier
+      .fillMaxWidth()
+      .clickable { setDeviceToRemove(device) },
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Image(
+      painter = painterResource(id = R.drawable.symbol_devices_24),
+      contentDescription = null,
+      colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface),
+      contentScale = ContentScale.Inside,
+      modifier = Modifier
+        .padding(start = 24.dp, top = 28.dp, bottom = 28.dp)
+        .size(40.dp)
+        .background(
+          color = MaterialTheme.colorScheme.surfaceVariant,
+          shape = CircleShape
+        )
+    )
+    Spacer(modifier = Modifier.size(16.dp))
+    Column {
+      Text(text = titleString, style = MaterialTheme.typography.bodyLarge)
+      Text(stringResource(R.string.DeviceListItem_linked_s, linkedDate), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant)
+      Text(stringResource(R.string.DeviceListItem_last_active_s, lastActive), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant)
+    }
+  }
+}
+
+@SignalPreview
+@Composable
+private fun DeviceScreenPreview() {
+  val previewDevices = listOf(
+    Device(1, "Sam's Macbook Pro", 1715793982000, 1716053182000),
+    Device(1, "Sam's iPad", 1715793182000, 1716053122000)
+  )
+  val previewState = LinkDeviceSettingsState(devices = previewDevices)
+
+  Previews.Preview {
+    DeviceDescriptionScreen(previewState)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceIntroBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceIntroBottomSheet.kt
new file mode 100644
index 0000000000..16584118ce
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceIntroBottomSheet.kt
@@ -0,0 +1,82 @@
+package org.thoughtcrime.securesms.linkdevice
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import com.airbnb.lottie.compose.LottieAnimation
+import com.airbnb.lottie.compose.LottieCompositionSpec
+import com.airbnb.lottie.compose.LottieConstants
+import com.airbnb.lottie.compose.rememberLottieComposition
+import org.signal.core.ui.BottomSheets
+import org.signal.core.ui.Buttons
+import org.signal.core.ui.Previews
+import org.signal.core.ui.SignalPreview
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
+
+/**
+ * Bottom sheet dialog displayed when users click 'Link a device'
+ */
+class LinkDeviceIntroBottomSheet : ComposeBottomSheetDialogFragment() {
+
+  override val peekHeightPercentage: Float = 0.8f
+
+  @Composable
+  override fun SheetContent() {
+    EducationSheet(this::dismissAllowingStateLoss)
+  }
+}
+
+@Composable
+fun EducationSheet(onClick: () -> Unit) {
+  val composition by rememberLottieComposition(LottieCompositionSpec.RawRes(R.raw.linking_device))
+
+  return Column(
+    horizontalAlignment = Alignment.CenterHorizontally,
+    modifier = Modifier
+      .fillMaxWidth()
+      .padding(16.dp)
+  ) {
+    BottomSheets.Handle()
+    Box(modifier = Modifier.size(150.dp)) {
+      LottieAnimation(composition, iterations = LottieConstants.IterateForever, modifier = Modifier.matchParentSize())
+    }
+    Text(
+      text = stringResource(R.string.AddLinkDeviceFragment__scan_qr_code),
+      style = MaterialTheme.typography.titleLarge,
+      modifier = Modifier.padding(bottom = 12.dp)
+    )
+    Text(
+      text = stringResource(R.string.AddLinkDeviceFragment__use_this_device_to_scan_qr_code),
+      style = MaterialTheme.typography.bodyMedium,
+      textAlign = TextAlign.Center,
+      modifier = Modifier.padding(bottom = 12.dp)
+    )
+    Buttons.LargeTonal(
+      onClick = onClick,
+      modifier = Modifier.defaultMinSize(minWidth = 220.dp)
+    ) {
+      Text(stringResource(id = R.string.AddLinkDeviceFragment__okay))
+    }
+  }
+}
+
+@SignalPreview
+@Composable
+fun EducationSheetPreview() {
+  Previews.BottomSheetPreview {
+    EducationSheet(onClick = {})
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceLearnMoreBottomSheetFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceLearnMoreBottomSheetFragment.kt
new file mode 100644
index 0000000000..bec3e8db2d
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceLearnMoreBottomSheetFragment.kt
@@ -0,0 +1,122 @@
+package org.thoughtcrime.securesms.linkdevice
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import org.signal.core.ui.BottomSheets
+import org.signal.core.ui.Previews
+import org.signal.core.ui.SignalPreview
+import org.signal.core.ui.Texts
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
+import org.thoughtcrime.securesms.util.CommunicationActions
+import org.thoughtcrime.securesms.util.SpanUtil
+
+/**
+ *  Bottom sheet dialog displayed when users click 'Learn more' when linking a device
+ */
+class LinkDeviceLearnMoreBottomSheetFragment : ComposeBottomSheetDialogFragment() {
+
+  override val peekHeightPercentage: Float = 0.8f
+
+  companion object {
+    const val SIGNAL_DOWNLOAD_URL = "https://signal.org/download"
+  }
+
+  @Composable
+  override fun SheetContent() {
+    LearnMoreSheet()
+  }
+}
+
+@Composable
+fun LearnMoreSheet() {
+  val context = LocalContext.current
+  val downloadUrl = stringResource(id = R.string.LinkDeviceFragment__signal_download_url)
+  val fullString = stringResource(id = R.string.LinkDeviceFragment__on_other_device_visit_signal, downloadUrl)
+  val spanned = SpanUtil.urlSubsequence(fullString, downloadUrl, LinkDeviceLearnMoreBottomSheetFragment.SIGNAL_DOWNLOAD_URL)
+
+  return Column(
+    horizontalAlignment = Alignment.CenterHorizontally,
+    modifier = Modifier
+      .fillMaxWidth()
+      .wrapContentSize(Alignment.Center)
+      .padding(bottom = 48.dp)
+  ) {
+    BottomSheets.Handle()
+    Icon(
+      painter = painterResource(R.drawable.ic_all_devices),
+      contentDescription = null,
+      tint = Color.Unspecified,
+      modifier = Modifier.size(110.dp)
+    )
+    Text(
+      style = MaterialTheme.typography.titleLarge,
+      text = stringResource(R.string.LinkDeviceFragment__signal_on_desktop_ipad),
+      modifier = Modifier.padding(horizontal = 32.dp, vertical = 8.dp)
+    )
+    LinkedDeviceInformationRow(
+      painterResource(R.drawable.symbol_lock_24),
+      stringResource(R.string.LinkDeviceFragment__all_messaging_is_private)
+    )
+    LinkedDeviceInformationRow(
+      painterResource(R.drawable.ic_replies_outline_20),
+      stringResource(R.string.LinkDeviceFragment__signal_messages_are_synchronized)
+    )
+    Row(modifier = Modifier.fillMaxWidth().padding(bottom = 12.dp, start = 40.dp, end = 32.dp)) {
+      Icon(
+        painter = painterResource(R.drawable.symbol_save_android_24),
+        contentDescription = stringResource(R.string.preferences__linked_devices),
+        modifier = Modifier.size(24.dp).padding(top = 4.dp)
+      )
+      Texts.LinkifiedText(
+        textWithUrlSpans = spanned,
+        onUrlClick = { CommunicationActions.openBrowserLink(context, it) },
+        style = MaterialTheme.typography.bodyLarge.copy(color = MaterialTheme.colorScheme.onSurface),
+        modifier = Modifier.padding(start = 20.dp)
+      )
+    }
+  }
+}
+
+@Composable
+private fun LinkedDeviceInformationRow(
+  iconPainter: Painter,
+  text: String
+) {
+  Row(modifier = Modifier.fillMaxWidth().padding(bottom = 12.dp, start = 40.dp, end = 32.dp)) {
+    Icon(
+      painter = iconPainter,
+      contentDescription = null,
+      modifier = Modifier.size(24.dp).padding(top = 4.dp)
+    )
+    Text(
+      style = MaterialTheme.typography.bodyLarge,
+      text = text,
+      modifier = Modifier.padding(start = 20.dp)
+    )
+  }
+}
+
+@SignalPreview
+@Composable
+fun LearnMorePreview() {
+  Previews.BottomSheetPreview {
+    LearnMoreSheet()
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceQrScanScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceQrScanScreen.kt
new file mode 100644
index 0000000000..f9418c36e8
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceQrScanScreen.kt
@@ -0,0 +1,113 @@
+package org.thoughtcrime.securesms.linkdevice
+
+import android.content.Context
+import android.widget.Toast
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.compose.ui.res.stringResource
+import org.signal.core.ui.Dialogs
+import org.signal.qr.QrScannerView
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.mediasend.camerax.CameraXModelBlocklist
+import org.thoughtcrime.securesms.qr.QrScanScreens
+import java.util.concurrent.TimeUnit
+
+/**
+ * A screen that allows you to scan a QR code to link a device
+ */
+@Composable
+fun LinkDeviceQrScanScreen(
+  hasPermission: Boolean,
+  onRequestPermissions: () -> Unit,
+  showFrontCamera: Boolean?,
+  qrCodeFound: Boolean,
+  qrCodeInvalid: Boolean,
+  onQrCodeScanned: (String) -> Unit,
+  onQrCodeAccepted: () -> Unit,
+  onQrCodeDismissed: () -> Unit,
+  onQrCodeRetry: () -> Unit,
+  linkDeviceResult: LinkDeviceRepository.LinkDeviceResult,
+  onLinkDeviceSuccess: () -> Unit,
+  onLinkDeviceFailure: () -> Unit,
+  modifier: Modifier = Modifier
+) {
+  val lifecycleOwner = LocalLifecycleOwner.current
+  val context = LocalContext.current
+
+  if (qrCodeFound) {
+    Dialogs.SimpleAlertDialog(
+      title = stringResource(id = R.string.DeviceProvisioningActivity_link_this_device),
+      body = stringResource(id = R.string.AddLinkDeviceFragment__this_device_will_see_your_groups_contacts),
+      confirm = stringResource(id = R.string.device_list_fragment__link_new_device),
+      onConfirm = onQrCodeAccepted,
+      dismiss = stringResource(id = android.R.string.cancel),
+      onDismiss = onQrCodeDismissed
+    )
+  } else if (qrCodeInvalid) {
+    Dialogs.SimpleAlertDialog(
+      title = stringResource(id = R.string.AddLinkDeviceFragment__linking_device_failed),
+      body = stringResource(id = R.string.AddLinkDeviceFragment__this_qr_code_not_valid),
+      confirm = stringResource(id = R.string.AddLinkDeviceFragment__retry),
+      onConfirm = onQrCodeRetry,
+      dismiss = stringResource(id = android.R.string.cancel),
+      onDismiss = onQrCodeDismissed
+    )
+  }
+
+  LaunchedEffect(linkDeviceResult) {
+    when (linkDeviceResult) {
+      LinkDeviceRepository.LinkDeviceResult.SUCCESS -> onLinkDeviceSuccess()
+      LinkDeviceRepository.LinkDeviceResult.NO_DEVICE -> makeToast(context, R.string.DeviceProvisioningActivity_content_progress_no_device, onLinkDeviceFailure)
+      LinkDeviceRepository.LinkDeviceResult.NETWORK_ERROR -> makeToast(context, R.string.DeviceProvisioningActivity_content_progress_network_error, onLinkDeviceFailure)
+      LinkDeviceRepository.LinkDeviceResult.KEY_ERROR -> makeToast(context, R.string.DeviceProvisioningActivity_content_progress_key_error, onLinkDeviceFailure)
+      LinkDeviceRepository.LinkDeviceResult.LIMIT_EXCEEDED -> makeToast(context, R.string.DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already, onLinkDeviceFailure)
+      LinkDeviceRepository.LinkDeviceResult.BAD_CODE -> makeToast(context, R.string.DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code, onLinkDeviceFailure)
+      LinkDeviceRepository.LinkDeviceResult.UNKNOWN -> Unit
+    }
+  }
+
+  Column(
+    modifier = modifier
+      .fillMaxWidth()
+      .fillMaxHeight()
+  ) {
+    Box(
+      modifier = Modifier
+        .fillMaxWidth()
+        .weight(1f, true)
+    ) {
+      QrScanScreens.QrScanScreen(
+        factory = { factoryContext ->
+          val view = QrScannerView(factoryContext)
+          view.qrData
+            .throttleFirst(3000, TimeUnit.MILLISECONDS)
+            .subscribe { data ->
+              onQrCodeScanned(data)
+            }
+          view
+        },
+        update = { view: QrScannerView ->
+          view.start(lifecycleOwner = lifecycleOwner, forceLegacy = CameraXModelBlocklist.isBlocklisted())
+          if (showFrontCamera != null) {
+            view.toggleCamera()
+          }
+        },
+        hasPermission = hasPermission,
+        onRequestPermissions = onRequestPermissions,
+        qrHeaderLabelString = stringResource(R.string.AddLinkDeviceFragment__scan_the_qr_code)
+      )
+    }
+  }
+}
+
+private fun makeToast(context: Context, messageId: Int, onLinkDeviceFailure: () -> Unit) {
+  Toast.makeText(context, messageId, Toast.LENGTH_LONG).show()
+  onLinkDeviceFailure()
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceRepository.kt
new file mode 100644
index 0000000000..5ca5afc81e
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceRepository.kt
@@ -0,0 +1,131 @@
+package org.thoughtcrime.securesms.linkdevice
+
+import android.net.Uri
+import org.signal.core.util.Base64.decode
+import org.signal.core.util.isNotNullOrBlank
+import org.signal.core.util.logging.Log
+import org.signal.libsignal.protocol.ecc.Curve
+import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.devicelist.protos.DeviceName
+import org.thoughtcrime.securesms.jobs.LinkedDeviceInactiveCheckJob
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.registration.secondary.DeviceNameCipher
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo
+import org.whispersystems.signalservice.api.push.SignalServiceAddress
+import org.whispersystems.signalservice.api.push.exceptions.NotFoundException
+import org.whispersystems.signalservice.internal.push.DeviceLimitExceededException
+import java.io.IOException
+import java.security.InvalidKeyException
+
+/**
+ * Repository for linked devices and its various actions (linking, unlinking, listing).
+ */
+object LinkDeviceRepository {
+
+  private val TAG = Log.tag(LinkDeviceRepository::class)
+
+  fun removeDevice(deviceId: Long): Boolean {
+    return try {
+      val accountManager = AppDependencies.signalServiceAccountManager
+      accountManager.removeDevice(deviceId)
+      LinkedDeviceInactiveCheckJob.enqueue()
+      true
+    } catch (e: IOException) {
+      Log.w(TAG, e)
+      false
+    }
+  }
+
+  fun loadDevices(): List<Device>? {
+    val accountManager = AppDependencies.signalServiceAccountManager
+    return try {
+      val devices: List<Device> = accountManager.getDevices()
+        .filter { d: DeviceInfo -> d.getId() != SignalServiceAddress.DEFAULT_DEVICE_ID }
+        .map { deviceInfo: DeviceInfo -> deviceInfo.toDevice() }
+        .sortedBy { it.createdMillis }
+        .toList()
+      devices
+    } catch (e: IOException) {
+      Log.w(TAG, e)
+      null
+    }
+  }
+
+  private fun DeviceInfo.toDevice(): Device {
+    val defaultDevice = Device(getId().toLong(), getName(), getCreated(), getLastSeen())
+    try {
+      if (getName().isNullOrEmpty() || getName().length < 4) {
+        Log.w(TAG, "Invalid DeviceInfo name.")
+        return defaultDevice
+      }
+
+      val deviceName = DeviceName.ADAPTER.decode(decode(getName()))
+      if (deviceName.ciphertext == null || deviceName.ephemeralPublic == null || deviceName.syntheticIv == null) {
+        Log.w(TAG, "Got a DeviceName that wasn't properly populated.")
+        return defaultDevice
+      }
+
+      val plaintext = DeviceNameCipher.decryptDeviceName(deviceName, SignalStore.account.aciIdentityKey)
+      if (plaintext == null) {
+        Log.w(TAG, "Failed to decrypt device name.")
+        return defaultDevice
+      }
+
+      return Device(getId().toLong(), String(plaintext), getCreated(), getLastSeen())
+    } catch (e: Exception) {
+      Log.w(TAG, "Failed while reading the protobuf.", e)
+    }
+    return defaultDevice
+  }
+
+  fun isValidQr(uri: Uri): Boolean {
+    if (!uri.isHierarchical) {
+      return false
+    }
+
+    val ephemeralId: String? = uri.getQueryParameter("uuid")
+    val publicKeyEncoded: String? = uri.getQueryParameter("pub_key")
+    return ephemeralId.isNotNullOrBlank() && publicKeyEncoded.isNotNullOrBlank()
+  }
+
+  fun addDevice(uri: Uri): LinkDeviceResult {
+    return try {
+      val accountManager = AppDependencies.signalServiceAccountManager
+      val verificationCode = accountManager.getNewDeviceVerificationCode()
+      if (!isValidQr(uri)) {
+        LinkDeviceResult.BAD_CODE
+      } else {
+        val ephemeralId: String? = uri.getQueryParameter("uuid")
+        val publicKeyEncoded: String? = uri.getQueryParameter("pub_key")
+        val publicKey = Curve.decodePoint(publicKeyEncoded?.let { decode(it) }, 0)
+        val aciIdentityKeyPair = SignalStore.account.aciIdentityKey
+        val pniIdentityKeyPair = SignalStore.account.pniIdentityKey
+        val profileKey = ProfileKeyUtil.getSelfProfileKey()
+
+        accountManager.addDevice(ephemeralId, publicKey, aciIdentityKeyPair, pniIdentityKeyPair, profileKey, SignalStore.svr.getOrCreateMasterKey(), verificationCode)
+        TextSecurePreferences.setMultiDevice(AppDependencies.application, true)
+        LinkDeviceResult.SUCCESS
+      }
+    } catch (e: NotFoundException) {
+      LinkDeviceResult.NO_DEVICE
+    } catch (e: DeviceLimitExceededException) {
+      LinkDeviceResult.LIMIT_EXCEEDED
+    } catch (e: IOException) {
+      LinkDeviceResult.NETWORK_ERROR
+    } catch (e: InvalidKeyException) {
+      LinkDeviceResult.KEY_ERROR
+    }
+  }
+
+  enum class LinkDeviceResult {
+    SUCCESS,
+    NO_DEVICE,
+    NETWORK_ERROR,
+    KEY_ERROR,
+    LIMIT_EXCEEDED,
+    BAD_CODE,
+    UNKNOWN
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceSettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceSettingsState.kt
new file mode 100644
index 0000000000..a6168fe67b
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceSettingsState.kt
@@ -0,0 +1,21 @@
+package org.thoughtcrime.securesms.linkdevice
+
+import androidx.annotation.StringRes
+
+/**
+ * Information about linked devices. Used in [LinkDeviceViewModel].
+ */
+data class LinkDeviceSettingsState(
+  val devices: List<Device> = emptyList(),
+  val deviceToRemove: Device? = null,
+  @StringRes val progressDialogMessage: Int = -1,
+  val toastDialog: String = "",
+  val showFrontCamera: Boolean? = null,
+  val qrCodeFound: Boolean = false,
+  val qrCodeInvalid: Boolean = false,
+  val url: String = "",
+  val linkDeviceResult: LinkDeviceRepository.LinkDeviceResult = LinkDeviceRepository.LinkDeviceResult.UNKNOWN,
+  val showFinishedSheet: Boolean = false,
+  val seenIntroSheet: Boolean = false,
+  val pendingNewDevice: Boolean = false
+)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceViewModel.kt
new file mode 100644
index 0000000000..2797815860
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/linkdevice/LinkDeviceViewModel.kt
@@ -0,0 +1,194 @@
+package org.thoughtcrime.securesms.linkdevice
+
+import android.content.Context
+import android.net.Uri
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.jobmanager.Job
+import org.thoughtcrime.securesms.jobmanager.JobTracker
+import org.thoughtcrime.securesms.jobs.LinkedDeviceInactiveCheckJob
+import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob
+
+/**
+ * Maintains the state of the [LinkDeviceFragment]
+ */
+class LinkDeviceViewModel : ViewModel() {
+
+  private val _state = MutableStateFlow(LinkDeviceSettingsState())
+  val state = _state.asStateFlow()
+
+  private lateinit var listener: JobTracker.JobListener
+
+  fun initialize(context: Context) {
+    listener = JobTracker.JobListener { _, jobState ->
+      if (jobState.isComplete) {
+        loadDevices(context = context, isPotentialNewDevice = true)
+      }
+    }
+    AppDependencies.jobManager.addListener(
+      { job: Job -> job.parameters.queue?.startsWith(MultiDeviceConfigurationUpdateJob.QUEUE) ?: false },
+      listener
+    )
+    loadDevices(context)
+  }
+
+  override fun onCleared() {
+    super.onCleared()
+    AppDependencies.jobManager.removeListener(listener)
+  }
+
+  fun setDeviceToRemove(device: Device?) {
+    _state.update { it.copy(deviceToRemove = device) }
+  }
+
+  fun removeDevice(context: Context, device: Device) {
+    viewModelScope.launch(Dispatchers.IO) {
+      _state.update { it.copy(progressDialogMessage = R.string.DeviceListActivity_unlinking_device) }
+
+      val success = LinkDeviceRepository.removeDevice(device.id)
+      if (success) {
+        loadDevices(context)
+        _state.value = _state.value.copy(
+          toastDialog = context.getString(R.string.LinkDeviceFragment__s_unlinked, device.name),
+          progressDialogMessage = -1
+        )
+      } else {
+        _state.update {
+          it.copy(progressDialogMessage = -1)
+        }
+      }
+    }
+  }
+
+  private fun loadDevices(context: Context, isPotentialNewDevice: Boolean = false) {
+    if (isPotentialNewDevice && !_state.value.pendingNewDevice) {
+      return
+    }
+    _state.value = _state.value.copy(
+      progressDialogMessage = if (isPotentialNewDevice) R.string.LinkDeviceFragment__linking_device else R.string.LinkDeviceFragment__loading,
+      pendingNewDevice = if (isPotentialNewDevice) false else _state.value.pendingNewDevice,
+      showFrontCamera = null
+    )
+    viewModelScope.launch(Dispatchers.IO) {
+      val devices = LinkDeviceRepository.loadDevices()
+      if (devices == null) {
+        _state.value = _state.value.copy(
+          toastDialog = context.getString(R.string.DeviceListActivity_network_failed),
+          progressDialogMessage = -1
+        )
+      } else {
+        _state.update {
+          it.copy(
+            toastDialog = if (isPotentialNewDevice) context.getString(R.string.LinkDeviceFragment__device_approved) else "",
+            devices = devices,
+            progressDialogMessage = -1
+          )
+        }
+      }
+    }
+  }
+
+  fun showFrontCamera() {
+    _state.update {
+      val frontCamera = it.showFrontCamera
+      it.copy(
+        showFrontCamera = if (frontCamera == null) true else !frontCamera
+      )
+    }
+  }
+
+  fun markIntroSheetSeen() {
+    _state.update {
+      it.copy(
+        seenIntroSheet = true,
+        showFrontCamera = null
+      )
+    }
+  }
+
+  fun onQrCodeScanned(url: String) {
+    if (_state.value.qrCodeFound || _state.value.qrCodeInvalid) {
+      return
+    }
+
+    val uri = Uri.parse(url)
+    if (LinkDeviceRepository.isValidQr(uri)) {
+      _state.update {
+        it.copy(
+          qrCodeFound = true,
+          qrCodeInvalid = false,
+          url = url,
+          showFrontCamera = null
+        )
+      }
+    } else {
+      _state.update {
+        it.copy(
+          qrCodeFound = false,
+          qrCodeInvalid = true,
+          url = url,
+          showFrontCamera = null
+        )
+      }
+    }
+  }
+
+  fun onQrCodeDismissed() {
+    _state.update {
+      it.copy(
+        qrCodeFound = false,
+        qrCodeInvalid = false
+      )
+    }
+  }
+
+  fun addDevice() {
+    val uri = Uri.parse(_state.value.url)
+    viewModelScope.launch(Dispatchers.IO) {
+      val result = LinkDeviceRepository.addDevice(uri)
+      _state.update {
+        it.copy(
+          qrCodeFound = false,
+          qrCodeInvalid = false,
+          linkDeviceResult = result,
+          url = ""
+        )
+      }
+      LinkedDeviceInactiveCheckJob.enqueue()
+    }
+  }
+
+  fun onLinkDeviceResult(showSheet: Boolean) {
+    _state.update {
+      it.copy(
+        showFinishedSheet = showSheet,
+        linkDeviceResult = LinkDeviceRepository.LinkDeviceResult.UNKNOWN,
+        toastDialog = "",
+        pendingNewDevice = true
+      )
+    }
+  }
+
+  fun markFinishedSheetSeen() {
+    _state.update {
+      it.copy(
+        showFinishedSheet = false
+      )
+    }
+  }
+
+  fun clearToast() {
+    _state.update {
+      it.copy(
+        toastDialog = ""
+      )
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
index e3aca43f51..443c016828 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
@@ -29,7 +29,7 @@
 import org.thoughtcrime.securesms.database.AttachmentTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.GroupRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.groups.GroupManager;
 import org.thoughtcrime.securesms.groups.v2.GroupInviteLinkUrl;
@@ -100,7 +100,7 @@ public LinkPreviewRepository() {
 
   public @NonNull Single<Result<LinkPreview, Error>> getLinkPreview(@NonNull String url) {
     return Single.<Result<LinkPreview, Error>>create(emitter -> {
-      RequestController controller = getLinkPreview(ApplicationDependencies.getApplication(),
+      RequestController controller = getLinkPreview(AppDependencies.getApplication(),
                                                     url,
                                                     new Callback() {
                                                       @Override
@@ -238,12 +238,12 @@ public void onResponse(@NonNull Call call, @NonNull Response response) throws IO
         byte[]                           data        = OkHttpUtil.readAsBytes(bodyStream, FAILSAFE_MAX_IMAGE_SIZE);
         Bitmap                           bitmap      = BitmapFactory.decodeByteArray(data, 0, data.length);
         Optional<Attachment>             thumbnail   = Optional.empty();
-        PushMediaConstraints.MediaConfig mediaConfig = PushMediaConstraints.MediaConfig.getDefault(ApplicationDependencies.getApplication());
+        PushMediaConstraints.MediaConfig mediaConfig = PushMediaConstraints.MediaConfig.getDefault(AppDependencies.getApplication());
 
         if (bitmap != null) {
           for (final int maxDimension : mediaConfig.getImageSizeTargets()) {
             ImageCompressionUtil.Result result = ImageCompressionUtil.compressWithinConstraints(
-                ApplicationDependencies.getApplication(),
+                AppDependencies.getApplication(),
                 MediaUtil.IMAGE_JPEG,
                 bitmap,
                 maxDimension,
@@ -283,7 +283,7 @@ private static RequestController fetchStickerPackLinkPreview(@NonNull Context co
         byte[]               packIdBytes   = Hex.fromStringCondensed(packIdString);
         byte[]               packKeyBytes  = Hex.fromStringCondensed(packKeyString);
 
-        SignalServiceMessageReceiver receiver = ApplicationDependencies.getSignalServiceMessageReceiver();
+        SignalServiceMessageReceiver receiver = AppDependencies.getSignalServiceMessageReceiver();
         SignalServiceStickerManifest manifest = receiver.retrieveStickerManifest(packIdBytes, packKeyBytes);
 
         String                title        = OptionalUtil.or(manifest.getTitle(), manifest.getAuthor()).orElse("");
@@ -324,11 +324,11 @@ private static RequestController fetchCallLinkPreview(@NonNull Context context,
       return () -> { };
     }
 
-    Disposable disposable = ApplicationDependencies.getSignalCallManager()
-                                                   .getCallLinkManager()
-                                                   .readCallLink(new CallLinkCredentials(callLinkRootKey.getKeyBytes(), null))
-                                                   .observeOn(Schedulers.io())
-                                                   .subscribe(
+    Disposable disposable = AppDependencies.getSignalCallManager()
+                                           .getCallLinkManager()
+                                           .readCallLink(new CallLinkCredentials(callLinkRootKey.getKeyBytes(), null))
+                                           .observeOn(Schedulers.io())
+                                           .subscribe(
                                                         result -> {
                                                           if (result instanceof ReadCallLinkResult.Success) {
                                                             ReadCallLinkResult.Success success = (ReadCallLinkResult.Success) result;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java
index d20c0ab0ee..6ba70ac4fb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java
@@ -13,7 +13,7 @@
 
 import org.signal.core.util.ThreadUtil;
 import org.thoughtcrime.securesms.attachments.AttachmentId;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.net.RequestController;
 import org.thoughtcrime.securesms.util.Debouncer;
@@ -210,7 +210,7 @@ private boolean isCursorPositionValid(@NonNull String text, @NonNull Link link,
   }
 
   private @Nullable RequestController performRequest(String url) {
-    return repository.getLinkPreview(ApplicationDependencies.getApplication(), url, new LinkPreviewRepository.Callback() {
+    return repository.getLinkPreview(AppDependencies.getApplication(), url, new LinkPreviewRepository.Callback() {
       @Override
       public void onSuccess(@NonNull LinkPreview linkPreview) {
         ThreadUtil.runOnMain(() -> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModelV2.kt b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModelV2.kt
index 9aef0296ae..767751806e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModelV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModelV2.kt
@@ -35,7 +35,7 @@ class LinkPreviewViewModelV2(
     private const val LINK_PREVIEW_STATE = "link_preview_state"
   }
 
-  private var enabled = SignalStore.settings().isLinkPreviewsEnabled
+  private var enabled = SignalStore.settings.isLinkPreviewsEnabled
   private var savedLinkPreviewState by savedStateHandle.delegate(LINK_PREVIEW_STATE) { LinkPreviewState.forNoLinks() }
   private val linkPreviewStateStore = RxStore(savedLinkPreviewState)
 
@@ -114,7 +114,7 @@ class LinkPreviewViewModelV2(
 
   fun onEnabled() {
     userCancelled = false
-    enabled = SignalStore.settings().isLinkPreviewsEnabled
+    enabled = SignalStore.settings.isLinkPreviewsEnabled
   }
 
   fun onUserCancel() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/SignalPinReminderDialog.java b/app/src/main/java/org/thoughtcrime/securesms/lock/SignalPinReminderDialog.java
index 43025e384d..db4f4f6233 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/SignalPinReminderDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/SignalPinReminderDialog.java
@@ -76,7 +76,7 @@ public static void show(@NonNull Context context, @NonNull Launcher launcher, @N
     ViewUtil.focusAndShowKeyboard(pinEditText);
     ViewCompat.setAutofillHints(pinEditText, HintConstants.AUTOFILL_HINT_PASSWORD);
 
-    switch (SignalStore.pinValues().getKeyboardType()) {
+    switch (SignalStore.pin().getKeyboardType()) {
       case NUMERIC:
         pinEditText.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
         break;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmSvrPinFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmSvrPinFragment.kt
index 5ea3c6b256..be7f4fabb8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmSvrPinFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmSvrPinFragment.kt
@@ -9,7 +9,7 @@ import androidx.core.view.ViewCompat
 import androidx.lifecycle.ViewModelProvider
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.lock.v2.ConfirmSvrPinViewModel.SaveAnimation
 import org.thoughtcrime.securesms.megaphone.Megaphones
 import org.thoughtcrime.securesms.registration.RegistrationUtil
@@ -117,6 +117,6 @@ internal class ConfirmSvrPinFragment : BaseSvrPinFragment<ConfirmSvrPinViewModel
   }
 
   private fun markMegaphoneSeenIfNecessary() {
-    ApplicationDependencies.getMegaphoneRepository().markSeen(Megaphones.Event.PINS_FOR_ALL)
+    AppDependencies.megaphoneRepository.markSeen(Megaphones.Event.PINS_FOR_ALL)
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/SvrMigrationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/SvrMigrationActivity.java
index 268661a8ca..861dbaba0b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/SvrMigrationActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/SvrMigrationActivity.java
@@ -8,7 +8,7 @@
 import org.thoughtcrime.securesms.BaseActivity;
 import org.thoughtcrime.securesms.PassphrasePromptActivity;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.util.DynamicRegistrationTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
@@ -20,7 +20,7 @@ public class SvrMigrationActivity extends BaseActivity {
   private final DynamicTheme dynamicTheme = new DynamicRegistrationTheme();
 
   public static Intent createIntent() {
-    return new Intent(ApplicationDependencies.getApplication(), SvrMigrationActivity.class);
+    return new Intent(AppDependencies.getApplication(), SvrMigrationActivity.class);
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionCapabilities.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionCapabilities.java
index 2d0e7e6001..99c9df98fd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionCapabilities.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionCapabilities.java
@@ -34,10 +34,12 @@ public final class LogSectionCapabilities implements LogSection {
     RecipientRecord.Capabilities   globalCapabilities = SignalDatabase.recipients().getCapabilities(self.getId());
 
     StringBuilder builder = new StringBuilder().append("-- Local").append("\n")
+                                               .append("DeleteSync: ").append(localCapabilities.getDeleteSync()).append("\n")
                                                .append("\n")
                                                .append("-- Global").append("\n");
 
     if (globalCapabilities != null) {
+      builder.append("DeleteSync: ").append(globalCapabilities.getDeleteSync()).append("\n");
       builder.append("\n");
     } else {
       builder.append("Self not found!");
diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionConstraints.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionConstraints.java
index 1f8ae12dc3..699dc69178 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionConstraints.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionConstraints.java
@@ -6,7 +6,7 @@
 
 import com.annimon.stream.Stream;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Constraint;
 import org.thoughtcrime.securesms.jobs.JobManagerFactories;
 import org.thoughtcrime.securesms.util.Util;
@@ -23,7 +23,7 @@ final class LogSectionConstraints implements LogSection {
   @Override
   public @NonNull CharSequence getContent(@NonNull Context context) {
     StringBuilder                   output    = new StringBuilder();
-    Map<String, Constraint.Factory> factories = JobManagerFactories.getConstraintFactories(ApplicationDependencies.getApplication());
+    Map<String, Constraint.Factory> factories = JobManagerFactories.getConstraintFactories(AppDependencies.getApplication());
     int                             keyLength = Stream.of(factories.keySet()).map(String::length).max(Integer::compareTo).orElse(0);
 
     for (Map.Entry<String, Constraint.Factory> entry : factories.entrySet()) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionExoPlayerPool.kt b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionExoPlayerPool.kt
index a6a4f953b2..1920f7b5b7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionExoPlayerPool.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionExoPlayerPool.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.logsubmit
 
 import android.content.Context
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.video.exo.ExoPlayerPool
 
 /**
@@ -11,7 +11,7 @@ class LogSectionExoPlayerPool : LogSection {
   override fun getTitle(): String = "EXOPLAYER POOL"
 
   override fun getContent(context: Context): CharSequence {
-    val poolStats = ApplicationDependencies.getExoPlayerPool().getPoolStats()
+    val poolStats = AppDependencies.exoPlayerPool.getPoolStats()
     val owners: Map<String, List<ExoPlayerPool.OwnershipInfo>> = poolStats.owners.groupBy { it.tag }
     val output = StringBuilder()
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionJobs.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionJobs.java
index 0a36ffaa1d..fd2052be18 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionJobs.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionJobs.java
@@ -4,7 +4,7 @@
 
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 
 public class LogSectionJobs implements LogSection {
 
@@ -15,6 +15,6 @@ public class LogSectionJobs implements LogSection {
 
   @Override
   public @NonNull CharSequence getContent(@NonNull Context context) {
-    return ApplicationDependencies.getJobManager().getDebugInfo();
+    return AppDependencies.getJobManager().getDebugInfo();
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionLocalMetrics.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionLocalMetrics.java
index f96c9b034f..02f399bff7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionLocalMetrics.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionLocalMetrics.java
@@ -7,7 +7,7 @@
 import org.thoughtcrime.securesms.database.LocalMetricsDatabase;
 import org.thoughtcrime.securesms.database.LocalMetricsDatabase.EventMetrics;
 import org.thoughtcrime.securesms.database.LocalMetricsDatabase.SplitMetrics;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 
 import java.util.List;
 
@@ -19,7 +19,7 @@ final class LogSectionLocalMetrics implements LogSection {
 
   @Override
   public @NonNull CharSequence getContent(@NonNull Context context) {
-    List<EventMetrics> metrics = LocalMetricsDatabase.getInstance(ApplicationDependencies.getApplication()).getMetrics();
+    List<EventMetrics> metrics = LocalMetricsDatabase.getInstance(AppDependencies.getApplication()).getMetrics();
 
     StringBuilder builder = new StringBuilder();
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionNotificationProfiles.kt b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionNotificationProfiles.kt
index 4175069b4b..8bb26589bc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionNotificationProfiles.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionNotificationProfiles.kt
@@ -13,9 +13,9 @@ class LogSectionNotificationProfiles : LogSection {
 
     val output = StringBuilder()
 
-    output.append("Manually enabled profile: ${SignalStore.notificationProfileValues().manuallyEnabledProfile}\n")
-    output.append("Manually enabled until  : ${SignalStore.notificationProfileValues().manuallyEnabledUntil}\n")
-    output.append("Manually disabled at    : ${SignalStore.notificationProfileValues().manuallyDisabledAt}\n")
+    output.append("Manually enabled profile: ${SignalStore.notificationProfile.manuallyEnabledProfile}\n")
+    output.append("Manually enabled until  : ${SignalStore.notificationProfile.manuallyEnabledUntil}\n")
+    output.append("Manually disabled at    : ${SignalStore.notificationProfile.manuallyDisabledAt}\n")
     output.append("Now                     : ${System.currentTimeMillis()}\n\n")
 
     output.append("Profiles:\n")
diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionNotifications.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionNotifications.java
index cae3f3678b..f46d4d62ab 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionNotifications.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionNotifications.java
@@ -9,6 +9,7 @@
 import androidx.annotation.RequiresApi;
 
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.notifications.SlowNotificationHeuristics;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 
 final class LogSectionNotifications implements LogSection {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionPin.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionPin.java
index a45da288b5..2949ee3fb3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionPin.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionPin.java
@@ -15,15 +15,15 @@ public class LogSectionPin implements LogSection {
 
   @Override
   public @NonNull CharSequence getContent(@NonNull Context context) {
-    return new StringBuilder().append("Last Successful Reminder Entry: ").append(SignalStore.pinValues().getLastSuccessfulEntryTime()).append("\n")
-                              .append("Next Reminder Interval: ").append(SignalStore.pinValues().getCurrentInterval()).append("\n")
+    return new StringBuilder().append("Last Successful Reminder Entry: ").append(SignalStore.pin().getLastSuccessfulEntryTime()).append("\n")
+                              .append("Next Reminder Interval: ").append(SignalStore.pin().getCurrentInterval()).append("\n")
                               .append("Reglock: ").append(SignalStore.svr().isRegistrationLockEnabled()).append("\n")
                               .append("Signal PIN: ").append(SignalStore.svr().hasPin()).append("\n")
                               .append("Opted Out: ").append(SignalStore.svr().hasOptedOut()).append("\n")
                               .append("Last Creation Failed: ").append(SignalStore.svr().lastPinCreateFailed()).append("\n")
                               .append("Needs Account Restore: ").append(SignalStore.storageService().needsAccountRestore()).append("\n")
-                              .append("PIN Required at Registration: ").append(SignalStore.registrationValues().pinWasRequiredAtRegistration()).append("\n")
-                              .append("Registration Complete: ").append(SignalStore.registrationValues().isRegistrationComplete());
+                              .append("PIN Required at Registration: ").append(SignalStore.registration().pinWasRequiredAtRegistration()).append("\n")
+                              .append("Registration Complete: ").append(SignalStore.registration().isRegistrationComplete());
 
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionFeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteConfig.java
similarity index 64%
rename from app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionFeatureFlags.java
rename to app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteConfig.java
index e1784a252a..220377ea9a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionFeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteConfig.java
@@ -6,29 +6,27 @@
 
 import com.annimon.stream.Stream;
 
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.Util;
 
 import java.util.Map;
 
-public class LogSectionFeatureFlags implements LogSection {
+public class LogSectionRemoteConfig implements LogSection {
 
   @Override
   public @NonNull String getTitle() {
-    return "FEATURE FLAGS";
+    return "REMOTE CONFIG";
   }
 
   @Override
   public @NonNull CharSequence getContent(@NonNull Context context) {
     StringBuilder       out           = new StringBuilder();
-    Map<String, Object> memory        = FeatureFlags.getMemoryValues();
-    Map<String, Object> disk          = FeatureFlags.getDiskValues();
-    Map<String, Object> pending       = FeatureFlags.getPendingDiskValues();
-    Map<String, Object> forced        = FeatureFlags.getForcedValues();
+    Map<String, Object> memory        = RemoteConfig.getDebugMemoryValues();
+    Map<String, Object> disk          = RemoteConfig.getDebugDiskValues();
+    Map<String, Object> pending       = RemoteConfig.getDebugPendingDiskValues();
     int                 remoteLength  = Stream.of(memory.keySet()).map(String::length).max(Integer::compareTo).orElse(0);
     int                 diskLength    = Stream.of(disk.keySet()).map(String::length).max(Integer::compareTo).orElse(0);
     int                 pendingLength = Stream.of(pending.keySet()).map(String::length).max(Integer::compareTo).orElse(0);
-    int                 forcedLength  = Stream.of(forced.keySet()).map(String::length).max(Integer::compareTo).orElse(0);
 
     out.append("-- Memory\n");
     for (Map.Entry<String, Object> entry : memory.entrySet()) {
@@ -48,15 +46,6 @@ public class LogSectionFeatureFlags implements LogSection {
     }
     out.append("\n");
 
-    out.append("-- Forced\n");
-    if (forced.isEmpty()) {
-      out.append("None\n");
-    } else {
-      for (Map.Entry<String, Object> entry : forced.entrySet()) {
-        out.append(Util.rightPad(entry.getKey(), forcedLength)).append(": ").append(entry.getValue()).append("\n");
-      }
-    }
-
     return out;
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java
index d90cb0c93c..69e00e9cca 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java
@@ -16,10 +16,11 @@
 
 import org.signal.core.util.FontUtil;
 import org.thoughtcrime.securesms.BuildConfig;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.emoji.EmojiFiles;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.net.StandardUserAgentInterceptor;
+import org.thoughtcrime.securesms.notifications.SlowNotificationHeuristics;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.service.webrtc.AndroidTelecomUtil;
@@ -28,6 +29,7 @@
 import org.thoughtcrime.securesms.util.ContextUtil;
 import org.thoughtcrime.securesms.util.DeviceProperties;
 import org.thoughtcrime.securesms.util.NetworkUtil;
+import org.thoughtcrime.securesms.util.PowerManagerCompat;
 import org.thoughtcrime.securesms.util.ScreenDensity;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -72,15 +74,13 @@ public class LogSectionSystemInfo implements LogSection {
     builder.append("Memclass          : ").append(getMemoryClass(context)).append("\n");
     builder.append("MemInfo           : ").append(getMemoryInfo(context)).append("\n");
     builder.append("OS Host           : ").append(Build.HOST).append("\n");
-    builder.append("RecipientId       : ").append(locked ? "Unknown" : SignalStore.registrationValues().isRegistrationComplete() ? Recipient.self().getId() : "N/A").append("\n");
+    builder.append("RecipientId       : ").append(locked ? "Unknown" : SignalStore.registration().isRegistrationComplete() ? Recipient.self().getId() : "N/A").append("\n");
     builder.append("ACI               : ").append(locked ? "Unknown" : getCensoredAci(context)).append("\n");
     builder.append("Device ID         : ").append(locked ? "Unknown" : SignalStore.account().getDeviceId()).append("\n");
-    builder.append("Censored          : ").append(locked ? "Unknown" : ApplicationDependencies.getSignalServiceNetworkAccess().isCensored()).append("\n");
+    builder.append("Censored          : ").append(locked ? "Unknown" : AppDependencies.getSignalServiceNetworkAccess().isCensored()).append("\n");
     builder.append("Network Status    : ").append(NetworkUtil.getNetworkStatus(context)).append("\n");
-    builder.append("Data Saver        : ").append(DeviceProperties.getDataSaverState(context)).append("\n");
     builder.append("Play Services     : ").append(getPlayServicesString(context)).append("\n");
     builder.append("FCM               : ").append(locked ? "Unknown" : SignalStore.account().isFcmEnabled()).append("\n");
-    builder.append("BkgRestricted     : ").append(Build.VERSION.SDK_INT >= 28 ? DeviceProperties.isBackgroundRestricted(context) : "N/A").append("\n");
     builder.append("Locale            : ").append(Locale.getDefault()).append("\n");
     builder.append("Linked Devices    : ").append(locked ? "Unknown" : TextSecurePreferences.isMultiDevice(context)).append("\n");
     builder.append("First Version     : ").append(TextSecurePreferences.getFirstInstallVersion(context)).append("\n");
@@ -92,7 +92,11 @@ public class LogSectionSystemInfo implements LogSection {
     builder.append("Server Time Offset: ").append(locked ? "Unknown" : getLastKnownServerTimeOffset()).append("\n");
     builder.append("Telecom           : ").append(locked ? "Unknown" : AndroidTelecomUtil.getTelecomSupported()).append("\n");
     builder.append("User-Agent        : ").append(StandardUserAgentInterceptor.USER_AGENT).append("\n");
-    builder.append("APNG Animation    : ").append(locked ? "Unknown" : DeviceProperties.shouldAllowApngStickerAnimation(context)).append("\n");
+    builder.append("SlowNotifications : ").append(locked ? "Unknown" : SlowNotificationHeuristics.isHavingDelayedNotifications()).append("\n");
+    builder.append("IgnoringBatteryOpt: ").append(PowerManagerCompat.isIgnoringBatteryOptimizations(context)).append("\n");
+    builder.append("BkgRestricted     : ").append(Build.VERSION.SDK_INT >= 28 ? DeviceProperties.isBackgroundRestricted(context) : "N/A").append("\n");
+    builder.append("Data Saver        : ").append(DeviceProperties.getDataSaverState(context)).append("\n");
+    builder.append("APNG Animation    : ").append(DeviceProperties.shouldAllowApngStickerAnimation(context)).append("\n");
     if (BuildConfig.MANAGES_MOLLY_UPDATES) {
       builder.append("Update Check URL  : ").append(BuildConfig.FDROID_UPDATE_URL).append("\n");
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionThreadDump.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionThreadDump.java
index b4137e417f..eee74fabd6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionThreadDump.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionThreadDump.java
@@ -4,8 +4,7 @@
 
 import androidx.annotation.NonNull;
 
-import org.signal.core.util.concurrent.DeadlockDetector;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -23,8 +22,8 @@ public class LogSectionThreadDump implements LogSection {
 
   @Override
   public @NonNull CharSequence getContent(@NonNull Context context) {
-    Map<Thread, StackTraceElement[]> traces = ApplicationDependencies.getDeadlockDetector().getLastThreadDump();
-    long                             time   = ApplicationDependencies.getDeadlockDetector().getLastThreadDumpTime();
+    Map<Thread, StackTraceElement[]> traces = AppDependencies.getDeadlockDetector().getLastThreadDump();
+    long                             time   = AppDependencies.getDeadlockDetector().getLastThreadDumpTime();
 
     if (traces == null) {
       return "None";
diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionTrace.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionTrace.java
deleted file mode 100644
index a37f207118..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionTrace.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.thoughtcrime.securesms.logsubmit;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-
-public class LogSectionTrace implements LogSection {
-
-  @Override
-  public @NonNull String getTitle() {
-    return "TRACE";
-  }
-
-  @Override
-  public @NonNull CharSequence getContent(@NonNull Context context) {
-    return LogStyleParser.TRACE_PLACEHOLDER;
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogRepository.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogRepository.java
index 5497818b97..f0d2cedb5b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogRepository.java
@@ -20,12 +20,12 @@
 import org.signal.core.util.logging.Scrubber;
 import org.signal.core.util.tracing.Tracer;
 import org.thoughtcrime.securesms.database.LogDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.net.Networking;
 import org.thoughtcrime.securesms.net.StandardUserAgentInterceptor;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.service.KeyCachingService;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.signal.core.util.Stopwatch;
 
 import java.io.IOException;
@@ -78,7 +78,7 @@ public class SubmitDebugLogRepository {
     add(new LogSectionCapabilities());
     add(new LogSectionMemory());
     add(new LogSectionLocalMetrics());
-    add(new LogSectionFeatureFlags());
+    add(new LogSectionRemoteConfig());
     add(new LogSectionPin());
     if (Build.VERSION.SDK_INT >= 28) {
       add(new LogSectionPower());
@@ -89,10 +89,9 @@ public class SubmitDebugLogRepository {
     add(new LogSectionKeyPreferences());
     add(new LogSectionStories());
     add(new LogSectionPermissions());
-    add(new LogSectionTrace());
     add(new LogSectionThreads());
     add(new LogSectionThreadDump());
-    if (FeatureFlags.internalUser()) {
+    if (RemoteConfig.internalUser()) {
       add(new LogSectionSenderKey());
     }
     add(new LogSectionDatabaseSchema());
@@ -106,7 +105,7 @@ public class SubmitDebugLogRepository {
   private final ExecutorService executor;
 
   public SubmitDebugLogRepository() {
-    this.context  = ApplicationDependencies.getApplication();
+    this.context  = AppDependencies.getApplication();
     this.executor = SignalExecutors.SERIAL;
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogViewModel.java
index 7d95c86185..ace573fc27 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogViewModel.java
@@ -21,7 +21,7 @@
 import org.signal.paging.PagingController;
 import org.signal.paging.ProxyPagingController;
 import org.thoughtcrime.securesms.database.LogDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.util.SingleLiveEvent;
 
 import java.util.ArrayList;
@@ -59,9 +59,9 @@ private SubmitDebugLogViewModel() {
 
       try {
         Log.blockUntilAllWritesFinished();
-        LogDatabase.getInstance(ApplicationDependencies.getApplication()).logs().trimToSize();
+        LogDatabase.getInstance(AppDependencies.getApplication()).logs().trimToSize();
 
-        dataSource = new LogDataSource(ApplicationDependencies.getApplication(), staticLines, firstViewTime);
+        dataSource = new LogDataSource(AppDependencies.getApplication(), staticLines, firstViewTime);
       } catch (IllegalStateException e) {
         dataSource = new PagedDataSource<Long, LogLine>() {
           @Override
@@ -85,7 +85,6 @@ public int size() {
           }
         };
       }
-
       PagingConfig  config     = new PagingConfig.Builder().setPageSize(100)
                                                            .setBufferPages(3)
                                                            .setStartIndex(0)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java
index 25c790f425..44d800e51d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java
@@ -9,7 +9,7 @@
 import androidx.lifecycle.ViewModelProvider;
 
 import org.thoughtcrime.securesms.database.DatabaseObserver;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 
 import java.util.Optional;
 
@@ -25,7 +25,7 @@ private LongMessageViewModel(@NonNull Application application, @NonNull LongMess
 
     repository.getMessage(application, messageId, longMessage -> {
       if (longMessage.isPresent()) {
-        ApplicationDependencies.getDatabaseObserver().registerConversationObserver(longMessage.get().getMessageRecord().getThreadId(), threadObserver);
+        AppDependencies.getDatabaseObserver().registerConversationObserver(longMessage.get().getMessageRecord().getThreadId(), threadObserver);
       }
 
       message.postValue(longMessage);
@@ -38,7 +38,7 @@ LiveData<Optional<LongMessage>> getMessage() {
 
   @Override
   protected void onCleared() {
-    ApplicationDependencies.getDatabaseObserver().unregisterObserver(threadObserver);
+    AppDependencies.getDatabaseObserver().unregisterObserver(threadObserver);
   }
 
   static class Factory extends ViewModelProvider.NewInstanceFactory {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
index 8e4d2dba85..204997f340 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
@@ -31,7 +31,7 @@ import org.thoughtcrime.securesms.components.TooltipPopup
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
 import org.thoughtcrime.securesms.components.settings.app.notifications.manual.NotificationProfileSelectionFragment
 import org.thoughtcrime.securesms.conversationlist.ConversationListFragment
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.net.Networking
 import org.thoughtcrime.securesms.notifications.profiles.NotificationProfile
@@ -287,7 +287,7 @@ class MainActivityListHostFragment : Fragment(R.layout.main_activity_list_host_f
   }
 
   override fun updateProxyStatus(state: WebSocketConnectionState) {
-    if (ApplicationDependencies.getNetworkManager().isProxyEnabled) {
+    if (AppDependencies.networkManager.isProxyEnabled) {
       proxyStatus.visibility = View.VISIBLE
       when (state) {
         WebSocketConnectionState.CONNECTING, WebSocketConnectionState.DISCONNECTING, WebSocketConnectionState.DISCONNECTED -> proxyStatus.setImageResource(R.drawable.ic_proxy_connecting_24)
@@ -308,13 +308,13 @@ class MainActivityListHostFragment : Fragment(R.layout.main_activity_list_host_f
   override fun updateNotificationProfileStatus(notificationProfiles: List<NotificationProfile>) {
     val activeProfile = NotificationProfiles.getActiveProfile(notificationProfiles)
     if (activeProfile != null) {
-      if (activeProfile.id != SignalStore.notificationProfileValues().lastProfilePopup) {
+      if (activeProfile.id != SignalStore.notificationProfile.lastProfilePopup) {
         view?.postDelayed({
           try {
             var fragmentView = view as? ViewGroup ?: return@postDelayed
 
-            SignalStore.notificationProfileValues().lastProfilePopup = activeProfile.id
-            SignalStore.notificationProfileValues().lastProfilePopupTime = System.currentTimeMillis()
+            SignalStore.notificationProfile.lastProfilePopup = activeProfile.id
+            SignalStore.notificationProfile.lastProfilePopupTime = System.currentTimeMillis()
 
             if (previousTopToastPopup?.isShowing == true) {
               previousTopToastPopup?.dismiss()
@@ -336,14 +336,14 @@ class MainActivityListHostFragment : Fragment(R.layout.main_activity_list_host_f
       notificationProfileStatus.visibility = View.GONE
     }
 
-    if (!SignalStore.notificationProfileValues().hasSeenTooltip && Util.hasItems(notificationProfiles)) {
+    if (!SignalStore.notificationProfile.hasSeenTooltip && Util.hasItems(notificationProfiles)) {
       val target: View? = findOverflowMenuButton(_toolbar)
       if (target != null) {
         TooltipPopup.forTarget(target)
           .setText(R.string.ConversationListFragment__turn_your_notification_profile_on_or_off_here)
           .setBackgroundTint(ContextCompat.getColor(requireContext(), R.color.signal_button_primary))
           .setTextColor(ContextCompat.getColor(requireContext(), R.color.signal_button_primary_text))
-          .setOnDismissListener { SignalStore.notificationProfileValues().hasSeenTooltip = true }
+          .setOnDismissListener { SignalStore.notificationProfile.hasSeenTooltip = true }
           .show(TooltipPopup.POSITION_BELOW)
       } else {
         Log.w(TAG, "Unable to find overflow menu to show Notification Profile tooltip")
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaActions.java b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaActions.java
index b24d95dcb2..9500fa43fc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaActions.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaActions.java
@@ -13,15 +13,22 @@
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.MediaTable;
+import org.thoughtcrime.securesms.database.model.MessageRecord;
+import org.thoughtcrime.securesms.jobs.MultiDeviceDeleteSyncJob;
 import org.thoughtcrime.securesms.permissions.Permissions;
+import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.AttachmentUtil;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask;
 import org.thoughtcrime.securesms.util.StorageUtil;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
 
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 final class MediaActions {
 
@@ -53,12 +60,8 @@ static void handleDeleteMedia(@NonNull Context context,
   {
     int       recordCount    = mediaRecords.size();
     Resources res            = context.getResources();
-    String    confirmTitle   = res.getQuantityString(R.plurals.MediaOverviewActivity_Media_delete_confirm_title,
-                                                     recordCount,
-                                                     recordCount);
-    String    confirmMessage = res.getQuantityString(R.plurals.MediaOverviewActivity_Media_delete_confirm_message,
-                                                     recordCount,
-                                                     recordCount);
+    String    confirmTitle   = res.getQuantityString(R.plurals.MediaOverviewActivity_Media_delete_confirm_title, recordCount, recordCount);
+    String    confirmMessage = res.getQuantityString(R.plurals.MediaOverviewActivity_Media_delete_confirm_message, recordCount, recordCount);
 
     MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context).setTitle(confirmTitle)
                                                                                 .setMessage(confirmMessage)
@@ -75,9 +78,18 @@ protected Void doInBackground(MediaTable.MediaRecord... records) {
             return null;
           }
 
+          Set<MessageRecord> deletedMessageRecords = new HashSet<>(records.length);
           for (MediaTable.MediaRecord record : records) {
-            AttachmentUtil.deleteAttachment(context, record.getAttachment());
+            MessageRecord deleted = AttachmentUtil.deleteAttachment(record.getAttachment());
+            if (deleted != null) {
+              deletedMessageRecords.add(deleted);
+            }
           }
+
+          if (Recipient.self().getDeleteSyncCapability().isSupported() && Util.hasItems(deletedMessageRecords)) {
+            MultiDeviceDeleteSyncJob.enqueueMessageDeletes(deletedMessageRecords);
+          }
+
           return null;
         }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java
index 1dec181fba..d75b722d79 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java
@@ -30,9 +30,11 @@
 import com.codewaves.stickyheadergrid.StickyHeaderGridLayoutManager;
 
 import org.signal.core.util.DimensionUnit;
+import org.signal.core.util.concurrent.LifecycleDisposable;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
+import org.thoughtcrime.securesms.components.DeleteSyncEducationDialog;
 import org.thoughtcrime.securesms.components.menu.ActionItem;
 import org.thoughtcrime.securesms.components.menu.SignalBottomActionBar;
 import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaController;
@@ -63,9 +65,9 @@ public final class MediaOverviewPageFragment extends Fragment
   private static final String MEDIA_TYPE_EXTRA = "media_type";
   private static final String GRID_MODE        = "grid_mode";
 
-  private final ActionModeCallback    actionModeCallback = new ActionModeCallback();
-  private       MediaTable.Sorting    sorting            = MediaTable.Sorting.Newest;
-  private       MediaLoader.MediaType mediaType          = MediaLoader.MediaType.GALLERY;
+  private final ActionModeCallback            actionModeCallback = new ActionModeCallback();
+  private       MediaTable.Sorting            sorting            = MediaTable.Sorting.Newest;
+  private       MediaLoader.MediaType         mediaType          = MediaLoader.MediaType.GALLERY;
   private       long                          threadId;
   private       TextView                      noMedia;
   private       RecyclerView                  recyclerView;
@@ -76,6 +78,7 @@ public final class MediaOverviewPageFragment extends Fragment
   private       GridMode                      gridMode;
   private       VoiceNoteMediaController      voiceNoteMediaController;
   private       SignalBottomActionBar         bottomActionBar;
+  private       LifecycleDisposable           lifecycleDisposable;
 
   public static @NonNull Fragment newInstance(long threadId,
                                               @NonNull MediaLoader.MediaType mediaType,
@@ -115,6 +118,9 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
   @Override
   public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    lifecycleDisposable = new LifecycleDisposable();
+    lifecycleDisposable.bindTo(getViewLifecycleOwner());
+
     Context context = requireContext();
     View    view    = inflater.inflate(R.layout.media_overview_page_fragment, container, false);
     int     spans   = getResources().getInteger(R.integer.media_overview_cols);
@@ -297,6 +303,19 @@ public void onMediaLongClicked(MediaTable.MediaRecord mediaRecord) {
     handleMediaMultiSelectClick(mediaRecord);
   }
 
+  private void handleDeleteSelectedMedia() {
+    if (DeleteSyncEducationDialog.shouldShow()) {
+      lifecycleDisposable.add(
+          DeleteSyncEducationDialog.show(getChildFragmentManager())
+                                   .subscribe(this::handleDeleteSelectedMedia)
+      );
+      return;
+    }
+
+    MediaActions.handleDeleteMedia(requireContext(), getListAdapter().getSelectedMedia());
+    exitMultiSelect();
+  }
+
   private void handleSelectAllMedia() {
     getListAdapter().selectAllMedia();
     updateMultiSelect();
@@ -344,10 +363,7 @@ private void updateMultiSelect() {
                                          this::exitMultiSelect);
           }),
           new ActionItem(R.drawable.symbol_check_circle_24, getString(R.string.MediaOverviewActivity_select_all), this::handleSelectAllMedia),
-          new ActionItem(R.drawable.symbol_trash_24, getResources().getQuantityString(R.plurals.MediaOverviewActivity_delete_plural, selectionCount), () -> {
-            MediaActions.handleDeleteMedia(requireContext(), getListAdapter().getSelectedMedia());
-            exitMultiSelect();
-          })
+          new ActionItem(R.drawable.symbol_trash_24, getResources().getQuantityString(R.plurals.MediaOverviewActivity_delete_plural, selectionCount), this::handleDeleteSelectedMedia)
       ));
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewPlayerControlView.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewPlayerControlView.kt
index 87d12d526a..5fbb999b87 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewPlayerControlView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewPlayerControlView.kt
@@ -45,7 +45,8 @@ class MediaPreviewPlayerControlView @JvmOverloads constructor(
   private val forwardButton: ImageButton = findViewById(R.id.exo_forward)
 
   enum class MediaMode {
-    IMAGE, VIDEO;
+    IMAGE,
+    VIDEO;
 
     companion object {
       @JvmStatic
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewRepository.kt
index feb9741bdd..91a0b7a81e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewRepository.kt
@@ -21,7 +21,9 @@ import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.SignalDatabase.Companion.media
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
+import org.thoughtcrime.securesms.jobs.MultiDeviceDeleteSyncJob
 import org.thoughtcrime.securesms.longmessage.resolveBody
+import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.sms.MessageSender
 import org.thoughtcrime.securesms.util.AttachmentUtil
@@ -80,9 +82,12 @@ class MediaPreviewRepository {
     }.subscribeOn(Schedulers.io()).toFlowable()
   }
 
-  fun localDelete(context: Context, attachment: DatabaseAttachment): Completable {
+  fun localDelete(attachment: DatabaseAttachment): Completable {
     return Completable.fromRunnable {
-      AttachmentUtil.deleteAttachment(context.applicationContext, attachment)
+      val deletedMessageRecord = AttachmentUtil.deleteAttachment(attachment)
+      if (deletedMessageRecord != null && Recipient.self().deleteSyncCapability.isSupported) {
+        MultiDeviceDeleteSyncJob.enqueueMessageDeletes(setOf(deletedMessageRecord))
+      }
     }.subscribeOn(Schedulers.io())
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Adapter.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Adapter.kt
index 5ad24e4c72..27969cdc23 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Adapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Adapter.kt
@@ -28,7 +28,7 @@ class MediaPreviewV2Adapter(fragment: Fragment) : FragmentStateAdapter(fragment)
 
     val contentType = attachment.contentType
     val args = bundleOf(
-      MediaPreviewFragment.DATA_URI to attachment.uri,
+      MediaPreviewFragment.DATA_URI to attachment.displayUri,
       MediaPreviewFragment.DATA_CONTENT_TYPE to contentType,
       MediaPreviewFragment.DATA_SIZE to attachment.size,
       MediaPreviewFragment.AUTO_PLAY to attachment.videoGif,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
index 7399c9d8b2..534a9bf2d9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
@@ -40,10 +40,12 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.kotlin.subscribeBy
 import org.signal.core.util.concurrent.LifecycleDisposable
 import org.signal.core.util.concurrent.SignalExecutors
+import org.signal.core.util.concurrent.addTo
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment
+import org.thoughtcrime.securesms.components.DeleteSyncEducationDialog
 import org.thoughtcrime.securesms.components.ViewBinderDelegate
 import org.thoughtcrime.securesms.components.mention.MentionAnnotation
 import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragment
@@ -52,7 +54,7 @@ import org.thoughtcrime.securesms.database.DatabaseObserver
 import org.thoughtcrime.securesms.database.MediaTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.databinding.FragmentMediaPreviewV2Binding
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.mediapreview.caption.ExpandingCaptionView
 import org.thoughtcrime.securesms.mediapreview.mediarail.CenterDecoration
 import org.thoughtcrime.securesms.mediapreview.mediarail.MediaRailAdapter
@@ -150,7 +152,7 @@ class MediaPreviewV2Fragment : LoggingFragment(R.layout.fragment_media_preview_v
     val threadId = args.threadId
     viewModel.fetchAttachments(requireContext(), startingAttachmentId, threadId, sorting)
     val dbObserver = DatabaseObserver.Observer { viewModel.fetchAttachments(requireContext(), startingAttachmentId, threadId, sorting, true) }
-    ApplicationDependencies.getDatabaseObserver().registerAttachmentObserver(dbObserver)
+    AppDependencies.databaseObserver.registerAttachmentObserver(dbObserver)
     this.dbChangeObserver = dbObserver
   }
 
@@ -509,7 +511,7 @@ class MediaPreviewV2Fragment : LoggingFragment(R.layout.fragment_media_preview_v
     super.onDestroy()
     val observer = dbChangeObserver
     if (observer != null) {
-      ApplicationDependencies.getDatabaseObserver().unregisterObserver(observer)
+      AppDependencies.databaseObserver.unregisterObserver(observer)
       dbChangeObserver = null
     }
   }
@@ -585,6 +587,15 @@ class MediaPreviewV2Fragment : LoggingFragment(R.layout.fragment_media_preview_v
   private fun deleteMedia(mediaItem: MediaTable.MediaRecord) {
     val attachment: DatabaseAttachment = mediaItem.attachment ?: return
 
+    if (DeleteSyncEducationDialog.shouldShow()) {
+      DeleteSyncEducationDialog
+        .show(childFragmentManager)
+        .subscribe { deleteMedia(mediaItem) }
+        .addTo(lifecycleDisposable)
+
+      return
+    }
+
     MaterialAlertDialogBuilder(requireContext()).apply {
       setIcon(R.drawable.symbol_error_triangle_fill_24)
       setTitle(R.string.MediaPreviewActivity_media_delete_confirmation_title)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2ViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2ViewModel.kt
index e41f7a08a8..347989efba 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2ViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2ViewModel.kt
@@ -93,7 +93,7 @@ class MediaPreviewV2ViewModel : ViewModel() {
   }
 
   fun localDelete(context: Context, attachment: DatabaseAttachment): Completable {
-    return repository.localDelete(context, attachment).subscribeOn(Schedulers.io())
+    return repository.localDelete(attachment).subscribeOn(Schedulers.io())
   }
 
   fun jumpToFragment(context: Context, messageId: Long): Single<Intent> {
@@ -131,6 +131,7 @@ fun MediaTable.MediaRecord.toMedia(): Media? {
     attachment.videoGif,
     Optional.empty(),
     Optional.ofNullable(attachment.caption),
+    Optional.empty(),
     Optional.empty()
   )
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java
index 09b1c610c5..a1b5f2b5ac 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java
@@ -101,6 +101,7 @@ public void onImageCaptured(@NonNull byte[] data, int width, int height) {
                               false,
                               Optional.of(Media.ALL_MEDIA_BUCKET_ID),
                               Optional.empty(),
+                              Optional.empty(),
                               Optional.empty()));
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
index 5c67fad673..5cf3a08aa5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
@@ -62,7 +62,7 @@
 import org.thoughtcrime.securesms.mms.MediaConstraints;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.util.BottomSheetUtil;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.MemoryFileDescriptor;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.ViewUtil;
@@ -166,7 +166,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     this.controlsContainer           = view.findViewById(R.id.camerax_controls_container);
     this.cameraXModePolicy           = CameraXModePolicy.acquire(requireContext(),
                                                         controller.getMediaConstraints(),
-                                                        requireArguments().getBoolean(IS_VIDEO_ENABLED, true));
+                                                        requireArguments().getBoolean(IS_VIDEO_ENABLED, true),
+                                                        requireArguments().getBoolean(IS_QR_SCAN_ENABLED, false));
     this.missingPermissionsContainer = view.findViewById(R.id.missing_permissions_container);
     this.missingPermissionsText      = view.findViewById(R.id.missing_permissions_text);
     this.allowAccessButton           = view.findViewById(R.id.allow_access_button);
@@ -177,7 +178,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
 
     previewView.setScaleType(PREVIEW_SCALE_TYPE);
-    if (FeatureFlags.customCameraXController()) {
+    if (RemoteConfig.customCameraXController()) {
       View focusIndicator = view.findViewById(R.id.camerax_focus_indicator);
       cameraController = new SignalCameraController(requireContext(), getViewLifecycleOwner(), previewView, focusIndicator);
     } else {
@@ -198,7 +199,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
     onOrientationChanged();
 
-    if (FeatureFlags.customCameraXController()) {
+    if (RemoteConfig.customCameraXController()) {
       cameraController.initializeAndBind(requireContext(), getViewLifecycleOwner());
     }
 
@@ -704,7 +705,7 @@ public CameraXOrientationListener(Context context) {
     @Override
     public void onOrientationChanged(int orientation) {
       if (cameraController != null) {
-        if (FeatureFlags.customCameraXController()) {
+        if (RemoteConfig.customCameraXController()) {
           cameraController.setImageRotation(orientation);
         }
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXVideoCaptureHelper.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXVideoCaptureHelper.java
index e6ce4d06b1..ab314d6f2d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXVideoCaptureHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXVideoCaptureHelper.java
@@ -30,7 +30,7 @@
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.util.ContextUtil;
 import org.thoughtcrime.securesms.util.Debouncer;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.MemoryFileDescriptor;
 import org.thoughtcrime.securesms.video.VideoUtil;
 
@@ -259,7 +259,7 @@ static MemoryFileDescriptor createFileDescriptor(@NonNull Context context) throw
   }
 
   public float getDefaultVideoZoomRatio() {
-    if (FeatureFlags.startVideoRecordAt1x()) {
+    if (RemoteConfig.startVideoRecordAt1x()) {
       return 1f;
     } else {
       return Objects.requireNonNull(cameraController.getZoomState().getValue()).getMinZoomRatio();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/ImageEditorModelRenderMediaTransform.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/ImageEditorModelRenderMediaTransform.java
index 9504a755f4..69b8f0047f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/ImageEditorModelRenderMediaTransform.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/ImageEditorModelRenderMediaTransform.java
@@ -50,7 +50,7 @@ public ImageEditorModelRenderMediaTransform(@NonNull EditorModel modelToRender,
                             .withMimeType(MediaUtil.IMAGE_JPEG)
                             .createForSingleSessionOnDisk(context);
 
-      return new Media(uri, MediaUtil.IMAGE_JPEG, media.getDate(), bitmap.getWidth(), bitmap.getHeight(), outputStream.size(), 0, false, false, media.getBucketId(), media.getCaption(), Optional.empty());
+      return new Media(uri, MediaUtil.IMAGE_JPEG, media.getDate(), bitmap.getWidth(), bitmap.getHeight(), outputStream.size(), 0, false, false, media.getBucketId(), media.getCaption(), Optional.empty(), Optional.empty());
     } catch (IOException e) {
       Log.w(TAG, "Failed to render image. Using base image.");
       return media;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Media.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Media.java
index e4899cdc4b..e08a6a07e1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Media.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Media.java
@@ -31,9 +31,10 @@ public class Media implements Parcelable {
   private final boolean borderless;
   private final boolean videoGif;
 
-  private Optional<String>                                 bucketId;
+  private Optional<String>                              bucketId;
   private Optional<String>                              caption;
   private Optional<AttachmentTable.TransformProperties> transformProperties;
+  private Optional<String>                              fileName;
 
   public Media(@NonNull Uri uri,
                @NonNull String mimeType,
@@ -46,7 +47,8 @@ public Media(@NonNull Uri uri,
                boolean videoGif,
                Optional<String> bucketId,
                Optional<String> caption,
-               Optional<AttachmentTable.TransformProperties> transformProperties)
+               Optional<AttachmentTable.TransformProperties> transformProperties,
+               Optional<String> fileName)
   {
     this.uri                 = uri;
     this.mimeType            = mimeType;
@@ -60,6 +62,7 @@ public Media(@NonNull Uri uri,
     this.bucketId            = bucketId;
     this.caption             = caption;
     this.transformProperties = transformProperties;
+    this.fileName            = fileName;
   }
 
   protected Media(Parcel in) {
@@ -80,6 +83,7 @@ protected Media(Parcel in) {
     } catch (IOException e) {
       throw new AssertionError(e);
     }
+    fileName   = Optional.ofNullable(in.readString());
   }
 
   public Uri getUri() {
@@ -130,6 +134,14 @@ public void setCaption(String caption) {
     this.caption = Optional.ofNullable(caption);
   }
 
+  public Optional<String> getFileName() {
+    return fileName;
+  }
+
+  public void setFileName(String name) {
+    this.fileName = Optional.ofNullable(name);
+  }
+
   public Optional<AttachmentTable.TransformProperties> getTransformProperties() {
     return transformProperties;
   }
@@ -153,6 +165,7 @@ public void writeToParcel(Parcel dest, int flags) {
     dest.writeString(bucketId.orElse(null));
     dest.writeString(caption.orElse(null));
     dest.writeString(transformProperties.map(JsonUtil::toJson).orElse(null));
+    dest.writeString(fileName.orElse(null));
   }
 
   public static final Creator<Media> CREATOR = new Creator<Media>() {
@@ -194,7 +207,8 @@ public int hashCode() {
                      media.isVideoGif(),
                      media.getBucketId(),
                      media.getCaption(),
-                     media.getTransformProperties());
+                     media.getTransformProperties(),
+                     media.getFileName());
   }
 
   public static @NonNull Media stripTransform(@NonNull Media media) {
@@ -211,6 +225,7 @@ public int hashCode() {
                      media.isVideoGif(),
                      media.getBucketId(),
                      media.getCaption(),
-                     Optional.empty());
+                     Optional.empty(),
+                     media.getFileName());
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java
index 7c3ef97284..0a750a8003 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java
@@ -21,7 +21,7 @@
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.signal.core.util.SqlUtil;
@@ -74,7 +74,7 @@ public Single<List<Media>> getRecentMedia() {
                      return Collections.emptyList();
                    }
 
-                   return getMediaInBucket(ApplicationDependencies.getApplication(), Media.ALL_MEDIA_BUCKET_ID);
+                   return getMediaInBucket(AppDependencies.getApplication(), Media.ALL_MEDIA_BUCKET_ID);
                  })
                  .onErrorReturn(t -> {
                    Log.w(TAG, "Unable to get recent media", t);
@@ -275,7 +275,7 @@ static void transformMedia(@NonNull Context context,
         long   size        = cursor.getLong(cursor.getColumnIndexOrThrow(Images.Media.SIZE));
         long   duration    = !isImage ? cursor.getInt(cursor.getColumnIndexOrThrow(Video.Media.DURATION)) : 0;
 
-        media.add(fixMimeType(context, new Media(uri, mimetype, date, width, height, size, duration, false, false, Optional.of(bucketId), Optional.empty(), Optional.empty())));
+        media.add(fixMimeType(context, new Media(uri, mimetype, date, width, height, size, duration, false, false, Optional.of(bucketId), Optional.empty(), Optional.empty(), Optional.empty())));
       }
     }
 
@@ -366,7 +366,7 @@ private Media getLocallyPopulatedMedia(@NonNull Context context, @NonNull Media
       height = dimens.second;
     }
 
-    return new Media(media.getUri(), media.getMimeType(), media.getDate(), width, height, size, 0, media.isBorderless(), media.isVideoGif(), media.getBucketId(), media.getCaption(), Optional.empty());
+    return new Media(media.getUri(), media.getMimeType(), media.getDate(), width, height, size, 0, media.isBorderless(), media.isVideoGif(), media.getBucketId(), media.getCaption(), Optional.empty(), Optional.empty());
   }
 
   private Media getContentResolverPopulatedMedia(@NonNull Context context, @NonNull Media media) throws IOException {
@@ -392,7 +392,7 @@ private Media getContentResolverPopulatedMedia(@NonNull Context context, @NonNul
       height = dimens.second;
     }
 
-    return new Media(media.getUri(), media.getMimeType(), media.getDate(), width, height, size, 0, media.isBorderless(), media.isVideoGif(), media.getBucketId(), media.getCaption(), Optional.empty());
+    return new Media(media.getUri(), media.getMimeType(), media.getDate(), width, height, size, 0, media.isBorderless(), media.isVideoGif(), media.getBucketId(), media.getCaption(), Optional.empty(), Optional.empty());
   }
 
   @VisibleForTesting
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendDocumentFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendDocumentFragment.kt
new file mode 100644
index 0000000000..53be9cd101
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendDocumentFragment.kt
@@ -0,0 +1,139 @@
+package org.thoughtcrime.securesms.mediasend
+
+import android.database.Cursor
+import android.net.Uri
+import android.os.Bundle
+import android.provider.OpenableColumns
+import android.view.View
+import android.widget.TextView
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import org.signal.core.util.getParcelableCompat
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.mms.PartAuthority
+import org.thoughtcrime.securesms.util.MediaUtil
+import org.thoughtcrime.securesms.util.Util
+import java.io.IOException
+import java.util.Optional
+
+/**
+ * Fragment to show full screen document attachments
+ */
+class MediaSendDocumentFragment : Fragment(R.layout.mediasend_document_fragment), MediaSendPageFragment {
+
+  companion object {
+    private val TAG = Log.tag(MediaSendDocumentFragment::class.java)
+
+    private const val KEY_MEDIA = "media"
+
+    fun newInstance(media: Media): MediaSendDocumentFragment {
+      val args = Bundle()
+      args.putParcelable(KEY_MEDIA, media)
+
+      val fragment = MediaSendDocumentFragment()
+      fragment.arguments = args
+      fragment.uri = media.uri
+      return fragment
+    }
+  }
+
+  private lateinit var uri: Uri
+  private lateinit var media: Media
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+
+    val name: TextView = view.findViewById(R.id.name)
+    val size: TextView = view.findViewById(R.id.size)
+    val extension: TextView = view.findViewById(R.id.extension)
+
+    this.media = requireNotNull(requireArguments().getParcelableCompat(KEY_MEDIA, Media::class.java))
+
+    val fileInfo: Pair<String?, Long>? = getFileInfo()
+    if (fileInfo != null) {
+      media.setFileName(fileInfo.first)
+      name.text = fileInfo.first ?: getString(R.string.DocumentView_unnamed_file)
+      size.text = Util.getPrettyFileSize(fileInfo.second)
+
+      val extensionText: String = MediaUtil.getFileType(requireContext(), Optional.ofNullable(fileInfo.first), media.uri).orElse("")
+      if (extensionText.length <= 3) {
+        extension.text = extensionText
+        extension.setTextAppearance(requireContext(), R.style.Signal_Text_BodySmall)
+      } else if (extensionText.length == 4) {
+        extension.text = extensionText
+        extension.setTextAppearance(requireContext(), R.style.Signal_Text_Caption)
+      }
+    } else {
+      Toast.makeText(requireContext(), R.string.ConversationActivity_sorry_there_was_an_error_setting_your_attachment, Toast.LENGTH_SHORT).show()
+      requireActivity().finishAfterTransition()
+    }
+  }
+
+  override fun getUri(): Uri {
+    return uri
+  }
+
+  override fun setUri(uri: Uri) {
+    this.uri = uri
+  }
+
+  override fun saveState(): Any = Unit
+
+  override fun restoreState(state: Any) = Unit
+
+  override fun notifyHidden() = Unit
+
+  private fun getFileInfo(): Pair<String?, Long>? {
+    val fileInfo: Pair<String?, Long>
+    try {
+      if (PartAuthority.isLocalUri(uri)) {
+        fileInfo = getManuallyCalculatedFileInfo(uri)
+      } else {
+        val result = getContentResolverFileInfo(uri)
+        fileInfo = if ((result == null)) getManuallyCalculatedFileInfo(uri) else result
+      }
+    } catch (e: IOException) {
+      Log.w(TAG, e)
+      return null
+    }
+
+    return fileInfo
+  }
+
+  @Throws(IOException::class)
+  private fun getManuallyCalculatedFileInfo(uri: Uri): Pair<String?, Long> {
+    var fileName: String? = null
+    var fileSize: Long? = null
+
+    if (PartAuthority.isLocalUri(uri)) {
+      fileSize = PartAuthority.getAttachmentSize(requireContext(), uri)
+      fileName = PartAuthority.getAttachmentFileName(requireContext(), uri)
+    }
+    if (fileSize == null) {
+      fileSize = MediaUtil.getMediaSize(context, uri)
+    }
+
+    return Pair(fileName, fileSize)
+  }
+
+  private fun getContentResolverFileInfo(uri: Uri): Pair<String, Long>? {
+    var cursor: Cursor? = null
+
+    try {
+      cursor = requireContext().contentResolver.query(uri, null, null, null, null)
+
+      if (cursor != null && cursor.moveToFirst()) {
+        val fileName = cursor.getString(cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME))
+        val fileSize = cursor.getLong(cursor.getColumnIndexOrThrow(OpenableColumns.SIZE))
+        media.setFileName(fileName)
+
+        return Pair(fileName, fileSize)
+      }
+    } finally {
+      cursor?.close()
+    }
+
+    return null
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaUploadRepository.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaUploadRepository.java
index 2d3b6bfe7e..52b6737562 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaUploadRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaUploadRepository.java
@@ -16,7 +16,7 @@
 import org.thoughtcrime.securesms.database.AttachmentTable;
 import org.thoughtcrime.securesms.database.AttachmentTable.TransformProperties;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.mms.GifSlide;
 import org.thoughtcrime.securesms.mms.ImageSlide;
@@ -157,7 +157,7 @@ private void uploadMediaInternal(@NonNull Media media, @Nullable Recipient recip
   }
 
   private void cancelUploadInternal(@NonNull Media media) {
-    JobManager      jobManager = ApplicationDependencies.getJobManager();
+    JobManager      jobManager = AppDependencies.getJobManager();
     PreUploadResult result     = uploadResults.get(media);
 
     if (result != null) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/SentMediaQualityTransform.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/SentMediaQualityTransform.java
index 42cd868452..1b49c2e90a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/SentMediaQualityTransform.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/SentMediaQualityTransform.java
@@ -37,6 +37,7 @@ public SentMediaQualityTransform(@NonNull SentMediaQuality sentMediaQuality) {
                      media.isVideoGif(),
                      media.getBucketId(),
                      media.getCaption(),
-                     Optional.of(AttachmentTable.TransformProperties.forSentMediaQuality(media.getTransformProperties(), sentMediaQuality)));
+                     Optional.of(AttachmentTable.TransformProperties.forSentMediaQuality(media.getTransformProperties(), sentMediaQuality)),
+                     media.getFileName());
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/VideoTrimTransform.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/VideoTrimTransform.kt
index 77aa092f74..6365c5e450 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/VideoTrimTransform.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/VideoTrimTransform.kt
@@ -22,7 +22,8 @@ class VideoTrimTransform(private val data: VideoTrimData) : MediaTransform {
       media.isVideoGif,
       media.bucketId,
       media.caption,
-      Optional.of(TransformProperties(false, data.isDurationEdited, data.startTimeUs, data.endTimeUs, SentMediaQuality.STANDARD.code, false))
+      Optional.of(TransformProperties(false, data.isDurationEdited, data.startTimeUs, data.endTimeUs, SentMediaQuality.STANDARD.code, false)),
+      media.fileName
     )
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXModePolicy.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXModePolicy.kt
index 23a71f8d80..ff5d644db2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXModePolicy.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXModePolicy.kt
@@ -5,7 +5,7 @@ import android.os.Build
 import androidx.camera.view.CameraController
 import org.signal.core.util.asListContains
 import org.thoughtcrime.securesms.mms.MediaConstraints
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.video.VideoUtil
 
 /**
@@ -15,8 +15,18 @@ sealed class CameraXModePolicy {
 
   abstract val isVideoSupported: Boolean
 
+  abstract val isQrScanEnabled: Boolean
+
   abstract fun initialize(cameraController: CameraXController)
 
+  open fun initialize(cameraController: CameraXController, useCaseFlags: Int) {
+    if (isQrScanEnabled) {
+      cameraController.setEnabledUseCases(useCaseFlags or CameraController.IMAGE_ANALYSIS)
+    } else {
+      cameraController.setEnabledUseCases(useCaseFlags)
+    }
+  }
+
   open fun setToImage(cameraController: CameraXController) = Unit
 
   open fun setToVideo(cameraController: CameraXController) = Unit
@@ -24,19 +34,19 @@ sealed class CameraXModePolicy {
   /**
    * The device supports having Image and Video enabled at the same time
    */
-  object Mixed : CameraXModePolicy() {
+  data class Mixed(override val isQrScanEnabled: Boolean) : CameraXModePolicy() {
 
     override val isVideoSupported: Boolean = true
 
     override fun initialize(cameraController: CameraXController) {
-      cameraController.setEnabledUseCases(CameraController.IMAGE_CAPTURE or CameraController.VIDEO_CAPTURE)
+      super.initialize(cameraController, CameraController.IMAGE_CAPTURE or CameraController.VIDEO_CAPTURE)
     }
   }
 
   /**
    * The device supports image and video, but only one mode at a time.
    */
-  object Single : CameraXModePolicy() {
+  data class Single(override val isQrScanEnabled: Boolean) : CameraXModePolicy() {
 
     override val isVideoSupported: Boolean = true
 
@@ -45,29 +55,29 @@ sealed class CameraXModePolicy {
     }
 
     override fun setToImage(cameraController: CameraXController) {
-      cameraController.setEnabledUseCases(CameraController.IMAGE_CAPTURE)
+      super.initialize(cameraController, CameraController.IMAGE_CAPTURE)
     }
 
     override fun setToVideo(cameraController: CameraXController) {
-      cameraController.setEnabledUseCases(CameraController.VIDEO_CAPTURE)
+      super.initialize(cameraController, CameraController.VIDEO_CAPTURE)
     }
   }
 
   /**
    * The device supports taking images only.
    */
-  object ImageOnly : CameraXModePolicy() {
+  data class ImageOnly(override val isQrScanEnabled: Boolean) : CameraXModePolicy() {
 
     override val isVideoSupported: Boolean = false
 
     override fun initialize(cameraController: CameraXController) {
-      cameraController.setEnabledUseCases(CameraController.IMAGE_CAPTURE)
+      super.initialize(cameraController, CameraController.IMAGE_CAPTURE)
     }
   }
 
   companion object {
     @JvmStatic
-    fun acquire(context: Context, mediaConstraints: MediaConstraints, isVideoEnabled: Boolean): CameraXModePolicy {
+    fun acquire(context: Context, mediaConstraints: MediaConstraints, isVideoEnabled: Boolean, isQrScanEnabled: Boolean): CameraXModePolicy {
       val isVideoSupported = Build.VERSION.SDK_INT >= 26 &&
         isVideoEnabled &&
         MediaConstraints.isVideoTranscodeAvailable() &&
@@ -76,12 +86,12 @@ sealed class CameraXModePolicy {
       val isMixedModeSupported = isVideoSupported &&
         Build.VERSION.SDK_INT >= 26 &&
         CameraXUtil.isMixedModeSupported(context) &&
-        !FeatureFlags.cameraXMixedModelBlocklist().asListContains(Build.MODEL)
+        !RemoteConfig.cameraXMixedModelBlocklist.asListContains(Build.MODEL)
 
       return when {
-        isMixedModeSupported -> Mixed
-        isVideoSupported -> Single
-        else -> ImageOnly
+        isMixedModeSupported -> Mixed(isQrScanEnabled)
+        isVideoSupported -> Single(isQrScanEnabled)
+        else -> ImageOnly(isQrScanEnabled)
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXModelBlocklist.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXModelBlocklist.kt
index cfea065b89..82eb7842f9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXModelBlocklist.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXModelBlocklist.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.mediasend.camerax
 
 import android.os.Build
 import org.signal.core.util.asListContains
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 
 /**
  * Some phones don't work well with CameraX. This class uses a remote config to decide
@@ -12,6 +12,6 @@ object CameraXModelBlocklist {
 
   @JvmStatic
   fun isBlocklisted(): Boolean {
-    return FeatureFlags.cameraXModelBlocklist().asListContains(Build.MODEL)
+    return RemoteConfig.cameraXModelBlocklist.asListContains(Build.MODEL)
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXUtil.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXUtil.java
index d8066859b7..24744f0776 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXUtil.java
@@ -202,7 +202,7 @@ public static boolean isMixedModeSupported(@NonNull Context context) {
   }
 
   public static int getLowestSupportedHardwareLevel(@NonNull Context context) {
-    @SuppressLint("RestrictedApi") CameraManager cameraManager = CameraManagerCompat.from(context).unwrap();
+    @SuppressLint("RestrictedApi") CameraManager cameraManager = CameraManagerCompat.from(context.getApplicationContext()).unwrap();
 
     try {
       int supported = maxHardwareLevel();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaBuilder.kt
index e9f2e1b3a7..f8526595b9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaBuilder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaBuilder.kt
@@ -18,6 +18,7 @@ object MediaBuilder {
     videoGif: Boolean = false,
     bucketId: Optional<String> = Optional.empty(),
     caption: Optional<String> = Optional.empty(),
-    transformProperties: Optional<AttachmentTable.TransformProperties> = Optional.empty()
-  ) = Media(uri, mimeType, date, width, height, size, duration, borderless, videoGif, bucketId, caption, transformProperties)
+    transformProperties: Optional<AttachmentTable.TransformProperties> = Optional.empty(),
+    fileName: Optional<String> = Optional.empty()
+  ) = Media(uri, mimeType, date, width, height, size, duration, borderless, videoGif, bucketId, caption, transformProperties, fileName)
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionActivity.kt
index 84529d23e9..cc3557622f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionActivity.kt
@@ -44,8 +44,8 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.safety.SafetyNumberBottomSheet
 import org.thoughtcrime.securesms.stories.Stories
 import org.thoughtcrime.securesms.util.Debouncer
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.FullscreenHelper
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.WindowUtil
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import org.thoughtcrime.securesms.util.visible
@@ -92,7 +92,7 @@ class MediaSelectionActivity :
   override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
     setContentView(R.layout.media_selection_activity)
 
-    if (FeatureFlags.customCameraXController()) {
+    if (RemoteConfig.customCameraXController) {
       requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionNavigator.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionNavigator.kt
index bca57bf84e..0209f2398b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionNavigator.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionNavigator.kt
@@ -6,7 +6,6 @@ import androidx.fragment.app.Fragment
 import androidx.navigation.NavController
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.mediasend.camerax.CameraXUtil
-import org.thoughtcrime.securesms.permissions.PermissionCompat
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
@@ -47,17 +46,5 @@ class MediaSelectionNavigator(
           .execute()
       }
     }
-
-    fun Fragment.requestPermissionsForGallery(
-      onGranted: () -> Unit
-    ) {
-      Permissions.with(this)
-        .request(*PermissionCompat.forImagesAndVideos())
-        .ifNecessary()
-        .withPermanentDenialDialog(getString(R.string.AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos))
-        .onAllGranted(onGranted)
-        .onAnyDenied { Toast.makeText(this.requireContext(), R.string.AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos, Toast.LENGTH_LONG).show() }
-        .execute()
-    }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt
index 17d953d689..65e55afbc3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt
@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.Mention
 import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.keyvalue.StorySend
 import org.thoughtcrime.securesms.mediasend.CompositeMediaTransform
@@ -151,6 +151,21 @@ class MediaSelectionRepository(context: Context) {
           scheduleMessages(sendType, contacts.map { it.recipientId }, trimmedBody, updatedMedia, trimmedMentions, trimmedBodyRanges, isViewOnce, scheduledTime)
           emitter.onComplete()
         }
+      } else if (MediaUtil.isDocumentType(selectedMedia.first().mimeType)) {
+        Log.i(TAG, "Document. Skipping pre-upload.")
+        emitter.onSuccess(
+          MediaSendActivityResult(
+            recipientId = singleRecipient!!.id,
+            nonUploadedMedia = updatedMedia,
+            body = trimmedBody,
+            messageSendType = sendType,
+            isViewOnce = isViewOnce,
+            mentions = trimmedMentions,
+            bodyRanges = trimmedBodyRanges,
+            storyType = StoryType.NONE,
+            scheduledTime = scheduledTime
+          )
+        )
       } else {
         val splitMessage = MessageUtil.getSplitMessage(context, trimmedBody, sendType.calculateCharacters(trimmedBody).maxPrimaryMessageSize)
         val splitBody = splitMessage.body
@@ -295,7 +310,7 @@ class MediaSelectionRepository(context: Context) {
     scheduledDate: Long
   ) {
     val slideDeck = SlideDeck()
-    val context: Context = ApplicationDependencies.getApplication()
+    val context: Context = AppDependencies.application
 
     for (mediaItem in nonUploadedMedia) {
       if (MediaUtil.isVideoType(mediaItem.mimeType)) {
@@ -355,7 +370,7 @@ class MediaSelectionRepository(context: Context) {
       val isStory = contact.isStory || recipient.isDistributionList
 
       if (isStory && !recipient.isMyStory) {
-        SignalStore.storyValues().setLatestStorySend(StorySend.newSend(recipient))
+        SignalStore.story.setLatestStorySend(StorySend.newSend(recipient))
       }
 
       val storyType: StoryType = when {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionState.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionState.kt
index 4f8611531c..ed5ebc941c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionState.kt
@@ -9,8 +9,8 @@ import org.thoughtcrime.securesms.mms.MediaConstraints
 import org.thoughtcrime.securesms.mms.SentMediaQuality
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.stories.Stories
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.MediaUtil
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.video.TranscodingPreset
 
 data class MediaSelectionState(
@@ -18,7 +18,7 @@ data class MediaSelectionState(
   val selectedMedia: List<Media> = listOf(),
   val focusedMedia: Media? = null,
   val recipient: Recipient? = null,
-  val quality: SentMediaQuality = SignalStore.settings().sentMediaQuality,
+  val quality: SentMediaQuality = SignalStore.settings.sentMediaQuality,
   val message: CharSequence? = null,
   val viewOnceToggleState: ViewOnceToggleState = ViewOnceToggleState.default,
   val isTouchEnabled: Boolean = true,
@@ -36,7 +36,7 @@ data class MediaSelectionState(
 
   val transcodingPreset: TranscodingPreset = MediaConstraints.getPushMediaConstraints(SentMediaQuality.fromCode(quality.code)).videoTranscodingSettings
 
-  val maxSelection = FeatureFlags.maxAttachmentCount()
+  val maxSelection = RemoteConfig.maxAttachmentCount
 
   val canSend = !isSent && selectedMedia.isNotEmpty()
 
@@ -45,7 +45,8 @@ data class MediaSelectionState(
   }
 
   enum class ViewOnceToggleState(val code: Int) {
-    INFINITE(0), ONCE(1);
+    INFINITE(0),
+    ONCE(1);
 
     fun next(): ViewOnceToggleState {
       return when (this) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionViewModel.kt
index bd711932f4..f5c519e220 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionViewModel.kt
@@ -421,7 +421,7 @@ class MediaSelectionViewModel(
     }
 
     val filteredPreUploadMedia = if (destination is MediaSelectionDestination.SingleRecipient || !Stories.isFeatureEnabled()) {
-      media
+      media.filter { !MediaUtil.isDocumentType(it.mimeType) }
     } else {
       media.filter { Stories.MediaTransform.canPreUploadMedia(it) }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaValidator.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaValidator.kt
index e7cd3a844d..98c42e971f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaValidator.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaValidator.kt
@@ -17,7 +17,7 @@ object MediaValidator {
 
     var error: FilterError? = null
     if (!isAllMediaValid) {
-      error = if (media.all { MediaUtil.isImageOrVideoType(it.mimeType) }) {
+      error = if (media.all { MediaUtil.isImageOrVideoType(it.mimeType) || MediaUtil.isDocumentType(it.mimeType) }) {
         FilterError.ItemTooLarge
       } else {
         FilterError.ItemInvalidType
@@ -53,7 +53,7 @@ object MediaValidator {
     return media
       .filter { m -> isSupportedMediaType(m.mimeType) }
       .filter { m ->
-        MediaUtil.isImageAndNotGif(m.mimeType) || isValidGif(context, m, mediaConstraints) || isValidVideo(context, m, mediaConstraints)
+        MediaUtil.isImageAndNotGif(m.mimeType) || isValidGif(context, m, mediaConstraints) || isValidVideo(context, m, mediaConstraints) || isValidDocument(context, m, mediaConstraints)
       }
       .filter { m ->
         !isStory || Stories.MediaTransform.getSendRequirements(m) != Stories.MediaTransform.SendRequirements.CAN_NOT_SEND
@@ -68,8 +68,12 @@ object MediaValidator {
     return MediaUtil.isVideoType(media.mimeType) && media.size < mediaConstraints.getUncompressedVideoMaxSize(context)
   }
 
+  private fun isValidDocument(context: Context, media: Media, mediaConstraints: MediaConstraints): Boolean {
+    return MediaUtil.isDocumentType(media.mimeType) && media.size < mediaConstraints.getDocumentMaxSize(context)
+  }
+
   private fun isSupportedMediaType(mimeType: String): Boolean {
-    return MediaUtil.isGif(mimeType) || MediaUtil.isImageType(mimeType) || MediaUtil.isVideoType(mimeType)
+    return MediaUtil.isGif(mimeType) || MediaUtil.isImageType(mimeType) || MediaUtil.isVideoType(mimeType) || MediaUtil.isDocumentType(mimeType)
   }
 
   data class FilterResult(val filteredMedia: List<Media>, val filterError: FilterError?, val bucketId: String?)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/UntrustedRecords.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/UntrustedRecords.kt
index 8fdb76a371..f985c4283c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/UntrustedRecords.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/UntrustedRecords.kt
@@ -8,7 +8,7 @@ import org.signal.core.util.concurrent.SignalExecutors
 import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.IdentityRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 import java.util.concurrent.TimeUnit
 
@@ -43,8 +43,8 @@ object UntrustedRecords {
       .flatten()
 
     val calculatedUntrustedWindow = System.currentTimeMillis() - changedSince
-    return ApplicationDependencies
-      .getProtocolStore()
+    return AppDependencies
+      .protocolStore
       .aci()
       .identities()
       .getIdentityRecords(recipients)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt
index ddd3c82ed6..1d5fec556f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureFragment.kt
@@ -12,13 +12,12 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import io.reactivex.rxjava3.core.Flowable
 import org.signal.core.util.concurrent.LifecycleDisposable
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.DeviceActivity
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
 import org.thoughtcrime.securesms.mediasend.CameraFragment
 import org.thoughtcrime.securesms.mediasend.Media
 import org.thoughtcrime.securesms.mediasend.v2.HudCommand
 import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionNavigator
-import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionNavigator.Companion.requestPermissionsForGallery
 import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionViewModel
 import org.thoughtcrime.securesms.mms.MediaConstraints
 import org.thoughtcrime.securesms.permissions.Permissions
@@ -93,7 +92,7 @@ class MediaCaptureFragment : Fragment(R.layout.fragment_container), CameraFragme
             .setTitle(R.string.MediaCaptureFragment_device_link_dialog_title)
             .setMessage(R.string.MediaCaptureFragment_device_link_dialog_body)
             .setPositiveButton(R.string.MediaCaptureFragment_device_link_dialog_continue) { d, _ ->
-              startActivity(DeviceActivity.getIntentForScanner(requireContext()))
+              startActivity(AppSettingsActivity.linkedDevices(requireContext()))
               requireActivity().finish()
             }
             .setNegativeButton(android.R.string.cancel, null)
@@ -160,10 +159,8 @@ class MediaCaptureFragment : Fragment(R.layout.fragment_container), CameraFragme
 
   override fun onGalleryClicked() {
     val controller = findNavController()
-    requestPermissionsForGallery {
-      captureChildFragment.fadeOutControls {
-        navigator.goToGallery(controller)
-      }
+    captureChildFragment.fadeOutControls {
+      navigator.goToGallery(controller)
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureRepository.kt
index 0288ff9d66..2ff22ea411 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/capture/MediaCaptureRepository.kt
@@ -106,6 +106,7 @@ class MediaCaptureRepository(context: Context) {
         false,
         Optional.of(Media.ALL_MEDIA_BUCKET_ID),
         Optional.empty(),
+        Optional.empty(),
         Optional.empty()
       )
     } catch (e: IOException) {
@@ -160,6 +161,7 @@ class MediaCaptureRepository(context: Context) {
                 false,
                 Optional.of(bucketId),
                 Optional.empty(),
+                Optional.empty(),
                 Optional.empty()
               )
             )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/documents/MediaReviewDocumentPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/documents/MediaReviewDocumentPageFragment.kt
new file mode 100644
index 0000000000..042d001050
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/documents/MediaReviewDocumentPageFragment.kt
@@ -0,0 +1,63 @@
+package org.thoughtcrime.securesms.mediasend.v2.documents
+
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import org.signal.core.util.getParcelableCompat
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.mediasend.Media
+import org.thoughtcrime.securesms.mediasend.MediaSendDocumentFragment
+import org.thoughtcrime.securesms.mediasend.v2.HudCommand
+import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionViewModel
+
+private const val DOCUMENT_TAG = "media.send.document.fragment"
+
+/**
+ * Fragment which ensures we fire off ResumeEntryTransition when viewing a document.
+ */
+class MediaReviewDocumentPageFragment : Fragment(R.layout.fragment_container) {
+
+  private lateinit var mediaSendDocumentFragment: MediaSendDocumentFragment
+
+  private val sharedViewModel: MediaSelectionViewModel by viewModels(ownerProducer = { requireActivity() })
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    mediaSendDocumentFragment = ensureFragment()
+    sharedViewModel.sendCommand(HudCommand.ResumeEntryTransition)
+  }
+
+  private fun ensureFragment(): MediaSendDocumentFragment {
+    val fragmentInManager: MediaSendDocumentFragment? = childFragmentManager.findFragmentByTag(DOCUMENT_TAG) as? MediaSendDocumentFragment
+
+    return if (fragmentInManager != null) {
+      fragmentInManager
+    } else {
+      val mediaSendDocumentFragment = MediaSendDocumentFragment.newInstance(requireMedia())
+
+      childFragmentManager.beginTransaction()
+        .replace(
+          R.id.fragment_container,
+          mediaSendDocumentFragment,
+          DOCUMENT_TAG
+        )
+        .commitAllowingStateLoss()
+
+      mediaSendDocumentFragment
+    }
+  }
+
+  private fun requireMedia(): Media = requireNotNull(requireArguments().getParcelableCompat(ARG_MEDIA, Media::class.java))
+
+  companion object {
+    private const val ARG_MEDIA = "arg.media"
+
+    fun newInstance(media: Media): Fragment {
+      return MediaReviewDocumentPageFragment().apply {
+        arguments = Bundle().apply {
+          putParcelable(ARG_MEDIA, media)
+        }
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt
index 0295d5cfd0..3a239237a9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt
@@ -38,6 +38,7 @@ import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionViewModel
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.stories.Stories
+import org.thoughtcrime.securesms.util.MediaUtil
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.views.Stub
 import org.thoughtcrime.securesms.util.visible
@@ -92,7 +93,7 @@ class AddMessageDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_a
 
     binding.content.addAMessageInput.setText(requireArguments().getCharSequence(ARG_INITIAL_TEXT))
 
-    if (SignalStore.settings().isPreferSystemEmoji) {
+    if (SignalStore.settings.isPreferSystemEmoji) {
       binding.content.emojiToggle.visible = false
     } else {
       binding.content.emojiToggle.setOnClickListener { onEmojiToggleClicked() }
@@ -133,7 +134,7 @@ class AddMessageDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_a
         binding.content.addAMessageInput.text = null
         dismiss()
       }
-      binding.content.viewOnceToggle.visible = state.selectedMedia.size == 1 && !state.isStory
+      binding.content.viewOnceToggle.visible = state.selectedMedia.size == 1 && !state.isStory && !MediaUtil.isDocumentType(state.focusedMedia?.mimeType)
     }
 
     initializeMentions()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
index 67249f0039..ca54cd7a47 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
@@ -50,7 +50,6 @@ import org.thoughtcrime.securesms.mediasend.MediaSendActivityResult
 import org.thoughtcrime.securesms.mediasend.v2.HudCommand
 import org.thoughtcrime.securesms.mediasend.v2.MediaAnimations
 import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionNavigator
-import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionNavigator.Companion.requestPermissionsForGallery
 import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionState
 import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionViewModel
 import org.thoughtcrime.securesms.mediasend.v2.MediaValidator
@@ -113,7 +112,7 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul
 
   private var animatorSet: AnimatorSet? = null
   private var disposables: LifecycleDisposable = LifecycleDisposable()
-  private var sentMediaQuality: SentMediaQuality = SignalStore.settings().sentMediaQuality
+  private var sentMediaQuality: SentMediaQuality = SignalStore.settings.sentMediaQuality
   private var viewOnceToggleState: MediaSelectionState.ViewOnceToggleState = MediaSelectionState.ViewOnceToggleState.default
 
   private var scheduledSendTime: Long? = null
@@ -275,7 +274,7 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul
       sharedViewModel.incrementViewOnceState()
     }
 
-    if (!SignalStore.settings().isPreferSystemEmoji) {
+    if (!SignalStore.settings.isPreferSystemEmoji) {
       emojiButton.setOnClickListener {
         AddMessageDialogFragment.show(parentFragmentManager, sharedViewModel.state.value?.message, true)
       }
@@ -442,9 +441,7 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul
 
   private fun launchGallery() {
     val controller = findNavController()
-    requestPermissionsForGallery {
-      navigator.goToGallery(controller)
-    }
+    navigator.goToGallery(controller)
   }
 
   private fun performSend(selection: List<ContactSearchKey> = listOf()) {
@@ -658,7 +655,7 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul
   }
 
   private fun computeViewOnceButtonAnimators(state: MediaSelectionState): List<Animator> {
-    return if (state.isTouchEnabled && state.selectedMedia.size == 1 && !state.isStory) {
+    return if (state.isTouchEnabled && state.selectedMedia.size == 1 && !state.isStory && !MediaUtil.isDocumentType(state.focusedMedia?.mimeType)) {
       listOf(MediaReviewAnimatorController.getFadeInAnimator(viewOnceButton))
     } else {
       listOf(MediaReviewAnimatorController.getFadeOutAnimator(viewOnceButton))
@@ -666,7 +663,7 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul
   }
 
   private fun computeEmojiButtonAnimators(state: MediaSelectionState): List<Animator> {
-    return if (state.isTouchEnabled && !SignalStore.settings().isPreferSystemEmoji && state.viewOnceToggleState != MediaSelectionState.ViewOnceToggleState.ONCE) {
+    return if (state.isTouchEnabled && !SignalStore.settings.isPreferSystemEmoji && state.viewOnceToggleState != MediaSelectionState.ViewOnceToggleState.ONCE) {
       listOf(MediaReviewAnimatorController.getFadeInAnimator(emojiButton))
     } else {
       listOf(MediaReviewAnimatorController.getFadeOutAnimator(emojiButton))
@@ -675,7 +672,7 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul
 
   private fun computeAddMediaButtonsAnimators(state: MediaSelectionState): List<Animator> {
     return when {
-      !state.isTouchEnabled || state.viewOnceToggleState == MediaSelectionState.ViewOnceToggleState.ONCE -> {
+      !state.isTouchEnabled || state.viewOnceToggleState == MediaSelectionState.ViewOnceToggleState.ONCE || MediaUtil.isDocumentType(state.focusedMedia?.mimeType) -> {
         listOf(
           MediaReviewAnimatorController.getFadeOutAnimator(addMediaButton),
           MediaReviewAnimatorController.getFadeOutAnimator(selectionRecycler)
@@ -709,7 +706,7 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul
   }
 
   private fun computeSaveButtonAnimators(state: MediaSelectionState): List<Animator> {
-    return if (state.isTouchEnabled && !MediaUtil.isVideo(state.focusedMedia?.mimeType)) {
+    return if (state.isTouchEnabled && !MediaUtil.isVideo(state.focusedMedia?.mimeType) && !MediaUtil.isDocumentType(state.focusedMedia?.mimeType)) {
       listOf(
         MediaReviewAnimatorController.getFadeInAnimator(saveButton)
       )
@@ -721,7 +718,7 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul
   }
 
   private fun computeQualityButtonAnimators(state: MediaSelectionState): List<Animator> {
-    return if (state.isTouchEnabled && !state.isStory) {
+    return if (state.isTouchEnabled && !state.isStory && !MediaUtil.isDocumentType(state.focusedMedia?.mimeType)) {
       listOf(MediaReviewAnimatorController.getFadeInAnimator(qualityButton))
     } else {
       listOf(MediaReviewAnimatorController.getFadeOutAnimator(qualityButton))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragmentPagerAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragmentPagerAdapter.kt
index 1ae6e4db03..55b72a8fdf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragmentPagerAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragmentPagerAdapter.kt
@@ -5,6 +5,7 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import org.thoughtcrime.securesms.mediasend.Media
+import org.thoughtcrime.securesms.mediasend.v2.documents.MediaReviewDocumentPageFragment
 import org.thoughtcrime.securesms.mediasend.v2.gif.MediaReviewGifPageFragment
 import org.thoughtcrime.securesms.mediasend.v2.images.MediaReviewImagePageFragment
 import org.thoughtcrime.securesms.mediasend.v2.videos.MediaReviewVideoPageFragment
@@ -46,6 +47,7 @@ class MediaReviewFragmentPagerAdapter(fragment: Fragment) : FragmentStateAdapter
       MediaUtil.isGif(mediaItem.mimeType) -> MediaReviewGifPageFragment.newInstance(mediaItem.uri)
       MediaUtil.isImageType(mediaItem.mimeType) -> MediaReviewImagePageFragment.newInstance(mediaItem.uri)
       MediaUtil.isVideoType(mediaItem.mimeType) -> MediaReviewVideoPageFragment.newInstance(mediaItem.uri, mediaItem.isVideoGif)
+      MediaUtil.isDocumentType(mediaItem.mimeType) -> MediaReviewDocumentPageFragment.newInstance(mediaItem)
       else -> {
         throw UnsupportedOperationException("Can only render images and videos. Found mimetype: '" + mediaItem.mimeType + "'")
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseGroupStoryBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseGroupStoryBottomSheet.kt
index 82dcb6aa59..ba3a34037c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseGroupStoryBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseGroupStoryBottomSheet.kt
@@ -25,7 +25,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.sharing.ShareContact
 import org.thoughtcrime.securesms.sharing.ShareSelectionAdapter
 import org.thoughtcrime.securesms.sharing.ShareSelectionMappingModel
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 
 class ChooseGroupStoryBottomSheet : FixedRoundedCornerBottomSheetDialogFragment() {
 
@@ -65,10 +65,9 @@ class ChooseGroupStoryBottomSheet : FixedRoundedCornerBottomSheetDialogFragment(
     val contactRecycler: RecyclerView = view.findViewById(R.id.contact_recycler)
     mediator = ContactSearchMediator(
       fragment = this,
-      selectionLimits = FeatureFlags.shareSelectionLimit(),
+      selectionLimits = RemoteConfig.shareSelectionLimit,
       displayOptions = ContactSearchAdapter.DisplayOptions(
         displayCheckBox = true,
-        displaySmsTag = ContactSearchAdapter.DisplaySmsTag.DEFAULT,
         displaySecondaryInformation = ContactSearchAdapter.DisplaySecondaryInformation.NEVER
       ),
       mapStateToConfiguration = { state ->
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostCreationState.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostCreationState.kt
index 13ea17f1be..04fdd62a58 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostCreationState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostCreationState.kt
@@ -10,14 +10,14 @@ import kotlinx.parcelize.Parcelize
 import org.thoughtcrime.securesms.conversation.colors.ChatColors
 import org.thoughtcrime.securesms.fonts.TextFont
 import org.thoughtcrime.securesms.scribbles.HSVColorSlider
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 
 @Parcelize
 data class TextStoryPostCreationState(
   val body: CharSequence = "",
   val textColor: Int = HSVColorSlider.getLastColor(),
   val textColorStyle: TextColorStyle = TextColorStyle.NO_BACKGROUND,
-  val textAlignment: TextAlignment = if (FeatureFlags.storiesTextFunctions()) TextAlignment.START else TextAlignment.CENTER,
+  val textAlignment: TextAlignment = if (RemoteConfig.storiesTextFunctions) TextAlignment.START else TextAlignment.CENTER,
   val textFont: TextFont = TextFont.REGULAR,
   @IntRange(from = 0, to = 100) val textScale: Int = 50,
   val backgroundColor: ChatColors = TextStoryBackgroundColors.getInitialBackgroundColor(),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostCreationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostCreationViewModel.kt
index 36ea4b7f30..006890bc34 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostCreationViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostCreationViewModel.kt
@@ -20,7 +20,7 @@ import io.reactivex.rxjava3.subjects.Subject
 import org.signal.core.util.getParcelableCompat
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.fonts.TextFont
 import org.thoughtcrime.securesms.fonts.TextToScript
 import org.thoughtcrime.securesms.fonts.TypefaceCache
@@ -49,7 +49,7 @@ class TextStoryPostCreationViewModel(private val repository: TextStoryPostSendRe
     disposables += Observable.combineLatest(textFontSubject, scriptGuess, ::Pair)
       .observeOn(Schedulers.io())
       .distinctUntilChanged()
-      .switchMapSingle { (textFont, script) -> TypefaceCache.get(ApplicationDependencies.getApplication(), textFont, script) }
+      .switchMapSingle { (textFont, script) -> TypefaceCache.get(AppDependencies.application, textFont, script) }
       .subscribeOn(Schedulers.io())
       .subscribe {
         internalTypeface.onNext(it)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostTextEntryFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostTextEntryFragment.kt
index 9500ed027b..a4d2fb94c9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostTextEntryFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostTextEntryFragment.kt
@@ -34,7 +34,7 @@ import org.thoughtcrime.securesms.scribbles.HSVColorSlider
 import org.thoughtcrime.securesms.scribbles.HSVColorSlider.getColor
 import org.thoughtcrime.securesms.scribbles.HSVColorSlider.setColor
 import org.thoughtcrime.securesms.scribbles.HSVColorSlider.setUpForColor
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.fragments.findListener
@@ -105,7 +105,7 @@ class TextStoryPostTextEntryFragment : KeyboardEntryDialogFragment(
       backgroundButton
     )
 
-    if (FeatureFlags.storiesTextFunctions()) {
+    if (RemoteConfig.storiesTextFunctions) {
       fadeableViews = fadeableViews + alignmentButton
       alignmentButton.visibility = View.VISIBLE
       scaleBar.visibility = View.VISIBLE
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/send/TextStoryPostSendRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/send/TextStoryPostSendRepository.kt
index d627eb6a66..90d9ed685e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/send/TextStoryPostSendRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/send/TextStoryPostSendRepository.kt
@@ -67,7 +67,7 @@ class TextStoryPostSendRepository {
         val isStory = contact.requireRecipientSearchKey().isStory || recipient.isDistributionList
 
         if (isStory && !recipient.isMyStory) {
-          SignalStore.storyValues().setLatestStorySend(StorySend.newSend(recipient))
+          SignalStore.story.setLatestStorySend(StorySend.newSend(recipient))
         }
 
         val storyType: StoryType = when {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/ClientDeprecatedActivity.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/ClientDeprecatedActivity.java
index ee221798e8..7aa4292475 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/ClientDeprecatedActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/ClientDeprecatedActivity.java
@@ -8,7 +8,7 @@
 import org.signal.core.util.ThreadUtil;
 import org.thoughtcrime.securesms.PassphraseRequiredActivity;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.PlayStoreUtil;
@@ -54,7 +54,7 @@ private void onDontUpdateClicked() {
                    .setTitle(R.string.ClientDeprecatedActivity_warning)
                    .setMessage(R.string.ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history)
                    .setPositiveButton(R.string.ClientDeprecatedActivity_dont_update, (dialog, which) -> {
-                     ApplicationDependencies.getMegaphoneRepository().markFinished(Megaphones.Event.CLIENT_DEPRECATED, () -> {
+                     AppDependencies.getMegaphoneRepository().markFinished(Megaphones.Event.CLIENT_DEPRECATED, () -> {
                        ThreadUtil.runOnMain(this::finish);
                      });
                    })
diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
index 22a1697b7e..8e820e900a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
@@ -18,13 +18,14 @@
 import org.signal.core.util.SetUtil;
 import org.signal.core.util.TranslationDetection;
 import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.apkupdate.ApkUpdateRefreshListener;
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.MegaphoneRecord;
 import org.thoughtcrime.securesms.database.model.RemoteMegaphoneRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -41,7 +42,7 @@
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.util.CommunicationActions;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.VersionTracker;
@@ -108,7 +109,7 @@ private Megaphones() {}
    * The megaphones we want to display *in priority order*. This is a {@link LinkedHashMap}, so order is preserved.
    * We will render the first applicable megaphone in this collection.
    * <p>
-   * This is also when you would hide certain megaphones based on things like {@link FeatureFlags}.
+   * This is also when you would hide certain megaphones based on things like {@link RemoteConfig}.
    */
   private static Map<Event, MegaphoneSchedule> buildDisplayOrder(@NonNull Context context, @NonNull Map<Event, MegaphoneRecord> records) {
     return new LinkedHashMap<>() {{
@@ -138,7 +139,7 @@ private static boolean shouldShowLinkedDeviceInactiveMegaphone() {
       return false;
     }
 
-    long expiringAt = device.lastActiveTimestamp + FeatureFlags.linkedDeviceLifespan();
+    long expiringAt = device.lastActiveTimestamp + RemoteConfig.getLinkedDeviceLifespan();
     long expiringIn = Math.max(expiringAt - System.currentTimeMillis(), 0);
 
     return expiringIn < TimeUnit.DAYS.toMillis(7) && expiringIn > 0;
@@ -187,7 +188,7 @@ private static Megaphone buildLinkedDeviceInactiveMegaphone(Context context) {
       throw new IllegalStateException("No linked device to show");
     }
 
-    long expiringAt   = device.lastActiveTimestamp + FeatureFlags.linkedDeviceLifespan();
+    long expiringAt   = device.lastActiveTimestamp + RemoteConfig.getLinkedDeviceLifespan();
     long expiringIn   = Math.max(expiringAt - System.currentTimeMillis(), 0);
     int  expiringDays = (int) TimeUnit.MILLISECONDS.toDays(expiringIn);
 
@@ -209,7 +210,7 @@ private static Megaphone buildLinkedDeviceInactiveMegaphone(Context context) {
       return new Megaphone.Builder(Event.PINS_FOR_ALL, Megaphone.Style.FULLSCREEN)
           .enableSnooze(null)
           .setOnVisibleListener((megaphone, listener) -> {
-            if (new NetworkConstraint.Factory(ApplicationDependencies.getApplication()).create().isMet()) {
+            if (new NetworkConstraint.Factory(AppDependencies.getApplication()).create().isMet()) {
               listener.onMegaphoneNavigationRequested(SvrMigrationActivity.createIntent(), SvrMigrationActivity.REQUEST_NEW_PIN);
             }
           })
@@ -220,7 +221,7 @@ private static Megaphone buildLinkedDeviceInactiveMegaphone(Context context) {
           .setTitle(R.string.KbsMegaphone__create_a_pin)
           .setBody(R.string.KbsMegaphone__pins_keep_information_thats_stored_with_signal_encrytped)
           .setActionButton(R.string.KbsMegaphone__create_pin, (megaphone, listener) -> {
-            Intent intent = CreateSvrPinActivity.getIntentForPinCreate(ApplicationDependencies.getApplication());
+            Intent intent = CreateSvrPinActivity.getIntentForPinCreate(AppDependencies.getApplication());
 
             listener.onMegaphoneNavigationRequested(intent, CreateSvrPinActivity.REQUEST_NEW_PIN);
           })
@@ -240,7 +241,7 @@ private static Megaphone buildLinkedDeviceInactiveMegaphone(Context context) {
             public void onReminderDismissed(boolean includedFailure) {
               Log.i(TAG, "[PinReminder] onReminderDismissed(" + includedFailure + ")");
               if (includedFailure) {
-                SignalStore.pinValues().onEntrySkipWithWrongGuess();
+                SignalStore.pin().onEntrySkipWithWrongGuess();
               }
             }
 
@@ -248,13 +249,13 @@ public void onReminderDismissed(boolean includedFailure) {
             public void onReminderCompleted(@NonNull String pin, boolean includedFailure) {
               Log.i(TAG, "[PinReminder] onReminderCompleted(" + includedFailure + ")");
               if (includedFailure) {
-                SignalStore.pinValues().onEntrySuccessWithWrongGuess(pin);
+                SignalStore.pin().onEntrySuccessWithWrongGuess(pin);
               } else {
-                SignalStore.pinValues().onEntrySuccess(pin);
+                SignalStore.pin().onEntrySuccess(pin);
               }
 
               controller.onMegaphoneSnooze(Event.PIN_REMINDER);
-              controller.onMegaphoneToastRequested(controller.getMegaphoneActivity().getString(SignalPinReminders.getReminderString(SignalStore.pinValues().getCurrentInterval())));
+              controller.onMegaphoneToastRequested(controller.getMegaphoneActivity().getString(SignalPinReminders.getReminderString(SignalStore.pin().getCurrentInterval())));
             }
           });
         })
@@ -404,7 +405,7 @@ private static Megaphone buildBackupPermissionMegaphone(@NonNull Context context
   }
 
   private static boolean shouldShowEnableAppUpdatesMegaphone(@NonNull Context context) {
-    return FeatureFlags.selfUpdater() &&
+    return BuildConfig.MANAGES_MOLLY_UPDATES &&
            !TextSecurePreferences.isUpdateApkEnabled(context) &&
            VersionTracker.getDaysSinceFirstInstalled(context) > 0;
   }
@@ -446,6 +447,7 @@ private static boolean shouldShowEnableAppUpdatesMegaphone(@NonNull Context cont
         .build();
   }
 
+  @SuppressLint("NewApi")
   public static @NonNull Megaphone buildGrantFullScreenIntentPermission(@NonNull Context context) {
     return new Megaphone.Builder(Event.GRANT_FULL_SCREEN_INTENT, Megaphone.Style.BASIC)
         .setTitle(R.string.GrantFullScreenIntentPermission_megaphone_title)
@@ -472,7 +474,7 @@ private static boolean shouldShowOnboardingMegaphone(@NonNull Context context) {
   }
 
   private static boolean shouldShowTurnOffCircumventionMegaphone() {
-    return ApplicationDependencies.getSignalServiceNetworkAccess().isCensored() &&
+    return AppDependencies.getSignalServiceNetworkAccess().isCensored() &&
            SignalStore.misc().isServiceReachableWithoutCircumvention();
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView.java
index 384e1b4e3a..7795cd8f9f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView.java
@@ -63,7 +63,7 @@ private static class CardAdapter extends RecyclerView.Adapter<CardViewHolder> im
 
     // MOLLY: New group card is replaced by stories, that is opt-in
     private static final int TYPE_STORIES    = 0;
-    private static final int TYPE_INVITE     = 1;
+    //private static final int TYPE_INVITE   = 1;
     private static final int TYPE_APPEARANCE = 2;
     private static final int TYPE_ADD_PHOTO  = 3;
 
@@ -99,7 +99,6 @@ public long getItemId(int position) {
       View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.onboarding_megaphone_card, parent, false);
       switch (viewType) {
         case TYPE_STORIES:    return new StoriesViewHolder(view);
-        case TYPE_INVITE:     return new InviteCardViewHolder(view);
         case TYPE_APPEARANCE: return new AppearanceCardViewHolder(view);
         case TYPE_ADD_PHOTO:  return new AddPhotoCardViewHolder(view);
         default:              throw new IllegalStateException("Invalid viewType! " + viewType);
@@ -130,14 +129,10 @@ public void onClick() {
     private static List<Integer> buildData() {
       List<Integer> data = new ArrayList<>();
 
-      if (SignalStore.onboarding().shouldShowStories() && SignalStore.storyValues().isFeatureDisabled()) {
+      if (SignalStore.onboarding().shouldShowStories() && SignalStore.story().isFeatureDisabled()) {
         data.add(TYPE_STORIES);
       }
 
-      if (SignalStore.onboarding().shouldShowInviteFriends()) {
-        data.add(TYPE_INVITE);
-      }
-
       if (SignalStore.onboarding().shouldShowAddPhoto() && !SignalStore.misc().getHasEverHadAnAvatar()) {
         data.add(TYPE_ADD_PHOTO);
       }
@@ -223,38 +218,6 @@ void onCloseClicked() {
     }
   }
 
-  private static class InviteCardViewHolder extends CardViewHolder {
-
-    public InviteCardViewHolder(@NonNull View itemView) {
-      super(itemView);
-    }
-
-    @Override
-    int getButtonStringRes() {
-      return R.string.Megaphones_invite_friends;
-    }
-
-    @Override
-    int getImageRes() {
-      return R.drawable.symbol_invite_24;
-    }
-
-    @Override
-    int getBackgroundColor() {
-      return R.color.onboarding_background_2;
-    }
-
-    @Override
-    void onActionClicked(@NonNull MegaphoneActionController controller) {
-      controller.onMegaphoneNavigationRequested(new Intent(controller.getMegaphoneActivity(), InviteActivity.class));
-    }
-
-    @Override
-    void onCloseClicked() {
-      SignalStore.onboarding().setShowInviteFriends(false);
-    }
-  }
-
   private static class AppearanceCardViewHolder extends CardViewHolder {
 
     public AppearanceCardViewHolder(@NonNull View itemView) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/PinsForAllSchedule.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/PinsForAllSchedule.java
index 186726c93f..edd1123509 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/PinsForAllSchedule.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/PinsForAllSchedule.java
@@ -45,11 +45,7 @@ private static boolean isEnabled() {
       return false;
     }
 
-    if (SignalStore.svr().hasPin()) {
-      return false;
-    }
-
-    if (SignalStore.account().isLinkedDevice()) {
+    if (SignalStore.svr().hasPin() || SignalStore.account().isLinkedDevice()) {
       return false;
     }
 
@@ -57,7 +53,7 @@ private static boolean isEnabled() {
       return true;
     }
 
-    if (SignalStore.registrationValues().pinWasRequiredAtRegistration()) {
+    if (SignalStore.registration().pinWasRequiredAtRegistration()) {
       return false;
     }
 
@@ -65,7 +61,7 @@ private static boolean isEnabled() {
   }
 
   private static boolean pinCreationFailedDuringRegistration() {
-    return SignalStore.registrationValues().pinWasRequiredAtRegistration() &&
+    return SignalStore.registration().pinWasRequiredAtRegistration() &&
            !SignalStore.svr().hasPin();
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository.kt
index 6319db024e..5687f1f336 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/RemoteMegaphoneRepository.kt
@@ -13,12 +13,12 @@ import org.thoughtcrime.securesms.database.RemoteMegaphoneTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.RemoteMegaphoneRecord
 import org.thoughtcrime.securesms.database.model.RemoteMegaphoneRecord.ActionId
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.megaphone.RemoteMegaphoneRepository.Action
 import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.util.CommunicationActions
-import org.thoughtcrime.securesms.util.FeatureFlags
-import org.thoughtcrime.securesms.util.LocaleFeatureFlags
+import org.thoughtcrime.securesms.util.LocaleRemoteConfig
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.VersionTracker
 import kotlin.math.min
 import kotlin.time.Duration.Companion.days
@@ -31,7 +31,7 @@ object RemoteMegaphoneRepository {
   private val TAG = Log.tag(RemoteMegaphoneRepository::class.java)
 
   private val db: RemoteMegaphoneTable = SignalDatabase.remoteMegaphones
-  private val context: Application = ApplicationDependencies.getApplication()
+  private val context: Application = AppDependencies.application
 
   private val snooze: Action = Action { _, controller, remote ->
     controller.onMegaphoneSnooze(Megaphones.Event.REMOTE_MEGAPHONE)
@@ -77,7 +77,7 @@ object RemoteMegaphoneRepository {
     return db.getPotentialMegaphonesAndClearOld(now)
       .asSequence()
       .filter { it.imageUrl == null || it.imageUri != null }
-      .filter { it.countries == null || LocaleFeatureFlags.shouldShowReleaseNote(it.uuid, it.countries) }
+      .filter { it.countries == null || LocaleRemoteConfig.shouldShowReleaseNote(it.uuid, it.countries) }
       .filter { it.conditionalId == null || checkCondition(it.conditionalId) }
       .filter { it.snoozedAt == 0L || checkSnooze(it, now) }
       .firstOrNull()
@@ -100,7 +100,7 @@ object RemoteMegaphoneRepository {
   private fun checkCondition(conditionalId: String): Boolean {
     return when (conditionalId) {
       "standard_donate" -> shouldShowDonateMegaphone()
-      "internal_user" -> FeatureFlags.internalUser()
+      "internal_user" -> RemoteConfig.internalUser
       else -> false
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/SignalPinReminderSchedule.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/SignalPinReminderSchedule.java
index 1b7f7705c1..555290d35f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/SignalPinReminderSchedule.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/SignalPinReminderSchedule.java
@@ -10,15 +10,11 @@ public boolean shouldDisplay(int seenCount, long lastSeen, long firstVisible, lo
       return false;
     }
 
-    if (!SignalStore.svr().hasPin()) {
+    if (!SignalStore.svr().hasPin() || SignalStore.account().isLinkedDevice()) {
       return false;
     }
 
-    if (SignalStore.account().isLinkedDevice()) {
-      return false;
-    }
-
-    if (!SignalStore.pinValues().arePinRemindersEnabled()) {
+    if (!SignalStore.pin().arePinRemindersEnabled()) {
       return false;
     }
 
@@ -26,8 +22,8 @@ public boolean shouldDisplay(int seenCount, long lastSeen, long firstVisible, lo
       return false;
     }
 
-    long lastSuccessTime = SignalStore.pinValues().getLastSuccessfulEntryTime();
-    long interval        = SignalStore.pinValues().getCurrentInterval();
+    long lastSuccessTime = SignalStore.pin().getLastSuccessfulEntryTime();
+    long interval        = SignalStore.pin().getCurrentInterval();
 
     return currentTime - lastSuccessTime >= interval;
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetails.java b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetails.java
index e755fda460..4359dd5fc5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetails.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetails.java
@@ -5,7 +5,7 @@
 import com.annimon.stream.ComparatorCompat;
 
 import org.thoughtcrime.securesms.conversation.ConversationMessage;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 
 import java.util.Collection;
 import java.util.Comparator;
@@ -13,8 +13,8 @@
 import java.util.TreeSet;
 
 public final class MessageDetails {
-  private static final Comparator<RecipientDeliveryStatus> HAS_DISPLAY_NAME     = (r1, r2) -> Boolean.compare(r2.getRecipient().hasAUserSetDisplayName(ApplicationDependencies.getApplication()), r1.getRecipient().hasAUserSetDisplayName(ApplicationDependencies.getApplication()));
-  private static final Comparator<RecipientDeliveryStatus> ALPHABETICAL         = (r1, r2) -> r1.getRecipient().getDisplayName(ApplicationDependencies.getApplication()).compareToIgnoreCase(r2.getRecipient().getDisplayName(ApplicationDependencies.getApplication()));
+  private static final Comparator<RecipientDeliveryStatus> HAS_DISPLAY_NAME     = (r1, r2) -> Boolean.compare(r2.getRecipient().hasAUserSetDisplayName(AppDependencies.getApplication()), r1.getRecipient().hasAUserSetDisplayName(AppDependencies.getApplication()));
+  private static final Comparator<RecipientDeliveryStatus> ALPHABETICAL         = (r1, r2) -> r1.getRecipient().getDisplayName(AppDependencies.getApplication()).compareToIgnoreCase(r2.getRecipient().getDisplayName(AppDependencies.getApplication()));
   private static final Comparator<RecipientDeliveryStatus> RECIPIENT_COMPARATOR = ComparatorCompat.chain(HAS_DISPLAY_NAME).thenComparing(ALPHABETICAL);
 
   private final ConversationMessage conversationMessage;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetailsRepository.java b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetailsRepository.java
index 076a431494..30ac8eeb47 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetailsRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetailsRepository.java
@@ -19,7 +19,7 @@
 import org.thoughtcrime.securesms.database.documents.NetworkFailure;
 import org.thoughtcrime.securesms.database.model.MessageId;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.whispersystems.signalservice.api.push.DistributionId;
@@ -34,7 +34,7 @@
 
 public final class MessageDetailsRepository {
 
-  private final Context context = ApplicationDependencies.getApplication();
+  private final Context context = AppDependencies.getApplication();
 
   @NonNull LiveData<MessageRecord> getMessageRecord(Long messageId) {
     return new MessageRecordLiveData(new MessageId(messageId));
@@ -65,8 +65,8 @@ public final class MessageDetailsRepository {
         }
       };
 
-      ApplicationDependencies.getDatabaseObserver().registerMessageUpdateObserver(messageObserver);
-      emitter.setCancellable(() -> ApplicationDependencies.getDatabaseObserver().unregisterObserver(messageObserver));
+      AppDependencies.getDatabaseObserver().registerMessageUpdateObserver(messageObserver);
+      emitter.setCancellable(() -> AppDependencies.getDatabaseObserver().unregisterObserver(messageObserver));
 
       messageObserver.onMessageChanged(messageId);
     }).observeOn(Schedulers.io());
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageHeaderViewHolder.java b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageHeaderViewHolder.java
index 98703dacdf..45345a6d84 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageHeaderViewHolder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageHeaderViewHolder.java
@@ -36,7 +36,7 @@
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.ExpirationUtil;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.Projection;
 import org.thoughtcrime.securesms.util.ProjectionList;
 
@@ -96,7 +96,7 @@ void bind(@NonNull LifecycleOwner lifecycleOwner, @NonNull ConversationMessage c
   }
 
   private void bindInternalDetails(MessageRecord messageRecord) {
-    if (!FeatureFlags.internalUser()) {
+    if (!RemoteConfig.internalUser()) {
       internalDetailsButton.setVisibility(View.GONE);
       return;
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageRecordLiveData.java b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageRecordLiveData.java
index 7370e9c9f5..c279b4ee23 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageRecordLiveData.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageRecordLiveData.java
@@ -5,12 +5,11 @@
 
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.database.DatabaseObserver;
-import org.thoughtcrime.securesms.database.MessageTable;
 import org.thoughtcrime.securesms.database.NoSuchMessageException;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.MessageId;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 
 final class MessageRecordLiveData extends LiveData<MessageRecord> {
 
@@ -29,7 +28,7 @@ protected void onActive() {
 
   @Override
   protected void onInactive() {
-    ApplicationDependencies.getDatabaseObserver().unregisterObserver(observer);
+    AppDependencies.getDatabaseObserver().unregisterObserver(observer);
   }
 
   @WorkerThread
@@ -42,7 +41,7 @@ record = SignalDatabase.payments().updateMessageWithPayment(record);
       }
 
       postValue(record);
-      ApplicationDependencies.getDatabaseObserver().registerVerboseConversationObserver(record.getThreadId(), observer);
+      AppDependencies.getDatabaseObserver().registerVerboseConversationObserver(record.getThreadId(), observer);
     } catch (NoSuchMessageException ignored) {
       postValue(null);
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messageprocessingalarm/RoutineMessageFetchReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/messageprocessingalarm/RoutineMessageFetchReceiver.java
index a61bef687a..842e437eca 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messageprocessingalarm/RoutineMessageFetchReceiver.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messageprocessingalarm/RoutineMessageFetchReceiver.java
@@ -14,11 +14,11 @@
 import org.signal.core.util.PendingIntentFlags;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JobTracker;
 import org.thoughtcrime.securesms.jobs.MessageFetchJob;
 import org.thoughtcrime.securesms.service.ExportedBroadcastReceiver;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 
 import java.util.Locale;
 import java.util.Optional;
@@ -43,12 +43,12 @@ public void onReceiveUnlock(@NonNull Context context, @NonNull Intent intent) {
       startOrUpdateAlarm(context);
     } else if (BROADCAST_ACTION.equals(intent.getAction())) {
 
-      if (ApplicationDependencies.getAppForegroundObserver().isForegrounded()) {
+      if (AppDependencies.getAppForegroundObserver().isForegrounded()) {
         Log.i(TAG, "App is foregrounded");
         return;
       }
 
-      long foregroundDelayMs = FeatureFlags.getBackgroundMessageProcessForegroundDelay();
+      long foregroundDelayMs = RemoteConfig.getBackgroundMessageProcessForegroundDelay();
       long jobTimeout        = foregroundDelayMs + 200;
 
       Log.i(TAG, String.format(Locale.US, "Starting PushNotificationReceiveJob asynchronously with %d delay before foreground shown", foregroundDelayMs));
@@ -60,8 +60,8 @@ public void onReceiveUnlock(@NonNull Context context, @NonNull Intent intent) {
       SignalExecutors.BOUNDED.submit(() -> {
         Log.i(TAG, "Running PushNotificationReceiveJob");
 
-        Optional<JobTracker.JobState> jobState = ApplicationDependencies.getJobManager()
-                                                                        .runSynchronously(new MessageFetchJob(), jobTimeout);
+        Optional<JobTracker.JobState> jobState = AppDependencies.getJobManager()
+                                                                .runSynchronously(new MessageFetchJob(), jobTimeout);
 
         Log.i(TAG, "PushNotificationReceiveJob ended: " + (jobState.isPresent() ? jobState.get().toString() : "Job did not complete"));
       });
@@ -76,7 +76,7 @@ public static void startOrUpdateAlarm(@NonNull Context context) {
     PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 123, alarmIntent, PendingIntentFlags.updateCurrent());
     AlarmManager  alarmManager  = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
 
-    long interval = FeatureFlags.getBackgroundMessageProcessInterval();
+    long interval = RemoteConfig.getBackgroundMessageProcessInterval();
 
     if (interval < 0) {
       alarmManager.cancel(pendingIntent);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/CalleeMustAcceptMessageRequestActivity.java b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/CalleeMustAcceptMessageRequestActivity.java
index 926a474dc9..db79336ee6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/CalleeMustAcceptMessageRequestActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/CalleeMustAcceptMessageRequestActivity.java
@@ -19,9 +19,6 @@
 import org.thoughtcrime.securesms.BaseActivity;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.AvatarImageView;
-import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
-import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 
 import java.util.concurrent.TimeUnit;
@@ -62,7 +59,6 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
     avatar      = findViewById(R.id.avatar);
     okay        = findViewById(R.id.okay);
 
-    avatar.setFallbackPhotoProvider(new FallbackPhotoProvider());
     okay.setOnClickListener(v -> finish());
 
     RecipientId                                     recipientId = getIntent().getParcelableExtra(RECIPIENT_ID_EXTRA);
@@ -94,11 +90,4 @@ public void onPause() {
 
     handler.removeCallbacks(finisher);
   }
-
-  private static class FallbackPhotoProvider extends Recipient.FallbackPhotoProvider {
-    @Override
-    public @NonNull FallbackContactPhoto getPhotoForRecipientWithoutName() {
-      return new ResourceContactPhoto(R.drawable.ic_profile_80);
-    }
-  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java
index 3886aa414d..f76bb2c2a4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java
@@ -15,7 +15,7 @@
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.ThreadTable;
 import org.thoughtcrime.securesms.database.model.GroupRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupChangeException;
 import org.thoughtcrime.securesms.groups.GroupManager;
 import org.thoughtcrime.securesms.groups.ui.GroupChangeErrorCallback;
@@ -200,7 +200,7 @@ public void acceptMessageRequest(@NonNull RecipientId recipientId,
         MessageSender.sendProfileKey(threadId);
 
         List<MessageTable.MarkedMessageInfo> messageIds = SignalDatabase.threads().setEntireThreadRead(threadId);
-        ApplicationDependencies.getMessageNotifier().updateNotification(context);
+        AppDependencies.getMessageNotifier().updateNotification(context);
         MarkReadReceiver.process(messageIds);
 
         List<MessageTable.MarkedMessageInfo> viewedInfos = SignalDatabase.messages().getViewedIncomingMessages(threadId);
@@ -208,7 +208,7 @@ public void acceptMessageRequest(@NonNull RecipientId recipientId,
         SendViewedReceiptJob.enqueue(threadId, recipientId, viewedInfos);
 
         if (TextSecurePreferences.isMultiDevice(context)) {
-          ApplicationDependencies.getJobManager().add(MultiDeviceMessageRequestResponseJob.forAccept(recipientId));
+          AppDependencies.getJobManager().add(MultiDeviceMessageRequestResponseJob.forAccept(recipientId));
         }
 
         insertMessageRequestAccept(recipient, threadId);
@@ -270,11 +270,11 @@ public void deleteMessageRequest(@NonNull RecipientId recipientId,
       }
 
       if (TextSecurePreferences.isMultiDevice(context)) {
-        ApplicationDependencies.getJobManager().add(MultiDeviceMessageRequestResponseJob.forDelete(recipientId));
+        AppDependencies.getJobManager().add(MultiDeviceMessageRequestResponseJob.forDelete(recipientId));
       }
 
       ThreadTable threadTable = SignalDatabase.threads();
-      threadTable.deleteConversation(threadId);
+      threadTable.deleteConversation(threadId, false);
 
       onMessageRequestDeleted.run();
     });
@@ -308,7 +308,7 @@ public void blockMessageRequest(@NonNull RecipientId recipientId,
       Recipient.live(recipientId).refresh();
 
       if (TextSecurePreferences.isMultiDevice(context)) {
-        ApplicationDependencies.getJobManager().add(MultiDeviceMessageRequestResponseJob.forBlock(recipientId));
+        AppDependencies.getJobManager().add(MultiDeviceMessageRequestResponseJob.forBlock(recipientId));
       }
 
       onMessageRequestBlocked.run();
@@ -365,10 +365,10 @@ public void blockAndReportSpamMessageRequest(@NonNull RecipientId recipientId,
 
       Recipient.live(recipientId).refresh();
 
-      ApplicationDependencies.getJobManager().add(new ReportSpamJob(threadId, System.currentTimeMillis()));
+      AppDependencies.getJobManager().add(new ReportSpamJob(threadId, System.currentTimeMillis()));
 
       if (TextSecurePreferences.isMultiDevice(context)) {
-        ApplicationDependencies.getJobManager().add(MultiDeviceMessageRequestResponseJob.forBlockAndReportSpam(recipientId));
+        AppDependencies.getJobManager().add(MultiDeviceMessageRequestResponseJob.forBlockAndReportSpam(recipientId));
       }
 
       onMessageRequestBlocked.run();
@@ -392,10 +392,10 @@ private void reportSpamMessageRequest(@NonNull RecipientId recipientId,
         Log.w(TAG, "Unable to insert report spam message", e);
       }
 
-      ApplicationDependencies.getJobManager().add(new ReportSpamJob(threadId, System.currentTimeMillis()));
+      AppDependencies.getJobManager().add(new ReportSpamJob(threadId, System.currentTimeMillis()));
 
       if (TextSecurePreferences.isMultiDevice(context)) {
-        ApplicationDependencies.getJobManager().add(MultiDeviceMessageRequestResponseJob.forReportSpam(recipientId));
+        AppDependencies.getJobManager().add(MultiDeviceMessageRequestResponseJob.forReportSpam(recipientId));
       }
 
       onReported.run();
@@ -420,7 +420,7 @@ public void unblockAndAccept(@NonNull RecipientId recipientId, @NonNull Runnable
       RecipientUtil.unblock(recipient);
 
       if (TextSecurePreferences.isMultiDevice(context)) {
-        ApplicationDependencies.getJobManager().add(MultiDeviceMessageRequestResponseJob.forAccept(recipientId));
+        AppDependencies.getJobManager().add(MultiDeviceMessageRequestResponseJob.forAccept(recipientId));
       }
 
       onMessageRequestUnblocked.run();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsBottomView.kt b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsBottomView.kt
index 0dd3d06c25..96dc8f9b6c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsBottomView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsBottomView.kt
@@ -54,7 +54,13 @@ class MessageRequestsBottomView @JvmOverloads constructor(context: Context, attr
 
     when (messageRequestState.state) {
       MessageRequestState.State.INDIVIDUAL_BLOCKED -> {
-        val message = if (recipient.isReleaseNotes) R.string.MessageRequestBottomView_get_updates_and_news_from_s_you_wont_receive_any_updates_until_you_unblock_them else if (recipient.isRegistered) R.string.MessageRequestBottomView_do_you_want_to_let_s_message_you_wont_receive_any_messages_until_you_unblock_them else R.string.MessageRequestBottomView_do_you_want_to_let_s_message_you_wont_receive_any_messages_until_you_unblock_them_SMS
+        val message = if (recipient.isReleaseNotes) {
+          R.string.MessageRequestBottomView_get_updates_and_news_from_s_you_wont_receive_any_updates_until_you_unblock_them
+        } else if (recipient.isRegistered) {
+          R.string.MessageRequestBottomView_do_you_want_to_let_s_message_you_wont_receive_any_messages_until_you_unblock_them
+        } else {
+          R.string.MessageRequestBottomView_do_you_want_to_let_s_message_you_wont_receive_any_messages_until_you_unblock_them_SMS
+        }
         question.text = HtmlCompat.fromHtml(
           context.getString(
             message,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/CallMessageProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/CallMessageProcessor.kt
index 991fb4d208..32cc1cb212 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/CallMessageProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/CallMessageProcessor.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.messages
 
 import org.signal.ringrtc.CallId
 import org.thoughtcrime.securesms.database.model.IdentityRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.messages.MessageContentProcessor.Companion.log
 import org.thoughtcrime.securesms.messages.MessageContentProcessor.Companion.warn
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -57,9 +57,9 @@ object CallMessageProcessor {
     }
 
     val remotePeer = RemotePeer(senderRecipientId, CallId(offerId))
-    val remoteIdentityKey = ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecord(senderRecipientId).map { (_, identityKey): IdentityRecord -> identityKey.serialize() }.get()
+    val remoteIdentityKey = AppDependencies.protocolStore.aci().identities().getIdentityRecord(senderRecipientId).map { (_, identityKey): IdentityRecord -> identityKey.serialize() }.get()
 
-    ApplicationDependencies.getSignalCallManager()
+    AppDependencies.signalCallManager
       .receivedOffer(
         CallMetadata(remotePeer, metadata.sourceDeviceId),
         OfferMetadata(offer.opaque?.toByteArray(), OfferMessage.Type.fromProto(offer.type!!)),
@@ -87,9 +87,9 @@ object CallMessageProcessor {
     }
 
     val remotePeer = RemotePeer(senderRecipientId, CallId(answerId))
-    val remoteIdentityKey = ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecord(senderRecipientId).map { (_, identityKey): IdentityRecord -> identityKey.serialize() }.get()
+    val remoteIdentityKey = AppDependencies.protocolStore.aci().identities().getIdentityRecord(senderRecipientId).map { (_, identityKey): IdentityRecord -> identityKey.serialize() }.get()
 
-    ApplicationDependencies.getSignalCallManager()
+    AppDependencies.signalCallManager
       .receivedAnswer(
         CallMetadata(remotePeer, metadata.sourceDeviceId),
         AnswerMetadata(answer.opaque?.toByteArray()),
@@ -117,7 +117,7 @@ object CallMessageProcessor {
 
     if (iceCandidates.isNotEmpty()) {
       val remotePeer = RemotePeer(senderRecipientId, CallId(callId))
-      ApplicationDependencies.getSignalCallManager()
+      AppDependencies.signalCallManager
         .receivedIceCandidates(
           CallMetadata(remotePeer, metadata.sourceDeviceId),
           iceCandidates
@@ -143,7 +143,7 @@ object CallMessageProcessor {
     }
 
     val remotePeer = RemotePeer(senderRecipientId, CallId(hangupId))
-    ApplicationDependencies.getSignalCallManager()
+    AppDependencies.signalCallManager
       .receivedCallHangup(
         CallMetadata(remotePeer, metadata.sourceDeviceId),
         HangupMetadata(HangupMessage.Type.fromProto(hangup.type), hangupDeviceId ?: 0)
@@ -161,7 +161,7 @@ object CallMessageProcessor {
     }
 
     val remotePeer = RemotePeer(senderRecipientId, CallId(busyId))
-    ApplicationDependencies.getSignalCallManager().receivedCallBusy(CallMetadata(remotePeer, metadata.sourceDeviceId))
+    AppDependencies.signalCallManager.receivedCallBusy(CallMetadata(remotePeer, metadata.sourceDeviceId))
   }
 
   private fun handleCallOpaqueMessage(envelope: Envelope, metadata: EnvelopeMetadata, opaque: Opaque, senderServiceId: ServiceId, serverDeliveredTimestamp: Long) {
@@ -179,7 +179,7 @@ object CallMessageProcessor {
       messageAgeSeconds = (serverDeliveredTimestamp - envelope.serverTimestamp!!).milliseconds.inWholeSeconds
     }
 
-    ApplicationDependencies.getSignalCallManager()
+    AppDependencies.signalCallManager
       .receivedOpaqueMessage(
         OpaqueMessageMetadata(
           senderServiceId.rawUuid,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt
index 850d0f56ab..15b26305dd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/DataMessageProcessor.kt
@@ -4,12 +4,15 @@ import ProtoUtil.isNotEmpty
 import android.content.Context
 import android.text.TextUtils
 import com.mobilecoin.lib.exceptions.SerializationException
+import okio.ByteString.Companion.toByteString
+import org.signal.core.util.Base64
 import org.signal.core.util.Hex
 import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.logging.Log
 import org.signal.core.util.orNull
 import org.signal.core.util.toOptional
 import org.signal.libsignal.zkgroup.groups.GroupSecretParams
+import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation
 import org.thoughtcrime.securesms.attachments.Attachment
 import org.thoughtcrime.securesms.attachments.PointerAttachment
 import org.thoughtcrime.securesms.attachments.TombstoneAttachment
@@ -37,8 +40,9 @@ import org.thoughtcrime.securesms.database.model.ParentStoryId.GroupReply
 import org.thoughtcrime.securesms.database.model.ReactionRecord
 import org.thoughtcrime.securesms.database.model.StickerRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
+import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
 import org.thoughtcrime.securesms.database.model.toBodyRangeList
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.BadGroupIdException
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob
@@ -85,10 +89,10 @@ import org.thoughtcrime.securesms.recipients.RecipientUtil
 import org.thoughtcrime.securesms.stickers.StickerLocator
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
 import org.thoughtcrime.securesms.util.EarlyMessageCacheEntry
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.LinkUtil
 import org.thoughtcrime.securesms.util.MediaUtil
 import org.thoughtcrime.securesms.util.MessageConstraintsUtil
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.SignalLocalMetrics
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.isStory
@@ -188,15 +192,15 @@ object DataMessageProcessor {
     }
 
     if (metadata.sealedSender && messageId != null) {
-      SignalExecutors.BOUNDED.execute { ApplicationDependencies.getJobManager().add(SendDeliveryReceiptJob(senderRecipient.id, message.timestamp!!, messageId)) }
+      SignalExecutors.BOUNDED.execute { AppDependencies.jobManager.add(SendDeliveryReceiptJob(senderRecipient.id, message.timestamp!!, messageId)) }
     } else if (!metadata.sealedSender) {
       if (RecipientUtil.shouldHaveProfileKey(threadRecipient)) {
         Log.w(MessageContentProcessor.TAG, "Received an unsealed sender message from " + senderRecipient.id + ", but they should already have our profile key. Correcting.")
 
         if (groupId != null) {
           Log.i(MessageContentProcessor.TAG, "Message was to a GV2 group. Ensuring our group profile keys are up to date.")
-          ApplicationDependencies
-            .getJobManager()
+          AppDependencies
+            .jobManager
             .startChain(RefreshAttributesJob(false))
             .then(GroupV2UpdateSelfProfileKeyJob.withQueueLimits(groupId))
             .enqueue()
@@ -204,8 +208,8 @@ object DataMessageProcessor {
           Log.i(MessageContentProcessor.TAG, "Message was to a 1:1. Ensuring this user has our profile key.")
           val profileSendJob = ProfileKeySendJob.create(SignalDatabase.threads.getOrCreateThreadIdFor(threadRecipient), true)
           if (profileSendJob != null) {
-            ApplicationDependencies
-              .getJobManager()
+            AppDependencies
+              .jobManager
               .startChain(RefreshAttributesJob(false))
               .then(profileSendJob)
               .enqueue()
@@ -215,11 +219,11 @@ object DataMessageProcessor {
     }
 
     if (insertResult != null && insertResult.threadWasNewlyCreated && !threadRecipient.isGroup && !threadRecipient.isSelf && !senderRecipient.isSystemContact) {
-      val timeSinceLastSync = System.currentTimeMillis() - SignalStore.misc().lastCdsForegroundSyncTime
-      if (timeSinceLastSync > FeatureFlags.cdsForegroundSyncInterval() || timeSinceLastSync < 0) {
+      val timeSinceLastSync = System.currentTimeMillis() - SignalStore.misc.lastCdsForegroundSyncTime
+      if (timeSinceLastSync > RemoteConfig.cdsForegroundSyncInterval || timeSinceLastSync < 0) {
         log(envelope.timestamp!!, "New 1:1 chat. Scheduling a CDS sync to see if they match someone in our contacts.")
-        ApplicationDependencies.getJobManager().add(DirectoryRefreshJob(false))
-        SignalStore.misc().lastCdsForegroundSyncTime = System.currentTimeMillis()
+        AppDependencies.jobManager.add(DirectoryRefreshJob(false))
+        SignalStore.misc.lastCdsForegroundSyncTime = System.currentTimeMillis()
       } else {
         warn(envelope.timestamp!!, "New 1:1 chat, but performed a CDS sync $timeSinceLastSync ms ago, which is less than our threshold. Skipping CDS sync.")
       }
@@ -274,7 +278,7 @@ object DataMessageProcessor {
     val insertResult: InsertResult? = insertPlaceholder(sender, timestamp, groupId)
     if (insertResult != null) {
       SignalDatabase.messages.markAsInvalidMessage(insertResult.messageId)
-      ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(insertResult.threadId))
+      AppDependencies.messageNotifier.updateNotification(context, ConversationId.forConversation(insertResult.threadId))
     }
   }
 
@@ -299,9 +303,9 @@ object DataMessageProcessor {
     val insertResult: InsertResult? = SignalDatabase.messages.insertMessageInbox(incomingMessage).orNull()
 
     return if (insertResult != null) {
-      ApplicationDependencies.getProtocolStore().aci().deleteAllSessions(metadata.sourceServiceId.toString())
+      AppDependencies.protocolStore.aci().deleteAllSessions(metadata.sourceServiceId.toString())
       SecurityEvent.broadcastSecurityUpdateEvent(context)
-      ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(insertResult.threadId))
+      AppDependencies.messageNotifier.updateNotification(context, ConversationId.forConversation(insertResult.threadId))
       insertResult
     } else {
       null
@@ -456,9 +460,9 @@ object DataMessageProcessor {
         SignalDatabase.messages.setTransactionSuccessful()
 
         if (parentStoryId.isGroupReply()) {
-          ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.fromThreadAndReply(insertResult.threadId, parentStoryId as GroupReply))
+          AppDependencies.messageNotifier.updateNotification(context, ConversationId.fromThreadAndReply(insertResult.threadId, parentStoryId as GroupReply))
         } else {
-          ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(insertResult.threadId))
+          AppDependencies.messageNotifier.updateNotification(context, ConversationId.forConversation(insertResult.threadId))
           TrimThreadJob.enqueueAsync(insertResult.threadId)
         }
 
@@ -510,7 +514,7 @@ object DataMessageProcessor {
     if (targetMessage == null) {
       warn(envelope.timestamp!!, "[handleReaction] Could not find matching message! Putting it in the early message cache. timestamp: " + targetSentTimestamp + "  author: " + targetAuthor.id)
       if (earlyMessageCacheEntry != null) {
-        ApplicationDependencies.getEarlyMessageCache().store(targetAuthor.id, targetSentTimestamp, earlyMessageCacheEntry)
+        AppDependencies.earlyMessageCache.store(targetAuthor.id, targetSentTimestamp, earlyMessageCacheEntry)
         PushProcessEarlyMessagesJob.enqueue()
       }
       return null
@@ -543,11 +547,11 @@ object DataMessageProcessor {
 
     if (isRemove) {
       SignalDatabase.reactions.deleteReaction(targetMessageId, senderRecipientId)
-      ApplicationDependencies.getMessageNotifier().updateNotification(context)
+      AppDependencies.messageNotifier.updateNotification(context)
     } else {
       val reactionRecord = ReactionRecord(emoji!!, senderRecipientId, message.timestamp!!, System.currentTimeMillis())
       SignalDatabase.reactions.addReaction(targetMessageId, reactionRecord)
-      ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.fromMessageRecord(targetMessage))
+      AppDependencies.messageNotifier.updateNotification(context, ConversationId.fromMessageRecord(targetMessage))
     }
 
     return targetMessageId
@@ -567,13 +571,13 @@ object DataMessageProcessor {
         SignalDatabase.messages.deleteRemotelyDeletedStory(targetMessage.id)
       }
 
-      ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.fromMessageRecord(targetMessage))
+      AppDependencies.messageNotifier.updateNotification(context, ConversationId.fromMessageRecord(targetMessage))
 
       MessageId(targetMessage.id)
     } else if (targetMessage == null) {
       warn(envelope.timestamp!!, "[handleRemoteDelete] Could not find matching message! timestamp: $targetSentTimestamp  author: $senderRecipientId")
       if (earlyMessageCacheEntry != null) {
-        ApplicationDependencies.getEarlyMessageCache().store(senderRecipientId, targetSentTimestamp, earlyMessageCacheEntry)
+        AppDependencies.earlyMessageCache.store(senderRecipientId, targetSentTimestamp, earlyMessageCacheEntry)
         PushProcessEarlyMessagesJob.enqueue()
       }
 
@@ -667,7 +671,7 @@ object DataMessageProcessor {
 
       val insertResult: InsertResult? = SignalDatabase.messages.insertMessageInbox(mediaMessage, -1).orNull()
       if (insertResult != null) {
-        ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(insertResult.threadId))
+        AppDependencies.messageNotifier.updateNotification(context, ConversationId.forConversation(insertResult.threadId))
         return insertResult
       }
     } catch (e: PublicKeyConflictException) {
@@ -678,7 +682,7 @@ object DataMessageProcessor {
       throw StorageFailedException(e, metadata.sourceServiceId.toString(), metadata.sourceDeviceId)
     } finally {
       SignalDatabase.runPostSuccessfulTransaction {
-        ApplicationDependencies.getJobManager()
+        AppDependencies.jobManager
           .startChain(PaymentTransactionCheckJob(uuid, queue))
           .then(PaymentLedgerUpdateJob.updateLedger())
           .enqueue()
@@ -786,9 +790,9 @@ object DataMessageProcessor {
         SignalDatabase.messages.setTransactionSuccessful()
 
         if (parentStoryId.isGroupReply()) {
-          ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.fromThreadAndReply(insertResult.threadId, parentStoryId as GroupReply))
+          AppDependencies.messageNotifier.updateNotification(context, ConversationId.fromThreadAndReply(insertResult.threadId, parentStoryId as GroupReply))
         } else {
-          ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(insertResult.threadId))
+          AppDependencies.messageNotifier.updateNotification(context, ConversationId.forConversation(insertResult.threadId))
           TrimThreadJob.enqueueAsync(insertResult.threadId)
         }
 
@@ -904,14 +908,14 @@ object DataMessageProcessor {
               AttachmentDownloadJob(insertResult.messageId, attachmentId, false)
             }
           }
-          ApplicationDependencies.getJobManager().addAll(downloadJobs)
+          AppDependencies.jobManager.addAll(downloadJobs)
         }
 
-        ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(insertResult.threadId))
+        AppDependencies.messageNotifier.updateNotification(context, ConversationId.forConversation(insertResult.threadId))
         TrimThreadJob.enqueueAsync(insertResult.threadId)
 
         if (message.isViewOnce == true) {
-          ApplicationDependencies.getViewOnceMessageManager().scheduleIfNecessary()
+          AppDependencies.viewOnceMessageManager.scheduleIfNecessary()
         }
       }
 
@@ -958,7 +962,7 @@ object DataMessageProcessor {
     localMetrics?.onInsertedTextMessage()
 
     return if (insertResult != null) {
-      ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(insertResult.threadId))
+      AppDependencies.messageNotifier.updateNotification(context, ConversationId.forConversation(insertResult.threadId))
       insertResult
     } else {
       null
@@ -997,7 +1001,7 @@ object DataMessageProcessor {
 
     if (threadId > 0 && TextSecurePreferences.isTypingIndicatorsEnabled(context)) {
       debug("Typing stopped on thread $threadId due to an incoming message.")
-      ApplicationDependencies.getTypingStatusRepository().onTypingStopped(threadId, senderRecipient, device, true)
+      AppDependencies.typingStatusRepository.onTypingStopped(threadId, senderRecipient, device, true)
     }
   }
 
@@ -1038,12 +1042,7 @@ object DataMessageProcessor {
       return null
     }
 
-    val authorAci = ServiceId.parseOrThrow(quote.authorAci!!)
-    if (authorAci.isUnknown) {
-      warn(timestamp, "Received quote from an unknown author! Ignoring...")
-      return null
-    }
-    val authorId = Recipient.externalPush(authorAci).id
+    val authorId = Recipient.externalPush(ServiceId.parseOrThrow(quote.authorAci!!)).id
     var quotedMessage = SignalDatabase.messages.getMessageFor(quote.id!!, authorId) as? MmsMessageRecord
 
     if (quotedMessage != null && !quotedMessage.isRemoteDelete) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/EditMessageProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/EditMessageProcessor.kt
index 6fc3dd2a7c..98b4ef20d3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/EditMessageProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/EditMessageProcessor.kt
@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
 import org.thoughtcrime.securesms.database.model.toBodyRangeList
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob
 import org.thoughtcrime.securesms.jobs.PushProcessEarlyMessagesJob
@@ -56,7 +56,7 @@ object EditMessageProcessor {
       warn(envelope.timestamp!!, "[handleEditMessage] Could not find matching message! timestamp: ${editMessage.targetSentTimestamp}  author: ${senderRecipient.id}")
 
       if (earlyMessageCacheEntry != null) {
-        ApplicationDependencies.getEarlyMessageCache().store(senderRecipient.id, editMessage.targetSentTimestamp!!, earlyMessageCacheEntry)
+        AppDependencies.earlyMessageCache.store(senderRecipient.id, editMessage.targetSentTimestamp!!, earlyMessageCacheEntry)
         PushProcessEarlyMessagesJob.enqueue()
       }
 
@@ -95,11 +95,11 @@ object EditMessageProcessor {
 
     if (insertResult != null) {
       SignalExecutors.BOUNDED.execute {
-        ApplicationDependencies.getJobManager().add(SendDeliveryReceiptJob(senderRecipient.id, message.timestamp!!, MessageId(insertResult.messageId)))
+        AppDependencies.jobManager.add(SendDeliveryReceiptJob(senderRecipient.id, message.timestamp!!, MessageId(insertResult.messageId)))
       }
 
       if (targetMessage.expireStarted > 0) {
-        ApplicationDependencies.getExpiringMessageManager()
+        AppDependencies.expiringMessageManager
           .scheduleDeletion(
             insertResult.messageId,
             true,
@@ -108,7 +108,7 @@ object EditMessageProcessor {
           )
       }
 
-      ApplicationDependencies.getMessageNotifier().updateNotification(context, forConversation(insertResult.threadId))
+      AppDependencies.messageNotifier.updateNotification(context, forConversation(insertResult.threadId))
     }
   }
 
@@ -166,7 +166,7 @@ object EditMessageProcessor {
         val downloadJobs: List<AttachmentDownloadJob> = insertResult.insertedAttachments.mapNotNull { (_, attachmentId) ->
           AttachmentDownloadJob(insertResult.messageId, attachmentId, false)
         }
-        ApplicationDependencies.getJobManager().addAll(downloadJobs)
+        AppDependencies.jobManager.addAll(downloadJobs)
       }
     }
     return insertResult
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/GroupSendEndorsementInternalNotifier.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/GroupSendEndorsementInternalNotifier.kt
new file mode 100644
index 0000000000..4a91b05b4e
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/GroupSendEndorsementInternalNotifier.kt
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.messages
+
+import android.app.Notification
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import org.signal.core.util.PendingIntentFlags
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.logsubmit.SubmitDebugLogActivity
+import org.thoughtcrime.securesms.notifications.NotificationChannels
+import org.thoughtcrime.securesms.notifications.NotificationIds
+import org.thoughtcrime.securesms.util.RemoteConfig
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.minutes
+
+/**
+ * Internal user only notifier when "bad" things happen with group send endorsement sends.
+ */
+object GroupSendEndorsementInternalNotifier : SealedSenderAccess.FallbackListener {
+
+  private const val TAG = "GSENotifier"
+
+  private var lastGroupSendNotify: Duration = 0.milliseconds
+  private var skippedGroupSendNotifies = 0
+
+  private var lastMissingNotify: Duration = 0.milliseconds
+
+  private var lastFallbackNotify: Duration = 0.milliseconds
+
+  @JvmStatic
+  fun init() {
+    if (RemoteConfig.internalUser) {
+      SealedSenderAccess.fallbackListener = this
+    }
+  }
+
+  override fun onAccessToTokenFallback() {
+    Log.w(TAG, "Fallback from access key to token", Throwable())
+    postFallbackError(AppDependencies.application)
+  }
+
+  override fun onTokenToAccessFallback(hasAccessKeyFallback: Boolean) {
+    Log.w(TAG, "Fallback from token hasAccessKey=$hasAccessKeyFallback", Throwable())
+    postFallbackError(AppDependencies.application)
+  }
+
+  @JvmStatic
+  fun postGroupSendFallbackError(context: Context) {
+    val now = System.currentTimeMillis().milliseconds
+    if (lastGroupSendNotify + 5.minutes > now && skippedGroupSendNotifies < 5) {
+      skippedGroupSendNotifies++
+      return
+    }
+
+    val notification: Notification = NotificationCompat.Builder(context, NotificationChannels.getInstance().FAILURES)
+      .setSmallIcon(R.drawable.ic_notification)
+      .setContentTitle("[Internal-only] GSE failed for group send")
+      .setContentText("Please tap to send a debug log")
+      .setContentIntent(PendingIntent.getActivity(context, 0, Intent(context, SubmitDebugLogActivity::class.java), PendingIntentFlags.mutable()))
+      .build()
+
+    NotificationManagerCompat.from(context).notify(NotificationIds.INTERNAL_ERROR, notification)
+
+    lastGroupSendNotify = now
+    skippedGroupSendNotifies = 0
+  }
+
+  @JvmStatic
+  fun postMissingGroupSendEndorsement(context: Context) {
+    val now = System.currentTimeMillis().milliseconds
+    if (lastMissingNotify + 5.minutes > now) {
+      return
+    }
+
+    val notification: Notification = NotificationCompat.Builder(context, NotificationChannels.getInstance().FAILURES)
+      .setSmallIcon(R.drawable.ic_notification)
+      .setContentTitle("[Internal-only] GSE missing for recipient")
+      .setContentText("Please tap to send a debug log")
+      .setContentIntent(PendingIntent.getActivity(context, 0, Intent(context, SubmitDebugLogActivity::class.java), PendingIntentFlags.mutable()))
+      .build()
+
+    NotificationManagerCompat.from(context).notify(NotificationIds.INTERNAL_ERROR, notification)
+
+    lastMissingNotify = now
+  }
+
+  @JvmStatic
+  fun postFallbackError(context: Context) {
+    val now = System.currentTimeMillis().milliseconds
+    if (lastFallbackNotify + 5.minutes > now) {
+      return
+    }
+
+    val notification: Notification = NotificationCompat.Builder(context, NotificationChannels.getInstance().FAILURES)
+      .setSmallIcon(R.drawable.ic_notification)
+      .setContentTitle("[Internal-only] GSE fallback occurred!")
+      .setContentText("Please tap to send a debug log")
+      .setContentIntent(PendingIntent.getActivity(context, 0, Intent(context, SubmitDebugLogActivity::class.java), PendingIntentFlags.mutable()))
+      .build()
+
+    NotificationManagerCompat.from(context).notify(NotificationIds.INTERNAL_ERROR, notification)
+
+    lastFallbackNotify = now
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/GroupSendUtil.java b/app/src/main/java/org/thoughtcrime/securesms/messages/GroupSendUtil.java
index a9cdf11ad1..7342c78ca1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/GroupSendUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/GroupSendUtil.java
@@ -7,34 +7,44 @@
 import androidx.annotation.WorkerThread;
 
 import org.signal.core.util.logging.Log;
+import org.signal.libsignal.metadata.certificate.SenderCertificate;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.InvalidRegistrationIdException;
 import org.signal.libsignal.protocol.NoSessionException;
+import org.signal.libsignal.zkgroup.groups.GroupSecretParams;
+import org.signal.libsignal.zkgroup.groupsend.GroupSendEndorsement;
+import org.signal.libsignal.zkgroup.groupsend.GroupSendFullToken;
 import org.thoughtcrime.securesms.crypto.SenderKeyUtil;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
-import org.thoughtcrime.securesms.database.model.GroupRecord;
+import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil;
 import org.thoughtcrime.securesms.database.MessageSendLogTables;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.DistributionListId;
+import org.thoughtcrime.securesms.database.model.GroupRecord;
+import org.thoughtcrime.securesms.database.model.GroupSendEndorsementRecords;
 import org.thoughtcrime.securesms.database.model.MessageId;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
+import org.thoughtcrime.securesms.groups.GroupChangeException;
 import org.thoughtcrime.securesms.groups.GroupId;
+import org.thoughtcrime.securesms.groups.GroupManager;
+import org.thoughtcrime.securesms.jobs.RequestGroupV2InfoJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.RecipientAccessList;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.SignalLocalMetrics;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.signalservice.api.CancelationException;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender.LegacyGroupEvents;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender.SenderKeyGroupEvents;
 import org.whispersystems.signalservice.api.crypto.ContentHint;
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
+import org.whispersystems.signalservice.api.groupsv2.GroupSendEndorsements;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceEditMessage;
@@ -43,6 +53,7 @@
 import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
 import org.whispersystems.signalservice.api.messages.calls.SignalServiceCallMessage;
 import org.whispersystems.signalservice.api.push.DistributionId;
+import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.NotFoundException;
 import org.whispersystems.signalservice.api.util.Preconditions;
@@ -52,6 +63,7 @@
 import org.whispersystems.signalservice.internal.push.http.PartialSendCompleteListener;
 
 import java.io.IOException;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -65,7 +77,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 public final class GroupSendUtil {
 
@@ -249,28 +260,81 @@ private static List<SendMessageResult> sendMessage(@NonNull Context context,
     Set<Recipient>  unregisteredTargets = allTargets.stream().filter(Recipient::isUnregistered).collect(Collectors.toSet());
     List<Recipient> registeredTargets   = allTargets.stream().filter(r -> !unregisteredTargets.contains(r)).collect(Collectors.toList());
 
-    RecipientData         recipients  = new RecipientData(context, registeredTargets, isStorySend);
-    Optional<GroupRecord> groupRecord = groupId != null ? SignalDatabase.groups().getGroup(groupId) : Optional.empty();
+    RecipientData               recipients                     = new RecipientData(context, registeredTargets, isStorySend);
+    Optional<GroupRecord>       groupRecord                    = groupId != null ? SignalDatabase.groups().getGroup(groupId) : Optional.empty();
+    GroupSendEndorsementRecords groupSendEndorsementRecords    = groupRecord.filter(GroupRecord::isV2Group).map(g -> SignalDatabase.groups().getGroupSendEndorsements(g.getId())).orElse(null);
+    long                        groupSendEndorsementExpiration = groupRecord.map(GroupRecord::getGroupSendEndorsementExpiration).orElse(0L);
+    SenderCertificate           senderCertificate              = SealedSenderAccessUtil.getSealedSenderCertificate();
+    boolean                     useGroupSendEndorsements       = groupSendEndorsementRecords != null;
+
+    if (useGroupSendEndorsements && senderCertificate == null) {
+      Log.w(TAG, "Can't use group send endorsements without a sealed sender certificate, falling back to access key");
+      useGroupSendEndorsements = false;
+    } else if (useGroupSendEndorsements) {
+      boolean refreshGroupSendEndorsements = false;
+
+      if (groupSendEndorsementExpiration == 0) {
+        Log.i(TAG, "No group send endorsements expiration set, need to refresh");
+        refreshGroupSendEndorsements = true;
+      } else if (groupSendEndorsementExpiration - TimeUnit.HOURS.toMillis(2) < System.currentTimeMillis()) {
+        Log.i(TAG, "Group send endorsements are expired or expire imminently, refresh. Expires in " + (groupSendEndorsementExpiration - System.currentTimeMillis()) + "ms");
+        refreshGroupSendEndorsements = true;
+      } else if (groupSendEndorsementRecords.isMissingAnyEndorsements()) {
+        Log.i(TAG, "Missing group send endorsements for some members, refresh.");
+        refreshGroupSendEndorsements = true;
+      }
+
+      if (refreshGroupSendEndorsements) {
+        try {
+          GroupManager.updateGroupSendEndorsements(context, groupRecord.get().requireV2GroupProperties().getGroupMasterKey());
+
+          groupSendEndorsementExpiration = SignalDatabase.groups().getGroupSendEndorsementsExpiration(groupId);
+          groupSendEndorsementRecords    = SignalDatabase.groups().getGroupSendEndorsements(groupId);
+        } catch (GroupChangeException | IOException e) {
+          if (groupSendEndorsementExpiration == 0) {
+            Log.w(TAG, "Unable to update group send endorsements, falling back to access key", e);
+            useGroupSendEndorsements = false;
+            groupSendEndorsementRecords = new GroupSendEndorsementRecords(Collections.emptyMap());
+          } else {
+            Log.w(TAG, "Unable to update group send endorsements, using what we have", e);
+          }
+        }
+
+        Log.d(TAG, "Refresh all group state because we needed to refresh gse");
+        AppDependencies.getJobManager().add(new RequestGroupV2InfoJob(groupId));
+      }
+    }
 
     List<Recipient> senderKeyTargets = new LinkedList<>();
     List<Recipient> legacyTargets    = new LinkedList<>();
 
     for (Recipient recipient : registeredTargets) {
-      Optional<UnidentifiedAccessPair> access          = recipients.getAccessPair(recipient.getId());
-      boolean                          validMembership = true;
+      Optional<UnidentifiedAccess> access          = recipients.getAccessPair(recipient.getId());
+      boolean                      validMembership = groupId == null || (groupRecord.isPresent() && groupRecord.get().getMembers().contains(recipient.getId()));
 
-      if (groupId != null && (!groupRecord.isPresent() || !groupRecord.get().getMembers().contains(recipient.getId()))) {
-        validMembership = false;
-      }
-
-      if (recipient.getHasServiceId() &&
-          access.isPresent() &&
-          access.get().getTargetUnidentifiedAccess().isPresent() &&
-          validMembership)
-      {
-        senderKeyTargets.add(recipient);
+      if (useGroupSendEndorsements) {
+        GroupSendEndorsement groupSendEndorsement = groupSendEndorsementRecords.getEndorsement(recipient.getId());
+        if (groupSendEndorsement != null && recipient.getHasAci() && validMembership) {
+          senderKeyTargets.add(recipient);
+        } else {
+          legacyTargets.add(recipient);
+          if (validMembership) {
+            Log.w(TAG, "Should be using group send endorsement but not found for " + recipient.getId());
+            if (RemoteConfig.internalUser()) {
+              GroupSendEndorsementInternalNotifier.postMissingGroupSendEndorsement(context);
+            }
+          }
+        }
       } else {
-        legacyTargets.add(recipient);
+        // Use sender key
+        if (recipient.getHasServiceId() &&
+            access.isPresent() &&
+            validMembership)
+        {
+          senderKeyTargets.add(recipient);
+        } else {
+          legacyTargets.add(recipient);
+        }
       }
     }
 
@@ -283,7 +347,7 @@ private static List<SendMessageResult> sendMessage(@NonNull Context context,
       senderKeyTargets.clear();
       senderKeyTargets.addAll(registeredTargets);
       legacyTargets.clear();
-    } else if (SignalStore.internalValues().removeSenderKeyMinimum()) {
+    } else if (SignalStore.internal().removeSenderKeyMinimum()) {
       Log.i(TAG, "Sender key minimum removed. Using for " + senderKeyTargets.size() + " recipients.");
     } else if (senderKeyTargets.size() < 2) {
       Log.i(TAG, "Too few sender-key-capable users (" + senderKeyTargets.size() + "). Doing all legacy sends.");
@@ -298,26 +362,48 @@ private static List<SendMessageResult> sendMessage(@NonNull Context context,
     }
 
     List<SendMessageResult>    allResults    = new ArrayList<>(allTargets.size());
-    SignalServiceMessageSender messageSender = ApplicationDependencies.getSignalServiceMessageSender();
+    SignalServiceMessageSender messageSender = AppDependencies.getSignalServiceMessageSender();
 
-    if (senderKeyTargets.size() > 0 && distributionId != null) {
+    if (Util.hasItems(senderKeyTargets) && distributionId != null) {
       long           keyCreateTime  = SenderKeyUtil.getCreateTimeForOurKey(distributionId);
       long           keyAge         = System.currentTimeMillis() - keyCreateTime;
 
-      if (keyCreateTime != -1 && keyAge > FeatureFlags.senderKeyMaxAge()) {
+      if (keyCreateTime != -1 && keyAge > RemoteConfig.senderKeyMaxAge()) {
         Log.w(TAG, "DistributionId " + distributionId + " was created at " + keyCreateTime + " and is " + (keyAge) + " ms old (~" + TimeUnit.MILLISECONDS.toDays(keyAge) + " days). Rotating.");
         SenderKeyUtil.rotateOurKey(distributionId);
       }
 
       try {
-        List<SignalServiceAddress> targets = senderKeyTargets.stream().map(r -> recipients.getAddress(r.getId())).collect(Collectors.toList());
-        List<UnidentifiedAccess>   access  = senderKeyTargets.stream().map(r -> recipients.requireAccess(r.getId())).collect(Collectors.toList());
+        List<SignalServiceAddress>               targets               = new ArrayList<>(senderKeyTargets.size());
+        List<UnidentifiedAccess>                 access                = new ArrayList<>(senderKeyTargets.size());
+        Map<ServiceId.ACI, GroupSendEndorsement> senderKeyEndorsements = new HashMap<>(senderKeyTargets.size());
+        GroupSendEndorsements                    groupSendEndorsements = null;
+
+        for (Recipient recipient : senderKeyTargets) {
+          targets.add(recipients.getAddress(recipient.getId()));
+
+          if (useGroupSendEndorsements) {
+            senderKeyEndorsements.put(recipient.requireAci(), groupSendEndorsementRecords.getEndorsement(recipient.getId()));
+            access.add(recipients.getAccess(recipient.getId()));
+          } else {
+            access.add(recipients.requireAccess(recipient.getId()));
+          }
+        }
+
+        if (useGroupSendEndorsements) {
+          groupSendEndorsements = new GroupSendEndorsements(
+              groupSendEndorsementExpiration,
+              senderKeyEndorsements,
+              senderCertificate,
+              GroupSecretParams.deriveFromMasterKey(groupRecord.get().requireV2GroupProperties().getGroupMasterKey())
+          );
+        }
 
         final MessageSendLogTables messageLogDatabase  = SignalDatabase.messageLog();
         final AtomicLong           entryId             = new AtomicLong(-1);
         final boolean              includeInMessageLog = sendOperation.shouldIncludeInMessageLog();
 
-        List<SendMessageResult> results = sendOperation.sendWithSenderKey(messageSender, distributionId, targets, access, isRecipientUpdate, partialResults -> {
+        List<SendMessageResult> results = sendOperation.sendWithSenderKey(messageSender, distributionId, targets, access, groupSendEndorsements, isRecipientUpdate, partialResults -> {
           if (!includeInMessageLog) {
             return;
           }
@@ -344,6 +430,10 @@ private static List<SendMessageResult> sendMessage(@NonNull Context context,
       } catch (InvalidUnidentifiedAccessHeaderException e) {
         Log.w(TAG, "Someone had a bad UD header. Falling back to legacy sends.", e);
         legacyTargets.addAll(senderKeyTargets);
+
+        if (useGroupSendEndorsements && RemoteConfig.internalUser()) {
+          GroupSendEndorsementInternalNotifier.postGroupSendFallbackError(context);
+        }
       } catch (NoSessionException e) {
         Log.w(TAG, "No session. Falling back to legacy sends.", e);
         legacyTargets.addAll(senderKeyTargets);
@@ -378,15 +468,32 @@ private static List<SendMessageResult> sendMessage(@NonNull Context context,
         Log.i(TAG, "Need to do a legacy send to send a sync message for a group of only ourselves.");
       }
 
-      List<SignalServiceAddress>             targets         = legacyTargets.stream().map(r -> recipients.getAddress(r.getId())).collect(Collectors.toList());
-      List<Optional<UnidentifiedAccessPair>> access          = legacyTargets.stream().map(r -> recipients.getAccessPair(r.getId())).collect(Collectors.toList());
-      boolean                                recipientUpdate = isRecipientUpdate || allResults.size() > 0;
+      List<SignalServiceAddress> legacyTargetAddresses = legacyTargets.stream().map(r -> recipients.getAddress(r.getId())).collect(Collectors.toList());
+      List<UnidentifiedAccess>   legacyTargetAccesses  = legacyTargets.stream().map(r -> recipients.getAccess(r.getId())).collect(Collectors.toList());
+      List<GroupSendFullToken>   groupSendTokens       = null;
+      boolean                    recipientUpdate       = isRecipientUpdate || allResults.size() > 0;
+
+      if (useGroupSendEndorsements) {
+        Instant           expiration        = Instant.ofEpochMilli(groupSendEndorsementExpiration);
+        GroupSecretParams groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupRecord.get().requireV2GroupProperties().getGroupMasterKey());
+
+        groupSendTokens = new ArrayList<>(legacyTargetAddresses.size());
+
+        for (Recipient r : legacyTargets) {
+          GroupSendEndorsement endorsement = groupSendEndorsementRecords.getEndorsement(r.getId());
+          if (r.getHasAci() && endorsement != null) {
+            groupSendTokens.add(endorsement.toFullToken(groupSecretParams, expiration));
+          } else {
+            groupSendTokens.add(null);
+          }
+        }
+      }
 
       final MessageSendLogTables messageLogDatabase  = SignalDatabase.messageLog();
       final AtomicLong           entryId             = new AtomicLong(-1);
       final boolean              includeInMessageLog = sendOperation.shouldIncludeInMessageLog();
 
-      List<SendMessageResult> results = sendOperation.sendLegacy(messageSender, targets, legacyTargets, access, recipientUpdate, result -> {
+      List<SendMessageResult> results = sendOperation.sendLegacy(messageSender, legacyTargetAddresses, legacyTargets, SealedSenderAccess.forFanOutGroupSend(groupSendTokens, SealedSenderAccessUtil.getSealedSenderCertificate(), legacyTargetAccesses), recipientUpdate, result -> {
         if (!includeInMessageLog) {
           return;
         }
@@ -403,7 +510,7 @@ private static List<SendMessageResult> sendMessage(@NonNull Context context,
       allResults.addAll(results);
 
       int successCount = (int) results.stream().filter(SendMessageResult::isSuccess).count();
-      Log.d(TAG, "Successfully sent using 1:1 to " + successCount + "/" + targets.size() + " legacy targets.");
+      Log.d(TAG, "Successfully sent using 1:1 to " + successCount + "/" + legacyTargetAddresses.size() + " legacy targets.");
     } else if (relatedMessageId != null) {
       SignalLocalMetrics.GroupMessageSend.onLegacyMessageSent(relatedMessageId.getId());
       SignalLocalMetrics.GroupMessageSend.onLegacySyncFinished(relatedMessageId.getId());
@@ -449,6 +556,7 @@ private interface SendOperation {
                                                        @NonNull DistributionId distributionId,
                                                        @NonNull List<SignalServiceAddress> targets,
                                                        @NonNull List<UnidentifiedAccess> access,
+                                                       @Nullable GroupSendEndorsements groupSendEndorsements,
                                                        boolean isRecipientUpdate,
                                                        @Nullable PartialSendBatchCompleteListener partialListener)
         throws NoSessionException, UntrustedIdentityException, InvalidKeyException, IOException, InvalidRegistrationIdException;
@@ -456,7 +564,7 @@ private interface SendOperation {
     @NonNull List<SendMessageResult> sendLegacy(@NonNull SignalServiceMessageSender messageSender,
                                                 @NonNull List<SignalServiceAddress> targets,
                                                 @NonNull List<Recipient> targetRecipients,
-                                                @NonNull List<Optional<UnidentifiedAccessPair>> access,
+                                                @NonNull List<SealedSenderAccess> sealedSenderAccesses,
                                                 boolean isRecipientUpdate,
                                                 @Nullable PartialSendCompleteListener partialListener,
                                                 @Nullable CancelationSignal cancelationSignal)
@@ -505,19 +613,20 @@ private DataSendOperation(@NonNull SignalServiceDataMessage message, @NonNull Co
                                                               @NonNull DistributionId distributionId,
                                                               @NonNull List<SignalServiceAddress> targets,
                                                               @NonNull List<UnidentifiedAccess> access,
+                                                              @Nullable GroupSendEndorsements groupSendEndorsements,
                                                               boolean isRecipientUpdate,
                                                               @Nullable PartialSendBatchCompleteListener partialListener)
         throws NoSessionException, UntrustedIdentityException, InvalidKeyException, IOException, InvalidRegistrationIdException
     {
       SenderKeyGroupEvents listener = relatedMessageId != null ? new SenderKeyMetricEventListener(relatedMessageId.getId()) : SenderKeyGroupEvents.EMPTY;
-      return messageSender.sendGroupDataMessage(distributionId, targets, access, isRecipientUpdate, contentHint, message, listener, urgent, isForStory, editMessage, partialListener);
+      return messageSender.sendGroupDataMessage(distributionId, targets, access, groupSendEndorsements, isRecipientUpdate, contentHint, message, listener, urgent, isForStory, editMessage, partialListener);
     }
 
     @Override
     public @NonNull List<SendMessageResult> sendLegacy(@NonNull SignalServiceMessageSender messageSender,
                                                        @NonNull List<SignalServiceAddress> targets,
                                                        @NonNull List<Recipient> targetRecipients,
-                                                       @NonNull List<Optional<UnidentifiedAccessPair>> access,
+                                                       @NonNull List<SealedSenderAccess> sealedSenderAccesses,
                                                        boolean isRecipientUpdate,
                                                        @Nullable PartialSendCompleteListener partialListener,
                                                        @Nullable CancelationSignal cancelationSignal)
@@ -525,13 +634,14 @@ private DataSendOperation(@NonNull SignalServiceDataMessage message, @NonNull Co
     {
       // PniSignatures are only needed for 1:1 messages, but some message jobs use the GroupSendUtil methods to send 1:1
       if (targets.size() == 1 && relatedMessageId == null) {
-        Recipient         targetRecipient = targetRecipients.get(0);
-        SendMessageResult result;
+        Recipient          targetRecipient    = targetRecipients.get(0);
+        SealedSenderAccess sealedSenderAccess = sealedSenderAccesses.get(0);
+        SendMessageResult  result;
 
         if (editMessage != null) {
-          result = messageSender.sendEditMessage(targets.get(0), access.get(0), contentHint, message, SignalServiceMessageSender.IndividualSendEvents.EMPTY, urgent, editMessage.getTargetSentTimestamp());
+          result = messageSender.sendEditMessage(targets.get(0), sealedSenderAccess, contentHint, message, SignalServiceMessageSender.IndividualSendEvents.EMPTY, urgent, editMessage.getTargetSentTimestamp());
         } else {
-          result = messageSender.sendDataMessage(targets.get(0), access.get(0), contentHint, message, SignalServiceMessageSender.IndividualSendEvents.EMPTY, urgent, targetRecipient.getNeedsPniSignature());
+          result = messageSender.sendDataMessage(targets.get(0), sealedSenderAccess, contentHint, message, SignalServiceMessageSender.IndividualSendEvents.EMPTY, urgent, targetRecipient.getNeedsPniSignature());
         }
 
         if (targetRecipient.getNeedsPniSignature()) {
@@ -541,10 +651,11 @@ private DataSendOperation(@NonNull SignalServiceDataMessage message, @NonNull Co
         return Collections.singletonList(result);
       } else {
         LegacyGroupEvents listener = relatedMessageId != null ? new LegacyMetricEventListener(relatedMessageId.getId()) : LegacyGroupEvents.EMPTY;
+
         if (editMessage != null) {
-          return messageSender.sendEditMessage(targets, access, isRecipientUpdate, contentHint, message, listener, partialListener, cancelationSignal, urgent, editMessage.getTargetSentTimestamp());
+          return messageSender.sendEditMessage(targets, sealedSenderAccesses, isRecipientUpdate, contentHint, message, listener, partialListener, cancelationSignal, urgent, editMessage.getTargetSentTimestamp());
         } else {
-          return messageSender.sendDataMessage(targets, access, isRecipientUpdate, contentHint, message, listener, partialListener, cancelationSignal, urgent);
+          return messageSender.sendDataMessage(targets, sealedSenderAccesses, isRecipientUpdate, contentHint, message, listener, partialListener, cancelationSignal, urgent);
         }
       }
     }
@@ -592,11 +703,12 @@ private TypingSendOperation(@NonNull SignalServiceTypingMessage message) {
                                                               @NonNull DistributionId distributionId,
                                                               @NonNull List<SignalServiceAddress> targets,
                                                               @NonNull List<UnidentifiedAccess> access,
+                                                              @Nullable GroupSendEndorsements groupSendEndorsements,
                                                               boolean isRecipientUpdate,
                                                               @Nullable PartialSendBatchCompleteListener partialListener)
         throws NoSessionException, UntrustedIdentityException, InvalidKeyException, IOException, InvalidRegistrationIdException
     {
-      messageSender.sendGroupTyping(distributionId, targets, access, message);
+      messageSender.sendGroupTyping(distributionId, targets, access, groupSendEndorsements, message);
       List<SendMessageResult> results = targets.stream().map(a -> SendMessageResult.success(a, Collections.emptyList(), true, false, -1, Optional.empty())).collect(Collectors.toList());
 
       if (partialListener != null) {
@@ -610,13 +722,13 @@ private TypingSendOperation(@NonNull SignalServiceTypingMessage message) {
     public @NonNull List<SendMessageResult> sendLegacy(@NonNull SignalServiceMessageSender messageSender,
                                                        @NonNull List<SignalServiceAddress> targets,
                                                        @NonNull List<Recipient> targetRecipients,
-                                                       @NonNull List<Optional<UnidentifiedAccessPair>> access,
+                                                       @NonNull List<SealedSenderAccess> sealedSenderAccesses,
                                                        boolean isRecipientUpdate,
                                                        @Nullable PartialSendCompleteListener partialListener,
                                                        @Nullable CancelationSignal cancelationSignal)
         throws IOException
     {
-      messageSender.sendTyping(targets, access, message, cancelationSignal);
+      messageSender.sendTyping(targets, sealedSenderAccesses, message, cancelationSignal);
       return targets.stream().map(a -> SendMessageResult.success(a, Collections.emptyList(), true, false, -1, Optional.empty())).collect(Collectors.toList());
     }
 
@@ -659,24 +771,25 @@ private CallSendOperation(@NonNull SignalServiceCallMessage message) {
                                                               @NonNull DistributionId distributionId,
                                                               @NonNull List<SignalServiceAddress> targets,
                                                               @NonNull List<UnidentifiedAccess> access,
+                                                              @Nullable GroupSendEndorsements groupSendEndorsements,
                                                               boolean isRecipientUpdate,
                                                               @Nullable PartialSendBatchCompleteListener partialSendListener)
         throws NoSessionException, UntrustedIdentityException, InvalidKeyException, IOException, InvalidRegistrationIdException
     {
-      return messageSender.sendCallMessage(distributionId, targets, access, message, partialSendListener);
+      return messageSender.sendCallMessage(distributionId, targets, access, groupSendEndorsements, message, partialSendListener);
     }
 
     @Override
     public @NonNull List<SendMessageResult> sendLegacy(@NonNull SignalServiceMessageSender messageSender,
                                                        @NonNull List<SignalServiceAddress> targets,
                                                        @NonNull List<Recipient> targetRecipients,
-                                                       @NonNull List<Optional<UnidentifiedAccessPair>> access,
+                                                       @NonNull List<SealedSenderAccess> sealedSenderAccesses,
                                                        boolean isRecipientUpdate,
                                                        @Nullable PartialSendCompleteListener partialListener,
                                                        @Nullable CancelationSignal cancelationSignal)
         throws IOException
     {
-      return messageSender.sendCallMessage(targets, access, message);
+      return messageSender.sendCallMessage(targets, sealedSenderAccesses, message);
     }
 
     @Override
@@ -731,18 +844,19 @@ public StorySendOperation(@NonNull MessageId relatedMessageId,
                                                               @NonNull DistributionId distributionId,
                                                               @NonNull List<SignalServiceAddress> targets,
                                                               @NonNull List<UnidentifiedAccess> access,
+                                                              @Nullable GroupSendEndorsements groupSendEndorsements,
                                                               boolean isRecipientUpdate,
                                                               @Nullable PartialSendBatchCompleteListener partialListener)
         throws NoSessionException, UntrustedIdentityException, InvalidKeyException, IOException, InvalidRegistrationIdException
     {
-      return messageSender.sendGroupStory(distributionId, Optional.ofNullable(groupId).map(GroupId::getDecodedId), targets, access, isRecipientUpdate, message, getSentTimestamp(), manifest, partialListener);
+      return messageSender.sendGroupStory(distributionId, Optional.ofNullable(groupId).map(GroupId::getDecodedId), targets, access, groupSendEndorsements, isRecipientUpdate, message, getSentTimestamp(), manifest, partialListener);
     }
 
     @Override
     public @NonNull List<SendMessageResult> sendLegacy(@NonNull SignalServiceMessageSender messageSender,
                                                        @NonNull List<SignalServiceAddress> targets,
                                                        @NonNull List<Recipient> targetRecipients,
-                                                       @NonNull List<Optional<UnidentifiedAccessPair>> access,
+                                                       @NonNull List<SealedSenderAccess> sealedSenderAccesses,
                                                        boolean isRecipientUpdate,
                                                        @Nullable PartialSendCompleteListener partialListener,
                                                        @Nullable CancelationSignal cancelationSignal)
@@ -840,12 +954,12 @@ public void onSyncMessageSent() {
    */
   private static final class RecipientData {
 
-    private final Map<RecipientId, Optional<UnidentifiedAccessPair>> accessById;
+    private final Map<RecipientId, Optional<UnidentifiedAccess>> accessById;
     private final Map<RecipientId, SignalServiceAddress>             addressById;
     private final RecipientAccessList                                accessList;
 
     RecipientData(@NonNull Context context, @NonNull List<Recipient> recipients, boolean isForStory) throws IOException {
-      this.accessById  = UnidentifiedAccessUtil.getAccessMapFor(context, recipients, isForStory);
+      this.accessById  = SealedSenderAccessUtil.getAccessMapFor(recipients, isForStory);
       this.addressById = mapAddresses(context, recipients);
       this.accessList  = new RecipientAccessList(recipients);
     }
@@ -854,22 +968,22 @@ private static final class RecipientData {
       return Objects.requireNonNull(addressById.get(id));
     }
 
-    @NonNull Optional<UnidentifiedAccessPair> getAccessPair(@NonNull RecipientId id) {
+    @NonNull Optional<UnidentifiedAccess> getAccessPair(@NonNull RecipientId id) {
       return Objects.requireNonNull(accessById.get(id));
     }
 
+    @Nullable UnidentifiedAccess getAccess(@NonNull RecipientId id) {
+      return Objects.requireNonNull(accessById.get(id)).orElse(null);
+    }
+
     @NonNull UnidentifiedAccess requireAccess(@NonNull RecipientId id) {
-      return Objects.requireNonNull(accessById.get(id)).get().getTargetUnidentifiedAccess().get();
+      return Objects.requireNonNull(accessById.get(id)).get();
     }
 
     @NonNull RecipientId requireRecipientId(@NonNull SignalServiceAddress address) {
       return accessList.requireIdByAddress(address);
     }
 
-    @NonNull List<RecipientId> requireRecipientIds(@NonNull List<SignalServiceAddress> addresses) {
-      return addresses.stream().map(accessList::requireIdByAddress).collect(Collectors.toList());
-    }
-
     private static @NonNull Map<RecipientId, SignalServiceAddress> mapAddresses(@NonNull Context context, @NonNull List<Recipient> recipients) throws IOException {
       List<SignalServiceAddress> addresses = RecipientUtil.toSignalServiceAddressesFromResolved(context, recipients);
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.kt
index 68b8816627..d2a57d1af4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.kt
@@ -14,7 +14,7 @@ import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.crypto.ReentrantSessionLock
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupsV2ProcessingLock
 import org.thoughtcrime.securesms.jobmanager.impl.BackoffUtil
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
@@ -73,7 +73,7 @@ class IncomingMessageObserver(private val context: Application) {
     const val FOREGROUND_ID = 313399
 
     private val censored: Boolean
-      get() = ApplicationDependencies.getSignalServiceNetworkAccess().isCensored()
+      get() = AppDependencies.signalServiceNetworkAccess.isCensored()
   }
 
   private val decryptionDrainedListeners: MutableList<Runnable> = CopyOnWriteArrayList()
@@ -112,7 +112,7 @@ class IncomingMessageObserver(private val context: Application) {
 
     // MOLLY: Foreground service startup is handled inside the connection loop
 
-    ApplicationDependencies.getAppForegroundObserver().addListener(object : AppForegroundObserver.Listener {
+    AppDependencies.appForegroundObserver.addListener(object : AppForegroundObserver.Listener {
       override fun onForeground() {
         onAppForegrounded()
       }
@@ -189,12 +189,12 @@ class IncomingMessageObserver(private val context: Application) {
       }.toImmutableSet()
     }
 
-    val registered = SignalStore.account().isRegistered
-    val fcmEnabled = SignalStore.account().fcmEnabled
-    val pushAvailable = SignalStore.account().pushAvailable
+    val registered = SignalStore.account.isRegistered
+    val fcmEnabled = SignalStore.account.fcmEnabled
+    val pushAvailable = SignalStore.account.pushAvailable
     val hasNetwork = NetworkConstraint.isMet(context)
-    val hasProxy = ApplicationDependencies.getNetworkManager().isProxyEnabled
-    val forceWebsocket = SignalStore.internalValues().isWebsocketModeForced
+    val hasProxy = AppDependencies.networkManager.isProxyEnabled
+    val forceWebsocket = SignalStore.internal.isWebsocketModeForced
 
     if (registered && (!pushAvailable || forceWebsocket)) {
       // MOLLY: Try to start the foreground service only once
@@ -251,7 +251,7 @@ class IncomingMessageObserver(private val context: Application) {
   }
 
   private fun disconnect() {
-    ApplicationDependencies.getSignalWebSocket().disconnect()
+    AppDependencies.signalWebSocket.disconnect()
   }
 
   @JvmOverloads
@@ -387,8 +387,8 @@ class IncomingMessageObserver(private val context: Application) {
         waitForConnectionNecessary()
         Log.i(TAG, "Making websocket connection....")
 
-        val signalWebSocket = ApplicationDependencies.getSignalWebSocket()
-        val webSocketDisposable = signalWebSocket.webSocketState.subscribe { state: WebSocketConnectionState ->
+        val signalWebSocket = AppDependencies.signalWebSocket
+        val webSocketDisposable = AppDependencies.webSocketObserver.subscribe { state: WebSocketConnectionState ->
           Log.d(TAG, "WebSocket State: $state")
 
           // Any state change at all means that we are not drained
@@ -420,7 +420,7 @@ class IncomingMessageObserver(private val context: Application) {
                       if (followUpOperations != null) {
                         Log.d(TAG, "Running ${followUpOperations.size} follow-up operations...")
                         val jobs = followUpOperations.mapNotNull { it.run() }
-                        ApplicationDependencies.getJobManager().addAllChains(jobs)
+                        AppDependencies.jobManager.addAllChains(jobs)
                       }
 
                       signalWebSocket.sendAck(response)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.kt
index bac75fba8e..e3999a4451 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.kt
@@ -14,13 +14,14 @@ import org.thoughtcrime.securesms.database.model.GroupRecord
 import org.thoughtcrime.securesms.database.model.MessageLogEntry
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.PendingRetryReceiptModel
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.BadGroupIdException
 import org.thoughtcrime.securesms.groups.GroupChangeBusyException
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.groups.GroupManager
 import org.thoughtcrime.securesms.groups.GroupNotAMemberException
-import org.thoughtcrime.securesms.groups.v2.processing.GroupsV2StateProcessor
+import org.thoughtcrime.securesms.groups.v2.processing.GroupUpdateResult
+import org.thoughtcrime.securesms.groups.v2.processing.GroupUpdateResult.UpdateStatus
 import org.thoughtcrime.securesms.jobs.AutomaticSessionResetJob
 import org.thoughtcrime.securesms.jobs.NullMessageSendJob
 import org.thoughtcrime.securesms.jobs.ResendMessageJob
@@ -42,7 +43,7 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.recipients.RecipientUtil
 import org.thoughtcrime.securesms.util.EarlyMessageCacheEntry
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.SignalLocalMetrics
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.Util
@@ -71,7 +72,7 @@ open class MessageContentProcessor(private val context: Context) {
 
     @JvmStatic
     @JvmOverloads
-    fun create(context: Context = ApplicationDependencies.getApplication()): MessageContentProcessor {
+    fun create(context: Context = AppDependencies.application): MessageContentProcessor {
       return MessageContentProcessor(context)
     }
 
@@ -196,7 +197,7 @@ open class MessageContentProcessor(private val context: Context) {
       senderRecipient.isBlocked || when {
         senderRecipient.isSystemContact -> false
         senderRecipient.isProfileSharing -> false
-        !TextSecurePreferences.isBlockUnknownEnabled(ApplicationDependencies.getApplication()) -> false
+        !TextSecurePreferences.isBlockUnknownEnabled(AppDependencies.application) -> false
         RecipientUtil.isProfileSharedViaGroup(senderRecipient) -> false
         else -> true
       }
@@ -211,7 +212,7 @@ open class MessageContentProcessor(private val context: Context) {
         val threadId = SignalDatabase.threads.getThreadIdFor(destination.id)
         if (threadId != null) {
           val lastSeen = SignalDatabase.threads.getConversationMetadata(threadId).lastSeen
-          val visibleThread = ApplicationDependencies.getMessageNotifier().visibleThread.map(ConversationId::threadId).orElse(-1L)
+          val visibleThread = AppDependencies.messageNotifier.visibleThread.map(ConversationId::threadId).orElse(-1L)
 
           if (threadId != visibleThread && lastSeen > 0 && lastSeen < pending.receivedTimestamp) {
             receivedTime = pending.receivedTimestamp
@@ -249,7 +250,7 @@ open class MessageContentProcessor(private val context: Context) {
         return Gv2PreProcessResult.IGNORE
       }
 
-      val groupRecord = if (groupUpdateResult.groupState == GroupsV2StateProcessor.GroupState.GROUP_CONSISTENT_OR_AHEAD) {
+      val groupRecord = if (groupUpdateResult.updateStatus == UpdateStatus.GROUP_CONSISTENT_OR_AHEAD) {
         preUpdateGroupRecord
       } else {
         SignalDatabase.groups.getGroup(groupId)
@@ -272,9 +273,9 @@ open class MessageContentProcessor(private val context: Context) {
         }
       }
 
-      return when (groupUpdateResult.groupState) {
-        GroupsV2StateProcessor.GroupState.GROUP_UPDATED -> Gv2PreProcessResult.GROUP_UPDATE
-        GroupsV2StateProcessor.GroupState.GROUP_CONSISTENT_OR_AHEAD -> Gv2PreProcessResult.GROUP_UP_TO_DATE
+      return when (groupUpdateResult.updateStatus) {
+        UpdateStatus.GROUP_UPDATED -> Gv2PreProcessResult.GROUP_UPDATE
+        UpdateStatus.GROUP_CONSISTENT_OR_AHEAD -> Gv2PreProcessResult.GROUP_UP_TO_DATE
       }
     }
 
@@ -286,7 +287,7 @@ open class MessageContentProcessor(private val context: Context) {
       localRecord: Optional<GroupRecord>,
       groupSecretParams: GroupSecretParams? = null,
       serverGuid: String? = null
-    ): GroupsV2StateProcessor.GroupUpdateResult? {
+    ): GroupUpdateResult? {
       return try {
         val signedGroupChange: ByteArray? = if (groupV2.hasSignedGroupChange) groupV2.signedGroupChange else null
         val updatedTimestamp = if (signedGroupChange != null) timestamp else timestamp - 1
@@ -317,7 +318,7 @@ open class MessageContentProcessor(private val context: Context) {
         .insertMessageInbox(textMessage)
         .ifPresent {
           marker(it.messageId)
-          ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(it.threadId))
+          AppDependencies.messageNotifier.updateNotification(context, ConversationId.forConversation(it.threadId))
         }
     }
   }
@@ -338,8 +339,8 @@ open class MessageContentProcessor(private val context: Context) {
 
     handleMessage(senderRecipient, envelope, content, metadata, serverDeliveredTimestamp, processingEarlyContent, localMetric)
 
-    val earlyCacheEntries: List<EarlyMessageCacheEntry>? = ApplicationDependencies
-      .getEarlyMessageCache()
+    val earlyCacheEntries: List<EarlyMessageCacheEntry>? = AppDependencies
+      .earlyMessageCache
       .retrieve(senderRecipient.id, envelope.timestamp!!)
       .orNull()
 
@@ -405,7 +406,7 @@ open class MessageContentProcessor(private val context: Context) {
       MessageState.CORRUPT_MESSAGE,
       MessageState.NO_SESSION -> {
         warn(timestamp, "Discovered old enqueued bad encrypted message. Scheduling reset.")
-        ApplicationDependencies.getJobManager().add(AutomaticSessionResetJob(sender.id, exceptionMetadata.senderDevice, timestamp))
+        AppDependencies.jobManager.add(AutomaticSessionResetJob(sender.id, exceptionMetadata.senderDevice, timestamp))
       }
 
       MessageState.DUPLICATE_MESSAGE -> warn(timestamp, "Duplicate message. Dropping.")
@@ -430,7 +431,7 @@ open class MessageContentProcessor(private val context: Context) {
       return
     }
 
-    val pending: PendingRetryReceiptModel? = ApplicationDependencies.getPendingRetryReceiptCache().get(senderRecipient.id, envelope.timestamp!!)
+    val pending: PendingRetryReceiptModel? = AppDependencies.pendingRetryReceiptCache.get(senderRecipient.id, envelope.timestamp!!)
     val receivedTime: Long = handlePendingRetry(pending, envelope.timestamp!!, threadRecipient)
 
     log(envelope.timestamp!!, "Beginning message processing. Sender: " + formatSender(senderRecipient.id, metadata.sourceServiceId, metadata.sourceDeviceId))
@@ -468,8 +469,8 @@ open class MessageContentProcessor(private val context: Context) {
 
         val message: CallMessage = content.callMessage!!
 
-        if (message.destinationDeviceId != null && message.destinationDeviceId != SignalStore.account().deviceId) {
-          log(envelope.timestamp!!, "Ignoring call message that is not for this device! intended: ${message.destinationDeviceId}, this: ${SignalStore.account().deviceId}")
+        if (message.destinationDeviceId != null && message.destinationDeviceId != SignalStore.account.deviceId) {
+          log(envelope.timestamp!!, "Ignoring call message that is not for this device! intended: ${message.destinationDeviceId}, this: ${SignalStore.account.deviceId}")
           return
         }
 
@@ -528,7 +529,7 @@ open class MessageContentProcessor(private val context: Context) {
 
     if (pending != null) {
       warn(envelope.timestamp!!, "Pending retry was processed. Deleting.")
-      ApplicationDependencies.getPendingRetryReceiptCache().delete(pending)
+      AppDependencies.pendingRetryReceiptCache.delete(pending)
     }
   }
 
@@ -563,20 +564,20 @@ open class MessageContentProcessor(private val context: Context) {
 
     if (typingMessage.hasStarted) {
       Log.d(TAG, "Typing started on thread $threadId")
-      ApplicationDependencies.getTypingStatusRepository().onTypingStarted(context, threadId, senderRecipient, metadata.sourceDeviceId)
+      AppDependencies.typingStatusRepository.onTypingStarted(context, threadId, senderRecipient, metadata.sourceDeviceId)
     } else {
       Log.d(TAG, "Typing stopped on thread $threadId")
-      ApplicationDependencies.getTypingStatusRepository().onTypingStopped(threadId, senderRecipient, metadata.sourceDeviceId, false)
+      AppDependencies.typingStatusRepository.onTypingStopped(threadId, senderRecipient, metadata.sourceDeviceId, false)
     }
   }
 
   private fun handleRetryReceipt(envelope: Envelope, metadata: EnvelopeMetadata, decryptionErrorMessage: DecryptionErrorMessage, senderRecipient: Recipient) {
-    if (!FeatureFlags.retryReceipts()) {
+    if (!RemoteConfig.retryReceipts) {
       warn(envelope.timestamp!!, "[RetryReceipt] Feature flag disabled, skipping retry receipt.")
       return
     }
 
-    if (decryptionErrorMessage.deviceId != SignalStore.account().deviceId) {
+    if (decryptionErrorMessage.deviceId != SignalStore.account.deviceId) {
       log(envelope.timestamp!!, "[RetryReceipt] Received a DecryptionErrorMessage targeting a linked device. Ignoring.")
       return
     }
@@ -643,7 +644,7 @@ open class MessageContentProcessor(private val context: Context) {
 
     if (messageLogEntry != null) {
       warn(envelope.timestamp!!, "[RetryReceipt-SK] Found MSL entry for ${requester.id} ($requesterAddress) with timestamp $sentTimestamp. Scheduling a resend.")
-      ApplicationDependencies.getJobManager().add(
+      AppDependencies.jobManager.add(
         ResendMessageJob(
           messageLogEntry.recipientId,
           messageLogEntry.dateSent,
@@ -656,7 +657,7 @@ open class MessageContentProcessor(private val context: Context) {
       )
     } else {
       warn(envelope.timestamp!!, "[RetryReceipt-SK] Unable to find MSL entry for ${requester.id} ($requesterAddress) with timestamp $sentTimestamp for ${if (groupId != null) "group $groupId" else "distribution list"}. Scheduling a job to send them the SenderKeyDistributionMessage. Membership will be checked there.")
-      ApplicationDependencies.getJobManager().add(SenderKeyDistributionSendJob(requester.id, threadRecipient.id))
+      AppDependencies.jobManager.add(SenderKeyDistributionSendJob(requester.id, threadRecipient.id))
     }
   }
 
@@ -671,7 +672,7 @@ open class MessageContentProcessor(private val context: Context) {
     if (decryptionErrorMessage.ratchetKey.isPresent) {
       if (ratchetKeyMatches(requester, metadata.sourceDeviceId, decryptionErrorMessage.ratchetKey.get())) {
         warn(envelope.timestamp!!, "[RetryReceipt-I] Ratchet key matches. Archiving the session.")
-        ApplicationDependencies.getProtocolStore().aci().sessions().archiveSession(requester.requireServiceId(), metadata.sourceDeviceId)
+        AppDependencies.protocolStore.aci().sessions().archiveSession(requester.requireServiceId(), metadata.sourceDeviceId)
         archivedSession = true
       } else {
         log(envelope.timestamp!!, "[RetryReceipt-I] Ratchet key does not match. Leaving the session as-is.")
@@ -682,7 +683,7 @@ open class MessageContentProcessor(private val context: Context) {
 
     if (messageLogEntry != null) {
       warn(envelope.timestamp!!, "[RetryReceipt-I] Found an entry in the MSL. Resending.")
-      ApplicationDependencies.getJobManager().add(
+      AppDependencies.jobManager.add(
         ResendMessageJob(
           messageLogEntry.recipientId,
           messageLogEntry.dateSent,
@@ -695,7 +696,7 @@ open class MessageContentProcessor(private val context: Context) {
       )
     } else if (archivedSession) {
       warn(envelope.timestamp!!, "[RetryReceipt-I] Could not find an entry in the MSL, but we archived the session, so we're sending a null message to complete the reset.")
-      ApplicationDependencies.getJobManager().add(NullMessageSendJob(requester.id))
+      AppDependencies.jobManager.add(NullMessageSendJob(requester.id))
     } else {
       warn(envelope.timestamp!!, "[RetryReceipt-I] Could not find an entry in the MSL. Skipping.")
     }
@@ -712,7 +713,7 @@ open class MessageContentProcessor(private val context: Context) {
 
   private fun ratchetKeyMatches(recipient: Recipient, deviceId: Int, ratchetKey: ECPublicKey): Boolean {
     val address = recipient.resolve().requireAci().toProtocolAddress(deviceId)
-    val session = ApplicationDependencies.getProtocolStore().aci().loadSession(address)
+    val session = AppDependencies.protocolStore.aci().loadSession(address)
     return session.currentRatchetKeyMatches(ratchetKey)
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt
index 57d6b7d5df..3f97588e1e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt
@@ -32,9 +32,9 @@ import org.signal.libsignal.protocol.message.SenderKeyDistributionMessage
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.crypto.ReentrantSessionLock
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil
+import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.BadGroupIdException
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.jobmanager.JobManager
@@ -49,8 +49,8 @@ import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.notifications.NotificationIds
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.LRUCache
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.asChain
 import org.whispersystems.signalservice.api.InvalidMessageStructureException
 import org.whispersystems.signalservice.api.crypto.ContentHint
@@ -93,8 +93,8 @@ object MessageDecryptor {
     envelope: Envelope,
     serverDeliveredTimestamp: Long
   ): Result {
-    val selfAci: ACI = SignalStore.account().requireAci()
-    val selfPni: PNI = SignalStore.account().requirePni()
+    val selfAci: ACI = SignalStore.account.requireAci()
+    val selfPni: PNI = SignalStore.account.requirePni()
 
     val destination: ServiceId? = ServiceId.parseOrNull(envelope.destinationServiceId)
 
@@ -136,8 +136,8 @@ object MessageDecryptor {
     }
 
     val bufferedStore = bufferedProtocolStore.get(destination)
-    val localAddress = SignalServiceAddress(selfAci, SignalStore.account().e164)
-    val cipher = SignalServiceCipher(localAddress, SignalStore.account().deviceId, bufferedStore, ReentrantSessionLock.INSTANCE, UnidentifiedAccessUtil.getCertificateValidator())
+    val localAddress = SignalServiceAddress(selfAci, SignalStore.account.e164)
+    val cipher = SignalServiceCipher(localAddress, SignalStore.account.deviceId, bufferedStore, ReentrantSessionLock.INSTANCE, SealedSenderAccessUtil.getCertificateValidator())
 
     return try {
       val startTimeNanos = System.nanoTime()
@@ -156,7 +156,7 @@ object MessageDecryptor {
       if (validationResult is EnvelopeContentValidator.Result.Invalid) {
         Log.w(TAG, "${logPrefix(envelope, cipherResult)} Invalid content! ${validationResult.reason}", validationResult.throwable)
 
-        if (FeatureFlags.internalUser()) {
+        if (RemoteConfig.internalUser) {
           postInvalidMessageNotification(context, validationResult.reason)
         }
 
@@ -213,11 +213,11 @@ object MessageDecryptor {
           check(e is ProtocolException)
           Log.w(TAG, "${logPrefix(envelope, e)} Decryption error!", e, true)
 
-          if (FeatureFlags.internalUser()) {
+          if (RemoteConfig.internalUser) {
             postDecryptionErrorNotification(context)
           }
 
-          if (FeatureFlags.retryReceipts()) {
+          if (RemoteConfig.retryReceipts) {
             buildResultForDecryptionError(context, envelope, serverDeliveredTimestamp, followUpOperations, e)
           } else {
             Log.w(TAG, "${logPrefix(envelope, e)} Retry receipts disabled! Enqueuing a session reset job, which will also insert an error message.", e, true)
@@ -273,7 +273,7 @@ object MessageDecryptor {
     followUpOperations: MutableList<FollowUpOperation>,
     protocolException: ProtocolException
   ): Result {
-    if (ServiceId.parseOrNull(envelope.destinationServiceId) == SignalStore.account().pni) {
+    if (ServiceId.parseOrNull(envelope.destinationServiceId) == SignalStore.account.pni) {
       Log.w(TAG, "${logPrefix(envelope)} Decryption error for message sent to our PNI! Ignoring.")
       return Result.Ignore(envelope, serverDeliveredTimestamp, followUpOperations)
     }
@@ -296,7 +296,7 @@ object MessageDecryptor {
 
     val errorCount: DecryptionErrorCount = decryptionErrorCounts.getOrPut(sender.id) { DecryptionErrorCount(count = 0, lastReceivedTime = 0) }
     val timeSinceLastError = receivedTimestamp - errorCount.lastReceivedTime
-    if (timeSinceLastError > FeatureFlags.retryReceiptMaxCountResetAge() && errorCount.count > 0) {
+    if (timeSinceLastError > RemoteConfig.retryReceiptMaxCountResetAge && errorCount.count > 0) {
       Log.i(TAG, "${logPrefix(envelope, senderServiceId)} Resetting decryption error count for ${sender.id} because it has been $timeSinceLastError ms since the last error.", true)
       errorCount.count = 0
     }
@@ -304,8 +304,8 @@ object MessageDecryptor {
     errorCount.count++
     errorCount.lastReceivedTime = receivedTimestamp
 
-    if (errorCount.count > FeatureFlags.retryReceiptMaxCount()) {
-      Log.w(TAG, "${logPrefix(envelope, senderServiceId)} This is error number ${errorCount.count} from ${sender.id}, which is greater than the maximum of ${FeatureFlags.retryReceiptMaxCount()}. Ignoring.", true)
+    if (errorCount.count > RemoteConfig.retryReceiptMaxCount) {
+      Log.w(TAG, "${logPrefix(envelope, senderServiceId)} This is error number ${errorCount.count} from ${sender.id}, which is greater than the maximum of ${RemoteConfig.retryReceiptMaxCount}. Ignoring.", true)
 
       if (contentHint == ContentHint.IMPLICIT) {
         Log.w(TAG, "${logPrefix(envelope, senderServiceId)} The content hint is $contentHint, so no error message is needed.", true)
@@ -360,8 +360,8 @@ object MessageDecryptor {
             return@FollowUpOperation null
           }
 
-          ApplicationDependencies.getPendingRetryReceiptCache().insert(sender.id, senderDevice, envelope.timestamp!!, receivedTimestamp, threadId)
-          ApplicationDependencies.getPendingRetryReceiptManager().scheduleIfNecessary()
+          AppDependencies.pendingRetryReceiptCache.insert(sender.id, senderDevice, envelope.timestamp!!, receivedTimestamp, threadId)
+          AppDependencies.pendingRetryReceiptManager.scheduleIfNecessary()
           null
         }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/ReceiptMessageProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/ReceiptMessageProcessor.kt
index bf4ac20b41..e136bb3bec 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/ReceiptMessageProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/ReceiptMessageProcessor.kt
@@ -4,7 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import org.signal.core.util.Stopwatch
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.PushProcessEarlyMessagesJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.messages.MessageContentProcessor.Companion.log
@@ -88,7 +88,7 @@ object ReceiptMessageProcessor {
       for (targetTimestamp in missingTargetTimestamps) {
         warn(envelope.timestamp!!, "[handleReadReceipt] Could not find matching message! targetTimestamp: $targetTimestamp, receiptAuthor: $senderRecipientId | Receipt, so associating with message from self ($selfId)")
         if (earlyMessageCacheEntry != null) {
-          ApplicationDependencies.getEarlyMessageCache().store(selfId, targetTimestamp, earlyMessageCacheEntry)
+          AppDependencies.earlyMessageCache.store(selfId, targetTimestamp, earlyMessageCacheEntry)
         }
       }
     }
@@ -107,7 +107,7 @@ object ReceiptMessageProcessor {
     earlyMessageCacheEntry: EarlyMessageCacheEntry?
   ) {
     val readReceipts = TextSecurePreferences.isReadReceiptsEnabled(context)
-    val storyViewedReceipts = SignalStore.storyValues().viewedReceiptsEnabled
+    val storyViewedReceipts = SignalStore.story.viewedReceiptsEnabled
 
     if (!readReceipts && !storyViewedReceipts) {
       log(envelope.timestamp!!, "Ignoring viewed receipts for IDs: ${viewedReceipt.timestamp.joinToString(", ")}")
@@ -133,7 +133,7 @@ object ReceiptMessageProcessor {
       for (targetTimestamp in missingTargetTimestamps) {
         warn(envelope.timestamp!!, "[handleViewedReceipt] Could not find matching message! targetTimestamp: $targetTimestamp, receiptAuthor: $senderRecipientId | Receipt so associating with message from self ($selfId)")
         if (earlyMessageCacheEntry != null) {
-          ApplicationDependencies.getEarlyMessageCache().store(selfId, targetTimestamp, earlyMessageCacheEntry)
+          AppDependencies.earlyMessageCache.store(selfId, targetTimestamp, earlyMessageCacheEntry)
         }
       }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/SignalServiceProtoUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/SignalServiceProtoUtil.kt
index bd47a69d1e..0a09e38108 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/SignalServiceProtoUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/SignalServiceProtoUtil.kt
@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.messages
 import ProtoUtil.isNotEmpty
 import com.squareup.wire.Message
 import okio.ByteString
+import okio.ByteString.Companion.toByteString
 import org.signal.core.util.orNull
 import org.signal.libsignal.protocol.message.DecryptionErrorMessage
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey
@@ -13,8 +14,8 @@ import org.thoughtcrime.securesms.attachments.PointerAttachment
 import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.stickers.StickerLocator
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.MediaUtil
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.whispersystems.signalservice.api.InvalidMessageStructureException
 import org.whispersystems.signalservice.api.crypto.EnvelopeMetadata
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer
@@ -26,8 +27,10 @@ import org.whispersystems.signalservice.internal.push.DataMessage
 import org.whispersystems.signalservice.internal.push.DataMessage.Payment
 import org.whispersystems.signalservice.internal.push.GroupContextV2
 import org.whispersystems.signalservice.internal.push.StoryMessage
+import org.whispersystems.signalservice.internal.push.SyncMessage
 import org.whispersystems.signalservice.internal.push.SyncMessage.Sent
 import org.whispersystems.signalservice.internal.push.TypingMessage
+import org.whispersystems.signalservice.internal.util.Util
 import java.util.Optional
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
@@ -168,7 +171,7 @@ object SignalServiceProtoUtil {
   }
 
   fun List<AttachmentPointer>.toPointersWithinLimit(): List<Attachment> {
-    return mapNotNull { it.toPointer() }.take(FeatureFlags.maxAttachmentCount())
+    return mapNotNull { it.toPointer() }.take(RemoteConfig.maxAttachmentCount)
   }
 
   fun AttachmentPointer.toPointer(stickerLocator: StickerLocator? = null): Attachment? {
@@ -192,6 +195,11 @@ object SignalServiceProtoUtil {
     return Money.picoMobileCoin(this)
   }
 
+  fun SyncMessage.Builder.pad(length: Int = 512): SyncMessage.Builder {
+    padding(Util.getRandomLengthSecretBytes(length).toByteString())
+    return this
+  }
+
   @Suppress("UNCHECKED_CAST")
   inline fun <reified MessageType : Message<MessageType, BuilderType>, BuilderType : Message.Builder<MessageType, BuilderType>> Message.Builder<MessageType, BuilderType>.buildWith(block: BuilderType.() -> Unit): MessageType {
     block(this as BuilderType)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/StoryMessageProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/StoryMessageProcessor.kt
index a7d14b94c7..1dc4e45eb3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/StoryMessageProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/StoryMessageProcessor.kt
@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.database.model.databaseprotos.ChatColor
 import org.thoughtcrime.securesms.database.model.databaseprotos.StoryTextPost
 import org.thoughtcrime.securesms.database.model.toBodyRangeList
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.messages.MessageContentProcessor.Companion.log
 import org.thoughtcrime.securesms.messages.MessageContentProcessor.Companion.warn
 import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.groupId
@@ -19,7 +19,7 @@ import org.thoughtcrime.securesms.mms.IncomingMessage
 import org.thoughtcrime.securesms.mms.MmsException
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.stories.Stories
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.whispersystems.signalservice.api.crypto.EnvelopeMetadata
 import org.whispersystems.signalservice.internal.push.Content
 import org.whispersystems.signalservice.internal.push.Envelope
@@ -90,8 +90,8 @@ object StoryMessageProcessor {
     }
 
     if (insertResult != null) {
-      Stories.enqueueNextStoriesForDownload(threadRecipient.id, false, FeatureFlags.storiesAutoDownloadMaximum())
-      ApplicationDependencies.getExpireStoriesManager().scheduleIfNecessary()
+      Stories.enqueueNextStoriesForDownload(threadRecipient.id, false, RemoteConfig.storiesAutoDownloadMaximum)
+      AppDependencies.expireStoriesManager.scheduleIfNecessary()
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/SyncMessageProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/SyncMessageProcessor.kt
index 8836d0781c..9c878e05f5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/SyncMessageProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/SyncMessageProcessor.kt
@@ -4,6 +4,7 @@ import ProtoUtil.isNotEmpty
 import android.content.Context
 import com.mobilecoin.lib.exceptions.SerializationException
 import okio.ByteString
+import org.signal.core.util.Base64
 import org.signal.core.util.Hex
 import org.signal.core.util.orNull
 import org.signal.libsignal.protocol.IdentityKey
@@ -23,6 +24,7 @@ import org.thoughtcrime.securesms.components.emoji.EmojiUtil
 import org.thoughtcrime.securesms.contactshare.Contact
 import org.thoughtcrime.securesms.crypto.PreKeyUtil
 import org.thoughtcrime.securesms.crypto.SecurityEvent
+import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.database.CallLinkTable
 import org.thoughtcrime.securesms.database.CallTable
 import org.thoughtcrime.securesms.database.GroupReceiptTable
@@ -45,7 +47,7 @@ import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
 import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
 import org.thoughtcrime.securesms.database.model.toBodyRangeList
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.BadGroupIdException
 import org.thoughtcrime.securesms.groups.GroupChangeBusyException
 import org.thoughtcrime.securesms.groups.GroupId
@@ -97,10 +99,10 @@ import org.thoughtcrime.securesms.service.webrtc.links.SignalCallLinkState
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
 import org.thoughtcrime.securesms.stories.Stories
 import org.thoughtcrime.securesms.util.EarlyMessageCacheEntry
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.IdentityUtil
 import org.thoughtcrime.securesms.util.MediaUtil
 import org.thoughtcrime.securesms.util.MessageConstraintsUtil
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.Util
 import org.whispersystems.signalservice.api.account.PreKeyUpload
@@ -113,6 +115,7 @@ import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import org.whispersystems.signalservice.api.push.ServiceIdType
 import org.whispersystems.signalservice.api.push.SignalServiceAddress
 import org.whispersystems.signalservice.api.storage.StorageKey
+import org.whispersystems.signalservice.api.util.UuidUtil
 import org.whispersystems.signalservice.internal.push.Content
 import org.whispersystems.signalservice.internal.push.DataMessage
 import org.whispersystems.signalservice.internal.push.EditMessage
@@ -169,6 +172,7 @@ object SyncMessageProcessor {
       syncMessage.callEvent != null -> handleSynchronizeCallEvent(syncMessage.callEvent!!, envelope.timestamp!!)
       syncMessage.callLinkUpdate != null -> handleSynchronizeCallLink(syncMessage.callLinkUpdate!!, envelope.timestamp!!)
       syncMessage.callLogEvent != null -> handleSynchronizeCallLogEvent(syncMessage.callLogEvent!!, envelope.timestamp!!)
+      syncMessage.deleteForMe != null -> handleSynchronizeDeleteForMe(context, syncMessage.deleteForMe!!, envelope.timestamp!!, earlyMessageCacheEntry)
       else -> warn(envelope.timestamp!!, "Contains no known sync types...")
     }
   }
@@ -251,15 +255,15 @@ object SyncMessageProcessor {
 
       if (threadId != -1L) {
         SignalDatabase.threads.setRead(threadId, true)
-        ApplicationDependencies.getMessageNotifier().updateNotification(context)
+        AppDependencies.messageNotifier.updateNotification(context)
       }
 
-      if (SignalStore.rateLimit().needsRecaptcha()) {
+      if (SignalStore.rateLimit.needsRecaptcha()) {
         log(envelope.timestamp!!, "Got a sent transcript while in reCAPTCHA mode. Assuming we're good to message again.")
         RateLimitUtil.retryAllRateLimitedMessages(context)
       }
 
-      ApplicationDependencies.getMessageNotifier().setLastDesktopActivityTimestamp(sent.timestamp!!)
+      AppDependencies.messageNotifier.setLastDesktopActivityTimestamp(sent.timestamp!!)
     } catch (e: MmsException) {
       throw StorageFailedException(e, metadata.sourceServiceId.toString(), metadata.sourceDeviceId)
     }
@@ -278,7 +282,7 @@ object SyncMessageProcessor {
 
       val address = SignalProtocolAddress(pni.toString(), SignalServiceAddress.DEFAULT_DEVICE_ID)
 
-      if (ApplicationDependencies.getProtocolStore().aci().identities().getIdentity(address) != null) {
+      if (AppDependencies.protocolStore.aci().identities().getIdentity(address) != null) {
         log(envelope.timestamp!!, "Ignoring identity on sent transcript for $pni because we already have one.")
         continue
       }
@@ -286,7 +290,7 @@ object SyncMessageProcessor {
       try {
         log(envelope.timestamp!!, "Saving identity from sent transcript for $pni")
         val identityKey = IdentityKey(status.destinationIdentityKey!!.toByteArray())
-        ApplicationDependencies.getProtocolStore().aci().identities().saveIdentity(address, identityKey)
+        AppDependencies.protocolStore.aci().identities().saveIdentity(address, identityKey)
       } catch (e: InvalidKeyException) {
         warn(envelope.timestamp!!, "Failed to deserialize identity key for $pni")
       }
@@ -317,7 +321,7 @@ object SyncMessageProcessor {
     if (targetMessage == null) {
       warn(envelope.timestamp!!, "[handleSynchronizeSentEditMessage] Could not find matching message! targetTimestamp: $targetSentTimestamp  author: $senderRecipientId")
       if (earlyMessageCacheEntry != null) {
-        ApplicationDependencies.getEarlyMessageCache().store(senderRecipientId, targetSentTimestamp, earlyMessageCacheEntry)
+        AppDependencies.earlyMessageCache.store(senderRecipientId, targetSentTimestamp, earlyMessageCacheEntry)
         PushProcessEarlyMessagesJob.enqueue()
       }
     } else if (MessageConstraintsUtil.isValidEditMessageReceive(targetMessage, senderRecipient, envelope.serverTimestamp!!)) {
@@ -329,7 +333,7 @@ object SyncMessageProcessor {
       }
 
       if (message.isMediaMessage) {
-        handleSynchronizeSentEditMediaMessage(context, targetMessage, toRecipient, sent, message, envelope.timestamp!!)
+        handleSynchronizeSentEditMediaMessage(targetMessage, toRecipient, sent, message, envelope.timestamp!!)
       } else {
         handleSynchronizeSentEditTextMessage(targetMessage, toRecipient, sent, message, envelope.timestamp!!)
       }
@@ -385,7 +389,7 @@ object SyncMessageProcessor {
     SignalDatabase.messages.markAsSent(messageId, true)
     if (targetMessage.expireStarted > 0) {
       SignalDatabase.messages.markExpireStarted(messageId, targetMessage.expireStarted)
-      ApplicationDependencies.getExpiringMessageManager().scheduleDeletion(messageId, true, targetMessage.expireStarted, targetMessage.expireStarted)
+      AppDependencies.expiringMessageManager.scheduleDeletion(messageId, true, targetMessage.expireStarted, targetMessage.expireStarted)
     }
 
     if (toRecipient.isSelf) {
@@ -395,7 +399,6 @@ object SyncMessageProcessor {
   }
 
   private fun handleSynchronizeSentEditMediaMessage(
-    context: Context,
     targetMessage: MessageRecord,
     toRecipient: Recipient,
     sent: Sent,
@@ -404,7 +407,22 @@ object SyncMessageProcessor {
   ) {
     log(envelopeTimestamp, "Synchronize sent edit media message for: ${targetMessage.id}")
 
-    val quote: QuoteModel? = DataMessageProcessor.getValidatedQuote(context, envelopeTimestamp, message)
+    val targetQuote = (targetMessage as? MmsMessageRecord)?.quote
+    val quote: QuoteModel? = if (targetQuote != null && message.quote != null) {
+      QuoteModel(
+        targetQuote.id,
+        targetQuote.author,
+        targetQuote.displayText.toString(),
+        targetQuote.isOriginalMissing,
+        emptyList(),
+        null,
+        targetQuote.quoteType,
+        null
+      )
+    } else {
+      null
+    }
+
     val sharedContacts: List<Contact> = DataMessageProcessor.getContacts(message)
     val previews: List<LinkPreview> = DataMessageProcessor.getLinkPreviews(message.preview, message.body ?: "", false)
     val mentions: List<Mention> = DataMessageProcessor.getMentions(message.bodyRanges)
@@ -446,7 +464,7 @@ object SyncMessageProcessor {
 
     if (targetMessage.expireStarted > 0) {
       SignalDatabase.messages.markExpireStarted(messageId, targetMessage.expireStarted)
-      ApplicationDependencies.getExpiringMessageManager().scheduleDeletion(messageId, true, targetMessage.expireStarted, targetMessage.expireStarted)
+      AppDependencies.expiringMessageManager.scheduleDeletion(messageId, true, targetMessage.expireStarted, targetMessage.expireStarted)
     }
 
     if (toRecipient.isSelf) {
@@ -457,7 +475,7 @@ object SyncMessageProcessor {
     if (syncAttachments.isNotEmpty()) {
       SignalDatabase.runPostSuccessfulTransaction {
         for (attachment in attachments) {
-          ApplicationDependencies.getJobManager().add(AttachmentDownloadJob(messageId, attachment.attachmentId, false))
+          AppDependencies.jobManager.add(AttachmentDownloadJob(messageId, attachment.attachmentId, false))
         }
       }
     }
@@ -557,7 +575,7 @@ object SyncMessageProcessor {
 
     SignalDatabase.runPostSuccessfulTransaction {
       for (attachment in attachments) {
-        ApplicationDependencies.getJobManager().add(AttachmentDownloadJob(messageId, attachment.attachmentId, false))
+        AppDependencies.jobManager.add(AttachmentDownloadJob(messageId, attachment.attachmentId, false))
       }
     }
   }
@@ -625,7 +643,7 @@ object SyncMessageProcessor {
     val threadId: Long = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
 
     if (!recipient.isGroup) {
-      ApplicationDependencies.getProtocolStore().aci().deleteAllSessions(recipient.requireServiceId().toString())
+      AppDependencies.protocolStore.aci().deleteAllSessions(recipient.requireServiceId().toString())
       SecurityEvent.broadcastSecurityUpdateEvent(context)
       val messageId = SignalDatabase.messages.insertMessageOutbox(
         outgoingEndSessionMessage,
@@ -759,8 +777,8 @@ object SyncMessageProcessor {
       if (dataMessage.expireTimerDuration > Duration.ZERO) {
         SignalDatabase.messages.markExpireStarted(messageId, sent.expirationStartTimestamp ?: 0)
 
-        ApplicationDependencies
-          .getExpiringMessageManager()
+        AppDependencies
+          .expiringMessageManager
           .scheduleDeletion(messageId, true, sent.expirationStartTimestamp ?: 0, dataMessage.expireTimerDuration.inWholeMilliseconds)
       }
       if (recipient.isSelf) {
@@ -827,7 +845,7 @@ object SyncMessageProcessor {
     if (dataMessage.expireTimerDuration > Duration.ZERO) {
       SignalDatabase.messages.markExpireStarted(messageId, sent.expirationStartTimestamp ?: 0)
 
-      ApplicationDependencies.getExpiringMessageManager().scheduleDeletion(messageId, true, sent.expirationStartTimestamp ?: 0, dataMessage.expireTimerDuration.inWholeMilliseconds)
+      AppDependencies.expiringMessageManager.scheduleDeletion(messageId, true, sent.expirationStartTimestamp ?: 0, dataMessage.expireTimerDuration.inWholeMilliseconds)
     }
     if (recipient.isSelf) {
       SignalDatabase.messages.incrementDeliveryReceiptCount(sent.timestamp!!, recipient.id, System.currentTimeMillis())
@@ -837,7 +855,7 @@ object SyncMessageProcessor {
     SignalDatabase.runPostSuccessfulTransaction {
       val downloadJobs: List<AttachmentDownloadJob> = attachments.map { AttachmentDownloadJob(messageId, it.attachmentId, false) }
       for (attachment in attachments) {
-        ApplicationDependencies.getJobManager().addAll(downloadJobs)
+        AppDependencies.jobManager.addAll(downloadJobs)
       }
     }
 
@@ -882,7 +900,7 @@ object SyncMessageProcessor {
     SignalDatabase.messages.markAsSent(messageId, true)
     if (expiresInMillis > 0) {
       SignalDatabase.messages.markExpireStarted(messageId, sent.expirationStartTimestamp ?: 0)
-      ApplicationDependencies.getExpiringMessageManager().scheduleDeletion(messageId, isGroup, sent.expirationStartTimestamp ?: 0, expiresInMillis)
+      AppDependencies.expiringMessageManager.scheduleDeletion(messageId, isGroup, sent.expirationStartTimestamp ?: 0, expiresInMillis)
     }
 
     if (recipient.isSelf) {
@@ -894,7 +912,7 @@ object SyncMessageProcessor {
   }
 
   private fun handleSynchronizeRequestMessage(context: Context, message: Request, envelopeTimestamp: Long) {
-    if (SignalStore.account().isPrimaryDevice) {
+    if (SignalStore.account.isPrimaryDevice) {
       log(envelopeTimestamp, "Synchronize request message.")
     } else {
       log(envelopeTimestamp, "Linked device ignoring synchronize request message.")
@@ -902,20 +920,20 @@ object SyncMessageProcessor {
     }
 
     when (message.type) {
-      Request.Type.CONTACTS -> ApplicationDependencies.getJobManager().add(MultiDeviceContactUpdateJob(true))
-      Request.Type.BLOCKED -> ApplicationDependencies.getJobManager().add(MultiDeviceBlockedUpdateJob())
+      Request.Type.CONTACTS -> AppDependencies.jobManager.add(MultiDeviceContactUpdateJob(true))
+      Request.Type.BLOCKED -> AppDependencies.jobManager.add(MultiDeviceBlockedUpdateJob())
       Request.Type.CONFIGURATION -> {
-        ApplicationDependencies.getJobManager().add(
+        AppDependencies.jobManager.add(
           MultiDeviceConfigurationUpdateJob(
             TextSecurePreferences.isReadReceiptsEnabled(context),
             TextSecurePreferences.isTypingIndicatorsEnabled(context),
             TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(context),
-            SignalStore.settings().isLinkPreviewsEnabled
+            SignalStore.settings.isLinkPreviewsEnabled
           )
         )
-        ApplicationDependencies.getJobManager().add(MultiDeviceStickerPackSyncJob())
+        AppDependencies.jobManager.add(MultiDeviceStickerPackSyncJob())
       }
-      Request.Type.KEYS -> ApplicationDependencies.getJobManager().add(MultiDeviceKeysUpdateJob())
+      Request.Type.KEYS -> AppDependencies.jobManager.add(MultiDeviceKeysUpdateJob())
       else -> warn(envelopeTimestamp, "Unknown request type: ${message.type}")
     }
   }
@@ -940,7 +958,7 @@ object SyncMessageProcessor {
     for (id in unhandled) {
       warn(envelopeTimestamp, "[handleSynchronizeReadMessage] Could not find matching message! timestamp: ${id.timetamp}  author: ${id.recipientId}")
       if (earlyMessageCacheEntry != null) {
-        ApplicationDependencies.getEarlyMessageCache().store(id.recipientId, id.timetamp, earlyMessageCacheEntry)
+        AppDependencies.earlyMessageCache.store(id.recipientId, id.timetamp, earlyMessageCacheEntry)
       }
     }
 
@@ -948,8 +966,8 @@ object SyncMessageProcessor {
       PushProcessEarlyMessagesJob.enqueue()
     }
 
-    ApplicationDependencies
-      .getMessageNotifier()
+    AppDependencies
+      .messageNotifier
       .apply {
         setLastDesktopActivityTimestamp(envelopeTimestamp)
         cancelDelayedNotifications()
@@ -984,7 +1002,7 @@ object SyncMessageProcessor {
     SignalDatabase.messages.setIncomingMessagesViewed(toMarkViewed)
     SignalDatabase.messages.setOutgoingGiftsRevealed(toMarkViewed)
 
-    ApplicationDependencies.getMessageNotifier().apply {
+    AppDependencies.messageNotifier.apply {
       setLastDesktopActivityTimestamp(envelopeTimestamp)
       cancelDelayedNotifications()
       updateNotification(context)
@@ -1008,12 +1026,12 @@ object SyncMessageProcessor {
     } else {
       warn(envelopeTimestamp.toString(), "Got a view-once open message for a message we don't have!")
       if (earlyMessageCacheEntry != null) {
-        ApplicationDependencies.getEarlyMessageCache().store(author, timestamp, earlyMessageCacheEntry)
+        AppDependencies.earlyMessageCache.store(author, timestamp, earlyMessageCacheEntry)
         PushProcessEarlyMessagesJob.enqueue()
       }
     }
 
-    ApplicationDependencies.getMessageNotifier().apply {
+    AppDependencies.messageNotifier.apply {
       setLastDesktopActivityTimestamp(envelopeTimestamp)
       cancelDelayedNotifications()
       updateNotification(context)
@@ -1029,7 +1047,7 @@ object SyncMessageProcessor {
   private fun handleSynchronizeStickerPackOperation(stickerPackOperations: List<StickerPackOperation>, envelopeTimestamp: Long) {
     log(envelopeTimestamp, "Synchronize sticker pack operation.")
 
-    val jobManager = ApplicationDependencies.getJobManager()
+    val jobManager = AppDependencies.jobManager
 
     for (operation in stickerPackOperations) {
       if (operation.packId != null && operation.packKey != null && operation.type != null) {
@@ -1062,7 +1080,7 @@ object SyncMessageProcessor {
     }
 
     if (configurationMessage.linkPreviews != null) {
-      SignalStore.settings().isLinkPreviewsEnabled = configurationMessage.linkPreviews!!
+      SignalStore.settings.isLinkPreviewsEnabled = configurationMessage.linkPreviews!!
     }
   }
 
@@ -1076,7 +1094,7 @@ object SyncMessageProcessor {
   private fun handleSynchronizeFetchMessage(fetchType: FetchLatest.Type, envelopeTimestamp: Long) {
     log(envelopeTimestamp, "Received fetch request with type: $fetchType")
     when (fetchType) {
-      FetchLatest.Type.LOCAL_PROFILE -> ApplicationDependencies.getJobManager().add(RefreshOwnProfileJob())
+      FetchLatest.Type.LOCAL_PROFILE -> AppDependencies.jobManager.add(RefreshOwnProfileJob())
       FetchLatest.Type.STORAGE_MANIFEST -> StorageSyncHelper.scheduleSyncForDataChange()
       FetchLatest.Type.SUBSCRIPTION_STATUS -> warn(envelopeTimestamp, "Dropping subscription status fetch message.")
       else -> warn(envelopeTimestamp, "Received a fetch message for an unknown type.")
@@ -1113,7 +1131,7 @@ object SyncMessageProcessor {
       MessageRequestResponse.Type.DELETE -> {
         SignalDatabase.recipients.setProfileSharing(recipient.id, false)
         if (threadId > 0) {
-          SignalDatabase.threads.deleteConversation(threadId)
+          SignalDatabase.threads.deleteConversation(threadId, syncThreadDelete = false)
         }
       }
       MessageRequestResponse.Type.BLOCK -> {
@@ -1124,7 +1142,7 @@ object SyncMessageProcessor {
         SignalDatabase.recipients.setBlocked(recipient.id, true)
         SignalDatabase.recipients.setProfileSharing(recipient.id, false)
         if (threadId > 0) {
-          SignalDatabase.threads.deleteConversation(threadId)
+          SignalDatabase.threads.deleteConversation(threadId, syncThreadDelete = false)
         }
       }
       MessageRequestResponse.Type.SPAM -> {
@@ -1174,7 +1192,7 @@ object SyncMessageProcessor {
 
     if (address == null && recipientId == null) {
       log(envelopeTimestamp, "Inserting defrag")
-      address = ApplicationDependencies.getPayments().wallet.mobileCoinPublicAddress
+      address = AppDependencies.payments.wallet.mobileCoinPublicAddress
       recipientId = Recipient.self().id
     }
 
@@ -1201,21 +1219,19 @@ object SyncMessageProcessor {
   }
 
   private fun handleSynchronizeKeys(storageKey: ByteString, envelopeTimestamp: Long) {
-    if (SignalStore.account().isLinkedDevice) {
+    if (SignalStore.account.isLinkedDevice) {
       log(envelopeTimestamp, "Synchronize keys.")
     } else {
       log(envelopeTimestamp, "Primary device ignores synchronize keys.")
       return
     }
 
-    SignalStore.storageService().setStorageKeyFromPrimary(StorageKey(storageKey.toByteArray()))
-
-    ApplicationDependencies.getJobManager().add(StorageSyncJob())
+    SignalStore.storageService.setStorageKeyFromPrimary(StorageKey(storageKey.toByteArray()))
   }
 
   @Throws(IOException::class)
   private fun handleSynchronizeContacts(contactsMessage: SyncMessage.Contacts, envelopeTimestamp: Long) {
-    if (SignalStore.account().isLinkedDevice) {
+    if (SignalStore.account.isLinkedDevice) {
       log(envelopeTimestamp, "Synchronize contacts.")
     } else {
       log(envelopeTimestamp, "Primary device ignores synchronize contacts.")
@@ -1229,7 +1245,7 @@ object SyncMessageProcessor {
 
     val attachment: SignalServiceAttachmentPointer = contactsMessage.blob!!.toSignalServiceAttachmentPointer()
 
-    ApplicationDependencies.getJobManager().add(MultiDeviceContactSyncJob(attachment))
+    AppDependencies.jobManager.add(MultiDeviceContactSyncJob(attachment))
   }
 
   private fun handleSynchronizeCallEvent(callEvent: SyncMessage.CallEvent, envelopeTimestamp: Long) {
@@ -1341,7 +1357,7 @@ object SyncMessageProcessor {
       )
     }
 
-    ApplicationDependencies.getJobManager().add(RefreshCallLinkDetailsJob(callLinkUpdate))
+    AppDependencies.jobManager.add(RefreshCallLinkDetailsJob(callLinkUpdate))
   }
 
   private fun handleSynchronizeOneToOneCallEvent(callEvent: SyncMessage.CallEvent, envelopeTimestamp: Long) {
@@ -1363,16 +1379,20 @@ object SyncMessageProcessor {
 
     val call = SignalDatabase.calls.getCallById(callId, recipientId)
     if (call != null) {
-      val typeMismatch = call.type !== type
-      val directionMismatch = call.direction !== direction
-      val eventDowngrade = call.event === CallTable.Event.ACCEPTED && event !== CallTable.Event.ACCEPTED
+      val typeMismatch = call.type != type
+      val directionMismatch = call.direction != direction
+      val eventDowngrade = call.event == CallTable.Event.ACCEPTED && event != CallTable.Event.ACCEPTED && event != CallTable.Event.DELETE
       val peerMismatch = call.peer != recipientId
 
-      if (typeMismatch || directionMismatch || eventDowngrade || peerMismatch) {
+      if (typeMismatch || directionMismatch || peerMismatch || eventDowngrade) {
         warn(envelopeTimestamp, "Call event sync message is not valid for existing call record, ignoring. type: $type direction: $direction  event: $event peerMismatch: $peerMismatch")
+      } else if (event == CallTable.Event.DELETE) {
+        SignalDatabase.calls.markCallDeletedFromSyncEvent(call)
       } else {
         SignalDatabase.calls.updateOneToOneCall(callId, event, timestamp)
       }
+    } else if (event == CallTable.Event.DELETE) {
+      SignalDatabase.calls.insertDeletedCallFromSyncEvent(callId, recipientId, type, direction, timestamp)
     } else {
       SignalDatabase.calls.insertOneToOneCall(callId, timestamp, recipientId, type, direction, event)
     }
@@ -1380,7 +1400,7 @@ object SyncMessageProcessor {
 
   @Throws(BadGroupIdException::class)
   private fun handleSynchronizeGroupOrAdHocCallEvent(callEvent: SyncMessage.CallEvent, envelopeTimestamp: Long) {
-    if (!FeatureFlags.adHocCalling() && callEvent.type == SyncMessage.CallEvent.Type.AD_HOC_CALL) {
+    if (!RemoteConfig.adHocCalling && callEvent.type == SyncMessage.CallEvent.Type.AD_HOC_CALL) {
       log(envelopeTimestamp, "Ad-Hoc calling is not currently supported by this client, ignoring.")
       return
     }
@@ -1392,6 +1412,23 @@ object SyncMessageProcessor {
     val event: CallTable.Event? = CallTable.Event.from(callEvent.event)
     val hasConversationId: Boolean = callEvent.conversationId != null
 
+    if (hasConversationId && type == CallTable.Type.AD_HOC_CALL && callEvent.event == SyncMessage.CallEvent.Event.OBSERVED && direction != null) {
+      log(envelopeTimestamp, "Handling OBSERVED ad-hoc calling event")
+      if (direction == CallTable.Direction.OUTGOING) {
+        warn("Received an OBSERVED sync message for an outgoing event. Dropping.")
+        return
+      }
+
+      val recipient = resolveCallLinkRecipient(callEvent)
+      SignalDatabase.calls.insertOrUpdateAdHocCallFromObserveEvent(
+        callRecipient = recipient,
+        timestamp = callEvent.timestamp!!,
+        callId = callId
+      )
+
+      return
+    }
+
     if (timestamp == 0L || type == null || direction == null || event == null || !hasConversationId) {
       warn(envelopeTimestamp, "Group/Ad-hoc call event sync message is not valid, ignoring. timestamp: $timestamp type: $type direction: $direction event: $event hasPeer: $hasConversationId")
       return
@@ -1399,9 +1436,7 @@ object SyncMessageProcessor {
 
     val recipient: Recipient? = when (type) {
       CallTable.Type.AD_HOC_CALL -> {
-        val callLinkRoomId = CallLinkRoomId.fromBytes(callEvent.conversationId!!.toByteArray())
-        val callLink = SignalDatabase.callLinks.getOrCreateCallLinkByRoomId(callLinkRoomId)
-        Recipient.resolved(callLink.recipientId)
+        resolveCallLinkRecipient(callEvent)
       }
       CallTable.Type.GROUP_CALL -> {
         val groupId: GroupId = GroupId.push(callEvent.conversationId!!.toByteArray())
@@ -1426,7 +1461,7 @@ object SyncMessageProcessor {
         return
       }
       when (event) {
-        CallTable.Event.DELETE -> SignalDatabase.calls.deleteGroupCall(call)
+        CallTable.Event.DELETE -> SignalDatabase.calls.markCallDeletedFromSyncEvent(call)
         CallTable.Event.ACCEPTED -> {
           if (call.timestamp > timestamp) {
             SignalDatabase.calls.setTimestamp(call.callId, recipient.id, timestamp)
@@ -1451,7 +1486,7 @@ object SyncMessageProcessor {
       }
     } else {
       when (event) {
-        CallTable.Event.DELETE -> SignalDatabase.calls.insertDeletedGroupCallFromSyncEvent(callEvent.id!!, recipient.id, direction, timestamp)
+        CallTable.Event.DELETE -> SignalDatabase.calls.insertDeletedCallFromSyncEvent(callEvent.id!!, recipient.id, type, direction, timestamp)
         CallTable.Event.ACCEPTED -> SignalDatabase.calls.insertAcceptedGroupCall(callEvent.id!!, recipient.id, direction, timestamp)
         CallTable.Event.NOT_ACCEPTED -> {
           if (callEvent.direction == SyncMessage.CallEvent.Direction.INCOMING) {
@@ -1465,8 +1500,193 @@ object SyncMessageProcessor {
     }
   }
 
+  private fun resolveCallLinkRecipient(callEvent: SyncMessage.CallEvent): Recipient {
+    val callLinkRoomId = CallLinkRoomId.fromBytes(callEvent.conversationId!!.toByteArray())
+    val callLink = SignalDatabase.callLinks.getOrCreateCallLinkByRoomId(callLinkRoomId)
+    return Recipient.resolved(callLink.recipientId)
+  }
+
+  private fun handleSynchronizeDeleteForMe(context: Context, deleteForMe: SyncMessage.DeleteForMe, envelopeTimestamp: Long, earlyMessageCacheEntry: EarlyMessageCacheEntry?) {
+    log(envelopeTimestamp, "Synchronize delete message messageDeletes=${deleteForMe.messageDeletes.size} conversationDeletes=${deleteForMe.conversationDeletes.size} localOnlyConversationDeletes=${deleteForMe.localOnlyConversationDeletes.size}")
+
+    if (deleteForMe.messageDeletes.isNotEmpty()) {
+      handleSynchronizeMessageDeletes(deleteForMe.messageDeletes, envelopeTimestamp, earlyMessageCacheEntry)
+    }
+
+    if (deleteForMe.conversationDeletes.isNotEmpty()) {
+      handleSynchronizeConversationDeletes(deleteForMe.conversationDeletes, envelopeTimestamp)
+    }
+
+    if (deleteForMe.localOnlyConversationDeletes.isNotEmpty()) {
+      handleSynchronizeLocalOnlyConversationDeletes(deleteForMe.localOnlyConversationDeletes, envelopeTimestamp)
+    }
+
+    if (deleteForMe.attachmentDeletes.isNotEmpty()) {
+      handleSynchronizeAttachmentDeletes(deleteForMe.attachmentDeletes, envelopeTimestamp, earlyMessageCacheEntry)
+    }
+
+    AppDependencies.messageNotifier.updateNotification(context)
+  }
+
+  private fun handleSynchronizeMessageDeletes(messageDeletes: List<SyncMessage.DeleteForMe.MessageDeletes>, envelopeTimestamp: Long, earlyMessageCacheEntry: EarlyMessageCacheEntry?) {
+    val messagesToDelete: List<MessageTable.SyncMessageId> = messageDeletes
+      .asSequence()
+      .map { it.messages }
+      .flatten()
+      .mapNotNull { it.toSyncMessageId(envelopeTimestamp) }
+      .toList()
+
+    val unhandled: List<MessageTable.SyncMessageId> = SignalDatabase.messages.deleteMessages(messagesToDelete)
+
+    for (syncMessage in unhandled) {
+      warn(envelopeTimestamp, "[handleSynchronizeDeleteForMe] Could not find matching message! timestamp: ${syncMessage.timetamp}  author: ${syncMessage.recipientId}")
+      if (earlyMessageCacheEntry != null) {
+        AppDependencies.earlyMessageCache.store(syncMessage.recipientId, syncMessage.timetamp, earlyMessageCacheEntry)
+      }
+    }
+
+    if (unhandled.isNotEmpty() && earlyMessageCacheEntry != null) {
+      PushProcessEarlyMessagesJob.enqueue()
+    }
+  }
+
+  private fun handleSynchronizeConversationDeletes(conversationDeletes: List<SyncMessage.DeleteForMe.ConversationDelete>, envelopeTimestamp: Long) {
+    for (delete in conversationDeletes) {
+      val threadRecipientId: RecipientId? = delete.conversation?.toRecipientId()
+
+      if (threadRecipientId == null) {
+        warn(envelopeTimestamp, "[handleSynchronizeDeleteForMe] Could not find matching conversation recipient")
+        continue
+      }
+
+      val threadId = SignalDatabase.threads.getThreadIdFor(threadRecipientId)
+      if (threadId == null) {
+        log(envelopeTimestamp, "[handleSynchronizeDeleteForMe] No thread for matching conversation for recipient: $threadRecipientId")
+        continue
+      }
+
+      var latestReceivedAt = SignalDatabase.messages.getLatestReceivedAt(threadId, delete.mostRecentMessages.mapNotNull { it.toSyncMessageId(envelopeTimestamp) })
+
+      if (latestReceivedAt == null && delete.mostRecentNonExpiringMessages.isNotEmpty()) {
+        log(envelopeTimestamp, "[handleSynchronizeDeleteForMe] Using backup non-expiring messages")
+        latestReceivedAt = SignalDatabase.messages.getLatestReceivedAt(threadId, delete.mostRecentNonExpiringMessages.mapNotNull { it.toSyncMessageId(envelopeTimestamp) })
+      }
+
+      if (latestReceivedAt != null) {
+        SignalDatabase.threads.trimThread(threadId = threadId, syncThreadTrimDeletes = false, trimBeforeDate = latestReceivedAt, inclusive = true)
+
+        if (delete.isFullDelete == true) {
+          val deleted = SignalDatabase.threads.deleteConversationIfContainsOnlyLocal(threadId)
+
+          if (deleted) {
+            log(envelopeTimestamp, "[handleSynchronizeDeleteForMe] Deleted thread with only local remaining")
+          }
+        }
+      } else {
+        warn(envelopeTimestamp, "[handleSynchronizeDeleteForMe] Unable to find most recent received at timestamp for recipient: $threadRecipientId thread: $threadId")
+      }
+    }
+  }
+
+  private fun handleSynchronizeLocalOnlyConversationDeletes(conversationDeletes: List<SyncMessage.DeleteForMe.LocalOnlyConversationDelete>, envelopeTimestamp: Long) {
+    for (delete in conversationDeletes) {
+      val threadRecipientId: RecipientId? = delete.conversation?.toRecipientId()
+
+      if (threadRecipientId == null) {
+        warn(envelopeTimestamp, "[handleSynchronizeDeleteForMe] Could not find matching conversation recipient")
+        continue
+      }
+
+      val threadId = SignalDatabase.threads.getThreadIdFor(threadRecipientId)
+      if (threadId == null) {
+        log(envelopeTimestamp, "[handleSynchronizeDeleteForMe] No thread for matching conversation for recipient: $threadRecipientId")
+        continue
+      }
+
+      val deleted = SignalDatabase.threads.deleteConversationIfContainsOnlyLocal(threadId)
+      if (!deleted) {
+        log(envelopeTimestamp, "[handleSynchronizeDeleteForMe] Thread is not local only or already empty recipient: $threadRecipientId thread: $threadId")
+      }
+    }
+  }
+
+  private fun handleSynchronizeAttachmentDeletes(attachmentDeletes: List<SyncMessage.DeleteForMe.AttachmentDelete>, envelopeTimestamp: Long, earlyMessageCacheEntry: EarlyMessageCacheEntry?) {
+    val toDelete: List<AttachmentTable.SyncAttachmentId> = attachmentDeletes
+      .mapNotNull { delete ->
+        delete.toSyncAttachmentId(delete.targetMessage?.toSyncMessageId(envelopeTimestamp), envelopeTimestamp)
+      }
+
+    val unhandled: List<MessageTable.SyncMessageId> = SignalDatabase.attachments.deleteAttachments(toDelete)
+
+    for (syncMessage in unhandled) {
+      warn(envelopeTimestamp, "[handleSynchronizeDeleteForMe] Could not find matching message for attachment delete! timestamp: ${syncMessage.timetamp}  author: ${syncMessage.recipientId}")
+      if (earlyMessageCacheEntry != null) {
+        AppDependencies.earlyMessageCache.store(syncMessage.recipientId, syncMessage.timetamp, earlyMessageCacheEntry)
+      }
+    }
+
+    if (unhandled.isNotEmpty() && earlyMessageCacheEntry != null) {
+      PushProcessEarlyMessagesJob.enqueue()
+    }
+  }
+
+  private fun SyncMessage.DeleteForMe.ConversationIdentifier.toRecipientId(): RecipientId? {
+    return when {
+      threadGroupId != null -> {
+        try {
+          val groupId: GroupId = GroupId.push(threadGroupId!!)
+          Recipient.externalPossiblyMigratedGroup(groupId).id
+        } catch (e: BadGroupIdException) {
+          null
+        }
+      }
+
+      threadServiceId != null -> {
+        ServiceId.parseOrNull(threadServiceId)?.let {
+          SignalDatabase.recipients.getOrInsertFromServiceId(it)
+        }
+      }
+
+      threadE164 != null -> {
+        SignalDatabase.recipients.getOrInsertFromE164(threadE164!!)
+      }
+
+      else -> null
+    }
+  }
+
+  private fun SyncMessage.DeleteForMe.AddressableMessage.toSyncMessageId(envelopeTimestamp: Long): MessageTable.SyncMessageId? {
+    return if (this.sentTimestamp != null && (this.authorServiceId != null || this.authorE164 != null)) {
+      val serviceId = ServiceId.parseOrNull(this.authorServiceId)
+      val id = if (serviceId != null) {
+        SignalDatabase.recipients.getOrInsertFromServiceId(serviceId)
+      } else {
+        SignalDatabase.recipients.getOrInsertFromE164(this.authorE164!!)
+      }
+
+      MessageTable.SyncMessageId(id, this.sentTimestamp!!)
+    } else {
+      warn(envelopeTimestamp, "[handleSynchronizeDeleteForMe] Invalid delete sync missing timestamp or author")
+      null
+    }
+  }
+
+  private fun SyncMessage.DeleteForMe.AttachmentDelete.toSyncAttachmentId(syncMessageId: MessageTable.SyncMessageId?, envelopeTimestamp: Long): AttachmentTable.SyncAttachmentId? {
+    val uuid = UuidUtil.fromByteStringOrNull(uuid)
+    val digest = fallbackDigest?.toByteArray()
+    val plaintextHash = fallbackPlaintextHash?.let { Base64.encodeWithPadding(it.toByteArray()) }
+
+    if (syncMessageId == null || (uuid == null && digest == null && plaintextHash == null)) {
+      warn(envelopeTimestamp, "[handleSynchronizeDeleteForMe] Invalid delete sync attachment missing identifiers")
+      return null
+    } else {
+      return AttachmentTable.SyncAttachmentId(syncMessageId, uuid, digest, plaintextHash)
+    }
+  }
+
+  // MOLLY: FIXME
   private fun handleSynchronizePniChangeNumber(pniChangeNumber: PniChangeNumber, updatedPni: String?, envelopeTimestamp: Long) {
-    if (SignalStore.account().isLinkedDevice) {
+    if (SignalStore.account.isLinkedDevice) {
       log(envelopeTimestamp, "Primary device changed number. Synchronizing.")
     } else {
       log(envelopeTimestamp, "Primary device should not receive number change updates. Ignoring.")
@@ -1482,18 +1702,18 @@ object SyncMessageProcessor {
       val signedPreKey = SignedPreKeyRecord(pniChangeNumber.signedPreKey!!.toByteArray())
       val pni = PNI.parseOrThrow(updatedPni)
 
-      val pniProtocolStore = ApplicationDependencies.getProtocolStore().pni()
-      val pniMetadataStore = SignalStore.account().pniPreKeys
+      val pniProtocolStore = AppDependencies.protocolStore.pni()
+      val pniMetadataStore = SignalStore.account.pniPreKeys
 
-      SignalStore.account().setPni(pni)
-      SignalStore.account().pniRegistrationId = pniChangeNumber.registrationId!!
-      SignalStore.account().setPniIdentityKeyAfterChangeNumber(IdentityKeyPair(pniChangeNumber.identityKeyPair!!.toByteArray()))
+      SignalStore.account.setPni(pni)
+      SignalStore.account.pniRegistrationId = pniChangeNumber.registrationId!!
+      SignalStore.account.setPniIdentityKeyAfterChangeNumber(IdentityKeyPair(pniChangeNumber.identityKeyPair!!.toByteArray()))
 
       pniProtocolStore.storeSignedPreKey(signedPreKey.id, signedPreKey)
       val oneTimePreKeys = PreKeyUtil.generateAndStoreOneTimeEcPreKeys(pniProtocolStore, pniMetadataStore)
 
       pniMetadataStore.activeSignedPreKeyId = signedPreKey.id
-      ApplicationDependencies.getSignalServiceAccountManager().setPreKeys(
+      AppDependencies.signalServiceAccountManager.setPreKeys(
         PreKeyUpload(
           serviceIdType = ServiceIdType.PNI,
           signedPreKey = signedPreKey,
@@ -1514,16 +1734,14 @@ object SyncMessageProcessor {
         true
       )
 
-      SignalStore.misc().hasPniInitializedDevices = true
-      ApplicationDependencies.getGroupsV2Authorization().clear()
+      AppDependencies.groupsV2Authorization.clear()
     } catch (e: InvalidMessageException) {
       warn(envelopeTimestamp, "Invalid signed prekey received while synchronize number change", e)
       return
     }
 
-    ApplicationDependencies.closeConnections()
-    ApplicationDependencies.getIncomingMessageObserver()
+    AppDependencies.resetNetwork(restartMessageObserver = true)
 
-    ApplicationDependencies.getJobManager().add(RotateCertificateJob())
+    AppDependencies.jobManager.add(RotateCertificateJob())
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/WebSocketDrainer.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/WebSocketDrainer.kt
index af974161f2..37a4331489 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/WebSocketDrainer.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/WebSocketDrainer.kt
@@ -5,7 +5,7 @@ import androidx.annotation.AnyThread
 import androidx.annotation.WorkerThread
 import org.signal.core.util.Stopwatch
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.JobTracker
 import org.thoughtcrime.securesms.jobmanager.JobTracker.JobListener
@@ -50,8 +50,8 @@ object WebSocketDrainer {
 
     var websocketDrainTimeout = requestedWebsocketDrainTimeoutMs
 
-    val context = ApplicationDependencies.getApplication()
-    val incomingMessageObserver = ApplicationDependencies.getIncomingMessageObserver()
+    val context = AppDependencies.application
+    val incomingMessageObserver = AppDependencies.incomingMessageObserver
     val powerManager = ServiceUtil.getPowerManager(context)
 
     val doze = PowerManagerCompat.isDeviceIdleMode(powerManager)
@@ -67,7 +67,7 @@ object WebSocketDrainer {
     }
 
     val wakeLockTag = WAKELOCK_PREFIX + System.currentTimeMillis()
-    val wakeLock = WakeLockUtil.acquire(ApplicationDependencies.getApplication(), PowerManager.PARTIAL_WAKE_LOCK, websocketDrainTimeout + QUEUE_TIMEOUT, wakeLockTag)
+    val wakeLock = WakeLockUtil.acquire(AppDependencies.application, PowerManager.PARTIAL_WAKE_LOCK, websocketDrainTimeout + QUEUE_TIMEOUT, wakeLockTag)
 
     return try {
       drainAndProcess(websocketDrainTimeout, incomingMessageObserver, keepAliveToken)
@@ -86,7 +86,7 @@ object WebSocketDrainer {
   private fun drainAndProcess(timeout: Long, incomingMessageObserver: IncomingMessageObserver, keepAliveToken: String): Boolean {
     val stopwatch = Stopwatch("websocket-strategy")
 
-    val jobManager = ApplicationDependencies.getJobManager()
+    val jobManager = AppDependencies.jobManager
     val queueListener = QueueFindingJobListener()
 
     jobManager.addListener(
@@ -148,7 +148,7 @@ object WebSocketDrainer {
 
   private fun blockUntilJobQueueDrained(queue: String, timeoutMs: Long): Boolean {
     val startTime = System.currentTimeMillis()
-    val jobManager = ApplicationDependencies.getJobManager()
+    val jobManager = AppDependencies.jobManager
     val markerJob = MarkerJob(queue)
     val jobState = jobManager.runSynchronously(markerJob, timeoutMs)
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/protocol/BufferedProtocolStore.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/protocol/BufferedProtocolStore.kt
index 1c26fe61e4..50e29fb827 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/protocol/BufferedProtocolStore.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/protocol/BufferedProtocolStore.kt
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.messages.protocol
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.whispersystems.signalservice.api.push.ServiceId
 
@@ -32,14 +32,14 @@ class BufferedProtocolStore private constructor(
    * Writes any buffered data to disk. You can continue to use the same buffered store afterwards.
    */
   fun flushToDisk() {
-    aciStore.second.flushToDisk(ApplicationDependencies.getProtocolStore().aci())
-    pniStore.second.flushToDisk(ApplicationDependencies.getProtocolStore().pni())
+    aciStore.second.flushToDisk(AppDependencies.protocolStore.aci())
+    pniStore.second.flushToDisk(AppDependencies.protocolStore.pni())
   }
 
   companion object {
     fun create(): BufferedProtocolStore {
-      val aci = SignalStore.account().requireAci()
-      val pni = SignalStore.account().requirePni()
+      val aci = SignalStore.account.requireAci()
+      val pni = SignalStore.account.requirePni()
 
       return BufferedProtocolStore(
         aciStore = aci to BufferedSignalServiceAccountDataStore(aci),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/protocol/BufferedSignalServiceAccountDataStore.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/protocol/BufferedSignalServiceAccountDataStore.kt
index 3f1846fd5d..33ffcdf3af 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/protocol/BufferedSignalServiceAccountDataStore.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/protocol/BufferedSignalServiceAccountDataStore.kt
@@ -21,10 +21,10 @@ import java.util.UUID
  */
 class BufferedSignalServiceAccountDataStore(selfServiceId: ServiceId) : SignalServiceAccountDataStore {
 
-  private val identityStore: BufferedIdentityKeyStore = if (selfServiceId == SignalStore.account().pni) {
-    BufferedIdentityKeyStore(selfServiceId, SignalStore.account().pniIdentityKey, SignalStore.account().pniRegistrationId)
+  private val identityStore: BufferedIdentityKeyStore = if (selfServiceId == SignalStore.account.pni) {
+    BufferedIdentityKeyStore(selfServiceId, SignalStore.account.pniIdentityKey, SignalStore.account.pniRegistrationId)
   } else {
-    BufferedIdentityKeyStore(selfServiceId, SignalStore.account().aciIdentityKey, SignalStore.account().registrationId)
+    BufferedIdentityKeyStore(selfServiceId, SignalStore.account.aciIdentityKey, SignalStore.account.registrationId)
   }
 
   private val oneTimePreKeyStore: BufferedOneTimePreKeyStore = BufferedOneTimePreKeyStore(selfServiceId)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/AccountConsistencyMigrationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/migrations/AccountConsistencyMigrationJob.kt
index 30294af951..029e5973c5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/AccountConsistencyMigrationJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/AccountConsistencyMigrationJob.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.migrations
 
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobs.AccountConsistencyWorkerJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -24,17 +24,17 @@ internal class AccountConsistencyMigrationJob(
   override fun isUiBlocking(): Boolean = false
 
   override fun performMigration() {
-    if (!SignalStore.account().hasAciIdentityKey()) {
+    if (!SignalStore.account.hasAciIdentityKey()) {
       Log.i(TAG, "No identity set yet, skipping.")
       return
     }
 
-    if (!SignalStore.account().isRegistered || SignalStore.account().aci == null) {
+    if (!SignalStore.account.isRegistered || SignalStore.account.aci == null) {
       Log.i(TAG, "Not yet registered, skipping.")
       return
     }
 
-    ApplicationDependencies.getJobManager().add(AccountConsistencyWorkerJob())
+    AppDependencies.jobManager.add(AccountConsistencyWorkerJob())
   }
 
   override fun shouldRetry(e: Exception): Boolean = false
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/AccountRecordMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/AccountRecordMigrationJob.java
index 40bdcce6c6..e55719050b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/AccountRecordMigrationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/AccountRecordMigrationJob.java
@@ -5,7 +5,7 @@
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobs.StorageSyncJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -47,7 +47,7 @@ public void performMigration() {
     }
 
     SignalDatabase.recipients().markNeedsSync(Recipient.self().getId());
-    ApplicationDependencies.getJobManager().add(new StorageSyncJob());
+    AppDependencies.getJobManager().add(new StorageSyncJob());
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java
index b2b9dd4a05..776bc81577 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java
@@ -12,6 +12,7 @@
 import org.greenrobot.eventbus.ThreadMode;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
+import org.thoughtcrime.securesms.jobmanager.migrations.RetrieveProfileJobMigration;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.stickers.BlessedPacks;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -135,9 +136,12 @@ static final class Version {
     static final int PNP_LAUNCH                    = 102;
     static final int EMOJI_VERSION_10              = 103;
     static final int ATTACHMENT_HASH_BACKFILL      = 104;
+    static final int SUBSCRIBER_ID                 = 105;
+    static final int CONTACT_LINK_REBUILD          = 106;
+    static final int DELETE_SYNC_CAPABILITY        = 107;
   }
 
-  public static final int CURRENT_VERSION = 104;
+  public static final int CURRENT_VERSION = 107;
 
  /**
    * This *must* be called after the {@link JobManager} has been instantiated, but *before* the call
@@ -155,7 +159,7 @@ public static void onApplicationCreate(@NonNull Context context, @NonNull JobMan
       VersionTracker.updateLastSeenVersion(context);
       return;
     } else {
-      Log.d(TAG, "About to update. Clearing deprecation flag.");
+      Log.d(TAG, "About to update. Clearing deprecation flag.", true);
       SignalStore.misc().setClientDeprecated(false);
     }
 
@@ -608,6 +612,18 @@ private static LinkedHashMap<Integer, MigrationJob> getMigrationJobs(@NonNull Co
       jobs.put(Version.ATTACHMENT_HASH_BACKFILL, new AttachmentHashBackfillMigrationJob());
     }
 
+    if (lastSeenVersion < Version.SUBSCRIBER_ID) {
+      jobs.put(Version.SUBSCRIBER_ID, new SubscriberIdMigrationJob());
+    }
+
+    if (lastSeenVersion < Version.CONTACT_LINK_REBUILD) {
+      jobs.put(Version.CONTACT_LINK_REBUILD, new ContactLinkRebuildMigrationJob());
+    }
+
+    if (lastSeenVersion < Version.DELETE_SYNC_CAPABILITY) {
+      jobs.put(Version.DELETE_SYNC_CAPABILITY, new AttributesMigrationJob());
+    }
+
     return jobs;
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/AttachmentHashBackfillMigrationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/migrations/AttachmentHashBackfillMigrationJob.kt
index 3b8718a7c2..bd479a2f0b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/AttachmentHashBackfillMigrationJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/AttachmentHashBackfillMigrationJob.kt
@@ -6,7 +6,7 @@
 package org.thoughtcrime.securesms.migrations
 
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobs.AttachmentHashBackfillJob
 import java.lang.Exception
@@ -26,7 +26,7 @@ internal class AttachmentHashBackfillMigrationJob(parameters: Parameters = Param
   override fun isUiBlocking(): Boolean = false
 
   override fun performMigration() {
-    ApplicationDependencies.getJobManager().add(AttachmentHashBackfillJob())
+    AppDependencies.jobManager.add(AttachmentHashBackfillJob())
   }
 
   override fun shouldRetry(e: Exception): Boolean = false
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/AttributesMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/AttributesMigrationJob.java
index 6ad5ac48c8..4bd984b260 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/AttributesMigrationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/AttributesMigrationJob.java
@@ -4,7 +4,7 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob;
 import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob;
@@ -39,9 +39,9 @@ public boolean isUiBlocking() {
   @Override
   public void performMigration() {
     Log.i(TAG, "Scheduling attributes upload and profile refresh job chain");
-    ApplicationDependencies.getJobManager().startChain(new RefreshAttributesJob())
-                                           .then(new RefreshOwnProfileJob())
-                                           .enqueue();
+    AppDependencies.getJobManager().startChain(new RefreshAttributesJob())
+                   .then(new RefreshOwnProfileJob())
+                   .enqueue();
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/AvatarIdRemovalMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/AvatarIdRemovalMigrationJob.java
index c97e6f0bf9..37e7e051e0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/AvatarIdRemovalMigrationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/AvatarIdRemovalMigrationJob.java
@@ -4,7 +4,7 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob;
 
@@ -38,7 +38,7 @@ public boolean isUiBlocking() {
 
   @Override
   public void performMigration() {
-    ApplicationDependencies.getJobManager().add(new RefreshOwnProfileJob());
+    AppDependencies.getJobManager().add(new RefreshOwnProfileJob());
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/BackupJitterMigrationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/migrations/BackupJitterMigrationJob.kt
index fba71ce2e8..c4aca674bc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/BackupJitterMigrationJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/BackupJitterMigrationJob.kt
@@ -22,13 +22,13 @@ internal class BackupJitterMigrationJob(parameters: Parameters = Parameters.Buil
   override fun isUiBlocking(): Boolean = false
 
   override fun performMigration() {
-    val hour = SignalStore.settings().backupHour
-    val minute = SignalStore.settings().backupMinute
+    val hour = SignalStore.settings.backupHour
+    val minute = SignalStore.settings.backupMinute
     if (hour == SettingsValues.BACKUP_DEFAULT_HOUR && minute == SettingsValues.BACKUP_DEFAULT_MINUTE) {
       val rand = Random()
       val newHour = rand.nextInt(3) + 1 // between 1AM - 3AM
       val newMinute = rand.nextInt(12) * 5 // 5 minute intervals up to +55 minutes
-      SignalStore.settings().setBackupSchedule(newHour, newMinute)
+      SignalStore.settings.setBackupSchedule(newHour, newMinute)
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/ContactLinkRebuildMigrationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/migrations/ContactLinkRebuildMigrationJob.kt
new file mode 100644
index 0000000000..8886bea192
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/ContactLinkRebuildMigrationJob.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.migrations
+
+import android.Manifest
+import android.content.pm.PackageManager
+import androidx.core.content.ContextCompat
+import org.signal.contacts.SystemContactsRepository
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.BuildConfig
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.jobmanager.Job
+import org.thoughtcrime.securesms.jobs.SyncSystemContactLinksJob
+
+/**
+ * This migration job is responsible for rebuilding the contact links for all contacts in the system. Contact links
+ * refers to the raw contact table entries that are used to place links into the system contacts app to message,
+ * voice, and video call a given contact on Signal. This job is necessary to ensure that all contacts have the correct
+ * links in the system contacts app. At the time of writing, this job is adding the video call link and changing the
+ * text of the voice call link to "Signal Voice Call" instead of "Signal Call". This job could be reused in the future
+ * if other links are added or changed.
+ */
+internal class ContactLinkRebuildMigrationJob(parameters: Parameters = Parameters.Builder().build()) : MigrationJob(parameters) {
+  companion object {
+    private val TAG = Log.tag(ContactLinkRebuildMigrationJob::class.java)
+    const val KEY = "ContactLinkRebuildMigrationJob"
+  }
+
+  override fun getFactoryKey(): String = KEY
+
+  override fun isUiBlocking(): Boolean = false
+
+  override fun performMigration() {
+    val account = SystemContactsRepository.getOrCreateSystemAccount(context, BuildConfig.APPLICATION_ID, context.getString(R.string.app_name))
+    if (account == null) {
+      Log.w(TAG, "Failed to create an account!")
+      return
+    }
+
+    if (ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_CONTACTS) != PackageManager.PERMISSION_GRANTED) {
+      Log.w(TAG, "We don't have the right permissions to perform this migration!")
+      return
+    }
+
+    SystemContactsRepository.addMessageAndCallLinksToContacts(
+      context = context,
+      config = SyncSystemContactLinksJob.buildContactLinkConfiguration(context, account),
+      targetE164s = emptySet(),
+      removeIfMissing = true
+    )
+
+    AppDependencies.jobManager.add(SyncSystemContactLinksJob())
+  }
+
+  override fun shouldRetry(e: Exception): Boolean = false
+
+  class Factory : Job.Factory<ContactLinkRebuildMigrationJob> {
+    override fun create(parameters: Parameters, serializedData: ByteArray?): ContactLinkRebuildMigrationJob {
+      return ContactLinkRebuildMigrationJob(parameters)
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/CopyUsernameToSignalStoreMigrationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/migrations/CopyUsernameToSignalStoreMigrationJob.kt
index 0eb6e23530..504001f6b6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/CopyUsernameToSignalStoreMigrationJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/CopyUsernameToSignalStoreMigrationJob.kt
@@ -25,7 +25,7 @@ internal class CopyUsernameToSignalStoreMigrationJob(
   override fun isUiBlocking(): Boolean = false
 
   override fun performMigration() {
-    if (SignalStore.account().aci == null || SignalStore.account().pni == null) {
+    if (SignalStore.account.aci == null || SignalStore.account.pni == null) {
       Log.i(TAG, "ACI/PNI are unset, skipping.")
       return
     }
@@ -37,7 +37,7 @@ internal class CopyUsernameToSignalStoreMigrationJob(
       return
     }
 
-    SignalStore.account().username = self.username.get()
+    SignalStore.account.username = self.username.get()
 
     // New fields in storage service, so we trigger a sync
     SignalDatabase.recipients.markNeedsSync(self.id)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/DirectoryRefreshMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/DirectoryRefreshMigrationJob.java
index db93f11a7e..a3e40e2d0a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/DirectoryRefreshMigrationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/DirectoryRefreshMigrationJob.java
@@ -39,8 +39,8 @@ public boolean isUiBlocking() {
 
   @Override
   public void performMigration() throws IOException {
-    if (!SignalStore.account().isRegistered()                      ||
-        !SignalStore.registrationValues().isRegistrationComplete() ||
+    if (!SignalStore.account().isRegistered() ||
+        !SignalStore.registration().isRegistrationComplete() ||
         SignalStore.account().getAci() == null)
     {
       Log.w(TAG, "Not registered! Skipping.");
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/EmojiDownloadMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/EmojiDownloadMigrationJob.java
index 6ad2f3ef32..2b75986320 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/EmojiDownloadMigrationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/EmojiDownloadMigrationJob.java
@@ -3,7 +3,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobs.DownloadLatestEmojiDataJob;
 import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob;
@@ -35,7 +35,7 @@ public boolean isUiBlocking() {
 
   @Override
   public void performMigration() {
-    ApplicationDependencies.getJobManager().add(new DownloadLatestEmojiDataJob(false));
+    AppDependencies.getJobManager().add(new DownloadLatestEmojiDataJob(false));
     EmojiSearchIndexDownloadJob.scheduleImmediately();
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/EmojiSearchIndexCheckMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/EmojiSearchIndexCheckMigrationJob.java
index 926c3c9203..a9c14a0226 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/EmojiSearchIndexCheckMigrationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/EmojiSearchIndexCheckMigrationJob.java
@@ -6,9 +6,7 @@
 import org.signal.core.util.SqlUtil;
 import org.thoughtcrime.securesms.database.EmojiSearchTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
-import org.thoughtcrime.securesms.jobs.DownloadLatestEmojiDataJob;
 import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 
@@ -40,7 +38,7 @@ public boolean isUiBlocking() {
   @Override
   public void performMigration() {
     if (SqlUtil.isEmpty(SignalDatabase.getRawDatabase(), EmojiSearchTable.TABLE_NAME)) {
-      SignalStore.emojiValues().clearSearchIndexMetadata();
+      SignalStore.emoji().clearSearchIndexMetadata();
       EmojiSearchIndexDownloadJob.scheduleImmediately();
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/IdentityTableCleanupMigrationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/migrations/IdentityTableCleanupMigrationJob.kt
index 880a66dbfa..e8f33f21f6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/IdentityTableCleanupMigrationJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/IdentityTableCleanupMigrationJob.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.migrations
 
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.database.IdentityTable
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobs.AccountConsistencyWorkerJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -26,42 +26,42 @@ internal class IdentityTableCleanupMigrationJob(
   override fun isUiBlocking(): Boolean = false
 
   override fun performMigration() {
-    if (SignalStore.account().aci == null || SignalStore.account().pni == null) {
+    if (SignalStore.account.aci == null || SignalStore.account.pni == null) {
       Log.i(TAG, "ACI/PNI are unset, skipping.")
       return
     }
 
-    if (!SignalStore.account().hasAciIdentityKey()) {
+    if (!SignalStore.account.hasAciIdentityKey()) {
       Log.i(TAG, "No ACI identity set yet, skipping.")
       return
     }
 
-    if (!SignalStore.account().hasPniIdentityKey()) {
+    if (!SignalStore.account.hasPniIdentityKey()) {
       Log.i(TAG, "No PNI identity set yet, skipping.")
       return
     }
 
-    ApplicationDependencies.getProtocolStore().aci().identities().saveIdentityWithoutSideEffects(
+    AppDependencies.protocolStore.aci().identities().saveIdentityWithoutSideEffects(
       Recipient.self().id,
-      SignalStore.account().aci!!,
-      SignalStore.account().aciIdentityKey.publicKey,
+      SignalStore.account.aci!!,
+      SignalStore.account.aciIdentityKey.publicKey,
       IdentityTable.VerifiedStatus.VERIFIED,
       true,
       System.currentTimeMillis(),
       true
     )
 
-    ApplicationDependencies.getProtocolStore().pni().identities().saveIdentityWithoutSideEffects(
+    AppDependencies.protocolStore.pni().identities().saveIdentityWithoutSideEffects(
       Recipient.self().id,
-      SignalStore.account().pni!!,
-      SignalStore.account().pniIdentityKey.publicKey,
+      SignalStore.account.pni!!,
+      SignalStore.account.pniIdentityKey.publicKey,
       IdentityTable.VerifiedStatus.VERIFIED,
       true,
       System.currentTimeMillis(),
       true
     )
 
-    ApplicationDependencies.getJobManager().add(AccountConsistencyWorkerJob())
+    AppDependencies.jobManager.add(AccountConsistencyWorkerJob())
   }
 
   override fun shouldRetry(e: Exception): Boolean = false
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/MigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/MigrationJob.java
index 1331b24194..7a66acee60 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/MigrationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/MigrationJob.java
@@ -7,7 +7,7 @@
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobLogger;
 import org.thoughtcrime.securesms.jobmanager.impl.BackoffUtil;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 
 /**
  * A base class for jobs that are intended to be used in {@link ApplicationMigrations}. Some
@@ -47,7 +47,7 @@ abstract class MigrationJob extends Job {
     } catch (Exception e) {
       if (shouldRetry(e)) {
         Log.w(TAG, JobLogger.format(this, "Encountered a retryable exception."), e);
-        return Result.retry(BackoffUtil.exponentialBackoff(getRunAttempt() + 1, FeatureFlags.getDefaultMaxBackoff()));
+        return Result.retry(BackoffUtil.exponentialBackoff(getRunAttempt() + 1, RemoteConfig.getDefaultMaxBackoff()));
       } else {
         Log.w(TAG, JobLogger.format(this, "Encountered a non-runtime fatal exception."), e);
         throw new FailedMigrationError(e);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/PinOptOutMigration.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/PinOptOutMigration.java
index c4d0273ae9..4506ed0939 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/PinOptOutMigration.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/PinOptOutMigration.java
@@ -4,7 +4,7 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob;
 import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob;
@@ -41,10 +41,10 @@ void performMigration() {
       Log.w(TAG, "Discovered a legacy opt-out user! Resetting the state.");
 
       SignalStore.svr().optOut();
-      ApplicationDependencies.getJobManager().startChain(new RefreshAttributesJob())
-                                             .then(new RefreshOwnProfileJob())
-                                             .then(new StorageForcePushJob())
-                                             .enqueue();
+      AppDependencies.getJobManager().startChain(new RefreshAttributesJob())
+                     .then(new RefreshOwnProfileJob())
+                     .then(new StorageForcePushJob())
+                     .enqueue();
     } else if (SignalStore.svr().hasOptedOut()) {
       Log.i(TAG, "Discovered an opt-out user, but they're already in a good state. No action required.");
     } else {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/PinReminderMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/PinReminderMigrationJob.java
index 6fbfdf6266..81dc9d97ee 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/PinReminderMigrationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/PinReminderMigrationJob.java
@@ -34,8 +34,8 @@ boolean isUiBlocking() {
   @Override
   void performMigration() {
     boolean value = SecurePreferenceManager.getSecurePreferences(context).getBoolean("pref_signal_enable_pinv2_reminders", true);
-    SignalStore.pinValues().setPinRemindersEnabled(value);
-    SignalStore.pinValues().setNextReminderIntervalToAtMost(TimeUnit.DAYS.toMillis(3));
+    SignalStore.pin().setPinRemindersEnabled(value);
+    SignalStore.pin().setNextReminderIntervalToAtMost(TimeUnit.DAYS.toMillis(3));
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/PniAccountInitializationMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/PniAccountInitializationMigrationJob.java
index 9d5ca9fd22..9ea8ac555b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/PniAccountInitializationMigrationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/PniAccountInitializationMigrationJob.java
@@ -8,7 +8,7 @@
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.thoughtcrime.securesms.crypto.PreKeyUtil;
 import org.thoughtcrime.securesms.crypto.storage.PreKeyMetadataStore;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -70,8 +70,8 @@ public void performMigration() throws IOException {
       Log.w(TAG, "Already generated the PNI identity. Skipping this step.");
     }
 
-    SignalServiceAccountManager   accountManager = ApplicationDependencies.getSignalServiceAccountManager();
-    SignalServiceAccountDataStore protocolStore  = ApplicationDependencies.getProtocolStore().pni();
+    SignalServiceAccountManager   accountManager = AppDependencies.getSignalServiceAccountManager();
+    SignalServiceAccountDataStore protocolStore  = AppDependencies.getProtocolStore().pni();
     PreKeyMetadataStore           metadataStore  = SignalStore.account().pniPreKeys();
 
     if (!metadataStore.isSignedPreKeyRegistered()) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/PniMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/PniMigrationJob.java
index 6035f6cdc8..b392168f76 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/PniMigrationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/PniMigrationJob.java
@@ -5,7 +5,7 @@
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -47,7 +47,7 @@ void performMigration() throws Exception {
       return;
     }
 
-    PNI pni = PNI.parseOrNull(ApplicationDependencies.getSignalServiceAccountManager().getWhoAmI().getPni());
+    PNI pni = PNI.parseOrNull(AppDependencies.getSignalServiceAccountManager().getWhoAmI().getPni());
 
     if (pni == null) {
       throw new IOException("Invalid PNI!");
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/PnpLaunchMigrationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/migrations/PnpLaunchMigrationJob.kt
index 314ed73c23..2ecd4f34a2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/PnpLaunchMigrationJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/PnpLaunchMigrationJob.kt
@@ -5,7 +5,7 @@
 
 package org.thoughtcrime.securesms.migrations
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobs.ProfileUploadJob
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob
@@ -24,7 +24,7 @@ internal class PnpLaunchMigrationJob(parameters: Parameters = Parameters.Builder
   override fun isUiBlocking(): Boolean = false
 
   override fun performMigration() {
-    ApplicationDependencies.getJobManager()
+    AppDependencies.jobManager
       .startChain(RefreshAttributesJob())
       .then(ProfileUploadJob())
       .enqueue()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/PreKeysSyncMigrationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/migrations/PreKeysSyncMigrationJob.kt
index 37204996d3..f4b87fc5d6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/PreKeysSyncMigrationJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/PreKeysSyncMigrationJob.kt
@@ -22,7 +22,7 @@ internal class PreKeysSyncMigrationJob(
   override fun isUiBlocking(): Boolean = false
 
   override fun performMigration() {
-    SignalStore.misc().lastFullPrekeyRefreshTime = 0
+    SignalStore.misc.lastFullPrekeyRefreshTime = 0
     PreKeysSyncJob.enqueue()
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/ProfileMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/ProfileMigrationJob.java
index 8d1e12deaa..289d30cacc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/ProfileMigrationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/ProfileMigrationJob.java
@@ -4,7 +4,7 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobs.ProfileUploadJob;
 
@@ -38,7 +38,7 @@ public boolean isUiBlocking() {
   @Override
   public void performMigration() {
     Log.i(TAG, "Scheduling profile upload job");
-    ApplicationDependencies.getJobManager().add(new ProfileUploadJob());
+    AppDependencies.getJobManager().add(new ProfileUploadJob());
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/RecheckPaymentsMigrationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/migrations/RecheckPaymentsMigrationJob.kt
index 64458944eb..1aac61632c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/RecheckPaymentsMigrationJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/RecheckPaymentsMigrationJob.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.migrations
 
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobs.PaymentLedgerUpdateJob
 import org.thoughtcrime.securesms.jobs.PaymentTransactionCheckJob
@@ -37,7 +37,7 @@ internal class RecheckPaymentsMigrationJob(
     if (jobs.isNotEmpty()) {
       jobs += PaymentLedgerUpdateJob.updateLedger()
     }
-    ApplicationDependencies.getJobManager().addAll(jobs)
+    AppDependencies.jobManager.addAll(jobs)
   }
 
   override fun shouldRetry(e: Exception): Boolean = false
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/SelfRegisteredStateMigrationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/migrations/SelfRegisteredStateMigrationJob.kt
index 3033750395..6b9a0e9060 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/SelfRegisteredStateMigrationJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/SelfRegisteredStateMigrationJob.kt
@@ -25,12 +25,12 @@ internal class SelfRegisteredStateMigrationJob(
   override fun isUiBlocking(): Boolean = false
 
   override fun performMigration() {
-    if (SignalStore.account().isRegistered && SignalStore.account().aci != null) {
+    if (SignalStore.account.isRegistered && SignalStore.account.aci != null) {
       val record = SignalDatabase.recipients.getRecord(Recipient.self().id)
 
       if (record.registered != RecipientTable.RegisteredState.REGISTERED) {
         Log.w(TAG, "Inconsistent registered state! Fixing...")
-        SignalDatabase.recipients.markRegistered(Recipient.self().id, SignalStore.account().aci!!)
+        SignalDatabase.recipients.markRegistered(Recipient.self().id, SignalStore.account.aci!!)
       } else {
         Log.d(TAG, "Local user is already registered.")
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/StickerAdditionMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/StickerAdditionMigrationJob.java
index a18c17505d..f00eb709d5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/StickerAdditionMigrationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/StickerAdditionMigrationJob.java
@@ -6,7 +6,7 @@
 import com.annimon.stream.Stream;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
@@ -57,7 +57,7 @@ public boolean isUiBlocking() {
 
   @Override
   public void performMigration() {
-    JobManager jobManager = ApplicationDependencies.getJobManager();
+    JobManager jobManager = AppDependencies.getJobManager();
 
     for (BlessedPacks.Pack pack : packs) {
       Log.i(TAG, "Installing reference for blessed pack: " + pack.getPackId());
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/StickerDayByDayMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/StickerDayByDayMigrationJob.java
index 1b16c34854..7280bf412c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/StickerDayByDayMigrationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/StickerDayByDayMigrationJob.java
@@ -3,7 +3,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob;
 import org.thoughtcrime.securesms.stickers.BlessedPacks;
@@ -35,7 +35,7 @@ public boolean isUiBlocking() {
 
   @Override
   public void performMigration() {
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.DAY_BY_DAY.getPackId(), BlessedPacks.DAY_BY_DAY.getPackKey(), false));
+    AppDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.DAY_BY_DAY.getPackId(), BlessedPacks.DAY_BY_DAY.getPackKey(), false));
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/StickerMyDailyLifeMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/StickerMyDailyLifeMigrationJob.java
index 608b1334ab..916578aa41 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/StickerMyDailyLifeMigrationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/StickerMyDailyLifeMigrationJob.java
@@ -3,7 +3,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob;
 import org.thoughtcrime.securesms.stickers.BlessedPacks;
@@ -35,7 +35,7 @@ public boolean isUiBlocking() {
 
   @Override
   public void performMigration() {
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.MY_DAILY_LIFE.getPackId(), BlessedPacks.MY_DAILY_LIFE.getPackKey(), false));
+    AppDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.MY_DAILY_LIFE.getPackId(), BlessedPacks.MY_DAILY_LIFE.getPackKey(), false));
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/StorageCapabilityMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/StorageCapabilityMigrationJob.java
index c7be56d8bb..28245dba36 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/StorageCapabilityMigrationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/StorageCapabilityMigrationJob.java
@@ -4,7 +4,7 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.jobs.MultiDeviceKeysUpdateJob;
@@ -49,7 +49,7 @@ public boolean isUiBlocking() {
 
   @Override
   public void performMigration() {
-    JobManager jobManager = ApplicationDependencies.getJobManager();
+    JobManager jobManager = AppDependencies.getJobManager();
 
     jobManager.startChain(new RefreshAttributesJob()).then(new RefreshOwnProfileJob()).enqueue();
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/StorageFixLocalUnknownMigrationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/migrations/StorageFixLocalUnknownMigrationJob.kt
index 488395884a..e2fd846455 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/StorageFixLocalUnknownMigrationJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/StorageFixLocalUnknownMigrationJob.kt
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.migrations
 import org.signal.core.util.logging.Log
 import org.signal.core.util.withinTransaction
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobs.MultiDeviceKeysUpdateJob
 import org.thoughtcrime.securesms.jobs.StorageSyncJob
@@ -28,7 +28,7 @@ internal class StorageFixLocalUnknownMigrationJob(
 
   @Suppress("UsePropertyAccessSyntax")
   override fun performMigration() {
-    val localStorageIds = SignalStore.storageService().getManifest().storageIds.toSet()
+    val localStorageIds = SignalStore.storageService.getManifest().storageIds.toSet()
     val unknownLocalIds = SignalDatabase.unknownStorageIds.getAllUnknownIds().toSet()
     val danglingLocalUnknownIds = unknownLocalIds - localStorageIds
 
@@ -42,7 +42,7 @@ internal class StorageFixLocalUnknownMigrationJob(
       SignalDatabase.unknownStorageIds.delete(danglingLocalUnknownIds)
     }
 
-    val jobManager = ApplicationDependencies.getJobManager()
+    val jobManager = AppDependencies.jobManager
 
     if (TextSecurePreferences.isMultiDevice(context)) {
       Log.i(TAG, "Multi-device.")
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/StorageServiceMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/StorageServiceMigrationJob.java
index dcaad4fd44..4c562f0cf6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/StorageServiceMigrationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/StorageServiceMigrationJob.java
@@ -5,7 +5,7 @@
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.jobs.MultiDeviceKeysUpdateJob;
@@ -50,7 +50,7 @@ public void performMigration() {
 
     SignalDatabase.recipients().markNeedsSync(Recipient.self().getId());
 
-    JobManager jobManager = ApplicationDependencies.getJobManager();
+    JobManager jobManager = AppDependencies.getJobManager();
 
     if (TextSecurePreferences.isMultiDevice(context)) {
       Log.i(TAG, "Multi-device.");
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/StoryViewedReceiptsStateMigrationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/migrations/StoryViewedReceiptsStateMigrationJob.kt
index 0a29399090..43f2ed2cf8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/StoryViewedReceiptsStateMigrationJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/StoryViewedReceiptsStateMigrationJob.kt
@@ -22,10 +22,10 @@ internal class StoryViewedReceiptsStateMigrationJob(
   override fun isUiBlocking(): Boolean = true
 
   override fun performMigration() {
-    SignalStore.storyValues().isFeatureDisabled = false
-    if (!SignalStore.storyValues().isViewedReceiptsStateSet()) {
-      SignalStore.storyValues().viewedReceiptsEnabled = TextSecurePreferences.isReadReceiptsEnabled(context)
-      if (SignalStore.account().isRegistered) {
+    SignalStore.story.isFeatureDisabled = false
+    if (!SignalStore.story.isViewedReceiptsStateSet()) {
+      SignalStore.story.viewedReceiptsEnabled = TextSecurePreferences.isReadReceiptsEnabled(context)
+      if (SignalStore.account.isRegistered) {
         recipients.markNeedsSync(Recipient.self().id)
         StorageSyncHelper.scheduleSyncForDataChange()
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/SubscriberIdMigrationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/migrations/SubscriberIdMigrationJob.kt
new file mode 100644
index 0000000000..14c0a99e4d
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/SubscriberIdMigrationJob.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.migrations
+
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.toPaymentMethodType
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
+import org.thoughtcrime.securesms.jobmanager.Job
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import java.util.Currency
+
+/**
+ * Migrates all subscriber ids from the key value store into the database.
+ */
+internal class SubscriberIdMigrationJob(
+  parameters: Parameters = Parameters.Builder().build()
+) : MigrationJob(
+  parameters
+) {
+
+  companion object {
+    const val KEY = "SubscriberIdMigrationJob"
+  }
+
+  override fun getFactoryKey(): String = KEY
+
+  override fun isUiBlocking(): Boolean = false
+
+  override fun performMigration() {
+    Currency.getAvailableCurrencies().forEach { currency ->
+      val subscriber = SignalStore.inAppPayments.getSubscriber(currency)
+
+      if (subscriber != null) {
+        SignalDatabase.inAppPaymentSubscribers.insertOrReplace(
+          InAppPaymentSubscriberRecord(
+            subscriber.subscriberId,
+            subscriber.currency,
+            InAppPaymentSubscriberRecord.Type.DONATION,
+            SignalStore.inAppPayments.shouldCancelSubscriptionBeforeNextSubscribeAttempt,
+            SignalStore.inAppPayments.getSubscriptionPaymentSourceType().toPaymentMethodType()
+          )
+        )
+      }
+    }
+  }
+
+  override fun shouldRetry(e: Exception): Boolean = false
+
+  class Factory : Job.Factory<SubscriberIdMigrationJob> {
+    override fun create(parameters: Parameters, serializedData: ByteArray?): SubscriberIdMigrationJob {
+      return SubscriberIdMigrationJob(parameters)
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/Svr2MirrorMigrationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/migrations/Svr2MirrorMigrationJob.kt
index 37d5a807ab..3441b99f0d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/Svr2MirrorMigrationJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/Svr2MirrorMigrationJob.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.migrations
 
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobs.Svr2MirrorJob
 
@@ -22,7 +22,7 @@ internal class Svr2MirrorMigrationJob(
   override fun isUiBlocking(): Boolean = false
 
   override fun performMigration() {
-    ApplicationDependencies.getJobManager().add(Svr2MirrorJob())
+    AppDependencies.jobManager.add(Svr2MirrorJob())
   }
 
   override fun shouldRetry(e: Exception): Boolean = false
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/SyncKeysMigrationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/migrations/SyncKeysMigrationJob.kt
index dd26dc4573..6fd2a9b311 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/SyncKeysMigrationJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/SyncKeysMigrationJob.kt
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.migrations
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobs.MultiDeviceKeysUpdateJob
 import org.thoughtcrime.securesms.util.TextSecurePreferences
@@ -22,7 +22,7 @@ internal class SyncKeysMigrationJob(
 
   override fun performMigration() {
     if (TextSecurePreferences.isMultiDevice(context)) {
-      ApplicationDependencies.getJobManager().add(MultiDeviceKeysUpdateJob())
+      AppDependencies.jobManager.add(MultiDeviceKeysUpdateJob())
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/TrimByLengthSettingsMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/TrimByLengthSettingsMigrationJob.java
index b4bc39f67f..fbdb0a4cd7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/TrimByLengthSettingsMigrationJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/TrimByLengthSettingsMigrationJob.java
@@ -6,7 +6,7 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.util.SecurePreferenceManager;
@@ -35,7 +35,7 @@ boolean isUiBlocking() {
 
   @Override
   void performMigration() throws Exception {
-    SharedPreferences preferences = SecurePreferenceManager.getSecurePreferences(ApplicationDependencies.getApplication());
+    SharedPreferences preferences = SecurePreferenceManager.getSecurePreferences(AppDependencies.getApplication());
     if (preferences.contains(THREAD_TRIM_ENABLED)) {
       SignalStore.settings().setThreadTrimByLengthEnabled(preferences.getBoolean(THREAD_TRIM_ENABLED, false));
       //noinspection ConstantConditions
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/UpdateSmsJobsMigrationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/migrations/UpdateSmsJobsMigrationJob.kt
index 076ca6fb79..57f7bbb4a0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/UpdateSmsJobsMigrationJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/UpdateSmsJobsMigrationJob.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.migrations
 
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.JsonJobData
 import org.thoughtcrime.securesms.jobmanager.persistence.JobSpec
@@ -31,10 +31,10 @@ internal class UpdateSmsJobsMigrationJob(
   override fun isUiBlocking(): Boolean = false
 
   override fun performMigration() {
-    val idOffset = SignalStore.plaintext().smsMigrationIdOffset
+    val idOffset = SignalStore.plaintext.smsMigrationIdOffset
     check(idOffset >= 0) { "Invalid ID offset of $idOffset -- this shouldn't be possible!" }
 
-    ApplicationDependencies.getJobManager().update { jobSpec ->
+    AppDependencies.jobManager.update { jobSpec ->
       when (jobSpec.factoryKey) {
         "PushTextSendJob" -> jobSpec.updateAndSerialize("message_id", null, idOffset)
         "ReactionSendJob" -> jobSpec.updateAndSerialize("message_id", "is_mms", idOffset)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
index b61809d34c..c5622b0828 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
@@ -17,25 +17,19 @@
 package org.thoughtcrime.securesms.mms;
 
 import android.Manifest;
-import android.annotation.SuppressLint;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.PorterDuff;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.provider.ContactsContract;
-import android.provider.OpenableColumns;
-import android.util.Pair;
 import android.view.View;
 import android.widget.Toast;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.WorkerThread;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 
@@ -50,7 +44,6 @@
 import org.signal.core.util.concurrent.SimpleTask;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.components.AudioView;
 import org.thoughtcrime.securesms.components.DocumentView;
 import org.thoughtcrime.securesms.components.RemovableEditableMediaView;
@@ -58,7 +51,6 @@
 import org.thoughtcrime.securesms.components.location.SignalMapView;
 import org.thoughtcrime.securesms.components.location.SignalPlace;
 import org.thoughtcrime.securesms.conversation.MessageSendType;
-import org.thoughtcrime.securesms.database.AttachmentTable;
 import org.thoughtcrime.securesms.database.MediaTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.giph.ui.GiphyActivity;
@@ -81,7 +73,7 @@
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.util.BitmapUtil;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.ProfileUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
@@ -256,149 +248,6 @@ public void setLocation(@NonNull final SignalPlace place,
     attachmentListener.onAttachmentChanged();
   }
 
-  @SuppressLint("StaticFieldLeak")
-  public ListenableFuture<Boolean> setMedia(@NonNull final RequestManager requestManager,
-                                            @NonNull final Uri uri,
-                                            @NonNull final SlideFactory.MediaType mediaType,
-                                            @NonNull final MediaConstraints constraints,
-                                                     final int width,
-                                                     final int height)
-  {
-    inflateStub();
-
-    final SettableFuture<Boolean> result = new SettableFuture<>();
-
-    new AsyncTask<Void, Void, Slide>() {
-      private boolean areConstraintsSatisfied = false;
-
-      @Override
-      protected void onPreExecute() {
-        thumbnail.clear(requestManager);
-        thumbnail.showProgressSpinner();
-        attachmentViewStub.get().setVisibility(View.VISIBLE);
-      }
-
-      @Override
-      protected @Nullable Slide doInBackground(Void... params) {
-        Slide slide;
-        try {
-          if (PartAuthority.isLocalUri(uri)) {
-            slide = getManuallyCalculatedSlideInfo(uri, width, height);
-          } else {
-            Slide result = getContentResolverSlideInfo(uri, width, height);
-            slide = (result == null) ? getManuallyCalculatedSlideInfo(uri, width, height) : result;
-          }
-        } catch (IOException e) {
-          Log.w(TAG, e);
-          return null;
-        }
-
-        this.areConstraintsSatisfied = areConstraintsSatisfied(context, slide, constraints);
-        return slide;
-      }
-
-      @Override
-      protected void onPostExecute(@Nullable final Slide slide) {
-        if (slide == null) {
-          attachmentViewStub.get().setVisibility(View.GONE);
-          Toast.makeText(context,
-                         R.string.ConversationActivity_sorry_there_was_an_error_setting_your_attachment,
-                         Toast.LENGTH_SHORT).show();
-          result.set(false);
-        } else if (!areConstraintsSatisfied) {
-          attachmentViewStub.get().setVisibility(View.GONE);
-          Toast.makeText(context,
-                         R.string.ConversationActivity_attachment_exceeds_size_limits,
-                         Toast.LENGTH_SHORT).show();
-          result.set(false);
-        } else {
-          setSlide(slide);
-          attachmentViewStub.get().setVisibility(View.VISIBLE);
-
-          if (slide.hasAudio()) {
-            audioView.setAudio((AudioSlide) slide, null, false, false);
-            removableMediaView.display(audioView, false);
-            result.set(true);
-          } else if (slide.hasDocument()) {
-            documentView.setDocument((DocumentSlide) slide, false);
-            removableMediaView.display(documentView, false);
-            result.set(true);
-          } else {
-            Attachment attachment = slide.asAttachment();
-            result.deferTo(thumbnail.setImageResource(requestManager, slide, false, true, attachment.width, attachment.height));
-            removableMediaView.display(thumbnail, mediaType == SlideFactory.MediaType.IMAGE);
-          }
-
-          attachmentListener.onAttachmentChanged();
-        }
-      }
-
-      private @Nullable Slide getContentResolverSlideInfo(Uri uri, int width, int height) {
-        Cursor cursor = null;
-        long   start  = System.currentTimeMillis();
-
-        try {
-          cursor = context.getContentResolver().query(uri, null, null, null, null);
-
-          if (cursor != null && cursor.moveToFirst()) {
-            String fileName = cursor.getString(cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME));
-            long   fileSize = cursor.getLong(cursor.getColumnIndexOrThrow(OpenableColumns.SIZE));
-            String mimeType = context.getContentResolver().getType(uri);
-
-            if (width == 0 || height == 0) {
-              Pair<Integer, Integer> dimens = MediaUtil.getDimensions(context, mimeType, uri);
-              width  = dimens.first;
-              height = dimens.second;
-            }
-
-            Log.d(TAG, "remote slide with size " + fileSize + " took " + (System.currentTimeMillis() - start) + "ms");
-            return mediaType.createSlide(context, uri, fileName, mimeType, null, fileSize, width, height, false, null);
-          }
-        } finally {
-          if (cursor != null) cursor.close();
-        }
-
-        return null;
-      }
-
-      private @NonNull Slide getManuallyCalculatedSlideInfo(Uri uri, int width, int height) throws IOException {
-        long                                   start               = System.currentTimeMillis();
-        Long                                   mediaSize           = null;
-        String                                 fileName            = null;
-        String                                 mimeType            = null;
-        boolean                             gif                 = false;
-        AttachmentTable.TransformProperties transformProperties = null;
-
-        if (PartAuthority.isLocalUri(uri)) {
-          mediaSize           = PartAuthority.getAttachmentSize(context, uri);
-          fileName            = PartAuthority.getAttachmentFileName(context, uri);
-          mimeType            = PartAuthority.getAttachmentContentType(context, uri);
-          gif                 = PartAuthority.getAttachmentIsVideoGif(context, uri);
-          transformProperties = PartAuthority.getAttachmentTransformProperties(uri);
-        }
-
-        if (mediaSize == null) {
-          mediaSize = MediaUtil.getMediaSize(context, uri);
-        }
-
-        if (mimeType == null) {
-          mimeType = MediaUtil.getMimeType(context, uri);
-        }
-
-        if (width == 0 || height == 0) {
-          Pair<Integer, Integer> dimens = MediaUtil.getDimensions(context, mimeType, uri);
-          width  = dimens.first;
-          height = dimens.second;
-        }
-
-        Log.d(TAG, "local slide with size " + mediaSize + " took " + (System.currentTimeMillis() - start) + "ms");
-        return mediaType.createSlide(context, uri, fileName, mimeType, null, mediaSize, width, height, gif, transformProperties);
-      }
-    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-
-    return result;
-  }
-
   public boolean isAttachmentPresent() {
     return attachmentViewStub.resolved() && attachmentViewStub.get().getVisibility() == View.VISIBLE;
   }
@@ -477,7 +326,7 @@ public static void selectPayment(@NonNull Fragment fragment, @NonNull Recipient
                        intent.putExtra(PaymentsActivity.EXTRA_PAYMENTS_STARTING_ACTION, R.id.action_directly_to_createPayment);
                        intent.putExtra(PaymentsActivity.EXTRA_STARTING_ARGUMENTS, new CreatePaymentFragmentArgs.Builder(new PayeeParcelable(recipient.getId())).setFinishOnConfirm(true).build().toBundle());
                        fragment.startActivity(intent);
-                     } else if (FeatureFlags.paymentsRequestActivateFlow() && recipient.getPaymentActivationCapability().isSupported()) {
+                     } else if (RemoteConfig.paymentsRequestActivateFlow()) {
                        showRequestToActivatePayments(fragment.requireContext(), recipient);
                      } else {
                        RecipientHasNotEnabledPaymentsDialog.show(fragment.requireContext());
@@ -531,16 +380,6 @@ private static void selectMediaType(Fragment fragment, @NonNull String type, @Nu
     }
   }
 
-  @WorkerThread
-  private boolean areConstraintsSatisfied(final @NonNull  Context context,
-                                          final @Nullable Slide slide,
-                                          final @NonNull  MediaConstraints constraints)
-  {
-   return slide == null                                          ||
-          constraints.isSatisfied(context, slide.asAttachment()) ||
-          constraints.canResize(slide.asAttachment());
-  }
-
   private void previewImageDraft(final @NonNull Slide slide) {
     if (MediaPreviewV2Fragment.isContentTypeSupported(slide.getContentType()) && slide.getUri() != null) {
       MediaIntentFactory.MediaPreviewArgs args = new MediaIntentFactory.MediaPreviewArgs(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java
index b4172dd5ce..cdb147724c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java
@@ -8,6 +8,7 @@
 import com.bumptech.glide.load.data.StreamLocalUriFetcher;
 
 import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.attachments.AttachmentId;
 import org.thoughtcrime.securesms.util.MediaUtil;
 
 import java.io.ByteArrayInputStream;
@@ -39,6 +40,18 @@ protected InputStream loadResource(Uri uri, ContentResolver contentResolver) thr
         thumbnail.recycle();
         return thumbnailStream;
       }
+      if (PartAuthority.isAttachmentUri(uri) && MediaUtil.isVideoType(PartAuthority.getAttachmentContentType(context, uri))) {
+        try {
+          AttachmentId attachmentId = PartAuthority.requireAttachmentId(uri);
+          Uri thumbnailUri = PartAuthority.getAttachmentThumbnailUri(attachmentId);
+          InputStream thumbStream = PartAuthority.getAttachmentThumbnailStream(context, thumbnailUri);
+          if (thumbStream != null) {
+            return thumbStream;
+          }
+        } catch (IOException e) {
+          Log.i(TAG, "Failed to fetch thumbnail", e);
+        }
+      }
     }
 
     try {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/IncomingMessage.kt b/app/src/main/java/org/thoughtcrime/securesms/mms/IncomingMessage.kt
index 4d947da7de..33e19d322f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mms/IncomingMessage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mms/IncomingMessage.kt
@@ -7,7 +7,6 @@ import org.thoughtcrime.securesms.database.model.Mention
 import org.thoughtcrime.securesms.database.model.ParentStoryId
 import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
-import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context
 import org.thoughtcrime.securesms.database.model.databaseprotos.GV2UpdateDescription
 import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
 import org.thoughtcrime.securesms.database.model.databaseprotos.MessageExtras
@@ -39,7 +38,8 @@ class IncomingMessage(
   linkPreviews: List<LinkPreview> = emptyList(),
   mentions: List<Mention> = emptyList(),
   val giftBadge: GiftBadge? = null,
-  val messageExtras: MessageExtras? = null
+  val messageExtras: MessageExtras? = null,
+  val isGroupAdd: Boolean = false
 ) {
 
   val attachments: List<Attachment> = ArrayList(attachments)
@@ -97,18 +97,21 @@ class IncomingMessage(
     }
 
     @JvmStatic
-    fun groupUpdate(from: RecipientId, timestamp: Long, groupId: GroupId, groupContext: DecryptedGroupV2Context, serverGuid: String?): IncomingMessage {
-      val messageGroupContext = MessageGroupContext(groupContext)
+    fun groupUpdate(from: RecipientId, timestamp: Long, groupId: GroupId, update: GV2UpdateDescription, isGroupAdd: Boolean, serverGuid: String?): IncomingMessage {
+      val messageExtras = MessageExtras(gv2UpdateDescription = update)
+      val groupContext = MessageGroupContext(update.gv2ChangeDescription!!)
 
       return IncomingMessage(
         from = from,
         sentTimeMillis = timestamp,
         receivedTimeMillis = timestamp,
         serverTimeMillis = timestamp,
+        serverGuid = serverGuid,
         groupId = groupId,
-        groupContext = messageGroupContext,
+        groupContext = groupContext,
         type = MessageType.GROUP_UPDATE,
-        messageExtras = MessageExtras(gv2UpdateDescription = GV2UpdateDescription(gv2ChangeDescription = groupContext, groupChangeUpdate = null))
+        messageExtras = messageExtras,
+        isGroupAdd = isGroupAdd
       )
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java b/app/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java
index 0c936ea150..9c0a3ba9d9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java
@@ -14,7 +14,7 @@
 import org.thoughtcrime.securesms.jobs.AttachmentUploadJob;
 import org.thoughtcrime.securesms.util.BitmapDecodingException;
 import org.thoughtcrime.securesms.util.BitmapUtil;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.MemoryFileDescriptor;
 import org.thoughtcrime.securesms.video.TranscodingPreset;
@@ -129,6 +129,6 @@ public boolean canResize(@NonNull String mediaType) {
   }
 
   public static boolean isVideoTranscodeAvailable() {
-    return Build.VERSION.SDK_INT >= 26 && (FeatureFlags.useStreamingVideoMuxer() || MemoryFileDescriptor.supported());
+    return Build.VERSION.SDK_INT >= 26 && (RemoteConfig.useStreamingVideoMuxer() || MemoryFileDescriptor.supported());
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java b/app/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java
index d19aec7732..89d282eb57 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java
@@ -6,9 +6,9 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.thoughtcrime.securesms.util.LocaleFeatureFlags;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
+import org.thoughtcrime.securesms.util.RemoteConfig;
+import org.thoughtcrime.securesms.util.LocaleRemoteConfig;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.video.TranscodingPreset;
 
@@ -22,7 +22,7 @@ public class PushMediaConstraints extends MediaConstraints {
   private final MediaConfig currentConfig;
 
   public PushMediaConstraints(@Nullable SentMediaQuality sentMediaQuality) {
-    currentConfig = getCurrentConfig(ApplicationDependencies.getApplication(), sentMediaQuality);
+    currentConfig = getCurrentConfig(AppDependencies.getApplication(), sentMediaQuality);
   }
 
   @Override
@@ -68,7 +68,7 @@ public long getUncompressedVideoMaxSize(Context context) {
 
   @Override
   public long getCompressedVideoMaxSize(Context context) {
-    if (FeatureFlags.useStreamingVideoMuxer()) {
+    if (RemoteConfig.useStreamingVideoMuxer()) {
       return getMaxAttachmentSize();
     } else {
       return Util.isLowMemory(context) ? 30 * MB
@@ -104,7 +104,7 @@ public TranscodingPreset getVideoTranscodingSettings() {
     if (sentMediaQuality == SentMediaQuality.HIGH) {
       return MediaConfig.LEVEL_3;
     }
-    return LocaleFeatureFlags.getMediaQualityLevel().orElse(MediaConfig.getDefault(context));
+    return LocaleRemoteConfig.getMediaQualityLevel().orElse(MediaConfig.getDefault(context));
   }
 
   public enum MediaConfig {
@@ -153,7 +153,7 @@ public TranscodingPreset getVideoPreset() {
     }
 
     public static @Nullable MediaConfig forLevel(int level) {
-      boolean isLowMemory = Util.isLowMemory(ApplicationDependencies.getApplication());
+      boolean isLowMemory = Util.isLowMemory(AppDependencies.getApplication());
 
       return Arrays.stream(values())
                    .filter(v -> v.level == level && v.isLowMemory == isLowMemory)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/Slide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/Slide.java
index 3ae762881c..50453eede9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mms/Slide.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mms/Slide.java
@@ -56,11 +56,12 @@ public Uri getThumbnailUri() {
 
   @Nullable
   public Uri getUri() {
-    Uri attachmentUri = attachment.getUri();
-    if (attachmentUri != null) {
-      return attachmentUri;
-    }
-    return attachment.getThumbnailUri();
+    return attachment.getUri();
+  }
+
+  @Nullable
+  public Uri getDisplayUri() {
+    return attachment.getDisplayUri();
   }
 
   public @Nullable Uri getPublicUri() {
@@ -141,7 +142,8 @@ public boolean isInProgress() {
 
   public boolean isPendingDownload() {
     return getTransferState() == AttachmentTable.TRANSFER_PROGRESS_FAILED ||
-           getTransferState() == AttachmentTable.TRANSFER_PROGRESS_PENDING;
+           getTransferState() == AttachmentTable.TRANSFER_PROGRESS_PENDING ||
+           getTransferState() == AttachmentTable.TRANSFER_RESTORE_OFFLOADED;
   }
 
   public int getTransferState() {
@@ -160,6 +162,10 @@ public boolean hasPlaceholder() {
     return false;
   }
 
+  public boolean hasThumbnail() {
+    return attachment.getThumbnailUri() != null;
+  }
+
   public boolean hasPlayOverlay() {
     return false;
   }
@@ -224,34 +230,7 @@ protected static Attachment constructAttachmentFromUri(@NonNull  Context
   }
 
   public @NonNull Optional<String> getFileType(@NonNull Context context) {
-    Optional<String> fileName = getFileName();
-
-    if (fileName.isPresent()) {
-      String fileType = getFileType(fileName);
-      if (!fileType.isEmpty()) {
-        return Optional.of(fileType);
-      }
-    }
-
-    return Optional.ofNullable(MediaUtil.getExtension(context, getUri()));
-  }
-
-  private static @NonNull String getFileType(Optional<String> fileName) {
-    if (!fileName.isPresent()) return "";
-
-    String[] parts = fileName.get().split("\\.");
-
-    if (parts.length < 2) {
-      return "";
-    }
-
-    String suffix = parts[parts.length - 1];
-
-    if (suffix.length() <= 3) {
-      return suffix;
-    }
-
-    return "";
+    return MediaUtil.getFileType(context, getFileName(), getUri());
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java b/app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java
index 2e1800de29..5f91fb0dbe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java
@@ -45,6 +45,10 @@ public SlideDeck(@NonNull Attachment attachment) {
     if (slide != null) slides.add(slide);
   }
 
+  public SlideDeck(SlideDeck otherSlideDeck) {
+    slides.addAll(otherSlideDeck.slides);
+  }
+
   public SlideDeck() {
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java
index da86906da5..afa2105eb0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.content.res.Resources.Theme;
 import android.net.Uri;
+import android.os.Build;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
@@ -55,7 +56,7 @@ public boolean hasPlaceholder() {
 
   @Override
   public boolean hasPlayOverlay() {
-    return !(isVideoGif() && GiphyMp4PlaybackPolicy.autoplay());
+    return !(isVideoGif() && GiphyMp4PlaybackPolicy.autoplay()) || Build.VERSION.SDK_INT < 23;
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/DefaultWebSocketShadowingBridge.kt b/app/src/main/java/org/thoughtcrime/securesms/net/DefaultWebSocketShadowingBridge.kt
index 9f48d70481..1b06ddc20b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/net/DefaultWebSocketShadowingBridge.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/net/DefaultWebSocketShadowingBridge.kt
@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.logsubmit.SubmitDebugLogActivity
 import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.notifications.NotificationIds
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.whispersystems.signalservice.internal.websocket.WebSocketShadowingBridge
 
 /**
@@ -26,7 +26,7 @@ import org.whispersystems.signalservice.internal.websocket.WebSocketShadowingBri
  * [org.whispersystems.signalservice.internal.websocket.ShadowingWebSocketConnection]
  */
 class DefaultWebSocketShadowingBridge(private val context: Application) : WebSocketShadowingBridge {
-  private val store: InternalValues = SignalStore.internalValues()
+  private val store: InternalValues = SignalStore.internal
 
   override fun writeStatsSnapshot(bytes: ByteArray) {
     store.setWebSocketShadowingStats(bytes)
@@ -37,7 +37,7 @@ class DefaultWebSocketShadowingBridge(private val context: Application) : WebSoc
   }
 
   override fun triggerFailureNotification(message: String) {
-    if (!FeatureFlags.internalUser()) {
+    if (!RemoteConfig.internalUser) {
       return
     }
     val notification: Notification = NotificationCompat.Builder(context, NotificationChannels.getInstance().FAILURES)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/DeviceTransferBlockingInterceptor.java b/app/src/main/java/org/thoughtcrime/securesms/net/DeviceTransferBlockingInterceptor.java
index e7f30db7ce..deaddbd393 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/net/DeviceTransferBlockingInterceptor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/net/DeviceTransferBlockingInterceptor.java
@@ -3,7 +3,7 @@
 import androidx.annotation.NonNull;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 
 import java.io.IOException;
@@ -50,11 +50,11 @@ public DeviceTransferBlockingInterceptor() {
 
   public void blockNetwork() {
     blockNetworking = true;
-    ApplicationDependencies.closeConnections();
+    AppDependencies.resetNetwork(false);
   }
 
   public void unblockNetwork() {
     blockNetworking = false;
-    ApplicationDependencies.getIncomingMessageObserver();
+    AppDependencies.resetNetwork(true);
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/NetworkManager.java b/app/src/main/java/org/thoughtcrime/securesms/net/NetworkManager.java
index ae1a25f563..7ec81748cf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/net/NetworkManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/net/NetworkManager.java
@@ -14,7 +14,7 @@
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.events.NetworkAvailableEvent;
 
 import java.util.Objects;
@@ -164,11 +164,11 @@ public void onEnabled(Intent statusIntent) {
         if (proxyOrbotPort != socksPort) {
           if (proxyType == ProxyType.ORBOT) {
             if (configureProxy(new SocksProxy(OrbotHelper.DEFAULT_PROXY_HOST, socksPort))) {
-              ApplicationDependencies.restartAllNetworkConnections();
+              AppDependencies.resetNetwork(true);
             }
           }
           proxyOrbotPort = socksPort;
-          if (ApplicationDependencies.getAppForegroundObserver().isForegrounded()) {
+          if (AppDependencies.getAppForegroundObserver().isForegrounded()) {
             Toast.makeText(application, R.string.ProxyManager_successfully_started_orbot, Toast.LENGTH_SHORT).show();
           }
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/Networking.kt b/app/src/main/java/org/thoughtcrime/securesms/net/Networking.kt
index 9443b65b00..6bce95c2f3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/net/Networking.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/net/Networking.kt
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.net
 
 import okhttp3.Dns
 import java.io.IOException
+import java.net.InetAddress
 import java.net.InetSocketAddress
 import java.net.Proxy
 import java.net.ProxySelector
@@ -10,21 +11,14 @@ import java.net.URI
 import javax.net.SocketFactory
 
 object Networking {
+
   @JvmStatic
   var isEnabled: Boolean = false
 
-  private fun throwIfDisabled() {
-    if (!isEnabled) throw IOException("Network is disabled")
-  }
-
   @JvmStatic
   val socketFactory: SocketFactory = ProxySocketFactory {
-    throwIfDisabled()
-    proxy.also {
-      if (it == DUMMY_PROXY) {
-        throw IOException("Proxy socket address not available yet")
-      }
-    }
+    ensureNetworkEnabled()
+    proxy.also { validateProxyAddress(it) }
   }
 
   @JvmStatic
@@ -48,15 +42,15 @@ object Networking {
    * connection without a proxy.
    */
   @JvmStatic
-  val proxy
-    get(): Proxy {
+  val proxy: Proxy
+    get() {
       val currentSocksProxy = socksProxy ?: return Proxy.NO_PROXY
       return currentSocksProxy.makeProxy() ?: DUMMY_PROXY
     }
 
   @JvmStatic
   val proxySelectorForSocks = object : ProxySelector() {
-    val systemDefault = getDefault()
+    private val systemDefault = getDefault()
 
     override fun select(uri: URI?): List<Proxy> {
       return if (socksProxy != null) {
@@ -67,31 +61,35 @@ object Networking {
       }
     }
 
-    override fun connectFailed(uri: URI?, sa: SocketAddress?, ioe: IOException?) = systemDefault.connectFailed(uri, sa, ioe)
+    override fun connectFailed(uri: URI?, sa: SocketAddress?, ioe: IOException?) =
+      systemDefault.connectFailed(uri, sa, ioe)
   }
 
   @JvmStatic
-  val dns = Dns { hostname ->
-    throwIfDisabled()
-    if (socksProxy == null) {
-      systemResolver.lookup(hostname)
-    } else {
-      dohResolver.lookup(hostname)
-    }
+  val dns: Dns = DnsProxyAware()
+
+  private fun ensureNetworkEnabled() {
+    if (!isEnabled) throw IOException("Network is disabled")
   }
 
-  private val cloudflare: Dns = DohClient("https://1.1.1.1/dns-query", socketFactory, proxySelectorForSocks)
+  private fun validateProxyAddress(proxy: Proxy) {
+    if (proxy == DUMMY_PROXY) throw IOException("Proxy socket address not available yet")
+  }
 
-  private val quad9: Dns = DohClient("https://9.9.9.9/dns-query", socketFactory, proxySelectorForSocks)
+  private class DnsProxyAware : Dns {
+    private val cloudflare: Dns = DohClient("https://1.1.1.1/dns-query", socketFactory, proxySelectorForSocks)
+    private val quad9: Dns = DohClient("https://9.9.9.9/dns-query", socketFactory, proxySelectorForSocks)
 
-  private val systemResolver: Dns = SequentialDns(
-    Dns.SYSTEM,
-    cloudflare,
-    quad9,
-  )
+    private val systemDnsResolver: Dns = SequentialDns(Dns.SYSTEM, cloudflare, quad9)
+    private val dohDnsResolver: Dns = SequentialDns(cloudflare, quad9)
 
-  private val dohResolver: Dns = SequentialDns(
-    cloudflare,
-    quad9,
-  )
+    override fun lookup(hostname: String): List<InetAddress> {
+      ensureNetworkEnabled()
+      return if (socksProxy == null) {
+        systemDnsResolver.lookup(hostname)
+      } else {
+        dohDnsResolver.lookup(hostname)
+      }
+    }
+  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/RemoteDeprecationDetectorInterceptor.java b/app/src/main/java/org/thoughtcrime/securesms/net/RemoteDeprecationDetectorInterceptor.java
index cc4b006efe..f4ed3c9db3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/net/RemoteDeprecationDetectorInterceptor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/net/RemoteDeprecationDetectorInterceptor.java
@@ -22,7 +22,7 @@ public final class RemoteDeprecationDetectorInterceptor implements Interceptor {
     Response response = chain.proceed(chain.request());
 
     if (response.code() == 499 && !SignalStore.misc().isClientDeprecated()) {
-      Log.w(TAG, "Received 499. Client version is deprecated.");
+      Log.w(TAG, "Received 499. Client version is deprecated.", true);
       SignalStore.misc().setClientDeprecated(true);
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/SequentialDns.java b/app/src/main/java/org/thoughtcrime/securesms/net/SequentialDns.java
index d8ea4dc541..e83b0a8a82 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/net/SequentialDns.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/net/SequentialDns.java
@@ -3,7 +3,7 @@
 import androidx.annotation.NonNull;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 import org.thoughtcrime.securesms.util.Environment;
 import org.thoughtcrime.securesms.util.NetworkUtil;
@@ -52,10 +52,10 @@ public SequentialDns(Dns... dns) {
           Log.w(TAG, String.format(Locale.ENGLISH, "Didn't find any addresses for %s using %s. Continuing.", hostname, dns.getClass().getSimpleName()));
         }
       } catch (UnknownHostException e) {
-        Log.w(TAG, String.format(Locale.ENGLISH, "Failed to resolve %s using %s. Continuing. Network Type: %s", hostname, dns.getClass().getSimpleName(), NetworkUtil.getNetworkTypeDescriptor(ApplicationDependencies.getApplication())));
+        Log.w(TAG, String.format(Locale.ENGLISH, "Failed to resolve %s using %s. Continuing. Network Type: %s", hostname, dns.getClass().getSimpleName(), NetworkUtil.getNetworkTypeDescriptor(AppDependencies.getApplication())));
       }
     }
-    Log.w(TAG, "Failed to resolve using any DNS. Network Type: " + NetworkUtil.getNetworkTypeDescriptor(ApplicationDependencies.getApplication()));
+    Log.w(TAG, "Failed to resolve using any DNS. Network Type: " + NetworkUtil.getNetworkTypeDescriptor(AppDependencies.getApplication()));
     throw new UnknownHostException(hostname);
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DeleteNotificationReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DeleteNotificationReceiver.java
index b3b02e2c0e..e83c02ec87 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DeleteNotificationReceiver.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DeleteNotificationReceiver.java
@@ -6,7 +6,7 @@
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.service.ExportedBroadcastReceiver;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.notifications.v2.ConversationId;
 
 import java.util.ArrayList;
@@ -22,7 +22,7 @@ public class DeleteNotificationReceiver extends ExportedBroadcastReceiver {
   @Override
   public void onReceiveUnlock(final Context context, Intent intent) {
     if (DELETE_NOTIFICATION_ACTION.equals(intent.getAction())) {
-      MessageNotifier notifier = ApplicationDependencies.getMessageNotifier();
+      MessageNotifier notifier = AppDependencies.getMessageNotifier();
 
       final long[]                        ids     = intent.getLongArrayExtra(EXTRA_IDS);
       final boolean[]                 mms     = intent.getBooleanArrayExtra(EXTRA_MMS);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DeviceSpecificNotificationConfig.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/DeviceSpecificNotificationConfig.kt
new file mode 100644
index 0000000000..af62b28dd0
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DeviceSpecificNotificationConfig.kt
@@ -0,0 +1,80 @@
+package org.thoughtcrime.securesms.notifications
+
+import android.os.Build
+import androidx.annotation.VisibleForTesting
+import com.fasterxml.jackson.annotation.JsonProperty
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.util.JsonUtils
+import org.thoughtcrime.securesms.util.RemoteConfig
+import java.io.IOException
+
+/**
+ * Remote configs for a device to show a support screen in an effort to prevent delayed notifications
+ */
+object DeviceSpecificNotificationConfig {
+
+  private val TAG = Log.tag(DeviceSpecificNotificationConfig::class.java)
+  private const val GENERAL_SUPPORT_URL = "https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting"
+
+  @JvmStatic
+  val currentConfig: Config by lazy { computeConfig() }
+
+  /**
+   * Maps a device model to specific modifications set in order to support better notification
+   * @param model either exact device model name or model name that ends with a wildcard
+   * @param showConditionCode outlines under which conditions to show the prompt, still dependent on localePercent
+   * @param link represents the Signal support url that corresponds to this device model
+   * @param localePercent represents the percent of people who will get this change per country
+   * @param version represents the version of the link being shown and should be incremented if the link or link content changes
+   */
+  data class Config(
+    @JsonProperty val model: String = "",
+    @JsonProperty val showConditionCode: String = "has-slow-notifications",
+    @JsonProperty val link: String = GENERAL_SUPPORT_URL,
+    @JsonProperty val localePercent: String = "*",
+    @JsonProperty val version: Int = 0
+  ) {
+    val showCondition: ShowCondition = ShowCondition.fromCode(showConditionCode)
+  }
+
+  /**
+   * Describes under which conditions to show device help prompt
+   */
+  enum class ShowCondition(val code: String) {
+    ALWAYS("always"),
+    HAS_BATTERY_OPTIMIZATION_ON("has-battery-optimization-on"),
+    HAS_SLOW_NOTIFICATIONS("has-slow-notifications");
+
+    companion object {
+      fun fromCode(code: String) = values().firstOrNull { it.code == code } ?: HAS_SLOW_NOTIFICATIONS
+    }
+  }
+
+  @VisibleForTesting
+  fun computeConfig(): Config {
+    val default = Config()
+    val serialized = RemoteConfig.deviceSpecificNotificationConfig
+    if (serialized.isBlank()) {
+      return default
+    }
+
+    val list: List<Config> = try {
+      JsonUtils.fromJsonArray(serialized, Config::class.java)
+    } catch (e: IOException) {
+      Log.w(TAG, "Failed to parse json!", e)
+      emptyList()
+    }
+
+    val config: Config? = list
+      .filter { it.model.isNotEmpty() }
+      .find {
+        if (it.model.last() == '*') {
+          Build.MODEL.startsWith(it.model.substring(0, it.model.length - 1))
+        } else {
+          it.model.contains(Build.MODEL)
+        }
+      }
+
+    return config ?: default
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
index 2a4761f31c..8196b0369a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
@@ -17,7 +17,7 @@
 import org.thoughtcrime.securesms.database.MessageTable.MarkedMessageInfo;
 import org.thoughtcrime.securesms.database.MessageTable.SyncMessageId;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.CallLogEventSendJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceReadUpdateJob;
 import org.thoughtcrime.securesms.jobs.SendReadReceiptJob;
@@ -45,7 +45,7 @@ public void onReceive(final Context context, Intent intent) {
     final ArrayList<ConversationId> threads = intent.getParcelableArrayListExtra(THREADS_EXTRA);
 
     if (threads != null) {
-      MessageNotifier notifier = ApplicationDependencies.getMessageNotifier();
+      MessageNotifier notifier = AppDependencies.getMessageNotifier();
       for (ConversationId thread : threads) {
         notifier.removeStickyThread(thread);
       }
@@ -65,7 +65,7 @@ public void onReceive(final Context context, Intent intent) {
         process(messageIdsCollection);
         processCallEvents(threads, System.currentTimeMillis());
 
-        ApplicationDependencies.getMessageNotifier().updateNotification(context);
+        AppDependencies.getMessageNotifier().updateNotification(context);
         finisher.finish();
       });
     }
@@ -113,7 +113,7 @@ public static void processCallEvents(@NonNull List<ConversationId> threads, long
     for (RecipientId peer : peers) {
       CallTable.Call lastCallInThread = SignalDatabase.calls().markAllCallEventsWithPeerBeforeTimestampRead(peer, timestamp);
       if (lastCallInThread != null) {
-        ApplicationDependencies.getJobManager().add(CallLogEventSendJob.forMarkedAsReadInConversation(lastCallInThread));
+        AppDependencies.getJobManager().add(CallLogEventSendJob.forMarkedAsReadInConversation(lastCallInThread));
       }
     }
   }
@@ -123,8 +123,8 @@ private static void scheduleDeletion(@NonNull List<ExpirationInfo> expirationInf
       long now = System.currentTimeMillis();
       SignalDatabase.messages().markExpireStarted(Stream.of(expirationInfo).map(info -> new kotlin.Pair<>(info.getId(), now)).toList());
 
-      ApplicationDependencies.getExpiringMessageManager()
-                             .scheduleDeletion(Stream.of(expirationInfo).map(info -> info.copy(info.getId(), info.getExpiresIn(), now, info.isMms())).toList());
+      AppDependencies.getExpiringMessageManager()
+                     .scheduleDeletion(Stream.of(expirationInfo).map(info -> info.copy(info.getId(), info.getExpiresIn(), now, info.isMms())).toList());
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java
index 6d9ac9e58d..5dec403ba0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java
@@ -8,10 +8,9 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.concurrent.SignalExecutors;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.notifications.v2.ConversationId;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.BubbleUtil;
 
 import java.util.Optional;
 
@@ -35,7 +34,7 @@ class ReminderReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(final Context context, final Intent intent) {
       SignalExecutors.BOUNDED.execute(() -> {
-        ApplicationDependencies.getMessageNotifier().updateNotification(context);
+        AppDependencies.getMessageNotifier().updateNotification(context);
       });
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCancellationHelper.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCancellationHelper.java
index a3e5982757..9f6b4d29ca 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCancellationHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCancellationHelper.java
@@ -13,7 +13,7 @@
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.notifications.v2.DefaultMessageNotifier;
 import org.thoughtcrime.securesms.notifications.v2.ConversationId;
 import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -53,27 +53,31 @@ public static void cancelAllMessageNotifications(@NonNull Context context) {
    * bubble notifications that do not have unread messages in them.
    */
   public static void cancelAllMessageNotifications(@NonNull Context context, @NonNull Set<Integer> stickyNotifications) {
-    try {
-      NotificationManager     notifications       = ServiceUtil.getNotificationManager(context);
-      StatusBarNotification[] activeNotifications = notifications.getActiveNotifications();
-      int                     activeCount         = 0;
-
-      for (StatusBarNotification activeNotification : activeNotifications) {
-        if (isSingleThreadNotification(activeNotification)) {
-          activeCount++;
-          if (!stickyNotifications.contains(activeNotification.getId()) && cancel(context, activeNotification.getId())) {
-            activeCount--;
+    if (Build.VERSION.SDK_INT >= 23) {
+      try {
+        NotificationManager     notifications       = ServiceUtil.getNotificationManager(context);
+        StatusBarNotification[] activeNotifications = notifications.getActiveNotifications();
+        int                     activeCount         = 0;
+
+        for (StatusBarNotification activeNotification : activeNotifications) {
+          if (isSingleThreadNotification(activeNotification)) {
+            activeCount++;
+            if (!stickyNotifications.contains(activeNotification.getId()) && cancel(context, activeNotification.getId())) {
+              activeCount--;
+            }
           }
         }
-      }
 
-      if (activeCount == 0) {
-        cancelLegacy(context, NotificationIds.MESSAGE_SUMMARY);
+        if (activeCount == 0) {
+          cancelLegacy(context, NotificationIds.MESSAGE_SUMMARY);
+        }
+      } catch (Throwable e) {
+        // XXX Appears to be a ROM bug, see #6043
+        Log.w(TAG, "Canceling all notifications.", e);
+        ServiceUtil.getNotificationManager(context).cancelAll();
       }
-    } catch (Throwable e) {
-      // XXX Appears to be a ROM bug, see #6043
-      Log.w(TAG, "Canceling all notifications.", e);
-      ServiceUtil.getNotificationManager(context).cancelAll();
+    } else {
+      cancelLegacy(context, NotificationIds.MESSAGE_SUMMARY);
     }
   }
 
@@ -182,7 +186,7 @@ private static boolean isCancellable(@NonNull Context context, int notificationI
     }
 
     Long                     threadId            = SignalDatabase.threads().getThreadIdFor(recipientId);
-    Optional<ConversationId> focusedThread       = ApplicationDependencies.getMessageNotifier().getVisibleThread();
+    Optional<ConversationId> focusedThread       = AppDependencies.getMessageNotifier().getVisibleThread();
     Long                     focusedThreadId     = focusedThread.map(ConversationId::getThreadId).orElse(null);
     Long                     focusedGroupStoryId = focusedThread.map(ConversationId::getGroupStoryId).orElse(null);
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java
index 1caa2b58ac..6ccf06fd2f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java
@@ -26,16 +26,16 @@
 import com.annimon.stream.Stream;
 
 import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.RecipientTable;
 import org.thoughtcrime.securesms.database.RecipientTable.VibrateState;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.ConversationUtil;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
@@ -68,19 +68,18 @@ private static class Version {
   private static final String CONTACT_PREFIX    = "contact_";
   private static final String MESSAGES_PREFIX   = "messages_";
 
-  public static final String LOCKED_STATUS = "locked_status_v2";
-
   public final String CALLS                            = "calls_v3";
   public final String FAILURES                         = "failures";
   public final String APP_UPDATES                      = "app_updates";
   public final String BACKUPS                          = "backups_v2";
+  public static final String LOCKED_STATUS             = "locked_status_v2";
   public final String OTHER                            = "other_v3";
   public final String VOICE_NOTES                      = "voice_notes";
   public final String JOIN_EVENTS                      = "join_events";
   public final String BACKGROUND                       = "background_connection";
   public final String CALL_STATUS                      = "call_status";
   public final String APP_ALERTS                       = "app_alerts";
-  public static String ADDITIONAL_MESSAGE_NOTIFICATIONS = "additional_message_notifications";
+  public static final String ADDITIONAL_MESSAGE_NOTIFICATIONS = "additional_message_notifications";
 
   private static volatile NotificationChannels instance;
 
@@ -90,7 +89,7 @@ public static NotificationChannels getInstance() {
     if (instance == null) {
       synchronized (NotificationChannels.class) {
         if (instance == null) {
-          instance = new NotificationChannels(ApplicationDependencies.getApplication());
+          instance = new NotificationChannels(AppDependencies.getApplication());
         }
       }
     }
@@ -654,7 +653,7 @@ private void onCreate(@NonNull NotificationManager notificationManager) {
 
     notificationManager.createNotificationChannels(Arrays.asList(messages, calls, failures, backups, lockedStatus, other, voiceNotes, joinEvents, background, callStatus, appAlerts, additionalMessageNotifications));
 
-    if (FeatureFlags.selfUpdater()) {
+    if (BuildConfig.MANAGES_MOLLY_UPDATES) {
       NotificationChannel appUpdates = new NotificationChannel(APP_UPDATES, context.getString(R.string.NotificationChannel_app_updates), NotificationManager.IMPORTANCE_DEFAULT);
       notificationManager.createNotificationChannel(appUpdates);
     } else {
@@ -695,7 +694,7 @@ private static void onUpgrade(@NonNull NotificationManager notificationManager,
     }
 
     if (oldVersion < Version.AUDIO_ATTRIBUTE_CHANGE) {
-      Context context                       = ApplicationDependencies.getApplication();
+      Context context                       = AppDependencies.getApplication();
       int     existingMessageChannelVersion = TextSecurePreferences.getNotificationMessagesChannelVersion(context);
       int     newMessageChannelVersion      = existingMessageChannelVersion + 1;
       String  existingChannelId             = "messages_" + existingMessageChannelVersion;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationIds.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationIds.java
index 862f5bd91a..8398de27de 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationIds.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationIds.java
@@ -23,7 +23,7 @@ public final class NotificationIds {
   //public static final int LEGACY_SQLCIPHER_MIGRATION      = 494949;
   public static final int USER_NOTIFICATION_MIGRATION       = 525600;
   public static final int DEVICE_TRANSFER                   = 625420;
-  //public static final int DONOR_BADGE_FAILURE             = 630001;
+  public static final int DONOR_BADGE_FAILURE               = 630001;
   public static final int FCM_FETCH                         = 630002;
   //public static final int SMS_EXPORT_SERVICE              = 630003;
   //public static final int SMS_EXPORT_COMPLETE             = 630004;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
index 1bc78e3a3e..e1fc8aa36d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
@@ -30,7 +30,7 @@
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.ParentStoryId;
 import org.thoughtcrime.securesms.database.model.StoryType;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.mms.OutgoingMessage;
 import org.thoughtcrime.securesms.notifications.v2.DefaultMessageNotifier;
 import org.thoughtcrime.securesms.notifications.v2.ConversationId;
@@ -114,13 +114,13 @@ public void onReceive(final Context context, Intent intent) {
             throw new AssertionError("Unknown Reply method");
         }
 
-        ApplicationDependencies.getMessageNotifier()
-                               .addStickyThread(new ConversationId(threadId, groupStoryId != Long.MIN_VALUE ? groupStoryId : null),
+        AppDependencies.getMessageNotifier()
+                       .addStickyThread(new ConversationId(threadId, groupStoryId != Long.MIN_VALUE ? groupStoryId : null),
                                                 intent.getLongExtra(EARLIEST_TIMESTAMP, System.currentTimeMillis()));
 
         List<MarkedMessageInfo> messageIds = SignalDatabase.threads().setRead(threadId, true);
 
-        ApplicationDependencies.getMessageNotifier().updateNotification(context);
+        AppDependencies.getMessageNotifier().updateNotification(context);
         MarkReadReceiver.process(messageIds);
       });
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/SlowNotificationHeuristics.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/SlowNotificationHeuristics.kt
new file mode 100644
index 0000000000..649c5779f0
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/SlowNotificationHeuristics.kt
@@ -0,0 +1,214 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.notifications
+
+import android.os.Build
+import android.text.TextUtils
+import androidx.annotation.WorkerThread
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.database.LocalMetricsDatabase
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.util.DeviceProperties
+import org.thoughtcrime.securesms.util.JsonUtils
+import org.thoughtcrime.securesms.util.LocaleRemoteConfig
+import org.thoughtcrime.securesms.util.PowerManagerCompat
+import org.thoughtcrime.securesms.util.RemoteConfig
+import org.thoughtcrime.securesms.util.SignalLocalMetrics
+import java.util.concurrent.TimeUnit
+import kotlin.time.Duration.Companion.days
+import kotlin.time.Duration.Companion.hours
+import kotlin.time.Duration.Companion.minutes
+
+/**
+ * Heuristic for estimating if a user has been experiencing issues with delayed notifications.
+ *
+ * This uses local metrics based off of message latency, failed service starts, and queue drain
+ * timeouts.
+ *
+ * This will enable us to attempt to improve notifications for users who are experiencing these issues.
+ */
+object SlowNotificationHeuristics {
+
+  private val TAG = Log.tag(SlowNotificationHeuristics::class.java)
+
+  fun getConfiguration(): Configuration {
+    val json = RemoteConfig.delayedNotificationsPromptConfig
+    return if (TextUtils.isEmpty(json)) {
+      getDefaultConfiguration()
+    } else {
+      try {
+        JsonUtils.fromJson(json, Configuration::class.java)
+      } catch (exception: Exception) {
+        getDefaultConfiguration()
+      }
+    }
+  }
+
+  private fun getDefaultConfiguration(): Configuration {
+    return Configuration(
+      minimumEventAgeMs = 3.days.inWholeMilliseconds,
+      minimumServiceEventCount = 10,
+      serviceStartFailurePercentage = 0.5f,
+      minimumMessageLatencyEvents = 50,
+      weeklyFailedQueueDrains = 5,
+      messageLatencyPercentiles = mapOf(
+        90 to 2.hours.inWholeMilliseconds,
+        50 to 30.minutes.inWholeMilliseconds
+      )
+    )
+  }
+
+  @JvmStatic
+  fun shouldPromptBatterySaver(): Boolean {
+    if (Build.VERSION.SDK_INT < 23) {
+      return false
+    }
+
+    val remoteEnabled = LocaleRemoteConfig.isBatterySaverPromptEnabled() || LocaleRemoteConfig.isDelayedNotificationPromptEnabled()
+    if (!remoteEnabled || SignalStore.uiHints.hasDismissedBatterySaverPrompt()) {
+      return false
+    }
+
+    if (System.currentTimeMillis() - SignalStore.uiHints.lastBatterySaverPrompt < TimeUnit.DAYS.toMillis(7)) {
+      return false
+    }
+
+    return true
+  }
+
+  @WorkerThread
+  @JvmStatic
+  fun isHavingDelayedNotifications(): Boolean {
+    if (!SignalStore.settings.isMessageNotificationsEnabled ||
+      !NotificationChannels.getInstance().areNotificationsEnabled()
+    ) {
+      // If user does not have notifications enabled, we shouldn't bother them about delayed notifications
+      return false
+    }
+    val configuration = getConfiguration()
+    val db = LocalMetricsDatabase.getInstance(AppDependencies.application)
+
+    val metrics = db.getMetrics()
+
+    val failedServiceStarts = hasRepeatedFailedServiceStarts(metrics, configuration.minimumEventAgeMs, configuration.minimumServiceEventCount, configuration.serviceStartFailurePercentage)
+    val failedQueueDrains = isFailingToDrainQueue(metrics, configuration.minimumEventAgeMs, configuration.weeklyFailedQueueDrains)
+    val longMessageLatency = hasLongMessageLatency(metrics, configuration.minimumEventAgeMs, configuration.minimumMessageLatencyEvents, configuration.messageLatencyPercentiles)
+
+    if (failedServiceStarts || failedQueueDrains || longMessageLatency) {
+      Log.w(TAG, "User seems to be having delayed notifications: failed-service-starts=$failedServiceStarts failedQueueDrains=$failedQueueDrains longMessageLatency=$longMessageLatency")
+      return true
+    }
+    return false
+  }
+
+  /**
+   * Returns whether or not the delayed notifications may be due to battery saver optimizations.
+   *
+   * Some OEMs over-optimize this battery restrictions and remove network even after receiving a
+   * high priority push.
+   *
+   * We consider a scenario where removing battery optimizations can fix delayed notifications:
+   *  - Data saver must be off (or white listed), otherwise it can be causing delayed notifications
+   *  - App must not already be exempted from battery optimizations
+   *
+   * We do not need to check if {ActivityManager#isBackgroundRestricted} is true, because if the app
+   * is set to "Optimized" this will be false (and can be culprit to delayed notifications) or if
+   * true can most definitely be at fault.
+   */
+  @JvmStatic
+  fun isBatteryOptimizationsOn(): Boolean {
+    val applicationContext = AppDependencies.application
+    if (DeviceProperties.getDataSaverState(applicationContext) == DeviceProperties.DataSaverState.ENABLED) {
+      return false
+    }
+    if (PowerManagerCompat.isIgnoringBatteryOptimizations(applicationContext)) {
+      return false
+    }
+    return true
+  }
+
+  fun showCondition(): DeviceSpecificNotificationConfig.ShowCondition {
+    return DeviceSpecificNotificationConfig.currentConfig.showCondition
+  }
+
+  fun shouldShowDialog(): Boolean {
+    return LocaleRemoteConfig.isDeviceSpecificNotificationEnabled() && SignalStore.uiHints.lastSupportVersionSeen < DeviceSpecificNotificationConfig.currentConfig.version
+  }
+
+  private fun hasRepeatedFailedServiceStarts(metrics: List<LocalMetricsDatabase.EventMetrics>, minimumEventAgeMs: Long, minimumEventCount: Int, failurePercentage: Float): Boolean {
+    if (!haveEnoughData(SignalLocalMetrics.FcmServiceStartSuccess.NAME, minimumEventAgeMs) && !haveEnoughData(SignalLocalMetrics.FcmServiceStartFailure.NAME, minimumEventAgeMs)) {
+      Log.d(TAG, "insufficient data for service starts")
+      return false
+    }
+
+    val successes = metrics.filter { it.name == SignalLocalMetrics.FcmServiceStartSuccess.NAME }
+    val failures = metrics.filter { it.name == SignalLocalMetrics.FcmServiceStartFailure.NAME }
+
+    if ((successes.size + failures.size) < minimumEventCount) {
+      Log.d(TAG, "insufficient service start events")
+      return false
+    }
+
+    if (failures.size / (failures.size + successes.size) >= failurePercentage) {
+      Log.w(TAG, "User often unable start FCM service. ${failures.size} failed : ${successes.size} successful")
+      return true
+    }
+    return false
+  }
+
+  private fun isFailingToDrainQueue(metrics: List<LocalMetricsDatabase.EventMetrics>, minimumEventAgeMs: Long, failureThreshold: Int): Boolean {
+    if (!haveEnoughData(SignalLocalMetrics.PushWebsocketFetch.SUCCESS_EVENT, minimumEventAgeMs) && !haveEnoughData(SignalLocalMetrics.PushWebsocketFetch.TIMEOUT_EVENT, minimumEventAgeMs)) {
+      Log.d(TAG, "insufficient data for failed queue drains")
+      return false
+    }
+    val failures = metrics.filter { it.name == SignalLocalMetrics.PushWebsocketFetch.TIMEOUT_EVENT }
+    if (failures.size < failureThreshold) {
+      return false
+    }
+    Log.w(TAG, "User has repeatedly failed to drain queue ${failures.size} events")
+    return true
+  }
+
+  private fun hasLongMessageLatency(metrics: List<LocalMetricsDatabase.EventMetrics>, minimumEventAgeMs: Long, messageThreshold: Int, percentiles: Map<Int, Long>): Boolean {
+    if (!haveEnoughData(SignalLocalMetrics.MessageLatency.NAME_HIGH, minimumEventAgeMs)) {
+      Log.d(TAG, "insufficient data for message latency")
+      return false
+    }
+    val eventCount = metrics.find { it.name == SignalLocalMetrics.MessageLatency.NAME_HIGH }?.count ?: 0
+    if (eventCount < messageThreshold) {
+      Log.d(TAG, "not enough messages for message latency")
+      return false
+    }
+    val db = LocalMetricsDatabase.getInstance(AppDependencies.application)
+    for ((percentage, threshold) in percentiles.entries) {
+      val averageLatency = db.eventPercent(SignalLocalMetrics.MessageLatency.NAME_HIGH, percentage.coerceAtMost(100).coerceAtLeast(0))
+
+      if (averageLatency > threshold) {
+        Log.w(TAG, "User has high average message latency of $averageLatency ms over $eventCount events over threshold of $threshold ms")
+        return true
+      }
+    }
+    return false
+  }
+
+  private fun haveEnoughData(eventName: String, minimumEventAgeMs: Long): Boolean {
+    val db = LocalMetricsDatabase.getInstance(AppDependencies.application)
+
+    val oldestEvent = db.getOldestMetricTime(eventName)
+
+    return !(oldestEvent == 0L || oldestEvent > System.currentTimeMillis() - minimumEventAgeMs)
+  }
+}
+
+data class Configuration(
+  val minimumEventAgeMs: Long,
+  val minimumServiceEventCount: Int,
+  val serviceStartFailurePercentage: Float,
+  val weeklyFailedQueueDrains: Int,
+  val minimumMessageLatencyEvents: Int,
+  val messageLatencyPercentiles: Map<Int, Long>
+)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/VitalsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/VitalsViewModel.kt
new file mode 100644
index 0000000000..77a5e3251a
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/VitalsViewModel.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.notifications
+
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
+import io.reactivex.rxjava3.subjects.BehaviorSubject
+import java.util.concurrent.TimeUnit
+
+/**
+ * View model for checking for various app vitals, like slow notifications and crashes.
+ */
+class VitalsViewModel(private val context: Application) : AndroidViewModel(context) {
+
+  private val checkSubject = BehaviorSubject.create<Unit>()
+
+  val vitalsState: Observable<State>
+
+  init {
+    vitalsState = checkSubject
+      .subscribeOn(Schedulers.io())
+      .observeOn(Schedulers.io())
+      .throttleFirst(1, TimeUnit.MINUTES)
+      .switchMapSingle {
+        checkHeuristics()
+      }
+      .distinctUntilChanged()
+      .observeOn(AndroidSchedulers.mainThread())
+  }
+
+  fun checkSlowNotificationHeuristics() {
+    checkSubject.onNext(Unit)
+  }
+
+  private fun checkHeuristics(): Single<State> {
+    return Single.fromCallable {
+      var state = State.NONE
+      when (SlowNotificationHeuristics.showCondition()) {
+        DeviceSpecificNotificationConfig.ShowCondition.ALWAYS -> {
+          if (SlowNotificationHeuristics.shouldShowDialog()) {
+            state = State.PROMPT_SPECIFIC_BATTERY_SAVER_DIALOG
+          }
+        }
+        DeviceSpecificNotificationConfig.ShowCondition.HAS_BATTERY_OPTIMIZATION_ON -> {
+          if (SlowNotificationHeuristics.isBatteryOptimizationsOn()) {
+            state = State.PROMPT_SPECIFIC_BATTERY_SAVER_DIALOG
+          }
+        }
+        DeviceSpecificNotificationConfig.ShowCondition.HAS_SLOW_NOTIFICATIONS -> {
+          if (SlowNotificationHeuristics.isHavingDelayedNotifications() && SlowNotificationHeuristics.shouldPromptBatterySaver()) {
+            state = State.PROMPT_GENERAL_BATTERY_SAVER_DIALOG
+          }
+        }
+      }
+
+      return@fromCallable state
+    }.subscribeOn(Schedulers.io())
+  }
+
+  enum class State {
+    NONE,
+    PROMPT_SPECIFIC_BATTERY_SAVER_DIALOG,
+    PROMPT_GENERAL_BATTERY_SAVER_DIALOG,
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfiles.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfiles.kt
index 292f6ac8a8..43886e1e28 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfiles.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/profiles/NotificationProfiles.kt
@@ -21,7 +21,7 @@ object NotificationProfiles {
   @JvmStatic
   @JvmOverloads
   fun getActiveProfile(profiles: List<NotificationProfile>, now: Long = System.currentTimeMillis(), zoneId: ZoneId = ZoneId.systemDefault()): NotificationProfile? {
-    val storeValues: NotificationProfileValues = SignalStore.notificationProfileValues()
+    val storeValues: NotificationProfileValues = SignalStore.notificationProfile
     val localNow: LocalDateTime = now.toLocalDateTime(zoneId)
 
     val manualProfile: NotificationProfile? = if (now < storeValues.manuallyEnabledUntil) {
@@ -46,7 +46,7 @@ object NotificationProfiles {
   }
 
   fun getActiveProfileDescription(context: Context, profile: NotificationProfile, now: Long = System.currentTimeMillis()): String {
-    val storeValues: NotificationProfileValues = SignalStore.notificationProfileValues()
+    val storeValues: NotificationProfileValues = SignalStore.notificationProfile
 
     if (profile.id == storeValues.manuallyEnabledProfile) {
       if (storeValues.manuallyEnabledUntil.isForever()) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/DefaultMessageNotifier.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/DefaultMessageNotifier.kt
index 6b99dc24c9..86205458f9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/DefaultMessageNotifier.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/DefaultMessageNotifier.kt
@@ -16,7 +16,7 @@ import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.ScreenLockController
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.messages.IncomingMessageObserver
 import org.thoughtcrime.securesms.notifications.MessageNotifier
@@ -59,7 +59,7 @@ class DefaultMessageNotifier(context: Application) : MessageNotifier {
 
   @Volatile private var previousScreenLockState: Boolean = ScreenLockController.lockScreenAtStart
 
-  @Volatile private var previousPrivacyPreference: NotificationPrivacyPreference = SignalStore.settings().messageNotificationsPrivacy
+  @Volatile private var previousPrivacyPreference: NotificationPrivacyPreference = SignalStore.settings.messageNotificationsPrivacy
 
   @Volatile private var previousState: NotificationState = NotificationState.EMPTY
 
@@ -130,7 +130,7 @@ class DefaultMessageNotifier(context: Application) : MessageNotifier {
     NotificationChannels.getInstance().ensureCustomChannelConsistency()
 
     val currentLockStatus: Boolean = KeyCachingService.isLocked()
-    val currentPrivacyPreference: NotificationPrivacyPreference = SignalStore.settings().messageNotificationsPrivacy
+    val currentPrivacyPreference: NotificationPrivacyPreference = SignalStore.settings.messageNotificationsPrivacy
     val currentScreenLockState: Boolean = ScreenLockController.lockScreenAtStart
     val notificationConfigurationChanged: Boolean = (
       currentLockStatus != previousLockedStatus ||
@@ -165,7 +165,7 @@ class DefaultMessageNotifier(context: Application) : MessageNotifier {
       }
     }
 
-    if (!SignalStore.settings().isMessageNotificationsEnabled) {
+    if (!SignalStore.settings.isMessageNotificationsEnabled) {
       Log.i(TAG, "Marking ${state.conversations.size} conversations as notified to skip notification")
       state.conversations.forEach { conversation ->
         conversation.notificationItems.forEach { item ->
@@ -257,7 +257,7 @@ class DefaultMessageNotifier(context: Application) : MessageNotifier {
   }
 
   private fun updateReminderTimestamps(context: Context, alertOverrides: Set<ConversationId>, threadsThatAlerted: Set<ConversationId>) {
-    if (SignalStore.settings().messageNotificationsRepeatAlerts == 0) {
+    if (SignalStore.settings.messageNotificationsRepeatAlerts == 0) {
       return
     }
 
@@ -267,7 +267,7 @@ class DefaultMessageNotifier(context: Application) : MessageNotifier {
       val (id: ConversationId, reminder: Reminder) = entry
       if (alertOverrides.contains(id)) {
         val notifyCount: Int = reminder.count + 1
-        if (notifyCount >= SignalStore.settings().messageNotificationsRepeatAlerts) {
+        if (notifyCount >= SignalStore.settings.messageNotificationsRepeatAlerts) {
           iterator.remove()
         } else {
           entry.setValue(Reminder(lastAudibleNotification, notifyCount))
@@ -414,8 +414,8 @@ private class CancelableExecutor {
       }
       if (!canceled.get()) {
         Log.i(TAG, "Not canceled, notifying...")
-        ApplicationDependencies.getMessageNotifier().cancelDelayedNotifications()
-        ApplicationDependencies.getMessageNotifier().updateNotification(context, thread)
+        AppDependencies.messageNotifier.cancelDelayedNotifications()
+        AppDependencies.messageNotifier.updateNotification(context, thread)
       } else {
         Log.w(TAG, "Canceled, not notifying...")
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationBuilder.kt
index f3ee2cecff..989f196236 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationBuilder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationBuilder.kt
@@ -46,7 +46,7 @@ private const val BIG_PICTURE_DIMEN = 500
  */
 sealed class NotificationBuilder(protected val context: Context) {
 
-  private val privacy: NotificationPrivacyPreference = SignalStore.settings().messageNotificationsPrivacy
+  private val privacy: NotificationPrivacyPreference = SignalStore.settings.messageNotificationsPrivacy
   private val isNotLocked: Boolean = !KeyCachingService.isLocked()
 
   abstract fun setSmallIcon(@DrawableRes drawable: Int)
@@ -160,10 +160,10 @@ sealed class NotificationBuilder(protected val context: Context) {
   }
 
   fun setLights() {
-    val ledColor: String = SignalStore.settings().messageLedColor
+    val ledColor: String = SignalStore.settings.messageLedColor
 
     if (ledColor != "none") {
-      var blinkPattern = SignalStore.settings().messageLedBlinkPattern
+      var blinkPattern = SignalStore.settings.messageLedBlinkPattern
       if (blinkPattern == "custom") {
         blinkPattern = TextSecurePreferences.getNotificationLedPatternCustom(context)
       }
@@ -333,8 +333,8 @@ sealed class NotificationBuilder(protected val context: Context) {
       val ringtone: Uri? = recipient?.messageRingtone
       val vibrate = recipient?.messageVibrate
 
-      val defaultRingtone: Uri = SignalStore.settings().messageNotificationSound
-      val defaultVibrate: Boolean = SignalStore.settings().isMessageVibrateEnabled
+      val defaultRingtone: Uri = SignalStore.settings.messageNotificationSound
+      val defaultVibrate: Boolean = SignalStore.settings.isMessageVibrateEnabled
 
       if (ringtone == null && !TextUtils.isEmpty(defaultRingtone.toString())) {
         builder.setSound(defaultRingtone)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationConversation.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationConversation.kt
index 47b90cc940..7b71ffc1a6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationConversation.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationConversation.kt
@@ -10,8 +10,9 @@ import androidx.core.app.TaskStackBuilder
 import org.signal.core.util.PendingIntentFlags
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatar
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatarDrawable
 import org.thoughtcrime.securesms.contacts.TurnOffContactJoinedNotificationsActivity
-import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto
 import org.thoughtcrime.securesms.conversation.ConversationIntents
 import org.thoughtcrime.securesms.conversation.colors.AvatarColor
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -27,7 +28,6 @@ import org.thoughtcrime.securesms.service.KeyCachingService
 import org.thoughtcrime.securesms.stories.StoryViewerArgs
 import org.thoughtcrime.securesms.stories.viewer.StoryViewerActivity
 import org.thoughtcrime.securesms.util.Util
-import java.lang.NullPointerException
 
 /**
  * Encapsulate all the notifications for a given conversation (thread) and the top
@@ -46,7 +46,7 @@ data class NotificationConversation(
   val isOnlyContactJoinedEvent: Boolean = messageCount == 1 && mostRecentNotification.isJoined
 
   fun getContentTitle(context: Context): CharSequence {
-    return if (SignalStore.settings().messageNotificationsPrivacy.isDisplayContact) {
+    return if (SignalStore.settings.messageNotificationsPrivacy.isDisplayContact) {
       getDisplayName(context)
     } else {
       context.getString(R.string.SingleRecipientNotificationBuilder_signal)
@@ -54,15 +54,15 @@ data class NotificationConversation(
   }
 
   fun getContactLargeIcon(context: Context): Drawable? {
-    return if (SignalStore.settings().messageNotificationsPrivacy.isDisplayContact) {
+    return if (SignalStore.settings.messageNotificationsPrivacy.isDisplayContact) {
       recipient.getContactDrawable(context)
     } else {
-      GeneratedContactPhoto("Unknown", R.drawable.ic_profile_outline_40).asDrawable(context, AvatarColor.UNKNOWN)
+      FallbackAvatarDrawable(context, FallbackAvatar.forTextOrDefault("Unknown", AvatarColor.UNKNOWN)).circleCrop()
     }
   }
 
   fun getSlideBigPictureUri(context: Context): Uri? {
-    return if (notificationItems.size == 1 && SignalStore.settings().messageNotificationsPrivacy.isDisplayMessage && !KeyCachingService.isLocked()) {
+    return if (notificationItems.size == 1 && SignalStore.settings.messageNotificationsPrivacy.isDisplayMessage && !KeyCachingService.isLocked()) {
       mostRecentNotification.getBigPictureUri()
     } else {
       null
@@ -70,7 +70,7 @@ data class NotificationConversation(
   }
 
   fun getContentText(context: Context): CharSequence? {
-    val privacy: NotificationPrivacyPreference = SignalStore.settings().messageNotificationsPrivacy
+    val privacy: NotificationPrivacyPreference = SignalStore.settings.messageNotificationsPrivacy
     val stringBuilder = SpannableStringBuilder()
 
     if (privacy.isDisplayContact && recipient.isGroup) {
@@ -85,7 +85,7 @@ data class NotificationConversation(
   }
 
   fun getConversationTitle(context: Context): CharSequence? {
-    if (SignalStore.settings().messageNotificationsPrivacy.isDisplayContact) {
+    if (SignalStore.settings.messageNotificationsPrivacy.isDisplayContact) {
       return if (isGroup) getDisplayName(context) else null
     }
     return context.getString(R.string.SingleRecipientNotificationBuilder_signal)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationExtensions.kt
index 4f1d5e4a59..ef5e8d8910 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationExtensions.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationExtensions.kt
@@ -13,11 +13,11 @@ import com.bumptech.glide.load.Transformation
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.resource.bitmap.CircleCrop
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatar
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatarDrawable
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto
-import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto
-import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto
 import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri
 import org.thoughtcrime.securesms.notifications.NotificationIds
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -37,12 +37,12 @@ fun Drawable?.toLargeBitmap(context: Context): Bitmap? {
 
 fun Recipient.getContactDrawable(context: Context): Drawable? {
   val contactPhoto: ContactPhoto? = if (isSelf) ProfileContactPhoto(this) else contactPhoto
-  val fallbackContactPhoto: FallbackContactPhoto = if (isSelf) getFallback(context) else fallbackContactPhoto
+  val fallbackAvatar: FallbackAvatar = if (isSelf) getFallback(context) else getFallbackAvatar()
   return if (contactPhoto != null) {
     try {
       val transforms: MutableList<Transformation<Bitmap>> = mutableListOf()
       if (shouldBlurAvatar) {
-        transforms += BlurTransformation(ApplicationDependencies.getApplication(), 0.25f, BlurTransformation.MAX_RADIUS)
+        transforms += BlurTransformation(AppDependencies.application, 0.25f, BlurTransformation.MAX_RADIUS)
       }
       transforms += CircleCrop()
 
@@ -56,12 +56,12 @@ fun Recipient.getContactDrawable(context: Context): Drawable? {
         )
         .get()
     } catch (e: InterruptedException) {
-      fallbackContactPhoto.asDrawable(context, avatarColor)
+      FallbackAvatarDrawable(context, fallbackAvatar).circleCrop()
     } catch (e: ExecutionException) {
-      fallbackContactPhoto.asDrawable(context, avatarColor)
+      FallbackAvatarDrawable(context, fallbackAvatar).circleCrop()
     }
   } else {
-    fallbackContactPhoto.asDrawable(context, avatarColor)
+    FallbackAvatarDrawable(context, fallbackAvatar).circleCrop()
   }
 }
 
@@ -84,8 +84,8 @@ fun Intent.makeUniqueToPreventMerging(): Intent {
   return setData((Uri.parse("custom://" + System.currentTimeMillis())))
 }
 
-fun Recipient.getFallback(context: Context): FallbackContactPhoto {
-  return GeneratedContactPhoto(getDisplayName(context), R.drawable.ic_profile_outline_40)
+fun Recipient.getFallback(context: Context): FallbackAvatar {
+  return FallbackAvatar.forTextOrDefault(getDisplayName(context), avatarColor)
 }
 
 fun NotificationManager.isDisplayingSummaryNotification(): Boolean {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationFactory.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationFactory.kt
index 30523116ec..a0e0626dac 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationFactory.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationFactory.kt
@@ -19,13 +19,14 @@ import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.MainActivity
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatar
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatarDrawable
 import org.thoughtcrime.securesms.components.emoji.EmojiStrings
-import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto
 import org.thoughtcrime.securesms.conversation.ConversationIntents
 import org.thoughtcrime.securesms.conversation.colors.AvatarColor
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.InMemoryMessageRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.notifications.NotificationIds
@@ -201,7 +202,7 @@ object NotificationFactory {
   private fun shouldAlert(conversation: NotificationConversation, lastNotificationTimestamp: Long, alertOverride: Boolean): Boolean {
     val throttle: Duration = when {
       conversation.recipient.isGroup && (conversation.mostRecentNotification as? MessageNotification)?.hasSelfMention == false -> GROUP_THROTTLE
-      ApplicationDependencies.getIncomingMessageObserver().decryptionDrained -> STILL_DECRYPTING_INDIVIDUAL_THROTTLE
+      AppDependencies.incomingMessageObserver.decryptionDrained -> STILL_DECRYPTING_INDIVIDUAL_THROTTLE
       else -> 0.seconds
     }
     val canAlertBasedOnTime: Boolean = lastNotificationTimestamp < System.currentTimeMillis() - throttle.inWholeMilliseconds || lastNotificationTimestamp > System.currentTimeMillis()
@@ -307,7 +308,7 @@ object NotificationFactory {
   }
 
   private fun notifyInThread(context: Context, recipient: Recipient, lastAudibleNotification: Long) {
-    if (!SignalStore.settings().isMessageNotificationsInChatSoundsEnabled ||
+    if (!SignalStore.settings.isMessageNotificationsInChatSoundsEnabled ||
       ServiceUtil.getAudioManager(context).ringerMode != AudioManager.RINGER_MODE_NORMAL ||
       (System.currentTimeMillis() - lastAudibleNotification) < DefaultMessageNotifier.MIN_AUDIBLE_PERIOD_MILLIS
     ) {
@@ -317,7 +318,7 @@ object NotificationFactory {
     val uri: Uri = if (NotificationChannels.supported()) {
       NotificationChannels.getInstance().getMessageRingtone(recipient) ?: NotificationChannels.getInstance().messageRingtone
     } else {
-      recipient.messageRingtone ?: SignalStore.settings().messageNotificationSound
+      recipient.messageRingtone ?: SignalStore.settings.messageNotificationSound
     }
 
     if (uri == Uri.EMPTY || uri.toString().isEmpty()) {
@@ -373,7 +374,7 @@ object NotificationFactory {
   fun notifyStoryDeliveryFailed(context: Context, recipient: Recipient, thread: ConversationId) {
     val intent = Intent(context, MyStoriesActivity::class.java).makeUniqueToPreventMerging()
 
-    val contentTitle = if (SignalStore.settings().messageNotificationsPrivacy.isDisplayContact) {
+    val contentTitle = if (SignalStore.settings.messageNotificationsPrivacy.isDisplayContact) {
       if (recipient.isGroup) {
         context.getString(R.string.MessageNotifier_group_story_title, recipient.getDisplayName(context))
       } else {
@@ -383,14 +384,14 @@ object NotificationFactory {
       context.getString(R.string.SingleRecipientNotificationBuilder_signal)
     }
 
-    val largeIcon = if (SignalStore.settings().messageNotificationsPrivacy.isDisplayContact) {
+    val largeIcon = if (SignalStore.settings.messageNotificationsPrivacy.isDisplayContact) {
       if (recipient.isMyStory) {
         Recipient.self().getContactDrawable(context)
       } else {
         recipient.getContactDrawable(context)
       }
     } else {
-      GeneratedContactPhoto("Unknown", R.drawable.ic_profile_outline_40).asDrawable(context, AvatarColor.UNKNOWN)
+      FallbackAvatarDrawable(context, FallbackAvatar.forTextOrDefault("Unknown", AvatarColor.UNKNOWN)).circleCrop()
     }.toLargeBitmap(context)
 
     val builder: NotificationBuilder = NotificationBuilder.create(context)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationItem.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationItem.kt
index dce50c11b0..81fd64b6d2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationItem.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationItem.kt
@@ -90,7 +90,7 @@ sealed class NotificationItem(val threadRecipient: Recipient, protected val reco
   }
 
   fun getStyledPrimaryText(context: Context, trimmed: Boolean = false): CharSequence {
-    return if (SignalStore.settings().messageNotificationsPrivacy.isDisplayNothing) {
+    return if (SignalStore.settings.messageNotificationsPrivacy.isDisplayNothing) {
       context.getString(R.string.SingleRecipientNotificationBuilder_new_message)
     } else {
       SpannableStringBuilder().apply {
@@ -105,7 +105,7 @@ sealed class NotificationItem(val threadRecipient: Recipient, protected val reco
   }
 
   fun getPersonName(context: Context): CharSequence {
-    return if (SignalStore.settings().messageNotificationsPrivacy.isDisplayContact) {
+    return if (SignalStore.settings.messageNotificationsPrivacy.isDisplayContact) {
       authorRecipient.getDisplayName(context)
     } else {
       context.getString(R.string.SingleRecipientNotificationBuilder_signal)
@@ -117,7 +117,7 @@ sealed class NotificationItem(val threadRecipient: Recipient, protected val reco
   }
 
   fun getPersonUri(): String? {
-    return if (SignalStore.settings().messageNotificationsPrivacy.isDisplayContact && authorRecipient.isSystemContact) {
+    return if (SignalStore.settings.messageNotificationsPrivacy.isDisplayContact && authorRecipient.isSystemContact) {
       authorRecipient.contactUri.toString()
     } else {
       null
@@ -125,7 +125,7 @@ sealed class NotificationItem(val threadRecipient: Recipient, protected val reco
   }
 
   fun getPersonIcon(context: Context): IconCompat? {
-    return if (SignalStore.settings().messageNotificationsPrivacy.isDisplayContact) {
+    return if (SignalStore.settings.messageNotificationsPrivacy.isDisplayContact) {
       AvatarUtil.getIconCompat(context, authorRecipient)
     } else {
       null
@@ -133,7 +133,7 @@ sealed class NotificationItem(val threadRecipient: Recipient, protected val reco
   }
 
   fun getPrimaryText(context: Context): CharSequence {
-    return if (SignalStore.settings().messageNotificationsPrivacy.isDisplayMessage) {
+    return if (SignalStore.settings.messageNotificationsPrivacy.isDisplayMessage) {
       if (RecipientUtil.isMessageRequestAccepted(context, thread.threadId)) {
         getPrimaryTextActual(context)
       } else {
@@ -146,7 +146,7 @@ sealed class NotificationItem(val threadRecipient: Recipient, protected val reco
 
   fun getInboxLine(context: Context): CharSequence? {
     return when {
-      SignalStore.settings().messageNotificationsPrivacy.isDisplayNothing -> null
+      SignalStore.settings.messageNotificationsPrivacy.isDisplayNothing -> null
       else -> getStyledPrimaryText(context, true)
     }
   }
@@ -233,7 +233,7 @@ class MessageNotification(threadRecipient: Recipient, record: MessageRecord) : N
       ThreadBodyUtil.getFormattedBodyForNotification(context, record, null)
     } else if (record.isStoryReaction()) {
       ThreadBodyUtil.getFormattedBodyForNotification(context, record, null)
-    } else if (record.isPaymentNotification) {
+    } else if (record.isPaymentNotification || record.isPaymentTombstone) {
       ThreadBodyUtil.getFormattedBodyForNotification(context, record, null)
     } else {
       getBodyWithMentionsAndStyles(context, record)
@@ -267,7 +267,7 @@ class MessageNotification(threadRecipient: Recipient, record: MessageRecord) : N
   }
 
   override fun getThumbnailInfo(context: Context): ThumbnailInfo {
-    return if (SignalStore.settings().messageNotificationsPrivacy.isDisplayMessage && !KeyCachingService.isLocked()) {
+    return if (SignalStore.settings.messageNotificationsPrivacy.isDisplayMessage && !KeyCachingService.isLocked()) {
       if (thumbnailInfo.needsShrinking) {
         thumbnailInfo = NotificationThumbnails.get(context, this)
       }
@@ -343,7 +343,7 @@ class ReactionNotification(threadRecipient: Recipient, record: MessageRecord, va
       context.getString(R.string.MessageNotifier_reacted_s_to_your_sticker, EMOJI_REPLACEMENT_STRING)
     } else if (record.isMms && record.isViewOnce) {
       context.getString(R.string.MessageNotifier_reacted_s_to_your_view_once_media, EMOJI_REPLACEMENT_STRING)
-    } else if (record.isPaymentNotification) {
+    } else if (record.isPaymentNotification || record.isPaymentTombstone) {
       context.getString(R.string.MessageNotifier_reacted_s_to_your_payment, EMOJI_REPLACEMENT_STRING)
     } else if (!bodyIsEmpty) {
       context.getString(R.string.MessageNotifier_reacted_s_to_s, EMOJI_REPLACEMENT_STRING, body)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationThumbnails.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationThumbnails.kt
index 2d4d1dbbae..bc4d7aa90e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationThumbnails.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationThumbnails.kt
@@ -7,13 +7,13 @@ import org.signal.core.util.asListContains
 import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.database.model.MessageId
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader
 import org.thoughtcrime.securesms.mms.Slide
 import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.util.BitmapDecodingException
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.ImageCompressionUtil
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.kb
 import org.thoughtcrime.securesms.util.mb
 
@@ -41,7 +41,7 @@ object NotificationThumbnails {
    * specifics here, we'll just disable notification thumbnails for them.
    */
   private val isBlocklisted by lazy {
-    FeatureFlags.notificationThumbnailProductBlocklist().asListContains(Build.PRODUCT)
+    RemoteConfig.notificationThumbnailProductBlocklist.asListContains(Build.PRODUCT)
   }
 
   fun getWithoutModifying(notificationItem: NotificationItem): NotificationItem.ThumbnailInfo {
@@ -143,7 +143,7 @@ object NotificationThumbnails {
             thumbnailCache[messageId] = CachedThumbnail(thumbnailUri, result.mimeType)
           }
 
-          ApplicationDependencies.getMessageNotifier().updateNotification(context, notificationItem.thread)
+          AppDependencies.messageNotifier.updateNotification(context, notificationItem.thread)
         } else {
           Log.i(TAG, "Unable to compress attachment thumbnail for $messageId")
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/DataExportUtil.java b/app/src/main/java/org/thoughtcrime/securesms/payments/DataExportUtil.java
index 6fc50b8e9b..b44a457954 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/DataExportUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/DataExportUtil.java
@@ -8,11 +8,11 @@
 
 import org.thoughtcrime.securesms.database.PaymentTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.payments.reconciliation.LedgerReconcile;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
@@ -25,7 +25,7 @@ public final class DataExportUtil {
   private DataExportUtil() {}
 
   public static @NonNull String createTsv() {
-    if (!FeatureFlags.internalUser()) {
+    if (!RemoteConfig.internalUser()) {
       throw new AssertionError("This is intended for internal use only");
     }
 
@@ -34,7 +34,7 @@ private DataExportUtil() {}
     }
 
     List<PaymentTable.PaymentTransaction> paymentTransactions = SignalDatabase.payments().getAll();
-    MobileCoinLedgerWrapper               ledger              = SignalStore.paymentsValues().liveMobileCoinLedger().getValue();
+    MobileCoinLedgerWrapper               ledger              = SignalStore.payments().liveMobileCoinLedger().getValue();
     List<Payment>                            reconciled          = LedgerReconcile.reconcile(paymentTransactions, Objects.requireNonNull(ledger));
 
     return createTsv(reconciled);
@@ -42,7 +42,7 @@ private DataExportUtil() {}
 
   @RequiresApi(api = 26)
   private static @NonNull String createTsv(@NonNull List<Payment> payments) {
-    Context       context = ApplicationDependencies.getApplication();
+    Context       context = AppDependencies.getApplication();
     StringBuilder sb      = new StringBuilder();
 
     sb.append(String.format(Locale.US, "%s\t%s\t%s\t%s\t%s%n", "Date Time", "From", "To", "Amount", "Fee"));
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/FiatMoneyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/payments/FiatMoneyUtil.java
index dc2b1eb094..026fe4116b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/FiatMoneyUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/FiatMoneyUtil.java
@@ -7,7 +7,7 @@
 import org.signal.core.util.logging.Log;
 import org.signal.core.util.money.FiatMoney;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
@@ -33,10 +33,10 @@ private FiatMoneyUtil() {}
   public static @NonNull LiveData<Optional<FiatMoney>> getExchange(@NonNull LiveData<Money> amount) {
     return LiveDataUtil.mapAsync(amount, a -> {
       try {
-        return ApplicationDependencies.getPayments()
-                                      .getCurrencyExchange(false)
-                                      .getExchangeRate(SignalStore.paymentsValues().currentCurrency())
-                                      .exchange(a);
+        return AppDependencies.getPayments()
+                              .getCurrencyExchange(false)
+                              .getExchangeRate(SignalStore.payments().currentCurrency())
+                              .exchange(a);
       } catch (IOException e) {
         Log.w(TAG, e);
         return Optional.empty();
@@ -68,7 +68,7 @@ private FiatMoneyUtil() {}
     if (amount.getTimestamp() > 0 && options.displayTime) {
       return resources.getString(R.string.CurrencyAmountFormatter_s_at_s,
                                  formattedAmount,
-                                 DateUtils.getTimeString(ApplicationDependencies.getApplication(), Locale.getDefault(), amount.getTimestamp()));
+                                 DateUtils.getTimeString(AppDependencies.getApplication(), Locale.getDefault(), amount.getTimestamp()));
     }
     return formattedAmount;
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/GeographicalRestrictions.java b/app/src/main/java/org/thoughtcrime/securesms/payments/GeographicalRestrictions.java
index 1dcf692146..89d7b3d0b8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/GeographicalRestrictions.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/GeographicalRestrictions.java
@@ -4,7 +4,7 @@
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.Util;
 
 import java.util.Arrays;
@@ -24,7 +24,7 @@ public static boolean e164Allowed(@Nullable String e164) {
 
     String bareE164 = e164.startsWith("+") ? e164.substring(1) : e164;
 
-    return parsePrefixes(FeatureFlags.paymentsCountryBlocklist())
+    return parsePrefixes(RemoteConfig.paymentsCountryBlocklist())
         .stream()
         .noneMatch(bareE164::startsWith);
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/MobileCoinConfig.java b/app/src/main/java/org/thoughtcrime/securesms/payments/MobileCoinConfig.java
index cc1ef83d15..00171b0ec6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/MobileCoinConfig.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/MobileCoinConfig.java
@@ -7,7 +7,7 @@
 
 import com.mobilecoin.lib.ClientConfig;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.internal.push.AuthCredentials;
 
@@ -45,7 +45,7 @@ public static MobileCoinConfig getMainNet(SignalServiceAccountManager signalServ
   }
 
   protected static Set<X509Certificate> getTrustRoots(@RawRes int pemResource) {
-    try (InputStream inputStream = ApplicationDependencies.getApplication().getResources().openRawResource(pemResource)) {
+    try (InputStream inputStream = AppDependencies.getApplication().getResources().openRawResource(pemResource)) {
       Collection<? extends Certificate> certificates = CertificateFactory.getInstance("X.509")
                                                                          .generateCertificates(inputStream);
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/MoneyView.java b/app/src/main/java/org/thoughtcrime/securesms/payments/MoneyView.java
index ea2491eb3e..9e512e2819 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/MoneyView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/MoneyView.java
@@ -13,7 +13,7 @@
 import androidx.core.content.ContextCompat;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.whispersystems.signalservice.api.payments.Currency;
 import org.whispersystems.signalservice.api.payments.FormatterOptions;
@@ -101,7 +101,7 @@ public void setMoney(@NonNull Money money, long timestamp, @Nullable Object curr
     if (timestamp > 0L) {
       balanceSpan = new SpannableString(getResources().getString(R.string.CurrencyAmountFormatter_s_at_s,
                                         balance,
-                                        DateUtils.getTimeString(ApplicationDependencies.getApplication(), Locale.getDefault(), timestamp)));
+                                        DateUtils.getTimeString(AppDependencies.getApplication(), Locale.getDefault(), timestamp)));
     } else {
       balanceSpan = new SpannableString(balance);
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/PaymentTransactionLiveData.java b/app/src/main/java/org/thoughtcrime/securesms/payments/PaymentTransactionLiveData.java
index a1497c47e2..bd15807e4b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/PaymentTransactionLiveData.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/PaymentTransactionLiveData.java
@@ -7,7 +7,7 @@
 import org.thoughtcrime.securesms.database.DatabaseObserver;
 import org.thoughtcrime.securesms.database.PaymentTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.util.concurrent.SerialMonoLifoExecutor;
 
 import java.util.UUID;
@@ -30,12 +30,12 @@ public PaymentTransactionLiveData(@NonNull UUID paymentId) {
   @Override
   protected void onActive() {
     getPaymentTransaction();
-    ApplicationDependencies.getDatabaseObserver().registerPaymentObserver(paymentId, observer);
+    AppDependencies.getDatabaseObserver().registerPaymentObserver(paymentId, observer);
   }
 
   @Override
   protected void onInactive() {
-    ApplicationDependencies.getDatabaseObserver().unregisterObserver(observer);
+    AppDependencies.getDatabaseObserver().unregisterObserver(observer);
   }
 
   private void getPaymentTransaction() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/Payments.java b/app/src/main/java/org/thoughtcrime/securesms/payments/Payments.java
index 7c09b5554c..6a10a4429d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/Payments.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/Payments.java
@@ -4,7 +4,7 @@
 import androidx.annotation.WorkerThread;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.payments.currency.CurrencyExchange;
 import org.whispersystems.signalservice.api.payments.CurrencyConversion;
@@ -33,7 +33,7 @@ public synchronized Wallet getWallet() {
     if (wallet != null) {
       return wallet;
     }
-    Entropy paymentsEntropy = SignalStore.paymentsValues().getPaymentsEntropy();
+    Entropy paymentsEntropy = SignalStore.payments().getPaymentsEntropy();
     wallet = new Wallet(mobileCoinConfig, Objects.requireNonNull(paymentsEntropy));
     return wallet;
   }
@@ -46,7 +46,7 @@ public synchronized void closeWallet() {
   public synchronized @NonNull CurrencyExchange getCurrencyExchange(boolean refreshIfAble) throws IOException {
     if (currencyConversions == null || shouldRefresh(refreshIfAble, currencyConversions.getTimestamp())) {
       Log.i(TAG, "Currency conversion data is unavailable or a refresh was requested and available");
-      CurrencyConversions newCurrencyConversions = ApplicationDependencies.getSignalServiceAccountManager().getCurrencyConversions();
+      CurrencyConversions newCurrencyConversions = AppDependencies.getSignalServiceAccountManager().getCurrencyConversions();
       if (currencyConversions == null || (newCurrencyConversions != null && newCurrencyConversions.getTimestamp() > currencyConversions.getTimestamp())) {
         currencyConversions = newCurrencyConversions;
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/UnreadPaymentsRepository.java b/app/src/main/java/org/thoughtcrime/securesms/payments/UnreadPaymentsRepository.java
index 7e94be2631..c3938da7db 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/UnreadPaymentsRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/UnreadPaymentsRepository.java
@@ -7,7 +7,7 @@
 
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 
 import java.util.UUID;
 import java.util.concurrent.Executor;
@@ -26,13 +26,13 @@ public void markPaymentSeen(@NonNull UUID paymentId) {
 
   @WorkerThread
   private void markAllPaymentsSeenInternal() {
-    Context context = ApplicationDependencies.getApplication();
+    Context context = AppDependencies.getApplication();
     SignalDatabase.payments().markAllSeen();
   }
 
   @WorkerThread
   private void markPaymentSeenInternal(@NonNull UUID paymentId) {
-    Context context = ApplicationDependencies.getApplication();
+    Context context = AppDependencies.getApplication();
     SignalDatabase.payments().markPaymentSeen(paymentId);
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/Wallet.java b/app/src/main/java/org/thoughtcrime/securesms/payments/Wallet.java
index 23f35aaf6e..0528cb7aa5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/Wallet.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/Wallet.java
@@ -93,12 +93,12 @@ public Wallet(@NonNull MobileCoinConfig mobileCoinConfig, @NonNull Entropy payme
 
   @AnyThread
   public @NonNull Balance getCachedBalance() {
-    return SignalStore.paymentsValues().mobileCoinLatestBalance();
+    return SignalStore.payments().mobileCoinLatestBalance();
   }
 
   @AnyThread
   public @NonNull MobileCoinLedgerWrapper getCachedLedger() {
-    return SignalStore.paymentsValues().mobileCoinLatestFullLedger();
+    return SignalStore.payments().mobileCoinLatestFullLedger();
   }
 
   @WorkerThread
@@ -108,7 +108,7 @@ public Wallet(@NonNull MobileCoinConfig mobileCoinConfig, @NonNull Entropy payme
 
   @WorkerThread
   private @NonNull MobileCoinLedgerWrapper getFullLedger(boolean retryOnAuthFailure) {
-    PaymentsValues paymentsValues = SignalStore.paymentsValues();
+    PaymentsValues paymentsValues = SignalStore.payments();
     try {
       MobileCoinLedgerWrapper ledger = tryGetFullLedger(null);
 
@@ -205,7 +205,7 @@ public Wallet(@NonNull MobileCoinConfig mobileCoinConfig, @NonNull Entropy payme
                                                      .blockNumber(highestBlockIndex.longValue())
                                                      .timestamp(highestBlockTimeStamp)
                                                      .build());
-      SignalStore.paymentsValues().setEnclaveFailure(false);
+      SignalStore.payments().setEnclaveFailure(false);
       return new MobileCoinLedgerWrapper(builder.build());
     } catch (InvalidFogResponse e) {
       Log.w(TAG, "Problem getting ledger", e);
@@ -218,7 +218,7 @@ public Wallet(@NonNull MobileCoinConfig mobileCoinConfig, @NonNull Entropy payme
       }
       throw new IOException(e);
     } catch (AttestationException e) {
-      SignalStore.paymentsValues().setEnclaveFailure(true);
+      SignalStore.payments().setEnclaveFailure(true);
       Log.w(TAG, "Attestation problem getting ledger", e);
       throw new IOException(e);
     } catch (Uint64RangeException e) {
@@ -247,10 +247,10 @@ public Wallet(@NonNull MobileCoinConfig mobileCoinConfig, @NonNull Entropy payme
       } else {
         money = Money.picoMobileCoin(mobileCoinClient.estimateTotalFee(Amount.ofMOB(picoMob)).getValue());
       }
-      SignalStore.paymentsValues().setEnclaveFailure(false);
+      SignalStore.payments().setEnclaveFailure(false);
       return money;
     } catch (AttestationException e) {
-      SignalStore.paymentsValues().setEnclaveFailure(true);
+      SignalStore.payments().setEnclaveFailure(true);
       return Money.MobileCoin.ZERO;
     } catch (InvalidFogResponse | InsufficientFundsException e) {
       Log.w(TAG, "Failed to get fee", e);
@@ -317,7 +317,7 @@ public Wallet(@NonNull MobileCoinConfig mobileCoinConfig, @NonNull Entropy payme
           break;
         default:
       }
-      SignalStore.paymentsValues().setEnclaveFailure(false);
+      SignalStore.payments().setEnclaveFailure(false);
       if (txStatus == null) throw new IllegalStateException("Unknown Transaction Status: " + status);
       return txStatus;
     } catch (SerializationException | InvalidFogResponse | InvalidReceiptException e) {
@@ -326,7 +326,7 @@ public Wallet(@NonNull MobileCoinConfig mobileCoinConfig, @NonNull Entropy payme
     } catch (NetworkException e) {
       throw new IOException(e);
     } catch (AttestationException e) {
-      SignalStore.paymentsValues().setEnclaveFailure(true);
+      SignalStore.payments().setEnclaveFailure(true);
       throw new IOException(e);
     } catch (AmountDecoderException e) {
       Log.w(TAG, "Failed to decode amount", e);
@@ -345,14 +345,14 @@ private void sendPayment(@NonNull MobileCoinPublicAddress to,
     if (defragmentFirst) {
       try {
         defragmentFees = defragment(amount, results);
-        SignalStore.paymentsValues().setEnclaveFailure(false);
+        SignalStore.payments().setEnclaveFailure(false);
       } catch (InsufficientFundsException e) {
         Log.w(TAG, "Insufficient funds", e);
         results.add(TransactionSubmissionResult.failure(TransactionSubmissionResult.ErrorCode.INSUFFICIENT_FUNDS, true));
         return;
       } catch (AttestationException e) {
         results.add(TransactionSubmissionResult.failure(TransactionSubmissionResult.ErrorCode.GENERIC_FAILURE, true));
-        SignalStore.paymentsValues().setEnclaveFailure(true);
+        SignalStore.payments().setEnclaveFailure(true);
         return;
       } catch (TimeoutException | InvalidTransactionException | InvalidFogResponse | TransactionBuilderException | NetworkException | FogReportException | FogSyncException e) {
         Log.w(TAG, "Defragment failed", e);
@@ -386,7 +386,7 @@ private void sendPayment(@NonNull MobileCoinPublicAddress to,
                                                                  Amount.ofMOB(feeMobileCoin.toPicoMobBigInteger()),
                                                                  TxOutMemoBuilder.createSenderAndDestinationRTHMemoBuilder(account));
       }
-      SignalStore.paymentsValues().setEnclaveFailure(false);
+      SignalStore.payments().setEnclaveFailure(false);
     } catch (InsufficientFundsException e) {
       Log.w(TAG, "Insufficient funds", e);
       results.add(TransactionSubmissionResult.failure(TransactionSubmissionResult.ErrorCode.INSUFFICIENT_FUNDS, false));
@@ -407,7 +407,7 @@ private void sendPayment(@NonNull MobileCoinPublicAddress to,
     } catch (AttestationException e) {
       Log.w(TAG, "Attestation problem", e);
       results.add(TransactionSubmissionResult.failure(TransactionSubmissionResult.ErrorCode.GENERIC_FAILURE, false));
-      SignalStore.paymentsValues().setEnclaveFailure(true);
+      SignalStore.payments().setEnclaveFailure(true);
     } catch (NetworkException e) {
       Log.w(TAG, "Network problem", e);
       results.add(TransactionSubmissionResult.failure(TransactionSubmissionResult.ErrorCode.GENERIC_FAILURE, false));
@@ -429,7 +429,7 @@ private void sendPayment(@NonNull MobileCoinPublicAddress to,
       mobileCoinClient.submitTransaction(pendingTransaction.getTransaction());
       Log.i(TAG, "Transaction submitted");
       results.add(TransactionSubmissionResult.successfullySubmitted(new PaymentTransactionId.MobileCoin(pendingTransaction.getTransaction().toByteArray(), pendingTransaction.getReceipt().toByteArray(), feeMobileCoin)));
-      SignalStore.paymentsValues().setEnclaveFailure(false);
+      SignalStore.payments().setEnclaveFailure(false);
     } catch (NetworkException e) {
       Log.w(TAG, "Network problem", e);
       results.add(TransactionSubmissionResult.failure(TransactionSubmissionResult.ErrorCode.NETWORK_FAILURE, false));
@@ -439,7 +439,7 @@ private void sendPayment(@NonNull MobileCoinPublicAddress to,
     } catch (AttestationException e) {
       Log.w(TAG, "Attestation problem", e);
       results.add(TransactionSubmissionResult.failure(TransactionSubmissionResult.ErrorCode.GENERIC_FAILURE, false));
-      SignalStore.paymentsValues().setEnclaveFailure(true);
+      SignalStore.payments().setEnclaveFailure(true);
     } catch (SerializationException e) {
       Log.w(TAG, "Serialization problem", e);
       results.add(TransactionSubmissionResult.failure(TransactionSubmissionResult.ErrorCode.GENERIC_FAILURE, false));
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/backup/PaymentsRecoveryRepository.java b/app/src/main/java/org/thoughtcrime/securesms/payments/backup/PaymentsRecoveryRepository.java
index 80c0630a70..b706083866 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/backup/PaymentsRecoveryRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/backup/PaymentsRecoveryRepository.java
@@ -7,6 +7,6 @@
 
 public final class PaymentsRecoveryRepository {
   public @NonNull Mnemonic getMnemonic() {
-    return SignalStore.paymentsValues().getPaymentsMnemonic();
+    return SignalStore.payments().getPaymentsMnemonic();
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/backup/PaymentsRecoveryStartFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/backup/PaymentsRecoveryStartFragment.java
index 9edd125701..f17632c498 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/backup/PaymentsRecoveryStartFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/backup/PaymentsRecoveryStartFragment.java
@@ -65,7 +65,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
       message.setText(getDescription(state));
       message.setLink(getString(R.string.PaymentsRecoveryStartFragment__learn_more__view));
       startButton.setOnClickListener(v -> {
-        if (state == RecoveryPhraseStates.FROM_PAYMENTS_MENU_WITH_MNEMONIC_CONFIRMED && ServiceUtil.getKeyguardManager(requireContext()).isKeyguardSecure() && SignalStore.paymentsValues().isPaymentLockEnabled()) {
+        if (state == RecoveryPhraseStates.FROM_PAYMENTS_MENU_WITH_MNEMONIC_CONFIRMED && ServiceUtil.getKeyguardManager(requireContext()).isKeyguardSecure() && SignalStore.payments().isPaymentLockEnabled()) {
           BiometricPrompt.PromptInfo promptInfo = new BiometricPrompt.PromptInfo
                                                                      .Builder()
                                                                      .setAllowedAuthenticators(BiometricDeviceAuthentication.ALLOWED_AUTHENTICATORS)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/backup/confirm/PaymentsRecoveryPhraseConfirmFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/backup/confirm/PaymentsRecoveryPhraseConfirmFragment.java
index 6006509932..66f649dc23 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/backup/confirm/PaymentsRecoveryPhraseConfirmFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/backup/confirm/PaymentsRecoveryPhraseConfirmFragment.java
@@ -67,7 +67,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     word2.addTextChangedListener(new AfterTextChanged(e -> viewModel.validateWord2(e.toString())));
     seePhraseAgain.setOnClickListener(v -> Navigation.findNavController(requireView()).popBackStack());
     done.setOnClickListener(v -> {
-      SignalStore.paymentsValues().confirmMnemonic(true);
+      SignalStore.payments().confirmMnemonic(true);
       ViewUtil.hideKeyboard(requireContext(), view);
       Toast.makeText(requireContext(), R.string.PaymentRecoveryPhraseConfirmFragment__recovery_phrase_confirmed, Toast.LENGTH_SHORT).show();
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/backup/phrase/PaymentsRecoveryPhraseFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/backup/phrase/PaymentsRecoveryPhraseFragment.java
index 5a5f734fc0..3b2ac0f29d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/backup/phrase/PaymentsRecoveryPhraseFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/backup/phrase/PaymentsRecoveryPhraseFragment.java
@@ -61,7 +61,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
       setUpForConfirmation(message, next, edit, copy, words);
     } else {
-      Mnemonic mnemonic = SignalStore.paymentsValues().getPaymentsMnemonic();
+      Mnemonic mnemonic = SignalStore.payments().getPaymentsMnemonic();
 
       words = mnemonic.getWords();
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/backup/phrase/PaymentsRecoveryPhraseRepository.java b/app/src/main/java/org/thoughtcrime/securesms/payments/backup/phrase/PaymentsRecoveryPhraseRepository.java
index 4fdb65bb0a..a99afac092 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/backup/phrase/PaymentsRecoveryPhraseRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/backup/phrase/PaymentsRecoveryPhraseRepository.java
@@ -6,7 +6,7 @@
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.PaymentLedgerUpdateJob;
 import org.thoughtcrime.securesms.jobs.ProfileUploadJob;
 import org.thoughtcrime.securesms.keyvalue.PaymentsValues;
@@ -24,13 +24,13 @@ void restoreMnemonic(@NonNull List<String> words,
   {
     SignalExecutors.BOUNDED.execute(() -> {
       String                             mnemonic = Util.join(words, " ");
-      PaymentsValues.WalletRestoreResult result   = SignalStore.paymentsValues().restoreWallet(mnemonic);
+      PaymentsValues.WalletRestoreResult result   = SignalStore.payments().restoreWallet(mnemonic);
 
       switch (result) {
         case ENTROPY_CHANGED:
           Log.i(TAG, "restoreMnemonic: mnemonic resulted in entropy mismatch, flushing cached values");
           SignalDatabase.payments().deleteAll();
-          ApplicationDependencies.getPayments().closeWallet();
+          AppDependencies.getPayments().closeWallet();
           updateProfileAndFetchLedger();
           break;
         case ENTROPY_UNCHANGED:
@@ -47,9 +47,9 @@ void restoreMnemonic(@NonNull List<String> words,
   }
 
   private void updateProfileAndFetchLedger() {
-    ApplicationDependencies.getJobManager()
-                           .startChain(new ProfileUploadJob())
-                           .then(PaymentLedgerUpdateJob.updateLedger())
-                           .enqueue();
+    AppDependencies.getJobManager()
+                   .startChain(new ProfileUploadJob())
+                   .then(PaymentLedgerUpdateJob.updateLedger())
+                   .enqueue();
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentFragment.java
index ded35a5b1b..f35f4ce5c3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentFragment.java
@@ -217,7 +217,7 @@ private static CharSequence mono(Context context, CharSequence address) {
 
 
   private boolean isPaymentLockEnabled(Context context) {
-    return SignalStore.paymentsValues().isPaymentLockEnabled() && ServiceUtil.getKeyguardManager(context).isKeyguardSecure();
+    return SignalStore.payments().isPaymentLockEnabled() && ServiceUtil.getKeyguardManager(context).isKeyguardSecure();
   }
 
   private class Callbacks implements ConfirmPaymentAdapter.Callbacks {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentViewModel.java
index 731d8634ac..1af8e20e5f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentViewModel.java
@@ -11,7 +11,7 @@
 import org.signal.core.util.logging.Log;
 import org.signal.core.util.money.FiatMoney;
 import org.thoughtcrime.securesms.database.PaymentTable.PaymentTransaction;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.payments.CreatePaymentDetails;
 import org.thoughtcrime.securesms.payments.FiatMoneyUtil;
@@ -46,7 +46,7 @@ final class ConfirmPaymentViewModel extends ViewModel {
     this.errorEvents              = new SingleLiveEvent<>();
     this.feeRetry                 = new DefaultValueLiveData<>(true);
 
-    this.store.update(SignalStore.paymentsValues().liveMobileCoinBalance(), (balance, state) -> state.updateBalance(balance.getFullAmount()));
+    this.store.update(SignalStore.payments().liveMobileCoinBalance(), (balance, state) -> state.updateBalance(balance.getFullAmount()));
 
     LiveData<Boolean> longLoadTime = LiveDataUtil.delay(1000, true);
     this.store.update(longLoadTime, (l, s) -> {
@@ -201,7 +201,7 @@ public Factory(@NonNull CreatePaymentDetails createPaymentDetails) {
       return modelClass.cast(new ConfirmPaymentViewModel(new ConfirmPaymentState(createPaymentDetails.getPayee(),
                                                                                  createPaymentDetails.getAmount(),
                                                                                  createPaymentDetails.getNote()),
-                                                         new ConfirmPaymentRepository(ApplicationDependencies.getPayments().getWallet())));
+                                                         new ConfirmPaymentRepository(AppDependencies.getPayments().getWallet())));
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentViewModel.java
index 21d919baee..f208a16f85 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentViewModel.java
@@ -12,7 +12,7 @@
 
 import org.signal.core.util.logging.Log;
 import org.signal.core.util.money.FiatMoney;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.payments.Balance;
 import org.thoughtcrime.securesms.payments.CreatePaymentDetails;
@@ -51,11 +51,11 @@ public class CreatePaymentViewModel extends ViewModel {
 
   private CreatePaymentViewModel(@NonNull PayeeParcelable payee, @Nullable CharSequence note) {
     this.payee            = payee;
-    this.spendableBalance = Transformations.map(SignalStore.paymentsValues().liveMobileCoinBalance(), Balance::getTransferableAmount);
+    this.spendableBalance = Transformations.map(SignalStore.payments().liveMobileCoinBalance(), Balance::getTransferableAmount);
     this.note             = new MutableLiveData<>(note);
     this.inputState       = new Store<>(new InputState());
     this.isValidAmount    = LiveDataUtil.combineLatest(spendableBalance, inputState.getStateLiveData(), (b, s) -> validateAmount(b.requireMobileCoin(), s.getMoney().requireMobileCoin()));
-    this.enclaveFailure   = LiveDataUtil.mapDistinct(SignalStore.paymentsValues().enclaveFailure(), isFailure -> isFailure);
+    this.enclaveFailure   = LiveDataUtil.mapDistinct(SignalStore.payments().enclaveFailure(), isFailure -> isFailure);
 
     if (payee.getPayee().hasRecipientId()) {
       isPaymentsSupportedByPayee = LiveDataUtil.mapAsync(new DefaultValueLiveData<>(payee.getPayee().requireRecipientId()), r -> {
@@ -71,18 +71,18 @@ private CreatePaymentViewModel(@NonNull PayeeParcelable payee, @Nullable CharSeq
       isPaymentsSupportedByPayee = new DefaultValueLiveData<>(true);
     }
 
-    LiveData<Optional<CurrencyExchange.ExchangeRate>> liveExchangeRate = LiveDataUtil.mapAsync(SignalStore.paymentsValues().liveCurrentCurrency(),
+    LiveData<Optional<CurrencyExchange.ExchangeRate>> liveExchangeRate = LiveDataUtil.mapAsync(SignalStore.payments().liveCurrentCurrency(),
                                                                                                currency -> {
                                                                                                  try {
-                                                                                                   return Optional.ofNullable(ApplicationDependencies.getPayments()
-                                                                                                                                                       .getCurrencyExchange(true)
-                                                                                                                                                       .getExchangeRate(currency));
+                                                                                                   return Optional.ofNullable(AppDependencies.getPayments()
+                                                                                                                                             .getCurrencyExchange(true)
+                                                                                                                                             .getExchangeRate(currency));
                                                                                                  } catch (IOException e1) {
                                                                                                    Log.w(TAG, "Unable to get fresh exchange data, falling back to cached", e1);
                                                                                                    try {
-                                                                                                     return Optional.ofNullable(ApplicationDependencies.getPayments()
-                                                                                                                                                         .getCurrencyExchange(false)
-                                                                                                                                                         .getExchangeRate(currency));
+                                                                                                     return Optional.ofNullable(AppDependencies.getPayments()
+                                                                                                                                               .getCurrencyExchange(false)
+                                                                                                                                               .getExchangeRate(currency));
                                                                                                    } catch (IOException e2) {
                                                                                                      Log.w(TAG, "Unable to get any exchange data", e2);
                                                                                                      return Optional.empty();
@@ -90,7 +90,7 @@ private CreatePaymentViewModel(@NonNull PayeeParcelable payee, @Nullable CharSeq
                                                                                                  }
                                                                                                });
 
-    inputState.update(liveExchangeRate, (rate, state) -> updateAmount(ApplicationDependencies.getApplication(), state.updateExchangeRate(rate), AmountKeyboardGlyph.NONE));
+    inputState.update(liveExchangeRate, (rate, state) -> updateAmount(AppDependencies.getApplication(), state.updateExchangeRate(rate), AmountKeyboardGlyph.NONE));
   }
 
   @NonNull LiveData<Boolean> getEnclaveFailure() {
@@ -145,7 +145,7 @@ void updateAmount(@NonNull Context context, @NonNull AmountKeyboardGlyph glyph)
   private @NonNull InputState updateAmount(@NonNull Context context, @NonNull InputState inputState, @NonNull AmountKeyboardGlyph glyph) {
     switch (inputState.getInputTarget()) {
       case FIAT_MONEY:
-        return updateFiatAmount(context, inputState, glyph, SignalStore.paymentsValues().currentCurrency());
+        return updateFiatAmount(context, inputState, glyph, SignalStore.payments().currentCurrency());
       case MONEY:
         return updateMoneyAmount(context, inputState, glyph);
       default:
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/deactivate/DeactivateWalletViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/payments/deactivate/DeactivateWalletViewModel.java
index 457fd2c38b..17f915f90e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/deactivate/DeactivateWalletViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/deactivate/DeactivateWalletViewModel.java
@@ -17,7 +17,7 @@ public class DeactivateWalletViewModel extends ViewModel {
   private final SingleLiveEvent<Result> deactivatePaymentResults = new SingleLiveEvent<>();
 
   public DeactivateWalletViewModel() {
-    balance = Transformations.map(SignalStore.paymentsValues().liveMobileCoinBalance(), Balance::getFullAmount);
+    balance = Transformations.map(SignalStore.payments().liveMobileCoinBalance(), Balance::getFullAmount);
   }
 
   void deactivateWallet() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsActivity.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsActivity.java
index 864da5101c..5fa22dab30 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsActivity.java
@@ -11,7 +11,7 @@
 
 import org.thoughtcrime.securesms.PassphraseRequiredActivity;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.PaymentLedgerUpdateJob;
 import org.thoughtcrime.securesms.payments.preferences.details.PaymentDetailsFragmentArgs;
 import org.thoughtcrime.securesms.payments.preferences.details.PaymentDetailsParcelable;
@@ -58,7 +58,7 @@ protected void onResume() {
 
     dynamicTheme.onResume(this);
 
-    ApplicationDependencies.getJobManager()
-                           .add(PaymentLedgerUpdateJob.updateLedger());
+    AppDependencies.getJobManager()
+                   .add(PaymentLedgerUpdateJob.updateLedger());
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java
index 6ae4592093..532dd5eac0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeFragment.java
@@ -37,7 +37,7 @@
 import org.thoughtcrime.securesms.payments.backup.confirm.PaymentsRecoveryPhraseConfirmFragment;
 import org.thoughtcrime.securesms.payments.preferences.model.InfoCard;
 import org.thoughtcrime.securesms.payments.preferences.model.PaymentItem;
-import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
+import org.thoughtcrime.securesms.registration.ui.RegistrationActivity;
 import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.PlayStoreUtil;
 import org.thoughtcrime.securesms.util.SpanUtil;
@@ -62,15 +62,15 @@ public PaymentsHomeFragment() {
   @Override
   public void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    long    paymentLockTimestamp = SignalStore.paymentsValues().getPaymentLockTimestamp();
+    long    paymentLockTimestamp = SignalStore.payments().getPaymentLockTimestamp();
     boolean enablePaymentLock    = PaymentsHomeFragmentArgs.fromBundle(getArguments()).getEnablePaymentLock();
-    boolean showPaymentLock      = SignalStore.paymentsValues().getPaymentLockSkipCount() < MAX_PAYMENT_LOCK_SKIP_COUNT &&
+    boolean showPaymentLock      = SignalStore.payments().getPaymentLockSkipCount() < MAX_PAYMENT_LOCK_SKIP_COUNT &&
                                    (System.currentTimeMillis() >= paymentLockTimestamp);
 
     if (enablePaymentLock && showPaymentLock) {
       long waitUntil = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(DAYS_UNTIL_REPROMPT_PAYMENT_LOCK);
 
-      SignalStore.paymentsValues().setPaymentLockTimestamp(waitUntil);
+      SignalStore.payments().setPaymentLockTimestamp(waitUntil);
       new MaterialAlertDialogBuilder(requireContext())
           .setTitle(getString(R.string.PaymentsHomeFragment__turn_on))
           .setMessage(getString(R.string.PaymentsHomeFragment__add_an_additional_layer))
@@ -83,8 +83,8 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
   }
 
   private void setSkipCount() {
-      int skipCount = SignalStore.paymentsValues().getPaymentLockSkipCount();
-      SignalStore.paymentsValues().setPaymentLockSkipCount(++skipCount);
+      int skipCount = SignalStore.payments().getPaymentLockSkipCount();
+      SignalStore.payments().setPaymentLockSkipCount(++skipCount);
   }
 
   @Override
@@ -110,7 +110,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     addMoney.setOnClickListener(v -> {
       if (viewModel.isEnclaveFailurePresent()) {
         showUpdateIsRequiredDialog();
-      } else if (SignalStore.paymentsValues().getPaymentsAvailability().isSendAllowed()) {
+      } else if (SignalStore.payments().getPaymentsAvailability().isSendAllowed()) {
         SafeNavigation.safeNavigate(Navigation.findNavController(v), PaymentsHomeFragmentDirections.actionPaymentsHomeToPaymentsAddMoney());
       } else {
         showPaymentsDisabledDialog();
@@ -119,7 +119,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     sendMoney.setOnClickListener(v -> {
       if (viewModel.isEnclaveFailurePresent()) {
         showUpdateIsRequiredDialog();
-      } else if (SignalStore.paymentsValues().getPaymentsAvailability().isSendAllowed()) {
+      } else if (SignalStore.payments().getPaymentsAvailability().isSendAllowed()) {
         SafeNavigation.safeNavigate(Navigation.findNavController(v), PaymentsHomeFragmentDirections.actionPaymentsHomeToPaymentRecipientSelectionFragment());
       } else {
         showPaymentsDisabledDialog();
@@ -158,11 +158,11 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
     viewModel.getBalance().observe(getViewLifecycleOwner(), balanceAmount -> {
       balance.setMoney(balanceAmount);
-      if (SignalStore.paymentsValues().getShowSaveRecoveryPhrase() &&
-          !SignalStore.paymentsValues().getUserConfirmedMnemonic() &&
+      if (SignalStore.payments().getShowSaveRecoveryPhrase() &&
+          !SignalStore.payments().getUserConfirmedMnemonic() &&
           !balanceAmount.isEqualOrLessThanZero()) {
         SafeNavigation.safeNavigate(NavHostFragment.findNavController(this), PaymentsHomeFragmentDirections.actionPaymentsHomeToPaymentsBackup().setRecoveryPhraseState(RecoveryPhraseStates.FIRST_TIME_NON_ZERO_BALANCE_WITH_MNEMONIC_NOT_CONFIRMED));
-        SignalStore.paymentsValues().setShowSaveRecoveryPhrase(false);
+        SignalStore.payments().setShowSaveRecoveryPhrase(false);
       }
     });
 
@@ -230,7 +230,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
           });
           break;
         case ACTIVATED:
-          if (!SignalStore.paymentsValues().isPaymentLockEnabled()) {
+          if (!SignalStore.payments().isPaymentLockEnabled()) {
             SafeNavigation.safeNavigate(NavHostFragment.findNavController(this), R.id.action_paymentsHome_to_securitySetup);
           }
           return;
@@ -262,7 +262,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
           if (actionId == R.id.reminder_action_update_now) {
             PlayStoreUtil.openPlayStoreOrOurApkDownloadPage(requireContext());
           } else if (actionId == R.id.reminder_action_re_register) {
-            startActivity(RegistrationNavigationActivity.newIntentForReRegistration(requireContext()));
+            startActivity(RegistrationActivity.newIntentForReRegistration(requireContext()));
           }
         });
       } else {
@@ -305,7 +305,7 @@ private boolean onMenuItemSelected(@NonNull MenuItem item) {
       return true;
     } else if (item.getItemId() == R.id.payments_home_fragment_menu_view_recovery_phrase) {
       SafeNavigation.safeNavigate(NavHostFragment.findNavController(this),
-                                  PaymentsHomeFragmentDirections.actionPaymentsHomeToPaymentsBackup().setRecoveryPhraseState(SignalStore.paymentsValues().isMnemonicConfirmed() ?
+                                  PaymentsHomeFragmentDirections.actionPaymentsHomeToPaymentsBackup().setRecoveryPhraseState(SignalStore.payments().isMnemonicConfirmed() ?
                                                                                         RecoveryPhraseStates.FROM_PAYMENTS_MENU_WITH_MNEMONIC_CONFIRMED :
                                                                                         RecoveryPhraseStates.FROM_PAYMENTS_MENU_WITH_MNEMONIC_NOT_CONFIRMED));
       return true;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeRepository.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeRepository.java
index 2a434d9ffb..56c6223617 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeRepository.java
@@ -5,7 +5,7 @@
 
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.PaymentLedgerUpdateJob;
 import org.thoughtcrime.securesms.jobs.ProfileUploadJob;
 import org.thoughtcrime.securesms.jobs.SendPaymentsActivatedJob;
@@ -23,24 +23,24 @@ public class PaymentsHomeRepository {
 
   public void activatePayments(@NonNull AsynchronousCallback.WorkerThread<Void, Error> callback) {
     SignalExecutors.BOUNDED.execute(() -> {
-      SignalStore.paymentsValues().setMobileCoinPaymentsEnabled(true);
+      SignalStore.payments().setMobileCoinPaymentsEnabled(true);
       try {
-        ProfileUtil.uploadProfile(ApplicationDependencies.getApplication());
-        ApplicationDependencies.getJobManager()
-                               .startChain(PaymentLedgerUpdateJob.updateLedger())
-                               .then(new SendPaymentsActivatedJob())
-                               .enqueue();
+        ProfileUtil.uploadProfile(AppDependencies.getApplication());
+        AppDependencies.getJobManager()
+                       .startChain(PaymentLedgerUpdateJob.updateLedger())
+                       .then(new SendPaymentsActivatedJob())
+                       .enqueue();
         callback.onComplete(null);
       } catch (PaymentsRegionException e) {
-        SignalStore.paymentsValues().setMobileCoinPaymentsEnabled(false);
+        SignalStore.payments().setMobileCoinPaymentsEnabled(false);
         Log.w(TAG, "Problem enabling payments in region", e);
         callback.onError(Error.RegionError);
       } catch (NonSuccessfulResponseCodeException e) {
-        SignalStore.paymentsValues().setMobileCoinPaymentsEnabled(false);
+        SignalStore.payments().setMobileCoinPaymentsEnabled(false);
         Log.w(TAG, "Problem enabling payments", e);
         callback.onError(Error.NetworkError);
       } catch (IOException e) {
-        SignalStore.paymentsValues().setMobileCoinPaymentsEnabled(false);
+        SignalStore.payments().setMobileCoinPaymentsEnabled(false);
         Log.w(TAG, "Problem enabling payments", e);
         tryToRestoreProfile();
         callback.onError(Error.NetworkError);
@@ -50,7 +50,7 @@ public void activatePayments(@NonNull AsynchronousCallback.WorkerThread<Void, Er
 
   private void tryToRestoreProfile() {
     try {
-      ProfileUtil.uploadProfile(ApplicationDependencies.getApplication());
+      ProfileUtil.uploadProfile(AppDependencies.getApplication());
       Log.i(TAG, "Restored profile");
     } catch (IOException e) {
       Log.w(TAG, "Problem uploading profile", e);
@@ -59,9 +59,9 @@ private void tryToRestoreProfile() {
 
   public void deactivatePayments(@NonNull Consumer<Boolean> consumer) {
     SignalExecutors.BOUNDED.execute(() -> {
-      SignalStore.paymentsValues().setMobileCoinPaymentsEnabled(false);
-      ApplicationDependencies.getJobManager().add(new ProfileUploadJob());
-      consumer.accept(!SignalStore.paymentsValues().mobileCoinPaymentsEnabled());
+      SignalStore.payments().setMobileCoinPaymentsEnabled(false);
+      AppDependencies.getJobManager().add(new ProfileUploadJob());
+      consumer.accept(!SignalStore.payments().mobileCoinPaymentsEnabled());
     });
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeViewModel.java
index cc07a0df36..ef38b7f4ea 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsHomeViewModel.java
@@ -13,7 +13,7 @@
 import org.signal.core.util.money.FiatMoney;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.settings.SettingHeader;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.PaymentsAvailability;
 import org.thoughtcrime.securesms.keyvalue.PaymentsValues;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -66,17 +66,17 @@ public class PaymentsHomeViewModel extends ViewModel {
     this.currencyExchangeRepository = currencyExchangeRepository;
     this.unreadPaymentsRepository   = new UnreadPaymentsRepository();
     this.store                      = new Store<>(new PaymentsHomeState(getPaymentsState()));
-    this.balance                    = LiveDataUtil.mapDistinct(SignalStore.paymentsValues().liveMobileCoinBalance(), Balance::getFullAmount);
+    this.balance                    = LiveDataUtil.mapDistinct(SignalStore.payments().liveMobileCoinBalance(), Balance::getFullAmount);
     this.list                       = Transformations.map(store.getStateLiveData(), this::createList);
     this.paymentsEnabled            = LiveDataUtil.mapDistinct(store.getStateLiveData(), state -> state.getPaymentsState() == PaymentsHomeState.PaymentsState.ACTIVATED);
     this.exchange                   = LiveDataUtil.mapDistinct(store.getStateLiveData(), PaymentsHomeState::getExchangeAmount);
     this.exchangeLoadState          = LiveDataUtil.mapDistinct(store.getStateLiveData(), PaymentsHomeState::getExchangeRateLoadState);
     this.paymentStateEvents         = new SingleLiveEvent<>();
     this.errorEnablingPayments      = new SingleLiveEvent<>();
-    this.enclaveFailure             = LiveDataUtil.mapDistinct(SignalStore.paymentsValues().enclaveFailure(), isFailure -> isFailure);
+    this.enclaveFailure             = LiveDataUtil.mapDistinct(SignalStore.payments().enclaveFailure(), isFailure -> isFailure);
     this.store.update(paymentsRepository.getRecentPayments(), this::updateRecentPayments);
 
-    LiveData<CurrencyExchange.ExchangeRate> liveExchangeRate = LiveDataUtil.combineLatest(SignalStore.paymentsValues().liveCurrentCurrency(),
+    LiveData<CurrencyExchange.ExchangeRate> liveExchangeRate = LiveDataUtil.combineLatest(SignalStore.payments().liveCurrentCurrency(),
                                                                                           LiveDataUtil.mapDistinct(store.getStateLiveData(), PaymentsHomeState::getCurrencyExchange),
                                                                                           (currency, exchange) -> exchange.getExchangeRate(currency));
 
@@ -95,7 +95,7 @@ protected void onCleared() {
   }
 
   private static PaymentsHomeState.PaymentsState getPaymentsState() {
-    PaymentsValues paymentsValues = SignalStore.paymentsValues();
+    PaymentsValues paymentsValues = SignalStore.payments();
 
     PaymentsAvailability paymentsAvailability = paymentsValues.getPaymentsAvailability();
 
@@ -150,7 +150,7 @@ void markAllPaymentsSeen() {
 
   void checkPaymentActivationState() {
     PaymentsHomeState.PaymentsState storedState     = store.getState().getPaymentsState();
-    boolean                         paymentsEnabled = SignalStore.paymentsValues().mobileCoinPaymentsEnabled();
+    boolean                         paymentsEnabled = SignalStore.payments().mobileCoinPaymentsEnabled();
 
     if (storedState.equals(PaymentsHomeState.PaymentsState.ACTIVATED) && !paymentsEnabled) {
       store.update(s -> s.updatePaymentsEnabled(PaymentsHomeState.PaymentsState.NOT_ACTIVATED));
@@ -284,7 +284,7 @@ public static final class Factory implements ViewModelProvider.Factory {
       //noinspection ConstantConditions
       return modelClass.cast(new PaymentsHomeViewModel(new PaymentsHomeRepository(),
                                                        new PaymentsRepository(),
-                                                       new CurrencyExchangeRepository(ApplicationDependencies.getPayments())));
+                                                       new CurrencyExchangeRepository(AppDependencies.getPayments())));
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsRepository.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsRepository.java
index 2e5d3a357d..4686321f49 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentsRepository.java
@@ -38,7 +38,7 @@ public PaymentsRepository() {
     paymentDatabase = SignalDatabase.payments();
 
     LiveData<List<PaymentTable.PaymentTransaction>> localPayments = paymentDatabase.getAllLive();
-    LiveData<MobileCoinLedgerWrapper>               ledger        = SignalStore.paymentsValues().liveMobileCoinLedger();
+    LiveData<MobileCoinLedgerWrapper>               ledger        = SignalStore.payments().liveMobileCoinLedger();
 
     //noinspection NullableProblems
     this.recentPayments         = LiveDataUtil.mapAsync(LiveDataUtil.combineLatest(localPayments, ledger, Pair::create), p -> reconcile(p.first, p.second));
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/SetCurrencyViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/SetCurrencyViewModel.java
index b86e249973..c8854da24c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/SetCurrencyViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/SetCurrencyViewModel.java
@@ -16,7 +16,7 @@
 import org.thoughtcrime.securesms.components.settings.SettingHeader;
 import org.thoughtcrime.securesms.components.settings.SettingProgress;
 import org.thoughtcrime.securesms.components.settings.SingleSelectSetting;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.payments.currency.CurrencyExchange;
 import org.thoughtcrime.securesms.payments.currency.CurrencyExchangeRepository;
@@ -43,10 +43,10 @@ public final class SetCurrencyViewModel extends ViewModel {
   private final LiveData<CurrencyListState> list;
 
   public SetCurrencyViewModel(@NonNull CurrencyExchangeRepository currencyExchangeRepository) {
-    this.store = new Store<>(new SetCurrencyState(SignalStore.paymentsValues().currentCurrency()));
+    this.store = new Store<>(new SetCurrencyState(SignalStore.payments().currentCurrency()));
     this.list  = Transformations.map(this.store.getStateLiveData(), this::createListState);
 
-    this.store.update(SignalStore.paymentsValues().liveCurrentCurrency(), (currency, state) -> state.updateCurrentCurrency(currency));
+    this.store.update(SignalStore.payments().liveCurrentCurrency(), (currency, state) -> state.updateCurrentCurrency(currency));
 
     currencyExchangeRepository.getCurrencyExchange(new AsynchronousCallback.WorkerThread<CurrencyExchange, Throwable>() {
       @Override
@@ -63,7 +63,7 @@ public void onError(@Nullable Throwable error) {
   }
 
   public void select(@NonNull Currency selection) {
-    SignalStore.paymentsValues().setCurrentCurrency(selection);
+    SignalStore.payments().setCurrentCurrency(selection);
   }
 
   public LiveData<CurrencyListState> getCurrencyListState() {
@@ -206,7 +206,7 @@ public static final class Factory implements ViewModelProvider.Factory {
     @Override
     public @NonNull <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
       //noinspection ConstantConditions
-      return modelClass.cast(new SetCurrencyViewModel(new CurrencyExchangeRepository(ApplicationDependencies.getPayments())));
+      return modelClass.cast(new SetCurrencyViewModel(new CurrencyExchangeRepository(AppDependencies.getPayments())));
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/addmoney/PaymentsAddMoneyRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/addmoney/PaymentsAddMoneyRepository.kt
index d1baf92704..f6a3178e75 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/addmoney/PaymentsAddMoneyRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/addmoney/PaymentsAddMoneyRepository.kt
@@ -3,19 +3,19 @@ package org.thoughtcrime.securesms.payments.preferences.addmoney
 import androidx.annotation.MainThread
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.signal.core.util.Result as SignalResult
 
 internal class PaymentsAddMoneyRepository {
   @MainThread
   fun getWalletAddress(): Single<SignalResult<AddressAndUri, Error>> {
-    if (!SignalStore.paymentsValues().mobileCoinPaymentsEnabled()) {
+    if (!SignalStore.payments.mobileCoinPaymentsEnabled()) {
       return Single.just(SignalResult.failure(Error.PAYMENTS_NOT_ENABLED))
     }
 
     return Single.fromCallable<SignalResult<AddressAndUri, Error>> {
-      val publicAddress = ApplicationDependencies.getPayments().wallet.mobileCoinPublicAddress
+      val publicAddress = AppDependencies.payments.wallet.mobileCoinPublicAddress
       val paymentAddressBase58 = publicAddress.paymentAddressBase58
       val paymentAddressUri = publicAddress.paymentAddressUri
       SignalResult.success(AddressAndUri(paymentAddressBase58, paymentAddressUri))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/model/InfoCard.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/model/InfoCard.java
index 1924836dd8..ab252beaa8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/model/InfoCard.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/model/InfoCard.java
@@ -76,7 +76,7 @@ public boolean areContentsTheSame(@NonNull InfoCard newItem) {
 
   public static @NonNull List<InfoCard> getInfoCards() {
     List<InfoCard> infoCards      = new ArrayList<>(Type.values().length);
-    PaymentsValues paymentsValues = SignalStore.paymentsValues();
+    PaymentsValues paymentsValues = SignalStore.payments();
 
     if (!paymentsValues.isMnemonicConfirmed() && paymentsValues.hasPaymentsEntropy()) {
       infoCards.add(new InfoCard(R.string.payment_info_card_save_recovery_phrase,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/transfer/PaymentsTransferViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/transfer/PaymentsTransferViewModel.java
index 4a7cbb9eb6..79748f7cc7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/transfer/PaymentsTransferViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/transfer/PaymentsTransferViewModel.java
@@ -7,7 +7,7 @@
 import androidx.lifecycle.ViewModel;
 import androidx.lifecycle.ViewModelProvider;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.payments.MobileCoinPublicAddress;
 
 final class PaymentsTransferViewModel extends ViewModel {
@@ -16,7 +16,7 @@ final class PaymentsTransferViewModel extends ViewModel {
   private final MobileCoinPublicAddress ownAddress;
 
   PaymentsTransferViewModel() {
-    ownAddress = ApplicationDependencies.getPayments().getWallet().getMobileCoinPublicAddress();
+    ownAddress = AppDependencies.getPayments().getWallet().getMobileCoinPublicAddress();
   }
 
   LiveData<String> getAddress() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/viewholder/IntroducingPaymentViewHolder.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/viewholder/IntroducingPaymentViewHolder.java
index 9194d6a6b3..5fe96fd744 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/viewholder/IntroducingPaymentViewHolder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/viewholder/IntroducingPaymentViewHolder.java
@@ -44,7 +44,7 @@ public void bind(@NonNull IntroducingPayments model) {
 
     activateButton.setOnClickListener(v -> callbacks.onActivatePayments());
 
-    if (SignalStore.paymentsValues().hasPaymentsEntropy()) {
+    if (SignalStore.payments().hasPaymentsEntropy()) {
       restoreButton.setVisibility(View.GONE);
     } else {
       restoreButton.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java b/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
index fb30608b5a..58e6e329cd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/Permissions.java
@@ -113,6 +113,10 @@ public PermissionsBuilder withRationaleDialog(@NonNull String title, @NonNull St
       return withRationaleDialog(null, title, details, true, headers);
     }
 
+    public PermissionsBuilder withRationaleDialog(@NonNull String title, @NonNull String details, boolean cancelable, @NonNull @DrawableRes int... headers) {
+      return withRationaleDialog(null, title, details, cancelable, headers);
+    }
+
     public PermissionsBuilder withRationaleDialog(@Nullable String message, @Nullable String title, @Nullable String details, boolean cancelable, @NonNull @DrawableRes int... headers) {
       this.rationalDialogHeader      = headers;
       this.rationaleDialogMessage    = message;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java b/app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java
index 8714a028a0..4ead914b22 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java
@@ -14,7 +14,7 @@
 import org.signal.core.util.StringUtil;
 import org.signal.core.util.logging.Log;
 import org.signal.libsignal.protocol.util.Pair;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.service.KeyCachingService;
@@ -80,7 +80,7 @@ public class PhoneNumberFormatter {
   }
 
   public static @NonNull String prettyPrint(@NonNull String e164) {
-    return StringUtil.forceLtr(get(ApplicationDependencies.getApplication()).prettyPrintFormat(e164));
+    return StringUtil.forceLtr(get(AppDependencies.getApplication()).prettyPrintFormat(e164));
   }
 
   public @NonNull String prettyPrintFormat(@NonNull String e164) {
@@ -102,7 +102,7 @@ public class PhoneNumberFormatter {
   }
 
   public static int getLocalCountryCode() {
-    Optional<PhoneNumber> localNumber = get(ApplicationDependencies.getApplication()).localNumber;
+    Optional<PhoneNumber> localNumber = get(AppDependencies.getApplication()).localNumber;
     return localNumber != null && localNumber.isPresent() ? localNumber.get().countryCode : 0;
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreEntryFragment.java b/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreEntryFragment.java
index 41f3c5ef6d..fc11abdc9f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreEntryFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreEntryFragment.java
@@ -23,22 +23,22 @@
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.LoggingFragment;
 import org.thoughtcrime.securesms.MainActivity;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsTestRestoreActivity;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.ProfileUploadJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.lock.v2.SvrConstants;
 import org.thoughtcrime.securesms.lock.v2.PinKeyboardType;
+import org.thoughtcrime.securesms.lock.v2.SvrConstants;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
 import org.thoughtcrime.securesms.profiles.edit.CreateProfileActivity;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.registration.RegistrationUtil;
 import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate;
+import org.thoughtcrime.securesms.restore.RestoreActivity;
 import org.thoughtcrime.securesms.util.CommunicationActions;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.SupportEmailUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
@@ -238,8 +238,8 @@ private void handleSuccess() {
 
     Activity activity = requireActivity();
 
-    if (BuildConfig.MESSAGE_BACKUP_RESTORE_ENABLED) {
-      startActivity(MessageBackupsTestRestoreActivity.Companion.getIntent(activity));
+    if (RemoteConfig.messageBackups()) {
+      startActivity(RestoreActivity.getIntentForTransferOrRestore(activity));
     } else if (Recipient.self().getProfileName().isEmpty() || !AvatarHelper.hasAvatar(activity, Recipient.self().getId())) {
       final Intent main    = MainActivity.clearTop(activity);
       final Intent profile = CreateProfileActivity.getIntentForUserProfile(activity);
@@ -248,7 +248,7 @@ private void handleSuccess() {
       startActivity(profile);
     } else {
       RegistrationUtil.maybeMarkRegistrationComplete();
-      ApplicationDependencies.getJobManager().add(new ProfileUploadJob());
+      AppDependencies.getJobManager().add(new ProfileUploadJob());
       startActivity(MainActivity.clearTop(activity));
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreViewModel.kt
index 08d7556bec..ce5c9b61f9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreViewModel.kt
@@ -7,6 +7,7 @@ import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import io.reactivex.rxjava3.schedulers.Schedulers
+import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.lock.v2.PinKeyboardType
 import org.thoughtcrime.securesms.lock.v2.SvrConstants
 import org.thoughtcrime.securesms.util.DefaultValueLiveData
@@ -35,7 +36,11 @@ class PinRestoreViewModel : ViewModel() {
     }
 
     disposables += Single
-      .fromCallable { repo.restoreMasterKeyPostRegistration(pin, pinKeyboardType) }
+      .fromCallable {
+        val response = repo.restoreMasterKeyPostRegistration(pin, pinKeyboardType)
+        BackupRepository.restoreBackupTier()
+        response
+      }
       .subscribeOn(Schedulers.io())
       .observeOn(AndroidSchedulers.mainThread())
       .subscribe { result ->
diff --git a/app/src/main/java/org/thoughtcrime/securesms/pin/Svr3Migration.kt b/app/src/main/java/org/thoughtcrime/securesms/pin/Svr3Migration.kt
new file mode 100644
index 0000000000..674b0fa5da
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/pin/Svr3Migration.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.pin
+
+import org.thoughtcrime.securesms.util.RemoteConfig
+
+object Svr3Migration {
+
+  /**
+   * Whether we should read from SVR3. This is a compile-time flag because it affects what happens pre-registration.
+   * It only exists so that we can merge this in before SVR3 is ready server-side. This flag will be removed once we actually launch SVR3 support.
+   */
+  const val shouldReadFromSvr3 = false
+
+  /**
+   * Whether or not you should write to SVR3. If [shouldWriteToSvr2] is also enabled, you should write to SVR3 first.
+   */
+  val shouldWriteToSvr3: Boolean
+    get() = shouldReadFromSvr3 && RemoteConfig.svr3MigrationPhase.let { it == 1 || it == 2 }
+
+  /**
+   * Whether or not you should write to SVR2. If [shouldWriteToSvr3] is also enabled, you should write to SVR3 first.
+   */
+  val shouldWriteToSvr2: Boolean
+    get() = !shouldReadFromSvr3 || RemoteConfig.svr3MigrationPhase != 2
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/pin/SvrRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/pin/SvrRepository.kt
index 6ef87094ac..df4c1a7686 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/pin/SvrRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/pin/SvrRepository.kt
@@ -6,11 +6,12 @@
 package org.thoughtcrime.securesms.pin
 
 import android.app.backup.BackupManager
+import androidx.annotation.VisibleForTesting
 import androidx.annotation.WorkerThread
 import org.signal.core.util.Stopwatch
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.BuildConfig
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.JobTracker
 import org.thoughtcrime.securesms.jobs.ReclaimUsernameAndLinkJob
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob
@@ -19,16 +20,18 @@ import org.thoughtcrime.securesms.jobs.StorageAccountRestoreJob
 import org.thoughtcrime.securesms.jobs.StorageForcePushJob
 import org.thoughtcrime.securesms.jobs.StorageSyncJob
 import org.thoughtcrime.securesms.jobs.Svr2MirrorJob
+import org.thoughtcrime.securesms.jobs.Svr3MirrorJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.lock.v2.PinKeyboardType
 import org.thoughtcrime.securesms.megaphone.Megaphones
 import org.thoughtcrime.securesms.registration.viewmodel.SvrAuthCredentialSet
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.whispersystems.signalservice.api.SvrNoDataException
 import org.whispersystems.signalservice.api.kbs.MasterKey
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery.BackupResponse
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery.RestoreResponse
+import org.whispersystems.signalservice.api.svr.SecureValueRecovery.SvrVersion
+import org.whispersystems.signalservice.api.svr.Svr3Credentials
 import org.whispersystems.signalservice.internal.push.AuthCredentials
 import java.io.IOException
 import java.util.concurrent.TimeUnit
@@ -39,13 +42,24 @@ object SvrRepository {
 
   val TAG = Log.tag(SvrRepository::class.java)
 
-  private val svr2: SecureValueRecovery = ApplicationDependencies.getSignalServiceAccountManager().getSecureValueRecoveryV2(BuildConfig.SVR2_MRENCLAVE)
+  private val svr2: SecureValueRecovery = AppDependencies.signalServiceAccountManager.getSecureValueRecoveryV2(BuildConfig.SVR2_MRENCLAVE)
+  private val svr3: SecureValueRecovery = AppDependencies.signalServiceAccountManager.getSecureValueRecoveryV3(AppDependencies.libsignalNetwork)
 
   /** An ordered list of SVR implementations to read from. They should be in priority order, with the most important one listed first. */
-  private val readImplementations: List<SecureValueRecovery> = listOf(svr2)
+  private val readImplementations: List<SecureValueRecovery> = if (Svr3Migration.shouldReadFromSvr3) listOf(svr3, svr2) else listOf(svr2)
 
   /** An ordered list of SVR implementations to write to. They should be in priority order, with the most important one listed first. */
-  private val writeImplementations: List<SecureValueRecovery> = listOf(svr2)
+  private val writeImplementations: List<SecureValueRecovery>
+    get() {
+      val implementations = mutableListOf<SecureValueRecovery>()
+      if (Svr3Migration.shouldWriteToSvr3) {
+        implementations += svr3
+      }
+      if (Svr3Migration.shouldWriteToSvr2) {
+        implementations += svr2
+      }
+      return implementations
+    }
 
   /**
    * A lock that ensures that only one thread at a time is altering the various pieces of SVR state.
@@ -72,16 +86,23 @@ object SvrRepository {
     operationLock.withLock {
       Log.i(TAG, "restoreMasterKeyPreRegistration()", true)
 
-      val operations: List<Pair<SecureValueRecovery, () -> RestoreResponse>> = listOf(
-        svr2 to { restoreMasterKeyPreRegistration(svr2, credentials.svr2, userPin) }
-      )
+      val operations: List<Pair<SecureValueRecovery, () -> RestoreResponse>> = if (Svr3Migration.shouldReadFromSvr3) {
+        listOf(
+          svr3 to { restoreMasterKeyPreRegistrationFromV3(credentials.svr3, userPin) },
+          svr2 to { restoreMasterKeyPreRegistrationFromV2(credentials.svr2, userPin) }
+        )
+      } else {
+        listOf(svr2 to { restoreMasterKeyPreRegistrationFromV2(credentials.svr2, userPin) })
+      }
 
       for ((implementation, operation) in operations) {
         when (val response: RestoreResponse = operation()) {
           is RestoreResponse.Success -> {
             Log.i(TAG, "[restoreMasterKeyPreRegistration] Successfully restored master key. $implementation", true)
-            if (implementation == svr2) {
-              SignalStore.svr().appendAuthTokenToList(response.authorization.asBasic())
+
+            when (implementation.svrVersion) {
+              SvrVersion.SVR2 -> SignalStore.svr.appendSvr2AuthTokenToList(response.authorization.asBasic())
+              SvrVersion.SVR3 -> SignalStore.svr.appendSvr3AuthTokenToList(response.authorization.asBasic())
             }
 
             return response.masterKey
@@ -131,31 +152,38 @@ object SvrRepository {
             Log.i(TAG, "[restoreMasterKeyPostRegistration] Successfully restored master key. $implementation", true)
             stopwatch.split("restore")
 
-            SignalStore.svr().setMasterKey(response.masterKey, userPin)
-            SignalStore.svr().isRegistrationLockEnabled = false
-            SignalStore.pinValues().resetPinReminders()
-            SignalStore.svr().isPinForgottenOrSkipped = false
-            SignalStore.storageService().setNeedsAccountRestore(false)
-            SignalStore.pinValues().keyboardType = pinKeyboardType
-            SignalStore.storageService().setNeedsAccountRestore(false)
-            if (implementation == svr2) {
-              SignalStore.svr().appendAuthTokenToList(response.authorization.asBasic())
+            SignalStore.svr.setMasterKey(response.masterKey, userPin)
+            SignalStore.svr.isRegistrationLockEnabled = false
+            SignalStore.pin.resetPinReminders()
+            SignalStore.svr.isPinForgottenOrSkipped = false
+            SignalStore.storageService.setNeedsAccountRestore(false)
+            SignalStore.pin.keyboardType = pinKeyboardType
+            SignalStore.storageService.setNeedsAccountRestore(false)
+
+            when (implementation.svrVersion) {
+              SvrVersion.SVR2 -> SignalStore.svr.appendSvr2AuthTokenToList(response.authorization.asBasic())
+              SvrVersion.SVR3 -> SignalStore.svr.appendSvr3AuthTokenToList(response.authorization.asBasic())
             }
-            ApplicationDependencies.getJobManager().add(ResetSvrGuessCountJob())
+
+            AppDependencies.jobManager.add(ResetSvrGuessCountJob())
             stopwatch.split("metadata")
 
-            ApplicationDependencies.getJobManager().runSynchronously(StorageAccountRestoreJob(), StorageAccountRestoreJob.LIFESPAN)
+            AppDependencies.jobManager.runSynchronously(StorageAccountRestoreJob(), StorageAccountRestoreJob.LIFESPAN)
             stopwatch.split("account-restore")
 
-            ApplicationDependencies
-              .getJobManager()
+            AppDependencies
+              .jobManager
               .startChain(StorageSyncJob())
               .then(ReclaimUsernameAndLinkJob())
               .enqueueAndBlockUntilCompletion(TimeUnit.SECONDS.toMillis(10))
             stopwatch.split("contact-restore")
 
-            if (implementation != svr2) {
-              ApplicationDependencies.getJobManager().add(Svr2MirrorJob())
+            if (implementation.svrVersion != SvrVersion.SVR2 && Svr3Migration.shouldWriteToSvr2) {
+              AppDependencies.jobManager.add(Svr2MirrorJob())
+            }
+
+            if (implementation.svrVersion != SvrVersion.SVR3 && Svr3Migration.shouldWriteToSvr3) {
+              AppDependencies.jobManager.add(Svr3MirrorJob())
             }
 
             stopwatch.stop(TAG)
@@ -197,10 +225,11 @@ object SvrRepository {
   @JvmStatic
   fun setPin(userPin: String, keyboardType: PinKeyboardType): BackupResponse {
     return operationLock.withLock {
-      val masterKey: MasterKey = SignalStore.svr().getOrCreateMasterKey()
+      val masterKey: MasterKey = SignalStore.svr.getOrCreateMasterKey()
 
-      val responses: List<BackupResponse> = writeImplementations
-        .filter { it != svr2 || FeatureFlags.svr2() }
+      val writeTargets = writeImplementations
+
+      val responses: List<BackupResponse> = writeTargets
         .map { it.setPin(userPin, masterKey) }
         .map { it.execute() }
 
@@ -224,21 +253,28 @@ object SvrRepository {
       if (overallResponse is BackupResponse.Success) {
         Log.i(TAG, "[setPin] Success!", true)
 
-        SignalStore.svr().setMasterKey(masterKey, userPin)
-        SignalStore.svr().isPinForgottenOrSkipped = false
-        SignalStore.svr().appendAuthTokenToList(overallResponse.authorization.asBasic())
+        SignalStore.svr.setMasterKey(masterKey, userPin)
+        SignalStore.svr.isPinForgottenOrSkipped = false
+        responses
+          .filterIsInstance<BackupResponse.Success>()
+          .forEach {
+            when (it.svrVersion) {
+              SvrVersion.SVR2 -> SignalStore.svr.appendSvr2AuthTokenToList(it.authorization.asBasic())
+              SvrVersion.SVR3 -> SignalStore.svr.appendSvr3AuthTokenToList(it.authorization.asBasic())
+            }
+          }
 
-        SignalStore.pinValues().keyboardType = keyboardType
-        SignalStore.pinValues().resetPinReminders()
+        SignalStore.pin.keyboardType = keyboardType
+        SignalStore.pin.resetPinReminders()
 
-        ApplicationDependencies.getMegaphoneRepository().markFinished(Megaphones.Event.PINS_FOR_ALL)
+        AppDependencies.megaphoneRepository.markFinished(Megaphones.Event.PINS_FOR_ALL)
 
-        ApplicationDependencies.getJobManager().add(RefreshAttributesJob())
+        AppDependencies.jobManager.add(RefreshAttributesJob())
       } else {
         Log.w(TAG, "[setPin] Failed to set PIN! $overallResponse", true)
 
         if (hasNoRegistrationLock) {
-          SignalStore.svr().onPinCreateFailure()
+          SignalStore.svr.onPinCreateFailure()
         }
       }
 
@@ -255,7 +291,8 @@ object SvrRepository {
     masterKey: MasterKey?,
     userPin: String?,
     hasPinToRestore: Boolean,
-    setRegistrationLockEnabled: Boolean
+    setRegistrationLockEnabled: Boolean,
+    isLinkedDevice: Boolean,
   ) {
     Log.i(TAG, "[onRegistrationComplete] Starting", true)
     operationLock.withLock {
@@ -266,26 +303,30 @@ object SvrRepository {
       if (masterKey != null && userPin != null) {
         if (setRegistrationLockEnabled) {
           Log.i(TAG, "[onRegistrationComplete] Registration Lock", true)
-          SignalStore.svr().isRegistrationLockEnabled = true
+          SignalStore.svr.isRegistrationLockEnabled = true
         } else {
           Log.i(TAG, "[onRegistrationComplete] ReRegistration Skip SMS", true)
         }
 
-        SignalStore.svr().setMasterKey(masterKey, userPin)
-        SignalStore.pinValues().resetPinReminders()
+        SignalStore.svr.setMasterKey(masterKey, userPin)
+        SignalStore.pin.resetPinReminders()
 
-        ApplicationDependencies.getJobManager().add(ResetSvrGuessCountJob())
+        AppDependencies.jobManager.add(ResetSvrGuessCountJob())
+      } else if (isLinkedDevice && masterKey != null) {
+        Log.i(TAG, "[onRegistrationComplete] Registration as linked device.", true)
+        SignalStore.storageService.setStorageKeyFromPrimary(masterKey.deriveStorageServiceKey())
+        SignalStore.svr.clearRegistrationLockAndPin()
       } else if (hasPinToRestore) {
         Log.i(TAG, "[onRegistrationComplete] Has a PIN to restore.", true)
-        SignalStore.svr().clearRegistrationLockAndPin()
-        SignalStore.storageService().setNeedsAccountRestore(true)
+        SignalStore.svr.clearRegistrationLockAndPin()
+        SignalStore.storageService.setNeedsAccountRestore(true)
       } else {
         Log.i(TAG, "[onRegistrationComplete] No registration lock or PIN at all.", true)
-        SignalStore.svr().clearRegistrationLockAndPin()
+        SignalStore.svr.clearRegistrationLockAndPin()
       }
     }
 
-    ApplicationDependencies.getJobManager().add(RefreshAttributesJob())
+    AppDependencies.jobManager.add(RefreshAttributesJob())
   }
 
   /**
@@ -294,9 +335,9 @@ object SvrRepository {
   @JvmStatic
   fun onPinRestoreForgottenOrSkipped() {
     operationLock.withLock {
-      SignalStore.svr().clearRegistrationLockAndPin()
-      SignalStore.storageService().setNeedsAccountRestore(false)
-      SignalStore.svr().isPinForgottenOrSkipped = true
+      SignalStore.svr.clearRegistrationLockAndPin()
+      SignalStore.storageService.setNeedsAccountRestore(false)
+      SignalStore.svr.isPinForgottenOrSkipped = true
     }
   }
 
@@ -304,9 +345,9 @@ object SvrRepository {
   @WorkerThread
   fun optOutOfPin() {
     operationLock.withLock {
-      SignalStore.svr().optOut()
+      SignalStore.svr.optOut()
 
-      ApplicationDependencies.getMegaphoneRepository().markFinished(Megaphones.Event.PINS_FOR_ALL)
+      AppDependencies.megaphoneRepository.markFinished(Megaphones.Event.PINS_FOR_ALL)
 
       bestEffortRefreshAttributes()
       bestEffortForcePushStorage()
@@ -318,11 +359,11 @@ object SvrRepository {
   @Throws(IOException::class)
   fun enableRegistrationLockForUserWithPin() {
     operationLock.withLock {
-      check(SignalStore.svr().hasPin() && !SignalStore.svr().hasOptedOut()) { "Must have a PIN to set a registration lock!" }
+      check(SignalStore.svr.hasPin() && !SignalStore.svr.hasOptedOut()) { "Must have a PIN to set a registration lock!" }
 
       Log.i(TAG, "[enableRegistrationLockForUserWithPin] Enabling registration lock.", true)
-      ApplicationDependencies.getSignalServiceAccountManager().enableRegistrationLock(SignalStore.svr().getOrCreateMasterKey())
-      SignalStore.svr().isRegistrationLockEnabled = true
+      AppDependencies.signalServiceAccountManager.enableRegistrationLock(SignalStore.svr.getOrCreateMasterKey())
+      SignalStore.svr.isRegistrationLockEnabled = true
       Log.i(TAG, "[enableRegistrationLockForUserWithPin] Registration lock successfully enabled.", true)
     }
   }
@@ -332,11 +373,11 @@ object SvrRepository {
   @Throws(IOException::class)
   fun disableRegistrationLockForUserWithPin() {
     operationLock.withLock {
-      check(SignalStore.svr().hasPin() && !SignalStore.svr().hasOptedOut()) { "Must have a PIN to disable registration lock!" }
+      check(SignalStore.svr.hasPin() && !SignalStore.svr.hasOptedOut()) { "Must have a PIN to disable registration lock!" }
 
       Log.i(TAG, "[disableRegistrationLockForUserWithPin] Disabling registration lock.", true)
-      ApplicationDependencies.getSignalServiceAccountManager().disableRegistrationLock()
-      SignalStore.svr().isRegistrationLockEnabled = false
+      AppDependencies.signalServiceAccountManager.disableRegistrationLock()
+      SignalStore.svr.isRegistrationLockEnabled = false
       Log.i(TAG, "[disableRegistrationLockForUserWithPin] Registration lock successfully disabled.", true)
     }
   }
@@ -348,8 +389,23 @@ object SvrRepository {
   @Throws(IOException::class)
   fun refreshAndStoreAuthorization() {
     try {
-      val credentials: AuthCredentials = svr2.authorization()
-      backupSvrCredentials(credentials)
+      var newToken = if (Svr3Migration.shouldWriteToSvr3) {
+        val credentials: AuthCredentials = svr3.authorization()
+        SignalStore.svr.appendSvr3AuthTokenToList(credentials.asBasic())
+      } else {
+        false
+      }
+
+      newToken = newToken || if (Svr3Migration.shouldWriteToSvr2) {
+        val credentials: AuthCredentials = svr2.authorization()
+        SignalStore.svr.appendSvr2AuthTokenToList(credentials.asBasic())
+      } else {
+        false
+      }
+
+      if (newToken && SignalStore.svr.hasPin()) {
+        BackupManager(AppDependencies.application).dataChanged()
+      }
     } catch (e: Throwable) {
       if (e is IOException) {
         throw e
@@ -360,22 +416,33 @@ object SvrRepository {
   }
 
   @WorkerThread
-  private fun restoreMasterKeyPreRegistration(svr: SecureValueRecovery, credentials: AuthCredentials?, userPin: String): RestoreResponse {
+  @VisibleForTesting
+  fun restoreMasterKeyPreRegistrationFromV2(credentials: AuthCredentials?, userPin: String): RestoreResponse {
     return if (credentials == null) {
       RestoreResponse.Missing
     } else {
-      svr.restoreDataPreRegistration(credentials, userPin)
+      svr2.restoreDataPreRegistration(credentials, shareSet = null, userPin)
+    }
+  }
+
+  @WorkerThread
+  @VisibleForTesting
+  fun restoreMasterKeyPreRegistrationFromV3(credentials: Svr3Credentials?, userPin: String): RestoreResponse {
+    return if (credentials?.shareSet == null) {
+      RestoreResponse.Missing
+    } else {
+      svr3.restoreDataPreRegistration(credentials.authCredentials, credentials.shareSet, userPin)
     }
   }
 
   @WorkerThread
   private fun bestEffortRefreshAttributes() {
-    val result = ApplicationDependencies.getJobManager().runSynchronously(RefreshAttributesJob(), TimeUnit.SECONDS.toMillis(10))
+    val result = AppDependencies.jobManager.runSynchronously(RefreshAttributesJob(), TimeUnit.SECONDS.toMillis(10))
     if (result.isPresent && result.get() == JobTracker.JobState.SUCCESS) {
       Log.i(TAG, "Attributes were refreshed successfully.", true)
     } else if (result.isPresent) {
       Log.w(TAG, "Attribute refresh finished, but was not successful. Enqueuing one for later. (Result: " + result.get() + ")", true)
-      ApplicationDependencies.getJobManager().add(RefreshAttributesJob())
+      AppDependencies.jobManager.add(RefreshAttributesJob())
     } else {
       Log.w(TAG, "Job did not finish in the allotted time. It'll finish later.", true)
     }
@@ -383,29 +450,21 @@ object SvrRepository {
 
   @WorkerThread
   private fun bestEffortForcePushStorage() {
-    val result = ApplicationDependencies.getJobManager().runSynchronously(StorageForcePushJob(), TimeUnit.SECONDS.toMillis(10))
+    val result = AppDependencies.jobManager.runSynchronously(StorageForcePushJob(), TimeUnit.SECONDS.toMillis(10))
     if (result.isPresent && result.get() == JobTracker.JobState.SUCCESS) {
       Log.i(TAG, "Storage was force-pushed successfully.", true)
     } else if (result.isPresent) {
       Log.w(TAG, "Storage force-pushed finished, but was not successful. Enqueuing one for later. (Result: " + result.get() + ")", true)
-      ApplicationDependencies.getJobManager().add(RefreshAttributesJob())
+      AppDependencies.jobManager.add(RefreshAttributesJob())
     } else {
       Log.w(TAG, "Storage fore push did not finish in the allotted time. It'll finish later.", true)
     }
   }
 
-  private fun backupSvrCredentials(credentials: AuthCredentials) {
-    val tokenIsNew = SignalStore.svr().appendAuthTokenToList(credentials.asBasic())
-
-    if (tokenIsNew && SignalStore.svr().hasPin()) {
-      BackupManager(ApplicationDependencies.getApplication()).dataChanged()
-    }
-  }
-
   private val hasNoRegistrationLock: Boolean
     get() {
-      return !SignalStore.svr().isRegistrationLockEnabled &&
-        !SignalStore.svr().hasPin() &&
-        !SignalStore.svr().hasOptedOut()
+      return !SignalStore.svr.isRegistrationLockEnabled &&
+        !SignalStore.svr.hasPin() &&
+        !SignalStore.svr.hasOptedOut()
     }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPinPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPinPreferenceFragment.java
index 69af060e3d..5dbe4a00f8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPinPreferenceFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPinPreferenceFragment.java
@@ -76,7 +76,7 @@ private void onPreferenceChanged(boolean enabled) {
                      .setCancelable(true)
                      .setPositiveButton(android.R.string.ok, (d, which) -> d.dismiss())
                      .show();
-    } else if (!enabled && SignalStore.paymentsValues().mobileCoinPaymentsEnabled() && !SignalStore.paymentsValues().getUserConfirmedMnemonic()) {
+    } else if (!enabled && SignalStore.payments().mobileCoinPaymentsEnabled() && !SignalStore.payments().getUserConfirmedMnemonic()) {
       new MaterialAlertDialogBuilder(requireContext())
                      .setTitle(R.string.ApplicationPreferencesActivity_record_payments_recovery_phrase)
                      .setMessage(R.string.ApplicationPreferencesActivity_before_you_can_disable_your_pin)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/BackupsPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/BackupsPreferenceFragment.java
index 06351d24eb..3a107040ee 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/BackupsPreferenceFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/BackupsPreferenceFragment.java
@@ -35,7 +35,7 @@
 import org.thoughtcrime.securesms.backup.BackupDialog;
 import org.thoughtcrime.securesms.backup.BackupEvent;
 import org.thoughtcrime.securesms.database.NoExternalStorageException;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.LocalBackupJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.permissions.Permissions;
@@ -385,6 +385,6 @@ private void setBackupsDisabled() {
     maxFiles.setVisibility(View.GONE);
     verify.setVisibility(View.GONE);
     timer.setVisibility(View.GONE);
-    ApplicationDependencies.getJobManager().cancelAllInQueue(LocalBackupJob.QUEUE);
+    AppDependencies.getJobManager().cancelAllInQueue(LocalBackupJob.QUEUE);
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/NetworkPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/NetworkPreferenceFragment.java
index 20b8b21028..93adfff213 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/NetworkPreferenceFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/NetworkPreferenceFragment.java
@@ -22,7 +22,7 @@
 import org.signal.core.util.concurrent.SettableFuture;
 import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.net.NetworkManager;
 import org.thoughtcrime.securesms.net.ProxyType;
 import org.thoughtcrime.securesms.net.SocksProxy;
@@ -43,7 +43,7 @@ public class NetworkPreferenceFragment extends ListSummaryPreferenceFragment {
   private SettableFuture<Boolean> connected;
 
   public NetworkPreferenceFragment() {
-    networkManager = ApplicationDependencies.getNetworkManager();
+    networkManager = AppDependencies.getNetworkManager();
   }
 
   @Override
@@ -145,7 +145,7 @@ private void applyProxyChanges(boolean alwaysRestart) {
     final boolean changed = networkManager.applyProxyConfig();
     if (changed || alwaysRestart) {
       networkManager.setNetworkEnabled(true);
-      ApplicationDependencies.restartAllNetworkConnections();
+      AppDependencies.resetNetwork(true);
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/CreateProfileFragment.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/CreateProfileFragment.java
index 6f8f6795b4..d7b24e8d48 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/CreateProfileFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/CreateProfileFragment.java
@@ -41,7 +41,7 @@
 import org.thoughtcrime.securesms.profiles.manage.EditProfileNameFragment;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.util.CommunicationActions;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
 import org.thoughtcrime.securesms.util.text.AfterTextChanged;
@@ -166,7 +166,7 @@ private void initializeResources(@Nullable GroupId groupId) {
     binding.mmsGroupHint.setVisibility(isEditingGroup && groupId.isMms() ? View.VISIBLE : View.GONE);
 
     if (isEditingGroup) {
-      EditTextUtil.addGraphemeClusterLimitFilter(binding.givenName, FeatureFlags.getMaxGroupNameGraphemeLength());
+      EditTextUtil.addGraphemeClusterLimitFilter(binding.givenName, RemoteConfig.getMaxGroupNameGraphemeLength());
       binding.profileDescriptionText.setVisibility(View.GONE);
       binding.whoCanFindMeContainer.setVisibility(View.GONE);
       binding.givenName.addTextChangedListener(new AfterTextChanged(s -> viewModel.setGivenName(s.toString())));
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditSelfProfileRepository.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditSelfProfileRepository.java
index 5716ab7c4a..92fcb38d37 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditSelfProfileRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditSelfProfileRepository.java
@@ -13,7 +13,7 @@
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.conversation.colors.AvatarColor;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.MultiDeviceProfileContentUpdateJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceProfileKeyUpdateJob;
 import org.thoughtcrime.securesms.jobs.ProfileUploadJob;
@@ -140,10 +140,10 @@ public void uploadProfile(@NonNull ProfileName profileName,
         }
       }
 
-      ApplicationDependencies.getJobManager()
-                             .startChain(new ProfileUploadJob())
-                             .then(Arrays.asList(new MultiDeviceProfileKeyUpdateJob(), new MultiDeviceProfileContentUpdateJob()))
-                             .enqueue();
+      AppDependencies.getJobManager()
+                     .startChain(new ProfileUploadJob())
+                     .then(Arrays.asList(new MultiDeviceProfileKeyUpdateJob(), new MultiDeviceProfileContentUpdateJob()))
+                     .enqueue();
 
       RegistrationUtil.maybeMarkRegistrationComplete();
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/pnp/WhoCanFindMeByPhoneNumberRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/pnp/WhoCanFindMeByPhoneNumberRepository.kt
index a620107d9f..62ffbfa248 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/pnp/WhoCanFindMeByPhoneNumberRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/pnp/WhoCanFindMeByPhoneNumberRepository.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.profiles.edit.pnp
 
 import io.reactivex.rxjava3.core.Completable
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.ProfileUploadJob
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob
 import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues
@@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.storage.StorageSyncHelper
 class WhoCanFindMeByPhoneNumberRepository {
 
   fun getCurrentState(): WhoCanFindMeByPhoneNumberState {
-    return when (SignalStore.phoneNumberPrivacy().phoneNumberDiscoverabilityMode) {
+    return when (SignalStore.phoneNumberPrivacy.phoneNumberDiscoverabilityMode) {
       PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode.DISCOVERABLE -> WhoCanFindMeByPhoneNumberState.EVERYONE
       PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE -> WhoCanFindMeByPhoneNumberState.NOBODY
       PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode.UNDECIDED -> WhoCanFindMeByPhoneNumberState.EVERYONE
@@ -25,17 +25,17 @@ class WhoCanFindMeByPhoneNumberRepository {
     return Completable.fromAction {
       when (whoCanFindMeByPhoneNumberState) {
         WhoCanFindMeByPhoneNumberState.EVERYONE -> {
-          SignalStore.phoneNumberPrivacy().phoneNumberDiscoverabilityMode = PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode.DISCOVERABLE
+          SignalStore.phoneNumberPrivacy.phoneNumberDiscoverabilityMode = PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode.DISCOVERABLE
         }
         WhoCanFindMeByPhoneNumberState.NOBODY -> {
-          SignalStore.phoneNumberPrivacy().phoneNumberSharingMode = PhoneNumberPrivacyValues.PhoneNumberSharingMode.NOBODY
-          SignalStore.phoneNumberPrivacy().phoneNumberDiscoverabilityMode = PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE
+          SignalStore.phoneNumberPrivacy.phoneNumberSharingMode = PhoneNumberPrivacyValues.PhoneNumberSharingMode.NOBODY
+          SignalStore.phoneNumberPrivacy.phoneNumberDiscoverabilityMode = PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE
         }
       }
 
-      ApplicationDependencies.getJobManager().add(RefreshAttributesJob())
+      AppDependencies.jobManager.add(RefreshAttributesJob())
       StorageSyncHelper.scheduleSyncForDataChange()
-      ApplicationDependencies.getJobManager().add(ProfileUploadJob())
+      AppDependencies.jobManager.add(ProfileUploadJob())
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt
index 07010795d3..40834753c2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt
@@ -36,7 +36,7 @@ import org.thoughtcrime.securesms.profiles.ProfileName
 import org.thoughtcrime.securesms.profiles.manage.EditProfileViewModel.AvatarState
 import org.thoughtcrime.securesms.profiles.manage.UsernameRepository.UsernameDeleteResult
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity
+import org.thoughtcrime.securesms.registration.ui.RegistrationActivity
 import org.thoughtcrime.securesms.util.NameUtil.getAbbreviation
 import org.thoughtcrime.securesms.util.PlayStoreUtil
 import org.thoughtcrime.securesms.util.livedata.LiveDataUtil
@@ -98,7 +98,7 @@ class EditProfileFragment : LoggingFragment() {
     binding.manageProfileUsernameContainer.setOnClickListener { v: View ->
       if (!viewModel.isRegisteredAndUpToDate) {
         onClickWhenUnregisteredOrDeprecated()
-      } else if (SignalStore.account().username != null) {
+      } else if (SignalStore.account.username != null) {
         MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Signal_MaterialAlertDialog_List)
           .setItems(R.array.username_edit_entries) { _: DialogInterface?, w: Int ->
             when (w) {
@@ -246,28 +246,28 @@ class EditProfileFragment : LoggingFragment() {
       binding.manageProfileUsername.text = username
     }
 
-    if (SignalStore.account().usernameSyncState == AccountValues.UsernameSyncState.USERNAME_AND_LINK_CORRUPTED) {
+    if (SignalStore.account.usernameSyncState == AccountValues.UsernameSyncState.USERNAME_AND_LINK_CORRUPTED) {
       binding.usernameErrorIndicator.visibility = View.VISIBLE
     } else {
       binding.usernameErrorIndicator.visibility = View.GONE
     }
 
-    if (SignalStore.account().username != null && SignalStore.account().usernameSyncState != AccountValues.UsernameSyncState.USERNAME_AND_LINK_CORRUPTED) {
+    if (SignalStore.account.username != null && SignalStore.account.usernameSyncState != AccountValues.UsernameSyncState.USERNAME_AND_LINK_CORRUPTED) {
       binding.usernameLinkContainer.setOnClickListener {
         findNavController().safeNavigate(EditProfileFragmentDirections.actionManageProfileFragmentToUsernameLinkFragment())
       }
 
-      if (SignalStore.account().usernameSyncState == AccountValues.UsernameSyncState.LINK_CORRUPTED) {
+      if (SignalStore.account.usernameSyncState == AccountValues.UsernameSyncState.LINK_CORRUPTED) {
         binding.linkErrorIndicator.visibility = View.VISIBLE
       } else {
         binding.linkErrorIndicator.visibility = View.GONE
       }
 
-      if (SignalStore.tooltips().showProfileSettingsQrCodeTooltop()) {
+      if (SignalStore.tooltips.showProfileSettingsQrCodeTooltop()) {
         binding.usernameLinkTooltip.visibility = View.VISIBLE
         binding.linkTooltipCloseButton.setOnClickListener {
           binding.usernameLinkTooltip.visibility = View.GONE
-          SignalStore.tooltips().markProfileSettingsQrCodeTooltipSeen()
+          SignalStore.tooltips.markProfileSettingsQrCodeTooltipSeen()
         }
       }
 
@@ -335,7 +335,7 @@ class EditProfileFragment : LoggingFragment() {
   private fun displayConfirmUsernameDeletionDialog() {
     MaterialAlertDialogBuilder(requireContext())
       .setTitle(R.string.ManageProfileFragment__delete_username_dialog_title)
-      .setMessage(requireContext().getString(R.string.ManageProfileFragment__delete_username_dialog_body, SignalStore.account().username))
+      .setMessage(requireContext().getString(R.string.ManageProfileFragment__delete_username_dialog_body, SignalStore.account.username))
       .setPositiveButton(R.string.delete) { _, _ -> onUserConfirmedUsernameDeletion() }
       .setNegativeButton(android.R.string.cancel) { d: DialogInterface?, w: Int -> }
       .show()
@@ -380,7 +380,7 @@ class EditProfileFragment : LoggingFragment() {
         .setMessage(R.string.EditProfileFragment_unregistered_dialog_body)
         .setNegativeButton(android.R.string.cancel) { d, _ -> d.dismiss() }
         .setPositiveButton(R.string.EditProfileFragment_unregistered_dialog_reregister_button) { d, _ ->
-          startActivity(RegistrationNavigationActivity.newIntentForReRegistration(requireContext()))
+          startActivity(RegistrationActivity.newIntentForReRegistration(requireContext()))
           d.dismiss()
         }
         .show()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileRepository.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileRepository.java
index da0a95a6de..6f8f882cf8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileRepository.java
@@ -8,7 +8,7 @@
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.MultiDeviceProfileContentUpdateJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
@@ -29,7 +29,7 @@ public void setName(@NonNull Context context, @NonNull ProfileName profileName,
       try {
         ProfileUtil.uploadProfileWithName(context, profileName);
         SignalDatabase.recipients().setProfileName(Recipient.self().getId(), profileName);
-        ApplicationDependencies.getJobManager().add(new MultiDeviceProfileContentUpdateJob());
+        AppDependencies.getJobManager().add(new MultiDeviceProfileContentUpdateJob());
 
         callback.accept(Result.SUCCESS);
       } catch (IOException e) {
@@ -44,7 +44,7 @@ public void setAbout(@NonNull Context context, @NonNull String about, @NonNull S
       try {
         ProfileUtil.uploadProfileWithAbout(context, about, emoji);
         SignalDatabase.recipients().setAbout(Recipient.self().getId(), about, emoji);
-        ApplicationDependencies.getJobManager().add(new MultiDeviceProfileContentUpdateJob());
+        AppDependencies.getJobManager().add(new MultiDeviceProfileContentUpdateJob());
 
         callback.accept(Result.SUCCESS);
       } catch (IOException e) {
@@ -60,7 +60,7 @@ public void setAvatar(@NonNull Context context, @NonNull byte[] data, @NonNull S
         ProfileUtil.uploadProfileWithAvatar(new StreamDetails(new ByteArrayInputStream(data), contentType, data.length));
         AvatarHelper.setAvatar(context, Recipient.self().getId(), new ByteArrayInputStream(data));
         SignalStore.misc().setHasEverHadAnAvatar(true);
-        ApplicationDependencies.getJobManager().add(new MultiDeviceProfileContentUpdateJob());
+        AppDependencies.getJobManager().add(new MultiDeviceProfileContentUpdateJob());
 
         callback.accept(Result.SUCCESS);
       } catch (IOException e) {
@@ -75,7 +75,7 @@ public void clearAvatar(@NonNull Context context, @NonNull Consumer<Result> call
       try {
         ProfileUtil.uploadProfileWithAvatar(null);
         AvatarHelper.delete(context, Recipient.self().getId());
-        ApplicationDependencies.getJobManager().add(new MultiDeviceProfileContentUpdateJob());
+        AppDependencies.getJobManager().add(new MultiDeviceProfileContentUpdateJob());
 
         callback.accept(Result.SUCCESS);
       } catch (IOException e) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileViewModel.java
index c15ca12523..d4559265ea 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileViewModel.java
@@ -14,7 +14,7 @@
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.badges.models.Badge;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.mediasend.Media;
@@ -108,7 +108,7 @@ public Single<UsernameRepository.UsernameDeleteResult> deleteUsername() {
   }
 
   public boolean isRegisteredAndUpToDate() {
-    return !TextSecurePreferences.isUnauthorizedReceived(ApplicationDependencies.getApplication()) && SignalStore.account().isRegistered() && !SignalStore.misc().isClientDeprecated();
+    return !TextSecurePreferences.isUnauthorizedReceived(AppDependencies.getApplication()) && SignalStore.account().isRegistered() && !SignalStore.misc().isClientDeprecated();
   }
 
   public boolean isDeprecated() {
@@ -170,7 +170,7 @@ private void onRecipientChanged(@NonNull Recipient recipient) {
     about.postValue(recipient.getAbout());
     aboutEmoji.postValue(recipient.getAboutEmoji());
     badge.postValue(Optional.ofNullable(recipient.getFeaturedBadge()));
-    renderAvatar(AvatarHelper.getSelfProfileAvatarStream(ApplicationDependencies.getApplication()));
+    renderAvatar(AvatarHelper.getSelfProfileAvatarStream(AppDependencies.getApplication()));
   }
 
   private void renderAvatar(@Nullable StreamDetails details) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditViewModel.kt
index 9dd7f024e3..359bc4cf98 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditViewModel.kt
@@ -15,7 +15,7 @@ import org.signal.core.util.Result
 import org.signal.core.util.isNotNullOrBlank
 import org.signal.core.util.logging.Log
 import org.signal.libsignal.usernames.Username
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.profiles.manage.UsernameRepository.UsernameDeleteResult
 import org.thoughtcrime.securesms.profiles.manage.UsernameRepository.UsernameSetResult
@@ -44,15 +44,15 @@ internal class UsernameEditViewModel private constructor(private val mode: Usern
     defaultValue = State(
       buttonState = ButtonState.SUBMIT_DISABLED,
       usernameStatus = UsernameStatus.NONE,
-      usernameState = SignalStore.account().username?.let { UsernameState.Set(Username(it)) } ?: UsernameState.NoUsername
+      usernameState = SignalStore.account.username?.let { UsernameState.Set(Username(it)) } ?: UsernameState.NoUsername
     ),
     scheduler = Schedulers.computation()
   )
 
   private val stateMachineStore = RxStore<UsernameEditStateMachine.State>(
     defaultValue = UsernameEditStateMachine.NoUserEntry(
-      nickname = SignalStore.account().username?.split(Usernames.DELIMITER)?.first() ?: "",
-      discriminator = SignalStore.account().username?.split(Usernames.DELIMITER)?.last() ?: "",
+      nickname = SignalStore.account.username?.split(Usernames.DELIMITER)?.first() ?: "",
+      discriminator = SignalStore.account.username?.split(Usernames.DELIMITER)?.last() ?: "",
       stateModifier = UsernameEditStateMachine.StateModifier.SYSTEM
     ),
     scheduler = Schedulers.computation()
@@ -68,8 +68,8 @@ internal class UsernameEditViewModel private constructor(private val mode: Usern
       .subscribeBy(onNext = this::onUsernameStateUpdateDebounced)
 
     if (mode == UsernameEditMode.RECOVERY) {
-      onNicknameUpdated(SignalStore.account().username?.split(Usernames.DELIMITER)?.first() ?: "")
-      onDiscriminatorUpdated(SignalStore.account().username?.split(Usernames.DELIMITER)?.last() ?: "")
+      onNicknameUpdated(SignalStore.account.username?.split(Usernames.DELIMITER)?.first() ?: "")
+      onDiscriminatorUpdated(SignalStore.account.username?.split(Usernames.DELIMITER)?.last() ?: "")
     }
   }
 
@@ -81,7 +81,7 @@ internal class UsernameEditViewModel private constructor(private val mode: Usern
 
   fun onNicknameUpdated(nickname: String) {
     uiState.update { state: State ->
-      if (nickname.isBlank() && SignalStore.account().username != null) {
+      if (nickname.isBlank() && SignalStore.account.username != null) {
         return@update State(
           buttonState = ButtonState.DELETE,
           usernameStatus = UsernameStatus.NONE,
@@ -103,7 +103,7 @@ internal class UsernameEditViewModel private constructor(private val mode: Usern
 
   fun onDiscriminatorUpdated(discriminator: String) {
     uiState.update { state: State ->
-      if (discriminator.isBlank() && SignalStore.account().username != null) {
+      if (discriminator.isBlank() && SignalStore.account.username != null) {
         return@update State(
           buttonState = ButtonState.DELETE,
           usernameStatus = UsernameStatus.NONE,
@@ -124,7 +124,7 @@ internal class UsernameEditViewModel private constructor(private val mode: Usern
   }
 
   fun onUsernameSkipped() {
-    SignalStore.uiHints().markHasSetOrSkippedUsernameCreation()
+    SignalStore.uiHints.markHasSetOrSkippedUsernameCreation()
     events.onNext(Event.SKIPPED)
   }
 
@@ -132,14 +132,14 @@ internal class UsernameEditViewModel private constructor(private val mode: Usern
     val usernameState = uiState.state.usernameState
     return mode == UsernameEditMode.RECOVERY &&
       usernameState is UsernameState.Reserved &&
-      usernameState.requireUsername().username.lowercase() == SignalStore.account().username?.lowercase()
+      usernameState.requireUsername().username.lowercase() == SignalStore.account.username?.lowercase()
   }
 
   /**
    * @param userConfirmedResetOk True if the user is submitting this after confirming that they're ok with resetting their username via [Event.NEEDS_CONFIRM_RESET].
    */
   fun onUsernameSubmitted(userConfirmedResetOk: Boolean) {
-    if (!NetworkUtil.isConnected(ApplicationDependencies.getApplication())) {
+    if (!NetworkUtil.isConnected(AppDependencies.application)) {
       events.onNext(Event.NETWORK_FAILURE)
       return
     }
@@ -148,7 +148,7 @@ internal class UsernameEditViewModel private constructor(private val mode: Usern
     val usernameState = uiState.state.usernameState
     val isCaseChange = isCaseChange(editState)
 
-    if (!isCaseChange && SignalStore.account().username.isNotNullOrBlank() && !userConfirmedResetOk) {
+    if (!isCaseChange && SignalStore.account.username.isNotNullOrBlank() && !userConfirmedResetOk) {
       events.onNext(Event.NEEDS_CONFIRM_RESET)
       return
     }
@@ -159,7 +159,7 @@ internal class UsernameEditViewModel private constructor(private val mode: Usern
       return
     }
 
-    if (usernameState.requireUsername().username == SignalStore.account().username && mode != UsernameEditMode.RECOVERY) {
+    if (usernameState.requireUsername().username == SignalStore.account.username && mode != UsernameEditMode.RECOVERY) {
       Log.d(TAG, "Username was submitted, but was identical to the current username. Ignoring.")
       uiState.update { it.copy(buttonState = ButtonState.SUBMIT_DISABLED, usernameStatus = UsernameStatus.NONE) }
       return
@@ -186,7 +186,7 @@ internal class UsernameEditViewModel private constructor(private val mode: Usern
 
       when (result) {
         UsernameSetResult.SUCCESS -> {
-          SignalStore.uiHints().markHasSetOrSkippedUsernameCreation()
+          SignalStore.uiHints.markHasSetOrSkippedUsernameCreation()
           uiState.update { State(ButtonState.SUBMIT_DISABLED, UsernameStatus.NONE, it.usernameState) }
           events.onNext(Event.SUBMIT_SUCCESS)
         }
@@ -252,7 +252,7 @@ internal class UsernameEditViewModel private constructor(private val mode: Usern
     }
 
     val newLower = state.nickname.lowercase()
-    val oldLower = SignalStore.account().username?.split(Usernames.DELIMITER)?.firstOrNull()?.lowercase()
+    val oldLower = SignalStore.account.username?.split(Usernames.DELIMITER)?.firstOrNull()?.lowercase()
 
     return newLower == oldLower
   }
@@ -280,7 +280,7 @@ internal class UsernameEditViewModel private constructor(private val mode: Usern
     }
 
     if (isCaseChange(state)) {
-      val discriminator = SignalStore.account().username?.split(Usernames.DELIMITER)?.lastOrNull() ?: error("Unexpected case change, no discriminator!")
+      val discriminator = SignalStore.account.username?.split(Usernames.DELIMITER)?.lastOrNull() ?: error("Unexpected case change, no discriminator!")
       uiState.update {
         State(
           buttonState = ButtonState.SUBMIT,
@@ -386,11 +386,23 @@ internal class UsernameEditViewModel private constructor(private val mode: Usern
   }
 
   enum class ButtonState {
-    SUBMIT, SUBMIT_DISABLED, SUBMIT_LOADING, DELETE, DELETE_LOADING, DELETE_DISABLED
+    SUBMIT,
+    SUBMIT_DISABLED,
+    SUBMIT_LOADING,
+    DELETE,
+    DELETE_LOADING,
+    DELETE_DISABLED
   }
 
   enum class Event {
-    NETWORK_FAILURE, SUBMIT_SUCCESS, DELETE_SUCCESS, SUBMIT_FAIL_INVALID, SUBMIT_FAIL_TAKEN, SKIPPED, NEEDS_CONFIRM_RESET, RATE_LIMIT_EXCEEDED
+    NETWORK_FAILURE,
+    SUBMIT_SUCCESS,
+    DELETE_SUCCESS,
+    SUBMIT_FAIL_INVALID,
+    SUBMIT_FAIL_TAKEN,
+    SKIPPED,
+    NEEDS_CONFIRM_RESET,
+    RATE_LIMIT_EXCEEDED
   }
 
   class Factory(private val mode: UsernameEditMode) : ViewModelProvider.Factory {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameRepository.kt
index b12d7fc22d..d1cfed0bc0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameRepository.kt
@@ -12,7 +12,7 @@ import org.signal.libsignal.usernames.BaseUsernameException
 import org.signal.libsignal.usernames.Username
 import org.thoughtcrime.securesms.components.settings.app.usernamelinks.main.UsernameLinkResetResult
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.AccountValues
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -88,7 +88,7 @@ object UsernameRepository {
   private const val BASE_URL = "https://signal.me/#eu/"
   private const val USERNAME_SYNC_ERROR_THRESHOLD = 3
 
-  private val accountManager: SignalServiceAccountManager get() = ApplicationDependencies.getSignalServiceAccountManager()
+  private val accountManager: SignalServiceAccountManager get() = AppDependencies.signalServiceAccountManager
 
   /**
    * Given a nickname, this will temporarily reserve a matching discriminator that can later be confirmed via [confirmUsernameAndCreateNewLink].
@@ -130,17 +130,17 @@ object UsernameRepository {
   @WorkerThread
   @JvmStatic
   fun reclaimUsernameIfNecessary(): UsernameReclaimResult {
-    if (!SignalStore.misc().needsUsernameRestore) {
+    if (!SignalStore.misc.needsUsernameRestore) {
       Log.d(TAG, "[reclaimUsernameIfNecessary] No need to restore username. Skipping.")
       return UsernameReclaimResult.SUCCESS
     }
 
-    val username = SignalStore.account().username
-    val link = SignalStore.account().usernameLink
+    val username = SignalStore.account.username
+    val link = SignalStore.account.usernameLink
 
     if (username == null || link == null) {
       Log.d(TAG, "[reclaimUsernameIfNecessary] No username or link to restore. Skipping.")
-      SignalStore.misc().needsUsernameRestore = false
+      SignalStore.misc.needsUsernameRestore = false
       return UsernameReclaimResult.SUCCESS
     }
 
@@ -149,13 +149,13 @@ object UsernameRepository {
     when (result) {
       UsernameReclaimResult.SUCCESS -> {
         Log.i(TAG, "[reclaimUsernameIfNecessary] Successfully reclaimed username and link.")
-        SignalStore.misc().needsUsernameRestore = false
+        SignalStore.misc.needsUsernameRestore = false
       }
 
       UsernameReclaimResult.PERMANENT_ERROR -> {
         Log.w(TAG, "[reclaimUsernameIfNecessary] Permanently failed to reclaim username and link. User will see an error.")
-        SignalStore.account().usernameSyncState = AccountValues.UsernameSyncState.USERNAME_AND_LINK_CORRUPTED
-        SignalStore.misc().needsUsernameRestore = false
+        SignalStore.account.usernameSyncState = AccountValues.UsernameSyncState.USERNAME_AND_LINK_CORRUPTED
+        SignalStore.misc.needsUsernameRestore = false
       }
 
       UsernameReclaimResult.NETWORK_ERROR -> {
@@ -180,12 +180,12 @@ object UsernameRepository {
    * Creates or rotates the username link for the local user.
    */
   fun createOrResetUsernameLink(): Single<UsernameLinkResetResult> {
-    if (!NetworkUtil.isConnected(ApplicationDependencies.getApplication())) {
+    if (!NetworkUtil.isConnected(AppDependencies.application)) {
       Log.w(TAG, "[createOrResetUsernameLink] No network! Not making any changes.")
       return Single.just(UsernameLinkResetResult.NetworkUnavailable)
     }
 
-    val usernameString = SignalStore.account().username
+    val usernameString = SignalStore.account.username
     if (usernameString.isNullOrBlank()) {
       Log.w(TAG, "[createOrResetUsernameLink] No username set! Cannot rotate the link!")
       return Single.just(UsernameLinkResetResult.UnexpectedError)
@@ -201,15 +201,15 @@ object UsernameRepository {
     return Single
       .fromCallable {
         try {
-          SignalStore.account().usernameLink = null
+          SignalStore.account.usernameLink = null
 
           Log.d(TAG, "[createOrResetUsernameLink] Creating username link...")
           val components = accountManager.createUsernameLink(username)
-          SignalStore.account().usernameLink = components
+          SignalStore.account.usernameLink = components
 
-          if (SignalStore.account().usernameSyncState == AccountValues.UsernameSyncState.LINK_CORRUPTED) {
-            SignalStore.account().usernameSyncState = AccountValues.UsernameSyncState.IN_SYNC
-            SignalStore.account().usernameSyncErrorCount = 0
+          if (SignalStore.account.usernameSyncState == AccountValues.UsernameSyncState.LINK_CORRUPTED) {
+            SignalStore.account.usernameSyncState = AccountValues.UsernameSyncState.IN_SYNC
+            SignalStore.account.usernameSyncErrorCount = 0
           }
 
           SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
@@ -269,7 +269,7 @@ object UsernameRepository {
   fun fetchAciForUsername(username: String): Single<UsernameAciFetchResult> {
     return Single.fromCallable {
       try {
-        val aci: ACI = ApplicationDependencies.getSignalServiceAccountManager().getAciByUsername(Username(username))
+        val aci: ACI = AppDependencies.signalServiceAccountManager.getAciByUsername(Username(username))
         UsernameAciFetchResult.Success(aci)
       } catch (e: UsernameIsNotAssociatedWithAnAccountException) {
         Log.w(TAG, "[fetchAciFromUsername] Failed to get ACI for username hash", e)
@@ -317,39 +317,39 @@ object UsernameRepository {
 
   @JvmStatic
   fun onUsernameConsistencyValidated() {
-    SignalStore.account().usernameSyncState = AccountValues.UsernameSyncState.IN_SYNC
+    SignalStore.account.usernameSyncState = AccountValues.UsernameSyncState.IN_SYNC
 
-    if (SignalStore.account().usernameSyncErrorCount > 0) {
-      Log.i(TAG, "Username consistency validated. There were previously ${SignalStore.account().usernameSyncErrorCount} error(s).")
-      SignalStore.account().usernameSyncErrorCount = 0
+    if (SignalStore.account.usernameSyncErrorCount > 0) {
+      Log.i(TAG, "Username consistency validated. There were previously ${SignalStore.account.usernameSyncErrorCount} error(s).")
+      SignalStore.account.usernameSyncErrorCount = 0
     }
   }
 
   @JvmStatic
   fun onUsernameMismatchDetected() {
-    SignalStore.account().usernameSyncErrorCount++
+    SignalStore.account.usernameSyncErrorCount++
 
-    if (SignalStore.account().usernameSyncErrorCount >= USERNAME_SYNC_ERROR_THRESHOLD) {
-      Log.w(TAG, "We've now seen ${SignalStore.account().usernameSyncErrorCount} mismatches in a row. Marking username and link as corrupted.")
-      SignalStore.account().usernameSyncState = AccountValues.UsernameSyncState.USERNAME_AND_LINK_CORRUPTED
-      SignalStore.account().usernameSyncErrorCount = 0
+    if (SignalStore.account.usernameSyncErrorCount >= USERNAME_SYNC_ERROR_THRESHOLD) {
+      Log.w(TAG, "We've now seen ${SignalStore.account.usernameSyncErrorCount} mismatches in a row. Marking username and link as corrupted.")
+      SignalStore.account.usernameSyncState = AccountValues.UsernameSyncState.USERNAME_AND_LINK_CORRUPTED
+      SignalStore.account.usernameSyncErrorCount = 0
     } else {
-      Log.w(TAG, "Username mismatch reported. At ${SignalStore.account().usernameSyncErrorCount} / $USERNAME_SYNC_ERROR_THRESHOLD tries.")
+      Log.w(TAG, "Username mismatch reported. At ${SignalStore.account.usernameSyncErrorCount} / $USERNAME_SYNC_ERROR_THRESHOLD tries.")
     }
   }
 
   @JvmStatic
   fun onUsernameLinkMismatchDetected() {
-    SignalStore.account().usernameSyncErrorCount++
+    SignalStore.account.usernameSyncErrorCount++
 
-    if (SignalStore.account().usernameSyncErrorCount >= USERNAME_SYNC_ERROR_THRESHOLD) {
-      Log.w(TAG, "We've now seen ${SignalStore.account().usernameSyncErrorCount} mismatches in a row. Marking link as corrupted.")
-      SignalStore.account().usernameSyncState = AccountValues.UsernameSyncState.LINK_CORRUPTED
-      SignalStore.account().usernameLink = null
-      SignalStore.account().usernameSyncErrorCount = 0
+    if (SignalStore.account.usernameSyncErrorCount >= USERNAME_SYNC_ERROR_THRESHOLD) {
+      Log.w(TAG, "We've now seen ${SignalStore.account.usernameSyncErrorCount} mismatches in a row. Marking link as corrupted.")
+      SignalStore.account.usernameSyncState = AccountValues.UsernameSyncState.LINK_CORRUPTED
+      SignalStore.account.usernameLink = null
+      SignalStore.account.usernameSyncErrorCount = 0
       StorageSyncHelper.scheduleSyncForDataChange()
     } else {
-      Log.w(TAG, "Link mismatch reported. At ${SignalStore.account().usernameSyncErrorCount} / $USERNAME_SYNC_ERROR_THRESHOLD tries.")
+      Log.w(TAG, "Link mismatch reported. At ${SignalStore.account.usernameSyncErrorCount} / $USERNAME_SYNC_ERROR_THRESHOLD tries.")
     }
   }
 
@@ -397,21 +397,21 @@ object UsernameRepository {
   private fun updateUsernameDisplayForCurrentLinkInternal(updatedUsername: Username): UsernameSetResult {
     Log.i(TAG, "[updateUsernameDisplayForCurrentLink] Beginning username update...")
 
-    if (!NetworkUtil.isConnected(ApplicationDependencies.getApplication())) {
+    if (!NetworkUtil.isConnected(AppDependencies.application)) {
       Log.w(TAG, "[deleteUsernameInternal] No network connection! Not attempting the request.")
       return UsernameSetResult.NETWORK_ERROR
     }
 
     return try {
-      val oldUsernameLink = SignalStore.account().usernameLink ?: return UsernameSetResult.USERNAME_INVALID
+      val oldUsernameLink = SignalStore.account.usernameLink ?: return UsernameSetResult.USERNAME_INVALID
       val newUsernameLink = updatedUsername.generateLink(oldUsernameLink.entropy)
       val usernameLinkComponents = accountManager.updateUsernameLink(newUsernameLink)
 
-      SignalStore.account().username = updatedUsername.username
-      SignalStore.account().usernameLink = usernameLinkComponents
+      SignalStore.account.username = updatedUsername.username
+      SignalStore.account.usernameLink = usernameLinkComponents
       SignalDatabase.recipients.setUsername(Recipient.self().id, updatedUsername.username)
-      SignalStore.account().usernameSyncState = AccountValues.UsernameSyncState.IN_SYNC
-      SignalStore.account().usernameSyncErrorCount = 0
+      SignalStore.account.usernameSyncState = AccountValues.UsernameSyncState.IN_SYNC
+      SignalStore.account.usernameSyncErrorCount = 0
 
       SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
       StorageSyncHelper.scheduleSyncForDataChange()
@@ -428,7 +428,7 @@ object UsernameRepository {
   private fun confirmUsernameAndCreateNewLinkInternal(username: Username): UsernameSetResult {
     Log.i(TAG, "[confirmUsernameAndCreateNewLink] Beginning username confirmation...")
 
-    if (!NetworkUtil.isConnected(ApplicationDependencies.getApplication())) {
+    if (!NetworkUtil.isConnected(AppDependencies.application)) {
       Log.w(TAG, "[confirmUsernameAndCreateNewLink] No network connection! Not attempting the request.")
       return UsernameSetResult.NETWORK_ERROR
     }
@@ -436,11 +436,11 @@ object UsernameRepository {
     return try {
       val linkComponents: UsernameLinkComponents = accountManager.confirmUsernameAndCreateNewLink(username)
 
-      SignalStore.account().username = username.username
-      SignalStore.account().usernameLink = linkComponents
+      SignalStore.account.username = username.username
+      SignalStore.account.usernameLink = linkComponents
       SignalDatabase.recipients.setUsername(Recipient.self().id, username.username)
-      SignalStore.account().usernameSyncState = AccountValues.UsernameSyncState.IN_SYNC
-      SignalStore.account().usernameSyncErrorCount = 0
+      SignalStore.account.usernameSyncState = AccountValues.UsernameSyncState.IN_SYNC
+      SignalStore.account.usernameSyncErrorCount = 0
 
       SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
       StorageSyncHelper.scheduleSyncForDataChange()
@@ -464,7 +464,7 @@ object UsernameRepository {
 
   @WorkerThread
   private fun deleteUsernameInternal(): UsernameDeleteResult {
-    if (!NetworkUtil.isConnected(ApplicationDependencies.getApplication())) {
+    if (!NetworkUtil.isConnected(AppDependencies.application)) {
       Log.w(TAG, "[deleteUsernameInternal] No network connection! Not attempting the request.")
       return UsernameDeleteResult.NETWORK_ERROR
     }
@@ -472,10 +472,10 @@ object UsernameRepository {
     return try {
       accountManager.deleteUsername()
       SignalDatabase.recipients.setUsername(Recipient.self().id, null)
-      SignalStore.account().username = null
-      SignalStore.account().usernameLink = null
-      SignalStore.account().usernameSyncState = AccountValues.UsernameSyncState.IN_SYNC
-      SignalStore.account().usernameSyncErrorCount = 0
+      SignalStore.account.username = null
+      SignalStore.account.usernameLink = null
+      SignalStore.account.usernameSyncState = AccountValues.UsernameSyncState.IN_SYNC
+      SignalStore.account.usernameSyncErrorCount = 0
       SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
       StorageSyncHelper.scheduleSyncForDataChange()
       Log.i(TAG, "[deleteUsername] Successfully deleted the username.")
@@ -509,15 +509,23 @@ object UsernameRepository {
   }
 
   enum class UsernameSetResult {
-    SUCCESS, USERNAME_UNAVAILABLE, USERNAME_INVALID, NETWORK_ERROR, CANDIDATE_GENERATION_ERROR, RATE_LIMIT_ERROR
+    SUCCESS,
+    USERNAME_UNAVAILABLE,
+    USERNAME_INVALID,
+    NETWORK_ERROR,
+    CANDIDATE_GENERATION_ERROR,
+    RATE_LIMIT_ERROR
   }
 
   enum class UsernameReclaimResult {
-    SUCCESS, PERMANENT_ERROR, NETWORK_ERROR
+    SUCCESS,
+    PERMANENT_ERROR,
+    NETWORK_ERROR
   }
 
   enum class UsernameDeleteResult {
-    SUCCESS, NETWORK_ERROR
+    SUCCESS,
+    NETWORK_ERROR
   }
 
   internal interface Callback<E> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewBannerView.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewBannerView.java
index 549c5b9bf6..caad1944b5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewBannerView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewBannerView.java
@@ -8,12 +8,8 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.FallbackPhoto20dp;
-import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
-import org.thoughtcrime.securesms.conversation.colors.AvatarColor;
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatar;
+import org.thoughtcrime.securesms.components.AvatarImageView;
 import org.thoughtcrime.securesms.databinding.ReviewBannerViewBinding;
 import org.thoughtcrime.securesms.recipients.Recipient;
 
@@ -39,10 +35,10 @@ protected void onFinishInflate() {
 
     binding = ReviewBannerViewBinding.bind(this);
 
-    FallbackPhotoProvider provider = new FallbackPhotoProvider();
+    FallbackAvatarProvider provider = new FallbackAvatarProvider();
 
-    binding.bannerBottomRightAvatar.setFallbackPhotoProvider(provider);
-    binding.bannerTopLeftAvatar.setFallbackPhotoProvider(provider);
+    binding.bannerBottomRightAvatar.setFallbackAvatarProvider(provider);
+    binding.bannerTopLeftAvatar.setFallbackAvatarProvider(provider);
 
     binding.bannerClose.setOnClickListener(v -> {
       if (onHideListener != null && onHideListener.onHide()) {
@@ -86,44 +82,14 @@ public void setOnClickListener(@Nullable OnClickListener l) {
     binding.bannerTapToReview.setOnClickListener(l);
   }
 
-  private static final class FallbackPhotoProvider extends Recipient.FallbackPhotoProvider {
+  private static final class FallbackAvatarProvider implements AvatarImageView.FallbackAvatarProvider {
     @Override
-    public @NonNull
-    FallbackContactPhoto getPhotoForGroup() {
-      throw new UnsupportedOperationException("This provider does not support groups");
-    }
-
-    @Override
-    public @NonNull FallbackContactPhoto getPhotoForResolvingRecipient() {
-      throw new UnsupportedOperationException("This provider does not support resolving recipients");
-    }
-
-    @Override
-    public @NonNull FallbackContactPhoto getPhotoForLocalNumber() {
-      return new ResourceContactPhoto(R.drawable.symbol_note_light_24, R.drawable.symbol_note_light_24);
-    }
-
-    @NonNull
-    @Override
-    public FallbackContactPhoto getPhotoForRecipientWithName(String name, int targetSize) {
-      return new FixedSizeGeneratedContactPhoto(name, R.drawable.ic_profile_outline_20);
-    }
-
-    @NonNull
-    @Override
-    public FallbackContactPhoto getPhotoForRecipientWithoutName() {
-      return new FallbackPhoto20dp(R.drawable.ic_profile_outline_20);
-    }
-  }
-
-  private static final class FixedSizeGeneratedContactPhoto extends GeneratedContactPhoto {
-    public FixedSizeGeneratedContactPhoto(@NonNull String name, int fallbackResId) {
-      super(name, fallbackResId);
-    }
+    public @NonNull FallbackAvatar getFallbackAvatar(@NonNull Recipient recipient) {
+      if (recipient.isIndividual() && !recipient.isSelf()) {
+        return new FallbackAvatar.Resource.Person(recipient.getAvatarColor());
+      }
 
-    @Override
-    protected Drawable newFallbackDrawable(@NonNull Context context, @NonNull AvatarColor color, boolean inverted) {
-      return new FallbackPhoto20dp(getFallbackResId()).asDrawable(context, color, inverted);
+      return recipient.getFallbackAvatar();
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewCardRepository.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewCardRepository.java
index ee832801b4..384200b37e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewCardRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewCardRepository.java
@@ -5,12 +5,10 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.WorkerThread;
 
-import com.annimon.stream.Stream;
-
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.ThreadTable;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupChangeException;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.groups.GroupManager;
@@ -21,7 +19,6 @@
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.io.IOException;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
 
@@ -63,10 +60,6 @@ int loadGroupsInCommonCount(@NonNull ReviewRecipient reviewRecipient) {
   }
 
   void block(@NonNull ReviewCard reviewCard, @NonNull Runnable onActionCompleteListener) {
-    if (recipientId == null) {
-      throw new UnsupportedOperationException();
-    }
-
     SignalExecutors.BOUNDED.execute(() -> {
       RecipientUtil.blockNonGroup(context, reviewCard.getReviewRecipient());
       onActionCompleteListener.run();
@@ -84,13 +77,13 @@ void delete(@NonNull ReviewCard reviewCard, @NonNull Runnable onActionCompleteLi
       if (resolved.isGroup()) throw new AssertionError();
 
       if (TextSecurePreferences.isMultiDevice(context)) {
-        ApplicationDependencies.getJobManager().add(MultiDeviceMessageRequestResponseJob.forDelete(recipientId));
+        AppDependencies.getJobManager().add(MultiDeviceMessageRequestResponseJob.forDelete(recipientId));
       }
 
       ThreadTable threadTable = SignalDatabase.threads();
       long        threadId    = Objects.requireNonNull(threadTable.getThreadIdFor(recipientId));
 
-      threadTable.deleteConversation(threadId);
+      threadTable.deleteConversation(threadId, false);
       onActionCompleteListener.run();
     });
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/providers/AvatarProvider.kt b/app/src/main/java/org/thoughtcrime/securesms/providers/AvatarProvider.kt
index 4e6eb0d0e4..6a18a28abe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/providers/AvatarProvider.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/providers/AvatarProvider.kt
@@ -21,8 +21,8 @@ import org.thoughtcrime.securesms.profiles.AvatarHelper
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.service.KeyCachingService
+import org.thoughtcrime.securesms.util.AdaptiveBitmapMetrics
 import org.thoughtcrime.securesms.util.AvatarUtil
-import org.thoughtcrime.securesms.util.DrawableUtil
 import org.thoughtcrime.securesms.util.MediaUtil
 import java.io.File
 import java.io.FileNotFoundException
@@ -168,7 +168,7 @@ class AvatarProvider : BaseContentProvider() {
       ParcelFileDescriptor.AutoCloseOutputStream(pipe[1]).use { output ->
         if (VERBOSE) Log.i(TAG, "Writing to pipe:${recipient.id}")
 
-        AvatarUtil.getBitmapForNotification(context!!, recipient, DrawableUtil.SHORTCUT_INFO_WRAPPED_SIZE).apply {
+        AvatarUtil.getBitmapForNotification(context!!, recipient, AdaptiveBitmapMetrics.innerWidth).apply {
           compress(Bitmap.CompressFormat.PNG, 100, output)
         }
         output.flush()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/providers/BlobContentProvider.java b/app/src/main/java/org/thoughtcrime/securesms/providers/BlobContentProvider.java
index ac8c63cb8d..59191292a5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/providers/BlobContentProvider.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/providers/BlobContentProvider.java
@@ -11,7 +11,7 @@
 
 import org.signal.core.util.StreamUtil;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.util.MemoryFileUtil;
 import org.thoughtcrime.securesms.util.Util;
 
@@ -35,7 +35,7 @@ public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) thr
     Log.i(TAG, "openFile() called: " + uri);
 
     try {
-      try (InputStream stream = BlobProvider.getInstance().getStream(ApplicationDependencies.getApplication(), uri)) {
+      try (InputStream stream = BlobProvider.getInstance().getStream(AppDependencies.getApplication(), uri)) {
         Long fileSize = BlobProvider.getFileSize(uri);
         if (fileSize == null) {
           Log.w(TAG, "No file size available");
diff --git a/app/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java b/app/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java
index 7dddac2310..6a5a270a66 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java
@@ -10,8 +10,8 @@
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.BuildConfig;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId.PNI;
@@ -46,7 +46,7 @@ public static void setInstance(@NonNull AccountManagerFactory accountManagerFact
                                                                   int deviceId,
                                                                   @NonNull String password)
   {
-    if (ApplicationDependencies.getSignalServiceNetworkAccess().isCensored(e164)) {
+    if (AppDependencies.getSignalServiceNetworkAccess().isCensored(e164)) {
       SignalExecutors.BOUNDED.execute(() -> {
         try {
           ProviderInstaller.installIfNeeded(context);
@@ -56,15 +56,15 @@ public static void setInstance(@NonNull AccountManagerFactory accountManagerFact
       });
     }
 
-    return new SignalServiceAccountManager(ApplicationDependencies.getSignalServiceNetworkAccess().getConfiguration(e164),
+    return new SignalServiceAccountManager(AppDependencies.getSignalServiceNetworkAccess().getConfiguration(e164),
                                            aci,
                                            pni,
                                            e164,
                                            deviceId,
                                            password,
                                            BuildConfig.SIGNAL_AGENT,
-                                           FeatureFlags.okHttpAutomaticRetry(),
-                                           FeatureFlags.groupLimits().getHardLimit());
+                                           RemoteConfig.okHttpAutomaticRetry(),
+                                           RemoteConfig.groupLimits().getHardLimit());
   }
 
   /**
@@ -85,33 +85,33 @@ public static void setInstance(@NonNull AccountManagerFactory accountManagerFact
       });
     }
 
-    return new SignalServiceAccountManager(ApplicationDependencies.getSignalServiceNetworkAccess().getConfiguration(e164),
+    return new SignalServiceAccountManager(AppDependencies.getSignalServiceNetworkAccess().getConfiguration(e164),
                                            null,
                                            null,
                                            e164,
                                            deviceId,
                                            password,
                                            BuildConfig.SIGNAL_AGENT,
-                                           FeatureFlags.okHttpAutomaticRetry(),
-                                           FeatureFlags.groupLimits().getHardLimit());
+                                           RemoteConfig.okHttpAutomaticRetry(),
+                                           RemoteConfig.groupLimits().getHardLimit());
   }
 
   /**
    * Should only be used during registration when linking to an existing device.
    */
-  public static @NonNull SignalServiceAccountManager createForDeviceLink(@NonNull Context context,
-                                                                         @NonNull String password)
+  public @NonNull SignalServiceAccountManager createForDeviceLink(@NonNull Context context,
+                                                                  @NonNull String password)
   {
     // Limitation - We cannot detect the need to use a censored configuration for the link process, because the number (and hence country code) is unknown.
     // Perhaps offer a UI to select just the country, and obtain censorship configuration that way?
-    return new SignalServiceAccountManager(ApplicationDependencies.getSignalServiceNetworkAccess().getConfiguration(null),
+    return new SignalServiceAccountManager(AppDependencies.getSignalServiceNetworkAccess().getConfiguration(null),
                                            null,
                                            null,
                                            null,
                                            SignalServiceAddress.DEFAULT_DEVICE_ID,
                                            password,
                                            BuildConfig.SIGNAL_AGENT,
-                                           FeatureFlags.okHttpAutomaticRetry(),
-                                           FeatureFlags.groupLimits().getHardLimit());
+                                           RemoteConfig.okHttpAutomaticRetry(),
+                                           RemoteConfig.groupLimits().getHardLimit());
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt b/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt
index 6edda3fda5..93c4d39ed3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt
@@ -277,7 +277,7 @@ open class SignalServiceNetworkAccess(context: Context) {
   )
 
   open fun getConfiguration(): SignalServiceConfiguration {
-    return getConfiguration(SignalStore.account().e164)
+    return getConfiguration(SignalStore.account.e164)
   }
 
   open fun getConfiguration(e164: String?): SignalServiceConfiguration {
@@ -287,7 +287,7 @@ open class SignalServiceNetworkAccess(context: Context) {
 
     val countryCode: Int = PhoneNumberUtil.getInstance().parse(e164, null).countryCode
 
-    return when (SignalStore.settings().censorshipCircumventionEnabled) {
+    return when (SignalStore.settings.censorshipCircumventionEnabled) {
       SettingsValues.CensorshipCircumventionEnabled.ENABLED -> {
         censorshipConfiguration[countryCode] ?: defaultCensoredConfiguration
       }
@@ -305,7 +305,7 @@ open class SignalServiceNetworkAccess(context: Context) {
   }
 
   fun isCensored(): Boolean {
-    return isCensored(SignalStore.account().e164)
+    return isCensored(SignalStore.account.e164)
   }
 
   fun isCensored(number: String?): Boolean {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/qr/QrScanScreens.kt b/app/src/main/java/org/thoughtcrime/securesms/qr/QrScanScreens.kt
new file mode 100644
index 0000000000..28cce53e46
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/qr/QrScanScreens.kt
@@ -0,0 +1,140 @@
+package org.thoughtcrime.securesms.qr
+
+import android.content.Context
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.graphics.PathEffect
+import androidx.compose.ui.graphics.drawscope.DrawScope
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidView
+import androidx.compose.ui.viewinterop.NoOpUpdate
+import org.signal.core.ui.Buttons
+import org.signal.qr.QrScannerView
+import org.thoughtcrime.securesms.R
+
+object QrScanScreens {
+  /**
+   * Full-screen qr scanning screen with permission-asking UI
+   */
+  @Composable
+  fun QrScanScreen(
+    factory: (Context) -> QrScannerView,
+    update: (QrScannerView) -> Unit = NoOpUpdate,
+    hasPermission: Boolean,
+    onRequestPermissions: () -> Unit = {},
+    qrHeaderLabelString: String
+  ) {
+    val path = remember { Path() }
+
+    Column(
+      verticalArrangement = Arrangement.Center,
+      horizontalAlignment = Alignment.CenterHorizontally,
+      modifier = Modifier
+        .fillMaxWidth()
+        .fillMaxHeight()
+    ) {
+      Box(
+        modifier = Modifier
+          .fillMaxWidth()
+          .weight(1f, true)
+      ) {
+        AndroidView(
+          factory = factory,
+          update = update,
+          modifier = Modifier
+            .fillMaxWidth()
+            .fillMaxHeight()
+            .drawWithContent {
+              drawContent()
+              if (hasPermission) {
+                drawQrCrosshair(path)
+              }
+            }
+        )
+        if (!hasPermission) {
+          Column(
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally,
+            modifier = Modifier.align(Alignment.Center).padding(48.dp)
+          ) {
+            Text(
+              text = stringResource(R.string.CameraXFragment_to_scan_qr_code_allow_camera),
+              textAlign = TextAlign.Center,
+              style = MaterialTheme.typography.bodyLarge,
+              color = Color.White
+            )
+            Buttons.MediumTonal(
+              colors = ButtonDefaults.filledTonalButtonColors(),
+              onClick = onRequestPermissions
+            ) {
+              Text(stringResource(R.string.CameraXFragment_allow_access))
+            }
+          }
+        } else {
+          Text(
+            text = qrHeaderLabelString,
+            style = MaterialTheme.typography.bodyMedium,
+            color = Color.White,
+            textAlign = TextAlign.Center,
+            modifier = Modifier.padding(top = 24.dp).fillMaxWidth()
+          )
+        }
+      }
+    }
+  }
+
+  private fun DrawScope.drawQrCrosshair(path: Path) {
+    val crosshairWidth: Float = size.minDimension * 0.6f
+    val crosshairLineLength = crosshairWidth * 0.125f
+
+    val topLeft = center - Offset(crosshairWidth / 2, crosshairWidth / 2)
+    val topRight = center + Offset(crosshairWidth / 2, -crosshairWidth / 2)
+    val bottomRight = center + Offset(crosshairWidth / 2, crosshairWidth / 2)
+    val bottomLeft = center + Offset(-crosshairWidth / 2, crosshairWidth / 2)
+
+    path.reset()
+
+    drawPath(
+      path = path.apply {
+        moveTo(topLeft.x, topLeft.y + crosshairLineLength)
+        lineTo(topLeft.x, topLeft.y)
+        lineTo(topLeft.x + crosshairLineLength, topLeft.y)
+
+        moveTo(topRight.x - crosshairLineLength, topRight.y)
+        lineTo(topRight.x, topRight.y)
+        lineTo(topRight.x, topRight.y + crosshairLineLength)
+
+        moveTo(bottomRight.x, bottomRight.y - crosshairLineLength)
+        lineTo(bottomRight.x, bottomRight.y)
+        lineTo(bottomRight.x - crosshairLineLength, bottomRight.y)
+
+        moveTo(bottomLeft.x + crosshairLineLength, bottomLeft.y)
+        lineTo(bottomLeft.x, bottomLeft.y)
+        lineTo(bottomLeft.x, bottomLeft.y - crosshairLineLength)
+      },
+      color = Color.White,
+      style = Stroke(
+        width = 3.dp.toPx(),
+        pathEffect = PathEffect.cornerPathEffect(10.dp.toPx())
+      )
+    )
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ratelimit/RateLimitUtil.java b/app/src/main/java/org/thoughtcrime/securesms/ratelimit/RateLimitUtil.java
index a0d9a0963b..4e4bc9992a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ratelimit/RateLimitUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ratelimit/RateLimitUtil.java
@@ -7,7 +7,7 @@
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.PushGroupSendJob;
 import org.thoughtcrime.securesms.jobs.IndividualSendJob;
 
@@ -34,7 +34,7 @@ public static void retryAllRateLimitedMessages(@NonNull Context context) {
 
     SignalDatabase.messages().clearRateLimitStatus(messageIds);
 
-    ApplicationDependencies.getJobManager().update((job) -> {
+    AppDependencies.getJobManager().update((job) -> {
       if (job.getFactoryKey().equals(IndividualSendJob.KEY) && messageIds.contains(IndividualSendJob.getMessageId(job.getSerializedData()))) {
         return job.withNextBackoffInterval(0);
       } else if (job.getFactoryKey().equals(PushGroupSendJob.KEY) && messageIds.contains(PushGroupSendJob.getMessageId(job.getSerializedData()))) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ratelimit/RecaptchaProofActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ratelimit/RecaptchaProofActivity.java
index 3a6af56c57..7c1bcd6508 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ratelimit/RecaptchaProofActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ratelimit/RecaptchaProofActivity.java
@@ -16,7 +16,7 @@
 import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.PassphraseRequiredActivity;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.Util;
@@ -100,7 +100,7 @@ private void handleToken(@NonNull String token) {
       try {
         for (int i = 0; i < 3; i++) {
           try {
-            ApplicationDependencies.getSignalServiceAccountManager().submitRateLimitRecaptchaChallenge(challenge, token);
+            AppDependencies.getSignalServiceAccountManager().submitRateLimitRecaptchaChallenge(challenge, token);
             RateLimitUtil.retryAllRateLimitedMessages(this);
             Log.i(TAG, "Successfully completed reCAPTCHA.");
             return new TokenResult(true, true);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsRepository.kt
index 51ade0c42b..2ca2f35787 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsRepository.kt
@@ -8,14 +8,14 @@ import org.thoughtcrime.securesms.database.DatabaseObserver
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.ReactionRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 
 class ReactionsRepository {
 
   fun getReactions(messageId: MessageId): Observable<List<ReactionDetails>> {
     return Observable.create { emitter: ObservableEmitter<List<ReactionDetails>> ->
-      val databaseObserver: DatabaseObserver = ApplicationDependencies.getDatabaseObserver()
+      val databaseObserver: DatabaseObserver = AppDependencies.databaseObserver
 
       val messageObserver = DatabaseObserver.MessageObserver { reactionMessageId ->
         if (reactionMessageId == messageId) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiViewModel.java
index 441afa5b76..cb95a97aa8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiViewModel.java
@@ -11,7 +11,7 @@
 import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter;
 import org.thoughtcrime.securesms.components.emoji.RecentEmojiPageModel;
 import org.thoughtcrime.securesms.database.model.MessageId;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.emoji.EmojiCategory;
 import org.thoughtcrime.securesms.keyboard.emoji.EmojiCategoryMappingModel;
 import org.thoughtcrime.securesms.keyboard.emoji.RecentsMappingModel;
@@ -110,7 +110,7 @@ private ReactWithAnyEmojiViewModel(@NonNull ReactWithAnyEmojiRepository reposito
 
   void onEmojiSelected(@NonNull String emoji) {
     if (messageId > 0) {
-      SignalStore.emojiValues().setPreferredVariation(emoji);
+      SignalStore.emoji().setPreferredVariation(emoji);
       repository.addEmojiToMessage(emoji, new MessageId(messageId));
     }
   }
@@ -131,7 +131,7 @@ public void selectPage(@NonNull String key) {
   }
 
   private static @NonNull String getStartingKey() {
-    if (RecentEmojiPageModel.hasRecents(ApplicationDependencies.getApplication(), TextSecurePreferences.RECENT_STORAGE_KEY)) {
+    if (RecentEmojiPageModel.hasRecents(AppDependencies.getApplication(), TextSecurePreferences.RECENT_STORAGE_KEY)) {
       return RecentEmojiPageModel.KEY;
     } else {
       return EmojiCategory.PEOPLE.getKey();
@@ -167,7 +167,7 @@ static class Factory implements ViewModelProvider.Factory {
     @Override
     public @NonNull <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
       //noinspection ConstantConditions
-      return modelClass.cast(new ReactWithAnyEmojiViewModel(repository, messageId, isMms, new EmojiSearchRepository(ApplicationDependencies.getApplication())));
+      return modelClass.cast(new ReactWithAnyEmojiViewModel(repository, messageId, isMms, new EmojiSearchRepository(AppDependencies.getApplication())));
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/edit/EditReactionsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/reactions/edit/EditReactionsViewModel.kt
index d77c42eb39..31e1c9a905 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/reactions/edit/EditReactionsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/reactions/edit/EditReactionsViewModel.kt
@@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.util.livedata.Store
 
 class EditReactionsViewModel : ViewModel() {
 
-  private val emojiValues: EmojiValues = SignalStore.emojiValues()
+  private val emojiValues: EmojiValues = SignalStore.emoji
   private val store: Store<State> = Store(State(reactions = emojiValues.reactions.map { emojiValues.getPreferredVariation(it) }))
 
   val reactions: LiveData<List<String>> = LiveDataUtil.mapDistinct(store.stateLiveData, State::reactions)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java
index 37b53d1c74..724bb63bf2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java
@@ -232,7 +232,7 @@ public void warmUp() {
 
       stopwatch.split("thread");
 
-      if (SignalStore.registrationValues().isRegistrationComplete() && SignalStore.account().getAci() != null) {
+      if (SignalStore.registration().isRegistrationComplete() && SignalStore.account().getAci() != null) {
         try (Cursor cursor = SignalDatabase.recipients().getNonGroupContacts(false)) {
           int count = 0;
           while (cursor != null && cursor.moveToNext() && count < CONTACT_CACHE_WARM_MAX) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.kt
index d44de86a2d..4e5e233829 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.kt
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.recipients
 
 import android.content.Context
-import android.graphics.drawable.Drawable
 import android.net.Uri
 import androidx.annotation.AnyThread
 import androidx.annotation.WorkerThread
@@ -14,15 +13,12 @@ import org.signal.core.util.logging.Log
 import org.signal.core.util.nullIfBlank
 import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatar
 import org.thoughtcrime.securesms.badges.models.Badge
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto
-import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto
-import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto
 import org.thoughtcrime.securesms.contacts.avatars.GroupRecordContactPhoto
 import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto
-import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto
 import org.thoughtcrime.securesms.contacts.avatars.SystemContactPhoto
-import org.thoughtcrime.securesms.contacts.avatars.TransparentContactPhoto
 import org.thoughtcrime.securesms.conversation.colors.AvatarColor
 import org.thoughtcrime.securesms.conversation.colors.ChatColors
 import org.thoughtcrime.securesms.conversation.colors.ChatColors.Id.Auto
@@ -31,7 +27,7 @@ import org.thoughtcrime.securesms.database.RecipientTable.MentionSetting
 import org.thoughtcrime.securesms.database.RecipientTable.MissingRecipientException
 import org.thoughtcrime.securesms.database.RecipientTable.PhoneNumberSharingState
 import org.thoughtcrime.securesms.database.RecipientTable.RegisteredState
-import org.thoughtcrime.securesms.database.RecipientTable.UnidentifiedAccessMode
+import org.thoughtcrime.securesms.database.RecipientTable.SealedSenderAccessMode
 import org.thoughtcrime.securesms.database.RecipientTable.VibrateState
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.DistributionListId
@@ -39,7 +35,7 @@ import org.thoughtcrime.securesms.database.model.GroupRecord
 import org.thoughtcrime.securesms.database.model.ProfileAvatarFileDetails
 import org.thoughtcrime.securesms.database.model.RecipientRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.RecipientExtras
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.notifications.NotificationChannels
@@ -47,7 +43,6 @@ import org.thoughtcrime.securesms.phonenumbers.NumberUtil
 import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
 import org.thoughtcrime.securesms.profiles.ProfileName
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId
-import org.thoughtcrime.securesms.util.AvatarUtil
 import org.thoughtcrime.securesms.util.UsernameUtil.isValidUsernameForSearch
 import org.thoughtcrime.securesms.util.Util
 import org.thoughtcrime.securesms.wallpaper.ChatWallpaper
@@ -103,7 +98,7 @@ class Recipient(
   val hiddenState: HiddenState = HiddenState.NOT_HIDDEN,
   val lastProfileFetchTime: Long = 0,
   private val notificationChannelValue: String? = null,
-  private val unidentifiedAccessModeValue: UnidentifiedAccessMode = UnidentifiedAccessMode.UNKNOWN,
+  private val sealedSenderAccessModeValue: SealedSenderAccessMode = SealedSenderAccessMode.UNKNOWN,
   private val capabilities: RecipientRecord.Capabilities = RecipientRecord.Capabilities.UNKNOWN,
   val storageId: ByteArray? = null,
   val mentionSetting: MentionSetting = MentionSetting.ALWAYS_NOTIFY,
@@ -248,7 +243,7 @@ class Recipient(
       null
     } else if (groupIdValue != null && groupAvatarId.isPresent) {
       GroupRecordContactPhoto(groupIdValue, groupAvatarId.get())
-    } else if (systemContactPhoto != null && SignalStore.settings().isPreferSystemContactPhotos) {
+    } else if (systemContactPhoto != null && SignalStore.settings.isPreferSystemContactPhotos) {
       SystemContactPhoto(id, systemContactPhoto, 0)
     } else if (profileAvatar != null && profileAvatarFileDetails.hasFile()) {
       ProfileContactPhoto(this)
@@ -258,10 +253,6 @@ class Recipient(
       null
     }
 
-  /** A photo you can use as a fallback if [contactPhoto] fails to load. */
-  val fallbackContactPhoto: FallbackContactPhoto
-    get() = getFallbackContactPhoto(DEFAULT_FALLBACK_PHOTO_PROVIDER)
-
   /** The URI of the ringtone that should be used when receiving a message from this recipient, if set. */
   val messageRingtone: Uri? by lazy {
     if (messageRingtoneUri != null && messageRingtoneUri.scheme != null && messageRingtoneUri.scheme!!.startsWith("file")) {
@@ -324,13 +315,13 @@ class Recipient(
   val notificationChannel: String? = if (!NotificationChannels.supported()) null else notificationChannelValue
 
   /** The user's payment capability. */
-  val paymentActivationCapability: Capability = capabilities.paymentActivation
+  val deleteSyncCapability: Capability = capabilities.deleteSync
 
   /** The state around whether we can send sealed sender to this user. */
-  val unidentifiedAccessMode: UnidentifiedAccessMode = if (pni.isPresent && pni == serviceId) {
-    UnidentifiedAccessMode.DISABLED
+  val sealedSenderAccessMode: SealedSenderAccessMode = if (pni.isPresent && pni == serviceId) {
+    SealedSenderAccessMode.DISABLED
   } else {
-    unidentifiedAccessModeValue
+    sealedSenderAccessModeValue
   }
 
   /** The wallpaper to render as the chat background, if present. */
@@ -341,7 +332,7 @@ class Recipient(
       } else if (isReleaseNotes) {
         null
       } else {
-        SignalStore.wallpaper().getWallpaper()
+        SignalStore.wallpaper.getWallpaper()
       }
     }
 
@@ -350,7 +341,7 @@ class Recipient(
 
   /** A cheap way to check if wallpaper is set without doing any unnecessary proto parsing. */
   val hasWallpaper: Boolean
-    get() = wallpaperValue != null || SignalStore.wallpaper().hasWallpaperSet()
+    get() = wallpaperValue != null || SignalStore.wallpaper.hasWallpaperSet()
 
   /** The color of the chat bubbles to use in a chat with this recipient. */
   val chatColors: ChatColors
@@ -360,7 +351,7 @@ class Recipient(
       } else if (chatColorsValue != null) {
         autoChatColor
       } else {
-        val global = SignalStore.chatColorsValues().chatColors
+        val global = SignalStore.chatColors.chatColors
         if (global != null && global.id !is Auto) {
           global
         } else {
@@ -460,7 +451,7 @@ class Recipient(
   /** The name to show for a group. It will be the group name if present, otherwise we default to a list of shortened member names. */
   fun getGroupName(context: Context): String? {
     return if (groupIdValue != null && Util.isEmpty(groupName)) {
-      val selfId = ApplicationDependencies.getRecipientCache().getSelfId()
+      val selfId = AppDependencies.recipientCache.getSelfId()
       val others = participantIdsValue
         .filter { id: RecipientId -> id != selfId }
         .take(MAX_MEMBER_NAMES)
@@ -609,45 +600,29 @@ class Recipient(
     }
   }
 
-  fun getFallbackContactPhotoDrawable(context: Context?, inverted: Boolean): Drawable {
-    return getFallbackContactPhotoDrawable(context, inverted, DEFAULT_FALLBACK_PHOTO_PROVIDER, AvatarUtil.UNDEFINED_SIZE)
-  }
-
-  fun getFallbackContactPhotoDrawable(context: Context?, inverted: Boolean, fallbackPhotoProvider: FallbackPhotoProvider?, targetSize: Int): Drawable {
-    return getFallbackContactPhoto(Util.firstNonNull(fallbackPhotoProvider, DEFAULT_FALLBACK_PHOTO_PROVIDER), targetSize).asDrawable(context!!, avatarColor, inverted)
-  }
-
-  fun getSmallFallbackContactPhotoDrawable(context: Context?, inverted: Boolean, fallbackPhotoProvider: FallbackPhotoProvider?, targetSize: Int): Drawable {
-    return getFallbackContactPhoto(Util.firstNonNull(fallbackPhotoProvider, DEFAULT_FALLBACK_PHOTO_PROVIDER), targetSize).asSmallDrawable(context!!, avatarColor, inverted)
-  }
-
-  fun getFallbackContactPhoto(fallbackPhotoProvider: FallbackPhotoProvider): FallbackContactPhoto {
-    return getFallbackContactPhoto(fallbackPhotoProvider, AvatarUtil.UNDEFINED_SIZE)
-  }
-
-  private fun getFallbackContactPhoto(fallbackPhotoProvider: FallbackPhotoProvider, targetSize: Int): FallbackContactPhoto {
+  fun getFallbackAvatar(): FallbackAvatar {
     return if (isSelf) {
-      fallbackPhotoProvider.photoForLocalNumber
+      FallbackAvatar.Resource.Local(avatarColor)
     } else if (isResolving) {
-      fallbackPhotoProvider.photoForResolvingRecipient
+      FallbackAvatar.Transparent
     } else if (isDistributionList) {
-      fallbackPhotoProvider.photoForDistributionList
+      FallbackAvatar.Resource.DistributionList(avatarColor)
     } else if (isCallLink) {
-      fallbackPhotoProvider.photoForCallLink
+      FallbackAvatar.Resource.CallLink(avatarColor)
     } else if (groupIdValue != null) {
-      fallbackPhotoProvider.photoForGroup
+      FallbackAvatar.Resource.Group(avatarColor)
     } else if (isGroup) {
-      fallbackPhotoProvider.photoForGroup
+      FallbackAvatar.Resource.Group(avatarColor)
     } else if (groupName.isNotNullOrBlank()) {
-      fallbackPhotoProvider.getPhotoForRecipientWithName(groupName, targetSize)
+      FallbackAvatar.forTextOrDefault(groupName, avatarColor, FallbackAvatar.Resource.Group(avatarColor))
     } else if (!nickname.isEmpty) {
-      fallbackPhotoProvider.getPhotoForRecipientWithName(nickname.toString(), targetSize)
+      FallbackAvatar.forTextOrDefault(nickname.toString(), avatarColor)
     } else if (systemContactName.isNotNullOrBlank()) {
-      fallbackPhotoProvider.getPhotoForRecipientWithName(systemContactName, targetSize)
+      FallbackAvatar.forTextOrDefault(systemContactName, avatarColor)
     } else if (!profileName.isEmpty) {
-      fallbackPhotoProvider.getPhotoForRecipientWithName(profileName.toString(), targetSize)
+      FallbackAvatar.forTextOrDefault(profileName.toString(), avatarColor)
     } else {
-      fallbackPhotoProvider.photoForRecipientWithoutName
+      FallbackAvatar.Resource.Person(avatarColor)
     }
   }
 
@@ -666,7 +641,7 @@ class Recipient(
 
   /** Returns a live, observable copy of this recipient. */
   fun live(): LiveRecipient {
-    return ApplicationDependencies.getRecipientCache().getLive(id)
+    return AppDependencies.recipientCache.getLive(id)
   }
 
   enum class HiddenState(private val value: Int) {
@@ -785,7 +760,7 @@ class Recipient(
       systemProfileName == other.systemProfileName &&
       profileAvatar == other.profileAvatar &&
       notificationChannelValue == other.notificationChannelValue &&
-      unidentifiedAccessModeValue == other.unidentifiedAccessModeValue &&
+      sealedSenderAccessModeValue == other.sealedSenderAccessModeValue &&
       storageId.contentEquals(other.storageId) &&
       mentionSetting == other.mentionSetting &&
       wallpaperValue == other.wallpaperValue &&
@@ -818,30 +793,6 @@ class Recipient(
     return id.hashCode()
   }
 
-  open class FallbackPhotoProvider {
-    open val photoForLocalNumber: FallbackContactPhoto
-      get() = ResourceContactPhoto(R.drawable.ic_note_34, R.drawable.ic_note_24)
-
-    open val photoForResolvingRecipient: FallbackContactPhoto
-      get() = TransparentContactPhoto()
-
-    open val photoForGroup: FallbackContactPhoto
-      get() = ResourceContactPhoto(R.drawable.ic_group_outline_34, R.drawable.ic_group_outline_20, R.drawable.ic_group_outline_48)
-
-    open val photoForRecipientWithoutName: FallbackContactPhoto
-      get() = ResourceContactPhoto(R.drawable.ic_profile_outline_40, R.drawable.ic_profile_outline_20, R.drawable.ic_profile_outline_48)
-
-    val photoForDistributionList: FallbackContactPhoto
-      get() = ResourceContactPhoto(R.drawable.symbol_stories_24, R.drawable.symbol_stories_24, R.drawable.symbol_stories_24)
-
-    val photoForCallLink: FallbackContactPhoto
-      get() = ResourceContactPhoto(R.drawable.symbol_video_24, R.drawable.symbol_video_24, R.drawable.symbol_video_24)
-
-    open fun getPhotoForRecipientWithName(name: String, targetSize: Int): FallbackContactPhoto {
-      return GeneratedContactPhoto(name, R.drawable.ic_profile_outline_40, targetSize)
-    }
-  }
-
   private class MissingAddressError(recipientId: RecipientId) : AssertionError("Missing address for " + recipientId.serialize())
 
   companion object {
@@ -850,9 +801,6 @@ class Recipient(
     @JvmField
     val UNKNOWN = Recipient()
 
-    @JvmField
-    val DEFAULT_FALLBACK_PHOTO_PROVIDER = FallbackPhotoProvider()
-
     private const val MAX_MEMBER_NAMES = 10
 
     /**
@@ -863,7 +811,7 @@ class Recipient(
     @JvmStatic
     @AnyThread
     fun live(id: RecipientId): LiveRecipient {
-      return ApplicationDependencies.getRecipientCache().getLive(id)
+      return AppDependencies.recipientCache.getLive(id)
     }
 
     /**
@@ -1077,11 +1025,11 @@ class Recipient(
 
     @JvmStatic
     fun self(): Recipient {
-      return ApplicationDependencies.getRecipientCache().getSelf()
+      return AppDependencies.recipientCache.getSelf()
     }
 
     /** Whether we've set a recipient for 'self' yet. We do this during registration. */
     val isSelfSet: Boolean
-      get() = ApplicationDependencies.getRecipientCache().getSelfId() != null
+      get() = AppDependencies.recipientCache.getSelfId() != null
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientCreator.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientCreator.kt
index b2073cccd4..e689855f8c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientCreator.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientCreator.kt
@@ -26,12 +26,12 @@ object RecipientCreator {
 
   @JvmStatic
   fun forIndividual(context: Context, record: RecipientRecord): Recipient {
-    val isSelf = record.e164 != null && record.e164 == SignalStore.account().e164 || record.aci != null && record.aci == SignalStore.account().aci
-    val isReleaseChannel = record.id == SignalStore.releaseChannelValues().releaseChannelRecipientId
+    val isSelf = record.e164 != null && record.e164 == SignalStore.account.e164 || record.aci != null && record.aci == SignalStore.account.aci
+    val isReleaseChannel = record.id == SignalStore.releaseChannel.releaseChannelRecipientId
     var registeredState = record.registered
 
     if (isSelf) {
-      registeredState = if (SignalStore.account().isRegistered && !TextSecurePreferences.isUnauthorizedReceived(context)) {
+      registeredState = if (SignalStore.account.isRegistered && !TextSecurePreferences.isUnauthorizedReceived(context)) {
         RegisteredState.REGISTERED
       } else {
         RegisteredState.NOT_REGISTERED
@@ -162,7 +162,7 @@ object RecipientCreator {
       lastProfileFetchTime = record.lastProfileFetch,
       isSelf = isSelf,
       notificationChannelValue = record.notificationChannel,
-      unidentifiedAccessModeValue = record.unidentifiedAccessMode,
+      sealedSenderAccessModeValue = record.sealedSenderAccessMode,
       capabilities = record.capabilities,
       storageId = record.storageId,
       mentionSetting = record.mentionSetting,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java
index f7b82b8de8..3356a96306 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java
@@ -15,7 +15,7 @@
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.ThreadTable;
 import org.thoughtcrime.securesms.database.model.GroupRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupChangeBusyException;
 import org.thoughtcrime.securesms.groups.GroupChangeException;
 import org.thoughtcrime.securesms.groups.GroupChangeFailedException;
@@ -131,8 +131,8 @@ public static Optional<Integer> getSubDeviceCount(@NonNull Context context, @Non
       return Optional.empty();
     }
     try {
-      List<Integer> subSessions = ApplicationDependencies.getSignalServiceMessageSender()
-                                                         .getSubDeviceSessions(toSignalServiceAddress(context, recipient));
+      List<Integer> subSessions = AppDependencies.getSignalServiceMessageSender()
+                                                 .getSubDeviceSessions(toSignalServiceAddress(context, recipient));
       return Optional.of(subSessions.size());
     } catch (IOException e) {
       return Optional.empty();
@@ -188,12 +188,12 @@ public static void block(@NonNull Context context, @NonNull Recipient recipient)
     if (recipient.isSystemContact() || recipient.isProfileSharing() || isProfileSharedViaGroup(recipient)) {
       SignalDatabase.recipients().setProfileSharing(recipient.getId(), false);
 
-      ApplicationDependencies.getJobManager().startChain(new RefreshOwnProfileJob())
-                                             .then(new RotateProfileKeyJob())
-                                             .enqueue();
+      AppDependencies.getJobManager().startChain(new RefreshOwnProfileJob())
+                     .then(new RotateProfileKeyJob())
+                     .enqueue();
     }
 
-    ApplicationDependencies.getJobManager().add(new MultiDeviceBlockedUpdateJob());
+    AppDependencies.getJobManager().add(new MultiDeviceBlockedUpdateJob());
     StorageSyncHelper.scheduleSyncForDataChange();
   }
 
@@ -206,7 +206,7 @@ public static void unblock(@NonNull Recipient recipient) {
 
     SignalDatabase.recipients().setBlocked(recipient.getId(), false);
     SignalDatabase.recipients().setProfileSharing(recipient.getId(), true);
-    ApplicationDependencies.getJobManager().add(new MultiDeviceBlockedUpdateJob());
+    AppDependencies.getJobManager().add(new MultiDeviceBlockedUpdateJob());
     StorageSyncHelper.scheduleSyncForDataChange();
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheetRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheetRepository.kt
index 22650f7f81..148fe727aa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheetRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheetRepository.kt
@@ -9,7 +9,7 @@ import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.thoughtcrime.securesms.database.IdentityTable
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.RecipientId
 
 class AboutSheetRepository {
@@ -21,7 +21,7 @@ class AboutSheetRepository {
 
   fun getVerified(recipientId: RecipientId): Single<Boolean> {
     return Single.fromCallable {
-      val identityRecord = ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecord(recipientId)
+      val identityRecord = AppDependencies.protocolStore.aci().identities().getIdentityRecord(recipientId)
       identityRecord.isPresent && identityRecord.get().verifiedStatus == IdentityTable.VerifiedStatus.VERIFIED
     }.subscribeOn(Schedulers.io())
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java
index 1c3d80aa17..bcc9105505 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java
@@ -30,8 +30,6 @@
 import org.thoughtcrime.securesms.badges.BadgeImageView;
 import org.thoughtcrime.securesms.components.settings.DSLSettingsIcon;
 import org.thoughtcrime.securesms.components.settings.conversation.preferences.ButtonStripPreference;
-import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.FallbackPhoto80dp;
 import org.thoughtcrime.securesms.fonts.SignalSymbols;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.nicknames.NicknameActivity;
@@ -42,7 +40,6 @@
 import org.thoughtcrime.securesms.recipients.ui.about.AboutSheet;
 import org.thoughtcrime.securesms.util.BottomSheetUtil;
 import org.thoughtcrime.securesms.util.ContextUtil;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.SpanUtil;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.Util;
@@ -167,13 +164,6 @@ public void onViewCreated(@NonNull View fragmentView, @Nullable Bundle savedInst
 
     viewModel.getRecipient().observe(getViewLifecycleOwner(), recipient -> {
       interactionsContainer.setVisibility(recipient.isSelf() ? View.GONE : View.VISIBLE);
-
-      avatar.setFallbackPhotoProvider(new Recipient.FallbackPhotoProvider() {
-        @Override
-        public @NonNull FallbackContactPhoto getPhotoForLocalNumber() {
-          return new FallbackPhoto80dp(R.drawable.ic_note_80, recipient.getAvatarColor());
-        }
-      });
       avatar.displayChatAvatar(recipient);
 
       if (!recipient.isSelf()) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogRepository.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogRepository.java
index f08efa7f1b..e2528c3232 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogRepository.java
@@ -13,7 +13,7 @@
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.GroupRecord;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupChangeException;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.groups.GroupManager;
@@ -55,7 +55,7 @@ final class RecipientDialogRepository {
 
   void getIdentity(@NonNull Consumer<IdentityRecord> callback) {
     SignalExecutors.BOUNDED.execute(
-      () -> callback.accept(ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecord(recipientId).orElse(null)));
+      () -> callback.accept(AppDependencies.getProtocolStore().aci().identities().getIdentityRecord(recipientId).orElse(null)));
   }
 
   void getRecipient(@NonNull RecipientCallback recipientCallback) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/findby/FindByActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/findby/FindByActivity.kt
index 9e8f75016c..9ae4ba9985 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/findby/FindByActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/findby/FindByActivity.kt
@@ -81,7 +81,6 @@ import org.thoughtcrime.securesms.PassphraseRequiredActivity
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.app.usernamelinks.main.UsernameQrScannerActivity
 import org.thoughtcrime.securesms.invites.InviteActions
-import org.thoughtcrime.securesms.permissions.compose.Permissions
 import org.thoughtcrime.securesms.phonenumbers.PhoneNumberVisualTransformation
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.registration.util.CountryPrefix
@@ -142,13 +141,6 @@ class FindByActivity : PassphraseRequiredActivity() {
             ) {
               val context = LocalContext.current
 
-              val cameraPermissionController = Permissions.cameraPermissionHandler(
-                rationale = stringResource(id = R.string.PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera),
-                onPermissionGranted = {
-                  qrScanLauncher.launch(Unit)
-                }
-              )
-
               Content(
                 paddingValues = it,
                 state = state,
@@ -171,7 +163,7 @@ class FindByActivity : PassphraseRequiredActivity() {
                   navController.navigate("select-country-prefix")
                 },
                 onQrCodeScanClicked = {
-                  cameraPermissionController.request()
+                  qrScanLauncher.launch(Unit)
                 }
               )
             }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/LinkDeviceRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/LinkDeviceRepository.kt
deleted file mode 100644
index 199c8547dc..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/LinkDeviceRepository.kt
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.thoughtcrime.securesms.registration
-
-import android.app.Application
-import io.reactivex.rxjava3.core.Single
-import io.reactivex.rxjava3.schedulers.Schedulers
-import org.signal.core.util.Base64
-import org.signal.core.util.logging.Log
-import org.signal.libsignal.protocol.IdentityKeyPair
-import org.thoughtcrime.securesms.AppCapabilities
-import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
-import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.push.AccountManagerFactory
-import org.thoughtcrime.securesms.registration.secondary.DeviceNameCipher
-import org.thoughtcrime.securesms.util.TextSecurePreferences
-import org.whispersystems.signalservice.api.SignalServiceAccountManager
-import org.whispersystems.signalservice.api.account.AccountAttributes
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess
-import org.whispersystems.signalservice.internal.ServiceResponse
-import org.whispersystems.signalservice.internal.ServiceResponseProcessor
-import java.io.IOException
-import java.net.URLEncoder
-
-/**
- * Link a new device to an existing primary device.
- */
-class LinkDeviceRepository(private val context: Application) {
-
-  fun requestDeviceLinkCode(
-    registrationData: RegistrationData,
-    deviceName: String?
-  ): Single<LinkDeviceProgressProcessor> {
-    Log.d(TAG, "Device link requested")
-
-    val tempIdentityKey: IdentityKeyPair = IdentityKeyUtil.generateIdentityKeyPair()
-    val accountManager: SignalServiceAccountManager = AccountManagerFactory.createForDeviceLink(
-      context,
-      registrationData.password
-    )
-
-    return Single.fromCallable<ServiceResponse<LinkDeviceProgress>> {
-      try {
-        ServiceResponse.forResult(
-          LinkDeviceProgressImpl(
-            "sgnl://linkdevice?uuid=" +
-              URLEncoder.encode(accountManager.newDeviceUuid, "utf-8") +
-              "&pub_key=" +
-              URLEncoder.encode(Base64.encodeWithoutPadding(tempIdentityKey.publicKey.publicKey.serialize()), "utf-8"),
-            tempIdentityKey,
-            accountManager,
-            registrationData,
-            deviceName
-          ),
-          200, null
-        )
-      } catch (e: IOException) {
-        ServiceResponse.forExecutionError(e)
-      }
-    }.subscribeOn(Schedulers.io()).map(::LinkDeviceProgressProcessor)
-  }
-
-  fun attemptDeviceLink(
-    progress: LinkDeviceProgress
-  ): Single<LinkDeviceResponseProcessor> {
-    val progressImpl: LinkDeviceProgressImpl = progress as LinkDeviceProgressImpl
-    val tempIdentityKey: IdentityKeyPair = progressImpl.tempIdentityKey
-    val accountManager: SignalServiceAccountManager = progressImpl.accountManager
-    val registrationData: RegistrationData = progressImpl.registrationData
-    val deviceName: String? = progressImpl.deviceName
-
-    return Single.fromCallable<ServiceResponse<LinkDeviceResponse>> {
-      val ret = accountManager.getNewDeviceRegistration(tempIdentityKey)
-
-      val universalUnidentifiedAccess: Boolean = TextSecurePreferences.isUniversalUnidentifiedAccess(context)
-      val unidentifiedAccessKey: ByteArray = UnidentifiedAccess.deriveAccessKeyFrom(registrationData.profileKey)
-
-      val registrationLock: String? = ret.masterKey?.deriveRegistrationLock()
-      val encryptedDeviceName = deviceName?.let { DeviceNameCipher.encryptDeviceName(it.toByteArray(), ret.aciIdentity) }
-
-      val notDiscoverable =  SignalStore.phoneNumberPrivacy().phoneNumberDiscoverabilityMode == PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE
-
-      val accountAttributes = AccountAttributes(
-        signalingKey = null,
-        registrationId = registrationData.registrationId,
-        fetchesMessages = registrationData.isNotFcm,
-        registrationLock = registrationLock,
-        unidentifiedAccessKey = unidentifiedAccessKey,
-        unrestrictedUnidentifiedAccess = universalUnidentifiedAccess,
-        capabilities = AppCapabilities.getCapabilities(true),
-        discoverableByPhoneNumber = !notDiscoverable,
-        name = encryptedDeviceName?.let { Base64.encodeWithPadding(it) },
-        pniRegistrationId = registrationData.pniRegistrationId,
-        recoveryPassword = registrationData.recoveryPassword
-      )
-
-      val aciPreKeyCollection = RegistrationRepository.generateSignedAndLastResortPreKeys(ret.aciIdentity, SignalStore.account().aciPreKeys)
-      val pniPreKeyCollection = RegistrationRepository.generateSignedAndLastResortPreKeys(ret.pniIdentity, SignalStore.account().pniPreKeys)
-
-      val deviceId = accountManager.finishNewDeviceRegistration(
-        ret.provisioningCode,
-        accountAttributes,
-        aciPreKeyCollection, pniPreKeyCollection,
-        registrationData.fcmToken
-      )
-
-      ServiceResponse.forResult(LinkDeviceResponse(deviceName, ret, deviceId, aciPreKeyCollection, pniPreKeyCollection), 200, null)
-    }.subscribeOn(Schedulers.io())
-      .onErrorReturn { t -> ServiceResponse.forExecutionError(t) }
-      .map(::LinkDeviceResponseProcessor)
-  }
-
-  companion object {
-    private val TAG = Log.tag(LinkDeviceRepository::class.java)
-  }
-
-  class LinkDeviceProgressProcessor(response: ServiceResponse<LinkDeviceProgress>) : ServiceResponseProcessor<LinkDeviceProgress>(response) {
-    fun asNewDeviceRegistrationReturnProcessor(): NewDeviceRegistrationReturnProcessor {
-      return NewDeviceRegistrationReturnProcessor(ServiceResponse.coerceError(response))
-    }
-  }
-
-  class LinkDeviceResponseProcessor(response: ServiceResponse<LinkDeviceResponse>) : ServiceResponseProcessor<LinkDeviceResponse>(response) {
-    fun asNewDeviceRegistrationReturnProcessor(): NewDeviceRegistrationReturnProcessor {
-      return NewDeviceRegistrationReturnProcessor(ServiceResponse.coerceError(response))
-    }
-  }
-
-  class NewDeviceRegistrationReturnProcessor(response: ServiceResponse<LinkDeviceResponse>) : ServiceResponseProcessor<LinkDeviceResponse>(response)
-
-  interface LinkDeviceProgress {
-    val deviceLinkCode: String
-  }
-
-  private data class LinkDeviceProgressImpl(override val deviceLinkCode: String, val tempIdentityKey: IdentityKeyPair, val accountManager: SignalServiceAccountManager, val registrationData: RegistrationData, val deviceName: String?) : LinkDeviceProgress
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/LinkDeviceResponse.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/LinkDeviceResponse.kt
deleted file mode 100644
index 27de644ec7..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/LinkDeviceResponse.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.thoughtcrime.securesms.registration
-
-import org.whispersystems.signalservice.api.SignalServiceAccountManager
-import org.whispersystems.signalservice.api.account.PreKeyCollection
-
-data class LinkDeviceResponse(
-  val deviceName: String?,
-  val provisionData: SignalServiceAccountManager.ProvisionDecryptResult,
-  val deviceId: Int,
-  val aciPreKeys: PreKeyCollection,
-  val pniPreKeys: PreKeyCollection
-)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ReceivedSmsEvent.java b/app/src/main/java/org/thoughtcrime/securesms/registration/ReceivedSmsEvent.java
index 6f88ca36e4..6f7227c815 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/ReceivedSmsEvent.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ReceivedSmsEvent.java
@@ -4,6 +4,8 @@
 
 public final class ReceivedSmsEvent {
 
+  public static final int CODE_LENGTH = 6;
+
   private final @NonNull String code;
 
   public ReceivedSmsEvent(@NonNull String code) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationNavigationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationNavigationActivity.java
deleted file mode 100644
index 1f5b7a0c06..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationNavigationActivity.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.thoughtcrime.securesms.registration;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.lifecycle.ViewModelProvider;
-
-import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.PassphraseRequiredActivity;
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.registration.viewmodel.RegistrationViewModel;
-import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
-import org.thoughtcrime.securesms.util.DynamicTheme;
-
-public final class RegistrationNavigationActivity extends PassphraseRequiredActivity {
-
-  private static final String TAG = Log.tag(RegistrationNavigationActivity.class);
-
-  public static final String RE_REGISTRATION_EXTRA = "re_registration";
-
-  private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
-
-  private SmsRetrieverReceiver  smsRetrieverReceiver;
-  private RegistrationViewModel viewModel;
-
-  public static Intent newIntentForNewRegistration(@NonNull Context context, @Nullable Intent originalIntent) {
-    Intent intent = new Intent(context, RegistrationNavigationActivity.class);
-    intent.putExtra(RE_REGISTRATION_EXTRA, false);
-
-    if (originalIntent != null) {
-      intent.setData(originalIntent.getData());
-    }
-
-    return intent;
-  }
-
-  public static Intent newIntentForReRegistration(@NonNull Context context) {
-    Intent intent = new Intent(context, RegistrationNavigationActivity.class);
-    intent.putExtra(RE_REGISTRATION_EXTRA, true);
-    return intent;
-  }
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState, boolean ready) {
-    dynamicTheme.onCreate(this);
-
-    viewModel = new ViewModelProvider(this, new RegistrationViewModel.Factory(this, isReregister(getIntent()))).get(RegistrationViewModel.class);
-
-    setContentView(R.layout.activity_registration_navigation);
-    initializeChallengeListener();
-  }
-
-  @Override
-  protected void onNewIntent(Intent intent) {
-    super.onNewIntent(intent);
-
-    viewModel.setIsReregister(isReregister(intent));
-  }
-
-  @Override
-  protected void onDestroy() {
-    super.onDestroy();
-    shutdownChallengeListener();
-  }
-
-  private boolean isReregister(@NonNull Intent intent) {
-    return intent.getBooleanExtra(RE_REGISTRATION_EXTRA, false);
-  }
-
-  private void initializeChallengeListener() {
-    smsRetrieverReceiver = new SmsRetrieverReceiver(getApplication());
-    smsRetrieverReceiver.registerReceiver();
-  }
-
-  private void shutdownChallengeListener() {
-    if (smsRetrieverReceiver != null) {
-      smsRetrieverReceiver.unregisterReceiver();
-      smsRetrieverReceiver = null;
-    }
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationRepository.java b/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationRepository.java
index 8e7ff81137..a1498d04a3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationRepository.java
@@ -22,12 +22,10 @@
 import org.thoughtcrime.securesms.database.IdentityTable;
 import org.thoughtcrime.securesms.database.RecipientTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
-import org.thoughtcrime.securesms.jobs.AllDataSyncRequestJob;
 import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
 import org.thoughtcrime.securesms.jobs.PreKeysSyncJob;
-import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob;
 import org.thoughtcrime.securesms.jobs.RotateCertificateJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.notifications.NotificationIds;
@@ -40,12 +38,9 @@
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.account.PreKeyCollection;
-import org.whispersystems.signalservice.api.account.PreKeyUpload;
-import org.whispersystems.signalservice.api.kbs.MasterKey;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.ServiceId;
-import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.Preconditions;
 import org.whispersystems.signalservice.internal.ServiceResponse;
@@ -110,7 +105,7 @@ public Single<ServiceResponse<VerifyResponse>> registerAccount(@NonNull Registra
       try {
         registerAccountInternal(registrationData, response, setRegistrationLockEnabled);
 
-        JobManager jobManager = ApplicationDependencies.getJobManager();
+        JobManager jobManager = AppDependencies.getJobManager();
         jobManager.add(new DirectoryRefreshJob(false));
         jobManager.add(new RotateCertificateJob());
 
@@ -124,89 +119,36 @@ public Single<ServiceResponse<VerifyResponse>> registerAccount(@NonNull Registra
     }).subscribeOn(Schedulers.io());
   }
 
-  public Single<ServiceResponse<LinkDeviceResponse>> registerAccountFromPrimaryDevice(@NonNull RegistrationData registrationData,
-                                                                                      @NonNull LinkDeviceResponse response)
-  {
-    return Single.<ServiceResponse<LinkDeviceResponse>>fromCallable(() -> {
-      try {
-        // We have to set the deviceId before setting the identity keys, or they will throw for not being a linked device
-        // But we also have to set the identity keys before calling registerAccountInternal, otherwise it will generate new ones when creating the prekeys
-        SignalStore.account().setDeviceId(response.getDeviceId());
-        SignalStore.account().setAciIdentityKeysFromPrimaryDevice(response.getProvisionData().getAciIdentity());
-        SignalStore.account().setPniIdentityKeyAfterChangeNumber(response.getProvisionData().getPniIdentity());
-        SignalStore.registrationValues().markNeedDownloadProfileAndAvatar();
-        registerAccountInternal(new RegistrationData(registrationData.getCode(),
-                                                     response.getProvisionData().getNumber(),
-                                                     registrationData.getPassword(),
-                                                     registrationData.getRegistrationId(),
-                                                     response.getProvisionData().getProfileKey() == null ? ProfileKeyUtil.createNew() : response.getProvisionData().getProfileKey(),
-                                                     registrationData.getFcmToken(),
-                                                     registrationData.getPniRegistrationId(),
-                                                     registrationData.getRecoveryPassword()),
-                                response.getProvisionData().getAci(),
-                                response.getProvisionData().getPni(),
-                                response.getAciPreKeys(),
-                                response.getPniPreKeys(),
-                                false,
-                                response.getDeviceId(),
-                                response.getDeviceName(),
-                                null,
-                                null,
-                                false);
-
-        JobManager jobManager = ApplicationDependencies.getJobManager();
-        jobManager.add(new RotateCertificateJob());
-        jobManager.add(new AllDataSyncRequestJob());
-        jobManager.add(new RefreshOwnProfileJob());
-
-        RotateSignedPreKeyListener.schedule(context);
-
-        return ServiceResponse.forResult(response, 200, null);
-      } catch (IOException e) {
-        return ServiceResponse.forUnknownError(e);
-      }
-    }).subscribeOn(Schedulers.io());
-  }
-
   @WorkerThread
   private void registerAccountInternal(@NonNull RegistrationData registrationData,
-                                       @NonNull ACI aci,
-                                       @NonNull PNI pni,
-                                       @Nullable PreKeyCollection aciPreKeyCollection,
-                                       @Nullable PreKeyCollection pniPreKeyCollection,
-                                       boolean hasPin,
-                                       int deviceId,
-                                       @Nullable String deviceName,
-                                       @Nullable MasterKey masterKey,
-                                       @Nullable String userPin,
+                                       @NonNull VerifyResponse response,
                                        boolean setRegistrationLockEnabled)
       throws IOException
   {
-    Preconditions.checkNotNull(aciPreKeyCollection, "Missing ACI prekey collection!");
-    Preconditions.checkNotNull(pniPreKeyCollection, "Missing PNI prekey collection!");
+    Preconditions.checkNotNull(response.getAciPreKeyCollection(), "Missing ACI prekey collection!");
+    Preconditions.checkNotNull(response.getPniPreKeyCollection(), "Missing PNI prekey collection!");
+
+    ACI     aci    = ACI.parseOrThrow(response.getVerifyAccountResponse().getUuid());
+    PNI     pni    = PNI.parseOrThrow(response.getVerifyAccountResponse().getPni());
+    boolean hasPin = response.getVerifyAccountResponse().isStorageCapable();
 
     SignalStore.account().setAci(aci);
     SignalStore.account().setPni(pni);
-    SignalStore.account().setDeviceId(deviceId);
-    SignalStore.account().setDeviceName(deviceName);
-    if (deviceId != SignalServiceAddress.DEFAULT_DEVICE_ID) {
-      TextSecurePreferences.setMultiDevice(context, true);
-    }
 
-    ApplicationDependencies.resetProtocolStores();
+    AppDependencies.resetProtocolStores();
 
-    ApplicationDependencies.getProtocolStore().aci().sessions().archiveAllSessions();
-    ApplicationDependencies.getProtocolStore().pni().sessions().archiveAllSessions();
+    AppDependencies.getProtocolStore().aci().sessions().archiveAllSessions();
+    AppDependencies.getProtocolStore().pni().sessions().archiveAllSessions();
     SenderKeyUtil.clearAllState();
 
-    SignalServiceAccountDataStoreImpl aciProtocolStore = ApplicationDependencies.getProtocolStore().aci();
+    SignalServiceAccountDataStoreImpl aciProtocolStore = AppDependencies.getProtocolStore().aci();
     PreKeyMetadataStore               aciMetadataStore = SignalStore.account().aciPreKeys();
 
-    SignalServiceAccountDataStoreImpl pniProtocolStore = ApplicationDependencies.getProtocolStore().pni();
+    SignalServiceAccountDataStoreImpl pniProtocolStore = AppDependencies.getProtocolStore().pni();
     PreKeyMetadataStore               pniMetadataStore = SignalStore.account().pniPreKeys();
 
-    storeSignedAndLastResortPreKeys(aciProtocolStore, aciMetadataStore, aciPreKeyCollection);
-    storeSignedAndLastResortPreKeys(pniProtocolStore, pniMetadataStore, pniPreKeyCollection);
+    storeSignedAndLastResortPreKeys(aciProtocolStore, aciMetadataStore, response.getAciPreKeyCollection());
+    storeSignedAndLastResortPreKeys(pniProtocolStore, pniMetadataStore, response.getPniPreKeyCollection());
 
     RecipientTable recipientTable = SignalDatabase.recipients();
     RecipientId    selfId         = Recipient.trustedPush(aci, pni, registrationData.getE164()).getId();
@@ -216,7 +158,7 @@ private void registerAccountInternal(@NonNull RegistrationData registrationData,
     recipientTable.linkIdsForSelf(aci, pni, registrationData.getE164());
     recipientTable.setProfileKey(selfId, registrationData.getProfileKey());
 
-    ApplicationDependencies.getRecipientCache().clearSelf();
+    AppDependencies.getRecipientCache().clearSelf();
 
     SignalStore.account().setE164(registrationData.getE164());
     SignalStore.account().setFcmToken(registrationData.getFcmToken());
@@ -232,36 +174,12 @@ private void registerAccountInternal(@NonNull RegistrationData registrationData,
     TextSecurePreferences.setUnauthorizedReceived(context, false);
     NotificationManagerCompat.from(context).cancel(NotificationIds.UNREGISTERED_NOTIFICATION_ID);
 
-    SvrRepository.onRegistrationComplete(masterKey, userPin, hasPin, setRegistrationLockEnabled);
+    SvrRepository.onRegistrationComplete(response.getMasterKey(), response.getPin(), hasPin, setRegistrationLockEnabled, SignalStore.account().isLinkedDevice());
 
-    ApplicationDependencies.closeConnections();
-    ApplicationDependencies.getIncomingMessageObserver();
+    AppDependencies.resetNetwork(true);
     PreKeysSyncJob.enqueue();
   }
 
-  @WorkerThread
-  private void registerAccountInternal(@NonNull RegistrationData registrationData,
-                                       @NonNull VerifyResponse response,
-                                       boolean setRegistrationLockEnabled)
-      throws IOException
-  {
-    SignalStore.registrationValues().clearNeedDownloadProfile();
-    SignalStore.registrationValues().clearNeedDownloadProfileAvatar();
-    registerAccountInternal(
-        registrationData,
-        ACI.parseOrThrow(response.getVerifyAccountResponse().getUuid()),
-        PNI.parseOrThrow(response.getVerifyAccountResponse().getPni()),
-        response.getAciPreKeyCollection(),
-        response.getPniPreKeyCollection(),
-        response.getVerifyAccountResponse().isStorageCapable(),
-        SignalServiceAddress.DEFAULT_DEVICE_ID,
-        null,
-        response.getMasterKey(),
-        response.getPin(),
-        setRegistrationLockEnabled
-    );
-  }
-
   public static PreKeyCollection generateSignedAndLastResortPreKeys(IdentityKeyPair identity, PreKeyMetadataStore metadataStore) {
     SignedPreKeyRecord      signedPreKey          = PreKeyUtil.generateSignedPreKey(metadataStore.getNextSignedPreKeyId(), identity.getPrivateKey());
     KyberPreKeyRecord       lastResortKyberPreKey = PreKeyUtil.generateLastResortKyberPreKey(metadataStore.getNextKyberPreKeyId(), identity.getPrivateKey());
@@ -314,7 +232,7 @@ public Single<BackupAuthCheckProcessor> getSvrAuthCredential(@NonNull Registrati
                          .map(BackupAuthCheckProcessor::new)
                          .doOnSuccess(processor -> {
                            Log.d(TAG, "Received SVR backup auth credential response.");
-                           if (SignalStore.svr().removeAuthTokens(processor.getInvalid())) {
+                           if (SignalStore.svr().removeSvr2AuthTokens(processor.getInvalid())) {
                              new BackupManager(context).dataChanged();
                            }
                          });
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationUtil.java b/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationUtil.java
index 512e00339e..d093d555a4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationUtil.java
@@ -1,11 +1,10 @@
 package org.thoughtcrime.securesms.registration;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob;
 import org.thoughtcrime.securesms.jobs.StorageSyncJob;
-import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues;
 import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -22,25 +21,25 @@ private RegistrationUtil() {}
    * requirements are met.
    */
   public static void maybeMarkRegistrationComplete() {
-    if (!SignalStore.registrationValues().isRegistrationComplete() &&
-        SignalStore.account().isRegistered()                       &&
-        ((!Recipient.self().getProfileName().isEmpty()               &&
+    if (!SignalStore.registration().isRegistrationComplete() &&
+        SignalStore.account().isRegistered() &&
+        ((!Recipient.self().getProfileName().isEmpty() &&
           (SignalStore.svr().hasPin() || SignalStore.svr().hasOptedOut())) || SignalStore.account().isLinkedDevice()))
     {
       Log.i(TAG, "Marking registration completed.", new Throwable());
-      SignalStore.registrationValues().setRegistrationComplete();
+      SignalStore.registration().setRegistrationComplete();
 
       if (SignalStore.phoneNumberPrivacy().getPhoneNumberDiscoverabilityMode() == PhoneNumberDiscoverabilityMode.UNDECIDED) {
         Log.w(TAG, "Phone number discoverability mode is still UNDECIDED. Setting to DISCOVERABLE.");
         SignalStore.phoneNumberPrivacy().setPhoneNumberDiscoverabilityMode(PhoneNumberDiscoverabilityMode.DISCOVERABLE);
       }
 
-      ApplicationDependencies.getJobManager().startChain(new RefreshAttributesJob())
-                                             .then(new StorageSyncJob())
-                                             .then(new DirectoryRefreshJob(false))
-                                             .enqueue();
+      AppDependencies.getJobManager().startChain(new RefreshAttributesJob())
+                     .then(new StorageSyncJob())
+                     .then(new DirectoryRefreshJob(false))
+                     .enqueue();
 
-    } else if (!SignalStore.registrationValues().isRegistrationComplete()) {
+    } else if (!SignalStore.registration().isRegistrationComplete()) {
       Log.i(TAG, "Registration is not yet complete.", new Throwable());
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyAccountRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyAccountRepository.kt
index 391c5ec7a9..e028a7ae94 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyAccountRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyAccountRepository.kt
@@ -180,20 +180,20 @@ class VerifyAccountRepository(private val context: Application) {
       unidentifiedAccessKey = unidentifiedAccessKey,
       unrestrictedUnidentifiedAccess = universalUnidentifiedAccess,
       capabilities = AppCapabilities.getCapabilities(true),
-      discoverableByPhoneNumber = SignalStore.phoneNumberPrivacy().phoneNumberDiscoverabilityMode == PhoneNumberDiscoverabilityMode.DISCOVERABLE,
+      discoverableByPhoneNumber = SignalStore.phoneNumberPrivacy.phoneNumberDiscoverabilityMode == PhoneNumberDiscoverabilityMode.DISCOVERABLE,
       name = null,
       pniRegistrationId = registrationData.pniRegistrationId,
       recoveryPassword = registrationData.recoveryPassword
     )
 
-    SignalStore.account().generateAciIdentityKeyIfNecessary()
-    val aciIdentity: IdentityKeyPair = SignalStore.account().aciIdentityKey
+    SignalStore.account.generateAciIdentityKeyIfNecessary()
+    val aciIdentity: IdentityKeyPair = SignalStore.account.aciIdentityKey
 
-    SignalStore.account().generatePniIdentityKeyIfNecessary()
-    val pniIdentity: IdentityKeyPair = SignalStore.account().pniIdentityKey
+    SignalStore.account.generatePniIdentityKeyIfNecessary()
+    val pniIdentity: IdentityKeyPair = SignalStore.account.pniIdentityKey
 
-    val aciPreKeyCollection = RegistrationRepository.generateSignedAndLastResortPreKeys(aciIdentity, SignalStore.account().aciPreKeys)
-    val pniPreKeyCollection = RegistrationRepository.generateSignedAndLastResortPreKeys(pniIdentity, SignalStore.account().pniPreKeys)
+    val aciPreKeyCollection = RegistrationRepository.generateSignedAndLastResortPreKeys(aciIdentity, SignalStore.account.aciPreKeys)
+    val pniPreKeyCollection = RegistrationRepository.generateSignedAndLastResortPreKeys(pniIdentity, SignalStore.account.pniPreKeys)
 
     return Single.fromCallable {
       val response = accountManager.registerAccount(sessionId, registrationData.recoveryPassword, accountAttributes, aciPreKeyCollection, pniPreKeyCollection, registrationData.fcmToken, true)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyResponseProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyResponseProcessor.kt
index 43ffaae3ec..44be9a2311 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyResponseProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyResponseProcessor.kt
@@ -21,7 +21,7 @@ sealed class VerifyResponseProcessor(response: ServiceResponse<VerifyResponse>)
     get() {
       return error?.let {
         if (it is LockedException) {
-          SvrAuthCredentialSet(it.svr1Credentials, it.svr2Credentials)
+          SvrAuthCredentialSet(svr2Credentials = it.svr2Credentials, svr3Credentials = it.svr3Credentials)
         } else {
           null
         }
@@ -65,7 +65,7 @@ sealed class VerifyResponseProcessor(response: ServiceResponse<VerifyResponse>)
  */
 class VerifyResponseWithoutKbs(response: ServiceResponse<VerifyResponse>) : VerifyResponseProcessor(response) {
   override fun isRegistrationLockPresentAndSvrExhausted(): Boolean {
-    return registrationLock() && getLockedException().svr1Credentials == null && getLockedException().svr2Credentials == null
+    return registrationLock() && getLockedException().svr2Credentials == null
   }
 }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/data/LinkDeviceRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/LinkDeviceRepository.kt
new file mode 100644
index 0000000000..1ed8e7f428
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/LinkDeviceRepository.kt
@@ -0,0 +1,129 @@
+package org.thoughtcrime.securesms.registration.data
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.signal.core.util.Base64
+import org.signal.libsignal.protocol.IdentityKey
+import org.signal.libsignal.protocol.IdentityKeyPair
+import org.signal.libsignal.zkgroup.profiles.ProfileKey
+import org.thoughtcrime.securesms.AppCapabilities
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.push.AccountManagerFactory
+import org.thoughtcrime.securesms.registration.RegistrationRepository
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository.AccountRegistrationResult
+import org.thoughtcrime.securesms.registration.data.network.DeviceUuidRequestResult
+import org.thoughtcrime.securesms.registration.data.network.RegisterAccountResult
+import org.thoughtcrime.securesms.registration.secondary.DeviceNameCipher
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.whispersystems.signalservice.api.NetworkResult
+import org.whispersystems.signalservice.api.SignalServiceAccountManager
+import org.whispersystems.signalservice.api.account.AccountAttributes
+import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess
+import java.net.URLEncoder
+
+class LinkDeviceRepository(password: String) {
+
+  private val context = AppDependencies.application
+
+  private val accountManager: SignalServiceAccountManager =
+    AccountManagerFactory.getInstance().createForDeviceLink(context, password)
+
+  suspend fun requestDeviceLinkUuid(): DeviceUuidRequestResult =
+    withContext(Dispatchers.IO) {
+      val uuid = NetworkResult.fromFetch {
+        accountManager.requestNewDeviceUuid()
+      }
+      return@withContext DeviceUuidRequestResult.from(uuid)
+    }
+
+  fun deviceLinkUrl(deviceUuid: String, devicePublicKey: IdentityKey): String =
+    with(StringBuilder()) {
+      append("sgnl://linkdevice?uuid=")
+      append(
+        URLEncoder.encode(deviceUuid, "utf-8")
+      )
+      append("&pub_key=")
+      append(
+        URLEncoder.encode(
+          Base64.encodeWithoutPadding(devicePublicKey.publicKey.serialize()), "utf-8"
+        )
+      )
+      toString()
+    }
+
+  suspend fun attemptDeviceLink(
+    deviceKeyPair: IdentityKeyPair,
+    deviceName: String,
+    profileKey: ProfileKey,
+    registrationId: Int,
+    pniRegistrationId: Int,
+    fcmToken: String?
+  ): RegisterAccountResult =
+    withContext(Dispatchers.IO) {
+      val result = NetworkResult.fromFetch {
+        accountManager.getNewDeviceRegistration(deviceKeyPair)
+      }.then { registration ->
+        val universalUnidentifiedAccess: Boolean = TextSecurePreferences.isUniversalUnidentifiedAccess(context)
+        val unidentifiedAccessKey: ByteArray = UnidentifiedAccess.deriveAccessKeyFrom(profileKey)
+
+        val registrationLock = registration.masterKey?.deriveRegistrationLock()
+        val encryptedDeviceName = DeviceNameCipher.encryptDeviceName(deviceName.toByteArray(), registration.aciIdentity)
+
+        val notDiscoverable = SignalStore.phoneNumberPrivacy.phoneNumberDiscoverabilityMode == PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE
+
+        val accountAttributes = AccountAttributes(
+          signalingKey = null,
+          registrationId = registrationId,
+          fetchesMessages = fcmToken.isNullOrBlank(),
+          registrationLock = registrationLock,
+          unidentifiedAccessKey = unidentifiedAccessKey,
+          unrestrictedUnidentifiedAccess = universalUnidentifiedAccess,
+          capabilities = AppCapabilities.getCapabilities(true),
+          discoverableByPhoneNumber = !notDiscoverable,
+          name = Base64.encodeWithPadding(encryptedDeviceName),
+          pniRegistrationId = pniRegistrationId,
+          recoveryPassword = null
+        )
+
+        val aciPreKeyCollection = RegistrationRepository.generateSignedAndLastResortPreKeys(
+          registration.aciIdentity, SignalStore.account.aciPreKeys
+        )
+        val pniPreKeyCollection = RegistrationRepository.generateSignedAndLastResortPreKeys(
+          registration.pniIdentity, SignalStore.account.pniPreKeys
+        )
+
+        NetworkResult.fromFetch {
+          accountManager.finishNewDeviceRegistration(
+            registration.provisioningCode,
+            accountAttributes,
+            aciPreKeyCollection, pniPreKeyCollection,
+            fcmToken
+          )
+        }.map { deviceId ->
+          // We have to set the deviceId before setting the identity keys, or they will throw for not being a linked device
+          // But we also have to set the identity keys before calling registerAccountInternal, otherwise it will generate new ones when creating the prekeys
+          SignalStore.account.deviceId = deviceId
+          SignalStore.account.setDeviceName(deviceName)
+          SignalStore.account.setAciIdentityKeysFromPrimaryDevice(registration.aciIdentity)
+          SignalStore.account.setPniIdentityKeyAfterChangeNumber(registration.pniIdentity)
+          SignalStore.registration.markHasUploadedProfile()
+
+          AccountRegistrationResult(
+            uuid = registration.aci.toString(),
+            pni = registration.pni.toString(),
+            storageCapable = true,
+            number = registration.number,
+            masterKey = registration.masterKey,
+            pin = null,
+            aciPreKeyCollection = aciPreKeyCollection,
+            pniPreKeyCollection = pniPreKeyCollection
+          )
+        }
+      }
+
+      return@withContext RegisterAccountResult.from(result)
+    }
+
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/RegistrationRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/RegistrationRepository.kt
similarity index 62%
rename from app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/RegistrationRepository.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/data/RegistrationRepository.kt
index 80279e706c..81b51dc0bb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/RegistrationRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/RegistrationRepository.kt
@@ -3,14 +3,16 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registration.v2.data
+package org.thoughtcrime.securesms.registration.data
 
 import android.app.backup.BackupManager
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
+import com.google.android.gms.auth.api.phone.SmsRetriever
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
+import kotlinx.coroutines.tasks.await
 import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeoutOrNull
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.signal.core.util.Base64
@@ -26,7 +28,7 @@ import org.thoughtcrime.securesms.crypto.storage.PreKeyMetadataStore
 import org.thoughtcrime.securesms.crypto.storage.SignalServiceAccountDataStoreImpl
 import org.thoughtcrime.securesms.database.IdentityTable
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.gcm.FcmUtil
 import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob
 import org.thoughtcrime.securesms.jobs.PreKeysSyncJob
@@ -34,23 +36,27 @@ import org.thoughtcrime.securesms.jobs.RotateCertificateJob
 import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.notifications.NotificationIds
+import org.thoughtcrime.securesms.pin.Svr3Migration
 import org.thoughtcrime.securesms.pin.SvrRepository
+import org.thoughtcrime.securesms.pin.SvrWrongPinException
 import org.thoughtcrime.securesms.push.AccountManagerFactory
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.registration.PushChallengeRequest
 import org.thoughtcrime.securesms.registration.RegistrationData
 import org.thoughtcrime.securesms.registration.VerifyAccountRepository
-import org.thoughtcrime.securesms.registration.v2.data.network.BackupAuthCheckResult
-import org.thoughtcrime.securesms.registration.v2.data.network.RegistrationSessionCheckResult
-import org.thoughtcrime.securesms.registration.v2.data.network.RegistrationSessionCreationResult
-import org.thoughtcrime.securesms.registration.v2.data.network.RegistrationSessionResult
-import org.thoughtcrime.securesms.registration.v2.data.network.VerificationCodeRequestResult
+import org.thoughtcrime.securesms.registration.data.network.BackupAuthCheckResult
+import org.thoughtcrime.securesms.registration.data.network.RegisterAccountResult
+import org.thoughtcrime.securesms.registration.data.network.RegistrationSessionCheckResult
+import org.thoughtcrime.securesms.registration.data.network.RegistrationSessionCreationResult
+import org.thoughtcrime.securesms.registration.data.network.RegistrationSessionResult
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult
 import org.thoughtcrime.securesms.registration.viewmodel.SvrAuthCredentialSet
 import org.thoughtcrime.securesms.service.DirectoryRefreshListener
 import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.signalservice.api.NetworkResult
+import org.whispersystems.signalservice.api.SvrNoDataException
 import org.whispersystems.signalservice.api.account.AccountAttributes
 import org.whispersystems.signalservice.api.account.PreKeyCollection
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess
@@ -61,12 +67,16 @@ import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import org.whispersystems.signalservice.api.push.SignalServiceAddress
 import org.whispersystems.signalservice.api.registration.RegistrationApi
+import org.whispersystems.signalservice.api.svr.Svr3Credentials
 import org.whispersystems.signalservice.internal.push.AuthCredentials
+import org.whispersystems.signalservice.internal.push.PushServiceSocket
 import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataHeaders
 import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse
+import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
 import java.io.IOException
 import java.nio.charset.StandardCharsets
 import java.util.Locale
+import java.util.Optional
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 import kotlin.time.Duration.Companion.seconds
@@ -93,7 +103,7 @@ object RegistrationRepository {
    */
   @JvmStatic
   fun hasPin(): Boolean {
-    return SignalStore.svr().hasPin()
+    return SignalStore.svr.hasPin()
   }
 
   /**
@@ -102,10 +112,10 @@ object RegistrationRepository {
   @JvmStatic
   fun getRegistrationId(): Int {
     // TODO [regv2]: make creation more explicit instead of hiding it in this getter
-    var registrationId = SignalStore.account().registrationId
+    var registrationId = SignalStore.account.registrationId
     if (registrationId == 0) {
       registrationId = KeyHelper.generateRegistrationId(false)
-      SignalStore.account().registrationId = registrationId
+      SignalStore.account.registrationId = registrationId
     }
     return registrationId
   }
@@ -116,10 +126,10 @@ object RegistrationRepository {
   @JvmStatic
   fun getPniRegistrationId(): Int {
     // TODO [regv2]: make creation more explicit instead of hiding it in this getter
-    var pniRegistrationId = SignalStore.account().pniRegistrationId
+    var pniRegistrationId = SignalStore.account.pniRegistrationId
     if (pniRegistrationId == 0) {
       pniRegistrationId = KeyHelper.generateRegistrationId(false)
-      SignalStore.account().pniRegistrationId = pniRegistrationId
+      SignalStore.account.pniRegistrationId = pniRegistrationId
     }
     return pniRegistrationId
   }
@@ -151,26 +161,27 @@ object RegistrationRepository {
   @JvmStatic
   suspend fun registerAccountLocally(context: Context, registrationData: RegistrationData, response: AccountRegistrationResult, reglockEnabled: Boolean) =
     withContext(Dispatchers.IO) {
+      Log.v(TAG, "registerAccountLocally()")
       val aciPreKeyCollection: PreKeyCollection = response.aciPreKeyCollection
       val pniPreKeyCollection: PreKeyCollection = response.pniPreKeyCollection
       val aci: ACI = ACI.parseOrThrow(response.uuid)
       val pni: PNI = PNI.parseOrThrow(response.pni)
       val hasPin: Boolean = response.storageCapable
 
-      SignalStore.account().setAci(aci)
-      SignalStore.account().setPni(pni)
+      SignalStore.account.setAci(aci)
+      SignalStore.account.setPni(pni)
 
-      ApplicationDependencies.resetProtocolStores()
+      AppDependencies.resetProtocolStores()
 
-      ApplicationDependencies.getProtocolStore().aci().sessions().archiveAllSessions()
-      ApplicationDependencies.getProtocolStore().pni().sessions().archiveAllSessions()
+      AppDependencies.protocolStore.aci().sessions().archiveAllSessions()
+      AppDependencies.protocolStore.pni().sessions().archiveAllSessions()
       SenderKeyUtil.clearAllState()
 
-      val aciProtocolStore = ApplicationDependencies.getProtocolStore().aci()
-      val aciMetadataStore = SignalStore.account().aciPreKeys
+      val aciProtocolStore = AppDependencies.protocolStore.aci()
+      val aciMetadataStore = SignalStore.account.aciPreKeys
 
-      val pniProtocolStore = ApplicationDependencies.getProtocolStore().pni()
-      val pniMetadataStore = SignalStore.account().pniPreKeys
+      val pniProtocolStore = AppDependencies.protocolStore.pni()
+      val pniMetadataStore = SignalStore.account.pniPreKeys
 
       storeSignedAndLastResortPreKeys(aciProtocolStore, aciMetadataStore, aciPreKeyCollection)
       storeSignedAndLastResortPreKeys(pniProtocolStore, pniMetadataStore, pniPreKeyCollection)
@@ -183,29 +194,28 @@ object RegistrationRepository {
       recipientTable.linkIdsForSelf(aci, pni, registrationData.e164)
       recipientTable.setProfileKey(selfId, registrationData.profileKey)
 
-      ApplicationDependencies.getRecipientCache().clearSelf()
+      AppDependencies.recipientCache.clearSelf()
 
-      SignalStore.account().setE164(registrationData.e164)
-      SignalStore.account().fcmToken = registrationData.fcmToken
-      SignalStore.account().fcmEnabled = registrationData.isFcm
+      SignalStore.account.setE164(registrationData.e164)
+      SignalStore.account.fcmToken = registrationData.fcmToken
+      SignalStore.account.fcmEnabled = registrationData.isFcm
 
       val now = System.currentTimeMillis()
       saveOwnIdentityKey(selfId, aci, aciProtocolStore, now)
       saveOwnIdentityKey(selfId, pni, pniProtocolStore, now)
 
-      SignalStore.account().setServicePassword(registrationData.password)
-      SignalStore.account().setRegistered(true)
+      SignalStore.account.setServicePassword(registrationData.password)
+      SignalStore.account.setRegistered(true)
       TextSecurePreferences.setPromptedPushRegistration(context, true)
       TextSecurePreferences.setUnauthorizedReceived(context, false)
       NotificationManagerCompat.from(context).cancel(NotificationIds.UNREGISTERED_NOTIFICATION_ID)
 
-      SvrRepository.onRegistrationComplete(response.masterKey, response.pin, hasPin, reglockEnabled)
+      SvrRepository.onRegistrationComplete(response.masterKey, response.pin, hasPin, reglockEnabled, isLinkedDevice = SignalStore.account.isLinkedDevice)
 
-      ApplicationDependencies.closeConnections()
-      ApplicationDependencies.getIncomingMessageObserver()
+      AppDependencies.resetNetwork(restartMessageObserver = true)
       PreKeysSyncJob.enqueue()
 
-      val jobManager = ApplicationDependencies.getJobManager()
+      val jobManager = AppDependencies.jobManager
       jobManager.add(DirectoryRefreshJob(false))
       jobManager.add(RotateCertificateJob())
 
@@ -239,20 +249,21 @@ object RegistrationRepository {
   }
 
   fun canUseLocalRecoveryPassword(): Boolean {
-    val recoveryPassword = SignalStore.svr().recoveryPassword
-    val pinHash = SignalStore.svr().localPinHash
+    val recoveryPassword = SignalStore.svr.recoveryPassword
+    val pinHash = SignalStore.svr.localPinHash
     return recoveryPassword != null && pinHash != null
   }
 
   fun doesPinMatchLocalHash(pin: String): Boolean {
-    val pinHash = SignalStore.svr().localPinHash ?: throw IllegalStateException("Local PIN hash is not present!")
+    val pinHash = SignalStore.svr.localPinHash ?: throw IllegalStateException("Local PIN hash is not present!")
     return PinHashUtil.verifyLocalPinHash(pinHash, pin)
   }
 
-  suspend fun fetchMasterKeyFromSvrRemote(pin: String, authCredentials: AuthCredentials): MasterKey =
+  suspend fun fetchMasterKeyFromSvrRemote(pin: String, svr2Credentials: AuthCredentials?, svr3Credentials: Svr3Credentials?): MasterKey =
     withContext(Dispatchers.IO) {
-      val masterKey = SvrRepository.restoreMasterKeyPreRegistration(SvrAuthCredentialSet(null, authCredentials), pin)
-      SignalStore.svr().setMasterKey(masterKey, pin)
+      val credentialSet = SvrAuthCredentialSet(svr2Credentials = svr2Credentials, svr3Credentials = svr3Credentials)
+      val masterKey = SvrRepository.restoreMasterKeyPreRegistration(credentialSet, pin)
+      SignalStore.svr.setMasterKey(masterKey, pin)
       return@withContext masterKey
     }
 
@@ -262,6 +273,7 @@ object RegistrationRepository {
   suspend fun validateSession(context: Context, sessionId: String, e164: String, password: String): RegistrationSessionCheckResult =
     withContext(Dispatchers.IO) {
       val api: RegistrationApi = AccountManagerFactory.getInstance().createUnauthenticated(context, e164, SignalServiceAddress.DEFAULT_DEVICE_ID, password).registrationApi
+      Log.d(TAG, "Validating registration session with service.")
       val registrationSessionResult = api.getRegistrationSessionStatus(sessionId)
       return@withContext RegistrationSessionCheckResult.from(registrationSessionResult)
     }
@@ -271,18 +283,22 @@ object RegistrationRepository {
    */
   suspend fun createSession(context: Context, e164: String, password: String, mcc: String?, mnc: String?): RegistrationSessionCreationResult =
     withContext(Dispatchers.IO) {
+      Log.d(TAG, "About to create a registration session…")
       val fcmToken: String? = FcmUtil.getToken(context).orElse(null)
       val api: RegistrationApi = AccountManagerFactory.getInstance().createUnauthenticated(context, e164, SignalServiceAddress.DEFAULT_DEVICE_ID, password).registrationApi
 
       val registrationSessionResult = if (fcmToken == null) {
+        Log.d(TAG, "Creating registration session without FCM token.")
         api.createRegistrationSession(null, mcc, mnc)
       } else {
+        Log.d(TAG, "Creating registration session with FCM token.")
         createSessionAndBlockForPushChallenge(api, fcmToken, mcc, mnc)
       }
       val result = RegistrationSessionCreationResult.from(registrationSessionResult)
       if (result is RegistrationSessionCreationResult.Success) {
-        SignalStore.registrationValues().sessionId = result.getMetadata().body.id
-        SignalStore.registrationValues().sessionE164 = e164
+        Log.d(TAG, "Updating registration session and E164 in value store.")
+        SignalStore.registration.sessionId = result.getMetadata().body.id
+        SignalStore.registration.sessionE164 = e164
       }
 
       return@withContext result
@@ -292,10 +308,21 @@ object RegistrationRepository {
    * Validates an existing session, if its ID is provided. If the session is expired/invalid, or none is provided, it will attempt to initiate a new session.
    */
   suspend fun createOrValidateSession(context: Context, sessionId: String?, e164: String, password: String, mcc: String?, mnc: String?): RegistrationSessionResult {
-    if (sessionId != null) {
-      val sessionValidationResult = validateSession(context, sessionId, e164, password)
+    val savedSessionId = if (sessionId == null && e164 == SignalStore.registration.sessionE164) {
+      SignalStore.registration.sessionId
+    } else {
+      sessionId
+    }
+
+    if (savedSessionId != null) {
+      Log.d(TAG, "Validating existing registration session.")
+      val sessionValidationResult = validateSession(context, savedSessionId, e164, password)
       when (sessionValidationResult) {
-        is RegistrationSessionCheckResult.Success -> return sessionValidationResult
+        is RegistrationSessionCheckResult.Success -> {
+          Log.d(TAG, "Existing registration session is valid.")
+          return sessionValidationResult
+        }
+
         is RegistrationSessionCheckResult.UnknownError -> {
           Log.w(TAG, "Encountered error when validating existing session.", sessionValidationResult.getCause())
           return sessionValidationResult
@@ -313,19 +340,11 @@ object RegistrationRepository {
   /**
    * Asks the service to send a verification code through one of our supported channels (SMS, phone call).
    */
-  suspend fun requestSmsCode(context: Context, sessionId: String, e164: String, password: String, mode: Mode = Mode.SMS_WITHOUT_LISTENER): VerificationCodeRequestResult =
+  suspend fun requestSmsCode(context: Context, sessionId: String, e164: String, password: String, mode: Mode): VerificationCodeRequestResult =
     withContext(Dispatchers.IO) {
       val api: RegistrationApi = AccountManagerFactory.getInstance().createUnauthenticated(context, e164, SignalServiceAddress.DEFAULT_DEVICE_ID, password).registrationApi
 
-      // TODO [regv2]: support other verification code [Mode] options
-      val codeRequestResult = if (mode == Mode.PHONE_CALL) {
-        // TODO [regv2]
-        val notImplementedError = NotImplementedError()
-        Log.w(TAG, "Not yet implemented!", notImplementedError)
-        NetworkResult.ApplicationError(notImplementedError)
-      } else {
-        api.requestSmsVerificationCode(sessionId, Locale.getDefault(), mode.isSmsRetrieverSupported)
-      }
+      val codeRequestResult = api.requestSmsVerificationCode(sessionId, Locale.getDefault(), mode.isSmsRetrieverSupported, mode.transport)
 
       return@withContext VerificationCodeRequestResult.from(codeRequestResult)
     }
@@ -333,33 +352,53 @@ object RegistrationRepository {
   /**
    * Submits the user-entered verification code to the service.
    */
-  suspend fun submitVerificationCode(context: Context, e164: String, password: String, sessionId: String, registrationData: RegistrationData): NetworkResult<RegistrationSessionMetadataResponse> =
+  suspend fun submitVerificationCode(context: Context, sessionId: String, registrationData: RegistrationData): VerificationCodeRequestResult =
     withContext(Dispatchers.IO) {
-      val api: RegistrationApi = AccountManagerFactory.getInstance().createUnauthenticated(context, e164, SignalServiceAddress.DEFAULT_DEVICE_ID, password).registrationApi
-      api.verifyAccount(sessionId = sessionId, verificationCode = registrationData.code)
+      val api: RegistrationApi = AccountManagerFactory.getInstance().createUnauthenticated(context, registrationData.e164, SignalServiceAddress.DEFAULT_DEVICE_ID, registrationData.password).registrationApi
+      val result = api.verifyAccount(sessionId = sessionId, verificationCode = registrationData.code)
+      return@withContext VerificationCodeRequestResult.from(result)
     }
 
   /**
    * Submits the solved captcha token to the service.
    */
-  suspend fun submitCaptchaToken(context: Context, e164: String, password: String, sessionId: String, captchaToken: String) =
+  suspend fun submitCaptchaToken(context: Context, e164: String, password: String, sessionId: String, captchaToken: String): VerificationCodeRequestResult =
     withContext(Dispatchers.IO) {
       val api: RegistrationApi = AccountManagerFactory.getInstance().createUnauthenticated(context, e164, SignalServiceAddress.DEFAULT_DEVICE_ID, password).registrationApi
       val captchaSubmissionResult = api.submitCaptchaToken(sessionId = sessionId, captchaToken = captchaToken)
       return@withContext VerificationCodeRequestResult.from(captchaSubmissionResult)
     }
 
+  suspend fun requestAndVerifyPushToken(context: Context, sessionId: String, e164: String, password: String) =
+    withContext(Dispatchers.IO) {
+      val fcmToken = getFcmToken(context)
+      val accountManager = AccountManagerFactory.getInstance().createUnauthenticated(context, e164, SignalServiceAddress.DEFAULT_DEVICE_ID, password)
+      val pushChallenge = PushChallengeRequest.getPushChallengeBlocking(accountManager, sessionId, Optional.ofNullable(fcmToken), PUSH_REQUEST_TIMEOUT).orElse(null)
+      val pushSubmissionResult = accountManager.registrationApi.submitPushChallengeToken(sessionId = sessionId, pushChallengeToken = pushChallenge)
+      return@withContext VerificationCodeRequestResult.from(pushSubmissionResult)
+    }
+
   /**
    * Submit the necessary assets as a verified account so that the user can actually use the service.
    */
-  suspend fun registerAccount(context: Context, sessionId: String?, registrationData: RegistrationData, pin: String? = null, masterKeyProducer: VerifyAccountRepository.MasterKeyProducer? = null): NetworkResult<AccountRegistrationResult> =
+  suspend fun registerAccount(context: Context, sessionId: String?, registrationData: RegistrationData, pin: String? = null, masterKeyProducer: VerifyAccountRepository.MasterKeyProducer? = null): RegisterAccountResult =
     withContext(Dispatchers.IO) {
       val api: RegistrationApi = AccountManagerFactory.getInstance().createUnauthenticated(context, registrationData.e164, SignalServiceAddress.DEFAULT_DEVICE_ID, registrationData.password).registrationApi
 
       val universalUnidentifiedAccess: Boolean = TextSecurePreferences.isUniversalUnidentifiedAccess(context)
       val unidentifiedAccessKey: ByteArray = UnidentifiedAccess.deriveAccessKeyFrom(registrationData.profileKey)
 
-      val masterKey: MasterKey? = masterKeyProducer?.produceMasterKey()
+      val masterKey: MasterKey?
+      try {
+        masterKey = masterKeyProducer?.produceMasterKey()
+      } catch (e: SvrNoDataException) {
+        return@withContext RegisterAccountResult.SvrNoData(e)
+      } catch (e: SvrWrongPinException) {
+        return@withContext RegisterAccountResult.SvrWrongPin(e)
+      } catch (e: IOException) {
+        return@withContext RegisterAccountResult.UnknownError(e)
+      }
+
       val registrationLock: String? = masterKey?.deriveRegistrationLock()
 
       val accountAttributes = AccountAttributes(
@@ -370,23 +409,23 @@ object RegistrationRepository {
         unidentifiedAccessKey = unidentifiedAccessKey,
         unrestrictedUnidentifiedAccess = universalUnidentifiedAccess,
         capabilities = AppCapabilities.getCapabilities(true),
-        discoverableByPhoneNumber = SignalStore.phoneNumberPrivacy().phoneNumberDiscoverabilityMode == PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode.DISCOVERABLE,
+        discoverableByPhoneNumber = SignalStore.phoneNumberPrivacy.phoneNumberDiscoverabilityMode == PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode.DISCOVERABLE,
         name = null,
         pniRegistrationId = registrationData.pniRegistrationId,
         recoveryPassword = registrationData.recoveryPassword
       )
 
-      SignalStore.account().generateAciIdentityKeyIfNecessary()
-      val aciIdentity: IdentityKeyPair = SignalStore.account().aciIdentityKey
+      SignalStore.account.generateAciIdentityKeyIfNecessary()
+      val aciIdentity: IdentityKeyPair = SignalStore.account.aciIdentityKey
 
-      SignalStore.account().generatePniIdentityKeyIfNecessary()
-      val pniIdentity: IdentityKeyPair = SignalStore.account().pniIdentityKey
+      SignalStore.account.generatePniIdentityKeyIfNecessary()
+      val pniIdentity: IdentityKeyPair = SignalStore.account.pniIdentityKey
 
-      val aciPreKeyCollection = org.thoughtcrime.securesms.registration.RegistrationRepository.generateSignedAndLastResortPreKeys(aciIdentity, SignalStore.account().aciPreKeys)
-      val pniPreKeyCollection = org.thoughtcrime.securesms.registration.RegistrationRepository.generateSignedAndLastResortPreKeys(pniIdentity, SignalStore.account().pniPreKeys)
+      val aciPreKeyCollection = org.thoughtcrime.securesms.registration.RegistrationRepository.generateSignedAndLastResortPreKeys(aciIdentity, SignalStore.account.aciPreKeys)
+      val pniPreKeyCollection = org.thoughtcrime.securesms.registration.RegistrationRepository.generateSignedAndLastResortPreKeys(pniIdentity, SignalStore.account.pniPreKeys)
 
-      api.registerAccount(sessionId, registrationData.recoveryPassword, accountAttributes, aciPreKeyCollection, pniPreKeyCollection, registrationData.fcmToken, true)
-        .map { accountRegistrationResponse ->
+      val result: NetworkResult<AccountRegistrationResult> = api.registerAccount(sessionId, registrationData.recoveryPassword, accountAttributes, aciPreKeyCollection, pniPreKeyCollection, registrationData.fcmToken, true)
+        .map { accountRegistrationResponse: VerifyAccountResponse ->
           AccountRegistrationResult(
             uuid = accountRegistrationResponse.uuid,
             pni = accountRegistrationResponse.pni,
@@ -398,9 +437,11 @@ object RegistrationRepository {
             pniPreKeyCollection = pniPreKeyCollection
           )
         }
+
+      return@withContext RegisterAccountResult.from(result)
     }
 
-  suspend fun createSessionAndBlockForPushChallenge(accountManager: RegistrationApi, fcmToken: String, mcc: String?, mnc: String?): NetworkResult<RegistrationSessionMetadataResponse> =
+  private suspend fun createSessionAndBlockForPushChallenge(accountManager: RegistrationApi, fcmToken: String, mcc: String?, mnc: String?): NetworkResult<RegistrationSessionMetadataResponse> =
     withContext(Dispatchers.IO) {
       // TODO [regv2]: do not use event bus nor latch
       val subscriber = PushTokenChallengeSubscriber()
@@ -408,6 +449,7 @@ object RegistrationRepository {
       eventBus.register(subscriber)
 
       try {
+        Log.d(TAG, "Requesting a registration session with FCM token…")
         val sessionCreationResponse = accountManager.createRegistrationSession(fcmToken, mcc, mnc)
         if (sessionCreationResponse !is NetworkResult.Success) {
           return@withContext sessionCreationResponse
@@ -430,7 +472,7 @@ object RegistrationRepository {
         Log.i(TAG, "Push challenge unsuccessful. Updating registration state accordingly.")
         return@withContext NetworkResult.ApplicationError<RegistrationSessionMetadataResponse>(NullPointerException())
       } catch (ex: Exception) {
-        Log.w(TAG, "Exception caught, but the earlier try block should have caught it?", ex) // TODO [regv2]: figure out why this exception is not caught
+        Log.w(TAG, "Exception caught, but the earlier try block should have caught it?", ex)
         return@withContext NetworkResult.ApplicationError<RegistrationSessionMetadataResponse>(ex)
       }
     }
@@ -447,30 +489,55 @@ object RegistrationRepository {
 
   suspend fun hasValidSvrAuthCredentials(context: Context, e164: String, password: String): BackupAuthCheckResult =
     withContext(Dispatchers.IO) {
-      val usernamePasswords = async { retrieveLocalSvrCredentials() }
       val api: RegistrationApi = AccountManagerFactory.getInstance().createUnauthenticated(context, e164, SignalServiceAddress.DEFAULT_DEVICE_ID, password).registrationApi
 
-      val result = api.getSvrAuthCredential(e164, usernamePasswords.await())
-        .runIfSuccessful {
-          val removedInvalidTokens = SignalStore.svr().removeAuthTokens(it.invalid)
-          if (removedInvalidTokens) {
-            BackupManager(context).dataChanged()
-          }
+      val svr3Result = SignalStore.svr.svr3AuthTokens
+        ?.takeIf { Svr3Migration.shouldReadFromSvr3 }
+        ?.takeIf { it.isNotEmpty() }
+        ?.toSvrCredentials()
+        ?.let { authTokens ->
+          api
+            .validateSvr3AuthCredential(e164, authTokens)
+            .runIfSuccessful {
+              val removedInvalidTokens = SignalStore.svr.removeSvr3AuthTokens(it.invalid)
+              if (removedInvalidTokens) {
+                BackupManager(context).dataChanged()
+              }
+            }
+            .let { BackupAuthCheckResult.fromV3(it) }
         }
 
-      return@withContext BackupAuthCheckResult.from(result)
+      if (svr3Result is BackupAuthCheckResult.SuccessWithCredentials) {
+        Log.d(TAG, "Found valid SVR3 credentials.")
+        return@withContext svr3Result
+      }
+
+      Log.d(TAG, "No valid SVR3 credentials, looking for SVR2.")
+
+      return@withContext SignalStore.svr.svr2AuthTokens
+        ?.takeIf { it.isNotEmpty() }
+        ?.toSvrCredentials()
+        ?.let { authTokens ->
+          api
+            .validateSvr2AuthCredential(e164, authTokens)
+            .runIfSuccessful {
+              val removedInvalidTokens = SignalStore.svr.removeSvr2AuthTokens(it.invalid)
+              if (removedInvalidTokens) {
+                BackupManager(context).dataChanged()
+              }
+            }
+            .let { BackupAuthCheckResult.fromV2(it) }
+        } ?: BackupAuthCheckResult.SuccessWithoutCredentials()
     }
 
-  private suspend fun retrieveLocalSvrCredentials(): List<String> = withContext(Dispatchers.IO) {
-    return@withContext SignalStore.svr()
-      .authTokenList
+  /** Converts the basic-auth creds we have locally into username:password pairs that are suitable for handing off to the service. */
+  private fun List<String?>.toSvrCredentials(): List<String> {
+    return this
       .asSequence()
       .filterNotNull()
-      .take<String>(10)
-      .map<String, String> {
-        it.replace("Basic ", "").trim()
-      }
-      .mapNotNull<String, ByteArray> {
+      .take(10)
+      .map { it.replace("Basic ", "").trim() }
+      .mapNotNull {
         try {
           Base64.decode(it)
         } catch (e: IOException) {
@@ -478,14 +545,41 @@ object RegistrationRepository {
           null
         }
       }
-      .map<ByteArray, String> {
-        String(it, StandardCharsets.ISO_8859_1)
-      }
+      .map { String(it, StandardCharsets.ISO_8859_1) }
       .toList()
   }
 
-  enum class Mode(val isSmsRetrieverSupported: Boolean) {
-    SMS_WITH_LISTENER(true), SMS_WITHOUT_LISTENER(false), PHONE_CALL(false)
+  /**
+   * Starts an SMS listener to auto-enter a verification code.
+   *
+   * The listener [lives for 5 minutes](https://developers.google.com/android/reference/com/google/android/gms/auth/api/phone/SmsRetrieverApi).
+   *
+   * @return whether or not the Play Services SMS Listener was successfully registered.
+   */
+  suspend fun registerSmsListener(context: Context): Boolean {
+    Log.d(TAG, "Attempting to start verification code SMS retriever.")
+    val started = withTimeoutOrNull(5.seconds.inWholeMilliseconds) {
+      try {
+        SmsRetriever.getClient(context).startSmsRetriever().await()
+        Log.d(TAG, "Successfully started verification code SMS retriever.")
+        return@withTimeoutOrNull true
+      } catch (ex: Exception) {
+        Log.w(TAG, "Could not start verification code SMS retriever due to exception.", ex)
+        return@withTimeoutOrNull false
+      }
+    }
+
+    if (started == null) {
+      Log.w(TAG, "Could not start verification code SMS retriever due to timeout.")
+    }
+
+    return started == true
+  }
+
+  enum class Mode(val isSmsRetrieverSupported: Boolean, val transport: PushServiceSocket.VerificationCodeTransport) {
+    SMS_WITH_LISTENER(true, PushServiceSocket.VerificationCodeTransport.SMS),
+    SMS_WITHOUT_LISTENER(false, PushServiceSocket.VerificationCodeTransport.SMS),
+    PHONE_CALL(false, PushServiceSocket.VerificationCodeTransport.VOICE)
   }
 
   private class PushTokenChallengeSubscriber {
@@ -494,6 +588,7 @@ object RegistrationRepository {
 
     @Subscribe
     fun onChallengeEvent(pushChallengeEvent: PushChallengeRequest.PushChallengeEvent) {
+      Log.d(TAG, "Push challenge received!")
       challenge = pushChallengeEvent.challenge
       latch.countDown()
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/BackupAuthCheckResult.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/BackupAuthCheckResult.kt
new file mode 100644
index 0000000000..9df74e2b8b
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/BackupAuthCheckResult.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.data.network
+
+import org.whispersystems.signalservice.api.NetworkResult
+import org.whispersystems.signalservice.api.svr.Svr3Credentials
+import org.whispersystems.signalservice.internal.push.AuthCredentials
+import org.whispersystems.signalservice.internal.push.BackupV2AuthCheckResponse
+import org.whispersystems.signalservice.internal.push.BackupV3AuthCheckResponse
+
+/**
+ * This is a processor to map a [BackupV2AuthCheckResponse] to all the known outcomes.
+ */
+sealed class BackupAuthCheckResult(cause: Throwable?) : RegistrationResult(cause) {
+  companion object {
+    @JvmStatic
+    fun fromV2(networkResult: NetworkResult<BackupV2AuthCheckResponse>): BackupAuthCheckResult {
+      return when (networkResult) {
+        is NetworkResult.Success -> {
+          val match = networkResult.result.match
+          if (match != null) {
+            SuccessWithCredentials(svr2Credentials = match, svr3Credentials = null)
+          } else {
+            SuccessWithoutCredentials()
+          }
+        }
+
+        is NetworkResult.ApplicationError -> UnknownError(networkResult.throwable)
+        is NetworkResult.NetworkError -> UnknownError(networkResult.exception)
+        is NetworkResult.StatusCodeError -> UnknownError(networkResult.exception)
+      }
+    }
+
+    @JvmStatic
+    fun fromV3(networkResult: NetworkResult<BackupV3AuthCheckResponse>): BackupAuthCheckResult {
+      return when (networkResult) {
+        is NetworkResult.Success -> {
+          val match = networkResult.result.match
+          if (match != null) {
+            SuccessWithCredentials(svr2Credentials = null, svr3Credentials = match)
+          } else {
+            SuccessWithoutCredentials()
+          }
+        }
+
+        is NetworkResult.ApplicationError -> UnknownError(networkResult.throwable)
+        is NetworkResult.NetworkError -> UnknownError(networkResult.exception)
+        is NetworkResult.StatusCodeError -> UnknownError(networkResult.exception)
+      }
+    }
+  }
+
+  class SuccessWithCredentials(val svr2Credentials: AuthCredentials?, val svr3Credentials: Svr3Credentials?) : BackupAuthCheckResult(null)
+
+  class SuccessWithoutCredentials : BackupAuthCheckResult(null)
+
+  class UnknownError(cause: Throwable) : BackupAuthCheckResult(cause)
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/Challenge.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/Challenge.kt
new file mode 100644
index 0000000000..dc364b83a3
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/Challenge.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.data.network
+
+import org.signal.core.util.logging.Log
+
+enum class Challenge(val key: String) {
+  CAPTCHA("captcha"),
+  PUSH("pushChallenge");
+
+  companion object {
+    private val TAG = Log.tag(Challenge::class)
+
+    fun parse(strings: List<String>): List<Challenge> {
+      return strings.mapNotNull {
+        when (it) {
+          CAPTCHA.key -> CAPTCHA
+          PUSH.key -> PUSH
+          else -> {
+            Log.i(TAG, "Encountered unknown challenge type: $it")
+            null
+          }
+        }
+      }
+    }
+  }
+
+  fun stringify(challenges: List<Challenge>): String {
+    return challenges.joinToString { it.key }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/DeviceUuidRequestResult.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/DeviceUuidRequestResult.kt
new file mode 100644
index 0000000000..08a3de5e6f
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/DeviceUuidRequestResult.kt
@@ -0,0 +1,20 @@
+package org.thoughtcrime.securesms.registration.data.network
+
+import org.whispersystems.signalservice.api.NetworkResult
+import org.whispersystems.signalservice.internal.push.ProvisioningUuid
+
+sealed class DeviceUuidRequestResult(cause: Throwable?) : RegistrationResult(cause) {
+  companion object {
+    fun from(networkResult: NetworkResult<ProvisioningUuid>): DeviceUuidRequestResult {
+      return when (networkResult) {
+        is NetworkResult.Success -> Success(networkResult.result.uuid)
+        is NetworkResult.ApplicationError -> UnknownError(networkResult.throwable)
+        is NetworkResult.NetworkError -> UnknownError(networkResult.exception)
+        is NetworkResult.StatusCodeError -> UnknownError(networkResult.exception)
+      }
+    }
+  }
+
+  class Success(val uuid: String) : DeviceUuidRequestResult(null)
+  class UnknownError(cause: Throwable) : DeviceUuidRequestResult(cause)
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/RegisterAccountResult.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/RegisterAccountResult.kt
new file mode 100644
index 0000000000..858be7c09d
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/RegisterAccountResult.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.data.network
+
+import org.thoughtcrime.securesms.pin.SvrWrongPinException
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository
+import org.whispersystems.signalservice.api.NetworkResult
+import org.whispersystems.signalservice.api.SvrNoDataException
+import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException
+import org.whispersystems.signalservice.api.push.exceptions.IncorrectRegistrationRecoveryPasswordException
+import org.whispersystems.signalservice.api.push.exceptions.MalformedRequestException
+import org.whispersystems.signalservice.api.push.exceptions.RateLimitException
+import org.whispersystems.signalservice.api.svr.Svr3Credentials
+import org.whispersystems.signalservice.internal.push.AuthCredentials
+import org.whispersystems.signalservice.internal.push.LockedException
+import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
+
+/**
+ * This is a processor to map a [VerifyAccountResponse] to all the known outcomes.
+ */
+sealed class RegisterAccountResult(cause: Throwable?) : RegistrationResult(cause) {
+  companion object {
+    fun from(networkResult: NetworkResult<RegistrationRepository.AccountRegistrationResult>): RegisterAccountResult {
+      return when (networkResult) {
+        is NetworkResult.Success -> Success(networkResult.result)
+        is NetworkResult.ApplicationError -> UnknownError(networkResult.throwable)
+        is NetworkResult.NetworkError -> UnknownError(networkResult.exception)
+        is NetworkResult.StatusCodeError -> {
+          when (val cause = networkResult.exception) {
+            is IncorrectRegistrationRecoveryPasswordException -> IncorrectRecoveryPassword(cause)
+            is AuthorizationFailedException -> AuthorizationFailed(cause)
+            is MalformedRequestException -> MalformedRequest(cause)
+            is RateLimitException -> createRateLimitProcessor(cause)
+            is LockedException -> RegistrationLocked(cause = cause, timeRemaining = cause.timeRemaining, svr2Credentials = cause.svr2Credentials, svr3Credentials = cause.svr3Credentials)
+            else -> {
+              if (networkResult.code == 422) {
+                ValidationError(cause)
+              } else {
+                UnknownError(cause)
+              }
+            }
+          }
+        }
+      }
+    }
+
+    private fun createRateLimitProcessor(exception: RateLimitException): RegisterAccountResult {
+      return if (exception.retryAfterMilliseconds.isPresent) {
+        RateLimited(exception, exception.retryAfterMilliseconds.get())
+      } else {
+        AttemptsExhausted(exception)
+      }
+    }
+  }
+  class Success(val accountRegistrationResult: RegistrationRepository.AccountRegistrationResult) : RegisterAccountResult(null)
+  class IncorrectRecoveryPassword(cause: Throwable) : RegisterAccountResult(cause)
+  class AuthorizationFailed(cause: Throwable) : RegisterAccountResult(cause)
+  class MalformedRequest(cause: Throwable) : RegisterAccountResult(cause)
+  class ValidationError(cause: Throwable) : RegisterAccountResult(cause)
+  class RateLimited(cause: Throwable, val timeRemaining: Long) : RegisterAccountResult(cause)
+  class AttemptsExhausted(cause: Throwable) : RegisterAccountResult(cause)
+  class RegistrationLocked(cause: Throwable, val timeRemaining: Long, val svr2Credentials: AuthCredentials?, val svr3Credentials: Svr3Credentials?) : RegisterAccountResult(cause)
+  class UnknownError(cause: Throwable) : RegisterAccountResult(cause)
+
+  class SvrNoData(cause: SvrNoDataException) : RegisterAccountResult(cause)
+  class SvrWrongPin(cause: SvrWrongPinException) : RegisterAccountResult(cause) {
+    val triesRemaining = cause.triesRemaining
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/network/RegistrationResult.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/RegistrationResult.kt
similarity index 79%
rename from app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/network/RegistrationResult.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/data/network/RegistrationResult.kt
index b4b38baffa..52b9b687bd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/network/RegistrationResult.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/RegistrationResult.kt
@@ -3,7 +3,9 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registration.v2.data.network
+package org.thoughtcrime.securesms.registration.data.network
+
+import org.signal.core.util.logging.Log
 
 /**
  * This is a merging of the NetworkResult pattern and the Processor pattern of registration v1.
@@ -24,4 +26,10 @@ abstract class RegistrationResult(private val errorCause: Throwable?) {
 
     return errorCause
   }
+
+  fun logCause() {
+    errorCause?.let {
+      Log.w(Log.tag(this::class), "Cause:", it)
+    }
+  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/network/RegistrationSessionResult.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/RegistrationSessionResult.kt
similarity index 80%
rename from app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/network/RegistrationSessionResult.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/data/network/RegistrationSessionResult.kt
index 64025ed0ee..f262cb2bd0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/network/RegistrationSessionResult.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/RegistrationSessionResult.kt
@@ -3,11 +3,12 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registration.v2.data.network
+package org.thoughtcrime.securesms.registration.data.network
 
 import org.signal.core.util.logging.Log
 import org.whispersystems.signalservice.api.NetworkResult
 import org.whispersystems.signalservice.api.push.exceptions.MalformedRequestException
+import org.whispersystems.signalservice.api.push.exceptions.NoSuchSessionException
 import org.whispersystems.signalservice.api.push.exceptions.NotFoundException
 import org.whispersystems.signalservice.api.push.exceptions.RateLimitException
 import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse
@@ -29,11 +30,12 @@ sealed class RegistrationSessionCreationResult(cause: Throwable?) : Registration
         is NetworkResult.Success -> {
           Success(networkResult.result)
         }
+
         is NetworkResult.ApplicationError -> UnknownError(networkResult.throwable)
         is NetworkResult.NetworkError -> UnknownError(networkResult.exception)
         is NetworkResult.StatusCodeError -> {
           when (val cause = networkResult.exception) {
-            is RateLimitException -> RateLimited(cause)
+            is RateLimitException -> createRateLimitProcessor(cause)
             is MalformedRequestException -> MalformedRequest(cause)
             else -> if (networkResult.code == 422) {
               ServerUnableToParse(cause)
@@ -44,6 +46,14 @@ sealed class RegistrationSessionCreationResult(cause: Throwable?) : Registration
         }
       }
     }
+
+    private fun createRateLimitProcessor(exception: RateLimitException): RegistrationSessionCreationResult {
+      return if (exception.retryAfterMilliseconds.isPresent) {
+        RateLimited(exception, exception.retryAfterMilliseconds.get())
+      } else {
+        AttemptsExhausted(exception)
+      }
+    }
   }
 
   class Success(private val metadata: RegistrationSessionMetadataResponse) : RegistrationSessionCreationResult(null), SessionMetadataHolder {
@@ -52,7 +62,8 @@ sealed class RegistrationSessionCreationResult(cause: Throwable?) : Registration
     }
   }
 
-  class RateLimited(cause: Throwable) : RegistrationSessionCreationResult(cause)
+  class RateLimited(cause: Throwable, val timeRemaining: Long) : RegistrationSessionCreationResult(cause)
+  class AttemptsExhausted(cause: Throwable) : RegistrationSessionCreationResult(cause)
   class ServerUnableToParse(cause: Throwable) : RegistrationSessionCreationResult(cause)
   class MalformedRequest(cause: Throwable) : RegistrationSessionCreationResult(cause)
   class UnknownError(cause: Throwable) : RegistrationSessionCreationResult(cause)
@@ -70,7 +81,7 @@ sealed class RegistrationSessionCheckResult(cause: Throwable?) : RegistrationSes
         is NetworkResult.NetworkError -> UnknownError(networkResult.exception)
         is NetworkResult.StatusCodeError -> {
           when (val cause = networkResult.exception) {
-            is NotFoundException -> SessionNotFound(cause)
+            is NoSuchSessionException, is NotFoundException -> SessionNotFound(cause)
             else -> UnknownError(cause)
           }
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/network/SubmitCaptchaResult.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/SubmitCaptchaResult.kt
similarity index 94%
rename from app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/network/SubmitCaptchaResult.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/data/network/SubmitCaptchaResult.kt
index f9e17bfd51..5102e83302 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/network/SubmitCaptchaResult.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/SubmitCaptchaResult.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registration.v2.data.network
+package org.thoughtcrime.securesms.registration.data.network
 
 import org.signal.core.util.logging.Log
 import org.whispersystems.signalservice.api.NetworkResult
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/network/VerificationCodeRequestResult.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/VerificationCodeRequestResult.kt
similarity index 68%
rename from app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/network/VerificationCodeRequestResult.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/data/network/VerificationCodeRequestResult.kt
index 778d10fe29..915147dc8b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/network/VerificationCodeRequestResult.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/network/VerificationCodeRequestResult.kt
@@ -3,22 +3,27 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registration.v2.data.network
+package org.thoughtcrime.securesms.registration.data.network
 
 import okio.IOException
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.registration.v2.data.RegistrationRepository
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository
 import org.whispersystems.signalservice.api.NetworkResult
+import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException
 import org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException
 import org.whispersystems.signalservice.api.push.exceptions.ExternalServiceFailureException
 import org.whispersystems.signalservice.api.push.exceptions.ImpossiblePhoneNumberException
 import org.whispersystems.signalservice.api.push.exceptions.InvalidTransportModeException
 import org.whispersystems.signalservice.api.push.exceptions.MalformedRequestException
+import org.whispersystems.signalservice.api.push.exceptions.NoSuchSessionException
 import org.whispersystems.signalservice.api.push.exceptions.NonNormalizedPhoneNumberException
 import org.whispersystems.signalservice.api.push.exceptions.PushChallengeRequiredException
 import org.whispersystems.signalservice.api.push.exceptions.RateLimitException
 import org.whispersystems.signalservice.api.push.exceptions.RegistrationRetryException
 import org.whispersystems.signalservice.api.push.exceptions.TokenNotAcceptedException
+import org.whispersystems.signalservice.api.svr.Svr3Credentials
+import org.whispersystems.signalservice.internal.push.AuthCredentials
+import org.whispersystems.signalservice.internal.push.LockedException
 import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataJson
 import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse
 import org.whispersystems.signalservice.internal.util.JsonUtil
@@ -35,15 +40,19 @@ sealed class VerificationCodeRequestResult(cause: Throwable?) : RegistrationResu
     fun from(networkResult: NetworkResult<RegistrationSessionMetadataResponse>): VerificationCodeRequestResult {
       return when (networkResult) {
         is NetworkResult.Success -> {
-          val challenges = networkResult.result.body.requestedInformation
+          val challenges = Challenge.parse(networkResult.result.body.requestedInformation)
           if (challenges.isNotEmpty()) {
+            Log.d(TAG, "Received \"successful\" response that contains challenges: ${challenges.joinToString { it.key }}")
             ChallengeRequired(challenges)
           } else {
             Success(
               sessionId = networkResult.result.body.id,
-              allowedToRequestCode = networkResult.result.body.allowedToRequestCode,
               nextSmsTimestamp = RegistrationRepository.deriveTimestamp(networkResult.result.headers, networkResult.result.body.nextSms),
-              nextCallTimestamp = RegistrationRepository.deriveTimestamp(networkResult.result.headers, networkResult.result.body.nextCall)
+              nextCallTimestamp = RegistrationRepository.deriveTimestamp(networkResult.result.headers, networkResult.result.body.nextCall),
+              nextVerificationAttempt = RegistrationRepository.deriveTimestamp(networkResult.result.headers, networkResult.result.body.nextVerificationAttempt),
+              allowedToRequestCode = networkResult.result.body.allowedToRequestCode,
+              challengesRequested = Challenge.parse(networkResult.result.body.requestedInformation),
+              verified = networkResult.result.body.verified
             )
           }
         }
@@ -56,12 +65,15 @@ sealed class VerificationCodeRequestResult(cause: Throwable?) : RegistrationResu
             is CaptchaRequiredException -> createChallengeRequiredProcessor(networkResult)
             is RateLimitException -> createRateLimitProcessor(cause)
             is ImpossiblePhoneNumberException -> ImpossibleNumber(cause)
-            is NonNormalizedPhoneNumberException -> NonNormalizedNumber(cause)
+            is NonNormalizedPhoneNumberException -> NonNormalizedNumber(cause = cause, originalNumber = cause.originalNumber, normalizedNumber = cause.normalizedNumber)
             is TokenNotAcceptedException -> TokenNotAccepted(cause)
             is ExternalServiceFailureException -> ExternalServiceFailure(cause)
             is InvalidTransportModeException -> InvalidTransportModeFailure(cause)
             is MalformedRequestException -> MalformedRequest(cause)
             is RegistrationRetryException -> MustRetry(cause)
+            is LockedException -> RegistrationLocked(cause = cause, timeRemaining = cause.timeRemaining, svr2Credentials = cause.svr2Credentials, svr3Credentials = cause.svr3Credentials)
+            is NoSuchSessionException -> NoSuchSession(cause)
+            is AlreadyVerifiedException -> AlreadyVerified(cause)
             else -> UnknownError(cause)
           }
         }
@@ -76,7 +88,7 @@ sealed class VerificationCodeRequestResult(cause: Throwable?) : RegistrationResu
 
       try {
         val response = JsonUtil.fromJson(errorResult.body, RegistrationSessionMetadataJson::class.java)
-        return ChallengeRequired(response.requestedInformation)
+        return ChallengeRequired(Challenge.parse(response.requestedInformation))
       } catch (parseException: IOException) {
         Log.w(TAG, "Attempted to parse error body for list of requested information, but encountered exception.", parseException)
         return UnknownError(parseException)
@@ -92,9 +104,9 @@ sealed class VerificationCodeRequestResult(cause: Throwable?) : RegistrationResu
     }
   }
 
-  class Success(val sessionId: String, val allowedToRequestCode: Boolean, val nextSmsTimestamp: Long, val nextCallTimestamp: Long) : VerificationCodeRequestResult(null)
+  class Success(val sessionId: String, val nextSmsTimestamp: Long, val nextCallTimestamp: Long, nextVerificationAttempt: Long, val allowedToRequestCode: Boolean, challengesRequested: List<Challenge>, val verified: Boolean) : VerificationCodeRequestResult(null)
 
-  class ChallengeRequired(val challenges: List<String>) : VerificationCodeRequestResult(null)
+  class ChallengeRequired(val challenges: List<Challenge>) : VerificationCodeRequestResult(null)
 
   class RateLimited(cause: Throwable, val timeRemaining: Long) : VerificationCodeRequestResult(cause)
 
@@ -102,7 +114,7 @@ sealed class VerificationCodeRequestResult(cause: Throwable?) : RegistrationResu
 
   class ImpossibleNumber(cause: Throwable) : VerificationCodeRequestResult(cause)
 
-  class NonNormalizedNumber(cause: Throwable) : VerificationCodeRequestResult(cause)
+  class NonNormalizedNumber(cause: Throwable, val originalNumber: String, val normalizedNumber: String) : VerificationCodeRequestResult(cause)
 
   class TokenNotAccepted(cause: Throwable) : VerificationCodeRequestResult(cause)
 
@@ -114,5 +126,11 @@ sealed class VerificationCodeRequestResult(cause: Throwable?) : RegistrationResu
 
   class MustRetry(cause: Throwable) : VerificationCodeRequestResult(cause)
 
+  class RegistrationLocked(cause: Throwable, val timeRemaining: Long, val svr2Credentials: AuthCredentials, val svr3Credentials: Svr3Credentials) : VerificationCodeRequestResult(cause)
+
+  class NoSuchSession(cause: Throwable) : VerificationCodeRequestResult(cause)
+
+  class AlreadyVerified(cause: Throwable) : VerificationCodeRequestResult(cause)
+
   class UnknownError(cause: Throwable) : VerificationCodeRequestResult(cause)
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/AccountLockedFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/AccountLockedFragment.java
deleted file mode 100644
index d9637424f7..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/AccountLockedFragment.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.thoughtcrime.securesms.registration.fragments;
-
-import androidx.lifecycle.ViewModelProvider;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.registration.viewmodel.BaseRegistrationViewModel;
-import org.thoughtcrime.securesms.registration.viewmodel.RegistrationViewModel;
-
-public class AccountLockedFragment extends BaseAccountLockedFragment {
-
-  public AccountLockedFragment() {
-    super(R.layout.account_locked_fragment);
-  }
-
-  @Override
-  protected BaseRegistrationViewModel getViewModel() {
-    return new ViewModelProvider(requireActivity()).get(RegistrationViewModel.class);
-  }
-
-  @Override
-  protected void onNext() {
-    requireActivity().finish();
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseAccountLockedFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseAccountLockedFragment.java
deleted file mode 100644
index 7b67f5ed22..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseAccountLockedFragment.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.thoughtcrime.securesms.registration.fragments;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.activity.OnBackPressedCallback;
-import androidx.annotation.CallSuper;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.thoughtcrime.securesms.LoggingFragment;
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.registration.viewmodel.BaseRegistrationViewModel;
-
-import java.util.concurrent.TimeUnit;
-
-import static org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView;
-
-/**
- * Base fragment used by registration and change number flow to show an account as locked.
- */
-public abstract class BaseAccountLockedFragment extends LoggingFragment {
-
-  public BaseAccountLockedFragment(int contentLayoutId) {
-    super(contentLayoutId);
-  }
-
-  @Override
-  @CallSuper
-  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-    super.onViewCreated(view, savedInstanceState);
-
-    setDebugLogSubmitMultiTapView(view.findViewById(R.id.account_locked_title));
-
-    TextView description = view.findViewById(R.id.account_locked_description);
-
-    BaseRegistrationViewModel viewModel = getViewModel();
-    viewModel.getLockedTimeRemaining().observe(getViewLifecycleOwner(),
-      t -> description.setText(getString(R.string.AccountLockedFragment__your_account_has_been_locked_to_protect_your_privacy, durationToDays(t)))
-    );
-
-    view.findViewById(R.id.account_locked_next).setOnClickListener(v -> onNext());
-    view.findViewById(R.id.account_locked_learn_more).setOnClickListener(v -> learnMore());
-
-    requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), new OnBackPressedCallback(true) {
-      @Override
-      public void handleOnBackPressed() {
-        onNext();
-      }
-    });
-  }
-
-  private void learnMore() {
-    Intent intent = new Intent(Intent.ACTION_VIEW);
-    intent.setData(Uri.parse(getString(R.string.AccountLockedFragment__learn_more_url)));
-    startActivity(intent);
-  }
-
-  private static long durationToDays(long duration) {
-    return duration != 0L ? getLockoutDays(duration) : 7;
-  }
-
-  private static int getLockoutDays(long timeRemainingMs) {
-    return (int) TimeUnit.MILLISECONDS.toDays(timeRemainingMs) + 1;
-  }
-
-  protected abstract BaseRegistrationViewModel getViewModel();
-
-  protected abstract void onNext();
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseEnterSmsCodeFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseEnterSmsCodeFragment.java
deleted file mode 100644
index 1df9351a2e..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseEnterSmsCodeFragment.java
+++ /dev/null
@@ -1,442 +0,0 @@
-package org.thoughtcrime.securesms.registration.fragments;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.activity.OnBackPressedCallback;
-import androidx.annotation.CallSuper;
-import androidx.annotation.LayoutRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.navigation.Navigation;
-
-import com.google.android.material.button.MaterialButton;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.LoggingFragment;
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.components.registration.ActionCountDownButton;
-import org.thoughtcrime.securesms.components.registration.VerificationCodeView;
-import org.thoughtcrime.securesms.components.registration.VerificationPinKeyboard;
-import org.thoughtcrime.securesms.registration.ReceivedSmsEvent;
-import org.thoughtcrime.securesms.registration.VerifyAccountRepository;
-import org.thoughtcrime.securesms.registration.VerifyResponseProcessor;
-import org.thoughtcrime.securesms.registration.viewmodel.BaseRegistrationViewModel;
-import org.signal.core.util.concurrent.LifecycleDisposable;
-import org.thoughtcrime.securesms.util.ViewUtil;
-import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
-import org.thoughtcrime.securesms.util.dualsim.MccMncProducer;
-import org.whispersystems.signalservice.internal.push.LockedException;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.disposables.Disposable;
-
-import static org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView;
-import static org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.showConfirmNumberDialogIfTranslated;
-
-/**
- * Base fragment used by registration and change number flow to input an SMS verification code or request a
- * phone code after requesting SMS.
- *
- * @param <ViewModel> - The concrete view model used by the subclasses, for ease of access in said subclass
- */
-public abstract class BaseEnterSmsCodeFragment<ViewModel extends BaseRegistrationViewModel> extends LoggingFragment implements SignalStrengthPhoneStateListener.Callback {
-
-  private static final String TAG = Log.tag(BaseEnterSmsCodeFragment.class);
-
-  private ScrollView              scrollView;
-  private TextView                subheader;
-  private VerificationCodeView    verificationCodeView;
-  private VerificationPinKeyboard keyboard;
-  private ActionCountDownButton   callMeCountDown;
-  private ActionCountDownButton   resendSmsCountDown;
-  private MaterialButton          wrongNumber;
-  private MaterialButton          bottomSheetButton;
-  private boolean                 autoCompleting;
-
-  private ViewModel viewModel;
-
-  protected final LifecycleDisposable disposables = new LifecycleDisposable();
-
-  public BaseEnterSmsCodeFragment(@LayoutRes int contentLayoutId) {
-    super(contentLayoutId);
-  }
-
-  @Override
-  @CallSuper
-  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-    super.onViewCreated(view, savedInstanceState);
-
-    setDebugLogSubmitMultiTapView(view.findViewById(R.id.verify_header));
-
-    scrollView           = view.findViewById(R.id.scroll_view);
-    subheader            = view.findViewById(R.id.verification_subheader);
-    verificationCodeView = view.findViewById(R.id.code);
-    keyboard             = view.findViewById(R.id.keyboard);
-    callMeCountDown      = view.findViewById(R.id.call_me_count_down);
-    resendSmsCountDown   = view.findViewById(R.id.resend_sms_count_down);
-    wrongNumber          = view.findViewById(R.id.wrong_number);
-    bottomSheetButton    = view.findViewById(R.id.having_trouble_button);
-
-    new SignalStrengthPhoneStateListener(this, this);
-
-    connectKeyboard(verificationCodeView, keyboard);
-    ViewUtil.hideKeyboard(requireContext(), view);
-
-    setOnCodeFullyEnteredListener(verificationCodeView);
-
-    wrongNumber.setOnClickListener(v -> returnToPhoneEntryScreen());
-    bottomSheetButton.setOnClickListener( v -> showBottomSheet());
-
-    callMeCountDown.setTextResources(R.string.RegistrationActivity_call, R.string.RegistrationActivity_call_me_instead_available_in);
-    resendSmsCountDown.setTextResources(R.string.RegistrationActivity_resend_code, R.string.RegistrationActivity_resend_sms_available_in);
-
-    callMeCountDown.setOnClickListener(v -> handlePhoneCallRequest());
-    resendSmsCountDown.setOnClickListener(v -> handleSmsRequest());
-
-    callMeCountDown.setListener((v, remaining) -> {
-      if (remaining <= 30) {
-        scrollView.smoothScrollTo(0, v.getBottom());
-        callMeCountDown.setListener(null);
-      }
-    });
-
-    resendSmsCountDown.setListener((v, remaining) -> {
-      if (remaining <= 30) {
-        scrollView.smoothScrollTo(0, v.getBottom());
-        resendSmsCountDown.setListener(null);
-      }
-    });
-
-
-    disposables.bindTo(getViewLifecycleOwner().getLifecycle());
-    viewModel = getViewModel();
-    viewModel.getIncorrectCodeAttempts().observe(getViewLifecycleOwner(), (attempts) -> {
-      if (attempts >= 3) {
-        bottomSheetButton.setVisibility(View.VISIBLE);
-      }
-    });
-
-    requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), new OnBackPressedCallback(true) {
-      @Override
-      public void handleOnBackPressed() {
-        viewModel.resetSession();
-        this.remove();
-        requireActivity().getOnBackPressedDispatcher().onBackPressed();
-      }
-    });
-  }
-
-  protected abstract ViewModel getViewModel();
-
-  protected abstract void handleSuccessfulVerify();
-
-  protected abstract void navigateToCaptcha();
-
-  protected abstract void navigateToRegistrationLock(long timeRemaining);
-
-  protected abstract void navigateToKbsAccountLocked();
-
-  private void returnToPhoneEntryScreen() {
-    viewModel.resetSession();
-    Navigation.findNavController(requireView()).navigateUp();
-  }
-
-  private void setOnCodeFullyEnteredListener(VerificationCodeView verificationCodeView) {
-    verificationCodeView.setOnCompleteListener(code -> {
-
-      callMeCountDown.setVisibility(View.INVISIBLE);
-      resendSmsCountDown.setVisibility(View.INVISIBLE);
-      wrongNumber.setVisibility(View.INVISIBLE);
-      keyboard.displayProgress();
-
-      Disposable verify = viewModel.verifyCodeWithoutRegistrationLock(code)
-                                   .observeOn(AndroidSchedulers.mainThread())
-                                   .subscribe((VerifyResponseProcessor processor) -> {
-                                     if (!processor.hasResult()) {
-                                       Log.w(TAG, "post verify: ", processor.getError());
-                                     }
-                                     if (processor.hasResult()) {
-                                       handleSuccessfulVerify();
-                                     } else if (processor.rateLimit()) {
-                                       handleRateLimited();
-                                     } else if (processor.registrationLock() && !processor.isRegistrationLockPresentAndSvrExhausted()) {
-                                       LockedException lockedException = processor.getLockedException();
-                                       handleRegistrationLock(lockedException.getTimeRemaining());
-                                     } else if (processor.authorizationFailed()) {
-                                       handleIncorrectCodeError();
-                                     } else {
-                                       Log.w(TAG, "Unable to verify code", processor.getError());
-                                       handleGeneralError();
-                                     }
-                                   });
-
-      disposables.add(verify);
-    });
-  }
-
-  protected void displaySuccess(@NonNull Runnable runAfterAnimation) {
-    keyboard.displaySuccess().addListener(new AssertedSuccessListener<Boolean>() {
-      @Override
-      public void onSuccess(Boolean result) {
-        runAfterAnimation.run();
-      }
-    });
-  }
-
-  protected void handleRateLimited() {
-    keyboard.displayFailure().addListener(new AssertedSuccessListener<Boolean>() {
-      @Override
-      public void onSuccess(Boolean r) {
-        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
-
-        builder.setTitle(R.string.RegistrationActivity_too_many_attempts)
-               .setMessage(R.string.RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later)
-               .setPositiveButton(android.R.string.ok, (dialog, which) -> {
-                 callMeCountDown.setVisibility(View.VISIBLE);
-                 resendSmsCountDown.setVisibility(View.VISIBLE);
-                 wrongNumber.setVisibility(View.VISIBLE);
-                 verificationCodeView.clear();
-                 keyboard.displayKeyboard();
-               })
-               .show();
-      }
-    });
-  }
-
-  protected void handleRegistrationLock(long timeRemaining) {
-    keyboard.displayLocked().addListener(new AssertedSuccessListener<Boolean>() {
-      @Override
-      public void onSuccess(Boolean r) {
-        navigateToRegistrationLock(timeRemaining);
-      }
-    });
-  }
-
-  protected void handleSvrAccountLocked() {
-    navigateToKbsAccountLocked();
-  }
-
-  protected void handleIncorrectCodeError() {
-    viewModel.incrementIncorrectCodeAttempts();
-
-    Toast.makeText(requireContext(), R.string.RegistrationActivity_incorrect_code, Toast.LENGTH_LONG).show();
-    keyboard.displayFailure().addListener(new AssertedSuccessListener<Boolean>() {
-      @Override
-      public void onSuccess(Boolean result) {
-        callMeCountDown.setVisibility(View.VISIBLE);
-        resendSmsCountDown.setVisibility(View.VISIBLE);
-        wrongNumber.setVisibility(View.VISIBLE);
-        verificationCodeView.clear();
-        keyboard.displayKeyboard();
-      }
-    });
-  }
-
-  protected void handleGeneralError() {
-    Toast.makeText(requireContext(), R.string.RegistrationActivity_error_connecting_to_service, Toast.LENGTH_LONG).show();
-    keyboard.displayFailure().addListener(new AssertedSuccessListener<Boolean>() {
-      @Override
-      public void onSuccess(Boolean result) {
-        callMeCountDown.setVisibility(View.VISIBLE);
-        resendSmsCountDown.setVisibility(View.VISIBLE);
-        wrongNumber.setVisibility(View.VISIBLE);
-        verificationCodeView.clear();
-        keyboard.displayKeyboard();
-      }
-    });
-  }
-
-  @Override
-  public void onStart() {
-    super.onStart();
-    EventBus.getDefault().register(this);
-  }
-
-  @Override
-  public void onStop() {
-    super.onStop();
-    EventBus.getDefault().unregister(this);
-  }
-
-  @Subscribe(threadMode = ThreadMode.MAIN)
-  public void onVerificationCodeReceived(@NonNull ReceivedSmsEvent event) {
-    verificationCodeView.clear();
-
-    List<Integer> parsedCode = convertVerificationCodeToDigits(event.getCode());
-
-    autoCompleting = true;
-
-    final int size = parsedCode.size();
-
-    for (int i = 0; i < size; i++) {
-      final int index = i;
-      verificationCodeView.postDelayed(() -> {
-        verificationCodeView.append(parsedCode.get(index));
-        if (index == size - 1) {
-          autoCompleting = false;
-        }
-      }, i * 200L);
-    }
-  }
-
-  private static List<Integer> convertVerificationCodeToDigits(@Nullable String code) {
-    if (code == null || code.length() != 6) {
-      return Collections.emptyList();
-    }
-
-    List<Integer> result = new ArrayList<>(code.length());
-
-    try {
-      for (int i = 0; i < code.length(); i++) {
-        result.add(Integer.parseInt(Character.toString(code.charAt(i))));
-      }
-    } catch (NumberFormatException e) {
-      Log.w(TAG, "Failed to convert code into digits.", e);
-      return Collections.emptyList();
-    }
-
-    return result;
-  }
-
-  private void handlePhoneCallRequest() {
-    showConfirmNumberDialogIfTranslated(requireContext(),
-                                        R.string.RegistrationActivity_phone_number_verification_dialog_title,
-                                        R.string.RegistrationActivity_you_will_receive_a_call_to_verify_this_number,
-                                        viewModel.getNumber().getE164Number(),
-                                        () -> handleCodeCallRequestAfterConfirm(VerifyAccountRepository.Mode.PHONE_CALL),
-                                        this::returnToPhoneEntryScreen);
-  }
-
-  private void handleSmsRequest() {
-    showConfirmNumberDialogIfTranslated(requireContext(),
-                                        R.string.RegistrationActivity_phone_number_verification_dialog_title,
-                                        R.string.RegistrationActivity_a_verification_code_will_be_sent_to_this_number,
-                                        viewModel.getNumber().getE164Number(),
-                                        () -> handleCodeCallRequestAfterConfirm(VerifyAccountRepository.Mode.SMS_WITH_LISTENER),
-                                        this::returnToPhoneEntryScreen);
-  }
-
-  private void handleCodeCallRequestAfterConfirm(VerifyAccountRepository.Mode mode) {
-    MccMncProducer mccMncProducer = new MccMncProducer(requireContext());
-    Disposable request = viewModel.requestVerificationCode(mode, mccMncProducer.getMcc(), mccMncProducer.getMnc())
-                                  .observeOn(AndroidSchedulers.mainThread())
-                                  .subscribe(processor -> {
-                                    if (processor.hasResult()) {
-                                      Toast.makeText(requireContext(), getCodeRequestedToastText(mode), Toast.LENGTH_LONG).show();
-                                    } else if (processor.captchaRequired(viewModel.getExcludedChallenges())) {
-                                      navigateToCaptcha();
-                                    } else if (processor.rateLimit()) {
-                                      handleRateLimited();
-                                    } else {
-                                      Log.w(TAG, "Unable to request phone code", processor.getError());
-                                      Toast.makeText(requireContext(), R.string.RegistrationActivity_unable_to_connect_to_service, Toast.LENGTH_LONG).show();
-                                    }
-                                  });
-
-    disposables.add(request);
-  }
-
-  @StringRes
-  private int getCodeRequestedToastText(VerifyAccountRepository.Mode mode) {
-    switch (mode) {
-      case PHONE_CALL:
-        return R.string.RegistrationActivity_call_requested;
-      case SMS_WITH_LISTENER:
-      case SMS_WITHOUT_LISTENER:
-        return R.string.RegistrationActivity_sms_requested;
-      default:
-        return R.string.RegistrationActivity_code_requested;
-    }
-  }
-
-  private void connectKeyboard(VerificationCodeView verificationCodeView, VerificationPinKeyboard keyboard) {
-    keyboard.setOnKeyPressListener(key -> {
-      if (!autoCompleting) {
-        if (key >= 0) {
-          verificationCodeView.append(key);
-        } else {
-          verificationCodeView.delete();
-        }
-      }
-    });
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    String sessionE164 = viewModel.getSessionE164();
-    if (sessionE164 == null) {
-      returnToPhoneEntryScreen();
-      return;
-    }
-
-    subheader.setText(requireContext().getString(R.string.RegistrationActivity_enter_the_code_we_sent_to_s, viewModel.getNumber().getFullFormattedNumber()));
-
-    Disposable request = viewModel.validateSession(sessionE164)
-                                  .observeOn(AndroidSchedulers.mainThread())
-                                  .subscribe(processor -> {
-                                    if (!processor.hasResult()) {
-                                      Log.d(TAG, "Network error.");
-                                      returnToPhoneEntryScreen();
-                                    } else if (processor.isInvalidSession()) {
-                                      Log.d(TAG, "Registration session is invalid.");
-                                      returnToPhoneEntryScreen();
-                                    } else if (processor.cannotSubmitVerificationAttempt()) {
-                                      Log.d(TAG, "Cannot submit any more verification attempts.");
-                                      returnToPhoneEntryScreen();
-                                    } else if (processor.mustWaitToSubmitProof()) {
-                                      Log.d(TAG, "Blocked from submitting proof at this time.");
-                                      handleRateLimited();
-                                    }
-                                    // else session state is valid and server is ready to accept code
-                                  });
-
-    disposables.add(request);
-
-    viewModel.getCanCallAtTime().observe(getViewLifecycleOwner(), callAtTime -> {
-      if (callAtTime > 0) {
-        callMeCountDown.setVisibility(View.VISIBLE);
-        callMeCountDown.startCountDownTo(callAtTime);
-      } else {
-        callMeCountDown.setVisibility(View.INVISIBLE);
-      }
-    });
-    viewModel.getCanSmsAtTime().observe(getViewLifecycleOwner(), smsAtTime -> {
-      if (smsAtTime > 0) {
-        resendSmsCountDown.setVisibility(View.VISIBLE);
-        resendSmsCountDown.startCountDownTo(smsAtTime);
-      } else {
-        resendSmsCountDown.setVisibility(View.INVISIBLE);
-      }
-    });
-  }
-
-
-  private void showBottomSheet() {
-    ContactSupportBottomSheetFragment bottomSheet = new ContactSupportBottomSheetFragment();
-    bottomSheet.show(getChildFragmentManager(), "support_bottom_sheet");
-  }
-
-  @Override
-  public void onNoCellSignalPresent() {
-    // TODO animate in bottom sheet
-  }
-
-  @Override
-  public void onCellSignalPresent() {
-    // TODO animate away bottom sheet
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseRegistrationLockFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseRegistrationLockFragment.java
deleted file mode 100644
index 027a4d3420..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseRegistrationLockFragment.java
+++ /dev/null
@@ -1,283 +0,0 @@
-package org.thoughtcrime.securesms.registration.fragments;
-
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.text.InputType;
-import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.CallSuper;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.google.android.material.button.MaterialButton;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
-import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.LoggingFragment;
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.lock.v2.PinKeyboardType;
-import org.thoughtcrime.securesms.registration.viewmodel.BaseRegistrationViewModel;
-import org.signal.core.util.concurrent.LifecycleDisposable;
-import org.thoughtcrime.securesms.util.ViewUtil;
-import org.thoughtcrime.securesms.util.views.CircularProgressMaterialButton;
-
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.disposables.Disposable;
-
-import static org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView;
-
-/**
- * Base fragment used by registration and change number flow to deal with a registration locked account.
- */
-public abstract class BaseRegistrationLockFragment extends LoggingFragment {
-
-  private static final String TAG = Log.tag(BaseRegistrationLockFragment.class);
-
-  /**
-   * Applies to both V1 and V2 pins, because some V2 pins may have been migrated from V1.
-   */
-  public static final int MINIMUM_PIN_LENGTH = 4;
-
-  private   EditText                       pinEntry;
-  private   View                           forgotPin;
-  protected CircularProgressMaterialButton pinButton;
-  private   TextView                       errorLabel;
-  private   MaterialButton                 keyboardToggle;
-  private   long                           timeRemaining;
-
-  private BaseRegistrationViewModel viewModel;
-
-  private final LifecycleDisposable disposables = new LifecycleDisposable();
-
-  public BaseRegistrationLockFragment(int contentLayoutId) {
-    super(contentLayoutId);
-  }
-
-  @Override
-  @CallSuper
-  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-    super.onViewCreated(view, savedInstanceState);
-
-    setDebugLogSubmitMultiTapView(view.findViewById(R.id.kbs_lock_pin_title));
-
-    pinEntry       = view.findViewById(R.id.kbs_lock_pin_input);
-    pinButton      = view.findViewById(R.id.kbs_lock_pin_confirm);
-    errorLabel     = view.findViewById(R.id.kbs_lock_pin_input_label);
-    keyboardToggle = view.findViewById(R.id.kbs_lock_keyboard_toggle);
-    forgotPin      = view.findViewById(R.id.kbs_lock_forgot_pin);
-
-    RegistrationLockFragmentArgs args = RegistrationLockFragmentArgs.fromBundle(requireArguments());
-
-    timeRemaining        = args.getTimeRemaining();
-
-    forgotPin.setVisibility(View.GONE);
-    forgotPin.setOnClickListener(v -> handleForgottenPin(timeRemaining));
-
-    pinEntry.setImeOptions(EditorInfo.IME_ACTION_DONE);
-    pinEntry.setOnEditorActionListener((v, actionId, event) -> {
-      if (actionId == EditorInfo.IME_ACTION_DONE) {
-        ViewUtil.hideKeyboard(requireContext(), v);
-        handlePinEntry();
-        return true;
-      }
-      return false;
-    });
-
-    enableAndFocusPinEntry();
-
-    pinButton.setOnClickListener((v) -> {
-      ViewUtil.hideKeyboard(requireContext(), pinEntry);
-      handlePinEntry();
-    });
-
-    keyboardToggle.setOnClickListener((v) -> {
-      PinKeyboardType keyboardType = getPinEntryKeyboardType();
-
-      updateKeyboard(keyboardType.getOther());
-      keyboardToggle.setIconResource(keyboardType.getIconResource());
-    });
-
-    PinKeyboardType keyboardType = getPinEntryKeyboardType().getOther();
-    keyboardToggle.setIconResource(keyboardType.getIconResource());
-
-    disposables.bindTo(getViewLifecycleOwner().getLifecycle());
-    viewModel = getViewModel();
-
-    viewModel.getLockedTimeRemaining()
-             .observe(getViewLifecycleOwner(), t -> timeRemaining = t);
-
-    Integer triesRemaining = viewModel.getSvrTriesRemaining();
-
-    if (triesRemaining != null) {
-      if (triesRemaining <= 3) {
-        int daysRemaining = getLockoutDays(timeRemaining);
-
-        new MaterialAlertDialogBuilder(requireContext())
-            .setTitle(R.string.RegistrationLockFragment__not_many_tries_left)
-            .setMessage(getTriesRemainingDialogMessage(triesRemaining, daysRemaining))
-            .setPositiveButton(android.R.string.ok, null)
-            .setNeutralButton(R.string.PinRestoreEntryFragment_contact_support, (dialog, which) -> sendEmailToSupport())
-            .show();
-      }
-
-      if (triesRemaining < 5) {
-        errorLabel.setText(requireContext().getResources().getQuantityString(R.plurals.RegistrationLockFragment__d_attempts_remaining, triesRemaining, triesRemaining));
-      }
-    }
-  }
-
-  protected abstract BaseRegistrationViewModel getViewModel();
-
-  private String getTriesRemainingDialogMessage(int triesRemaining, int daysRemaining) {
-    Resources resources = requireContext().getResources();
-    String    tries     = resources.getQuantityString(R.plurals.RegistrationLockFragment__you_have_d_attempts_remaining, triesRemaining, triesRemaining);
-    String    days      = resources.getQuantityString(R.plurals.RegistrationLockFragment__if_you_run_out_of_attempts_your_account_will_be_locked_for_d_days, daysRemaining, daysRemaining);
-
-    return tries + " " + days;
-  }
-
-  protected PinKeyboardType getPinEntryKeyboardType() {
-    boolean isNumeric = (pinEntry.getInputType() & InputType.TYPE_MASK_CLASS) == InputType.TYPE_CLASS_NUMBER;
-
-    return isNumeric ? PinKeyboardType.NUMERIC : PinKeyboardType.ALPHA_NUMERIC;
-  }
-
-  private void handlePinEntry() {
-    pinEntry.setEnabled(false);
-
-    final String pin = pinEntry.getText().toString();
-
-    int trimmedLength = pin.replace(" ", "").length();
-    if (trimmedLength == 0) {
-      Toast.makeText(requireContext(), R.string.RegistrationActivity_you_must_enter_your_registration_lock_PIN, Toast.LENGTH_LONG).show();
-      enableAndFocusPinEntry();
-      return;
-    }
-
-    if (trimmedLength < MINIMUM_PIN_LENGTH) {
-      Toast.makeText(requireContext(), getString(R.string.RegistrationActivity_your_pin_has_at_least_d_digits_or_characters, MINIMUM_PIN_LENGTH), Toast.LENGTH_LONG).show();
-      enableAndFocusPinEntry();
-      return;
-    }
-
-    pinButton.setSpinning();
-
-    Disposable verify = viewModel.verifyCodeAndRegisterAccountWithRegistrationLock(pin)
-                                 .observeOn(AndroidSchedulers.mainThread())
-                                 .subscribe(processor -> {
-                                   if (processor.hasResult()) {
-                                     handleSuccessfulPinEntry(pin);
-                                   } else if (processor.wrongPin()) {
-                                     onIncorrectKbsRegistrationLockPin(Objects.requireNonNull(processor.getSvrTriesRemaining()));
-                                   } else if (processor.isRegistrationLockPresentAndSvrExhausted() || processor.registrationLock()) {
-                                     onKbsAccountLocked();
-                                   } else if (processor.rateLimit()) {
-                                     onRateLimited();
-                                   } else {
-                                     Log.w(TAG, "Unable to verify code with registration lock", processor.getError());
-                                     onError();
-                                   }
-                                 });
-
-    disposables.add(verify);
-  }
-
-  public void onIncorrectKbsRegistrationLockPin(int svrTriesRemaining) {
-    pinButton.cancelSpinning();
-    pinEntry.getText().clear();
-    enableAndFocusPinEntry();
-
-    viewModel.setSvrTriesRemaining(svrTriesRemaining);
-
-    if (svrTriesRemaining == 0) {
-      Log.w(TAG, "Account locked. User out of attempts on KBS.");
-      onAccountLocked();
-      return;
-    }
-
-    if (svrTriesRemaining == 3) {
-      int daysRemaining = getLockoutDays(timeRemaining);
-
-      new MaterialAlertDialogBuilder(requireContext())
-          .setTitle(R.string.RegistrationLockFragment__incorrect_pin)
-          .setMessage(getTriesRemainingDialogMessage(svrTriesRemaining, daysRemaining))
-          .setPositiveButton(android.R.string.ok, null)
-          .show();
-    }
-
-    if (svrTriesRemaining > 5) {
-      errorLabel.setText(R.string.RegistrationLockFragment__incorrect_pin_try_again);
-    } else {
-      errorLabel.setText(requireContext().getResources().getQuantityString(R.plurals.RegistrationLockFragment__incorrect_pin_d_attempts_remaining, svrTriesRemaining, svrTriesRemaining));
-      forgotPin.setVisibility(View.VISIBLE);
-    }
-  }
-
-  public void onRateLimited() {
-    pinButton.cancelSpinning();
-    enableAndFocusPinEntry();
-
-    new MaterialAlertDialogBuilder(requireContext())
-        .setTitle(R.string.RegistrationActivity_too_many_attempts)
-        .setMessage(R.string.RegistrationActivity_you_have_made_too_many_incorrect_registration_lock_pin_attempts_please_try_again_in_a_day)
-        .setPositiveButton(android.R.string.ok, null)
-        .show();
-  }
-
-  public void onKbsAccountLocked() {
-    onAccountLocked();
-  }
-
-  public void onError() {
-    pinButton.cancelSpinning();
-    enableAndFocusPinEntry();
-
-    Toast.makeText(requireContext(), R.string.RegistrationActivity_error_connecting_to_service, Toast.LENGTH_LONG).show();
-  }
-
-  private void handleForgottenPin(long timeRemainingMs) {
-    int lockoutDays = getLockoutDays(timeRemainingMs);
-    new MaterialAlertDialogBuilder(requireContext())
-        .setTitle(R.string.RegistrationLockFragment__forgot_your_pin)
-        .setMessage(requireContext().getResources().getQuantityString(R.plurals.RegistrationLockFragment__for_your_privacy_and_security_there_is_no_way_to_recover, lockoutDays, lockoutDays))
-        .setPositiveButton(android.R.string.ok, null)
-        .setNeutralButton(R.string.PinRestoreEntryFragment_contact_support, (dialog, which) -> sendEmailToSupport())
-        .show();
-  }
-
-  private static int getLockoutDays(long timeRemainingMs) {
-    return (int) TimeUnit.MILLISECONDS.toDays(timeRemainingMs) + 1;
-  }
-
-  private void onAccountLocked() {
-    navigateToAccountLocked();
-  }
-
-  protected abstract void navigateToAccountLocked();
-
-  private void updateKeyboard(@NonNull PinKeyboardType keyboard) {
-    boolean isAlphaNumeric = keyboard == PinKeyboardType.ALPHA_NUMERIC;
-
-    pinEntry.setInputType(isAlphaNumeric ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD
-                                         : InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD);
-
-    pinEntry.getText().clear();
-  }
-
-  private void enableAndFocusPinEntry() {
-    pinEntry.setEnabled(true);
-    pinEntry.setFocusable(true);
-    ViewUtil.focusAndShowKeyboard(pinEntry);
-  }
-
-  protected abstract void handleSuccessfulPinEntry(@NonNull String pin);
-
-  protected abstract void sendEmailToSupport();
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/CaptchaFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/CaptchaFragment.java
deleted file mode 100644
index 0b158b1e87..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/CaptchaFragment.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.thoughtcrime.securesms.registration.fragments;
-
-import android.annotation.SuppressLint;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.navigation.fragment.NavHostFragment;
-
-import org.thoughtcrime.securesms.BuildConfig;
-import org.thoughtcrime.securesms.LoggingFragment;
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.registration.viewmodel.BaseRegistrationViewModel;
-import org.thoughtcrime.securesms.registration.viewmodel.RegistrationViewModel;
-
-import java.io.Serializable;
-
-/**
- * Fragment that displays a Captcha in a WebView.
- */
-public final class CaptchaFragment extends LoggingFragment {
-
-  public static final String EXTRA_VIEW_MODEL_PROVIDER = "view_model_provider";
-  
-  private BaseRegistrationViewModel viewModel;
-
-  @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-    return inflater.inflate(R.layout.fragment_registration_captcha, container, false);
-  }
-
-  @Override
-  @SuppressLint("SetJavaScriptEnabled")
-  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-    super.onViewCreated(view, savedInstanceState);
-
-    WebView webView = view.findViewById(R.id.registration_captcha_web_view);
-
-    webView.getSettings().setJavaScriptEnabled(true);
-    webView.clearCache(true);
-
-    webView.setWebViewClient(new WebViewClient() {
-      @Override
-      public boolean shouldOverrideUrlLoading(WebView view, String url) {
-        if (url != null && url.startsWith(RegistrationConstants.SIGNAL_CAPTCHA_SCHEME)) {
-          handleToken(url.substring(RegistrationConstants.SIGNAL_CAPTCHA_SCHEME.length()));
-          return true;
-        }
-        return false;
-      }
-    });
-
-    webView.loadUrl(BuildConfig.SIGNAL_CAPTCHA_URL);
-
-    CaptchaViewModelProvider provider = null;
-    if (getArguments() != null) {
-      provider = (CaptchaViewModelProvider) requireArguments().getSerializable(EXTRA_VIEW_MODEL_PROVIDER);
-    }
-
-    if (provider == null) {
-      viewModel = new ViewModelProvider(
-          requireActivity()).get(RegistrationViewModel.class);
-    } else {
-      viewModel = provider.get(this);
-    }
-  }
-
-  private void handleToken(@NonNull String token) {
-    viewModel.setCaptchaResponse(token);
-
-    NavHostFragment.findNavController(this).navigateUp();
-  }
-
-  public interface CaptchaViewModelProvider extends Serializable {
-    @NonNull BaseRegistrationViewModel get(@NonNull CaptchaFragment fragment);
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ChooseBackupFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ChooseBackupFragment.java
deleted file mode 100644
index d5591e7593..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ChooseBackupFragment.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.thoughtcrime.securesms.registration.fragments;
-
-import android.app.Activity;
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.provider.DocumentsContract;
-import android.text.method.LinkMovementMethod;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.text.HtmlCompat;
-import androidx.navigation.Navigation;
-
-import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.LoggingFragment;
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
-
-public class ChooseBackupFragment extends LoggingFragment {
-
-  private static final String TAG = Log.tag(ChooseBackupFragment.class);
-
-  private static final short OPEN_FILE_REQUEST_CODE = 3862;
-
-  @Override
-  public @Nullable View onCreateView(@NonNull LayoutInflater inflater,
-                                     @Nullable ViewGroup container,
-                                     @Nullable Bundle savedInstanceState)
-  {
-    return inflater.inflate(R.layout.fragment_registration_choose_backup, container, false);
-  }
-
-  @Override
-  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-    View chooseBackupButton = view.findViewById(R.id.choose_backup_fragment_button);
-    chooseBackupButton.setOnClickListener(this::onChooseBackupSelected);
-
-    TextView learnMore = view.findViewById(R.id.choose_backup_fragment_learn_more);
-    learnMore.setText(HtmlCompat.fromHtml(String.format("<a href=\"%s\">%s</a>", getString(R.string.backup_support_url), getString(R.string.ChooseBackupFragment__learn_more)), 0));
-    learnMore.setMovementMethod(LinkMovementMethod.getInstance());
-  }
-
-  @Override
-  public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-    if (requestCode == OPEN_FILE_REQUEST_CODE && resultCode == Activity.RESULT_OK && data != null) {
-      ChooseBackupFragmentDirections.ActionRestore restore = ChooseBackupFragmentDirections.actionRestore();
-
-      restore.setUri(data.getData());
-
-      SafeNavigation.safeNavigate(Navigation.findNavController(requireView()), restore);
-    }
-  }
-
-  private void onChooseBackupSelected(@NonNull View view) {
-    Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-
-    intent.setType("application/octet-stream");
-    intent.addCategory(Intent.CATEGORY_OPENABLE);
-    intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
-
-    if (Build.VERSION.SDK_INT >= 26) {
-      intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, SignalStore.settings().getLatestSignalBackupDirectory());
-    }
-
-    try {
-      startActivityForResult(intent, OPEN_FILE_REQUEST_CODE);
-    } catch (ActivityNotFoundException e) {
-      Toast.makeText(requireContext(), R.string.ChooseBackupFragment__no_file_browser_available, Toast.LENGTH_LONG).show();
-      Log.w(TAG, "No matching activity!", e);
-    }
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ContactSupportBottomSheetFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ContactSupportBottomSheetFragment.kt
index dab4a49857..7a625d5b7f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ContactSupportBottomSheetFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ContactSupportBottomSheetFragment.kt
@@ -19,6 +19,7 @@ import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.fragment.app.FragmentManager
 import org.signal.core.ui.BottomSheets
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
@@ -80,7 +81,7 @@ class ContactSupportBottomSheetFragment : ComposeBottomSheetDialogFragment() {
   private fun buildClickableString(): AnnotatedString {
     val troubleshootingStepsString = stringResource(R.string.RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring)
     val contactSupportString = stringResource(R.string.RegistrationActivity_support_bottom_sheet_cta_contact_support_substring)
-    val completeString = stringResource(R.string.RegistrationActivity_support_bottom_sheet_body_call_to_action)
+    val completeString = stringResource(R.string.RegistrationActivity_support_bottom_sheet_body_call_to_action, troubleshootingStepsString, contactSupportString)
 
     val troubleshootingStartIndex = completeString.indexOf(troubleshootingStepsString)
     val troubleshootingEndIndex = troubleshootingStartIndex + troubleshootingStepsString.length
@@ -158,6 +159,12 @@ class ContactSupportBottomSheetFragment : ComposeBottomSheetDialogFragment() {
     )
   }
 
+  fun showSafely(fm: FragmentManager, tag: String) {
+    if (!isAdded && !fm.isStateSaved) {
+      show(fm, tag)
+    }
+  }
+
   companion object {
     private const val TROUBLESHOOTING_STEPS_KEY = "troubleshooting"
     private const val CONTACT_SUPPORT_KEY = "contact_support"
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/CountryPickerFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/CountryPickerFragment.java
index 0db1656f96..adc00c7ac1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/CountryPickerFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/CountryPickerFragment.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 package org.thoughtcrime.securesms.registration.fragments;
 
 import android.os.Bundle;
@@ -20,8 +25,8 @@
 import androidx.navigation.fragment.NavHostFragment;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberViewModel;
 import org.thoughtcrime.securesms.database.loaders.CountryListLoader;
-import org.thoughtcrime.securesms.registration.viewmodel.RegistrationViewModel;
 
 import java.util.ArrayList;
 import java.util.Map;
@@ -32,7 +37,7 @@ public final class CountryPickerFragment extends ListFragment implements LoaderM
   public static final String KEY_COUNTRY_CODE = "country_code";
 
   private EditText              countryFilter;
-  private RegistrationViewModel model;
+  private ChangeNumberViewModel model;
   private String                resultKey;
 
   @Override
@@ -50,7 +55,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     }
 
     if (resultKey == null) {
-      model = new ViewModelProvider(requireActivity()).get(RegistrationViewModel.class);
+      model = new ViewModelProvider(requireActivity()).get(ChangeNumberViewModel.class);
     }
 
     countryFilter = view.findViewById(R.id.country_search);
@@ -67,7 +72,7 @@ public void onListItemClick(@NonNull ListView listView, @NonNull View view, int
     String countryName = item.get("country_name");
 
     if (resultKey == null) {
-      model.onCountrySelected(countryName, countryCode);
+      model.setNewCountry(countryCode, countryName);
     } else {
       Bundle result = new Bundle();
       result.putString(KEY_COUNTRY, countryName);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java
deleted file mode 100644
index d567d840a4..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java
+++ /dev/null
@@ -1,509 +0,0 @@
-package org.thoughtcrime.securesms.registration.fragments;
-
-import android.content.Context;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.ScrollView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.navigation.NavController;
-import androidx.navigation.Navigation;
-import androidx.navigation.fragment.NavHostFragment;
-
-import com.google.android.gms.auth.api.phone.SmsRetriever;
-import com.google.android.gms.auth.api.phone.SmsRetrieverClient;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
-import com.google.android.gms.tasks.Task;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.textfield.TextInputLayout;
-import com.google.i18n.phonenumbers.NumberParseException;
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
-import com.google.i18n.phonenumbers.Phonenumber;
-
-import org.signal.core.util.ThreadUtil;
-import org.signal.core.util.concurrent.LifecycleDisposable;
-import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.LoggingFragment;
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.registration.RegistrationSessionProcessor;
-import org.thoughtcrime.securesms.registration.VerifyAccountRepository.Mode;
-import org.thoughtcrime.securesms.registration.util.RegistrationNumberInputController;
-import org.thoughtcrime.securesms.registration.viewmodel.NumberViewState;
-import org.thoughtcrime.securesms.registration.viewmodel.RegistrationViewModel;
-import org.thoughtcrime.securesms.util.CommunicationActions;
-import org.thoughtcrime.securesms.util.Debouncer;
-import org.thoughtcrime.securesms.util.Dialogs;
-import org.thoughtcrime.securesms.util.PlayServicesUtil;
-import org.thoughtcrime.securesms.util.SupportEmailUtil;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.ViewUtil;
-import org.thoughtcrime.securesms.util.dualsim.MccMncProducer;
-import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
-import org.thoughtcrime.securesms.util.views.CircularProgressMaterialButton;
-
-import java.util.Locale;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.disposables.Disposable;
-
-import static org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView;
-import static org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.showConfirmNumberDialogIfTranslated;
-
-public final class EnterPhoneNumberFragment extends LoggingFragment implements RegistrationNumberInputController.Callbacks {
-
-  private static final String TAG = Log.tag(EnterPhoneNumberFragment.class);
-
-  private TextInputLayout                countryCode;
-  private TextInputLayout                number;
-  private CircularProgressMaterialButton register;
-  private View                           linkDevice;
-  private View                           cancel;
-  private ScrollView                     scrollView;
-  private RegistrationViewModel          viewModel;
-
-  private final LifecycleDisposable disposables = new LifecycleDisposable();
-
-  @Override
-  public void onCreate(@Nullable Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setHasOptionsMenu(true);
-  }
-
-  @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-    return inflater.inflate(R.layout.fragment_registration_enter_phone_number, container, false);
-  }
-
-  @Override
-  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-    super.onViewCreated(view, savedInstanceState);
-
-    setDebugLogSubmitMultiTapView(view.findViewById(R.id.verify_header));
-
-    countryCode = view.findViewById(R.id.country_code);
-    number      = view.findViewById(R.id.number);
-    cancel      = view.findViewById(R.id.cancel_button);
-    scrollView  = view.findViewById(R.id.scroll_view);
-    register    = view.findViewById(R.id.registerButton);
-    linkDevice  = view.findViewById(R.id.link_button);
-
-    RegistrationNumberInputController controller = new RegistrationNumberInputController(requireContext(),
-                                                                                         this,
-                                                                                         Objects.requireNonNull(number.getEditText()),
-                                                                                         countryCode);
-    register.setOnClickListener(v -> handleRegister(requireContext()));
-    linkDevice.setOnClickListener(v -> SafeNavigation.safeNavigate(Navigation.findNavController(v), EnterPhoneNumberFragmentDirections.actionLinkDevice()));
-
-    disposables.bindTo(getViewLifecycleOwner().getLifecycle());
-    viewModel = new ViewModelProvider(requireActivity()).get(RegistrationViewModel.class);
-
-    if (viewModel.isReregister()) {
-      cancel.setVisibility(View.VISIBLE);
-      cancel.setOnClickListener(v -> requireActivity().finish());
-    } else {
-      cancel.setVisibility(View.GONE);
-    }
-
-    viewModel.getLiveNumber().observe(getViewLifecycleOwner(), controller::updateNumberFormatter);
-
-    if (viewModel.hasCaptchaToken()) {
-      ThreadUtil.runOnMainDelayed(() -> handleRegister(requireContext()), 250);
-    }
-
-    Toolbar toolbar = view.findViewById(R.id.toolbar);
-    ((AppCompatActivity) requireActivity()).setSupportActionBar(toolbar);
-    final ActionBar supportActionBar = ((AppCompatActivity) requireActivity()).getSupportActionBar();
-    if (supportActionBar != null) {
-      supportActionBar.setTitle(null);
-    }
-
-    final NumberViewState viewModelNumber = viewModel.getNumber();
-    if (viewModelNumber.getCountryCode() == 0) {
-      controller.prepopulateCountryCode();
-    }
-    controller.setNumberAndCountryCode(viewModelNumber);
-
-    ViewUtil.focusAndShowKeyboard(number.getEditText());
-
-    if (viewModel.hasUserSkippedReRegisterFlow() && viewModel.shouldAutoShowSmsConfirmDialog()) {
-      viewModel.setAutoShowSmsConfirmDialog(false);
-      ThreadUtil.runOnMainDelayed(() -> handleRegister(requireContext()), 250);
-    }
-  }
-
-  @Override
-  public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
-    inflater.inflate(R.menu.enter_phone_number, menu);
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-    if (item.getItemId() == R.id.phone_menu_use_proxy) {
-      SafeNavigation.safeNavigate(Navigation.findNavController(requireView()), EnterPhoneNumberFragmentDirections.actionEditProxy());
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  private void handleRegister(@NonNull Context context) {
-    if (viewModel.getNumber().getCountryCode() == 0) {
-      showErrorDialog(context, getString(R.string.RegistrationActivity_you_must_specify_your_country_code));
-      return;
-    }
-
-    if (TextUtils.isEmpty(viewModel.getNumber().getNationalNumber())) {
-      showErrorDialog(context, getString(R.string.RegistrationActivity_please_enter_a_valid_phone_number_to_register));
-      return;
-    }
-
-    final NumberViewState number     = viewModel.getNumber();
-    final String          e164number = number.getE164Number();
-
-    if (!number.isValid()) {
-      Dialogs.showAlertDialog(context,
-                              getString(R.string.RegistrationActivity_invalid_number),
-                              String.format(getString(R.string.RegistrationActivity_the_number_you_specified_s_is_invalid), e164number));
-      return;
-    }
-
-    TextSecurePreferences.setHasSeenNetworkConfig(context, true);
-    ApplicationDependencies.getNetworkManager().setNetworkEnabled(true);
-
-    PlayServicesUtil.PlayServicesStatus fcmStatus = PlayServicesUtil.getPlayServicesStatus(context);
-
-    if (fcmStatus == PlayServicesUtil.PlayServicesStatus.SUCCESS) {
-      confirmNumberPrompt(context, e164number, () -> onE164EnteredSuccessfully(context, true));
-    } else if (fcmStatus == PlayServicesUtil.PlayServicesStatus.DISABLED) {
-      confirmNumberPrompt(context, e164number, () -> onE164EnteredSuccessfully(context, false));
-    } else if (fcmStatus == PlayServicesUtil.PlayServicesStatus.MISSING) {
-      confirmNumberPrompt(context, e164number, () -> handlePromptForNoPlayServices(context));
-    } else if (fcmStatus == PlayServicesUtil.PlayServicesStatus.NEEDS_UPDATE) {
-      GoogleApiAvailability.getInstance().getErrorDialog(requireActivity(), ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED, 0).show();
-    } else {
-      Dialogs.showAlertDialog(context,
-                              getString(R.string.RegistrationActivity_play_services_error),
-                              getString(R.string.RegistrationActivity_google_play_services_is_updating_or_unavailable));
-    }
-  }
-
-  private void onE164EnteredSuccessfully(@NonNull Context context, boolean fcmSupported) {
-    enterInProgressUiState();
-    Log.d(TAG, "E164 entered successfully.");
-    Disposable disposable = viewModel.canEnterSkipSmsFlow()
-                                     .observeOn(AndroidSchedulers.mainThread())
-                                     .onErrorReturnItem(false)
-                                     .subscribe(canEnter -> {
-                                       if (canEnter) {
-                                         Log.i(TAG, "Entering skip flow.");
-                                         SafeNavigation.safeNavigate(NavHostFragment.findNavController(this), EnterPhoneNumberFragmentDirections.actionReRegisterWithPinFragment());
-                                       } else {
-                                         Log.i(TAG, "Unable to collect necessary data to enter skip flow, returning to normal");
-                                         handleRequestVerification(context, fcmSupported);
-                                       }
-                                     });
-    disposables.add(disposable);
-  }
-
-  private void handleRequestVerification(@NonNull Context context, boolean fcmSupported) {
-    if (fcmSupported) {
-      SmsRetrieverClient client  = SmsRetriever.getClient(context);
-      Task<Void>         task    = client.startSmsRetriever();
-      AtomicBoolean      handled = new AtomicBoolean(false);
-
-      Debouncer debouncer = new Debouncer(TimeUnit.SECONDS.toMillis(5));
-      debouncer.publish(() -> {
-        if (!handled.getAndSet(true)) {
-          Log.w(TAG, "Timed out waiting for SMS listener!");
-          requestVerificationCode(Mode.SMS_WITHOUT_LISTENER);
-        }
-      });
-
-      task.addOnSuccessListener(none -> {
-        if (!handled.getAndSet(true)) {
-          Log.i(TAG, "Successfully registered SMS listener.");
-          requestVerificationCode(Mode.SMS_WITH_LISTENER);
-        } else {
-          Log.w(TAG, "Successfully registered listener after timeout.");
-        }
-        debouncer.clear();
-      });
-
-      task.addOnFailureListener(e -> {
-        if (!handled.getAndSet(true)) {
-          Log.w(TAG, "Failed to register SMS listener.", e);
-          requestVerificationCode(Mode.SMS_WITHOUT_LISTENER);
-        } else {
-          Log.w(TAG, "Failed to register listener after timeout.");
-        }
-        debouncer.clear();
-      });
-
-      task.addOnCanceledListener(() -> {
-        if (!handled.getAndSet(true)) {
-          Log.w(TAG, "SMS listener registration canceled.");
-          requestVerificationCode(Mode.SMS_WITHOUT_LISTENER);
-        } else {
-          Log.w(TAG, "SMS listener registration canceled after timeout.");
-        }
-        debouncer.clear();
-      });
-
-    } else {
-      Log.i(TAG, "FCM is not supported, using no SMS listener");
-      requestVerificationCode(Mode.SMS_WITHOUT_LISTENER);
-    }
-  }
-
-  private void enterInProgressUiState() {
-    register.setSpinning();
-    linkDevice.setEnabled(false);
-    countryCode.setEnabled(false);
-    number.setEnabled(false);
-    cancel.setVisibility(View.GONE);
-  }
-
-  private void exitInProgressUiState() {
-    register.cancelSpinning();
-    linkDevice.setEnabled(true);
-    countryCode.setEnabled(true);
-    number.setEnabled(true);
-    if (viewModel.isReregister()) {
-      cancel.setVisibility(View.VISIBLE);
-    }
-  }
-
-  private void requestVerificationCode(@NonNull Mode mode) {
-    NavController                         navController       = NavHostFragment.findNavController(this);
-    MccMncProducer                        mccMncProducer      = new MccMncProducer(requireContext());
-    final DialogInterface.OnClickListener proceedToNextScreen = (dialog, which) -> SafeNavigation.safeNavigate(navController, EnterPhoneNumberFragmentDirections.actionEnterVerificationCode());
-    Disposable request = viewModel.requestVerificationCode(mode, mccMncProducer.getMcc(), mccMncProducer.getMnc())
-                                  .doOnSubscribe(unused -> SignalStore.account().setRegistered(false))
-                                  .observeOn(AndroidSchedulers.mainThread())
-                                  .subscribe((RegistrationSessionProcessor processor) -> {
-                                    Context context = getContext();
-                                    if (context == null) {
-                                      Log.w(TAG, "[requestVerificationCode] Invalid context! Skipping.");
-                                      return;
-                                    }
-
-                                    if (processor.verificationCodeRequestSuccess()) {
-                                      disposables.add(updateFcmTokenValue());
-                                      SafeNavigation.safeNavigate(navController, EnterPhoneNumberFragmentDirections.actionEnterVerificationCode());
-                                    } else if (processor.captchaRequired(viewModel.getExcludedChallenges())) {
-                                      Log.i(TAG, "Unable to request sms code due to captcha required");
-                                      SafeNavigation.safeNavigate(navController, EnterPhoneNumberFragmentDirections.actionRequestCaptcha());
-                                    } else if (processor.exhaustedVerificationCodeAttempts()) {
-                                      Log.i(TAG, "Unable to request sms code due to exhausting attempts");
-                                      showErrorDialog(context, context.getString(R.string.RegistrationActivity_rate_limited_to_service));
-                                    } else if (processor.rateLimit()) {
-                                      Log.i(TAG, "Unable to request sms code due to rate limit");
-                                      showErrorDialog(context, context.getString(R.string.RegistrationActivity_rate_limited_to_try_again, formatMillisecondsToString(processor.getRateLimit())));
-                                    } else if (processor.isImpossibleNumber()) {
-                                      Log.w(TAG, "Impossible number", processor.getError());
-                                      Dialogs.showAlertDialog(requireContext(),
-                                                              context.getString(R.string.RegistrationActivity_invalid_number),
-                                                              String.format(context.getString(R.string.RegistrationActivity_the_number_you_specified_s_is_invalid), viewModel.getNumber().getFullFormattedNumber()));
-                                    } else if (processor.isNonNormalizedNumber()) {
-                                      handleNonNormalizedNumberError(processor.getOriginalNumber(), processor.getNormalizedNumber(), mode);
-                                    } else if (processor.isTokenRejected()) {
-                                      Log.i(TAG, "The server did not accept the information.", processor.getError());
-                                      showErrorDialog(context, context.getString(R.string.RegistrationActivity_we_need_to_verify_that_youre_human));
-                                    } else if (processor.externalServiceUnavailable()) {
-                                      Log.w(TAG, "The server reported a failure with an external service.", processor.getError());
-                                      showErrorDialog(context, context.getString(R.string.RegistrationActivity_unable_to_connect_to_service), proceedToNextScreen);
-                                    } else if (processor.externalServiceRejected()) {
-                                      Log.w(TAG, "The server reported a failure with an external service.", processor.getError());
-                                      showErrorDialog(context, context.getString(R.string.RegistrationActivity_provider_declined), proceedToNextScreen);
-                                    } else if (processor.invalidTransportModeFailure()) {
-                                      Log.w(TAG, "The server reported an invalid transport mode failure.", processor.getError());
-                                      new MaterialAlertDialogBuilder(context)
-                                          .setMessage(R.string.RegistrationActivity_we_couldnt_send_you_a_verification_code)
-                                          .setPositiveButton(R.string.RegistrationActivity_voice_call, (dialog, which) -> requestVerificationCode(Mode.PHONE_CALL))
-                                          .setNegativeButton(R.string.RegistrationActivity_cancel, null)
-                                          .show();
-                                    } else if ( processor.isMalformedRequest()){
-                                      Log.w(TAG, "The server reported a malformed request.", processor.getError());
-                                      showErrorDialog(context, context.getString(R.string.RegistrationActivity_unable_to_connect_to_service), proceedToNextScreen);
-
-                                    } else if (processor.isRetryException()) {
-                                      Log.w(TAG, "The server reported a failure that is retryable.", processor.getError());
-                                      showErrorDialog(context, context.getString(R.string.RegistrationActivity_unable_to_connect_to_service), proceedToNextScreen);
-                                    } else {
-                                      Log.i(TAG, "Unknown error during verification code request", processor.getError());
-                                      showErrorDialog(context, context.getString(R.string.RegistrationActivity_unable_to_connect_to_service));
-                                    }
-
-                                    exitInProgressUiState();
-                                  });
-
-    disposables.add(request);
-  }
-
-  private Disposable updateFcmTokenValue() {
-    return viewModel.updateFcmTokenValue().subscribe();
-  }
-
-  private String formatMillisecondsToString(long milliseconds) {
-    long totalSeconds = milliseconds / 1000;
-    long HH           = totalSeconds / 3600;
-    long MM           = (totalSeconds % 3600) / 60;
-    long SS           = totalSeconds % 60;
-    return String.format(Locale.getDefault(), "%02d:%02d:%02d", HH, MM, SS);
-  }
-
-  public void showErrorDialog(Context context, String msg) {
-    showErrorDialog(context, msg, null);
-  }
-
-  public void showErrorDialog(Context context, String msg, DialogInterface.OnClickListener positiveButtonListener) {
-    new MaterialAlertDialogBuilder(context).setMessage(msg).setPositiveButton(android.R.string.ok, positiveButtonListener).show();
-  }
-
-  @Override
-  public void onNumberFocused() {
-    scrollView.postDelayed(() -> scrollView.smoothScrollTo(0, register.getBottom()), 250);
-  }
-
-  @Override
-  public void onNumberInputDone(@NonNull View view) {
-    ViewUtil.hideKeyboard(requireContext(), view);
-    handleRegister(requireContext());
-  }
-
-  @Override
-  public void setNationalNumber(@NonNull String number) {
-    viewModel.setNationalNumber(number);
-  }
-
-  @Override
-  public void setCountry(int countryCode) {
-    viewModel.onCountrySelected(null, countryCode);
-  }
-
-  @Override
-  public void onStart() {
-    super.onStart();
-    String sessionE164 = viewModel.getSessionE164();
-    if (sessionE164 != null && viewModel.getSessionId() != null && viewModel.getCaptchaToken() == null) {
-      checkIfSessionIsInProgressAndAdvance(sessionE164);
-    }
-  }
-
-  private void checkIfSessionIsInProgressAndAdvance(@NonNull String sessionE164) {
-    NavController navController = NavHostFragment.findNavController(this);
-    Disposable request = viewModel.validateSession(sessionE164)
-                                  .observeOn(AndroidSchedulers.mainThread())
-                                  .subscribe(processor -> {
-                                    if (processor.hasResult() && processor.canSubmitProofImmediately()) {
-                                      try {
-                                        viewModel.restorePhoneNumberStateFromE164(sessionE164);
-                                        SafeNavigation.safeNavigate(navController, EnterPhoneNumberFragmentDirections.actionEnterVerificationCode());
-                                      } catch (NumberParseException numberParseException) {
-                                        viewModel.resetSession();
-                                      }
-                                    } else {
-                                      viewModel.resetSession();
-                                    }
-                                  });
-
-    disposables.add(request);
-  }
-
-  private void handleNonNormalizedNumberError(@NonNull String originalNumber, @NonNull String normalizedNumber, @NonNull Mode mode) {
-    try {
-      Phonenumber.PhoneNumber phoneNumber = PhoneNumberUtil.getInstance().parse(normalizedNumber, null);
-
-      new MaterialAlertDialogBuilder(requireContext())
-          .setTitle(R.string.RegistrationActivity_non_standard_number_format)
-          .setMessage(getString(R.string.RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard, originalNumber, normalizedNumber))
-          .setNegativeButton(android.R.string.no, (d, i) -> d.dismiss())
-          .setNeutralButton(R.string.RegistrationActivity_contact_signal_support, (d, i) -> {
-            String subject = getString(R.string.RegistrationActivity_signal_android_phone_number_format);
-            String body    = SupportEmailUtil.generateSupportEmailBody(requireContext(), R.string.RegistrationActivity_signal_android_phone_number_format, null, null);
-
-            CommunicationActions.openEmail(requireContext(), SupportEmailUtil.getSupportEmailAddress(requireContext()), subject, body);
-            d.dismiss();
-          })
-          .setPositiveButton(R.string.yes, (d, i) -> {
-            countryCode.getEditText().setText(String.valueOf(phoneNumber.getCountryCode()));
-            number.getEditText().setText(String.valueOf(phoneNumber.getNationalNumber()));
-            requestVerificationCode(mode);
-            d.dismiss();
-          })
-          .show();
-    } catch (NumberParseException e) {
-      Log.w(TAG, "Failed to parse number!", e);
-
-      Dialogs.showAlertDialog(requireContext(),
-                              getString(R.string.RegistrationActivity_invalid_number),
-                              String.format(getString(R.string.RegistrationActivity_the_number_you_specified_s_is_invalid), viewModel.getNumber().getFullFormattedNumber()));
-    }
-  }
-
-  private void handlePromptForNoPlayServices(@NonNull Context context) {
-    Log.d(TAG, "Device does not have Play Services, showing consent dialog.");
-    new MaterialAlertDialogBuilder(context)
-        .setTitle(R.string.RegistrationActivity_missing_google_play_services)
-        .setMessage(R.string.RegistrationActivity_this_device_is_missing_google_play_services)
-        .setPositiveButton(R.string.RegistrationActivity_i_understand, (dialog1, which) -> onE164EnteredSuccessfully(context, false))
-        .setNegativeButton(android.R.string.cancel, null)
-        .show();
-  }
-
-  private void confirmNumberPrompt(@NonNull Context context,
-                                   @NonNull String e164number,
-                                   @NonNull Runnable onConfirmed)
-  {
-    enterInProgressUiState();
-
-    disposables.add(
-        viewModel.canEnterSkipSmsFlow()
-                 .observeOn(AndroidSchedulers.mainThread())
-                 .subscribe(canSkipSms -> {
-                   Log.d(TAG, "Showing confirm number dialog. canSkipSms = " + canSkipSms + " hasUserSkipped = " + viewModel.hasUserSkippedReRegisterFlow());
-                   final EditText editText = this.number.getEditText();
-                   showConfirmNumberDialogIfTranslated(context,
-                                                       viewModel.hasUserSkippedReRegisterFlow() ? R.string.RegistrationActivity_additional_verification_required
-                                                                                                : R.string.RegistrationActivity_phone_number_verification_dialog_title,
-                                                       canSkipSms ? null
-                                                                  : R.string.RegistrationActivity_a_verification_code_will_be_sent_to_this_number,
-                                                       e164number,
-                                                       () -> {
-                                                         Log.d(TAG, "User confirmed number.");
-                                                         if (editText != null) {
-                                                           ViewUtil.hideKeyboard(context, editText);
-                                                         }
-                                                         onConfirmed.run();
-                                                       },
-                                                       () -> {
-                                                         Log.d(TAG, "User canceled confirm number, returning to edit number.");
-                                                         exitInProgressUiState();
-                                                         if (editText != null) {
-                                                           ViewUtil.focusAndMoveCursorToEndAndOpenKeyboard(editText);
-                                                         }
-                                                       });
-                            }
-                 )
-    );
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterSmsCodeFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterSmsCodeFragment.java
deleted file mode 100644
index 70f0aa087d..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterSmsCodeFragment.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.thoughtcrime.securesms.registration.fragments;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.navigation.Navigation;
-import androidx.navigation.fragment.NavHostFragment;
-
-import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.registration.viewmodel.RegistrationViewModel;
-import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.signal.core.util.concurrent.SimpleTask;
-import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
-
-import java.io.IOException;
-
-public final class EnterSmsCodeFragment extends BaseEnterSmsCodeFragment<RegistrationViewModel> implements SignalStrengthPhoneStateListener.Callback {
-
-  private static final String TAG = Log.tag(EnterSmsCodeFragment.class);
-
-  public EnterSmsCodeFragment() {
-    super(R.layout.fragment_registration_enter_code);
-  }
-
-  @Override
-  protected @NonNull RegistrationViewModel getViewModel() {
-    return new ViewModelProvider(requireActivity()).get(RegistrationViewModel.class);
-  }
-
-  @Override
-  protected void handleSuccessfulVerify() {
-    SimpleTask.run(() -> {
-      long startTime = System.currentTimeMillis();
-      try {
-        FeatureFlags.refreshSync();
-        Log.i(TAG, "Took " + (System.currentTimeMillis() - startTime) + " ms to get feature flags.");
-      } catch (IOException e) {
-        Log.w(TAG, "Failed to refresh flags after " + (System.currentTimeMillis() - startTime) + " ms.", e);
-      }
-      return null;
-    }, none -> displaySuccess(() -> SafeNavigation.safeNavigate(Navigation.findNavController(requireView()), EnterSmsCodeFragmentDirections.actionSuccessfulRegistration())));
-  }
-
-  @Override
-  protected void navigateToRegistrationLock(long timeRemaining) {
-    SafeNavigation.safeNavigate(Navigation.findNavController(requireView()),
-                                EnterSmsCodeFragmentDirections.actionRequireKbsLockPin(timeRemaining));
-  }
-
-  @Override
-  protected void navigateToCaptcha() {
-    SafeNavigation.safeNavigate(NavHostFragment.findNavController(this), EnterSmsCodeFragmentDirections.actionRequestCaptcha());
-  }
-
-  @Override
-  protected void navigateToKbsAccountLocked() {
-    SafeNavigation.safeNavigate(Navigation.findNavController(requireView()), RegistrationLockFragmentDirections.actionAccountLocked());
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/GrantPermissionsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/GrantPermissionsFragment.kt
deleted file mode 100644
index c37801b045..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/GrantPermissionsFragment.kt
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.registration.fragments
-
-import android.os.Build
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.ui.platform.LocalContext
-import androidx.fragment.app.activityViewModels
-import androidx.navigation.fragment.navArgs
-import org.thoughtcrime.securesms.compose.ComposeFragment
-import org.thoughtcrime.securesms.permissions.Permissions
-import org.thoughtcrime.securesms.registration.compose.GrantPermissionsScreen
-import org.thoughtcrime.securesms.registration.viewmodel.RegistrationViewModel
-import org.thoughtcrime.securesms.util.BackupUtil
-
-/**
- * Fragment displayed during registration which allows a user to read through
- * what permissions are granted to Signal and why, and a means to either skip
- * granting those permissions or continue to grant via system dialogs.
- */
-class GrantPermissionsFragment : ComposeFragment() {
-
-  private val args by navArgs<GrantPermissionsFragmentArgs>()
-  private val viewModel by activityViewModels<RegistrationViewModel>()
-  private val isSearchingForBackup = mutableStateOf(false)
-
-  @Composable
-  override fun FragmentContent() {
-    val isSearchingForBackup by this.isSearchingForBackup
-
-    GrantPermissionsScreen(
-      deviceBuildVersion = Build.VERSION.SDK_INT,
-      isSearchingForBackup = isSearchingForBackup,
-      isBackupSelectionRequired = BackupUtil.isUserSelectionRequired(LocalContext.current),
-      onNextClicked = this::onNextClicked,
-      onNotNowClicked = this::onNotNowClicked
-    )
-  }
-
-  override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String?>, grantResults: IntArray) {
-    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults)
-  }
-
-  private fun onNextClicked() {
-    when (args.welcomeAction) {
-      WelcomeAction.CONTINUE -> {
-        WelcomeFragment.continueClicked(
-          this,
-          viewModel,
-          { isSearchingForBackup.value = true },
-          { isSearchingForBackup.value = false },
-          GrantPermissionsFragmentDirections.actionSkipRestore(),
-          GrantPermissionsFragmentDirections.actionRestore()
-        )
-      }
-
-      WelcomeAction.RESTORE_BACKUP -> {
-        WelcomeFragment.restoreFromBackupClicked(
-          this,
-          viewModel,
-          GrantPermissionsFragmentDirections.actionTransferOrRestore()
-        )
-      }
-    }
-  }
-
-  private fun onNotNowClicked() {
-    when (args.welcomeAction) {
-      WelcomeAction.CONTINUE -> {
-        WelcomeFragment.gatherInformationAndContinue(
-          this,
-          viewModel,
-          { isSearchingForBackup.value = true },
-          { isSearchingForBackup.value = false },
-          GrantPermissionsFragmentDirections.actionSkipRestore(),
-          GrantPermissionsFragmentDirections.actionRestore()
-        )
-      }
-
-      WelcomeAction.RESTORE_BACKUP -> {
-        WelcomeFragment.gatherInformationAndChooseBackup(
-          this,
-          viewModel,
-          GrantPermissionsFragmentDirections.actionTransferOrRestore()
-        )
-      }
-    }
-  }
-
-  /**
-   * Which welcome action the user selected which prompted this
-   * screen.
-   */
-  enum class WelcomeAction {
-    CONTINUE,
-    RESTORE_BACKUP
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/LinkDeviceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/LinkDeviceFragment.java
deleted file mode 100644
index c90ec2c4bc..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/LinkDeviceFragment.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package org.thoughtcrime.securesms.registration.fragments;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.navigation.Navigation;
-
-import org.signal.core.util.concurrent.LifecycleDisposable;
-import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.LoggingFragment;
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.components.qr.QrView;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.registration.viewmodel.RegistrationViewModel;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
-
-import java.io.IOException;
-import java.util.concurrent.TimeoutException;
-
-import io.reactivex.rxjava3.core.Single;
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-
-public final class LinkDeviceFragment extends LoggingFragment {
-
-  private static final String TAG = Log.tag(LinkDeviceFragment.class);
-
-  private int                   state;
-  private View                  loadingSpinner;
-  private QrView                qrImageView;
-  private TextView              textCode;
-  private View                  labelError;
-  private View                  labelTimeout;
-  private View                  retry;
-  private RegistrationViewModel viewModel;
-
-  private final LifecycleDisposable disposables = new LifecycleDisposable();
-
-  @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-    return inflater.inflate(R.layout.fragment_registration_link_device, container, false);
-  }
-
-  @Override
-  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-    super.onViewCreated(view, savedInstanceState);
-
-    loadingSpinner = view.findViewById(R.id.linking_loading_spinner);
-    qrImageView    = view.findViewById(R.id.linking_qr_image);
-    textCode       = view.findViewById(R.id.linking_text_code);
-    labelError     = view.findViewById(R.id.linking_error);
-    labelTimeout   = view.findViewById(R.id.linking_timeout);
-    retry          = view.findViewById(R.id.link_retry_button);
-
-    disposables.bindTo(getViewLifecycleOwner().getLifecycle());
-    viewModel = new ViewModelProvider(requireActivity()).get(RegistrationViewModel.class);
-
-    TextSecurePreferences.setHasSeenNetworkConfig(requireContext(), true);
-    ApplicationDependencies.getNetworkManager().setNetworkEnabled(true);
-
-    state = 0;
-    attemptDeviceLink();
-
-    retry.setOnClickListener(v -> attemptDeviceLink());
-
-    textCode.setOnClickListener(v -> {
-      Context context = requireContext();
-      Util.copyToClipboard(context, textCode.getText());
-      Toast.makeText(context, R.string.RegistrationActivity_copied_to_clipboard, Toast.LENGTH_SHORT).show();
-    });
-  }
-
-  private void attemptDeviceLink() {
-    if (state != 0) return;
-    loadingSpinner.setVisibility(View.VISIBLE);
-    labelError.setVisibility(View.GONE);
-    labelTimeout.setVisibility(View.GONE);
-    retry.setVisibility(View.GONE);
-    state = 1;
-    // This is hacky, but LifecycleDisposable doesn't expose a method to remove a single disposable,
-    // and we will leak for each repeated attempt if we don't clear it before a retry
-    disposables.clear();
-    disposables.add(
-      viewModel.requestDeviceLinkCode()
-               .doOnSubscribe(unused -> SignalStore.account().setRegistered(false))
-               .observeOn(AndroidSchedulers.mainThread())
-               .flatMap(processor -> {
-                 if (processor.hasResult()) {
-                   state = 2;
-                   String deviceLinkCode = processor.getResult().getDeviceLinkCode();
-                   Log.d(TAG, "Displaying device link code: "+deviceLinkCode);
-                   qrImageView.setQrText(deviceLinkCode);
-                   textCode.setText(deviceLinkCode);
-                   loadingSpinner.setVisibility(View.GONE);
-                   qrImageView.setVisibility(View.VISIBLE);
-                   textCode.setVisibility(View.VISIBLE);
-                   return viewModel.attemptDeviceLink(processor.getResult());
-                 }
-                 return Single.just(processor.asNewDeviceRegistrationReturnProcessor());
-               })
-               .observeOn(AndroidSchedulers.mainThread())
-               .subscribe(processor -> {
-                 try {
-                   processor.getResultOrThrow();
-                   state = -1;
-                   SafeNavigation.safeNavigate(Navigation.findNavController(requireView()), LinkDeviceFragmentDirections.actionLinkDeviceComplete());
-                 } catch (Throwable t) {
-                   Log.w(TAG, "Failed to link device. Allowing user to retry", t);
-                   loadingSpinner.setVisibility(View.GONE);
-                   qrImageView.setVisibility(View.GONE);
-                   textCode.setVisibility(View.GONE);
-                   if (state == 2) {
-                     labelTimeout.setVisibility(View.VISIBLE);
-                   } else {
-                     labelError.setVisibility(View.VISIBLE);
-                   }
-                   retry.setVisibility(View.VISIBLE);
-                   state = 0;
-                 }
-               })
-    );
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/LinkDeviceNameFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/LinkDeviceNameFragment.java
deleted file mode 100644
index dd584e8302..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/LinkDeviceNameFragment.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.thoughtcrime.securesms.registration.fragments;
-
-import android.os.Build;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.navigation.Navigation;
-
-import org.signal.core.util.concurrent.LifecycleDisposable;
-import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.LoggingFragment;
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.components.LabeledEditText;
-import org.thoughtcrime.securesms.registration.viewmodel.RegistrationViewModel;
-import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
-import org.thoughtcrime.securesms.util.text.AfterTextChanged;
-
-public final class LinkDeviceNameFragment extends LoggingFragment {
-
-  private static final String TAG = Log.tag(LinkDeviceNameFragment.class);
-
-  private RegistrationViewModel viewModel;
-
-  private final LifecycleDisposable disposables = new LifecycleDisposable();
-
-  @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-    return inflater.inflate(R.layout.fragment_registration_link_device_name, container, false);
-  }
-
-  @Override
-  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-    super.onViewCreated(view, savedInstanceState);
-
-    LabeledEditText deviceName = view.findViewById(R.id.device_name);
-    View            linkDevice = view.findViewById(R.id.link_button);
-
-    disposables.bindTo(getViewLifecycleOwner().getLifecycle());
-    viewModel = new ViewModelProvider(requireActivity()).get(RegistrationViewModel.class);
-
-    deviceName.getInput().addTextChangedListener(new AfterTextChanged(editable -> {
-      linkDevice.setEnabled(editable.length() > 0);
-      viewModel.setDeviceName(editable.toString());
-    }));
-    deviceName.setText(Build.MODEL);
-
-    linkDevice.setOnClickListener(v -> SafeNavigation.safeNavigate(Navigation.findNavController(v), LinkDeviceNameFragmentDirections.actionLinkDevice()));
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ReRegisterWithPinFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ReRegisterWithPinFragment.kt
deleted file mode 100644
index bab50b5ccb..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ReRegisterWithPinFragment.kt
+++ /dev/null
@@ -1,282 +0,0 @@
-package org.thoughtcrime.securesms.registration.fragments
-
-import android.os.Bundle
-import android.text.InputType
-import android.view.View
-import android.view.inputmethod.EditorInfo
-import android.widget.Toast
-import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.viewModels
-import androidx.navigation.Navigation
-import androidx.navigation.fragment.findNavController
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.signal.core.util.concurrent.LifecycleDisposable
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.LoggingFragment
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.databinding.PinRestoreEntryFragmentBinding
-import org.thoughtcrime.securesms.lock.v2.PinKeyboardType
-import org.thoughtcrime.securesms.lock.v2.SvrConstants
-import org.thoughtcrime.securesms.registration.VerifyResponseWithRegistrationLockProcessor
-import org.thoughtcrime.securesms.registration.viewmodel.ReRegisterWithPinViewModel
-import org.thoughtcrime.securesms.registration.viewmodel.RegistrationViewModel
-import org.thoughtcrime.securesms.util.CommunicationActions
-import org.thoughtcrime.securesms.util.SupportEmailUtil
-import org.thoughtcrime.securesms.util.ViewUtil
-import org.thoughtcrime.securesms.util.navigation.safeNavigate
-
-/**
- * Using a recovery password or restored KBS token attempt to register in the skip flow.
- */
-class ReRegisterWithPinFragment : LoggingFragment(R.layout.pin_restore_entry_fragment) {
-
-  companion object {
-    private val TAG = Log.tag(ReRegisterWithPinFragment::class.java)
-  }
-
-  private var _binding: PinRestoreEntryFragmentBinding? = null
-  private val binding: PinRestoreEntryFragmentBinding
-    get() = _binding!!
-
-  private val registrationViewModel: RegistrationViewModel by activityViewModels()
-  private val reRegisterViewModel: ReRegisterWithPinViewModel by viewModels()
-
-  private val disposables = LifecycleDisposable()
-
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    _binding = PinRestoreEntryFragmentBinding.bind(view)
-
-    disposables.bindTo(viewLifecycleOwner.lifecycle)
-
-    RegistrationViewDelegate.setDebugLogSubmitMultiTapView(binding.pinRestorePinTitle)
-
-    binding.pinRestorePinDescription.setText(R.string.RegistrationLockFragment__enter_the_pin_you_created_for_your_account)
-
-    binding.pinRestoreForgotPin.visibility = View.GONE
-    binding.pinRestoreForgotPin.setOnClickListener { onNeedHelpClicked() }
-
-    binding.pinRestoreSkipButton.setOnClickListener { onSkipClicked() }
-
-    binding.pinRestorePinInput.imeOptions = EditorInfo.IME_ACTION_DONE
-    binding.pinRestorePinInput.setOnEditorActionListener { v, actionId, _ ->
-      if (actionId == EditorInfo.IME_ACTION_DONE) {
-        ViewUtil.hideKeyboard(requireContext(), v!!)
-        handlePinEntry()
-        return@setOnEditorActionListener true
-      }
-      false
-    }
-
-    enableAndFocusPinEntry()
-
-    binding.pinRestorePinConfirm.setOnClickListener {
-      handlePinEntry()
-    }
-
-    binding.pinRestoreKeyboardToggle.setOnClickListener {
-      val currentKeyboardType: PinKeyboardType = getPinEntryKeyboardType()
-      updateKeyboard(currentKeyboardType.other)
-      binding.pinRestoreKeyboardToggle.setIconResource(currentKeyboardType.iconResource)
-    }
-
-    binding.pinRestoreKeyboardToggle.setIconResource(getPinEntryKeyboardType().other.iconResource)
-
-    reRegisterViewModel.updateSvrTriesRemaining(registrationViewModel.svrTriesRemaining)
-
-    disposables += reRegisterViewModel.triesRemaining.subscribe(this::updateTriesRemaining)
-  }
-
-  override fun onDestroyView() {
-    _binding = null
-    super.onDestroyView()
-  }
-
-  private fun handlePinEntry() {
-    val pin: String? = binding.pinRestorePinInput.text?.toString()
-
-    val trimmedLength = pin?.trim()?.length ?: 0
-    if (trimmedLength == 0) {
-      Toast.makeText(requireContext(), R.string.RegistrationActivity_you_must_enter_your_registration_lock_PIN, Toast.LENGTH_LONG).show()
-      enableAndFocusPinEntry()
-      return
-    }
-
-    if (trimmedLength < BaseRegistrationLockFragment.MINIMUM_PIN_LENGTH) {
-      Toast.makeText(requireContext(), getString(R.string.RegistrationActivity_your_pin_has_at_least_d_digits_or_characters, BaseRegistrationLockFragment.MINIMUM_PIN_LENGTH), Toast.LENGTH_LONG).show()
-      enableAndFocusPinEntry()
-      return
-    }
-
-    disposables += registrationViewModel.verifyReRegisterWithPin(pin!!)
-      .doOnSubscribe {
-        ViewUtil.hideKeyboard(requireContext(), binding.pinRestorePinInput)
-        binding.pinRestorePinInput.isEnabled = false
-        binding.pinRestorePinConfirm.setSpinning()
-      }
-      .doAfterTerminate {
-        binding.pinRestorePinInput.isEnabled = true
-        binding.pinRestorePinConfirm.cancelSpinning()
-      }
-      .subscribe { processor ->
-        if (processor.hasResult()) {
-          Log.i(TAG, "Successfully re-registered via skip flow")
-          try {
-            findNavController().safeNavigate(R.id.action_reRegisterWithPinFragment_to_registrationCompletePlaceHolderFragment)
-            return@subscribe
-          } catch (ise: IllegalStateException) {
-            Log.w(TAG, "Could not get parent activity fragment manager!")
-          }
-
-          try {
-            val hostActivity = activity
-            if (hostActivity != null) {
-              Navigation.findNavController(hostActivity, R.id.nav_host_fragment).safeNavigate(R.id.action_reRegisterWithPinFragment_to_registrationCompletePlaceHolderFragment)
-              return@subscribe
-            } else {
-              Log.w(TAG, "Could not get parent activity!")
-            }
-          } catch (ise: IllegalStateException) {
-            Log.w(TAG, "Could not find navigation host fragment!")
-          }
-
-          activity?.let {
-            Log.w(TAG, "Could not navigate to registration complete. Finishing activity gracefully.")
-            it.finish()
-          }
-
-          return@subscribe
-        }
-
-        reRegisterViewModel.hasIncorrectGuess = true
-
-        if (processor is VerifyResponseWithRegistrationLockProcessor && processor.wrongPin()) {
-          reRegisterViewModel.updateSvrTriesRemaining(processor.svrTriesRemaining)
-          if (processor.svrTriesRemaining != null) {
-            registrationViewModel.svrTriesRemaining = processor.svrTriesRemaining
-          }
-          return@subscribe
-        } else if (processor.isRegistrationLockPresentAndSvrExhausted()) {
-          Log.w(TAG, "Unable to continue skip flow, KBS is locked")
-          onAccountLocked()
-        } else if (processor.isIncorrectRegistrationRecoveryPassword()) {
-          Log.w(TAG, "Registration recovery password was incorrect. Moving to SMS verification.")
-          onSkipPinEntry()
-        } else if (processor.isServerSentError()) {
-          Log.i(TAG, "Error from server, not likely recoverable", processor.error)
-          genericErrorDialog()
-        } else {
-          Log.i(TAG, "Unexpected error occurred", processor.error)
-          genericErrorDialog()
-        }
-      }
-  }
-
-  private fun updateTriesRemaining(triesRemaining: Int) {
-    if (reRegisterViewModel.hasIncorrectGuess) {
-      if (triesRemaining == 1 && !reRegisterViewModel.isLocalVerification) {
-        MaterialAlertDialogBuilder(requireContext())
-          .setTitle(R.string.PinRestoreEntryFragment_incorrect_pin)
-          .setMessage(resources.getQuantityString(R.plurals.PinRestoreEntryFragment_you_have_d_attempt_remaining, triesRemaining, triesRemaining))
-          .setPositiveButton(android.R.string.ok, null)
-          .show()
-      }
-
-      if (triesRemaining > 5) {
-        binding.pinRestorePinInputLabel.setText(R.string.PinRestoreEntryFragment_incorrect_pin)
-      } else {
-        binding.pinRestorePinInputLabel.text = resources.getQuantityString(R.plurals.RegistrationLockFragment__incorrect_pin_d_attempts_remaining, triesRemaining, triesRemaining)
-      }
-      binding.pinRestoreForgotPin.visibility = View.VISIBLE
-    } else {
-      if (triesRemaining == 1) {
-        binding.pinRestoreForgotPin.visibility = View.VISIBLE
-        if (!reRegisterViewModel.isLocalVerification) {
-          MaterialAlertDialogBuilder(requireContext())
-            .setMessage(resources.getQuantityString(R.plurals.PinRestoreEntryFragment_you_have_d_attempt_remaining, triesRemaining, triesRemaining))
-            .setPositiveButton(android.R.string.ok, null)
-            .show()
-        }
-      }
-    }
-
-    if (triesRemaining == 0) {
-      Log.w(TAG, "Account locked. User out of attempts on KBS.")
-      onAccountLocked()
-    }
-  }
-
-  private fun onAccountLocked() {
-    Log.d(TAG, "Showing Incorrect PIN dialog. Is local verification: ${reRegisterViewModel.isLocalVerification}")
-    val message = if (reRegisterViewModel.isLocalVerification) R.string.ReRegisterWithPinFragment_out_of_guesses_local else R.string.PinRestoreLockedFragment_youve_run_out_of_pin_guesses
-
-    MaterialAlertDialogBuilder(requireContext())
-      .setTitle(R.string.PinRestoreEntryFragment_incorrect_pin)
-      .setMessage(message)
-      .setCancelable(false)
-      .setPositiveButton(R.string.ReRegisterWithPinFragment_send_sms_code) { _, _ -> onSkipPinEntry() }
-      .setNegativeButton(R.string.AccountLockedFragment__learn_more) { _, _ -> CommunicationActions.openBrowserLink(requireContext(), getString(R.string.PinRestoreLockedFragment_learn_more_url)) }
-      .show()
-  }
-
-  private fun enableAndFocusPinEntry() {
-    binding.pinRestorePinInput.isEnabled = true
-    binding.pinRestorePinInput.isFocusable = true
-    ViewUtil.focusAndShowKeyboard(binding.pinRestorePinInput)
-  }
-
-  private fun getPinEntryKeyboardType(): PinKeyboardType {
-    val isNumeric = binding.pinRestorePinInput.inputType and InputType.TYPE_MASK_CLASS == InputType.TYPE_CLASS_NUMBER
-    return if (isNumeric) PinKeyboardType.NUMERIC else PinKeyboardType.ALPHA_NUMERIC
-  }
-
-  private fun updateKeyboard(keyboard: PinKeyboardType) {
-    val isAlphaNumeric = keyboard == PinKeyboardType.ALPHA_NUMERIC
-    binding.pinRestorePinInput.inputType = if (isAlphaNumeric) InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD else InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_VARIATION_PASSWORD
-    binding.pinRestorePinInput.text?.clear()
-  }
-
-  private fun onNeedHelpClicked() {
-    val message = if (reRegisterViewModel.isLocalVerification) R.string.ReRegisterWithPinFragment_need_help_local else R.string.PinRestoreEntryFragment_your_pin_is_a_d_digit_code
-
-    MaterialAlertDialogBuilder(requireContext())
-      .setTitle(R.string.PinRestoreEntryFragment_need_help)
-      .setMessage(getString(message, SvrConstants.MINIMUM_PIN_LENGTH))
-      .setPositiveButton(R.string.PinRestoreEntryFragment_skip) { _, _ -> onSkipPinEntry() }
-      .setNeutralButton(R.string.PinRestoreEntryFragment_contact_support) { _, _ ->
-        val body = SupportEmailUtil.generateSupportEmailBody(requireContext(), R.string.ReRegisterWithPinFragment_support_email_subject, null, null)
-
-        CommunicationActions.openEmail(
-          requireContext(),
-          SupportEmailUtil.getSupportEmailAddress(requireContext()),
-          getString(R.string.ReRegisterWithPinFragment_support_email_subject),
-          body
-        )
-      }
-      .setNegativeButton(R.string.PinRestoreEntryFragment_cancel, null)
-      .show()
-  }
-
-  private fun onSkipClicked() {
-    val message = if (reRegisterViewModel.isLocalVerification) R.string.ReRegisterWithPinFragment_skip_local else R.string.PinRestoreEntryFragment_if_you_cant_remember_your_pin
-
-    MaterialAlertDialogBuilder(requireContext())
-      .setTitle(R.string.PinRestoreEntryFragment_skip_pin_entry)
-      .setMessage(message)
-      .setPositiveButton(R.string.PinRestoreEntryFragment_skip) { _, _ -> onSkipPinEntry() }
-      .setNegativeButton(R.string.PinRestoreEntryFragment_cancel, null)
-      .show()
-  }
-
-  private fun onSkipPinEntry() {
-    Log.d(TAG, "User skipping PIN entry.")
-    registrationViewModel.setUserSkippedReRegisterFlow(true)
-    findNavController().safeNavigate(R.id.action_reRegisterWithPinFragment_to_enterPhoneNumberFragment)
-  }
-
-  private fun genericErrorDialog() {
-    MaterialAlertDialogBuilder(requireContext())
-      .setMessage(R.string.RegistrationActivity_error_connecting_to_service)
-      .setPositiveButton(android.R.string.ok, null)
-      .show()
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.kt
deleted file mode 100644
index bc9763b6b2..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.kt
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.thoughtcrime.securesms.registration.fragments
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.viewModels
-import androidx.navigation.ActivityNavigator
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.LoggingFragment
-import org.thoughtcrime.securesms.MainActivity
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.jobs.MultiDeviceProfileContentUpdateJob
-import org.thoughtcrime.securesms.jobs.MultiDeviceProfileKeyUpdateJob
-import org.thoughtcrime.securesms.jobs.ProfileUploadJob
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.lock.v2.CreateSvrPinActivity
-import org.thoughtcrime.securesms.pin.PinRestoreActivity
-import org.thoughtcrime.securesms.profiles.AvatarHelper
-import org.thoughtcrime.securesms.profiles.edit.CreateProfileActivity
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.registration.RegistrationUtil
-import org.thoughtcrime.securesms.registration.viewmodel.RegistrationViewModel
-
-/**
- * [RegistrationCompleteFragment] is not visible to the user, but functions as basically a redirect towards one of:
- * - [PIN Restore flow activity](org.thoughtcrime.securesms.pin.PinRestoreActivity)
- * - [Profile](org.thoughtcrime.securesms.profiles.edit.EditProfileActivity) / [PIN creation](org.thoughtcrime.securesms.lock.v2.CreateKbsPinActivity) flow activities (this class chains the necessary activities together as an intent)
- * - Exit registration flow and progress to conversation list
- */
-class RegistrationCompleteFragment : LoggingFragment() {
-  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-    return inflater.inflate(R.layout.fragment_registration_blank, container, false)
-  }
-
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    super.onViewCreated(view, savedInstanceState)
-    val activity = requireActivity()
-    val viewModel: RegistrationViewModel by viewModels(ownerProducer = { requireActivity() })
-
-    if (SignalStore.misc().hasLinkedDevices) {
-      SignalStore.misc().shouldShowLinkedDevicesReminder = viewModel.isReregister
-    }
-
-    if (SignalStore.storageService().needsAccountRestore()) {
-      Log.i(TAG, "Performing pin restore.")
-      activity.startActivity(Intent(activity, PinRestoreActivity::class.java))
-    } else {
-      val isProfileNameEmpty = Recipient.self().profileName.isEmpty
-      val isAvatarEmpty = !AvatarHelper.hasAvatar(activity, Recipient.self().id)
-      // MOLLY: If this is a link, and not a new registration, give the device a chance to sync the info from main before force-changing it.
-      val isLinkedDevice = SignalStore.account().isLinkedDevice
-      val needsProfile = if (isLinkedDevice) false else isProfileNameEmpty || isAvatarEmpty
-      val needsPin = if (isLinkedDevice) false else !SignalStore.svr().hasPin() && !viewModel.isReregister
-
-      Log.i(TAG, "Pin restore flow not required. Profile name: $isProfileNameEmpty | Profile avatar: $isAvatarEmpty | Needs PIN: $needsPin")
-
-      if (!needsProfile && !needsPin) {
-        ApplicationDependencies.getJobManager()
-          .startChain(ProfileUploadJob())
-          .then(listOf(MultiDeviceProfileKeyUpdateJob(), MultiDeviceProfileContentUpdateJob()))
-          .enqueue()
-        RegistrationUtil.maybeMarkRegistrationComplete()
-      }
-
-      var startIntent = MainActivity.clearTop(activity)
-
-      if (needsPin) {
-        startIntent = chainIntents(CreateSvrPinActivity.getIntentForPinCreate(activity), startIntent)
-      }
-
-      if (needsProfile) {
-        startIntent = chainIntents(CreateProfileActivity.getIntentForUserProfile(activity), startIntent)
-      }
-
-      activity.startActivity(startIntent)
-    }
-
-    activity.finish()
-    ActivityNavigator.applyPopAnimationsToPendingTransition(activity)
-  }
-
-  private fun chainIntents(sourceIntent: Intent, nextIntent: Intent): Intent {
-    sourceIntent.putExtra("next_intent", nextIntent)
-    return sourceIntent
-  }
-
-  companion object {
-    private val TAG = Log.tag(RegistrationCompleteFragment::class.java)
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationConstants.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationConstants.java
index 8228bd6efa..883523e07f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationConstants.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationConstants.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 package org.thoughtcrime.securesms.registration.fragments;
 
 public final class RegistrationConstants {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java
deleted file mode 100644
index 1298784b9f..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.thoughtcrime.securesms.registration.fragments;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.navigation.Navigation;
-
-import org.signal.core.util.concurrent.SimpleTask;
-import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobs.ReclaimUsernameAndLinkJob;
-import org.thoughtcrime.securesms.jobs.StorageAccountRestoreJob;
-import org.thoughtcrime.securesms.jobs.StorageSyncJob;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.registration.viewmodel.BaseRegistrationViewModel;
-import org.thoughtcrime.securesms.registration.viewmodel.RegistrationViewModel;
-import org.thoughtcrime.securesms.util.CommunicationActions;
-import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.signal.core.util.Stopwatch;
-import org.thoughtcrime.securesms.util.SupportEmailUtil;
-import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
-
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-
-public final class RegistrationLockFragment extends BaseRegistrationLockFragment {
-
-  private static final String TAG = Log.tag(RegistrationLockFragment.class);
-
-  public RegistrationLockFragment() {
-    super(R.layout.fragment_registration_lock);
-  }
-
-  @Override
-  protected BaseRegistrationViewModel getViewModel() {
-    return new ViewModelProvider(requireActivity()).get(RegistrationViewModel.class);
-  }
-
-  @Override
-  protected void navigateToAccountLocked() {
-    SafeNavigation.safeNavigate(Navigation.findNavController(requireView()), RegistrationLockFragmentDirections.actionAccountLocked());
-  }
-
-  @Override
-  protected void handleSuccessfulPinEntry(@NonNull String pin) {
-    SignalStore.pinValues().setKeyboardType(getPinEntryKeyboardType());
-
-    SimpleTask.run(() -> {
-      SignalStore.onboarding().clearAll();
-
-      Stopwatch stopwatch = new Stopwatch("RegistrationLockRestore");
-
-      ApplicationDependencies.getJobManager().runSynchronously(new StorageAccountRestoreJob(), StorageAccountRestoreJob.LIFESPAN);
-      stopwatch.split("AccountRestore");
-
-      ApplicationDependencies
-          .getJobManager()
-          .startChain(new StorageSyncJob())
-          .then(new ReclaimUsernameAndLinkJob())
-          .enqueueAndBlockUntilCompletion(TimeUnit.SECONDS.toMillis(10));
-      stopwatch.split("ContactRestore");
-
-      try {
-        FeatureFlags.refreshSync();
-      } catch (IOException e) {
-        Log.w(TAG, "Failed to refresh flags.", e);
-      }
-      stopwatch.split("FeatureFlags");
-
-      stopwatch.stop(TAG);
-
-      return null;
-    }, none -> {
-      pinButton.cancelSpinning();
-      SafeNavigation.safeNavigate(Navigation.findNavController(requireView()), RegistrationLockFragmentDirections.actionSuccessfulRegistration());
-    });
-  }
-
-  @Override
-  protected void sendEmailToSupport() {
-    int subject = R.string.RegistrationLockFragment__signal_registration_need_help_with_pin_for_android_v2_pin;
-
-    String body = SupportEmailUtil.generateSupportEmailBody(requireContext(),
-                                                            subject,
-                                                            null,
-                                                            null);
-    CommunicationActions.openEmail(requireContext(),
-                                   SupportEmailUtil.getSupportEmailAddress(requireContext()),
-                                   getString(subject),
-                                   body);
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java
deleted file mode 100644
index ab2cef3a39..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java
+++ /dev/null
@@ -1,494 +0,0 @@
-package org.thoughtcrime.securesms.registration.fragments;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.Spanned;
-import android.text.TextWatcher;
-import android.text.style.ReplacementSpan;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.MainThread;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.annotation.StringRes;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.navigation.Navigation;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
-import net.zetetic.database.sqlcipher.SQLiteDatabase;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-import org.signal.core.util.ThreadUtil;
-import org.signal.core.util.concurrent.SimpleTask;
-import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.AppInitialization;
-import org.thoughtcrime.securesms.LoggingFragment;
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.backup.BackupEvent;
-import org.thoughtcrime.securesms.backup.BackupPassphrase;
-import org.thoughtcrime.securesms.backup.FullBackupImporter;
-import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
-import org.thoughtcrime.securesms.database.NoExternalStorageException;
-import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.jobmanager.impl.DataRestoreConstraint;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.notifications.NotificationChannels;
-import org.thoughtcrime.securesms.registration.viewmodel.RegistrationViewModel;
-import org.thoughtcrime.securesms.service.LocalBackupListener;
-import org.thoughtcrime.securesms.util.BackupUtil;
-import org.thoughtcrime.securesms.util.DateUtils;
-import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
-import org.thoughtcrime.securesms.util.views.CircularProgressMaterialButton;
-
-import java.io.IOException;
-import java.util.Locale;
-
-import static org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView;
-
-public final class RestoreBackupFragment extends LoggingFragment {
-
-  private static final String TAG                            = Log.tag(RestoreBackupFragment.class);
-  private static final short  OPEN_DOCUMENT_TREE_RESULT_CODE = 13782;
-
-  private TextView                       restoreBackupSize;
-  private TextView                       restoreBackupTime;
-  private TextView                       restoreBackupProgress;
-  private CircularProgressMaterialButton restoreButton;
-  private View                           skipRestoreButton;
-  private RegistrationViewModel          viewModel;
-
-  @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                           Bundle savedInstanceState) {
-    return inflater.inflate(R.layout.fragment_registration_restore_backup, container, false);
-  }
-
-  @Override
-  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-    super.onViewCreated(view, savedInstanceState);
-
-    setDebugLogSubmitMultiTapView(view.findViewById(R.id.verify_header));
-
-    Log.i(TAG, "Backup restore.");
-
-    restoreBackupSize     = view.findViewById(R.id.backup_size_text);
-    restoreBackupTime     = view.findViewById(R.id.backup_created_text);
-    restoreBackupProgress = view.findViewById(R.id.backup_progress_text);
-    restoreButton         = view.findViewById(R.id.restore_button);
-    skipRestoreButton     = view.findViewById(R.id.skip_restore_button);
-
-    skipRestoreButton.setOnClickListener((v) -> {
-                       Log.i(TAG, "User skipped backup restore.");
-                       SafeNavigation.safeNavigate(Navigation.findNavController(view),
-                                                   RestoreBackupFragmentDirections.actionSkip());
-                     });
-
-    viewModel = new ViewModelProvider(requireActivity()).get(RegistrationViewModel.class);
-
-    if (viewModel.isReregister()) {
-      Log.i(TAG, "Skipping backup restore during re-register.");
-      SafeNavigation.safeNavigate(Navigation.findNavController(view),
-                                  RestoreBackupFragmentDirections.actionSkipNoReturn());
-      return;
-    }
-
-    if (viewModel.hasBackupCompleted()) {
-      onBackupComplete();
-      return;
-    }
-
-    if (SignalStore.settings().isBackupEnabled()) {
-      Log.i(TAG, "Backups enabled, so a backup must have been previously restored.");
-      SafeNavigation.safeNavigate(Navigation.findNavController(view),
-                                  RestoreBackupFragmentDirections.actionSkipNoReturn());
-      return;
-    }
-
-    RestoreBackupFragmentArgs args = RestoreBackupFragmentArgs.fromBundle(requireArguments());
-    if ((Build.VERSION.SDK_INT < 29 || BackupUtil.isUserSelectionRequired(requireContext())) && args.getUri() != null) {
-      Log.i(TAG, "Restoring backup from passed uri");
-      initializeBackupForUri(view, args.getUri());
-
-      return;
-    }
-
-    if (BackupUtil.canUserAccessBackupDirectory(requireContext())) {
-      initializeBackupDetection(view);
-    } else {
-      Log.i(TAG, "Skipping backup detection. We don't have the permission.");
-      SafeNavigation.safeNavigate(Navigation.findNavController(view),
-                                  RestoreBackupFragmentDirections.actionSkipNoReturn());
-    }
-  }
-
-  @Override
-  public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-    if (requestCode == OPEN_DOCUMENT_TREE_RESULT_CODE && resultCode == Activity.RESULT_OK && data != null && data.getData() != null) {
-      Uri backupDirectoryUri = data.getData();
-      int takeFlags          = Intent.FLAG_GRANT_READ_URI_PERMISSION |
-                               Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
-
-      SignalStore.settings().setSignalBackupDirectory(backupDirectoryUri);
-      requireContext().getContentResolver()
-                      .takePersistableUriPermission(backupDirectoryUri, takeFlags);
-
-      enableBackups(requireContext());
-
-      SafeNavigation.safeNavigate(Navigation.findNavController(requireView()),
-                                  RestoreBackupFragmentDirections.actionBackupRestored());
-    }
-  }
-
-  private void initializeBackupForUri(@NonNull View view, @NonNull Uri uri) {
-    getFromUri(requireContext(), uri, backup -> handleBackupInfo(view, backup));
-  }
-
-  @SuppressLint("StaticFieldLeak")
-  private void initializeBackupDetection(@NonNull View view) {
-    searchForBackup(backup -> handleBackupInfo(view, backup));
-  }
-
-  private void handleBackupInfo(@NonNull View view, @Nullable BackupUtil.BackupInfo backup) {
-    Context context = getContext();
-    if (context == null) {
-      Log.i(TAG, "No context on fragment, must have navigated away.");
-      return;
-    }
-
-    if (backup == null) {
-      Log.i(TAG, "Skipping backup detection. No backup found, or permission revoked since.");
-      SafeNavigation.safeNavigate(Navigation.findNavController(view),
-                                  RestoreBackupFragmentDirections.actionNoBackupFound());
-    } else {
-      restoreBackupSize.setText(getString(R.string.RegistrationActivity_backup_size_s, Util.getPrettyFileSize(backup.getSize())));
-      restoreBackupTime.setText(getString(R.string.RegistrationActivity_backup_timestamp_s, DateUtils.getExtendedRelativeTimeSpanString(requireContext(), Locale.getDefault(), backup.getTimestamp())));
-
-      restoreButton.setOnClickListener((v) -> handleRestore(v.getContext(), backup));
-    }
-  }
-
-  interface OnBackupSearchResultListener {
-
-    @MainThread
-    void run(@Nullable BackupUtil.BackupInfo backup);
-  }
-
-  static void searchForBackup(@NonNull OnBackupSearchResultListener listener) {
-    new AsyncTask<Void, Void, BackupUtil.BackupInfo>() {
-      @Override
-      protected @Nullable
-      BackupUtil.BackupInfo doInBackground(Void... voids) {
-        try {
-          return BackupUtil.getLatestBackup();
-        } catch (NoExternalStorageException e) {
-          Log.w(TAG, e);
-          return null;
-        }
-      }
-
-      @Override
-      protected void onPostExecute(@Nullable BackupUtil.BackupInfo backup) {
-        listener.run(backup);
-      }
-    }.execute();
-  }
-
-  static void getFromUri(@NonNull Context context,
-                         @NonNull Uri backupUri,
-                         @NonNull OnBackupSearchResultListener listener)
-  {
-    SimpleTask.run(() -> {
-                     try {
-                       return BackupUtil.getBackupInfoFromSingleUri(context, backupUri);
-                     } catch (BackupUtil.BackupFileException e) {
-                       Log.w(TAG, "Could not restore backup.", e);
-                       postToastForBackupRestorationFailure(context, e);
-                       return null;
-                     }
-                   },
-                   listener::run);
-  }
-
-  private static void postToastForBackupRestorationFailure(@NonNull Context context, @NonNull BackupUtil.BackupFileException exception) {
-    final @StringRes int errorResId;
-    switch (exception.getState()) {
-      case READABLE:
-        throw new AssertionError("Unexpected error state.");
-      case NOT_FOUND:
-        errorResId = R.string.RestoreBackupFragment__backup_not_found;
-        break;
-      case UNSUPPORTED_FILE_EXTENSION:
-        errorResId = R.string.RestoreBackupFragment__backup_has_a_bad_extension;
-        break;
-      default:
-        errorResId = R.string.RestoreBackupFragment__backup_could_not_be_read;
-    }
-
-    ThreadUtil.postToMain(() -> Toast.makeText(context, errorResId, Toast.LENGTH_LONG).show());
-  }
-
-  private void handleRestore(@NonNull Context context, @NonNull BackupUtil.BackupInfo backup) {
-    View     view   = LayoutInflater.from(context).inflate(R.layout.enter_backup_passphrase_dialog, null);
-    EditText prompt = view.findViewById(R.id.restore_passphrase_input);
-
-    prompt.addTextChangedListener(new PassphraseAsYouTypeFormatter());
-
-    new MaterialAlertDialogBuilder(context)
-                   .setTitle(R.string.RegistrationActivity_enter_backup_passphrase)
-                   .setView(view)
-                   .setPositiveButton(R.string.RegistrationActivity_restore, (dialog, which) -> {
-                     InputMethodManager inputMethodManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-                     inputMethodManager.hideSoftInputFromWindow(prompt.getWindowToken(), 0);
-
-                     restoreButton.setSpinning();
-                     skipRestoreButton.setVisibility(View.INVISIBLE);
-
-                     String passphrase = prompt.getText().toString();
-
-                     restoreAsynchronously(context, backup, passphrase);
-                   })
-                   .setNegativeButton(android.R.string.cancel, null)
-                   .show();
-
-    Log.i(TAG, "Prompt for backup passphrase shown to user.");
-  }
-
-  @SuppressLint("StaticFieldLeak")
-  private void restoreAsynchronously(@NonNull Context context,
-                                     @NonNull BackupUtil.BackupInfo backup,
-                                     @NonNull String passphrase)
-  {
-    new AsyncTask<Void, Void, BackupImportResult>() {
-      @Override
-      protected BackupImportResult doInBackground(Void... voids) {
-        try {
-          Log.i(TAG, "Starting backup restore.");
-          DataRestoreConstraint.setRestoringData(true);
-
-          SQLiteDatabase database = SignalDatabase.getBackupDatabase();
-
-          BackupPassphrase.set(context, passphrase);
-
-          if (!FullBackupImporter.validatePassphrase(context, backup.getUri(), passphrase)) {
-            return BackupImportResult.FAILURE_UNKNOWN;
-          }
-
-          FullBackupImporter.importFile(context,
-                                        AttachmentSecretProvider.getInstance(context).getOrCreateAttachmentSecret(),
-                                        database,
-                                        backup.getUri(),
-                                        passphrase);
-
-          SignalDatabase.runPostBackupRestoreTasks(database);
-          NotificationChannels.getInstance().restoreContactNotificationChannels();
-
-          enableBackups(context);
-
-          AppInitialization.onPostBackupRestore(context);
-
-          Log.i(TAG, "Backup restore complete.");
-          return BackupImportResult.SUCCESS;
-        } catch (FullBackupImporter.DatabaseDowngradeException e) {
-          Log.w(TAG, "Failed due to the backup being from a newer version of Signal.", e);
-          return BackupImportResult.FAILURE_VERSION_DOWNGRADE;
-        } catch (FullBackupImporter.ForeignKeyViolationException e) {
-          Log.w(TAG, "Failed due to foreign key constraint violations.", e);
-          return BackupImportResult.FAILURE_FOREIGN_KEY;
-        } catch (IOException e) {
-          Log.w(TAG, e);
-          return BackupImportResult.FAILURE_UNKNOWN;
-        } finally {
-          DataRestoreConstraint.setRestoringData(false);
-        }
-      }
-
-      @Override
-      protected void onPostExecute(@NonNull BackupImportResult result) {
-        viewModel.markBackupCompleted();
-        restoreButton.cancelSpinning();
-        skipRestoreButton.setVisibility(View.VISIBLE);
-
-        restoreBackupProgress.setText("");
-
-        switch (result) {
-          case SUCCESS:
-            Log.i(TAG, "Successful backup restore.");
-            break;
-          case FAILURE_VERSION_DOWNGRADE:
-            Toast.makeText(context, R.string.RegistrationActivity_backup_failure_downgrade, Toast.LENGTH_LONG).show();
-            break;
-          case FAILURE_FOREIGN_KEY:
-            Toast.makeText(context, R.string.RegistrationActivity_backup_failure_foreign_key, Toast.LENGTH_LONG).show();
-            break;
-          case FAILURE_UNKNOWN:
-            Toast.makeText(context, R.string.RegistrationActivity_incorrect_backup_passphrase, Toast.LENGTH_LONG).show();
-            break;
-        }
-      }
-    }.execute();
-  }
-
-  @Override
-  public void onStart() {
-    super.onStart();
-    EventBus.getDefault().register(this);
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    if (viewModel != null && viewModel.hasBackupCompleted()) {
-      onBackupComplete();
-    }
-  }
-
-  @Override
-  public void onStop() {
-    super.onStop();
-    EventBus.getDefault().unregister(this);
-  }
-
-  @Subscribe(threadMode = ThreadMode.MAIN)
-  public void onEvent(@NonNull BackupEvent event) {
-    long count = event.getCount();
-
-    if (count == 0) {
-      restoreBackupProgress.setText(R.string.RegistrationActivity_checking);
-    } else {
-      restoreBackupProgress.setText(getString(R.string.RegistrationActivity_d_messages_so_far, count));
-    }
-
-    restoreButton.setSpinning();
-    skipRestoreButton.setVisibility(View.INVISIBLE);
-
-    if (event.getType() == BackupEvent.Type.FINISHED) {
-      onBackupComplete();
-    }
-  }
-
-  private void onBackupComplete() {
-    if (BackupUtil.isUserSelectionRequired(requireContext()) && !BackupUtil.canUserAccessBackupDirectory(requireContext())) {
-      displayConfirmationDialog(requireContext());
-    } else {
-      SafeNavigation.safeNavigate(Navigation.findNavController(requireView()),
-                                  RestoreBackupFragmentDirections.actionBackupRestored());
-    }
-  }
-
-  private void enableBackups(@NonNull Context context) {
-    if (BackupUtil.canUserAccessBackupDirectory(context)) {
-      LocalBackupListener.setNextBackupTimeToIntervalFromNow(context);
-      SignalStore.settings().setBackupEnabled(true);
-      LocalBackupListener.schedule(context);
-    }
-  }
-
-  @RequiresApi(29)
-  private void displayConfirmationDialog(@NonNull Context context) {
-    new MaterialAlertDialogBuilder(context)
-                   .setTitle(R.string.RestoreBackupFragment__restore_complete)
-                   .setMessage(R.string.RestoreBackupFragment__to_continue_using_backups_please_choose_a_folder)
-                   .setPositiveButton(R.string.RestoreBackupFragment__choose_folder, (dialog, which) -> {
-                     Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
-
-                     intent.addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION |
-                                     Intent.FLAG_GRANT_WRITE_URI_PERMISSION       |
-                                     Intent.FLAG_GRANT_READ_URI_PERMISSION);
-
-                     startActivityForResult(intent, OPEN_DOCUMENT_TREE_RESULT_CODE);
-                   })
-                   .setNegativeButton(R.string.RestoreBackupFragment__not_now, (dialog, which) -> {
-                     BackupPassphrase.set(context, null);
-                     dialog.dismiss();
-
-                     SafeNavigation.safeNavigate(Navigation.findNavController(requireView()),
-                                                 RestoreBackupFragmentDirections.actionBackupRestored());
-                   })
-                   .setCancelable(false)
-                   .show();
-  }
-
-  private enum BackupImportResult {
-    SUCCESS,
-    FAILURE_VERSION_DOWNGRADE,
-    FAILURE_FOREIGN_KEY,
-    FAILURE_UNKNOWN
-  }
-
-  public static class PassphraseAsYouTypeFormatter implements TextWatcher {
-
-    private static final int GROUP_SIZE = 5;
-
-    @Override
-    public void afterTextChanged(Editable editable) {
-      removeSpans(editable);
-
-      addSpans(editable);
-    }
-
-    private static void removeSpans(Editable editable) {
-      SpaceSpan[] paddingSpans = editable.getSpans(0, editable.length(), SpaceSpan.class);
-
-      for (SpaceSpan span : paddingSpans) {
-        editable.removeSpan(span);
-      }
-    }
-
-    private static void addSpans(Editable editable) {
-      final int length = editable.length();
-
-      for (int i = GROUP_SIZE; i < length; i += GROUP_SIZE) {
-        editable.setSpan(new SpaceSpan(), i - 1, i, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-      }
-
-      if (editable.length() > BackupUtil.PASSPHRASE_LENGTH) {
-        editable.delete(BackupUtil.PASSPHRASE_LENGTH, editable.length());
-      }
-    }
-
-    @Override
-    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-    }
-
-    @Override
-    public void onTextChanged(CharSequence s, int start, int before, int count) {
-    }
-  }
-
-  /**
-   * A {@link ReplacementSpan} adds a small space after a single character.
-   * Based on https://stackoverflow.com/a/51949578
-   */
-  private static class SpaceSpan extends ReplacementSpan {
-
-    @Override
-    public int getSize(@NonNull Paint paint, CharSequence text, int start, int end, Paint.FontMetricsInt fm) {
-      return (int) (paint.measureText(text, start, end) * 1.7f);
-    }
-
-    @Override
-    public void draw(@NonNull Canvas canvas, CharSequence text, int start, int end, float x, int top, int y, int bottom, @NonNull Paint paint) {
-      canvas.drawText(text.subSequence(start, end).toString(), x, y, paint);
-    }
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/SignalStrengthPhoneStateListener.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/SignalStrengthPhoneStateListener.java
index 6c03397b14..daf6077202 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/SignalStrengthPhoneStateListener.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/SignalStrengthPhoneStateListener.java
@@ -15,7 +15,7 @@
 import androidx.lifecycle.LifecycleOwner;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.util.Debouncer;
 
 // TODO [nicholas]: move to v2 package and make package-private. convert to Kotlin
@@ -60,14 +60,14 @@ public interface Callback {
 
   @Override
   public void onResume(@NonNull LifecycleOwner owner) {
-    TelephonyManager telephonyManager = (TelephonyManager) ApplicationDependencies.getApplication().getSystemService(Context.TELEPHONY_SERVICE);
+    TelephonyManager telephonyManager = (TelephonyManager) AppDependencies.getApplication().getSystemService(Context.TELEPHONY_SERVICE);
     telephonyManager.listen(this, PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
     Log.i(TAG, "Listening to cell phone signal strength changes");
   }
 
   @Override
   public void onPause(@NonNull LifecycleOwner owner) {
-    TelephonyManager telephonyManager = (TelephonyManager) ApplicationDependencies.getApplication().getSystemService(Context.TELEPHONY_SERVICE);
+    TelephonyManager telephonyManager = (TelephonyManager) AppDependencies.getApplication().getSystemService(Context.TELEPHONY_SERVICE);
     telephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
     Log.i(TAG, "Stopped listening to cell phone signal strength changes");
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/WelcomeFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/WelcomeFragment.java
deleted file mode 100644
index 96fac41b3b..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/WelcomeFragment.java
+++ /dev/null
@@ -1,252 +0,0 @@
-package org.thoughtcrime.securesms.registration.fragments;
-
-import android.Manifest;
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.navigation.ActivityNavigator;
-import androidx.navigation.NavDirections;
-import androidx.navigation.Navigation;
-import androidx.navigation.fragment.NavHostFragment;
-
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
-import com.google.i18n.phonenumbers.Phonenumber;
-
-import org.greenrobot.eventbus.EventBus;
-import org.signal.core.util.logging.Log;
-import org.signal.devicetransfer.DeviceToDeviceTransferService;
-import org.signal.devicetransfer.TransferStatus;
-import org.thoughtcrime.securesms.LoggingFragment;
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.permissions.Permissions;
-import org.thoughtcrime.securesms.registration.viewmodel.RegistrationViewModel;
-import org.thoughtcrime.securesms.util.BackupUtil;
-import org.thoughtcrime.securesms.util.CommunicationActions;
-import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
-import org.thoughtcrime.securesms.util.views.CircularProgressMaterialButton;
-
-import java.util.Optional;
-
-import static org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView;
-
-public final class WelcomeFragment extends LoggingFragment {
-
-  private static final String TAG = Log.tag(WelcomeFragment.class);
-
-  private CircularProgressMaterialButton continueButton;
-  private RegistrationViewModel          viewModel;
-
-  @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-    return inflater.inflate(R.layout.fragment_registration_welcome, container, false);
-  }
-
-  @Override
-  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-    super.onViewCreated(view, savedInstanceState);
-
-    viewModel = new ViewModelProvider(requireActivity()).get(RegistrationViewModel.class);
-
-    if (viewModel.isReregister()) {
-      if (viewModel.hasRestoreFlowBeenShown()) {
-        Log.i(TAG, "We've come back to the home fragment on a restore, user must be backing out");
-        if (!Navigation.findNavController(view).popBackStack()) {
-          FragmentActivity activity = requireActivity();
-          activity.finish();
-          ActivityNavigator.applyPopAnimationsToPendingTransition(activity);
-        }
-        return;
-      }
-
-      initializeNumber(requireContext(), viewModel);
-
-      Log.i(TAG, "Skipping restore because this is a reregistration.");
-      viewModel.setWelcomeSkippedOnRestore();
-      SafeNavigation.safeNavigate(NavHostFragment.findNavController(this),
-                                  WelcomeFragmentDirections.actionSkipRestore());
-    } else {
-
-      setDebugLogSubmitMultiTapView(view.findViewById(R.id.image));
-      setDebugLogSubmitMultiTapView(view.findViewById(R.id.title));
-
-      continueButton = view.findViewById(R.id.welcome_continue_button);
-      continueButton.setOnClickListener(v -> onContinueClicked());
-
-      Button restoreFromBackup = view.findViewById(R.id.welcome_transfer_or_restore);
-      restoreFromBackup.setOnClickListener(v -> onRestoreFromBackupClicked());
-
-      TextView welcomeTermsButton = view.findViewById(R.id.welcome_terms_button);
-      welcomeTermsButton.setOnClickListener(v -> onTermsClicked());
-
-      if (!canUserSelectBackup()) {
-        restoreFromBackup.setText(R.string.registration_activity__transfer_account);
-      }
-    }
-  }
-
-  @Override
-  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    if (EventBus.getDefault().getStickyEvent(TransferStatus.class) != null) {
-      Log.i(TAG, "Found existing transferStatus, redirect to transfer flow");
-      SafeNavigation.safeNavigate(NavHostFragment.findNavController(this), R.id.action_welcomeFragment_to_deviceTransferSetup);
-    } else {
-      DeviceToDeviceTransferService.stop(requireContext());
-    }
-  }
-
-  private void onContinueClicked() {
-    if (Permissions.isRuntimePermissionsRequired()) {
-      SafeNavigation.safeNavigate(NavHostFragment.findNavController(this),
-                                  WelcomeFragmentDirections.actionWelcomeFragmentToGrantPermissionsFragment(GrantPermissionsFragment.WelcomeAction.CONTINUE));
-    } else {
-      gatherInformationAndContinue(
-          this,
-          viewModel,
-          () -> continueButton.setSpinning(),
-          () -> continueButton.cancelSpinning(),
-          WelcomeFragmentDirections.actionSkipRestore(),
-          WelcomeFragmentDirections.actionRestore()
-      );
-    }
-  }
-
-  private void onRestoreFromBackupClicked() {
-    if (Permissions.isRuntimePermissionsRequired()) {
-      SafeNavigation.safeNavigate(NavHostFragment.findNavController(this),
-                                  WelcomeFragmentDirections.actionWelcomeFragmentToGrantPermissionsFragment(GrantPermissionsFragment.WelcomeAction.RESTORE_BACKUP));
-    } else {
-      gatherInformationAndChooseBackup(this, viewModel, WelcomeFragmentDirections.actionTransferOrRestore());
-    }
-  }
-
-  static void continueClicked(@NonNull Fragment fragment,
-                              @NonNull RegistrationViewModel viewModel,
-                              @NonNull Runnable onSearchForBackupStarted,
-                              @NonNull Runnable onSearchForBackupFinished,
-                              @NonNull NavDirections actionSkipRestore,
-                              @NonNull NavDirections actionRestore)
-  {
-    boolean isUserSelectionRequired = BackupUtil.isUserSelectionRequired(fragment.requireContext());
-
-    Permissions.with(fragment)
-               .request(WelcomePermissions.getWelcomePermissions(isUserSelectionRequired))
-               .ifNecessary()
-               .onAnyResult(() -> gatherInformationAndContinue(fragment,
-                                                               viewModel,
-                                                               onSearchForBackupStarted,
-                                                               onSearchForBackupFinished,
-                                                               actionSkipRestore,
-                                                               actionRestore))
-               .execute();
-  }
-
-  static void restoreFromBackupClicked(@NonNull Fragment fragment,
-                                       @NonNull RegistrationViewModel viewModel,
-                                       @NonNull NavDirections actionTransferOrRestore)
-  {
-    boolean isUserSelectionRequired = BackupUtil.isUserSelectionRequired(fragment.requireContext());
-
-    Permissions.with(fragment)
-               .request(WelcomePermissions.getWelcomePermissions(isUserSelectionRequired))
-               .ifNecessary()
-               .onAnyResult(() -> gatherInformationAndChooseBackup(fragment, viewModel, actionTransferOrRestore))
-               .execute();
-  }
-
-  static void gatherInformationAndContinue(
-      @NonNull Fragment fragment,
-      @NonNull RegistrationViewModel viewModel,
-      @NonNull Runnable onSearchForBackupStarted,
-      @NonNull Runnable onSearchForBackupFinished,
-      @NonNull NavDirections actionSkipRestore,
-      @NonNull NavDirections actionRestore
-  ) {
-    onSearchForBackupStarted.run();
-
-    RestoreBackupFragment.searchForBackup(backup -> {
-      Context context = fragment.getContext();
-      if (context == null) {
-        Log.i(TAG, "No context on fragment, must have navigated away.");
-        return;
-      }
-
-      initializeNumber(fragment.requireContext(), viewModel);
-
-      onSearchForBackupFinished.run();
-
-      if (backup == null) {
-        Log.i(TAG, "Skipping backup. No backup found, or no permission to look.");
-        SafeNavigation.safeNavigate(NavHostFragment.findNavController(fragment),
-                                    actionSkipRestore);
-      } else {
-        SafeNavigation.safeNavigate(NavHostFragment.findNavController(fragment),
-                                    actionRestore);
-      }
-    });
-  }
-
-  static void gatherInformationAndChooseBackup(@NonNull Fragment fragment,
-                                               @NonNull RegistrationViewModel viewModel,
-                                               @NonNull NavDirections actionTransferOrRestore) {
-    initializeNumber(fragment.requireContext(), viewModel);
-
-    SafeNavigation.safeNavigate(NavHostFragment.findNavController(fragment),
-                                actionTransferOrRestore);
-  }
-
-  @SuppressLint("MissingPermission")
-  private static void initializeNumber(@NonNull Context context, @NonNull RegistrationViewModel viewModel) {
-    Optional<Phonenumber.PhoneNumber> localNumber = Optional.empty();
-
-    if (Permissions.hasAll(context, Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_PHONE_NUMBERS)) {
-      localNumber = Util.getDeviceNumber(context);
-    } else {
-      Log.i(TAG, "No phone permission");
-    }
-
-    if (localNumber.isPresent()) {
-      Log.i(TAG, "Phone number detected");
-      Phonenumber.PhoneNumber phoneNumber    = localNumber.get();
-      String                  nationalNumber = PhoneNumberUtil.getInstance().format(phoneNumber, PhoneNumberUtil.PhoneNumberFormat.NATIONAL);
-
-      viewModel.onNumberDetected(phoneNumber.getCountryCode(), nationalNumber);
-    } else {
-      Log.i(TAG, "No number detected");
-      Optional<String> simCountryIso = Util.getSimCountryIso(context);
-
-      if (simCountryIso.isPresent() && !TextUtils.isEmpty(simCountryIso.get())) {
-        viewModel.onNumberDetected(PhoneNumberUtil.getInstance().getCountryCodeForRegion(simCountryIso.get()), "");
-      }
-    }
-  }
-
-  private void onTermsClicked() {
-    CommunicationActions.openBrowserLink(requireContext(), RegistrationConstants.TERMS_AND_CONDITIONS_URL);
-  }
-
-  private boolean canUserSelectBackup() {
-    return BackupUtil.isUserSelectionRequired(requireContext()) &&
-           !viewModel.isReregister() &&
-           !SignalStore.settings().isBackupEnabled();
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/WelcomePermissions.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/WelcomePermissions.kt
index 0151f4c0d3..9748c7afac 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/WelcomePermissions.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/WelcomePermissions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Signal Messenger, LLC
+ * Copyright 2024 Signal Messenger, LLC
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationActivity.kt
new file mode 100644
index 0000000000..417e1dc5f9
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationActivity.kt
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.ui
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.viewModels
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.navigation.ActivityNavigator
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.BaseActivity
+import org.thoughtcrime.securesms.MainActivity
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.lock.v2.CreateSvrPinActivity
+import org.thoughtcrime.securesms.pin.PinRestoreActivity
+import org.thoughtcrime.securesms.profiles.AvatarHelper
+import org.thoughtcrime.securesms.profiles.edit.CreateProfileActivity
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.registration.SmsRetrieverReceiver
+import org.thoughtcrime.securesms.registration.ui.restore.RemoteRestoreActivity
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
+import org.thoughtcrime.securesms.util.RemoteConfig
+
+/**
+ * Activity to hold the entire registration process.
+ */
+class RegistrationActivity : BaseActivity() {
+
+  private val TAG = Log.tag(RegistrationActivity::class.java)
+
+  private val dynamicTheme = DynamicNoActionBarTheme()
+  val sharedViewModel: RegistrationViewModel by viewModels()
+
+  private var smsRetrieverReceiver: SmsRetrieverReceiver? = null
+
+  init {
+    lifecycle.addObserver(SmsRetrieverObserver())
+  }
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    dynamicTheme.onCreate(this)
+
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_registration_navigation_v2)
+
+    sharedViewModel.isReregister = intent.getBooleanExtra(RE_REGISTRATION_EXTRA, false)
+
+    sharedViewModel.checkpoint.observe(this) {
+      if (it >= RegistrationCheckpoint.LOCAL_REGISTRATION_COMPLETE) {
+        handleSuccessfulVerify()
+      }
+    }
+  }
+
+  override fun onResume() {
+    super.onResume()
+    dynamicTheme.onResume(this)
+  }
+
+  private fun handleSuccessfulVerify() {
+    if (SignalStore.misc.hasLinkedDevices) {
+      SignalStore.misc.shouldShowLinkedDevicesReminder = sharedViewModel.isReregister
+    }
+
+    if (SignalStore.storageService.needsAccountRestore()) {
+      Log.i(TAG, "Performing pin restore.")
+      startActivity(Intent(this, PinRestoreActivity::class.java))
+      finish()
+    } else {
+      val isProfileNameEmpty = Recipient.self().profileName.isEmpty
+      val isAvatarEmpty = !AvatarHelper.hasAvatar(this, Recipient.self().id)
+      val isLinkedDevice = SignalStore.account.isLinkedDevice
+      val needsProfile = if (isLinkedDevice) false else isProfileNameEmpty || isAvatarEmpty
+      val needsPin = if (isLinkedDevice) false else !sharedViewModel.hasPin()
+
+      Log.i(TAG, "Pin restore flow not required. Profile name: $isProfileNameEmpty | Profile avatar: $isAvatarEmpty | Needs PIN: $needsPin")
+
+      if (!needsProfile && !needsPin) {
+        sharedViewModel.completeRegistration()
+      }
+      sharedViewModel.setInProgress(false)
+
+      val startIntent = MainActivity.clearTop(this).apply {
+        if (needsPin) {
+          putExtra("next_intent", CreateSvrPinActivity.getIntentForPinCreate(this@RegistrationActivity))
+        } else if (!SignalStore.registration.hasSkippedTransferOrRestore() && RemoteConfig.messageBackups) {
+          putExtra("next_intent", RemoteRestoreActivity.getIntent(this@RegistrationActivity))
+        } else if (needsProfile) {
+          putExtra("next_intent", CreateProfileActivity.getIntentForUserProfile(this@RegistrationActivity))
+        }
+      }
+
+      Log.d(TAG, "Launching ${startIntent.component}")
+      startActivity(startIntent)
+      finish()
+      ActivityNavigator.applyPopAnimationsToPendingTransition(this)
+    }
+  }
+
+  private inner class SmsRetrieverObserver : DefaultLifecycleObserver {
+    override fun onCreate(owner: LifecycleOwner) {
+      smsRetrieverReceiver = SmsRetrieverReceiver(application)
+      smsRetrieverReceiver?.registerReceiver()
+    }
+
+    override fun onDestroy(owner: LifecycleOwner) {
+      smsRetrieverReceiver?.unregisterReceiver()
+      smsRetrieverReceiver = null
+    }
+  }
+
+  companion object {
+    const val RE_REGISTRATION_EXTRA: String = "re_registration"
+
+    @JvmStatic
+    fun newIntentForNewRegistration(context: Context, originalIntent: Intent): Intent {
+      return Intent(context, RegistrationActivity::class.java).apply {
+        putExtra(RE_REGISTRATION_EXTRA, false)
+        setData(originalIntent.data)
+      }
+    }
+
+    @JvmStatic
+    fun newIntentForReRegistration(context: Context): Intent {
+      return Intent(context, RegistrationActivity::class.java).apply {
+        putExtra(RE_REGISTRATION_EXTRA, true)
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationCheckpoint.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationCheckpoint.kt
similarity index 90%
rename from app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationCheckpoint.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationCheckpoint.kt
index 06f682dd8e..cd5c706a2e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationCheckpoint.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationCheckpoint.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registration.v2.ui
+package org.thoughtcrime.securesms.registration.ui
 
 /**
  * An ordered list of checkpoints of the registration process.
@@ -20,6 +20,7 @@ enum class RegistrationCheckpoint {
   CHALLENGE_COMPLETED,
   VERIFICATION_CODE_REQUESTED,
   VERIFICATION_CODE_ENTERED,
+  PIN_ENTERED,
   VERIFICATION_CODE_VALIDATED,
   SERVICE_REGISTRATION_COMPLETED,
   LOCAL_REGISTRATION_COMPLETE
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2Extensions.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationExtensions.kt
similarity index 86%
rename from app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2Extensions.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationExtensions.kt
index 9b76f73561..6cd4c70d11 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2Extensions.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationExtensions.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registration.v2.ui
+package org.thoughtcrime.securesms.registration.ui
 
 import com.google.i18n.phonenumbers.PhoneNumberUtil
 import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationState.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationState.kt
new file mode 100644
index 0000000000..11e0d77fda
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationState.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.ui
+
+import com.google.i18n.phonenumbers.NumberParseException
+import com.google.i18n.phonenumbers.PhoneNumberUtil
+import com.google.i18n.phonenumbers.Phonenumber
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.registration.data.network.Challenge
+import org.whispersystems.signalservice.api.svr.Svr3Credentials
+import org.whispersystems.signalservice.internal.push.AuthCredentials
+
+/**
+ * State holder shared across all of registration.
+ */
+data class RegistrationState(
+  val sessionId: String? = null,
+  val enteredCode: String = "",
+  val phoneNumber: Phonenumber.PhoneNumber? = fetchExistingE164FromValues(),
+  val linkDeviceName: String? = null,
+  val deviceLinkUrl: String? = null,
+  val inProgress: Boolean = false,
+  val isReRegister: Boolean = false,
+  val recoveryPassword: String? = SignalStore.svr.getRecoveryPassword(),
+  val canSkipSms: Boolean = false,
+  val svr2AuthCredentials: AuthCredentials? = null,
+  val svr3AuthCredentials: Svr3Credentials? = null,
+  val svrTriesRemaining: Int = 10,
+  val incorrectCodeAttempts: Int = 0,
+  val isRegistrationLockEnabled: Boolean = false,
+  val lockedTimeRemaining: Long = 0L,
+  val userSkippedReregistration: Boolean = false,
+  val isFcmSupported: Boolean = false,
+  val isAllowedToRequestCode: Boolean = false,
+  val fcmToken: String? = null,
+  val challengesRequested: List<Challenge> = emptyList(),
+  val challengesPresented: Set<Challenge> = emptySet(),
+  val captchaToken: String? = null,
+  val allowedToRequestCode: Boolean = false,
+  val nextSmsTimestamp: Long = 0L,
+  val nextCallTimestamp: Long = 0L,
+  val nextVerificationAttempt: Long = 0L,
+  val verified: Boolean = false,
+  val smsListenerTimeout: Long = 0L,
+  val registrationCheckpoint: RegistrationCheckpoint = RegistrationCheckpoint.INITIALIZATION,
+  val networkError: Throwable? = null
+) {
+  val challengesRemaining: List<Challenge> = challengesRequested.filterNot { it in challengesPresented }
+
+  companion object {
+    private val TAG = Log.tag(RegistrationState::class)
+
+    private fun fetchExistingE164FromValues(): Phonenumber.PhoneNumber? {
+      val existingE164 = SignalStore.registration.sessionE164
+      if (existingE164 != null) {
+        try {
+          return PhoneNumberUtil.getInstance().parse(existingE164, null)
+        } catch (ex: NumberParseException) {
+          Log.w(TAG, "Could not parse stored E164.", ex)
+          return null
+        }
+      } else {
+        return null
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt
new file mode 100644
index 0000000000..5f064a2e78
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt
@@ -0,0 +1,997 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.ui
+
+import android.Manifest
+import android.content.Context
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.asLiveData
+import androidx.lifecycle.viewModelScope
+import com.google.i18n.phonenumbers.Phonenumber
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.flow.updateAndGet
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.signal.core.util.Stopwatch
+import org.signal.core.util.isNotNullOrBlank
+import org.signal.core.util.logging.Log
+import org.signal.libsignal.protocol.IdentityKeyPair
+import org.thoughtcrime.securesms.backup.v2.BackupRepository
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
+import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.jobs.MultiDeviceProfileContentUpdateJob
+import org.thoughtcrime.securesms.jobs.MultiDeviceProfileKeyUpdateJob
+import org.thoughtcrime.securesms.jobs.ProfileUploadJob
+import org.thoughtcrime.securesms.jobs.ReclaimUsernameAndLinkJob
+import org.thoughtcrime.securesms.jobs.StorageAccountRestoreJob
+import org.thoughtcrime.securesms.jobs.StorageSyncJob
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.permissions.Permissions
+import org.thoughtcrime.securesms.pin.SvrRepository
+import org.thoughtcrime.securesms.pin.SvrWrongPinException
+import org.thoughtcrime.securesms.registration.RegistrationData
+import org.thoughtcrime.securesms.registration.RegistrationUtil
+import org.thoughtcrime.securesms.registration.data.LinkDeviceRepository
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository
+import org.thoughtcrime.securesms.registration.data.network.BackupAuthCheckResult
+import org.thoughtcrime.securesms.registration.data.network.Challenge
+import org.thoughtcrime.securesms.registration.data.network.DeviceUuidRequestResult
+import org.thoughtcrime.securesms.registration.data.network.RegisterAccountResult
+import org.thoughtcrime.securesms.registration.data.network.RegistrationResult
+import org.thoughtcrime.securesms.registration.data.network.RegistrationSessionCheckResult
+import org.thoughtcrime.securesms.registration.data.network.RegistrationSessionCreationResult
+import org.thoughtcrime.securesms.registration.data.network.RegistrationSessionResult
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.AlreadyVerified
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.AttemptsExhausted
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.ChallengeRequired
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.ExternalServiceFailure
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.ImpossibleNumber
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.InvalidTransportModeFailure
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.MalformedRequest
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.MustRetry
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.NoSuchSession
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.NonNormalizedNumber
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.RateLimited
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.RegistrationLocked
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.Success
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.TokenNotAccepted
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.UnknownError
+import org.thoughtcrime.securesms.registration.viewmodel.SvrAuthCredentialSet
+import org.thoughtcrime.securesms.util.RemoteConfig
+import org.thoughtcrime.securesms.util.Util
+import org.thoughtcrime.securesms.util.dualsim.MccMncProducer
+import org.whispersystems.signalservice.api.SvrNoDataException
+import org.whispersystems.signalservice.api.kbs.MasterKey
+import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse
+import java.io.IOException
+import java.util.concurrent.TimeUnit
+import kotlin.jvm.optionals.getOrNull
+import kotlin.time.Duration.Companion.minutes
+
+/**
+ * ViewModel shared across all of registration.
+ */
+class RegistrationViewModel : ViewModel() {
+
+  private val store = MutableStateFlow(RegistrationState())
+  private val password = Util.getSecret(18)
+
+  private val coroutineExceptionHandler = CoroutineExceptionHandler { _, exception ->
+    Log.w(TAG, "CoroutineExceptionHandler invoked.", exception)
+    store.update {
+      it.copy(
+        networkError = exception,
+        inProgress = false
+      )
+    }
+  }
+
+  val uiState = store.asLiveData()
+
+  val checkpoint = store.map { it.registrationCheckpoint }.asLiveData()
+
+  val lockedTimeRemaining = store.map { it.lockedTimeRemaining }.asLiveData()
+
+  val incorrectCodeAttempts = store.map { it.incorrectCodeAttempts }.asLiveData()
+
+  val inProgress = store.map { it.inProgress }.asLiveData()
+
+  val svrTriesRemaining: Int
+    get() = store.value.svrTriesRemaining
+
+  var isReregister: Boolean
+    get() = store.value.isReRegister
+    set(value) {
+      store.update {
+        it.copy(isReRegister = value)
+      }
+    }
+
+  val phoneNumber: Phonenumber.PhoneNumber?
+    get() = store.value.phoneNumber
+
+  fun maybePrefillE164(context: Context) {
+    Log.v(TAG, "maybePrefillE164()")
+    if (Permissions.hasAll(context, Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_PHONE_NUMBERS)) {
+      val localNumber = Util.getDeviceNumber(context).getOrNull()
+
+      if (localNumber != null) {
+        Log.v(TAG, "Phone number detected.")
+        setPhoneNumber(localNumber)
+      } else {
+        Log.i(TAG, "Could not read phone number.")
+      }
+    } else {
+      Log.i(TAG, "No phone permission.")
+    }
+  }
+
+  fun setInProgress(inProgress: Boolean) {
+    store.update {
+      it.copy(inProgress = inProgress)
+    }
+  }
+
+  fun setRegistrationCheckpoint(checkpoint: RegistrationCheckpoint) {
+    store.update {
+      it.copy(registrationCheckpoint = checkpoint)
+    }
+  }
+
+  fun setPhoneNumber(phoneNumber: Phonenumber.PhoneNumber?) {
+    store.update {
+      it.copy(phoneNumber = phoneNumber)
+    }
+  }
+
+  fun setCaptchaResponse(token: String) {
+    store.update {
+      it.copy(
+        registrationCheckpoint = RegistrationCheckpoint.CHALLENGE_COMPLETED,
+        captchaToken = token
+      )
+    }
+  }
+
+  fun incrementIncorrectCodeAttempts() {
+    store.update {
+      it.copy(incorrectCodeAttempts = it.incorrectCodeAttempts + 1)
+    }
+  }
+
+  fun addPresentedChallenge(challenge: Challenge) {
+    store.update {
+      it.copy(challengesPresented = it.challengesPresented.plus(challenge))
+    }
+  }
+
+  fun removePresentedChallenge(challenge: Challenge) {
+    store.update {
+      it.copy(challengesPresented = it.challengesPresented.minus(challenge))
+    }
+  }
+
+  fun fetchFcmToken(context: Context) {
+    viewModelScope.launch(context = coroutineExceptionHandler) {
+      val fcmToken = RegistrationRepository.getFcmToken(context)
+      store.update {
+        it.copy(registrationCheckpoint = RegistrationCheckpoint.PUSH_NETWORK_AUDITED, isFcmSupported = true, fcmToken = fcmToken)
+      }
+    }
+  }
+
+  private suspend fun updateFcmToken(context: Context): String? {
+    Log.d(TAG, "Fetching FCM token…")
+    val fcmToken = RegistrationRepository.getFcmToken(context)
+    store.update {
+      it.copy(fcmToken = fcmToken)
+    }
+    Log.d(TAG, "FCM token fetched.")
+    return fcmToken
+  }
+
+  fun onBackupSuccessfullyRestored() {
+    val recoveryPassword = SignalStore.svr.recoveryPassword
+    store.update {
+      it.copy(registrationCheckpoint = RegistrationCheckpoint.BACKUP_RESTORED_OR_SKIPPED, recoveryPassword = SignalStore.svr.recoveryPassword, canSkipSms = recoveryPassword != null, isReRegister = true)
+    }
+  }
+
+  fun onUserConfirmedPhoneNumber(context: Context, errorHandler: (RegistrationResult) -> Unit) {
+    setRegistrationCheckpoint(RegistrationCheckpoint.PHONE_NUMBER_CONFIRMED)
+    val state = store.value
+
+    val e164 = state.phoneNumber?.toE164() ?: return bail { Log.i(TAG, "Phone number was null after confirmation.") }
+
+    if (!state.userSkippedReregistration) {
+      if (hasRecoveryPassword() && matchesSavedE164(e164)) {
+        // Re-registration when the local database is intact.
+        Log.d(TAG, "Has recovery password, and therefore can skip SMS verification.")
+        store.update {
+          it.copy(
+            canSkipSms = true,
+            isReRegister = true,
+            inProgress = false
+          )
+        }
+        return
+      }
+    }
+
+    viewModelScope.launch {
+      if (!state.userSkippedReregistration) {
+        val svrCredentialsResult: BackupAuthCheckResult = RegistrationRepository.hasValidSvrAuthCredentials(context, e164, password)
+
+        when (svrCredentialsResult) {
+          is BackupAuthCheckResult.UnknownError -> {
+            handleGenericError(svrCredentialsResult.getCause())
+            return@launch
+          }
+
+          is BackupAuthCheckResult.SuccessWithCredentials -> {
+            Log.d(TAG, "Found local valid SVR auth credentials.")
+            store.update {
+              it.copy(
+                isReRegister = true,
+                canSkipSms = true,
+                svr2AuthCredentials = svrCredentialsResult.svr2Credentials,
+                svr3AuthCredentials = svrCredentialsResult.svr3Credentials,
+                inProgress = false
+              )
+            }
+            return@launch
+          }
+
+          is BackupAuthCheckResult.SuccessWithoutCredentials -> {
+            Log.d(TAG, "No local SVR auth credentials could be found and/or validated.")
+          }
+        }
+      }
+
+      val validSession = getOrCreateValidSession(context, errorHandler) ?: return@launch bail { Log.i(TAG, "Could not create valid session for confirming the entered E164.") }
+
+      if (validSession.body.verified) {
+        Log.i(TAG, "Session is already verified, registering account.")
+        registerVerifiedSession(context, validSession.body.id, errorHandler)
+        return@launch
+      }
+
+      if (!validSession.body.allowedToRequestCode) {
+        if (System.currentTimeMillis() > (validSession.body.nextVerificationAttempt ?: Int.MAX_VALUE)) {
+          store.update {
+            it.copy(registrationCheckpoint = RegistrationCheckpoint.VERIFICATION_CODE_REQUESTED)
+          }
+        } else {
+          val challenges = validSession.body.requestedInformation
+          Log.i(TAG, "Not allowed to request code! Remaining challenges: ${challenges.joinToString()}")
+          handleSessionStateResult(context, ChallengeRequired(Challenge.parse(validSession.body.requestedInformation)), errorHandler)
+        }
+        return@launch
+      }
+
+      requestSmsCodeInternal(context, validSession.body.id, e164, errorHandler)
+    }
+  }
+
+  fun requestSmsCode(context: Context, errorHandler: (RegistrationResult) -> Unit) {
+    val e164 = getCurrentE164() ?: return bail { Log.i(TAG, "Phone number was null after confirmation.") }
+
+    viewModelScope.launch {
+      val validSession = getOrCreateValidSession(context, errorHandler) ?: return@launch bail { Log.i(TAG, "Could not create valid session for requesting an SMS code.") }
+      requestSmsCodeInternal(context, validSession.body.id, e164, errorHandler)
+    }
+  }
+
+  fun requestVerificationCall(context: Context, errorHandler: (RegistrationResult) -> Unit) {
+    val e164 = getCurrentE164()
+
+    if (e164 == null) {
+      Log.w(TAG, "Phone number was null after confirmation.")
+      onErrorOccurred()
+      return
+    }
+
+    viewModelScope.launch {
+      val validSession = getOrCreateValidSession(context, errorHandler) ?: return@launch bail { Log.i(TAG, "Could not create valid session for requesting a verification call.") }
+      Log.d(TAG, "Requesting voice call code…")
+      val codeRequestResponse = RegistrationRepository.requestSmsCode(
+        context = context,
+        sessionId = validSession.body.id,
+        e164 = e164,
+        password = password,
+        mode = RegistrationRepository.Mode.PHONE_CALL
+      )
+      Log.d(TAG, "Voice code request network call completed.")
+
+      handleSessionStateResult(context, codeRequestResponse, errorHandler)
+      if (codeRequestResponse is Success) {
+        Log.d(TAG, "Voice code request was successful.")
+      }
+    }
+  }
+
+  private suspend fun requestSmsCodeInternal(context: Context, sessionId: String, e164: String, errorHandler: (RegistrationResult) -> Unit) {
+    var smsListenerReady = false
+    Log.d(TAG, "Initializing SMS listener.")
+    if (store.value.smsListenerTimeout < System.currentTimeMillis()) {
+      smsListenerReady = store.value.isFcmSupported && RegistrationRepository.registerSmsListener(context)
+
+      if (smsListenerReady) {
+        val smsRetrieverTimeout = System.currentTimeMillis() + 5.minutes.inWholeMilliseconds
+        Log.d(TAG, "Successfully started verification code SMS retriever, which will last until $smsRetrieverTimeout.")
+        store.update { it.copy(smsListenerTimeout = smsRetrieverTimeout) }
+      } else {
+        Log.d(TAG, "Could not start verification code SMS retriever.")
+      }
+    }
+
+    Log.d(TAG, "Requesting SMS code…")
+    val transportMode = if (smsListenerReady) RegistrationRepository.Mode.SMS_WITH_LISTENER else RegistrationRepository.Mode.SMS_WITHOUT_LISTENER
+    val codeRequestResponse = RegistrationRepository.requestSmsCode(
+      context = context,
+      sessionId = sessionId,
+      e164 = e164,
+      password = password,
+      mode = transportMode
+    )
+    Log.d(TAG, "SMS code request network call completed.")
+
+    handleSessionStateResult(context, codeRequestResponse, errorHandler)
+
+    if (codeRequestResponse is Success) {
+      Log.d(TAG, "SMS code request was successful.")
+      store.update {
+        it.copy(
+          registrationCheckpoint = RegistrationCheckpoint.VERIFICATION_CODE_REQUESTED
+        )
+      }
+    }
+  }
+
+  private suspend fun getOrCreateValidSession(context: Context, errorHandler: (RegistrationResult) -> Unit): RegistrationSessionMetadataResponse? {
+    Log.v(TAG, "getOrCreateValidSession()")
+    val e164 = getCurrentE164() ?: throw IllegalStateException("E164 required to create session!")
+    val mccMncProducer = MccMncProducer(context)
+
+    val existingSessionId = store.value.sessionId
+    return getOrCreateValidSession(
+      context = context,
+      existingSessionId = existingSessionId,
+      e164 = e164,
+      password = password,
+      mcc = mccMncProducer.mcc,
+      mnc = mccMncProducer.mnc,
+      successListener = { networkResult ->
+        store.update {
+          it.copy(
+            sessionId = networkResult.body.id,
+            nextSmsTimestamp = RegistrationRepository.deriveTimestamp(networkResult.headers, networkResult.body.nextSms),
+            nextCallTimestamp = RegistrationRepository.deriveTimestamp(networkResult.headers, networkResult.body.nextCall),
+            nextVerificationAttempt = RegistrationRepository.deriveTimestamp(networkResult.headers, networkResult.body.nextVerificationAttempt),
+            allowedToRequestCode = networkResult.body.allowedToRequestCode,
+            challengesRequested = Challenge.parse(networkResult.body.requestedInformation),
+            verified = networkResult.body.verified
+          )
+        }
+      },
+      errorHandler = errorHandler
+    )
+  }
+
+  fun submitCaptchaToken(context: Context, errorHandler: (RegistrationResult) -> Unit) {
+    val e164 = getCurrentE164() ?: throw IllegalStateException("Can't submit captcha token if no phone number is set!")
+    val captchaToken = store.value.captchaToken ?: throw IllegalStateException("Can't submit captcha token if no captcha token is set!")
+
+    store.update {
+      it.copy(captchaToken = null)
+    }
+
+    viewModelScope.launch {
+      val session = getOrCreateValidSession(context, errorHandler) ?: return@launch bail { Log.i(TAG, "Could not create valid session for submitting a captcha token.") }
+      Log.d(TAG, "Submitting captcha token…")
+      val captchaSubmissionResult = RegistrationRepository.submitCaptchaToken(context, e164, password, session.body.id, captchaToken)
+      Log.d(TAG, "Captcha token submitted.")
+
+      handleSessionStateResult(context, captchaSubmissionResult, errorHandler)
+    }
+  }
+
+  fun requestAndSubmitPushToken(context: Context, errorHandler: (RegistrationResult) -> Unit) {
+    Log.v(TAG, "validatePushToken()")
+
+    addPresentedChallenge(Challenge.PUSH)
+
+    val e164 = getCurrentE164() ?: throw IllegalStateException("Can't submit captcha token if no phone number is set!")
+
+    viewModelScope.launch {
+      Log.d(TAG, "Getting session in order to perform push token verification…")
+      val session = getOrCreateValidSession(context, errorHandler) ?: return@launch bail { Log.i(TAG, "Could not create valid session for submitting a push challenge token.") }
+
+      if (!Challenge.parse(session.body.requestedInformation).contains(Challenge.PUSH)) {
+        Log.d(TAG, "Push submission no longer necessary, bailing.")
+        store.update {
+          it.copy(
+            inProgress = false
+          )
+        }
+        return@launch bail { Log.i(TAG, "Push challenge token no longer needed, bailing.") }
+      }
+
+      Log.d(TAG, "Requesting push challenge token…")
+      val pushSubmissionResult = RegistrationRepository.requestAndVerifyPushToken(context, session.body.id, e164, password)
+      Log.d(TAG, "Push challenge token submitted.")
+      handleSessionStateResult(context, pushSubmissionResult, errorHandler)
+    }
+  }
+
+  /**
+   * @return whether the request was successful and execution should continue
+   */
+  private suspend fun handleSessionStateResult(context: Context, sessionResult: RegistrationResult, errorHandler: (RegistrationResult) -> Unit): Boolean {
+    Log.v(TAG, "handleSessionStateResult()")
+    when (sessionResult) {
+      is UnknownError -> {
+        handleGenericError(sessionResult.getCause())
+      }
+
+      is Success -> {
+        Log.d(TAG, "New registration session status received.")
+        updateFcmToken(context)
+        store.update {
+          it.copy(
+            sessionId = sessionResult.sessionId,
+            nextSmsTimestamp = sessionResult.nextSmsTimestamp,
+            nextCallTimestamp = sessionResult.nextCallTimestamp,
+            isAllowedToRequestCode = sessionResult.allowedToRequestCode,
+            challengesRequested = emptyList(),
+            inProgress = false
+          )
+        }
+        return true
+      }
+
+      is ChallengeRequired -> {
+        Log.d(TAG, "[${sessionResult.challenges.joinToString()}] registration challenges received.")
+        store.update {
+          it.copy(
+            registrationCheckpoint = RegistrationCheckpoint.CHALLENGE_RECEIVED,
+            challengesRequested = sessionResult.challenges,
+            inProgress = false
+          )
+        }
+        return false
+      }
+
+      is AttemptsExhausted -> Log.i(TAG, "Received AttemptsExhausted.", sessionResult.getCause())
+
+      is ImpossibleNumber -> Log.i(TAG, "Received ImpossibleNumber.", sessionResult.getCause())
+
+      is NonNormalizedNumber -> Log.i(TAG, "Received NonNormalizedNumber.", sessionResult.getCause())
+
+      is RateLimited -> Log.i(TAG, "Received RateLimited.", sessionResult.getCause())
+
+      is ExternalServiceFailure -> Log.i(TAG, "Received ExternalServiceFailure.", sessionResult.getCause())
+
+      is InvalidTransportModeFailure -> Log.i(TAG, "Received InvalidTransportModeFailure.", sessionResult.getCause())
+
+      is MalformedRequest -> Log.i(TAG, "Received MalformedRequest.", sessionResult.getCause())
+
+      is MustRetry -> Log.i(TAG, "Received MustRetry.", sessionResult.getCause())
+
+      is TokenNotAccepted -> Log.i(TAG, "Received TokenNotAccepted.", sessionResult.getCause())
+
+      is RegistrationLocked -> Log.i(TAG, "Received RegistrationLocked.", sessionResult.getCause())
+
+      is NoSuchSession -> Log.i(TAG, "Received NoSuchSession.", sessionResult.getCause())
+
+      is AlreadyVerified -> Log.i(TAG, "Received AlreadyVerified", sessionResult.getCause())
+    }
+    setInProgress(false)
+    errorHandler(sessionResult)
+    return false
+  }
+
+  /**
+   * @return whether the request was successful and execution should continue
+   */
+  private suspend fun handleRegistrationResult(context: Context, registrationData: RegistrationData, registrationResult: RegisterAccountResult, reglockEnabled: Boolean, errorHandler: (RegisterAccountResult) -> Unit): Boolean {
+    Log.v(TAG, "handleRegistrationResult()")
+    when (registrationResult) {
+      is RegisterAccountResult.Success -> {
+        Log.i(TAG, "Register account result: Success! Registration lock: $reglockEnabled")
+        store.update {
+          it.copy(
+            registrationCheckpoint = RegistrationCheckpoint.SERVICE_REGISTRATION_COMPLETED
+          )
+        }
+        onSuccessfulRegistration(context, registrationData, registrationResult.accountRegistrationResult, reglockEnabled)
+        return true
+      }
+
+      is RegisterAccountResult.IncorrectRecoveryPassword -> {
+        Log.i(TAG, "Registration recovery password was incorrect, falling back to SMS verification.", registrationResult.getCause())
+        setUserSkippedReRegisterFlow(true)
+      }
+
+      is RegisterAccountResult.RegistrationLocked -> {
+        Log.i(TAG, "Account is registration locked!", registrationResult.getCause())
+      }
+      is RegisterAccountResult.SvrWrongPin -> {
+        Log.i(TAG, "Received wrong SVR PIN response! ${registrationResult.triesRemaining} tries remaining.")
+        updateSvrTriesRemaining(registrationResult.triesRemaining)
+      }
+
+      is RegisterAccountResult.SvrNoData,
+      is RegisterAccountResult.AttemptsExhausted,
+      is RegisterAccountResult.RateLimited,
+      is RegisterAccountResult.AuthorizationFailed,
+      is RegisterAccountResult.MalformedRequest,
+      is RegisterAccountResult.ValidationError,
+      is RegisterAccountResult.UnknownError -> Log.i(TAG, "Received error when trying to register!", registrationResult.getCause())
+    }
+    setInProgress(false)
+    errorHandler(registrationResult)
+    return false
+  }
+
+  private fun handleGenericError(cause: Throwable) {
+    Log.w(TAG, "Encountered unknown error!", cause)
+    store.update {
+      it.copy(inProgress = false, networkError = cause)
+    }
+  }
+
+  private fun setRecoveryPassword(recoveryPassword: String?) {
+    store.update {
+      it.copy(recoveryPassword = recoveryPassword)
+    }
+  }
+
+  private fun updateSvrTriesRemaining(remainingTries: Int) {
+    store.update {
+      it.copy(svrTriesRemaining = remainingTries)
+    }
+  }
+
+  fun setUserSkippedReRegisterFlow(value: Boolean) {
+    store.update {
+      it.copy(userSkippedReregistration = value, canSkipSms = !value)
+    }
+  }
+
+  fun verifyReRegisterWithPin(context: Context, pin: String, wrongPinHandler: () -> Unit, registrationErrorHandler: (RegisterAccountResult) -> Unit) {
+    setInProgress(true)
+
+    // Local recovery password
+    if (RegistrationRepository.canUseLocalRecoveryPassword()) {
+      if (RegistrationRepository.doesPinMatchLocalHash(pin)) {
+        Log.d(TAG, "Found recovery password, attempting to re-register.")
+        viewModelScope.launch(context = coroutineExceptionHandler) {
+          verifyReRegisterInternal(context, pin, SignalStore.svr.getOrCreateMasterKey(), registrationErrorHandler)
+          setInProgress(false)
+        }
+      } else {
+        Log.d(TAG, "Entered PIN did not match local PIN hash.")
+        wrongPinHandler()
+        setInProgress(false)
+      }
+      return
+    }
+
+    // remote recovery password
+    val svr2Credentials = store.value.svr2AuthCredentials
+    val svr3Credentials = store.value.svr3AuthCredentials
+
+    if (svr2Credentials != null || svr3Credentials != null) {
+      Log.d(TAG, "Found SVR auth credentials, fetching recovery password from SVR (svr2: ${svr2Credentials != null}, svr3: ${svr3Credentials != null}).")
+      viewModelScope.launch(context = coroutineExceptionHandler) {
+        try {
+          val masterKey = RegistrationRepository.fetchMasterKeyFromSvrRemote(pin, svr2Credentials, svr3Credentials)
+          setRecoveryPassword(masterKey.deriveRegistrationRecoveryPassword())
+          updateSvrTriesRemaining(10)
+          verifyReRegisterInternal(context, pin, masterKey, registrationErrorHandler)
+        } catch (rejectedPin: SvrWrongPinException) {
+          Log.w(TAG, "Submitted PIN was rejected by SVR.", rejectedPin)
+          updateSvrTriesRemaining(rejectedPin.triesRemaining)
+          wrongPinHandler()
+        } catch (noData: SvrNoDataException) {
+          Log.w(TAG, "SVR has no data for these credentials. Aborting skip SMS flow.", noData)
+          updateSvrTriesRemaining(0)
+          setUserSkippedReRegisterFlow(true)
+        }
+        setInProgress(false)
+      }
+      return
+    }
+
+    Log.w(TAG, "Could not get credentials to skip SMS registration, aborting!")
+    store.update {
+      it.copy(canSkipSms = false, inProgress = false)
+    }
+  }
+
+  private suspend fun verifyReRegisterInternal(context: Context, pin: String, masterKey: MasterKey, registrationErrorHandler: (RegisterAccountResult) -> Unit) {
+    Log.v(TAG, "verifyReRegisterInternal()")
+    updateFcmToken(context)
+
+    val registrationData = getRegistrationData()
+
+    val resultAndRegLockStatus = registerAccountInternal(context, null, registrationData, pin, masterKey)
+    val result = resultAndRegLockStatus.first
+    val reglockEnabled = resultAndRegLockStatus.second
+
+    handleRegistrationResult(context, registrationData, result, reglockEnabled, registrationErrorHandler)
+  }
+
+  /**
+   * @return a [Pair] containing the server response and a boolean signifying whether the current account is registration locked.
+   */
+  private suspend fun registerAccountInternal(context: Context, sessionId: String?, registrationData: RegistrationData, pin: String?, masterKey: MasterKey): Pair<RegisterAccountResult, Boolean> {
+    Log.v(TAG, "registerAccountInternal()")
+    val registrationResult: RegisterAccountResult = RegistrationRepository.registerAccount(context = context, sessionId = sessionId, registrationData = registrationData, pin = pin) { masterKey }
+
+    // Check if reg lock is enabled
+    if (registrationResult !is RegisterAccountResult.RegistrationLocked) {
+      Log.i(TAG, "Received a non-registration lock response to registration. Assuming registration lock as DISABLED")
+      return Pair(registrationResult, false)
+    }
+
+    Log.i(TAG, "Received a registration lock response when trying to register an account. Retrying with master key.")
+    store.update {
+      it.copy(
+        svr2AuthCredentials = registrationResult.svr2Credentials,
+        svr3AuthCredentials = registrationResult.svr3Credentials
+      )
+    }
+
+    return Pair(RegistrationRepository.registerAccount(context = context, sessionId = sessionId, registrationData = registrationData, pin = pin) { masterKey }, true)
+  }
+
+  fun verifyCodeWithoutRegistrationLock(context: Context, code: String, submissionErrorHandler: (RegistrationResult) -> Unit, registrationErrorHandler: (RegisterAccountResult) -> Unit) {
+    Log.v(TAG, "verifyCodeWithoutRegistrationLock()")
+    store.update {
+      it.copy(
+        inProgress = true,
+        enteredCode = code,
+        registrationCheckpoint = RegistrationCheckpoint.VERIFICATION_CODE_ENTERED
+      )
+    }
+
+    viewModelScope.launch(context = coroutineExceptionHandler) {
+      verifyCodeInternal(
+        context = context,
+        pin = null,
+        registrationLocked = false,
+        submissionErrorHandler = submissionErrorHandler,
+        registrationErrorHandler = registrationErrorHandler
+      )
+    }
+  }
+
+  fun verifyCodeAndRegisterAccountWithRegistrationLock(context: Context, pin: String, submissionErrorHandler: (RegistrationResult) -> Unit, registrationErrorHandler: (RegisterAccountResult) -> Unit) {
+    Log.v(TAG, "verifyCodeAndRegisterAccountWithRegistrationLock()")
+    store.update {
+      it.copy(
+        inProgress = true,
+        registrationCheckpoint = RegistrationCheckpoint.PIN_ENTERED
+      )
+    }
+    viewModelScope.launch {
+      verifyCodeInternal(
+        context = context,
+        pin = pin,
+        registrationLocked = true,
+        submissionErrorHandler = submissionErrorHandler,
+        registrationErrorHandler = registrationErrorHandler
+      )
+    }
+  }
+
+  private suspend fun verifyCodeInternal(context: Context, registrationLocked: Boolean, pin: String?, submissionErrorHandler: (RegistrationResult) -> Unit, registrationErrorHandler: (RegisterAccountResult) -> Unit) {
+    Log.d(TAG, "Getting valid session in order to submit verification code.")
+
+    if (registrationLocked && pin.isNullOrBlank()) {
+      throw IllegalStateException("Must have PIN to register with registration lock!")
+    }
+
+    var reglock = registrationLocked
+
+    val sessionId = getOrCreateValidSession(context, submissionErrorHandler)?.body?.id ?: return
+    val registrationData = getRegistrationData()
+
+    Log.d(TAG, "Submitting verification code…")
+
+    val verificationResponse = RegistrationRepository.submitVerificationCode(context, sessionId, registrationData)
+
+    val submissionSuccessful = verificationResponse is Success
+    val alreadyVerified = verificationResponse is AlreadyVerified
+
+    Log.d(TAG, "Verification code submission network call completed. Submission successful? $submissionSuccessful Account already verified? $alreadyVerified")
+
+    if (!submissionSuccessful && !alreadyVerified) {
+      handleSessionStateResult(context, verificationResponse, submissionErrorHandler)
+      return
+    }
+
+    Log.d(TAG, "Submitting registration…")
+
+    var result: RegisterAccountResult? = null
+    var state = store.value
+
+    if (!reglock) {
+      Log.d(TAG, "Registration lock not enabled, attempting to register account without master key producer.")
+      result = RegistrationRepository.registerAccount(context, sessionId, registrationData, pin)
+    }
+
+    if (result is RegisterAccountResult.RegistrationLocked) {
+      Log.d(TAG, "Registration lock response received.")
+      reglock = true
+      if (pin == null && SignalStore.svr.registrationLockToken != null) {
+        Log.d(TAG, "Retrying registration with stored credentials.")
+        result = RegistrationRepository.registerAccount(context, sessionId, registrationData, SignalStore.svr.pin) { SignalStore.svr.getOrCreateMasterKey() }
+      } else if (result.svr2Credentials != null || result.svr3Credentials != null) {
+        Log.d(TAG, "Retrying registration with received credentials (svr2: ${result.svr2Credentials != null}, svr3: ${result.svr3Credentials != null}).")
+        val svr2Credentials = result.svr2Credentials
+        val svr3Credentials = result.svr3Credentials
+        state = store.updateAndGet {
+          it.copy(svr2AuthCredentials = svr2Credentials, svr3AuthCredentials = svr3Credentials)
+        }
+      }
+    }
+
+    if (reglock && pin.isNotNullOrBlank()) {
+      Log.d(TAG, "Registration lock enabled, attempting to register account restore master key from SVR (svr2: ${state.svr2AuthCredentials != null}, svr3: ${state.svr3AuthCredentials != null})")
+      result = RegistrationRepository.registerAccount(context, sessionId, registrationData, pin) {
+        SvrRepository.restoreMasterKeyPreRegistration(
+          credentials = SvrAuthCredentialSet(
+            svr2Credentials = state.svr2AuthCredentials,
+            svr3Credentials = state.svr3AuthCredentials
+          ),
+          userPin = pin
+        )
+      }
+    }
+
+    if (result != null) {
+      handleRegistrationResult(context, registrationData, result, reglock, registrationErrorHandler)
+    } else {
+      Log.w(TAG, "No registration response received!")
+    }
+  }
+
+  private suspend fun registerVerifiedSession(context: Context, sessionId: String, registrationErrorHandler: (RegisterAccountResult) -> Unit) {
+    val registrationData = getRegistrationData()
+    val registrationResponse: RegisterAccountResult = RegistrationRepository.registerAccount(context, sessionId, registrationData)
+    handleRegistrationResult(context, registrationData, registrationResponse, false, registrationErrorHandler)
+  }
+
+  private suspend fun onSuccessfulRegistration(context: Context, registrationData: RegistrationData, remoteResult: RegistrationRepository.AccountRegistrationResult, reglockEnabled: Boolean) {
+    Log.v(TAG, "onSuccessfulRegistration()")
+    RegistrationRepository.registerAccountLocally(context, registrationData, remoteResult, reglockEnabled)
+
+    restoreBackupTier()
+
+    if (reglockEnabled) {
+      SignalStore.onboarding.clearAll()
+      val stopwatch = Stopwatch("RegistrationLockRestore")
+
+      AppDependencies.jobManager.runSynchronously(StorageAccountRestoreJob(), StorageAccountRestoreJob.LIFESPAN)
+      stopwatch.split("AccountRestore")
+
+      AppDependencies.jobManager
+        .startChain(StorageSyncJob())
+        .then(ReclaimUsernameAndLinkJob())
+        .enqueueAndBlockUntilCompletion(TimeUnit.SECONDS.toMillis(10))
+      stopwatch.split("ContactRestore")
+
+      refreshRemoteConfig()
+
+      stopwatch.split("RemoteConfig")
+
+      stopwatch.stop(TAG)
+    } else {
+      refreshRemoteConfig()
+    }
+
+    store.update {
+      it.copy(
+        registrationCheckpoint = RegistrationCheckpoint.LOCAL_REGISTRATION_COMPLETE,
+        inProgress = false
+      )
+    }
+  }
+
+  fun setLinkDeviceName(name: String?) {
+    store.update {
+      it.copy(linkDeviceName = name)
+    }
+  }
+
+  fun attemptDeviceLink(context: Context, registrationErrorHandler: (RegisterAccountResult) -> Unit) {
+    setInProgress(true)
+
+    viewModelScope.launch(context = coroutineExceptionHandler) {
+      val linkDeviceRepository = LinkDeviceRepository(password)
+
+      val deviceUuid = when (val result = linkDeviceRepository.requestDeviceLinkUuid()) {
+        is DeviceUuidRequestResult.Success -> result.uuid
+        is DeviceUuidRequestResult.UnknownError -> {
+          registrationErrorHandler(RegisterAccountResult.UnknownError(result.getCause()))
+          return@launch
+        }
+      }
+
+      val deviceKeyPair: IdentityKeyPair = IdentityKeyUtil.generateIdentityKeyPair()
+      val url = linkDeviceRepository.deviceLinkUrl(deviceUuid, deviceKeyPair.publicKey)
+
+      store.update {
+        it.copy(
+          deviceLinkUrl = url,
+          inProgress = false,
+        )
+      }
+
+      val profileKey = ProfileKeyUtil.createNew()
+      val registrationId = RegistrationRepository.getRegistrationId()
+      val pniRegistrationId = RegistrationRepository.getPniRegistrationId()
+      val fcmToken = RegistrationRepository.getFcmToken(context)
+
+      val registrationResult = linkDeviceRepository.attemptDeviceLink(
+        deviceKeyPair = deviceKeyPair,
+        deviceName = store.value.linkDeviceName ?: throw IllegalStateException(),
+        profileKey = profileKey,
+        registrationId = registrationId,
+        pniRegistrationId = pniRegistrationId,
+        fcmToken = fcmToken,
+      )
+
+      setInProgress(true)
+
+      when (registrationResult) {
+        is RegisterAccountResult.Success -> {
+          val remoteResult = registrationResult.accountRegistrationResult
+          val registrationData = RegistrationData(
+            code = "",
+            e164 = remoteResult.number,
+            password = password,
+            registrationId = registrationId,
+            profileKey = profileKey,
+            fcmToken = fcmToken,
+            pniRegistrationId = pniRegistrationId,
+            recoveryPassword = null,
+          )
+          onSuccessfulRegistration(context, registrationData, remoteResult, true)
+        }
+
+        else -> {
+          registrationErrorHandler(registrationResult)
+          return@launch
+        }
+      }
+    }
+
+    store.update {
+      it.copy(
+        deviceLinkUrl = null,
+        inProgress = false,
+      )
+    }
+  }
+
+  fun hasPin(): Boolean {
+    return RegistrationRepository.hasPin() || store.value.isReRegister
+  }
+
+  fun completeRegistration() {
+    AppDependencies.jobManager.startChain(ProfileUploadJob()).then(listOf(MultiDeviceProfileKeyUpdateJob(), MultiDeviceProfileContentUpdateJob())).enqueue()
+    RegistrationUtil.maybeMarkRegistrationComplete()
+  }
+
+  fun clearNetworkError() {
+    store.update {
+      it.copy(networkError = null)
+    }
+  }
+
+  private fun matchesSavedE164(e164: String?): Boolean {
+    return if (e164 == null) {
+      false
+    } else {
+      e164 == SignalStore.account.e164
+    }
+  }
+
+  private fun hasRecoveryPassword(): Boolean {
+    return store.value.recoveryPassword != null
+  }
+
+  private fun getCurrentE164(): String? {
+    return store.value.phoneNumber?.toE164()
+  }
+
+  private suspend fun getRegistrationData(): RegistrationData {
+    val currentState = store.value
+    val code = currentState.enteredCode
+    val e164: String = currentState.phoneNumber?.toE164() ?: throw IllegalStateException("Can't construct registration data without E164!")
+    val recoveryPassword = if (currentState.sessionId == null) SignalStore.svr.getRecoveryPassword() else null
+    return RegistrationData(code, e164, password, RegistrationRepository.getRegistrationId(), RegistrationRepository.getProfileKey(e164), currentState.fcmToken, RegistrationRepository.getPniRegistrationId(), recoveryPassword)
+  }
+
+  /**
+   * This is a generic error UI handler that re-enables the UI so that the user can recover from errors.
+   * Do not forget to log any errors when calling this method!
+   */
+  private fun onErrorOccurred() {
+    setInProgress(false)
+  }
+
+  /**
+   * Used for early returns in order to end the in-progress visual state, as well as print a log message explaining what happened.
+   *
+   * @param logMessage Logging code is wrapped in lambda so that our automated tools detect the various [Log] calls with their accompanying messages.
+   */
+  private fun bail(logMessage: () -> Unit) {
+    logMessage()
+    setInProgress(false)
+  }
+
+  companion object {
+    private val TAG = Log.tag(RegistrationViewModel::class.java)
+
+    private suspend fun restoreBackupTier() = withContext(Dispatchers.IO) {
+      val startTime = System.currentTimeMillis()
+      BackupRepository.restoreBackupTier()
+      Log.i(TAG, "Took " + (System.currentTimeMillis() - startTime) + " ms to restore the backup tier..")
+    }
+
+    private suspend fun refreshRemoteConfig() = withContext(Dispatchers.IO) {
+      val startTime = System.currentTimeMillis()
+      try {
+        RemoteConfig.refreshSync()
+        Log.i(TAG, "Took " + (System.currentTimeMillis() - startTime) + " ms to get feature flags.")
+      } catch (e: IOException) {
+        Log.w(TAG, "Failed to refresh flags after " + (System.currentTimeMillis() - startTime) + " ms.", e)
+      }
+    }
+
+    suspend fun getOrCreateValidSession(
+      context: Context,
+      existingSessionId: String?,
+      e164: String,
+      password: String,
+      mcc: String?,
+      mnc: String?,
+      successListener: (RegistrationSessionMetadataResponse) -> Unit,
+      errorHandler: (RegistrationSessionResult) -> Unit
+    ): RegistrationSessionMetadataResponse? {
+      Log.d(TAG, "Validating/creating a registration session.")
+      val sessionResult: RegistrationSessionResult = RegistrationRepository.createOrValidateSession(context, existingSessionId, e164, password, mcc, mnc)
+      when (sessionResult) {
+        is RegistrationSessionCheckResult.Success -> {
+          val metadata = sessionResult.getMetadata()
+          successListener(metadata)
+          Log.d(TAG, "Registration session validated.")
+          return metadata
+        }
+
+        is RegistrationSessionCreationResult.Success -> {
+          val metadata = sessionResult.getMetadata()
+          successListener(metadata)
+          Log.d(TAG, "Registration session created.")
+          return metadata
+        }
+
+        else -> errorHandler(sessionResult)
+      }
+      return null
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/accountlocked/AccountLockedFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/accountlocked/AccountLockedFragment.kt
new file mode 100644
index 0000000000..1d6f0ea6d6
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/accountlocked/AccountLockedFragment.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.ui.accountlocked
+
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.view.View
+import android.widget.TextView
+import androidx.activity.OnBackPressedCallback
+import androidx.fragment.app.activityViewModels
+import org.thoughtcrime.securesms.LoggingFragment
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
+import kotlin.time.Duration.Companion.milliseconds
+
+/**
+ * Screen educating the user that they need to wait some number of days to register.
+ */
+class AccountLockedFragment : LoggingFragment(R.layout.account_locked_fragment) {
+  private val viewModel by activityViewModels<RegistrationViewModel>()
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+
+    setDebugLogSubmitMultiTapView(view.findViewById(R.id.account_locked_title))
+
+    val description = view.findViewById<TextView>(R.id.account_locked_description)
+
+    viewModel.lockedTimeRemaining.observe(
+      viewLifecycleOwner
+    ) { t: Long? -> description.text = getString(R.string.AccountLockedFragment__your_account_has_been_locked_to_protect_your_privacy, durationToDays(t!!)) }
+
+    view.findViewById<View>(R.id.account_locked_next).setOnClickListener { v: View? -> onNext() }
+    view.findViewById<View>(R.id.account_locked_learn_more).setOnClickListener { v: View? -> learnMore() }
+
+    requireActivity().onBackPressedDispatcher.addCallback(
+      viewLifecycleOwner,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          onNext()
+        }
+      }
+    )
+  }
+
+  private fun learnMore() {
+    val intent = Intent(Intent.ACTION_VIEW)
+    intent.setData(Uri.parse(getString(R.string.AccountLockedFragment__learn_more_url)))
+    startActivity(intent)
+  }
+
+  fun onNext() {
+    requireActivity().finish()
+  }
+
+  private fun durationToDays(duration: Long): Long {
+    return if (duration != 0L) getLockoutDays(duration).toLong() else 7
+  }
+
+  private fun getLockoutDays(timeRemainingMs: Long): Int {
+    return timeRemainingMs.milliseconds.inWholeDays.toInt() + 1
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/captcha/CaptchaFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/captcha/CaptchaFragment.kt
similarity index 65%
rename from app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/captcha/CaptchaFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/captcha/CaptchaFragment.kt
index c1204499f0..a7ece8959d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/captcha/CaptchaFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/captcha/CaptchaFragment.kt
@@ -3,27 +3,32 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registration.v2.ui.captcha
+package org.thoughtcrime.securesms.registration.ui.captcha
 
 import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.View
 import android.webkit.WebView
 import android.webkit.WebViewClient
-import androidx.fragment.app.activityViewModels
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.addCallback
 import androidx.navigation.fragment.findNavController
 import org.thoughtcrime.securesms.BuildConfig
 import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.ViewBinderDelegate
-import org.thoughtcrime.securesms.databinding.FragmentRegistrationCaptchaV2Binding
+import org.thoughtcrime.securesms.databinding.FragmentRegistrationCaptchaBinding
 import org.thoughtcrime.securesms.registration.fragments.RegistrationConstants
-import org.thoughtcrime.securesms.registration.v2.ui.RegistrationV2ViewModel
 
-class CaptchaFragment : LoggingFragment(R.layout.fragment_registration_captcha_v2) {
+abstract class CaptchaFragment : LoggingFragment(R.layout.fragment_registration_captcha) {
 
-  private val sharedViewModel by activityViewModels<RegistrationV2ViewModel>()
-  private val binding: FragmentRegistrationCaptchaV2Binding by ViewBinderDelegate(FragmentRegistrationCaptchaV2Binding::bind)
+  private val binding: FragmentRegistrationCaptchaBinding by ViewBinderDelegate(FragmentRegistrationCaptchaBinding::bind)
+
+  private val backListener = object : OnBackPressedCallback(true) {
+    override fun handleOnBackPressed() {
+      handleUserExit()
+    }
+  }
 
   @SuppressLint("SetJavaScriptEnabled")
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -36,14 +41,21 @@ class CaptchaFragment : LoggingFragment(R.layout.fragment_registration_captcha_v
       override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
         if (url.startsWith(RegistrationConstants.SIGNAL_CAPTCHA_SCHEME)) {
           val token = url.substring(RegistrationConstants.SIGNAL_CAPTCHA_SCHEME.length)
-          sharedViewModel.setCaptchaResponse(token)
+          handleCaptchaToken(token)
+          backListener.isEnabled = false
           findNavController().navigateUp()
           return true
         }
         return false
       }
     }
-
+    requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
+      handleUserExit()
+    }
     binding.registrationCaptchaWebView.loadUrl(BuildConfig.SIGNAL_CAPTCHA_URL)
   }
+
+  abstract fun handleCaptchaToken(token: String)
+
+  abstract fun handleUserExit()
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/captcha/RegistrationCaptchaFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/captcha/RegistrationCaptchaFragment.kt
new file mode 100644
index 0000000000..4e59ec7706
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/captcha/RegistrationCaptchaFragment.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.ui.captcha
+
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.activityViewModels
+import org.thoughtcrime.securesms.registration.data.network.Challenge
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
+
+/**
+ * Screen that displays a captcha as part of the registration flow.
+ * This subclass plugs in [RegistrationViewModel] to the shared super class.
+ *
+ * @see CaptchaFragment
+ */
+class RegistrationCaptchaFragment : CaptchaFragment() {
+  private val sharedViewModel by activityViewModels<RegistrationViewModel>()
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+    sharedViewModel.addPresentedChallenge(Challenge.CAPTCHA)
+  }
+
+  override fun handleCaptchaToken(token: String) {
+    sharedViewModel.setCaptchaResponse(token)
+  }
+
+  override fun handleUserExit() {
+    sharedViewModel.removePresentedChallenge(Challenge.CAPTCHA)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/entercode/EnterCodeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/entercode/EnterCodeFragment.kt
new file mode 100644
index 0000000000..a7df623a3f
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/entercode/EnterCodeFragment.kt
@@ -0,0 +1,282 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.ui.entercode
+
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.View
+import android.widget.Toast
+import androidx.activity.OnBackPressedCallback
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.fragment.findNavController
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.i18n.phonenumbers.PhoneNumberUtil
+import kotlinx.coroutines.launch
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.LoggingFragment
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.ViewBinderDelegate
+import org.thoughtcrime.securesms.databinding.FragmentRegistrationEnterCodeBinding
+import org.thoughtcrime.securesms.registration.ReceivedSmsEvent
+import org.thoughtcrime.securesms.registration.data.network.RegisterAccountResult
+import org.thoughtcrime.securesms.registration.data.network.RegistrationResult
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult
+import org.thoughtcrime.securesms.registration.fragments.ContactSupportBottomSheetFragment
+import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView
+import org.thoughtcrime.securesms.registration.fragments.SignalStrengthPhoneStateListener
+import org.thoughtcrime.securesms.registration.ui.RegistrationCheckpoint
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
+import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
+import org.thoughtcrime.securesms.util.visible
+
+/**
+ * The final screen of account registration, where the user enters their verification code.
+ */
+class EnterCodeFragment : LoggingFragment(R.layout.fragment_registration_enter_code) {
+
+  companion object {
+    private const val BOTTOM_SHEET_TAG = "support_bottom_sheet"
+  }
+
+  private val TAG = Log.tag(EnterCodeFragment::class.java)
+
+  private val sharedViewModel by activityViewModels<RegistrationViewModel>()
+  private val bottomSheet = ContactSupportBottomSheetFragment()
+  private val binding: FragmentRegistrationEnterCodeBinding by ViewBinderDelegate(FragmentRegistrationEnterCodeBinding::bind)
+
+  private lateinit var phoneStateListener: SignalStrengthPhoneStateListener
+
+  private var autopilotCodeEntryActive = false
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+    setDebugLogSubmitMultiTapView(binding.verifyHeader)
+
+    phoneStateListener = SignalStrengthPhoneStateListener(this, PhoneStateCallback())
+
+    requireActivity().onBackPressedDispatcher.addCallback(
+      viewLifecycleOwner,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          popBackStack()
+        }
+      }
+    )
+
+    binding.wrongNumber.setOnClickListener {
+      popBackStack()
+    }
+
+    binding.code.setOnCompleteListener {
+      sharedViewModel.verifyCodeWithoutRegistrationLock(requireContext(), it, ::handleSessionErrorResponse, ::handleRegistrationErrorResponse)
+    }
+
+    binding.havingTroubleButton.setOnClickListener {
+      bottomSheet.showSafely(childFragmentManager, BOTTOM_SHEET_TAG)
+    }
+
+    binding.callMeCountDown.apply {
+      setTextResources(R.string.RegistrationActivity_call, R.string.RegistrationActivity_call_me_instead_available_in)
+      setOnClickListener {
+        sharedViewModel.requestVerificationCall(requireContext(), ::handleSessionErrorResponse)
+      }
+    }
+
+    binding.resendSmsCountDown.apply {
+      setTextResources(R.string.RegistrationActivity_resend_code, R.string.RegistrationActivity_resend_sms_available_in)
+      setOnClickListener {
+        sharedViewModel.requestSmsCode(requireContext(), ::handleSessionErrorResponse)
+      }
+    }
+
+    binding.keyboard.setOnKeyPressListener { key ->
+      if (!autopilotCodeEntryActive) {
+        if (key >= 0) {
+          binding.code.append(key)
+        } else {
+          binding.code.delete()
+        }
+      }
+    }
+
+    sharedViewModel.incorrectCodeAttempts.observe(viewLifecycleOwner) { attempts: Int ->
+      if (attempts >= 3) {
+        binding.havingTroubleButton.visible = true
+      }
+    }
+
+    sharedViewModel.uiState.observe(viewLifecycleOwner) {
+      binding.resendSmsCountDown.startCountDownTo(it.nextSmsTimestamp)
+      binding.callMeCountDown.startCountDownTo(it.nextCallTimestamp)
+      if (it.inProgress) {
+        binding.keyboard.displayProgress()
+      } else {
+        binding.keyboard.displayKeyboard()
+      }
+    }
+  }
+
+  override fun onResume() {
+    super.onResume()
+    sharedViewModel.phoneNumber?.let {
+      val formatted = PhoneNumberUtil.getInstance().format(it, PhoneNumberUtil.PhoneNumberFormat.INTERNATIONAL)
+      binding.verificationSubheader.text = requireContext().getString(R.string.RegistrationActivity_enter_the_code_we_sent_to_s, formatted)
+    }
+  }
+
+  private fun handleSessionErrorResponse(result: RegistrationResult) {
+    viewLifecycleOwner.lifecycleScope.launch {
+      when (result) {
+        is VerificationCodeRequestResult.Success -> binding.keyboard.displaySuccess()
+        is VerificationCodeRequestResult.RateLimited -> presentRateLimitedDialog()
+        is VerificationCodeRequestResult.AttemptsExhausted -> presentAccountLocked()
+        is VerificationCodeRequestResult.RegistrationLocked -> presentRegistrationLocked(result.timeRemaining)
+        else -> presentGenericError(result)
+      }
+    }
+  }
+
+  private fun handleRegistrationErrorResponse(result: RegisterAccountResult) {
+    viewLifecycleOwner.lifecycleScope.launch {
+      when (result) {
+        is RegisterAccountResult.Success -> binding.keyboard.displaySuccess()
+        is RegisterAccountResult.RegistrationLocked -> presentRegistrationLocked(result.timeRemaining)
+        is RegisterAccountResult.AuthorizationFailed -> presentIncorrectCodeDialog()
+        is RegisterAccountResult.AttemptsExhausted -> presentAccountLocked()
+        is RegisterAccountResult.RateLimited -> presentRateLimitedDialog()
+
+        else -> presentGenericError(result)
+      }
+    }
+  }
+
+  private fun presentAccountLocked() {
+    binding.keyboard.displayLocked().addListener(
+      object : AssertedSuccessListener<Boolean>() {
+        override fun onSuccess(result: Boolean?) {
+          findNavController().safeNavigate(EnterCodeFragmentDirections.actionAccountLocked())
+        }
+      }
+    )
+  }
+
+  private fun presentRegistrationLocked(timeRemaining: Long) {
+    binding.keyboard.displayLocked().addListener(
+      object : AssertedSuccessListener<Boolean>() {
+        override fun onSuccess(result: Boolean?) {
+          findNavController().safeNavigate(EnterCodeFragmentDirections.actionRequireKbsLockPin(timeRemaining))
+        }
+      }
+    )
+  }
+
+  private fun presentRateLimitedDialog() {
+    binding.keyboard.displayFailure().addListener(
+      object : AssertedSuccessListener<Boolean?>() {
+        override fun onSuccess(result: Boolean?) {
+          MaterialAlertDialogBuilder(requireContext()).apply {
+            setTitle(R.string.RegistrationActivity_too_many_attempts)
+            setMessage(R.string.RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later)
+            setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int ->
+              binding.callMeCountDown.visibility = View.VISIBLE
+              binding.resendSmsCountDown.visibility = View.VISIBLE
+              binding.wrongNumber.visibility = View.VISIBLE
+              binding.code.clear()
+              binding.keyboard.displayKeyboard()
+            }
+            show()
+          }
+        }
+      }
+    )
+  }
+
+  private fun presentIncorrectCodeDialog() {
+    sharedViewModel.incrementIncorrectCodeAttempts()
+
+    viewLifecycleOwner.lifecycleScope.launch {
+      Toast.makeText(requireContext(), R.string.RegistrationActivity_incorrect_code, Toast.LENGTH_LONG).show()
+
+      binding.keyboard.displayFailure().addListener(object : AssertedSuccessListener<Boolean?>() {
+        override fun onSuccess(result: Boolean?) {
+          binding.callMeCountDown.visibility = View.VISIBLE
+          binding.resendSmsCountDown.visibility = View.VISIBLE
+          binding.wrongNumber.visibility = View.VISIBLE
+          binding.code.clear()
+          binding.keyboard.displayKeyboard()
+        }
+      })
+    }
+  }
+
+  private fun presentGenericError(requestResult: RegistrationResult) {
+    binding.keyboard.displayFailure().addListener(
+      object : AssertedSuccessListener<Boolean>() {
+        override fun onSuccess(result: Boolean?) {
+          Log.w(TAG, "Encountered unexpected error!", requestResult.getCause())
+          MaterialAlertDialogBuilder(requireContext()).apply {
+            null?.let<String, MaterialAlertDialogBuilder> {
+              setTitle(it)
+            }
+            setMessage(getString(R.string.RegistrationActivity_error_connecting_to_service))
+            setPositiveButton(android.R.string.ok) { _, _ -> binding.keyboard.displayKeyboard() }
+            show()
+          }
+        }
+      }
+    )
+  }
+
+  private fun popBackStack() {
+    sharedViewModel.setRegistrationCheckpoint(RegistrationCheckpoint.PUSH_NETWORK_AUDITED)
+    NavHostFragment.findNavController(this).popBackStack()
+  }
+
+  @Subscribe(threadMode = ThreadMode.MAIN)
+  fun onVerificationCodeReceived(event: ReceivedSmsEvent) {
+    binding.code.clear()
+
+    if (event.code.isBlank() || event.code.length != ReceivedSmsEvent.CODE_LENGTH) {
+      Log.i(TAG, "Received invalid code of length ${event.code.length}. Ignoring.")
+      return
+    }
+
+    val finalIndex = ReceivedSmsEvent.CODE_LENGTH - 1
+    autopilotCodeEntryActive = true
+    try {
+      event.code
+        .map { it.digitToInt() }
+        .forEachIndexed { i, digit ->
+          binding.code.postDelayed({
+            binding.code.append(digit)
+            if (i == finalIndex) {
+              autopilotCodeEntryActive = false
+            }
+          }, i * 200L)
+        }
+    } catch (notADigit: IllegalArgumentException) {
+      Log.w(TAG, "Failed to convert code into digits.", notADigit)
+      autopilotCodeEntryActive = false
+    }
+  }
+
+  private inner class PhoneStateCallback : SignalStrengthPhoneStateListener.Callback {
+    override fun onNoCellSignalPresent() {
+      bottomSheet.showSafely(childFragmentManager, BOTTOM_SHEET_TAG)
+    }
+
+    override fun onCellSignalPresent() {
+      if (bottomSheet.isResumed) {
+        bottomSheet.dismiss()
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/grantpermissions/GrantPermissionsV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/grantpermissions/GrantPermissionsFragment.kt
similarity index 82%
rename from app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/grantpermissions/GrantPermissionsV2Fragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/grantpermissions/GrantPermissionsFragment.kt
index 114e5ca311..e2b3dc61a6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/grantpermissions/GrantPermissionsV2Fragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/grantpermissions/GrantPermissionsFragment.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registration.v2.ui.grantpermissions
+package org.thoughtcrime.securesms.registration.ui.grantpermissions
 
 import android.app.Activity
 import android.content.pm.PackageManager
@@ -19,13 +19,14 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.compose.ComposeFragment
 import org.thoughtcrime.securesms.registration.compose.GrantPermissionsScreen
 import org.thoughtcrime.securesms.registration.fragments.WelcomePermissions
-import org.thoughtcrime.securesms.registration.v2.ui.RegistrationCheckpoint
-import org.thoughtcrime.securesms.registration.v2.ui.RegistrationV2ViewModel
+import org.thoughtcrime.securesms.registration.ui.RegistrationCheckpoint
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
 import org.thoughtcrime.securesms.restore.RestoreActivity
 import org.thoughtcrime.securesms.util.BackupUtil
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
@@ -34,10 +35,10 @@ import org.thoughtcrime.securesms.util.navigation.safeNavigate
  * Screen in account registration that provides rationales for the suggested runtime permissions.
  */
 @RequiresApi(23)
-class GrantPermissionsV2Fragment : ComposeFragment() {
+class GrantPermissionsFragment : ComposeFragment() {
 
-  private val sharedViewModel by activityViewModels<RegistrationV2ViewModel>()
-  private val args by navArgs<GrantPermissionsV2FragmentArgs>()
+  private val sharedViewModel by activityViewModels<RegistrationViewModel>()
+  private val args by navArgs<GrantPermissionsFragmentArgs>()
   private val isSearchingForBackup = mutableStateOf(false)
 
   private val requestPermissionLauncher = registerForActivityResult(
@@ -49,7 +50,7 @@ class GrantPermissionsV2Fragment : ComposeFragment() {
     when (val resultCode = result.resultCode) {
       Activity.RESULT_OK -> {
         sharedViewModel.onBackupSuccessfullyRestored()
-        NavHostFragment.findNavController(this).safeNavigate(GrantPermissionsV2FragmentDirections.actionEnterPhoneNumber())
+        NavHostFragment.findNavController(this).safeNavigate(GrantPermissionsFragmentDirections.actionEnterPhoneNumber())
       }
       Activity.RESULT_CANCELED -> Log.w(TAG, "Backup restoration canceled.")
       else -> Log.w(TAG, "Backup restoration activity ended with unknown result code: $resultCode")
@@ -94,15 +95,16 @@ class GrantPermissionsV2Fragment : ComposeFragment() {
     permissions.forEach {
       Log.d(TAG, "${it.key} = ${it.value}")
     }
+    sharedViewModel.maybePrefillE164(requireContext())
     sharedViewModel.setRegistrationCheckpoint(RegistrationCheckpoint.PERMISSIONS_GRANTED)
     proceedToNextScreen()
   }
 
   private fun proceedToNextScreen() {
     when (welcomeAction) {
-      WelcomeAction.CONTINUE -> NavHostFragment.findNavController(this).safeNavigate(GrantPermissionsV2FragmentDirections.actionEnterPhoneNumber())
+      WelcomeAction.CONTINUE -> findNavController().safeNavigate(GrantPermissionsFragmentDirections.actionEnterPhoneNumber())
       WelcomeAction.RESTORE_BACKUP -> {
-        val restoreIntent = RestoreActivity.getIntentForRestore(requireActivity())
+        val restoreIntent = RestoreActivity.getIntentForTransferOrRestore(requireActivity())
         launchRestoreActivity.launch(restoreIntent)
       }
     }
@@ -118,6 +120,6 @@ class GrantPermissionsV2Fragment : ComposeFragment() {
   }
 
   companion object {
-    private val TAG = Log.tag(GrantPermissionsV2Fragment::class.java)
+    private val TAG = Log.tag(GrantPermissionsFragment::class.java)
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/linkdevice/EnterDeviceNameFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/linkdevice/EnterDeviceNameFragment.kt
new file mode 100644
index 0000000000..c3e58b90a4
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/linkdevice/EnterDeviceNameFragment.kt
@@ -0,0 +1,37 @@
+package org.thoughtcrime.securesms.registration.ui.linkdevice
+
+import android.os.Build
+import android.os.Bundle
+import android.view.View
+import androidx.core.widget.addTextChangedListener
+import androidx.fragment.app.activityViewModels
+import androidx.navigation.fragment.findNavController
+import org.thoughtcrime.securesms.LoggingFragment
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.ViewBinderDelegate
+import org.thoughtcrime.securesms.databinding.FragmentRegistrationLinkDeviceNameBinding
+import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
+
+class EnterDeviceNameFragment : LoggingFragment(R.layout.fragment_registration_link_device_name) {
+
+  private val sharedViewModel by activityViewModels<RegistrationViewModel>()
+  private val binding: FragmentRegistrationLinkDeviceNameBinding by ViewBinderDelegate(FragmentRegistrationLinkDeviceNameBinding::bind)
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+    setDebugLogSubmitMultiTapView(binding.verifyHeader)
+
+    binding.deviceName.input.addTextChangedListener(afterTextChanged = {
+      binding.linkButton.isEnabled = !it.isNullOrBlank()
+      sharedViewModel.setLinkDeviceName(it.toString())
+    })
+
+    binding.deviceName.setText(Build.MODEL)
+
+    binding.linkButton.setOnClickListener {
+      findNavController().safeNavigate(EnterDeviceNameFragmentDirections.actionLinkDevice())
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/linkdevice/RegisterAsLinkedDeviceFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/linkdevice/RegisterAsLinkedDeviceFragment.kt
new file mode 100644
index 0000000000..37051db6c5
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/linkdevice/RegisterAsLinkedDeviceFragment.kt
@@ -0,0 +1,74 @@
+package org.thoughtcrime.securesms.registration.ui.linkdevice
+
+import android.os.Bundle
+import android.view.View
+import android.widget.Toast
+import androidx.fragment.app.activityViewModels
+import org.thoughtcrime.securesms.LoggingFragment
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.ViewBinderDelegate
+import org.thoughtcrime.securesms.databinding.FragmentRegistrationLinkDeviceBinding
+import org.thoughtcrime.securesms.registration.data.network.RegisterAccountResult
+import org.thoughtcrime.securesms.registration.ui.RegistrationState
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
+import org.thoughtcrime.securesms.util.Util
+
+class RegisterAsLinkedDeviceFragment : LoggingFragment(R.layout.fragment_registration_link_device) {
+
+  private val sharedViewModel by activityViewModels<RegistrationViewModel>()
+  private val binding: FragmentRegistrationLinkDeviceBinding by ViewBinderDelegate(FragmentRegistrationLinkDeviceBinding::bind)
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+
+    binding.linkingTextCode.setOnClickListener {
+      copyToClipboard(binding.linkingTextCode.text)
+    }
+    binding.linkRetryButton.setOnClickListener {
+      attemptDeviceLink()
+    }
+
+    sharedViewModel.uiState.observe(viewLifecycleOwner, ::updateViewState)
+
+    attemptDeviceLink()
+  }
+
+  private fun updateViewState(state: RegistrationState) {
+    if (state.deviceLinkUrl != null && !state.inProgress) {
+      binding.linkingQrImage.setQrText(state.deviceLinkUrl)
+      binding.linkingTextCode.text = state.deviceLinkUrl
+      binding.linkingQrImage.visibility = View.VISIBLE
+      binding.linkingTextCode.visibility = View.VISIBLE
+    } else {
+      binding.linkingQrImage.visibility = View.GONE
+      binding.linkingTextCode.visibility = View.GONE
+    }
+    if (state.inProgress) {
+      binding.linkingLoadingSpinner.visibility = View.VISIBLE
+    } else {
+      binding.linkingLoadingSpinner.visibility = View.GONE
+    }
+    if (state.networkError != null) {
+      binding.linkingError.visibility = View.VISIBLE
+      binding.linkRetryButton.visibility = View.VISIBLE
+      // binding.linkingTimeout.visibility = View.GONE
+    } else {
+      binding.linkingError.visibility = View.GONE
+      binding.linkRetryButton.visibility = View.GONE
+    }
+  }
+
+  private fun attemptDeviceLink() {
+    sharedViewModel.clearNetworkError()
+    sharedViewModel.attemptDeviceLink(requireContext(), ::registrationErrorHandler)
+  }
+
+  private fun copyToClipboard(text: CharSequence) {
+    Util.copyToClipboard(requireContext(), text)
+    Toast.makeText(requireContext(), "Copied to clipboard", Toast.LENGTH_SHORT).show()
+  }
+
+  private fun registrationErrorHandler(result: RegisterAccountResult) {
+
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberFragment.kt
new file mode 100644
index 0000000000..649ac1d83a
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberFragment.kt
@@ -0,0 +1,595 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.ui.phonenumber
+
+import android.content.Context
+import android.content.DialogInterface
+import android.os.Bundle
+import android.text.Editable
+import android.text.SpannableStringBuilder
+import android.text.TextWatcher
+import android.view.KeyEvent
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.inputmethod.EditorInfo
+import android.widget.ArrayAdapter
+import android.widget.TextView
+import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.MenuProvider
+import androidx.core.widget.addTextChangedListener
+import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.fragment.findNavController
+import com.google.android.gms.common.ConnectionResult
+import com.google.android.gms.common.GoogleApiAvailability
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.textfield.MaterialAutoCompleteTextView
+import com.google.android.material.textfield.TextInputEditText
+import com.google.i18n.phonenumbers.NumberParseException
+import com.google.i18n.phonenumbers.PhoneNumberUtil
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber
+import kotlinx.coroutines.launch
+import org.signal.core.util.isNotNullOrBlank
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.LoggingFragment
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.ViewBinderDelegate
+import org.thoughtcrime.securesms.databinding.FragmentRegistrationEnterPhoneNumberBinding
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository
+import org.thoughtcrime.securesms.registration.data.network.Challenge
+import org.thoughtcrime.securesms.registration.data.network.RegistrationResult
+import org.thoughtcrime.securesms.registration.data.network.RegistrationSessionCreationResult
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult
+import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView
+import org.thoughtcrime.securesms.registration.ui.RegistrationCheckpoint
+import org.thoughtcrime.securesms.registration.ui.RegistrationState
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
+import org.thoughtcrime.securesms.registration.ui.toE164
+import org.thoughtcrime.securesms.registration.util.CountryPrefix
+import org.thoughtcrime.securesms.util.CommunicationActions
+import org.thoughtcrime.securesms.util.Dialogs
+import org.thoughtcrime.securesms.util.PlayServicesUtil
+import org.thoughtcrime.securesms.util.SpanUtil
+import org.thoughtcrime.securesms.util.SupportEmailUtil
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.thoughtcrime.securesms.util.ViewUtil
+import org.thoughtcrime.securesms.util.livedata.LiveDataObserverCallback
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
+import org.thoughtcrime.securesms.util.visible
+import kotlin.time.Duration.Companion.milliseconds
+
+/**
+ * Screen in registration where the user enters their phone number.
+ */
+class EnterPhoneNumberFragment : LoggingFragment(R.layout.fragment_registration_enter_phone_number) {
+
+  private val TAG = Log.tag(EnterPhoneNumberFragment::class.java)
+  private val sharedViewModel by activityViewModels<RegistrationViewModel>()
+  private val fragmentViewModel by viewModels<EnterPhoneNumberViewModel>()
+  private val binding: FragmentRegistrationEnterPhoneNumberBinding by ViewBinderDelegate(FragmentRegistrationEnterPhoneNumberBinding::bind)
+
+  private val skipToNextScreen: DialogInterface.OnClickListener = DialogInterface.OnClickListener { _: DialogInterface?, _: Int -> moveToVerificationEntryScreen() }
+
+  private lateinit var spinnerAdapter: ArrayAdapter<CountryPrefix>
+  private lateinit var phoneNumberInputLayout: TextInputEditText
+  private lateinit var spinnerView: MaterialAutoCompleteTextView
+
+  private var currentPhoneNumberFormatter: TextWatcher? = null
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+    setDebugLogSubmitMultiTapView(binding.verifyHeader)
+    requireActivity().onBackPressedDispatcher.addCallback(
+      viewLifecycleOwner,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          popBackStack()
+        }
+      }
+    )
+    phoneNumberInputLayout = binding.number.editText as TextInputEditText
+    spinnerView = binding.countryCode.editText as MaterialAutoCompleteTextView
+    spinnerAdapter = ArrayAdapter<CountryPrefix>(
+      requireContext(),
+      R.layout.registration_country_code_dropdown_item,
+      fragmentViewModel.supportedCountryPrefixes
+    )
+    binding.registerButton.setOnClickListener {
+      enableNetwork()
+      onRegistrationButtonClicked()
+    }
+    binding.linkButton.setOnClickListener {
+      enableNetwork()
+      findNavController().safeNavigate(EnterPhoneNumberFragmentDirections.actionLinkDevice())
+    }
+
+    binding.toolbar.title = ""
+    val activity = requireActivity() as AppCompatActivity
+    activity.setSupportActionBar(binding.toolbar)
+
+    requireActivity().addMenuProvider(UseProxyMenuProvider(), viewLifecycleOwner)
+
+    sharedViewModel.uiState.observe(viewLifecycleOwner) { sharedState ->
+      presentRegisterButton(sharedState)
+      presentProgressBar(sharedState.inProgress, sharedState.isReRegister)
+
+      sharedState.networkError?.let {
+        presentNetworkError(it)
+      }
+
+      if (sharedState.challengesRequested.contains(Challenge.CAPTCHA) && sharedState.captchaToken.isNotNullOrBlank()) {
+        sharedViewModel.submitCaptchaToken(requireContext(), ::handleErrorResponse)
+      } else if (sharedState.challengesRemaining.isNotEmpty()) {
+        handleChallenges(sharedState.challengesRemaining)
+      } else if (sharedState.registrationCheckpoint >= RegistrationCheckpoint.PHONE_NUMBER_CONFIRMED && sharedState.canSkipSms) {
+        moveToEnterPinScreen()
+      } else if (sharedState.registrationCheckpoint >= RegistrationCheckpoint.VERIFICATION_CODE_REQUESTED) {
+        moveToVerificationEntryScreen()
+      }
+    }
+
+    fragmentViewModel.uiState.observe(viewLifecycleOwner) { fragmentState ->
+
+      fragmentState.phoneNumberFormatter?.let {
+        bindPhoneNumberFormatter(it)
+      }
+
+      if (fragmentViewModel.isEnteredNumberValid(fragmentState)) {
+        sharedViewModel.setPhoneNumber(fragmentViewModel.parsePhoneNumber(fragmentState))
+      } else {
+        sharedViewModel.setPhoneNumber(null)
+      }
+
+      if (fragmentState.error != EnterPhoneNumberState.Error.NONE) {
+        presentLocalError(fragmentState)
+      }
+    }
+
+    initializeInputFields()
+
+    val existingPhoneNumber = sharedViewModel.phoneNumber
+    if (existingPhoneNumber != null) {
+      fragmentViewModel.restoreState(existingPhoneNumber)
+      spinnerView.setText(existingPhoneNumber.countryCode.toString())
+      fragmentViewModel.formatter?.let {
+        bindPhoneNumberFormatter(it)
+      }
+      phoneNumberInputLayout.setText(existingPhoneNumber.nationalNumber.toString())
+    } else {
+      spinnerView.setText(fragmentViewModel.countryPrefix().toString())
+    }
+
+    ViewUtil.focusAndShowKeyboard(phoneNumberInputLayout)
+  }
+
+  private fun bindPhoneNumberFormatter(formatter: TextWatcher) {
+    if (formatter != currentPhoneNumberFormatter) {
+      currentPhoneNumberFormatter?.let { oldWatcher ->
+        Log.d(TAG, "Removing current phone number formatter in fragment")
+        phoneNumberInputLayout.removeTextChangedListener(oldWatcher)
+      }
+      phoneNumberInputLayout.addTextChangedListener(formatter)
+      currentPhoneNumberFormatter = formatter
+      Log.d(TAG, "Updating phone number formatter in fragment")
+    }
+  }
+
+  private fun handleChallenges(remainingChallenges: List<Challenge>) {
+    when (remainingChallenges.first()) {
+      Challenge.CAPTCHA -> moveToCaptcha()
+      Challenge.PUSH -> performPushChallenge()
+    }
+  }
+
+  private fun performPushChallenge() {
+    sharedViewModel.requestAndSubmitPushToken(requireContext(), ::handleErrorResponse)
+  }
+
+  private fun initializeInputFields() {
+    binding.countryCode.editText?.addTextChangedListener { s ->
+      val sanitized = s.toString().filter { c -> c.isDigit() }
+      if (sanitized.isNotNullOrBlank()) {
+        val countryCode: Int = sanitized.toInt()
+        fragmentViewModel.setCountry(countryCode)
+      }
+    }
+
+    phoneNumberInputLayout.addTextChangedListener {
+      fragmentViewModel.setPhoneNumber(it?.toString())
+    }
+
+    val scrollView = binding.scrollView
+    val registerButton = binding.registerButton
+    phoneNumberInputLayout.onFocusChangeListener = View.OnFocusChangeListener { _: View?, hasFocus: Boolean ->
+      if (hasFocus) {
+        scrollView.postDelayed({
+          scrollView.smoothScrollTo(0, registerButton.bottom)
+        }, 250)
+      }
+    }
+
+    phoneNumberInputLayout.imeOptions = EditorInfo.IME_ACTION_DONE
+    phoneNumberInputLayout.setOnEditorActionListener { v: TextView?, actionId: Int, _: KeyEvent? ->
+      if (actionId == EditorInfo.IME_ACTION_DONE && v != null) {
+        onRegistrationButtonClicked()
+        return@setOnEditorActionListener true
+      }
+      false
+    }
+
+    spinnerView.threshold = 100
+    spinnerView.setAdapter(spinnerAdapter)
+    spinnerView.addTextChangedListener(afterTextChanged = ::onCountryDropDownChanged)
+  }
+
+  private fun onCountryDropDownChanged(s: Editable?) {
+    if (s.isNullOrEmpty()) {
+      return
+    }
+
+    if (s[0] != '+') {
+      s.insert(0, "+")
+    }
+
+    fragmentViewModel.supportedCountryPrefixes.firstOrNull { it.toString() == s.toString() }?.let {
+      fragmentViewModel.setCountry(it.digits)
+      val numberLength: Int = phoneNumberInputLayout.text?.length ?: 0
+      phoneNumberInputLayout.setSelection(numberLength, numberLength)
+    }
+  }
+
+  private fun presentRegisterButton(sharedState: RegistrationState) {
+    binding.registerButton.isEnabled = sharedState.phoneNumber != null && PhoneNumberUtil.getInstance().isValidNumber(sharedState.phoneNumber)
+    if (sharedState.inProgress) {
+      binding.registerButton.setSpinning()
+    } else {
+      binding.registerButton.cancelSpinning()
+    }
+  }
+
+  private fun presentLocalError(state: EnterPhoneNumberState) {
+    when (state.error) {
+      EnterPhoneNumberState.Error.NONE -> Unit
+
+      EnterPhoneNumberState.Error.INVALID_PHONE_NUMBER -> {
+        MaterialAlertDialogBuilder(requireContext()).apply {
+          setTitle(R.string.RegistrationActivity_invalid_number)
+          setMessage(
+            String.format(
+              getString(R.string.RegistrationActivity_the_number_you_specified_s_is_invalid),
+              state.phoneNumber
+            )
+          )
+          setPositiveButton(android.R.string.ok) { _, _ -> fragmentViewModel.clearError() }
+          setOnCancelListener { fragmentViewModel.clearError() }
+          setOnDismissListener { fragmentViewModel.clearError() }
+          show()
+        }
+      }
+
+      EnterPhoneNumberState.Error.PLAY_SERVICES_MISSING -> {
+        handlePromptForNoPlayServices()
+      }
+
+      EnterPhoneNumberState.Error.PLAY_SERVICES_NEEDS_UPDATE -> {
+        GoogleApiAvailability.getInstance().getErrorDialog(requireActivity(), ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED, 0)?.show()
+      }
+
+      EnterPhoneNumberState.Error.PLAY_SERVICES_TRANSIENT -> {
+        MaterialAlertDialogBuilder(requireContext()).apply {
+          setTitle(R.string.RegistrationActivity_play_services_error)
+          setMessage(R.string.RegistrationActivity_google_play_services_is_updating_or_unavailable)
+          setPositiveButton(android.R.string.ok) { _, _ -> fragmentViewModel.clearError() }
+          setOnCancelListener { fragmentViewModel.clearError() }
+          setOnDismissListener { fragmentViewModel.clearError() }
+          show()
+        }
+      }
+    }
+  }
+
+  private fun presentNetworkError(networkError: Throwable) {
+    Log.i(TAG, "Unknown error during verification code request", networkError)
+    MaterialAlertDialogBuilder(requireContext()).apply {
+      setMessage(R.string.RegistrationActivity_unable_to_connect_to_service)
+      setPositiveButton(android.R.string.ok) { _, _ -> sharedViewModel.clearNetworkError() }
+      setOnCancelListener { sharedViewModel.clearNetworkError() }
+      setOnDismissListener { sharedViewModel.clearNetworkError() }
+      show()
+    }
+  }
+
+  private fun handleErrorResponse(result: RegistrationResult) {
+    viewLifecycleOwner.lifecycleScope.launch {
+      if (!result.isSuccess()) {
+        Log.i(TAG, "Handling error response.", result.getCause())
+      }
+      when (result) {
+        is RegistrationSessionCreationResult.Success,
+        is VerificationCodeRequestResult.Success -> Unit
+
+        is RegistrationSessionCreationResult.AttemptsExhausted,
+        is VerificationCodeRequestResult.AttemptsExhausted -> presentRemoteErrorDialog(getString(R.string.RegistrationActivity_rate_limited_to_service))
+
+        is VerificationCodeRequestResult.ChallengeRequired -> {
+          handleChallenges(result.challenges)
+        }
+
+        // MOLLY: FIXME restore commit 4048263d
+        is VerificationCodeRequestResult.ExternalServiceFailure -> presentRemoteErrorDialog(getString(R.string.RegistrationActivity_unable_to_connect_to_service), skipToNextScreen)
+        is VerificationCodeRequestResult.ImpossibleNumber -> {
+          MaterialAlertDialogBuilder(requireContext()).apply {
+            setMessage(getString(R.string.RegistrationActivity_the_number_you_specified_s_is_invalid, fragmentViewModel.phoneNumber?.toE164()))
+            setPositiveButton(android.R.string.ok, null)
+            show()
+          }
+        }
+
+        is VerificationCodeRequestResult.InvalidTransportModeFailure -> {
+          MaterialAlertDialogBuilder(requireContext()).apply {
+            setMessage(R.string.RegistrationActivity_we_couldnt_send_you_a_verification_code)
+            setPositiveButton(R.string.RegistrationActivity_voice_call) { _, _ ->
+              sharedViewModel.requestVerificationCall(requireContext(), ::handleErrorResponse)
+            }
+            setNegativeButton(R.string.RegistrationActivity_cancel, null)
+            show()
+          }
+        }
+
+        is RegistrationSessionCreationResult.MalformedRequest,
+        is VerificationCodeRequestResult.MalformedRequest -> presentRemoteErrorDialog(getString(R.string.RegistrationActivity_unable_to_connect_to_service), skipToNextScreen)
+
+        is VerificationCodeRequestResult.MustRetry -> presentRemoteErrorDialog(getString(R.string.RegistrationActivity_unable_to_connect_to_service), skipToNextScreen)
+        is VerificationCodeRequestResult.NonNormalizedNumber -> handleNonNormalizedNumberError(result.originalNumber, result.normalizedNumber, fragmentViewModel.mode)
+        is RegistrationSessionCreationResult.RateLimited -> {
+          Log.i(TAG, "Session creation rate limited! Next attempt: ${result.timeRemaining.milliseconds}")
+          presentRemoteErrorDialog(getString(R.string.RegistrationActivity_rate_limited_to_try_again, result.timeRemaining.milliseconds.toString()))
+        }
+
+        is VerificationCodeRequestResult.RateLimited -> {
+          Log.i(TAG, "Code request rate limited! Next attempt: ${result.timeRemaining.milliseconds}")
+          presentRemoteErrorDialog(getString(R.string.RegistrationActivity_rate_limited_to_try_again, result.timeRemaining.milliseconds.toString()))
+        }
+
+        is VerificationCodeRequestResult.TokenNotAccepted -> presentRemoteErrorDialog(getString(R.string.RegistrationActivity_we_need_to_verify_that_youre_human)) { _, _ -> moveToCaptcha() }
+        else -> presentRemoteErrorDialog(getString(R.string.RegistrationActivity_unable_to_connect_to_service))
+      }
+    }
+  }
+
+  private fun moveToCaptcha() {
+    findNavController().safeNavigate(EnterPhoneNumberFragmentDirections.actionRequestCaptcha())
+  }
+
+  private fun presentRemoteErrorDialog(message: String, positiveButtonListener: DialogInterface.OnClickListener? = null) {
+    MaterialAlertDialogBuilder(requireContext()).apply {
+      setMessage(message)
+      setPositiveButton(android.R.string.ok, positiveButtonListener)
+      show()
+    }
+  }
+
+  private fun handleNonNormalizedNumberError(originalNumber: String, normalizedNumber: String, mode: RegistrationRepository.Mode) {
+    try {
+      val phoneNumber = PhoneNumberUtil.getInstance().parse(normalizedNumber, null)
+
+      MaterialAlertDialogBuilder(requireContext()).apply {
+        setTitle(R.string.RegistrationActivity_non_standard_number_format)
+        setMessage(getString(R.string.RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard, originalNumber, normalizedNumber))
+        setNegativeButton(android.R.string.no) { d: DialogInterface, i: Int -> d.dismiss() }
+        setNeutralButton(R.string.RegistrationActivity_contact_signal_support) { dialogInterface, _ ->
+          val subject = getString(R.string.RegistrationActivity_signal_android_phone_number_format)
+          val body = SupportEmailUtil.generateSupportEmailBody(requireContext(), R.string.RegistrationActivity_signal_android_phone_number_format, null, null)
+
+          CommunicationActions.openEmail(requireContext(), SupportEmailUtil.getSupportEmailAddress(requireContext()), subject, body)
+          dialogInterface.dismiss()
+        }
+        setPositiveButton(R.string.yes) { dialogInterface, _ ->
+          spinnerView.setText(phoneNumber.countryCode.toString())
+          phoneNumberInputLayout.setText(phoneNumber.nationalNumber.toString())
+          when (mode) {
+            RegistrationRepository.Mode.SMS_WITH_LISTENER,
+            RegistrationRepository.Mode.SMS_WITHOUT_LISTENER -> sharedViewModel.requestSmsCode(requireContext(), ::handleErrorResponse)
+            RegistrationRepository.Mode.PHONE_CALL -> sharedViewModel.requestVerificationCall(requireContext(), ::handleErrorResponse)
+          }
+          dialogInterface.dismiss()
+        }
+        show()
+      }
+    } catch (e: NumberParseException) {
+      Log.w(TAG, "Failed to parse number!", e)
+
+      Dialogs.showAlertDialog(
+        requireContext(),
+        getString(R.string.RegistrationActivity_invalid_number),
+        getString(R.string.RegistrationActivity_the_number_you_specified_s_is_invalid, fragmentViewModel.phoneNumber?.toE164())
+      )
+    }
+  }
+
+  private fun onRegistrationButtonClicked() {
+    ViewUtil.hideKeyboard(requireContext(), phoneNumberInputLayout)
+    sharedViewModel.setInProgress(true)
+    val hasFcm = validateFcmStatus(requireContext())
+    if (hasFcm) {
+      sharedViewModel.uiState.observe(viewLifecycleOwner, FcmTokenRetrievedObserver())
+      sharedViewModel.fetchFcmToken(requireContext())
+    } else {
+      sharedViewModel.uiState.value?.let { value ->
+        val now = System.currentTimeMillis()
+        if (value.phoneNumber == null) {
+          fragmentViewModel.setError(EnterPhoneNumberState.Error.INVALID_PHONE_NUMBER)
+          sharedViewModel.setInProgress(false)
+        } else if (now < value.nextSmsTimestamp) {
+          moveToVerificationEntryScreen()
+        } else {
+          presentConfirmNumberDialog(value.phoneNumber, value.isReRegister, value.canSkipSms, missingFcmConsentRequired = true)
+        }
+      }
+    }
+  }
+
+  private fun enableNetwork() {
+    TextSecurePreferences.setHasSeenNetworkConfig(requireContext(), true)
+    AppDependencies.networkManager.setNetworkEnabled(true)
+  }
+
+  private fun onFcmTokenRetrieved(value: RegistrationState) {
+    if (value.phoneNumber == null) {
+      fragmentViewModel.setError(EnterPhoneNumberState.Error.INVALID_PHONE_NUMBER)
+      sharedViewModel.setInProgress(false)
+    } else {
+      presentConfirmNumberDialog(value.phoneNumber, value.isReRegister, value.canSkipSms, missingFcmConsentRequired = false)
+    }
+  }
+
+  private fun presentProgressBar(showProgress: Boolean, isReRegister: Boolean) {
+    if (showProgress) {
+      binding.registerButton.setSpinning()
+    } else {
+      binding.registerButton.cancelSpinning()
+    }
+    binding.countryCode.isEnabled = !showProgress
+    binding.number.isEnabled = !showProgress
+    binding.linkButton.isEnabled = !showProgress
+    binding.cancelButton.visible = !showProgress && isReRegister
+  }
+
+  private fun validateFcmStatus(context: Context): Boolean {
+    val fcmStatus = PlayServicesUtil.getPlayServicesStatus(context)
+    Log.d(TAG, "Got $fcmStatus for Play Services status.")
+    when (fcmStatus) {
+      PlayServicesUtil.PlayServicesStatus.SUCCESS -> {
+        return true
+      }
+
+      PlayServicesUtil.PlayServicesStatus.DISABLED -> {
+        return false
+      }
+
+      PlayServicesUtil.PlayServicesStatus.MISSING -> {
+        fragmentViewModel.setError(EnterPhoneNumberState.Error.PLAY_SERVICES_MISSING)
+        return false
+      }
+
+      PlayServicesUtil.PlayServicesStatus.NEEDS_UPDATE -> {
+        fragmentViewModel.setError(EnterPhoneNumberState.Error.PLAY_SERVICES_NEEDS_UPDATE)
+        return false
+      }
+
+      PlayServicesUtil.PlayServicesStatus.TRANSIENT_ERROR -> {
+        fragmentViewModel.setError(EnterPhoneNumberState.Error.PLAY_SERVICES_TRANSIENT)
+        return false
+      }
+
+      null -> {
+        Log.w(TAG, "Null result received from PlayServicesUtil, marking Play Services as missing.")
+        fragmentViewModel.setError(EnterPhoneNumberState.Error.PLAY_SERVICES_MISSING)
+        return false
+      }
+    }
+  }
+
+  private fun handleConfirmNumberDialogCanceled() {
+    Log.d(TAG, "User canceled confirm number, returning to edit number.")
+    sharedViewModel.setInProgress(false)
+    ViewUtil.focusAndMoveCursorToEndAndOpenKeyboard(phoneNumberInputLayout)
+  }
+
+  private fun presentConfirmNumberDialog(phoneNumber: PhoneNumber, isReRegister: Boolean, canSkipSms: Boolean, missingFcmConsentRequired: Boolean) {
+    val title = if (isReRegister) {
+      R.string.RegistrationActivity_additional_verification_required
+    } else {
+      R.string.RegistrationActivity_phone_number_verification_dialog_title
+    }
+
+    val message: CharSequence = SpannableStringBuilder().apply {
+      append(SpanUtil.bold(PhoneNumberFormatter.prettyPrint(phoneNumber.toE164())))
+      if (!canSkipSms) {
+        append("\n\n")
+        append(getString(R.string.RegistrationActivity_a_verification_code_will_be_sent_to_this_number))
+      }
+    }
+
+    MaterialAlertDialogBuilder(requireContext()).apply {
+      setTitle(title)
+      setMessage(message)
+      setPositiveButton(android.R.string.ok) { _, _ ->
+        Log.d(TAG, "User confirmed number.")
+        if (missingFcmConsentRequired) {
+          handlePromptForNoPlayServices()
+        } else {
+          sharedViewModel.onUserConfirmedPhoneNumber(requireContext(), ::handleErrorResponse)
+        }
+      }
+      setNegativeButton(R.string.RegistrationActivity_edit_number) { _, _ -> handleConfirmNumberDialogCanceled() }
+      setOnCancelListener { _ -> handleConfirmNumberDialogCanceled() }
+    }.show()
+  }
+
+  private fun handlePromptForNoPlayServices() {
+    Log.d(TAG, "Device does not have Play Services, showing consent dialog.")
+    MaterialAlertDialogBuilder(requireContext()).apply {
+      setTitle(R.string.RegistrationActivity_missing_google_play_services)
+      setMessage(R.string.RegistrationActivity_this_device_is_missing_google_play_services)
+      setPositiveButton(R.string.RegistrationActivity_i_understand) { _, _ ->
+        Log.d(TAG, "User confirmed number.")
+        sharedViewModel.onUserConfirmedPhoneNumber(requireContext(), ::handleErrorResponse)
+      }
+      setNegativeButton(android.R.string.cancel, null)
+      setOnCancelListener { fragmentViewModel.clearError() }
+      setOnDismissListener { fragmentViewModel.clearError() }
+      show()
+    }
+  }
+
+  private fun moveToEnterPinScreen() {
+    findNavController().safeNavigate(EnterPhoneNumberFragmentDirections.actionReRegisterWithPinFragment())
+    sharedViewModel.setInProgress(false)
+  }
+
+  private fun moveToVerificationEntryScreen() {
+    findNavController().safeNavigate(EnterPhoneNumberFragmentDirections.actionEnterVerificationCode())
+    sharedViewModel.setInProgress(false)
+  }
+
+  private fun popBackStack() {
+    sharedViewModel.setRegistrationCheckpoint(RegistrationCheckpoint.INITIALIZATION)
+    findNavController().popBackStack()
+  }
+
+  private inner class FcmTokenRetrievedObserver : LiveDataObserverCallback<RegistrationState>(sharedViewModel.uiState) {
+    override fun onValue(value: RegistrationState): Boolean {
+      val fcmRetrieved = value.isFcmSupported
+      if (fcmRetrieved) {
+        onFcmTokenRetrieved(value)
+      }
+      return fcmRetrieved
+    }
+  }
+
+  private inner class UseProxyMenuProvider : MenuProvider {
+    override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+      menuInflater.inflate(R.menu.enter_phone_number, menu)
+    }
+
+    override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+      return if (menuItem.itemId == R.id.phone_menu_use_proxy) {
+        NavHostFragment.findNavController(this@EnterPhoneNumberFragment).safeNavigate(EnterPhoneNumberFragmentDirections.actionEditProxy())
+        true
+      } else {
+        false
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberState.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberState.kt
new file mode 100644
index 0000000000..226c3bf98a
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberState.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.ui.phonenumber
+
+import android.text.TextWatcher
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository
+
+/**
+ * State holder for the phone number entry screen, including phone number and Play Services errors.
+ */
+data class EnterPhoneNumberState(val countryPrefixIndex: Int = 0, val phoneNumber: String = "", val phoneNumberFormatter: TextWatcher? = null, val mode: RegistrationRepository.Mode = RegistrationRepository.Mode.SMS_WITHOUT_LISTENER, val error: Error = Error.NONE) {
+  enum class Error {
+    NONE, INVALID_PHONE_NUMBER, PLAY_SERVICES_MISSING, PLAY_SERVICES_NEEDS_UPDATE, PLAY_SERVICES_TRANSIENT
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/phonenumber/EnterPhoneNumberV2ViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberViewModel.kt
similarity index 74%
rename from app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/phonenumber/EnterPhoneNumberV2ViewModel.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberViewModel.kt
index 7920f69038..2ca2ad4c21 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/phonenumber/EnterPhoneNumberV2ViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberViewModel.kt
@@ -3,9 +3,10 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registration.v2.ui.phonenumber
+package org.thoughtcrime.securesms.registration.ui.phonenumber
 
 import android.telephony.PhoneNumberFormattingTextWatcher
+import android.text.TextWatcher
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
@@ -18,33 +19,42 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.registration.data.RegistrationRepository
 import org.thoughtcrime.securesms.registration.util.CountryPrefix
 
 /**
  * ViewModel for the phone number entry screen.
  */
-class EnterPhoneNumberV2ViewModel : ViewModel() {
+class EnterPhoneNumberViewModel : ViewModel() {
 
-  private val TAG = Log.tag(EnterPhoneNumberV2ViewModel::class.java)
+  private val TAG = Log.tag(EnterPhoneNumberViewModel::class.java)
 
-  private val store = MutableStateFlow(EnterPhoneNumberV2State.INIT)
+  private val store = MutableStateFlow(EnterPhoneNumberState())
   val uiState = store.asLiveData()
 
-  val supportedCountryPrefixes: List<CountryPrefix> = PhoneNumberUtil.getInstance().supportedCallingCodes
-    .map { CountryPrefix(it, PhoneNumberUtil.getInstance().getRegionCodeForCountryCode(it)) }
-    .sortedBy { it.digits.toString() }
+  val formatter: TextWatcher?
+    get() = store.value.phoneNumberFormatter
 
-  fun countryPrefix(): CountryPrefix {
-    return supportedCountryPrefixes[store.value.countryPrefixIndex]
-  }
-
-  fun phoneNumber(): PhoneNumber? {
-    return try {
+  val phoneNumber: PhoneNumber?
+    get() = try {
       parsePhoneNumber(store.value)
     } catch (ex: NumberParseException) {
       Log.w(TAG, "Could not parse phone number in current state.", ex)
       null
     }
+
+  val supportedCountryPrefixes: List<CountryPrefix> = PhoneNumberUtil.getInstance().supportedCallingCodes
+    .map { CountryPrefix(it, PhoneNumberUtil.getInstance().getRegionCodeForCountryCode(it)) }
+    .sortedBy { it.digits }
+
+  var mode: RegistrationRepository.Mode
+    get() = store.value.mode
+    set(value) = store.update {
+      it.copy(mode = value)
+    }
+
+  fun countryPrefix(): CountryPrefix {
+    return supportedCountryPrefixes[store.value.countryPrefixIndex]
   }
 
   fun setPhoneNumber(phoneNumber: String?) {
@@ -53,6 +63,11 @@ class EnterPhoneNumberV2ViewModel : ViewModel() {
 
   fun setCountry(digits: Int) {
     val matchingIndex = countryCodeToAdapterIndex(digits)
+    if (matchingIndex == -1) {
+      Log.d(TAG, "Invalid country code specified $digits")
+      return
+    }
+
     store.update {
       it.copy(countryPrefixIndex = matchingIndex)
     }
@@ -70,11 +85,11 @@ class EnterPhoneNumberV2ViewModel : ViewModel() {
     }
   }
 
-  fun parsePhoneNumber(state: EnterPhoneNumberV2State): PhoneNumber {
+  fun parsePhoneNumber(state: EnterPhoneNumberState): PhoneNumber {
     return PhoneNumberUtil.getInstance().parse(state.phoneNumber, supportedCountryPrefixes[state.countryPrefixIndex].regionCode)
   }
 
-  fun isEnteredNumberValid(state: EnterPhoneNumberV2State): Boolean {
+  fun isEnteredNumberValid(state: EnterPhoneNumberState): Boolean {
     return try {
       PhoneNumberUtil.getInstance().isValidNumber(parsePhoneNumber(state))
     } catch (ex: NumberParseException) {
@@ -99,10 +114,10 @@ class EnterPhoneNumberV2ViewModel : ViewModel() {
   }
 
   fun clearError() {
-    setError(EnterPhoneNumberV2State.Error.NONE)
+    setError(EnterPhoneNumberState.Error.NONE)
   }
 
-  fun setError(error: EnterPhoneNumberV2State.Error) {
+  fun setError(error: EnterPhoneNumberState.Error) {
     store.update {
       it.copy(error = error)
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/registrationlock/RegistrationLockFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/registrationlock/RegistrationLockFragment.kt
new file mode 100644
index 0000000000..5a674feb5c
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/registrationlock/RegistrationLockFragment.kt
@@ -0,0 +1,295 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.ui.registrationlock
+
+import android.os.Bundle
+import android.text.InputType
+import android.view.KeyEvent
+import android.view.View
+import android.view.inputmethod.EditorInfo
+import android.widget.TextView
+import android.widget.Toast
+import androidx.fragment.app.activityViewModels
+import androidx.navigation.fragment.findNavController
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.LoggingFragment
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.ViewBinderDelegate
+import org.thoughtcrime.securesms.databinding.FragmentRegistrationLockBinding
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.lock.v2.PinKeyboardType
+import org.thoughtcrime.securesms.lock.v2.SvrConstants
+import org.thoughtcrime.securesms.registration.data.network.RegisterAccountResult
+import org.thoughtcrime.securesms.registration.data.network.RegistrationResult
+import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult
+import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
+import org.thoughtcrime.securesms.util.CommunicationActions
+import org.thoughtcrime.securesms.util.SupportEmailUtil
+import org.thoughtcrime.securesms.util.ViewUtil
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
+import java.util.concurrent.TimeUnit
+
+class RegistrationLockFragment : LoggingFragment(R.layout.fragment_registration_lock) {
+  companion object {
+    private val TAG = Log.tag(RegistrationLockFragment::class.java)
+  }
+
+  private val binding: FragmentRegistrationLockBinding by ViewBinderDelegate(FragmentRegistrationLockBinding::bind)
+
+  private val viewModel by activityViewModels<RegistrationViewModel>()
+
+  private var timeRemaining: Long = 0
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    super.onViewCreated(view, savedInstanceState)
+    setDebugLogSubmitMultiTapView(view.findViewById(R.id.kbs_lock_pin_title))
+
+    val args: RegistrationLockFragmentArgs = RegistrationLockFragmentArgs.fromBundle(requireArguments())
+
+    timeRemaining = args.getTimeRemaining()
+
+    binding.kbsLockForgotPin.visibility = View.GONE
+    binding.kbsLockForgotPin.setOnClickListener { handleForgottenPin(timeRemaining) }
+
+    binding.kbsLockPinInput.setImeOptions(EditorInfo.IME_ACTION_DONE)
+    binding.kbsLockPinInput.setOnEditorActionListener { v: TextView?, actionId: Int, _: KeyEvent? ->
+      if (actionId == EditorInfo.IME_ACTION_DONE) {
+        ViewUtil.hideKeyboard(requireContext(), v!!)
+        handlePinEntry()
+        return@setOnEditorActionListener true
+      }
+      false
+    }
+
+    enableAndFocusPinEntry()
+
+    binding.kbsLockPinConfirm.setOnClickListener {
+      ViewUtil.hideKeyboard(requireContext(), binding.kbsLockPinInput)
+      handlePinEntry()
+    }
+
+    binding.kbsLockKeyboardToggle.setOnClickListener {
+      val keyboardType: PinKeyboardType = getPinEntryKeyboardType()
+      updateKeyboard(keyboardType.other)
+      binding.kbsLockKeyboardToggle.setIconResource(keyboardType.iconResource)
+    }
+
+    val keyboardType: PinKeyboardType = getPinEntryKeyboardType().getOther()
+    binding.kbsLockKeyboardToggle.setIconResource(keyboardType.iconResource)
+
+    viewModel.lockedTimeRemaining.observe(viewLifecycleOwner) { t: Long -> timeRemaining = t }
+
+    val triesRemaining: Int = viewModel.svrTriesRemaining
+
+    if (triesRemaining <= 3) {
+      val daysRemaining = getLockoutDays(timeRemaining)
+
+      MaterialAlertDialogBuilder(requireContext())
+        .setTitle(R.string.RegistrationLockFragment__not_many_tries_left)
+        .setMessage(getTriesRemainingDialogMessage(triesRemaining, daysRemaining))
+        .setPositiveButton(android.R.string.ok, null)
+        .setNeutralButton(R.string.PinRestoreEntryFragment_contact_support) { _, _ -> sendEmailToSupport() }
+        .show()
+    }
+
+    if (triesRemaining < 5) {
+      binding.kbsLockPinInputLabel.text = requireContext().resources.getQuantityString(R.plurals.RegistrationLockFragment__d_attempts_remaining, triesRemaining, triesRemaining)
+    }
+
+    viewModel.inProgress.observe(viewLifecycleOwner) {
+      if (it) {
+        binding.kbsLockPinConfirm.setSpinning()
+      } else {
+        binding.kbsLockPinConfirm.cancelSpinning()
+      }
+    }
+  }
+
+  private fun handlePinEntry() {
+    binding.kbsLockPinInput.setEnabled(false)
+
+    val pin: String = binding.kbsLockPinInput.getText().toString()
+
+    val trimmedLength = pin.replace(" ", "").length
+    if (trimmedLength == 0) {
+      Toast.makeText(requireContext(), R.string.RegistrationActivity_you_must_enter_your_registration_lock_PIN, Toast.LENGTH_LONG).show()
+      enableAndFocusPinEntry()
+      return
+    }
+
+    if (trimmedLength < SvrConstants.MINIMUM_PIN_LENGTH) {
+      Toast.makeText(requireContext(), getString(R.string.RegistrationActivity_your_pin_has_at_least_d_digits_or_characters, SvrConstants.MINIMUM_PIN_LENGTH), Toast.LENGTH_LONG).show()
+      enableAndFocusPinEntry()
+      return
+    }
+
+    SignalStore.pin.keyboardType = getPinEntryKeyboardType()
+
+    binding.kbsLockPinConfirm.setSpinning()
+
+    viewModel.verifyCodeAndRegisterAccountWithRegistrationLock(requireContext(), pin, ::handleSessionErrorResponse, ::handleRegistrationErrorResponse)
+  }
+
+  private fun handleSessionErrorResponse(requestResult: RegistrationResult) {
+    when (requestResult) {
+      is VerificationCodeRequestResult.Success -> Unit
+      is VerificationCodeRequestResult.RateLimited -> onRateLimited()
+      is VerificationCodeRequestResult.AttemptsExhausted -> {
+        findNavController().safeNavigate(RegistrationLockFragmentDirections.actionAccountLocked())
+      }
+
+      is VerificationCodeRequestResult.RegistrationLocked -> {
+        Log.i(TAG, "Registration locked response to verify account!")
+        binding.kbsLockPinConfirm.cancelSpinning()
+        enableAndFocusPinEntry()
+        Toast.makeText(requireContext(), "Reg lock!", Toast.LENGTH_LONG).show()
+      }
+
+      else -> {
+        Log.w(TAG, "Unable to verify code with registration lock", requestResult.getCause())
+        onError()
+      }
+    }
+  }
+
+  private fun handleRegistrationErrorResponse(result: RegisterAccountResult) {
+    when (result) {
+      is RegisterAccountResult.Success -> Unit
+      is RegisterAccountResult.RateLimited -> onRateLimited()
+      is RegisterAccountResult.AttemptsExhausted -> {
+        findNavController().safeNavigate(RegistrationLockFragmentDirections.actionAccountLocked())
+      }
+
+      is RegisterAccountResult.RegistrationLocked -> {
+        Log.i(TAG, "Registration locked response to register account!")
+        binding.kbsLockPinConfirm.cancelSpinning()
+        enableAndFocusPinEntry()
+        Toast.makeText(requireContext(), "Reg lock!", Toast.LENGTH_LONG).show()
+      }
+
+      is RegisterAccountResult.SvrWrongPin -> onIncorrectKbsRegistrationLockPin(result.triesRemaining)
+      is RegisterAccountResult.SvrNoData -> {
+        findNavController().safeNavigate(RegistrationLockFragmentDirections.actionAccountLocked())
+      }
+
+      else -> {
+        Log.w(TAG, "Unable to register account with registration lock", result.getCause())
+        onError()
+      }
+    }
+  }
+
+  private fun onIncorrectKbsRegistrationLockPin(svrTriesRemaining: Int) {
+    binding.kbsLockPinConfirm.cancelSpinning()
+    binding.kbsLockPinInput.getText().clear()
+    enableAndFocusPinEntry()
+
+    if (svrTriesRemaining == 0) {
+      Log.w(TAG, "Account locked. User out of attempts on KBS.")
+      findNavController().safeNavigate(RegistrationLockFragmentDirections.actionAccountLocked())
+      return
+    }
+
+    if (svrTriesRemaining == 3) {
+      val daysRemaining = getLockoutDays(timeRemaining)
+
+      MaterialAlertDialogBuilder(requireContext())
+        .setTitle(R.string.RegistrationLockFragment__incorrect_pin)
+        .setMessage(getTriesRemainingDialogMessage(svrTriesRemaining, daysRemaining))
+        .setPositiveButton(android.R.string.ok, null)
+        .show()
+    }
+
+    if (svrTriesRemaining > 5) {
+      binding.kbsLockPinInputLabel.setText(R.string.RegistrationLockFragment__incorrect_pin_try_again)
+    } else {
+      binding.kbsLockPinInputLabel.text = requireContext().resources.getQuantityString(R.plurals.RegistrationLockFragment__incorrect_pin_d_attempts_remaining, svrTriesRemaining, svrTriesRemaining)
+      binding.kbsLockForgotPin.visibility = View.VISIBLE
+    }
+  }
+
+  private fun onRateLimited() {
+    binding.kbsLockPinConfirm.cancelSpinning()
+    enableAndFocusPinEntry()
+
+    MaterialAlertDialogBuilder(requireContext())
+      .setTitle(R.string.RegistrationActivity_too_many_attempts)
+      .setMessage(R.string.RegistrationActivity_you_have_made_too_many_incorrect_registration_lock_pin_attempts_please_try_again_in_a_day)
+      .setPositiveButton(android.R.string.ok, null)
+      .show()
+  }
+
+  fun onError() {
+    binding.kbsLockPinConfirm.cancelSpinning()
+    enableAndFocusPinEntry()
+
+    Toast.makeText(requireContext(), R.string.RegistrationActivity_error_connecting_to_service, Toast.LENGTH_LONG).show()
+  }
+
+  private fun handleForgottenPin(timeRemainingMs: Long) {
+    val lockoutDays = getLockoutDays(timeRemainingMs)
+    MaterialAlertDialogBuilder(requireContext())
+      .setTitle(R.string.RegistrationLockFragment__forgot_your_pin)
+      .setMessage(requireContext().resources.getQuantityString(R.plurals.RegistrationLockFragment__for_your_privacy_and_security_there_is_no_way_to_recover, lockoutDays, lockoutDays))
+      .setPositiveButton(android.R.string.ok, null)
+      .setNeutralButton(R.string.PinRestoreEntryFragment_contact_support) { _, _ -> sendEmailToSupport() }
+      .show()
+  }
+
+  private fun getLockoutDays(timeRemainingMs: Long): Int {
+    return TimeUnit.MILLISECONDS.toDays(timeRemainingMs).toInt() + 1
+  }
+
+  private fun getTriesRemainingDialogMessage(triesRemaining: Int, daysRemaining: Int): String {
+    val resources = requireContext().resources
+    val tries = resources.getQuantityString(R.plurals.RegistrationLockFragment__you_have_d_attempts_remaining, triesRemaining, triesRemaining)
+    val days = resources.getQuantityString(R.plurals.RegistrationLockFragment__if_you_run_out_of_attempts_your_account_will_be_locked_for_d_days, daysRemaining, daysRemaining)
+
+    return "$tries $days"
+  }
+
+  private fun enableAndFocusPinEntry() {
+    binding.kbsLockPinInput.setEnabled(true)
+    binding.kbsLockPinInput.setFocusable(true)
+    ViewUtil.focusAndShowKeyboard(binding.kbsLockPinInput)
+  }
+
+  private fun getPinEntryKeyboardType(): PinKeyboardType {
+    val isNumeric = (binding.kbsLockPinInput.inputType and InputType.TYPE_MASK_CLASS) == InputType.TYPE_CLASS_NUMBER
+
+    return if (isNumeric) PinKeyboardType.NUMERIC else PinKeyboardType.ALPHA_NUMERIC
+  }
+
+  private fun updateKeyboard(keyboard: PinKeyboardType) {
+    val isAlphaNumeric = keyboard == PinKeyboardType.ALPHA_NUMERIC
+
+    binding.kbsLockPinInput.setInputType(
+      if (isAlphaNumeric) InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
+      else InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_VARIATION_PASSWORD
+    )
+
+    binding.kbsLockPinInput.getText().clear()
+  }
+
+  private fun sendEmailToSupport() {
+    val subject = R.string.RegistrationLockFragment__signal_registration_need_help_with_pin_for_android_v2_pin
+
+    val body = SupportEmailUtil.generateSupportEmailBody(
+      requireContext(),
+      subject,
+      null,
+      null
+    )
+    CommunicationActions.openEmail(
+      requireContext(),
+      SupportEmailUtil.getSupportEmailAddress(requireContext()),
+      getString(subject),
+      body
+    )
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/reregisterwithpin/ReRegisterWithPinV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinFragment.kt
similarity index 77%
rename from app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/reregisterwithpin/ReRegisterWithPinV2Fragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinFragment.kt
index f9bc892c23..71a85ff660 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/reregisterwithpin/ReRegisterWithPinV2Fragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinFragment.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registration.v2.ui.reregisterwithpin
+package org.thoughtcrime.securesms.registration.ui.reregisterwithpin
 
 import android.os.Bundle
 import android.text.InputType
@@ -21,23 +21,23 @@ import org.thoughtcrime.securesms.components.ViewBinderDelegate
 import org.thoughtcrime.securesms.databinding.FragmentRegistrationPinRestoreEntryV2Binding
 import org.thoughtcrime.securesms.lock.v2.PinKeyboardType
 import org.thoughtcrime.securesms.lock.v2.SvrConstants
-import org.thoughtcrime.securesms.registration.fragments.BaseRegistrationLockFragment
+import org.thoughtcrime.securesms.registration.data.network.RegisterAccountResult
 import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate
-import org.thoughtcrime.securesms.registration.v2.ui.RegistrationCheckpoint
-import org.thoughtcrime.securesms.registration.v2.ui.RegistrationV2State
-import org.thoughtcrime.securesms.registration.v2.ui.RegistrationV2ViewModel
+import org.thoughtcrime.securesms.registration.ui.RegistrationCheckpoint
+import org.thoughtcrime.securesms.registration.ui.RegistrationState
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.SupportEmailUtil
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
-class ReRegisterWithPinV2Fragment : LoggingFragment(R.layout.fragment_registration_pin_restore_entry_v2) {
+class ReRegisterWithPinFragment : LoggingFragment(R.layout.fragment_registration_pin_restore_entry_v2) {
   companion object {
-    private val TAG = Log.tag(ReRegisterWithPinV2Fragment::class.java)
+    private val TAG = Log.tag(ReRegisterWithPinFragment::class.java)
   }
 
-  private val registrationViewModel by activityViewModels<RegistrationV2ViewModel>()
-  private val reRegisterViewModel by viewModels<ReRegisterWithPinV2ViewModel>()
+  private val registrationViewModel by activityViewModels<RegistrationViewModel>()
+  private val reRegisterViewModel by viewModels<ReRegisterWithPinViewModel>()
 
   private val binding: FragmentRegistrationPinRestoreEntryV2Binding by ViewBinderDelegate(FragmentRegistrationPinRestoreEntryV2Binding::bind)
 
@@ -79,11 +79,11 @@ class ReRegisterWithPinV2Fragment : LoggingFragment(R.layout.fragment_registrati
     registrationViewModel.uiState.observe(viewLifecycleOwner, ::updateViewState)
   }
 
-  private fun updateViewState(state: RegistrationV2State) {
+  private fun updateViewState(state: RegistrationState) {
     if (state.networkError != null) {
       genericErrorDialog()
     } else if (!state.canSkipSms) {
-      abortSkipSmsFlow()
+      findNavController().safeNavigate(ReRegisterWithPinFragmentDirections.actionReRegisterWithPinFragmentToEnterPhoneNumberFragment())
     } else if (state.isRegistrationLockEnabled && state.svrTriesRemaining == 0) {
       Log.w(TAG, "Unable to continue skip flow, KBS is locked")
       onAccountLocked()
@@ -93,10 +93,6 @@ class ReRegisterWithPinV2Fragment : LoggingFragment(R.layout.fragment_registrati
     }
   }
 
-  private fun abortSkipSmsFlow() {
-    findNavController().safeNavigate(ReRegisterWithPinV2FragmentDirections.actionReRegisterWithPinFragmentToEnterPhoneNumberV2Fragment())
-  }
-
   private fun presentProgress(inProgress: Boolean) {
     if (inProgress) {
       ViewUtil.hideKeyboard(requireContext(), binding.pinRestorePinInput)
@@ -117,19 +113,22 @@ class ReRegisterWithPinV2Fragment : LoggingFragment(R.layout.fragment_registrati
       return
     }
 
-    if (pin.trim().length < BaseRegistrationLockFragment.MINIMUM_PIN_LENGTH) {
-      Toast.makeText(requireContext(), getString(R.string.RegistrationActivity_your_pin_has_at_least_d_digits_or_characters, BaseRegistrationLockFragment.MINIMUM_PIN_LENGTH), Toast.LENGTH_LONG).show()
+    if (pin.trim().length < SvrConstants.MINIMUM_PIN_LENGTH) {
+      Toast.makeText(requireContext(), getString(R.string.RegistrationActivity_your_pin_has_at_least_d_digits_or_characters, SvrConstants.MINIMUM_PIN_LENGTH), Toast.LENGTH_LONG).show()
       enableAndFocusPinEntry()
       return
     }
 
     registrationViewModel.setRegistrationCheckpoint(RegistrationCheckpoint.PIN_CONFIRMED)
 
-    registrationViewModel.verifyReRegisterWithPin(requireContext(), pin) {
-      reRegisterViewModel.markIncorrectGuess()
-    }
-
-    // TODO [regv2]: check for registration lock + wrong pin and decrement SVR tries remaining
+    registrationViewModel.verifyReRegisterWithPin(
+      context = requireContext(),
+      pin = pin,
+      wrongPinHandler = {
+        reRegisterViewModel.markIncorrectGuess()
+      },
+      registrationErrorHandler = ::registrationErrorHandler
+    )
   }
 
   private fun presentTriesRemaining(triesRemaining: Int) {
@@ -233,6 +232,15 @@ class ReRegisterWithPinV2Fragment : LoggingFragment(R.layout.fragment_registrati
     registrationViewModel.setUserSkippedReRegisterFlow(true)
   }
 
+  private fun presentRateLimitedDialog() {
+    MaterialAlertDialogBuilder(requireContext()).apply {
+      setTitle(R.string.RegistrationActivity_too_many_attempts)
+      setMessage(R.string.RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later)
+      setPositiveButton(android.R.string.ok, null)
+      show()
+    }
+  }
+
   private fun genericErrorDialog() {
     MaterialAlertDialogBuilder(requireContext())
       .setMessage(R.string.RegistrationActivity_error_connecting_to_service)
@@ -240,4 +248,32 @@ class ReRegisterWithPinV2Fragment : LoggingFragment(R.layout.fragment_registrati
       .create()
       .show()
   }
+
+  private fun registrationErrorHandler(result: RegisterAccountResult) {
+    when (result) {
+      is RegisterAccountResult.Success -> Log.d(TAG, "Register account was successful.")
+      is RegisterAccountResult.AuthorizationFailed,
+      is RegisterAccountResult.MalformedRequest,
+      is RegisterAccountResult.UnknownError,
+      is RegisterAccountResult.ValidationError,
+      is RegisterAccountResult.RegistrationLocked -> {
+        Log.i(TAG, "Registration failed.", result.getCause())
+        genericErrorDialog()
+      }
+
+      is RegisterAccountResult.IncorrectRecoveryPassword -> {
+        registrationViewModel.setUserSkippedReRegisterFlow(true)
+        findNavController().safeNavigate(ReRegisterWithPinFragmentDirections.actionReRegisterWithPinFragmentToEnterPhoneNumberFragment())
+      }
+
+      is RegisterAccountResult.AttemptsExhausted,
+      is RegisterAccountResult.RateLimited -> presentRateLimitedDialog()
+
+      is RegisterAccountResult.SvrNoData -> onAccountLocked()
+      is RegisterAccountResult.SvrWrongPin -> {
+        reRegisterViewModel.markIncorrectGuess()
+        reRegisterViewModel.markAsRemoteVerification()
+      }
+    }
+  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/reregisterwithpin/ReRegisterWithPinV2State.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinState.kt
similarity index 66%
rename from app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/reregisterwithpin/ReRegisterWithPinV2State.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinState.kt
index 7f8bf609fa..cbfb7a5bc3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/reregisterwithpin/ReRegisterWithPinV2State.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinState.kt
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registration.v2.ui.reregisterwithpin
+package org.thoughtcrime.securesms.registration.ui.reregisterwithpin
 
-data class ReRegisterWithPinV2State(
+data class ReRegisterWithPinState(
   val isLocalVerification: Boolean = false,
   val hasIncorrectGuess: Boolean = false,
   val localPinMatches: Boolean = false
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/reregisterwithpin/ReRegisterWithPinV2ViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinViewModel.kt
similarity index 59%
rename from app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/reregisterwithpin/ReRegisterWithPinV2ViewModel.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinViewModel.kt
index 2f8b2b4098..acd1016000 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/reregisterwithpin/ReRegisterWithPinV2ViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinViewModel.kt
@@ -3,27 +3,31 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registration.v2.ui.reregisterwithpin
+package org.thoughtcrime.securesms.registration.ui.reregisterwithpin
 
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.asLiveData
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
 import org.signal.core.util.logging.Log
 
-class ReRegisterWithPinV2ViewModel : ViewModel() {
+class ReRegisterWithPinViewModel : ViewModel() {
   companion object {
-    private val TAG = Log.tag(ReRegisterWithPinV2ViewModel::class.java)
+    private val TAG = Log.tag(ReRegisterWithPinViewModel::class.java)
   }
 
-  private val store = MutableStateFlow(ReRegisterWithPinV2State())
-  val uiState = store.asLiveData()
+  private val store = MutableStateFlow(ReRegisterWithPinState())
 
   val isLocalVerification: Boolean
     get() = store.value.isLocalVerification
   val hasIncorrectGuess: Boolean
     get() = store.value.hasIncorrectGuess
 
+  fun markAsRemoteVerification() {
+    store.update {
+      it.copy(isLocalVerification = false)
+    }
+  }
+
   fun markIncorrectGuess() {
     store.update {
       it.copy(hasIncorrectGuess = true)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreActivity.kt
new file mode 100644
index 0000000000..84e34a1055
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreActivity.kt
@@ -0,0 +1,377 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.ui.restore
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.compose.setContent
+import androidx.activity.viewModels
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.withStyle
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.signal.core.ui.Buttons
+import org.signal.core.ui.Previews
+import org.signal.core.ui.theme.SignalTheme
+import org.thoughtcrime.securesms.BaseActivity
+import org.thoughtcrime.securesms.MainActivity
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
+import org.thoughtcrime.securesms.backup.v2.RestoreV2Event
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsTypeFeature
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsTypeFeatureRow
+import org.thoughtcrime.securesms.backup.v2.ui.subscription.RemoteRestoreViewModel
+import org.thoughtcrime.securesms.conversation.v2.registerForLifecycle
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.jobs.ProfileUploadJob
+import org.thoughtcrime.securesms.profiles.AvatarHelper
+import org.thoughtcrime.securesms.profiles.edit.CreateProfileActivity
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.registration.RegistrationUtil
+import org.thoughtcrime.securesms.restore.transferorrestore.TransferOrRestoreMoreOptionsDialog
+import org.thoughtcrime.securesms.util.DateUtils
+import org.thoughtcrime.securesms.util.Util
+import java.util.Locale
+
+class RemoteRestoreActivity : BaseActivity() {
+  companion object {
+    fun getIntent(context: Context): Intent {
+      return Intent(context, RemoteRestoreActivity::class.java)
+    }
+  }
+
+  private val viewModel: RemoteRestoreViewModel by viewModels()
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+
+    setContent {
+      val state by viewModel.state
+      SignalTheme {
+        Surface {
+          RestoreFromBackupContent(
+            features = getFeatureList(state.backupTier),
+            onRestoreBackupClick = {
+              viewModel.restore()
+            },
+            onCancelClick = {
+              finish()
+            },
+            onMoreOptionsClick = {
+              TransferOrRestoreMoreOptionsDialog.show(fragmentManager = supportFragmentManager, skipOnly = false)
+            },
+            state.backupTier,
+            state.backupTime,
+            state.backupTier != MessageBackupTier.PAID
+          )
+          if (state.importState == RemoteRestoreViewModel.ImportState.RESTORED) {
+            SideEffect {
+              RegistrationUtil.maybeMarkRegistrationComplete()
+              AppDependencies.jobManager.add(ProfileUploadJob())
+              startActivity(MainActivity.clearTop(this))
+            }
+          } else if (state.importState == RemoteRestoreViewModel.ImportState.IN_PROGRESS) {
+            ProgressDialog(state.restoreProgress)
+          }
+        }
+      }
+    }
+    EventBus.getDefault().registerForLifecycle(subscriber = this, lifecycleOwner = this)
+  }
+
+  @Subscribe(threadMode = ThreadMode.MAIN)
+  fun onEvent(restoreEvent: RestoreV2Event) {
+    viewModel.updateRestoreProgress(restoreEvent)
+  }
+
+  private fun getFeatureList(tier: MessageBackupTier?): ImmutableList<MessageBackupsTypeFeature> {
+    return when (tier) {
+      null -> persistentListOf()
+      MessageBackupTier.PAID -> {
+        persistentListOf(
+          MessageBackupsTypeFeature(
+            iconResourceId = R.drawable.symbol_thread_compact_bold_16,
+            label = "All of your media"
+          ),
+          MessageBackupsTypeFeature(
+            iconResourceId = R.drawable.symbol_recent_compact_bold_16,
+            label = "All of your text messages"
+          )
+        )
+      }
+      MessageBackupTier.FREE -> {
+        persistentListOf(
+          MessageBackupsTypeFeature(
+            iconResourceId = R.drawable.symbol_thread_compact_bold_16,
+            label = "Your last 30 days of media"
+          ),
+          MessageBackupsTypeFeature(
+            iconResourceId = R.drawable.symbol_recent_compact_bold_16,
+            label = "All of your text messages"
+          )
+        )
+      }
+    }
+  }
+
+  /**
+   * A dialog that *just* shows a spinner. Useful for short actions where you need to
+   * let the user know that some action is completing.
+   */
+  @Composable
+  fun ProgressDialog(restoreProgress: RestoreV2Event?) {
+    androidx.compose.material3.AlertDialog(
+      onDismissRequest = {},
+      confirmButton = {},
+      dismissButton = {},
+      text = {
+        Box(
+          contentAlignment = Alignment.Center,
+          modifier = Modifier
+            .fillMaxWidth()
+        ) {
+          Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            modifier = Modifier.wrapContentSize()
+          ) {
+            if (restoreProgress == null) {
+              CircularProgressIndicator(
+                modifier = Modifier
+                  .padding(top = 55.dp, bottom = 16.dp)
+                  .width(48.dp)
+                  .height(48.dp)
+              )
+            } else {
+              CircularProgressIndicator(
+                progress = restoreProgress.getProgress(),
+                modifier = Modifier
+                  .padding(top = 55.dp, bottom = 16.dp)
+                  .width(48.dp)
+                  .height(48.dp)
+              )
+            }
+
+            // TODO [message-backups] Finalized copy.
+            val progressText = when (restoreProgress?.type) {
+              RestoreV2Event.Type.PROGRESS_DOWNLOAD -> "Downloading backup..."
+              RestoreV2Event.Type.PROGRESS_RESTORE -> "Restoring messages..."
+              else -> "Restoring..."
+            }
+
+            Text(
+              text = progressText,
+              style = MaterialTheme.typography.bodyMedium,
+              modifier = Modifier.padding(bottom = 12.dp)
+            )
+
+            if (restoreProgress != null) {
+              val progressBytes = Util.getPrettyFileSize(restoreProgress.count)
+              val totalBytes = Util.getPrettyFileSize(restoreProgress.estimatedTotalCount)
+              Text(
+                text = "$progressBytes of $totalBytes (%.2f%%)".format(restoreProgress.getProgress()),
+                style = MaterialTheme.typography.bodySmall,
+                modifier = Modifier.padding(bottom = 12.dp)
+              )
+            }
+          }
+        }
+      },
+      modifier = Modifier.width(212.dp)
+    )
+  }
+
+  @Preview
+  @Composable
+  private fun ProgressDialogPreview() {
+    Previews.Preview {
+      ProgressDialog(RestoreV2Event(RestoreV2Event.Type.PROGRESS_RESTORE, 10, 1000))
+    }
+  }
+
+  @Preview
+  @Composable
+  private fun RestoreFromBackupContentPreview() {
+    Previews.Preview {
+      RestoreFromBackupContent(
+        features = persistentListOf(
+          MessageBackupsTypeFeature(
+            iconResourceId = R.drawable.symbol_thread_compact_bold_16,
+            label = "Your last 30 days of media"
+          ),
+          MessageBackupsTypeFeature(
+            iconResourceId = R.drawable.symbol_recent_compact_bold_16,
+            label = "All of your text messages"
+          )
+        ),
+        onRestoreBackupClick = {},
+        onCancelClick = {},
+        onMoreOptionsClick = {},
+        MessageBackupTier.PAID,
+        System.currentTimeMillis(),
+        true
+      )
+    }
+  }
+
+  @Composable
+  private fun RestoreFromBackupContent(
+    features: ImmutableList<MessageBackupsTypeFeature>,
+    onRestoreBackupClick: () -> Unit,
+    onCancelClick: () -> Unit,
+    onMoreOptionsClick: () -> Unit,
+    tier: MessageBackupTier?,
+    lastBackupTime: Long,
+    cancelable: Boolean
+  ) {
+    Column(
+      modifier = Modifier
+        .padding(horizontal = dimensionResource(id = R.dimen.core_ui__gutter))
+        .padding(top = 40.dp, bottom = 24.dp)
+    ) {
+      Text(
+        text = "Restore from backup", // TODO [message-backups] Finalized copy.
+        style = MaterialTheme.typography.headlineMedium,
+        modifier = Modifier.padding(bottom = 12.dp)
+      )
+
+      val yourLastBackupText = buildAnnotatedString {
+        append(
+          stringResource(
+            id = R.string.RemoteRestoreActivity__backup_created_at,
+            DateUtils.formatDateWithoutDayOfWeek(Locale.getDefault(), lastBackupTime),
+            DateUtils.getOnlyTimeString(LocalContext.current, lastBackupTime)
+          )
+
+        )
+        append(" ")
+        if (tier != MessageBackupTier.PAID) {
+          withStyle(SpanStyle(fontWeight = FontWeight.SemiBold)) {
+            append("Only media sent or received in the past 30 days is included.") // TODO [message-backups] Finalized copy.
+          }
+        }
+      }
+
+      Text(
+        text = yourLastBackupText,
+        style = MaterialTheme.typography.bodyLarge,
+        color = MaterialTheme.colorScheme.onSurfaceVariant,
+        modifier = Modifier.padding(bottom = 28.dp)
+      )
+
+      Column(
+        modifier = Modifier
+          .fillMaxWidth()
+          .background(color = SignalTheme.colors.colorSurface2, shape = RoundedCornerShape(18.dp))
+          .padding(horizontal = 20.dp)
+          .padding(top = 20.dp, bottom = 18.dp)
+      ) {
+        Text(
+          text = "Your backup includes:", // TODO [message-backups] Finalized copy.
+          style = MaterialTheme.typography.titleMedium,
+          modifier = Modifier.padding(bottom = 6.dp)
+        )
+
+        features.forEach {
+          MessageBackupsTypeFeatureRow(
+            messageBackupsTypeFeature = it,
+            iconTint = MaterialTheme.colorScheme.primary,
+            modifier = Modifier.padding(start = 16.dp, top = 6.dp)
+          )
+        }
+      }
+
+      Spacer(modifier = Modifier.weight(1f))
+
+      Buttons.LargeTonal(
+        onClick = onRestoreBackupClick,
+        modifier = Modifier.fillMaxWidth()
+      ) {
+        Text(
+          text = "Restore backup" // TODO [message-backups] Finalized copy.
+        )
+      }
+
+      if (cancelable) {
+        TextButton(
+          onClick = onCancelClick,
+          modifier = Modifier.fillMaxWidth()
+        ) {
+          Text(
+            text = stringResource(id = android.R.string.cancel)
+          )
+        }
+      } else {
+        TextButton(
+          onClick = onMoreOptionsClick,
+          modifier = Modifier.fillMaxWidth()
+        ) {
+          Text(
+            text = stringResource(id = R.string.TransferOrRestoreFragment__more_options)
+          )
+        }
+      }
+    }
+  }
+
+  private fun restoreFromServer() {
+    viewModel.restore()
+  }
+
+  private fun continueRegistration() {
+    if (Recipient.self().profileName.isEmpty || !AvatarHelper.hasAvatar(this, Recipient.self().id)) {
+      val main = MainActivity.clearTop(this)
+      val profile = CreateProfileActivity.getIntentForUserProfile(this)
+      profile.putExtra("next_intent", main)
+      startActivity(profile)
+    } else {
+      RegistrationUtil.maybeMarkRegistrationComplete()
+      AppDependencies.jobManager.add(ProfileUploadJob())
+      startActivity(MainActivity.clearTop(this))
+    }
+    finish()
+  }
+
+  @Composable
+  private fun StateLabel(text: String) {
+    Text(
+      text = text,
+      style = MaterialTheme.typography.labelSmall,
+      textAlign = TextAlign.Center
+    )
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/welcome/WelcomeV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/WelcomeFragment.kt
similarity index 62%
rename from app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/welcome/WelcomeV2Fragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/WelcomeFragment.kt
index b8e417a0c7..c28abdcf78 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/welcome/WelcomeV2Fragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/WelcomeFragment.kt
@@ -3,9 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registration.v2.ui.welcome
+package org.thoughtcrime.securesms.registration.ui.welcome
 
-import android.Manifest
 import android.app.Activity
 import android.content.pm.PackageManager
 import android.os.Bundle
@@ -19,36 +18,35 @@ import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.ViewBinderDelegate
-import org.thoughtcrime.securesms.databinding.FragmentRegistrationWelcomeV2Binding
+import org.thoughtcrime.securesms.databinding.FragmentRegistrationWelcomeBinding
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView
 import org.thoughtcrime.securesms.registration.fragments.WelcomePermissions
-import org.thoughtcrime.securesms.registration.v2.ui.RegistrationCheckpoint
-import org.thoughtcrime.securesms.registration.v2.ui.RegistrationV2ViewModel
-import org.thoughtcrime.securesms.registration.v2.ui.grantpermissions.GrantPermissionsV2Fragment
+import org.thoughtcrime.securesms.registration.ui.RegistrationCheckpoint
+import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel
+import org.thoughtcrime.securesms.registration.ui.grantpermissions.GrantPermissionsFragment
 import org.thoughtcrime.securesms.restore.RestoreActivity
 import org.thoughtcrime.securesms.util.BackupUtil
 import org.thoughtcrime.securesms.util.CommunicationActions
-import org.thoughtcrime.securesms.util.Util
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
-import kotlin.jvm.optionals.getOrNull
+import org.thoughtcrime.securesms.util.visible
 
 /**
  * First screen that is displayed on the very first app launch.
  */
-class WelcomeV2Fragment : LoggingFragment(R.layout.fragment_registration_welcome_v2) {
-  private val sharedViewModel by activityViewModels<RegistrationV2ViewModel>()
-  private val binding: FragmentRegistrationWelcomeV2Binding by ViewBinderDelegate(FragmentRegistrationWelcomeV2Binding::bind)
+class WelcomeFragment : LoggingFragment(R.layout.fragment_registration_welcome) {
+  private val sharedViewModel by activityViewModels<RegistrationViewModel>()
+  private val binding: FragmentRegistrationWelcomeBinding by ViewBinderDelegate(FragmentRegistrationWelcomeBinding::bind)
 
   private val launchRestoreActivity = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
     when (val resultCode = result.resultCode) {
       Activity.RESULT_OK -> {
         sharedViewModel.onBackupSuccessfullyRestored()
-        findNavController().safeNavigate(WelcomeV2FragmentDirections.actionGoToRegistration())
+        findNavController().safeNavigate(WelcomeFragmentDirections.actionGoToRegistration())
       }
       Activity.RESULT_CANCELED -> {
         Log.w(TAG, "Backup restoration canceled.")
-        findNavController().popBackStack()
       }
       else -> Log.w(TAG, "Backup restoration activity ended with unknown result code: $resultCode")
     }
@@ -56,19 +54,20 @@ class WelcomeV2Fragment : LoggingFragment(R.layout.fragment_registration_welcome
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
-    maybePrefillE164()
     setDebugLogSubmitMultiTapView(binding.image)
     setDebugLogSubmitMultiTapView(binding.title)
     binding.welcomeContinueButton.setOnClickListener { onContinueClicked() }
     binding.welcomeTermsButton.setOnClickListener { onTermsClicked() }
     binding.welcomeTransferOrRestore.setOnClickListener { onTransferOrRestoreClicked() }
+    binding.welcomeTransferOrRestore.visible = !RemoteConfig.restoreAfterRegistration
   }
 
   private fun onContinueClicked() {
     if (Permissions.isRuntimePermissionsRequired() && !hasAllPermissions()) {
-      findNavController().safeNavigate(WelcomeV2FragmentDirections.actionWelcomeFragmentToGrantPermissionsV2Fragment(GrantPermissionsV2Fragment.WelcomeAction.CONTINUE))
+      findNavController().safeNavigate(WelcomeFragmentDirections.actionWelcomeFragmentToGrantPermissionsFragment(GrantPermissionsFragment.WelcomeAction.CONTINUE))
     } else {
-      skipRestore()
+      sharedViewModel.maybePrefillE164(requireContext())
+      findNavController().safeNavigate(WelcomeFragmentDirections.actionSkipRestore())
     }
   }
 
@@ -77,42 +76,23 @@ class WelcomeV2Fragment : LoggingFragment(R.layout.fragment_registration_welcome
     return WelcomePermissions.getWelcomePermissions(isUserSelectionRequired).all { ContextCompat.checkSelfPermission(requireContext(), it) == PackageManager.PERMISSION_GRANTED }
   }
 
-  private fun skipRestore() {
-    findNavController().safeNavigate(WelcomeV2FragmentDirections.actionSkipRestore())
-  }
-
   private fun onTermsClicked() {
     CommunicationActions.openBrowserLink(requireContext(), TERMS_AND_CONDITIONS_URL)
   }
 
   private fun onTransferOrRestoreClicked() {
     if (Permissions.isRuntimePermissionsRequired() && !hasAllPermissions()) {
-      findNavController().safeNavigate(WelcomeV2FragmentDirections.actionWelcomeFragmentToGrantPermissionsV2Fragment(GrantPermissionsV2Fragment.WelcomeAction.RESTORE_BACKUP))
+      findNavController().safeNavigate(WelcomeFragmentDirections.actionWelcomeFragmentToGrantPermissionsFragment(GrantPermissionsFragment.WelcomeAction.RESTORE_BACKUP))
     } else {
       sharedViewModel.setRegistrationCheckpoint(RegistrationCheckpoint.PERMISSIONS_GRANTED)
 
-      val restoreIntent = RestoreActivity.getIntentForRestore(requireActivity())
+      val restoreIntent = RestoreActivity.getIntentForTransferOrRestore(requireActivity())
       launchRestoreActivity.launch(restoreIntent)
     }
   }
 
-  private fun maybePrefillE164() {
-    if (Permissions.hasAll(requireContext(), Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_PHONE_NUMBERS)) {
-      val localNumber = Util.getDeviceNumber(requireContext()).getOrNull()
-
-      if (localNumber != null) {
-        Log.v(TAG, "Phone number detected.")
-        sharedViewModel.setPhoneNumber(localNumber)
-      } else {
-        Log.i(TAG, "Could not read phone number.")
-      }
-    } else {
-      Log.i(TAG, "No phone permission.")
-    }
-  }
-
   companion object {
-    private val TAG = Log.tag(WelcomeV2Fragment::class.java)
+    private val TAG = Log.tag(WelcomeFragment::class.java)
     private const val TERMS_AND_CONDITIONS_URL = "https://signal.org/legal"
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/util/CountryPrefix.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/util/CountryPrefix.kt
new file mode 100644
index 0000000000..06dd997a7c
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/util/CountryPrefix.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.registration.util
+
+data class CountryPrefix(val digits: Int, val regionCode: String) {
+  override fun toString(): String {
+    return "+$digits"
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/util/RegistrationNumberInputController.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/util/RegistrationNumberInputController.kt
deleted file mode 100644
index 8521cd7ae4..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/util/RegistrationNumberInputController.kt
+++ /dev/null
@@ -1,179 +0,0 @@
-package org.thoughtcrime.securesms.registration.util
-
-import android.content.Context
-import android.text.Editable
-import android.text.TextUtils
-import android.text.TextWatcher
-import android.view.KeyEvent
-import android.view.View
-import android.view.View.OnFocusChangeListener
-import android.view.inputmethod.EditorInfo
-import android.widget.ArrayAdapter
-import android.widget.EditText
-import android.widget.TextView
-import com.google.android.material.textfield.MaterialAutoCompleteTextView
-import com.google.android.material.textfield.TextInputLayout
-import com.google.i18n.phonenumbers.AsYouTypeFormatter
-import com.google.i18n.phonenumbers.PhoneNumberUtil
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.registration.viewmodel.NumberViewState
-
-/**
- * Handle the logic and formatting of phone number input specifically for registration number the flow.
- */
-class RegistrationNumberInputController(
-  val context: Context,
-  val callbacks: Callbacks,
-  private val phoneNumberInputLayout: EditText,
-  countryCodeInputLayout: TextInputLayout
-) {
-  private val spinnerView: MaterialAutoCompleteTextView = countryCodeInputLayout.editText as MaterialAutoCompleteTextView
-  private val supportedCountryPrefixes: List<CountryPrefix> = PhoneNumberUtil.getInstance().supportedCallingCodes
-    .map { CountryPrefix(it, PhoneNumberUtil.getInstance().getRegionCodeForCountryCode(it)) }
-    .sortedBy { it.digits.toString() }
-  private val spinnerAdapter: ArrayAdapter<CountryPrefix> = ArrayAdapter<CountryPrefix>(context, R.layout.registration_country_code_dropdown_item, supportedCountryPrefixes)
-  private val countryCodeEntryListener = CountryCodeEntryListener()
-
-  private var countryFormatter: AsYouTypeFormatter? = null
-  private var isUpdating = true
-
-  init {
-    setUpNumberInput()
-
-    spinnerView.threshold = 100
-    spinnerView.setAdapter(spinnerAdapter)
-    spinnerView.addTextChangedListener(countryCodeEntryListener)
-  }
-
-  fun prepopulateCountryCode() {
-    if (spinnerView.editableText.isBlank()) {
-      spinnerView.setText(supportedCountryPrefixes[0].toString())
-    }
-  }
-
-  private fun advanceToPhoneNumberInput() {
-    if (!isUpdating) {
-      phoneNumberInputLayout.requestFocus()
-    }
-    val numberLength: Int = phoneNumberInputLayout.text?.length ?: 0
-    phoneNumberInputLayout.setSelection(numberLength, numberLength)
-  }
-
-  private fun setUpNumberInput() {
-    phoneNumberInputLayout.addTextChangedListener(NumberChangedListener())
-    phoneNumberInputLayout.onFocusChangeListener = OnFocusChangeListener { v: View?, hasFocus: Boolean ->
-      if (hasFocus) {
-        callbacks.onNumberFocused()
-      }
-    }
-    phoneNumberInputLayout.imeOptions = EditorInfo.IME_ACTION_DONE
-    phoneNumberInputLayout.setOnEditorActionListener { v: TextView?, actionId: Int, _: KeyEvent? ->
-      if (actionId == EditorInfo.IME_ACTION_DONE) {
-        callbacks.onNumberInputDone(v!!)
-        return@setOnEditorActionListener true
-      }
-      false
-    }
-  }
-
-  fun setNumberAndCountryCode(numberViewState: NumberViewState) {
-    val countryCode = numberViewState.countryCode
-
-    isUpdating = true
-    phoneNumberInputLayout.setText(numberViewState.nationalNumber)
-    if (numberViewState.countryCode != 0) {
-      spinnerView.setText(supportedCountryPrefixes.first { it.digits == numberViewState.countryCode }.toString())
-    }
-    val regionCode = PhoneNumberUtil.getInstance().getRegionCodeForCountryCode(countryCode)
-    setCountryFormatter(regionCode)
-
-    isUpdating = false
-  }
-
-  fun updateNumberFormatter(numberViewState: NumberViewState) {
-    val countryCode = numberViewState.countryCode
-
-    isUpdating = true
-    val regionCode = PhoneNumberUtil.getInstance().getRegionCodeForCountryCode(countryCode)
-    setCountryFormatter(regionCode)
-
-    isUpdating = false
-  }
-
-  private fun setCountryFormatter(regionCode: String?) {
-    val util = PhoneNumberUtil.getInstance()
-    countryFormatter = if (regionCode != null) util.getAsYouTypeFormatter(regionCode) else null
-    reformatText(phoneNumberInputLayout.text)
-  }
-
-  private fun reformatText(editable: Editable): String? {
-    if (TextUtils.isEmpty(editable)) {
-      return null
-    }
-    val countryFormatter: AsYouTypeFormatter = countryFormatter ?: return null
-    countryFormatter.clear()
-    var formattedNumber: String? = null
-    val justDigits = StringBuilder()
-    for (character in editable) {
-      if (Character.isDigit(character)) {
-        formattedNumber = countryFormatter.inputDigit(character)
-        justDigits.append(character)
-      }
-    }
-    if (formattedNumber != null && editable.toString() != formattedNumber) {
-      editable.replace(0, editable.length, formattedNumber)
-    }
-    return if (justDigits.isEmpty()) {
-      null
-    } else {
-      justDigits.toString()
-    }
-  }
-
-  inner class NumberChangedListener : TextWatcher {
-    override fun afterTextChanged(s: Editable) {
-      val number: String = reformatText(s) ?: return
-      if (!isUpdating) {
-        callbacks.setNationalNumber(number)
-      }
-    }
-
-    override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
-    override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
-  }
-
-  inner class CountryCodeEntryListener : TextWatcher {
-
-    override fun afterTextChanged(s: Editable?) {
-      if (s.isNullOrEmpty()) {
-        return
-      }
-
-      if (s[0] != '+') {
-        s.insert(0, "+")
-      }
-
-      supportedCountryPrefixes.firstOrNull { it.toString() == s.toString() }?.let {
-        setCountryFormatter(it.regionCode)
-        callbacks.setCountry(it.digits)
-        advanceToPhoneNumberInput()
-      }
-    }
-
-    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-  }
-
-  interface Callbacks {
-    fun onNumberFocused()
-    fun onNumberInputDone(view: View)
-    fun setNationalNumber(number: String)
-    fun setCountry(countryCode: Int)
-  }
-}
-
-data class CountryPrefix(val digits: Int, val regionCode: String) {
-  override fun toString(): String {
-    return "+$digits"
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/network/BackupAuthCheckResult.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/network/BackupAuthCheckResult.kt
deleted file mode 100644
index 10acf03c8b..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/data/network/BackupAuthCheckResult.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.registration.v2.data.network
-
-import org.whispersystems.signalservice.api.NetworkResult
-import org.whispersystems.signalservice.internal.push.AuthCredentials
-import org.whispersystems.signalservice.internal.push.BackupAuthCheckResponse
-
-/**
- * This is a processor to map a [BackupAuthCheckResponse] to all the known outcomes.
- */
-sealed class BackupAuthCheckResult(cause: Throwable?) : RegistrationResult(cause) {
-  companion object {
-    @JvmStatic
-    fun from(networkResult: NetworkResult<BackupAuthCheckResponse>): BackupAuthCheckResult {
-      return when (networkResult) {
-        is NetworkResult.Success -> {
-          val match = networkResult.result.match
-          if (match != null) {
-            SuccessWithCredentials(match)
-          } else {
-            SuccessWithoutCredentials()
-          }
-        }
-
-        is NetworkResult.ApplicationError -> UnknownError(networkResult.throwable)
-        is NetworkResult.NetworkError -> UnknownError(networkResult.exception)
-        is NetworkResult.StatusCodeError -> UnknownError(networkResult.exception)
-      }
-    }
-  }
-
-  class SuccessWithCredentials(val authCredentials: AuthCredentials) : BackupAuthCheckResult(null)
-
-  class SuccessWithoutCredentials : BackupAuthCheckResult(null)
-
-  class UnknownError(cause: Throwable) : BackupAuthCheckResult(cause)
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2Activity.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2Activity.kt
deleted file mode 100644
index 163b4e4691..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2Activity.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.registration.v2.ui
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import androidx.activity.viewModels
-import androidx.navigation.ActivityNavigator
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.BaseActivity
-import org.thoughtcrime.securesms.MainActivity
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.lock.v2.CreateSvrPinActivity
-import org.thoughtcrime.securesms.profiles.AvatarHelper
-import org.thoughtcrime.securesms.profiles.edit.CreateProfileActivity
-import org.thoughtcrime.securesms.recipients.Recipient
-
-/**
- * Activity to hold the entire registration process.
- */
-class RegistrationV2Activity : BaseActivity() {
-
-  private val TAG = Log.tag(RegistrationV2Activity::class.java)
-
-  val sharedViewModel: RegistrationV2ViewModel by viewModels()
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    setContentView(R.layout.activity_registration_navigation_v2)
-    sharedViewModel.uiState.observe(this) {
-      if (it.registrationCheckpoint == RegistrationCheckpoint.SERVICE_REGISTRATION_COMPLETED) {
-        handleSuccessfulVerify()
-      }
-    }
-  }
-
-  private fun handleSuccessfulVerify() {
-    // TODO [regv2]: add functionality of [RegistrationCompleteFragment]
-    val isProfileNameEmpty = Recipient.self().profileName.isEmpty
-    val isAvatarEmpty = !AvatarHelper.hasAvatar(this, Recipient.self().id)
-    val needsProfile = isProfileNameEmpty || isAvatarEmpty
-    val needsPin = !sharedViewModel.hasPin()
-
-    Log.i(TAG, "Pin restore flow not required. Profile name: $isProfileNameEmpty | Profile avatar: $isAvatarEmpty | Needs PIN: $needsPin")
-
-    SignalStore.internalValues().setForceEnterRestoreV2Flow(true)
-
-    if (!needsProfile && !needsPin) {
-      sharedViewModel.completeRegistration()
-    }
-    sharedViewModel.setInProgress(false)
-
-    val startIntent = MainActivity.clearTop(this).apply {
-      if (needsPin) {
-        putExtra("next_intent", CreateSvrPinActivity.getIntentForPinCreate(this@RegistrationV2Activity))
-      }
-
-      if (needsProfile) {
-        putExtra("next_intent", CreateProfileActivity.getIntentForUserProfile(this@RegistrationV2Activity))
-      }
-    }
-
-    Log.d(TAG, "Launching ${startIntent.component}")
-    startActivity(startIntent)
-    finish()
-    ActivityNavigator.applyPopAnimationsToPendingTransition(this)
-  }
-
-  companion object {
-
-    @JvmStatic
-    fun newIntentForNewRegistration(context: Context, originalIntent: Intent): Intent {
-      return Intent(context, RegistrationV2Activity::class.java).apply {
-        setData(originalIntent.data)
-      }
-    }
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2State.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2State.kt
deleted file mode 100644
index f44aff463b..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2State.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.registration.v2.ui
-
-import com.google.i18n.phonenumbers.Phonenumber
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.whispersystems.signalservice.internal.push.AuthCredentials
-
-/**
- * State holder shared across all of registration.
- */
-data class RegistrationV2State(
-  val sessionId: String? = null,
-  val phoneNumber: Phonenumber.PhoneNumber? = null,
-  val inProgress: Boolean = false,
-  val isReRegister: Boolean = false,
-  val recoveryPassword: String? = SignalStore.svr().getRecoveryPassword(),
-  val canSkipSms: Boolean = false,
-  val svrAuthCredentials: AuthCredentials? = null,
-  val svrTriesRemaining: Int = 10,
-  val isRegistrationLockEnabled: Boolean = false,
-  val userSkippedReregistration: Boolean = false,
-  val isFcmSupported: Boolean = false,
-  val fcmToken: String? = null,
-  val captchaToken: String? = null,
-  val nextSms: Long = 0L,
-  val nextCall: Long = 0L,
-  val registrationCheckpoint: RegistrationCheckpoint = RegistrationCheckpoint.INITIALIZATION,
-  val networkError: Throwable? = null
-)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2ViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2ViewModel.kt
deleted file mode 100644
index c7d4efc566..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/RegistrationV2ViewModel.kt
+++ /dev/null
@@ -1,494 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.registration.v2.ui
-
-import android.content.Context
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.asLiveData
-import androidx.lifecycle.viewModelScope
-import com.google.i18n.phonenumbers.NumberParseException
-import com.google.i18n.phonenumbers.PhoneNumberUtil
-import com.google.i18n.phonenumbers.Phonenumber
-import kotlinx.coroutines.CoroutineExceptionHandler
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.signal.core.util.isNotNullOrBlank
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.jobs.MultiDeviceProfileContentUpdateJob
-import org.thoughtcrime.securesms.jobs.MultiDeviceProfileKeyUpdateJob
-import org.thoughtcrime.securesms.jobs.ProfileUploadJob
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.pin.SvrWrongPinException
-import org.thoughtcrime.securesms.registration.RegistrationData
-import org.thoughtcrime.securesms.registration.RegistrationUtil
-import org.thoughtcrime.securesms.registration.v2.data.RegistrationRepository
-import org.thoughtcrime.securesms.registration.v2.data.network.BackupAuthCheckResult
-import org.thoughtcrime.securesms.registration.v2.data.network.RegistrationSessionCheckResult
-import org.thoughtcrime.securesms.registration.v2.data.network.RegistrationSessionCreationResult
-import org.thoughtcrime.securesms.registration.v2.data.network.RegistrationSessionResult
-import org.thoughtcrime.securesms.registration.v2.data.network.VerificationCodeRequestResult
-import org.thoughtcrime.securesms.registration.v2.data.network.VerificationCodeRequestResult.AttemptsExhausted
-import org.thoughtcrime.securesms.registration.v2.data.network.VerificationCodeRequestResult.ChallengeRequired
-import org.thoughtcrime.securesms.registration.v2.data.network.VerificationCodeRequestResult.ExternalServiceFailure
-import org.thoughtcrime.securesms.registration.v2.data.network.VerificationCodeRequestResult.ImpossibleNumber
-import org.thoughtcrime.securesms.registration.v2.data.network.VerificationCodeRequestResult.InvalidTransportModeFailure
-import org.thoughtcrime.securesms.registration.v2.data.network.VerificationCodeRequestResult.MalformedRequest
-import org.thoughtcrime.securesms.registration.v2.data.network.VerificationCodeRequestResult.MustRetry
-import org.thoughtcrime.securesms.registration.v2.data.network.VerificationCodeRequestResult.NonNormalizedNumber
-import org.thoughtcrime.securesms.registration.v2.data.network.VerificationCodeRequestResult.RateLimited
-import org.thoughtcrime.securesms.registration.v2.data.network.VerificationCodeRequestResult.Success
-import org.thoughtcrime.securesms.registration.v2.data.network.VerificationCodeRequestResult.TokenNotAccepted
-import org.thoughtcrime.securesms.registration.v2.data.network.VerificationCodeRequestResult.UnknownError
-import org.thoughtcrime.securesms.util.FeatureFlags
-import org.thoughtcrime.securesms.util.Util
-import org.thoughtcrime.securesms.util.dualsim.MccMncProducer
-import org.whispersystems.signalservice.api.NetworkResult
-import org.whispersystems.signalservice.api.SvrNoDataException
-import org.whispersystems.signalservice.api.kbs.MasterKey
-import org.whispersystems.signalservice.internal.push.LockedException
-import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse
-import java.io.IOException
-
-/**
- * ViewModel shared across all of registration.
- */
-class RegistrationV2ViewModel : ViewModel() {
-
-  private val store = MutableStateFlow(RegistrationV2State())
-  private val password = Util.getSecret(18) // TODO [regv2]: persist this
-
-  private val coroutineExceptionHandler = CoroutineExceptionHandler { _, exception ->
-    Log.w(TAG, "CoroutineExceptionHandler invoked.", exception)
-    store.update {
-      it.copy(networkError = exception)
-    }
-  }
-
-  val uiState = store.asLiveData()
-
-  init {
-    val existingE164 = SignalStore.registrationValues().sessionE164
-    if (existingE164 != null) {
-      try {
-        val existingPhoneNumber = PhoneNumberUtil.getInstance().parse(existingE164, null)
-        if (existingPhoneNumber != null) {
-          setPhoneNumber(existingPhoneNumber)
-        }
-      } catch (ex: NumberParseException) {
-        Log.w(TAG, "Could not parse stored E164.", ex)
-      }
-    }
-  }
-
-  fun setInProgress(inProgress: Boolean) {
-    store.update {
-      it.copy(inProgress = inProgress)
-    }
-  }
-
-  fun setRegistrationCheckpoint(checkpoint: RegistrationCheckpoint) {
-    store.update {
-      it.copy(registrationCheckpoint = checkpoint)
-    }
-  }
-
-  fun setPhoneNumber(phoneNumber: Phonenumber.PhoneNumber?) {
-    store.update {
-      it.copy(phoneNumber = phoneNumber)
-    }
-  }
-
-  fun setCaptchaResponse(token: String) {
-    store.update {
-      it.copy(
-        registrationCheckpoint = RegistrationCheckpoint.CHALLENGE_COMPLETED,
-        captchaToken = token
-      )
-    }
-  }
-
-  fun fetchFcmToken(context: Context) {
-    viewModelScope.launch(context = coroutineExceptionHandler) {
-      val fcmToken = RegistrationRepository.getFcmToken(context)
-      store.update {
-        it.copy(registrationCheckpoint = RegistrationCheckpoint.PUSH_NETWORK_AUDITED, isFcmSupported = true, fcmToken = fcmToken)
-      }
-    }
-  }
-
-  private suspend fun updateFcmToken(context: Context): String? {
-    val fcmToken = RegistrationRepository.getFcmToken(context)
-    store.update {
-      it.copy(fcmToken = fcmToken)
-    }
-    return fcmToken
-  }
-
-  fun onBackupSuccessfullyRestored() {
-    val recoveryPassword = SignalStore.svr().recoveryPassword
-    store.update {
-      it.copy(registrationCheckpoint = RegistrationCheckpoint.BACKUP_RESTORED_OR_SKIPPED, recoveryPassword = SignalStore.svr().recoveryPassword, canSkipSms = recoveryPassword != null)
-    }
-  }
-
-  fun onUserConfirmedPhoneNumber(context: Context) {
-    setRegistrationCheckpoint(RegistrationCheckpoint.PHONE_NUMBER_CONFIRMED)
-    val state = store.value
-    if (state.phoneNumber == null) {
-      Log.w(TAG, "Phone number was null after confirmation.")
-      onErrorOccurred()
-      return
-    }
-
-    // TODO [regv2]: initialize Play Services sms retriever
-    val mccMncProducer = MccMncProducer(context)
-    val e164 = state.phoneNumber.toE164()
-    if (hasRecoveryPassword() && matchesSavedE164(e164)) {
-      // Re-registration when the local database is intact.
-      store.update {
-        it.copy(canSkipSms = true)
-      }
-      return
-    }
-
-    viewModelScope.launch {
-      val svrCredentialsResult = RegistrationRepository.hasValidSvrAuthCredentials(context, e164, password)
-
-      when (svrCredentialsResult) {
-        is BackupAuthCheckResult.UnknownError -> {
-          handleGenericError(svrCredentialsResult.getCause())
-          return@launch
-        }
-
-        is BackupAuthCheckResult.SuccessWithCredentials -> {
-          Log.d(TAG, "Found local valid SVR auth credentials.")
-          store.update {
-            it.copy(canSkipSms = true, svrAuthCredentials = svrCredentialsResult.authCredentials)
-          }
-          return@launch
-        }
-
-        is BackupAuthCheckResult.SuccessWithoutCredentials -> Log.d(TAG, "No local SVR auth credentials could be found and/or validated.")
-      }
-
-      val validSession = getOrCreateValidSession(context) ?: return@launch
-
-      if (!validSession.body.allowedToRequestCode) {
-        val challenges = validSession.body.requestedInformation.joinToString()
-        Log.i(TAG, "Not allowed to request code! Remaining challenges: $challenges")
-        handleSessionStateResult(context, ChallengeRequired(validSession.body.requestedInformation))
-        return@launch
-      }
-
-      val codeRequestResponse = RegistrationRepository.requestSmsCode(context, validSession.body.id, e164, password)
-
-      handleSessionStateResult(context, codeRequestResponse)
-    }
-  }
-
-  private suspend fun getOrCreateValidSession(context: Context): RegistrationSessionMetadataResponse? {
-    val e164 = getCurrentE164() ?: throw IllegalStateException("E164 required to create session!")
-    val mccMncProducer = MccMncProducer(context)
-
-    val existingSessionId = store.value.sessionId
-    val sessionResult: RegistrationSessionResult = RegistrationRepository.createOrValidateSession(context, existingSessionId, e164, password, mccMncProducer.mcc, mccMncProducer.mnc)
-    when (sessionResult) {
-      is RegistrationSessionCheckResult.Success -> {
-        val metadata = sessionResult.getMetadata()
-        val newSessionId = metadata.body.id
-        if (newSessionId.isNotNullOrBlank() && newSessionId != existingSessionId) {
-          store.update {
-            it.copy(
-              sessionId = newSessionId
-            )
-          }
-        }
-        return metadata
-      }
-      is RegistrationSessionCreationResult.Success -> {
-        val metadata = sessionResult.getMetadata()
-        val newSessionId = metadata.body.id
-        if (newSessionId.isNotNullOrBlank() && newSessionId != existingSessionId) {
-          store.update {
-            it.copy(
-              sessionId = newSessionId
-            )
-          }
-        }
-        return metadata
-      }
-      is RegistrationSessionCheckResult.SessionNotFound -> Log.w(TAG, "This should be impossible to reach at this stage; it should have been handled in RegistrationRepository.", sessionResult.getCause())
-      is RegistrationSessionCheckResult.UnknownError -> Log.i(TAG, "Unknown error occurred while checking registration session.", sessionResult.getCause())
-      is RegistrationSessionCreationResult.MalformedRequest -> Log.i(TAG, "Malformed request error occurred while creating registration session.", sessionResult.getCause())
-      is RegistrationSessionCreationResult.RateLimited -> Log.i(TAG, "Rate limit occurred while creating registration session.", sessionResult.getCause())
-      is RegistrationSessionCreationResult.ServerUnableToParse -> Log.i(TAG, "Server unable to parse request for creating registration session.", sessionResult.getCause())
-      is RegistrationSessionCreationResult.UnknownError -> Log.i(TAG, "Unknown error occurred while checking registration session.", sessionResult.getCause())
-    }
-    setInProgress(false)
-    return null
-  }
-
-  fun submitCaptchaToken(context: Context) {
-    val e164 = getCurrentE164() ?: throw IllegalStateException("TODO")
-    val sessionId = store.value.sessionId ?: throw IllegalStateException("TODO")
-    val captchaToken = store.value.captchaToken ?: throw IllegalStateException("TODO")
-
-    viewModelScope.launch {
-      val captchaSubmissionResult = RegistrationRepository.submitCaptchaToken(context, e164, password, sessionId, captchaToken)
-
-      handleSessionStateResult(context, captchaSubmissionResult)
-    }
-  }
-
-  /**
-   * @return whether the request was successful and execution should continue
-   */
-  private suspend fun handleSessionStateResult(context: Context, sessionResult: VerificationCodeRequestResult): Boolean {
-    when (sessionResult) {
-      is UnknownError -> {
-        handleGenericError(sessionResult.getCause())
-        return false
-      }
-
-      is Success -> {
-        updateFcmToken(context)
-        store.update {
-          it.copy(
-            sessionId = sessionResult.sessionId,
-            nextSms = sessionResult.nextSmsTimestamp,
-            nextCall = sessionResult.nextCallTimestamp,
-            registrationCheckpoint = RegistrationCheckpoint.VERIFICATION_CODE_REQUESTED
-          )
-        }
-        return true
-      }
-
-      is AttemptsExhausted -> Log.w(TAG, "TODO")
-      is ChallengeRequired -> store.update {
-        // TODO [regv2] handle push challenge required
-        it.copy(
-          registrationCheckpoint = RegistrationCheckpoint.CHALLENGE_RECEIVED
-        )
-      }
-      is ImpossibleNumber -> Log.w(TAG, "TODO")
-      is NonNormalizedNumber -> Log.w(TAG, "TODO")
-      is RateLimited -> Log.w(TAG, "TODO")
-      is ExternalServiceFailure -> Log.w(TAG, "TODO")
-      is InvalidTransportModeFailure -> Log.w(TAG, "TODO")
-      is MalformedRequest -> Log.w(TAG, "TODO")
-      is MustRetry -> Log.w(TAG, "TODO")
-      is TokenNotAccepted -> Log.w(TAG, "TODO")
-    }
-    return false
-  }
-
-  private fun handleGenericError(cause: Throwable) {
-    Log.w(TAG, "Encountered unknown error!", cause)
-    store.update {
-      it.copy(inProgress = false, networkError = cause)
-    }
-  }
-
-  private fun setRecoveryPassword(recoveryPassword: String?) {
-    store.update {
-      it.copy(recoveryPassword = recoveryPassword)
-    }
-  }
-
-  private fun updateSvrTriesRemaining(remainingTries: Int) {
-    store.update {
-      it.copy(svrTriesRemaining = remainingTries)
-    }
-  }
-
-  fun setUserSkippedReRegisterFlow(value: Boolean) {
-    store.update {
-      it.copy(userSkippedReregistration = value, canSkipSms = !value)
-    }
-  }
-
-  fun verifyReRegisterWithPin(context: Context, pin: String, wrongPinHandler: () -> Unit) {
-    setInProgress(true)
-
-    // Local recovery password
-    if (RegistrationRepository.canUseLocalRecoveryPassword()) {
-      if (RegistrationRepository.doesPinMatchLocalHash(pin)) {
-        Log.d(TAG, "Found recovery password, attempting to re-register.")
-        viewModelScope.launch(context = coroutineExceptionHandler) {
-          verifyReRegisterInternal(context, pin, SignalStore.svr().getOrCreateMasterKey())
-          setInProgress(false)
-        }
-      } else {
-        Log.d(TAG, "Entered PIN did not match local PIN hash.")
-        wrongPinHandler()
-        setInProgress(false)
-      }
-      return
-    }
-
-    // remote recovery password
-    val authCredentials = store.value.svrAuthCredentials
-    if (authCredentials != null) {
-      Log.d(TAG, "Found SVR auth credentials, fetching recovery password from SVR.")
-      viewModelScope.launch(context = coroutineExceptionHandler) {
-        try {
-          val masterKey = RegistrationRepository.fetchMasterKeyFromSvrRemote(pin, authCredentials)
-          setRecoveryPassword(masterKey.deriveRegistrationRecoveryPassword())
-          updateSvrTriesRemaining(10)
-          verifyReRegisterInternal(context, pin, masterKey)
-        } catch (rejectedPin: SvrWrongPinException) {
-          Log.w(TAG, "Submitted PIN was rejected by SVR.", rejectedPin)
-          updateSvrTriesRemaining(rejectedPin.triesRemaining)
-          wrongPinHandler()
-        } catch (noData: SvrNoDataException) {
-          Log.w(TAG, "SVR has no data for these credentials. Aborting skip SMS flow.", noData)
-          setUserSkippedReRegisterFlow(true)
-        }
-        setInProgress(false)
-      }
-      return
-    }
-
-    Log.w(TAG, "Could not get credentials to skip SMS registration, aborting!")
-    // TODO [regv2]: Investigate why in v1, this case throws a [IncorrectRegistrationRecoveryPasswordException], which seems weird.
-    store.update {
-      it.copy(canSkipSms = false, inProgress = false)
-    }
-  }
-
-  private suspend fun verifyReRegisterInternal(context: Context, pin: String, masterKey: MasterKey) {
-    updateFcmToken(context)
-
-    val registrationData = getRegistrationData("")
-
-    val resultAndRegLockStatus = registerAccountInternal(context, null, registrationData, pin, masterKey)
-    val result = resultAndRegLockStatus.first
-    val reglockEnabled = resultAndRegLockStatus.second
-
-    if (result !is NetworkResult.Success) {
-      Log.w(TAG, "Error during registration!", result.getCause())
-      return
-    }
-
-    onSuccessfulRegistration(context, registrationData, result.result, reglockEnabled)
-  }
-
-  private suspend fun registerAccountInternal(context: Context, sessionId: String?, registrationData: RegistrationData, pin: String?, masterKey: MasterKey): Pair<NetworkResult<RegistrationRepository.AccountRegistrationResult>, Boolean> {
-    val registrationResult = RegistrationRepository.registerAccount(context = context, sessionId = sessionId, registrationData = registrationData, pin = pin) { masterKey }
-
-    // TODO: check for wrong recovery password
-
-    // Check if reg lock is enabled
-    if (registrationResult !is NetworkResult.StatusCodeError || registrationResult.exception !is LockedException) {
-      return Pair(registrationResult, false)
-    }
-
-    Log.i(TAG, "Received a registration lock response when trying to register an account. Retrying with master key.")
-    val lockedException = registrationResult.exception as LockedException
-    store.update {
-      it.copy(svrAuthCredentials = lockedException.svr2Credentials)
-    }
-
-    return Pair(RegistrationRepository.registerAccount(context = context, sessionId = sessionId, registrationData = registrationData, pin = pin) { masterKey }, true)
-  }
-
-  fun verifyCodeWithoutRegistrationLock(context: Context, code: String) {
-    store.update {
-      it.copy(inProgress = true, registrationCheckpoint = RegistrationCheckpoint.VERIFICATION_CODE_ENTERED)
-    }
-
-    val sessionId = store.value.sessionId
-    if (sessionId == null) {
-      Log.w(TAG, "Session ID was null. TODO: handle this better in the UI.")
-      return
-    }
-    val e164: String = getCurrentE164() ?: throw IllegalStateException()
-
-    viewModelScope.launch(context = coroutineExceptionHandler) {
-      val registrationData = getRegistrationData(code)
-      val verificationResponse = RegistrationRepository.submitVerificationCode(context, e164, password, sessionId, registrationData).successOrThrow()
-
-      if (!verificationResponse.body.verified) {
-        Log.w(TAG, "Could not verify code!")
-        // TODO [regv2]: error handling
-        return@launch
-      }
-
-      setRegistrationCheckpoint(RegistrationCheckpoint.VERIFICATION_CODE_VALIDATED)
-
-      val registrationResponse = RegistrationRepository.registerAccount(context, sessionId, registrationData).successOrThrow()
-      onSuccessfulRegistration(context, registrationData, registrationResponse, false)
-    }
-  }
-
-  private suspend fun onSuccessfulRegistration(context: Context, registrationData: RegistrationData, remoteResult: RegistrationRepository.AccountRegistrationResult, reglockEnabled: Boolean) {
-    RegistrationRepository.registerAccountLocally(context, registrationData, remoteResult, reglockEnabled)
-
-    refreshFeatureFlags()
-
-    store.update {
-      it.copy(registrationCheckpoint = RegistrationCheckpoint.SERVICE_REGISTRATION_COMPLETED)
-    }
-  }
-
-  fun hasPin(): Boolean {
-    return RegistrationRepository.hasPin() || store.value.isReRegister
-  }
-
-  fun completeRegistration() {
-    ApplicationDependencies.getJobManager().startChain(ProfileUploadJob()).then(listOf(MultiDeviceProfileKeyUpdateJob(), MultiDeviceProfileContentUpdateJob())).enqueue()
-    RegistrationUtil.maybeMarkRegistrationComplete()
-  }
-
-  private fun matchesSavedE164(e164: String?): Boolean {
-    return if (e164 == null) {
-      false
-    } else {
-      e164 == SignalStore.account().e164
-    }
-  }
-
-  private fun hasRecoveryPassword(): Boolean {
-    return store.value.recoveryPassword != null
-  }
-
-  private fun getCurrentE164(): String? {
-    return store.value.phoneNumber?.toE164()
-  }
-
-  private suspend fun getRegistrationData(code: String): RegistrationData {
-    val currentState = store.value
-    val e164: String = currentState.phoneNumber?.toE164() ?: throw IllegalStateException()
-    val recoveryPassword = if (currentState.sessionId == null) SignalStore.svr().getRecoveryPassword() else null
-    return RegistrationData(code, e164, password, RegistrationRepository.getRegistrationId(), RegistrationRepository.getProfileKey(e164), currentState.fcmToken, RegistrationRepository.getPniRegistrationId(), recoveryPassword)
-  }
-
-  /**
-   * This is a generic error UI handler that re-enables the UI so that the user can recover from errors.
-   * Do not forget to log any errors when calling this method!
-   */
-  private fun onErrorOccurred() {
-    setInProgress(false)
-  }
-
-  companion object {
-    private val TAG = Log.tag(RegistrationV2ViewModel::class.java)
-
-    private suspend fun refreshFeatureFlags() = withContext(Dispatchers.IO) {
-      val startTime = System.currentTimeMillis()
-      try {
-        FeatureFlags.refreshSync()
-        Log.i(TAG, "Took " + (System.currentTimeMillis() - startTime) + " ms to get feature flags.")
-      } catch (e: IOException) {
-        Log.w(TAG, "Failed to refresh flags after " + (System.currentTimeMillis() - startTime) + " ms.", e)
-      }
-    }
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/entercode/EnterCodeV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/entercode/EnterCodeV2Fragment.kt
deleted file mode 100644
index ac31b27215..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/entercode/EnterCodeV2Fragment.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.registration.v2.ui.entercode
-
-import android.os.Bundle
-import android.view.View
-import androidx.activity.OnBackPressedCallback
-import androidx.fragment.app.activityViewModels
-import androidx.navigation.fragment.NavHostFragment
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.LoggingFragment
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.components.ViewBinderDelegate
-import org.thoughtcrime.securesms.databinding.FragmentRegistrationEnterCodeV2Binding
-import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView
-import org.thoughtcrime.securesms.registration.fragments.SignalStrengthPhoneStateListener
-import org.thoughtcrime.securesms.registration.v2.ui.RegistrationCheckpoint
-import org.thoughtcrime.securesms.registration.v2.ui.RegistrationV2ViewModel
-
-/**
- * The final screen of account registration, where the user enters their verification code.
- */
-class EnterCodeV2Fragment : LoggingFragment(R.layout.fragment_registration_enter_code_v2) {
-
-  private val TAG = Log.tag(EnterCodeV2Fragment::class.java)
-
-  private val sharedViewModel by activityViewModels<RegistrationV2ViewModel>()
-  private val binding: FragmentRegistrationEnterCodeV2Binding by ViewBinderDelegate(FragmentRegistrationEnterCodeV2Binding::bind)
-
-  private lateinit var phoneStateListener: SignalStrengthPhoneStateListener
-
-  private var autopilotCodeEntryActive = false
-
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    super.onViewCreated(view, savedInstanceState)
-
-    setDebugLogSubmitMultiTapView(binding.verifyHeader)
-
-    phoneStateListener = SignalStrengthPhoneStateListener(this, PhoneStateCallback())
-
-    requireActivity().onBackPressedDispatcher.addCallback(
-      viewLifecycleOwner,
-      object : OnBackPressedCallback(true) {
-        override fun handleOnBackPressed() {
-          popBackStack()
-        }
-      }
-    )
-
-    binding.wrongNumber.setOnClickListener {
-      popBackStack()
-    }
-
-    binding.code.setOnCompleteListener {
-      sharedViewModel.verifyCodeWithoutRegistrationLock(requireContext(), it)
-    }
-
-    binding.keyboard.setOnKeyPressListener { key ->
-      if (!autopilotCodeEntryActive) {
-        if (key >= 0) {
-          binding.code.append(key)
-        } else {
-          binding.code.delete()
-        }
-      }
-    }
-  }
-
-  private fun popBackStack() {
-    sharedViewModel.setRegistrationCheckpoint(RegistrationCheckpoint.PUSH_NETWORK_AUDITED)
-    NavHostFragment.findNavController(this).popBackStack()
-  }
-
-  private class PhoneStateCallback : SignalStrengthPhoneStateListener.Callback {
-    override fun onNoCellSignalPresent() {
-      // TODO [regv2]: animate in bottom sheet
-    }
-
-    override fun onCellSignalPresent() {
-      // TODO [regv2]: animate in bottom sheet
-    }
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/phonenumber/EnterPhoneNumberV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/phonenumber/EnterPhoneNumberV2Fragment.kt
deleted file mode 100644
index f44dba8b36..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/phonenumber/EnterPhoneNumberV2Fragment.kt
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.registration.v2.ui.phonenumber
-
-import android.content.Context
-import android.os.Bundle
-import android.text.SpannableStringBuilder
-import android.text.TextWatcher
-import android.view.KeyEvent
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.inputmethod.EditorInfo
-import android.widget.ArrayAdapter
-import android.widget.TextView
-import androidx.activity.OnBackPressedCallback
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.MenuProvider
-import androidx.core.widget.addTextChangedListener
-import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.viewModels
-import androidx.navigation.fragment.NavHostFragment
-import androidx.navigation.fragment.findNavController
-import com.google.android.gms.common.ConnectionResult
-import com.google.android.gms.common.GoogleApiAvailability
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.textfield.MaterialAutoCompleteTextView
-import com.google.android.material.textfield.TextInputEditText
-import com.google.i18n.phonenumbers.PhoneNumberUtil
-import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.LoggingFragment
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.components.ViewBinderDelegate
-import org.thoughtcrime.securesms.databinding.FragmentRegistrationEnterPhoneNumberV2Binding
-import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
-import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView
-import org.thoughtcrime.securesms.registration.util.CountryPrefix
-import org.thoughtcrime.securesms.registration.v2.ui.RegistrationCheckpoint
-import org.thoughtcrime.securesms.registration.v2.ui.RegistrationV2State
-import org.thoughtcrime.securesms.registration.v2.ui.RegistrationV2ViewModel
-import org.thoughtcrime.securesms.registration.v2.ui.toE164
-import org.thoughtcrime.securesms.util.PlayServicesUtil
-import org.thoughtcrime.securesms.util.SpanUtil
-import org.thoughtcrime.securesms.util.ViewUtil
-import org.thoughtcrime.securesms.util.livedata.LiveDataObserverCallback
-import org.thoughtcrime.securesms.util.navigation.safeNavigate
-import org.thoughtcrime.securesms.util.visible
-
-/**
- * Screen in registration where the user enters their phone number.
- */
-class EnterPhoneNumberV2Fragment : LoggingFragment(R.layout.fragment_registration_enter_phone_number_v2) {
-
-  private val TAG = Log.tag(EnterPhoneNumberV2Fragment::class.java)
-  private val sharedViewModel by activityViewModels<RegistrationV2ViewModel>()
-  private val fragmentViewModel by viewModels<EnterPhoneNumberV2ViewModel>()
-  private val binding: FragmentRegistrationEnterPhoneNumberV2Binding by ViewBinderDelegate(FragmentRegistrationEnterPhoneNumberV2Binding::bind)
-
-  private lateinit var spinnerAdapter: ArrayAdapter<CountryPrefix>
-  private lateinit var phoneNumberInputLayout: TextInputEditText
-  private lateinit var spinnerView: MaterialAutoCompleteTextView
-
-  private var currentPhoneNumberFormatter: TextWatcher? = null
-
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    super.onViewCreated(view, savedInstanceState)
-    setDebugLogSubmitMultiTapView(binding.verifyHeader)
-    requireActivity().onBackPressedDispatcher.addCallback(
-      viewLifecycleOwner,
-      object : OnBackPressedCallback(true) {
-        override fun handleOnBackPressed() {
-          popBackStack()
-        }
-      }
-    )
-    phoneNumberInputLayout = binding.number.editText as TextInputEditText
-    spinnerView = binding.countryCode.editText as MaterialAutoCompleteTextView
-    spinnerAdapter = ArrayAdapter<CountryPrefix>(
-      requireContext(),
-      R.layout.registration_country_code_dropdown_item,
-      fragmentViewModel.supportedCountryPrefixes
-    )
-    binding.registerButton.setOnClickListener { onRegistrationButtonClicked() }
-
-    binding.toolbar.title = ""
-    val activity = requireActivity() as AppCompatActivity
-    activity.setSupportActionBar(binding.toolbar)
-
-    requireActivity().addMenuProvider(UseProxyMenuProvider(), viewLifecycleOwner)
-
-    sharedViewModel.uiState.observe(viewLifecycleOwner) { sharedState ->
-      presentRegisterButton(sharedState)
-      presentProgressBar(sharedState.inProgress, sharedState.isReRegister)
-
-      sharedState.networkError?.let {
-        presentNetworkError(it)
-      }
-
-      if (sharedState.registrationCheckpoint >= RegistrationCheckpoint.PHONE_NUMBER_CONFIRMED && sharedState.canSkipSms) {
-        moveToEnterPinScreen()
-      } else if (sharedState.registrationCheckpoint >= RegistrationCheckpoint.VERIFICATION_CODE_REQUESTED) {
-        moveToVerificationEntryScreen()
-      } else if (sharedState.registrationCheckpoint >= RegistrationCheckpoint.CHALLENGE_COMPLETED) {
-        sharedViewModel.submitCaptchaToken(requireContext())
-      } else if (sharedState.registrationCheckpoint >= RegistrationCheckpoint.CHALLENGE_RECEIVED) {
-        findNavController().safeNavigate(EnterPhoneNumberV2FragmentDirections.actionRequestCaptcha())
-      }
-    }
-
-    fragmentViewModel.uiState.observe(viewLifecycleOwner) { fragmentState ->
-
-      fragmentState.phoneNumberFormatter?.let {
-        if (it != currentPhoneNumberFormatter) {
-          currentPhoneNumberFormatter?.let { oldWatcher ->
-            Log.d(TAG, "Removing current phone number formatter in fragment")
-            phoneNumberInputLayout.removeTextChangedListener(oldWatcher)
-          }
-          phoneNumberInputLayout.addTextChangedListener(it)
-          currentPhoneNumberFormatter = it
-          Log.d(TAG, "Updating phone number formatter in fragment")
-        }
-      }
-
-      if (fragmentViewModel.isEnteredNumberValid(fragmentState)) {
-        sharedViewModel.setPhoneNumber(fragmentViewModel.parsePhoneNumber(fragmentState))
-      } else {
-        sharedViewModel.setPhoneNumber(null)
-      }
-
-      if (fragmentState.error != EnterPhoneNumberV2State.Error.NONE) {
-        presentError(fragmentState)
-      }
-    }
-
-    initializeInputFields()
-
-    val existingPhoneNumber = sharedViewModel.uiState.value?.phoneNumber
-    if (existingPhoneNumber != null) {
-      fragmentViewModel.restoreState(existingPhoneNumber)
-      fragmentViewModel.phoneNumber()?.let {
-        phoneNumberInputLayout.setText(it.nationalNumber.toString())
-      }
-    } else if (spinnerView.editableText.isBlank()) {
-      spinnerView.setText(fragmentViewModel.countryPrefix().toString())
-    }
-
-    ViewUtil.focusAndShowKeyboard(phoneNumberInputLayout)
-  }
-
-  private fun initializeInputFields() {
-    binding.countryCode.editText?.addTextChangedListener { s ->
-      val countryCode: Int = s.toString().toInt()
-      fragmentViewModel.setCountry(countryCode)
-    }
-
-    phoneNumberInputLayout.addTextChangedListener {
-      fragmentViewModel.setPhoneNumber(it?.toString())
-    }
-    phoneNumberInputLayout.onFocusChangeListener = View.OnFocusChangeListener { _: View?, hasFocus: Boolean ->
-      if (hasFocus) {
-        binding.scrollView.postDelayed({ binding.scrollView.smoothScrollTo(0, binding.registerButton.bottom) }, 250)
-      }
-    }
-    phoneNumberInputLayout.imeOptions = EditorInfo.IME_ACTION_DONE
-    phoneNumberInputLayout.setOnEditorActionListener { v: TextView?, actionId: Int, _: KeyEvent? ->
-      if (actionId == EditorInfo.IME_ACTION_DONE && v != null) {
-        onRegistrationButtonClicked()
-        return@setOnEditorActionListener true
-      }
-      false
-    }
-
-    spinnerView.threshold = 100
-    spinnerView.setAdapter(spinnerAdapter)
-    spinnerView.addTextChangedListener { s ->
-      if (s.isNullOrEmpty()) {
-        return@addTextChangedListener
-      }
-
-      if (s[0] != '+') {
-        s.insert(0, "+")
-      }
-
-      fragmentViewModel.supportedCountryPrefixes.firstOrNull { it.toString() == s.toString() }?.let {
-        fragmentViewModel.setCountry(it.digits)
-        val numberLength: Int = phoneNumberInputLayout.text?.length ?: 0
-        phoneNumberInputLayout.setSelection(numberLength, numberLength)
-      }
-    }
-  }
-
-  private fun presentRegisterButton(sharedState: RegistrationV2State) {
-    binding.registerButton.isEnabled = sharedState.phoneNumber != null && PhoneNumberUtil.getInstance().isValidNumber(sharedState.phoneNumber) && !sharedState.inProgress
-    // TODO [regv2]: always enable the button but display error dialogs if the entered phone number is invalid
-  }
-
-  private fun presentError(state: EnterPhoneNumberV2State) {
-    when (state.error) {
-      EnterPhoneNumberV2State.Error.NONE -> {
-        Unit
-      }
-
-      EnterPhoneNumberV2State.Error.INVALID_PHONE_NUMBER -> {
-        MaterialAlertDialogBuilder(requireContext()).apply {
-          setTitle(R.string.RegistrationActivity_invalid_number)
-          setMessage(
-            String.format(
-              getString(R.string.RegistrationActivity_the_number_you_specified_s_is_invalid),
-              state.phoneNumber
-            )
-          )
-          setPositiveButton(android.R.string.ok) { _, _ -> fragmentViewModel.clearError() }
-          setOnCancelListener { fragmentViewModel.clearError() }
-          setOnDismissListener { fragmentViewModel.clearError() }
-          show()
-        }
-      }
-
-      EnterPhoneNumberV2State.Error.PLAY_SERVICES_MISSING -> {
-        Log.w(TAG, "Not yet implemented!", NotImplementedError()) // TODO [regv2]
-      }
-
-      EnterPhoneNumberV2State.Error.PLAY_SERVICES_NEEDS_UPDATE -> {
-        GoogleApiAvailability.getInstance().getErrorDialog(requireActivity(), ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED, 0)?.show()
-      }
-
-      EnterPhoneNumberV2State.Error.PLAY_SERVICES_TRANSIENT -> {
-        MaterialAlertDialogBuilder(requireContext()).apply {
-          setTitle(R.string.RegistrationActivity_play_services_error)
-          setMessage(R.string.RegistrationActivity_google_play_services_is_updating_or_unavailable)
-          setPositiveButton(android.R.string.ok) { _, _ -> fragmentViewModel.clearError() }
-          setOnCancelListener { fragmentViewModel.clearError() }
-          setOnDismissListener { fragmentViewModel.clearError() }
-          show()
-        }
-      }
-    }
-  }
-
-  private fun presentNetworkError(networkError: Throwable) {
-    // TODO [regv2]: check specific errors with a when clause
-    Log.i(TAG, "Unknown error during verification code request", networkError)
-    MaterialAlertDialogBuilder(requireContext())
-      .setMessage(R.string.RegistrationActivity_unable_to_connect_to_service)
-      .setPositiveButton(android.R.string.ok, null)
-      .show()
-  }
-
-  private fun onRegistrationButtonClicked() {
-    ViewUtil.hideKeyboard(requireContext(), phoneNumberInputLayout)
-    sharedViewModel.setInProgress(true)
-    val hasFcm = validateFcmStatus(requireContext())
-    if (hasFcm) {
-      sharedViewModel.uiState.observe(viewLifecycleOwner, FcmTokenRetrievedObserver())
-      sharedViewModel.fetchFcmToken(requireContext())
-    } else {
-      sharedViewModel.uiState.value?.let { value ->
-        if (value.phoneNumber == null) {
-          fragmentViewModel.setError(EnterPhoneNumberV2State.Error.INVALID_PHONE_NUMBER)
-          sharedViewModel.setInProgress(false)
-        } else {
-          presentConfirmNumberDialog(value.phoneNumber, value.isReRegister, value.canSkipSms, missingFcmConsentRequired = true)
-        }
-      }
-    }
-  }
-
-  private fun onFcmTokenRetrieved(value: RegistrationV2State) {
-    if (value.phoneNumber == null) {
-      fragmentViewModel.setError(EnterPhoneNumberV2State.Error.INVALID_PHONE_NUMBER)
-      sharedViewModel.setInProgress(false)
-    } else {
-      presentConfirmNumberDialog(value.phoneNumber, value.isReRegister, value.canSkipSms, missingFcmConsentRequired = false)
-    }
-  }
-
-  private fun presentProgressBar(showProgress: Boolean, isReRegister: Boolean) {
-    if (showProgress) {
-      binding.registerButton.setSpinning()
-    } else {
-      binding.registerButton.cancelSpinning()
-    }
-    binding.countryCode.isEnabled = !showProgress
-    binding.number.isEnabled = !showProgress
-    binding.cancelButton.visible = !showProgress && isReRegister
-  }
-
-  private fun validateFcmStatus(context: Context): Boolean {
-    val fcmStatus = PlayServicesUtil.getPlayServicesStatus(context)
-    Log.d(TAG, "Got $fcmStatus for Play Services status.")
-    when (fcmStatus) {
-      PlayServicesUtil.PlayServicesStatus.SUCCESS -> {
-        return true
-      }
-
-      PlayServicesUtil.PlayServicesStatus.DISABLED -> {
-        // TODO: MOLLY
-        return false
-      }
-
-      PlayServicesUtil.PlayServicesStatus.MISSING -> {
-        fragmentViewModel.setError(EnterPhoneNumberV2State.Error.PLAY_SERVICES_MISSING)
-        return false
-      }
-
-      PlayServicesUtil.PlayServicesStatus.NEEDS_UPDATE -> {
-        fragmentViewModel.setError(EnterPhoneNumberV2State.Error.PLAY_SERVICES_NEEDS_UPDATE)
-        return false
-      }
-
-      PlayServicesUtil.PlayServicesStatus.TRANSIENT_ERROR -> {
-        fragmentViewModel.setError(EnterPhoneNumberV2State.Error.PLAY_SERVICES_TRANSIENT)
-        return false
-      }
-
-      null -> {
-        Log.w(TAG, "Null result received from PlayServicesUtil, marking Play Services as missing.")
-        fragmentViewModel.setError(EnterPhoneNumberV2State.Error.PLAY_SERVICES_MISSING)
-        return false
-      }
-    }
-  }
-
-  private fun onConfirmNumberDialogCanceled() {
-    Log.d(TAG, "User canceled confirm number, returning to edit number.")
-    sharedViewModel.setInProgress(false)
-    ViewUtil.focusAndMoveCursorToEndAndOpenKeyboard(phoneNumberInputLayout)
-  }
-
-  private fun presentConfirmNumberDialog(phoneNumber: PhoneNumber, isReRegister: Boolean, canSkipSms: Boolean, missingFcmConsentRequired: Boolean) {
-    val title = if (isReRegister) {
-      R.string.RegistrationActivity_additional_verification_required
-    } else {
-      R.string.RegistrationActivity_phone_number_verification_dialog_title
-    }
-
-    val message: CharSequence = SpannableStringBuilder().apply {
-      append(SpanUtil.bold(PhoneNumberFormatter.prettyPrint(phoneNumber.toE164())))
-      if (!canSkipSms) {
-        append("\n\n")
-        append(getString(R.string.RegistrationActivity_a_verification_code_will_be_sent_to_this_number))
-      }
-    }
-
-    MaterialAlertDialogBuilder(requireContext()).apply {
-      setTitle(title)
-      setMessage(message)
-      setPositiveButton(android.R.string.ok) { _, _ ->
-        Log.d(TAG, "User confirmed number.")
-        if (missingFcmConsentRequired) {
-          handlePromptForNoPlayServices()
-        } else {
-          sharedViewModel.onUserConfirmedPhoneNumber(requireContext())
-        }
-      }
-      setNegativeButton(R.string.RegistrationActivity_edit_number) { _, _ -> onConfirmNumberDialogCanceled() }
-      setOnCancelListener { _ -> onConfirmNumberDialogCanceled() }
-    }.show()
-  }
-
-  private fun handlePromptForNoPlayServices() {
-    Log.d(TAG, "Device does not have Play Services, showing consent dialog.")
-    MaterialAlertDialogBuilder(requireContext()).apply {
-      setTitle(R.string.RegistrationActivity_missing_google_play_services)
-      setMessage(R.string.RegistrationActivity_this_device_is_missing_google_play_services)
-      setPositiveButton(R.string.RegistrationActivity_i_understand) { _, _ ->
-        Log.d(TAG, "User confirmed number.")
-        sharedViewModel.onUserConfirmedPhoneNumber(requireContext())
-      }
-      setNegativeButton(android.R.string.cancel, null)
-      setOnCancelListener { fragmentViewModel.clearError() }
-      setOnDismissListener { fragmentViewModel.clearError() }
-      show()
-    }
-  }
-
-  private fun moveToEnterPinScreen() {
-    findNavController().safeNavigate(EnterPhoneNumberV2FragmentDirections.actionReRegisterWithPinV2Fragment())
-    sharedViewModel.setInProgress(false)
-  }
-
-  private fun moveToVerificationEntryScreen() {
-    findNavController().safeNavigate(EnterPhoneNumberV2FragmentDirections.actionEnterVerificationCode())
-    sharedViewModel.setInProgress(false)
-  }
-
-  private fun popBackStack() {
-    sharedViewModel.setRegistrationCheckpoint(RegistrationCheckpoint.INITIALIZATION)
-    findNavController().popBackStack()
-  }
-
-  private inner class FcmTokenRetrievedObserver : LiveDataObserverCallback<RegistrationV2State>(sharedViewModel.uiState) {
-    override fun onValue(value: RegistrationV2State): Boolean {
-      val fcmRetrieved = value.isFcmSupported
-      if (fcmRetrieved) {
-        onFcmTokenRetrieved(value)
-      }
-      return fcmRetrieved
-    }
-  }
-
-  private inner class UseProxyMenuProvider : MenuProvider {
-    override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
-      menuInflater.inflate(R.menu.enter_phone_number, menu)
-    }
-
-    override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
-      return if (menuItem.itemId == R.id.phone_menu_use_proxy) {
-        NavHostFragment.findNavController(this@EnterPhoneNumberV2Fragment).safeNavigate(EnterPhoneNumberV2FragmentDirections.actionEditProxy())
-        true
-      } else {
-        false
-      }
-    }
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/phonenumber/EnterPhoneNumberV2State.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/phonenumber/EnterPhoneNumberV2State.kt
deleted file mode 100644
index d311bcaa6e..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/ui/phonenumber/EnterPhoneNumberV2State.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.registration.v2.ui.phonenumber
-
-import android.text.TextWatcher
-
-/**
- * State holder for the phone number entry screen, including phone number and Play Services errors.
- */
-data class EnterPhoneNumberV2State(val countryPrefixIndex: Int, val phoneNumber: String, val phoneNumberFormatter: TextWatcher? = null, val error: Error = Error.NONE) {
-
-  companion object {
-    @JvmStatic
-    val INIT = EnterPhoneNumberV2State(0, "")
-  }
-
-  enum class Error {
-    NONE,
-    INVALID_PHONE_NUMBER,
-    PLAY_SERVICES_MISSING,
-    PLAY_SERVICES_NEEDS_UPDATE,
-    PLAY_SERVICES_TRANSIENT
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/BaseEnterCodeViewModelDelegate.java b/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/BaseEnterCodeViewModelDelegate.java
deleted file mode 100644
index 367f58a9dd..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/BaseEnterCodeViewModelDelegate.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.thoughtcrime.securesms.registration.viewmodel;
-
-public final class BaseEnterCodeViewModelDelegate {
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/BaseRegistrationViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/BaseRegistrationViewModel.java
deleted file mode 100644
index 828d9d7f74..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/BaseRegistrationViewModel.java
+++ /dev/null
@@ -1,397 +0,0 @@
-package org.thoughtcrime.securesms.registration.viewmodel;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.SavedStateHandle;
-import androidx.lifecycle.ViewModel;
-
-import com.google.i18n.phonenumbers.NumberParseException;
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
-import com.google.i18n.phonenumbers.Phonenumber;
-
-import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.registration.RegistrationSessionProcessor;
-import org.thoughtcrime.securesms.registration.VerifyAccountRepository;
-import org.thoughtcrime.securesms.registration.VerifyAccountRepository.Mode;
-import org.thoughtcrime.securesms.registration.VerifyResponse;
-import org.thoughtcrime.securesms.registration.VerifyResponseProcessor;
-import org.thoughtcrime.securesms.registration.VerifyResponseWithRegistrationLockProcessor;
-import org.thoughtcrime.securesms.registration.VerifyResponseHitRegistrationLock;
-import org.thoughtcrime.securesms.registration.VerifyResponseWithoutKbs;
-import org.whispersystems.signalservice.internal.ServiceResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.core.Single;
-
-/**
- * Base view model used in registration and change number flow. Handles the storage of all data
- * shared between the two flows, orchestrating verification, and calling to subclasses to perform
- * the specific verify operations for each flow.
- */
-public abstract class BaseRegistrationViewModel extends ViewModel {
-
-  private static final String TAG = Log.tag(BaseRegistrationViewModel.class);
-
-  private static final String STATE_NUMBER                  = "NUMBER";
-  private static final String STATE_REGISTRATION_SECRET     = "REGISTRATION_SECRET";
-  private static final String STATE_VERIFICATION_CODE       = "TEXT_CODE_ENTERED";
-  private static final String STATE_CAPTCHA                 = "CAPTCHA";
-  private static final String STATE_PUSH_TIMED_OUT          = "PUSH_TIMED_OUT";
-  private static final String STATE_INCORRECT_CODE_ATTEMPTS = "STATE_INCORRECT_CODE_ATTEMPTS";
-  private static final String STATE_REQUEST_RATE_LIMITER    = "REQUEST_RATE_LIMITER";
-  private static final String STATE_SVR_AUTH                = "SVR_AUTH";
-  private static final String STATE_SVR_TRIES_REMAINING     = "SVR_TRIES_REMAINING";
-  private static final String STATE_TIME_REMAINING          = "TIME_REMAINING";
-  private static final String STATE_CAN_CALL_AT_TIME        = "CAN_CALL_AT_TIME";
-  private static final String STATE_CAN_SMS_AT_TIME         = "CAN_SMS_AT_TIME";
-  private static final String STATE_RECOVERY_PASSWORD       = "RECOVERY_PASSWORD";
-
-  protected final SavedStateHandle        savedState;
-  protected final VerifyAccountRepository verifyAccountRepository;
-
-  public BaseRegistrationViewModel(@NonNull SavedStateHandle savedStateHandle,
-                                   @NonNull VerifyAccountRepository verifyAccountRepository,
-                                   @NonNull String password)
-  {
-    this.savedState = savedStateHandle;
-
-    this.verifyAccountRepository = verifyAccountRepository;
-
-    setInitialDefaultValue(STATE_NUMBER, NumberViewState.INITIAL);
-    setInitialDefaultValue(STATE_REGISTRATION_SECRET, password);
-    setInitialDefaultValue(STATE_VERIFICATION_CODE, "");
-    setInitialDefaultValue(STATE_INCORRECT_CODE_ATTEMPTS, 0);
-    setInitialDefaultValue(STATE_REQUEST_RATE_LIMITER, new LocalCodeRequestRateLimiter(60_000));
-    setInitialDefaultValue(STATE_RECOVERY_PASSWORD, SignalStore.svr().getRecoveryPassword());
-    setInitialDefaultValue(STATE_PUSH_TIMED_OUT, false);
-  }
-
-  protected <T> void setInitialDefaultValue(@NonNull String key, @Nullable T initialValue) {
-    if (!savedState.contains(key) || savedState.get(key) == null) {
-      savedState.set(key, initialValue);
-    }
-  }
-
-  public @Nullable String getSessionId() {
-    return SignalStore.registrationValues().getSessionId();
-  }
-
-  public void setSessionId(String sessionId) {
-    SignalStore.registrationValues().setSessionId(sessionId);
-  }
-
-  public @Nullable String getSessionE164() {
-    return SignalStore.registrationValues().getSessionE164();
-  }
-
-  public void setSessionE164(String sessionE164) {
-    SignalStore.registrationValues().setSessionE164(sessionE164);
-  }
-
-  public void resetSession() {
-    setSessionE164(null);
-    setSessionId(null);
-  }
-
-  public @NonNull NumberViewState getNumber() {
-    //noinspection ConstantConditions
-    return savedState.get(STATE_NUMBER);
-  }
-
-  public @NonNull LiveData<NumberViewState> getLiveNumber() {
-    return savedState.getLiveData(STATE_NUMBER);
-  }
-
-  public void restorePhoneNumberStateFromE164(String e164) throws NumberParseException {
-    Phonenumber.PhoneNumber phoneNumber = PhoneNumberUtil.getInstance().parse(e164, null);
-    onCountrySelected(null, phoneNumber.getCountryCode());
-    setNationalNumber(String.valueOf(phoneNumber.getNationalNumber()));
-  }
-
-  public void onCountrySelected(@Nullable String selectedCountryName, int countryCode) {
-    setViewState(getNumber().toBuilder()
-                            .selectedCountryDisplayName(selectedCountryName)
-                            .countryCode(countryCode)
-                            .build());
-  }
-
-  public void setNationalNumber(String number) {
-    NumberViewState numberViewState = getNumber().toBuilder().nationalNumber(number).build();
-    setViewState(numberViewState);
-  }
-
-  protected void setViewState(NumberViewState numberViewState) {
-    if (!numberViewState.equals(getNumber())) {
-      savedState.set(STATE_NUMBER, numberViewState);
-    }
-  }
-
-  public @NonNull String getRegistrationSecret() {
-    //noinspection ConstantConditions
-    return savedState.get(STATE_REGISTRATION_SECRET);
-  }
-
-  public @NonNull String getTextCodeEntered() {
-    //noinspection ConstantConditions
-    return savedState.get(STATE_VERIFICATION_CODE);
-  }
-
-  public @Nullable String getCaptchaToken() {
-    return savedState.get(STATE_CAPTCHA);
-  }
-
-  public boolean hasCaptchaToken() {
-    return getCaptchaToken() != null;
-  }
-
-  public void setCaptchaResponse(@Nullable String captchaToken) {
-    savedState.set(STATE_CAPTCHA, captchaToken);
-  }
-
-  public void clearCaptchaResponse() {
-    setCaptchaResponse(null);
-  }
-
-  public void onVerificationCodeEntered(String code) {
-    savedState.set(STATE_VERIFICATION_CODE, code);
-  }
-
-  public void incrementIncorrectCodeAttempts() {
-    //noinspection ConstantConditions
-    savedState.set(STATE_INCORRECT_CODE_ATTEMPTS, (Integer) savedState.get(STATE_INCORRECT_CODE_ATTEMPTS) + 1);
-  }
-
-  public LiveData<Integer> getIncorrectCodeAttempts() {
-    return savedState.getLiveData(STATE_INCORRECT_CODE_ATTEMPTS, 0);
-  }
-
-  public void markPushChallengeTimedOut() {
-    savedState.set(STATE_PUSH_TIMED_OUT, true);
-  }
-
-  public List<String> getExcludedChallenges() {
-    ArrayList<String> challengeKeys = new ArrayList<>();
-    if (Boolean.TRUE.equals(savedState.get(STATE_PUSH_TIMED_OUT))) {
-      challengeKeys.add(RegistrationSessionProcessor.PUSH_CHALLENGE_KEY);
-    }
-    return challengeKeys;
-  }
-
-  protected void setSvrAuthCredentials(SvrAuthCredentialSet credentials) {
-    savedState.set(STATE_SVR_AUTH, credentials);
-  }
-
-  protected @Nullable SvrAuthCredentialSet getSvrAuthCredentials() {
-    return savedState.get(STATE_SVR_AUTH);
-  }
-
-  public @Nullable Integer getSvrTriesRemaining() {
-    return savedState.get(STATE_SVR_TRIES_REMAINING);
-  }
-
-  public void setSvrTriesRemaining(@Nullable Integer triesRemaining) {
-    savedState.set(STATE_SVR_TRIES_REMAINING, triesRemaining);
-  }
-
-  public void setRecoveryPassword(@Nullable String recoveryPassword) {
-    savedState.set(STATE_RECOVERY_PASSWORD, recoveryPassword);
-  }
-
-  public @Nullable String getRecoveryPassword() {
-    return savedState.get(STATE_RECOVERY_PASSWORD);
-  }
-
-  public LiveData<Long> getLockedTimeRemaining() {
-    return savedState.getLiveData(STATE_TIME_REMAINING, 0L);
-  }
-
-  public LiveData<Long> getCanCallAtTime() {
-    return savedState.getLiveData(STATE_CAN_CALL_AT_TIME, 0L);
-  }
-
-  public LiveData<Long> getCanSmsAtTime() {
-    return savedState.getLiveData(STATE_CAN_SMS_AT_TIME, 0L);
-  }
-
-  public void setLockedTimeRemaining(long lockedTimeRemaining) {
-    savedState.set(STATE_TIME_REMAINING, lockedTimeRemaining);
-  }
-
-  public void setCanCallAtTime(long callingTimestamp) {
-    savedState.getLiveData(STATE_CAN_CALL_AT_TIME).postValue(callingTimestamp);
-  }
-
-  public void setCanSmsAtTime(long smsTimestamp) {
-    savedState.getLiveData(STATE_CAN_SMS_AT_TIME).postValue(smsTimestamp);
-  }
-
-  public Single<RegistrationSessionProcessor> requestVerificationCode(@NonNull Mode mode, @Nullable String mcc, @Nullable String mnc) {
-
-    final String e164 = getNumber().getE164Number();
-
-    return getValidSession(e164, mcc, mnc)
-        .flatMap(processor -> {
-          if (!processor.hasResult()) {
-            return Single.just(processor);
-          }
-
-          String sessionId = processor.getSessionId();
-          setSessionId(sessionId);
-          setSessionE164(e164);
-
-          return handleRequiredChallenges(processor, e164);
-        })
-        .flatMap(processor -> {
-          if (!processor.hasResult()) {
-            return Single.just(processor);
-          }
-
-          if (!processor.isAllowedToRequestCode()) {
-            return Single.just(processor);
-          }
-
-          String sessionId = processor.getSessionId();
-          clearCaptchaResponse();
-          return verifyAccountRepository.requestVerificationCode(sessionId,
-                                                                 getNumber().getE164Number(),
-                                                                 getRegistrationSecret(),
-                                                                 mode)
-                                        .map(RegistrationSessionProcessor.RegistrationSessionProcessorForVerification::new);
-        })
-        .observeOn(AndroidSchedulers.mainThread())
-        .doOnSuccess((RegistrationSessionProcessor processor) -> {
-          if (processor.hasResult() && processor.isAllowedToRequestCode()) {
-            setCanSmsAtTime(processor.getNextCodeViaSmsAttempt());
-            setCanCallAtTime(processor.getNextCodeViaCallAttempt());
-          }
-        });
-  }
-
-  public Single<RegistrationSessionProcessor.RegistrationSessionProcessorForSession> validateSession(String e164) {
-    String storedSessionId = null;
-    if (e164.equals(getSessionE164())) {
-      storedSessionId = getSessionId();
-    }
-    return verifyAccountRepository.validateSession(storedSessionId, e164, getRegistrationSecret())
-                                  .map(RegistrationSessionProcessor.RegistrationSessionProcessorForSession::new);
-  }
-
-  public Single<RegistrationSessionProcessor.RegistrationSessionProcessorForSession> getValidSession(String e164, @Nullable String mcc, @Nullable String mnc) {
-    return validateSession(e164)
-        .flatMap(processor -> {
-          if (processor.isInvalidSession()) {
-            return verifyAccountRepository.requestValidSession(e164, getRegistrationSecret(), mcc, mnc)
-                                          .map(RegistrationSessionProcessor.RegistrationSessionProcessorForSession::new)
-                                          .doOnSuccess(createSessionProcessor -> {
-                                            if (createSessionProcessor.pushChallengeTimedOut()) {
-                                              Log.w(TAG, "Registration push challenge timed out.");
-                                              markPushChallengeTimedOut();
-                                            }
-                                          });
-          } else {
-            return Single.just(processor);
-          }
-        });
-  }
-
-  public Single<RegistrationSessionProcessor> handleRequiredChallenges(RegistrationSessionProcessor processor, String e164) {
-    final String sessionId = processor.getSessionId();
-
-    if (processor.isAllowedToRequestCode()) {
-      Log.d(TAG, "All challenges satisfied.");
-      return Single.just(processor);
-    }
-
-    if (hasCaptchaToken() && processor.captchaRequired(getExcludedChallenges())) {
-      Log.d(TAG, "Submitting completed captcha challenge");
-      final String captcha = Objects.requireNonNull(getCaptchaToken());
-      clearCaptchaResponse();
-      return verifyAccountRepository.verifyCaptcha(sessionId, captcha, e164, getRegistrationSecret())
-                                    .map(RegistrationSessionProcessor.RegistrationSessionProcessorForSession::new);
-    } else {
-      String challenge = processor.getChallenge(getExcludedChallenges());
-      Log.d(TAG, "Handling challenge of type " + challenge);
-      if (challenge != null) {
-        switch (challenge) {
-          case RegistrationSessionProcessor.PUSH_CHALLENGE_KEY:
-            return verifyAccountRepository.requestAndVerifyPushToken(sessionId,
-                                                                     getNumber().getE164Number(),
-                                                                     getRegistrationSecret())
-                                          .map(RegistrationSessionProcessor.RegistrationSessionProcessorForSession::new);
-
-          case RegistrationSessionProcessor.CAPTCHA_KEY:
-            // fall through to passing the processor back so that the eventual subscriber will check captchaRequired() and handle accordingly
-          default:
-            break;
-        }
-      }
-    }
-
-    return Single.just(processor);
-  }
-
-  public Single<VerifyResponseProcessor> verifyCodeWithoutRegistrationLock(@NonNull String code) {
-    onVerificationCodeEntered(code);
-
-    return verifyAccountWithoutRegistrationLock()
-        .flatMap(response -> {
-          if (response.getResult().isPresent() && response.getResult().get().getMasterKey() != null) {
-            return onVerifySuccessWithRegistrationLock(new VerifyResponseWithRegistrationLockProcessor(response, null), response.getResult().get().getPin());
-          }
-
-          VerifyResponseProcessor processor = new VerifyResponseWithoutKbs(response);
-          if (processor.hasResult()) {
-            return onVerifySuccess(processor);
-          } else if (processor.registrationLock() && !processor.isRegistrationLockPresentAndSvrExhausted()) {
-            return Single.just(new VerifyResponseHitRegistrationLock(processor.getResponse()));
-          }
-          return Single.just(processor);
-        })
-        .observeOn(AndroidSchedulers.mainThread())
-        .doOnSuccess(processor -> {
-          if (processor.registrationLock() && !processor.isRegistrationLockPresentAndSvrExhausted()) {
-            setLockedTimeRemaining(processor.getLockedException().getTimeRemaining());
-            setSvrTriesRemaining(processor.getSvrTriesRemaining());
-            setSvrAuthCredentials(processor.getSvrAuthCredentials());
-          } else if (processor.isRegistrationLockPresentAndSvrExhausted()) {
-            setLockedTimeRemaining(processor.getLockedException().getTimeRemaining());
-          }
-        });
-  }
-
-  public Single<VerifyResponseWithRegistrationLockProcessor> verifyCodeAndRegisterAccountWithRegistrationLock(@NonNull String pin) {
-    SvrAuthCredentialSet authCredentials = Objects.requireNonNull(getSvrAuthCredentials());
-
-    return verifyAccountWithRegistrationLock(pin, authCredentials)
-        .map(r -> new VerifyResponseWithRegistrationLockProcessor(r, authCredentials))
-        .flatMap(processor -> {
-          if (processor.hasResult()) {
-            return onVerifySuccessWithRegistrationLock(processor, pin);
-          } else if (processor.wrongPin()) {
-            return Single.just(new VerifyResponseWithRegistrationLockProcessor(processor.getResponse(), authCredentials));
-          }
-          return Single.just(processor);
-        })
-        .observeOn(AndroidSchedulers.mainThread())
-        .doOnSuccess(processor -> {
-          if (processor.wrongPin()) {
-            setSvrTriesRemaining(processor.getSvrTriesRemaining());
-          }
-        });
-  }
-
-  protected abstract Single<ServiceResponse<VerifyResponse>> verifyAccountWithoutRegistrationLock();
-
-  protected abstract Single<ServiceResponse<VerifyResponse>> verifyAccountWithRegistrationLock(@NonNull String pin, @NonNull SvrAuthCredentialSet svrAuthCredentials);
-
-  protected abstract Single<VerifyResponseProcessor> onVerifySuccess(@NonNull VerifyResponseProcessor processor);
-
-  protected abstract Single<VerifyResponseWithRegistrationLockProcessor> onVerifySuccessWithRegistrationLock(@NonNull VerifyResponseWithRegistrationLockProcessor processor, String pin);
-
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/LocalCodeRequestRateLimiter.java b/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/LocalCodeRequestRateLimiter.java
deleted file mode 100644
index 4e8780f22d..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/LocalCodeRequestRateLimiter.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.thoughtcrime.securesms.registration.viewmodel;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import androidx.annotation.MainThread;
-import androidx.annotation.NonNull;
-
-import org.thoughtcrime.securesms.registration.VerifyAccountRepository.Mode;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-public final class LocalCodeRequestRateLimiter implements Parcelable {
-
-  private final long            timePeriod;
-  private final Map<Mode, Data> dataMap;
-
-  public LocalCodeRequestRateLimiter(long timePeriod) {
-    this.timePeriod = timePeriod;
-    this.dataMap    = new HashMap<>();
-  }
-
-  @MainThread
-  public boolean canRequest(@NonNull Mode mode, @NonNull String e164Number, long currentTime) {
-    Data data = dataMap.get(mode);
-
-    return data == null || !data.limited(e164Number, currentTime);
-  }
-
-  /**
-   * Call this when the server has returned that it was successful in requesting a code via the specified mode.
-   */
-  @MainThread
-  public void onSuccessfulRequest(@NonNull Mode mode, @NonNull String e164Number, long currentTime) {
-    dataMap.put(mode, new Data(e164Number, currentTime + timePeriod));
-  }
-
-  /**
-   * Call this if a mode was unsuccessful in sending.
-   */
-  @MainThread
-  public void onUnsuccessfulRequest() {
-    dataMap.clear();
-  }
-
-  static class Data {
-
-    final String e164Number;
-    final long   limitedUntil;
-
-    Data(@NonNull String e164Number, long limitedUntil) {
-      this.e164Number   = e164Number;
-      this.limitedUntil = limitedUntil;
-    }
-
-    boolean limited(String e164Number, long currentTime) {
-      return this.e164Number.equals(e164Number) && currentTime < limitedUntil;
-    }
-  }
-
-  public static final Creator<LocalCodeRequestRateLimiter> CREATOR = new Creator<LocalCodeRequestRateLimiter>() {
-    @Override
-    public LocalCodeRequestRateLimiter createFromParcel(Parcel in) {
-      long timePeriod         = in.readLong();
-      int  numberOfMapEntries = in.readInt();
-
-      LocalCodeRequestRateLimiter localCodeRequestRateLimiter = new LocalCodeRequestRateLimiter(timePeriod);
-
-      for (int i = 0; i < numberOfMapEntries; i++) {
-        Mode   mode         = Mode.values()[in.readInt()];
-        String e164Number   = in.readString();
-        long   limitedUntil = in.readLong();
-
-        localCodeRequestRateLimiter.dataMap.put(mode, new Data(Objects.requireNonNull(e164Number), limitedUntil));
-      }
-      return localCodeRequestRateLimiter;
-    }
-
-    @Override
-    public LocalCodeRequestRateLimiter[] newArray(int size) {
-      return new LocalCodeRequestRateLimiter[size];
-    }
-  };
-
-  @Override
-  public int describeContents() {
-    return 0;
-  }
-
-  @Override
-  public void writeToParcel(Parcel dest, int flags) {
-    dest.writeLong(timePeriod);
-    dest.writeInt(dataMap.size());
-
-    for (Map.Entry<Mode, Data> a : dataMap.entrySet()) {
-      dest.writeInt(a.getKey().ordinal());
-      dest.writeString(a.getValue().e164Number);
-      dest.writeLong(a.getValue().limitedUntil);
-    }
-  }
-}
-
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/ReRegisterWithPinViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/ReRegisterWithPinViewModel.kt
deleted file mode 100644
index 9b10098372..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/ReRegisterWithPinViewModel.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.thoughtcrime.securesms.registration.viewmodel
-
-import androidx.lifecycle.ViewModel
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Observable
-import io.reactivex.rxjava3.subjects.BehaviorSubject
-
-/**
- * Used during re-registration flow when pin entry is required to skip SMS verification. Mostly tracks
- * guesses remaining in both the local and remote check flows.
- */
-class ReRegisterWithPinViewModel : ViewModel() {
-  var isLocalVerification: Boolean = false
-    private set
-
-  var hasIncorrectGuess: Boolean = false
-
-  private val _triesRemaining: BehaviorSubject<Int> = BehaviorSubject.createDefault(10)
-  val triesRemaining: Observable<Int> = _triesRemaining.observeOn(AndroidSchedulers.mainThread())
-
-  fun updateSvrTriesRemaining(triesRemaining: Int?) {
-    if (triesRemaining == null) {
-      isLocalVerification = true
-      if (hasIncorrectGuess) {
-        _triesRemaining.onNext((_triesRemaining.value!! - 1).coerceAtLeast(0))
-      }
-    } else {
-      _triesRemaining.onNext(triesRemaining)
-    }
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java
deleted file mode 100644
index 9be0e0badc..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java
+++ /dev/null
@@ -1,492 +0,0 @@
-package org.thoughtcrime.securesms.registration.viewmodel;
-
-import androidx.annotation.MainThread;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.WorkerThread;
-import androidx.lifecycle.AbstractSavedStateViewModelFactory;
-import androidx.lifecycle.SavedStateHandle;
-import androidx.lifecycle.ViewModel;
-import androidx.savedstate.SavedStateRegistryOwner;
-
-import org.signal.core.util.Stopwatch;
-import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobs.ReclaimUsernameAndLinkJob;
-import org.thoughtcrime.securesms.jobs.StorageAccountRestoreJob;
-import org.thoughtcrime.securesms.jobs.StorageSyncJob;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.pin.SvrWrongPinException;
-import org.thoughtcrime.securesms.pin.SvrRepository;
-import org.thoughtcrime.securesms.registration.LinkDeviceRepository;
-import org.thoughtcrime.securesms.registration.LinkDeviceRepository.LinkDeviceProgressProcessor;
-import org.thoughtcrime.securesms.registration.LinkDeviceRepository.NewDeviceRegistrationReturnProcessor;
-import org.thoughtcrime.securesms.registration.RegistrationData;
-import org.thoughtcrime.securesms.registration.RegistrationRepository;
-import org.thoughtcrime.securesms.registration.RegistrationSessionProcessor;
-import org.thoughtcrime.securesms.registration.VerifyAccountRepository;
-import org.thoughtcrime.securesms.registration.VerifyResponse;
-import org.thoughtcrime.securesms.registration.VerifyResponseProcessor;
-import org.thoughtcrime.securesms.registration.VerifyResponseWithRegistrationLockProcessor;
-import org.thoughtcrime.securesms.registration.VerifyResponseWithoutKbs;
-import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.thoughtcrime.securesms.util.Util;
-import org.whispersystems.signalservice.api.SvrNoDataException;
-import org.whispersystems.signalservice.api.kbs.MasterKey;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
-import org.whispersystems.signalservice.api.kbs.PinHashUtil;
-import org.whispersystems.signalservice.api.push.exceptions.IncorrectCodeException;
-import org.whispersystems.signalservice.api.push.exceptions.IncorrectRegistrationRecoveryPasswordException;
-import org.whispersystems.signalservice.internal.ServiceResponse;
-import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse;
-import org.signal.core.util.Base64;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.core.Single;
-import io.reactivex.rxjava3.schedulers.Schedulers;
-
-public final class RegistrationViewModel extends BaseRegistrationViewModel {
-
-  private static final String TAG = Log.tag(RegistrationViewModel.class);
-
-  private static final String STATE_FCM_TOKEN          = "FCM_TOKEN";
-  private static final String STATE_RESTORE_FLOW_SHOWN = "RESTORE_FLOW_SHOWN";
-  private static final String STATE_IS_REREGISTER      = "IS_REREGISTER";
-  private static final String STATE_BACKUP_COMPLETED   = "BACKUP_COMPLETED";
-  private static final String STATE_DEVICE_NAME        = "DEVICE_NAME_ENTERED";
-
-  private final RegistrationRepository registrationRepository;
-  private final LinkDeviceRepository linkDeviceRepository;
-
-  private boolean userSkippedReRegisterFlow = false;
-  private boolean autoShowSmsConfirmDialog = false;
-
-  public RegistrationViewModel(@NonNull SavedStateHandle savedStateHandle,
-                               boolean isReregister,
-                               @NonNull VerifyAccountRepository verifyAccountRepository,
-                               @NonNull RegistrationRepository registrationRepository,
-                               @NonNull LinkDeviceRepository linkDeviceRepository)
-  {
-    super(savedStateHandle, verifyAccountRepository, Util.getSecret(18));
-
-    this.registrationRepository = registrationRepository;
-    this.linkDeviceRepository   = linkDeviceRepository;
-
-    setInitialDefaultValue(STATE_RESTORE_FLOW_SHOWN, false);
-    setInitialDefaultValue(STATE_BACKUP_COMPLETED, false);
-    setInitialDefaultValue(STATE_DEVICE_NAME, "");
-
-    this.savedState.set(STATE_IS_REREGISTER, isReregister);
-  }
-
-  public boolean isReregister() {
-    //noinspection ConstantConditions
-    return savedState.get(STATE_IS_REREGISTER);
-  }
-
-  public void onNumberDetected(int countryCode, String nationalNumber) {
-    setViewState(getNumber().toBuilder()
-                            .countryCode(countryCode)
-                            .nationalNumber(nationalNumber)
-                            .build());
-  }
-
-  public @Nullable String getFcmToken() {
-    String token = savedState.get(STATE_FCM_TOKEN);
-    if (token == null || token.isEmpty()) {
-      return null;
-    }
-    return token;
-  }
-
-  @MainThread
-  public void setFcmToken(@Nullable String fcmToken) {
-    savedState.set(STATE_FCM_TOKEN, fcmToken);
-  }
-
-  public void setWelcomeSkippedOnRestore() {
-    savedState.set(STATE_RESTORE_FLOW_SHOWN, true);
-  }
-
-  public boolean hasRestoreFlowBeenShown() {
-    //noinspection ConstantConditions
-    return savedState.get(STATE_RESTORE_FLOW_SHOWN);
-  }
-
-  public void setIsReregister(boolean isReregister) {
-    savedState.set(STATE_IS_REREGISTER, isReregister);
-  }
-
-  public void markBackupCompleted() {
-    savedState.set(STATE_BACKUP_COMPLETED, true);
-  }
-
-  public boolean hasBackupCompleted() {
-    Boolean completed = savedState.get(STATE_BACKUP_COMPLETED);
-    return completed != null ? completed : false;
-  }
-
-  public boolean hasUserSkippedReRegisterFlow() {
-    return userSkippedReRegisterFlow;
-  }
-
-  public void setUserSkippedReRegisterFlow(boolean userSkippedReRegisterFlow) {
-    Log.i(TAG, "User skipped re-register flow.");
-    this.userSkippedReRegisterFlow = userSkippedReRegisterFlow;
-    if (userSkippedReRegisterFlow) {
-      setAutoShowSmsConfirmDialog(true);
-    }
-  }
-
-  public @NonNull String getDeviceName() {
-    //noinspection ConstantConditions
-    return savedState.get(STATE_DEVICE_NAME);
-  }
-
-  public void setDeviceName(@NonNull String deviceName) {
-    savedState.set(STATE_DEVICE_NAME, deviceName);
-  }
-
-  public boolean shouldAutoShowSmsConfirmDialog() {
-    return autoShowSmsConfirmDialog;
-  }
-
-  public void setAutoShowSmsConfirmDialog(boolean autoShowSmsConfirmDialog) {
-    this.autoShowSmsConfirmDialog = autoShowSmsConfirmDialog;
-  }
-
-  public Single<LinkDeviceProgressProcessor> requestDeviceLinkCode() {
-    return linkDeviceRepository.requestDeviceLinkCode(getRegistrationData(), getDeviceName());
-  }
-
-  public Single<NewDeviceRegistrationReturnProcessor> attemptDeviceLink(LinkDeviceRepository.LinkDeviceProgress progress) {
-    return linkDeviceRepository.attemptDeviceLink(progress)
-                               .flatMap(processor -> {
-                                 if (processor.hasResult()) {
-                                   return registrationRepository.registerAccountFromPrimaryDevice(getRegistrationData(), processor.getResult())
-                                                                .map(LinkDeviceRepository.NewDeviceRegistrationReturnProcessor::new);
-                                 }
-                                 return Single.just(processor.asNewDeviceRegistrationReturnProcessor());
-                               });
-  }
-
-  @Override
-  protected Single<ServiceResponse<VerifyResponse>> verifyAccountWithoutRegistrationLock() {
-    final String sessionId = getSessionId();
-    if (sessionId == null) {
-      throw new IllegalStateException("No valid registration session");
-    }
-    return verifyAccountRepository.verifyAccount(sessionId, getRegistrationData())
-                                  .map(RegistrationSessionProcessor.RegistrationSessionProcessorForVerification::new)
-                                  .observeOn(AndroidSchedulers.mainThread())
-                                  .doOnSuccess(processor -> {
-                                    if (processor.hasResult()) {
-                                      setCanSmsAtTime(processor.getNextCodeViaSmsAttempt());
-                                      setCanCallAtTime(processor.getNextCodeViaCallAttempt());
-                                    }
-                                  })
-                                  .observeOn(Schedulers.io())
-                                  .flatMap(processor -> {
-                                    if (processor.isAlreadyVerified() || (processor.hasResult() && processor.isVerified())) {
-                                      return verifyAccountRepository.registerAccount(sessionId, getRegistrationData(), null, null);
-                                    } else if (processor.getError() == null) {
-                                      return Single.just(ServiceResponse.<VerifyResponse>forApplicationError(new IncorrectCodeException(), 403, null));
-                                    } else {
-                                      return Single.just(ServiceResponse.<VerifyResponse, RegistrationSessionMetadataResponse>coerceError(processor.getResponse()));
-                                    }
-                                  })
-                                  .flatMap(verifyAccountWithoutKbsResponse -> {
-                                    VerifyResponseProcessor processor = new VerifyResponseWithoutKbs(verifyAccountWithoutKbsResponse);
-                                    String                  pin       = SignalStore.svr().getPin();
-
-                                    if ((processor.isRegistrationLockPresentAndSvrExhausted() || processor.registrationLock()) && SignalStore.svr().getRegistrationLockToken() != null && pin != null) {
-                                      return verifyAccountRepository.registerAccount(sessionId, getRegistrationData(), pin, () -> SignalStore.svr().getOrCreateMasterKey())
-                                                                    .map(verifyAccountWithPinResponse -> {
-                                                                      if (verifyAccountWithPinResponse.getResult().isPresent() && verifyAccountWithPinResponse.getResult().get().getMasterKey() != null) {
-                                                                        return verifyAccountWithPinResponse;
-                                                                      } else {
-                                                                        return verifyAccountWithoutKbsResponse;
-                                                                      }
-                                                                    });
-                                    } else {
-                                      return Single.just(verifyAccountWithoutKbsResponse);
-                                    }
-                                  })
-                                  .onErrorReturn(ServiceResponse::forUnknownError);
-  }
-
-  @Override
-  protected Single<ServiceResponse<VerifyResponse>> verifyAccountWithRegistrationLock(@NonNull String pin, @NonNull SvrAuthCredentialSet svrAuthCredentials) {
-    final String sessionId = getSessionId();
-    if (sessionId == null) {
-      throw new IllegalStateException("No valid registration session");
-    }
-    return verifyAccountRepository.verifyAccount(sessionId, getRegistrationData())
-                                  .map(RegistrationSessionProcessor.RegistrationSessionProcessorForVerification::new)
-                                  .doOnSuccess(processor -> {
-                                    if (processor.hasResult()) {
-                                      setCanSmsAtTime(processor.getNextCodeViaSmsAttempt());
-                                      setCanCallAtTime(processor.getNextCodeViaCallAttempt());
-                                    }
-                                  })
-                                  .<ServiceResponse<VerifyResponse>>flatMap(processor -> {
-                                    if (processor.isAlreadyVerified() || (processor.hasResult() && processor.isVerified())) {
-                                      return verifyAccountRepository.registerAccount(sessionId, getRegistrationData(), pin, () -> SvrRepository.restoreMasterKeyPreRegistration(svrAuthCredentials, pin));
-                                    } else {
-                                      return Single.just(ServiceResponse.coerceError(processor.getResponse()));
-                                    }
-                                  })
-                                  .onErrorReturn(ServiceResponse::forUnknownError);
-  }
-
-  @Override
-  protected Single<VerifyResponseProcessor> onVerifySuccess(@NonNull VerifyResponseProcessor processor) {
-    return registrationRepository.registerAccount(getRegistrationData(), processor.getResult(), false)
-                                 .map(VerifyResponseWithoutKbs::new);
-  }
-
-  @Override
-  protected Single<VerifyResponseWithRegistrationLockProcessor> onVerifySuccessWithRegistrationLock(@NonNull VerifyResponseWithRegistrationLockProcessor processor, String pin) {
-    return registrationRepository.registerAccount(getRegistrationData(), processor.getResult(), true)
-                                 .map(processor::updatedIfRegistrationFailed);
-  }
-
-  private RegistrationData getRegistrationData() {
-    return new RegistrationData(getTextCodeEntered(),
-                                getNumber().getE164Number(),
-                                getRegistrationSecret(),
-                                registrationRepository.getRegistrationId(),
-                                registrationRepository.getProfileKey(getNumber().getE164Number()),
-                                getFcmToken(),
-                                registrationRepository.getPniRegistrationId(),
-                                getSessionId() != null ? null : getRecoveryPassword());
-  }
-
-  public @NonNull Single<VerifyResponseProcessor> verifyReRegisterWithPin(@NonNull String pin) {
-    return Single.fromCallable(() -> verifyReRegisterWithPinInternal(pin))
-                 .subscribeOn(Schedulers.io())
-                 .observeOn(Schedulers.io())
-                 .flatMap(data -> {
-                   if (data.canProceed) {
-                     return updateFcmTokenValue().subscribeOn(Schedulers.io())
-                                                 .observeOn(Schedulers.io())
-                                                 .onErrorReturnItem("")
-                                                 .flatMap(s -> verifyReRegisterWithRecoveryPassword(pin, data.masterKey));
-                   } else {
-                     throw new IncorrectRegistrationRecoveryPasswordException();
-                   }
-                 })
-                 .onErrorReturn(t -> new VerifyResponseWithRegistrationLockProcessor(ServiceResponse.forUnknownError(t), getSvrAuthCredentials()))
-                 .map(p -> {
-                   if (p instanceof VerifyResponseWithRegistrationLockProcessor) {
-                     VerifyResponseWithRegistrationLockProcessor lockProcessor = (VerifyResponseWithRegistrationLockProcessor) p;
-                     if (lockProcessor.wrongPin() && lockProcessor.getSvrTriesRemaining() != null) {
-                       return new VerifyResponseWithRegistrationLockProcessor(lockProcessor.getResponse(), lockProcessor.getSvrAuthCredentials());
-                     }
-                   }
-
-                   return p;
-                 })
-                 .doOnSuccess(p -> {
-                   if (p.hasResult()) {
-                     restoreFromStorageService();
-                   }
-                 })
-                 .observeOn(AndroidSchedulers.mainThread());
-  }
-
-  @WorkerThread
-  private @NonNull ReRegistrationData verifyReRegisterWithPinInternal(@NonNull String pin)
-      throws SvrWrongPinException, IOException, SvrNoDataException
-  {
-    String localPinHash = SignalStore.svr().getLocalPinHash();
-
-    if (hasRecoveryPassword() && localPinHash != null) {
-      if (PinHashUtil.verifyLocalPinHash(localPinHash, pin)) {
-        Log.i(TAG, "Local pin matches input, attempting registration");
-        return ReRegistrationData.canProceed(SignalStore.svr().getOrCreateMasterKey());
-      } else {
-        throw new SvrWrongPinException(0);
-      }
-    } else {
-      SvrAuthCredentialSet authCredentials = getSvrAuthCredentials();
-      if (authCredentials == null) {
-        Log.w(TAG, "No SVR auth credentials, abort skip flow");
-        return ReRegistrationData.cannotProceed();
-      }
-
-      MasterKey masterKey = SvrRepository.restoreMasterKeyPreRegistration(authCredentials, pin);
-
-      setRecoveryPassword(masterKey.deriveRegistrationRecoveryPassword());
-      setSvrTriesRemaining(10);
-      return ReRegistrationData.canProceed(masterKey);
-    }
-  }
-
-  private Single<VerifyResponseProcessor> verifyReRegisterWithRecoveryPassword(@NonNull String pin, @NonNull MasterKey masterKey) {
-    RegistrationData registrationData = getRegistrationData();
-    if (registrationData.getRecoveryPassword() == null) {
-      throw new IllegalStateException("No valid recovery password");
-    }
-
-    return verifyAccountRepository.registerAccount(null, registrationData, null, null)
-                                  .observeOn(Schedulers.io())
-                                  .onErrorReturn(ServiceResponse::forUnknownError)
-                                  .map(VerifyResponseWithoutKbs::new)
-                                  .flatMap(processor -> {
-                                    if (processor.registrationLock()) {
-                                      setSvrAuthCredentials(processor.getSvrAuthCredentials());
-                                      return verifyAccountRepository.registerAccount(null, registrationData, pin, () -> masterKey)
-                                                                    .onErrorReturn(ServiceResponse::forUnknownError)
-                                                                    .map(r -> new VerifyResponseWithRegistrationLockProcessor(r, processor.getSvrAuthCredentials()));
-                                    } else {
-                                      return Single.just(processor);
-                                    }
-                                  })
-                                  .flatMap(processor -> {
-                                    if (processor.hasResult()) {
-                                      VerifyResponse verifyResponse             = processor.getResult();
-                                      boolean        setRegistrationLockEnabled = verifyResponse.getMasterKey() != null;
-
-                                      if (!setRegistrationLockEnabled) {
-                                        verifyResponse = new VerifyResponse(processor.getResult().getVerifyAccountResponse(), masterKey, pin, verifyResponse.getAciPreKeyCollection(), verifyResponse.getPniPreKeyCollection());
-                                      }
-
-                                      return registrationRepository.registerAccount(registrationData, verifyResponse, setRegistrationLockEnabled)
-                                                                   .map(r -> new VerifyResponseWithRegistrationLockProcessor(r, getSvrAuthCredentials()));
-                                    } else {
-                                      return Single.just(processor);
-                                    }
-                                  });
-  }
-
-  public @NonNull Single<Boolean> canEnterSkipSmsFlow() {
-    if (userSkippedReRegisterFlow) {
-      Log.d(TAG, "User skipped re-register flow.");
-      return Single.just(false);
-    }
-
-    Log.d(TAG, "Querying if user can enter skip SMS flow.");
-    return Single.just(hasRecoveryPassword())
-                 .flatMap(hasRecoveryPassword -> {
-                   Log.i(TAG, "Checking if user has existing recovery password: " + hasRecoveryPassword);
-                   if (hasRecoveryPassword) {
-                     return Single.just(true);
-                   } else {
-                     return checkForValidSvrAuthCredentials();
-                   }
-                 });
-  }
-
-  private Single<Boolean> checkForValidSvrAuthCredentials() {
-    final List<String> svrAuthTokenList = SignalStore.svr().getAuthTokenList();
-    List<String> usernamePasswords = svrAuthTokenList
-        .stream()
-        .limit(10)
-        .map(t -> {
-          try {
-            return new String(Base64.decode(t.replace("Basic ", "").trim()), StandardCharsets.ISO_8859_1);
-          } catch (IOException e) {
-            return null;
-          }
-        })
-        .collect(Collectors.toList());
-
-    if (usernamePasswords.isEmpty()) {
-      Log.d(TAG, "No valid SVR tokens in local store.");
-      return Single.just(false);
-    }
-
-    Log.d(TAG, "Valid tokens in local store, validating with SVR.");
-    return registrationRepository.getSvrAuthCredential(getRegistrationData(), usernamePasswords)
-                                 .flatMap(p -> {
-                                   if (p.hasValidSvr2AuthCredential()) {
-                                     Log.d(TAG, "Saving valid SVR2 auth credential.");
-                                     setSvrAuthCredentials(new SvrAuthCredentialSet(null, p.requireSvr2AuthCredential()));
-                                     return Single.just(true);
-                                   } else {
-                                     Log.d(TAG, "SVR2 response contained no valid SVR2 auth credentials.");
-                                     return Single.just(false);
-                                   }
-                                 })
-                                 .onErrorReturnItem(false)
-                                 .observeOn(AndroidSchedulers.mainThread());
-  }
-
-  public Single<String> updateFcmTokenValue() {
-    return verifyAccountRepository.getFcmToken().observeOn(AndroidSchedulers.mainThread()).doOnSuccess(this::setFcmToken);
-  }
-
-  private void restoreFromStorageService() {
-    SignalStore.onboarding().clearAll();
-
-    Stopwatch stopwatch = new Stopwatch("ReRegisterRestore");
-
-    ApplicationDependencies.getJobManager().runSynchronously(new StorageAccountRestoreJob(), StorageAccountRestoreJob.LIFESPAN);
-    stopwatch.split("AccountRestore");
-
-    ApplicationDependencies
-        .getJobManager()
-        .startChain(new StorageSyncJob())
-        .then(new ReclaimUsernameAndLinkJob())
-        .enqueueAndBlockUntilCompletion(TimeUnit.SECONDS.toMillis(10));
-    stopwatch.split("ContactRestore");
-
-    try {
-      FeatureFlags.refreshSync();
-    } catch (IOException e) {
-      Log.w(TAG, "Failed to refresh flags.", e);
-    }
-    stopwatch.split("FeatureFlags");
-
-    stopwatch.stop(TAG);
-  }
-
-  private boolean hasRecoveryPassword() {
-    return getRecoveryPassword() != null && Objects.equals(getRegistrationData().getE164(), SignalStore.account().getE164());
-  }
-
-  private static class ReRegistrationData {
-    public boolean   canProceed;
-    public MasterKey masterKey;
-
-    private ReRegistrationData(boolean canProceed, @Nullable MasterKey masterKey) {
-      this.canProceed = canProceed;
-      this.masterKey  = masterKey;
-    }
-
-    public static ReRegistrationData cannotProceed() {
-      return new ReRegistrationData(false, null);
-    }
-
-    public static ReRegistrationData canProceed(@NonNull MasterKey masterKey) {
-      return new ReRegistrationData(true, masterKey);
-    }
-  }
-
-  public static final class Factory extends AbstractSavedStateViewModelFactory {
-    private final boolean isReregister;
-
-    public Factory(@NonNull SavedStateRegistryOwner owner, boolean isReregister) {
-      super(owner, null);
-      this.isReregister = isReregister;
-    }
-
-    @Override
-    protected @NonNull <T extends ViewModel> T create(@NonNull String key, @NonNull Class<T> modelClass, @NonNull SavedStateHandle handle) {
-      //noinspection ConstantConditions
-      return modelClass.cast(new RegistrationViewModel(handle,
-                                                       isReregister,
-                                                       new VerifyAccountRepository(ApplicationDependencies.getApplication()),
-                                                       new RegistrationRepository(ApplicationDependencies.getApplication()),
-                                                       new LinkDeviceRepository(ApplicationDependencies.getApplication())));
-    }
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/SvrAuthCredentialSet.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/SvrAuthCredentialSet.kt
index 74af655131..fda7aab653 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/SvrAuthCredentialSet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/SvrAuthCredentialSet.kt
@@ -7,20 +7,24 @@ package org.thoughtcrime.securesms.registration.viewmodel
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
+import org.whispersystems.signalservice.api.svr.Svr3Credentials
 import org.whispersystems.signalservice.internal.push.AuthCredentials
 
 @Parcelize
 data class SvrAuthCredentialSet(
-  private val svr1Credentials: ParcelableAuthCredentials?,
-  private val svr2Credentials: ParcelableAuthCredentials?
+  private val svr2Credentials: ParcelableAuthCredentials?,
+  private val svr3Credentials: ParcelableSvr3AuthCredentials?
 ) : Parcelable {
   constructor(
-    svr1Credentials: AuthCredentials?,
-    svr2Credentials: AuthCredentials?
-  ) : this(ParcelableAuthCredentials.createOrNull(svr1Credentials), ParcelableAuthCredentials.createOrNull(svr2Credentials))
+    svr2Credentials: AuthCredentials?,
+    svr3Credentials: Svr3Credentials?
+  ) : this(
+    ParcelableAuthCredentials.createOrNull(svr2Credentials),
+    ParcelableSvr3AuthCredentials.createOrNull(svr3Credentials)
+  )
 
-  val svr1: AuthCredentials? = svr1Credentials?.credentials()
   val svr2: AuthCredentials? = svr2Credentials?.credentials()
+  val svr3: Svr3Credentials? = svr3Credentials?.credentials()
 
   @Parcelize
   data class ParcelableAuthCredentials(private val username: String, private val password: String) : Parcelable {
@@ -39,4 +43,22 @@ data class SvrAuthCredentialSet(
       return AuthCredentials.create(username, password)
     }
   }
+
+  @Parcelize
+  data class ParcelableSvr3AuthCredentials(private val username: String, private val password: String, private val shareSet: ByteArray?) : Parcelable {
+
+    companion object {
+      fun createOrNull(creds: Svr3Credentials?): ParcelableSvr3AuthCredentials? {
+        return if (creds != null) {
+          ParcelableSvr3AuthCredentials(creds.username, creds.password, creds.shareSet)
+        } else {
+          null
+        }
+      }
+    }
+
+    fun credentials(): Svr3Credentials {
+      return Svr3Credentials(username, password, shareSet)
+    }
+  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/releasechannel/ReleaseChannel.kt b/app/src/main/java/org/thoughtcrime/securesms/releasechannel/ReleaseChannel.kt
index 1d5a9b861e..5c4de0662d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/releasechannel/ReleaseChannel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/releasechannel/ReleaseChannel.kt
@@ -29,7 +29,7 @@ object ReleaseChannel {
     mediaWidth: Int = 0,
     mediaHeight: Int = 0,
     mediaType: String = "image/webp",
-    serverUuid: String? = UUID.randomUUID().toString(),
+    mediaAttachmentUuid: UUID? = UUID.randomUUID(),
     messageRanges: BodyRangeList? = null,
     storyType: StoryType = StoryType.NONE
   ): MessageTable.InsertResult? {
@@ -52,7 +52,8 @@ object ReleaseChannel {
         MediaUtil.isVideo(mediaType),
         Optional.empty(),
         Optional.empty(),
-        System.currentTimeMillis()
+        System.currentTimeMillis(),
+        mediaAttachmentUuid
       )
 
       Optional.of(listOf(attachment))
@@ -68,7 +69,7 @@ object ReleaseChannel {
       receivedTimeMillis = System.currentTimeMillis(),
       body = body,
       attachments = PointerAttachment.forPointers(attachments),
-      serverGuid = serverUuid,
+      serverGuid = UUID.randomUUID().toString(),
       messageRanges = messageRanges,
       storyType = storyType
     )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt
index fea5fb263b..70a236c45f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt
@@ -9,19 +9,26 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.viewModels
+import androidx.navigation.findNavController
 import org.signal.core.util.getParcelableExtraCompat
 import org.thoughtcrime.securesms.BaseActivity
 import org.thoughtcrime.securesms.PassphraseRequiredActivity
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.registration.ui.restore.RemoteRestoreActivity
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
 
 /**
  * Activity to hold the restore from backup flow.
  */
 class RestoreActivity : BaseActivity() {
 
+  private val dynamicTheme = DynamicNoActionBarTheme()
   private val sharedViewModel: RestoreViewModel by viewModels()
 
   override fun onCreate(savedInstanceState: Bundle?) {
+    dynamicTheme.onCreate(this)
     super.onCreate(savedInstanceState)
 
     setResult(RESULT_CANCELED)
@@ -30,6 +37,18 @@ class RestoreActivity : BaseActivity() {
     intent.getParcelableExtraCompat(PassphraseRequiredActivity.NEXT_INTENT_EXTRA, Intent::class.java)?.let {
       sharedViewModel.setNextIntent(it)
     }
+
+    val navTarget = NavTarget.deserialize(intent.getIntExtra(EXTRA_NAV_TARGET, NavTarget.NONE.value))
+    when (navTarget) {
+      NavTarget.LOCAL_RESTORE -> findNavController(R.id.nav_host_fragment).navigate(R.id.choose_local_backup_fragment)
+      NavTarget.TRANSFER -> findNavController(R.id.nav_host_fragment).navigate(R.id.newDeviceTransferInstructions)
+      else -> Unit
+    }
+  }
+
+  override fun onResume() {
+    super.onResume()
+    dynamicTheme.onResume(this)
   }
 
   fun finishActivitySuccessfully() {
@@ -38,8 +57,41 @@ class RestoreActivity : BaseActivity() {
   }
 
   companion object {
+
+    enum class NavTarget(val value: Int) {
+      NONE(0),
+      TRANSFER(1),
+      LOCAL_RESTORE(2);
+
+      companion object {
+        fun deserialize(value: Int): NavTarget {
+          return values().firstOrNull { it.value == value } ?: NONE
+        }
+      }
+    }
+
+    private const val EXTRA_NAV_TARGET = "nav_target"
+
+    @JvmStatic
+    fun getIntentForTransfer(context: Context): Intent {
+      return Intent(context, RestoreActivity::class.java).apply {
+        putExtra(EXTRA_NAV_TARGET, NavTarget.TRANSFER.value)
+      }
+    }
+
+    @JvmStatic
+    fun getIntentForLocalRestore(context: Context): Intent {
+      return Intent(context, RestoreActivity::class.java).apply {
+        putExtra(EXTRA_NAV_TARGET, NavTarget.LOCAL_RESTORE.value)
+      }
+    }
+
     @JvmStatic
-    fun getIntentForRestore(context: Context): Intent {
+    fun getIntentForTransferOrRestore(context: Context): Intent {
+      val tier = SignalStore.backup.backupTier
+      if (tier == MessageBackupTier.PAID) {
+        return Intent(context, RemoteRestoreActivity::class.java)
+      }
       return Intent(context, RestoreActivity::class.java)
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreRepository.kt
index a919d0a279..b324333d12 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/RestoreRepository.kt
@@ -20,6 +20,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.service.LocalBackupListener
 import org.thoughtcrime.securesms.util.BackupUtil
+import org.thoughtcrime.securesms.util.BackupUtil.BackupInfo
 import java.io.IOException
 
 /**
@@ -28,8 +29,13 @@ import java.io.IOException
 object RestoreRepository {
   private val TAG = Log.tag(RestoreRepository.javaClass)
 
-  suspend fun getLocalBackupFromUri(context: Context, uri: Uri): BackupUtil.BackupInfo? = withContext(Dispatchers.IO) {
-    BackupUtil.getBackupInfoFromSingleUri(context, uri)
+  suspend fun getLocalBackupFromUri(context: Context, uri: Uri): BackupInfoResult = withContext(Dispatchers.IO) {
+    try {
+      return@withContext BackupInfoResult(backupInfo = BackupUtil.getBackupInfoFromSingleUri(context, uri), failureCause = null, failure = false)
+    } catch (ex: BackupUtil.BackupFileException) {
+      Log.w(TAG, "Encountered error while trying to read backup!", ex)
+      return@withContext BackupInfoResult(backupInfo = null, failureCause = ex, failure = true)
+    }
   }
 
   suspend fun restoreBackupAsynchronously(context: Context, backupFileUri: Uri, passphrase: String): BackupImportResult = withContext(Dispatchers.IO) {
@@ -60,7 +66,7 @@ object RestoreRepository {
 
       if (BackupUtil.canUserAccessBackupDirectory(context)) {
         LocalBackupListener.setNextBackupTimeToIntervalFromNow(context)
-        SignalStore.settings().isBackupEnabled = true
+        SignalStore.settings.isBackupEnabled = true
         LocalBackupListener.schedule(context)
       }
 
@@ -88,4 +94,6 @@ object RestoreRepository {
     FAILURE_FOREIGN_KEY,
     FAILURE_UNKNOWN
   }
+
+  data class BackupInfoResult(val backupInfo: BackupInfo?, val failureCause: BackupUtil.BackupFileException?, val failure: Boolean)
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/choosebackup/ChooseBackupV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/choosebackup/ChooseBackupFragment.kt
similarity index 87%
rename from app/src/main/java/org/thoughtcrime/securesms/restore/choosebackup/ChooseBackupV2Fragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/restore/choosebackup/ChooseBackupFragment.kt
index 51a0caa594..5c56cbb979 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/restore/choosebackup/ChooseBackupV2Fragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/choosebackup/ChooseBackupFragment.kt
@@ -21,7 +21,7 @@ import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.ViewBinderDelegate
-import org.thoughtcrime.securesms.databinding.FragmentChooseBackupV2Binding
+import org.thoughtcrime.securesms.databinding.FragmentChooseBackupBinding
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate
 import org.thoughtcrime.securesms.restore.RestoreViewModel
@@ -30,9 +30,9 @@ import org.thoughtcrime.securesms.util.navigation.safeNavigate
 /**
  * This fragment presents a button to the user to browse their local file system for a legacy backup file.
  */
-class ChooseBackupV2Fragment : LoggingFragment(R.layout.fragment_choose_backup_v2) {
+class ChooseBackupFragment : LoggingFragment(R.layout.fragment_choose_backup) {
   private val sharedViewModel by activityViewModels<RestoreViewModel>()
-  private val binding: FragmentChooseBackupV2Binding by ViewBinderDelegate(FragmentChooseBackupV2Binding::bind)
+  private val binding: FragmentChooseBackupBinding by ViewBinderDelegate(FragmentChooseBackupBinding::bind)
 
   private val pickMedia = registerForActivityResult(BackupFileContract()) {
     if (it != null) {
@@ -57,7 +57,7 @@ class ChooseBackupV2Fragment : LoggingFragment(R.layout.fragment_choose_backup_v
 
   private fun onUserChoseBackupFile(backupFileUri: Uri) {
     sharedViewModel.setBackupFileUri(backupFileUri)
-    NavHostFragment.findNavController(this).safeNavigate(ChooseBackupV2FragmentDirections.actionChooseLocalBackupFragmentToRestoreLocalBackupFragment())
+    NavHostFragment.findNavController(this).safeNavigate(ChooseBackupFragmentDirections.actionChooseLocalBackupFragmentToRestoreLocalBackupFragment())
   }
 
   private class BackupFileContract : ActivityResultContracts.GetContent() {
@@ -65,13 +65,13 @@ class ChooseBackupV2Fragment : LoggingFragment(R.layout.fragment_choose_backup_v
       return super.createIntent(context, input).apply {
         putExtra(Intent.EXTRA_LOCAL_ONLY, true)
         if (Build.VERSION.SDK_INT >= 26) {
-          putExtra(DocumentsContract.EXTRA_INITIAL_URI, SignalStore.settings().latestSignalBackupDirectory)
+          putExtra(DocumentsContract.EXTRA_INITIAL_URI, SignalStore.settings.latestSignalBackupDirectory)
         }
       }
     }
   }
 
   companion object {
-    private val TAG = Log.tag(ChooseBackupV2Fragment::class.java)
+    private val TAG = Log.tag(ChooseBackupFragment::class.java)
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/devicetransfer/DeviceTransferV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/devicetransfer/DeviceTransferFragment.kt
similarity index 95%
rename from app/src/main/java/org/thoughtcrime/securesms/restore/devicetransfer/DeviceTransferV2Fragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/restore/devicetransfer/DeviceTransferFragment.kt
index 3d23650d45..4e511edf63 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/restore/devicetransfer/DeviceTransferV2Fragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/devicetransfer/DeviceTransferFragment.kt
@@ -19,15 +19,15 @@ import org.signal.devicetransfer.TransferStatus
 import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.ViewBinderDelegate
-import org.thoughtcrime.securesms.databinding.FragmentDeviceTransferV2Binding
+import org.thoughtcrime.securesms.databinding.FragmentDeviceTransferBinding
 import org.thoughtcrime.securesms.restore.RestoreViewModel
 import org.thoughtcrime.securesms.util.visible
 
-sealed class DeviceTransferV2Fragment : LoggingFragment(R.layout.fragment_device_transfer_v2) {
+sealed class DeviceTransferFragment : LoggingFragment(R.layout.fragment_device_transfer) {
   private val onBackPressed = OnBackPressed()
   private val transferModeListener = TransferModeListener()
   protected val navigationViewModel: RestoreViewModel by activityViewModels()
-  protected val binding: FragmentDeviceTransferV2Binding by ViewBinderDelegate(FragmentDeviceTransferV2Binding::bind)
+  protected val binding: FragmentDeviceTransferBinding by ViewBinderDelegate(FragmentDeviceTransferBinding::bind)
 
   protected var transferFinished: Boolean = false
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/restorecomplete/RestoreCompleteV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/restorecomplete/RestoreCompleteFragment.kt
similarity index 81%
rename from app/src/main/java/org/thoughtcrime/securesms/restore/restorecomplete/RestoreCompleteV2Fragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/restore/restorecomplete/RestoreCompleteFragment.kt
index 2aa6f67135..44b1979a77 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/restore/restorecomplete/RestoreCompleteV2Fragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/restorecomplete/RestoreCompleteFragment.kt
@@ -10,7 +10,6 @@ import android.view.View
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.restore.RestoreActivity
 
 /**
@@ -19,7 +18,7 @@ import org.thoughtcrime.securesms.restore.RestoreActivity
  * This approximates that by taking the place of [EnterPhoneNumberFragment],
  * then bridging us back to [RegistrationV2Activity] by immediately closing the [RestoreActivity].
  */
-class RestoreCompleteV2Fragment : LoggingFragment(R.layout.fragment_registration_blank) {
+class RestoreCompleteFragment : LoggingFragment(R.layout.fragment_registration_blank) {
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
@@ -29,12 +28,11 @@ class RestoreCompleteV2Fragment : LoggingFragment(R.layout.fragment_registration
 
   private fun onBackupCompletedSuccessfully() {
     Log.d(TAG, "onBackupCompletedSuccessfully()")
-    SignalStore.internalValues().setForceEnterRestoreV2Flow(false)
     val activity = requireActivity() as RestoreActivity
     activity.finishActivitySuccessfully()
   }
 
   companion object {
-    private val TAG = Log.tag(RestoreCompleteV2Fragment::class.java)
+    private val TAG = Log.tag(RestoreCompleteFragment::class.java)
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/PassphraseAsYouTypeFormatter.java b/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/PassphraseAsYouTypeFormatter.java
new file mode 100644
index 0000000000..5bfa875390
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/PassphraseAsYouTypeFormatter.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.restore.restorelocalbackup;
+
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.text.Editable;
+import android.text.Spanned;
+import android.text.TextWatcher;
+import android.text.style.ReplacementSpan;
+
+import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.util.BackupUtil;
+
+public class PassphraseAsYouTypeFormatter implements TextWatcher {
+
+  private static final int GROUP_SIZE = 5;
+
+  @Override
+  public void afterTextChanged(Editable editable) {
+    removeSpans(editable);
+
+    addSpans(editable);
+  }
+
+  private static void removeSpans(Editable editable) {
+    SpaceSpan[] paddingSpans = editable.getSpans(0, editable.length(), SpaceSpan.class);
+
+    for (SpaceSpan span : paddingSpans) {
+      editable.removeSpan(span);
+    }
+  }
+
+  private static void addSpans(Editable editable) {
+    final int length = editable.length();
+
+    for (int i = GROUP_SIZE; i < length; i += GROUP_SIZE) {
+      editable.setSpan(new SpaceSpan(), i - 1, i, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+    }
+
+    if (editable.length() > BackupUtil.PASSPHRASE_LENGTH) {
+      editable.delete(BackupUtil.PASSPHRASE_LENGTH, editable.length());
+    }
+  }
+
+  @Override
+  public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+  }
+
+  @Override
+  public void onTextChanged(CharSequence s, int start, int before, int count) {
+  }
+
+  /**
+   * A {@link ReplacementSpan} adds a small space after a single character.
+   * Based on https://stackoverflow.com/a/51949578
+   */
+  private static class SpaceSpan extends ReplacementSpan {
+
+    @Override
+    public int getSize(@NonNull Paint paint, CharSequence text, int start, int end, Paint.FontMetricsInt fm) {
+      return (int) (paint.measureText(text, start, end) * 1.7f);
+    }
+
+    @Override
+    public void draw(@NonNull Canvas canvas, CharSequence text, int start, int end, float x, int top, int y, int bottom, @NonNull Paint paint) {
+      canvas.drawText(text.subSequence(start, end).toString(), x, y, paint);
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupFragment.kt
index 1a22c4471c..3b092babee 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupFragment.kt
@@ -10,8 +10,10 @@ import android.view.LayoutInflater
 import android.view.View
 import android.widget.EditText
 import android.widget.Toast
+import androidx.annotation.StringRes
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
@@ -21,13 +23,13 @@ import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.backup.BackupEvent
 import org.thoughtcrime.securesms.components.ViewBinderDelegate
-import org.thoughtcrime.securesms.databinding.FragmentRestoreLocalBackupV2Binding
+import org.thoughtcrime.securesms.databinding.FragmentRestoreLocalBackupBinding
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView
-import org.thoughtcrime.securesms.registration.fragments.RestoreBackupFragment.PassphraseAsYouTypeFormatter
 import org.thoughtcrime.securesms.restore.RestoreActivity
 import org.thoughtcrime.securesms.restore.RestoreRepository
 import org.thoughtcrime.securesms.restore.RestoreViewModel
+import org.thoughtcrime.securesms.util.BackupUtil
 import org.thoughtcrime.securesms.util.DateUtils
 import org.thoughtcrime.securesms.util.Util
 import org.thoughtcrime.securesms.util.ViewModelFactory
@@ -38,7 +40,7 @@ import java.util.Locale
 /**
  * This fragment is used to monitor and manage an in-progress backup restore.
  */
-class RestoreLocalBackupFragment : LoggingFragment(R.layout.fragment_restore_local_backup_v2) {
+class RestoreLocalBackupFragment : LoggingFragment(R.layout.fragment_restore_local_backup) {
   private val navigationViewModel: RestoreViewModel by activityViewModels()
   private val restoreLocalBackupViewModel: RestoreLocalBackupViewModel by viewModels(
     factoryProducer = ViewModelFactory.factoryProducer {
@@ -46,23 +48,38 @@ class RestoreLocalBackupFragment : LoggingFragment(R.layout.fragment_restore_loc
       RestoreLocalBackupViewModel(fileBackupUri)
     }
   )
-  private val binding: FragmentRestoreLocalBackupV2Binding by ViewBinderDelegate(FragmentRestoreLocalBackupV2Binding::bind)
+  private val binding: FragmentRestoreLocalBackupBinding by ViewBinderDelegate(FragmentRestoreLocalBackupBinding::bind)
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
     setDebugLogSubmitMultiTapView(binding.verifyHeader)
     Log.i(TAG, "Backup restore.")
 
+    if (navigationViewModel.getBackupFileUri() == null) {
+      Log.i(TAG, "No backup URI found, must navigate back to choose one.")
+      findNavController().navigateUp()
+      return
+    }
+
     binding.restoreButton.setOnClickListener { presentBackupPassPhrasePromptDialog() }
 
-    // TODO [regv2]: check for re-register and skip ahead to phone number entry
+    binding.cancelLocalRestoreButton.setOnClickListener {
+      findNavController().navigateUp()
+    }
 
-    if (SignalStore.settings().isBackupEnabled) {
+    if (SignalStore.settings.isBackupEnabled) {
       Log.i(TAG, "Backups enabled, so a backup must have been previously restored.")
       onBackupCompletedSuccessfully()
       return
     }
 
+    restoreLocalBackupViewModel.backupReadError.observe(viewLifecycleOwner) { fileState ->
+      fileState?.let {
+        restoreLocalBackupViewModel.clearBackupFileStateError()
+        handleBackupFileStateError(it)
+      }
+    }
+
     restoreLocalBackupViewModel.uiState.observe(viewLifecycleOwner) { fragmentState ->
       fragmentState.backupInfo?.let {
         presentBackupFileInfo(backupSize = it.size, backupTimestamp = it.timestamp)
@@ -73,9 +90,11 @@ class RestoreLocalBackupFragment : LoggingFragment(R.layout.fragment_restore_loc
       } else {
         presentProgressEnded()
       }
+    }
 
-      if (fragmentState.backupRestoreComplete) {
-        val importResult = fragmentState.backupImportResult
+    restoreLocalBackupViewModel.backupComplete.observe(viewLifecycleOwner) {
+      if (it.first) {
+        val importResult = it.second
         if (importResult == null) {
           onBackupCompletedSuccessfully()
         } else {
@@ -89,7 +108,6 @@ class RestoreLocalBackupFragment : LoggingFragment(R.layout.fragment_restore_loc
 
   private fun onBackupCompletedSuccessfully() {
     Log.d(TAG, "onBackupCompletedSuccessfully()")
-    SignalStore.internalValues().setForceEnterRestoreV2Flow(false)
     val activity = requireActivity() as RestoreActivity
     navigationViewModel.getNextIntent()?.let {
       Log.d(TAG, "Launching ${it.component}")
@@ -113,6 +131,18 @@ class RestoreLocalBackupFragment : LoggingFragment(R.layout.fragment_restore_loc
     restoreLocalBackupViewModel.onBackupProgressUpdate(event)
   }
 
+  private fun handleBackupFileStateError(fileState: BackupUtil.BackupFileState) {
+    @StringRes
+    val errorResId: Int = when (fileState) {
+      BackupUtil.BackupFileState.READABLE -> throw AssertionError("Unexpected error state.")
+      BackupUtil.BackupFileState.NOT_FOUND -> R.string.RestoreBackupFragment__backup_not_found
+      BackupUtil.BackupFileState.NOT_READABLE -> R.string.RestoreBackupFragment__backup_has_a_bad_extension
+      BackupUtil.BackupFileState.UNSUPPORTED_FILE_EXTENSION -> R.string.RestoreBackupFragment__backup_could_not_be_read
+    }
+
+    Toast.makeText(requireContext(), errorResId, Toast.LENGTH_LONG).show()
+  }
+
   private fun handleBackupImportError(importResult: RestoreRepository.BackupImportResult) {
     when (importResult) {
       RestoreRepository.BackupImportResult.FAILURE_VERSION_DOWNGRADE -> Toast.makeText(requireContext(), R.string.RegistrationActivity_backup_failure_downgrade, Toast.LENGTH_LONG).show()
@@ -125,7 +155,7 @@ class RestoreLocalBackupFragment : LoggingFragment(R.layout.fragment_restore_loc
   private fun presentProgressEnded() {
     binding.restoreButton.cancelSpinning()
     binding.cancelLocalRestoreButton.visible = true
-    binding.backupProgressText.text = ""
+    binding.backupProgressText.text = null
   }
 
   private fun presentRestoreProgress(backupProgressCount: Long) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupState.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupState.kt
index fbf2305fe0..f62af42146 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupState.kt
@@ -7,6 +7,7 @@ package org.thoughtcrime.securesms.restore.restorelocalbackup
 
 import android.net.Uri
 import org.thoughtcrime.securesms.restore.RestoreRepository
+import org.thoughtcrime.securesms.util.BackupUtil
 import org.thoughtcrime.securesms.util.BackupUtil.BackupInfo
 
 /**
@@ -15,6 +16,7 @@ import org.thoughtcrime.securesms.util.BackupUtil.BackupInfo
 data class RestoreLocalBackupState(
   val uri: Uri,
   val backupInfo: BackupInfo? = null,
+  val backupFileStateError: BackupUtil.BackupFileState? = null,
   val backupPassphrase: String = "",
   val restoreInProgress: Boolean = false,
   val backupVerifyingInProgress: Boolean = false,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupViewModel.kt
index 20c9f3f9b3..ee6cc891a8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupViewModel.kt
@@ -11,6 +11,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import org.signal.core.util.logging.Log
@@ -24,19 +25,29 @@ class RestoreLocalBackupViewModel(fileBackupUri: Uri) : ViewModel() {
   private val store = MutableStateFlow(RestoreLocalBackupState(fileBackupUri))
   val uiState = store.asLiveData()
 
+  val backupReadError = store.map { it.backupFileStateError }.asLiveData()
+
+  val backupComplete = store.map { Pair(it.backupRestoreComplete, it.backupImportResult) }.asLiveData()
+
   fun prepareRestore(context: Context) {
     val backupFileUri = store.value.uri
     viewModelScope.launch {
-      val backupInfo = RestoreRepository.getLocalBackupFromUri(context, backupFileUri)
+      val result: RestoreRepository.BackupInfoResult = RestoreRepository.getLocalBackupFromUri(context, backupFileUri)
 
-      if (backupInfo == null) {
+      if (result.failure && result.failureCause != null) {
+        store.update {
+          it.copy(
+            backupFileStateError = result.failureCause.state
+          )
+        }
+      } else if (result.backupInfo == null) {
         abort()
         return@launch
       }
 
       store.update {
         it.copy(
-          backupInfo = backupInfo
+          backupInfo = result.backupInfo
         )
       }
     }
@@ -98,6 +109,10 @@ class RestoreLocalBackupViewModel(fileBackupUri: Uri) : ViewModel() {
     }
   }
 
+  fun clearBackupFileStateError() {
+    store.update { it.copy(backupFileStateError = null) }
+  }
+
   companion object {
     private val TAG = Log.tag(RestoreLocalBackupViewModel::class.java)
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/transferorrestore/TransferOrRestoreMoreOptionsDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/transferorrestore/TransferOrRestoreMoreOptionsDialog.kt
new file mode 100644
index 0000000000..3eae9cc613
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/transferorrestore/TransferOrRestoreMoreOptionsDialog.kt
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.restore.transferorrestore
+
+import android.os.Bundle
+import android.view.ContextThemeWrapper
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.os.bundleOf
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.viewModels
+import org.thoughtcrime.securesms.MainActivity
+import org.thoughtcrime.securesms.components.FixedRoundedCornerBottomSheetDialogFragment
+import org.thoughtcrime.securesms.databinding.TransferOrRestoreOptionsBottomSheetDialogFragmentBinding
+import org.thoughtcrime.securesms.devicetransfer.newdevice.BackupRestorationType
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.profiles.edit.CreateProfileActivity
+import org.thoughtcrime.securesms.registration.ui.restore.RemoteRestoreActivity
+import org.thoughtcrime.securesms.restore.RestoreActivity
+import org.thoughtcrime.securesms.util.visible
+
+class TransferOrRestoreMoreOptionsDialog : FixedRoundedCornerBottomSheetDialogFragment() {
+
+  override val peekHeightPercentage: Float = 1f
+
+  private val viewModel by viewModels<TransferOrRestoreViewModel>()
+  private lateinit var binding: TransferOrRestoreOptionsBottomSheetDialogFragmentBinding
+
+  companion object {
+
+    const val TAG = "TRANSFER_OR_RESTORE_OPTIONS_DIALOG_FRAGMENT"
+    const val ARG_SKIP_ONLY = "skip_only"
+
+    fun show(fragmentManager: FragmentManager, skipOnly: Boolean) {
+      TransferOrRestoreMoreOptionsDialog().apply {
+        arguments = bundleOf(ARG_SKIP_ONLY to skipOnly)
+      }.show(fragmentManager, TAG)
+    }
+  }
+
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+    binding = TransferOrRestoreOptionsBottomSheetDialogFragmentBinding.inflate(inflater.cloneInContext(ContextThemeWrapper(inflater.context, themeResId)), container, false)
+    if (arguments?.getBoolean(ARG_SKIP_ONLY, false) ?: false) {
+      binding.transferCard.visible = false
+      binding.localRestoreCard.visible = false
+    }
+    binding.transferOrRestoreFragmentNext.setOnClickListener { launchSelection(viewModel.getBackupRestorationType()) }
+    binding.transferCard.setOnClickListener { viewModel.onTransferFromAndroidDeviceSelected() }
+    binding.localRestoreCard.setOnClickListener { viewModel.onRestoreFromLocalBackupSelected() }
+    binding.skipCard.setOnClickListener { viewModel.onSkipRestoreOrTransferSelected() }
+    binding.cancel.setOnClickListener { dismiss() }
+
+    viewModel.uiState.observe(viewLifecycleOwner) { state ->
+      updateSelection(state.restorationType)
+    }
+
+    return binding.root
+  }
+
+  private fun launchSelection(restorationType: BackupRestorationType?) {
+    when (restorationType) {
+      BackupRestorationType.DEVICE_TRANSFER -> {
+        startActivity(RestoreActivity.getIntentForTransfer(requireContext()))
+      }
+      BackupRestorationType.LOCAL_BACKUP -> {
+        startActivity(RestoreActivity.getIntentForLocalRestore(requireContext()))
+      }
+      BackupRestorationType.REMOTE_BACKUP -> {
+        startActivity(RemoteRestoreActivity.getIntent(requireContext()))
+      }
+      BackupRestorationType.NONE -> {
+        SignalStore.registration.markSkippedTransferOrRestore()
+        val startIntent = MainActivity.clearTop(requireContext()).apply {
+          putExtra("next_intent", CreateProfileActivity.getIntentForUserProfile(requireContext()))
+        }
+        startActivity(startIntent)
+      }
+      else -> {
+        return
+      }
+    }
+    dismiss()
+  }
+
+  private fun updateSelection(restorationType: BackupRestorationType?) {
+    binding.transferCard.isSelected = restorationType == BackupRestorationType.DEVICE_TRANSFER
+    binding.localRestoreCard.isSelected = restorationType == BackupRestorationType.LOCAL_BACKUP
+    binding.skipCard.isSelected = restorationType == BackupRestorationType.NONE
+    binding.transferOrRestoreFragmentNext.isEnabled = restorationType != null
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/transferorrestore/TransferOrRestoreV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/transferorrestore/TransferOrRestoreV2Fragment.kt
index 7622f03771..a2818976a9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/restore/transferorrestore/TransferOrRestoreV2Fragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/transferorrestore/TransferOrRestoreV2Fragment.kt
@@ -7,7 +7,6 @@ package org.thoughtcrime.securesms.restore.transferorrestore
 
 import android.os.Bundle
 import android.view.View
-import android.widget.Toast
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.NavHostFragment
 import org.signal.core.util.logging.Log
@@ -16,9 +15,11 @@ import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.ViewBinderDelegate
 import org.thoughtcrime.securesms.databinding.FragmentTransferRestoreV2Binding
 import org.thoughtcrime.securesms.devicetransfer.newdevice.BackupRestorationType
+import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate
+import org.thoughtcrime.securesms.registration.ui.restore.RemoteRestoreActivity
 import org.thoughtcrime.securesms.restore.RestoreViewModel
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.SpanUtil
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import org.thoughtcrime.securesms.util.visible
@@ -39,11 +40,15 @@ class TransferOrRestoreV2Fragment : LoggingFragment(R.layout.fragment_transfer_r
     binding.transferOrRestoreFragmentRestoreRemote.setOnClickListener { sharedViewModel.onRestoreFromRemoteBackupSelected() }
     binding.transferOrRestoreFragmentNext.setOnClickListener { launchSelection(sharedViewModel.getBackupRestorationType()) }
     binding.transferOrRestoreFragmentMoreOptions.setOnClickListener {
-      Log.w(TAG, "Not yet implemented!", NotImplementedError()) // TODO [regv2]
+      TransferOrRestoreMoreOptionsDialog.show(fragmentManager = childFragmentManager, skipOnly = true)
     }
 
-    binding.transferOrRestoreFragmentRestoreRemoteCard.visible = FeatureFlags.messageBackups()
-    binding.transferOrRestoreFragmentMoreOptions.visible = FeatureFlags.messageBackups()
+    if (SignalStore.backup.backupTier == null) {
+      binding.transferOrRestoreFragmentRestoreRemoteCard.visible = false
+    }
+
+    binding.transferOrRestoreFragmentRestoreRemoteCard.visible = RemoteConfig.messageBackups
+    binding.transferOrRestoreFragmentMoreOptions.visible = RemoteConfig.messageBackups
 
     val description = getString(R.string.TransferOrRestoreFragment__transfer_your_account_and_messages_from_your_old_android_device)
     val toBold = getString(R.string.TransferOrRestoreFragment__you_need_access_to_your_old_device)
@@ -69,12 +74,10 @@ class TransferOrRestoreV2Fragment : LoggingFragment(R.layout.fragment_transfer_r
         NavHostFragment.findNavController(this).safeNavigate(TransferOrRestoreV2FragmentDirections.actionNewDeviceTransferInstructions())
       }
       BackupRestorationType.LOCAL_BACKUP -> {
-        NavHostFragment.findNavController(this).safeNavigate(TransferOrRestoreV2FragmentDirections.actionTransferOrRestoreToRestore())
+        NavHostFragment.findNavController(this).safeNavigate(TransferOrRestoreV2FragmentDirections.actionTransferOrRestoreToLocalRestore())
       }
       BackupRestorationType.REMOTE_BACKUP -> {
-        // TODO [regv2]
-        Log.w(TAG, "Not yet implemented!", NotImplementedError())
-        Toast.makeText(requireContext(), "Not yet implemented!", Toast.LENGTH_LONG).show()
+        startActivity(RemoteRestoreActivity.getIntent(requireContext()))
       }
       else -> {
         throw IllegalArgumentException()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/transferorrestore/TransferOrRestoreViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/transferorrestore/TransferOrRestoreViewModel.kt
new file mode 100644
index 0000000000..d309c35da1
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/restore/transferorrestore/TransferOrRestoreViewModel.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.restore.transferorrestore
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.asLiveData
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
+import org.thoughtcrime.securesms.devicetransfer.newdevice.BackupRestorationType
+
+class TransferOrRestoreViewModel : ViewModel() {
+
+  private val store = MutableStateFlow(State())
+  val uiState = store.asLiveData()
+
+  fun onSkipRestoreOrTransferSelected() {
+    store.update {
+      it.copy(restorationType = BackupRestorationType.NONE)
+    }
+  }
+
+  fun onTransferFromAndroidDeviceSelected() {
+    store.update {
+      it.copy(restorationType = BackupRestorationType.DEVICE_TRANSFER)
+    }
+  }
+
+  fun onRestoreFromLocalBackupSelected() {
+    store.update {
+      it.copy(restorationType = BackupRestorationType.LOCAL_BACKUP)
+    }
+  }
+
+  fun getBackupRestorationType(): BackupRestorationType? {
+    return store.value.restorationType
+  }
+}
+
+data class State(val restorationType: BackupRestorationType? = null)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageManager.java b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageManager.java
index 944f63adea..4f8dd5f1f6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageManager.java
@@ -13,7 +13,7 @@
 import org.thoughtcrime.securesms.database.AttachmentTable;
 import org.thoughtcrime.securesms.database.MessageTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.service.ExportedBroadcastReceiver;
 import org.thoughtcrime.securesms.service.TimedEventManager;
 
@@ -79,7 +79,7 @@ public static class ViewOnceAlarm extends ExportedBroadcastReceiver {
     @Override
     public void onReceiveUnlock(Context context, Intent intent) {
       Log.d(TAG, "onReceive()");
-      ApplicationDependencies.getViewOnceMessageManager().scheduleIfNecessary();
+      AppDependencies.getViewOnceMessageManager().scheduleIfNecessary();
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageRepository.java b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageRepository.java
index 3b07a8b82e..3e2ee7bcca 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageRepository.java
@@ -10,7 +10,7 @@
 import org.thoughtcrime.securesms.database.NoSuchMessageException;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.MultiDeviceViewedUpdateJob;
 import org.thoughtcrime.securesms.jobs.SendViewedReceiptJob;
 
@@ -34,10 +34,10 @@ void getMessage(long messageId, @NonNull Callback<Optional<MmsMessageRecord>> ca
 
         MessageTable.MarkedMessageInfo info = mmsDatabase.setIncomingMessageViewed(record.getId());
         if (info != null) {
-          ApplicationDependencies.getJobManager().add(new SendViewedReceiptJob(record.getThreadId(),
-                                                                               info.getSyncMessageId().getRecipientId(),
-                                                                               info.getSyncMessageId().getTimetamp(),
-                                                                               info.getMessageId()));
+          AppDependencies.getJobManager().add(new SendViewedReceiptJob(record.getThreadId(),
+                                                                       info.getSyncMessageId().getRecipientId(),
+                                                                       info.getSyncMessageId().getTimetamp(),
+                                                                       info.getMessageId()));
           MultiDeviceViewedUpdateJob.enqueue(Collections.singletonList(info.getSyncMessageId()));
         }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageViewModel.java
index 2ffa223f4b..c93e0f86c1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageViewModel.java
@@ -10,7 +10,7 @@
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.DatabaseObserver;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 
 import java.util.Optional;
 
@@ -28,7 +28,7 @@ private ViewOnceMessageViewModel(long messageId, @NonNull ViewOnceMessageReposit
 
     repository.getMessage(messageId, message -> {
       if (message.isPresent()) {
-        ApplicationDependencies.getDatabaseObserver().registerConversationObserver(message.get().getThreadId(), observer);
+        AppDependencies.getDatabaseObserver().registerConversationObserver(message.get().getThreadId(), observer);
       }
 
       onMessageRetrieved(message);
@@ -41,7 +41,7 @@ private ViewOnceMessageViewModel(long messageId, @NonNull ViewOnceMessageReposit
 
   @Override
   protected void onCleared() {
-    ApplicationDependencies.getDatabaseObserver().unregisterObserver(observer);
+    AppDependencies.getDatabaseObserver().unregisterObserver(observer);
   }
 
   private void onMessageRetrieved(@NonNull Optional<MmsMessageRecord> optionalMessage) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/s3/S3.kt b/app/src/main/java/org/thoughtcrime/securesms/s3/S3.kt
index b89a426fa1..53f5373e2c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/s3/S3.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/s3/S3.kt
@@ -9,7 +9,7 @@ import okio.HashingSink
 import okio.sink
 import org.signal.core.util.Hex
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.util.EncryptedStreamUtils
 import org.thoughtcrime.securesms.util.JsonUtils
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException
@@ -35,7 +35,7 @@ import java.util.regex.Pattern
 object S3 {
   private val TAG = Log.tag(S3::class.java)
 
-  private val okHttpClient = ApplicationDependencies.getSignalOkHttpClient()
+  private val okHttpClient by lazy { AppDependencies.signalOkHttpClient }
 
   const val DYNAMIC_PATH = "/dynamic"
   const val STATIC_PATH = "/static"
@@ -53,10 +53,10 @@ object S3 {
   fun getString(endpoint: String): String {
     getObject(endpoint).use { response ->
       if (!response.isSuccessful) {
-        throw NonSuccessfulResponseCodeException(response.code())
+        throw NonSuccessfulResponseCodeException(response.code)
       }
 
-      return response.body()?.string()?.trim() ?: throw IOException()
+      return response.body?.string()?.trim() ?: throw IOException()
     }
   }
 
@@ -110,13 +110,13 @@ object S3 {
       getObject(endpoint).use { response ->
         if (!response.isSuccessful) {
           return ServiceResponse.forApplicationError(
-            DefaultErrorMapper.getDefault().parseError(response.code()),
-            response.code(),
+            DefaultErrorMapper.getDefault().parseError(response.code),
+            response.code,
             ""
           )
         }
 
-        val source = response.body()?.source()
+        val source = response.body?.source()
 
         val outputStream = ByteArrayOutputStream()
 
@@ -166,7 +166,7 @@ object S3 {
       }
 
       getObject(objectPathOnNetwork).use { response ->
-        val source = response.body()?.source()
+        val source = response.body?.source()
 
         val outputStream: OutputStream = if (doNotEncrypt) {
           FileOutputStream(objectFileOnDisk)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/safety/SafetyNumberBottomSheetRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/safety/SafetyNumberBottomSheetRepository.kt
index a21ed64165..39677d68f5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/safety/SafetyNumberBottomSheetRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/safety/SafetyNumberBottomSheetRepository.kt
@@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.DistributionListId
 import org.thoughtcrime.securesms.database.model.DistributionListRecord
 import org.thoughtcrime.securesms.database.model.IdentityRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.stories.Stories
@@ -28,7 +28,7 @@ class SafetyNumberBottomSheetRepository {
    */
   fun getIdentityRecord(recipientId: RecipientId): Maybe<IdentityRecord> {
     return Single.fromCallable {
-      ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecord(recipientId)
+      AppDependencies.protocolStore.aci().identities().getIdentityRecord(recipientId)
     }.flatMapMaybe {
       if (it.isPresent) {
         Maybe.just(it.get())
@@ -171,7 +171,7 @@ class SafetyNumberBottomSheetRepository {
     val recipientObservables: List<Observable<ResolvedIdentity>> = recipients.map {
       Recipient.observable(it).switchMap { recipient ->
         Observable.fromCallable {
-          val record = ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecord(recipient.id)
+          val record = AppDependencies.protocolStore.aci().identities().getIdentityRecord(recipient.id)
           ResolvedIdentity(recipient, record)
         }
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
index 8e3314b326..eb99ddde74 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
@@ -49,7 +49,7 @@
 import org.signal.libsignal.protocol.util.Pair;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.animation.ResizeAnimation;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.fonts.FontTypefaceProvider;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.mediasend.MediaSendPageFragment;
@@ -592,7 +592,7 @@ public void onBlurFacesToggled(boolean enabled) {
           FaceDetector detector = new AndroidFaceDetector();
 
           Point  size   = model.getOutputSizeMaxWidth(1000);
-          Bitmap render = model.render(ApplicationDependencies.getApplication(), size, new FontTypefaceProvider());
+          Bitmap render = model.render(AppDependencies.getApplication(), size, new FontTypefaceProvider());
           try {
             return new FaceDetectionResult(detector.detect(render), new Point(render.getWidth(), render.getHeight()), inverseCropPosition);
           } finally {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHudV2.kt b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHudV2.kt
index 2b44d72fca..3b8fc26ce6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHudV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHudV2.kt
@@ -189,9 +189,9 @@ class ImageEditorHudV2 @JvmOverloads constructor(
         brushPreview.setThickness(getActiveBrushWidth())
 
         when (currentMode) {
-          Mode.DRAW -> SignalStore.imageEditorValues().setMarkerPercentage(progress)
-          Mode.BLUR -> SignalStore.imageEditorValues().setBlurPercentage(progress)
-          Mode.HIGHLIGHT -> SignalStore.imageEditorValues().setHighlighterPercentage(progress)
+          Mode.DRAW -> SignalStore.imageEditor.setMarkerPercentage(progress)
+          Mode.BLUR -> SignalStore.imageEditor.setBlurPercentage(progress)
+          Mode.HIGHLIGHT -> SignalStore.imageEditor.setHighlighterPercentage(progress)
           else -> Unit
         }
       }
@@ -356,7 +356,7 @@ class ImageEditorHudV2 @JvmOverloads constructor(
   private fun presentModeDraw() {
     drawButton.isSelected = true
     brushToggle.setImageResource(R.drawable.symbol_brush_pen_24)
-    widthSeekBar.progress = SignalStore.imageEditorValues().getMarkerPercentage()
+    widthSeekBar.progress = SignalStore.imageEditor.getMarkerPercentage()
     listener?.onColorChange(getActiveColor())
     updateColorIndicator()
     animateModeChange(
@@ -369,7 +369,7 @@ class ImageEditorHudV2 @JvmOverloads constructor(
   private fun presentModeHighlight() {
     drawButton.isSelected = true
     brushToggle.setImageResource(R.drawable.symbol_brush_highlighter_24)
-    widthSeekBar.progress = SignalStore.imageEditorValues().getHighlighterPercentage()
+    widthSeekBar.progress = SignalStore.imageEditor.getHighlighterPercentage()
     listener?.onColorChange(getActiveColor())
     updateColorIndicator()
     animateModeChange(
@@ -381,7 +381,7 @@ class ImageEditorHudV2 @JvmOverloads constructor(
 
   private fun presentModeBlur() {
     blurButton.isSelected = true
-    widthSeekBar.progress = SignalStore.imageEditorValues().getBlurPercentage()
+    widthSeekBar.progress = SignalStore.imageEditor.getBlurPercentage()
     listener?.onColorChange(getActiveColor())
     updateColorIndicator()
     animateModeChange(
@@ -521,9 +521,9 @@ class ImageEditorHudV2 @JvmOverloads constructor(
     private const val ANIMATION_DURATION = 250L
 
     private val DRAW_WIDTH_BOUNDARIES: Map<Mode, Pair<Float, Float>> = mapOf(
-      Mode.DRAW to SignalStore.imageEditorValues().getMarkerWidthRange(),
-      Mode.HIGHLIGHT to SignalStore.imageEditorValues().getHighlighterWidthRange(),
-      Mode.BLUR to SignalStore.imageEditorValues().getBlurWidthRange()
+      Mode.DRAW to SignalStore.imageEditor.getMarkerWidthRange(),
+      Mode.HIGHLIGHT to SignalStore.imageEditor.getHighlighterWidthRange(),
+      Mode.BLUR to SignalStore.imageEditor.getBlurWidthRange()
     )
 
     private fun withHighlighterAlpha(color: Int): Int {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/VideoEditorPlayButtonLayout.kt b/app/src/main/java/org/thoughtcrime/securesms/scribbles/VideoEditorPlayButtonLayout.kt
index 000aa01e9e..ef79d466df 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/VideoEditorPlayButtonLayout.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/VideoEditorPlayButtonLayout.kt
@@ -32,7 +32,9 @@ class VideoEditorPlayButtonLayout @JvmOverloads constructor(context: Context, at
   fun fadePlayButton() {
     playOverlay.animate()
       .setListener(object : Animator.AnimatorListener {
-        override fun onAnimationEnd(animation: Animator) { playOverlay.visibility = GONE }
+        override fun onAnimationEnd(animation: Animator) {
+          playOverlay.visibility = GONE
+        }
         override fun onAnimationStart(animation: Animator) = Unit
         override fun onAnimationCancel(animation: Animator) = Unit
         override fun onAnimationRepeat(animation: Animator) = Unit
diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/stickers/AnalogClockStickerRenderer.kt b/app/src/main/java/org/thoughtcrime/securesms/scribbles/stickers/AnalogClockStickerRenderer.kt
index 28c9c2e697..c3e3c8a13d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/stickers/AnalogClockStickerRenderer.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/stickers/AnalogClockStickerRenderer.kt
@@ -8,7 +8,7 @@ import org.signal.imageeditor.core.Bounds
 import org.signal.imageeditor.core.RendererContext
 import org.signal.imageeditor.core.SelectableRenderer
 import org.signal.imageeditor.core.renderers.InvalidateableRenderer
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 
 /**
  * Analog clock sticker renderer for the image editor.
@@ -19,7 +19,7 @@ class AnalogClockStickerRenderer
   val style: AnalogClockStickerDrawable.Style = AnalogClockStickerDrawable.Style.STANDARD
 ) : InvalidateableRenderer(), SelectableRenderer, TappableRenderer {
 
-  private val clockStickerDrawable = AnalogClockStickerDrawable(ApplicationDependencies.getApplication())
+  private val clockStickerDrawable = AnalogClockStickerDrawable(AppDependencies.application)
   private val insetBounds = Rect(
     Bounds.FULL_BOUNDS.left.toInt(),
     Bounds.FULL_BOUNDS.top.toInt(),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/stickers/DigitalClockStickerRenderer.kt b/app/src/main/java/org/thoughtcrime/securesms/scribbles/stickers/DigitalClockStickerRenderer.kt
index ea7b86cd33..81b3b3dcfd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/stickers/DigitalClockStickerRenderer.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/stickers/DigitalClockStickerRenderer.kt
@@ -8,7 +8,7 @@ import org.signal.imageeditor.core.Bounds
 import org.signal.imageeditor.core.RendererContext
 import org.signal.imageeditor.core.SelectableRenderer
 import org.signal.imageeditor.core.renderers.InvalidateableRenderer
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 
 /**
  * Analog clock sticker renderer for the image editor.
@@ -19,7 +19,7 @@ class DigitalClockStickerRenderer
   val style: DigitalClockStickerDrawable.Style = DigitalClockStickerDrawable.Style.LIGHT_NO_BG
 ) : InvalidateableRenderer(), SelectableRenderer, TappableRenderer {
 
-  private val clockStickerDrawable = DigitalClockStickerDrawable(ApplicationDependencies.getApplication())
+  private val clockStickerDrawable = DigitalClockStickerDrawable(AppDependencies.application)
   private val insetBounds = Rect(
     Bounds.FULL_BOUNDS.left.toInt(),
     Bounds.FULL_BOUNDS.top.toInt(),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
index c70ca8c52f..f6079499fc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
@@ -32,7 +32,7 @@
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.Util;
@@ -72,7 +72,7 @@ public class SearchRepository {
   private final Executor serialExecutor;
 
   public SearchRepository(@NonNull String noteToSelfTitle) {
-    this.context           = ApplicationDependencies.getApplication().getApplicationContext();
+    this.context           = AppDependencies.getApplication().getApplicationContext();
     this.noteToSelfTitle   = noteToSelfTitle;
     this.searchDatabase    = SignalDatabase.messageSearch();
     this.threadTable       = SignalDatabase.threads();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/AnalyzeDatabaseAlarmListener.kt b/app/src/main/java/org/thoughtcrime/securesms/service/AnalyzeDatabaseAlarmListener.kt
index 779b662e81..c42793233f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/AnalyzeDatabaseAlarmListener.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/AnalyzeDatabaseAlarmListener.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.service
 
 import android.content.Context
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.AnalyzeDatabaseJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.toMillis
@@ -24,21 +24,21 @@ class AnalyzeDatabaseAlarmListener : PersistentAlarmManagerListener() {
   }
 
   override fun getNextScheduledExecutionTime(context: Context): Long {
-    var nextTime = SignalStore.misc().nextDatabaseAnalysisTime
+    var nextTime = SignalStore.misc.nextDatabaseAnalysisTime
 
     if (nextTime == 0L) {
       nextTime = getNextTime()
-      SignalStore.misc().nextDatabaseAnalysisTime = nextTime
+      SignalStore.misc.nextDatabaseAnalysisTime = nextTime
     }
 
     return nextTime
   }
 
   override fun onAlarm(context: Context, scheduledTime: Long): Long {
-    ApplicationDependencies.getJobManager().add(AnalyzeDatabaseJob())
+    AppDependencies.jobManager.add(AnalyzeDatabaseJob())
 
     val nextTime = getNextTime()
-    SignalStore.misc().nextDatabaseAnalysisTime = nextTime
+    SignalStore.misc.nextDatabaseAnalysisTime = nextTime
 
     return nextTime
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/BootReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/service/BootReceiver.java
index b22bf967ef..8dd5db2611 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/BootReceiver.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/BootReceiver.java
@@ -3,13 +3,13 @@
 import android.content.Context;
 import android.content.Intent;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.MessageFetchJob;
 
 public class BootReceiver extends ExportedBroadcastReceiver {
 
   @Override
   public void onReceiveUnlock(Context context, Intent intent) {
-    ApplicationDependencies.getJobManager().add(new MessageFetchJob());
+    AppDependencies.getJobManager().add(new MessageFetchJob());
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/DeletedCallEventManager.kt b/app/src/main/java/org/thoughtcrime/securesms/service/DeletedCallEventManager.kt
index cd35062943..1daa8da37b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/DeletedCallEventManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/DeletedCallEventManager.kt
@@ -7,7 +7,7 @@ import android.content.Intent
 import androidx.annotation.WorkerThread
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import java.util.concurrent.TimeUnit
 
 /**
@@ -64,7 +64,7 @@ class DeletedCallEventManager(
 
     override fun onReceiveUnlock(context: Context?, intent: Intent?) {
       Log.d(TAG, "onReceive()")
-      ApplicationDependencies.getDeletedCallEventManager().scheduleIfNecessary()
+      AppDependencies.deletedCallEventManager.scheduleIfNecessary()
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/DirectoryRefreshListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/DirectoryRefreshListener.java
index f12b810988..a809809999 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/DirectoryRefreshListener.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/DirectoryRefreshListener.java
@@ -2,12 +2,11 @@
 
 
 import android.content.Context;
-import android.content.Intent;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.util.concurrent.TimeUnit;
@@ -22,7 +21,7 @@ protected long getNextScheduledExecutionTime(Context context) {
   @Override
   protected long onAlarm(Context context, long scheduledTime) {
     if (scheduledTime != 0 && SignalStore.account().isRegistered()) {
-      ApplicationDependencies.getJobManager().add(new DirectoryRefreshJob(true));
+      AppDependencies.getJobManager().add(new DirectoryRefreshJob(true));
     }
 
     long newTime;
@@ -31,7 +30,7 @@ protected long onAlarm(Context context, long scheduledTime) {
       newTime = Math.min(System.currentTimeMillis() + TimeUnit.HOURS.toMillis(6),
                          SignalStore.misc().getCdsBlockedUtil());
     } else {
-      newTime = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(FeatureFlags.cdsRefreshIntervalSeconds());
+      newTime = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(RemoteConfig.cdsRefreshIntervalSeconds());
       TextSecurePreferences.setDirectoryRefreshTime(context, newTime);
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/ExpirationListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/ExpirationListener.java
index d860b75002..d8d6499834 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/ExpirationListener.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/ExpirationListener.java
@@ -2,19 +2,18 @@
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
 import org.signal.core.util.PendingIntentFlags;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 
 public class ExpirationListener extends ExportedBroadcastReceiver {
 
   @Override
   public void onReceiveUnlock(Context context, Intent intent) {
-    ApplicationDependencies.getExpiringMessageManager().checkSchedule();
+    AppDependencies.getExpiringMessageManager().checkSchedule();
   }
 
   public static void setAlarm(Context context, long waitTimeMillis) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringStoriesManager.kt b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringStoriesManager.kt
index 69ac4754cc..d169ade7fe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringStoriesManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringStoriesManager.kt
@@ -6,7 +6,7 @@ import android.content.Intent
 import androidx.annotation.WorkerThread
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import java.util.concurrent.TimeUnit
 
@@ -31,7 +31,7 @@ class ExpiringStoriesManager(
 
   @WorkerThread
   override fun getNextClosestEvent(): Event? {
-    val oldestTimestamp = mmsDatabase.getOldestStorySendTimestamp(SignalStore.storyValues().userHasViewedOnboardingStory) ?: return null
+    val oldestTimestamp = mmsDatabase.getOldestStorySendTimestamp(SignalStore.story.userHasViewedOnboardingStory) ?: return null
 
     val timeSinceSend = System.currentTimeMillis() - oldestTimestamp
     val delay = (STORY_LIFESPAN - timeSinceSend).coerceAtLeast(0)
@@ -43,7 +43,7 @@ class ExpiringStoriesManager(
   @WorkerThread
   override fun executeEvent(event: Event) {
     val threshold = System.currentTimeMillis() - STORY_LIFESPAN
-    val deletes = mmsDatabase.deleteStoriesOlderThan(threshold, SignalStore.storyValues().userHasViewedOnboardingStory)
+    val deletes = mmsDatabase.deleteStoriesOlderThan(threshold, SignalStore.story.userHasViewedOnboardingStory)
     Log.i(TAG, "Deleted $deletes stories before $threshold")
   }
 
@@ -65,7 +65,7 @@ class ExpiringStoriesManager(
 
     override fun onReceiveUnlock(context: Context?, intent: Intent?) {
       Log.d(TAG, "onReceive()")
-      ApplicationDependencies.getExpireStoriesManager().scheduleIfNecessary()
+      AppDependencies.expireStoriesManager.scheduleIfNecessary()
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
index 6b0de0c812..5f38b903e3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
@@ -38,7 +38,7 @@
 import org.thoughtcrime.securesms.MainActivity;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
@@ -161,7 +161,7 @@ private void handleCacheKey() {
 
     SignalExecutors.BOUNDED.execute(() -> {
       if (!ApplicationMigrations.isUpdate(KeyCachingService.this)) {
-        ApplicationDependencies.getMessageNotifier().updateNotification(KeyCachingService.this);
+        AppDependencies.getMessageNotifier().updateNotification(KeyCachingService.this);
       }
     });
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/MessageBackupListener.kt b/app/src/main/java/org/thoughtcrime/securesms/service/MessageBackupListener.kt
index e5471aeeb4..534357a0fa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/MessageBackupListener.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/MessageBackupListener.kt
@@ -9,11 +9,12 @@ import android.content.Context
 import org.thoughtcrime.securesms.backup.v2.BackupFrequency
 import org.thoughtcrime.securesms.jobs.BackupMessagesJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.toMillis
 import java.time.LocalDateTime
 import java.util.Random
-import java.util.concurrent.TimeUnit
+import kotlin.time.Duration.Companion.days
+import kotlin.time.Duration.Companion.minutes
 
 class MessageBackupListener : PersistentAlarmManagerListener() {
   override fun shouldScheduleExact(): Boolean {
@@ -21,44 +22,54 @@ class MessageBackupListener : PersistentAlarmManagerListener() {
   }
 
   override fun getNextScheduledExecutionTime(context: Context): Long {
-    return SignalStore.backup().nextBackupTime
+    return SignalStore.backup.nextBackupTime
   }
 
   override fun onAlarm(context: Context, scheduledTime: Long): Long {
-    if (SignalStore.backup().areBackupsEnabled) {
-      BackupMessagesJob.enqueue()
+    if (SignalStore.backup.areBackupsEnabled) {
+      val timeSinceLastSync = System.currentTimeMillis() - SignalStore.backup.lastMediaSyncTime
+      BackupMessagesJob.enqueue(pruneAbandonedRemoteMedia = timeSinceLastSync >= BACKUP_MEDIA_SYNC_INTERVAL || timeSinceLastSync < 0)
     }
     return setNextBackupTimeToIntervalFromNow()
   }
 
   companion object {
-    private val BACKUP_JITTER_WINDOW_SECONDS = Math.toIntExact(TimeUnit.MINUTES.toSeconds(10))
+    private val BACKUP_JITTER_WINDOW_SECONDS = 10.minutes.inWholeSeconds.toInt()
+    private val BACKUP_MEDIA_SYNC_INTERVAL = 7.days.inWholeMilliseconds
 
     @JvmStatic
     fun schedule(context: Context?) {
-      if (FeatureFlags.messageBackups() && SignalStore.backup().areBackupsEnabled) {
+      if (RemoteConfig.messageBackups && SignalStore.backup.areBackupsEnabled) {
         MessageBackupListener().onReceive(context, getScheduleIntent())
       }
     }
 
-    fun setNextBackupTimeToIntervalFromNow(): Long {
-      val now = LocalDateTime.now()
-      val hour = SignalStore.settings().backupHour
-      val minute = SignalStore.settings().backupMinute
+    @JvmStatic
+    fun getNextDailyBackupTimeFromNowWithJitter(now: LocalDateTime, hour: Int, minute: Int, maxJitterSeconds: Int, randomSource: Random = Random()): LocalDateTime {
       var next = now.withHour(hour).withMinute(minute).withSecond(0)
-      val jitter = Random().nextInt(BACKUP_JITTER_WINDOW_SECONDS) - BACKUP_JITTER_WINDOW_SECONDS / 2
-      next.plusSeconds(jitter.toLong())
-      next = when (SignalStore.backup().backupFrequency) {
-        BackupFrequency.DAILY -> next.plusDays(1)
-        BackupFrequency.MANUAL -> next.plusDays(365)
-        BackupFrequency.MONTHLY -> next.plusDays(30)
-        BackupFrequency.WEEKLY -> next.plusDays(7)
-      }
-      if (now.isAfter(next)) {
+
+      val endOfJitterWindowForNow = now.plusSeconds(maxJitterSeconds.toLong() / 2)
+      while (!endOfJitterWindowForNow.isBefore(next)) {
         next = next.plusDays(1)
       }
+
+      val jitter = randomSource.nextInt(maxJitterSeconds) - maxJitterSeconds / 2
+      return next.plusSeconds(jitter.toLong())
+    }
+
+    fun setNextBackupTimeToIntervalFromNow(maxJitterSeconds: Int = BACKUP_JITTER_WINDOW_SECONDS): Long {
+      val now = LocalDateTime.now()
+      val hour = SignalStore.settings.backupHour
+      val minute = SignalStore.settings.backupMinute
+      var next = getNextDailyBackupTimeFromNowWithJitter(now, hour, minute, maxJitterSeconds)
+      next = when (SignalStore.backup.backupFrequency) {
+        BackupFrequency.MANUAL -> next.plusDays(364)
+        BackupFrequency.MONTHLY -> next.plusDays(29)
+        BackupFrequency.WEEKLY -> next.plusDays(6)
+        else -> next
+      }
       val nextTime = next.toMillis()
-      SignalStore.backup().nextBackupTime = nextTime
+      SignalStore.backup.nextBackupTime = nextTime
       return nextTime
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/PendingRetryReceiptManager.java b/app/src/main/java/org/thoughtcrime/securesms/service/PendingRetryReceiptManager.java
index bd7ee1a2ec..ba901cc818 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/PendingRetryReceiptManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/PendingRetryReceiptManager.java
@@ -14,7 +14,7 @@
 import org.thoughtcrime.securesms.database.PendingRetryReceiptCache;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.PendingRetryReceiptModel;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 
 import java.util.concurrent.TimeUnit;
 
@@ -34,7 +34,7 @@ public final class PendingRetryReceiptManager extends TimedEventManager<PendingR
   public PendingRetryReceiptManager(@NonNull Application application) {
     super(application, "PendingRetryReceiptManager");
 
-    this.pendingCache    = ApplicationDependencies.getPendingRetryReceiptCache();
+    this.pendingCache    = AppDependencies.getPendingRetryReceiptCache();
     this.messageDatabase = SignalDatabase.messages();
 
     scheduleIfNecessary();
@@ -93,7 +93,7 @@ public static class PendingRetryReceiptAlarm extends ExportedBroadcastReceiver {
     @Override
     public void onReceiveUnlock(Context context, Intent intent) {
       Log.d(TAG, "onReceive()");
-      ApplicationDependencies.getPendingRetryReceiptManager().scheduleIfNecessary();
+      AppDependencies.getPendingRetryReceiptManager().scheduleIfNecessary();
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/RotateSenderCertificateListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/RotateSenderCertificateListener.java
index 9e2fc54935..979be95ad5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/RotateSenderCertificateListener.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/RotateSenderCertificateListener.java
@@ -2,9 +2,8 @@
 
 
 import android.content.Context;
-import android.content.Intent;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.RotateCertificateJob;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
@@ -21,7 +20,7 @@ protected long getNextScheduledExecutionTime(Context context) {
 
   @Override
   protected long onAlarm(Context context, long scheduledTime) {
-    ApplicationDependencies.getJobManager().add(new RotateCertificateJob());
+    AppDependencies.getJobManager().add(new RotateCertificateJob());
 
     long nextTime = System.currentTimeMillis() + INTERVAL;
     TextSecurePreferences.setUnidentifiedAccessCertificateRotationTime(context, nextTime);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/RotateSignedPreKeyListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/RotateSignedPreKeyListener.java
index c308a432c2..4cd7375e94 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/RotateSignedPreKeyListener.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/RotateSignedPreKeyListener.java
@@ -2,15 +2,11 @@
 
 
 import android.content.Context;
-import android.content.Intent;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobs.PreKeysSyncJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
-import java.util.concurrent.TimeUnit;
-
 public class RotateSignedPreKeyListener extends PersistentAlarmManagerListener {
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/ScheduledMessageManager.kt b/app/src/main/java/org/thoughtcrime/securesms/service/ScheduledMessageManager.kt
index 976d9a60d3..fd8c2f53e6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/ScheduledMessageManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/ScheduledMessageManager.kt
@@ -10,7 +10,7 @@ import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.conversation.ConversationIntents
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.IndividualSendJob
 import org.thoughtcrime.securesms.jobs.PushGroupSendJob
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -56,9 +56,9 @@ class ScheduledMessageManager(
       val expiresIn = SignalDatabase.recipients.getExpiresInSeconds(record.toRecipient.id)
       if (messagesTable.clearScheduledStatus(record.threadId, record.id, expiresIn.seconds.inWholeMilliseconds)) {
         if (record.toRecipient.isPushGroup) {
-          PushGroupSendJob.enqueue(application, ApplicationDependencies.getJobManager(), record.id, record.toRecipient.id, emptySet(), true)
+          PushGroupSendJob.enqueue(application, AppDependencies.jobManager, record.id, record.toRecipient.id, emptySet(), true)
         } else {
-          IndividualSendJob.enqueue(application, ApplicationDependencies.getJobManager(), record.id, record.toRecipient, true)
+          IndividualSendJob.enqueue(application, AppDependencies.jobManager, record.id, record.toRecipient, true)
         }
       } else {
         Log.i(TAG, "messageId=${record.id} was not a scheduled message, ignoring")
@@ -91,7 +91,7 @@ class ScheduledMessageManager(
 
     override fun onReceiveUnlock(context: Context?, intent: Intent?) {
       Log.d(TAG, "onReceive()")
-      ApplicationDependencies.getScheduledMessageManager().scheduleIfNecessary()
+      AppDependencies.scheduledMessageManager.scheduleIfNecessary()
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/TrimThreadsByDateManager.java b/app/src/main/java/org/thoughtcrime/securesms/service/TrimThreadsByDateManager.java
index 8d73e03a7b..1ff82292ec 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/TrimThreadsByDateManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/TrimThreadsByDateManager.java
@@ -11,7 +11,7 @@
 import org.thoughtcrime.securesms.database.MessageTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.ThreadTable;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.KeepMessagesDuration;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 
@@ -85,7 +85,7 @@ public static class TrimThreadsByDateAlarm extends ExportedBroadcastReceiver {
     @Override
     public void onReceiveUnlock(@NonNull Context context, @NonNull Intent intent) {
       Log.d(TAG, "onReceive()");
-      ApplicationDependencies.getTrimThreadsByDateManager().scheduleIfNecessary();
+      AppDependencies.getTrimThreadsByDateManager().scheduleIfNecessary();
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/ActiveCallActionProcessorDelegate.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/ActiveCallActionProcessorDelegate.java
index 57bee95d9b..1ea8000a3c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/ActiveCallActionProcessorDelegate.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/ActiveCallActionProcessorDelegate.java
@@ -10,7 +10,7 @@
 import org.signal.ringrtc.CallException;
 import org.signal.ringrtc.CallId;
 import org.signal.ringrtc.CallManager.CallEvent;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.events.CallParticipant;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
 import org.thoughtcrime.securesms.ringrtc.CallState;
@@ -95,8 +95,8 @@ public ActiveCallActionProcessorDelegate(@NonNull WebRtcInteractor webRtcInterac
       Log.i(tag, "handleLocalHangup(): call_id: " + remotePeer.getCallId());
     }
 
-    ApplicationDependencies.getSignalServiceAccountManager().cancelInFlightRequests();
-    ApplicationDependencies.getSignalServiceMessageSender().cancelInFlightRequests();
+    AppDependencies.getSignalServiceAccountManager().cancelInFlightRequests();
+    AppDependencies.getSignalServiceMessageSender().cancelInFlightRequests();
 
     try {
       webRtcInteractor.getCallManager().hangup();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/ActiveCallManager.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/ActiveCallManager.kt
index 04828a7e2e..c4f47e18a1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/ActiveCallManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/ActiveCallManager.kt
@@ -28,7 +28,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.core.util.PendingIntentFlags
 import org.signal.core.util.ThreadUtil
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.UnableToStartException
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -81,12 +81,12 @@ class ActiveCallManager(
 
     @JvmStatic
     fun denyCall() {
-      ApplicationDependencies.getSignalCallManager().denyCall()
+      AppDependencies.signalCallManager.denyCall()
     }
 
     @JvmStatic
     fun hangup() {
-      ApplicationDependencies.getSignalCallManager().localHangup()
+      AppDependencies.signalCallManager.localHangup()
     }
 
     @JvmStatic
@@ -132,7 +132,7 @@ class ActiveCallManager(
     }
   }
 
-  private val callManager = ApplicationDependencies.getSignalCallManager()
+  private val callManager = AppDependencies.signalCallManager
 
   private var networkReceiver: NetworkReceiver? = null
   private var powerButtonReceiver: PowerButtonReceiver? = null
@@ -357,7 +357,7 @@ class ActiveCallManager(
       }
 
       private fun hangup() {
-        ApplicationDependencies.getSignalCallManager().localHangup()
+        AppDependencies.signalCallManager.localHangup()
       }
     }
   }
@@ -372,8 +372,8 @@ class ActiveCallManager(
     override fun onReceive(context: Context?, intent: Intent?) {
       Log.d(TAG, "action: ${intent?.action}")
       when (intent?.action) {
-        ACTION_DENY -> ApplicationDependencies.getSignalCallManager().denyCall()
-        ACTION_HANGUP -> ApplicationDependencies.getSignalCallManager().localHangup()
+        ACTION_DENY -> AppDependencies.signalCallManager.denyCall()
+        ACTION_HANGUP -> AppDependencies.signalCallManager.localHangup()
       }
     }
   }
@@ -402,13 +402,13 @@ class ActiveCallManager(
     fun stop() {
       keepRunning = false
       ThreadUtil.cancelRunnableOnMain(this)
-      ApplicationDependencies.getIncomingMessageObserver().removeKeepAliveToken(WEBSOCKET_KEEP_ALIVE_TOKEN)
+      AppDependencies.incomingMessageObserver.removeKeepAliveToken(WEBSOCKET_KEEP_ALIVE_TOKEN)
     }
 
     @MainThread
     override fun run() {
       if (keepRunning) {
-        ApplicationDependencies.getIncomingMessageObserver().registerKeepAliveToken(WEBSOCKET_KEEP_ALIVE_TOKEN)
+        AppDependencies.incomingMessageObserver.registerKeepAliveToken(WEBSOCKET_KEEP_ALIVE_TOKEN)
         ThreadUtil.runOnMainDelayed(this, REQUEST_WEBSOCKET_STAY_OPEN_DELAY.inWholeMilliseconds)
       }
     }
@@ -419,7 +419,7 @@ class ActiveCallManager(
       val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
       val activeNetworkInfo = connectivityManager.activeNetworkInfo
 
-      ApplicationDependencies.getSignalCallManager().apply {
+      AppDependencies.signalCallManager.apply {
         networkChange(activeNetworkInfo != null && activeNetworkInfo.isConnected)
         dataModeUpdate()
       }
@@ -429,7 +429,7 @@ class ActiveCallManager(
   private class PowerButtonReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
       if (Intent.ACTION_SCREEN_OFF == intent.action) {
-        ApplicationDependencies.getSignalCallManager().screenOff()
+        AppDependencies.signalCallManager.screenOff()
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/AndroidCallConnection.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/AndroidCallConnection.kt
index ca8b34046c..af44fa6594 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/AndroidCallConnection.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/AndroidCallConnection.kt
@@ -7,7 +7,7 @@ import android.telecom.Connection
 import androidx.annotation.RequiresApi
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.WebRtcCallActivity
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.webrtc.CallNotificationBuilder
@@ -48,7 +48,7 @@ class AndroidCallConnection(
     val activeDevice = state.route.toDevices().firstOrNull() ?: SignalAudioManager.AudioDevice.EARPIECE
     val availableDevices = state.supportedRouteMask.toDevices()
 
-    ApplicationDependencies.getSignalCallManager().onAudioDeviceChanged(activeDevice, availableDevices)
+    AppDependencies.signalCallManager.onAudioDeviceChanged(activeDevice, availableDevices)
 
     if (needToResetAudioRoute) {
       if (initialAudioRoute == null) {
@@ -64,7 +64,7 @@ class AndroidCallConnection(
   override fun onAnswer(videoState: Int) {
     Log.i(TAG, "onAnswer($videoState)")
     if (Permissions.hasAll(context, android.Manifest.permission.RECORD_AUDIO)) {
-      ApplicationDependencies.getSignalCallManager().acceptCall(false)
+      AppDependencies.signalCallManager.acceptCall(false)
     } else {
       val intent = Intent(context, WebRtcCallActivity::class.java)
       intent.action = if (isVideoCall) WebRtcCallActivity.ANSWER_VIDEO_ACTION else WebRtcCallActivity.ANSWER_ACTION
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/AndroidCallConnectionService.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/AndroidCallConnectionService.kt
index c6bc5d9bc3..310a5567ec 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/AndroidCallConnectionService.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/AndroidCallConnectionService.kt
@@ -9,7 +9,7 @@ import android.telecom.PhoneAccountHandle
 import android.telecom.TelecomManager
 import androidx.annotation.RequiresApi
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -38,7 +38,7 @@ class AndroidCallConnectionService : ConnectionService() {
       isVideoCall = isVideoCall
     ).apply {
       setInitializing()
-      if (SignalStore.settings().messageNotificationsPrivacy.isDisplayContact && recipient.e164.isPresent) {
+      if (SignalStore.settings.messageNotificationsPrivacy.isDisplayContact && recipient.e164.isPresent) {
         setAddress(Uri.fromParts("tel", recipient.e164.get(), null), TelecomManager.PRESENTATION_ALLOWED)
         setCallerDisplayName(displayName, TelecomManager.PRESENTATION_ALLOWED)
       }
@@ -47,7 +47,7 @@ class AndroidCallConnectionService : ConnectionService() {
       setRinging()
     }
     AndroidTelecomUtil.connections[recipientId] = connection
-    ApplicationDependencies.getSignalCallManager().setTelecomApproved(callId, recipientId)
+    AppDependencies.signalCallManager.setTelecomApproved(callId, recipientId)
 
     return connection
   }
@@ -59,7 +59,7 @@ class AndroidCallConnectionService : ConnectionService() {
     val (recipientId: RecipientId, callId: Long) = request.getOurExtras()
 
     Log.i(TAG, "onCreateIncomingConnectionFailed($recipientId)")
-    ApplicationDependencies.getSignalCallManager().dropCall(callId)
+    AppDependencies.signalCallManager.dropCall(callId)
   }
 
   override fun onCreateOutgoingConnection(
@@ -80,7 +80,7 @@ class AndroidCallConnectionService : ConnectionService() {
       setDialing()
     }
     AndroidTelecomUtil.connections[recipientId] = connection
-    ApplicationDependencies.getSignalCallManager().setTelecomApproved(callId, recipientId)
+    AppDependencies.signalCallManager.setTelecomApproved(callId, recipientId)
 
     return connection
   }
@@ -92,7 +92,7 @@ class AndroidCallConnectionService : ConnectionService() {
     val (recipientId: RecipientId, callId: Long) = request.getOurExtras()
 
     Log.i(TAG, "onCreateOutgoingConnectionFailed($recipientId)")
-    ApplicationDependencies.getSignalCallManager().dropCall(callId)
+    AppDependencies.signalCallManager.dropCall(callId)
   }
 
   companion object {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil.kt
index b17f8e1645..2724b2e36a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/AndroidTelecomUtil.kt
@@ -18,10 +18,10 @@ import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager
 
 /**
@@ -34,7 +34,7 @@ import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager
 object AndroidTelecomUtil {
 
   private val TAG = Log.tag(AndroidTelecomUtil::class.java)
-  private val context = ApplicationDependencies.getApplication()
+  private val context = AppDependencies.application
   private var systemRejected = false
   private var accountRegistered = false
 
@@ -192,8 +192,8 @@ object AndroidTelecomUtil {
   }
 
   private fun isTelecomAllowedForDevice(): Boolean {
-    if (FeatureFlags.internalUser()) {
-      return !SignalStore.internalValues().callingDisableTelecom()
+    if (RemoteConfig.internalUser) {
+      return !SignalStore.internal.callingDisableTelecom()
     }
 //    return RingRtcDynamicConfiguration.isTelecomAllowedForDevice()
     return false
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallEventSyncMessageUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallEventSyncMessageUtil.kt
index 399c452778..da26e59e06 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallEventSyncMessageUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallEventSyncMessageUtil.kt
@@ -47,6 +47,18 @@ object CallEventSyncMessageUtil {
     )
   }
 
+  @JvmStatic
+  fun createObservedCallEvent(remotePeer: RemotePeer, timestamp: Long, isOutgoing: Boolean, isVideoCall: Boolean): CallEvent {
+    return createCallEvent(
+      remotePeer.id,
+      remotePeer.callId.longValue(),
+      timestamp,
+      isOutgoing,
+      isVideoCall,
+      CallEvent.Event.OBSERVED
+    )
+  }
+
   private fun createCallEvent(
     recipientId: RecipientId,
     callId: Long,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkPreJoinActionProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkPreJoinActionProcessor.kt
index d0e0989722..531fde4322 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkPreJoinActionProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallLinkPreJoinActionProcessor.kt
@@ -13,7 +13,7 @@ import org.signal.libsignal.zkgroup.calllinks.CallLinkSecretParams
 import org.signal.ringrtc.CallException
 import org.signal.ringrtc.CallLinkRootKey
 import org.thoughtcrime.securesms.database.SignalDatabase.Companion.callLinks
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.events.WebRtcViewModel
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.ringrtc.RemotePeer
@@ -46,17 +46,17 @@ class CallLinkPreJoinActionProcessor(
       val callLinkRootKey = CallLinkRootKey(callLink.credentials.linkKeyBytes)
       val callLinkSecretParams = CallLinkSecretParams.deriveFromRootKey(callLink.credentials.linkKeyBytes)
       val genericServerPublicParams = GenericServerPublicParams(
-        ApplicationDependencies.getSignalServiceNetworkAccess()
+        AppDependencies.signalServiceNetworkAccess
           .getConfiguration()
           .genericServerPublicParams
       )
 
-      val callLinkAuthCredentialPresentation = ApplicationDependencies
-        .getGroupsV2Authorization()
+      val callLinkAuthCredentialPresentation = AppDependencies
+        .groupsV2Authorization
         .getCallLinkAuthorizationForToday(genericServerPublicParams, callLinkSecretParams)
 
       webRtcInteractor.callManager.createCallLinkCall(
-        SignalStore.internalValues().groupCallingServer(),
+        SignalStore.internal.groupCallingServer(),
         callLinkAuthCredentialPresentation.serialize(),
         callLinkRootKey,
         callLink.credentials.adminPassBytes,
@@ -85,7 +85,7 @@ class CallLinkPreJoinActionProcessor(
       return groupCallFailure(currentState, "Unable to connect to call link", e)
     }
 
-    SignalStore.tooltips().markGroupCallingLobbyEntered()
+    SignalStore.tooltips.markGroupCallingLobbyEntered()
     return currentState.builder()
       .changeCallSetupState(RemotePeer.GROUP_CALL_ID)
       .setRingGroup(false)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallSetupActionProcessorDelegate.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallSetupActionProcessorDelegate.java
index 54eae3365b..aee189372e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallSetupActionProcessorDelegate.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/CallSetupActionProcessorDelegate.java
@@ -5,7 +5,7 @@
 import org.signal.core.util.logging.Log;
 import org.signal.ringrtc.CallException;
 import org.signal.ringrtc.CallManager;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
 import org.thoughtcrime.securesms.ringrtc.Camera;
 import org.thoughtcrime.securesms.ringrtc.RemotePeer;
@@ -43,7 +43,7 @@ public CallSetupActionProcessorDelegate(@NonNull WebRtcInteractor webRtcInteract
       currentState.getCallSetupState(activePeer).isAcceptWithVideo() || currentState.getLocalDeviceState().getCameraState().isEnabled()
     );
 
-    ApplicationDependencies.getAppForegroundObserver().removeListener(webRtcInteractor.getForegroundListener());
+    AppDependencies.getAppForegroundObserver().removeListener(webRtcInteractor.getForegroundListener());
     webRtcInteractor.startAudioCommunication();
     webRtcInteractor.activateCall(activePeer.getId());
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupNetworkUnavailableActionProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupNetworkUnavailableActionProcessor.java
index 346f9c8736..6582e552f7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupNetworkUnavailableActionProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupNetworkUnavailableActionProcessor.java
@@ -49,7 +49,7 @@ public GroupNetworkUnavailableActionProcessor(@NonNull MultiPeerActionProcessorF
 
     byte[]    groupId   = currentState.getCallInfoState().getCallRecipient().requireGroupId().getDecodedId();
     GroupCall groupCall = webRtcInteractor.getCallManager().createGroupCall(groupId,
-                                                                            SignalStore.internalValues().groupCallingServer(),
+                                                                            SignalStore.internal().groupCallingServer(),
                                                                             new byte[0],
                                                                             null,
                                                                             RingRtcDynamicConfiguration.getAudioProcessingMethod(),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupPreJoinActionProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupPreJoinActionProcessor.java
index 3b7b452852..8114332845 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupPreJoinActionProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupPreJoinActionProcessor.java
@@ -47,7 +47,7 @@ protected GroupPreJoinActionProcessor(@NonNull MultiPeerActionProcessorFactory a
 
     byte[]      groupId = currentState.getCallInfoState().getCallRecipient().requireGroupId().getDecodedId();
     GroupCall groupCall = webRtcInteractor.getCallManager().createGroupCall(groupId,
-                                                                            SignalStore.internalValues().groupCallingServer(),
+                                                                            SignalStore.internal().groupCallingServer(),
                                                                             new byte[0],
                                                                             AUDIO_LEVELS_INTERVAL,
                                                                             RingRtcDynamicConfiguration.getAudioProcessingMethod(),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IdleActionProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IdleActionProcessor.java
index 692471738f..6b5232250f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IdleActionProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IdleActionProcessor.java
@@ -15,7 +15,7 @@
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.ringrtc.RemotePeer;
 import org.thoughtcrime.securesms.service.webrtc.state.WebRtcServiceState;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.whispersystems.signalservice.api.messages.calls.OfferMessage;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 
@@ -102,8 +102,8 @@ public IdleActionProcessor(@NonNull WebRtcInteractor webRtcInteractor) {
     Log.i(TAG, "handleGroupCallRingUpdate(): recipient: " + remotePeerGroup.getId() + " ring: " + ringId + " update: " + ringUpdate);
 
     int groupSize = remotePeerGroup.getRecipient().getParticipantIds().size();
-    if (groupSize > FeatureFlags.maxGroupCallRingSize()) {
-      Log.w(TAG, "Received ring request for large group, dropping. size: " + groupSize + " max: " + FeatureFlags.maxGroupCallRingSize());
+    if (groupSize > RemoteConfig.maxGroupCallRingSize()) {
+      Log.w(TAG, "Received ring request for large group, dropping. size: " + groupSize + " max: " + RemoteConfig.maxGroupCallRingSize());
       return currentState;
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IncomingCallActionProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IncomingCallActionProcessor.java
index 2d8b151323..492b865e60 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IncomingCallActionProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IncomingCallActionProcessor.java
@@ -13,7 +13,7 @@
 import org.thoughtcrime.securesms.database.CallTable;
 import org.thoughtcrime.securesms.database.RecipientTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.events.CallParticipant;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -191,7 +191,7 @@ public IncomingCallActionProcessor(@NonNull WebRtcInteractor webRtcInteractor) {
       boolean started = webRtcInteractor.startWebRtcCallActivityIfPossible();
       if (!started) {
         Log.i(TAG, "Unable to start call activity due to OS version or not being in the foreground");
-        ApplicationDependencies.getAppForegroundObserver().addListener(webRtcInteractor.getForegroundListener());
+        AppDependencies.getAppForegroundObserver().addListener(webRtcInteractor.getForegroundListener());
       }
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IncomingGroupCallActionProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IncomingGroupCallActionProcessor.java
index e03fb1c10e..936ee9872a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IncomingGroupCallActionProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IncomingGroupCallActionProcessor.java
@@ -13,7 +13,7 @@
 import org.thoughtcrime.securesms.components.webrtc.EglBaseWrapper;
 import org.thoughtcrime.securesms.database.RecipientTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.events.CallParticipant;
 import org.thoughtcrime.securesms.events.CallParticipantId;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
@@ -128,7 +128,7 @@ public IncomingGroupCallActionProcessor(WebRtcInteractor webRtcInteractor) {
       boolean started = webRtcInteractor.startWebRtcCallActivityIfPossible();
       if (!started) {
         Log.i(TAG, "Unable to start call activity due to OS version or not being in the foreground");
-        ApplicationDependencies.getAppForegroundObserver().addListener(webRtcInteractor.getForegroundListener());
+        AppDependencies.getAppForegroundObserver().addListener(webRtcInteractor.getForegroundListener());
       }
     }
 
@@ -181,7 +181,7 @@ public IncomingGroupCallActionProcessor(WebRtcInteractor webRtcInteractor) {
   protected @NonNull WebRtcServiceState handleAcceptCall(@NonNull WebRtcServiceState currentState, boolean answerWithVideo) {
     byte[] groupId = currentState.getCallInfoState().getCallRecipient().requireGroupId().getDecodedId();
     GroupCall groupCall = webRtcInteractor.getCallManager().createGroupCall(groupId,
-                                                                            SignalStore.internalValues().groupCallingServer(),
+                                                                            SignalStore.internal().groupCallingServer(),
                                                                             new byte[0],
                                                                             AUDIO_LEVELS_INTERVAL,
                                                                             RingRtcDynamicConfiguration.getAudioProcessingMethod(),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/RingRtcDynamicConfiguration.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/RingRtcDynamicConfiguration.kt
index d4011a23e1..d8cac5796e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/RingRtcDynamicConfiguration.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/RingRtcDynamicConfiguration.kt
@@ -4,7 +4,7 @@ import android.os.Build
 import org.signal.core.util.asListContains
 import org.signal.ringrtc.CallManager.AudioProcessingMethod
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 
 /**
  * Utility class to determine which AEC method RingRTC should use.
@@ -15,26 +15,26 @@ object RingRtcDynamicConfiguration {
 
   @JvmStatic
   fun getAudioProcessingMethod(): AudioProcessingMethod {
-    if (SignalStore.internalValues().callingAudioProcessingMethod() != AudioProcessingMethod.Default) {
-      return SignalStore.internalValues().callingAudioProcessingMethod()
+    if (SignalStore.internal.callingAudioProcessingMethod() != AudioProcessingMethod.Default) {
+      return SignalStore.internal.callingAudioProcessingMethod()
     }
 
     return when {
       isHardwareBlocklisted() || isKnownFaultyHardwareImplementation() -> AudioProcessingMethod.ForceSoftwareAec3
       isSoftwareBlocklisted() -> AudioProcessingMethod.ForceHardware
-      Build.VERSION.SDK_INT < 29 && FeatureFlags.useHardwareAecIfOlderThanApi29() -> AudioProcessingMethod.ForceHardware
+      Build.VERSION.SDK_INT < 29 && RemoteConfig.useHardwareAecIfOlderThanApi29 -> AudioProcessingMethod.ForceHardware
       Build.VERSION.SDK_INT < 29 -> AudioProcessingMethod.ForceSoftwareAec3
       else -> AudioProcessingMethod.ForceHardware
     }
   }
 
   fun isTelecomAllowedForDevice(): Boolean {
-    return FeatureFlags.telecomManufacturerAllowList().lowercase().asListContains(Build.MANUFACTURER.lowercase()) &&
-      !FeatureFlags.telecomModelBlockList().lowercase().asListContains(Build.MODEL.lowercase())
+    return RemoteConfig.telecomManufacturerAllowList.lowercase().asListContains(Build.MANUFACTURER.lowercase()) &&
+      !RemoteConfig.telecomModelBlocklist.lowercase().asListContains(Build.MODEL.lowercase())
   }
 
   private fun isHardwareBlocklisted(): Boolean {
-    return FeatureFlags.hardwareAecBlocklistModels().asListContains(Build.MODEL)
+    return RemoteConfig.hardwareAecBlocklistModels.asListContains(Build.MODEL)
   }
 
   fun isKnownFaultyHardwareImplementation(): Boolean {
@@ -44,6 +44,6 @@ object RingRtcDynamicConfiguration {
   }
 
   private fun isSoftwareBlocklisted(): Boolean {
-    return FeatureFlags.softwareAecBlocklistModels().asListContains(Build.MODEL)
+    return RemoteConfig.softwareAecBlocklistModels.asListContains(Build.MODEL)
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java
index 28fee3f30a..481041e5a0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java
@@ -36,13 +36,13 @@
 import org.signal.ringrtc.Remote;
 import org.signal.storageservice.protos.groups.GroupExternalCredential;
 import org.thoughtcrime.securesms.WebRtcCallActivity;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
+import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil;
 import org.thoughtcrime.securesms.database.CallLinkTable;
 import org.thoughtcrime.securesms.database.CallTable;
 import org.thoughtcrime.securesms.database.GroupTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.GroupRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.events.CallParticipant;
 import org.thoughtcrime.securesms.events.GroupCallPeekEvent;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
@@ -66,8 +66,8 @@
 import org.thoughtcrime.securesms.service.webrtc.state.WebRtcEphemeralState;
 import org.thoughtcrime.securesms.service.webrtc.state.WebRtcServiceState;
 import org.thoughtcrime.securesms.util.AppForegroundObserver;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.RecipientAccessList;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.rx.RxStore;
@@ -75,6 +75,7 @@
 import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager;
 import org.thoughtcrime.securesms.webrtc.locks.LockManager;
 import org.webrtc.PeerConnection;
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.messages.calls.CallingResponse;
@@ -390,7 +391,7 @@ public void peekCallLinkCall(@NonNull RecipientId id) {
       return;
     }
 
-    if (!FeatureFlags.adHocCalling()) {
+    if (!RemoteConfig.adHocCalling()) {
       Log.i(TAG, "Ad Hoc Calling is disabled. Ignoring request to peek.");
       return;
     }
@@ -407,24 +408,32 @@ public void peekCallLinkCall(@NonNull RecipientId id) {
         }
 
         CallLinkRootKey           callLinkRootKey           = new CallLinkRootKey(callLink.getCredentials().getLinkKeyBytes());
-        GenericServerPublicParams genericServerPublicParams = new GenericServerPublicParams(ApplicationDependencies.getSignalServiceNetworkAccess()
-                                                                                                                   .getConfiguration()
-                                                                                                                   .getGenericServerPublicParams());
+        GenericServerPublicParams genericServerPublicParams = new GenericServerPublicParams(AppDependencies.getSignalServiceNetworkAccess()
+                                                                                                           .getConfiguration()
+                                                                                                           .getGenericServerPublicParams());
 
 
-        CallLinkAuthCredentialPresentation callLinkAuthCredentialPresentation = ApplicationDependencies.getGroupsV2Authorization()
-                                                                                                       .getCallLinkAuthorizationForToday(
+        CallLinkAuthCredentialPresentation callLinkAuthCredentialPresentation = AppDependencies.getGroupsV2Authorization()
+                                                                                               .getCallLinkAuthorizationForToday(
                                                                                                            genericServerPublicParams,
                                                                                                            CallLinkSecretParams.deriveFromRootKey(callLinkRootKey.getKeyBytes())
                                                                                                        );
 
-        callManager.peekCallLinkCall(SignalStore.internalValues().groupCallingServer(), callLinkAuthCredentialPresentation.serialize(), callLinkRootKey, peekInfo -> {
+        callManager.peekCallLinkCall(SignalStore.internal().groupCallingServer(), callLinkAuthCredentialPresentation.serialize(), callLinkRootKey, peekInfo -> {
           PeekInfo info = peekInfo.getValue();
           if (info == null) {
             Log.w(TAG, "Failed to get peek info: " + peekInfo.getStatus());
             return;
           }
 
+          String eraId = info.getEraId();
+          if (eraId != null && !info.getJoinedMembers().isEmpty()) {
+            if (SignalDatabase.calls().insertAdHocCallFromObserveEvent(callLinkRecipient, System.currentTimeMillis(), eraId)) {
+              AppDependencies.getJobManager()
+                             .add(CallSyncEventJob.createForObserved(callLinkRecipient.getId(), CallId.fromEra(eraId).longValue()));
+            }
+          }
+
           linkPeekInfoStore.update(store -> {
             Map<RecipientId, CallLinkPeekInfo> newHashMap = new HashMap<>(store);
             newHashMap.put(id, CallLinkPeekInfo.fromPeekInfo(info));
@@ -452,7 +461,7 @@ public void peekGroupCall(@NonNull RecipientId id) {
         List<GroupCall.GroupMemberInfo> members = Stream.of(GroupManager.getUuidCipherTexts(context, groupId))
                                                         .map(entry -> new GroupCall.GroupMemberInfo(entry.getKey(), entry.getValue().serialize()))
                                                         .toList();
-        callManager.peekGroupCall(SignalStore.internalValues().groupCallingServer(), credential.token.getBytes(Charsets.UTF_8), members, peekInfo -> {
+        callManager.peekGroupCall(SignalStore.internal().groupCallingServer(), credential.token.getBytes(Charsets.UTF_8), members, peekInfo -> {
           Long threadId = SignalDatabase.threads().getThreadIdFor(group.getId());
 
           if (threadId != null) {
@@ -463,7 +472,7 @@ public void peekGroupCall(@NonNull RecipientId id) {
                                                    WebRtcUtil.isCallFull(peekInfo),
                                                    TimeUnit.SECONDS.toMillis(group.getExpiresInSeconds()));
 
-            ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(threadId));
+            AppDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(threadId));
 
             EventBus.getDefault().postSticky(new GroupCallPeekEvent(id, peekInfo.getEraId(), peekInfo.getDeviceCount(), peekInfo.getMaxDevices()));
           }
@@ -492,7 +501,7 @@ public void peekGroupCallForRingingCheck(@NonNull GroupCallRingCheckInfo info) {
                                                               .map(entry -> new GroupCall.GroupMemberInfo(entry.getKey(), entry.getValue().serialize()))
                                                               .collect(Collectors.toList());
 
-        callManager.peekGroupCall(SignalStore.internalValues().groupCallingServer(),
+        callManager.peekGroupCall(SignalStore.internal().groupCallingServer(),
                                   credential.token.getBytes(Charsets.UTF_8),
                                   members,
                                   peekInfo -> receivedGroupCallPeekForRingingCheck(info, peekInfo));
@@ -772,10 +781,10 @@ public void onSendCallMessage(@NonNull UUID aciUuid, @NonNull byte[] message, @N
         return;
       }
       try {
-        ApplicationDependencies.getSignalServiceMessageSender()
-                               .sendCallMessage(RecipientUtil.toSignalServiceAddress(context, recipient),
-                                                recipient.isSelf() ? Optional.empty() : UnidentifiedAccessUtil.getAccessFor(context, recipient),
-                                                callMessage);
+        AppDependencies.getSignalServiceMessageSender()
+                       .sendCallMessage(RecipientUtil.toSignalServiceAddress(context, recipient),
+                                        recipient.isSelf() ? SealedSenderAccess.NONE : SealedSenderAccessUtil.getSealedSenderAccessFor(recipient),
+                                        callMessage);
       } catch (UntrustedIdentityException e) {
         Log.i(TAG, "onSendCallMessage onFailure: ", e);
         RetrieveProfileJob.enqueue(recipient.getId());
@@ -852,8 +861,8 @@ public void onSendHttpRequest(long requestId, @NonNull String url, @NonNull Call
         headerPairs = Collections.emptyList();
       }
 
-      CallingResponse response = ApplicationDependencies.getSignalServiceMessageSender()
-                                                        .makeCallingRequest(requestId, url, httpMethod.name(), headerPairs, body);
+      CallingResponse response = AppDependencies.getSignalServiceMessageSender()
+                                                .makeCallingRequest(requestId, url, httpMethod.name(), headerPairs, body);
 
       try {
         if (response instanceof CallingResponse.Success) {
@@ -924,9 +933,7 @@ public void onReactions(@NonNull GroupCall groupCall, List<Reaction> reactions)
 
   @Override
   public void onRaisedHands(@NonNull GroupCall groupCall, List<Long> raisedHands) {
-    if (FeatureFlags.groupCallRaiseHand()) {
-      process((s, p) -> p.handleGroupCallRaisedHand(s, raisedHands));
-    }
+    process((s, p) -> p.handleGroupCallRaisedHand(s, raisedHands));
   }
 
   @Override
@@ -970,7 +977,7 @@ public void onForeground() {
         Log.i(TAG, "Starting call activity from foreground listener");
         startCallCardActivityIfPossible();
       }
-      ApplicationDependencies.getAppForegroundObserver().removeListener(this);
+      AppDependencies.getAppForegroundObserver().removeListener(this);
       return s;
     });
   }
@@ -1002,7 +1009,7 @@ public void insertReceivedCall(@NonNull RemotePeer remotePeer, boolean isVideoOf
   public void retrieveTurnServers(@NonNull RemotePeer remotePeer) {
     networkExecutor.execute(() -> {
       try {
-        TurnServerInfo turnServerInfo = ApplicationDependencies.getSignalServiceAccountManager().getTurnServerInfo();
+        TurnServerInfo turnServerInfo = AppDependencies.getSignalServiceAccountManager().getTurnServerInfo();
 
         List<PeerConnection.IceServer> iceServers = new LinkedList<>();
         for (String url : ListUtil.emptyIfNull(turnServerInfo.getUrlsWithIps())) {
@@ -1058,7 +1065,7 @@ public void sendGroupCallUpdateMessage(@NonNull Recipient recipient, @Nullable S
           }
 
           if (callIdLocal != null) {
-            ApplicationDependencies.getJobManager().add(
+            AppDependencies.getJobManager().add(
                 CallSyncEventJob.createForJoin(
                     recipient.getId(),
                     callIdLocal.longValue(),
@@ -1075,7 +1082,7 @@ public void sendGroupCallUpdateMessage(@NonNull Recipient recipient, @Nullable S
 
     SignalExecutors.BOUNDED.execute(() -> {
       GroupCallUpdateSendJob updateSendJob = GroupCallUpdateSendJob.create(recipient.getId(), groupCallEraId);
-      JobManager.Chain       chain         = ApplicationDependencies.getJobManager().startChain(updateSendJob);
+      JobManager.Chain       chain         = AppDependencies.getJobManager().startChain(updateSendJob);
       CallId                 callIdLocal   = callId;
 
       if (callIdLocal == null && groupCallEraId != null) {
@@ -1123,10 +1130,10 @@ public void sendCallMessage(@NonNull final RemotePeer remotePeer,
       }
 
       try {
-        ApplicationDependencies.getSignalServiceMessageSender()
-                               .sendCallMessage(RecipientUtil.toSignalServiceAddress(context, recipient),
-                                                UnidentifiedAccessUtil.getAccessFor(context, recipient),
-                                                callMessage);
+        AppDependencies.getSignalServiceMessageSender()
+                       .sendCallMessage(RecipientUtil.toSignalServiceAddress(context, recipient),
+                                        SealedSenderAccessUtil.getSealedSenderAccessFor(recipient),
+                                        callMessage);
         process((s, p) -> p.handleMessageSentSuccess(s, remotePeer.getCallId()));
       } catch (UntrustedIdentityException e) {
         RetrieveProfileJob.enqueue(remotePeer.getId());
@@ -1154,7 +1161,7 @@ public void sendAcceptedCallEventSyncMessage(@NonNull RemotePeer remotePeer, boo
       networkExecutor.execute(() -> {
         try {
           SyncMessage.CallEvent callEvent = CallEventSyncMessageUtil.createAcceptedSyncMessage(remotePeer, System.currentTimeMillis(), isOutgoing, isVideoCall);
-          ApplicationDependencies.getSignalServiceMessageSender().sendSyncMessage(SignalServiceSyncMessage.forCallEvent(callEvent), Optional.empty());
+          AppDependencies.getSignalServiceMessageSender().sendSyncMessage(SignalServiceSyncMessage.forCallEvent(callEvent));
         } catch (IOException | UntrustedIdentityException e) {
           Log.w(TAG, "Unable to send call event sync message for " + remotePeer.getCallId().longValue(), e);
         }
@@ -1171,7 +1178,7 @@ public void sendNotAcceptedCallEventSyncMessage(@NonNull RemotePeer remotePeer,
       networkExecutor.execute(() -> {
         try {
           SyncMessage.CallEvent callEvent = CallEventSyncMessageUtil.createNotAcceptedSyncMessage(remotePeer, System.currentTimeMillis(), isOutgoing, isVideoCall);
-          ApplicationDependencies.getSignalServiceMessageSender().sendSyncMessage(SignalServiceSyncMessage.forCallEvent(callEvent), Optional.empty());
+          AppDependencies.getSignalServiceMessageSender().sendSyncMessage(SignalServiceSyncMessage.forCallEvent(callEvent));
         } catch (IOException | UntrustedIdentityException e) {
           Log.w(TAG, "Unable to send call event sync message for " + remotePeer.getCallId().longValue(), e);
         }
@@ -1184,7 +1191,7 @@ public void sendGroupCallNotAcceptedCallEventSyncMessage(@NonNull RemotePeer rem
       networkExecutor.execute(() -> {
         try {
           SyncMessage.CallEvent callEvent = CallEventSyncMessageUtil.createNotAcceptedSyncMessage(remotePeer, System.currentTimeMillis(), isOutgoing, true);
-          ApplicationDependencies.getSignalServiceMessageSender().sendSyncMessage(SignalServiceSyncMessage.forCallEvent(callEvent), Optional.empty());
+          AppDependencies.getSignalServiceMessageSender().sendSyncMessage(SignalServiceSyncMessage.forCallEvent(callEvent));
         } catch (IOException | UntrustedIdentityException e) {
           Log.w(TAG, "Unable to send call event sync message for " + remotePeer.getCallId().longValue(), e);
         }
@@ -1197,7 +1204,7 @@ public void sendGroupCallNotAcceptedCallEventSyncMessage(@NonNull RemotePeer rem
   }
 
   public void relaunchPipOnForeground() {
-    ApplicationDependencies.getAppForegroundObserver().addListener(new RelaunchListener(ApplicationDependencies.getAppForegroundObserver().isForegrounded()));
+    AppDependencies.getAppForegroundObserver().addListener(new RelaunchListener(AppDependencies.getAppForegroundObserver().isForegrounded()));
   }
 
   private void processSendMessageFailureWithChangeDetection(@NonNull RemotePeer remotePeer,
@@ -1242,7 +1249,7 @@ public void onForeground() {
             return s;
           });
         }
-        ApplicationDependencies.getAppForegroundObserver().removeListener(this);
+        AppDependencies.getAppForegroundObserver().removeListener(this);
       }
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcActionProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcActionProcessor.java
index e0091015a9..fbc79693a3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcActionProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcActionProcessor.java
@@ -24,7 +24,7 @@
 import org.thoughtcrime.securesms.components.webrtc.GroupCallSafetyNumberChangeNotificationUtil;
 import org.thoughtcrime.securesms.database.CallTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.events.CallParticipant;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
 import org.thoughtcrime.securesms.groups.GroupId;
@@ -692,7 +692,7 @@ public WebRtcActionProcessor(@NonNull WebRtcInteractor webRtcInteractor, @NonNul
       activePeer = remotePeer;
     }
 
-    ApplicationDependencies.getAppForegroundObserver().removeListener(webRtcInteractor.getForegroundListener());
+    AppDependencies.getAppForegroundObserver().removeListener(webRtcInteractor.getForegroundListener());
 
     if (activePeer.getState() != CallState.IDLE) {
       webRtcInteractor.updatePhoneState(LockManager.PhoneState.PROCESSING);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcCallService.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcCallService.java
index a128ac9e21..4089f26c12 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcCallService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcCallService.java
@@ -23,11 +23,11 @@
 import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.ForegroundServiceUtil;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.TelephonyUtil;
 import org.thoughtcrime.securesms.webrtc.CallNotificationBuilder;
 import org.thoughtcrime.securesms.webrtc.UncaughtExceptionHandlerManager;
@@ -88,7 +88,7 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
   private boolean                         stopping                   = false;
 
   public synchronized static void update(@NonNull Context context, int type, @NonNull RecipientId recipientId, boolean isVideoCall) {
-    if (FeatureFlags.useActiveCallManager()) {
+    if (RemoteConfig.useActiveCallManager()) {
       ActiveCallManager.update(context, type, recipientId, isVideoCall);
 
       return;
@@ -104,7 +104,7 @@ public synchronized static void update(@NonNull Context context, int type, @NonN
   }
 
   public static void denyCall(@NonNull Context context) {
-    if (FeatureFlags.useActiveCallManager()) {
+    if (RemoteConfig.useActiveCallManager()) {
       ActiveCallManager.denyCall();
       return;
     }
@@ -113,7 +113,7 @@ public static void denyCall(@NonNull Context context) {
   }
 
   public static void hangup(@NonNull Context context) {
-    if (FeatureFlags.useActiveCallManager()) {
+    if (RemoteConfig.useActiveCallManager()) {
       ActiveCallManager.hangup();
       return;
     }
@@ -122,7 +122,7 @@ public static void hangup(@NonNull Context context) {
   }
 
   public synchronized static void stop(@NonNull Context context) {
-    if (FeatureFlags.useActiveCallManager()) {
+    if (RemoteConfig.useActiveCallManager()) {
       ActiveCallManager.stop();
       return;
     }
@@ -134,7 +134,7 @@ public synchronized static void stop(@NonNull Context context) {
   }
 
   public synchronized static @NonNull PendingIntent denyCallIntent(@NonNull Context context) {
-    if (FeatureFlags.useActiveCallManager()) {
+    if (RemoteConfig.useActiveCallManager()) {
       return ActiveCallManager.denyCallIntent(context);
     }
 
@@ -142,7 +142,7 @@ public synchronized static void stop(@NonNull Context context) {
   }
 
   public synchronized static @NonNull PendingIntent hangupIntent(@NonNull Context context) {
-    if (FeatureFlags.useActiveCallManager()) {
+    if (RemoteConfig.useActiveCallManager()) {
       return ActiveCallManager.hangupIntent(context);
     }
 
@@ -150,7 +150,7 @@ public synchronized static void stop(@NonNull Context context) {
   }
 
   public synchronized static void sendAudioManagerCommand(@NonNull Context context, @NonNull AudioManagerCommand command) {
-    if (FeatureFlags.useActiveCallManager()) {
+    if (RemoteConfig.useActiveCallManager()) {
       ActiveCallManager.sendAudioManagerCommand(context, command);
       return;
     }
@@ -162,7 +162,7 @@ public synchronized static void sendAudioManagerCommand(@NonNull Context context
   }
 
   public synchronized static void changePowerButtonReceiver(@NonNull Context context, boolean register) {
-    if (FeatureFlags.useActiveCallManager()) {
+    if (RemoteConfig.useActiveCallManager()) {
       ActiveCallManager.changePowerButtonReceiver(context, register);
       return;
     }
@@ -178,7 +178,7 @@ public synchronized static void changePowerButtonReceiver(@NonNull Context conte
   public void onCreate() {
     Log.v(TAG, "onCreate");
     super.onCreate();
-    this.callManager                   = ApplicationDependencies.getSignalCallManager();
+    this.callManager                   = AppDependencies.getSignalCallManager();
     this.hangUpRtcOnDeviceCallAnswered = new HangUpRtcOnPstnCallAnsweredListener();
     this.lastNotificationId            = INVALID_NOTIFICATION_ID;
 
@@ -418,14 +418,14 @@ public void start() {
     public void stop() {
       keepRunning = false;
       ThreadUtil.cancelRunnableOnMain(webSocketKeepAliveTask);
-      ApplicationDependencies.getIncomingMessageObserver().removeKeepAliveToken(WEBSOCKET_KEEP_ALIVE_TOKEN);
+      AppDependencies.getIncomingMessageObserver().removeKeepAliveToken(WEBSOCKET_KEEP_ALIVE_TOKEN);
     }
 
     @MainThread
     @Override
     public void run() {
       if (keepRunning) {
-        ApplicationDependencies.getIncomingMessageObserver().registerKeepAliveToken(WEBSOCKET_KEEP_ALIVE_TOKEN);
+        AppDependencies.getIncomingMessageObserver().registerKeepAliveToken(WEBSOCKET_KEEP_ALIVE_TOKEN);
         ThreadUtil.runOnMainDelayed(this, REQUEST_WEBSOCKET_STAY_OPEN_DELAY);
       }
     }
@@ -437,8 +437,8 @@ public void onReceive(Context context, Intent intent) {
       ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
       NetworkInfo         activeNetworkInfo   = connectivityManager.getActiveNetworkInfo();
 
-      ApplicationDependencies.getSignalCallManager().networkChange(activeNetworkInfo != null && activeNetworkInfo.isConnected());
-      ApplicationDependencies.getSignalCallManager().dataModeUpdate();
+      AppDependencies.getSignalCallManager().networkChange(activeNetworkInfo != null && activeNetworkInfo.isConnected());
+      AppDependencies.getSignalCallManager().dataModeUpdate();
     }
   }
 
@@ -446,7 +446,7 @@ private static class PowerButtonReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(@NonNull Context context, @NonNull Intent intent) {
       if (Intent.ACTION_SCREEN_OFF.equals(intent.getAction())) {
-        ApplicationDependencies.getSignalCallManager().screenOff();
+        AppDependencies.getSignalCallManager().screenOff();
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcUtil.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcUtil.java
index 8997aa3b9d..be67e25d50 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcUtil.java
@@ -11,7 +11,7 @@
 import org.signal.ringrtc.CallManager;
 import org.signal.ringrtc.GroupCall;
 import org.signal.ringrtc.PeekInfo;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
 import org.thoughtcrime.securesms.net.Networking;
 import org.thoughtcrime.securesms.service.webrtc.state.WebRtcServiceState;
@@ -39,7 +39,7 @@ private WebRtcUtil() {}
   }
 
   public static @NonNull LockManager.PhoneState getInCallPhoneState(@NonNull Context context) {
-    AudioManagerCompat audioManager = ApplicationDependencies.getAndroidCallAudioManager();
+    AudioManagerCompat audioManager = AppDependencies.getAndroidCallAudioManager();
     if (audioManager.isSpeakerphoneOn() || audioManager.isBluetoothConnected() || audioManager.isWiredHeadsetOn()) {
       return LockManager.PhoneState.IN_HANDS_FREE_CALL;
     } else {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/CallLinkCredentials.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/CallLinkCredentials.kt
index b8227641cb..9d9e15effb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/CallLinkCredentials.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/CallLinkCredentials.kt
@@ -32,7 +32,9 @@ data class CallLinkCredentials(
     if (adminPassBytes != null) {
       if (other.adminPassBytes == null) return false
       if (!adminPassBytes.contentEquals(other.adminPassBytes)) return false
-    } else if (other.adminPassBytes != null) return false
+    } else if (other.adminPassBytes != null) {
+      return false
+    }
 
     return true
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/SignalCallLinkManager.kt b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/SignalCallLinkManager.kt
index 0b1e4ef928..d0f8c05512 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/SignalCallLinkManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/SignalCallLinkManager.kt
@@ -20,7 +20,7 @@ import org.signal.ringrtc.CallLinkRootKey
 import org.signal.ringrtc.CallLinkState
 import org.signal.ringrtc.CallLinkState.Restrictions
 import org.signal.ringrtc.CallManager
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.whispersystems.signalservice.internal.ServiceResponse
@@ -36,7 +36,7 @@ class SignalCallLinkManager(
 ) {
 
   private val genericServerPublicParams: GenericServerPublicParams = GenericServerPublicParams(
-    ApplicationDependencies.getSignalServiceNetworkAccess()
+    AppDependencies.signalServiceNetworkAccess
       .getConfiguration()
       .genericServerPublicParams
   )
@@ -51,7 +51,7 @@ class SignalCallLinkManager(
 
     Log.d(TAG, "Requesting call link credential response.")
 
-    val serviceResponse: ServiceResponse<CreateCallLinkCredentialResponse> = ApplicationDependencies.getCallLinksService().getCreateCallLinkAuthCredential(request)
+    val serviceResponse: ServiceResponse<CreateCallLinkCredentialResponse> = AppDependencies.callLinksService.getCreateCallLinkAuthCredential(request)
     if (serviceResponse.result.isAbsent()) {
       throw IOException("Failed to create credential response", serviceResponse.applicationError.or(serviceResponse.executionError).get())
     }
@@ -77,7 +77,7 @@ class SignalCallLinkManager(
   private fun requestCallLinkAuthCredentialPresentation(
     linkRootKey: ByteArray
   ): CallLinkAuthCredentialPresentation {
-    return ApplicationDependencies.getGroupsV2Authorization().getCallLinkAuthorizationForToday(
+    return AppDependencies.groupsV2Authorization.getCallLinkAuthorizationForToday(
       genericServerPublicParams,
       CallLinkSecretParams.deriveFromRootKey(linkRootKey)
     )
@@ -111,7 +111,7 @@ class SignalCallLinkManager(
 
       // Credential
       callManager.createCallLink(
-        SignalStore.internalValues().groupCallingServer(),
+        SignalStore.internal.groupCallingServer(),
         credentialPresentation.serialize(),
         rootKey,
         adminPassKey,
@@ -138,7 +138,7 @@ class SignalCallLinkManager(
   ): Single<ReadCallLinkResult> {
     return Single.create { emitter ->
       callManager.readCallLink(
-        SignalStore.internalValues().groupCallingServer(),
+        SignalStore.internal.groupCallingServer(),
         requestCallLinkAuthCredentialPresentation(credentials.linkKeyBytes).serialize(),
         CallLinkRootKey(credentials.linkKeyBytes)
       ) {
@@ -164,7 +164,7 @@ class SignalCallLinkManager(
       val credentialPresentation = requestCallLinkAuthCredentialPresentation(credentials.linkKeyBytes)
 
       callManager.updateCallLinkName(
-        SignalStore.internalValues().groupCallingServer(),
+        SignalStore.internal.groupCallingServer(),
         credentialPresentation.serialize(),
         CallLinkRootKey(credentials.linkKeyBytes),
         credentials.adminPassBytes,
@@ -191,7 +191,7 @@ class SignalCallLinkManager(
       val credentialPresentation = requestCallLinkAuthCredentialPresentation(credentials.linkKeyBytes)
 
       callManager.updateCallLinkRestrictions(
-        SignalStore.internalValues().groupCallingServer(),
+        SignalStore.internal.groupCallingServer(),
         credentialPresentation.serialize(),
         CallLinkRootKey(credentials.linkKeyBytes),
         credentials.adminPassBytes,
@@ -217,7 +217,7 @@ class SignalCallLinkManager(
       val credentialPresentation = requestCallLinkAuthCredentialPresentation(credentials.linkKeyBytes)
 
       callManager.deleteCallLink(
-        SignalStore.internalValues().groupCallingServer(),
+        SignalStore.internal.groupCallingServer(),
         credentialPresentation.serialize(),
         CallLinkRootKey(credentials.linkKeyBytes),
         credentials.adminPassBytes
diff --git a/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java b/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java
index d0e2ab4e36..36ccd1b412 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java
@@ -27,7 +27,7 @@
 import org.thoughtcrime.securesms.database.model.Mention;
 import org.thoughtcrime.securesms.database.model.StoryType;
 import org.thoughtcrime.securesms.database.model.databaseprotos.StoryTextPost;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.keyvalue.StorySend;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
@@ -84,14 +84,14 @@ public static void send(@NonNull MultiShareArgs multiShareArgs, @NonNull Consume
   @WorkerThread
   public static MultiShareSendResultCollection sendSync(@NonNull MultiShareArgs multiShareArgs) {
     List<MultiShareSendResult> results                           = new ArrayList<>(multiShareArgs.getContactSearchKeys().size());
-    Context                    context                           = ApplicationDependencies.getApplication();
+    Context                    context                           = AppDependencies.getApplication();
     String                     message                           = multiShareArgs.getDraftText();
-    SlideDeck                  slideDeck;
+    SlideDeck                  primarySlideDeck;
     List<OutgoingMessage>      storiesBatch                      = new LinkedList<>();
     ChatColors                 generatedTextStoryBackgroundColor = TextStoryBackgroundColors.getRandomBackgroundColor();
 
     try {
-      slideDeck = buildSlideDeck(context, multiShareArgs);
+      primarySlideDeck = buildSlideDeck(context, multiShareArgs);
     } catch (SlideNotFoundException e) {
       Log.w(TAG, "Could not create slide for media message");
       for (ContactSearchKey.RecipientSearchKey recipientSearchKey : multiShareArgs.getRecipientSearchKeys()) {
@@ -105,11 +105,13 @@ public static MultiShareSendResultCollection sendSync(@NonNull MultiShareArgs mu
     for (ContactSearchKey.RecipientSearchKey recipientSearchKey : multiShareArgs.getRecipientSearchKeys()) {
       Recipient recipient = Recipient.resolved(recipientSearchKey.getRecipientId());
 
-      long            threadId       = SignalDatabase.threads().getOrCreateThreadIdFor(recipient);
-      List<Mention>   mentions       = getValidMentionsForRecipient(recipient, multiShareArgs.getMentions());
-      MessageSendType sendType       = MessageSendType.SignalMessageSendType.INSTANCE;
-      long            expiresIn      = TimeUnit.SECONDS.toMillis(recipient.getExpiresInSeconds());
-      List<Contact>   contacts       = multiShareArgs.getSharedContacts();
+      long            threadId  = SignalDatabase.threads().getOrCreateThreadIdFor(recipient);
+      List<Mention>   mentions  = getValidMentionsForRecipient(recipient, multiShareArgs.getMentions());
+      MessageSendType sendType  = MessageSendType.SignalMessageSendType.INSTANCE;
+      long            expiresIn = TimeUnit.SECONDS.toMillis(recipient.getExpiresInSeconds());
+      List<Contact>   contacts  = multiShareArgs.getSharedContacts();
+      SlideDeck       slideDeck = new SlideDeck(primarySlideDeck);
+
       boolean needsSplit = message != null &&
                            message.length() > sendType.calculateCharacters(message).maxPrimaryMessageSize;
       boolean hasMmsMedia = !multiShareArgs.getMedia().isEmpty() ||
@@ -210,7 +212,7 @@ private static void sendMediaMessageOrCollectStoryToBatch(@NonNull Context conte
       }
 
       if (!recipient.isMyStory()) {
-        SignalStore.storyValues().setLatestStorySend(StorySend.newSend(recipient));
+        SignalStore.story().setLatestStorySend(StorySend.newSend(recipient));
       }
 
       if (multiShareArgs.isTextStory()) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareActivity.kt
index d37e2d2206..3fb03338d3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareActivity.kt
@@ -286,6 +286,7 @@ class ShareActivity : PassphraseRequiredActivity(), MultiselectForwardFragment.C
           false,
           Optional.empty(),
           Optional.empty(),
+          Optional.empty(),
           Optional.empty()
         )
       )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareRepository.kt
index 3eeedc3743..860264826c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/sharing/v2/ShareRepository.kt
@@ -11,8 +11,8 @@ import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.mediasend.Media
 import org.thoughtcrime.securesms.providers.BlobProvider
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.MediaUtil
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.UriUtil
 import java.io.IOException
 import java.io.InputStream
@@ -82,7 +82,7 @@ class ShareRepository(context: Context) {
     }
 
     val media: List<Media> = mimeTypes.toList()
-      .take(FeatureFlags.maxAttachmentCount())
+      .take(RemoteConfig.maxAttachmentCount)
       .map { (uri, mimeType) ->
         val stream: InputStream = try {
           appContext.contentResolver.openInputStream(uri)
@@ -116,6 +116,7 @@ class ShareRepository(context: Context) {
           false,
           Optional.of(Media.ALL_MEDIA_BUCKET_ID),
           Optional.empty(),
+          Optional.empty(),
           Optional.empty()
         )
       }.filterNotNull()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java
index 779d38110e..6312bf5d7a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java
@@ -45,7 +45,7 @@
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.ReactionRecord;
 import org.thoughtcrime.securesms.database.model.StoryType;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.jobs.AttachmentCompressionJob;
@@ -97,7 +97,7 @@ public class MessageSender {
   public static void sendProfileKey(final long threadId) {
     ProfileKeySendJob job = ProfileKeySendJob.create(threadId, false);
     if (job != null) {
-      ApplicationDependencies.getJobManager().add(job);
+      AppDependencies.getJobManager().add(job);
     }
   }
 
@@ -144,7 +144,7 @@ public static void sendStories(@NonNull final Context context,
 
       dependencyGraph = UploadDependencyGraph.create(
           messages,
-          ApplicationDependencies.getJobManager(),
+          AppDependencies.getJobManager(),
           attachment -> {
             try {
               return SignalDatabase.attachments().insertAttachmentForPreUpload(attachment);
@@ -210,7 +210,7 @@ public static void sendStories(@NonNull final Context context,
     onMessageSent();
 
     for (long threadId : threads) {
-      threadTable.update(threadId, true);
+      threadTable.update(threadId, true, true);
     }
   }
 
@@ -242,7 +242,7 @@ public static long send(final Context context,
 
       sendMessageInternal(context, recipient, sendType, messageId, Collections.emptyList(), message.getScheduledDate() > 0);
       onMessageSent();
-      threadTable.update(allocatedThreadId, true);
+      threadTable.update(allocatedThreadId, true, true);
 
       return allocatedThreadId;
     } catch (MmsException e) {
@@ -279,7 +279,7 @@ public static long sendPushWithPreUploadedMedia(final Context context,
 
       sendMessageInternal(context, recipient, SendType.SIGNAL, messageId, jobIds, false);
       onMessageSent();
-      threadTable.update(allocatedThreadId, true);
+      threadTable.update(allocatedThreadId, true, true);
 
       return allocatedThreadId;
     } catch (MmsException e) {
@@ -297,7 +297,7 @@ public static void sendMediaBroadcast(@NonNull Context context,
     Preconditions.checkArgument(messages.size() > 0, "No messages!");
     Preconditions.checkArgument(Stream.of(messages).allMatch(m -> m.getAttachments().isEmpty()), "Messages can't have attachments! They should be pre-uploaded.");
 
-    JobManager         jobManager             = ApplicationDependencies.getJobManager();
+    JobManager         jobManager             = AppDependencies.getJobManager();
     AttachmentTable    attachmentDatabase     = SignalDatabase.attachments();
     MessageTable       mmsDatabase            = SignalDatabase.messages();
     ThreadTable        threadTable            = SignalDatabase.threads();
@@ -422,10 +422,10 @@ public static void sendMediaBroadcast(@NonNull Context context,
       Job compressionJob = AttachmentCompressionJob.fromAttachment(databaseAttachment, false, -1);
       Job uploadJob      = new AttachmentUploadJob(databaseAttachment.attachmentId);
 
-      ApplicationDependencies.getJobManager()
-                             .startChain(compressionJob)
-                             .then(uploadJob)
-                             .enqueue();
+      AppDependencies.getJobManager()
+                     .startChain(compressionJob)
+                     .then(uploadJob)
+                     .enqueue();
 
       return new PreUploadResult(media, databaseAttachment.attachmentId, Arrays.asList(compressionJob.getId(), uploadJob.getId()));
     } catch (MmsException e) {
@@ -439,7 +439,7 @@ public static void sendNewReaction(@NonNull Context context, @NonNull MessageId
     SignalDatabase.reactions().addReaction(messageId, reaction);
 
     try {
-      ApplicationDependencies.getJobManager().add(ReactionSendJob.create(context, messageId, reaction, false));
+      AppDependencies.getJobManager().add(ReactionSendJob.create(context, messageId, reaction, false));
       onMessageSent();
     } catch (NoSuchMessageException e) {
       Log.w(TAG, "[sendNewReaction] Could not find message! Ignoring.");
@@ -450,7 +450,7 @@ public static void sendReactionRemoval(@NonNull Context context, @NonNull Messag
     SignalDatabase.reactions().deleteReaction(messageId, reaction.getAuthor());
 
     try {
-      ApplicationDependencies.getJobManager().add(ReactionSendJob.create(context, messageId, reaction, true));
+      AppDependencies.getJobManager().add(ReactionSendJob.create(context, messageId, reaction, true));
       onMessageSent();
     } catch (NoSuchMessageException e) {
       Log.w(TAG, "[sendReactionRemoval] Could not find message! Ignoring.");
@@ -540,7 +540,7 @@ private static void sendMessageInternal(Context context,
   }
 
   private static void sendMediaPush(Context context, Recipient recipient, long messageId, @NonNull Collection<String> uploadJobIds) {
-    JobManager jobManager = ApplicationDependencies.getJobManager();
+    JobManager jobManager = AppDependencies.getJobManager();
 
     if (uploadJobIds.size() > 0) {
       Job mediaSend = IndividualSendJob.create(messageId, recipient, true, false);
@@ -551,7 +551,7 @@ private static void sendMediaPush(Context context, Recipient recipient, long mes
   }
 
   private static void sendGroupPush(@NonNull Context context, @NonNull Recipient recipient, long messageId, @NonNull Set<RecipientId> filterRecipientIds, @NonNull Collection<String> uploadJobIds) {
-    JobManager jobManager = ApplicationDependencies.getJobManager();
+    JobManager jobManager = AppDependencies.getJobManager();
 
     if (uploadJobIds.size() > 0) {
       Job groupSend = new PushGroupSendJob(messageId, recipient.getId(), filterRecipientIds, !uploadJobIds.isEmpty(), false);
@@ -562,7 +562,7 @@ private static void sendGroupPush(@NonNull Context context, @NonNull Recipient r
   }
 
   private static void sendDistributionList(@NonNull Context context, @NonNull Recipient recipient, long messageId, @NonNull Set<RecipientId> filterRecipientIds, @NonNull Collection<String> uploadJobIds) {
-    JobManager jobManager = ApplicationDependencies.getJobManager();
+    JobManager jobManager = AppDependencies.getJobManager();
 
     if (uploadJobIds.size() > 0) {
       Job groupSend = new PushDistributionListSendJob(messageId, recipient.getId(), !uploadJobIds.isEmpty(), filterRecipientIds);
@@ -610,7 +610,7 @@ public static boolean isLocalSelfSend(@NonNull Context context, @Nullable Recipi
 
   private static void sendLocalMediaSelf(long messageId) {
     try {
-      ExpiringMessageManager expirationManager = ApplicationDependencies.getExpiringMessageManager();
+      ExpiringMessageManager expirationManager = AppDependencies.getExpiringMessageManager();
       MessageTable           mmsDatabase    = SignalDatabase.messages();
       OutgoingMessage        message        = mmsDatabase.getOutgoingMessage(messageId);
       SyncMessageId          syncId         = new SyncMessageId(Recipient.self().getId(), message.getSentTimeMillis());
@@ -638,9 +638,9 @@ private static void sendLocalMediaSelf(long messageId) {
                                                              .map(a -> new AttachmentMarkUploadedJob(messageId, ((DatabaseAttachment) a).attachmentId))
                                                              .toList();
 
-      ApplicationDependencies.getJobManager().startChain(compressionJobs)
-                                             .then(fakeUploadJobs)
-                                             .enqueue();
+      AppDependencies.getJobManager().startChain(compressionJobs)
+                     .then(fakeUploadJobs)
+                     .enqueue();
 
       mmsDatabase.markAsSent(messageId, true);
       mmsDatabase.markUnidentified(messageId, true);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java
index e67d8745b6..98868f5c9b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java
@@ -11,7 +11,7 @@
 import org.thoughtcrime.securesms.database.StickerTable;
 import org.thoughtcrime.securesms.database.StickerTable.StickerPackRecordReader;
 import org.thoughtcrime.securesms.database.model.StickerPackRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.jobs.MultiDeviceStickerPackOperationJob;
 import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob;
@@ -38,7 +38,7 @@ void deleteOrphanedStickerPacks() {
 
   void fetchUnretrievedReferencePacks() {
     SignalExecutors.SERIAL.execute(() -> {
-      JobManager jobManager = ApplicationDependencies.getJobManager();
+      JobManager jobManager = AppDependencies.getJobManager();
 
       try (Cursor cursor = attachmentDatabase.getUnavailableStickerPacks()) {
         while (cursor != null && cursor.moveToNext()) {
@@ -79,14 +79,14 @@ void uninstallStickerPack(@NonNull String packId, @NonNull String packKey) {
       stickerDatabase.uninstallPack(packId);
 
       if (TextSecurePreferences.isMultiDevice(context)) {
-        ApplicationDependencies.getJobManager().add(new MultiDeviceStickerPackOperationJob(packId, packKey, MultiDeviceStickerPackOperationJob.Type.REMOVE));
+        AppDependencies.getJobManager().add(new MultiDeviceStickerPackOperationJob(packId, packKey, MultiDeviceStickerPackOperationJob.Type.REMOVE));
       }
     });
   }
 
   void installStickerPack(@NonNull String packId, @NonNull String packKey, boolean notify) {
     SignalExecutors.SERIAL.execute(() -> {
-      JobManager jobManager = ApplicationDependencies.getJobManager();
+      JobManager jobManager = AppDependencies.getJobManager();
 
       if (stickerDatabase.isPackAvailableAsReference(packId)) {
         stickerDatabase.markPackAsInstalled(packId, notify);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java
index 4bc5564c38..7bbb45fa47 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java
@@ -10,7 +10,7 @@
 
 import org.thoughtcrime.securesms.database.DatabaseObserver;
 import org.thoughtcrime.securesms.database.model.StickerPackRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.stickers.StickerManagementRepository.PackResult;
 
 import java.util.List;
@@ -31,7 +31,7 @@ private StickerManagementViewModel(@NonNull Application application, @NonNull St
       repository.getStickerPacks(packs::postValue);
     };
 
-    ApplicationDependencies.getDatabaseObserver().registerStickerPackObserver(observer);
+    AppDependencies.getDatabaseObserver().registerStickerPackObserver(observer);
   }
 
   void init() {
@@ -62,7 +62,7 @@ void onOrderChanged(List<StickerPackRecord> packsInOrder) {
 
   @Override
   protected void onCleared() {
-    ApplicationDependencies.getDatabaseObserver().unregisterObserver(observer);
+    AppDependencies.getDatabaseObserver().unregisterObserver(observer);
   }
 
   static class Factory extends ViewModelProvider.NewInstanceFactory {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java
index ff472e16b3..69e584e5a2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java
@@ -15,7 +15,7 @@
 import org.thoughtcrime.securesms.database.StickerTable;
 import org.thoughtcrime.securesms.database.model.StickerPackRecord;
 import org.thoughtcrime.securesms.database.model.StickerRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.signal.core.util.Hex;
 import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
 import org.whispersystems.signalservice.api.messages.SignalServiceStickerManifest;
@@ -33,7 +33,7 @@ public final class StickerPackPreviewRepository {
   private final SignalServiceMessageReceiver receiver;
 
   public StickerPackPreviewRepository(@NonNull Context context) {
-    this.receiver        = ApplicationDependencies.getSignalServiceMessageReceiver();
+    this.receiver        = AppDependencies.getSignalServiceMessageReceiver();
     this.stickerDatabase = SignalDatabase.stickers();
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java
index 0d0cd322e2..2df5887522 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java
@@ -10,7 +10,7 @@
 import androidx.lifecycle.ViewModelProvider;
 
 import org.thoughtcrime.securesms.database.DatabaseObserver;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.stickers.StickerPackPreviewRepository.StickerManifestResult;
 
 import java.util.Optional;
@@ -41,7 +41,7 @@ private StickerPackPreviewViewModel(@NonNull Application application,
       }
     };
 
-    ApplicationDependencies.getDatabaseObserver().registerStickerPackObserver(packObserver);
+    AppDependencies.getDatabaseObserver().registerStickerPackObserver(packObserver);
   }
 
   LiveData<Optional<StickerManifestResult>> getStickerManifest(@NonNull String packId, @NonNull String packKey) {
@@ -63,7 +63,7 @@ void onRemoveClicked() {
 
   @Override
   protected void onCleared() {
-    ApplicationDependencies.getDatabaseObserver().unregisterObserver(packObserver);
+    AppDependencies.getDatabaseObserver().unregisterObserver(packObserver);
   }
 
   static class Factory extends ViewModelProvider.NewInstanceFactory {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java
index aa6e3e9380..b05d4c9dfc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java
@@ -7,7 +7,7 @@
 import com.bumptech.glide.load.model.ModelLoaderFactory;
 import com.bumptech.glide.load.model.MultiModelLoaderFactory;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
 
 import java.io.InputStream;
@@ -38,7 +38,7 @@ public static class Factory implements ModelLoaderFactory<StickerRemoteUri, Inpu
 
     @Override
     public @NonNull ModelLoader<StickerRemoteUri, InputStream> build(@NonNull MultiModelLoaderFactory multiFactory) {
-      return new StickerRemoteUriLoader(ApplicationDependencies.getSignalServiceMessageReceiver());
+      return new StickerRemoteUriLoader(AppDependencies.getSignalServiceMessageReceiver());
     }
 
     @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
index 9bfa06161b..ea47d847bf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
@@ -9,12 +9,15 @@
 import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
 
+import org.signal.core.util.Base64;
 import org.signal.core.util.SetUtil;
 import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository;
 import org.thoughtcrime.securesms.database.RecipientTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord;
 import org.thoughtcrime.securesms.database.model.RecipientRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob;
 import org.thoughtcrime.securesms.jobs.StorageSyncJob;
 import org.thoughtcrime.securesms.keyvalue.AccountValues;
@@ -22,8 +25,6 @@
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.payments.Entropy;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.subscription.Subscriber;
-import org.signal.core.util.Base64;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.signalservice.api.push.UsernameLinkComponents;
@@ -118,13 +119,13 @@ public static SignalStorageRecord buildAccountRecord(@NonNull Context context, @
                                                  .map(recipientTable::getRecordForSync)
                                                  .toList();
 
-    final OptionalBool storyViewReceiptsState = SignalStore.storyValues().getViewedReceiptsEnabled() ? OptionalBool.ENABLED
-                                                                                                     : OptionalBool.DISABLED;
+    final OptionalBool storyViewReceiptsState = SignalStore.story().getViewedReceiptsEnabled() ? OptionalBool.ENABLED
+                                                                                               : OptionalBool.DISABLED;
 
     if (self.getStorageId() == null || (record != null && record.getStorageId() == null)) {
       Log.w(TAG, "[buildAccountRecord] No storageId for self or record! Generating. (Self: " + (self.getStorageId() != null) + ", Record: " + (record != null && record.getStorageId() != null) + ")");
       SignalDatabase.recipients().updateStorageId(self.getId(), generateKey());
-      self = Recipient.self().fresh();
+      self   = Recipient.self().fresh();
       record = recipientTable.getRecordForSync(self.getId());
     }
 
@@ -151,19 +152,19 @@ record = recipientTable.getRecordForSync(self.getId());
                                                                  .setPhoneNumberSharingMode(StorageSyncModels.localToRemotePhoneNumberSharingMode(SignalStore.phoneNumberPrivacy().getPhoneNumberSharingMode()))
                                                                  .setPinnedConversations(StorageSyncModels.localToRemotePinnedConversations(pinned))
                                                                  .setPreferContactAvatars(SignalStore.settings().isPreferSystemContactPhotos())
-                                                                 .setPayments(SignalStore.paymentsValues().mobileCoinPaymentsEnabled(), Optional.ofNullable(SignalStore.paymentsValues().getPaymentsEntropy()).map(Entropy::getBytes).orElse(null))
+                                                                 .setPayments(SignalStore.payments().mobileCoinPaymentsEnabled(), Optional.ofNullable(SignalStore.payments().getPaymentsEntropy()).map(Entropy::getBytes).orElse(null))
                                                                  .setPrimarySendsSms(false)
                                                                  .setUniversalExpireTimer(SignalStore.settings().getUniversalExpireTimer())
-                                                                 .setDefaultReactions(SignalStore.emojiValues().getReactions())
-                                                                 .setSubscriber(StorageSyncModels.localToRemoteSubscriber(SignalStore.signalDonationsValues().getSubscriber()))
-                                                                 .setDisplayBadgesOnProfile(SignalStore.signalDonationsValues().getDisplayBadgesOnProfile())
-                                                                 .setSubscriptionManuallyCancelled(SignalStore.signalDonationsValues().isUserManuallyCancelled())
+                                                                 .setDefaultReactions(SignalStore.emoji().getReactions())
+                                                                 .setSubscriber(StorageSyncModels.localToRemoteSubscriber(InAppPaymentsRepository.getSubscriber(InAppPaymentSubscriberRecord.Type.DONATION)))
+                                                                 .setDisplayBadgesOnProfile(SignalStore.inAppPayments().getDisplayBadgesOnProfile())
+                                                                 .setSubscriptionManuallyCancelled(InAppPaymentsRepository.isUserManuallyCancelled(InAppPaymentSubscriberRecord.Type.DONATION))
                                                                  .setKeepMutedChatsArchived(SignalStore.settings().shouldKeepMutedChatsArchived())
-                                                                 .setHasSetMyStoriesPrivacy(SignalStore.storyValues().getUserHasBeenNotifiedAboutStories())
-                                                                 .setHasViewedOnboardingStory(SignalStore.storyValues().getUserHasViewedOnboardingStory())
-                                                                 .setStoriesDisabled(SignalStore.storyValues().isFeatureDisabled())
+                                                                 .setHasSetMyStoriesPrivacy(SignalStore.story().getUserHasBeenNotifiedAboutStories())
+                                                                 .setHasViewedOnboardingStory(SignalStore.story().getUserHasViewedOnboardingStory())
+                                                                 .setStoriesDisabled(SignalStore.story().isFeatureDisabled())
                                                                  .setStoryViewReceiptsState(storyViewReceiptsState)
-                                                                 .setHasSeenGroupStoryEducationSheet(SignalStore.storyValues().getUserHasSeenGroupStoryEducationSheet())
+                                                                 .setHasSeenGroupStoryEducationSheet(SignalStore.story().getUserHasSeenGroupStoryEducationSheet())
                                                                  .setUsername(SignalStore.account().getUsername())
                                                                  .setHasCompletedUsernameOnboarding(SignalStore.uiHints().hasCompletedUsernameOnboarding());
 
@@ -196,42 +197,40 @@ public static void applyAccountStorageSyncUpdates(@NonNull Context context, @Non
     SignalStore.phoneNumberPrivacy().setPhoneNumberDiscoverabilityMode(update.getNew().isPhoneNumberUnlisted() ? PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE : PhoneNumberDiscoverabilityMode.DISCOVERABLE);
     SignalStore.phoneNumberPrivacy().setPhoneNumberSharingMode(StorageSyncModels.remoteToLocalPhoneNumberSharingMode(update.getNew().getPhoneNumberSharingMode()));
     SignalStore.settings().setPreferSystemContactPhotos(update.getNew().isPreferContactAvatars());
-    SignalStore.paymentsValues().setEnabledAndEntropy(update.getNew().getPayments().isEnabled(), Entropy.fromBytes(update.getNew().getPayments().getEntropy().orElse(null)));
+    SignalStore.payments().setEnabledAndEntropy(update.getNew().getPayments().isEnabled(), Entropy.fromBytes(update.getNew().getPayments().getEntropy().orElse(null)));
     SignalStore.settings().setUniversalExpireTimer(update.getNew().getUniversalExpireTimer());
-    SignalStore.emojiValues().setReactions(update.getNew().getDefaultReactions());
-    SignalStore.signalDonationsValues().setDisplayBadgesOnProfile(update.getNew().isDisplayBadgesOnProfile());
+    SignalStore.emoji().setReactions(update.getNew().getDefaultReactions());
+    SignalStore.inAppPayments().setDisplayBadgesOnProfile(update.getNew().isDisplayBadgesOnProfile());
     SignalStore.settings().setKeepMutedChatsArchived(update.getNew().isKeepMutedChatsArchived());
-    SignalStore.storyValues().setUserHasBeenNotifiedAboutStories(update.getNew().hasSetMyStoriesPrivacy());
-    SignalStore.storyValues().setUserHasViewedOnboardingStory(update.getNew().hasViewedOnboardingStory());
-    SignalStore.storyValues().setFeatureDisabled(update.getNew().isStoriesDisabled());
-    SignalStore.storyValues().setUserHasSeenGroupStoryEducationSheet(update.getNew().hasSeenGroupStoryEducationSheet());
+    SignalStore.story().setUserHasBeenNotifiedAboutStories(update.getNew().hasSetMyStoriesPrivacy());
+    SignalStore.story().setUserHasViewedOnboardingStory(update.getNew().hasViewedOnboardingStory());
+    SignalStore.story().setFeatureDisabled(update.getNew().isStoriesDisabled());
+    SignalStore.story().setUserHasSeenGroupStoryEducationSheet(update.getNew().hasSeenGroupStoryEducationSheet());
     SignalStore.uiHints().setHasCompletedUsernameOnboarding(update.getNew().hasCompletedUsernameOnboarding());
 
     if (update.getNew().getStoryViewReceiptsState() == OptionalBool.UNSET) {
-      SignalStore.storyValues().setViewedReceiptsEnabled(update.getNew().isReadReceiptsEnabled());
+      SignalStore.story().setViewedReceiptsEnabled(update.getNew().isReadReceiptsEnabled());
     } else {
-      SignalStore.storyValues().setViewedReceiptsEnabled(update.getNew().getStoryViewReceiptsState() == OptionalBool.ENABLED);
+      SignalStore.story().setViewedReceiptsEnabled(update.getNew().getStoryViewReceiptsState() == OptionalBool.ENABLED);
     }
 
     if (update.getNew().getStoryViewReceiptsState() == OptionalBool.UNSET) {
-      SignalStore.storyValues().setViewedReceiptsEnabled(update.getNew().isReadReceiptsEnabled());
+      SignalStore.story().setViewedReceiptsEnabled(update.getNew().isReadReceiptsEnabled());
     } else {
-      SignalStore.storyValues().setViewedReceiptsEnabled(update.getNew().getStoryViewReceiptsState() == OptionalBool.ENABLED);
+      SignalStore.story().setViewedReceiptsEnabled(update.getNew().getStoryViewReceiptsState() == OptionalBool.ENABLED);
     }
 
-    if (update.getNew().isSubscriptionManuallyCancelled()) {
-      SignalStore.signalDonationsValues().updateLocalStateForManualCancellation();
-    } else {
-      SignalStore.signalDonationsValues().clearUserManuallyCancelled();
+    InAppPaymentSubscriberRecord remoteSubscriber = StorageSyncModels.remoteToLocalSubscriber(update.getNew().getSubscriber(), InAppPaymentSubscriberRecord.Type.DONATION);
+    if (remoteSubscriber != null) {
+      InAppPaymentsRepository.setSubscriber(remoteSubscriber);
     }
 
-    Subscriber subscriber = StorageSyncModels.remoteToLocalSubscriber(update.getNew().getSubscriber());
-    if (subscriber != null) {
-      SignalStore.signalDonationsValues().setSubscriber(subscriber);
+    if (update.getNew().isSubscriptionManuallyCancelled() && !update.getOld().isSubscriptionManuallyCancelled()) {
+      SignalStore.inAppPayments().updateLocalStateForManualCancellation(InAppPaymentSubscriberRecord.Type.DONATION);
     }
 
     if (fetchProfile && update.getNew().getAvatarUrlPath().isPresent()) {
-      ApplicationDependencies.getJobManager().add(new RetrieveProfileAvatarJob(self, update.getNew().getAvatarUrlPath().get()));
+      AppDependencies.getJobManager().add(new RetrieveProfileAvatarJob(self, update.getNew().getAvatarUrlPath().get()));
     }
 
     if (!update.getNew().getUsername().equals(update.getOld().getUsername())) {
@@ -242,21 +241,21 @@ public static void applyAccountStorageSyncUpdates(@NonNull Context context, @Non
 
     if (update.getNew().getUsernameLink() != null) {
       SignalStore.account().setUsernameLink(
-        new UsernameLinkComponents(
-          update.getNew().getUsernameLink().entropy.toByteArray(),
-          UuidUtil.parseOrThrow(update.getNew().getUsernameLink().serverId.toByteArray())
-        )
+          new UsernameLinkComponents(
+              update.getNew().getUsernameLink().entropy.toByteArray(),
+              UuidUtil.parseOrThrow(update.getNew().getUsernameLink().serverId.toByteArray())
+          )
       );
       SignalStore.misc().setUsernameQrCodeColorScheme(StorageSyncModels.remoteToLocalUsernameColor(update.getNew().getUsernameLink().color));
     }
   }
 
   public static void scheduleSyncForDataChange() {
-    if (!SignalStore.registrationValues().isRegistrationComplete()) {
+    if (!SignalStore.registration().isRegistrationComplete()) {
       Log.d(TAG, "Registration still ongoing. Ignore sync request.");
       return;
     }
-    ApplicationDependencies.getJobManager().add(new StorageSyncJob());
+    AppDependencies.getJobManager().add(new StorageSyncJob());
   }
 
   public static void scheduleRoutineSync() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java
index 9b8f31e198..dc4f5deb1e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.java
@@ -13,11 +13,13 @@
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.DistributionListId;
 import org.thoughtcrime.securesms.database.model.DistributionListRecord;
+import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord;
 import org.thoughtcrime.securesms.database.model.RecipientRecord;
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.subscription.Subscriber;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
 import org.whispersystems.signalservice.api.storage.SignalContactRecord;
@@ -31,6 +33,7 @@
 import org.whispersystems.signalservice.internal.storage.protos.ContactRecord.IdentityState;
 import org.whispersystems.signalservice.internal.storage.protos.GroupV2Record;
 
+import java.util.Currency;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -275,17 +278,39 @@ private static IdentityState localToRemoteIdentityState(@NonNull IdentityTable.V
     }
   }
 
-  public static @NonNull SignalAccountRecord.Subscriber localToRemoteSubscriber(@Nullable Subscriber subscriber) {
+  /**
+   * TODO - need to store the subscriber type
+   */
+  public static @NonNull SignalAccountRecord.Subscriber localToRemoteSubscriber(@Nullable InAppPaymentSubscriberRecord subscriber) {
     if (subscriber == null) {
       return new SignalAccountRecord.Subscriber(null, null);
     } else {
-      return new SignalAccountRecord.Subscriber(subscriber.getCurrencyCode(), subscriber.getSubscriberId().getBytes());
+      return new SignalAccountRecord.Subscriber(subscriber.getCurrency().getCurrencyCode(), subscriber.getSubscriberId().getBytes());
     }
   }
 
-  public static @Nullable Subscriber remoteToLocalSubscriber(@NonNull SignalAccountRecord.Subscriber subscriber) {
+  public static @Nullable InAppPaymentSubscriberRecord remoteToLocalSubscriber(
+      @NonNull SignalAccountRecord.Subscriber subscriber,
+      @NonNull InAppPaymentSubscriberRecord.Type type
+  ) {
     if (subscriber.getId().isPresent()) {
-      return new Subscriber(SubscriberId.fromBytes(subscriber.getId().get()), subscriber.getCurrencyCode().get());
+      SubscriberId                       subscriberId          = SubscriberId.fromBytes(subscriber.getId().get());
+      InAppPaymentSubscriberRecord       localSubscriberRecord = SignalDatabase.inAppPaymentSubscribers().getBySubscriberId(subscriberId);
+      boolean                            requiresCancel        = localSubscriberRecord != null && localSubscriberRecord.getRequiresCancel();
+      InAppPaymentData.PaymentMethodType paymentMethodType     = localSubscriberRecord != null ? localSubscriberRecord.getPaymentMethodType() : InAppPaymentData.PaymentMethodType.UNKNOWN;
+
+      Currency currency;
+      if (subscriber.getCurrencyCode().isEmpty()) {
+        return null;
+      } else {
+        try {
+          currency = Currency.getInstance(subscriber.getCurrencyCode().get());
+        } catch (IllegalArgumentException e) {
+          return null;
+        }
+      }
+
+      return new InAppPaymentSubscriberRecord(subscriberId, currency, type, requiresCancel, paymentMethodType);
     } else {
       return null;
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/GroupStoryEducationSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/GroupStoryEducationSheet.kt
index ad0e7dc4a4..b6cd533cf0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/GroupStoryEducationSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/GroupStoryEducationSheet.kt
@@ -28,7 +28,7 @@ class GroupStoryEducationSheet : FixedRoundedCornerBottomSheetDialogFragment() {
   }
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    SignalStore.storyValues().userHasSeenGroupStoryEducationSheet = true
+    SignalStore.story.userHasSeenGroupStoryEducationSheet = true
     SignalExecutors.BOUNDED_IO.execute { Stories.onStorySettingsChanged(Recipient.self().id) }
 
     view.findViewById<MaterialButton>(R.id.next).setOnClickListener {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt
index f82b2ce45e..33c40ffaa5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt
@@ -19,7 +19,7 @@ import org.thoughtcrime.securesms.database.AttachmentTable.TransformProperties
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.DistributionListId
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mediasend.Media
@@ -64,7 +64,7 @@ object Stories {
    */
   @JvmStatic
   fun isFeatureEnabled(): Boolean {
-    return !SignalStore.storyValues().isFeatureDisabled
+    return !SignalStore.story.isFeatureDisabled
   }
 
   fun getHeaderAction(onClick: () -> Unit): HeaderAction {
@@ -83,7 +83,7 @@ object Stories {
 
   fun sendTextStories(messages: List<OutgoingMessage>): Completable {
     return Completable.create { emitter ->
-      MessageSender.sendStories(ApplicationDependencies.getApplication(), messages, null, null)
+      MessageSender.sendStories(AppDependencies.application, messages, null, null)
       emitter.onComplete()
     }
   }
@@ -136,11 +136,11 @@ object Stories {
   fun enqueueAttachmentsFromStoryForDownloadSync(record: MmsMessageRecord, ignoreAutoDownloadConstraints: Boolean) {
     SignalDatabase.attachments.getAttachmentsForMessage(record.id).filterNot { it.isSticker }.forEach {
       val job = AttachmentDownloadJob(record.id, it.attachmentId, ignoreAutoDownloadConstraints)
-      ApplicationDependencies.getJobManager().add(job)
+      AppDependencies.jobManager.add(job)
     }
 
     if (record.hasLinkPreview() && record.linkPreviews[0].attachmentId != null) {
-      ApplicationDependencies.getJobManager().add(
+      AppDependencies.jobManager.add(
         AttachmentDownloadJob(record.id, record.linkPreviews[0].attachmentId!!, true)
       )
     }
@@ -279,7 +279,7 @@ object Stories {
       var player: ExoPlayer? = null
       val countDownLatch = CountDownLatch(1)
       ThreadUtil.runOnMainSync {
-        val mainThreadPlayer = ApplicationDependencies.getExoPlayerPool().get("stories_duration_check")
+        val mainThreadPlayer = AppDependencies.exoPlayerPool.get("stories_duration_check")
         if (mainThreadPlayer == null) {
           Log.w(TAG, "Could not get a player from the pool, so we cannot get the length of the video.")
           countDownLatch.countDown()
@@ -309,7 +309,7 @@ object Stories {
       ThreadUtil.runOnMainSync {
         val mainThreadPlayer = player
         if (mainThreadPlayer != null) {
-          ApplicationDependencies.getExoPlayerPool().pool(mainThreadPlayer)
+          AppDependencies.exoPlayerPool.pool(mainThreadPlayer)
         }
       }
 
@@ -359,7 +359,8 @@ object Stories {
         media.isVideoGif,
         media.bucketId,
         media.caption,
-        Optional.of(transformProperties)
+        Optional.of(transformProperties),
+        media.fileName
       )
     }
 
@@ -398,6 +399,7 @@ object Stories {
         videoSlide.isVideoGif,
         Optional.empty(),
         videoSlide.caption,
+        Optional.empty(),
         Optional.empty()
       )
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/StorySlateView.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/StorySlateView.kt
index 73f6c61821..4c466074f4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/StorySlateView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/StorySlateView.kt
@@ -12,7 +12,7 @@ import com.bumptech.glide.Glide
 import org.signal.core.util.getParcelableCompat
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.blurhash.BlurHash
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.visible
@@ -96,7 +96,7 @@ class StorySlateView @JvmOverloads constructor(
     unavailableText.visible = false
     errorText.visible = true
 
-    if (NetworkConstraint.isMet(ApplicationDependencies.getApplication())) {
+    if (NetworkConstraint.isMet(AppDependencies.application)) {
       errorText.setText(R.string.StorySlateView__couldnt_load_content)
     } else {
       errorText.setText(R.string.StorySlateView__no_internet_connection)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/StoryTextPostModel.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/StoryTextPostModel.kt
index 17dcc46ba6..42aa610fd8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/StoryTextPostModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/StoryTextPostModel.kt
@@ -26,7 +26,7 @@ import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
 import org.thoughtcrime.securesms.database.model.databaseprotos.StoryTextPost
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.fonts.TextFont
 import org.thoughtcrime.securesms.fonts.TextToScript
 import org.thoughtcrime.securesms.fonts.TypefaceCache
@@ -125,14 +125,14 @@ data class StoryTextPostModel(
           this
         }
       }
-      val view = StoryTextPostView(ContextThemeWrapper(ApplicationDependencies.getApplication(), R.style.TextSecure_DarkNoActionBar))
+      val view = StoryTextPostView(ContextThemeWrapper(AppDependencies.application, R.style.TextSecure_DarkNoActionBar))
       val typeface = TypefaceCache.get(
-        ApplicationDependencies.getApplication(),
+        AppDependencies.application,
         TextFont.fromStyle(source.storyTextPost.style),
         TextToScript.guessScript(source.storyTextPost.body)
       ).safeBlockingGet()
 
-      val displayWidth: Int = ApplicationDependencies.getApplication().resources.displayMetrics.widthPixels
+      val displayWidth: Int = AppDependencies.application.resources.displayMetrics.widthPixels
       val arHeight: Int = (RENDER_HW_AR * displayWidth).toInt()
 
       val linkPreview = (message as? MmsMessageRecord)?.linkPreviews?.firstOrNull()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/StoryTextPostView.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/StoryTextPostView.kt
index 3732af36cf..7afbcb96c3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/StoryTextPostView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/StoryTextPostView.kt
@@ -22,6 +22,7 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.StoryTextPost
 import org.thoughtcrime.securesms.fonts.TextFont
 import org.thoughtcrime.securesms.linkpreview.LinkPreview
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewState
+import org.thoughtcrime.securesms.mediasend.v2.text.TextStoryBackgroundColors
 import org.thoughtcrime.securesms.mediasend.v2.text.TextStoryPostCreationState
 import org.thoughtcrime.securesms.mediasend.v2.text.TextStoryScale
 import org.thoughtcrime.securesms.mediasend.v2.text.TextStoryTextWatcher
@@ -131,7 +132,7 @@ class StoryTextPostView @JvmOverloads constructor(
     linkPreviewView.visible = false
 
     val font: TextFont = TextFont.fromStyle(storyTextPost.style)
-    setPostBackground(ChatColors.forChatColor(ChatColors.Id.NotSet, storyTextPost.background!!).chatBubbleMask)
+    setPostBackground(ChatColors.forChatColor(ChatColors.Id.NotSet, storyTextPost.background ?: TextStoryBackgroundColors.getInitialBackgroundColor().serialize()).chatBubbleMask)
 
     if (font.isAllCaps) {
       setText(storyTextPost.body.uppercase(Locale.getDefault()), false)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt
index 10ec1b208e..eb36c63098 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt
@@ -43,14 +43,14 @@ import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectFor
 import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragmentArgs
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.database.model.StoryViewState
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.events.ReminderUpdateEvent
 import org.thoughtcrime.securesms.main.Material3OnScrollHelperBinder
 import org.thoughtcrime.securesms.main.SearchBinder
 import org.thoughtcrime.securesms.mediasend.camerax.CameraXUtil
 import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionActivity
 import org.thoughtcrime.securesms.permissions.Permissions
-import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity
+import org.thoughtcrime.securesms.registration.ui.RegistrationActivity
 import org.thoughtcrime.securesms.safety.SafetyNumberBottomSheet
 import org.thoughtcrime.securesms.stories.StoryTextPostModel
 import org.thoughtcrime.securesms.stories.StoryViewerArgs
@@ -111,7 +111,7 @@ class StoriesLandingFragment : DSLSettingsFragment(layoutId = R.layout.stories_l
     initializeSearchAction()
     viewModel.markStoriesRead()
 
-    ApplicationDependencies.getExpireStoriesManager().scheduleIfNecessary()
+    AppDependencies.expireStoriesManager.scheduleIfNecessary()
     EventBus.getDefault().register(this)
   }
 
@@ -187,7 +187,7 @@ class StoriesLandingFragment : DSLSettingsFragment(layoutId = R.layout.stories_l
       }
 
       R.id.reminder_action_re_register -> {
-        startActivity(RegistrationNavigationActivity.newIntentForReRegistration(requireContext()))
+        startActivity(RegistrationActivity.newIntentForReRegistration(requireContext()))
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt
index b9b7042223..876005bed0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt
@@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.database.model.DistributionListId
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.StoryResult
 import org.thoughtcrime.securesms.database.model.StoryViewState
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.MultiDeviceReadUpdateJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -134,12 +134,12 @@ class StoriesLandingRepository(context: Context) {
         refresh(it)
       }
 
-      ApplicationDependencies.getDatabaseObserver().registerConversationObserver(messageRecords.first().threadId, newRepliesObserver)
+      AppDependencies.databaseObserver.registerConversationObserver(messageRecords.first().threadId, newRepliesObserver)
       val liveRecipient = Recipient.live(sender.id)
       liveRecipient.observeForever(recipientChangedObserver)
 
       emitter.setCancellable {
-        ApplicationDependencies.getDatabaseObserver().unregisterObserver(newRepliesObserver)
+        AppDependencies.databaseObserver.unregisterObserver(newRepliesObserver)
         liveRecipient.removeForeverObserver(recipientChangedObserver)
       }
 
@@ -165,7 +165,7 @@ class StoriesLandingRepository(context: Context) {
   fun markStoriesRead() {
     SignalExecutors.BOUNDED_IO.execute {
       val messageInfos: List<MessageTable.MarkedMessageInfo> = SignalDatabase.messages.markAllIncomingStoriesRead()
-      val releaseThread: Long? = SignalStore.releaseChannelValues().releaseChannelRecipientId?.let { SignalDatabase.threads.getThreadIdIfExistsFor(it) }
+      val releaseThread: Long? = SignalStore.releaseChannel.releaseChannelRecipientId?.let { SignalDatabase.threads.getThreadIdIfExistsFor(it) }
 
       MultiDeviceReadUpdateJob.enqueue(messageInfos.filter { it.threadId == releaseThread }.map { it.syncMessageId })
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesItem.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesItem.kt
index 002521b184..d05c66ae05 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesItem.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/my/MyStoriesItem.kt
@@ -114,7 +114,7 @@ object MyStoriesItem {
       presentDateOrStatus(model)
 
       if (model.distributionStory.messageRecord.isSent) {
-        if (SignalStore.storyValues().viewedReceiptsEnabled) {
+        if (SignalStore.story.viewedReceiptsEnabled) {
           viewCount.text = context.resources.getQuantityString(
             R.plurals.MyStories__d_views,
             model.distributionStory.views,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/connections/ViewAllSignalConnectionsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/connections/ViewAllSignalConnectionsFragment.kt
index 37433f78e7..10d3834543 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/connections/ViewAllSignalConnectionsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/connections/ViewAllSignalConnectionsFragment.kt
@@ -29,7 +29,6 @@ class ViewAllSignalConnectionsFragment : Fragment(R.layout.view_all_signal_conne
       selectionLimits = SelectionLimits(0, 0),
       displayOptions = ContactSearchAdapter.DisplayOptions(
         displayCheckBox = false,
-        displaySmsTag = ContactSearchAdapter.DisplaySmsTag.IF_NOT_REGISTERED,
         displaySecondaryInformation = ContactSearchAdapter.DisplaySecondaryInformation.NEVER
       ),
       mapStateToConfiguration = { getConfiguration() },
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/my/MyStorySettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/my/MyStorySettingsViewModel.kt
index 1d9ff98788..402a079ad9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/my/MyStorySettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/my/MyStorySettingsViewModel.kt
@@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.stories.Stories
 import org.thoughtcrime.securesms.util.livedata.Store
 
 class MyStorySettingsViewModel @JvmOverloads constructor(private val repository: MyStorySettingsRepository = MyStorySettingsRepository()) : ViewModel() {
-  private val store = Store(MyStorySettingsState(hasUserPerformedManualSelection = SignalStore.storyValues().userHasBeenNotifiedAboutStories))
+  private val store = Store(MyStorySettingsState(hasUserPerformedManualSelection = SignalStore.story.userHasBeenNotifiedAboutStories))
   private val disposables = CompositeDisposable()
 
   val state: LiveData<MyStorySettingsState> = store.stateLiveData
@@ -44,7 +44,7 @@ class MyStorySettingsViewModel @JvmOverloads constructor(private val repository:
       state.copy(hasUserPerformedManualSelection = true)
     }
 
-    SignalStore.storyValues().userHasBeenNotifiedAboutStories = true
+    SignalStore.story.userHasBeenNotifiedAboutStories = true
 
     return if (privacyMode == state.value!!.myStoryPrivacyState.privacyMode) {
       Completable.fromAction {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/privacy/ChooseInitialMyStoryMembershipViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/privacy/ChooseInitialMyStoryMembershipViewModel.kt
index a7b2271dec..ee3e252849 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/privacy/ChooseInitialMyStoryMembershipViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/privacy/ChooseInitialMyStoryMembershipViewModel.kt
@@ -48,7 +48,7 @@ class ChooseInitialMyStoryMembershipViewModel @JvmOverloads constructor(
 
   fun save(): Single<RecipientId> {
     return Single.fromCallable<RecipientId> {
-      SignalStore.storyValues().userHasBeenNotifiedAboutStories = true
+      SignalStore.story.userHasBeenNotifiedAboutStories = true
       Stories.onStorySettingsChanged(Recipient.self().id)
       store.state.recipientId!!
     }.observeOn(AndroidSchedulers.mainThread())
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsFragment.kt
index 37d49820fc..b88bfdbbda 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsFragment.kt
@@ -189,7 +189,7 @@ class StoriesPrivacySettingsFragment :
   }
 
   override fun onGroupStoryClicked() {
-    if (SignalStore.storyValues().userHasSeenGroupStoryEducationSheet) {
+    if (SignalStore.story.userHasSeenGroupStoryEducationSheet) {
       onGroupStoryEducationSheetNext()
     } else {
       GroupStoryEducationSheet().show(childFragmentManager, GroupStoryEducationSheet.KEY)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsRepository.kt
index 6d9a640004..904c285192 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsRepository.kt
@@ -6,7 +6,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.core.util.concurrent.SignalExecutors
 import org.thoughtcrime.securesms.database.GroupTable
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -25,9 +25,9 @@ class StoriesPrivacySettingsRepository {
 
   fun setStoriesEnabled(isEnabled: Boolean): Completable {
     return Completable.fromAction {
-      SignalStore.storyValues().isFeatureDisabled = !isEnabled
+      SignalStore.story.isFeatureDisabled = !isEnabled
       Stories.onStorySettingsChanged(Recipient.self().id)
-      ApplicationDependencies.restartAllNetworkConnections()
+      AppDependencies.resetNetwork(restartMessageObserver = true)
 
       SignalDatabase.messages.getAllOutgoingStories(false, -1).use { reader ->
         reader.map { record -> record.id }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsViewModel.kt
index 40ccfc834c..a6bba1ca94 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/story/StoriesPrivacySettingsViewModel.kt
@@ -28,7 +28,7 @@ class StoriesPrivacySettingsViewModel(
   private val store = RxStore(
     StoriesPrivacySettingsState(
       areStoriesEnabled = Stories.isFeatureEnabled(),
-      areViewReceiptsEnabled = SignalStore.storyValues().viewedReceiptsEnabled
+      areViewReceiptsEnabled = SignalStore.story.viewedReceiptsEnabled
     )
   )
 
@@ -84,8 +84,8 @@ class StoriesPrivacySettingsViewModel(
   }
 
   fun toggleViewReceipts() {
-    SignalStore.storyValues().viewedReceiptsEnabled = !SignalStore.storyValues().viewedReceiptsEnabled
-    store.update { it.copy(areViewReceiptsEnabled = SignalStore.storyValues().viewedReceiptsEnabled) }
+    SignalStore.story.viewedReceiptsEnabled = !SignalStore.story.viewedReceiptsEnabled
+    store.update { it.copy(areViewReceiptsEnabled = SignalStore.story.viewedReceiptsEnabled) }
     repository.onSettingsChanged()
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/tabs/ConversationListTabsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/tabs/ConversationListTabsFragment.kt
index e6e19697f3..9d4ff6ad57 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/tabs/ConversationListTabsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/tabs/ConversationListTabsFragment.kt
@@ -89,7 +89,7 @@ class ConversationListTabsFragment : Fragment(R.layout.conversation_list_tabs) {
   }
 
   private fun updateTabsVisibility() {
-    if (SignalStore.settings().useCompactNavigationBar) {
+    if (SignalStore.settings.useCompactNavigationBar) {
       smallConstraintSet.applyTo(binding.root)
       binding.root.minHeight = 48.dp
     } else {
@@ -119,7 +119,7 @@ class ConversationListTabsFragment : Fragment(R.layout.conversation_list_tabs) {
       it.visible = Stories.isFeatureEnabled()
     }
 
-    if (SignalStore.settings().useCompactNavigationBar) {
+    if (SignalStore.settings.useCompactNavigationBar) {
       listOf(
         binding.callsTabLabel,
         binding.chatsTabLabel,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/AddToGroupStoryDelegate.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/AddToGroupStoryDelegate.kt
index 7a422d41c1..805ad76613 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/AddToGroupStoryDelegate.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/AddToGroupStoryDelegate.kt
@@ -17,7 +17,7 @@ import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.mediasend.MediaSendActivityResult
 import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionActivity
 import org.thoughtcrime.securesms.mms.OutgoingMessage
@@ -117,7 +117,7 @@ class AddToGroupStoryDelegate(
         }
 
       MessageSender.sendStories(
-        ApplicationDependencies.getApplication(),
+        AppDependencies.application,
         secureMessages,
         null
       ) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryMutePolicy.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryMutePolicy.kt
index 5cd4741ccd..ada2c70654 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryMutePolicy.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryMutePolicy.kt
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.stories.viewer
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.util.AppForegroundObserver
 
 /**
@@ -11,7 +11,7 @@ object StoryMutePolicy : AppForegroundObserver.Listener {
   var isContentMuted: Boolean = true
 
   fun initialize() {
-    ApplicationDependencies.getAppForegroundObserver().addListener(this)
+    AppDependencies.appForegroundObserver.addListener(this)
   }
 
   override fun onBackground() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerFragment.kt
index 263d73a424..70cb4ee733 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerFragment.kt
@@ -134,7 +134,7 @@ class StoryViewerFragment :
     } else {
       viewModel.refresh()
 
-      if (!SignalStore.storyValues().userHasSeenFirstNavView) {
+      if (!SignalStore.story.userHasSeenFirstNavView) {
         StoryFirstTimeNavigationFragment().show(childFragmentManager, null)
       }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerPagerAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerPagerAdapter.kt
index 68660f6c8a..c841889c7e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerPagerAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerPagerAdapter.kt
@@ -35,6 +35,10 @@ class StoryViewerPagerAdapter(
     return pages[position].toLong()
   }
 
+  override fun containsItem(itemId: Long): Boolean {
+    return pages.find { it.toLong() == itemId } != null
+  }
+
   override fun createFragment(position: Int): Fragment {
     return StoryViewerPageFragment.create(arguments.copy(recipientId = pages[position]))
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerRepository.kt
index 6f111fa402..273356fc66 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerRepository.kt
@@ -41,7 +41,7 @@ open class StoryViewerRepository {
     return Single.create { emitter ->
       val myStoriesId = SignalDatabase.recipients.getOrInsertFromDistributionListId(DistributionListId.MY_STORY)
       val myStories = Recipient.resolved(myStoriesId)
-      val releaseChannelId = SignalStore.releaseChannelValues().releaseChannelRecipientId
+      val releaseChannelId = SignalStore.releaseChannel.releaseChannelRecipientId
       val recipientIds = SignalDatabase.messages.getOrderedStoryRecipientsAndIds(isOutgoingOnly).groupBy {
         val recipient = Recipient.resolved(it.recipientId)
         if (recipient.isDistributionList) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerViewModel.kt
index ea1400889b..67f179b28d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerViewModel.kt
@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.stories.Stories
 import org.thoughtcrime.securesms.stories.StoryViewerArgs
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.rx.RxStore
 import java.util.concurrent.TimeUnit
 import kotlin.math.max
@@ -172,7 +172,7 @@ class StoryViewerViewModel(
       .filter { it != RecipientId.UNKNOWN }
       .distinctUntilChanged()
       .subscribe {
-        Stories.enqueueNextStoriesForDownload(it, true, FeatureFlags.storiesAutoDownloadMaximum())
+        Stories.enqueueNextStoriesForDownload(it, true, RemoteConfig.storiesAutoDownloadMaximum)
       }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/first/StoryFirstTimeNavigationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/first/StoryFirstTimeNavigationFragment.kt
index 10186799c1..91ce3b7e50 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/first/StoryFirstTimeNavigationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/first/StoryFirstTimeNavigationFragment.kt
@@ -63,13 +63,13 @@ class StoryFirstTimeNavigationFragment : DialogFragment(R.layout.story_viewer_fi
   }
 
   override fun userHasSeenFirstNavigationView(): Boolean {
-    return SignalStore.storyValues().userHasSeenFirstNavView
+    return SignalStore.story.userHasSeenFirstNavView
   }
 
   override fun onGotItClicked() {
     dismissAllowingStateLoss()
 
-    SignalStore.storyValues().userHasSeenFirstNavView = true
+    SignalStore.story.userHasSeenFirstNavView = true
     viewModel.setIsDisplayingFirstTimeNavigation(false)
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt
index f15a2615df..c25b3a8821 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt
@@ -4,9 +4,8 @@ import android.animation.Animator
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
-import android.content.Context
 import android.content.res.ColorStateList
-import android.graphics.drawable.Drawable
+import android.graphics.Rect
 import android.media.AudioManager
 import android.os.Bundle
 import android.text.SpannableString
@@ -28,7 +27,6 @@ import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
 import androidx.core.view.GestureDetectorCompat
 import androidx.core.view.animation.PathInterpolatorCompat
-import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -52,13 +50,9 @@ import org.thoughtcrime.securesms.components.emoji.EmojiTextView
 import org.thoughtcrime.securesms.components.segmentedprogressbar.SegmentedProgressBar
 import org.thoughtcrime.securesms.components.segmentedprogressbar.SegmentedProgressBarListener
 import org.thoughtcrime.securesms.components.spoiler.SpoilerAnnotation
-import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto
-import org.thoughtcrime.securesms.contacts.avatars.FallbackPhoto20dp
-import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto
 import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey
 import org.thoughtcrime.securesms.conversation.ConversationIntents
 import org.thoughtcrime.securesms.conversation.MessageStyler
-import org.thoughtcrime.securesms.conversation.colors.AvatarColor
 import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardBottomSheet
 import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragment
 import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragmentArgs
@@ -72,7 +66,6 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.recipients.ui.bottomsheet.RecipientBottomSheetDialogFragment
 import org.thoughtcrime.securesms.safety.SafetyNumberBottomSheet
 import org.thoughtcrime.securesms.stories.StorySlateView
-import org.thoughtcrime.securesms.stories.StoryTextPostView
 import org.thoughtcrime.securesms.stories.StoryVolumeOverlayView
 import org.thoughtcrime.securesms.stories.dialogs.StoryContextMenu
 import org.thoughtcrime.securesms.stories.dialogs.StoryDialogs
@@ -136,6 +129,9 @@ class StoryViewerPageFragment :
 
   private val storyViewStateViewModel: StoryViewStateViewModel by viewModels()
 
+  private var textStoryIntersectProcessingEvents: Boolean = false
+  private val textStoryIntersectHitRect: Rect = Rect()
+
   private val viewModel: StoryViewerPageViewModel by viewModels(
     factoryProducer = {
       StoryViewerPageViewModel.Factory(
@@ -227,9 +223,6 @@ class StoryViewerPageFragment :
       addToGroupStoryButtonWrapper
     )
 
-    senderAvatar.setFallbackPhotoProvider(FallbackPhotoProvider())
-    groupAvatar.setFallbackPhotoProvider(FallbackPhotoProvider())
-
     closeView.setOnClickListener {
       requireActivity().onBackPressed()
     }
@@ -545,16 +538,30 @@ class StoryViewerPageFragment :
 
   private fun checkEventIntersectsClickableSpan(cardWrapper: ViewGroup, event: MotionEvent): Boolean {
     if (viewModel.getPost()?.content?.isText() != true) {
+      textStoryIntersectProcessingEvents = false
       return false
     }
 
     val action = event.action
     if (action != MotionEvent.ACTION_DOWN && action != MotionEvent.ACTION_UP) {
-      return false
+      return textStoryIntersectProcessingEvents
+    }
+
+    if (checkTextSpanIntersect(cardWrapper, event)) {
+      textStoryIntersectProcessingEvents = true
+      return true
     }
 
-    val storyTextPostView = cardWrapper.findViewById<StoryTextPostView>(R.id.text)
-    val textView = storyTextPostView.findViewById<TextView>(R.id.text_story_post_text)
+    if (checkLinkPreviewIntersect(cardWrapper, event)) {
+      textStoryIntersectProcessingEvents = true
+      return true
+    }
+
+    return false
+  }
+
+  private fun checkTextSpanIntersect(cardWrapper: ViewGroup, event: MotionEvent): Boolean {
+    val textView = cardWrapper.findViewById<TextView>(R.id.text_story_post_text)
     val spanned = textView.text as? Spanned ?: return false
 
     val textViewProjection = Projection.relativeToParent(cardWrapper, textView, null)
@@ -579,12 +586,28 @@ class StoryViewerPageFragment :
     }
 
     val clickables = spanned.getSpans(off, off, ClickableSpan::class.java)
-    if (clickables.isNotEmpty()) {
-      return true
-    }
+    return clickables.isNotEmpty()
+  }
+
+  private fun checkLinkPreviewIntersect(cardWrapper: ViewGroup, event: MotionEvent): Boolean {
+    Log.d(TAG, "Checking motion event for link preview intersect: ${event.x} ${event.y}")
 
-    val linkPreview = storyTextPostView.findViewById<View>(R.id.text_story_post_link_preview)
-    return linkPreview.isVisible
+    val linkPreviewView = cardWrapper.findViewById<View>(R.id.text_story_post_link_preview)
+    val viewProjection = Projection.relativeToParent(cardWrapper, linkPreviewView, null)
+      .translateY(linkPreviewView.translationY)
+
+    textStoryIntersectHitRect.set(
+      viewProjection.x.toInt(),
+      viewProjection.y.toInt(),
+      viewProjection.x.toInt() + viewProjection.width,
+      viewProjection.y.toInt() + viewProjection.height
+    )
+
+    viewProjection.release()
+
+    Log.d(TAG, "${event.x}, ${event.y} within $textStoryIntersectHitRect? ${textStoryIntersectHitRect.contains(event.x.toInt(), event.y.toInt())}")
+
+    return textStoryIntersectHitRect.contains(event.x.toInt(), event.y.toInt())
   }
 
   private fun calculateDurationForText(textContent: StoryPost.Content.TextContent): Long {
@@ -1344,30 +1367,6 @@ class StoryViewerPageFragment :
     }
   }
 
-  private class FallbackPhotoProvider : Recipient.FallbackPhotoProvider() {
-    override val photoForGroup: FallbackContactPhoto
-      get() = FallbackPhoto20dp(R.drawable.symbol_group_20)
-
-    override val photoForResolvingRecipient: FallbackContactPhoto
-      get() = throw UnsupportedOperationException("This provider does not support resolving recipients")
-
-    override val photoForLocalNumber: FallbackContactPhoto
-      get() = throw UnsupportedOperationException("This provider does not support local number")
-
-    override fun getPhotoForRecipientWithName(name: String, targetSize: Int): FallbackContactPhoto {
-      return FixedSizeGeneratedContactPhoto(name, R.drawable.symbol_person_20)
-    }
-
-    override val photoForRecipientWithoutName: FallbackContactPhoto
-      get() = FallbackPhoto20dp(R.drawable.symbol_person_20)
-  }
-
-  private class FixedSizeGeneratedContactPhoto(name: String, fallbackResId: Int) : GeneratedContactPhoto(name, fallbackResId) {
-    override fun newFallbackDrawable(context: Context, color: AvatarColor, inverted: Boolean): Drawable {
-      return FallbackPhoto20dp(fallbackResId).asDrawable(context, color, inverted)
-    }
-  }
-
   override fun onContentReady() {
     Log.d(TAG, "Story content is ready.")
     sharedViewModel.setContentIsReady()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageRepository.kt
index 8544bcf6c6..0c04bbcd32 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageRepository.kt
@@ -19,7 +19,7 @@ import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.StoryTextPost
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.MultiDeviceViewedUpdateJob
 import org.thoughtcrime.securesms.jobs.SendViewedReceiptJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -39,7 +39,7 @@ open class StoryViewerPageRepository(context: Context, private val storyViewStat
 
   private val context = context.applicationContext
 
-  fun isReadReceiptsEnabled(): Boolean = SignalStore.storyValues().viewedReceiptsEnabled
+  fun isReadReceiptsEnabled(): Boolean = SignalStore.story.viewedReceiptsEnabled
 
   private fun getStoryRecords(recipientId: RecipientId, isOutgoingOnly: Boolean): Observable<List<MessageRecord>> {
     return Observable.create { emitter ->
@@ -65,9 +65,9 @@ open class StoryViewerPageRepository(context: Context, private val storyViewStat
         refresh()
       }
 
-      ApplicationDependencies.getDatabaseObserver().registerStoryObserver(recipientId, storyObserver)
+      AppDependencies.databaseObserver.registerStoryObserver(recipientId, storyObserver)
       emitter.setCancellable {
-        ApplicationDependencies.getDatabaseObserver().unregisterObserver(storyObserver)
+        AppDependencies.databaseObserver.unregisterObserver(storyObserver)
       }
 
       refresh()
@@ -123,23 +123,23 @@ open class StoryViewerPageRepository(context: Context, private val storyViewStat
         }
       }
 
-      ApplicationDependencies.getDatabaseObserver().registerConversationObserver(threadId, conversationObserver)
-      ApplicationDependencies.getDatabaseObserver().registerMessageUpdateObserver(messageUpdateObserver)
+      AppDependencies.databaseObserver.registerConversationObserver(threadId, conversationObserver)
+      AppDependencies.databaseObserver.registerMessageUpdateObserver(messageUpdateObserver)
 
       val messageInsertObserver = DatabaseObserver.MessageObserver {
         refresh(SignalDatabase.messages.getMessageRecord(recordId))
       }
 
       if (recipient.isGroup) {
-        ApplicationDependencies.getDatabaseObserver().registerMessageInsertObserver(threadId, messageInsertObserver)
+        AppDependencies.databaseObserver.registerMessageInsertObserver(threadId, messageInsertObserver)
       }
 
       emitter.setCancellable {
-        ApplicationDependencies.getDatabaseObserver().unregisterObserver(conversationObserver)
-        ApplicationDependencies.getDatabaseObserver().unregisterObserver(messageUpdateObserver)
+        AppDependencies.databaseObserver.unregisterObserver(conversationObserver)
+        AppDependencies.databaseObserver.unregisterObserver(messageUpdateObserver)
 
         if (recipient.isGroup) {
-          ApplicationDependencies.getDatabaseObserver().unregisterObserver(messageInsertObserver)
+          AppDependencies.databaseObserver.unregisterObserver(messageInsertObserver)
         }
       }
 
@@ -176,13 +176,13 @@ open class StoryViewerPageRepository(context: Context, private val storyViewStat
       SignalExecutors.SERIAL.execute {
         val markedMessageInfo = SignalDatabase.messages.setIncomingMessageViewed(storyPost.id)
         if (markedMessageInfo != null) {
-          ApplicationDependencies.getDatabaseObserver().notifyConversationListListeners()
+          AppDependencies.databaseObserver.notifyConversationListListeners()
 
           if (storyPost.sender.isReleaseNotes) {
-            SignalStore.storyValues().userHasViewedOnboardingStory = true
+            SignalStore.story.userHasViewedOnboardingStory = true
             Stories.onStorySettingsChanged(Recipient.self().id)
           } else {
-            ApplicationDependencies.getJobManager().add(
+            AppDependencies.jobManager.add(
               SendViewedReceiptJob(
                 markedMessageInfo.threadId,
                 storyPost.sender.id,
@@ -204,7 +204,7 @@ open class StoryViewerPageRepository(context: Context, private val storyViewStat
   @CheckResult
   fun resend(messageRecord: MessageRecord): Completable {
     return Completable.fromAction {
-      MessageSender.resend(ApplicationDependencies.getApplication(), messageRecord)
+      MessageSender.resend(AppDependencies.application, messageRecord)
     }.subscribeOn(Schedulers.io())
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/post/StoryTextPostRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/post/StoryTextPostRepository.kt
index 5ba196fa04..7d2f483f02 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/post/StoryTextPostRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/post/StoryTextPostRepository.kt
@@ -7,7 +7,7 @@ import org.signal.core.util.Base64
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.StoryTextPost
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.fonts.TextFont
 import org.thoughtcrime.securesms.fonts.TextToScript
 import org.thoughtcrime.securesms.fonts.TypefaceCache
@@ -25,7 +25,7 @@ class StoryTextPostRepository {
       val textFont = TextFont.fromStyle(model.style)
       val script = TextToScript.guessScript(model.body)
 
-      TypefaceCache.get(ApplicationDependencies.getApplication(), textFont, script)
+      TypefaceCache.get(AppDependencies.application, textFont, script)
     }
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/composer/StoryReactionBar.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/composer/StoryReactionBar.kt
index a8203ddb08..a0d89f8e8b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/composer/StoryReactionBar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/composer/StoryReactionBar.kt
@@ -39,13 +39,13 @@ class StoryReactionBar @JvmOverloads constructor(
 
   init {
     if (!isInEditMode) {
-      val emojis = SignalStore.emojiValues().reactions
+      val emojis = SignalStore.emoji.reactions
       emojiViews.forEachIndexed { index, emojiImageView ->
         if (index == emojiViews.lastIndex) {
           emojiImageView.setImageResource(R.drawable.ic_any_emoji_32)
           emojiImageView.setOnClickListener { onOpenReactionPicker() }
         } else {
-          val emoji = SignalStore.emojiValues().getPreferredVariation(emojis[index])
+          val emoji = SignalStore.emoji.getPreferredVariation(emojis[index])
           emojiImageView.setImageEmoji(emoji)
           emojiImageView.setOnClickListener { onEmojiSelected(emoji) }
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/composer/StoryReplyComposer.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/composer/StoryReplyComposer.kt
index c9d57dedf9..e75f56b7ee 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/composer/StoryReplyComposer.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/composer/StoryReplyComposer.kt
@@ -178,7 +178,7 @@ class StoryReplyComposer @JvmOverloads constructor(
   }
 
   private fun getReactionEmojis(): List<MappingModel<*>> {
-    val reactionDisplayEmoji: List<Emoji> = SignalStore.emojiValues().reactions.map { Emoji(it) }
+    val reactionDisplayEmoji: List<Emoji> = SignalStore.emoji.reactions.map { Emoji(it) }
     val canonicalReactionEmoji: List<String> = reactionDisplayEmoji.map { EmojiSource.latest.variationsToCanonical[it.value] ?: it.value }
     val canonicalRecentReactionEmoji: Set<String> = LinkedHashSet(RecentEmojiPageModel(context, ReactWithAnyEmojiBottomSheetDialogFragment.REACTION_STORAGE_KEY).emoji) - canonicalReactionEmoji.toSet()
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/direct/StoryDirectReplyDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/direct/StoryDirectReplyDialogFragment.kt
index 8de00a3e85..6a19d6849f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/direct/StoryDirectReplyDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/direct/StoryDirectReplyDialogFragment.kt
@@ -84,7 +84,7 @@ class StoryDirectReplyDialogFragment :
             }
         }
 
-        if (SignalStore.uiHints().hasNotSeenTextFormattingAlert() && composer.input.hasStyling()) {
+        if (SignalStore.uiHints.hasNotSeenTextFormattingAlert() && composer.input.hasStyling()) {
           Dialogs.showFormattedTextDialog(requireContext(), sendReply)
         } else {
           sendReply.run()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyDataSource.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyDataSource.kt
index ad69dd021e..9a15b9f016 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyDataSource.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyDataSource.kt
@@ -7,7 +7,7 @@ import org.thoughtcrime.securesms.database.MessageTypes
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 
 class StoryGroupReplyDataSource(private val parentStoryId: Long) : PagedDataSource<MessageId, ReplyBody> {
@@ -42,7 +42,7 @@ class StoryGroupReplyDataSource(private val parentStoryId: Long) : PagedDataSour
       record.isRemoteDelete -> ReplyBody.RemoteDelete(record)
       MessageTypes.isStoryReaction(record.type) -> ReplyBody.Reaction(record)
       else -> ReplyBody.Text(
-        ConversationMessage.ConversationMessageFactory.createWithUnresolvedData(ApplicationDependencies.getApplication(), record, threadRecipient)
+        ConversationMessage.ConversationMessageFactory.createWithUnresolvedData(AppDependencies.application, record, threadRecipient)
       )
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyFragment.kt
index f5869682cf..028ae3df44 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyFragment.kt
@@ -44,7 +44,7 @@ import org.thoughtcrime.securesms.database.model.Mention
 import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.RetrieveProfileJob
 import org.thoughtcrime.securesms.keyboard.KeyboardPage
 import org.thoughtcrime.securesms.keyboard.KeyboardPagerViewModel
@@ -199,7 +199,7 @@ class StoryGroupReplyFragment :
         viewModel.state.collect { state ->
           if (markReadHelper == null && state.threadId > 0L) {
             if (isResumed) {
-              ApplicationDependencies.getMessageNotifier().setVisibleThread(ConversationId(state.threadId, storyId))
+              AppDependencies.messageNotifier.setVisibleThread(ConversationId(state.threadId, storyId))
             }
 
             markReadHelper = MarkReadHelper(ConversationId(state.threadId, storyId), requireContext(), viewLifecycleOwner)
@@ -235,13 +235,13 @@ class StoryGroupReplyFragment :
     super.onResume()
     val threadId = viewModel.stateSnapshot.threadId
     if (threadId != 0L) {
-      ApplicationDependencies.getMessageNotifier().setVisibleThread(ConversationId(threadId, storyId))
+      AppDependencies.messageNotifier.setVisibleThread(ConversationId(threadId, storyId))
     }
   }
 
   override fun onPause() {
     super.onPause()
-    ApplicationDependencies.getMessageNotifier().setVisibleThread(null)
+    AppDependencies.messageNotifier.setVisibleThread(null)
   }
 
   override fun onDestroyView() {
@@ -362,7 +362,7 @@ class StoryGroupReplyFragment :
       performSend(body, mentions, bodyRanges)
     }
 
-    if (SignalStore.uiHints().hasNotSeenTextFormattingAlert() && composer.input.hasStyling()) {
+    if (SignalStore.uiHints.hasNotSeenTextFormattingAlert() && composer.input.hasStyling()) {
       Dialogs.showFormattedTextDialog(requireContext(), send)
     } else {
       send.run()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyItem.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyItem.kt
index 96dad886ac..0246ddd467 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyItem.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyItem.kt
@@ -256,7 +256,6 @@ object StoryGroupReplyItem {
       reaction.visible = true
       bubble.visibility = View.INVISIBLE
       itemView.padding(bottom = 0)
-      body.setText(R.string.StoryGroupReactionReplyItem__reacted_to_the_story)
       body.updateLayoutParams<ViewGroup.MarginLayoutParams> {
         marginEnd = 0
       }
@@ -269,6 +268,7 @@ object StoryGroupReplyItem {
     override fun bind(model: ReactionModel) {
       super.bind(model)
       reaction.setImageEmoji(model.reaction.emoji)
+      body.setText(if (model.replyBody.sender.isSelf) R.string.StoryGroupReactionReplyItem__you_reacted_to_the_story else R.string.StoryGroupReactionReplyItem__someone_reacted_to_the_story)
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyRepository.kt
index 29fbf722ca..2f69b1f98e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/group/StoryGroupReplyRepository.kt
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.stories.viewer.reply.group
 
-import androidx.lifecycle.Observer
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
@@ -14,7 +13,7 @@ import org.thoughtcrime.securesms.database.DatabaseObserver
 import org.thoughtcrime.securesms.database.NoSuchMessageException
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.MessageId
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.RecipientId
 
 class StoryGroupReplyRepository {
@@ -37,14 +36,14 @@ class StoryGroupReplyRepository {
           val insertObserver = DatabaseObserver.MessageObserver { controller.onDataItemInserted(it, PagingController.POSITION_END) }
           val conversationObserver = DatabaseObserver.Observer { controller.onDataInvalidated() }
 
-          ApplicationDependencies.getDatabaseObserver().registerMessageUpdateObserver(updateObserver)
-          ApplicationDependencies.getDatabaseObserver().registerMessageInsertObserver(threadId, insertObserver)
-          ApplicationDependencies.getDatabaseObserver().registerConversationObserver(threadId, conversationObserver)
+          AppDependencies.databaseObserver.registerMessageUpdateObserver(updateObserver)
+          AppDependencies.databaseObserver.registerMessageInsertObserver(threadId, insertObserver)
+          AppDependencies.databaseObserver.registerConversationObserver(threadId, conversationObserver)
 
           emitter.setCancellable {
-            ApplicationDependencies.getDatabaseObserver().unregisterObserver(updateObserver)
-            ApplicationDependencies.getDatabaseObserver().unregisterObserver(insertObserver)
-            ApplicationDependencies.getDatabaseObserver().unregisterObserver(conversationObserver)
+            AppDependencies.databaseObserver.unregisterObserver(updateObserver)
+            AppDependencies.databaseObserver.unregisterObserver(insertObserver)
+            AppDependencies.databaseObserver.unregisterObserver(conversationObserver)
           }
 
           emitter.onNext(pagedData)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/views/StoryViewsRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/views/StoryViewsRepository.kt
index cfa7b83e41..707022d013 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/views/StoryViewsRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/views/StoryViewsRepository.kt
@@ -9,7 +9,7 @@ import org.thoughtcrime.securesms.database.DatabaseObserver
 import org.thoughtcrime.securesms.database.GroupReceiptTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.MessageRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -21,7 +21,7 @@ class StoryViewsRepository {
     private val TAG = Log.tag(StoryViewsRepository::class.java)
   }
 
-  fun isReadReceiptsEnabled(): Boolean = SignalStore.storyValues().viewedReceiptsEnabled
+  fun isReadReceiptsEnabled(): Boolean = SignalStore.story.viewedReceiptsEnabled
 
   fun getStoryRecipient(storyId: Long): Single<Recipient> {
     return Single.fromCallable {
@@ -56,9 +56,9 @@ class StoryViewsRepository {
 
       val observer = DatabaseObserver.MessageObserver { refresh() }
 
-      ApplicationDependencies.getDatabaseObserver().registerMessageUpdateObserver(observer)
+      AppDependencies.databaseObserver.registerMessageUpdateObserver(observer)
       emitter.setCancellable {
-        ApplicationDependencies.getDatabaseObserver().unregisterObserver(observer)
+        AppDependencies.databaseObserver.unregisterObserver(observer)
       }
 
       refresh()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/subscription/LevelUpdate.kt b/app/src/main/java/org/thoughtcrime/securesms/subscription/LevelUpdate.kt
new file mode 100644
index 0000000000..44ce1e6c93
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/subscription/LevelUpdate.kt
@@ -0,0 +1,15 @@
+package org.thoughtcrime.securesms.subscription
+
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.subjects.BehaviorSubject
+
+object LevelUpdate {
+
+  private var isProcessingSubject = BehaviorSubject.createDefault(false)
+
+  var isProcessing: Observable<Boolean> = isProcessingSubject
+
+  fun updateProcessingState(isProcessing: Boolean) {
+    isProcessingSubject.onNext(isProcessing)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/subscription/LevelUpdateOperation.kt b/app/src/main/java/org/thoughtcrime/securesms/subscription/LevelUpdateOperation.kt
new file mode 100644
index 0000000000..13e9c5e381
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/subscription/LevelUpdateOperation.kt
@@ -0,0 +1,13 @@
+package org.thoughtcrime.securesms.subscription
+
+import org.whispersystems.signalservice.api.subscriptions.IdempotencyKey
+
+/**
+ * Binds a Subscription level update with an idempotency key.
+ *
+ * We are to use the same idempotency key whenever we want to retry updating to a particular level.
+ */
+data class LevelUpdateOperation(
+  val idempotencyKey: IdempotencyKey,
+  val level: String
+)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/subscription/Subscriber.kt b/app/src/main/java/org/thoughtcrime/securesms/subscription/Subscriber.kt
deleted file mode 100644
index 184a88d862..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/subscription/Subscriber.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.thoughtcrime.securesms.subscription
-
-import org.whispersystems.signalservice.api.subscriptions.SubscriberId
-
-data class Subscriber(
-  val subscriberId: SubscriberId,
-  val currencyCode: String
-)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/subscription/Subscription.kt b/app/src/main/java/org/thoughtcrime/securesms/subscription/Subscription.kt
new file mode 100644
index 0000000000..4cfbb8e419
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/subscription/Subscription.kt
@@ -0,0 +1,150 @@
+package org.thoughtcrime.securesms.subscription
+
+import android.animation.Animator
+import android.animation.AnimatorSet
+import android.animation.ObjectAnimator
+import android.view.View
+import androidx.core.animation.doOnEnd
+import androidx.lifecycle.DefaultLifecycleObserver
+import org.signal.core.util.money.FiatMoney
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.PreferenceModel
+import org.thoughtcrime.securesms.databinding.SubscriptionPreferenceBinding
+import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import org.thoughtcrime.securesms.util.DateUtils
+import org.thoughtcrime.securesms.util.adapter.mapping.BindingFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.BindingViewHolder
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
+import org.thoughtcrime.securesms.util.visible
+import java.util.Currency
+import java.util.Locale
+
+/**
+ * Represents a Subscription that a user can start.
+ */
+data class Subscription(
+  val id: String,
+  val name: String,
+  val badge: Badge,
+  val prices: Set<FiatMoney>,
+  val level: Int
+) {
+
+  companion object {
+    fun register(adapter: MappingAdapter) {
+      adapter.registerFactory(Model::class.java, BindingFactory(::ViewHolder, SubscriptionPreferenceBinding::inflate))
+      adapter.registerFactory(LoaderModel::class.java, LayoutFactory({ LoaderViewHolder(it) }, R.layout.subscription_preference_loader))
+    }
+  }
+
+  class LoaderModel : PreferenceModel<LoaderModel>() {
+    override fun areItemsTheSame(newItem: LoaderModel): Boolean = true
+  }
+
+  class LoaderViewHolder(itemView: View) : MappingViewHolder<LoaderModel>(itemView), DefaultLifecycleObserver {
+
+    private val animator: Animator = AnimatorSet().apply {
+      val fadeTo25Animator = ObjectAnimator.ofFloat(itemView, "alpha", 0.8f, 0.25f).apply {
+        duration = 1000L
+      }
+
+      val fadeTo80Animator = ObjectAnimator.ofFloat(itemView, "alpha", 0.25f, 0.8f).apply {
+        duration = 300L
+      }
+
+      playSequentially(fadeTo25Animator, fadeTo80Animator)
+      doOnEnd {
+        if (itemView.isAttachedToWindow) {
+          start()
+        }
+      }
+    }
+
+    override fun bind(model: LoaderModel) {
+    }
+
+    override fun onAttachedToWindow() {
+      if (animator.isStarted) {
+        animator.resume()
+      } else {
+        animator.start()
+      }
+    }
+
+    override fun onDetachedFromWindow() {
+      animator.pause()
+    }
+  }
+
+  class Model(
+    val activePrice: FiatMoney?,
+    val subscription: Subscription,
+    val isSelected: Boolean,
+    val isActive: Boolean,
+    val willRenew: Boolean,
+    override val isEnabled: Boolean,
+    val onClick: (Subscription) -> Unit,
+    val renewalTimestamp: Long,
+    val selectedCurrency: Currency
+  ) : PreferenceModel<Model>(isEnabled = isEnabled) {
+
+    override fun areItemsTheSame(newItem: Model): Boolean {
+      return subscription.id == newItem.subscription.id
+    }
+
+    override fun areContentsTheSame(newItem: Model): Boolean {
+      return super.areContentsTheSame(newItem) &&
+        newItem.subscription == subscription &&
+        newItem.isSelected == isSelected &&
+        newItem.isActive == isActive &&
+        newItem.renewalTimestamp == renewalTimestamp &&
+        newItem.willRenew == willRenew &&
+        newItem.selectedCurrency == selectedCurrency
+    }
+
+    override fun getChangePayload(newItem: Model): Any? {
+      return if (newItem.subscription.badge == subscription.badge) {
+        Unit
+      } else {
+        null
+      }
+    }
+  }
+
+  class ViewHolder(binding: SubscriptionPreferenceBinding) : BindingViewHolder<Model, SubscriptionPreferenceBinding>(binding) {
+
+    override fun bind(model: Model) {
+      binding.root.isEnabled = model.isEnabled
+      binding.root.setOnClickListener { model.onClick(model.subscription) }
+      binding.root.isSelected = model.isSelected
+
+      if (payload.isEmpty()) {
+        binding.badge.setBadge(model.subscription.badge)
+        binding.badge.isClickable = false
+      }
+
+      val formattedPrice = FiatMoneyUtil.format(
+        context.resources,
+        model.activePrice ?: model.subscription.prices.first { it.currency == model.selectedCurrency },
+        FiatMoneyUtil.formatOptions().trimZerosAfterDecimal()
+      )
+
+      if (model.isActive && model.willRenew) {
+        binding.tagline.text = context.getString(R.string.Subscription__renews_s, DateUtils.formatDateWithYear(Locale.getDefault(), model.renewalTimestamp))
+      } else if (model.isActive) {
+        binding.tagline.text = context.getString(R.string.Subscription__expires_s, DateUtils.formatDateWithYear(Locale.getDefault(), model.renewalTimestamp))
+      } else {
+        binding.tagline.text = context.getString(R.string.Subscription__get_a_s_badge, model.subscription.badge.name)
+      }
+
+      binding.title.text = context.getString(
+        R.string.Subscription__s_per_month,
+        formattedPrice
+      )
+      binding.check.visible = model.isActive
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/AdaptiveBitmapMetrics.kt b/app/src/main/java/org/thoughtcrime/securesms/util/AdaptiveBitmapMetrics.kt
new file mode 100644
index 0000000000..a4c1f5f5fb
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/AdaptiveBitmapMetrics.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.util
+
+import org.signal.core.util.dp
+import kotlin.math.ceil
+import kotlin.math.floor
+
+/**
+ * Describes the absolute measurements for adaptive icon bitmaps.
+ *
+ * Because adaptive icons are meant to be 108dp with a 72dp image,
+ * this can result in subpixel measurement on some devices. This class
+ * is responsible for on-the-fly calculation of metrics that'll look good
+ * and not cause off-by-a-pixel errors in Adaptive bitmaps.
+ */
+object AdaptiveBitmapMetrics {
+  private val ADAPTIVE_ICON_OUTER_SIZE: Float = 108f.dp
+  private val ADAPTIVE_ICON_INNER_SIZE: Float = 72f.dp
+
+  @get:JvmStatic
+  val outerWidth = ceil(ADAPTIVE_ICON_OUTER_SIZE).toInt()
+
+  @get:JvmStatic
+  val innerWidth = ceil(ADAPTIVE_ICON_INNER_SIZE).let { ceiling ->
+    if (floor(ADAPTIVE_ICON_OUTER_SIZE) < outerWidth) {
+      ceiling + 2
+    } else {
+      ceiling
+    }.toInt()
+  }
+
+  @get:JvmStatic
+  val padding = (outerWidth - innerWidth) / 2f
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java
index 564594dee6..bd7f86529f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java
@@ -4,17 +4,20 @@
 import android.content.Context;
 import android.text.TextUtils;
 
+import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
 import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.AttachmentId;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.database.NoSuchMessageException;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.jobmanager.impl.NotInCallConstraint;
+import org.thoughtcrime.securesms.jobs.MultiDeviceDeleteSyncJob;
 import org.thoughtcrime.securesms.recipients.Recipient;
 
 import java.util.Collections;
@@ -24,6 +27,21 @@ public class AttachmentUtil {
 
   private static final String TAG = Log.tag(AttachmentUtil.class);
 
+  @MainThread
+  public static boolean isRestoreOnOpenPermitted(@NonNull Context context, @Nullable Attachment attachment) {
+    if (attachment == null) {
+      Log.w(TAG, "attachment was null, returning vacuous true");
+      return true;
+    }
+    Set<String> allowedTypes = getAllowedAutoDownloadTypes(context);
+    String      contentType  = attachment.contentType;
+
+    if (MediaUtil.isImageType(contentType)) {
+      return NotInCallConstraint.isNotInConnectedCall() && allowedTypes.contains(MediaUtil.getDiscreteMimeType(contentType));
+    }
+    return false;
+  }
+  
   @WorkerThread
   public static boolean isAutoDownloadPermitted(@NonNull Context context, @Nullable DatabaseAttachment attachment) {
     if (attachment == null) {
@@ -69,22 +87,29 @@ public static boolean isAutoDownloadPermitted(@NonNull Context context, @Nullabl
   /**
    * Deletes the specified attachment. If its the only attachment for its linked message, the entire
    * message is deleted.
+   *
+   * @return message record of deleted message if a message is deleted
    */
   @WorkerThread
-  public static void deleteAttachment(@NonNull Context context,
-                                      @NonNull DatabaseAttachment attachment)
-  {
+  public static @Nullable MessageRecord deleteAttachment(@NonNull DatabaseAttachment attachment) {
     AttachmentId attachmentId    = attachment.attachmentId;
     long         mmsId           = attachment.mmsId;
     int          attachmentCount = SignalDatabase.attachments()
                                                  .getAttachmentsForMessage(mmsId)
                                                  .size();
 
+    MessageRecord deletedMessageRecord = null;
     if (attachmentCount <= 1) {
+      deletedMessageRecord = SignalDatabase.messages().getMessageRecordOrNull(mmsId);
       SignalDatabase.messages().deleteMessage(mmsId);
     } else {
       SignalDatabase.attachments().deleteAttachment(attachmentId);
+      if (Recipient.self().getDeleteSyncCapability().isSupported()) {
+        MultiDeviceDeleteSyncJob.enqueueAttachmentDelete(SignalDatabase.messages().getMessageRecordOrNull(mmsId), attachment);
+      }
     }
+
+    return deletedMessageRecord;
   }
 
   private static boolean isNonDocumentType(String contentType) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java
index dc4bced401..7b6d1ed7ac 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java
@@ -28,14 +28,14 @@
 import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatar;
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatarDrawable;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
 import org.thoughtcrime.securesms.providers.AvatarProvider;
 import org.thoughtcrime.securesms.recipients.Recipient;
 
 import java.util.Objects;
-import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -115,7 +115,7 @@ public static Bitmap loadIconBitmapSquareNoCache(@NonNull Context context,
     if (Build.VERSION.SDK_INT > 29) {
       return IconCompat.createWithContentUri(AvatarProvider.getContentUri(recipient.getId()));
     } else {
-      return IconCompat.createWithBitmap(getBitmapForNotification(context, recipient, DrawableUtil.SHORTCUT_INFO_WRAPPED_SIZE));
+      return IconCompat.createWithBitmap(getBitmapForNotification(context, recipient, AdaptiveBitmapMetrics.getInnerWidth()));
     }
   }
 
@@ -162,7 +162,7 @@ private static <T> RequestBuilder<T> request(@NonNull RequestBuilder<T> requestB
       photo = recipient.getContactPhoto();
     }
 
-    final int size = targetSize == -1 ? DrawableUtil.SHORTCUT_INFO_WRAPPED_SIZE : targetSize;
+    final int size = targetSize == -1 ? AdaptiveBitmapMetrics.getInnerWidth() : targetSize;
     final RequestBuilder<T> request = requestBuilder.load(photo)
                                                 .error(getFallback(context, recipient, size))
                                                 .diskCacheStrategy(DiskCacheStrategy.ALL)
@@ -183,9 +183,12 @@ private static <T> RequestBuilder<T> request(@NonNull RequestBuilder<T> requestB
   }
 
   private static Drawable getFallback(@NonNull Context context, @NonNull Recipient recipient, int targetSize) {
-    String name = Optional.of(recipient.getDisplayName(context)).orElse("");
+    FallbackAvatar fallbackAvatar = FallbackAvatar.forTextOrDefault(recipient.getDisplayName(context), recipient.getAvatarColor());
 
-    return new GeneratedContactPhoto(name, R.drawable.ic_profile_outline_40, targetSize).asDrawable(context, recipient.getAvatarColor());
+    Drawable avatar = new FallbackAvatarDrawable(context, fallbackAvatar).circleCrop();
+    avatar.setBounds(0, 0, targetSize, targetSize);
+
+    return avatar;
   }
 
   /**
@@ -199,7 +202,7 @@ private static class AvatarTarget extends CustomTarget<Bitmap> {
     private final int size;
 
     private AvatarTarget(int size) {
-      this.size = size == UNDEFINED_SIZE ? DrawableUtil.SHORTCUT_INFO_WRAPPED_SIZE : size;
+      this.size = size == UNDEFINED_SIZE ? AdaptiveBitmapMetrics.getInnerWidth() : size;
     }
 
     public @Nullable Bitmap await() throws InterruptedException {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.java
index 79f45f9b4b..5d2351ee46 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.java
@@ -19,7 +19,7 @@
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.backup.BackupPassphrase;
 import org.thoughtcrime.securesms.database.NoExternalStorageException;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.permissions.Permissions;
 
@@ -89,7 +89,7 @@ public static void deleteAllBackups() {
   }
 
   public static void deleteOldBackups() {
-    int maxFiles = TextSecurePreferences.getBackupMaxFiles(ApplicationDependencies.getApplication());
+    int maxFiles = TextSecurePreferences.getBackupMaxFiles(AppDependencies.getApplication());
 
     Log.i(TAG, "Deleting older backups. Keep " + maxFiles + " max.");
 
@@ -130,7 +130,7 @@ public static void disableBackups(@NonNull Context context) {
   }
 
   private static List<BackupInfo> getAllBackupsNewestFirst() throws NoExternalStorageException {
-    if (isUserSelectionRequired(ApplicationDependencies.getApplication())) {
+    if (isUserSelectionRequired(AppDependencies.getApplication())) {
       return getAllBackupsNewestFirstApi29();
     } else {
       return getAllBackupsNewestFirstLegacy();
@@ -145,7 +145,7 @@ private static List<BackupInfo> getAllBackupsNewestFirstApi29() {
       return Collections.emptyList();
     }
 
-    DocumentFile backupDirectory = DocumentFile.fromTreeUri(ApplicationDependencies.getApplication(), backupDirectoryUri);
+    DocumentFile backupDirectory = DocumentFile.fromTreeUri(AppDependencies.getApplication(), backupDirectoryUri);
     if (backupDirectory == null || !backupDirectory.exists() || !backupDirectory.canRead()) {
       Log.w(TAG, "Backup directory is inaccessible. Returning an empty list.");
       return Collections.emptyList();
@@ -359,7 +359,7 @@ private void delete() {
           Log.w(TAG, "Delete failed: " + file.getAbsolutePath());
         }
       } else {
-        DocumentFile document = DocumentFile.fromSingleUri(ApplicationDependencies.getApplication(), uri);
+        DocumentFile document = DocumentFile.fromSingleUri(AppDependencies.getApplication(), uri);
         if (document != null && document.exists()) {
           Log.i(TAG, "Deleting DocumentFile: " + uri);
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/BubbleUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/BubbleUtil.java
index 979759b89c..6170b4e913 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/BubbleUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/BubbleUtil.java
@@ -16,7 +16,7 @@
 
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.notifications.NotificationIds;
 import org.thoughtcrime.securesms.notifications.v2.NotificationFactory;
@@ -120,7 +120,7 @@ public static void displayAsBubble(@NonNull Context context, @NonNull RecipientI
                                                                    .orElse(null);
 
           if (activeThreadNotification != null && activeThreadNotification.deleteIntent != null) {
-            ApplicationDependencies.getMessageNotifier().forceBubbleNotification(context, conversationId);
+            AppDependencies.getMessageNotifier().forceBubbleNotification(context, conversationId);
           } else {
             Recipient recipient = Recipient.resolved(recipientId);
             NotificationFactory.notifyToBubbleConversation(context, recipient, threadId);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java b/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java
index f0e3a10b44..e9a79b3a5e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java
@@ -36,7 +36,7 @@
 import org.thoughtcrime.securesms.database.CallLinkTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.GroupRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.groups.ui.invitesandrequests.joining.GroupJoinBottomSheetDialogFragment;
 import org.thoughtcrime.securesms.groups.ui.invitesandrequests.joining.GroupJoinUpdateRequiredBottomSheetDialogFragment;
@@ -83,7 +83,7 @@ private static void startVoiceCall(@NonNull CallContext callContext, @NonNull Re
     }
 
     if (recipient.isRegistered()) {
-      ApplicationDependencies.getSignalCallManager().isCallActive(new ResultReceiver(new Handler(Looper.getMainLooper())) {
+      AppDependencies.getSignalCallManager().isCallActive(new ResultReceiver(new Handler(Looper.getMainLooper())) {
         @Override
         protected void onReceiveResult(int resultCode, Bundle resultData) {
           if (resultCode == 1) {
@@ -126,7 +126,7 @@ private static void startVideoCall(@NonNull CallContext callContext, @NonNull Re
       return;
     }
 
-    ApplicationDependencies.getSignalCallManager().isCallActive(new ResultReceiver(new Handler(Looper.getMainLooper())) {
+    AppDependencies.getSignalCallManager().isCallActive(new ResultReceiver(new Handler(Looper.getMainLooper())) {
       @Override
       protected void onReceiveResult(int resultCode, Bundle resultData) {
         startCallInternal(callContext, recipient, resultCode != 1, fromCallLink);
@@ -294,7 +294,7 @@ public static void handlePotentialCallLinkUrl(@NonNull FragmentActivity activity
       return;
     }
 
-    if (!FeatureFlags.adHocCalling()) {
+    if (!RemoteConfig.adHocCalling()) {
       Toast.makeText(activity, R.string.CommunicationActions_cant_join_call, Toast.LENGTH_SHORT).show();
       return;
     }
@@ -324,7 +324,7 @@ public static void startVideoCall(@NonNull Fragment fragment, @NonNull CallLinkR
   }
 
   private static void startVideoCall(@NonNull CallContext callContext, @NonNull CallLinkRootKey rootKey) {
-    if (!FeatureFlags.adHocCalling()) {
+    if (!RemoteConfig.adHocCalling()) {
       Toast.makeText(callContext.getContext(), R.string.CommunicationActions_cant_join_call, Toast.LENGTH_SHORT).show();
       return;
     }
@@ -376,7 +376,7 @@ private static void startAudioCallInternal(@NonNull CallContext callContext, @No
                .withPermanentDenialDialog(callContext.getContext().getString(R.string.ConversationActivity__to_call_signal_needs_access_to_your_microphone), null, R.string.ConversationActivity_allow_access_microphone, R.string.ConversationActivity__to_start_call, callContext.getFragmentManager())
                .onAnyDenied(() -> Toast.makeText(callContext.getContext(), R.string.ConversationActivity_signal_needs_microphone_access_voice_call, Toast.LENGTH_LONG).show())
                .onAllGranted(() -> {
-                 ApplicationDependencies.getSignalCallManager().startOutgoingAudioCall(recipient);
+                 AppDependencies.getSignalCallManager().startOutgoingAudioCall(recipient);
 
                  MessageSender.onMessageSent();
 
@@ -390,25 +390,15 @@ private static void startAudioCallInternal(@NonNull CallContext callContext, @No
   }
 
   private static void startVideoCallInternal(@NonNull CallContext callContext, @NonNull Recipient recipient, boolean fromCallLink) {
-    callContext.getPermissionsBuilder()
-               .request(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
-               .ifNecessary()
-               .withRationaleDialog(callContext.getContext().getString(R.string.ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s, recipient.getDisplayName(callContext.getContext())),
-                                    R.drawable.ic_mic_solid_24,
-                                    R.drawable.ic_video_solid_24_tinted)
-               .withPermanentDenialDialog(callContext.getContext().getString(R.string.ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s, recipient.getDisplayName(callContext.getContext())))
-               .onAllGranted(() -> {
-                 ApplicationDependencies.getSignalCallManager().startPreJoinCall(recipient);
+    AppDependencies.getSignalCallManager().startPreJoinCall(recipient);
 
-                 Intent activityIntent = new Intent(callContext.getContext(), WebRtcCallActivity.class);
+    Intent activityIntent = new Intent(callContext.getContext(), WebRtcCallActivity.class);
 
-                 activityIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                     .putExtra(WebRtcCallActivity.EXTRA_ENABLE_VIDEO_IF_AVAILABLE, true)
-                     .putExtra(WebRtcCallActivity.EXTRA_STARTED_FROM_CALL_LINK, fromCallLink);
+    activityIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                  .putExtra(WebRtcCallActivity.EXTRA_ENABLE_VIDEO_IF_AVAILABLE, true)
+                  .putExtra(WebRtcCallActivity.EXTRA_STARTED_FROM_CALL_LINK, fromCallLink);
 
-                 callContext.startActivity(activityIntent);
-               })
-               .execute();
+    callContext.startActivity(activityIntent);
   }
 
   private static void handleE164Link(Activity activity, String e164) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ConversationShortcutPhoto.java b/app/src/main/java/org/thoughtcrime/securesms/util/ConversationShortcutPhoto.java
index e7ae6e5bc1..c992b091ba 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ConversationShortcutPhoto.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ConversationShortcutPhoto.java
@@ -2,9 +2,7 @@
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
 
-import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.WorkerThread;
 
@@ -18,15 +16,10 @@
 import com.bumptech.glide.load.model.MultiModelLoaderFactory;
 
 import org.signal.libsignal.protocol.util.ByteUtil;
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.FallbackPhoto80dp;
-import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto;
+import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatarDrawable;
 import org.thoughtcrime.securesms.contacts.avatars.SystemContactPhoto;
-import org.thoughtcrime.securesms.conversation.colors.AvatarColor;
 import org.thoughtcrime.securesms.database.model.ProfileAvatarFileDetails;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.profiles.AvatarHelper;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
 
 import java.security.MessageDigest;
@@ -55,7 +48,7 @@ public ConversationShortcutPhoto(@NonNull Recipient recipient) {
 
   @Override
   public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
-    messageDigest.update(recipient.getDisplayName(ApplicationDependencies.getApplication()).getBytes());
+    messageDigest.update(recipient.getDisplayName(AppDependencies.getApplication()).getBytes());
     messageDigest.update(avatarObject.getBytes());
     messageDigest.update(isSystemContactPhoto() ? (byte) 1 : (byte) 0);
     messageDigest.update(profileAvatarFileDetails.getDiskCacheKeyBytes());
@@ -163,50 +156,19 @@ public void cancel() {
     private @NonNull Bitmap getShortcutInfoBitmap(@NonNull Context context) throws ExecutionException, InterruptedException {
       return DrawableUtil.wrapBitmapForShortcutInfo(AvatarUtil.loadIconBitmapSquareNoCache(context,
                                                                                            photo.recipient,
-                                                                                           DrawableUtil.SHORTCUT_INFO_WRAPPED_SIZE,
-                                                                                           DrawableUtil.SHORTCUT_INFO_WRAPPED_SIZE));
+                                                                                           AdaptiveBitmapMetrics.getInnerWidth(),
+                                                                                           AdaptiveBitmapMetrics.getInnerWidth()));
     }
 
     private @NonNull Bitmap getFallbackForShortcut(@NonNull Context context) {
       Recipient recipient = photo.recipient;
 
-      @DrawableRes final int photoSource;
-      if (recipient.isSelf()) {
-        photoSource = R.drawable.ic_note_80;
-      } else if (recipient.isGroup()) {
-        photoSource = R.drawable.ic_group_80;
-      } else {
-        photoSource = R.drawable.ic_profile_80;
-      }
-
-      FallbackContactPhoto photo   = recipient.isSelf() || recipient.isGroup() ? new FallbackPhoto80dp(photoSource, recipient.getAvatarColor())
-                                                                               : new ShortcutGeneratedContactPhoto(recipient.getDisplayName(context), photoSource, ViewUtil.dpToPx(80), recipient.getAvatarColor());
-      Bitmap               toWrap  = DrawableUtil.toBitmap(photo.asCallCard(context), ViewUtil.dpToPx(80), ViewUtil.dpToPx(80));
-      Bitmap               wrapped = DrawableUtil.wrapBitmapForShortcutInfo(toWrap);
+      Bitmap toWrap  = DrawableUtil.toBitmap(new FallbackAvatarDrawable(context, recipient.getFallbackAvatar()), ViewUtil.dpToPx(80), ViewUtil.dpToPx(80));
+      Bitmap wrapped = DrawableUtil.wrapBitmapForShortcutInfo(toWrap);
 
       toWrap.recycle();
 
       return wrapped;
     }
   }
-
-  private static final class ShortcutGeneratedContactPhoto extends GeneratedContactPhoto {
-
-    private final AvatarColor color;
-
-    public ShortcutGeneratedContactPhoto(@NonNull String name, int fallbackResId, int targetSize, @NonNull AvatarColor color) {
-      super(name, fallbackResId, targetSize);
-
-      this.color = color;
-    }
-
-    @Override
-    protected Drawable newFallbackDrawable(@NonNull Context context, @NonNull AvatarColor color, boolean inverted) {
-      return new FallbackPhoto80dp(getFallbackResId(), color).asDrawable(context, AvatarColor.UNKNOWN);
-    }
-
-    @Override public Drawable asCallCard(@NonNull Context context) {
-      return new FallbackPhoto80dp(getFallbackResId(), color).asCallCard(context);
-    }
-  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.kt b/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.kt
index 9a560e367e..0ace03c23d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.kt
@@ -210,13 +210,7 @@ object DateUtils : android.text.format.DateUtils() {
     return if (isSameDay(System.currentTimeMillis(), timestamp)) {
       context.getString(R.string.DeviceListItem_today)
     } else {
-      val format: String = when {
-        timestamp.isWithin(6.days) -> "EEE "
-        timestamp.isWithin(365.days) -> "MMM d"
-        else -> "MMM d, yyy"
-      }
-
-      timestamp.toDateString(format, locale)
+      timestamp.toDateString("dd/MM/yy", locale)
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DeleteDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/util/DeleteDialog.kt
index 44d0731438..4135bf5d3a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/DeleteDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/DeleteDialog.kt
@@ -8,7 +8,9 @@ import org.signal.core.util.concurrent.SignalExecutors
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.MessageRecord
+import org.thoughtcrime.securesms.jobs.MultiDeviceDeleteSyncJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.sms.MessageSender
 import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask
 
@@ -29,8 +31,8 @@ object DeleteDialog {
   fun show(
     context: Context,
     messageRecords: Set<MessageRecord>,
-    title: CharSequence = context.resources.getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messageRecords.size, messageRecords.size),
-    message: CharSequence? = null,
+    title: CharSequence? = null,
+    message: CharSequence = context.resources.getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messageRecords.size, messageRecords.size),
     forceRemoteDelete: Boolean = false
   ): Single<Pair<Boolean, Boolean>> = Single.create { emitter ->
     val builder = MaterialAlertDialogBuilder(context)
@@ -44,13 +46,23 @@ object DeleteDialog {
     if (forceRemoteDelete) {
       builder.setPositiveButton(R.string.ConversationFragment_delete_for_everyone) { _, _ -> deleteForEveryone(messageRecords, emitter) }
     } else {
-      builder.setPositiveButton(if (isNoteToSelfDelete) R.string.ConversationFragment_delete_on_this_device else R.string.ConversationFragment_delete_for_me) { _, _ ->
+      val deleteSyncEnabled = Recipient.self().deleteSyncCapability.isSupported
+
+      val positiveButton = if (isNoteToSelfDelete) {
+        if (deleteSyncEnabled) R.string.ConversationFragment_delete else R.string.ConversationFragment_delete_on_this_device
+      } else {
+        R.string.ConversationFragment_delete_for_me
+      }
+
+      builder.setPositiveButton(positiveButton) { _, _ ->
         DeleteProgressDialogAsyncTask(context, messageRecords) {
           emitter.onSuccess(Pair(true, it))
         }.executeOnExecutor(SignalExecutors.BOUNDED)
       }
 
-      if (MessageConstraintsUtil.isValidRemoteDeleteSend(messageRecords, System.currentTimeMillis()) && (!isNoteToSelfDelete || TextSecurePreferences.isMultiDevice(context))) {
+      val canDeleteForEveryoneInNoteToSelf = isNoteToSelfDelete && TextSecurePreferences.isMultiDevice(context) && !deleteSyncEnabled
+
+      if (MessageConstraintsUtil.isValidRemoteDeleteSend(messageRecords, System.currentTimeMillis()) && (!isNoteToSelfDelete || canDeleteForEveryoneInNoteToSelf)) {
         builder.setNeutralButton(if (isNoteToSelfDelete) R.string.ConversationFragment_delete_everywhere else R.string.ConversationFragment_delete_for_everyone) { _, _ -> handleDeleteForEveryone(context, messageRecords, emitter) }
       }
     }
@@ -65,13 +77,13 @@ object DeleteDialog {
   }
 
   private fun handleDeleteForEveryone(context: Context, messageRecords: Set<MessageRecord>, emitter: SingleEmitter<Pair<Boolean, Boolean>>) {
-    if (SignalStore.uiHints().hasConfirmedDeleteForEveryoneOnce()) {
+    if (SignalStore.uiHints.hasConfirmedDeleteForEveryoneOnce()) {
       deleteForEveryone(messageRecords, emitter)
     } else {
       MaterialAlertDialogBuilder(context)
         .setMessage(R.string.ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation)
         .setPositiveButton(R.string.ConversationFragment_delete_for_everyone) { _, _ ->
-          SignalStore.uiHints().markHasConfirmedDeleteForEveryoneOnce()
+          SignalStore.uiHints.markHasConfirmedDeleteForEveryoneOnce()
           deleteForEveryone(messageRecords, emitter)
         }
         .setNegativeButton(android.R.string.cancel) { _, _ -> emitter.onSuccess(Pair(false, false)) }
@@ -100,13 +112,19 @@ object DeleteDialog {
     R.string.ConversationFragment_deleting_messages
   ) {
     override fun doInBackground(vararg params: Void?): Boolean {
-      return messageRecords.map { record ->
-        if (record.isMms) {
-          SignalDatabase.messages.deleteMessage(record.id)
-        } else {
-          SignalDatabase.messages.deleteMessage(record.id)
+      var threadDeleted = false
+
+      messageRecords.forEach { record ->
+        if (SignalDatabase.messages.deleteMessage(record.id)) {
+          threadDeleted = true
         }
-      }.any { it }
+      }
+
+      if (Recipient.self().deleteSyncCapability.isSupported) {
+        MultiDeviceDeleteSyncJob.enqueueMessageDeletes(messageRecords)
+      }
+
+      return threadDeleted
     }
 
     override fun onPostExecute(result: Boolean?) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DeviceProperties.java b/app/src/main/java/org/thoughtcrime/securesms/util/DeviceProperties.java
index b57cb2f5d2..8722a14082 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/DeviceProperties.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/DeviceProperties.java
@@ -30,11 +30,11 @@ public static boolean shouldAllowApngStickerAnimation(@NonNull Context context)
       return false;
     }
 
-    if (memoryMb < FeatureFlags.animatedStickerMinimumTotalMemoryMb()) {
+    if (memoryMb < RemoteConfig.animatedStickerMinimumTotalMemoryMb()) {
       return false;
     }
 
-    if (getMemoryClass(context) < FeatureFlags.animatedStickerMinimumMemoryClass()) {
+    if (getMemoryClass(context) < RemoteConfig.animatedStickerMinimumMemoryClass()) {
       return false;
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java b/app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java
index eefb874eb7..fdd522cc48 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java
@@ -24,7 +24,7 @@
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
+import org.thoughtcrime.securesms.registration.ui.RegistrationActivity;
 
 public class Dialogs {
   public static void showAlertDialog(Context context, String title, String message) {
@@ -85,7 +85,7 @@ public static void showReregisterSignalDialog(@NonNull Context context) {
         .setMessage(R.string.ReregisterSignalDialog__message)
         .setNegativeButton(R.string.ReregisterSignalDialog__cancel_action, null)
         .setPositiveButton(R.string.ReregisterSignalDialog__reregister_action, (d, w) -> {
-          context.startActivity(RegistrationNavigationActivity.newIntentForReRegistration(context));
+          context.startActivity(RegistrationActivity.newIntentForReRegistration(context));
         })
         .show();
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DoubleClickDebouncer.kt b/app/src/main/java/org/thoughtcrime/securesms/util/DoubleClickDebouncer.kt
new file mode 100644
index 0000000000..db538603b7
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/DoubleClickDebouncer.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.util
+
+import android.os.Handler
+import android.os.Looper
+import java.util.concurrent.TimeUnit
+
+/**
+ * A class to throttle on click events. If multiple clicks happen in succession (within the threshold)
+ * We ignore both and let the caller know it was a double click.
+ */
+class DoubleClickDebouncer(private val threshold: Long) {
+  private val handler = Handler(Looper.getMainLooper())
+
+  constructor(threshold: Long, timeUnit: TimeUnit) : this(timeUnit.toMillis(threshold))
+
+  private var clickEnqueued = false
+
+  /**
+   * Returns true if the click is enqueued, otherwise its a double click
+   */
+  fun onClick(runnable: Runnable?): Boolean {
+    handler.removeCallbacksAndMessages(null)
+    if (!clickEnqueued) {
+      handler.postDelayed({
+        runnable!!.run()
+        clickEnqueued = false
+      }, threshold)
+      clickEnqueued = true
+    } else {
+      clickEnqueued = false
+    }
+    return clickEnqueued
+  }
+
+  fun clear() {
+    handler.removeCallbacksAndMessages(null)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DrawableUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/DrawableUtil.java
index 884e6247d4..2c1b2208a3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/DrawableUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/DrawableUtil.java
@@ -10,10 +10,6 @@
 
 public final class DrawableUtil {
 
-  private static final int SHORTCUT_INFO_BITMAP_SIZE  = ViewUtil.dpToPx(108);
-  public  static final int SHORTCUT_INFO_WRAPPED_SIZE = ViewUtil.dpToPx(72);
-  private static final int SHORTCUT_INFO_PADDING      = (SHORTCUT_INFO_BITMAP_SIZE - SHORTCUT_INFO_WRAPPED_SIZE) / 2;
-
   private DrawableUtil() {}
 
   public static @NonNull Bitmap toBitmap(@NonNull Drawable drawable, int width, int height) {
@@ -27,11 +23,11 @@ private DrawableUtil() {}
   }
 
   public static @NonNull Bitmap wrapBitmapForShortcutInfo(@NonNull Bitmap toWrap) {
-    Bitmap bitmap = Bitmap.createBitmap(SHORTCUT_INFO_BITMAP_SIZE, SHORTCUT_INFO_BITMAP_SIZE, Bitmap.Config.ARGB_8888);
-    Bitmap scaled = Bitmap.createScaledBitmap(toWrap, SHORTCUT_INFO_WRAPPED_SIZE, SHORTCUT_INFO_WRAPPED_SIZE, true);
+    Bitmap bitmap = Bitmap.createBitmap(AdaptiveBitmapMetrics.getOuterWidth(), AdaptiveBitmapMetrics.getOuterWidth(), Bitmap.Config.ARGB_8888);
+    Bitmap scaled = Bitmap.createScaledBitmap(toWrap, AdaptiveBitmapMetrics.getInnerWidth(), AdaptiveBitmapMetrics.getInnerWidth(), true);
 
     Canvas canvas = new Canvas(bitmap);
-    canvas.drawBitmap(scaled, SHORTCUT_INFO_PADDING, SHORTCUT_INFO_PADDING, null);
+    canvas.drawBitmap(scaled, AdaptiveBitmapMetrics.getPadding(), AdaptiveBitmapMetrics.getPadding(), null);
 
     return bitmap;
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Environment.kt b/app/src/main/java/org/thoughtcrime/securesms/util/Environment.kt
index 982fafaa06..f2d4a19837 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/Environment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/Environment.kt
@@ -1,11 +1,29 @@
 package org.thoughtcrime.securesms.util
 
+import com.google.android.gms.wallet.WalletConstants
+import org.signal.donations.GooglePayApi
+import org.signal.donations.StripeApi
 import org.thoughtcrime.securesms.BuildConfig
 
+@Suppress("KotlinConstantConditions")
 object Environment {
   const val IS_STAGING: Boolean = BuildConfig.FLAVOR_environment == "staging"
   const val IS_DEV: Boolean = BuildConfig.FLAVOR_environment == "dev" || BuildConfig.BUILD_TYPE == "instrumentation"
 
+  object Donations {
+    @JvmStatic
+    @get:JvmName("getGooglePayConfiguration")
+    val GOOGLE_PAY_CONFIGURATION = GooglePayApi.Configuration(
+      walletEnvironment = if (IS_STAGING) WalletConstants.ENVIRONMENT_TEST else WalletConstants.ENVIRONMENT_PRODUCTION
+    )
+
+    @JvmStatic
+    @get:JvmName("getStripeConfiguration")
+    val STRIPE_CONFIGURATION = StripeApi.Configuration(
+      publishableKey = BuildConfig.STRIPE_PUBLISHABLE_KEY
+    )
+  }
+
   object Calling {
     @JvmStatic
     fun defaultSfuUrl(): String {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
deleted file mode 100644
index a1da92332b..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ /dev/null
@@ -1,1010 +0,0 @@
-package org.thoughtcrime.securesms.util;
-
-import android.text.TextUtils;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
-import androidx.annotation.WorkerThread;
-
-import com.annimon.stream.Stream;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.signal.core.util.SetUtil;
-import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.BuildConfig;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.groups.SelectionLimits;
-import org.thoughtcrime.securesms.jobs.RemoteConfigRefreshJob;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.messageprocessingalarm.RoutineMessageFetchReceiver;
-import org.whispersystems.signalservice.api.RemoteConfigResult;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.concurrent.TimeUnit;
-
-/**
- * A location for flags that can be set locally and remotely. These flags can guard features that
- * are not yet ready to be activated.
- *
- * When creating a new flag:
- * - Create a new string constant. This should almost certainly be prefixed with "android."
- * - Add a method to retrieve the value using {@link #getBoolean(String, boolean)}. You can also add
- *   other checks here, like requiring other flags.
- * - If you want to be able to change a flag remotely, place it in {@link #REMOTE_CAPABLE}.
- * - If you would like to force a value for testing, place an entry in {@link #FORCED_VALUES}.
- *   Do not commit changes to this map!
- *
- * Other interesting things you can do:
- * - Make a flag {@link #HOT_SWAPPABLE}
- * - Make a flag {@link #STICKY} -- booleans only!
- * - Register a listener for flag changes in {@link #FLAG_CHANGE_LISTENERS}
- */
-public final class FeatureFlags {
-
-  private static final String TAG = Log.tag(FeatureFlags.class);
-
-  private static final long FETCH_INTERVAL = TimeUnit.HOURS.toMillis(2);
-
-  private static final String PAYMENTS_KILL_SWITCH              = "android.payments.kill";
-  private static final String GROUPS_V2_RECOMMENDED_LIMIT       = "global.groupsv2.maxGroupSize";
-  private static final String GROUPS_V2_HARD_LIMIT              = "global.groupsv2.groupSizeHardLimit";
-  private static final String GROUP_NAME_MAX_LENGTH             = "global.groupsv2.maxNameLength";
-  private static final String INTERNAL_USER                     = "android.internalUser";
-  private static final String VERIFY_V2                         = "android.verifyV2";
-  private static final String CLIENT_EXPIRATION                 = "android.clientExpiration";
-  private static final String CUSTOM_VIDEO_MUXER                = "android.customVideoMuxer.1";
-  private static final String CDS_REFRESH_INTERVAL              = "cds.syncInterval.seconds";
-  private static final String CDS_FOREGROUND_SYNC_INTERVAL      = "cds.foregroundSyncInterval.seconds";
-  private static final String AUTOMATIC_SESSION_RESET           = "android.automaticSessionReset.2";
-  private static final String AUTOMATIC_SESSION_INTERVAL        = "android.automaticSessionResetInterval";
-  private static final String DEFAULT_MAX_BACKOFF               = "android.defaultMaxBackoff";
-  private static final String SERVER_ERROR_MAX_BACKOFF          = "android.serverErrorMaxBackoff";
-  private static final String OKHTTP_AUTOMATIC_RETRY            = "android.okhttpAutomaticRetry";
-  private static final String SHARE_SELECTION_LIMIT             = "android.share.limit";
-  private static final String ANIMATED_STICKER_MIN_MEMORY       = "android.animatedStickerMinMemory";
-  private static final String ANIMATED_STICKER_MIN_TOTAL_MEMORY = "android.animatedStickerMinTotalMemory";
-  private static final String MESSAGE_PROCESSOR_ALARM_INTERVAL  = "android.messageProcessor.alarmIntervalMins";
-  private static final String MESSAGE_PROCESSOR_DELAY           = "android.messageProcessor.foregroundDelayMs";
-  private static final String MEDIA_QUALITY_LEVELS              = "android.mediaQuality.levels";
-  private static final String RETRY_RECEIPT_LIFESPAN            = "android.retryReceiptLifespan";
-  private static final String RETRY_RESPOND_MAX_AGE             = "android.retryRespondMaxAge";
-  private static final String SENDER_KEY_MAX_AGE                = "android.senderKeyMaxAge";
-  private static final String RETRY_RECEIPTS                    = "android.retryReceipts";
-  private static final String MAX_GROUP_CALL_RING_SIZE          = "global.calling.maxGroupCallRingSize";
-  private static final String STORIES_TEXT_FUNCTIONS            = "android.stories.text.functions";
-  private static final String HARDWARE_AEC_BLOCKLIST_MODELS     = "android.calling.hardwareAecBlockList";
-  private static final String SOFTWARE_AEC_BLOCKLIST_MODELS     = "android.calling.softwareAecBlockList";
-  private static final String USE_HARDWARE_AEC_IF_OLD           = "android.calling.useHardwareAecIfOlderThanApi29";
-  private static final String PAYMENTS_COUNTRY_BLOCKLIST        = "global.payments.disabledRegions";
-  private static final String STORIES_AUTO_DOWNLOAD_MAXIMUM     = "android.stories.autoDownloadMaximum";
-  private static final String TELECOM_MANUFACTURER_ALLOWLIST    = "android.calling.telecomAllowList";
-  private static final String TELECOM_MODEL_BLOCKLIST           = "android.calling.telecomModelBlockList";
-  private static final String CAMERAX_MODEL_BLOCKLIST           = "android.cameraXModelBlockList";
-  private static final String CAMERAX_MIXED_MODEL_BLOCKLIST     = "android.cameraXMixedModelBlockList";
-  private static final String PAYMENTS_REQUEST_ACTIVATE_FLOW    = "android.payments.requestActivateFlow";
-  public static final  String GOOGLE_PAY_DISABLED_REGIONS       = "global.donations.gpayDisabledRegions";
-  public static final  String CREDIT_CARD_DISABLED_REGIONS      = "global.donations.ccDisabledRegions";
-  public static final  String PAYPAL_DISABLED_REGIONS           = "global.donations.paypalDisabledRegions";
-  private static final String CDS_HARD_LIMIT                    = "android.cds.hardLimit";
-  private static final String PAYPAL_ONE_TIME_DONATIONS         = "android.oneTimePayPalDonations.2";
-  private static final String PAYPAL_RECURRING_DONATIONS        = "android.recurringPayPalDonations.3";
-  private static final String ANY_ADDRESS_PORTS_KILL_SWITCH     = "android.calling.fieldTrial.anyAddressPortsKillSwitch";
-  private static final String AD_HOC_CALLING                    = "android.calling.ad.hoc.3";
-  private static final String MAX_ATTACHMENT_COUNT              = "android.attachments.maxCount";
-  private static final String MAX_ATTACHMENT_RECEIVE_SIZE_BYTES = "global.attachments.maxReceiveBytes";
-  private static final String MAX_ATTACHMENT_SIZE_BYTES         = "global.attachments.maxBytes";
-  private static final String SVR2_KILLSWITCH                   = "android.svr2.killSwitch";
-  private static final String CDS_DISABLE_COMPAT_MODE           = "cds.disableCompatibilityMode";
-  private static final String FCM_MAY_HAVE_MESSAGES_KILL_SWITCH = "android.fcmNotificationFallbackKillSwitch";
-  public static final  String PROMPT_FOR_NOTIFICATION_LOGS      = "android.logs.promptNotifications";
-  private static final String PROMPT_FOR_NOTIFICATION_CONFIG    = "android.logs.promptNotificationsConfig";
-  public static final  String PROMPT_BATTERY_SAVER              = "android.promptBatterySaver";
-  public static final  String INSTANT_VIDEO_PLAYBACK            = "android.instantVideoPlayback.1";
-  public static final  String CRASH_PROMPT_CONFIG               = "android.crashPromptConfig";
-  private static final String SEPA_DEBIT_DONATIONS              = "android.sepa.debit.donations.5";
-  private static final String IDEAL_DONATIONS                   = "android.ideal.donations.5";
-  public static final  String IDEAL_ENABLED_REGIONS             = "global.donations.idealEnabledRegions";
-  public static final  String SEPA_ENABLED_REGIONS              = "global.donations.sepaEnabledRegions";
-  private static final String NOTIFICATION_THUMBNAIL_BLOCKLIST  = "android.notificationThumbnailProductBlocklist";
-  private static final String CALLING_RAISE_HAND                = "android.calling.raiseHand";
-  private static final String USE_ACTIVE_CALL_MANAGER           = "android.calling.useActiveCallManager.5";
-  private static final String GIF_SEARCH                        = "global.gifSearch";
-  private static final String AUDIO_REMUXING                    = "android.media.audioRemux.1";
-  private static final String VIDEO_RECORD_1X_ZOOM              = "android.media.videoCaptureDefaultZoom";
-  private static final String RETRY_RECEIPT_MAX_COUNT           = "android.retryReceipt.maxCount";
-  private static final String RETRY_RECEIPT_MAX_COUNT_RESET_AGE = "android.retryReceipt.maxCountResetAge";
-  private static final String PREKEY_FORCE_REFRESH_INTERVAL     = "android.prekeyForceRefreshInterval";
-  private static final String CDSI_LIBSIGNAL_NET                = "android.cds.libsignal.3";
-  private static final String RX_MESSAGE_SEND                   = "android.rxMessageSend.2";
-  private static final String LINKED_DEVICE_LIFESPAN_SECONDS    = "android.linkedDeviceLifespanSeconds";
-  private static final String MESSAGE_BACKUPS                   = "android.messageBackups";
-  private static final String CAMERAX_CUSTOM_CONTROLLER         = "android.cameraXCustomController";
-  private static final String REGISTRATION_V2                   = "android.registration.v2";
-  private static final String LIBSIGNAL_WEB_SOCKET_ENABLED      = "android.libsignalWebSocketEnabled";
-  private static final String RESTORE_POST_REGISTRATION         = "android.registration.restorePostRegistration";
-  private static final String LIBSIGNAL_WEB_SOCKET_SHADOW_PCT   = "android.libsignalWebSocketShadowingPercentage";
-
-  /**
-   * We will only store remote values for flags in this set. If you want a flag to be controllable
-   * remotely, place it in here.
-   */
-  @VisibleForTesting
-  static final Set<String> REMOTE_CAPABLE = SetUtil.newHashSet(
-      PAYMENTS_KILL_SWITCH,
-      GROUPS_V2_RECOMMENDED_LIMIT, GROUPS_V2_HARD_LIMIT,
-      INTERNAL_USER,
-      VERIFY_V2,
-      CLIENT_EXPIRATION,
-      CUSTOM_VIDEO_MUXER,
-      CDS_REFRESH_INTERVAL,
-      CDS_FOREGROUND_SYNC_INTERVAL,
-      GROUP_NAME_MAX_LENGTH,
-      AUTOMATIC_SESSION_RESET,
-      AUTOMATIC_SESSION_INTERVAL,
-      DEFAULT_MAX_BACKOFF,
-      SERVER_ERROR_MAX_BACKOFF,
-      OKHTTP_AUTOMATIC_RETRY,
-      SHARE_SELECTION_LIMIT,
-      ANIMATED_STICKER_MIN_MEMORY,
-      ANIMATED_STICKER_MIN_TOTAL_MEMORY,
-      MESSAGE_PROCESSOR_ALARM_INTERVAL,
-      MESSAGE_PROCESSOR_DELAY,
-      MEDIA_QUALITY_LEVELS,
-      RETRY_RECEIPT_LIFESPAN,
-      RETRY_RESPOND_MAX_AGE,
-      RETRY_RECEIPTS,
-      MAX_GROUP_CALL_RING_SIZE,
-      SENDER_KEY_MAX_AGE,
-      STORIES_TEXT_FUNCTIONS,
-      HARDWARE_AEC_BLOCKLIST_MODELS,
-      SOFTWARE_AEC_BLOCKLIST_MODELS,
-      USE_HARDWARE_AEC_IF_OLD,
-      PAYMENTS_COUNTRY_BLOCKLIST,
-      STORIES_AUTO_DOWNLOAD_MAXIMUM,
-      TELECOM_MANUFACTURER_ALLOWLIST,
-      TELECOM_MODEL_BLOCKLIST,
-      CAMERAX_MODEL_BLOCKLIST,
-      CAMERAX_MIXED_MODEL_BLOCKLIST,
-      PAYMENTS_REQUEST_ACTIVATE_FLOW,
-      GOOGLE_PAY_DISABLED_REGIONS,
-      CREDIT_CARD_DISABLED_REGIONS,
-      PAYPAL_DISABLED_REGIONS,
-      CDS_HARD_LIMIT,
-      PAYPAL_ONE_TIME_DONATIONS,
-      PAYPAL_RECURRING_DONATIONS,
-      ANY_ADDRESS_PORTS_KILL_SWITCH,
-      MAX_ATTACHMENT_COUNT,
-      MAX_ATTACHMENT_RECEIVE_SIZE_BYTES,
-      MAX_ATTACHMENT_SIZE_BYTES,
-      AD_HOC_CALLING,
-      SVR2_KILLSWITCH,
-      CDS_DISABLE_COMPAT_MODE,
-      FCM_MAY_HAVE_MESSAGES_KILL_SWITCH,
-      PROMPT_FOR_NOTIFICATION_LOGS,
-      PROMPT_FOR_NOTIFICATION_CONFIG,
-      PROMPT_BATTERY_SAVER,
-      INSTANT_VIDEO_PLAYBACK,
-      CRASH_PROMPT_CONFIG,
-      SEPA_DEBIT_DONATIONS,
-      IDEAL_DONATIONS,
-      IDEAL_ENABLED_REGIONS,
-      SEPA_ENABLED_REGIONS,
-      NOTIFICATION_THUMBNAIL_BLOCKLIST,
-      CALLING_RAISE_HAND,
-      USE_ACTIVE_CALL_MANAGER,
-      GIF_SEARCH,
-      AUDIO_REMUXING,
-      VIDEO_RECORD_1X_ZOOM,
-      RETRY_RECEIPT_MAX_COUNT,
-      RETRY_RECEIPT_MAX_COUNT_RESET_AGE,
-      PREKEY_FORCE_REFRESH_INTERVAL,
-      CDSI_LIBSIGNAL_NET,
-      RX_MESSAGE_SEND,
-      LINKED_DEVICE_LIFESPAN_SECONDS,
-      CAMERAX_CUSTOM_CONTROLLER,
-      LIBSIGNAL_WEB_SOCKET_ENABLED,
-      LIBSIGNAL_WEB_SOCKET_SHADOW_PCT
-  );
-
-  @VisibleForTesting
-  static final Set<String> NOT_REMOTE_CAPABLE = SetUtil.newHashSet(MESSAGE_BACKUPS, REGISTRATION_V2, RESTORE_POST_REGISTRATION);
-
-  /**
-   * Values in this map will take precedence over any value. This should only be used for local
-   * development. Given that you specify a default when retrieving a value, and that we only store
-   * remote values for things in {@link #REMOTE_CAPABLE}, there should be no need to ever *commit*
-   * an addition to this map.
-   */
-  @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
-  @VisibleForTesting
-  static final Map<String, Object> FORCED_VALUES = new HashMap<String, Object>() {{
-  }};
-
-  /**
-   * By default, flags are only updated once at app start. This is to ensure that values don't
-   * change within an app session, simplifying logic. However, given that this can delay how often
-   * a flag is updated, you can put a flag in here to mark it as 'hot swappable'. Flags in this set
-   * will be updated arbitrarily at runtime. This will make values more responsive, but also places
-   * more burden on the reader to ensure that the app experience remains consistent.
-   */
-  @VisibleForTesting
-  static final Set<String> HOT_SWAPPABLE = SetUtil.newHashSet(
-      VERIFY_V2,
-      CLIENT_EXPIRATION,
-      CUSTOM_VIDEO_MUXER,
-      CDS_REFRESH_INTERVAL,
-      CDS_FOREGROUND_SYNC_INTERVAL,
-      GROUP_NAME_MAX_LENGTH,
-      AUTOMATIC_SESSION_RESET,
-      AUTOMATIC_SESSION_INTERVAL,
-      DEFAULT_MAX_BACKOFF,
-      SERVER_ERROR_MAX_BACKOFF,
-      OKHTTP_AUTOMATIC_RETRY,
-      SHARE_SELECTION_LIMIT,
-      ANIMATED_STICKER_MIN_MEMORY,
-      ANIMATED_STICKER_MIN_TOTAL_MEMORY,
-      MESSAGE_PROCESSOR_ALARM_INTERVAL,
-      MESSAGE_PROCESSOR_DELAY,
-      MEDIA_QUALITY_LEVELS,
-      RETRY_RECEIPT_LIFESPAN,
-      RETRY_RESPOND_MAX_AGE,
-      RETRY_RECEIPTS,
-      MAX_GROUP_CALL_RING_SIZE,
-      SENDER_KEY_MAX_AGE,
-      HARDWARE_AEC_BLOCKLIST_MODELS,
-      SOFTWARE_AEC_BLOCKLIST_MODELS,
-      USE_HARDWARE_AEC_IF_OLD,
-      PAYMENTS_COUNTRY_BLOCKLIST,
-      TELECOM_MANUFACTURER_ALLOWLIST,
-      TELECOM_MODEL_BLOCKLIST,
-      CAMERAX_MODEL_BLOCKLIST,
-      PAYMENTS_REQUEST_ACTIVATE_FLOW,
-      CDS_HARD_LIMIT,
-      MAX_ATTACHMENT_COUNT,
-      MAX_ATTACHMENT_RECEIVE_SIZE_BYTES,
-      MAX_ATTACHMENT_SIZE_BYTES,
-      SVR2_KILLSWITCH,
-      CDS_DISABLE_COMPAT_MODE,
-      FCM_MAY_HAVE_MESSAGES_KILL_SWITCH,
-      PROMPT_FOR_NOTIFICATION_LOGS,
-      PROMPT_FOR_NOTIFICATION_CONFIG,
-      PROMPT_BATTERY_SAVER,
-      CRASH_PROMPT_CONFIG,
-      NOTIFICATION_THUMBNAIL_BLOCKLIST,
-      CALLING_RAISE_HAND,
-      VIDEO_RECORD_1X_ZOOM,
-      RETRY_RECEIPT_MAX_COUNT,
-      RETRY_RECEIPT_MAX_COUNT_RESET_AGE,
-      PREKEY_FORCE_REFRESH_INTERVAL,
-      CDSI_LIBSIGNAL_NET,
-      RX_MESSAGE_SEND,
-      LINKED_DEVICE_LIFESPAN_SECONDS,
-      CAMERAX_CUSTOM_CONTROLLER
-  );
-
-  /**
-   * Flags in this set will stay true forever once they receive a true value from a remote config.
-   */
-  @VisibleForTesting
-  static final Set<String> STICKY = SetUtil.newHashSet(
-      VERIFY_V2,
-      SVR2_KILLSWITCH,
-      FCM_MAY_HAVE_MESSAGES_KILL_SWITCH
-  );
-
-  /**
-   * Listeners that are called when the value in {@link #REMOTE_VALUES} changes. That means that
-   * hot-swappable flags will have this invoked as soon as we know about that change, but otherwise
-   * these will only run during initialization.
-   *
-   * These can be called on any thread, including the main thread, so be careful!
-   *
-   * Also note that this doesn't play well with {@link #FORCED_VALUES} -- changes there will not
-   * trigger changes in this map, so you'll have to do some manual hacking to get yourself in the
-   * desired test state.
-   */
-  private static final Map<String, OnFlagChange> FLAG_CHANGE_LISTENERS = new HashMap<String, OnFlagChange>() {{
-    put(MESSAGE_PROCESSOR_ALARM_INTERVAL, change -> RoutineMessageFetchReceiver.startOrUpdateAlarm(ApplicationDependencies.getApplication()));
-  }};
-
-  private static final Map<String, Object> REMOTE_VALUES = new TreeMap<>();
-
-  private FeatureFlags() {}
-
-  public static synchronized void init() {
-    Map<String, Object> current = parseStoredConfig(SignalStore.remoteConfigValues().getCurrentConfig());
-    Map<String, Object> pending = parseStoredConfig(SignalStore.remoteConfigValues().getPendingConfig());
-    Map<String, Change> changes = computeChanges(current, pending);
-
-    SignalStore.remoteConfigValues().setCurrentConfig(mapToJson(pending));
-    REMOTE_VALUES.putAll(pending);
-    triggerFlagChangeListeners(changes);
-
-    Log.i(TAG, "init() " + REMOTE_VALUES.toString());
-  }
-
-  public static void refreshIfNecessary() {
-    long timeSinceLastFetch = System.currentTimeMillis() - SignalStore.remoteConfigValues().getLastFetchTime();
-
-    if (timeSinceLastFetch < 0 || timeSinceLastFetch > FETCH_INTERVAL) {
-      Log.i(TAG, "Scheduling remote config refresh.");
-      ApplicationDependencies.getJobManager().add(new RemoteConfigRefreshJob());
-    } else {
-      Log.i(TAG, "Skipping remote config refresh. Refreshed " + timeSinceLastFetch + " ms ago.");
-    }
-  }
-
-  @WorkerThread
-  public static void refreshSync() throws IOException {
-    RemoteConfigResult result = ApplicationDependencies.getSignalServiceAccountManager().getRemoteConfig();
-    FeatureFlags.update(result.getConfig());
-  }
-
-  public static synchronized void update(@NonNull Map<String, Object> config) {
-    Map<String, Object> memory  = REMOTE_VALUES;
-    Map<String, Object> disk    = parseStoredConfig(SignalStore.remoteConfigValues().getPendingConfig());
-    UpdateResult        result  = updateInternal(config, memory, disk, REMOTE_CAPABLE, HOT_SWAPPABLE, STICKY);
-
-    SignalStore.remoteConfigValues().setPendingConfig(mapToJson(result.getDisk()));
-    REMOTE_VALUES.clear();
-    REMOTE_VALUES.putAll(result.getMemory());
-    triggerFlagChangeListeners(result.getMemoryChanges());
-
-    SignalStore.remoteConfigValues().setLastFetchTime(System.currentTimeMillis());
-
-    Log.i(TAG, "[Memory] Before: " + memory.toString());
-    Log.i(TAG, "[Memory] After : " + result.getMemory().toString());
-    Log.i(TAG, "[Disk]   Before: " + disk.toString());
-    Log.i(TAG, "[Disk]   After : " + result.getDisk().toString());
-  }
-
-  /**
-   * Maximum number of members allowed in a group.
-   */
-  public static SelectionLimits groupLimits() {
-    return new SelectionLimits(getInteger(GROUPS_V2_RECOMMENDED_LIMIT, 151),
-                               getInteger(GROUPS_V2_HARD_LIMIT, 1001));
-  }
-
-  /** Payments Support */
-  public static boolean payments() {
-    return !getBoolean(PAYMENTS_KILL_SWITCH, false);
-  }
-
-  /** Internal testing extensions. */
-  public static boolean internalUser() {
-    return getBoolean(INTERNAL_USER, false) || Environment.IS_STAGING || BuildConfig.DEBUG || BuildConfig.FORCE_INTERNAL_USER_FLAG;
-  }
-
-  public static boolean selfUpdater() {
-    return BuildConfig.MANAGES_MOLLY_UPDATES;
-  }
-
-  /** Whether or not to use the UUID in verification codes. */
-  public static boolean verifyV2() {
-    return getBoolean(VERIFY_V2, false);
-  }
-
-  /** The raw client expiration JSON string. */
-  public static String clientExpiration() {
-    return getString(CLIENT_EXPIRATION, null);
-  }
-
-  /** Whether to use the custom streaming muxer or built in android muxer. */
-  public static boolean useStreamingVideoMuxer() {
-    return getBoolean(CUSTOM_VIDEO_MUXER, false);
-  }
-
-  /** The time in between routine CDS refreshes, in seconds. */
-  public static int cdsRefreshIntervalSeconds() {
-    return getInteger(CDS_REFRESH_INTERVAL, (int) TimeUnit.HOURS.toSeconds(48));
-  }
-
-  /** The minimum time in between foreground CDS refreshes initiated via message requests, in milliseconds. */
-  public static Long cdsForegroundSyncInterval() {
-    return TimeUnit.SECONDS.toMillis(getInteger(CDS_FOREGROUND_SYNC_INTERVAL, (int) TimeUnit.HOURS.toSeconds(4)));
-  }
-
-  public static @NonNull SelectionLimits shareSelectionLimit() {
-    int limit = getInteger(SHARE_SELECTION_LIMIT, 5);
-    return new SelectionLimits(limit, limit);
-  }
-
-  /** The maximum number of grapheme */
-  public static int getMaxGroupNameGraphemeLength() {
-    return Math.max(32, getInteger(GROUP_NAME_MAX_LENGTH, -1));
-  }
-
-  /** Whether or not to allow automatic session resets. */
-  public static boolean automaticSessionReset() {
-    return getBoolean(AUTOMATIC_SESSION_RESET, true);
-  }
-
-  /** How often we allow an automatic session reset. */
-  public static int automaticSessionResetIntervalSeconds() {
-    return getInteger(AUTOMATIC_SESSION_RESET, (int) TimeUnit.HOURS.toSeconds(1));
-  }
-
-  /** The default maximum backoff for jobs. */
-  public static long getDefaultMaxBackoff() {
-    return TimeUnit.SECONDS.toMillis(getInteger(DEFAULT_MAX_BACKOFF, 60));
-  }
-
-  /** The maximum backoff for network jobs that hit a 5xx error. */
-  public static long getServerErrorMaxBackoff() {
-    return TimeUnit.SECONDS.toMillis(getInteger(SERVER_ERROR_MAX_BACKOFF, (int) TimeUnit.HOURS.toSeconds(6)));
-  }
-
-  /** Whether or not to allow automatic retries from OkHttp */
-  public static boolean okHttpAutomaticRetry() {
-    return getBoolean(OKHTTP_AUTOMATIC_RETRY, true);
-  }
-
-  /** The minimum memory class required for rendering animated stickers in the keyboard and such */
-  public static int animatedStickerMinimumMemoryClass() {
-    return getInteger(ANIMATED_STICKER_MIN_MEMORY, 193);
-  }
-
-  /** The minimum total memory for rendering animated stickers in the keyboard and such */
-  public static int animatedStickerMinimumTotalMemoryMb() {
-    return getInteger(ANIMATED_STICKER_MIN_TOTAL_MEMORY, (int) ByteUnit.GIGABYTES.toMegabytes(3));
-  }
-
-  public static @NonNull String getMediaQualityLevels() {
-    return getString(MEDIA_QUALITY_LEVELS, "");
-  }
-
-  /** Whether or not sending or responding to retry receipts is enabled. */
-  public static boolean retryReceipts() {
-    return getBoolean(RETRY_RECEIPTS, true);
-  }
-
-  /** How old a message is allowed to be while still resending in response to a retry receipt . */
-  public static long retryRespondMaxAge() {
-    return getLong(RETRY_RESPOND_MAX_AGE, TimeUnit.DAYS.toMillis(14));
-  }
-
-  /**
-   * The max number of retry receipts sends we allow (within @link{#retryReceiptMaxCountResetAge()}) before we consider the volume too large and stop responding.
-   */
-  public static long retryReceiptMaxCount() {
-    return getLong(RETRY_RECEIPT_MAX_COUNT, 10);
-  }
-
-  /**
-   * If the last retry receipt send was older than this, then we reset the retry receipt sent count. (For use with @link{#retryReceiptMaxCount()})
-   */
-  public static long retryReceiptMaxCountResetAge() {
-    return getLong(RETRY_RECEIPT_MAX_COUNT_RESET_AGE, TimeUnit.HOURS.toMillis(3));
-  }
-
-  /** How long a sender key can live before it needs to be rotated. */
-  public static long senderKeyMaxAge() {
-    return Math.min(getLong(SENDER_KEY_MAX_AGE, TimeUnit.DAYS.toMillis(14)), TimeUnit.DAYS.toMillis(90));
-  }
-
-  /** Max group size that can be use group call ringing. */
-  public static long maxGroupCallRingSize() {
-    return getLong(MAX_GROUP_CALL_RING_SIZE, 16);
-  }
-
-  /** A comma-separated list of country codes where payments should be disabled. */
-  public static String paymentsCountryBlocklist() {
-    return getString(PAYMENTS_COUNTRY_BLOCKLIST, "98,963,53,850,7");
-  }
-
-  /**
-   * Whether users can apply alignment and scale to text posts
-   *
-   * NOTE: This feature is still under ongoing development, do not enable.
-   */
-  public static boolean storiesTextFunctions() {
-    return getBoolean(STORIES_TEXT_FUNCTIONS, false);
-  }
-
-  /** A comma-separated list of models that should *not* use hardware AEC for calling. */
-  public static @NonNull String hardwareAecBlocklistModels() {
-    return getString(HARDWARE_AEC_BLOCKLIST_MODELS, "");
-  }
-
-  /** A comma-separated list of models that should *not* use software AEC for calling. */
-  public static @NonNull String softwareAecBlocklistModels() {
-    return getString(SOFTWARE_AEC_BLOCKLIST_MODELS, "");
-  }
-
-  /** A comma-separated list of manufacturers that *should* use Telecom for calling. */
-  public static @NonNull String telecomManufacturerAllowList() {
-    return getString(TELECOM_MANUFACTURER_ALLOWLIST, "");
-  }
-
-  /** A comma-separated list of manufacturers that *should* use Telecom for calling. */
-  public static @NonNull String telecomModelBlockList() {
-    return getString(TELECOM_MODEL_BLOCKLIST, "");
-  }
-
-  /** A comma-separated list of manufacturers that should *not* use CameraX. */
-  public static @NonNull String cameraXModelBlocklist() {
-    return getString(CAMERAX_MODEL_BLOCKLIST, "");
-  }
-
-  /** A comma-separated list of manufacturers that should *not* use CameraX mixed mode. */
-  public static @NonNull String cameraXMixedModelBlocklist() {
-    return getString(CAMERAX_MIXED_MODEL_BLOCKLIST, "");
-  }
-
-  /** Whether or not hardware AEC should be used for calling on devices older than API 29. */
-  public static boolean useHardwareAecIfOlderThanApi29() {
-    return getBoolean(USE_HARDWARE_AEC_IF_OLD, false);
-  }
-
-  /**
-   * Prefetch count for stories from a given user.
-   */
-  public static int storiesAutoDownloadMaximum() {
-    return getInteger(STORIES_AUTO_DOWNLOAD_MAXIMUM, 2);
-  }
-
-  /** Whether client supports sending a request to another to activate payments */
-  public static boolean paymentsRequestActivateFlow() {
-    return getBoolean(PAYMENTS_REQUEST_ACTIVATE_FLOW, false);
-  }
-
-  /**
-   * If the user has more than this number of contacts, the CDS request will certainly be rejected, so we must fail.
-   */
-  public static int cdsHardLimit() {
-    return getInteger(CDS_HARD_LIMIT, 50_000);
-  }
-
-  /**
-   * Enable/disable RingRTC field trial for "AnyAddressPortsKillSwitch"
-   */
-  public static boolean callingFieldTrialAnyAddressPortsKillSwitch() {
-    return getBoolean(ANY_ADDRESS_PORTS_KILL_SWITCH, false);
-  }
-
-  /**
-   * Whether or not ad-hoc calling is enabled
-   */
-  public static boolean adHocCalling() {
-    return getBoolean(AD_HOC_CALLING, false);
-  }
-
-  /** Maximum number of attachments allowed to be sent/received. */
-  public static int maxAttachmentCount() {
-    return getInteger(MAX_ATTACHMENT_COUNT, 32);
-  }
-
-  /** Maximum attachment size for ciphertext in bytes. */
-  public static long maxAttachmentReceiveSizeBytes() {
-    long maxAttachmentSize = maxAttachmentSizeBytes();
-    long maxReceiveSize    = getLong(MAX_ATTACHMENT_RECEIVE_SIZE_BYTES, (int) (maxAttachmentSize * 1.25));
-    return Math.max(maxAttachmentSize, maxReceiveSize);
-  }
-
-  /** Maximum attachment ciphertext size when sending in bytes */
-  public static long maxAttachmentSizeBytes() {
-    return getLong(MAX_ATTACHMENT_SIZE_BYTES, ByteUnit.MEGABYTES.toBytes(100));
-  }
-
-  /**
-   * Allow the video players to read from the temporary download files for attachments.
-   * @return whether this functionality is enabled.
-   */
-  public static boolean instantVideoPlayback() {
-    return getBoolean(INSTANT_VIDEO_PLAYBACK, false);
-  }
-
-  /**
-   * Whether or not group call raise hand is enabled.
-   */
-  public static boolean groupCallRaiseHand() {
-    return getBoolean(CALLING_RAISE_HAND, false);
-  }
-
-  /** List of device products that are blocked from showing notification thumbnails. */
-  public static String notificationThumbnailProductBlocklist() {
-    return getString(NOTIFICATION_THUMBNAIL_BLOCKLIST, "");
-  }
-
-  /** Whether or not to use active call manager instead of WebRtcCallService. */
-  public static boolean useActiveCallManager() {
-    return getBoolean(USE_ACTIVE_CALL_MANAGER, false);
-  }
-
-  /** Whether the in-app GIF search is available for use. */
-  public static boolean gifSearchAvailable() {
-    return getBoolean(GIF_SEARCH, true);
-  }
-
-  /** Allow media converters to remux audio instead of transcoding it. */
-  public static boolean allowAudioRemuxing() {
-    return getBoolean(AUDIO_REMUXING, false);
-  }
-
-  /** Get the default video zoom, expressed as 10x the actual Float value due to the service limiting us to whole numbers. */
-  public static boolean startVideoRecordAt1x() {
-    return getBoolean(VIDEO_RECORD_1X_ZOOM, false);
-  }
-
-  /** How often we allow a forced prekey refresh. */
-  public static long preKeyForceRefreshInterval() {
-    return getLong(PREKEY_FORCE_REFRESH_INTERVAL, TimeUnit.HOURS.toMillis(1));
-  }
-
-  /** Make CDSI lookups via libsignal-net instead of native websocket. */
-  public static boolean useLibsignalNetForCdsiLookup() {
-    return getBoolean(CDSI_LIBSIGNAL_NET, false);
-  }
-
-  /** Use Rx threading model to do sends. */
-  public static boolean useRxMessageSending() {
-    return getBoolean(RX_MESSAGE_SEND, false);
-  }
-
-  /** The lifespan of a linked device (i.e. the time it can be inactive for before it expires), in milliseconds. */
-  public static long linkedDeviceLifespan() {
-    long seconds = getLong(LINKED_DEVICE_LIFESPAN_SECONDS, TimeUnit.DAYS.toSeconds(30));
-    return TimeUnit.SECONDS.toMillis(seconds);
-  }
-
-  /**
-   * Enable Message Backups UI
-   * Note: This feature is in active development and is not intended to currently function.
-   */
-  public static boolean messageBackups() {
-    return false;
-  }
-
-  /** Whether or not to use the custom CameraX controller class */
-  public static boolean customCameraXController() {
-    return getBoolean(CAMERAX_CUSTOM_CONTROLLER, false);
-  }
-
-  /** Whether or not to use the V2 refactor of registration. */
-  public static boolean registrationV2() {
-    return false;
-  }
-
-  /** Whether unauthenticated chat web socket is backed by libsignal-net */
-  public static boolean libSignalWebSocketEnabled() { return false; }
-
-  /** Whether or not to launch the restore activity after registration is complete, rather than before. */
-  public static boolean restoreAfterRegistration() {
-    return getBoolean(RESTORE_POST_REGISTRATION, false);
-  }
-
-  /**
-   * Percentage [0, 100] of web socket requests that will be "shadowed" by sending
-   * an unauthenticated keep-alive via libsignal-net. Default: 0
-   */
-  public static  int libSignalWebSocketShadowingPercentage() {
-    return 0;
-  }
-
-  /** Only for rendering debug info. */
-  public static synchronized @NonNull Map<String, Object> getMemoryValues() {
-    return new TreeMap<>(REMOTE_VALUES);
-  }
-
-  /** Only for rendering debug info. */
-  public static synchronized @NonNull Map<String, Object> getDiskValues() {
-    return new TreeMap<>(parseStoredConfig(SignalStore.remoteConfigValues().getCurrentConfig()));
-  }
-
-  /** Only for rendering debug info. */
-  public static synchronized @NonNull Map<String, Object> getPendingDiskValues() {
-    return new TreeMap<>(parseStoredConfig(SignalStore.remoteConfigValues().getPendingConfig()));
-  }
-
-  /** Only for rendering debug info. */
-  public static synchronized @NonNull Map<String, Object> getForcedValues() {
-    return new TreeMap<>(FORCED_VALUES);
-  }
-
-  @VisibleForTesting
-  static @NonNull UpdateResult updateInternal(@NonNull Map<String, Object> remote,
-                                              @NonNull Map<String, Object> localMemory,
-                                              @NonNull Map<String, Object> localDisk,
-                                              @NonNull Set<String>         remoteCapable,
-                                              @NonNull Set<String>         hotSwap,
-                                              @NonNull Set<String>         sticky)
-  {
-    Map<String, Object> newMemory = new TreeMap<>(localMemory);
-    Map<String, Object> newDisk   = new TreeMap<>(localDisk);
-
-    Set<String> allKeys = new HashSet<>();
-    allKeys.addAll(remote.keySet());
-    allKeys.addAll(localDisk.keySet());
-    allKeys.addAll(localMemory.keySet());
-
-    Stream.of(allKeys)
-          .filter(remoteCapable::contains)
-          .forEach(key -> {
-            Object remoteValue = remote.get(key);
-            Object diskValue   = localDisk.get(key);
-            Object newValue    = remoteValue;
-
-            if (newValue != null && diskValue != null && newValue.getClass() != diskValue.getClass()) {
-              Log.w(TAG, "Type mismatch! key: " + key);
-
-              newDisk.remove(key);
-
-              if (hotSwap.contains(key)) {
-                newMemory.remove(key);
-              }
-
-              return;
-            }
-
-            if (sticky.contains(key) && (newValue instanceof Boolean || diskValue instanceof Boolean)) {
-              newValue = diskValue == Boolean.TRUE ? Boolean.TRUE : newValue;
-            } else if (sticky.contains(key)) {
-              Log.w(TAG, "Tried to make a non-boolean sticky! Ignoring. (key: " + key + ")");
-            }
-
-            if (newValue != null) {
-              newDisk.put(key, newValue);
-            } else {
-              newDisk.remove(key);
-            }
-
-            if (hotSwap.contains(key)) {
-              if (newValue != null) {
-                newMemory.put(key, newValue);
-              } else {
-                newMemory.remove(key);
-              }
-            }
-          });
-
-    Stream.of(allKeys)
-          .filterNot(remoteCapable::contains)
-          .filterNot(key -> sticky.contains(key) && localDisk.get(key) == Boolean.TRUE)
-          .forEach(key -> {
-            newDisk.remove(key);
-
-            if (hotSwap.contains(key)) {
-              newMemory.remove(key);
-            }
-          });
-
-    return new UpdateResult(newMemory, newDisk, computeChanges(localMemory, newMemory));
-  }
-
-  @VisibleForTesting
-  static @NonNull Map<String, Change> computeChanges(@NonNull Map<String, Object> oldMap, @NonNull Map<String, Object> newMap) {
-    Map<String, Change> changes = new HashMap<>();
-    Set<String>         allKeys = new HashSet<>();
-
-    allKeys.addAll(oldMap.keySet());
-    allKeys.addAll(newMap.keySet());
-
-    for (String key : allKeys) {
-      Object oldValue = oldMap.get(key);
-      Object newValue = newMap.get(key);
-
-      if (oldValue == null && newValue == null) {
-        throw new AssertionError("Should not be possible.");
-      } else if (oldValue != null && newValue == null) {
-        changes.put(key, Change.REMOVED);
-      } else if (newValue != oldValue && newValue instanceof Boolean) {
-        changes.put(key, (boolean) newValue ? Change.ENABLED : Change.DISABLED);
-      } else if (!Objects.equals(oldValue, newValue)) {
-        changes.put(key, Change.CHANGED);
-      }
-    }
-
-    return changes;
-  }
-
-  private static @NonNull VersionFlag getVersionFlag(@NonNull String key) {
-    int versionFromKey = getInteger(key, 0);
-
-    if (versionFromKey == 0) {
-      return VersionFlag.OFF;
-    }
-
-    if (Util.getSignalCanonicalVersionCode() >= versionFromKey) {
-      return VersionFlag.ON;
-    } else {
-      return VersionFlag.ON_IN_FUTURE_VERSION;
-    }
-  }
-
-  public static long getBackgroundMessageProcessInterval() {
-    int delayMinutes = getInteger(MESSAGE_PROCESSOR_ALARM_INTERVAL, (int) TimeUnit.HOURS.toMinutes(6));
-    return TimeUnit.MINUTES.toMillis(delayMinutes);
-  }
-
-  /**
-   * How long before a "Checking messages" foreground notification is shown to the user.
-   */
-  public static long getBackgroundMessageProcessForegroundDelay() {
-    return getInteger(MESSAGE_PROCESSOR_DELAY, 300);
-  }
-
-  /**
-   * Whether or not SVR2 should be used at all. Defaults to true. In practice this is reserved as a killswitch.
-   */
-  public static boolean svr2() {
-    // Despite us always inverting the value, it's important that this defaults to false so that the STICKY property works as intended
-    return !getBoolean(SVR2_KILLSWITCH, false);
-  }
-
-  private enum VersionFlag {
-    /** The flag is no set */
-    OFF,
-
-    /** The flag is set on for a version higher than the current client version */
-    ON_IN_FUTURE_VERSION,
-
-    /** The flag is set on for this version or earlier */
-    ON
-  }
-
-  private static boolean getBoolean(@NonNull String key, boolean defaultValue) {
-    Boolean forced = (Boolean) FORCED_VALUES.get(key);
-    if (forced != null) {
-      return forced;
-    }
-
-    Object remote = REMOTE_VALUES.get(key);
-    if (remote instanceof Boolean) {
-      return (boolean) remote;
-    } else if (remote instanceof String) {
-      String stringValue = ((String) remote).toLowerCase();
-      if (stringValue.equals("true")) {
-        return true;
-      } else if (stringValue.equals("false")) {
-        return false;
-      } else {
-        Log.w(TAG, "Expected a boolean for key '" + key + "', but got something else (" + stringValue + ")! Falling back to the default.");
-      }
-    } else if (remote != null) {
-      Log.w(TAG, "Expected a boolean for key '" + key + "', but got something else! Falling back to the default.");
-    }
-
-    return defaultValue;
-  }
-
-  private static int getInteger(@NonNull String key, int defaultValue) {
-    Integer forced = (Integer) FORCED_VALUES.get(key);
-    if (forced != null) {
-      return forced;
-    }
-
-    Object remote = REMOTE_VALUES.get(key);
-    if (remote instanceof String) {
-      try {
-        return Integer.parseInt((String) remote);
-      } catch (NumberFormatException e) {
-        Log.w(TAG, "Expected an int for key '" + key + "', but got something else! Falling back to the default.");
-      }
-    }
-
-    return defaultValue;
-  }
-
-  private static long getLong(@NonNull String key, long defaultValue) {
-    Long forced = (Long) FORCED_VALUES.get(key);
-    if (forced != null) {
-      return forced;
-    }
-
-    Object remote = REMOTE_VALUES.get(key);
-    if (remote instanceof String) {
-      try {
-        return Long.parseLong((String) remote);
-      } catch (NumberFormatException e) {
-        Log.w(TAG, "Expected a long for key '" + key + "', but got something else! Falling back to the default.");
-      }
-    }
-
-    return defaultValue;
-  }
-
-  private static String getString(@NonNull String key, String defaultValue) {
-    String forced = (String) FORCED_VALUES.get(key);
-    if (forced != null) {
-      return forced;
-    }
-
-    Object remote = REMOTE_VALUES.get(key);
-    if (remote instanceof String) {
-      return (String) remote;
-    }
-
-    return defaultValue;
-  }
-
-  private static Map<String, Object> parseStoredConfig(String stored) {
-    Map<String, Object> parsed = new HashMap<>();
-
-    if (TextUtils.isEmpty(stored)) {
-      Log.i(TAG, "No remote config stored. Skipping.");
-      return parsed;
-    }
-
-    try {
-      JSONObject       root = new JSONObject(stored);
-      Iterator<String> iter = root.keys();
-
-      while (iter.hasNext()) {
-        String key = iter.next();
-        parsed.put(key, root.get(key));
-      }
-    } catch (JSONException e) {
-      throw new AssertionError("Failed to parse! Cleared storage.");
-    }
-
-    return parsed;
-  }
-
-  private static @NonNull String mapToJson(@NonNull Map<String, Object> map) {
-    try {
-      JSONObject json = new JSONObject();
-
-      for (Map.Entry<String, Object> entry : map.entrySet()) {
-        json.put(entry.getKey(), entry.getValue());
-      }
-
-      return json.toString();
-    } catch (JSONException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-  private static void triggerFlagChangeListeners(Map<String, Change> changes) {
-    for (Map.Entry<String, Change> change : changes.entrySet()) {
-      OnFlagChange listener = FLAG_CHANGE_LISTENERS.get(change.getKey());
-
-      if (listener != null) {
-        Log.i(TAG, "Triggering change listener for: " + change.getKey());
-        listener.onFlagChange(change.getValue());
-      }
-    }
-  }
-
-  @VisibleForTesting
-  static final class UpdateResult {
-    private final Map<String, Object> memory;
-    private final Map<String, Object> disk;
-    private final Map<String, Change> memoryChanges;
-
-    UpdateResult(@NonNull Map<String, Object> memory, @NonNull Map<String, Object> disk, @NonNull Map<String, Change> memoryChanges) {
-      this.memory        = memory;
-      this.disk          = disk;
-      this.memoryChanges = memoryChanges;
-    }
-
-    public @NonNull Map<String, Object> getMemory() {
-      return memory;
-    }
-
-    public @NonNull Map<String, Object> getDisk() {
-      return disk;
-    }
-
-    public @NonNull Map<String, Change> getMemoryChanges() {
-      return memoryChanges;
-    }
-  }
-
-  @VisibleForTesting
-  interface OnFlagChange {
-    void onFlagChange(@NonNull Change change);
-  }
-
-  enum Change {
-    ENABLED, DISABLED, CHANGED, REMOVED
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java
index 9791076f42..bd754cd60a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java
@@ -26,7 +26,7 @@
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.GroupRecord;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.mms.IncomingMessage;
 import org.thoughtcrime.securesms.mms.MmsException;
 import org.thoughtcrime.securesms.mms.OutgoingMessage;
@@ -53,7 +53,7 @@ public static ListenableFuture<Optional<IdentityRecord>> getRemoteIdentityKey(fi
     final RecipientId                              recipientId = recipient.getId();
 
     SimpleTask.run(SignalExecutors.BOUNDED,
-                   () -> ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecord(recipientId),
+                   () -> AppDependencies.getProtocolStore().aci().identities().getIdentityRecord(recipientId),
                    future::set);
 
     return future;
@@ -98,7 +98,7 @@ public static void markIdentityVerified(Context context, Recipient recipient, bo
             } catch (MmsException e) {
               throw new AssertionError(e);
             }
-            SignalDatabase.threads().update(threadId, true);
+            SignalDatabase.threads().update(threadId, true, true);
           }
         }
       }
@@ -129,7 +129,7 @@ public static void markIdentityVerified(Context context, Recipient recipient, bo
       } catch (MmsException e) {
         throw new AssertionError();
       }
-      SignalDatabase.threads().update(threadId, true);
+      SignalDatabase.threads().update(threadId, true, true);
     }
   }
 
@@ -158,7 +158,7 @@ public static void markIdentityUpdate(@NonNull Context context, @NonNull Recipie
       Optional<InsertResult> insertResult     = smsDatabase.insertMessageInbox(individualUpdate);
 
       if (insertResult.isPresent()) {
-        ApplicationDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(insertResult.get().getThreadId()));
+        AppDependencies.getMessageNotifier().updateNotification(context, ConversationId.forConversation(insertResult.get().getThreadId()));
       }
     } catch (MmsException e) {
       throw new AssertionError(e);
@@ -169,10 +169,10 @@ public static void markIdentityUpdate(@NonNull Context context, @NonNull Recipie
 
   public static void saveIdentity(String user, IdentityKey identityKey) {
     try(SignalSessionLock.Lock unused = ReentrantSessionLock.INSTANCE.acquire()) {
-      SessionStore          sessionStore     = ApplicationDependencies.getProtocolStore().aci();
+      SessionStore          sessionStore     = AppDependencies.getProtocolStore().aci();
       SignalProtocolAddress address          = new SignalProtocolAddress(user, SignalServiceAddress.DEFAULT_DEVICE_ID);
 
-      if (ApplicationDependencies.getProtocolStore().aci().identities().saveIdentity(address, identityKey)) {
+      if (AppDependencies.getProtocolStore().aci().identities().saveIdentity(address, identityKey)) {
         if (sessionStore.containsSession(address)) {
           SessionRecord sessionRecord = sessionStore.loadSession(address);
           sessionRecord.archiveCurrentState();
@@ -207,7 +207,7 @@ public static void processVerifiedMessage(Context context, Verified verified) th
 
   public static void processVerifiedMessage(Context context, VerifiedMessage verifiedMessage) {
     try(SignalSessionLock.Lock unused = ReentrantSessionLock.INSTANCE.acquire()) {
-      SignalIdentityKeyStore   identityStore  = ApplicationDependencies.getProtocolStore().aci().identities();
+      SignalIdentityKeyStore   identityStore  = AppDependencies.getProtocolStore().aci().identities();
       Recipient                recipient      = Recipient.externalPush(verifiedMessage.getDestination());
 
       if (recipient.isSelf()) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/InternetConnectionObserver.kt b/app/src/main/java/org/thoughtcrime/securesms/util/InternetConnectionObserver.kt
new file mode 100644
index 0000000000..6ca5ff8c6c
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/InternetConnectionObserver.kt
@@ -0,0 +1,68 @@
+package org.thoughtcrime.securesms.util
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.net.ConnectivityManager
+import android.net.Network
+import android.os.Build
+import androidx.annotation.RequiresApi
+import io.reactivex.rxjava3.core.Observable
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
+
+object InternetConnectionObserver {
+  /**
+   * Observe network availability changes.
+   */
+  fun observe(): Observable<Boolean> {
+    return if (Build.VERSION.SDK_INT >= 24) {
+      observeApi24()
+    } else {
+      observeApi19()
+    }
+  }
+
+  @RequiresApi(24)
+  private fun observeApi24(): Observable<Boolean> {
+    return Observable.create {
+      val application = AppDependencies.application
+      val connectivityManager = ServiceUtil.getConnectivityManager(application)
+
+      val callback = object : ConnectivityManager.NetworkCallback() {
+        override fun onAvailable(network: Network) {
+          it.onNext(true)
+        }
+
+        override fun onLost(network: Network) {
+          it.onNext(false)
+        }
+      }
+
+      connectivityManager.registerDefaultNetworkCallback(callback)
+
+      it.setCancellable {
+        connectivityManager.unregisterNetworkCallback(callback)
+      }
+    }
+  }
+
+  @Suppress("DEPRECATION")
+  private fun observeApi19(): Observable<Boolean> {
+    return Observable.create {
+      val application = AppDependencies.application
+
+      val observer = object : BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent?) {
+          if (!it.isDisposed) {
+            it.onNext(NetworkConstraint.isMet(application))
+          }
+        }
+      }
+
+      it.setCancellable { application.unregisterReceiver(observer) }
+      application.registerReceiver(observer, IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION))
+    }
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/JobExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/util/JobExtensions.kt
index dde6c12daf..7adb0d1c6a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/JobExtensions.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/JobExtensions.kt
@@ -5,11 +5,11 @@
 
 package org.thoughtcrime.securesms.util
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.JobManager
 
 /** Starts a new chain with this job. */
 fun Job.asChain(): JobManager.Chain {
-  return ApplicationDependencies.getJobManager().startChain(this)
+  return AppDependencies.jobManager.startChain(this)
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/JsonUtils.java b/app/src/main/java/org/thoughtcrime/securesms/util/JsonUtils.java
index bc860a8258..2fc1da0ac4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/JsonUtils.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/JsonUtils.java
@@ -23,6 +23,7 @@ public class JsonUtils {
     objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     objectMapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
     objectMapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
+    com.fasterxml.jackson.module.kotlin.ExtensionsKt.registerKotlinModule(objectMapper);
   }
 
   public static <T> T fromJson(byte[] serialized, Class<T> clazz) throws IOException {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/LinkUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/util/LinkUtil.kt
index 2422480a63..142af786a9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/LinkUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/LinkUtil.kt
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.util
 
-import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import org.thoughtcrime.securesms.stickers.StickerUrl
 import java.net.URI
 import java.net.URISyntaxException
@@ -43,7 +43,7 @@ object LinkUtil {
       return false
     }
 
-    return HttpUrl.parse(linkUrl)?.scheme() == "https"
+    return linkUrl.toHttpUrlOrNull()?.scheme == "https"
   }
 
   /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/LocalMetrics.kt b/app/src/main/java/org/thoughtcrime/securesms/util/LocalMetrics.kt
index 0ac6550153..a1d577e502 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/LocalMetrics.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/LocalMetrics.kt
@@ -7,7 +7,7 @@ import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.database.LocalMetricsDatabase
 import org.thoughtcrime.securesms.database.model.LocalMetricsEvent
 import org.thoughtcrime.securesms.database.model.LocalMetricsSplit
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import java.util.concurrent.Executor
 import java.util.concurrent.TimeUnit
 
@@ -33,7 +33,7 @@ object LocalMetrics {
   private val lastSplitTimeById: MutableMap<String, Long> = LRUCache(200)
 
   private val executor: Executor = SignalExecutors.newCachedSingleThreadExecutor("signal-LocalMetrics", ThreadUtil.PRIORITY_BACKGROUND_THREAD)
-  private val db: LocalMetricsDatabase by lazy { LocalMetricsDatabase.getInstance(ApplicationDependencies.getApplication()) }
+  private val db: LocalMetricsDatabase by lazy { LocalMetricsDatabase.getInstance(AppDependencies.application) }
 
   @JvmStatic
   fun getInstance(): LocalMetrics {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/LocaleFeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/LocaleRemoteConfig.java
similarity index 70%
rename from app/src/main/java/org/thoughtcrime/securesms/util/LocaleFeatureFlags.java
rename to app/src/main/java/org/thoughtcrime/securesms/util/LocaleRemoteConfig.java
index f8039f5e1d..725e983c65 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/LocaleFeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/LocaleRemoteConfig.java
@@ -8,6 +8,7 @@
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.mms.PushMediaConstraints;
+import org.thoughtcrime.securesms.notifications.DeviceSpecificNotificationConfig;
 import org.thoughtcrime.securesms.recipients.Recipient;
 
 import java.util.Arrays;
@@ -18,19 +19,19 @@
 import java.util.stream.Collectors;
 
 /**
- * Provide access to locale specific values within feature flags following the locale CSV-Colon format.
+ * Provide access to locale-specific values within remote config, following the locale CSV-Colon format.
  *
  * Example: countryCode:integerValue,countryCode:integerValue,*:integerValue
  */
-public final class LocaleFeatureFlags {
+public final class LocaleRemoteConfig {
 
-  private static final String TAG = Log.tag(LocaleFeatureFlags.class);
+  private static final String TAG = Log.tag(LocaleRemoteConfig.class);
 
   private static final String COUNTRY_WILDCARD = "*";
   private static final int    NOT_FOUND        = -1;
 
   public static @NonNull Optional<PushMediaConstraints.MediaConfig> getMediaQualityLevel() {
-    Map<String, Integer> countryValues = parseCountryValues(FeatureFlags.getMediaQualityLevels(), NOT_FOUND);
+    Map<String, Integer> countryValues = parseCountryValues(RemoteConfig.getMediaQualityLevels(), NOT_FOUND);
     int                  level         = getCountryValue(countryValues, Recipient.self().getE164().orElse(""), NOT_FOUND);
 
     return Optional.ofNullable(PushMediaConstraints.MediaConfig.forLevel(level));
@@ -40,6 +41,47 @@ public static boolean shouldShowReleaseNote(@NonNull String releaseNoteUuid, @No
     return isEnabledPartsPerMillion(releaseNoteUuid, countries);
   }
 
+  /**
+   * @return Whether Google Pay is disabled in this region
+   */
+  public static boolean isGooglePayDisabled() {
+    return isEnabledE164Start(RemoteConfig.googlePayDisabledRegions());
+  }
+
+  /**
+   * @return Whether credit cards are disabled in this region
+   */
+  public static boolean isCreditCardDisabled() {
+    return isEnabledE164Start(RemoteConfig.creditCardDisabledRegions());
+  }
+
+  /**
+   * @return Whether PayPal is disabled in this region
+   */
+  public static boolean isPayPalDisabled() {
+    return isEnabledE164Start(RemoteConfig.paypalDisabledRegions());
+  }
+
+  public static boolean isIdealEnabled() {
+    return isEnabledE164Start(RemoteConfig.idealEnabledRegions());
+  }
+
+  public static boolean isSepaEnabled() {
+    return isEnabledE164Start(RemoteConfig.sepaEnabledRegions());
+  }
+
+  public static boolean isDelayedNotificationPromptEnabled() {
+    return RemoteConfig.internalUser() || isEnabledPartsPerMillion(RemoteConfig.PROMPT_FOR_NOTIFICATION_LOGS, RemoteConfig.promptForDelayedNotificationLogs());
+  }
+
+  public static boolean isBatterySaverPromptEnabled() {
+    return RemoteConfig.internalUser() || isEnabledPartsPerMillion(RemoteConfig.PROMPT_BATTERY_SAVER, RemoteConfig.promptBatterySaver());
+  }
+
+  public static boolean isDeviceSpecificNotificationEnabled() {
+    return isEnabledPartsPerMillion(RemoteConfig.DEVICE_SPECIFIC_NOTIFICATION_CONFIG, DeviceSpecificNotificationConfig.getCurrentConfig().getLocalePercent());
+  }
+
   /**
    * Parses a comma-separated list of country codes and area codes to check if self's e164 starts with
    * one of them. For example, "33,1555" will return turn for e164's that start with 33 or look like 1-555-xxx-xxx.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/LocaleUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/util/LocaleUtil.kt
index 652dd230cd..76c16727fe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/LocaleUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/LocaleUtil.kt
@@ -17,7 +17,7 @@ object LocaleUtil {
    */
   fun getLocaleDefaults(): List<Locale> {
     val locales: MutableList<Locale> = mutableListOf()
-    val signalLocale: Locale? = LanguageString.parseLocale(SignalStore.settings().language)
+    val signalLocale: Locale? = LanguageString.parseLocale(SignalStore.settings.language)
     val localeList: LocaleListCompat = LocaleListCompat.getDefault()
 
     if (signalLocale != null) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/LongClickMovementMethod.java b/app/src/main/java/org/thoughtcrime/securesms/util/LongClickMovementMethod.java
index 1cfe455bd7..234ed61c5c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/LongClickMovementMethod.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/LongClickMovementMethod.java
@@ -16,7 +16,7 @@
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.spoiler.SpoilerAnnotation;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 
 import java.lang.ref.WeakReference;
 
@@ -119,7 +119,7 @@ public boolean onTouchEvent(TextView widget, Spannable buffer, MotionEvent event
 
   /** This signature is available in the base class and can lead to the wrong instance being returned. */
   public static LongClickMovementMethod getInstance() {
-    return getInstance(ApplicationDependencies.getApplication());
+    return getInstance(AppDependencies.getApplication());
   }
 
   public static LongClickMovementMethod getInstance(Context context) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java
index fdfaa7d4cf..858ee2fc40 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java
@@ -12,6 +12,7 @@
 import android.media.MediaMetadataRetriever;
 import android.media.ThumbnailUtils;
 import android.net.Uri;
+import android.os.Build;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.util.Pair;
@@ -50,6 +51,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLConnection;
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 
 public class MediaUtil {
@@ -136,6 +138,35 @@ public static SlideType getSlideTypeFromContentType(@NonNull String contentType)
     return getCorrectedMimeType(type);
   }
 
+  public static @NonNull Optional<String> getFileType(@NonNull Context context, Optional<String> fileName, Uri uri) {
+    if (fileName.isPresent()) {
+      String fileType = getFileType(fileName);
+      if (!fileType.isEmpty()) {
+        return Optional.of(fileType);
+      }
+    }
+
+    return Optional.ofNullable(MediaUtil.getExtension(context, uri));
+  }
+
+  private static @NonNull String getFileType(Optional<String> fileName) {
+    if (!fileName.isPresent()) return "";
+
+    String[] parts = fileName.get().split("\\.");
+
+    if (parts.length < 2) {
+      return "";
+    }
+
+    String suffix = parts[parts.length - 1];
+
+    if (suffix.length() <= 3) {
+      return suffix;
+    }
+
+    return "";
+  }
+
   public static @Nullable String getExtension(@NonNull Context context, @Nullable Uri uri) {
     return MimeTypeMap.getSingleton()
                       .getExtensionFromMimeType(getMimeType(context, uri));
@@ -383,12 +414,16 @@ public static boolean isOctetStream(@Nullable String contentType) {
     return OCTET.equals(contentType);
   }
 
+  public static boolean isDocumentType(String contentType) {
+    return !isImageOrVideoType(contentType) && !isGif(contentType) && !isLongTextType(contentType) && !isViewOnceType(contentType);
+  }
+
   public static boolean hasVideoThumbnail(@NonNull Context context, @Nullable Uri uri) {
     if (uri == null) {
       return false;
     }
 
-    if (BlobProvider.isAuthority(uri) && MediaUtil.isVideo(BlobProvider.getMimeType(uri))) {
+    if (BlobProvider.isAuthority(uri) && MediaUtil.isVideo(BlobProvider.getMimeType(uri)) && Build.VERSION.SDK_INT >= 23) {
       return true;
     }
 
@@ -433,7 +468,8 @@ public static boolean hasVideoThumbnail(@NonNull Context context, @Nullable Uri
                MediaUtil.isVideo(URLConnection.guessContentTypeFromName(uri.toString()))) {
       return ThumbnailUtils.createVideoThumbnail(uri.toString().replace("file://", ""),
                                                  MediaStore.Video.Thumbnails.MINI_KIND);
-    } else if (BlobProvider.isAuthority(uri) &&
+    } else if (Build.VERSION.SDK_INT >= 23   &&
+               BlobProvider.isAuthority(uri) &&
                MediaUtil.isVideo(BlobProvider.getMimeType(uri)))
     {
       try {
@@ -442,7 +478,8 @@ public static boolean hasVideoThumbnail(@NonNull Context context, @Nullable Uri
       } catch (IOException e) {
         Log.w(TAG, "Failed to extract frame for URI: " + uri, e);
       }
-    } else if (PartAuthority.isAttachmentUri(uri) &&
+    } else if (Build.VERSION.SDK_INT >= 23        &&
+               PartAuthority.isAttachmentUri(uri) &&
                MediaUtil.isVideoType(PartAuthority.getAttachmentContentType(context, uri)))
     {
       try {
@@ -470,9 +507,6 @@ public static boolean hasVideoThumbnail(@NonNull Context context, @Nullable Uri
   }
 
   public static boolean isInstantVideoSupported(Slide slide) {
-    if (!FeatureFlags.instantVideoPlayback()) {
-      return false;
-    }
     final Attachment attachment                        = slide.asAttachment();
     final boolean    isIncremental                     = attachment.getIncrementalDigest() != null;
     final boolean    hasIncrementalMacChunkSizeDefined = attachment.incrementalMacChunkSize > 0;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/MemoryFileUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/MemoryFileUtil.java
index d8725e9c2c..787c187807 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/MemoryFileUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/MemoryFileUtil.java
@@ -7,7 +7,7 @@
 
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 
 import java.io.FileDescriptor;
 import java.io.IOException;
@@ -23,7 +23,7 @@ public static ParcelFileDescriptor getParcelFileDescriptor(@NonNull MemoryFile f
       throws IOException
   {
     if (Build.VERSION.SDK_INT >= 26) {
-      return MemoryFileDescriptorProxy.create(ApplicationDependencies.getApplication(), file);
+      return MemoryFileDescriptorProxy.create(AppDependencies.getApplication(), file);
     } else {
       return getParcelFileDescriptorLegacy(file);
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/MessageConstraintsUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/util/MessageConstraintsUtil.kt
index 611f6f00bd..b91a0d6f4a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/MessageConstraintsUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/MessageConstraintsUtil.kt
@@ -66,7 +66,8 @@ object MessageConstraintsUtil {
       targetMessage.revisionNumber < MAX_EDIT_COUNT &&
       !targetMessage.isViewOnceMessage() &&
       !targetMessage.hasAudio() &&
-      !targetMessage.hasSharedContact()
+      !targetMessage.hasSharedContact() &&
+      !targetMessage.hasSticker()
   }
 
   /**
@@ -85,6 +86,7 @@ object MessageConstraintsUtil {
       !message.isRemoteDelete &&
       !message.hasGiftBadge() &&
       !message.isPaymentNotification &&
+      !message.isPaymentTombstone &&
       (currentTime - message.dateSent < SEND_THRESHOLD || message.toRecipient.isSelf)
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/MessageRecordUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/util/MessageRecordUtil.kt
index ae7d6564ae..858252adf8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/MessageRecordUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/MessageRecordUtil.kt
@@ -139,7 +139,8 @@ fun MessageRecord.isTextOnly(context: Context): Boolean {
         !hasSticker() &&
         !isCaptionlessMms(context) &&
         !hasGiftBadge() &&
-        !isPaymentNotification()
+        !isPaymentNotification &&
+        !isPaymentTombstone
       )
 }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/NetworkUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/NetworkUtil.java
index 11dd4ed6ba..371e63c7d1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/NetworkUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/NetworkUtil.java
@@ -43,8 +43,8 @@ public static boolean isConnected(@NonNull Context context) {
   }
 
   public static @NonNull CallManager.DataMode getCallingDataMode(@NonNull Context context, @NonNull PeerConnection.AdapterType networkAdapter) {
-    if (SignalStore.internalValues().callingDataMode() != CallManager.DataMode.NORMAL) {
-      return SignalStore.internalValues().callingDataMode();
+    if (SignalStore.internal().callingDataMode() != CallManager.DataMode.NORMAL) {
+      return SignalStore.internal().callingDataMode();
     }
 
     return useLowDataCalling(context, networkAdapter) ? CallManager.DataMode.LOW : CallManager.DataMode.NORMAL;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java
index 7e82026e09..9f046fec57 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java
@@ -17,10 +17,10 @@
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.thoughtcrime.securesms.badges.models.Badge;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
+import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil;
 import org.thoughtcrime.securesms.database.RecipientTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobs.GroupV2UpdateSelfProfileKeyJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceProfileKeyUpdateJob;
@@ -38,8 +38,7 @@
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException;
 import org.whispersystems.signalservice.api.crypto.ProfileCipher;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess;
 import org.whispersystems.signalservice.api.profiles.AvatarUploadParams;
 import org.whispersystems.signalservice.api.profiles.ProfileAndCredential;
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
@@ -81,12 +80,12 @@ public static void handleSelfProfileKeyChange() {
 
     Log.w(TAG, "[handleSelfProfileKeyChange] Scheduling jobs, including " + gv2UpdateJobs.size() + " group update jobs.");
 
-    ApplicationDependencies.getJobManager()
-                           .startChain(new RefreshAttributesJob())
-                           .then(new ProfileUploadJob())
-                           .then(new MultiDeviceProfileKeyUpdateJob())
-                           .then(gv2UpdateJobs)
-                           .enqueue();
+    AppDependencies.getJobManager()
+                   .startChain(new RefreshAttributesJob())
+                   .then(new ProfileUploadJob())
+                   .then(new MultiDeviceProfileKeyUpdateJob())
+                   .then(gv2UpdateJobs)
+                   .enqueue();
   }
 
   @WorkerThread
@@ -114,11 +113,11 @@ public static void handleSelfProfileKeyChange() {
                                                                   @NonNull SignalServiceProfile.RequestType requestType)
       throws IOException
   {
-    ProfileService               profileService     = ApplicationDependencies.getProfileService();
+    ProfileService               profileService     = AppDependencies.getProfileService();
 
     ServiceResponse<ProfileAndCredential> response = Single
         .fromCallable(() -> new SignalServiceAddress(pni))
-        .flatMap(address -> profileService.getProfile(address, Optional.empty(), Optional.empty(), requestType, Locale.getDefault()))
+        .flatMap(address -> profileService.getProfile(address, Optional.empty(), SealedSenderAccess.NONE, requestType, Locale.getDefault()))
         .onErrorReturn(t -> ServiceResponse.forUnknownError(t))
         .blockingGet();
 
@@ -137,12 +136,12 @@ private static Single<Pair<Recipient, ServiceResponse<ProfileAndCredential>>> re
                                                                                                 @NonNull SignalServiceProfile.RequestType requestType,
                                                                                                 boolean allowUnidentifiedAccess)
   {
-    ProfileService               profileService     = ApplicationDependencies.getProfileService();
-    Optional<UnidentifiedAccess> unidentifiedAccess = allowUnidentifiedAccess ? getUnidentifiedAccess(context, recipient) : Optional.empty();
-    Optional<ProfileKey>         profileKey         = ProfileKeyUtil.profileKeyOptional(recipient.getProfileKey());
+    ProfileService       profileService     = AppDependencies.getProfileService();
+    SealedSenderAccess   sealedSenderAccess = allowUnidentifiedAccess ? SealedSenderAccessUtil.getSealedSenderAccessFor(recipient, false) : SealedSenderAccess.NONE;
+    Optional<ProfileKey> profileKey         = ProfileKeyUtil.profileKeyOptional(recipient.getProfileKey());
 
     return Single.fromCallable(() -> toSignalServiceAddress(context, recipient))
-                 .flatMap(address -> profileService.getProfile(address, profileKey, unidentifiedAccess, requestType, Locale.getDefault()).map(p -> new Pair<>(recipient, p)))
+                 .flatMap(address -> profileService.getProfile(address, profileKey, sealedSenderAccess, requestType, Locale.getDefault()).map(p -> new Pair<>(recipient, p)))
                  .onErrorReturn(t -> new Pair<>(recipient, ServiceResponse.forUnknownError(t)));
   }
 
@@ -189,7 +188,7 @@ public static Optional<Boolean> decryptBoolean(@NonNull ProfileKey profileKey, @
       Log.w(TAG, "Profile key not available for " + recipient.getId());
       throw new PaymentsAddressException(PaymentsAddressException.Code.NO_PROFILE_KEY);
     }
-    ProfileAndCredential profileAndCredential     = ProfileUtil.retrieveProfileSync(ApplicationDependencies.getApplication(), recipient, SignalServiceProfile.RequestType.PROFILE);
+    ProfileAndCredential profileAndCredential     = ProfileUtil.retrieveProfileSync(AppDependencies.getApplication(), recipient, SignalServiceProfile.RequestType.PROFILE);
     SignalServiceProfile profile                  = profileAndCredential.getProfile();
     byte[]               encryptedPaymentsAddress = profile.getPaymentAddress();
 
@@ -308,8 +307,8 @@ public static Optional<ExpiringProfileKeyCredential> updateExpiringProfileKeyCre
     if (profileKey != null) {
       Log.i(TAG, String.format("Updating profile key credential on recipient %s, fetching", recipient.getId()));
 
-      Optional<ExpiringProfileKeyCredential> profileKeyCredentialOptional = ApplicationDependencies.getSignalServiceAccountManager()
-                                                                                                   .resolveProfileKeyCredential(recipient.requireAci(), profileKey, Locale.getDefault());
+      Optional<ExpiringProfileKeyCredential> profileKeyCredentialOptional = AppDependencies.getSignalServiceAccountManager()
+                                                                                           .resolveProfileKeyCredential(recipient.requireAci(), profileKey, Locale.getDefault());
 
       if (profileKeyCredentialOptional.isPresent()) {
         boolean updatedProfileKey = SignalDatabase.recipients().setProfileKeyCredential(recipient.getId(), profileKey, profileKeyCredentialOptional.get());
@@ -334,11 +333,6 @@ private static void uploadProfile(@NonNull ProfileName profileName,
                                     @NonNull List<Badge> badges)
       throws IOException
   {
-    if (SignalStore.registrationValues().needDownloadProfileOrAvatar()) {
-      // Prevent uploading an empty profile after linking a device, but before having a chance to pull the existing profile from the primary device
-      Log.w(TAG, "Profile download pending. Skipping profile upload.");
-      return;
-    }
     List<String> badgeIds = badges.stream()
                                   .filter(Badge::getVisible)
                                   .map(Badge::getId)
@@ -357,7 +351,7 @@ private static void uploadProfile(@NonNull ProfileName profileName,
     }
 
     ProfileKey                  profileKey     = ProfileKeyUtil.getSelfProfileKey();
-    SignalServiceAccountManager accountManager = ApplicationDependencies.getSignalServiceAccountManager();
+    SignalServiceAccountManager accountManager = AppDependencies.getSignalServiceAccountManager();
     String                      avatarPath     = accountManager.setVersionedProfile(SignalStore.account().requireAci(),
                                                                                     profileKey,
                                                                                     profileName.serialize(),
@@ -367,36 +361,26 @@ private static void uploadProfile(@NonNull ProfileName profileName,
                                                                                     avatar,
                                                                                     badgeIds,
                                                                                     SignalStore.phoneNumberPrivacy().isPhoneNumberSharingEnabled()).orElse(null);
-    SignalStore.registrationValues().markHasUploadedProfile();
+    SignalStore.registration().markHasUploadedProfile();
     if (!avatar.keepTheSame) {
       SignalDatabase.recipients().setProfileAvatar(Recipient.self().getId(), avatarPath);
     }
-    ApplicationDependencies.getJobManager().add(new RefreshOwnProfileJob());
+    AppDependencies.getJobManager().add(new RefreshOwnProfileJob());
   }
 
   private static @Nullable PaymentAddress getSelfPaymentsAddressProtobuf() {
-    if (!SignalStore.paymentsValues().mobileCoinPaymentsEnabled()) {
+    if (!SignalStore.payments().mobileCoinPaymentsEnabled()) {
       return null;
     } else {
       IdentityKeyPair         identityKeyPair = SignalStore.account().getAciIdentityKey();
-      MobileCoinPublicAddress publicAddress   = ApplicationDependencies.getPayments()
-                                                                       .getWallet()
-                                                                       .getMobileCoinPublicAddress();
+      MobileCoinPublicAddress publicAddress   = AppDependencies.getPayments()
+                                                               .getWallet()
+                                                               .getMobileCoinPublicAddress();
 
       return MobileCoinPublicAddressProfileUtil.signPaymentsAddress(publicAddress.serialize(), identityKeyPair);
     }
   }
 
-  private static Optional<UnidentifiedAccess> getUnidentifiedAccess(@NonNull Context context, @NonNull Recipient recipient) {
-    Optional<UnidentifiedAccessPair> unidentifiedAccess = UnidentifiedAccessUtil.getAccessFor(context, recipient, false);
-
-    if (unidentifiedAccess.isPresent()) {
-      return unidentifiedAccess.get().getTargetUnidentifiedAccess();
-    }
-
-    return Optional.empty();
-  }
-
   private static @NonNull SignalServiceAddress toSignalServiceAddress(@NonNull Context context, @NonNull Recipient recipient) throws IOException {
     if (recipient.getRegistered() == RecipientTable.RegisteredState.NOT_REGISTERED) {
       if (recipient.getHasServiceId()) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Projection.java b/app/src/main/java/org/thoughtcrime/securesms/util/Projection.java
index e95e312709..30156a17a9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/Projection.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/Projection.java
@@ -3,6 +3,7 @@
 import android.graphics.Path;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.os.Build;
 import android.view.View;
 import android.view.ViewGroup;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
new file mode 100644
index 0000000000..dbc0d474c9
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
@@ -0,0 +1,1056 @@
+package org.thoughtcrime.securesms.util
+
+import androidx.annotation.VisibleForTesting
+import androidx.annotation.WorkerThread
+import org.json.JSONException
+import org.json.JSONObject
+import org.signal.core.util.gibiBytes
+import org.signal.core.util.logging.Log
+import org.signal.core.util.mebiBytes
+import org.thoughtcrime.securesms.BuildConfig
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.groups.SelectionLimits
+import org.thoughtcrime.securesms.jobs.RemoteConfigRefreshJob
+import org.thoughtcrime.securesms.jobs.Svr3MirrorJob
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.messageprocessingalarm.RoutineMessageFetchReceiver
+import org.thoughtcrime.securesms.util.RemoteConfig.Config
+import org.thoughtcrime.securesms.util.RemoteConfig.remoteBoolean
+import org.thoughtcrime.securesms.util.RemoteConfig.remoteValue
+import java.io.IOException
+import java.util.TreeMap
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.reflect.KProperty
+import kotlin.time.Duration.Companion.days
+import kotlin.time.Duration.Companion.hours
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
+
+/**
+ * A location for accessing remotely-configured values.
+ *
+ * When creating a new config:
+ * - At the bottom of the file, create a new `val` with the name you'd like.
+ * - Use one of the helper delegates, like [remoteBoolean] or [remoteValue], to define your `val`.
+ * - See the documentation for [Config] to understand all of the fields.
+ */
+object RemoteConfig {
+  private val TAG = Log.tag(RemoteConfig::class.java)
+
+  // region Core behavior
+
+  private val FETCH_INTERVAL = 2.hours
+
+  @VisibleForTesting
+  val REMOTE_VALUES: MutableMap<String, Any> = TreeMap()
+
+  @VisibleForTesting
+  val configsByKey: MutableMap<String, Config<*>> = mutableMapOf()
+
+  @JvmStatic
+  @Synchronized
+  fun init() {
+    val current = parseStoredConfig(SignalStore.remoteConfig.currentConfig)
+    val pending = parseStoredConfig(SignalStore.remoteConfig.pendingConfig)
+    val changes = computeChanges(current, pending)
+
+    SignalStore.remoteConfig.currentConfig = mapToJson(pending)
+    REMOTE_VALUES.putAll(pending)
+    triggerFlagChangeListeners(changes)
+
+    Log.i(TAG, "init() $REMOTE_VALUES")
+  }
+
+  @JvmStatic
+  fun refreshIfNecessary() {
+    val timeSinceLastFetch = System.currentTimeMillis() - SignalStore.remoteConfig.lastFetchTime
+
+    if (timeSinceLastFetch < 0 || timeSinceLastFetch > FETCH_INTERVAL.inWholeMilliseconds) {
+      Log.i(TAG, "Scheduling remote config refresh.")
+      AppDependencies.jobManager.add(RemoteConfigRefreshJob())
+    } else {
+      Log.i(TAG, "Skipping remote config refresh. Refreshed $timeSinceLastFetch ms ago.")
+    }
+  }
+
+  @JvmStatic
+  @WorkerThread
+  @Throws(IOException::class)
+  fun refreshSync() {
+    val result = AppDependencies.signalServiceAccountManager.getRemoteConfig()
+    update(result.config)
+  }
+
+  @JvmStatic
+  @Synchronized
+  fun update(config: Map<String, Any?>) {
+    val memory: Map<String, Any> = REMOTE_VALUES
+    val disk = parseStoredConfig(SignalStore.remoteConfig.pendingConfig)
+
+    val remoteCapable: Set<String> = configsByKey.filterValues { it.active }.keys
+    val hotSwap: Set<String> = configsByKey.filterValues { it.hotSwappable }.keys
+    val sticky: Set<String> = configsByKey.filterValues { it.sticky }.keys
+
+    val result = updateInternal(config, memory, disk, remoteCapable, hotSwap, sticky)
+
+    SignalStore.remoteConfig.pendingConfig = mapToJson(result.disk)
+    REMOTE_VALUES.clear()
+    REMOTE_VALUES.putAll(result.memory)
+    triggerFlagChangeListeners(result.memoryChanges)
+
+    SignalStore.remoteConfig.lastFetchTime = System.currentTimeMillis()
+
+    Log.i(TAG, "[Memory] Before: $memory")
+    Log.i(TAG, "[Memory] After : ${result.memory}")
+    Log.i(TAG, "[Disk]   Before: $disk")
+    Log.i(TAG, "[Disk]   After : ${result.disk}")
+  }
+
+  /** Only for rendering debug info.  */
+  @JvmStatic
+  @get:Synchronized
+  val debugMemoryValues: Map<String, Any>
+    get() = TreeMap(REMOTE_VALUES)
+
+  /** Only for rendering debug info.  */
+  @JvmStatic
+  @get:Synchronized
+  val debugDiskValues: Map<String, Any>
+    get() = TreeMap(parseStoredConfig(SignalStore.remoteConfig.currentConfig))
+
+  /** Only for rendering debug info.  */
+  @JvmStatic
+  @get:Synchronized
+  val debugPendingDiskValues: Map<String, Any>
+    get() = TreeMap(parseStoredConfig(SignalStore.remoteConfig.pendingConfig))
+
+  @JvmStatic
+  @VisibleForTesting
+  fun updateInternal(
+    remote: Map<String, Any?>,
+    localMemory: Map<String, Any>,
+    localDisk: Map<String, Any>,
+    remoteCapable: Set<String>,
+    hotSwap: Set<String>,
+    sticky: Set<String>
+  ): UpdateResult {
+    val newMemory: MutableMap<String, Any> = TreeMap(localMemory)
+    val newDisk: MutableMap<String, Any> = TreeMap(localDisk)
+
+    val allKeys: Set<String> = remote.keys + localDisk.keys + localMemory.keys
+
+    allKeys
+      .filter { remoteCapable.contains(it) }
+      .forEach { key: String ->
+        val remoteValue = remote[key]
+        val diskValue = localDisk[key]
+        var newValue = remoteValue
+
+        if (newValue != null && diskValue != null && newValue.javaClass != diskValue.javaClass) {
+          Log.w(TAG, "Type mismatch! key: $key")
+
+          newDisk.remove(key)
+
+          if (hotSwap.contains(key)) {
+            newMemory.remove(key)
+          }
+
+          return@forEach
+        }
+
+        if (sticky.contains(key) && (newValue is Boolean || diskValue is Boolean)) {
+          newValue = if (diskValue == true) true else newValue
+        } else if (sticky.contains(key)) {
+          Log.w(TAG, "Tried to make a non-boolean sticky! Ignoring. (key: $key)")
+        }
+
+        if (newValue != null) {
+          newDisk[key] = newValue
+        } else {
+          newDisk.remove(key)
+        }
+
+        if (hotSwap.contains(key)) {
+          if (newValue != null) {
+            newMemory[key] = newValue
+          } else {
+            newMemory.remove(key)
+          }
+        }
+      }
+
+    allKeys
+      .filterNot { remoteCapable.contains(it) }
+      .filterNot { key -> sticky.contains(key) && localDisk[key] == java.lang.Boolean.TRUE }
+      .forEach { key: String ->
+        newDisk.remove(key)
+        if (hotSwap.contains(key)) {
+          newMemory.remove(key)
+        }
+      }
+
+    return UpdateResult(newMemory, newDisk, computeChanges(localMemory, newMemory))
+  }
+
+  @JvmStatic
+  @VisibleForTesting
+  fun computeChanges(oldMap: Map<String, Any>, newMap: Map<String, Any>): Map<String, ConfigChange> {
+    val allKeys: Set<String> = oldMap.keys + newMap.keys
+
+    return allKeys
+      .filter { oldMap[it] != newMap[it] }
+      .associateWith { key ->
+        ConfigChange(
+          oldValue = oldMap[key],
+          newValue = newMap[key]
+        )
+      }
+  }
+
+  private fun parseStoredConfig(stored: String?): Map<String, Any> {
+    val parsed: MutableMap<String, Any> = HashMap()
+
+    if (stored.isNullOrEmpty()) {
+      Log.i(TAG, "No remote config stored. Skipping.")
+      return parsed
+    }
+
+    try {
+      val root = JSONObject(stored)
+      val iter = root.keys()
+
+      while (iter.hasNext()) {
+        val key = iter.next()
+        parsed[key] = root[key]
+      }
+    } catch (e: JSONException) {
+      throw AssertionError("Failed to parse! Cleared storage.")
+    }
+
+    return parsed
+  }
+
+  private fun mapToJson(map: Map<String, Any>): String {
+    try {
+      val json = JSONObject()
+
+      for ((key, value) in map) {
+        json.put(key, value)
+      }
+
+      return json.toString()
+    } catch (e: JSONException) {
+      throw AssertionError(e)
+    }
+  }
+
+  private fun triggerFlagChangeListeners(changes: Map<String, ConfigChange>) {
+    for ((key, value) in changes) {
+      val listener = configsByKey[key]?.onChangeListener
+
+      if (listener != null) {
+        Log.i(TAG, "Triggering change listener for: $key")
+        listener.onFlagChange(value)
+      }
+    }
+  }
+
+  @VisibleForTesting
+  class UpdateResult(
+    val memory: Map<String, Any>,
+    val disk: Map<String, Any>,
+    val memoryChanges: Map<String, ConfigChange>
+  )
+
+  data class ConfigChange(val oldValue: Any?, val newValue: Any?)
+
+  @VisibleForTesting
+  fun interface OnFlagChange {
+    fun onFlagChange(change: ConfigChange)
+  }
+
+  // endregion
+
+  // region Conversion utilities
+  private fun Any?.asBoolean(defaultValue: Boolean): Boolean {
+    return when (this) {
+      is Boolean -> this
+      is String -> this.toBoolean()
+      else -> defaultValue
+    }
+  }
+
+  private fun Any?.asInteger(defaultValue: Int): Int {
+    return when (this) {
+      is String -> this.toIntOrNull() ?: defaultValue
+      else -> defaultValue
+    }
+  }
+
+  private fun Any?.asLong(defaultValue: Long): Long {
+    return when (this) {
+      is String -> this.toLongOrNull() ?: defaultValue
+      else -> defaultValue
+    }
+  }
+
+  private fun <T : String?> Any?.asString(defaultValue: T): T {
+    @Suppress("UNCHECKED_CAST")
+    return when (this) {
+      is String -> this as T
+      else -> defaultValue
+    }
+  }
+
+  // endregion
+
+  // region Delegates
+  data class Config<T>(
+    /**
+     * The key used to identify the remote config on the service.
+     */
+    val key: String,
+
+    /**
+     * By default, flags are only updated once at app start. This is to ensure that values don't
+     * change within an app session, simplifying logic. However, given that this can delay how often
+     * a flag is updated, you can put a flag in here to mark it as 'hot swappable'. Flags in this set
+     * will be updated arbitrarily at runtime. This will make values more responsive, but also places
+     * more burden on the reader to ensure that the app experience remains consistent.
+     */
+    val hotSwappable: Boolean,
+
+    /**
+     * Flags in this set will stay true forever once they receive a true value from a remote config.
+     */
+    val sticky: Boolean,
+
+    /**
+     * If this is false, the remote value of the flag will be ignored, and we'll only ever use the default value.
+     */
+    val active: Boolean,
+
+    /**
+     * Listeners that are called when the value in [REMOTE_VALUES] changes. That means that
+     * hot-swappable flags will have this invoked as soon as we know about that change, but otherwise
+     * these will only run during initialization.
+     *
+     * These can be called on any thread, including the main thread, so be careful!
+     */
+    val onChangeListener: OnFlagChange? = null,
+
+    /**
+     * Takes the remote value and coerces it to the value you want to read. If implementing this directly,
+     * consider using helpers like [asBoolean] or [asInteger] to make your life easier.
+     */
+    val transformer: (Any?) -> T
+  ) {
+    operator fun getValue(thisRef: Any?, property: KProperty<*>): T {
+      return transformer(REMOTE_VALUES[key])
+    }
+  }
+
+  private fun remoteBoolean(
+    key: String,
+    defaultValue: Boolean,
+    hotSwappable: Boolean,
+    sticky: Boolean = false,
+    active: Boolean = true,
+    onChangeListener: OnFlagChange? = null
+  ): Config<Boolean> {
+    return remoteValue(
+      key = key,
+      hotSwappable = hotSwappable,
+      sticky = sticky,
+      active = active,
+      onChangeListener = onChangeListener,
+      transformer = { it.asBoolean(defaultValue) }
+    )
+  }
+
+  private fun remoteInt(
+    key: String,
+    defaultValue: Int,
+    hotSwappable: Boolean,
+    active: Boolean = true,
+    onChangeListener: OnFlagChange? = null
+  ): Config<Int> {
+    return remoteValue(
+      key = key,
+      hotSwappable = hotSwappable,
+      sticky = false,
+      active = active,
+      onChangeListener = onChangeListener,
+      transformer = { it.asInteger(defaultValue) }
+    )
+  }
+
+  private fun remoteLong(
+    key: String,
+    defaultValue: Long,
+    hotSwappable: Boolean,
+    active: Boolean = true,
+    onChangeListener: OnFlagChange? = null
+  ): Config<Long> {
+    return remoteValue(
+      key = key,
+      hotSwappable = hotSwappable,
+      sticky = false,
+      active = active,
+      onChangeListener = onChangeListener,
+      transformer = { it.asLong(defaultValue) }
+    )
+  }
+
+  private fun <T : String?> remoteString(
+    key: String,
+    defaultValue: T,
+    hotSwappable: Boolean,
+    active: Boolean = true,
+    onChangeListener: OnFlagChange? = null
+  ): Config<T> {
+    return remoteValue(
+      key = key,
+      hotSwappable = hotSwappable,
+      sticky = false,
+      active = active,
+      onChangeListener = onChangeListener,
+      transformer = { it.asString(defaultValue) }
+    )
+  }
+
+  private fun <T> remoteValue(
+    key: String,
+    hotSwappable: Boolean,
+    sticky: Boolean = false,
+    active: Boolean = true,
+    onChangeListener: OnFlagChange? = null,
+    transformer: (Any?) -> T
+  ): Config<T> {
+    val config = Config(key = key, active = active, hotSwappable = hotSwappable, sticky = sticky, onChangeListener = onChangeListener, transformer = transformer)
+    configsByKey[config.key] = config
+    return config
+  }
+
+  // endregion
+
+  // region Config definitions
+
+  /** Payments support */
+  val payments: Boolean by remoteValue(
+    key = "android.payments.kill",
+    hotSwappable = false
+  ) { value ->
+    !value.asBoolean(false)
+  }
+
+  /** Whether or not to use the UUID in verification codes.  */
+  val verifyV2: Boolean by remoteBoolean(
+    key = "android.verifyV2",
+    defaultValue = false,
+    hotSwappable = true,
+    sticky = true
+  )
+
+  /** Maximum number of members allowed in a group. */
+  @JvmStatic
+  @get:JvmName("groupLimits")
+  val groupLimits: SelectionLimits
+    get() = SelectionLimits(groupRecommendedLimit, groupHardLimit)
+
+  private val groupRecommendedLimit: Int by remoteInt(
+    key = "global.groupsv2.maxGroupSize",
+    defaultValue = 151,
+    hotSwappable = true
+  )
+
+  private val groupHardLimit: Int by remoteInt(
+    key = "global.groupsv2.groupSizeHardLimit",
+    defaultValue = 1001,
+    hotSwappable = true
+  )
+
+  /** The maximum number of grapheme  */
+  @JvmStatic
+  val maxGroupNameGraphemeLength: Int by remoteValue(
+    key = "global.groupsv2.maxNameLength",
+    hotSwappable = true
+  ) { value ->
+    val remote = value.asInteger(-1)
+    max(32, remote)
+  }
+
+  /** Whether or not the user is an 'internal' one, which activates certain developer tools. */
+  @JvmStatic
+  @get:JvmName("internalUser")
+  val internalUser: Boolean = Environment.IS_STAGING || BuildConfig.DEBUG || BuildConfig.FORCE_INTERNAL_USER_FLAG
+
+  /** The raw client expiration JSON string.  */
+  @JvmStatic
+  @get:JvmName("clientExpiration")
+  val clientExpiration: String? by remoteString(
+    key = "android.clientExpiration",
+    hotSwappable = true,
+    defaultValue = null
+  )
+
+  /** Whether to use the custom streaming muxer or built in android muxer.  */
+  @JvmStatic
+  @get:JvmName("useStreamingVideoMuxer")
+  val useStreamingVideoMuxer: Boolean by remoteBoolean(
+    key = "android.customVideoMuxer.1",
+    defaultValue = false,
+    hotSwappable = true
+  )
+
+  /** The time in between routine CDS refreshes, in seconds.  */
+  @JvmStatic
+  @get:JvmName("cdsRefreshIntervalSeconds")
+  val cdsRefreshIntervalSeconds: Int by remoteInt(
+    key = "cds.syncInterval.seconds",
+    defaultValue = 48.hours.inWholeSeconds.toInt(),
+    hotSwappable = true
+  )
+
+  /** The minimum time in between foreground CDS refreshes initiated via message requests, in milliseconds.  */
+  val cdsForegroundSyncInterval: Long by remoteValue(
+    key = "cds.foregroundSyncInterval.seconds",
+    hotSwappable = true
+  ) { value ->
+    val inSeconds = value.asLong(4.hours.inWholeSeconds)
+    inSeconds.seconds.inWholeMilliseconds
+  }
+
+  val shareSelectionLimit: SelectionLimits by remoteValue(
+    key = "android.share.limit",
+    hotSwappable = true
+  ) { value ->
+    val limit = value.asInteger(5)
+    SelectionLimits(limit, limit)
+  }
+
+  /** Whether or not to allow automatic session resets.  */
+  @JvmStatic
+  @get:JvmName("automaticSessionReset")
+  val automaticSessionReset: Boolean by remoteBoolean(
+    key = "android.automaticSessionReset.2",
+    defaultValue = true,
+    hotSwappable = true
+  )
+
+  /** How often we allow an automatic session reset.  */
+  @JvmStatic
+  @get:JvmName("automaticSessionResetIntervalSeconds")
+  val automaticSessionResetIntervalSeconds: Int by remoteInt(
+    key = "android.automaticSessionResetInterval",
+    defaultValue = 1.hours.inWholeSeconds.toInt(),
+    hotSwappable = true
+  )
+
+  @JvmStatic
+  val defaultMaxBackoff: Long by remoteValue(
+    key = "android.defaultMaxBackoff",
+    hotSwappable = true
+  ) { value ->
+    val inSeconds = value.asLong(60)
+    inSeconds.seconds.inWholeMilliseconds
+  }
+
+  @JvmStatic
+  val serverErrorMaxBackoff: Long by remoteValue(
+    key = "android.serverErrorMaxBackoff",
+    hotSwappable = true
+  ) { value ->
+    val inSeconds = value.asLong(6.hours.inWholeSeconds)
+    inSeconds.seconds.inWholeMilliseconds
+  }
+
+  /** Whether or not to allow automatic retries from OkHttp  */
+  @JvmStatic
+  @get:JvmName("okHttpAutomaticRetry")
+  val okHttpAutomaticRetry: Boolean by remoteBoolean(
+    key = "android.okhttpAutomaticRetry",
+    defaultValue = true,
+    hotSwappable = true
+  )
+
+  /** The minimum memory class required for rendering animated stickers in the keyboard and such  */
+  @JvmStatic
+  @get:JvmName("animatedStickerMinimumMemoryClass")
+  val animatedStickerMinimumMemoryClass: Int by remoteInt(
+    key = "android.animatedStickerMinMemory",
+    defaultValue = 193,
+    hotSwappable = true
+  )
+
+  /** The minimum total memory for rendering animated stickers in the keyboard and such  */
+  @JvmStatic
+  @get:JvmName("animatedStickerMinimumTotalMemoryMb")
+  val animatedStickerMinimumTotalMemoryMb: Int by remoteInt(
+    key = "android.animatedStickerMinTotalMemory",
+    defaultValue = 3.gibiBytes.inWholeMebiBytes.toInt(),
+    hotSwappable = true
+  )
+
+  @JvmStatic
+  val mediaQualityLevels: String by remoteString(
+    key = "android.mediaQuality.levels",
+    defaultValue = "",
+    hotSwappable = true
+  )
+
+  /** Whether or not sending or responding to retry receipts is enabled.  */
+  @JvmStatic
+  @get:JvmName("retryReceipts")
+  val retryReceipts: Boolean by remoteBoolean(
+    key = "android.retryReceipts",
+    defaultValue = true,
+    hotSwappable = true
+  )
+
+  /** How old a message is allowed to be while still resending in response to a retry receipt .  */
+  @JvmStatic
+  @get:JvmName("retryRespondMaxAge")
+  val retryRespondMaxAge: Long by remoteLong(
+    key = "android.retryRespondMaxAge",
+    defaultValue = 14.days.inWholeMilliseconds,
+    hotSwappable = true
+  )
+
+  /** The max number of retry receipts sends we allow (within [retryReceiptMaxCountResetAge]) before we consider the volume too large and stop responding. */
+  @JvmStatic
+  @get:JvmName("retryReceiptMaxCount")
+  val retryReceiptMaxCount: Long by remoteLong(
+    key = "android.retryReceipt.maxCount",
+    defaultValue = 10,
+    hotSwappable = true
+  )
+
+  /** If the last retry receipt send was older than this, then we reset the retry receipt sent count. (For use with [retryReceiptMaxCount]) */
+  @JvmStatic
+  @get:JvmName("retryReceiptMaxCountResetAge")
+  val retryReceiptMaxCountResetAge: Long by remoteLong(
+    key = "android.retryReceipt.maxCountResetAge",
+    defaultValue = 3.hours.inWholeMilliseconds,
+    hotSwappable = true
+  )
+
+  /** How long a sender key can live before it needs to be rotated.  */
+  @JvmStatic
+  @get:JvmName("senderKeyMaxAge")
+  val senderKeyMaxAge: Long by remoteValue(
+    key = "android.senderKeyMaxAge",
+    hotSwappable = true
+  ) { value ->
+    val remoteValue = value.asLong(14.days.inWholeMilliseconds)
+    min(remoteValue, 90.days.inWholeMilliseconds)
+  }
+
+  /** Max group size that can be use group call ringing.  */
+  @JvmStatic
+  @get:JvmName("maxGroupCallRingSize")
+  val maxGroupCallRingSize: Long by remoteLong(
+    key = "global.calling.maxGroupCallRingSize",
+    defaultValue = 16,
+    hotSwappable = true
+  )
+
+  /** A comma-separated list of country codes where payments should be disabled.  */
+  @JvmStatic
+  @get:JvmName("paymentsCountryBlocklist")
+  val paymentsCountryBlocklist: String by remoteString(
+    key = "global.payments.disabledRegions",
+    defaultValue = "98,963,53,850,7",
+    hotSwappable = true
+  )
+
+  /**
+   * Whether users can apply alignment and scale to text posts
+   *
+   * NOTE: This feature is still under ongoing development, do not enable.
+   */
+  val storiesTextFunctions: Boolean by remoteBoolean(
+    key = "android.stories.text.functions",
+    defaultValue = false,
+    hotSwappable = false
+  )
+
+  /** A comma-separated list of models that should *not* use hardware AEC for calling.  */
+  val hardwareAecBlocklistModels: String by remoteString(
+    key = "android.calling.hardwareAecBlockList",
+    defaultValue = "",
+    hotSwappable = true
+  )
+
+  /** A comma-separated list of models that should *not* use software AEC for calling.  */
+  val softwareAecBlocklistModels: String by remoteString(
+    key = "android.calling.softwareAecBlockList",
+    defaultValue = "",
+    hotSwappable = true
+  )
+
+  /** A comma-separated list of manufacturers that *should* use Telecom for calling.  */
+  val telecomManufacturerAllowList: String by remoteString(
+    key = "android.calling.telecomAllowList",
+    defaultValue = "",
+    hotSwappable = true
+  )
+
+  /** A comma-separated list of manufacturers that *should* use Telecom for calling.  */
+  val telecomModelBlocklist: String by remoteString(
+    key = "android.calling.telecomModelBlockList",
+    defaultValue = "",
+    hotSwappable = true
+  )
+
+  /** A comma-separated list of manufacturers that should *not* use CameraX.  */
+  val cameraXModelBlocklist: String by remoteString(
+    key = "android.cameraXModelBlockList",
+    defaultValue = "",
+    hotSwappable = true
+  )
+
+  /** A comma-separated list of manufacturers that should *not* use CameraX mixed mode.  */
+  val cameraXMixedModelBlocklist: String by remoteString(
+    key = "android.cameraXMixedModelBlockList",
+    defaultValue = "",
+    hotSwappable = false
+  )
+
+  /** Whether or not hardware AEC should be used for calling on devices older than API 29.  */
+  val useHardwareAecIfOlderThanApi29: Boolean by remoteBoolean(
+    key = "android.calling.useHardwareAecIfOlderThanApi29",
+    defaultValue = false,
+    hotSwappable = true
+  )
+
+  /** Prefetch count for stories from a given user. */
+  val storiesAutoDownloadMaximum: Int by remoteInt(
+    key = "android.stories.autoDownloadMaximum",
+    defaultValue = 2,
+    hotSwappable = false
+  )
+
+  /** Whether client supports sending a request to another to activate payments  */
+  @JvmStatic
+  @get:JvmName("paymentsRequestActivateFlow")
+  val paymentsRequestActivateFlow: Boolean by remoteBoolean(
+    key = "android.payments.requestActivateFlow",
+    defaultValue = false,
+    hotSwappable = true
+  )
+
+  /** Serialized list of regions in which Google Pay is disabled for donations */
+  @JvmStatic
+  @get:JvmName("googlePayDisabledRegions")
+  val googlePayDisabledRegions: String by remoteString(
+    key = "global.donations.gpayDisabledRegions",
+    defaultValue = "*",
+    hotSwappable = false
+  )
+
+  /** Serialized list of regions in which credit cards are disabled for donations */
+  @JvmStatic
+  @get:JvmName("creditCardDisabledRegions")
+  val creditCardDisabledRegions: String by remoteString(
+    key = "global.donations.ccDisabledRegions",
+    defaultValue = "*",
+    hotSwappable = false
+  )
+
+  /** @return Serialized list of regions in which PayPal is disabled for donations */
+  @JvmStatic
+  @get:JvmName("paypalDisabledRegions")
+  val paypalDisabledRegions: String by remoteString(
+    key = "global.donations.paypalDisabledRegions",
+    defaultValue = "*",
+    hotSwappable = false
+  )
+
+  /** If the user has more than this number of contacts, the CDS request will certainly be rejected, so we must fail. */
+  val cdsHardLimit: Int by remoteInt(
+    key = "android.cds.hardLimit",
+    defaultValue = 50000,
+    hotSwappable = true
+  )
+
+  /** Whether or not we should allow PayPal payments for one-time donations */
+  val paypalOneTimeDonations: Boolean by remoteBoolean(
+    key = "android.oneTimePayPalDonations.2",
+    defaultValue = Environment.IS_STAGING,
+    hotSwappable = false
+  )
+
+  /** Whether or not we should allow PayPal payments for recurring donations */
+  val paypalRecurringDonations: Boolean by remoteBoolean(
+    key = "android.recurringPayPalDonations.3",
+    defaultValue = Environment.IS_STAGING,
+    hotSwappable = false
+  )
+
+  /** Enable/disable RingRTC field trial for "AnyAddressPortsKillSwitch" */
+  @JvmStatic
+  @get:JvmName("callingFieldTrialAnyAddressPortsKillSwitch")
+  val callingFieldTrialAnyAddressPortsKillSwitch: Boolean by remoteBoolean(
+    key = "android.calling.fieldTrial.anyAddressPortsKillSwitch",
+    defaultValue = false,
+    hotSwappable = false
+  )
+
+  /**
+   * Whether or not ad-hoc calling is enabled
+   */
+  @JvmStatic
+  @get:JvmName("adHocCalling")
+  val adHocCalling: Boolean by remoteBoolean(
+    key = "android.calling.ad.hoc.3",
+    defaultValue = false,
+    hotSwappable = false
+  )
+
+  /** Maximum number of attachments allowed to be sent/received.  */
+  val maxAttachmentCount: Int by remoteInt(
+    key = "android.attachments.maxCount",
+    defaultValue = 32,
+    hotSwappable = true
+  )
+
+  /** Maximum attachment size for ciphertext in bytes.  */
+  val maxAttachmentReceiveSizeBytes: Long by remoteValue(
+    key = "global.attachments.maxReceiveBytes",
+    hotSwappable = true
+  ) { value ->
+    val maxAttachmentSize = maxAttachmentSizeBytes
+    val maxReceiveSize = value.asLong((maxAttachmentSize * 1.25).toInt().toLong())
+    max(maxAttachmentSize, maxReceiveSize)
+  }
+
+  /** Maximum attachment ciphertext size when sending in bytes  */
+  val maxAttachmentSizeBytes: Long by remoteLong(
+    key = "global.attachments.maxBytes",
+    defaultValue = 100.mebiBytes.inWholeBytes,
+    hotSwappable = true
+  )
+
+  const val PROMPT_FOR_NOTIFICATION_LOGS: String = "android.logs.promptNotifications"
+
+  @JvmStatic
+  @get:JvmName("promptForDelayedNotificationLogs")
+  val promptForDelayedNotificationLogs: String by remoteString(
+    key = RemoteConfig.PROMPT_FOR_NOTIFICATION_LOGS,
+    defaultValue = "*",
+    hotSwappable = true
+  )
+
+  val delayedNotificationsPromptConfig: String by remoteString(
+    key = "android.logs.promptNotificationsConfig",
+    defaultValue = "",
+    hotSwappable = true
+  )
+
+  const val PROMPT_BATTERY_SAVER: String = "android.promptBatterySaver"
+
+  @JvmStatic
+  @get:JvmName("promptBatterySaver")
+  val promptBatterySaver: String by remoteString(
+    key = PROMPT_BATTERY_SAVER,
+    defaultValue = "*",
+    hotSwappable = true
+  )
+
+  const val DEVICE_SPECIFIC_NOTIFICATION_CONFIG: String = "android.deviceSpecificNotificationConfig"
+
+  val deviceSpecificNotificationConfig: String by remoteString(
+    key = DEVICE_SPECIFIC_NOTIFICATION_CONFIG,
+    defaultValue = "",
+    hotSwappable = true
+  )
+
+  /** Whether or not SEPA debit payments for donations are enabled. */
+  val sepaDebitDonations: Boolean by remoteBoolean(
+    key = "android.sepa.debit.donations.5",
+    defaultValue = false,
+    hotSwappable = false
+  )
+
+  val idealDonations: Boolean by remoteBoolean(
+    key = "android.ideal.donations.5",
+    defaultValue = false,
+    hotSwappable = false
+  )
+
+  @JvmStatic
+  @get:JvmName("idealEnabledRegions")
+  val idealEnabledRegions: String by remoteString(
+    key = "global.donations.idealEnabledRegions",
+    defaultValue = "",
+    hotSwappable = false
+  )
+
+  @JvmStatic
+  @get:JvmName("sepaEnabledRegions")
+  val sepaEnabledRegions: String by remoteString(
+    key = "global.donations.sepaEnabledRegions",
+    defaultValue = "",
+    hotSwappable = false
+  )
+
+  /** List of device products that are blocked from showing notification thumbnails.  */
+  val notificationThumbnailProductBlocklist: String by remoteString(
+    key = "android.notificationThumbnailProductBlocklist",
+    defaultValue = "",
+    hotSwappable = true
+  )
+
+  /** Whether or not to use active call manager instead of WebRtcCallService.  */
+  @JvmStatic
+  @get:JvmName("useActiveCallManager")
+  val useActiveCallManager: Boolean by remoteBoolean(
+    key = "android.calling.useActiveCallManager.5",
+    defaultValue = false,
+    hotSwappable = false
+  )
+
+  /** Whether the in-app GIF search is available for use.  */
+  @JvmStatic
+  @get:JvmName("gifSearchAvailable")
+  val gifSearchAvailable: Boolean by remoteBoolean(
+    key = "global.gifSearch",
+    defaultValue = true,
+    hotSwappable = true
+  )
+
+  /** Allow media converters to remux audio instead of transcoding it.  */
+  @JvmStatic
+  @get:JvmName("allowAudioRemuxing")
+  val allowAudioRemuxing: Boolean by remoteBoolean(
+    key = "android.media.audioRemux.1",
+    defaultValue = false,
+    hotSwappable = false
+  )
+
+  /** Get the default video zoom, expressed as 10x the actual Float value due to the service limiting us to whole numbers.  */
+  @JvmStatic
+  @get:JvmName("startVideoRecordAt1x")
+  val startVideoRecordAt1x: Boolean by remoteBoolean(
+    key = "android.media.videoCaptureDefaultZoom",
+    defaultValue = false,
+    hotSwappable = true
+  )
+
+  /** How often we allow a forced prekey refresh.  */
+  val preKeyForceRefreshInterval: Long by remoteLong(
+    key = "android.prekeyForceRefreshInterval",
+    defaultValue = 1.hours.inWholeMilliseconds,
+    hotSwappable = true
+  )
+
+  /** Make CDSI lookups via libsignal-net instead of native websocket.  */
+  val useLibsignalNetForCdsiLookup: Boolean by remoteBoolean(
+    key = "android.cds.libsignal.4",
+    defaultValue = false,
+    hotSwappable = true
+  )
+
+  /** The lifespan of a linked device (i.e. the time it can be inactive for before it expires), in milliseconds.  */
+  @JvmStatic
+  val linkedDeviceLifespan: Long by remoteValue(
+    key = "android.linkedDeviceLifespanSeconds",
+    hotSwappable = true
+  ) { value ->
+    val inSeconds = value.asLong(30.days.inWholeSeconds)
+    inSeconds.seconds.inWholeMilliseconds
+  }
+
+  /**
+   * Enable Message Backups UI
+   * Note: This feature is in active development and is not intended to currently function.
+   */
+  @JvmStatic
+  @get:JvmName("messageBackups")
+  val messageBackups: Boolean by remoteValue(
+    key = "android.messageBackups",
+    hotSwappable = false,
+    active = false  // MOLLY: Test before setting to true
+  ) { value ->
+    value.asBoolean(false)
+  }
+
+  /** Whether or not to use the custom CameraX controller class  */
+  @JvmStatic
+  @get:JvmName("customCameraXController")
+  val customCameraXController: Boolean by remoteBoolean(
+    key = "android.cameraXCustomController",
+    defaultValue = false,
+    hotSwappable = true
+  )
+
+  /** Whether unauthenticated chat web socket is backed by libsignal-net  */
+  @JvmStatic
+  @get:JvmName("libSignalWebSocketEnabled")
+  val libSignalWebSocketEnabled: Boolean by remoteBoolean(
+    key = "android.libsignalWebSocketEnabled",
+    defaultValue = false,
+    hotSwappable = false,
+    active = false  // MOLLY: Test before setting to true
+  )
+
+  /** Whether or not to launch the restore activity after registration is complete, rather than before.  */
+  @JvmStatic
+  @get:JvmName("restoreAfterRegistration")
+  val restoreAfterRegistration: Boolean by remoteValue(
+    key = "android.registration.restorePostRegistration",
+    hotSwappable = false,
+    active = false  // MOLLY: Test before setting to true
+  ) { value ->
+    value.asBoolean(false)
+  }
+
+  /**
+   * Percentage [0, 100] of web socket requests that will be "shadowed" by sending
+   * an unauthenticated keep-alive via libsignal-net. Default: 0
+   */
+  @JvmStatic
+  @get:JvmName("libSignalWebSocketShadowingPercentage")
+  val libSignalWebSocketShadowingPercentage: Int by remoteValue(
+    key = "android.libsignalWebSocketShadowingPercentage",
+    hotSwappable = false,
+    active = false
+  ) { value ->
+    val remote = value.asInteger(0)
+    remote.coerceIn(0, 100)
+  }
+
+  @JvmStatic
+  val backgroundMessageProcessInterval: Long by remoteValue(
+    key = "android.messageProcessor.alarmIntervalMins",
+    hotSwappable = true,
+    onChangeListener = { RoutineMessageFetchReceiver.startOrUpdateAlarm(AppDependencies.application) }
+  ) { value ->
+    val inMinutes = value.asLong(6.hours.inWholeMinutes)
+    inMinutes.minutes.inWholeMilliseconds
+  }
+
+  @JvmStatic
+  val backgroundMessageProcessForegroundDelay: Int by remoteInt(
+    key = "android.messageProcessor.foregroundDelayMs",
+    defaultValue = 300,
+    hotSwappable = true
+  )
+
+  /** Which phase we're in for the SVR3 migration  */
+  val svr3MigrationPhase: Int by remoteInt(
+    key = "global.svr3.phase",
+    defaultValue = 0,
+    hotSwappable = true,
+    onChangeListener = {
+      if ((it.oldValue == null || it.oldValue == 0) && it.newValue == 1) {
+        Log.w(TAG, "Detected the SVR3 migration phase change to 1! Enqueuing a mirroring job.")
+        AppDependencies.jobManager.add(Svr3MirrorJob())
+      }
+    }
+  )
+
+  // endregion
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteDeprecation.java b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteDeprecation.java
index ffcf6be05b..178dd8c5cc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteDeprecation.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteDeprecation.java
@@ -19,12 +19,20 @@ public final class RemoteDeprecation {
 
   private RemoteDeprecation() { }
 
+  /**
+   * @return The amount of time (in milliseconds) until this client version expires, or -1 if
+   *         there's no pending expiration.
+   */
+  public static long getTimeUntilDeprecation(long currentTime) {
+    return getTimeUntilDeprecation(RemoteConfig.clientExpiration(), currentTime, Util.getSignalCanonicalVersionName());
+  }
+
   /**
    * @return The amount of time (in milliseconds) until this client version expires, or -1 if
    *         there's no pending expiration.
    */
   public static long getTimeUntilDeprecation() {
-    return getTimeUntilDeprecation(FeatureFlags.clientExpiration(), System.currentTimeMillis(), Util.getSignalCanonicalVersionName());
+    return getTimeUntilDeprecation(System.currentTimeMillis());
   }
 
   /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentUtil.kt
index da29fca579..6e5b26c354 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentUtil.kt
@@ -27,7 +27,7 @@ import org.signal.core.util.logging.Log
 import org.signal.core.util.orNull
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.mms.PartAuthority
 import java.io.File
 import java.io.FileOutputStream
@@ -110,15 +110,15 @@ object SaveAttachmentUtil {
     val updateValues = ContentValues()
     val mediaUri = result.mediaUri ?: return null
 
-    val inputStream: InputStream = PartAuthority.getAttachmentStream(ApplicationDependencies.getApplication(), attachment.uri) ?: return null
+    val inputStream: InputStream = PartAuthority.getAttachmentStream(AppDependencies.application, attachment.uri) ?: return null
     inputStream.use { inStream ->
       if (result.outputUri.scheme == ContentResolver.SCHEME_FILE) {
         FileOutputStream(mediaUri.path).use { outStream ->
           StreamUtil.copy(inStream, outStream)
-          MediaScannerConnection.scanFile(ApplicationDependencies.getApplication(), arrayOf(mediaUri.path), arrayOf(contentType), null)
+          MediaScannerConnection.scanFile(AppDependencies.application, arrayOf(mediaUri.path), arrayOf(contentType), null)
         }
       } else {
-        ApplicationDependencies.getApplication().contentResolver.openOutputStream(mediaUri, "w").use { outStream ->
+        AppDependencies.application.contentResolver.openOutputStream(mediaUri, "w").use { outStream ->
           val total = StreamUtil.copy(inStream, outStream)
           if (total > 0) {
             updateValues.put(MediaStore.MediaColumns.SIZE, total)
@@ -132,7 +132,7 @@ object SaveAttachmentUtil {
     }
 
     if (updateValues.size() > 0) {
-      ApplicationDependencies.getApplication().contentResolver.update(mediaUri, updateValues, null, null)
+      AppDependencies.application.contentResolver.update(mediaUri, updateValues, null, null)
     }
 
     return result.outputUri.lastPathSegment
@@ -231,11 +231,11 @@ object SaveAttachmentUtil {
     }
 
     return try {
-      CreateMediaUriResult(outputUri, ApplicationDependencies.getApplication().contentResolver.insert(outputUri, contentValues))
+      CreateMediaUriResult(outputUri, AppDependencies.application.contentResolver.insert(outputUri, contentValues))
     } catch (e: RuntimeException) {
       if (e is IllegalArgumentException || e.cause is IllegalArgumentException) {
         Log.w(TAG, "Unable to create uri in $outputUri with mimeType [$mimeType]")
-        CreateMediaUriResult(StorageUtil.getDownloadUri(), ApplicationDependencies.getApplication().contentResolver.insert(StorageUtil.getDownloadUri(), contentValues))
+        CreateMediaUriResult(StorageUtil.getDownloadUri(), AppDependencies.application.contentResolver.insert(StorageUtil.getDownloadUri(), contentValues))
       } else {
         throw e
       }
@@ -272,7 +272,7 @@ object SaveAttachmentUtil {
 
   @Throws(IOException::class)
   private fun pathTaken(outputUri: Uri, dataPath: String): Boolean {
-    val cursor: Cursor = ApplicationDependencies.getApplication().contentResolver.query(
+    val cursor: Cursor = AppDependencies.application.contentResolver.query(
       outputUri,
       arrayOf(MediaStore.MediaColumns.DATA),
       "${MediaStore.MediaColumns.DATA} = ?",
@@ -285,7 +285,7 @@ object SaveAttachmentUtil {
 
   @Throws(IOException::class)
   private fun displayNameTaken(outputUri: Uri, displayName: String): Boolean {
-    val cursor: Cursor = ApplicationDependencies.getApplication().contentResolver.query(
+    val cursor: Cursor = AppDependencies.application.contentResolver.query(
       outputUri,
       arrayOf(MediaStore.MediaColumns.DISPLAY_NAME),
       "${MediaStore.MediaColumns.DISPLAY_NAME} = ?",
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ScreenDensity.java b/app/src/main/java/org/thoughtcrime/securesms/util/ScreenDensity.java
index 9cb223ed75..4893bbfa52 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ScreenDensity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ScreenDensity.java
@@ -5,7 +5,7 @@
 
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -54,7 +54,7 @@ public ScreenDensity(String bucket, int density) {
   }
 
   public static @NonNull String getBestDensityBucketForDevice() {
-    ScreenDensity density = get(ApplicationDependencies.getApplication());
+    ScreenDensity density = get(AppDependencies.getApplication());
 
     if (density.isKnownDensity()) {
       return density.bucket;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ServiceUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ServiceUtil.java
index fb603db0bb..a15312d6c4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ServiceUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ServiceUtil.java
@@ -109,14 +109,14 @@ public static KeyguardManager getKeyguardManager(@NonNull Context context) {
     return ContextCompat.getSystemService(context, KeyguardManager.class);
   }
 
-  public static AppOpsManager getAppOpsManager(@NonNull Context context) {
-    return ContextCompat.getSystemService(context, AppOpsManager.class);
-  }
-
   public static BluetoothManager getBluetoothManager(@NonNull Context context) {
     return ContextCompat.getSystemService(context, BluetoothManager.class);
   }
 
+  public static AppOpsManager getAppOpsManager(@NonNull Context context) {
+    return ContextCompat.getSystemService(context, AppOpsManager.class);
+  }
+
   public static DownloadManager getDownloadManager(@NonNull Context context) {
     return ContextCompat.getSystemService(context, DownloadManager.class);
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SignalProxyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/SignalProxyUtil.java
index 993f17398d..87ffa2eb51 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/SignalProxyUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/SignalProxyUtil.java
@@ -4,7 +4,7 @@
 
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.push.AccountManagerFactory;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
@@ -35,7 +35,7 @@ public static boolean testWebsocketConnection(long timeout) {
   private static boolean testWebsocketConnectionUnregistered(long timeout) {
     CountDownLatch              latch          = new CountDownLatch(1);
     AtomicBoolean               success        = new AtomicBoolean(false);
-    SignalServiceAccountManager accountManager = AccountManagerFactory.getInstance().createUnauthenticated(ApplicationDependencies.getApplication(), "", SignalServiceAddress.DEFAULT_DEVICE_ID, "");
+    SignalServiceAccountManager accountManager = AccountManagerFactory.getInstance().createUnauthenticated(AppDependencies.getApplication(), "", SignalServiceAddress.DEFAULT_DEVICE_ID, "");
 
     SignalExecutors.UNBOUNDED.execute(() -> {
       try {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SignalUncaughtExceptionHandler.java b/app/src/main/java/org/thoughtcrime/securesms/util/SignalUncaughtExceptionHandler.java
index 4f44dc1358..b01e3f2033 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/SignalUncaughtExceptionHandler.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/SignalUncaughtExceptionHandler.java
@@ -7,9 +7,8 @@
 import org.signal.core.util.ExceptionUtil;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.LogDatabase;
-import org.thoughtcrime.securesms.database.SearchTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 
 import java.io.IOException;
@@ -59,10 +58,10 @@ public void uncaughtException(@NonNull Thread t, @NonNull Throwable e) {
     }
 
     Log.e(TAG, "", e, true);
-    LogDatabase.getInstance(ApplicationDependencies.getApplication()).crashes().saveCrash(System.currentTimeMillis(), exceptionName, e.getMessage(), ExceptionUtil.convertThrowableToString(e));
+    LogDatabase.getInstance(AppDependencies.getApplication()).crashes().saveCrash(System.currentTimeMillis(), exceptionName, e.getMessage(), ExceptionUtil.convertThrowableToString(e));
     SignalStore.blockUntilAllWritesFinished();
     Log.blockUntilAllWritesFinished();
-    ApplicationDependencies.getJobManager().flush();
+    AppDependencies.getJobManager().flush();
     originalHandler.uncaughtException(t, ExceptionUtil.joinStackTraceAndMessage(e));
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/StorageUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/StorageUtil.java
index 61b7b86261..f21758d0df 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/StorageUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/StorageUtil.java
@@ -15,7 +15,7 @@
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.NoExternalStorageException;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.permissions.PermissionCompat;
 import org.thoughtcrime.securesms.permissions.Permissions;
 
@@ -44,7 +44,7 @@ public static File getOrCreateBackupDirectory() throws NoExternalStorageExceptio
   }
 
   public static File getBackupDirectory() throws NoExternalStorageException {
-    String appName = ApplicationDependencies.getApplication().getString(R.string.app_name);
+    String appName = AppDependencies.getApplication().getString(R.string.app_name);
 
     File storage = Environment.getExternalStorageDirectory();
     File signal  = new File(storage, appName.replace(" Staging", ".staging"));
@@ -105,11 +105,11 @@ public static boolean canWriteInSignalStorageDir() {
 
   public static boolean canWriteToMediaStore() {
     return Build.VERSION.SDK_INT > 28 ||
-           Permissions.hasAll(ApplicationDependencies.getApplication(), Manifest.permission.WRITE_EXTERNAL_STORAGE);
+           Permissions.hasAll(AppDependencies.getApplication(), Manifest.permission.WRITE_EXTERNAL_STORAGE);
   }
 
   public static boolean canReadFromMediaStore() {
-    return Permissions.hasAny(ApplicationDependencies.getApplication(), PermissionCompat.forImagesAndVideos());
+    return Permissions.hasAny(AppDependencies.getApplication(), PermissionCompat.forImagesAndVideos());
   }
 
   public static @NonNull Uri getVideoUri() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
index 58757ee717..00af852981 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
@@ -23,7 +23,7 @@
 import org.thoughtcrime.securesms.backup.proto.SharedPreference;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SettingsValues;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.lock.RegistrationLockReminders;
@@ -33,7 +33,7 @@
 import org.thoughtcrime.securesms.preferences.widgets.NotificationPrivacyPreference;
 import org.thoughtcrime.securesms.preferences.widgets.PassphraseLockTriggerPreference;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
+import org.thoughtcrime.securesms.registration.ui.RegistrationActivity;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -1092,7 +1092,7 @@ private static void clearLocalCredentials(Context context) {
     Recipient  self          = Recipient.self();
     SignalDatabase.recipients().setProfileKey(self.getId(), newProfileKey);
 
-    ApplicationDependencies.getGroupsV2Authorization().clear();
+    AppDependencies.getGroupsV2Authorization().clear();
   }
 
   private static SharedPreferences getSharedPreferences(Context context) {
@@ -1102,7 +1102,7 @@ private static SharedPreferences getSharedPreferences(Context context) {
   private static void notifyUnregisteredReceived(Context context) {
     PendingIntent reRegistrationIntent = PendingIntent.getActivity(context,
                                                                    0,
-                                                                   RegistrationNavigationActivity.newIntentForReRegistration(context),
+                                                                   RegistrationActivity.newIntentForReRegistration(context),
                                                                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntentFlags.immutable());
     final NotificationCompat.Builder builder = new NotificationCompat.Builder(context, NotificationChannels.getInstance().FAILURES)
         .setSmallIcon(R.drawable.ic_notification)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Util.java b/app/src/main/java/org/thoughtcrime/securesms/util/Util.java
index f7ff2cb16f..d81aa4c04b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/Util.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/Util.java
@@ -352,14 +352,14 @@ public static byte[] getSecretBytes(@NonNull SecureRandom secureRandom, int size
    * @return The amount of time (in ms) until this build of Signal will be considered 'expired'.
    *         Takes into account both the build age as well as any remote deprecation values.
    */
-  public static long getTimeUntilBuildExpiry() {
+  public static long getTimeUntilBuildExpiry(long currentTime) {
     if (SignalStore.misc().isClientDeprecated()) {
       return 0;
     }
 
-    long buildAge                   = System.currentTimeMillis() - BuildConfig.BUILD_TIMESTAMP;
+    long buildAge                   = currentTime - BuildConfig.BUILD_TIMESTAMP;
     long timeUntilBuildDeprecation  = BUILD_LIFESPAN - buildAge;
-    long timeUntilRemoteDeprecation = RemoteDeprecation.getTimeUntilDeprecation();
+    long timeUntilRemoteDeprecation = RemoteDeprecation.getTimeUntilDeprecation(currentTime);
 
     if (timeUntilRemoteDeprecation != -1) {
       long timeUntilDeprecation = Math.min(timeUntilBuildDeprecation, timeUntilRemoteDeprecation);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/VersionTracker.kt b/app/src/main/java/org/thoughtcrime/securesms/util/VersionTracker.kt
index 774dcb59ed..122e474f25 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/VersionTracker.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/VersionTracker.kt
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.util
 import android.content.Context
 import android.content.pm.PackageManager
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob
 import org.thoughtcrime.securesms.jobs.RemoteConfigRefreshJob
 import org.thoughtcrime.securesms.jobs.RetrieveRemoteAnnouncementsJob
@@ -24,10 +24,10 @@ object VersionTracker {
     val lastVersionCode = TextSecurePreferences.getSignalLastVersionCode(context)
 
     if (currentVersionCode != lastVersionCode) {
-      Log.i(TAG, "Upgraded from $lastVersionCode to $currentVersionCode")
-      SignalStore.misc().isClientDeprecated = false
+      Log.i(TAG, "Upgraded from $lastVersionCode to $currentVersionCode. Clearing client deprecation.", true)
+      SignalStore.misc.isClientDeprecated = false
       val jobChain = listOf(RemoteConfigRefreshJob(), RefreshAttributesJob())
-      ApplicationDependencies.getJobManager().startChain(jobChain).enqueue()
+      AppDependencies.jobManager.startChain(jobChain).enqueue()
       RetrieveRemoteAnnouncementsJob.enqueue(true)
       LocalMetrics.getInstance().clear()
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/WindowUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/WindowUtil.java
index 36da9f7c63..e9ab9bc7cc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/WindowUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/WindowUtil.java
@@ -62,6 +62,8 @@ public static void setNavigationBarColor(@NonNull Context context, @NonNull Wind
   }
 
   public static void setLightStatusBarFromTheme(@NonNull Activity activity) {
+    if (Build.VERSION.SDK_INT < 23) return;
+
     final boolean isLightStatusBar = ThemeUtil.getThemedBoolean(activity, android.R.attr.windowLightStatusBar);
 
     if (isLightStatusBar) setLightStatusBar(activity.getWindow());
@@ -69,10 +71,14 @@ public static void setLightStatusBarFromTheme(@NonNull Activity activity) {
   }
 
   public static void clearLightStatusBar(@NonNull Window window) {
+    if (Build.VERSION.SDK_INT < 23) return;
+
     clearSystemUiFlags(window, View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
   }
 
   public static void setLightStatusBar(@NonNull Window window) {
+    if (Build.VERSION.SDK_INT < 23) return;
+
     setSystemUiFlags(window, View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/navigation/SafeNavigation.kt b/app/src/main/java/org/thoughtcrime/securesms/util/navigation/SafeNavigation.kt
index 6584562240..0fbaa5ee69 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/navigation/SafeNavigation.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/navigation/SafeNavigation.kt
@@ -9,7 +9,7 @@ import androidx.navigation.NavController
 import androidx.navigation.NavDirections
 import androidx.navigation.NavOptions
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 
 private const val TAG = "SafeNavigation"
 
@@ -62,7 +62,7 @@ private fun getDisplayName(id: Int): String? {
     id.toString()
   } else {
     try {
-      ApplicationDependencies.getApplication().resources.getResourceName(id)
+      AppDependencies.application.resources.getResourceName(id)
     } catch (e: Resources.NotFoundException) {
       id.toString()
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/parcelers/MillisecondDurationParceler.kt b/app/src/main/java/org/thoughtcrime/securesms/util/parcelers/MillisecondDurationParceler.kt
new file mode 100644
index 0000000000..87ff6c66b1
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/parcelers/MillisecondDurationParceler.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.util.parcelers
+
+import android.os.Parcel
+import kotlinx.parcelize.Parceler
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+
+/**
+ * Parceler for non-null durations, storing them in milliseconds.
+ */
+object MillisecondDurationParceler : Parceler<Duration> {
+  override fun create(parcel: Parcel): Duration {
+    return parcel.readLong().milliseconds
+  }
+
+  override fun Duration.write(parcel: Parcel, flags: Int) {
+    parcel.writeLong(inWholeMilliseconds)
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/parcelers/NullableSubscriberIdParceler.kt b/app/src/main/java/org/thoughtcrime/securesms/util/parcelers/NullableSubscriberIdParceler.kt
new file mode 100644
index 0000000000..a773581ecc
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/parcelers/NullableSubscriberIdParceler.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.util.parcelers
+
+import android.os.Parcel
+import kotlinx.parcelize.Parceler
+import org.whispersystems.signalservice.api.subscriptions.SubscriberId
+
+/**
+ * Parceler for nullable SubscriberIds
+ */
+object NullableSubscriberIdParceler : Parceler<SubscriberId?> {
+  override fun create(parcel: Parcel): SubscriberId? {
+    return parcel.readString()?.let { SubscriberId.deserialize(it) }
+  }
+
+  override fun SubscriberId?.write(parcel: Parcel, flags: Int) {
+    parcel.writeString(this?.serialize())
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/viewholders/RecipientMappingModel.java b/app/src/main/java/org/thoughtcrime/securesms/util/viewholders/RecipientMappingModel.java
index 962ddeeff4..6f0b82e1bb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/viewholders/RecipientMappingModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/viewholders/RecipientMappingModel.java
@@ -4,7 +4,7 @@
 
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel;
@@ -26,7 +26,7 @@ public boolean areItemsTheSame(@NonNull T newItem) {
 
   @Override
   public boolean areContentsTheSame(@NonNull T newItem) {
-    Context context = ApplicationDependencies.getApplication();
+    Context context = AppDependencies.getApplication();
     return getName(context).equals(newItem.getName(context)) && Objects.equals(getRecipient().getContactPhoto(), newItem.getRecipient().getContactPhoto());
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/views/SimpleProgressDialog.java b/app/src/main/java/org/thoughtcrime/securesms/util/views/SimpleProgressDialog.java
index a5e4e872e7..b051316a46 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/views/SimpleProgressDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/views/SimpleProgressDialog.java
@@ -18,8 +18,9 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
- * Helper class to show a fullscreen blocking indeterminate progress dialog.
+ * @deprecated  Replaced by {@link org.thoughtcrime.securesms.components.SignalProgressDialog}
  */
+@Deprecated
 public final class SimpleProgressDialog {
 
   private static final String TAG = Log.tag(SimpleProgressDialog.class);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/views/SlideUpWithDependencyBehavior.kt b/app/src/main/java/org/thoughtcrime/securesms/util/views/SlideUpWithDependencyBehavior.kt
new file mode 100644
index 0000000000..2de6aa7ea9
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/views/SlideUpWithDependencyBehavior.kt
@@ -0,0 +1,43 @@
+package org.thoughtcrime.securesms.util.views
+
+import android.content.Context
+import android.graphics.Rect
+import android.util.AttributeSet
+import android.view.View
+import androidx.annotation.Px
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import kotlin.math.min
+
+/**
+ * @param offsetY - Extra padding between the dependency and child.
+ * @param maxTranslationY - The maximum offset to apply to child's translationY value. This should be a negative number.
+ */
+abstract class SlideUpWithDependencyBehavior(
+  context: Context,
+  attributeSet: AttributeSet?,
+  @field:Px @param:Px private val offsetY: Float = 0f
+) : CoordinatorLayout.Behavior<View>(context, attributeSet) {
+
+  private val rect = Rect()
+
+  override fun onDependentViewChanged(parent: CoordinatorLayout, child: View, dependency: View): Boolean {
+    dependency.getLocalVisibleRect(rect)
+
+    val height = if (rect.top < parent.bottom) {
+      rect.height()
+    } else {
+      0
+    }
+
+    val translationY = min(0.0, (dependency.translationY - (height + offsetY)).toDouble()).toFloat()
+    child.translationY = translationY
+
+    return true
+  }
+
+  override fun onDependentViewRemoved(parent: CoordinatorLayout, child: View, dependency: View) {
+    child.translationY = 0f
+  }
+
+  abstract override fun layoutDependsOn(parent: CoordinatorLayout, child: View, dependency: View): Boolean
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/views/SlideUpWithSnackbarBehavior.java b/app/src/main/java/org/thoughtcrime/securesms/util/views/SlideUpWithSnackbarBehavior.java
deleted file mode 100644
index 8833e0d95c..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/util/views/SlideUpWithSnackbarBehavior.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.thoughtcrime.securesms.util.views;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-
-import androidx.annotation.Dimension;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.Px;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
-
-import com.google.android.material.snackbar.Snackbar;
-
-import org.signal.core.util.DimensionUnit;
-
-public class SlideUpWithSnackbarBehavior extends CoordinatorLayout.Behavior<View> {
-
-  @Dimension(unit = Dimension.DP)
-  private static final float PAD_TOP_OF_SNACKBAR_DP = 16f;
-
-  @Px
-  private final float padTopOfSnackbar = DimensionUnit.DP.toPixels(PAD_TOP_OF_SNACKBAR_DP);
-
-  public SlideUpWithSnackbarBehavior(@NonNull Context context, @Nullable AttributeSet attributeSet) {
-    super(context, attributeSet);
-  }
-
-  @Override
-  public boolean onDependentViewChanged(@NonNull CoordinatorLayout parent,
-                                        @NonNull View child,
-                                        @NonNull View dependency)
-  {
-    float translationY = Math.min(0, dependency.getTranslationY() - (dependency.getHeight() + padTopOfSnackbar));
-    child.setTranslationY(translationY);
-
-    return true;
-  }
-
-  @Override
-  public void onDependentViewRemoved(@NonNull CoordinatorLayout parent,
-                                     @NonNull View child,
-                                     @NonNull View dependency)
-  {
-    child.setTranslationY(0);
-  }
-
-  @Override
-  public boolean layoutDependsOn(@NonNull CoordinatorLayout parent,
-                                 @NonNull View child,
-                                 @NonNull View dependency)
-  {
-    return dependency instanceof Snackbar.SnackbarLayout;
-  }
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/views/SlideUpWithSnackbarBehavior.kt b/app/src/main/java/org/thoughtcrime/securesms/util/views/SlideUpWithSnackbarBehavior.kt
new file mode 100644
index 0000000000..054f00d76b
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/views/SlideUpWithSnackbarBehavior.kt
@@ -0,0 +1,20 @@
+package org.thoughtcrime.securesms.util.views
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import com.google.android.material.snackbar.Snackbar.SnackbarLayout
+import org.signal.core.util.dp
+
+class SlideUpWithSnackbarBehavior(context: Context, attributeSet: AttributeSet?) : SlideUpWithDependencyBehavior(context, attributeSet, 16f.dp) {
+  @SuppressLint("RestrictedApi")
+  override fun layoutDependsOn(
+    parent: CoordinatorLayout,
+    child: View,
+    dependency: View
+  ): Boolean {
+    return dependency is SnackbarLayout
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayFragment.kt
index d2e732d8dc..03031b1018 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayFragment.kt
@@ -36,7 +36,7 @@ import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable
 import org.thoughtcrime.securesms.databinding.VerifyDisplayFragmentBinding
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.Util
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.visible
@@ -116,7 +116,7 @@ class VerifyDisplayFragment : Fragment(), OnScrollChangedListener {
 
       if (fingerprints.isEmpty()) {
         val resolved = viewModel.recipient.resolve()
-        Log.w(TAG, String.format(Locale.ENGLISH, "Could not show proper verification! verifyV2: %s, hasUuid: %s, hasE164: %s", FeatureFlags.verifyV2(), resolved.serviceId.isPresent, resolved.e164.isPresent))
+        Log.w(TAG, String.format(Locale.ENGLISH, "Could not show proper verification! verifyV2: %s, hasUuid: %s, hasE164: %s", RemoteConfig.verifyV2, resolved.serviceId.isPresent, resolved.e164.isPresent))
         MaterialAlertDialogBuilder(requireContext())
           .setMessage(getString(R.string.VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view, resolved.getDisplayName(requireContext())))
           .setPositiveButton(android.R.string.ok) { dialog: DialogInterface?, which: Int -> requireActivity().finish() }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyIdentityActivity.java b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyIdentityActivity.java
index b441e6c559..9983f37ca8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyIdentityActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyIdentityActivity.java
@@ -20,7 +20,6 @@
 import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 
 /**
  * Activity for verifying identity keys.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyIdentityFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyIdentityFragment.kt
index 824f173847..55dfe20618 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyIdentityFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyIdentityFragment.kt
@@ -71,7 +71,7 @@ class VerifyIdentityFragment : Fragment(R.layout.fragment_container), ScanListen
     VerifyDisplayFragment.create(
       recipientId,
       remoteIdentity,
-      IdentityKeyParcelable(SignalStore.account().aciIdentityKey.publicKey),
+      IdentityKeyParcelable(SignalStore.account.aciIdentityKey.publicKey),
       Recipient.self().requireE164(),
       isVerified
     )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifySafetyNumberViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifySafetyNumberViewModel.kt
index 78613e5b01..9abd39e2dd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifySafetyNumberViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifySafetyNumberViewModel.kt
@@ -17,7 +17,7 @@ import org.signal.libsignal.protocol.fingerprint.Fingerprint
 import org.signal.libsignal.protocol.fingerprint.NumericFingerprintGenerator
 import org.thoughtcrime.securesms.crypto.ReentrantSessionLock
 import org.thoughtcrime.securesms.database.IdentityTable
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.MultiDeviceVerifiedUpdateJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.LiveRecipient
@@ -54,7 +54,7 @@ class VerifySafetyNumberViewModel(
       var aciFingerprint: SafetyNumberFingerprint? = null
 
       if (resolved.aci.isPresent) {
-        val localIdentifier = SignalStore.account().requireAci().toByteArray()
+        val localIdentifier = SignalStore.account.requireAci().toByteArray()
         val remoteIdentifier = resolved.requireAci().toByteArray()
         val version = 2
         aciFingerprint = SafetyNumberFingerprint(version, localIdentifier, localIdentity, remoteIdentifier, remoteIdentity, generator.createFor(version, localIdentifier, localIdentity, remoteIdentifier, remoteIdentity))
@@ -74,13 +74,13 @@ class VerifySafetyNumberViewModel(
 
   fun updateSafetyNumberVerification(verified: Boolean) {
     val recipientId: RecipientId = recipientId
-    val context: Context = ApplicationDependencies.getApplication()
+    val context: Context = AppDependencies.application
 
     SignalExecutors.BOUNDED.execute {
       ReentrantSessionLock.INSTANCE.acquire().use { _ ->
         if (verified) {
           Log.i(TAG, "Saving identity: $recipientId")
-          ApplicationDependencies.getProtocolStore().aci().identities()
+          AppDependencies.protocolStore.aci().identities()
             .saveIdentityWithoutSideEffects(
               recipientId,
               recipient.resolve().requireAci(),
@@ -91,9 +91,9 @@ class VerifySafetyNumberViewModel(
               true
             )
         } else {
-          ApplicationDependencies.getProtocolStore().aci().identities().setVerified(recipientId, remoteIdentity, IdentityTable.VerifiedStatus.DEFAULT)
+          AppDependencies.protocolStore.aci().identities().setVerified(recipientId, remoteIdentity, IdentityTable.VerifiedStatus.DEFAULT)
         }
-        ApplicationDependencies.getJobManager()
+        AppDependencies.jobManager
           .add(
             MultiDeviceVerifiedUpdateJob(
               recipientId,
@@ -136,12 +136,16 @@ data class SafetyNumberFingerprint(
     if (localStableIdentifier != null) {
       if (other.localStableIdentifier == null) return false
       if (!localStableIdentifier.contentEquals(other.localStableIdentifier)) return false
-    } else if (other.localStableIdentifier != null) return false
+    } else if (other.localStableIdentifier != null) {
+      return false
+    }
     if (localIdentityKey != other.localIdentityKey) return false
     if (remoteStableIdentifier != null) {
       if (other.remoteStableIdentifier == null) return false
       if (!remoteStableIdentifier.contentEquals(other.remoteStableIdentifier)) return false
-    } else if (other.remoteStableIdentifier != null) return false
+    } else if (other.remoteStableIdentifier != null) {
+      return false
+    }
     if (remoteIdentityKey != other.remoteIdentityKey) return false
     if (fingerprint != other.fingerprint) return false
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java b/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
index 2cd5a7da52..009450c4cf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
@@ -43,7 +43,7 @@
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.mediapreview.MediaPreviewPlayerControlView;
 import org.thoughtcrime.securesms.mms.VideoSlide;
 
@@ -149,7 +149,7 @@ public void setVideoSource(@NonNull VideoSlide videoSource, boolean autoplay, St
 
   public void setVideoSource(@NonNull VideoSlide videoSource, boolean autoplay, String poolTag, long clipStartMs, long clipEndMs) {
     if (exoPlayer == null) {
-      exoPlayer = ApplicationDependencies.getExoPlayerPool().require(poolTag);
+      exoPlayer = AppDependencies.getExoPlayerPool().require(poolTag);
       exoPlayer.addListener(exoPlayerListener);
       exoPlayer.addListener(playerListener);
       exoView.setPlayer(exoPlayer);
@@ -263,7 +263,7 @@ public void cleanup() {
       exoPlayer.removeListener(playerListener);
       exoPlayer.removeListener(exoPlayerListener);
 
-      ApplicationDependencies.getExoPlayerPool().pool(exoPlayer);
+      AppDependencies.getExoPlayerPool().pool(exoPlayer);
       this.exoPlayer = null;
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/video/exo/ChunkedDataSource.java b/app/src/main/java/org/thoughtcrime/securesms/video/exo/ChunkedDataSource.java
index 726f142975..6de8dd90b1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/video/exo/ChunkedDataSource.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/video/exo/ChunkedDataSource.java
@@ -13,7 +13,7 @@
 import androidx.media3.datasource.DataSpec;
 import androidx.media3.datasource.TransferListener;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.net.ChunkedDataFetcher;
 
 import java.io.EOFException;
@@ -63,8 +63,8 @@ public long open(@NonNull DataSpec dataSpec) throws IOException {
       // Exoplayer sometimes interrupts the thread
     }
 
-    Context       context = ApplicationDependencies.getApplication();
-    GiphyMp4Cache cache   = ApplicationDependencies.getGiphyMp4Cache();
+    Context       context = AppDependencies.getApplication();
+    GiphyMp4Cache cache   = AppDependencies.getGiphyMp4Cache();
 
     cacheEntry = cache.read(context, dataSpec.uri);
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/video/exo/PartDataSource.java b/app/src/main/java/org/thoughtcrime/securesms/video/exo/PartDataSource.java
index 5ba14edc59..bf40405b49 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/video/exo/PartDataSource.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/video/exo/PartDataSource.java
@@ -16,10 +16,14 @@
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.database.AttachmentTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.mms.PartUriParser;
 import org.signal.core.util.Base64;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.whispersystems.signalservice.api.backup.BackupKey;
+import org.whispersystems.signalservice.api.backup.MediaId;
 import org.whispersystems.signalservice.api.crypto.AttachmentCipherInputStream;
+import org.whispersystems.signalservice.api.crypto.AttachmentCipherStreamUtil;
+import org.whispersystems.signalservice.internal.crypto.PaddingInputStream;
 
 import java.io.EOFException;
 import java.io.File;
@@ -61,22 +65,32 @@ public long open(DataSpec dataSpec) throws IOException {
     final String  attachmentKey        = attachment.remoteKey;
     final boolean hasData              = attachment.hasData;
 
-    if (inProgress && !hasData && hasIncrementalDigest && attachmentKey != null && FeatureFlags.instantVideoPlayback()) {
+    if (inProgress && !hasData && hasIncrementalDigest && attachmentKey != null) {
       final byte[] decode       = Base64.decode(attachmentKey);
-      final File   transferFile = attachmentDatabase.getOrCreateTransferFile(attachment.attachmentId);
-      try {
-        this.inputStream = AttachmentCipherInputStream.createForAttachment(transferFile, attachment.size, decode, attachment.remoteDigest, attachment.getIncrementalDigest(), attachment.incrementalMacChunkSize);
-
-        long skipped = 0;
-        while (skipped < dataSpec.position) {
-          skipped += this.inputStream.read();
+      if (attachment.transferState == AttachmentTable.TRANSFER_RESTORE_IN_PROGRESS && attachment.archiveMediaId != null) {
+        final File archiveFile = attachmentDatabase.getOrCreateArchiveTransferFile(attachment.attachmentId);
+        try {
+          BackupKey.MediaKeyMaterial mediaKeyMaterial = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey().deriveMediaSecretsFromMediaId(attachment.archiveMediaId);
+          long originalCipherLength = AttachmentCipherStreamUtil.getCiphertextLength(PaddingInputStream.getPaddedSize(attachment.size));
+
+          this.inputStream = AttachmentCipherInputStream.createStreamingForArchivedAttachment(mediaKeyMaterial, archiveFile, originalCipherLength, attachment.size, attachment.remoteDigest, decode, attachment.getIncrementalDigest(), attachment.incrementalMacChunkSize);
+        } catch (InvalidMessageException e) {
+          throw new IOException("Error decrypting attachment stream!", e);
         }
-
-        Log.d(TAG, "Successfully loaded partial attachment file.");
-
-      } catch (InvalidMessageException e) {
-        throw new IOException("Error decrypting attachment stream!", e);
+      } else {
+        final File transferFile = attachmentDatabase.getOrCreateTransferFile(attachment.attachmentId);
+        try {
+          this.inputStream = AttachmentCipherInputStream.createForAttachment(transferFile, attachment.size, decode, attachment.remoteDigest, attachment.getIncrementalDigest(), attachment.incrementalMacChunkSize);
+        } catch (InvalidMessageException e) {
+          throw new IOException("Error decrypting attachment stream!", e);
+        }
+      }
+      long skipped = 0;
+      while (skipped < dataSpec.position) {
+        skipped += this.inputStream.read();
       }
+
+      Log.d(TAG, "Successfully loaded partial attachment file.");
     } else if (!inProgress || hasData) {
       this.inputStream = attachmentDatabase.getAttachmentStream(partUri.getPartId(), dataSpec.position);
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/video/exo/SimpleExoPlayerPool.kt b/app/src/main/java/org/thoughtcrime/securesms/video/exo/SimpleExoPlayerPool.kt
index a9e93e6338..505e5cd1fe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/video/exo/SimpleExoPlayerPool.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/video/exo/SimpleExoPlayerPool.kt
@@ -11,7 +11,7 @@ import androidx.media3.exoplayer.mediacodec.MediaCodecUtil
 import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
 import androidx.media3.exoplayer.source.MediaSource
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.net.ContentProxySelector
 import org.thoughtcrime.securesms.util.AppForegroundObserver
 import org.thoughtcrime.securesms.util.DeviceProperties
@@ -23,12 +23,12 @@ import kotlin.time.Duration.Companion.seconds
 @OptIn(markerClass = [UnstableApi::class])
 class SimpleExoPlayerPool(context: Context) : ExoPlayerPool<ExoPlayer>(MAXIMUM_RESERVED_PLAYERS) {
   private val context: Context = context.applicationContext
-  private val okHttpClient = ApplicationDependencies.getOkHttpClient().newBuilder().proxySelector(ContentProxySelector()).build()
-  private val dataSourceFactory: DataSource.Factory = SignalDataSource.Factory(ApplicationDependencies.getApplication(), okHttpClient, null)
+  private val okHttpClient = AppDependencies.okHttpClient.newBuilder().proxySelector(ContentProxySelector()).build()
+  private val dataSourceFactory: DataSource.Factory = SignalDataSource.Factory(AppDependencies.application, okHttpClient, null)
   private val mediaSourceFactory: MediaSource.Factory = DefaultMediaSourceFactory(dataSourceFactory)
 
   init {
-    ApplicationDependencies.getAppForegroundObserver().addListener(this)
+    AppDependencies.appForegroundObserver.addListener(this)
   }
 
   /**
@@ -51,7 +51,7 @@ class SimpleExoPlayerPool(context: Context) : ExoPlayerPool<ExoPlayer>(MAXIMUM_R
       return maxInstances
     }
 
-    return if (DeviceProperties.isLowMemoryDevice(ApplicationDependencies.getApplication())) {
+    return if (DeviceProperties.isLowMemoryDevice(AppDependencies.application)) {
       MAXIMUM_SUPPORTED_PLAYBACK_PRE_23_LOW_MEM
     } else {
       MAXIMUM_SUPPORTED_PLAYBACK_PRE_23
diff --git a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperPreviewActivity.java
index ca1838de46..196d5ad404 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperPreviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperPreviewActivity.java
@@ -104,7 +104,7 @@ protected void onCreate(Bundle savedInstanceState, boolean ready) {
                  addUpdateBubbleColorListeners(recipient.getChatColors(), selected.getAutoChatColors());
                });
     } else {
-      addUpdateBubbleColorListeners(SignalStore.chatColorsValues().getChatColors(), selected.getAutoChatColors());
+      addUpdateBubbleColorListeners(SignalStore.chatColors().getChatColors(), selected.getAutoChatColors());
     }
 
     new FullscreenHelper(this).showSystemUI();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperRepository.java b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperRepository.java
index e282eca0f4..5aed75ac27 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperRepository.java
@@ -9,7 +9,7 @@
 import org.thoughtcrime.securesms.conversation.colors.ChatColors;
 import org.thoughtcrime.securesms.conversation.colors.ChatColorsPalette;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -37,8 +37,8 @@ class ChatWallpaperRepository {
   @NonNull ChatColors getCurrentChatColors(@Nullable RecipientId recipientId) {
     if (recipientId != null) {
       return Recipient.live(recipientId).get().getChatColors();
-    } else if (SignalStore.chatColorsValues().hasChatColors()) {
-      return Objects.requireNonNull(SignalStore.chatColorsValues().getChatColors());
+    } else if (SignalStore.chatColors().hasChatColors()) {
+      return Objects.requireNonNull(SignalStore.chatColors().getChatColors());
     } else if (SignalStore.wallpaper().hasWallpaperSet()) {
       return Objects.requireNonNull(SignalStore.wallpaper().getWallpaper()).getAutoChatColors();
     } else {
@@ -50,7 +50,7 @@ void getAllWallpaper(@NonNull Consumer<List<ChatWallpaper>> consumer) {
     EXECUTOR.execute(() -> {
       List<ChatWallpaper> wallpapers = new ArrayList<>(ChatWallpaper.BuiltIns.INSTANCE.getAllBuiltIns());
 
-      wallpapers.addAll(WallpaperStorage.getAll(ApplicationDependencies.getApplication()));
+      wallpapers.addAll(WallpaperStorage.getAll(AppDependencies.getApplication()));
       consumer.accept(wallpapers);
     });
   }
@@ -63,13 +63,13 @@ void saveWallpaper(@Nullable RecipientId recipientId, @Nullable ChatWallpaper ch
         onWallpaperSaved.run();
       });
     } else {
-      SignalStore.wallpaper().setWallpaper(ApplicationDependencies.getApplication(), chatWallpaper);
+      SignalStore.wallpaper().setWallpaper(AppDependencies.getApplication(), chatWallpaper);
       onWallpaperSaved.run();
     }
   }
 
   void resetAllWallpaper(@NonNull Runnable onWallpaperReset) {
-    SignalStore.wallpaper().setWallpaper(ApplicationDependencies.getApplication(), null);
+    SignalStore.wallpaper().setWallpaper(AppDependencies.getApplication(), null);
     EXECUTOR.execute(() -> {
       SignalDatabase.recipients().resetAllWallpaper();
       onWallpaperReset.run();
@@ -77,7 +77,7 @@ void resetAllWallpaper(@NonNull Runnable onWallpaperReset) {
   }
 
   void resetAllChatColors(@NonNull Runnable onColorsReset) {
-    SignalStore.chatColorsValues().setChatColors(null);
+    SignalStore.chatColors().setChatColors(null);
     EXECUTOR.execute(() -> {
       SignalDatabase.recipients().clearAllColors();
       onColorsReset.run();
@@ -107,7 +107,7 @@ void setDimInDarkTheme(@Nullable RecipientId recipientId, boolean dimInDarkTheme
 
   public void clearChatColor(@Nullable RecipientId recipientId, @NonNull Runnable onChatColorCleared) {
     if (recipientId == null) {
-      SignalStore.chatColorsValues().setChatColors(null);
+      SignalStore.chatColors().setChatColors(null);
       onChatColorCleared.run();
     } else {
       EXECUTOR.execute(() -> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperSelectionFragment.java b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperSelectionFragment.java
index c8ad4ed300..d8ebf330cd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperSelectionFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperSelectionFragment.java
@@ -1,13 +1,11 @@
 package org.thoughtcrime.securesms.wallpaper;
 
-import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -18,8 +16,6 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.permissions.PermissionCompat;
-import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.wallpaper.crop.WallpaperImageSelectionActivity;
 
 public class ChatWallpaperSelectionFragment extends Fragment {
@@ -40,7 +36,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     RecyclerView         recyclerView         = view.findViewById(R.id.chat_wallpaper_recycler);
 
     chooseFromPhotos.setOnClickListener(unused -> {
-      askForPermissionIfNeededAndLaunchPhotoSelection();
+      startActivityForResult(WallpaperImageSelectionActivity.getIntent(requireContext(), viewModel.getRecipientId()), CHOOSE_WALLPAPER);
     });
 
     toolbar.setTitle(R.string.preferences__chat_color_and_wallpaper);
@@ -74,16 +70,4 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
       super.onActivityResult(requestCode, resultCode, data);
     }
   }
-
-  private void askForPermissionIfNeededAndLaunchPhotoSelection() {
-    Permissions.with(this)
-               .request(PermissionCompat.forImages())
-               .ifNecessary()
-               .onAllGranted(() -> {
-                 startActivityForResult(WallpaperImageSelectionActivity.getIntent(requireContext(), viewModel.getRecipientId()), CHOOSE_WALLPAPER);
-               })
-               .onAnyDenied(() -> Toast.makeText(requireContext(), R.string.ChatWallpaperPreviewActivity__viewing_your_gallery_requires_the_storage_permission, Toast.LENGTH_SHORT)
-                                       .show())
-               .execute();
-  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/crop/WallpaperCropRepository.java b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/crop/WallpaperCropRepository.java
index 3f167f9e00..9b8e81a947 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/crop/WallpaperCropRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/crop/WallpaperCropRepository.java
@@ -8,7 +8,7 @@
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.wallpaper.ChatWallpaper;
@@ -26,7 +26,7 @@ final class WallpaperCropRepository {
   private final           Context     context;
 
   public WallpaperCropRepository(@Nullable RecipientId recipientId) {
-    this.context     = ApplicationDependencies.getApplication();
+    this.context     = AppDependencies.getApplication();
     this.recipientId = recipientId;
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/VoiceCallShare.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/VoiceCallShare.java
index 8e53bb8190..eadf3a3465 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/VoiceCallShare.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/VoiceCallShare.java
@@ -9,7 +9,7 @@
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.PassphraseRequiredActivity;
 import org.thoughtcrime.securesms.WebRtcCallActivity;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.signal.core.util.concurrent.SimpleTask;
 
@@ -35,9 +35,9 @@ protected void onCreate(Bundle savedInstanceState, boolean ready) {
           SimpleTask.run(() -> Recipient.external(this, destination), recipient -> {
             if (!TextUtils.isEmpty(destination)) {
               if (VIDEO_CALL_MIME_TYPE.equals(getIntent().getType())) {
-                ApplicationDependencies.getSignalCallManager().startOutgoingVideoCall(recipient);
+                AppDependencies.getSignalCallManager().startOutgoingVideoCall(recipient);
               } else {
-                ApplicationDependencies.getSignalCallManager().startOutgoingAudioCall(recipient);
+                AppDependencies.getSignalCallManager().startOutgoingAudioCall(recipient);
               }
 
               Intent activityIntent = new Intent(this, WebRtcCallActivity.class);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/AudioManagerCompat.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/AudioManagerCompat.java
index bd5e26f97e..f69eff5ab4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/AudioManagerCompat.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/AudioManagerCompat.java
@@ -159,16 +159,21 @@ public void unregisterAudioDeviceCallback(@NonNull AudioDeviceCallback deviceCal
 
   @SuppressLint("WrongConstant")
   public boolean isWiredHeadsetOn() {
-    AudioDeviceInfo[] devices = audioManager.getDevices(AudioManager.GET_DEVICES_ALL);
-    for (AudioDeviceInfo device : devices) {
-      final int type = device.getType();
-      if (type == AudioDeviceInfo.TYPE_WIRED_HEADSET) {
-        return true;
-      } else if (type == AudioDeviceInfo.TYPE_USB_DEVICE) {
-        return true;
+    if (Build.VERSION.SDK_INT < 23) {
+      //noinspection deprecation
+      return audioManager.isWiredHeadsetOn();
+    } else {
+      AudioDeviceInfo[] devices = audioManager.getDevices(AudioManager.GET_DEVICES_ALL);
+      for (AudioDeviceInfo device : devices) {
+        final int type = device.getType();
+        if (type == AudioDeviceInfo.TYPE_WIRED_HEADSET) {
+          return true;
+        } else if (type == AudioDeviceInfo.TYPE_USB_DEVICE) {
+          return true;
+        }
       }
+      return false;
     }
-    return false;
   }
 
   public float ringVolumeWithMinimum() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/FullSignalAudioManagerApi31.kt b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/FullSignalAudioManagerApi31.kt
index e662dc789b..472b46668d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/FullSignalAudioManagerApi31.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/FullSignalAudioManagerApi31.kt
@@ -201,6 +201,7 @@ class FullSignalAudioManagerApi31(context: Context, eventListener: EventListener
           Log.d(TAG, "Switching to new device of type ${candidate.type} from ${currentAudioDevice?.type}")
           val result = androidAudioManager.setCommunicationDevice(candidate)
           if (result) {
+            Log.w(TAG, "Succeeded in setting ${candidate.id} (type: ${candidate.type}) as communication device.")
             eventListener?.onAudioDeviceChanged(AudioDeviceMapping.fromPlatformType(candidate.type), availableCommunicationDevices.map { AudioDeviceMapping.fromPlatformType(it.type) }.toSet())
           } else {
             Log.w(TAG, "Failed to set ${candidate.id} as communication device.")
diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java
index b203033648..bfc66b3063 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java
@@ -2,8 +2,10 @@
 
 import android.content.Context;
 import android.media.AudioAttributes;
+import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.net.Uri;
+import android.os.Build;
 
 import androidx.annotation.NonNull;
 
@@ -42,10 +44,14 @@ public void start(Type type) {
 
     mediaPlayer = new MediaPlayer();
 
-    mediaPlayer.setAudioAttributes(new AudioAttributes.Builder()
-                                                      .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
-                                                      .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
-                                                      .build());
+    if (Build.VERSION.SDK_INT <= 21) {
+      mediaPlayer.setAudioStreamType(AudioManager.STREAM_VOICE_CALL);
+    } else {
+      mediaPlayer.setAudioAttributes(new AudioAttributes.Builder()
+                                                        .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+                                                        .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
+                                                        .build());
+    }
     mediaPlayer.setLooping(true);
 
     String packageName = context.getPackageName();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.kt b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.kt
index 0cab43e7f9..04f22d7d6b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.kt
@@ -19,7 +19,7 @@ import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.audio.AudioDeviceUpdatedListener
 import org.thoughtcrime.securesms.audio.SignalBluetoothManager
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.safeUnregisterReceiver
 import org.whispersystems.signalservice.api.util.Preconditions
@@ -33,7 +33,7 @@ sealed class SignalAudioManager(protected val context: Context, protected val ev
 
   protected var state: State = State.UNINITIALIZED
 
-  protected val androidAudioManager = ApplicationDependencies.getAndroidCallAudioManager()
+  protected val androidAudioManager = AppDependencies.androidCallAudioManager
 
   protected var selectedAudioDevice: AudioDevice = AudioDevice.NONE
 
@@ -103,11 +103,17 @@ sealed class SignalAudioManager(protected val context: Context, protected val ev
   }
 
   enum class AudioDevice {
-    SPEAKER_PHONE, WIRED_HEADSET, EARPIECE, BLUETOOTH, NONE
+    SPEAKER_PHONE,
+    WIRED_HEADSET,
+    EARPIECE,
+    BLUETOOTH,
+    NONE
   }
 
   enum class State {
-    UNINITIALIZED, PREINITIALIZED, RUNNING
+    UNINITIALIZED,
+    PREINITIALIZED,
+    RUNNING
   }
 
   /**
diff --git a/app/src/main/protowire/Backup.proto b/app/src/main/protowire/Backup.proto
index 91d60648a3..b516ce25a0 100644
--- a/app/src/main/protowire/Backup.proto
+++ b/app/src/main/protowire/Backup.proto
@@ -74,6 +74,13 @@ message AccountData {
     bool hasSeenGroupStoryEducationSheet = 15;
     bool hasCompletedUsernameOnboarding = 16;
     PhoneNumberSharingMode phoneNumberSharingMode = 17;
+    ChatStyle defaultChatStyle = 18;
+  }
+
+  message SubscriberData {
+    bytes subscriberId = 1;
+    string currencyCode = 2;
+    bool manuallyCancelled = 3;
   }
 
   bytes profileKey = 1;
@@ -82,10 +89,9 @@ message AccountData {
   string givenName = 4;
   string familyName = 5;
   string avatarUrlPath = 6;
-  bytes subscriberId = 7;
-  string subscriberCurrencyCode = 8;
-  bool subscriptionManuallyCancelled = 9;
-  AccountSettings accountSettings = 10;
+  SubscriberData donationSubscriberData = 7;
+  SubscriberData backupsSubscriberData = 8;
+  AccountSettings accountSettings = 9;
 }
 
 message Recipient {
@@ -93,7 +99,7 @@ message Recipient {
   oneof destination {
     Contact contact = 2;
     Group group = 3;
-    DistributionList distributionList = 4;
+    DistributionListItem distributionList = 4;
     Self self = 5;
     ReleaseNotes releaseNotes = 6;
     CallLink callLink = 7;
@@ -101,10 +107,15 @@ message Recipient {
 }
 
 message Contact {
-  enum Registered {
-    UNKNOWN = 0;
-    REGISTERED = 1;
-    NOT_REGISTERED = 2;
+  message Registered { }
+  message NotRegistered {
+    uint64 unregisteredTimestamp = 1;
+  }
+
+  enum Visibility {
+    VISIBLE = 0;
+    HIDDEN = 1;
+    HIDDEN_MESSAGE_REQUEST = 2;
   }
 
   optional bytes aci = 1; // should be 16 bytes
@@ -112,9 +123,13 @@ message Contact {
   optional string username = 3;
   optional uint64 e164 = 4;
   bool blocked = 5;
-  bool hidden = 6;
-  Registered registered = 7;
-  uint64 unregisteredTimestamp = 8;
+  Visibility visibility = 6;
+
+  oneof registration {
+    Registered registered = 7;
+    NotRegistered notRegistered = 8;
+  }
+
   optional bytes profileKey = 9;
   bool profileSharing = 10;
   optional string profileGivenName = 11;
@@ -225,7 +240,7 @@ message Chat {
   uint64 muteUntilMs = 6;
   bool markedUnread = 7;
   bool dontNotifyForMentionsIfMuted = 8;
-  FilePointer wallpaper = 9;
+  ChatStyle style = 9;
 }
 
 /**
@@ -260,10 +275,16 @@ message AdHocCall {
   // Refers to a `CallLink` recipient.
   uint64 recipientId = 2;
   State state = 3;
-  optional bytes startedCallAci = 4;
-  uint64 startedCallTimestamp = 5;
-  // The time the call ended. 0 indicates an unknown time.
-  uint64 endedCallTimestamp = 6;
+  uint64 callTimestamp = 4;
+}
+
+message DistributionListItem {
+  bytes distributionId = 1; // distribution list ids are uuids
+
+  oneof item {
+    uint64 deletionTimestamp = 2;
+    DistributionList distributionList = 3;
+  }
 }
 
 message DistributionList {
@@ -275,20 +296,9 @@ message DistributionList {
   }
 
   string name = 1;
-  bytes distributionId = 2; // distribution list ids are uuids
-  bool allowReplies = 3;
-  uint64 deletionTimestamp = 4;
-  PrivacyMode privacyMode = 5;
-  repeated uint64 memberRecipientIds = 6; // generated recipient id
-}
-
-message Identity {
-  bytes serviceId = 1;
-  bytes identityKey = 2;
-  uint64 timestamp = 3;
-  bool firstUse = 4;
-  bool verified = 5;
-  bool nonblockingApproval = 6;
+  bool allowReplies = 2;
+  PrivacyMode privacyMode = 3;
+  repeated uint64 memberRecipientIds = 4; // generated recipient id
 }
 
 message ChatItem {
@@ -326,6 +336,8 @@ message ChatItem {
     StickerMessage stickerMessage = 13;
     RemoteDeletedMessage remoteDeletedMessage = 14;
     ChatUpdateMessage updateMessage = 15;
+    PaymentNotification paymentNotification = 16;
+    GiftBadge giftBadge = 17;
   }
 }
 
@@ -368,6 +380,66 @@ message ContactMessage {
   repeated Reaction reactions = 2;
 }
 
+message PaymentNotification {
+  message TransactionDetails {
+    message MobileCoinTxoIdentification { // Used to map to payments on the ledger
+      repeated bytes publicKey = 1; // for received transactions
+      repeated bytes keyImages = 2; // for sent transactions
+    }
+
+    message FailedTransaction { // Failed payments can't be synced from the ledger
+      enum FailureReason {
+        GENERIC = 0;
+        NETWORK = 1;
+        INSUFFICIENT_FUNDS = 2;
+      }
+      FailureReason reason = 1;
+    }
+
+    message Transaction {
+      enum Status {
+        INITIAL = 0;
+        SUBMITTED = 1;
+        SUCCESSFUL = 2;
+      }
+      Status status = 1;
+
+      // This identification is used to map the payment table to the ledger
+      // and is likely required otherwise we may have issues reconciling with
+      // the ledger
+      MobileCoinTxoIdentification mobileCoinIdentification = 2;
+      optional uint64 timestamp = 3;
+      optional uint64 blockIndex = 4;
+      optional uint64 blockTimestamp = 5;
+      optional bytes transaction = 6; // mobile coin blobs
+      optional bytes receipt = 7; // mobile coin blobs
+    }
+
+    oneof payment {
+      Transaction transaction = 1;
+      FailedTransaction failedTransaction = 2;
+    }
+  }
+
+  optional string amountMob = 1; // stored as a decimal string, e.g. 1.00001
+  optional string feeMob = 2; // stored as a decimal string, e.g. 1.00001
+  optional string note = 3;
+  TransactionDetails transactionDetails = 4;
+
+}
+
+message GiftBadge {
+  enum State {
+    UNOPENED = 0;
+    OPENED = 1;
+    REDEEMED = 2;
+    FAILED = 3;
+  }
+
+  bytes receiptCredentialPresentation = 1;
+  State state = 2;
+}
+
 message ContactAttachment {
   message Name {
     optional string givenName = 1;
@@ -429,16 +501,10 @@ message ContactAttachment {
   repeated Phone number = 3;
   repeated Email email = 4;
   repeated PostalAddress address = 5;
-  optional string avatarUrlPath = 6;
+  optional FilePointer avatar = 6;
   optional string organization = 7;
 }
 
-message DocumentMessage {
-  Text text = 1;
-  FilePointer document = 2;
-  repeated Reaction reactions = 3;
-}
-
 message StickerMessage {
   Sticker sticker = 1;
   repeated Reaction reactions = 2;
@@ -483,6 +549,9 @@ message MessageAttachment {
   FilePointer pointer = 1;
   Flag flag = 2;
   bool wasDownloaded = 3;
+  // Cross-client identifier for this attachment among all attachments on the
+  // owning message. See: SignalService.AttachmentPointer.clientUuid.
+  optional bytes clientUuid = 4;
 }
 
 message FilePointer {
@@ -596,6 +665,7 @@ message ChatUpdateMessage {
     SessionSwitchoverChatUpdate sessionSwitchover = 6;
     IndividualCall individualCall = 7;
     GroupCall groupCall = 8;
+    LearnedProfileChatUpdate learnedProfileChange = 9;
   }
 }
 
@@ -656,7 +726,7 @@ message GroupCall {
   optional uint64 callId = 1;
   State state = 2;
   optional uint64 ringerRecipientId = 3;
-  optional bytes startedCallAci = 4;
+  optional uint64 startedCallRecipientId = 4;
   uint64 startedCallTimestamp = 5;
   // The time the call ended. 0 indicates an unknown time.
   uint64 endedCallTimestamp = 6;
@@ -676,6 +746,7 @@ message SimpleChatUpdate {
     BAD_DECRYPT = 9;
     PAYMENTS_ACTIVATED = 10;
     PAYMENT_ACTIVATION_REQUEST = 11;
+    UNSUPPORTED_PROTOCOL_MESSAGE = 12;
   }
 
   Type type = 1;
@@ -692,6 +763,13 @@ message ProfileChangeChatUpdate {
   string newName = 2;
 }
 
+message LearnedProfileChatUpdate {
+  oneof previousName {
+    uint64 e164 = 1;
+    string username = 2;
+  }
+}
+
 message ThreadMergeChatUpdate {
   uint64 previousE164 = 1;
 }
@@ -950,12 +1028,79 @@ message GroupExpirationTimerUpdate {
 message StickerPack {
   bytes packId = 1;
   bytes packKey = 2;
-  string title = 3;
-  string author = 4;
-  repeated StickerPackSticker stickers = 5; // First one should be cover sticker.
 }
 
-message StickerPackSticker {
-  string emoji = 1;
-  uint32 id = 2;
-}
+message ChatStyle {
+  message Gradient {
+    uint32 angle = 1; // degrees
+    repeated uint32 colors = 2;
+    repeated float positions = 3; // percent from 0 to 1
+  }
+
+  message AutomaticBubbleColor {
+  }
+
+  enum WallpaperPreset {
+    UNKNOWN_WALLPAPER_PRESET = 0;
+    SOLID_BLUSH = 1;
+    SOLID_COPPER = 2;
+    SOLID_DUST = 3;
+    SOLID_CELADON = 4;
+    SOLID_RAINFOREST = 5;
+    SOLID_PACIFIC = 6;
+    SOLID_FROST = 7;
+    SOLID_NAVY = 8;
+    SOLID_LILAC = 9;
+    SOLID_PINK = 10;
+    SOLID_EGGPLANT = 11;
+    SOLID_SILVER = 12;
+    GRADIENT_SUNSET = 13;
+    GRADIENT_NOIR = 14;
+    GRADIENT_HEATMAP = 15;
+    GRADIENT_AQUA = 16;
+    GRADIENT_IRIDESCENT = 17;
+    GRADIENT_MONSTERA = 18;
+    GRADIENT_BLISS = 19;
+    GRADIENT_SKY = 20;
+    GRADIENT_PEACH = 21;
+  }
+
+  enum BubbleColorPreset {
+    UNKNOWN_BUBBLE_COLOR_PRESET = 0;
+    SOLID_ULTRAMARINE = 1;
+    SOLID_CRIMSON = 2;
+    SOLID_VERMILION = 3;
+    SOLID_BURLAP = 4;
+    SOLID_FOREST = 5;
+    SOLID_WINTERGREEN = 6;
+    SOLID_TEAL = 7;
+    SOLID_BLUE = 8;
+    SOLID_INDIGO = 9;
+    SOLID_VIOLET = 10;
+    SOLID_PLUM = 11;
+    SOLID_TAUPE = 12;
+    SOLID_STEEL = 13;
+    GRADIENT_EMBER = 14;
+    GRADIENT_MIDNIGHT = 15;
+    GRADIENT_INFRARED = 16;
+    GRADIENT_LAGOON = 17;
+    GRADIENT_FLUORESCENT = 18;
+    GRADIENT_BASIL = 19;
+    GRADIENT_SUBLIME = 20;
+    GRADIENT_SEA = 21;
+    GRADIENT_TANGERINE = 22;
+  }
+
+  oneof wallpaper {
+    WallpaperPreset wallpaperPreset = 1;
+    FilePointer wallpaperPhoto = 2;
+  }
+
+  oneof bubbleColor {
+    BubbleColorPreset bubbleColorPreset = 3;
+    Gradient bubbleGradient = 4;
+    uint32 bubbleSolidColor = 5;
+    // Bubble setting is automatically determined based on the wallpaper setting.
+    AutomaticBubbleColor autoBubbleColor = 6;
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/protowire/Database.proto b/app/src/main/protowire/Database.proto
index c5800aeb4f..2a9aa3d073 100644
--- a/app/src/main/protowire/Database.proto
+++ b/app/src/main/protowire/Database.proto
@@ -72,8 +72,17 @@ message ProfileChangeDetails {
         string newValue = 2;
     }
 
-    StringChange profileNameChange = 1;
-    StringChange learnedProfileName = 2;
+    message LearnedProfileName {
+        oneof PreviouslyKnownAs {
+            string e164 = 1;
+            string username = 2;
+        }
+    }
+
+    StringChange       profileNameChange            = 1;
+    // Deprecated - Use learnedProfileName instead
+    StringChange       deprecatedLearnedProfileName = 2;
+    LearnedProfileName learnedProfileName           = 3;
 }
 
 message BodyRangeList {
@@ -292,6 +301,7 @@ message FiatValue {
     uint64       timestamp     = 3;
 }
 
+// DEPRECATED -- Replaced with InAppPaymentData.Error message.
 message DonationErrorValue {
     enum Type {
         PROCESSOR_CODE = 0; // Generic processor error (e.g. Stripe returned an error code)
@@ -299,12 +309,115 @@ message DonationErrorValue {
         FAILURE_CODE   = 2; // Stripe bank transfer failure code
         REDEMPTION     = 3; // Generic redemption error (status is HTTP code)
         PAYMENT        = 4; // Generic payment error (status is HTTP code)
+        VALIDATION     = 5; // Failed while trying to validate the ReceiptCredential returned from the service.
     }
 
     Type   type = 1;
     string code = 2;
 }
 
+/**
+ * Contains all the extra information required to appropriately
+ * manage the lifecycle of transactions.
+ */
+message InAppPaymentData {
+
+    enum PaymentMethodType {
+        UNKNOWN    = 0;
+        GOOGLE_PAY = 1;
+        CARD       = 2;
+        SEPA_DEBIT = 3;
+        IDEAL      = 4;
+        PAYPAL     = 5;
+    }
+
+    /**
+     * This mirrors ActiveSubscription.ChargeFailure
+     */
+    message ChargeFailure {
+        string code                 = 1;
+        string message              = 2;
+        string outcomeNetworkStatus = 3;
+        string outcomeNetworkReason = 4;
+        string outcomeType          = 5;
+    }
+
+    message Cancellation {
+        enum Reason {
+            UNKNOWN           = 0;
+            MANUAL            = 1;
+            PAST_DUE          = 2;
+            CANCELED          = 3;
+            UNPAID            = 4;
+            USER_WAS_INACTIVE = 5;
+        }
+
+                 Reason        reason            = 1; // Why the cancellation happened
+        optional ChargeFailure chargeFailure     = 2; // A charge failure, if available.
+    }
+
+    message WaitingForAuthorizationState {
+        string stripeIntentId      = 1;
+        string stripeClientSecret  = 2;
+        bool   checkedVerification = 3;
+    }
+
+    message RedemptionState {
+        enum Stage {
+            INIT               = 0;
+            CONVERSION_STARTED = 1;
+            REDEMPTION_STARTED = 2;
+            REDEEMED           = 3;
+        }
+
+                 Stage  stage                           = 1;
+        optional string paymentIntentId                 = 2; // Only present for one-time donations.
+        optional bool   keepAlive                       = 3; // Only present for recurring donations, specifies this redemption started from a keep-alive
+        optional bytes  receiptCredentialRequestContext = 4; // Reusable context for retrieving a presentation
+        optional bytes  receiptCredentialPresentation   = 5; // Redeemable presentation
+    }
+
+    message Error {
+        enum Type {
+            UNKNOWN                        = 0;  // A generic, untyped error. Check log for details.
+            GOOGLE_PAY_REQUEST_TOKEN       = 1;  // Google pay failed to give us a request token.
+            INVALID_GIFT_RECIPIENT         = 2;  // Selected recipient for gift is invalid.
+            ONE_TIME_AMOUNT_TOO_SMALL      = 3;  // One-time payment amount is below minimum
+            ONE_TIME_AMOUNT_TOO_LARGE      = 4;  // One-time payment amount is too large
+            INVALID_CURRENCY               = 5;  // One-time payment currency is invalid
+            PAYMENT_SETUP                  = 6;  // A generic payment setup error (prior to charging the user)
+            STRIPE_CODED_ERROR             = 7;  // Stripe error containing a stripe error code in data.
+            STRIPE_DECLINED_ERROR          = 8; // Stripe error containing a decline error code in data.
+            STRIPE_FAILURE                 = 9; // Stripe error containing a failure error code in data.
+            PAYPAL_CODED_ERROR             = 10; // PayPal error containing a paypal error code in data.
+            PAYPAL_DECLINED_ERROR          = 11; // PayPal error containing a paypal decline code in data.
+            PAYMENT_PROCESSING             = 12; // Generic payment error containing an HTTP status code in data.
+            CREDENTIAL_VALIDATION          = 13; // Failed to validate credential returned from service.
+            REDEMPTION                     = 14; // Failed during badge redemption containing an HTTP status code in data if available.
+        }
+
+                 Type   type = 1;
+        optional string data = 2;
+    }
+
+    optional BadgeList.Badge   badge             = 1; // The badge. Not present for backups transactions
+             FiatValue         amount            = 2; // The amount the user paid for the transaction
+    optional Error             error             = 3; // An error, if present.
+             int64             level             = 4; // The transaction "level" given to us by the server
+    optional Cancellation      cancellation      = 5; // The transaction was cancelled. This notes why.
+             string            label             = 6; // Descriptive text about the token
+    optional string            recipientId       = 7; // The target recipient the token is to be sent to (only used for gifts)
+    optional string            additionalMessage = 8; // The additional message to send the target recipient (only used for gifts)
+             PaymentMethodType paymentMethodType = 9; // The method through which this in app payment was made
+
+    oneof redemptionState {
+        WaitingForAuthorizationState waitForAuth = 10;   // Waiting on user authorization from an external source (3DS, iDEAL)
+        RedemptionState              redemption  = 11;  // Waiting on processing of token
+    }
+
+}
+
+// DEPRECATED -- Move to TokenTransactionData
 message PendingOneTimeDonation {
     enum PaymentMethodType {
         CARD       = 0;
@@ -328,6 +441,7 @@ message PendingOneTimeDonation {
  * the same way that it is used in Rx, where we simply mean that, regardless
  * of outcome, a donation has completed processing.
  */
+// DEPRECATED -- Move to TokenTransactionData
 message TerminalDonationQueue {
     message TerminalDonation {
                  int64              level                      = 1;
@@ -344,6 +458,7 @@ message TerminalDonationQueue {
  * scenarios where the application dies while the user is confirming
  * a transaction in their bank app.
  */
+// DEPRECATED -- Move to TokenTransactionData
 message ExternalLaunchTransactionState {
 
     message StripeIntentAccessor {
@@ -358,20 +473,21 @@ message ExternalLaunchTransactionState {
     }
 
     message GatewayRequest {
-        enum DonateToSignalType {
-            MONTHLY  = 0;
-            ONE_TIME = 1;
-            GIFT     = 2;
+        enum InAppPaymentType {
+            RECURRING_DONATION = 0;
+            ONE_TIME_DONATION  = 1;
+            ONE_TIME_GIFT      = 2;
+            RECURRING_BACKUPS  = 3;
         }
 
-        DonateToSignalType donateToSignalType = 1;
-        BadgeList.Badge    badge              = 2;
-        string             label              = 3;
-        DecimalValue       price              = 4;
-        string             currencyCode       = 5;
-        int64              level              = 6;
-        int64              recipient_id       = 7;
-        string             additionalMessage  = 8;
+        InAppPaymentType inAppPaymentType  = 1;
+        BadgeList.Badge  badge             = 2;
+        string           label             = 3;
+        DecimalValue     price             = 4;
+        string           currencyCode      = 5;
+        int64            level             = 6;
+        int64            recipient_id      = 7;
+        string           additionalMessage = 8;
     }
 
     StripeIntentAccessor stripeIntentAccessor = 1;
@@ -384,10 +500,17 @@ message MessageExtras {
         GV2UpdateDescription gv2UpdateDescription = 1;
         signalservice.GroupContext gv1Context = 2;
         ProfileChangeDetails profileChangeDetails = 3;
+        PaymentTombstone paymentTombstone = 4;
     }
 }
 
 message GV2UpdateDescription {
     optional DecryptedGroupV2Context gv2ChangeDescription = 1;
     backup.GroupChangeChatUpdate groupChangeUpdate = 2;
-}
\ No newline at end of file
+}
+
+message PaymentTombstone {
+    optional string note = 1;
+    CryptoValue amount = 2;
+    CryptoValue fee = 3;
+}
diff --git a/app/src/main/protowire/ExternalBackups.proto b/app/src/main/protowire/ExternalBackups.proto
index ce6cbb96b1..bf4db241c5 100644
--- a/app/src/main/protowire/ExternalBackups.proto
+++ b/app/src/main/protowire/ExternalBackups.proto
@@ -11,5 +11,6 @@ package signal;
 option java_package = "org.thoughtcrime.securesms.absbackup.protos";
 
 message SvrAuthToken {
-  repeated string tokens = 1;
+  repeated string svr2Tokens = 1;
+  repeated string svr3Tokens = 2;
 }
\ No newline at end of file
diff --git a/app/src/main/protowire/JobData.proto b/app/src/main/protowire/JobData.proto
index 889a9799b8..6fc7744e87 100644
--- a/app/src/main/protowire/JobData.proto
+++ b/app/src/main/protowire/JobData.proto
@@ -9,11 +9,21 @@ option java_multiple_files = true;
 
 
 message CallSyncEventJobRecord {
-  uint64 recipientId = 1;
-  reserved             2;
-  uint64 callId      = 3;
-  uint32 direction   = 4;
-  uint32 event       = 5;
+
+  enum Event {
+    UNKNOWN_ACTION = 0;
+    ACCEPTED       = 1;
+    NOT_ACCEPTED   = 2;
+    DELETE         = 3;
+    OBSERVED       = 4;
+  }
+
+  uint64 recipientId     = 1;
+  reserved                 2;
+  uint64 callId          = 3;
+  uint32 direction       = 4;
+  uint32 deprecatedEvent = 5; // Deprecated for callEvent.
+  Event  callEvent       = 6;
 }
 
 message CallSyncEventJobData {
@@ -62,3 +72,43 @@ message ArchiveAttachmentBackfillJobData {
 message ArchiveThumbnailUploadJobData {
   uint64 attachmentId = 1;
 }
+
+message InAppPaymentRedemptionJobData {
+  oneof id {
+    uint64 inAppPaymentId = 1;
+    uint64 giftMessageId  = 2;
+  }
+
+  bool makePrimary = 3;
+}
+
+message DeleteSyncJobData {
+  message AddressableMessage {
+    uint64 threadRecipientId = 1;
+    uint64 sentTimestamp = 2;
+    uint64 authorRecipientId = 3;
+  }
+
+  message AttachmentDelete {
+    AddressableMessage targetMessage = 1;
+    optional bytes uuid = 2;
+    optional bytes digest = 3;
+    optional bytes plaintextHash = 4;
+  }
+
+  message ThreadDelete {
+    uint64 threadRecipientId = 1;
+    repeated AddressableMessage messages = 2;
+    bool isFullDelete = 3;
+    repeated AddressableMessage nonExpiringMessages = 4;
+  }
+
+  repeated AddressableMessage messageDeletes = 1;
+  repeated ThreadDelete threadDeletes = 2;
+  repeated ThreadDelete localOnlyThreadDeletes = 3;
+  repeated AttachmentDelete attachmentDeletes = 4;
+}
+
+message Svr3MirrorJobData {
+  optional string serializedChangeSession = 1;
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable-night/delete_sync.xml b/app/src/main/res/drawable-night/delete_sync.xml
new file mode 100644
index 0000000000..8954046cdf
--- /dev/null
+++ b/app/src/main/res/drawable-night/delete_sync.xml
@@ -0,0 +1,38 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="140dp"
+    android:height="92dp"
+    android:viewportWidth="140"
+    android:viewportHeight="92">
+  <path
+      android:pathData="M125.47,2C131.54,2 136.47,6.92 136.47,13L136.47,72.4C136.47,78.48 131.54,83.4 125.47,83.4L38.93,83.4C32.86,83.4 27.93,78.48 27.93,72.4L27.93,13C27.93,6.92 32.86,2 38.93,2L125.47,2Z"
+      android:fillColor="#373D52"/>
+  <path
+      android:pathData="M125.47,0.17C132.55,0.17 138.3,5.91 138.3,13L138.3,72.4C138.3,79.49 132.55,85.24 125.47,85.24L38.93,85.24C31.84,85.24 26.1,79.49 26.1,72.4L26.1,13C26.1,5.91 31.84,0.17 38.93,0.17L125.47,0.17ZM134.63,13C134.63,7.94 130.53,3.84 125.47,3.84L38.93,3.84C33.87,3.84 29.77,7.94 29.77,13L29.77,72.4C29.77,77.46 33.87,81.57 38.93,81.57L125.47,81.57C130.53,81.57 134.63,77.46 134.63,72.4L134.63,13Z"
+      android:fillColor="@color/core_ultramarine_light_50"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M96,58C96,54.69 98.69,52 102,52H125C128.31,52 131,54.69 131,58V66C131,69.31 128.31,72 125,72H102C98.69,72 96,69.31 96,66V58Z"
+      android:fillColor="#6A77DD"/>
+  <path
+      android:pathData="M40,36C40,32.69 42.69,30 46,30H62C65.31,30 68,32.69 68,36V41C68,44.31 65.31,47 62,47H46C42.69,47 40,44.31 40,41V36Z"
+      android:fillColor="#D5D9FD"/>
+  <path
+      android:pathData="M35,17C35,13.69 37.69,11 41,11H77C80.31,11 83,13.69 83,17V22C83,25.31 80.31,28 77,28H41C37.69,28 35,25.31 35,22V17Z"
+      android:fillColor="#D5D9FD"/>
+  <path
+      android:pathData="M3,35.47C3,29.94 7.48,25.47 13,25.47H33.33C38.86,25.47 43.33,29.94 43.33,35.47V80C43.33,85.52 38.86,90 33.33,90H13C7.48,90 3,85.52 3,80L3,35.47Z"
+      android:fillColor="#373D52"/>
+  <path
+      android:pathData="M1.17,35.47C1.17,28.93 6.46,23.63 13,23.63L33.33,23.63C39.87,23.63 45.17,28.93 45.17,35.47V80C45.17,86.54 39.87,91.84 33.33,91.84H13C6.46,91.84 1.17,86.54 1.17,80L1.17,35.47ZM13,27.3C8.49,27.3 4.84,30.96 4.84,35.47L4.84,80C4.84,84.51 8.49,88.17 13,88.17H33.33C37.84,88.17 41.5,84.51 41.5,80V35.47C41.5,30.96 37.84,27.3 33.33,27.3H13Z"
+      android:fillColor="#B6C5FA"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M19.13,70.07C19.13,67.31 21.37,65.07 24.13,65.07H33.93C36.69,65.07 38.93,67.31 38.93,70.07V74.73C38.93,77.49 36.69,79.73 33.93,79.73H24.13C21.37,79.73 19.13,77.49 19.13,74.73V70.07Z"
+      android:fillColor="#6A77DD"/>
+  <path
+      android:pathData="M6.67,56.73C6.67,53.9 8.96,51.6 11.8,51.6H21.33C24.17,51.6 26.47,53.9 26.47,56.73V56.73C26.47,59.57 24.17,61.87 21.33,61.87H11.8C8.96,61.87 6.67,59.57 6.67,56.73V56.73Z"
+      android:fillColor="#D5D9FD"/>
+  <path
+      android:pathData="M6.67,45.27C6.67,42.43 8.96,40.13 11.8,40.13H27.2C30.03,40.13 32.33,42.43 32.33,45.27V45.27C32.33,48.1 30.03,50.4 27.2,50.4H11.8C8.96,50.4 6.67,48.1 6.67,45.27V45.27Z"
+      android:fillColor="#D5D9FD"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_all_devices.xml b/app/src/main/res/drawable-night/ic_all_devices.xml
new file mode 100644
index 0000000000..0be4ae9f27
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_all_devices.xml
@@ -0,0 +1,45 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112dp"
+    android:height="112dp"
+    android:viewportWidth="112"
+    android:viewportHeight="112">
+  <path
+      android:pathData="M15,31C15,26.58 18.58,23 23,23H71C75.42,23 79,26.58 79,31V71C79,75.42 75.42,79 71,79H23C18.58,79 15,75.42 15,71V31Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M14,31C14,26.03 18.03,22 23,22H71C75.97,22 80,26.03 80,31V71C80,75.97 75.97,80 71,80H23C18.03,80 14,75.97 14,71V31ZM23,24C19.13,24 16,27.13 16,31V71C16,74.87 19.13,78 23,78H71C74.87,78 78,74.87 78,71V31C78,27.13 74.87,24 71,24H23Z"
+      android:fillColor="#3B45FD"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M78,71V34.31C76.03,34.11 74.03,34 72,34C47.56,34 26.71,49.39 18.61,71H78Z"
+      android:fillColor="#C1C7FE"/>
+  <path
+      android:pathData="M5,75C5,72.79 6.79,71 9,71H85C87.21,71 89,72.79 89,75V75C89,77.21 87.21,79 85,79H9C6.79,79 5,77.21 5,75V75Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M4,75C4,72.24 6.24,70 9,70H85C87.76,70 90,72.24 90,75C90,77.76 87.76,80 85,80H9C6.24,80 4,77.76 4,75ZM9,72C7.34,72 6,73.34 6,75C6,76.66 7.34,78 9,78H85C86.66,78 88,76.66 88,75C88,73.34 86.66,72 85,72H9Z"
+      android:fillColor="#3B45FD"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M71,37C71,33.69 73.69,31 77,31H101C104.31,31 107,33.69 107,37V73C107,76.31 104.31,79 101,79H77C73.69,79 71,76.31 71,73V37Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M107,53.34V73.5C107,76.81 104.31,79.5 101,79.5H77C73.69,79.5 71,76.81 71,73.5V53.34C76.18,49.96 82.36,48 89,48C95.64,48 101.82,49.96 107,53.34Z"
+      android:fillColor="#C1C7FE"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M70,37C70,33.13 73.13,30 77,30H101C104.87,30 108,33.13 108,37V73C108,76.87 104.87,80 101,80H77C73.13,80 70,76.87 70,73V37ZM77,32C74.24,32 72,34.24 72,37V73C72,75.76 74.24,78 77,78H101C103.76,78 106,75.76 106,73V37C106,34.24 103.76,32 101,32H77Z"
+      android:fillColor="#3B45FD"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M56,57C56,53.69 58.69,51 62,51H74C77.31,51 80,53.69 80,57V85.5C80,88.81 77.31,91.5 74,91.5H62C58.69,91.5 56,88.81 56,85.5V57Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M80,70.56V85.5C80,88.81 77.31,91.5 74,91.5H62C58.69,91.5 56,88.81 56,85.5V70.56C59.45,68.31 63.57,67 68,67C72.43,67 76.55,68.31 80,70.56Z"
+      android:fillColor="#C1C7FE"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M55,57C55,53.13 58.13,50 62,50H74C77.87,50 81,53.13 81,57V85.5C81,89.37 77.87,92.5 74,92.5H62C58.13,92.5 55,89.37 55,85.5V57ZM62,52C59.24,52 57,54.24 57,57V85.5C57,88.26 59.24,90.5 62,90.5H74C76.76,90.5 79,88.26 79,85.5V57C79,54.24 76.76,52 74,52H62Z"
+      android:fillColor="#3B45FD"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_devices.xml b/app/src/main/res/drawable-night/ic_devices.xml
new file mode 100644
index 0000000000..2f3402be1e
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_devices.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112dp"
+    android:height="112dp"
+    android:viewportWidth="112"
+    android:viewportHeight="112">
+  <path
+      android:pathData="M20,31C20,26.58 23.58,23 28,23H76C80.42,23 84,26.58 84,31V71C84,75.42 80.42,79 76,79H28C23.58,79 20,75.42 20,71V31Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M19,31C19,26.03 23.03,22 28,22H76C80.97,22 85,26.03 85,31V71C85,75.97 80.97,80 76,80H28C23.03,80 19,75.97 19,71V31ZM28,24C24.13,24 21,27.13 21,31V71C21,74.87 24.13,78 28,78H76C79.87,78 83,74.87 83,71V31C83,27.13 79.87,24 76,24H28Z"
+      android:fillColor="#3B45FD"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M83,71V34.31C81.03,34.11 79.03,34 77,34C52.56,34 31.71,49.39 23.61,71H83Z"
+      android:fillColor="#C1C7FE"/>
+  <path
+      android:pathData="M10,75C10,72.79 11.79,71 14,71H90C92.21,71 94,72.79 94,75V75C94,77.21 92.21,79 90,79H14C11.79,79 10,77.21 10,75V75Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M9,75C9,72.24 11.24,70 14,70H90C92.76,70 95,72.24 95,75C95,77.76 92.76,80 90,80H14C11.24,80 9,77.76 9,75ZM14,72C12.34,72 11,73.34 11,75C11,76.66 12.34,78 14,78H90C91.66,78 93,76.66 93,75C93,73.34 91.66,72 90,72H14Z"
+      android:fillColor="#3B45FD"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M66,47C66,43.69 68.69,41 72,41H96C99.31,41 102,43.69 102,47V83C102,86.31 99.31,89 96,89H72C68.69,89 66,86.31 66,83V47Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M102,63.34V83.5C102,86.81 99.31,89.5 96,89.5H72C68.69,89.5 66,86.81 66,83.5V63.34C71.18,59.96 77.36,58 84,58C90.64,58 96.82,59.96 102,63.34Z"
+      android:fillColor="#C1C7FE"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M65,47C65,43.13 68.13,40 72,40H96C99.87,40 103,43.13 103,47V83C103,86.87 99.87,90 96,90H72C68.13,90 65,86.87 65,83V47ZM72,42C69.24,42 67,44.24 67,47V83C67,85.76 69.24,88 72,88H96C98.76,88 101,85.76 101,83V47C101,44.24 98.76,42 96,42H72Z"
+      android:fillColor="#3B45FD"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_devices_intro.xml b/app/src/main/res/drawable-night/ic_devices_intro.xml
new file mode 100644
index 0000000000..ab5c17b35a
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_devices_intro.xml
@@ -0,0 +1,66 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="184dp"
+    android:height="112dp"
+    android:viewportWidth="184"
+    android:viewportHeight="112">
+  <path
+      android:pathData="M21,25C21,18.37 26.37,13 33,13H105C111.63,13 117,18.37 117,25V85C117,91.63 111.63,97 105,97H33C26.37,97 21,91.63 21,85V25Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M20,25C20,17.82 25.82,12 33,12H105C112.18,12 118,17.82 118,25V85C118,92.18 112.18,98 105,98H33C25.82,98 20,92.18 20,85V25ZM33,14C26.92,14 22,18.92 22,25V85C22,91.08 26.92,96 33,96H105C111.07,96 116,91.08 116,85V25C116,18.92 111.07,14 105,14H33Z"
+      android:fillColor="#3B45FD"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M116,85V26.53C112.85,26.18 109.65,26 106.41,26C68.35,26 36.07,50.75 24.86,85H116Z"
+      android:fillColor="#C1C7FE"/>
+  <path
+      android:pathData="M6,91C6,87.69 8.69,85 12,85H126C129.31,85 132,87.69 132,91V91C132,94.31 129.31,97 126,97H12C8.69,97 6,94.31 6,91V91Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M5,91C5,87.13 8.13,84 12,84H126C129.87,84 133,87.13 133,91C133,94.87 129.87,98 126,98H12C8.13,98 5,94.87 5,91ZM12,86C9.24,86 7,88.24 7,91C7,93.76 9.24,96 12,96H126C128.76,96 131,93.76 131,91C131,88.24 128.76,86 126,86H12Z"
+      android:fillColor="#3B45FD"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M86,45C86,41.69 88.69,39 92,39H129C132.31,39 135,41.69 135,45V50C135,53.31 132.31,56 129,56H92C88.69,56 86,53.31 86,50V45Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M85,45C85,41.13 88.13,38 92,38H129C132.87,38 136,41.13 136,45V50C136,53.87 132.87,57 129,57H92C88.13,57 85,53.87 85,50V45ZM92,40C89.24,40 87,42.24 87,45V50C87,52.76 89.24,55 92,55H129C131.76,55 134,52.76 134,50V45C134,42.24 131.76,40 129,40H92Z"
+      android:fillColor="#3B45FD"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M106.5,24.5C106.5,20.63 109.63,17.5 113.5,17.5H148.5C152.37,17.5 155.5,20.63 155.5,24.5V24.5C155.5,28.37 152.37,31.5 148.5,31.5H113.5C109.63,31.5 106.5,28.37 106.5,24.5V24.5Z"
+      android:fillColor="#C1C7FE"/>
+  <path
+      android:pathData="M105.5,24.5C105.5,20.08 109.08,16.5 113.5,16.5H148.5C152.92,16.5 156.5,20.08 156.5,24.5C156.5,28.92 152.92,32.5 148.5,32.5H113.5C109.08,32.5 105.5,28.92 105.5,24.5ZM113.5,18.5C110.19,18.5 107.5,21.19 107.5,24.5C107.5,27.81 110.19,30.5 113.5,30.5H148.5C151.81,30.5 154.5,27.81 154.5,24.5C154.5,21.19 151.81,18.5 148.5,18.5H113.5Z"
+      android:fillColor="#3B45FD"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M141,46C141,41.03 145.03,37 150,37H168C172.97,37 177,41.03 177,46V88C177,92.97 172.97,97 168,97H150C145.03,97 141,92.97 141,88V46Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M177,67.36V88C177,92.97 172.97,97 168,97H150C145.03,97 141,92.97 141,88V68.64C146.37,64.9 152.93,62.7 160,62.7C166.22,62.7 172.04,64.4 177,67.36Z"
+      android:fillColor="#C1C7FE"/>
+  <path
+      android:pathData="M140,46C140,40.48 144.48,36 150,36H168C173.52,36 178,40.48 178,46V88C178,93.52 173.52,98 168,98H150C144.48,98 140,93.52 140,88V46ZM150,38C145.58,38 142,41.58 142,46V88C142,92.42 145.58,96 150,96H168C172.42,96 176,92.42 176,88V46C176,41.58 172.42,38 168,38H150Z"
+      android:fillColor="#3B45FD"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M114,24.5C114,23.95 114.45,23.5 115,23.5H148C148.55,23.5 149,23.95 149,24.5V24.5C149,25.05 148.55,25.5 148,25.5H115C114.45,25.5 114,25.05 114,24.5V24.5Z"
+      android:fillColor="#3B45FD"/>
+  <path
+      android:pathData="M93,50C93,49.45 93.45,49 94,49H127C127.55,49 128,49.45 128,50V50C128,50.55 127.55,51 127,51H94C93.45,51 93,50.55 93,50V50Z"
+      android:fillColor="#3B45FD"/>
+  <path
+      android:pathData="M106.5,71C106.5,67.13 109.63,64 113.5,64H148.5C152.37,64 155.5,67.13 155.5,71V71C155.5,74.87 152.37,78 148.5,78H113.5C109.63,78 106.5,74.87 106.5,71V71Z"
+      android:fillColor="#C1C7FE"/>
+  <path
+      android:pathData="M105.5,71C105.5,66.58 109.08,63 113.5,63H148.5C152.92,63 156.5,66.58 156.5,71C156.5,75.42 152.92,79 148.5,79H113.5C109.08,79 105.5,75.42 105.5,71ZM113.5,65C110.19,65 107.5,67.69 107.5,71C107.5,74.31 110.19,77 113.5,77H148.5C151.81,77 154.5,74.31 154.5,71C154.5,67.69 151.81,65 148.5,65H113.5Z"
+      android:fillColor="#3B45FD"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M93,45C93,44.45 93.45,44 94,44H127C127.55,44 128,44.45 128,45V45C128,45.55 127.55,46 127,46H94C93.45,46 93,45.55 93,45V45Z"
+      android:fillColor="#3B45FD"/>
+  <path
+      android:pathData="M114,71C114,70.45 114.45,70 115,70H148C148.55,70 149,70.45 149,71V71C149,71.55 148.55,72 148,72H115C114.45,72 114,71.55 114,71V71Z"
+      android:fillColor="#3B45FD"/>
+</vector>
diff --git a/app/src/main/res/drawable/delete_sync.xml b/app/src/main/res/drawable/delete_sync.xml
new file mode 100644
index 0000000000..6d304d2489
--- /dev/null
+++ b/app/src/main/res/drawable/delete_sync.xml
@@ -0,0 +1,38 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="140dp"
+    android:height="92dp"
+    android:viewportWidth="140"
+    android:viewportHeight="92">
+  <path
+      android:pathData="M125.47,2C131.54,2 136.47,6.92 136.47,13L136.47,72.4C136.47,78.48 131.54,83.4 125.47,83.4L38.93,83.4C32.86,83.4 27.93,78.48 27.93,72.4L27.93,13C27.93,6.92 32.86,2 38.93,2L125.47,2Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M125.47,0.17C132.55,0.17 138.3,5.91 138.3,13L138.3,72.4C138.3,79.49 132.55,85.24 125.47,85.24L38.93,85.24C31.84,85.24 26.1,79.49 26.1,72.4L26.1,13C26.1,5.91 31.84,0.17 38.93,0.17L125.47,0.17ZM134.63,13C134.63,7.94 130.53,3.84 125.47,3.84L38.93,3.84C33.87,3.84 29.77,7.94 29.77,13L29.77,72.4C29.77,77.46 33.87,81.57 38.93,81.57L125.47,81.57C130.53,81.57 134.63,77.46 134.63,72.4L134.63,13Z"
+      android:fillColor="#617092"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M96,58C96,54.69 98.69,52 102,52H125C128.31,52 131,54.69 131,58V66C131,69.31 128.31,72 125,72H102C98.69,72 96,69.31 96,66V58Z"
+      android:fillColor="#B4BCFF"/>
+  <path
+      android:pathData="M40,36C40,32.69 42.69,30 46,30H62C65.31,30 68,32.69 68,36V41C68,44.31 65.31,47 62,47H46C42.69,47 40,44.31 40,41V36Z"
+      android:fillColor="#E4E7FF"/>
+  <path
+      android:pathData="M35,17C35,13.69 37.69,11 41,11H77C80.31,11 83,13.69 83,17V22C83,25.31 80.31,28 77,28H41C37.69,28 35,25.31 35,22V17Z"
+      android:fillColor="#E4E7FF"/>
+  <path
+      android:pathData="M3,35.47C3,29.94 7.48,25.47 13,25.47H33.33C38.86,25.47 43.33,29.94 43.33,35.47V80C43.33,85.52 38.86,90 33.33,90H13C7.48,90 3,85.52 3,80L3,35.47Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M1.17,35.47C1.17,28.93 6.46,23.63 13,23.63L33.33,23.63C39.87,23.63 45.17,28.93 45.17,35.47V80C45.17,86.54 39.87,91.84 33.33,91.84H13C6.46,91.84 1.17,86.54 1.17,80L1.17,35.47ZM13,27.3C8.49,27.3 4.84,30.96 4.84,35.47L4.84,80C4.84,84.51 8.49,88.17 13,88.17H33.33C37.84,88.17 41.5,84.51 41.5,80V35.47C41.5,30.96 37.84,27.3 33.33,27.3H13Z"
+      android:fillColor="#617092"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M19.13,70.07C19.13,67.31 21.37,65.07 24.13,65.07H33.93C36.69,65.07 38.93,67.31 38.93,70.07V74.73C38.93,77.49 36.69,79.73 33.93,79.73H24.13C21.37,79.73 19.13,77.49 19.13,74.73V70.07Z"
+      android:fillColor="#B4BCFF"/>
+  <path
+      android:pathData="M6.67,56.73C6.67,53.9 8.96,51.6 11.8,51.6H21.33C24.17,51.6 26.47,53.9 26.47,56.73V56.73C26.47,59.57 24.17,61.87 21.33,61.87H11.8C8.96,61.87 6.67,59.57 6.67,56.73V56.73Z"
+      android:fillColor="#E4E7FF"/>
+  <path
+      android:pathData="M6.67,45.27C6.67,42.43 8.96,40.13 11.8,40.13H27.2C30.03,40.13 32.33,42.43 32.33,45.27V45.27C32.33,48.1 30.03,50.4 27.2,50.4H11.8C8.96,50.4 6.67,48.1 6.67,45.27V45.27Z"
+      android:fillColor="#E4E7FF"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_all_devices.xml b/app/src/main/res/drawable/ic_all_devices.xml
new file mode 100644
index 0000000000..728d4f03c8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_all_devices.xml
@@ -0,0 +1,45 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112dp"
+    android:height="112dp"
+    android:viewportWidth="112"
+    android:viewportHeight="112">
+  <path
+      android:pathData="M15,31C15,26.58 18.58,23 23,23H71C75.42,23 79,26.58 79,31V71C79,75.42 75.42,79 71,79H23C18.58,79 15,75.42 15,71V31Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M14,31C14,26.03 18.03,22 23,22H71C75.97,22 80,26.03 80,31V71C80,75.97 75.97,80 71,80H23C18.03,80 14,75.97 14,71V31ZM23,24C19.13,24 16,27.13 16,31V71C16,74.87 19.13,78 23,78H71C74.87,78 78,74.87 78,71V31C78,27.13 74.87,24 71,24H23Z"
+      android:fillColor="#020BAC"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M78,71V34.31C76.03,34.11 74.03,34 72,34C47.56,34 26.71,49.39 18.61,71H78Z"
+      android:fillColor="#C1C7FE"/>
+  <path
+      android:pathData="M5,75C5,72.79 6.79,71 9,71H85C87.21,71 89,72.79 89,75C89,77.21 87.21,79 85,79H9C6.79,79 5,77.21 5,75Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M4,75C4,72.24 6.24,70 9,70H85C87.76,70 90,72.24 90,75C90,77.76 87.76,80 85,80H9C6.24,80 4,77.76 4,75ZM9,72C7.34,72 6,73.34 6,75C6,76.66 7.34,78 9,78H85C86.66,78 88,76.66 88,75C88,73.34 86.66,72 85,72H9Z"
+      android:fillColor="#020BAC"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M71,37C71,33.69 73.69,31 77,31H101C104.31,31 107,33.69 107,37V73C107,76.31 104.31,79 101,79H77C73.69,79 71,76.31 71,73V37Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M107,53.34V73.5C107,76.81 104.31,79.5 101,79.5H77C73.69,79.5 71,76.81 71,73.5V53.34C76.18,49.96 82.36,48 89,48C95.64,48 101.82,49.96 107,53.34Z"
+      android:fillColor="#C1C7FE"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M70,37C70,33.13 73.13,30 77,30H101C104.87,30 108,33.13 108,37V73C108,76.87 104.87,80 101,80H77C73.13,80 70,76.87 70,73V37ZM77,32C74.24,32 72,34.24 72,37V73C72,75.76 74.24,78 77,78H101C103.76,78 106,75.76 106,73V37C106,34.24 103.76,32 101,32H77Z"
+      android:fillColor="#020BAC"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M56,57C56,53.69 58.69,51 62,51H74C77.31,51 80,53.69 80,57V85.5C80,88.81 77.31,91.5 74,91.5H62C58.69,91.5 56,88.81 56,85.5V57Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M80,70.56V85.5C80,88.81 77.31,91.5 74,91.5H62C58.69,91.5 56,88.81 56,85.5V70.56C59.45,68.31 63.57,67 68,67C72.43,67 76.55,68.31 80,70.56Z"
+      android:fillColor="#C1C7FE"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M55,57C55,53.13 58.13,50 62,50H74C77.87,50 81,53.13 81,57V85.5C81,89.37 77.87,92.5 74,92.5H62C58.13,92.5 55,89.37 55,85.5V57ZM62,52C59.24,52 57,54.24 57,57V85.5C57,88.26 59.24,90.5 62,90.5H74C76.76,90.5 79,88.26 79,85.5V57C79,54.24 76.76,52 74,52H62Z"
+      android:fillColor="#020BAC"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_continue_no_restore_48.xml b/app/src/main/res/drawable/ic_continue_no_restore_48.xml
new file mode 100644
index 0000000000..b930186f63
--- /dev/null
+++ b/app/src/main/res/drawable/ic_continue_no_restore_48.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="M30.944,1.6H17.056C15.704,1.613 14.412,2.162 13.464,3.126C12.516,4.091 11.989,5.392 12,6.744V41.256C11.989,42.608 12.516,43.91 13.464,44.874C14.412,45.839 15.704,46.387 17.056,46.4H30.944C32.296,46.387 33.588,45.839 34.536,44.874C35.484,43.91 36.011,42.608 36,41.256V6.744C36.011,5.392 35.484,4.091 34.536,3.126C33.588,2.162 32.296,1.613 30.944,1.6ZM17.056,44.8C16.128,44.787 15.243,44.407 14.595,43.743C13.947,43.078 13.589,42.184 13.6,41.256V6.744C13.589,5.816 13.947,4.922 14.595,4.257C15.243,3.593 16.128,3.213 17.056,3.2H30.944C31.872,3.213 32.757,3.593 33.405,4.257C34.053,4.922 34.411,5.816 34.4,6.744V41.256C34.411,42.184 34.053,43.078 33.405,43.743C32.757,44.407 31.872,44.787 30.944,44.8H17.056Z"
+      android:strokeWidth="0.5"
+      android:fillColor="#2C58C3"
+      android:strokeColor="#2C58C3"/>
+  <path
+      android:pathData="M29.279,18.868C29.628,19.092 29.73,19.556 29.507,19.904L23.267,29.654C23.136,29.859 22.913,29.988 22.67,29.999C22.428,30.011 22.194,29.904 22.044,29.712L18.534,25.227C18.279,24.901 18.337,24.43 18.663,24.174C18.989,23.919 19.46,23.977 19.716,24.303L22.574,27.955L28.243,19.096C28.467,18.747 28.93,18.645 29.279,18.868Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0.5"
+      android:fillColor="#2C58C3"
+      android:fillType="evenOdd"
+      android:strokeColor="#2C58C3"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_devices.xml b/app/src/main/res/drawable/ic_devices.xml
new file mode 100644
index 0000000000..d97ba9b284
--- /dev/null
+++ b/app/src/main/res/drawable/ic_devices.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112dp"
+    android:height="112dp"
+    android:viewportWidth="112"
+    android:viewportHeight="112">
+  <path
+      android:pathData="M20,31C20,26.58 23.58,23 28,23H76C80.42,23 84,26.58 84,31V71C84,75.42 80.42,79 76,79H28C23.58,79 20,75.42 20,71V31Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M19,31C19,26.03 23.03,22 28,22H76C80.97,22 85,26.03 85,31V71C85,75.97 80.97,80 76,80H28C23.03,80 19,75.97 19,71V31ZM28,24C24.13,24 21,27.13 21,31V71C21,74.87 24.13,78 28,78H76C79.87,78 83,74.87 83,71V31C83,27.13 79.87,24 76,24H28Z"
+      android:fillColor="#020BAC"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M83,71V34.31C81.03,34.11 79.03,34 77,34C52.56,34 31.71,49.39 23.61,71H83Z"
+      android:fillColor="#C1C7FE"/>
+  <path
+      android:pathData="M10,75C10,72.79 11.79,71 14,71H90C92.21,71 94,72.79 94,75C94,77.21 92.21,79 90,79H14C11.79,79 10,77.21 10,75Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M9,75C9,72.24 11.24,70 14,70H90C92.76,70 95,72.24 95,75C95,77.76 92.76,80 90,80H14C11.24,80 9,77.76 9,75ZM14,72C12.34,72 11,73.34 11,75C11,76.66 12.34,78 14,78H90C91.66,78 93,76.66 93,75C93,73.34 91.66,72 90,72H14Z"
+      android:fillColor="#020BAC"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M66,47C66,43.69 68.69,41 72,41H96C99.31,41 102,43.69 102,47V83C102,86.31 99.31,89 96,89H72C68.69,89 66,86.31 66,83V47Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M102,63.34V83.5C102,86.81 99.31,89.5 96,89.5H72C68.69,89.5 66,86.81 66,83.5V63.34C71.18,59.96 77.36,58 84,58C90.64,58 96.82,59.96 102,63.34Z"
+      android:fillColor="#C1C7FE"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M65,47C65,43.13 68.13,40 72,40H96C99.87,40 103,43.13 103,47V83C103,86.87 99.87,90 96,90H72C68.13,90 65,86.87 65,83V47ZM72,42C69.24,42 67,44.24 67,47V83C67,85.76 69.24,88 72,88H96C98.76,88 101,85.76 101,83V47C101,44.24 98.76,42 96,42H72Z"
+      android:fillColor="#020BAC"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_devices_intro.xml b/app/src/main/res/drawable/ic_devices_intro.xml
new file mode 100644
index 0000000000..71cdfb12c5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_devices_intro.xml
@@ -0,0 +1,66 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="184dp"
+    android:height="112dp"
+    android:viewportWidth="184"
+    android:viewportHeight="112">
+  <path
+      android:pathData="M21,25C21,18.37 26.37,13 33,13H105C111.63,13 117,18.37 117,25V85C117,91.63 111.63,97 105,97H33C26.37,97 21,91.63 21,85V25Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M20,25C20,17.82 25.82,12 33,12H105C112.18,12 118,17.82 118,25V85C118,92.18 112.18,98 105,98H33C25.82,98 20,92.18 20,85V25ZM33,14C26.92,14 22,18.92 22,25V85C22,91.08 26.92,96 33,96H105C111.07,96 116,91.08 116,85V25C116,18.92 111.07,14 105,14H33Z"
+      android:fillColor="#020BAC"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M116,85V26.53C112.85,26.18 109.65,26 106.41,26C68.35,26 36.07,50.75 24.86,85H116Z"
+      android:fillColor="#C1C7FE"/>
+  <path
+      android:pathData="M6,91C6,87.69 8.69,85 12,85H126C129.31,85 132,87.69 132,91C132,94.31 129.31,97 126,97H12C8.69,97 6,94.31 6,91Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M5,91C5,87.13 8.13,84 12,84H126C129.87,84 133,87.13 133,91C133,94.87 129.87,98 126,98H12C8.13,98 5,94.87 5,91ZM12,86C9.24,86 7,88.24 7,91C7,93.76 9.24,96 12,96H126C128.76,96 131,93.76 131,91C131,88.24 128.76,86 126,86H12Z"
+      android:fillColor="#020BAC"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M86,45C86,41.69 88.69,39 92,39H129C132.31,39 135,41.69 135,45V50C135,53.31 132.31,56 129,56H92C88.69,56 86,53.31 86,50V45Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M85,45C85,41.13 88.13,38 92,38H129C132.87,38 136,41.13 136,45V50C136,53.87 132.87,57 129,57H92C88.13,57 85,53.87 85,50V45ZM92,40C89.24,40 87,42.24 87,45V50C87,52.76 89.24,55 92,55H129C131.76,55 134,52.76 134,50V45C134,42.24 131.76,40 129,40H92Z"
+      android:fillColor="#020BAC"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M106.5,24.5C106.5,20.63 109.63,17.5 113.5,17.5H148.5C152.37,17.5 155.5,20.63 155.5,24.5C155.5,28.37 152.37,31.5 148.5,31.5H113.5C109.63,31.5 106.5,28.37 106.5,24.5Z"
+      android:fillColor="#C1C7FE"/>
+  <path
+      android:pathData="M105.5,24.5C105.5,20.08 109.08,16.5 113.5,16.5H148.5C152.92,16.5 156.5,20.08 156.5,24.5C156.5,28.92 152.92,32.5 148.5,32.5H113.5C109.08,32.5 105.5,28.92 105.5,24.5ZM113.5,18.5C110.19,18.5 107.5,21.19 107.5,24.5C107.5,27.81 110.19,30.5 113.5,30.5H148.5C151.81,30.5 154.5,27.81 154.5,24.5C154.5,21.19 151.81,18.5 148.5,18.5H113.5Z"
+      android:fillColor="#020BAC"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M141,46C141,41.03 145.03,37 150,37H168C172.97,37 177,41.03 177,46V88C177,92.97 172.97,97 168,97H150C145.03,97 141,92.97 141,88V46Z"
+      android:fillColor="#E3E8FE"/>
+  <path
+      android:pathData="M177,67.36V88C177,92.97 172.97,97 168,97H150C145.03,97 141,92.97 141,88V68.64C146.37,64.9 152.93,62.7 160,62.7C166.22,62.7 172.04,64.4 177,67.36Z"
+      android:fillColor="#C1C7FE"/>
+  <path
+      android:pathData="M140,46C140,40.48 144.48,36 150,36H168C173.52,36 178,40.48 178,46V88C178,93.52 173.52,98 168,98H150C144.48,98 140,93.52 140,88V46ZM150,38C145.58,38 142,41.58 142,46V88C142,92.42 145.58,96 150,96H168C172.42,96 176,92.42 176,88V46C176,41.58 172.42,38 168,38H150Z"
+      android:fillColor="#020BAC"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M114,24.5C114,23.95 114.45,23.5 115,23.5H148C148.55,23.5 149,23.95 149,24.5C149,25.05 148.55,25.5 148,25.5H115C114.45,25.5 114,25.05 114,24.5Z"
+      android:fillColor="#020BAC"/>
+  <path
+      android:pathData="M93,50C93,49.45 93.45,49 94,49H127C127.55,49 128,49.45 128,50C128,50.55 127.55,51 127,51H94C93.45,51 93,50.55 93,50Z"
+      android:fillColor="#020BAC"/>
+  <path
+      android:pathData="M106.5,71C106.5,67.13 109.63,64 113.5,64H148.5C152.37,64 155.5,67.13 155.5,71C155.5,74.87 152.37,78 148.5,78H113.5C109.63,78 106.5,74.87 106.5,71Z"
+      android:fillColor="#C1C7FE"/>
+  <path
+      android:pathData="M105.5,71C105.5,66.58 109.08,63 113.5,63H148.5C152.92,63 156.5,66.58 156.5,71C156.5,75.42 152.92,79 148.5,79H113.5C109.08,79 105.5,75.42 105.5,71ZM113.5,65C110.19,65 107.5,67.69 107.5,71C107.5,74.31 110.19,77 113.5,77H148.5C151.81,77 154.5,74.31 154.5,71C154.5,67.69 151.81,65 148.5,65H113.5Z"
+      android:fillColor="#020BAC"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M93,45C93,44.45 93.45,44 94,44H127C127.55,44 128,44.45 128,45C128,45.55 127.55,46 127,46H94C93.45,46 93,45.55 93,45Z"
+      android:fillColor="#020BAC"/>
+  <path
+      android:pathData="M114,71C114,70.45 114.45,70 115,70H148C148.55,70 149,70.45 149,71C149,71.55 148.55,72 148,72H115C114.45,72 114,71.55 114,71Z"
+      android:fillColor="#020BAC"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_transfer_local_48.xml b/app/src/main/res/drawable/ic_transfer_local_48.xml
new file mode 100644
index 0000000000..b290196c53
--- /dev/null
+++ b/app/src/main/res/drawable/ic_transfer_local_48.xml
@@ -0,0 +1,14 @@
+<!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="M12.935,36.608C10.02,36.608 8.556,35.171 8.556,32.285V15.285C8.556,12.482 9.965,11.088 12.405,11.088H16.379C17.76,11.088 18.471,11.339 19.392,12.12L20.242,12.817C20.94,13.417 21.511,13.64 22.459,13.64H35.847C38.748,13.64 40.226,15.09 40.226,17.963V32.285C40.226,35.158 38.762,36.608 36.265,36.608H12.935ZM10.801,15.411V18.883H37.981V18.088C37.981,16.638 37.186,15.885 35.805,15.885H21.874C20.493,15.885 19.754,15.62 18.848,14.867L17.997,14.156C17.286,13.556 16.728,13.319 15.808,13.319H12.865C11.526,13.319 10.801,14.03 10.801,15.411ZM12.963,34.363H35.805C37.186,34.363 37.981,33.624 37.981,32.187V20.989H10.801V32.173C10.801,33.624 11.568,34.363 12.963,34.363Z"
+      android:fillColor="#FF000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_check_light_24.xml b/app/src/main/res/drawable/symbol_check_light_24.xml
new file mode 100644
index 0000000000..b025d8f539
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_check_light_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18.9 5.37c0.35 0.22 0.46 0.69 0.23 1.03l-8.32 13c-0.13 0.2-0.35 0.34-0.6 0.35-0.24 0.01-0.47-0.1-0.62-0.29L4.9 13.48c-0.26-0.32-0.2-0.8 0.13-1.05 0.32-0.26 0.8-0.2 1.05 0.13l4.03 5.14 7.75-12.1c0.22-0.35 0.69-0.45 1.03-0.23Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_group_display_bold_40.xml b/app/src/main/res/drawable/symbol_group_display_bold_40.xml
new file mode 100644
index 0000000000..3eed63a1e2
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_group_display_bold_40.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M21.75 12.08c0-3.54 2.4-6.58 5.75-6.58s5.75 3.04 5.75 6.58c0 1.78-0.59 3.48-1.58 4.74-1 1.27-2.46 2.18-4.17 2.18s-3.17-0.9-4.17-2.18c-0.99-1.26-1.58-2.96-1.58-4.74ZM27.5 8c-1.62 0-3.25 1.54-3.25 4.08 0 1.25 0.42 2.4 1.05 3.2 0.64 0.81 1.43 1.22 2.2 1.22 0.77 0 1.56-0.4 2.2-1.22 0.63-0.8 1.05-1.95 1.05-3.2C30.75 9.54 29.12 8 27.5 8Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12.5 21c2.17 0 4.23 0.56 5.98 1.53-0.66 0.57-1.25 1.2-1.77 1.89-1.24-0.58-2.66-0.92-4.21-0.92-4.68 0-8.27 3.08-8.7 6.75h10.73L14.5 31c0 0.6 0.05 1.18 0.14 1.75H3.02c-0.92 0-1.77-0.73-1.77-1.75 0-5.67 5.2-10 11.25-10Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M27.5 21c-6.05 0-11.25 4.33-11.25 10 0 1.02 0.85 1.75 1.77 1.75h18.96c0.92 0 1.77-0.73 1.77-1.75 0-5.67-5.2-10-11.25-10Zm0 2.5c4.68 0 8.27 3.08 8.7 6.75H18.8c0.43-3.67 4.02-6.75 8.7-6.75Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12.5 5.5c-3.35 0-5.75 3.04-5.75 6.58 0 1.78 0.59 3.48 1.58 4.74C9.33 18.1 10.8 19 12.5 19s3.17-0.9 4.17-2.18c0.99-1.26 1.58-2.96 1.58-4.74 0-3.54-2.4-6.58-5.75-6.58Zm-3.25 6.58C9.25 9.54 10.88 8 12.5 8s3.25 1.54 3.25 4.08c0 1.25-0.42 2.4-1.05 3.2-0.64 0.81-1.43 1.22-2.2 1.22-0.77 0-1.56-0.4-2.2-1.22-0.63-0.8-1.05-1.95-1.05-3.2Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_note_24.xml b/app/src/main/res/drawable/symbol_note_24.xml
new file mode 100644
index 0000000000..263ae1a31f
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_note_24.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M8 9.88c-0.48 0-0.88 0.39-0.88 0.87s0.4 0.88 0.88 0.88h8c0.48 0 0.88-0.4 0.88-0.88S16.48 9.87 16 9.87H8Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7.13 14.25c0-0.48 0.39-0.88 0.87-0.88h8c0.48 0 0.88 0.4 0.88 0.88s-0.4 0.88-0.88 0.88H8c-0.48 0-0.88-0.4-0.88-0.88Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M8 16.88c-0.48 0-0.88 0.39-0.88 0.87s0.4 0.88 0.88 0.88h5c0.48 0 0.88-0.4 0.88-0.88s-0.4-0.88-0.88-0.88H8Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9.26 1.63h5.48c0.8 0 1.47 0 2 0.04 0.56 0.04 1.05 0.14 1.52 0.38 0.73 0.37 1.32 0.96 1.7 1.7 0.23 0.46 0.33 0.95 0.37 1.5 0.05 0.54 0.05 1.2 0.05 2.01v9.48c0 0.8 0 1.47-0.05 2-0.04 0.56-0.14 1.05-0.38 1.52-0.37 0.73-0.96 1.32-1.7 1.7-0.46 0.23-0.95 0.33-1.5 0.37-0.54 0.05-1.2 0.05-2.01 0.05H9.26c-0.8 0-1.47 0-2-0.05C6.7 22.3 6.2 22.2 5.74 21.95c-0.73-0.37-1.32-0.96-1.7-1.7-0.23-0.46-0.33-0.95-0.37-1.5-0.05-0.54-0.05-1.2-0.04-2.01V7.26c0-0.8 0-1.47 0.04-2C3.7 4.7 3.8 4.2 4.05 3.74 4.42 3.01 5 2.42 5.75 2.04 6.2 1.82 6.7 1.72 7.24 1.68c0.54-0.05 1.2-0.05 2.01-0.04ZM7.4 3.4c-0.45 0.04-0.69 0.1-0.86 0.2C6.14 3.8 5.8 4.14 5.6 4.54 5.5 4.7 5.45 4.95 5.4 5.4L5.38 6.12h13.24c0-0.27-0.02-0.51-0.03-0.72-0.04-0.45-0.1-0.69-0.2-0.86-0.2-0.4-0.53-0.73-0.93-0.93-0.17-0.1-0.41-0.16-0.86-0.2-0.46-0.03-1.05-0.04-1.9-0.04H9.3c-0.85 0-1.44 0-1.9 0.04ZM5.37 16.7c0 0.85 0 1.44 0.04 1.9 0.04 0.45 0.1 0.69 0.2 0.86 0.2 0.4 0.53 0.73 0.93 0.93 0.17 0.1 0.41 0.16 0.86 0.2 0.46 0.03 1.05 0.04 1.9 0.04h5.4c0.85 0 1.44 0 1.9-0.04 0.45-0.04 0.69-0.1 0.86-0.2 0.4-0.2 0.73-0.53 0.93-0.93 0.1-0.17 0.16-0.41 0.2-0.86 0.03-0.46 0.04-1.05 0.04-1.9V7.88H5.38v8.82Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_note_compact_16.xml b/app/src/main/res/drawable/symbol_note_compact_16.xml
new file mode 100644
index 0000000000..a6832d39db
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_note_compact_16.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M5.38 6.47c-0.36 0-0.65 0.3-0.65 0.65 0 0.36 0.29 0.65 0.65 0.65h5.25c0.35 0 0.65-0.29 0.65-0.65 0-0.35-0.3-0.65-0.65-0.65H5.38Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M4.73 9.5c0-0.36 0.29-0.65 0.65-0.65h5.25c0.35 0 0.65 0.3 0.65 0.65 0 0.36-0.3 0.65-0.65 0.65H5.38c-0.36 0-0.65-0.3-0.65-0.65Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M5.38 11.22c-0.36 0-0.65 0.3-0.65 0.65 0 0.36 0.29 0.66 0.65 0.66h3.37c0.36 0 0.65-0.3 0.65-0.65 0-0.36-0.3-0.66-0.65-0.66H5.38Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6.17 0.85h3.66c0.53 0 0.98 0 1.34 0.03 0.37 0.03 0.71 0.1 1.03 0.26 0.5 0.25 0.9 0.66 1.16 1.16 0.16 0.32 0.23 0.66 0.26 1.03 0.03 0.36 0.03 0.8 0.03 1.34v6.66c0 0.53 0 0.98-0.03 1.34-0.03 0.37-0.1 0.71-0.26 1.03-0.25 0.5-0.66 0.9-1.16 1.16-0.32 0.16-0.66 0.23-1.03 0.26-0.36 0.03-0.8 0.03-1.34 0.03H6.17c-0.53 0-0.98 0-1.34-0.03-0.37-0.03-0.71-0.1-1.03-0.26-0.5-0.25-0.9-0.66-1.16-1.16-0.16-0.32-0.23-0.66-0.26-1.03-0.03-0.36-0.03-0.8-0.03-1.34V4.67c0-0.53 0-0.98 0.03-1.34 0.03-0.37 0.1-0.71 0.26-1.03C2.89 1.8 3.3 1.4 3.8 1.14 4.12 0.98 4.46 0.9 4.83 0.88c0.36-0.03 0.8-0.03 1.34-0.03ZM4.94 2.18C4.64 2.2 4.49 2.24 4.39 2.3c-0.26 0.13-0.46 0.33-0.6 0.59-0.05 0.1-0.1 0.26-0.11 0.55L3.66 3.85h8.68c0-0.16 0-0.29-0.02-0.41-0.02-0.3-0.06-0.45-0.12-0.55-0.13-0.26-0.33-0.46-0.59-0.6-0.1-0.05-0.26-0.1-0.55-0.11-0.3-0.03-0.69-0.03-1.26-0.03H6.2c-0.57 0-0.96 0-1.26 0.03ZM3.65 11.3c0 0.57 0 0.96 0.03 1.26 0.02 0.3 0.06 0.45 0.12 0.55 0.13 0.26 0.33 0.46 0.59 0.6 0.1 0.05 0.26 0.1 0.55 0.11 0.3 0.03 0.69 0.03 1.26 0.03h3.6c0.57 0 0.96 0 1.26-0.03 0.3-0.02 0.45-0.06 0.55-0.12 0.26-0.13 0.46-0.33 0.6-0.59 0.05-0.1 0.1-0.26 0.11-0.55 0.03-0.3 0.03-0.69 0.03-1.26V5.15h-8.7v6.15Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_note_display_bold_40.xml b/app/src/main/res/drawable/symbol_note_display_bold_40.xml
new file mode 100644
index 0000000000..9ed6bc17f2
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_note_display_bold_40.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12.5 16.75c-0.69 0-1.25 0.56-1.25 1.25s0.56 1.25 1.25 1.25h15c0.69 0 1.25-0.56 1.25-1.25s-0.56-1.25-1.25-1.25h-15Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11.25 24c0-0.69 0.56-1.25 1.25-1.25h15c0.69 0 1.25 0.56 1.25 1.25s-0.56 1.25-1.25 1.25h-15c-0.69 0-1.25-0.56-1.25-1.25Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12.5 28.75c-0.69 0-1.25 0.56-1.25 1.25s0.56 1.25 1.25 1.25h10c0.69 0 1.25-0.56 1.25-1.25s-0.56-1.25-1.25-1.25h-10Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13.85 2.75h12.3c1.08 0 1.96 0 2.68 0.06 0.74 0.06 1.42 0.19 2.05 0.51 1 0.5 1.8 1.3 2.3 2.3 0.32 0.63 0.45 1.3 0.51 2.05 0.06 0.72 0.06 1.6 0.06 2.68v19.3c0 1.08 0 1.96-0.06 2.68-0.06 0.74-0.19 1.42-0.51 2.05-0.5 1-1.3 1.8-2.3 2.3-0.63 0.32-1.3 0.45-2.05 0.51-0.72 0.06-1.6 0.06-2.68 0.06h-12.3c-1.08 0-1.96 0-2.68-0.06-0.74-0.06-1.42-0.19-2.05-0.51-1-0.5-1.8-1.3-2.3-2.3-0.32-0.63-0.45-1.3-0.51-2.05-0.06-0.72-0.06-1.6-0.06-2.68v-19.3c0-1.08 0-1.96 0.06-2.68 0.06-0.74 0.19-1.42 0.51-2.05 0.5-1 1.3-1.8 2.3-2.3 0.63-0.32 1.3-0.45 2.05-0.51 0.72-0.06 1.6-0.06 2.68-0.06ZM11.37 5.3c-0.59 0.05-0.9 0.14-1.12 0.25-0.52 0.26-0.94 0.68-1.2 1.2-0.11 0.22-0.2 0.53-0.25 1.12-0.05 0.6-0.05 1.39-0.05 2.53v0.35h22.5V10.4c0-1.14 0-1.92-0.05-2.53-0.05-0.59-0.14-0.9-0.25-1.12-0.26-0.52-0.68-0.94-1.2-1.2-0.22-0.11-0.53-0.2-1.12-0.25-0.6-0.05-1.39-0.05-2.53-0.05H13.9c-1.14 0-1.92 0-2.53 0.05ZM8.75 29.6c0 1.14 0 1.92 0.05 2.53 0.05 0.59 0.14 0.9 0.25 1.12 0.26 0.52 0.68 0.94 1.2 1.2 0.22 0.11 0.53 0.2 1.12 0.25 0.6 0.05 1.39 0.05 2.53 0.05h12.2c1.14 0 1.92 0 2.53-0.05 0.59-0.05 0.9-0.14 1.12-0.25 0.52-0.26 0.94-0.68 1.2-1.2 0.11-0.22 0.2-0.53 0.25-1.12 0.05-0.6 0.05-1.39 0.05-2.53V13.25H8.75V29.6Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_person_display_bold_40.xml b/app/src/main/res/drawable/symbol_person_display_bold_40.xml
new file mode 100644
index 0000000000..4860e8cb74
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_person_display_bold_40.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20 2.25c-4.08 0-7 3.8-7 8.27 0 2.26 0.72 4.4 1.94 6 1.21 1.6 2.99 2.73 5.06 2.73 2.07 0 3.85-1.13 5.06-2.73 1.22-1.6 1.94-3.74 1.94-6 0-4.46-2.92-8.27-7-8.27Zm-4.5 8.27c0-3.54 2.22-5.77 4.5-5.77s4.5 2.23 4.5 5.77c0 1.75-0.56 3.35-1.43 4.49-0.87 1.14-1.97 1.74-3.07 1.74-1.1 0-2.2-0.6-3.07-1.74-0.87-1.14-1.43-2.74-1.43-4.49Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20 21.75c-7.9 0-14.75 5.26-14.75 12.25 0 1.02 0.84 1.75 1.76 1.75H33c0.92 0 1.76-0.73 1.76-1.75 0-7-6.86-12.25-14.75-12.25Zm0 2.5c6.67 0 11.74 4.16 12.21 9H7.8c0.47-4.84 5.54-9 12.21-9Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_stories_compact_16.xml b/app/src/main/res/drawable/symbol_stories_compact_16.xml
new file mode 100644
index 0000000000..d757fc2dbd
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_stories_compact_16.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M8.17 0.85c-0.53 0-0.98 0-1.34 0.03C6.46 0.9 6.12 0.98 5.8 1.14 5.3 1.39 4.9 1.8 4.64 2.3 4.48 2.62 4.4 2.96 4.38 3.33 4.35 3.7 4.35 4.13 4.35 4.67v6.66c0 0.53 0 0.98 0.03 1.34 0.03 0.37 0.1 0.71 0.26 1.03 0.25 0.5 0.66 0.9 1.16 1.16 0.32 0.16 0.66 0.23 1.03 0.26 0.36 0.03 0.8 0.03 1.34 0.03h2.16c0.53 0 0.98 0 1.34-0.03 0.37-0.03 0.71-0.1 1.03-0.26 0.5-0.25 0.9-0.66 1.16-1.16 0.16-0.32 0.23-0.66 0.26-1.03 0.03-0.36 0.03-0.8 0.03-1.34V4.67c0-0.53 0-0.98-0.03-1.34-0.03-0.37-0.1-0.71-0.26-1.03-0.25-0.5-0.66-0.9-1.16-1.16-0.32-0.16-0.66-0.23-1.03-0.26-0.36-0.03-0.8-0.03-1.34-0.03H8.17ZM6.4 2.3c0.1-0.06 0.26-0.1 0.55-0.12 0.3-0.03 0.69-0.03 1.26-0.03h2.1c0.57 0 0.96 0 1.26 0.03 0.3 0.02 0.45 0.06 0.55 0.12 0.26 0.13 0.46 0.33 0.6 0.59 0.05 0.1 0.1 0.26 0.11 0.55 0.03 0.3 0.03 0.69 0.03 1.26v6.6c0 0.57 0 0.96-0.03 1.26-0.02 0.3-0.06 0.45-0.12 0.55-0.13 0.26-0.33 0.46-0.59 0.6-0.1 0.05-0.26 0.1-0.55 0.11-0.3 0.03-0.69 0.03-1.26 0.03H8.2c-0.57 0-0.96 0-1.26-0.03-0.3-0.02-0.45-0.06-0.55-0.12-0.26-0.13-0.46-0.33-0.6-0.59-0.05-0.1-0.1-0.26-0.11-0.55-0.03-0.3-0.03-0.69-0.03-1.26V4.7c0-0.57 0-0.96 0.03-1.26 0.02-0.3 0.06-0.45 0.12-0.55 0.13-0.26 0.33-0.46 0.59-0.6Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3.45 2.32C3.35 2.64 3.3 2.96 3.28 3.24L3.26 3.77 2.7 4C2.48 4.1 2.37 4.18 2.3 4.24 2.16 4.41 2.05 4.63 2.03 4.86c-0.01 0.09 0 0.21 0.06 0.46 0.07 0.25 0.18 0.56 0.35 1.04l0.81 2.21v2.79 0.89l-0.09-0.2c-0.13-0.28-0.26-0.65-0.42-1.09L1.2 6.78c-0.16-0.44-0.3-0.81-0.37-1.12-0.1-0.32-0.14-0.63-0.1-0.96 0.06-0.5 0.28-0.97 0.62-1.34 0.23-0.25 0.5-0.4 0.8-0.55 0.3-0.13 0.66-0.26 1.1-0.42l0.19-0.07Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_stories_display_bold_40.xml b/app/src/main/res/drawable/symbol_stories_display_bold_40.xml
new file mode 100644
index 0000000000..0a3515ae80
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_stories_display_bold_40.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18.35 2.75c-1.08 0-1.96 0-2.68 0.06-0.74 0.06-1.42 0.19-2.05 0.51-1 0.5-1.8 1.3-2.3 2.3-0.32 0.63-0.45 1.3-0.51 2.05-0.06 0.72-0.06 1.6-0.06 2.68v19.3c0 1.08 0 1.96 0.06 2.68 0.06 0.74 0.19 1.42 0.51 2.05 0.5 1 1.3 1.8 2.3 2.3 0.63 0.32 1.3 0.45 2.05 0.51 0.72 0.06 1.6 0.06 2.68 0.06h8.3c1.08 0 1.96 0 2.68-0.06 0.74-0.06 1.42-0.19 2.05-0.51 1-0.5 1.8-1.3 2.3-2.3 0.32-0.63 0.45-1.3 0.51-2.05 0.06-0.72 0.06-1.6 0.06-2.68v-19.3c0-1.08 0-1.96-0.06-2.68-0.06-0.74-0.19-1.42-0.51-2.05-0.5-1-1.3-1.8-2.3-2.3-0.63-0.32-1.3-0.45-2.05-0.51-0.72-0.06-1.6-0.06-2.68-0.06h-8.3Zm-3.6 2.8c0.22-0.11 0.53-0.2 1.12-0.25 0.6-0.05 1.39-0.05 2.53-0.05h8.2c1.14 0 1.92 0 2.53 0.05 0.59 0.05 0.9 0.14 1.12 0.25 0.52 0.26 0.94 0.68 1.2 1.2 0.11 0.22 0.2 0.53 0.25 1.12 0.05 0.6 0.05 1.39 0.05 2.53v19.2c0 1.14 0 1.92-0.05 2.53-0.05 0.59-0.14 0.9-0.25 1.12-0.26 0.52-0.68 0.94-1.2 1.2-0.22 0.11-0.53 0.2-1.12 0.25-0.6 0.05-1.39 0.05-2.53 0.05h-8.2c-1.14 0-1.92 0-2.53-0.05-0.59-0.05-0.9-0.14-1.12-0.25-0.52-0.26-0.94-0.68-1.2-1.2-0.11-0.22-0.2-0.53-0.25-1.12-0.05-0.6-0.05-1.39-0.05-2.53V10.4c0-1.14 0-1.92 0.05-2.53 0.05-0.59 0.14-0.9 0.25-1.12 0.26-0.52 0.68-0.94 1.2-1.2Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9.23 6.33C9.15 6.74 9.1 7.14 9.06 7.53 9.03 8 9.01 8.52 9 9.08 8.18 9.38 7.58 9.6 7.12 9.82c-0.54 0.24-0.8 0.43-0.97 0.62-0.4 0.42-0.65 0.96-0.72 1.54-0.03 0.24 0 0.57 0.15 1.14C5.74 13.7 6 14.43 6.4 15.5L9 22.66v7.3l-0.42-1.15-4.55-12.5c-0.37-1-0.67-1.84-0.86-2.53-0.2-0.72-0.3-1.4-0.22-2.1 0.13-1.1 0.61-2.14 1.37-2.95C4.8 8.21 5.4 7.86 6.07 7.55c0.66-0.3 1.49-0.6 2.5-0.98l0.66-0.24Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_video_compact_16.xml b/app/src/main/res/drawable/symbol_video_compact_16.xml
new file mode 100644
index 0000000000..a3d8df9923
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_video_compact_16.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M4.42 2.35h3.4c0.54 0 0.99 0 1.35 0.03 0.37 0.03 0.71 0.1 1.03 0.26 0.5 0.25 0.9 0.66 1.16 1.16 0.16 0.32 0.23 0.66 0.26 1.03 0.02 0.22 0.03 0.46 0.03 0.73l1.61-1.61c0.88-0.89 2.39-0.26 2.39 0.99v6.12c0 1.25-1.5 1.88-2.39 1l-1.61-1.62c0 0.27-0.01 0.51-0.03 0.73-0.03 0.37-0.1 0.71-0.26 1.03-0.25 0.5-0.66 0.9-1.16 1.16-0.32 0.16-0.66 0.23-1.03 0.26-0.36 0.03-0.8 0.03-1.34 0.03h-3.4c-0.54 0-0.99 0-1.35-0.03-0.37-0.03-0.71-0.1-1.03-0.26-0.5-0.25-0.9-0.66-1.16-1.16-0.16-0.32-0.23-0.66-0.26-1.03C0.6 10.8 0.6 10.37 0.6 9.83V6.17c0-0.53 0-0.98 0.03-1.34 0.03-0.37 0.1-0.71 0.26-1.03 0.25-0.5 0.66-0.9 1.16-1.16C2.37 2.48 2.7 2.4 3.08 2.38c0.36-0.03 0.8-0.03 1.34-0.03Zm5.93 3.85c0-0.57 0-0.96-0.03-1.26-0.02-0.3-0.06-0.45-0.12-0.55-0.13-0.26-0.33-0.46-0.59-0.6-0.1-0.05-0.26-0.1-0.55-0.11-0.3-0.03-0.69-0.03-1.26-0.03H4.45c-0.57 0-0.96 0-1.26 0.03C2.89 3.7 2.74 3.74 2.64 3.8c-0.26 0.13-0.46 0.33-0.6 0.59C2 4.49 1.95 4.65 1.94 4.94 1.9 5.24 1.9 5.63 1.9 6.2v3.6c0 0.57 0 0.96 0.03 1.26 0.02 0.3 0.06 0.45 0.12 0.55 0.13 0.26 0.33 0.46 0.59 0.6 0.1 0.05 0.26 0.1 0.55 0.11 0.3 0.03 0.69 0.03 1.26 0.03H7.8c0.57 0 0.96 0 1.26-0.03 0.3-0.02 0.45-0.06 0.55-0.12 0.26-0.13 0.46-0.33 0.6-0.59 0.05-0.1 0.1-0.26 0.11-0.55 0.03-0.3 0.03-0.69 0.03-1.26V6.2Zm1.3 1.8c0 0.39 0.15 0.76 0.43 1.03l2.1 2.1c0.02 0.03 0.04 0.03 0.05 0.03h0.06l0.05-0.04 0.01-0.06V4.94l-0.01-0.06-0.05-0.04h-0.06c-0.01 0-0.03 0-0.05 0.02l-2.1 2.1C11.8 7.25 11.65 7.62 11.65 8Z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_registration_navigation.xml b/app/src/main/res/layout/activity_registration_navigation.xml
deleted file mode 100644
index 6c015abb3c..0000000000
--- a/app/src/main/res/layout/activity_registration_navigation.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:viewBindingIgnore="true"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".registration.RegistrationNavigationActivity">
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/nav_host_fragment"
-        android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:defaultNavHost="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:navGraph="@navigation/registration" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_registration_navigation_v2.xml b/app/src/main/res/layout/activity_registration_navigation_v2.xml
index 37a71416cd..a0e54602d5 100644
--- a/app/src/main/res/layout/activity_registration_navigation_v2.xml
+++ b/app/src/main/res/layout/activity_registration_navigation_v2.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".registration.v2.ui.RegistrationV2Activity">
+    tools:context=".registration.ui.RegistrationActivity">
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/nav_host_fragment"
@@ -17,6 +17,6 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:navGraph="@navigation/registration_v2" />
+        app:navGraph="@navigation/registration" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_remote_restore.xml b/app/src/main/res/layout/activity_remote_restore.xml
new file mode 100644
index 0000000000..883b564737
--- /dev/null
+++ b/app/src/main/res/layout/activity_remote_restore.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingStart="32dp"
+        android:paddingTop="@dimen/transfer_top_padding"
+        android:paddingEnd="32dp"
+        android:paddingBottom="24dp">
+
+        <TextView
+            android:id="@+id/transfer_or_restore_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            android:gravity="center"
+            android:text="@string/TransferOrRestoreFragment__transfer_or_restore_account"
+            android:textAppearance="@style/Signal.Text.HeadlineMedium" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/transfer_item_spacing"
+            android:gravity="center"
+            android:text="@string/TransferOrRestoreFragment__if_you_have_previously_registered_a_signal_account"
+            android:textAppearance="@style/Signal.Text.BodyLarge"
+            android:textColor="@color/signal_colorOnSurfaceVariant" />
+
+        <org.thoughtcrime.securesms.components.ClippedCardView
+            android:id="@+id/transfer_or_restore_fragment_transfer_card"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            app:cardBackgroundColor="@color/signal_colorSurface2"
+            app:cardCornerRadius="12dp"
+            app:cardElevation="0dp"
+            app:strokeColor="@color/transfer_option_stroke_color_selector"
+            app:strokeWidth="2dp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/transfer_or_restore_fragment_transfer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="16dp">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/transfer_or_restore_fragment_transfer_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_transfer_phone_48"
+                    app:tint="@color/signal_colorPrimary" />
+
+                <TextView
+                    android:id="@+id/transfer_or_restore_fragment_transfer_header"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginEnd="16dp"
+                    android:text="@string/TransferOrRestoreFragment__transfer_from_android_device"
+                    android:textAppearance="@style/Signal.Text.Body"
+                    app:layout_constraintBottom_toTopOf="@+id/transfer_or_restore_fragment_transfer_description"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0"
+                    app:layout_constraintStart_toEndOf="@+id/transfer_or_restore_fragment_transfer_icon"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_chainStyle="packed" />
+
+                <TextView
+                    android:id="@+id/transfer_or_restore_fragment_transfer_description"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:textColor="@color/signal_colorOnSurfaceVariant"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0"
+                    app:layout_constraintStart_toStartOf="@+id/transfer_or_restore_fragment_transfer_header"
+                    app:layout_constraintTop_toBottomOf="@+id/transfer_or_restore_fragment_transfer_header"
+                    tools:text="@string/TransferOrRestoreFragment__transfer_your_account_and_messages_from_your_old_android_device" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </org.thoughtcrime.securesms.components.ClippedCardView>
+
+        <org.thoughtcrime.securesms.components.ClippedCardView
+            android:id="@+id/transfer_or_restore_fragment_restore_remote_card"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            android:visibility="gone"
+            app:cardBackgroundColor="@color/signal_colorSurface2"
+            app:cardCornerRadius="12dp"
+            app:cardElevation="0dp"
+            app:strokeColor="@color/transfer_option_stroke_color_selector"
+            app:strokeWidth="2dp"
+            tools:visibility="visible">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/transfer_or_restore_fragment_restore_remote"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="16dp">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/transfer_or_restore_fragment_restore_remote_icon"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_marginStart="18dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/symbol_backup_light"
+                    app:tint="@color/signal_colorPrimary" />
+
+                <TextView
+                    android:id="@+id/transfer_or_restore_fragment_restore_remote_header"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="18dp"
+                    android:layout_marginEnd="16dp"
+                    android:text="@string/TransferOrRestoreFragment__restore_from_backup"
+                    android:textAppearance="@style/Signal.Text.Body"
+                    app:layout_constraintBottom_toTopOf="@+id/transfer_or_restore_fragment_restore_remote_description"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0"
+                    app:layout_constraintStart_toEndOf="@+id/transfer_or_restore_fragment_restore_remote_icon"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_chainStyle="packed" />
+
+                <TextView
+                    android:id="@+id/transfer_or_restore_fragment_restore_remote_description"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:text="@string/TransferOrRestoreFragment__restore_your_messages_from_a_local_backup"
+                    android:textColor="@color/signal_colorOnSurfaceVariant"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0"
+                    app:layout_constraintStart_toStartOf="@+id/transfer_or_restore_fragment_restore_remote_header"
+                    app:layout_constraintTop_toBottomOf="@+id/transfer_or_restore_fragment_restore_remote_header" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </org.thoughtcrime.securesms.components.ClippedCardView>
+
+        <org.thoughtcrime.securesms.components.ClippedCardView
+            android:id="@+id/transfer_or_restore_fragment_restore_card"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            app:cardBackgroundColor="@color/signal_colorSurface2"
+            app:cardCornerRadius="12dp"
+            app:cardElevation="0dp"
+            app:strokeColor="@color/transfer_option_stroke_color_selector"
+            app:strokeWidth="2dp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/transfer_or_restore_fragment_restore"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="16dp">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/transfer_or_restore_fragment_restore_icon"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_marginStart="18dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/symbol_backup_light"
+                    app:tint="@color/signal_colorPrimary" />
+
+                <TextView
+                    android:id="@+id/transfer_or_restore_fragment_restore_header"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="18dp"
+                    android:layout_marginEnd="16dp"
+                    android:text="@string/TransferOrRestoreFragment__restore_from_backup"
+                    android:textAppearance="@style/Signal.Text.Body"
+                    app:layout_constraintBottom_toTopOf="@+id/transfer_or_restore_fragment_restore_description"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0"
+                    app:layout_constraintStart_toEndOf="@+id/transfer_or_restore_fragment_restore_icon"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_chainStyle="packed" />
+
+                <TextView
+                    android:id="@+id/transfer_or_restore_fragment_restore_description"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:text="@string/TransferOrRestoreFragment__restore_your_messages_from_a_local_backup"
+                    android:textColor="@color/signal_colorOnSurfaceVariant"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0"
+                    app:layout_constraintStart_toStartOf="@+id/transfer_or_restore_fragment_restore_header"
+                    app:layout_constraintTop_toBottomOf="@+id/transfer_or_restore_fragment_restore_header" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </org.thoughtcrime.securesms.components.ClippedCardView>
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/transfer_or_restore_fragment_more_options"
+                style="@style/Widget.Signal.Button.TextButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/TransferOrRestoreFragment__more_options"
+                android:visibility="gone"
+                tools:visibility="visible" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/transfer_or_restore_fragment_next"
+                style="@style/Signal.Widget.Button.Large.Tonal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:text="@string/RegistrationActivity_next" />
+        </FrameLayout>
+    </LinearLayout>
+
+</ScrollView>
diff --git a/app/src/main/res/layout/avatar_picker_fragment.xml b/app/src/main/res/layout/avatar_picker_fragment.xml
index 5835deac5c..09f368e8ae 100644
--- a/app/src/main/res/layout/avatar_picker_fragment.xml
+++ b/app/src/main/res/layout/avatar_picker_fragment.xml
@@ -34,7 +34,6 @@
                 android:layout_height="0dp"
                 android:fontFamily="sans-serif-medium"
                 android:gravity="center"
-                app:emoji_forceCustom="true"
                 app:emoji_forceJumbo="true"
                 app:layout_constraintBottom_toBottomOf="@id/avatar_picker_item_image"
                 app:layout_constraintEnd_toEndOf="@id/avatar_picker_item_image"
diff --git a/app/src/main/res/layout/avatar_picker_item.xml b/app/src/main/res/layout/avatar_picker_item.xml
index d65160801a..3e531811cc 100644
--- a/app/src/main/res/layout/avatar_picker_item.xml
+++ b/app/src/main/res/layout/avatar_picker_item.xml
@@ -24,8 +24,7 @@
         android:fontFamily="sans-serif-medium"
         android:gravity="center"
         tools:text="AF"
-        app:emoji_forceJumbo="true"
-        app:emoji_forceCustom="true"/>
+        app:emoji_forceJumbo="true"/>
 
     <View
         android:id="@+id/avatar_picker_item_fader"
diff --git a/app/src/main/res/layout/boost_loading_preference.xml b/app/src/main/res/layout/boost_loading_preference.xml
new file mode 100644
index 0000000000..78272b1f05
--- /dev/null
+++ b/app/src/main/res/layout/boost_loading_preference.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="@dimen/dsl_settings_gutter"
+    android:layout_marginTop="10dp"
+    android:layout_marginEnd="@dimen/dsl_settings_gutter"
+    android:alpha="0.8">
+
+    <View
+        android:id="@+id/boost_1"
+        android:layout_width="0dp"
+        android:layout_height="58sp"
+        android:background="@drawable/boost_loading_preference_background"
+        app:layout_constraintEnd_toStartOf="@id/boost_2"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/boost_2"
+        android:layout_width="0dp"
+        android:layout_height="58sp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:background="@drawable/boost_loading_preference_background"
+        app:layout_constraintEnd_toStartOf="@id/boost_3"
+        app:layout_constraintStart_toEndOf="@id/boost_1"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/boost_3"
+        android:layout_width="0dp"
+        android:layout_height="58sp"
+        android:background="@drawable/boost_loading_preference_background"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/boost_2"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/boost_4"
+        android:layout_width="0dp"
+        android:layout_height="58sp"
+        android:layout_marginTop="24dp"
+        android:background="@drawable/boost_loading_preference_background"
+        app:layout_constraintEnd_toStartOf="@id/boost_5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/boost_1" />
+
+    <View
+        android:id="@+id/boost_5"
+        android:layout_width="0dp"
+        android:layout_height="58sp"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="20dp"
+        android:background="@drawable/boost_loading_preference_background"
+        app:layout_constraintEnd_toStartOf="@id/boost_6"
+        app:layout_constraintStart_toEndOf="@id/boost_4"
+        app:layout_constraintTop_toBottomOf="@id/boost_2" />
+
+    <View
+        android:id="@+id/boost_6"
+        android:layout_width="0dp"
+        android:layout_height="58sp"
+        android:layout_marginTop="24dp"
+        android:background="@drawable/boost_loading_preference_background"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/boost_5"
+        app:layout_constraintTop_toBottomOf="@id/boost_3" />
+
+    <View
+        android:id="@+id/boost_custom"
+        android:layout_width="0dp"
+        android:layout_height="58sp"
+        android:layout_marginTop="24dp"
+        android:background="@drawable/boost_loading_preference_background"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/boost_4" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/boost_preference.xml b/app/src/main/res/layout/boost_preference.xml
new file mode 100644
index 0000000000..111dad7b17
--- /dev/null
+++ b/app/src/main/res/layout/boost_preference.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="@dimen/dsl_settings_gutter"
+    android:layout_marginTop="10dp"
+    android:layout_marginEnd="@dimen/dsl_settings_gutter"
+    tools:viewBindingIgnore="true">
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/boost_1"
+        style="@style/Signal.Widget.Button.Large.Secondary"
+        android:layout_width="0dp"
+        android:layout_height="58sp"
+        android:textAppearance="@style/Signal.Text.Body"
+        android:textColor="@color/signal_text_primary"
+        app:backgroundTint="@color/signal_selectable_button_background_tint"
+        app:cornerRadius="12dp"
+        app:layout_constraintEnd_toStartOf="@id/boost_2"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:strokeColor="@color/signal_selectable_button_stroke"
+        app:strokeWidth="2dp"
+        tools:text="$3" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/boost_2"
+        style="@style/Signal.Widget.Button.Large.Secondary"
+        android:layout_width="0dp"
+        android:layout_height="58sp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:textAppearance="@style/Signal.Text.Body"
+        android:textColor="@color/signal_text_primary"
+        app:backgroundTint="@color/signal_selectable_button_background_tint"
+        app:cornerRadius="12dp"
+        app:layout_constraintEnd_toStartOf="@id/boost_3"
+        app:layout_constraintStart_toEndOf="@id/boost_1"
+        app:layout_constraintTop_toTopOf="parent"
+        app:strokeColor="@color/signal_selectable_button_stroke"
+        app:strokeWidth="2dp"
+        tools:text="$5" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/boost_3"
+        style="@style/Signal.Widget.Button.Large.Secondary"
+        android:layout_width="0dp"
+        android:layout_height="58sp"
+        android:textAppearance="@style/Signal.Text.Body"
+        android:textColor="@color/signal_text_primary"
+        app:backgroundTint="@color/signal_selectable_button_background_tint"
+        app:cornerRadius="12dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/boost_2"
+        app:layout_constraintTop_toTopOf="parent"
+        app:strokeColor="@color/signal_selectable_button_stroke"
+        app:strokeWidth="2dp"
+        tools:text="$10" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/boost_4"
+        style="@style/Signal.Widget.Button.Large.Secondary"
+        android:layout_width="0dp"
+        android:layout_height="58sp"
+        android:layout_marginTop="24dp"
+        android:textAppearance="@style/Signal.Text.Body"
+        android:textColor="@color/signal_text_primary"
+        app:backgroundTint="@color/signal_selectable_button_background_tint"
+        app:cornerRadius="12dp"
+        app:layout_constraintEnd_toStartOf="@id/boost_5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/boost_1"
+        app:strokeColor="@color/signal_selectable_button_stroke"
+        app:strokeWidth="2dp"
+        tools:text="$20" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/boost_5"
+        style="@style/Signal.Widget.Button.Large.Secondary"
+        android:layout_width="0dp"
+        android:layout_height="58sp"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="20dp"
+        android:textAppearance="@style/Signal.Text.Body"
+        android:textColor="@color/signal_text_primary"
+        app:backgroundTint="@color/signal_selectable_button_background_tint"
+        app:cornerRadius="12dp"
+        app:layout_constraintEnd_toStartOf="@id/boost_6"
+        app:layout_constraintStart_toEndOf="@id/boost_4"
+        app:layout_constraintTop_toBottomOf="@id/boost_2"
+        app:strokeColor="@color/signal_selectable_button_stroke"
+        app:strokeWidth="2dp"
+        tools:text="$50" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/boost_6"
+        style="@style/Signal.Widget.Button.Large.Secondary"
+        android:layout_width="0dp"
+        android:layout_height="58sp"
+        android:layout_marginTop="24dp"
+        android:gravity="center"
+        android:textAppearance="@style/Signal.Text.Body"
+        android:textColor="@color/signal_text_primary"
+        app:backgroundTint="@color/signal_selectable_button_background_tint"
+        app:cornerRadius="12dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/boost_5"
+        app:layout_constraintTop_toBottomOf="@id/boost_3"
+        app:strokeColor="@color/signal_selectable_button_stroke"
+        app:strokeWidth="2dp"
+        tools:text="$100" />
+
+    <androidx.appcompat.widget.AppCompatEditText
+        android:id="@+id/boost_custom"
+        android:layout_width="0dp"
+        android:layout_height="58sp"
+        android:layout_marginTop="24dp"
+        android:background="@drawable/custom_donation_amount_background"
+        android:gravity="center"
+        android:hint="@string/Boost__enter_custom_amount"
+        android:imeOptions="actionDone"
+        android:inputType="numberDecimal"
+        android:textAppearance="@style/Signal.Text.Body"
+        android:textColor="@color/signal_text_primary"
+        android:textColorHint="@color/signal_text_primary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/boost_4" />
+
+    <TextView
+        android:id="@+id/boost_custom_too_small"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:textAlignment="center"
+        android:textAppearance="@style/Signal.Text.BodySmall"
+        android:textColor="@color/signal_colorError"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/boost_custom"
+        tools:text="@string/Boost__the_minimum_amount_you_can_donate_is_s" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/boost_preview_preference.xml b/app/src/main/res/layout/boost_preview_preference.xml
new file mode 100644
index 0000000000..57455708a6
--- /dev/null
+++ b/app/src/main/res/layout/boost_preview_preference.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.badges.BadgeImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
+    android:layout_width="96dp"
+    android:layout_height="96dp"
+    android:layout_gravity="center_horizontal"
+    android:layout_marginTop="24dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/call_participant_item.xml b/app/src/main/res/layout/call_participant_item.xml
index 3a55f51acc..0d744ba636 100644
--- a/app/src/main/res/layout/call_participant_item.xml
+++ b/app/src/main/res/layout/call_participant_item.xml
@@ -90,8 +90,10 @@
         android:layout_height="28dp"
         android:layout_marginStart="@dimen/webrtc_audio_indicator_margin"
         android:layout_marginBottom="@dimen/webrtc_audio_indicator_margin"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        tools:visibility="visible" />
 
     <FrameLayout
         android:id="@+id/call_participant_switch_camera"
diff --git a/app/src/main/res/layout/contact_search_item.xml b/app/src/main/res/layout/contact_search_item.xml
index 4f9e56eb78..907c3843eb 100644
--- a/app/src/main/res/layout/contact_search_item.xml
+++ b/app/src/main/res/layout/contact_search_item.xml
@@ -79,7 +79,6 @@
         android:textAppearance="@style/TextAppearance.Signal.Body2"
         android:textColor="@color/signal_text_secondary"
         android:textDirection="ltr"
-        app:emoji_forceCustom="true"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/label"
@@ -105,24 +104,9 @@
         tools:ignore="RtlSymmetry"
         tools:text="· Mobile" />
 
-    <TextView
-        android:id="@+id/sms_tag"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_marginEnd="20dp"
-        android:text="@string/ContactSelectionListItem__sms"
-        android:textAppearance="@style/TextAppearance.Signal.Body2"
-        android:textColor="@color/signal_text_secondary"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/check_box"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_goneMarginEnd="0dp"
-        tools:visibility="visible" />
-
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/button_barrier"
-        app:constraint_referenced_ids="start_audio,start_video,sms_tag"
+        app:constraint_referenced_ids="start_audio,start_video"
         app:barrierDirection="start"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/contact_search_story_item.xml b/app/src/main/res/layout/contact_search_story_item.xml
index 5d245c91f9..f27c8f14ae 100644
--- a/app/src/main/res/layout/contact_search_story_item.xml
+++ b/app/src/main/res/layout/contact_search_story_item.xml
@@ -94,7 +94,6 @@
         android:textAppearance="@style/TextAppearance.Signal.Body2"
         android:textColor="@color/signal_text_secondary"
         android:textDirection="ltr"
-        app:emoji_forceCustom="true"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@id/name"
diff --git a/app/src/main/res/layout/contact_search_unknown_item.xml b/app/src/main/res/layout/contact_search_unknown_item.xml
index 1591d97d7d..5b4fc10862 100644
--- a/app/src/main/res/layout/contact_search_unknown_item.xml
+++ b/app/src/main/res/layout/contact_search_unknown_item.xml
@@ -79,7 +79,6 @@
         android:textAppearance="@style/TextAppearance.Signal.Body2"
         android:textColor="@color/signal_text_secondary"
         android:textDirection="ltr"
-        app:emoji_forceCustom="true"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/check_box"
diff --git a/app/src/main/res/layout/contact_selection_find_contacts_banner_item.xml b/app/src/main/res/layout/contact_selection_find_contacts_banner_item.xml
index 04e99d3af4..af3825ac33 100644
--- a/app/src/main/res/layout/contact_selection_find_contacts_banner_item.xml
+++ b/app/src/main/res/layout/contact_selection_find_contacts_banner_item.xml
@@ -4,9 +4,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="10dp"
+    android:layout_margin="16dp"
     android:background="@drawable/rounded_outline"
-    android:padding="15dp"
+    android:paddingVertical="24dp"
+    android:paddingHorizontal="16dp"
     tools:viewBindingIgnore="true">
 
     <com.google.android.material.imageview.ShapeableImageView
@@ -36,7 +37,6 @@
         android:id="@+id/description"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
         android:gravity="center"
         android:text="@string/ContactSelectionListFragment__allow_access_to_your_contacts_encrypted"
         android:textAppearance="@style/Signal.Text.BodyMedium"
@@ -46,28 +46,39 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/title" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/no_thanks_button"
-        style="@style/Signal.Widget.Button.Medium.Tonal"
-        android:layout_width="140dp"
+    <com.google.android.flexbox.FlexboxLayout
+        android:id="@+id/permission_buttons"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="10dp"
-        app:layout_constraintTop_toBottomOf="@id/description"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/allow_contacts_button"
-        android:text="@string/RatingManager_no_thanks" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/allow_contacts_button"
-        style="@style/Signal.Widget.Button.Medium.Tonal"
-        android:layout_width="140dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="10dp"
-        app:layout_constraintStart_toEndOf="@id/no_thanks_button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/description"
-        android:text="@string/ContactSelectionListFragment__allow_access" />
+        android:layout_marginTop="4dp"
+        android:layout_marginHorizontal="10dp"
+        app:flexWrap="wrap_reverse">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/no_thanks_button"
+            style="@style/Signal.Widget.Button.Medium.Tonal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:layout_marginHorizontal="6dp"
+            android:minWidth="@dimen/contact_permission_button_min_width"
+            android:text="@string/ContactSelectionListFragment__no_thanks"
+            app:layout_flexGrow="1" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/allow_contacts_button"
+            style="@style/Signal.Widget.Button.Medium.Tonal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:layout_marginHorizontal="6dp"
+            android:minWidth="@dimen/contact_permission_button_min_width"
+            android:text="@string/ContactSelectionListFragment__allow_access"
+            app:layout_flexGrow="1" />
+
+    </com.google.android.flexbox.FlexboxLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/conversation_cannot_send_announcement_group.xml b/app/src/main/res/layout/conversation_cannot_send_announcement_group.xml
index da84790428..07c3303300 100644
--- a/app/src/main/res/layout/conversation_cannot_send_announcement_group.xml
+++ b/app/src/main/res/layout/conversation_cannot_send_announcement_group.xml
@@ -5,7 +5,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/signal_transparent_80"
     android:gravity="center"
     android:padding="17dp"
     style="@style/Signal.Text.Preview"
diff --git a/app/src/main/res/layout/conversation_header_view.xml b/app/src/main/res/layout/conversation_header_view.xml
index d86b25b368..c82918b289 100644
--- a/app/src/main/res/layout/conversation_header_view.xml
+++ b/app/src/main/res/layout/conversation_header_view.xml
@@ -81,7 +81,6 @@
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:textAppearance="@style/Signal.Text.MessageRequest.Subtitle"
-        app:emoji_forceCustom="true"
         app:layout_constraintBottom_toTopOf="@id/message_request_divider"
         app:layout_constraintTop_toBottomOf="@id/message_request_title"
         tools:text="Hangin' on the web" />
diff --git a/app/src/main/res/layout/conversation_input_panel.xml b/app/src/main/res/layout/conversation_input_panel.xml
index dc3008c10f..bf85f3ffa9 100644
--- a/app/src/main/res/layout/conversation_input_panel.xml
+++ b/app/src/main/res/layout/conversation_input_panel.xml
@@ -134,26 +134,35 @@
         app:layout_constraintBottom_toBottomOf="@id/compose_bubble"
         app:layout_constraintStart_toStartOf="@id/compose_bubble"
         app:layout_constraintTop_toBottomOf="@id/compose_bubble_top_elements"
+        app:layout_constraintVertical_bias="1.0"
         app:tint="@color/signal_colorOnSurfaceVariant" />
 
-    <org.thoughtcrime.securesms.components.ComposeText
-        android:id="@+id/embedded_text_editor"
-        style="@style/ComposeEditText"
+    <FrameLayout
+        android:id="@+id/embedded_text_editor_container"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:minHeight="@dimen/conversation_compose_height"
-        android:nextFocusRight="@+id/send_button"
-        android:nextFocusForward="@+id/send_button"
-        android:paddingVertical="8dp"
         app:layout_constraintBottom_toBottomOf="@id/compose_bubble"
         app:layout_constraintEnd_toStartOf="@id/attachment_barrier"
         app:layout_constraintStart_toEndOf="@id/emoji_toggle"
-        app:layout_constraintTop_toBottomOf="@id/compose_bubble_top_elements"
-        tools:hint="Send TextSecure message">
+        android:visibility="visible"
+        app:layout_constraintTop_toBottomOf="@id/compose_bubble_top_elements">
+
+        <org.thoughtcrime.securesms.components.ComposeText
+            android:id="@+id/embedded_text_editor"
+            style="@style/ComposeEditText"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:minHeight="@dimen/conversation_compose_height"
+            android:nextFocusRight="@+id/send_button"
+            android:nextFocusForward="@+id/send_button"
+            android:paddingVertical="8dp"
+            tools:hint="Send TextSecure message">
+
+            <requestFocus />
+        </org.thoughtcrime.securesms.components.ComposeText>
 
-        <requestFocus />
-    </org.thoughtcrime.securesms.components.ComposeText>
+    </FrameLayout>
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/attachment_barrier"
diff --git a/app/src/main/res/layout/conversation_no_longer_a_member.xml b/app/src/main/res/layout/conversation_no_longer_a_member.xml
index ba8661fe9c..d6833db45d 100644
--- a/app/src/main/res/layout/conversation_no_longer_a_member.xml
+++ b/app/src/main/res/layout/conversation_no_longer_a_member.xml
@@ -5,7 +5,6 @@
     android:id="@+id/conversation_no_longer_member_banner"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/signal_background_tertiary"
     android:gravity="center"
     android:paddingStart="16dp"
     android:paddingTop="8dp"
diff --git a/app/src/main/res/layout/conversation_requesting_bottom_banner.xml b/app/src/main/res/layout/conversation_requesting_bottom_banner.xml
index 313999967c..693eb57ec1 100644
--- a/app/src/main/res/layout/conversation_requesting_bottom_banner.xml
+++ b/app/src/main/res/layout/conversation_requesting_bottom_banner.xml
@@ -10,7 +10,6 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/signal_background_tertiary"
         android:gravity="center"
         android:paddingStart="16dp"
         android:paddingTop="8dp"
diff --git a/app/src/main/res/layout/create_profile_fragment.xml b/app/src/main/res/layout/create_profile_fragment.xml
index 3b5b814a89..03787ed541 100644
--- a/app/src/main/res/layout/create_profile_fragment.xml
+++ b/app/src/main/res/layout/create_profile_fragment.xml
@@ -229,7 +229,8 @@
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
-                        app:srcCompat="@drawable/ic_group_24" />
+                        app:srcCompat="@drawable/ic_group_24"
+                        app:tint="@color/signal_icon_tint_primary" />
 
                     <TextView
                         android:id="@+id/who_can_find_me_title"
diff --git a/app/src/main/res/layout/device_transfer_fragment.xml b/app/src/main/res/layout/device_transfer_fragment.xml
deleted file mode 100644
index 627cc63b29..0000000000
--- a/app/src/main/res/layout/device_transfer_fragment.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:viewBindingIgnore="true"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingStart="32dp"
-    android:paddingTop="64dp"
-    android:paddingEnd="32dp"
-    android:paddingBottom="16dp">
-
-    <TextView
-        android:id="@+id/device_transfer_fragment_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:text="@string/DeviceTransfer__transferring_data"
-        android:textAppearance="@style/Signal.Text.Headline.Registration"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/device_transfer_fragment_subtitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:gravity="center"
-        android:text="@string/DeviceTransfer__keep_both_devices_near_each_other"
-        android:textAppearance="@style/TextAppearance.Signal.Body1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/device_transfer_fragment_title" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/device_transfer_fragment_alert"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_warning_40"
-        app:tint="@color/signal_alert_primary" />
-
-    <ProgressBar
-        android:id="@+id/device_transfer_fragment_progress"
-        style="?android:attr/progressBarStyleLarge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/device_Transfer_fragment_middle_content_barrier"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:barrierDirection="bottom"
-        app:constraint_referenced_ids="device_transfer_fragment_alert,device_transfer_fragment_progress" />
-
-    <TextView
-        android:id="@+id/device_transfer_fragment_status"
-        style="@style/TextAppearance.Signal.Body1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/device_Transfer_fragment_middle_content_barrier"
-        tools:text="Status" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/device_transfer_fragment_try_again"
-        style="@style/Signal.Widget.Button.Large.Primary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        android:text="@string/DeviceTransfer__try_again"
-        android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/device_transfer_fragment_cancel"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/device_transfer_fragment_cancel"
-        style="@style/Signal.Widget.Button.Medium.Secondary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/DeviceTransfer__stop_transfer"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/donation_receipt_png.xml b/app/src/main/res/layout/donation_receipt_png.xml
new file mode 100644
index 0000000000..3aff553504
--- /dev/null
+++ b/app/src/main/res/layout/donation_receipt_png.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:viewBindingIgnore="true"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="2180px"
+    android:layout_height="wrap_content"
+    android:background="@color/core_white"
+    android:paddingHorizontal="132px"
+    tools:ignore="PxUsage">
+
+    <ImageView
+        android:id="@+id/logo"
+        android:layout_width="400px"
+        android:layout_height="121.6px"
+        android:layout_marginTop="96px"
+        android:importantForAccessibility="no"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_molly_logo" />
+
+    <TextView
+        android:id="@+id/date"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/core_grey_60"
+        android:textSize="52px"
+        app:layout_constraintBottom_toBottomOf="@id/logo"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/logo"
+        tools:text="Tues, Dec 02, 2021" />
+
+    <View
+        android:id="@+id/divider_1"
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:layout_marginTop="48px"
+        android:background="@color/core_grey_15"
+        app:layout_constraintTop_toBottomOf="@id/logo" />
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="148px"
+        android:text="@string/DonationReceiptDetailsFragment__donation_receipt"
+        android:textColor="@color/core_grey_90"
+        android:textSize="80px"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/divider_1" />
+
+    <TextView
+        android:id="@+id/amount_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="96px"
+        android:text="@string/DonationReceiptDetailsFragment__amount"
+        android:textColor="@color/core_grey_90"
+        android:textSize="68px"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/title" />
+
+    <TextView
+        android:id="@+id/amount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="96px"
+        android:textColor="@color/core_grey_90"
+        android:textSize="68px"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        tools:text="$10.00" />
+
+    <View
+        android:id="@+id/divider_2"
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:layout_marginTop="80px"
+        android:background="@color/core_grey_90"
+        app:layout_constraintTop_toBottomOf="@id/amount" />
+
+    <TextView
+        android:id="@+id/donation_type_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="88px"
+        android:text="@string/DonationReceiptDetailsFragment__donation_type"
+        android:textColor="@color/core_grey_90"
+        android:textSize="68px"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/divider_2" />
+
+    <TextView
+        android:id="@+id/donation_type"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/core_grey_45"
+        android:textSize="52px"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/donation_type_label"
+        tools:text="Sustainer 2 - Recurring" />
+
+    <View
+        android:id="@+id/divider_3"
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:layout_marginTop="40px"
+        android:background="@color/core_grey_20"
+        app:layout_constraintTop_toBottomOf="@id/donation_type" />
+
+    <TextView
+        android:id="@+id/date_paid_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="40px"
+        android:text="@string/DonationReceiptDetailsFragment__date_paid"
+        android:textColor="@color/core_grey_90"
+        android:textSize="68px"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/divider_3" />
+
+    <TextView
+        android:id="@+id/date_paid"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/core_grey_45"
+        android:textSize="52px"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/date_paid_label"
+        tools:text="Nov 10, 2021" />
+
+    <TextView
+        android:id="@+id/thanks"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="88px"
+        android:text="@string/DonationReceiptDetailsFragment__thank_you_for_supporting"
+        android:textColor="@color/core_grey_60"
+        android:textSize="48px"
+        app:layout_constraintTop_toBottomOf="@id/date_paid" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/edit_about_fragment.xml b/app/src/main/res/layout/edit_about_fragment.xml
index 26b3f4cd4f..5bb293652f 100644
--- a/app/src/main/res/layout/edit_about_fragment.xml
+++ b/app/src/main/res/layout/edit_about_fragment.xml
@@ -45,8 +45,7 @@
       android:maxLines="1"
       app:layout_constraintTop_toBottomOf="@id/toolbar"
       app:layout_constraintStart_toEndOf="@id/edit_about_emoji"
-      app:layout_constraintEnd_toStartOf="@id/edit_about_clear"
-      app:emoji_forceCustom="true"/>
+      app:layout_constraintEnd_toStartOf="@id/edit_about_clear"/>
 
   <androidx.appcompat.widget.AppCompatImageView
       android:id="@+id/edit_about_clear"
diff --git a/app/src/main/res/layout/edit_profile_fragment.xml b/app/src/main/res/layout/edit_profile_fragment.xml
index d4dc59887c..9dce276078 100644
--- a/app/src/main/res/layout/edit_profile_fragment.xml
+++ b/app/src/main/res/layout/edit_profile_fragment.xml
@@ -265,7 +265,6 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="24dp"
                     android:textAlignment="viewStart"
-                    app:emoji_forceCustom="true"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/manage_profile_about_icon"
@@ -304,7 +303,6 @@
                     android:layout_marginStart="24dp"
                     android:text="@string/ManageProfileFragment_badges"
                     android:textAlignment="viewStart"
-                    app:emoji_forceCustom="true"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/manage_profile_badges_icon"
diff --git a/app/src/main/res/layout/fragment_change_number_enter_code.xml b/app/src/main/res/layout/fragment_change_number_enter_code.xml
index ec6f8f7174..80aa9fea95 100644
--- a/app/src/main/res/layout/fragment_change_number_enter_code.xml
+++ b/app/src/main/res/layout/fragment_change_number_enter_code.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -10,6 +8,7 @@
 
     <include
         layout="@layout/fragment_registration_enter_code"
+        android:id="@+id/code_entry_layout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/fragment_change_number_enter_phone_number.xml b/app/src/main/res/layout/fragment_change_number_enter_phone_number.xml
index 29f325cacc..2de821b8eb 100644
--- a/app/src/main/res/layout/fragment_change_number_enter_phone_number.xml
+++ b/app/src/main/res/layout/fragment_change_number_enter_phone_number.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/fragment_change_phone_number.xml b/app/src/main/res/layout/fragment_change_phone_number.xml
index 8ca3153f7c..559404fa1e 100644
--- a/app/src/main/res/layout/fragment_change_phone_number.xml
+++ b/app/src/main/res/layout/fragment_change_phone_number.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/fragment_choose_backup_v2.xml b/app/src/main/res/layout/fragment_choose_backup.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_choose_backup_v2.xml
rename to app/src/main/res/layout/fragment_choose_backup.xml
diff --git a/app/src/main/res/layout/fragment_device_transfer_v2.xml b/app/src/main/res/layout/fragment_device_transfer.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_device_transfer_v2.xml
rename to app/src/main/res/layout/fragment_device_transfer.xml
diff --git a/app/src/main/res/layout/fragment_edit_notification_profile.xml b/app/src/main/res/layout/fragment_edit_notification_profile.xml
index 9571de0fdc..b8e061539e 100644
--- a/app/src/main/res/layout/fragment_edit_notification_profile.xml
+++ b/app/src/main/res/layout/fragment_edit_notification_profile.xml
@@ -64,8 +64,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:inputType="textCapSentences"
-            android:maxLines="1"
-            app:emoji_forceCustom="true" />
+            android:maxLines="1" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/fragment_registration_captcha.xml b/app/src/main/res/layout/fragment_registration_captcha.xml
index 26cffc8a82..5087d02906 100644
--- a/app/src/main/res/layout/fragment_registration_captcha.xml
+++ b/app/src/main/res/layout/fragment_registration_captcha.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_registration_captcha_v2.xml b/app/src/main/res/layout/fragment_registration_captcha_v2.xml
deleted file mode 100644
index 5087d02906..0000000000
--- a/app/src/main/res/layout/fragment_registration_captcha_v2.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:background="@color/signal_colorSurface"
-        android:layout_width="match_parent"
-        android:layout_height="0dp">
-
-        <TextView
-            android:id="@+id/registration_captcha_title"
-            style="@style/Signal.Text.HeadlineMedium"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="24dp"
-            android:layout_marginEnd="24dp"
-            android:gravity="center"
-            android:text="@string/RegistrationActivity_we_need_to_verify_that_youre_human"
-            android:textColor="@color/signal_colorOnSurface"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <WebView
-            android:id="@+id/registration_captcha_web_view"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="16dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/registration_captcha_title" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_registration_choose_backup.xml b/app/src/main/res/layout/fragment_registration_choose_backup.xml
deleted file mode 100644
index 40bc0670b9..0000000000
--- a/app/src/main/res/layout/fragment_registration_choose_backup.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:viewBindingIgnore="true">
-
-    <TextView
-        android:id="@+id/choose_backup_fragment_title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginTop="64dp"
-        android:layout_marginEnd="32dp"
-        android:gravity="center"
-        android:text="@string/ChooseBackupFragment__restore_from_backup"
-        android:textAppearance="@style/Signal.Text.HeadlineMedium"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/choose_backup_fragment_message"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="32dp"
-        android:gravity="center"
-        android:text="@string/ChooseBackupFragment__restore_your_messages_and_media"
-        android:textAppearance="@style/Signal.Text.Body"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/choose_backup_fragment_title" />
-
-    <TextView
-        android:id="@+id/choose_backup_fragment_learn_more"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/ChooseBackupFragment__learn_more"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/choose_backup_fragment_message" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/choose_backup_fragment_icon"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="@drawable/circle_tintable"
-        android:contentDescription="@string/ChooseBackupFragment__icon_content_description"
-        android:padding="30dp"
-        app:backgroundTint="@color/signal_colorSurfaceVariant"
-        app:layout_constraintBottom_toTopOf="@+id/choose_backup_fragment_button"
-        app:layout_constraintDimensionRatio="H,1:1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_max="120dp"
-        app:layout_constraintHorizontal_bias="0.498"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/choose_backup_fragment_learn_more"
-        app:layout_constraintWidth_max="120dp"
-        app:srcCompat="@drawable/ic_backup_outline_60"
-        app:tint="@color/signal_colorPrimary" />
-
-    <org.thoughtcrime.securesms.util.views.CircularProgressMaterialButton
-        android:id="@+id/choose_backup_fragment_button"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginEnd="32dp"
-        android:layout_marginBottom="32dp"
-        app:circularProgressMaterialButton__label="@string/ChooseBackupFragment__choose_backup"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:materialThemeOverlay="@style/ThemeOverlay.Signal.CircularProgressIndicator.Primary" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_registration_enter_code.xml b/app/src/main/res/layout/fragment_registration_enter_code.xml
index 2d524588e8..8e833dfc7c 100644
--- a/app/src/main/res/layout/fragment_registration_enter_code.xml
+++ b/app/src/main/res/layout/fragment_registration_enter_code.xml
@@ -5,8 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".registration.fragments.EnterSmsCodeFragment"
-    tools:viewBindingIgnore="true">
+    tools:context=".registration.ui.entercode.EnterCodeFragment">
 
     <ScrollView
         android:id="@+id/scroll_view"
@@ -58,6 +57,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="16dp"
+                android:textAppearance="@style/Signal.Text.BodyMedium"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="@+id/verify_header"
diff --git a/app/src/main/res/layout/fragment_registration_enter_code_v2.xml b/app/src/main/res/layout/fragment_registration_enter_code_v2.xml
deleted file mode 100644
index 3d30f729dd..0000000000
--- a/app/src/main/res/layout/fragment_registration_enter_code_v2.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".registration.v2.ui.entercode.EnterCodeV2Fragment">
-
-    <ScrollView
-        android:id="@+id/scroll_view"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:fillViewport="true">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:context=".registration.fragments.EnterSmsCodeFragment">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/wrong_number"
-                style="@style/Signal.Widget.Button.Large.Secondary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="22dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="@dimen/registrationactivity_text_view_padding"
-                android:hyphenationFrequency="normal"
-                android:maxWidth="150dp"
-                android:text="@string/RegistrationActivity_wrong_number"
-                android:textColor="@color/signal_colorPrimary"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/verification_subheader" />
-
-            <TextView
-                android:id="@+id/verify_header"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="32dp"
-                android:layout_marginTop="40dp"
-                android:gravity="start"
-                android:text="@string/RegistrationActivity_verification_code"
-                android:textAppearance="@style/Signal.Text.HeadlineMedium"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/verification_subheader"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginEnd="16dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toStartOf="@+id/verify_header"
-                app:layout_constraintTop_toBottomOf="@+id/verify_header"
-                tools:text="@string/RegistrationActivity_enter_the_code_we_sent_to_s" />
-
-            <org.thoughtcrime.securesms.components.registration.ActionCountDownButton
-                android:id="@+id/call_me_count_down"
-                style="@style/Signal.Widget.Button.Large.Secondary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/code"
-                android:layout_marginEnd="22dp"
-                android:layout_marginBottom="8dp"
-                android:hyphenationFrequency="normal"
-                android:maxWidth="150dp"
-                android:maxLines="2"
-                android:textColor="@color/signal_text_secondary"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/code"
-                app:layout_constraintVertical_bias="1.0"
-                tools:text="@string/RegistrationActivity_call" />
-
-            <org.thoughtcrime.securesms.components.registration.ActionCountDownButton
-                android:id="@+id/resend_sms_count_down"
-                style="@style/Signal.Widget.Button.Large.Secondary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/code"
-                android:layout_marginStart="22dp"
-                android:layout_marginBottom="8dp"
-                android:hyphenationFrequency="normal"
-                android:maxWidth="150dp"
-                android:maxLines="2"
-                android:textColor="@color/signal_text_secondary"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/call_me_count_down"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/code"
-                app:layout_constraintVertical_bias="1.0"
-                tools:text="@string/RegistrationActivity_resend_code" />
-
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/having_trouble_button"
-                style="@style/Signal.Widget.Button.Large.Secondary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:text="@string/RegistrationActivity_support_bottom_sheet_title"
-                android:textColor="@color/signal_colorPrimary"
-                android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/code" />
-
-            <org.thoughtcrime.securesms.components.registration.VerificationCodeView
-                android:id="@+id/code"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:layout_centerHorizontal="true"
-                android:layout_marginStart="32dp"
-                android:layout_marginTop="32dp"
-                android:layout_marginEnd="32dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/wrong_number" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </ScrollView>
-
-    <org.thoughtcrime.securesms.components.registration.VerificationPinKeyboard
-        android:id="@+id/keyboard"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        tools:visibility="visible" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_registration_enter_phone_number.xml b/app/src/main/res/layout/fragment_registration_enter_phone_number.xml
index 5d7bcd5653..d6b877b0b9 100644
--- a/app/src/main/res/layout/fragment_registration_enter_phone_number.xml
+++ b/app/src/main/res/layout/fragment_registration_enter_phone_number.xml
@@ -6,8 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true"
-    tools:context=".registration.fragments.EnterPhoneNumberFragment"
-    tools:viewBindingIgnore="true">
+    tools:context="org.thoughtcrime.securesms.registration.ui.phonenumber.EnterPhoneNumberFragment">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -51,6 +50,7 @@
                     android:maxLines="1"
                     android:padding="0dp"
                     android:singleLine="true"
+                    android:textColor="?attr/colorOnSurface"
                     tools:text="+1" />
 
             </com.google.android.material.textfield.TextInputLayout>
@@ -62,14 +62,15 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:hint="@string/RegistrationActivity_phone_number_description"
-                app:materialThemeOverlay="@style/Signal.ThemeOverlay.TextInputLayout">
+                android:theme="@style/Signal.ThemeOverlay.TextInputLayout"
+                app:editTextStyle="@style/Signal.ThemeOverlay.TextInputLayout">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:imeOptions="actionDone"
-                    android:inputType="phone">
+                    android:inputType="phone"
+                    android:textColor="?attr/colorOnSurface">
 
                     <requestFocus />
                 </com.google.android.material.textfield.TextInputEditText>
diff --git a/app/src/main/res/layout/fragment_registration_enter_phone_number_v2.xml b/app/src/main/res/layout/fragment_registration_enter_phone_number_v2.xml
deleted file mode 100644
index fea95edc37..0000000000
--- a/app/src/main/res/layout/fragment_registration_enter_phone_number_v2.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/scroll_view"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true"
-    tools:context="org.thoughtcrime.securesms.registration.v2.ui.phonenumber.EnterPhoneNumberV2Fragment">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <LinearLayout
-            android:id="@+id/linearLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="32dp"
-            android:layoutDirection="ltr"
-            android:orientation="horizontal"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/verify_subheader">
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/country_code"
-                style="@style/Widget.Signal.TextInputLayout.Registration.Dropdown"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:theme="@style/Signal.ThemeOverlay.TextInputLayout"
-                app:errorEnabled="false"
-                app:hintEnabled="false">
-
-                <com.google.android.material.textfield.MaterialAutoCompleteTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:digits="+1234567890"
-                    android:drawablePadding="-24dp"
-                    android:hint="@string/Registration_country_code_entry_hint"
-                    android:imeOptions="actionNext"
-                    android:maxLength="4"
-                    android:maxLines="1"
-                    android:padding="0dp"
-                    android:singleLine="true"
-                    tools:text="+1" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/number"
-                style="@style/Widget.Signal.TextInputLayout"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:hint="@string/RegistrationActivity_phone_number_description"
-                app:materialThemeOverlay="@style/Signal.ThemeOverlay.TextInputLayout">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:imeOptions="actionDone"
-                    android:inputType="phone">
-
-                    <requestFocus />
-                </com.google.android.material.textfield.TextInputEditText>
-
-            </com.google.android.material.textfield.TextInputLayout>
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/verify_header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginHorizontal="24dp"
-            android:text="@string/RegistrationActivity_phone_number"
-            android:textAppearance="@style/Signal.Text.HeadlineMedium"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/toolbar" />
-
-        <TextView
-            android:id="@+id/verify_subheader"
-            style="@style/Signal.Text.BodyLarge"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/RegistrationActivity_enter_your_phone_number_to_get_started"
-            android:textColor="@color/signal_colorOnSurfaceVariant"
-            app:layout_constraintTop_toBottomOf="@+id/verify_header"
-            tools:layout_editor_absoluteX="0dp" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/cancel_button"
-            style="@style/Signal.Widget.Button.Large.Secondary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
-            android:text="@android:string/cancel"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:visibility="visible" />
-
-        <org.thoughtcrime.securesms.util.views.CircularProgressMaterialButton
-            android:id="@+id/registerButton"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="32dp"
-            android:layout_marginBottom="16dp"
-            app:circularProgressMaterialButton__label="@string/RegistrationActivity_continue"
-            app:layout_constraintBottom_toTopOf="@+id/cancel_button"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:materialThemeOverlay="@style/ThemeOverlay.Signal.CircularProgressIndicator.Tonal" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_registration_link_device.xml b/app/src/main/res/layout/fragment_registration_link_device.xml
index 64957e1f06..b5b68d8a40 100644
--- a/app/src/main/res/layout/fragment_registration_link_device.xml
+++ b/app/src/main/res/layout/fragment_registration_link_device.xml
@@ -6,8 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true"
-    tools:context=".registration.fragments.LinkDeviceFragment"
-    tools:viewBindingIgnore="true">
+    tools:context=".registration.ui.linkdevice.RegisterAsLinkedDeviceFragment">
 
     <LinearLayout
         android:id="@+id/linearLayout"
diff --git a/app/src/main/res/layout/fragment_registration_link_device_name.xml b/app/src/main/res/layout/fragment_registration_link_device_name.xml
index 4bbafff604..47a15a16b5 100644
--- a/app/src/main/res/layout/fragment_registration_link_device_name.xml
+++ b/app/src/main/res/layout/fragment_registration_link_device_name.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/scroll_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true"
-    tools:context=".registration.fragments.LinkDeviceFragment">
+    tools:context=".registration.ui.linkdevice.EnterDeviceNameFragment">
 
     <LinearLayout
         android:id="@+id/linearLayout"
diff --git a/app/src/main/res/layout/fragment_registration_welcome.xml b/app/src/main/res/layout/fragment_registration_welcome.xml
index 9384ff8a10..5f5a350be4 100644
--- a/app/src/main/res/layout/fragment_registration_welcome.xml
+++ b/app/src/main/res/layout/fragment_registration_welcome.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/fragment_registration_welcome_v2.xml b/app/src/main/res/layout/fragment_registration_welcome_v2.xml
deleted file mode 100644
index 5f5a350be4..0000000000
--- a/app/src/main/res/layout/fragment_registration_welcome_v2.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ImageView
-        android:id="@+id/image"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_margin="16dp"
-        android:importantForAccessibility="no"
-        android:src="@drawable/welcome"
-        app:layout_constraintBottom_toTopOf="@+id/title"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="40dp"
-        android:gravity="center"
-        android:text="@string/RegistrationActivity_take_privacy_with_you_be_yourself_in_every_message"
-        android:textAppearance="@style/Signal.Text.HeadlineMedium"
-        app:layout_constraintBottom_toTopOf="@+id/welcome_terms_button"
-        app:layout_constraintEnd_toEndOf="@+id/welcome_continue_button"
-        app:layout_constraintStart_toStartOf="@+id/welcome_continue_button" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/welcome_terms_button"
-        style="@style/Signal.Widget.Button.Large.Secondary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="24dp"
-        android:gravity="center"
-        android:text="@string/RegistrationActivity_terms_and_privacy"
-        android:textColor="@color/signal_colorOnSurfaceVariant"
-        app:layout_constraintBottom_toTopOf="@+id/welcome_continue_button"
-        app:layout_constraintEnd_toEndOf="@+id/welcome_continue_button"
-        app:layout_constraintStart_toStartOf="@+id/welcome_continue_button" />
-
-    <org.thoughtcrime.securesms.util.views.CircularProgressMaterialButton
-        android:id="@+id/welcome_continue_button"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginEnd="32dp"
-        android:layout_marginBottom="17dp"
-        app:circularProgressMaterialButton__label="@string/RegistrationActivity_continue"
-        app:layout_constraintBottom_toTopOf="@id/welcome_transfer_or_restore"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_goneMarginBottom="@dimen/registration_button_bottom_margin"
-        app:materialThemeOverlay="@style/ThemeOverlay.Signal.CircularProgressIndicator.Tonal" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/welcome_transfer_or_restore"
-        style="@style/Signal.Widget.Button.Large.Secondary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginEnd="32dp"
-        android:layout_marginBottom="24dp"
-        android:text="@string/registration_activity__transfer_or_restore_account"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/welcome_continue_button"
-        app:layout_constraintStart_toStartOf="@+id/welcome_continue_button" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_restore_local_backup_v2.xml b/app/src/main/res/layout/fragment_restore_local_backup.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_restore_local_backup_v2.xml
rename to app/src/main/res/layout/fragment_restore_local_backup.xml
diff --git a/app/src/main/res/layout/fragment_transfer_restore_v2.xml b/app/src/main/res/layout/fragment_transfer_restore_v2.xml
index 883b564737..9d2cd64ebd 100644
--- a/app/src/main/res/layout/fragment_transfer_restore_v2.xml
+++ b/app/src/main/res/layout/fragment_transfer_restore_v2.xml
@@ -129,7 +129,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="18dp"
                     android:layout_marginEnd="16dp"
-                    android:text="@string/TransferOrRestoreFragment__restore_from_backup"
+                    android:text="@string/TransferOrRestoreFragment__restore_from_signal_backup"
                     android:textAppearance="@style/Signal.Text.Body"
                     app:layout_constraintBottom_toTopOf="@+id/transfer_or_restore_fragment_restore_remote_description"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -143,7 +143,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="16dp"
-                    android:text="@string/TransferOrRestoreFragment__restore_your_messages_from_a_local_backup"
+                    android:text="@string/TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup"
                     android:textColor="@color/signal_colorOnSurfaceVariant"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -173,22 +173,22 @@
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/transfer_or_restore_fragment_restore_icon"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_marginStart="18dp"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_marginStart="12dp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/symbol_backup_light"
+                    app:srcCompat="@drawable/ic_transfer_local_48"
                     app:tint="@color/signal_colorPrimary" />
 
                 <TextView
                     android:id="@+id/transfer_or_restore_fragment_restore_header"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="18dp"
+                    android:layout_marginStart="12dp"
                     android:layout_marginEnd="16dp"
-                    android:text="@string/TransferOrRestoreFragment__restore_from_backup"
+                    android:text="@string/TransferOrRestoreFragment__restore_from_local_backup"
                     android:textAppearance="@style/Signal.Text.Body"
                     app:layout_constraintBottom_toTopOf="@+id/transfer_or_restore_fragment_restore_description"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/google_pay_button_pref.xml b/app/src/main/res/layout/google_pay_button_pref.xml
new file mode 100644
index 0000000000..54ede967b0
--- /dev/null
+++ b/app/src/main/res/layout/google_pay_button_pref.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="@dimen/dsl_settings_gutter"
+    android:layout_marginEnd="@dimen/dsl_settings_gutter">
+
+    <include
+        android:id="@+id/googlepay_button"
+        layout="@layout/donate_with_googlepay_button" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/group_recipient_list_item.xml b/app/src/main/res/layout/group_recipient_list_item.xml
index 0cb100a759..67763f019c 100644
--- a/app/src/main/res/layout/group_recipient_list_item.xml
+++ b/app/src/main/res/layout/group_recipient_list_item.xml
@@ -74,7 +74,6 @@
         android:textAlignment="viewStart"
         android:textAppearance="@style/Signal.Text.BodyMedium"
         android:textColor="@color/signal_text_secondary"
-        app:emoji_forceCustom="true"
         app:layout_constraintBottom_toBottomOf="@+id/recipient_avatar"
         app:layout_constraintEnd_toStartOf="@+id/admin"
         app:layout_constraintHorizontal_bias="0"
diff --git a/app/src/main/res/layout/mediasend_document_fragment.xml b/app/src/main/res/layout/mediasend_document_fragment.xml
new file mode 100644
index 0000000000..8948323bfd
--- /dev/null
+++ b/app/src/main/res/layout/mediasend_document_fragment.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="70dp"
+            android:minHeight="94dp"
+            android:src="@drawable/ic_document_large" />
+
+        <TextView
+            android:id="@+id/extension"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:textColor="@color/signal_light_colorOnSurface"
+            style="@style/Signal.Text.Caption"
+            tools:text="pdf" />
+
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="4dp"
+        android:layout_marginHorizontal="16dp"
+        android:singleLine="true"
+        android:ellipsize="middle"
+        android:textColor="@color/signal_colorOnSurface"
+        android:gravity="center"
+        style="@style/Signal.Text.BodyLarge"
+        android:letterSpacing="0"
+        tools:text="thoughts.pdf" />
+
+    <TextView
+        android:id="@+id/size"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/signal_colorOnSurfaceVariant"
+        style="@style/Signal.Text.BodyLarge"
+        tools:text="12 KB" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/my_support_preference.xml b/app/src/main/res/layout/my_support_preference.xml
new file mode 100644
index 0000000000..84e4678ac3
--- /dev/null
+++ b/app/src/main/res/layout/my_support_preference.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?selectableItemBackground"
+    android:paddingStart="@dimen/active_subscription_gutter_start"
+    android:paddingEnd="@dimen/dsl_settings_gutter">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <org.thoughtcrime.securesms.badges.BadgeImageView
+            android:id="@+id/my_support_badge"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            app:badge_size="xlarge"
+            app:layout_constraintBottom_toBottomOf="@id/my_support_expiry"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/my_support_title"
+            tools:src="@drawable/test_gradient" />
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            android:id="@+id/my_support_progress"
+            style="?circularProgressIndicatorStyle"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:indeterminate="true"
+            android:visibility="gone"
+            app:indicatorColor="@color/signal_colorOnSurfaceVariant"
+            app:indicatorSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="visible" />
+
+        <TextView
+            android:id="@+id/my_support_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="22dp"
+            android:layout_marginTop="11dp"
+            android:layout_marginEnd="22dp"
+            android:textAppearance="@style/Signal.Text.BodyLarge"
+            app:layout_constraintEnd_toStartOf="@id/my_support_progress"
+            app:layout_constraintStart_toEndOf="@id/my_support_badge"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Subscription Name" />
+
+        <TextView
+            android:id="@+id/my_support_expiry"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="22dp"
+            android:layout_marginEnd="22dp"
+            android:layout_marginBottom="11dp"
+            android:textAppearance="@style/Signal.Text.BodyMedium"
+            android:textColor="@color/signal_text_secondary"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/my_support_progress"
+            app:layout_constraintStart_toEndOf="@id/my_support_badge"
+            app:layout_constraintTop_toBottomOf="@id/my_support_title"
+            tools:text="$400.00" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/payment_message_view.xml b/app/src/main/res/layout/payment_message_view.xml
index ee3c898167..3c603fff76 100644
--- a/app/src/main/res/layout/payment_message_view.xml
+++ b/app/src/main/res/layout/payment_message_view.xml
@@ -42,6 +42,43 @@
             android:layout_height="20dp"
             android:layout_gravity="center" />
 
+        <LinearLayout
+            android:id="@+id/payment_tombstone"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            android:visibility="gone"
+            android:layout_marginHorizontal="8dp">
+
+            <ImageView
+                android:layout_width="22dp"
+                android:layout_height="22dp"
+                android:layout_marginEnd="7dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/ic_error_outline_24"/>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:orientation="vertical"
+                android:layout_weight="1">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/MessageRecord_payments_restore_tombstone"/>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/TextAppearance.AppCompat.Caption"
+                    android:text="@string/MessageRecord_payments_restore_tombstone_tap_more"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
     </FrameLayout>
 
     <org.thoughtcrime.securesms.components.emoji.EmojiTextView
diff --git a/app/src/main/res/layout/prompt_battery_saver_bottom_sheet.xml b/app/src/main/res/layout/prompt_battery_saver_bottom_sheet.xml
index 17fd1d195d..ba52f42d05 100644
--- a/app/src/main/res/layout/prompt_battery_saver_bottom_sheet.xml
+++ b/app/src/main/res/layout/prompt_battery_saver_bottom_sheet.xml
@@ -32,6 +32,7 @@
         android:layout_gravity="center_horizontal"
         android:gravity="center"
         android:layout_marginTop="16dp"
+        android:layout_marginHorizontal="24dp"
         android:text="@string/PromptBatterySaverBottomSheet__title"
         />
 
@@ -42,7 +43,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:gravity="center"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="8dp"
         android:layout_marginHorizontal="24dp"
         android:text="@string/PromptBatterySaverBottomSheet__message"
         />
@@ -51,9 +52,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:minWidth="320dp"
+        android:minWidth="340dp"
         android:gravity="center_horizontal"
-        android:layout_marginHorizontal="34dp">
+        android:layout_marginHorizontal="24dp">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/dismiss_button"
@@ -63,11 +64,10 @@
             android:layout_gravity="center"
             android:layout_marginTop="32dp"
             android:layout_marginBottom="32dp"
-            android:minWidth="160dp"
+            android:minWidth="170dp"
             android:layout_weight="1"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
-            android:text="@string/PromptBatterySaverBottomSheet__dismiss"/>
+            android:layout_marginEnd="12dp"
+            android:text="@string/PromptBatterySaverBottomSheet__no_thanks"/>
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/continue_button"
@@ -77,10 +77,9 @@
             android:layout_gravity="center"
             android:layout_marginTop="32dp"
             android:layout_marginBottom="32dp"
-            android:minWidth="160dp"
+            android:minWidth="170dp"
             android:layout_weight="1"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
+            android:layout_marginStart="12dp"
             android:text="@string/PromptBatterySaverBottomSheet__continue"/>
 
     </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_emoji_item.xml b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_emoji_item.xml
index 3fe4af0f84..62e05ee0a2 100644
--- a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_emoji_item.xml
+++ b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_emoji_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
@@ -20,8 +19,7 @@
         android:layout_height="20dp"
         android:layout_marginEnd="4dp"
         android:gravity="center"
-        android:textStyle="bold"
-        app:emoji_forceCustom="true" />
+        android:textStyle="bold" />
 
     <TextView
         android:id="@+id/reactions_bottom_view_emoji_item_text"
diff --git a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recipient_item.xml b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recipient_item.xml
index 3345640252..3bf0b92a84 100644
--- a/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recipient_item.xml
+++ b/app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recipient_item.xml
@@ -51,7 +51,6 @@
         android:layout_marginEnd="16dp"
         android:gravity="center"
         android:textSize="22dp"
-        app:emoji_forceCustom="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/recipient_bottom_sheet.xml b/app/src/main/res/layout/recipient_bottom_sheet.xml
index 7626a7657e..8221005536 100644
--- a/app/src/main/res/layout/recipient_bottom_sheet.xml
+++ b/app/src/main/res/layout/recipient_bottom_sheet.xml
@@ -82,7 +82,6 @@
             android:layout_marginEnd="@dimen/dsl_settings_gutter"
             android:gravity="center"
             android:textColor="@color/signal_text_secondary"
-            app:emoji_forceCustom="true"
             app:layout_constraintTop_toBottomOf="@id/rbs_full_name"
             tools:text="🕷🕷🕷 Hangin' on the web 🕷🕷🕷" />
 
diff --git a/app/src/main/res/layout/signal_progress_dialog.xml b/app/src/main/res/layout/signal_progress_dialog.xml
new file mode 100644
index 0000000000..484f9b9682
--- /dev/null
+++ b/app/src/main/res/layout/signal_progress_dialog.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:id="@+id/progress_dialog_progressbar"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginTop="62dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:indicatorColor="@color/signal_colorPrimary"
+        app:trackColor="@color/signal_colorPrimaryContainer" />
+
+    <TextView
+        android:id="@+id/progress_dialog_title"
+        style="@style/Signal.Text.BodyMedium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/progress_dialog_progressbar" />
+
+    <TextView
+        android:id="@+id/progress_dialog_message"
+        style="@style/Signal.Text.Caption"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="38dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/progress_dialog_title" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/subscribe_learn_more_bottom_sheet_dialog_fragment.xml b/app/src/main/res/layout/subscribe_learn_more_bottom_sheet_dialog_fragment.xml
new file mode 100644
index 0000000000..9d295aa932
--- /dev/null
+++ b/app/src/main/res/layout/subscribe_learn_more_bottom_sheet_dialog_fragment.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
+
+    <ImageView
+        android:id="@+id/subscribe_bottom_sheet_handle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="20dp"
+        android:importantForAccessibility="no"
+        app:srcCompat="@drawable/bottom_sheet_handle" />
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fillViewport="true">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/subscribe_bottom_sheet_heart"
+                android:layout_width="76dp"
+                android:layout_height="74dp"
+                android:layout_marginTop="16dp"
+                android:importantForAccessibility="no"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@drawable/ic_sustainer_heart" />
+
+            <TextView
+                android:id="@+id/subscribe_bottom_sheet_headline"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dsl_settings_gutter"
+                android:layout_marginTop="28dp"
+                android:layout_marginEnd="@dimen/dsl_settings_gutter"
+                android:gravity="center"
+                android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__signal_is_different"
+                android:textAppearance="@style/Signal.Text.HeadlineMedium"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/subscribe_bottom_sheet_heart" />
+
+            <TextView
+                android:id="@+id/subscribe_bottom_sheet_subhead"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dsl_settings_gutter"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="@dimen/dsl_settings_gutter"
+                android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__private_messaging"
+                android:textAppearance="@style/Signal.Text.BodyLarge"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/subscribe_bottom_sheet_headline" />
+
+            <TextView
+                android:id="@+id/subscribe_bottom_sheet_the_team"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dsl_settings_gutter"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="@dimen/dsl_settings_gutter"
+                android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__signal_is_supported_by"
+                android:textAppearance="@style/Signal.Text.BodyLarge"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/subscribe_bottom_sheet_subhead" />
+
+            <TextView
+                android:id="@+id/subscribe_bottom_sheet_your_contribution"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dsl_settings_gutter"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="@dimen/dsl_settings_gutter"
+                android:paddingBottom="36dp"
+                android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__if_you_can"
+                android:textAppearance="@style/Signal.Text.BodyLarge"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/subscribe_bottom_sheet_the_team" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+</LinearLayout>
diff --git a/app/src/main/res/layout/subscription_currency_selection.xml b/app/src/main/res/layout/subscription_currency_selection.xml
new file mode 100644
index 0000000000..754275f600
--- /dev/null
+++ b/app/src/main/res/layout/subscription_currency_selection.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/dsl_settings_gutter"
+    android:paddingEnd="@dimen/dsl_settings_gutter"
+    tools:viewBindingIgnore="true">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/subscription_currency_selection_spinner"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/currency_selection_background"
+        android:drawablePadding="8dp"
+        android:gravity="center"
+        android:minHeight="32dp"
+        android:paddingHorizontal="12dp"
+        android:paddingVertical="8dp"
+        android:textAppearance="@style/Signal.Text.LabelMedium"
+        android:textColor="@color/currency_selector_text_color"
+        app:drawableEndCompat="@drawable/ic_chevron_16"
+        app:drawableTint="@color/signal_colorOutline"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="USD" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/subscription_flow_badge_preview_preference.xml b/app/src/main/res/layout/subscription_flow_badge_preview_preference.xml
new file mode 100644
index 0000000000..2fddb2061e
--- /dev/null
+++ b/app/src/main/res/layout/subscription_flow_badge_preview_preference.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="8dp">
+
+        <org.thoughtcrime.securesms.components.AvatarImageView
+            android:id="@+id/avatar"
+            android:layout_width="88dp"
+            android:layout_height="88dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <org.thoughtcrime.securesms.badges.BadgeImageView
+            android:id="@+id/badge"
+            android:layout_width="33dp"
+            android:layout_height="33dp"
+            android:contentDescription="@string/BadgesOverviewFragment__featured_badge"
+            app:badge_size="large"
+            app:layout_constraintBottom_toBottomOf="@id/avatar"
+            app:layout_constraintEnd_toEndOf="@id/avatar" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/subscription_preference.xml b/app/src/main/res/layout/subscription_preference.xml
new file mode 100644
index 0000000000..5b067747ea
--- /dev/null
+++ b/app/src/main/res/layout/subscription_preference.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="@dimen/dsl_settings_gutter"
+    android:layout_marginTop="10dp"
+    android:layout_marginEnd="@dimen/dsl_settings_gutter"
+    android:background="@drawable/subscription_row_item_background"
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="12dp">
+
+    <org.thoughtcrime.securesms.badges.BadgeImageView
+        android:id="@+id/badge"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        app:badge_size="xlarge"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:textAppearance="@style/TextAppearance.Signal.Body1.Bold"
+        app:layout_constraintEnd_toStartOf="@id/check"
+        app:layout_constraintStart_toEndOf="@id/badge"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Subscription Name" />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/check"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:importantForAccessibility="no"
+        app:layout_constraintBottom_toBottomOf="@id/title"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/title"
+        app:layout_constraintTop_toTopOf="@id/title"
+        app:srcCompat="@drawable/ic_check_24"
+        app:tint="@color/signal_inverse_primary" />
+
+    <TextView
+        android:id="@+id/tagline"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:textAppearance="@style/TextAppearance.Signal.Body2"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/badge"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        tools:text="Earn a badge!" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/subscription_preference_loader.xml b/app/src/main/res/layout/subscription_preference_loader.xml
new file mode 100644
index 0000000000..2001e11b7a
--- /dev/null
+++ b/app/src/main/res/layout/subscription_preference_loader.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:viewBindingIgnore="true"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
+        android:layout_marginStart="@dimen/dsl_settings_gutter"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="@dimen/dsl_settings_gutter"
+        android:background="@drawable/subscription_loading_preference_background" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
+        android:layout_marginStart="@dimen/dsl_settings_gutter"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="@dimen/dsl_settings_gutter"
+        android:background="@drawable/subscription_loading_preference_background" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
+        android:layout_marginStart="@dimen/dsl_settings_gutter"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="@dimen/dsl_settings_gutter"
+        android:background="@drawable/subscription_loading_preference_background" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/text_avatar_creation_fragment_content_hidden_recycler.xml b/app/src/main/res/layout/text_avatar_creation_fragment_content_hidden_recycler.xml
index 0232587eae..6b55709296 100644
--- a/app/src/main/res/layout/text_avatar_creation_fragment_content_hidden_recycler.xml
+++ b/app/src/main/res/layout/text_avatar_creation_fragment_content_hidden_recycler.xml
@@ -41,7 +41,6 @@
             app:layout_constraintEnd_toEndOf="@id/avatar_picker_item_image"
             app:layout_constraintStart_toStartOf="@id/avatar_picker_item_image"
             app:layout_constraintTop_toTopOf="@id/avatar_picker_item_image"
-            app:emoji_forceCustom="true"
             tools:ignore="SpUsage"
             tools:text="AF" />
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/thanks_for_your_support_bottom_sheet_dialog_fragment.xml b/app/src/main/res/layout/thanks_for_your_support_bottom_sheet_dialog_fragment.xml
new file mode 100644
index 0000000000..3655218acd
--- /dev/null
+++ b/app/src/main/res/layout/thanks_for_your_support_bottom_sheet_dialog_fragment.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
+
+    <ImageView
+        android:id="@+id/thanks_bottom_sheet_handle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="20dp"
+        android:importantForAccessibility="no"
+        app:srcCompat="@drawable/bottom_sheet_handle" />
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fillViewport="true">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="16dp">
+
+            <TextView
+                android:id="@+id/thanks_bottom_sheet_heading"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dsl_settings_gutter"
+                android:layout_marginTop="12dp"
+                android:layout_marginEnd="@dimen/dsl_settings_gutter"
+                android:gravity="center"
+                android:text="@string/SubscribeThanksForYourSupportBottomSheetDialogFragment__thanks_for_your_support"
+                android:textAppearance="@style/Signal.Text.TitleLarge"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/thanks_bottom_sheet_badge" />
+
+            <TextView
+                android:id="@+id/thanks_bottom_sheet_subhead"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dsl_settings_gutter"
+                android:layout_marginTop="6dp"
+                android:layout_marginEnd="@dimen/dsl_settings_gutter"
+                android:gravity="center"
+                android:textAppearance="@style/Signal.Text.BodyLarge"
+                android:textColor="@color/signal_colorOnSurfaceVariant"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/thanks_bottom_sheet_heading"
+                tools:text="@string/SubscribeThanksForYourSupportBottomSheetDialogFragment__thanks_for_your_support" />
+
+            <org.thoughtcrime.securesms.badges.BadgeImageView
+                android:id="@+id/thanks_bottom_sheet_badge"
+                android:layout_width="112dp"
+                android:layout_height="112dp"
+                android:layout_marginTop="26dp"
+                app:badge_size="xlarge"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:src="@drawable/test_gradient" />
+
+            <com.airbnb.lottie.LottieAnimationView
+                android:id="@+id/thanks_bottom_sheet_lottie"
+                android:layout_width="112dp"
+                android:layout_height="112dp"
+                app:layout_constraintBottom_toBottomOf="@id/thanks_bottom_sheet_badge"
+                app:layout_constraintEnd_toEndOf="@id/thanks_bottom_sheet_badge"
+                app:layout_constraintStart_toStartOf="@id/thanks_bottom_sheet_badge"
+                app:layout_constraintTop_toTopOf="@id/thanks_bottom_sheet_badge"
+                app:lottie_rawRes="@raw/lottie_rocket" />
+
+            <View
+                android:id="@+id/thanks_bottom_sheet_control_outline"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:background="@drawable/rounded_outline"
+                app:layout_constraintBottom_toBottomOf="@id/thanks_bottom_sheet_control_text"
+                app:layout_constraintEnd_toEndOf="@id/thanks_bottom_sheet_switch"
+                app:layout_constraintStart_toStartOf="@id/thanks_bottom_sheet_control_text"
+                app:layout_constraintTop_toTopOf="@id/thanks_bottom_sheet_control_text" />
+
+            <TextView
+                android:id="@+id/thanks_bottom_sheet_control_text"
+                android:layout_width="0dp"
+                android:layout_height="48sp"
+                android:layout_marginStart="@dimen/dsl_settings_gutter"
+                android:layout_marginTop="36dp"
+                android:layout_marginEnd="@dimen/dsl_settings_gutter"
+                android:gravity="center_vertical"
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp"
+                android:text="@string/SubscribeThanksForYourSupportBottomSheetDialogFragment__display_on_profile"
+                android:textAppearance="@style/TextAppearance.Signal.Body1"
+                app:layout_constraintEnd_toStartOf="@id/thanks_bottom_sheet_switch"
+                app:layout_constraintHorizontal_chainStyle="spread"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/thanks_bottom_sheet_subhead" />
+
+            <com.google.android.material.materialswitch.MaterialSwitch
+                style="@style/Widget.Signal.CompoundButton.MaterialSwitch"
+                android:id="@+id/thanks_bottom_sheet_switch"
+                android:layout_width="wrap_content"
+                android:layout_height="48sp"
+                android:layout_marginEnd="@dimen/dsl_settings_gutter"
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp"
+                app:layout_constraintBottom_toBottomOf="@id/thanks_bottom_sheet_control_text"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/thanks_bottom_sheet_control_text"
+                app:layout_constraintTop_toTopOf="@id/thanks_bottom_sheet_control_text" />
+
+            <TextView
+                android:id="@+id/thanks_bottom_sheet_featured_note"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="40dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginEnd="40dp"
+                android:text="@string/ThanksForYourSupportBottomSheetFragment__when_you_have_more"
+                android:textAppearance="@style/Signal.Text.BodyMedium"
+                android:textColor="@color/signal_colorOnSurfaceVariant"
+                android:visibility="gone"
+                app:layout_constraintTop_toBottomOf="@id/thanks_bottom_sheet_control_outline"
+                tools:visibility="visible" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/thanks_bottom_sheet_done"
+                style="@style/Signal.Widget.Button.Large.Primary"
+                android:layout_width="0dp"
+                android:layout_height="48sp"
+                android:layout_marginStart="@dimen/dsl_settings_gutter"
+                android:layout_marginTop="48dp"
+                android:layout_marginEnd="@dimen/dsl_settings_gutter"
+                android:layout_marginBottom="16dp"
+                android:text="@string/SubscribeThanksForYourSupportBottomSheetDialogFragment__continue"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/thanks_bottom_sheet_featured_note"
+                app:layout_goneMarginTop="72dp" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/transfer_or_restore_options_bottom_sheet_dialog_fragment.xml b/app/src/main/res/layout/transfer_or_restore_options_bottom_sheet_dialog_fragment.xml
new file mode 100644
index 0000000000..1cb7f1e273
--- /dev/null
+++ b/app/src/main/res/layout/transfer_or_restore_options_bottom_sheet_dialog_fragment.xml
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:paddingHorizontal="24dp"
+    android:orientation="vertical"
+    android:background="@color/signal_colorSurface1"
+    >
+
+    <ImageView
+        android:id="@+id/pull_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="12dp"
+        android:layout_marginBottom="48dp"
+        android:src="@drawable/bottom_sheet_handle"
+        tools:ignore="ContentDescription" />
+
+    <org.thoughtcrime.securesms.components.ClippedCardView
+        android:id="@+id/transfer_card"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        app:cardBackgroundColor="@color/signal_colorSurface"
+        app:cardCornerRadius="12dp"
+        app:cardElevation="0dp"
+        app:strokeColor="@color/transfer_option_stroke_color_selector"
+        app:strokeWidth="2dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/transfer_or_restore_fragment_transfer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingVertical="16dp">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/transfer_or_restore_fragment_transfer_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@drawable/ic_transfer_phone_48"
+                app:tint="@color/signal_colorPrimary" />
+
+            <TextView
+                android:id="@+id/transfer_or_restore_fragment_transfer_header"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/TransferOrRestoreFragment__transfer_from_android_device"
+                android:textAppearance="@style/Signal.Text.Body"
+                app:layout_constraintBottom_toTopOf="@+id/transfer_or_restore_fragment_transfer_description"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0"
+                app:layout_constraintStart_toEndOf="@+id/transfer_or_restore_fragment_transfer_icon"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed" />
+
+            <TextView
+                android:id="@+id/transfer_or_restore_fragment_transfer_description"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
+                android:textColor="@color/signal_colorOnSurfaceVariant"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0"
+                app:layout_constraintStart_toStartOf="@+id/transfer_or_restore_fragment_transfer_header"
+                app:layout_constraintTop_toBottomOf="@+id/transfer_or_restore_fragment_transfer_header"
+                android:text="@string/TransferOrRestoreFragment__transfer_your_account_and_messages_from_your_old_android_device" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </org.thoughtcrime.securesms.components.ClippedCardView>
+
+    <org.thoughtcrime.securesms.components.ClippedCardView
+        android:id="@+id/local_restore_card"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        app:cardBackgroundColor="@color/signal_colorSurface"
+        app:cardCornerRadius="12dp"
+        app:cardElevation="0dp"
+        app:strokeColor="@color/transfer_option_stroke_color_selector"
+        app:strokeWidth="2dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingVertical="16dp">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/transfer_or_restore_fragment_restore_icon"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginStart="12dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@drawable/ic_transfer_local_48"
+                app:tint="@color/signal_colorPrimary" />
+
+            <TextView
+                android:id="@+id/transfer_or_restore_fragment_restore_header"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/TransferOrRestoreFragment__restore_from_local_backup"
+                android:textAppearance="@style/Signal.Text.Body"
+                app:layout_constraintBottom_toTopOf="@+id/transfer_or_restore_fragment_restore_description"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0"
+                app:layout_constraintStart_toEndOf="@+id/transfer_or_restore_fragment_restore_icon"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed" />
+
+            <TextView
+                android:id="@+id/transfer_or_restore_fragment_restore_description"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
+                android:text="@string/TransferOrRestoreFragment__restore_your_messages_from_a_local_backup"
+                android:textColor="@color/signal_colorOnSurfaceVariant"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0"
+                app:layout_constraintStart_toStartOf="@+id/transfer_or_restore_fragment_restore_header"
+                app:layout_constraintTop_toBottomOf="@+id/transfer_or_restore_fragment_restore_header" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </org.thoughtcrime.securesms.components.ClippedCardView>
+
+    <org.thoughtcrime.securesms.components.ClippedCardView
+        android:id="@+id/skip_card"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        app:cardBackgroundColor="@color/signal_colorSurface"
+        app:cardCornerRadius="12dp"
+        app:cardElevation="0dp"
+        app:strokeColor="@color/transfer_option_stroke_color_selector"
+        app:strokeWidth="2dp"
+        tools:visibility="visible">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingVertical="16dp">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/transfer_or_restore_fragment_restore_remote_icon"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginStart="12dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@drawable/ic_continue_no_restore_48"
+                app:tint="@color/signal_colorPrimary" />
+
+            <TextView
+                android:id="@+id/transfer_or_restore_fragment_restore_remote_header"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/TransferOrRestoreFragment__skip_transfer"
+                android:textAppearance="@style/Signal.Text.Body"
+                app:layout_constraintBottom_toTopOf="@+id/transfer_or_restore_fragment_restore_remote_description"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0"
+                app:layout_constraintStart_toEndOf="@+id/transfer_or_restore_fragment_restore_remote_icon"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed" />
+
+            <TextView
+                android:id="@+id/transfer_or_restore_fragment_restore_remote_description"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
+                android:text="@string/TransferOrRestoreFragment__skip_transfer_description"
+                android:textColor="@color/signal_colorOnSurfaceVariant"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0"
+                app:layout_constraintStart_toStartOf="@+id/transfer_or_restore_fragment_restore_remote_header"
+                app:layout_constraintTop_toBottomOf="@+id/transfer_or_restore_fragment_restore_remote_header" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </org.thoughtcrime.securesms.components.ClippedCardView>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/cancel"
+            style="@style/Widget.Signal.Button.TextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:text="@string/TransferOrRestoreFragment__cancel"
+            tools:visibility="visible" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/transfer_or_restore_fragment_next"
+            style="@style/Signal.Widget.Button.Large.Tonal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:text="@string/RegistrationActivity_next" />
+    </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/verification_code_view.xml b/app/src/main/res/layout/verification_code_view.xml
index f134e07bae..06d3788229 100644
--- a/app/src/main/res/layout/verification_code_view.xml
+++ b/app/src/main/res/layout/verification_code_view.xml
@@ -33,6 +33,7 @@
             android:inputType="none"
             android:padding="0dp"
             android:textAppearance="@style/Signal.Text.BodyLarge"
+            android:textColor="?attr/colorOnSurface"
             tools:text="0" />
 
     </com.google.android.material.textfield.TextInputLayout>
@@ -63,6 +64,7 @@
             android:inputType="none"
             android:padding="0dp"
             android:textAppearance="@style/Signal.Text.BodyLarge"
+            android:textColor="?attr/colorOnSurface"
             tools:text="1" />
 
     </com.google.android.material.textfield.TextInputLayout>
@@ -93,6 +95,7 @@
             android:inputType="none"
             android:padding="0dp"
             android:textAppearance="@style/Signal.Text.BodyLarge"
+            android:textColor="?attr/colorOnSurface"
             tools:text="2" />
 
     </com.google.android.material.textfield.TextInputLayout>
@@ -140,6 +143,7 @@
             android:inputType="none"
             android:padding="0dp"
             android:textAppearance="@style/Signal.Text.BodyLarge"
+            android:textColor="?attr/colorOnSurface"
             tools:text="3" />
 
     </com.google.android.material.textfield.TextInputLayout>
@@ -170,6 +174,7 @@
             android:inputType="none"
             android:padding="0dp"
             android:textAppearance="@style/Signal.Text.BodyLarge"
+            android:textColor="?attr/colorOnSurface"
             tools:text="4" />
 
     </com.google.android.material.textfield.TextInputLayout>
@@ -200,6 +205,7 @@
             android:inputType="none"
             android:padding="0dp"
             android:textAppearance="@style/Signal.Text.BodyLarge"
+            android:textColor="?attr/colorOnSurface"
             tools:text="5" />
 
     </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/webrtc_call_controls.xml b/app/src/main/res/layout/webrtc_call_controls.xml
index 1b62cad7e9..2284811bcf 100644
--- a/app/src/main/res/layout/webrtc_call_controls.xml
+++ b/app/src/main/res/layout/webrtc_call_controls.xml
@@ -16,6 +16,86 @@
     tools:layout_height="match_parent"
     tools:layout_width="match_parent">
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/call_controls_floating_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="org.thoughtcrime.securesms.components.webrtc.SlideUpWithCallControlsBehavior">
+
+        <org.thoughtcrime.securesms.components.recyclerview.NoTouchingRecyclerView
+            android:id="@+id/call_screen_reactions_feed"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:clickable="false"
+            android:orientation="vertical"
+            android:scrollbars="none"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_constraintBottom_toTopOf="@id/call_screen_raise_hand_view"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:reverseLayout="true"
+            tools:itemCount="2"
+            tools:listitem="@layout/webrtc_call_reaction_recycler_item" />
+
+        <org.thoughtcrime.securesms.stories.viewer.reply.reaction.MultiReactionBurstLayout
+            android:id="@+id/call_screen_reactions_container"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:clickable="false"
+            android:focusable="false"
+            app:layout_constraintBottom_toBottomOf="@id/call_screen_reactions_feed"
+            app:layout_constraintEnd_toEndOf="@id/call_screen_reactions_feed"
+            app:layout_constraintStart_toStartOf="@id/call_screen_reactions_feed"
+            app:layout_constraintTop_toTopOf="@id/call_screen_reactions_feed" />
+
+        <androidx.compose.ui.platform.ComposeView
+            android:id="@+id/call_screen_raise_hand_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dp"
+            app:layout_constraintBottom_toTopOf="@id/call_screen_pending_recipients"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <ViewStub
+            android:id="@+id/call_screen_pending_recipients"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginBottom="32dp"
+            android:inflatedId="@+id/call_screen_pending_recipients"
+            android:layout="@layout/call_screen_pending_participants_view"
+            app:layout_constraintBottom_toTopOf="@id/call_screen_camera_direction_toggle"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <ImageView
+            android:id="@+id/call_screen_camera_direction_toggle"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:clickable="false"
+            android:contentDescription="@string/WebRtcCallView__toggle_camera_direction"
+            android:scaleType="fitXY"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:srcCompat="@drawable/webrtc_call_screen_camera_toggle"
+            tools:visibility="visible" />
+
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/call_screen_above_controls_barrier"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="top"
+            app:constraint_referenced_ids="call_screen_camera_direction_toggle,call_screen_pending_recipients,call_screen_raise_hand_view" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
     <FrameLayout
         android:id="@+id/call_controls_info_parent"
         android:layout_width="match_parent"
@@ -56,28 +136,12 @@
                 android:scaleType="fitXY"
                 android:visibility="gone"
                 app:layout_constraintBottom_toTopOf="@id/call_screen_start_call_controls"
-                app:layout_constraintEnd_toStartOf="@id/call_screen_camera_direction_toggle"
+                app:layout_constraintEnd_toStartOf="@id/call_screen_video_toggle"
                 app:layout_constraintHorizontal_chainStyle="packed"
                 app:layout_constraintStart_toStartOf="parent"
                 app:srcCompat="@drawable/webrtc_call_screen_speaker_toggle"
                 tools:visibility="visible" />
 
-            <ImageView
-                android:id="@+id/call_screen_camera_direction_toggle"
-                android:layout_width="@dimen/webrtc_button_size"
-                android:layout_height="@dimen/webrtc_button_size"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginBottom="30dp"
-                android:clickable="false"
-                android:contentDescription="@string/WebRtcCallView__toggle_camera_direction"
-                android:scaleType="fitXY"
-                app:layout_constraintBottom_toTopOf="@id/call_screen_start_call_controls"
-                app:layout_constraintEnd_toStartOf="@id/call_screen_video_toggle"
-                app:layout_constraintHorizontal_chainStyle="packed"
-                app:layout_constraintStart_toEndOf="@id/call_screen_speaker_toggle"
-                app:srcCompat="@drawable/webrtc_call_screen_camera_toggle" />
-
             <org.thoughtcrime.securesms.components.AccessibleToggleButton
                 android:id="@+id/call_screen_video_toggle"
                 style="@style/WebRtcCallV2CompoundButton"
@@ -90,7 +154,7 @@
                 app:layout_constraintBottom_toTopOf="@id/call_screen_start_call_controls"
                 app:layout_constraintEnd_toStartOf="@id/call_screen_audio_mic_toggle"
                 app:layout_constraintHorizontal_chainStyle="packed"
-                app:layout_constraintStart_toEndOf="@id/call_screen_camera_direction_toggle"
+                app:layout_constraintStart_toEndOf="@id/call_screen_speaker_toggle"
                 tools:checked="true" />
 
             <org.thoughtcrime.securesms.components.AccessibleToggleButton
diff --git a/app/src/main/res/layout/webrtc_call_view.xml b/app/src/main/res/layout/webrtc_call_view.xml
index 3cad60ce92..f47f66203e 100644
--- a/app/src/main/res/layout/webrtc_call_view.xml
+++ b/app/src/main/res/layout/webrtc_call_view.xml
@@ -95,25 +95,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-        <org.thoughtcrime.securesms.components.recyclerview.NoTouchingRecyclerView
-            android:id="@+id/call_screen_reactions_feed"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="16dp"
-            android:clickable="false"
-            android:orientation="vertical"
-            android:scrollbars="none"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:layout_constraintBottom_toTopOf="@+id/call_screen_pending_recipients"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:reverseLayout="true"
-            tools:itemCount="2"
-            tools:listitem="@layout/webrtc_call_reaction_recycler_item" />
-
         <androidx.constraintlayout.widget.Guideline
             android:id="@+id/call_screen_show_participants_guideline"
             android:layout_width="0dp"
@@ -324,17 +305,6 @@
             app:layout_constraintStart_toStartOf="parent"
             tools:visibility="gone" />
 
-        <org.thoughtcrime.securesms.stories.viewer.reply.reaction.MultiReactionBurstLayout
-            android:id="@+id/call_screen_reactions_container"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:clickable="false"
-            android:focusable="false"
-            app:layout_constraintBottom_toBottomOf="@id/call_screen_reactions_feed"
-            app:layout_constraintEnd_toEndOf="@id/call_screen_reactions_feed"
-            app:layout_constraintStart_toStartOf="@id/call_screen_reactions_feed"
-            app:layout_constraintTop_toTopOf="@id/call_screen_reactions_feed" />
-
         <com.google.android.material.button.MaterialButton
             android:id="@+id/call_screen_error_cancel"
             style="@style/Widget.Signal.Button.Flat"
@@ -365,18 +335,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
-        <ViewStub
-            android:id="@+id/call_screen_pending_recipients"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            android:layout_marginBottom="32dp"
-            android:inflatedId="@+id/call_screen_pending_recipients"
-            android:layout="@layout/call_screen_pending_participants_view"
-            app:layout_constraintBottom_toTopOf="@id/call_screen_above_controls_guideline"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
         <ViewStub
             android:id="@+id/call_screen_call_link_warning"
             android:layout_width="match_parent"
@@ -396,20 +354,5 @@
             app:barrierDirection="top"
             app:constraint_referenced_ids="call_screen_answer_call,call_screen_decline_call,call_screen_audio_mic_toggle,call_screen_camera_direction_toggle,call_screen_video_toggle,call_screen_answer_without_video,call_screen_speaker_toggle,call_screen_end_call" />
 
-    <androidx.compose.ui.platform.ComposeView
-        android:id="@+id/call_screen_raise_hand_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="12dp"
-        app:layout_constraintBottom_toTopOf="@id/call_screen_pending_recipients"
-        app:layout_constraintEnd_toEndOf="parent" />
-
     <include layout="@layout/webrtc_call_controls"/>
-
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/pip_bottom_boundary_barrier"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:barrierDirection="top"
-        app:constraint_referenced_ids="call_screen_raise_hand_view,call_screen_pending_recipients,call_screen_above_controls_guideline" />
 </merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/webrtc_call_view_header_large.xml b/app/src/main/res/layout/webrtc_call_view_header_large.xml
index 987d3ae8bd..45f5460f0e 100644
--- a/app/src/main/res/layout/webrtc_call_view_header_large.xml
+++ b/app/src/main/res/layout/webrtc_call_view_header_large.xml
@@ -64,10 +64,39 @@
         android:gravity="center_horizontal"
         android:textAppearance="@style/Signal.Text.BodyMedium"
         android:textColor="@color/core_white"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/call_screen_recipient_name"
         tools:text="Signal Calling..." />
 
+    <LinearLayout
+        android:id="@+id/missing_permissions_container"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/call_screen_status"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/missing_permissions_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            style="@style/Signal.Text.Body"
+            android:text="@string/WebRtcCallActivity__to_enable_video_allow_camera" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/allow_access_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            style="@style/Signal.Widget.Button.Large.Tonal"
+            android:text="@string/CameraXFragment_allow_access" />
+
+    </LinearLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/menu/text_secure_normal.xml b/app/src/main/res/menu/text_secure_normal.xml
index 6760039ea8..527a73f3d6 100644
--- a/app/src/main/res/menu/text_secure_normal.xml
+++ b/app/src/main/res/menu/text_secure_normal.xml
@@ -10,9 +10,6 @@
     <item android:title="@string/text_secure_normal__mark_all_as_read"
           android:id="@+id/menu_mark_all_read" />
 
-    <item android:title="@string/text_secure_normal__invite_friends"
-          android:id="@+id/menu_invite" />
-
     <item android:title="@string/text_secure_normal__filter_unread_chats"
           android:id="@+id/menu_filter_unread_chats" />
 
diff --git a/app/src/main/res/navigation/app_settings_change_number.xml b/app/src/main/res/navigation/app_settings_change_number.xml
index cf70228145..f0d8eaf50c 100644
--- a/app/src/main/res/navigation/app_settings_change_number.xml
+++ b/app/src/main/res/navigation/app_settings_change_number.xml
@@ -63,7 +63,6 @@
 
         <argument
             android:name="result_key"
-            android:defaultValue="@null"
             app:argType="string"
             app:nullable="true" />
     </fragment>
@@ -74,7 +73,6 @@
         tools:layout="@layout/fragment_change_phone_number_verify">
 
         <argument android:name="sms_listener_enabled"
-            android:defaultValue="false"
             app:argType="boolean" />
 
         <action
@@ -97,12 +95,12 @@
 
     <fragment
         android:id="@+id/captchaFragment"
-        android:name="org.thoughtcrime.securesms.registration.fragments.CaptchaFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberCaptchaFragment"
         tools:layout="@layout/fragment_registration_captcha" />
 
     <fragment
         android:id="@+id/changeNumberEnterCodeFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberEnterSmsCodeFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberEnterCodeFragment"
         tools:layout="@layout/fragment_change_number_enter_code">
 
         <action
diff --git a/app/src/main/res/navigation/app_settings.xml b/app/src/main/res/navigation/app_settings_with_change_number.xml
similarity index 78%
rename from app/src/main/res/navigation/app_settings.xml
rename to app/src/main/res/navigation/app_settings_with_change_number.xml
index 0045523271..1a47ca11ef 100644
--- a/app/src/main/res/navigation/app_settings.xml
+++ b/app/src/main/res/navigation/app_settings_with_change_number.xml
@@ -43,6 +43,13 @@
             app:exitAnim="@anim/fragment_open_exit"
             app:popEnterAnim="@anim/fragment_close_enter"
             app:popExitAnim="@anim/fragment_close_exit" />
+        <action
+            android:id="@+id/action_appSettingsFragment_to_linkDeviceFragment"
+            app:destination="@id/linkDeviceFragment"
+            app:enterAnim="@anim/fragment_open_enter"
+            app:exitAnim="@anim/fragment_open_exit"
+            app:popEnterAnim="@anim/fragment_close_enter"
+            app:popExitAnim="@anim/fragment_close_exit" />
         <action
             android:id="@+id/action_appSettingsFragment_to_paymentsActivity"
             app:destination="@id/paymentsActivity"
@@ -113,6 +120,13 @@
             app:exitAnim="@anim/fragment_open_exit"
             app:popEnterAnim="@anim/fragment_close_enter"
             app:popExitAnim="@anim/fragment_close_exit" />
+        <action
+            android:id="@+id/action_appSettingsFragment_to_appUpdatesSettingsFragment"
+            app:destination="@id/appUpdatesFragment"
+            app:enterAnim="@anim/fragment_open_enter"
+            app:exitAnim="@anim/fragment_open_exit"
+            app:popEnterAnim="@anim/fragment_close_enter"
+            app:popExitAnim="@anim/fragment_close_exit" />
         <action
             android:id="@+id/action_appSettingsFragment_to_internalSettingsFragment"
             app:destination="@id/internalSettingsFragment"
@@ -120,6 +134,13 @@
             app:exitAnim="@anim/fragment_open_exit"
             app:popEnterAnim="@anim/fragment_close_enter"
             app:popExitAnim="@anim/fragment_close_exit" />
+        <action
+            android:id="@+id/action_appSettingsFragment_to_manageDonationsFragment"
+            app:destination="@id/manageDonationsFragment"
+            app:enterAnim="@anim/fragment_open_enter"
+            app:exitAnim="@anim/fragment_open_exit"
+            app:popEnterAnim="@anim/fragment_close_enter"
+            app:popExitAnim="@anim/fragment_close_exit" />
         <action
             android:id="@+id/action_appSettingsFragment_to_storyPrivacySettings"
             app:destination="@+id/story_privacy_settings"
@@ -211,12 +232,50 @@
 
     <!-- endregion -->
 
-    <!-- Linked Devices -->
+    <!-- Linked Devices V1-->
     <activity
         android:id="@+id/deviceActivity"
         android:name="org.thoughtcrime.securesms.DeviceActivity"
         android:label="device_activity" />
 
+    <!-- Linked Devices V2 -->
+    <fragment
+        android:id="@+id/linkDeviceFragment"
+        android:name="org.thoughtcrime.securesms.linkdevice.LinkDeviceFragment"
+        android:label="link_device_fragment">
+        <action
+            android:id="@+id/action_linkDeviceFragment_to_addLinkDeviceFragment"
+            app:destination="@id/addLinkDeviceFragment"
+            app:enterAnim="@anim/fragment_open_enter"
+            app:exitAnim="@anim/fragment_open_exit"
+            app:popEnterAnim="@anim/fragment_close_enter"
+            app:popExitAnim="@anim/fragment_close_exit" />
+        <action
+            android:id="@+id/action_linkDeviceFragment_to_linkDeviceFinishedSheet"
+            app:destination="@id/linkDeviceFinishedSheet" />
+        <action
+            android:id="@+id/action_linkDeviceFragment_to_linkDeviceLearnMoreBottomSheet"
+            app:destination="@id/linkDeviceLearnMoreBottomSheet" />
+    </fragment>
+    <dialog
+        android:id="@+id/linkDeviceFinishedSheet"
+        android:name="org.thoughtcrime.securesms.linkdevice.LinkDeviceFinishedSheet" />
+    <dialog
+        android:id="@+id/linkDeviceLearnMoreBottomSheet"
+        android:name="org.thoughtcrime.securesms.linkdevice.LinkDeviceLearnMoreBottomSheetFragment" />
+
+    <fragment
+        android:id="@+id/addLinkDeviceFragment"
+        android:name="org.thoughtcrime.securesms.linkdevice.AddLinkDeviceFragment"
+        android:label="link_device_add_fragment">
+        <action
+            android:id="@+id/action_addLinkDeviceFragment_to_linkDeviceIntroBottomSheet"
+            app:destination="@id/linkDeviceIntroBottomSheet" />
+    </fragment>
+    <dialog
+        android:id="@+id/linkDeviceIntroBottomSheet"
+        android:name="org.thoughtcrime.securesms.linkdevice.LinkDeviceIntroBottomSheet" />
+
     <!-- Payments -->
     <activity
         android:id="@+id/paymentsActivity"
@@ -343,8 +402,6 @@
         android:name="org.thoughtcrime.securesms.components.settings.app.wrapped.WrappedNetworkPreferenceFragment"
         android:label="network_preference_fragment" />
 
-    <!-- endregion -->
-
     <!-- region Data and Storage -->
 
     <fragment
@@ -471,6 +528,26 @@
         app:popEnterAnim="@anim/fragment_close_enter"
         app:popExitAnim="@anim/fragment_close_exit" />
 
+    <action
+        android:id="@+id/action_direct_to_manageDonations"
+        app:destination="@id/manageDonationsFragment"
+        app:enterAnim="@anim/fragment_open_enter"
+        app:exitAnim="@anim/fragment_open_exit"
+        app:popEnterAnim="@anim/fragment_close_enter"
+        app:popExitAnim="@anim/fragment_close_exit"
+        app:popUpTo="@id/app_settings"
+        app:popUpToInclusive="true" />
+
+    <action
+        android:id="@+id/action_direct_to_checkout"
+        app:destination="@id/checkoutFlowActivity"
+        app:enterAnim="@anim/fragment_open_enter"
+        app:exitAnim="@anim/fragment_open_exit"
+        app:popEnterAnim="@anim/fragment_close_enter"
+        app:popExitAnim="@anim/fragment_close_exit"
+        app:popUpTo="@id/app_settings"
+        app:popUpToInclusive="true" />
+
     <action
         android:id="@+id/action_direct_to_notificationProfiles"
         app:destination="@id/notificationProfilesFragment"
@@ -511,7 +588,7 @@
 
     <action
         android:id="@+id/action_direct_to_devices"
-        app:destination="@id/deviceActivity"
+        app:destination="@id/linkDeviceFragment"
         app:enterAnim="@anim/fragment_open_enter"
         app:exitAnim="@anim/fragment_open_exit"
         app:popEnterAnim="@anim/fragment_close_enter"
@@ -552,6 +629,9 @@
         android:id="@+id/internalSettingsFragment"
         android:name="org.thoughtcrime.securesms.components.settings.app.internal.InternalSettingsFragment"
         android:label="internal_settings_fragment">
+        <action
+            android:id="@+id/action_internalSettingsFragment_to_donorErrorConfigurationFragment"
+            app:destination="@id/donorErrorConfigurationFragment" />
         <action
             android:id="@+id/action_internalSettingsFragment_to_storyDialogsLauncherFragment"
             app:destination="@id/storyDialogsLauncherFragment" />
@@ -564,11 +644,32 @@
         <action
             android:id="@+id/action_internalSettingsFragment_to_internalConversationSpringboardFragment"
             app:destination="@id/internalConversationSpringboardFragment" />
+        <action
+            android:id="@+id/action_internalSettingsFragment_to_oneTimeDonationConfigurationFragment"
+            app:destination="@id/oneTimeDonationConfigurationFragment" />
+        <action
+            android:id="@+id/action_internalSettingsFragment_to_terminalDonationConfigurationFragment"
+            app:destination="@id/terminalDonationConfigurationFragment" />
         <action
             android:id="@+id/action_internalSettingsFragment_to_internalBackupPlaygroundFragment"
             app:destination="@id/internalBackupPlaygroundFragment" />
     </fragment>
 
+    <fragment
+        android:id="@+id/terminalDonationConfigurationFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.internal.InternalTerminalDonationConfigurationFragment"
+        android:label="terminal_donation_configuration_fragment" />
+
+    <fragment
+        android:id="@+id/oneTimeDonationConfigurationFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.internal.InternalPendingOneTimeDonationConfigurationFragment"
+        android:label="one_time_donation_configuration_fragment" />
+
+    <fragment
+        android:id="@+id/donorErrorConfigurationFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.internal.donor.InternalDonorErrorConfigurationFragment"
+        android:label="donor_error_configuration_fragment" />
+
     <fragment
         android:id="@+id/storyDialogsLauncherFragment"
         android:name="org.thoughtcrime.securesms.components.settings.app.internal.InternalStoryDialogLauncherFragment"
@@ -607,7 +708,69 @@
     <!-- endregion -->
 
     <!-- App updates -->
+
+    <fragment
+        android:id="@+id/appUpdatesFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.updates.AppUpdatesSettingsFragment"
+        android:label="app_update_fragment" />
+
     <!-- Subscriptions -->
+    <fragment
+        android:id="@+id/manageDonationsFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.manage.ManageDonationsFragment"
+        android:label="manage_donations_fragment"
+        tools:layout="@layout/dsl_settings_fragment">
+        <action
+            android:id="@+id/action_manageDonationsFragment_to_donationReceiptListFragment"
+            app:destination="@id/donationReceiptListFragment"
+            app:enterAnim="@anim/fragment_open_enter"
+            app:exitAnim="@anim/fragment_open_exit"
+            app:popEnterAnim="@anim/fragment_close_enter"
+            app:popExitAnim="@anim/fragment_close_exit" />
+        <action
+            android:id="@+id/action_manageDonationsFragment_to_subscribeLearnMoreBottomSheetDialog"
+            app:destination="@id/subscribeLearnMoreBottomSheetDialog" />
+        <action
+            android:id="@+id/action_manageDonationsFragment_to_donateToSignalFragment"
+            app:destination="@id/checkoutFlowActivity"
+            app:enterAnim="@anim/fragment_open_enter"
+            app:exitAnim="@anim/fragment_open_exit"
+            app:popEnterAnim="@anim/fragment_close_enter"
+            app:popExitAnim="@anim/fragment_close_exit" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/donationReceiptListFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.receipts.list.DonationReceiptListFragment"
+        android:label="donation_receipt_list_fragment"
+        tools:layout="@layout/donation_receipt_list_fragment">
+        <action
+            android:id="@+id/action_donationReceiptListFragment_to_donationReceiptDetailFragment"
+            app:destination="@id/donationReceiptDetailFragment"
+            app:enterAnim="@anim/fragment_open_enter"
+            app:exitAnim="@anim/fragment_open_exit"
+            app:popEnterAnim="@anim/fragment_close_enter"
+            app:popExitAnim="@anim/fragment_close_exit" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/donationReceiptDetailFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.receipts.detail.DonationReceiptDetailFragment"
+        android:label="donation_receipt_detail_fragment"
+        tools:layout="@layout/donation_receipt_detail_fragment">
+
+        <argument
+            android:name="id"
+            app:argType="long" />
+    </fragment>
+
+    <dialog
+        android:id="@+id/subscribeLearnMoreBottomSheetDialog"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.subscribe.SubscribeLearnMoreBottomSheetDialogFragment"
+        android:label="subscribe_learn_more_bottom_sheet_dialog"
+        tools:layout="@layout/subscribe_learn_more_bottom_sheet_dialog_fragment" />
+
+    <!-- endregion -->
 
     <!-- Notification Profiles -->
     <fragment
@@ -801,13 +964,45 @@
             app:exitAnim="@anim/fragment_open_exit"
             app:popEnterAnim="@anim/fragment_close_enter"
             app:popExitAnim="@anim/fragment_close_exit" />
+
+        <action
+            android:id="@+id/action_remoteBackupsSettingsFragment_to_remoteBackupsPaymentHistoryFragment"
+            app:destination="@id/remoteBackupsPaymentHistoryFragment"
+            app:enterAnim="@anim/fragment_open_enter"
+            app:exitAnim="@anim/fragment_open_exit"
+            app:popEnterAnim="@anim/fragment_close_enter"
+            app:popExitAnim="@anim/fragment_close_exit" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/remoteBackupsPaymentHistoryFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.chats.backups.history.RemoteBackupsPaymentHistoryFragment">
     </fragment>
 
     <fragment
         android:id="@+id/backupsTypeSettingsFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.chats.backups.type.BackupsTypeSettingsFragment" />
+        android:name="org.thoughtcrime.securesms.components.settings.app.chats.backups.type.BackupsTypeSettingsFragment">
+
+        <action
+            android:id="@+id/action_backupsTypeSettingsFragment_to_remoteBackupsPaymentHistoryFragment"
+            app:destination="@id/remoteBackupsPaymentHistoryFragment"
+            app:enterAnim="@anim/fragment_open_enter"
+            app:exitAnim="@anim/fragment_open_exit"
+            app:popEnterAnim="@anim/fragment_close_enter"
+            app:popExitAnim="@anim/fragment_close_exit" />
+    </fragment>
 
     <include app:graph="@navigation/username_link_settings" />
     <include app:graph="@navigation/story_privacy_settings" />
 
+    <activity
+        android:id="@+id/checkoutFlowActivity"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.donate.CheckoutFlowActivity"
+        android:label="checkout_flow_activity">
+
+        <argument
+            android:name="in_app_payment_type"
+            app:argType="org.signal.donations.InAppPaymentType" />
+    </activity>
+
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/checkout.xml b/app/src/main/res/navigation/checkout.xml
new file mode 100644
index 0000000000..18c15fd390
--- /dev/null
+++ b/app/src/main/res/navigation/checkout.xml
@@ -0,0 +1,347 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  -->
+
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/checkout_flow"
+    app:startDestination="@id/donateToSignalFragment">
+
+    <!-- region Unified Checkout -->
+
+    <dialog
+        android:id="@+id/stripePaymentInProgressFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.StripePaymentInProgressFragment"
+        android:label="stripe_payment_in_progress_fragment"
+        tools:layout="@layout/donation_in_progress_fragment">
+
+        <argument
+            android:name="action"
+            app:argType="org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentProcessorAction"
+            app:nullable="false" />
+
+        <argument
+            android:name="in_app_payment"
+            app:argType="org.thoughtcrime.securesms.database.InAppPaymentTable$InAppPayment"
+            app:nullable="true" />
+        <argument
+            android:name="in_app_payment_type"
+            app:argType="org.signal.donations.InAppPaymentType" />
+
+        <argument
+            android:name="is_long_running"
+            android:defaultValue="false"
+            app:argType="boolean" />
+        <action
+            android:id="@+id/action_stripePaymentInProgressFragment_to_stripe3dsDialogFragment"
+            app:destination="@id/stripe3dsDialogFragment" />
+    </dialog>
+
+    <fragment
+        android:id="@+id/creditCardFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.donate.card.CreditCardFragment"
+        android:label="credit_card_fragment"
+        tools:layout="@layout/credit_card_fragment">
+
+        <argument
+            android:name="in_app_payment"
+            app:argType="org.thoughtcrime.securesms.database.InAppPaymentTable$InAppPayment"
+            app:nullable="false" />
+
+        <action
+            android:id="@+id/action_creditCardFragment_to_yourInformationIsPrivateBottomSheet"
+            app:destination="@id/yourInformationIsPrivateBottomSheet" />
+        <action
+            android:id="@+id/action_creditCardFragment_to_stripePaymentInProgressFragment"
+            app:destination="@id/stripePaymentInProgressFragment" />
+    </fragment>
+
+    <dialog
+        android:id="@+id/stripe3dsDialogFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.Stripe3DSDialogFragment"
+        android:label="stripe_3ds_dialog_fragment"
+        tools:layout="@layout/donation_webview_fragment">
+
+        <argument
+            android:name="uri"
+            app:argType="android.net.Uri"
+            app:nullable="false" />
+
+        <argument
+            android:name="return_uri"
+            app:argType="android.net.Uri"
+            app:nullable="false" />
+
+        <argument
+            android:name="in_app_payment"
+            app:argType="org.thoughtcrime.securesms.database.InAppPaymentTable$InAppPayment"
+            app:nullable="false" />
+    </dialog>
+
+    <dialog
+        android:id="@+id/yourInformationIsPrivateBottomSheet"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.donate.card.YourInformationIsPrivateBottomSheet"
+        android:label="your_information_is_private_bottom_sheet"
+        tools:layout="@layout/dsl_settings_bottom_sheet" />
+
+    <dialog
+        android:id="@+id/paypalPaymentInProgressFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.donate.paypal.PayPalPaymentInProgressFragment"
+        android:label="paypal_payment_in_progress"
+        tools:layout="@layout/donation_in_progress_fragment">
+
+        <argument
+            android:name="action"
+            app:argType="org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentProcessorAction"
+            app:nullable="false" />
+
+        <argument
+            android:name="in_app_payment"
+            app:argType="org.thoughtcrime.securesms.database.InAppPaymentTable$InAppPayment"
+            app:nullable="true" />
+        <argument
+            android:name="in_app_payment_type"
+            app:argType="org.signal.donations.InAppPaymentType" />
+        <action
+            android:id="@+id/action_paypalPaymentInProgressFragment_to_paypalConfirmationFragment"
+            app:destination="@id/paypalConfirmationFragment" />
+        <action
+            android:id="@+id/action_paypalPaymentInProgressFragment_to_paypalCompleteOrderBottomSheet"
+            app:destination="@id/paypalCompleteOrderBottomSheet" />
+    </dialog>
+
+    <dialog
+        android:id="@+id/paypalConfirmationFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.donate.paypal.PayPalConfirmationDialogFragment"
+        android:label="paypal_confirmation_dialog_fragment"
+        tools:layout="@layout/donation_webview_fragment">
+
+        <argument
+            android:name="uri"
+            app:argType="android.net.Uri"
+            app:nullable="false" />
+
+    </dialog>
+
+    <dialog
+        android:id="@+id/paypalCompleteOrderBottomSheet"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.donate.paypal.PayPalCompleteOrderBottomSheet"
+        android:label="paypal_complete_order_bottom_sheet"
+        tools:layout="@layout/dsl_settings_bottom_sheet">
+
+        <argument
+            android:name="in_app_payment"
+            app:argType="org.thoughtcrime.securesms.database.InAppPaymentTable$InAppPayment"
+            app:nullable="false" />
+    </dialog>
+
+    <fragment
+        android:id="@+id/bankTransferMandateFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.mandate.BankTransferMandateFragment"
+        android:label="bank_transfer_mandate_fragment">
+
+        <argument
+            android:name="in_app_payment"
+            app:argType="org.thoughtcrime.securesms.database.InAppPaymentTable$InAppPayment"
+            app:nullable="false" />
+        <action
+            android:id="@+id/action_bankTransferMandateFragment_to_bankTransferDetailsFragment"
+            app:destination="@id/bankTransferDetailsFragment" />
+        <action
+            android:id="@+id/action_bankTransferMandateFragment_to_yourInformationIsPrivateBottomSheet"
+            app:destination="@id/yourInformationIsPrivateBottomSheet" />
+        <action
+            android:id="@+id/action_bankTransferMandateFragment_to_idealTransferDetailsFragment"
+            app:destination="@id/idealTransferDetailsFragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/bankTransferDetailsFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.details.BankTransferDetailsFragment"
+        android:label="bank_transfer_details_fragment">
+
+        <argument
+            android:name="in_app_payment"
+            app:argType="org.thoughtcrime.securesms.database.InAppPaymentTable$InAppPayment"
+            app:nullable="false" />
+        <action
+            android:id="@+id/action_bankTransferDetailsFragment_to_stripePaymentInProgressFragment"
+            app:destination="@id/stripePaymentInProgressFragment" />
+        <action
+            android:id="@+id/action_bankTransferDetailsFragment_to_yourInformationIsPrivateBottomSheet"
+            app:destination="@id/yourInformationIsPrivateBottomSheet" />
+    </fragment>
+
+    <dialog
+        android:id="@+id/donationPendingBottomSheet"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.DonationPendingBottomSheet"
+        android:label="donation_pending_bottom_sheet"
+        tools:layout="@layout/dsl_settings_bottom_sheet">
+
+        <argument
+            android:name="in_app_payment"
+            app:argType="org.thoughtcrime.securesms.database.InAppPaymentTable$InAppPayment"
+            app:nullable="false" />
+    </dialog>
+
+    <fragment
+        android:id="@+id/idealTransferDetailsFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.ideal.IdealTransferDetailsFragment"
+        android:label="ideal_transfer_details_fragment">
+
+        <argument
+            android:name="in_app_payment"
+            app:argType="org.thoughtcrime.securesms.database.InAppPaymentTable$InAppPayment"
+            app:nullable="false" />
+        <action
+            android:id="@+id/action_bankTransferDetailsFragment_to_stripePaymentInProgressFragment"
+            app:destination="@id/stripePaymentInProgressFragment" />
+        <action
+            android:id="@+id/action_bankTransferDetailsFragment_to_yourInformationIsPrivateBottomSheet"
+            app:destination="@id/yourInformationIsPrivateBottomSheet" />
+        <action
+            android:id="@+id/action_idealTransferDetailsFragment_to_idealTransferBankSelectionDialogFragment"
+            app:destination="@id/idealTransferBankSelectionDialogFragment" />
+    </fragment>
+
+    <dialog
+        android:id="@+id/idealTransferBankSelectionDialogFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.ideal.IdealTransferDetailsBankSelectionDialogFragment"
+        android:label="ideal_transfer_bank_selection" />
+
+    <!-- endregion -->
+
+    <!-- region DonateToSignal -->
+
+    <fragment
+        android:id="@+id/donateToSignalFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.donate.DonateToSignalFragment"
+        android:label="donate_to_signal_fragment"
+        tools:layout="@layout/dsl_settings_fragment">
+
+        <argument
+            android:name="start_type"
+            app:argType="org.signal.donations.InAppPaymentType"
+            app:nullable="false" />
+
+        <action
+            android:id="@+id/action_donateToSignalFragment_to_setCurrencyFragment"
+            app:destination="@id/setCurrencyFragment"
+            app:enterAnim="@anim/fragment_open_enter"
+            app:exitAnim="@anim/fragment_open_exit"
+            app:popEnterAnim="@anim/fragment_close_enter"
+            app:popExitAnim="@anim/fragment_close_exit" />
+
+        <action
+            android:id="@+id/action_donateToSignalFragment_to_gatewaySelectorBottomSheetDialog"
+            app:destination="@id/gatewaySelectorBottomSheet" />
+        <action
+            android:id="@+id/action_donateToSignalFragment_to_thanksForYourSupportBottomSheetDialog"
+            app:destination="@id/thanksForYourSupportBottomSheetDialog" />
+        <action
+            android:id="@+id/action_donateToSignalFragment_to_subscribeLearnMoreBottomSheetDialog"
+            app:destination="@id/subscribeLearnMoreBottomSheetDialog" />
+        <action
+            android:id="@+id/action_donateToSignalFragment_to_creditCardFragment"
+            app:destination="@id/creditCardFragment" />
+        <action
+            android:id="@+id/action_donateToSignalFragment_to_stripePaymentInProgressFragment"
+            app:destination="@id/stripePaymentInProgressFragment" />
+        <action
+            android:id="@+id/action_donateToSignalFragment_to_paypalPaymentInProgressFragment"
+            app:destination="@id/paypalPaymentInProgressFragment" />
+        <action
+            android:id="@+id/action_donateToSignalFragment_to_bankTransferMandateFragment"
+            app:destination="@id/bankTransferMandateFragment" />
+        <action
+            android:id="@+id/action_donateToSignalFragment_to_donationPendingBottomSheet"
+            app:destination="@id/donationPendingBottomSheet" />
+        <action
+            android:id="@+id/action_donateToSignalFragment_to_idealTransferDetailsFragment"
+            app:destination="@id/idealTransferDetailsFragment" />
+    </fragment>
+
+    <dialog
+        android:id="@+id/gatewaySelectorBottomSheet"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewaySelectorBottomSheet"
+        android:label="gateway_selector_bottom_sheet"
+        tools:layout="@layout/dsl_settings_bottom_sheet">
+
+        <argument
+            android:name="in_app_payment"
+            app:argType="org.thoughtcrime.securesms.database.InAppPaymentTable$InAppPayment"
+            app:nullable="false" />
+
+    </dialog>
+
+    <dialog
+        android:id="@+id/setCurrencyFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.currency.SetCurrencyFragment"
+        android:label="set_currency_fragment"
+        tools:layout="@layout/dsl_settings_fragment">
+
+        <argument
+            android:name="inAppPaymentType"
+            app:argType="org.signal.donations.InAppPaymentType" />
+
+        <argument
+            android:name="supportedCurrencyCodes"
+            app:argType="string[]" />
+    </dialog>
+
+    <dialog
+        android:id="@+id/thanksForYourSupportBottomSheetDialog"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.thanks.ThanksForYourSupportBottomSheetDialogFragment"
+        android:label="thanks_for_your_support_bottom_sheet_dialog"
+        tools:layout="@layout/thanks_for_your_support_bottom_sheet_dialog_fragment">
+
+        <argument
+            android:name="badge"
+            app:argType="org.thoughtcrime.securesms.badges.models.Badge"
+            app:nullable="false" />
+
+    </dialog>
+
+    <dialog
+        android:id="@+id/subscribeLearnMoreBottomSheetDialog"
+        android:name="org.thoughtcrime.securesms.components.settings.app.subscription.subscribe.SubscribeLearnMoreBottomSheetDialogFragment"
+        android:label="subscribe_learn_more_bottom_sheet_dialog"
+        tools:layout="@layout/subscribe_learn_more_bottom_sheet_dialog_fragment" />
+
+    <!-- endregion -->
+
+    <!-- region GiftFlow -->
+
+    <!-- endregion -->
+
+    <!-- region Backups -->
+
+    <fragment
+        android:id="@+id/messageBackupsFlowFragment"
+        android:name="org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsFlowFragment"
+        android:label="message_backups_flow_fragment">
+
+        <action
+            android:id="@+id/action_donateToSignalFragment_to_creditCardFragment"
+            app:destination="@id/creditCardFragment" />
+        <action
+            android:id="@+id/action_donateToSignalFragment_to_stripePaymentInProgressFragment"
+            app:destination="@id/stripePaymentInProgressFragment" />
+        <action
+            android:id="@+id/action_donateToSignalFragment_to_paypalPaymentInProgressFragment"
+            app:destination="@id/paypalPaymentInProgressFragment" />
+        <action
+            android:id="@+id/action_donateToSignalFragment_to_bankTransferMandateFragment"
+            app:destination="@id/bankTransferMandateFragment" />
+        <action
+            android:id="@+id/action_donateToSignalFragment_to_donationPendingBottomSheet"
+            app:destination="@id/donationPendingBottomSheet" />
+        <action
+            android:id="@+id/action_donateToSignalFragment_to_idealTransferDetailsFragment"
+            app:destination="@id/idealTransferDetailsFragment" />
+    </fragment>
+
+    <!-- endregion -->
+</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/registration.xml b/app/src/main/res/navigation/registration.xml
index 2f5c034ba4..fb5f9762d2 100644
--- a/app/src/main/res/navigation/registration.xml
+++ b/app/src/main/res/navigation/registration.xml
@@ -7,18 +7,10 @@
 
     <fragment
         android:id="@+id/welcomeFragment"
-        android:name="org.thoughtcrime.securesms.registration.fragments.WelcomeFragment"
+        android:name="org.thoughtcrime.securesms.registration.ui.welcome.WelcomeFragment"
         android:label="fragment_welcome"
         tools:layout="@layout/fragment_registration_welcome">
 
-        <action
-            android:id="@+id/action_restore"
-            app:destination="@id/restoreBackupFragmentV2"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
-
         <action
             android:id="@+id/action_skip_restore"
             app:destination="@id/enterPhoneNumberFragment"
@@ -28,16 +20,8 @@
             app:popExitAnim="@anim/nav_default_pop_exit_anim" />
 
         <action
-            android:id="@+id/action_transfer_or_restore"
-            app:destination="@id/transferOrRestore"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
-
-        <action
-            android:id="@+id/action_welcomeFragment_to_deviceTransferSetup"
-            app:destination="@id/deviceTransferSetup"
+            android:id="@+id/action_go_to_registration"
+            app:destination="@id/enterPhoneNumberFragment"
             app:enterAnim="@anim/nav_default_enter_anim"
             app:exitAnim="@anim/nav_default_exit_anim"
             app:popEnterAnim="@anim/nav_default_pop_enter_anim"
@@ -55,28 +39,13 @@
 
     <fragment
         android:id="@+id/grantPermissionsFragment"
-        android:name="org.thoughtcrime.securesms.registration.fragments.GrantPermissionsFragment"
+        android:name="org.thoughtcrime.securesms.registration.ui.grantpermissions.GrantPermissionsFragment"
         android:label="fragment_grant_permissions">
 
         <action
-            android:id="@+id/action_restore"
-            app:destination="@id/restoreBackupFragmentV2"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
-
-        <action
-            android:id="@+id/action_skip_restore"
+            android:id="@+id/action_enter_phone_number"
             app:destination="@id/enterPhoneNumberFragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
-
-        <action
-            android:id="@+id/action_transfer_or_restore"
-            app:destination="@id/transferOrRestore"
+            app:popUpTo="@+id/welcomeFragment"
             app:enterAnim="@anim/nav_default_enter_anim"
             app:exitAnim="@anim/nav_default_exit_anim"
             app:popEnterAnim="@anim/nav_default_pop_enter_anim"
@@ -84,52 +53,17 @@
 
         <argument
             android:name="welcomeAction"
-            app:argType="org.thoughtcrime.securesms.registration.fragments.GrantPermissionsFragment$WelcomeAction" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/chooseBackupFragment"
-        android:name="org.thoughtcrime.securesms.registration.fragments.ChooseBackupFragment"
-        android:label="fragment_choose_backup"
-        tools:layout="@layout/fragment_registration_choose_backup">
-
-        <action
-            android:id="@+id/action_restore"
-            app:destination="@id/restoreBackupFragmentV2"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@id/chooseBackupFragment"
-            app:popUpToInclusive="true" />
-
-        <action
-            android:id="@+id/action_skip"
-            app:destination="@id/enterPhoneNumberFragment"
-            app:enterAnim="@anim/slide_from_end"
-            app:exitAnim="@anim/slide_to_start"
-            app:popEnterAnim="@anim/slide_from_start"
-            app:popExitAnim="@anim/slide_to_end" />
+            app:argType="org.thoughtcrime.securesms.registration.ui.grantpermissions.GrantPermissionsFragment$WelcomeAction" />
 
     </fragment>
 
     <fragment
         android:id="@+id/enterPhoneNumberFragment"
-        android:name="org.thoughtcrime.securesms.registration.fragments.EnterPhoneNumberFragment"
+        android:name="org.thoughtcrime.securesms.registration.ui.phonenumber.EnterPhoneNumberFragment"
         android:label="fragment_enter_phone_number"
         tools:layout="@layout/fragment_registration_enter_phone_number">
 
-        <action
-            android:id="@+id/action_pickCountry"
-            app:destination="@id/countryPickerFragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:launchSingleTop="true"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
-
-        <action
+         <action
             android:id="@+id/action_enterVerificationCode"
             app:destination="@id/enterCodeFragment"
             app:enterAnim="@anim/nav_default_enter_anim"
@@ -153,6 +87,14 @@
             app:popEnterAnim="@anim/nav_default_pop_enter_anim"
             app:popExitAnim="@anim/nav_default_pop_exit_anim" />
 
+        <action
+            android:id="@+id/action_linkDevice"
+            app:destination="@+id/enterDeviceNameFragment"
+            app:enterAnim="@anim/nav_default_enter_anim"
+            app:exitAnim="@anim/nav_default_exit_anim"
+            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
+            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
+
         <action
             android:id="@+id/action_reRegisterWithPinFragment"
             app:destination="@id/reRegisterWithPinFragment"
@@ -163,9 +105,17 @@
             app:popUpTo="@id/enterPhoneNumberFragment"
             app:popUpToInclusive="true" />
 
+    </fragment>
+
+    <fragment
+        android:id="@+id/enterDeviceNameFragment"
+        android:name="org.thoughtcrime.securesms.registration.ui.linkdevice.EnterDeviceNameFragment"
+        android:label="fragment_enter_device_name"
+        tools:layout="@layout/fragment_registration_link_device_name">
+
         <action
             android:id="@+id/action_linkDevice"
-            app:destination="@+id/linkDeviceNameFragment"
+            app:destination="@id/registerAsLinkedDeviceFragment"
             app:enterAnim="@anim/nav_default_enter_anim"
             app:exitAnim="@anim/nav_default_exit_anim"
             app:popEnterAnim="@anim/nav_default_pop_enter_anim"
@@ -173,6 +123,12 @@
 
     </fragment>
 
+    <fragment
+        android:id="@+id/registerAsLinkedDeviceFragment"
+        android:name="org.thoughtcrime.securesms.registration.ui.linkdevice.RegisterAsLinkedDeviceFragment"
+        android:label="fragment_register_as_linked_device"
+        tools:layout="@layout/fragment_registration_link_device" />
+
     <fragment
         android:id="@+id/countryPickerFragment"
         android:name="org.thoughtcrime.securesms.registration.fragments.CountryPickerFragment"
@@ -181,7 +137,7 @@
 
     <fragment
         android:id="@+id/enterCodeFragment"
-        android:name="org.thoughtcrime.securesms.registration.fragments.EnterSmsCodeFragment"
+        android:name="org.thoughtcrime.securesms.registration.ui.entercode.EnterCodeFragment"
         android:label="fragment_enter_code"
         tools:layout="@layout/fragment_registration_enter_code">
 
@@ -203,11 +159,6 @@
             app:popEnterAnim="@anim/nav_default_pop_enter_anim"
             app:popExitAnim="@anim/nav_default_pop_exit_anim" />
 
-        <action
-            android:id="@+id/action_successfulRegistration"
-            app:destination="@id/registrationCompletePlaceHolderFragment"
-            app:popUpTo="@+id/welcomeFragment"
-            app:popUpToInclusive="true" />
         <action
             android:id="@+id/action_accountLocked"
             app:destination="@id/accountLockedFragment"
@@ -222,20 +173,10 @@
 
     <fragment
         android:id="@+id/registrationLockFragment"
-        android:name="org.thoughtcrime.securesms.registration.fragments.RegistrationLockFragment"
+        android:name="org.thoughtcrime.securesms.registration.ui.registrationlock.RegistrationLockFragment"
         android:label="fragment_kbs_lock"
         tools:layout="@layout/fragment_registration_lock">
 
-        <action
-            android:id="@+id/action_successfulRegistration"
-            app:destination="@id/registrationCompletePlaceHolderFragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@+id/welcomeFragment"
-            app:popUpToInclusive="true" />
-
         <action
             android:id="@+id/action_accountLocked"
             app:destination="@id/accountLockedFragment"
@@ -254,19 +195,9 @@
 
     <fragment
         android:id="@+id/reRegisterWithPinFragment"
-        android:name="org.thoughtcrime.securesms.registration.fragments.ReRegisterWithPinFragment"
+        android:name="org.thoughtcrime.securesms.registration.ui.reregisterwithpin.ReRegisterWithPinFragment"
         tools:layout="@layout/fragment_registration_lock">
 
-        <action
-            android:id="@+id/action_reRegisterWithPinFragment_to_registrationCompletePlaceHolderFragment"
-            app:destination="@id/registrationCompletePlaceHolderFragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@+id/welcomeFragment"
-            app:popUpToInclusive="true" />
-
         <action
             android:id="@+id/action_reRegisterWithPinFragment_to_enterPhoneNumberFragment"
             app:destination="@id/enterPhoneNumberFragment"
@@ -281,244 +212,21 @@
 
     <fragment
         android:id="@+id/accountLockedFragment"
-        android:name="org.thoughtcrime.securesms.registration.fragments.AccountLockedFragment"
+        android:name="org.thoughtcrime.securesms.registration.ui.accountlocked.AccountLockedFragment"
         android:label="fragment_account_locked"
         tools:layout="@layout/account_locked_fragment" />
 
     <fragment
         android:id="@+id/captchaFragment"
-        android:name="org.thoughtcrime.securesms.registration.fragments.CaptchaFragment"
+        android:name="org.thoughtcrime.securesms.registration.ui.captcha.RegistrationCaptchaFragment"
         android:label="fragment_captcha"
         tools:layout="@layout/fragment_registration_captcha" />
 
-    <fragment
-        android:id="@+id/restoreBackupFragmentV2"
-        android:name="org.thoughtcrime.securesms.registration.fragments.RestoreBackupFragment"
-        android:label="fragment_restore_backup"
-        tools:layout="@layout/fragment_registration_restore_backup">
-
-        <action
-            android:id="@+id/action_backupRestored"
-            app:destination="@id/enterPhoneNumberFragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@id/restoreBackupFragmentV2"
-            app:popUpToInclusive="true" />
-
-        <action
-            android:id="@+id/action_skip"
-            app:destination="@id/enterPhoneNumberFragment"
-            app:enterAnim="@anim/slide_from_end"
-            app:exitAnim="@anim/slide_to_start"
-            app:popEnterAnim="@anim/slide_from_start"
-            app:popExitAnim="@anim/slide_to_end" />
-
-        <action
-            android:id="@+id/action_noBackupFound"
-            app:destination="@id/enterPhoneNumberFragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@id/restoreBackupFragmentV2"
-            app:popUpToInclusive="true" />
-
-        <action
-            android:id="@+id/action_skip_no_return"
-            app:destination="@id/enterPhoneNumberFragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@+id/restoreBackupFragmentV2"
-            app:popUpToInclusive="true" />
-
-        <argument
-            android:name="uri"
-            android:defaultValue="@null"
-            app:argType="android.net.Uri"
-            app:nullable="true" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/linkDeviceNameFragment"
-        android:name="org.thoughtcrime.securesms.registration.fragments.LinkDeviceNameFragment"
-        android:label="fragment_link_device"
-        tools:layout="@layout/fragment_registration_link_device_name">
-
-        <action
-            android:id="@+id/action_linkDevice"
-            app:destination="@id/linkDeviceFragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/linkDeviceFragment"
-        android:name="org.thoughtcrime.securesms.registration.fragments.LinkDeviceFragment"
-        android:label="fragment_link_device"
-        tools:layout="@layout/fragment_registration_link_device">
-
-        <action
-            android:id="@+id/action_linkDeviceComplete"
-            app:destination="@id/registrationCompletePlaceHolderFragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@+id/welcomeFragment"
-            app:popUpToInclusive="true" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/registrationCompletePlaceHolderFragment"
-        android:name="org.thoughtcrime.securesms.registration.fragments.RegistrationCompleteFragment"
-        android:label="fragment_registration_complete_place_holder"
-        tools:layout="@layout/fragment_registration_blank" />
-
     <fragment
         android:id="@+id/networkPreferenceFragment"
         android:name="org.thoughtcrime.securesms.preferences.NetworkPreferenceFragment"
         android:label="NetworkPreferenceFragment" />
 
-    <fragment
-        android:id="@+id/transferOrRestore"
-        android:name="org.thoughtcrime.securesms.devicetransfer.newdevice.TransferOrRestoreFragment"
-        tools:layout="@layout/fragment_transfer_restore">
-
-        <action
-            android:id="@+id/action_choose_backup"
-            app:destination="@id/chooseBackupFragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
-
-        <action
-            android:id="@+id/action_new_device_transfer_instructions"
-            app:destination="@id/newDeviceTransferInstructions"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
-
-        <action
-            android:id="@+id/action_transferOrRestore_to_moreOptions"
-            app:destination="@+id/transferOrRestoreMoreOptionsDialog" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/restoreFromBackupFragment"
-        android:name="org.thoughtcrime.securesms.backup.v2.ui.restore.RestoreFromBackupFragment">
-
-        <action
-            android:id="@+id/action_restoreFromBacakupFragment_to_moreOptions"
-            app:destination="@+id/transferOrRestoreMoreOptionsDialog" />
-
-        <argument
-            android:name="cancelable"
-            app:argType="boolean" />
-
-    </fragment>
-
-    <dialog
-        android:id="@+id/transferOrRestoreMoreOptionsDialog"
-        android:name="org.thoughtcrime.securesms.devicetransfer.moreoptions.MoreTransferOrRestoreOptionsSheet">
-
-        <argument
-            android:name="mode"
-            app:argType="org.thoughtcrime.securesms.devicetransfer.moreoptions.MoreTransferOrRestoreOptionsMode" />
-    </dialog>
-
-    <fragment
-        android:id="@+id/newDeviceTransferInstructions"
-        android:name="org.thoughtcrime.securesms.devicetransfer.newdevice.NewDeviceTransferInstructionsFragment"
-        tools:layout="@layout/new_device_transfer_instructions_fragment">
-
-        <action
-            android:id="@+id/action_device_transfer_setup"
-            app:destination="@id/deviceTransferSetup"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/deviceTransferSetup"
-        android:name="org.thoughtcrime.securesms.devicetransfer.newdevice.NewDeviceTransferSetupFragment"
-        tools:layout="@layout/device_transfer_setup_fragment">
-
-        <action
-            android:id="@+id/action_new_device_transfer"
-            app:destination="@id/newDeviceTransfer"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
-
-        <action
-            android:id="@+id/action_deviceTransferSetup_to_transferOrRestore"
-            app:destination="@id/transferOrRestore"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@id/transferOrRestore"
-            app:popUpToInclusive="true" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/newDeviceTransfer"
-        android:name="org.thoughtcrime.securesms.devicetransfer.newdevice.NewDeviceTransferFragment"
-        tools:layout="@layout/device_transfer_fragment">
-
-        <action
-            android:id="@+id/action_newDeviceTransfer_to_newDeviceTransferInstructions"
-            app:destination="@id/newDeviceTransferInstructions"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@id/newDeviceTransferInstructions"
-            app:popUpToInclusive="true" />
-
-        <action
-            android:id="@+id/action_newDeviceTransfer_to_newDeviceTransferComplete"
-            app:destination="@id/newDeviceTransferComplete"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@id/welcomeFragment" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/newDeviceTransferComplete"
-        android:name="org.thoughtcrime.securesms.devicetransfer.newdevice.NewDeviceTransferCompleteFragment"
-        tools:layout="@layout/new_device_transfer_complete_fragment">
-
-        <action
-            android:id="@+id/action_newDeviceTransferComplete_to_enterPhoneNumberFragment"
-            app:destination="@id/enterPhoneNumberFragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
-
-    </fragment>
-
     <action
         android:id="@+id/action_restart_to_welcomeFragment"
         app:destination="@id/welcomeFragment"
diff --git a/app/src/main/res/navigation/registration_v2.xml b/app/src/main/res/navigation/registration_v2.xml
deleted file mode 100644
index 4ea88cb33d..0000000000
--- a/app/src/main/res/navigation/registration_v2.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/signup_v2"
-    app:startDestination="@id/welcomeV2Fragment">
-
-    <fragment
-        android:id="@+id/welcomeV2Fragment"
-        android:name="org.thoughtcrime.securesms.registration.v2.ui.welcome.WelcomeV2Fragment"
-        android:label="fragment_welcome"
-        tools:layout="@layout/fragment_registration_welcome_v2">
-
-        <action
-            android:id="@+id/action_skip_restore"
-            app:destination="@id/enterPhoneNumberV2Fragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
-
-        <action
-            android:id="@+id/action_go_to_registration"
-            app:destination="@id/enterPhoneNumberV2Fragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
-
-        <action
-            android:id="@+id/action_welcomeFragment_to_grantPermissionsV2Fragment"
-            app:destination="@id/grantPermissionsV2Fragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/grantPermissionsV2Fragment"
-        android:name="org.thoughtcrime.securesms.registration.v2.ui.grantpermissions.GrantPermissionsV2Fragment"
-        android:label="fragment_grant_permissions">
-
-        <action
-            android:id="@+id/action_enter_phone_number"
-            app:destination="@id/enterPhoneNumberV2Fragment"
-            app:popUpTo="@+id/welcomeV2Fragment"
-            app:popUpToInclusive="true"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
-
-        <argument
-            android:name="welcomeAction"
-            app:argType="org.thoughtcrime.securesms.registration.v2.ui.grantpermissions.GrantPermissionsV2Fragment$WelcomeAction" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/enterPhoneNumberV2Fragment"
-        android:name="org.thoughtcrime.securesms.registration.v2.ui.phonenumber.EnterPhoneNumberV2Fragment"
-        android:label="fragment_enter_phone_number"
-        tools:layout="@layout/fragment_registration_enter_phone_number_v2">
-
-         <action
-            android:id="@+id/action_enterVerificationCode"
-            app:destination="@id/enterCodeV2Fragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
-
-        <action
-            android:id="@+id/action_requestCaptcha"
-            app:destination="@id/captchaV2Fragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
-
-        <action
-            android:id="@+id/action_editProxy"
-            app:destination="@+id/registrationProxyV2Fragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
-
-        <action
-            android:id="@+id/action_reRegisterWithPinV2Fragment"
-            app:destination="@id/reRegisterWithPinV2Fragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@id/enterPhoneNumberV2Fragment"
-            app:popUpToInclusive="true" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/countryPickerV2Fragment"
-        android:name="org.thoughtcrime.securesms.registration.fragments.CountryPickerFragment"
-        android:label="fragment_country_picker"
-        tools:layout="@layout/fragment_registration_country_picker" />
-
-    <fragment
-        android:id="@+id/enterCodeV2Fragment"
-        android:name="org.thoughtcrime.securesms.registration.v2.ui.entercode.EnterCodeV2Fragment"
-        android:label="fragment_enter_code"
-        tools:layout="@layout/fragment_registration_enter_code_v2">
-
-        <action
-            android:id="@+id/action_requireKbsLockPin"
-            app:destination="@id/registrationLockV2Fragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@+id/welcomeV2Fragment"
-            app:popUpToInclusive="true" />
-
-        <action
-            android:id="@+id/action_requestCaptcha"
-            app:destination="@id/captchaV2Fragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
-
-        <action
-            android:id="@+id/action_successfulRegistration"
-            app:destination="@id/registrationCompletePlaceHolderV2Fragment"
-            app:popUpTo="@+id/welcomeV2Fragment"
-            app:popUpToInclusive="true" />
-
-        <action
-            android:id="@+id/action_accountLocked"
-            app:destination="@id/accountLockedV2Fragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@+id/welcomeV2Fragment"
-            app:popUpToInclusive="true" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/registrationLockV2Fragment"
-        android:name="org.thoughtcrime.securesms.registration.fragments.RegistrationLockFragment"
-        android:label="fragment_kbs_lock"
-        tools:layout="@layout/fragment_registration_lock">
-
-        <action
-            android:id="@+id/action_successfulRegistration"
-            app:destination="@id/registrationCompletePlaceHolderV2Fragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@+id/welcomeV2Fragment"
-            app:popUpToInclusive="true" />
-
-        <action
-            android:id="@+id/action_accountLocked"
-            app:destination="@id/accountLockedV2Fragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@+id/welcomeV2Fragment"
-            app:popUpToInclusive="true" />
-
-        <argument
-            android:name="timeRemaining"
-            app:argType="long" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/reRegisterWithPinV2Fragment"
-        android:name="org.thoughtcrime.securesms.registration.v2.ui.reregisterwithpin.ReRegisterWithPinV2Fragment"
-        tools:layout="@layout/fragment_registration_lock">
-
-        <action
-            android:id="@+id/action_reRegisterWithPinFragment_to_registrationCompletePlaceHolderV2Fragment"
-            app:destination="@id/registrationCompletePlaceHolderV2Fragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@+id/welcomeV2Fragment"
-            app:popUpToInclusive="true" />
-
-        <action
-            android:id="@+id/action_reRegisterWithPinFragment_to_enterPhoneNumberV2Fragment"
-            app:destination="@id/enterPhoneNumberV2Fragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@+id/reRegisterWithPinV2Fragment"
-            app:popUpToInclusive="true" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/accountLockedV2Fragment"
-        android:name="org.thoughtcrime.securesms.registration.fragments.AccountLockedFragment"
-        android:label="fragment_account_locked"
-        tools:layout="@layout/account_locked_fragment" />
-
-    <fragment
-        android:id="@+id/captchaV2Fragment"
-        android:name="org.thoughtcrime.securesms.registration.v2.ui.captcha.CaptchaFragment"
-        android:label="fragment_captcha"
-        tools:layout="@layout/fragment_registration_captcha" />
-
-    <fragment
-        android:id="@+id/registrationCompletePlaceHolderV2Fragment"
-        android:name="org.thoughtcrime.securesms.registration.fragments.RegistrationCompleteFragment"
-        android:label="fragment_registration_complete_place_holder"
-        tools:layout="@layout/fragment_registration_blank" />
-
-    <fragment
-        android:id="@+id/registrationProxyV2Fragment"
-        android:name="org.thoughtcrime.securesms.preferences.EditProxyFragment"
-        android:label="fragment_registration_edit_proxy"
-        tools:layout="@layout/edit_proxy_fragment" />
-
-    <action
-        android:id="@+id/action_restart_to_welcomeV2Fragment"
-        app:destination="@id/welcomeV2Fragment"
-        app:enterAnim="@anim/nav_default_enter_anim"
-        app:exitAnim="@anim/nav_default_exit_anim"
-        app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-        app:popExitAnim="@anim/nav_default_pop_exit_anim"
-        app:popUpTo="@id/welcomeV2Fragment"
-        app:popUpToInclusive="true" />
-
-</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/restore.xml b/app/src/main/res/navigation/restore.xml
index d2fec82cf9..a9601fe206 100644
--- a/app/src/main/res/navigation/restore.xml
+++ b/app/src/main/res/navigation/restore.xml
@@ -28,7 +28,7 @@
             app:destination="@+id/transferOrRestoreMoreOptionsDialog" />
 
         <action
-            android:id="@+id/action_transfer_or_restore_to_restore"
+            android:id="@+id/action_transfer_or_restore_to_local_restore"
             app:destination="@id/choose_local_backup_fragment"
             app:enterAnim="@anim/nav_default_enter_anim"
             app:exitAnim="@anim/nav_default_exit_anim"
@@ -38,9 +38,9 @@
 
     <fragment
         android:id="@+id/choose_local_backup_fragment"
-        android:name="org.thoughtcrime.securesms.restore.choosebackup.ChooseBackupV2Fragment"
+        android:name="org.thoughtcrime.securesms.restore.choosebackup.ChooseBackupFragment"
         android:label="choose_local_backup"
-        tools:layout="@layout/fragment_choose_backup_v2">
+        tools:layout="@layout/fragment_choose_backup">
 
         <action
             android:id="@+id/action_choose_local_backup_fragment_to_restore_local_backup_fragment"
@@ -51,17 +51,7 @@
         android:id="@+id/restore_local_backup_fragment"
         android:name="org.thoughtcrime.securesms.restore.restorelocalbackup.RestoreLocalBackupFragment"
         android:label="restore_local_backup"
-        tools:layout="@layout/fragment_restore_local_backup_v2">
-
-        <action
-            android:id="@id/action_backupRestored"
-            app:destination="@id/restoreCompleteFragment"
-            app:enterAnim="@anim/nav_default_enter_anim"
-            app:exitAnim="@anim/nav_default_exit_anim"
-            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
-            app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@id/restoreBackupV2Fragment"
-            app:popUpToInclusive="true" />
+        tools:layout="@layout/fragment_restore_local_backup">
 
         <action
             android:id="@+id/action_skip"
@@ -90,13 +80,6 @@
             app:popExitAnim="@anim/nav_default_pop_exit_anim"
             app:popUpTo="@+id/restoreBackupV2Fragment"
             app:popUpToInclusive="true" />
-
-        <argument
-            android:name="uri"
-            android:defaultValue="@null"
-            app:argType="android.net.Uri"
-            app:nullable="true" />
-
     </fragment>
 
     <dialog
@@ -151,7 +134,7 @@
     <fragment
         android:id="@+id/newDeviceTransfer"
         android:name="org.thoughtcrime.securesms.devicetransfer.newdevice.NewDeviceTransferFragment"
-        tools:layout="@layout/device_transfer_fragment">
+        tools:layout="@layout/fragment_device_transfer">
 
         <action
             android:id="@+id/action_newDeviceTransfer_to_newDeviceTransferInstructions"
@@ -170,7 +153,7 @@
             app:exitAnim="@anim/nav_default_exit_anim"
             app:popEnterAnim="@anim/nav_default_pop_enter_anim"
             app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@id/welcomeV2Fragment" />
+            app:popUpTo="@id/welcomeFragment" />
 
     </fragment>
 
@@ -205,6 +188,6 @@
 
     <fragment
         android:id="@+id/restoreCompleteFragment"
-        android:name="org.thoughtcrime.securesms.restore.restorecomplete.RestoreCompleteV2Fragment" />
+        android:name="org.thoughtcrime.securesms.restore.restorecomplete.RestoreCompleteFragment" />
 
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/raw-night/linking_device.json b/app/src/main/res/raw-night/linking_device.json
new file mode 100644
index 0000000000..f1ce946574
--- /dev/null
+++ b/app/src/main/res/raw-night/linking_device.json
@@ -0,0 +1 @@
+{"v":"5.6.5","fr":30,"ip":0,"op":240,"w":768,"h":768,"nm":"Linking a device - dark","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Layer 4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[384,408.994,0],"ix":2},"a":{"a":0,"k":[384,408.994,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.108,0],[0,0],[0,-3.112],[0,0],[-3.109,0],[0,0],[0,3.112],[0,0]],"o":[[0,0],[-3.109,0],[0,0],[0,3.112],[0,0],[3.108,0],[0,0],[0,-3.112]],"v":[[3.754,-9.381],[-3.754,-9.381],[-9.383,-3.752],[-9.383,3.752],[-3.754,9.381],[3.754,9.381],[9.383,3.752],[9.383,-3.752]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137255013,0.270588248968,0.992156863213,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[404.643,445.926],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.112,0],[0,0],[0,-3.108],[0,0],[-3.112,0],[0,0],[0,3.108],[0,0]],"o":[[0,0],[-3.112,0],[0,0],[0,3.108],[0,0],[3.112,0],[0,0],[0,-3.108]],"v":[[3.752,-9.383],[-3.752,-9.383],[-9.381,-3.754],[-9.381,3.754],[-3.752,9.383],[3.752,9.383],[9.381,3.754],[9.381,-3.754]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137255013,0.270588248968,0.992156863213,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[445.926,404.643],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.112,0],[0,0],[0,-3.112],[0,0],[-3.112,0],[0,0],[0,3.112],[0,0]],"o":[[0,0],[-3.112,0],[0,0],[0,3.112],[0,0],[3.112,0],[0,0],[0,-3.112]],"v":[[3.752,-9.381],[-3.752,-9.381],[-9.381,-3.752],[-9.381,3.752],[-3.752,9.381],[3.752,9.381],[9.381,3.752],[9.381,-3.752]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137255013,0.270588248968,0.992156863213,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[445.926,445.926],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.107,0],[0,0],[0,-3.108],[0,0],[-3.108,0],[0,0],[0,3.108],[0,0]],"o":[[0,0],[-3.108,0],[0,0],[0,3.108],[0,0],[3.107,0],[0,0],[0,-3.108]],"v":[[3.754,-9.383],[-3.754,-9.383],[-9.383,-3.754],[-9.383,3.754],[-3.754,9.383],[3.754,9.383],[9.383,3.754],[9.383,-3.754]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137255013,0.270588248968,0.992156863213,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[425.283,425.283],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.108,0],[0,0],[0,-3.108],[0,0],[-3.109,0],[0,0],[0,3.108],[0,0]],"o":[[0,0],[-3.109,0],[0,0],[0,3.108],[0,0],[3.108,0],[0,0],[0,-3.108]],"v":[[3.754,-9.383],[-3.754,-9.383],[-9.383,-3.754],[-9.383,3.754],[-3.754,9.383],[3.754,9.383],[9.383,3.754],[9.383,-3.754]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137255013,0.270588248968,0.992156863213,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[404.643,404.643],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":2,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.126,-1.548],[0.063,-0.124],[0.883,-0.45],[1.473,-0.12],[3.261,0],[0,0],[1.549,0.126],[0.121,0.063],[0.446,0.883],[0.122,1.471],[0,3.261],[0,0],[-0.126,1.548],[-0.063,0.124],[-0.883,0.45],[-1.468,0.12],[-3.261,0],[0,0],[-1.549,-0.127],[-0.126,-0.063],[-0.451,-0.883],[-0.122,-1.471],[0,-3.261]],"o":[[0,3.261],[-0.122,1.471],[-0.451,0.883],[-0.126,0.063],[-1.549,0.126],[0,0],[-3.261,0],[-1.468,-0.12],[-0.883,-0.45],[-0.063,-0.124],[-0.126,-1.548],[0,0],[0,-3.261],[0.122,-1.471],[0.446,-0.883],[0.121,-0.063],[1.549,-0.127],[0,0],[3.261,0],[1.473,0.12],[0.883,0.45],[0.063,0.124],[0.126,1.548],[0,0]],"v":[[21.579,10.133],[21.448,16.993],[21.07,19.019],[19.021,21.069],[16.994,21.449],[10.135,21.58],[-10.132,21.58],[-16.995,21.449],[-19.017,21.069],[-21.067,19.019],[-21.45,16.993],[-21.58,10.133],[-21.58,-10.134],[-21.45,-16.993],[-21.067,-19.019],[-19.017,-21.069],[-16.995,-21.449],[-10.132,-21.58],[10.135,-21.58],[16.994,-21.449],[19.021,-21.069],[21.07,-19.019],[21.448,-16.993],[21.579,-10.134]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[1.162,2.284],[3.355,1.709],[2.284,0.187],[2.945,0],[0,0],[2.148,-0.176],[2.285,-1.164],[1.709,-3.354],[0.187,-2.284],[0,-2.944],[0,0],[-0.175,-2.148],[-1.164,-2.285],[-3.354,-1.709],[-2.283,-0.187],[-2.941,0],[0,0],[-2.144,0.175],[-2.288,1.164],[-1.711,3.354],[-0.185,2.284],[0,2.944],[0,0],[0.176,2.147]],"o":[[-1.711,-3.354],[-2.288,-1.164],[-2.144,-0.176],[0,0],[-2.941,0],[-2.283,0.187],[-3.354,1.709],[-1.164,2.284],[-0.175,2.147],[0,0],[0,2.944],[0.187,2.284],[1.709,3.354],[2.285,1.164],[2.148,0.175],[0,0],[2.945,0],[2.284,-0.187],[3.355,-1.709],[1.162,-2.285],[0.176,-2.148],[0,0],[0,-2.943],[-0.185,-2.284]],"v":[[32.775,-24.982],[24.984,-32.773],[18.061,-34.541],[10.378,-34.716],[-10.38,-34.716],[-18.063,-34.541],[-24.982,-32.773],[-32.773,-24.982],[-34.541,-18.063],[-34.716,-10.378],[-34.716,10.378],[-34.541,18.063],[-32.773,24.982],[-24.982,32.773],[-18.063,34.541],[-10.38,34.716],[10.378,34.716],[18.061,34.541],[24.984,32.773],[32.775,24.982],[34.54,18.063],[34.716,10.378],[34.716,-10.379],[34.54,-18.063]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137255013,0.270588248968,0.992156863213,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[425.284,342.716],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6","np":3,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.107,0],[0,0],[0,-3.109],[0,0],[-3.108,0],[0,0],[0,3.109],[0,0]],"o":[[0,0],[-3.108,0],[0,0],[0,3.109],[0,0],[3.107,0],[0,0],[0,-3.109]],"v":[[3.754,-9.383],[-3.754,-9.383],[-9.383,-3.753],[-9.383,3.753],[-3.754,9.383],[3.754,9.383],[9.383,3.753],[9.383,-3.753]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137255013,0.270588248968,0.992156863213,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[425.283,342.716],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 7","np":2,"cix":2,"bm":0,"ix":7,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.126,-1.549],[0.063,-0.126],[0.883,-0.45],[1.471,-0.122],[3.261,0],[0,0],[1.548,0.126],[0.124,0.063],[0.45,0.883],[0.12,1.473],[0,3.261],[0,0],[-0.127,1.549],[-0.063,0.122],[-0.883,0.446],[-1.471,0.122],[-3.261,0],[0,0],[-1.548,-0.126],[-0.124,-0.063],[-0.45,-0.883],[-0.12,-1.468],[0,-3.261]],"o":[[0,3.261],[-0.12,1.473],[-0.45,0.883],[-0.124,0.063],[-1.548,0.126],[0,0],[-3.261,0],[-1.471,-0.122],[-0.883,-0.45],[-0.063,-0.126],[-0.127,-1.549],[0,0],[0,-3.261],[0.12,-1.468],[0.45,-0.883],[0.124,-0.063],[1.548,-0.126],[0,0],[3.261,0],[1.471,0.122],[0.883,0.446],[0.063,0.122],[0.126,1.549],[0,0]],"v":[[21.58,10.136],[21.449,16.995],[21.069,19.021],[19.019,21.07],[16.994,21.449],[10.133,21.58],[-10.133,21.58],[-16.993,21.449],[-19.019,21.07],[-21.069,19.021],[-21.448,16.995],[-21.58,10.136],[-21.58,-10.131],[-21.448,-16.995],[-21.069,-19.017],[-19.019,-21.066],[-16.993,-21.449],[-10.133,-21.58],[10.133,-21.58],[16.994,-21.449],[19.019,-21.066],[21.069,-19.017],[21.449,-16.995],[21.58,-10.131]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[1.164,2.284],[3.354,1.707],[2.284,0.189],[2.944,0],[0,0],[2.147,-0.176],[2.284,-1.167],[1.709,-3.355],[0.187,-2.284],[0,-2.941],[0,0],[-0.176,-2.144],[-1.164,-2.288],[-3.354,-1.711],[-2.284,-0.185],[-2.943,0],[0,0],[-2.148,0.176],[-2.285,1.162],[-1.709,3.355],[-0.187,2.284],[0,2.945],[0,0],[0.175,2.148]],"o":[[-1.709,-3.355],[-2.285,-1.167],[-2.148,-0.176],[0,0],[-2.943,0],[-2.284,0.189],[-3.354,1.707],[-1.164,2.284],[-0.176,2.148],[0,0],[0,2.945],[0.187,2.284],[1.709,3.355],[2.284,1.162],[2.147,0.176],[0,0],[2.944,0],[2.284,-0.185],[3.354,-1.711],[1.164,-2.288],[0.175,-2.144],[0,0],[0,-2.941],[-0.187,-2.284]],"v":[[32.773,-24.98],[24.982,-32.771],[18.063,-34.541],[10.378,-34.717],[-10.378,-34.717],[-18.063,-34.541],[-24.982,-32.771],[-32.773,-24.98],[-34.541,-18.062],[-34.716,-10.379],[-34.716,10.379],[-34.541,18.062],[-32.773,24.984],[-24.982,32.776],[-18.063,34.541],[-10.378,34.717],[10.378,34.717],[18.063,34.541],[24.982,32.776],[32.773,24.984],[34.541,18.062],[34.716,10.379],[34.716,-10.379],[34.541,-18.062]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137255013,0.270588248968,0.992156863213,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[342.716,425.283],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 8","np":3,"cix":2,"bm":0,"ix":8,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.109,0],[0,0],[0,-3.108],[0,0],[-3.109,0],[0,0],[0,3.108],[0,0]],"o":[[0,0],[-3.109,0],[0,0],[0,3.108],[0,0],[3.109,0],[0,0],[0,-3.108]],"v":[[3.753,-9.383],[-3.753,-9.383],[-9.383,-3.754],[-9.383,3.754],[-3.753,9.383],[3.753,9.383],[9.383,3.754],[9.383,-3.754]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137255013,0.270588248968,0.992156863213,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[342.716,425.283],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 9","np":2,"cix":2,"bm":0,"ix":9,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.126,-1.548],[0.063,-0.124],[0.883,-0.45],[1.471,-0.12],[3.261,0],[0,0],[1.548,0.126],[0.124,0.063],[0.45,0.883],[0.12,1.471],[0,3.261],[0,0],[-0.127,1.548],[-0.063,0.124],[-0.883,0.45],[-1.471,0.12],[-3.261,0],[0,0],[-1.548,-0.127],[-0.124,-0.063],[-0.45,-0.883],[-0.12,-1.471],[0,-3.261]],"o":[[0,3.261],[-0.12,1.471],[-0.45,0.883],[-0.124,0.063],[-1.548,0.126],[0,0],[-3.261,0],[-1.471,-0.12],[-0.883,-0.45],[-0.063,-0.124],[-0.127,-1.548],[0,0],[0,-3.261],[0.12,-1.471],[0.45,-0.883],[0.124,-0.063],[1.548,-0.127],[0,0],[3.261,0],[1.471,0.12],[0.883,0.45],[0.063,0.124],[0.126,1.548],[0,0]],"v":[[21.58,10.133],[21.449,16.993],[21.069,19.019],[19.019,21.069],[16.994,21.449],[10.133,21.58],[-10.133,21.58],[-16.993,21.449],[-19.019,21.069],[-21.069,19.019],[-21.448,16.993],[-21.58,10.133],[-21.58,-10.134],[-21.448,-16.993],[-21.069,-19.019],[-19.019,-21.069],[-16.993,-21.449],[-10.133,-21.58],[10.133,-21.58],[16.994,-21.449],[19.019,-21.069],[21.069,-19.019],[21.449,-16.993],[21.58,-10.134]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[1.164,2.284],[3.354,1.709],[2.284,0.187],[2.944,0],[0,0],[2.147,-0.176],[2.284,-1.164],[1.709,-3.354],[0.187,-2.284],[0,-2.944],[0,0],[-0.176,-2.148],[-1.164,-2.285],[-3.354,-1.709],[-2.284,-0.187],[-2.943,0],[0,0],[-2.147,0.175],[-2.285,1.164],[-1.709,3.354],[-0.187,2.284],[0,2.943],[0,0],[0.175,2.147]],"o":[[-1.709,-3.354],[-2.285,-1.164],[-2.148,-0.176],[0,0],[-2.943,0],[-2.284,0.187],[-3.354,1.709],[-1.164,2.284],[-0.176,2.147],[0,0],[0,2.944],[0.187,2.284],[1.709,3.354],[2.284,1.164],[2.147,0.175],[0,0],[2.943,0],[2.284,-0.187],[3.354,-1.709],[1.164,-2.285],[0.175,-2.147],[0,0],[0,-2.943],[-0.187,-2.284]],"v":[[32.773,-24.982],[24.982,-32.773],[18.063,-34.541],[10.378,-34.716],[-10.378,-34.716],[-18.063,-34.541],[-24.982,-32.773],[-32.773,-24.982],[-34.541,-18.063],[-34.716,-10.378],[-34.716,10.378],[-34.541,18.063],[-32.773,24.982],[-24.982,32.773],[-18.063,34.541],[-10.378,34.716],[10.379,34.716],[18.063,34.541],[24.982,32.773],[32.773,24.982],[34.541,18.063],[34.716,10.378],[34.716,-10.379],[34.541,-18.063]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137255013,0.270588248968,0.992156863213,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[342.716,342.716],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 10","np":3,"cix":2,"bm":0,"ix":10,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.109,0],[0,0],[0,-3.109],[0,0],[-3.109,0],[0,0],[0,3.109],[0,0]],"o":[[0,0],[-3.109,0],[0,0],[0,3.109],[0,0],[3.109,0],[0,0],[0,-3.109]],"v":[[3.753,-9.383],[-3.753,-9.383],[-9.383,-3.753],[-9.383,3.753],[-3.753,9.383],[3.753,9.383],[9.383,3.753],[9.383,-3.753]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137255013,0.270588248968,0.992156863213,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[342.716,342.716],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 11","np":2,"cix":2,"bm":0,"ix":11,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[14.36,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,14.36],[-14.36,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,-14.36]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[-14.36,0],[0,-14.36],[0,0],[0,0],[0,0],[0,0],[0,0],[14.36,0],[0,14.36]],"v":[[304,218],[231.198,218],[192,218],[-192,218],[-231.198,218],[-304,218],[-330,192],[-304,166],[-261.697,166],[-249.69,166],[249.69,166],[261.697,166],[304,166],[330,192]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[-32.032,0],[0,0],[0,-32.032],[0,0],[0,0]],"o":[[0,-32.032],[0,0],[32.032,0],[0,0],[0,0],[0,0]],"v":[[-250,-160],[-192,-218],[192,-218],[250,-160],[250,154],[-250,154]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[20.988,0],[0,0],[0,0],[38.66,0],[0,0],[0,-38.66],[0,0],[0,0],[0,-20.988],[-20.987,0],[0,0],[0,0],[0,0],[0,20.988]],"o":[[0,0],[0,0],[0,-38.66],[0,0],[-38.66,0],[0,0],[0,0],[-20.987,0],[0,20.988],[0,0],[0,0],[0,0],[20.988,0],[0,-20.988]],"v":[[304,154],[262,154],[262,-160],[192,-230],[-192,-230],[-262,-160],[-262,154],[-304,154],[-342,192],[-304,230],[-192,230],[192,230],[304,230],[342,192]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137255013,0.270588248968,0.992156863213,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[384,408.994],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 12","np":4,"cix":2,"bm":0,"ix":12,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Layer 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[394.873,421.994,0],"ix":2},"a":{"a":0,"k":[394.873,421.994,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[3.112,0],[0,0],[0,3.108],[0,0],[-3.112,0],[0,0],[0,-3.108]],"o":[[0,3.108],[0,0],[-3.112,0],[0,0],[0,-3.108],[0,0],[3.112,0],[0,0]],"v":[[60.434,-13.598],[54.804,-7.968],[47.301,-7.968],[41.672,-13.598],[41.672,-21.106],[47.301,-26.735],[54.804,-26.735],[60.434,-21.106]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[3.112,0],[0,0],[0,3.112],[0,0],[-3.112,0],[0,0],[0,-3.112]],"o":[[0,3.112],[0,0],[-3.112,0],[0,0],[0,-3.112],[0,0],[3.112,0],[0,0]],"v":[[60.434,27.683],[54.804,33.313],[47.301,33.313],[41.672,27.683],[41.672,20.18],[47.301,14.55],[54.804,14.55],[60.434,20.18]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0,0],[3.107,0],[0,0],[0,3.108],[0,0],[-3.108,0],[0,0],[0,-3.108]],"o":[[0,3.108],[0,0],[-3.108,0],[0,0],[0,-3.108],[0,0],[3.107,0],[0,0]],"v":[[39.794,7.043],[34.164,12.672],[26.656,12.672],[21.027,7.043],[21.027,-0.465],[26.656,-6.095],[34.164,-6.095],[39.794,-0.465]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0,0],[3.108,0],[0,0],[0,3.108],[0,0],[-3.109,0],[0,0],[0,-3.108]],"o":[[0,3.108],[0,0],[-3.109,0],[0,0],[0,-3.108],[0,0],[3.108,0],[0,0]],"v":[[19.153,-13.598],[13.523,-7.968],[6.016,-7.968],[0.386,-13.598],[0.386,-21.106],[6.016,-26.735],[13.523,-26.735],[19.153,-21.106]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0,0],[3.108,0],[0,0],[0,3.112],[0,0],[-3.109,0],[0,0],[0,-3.112]],"o":[[0,3.112],[0,0],[-3.109,0],[0,0],[0,-3.112],[0,0],[3.108,0],[0,0]],"v":[[19.153,27.683],[13.523,33.313],[6.016,33.313],[0.386,27.683],[0.386,20.18],[6.016,14.55],[13.523,14.55],[19.153,20.18]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[0,0],[0.175,-2.144],[1.164,-2.288],[3.354,-1.711],[2.284,-0.185],[2.944,0],[0,0],[2.147,0.176],[2.284,1.162],[1.709,3.355],[0.187,2.284],[0,2.945],[0,0],[-0.176,2.148],[-1.164,2.284],[-3.354,1.707],[-2.284,0.189],[-2.943,0],[0,0],[-2.148,-0.176],[-2.285,-1.167],[-1.709,-3.355],[-0.187,-2.284],[0,-2.941]],"o":[[0,2.945],[-0.187,2.284],[-1.709,3.355],[-2.285,1.162],[-2.148,0.176],[0,0],[-2.943,0],[-2.284,-0.185],[-3.354,-1.711],[-1.164,-2.288],[-0.176,-2.144],[0,0],[0,-2.941],[0.187,-2.284],[1.709,-3.355],[2.284,-1.167],[2.147,-0.176],[0,0],[2.944,0],[2.284,0.189],[3.354,1.707],[1.164,2.284],[0.175,2.148],[0,0]],"v":[[-17.441,13.668],[-17.616,21.351],[-19.384,28.273],[-27.175,36.064],[-34.094,37.83],[-41.779,38.006],[-62.536,38.006],[-70.22,37.83],[-77.139,36.064],[-84.93,28.273],[-86.698,21.351],[-86.873,13.668],[-86.873,-7.09],[-86.698,-14.773],[-84.93,-21.691],[-77.139,-29.482],[-70.22,-31.252],[-62.535,-31.428],[-41.779,-31.428],[-34.094,-31.252],[-27.175,-29.482],[-19.384,-21.691],[-17.616,-14.773],[-17.441,-7.09]],"c":true},"ix":2},"nm":"Path 6","mn":"ADBE Vector Shape - Group","hd":false},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[18.268,0],[48.598,-17.471],[0,0],[-2.144,-0.176],[-2.288,-1.164],[-1.711,-3.354],[-0.185,-2.284],[0,-2.943],[0,0],[0.176,-2.148],[1.162,-2.285],[3.355,-1.709],[2.284,-0.187],[2.945,0],[0,0],[2.148,0.175],[2.285,1.164],[1.709,3.354],[0.187,2.284],[0,2.944],[0,0],[-0.175,2.147],[-0.24,1.081],[4.561,-2.242],[0,-1.578],[0,0],[0.175,-2.147],[1.164,-2.285],[3.354,-1.709],[2.284,-0.187],[2.943,0],[0,0],[2.147,0.175],[2.284,1.164],[1.72,3.054],[32.866,-78.24],[0,0],[0,0]],"o":[[-54.617,0],[0,0],[2.945,0],[2.284,0.187],[3.355,1.709],[1.162,2.284],[0.176,2.147],[0,0],[0,2.944],[-0.185,2.284],[-1.711,3.354],[-2.288,1.164],[-2.144,0.175],[0,0],[-2.941,0],[-2.283,-0.187],[-3.354,-1.709],[-1.164,-2.285],[-0.175,-2.148],[0,0],[0,-2.944],[0.087,-1.066],[-4.644,2.094],[0.027,1.362],[0,0],[0,2.943],[-0.187,2.284],[-1.709,3.354],[-2.285,1.164],[-2.147,0.175],[0,0],[-2.943,0],[-2.284,-0.187],[-3.133,-1.596],[-67.817,49.178],[0,0],[0,0],[-17.712,-2.071]],"v":[[185.127,-141],[29.528,-113.994],[40.789,-113.994],[48.472,-113.819],[55.394,-112.052],[63.186,-104.26],[64.951,-97.342],[65.127,-89.657],[65.127,-68.9],[64.951,-61.215],[63.186,-54.296],[55.394,-46.506],[48.472,-44.737],[40.789,-44.562],[20.031,-44.562],[12.348,-44.737],[5.429,-46.506],[-2.362,-54.296],[-4.13,-61.215],[-4.305,-68.9],[-4.305,-89.656],[-4.13,-97.342],[-3.661,-100.569],[-17.47,-94.067],[-17.441,-89.657],[-17.441,-68.9],[-17.616,-61.215],[-19.384,-54.296],[-27.175,-46.506],[-34.094,-44.737],[-41.778,-44.562],[-62.536,-44.562],[-70.22,-44.737],[-77.139,-46.506],[-84.568,-53.649],[-239.127,141],[239.127,141],[239.127,-137.864]],"c":true},"ix":2},"nm":"Path 7","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.75686275959,0.780392169952,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[394.873,421.994],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":8,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[3.109,0],[0,0],[0,3.108],[0,0],[-3.109,0],[0,0],[0,-3.108]],"o":[[0,3.108],[0,0],[-3.109,0],[0,0],[0,-3.108],[0,0],[3.109,0],[0,0]],"v":[[9.383,3.754],[3.753,9.383],[-3.753,9.383],[-9.383,3.754],[-9.383,-3.754],[-3.753,-9.383],[3.753,-9.383],[9.383,-3.754]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.063,0.122],[0.883,0.446],[1.471,0.122],[3.261,0],[0,0],[1.548,-0.126],[0.124,-0.063],[0.45,-0.883],[0.12,-1.468],[0,-3.261],[0,0],[-0.127,-1.549],[-0.063,-0.126],[-0.883,-0.45],[-1.471,-0.122],[-3.261,0],[0,0],[-1.548,0.126],[-0.124,0.063],[-0.45,0.883],[-0.12,1.473],[0,3.261],[0,0],[0.126,1.549]],"o":[[-0.45,-0.883],[-0.124,-0.063],[-1.548,-0.126],[0,0],[-3.261,0],[-1.471,0.122],[-0.883,0.446],[-0.063,0.122],[-0.127,1.549],[0,0],[0,3.261],[0.12,1.473],[0.45,0.883],[0.124,0.063],[1.548,0.126],[0,0],[3.261,0],[1.471,-0.122],[0.883,-0.45],[0.063,-0.126],[0.126,-1.549],[0,0],[0,-3.261],[-0.12,-1.468]],"v":[[21.069,-19.017],[19.018,-21.066],[16.994,-21.449],[10.133,-21.58],[-10.133,-21.58],[-16.993,-21.449],[-19.019,-21.066],[-21.069,-19.017],[-21.449,-16.995],[-21.58,-10.131],[-21.58,10.136],[-21.449,16.995],[-21.069,19.021],[-19.019,21.07],[-16.993,21.449],[-10.133,21.58],[10.133,21.58],[16.994,21.449],[19.018,21.07],[21.069,19.021],[21.449,16.995],[21.58,10.136],[21.58,-10.131],[21.449,-16.995]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.75686275959,0.780392169952,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[342.716,425.283],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":3,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-3.108,0],[0,0],[0,-3.109],[0,0],[3.107,0],[0,0],[0,3.109]],"o":[[0,-3.109],[0,0],[3.107,0],[0,0],[0,3.109],[0,0],[-3.108,0],[0,0]],"v":[[-9.383,-3.753],[-3.754,-9.383],[3.754,-9.383],[9.384,-3.753],[9.384,3.753],[3.754,9.383],[-3.754,9.383],[-9.383,3.753]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.446,-0.883],[0.122,-1.471],[0,-3.261],[0,0],[-0.126,-1.548],[-0.063,-0.124],[-0.883,-0.45],[-1.468,-0.12],[-3.261,0],[0,0],[-1.549,0.126],[-0.126,0.063],[-0.451,0.883],[-0.122,1.471],[0,3.261],[0,0],[0.126,1.548],[0.063,0.124],[0.883,0.45],[1.473,0.12],[3.261,0],[0,0],[1.549,-0.127],[0.121,-0.063]],"o":[[-0.063,0.124],[-0.126,1.548],[0,0],[0,3.261],[0.122,1.471],[0.446,0.883],[0.121,0.063],[1.549,0.126],[0,0],[3.261,0],[1.473,-0.12],[0.883,-0.45],[0.063,-0.124],[0.126,-1.548],[0,0],[0,-3.261],[-0.122,-1.471],[-0.451,-0.883],[-0.126,-0.063],[-1.549,-0.127],[0,0],[-3.261,0],[-1.468,0.12],[-0.883,0.45]],"v":[[-21.066,-19.019],[-21.449,-16.993],[-21.58,-10.133],[-21.58,10.133],[-21.449,16.993],[-21.066,19.019],[-19.017,21.069],[-16.995,21.449],[-10.131,21.58],[10.135,21.58],[16.995,21.449],[19.021,21.069],[21.071,19.019],[21.449,16.993],[21.58,10.133],[21.58,-10.133],[21.449,-16.993],[21.071,-19.019],[19.021,-21.069],[16.995,-21.448],[10.135,-21.58],[-10.131,-21.58],[-16.995,-21.448],[-19.017,-21.069]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.75686275959,0.780392169952,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[425.283,342.716],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":3,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.883,-0.45],[-1.471,-0.12],[-3.261,0],[0,0],[-1.548,0.126],[-0.124,0.063],[-0.45,0.883],[-0.12,1.471],[0,3.261],[0,0],[4.029,-2.303],[0,0],[3.109,0],[0,0],[0.903,0.616],[4.749,-3.236],[-0.049,-0.095]],"o":[[0.124,0.063],[1.548,0.126],[0,0],[3.261,0],[1.471,-0.12],[0.883,-0.45],[0.063,-0.124],[0.126,-1.548],[0,0],[-4.104,2.183],[0,0],[0,3.109],[0,0],[-1.176,0],[-4.874,3.06],[0.111,0.79],[0.45,0.883]],"v":[[-19.131,14.326],[-17.106,14.705],[-10.246,14.837],[10.021,14.837],[16.881,14.705],[18.906,14.326],[20.956,12.275],[21.336,10.25],[21.468,3.39],[21.468,-14.837],[9.27,-8.104],[9.27,-2.99],[3.641,2.639],[-3.866,2.639],[-7.035,1.662],[-21.468,11.11],[-21.181,12.275]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.75686275959,0.780392169952,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[342.829,349.459],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Layer 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[384,408.994,0],"ix":2},"a":{"a":0,"k":[384,408.994,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-67.817,49.178],[0.113,0.221],[0.187,2.284],[0,2.944],[0,0],[-0.176,2.147],[-1.164,2.284],[-3.354,1.709],[-2.284,0.187],[-2.943,0],[0,0],[-2.148,-0.176],[-2.285,-1.164],[-1.709,-3.354],[-0.187,-2.284],[-0.023,-1.178],[-4.644,2.094],[-0.621,1.218],[-3.354,1.709],[-2.283,0.187],[-2.941,0],[0,0],[-54.617,0],[-17.712,-2.071],[0,0],[32.032,0],[0,0],[0,-32.032],[0,0],[0,0]],"o":[[-0.121,-0.216],[-1.164,-2.285],[-0.176,-2.148],[0,0],[0,-2.944],[0.187,-2.284],[1.709,-3.354],[2.284,-1.164],[2.147,-0.176],[0,0],[2.944,0],[2.284,0.187],[3.354,1.709],[1.164,2.284],[0.081,0.996],[4.561,-2.242],[0.274,-1.236],[1.709,-3.354],[2.285,-1.164],[2.148,-0.176],[0,0],[48.598,-17.471],[18.268,0],[0,0],[0,-32.032],[0,0],[-32.032,0],[0,0],[0,0],[32.866,-78.24]],"v":[[-73.694,-8.649],[-74.057,-9.296],[-75.825,-16.215],[-76,-23.9],[-76,-44.656],[-75.825,-52.342],[-74.057,-59.26],[-66.266,-67.052],[-59.347,-68.819],[-51.662,-68.994],[-30.906,-68.994],[-23.221,-68.819],[-16.302,-67.052],[-8.511,-59.26],[-6.743,-52.342],[-6.597,-49.067],[7.212,-55.569],[8.511,-59.26],[16.302,-67.052],[23.221,-68.819],[30.904,-68.994],[40.401,-68.994],[196,-96],[250,-92.864],[250,-128],[192,-186],[-192,-186],[-250,-128],[-250,186],[-228.254,186]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[384,376.994],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-4.104,2.183],[0,0],[0.126,1.548],[0.063,0.124],[0.883,0.45],[1.471,0.12],[3.261,0],[0,0],[1.548,-0.127],[0.124,-0.063],[0.45,-0.883],[0.12,-1.471],[0,-3.261],[0,0],[-0.127,-1.548],[-0.033,-0.238],[-4.874,3.06],[0,1.933],[0,0],[-3.109,0],[0,0],[0,-3.109],[0,0]],"o":[[0,0],[0,-3.261],[-0.12,-1.471],[-0.45,-0.883],[-0.124,-0.063],[-1.548,-0.127],[0,0],[-3.261,0],[-1.471,0.12],[-0.883,0.45],[-0.063,0.124],[-0.127,1.548],[0,0],[0,3.261],[0.028,0.341],[4.749,-3.236],[-1.485,-1.014],[0,0],[0,-3.109],[0,0],[3.109,0],[0,0],[4.029,-2.303]],"v":[[21.58,-6.23],[21.58,-8.27],[21.449,-15.13],[21.069,-17.155],[19.018,-19.205],[16.994,-19.585],[10.133,-19.717],[-10.133,-19.717],[-16.993,-19.585],[-19.019,-19.205],[-21.069,-17.155],[-21.449,-15.13],[-21.58,-8.27],[-21.58,11.997],[-21.449,18.857],[-21.355,19.717],[-6.922,10.269],[-9.383,5.617],[-9.383,-1.889],[-3.753,-7.519],[3.753,-7.519],[9.383,-1.889],[9.383,0.503]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[342.716,340.852],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[14.36,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,-14.36],[-14.36,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,14.36]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[-14.36,0],[0,14.36],[0,0],[0,0],[0,0],[0,0],[0,0],[14.36,0],[0,-14.36]],"v":[[304,-26],[261.697,-26],[249.69,-26],[-249.69,-26],[-261.697,-26],[-304,-26],[-330,0],[-304,26],[-231.198,26],[-192,26],[192,26],[231.198,26],[304,26],[330,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[384,600.994],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0}]},{"id":"comp_1","layers":[{"ddd":0,"ind":1,"ty":0,"nm":"Check - dark","refId":"comp_2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[384,384,0],"ix":2},"a":{"a":0,"k":[96,96,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":192,"h":192,"ip":110,"op":260,"st":110,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Layer 7","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[384,384,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[14.36,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,-14.36]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[14.36,0],[0,14.36]],"v":[[304,242.994],[231.198,242.994],[192,242.994],[153.987,242.994],[153.987,190.994],[249.69,190.994],[261.697,190.994],[304,190.994],[330,216.994]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.024,-0.296],[-0.018,0.298]],"o":[[0.023,-0.297],[-0.019,0.298]],"v":[[153.809,252.198],[153.877,251.308]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0.034,-0.759],[0,0.768]],"o":[[0.032,-0.76],[0,0.768]],"v":[[153.929,250.289],[153.987,248]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0,0],[23.196,0],[0,0],[0,23.196],[0,0],[-23.196,0],[0,0],[0,-23.196]],"o":[[0,23.196],[0,0],[-23.196,0],[0,0],[0,-23.196],[0,0],[23.196,0],[0,0]],"v":[[141.987,248],[99.987,290],[-99.987,290],[-141.987,248],[-141.987,-248],[-99.987,-290],[99.987,-290],[141.987,-248]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0.019,0.298],[-0.023,-0.297]],"o":[[0.018,0.298],[-0.024,-0.296]],"v":[[-153.877,251.308],[-153.809,252.198]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[-0.032,-0.76],[0,0.768]],"o":[[-0.034,-0.759],[0,0.768]],"v":[[-153.929,250.289],[-153.987,248]],"c":true},"ix":2},"nm":"Path 6","mn":"ADBE Vector Shape - Group","hd":false},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,14.36],[-14.36,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[-14.36,0],[0,-14.36],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-231.198,242.994],[-304,242.994],[-330,216.994],[-304,190.994],[-261.697,190.994],[-249.69,190.994],[-153.987,190.994],[-153.987,242.994],[-192,242.994]],"c":true},"ix":2},"nm":"Path 7","mn":"ADBE Vector Shape - Group","hd":false},{"ind":7,"ty":"sh","ix":8,"ks":{"a":0,"k":{"i":[[0,0],[-32.032,0],[0,0],[0,0],[0,0]],"o":[[0,-32.032],[0,0],[0,0],[0,0],[0,0]],"v":[[-250,-135.006],[-192,-193.006],[-153.987,-193.006],[-153.987,178.994],[-250,178.994]],"c":true},"ix":2},"nm":"Path 8","mn":"ADBE Vector Shape - Group","hd":false},{"ind":8,"ty":"sh","ix":9,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,-32.032],[0,0],[0,0]],"o":[[0,0],[32.032,0],[0,0],[0,0],[0,0]],"v":[[153.987,-193.006],[192,-193.006],[250,-135.006],[250,178.994],[153.987,178.994]],"c":true},"ix":2},"nm":"Path 9","mn":"ADBE Vector Shape - Group","hd":false},{"ind":9,"ty":"sh","ix":10,"ks":{"a":0,"k":{"i":[[20.988,0],[0,0],[0,0],[38.66,0],[0,0],[0,0],[29.824,0],[0,0],[0,-29.823],[0,0],[0,0],[0,-38.66],[0,0],[0,0],[0,-20.988],[-20.987,0],[0,0],[0,0],[0,0.001],[-27.453,0],[0,0],[-3.431,26.519],[0,-0.001],[0,0],[0,0],[0,20.988]],"o":[[0,0],[0,0],[0,-38.66],[0,0],[0,0],[0,-29.823],[0,0],[-29.824,0],[0,0],[0,0],[-38.66,0],[0,0],[0,0],[-20.987,0],[0,20.988],[0,0],[0,0],[0,-0.001],[3.431,26.519],[0,0],[27.453,0],[0,0.001],[0,0],[0,0],[20.988,0],[0,-20.988]],"v":[[304,178.994],[262,178.994],[262,-135.006],[192,-205.006],[153.987,-205.006],[153.987,-248],[99.987,-302],[-99.987,-302],[-153.987,-248],[-153.987,-205.006],[-192,-205.006],[-262,-135.006],[-262,178.994],[-304,178.994],[-342,216.994],[-304,254.994],[-192,254.994],[-153.521,254.994],[-153.522,254.991],[-99.987,302],[99.987,302],[153.522,254.991],[153.521,254.994],[192,254.994],[304,254.994],[342,216.994]],"c":true},"ix":2},"nm":"Path 10","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137254902,0.270588235294,0.992156862745,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":11,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Layer 6","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[384,384,0],"ix":2},"a":{"a":0,"k":[384,384,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[23.196,0],[0,0],[0,-23.196],[0,0],[-23.196,0],[0,0],[0,23.196],[0,0]],"o":[[0,0],[-23.196,0],[0,0],[0,23.196],[0,0],[23.196,0],[0,0],[0,-23.196]],"v":[[99.987,-290],[-99.987,-290],[-141.987,-248],[-141.987,248],[-99.987,290],[99.987,290],[141.987,248],[141.987,-248]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[384,384],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-17.712,-2.071],[0,0],[32.032,0],[0,0],[0,0],[-14.165,0]],"o":[[0,0],[0,-32.032],[0,0],[0,0],[13.838,-1.253],[18.268,0]],"v":[[48.006,46.568],[48.006,11.432],[-9.994,-46.568],[-48.006,-46.568],[-48.006,45.341],[-5.994,43.432]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[585.994,237.562],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-32.032],[0,0],[0,0],[-30.578,35.828],[0,0],[0,0]],"o":[[0,0],[0,0],[18.512,-44.069],[0,0],[0,0],[-32.032,0]],"v":[[-48.006,-128],[-48.006,186],[-26.26,186],[48.006,65.524],[48.006,-186],[9.994,-186]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[182.006,376.994],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,-14.36],[-14.36,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[-14.36,0],[0,14.36],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-19.703,-26],[-62.006,-26],[-88.006,0],[-62.006,26],[10.796,26],[49.994,26],[88.006,26],[88.006,-26],[-7.696,-26]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[142.006,600.994],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[14.36,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,14.36]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[14.36,0],[0,-14.36]],"v":[[62.006,-26],[19.703,-26],[7.696,-26],[-88.006,-26],[-88.006,26],[-49.994,26],[-10.796,26],[62.006,26],[88.006,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[625.994,600.994],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":2,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Layer 5","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[394.873,421.994,0],"ix":2},"a":{"a":0,"k":[394.873,421.994,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[18.268,0],[13.838,-1.253],[0,0],[0,0],[0,0]],"o":[[-14.165,0],[0,0],[0,0],[0,0],[-17.712,-2.071]],"v":[[-5.994,-141],[-48.006,-139.091],[-48.006,141],[48.006,141],[48.006,-137.864]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.75686275959,0.780392169952,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[585.994,421.994],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[18.512,-44.069],[0,0]],"o":[[-30.578,35.828],[0,0],[0,0]],"v":[[37.133,-60.238],[-37.133,60.238],[37.133,60.238]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.75686275959,0.780392169952,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[192.88,502.757],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0}]},{"id":"comp_2","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"check","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[96,96,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[99.999,99.999,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[9.25,-6],[-2.75,6],[-9.25,-0.5]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.461],"y":[1]},"o":{"x":[0.466],"y":[0]},"t":22,"s":[100]},{"t":45,"s":[0]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0.23137255013,0.270588248968,0.992156863213,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":4,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[350,350],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"check","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":151,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"circle","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[96,96,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[99.999,99.999,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[53,53],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.34],"y":[1]},"o":{"x":[0.66],"y":[0]},"t":0,"s":[0]},{"t":38.5,"s":[100]}],"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.34],"y":[1]},"o":{"x":[0.66],"y":[0]},"t":0,"s":[-360]},{"t":38.5,"s":[0]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0.23137255013,0.270588248968,0.992156863213,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":4,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"circle","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":151,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"Fade in - dark","refId":"comp_0","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":8,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[384,384,0],"ix":2},"a":{"a":0,"k":[384,384,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":768,"h":768,"ip":0,"op":10,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":0,"nm":"Fade out - dark","refId":"comp_1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":220,"s":[100]},{"t":228,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[384,384,0],"ix":2},"a":{"a":0,"k":[384,384,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":768,"h":768,"ip":210,"op":240,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":0,"nm":"Check - dark","refId":"comp_2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[384,384,0],"ix":2},"a":{"a":0,"k":[96,96,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":192,"h":192,"ip":110,"op":210,"st":110,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"laptop qr","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":8,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":100,"s":[100]},{"t":103,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[382,382,0],"ix":2},"a":{"a":0,"k":[191,197,0],"ix":1},"s":{"a":0,"k":[200,200,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.554,0],[0,0],[0,-1.556],[0,0],[-1.555,0],[0,0],[0,1.556],[0,0]],"o":[[0,0],[-1.555,0],[0,0],[0,1.556],[0,0],[1.554,0],[0,0],[0,-1.556]],"v":[[1.877,-4.691],[-1.877,-4.691],[-4.692,-1.876],[-4.692,1.876],[-1.877,4.691],[1.877,4.691],[4.692,1.876],[4.692,-1.876]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137254902,0.270588235294,0.992156862745,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[202.321,228.963],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.556,0],[0,0],[0,-1.554],[0,0],[-1.556,0],[0,0],[0,1.554],[0,0]],"o":[[0,0],[-1.556,0],[0,0],[0,1.554],[0,0],[1.556,0],[0,0],[0,-1.554]],"v":[[1.876,-4.692],[-1.876,-4.692],[-4.691,-1.877],[-4.691,1.877],[-1.876,4.692],[1.876,4.692],[4.691,1.877],[4.691,-1.877]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137254902,0.270588235294,0.992156862745,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[222.963,208.321],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.556,0],[0,0],[0,-1.556],[0,0],[-1.556,0],[0,0],[0,1.556],[0,0]],"o":[[0,0],[-1.556,0],[0,0],[0,1.556],[0,0],[1.556,0],[0,0],[0,-1.556]],"v":[[1.876,-4.691],[-1.876,-4.691],[-4.691,-1.876],[-4.691,1.876],[-1.876,4.691],[1.876,4.691],[4.691,1.876],[4.691,-1.876]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137254902,0.270588235294,0.992156862745,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[222.963,228.963],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.554,0],[0,0],[0,-1.554],[0,0],[-1.554,0],[0,0],[0,1.554],[0,0]],"o":[[0,0],[-1.554,0],[0,0],[0,1.554],[0,0],[1.554,0],[0,0],[0,-1.554]],"v":[[1.877,-4.692],[-1.877,-4.692],[-4.692,-1.877],[-4.692,1.877],[-1.877,4.692],[1.877,4.692],[4.692,1.877],[4.692,-1.877]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137254902,0.270588235294,0.992156862745,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[212.642,218.642],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.554,0],[0,0],[0,-1.554],[0,0],[-1.555,0],[0,0],[0,1.554],[0,0]],"o":[[0,0],[-1.555,0],[0,0],[0,1.554],[0,0],[1.554,0],[0,0],[0,-1.554]],"v":[[1.877,-4.692],[-1.877,-4.692],[-4.692,-1.877],[-4.692,1.877],[-1.877,4.692],[1.877,4.692],[4.692,1.877],[4.692,-1.877]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137254902,0.270588235294,0.992156862745,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[202.321,208.321],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":2,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.063,-0.774],[0.031,-0.062],[0.441,-0.225],[0.736,-0.06],[1.63,0],[0,0],[0.775,0.063],[0.061,0.032],[0.223,0.441],[0.061,0.736],[0,1.631],[0,0],[-0.063,0.774],[-0.032,0.062],[-0.441,0.225],[-0.734,0.06],[-1.63,0],[0,0],[-0.775,-0.063],[-0.063,-0.032],[-0.225,-0.441],[-0.061,-0.736],[0,-1.631]],"o":[[0,1.631],[-0.061,0.736],[-0.225,0.441],[-0.063,0.032],[-0.775,0.063],[0,0],[-1.63,0],[-0.734,-0.06],[-0.441,-0.225],[-0.032,-0.062],[-0.063,-0.774],[0,0],[0,-1.631],[0.061,-0.736],[0.223,-0.441],[0.061,-0.032],[0.775,-0.063],[0,0],[1.63,0],[0.736,0.06],[0.441,0.225],[0.031,0.062],[0.063,0.774],[0,0]],"v":[[10.789,5.067],[10.724,8.497],[10.535,9.509],[9.51,10.534],[8.497,10.724],[5.067,10.79],[-5.066,10.79],[-8.498,10.724],[-9.509,10.534],[-10.533,9.509],[-10.725,8.497],[-10.79,5.067],[-10.79,-5.067],[-10.725,-8.497],[-10.533,-9.509],[-9.509,-10.534],[-8.498,-10.724],[-5.066,-10.79],[5.067,-10.79],[8.497,-10.724],[9.51,-10.534],[10.535,-9.509],[10.724,-8.497],[10.789,-5.067]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.088,1.074],[0.581,1.142],[1.678,0.855],[1.142,0.093],[1.473,0],[0,0],[1.074,-0.088],[1.143,-0.582],[0.854,-1.677],[0.093,-1.142],[0,-1.472],[0,0],[-0.088,-1.074],[-0.582,-1.142],[-1.677,-0.854],[-1.142,-0.093],[-1.47,0],[0,0],[-1.072,0.088],[-1.144,0.582],[-0.856,1.677],[-0.092,1.142],[0,1.472],[0,0]],"o":[[-0.092,-1.142],[-0.856,-1.677],[-1.144,-0.582],[-1.072,-0.088],[0,0],[-1.47,0],[-1.142,0.093],[-1.677,0.855],[-0.582,1.142],[-0.088,1.074],[0,0],[0,1.472],[0.093,1.142],[0.854,1.677],[1.143,0.582],[1.074,0.088],[0,0],[1.473,0],[1.142,-0.093],[1.678,-0.854],[0.581,-1.142],[0.088,-1.074],[0,0],[0,-1.472]],"v":[[17.27,-9.032],[16.388,-12.491],[12.492,-16.387],[9.031,-17.27],[5.189,-17.358],[-5.19,-17.358],[-9.031,-17.27],[-12.491,-16.387],[-16.386,-12.491],[-17.27,-9.032],[-17.358,-5.189],[-17.358,5.189],[-17.27,9.032],[-16.386,12.491],[-12.491,16.386],[-9.031,17.27],[-5.19,17.358],[5.189,17.358],[9.031,17.27],[12.492,16.386],[16.388,12.491],[17.27,9.032],[17.358,5.189],[17.358,-5.189]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137254902,0.270588235294,0.992156862745,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[212.642,177.358],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6","np":3,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.554,0],[0,0],[0,-1.555],[0,0],[-1.554,0],[0,0],[0,1.554],[0,0]],"o":[[0,0],[-1.554,0],[0,0],[0,1.554],[0,0],[1.554,0],[0,0],[0,-1.555]],"v":[[1.877,-4.691],[-1.877,-4.691],[-4.692,-1.877],[-4.692,1.877],[-1.877,4.691],[1.877,4.691],[4.692,1.877],[4.692,-1.877]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137254902,0.270588235294,0.992156862745,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[212.642,177.358],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 7","np":2,"cix":2,"bm":0,"ix":7,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.063,-0.775],[0.032,-0.063],[0.441,-0.225],[0.736,-0.061],[1.631,0],[0,0],[0.774,0.063],[0.062,0.032],[0.225,0.441],[0.06,0.736],[0,1.63],[0,0],[-0.063,0.775],[-0.032,0.061],[-0.441,0.223],[-0.736,0.061],[-1.631,0],[0,0],[-0.774,-0.063],[-0.062,-0.032],[-0.225,-0.441],[-0.06,-0.734],[0,-1.63]],"o":[[0,1.63],[-0.06,0.736],[-0.225,0.441],[-0.062,0.032],[-0.774,0.063],[0,0],[-1.631,0],[-0.736,-0.061],[-0.441,-0.225],[-0.032,-0.063],[-0.063,-0.775],[0,0],[0,-1.63],[0.06,-0.734],[0.225,-0.441],[0.062,-0.032],[0.774,-0.063],[0,0],[1.631,0],[0.736,0.061],[0.441,0.223],[0.032,0.061],[0.063,0.775],[0,0]],"v":[[10.79,5.068],[10.724,8.497],[10.534,9.511],[9.509,10.535],[8.497,10.724],[5.067,10.79],[-5.067,10.79],[-8.497,10.724],[-9.509,10.535],[-10.534,9.511],[-10.724,8.497],[-10.79,5.068],[-10.79,-5.066],[-10.724,-8.497],[-10.534,-9.509],[-9.509,-10.533],[-8.497,-10.724],[-5.067,-10.79],[5.067,-10.79],[8.497,-10.724],[9.509,-10.533],[10.534,-9.509],[10.724,-8.497],[10.79,-5.066]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.582,1.142],[1.677,0.853],[1.142,0.095],[1.472,0],[0,0],[1.074,-0.088],[1.142,-0.583],[0.855,-1.678],[0.093,-1.142],[0,-1.47],[0,0],[-0.088,-1.072],[-0.582,-1.144],[-1.677,-0.856],[-1.142,-0.092],[-1.472,0],[0,0],[-1.074,0.088],[-1.142,0.581],[-0.855,1.678],[-0.093,1.142],[0,1.473],[0,0],[0.088,1.074]],"o":[[-0.855,-1.678],[-1.142,-0.583],[-1.074,-0.088],[0,0],[-1.472,0],[-1.142,0.095],[-1.677,0.853],[-0.582,1.142],[-0.088,1.074],[0,0],[0,1.473],[0.093,1.142],[0.855,1.678],[1.142,0.581],[1.074,0.088],[0,0],[1.472,0],[1.142,-0.092],[1.677,-0.856],[0.582,-1.144],[0.088,-1.072],[0,0],[0,-1.47],[-0.093,-1.142]],"v":[[16.386,-12.49],[12.491,-16.386],[9.032,-17.271],[5.189,-17.358],[-5.189,-17.358],[-9.032,-17.271],[-12.491,-16.386],[-16.387,-12.49],[-17.27,-9.031],[-17.358,-5.189],[-17.358,5.189],[-17.27,9.031],[-16.387,12.492],[-12.491,16.388],[-9.032,17.271],[-5.189,17.358],[5.189,17.358],[9.032,17.271],[12.491,16.388],[16.386,12.492],[17.27,9.031],[17.358,5.189],[17.358,-5.189],[17.27,-9.031]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137254902,0.270588235294,0.992156862745,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[171.358,218.642],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 8","np":3,"cix":2,"bm":0,"ix":8,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.554,0],[0,0],[0,-1.554],[0,0],[-1.555,0],[0,0],[0,1.554],[0,0]],"o":[[0,0],[-1.555,0],[0,0],[0,1.554],[0,0],[1.554,0],[0,0],[0,-1.554]],"v":[[1.877,-4.692],[-1.877,-4.692],[-4.691,-1.877],[-4.691,1.877],[-1.877,4.692],[1.877,4.692],[4.691,1.877],[4.691,-1.877]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137254902,0.270588235294,0.992156862745,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[171.358,218.642],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 9","np":2,"cix":2,"bm":0,"ix":9,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.063,-0.774],[0.032,-0.062],[0.441,-0.225],[0.736,-0.06],[1.631,0],[0,0],[0.774,0.063],[0.062,0.032],[0.225,0.441],[0.06,0.736],[0,1.631],[0,0],[-0.063,0.774],[-0.032,0.062],[-0.441,0.225],[-0.736,0.06],[-1.631,0],[0,0],[-0.774,-0.063],[-0.062,-0.032],[-0.225,-0.441],[-0.06,-0.736],[0,-1.631]],"o":[[0,1.631],[-0.06,0.736],[-0.225,0.441],[-0.062,0.032],[-0.774,0.063],[0,0],[-1.631,0],[-0.736,-0.06],[-0.441,-0.225],[-0.032,-0.062],[-0.063,-0.774],[0,0],[0,-1.631],[0.06,-0.736],[0.225,-0.441],[0.062,-0.032],[0.774,-0.063],[0,0],[1.631,0],[0.736,0.06],[0.441,0.225],[0.032,0.062],[0.063,0.774],[0,0]],"v":[[10.79,5.067],[10.724,8.497],[10.534,9.509],[9.509,10.534],[8.497,10.724],[5.067,10.79],[-5.067,10.79],[-8.497,10.724],[-9.509,10.534],[-10.534,9.509],[-10.724,8.497],[-10.79,5.067],[-10.79,-5.067],[-10.724,-8.497],[-10.534,-9.509],[-9.509,-10.534],[-8.497,-10.724],[-5.067,-10.79],[5.067,-10.79],[8.497,-10.724],[9.509,-10.534],[10.534,-9.509],[10.724,-8.497],[10.79,-5.067]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.582,1.142],[1.677,0.855],[1.142,0.093],[1.472,0],[0,0],[1.074,-0.088],[1.142,-0.582],[0.855,-1.677],[0.093,-1.142],[0,-1.472],[0,0],[-0.088,-1.074],[-0.582,-1.142],[-1.677,-0.854],[-1.142,-0.093],[-1.472,0],[0,0],[-1.074,0.088],[-1.142,0.582],[-0.855,1.677],[-0.093,1.142],[0,1.472],[0,0],[0.088,1.074]],"o":[[-0.855,-1.677],[-1.142,-0.582],[-1.074,-0.088],[0,0],[-1.472,0],[-1.142,0.093],[-1.677,0.855],[-0.582,1.142],[-0.088,1.074],[0,0],[0,1.472],[0.093,1.142],[0.855,1.677],[1.142,0.582],[1.074,0.088],[0,0],[1.472,0],[1.142,-0.093],[1.677,-0.854],[0.582,-1.142],[0.088,-1.074],[0,0],[0,-1.472],[-0.093,-1.142]],"v":[[16.386,-12.491],[12.491,-16.387],[9.032,-17.27],[5.189,-17.358],[-5.189,-17.358],[-9.032,-17.27],[-12.491,-16.387],[-16.387,-12.491],[-17.27,-9.032],[-17.358,-5.189],[-17.358,5.189],[-17.27,9.032],[-16.387,12.491],[-12.491,16.386],[-9.032,17.27],[-5.189,17.358],[5.189,17.358],[9.032,17.27],[12.491,16.386],[16.386,12.491],[17.27,9.032],[17.358,5.189],[17.358,-5.189],[17.27,-9.032]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137254902,0.270588235294,0.992156862745,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[171.358,177.358],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 10","np":3,"cix":2,"bm":0,"ix":10,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.554,0],[0,0],[0,-1.555],[0,0],[-1.555,0],[0,0],[0,1.554],[0,0]],"o":[[0,0],[-1.555,0],[0,0],[0,1.554],[0,0],[1.554,0],[0,0],[0,-1.555]],"v":[[1.877,-4.691],[-1.877,-4.691],[-4.691,-1.877],[-4.691,1.877],[-1.877,4.691],[1.877,4.691],[4.691,1.877],[4.691,-1.877]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137254902,0.270588235294,0.992156862745,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[171.358,177.358],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 11","np":2,"cix":2,"bm":0,"ix":11,"mn":"ADBE Vector Group","hd":false}],"ip":10,"op":210,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"phone border","parent":7,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":46,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":54,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":220,"s":[100]},{"t":228,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,-4,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-11.598],[0,0],[-11.598,0],[0,0],[0,11.598],[0,0],[11.598,0]],"o":[[-11.598,0],[0,0],[0,11.598],[0,0],[11.598,0],[0,0],[0,-11.598],[0,0]],"v":[[-49.994,-141],[-70.994,-120],[-70.994,128],[-49.994,149],[49.994,149],[70.994,128],[70.994,-120],[49.994,-141]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[-14.912,0],[0,0],[0,-14.912],[0,0],[14.912,0],[0,0],[0,14.912]],"o":[[0,-14.912],[0,0],[14.912,0],[0,0],[0,14.912],[0,0],[-14.912,0],[0,0]],"v":[[-76.994,-120],[-49.994,-147],[49.994,-147],[76.994,-120],[76.994,128],[49.994,155],[-49.994,155],[-76.994,128]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137254902,0.270588235294,0.992156862745,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":10,"op":210,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"phone frame","parent":7,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":46,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":54,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":100,"s":[100]},{"t":103,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2},"a":{"a":0,"k":[192,198,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":76,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":81,"s":[90,90,100]},{"t":86,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.656,0],[0,-1.656],[0,0],[2.762,0],[0,0],[0,-1.656],[-1.656,0],[0,0],[0,6.076],[0,0]],"o":[[-1.656,0],[0,0],[0,2.762],[0,0],[-1.656,0],[0,1.656],[0,0],[6.076,0],[0,0],[0,-1.656]],"v":[[14,-16],[11,-13],[11,5],[6,10],[-14,10],[-17,13],[-14,16],[6,16],[17,5],[17,-13]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137254902,0.270588235294,0.992156862745,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[233.997,240.997],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.656,0],[0,0],[0,2.762],[0,0],[1.656,0],[0,-1.656],[0,0],[-6.076,0],[0,0],[0,1.656]],"o":[[0,0],[-2.762,0],[0,0],[0,-1.656],[-1.656,0],[0,0],[0,6.076],[0,0],[1.656,0],[0,-1.656]],"v":[[14,10],[-6,10],[-11,5],[-11,-13],[-14,-16],[-17,-13],[-17,5],[-6,16],[14,16],[17,13]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137254902,0.270588235294,0.992156862745,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[150.003,240.997],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[6.076,0],[0,0],[0,-1.657],[-1.656,0],[0,0],[0,-2.761],[0,0],[-1.656,0],[0,1.657],[0,0]],"o":[[0,0],[-1.656,0],[0,1.657],[0,0],[2.762,0],[0,0],[0,1.657],[1.656,0],[0,0],[0,-6.075]],"v":[[6,-16],[-14,-16],[-17,-13],[-14,-10],[6,-10],[11,-5],[11,13],[14,16],[17,13],[17,-5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137254902,0.270588235294,0.992156862745,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[233.997,155.003],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.656,0],[0,0],[0,-6.075],[0,0],[-1.656,0],[0,1.657],[0,0],[-2.762,0],[0,0],[0,1.657]],"o":[[0,0],[-6.076,0],[0,0],[0,1.657],[1.656,0],[0,0],[0,-2.761],[0,0],[1.656,0],[0,-1.657]],"v":[[14,-16],[-6,-16],[-17,-5],[-17,13],[-14,16],[-11,13],[-11,-5],[-6,-10],[14,-10],[17,-13]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137254902,0.270588235294,0.992156862745,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[150.003,155.003],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false}],"ip":10,"op":210,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"phone bg","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":46,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":54,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":220,"s":[100]},{"t":228,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":46,"s":[384,464,0],"to":[0,-13.333,0],"ti":[0,13.333,0]},{"t":54,"s":[384,384,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[200,200,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[11.598,0],[0,0],[0,-11.598],[0,0],[-11.598,0],[0,0],[0,11.598]],"o":[[0,-11.598],[0,0],[-11.598,0],[0,0],[0,11.598],[0,0],[11.598,0],[0,0]],"v":[[70.994,-124],[49.994,-145],[-49.994,-145],[-70.994,-124],[-70.994,124],[-49.994,145],[49.994,145],[70.994,124]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":10,"op":210,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"laptop border 2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":8,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":220,"s":[100]},{"t":228,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[384,377,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[200,200,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.18,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,7.18],[-7.18,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,-7.18]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[-7.18,0],[0,-7.18],[0,0],[0,0],[0,0],[0,0],[0,0],[7.18,0],[0,7.18]],"v":[[152,125],[115.599,125],[96,125],[-96,125],[-115.599,125],[-152,125],[-165,112],[-152,99],[-130.849,99],[-124.845,99],[124.845,99],[130.849,99],[152,99],[165,112]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[-16.016,0],[0,0],[0,-16.016],[0,0],[0,0]],"o":[[0,-16.016],[0,0],[16.016,0],[0,0],[0,0],[0,0]],"v":[[-125,-64],[-96,-93],[96,-93],[125,-64],[125,93],[-125,93]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[10.494,0],[0,0],[0,0],[19.33,0],[0,0],[0,-19.33],[0,0],[0,0],[0,-10.494],[-10.493,0],[0,0],[0,0],[0,0],[0,10.494]],"o":[[0,0],[0,0],[0,-19.33],[0,0],[-19.33,0],[0,0],[0,0],[-10.493,0],[0,10.494],[0,0],[0,0],[0,0],[10.494,0],[0,-10.494]],"v":[[152,93],[131,93],[131,-64],[96,-99],[-96,-99],[-131,-64],[-131,93],[-152,93],[-171,112],[-152,131],[-96,131],[96,131],[152,131],[171,112]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.23137254902,0.270588235294,0.992156862745,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":10,"op":210,"st":0,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"laptop tint 2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":8,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":220,"s":[100]},{"t":228,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[394.873,422,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[200,200,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[9.134,0],[34.793,-82.827],[0,0]],"o":[[-8.856,-1.036],[-95.468,0],[0,0],[0,0]],"v":[[119.563,-68.932],[92.563,-70.5],[-119.563,70.5],[119.563,70.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.75686275959,0.780392169952,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":10,"op":210,"st":0,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"laptop bg 2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":8,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":220,"s":[100]},{"t":228,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[384,409,0],"ix":2},"a":{"a":0,"k":[192,208,0],"ix":1},"s":{"a":0,"k":[200,200,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[16.016,0],[0,0],[0,-16.016]],"o":[[0,0],[0,0],[0,-16.016],[0,0],[-16.016,0],[0,0]],"v":[[-125,93],[125,93],[125,-64],[96,-93],[-96,-93],[-125,-64]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[192,192],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.18,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,-7.18],[-7.18,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,7.18]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[-7.18,0],[0,7.18],[0,0],[0,0],[0,0],[0,0],[0,0],[7.18,0],[0,-7.18]],"v":[[152,-13],[130.849,-13],[124.845,-13],[-124.845,-13],[-130.849,-13],[-152,-13],[-165,0],[-152,13],[-115.599,13],[-96,13],[96,13],[115.599,13],[152,13],[165,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[192,304],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":10,"op":210,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/app/src/main/res/raw/linking_device.json b/app/src/main/res/raw/linking_device.json
new file mode 100644
index 0000000000..47a57ea046
--- /dev/null
+++ b/app/src/main/res/raw/linking_device.json
@@ -0,0 +1 @@
+{"v":"5.6.5","fr":30,"ip":0,"op":240,"w":768,"h":768,"nm":"Linking a device","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Layer 4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[384,408.994,0],"ix":2},"a":{"a":0,"k":[384,408.994,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.108,0],[0,0],[0,-3.112],[0,0],[-3.109,0],[0,0],[0,3.112],[0,0]],"o":[[0,0],[-3.109,0],[0,0],[0,3.112],[0,0],[3.108,0],[0,0],[0,-3.112]],"v":[[3.754,-9.381],[-3.754,-9.381],[-9.383,-3.752],[-9.383,3.752],[-3.754,9.381],[3.754,9.381],[9.383,3.752],[9.383,-3.752]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[404.643,445.926],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.112,0],[0,0],[0,-3.108],[0,0],[-3.112,0],[0,0],[0,3.108],[0,0]],"o":[[0,0],[-3.112,0],[0,0],[0,3.108],[0,0],[3.112,0],[0,0],[0,-3.108]],"v":[[3.752,-9.383],[-3.752,-9.383],[-9.381,-3.754],[-9.381,3.754],[-3.752,9.383],[3.752,9.383],[9.381,3.754],[9.381,-3.754]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[445.926,404.643],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.112,0],[0,0],[0,-3.112],[0,0],[-3.112,0],[0,0],[0,3.112],[0,0]],"o":[[0,0],[-3.112,0],[0,0],[0,3.112],[0,0],[3.112,0],[0,0],[0,-3.112]],"v":[[3.752,-9.381],[-3.752,-9.381],[-9.381,-3.752],[-9.381,3.752],[-3.752,9.381],[3.752,9.381],[9.381,3.752],[9.381,-3.752]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[445.926,445.926],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.107,0],[0,0],[0,-3.108],[0,0],[-3.108,0],[0,0],[0,3.108],[0,0]],"o":[[0,0],[-3.108,0],[0,0],[0,3.108],[0,0],[3.107,0],[0,0],[0,-3.108]],"v":[[3.754,-9.383],[-3.754,-9.383],[-9.383,-3.754],[-9.383,3.754],[-3.754,9.383],[3.754,9.383],[9.383,3.754],[9.383,-3.754]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[425.283,425.283],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.108,0],[0,0],[0,-3.108],[0,0],[-3.109,0],[0,0],[0,3.108],[0,0]],"o":[[0,0],[-3.109,0],[0,0],[0,3.108],[0,0],[3.108,0],[0,0],[0,-3.108]],"v":[[3.754,-9.383],[-3.754,-9.383],[-9.383,-3.754],[-9.383,3.754],[-3.754,9.383],[3.754,9.383],[9.383,3.754],[9.383,-3.754]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[404.643,404.643],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":2,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.126,-1.548],[0.063,-0.124],[0.883,-0.45],[1.473,-0.12],[3.261,0],[0,0],[1.549,0.126],[0.121,0.063],[0.446,0.883],[0.122,1.471],[0,3.261],[0,0],[-0.126,1.548],[-0.063,0.124],[-0.883,0.45],[-1.468,0.12],[-3.261,0],[0,0],[-1.549,-0.127],[-0.126,-0.063],[-0.451,-0.883],[-0.122,-1.471],[0,-3.261]],"o":[[0,3.261],[-0.122,1.471],[-0.451,0.883],[-0.126,0.063],[-1.549,0.126],[0,0],[-3.261,0],[-1.468,-0.12],[-0.883,-0.45],[-0.063,-0.124],[-0.126,-1.548],[0,0],[0,-3.261],[0.122,-1.471],[0.446,-0.883],[0.121,-0.063],[1.549,-0.127],[0,0],[3.261,0],[1.473,0.12],[0.883,0.45],[0.063,0.124],[0.126,1.548],[0,0]],"v":[[21.579,10.133],[21.448,16.993],[21.07,19.019],[19.021,21.069],[16.994,21.449],[10.135,21.58],[-10.132,21.58],[-16.995,21.449],[-19.017,21.069],[-21.067,19.019],[-21.45,16.993],[-21.58,10.133],[-21.58,-10.134],[-21.45,-16.993],[-21.067,-19.019],[-19.017,-21.069],[-16.995,-21.449],[-10.132,-21.58],[10.135,-21.58],[16.994,-21.449],[19.021,-21.069],[21.07,-19.019],[21.448,-16.993],[21.579,-10.134]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[1.162,2.284],[3.355,1.709],[2.284,0.187],[2.945,0],[0,0],[2.148,-0.176],[2.285,-1.164],[1.709,-3.354],[0.187,-2.284],[0,-2.944],[0,0],[-0.175,-2.148],[-1.164,-2.285],[-3.354,-1.709],[-2.283,-0.187],[-2.941,0],[0,0],[-2.144,0.175],[-2.288,1.164],[-1.711,3.354],[-0.185,2.284],[0,2.944],[0,0],[0.176,2.147]],"o":[[-1.711,-3.354],[-2.288,-1.164],[-2.144,-0.176],[0,0],[-2.941,0],[-2.283,0.187],[-3.354,1.709],[-1.164,2.284],[-0.175,2.147],[0,0],[0,2.944],[0.187,2.284],[1.709,3.354],[2.285,1.164],[2.148,0.175],[0,0],[2.945,0],[2.284,-0.187],[3.355,-1.709],[1.162,-2.285],[0.176,-2.148],[0,0],[0,-2.943],[-0.185,-2.284]],"v":[[32.775,-24.982],[24.984,-32.773],[18.061,-34.541],[10.378,-34.716],[-10.38,-34.716],[-18.063,-34.541],[-24.982,-32.773],[-32.773,-24.982],[-34.541,-18.063],[-34.716,-10.378],[-34.716,10.378],[-34.541,18.063],[-32.773,24.982],[-24.982,32.773],[-18.063,34.541],[-10.38,34.716],[10.378,34.716],[18.061,34.541],[24.984,32.773],[32.775,24.982],[34.54,18.063],[34.716,10.378],[34.716,-10.379],[34.54,-18.063]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[425.284,342.716],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6","np":3,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.107,0],[0,0],[0,-3.109],[0,0],[-3.108,0],[0,0],[0,3.109],[0,0]],"o":[[0,0],[-3.108,0],[0,0],[0,3.109],[0,0],[3.107,0],[0,0],[0,-3.109]],"v":[[3.754,-9.383],[-3.754,-9.383],[-9.383,-3.753],[-9.383,3.753],[-3.754,9.383],[3.754,9.383],[9.383,3.753],[9.383,-3.753]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[425.283,342.716],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 7","np":2,"cix":2,"bm":0,"ix":7,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.126,-1.549],[0.063,-0.126],[0.883,-0.45],[1.471,-0.122],[3.261,0],[0,0],[1.548,0.126],[0.124,0.063],[0.45,0.883],[0.12,1.473],[0,3.261],[0,0],[-0.127,1.549],[-0.063,0.122],[-0.883,0.446],[-1.471,0.122],[-3.261,0],[0,0],[-1.548,-0.126],[-0.124,-0.063],[-0.45,-0.883],[-0.12,-1.468],[0,-3.261]],"o":[[0,3.261],[-0.12,1.473],[-0.45,0.883],[-0.124,0.063],[-1.548,0.126],[0,0],[-3.261,0],[-1.471,-0.122],[-0.883,-0.45],[-0.063,-0.126],[-0.127,-1.549],[0,0],[0,-3.261],[0.12,-1.468],[0.45,-0.883],[0.124,-0.063],[1.548,-0.126],[0,0],[3.261,0],[1.471,0.122],[0.883,0.446],[0.063,0.122],[0.126,1.549],[0,0]],"v":[[21.58,10.136],[21.449,16.995],[21.069,19.021],[19.019,21.07],[16.994,21.449],[10.133,21.58],[-10.133,21.58],[-16.993,21.449],[-19.019,21.07],[-21.069,19.021],[-21.448,16.995],[-21.58,10.136],[-21.58,-10.131],[-21.448,-16.995],[-21.069,-19.017],[-19.019,-21.066],[-16.993,-21.449],[-10.133,-21.58],[10.133,-21.58],[16.994,-21.449],[19.019,-21.066],[21.069,-19.017],[21.449,-16.995],[21.58,-10.131]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[1.164,2.284],[3.354,1.707],[2.284,0.189],[2.944,0],[0,0],[2.147,-0.176],[2.284,-1.167],[1.709,-3.355],[0.187,-2.284],[0,-2.941],[0,0],[-0.176,-2.144],[-1.164,-2.288],[-3.354,-1.711],[-2.284,-0.185],[-2.943,0],[0,0],[-2.148,0.176],[-2.285,1.162],[-1.709,3.355],[-0.187,2.284],[0,2.945],[0,0],[0.175,2.148]],"o":[[-1.709,-3.355],[-2.285,-1.167],[-2.148,-0.176],[0,0],[-2.943,0],[-2.284,0.189],[-3.354,1.707],[-1.164,2.284],[-0.176,2.148],[0,0],[0,2.945],[0.187,2.284],[1.709,3.355],[2.284,1.162],[2.147,0.176],[0,0],[2.944,0],[2.284,-0.185],[3.354,-1.711],[1.164,-2.288],[0.175,-2.144],[0,0],[0,-2.941],[-0.187,-2.284]],"v":[[32.773,-24.98],[24.982,-32.771],[18.063,-34.541],[10.378,-34.717],[-10.378,-34.717],[-18.063,-34.541],[-24.982,-32.771],[-32.773,-24.98],[-34.541,-18.062],[-34.716,-10.379],[-34.716,10.379],[-34.541,18.062],[-32.773,24.984],[-24.982,32.776],[-18.063,34.541],[-10.378,34.717],[10.378,34.717],[18.063,34.541],[24.982,32.776],[32.773,24.984],[34.541,18.062],[34.716,10.379],[34.716,-10.379],[34.541,-18.062]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[342.716,425.283],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 8","np":3,"cix":2,"bm":0,"ix":8,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.109,0],[0,0],[0,-3.108],[0,0],[-3.109,0],[0,0],[0,3.108],[0,0]],"o":[[0,0],[-3.109,0],[0,0],[0,3.108],[0,0],[3.109,0],[0,0],[0,-3.108]],"v":[[3.753,-9.383],[-3.753,-9.383],[-9.383,-3.754],[-9.383,3.754],[-3.753,9.383],[3.753,9.383],[9.383,3.754],[9.383,-3.754]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[342.716,425.283],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 9","np":2,"cix":2,"bm":0,"ix":9,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.126,-1.548],[0.063,-0.124],[0.883,-0.45],[1.471,-0.12],[3.261,0],[0,0],[1.548,0.126],[0.124,0.063],[0.45,0.883],[0.12,1.471],[0,3.261],[0,0],[-0.127,1.548],[-0.063,0.124],[-0.883,0.45],[-1.471,0.12],[-3.261,0],[0,0],[-1.548,-0.127],[-0.124,-0.063],[-0.45,-0.883],[-0.12,-1.471],[0,-3.261]],"o":[[0,3.261],[-0.12,1.471],[-0.45,0.883],[-0.124,0.063],[-1.548,0.126],[0,0],[-3.261,0],[-1.471,-0.12],[-0.883,-0.45],[-0.063,-0.124],[-0.127,-1.548],[0,0],[0,-3.261],[0.12,-1.471],[0.45,-0.883],[0.124,-0.063],[1.548,-0.127],[0,0],[3.261,0],[1.471,0.12],[0.883,0.45],[0.063,0.124],[0.126,1.548],[0,0]],"v":[[21.58,10.133],[21.449,16.993],[21.069,19.019],[19.019,21.069],[16.994,21.449],[10.133,21.58],[-10.133,21.58],[-16.993,21.449],[-19.019,21.069],[-21.069,19.019],[-21.448,16.993],[-21.58,10.133],[-21.58,-10.134],[-21.448,-16.993],[-21.069,-19.019],[-19.019,-21.069],[-16.993,-21.449],[-10.133,-21.58],[10.133,-21.58],[16.994,-21.449],[19.019,-21.069],[21.069,-19.019],[21.449,-16.993],[21.58,-10.134]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[1.164,2.284],[3.354,1.709],[2.284,0.187],[2.944,0],[0,0],[2.147,-0.176],[2.284,-1.164],[1.709,-3.354],[0.187,-2.284],[0,-2.944],[0,0],[-0.176,-2.148],[-1.164,-2.285],[-3.354,-1.709],[-2.284,-0.187],[-2.943,0],[0,0],[-2.147,0.175],[-2.285,1.164],[-1.709,3.354],[-0.187,2.284],[0,2.943],[0,0],[0.175,2.147]],"o":[[-1.709,-3.354],[-2.285,-1.164],[-2.148,-0.176],[0,0],[-2.943,0],[-2.284,0.187],[-3.354,1.709],[-1.164,2.284],[-0.176,2.147],[0,0],[0,2.944],[0.187,2.284],[1.709,3.354],[2.284,1.164],[2.147,0.175],[0,0],[2.943,0],[2.284,-0.187],[3.354,-1.709],[1.164,-2.285],[0.175,-2.147],[0,0],[0,-2.943],[-0.187,-2.284]],"v":[[32.773,-24.982],[24.982,-32.773],[18.063,-34.541],[10.378,-34.716],[-10.378,-34.716],[-18.063,-34.541],[-24.982,-32.773],[-32.773,-24.982],[-34.541,-18.063],[-34.716,-10.378],[-34.716,10.378],[-34.541,18.063],[-32.773,24.982],[-24.982,32.773],[-18.063,34.541],[-10.378,34.716],[10.379,34.716],[18.063,34.541],[24.982,32.773],[32.773,24.982],[34.541,18.063],[34.716,10.378],[34.716,-10.379],[34.541,-18.063]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[342.716,342.716],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 10","np":3,"cix":2,"bm":0,"ix":10,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[3.109,0],[0,0],[0,-3.109],[0,0],[-3.109,0],[0,0],[0,3.109],[0,0]],"o":[[0,0],[-3.109,0],[0,0],[0,3.109],[0,0],[3.109,0],[0,0],[0,-3.109]],"v":[[3.753,-9.383],[-3.753,-9.383],[-9.383,-3.753],[-9.383,3.753],[-3.753,9.383],[3.753,9.383],[9.383,3.753],[9.383,-3.753]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[342.716,342.716],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 11","np":2,"cix":2,"bm":0,"ix":11,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[14.36,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,14.36],[-14.36,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,-14.36]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[-14.36,0],[0,-14.36],[0,0],[0,0],[0,0],[0,0],[0,0],[14.36,0],[0,14.36]],"v":[[304,218],[231.198,218],[192,218],[-192,218],[-231.198,218],[-304,218],[-330,192],[-304,166],[-261.697,166],[-249.69,166],[249.69,166],[261.697,166],[304,166],[330,192]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[-32.032,0],[0,0],[0,-32.032],[0,0],[0,0]],"o":[[0,-32.032],[0,0],[32.032,0],[0,0],[0,0],[0,0]],"v":[[-250,-160],[-192,-218],[192,-218],[250,-160],[250,154],[-250,154]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[20.988,0],[0,0],[0,0],[38.66,0],[0,0],[0,-38.66],[0,0],[0,0],[0,-20.988],[-20.987,0],[0,0],[0,0],[0,0],[0,20.988]],"o":[[0,0],[0,0],[0,-38.66],[0,0],[-38.66,0],[0,0],[0,0],[-20.987,0],[0,20.988],[0,0],[0,0],[0,0],[20.988,0],[0,-20.988]],"v":[[304,154],[262,154],[262,-160],[192,-230],[-192,-230],[-262,-160],[-262,154],[-304,154],[-342,192],[-304,230],[-192,230],[192,230],[304,230],[342,192]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[384,408.994],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 12","np":4,"cix":2,"bm":0,"ix":12,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Layer 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[394.873,421.994,0],"ix":2},"a":{"a":0,"k":[394.873,421.994,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[3.112,0],[0,0],[0,3.108],[0,0],[-3.112,0],[0,0],[0,-3.108]],"o":[[0,3.108],[0,0],[-3.112,0],[0,0],[0,-3.108],[0,0],[3.112,0],[0,0]],"v":[[60.434,-13.598],[54.804,-7.968],[47.301,-7.968],[41.672,-13.598],[41.672,-21.106],[47.301,-26.735],[54.804,-26.735],[60.434,-21.106]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[3.112,0],[0,0],[0,3.112],[0,0],[-3.112,0],[0,0],[0,-3.112]],"o":[[0,3.112],[0,0],[-3.112,0],[0,0],[0,-3.112],[0,0],[3.112,0],[0,0]],"v":[[60.434,27.683],[54.804,33.313],[47.301,33.313],[41.672,27.683],[41.672,20.18],[47.301,14.55],[54.804,14.55],[60.434,20.18]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0,0],[3.107,0],[0,0],[0,3.108],[0,0],[-3.108,0],[0,0],[0,-3.108]],"o":[[0,3.108],[0,0],[-3.108,0],[0,0],[0,-3.108],[0,0],[3.107,0],[0,0]],"v":[[39.794,7.043],[34.164,12.672],[26.656,12.672],[21.027,7.043],[21.027,-0.465],[26.656,-6.095],[34.164,-6.095],[39.794,-0.465]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0,0],[3.108,0],[0,0],[0,3.108],[0,0],[-3.109,0],[0,0],[0,-3.108]],"o":[[0,3.108],[0,0],[-3.109,0],[0,0],[0,-3.108],[0,0],[3.108,0],[0,0]],"v":[[19.153,-13.598],[13.523,-7.968],[6.016,-7.968],[0.386,-13.598],[0.386,-21.106],[6.016,-26.735],[13.523,-26.735],[19.153,-21.106]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0,0],[3.108,0],[0,0],[0,3.112],[0,0],[-3.109,0],[0,0],[0,-3.112]],"o":[[0,3.112],[0,0],[-3.109,0],[0,0],[0,-3.112],[0,0],[3.108,0],[0,0]],"v":[[19.153,27.683],[13.523,33.313],[6.016,33.313],[0.386,27.683],[0.386,20.18],[6.016,14.55],[13.523,14.55],[19.153,20.18]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[0,0],[0.175,-2.144],[1.164,-2.288],[3.354,-1.711],[2.284,-0.185],[2.944,0],[0,0],[2.147,0.176],[2.284,1.162],[1.709,3.355],[0.187,2.284],[0,2.945],[0,0],[-0.176,2.148],[-1.164,2.284],[-3.354,1.707],[-2.284,0.189],[-2.943,0],[0,0],[-2.148,-0.176],[-2.285,-1.167],[-1.709,-3.355],[-0.187,-2.284],[0,-2.941]],"o":[[0,2.945],[-0.187,2.284],[-1.709,3.355],[-2.285,1.162],[-2.148,0.176],[0,0],[-2.943,0],[-2.284,-0.185],[-3.354,-1.711],[-1.164,-2.288],[-0.176,-2.144],[0,0],[0,-2.941],[0.187,-2.284],[1.709,-3.355],[2.284,-1.167],[2.147,-0.176],[0,0],[2.944,0],[2.284,0.189],[3.354,1.707],[1.164,2.284],[0.175,2.148],[0,0]],"v":[[-17.441,13.668],[-17.616,21.351],[-19.384,28.273],[-27.175,36.064],[-34.094,37.83],[-41.779,38.006],[-62.536,38.006],[-70.22,37.83],[-77.139,36.064],[-84.93,28.273],[-86.698,21.351],[-86.873,13.668],[-86.873,-7.09],[-86.698,-14.773],[-84.93,-21.691],[-77.139,-29.482],[-70.22,-31.252],[-62.535,-31.428],[-41.779,-31.428],[-34.094,-31.252],[-27.175,-29.482],[-19.384,-21.691],[-17.616,-14.773],[-17.441,-7.09]],"c":true},"ix":2},"nm":"Path 6","mn":"ADBE Vector Shape - Group","hd":false},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[18.268,0],[48.598,-17.471],[0,0],[-2.144,-0.176],[-2.288,-1.164],[-1.711,-3.354],[-0.185,-2.284],[0,-2.943],[0,0],[0.176,-2.148],[1.162,-2.285],[3.355,-1.709],[2.284,-0.187],[2.945,0],[0,0],[2.148,0.175],[2.285,1.164],[1.709,3.354],[0.187,2.284],[0,2.944],[0,0],[-0.175,2.147],[-0.24,1.081],[4.561,-2.242],[0,-1.578],[0,0],[0.175,-2.147],[1.164,-2.285],[3.354,-1.709],[2.284,-0.187],[2.943,0],[0,0],[2.147,0.175],[2.284,1.164],[1.72,3.054],[32.866,-78.24],[0,0],[0,0]],"o":[[-54.617,0],[0,0],[2.945,0],[2.284,0.187],[3.355,1.709],[1.162,2.284],[0.176,2.147],[0,0],[0,2.944],[-0.185,2.284],[-1.711,3.354],[-2.288,1.164],[-2.144,0.175],[0,0],[-2.941,0],[-2.283,-0.187],[-3.354,-1.709],[-1.164,-2.285],[-0.175,-2.148],[0,0],[0,-2.944],[0.087,-1.066],[-4.644,2.094],[0.027,1.362],[0,0],[0,2.943],[-0.187,2.284],[-1.709,3.354],[-2.285,1.164],[-2.147,0.175],[0,0],[-2.943,0],[-2.284,-0.187],[-3.133,-1.596],[-67.817,49.178],[0,0],[0,0],[-17.712,-2.071]],"v":[[185.127,-141],[29.528,-113.994],[40.789,-113.994],[48.472,-113.819],[55.394,-112.052],[63.186,-104.26],[64.951,-97.342],[65.127,-89.657],[65.127,-68.9],[64.951,-61.215],[63.186,-54.296],[55.394,-46.506],[48.472,-44.737],[40.789,-44.562],[20.031,-44.562],[12.348,-44.737],[5.429,-46.506],[-2.362,-54.296],[-4.13,-61.215],[-4.305,-68.9],[-4.305,-89.656],[-4.13,-97.342],[-3.661,-100.569],[-17.47,-94.067],[-17.441,-89.657],[-17.441,-68.9],[-17.616,-61.215],[-19.384,-54.296],[-27.175,-46.506],[-34.094,-44.737],[-41.778,-44.562],[-62.536,-44.562],[-70.22,-44.737],[-77.139,-46.506],[-84.568,-53.649],[-239.127,141],[239.127,141],[239.127,-137.864]],"c":true},"ix":2},"nm":"Path 7","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.75686275959,0.780392169952,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[394.873,421.994],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":8,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[3.109,0],[0,0],[0,3.108],[0,0],[-3.109,0],[0,0],[0,-3.108]],"o":[[0,3.108],[0,0],[-3.109,0],[0,0],[0,-3.108],[0,0],[3.109,0],[0,0]],"v":[[9.383,3.754],[3.753,9.383],[-3.753,9.383],[-9.383,3.754],[-9.383,-3.754],[-3.753,-9.383],[3.753,-9.383],[9.383,-3.754]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.063,0.122],[0.883,0.446],[1.471,0.122],[3.261,0],[0,0],[1.548,-0.126],[0.124,-0.063],[0.45,-0.883],[0.12,-1.468],[0,-3.261],[0,0],[-0.127,-1.549],[-0.063,-0.126],[-0.883,-0.45],[-1.471,-0.122],[-3.261,0],[0,0],[-1.548,0.126],[-0.124,0.063],[-0.45,0.883],[-0.12,1.473],[0,3.261],[0,0],[0.126,1.549]],"o":[[-0.45,-0.883],[-0.124,-0.063],[-1.548,-0.126],[0,0],[-3.261,0],[-1.471,0.122],[-0.883,0.446],[-0.063,0.122],[-0.127,1.549],[0,0],[0,3.261],[0.12,1.473],[0.45,0.883],[0.124,0.063],[1.548,0.126],[0,0],[3.261,0],[1.471,-0.122],[0.883,-0.45],[0.063,-0.126],[0.126,-1.549],[0,0],[0,-3.261],[-0.12,-1.468]],"v":[[21.069,-19.017],[19.018,-21.066],[16.994,-21.449],[10.133,-21.58],[-10.133,-21.58],[-16.993,-21.449],[-19.019,-21.066],[-21.069,-19.017],[-21.449,-16.995],[-21.58,-10.131],[-21.58,10.136],[-21.449,16.995],[-21.069,19.021],[-19.019,21.07],[-16.993,21.449],[-10.133,21.58],[10.133,21.58],[16.994,21.449],[19.018,21.07],[21.069,19.021],[21.449,16.995],[21.58,10.136],[21.58,-10.131],[21.449,-16.995]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.75686275959,0.780392169952,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[342.716,425.283],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":3,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-3.108,0],[0,0],[0,-3.109],[0,0],[3.107,0],[0,0],[0,3.109]],"o":[[0,-3.109],[0,0],[3.107,0],[0,0],[0,3.109],[0,0],[-3.108,0],[0,0]],"v":[[-9.383,-3.753],[-3.754,-9.383],[3.754,-9.383],[9.384,-3.753],[9.384,3.753],[3.754,9.383],[-3.754,9.383],[-9.383,3.753]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.446,-0.883],[0.122,-1.471],[0,-3.261],[0,0],[-0.126,-1.548],[-0.063,-0.124],[-0.883,-0.45],[-1.468,-0.12],[-3.261,0],[0,0],[-1.549,0.126],[-0.126,0.063],[-0.451,0.883],[-0.122,1.471],[0,3.261],[0,0],[0.126,1.548],[0.063,0.124],[0.883,0.45],[1.473,0.12],[3.261,0],[0,0],[1.549,-0.127],[0.121,-0.063]],"o":[[-0.063,0.124],[-0.126,1.548],[0,0],[0,3.261],[0.122,1.471],[0.446,0.883],[0.121,0.063],[1.549,0.126],[0,0],[3.261,0],[1.473,-0.12],[0.883,-0.45],[0.063,-0.124],[0.126,-1.548],[0,0],[0,-3.261],[-0.122,-1.471],[-0.451,-0.883],[-0.126,-0.063],[-1.549,-0.127],[0,0],[-3.261,0],[-1.468,0.12],[-0.883,0.45]],"v":[[-21.066,-19.019],[-21.449,-16.993],[-21.58,-10.133],[-21.58,10.133],[-21.449,16.993],[-21.066,19.019],[-19.017,21.069],[-16.995,21.449],[-10.131,21.58],[10.135,21.58],[16.995,21.449],[19.021,21.069],[21.071,19.019],[21.449,16.993],[21.58,10.133],[21.58,-10.133],[21.449,-16.993],[21.071,-19.019],[19.021,-21.069],[16.995,-21.448],[10.135,-21.58],[-10.131,-21.58],[-16.995,-21.448],[-19.017,-21.069]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.75686275959,0.780392169952,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[425.283,342.716],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":3,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.883,-0.45],[-1.471,-0.12],[-3.261,0],[0,0],[-1.548,0.126],[-0.124,0.063],[-0.45,0.883],[-0.12,1.471],[0,3.261],[0,0],[4.029,-2.303],[0,0],[3.109,0],[0,0],[0.903,0.616],[4.749,-3.236],[-0.049,-0.095]],"o":[[0.124,0.063],[1.548,0.126],[0,0],[3.261,0],[1.471,-0.12],[0.883,-0.45],[0.063,-0.124],[0.126,-1.548],[0,0],[-4.104,2.183],[0,0],[0,3.109],[0,0],[-1.176,0],[-4.874,3.06],[0.111,0.79],[0.45,0.883]],"v":[[-19.131,14.326],[-17.106,14.705],[-10.246,14.837],[10.021,14.837],[16.881,14.705],[18.906,14.326],[20.956,12.275],[21.336,10.25],[21.468,3.39],[21.468,-14.837],[9.27,-8.104],[9.27,-2.99],[3.641,2.639],[-3.866,2.639],[-7.035,1.662],[-21.468,11.11],[-21.181,12.275]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.75686275959,0.780392169952,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[342.829,349.459],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Layer 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[384,408.994,0],"ix":2},"a":{"a":0,"k":[384,408.994,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-67.817,49.178],[0.113,0.221],[0.187,2.284],[0,2.944],[0,0],[-0.176,2.147],[-1.164,2.284],[-3.354,1.709],[-2.284,0.187],[-2.943,0],[0,0],[-2.148,-0.176],[-2.285,-1.164],[-1.709,-3.354],[-0.187,-2.284],[-0.023,-1.178],[-4.644,2.094],[-0.621,1.218],[-3.354,1.709],[-2.283,0.187],[-2.941,0],[0,0],[-54.617,0],[-17.712,-2.071],[0,0],[32.032,0],[0,0],[0,-32.032],[0,0],[0,0]],"o":[[-0.121,-0.216],[-1.164,-2.285],[-0.176,-2.148],[0,0],[0,-2.944],[0.187,-2.284],[1.709,-3.354],[2.284,-1.164],[2.147,-0.176],[0,0],[2.944,0],[2.284,0.187],[3.354,1.709],[1.164,2.284],[0.081,0.996],[4.561,-2.242],[0.274,-1.236],[1.709,-3.354],[2.285,-1.164],[2.148,-0.176],[0,0],[48.598,-17.471],[18.268,0],[0,0],[0,-32.032],[0,0],[-32.032,0],[0,0],[0,0],[32.866,-78.24]],"v":[[-73.694,-8.649],[-74.057,-9.296],[-75.825,-16.215],[-76,-23.9],[-76,-44.656],[-75.825,-52.342],[-74.057,-59.26],[-66.266,-67.052],[-59.347,-68.819],[-51.662,-68.994],[-30.906,-68.994],[-23.221,-68.819],[-16.302,-67.052],[-8.511,-59.26],[-6.743,-52.342],[-6.597,-49.067],[7.212,-55.569],[8.511,-59.26],[16.302,-67.052],[23.221,-68.819],[30.904,-68.994],[40.401,-68.994],[196,-96],[250,-92.864],[250,-128],[192,-186],[-192,-186],[-250,-128],[-250,186],[-228.254,186]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[384,376.994],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-4.104,2.183],[0,0],[0.126,1.548],[0.063,0.124],[0.883,0.45],[1.471,0.12],[3.261,0],[0,0],[1.548,-0.127],[0.124,-0.063],[0.45,-0.883],[0.12,-1.471],[0,-3.261],[0,0],[-0.127,-1.548],[-0.033,-0.238],[-4.874,3.06],[0,1.933],[0,0],[-3.109,0],[0,0],[0,-3.109],[0,0]],"o":[[0,0],[0,-3.261],[-0.12,-1.471],[-0.45,-0.883],[-0.124,-0.063],[-1.548,-0.127],[0,0],[-3.261,0],[-1.471,0.12],[-0.883,0.45],[-0.063,0.124],[-0.127,1.548],[0,0],[0,3.261],[0.028,0.341],[4.749,-3.236],[-1.485,-1.014],[0,0],[0,-3.109],[0,0],[3.109,0],[0,0],[4.029,-2.303]],"v":[[21.58,-6.23],[21.58,-8.27],[21.449,-15.13],[21.069,-17.155],[19.018,-19.205],[16.994,-19.585],[10.133,-19.717],[-10.133,-19.717],[-16.993,-19.585],[-19.019,-19.205],[-21.069,-17.155],[-21.449,-15.13],[-21.58,-8.27],[-21.58,11.997],[-21.449,18.857],[-21.355,19.717],[-6.922,10.269],[-9.383,5.617],[-9.383,-1.889],[-3.753,-7.519],[3.753,-7.519],[9.383,-1.889],[9.383,0.503]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[342.716,340.852],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[14.36,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,-14.36],[-14.36,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,14.36]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[-14.36,0],[0,14.36],[0,0],[0,0],[0,0],[0,0],[0,0],[14.36,0],[0,-14.36]],"v":[[304,-26],[261.697,-26],[249.69,-26],[-249.69,-26],[-261.697,-26],[-304,-26],[-330,0],[-304,26],[-231.198,26],[-192,26],[192,26],[231.198,26],[304,26],[330,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[384,600.994],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0}]},{"id":"comp_1","layers":[{"ddd":0,"ind":1,"ty":0,"nm":"check","refId":"comp_2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[386,384,0],"ix":2},"a":{"a":0,"k":[96,96,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":192,"h":192,"ip":110,"op":243,"st":110,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Layer 7","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[384,384,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[14.36,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,-14.36]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[14.36,0],[0,14.36]],"v":[[304,242.994],[231.198,242.994],[192,242.994],[153.987,242.994],[153.987,190.994],[249.69,190.994],[261.697,190.994],[304,190.994],[330,216.994]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.024,-0.296],[-0.018,0.298]],"o":[[0.023,-0.297],[-0.019,0.298]],"v":[[153.809,252.198],[153.877,251.308]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0.034,-0.759],[0,0.768]],"o":[[0.032,-0.76],[0,0.768]],"v":[[153.929,250.289],[153.987,248]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0,0],[23.196,0],[0,0],[0,23.196],[0,0],[-23.196,0],[0,0],[0,-23.196]],"o":[[0,23.196],[0,0],[-23.196,0],[0,0],[0,-23.196],[0,0],[23.196,0],[0,0]],"v":[[141.987,248],[99.987,290],[-99.987,290],[-141.987,248],[-141.987,-248],[-99.987,-290],[99.987,-290],[141.987,-248]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0.019,0.298],[-0.023,-0.297]],"o":[[0.018,0.298],[-0.024,-0.296]],"v":[[-153.877,251.308],[-153.809,252.198]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[-0.032,-0.76],[0,0.768]],"o":[[-0.034,-0.759],[0,0.768]],"v":[[-153.929,250.289],[-153.987,248]],"c":true},"ix":2},"nm":"Path 6","mn":"ADBE Vector Shape - Group","hd":false},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,14.36],[-14.36,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[-14.36,0],[0,-14.36],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-231.198,242.994],[-304,242.994],[-330,216.994],[-304,190.994],[-261.697,190.994],[-249.69,190.994],[-153.987,190.994],[-153.987,242.994],[-192,242.994]],"c":true},"ix":2},"nm":"Path 7","mn":"ADBE Vector Shape - Group","hd":false},{"ind":7,"ty":"sh","ix":8,"ks":{"a":0,"k":{"i":[[0,0],[-32.032,0],[0,0],[0,0],[0,0]],"o":[[0,-32.032],[0,0],[0,0],[0,0],[0,0]],"v":[[-250,-135.006],[-192,-193.006],[-153.987,-193.006],[-153.987,178.994],[-250,178.994]],"c":true},"ix":2},"nm":"Path 8","mn":"ADBE Vector Shape - Group","hd":false},{"ind":8,"ty":"sh","ix":9,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,-32.032],[0,0],[0,0]],"o":[[0,0],[32.032,0],[0,0],[0,0],[0,0]],"v":[[153.987,-193.006],[192,-193.006],[250,-135.006],[250,178.994],[153.987,178.994]],"c":true},"ix":2},"nm":"Path 9","mn":"ADBE Vector Shape - Group","hd":false},{"ind":9,"ty":"sh","ix":10,"ks":{"a":0,"k":{"i":[[20.988,0],[0,0],[0,0],[38.66,0],[0,0],[0,0],[29.824,0],[0,0],[0,-29.823],[0,0],[0,0],[0,-38.66],[0,0],[0,0],[0,-20.988],[-20.987,0],[0,0],[0,0],[0,0.001],[-27.453,0],[0,0],[-3.431,26.519],[0,-0.001],[0,0],[0,0],[0,20.988]],"o":[[0,0],[0,0],[0,-38.66],[0,0],[0,0],[0,-29.823],[0,0],[-29.824,0],[0,0],[0,0],[-38.66,0],[0,0],[0,0],[-20.987,0],[0,20.988],[0,0],[0,0],[0,-0.001],[3.431,26.519],[0,0],[27.453,0],[0,0.001],[0,0],[0,0],[20.988,0],[0,-20.988]],"v":[[304,178.994],[262,178.994],[262,-135.006],[192,-205.006],[153.987,-205.006],[153.987,-248],[99.987,-302],[-99.987,-302],[-153.987,-248],[-153.987,-205.006],[-192,-205.006],[-262,-135.006],[-262,178.994],[-304,178.994],[-342,216.994],[-304,254.994],[-192,254.994],[-153.521,254.994],[-153.522,254.991],[-99.987,302],[99.987,302],[153.522,254.991],[153.521,254.994],[192,254.994],[304,254.994],[342,216.994]],"c":true},"ix":2},"nm":"Path 10","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":11,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Layer 6","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[384,384,0],"ix":2},"a":{"a":0,"k":[384,384,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[23.196,0],[0,0],[0,-23.196],[0,0],[-23.196,0],[0,0],[0,23.196],[0,0]],"o":[[0,0],[-23.196,0],[0,0],[0,23.196],[0,0],[23.196,0],[0,0],[0,-23.196]],"v":[[99.987,-290],[-99.987,-290],[-141.987,-248],[-141.987,248],[-99.987,290],[99.987,290],[141.987,248],[141.987,-248]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[384,384],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-17.712,-2.071],[0,0],[32.032,0],[0,0],[0,0],[-14.165,0]],"o":[[0,0],[0,-32.032],[0,0],[0,0],[13.838,-1.253],[18.268,0]],"v":[[48.006,46.568],[48.006,11.432],[-9.994,-46.568],[-48.006,-46.568],[-48.006,45.341],[-5.994,43.432]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[585.994,237.562],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-32.032],[0,0],[0,0],[-30.578,35.828],[0,0],[0,0]],"o":[[0,0],[0,0],[18.512,-44.069],[0,0],[0,0],[-32.032,0]],"v":[[-48.006,-128],[-48.006,186],[-26.26,186],[48.006,65.524],[48.006,-186],[9.994,-186]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[182.006,376.994],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,-14.36],[-14.36,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[-14.36,0],[0,14.36],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-19.703,-26],[-62.006,-26],[-88.006,0],[-62.006,26],[10.796,26],[49.994,26],[88.006,26],[88.006,-26],[-7.696,-26]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[142.006,600.994],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[14.36,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,14.36]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[14.36,0],[0,-14.36]],"v":[[62.006,-26],[19.703,-26],[7.696,-26],[-88.006,-26],[-88.006,26],[-49.994,26],[-10.796,26],[62.006,26],[88.006,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[625.994,600.994],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":2,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Layer 5","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[394.873,421.994,0],"ix":2},"a":{"a":0,"k":[394.873,421.994,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[18.268,0],[13.838,-1.253],[0,0],[0,0],[0,0]],"o":[[-14.165,0],[0,0],[0,0],[0,0],[-17.712,-2.071]],"v":[[-5.994,-141],[-48.006,-139.091],[-48.006,141],[48.006,141],[48.006,-137.864]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.75686275959,0.780392169952,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[585.994,421.994],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[18.512,-44.069],[0,0]],"o":[[-30.578,35.828],[0,0],[0,0]],"v":[[37.133,-60.238],[-37.133,60.238],[37.133,60.238]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.75686275959,0.780392169952,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[192.88,502.757],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":240,"st":0,"bm":0}]},{"id":"comp_2","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"check","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[96,96,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[99.999,99.999,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[9.25,-6],[-2.75,6],[-9.25,-0.5]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.461],"y":[1]},"o":{"x":[0.466],"y":[0]},"t":22,"s":[100]},{"t":45,"s":[0]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":4,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[350,350],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"check","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":151,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"circle","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[96,96,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[99.999,99.999,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[53,53],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.34],"y":[1]},"o":{"x":[0.66],"y":[0]},"t":0,"s":[0]},{"t":38.5,"s":[100]}],"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.34],"y":[1]},"o":{"x":[0.66],"y":[0]},"t":0,"s":[-360]},{"t":38.5,"s":[0]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":4,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"circle","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":151,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"Linking a device - fade in","refId":"comp_0","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":8,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[384,384,0],"ix":2},"a":{"a":0,"k":[384,384,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":768,"h":768,"ip":0,"op":10,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":0,"nm":"Linking a device - fade out","refId":"comp_1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":220,"s":[100]},{"t":228,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[384,384,0],"ix":2},"a":{"a":0,"k":[384,384,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":768,"h":768,"ip":210,"op":240,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":0,"nm":"check","refId":"comp_2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":210,"s":[100]},{"t":218,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[386,384,0],"ix":2},"a":{"a":0,"k":[96,96,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":192,"h":192,"ip":110,"op":210,"st":110,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"laptop qr","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":8,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":100,"s":[100]},{"t":103,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[382,382,0],"ix":2},"a":{"a":0,"k":[191,197,0],"ix":1},"s":{"a":0,"k":[200,200,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.554,0],[0,0],[0,-1.556],[0,0],[-1.555,0],[0,0],[0,1.556],[0,0]],"o":[[0,0],[-1.555,0],[0,0],[0,1.556],[0,0],[1.554,0],[0,0],[0,-1.556]],"v":[[1.877,-4.691],[-1.877,-4.691],[-4.692,-1.876],[-4.692,1.876],[-1.877,4.691],[1.877,4.691],[4.692,1.876],[4.692,-1.876]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[202.321,228.963],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.556,0],[0,0],[0,-1.554],[0,0],[-1.556,0],[0,0],[0,1.554],[0,0]],"o":[[0,0],[-1.556,0],[0,0],[0,1.554],[0,0],[1.556,0],[0,0],[0,-1.554]],"v":[[1.876,-4.692],[-1.876,-4.692],[-4.691,-1.877],[-4.691,1.877],[-1.876,4.692],[1.876,4.692],[4.691,1.877],[4.691,-1.877]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[222.963,208.321],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.556,0],[0,0],[0,-1.556],[0,0],[-1.556,0],[0,0],[0,1.556],[0,0]],"o":[[0,0],[-1.556,0],[0,0],[0,1.556],[0,0],[1.556,0],[0,0],[0,-1.556]],"v":[[1.876,-4.691],[-1.876,-4.691],[-4.691,-1.876],[-4.691,1.876],[-1.876,4.691],[1.876,4.691],[4.691,1.876],[4.691,-1.876]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[222.963,228.963],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.554,0],[0,0],[0,-1.554],[0,0],[-1.554,0],[0,0],[0,1.554],[0,0]],"o":[[0,0],[-1.554,0],[0,0],[0,1.554],[0,0],[1.554,0],[0,0],[0,-1.554]],"v":[[1.877,-4.692],[-1.877,-4.692],[-4.692,-1.877],[-4.692,1.877],[-1.877,4.692],[1.877,4.692],[4.692,1.877],[4.692,-1.877]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[212.642,218.642],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.554,0],[0,0],[0,-1.554],[0,0],[-1.555,0],[0,0],[0,1.554],[0,0]],"o":[[0,0],[-1.555,0],[0,0],[0,1.554],[0,0],[1.554,0],[0,0],[0,-1.554]],"v":[[1.877,-4.692],[-1.877,-4.692],[-4.692,-1.877],[-4.692,1.877],[-1.877,4.692],[1.877,4.692],[4.692,1.877],[4.692,-1.877]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[202.321,208.321],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":2,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.063,-0.774],[0.031,-0.062],[0.441,-0.225],[0.736,-0.06],[1.63,0],[0,0],[0.775,0.063],[0.061,0.032],[0.223,0.441],[0.061,0.736],[0,1.631],[0,0],[-0.063,0.774],[-0.032,0.062],[-0.441,0.225],[-0.734,0.06],[-1.63,0],[0,0],[-0.775,-0.063],[-0.063,-0.032],[-0.225,-0.441],[-0.061,-0.736],[0,-1.631]],"o":[[0,1.631],[-0.061,0.736],[-0.225,0.441],[-0.063,0.032],[-0.775,0.063],[0,0],[-1.63,0],[-0.734,-0.06],[-0.441,-0.225],[-0.032,-0.062],[-0.063,-0.774],[0,0],[0,-1.631],[0.061,-0.736],[0.223,-0.441],[0.061,-0.032],[0.775,-0.063],[0,0],[1.63,0],[0.736,0.06],[0.441,0.225],[0.031,0.062],[0.063,0.774],[0,0]],"v":[[10.789,5.067],[10.724,8.497],[10.535,9.509],[9.51,10.534],[8.497,10.724],[5.067,10.79],[-5.066,10.79],[-8.498,10.724],[-9.509,10.534],[-10.533,9.509],[-10.725,8.497],[-10.79,5.067],[-10.79,-5.067],[-10.725,-8.497],[-10.533,-9.509],[-9.509,-10.534],[-8.498,-10.724],[-5.066,-10.79],[5.067,-10.79],[8.497,-10.724],[9.51,-10.534],[10.535,-9.509],[10.724,-8.497],[10.789,-5.067]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.088,1.074],[0.581,1.142],[1.678,0.855],[1.142,0.093],[1.473,0],[0,0],[1.074,-0.088],[1.143,-0.582],[0.854,-1.677],[0.093,-1.142],[0,-1.472],[0,0],[-0.088,-1.074],[-0.582,-1.142],[-1.677,-0.854],[-1.142,-0.093],[-1.47,0],[0,0],[-1.072,0.088],[-1.144,0.582],[-0.856,1.677],[-0.092,1.142],[0,1.472],[0,0]],"o":[[-0.092,-1.142],[-0.856,-1.677],[-1.144,-0.582],[-1.072,-0.088],[0,0],[-1.47,0],[-1.142,0.093],[-1.677,0.855],[-0.582,1.142],[-0.088,1.074],[0,0],[0,1.472],[0.093,1.142],[0.854,1.677],[1.143,0.582],[1.074,0.088],[0,0],[1.473,0],[1.142,-0.093],[1.678,-0.854],[0.581,-1.142],[0.088,-1.074],[0,0],[0,-1.472]],"v":[[17.27,-9.032],[16.388,-12.491],[12.492,-16.387],[9.031,-17.27],[5.189,-17.358],[-5.19,-17.358],[-9.031,-17.27],[-12.491,-16.387],[-16.386,-12.491],[-17.27,-9.032],[-17.358,-5.189],[-17.358,5.189],[-17.27,9.032],[-16.386,12.491],[-12.491,16.386],[-9.031,17.27],[-5.19,17.358],[5.189,17.358],[9.031,17.27],[12.492,16.386],[16.388,12.491],[17.27,9.032],[17.358,5.189],[17.358,-5.189]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[212.642,177.358],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6","np":3,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.554,0],[0,0],[0,-1.555],[0,0],[-1.554,0],[0,0],[0,1.554],[0,0]],"o":[[0,0],[-1.554,0],[0,0],[0,1.554],[0,0],[1.554,0],[0,0],[0,-1.555]],"v":[[1.877,-4.691],[-1.877,-4.691],[-4.692,-1.877],[-4.692,1.877],[-1.877,4.691],[1.877,4.691],[4.692,1.877],[4.692,-1.877]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[212.642,177.358],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 7","np":2,"cix":2,"bm":0,"ix":7,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.063,-0.775],[0.032,-0.063],[0.441,-0.225],[0.736,-0.061],[1.631,0],[0,0],[0.774,0.063],[0.062,0.032],[0.225,0.441],[0.06,0.736],[0,1.63],[0,0],[-0.063,0.775],[-0.032,0.061],[-0.441,0.223],[-0.736,0.061],[-1.631,0],[0,0],[-0.774,-0.063],[-0.062,-0.032],[-0.225,-0.441],[-0.06,-0.734],[0,-1.63]],"o":[[0,1.63],[-0.06,0.736],[-0.225,0.441],[-0.062,0.032],[-0.774,0.063],[0,0],[-1.631,0],[-0.736,-0.061],[-0.441,-0.225],[-0.032,-0.063],[-0.063,-0.775],[0,0],[0,-1.63],[0.06,-0.734],[0.225,-0.441],[0.062,-0.032],[0.774,-0.063],[0,0],[1.631,0],[0.736,0.061],[0.441,0.223],[0.032,0.061],[0.063,0.775],[0,0]],"v":[[10.79,5.068],[10.724,8.497],[10.534,9.511],[9.509,10.535],[8.497,10.724],[5.067,10.79],[-5.067,10.79],[-8.497,10.724],[-9.509,10.535],[-10.534,9.511],[-10.724,8.497],[-10.79,5.068],[-10.79,-5.066],[-10.724,-8.497],[-10.534,-9.509],[-9.509,-10.533],[-8.497,-10.724],[-5.067,-10.79],[5.067,-10.79],[8.497,-10.724],[9.509,-10.533],[10.534,-9.509],[10.724,-8.497],[10.79,-5.066]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.582,1.142],[1.677,0.853],[1.142,0.095],[1.472,0],[0,0],[1.074,-0.088],[1.142,-0.583],[0.855,-1.678],[0.093,-1.142],[0,-1.47],[0,0],[-0.088,-1.072],[-0.582,-1.144],[-1.677,-0.856],[-1.142,-0.092],[-1.472,0],[0,0],[-1.074,0.088],[-1.142,0.581],[-0.855,1.678],[-0.093,1.142],[0,1.473],[0,0],[0.088,1.074]],"o":[[-0.855,-1.678],[-1.142,-0.583],[-1.074,-0.088],[0,0],[-1.472,0],[-1.142,0.095],[-1.677,0.853],[-0.582,1.142],[-0.088,1.074],[0,0],[0,1.473],[0.093,1.142],[0.855,1.678],[1.142,0.581],[1.074,0.088],[0,0],[1.472,0],[1.142,-0.092],[1.677,-0.856],[0.582,-1.144],[0.088,-1.072],[0,0],[0,-1.47],[-0.093,-1.142]],"v":[[16.386,-12.49],[12.491,-16.386],[9.032,-17.271],[5.189,-17.358],[-5.189,-17.358],[-9.032,-17.271],[-12.491,-16.386],[-16.387,-12.49],[-17.27,-9.031],[-17.358,-5.189],[-17.358,5.189],[-17.27,9.031],[-16.387,12.492],[-12.491,16.388],[-9.032,17.271],[-5.189,17.358],[5.189,17.358],[9.032,17.271],[12.491,16.388],[16.386,12.492],[17.27,9.031],[17.358,5.189],[17.358,-5.189],[17.27,-9.031]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[171.358,218.642],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 8","np":3,"cix":2,"bm":0,"ix":8,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.554,0],[0,0],[0,-1.554],[0,0],[-1.555,0],[0,0],[0,1.554],[0,0]],"o":[[0,0],[-1.555,0],[0,0],[0,1.554],[0,0],[1.554,0],[0,0],[0,-1.554]],"v":[[1.877,-4.692],[-1.877,-4.692],[-4.691,-1.877],[-4.691,1.877],[-1.877,4.692],[1.877,4.692],[4.691,1.877],[4.691,-1.877]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[171.358,218.642],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 9","np":2,"cix":2,"bm":0,"ix":9,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.063,-0.774],[0.032,-0.062],[0.441,-0.225],[0.736,-0.06],[1.631,0],[0,0],[0.774,0.063],[0.062,0.032],[0.225,0.441],[0.06,0.736],[0,1.631],[0,0],[-0.063,0.774],[-0.032,0.062],[-0.441,0.225],[-0.736,0.06],[-1.631,0],[0,0],[-0.774,-0.063],[-0.062,-0.032],[-0.225,-0.441],[-0.06,-0.736],[0,-1.631]],"o":[[0,1.631],[-0.06,0.736],[-0.225,0.441],[-0.062,0.032],[-0.774,0.063],[0,0],[-1.631,0],[-0.736,-0.06],[-0.441,-0.225],[-0.032,-0.062],[-0.063,-0.774],[0,0],[0,-1.631],[0.06,-0.736],[0.225,-0.441],[0.062,-0.032],[0.774,-0.063],[0,0],[1.631,0],[0.736,0.06],[0.441,0.225],[0.032,0.062],[0.063,0.774],[0,0]],"v":[[10.79,5.067],[10.724,8.497],[10.534,9.509],[9.509,10.534],[8.497,10.724],[5.067,10.79],[-5.067,10.79],[-8.497,10.724],[-9.509,10.534],[-10.534,9.509],[-10.724,8.497],[-10.79,5.067],[-10.79,-5.067],[-10.724,-8.497],[-10.534,-9.509],[-9.509,-10.534],[-8.497,-10.724],[-5.067,-10.79],[5.067,-10.79],[8.497,-10.724],[9.509,-10.534],[10.534,-9.509],[10.724,-8.497],[10.79,-5.067]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.582,1.142],[1.677,0.855],[1.142,0.093],[1.472,0],[0,0],[1.074,-0.088],[1.142,-0.582],[0.855,-1.677],[0.093,-1.142],[0,-1.472],[0,0],[-0.088,-1.074],[-0.582,-1.142],[-1.677,-0.854],[-1.142,-0.093],[-1.472,0],[0,0],[-1.074,0.088],[-1.142,0.582],[-0.855,1.677],[-0.093,1.142],[0,1.472],[0,0],[0.088,1.074]],"o":[[-0.855,-1.677],[-1.142,-0.582],[-1.074,-0.088],[0,0],[-1.472,0],[-1.142,0.093],[-1.677,0.855],[-0.582,1.142],[-0.088,1.074],[0,0],[0,1.472],[0.093,1.142],[0.855,1.677],[1.142,0.582],[1.074,0.088],[0,0],[1.472,0],[1.142,-0.093],[1.677,-0.854],[0.582,-1.142],[0.088,-1.074],[0,0],[0,-1.472],[-0.093,-1.142]],"v":[[16.386,-12.491],[12.491,-16.387],[9.032,-17.27],[5.189,-17.358],[-5.189,-17.358],[-9.032,-17.27],[-12.491,-16.387],[-16.387,-12.491],[-17.27,-9.032],[-17.358,-5.189],[-17.358,5.189],[-17.27,9.032],[-16.387,12.491],[-12.491,16.386],[-9.032,17.27],[-5.189,17.358],[5.189,17.358],[9.032,17.27],[12.491,16.386],[16.386,12.491],[17.27,9.032],[17.358,5.189],[17.358,-5.189],[17.27,-9.032]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[171.358,177.358],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 10","np":3,"cix":2,"bm":0,"ix":10,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.554,0],[0,0],[0,-1.555],[0,0],[-1.555,0],[0,0],[0,1.554],[0,0]],"o":[[0,0],[-1.555,0],[0,0],[0,1.554],[0,0],[1.554,0],[0,0],[0,-1.555]],"v":[[1.877,-4.691],[-1.877,-4.691],[-4.691,-1.877],[-4.691,1.877],[-1.877,4.691],[1.877,4.691],[4.691,1.877],[4.691,-1.877]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[171.358,177.358],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 11","np":2,"cix":2,"bm":0,"ix":11,"mn":"ADBE Vector Group","hd":false}],"ip":10,"op":210,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"phone border","parent":7,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":46,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":54,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":220,"s":[100]},{"t":228,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,-4,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-11.598],[0,0],[-11.598,0],[0,0],[0,11.598],[0,0],[11.598,0]],"o":[[-11.598,0],[0,0],[0,11.598],[0,0],[11.598,0],[0,0],[0,-11.598],[0,0]],"v":[[-49.994,-141],[-70.994,-120],[-70.994,128],[-49.994,149],[49.994,149],[70.994,128],[70.994,-120],[49.994,-141]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[-14.912,0],[0,0],[0,-14.912],[0,0],[14.912,0],[0,0],[0,14.912]],"o":[[0,-14.912],[0,0],[14.912,0],[0,0],[0,14.912],[0,0],[-14.912,0],[0,0]],"v":[[-76.994,-120],[-49.994,-147],[49.994,-147],[76.994,-120],[76.994,128],[49.994,155],[-49.994,155],[-76.994,128]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":10,"op":210,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"phone frame","parent":7,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":46,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":54,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":100,"s":[100]},{"t":103,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2},"a":{"a":0,"k":[192,198,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":76,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":81,"s":[90,90,100]},{"t":86,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.656,0],[0,-1.656],[0,0],[2.762,0],[0,0],[0,-1.656],[-1.656,0],[0,0],[0,6.076],[0,0]],"o":[[-1.656,0],[0,0],[0,2.762],[0,0],[-1.656,0],[0,1.656],[0,0],[6.076,0],[0,0],[0,-1.656]],"v":[[14,-16],[11,-13],[11,5],[6,10],[-14,10],[-17,13],[-14,16],[6,16],[17,5],[17,-13]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[233.997,240.997],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.656,0],[0,0],[0,2.762],[0,0],[1.656,0],[0,-1.656],[0,0],[-6.076,0],[0,0],[0,1.656]],"o":[[0,0],[-2.762,0],[0,0],[0,-1.656],[-1.656,0],[0,0],[0,6.076],[0,0],[1.656,0],[0,-1.656]],"v":[[14,10],[-6,10],[-11,5],[-11,-13],[-14,-16],[-17,-13],[-17,5],[-6,16],[14,16],[17,13]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[150.003,240.997],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[6.076,0],[0,0],[0,-1.657],[-1.656,0],[0,0],[0,-2.761],[0,0],[-1.656,0],[0,1.657],[0,0]],"o":[[0,0],[-1.656,0],[0,1.657],[0,0],[2.762,0],[0,0],[0,1.657],[1.656,0],[0,0],[0,-6.075]],"v":[[6,-16],[-14,-16],[-17,-13],[-14,-10],[6,-10],[11,-5],[11,13],[14,16],[17,13],[17,-5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[233.997,155.003],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.656,0],[0,0],[0,-6.075],[0,0],[-1.656,0],[0,1.657],[0,0],[-2.762,0],[0,0],[0,1.657]],"o":[[0,0],[-6.076,0],[0,0],[0,1.657],[1.656,0],[0,0],[0,-2.761],[0,0],[1.656,0],[0,-1.657]],"v":[[14,-16],[-6,-16],[-17,-5],[-17,13],[-14,16],[-11,13],[-11,-5],[-6,-10],[14,-10],[17,-13]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[150.003,155.003],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false}],"ip":10,"op":210,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"phone bg","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":46,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":54,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":220,"s":[100]},{"t":228,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":46,"s":[384,464,0],"to":[0,-13.333,0],"ti":[0,13.333,0]},{"t":54,"s":[384,384,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[200,200,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[11.598,0],[0,0],[0,-11.598],[0,0],[-11.598,0],[0,0],[0,11.598]],"o":[[0,-11.598],[0,0],[-11.598,0],[0,0],[0,11.598],[0,0],[11.598,0],[0,0]],"v":[[70.994,-124],[49.994,-145],[-49.994,-145],[-70.994,-124],[-70.994,124],[-49.994,145],[49.994,145],[70.994,124]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":10,"op":210,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"laptop border 2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":8,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":220,"s":[100]},{"t":228,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[384,377,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[200,200,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.18,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,7.18],[-7.18,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,-7.18]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[-7.18,0],[0,-7.18],[0,0],[0,0],[0,0],[0,0],[0,0],[7.18,0],[0,7.18]],"v":[[152,125],[115.599,125],[96,125],[-96,125],[-115.599,125],[-152,125],[-165,112],[-152,99],[-130.849,99],[-124.845,99],[124.845,99],[130.849,99],[152,99],[165,112]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[-16.016,0],[0,0],[0,-16.016],[0,0],[0,0]],"o":[[0,-16.016],[0,0],[16.016,0],[0,0],[0,0],[0,0]],"v":[[-125,-64],[-96,-93],[96,-93],[125,-64],[125,93],[-125,93]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[10.494,0],[0,0],[0,0],[19.33,0],[0,0],[0,-19.33],[0,0],[0,0],[0,-10.494],[-10.493,0],[0,0],[0,0],[0,0],[0,10.494]],"o":[[0,0],[0,0],[0,-19.33],[0,0],[-19.33,0],[0,0],[0,0],[-10.493,0],[0,10.494],[0,0],[0,0],[0,0],[10.494,0],[0,-10.494]],"v":[[152,93],[131,93],[131,-64],[96,-99],[-96,-99],[-131,-64],[-131,93],[-152,93],[-171,112],[-152,131],[-96,131],[96,131],[152,131],[171,112]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.007843137719,0.043137256056,0.674509823322,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":10,"op":210,"st":0,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"laptop tint 2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":8,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":220,"s":[100]},{"t":228,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[394.873,422,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[200,200,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[9.134,0],[34.793,-82.827],[0,0]],"o":[[-8.856,-1.036],[-95.468,0],[0,0],[0,0]],"v":[[119.563,-68.932],[92.563,-70.5],[-119.563,70.5],[119.563,70.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.75686275959,0.780392169952,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":10,"op":210,"st":0,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"laptop bg 2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":8,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":220,"s":[100]},{"t":228,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[384,409,0],"ix":2},"a":{"a":0,"k":[192,208,0],"ix":1},"s":{"a":0,"k":[200,200,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[16.016,0],[0,0],[0,-16.016]],"o":[[0,0],[0,0],[0,-16.016],[0,0],[-16.016,0],[0,0]],"v":[[-125,93],[125,93],[125,-64],[96,-93],[-96,-93],[-125,-64]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[192,192],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[7.18,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,-7.18],[-7.18,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,7.18]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[-7.18,0],[0,7.18],[0,0],[0,0],[0,0],[0,0],[0,0],[7.18,0],[0,-7.18]],"v":[[152,-13],[130.849,-13],[124.845,-13],[-124.845,-13],[-130.849,-13],[-152,-13],[-165,0],[-152,13],[-115.599,13],[-96,13],[96,13],[115.599,13],[152,13],[165,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.890196084976,0.909803926945,0.996078431606,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[192,304],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":10,"op":210,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 05b0e3dea9..629e8b56ee 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal is tans besig met bywerking…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly is tans besig met bywerking…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Jy het nog nie \'n wagwoord gespesifiseer nie!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Deaktiveer wagwoord?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Hierdie sal Signal- en boodskapkennisgewings permanent ontsluit</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Hierdie sal Molly- en boodskapkennisgewings permanent ontsluit</string>
     <string name="ApplicationPreferencesActivity_disable">Deaktiveer</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Kon nie aan die bediener konnekteer nie!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN’s word vereis vir registrasieslot. Om PIN’s te deaktiveer, deaktiveer eers die registrasieslot.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Lêer</string>
     <string name="AttachmentKeyboard_contact">Kontak</string>
     <string name="AttachmentKeyboard_location">Ligging</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal benodig toestemming om jou foto\'s en videos te wys</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly benodig toestemming om jou foto\'s en videos te wys</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Gee toegang</string>
     <string name="AttachmentKeyboard_payment">Betaling</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Kan nie \'n program vind om media te kies nie.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal benodig die Berging-toestemming om foto\'s, videos of klank aan te heg, maar dit is permanent geweier. Gaan asseblief na die programinstellingsmenu, kies \"Toestemmings\" en aktiveer \"Berging\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal benodig toestemming vir Kontakte om kontakinligting aan te heg, maar dit is permanent geweier. Gaan asseblief na die programinstellingsmenu, kies \"Toestemmings\" en aktiveer \"Kontakte\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal benodig toestemming vir Plek om \'n plek aan te heg, maar dit is permanent geweier. Gaan asseblief na die programinstellingsmenu, kies \"Toestemmings\" en aktiveer \"Plek\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly benodig die Berging-toestemming om foto\'s, videos of klank aan te heg, maar dit is permanent geweier. Gaan asseblief na die programinstellingsmenu, kies \"Toestemmings\" en aktiveer \"Berging\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly benodig toestemming vir Kontakte om kontakinligting aan te heg, maar dit is permanent geweier. Gaan asseblief na die programinstellingsmenu, kies \"Toestemmings\" en aktiveer \"Kontakte\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly benodig toestemming vir Plek om \'n plek aan te heg, maar dit is permanent geweier. Gaan asseblief na die programinstellingsmenu, kies \"Toestemmings\" en aktiveer \"Plek\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Laat toegang tot jou ligging toe</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Om jou ligging te stuur:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Laat Signal toegang toe om jou ligging te stuur.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Laat Molly toegang toe om jou ligging te stuur.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal benodig liggingstoegang om jou ligging te stuur.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly benodig liggingstoegang om jou ligging te stuur.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Laat toegang tot stoorruimte toe</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Om foto\'s en video\'s te wys:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal benodig stoorruimtetoegang om jou foto\'s en videos te wys.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly benodig stoorruimtetoegang om jou foto\'s en videos te wys.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s het nie Betalings geaktiveer nie </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Verander kamera</string>
     <string name="CameraXFragment_open_gallery_description">Maak galery oop</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Gee toegang</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Laat toegang tot jou kamera en mikrofoon toe</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Laat toegang tot jou kamera toe</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Laat toegang tot jou mikrofoon toe</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Laat Signal toegang tot die kamera toe om foto\'s te neem.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Laat Signal toegang tot die kamera om foto\'s en video op te neem.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Laat Signal toegang tot die kamera en mikrofoon toe om foto\'s en video\'s te neem.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Om video\'s met klank te neem, laat Signal toegang tot jou mikrofoon toe.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Om \'n QR-kode te skandeer, laat Signal toegang tot die kamera toe.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal benodig kameratoegang om foto\'s te neem</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal benodig kameratoegang om QR-kodes te skandeer</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal benodig mikrofoontoegang om video\'s te neem</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Om foto\'s in Signal te neem:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Om foto\'s en video\'s in Signal te neem:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Om video\'s met klank te neem:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Om QR-kodes te skandeer:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Onlangse kontakte</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Geen Signal-kontakte nie</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Jy kan net die kameraknoppie gebruik om foto\'s na Signal-kontakte te stuur. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Kan nie kry wie jy soek nie?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Nooi \'n kontakpersoon om by Signal aan te sluit</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Nooi \'n kontakpersoon om by Molly aan te sluit</string>
     <string name="CameraContacts__menu_search">Soek</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Nee dankie</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Werk Signal by</string>
+    <string name="ClientDeprecatedActivity_update_signal">Werk Molly by</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Hierdie weergawe van die toepassing word nie meer ondersteun nie. Om voort te gaan om boodskappe te stuur en te ontvang, doen \'n bywerking van die jongste weergawe.</string>
     <string name="ClientDeprecatedActivity_update">Werk by</string>
     <string name="ClientDeprecatedActivity_dont_update">Moenie bywerk nie</string>
     <string name="ClientDeprecatedActivity_warning">Waarskuwing</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Jou weergawe van Signal het verval. Jy sal na jou boodskapgeskiedenis kan kyk, maar jy sal nie boodskappe kan stuur of ontvang totdat jy jou weergawe bywerk nie.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Jou weergawe van Molly het verval. Jy sal na jou boodskapgeskiedenis kan kyk, maar jy sal nie boodskappe kan stuur of ontvang totdat jy jou weergawe bywerk nie.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Geen webblaaier gevind nie.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Boodskap %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly-stemoproep %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly-video-oproep %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal-boodskap</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Stuur boodskap</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Kom ons skakel oor na Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Kom ons skakel oor na Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Kies asseblief \'n kontak</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Die aanhangsel oorskry die groottegrense vir die tipe boodskap wat jy stuur.</string>
     <string name="ConversationActivity_unable_to_record_audio">Kan nie klank opneem nie!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Om oudioboodskappe te stuur:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Om stemboodskappe te stuur, laat Signal toegang tot jou mikrofoon toe.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Om stemboodskappe te stuur, laat Molly toegang tot jou mikrofoon toe.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal benodig mikrofoontoegang om \'n stemboodskap op te neem.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal benodig toestemming vir die Mikrofoon om klankboodskappe te stuur, maar dit is permanent geweier. Gaan asseblief na die programinstellings, kies \"Toestemmings\" en aktiveer \"Mikrofoon\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly benodig mikrofoontoegang om \'n stemboodskap op te neem.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly benodig toestemming vir die Mikrofoon om klankboodskappe te stuur, maar dit is permanent geweier. Gaan asseblief na die programinstellings, kies \"Toestemmings\" en aktiveer \"Mikrofoon\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal benodig toestemming vir die Mikrofoon en Kamera om %1$s te kan bel, maar dit is permanent geweier. Gaan asseblief na die programinstellings, kies \"Toestemmings\" en skakel \"Mikrofoon\" en \"Kamera\" aan.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Laat Signal toegang tot die kamera om foto\'s en video op te neem.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal het die Kamera-toestemming nodig om foto\'s of video\'s te neem, maar dit is permanent geweier. Gaan asseblief na die programinstellings, kies \"Toestemmings\" en aktiveer \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal benodig toestemming om jou kamera te gebruik om foto\'s en videos te neem</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly benodig toestemming vir die Mikrofoon en Kamera om %1$s te kan bel, maar dit is permanent geweier. Gaan asseblief na die programinstellings, kies \"Toestemmings\" en skakel \"Mikrofoon\" en \"Kamera\" aan.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Laat Molly toegang tot die kamera om foto\'s en video op te neem.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly het die Kamera-toestemming nodig om foto\'s of video\'s te neem, maar dit is permanent geweier. Gaan asseblief na die programinstellings, kies \"Toestemmings\" en aktiveer \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly benodig toestemming om jou kamera te gebruik om foto\'s en videos te neem</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Aktiveer die toestemming van die mikrofoon om videos met klank op te neem.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal het mikrofoontoestemmings nodig om video\'s op te neem, maar dit is geweier. Gaan asseblief na die programinstellings, kies \"Toestemmings\" en skakel \"Mikrofoon\" en \"Kamera\" aan.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal mikrofoontoestemming nodig om videos op te neem.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly het mikrofoontoestemmings nodig om video\'s op te neem, maar dit is geweier. Gaan asseblief na die programinstellings, kies \"Toestemmings\" en skakel \"Mikrofoon\" en \"Kamera\" aan.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly mikrofoontoestemming nodig om videos op te neem.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Nee</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Om \'n oproep te begin:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Om \'n oproep te begin, laat Signal toegang tot jou mikrofoon toe.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Om \'n oproep te begin, laat Molly toegang tot jou mikrofoon toe.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal benodig mikrofoontoegang om \'n oproep te begin.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly benodig mikrofoontoegang om \'n oproep te begin.</string>
 
 
     <string name="ConversationActivity_join">Sluit aan</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">SMS-boodskappe word nie meer in Signal ondersteun nie. Nooi %1$s na Signal om die gesprek hier te hou.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Hierdie persoon gebruik nie meer Signal nie. Nooi hulle na Signal om die gesprek hier te hou.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Hierdie persoon gebruik nie meer Molly nie. Nooi hulle na Molly om die gesprek hier te hou.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Nooi na Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Nooi na Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Jy sal binnekort weer hieraan herinner word.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Skrap vir almal</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Skrap van hierdie toestel af</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Skrap</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Skrap oral</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Hierdie boodskap sal vir almal in die klets geskrap word indien hulle ’n onlangse weergawe van Signal gebruik. Hulle sal kan sien dat jy ’n boodskap geskrap het.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Versper</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Werk Signal by</string>
+    <string name="ConversationFragment__update_build">Werk Molly by</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Herregistreer Signal</string>
+    <string name="ConversationFragment__reregister_signal">Herregistreer Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Navigeer terug.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Maak Signal oop</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Maak Molly oop</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Nie meer geverifieer nie</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Dit sal die geselekteerde klets permanent verwyder.</item>
         <item quantity="other">Dit sal alle %1$d geselekteerde kletse permanent verwyder.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Dit sal die geselekteerde klets permanent op al jou toestelle skrap.</item>
+        <item quantity="other">Dit sal al %1$d geselekteerde kletse permanent op al jou toestelle skrap.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Skrap</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Besig om geselekteerde klets te skrap…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Wie kan my volgens my nommer vind?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Enigiemand wat jou telefoonnommer het, sal sien jy is op Signal en kan met jou begin klets.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Enigiemand wat jou telefoonnommer het, sal sien jy is op Molly en kan met jou begin klets.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Niemand sal kan sien jy is op Signal nie, tensy jy vir hulle \'n boodskap stuur of \'n bestaande klets met hulle het.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Niemand sal kan sien jy is op Molly nie, tensy jy vir hulle \'n boodskap stuur of \'n bestaande klets met hulle het.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Herstel van rugsteun af?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Toets jou wagwoordfrase en verifieer dat dit ooreenkom</string>
     <string name="BackupsPreferenceFragment__turn_on">Skakel aan</string>
     <string name="BackupsPreferenceFragment__turn_off">Skakel af</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Om \'n rugsteun te herwin, installeer \'n nuwe kopie van Signal. Maak die toepassing oop, tik op \"Herwin vanaf rugsteun\" en spoor dan \'n rugsteunlêer op. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Om \'n rugsteun te herwin, installeer \'n nuwe kopie van Molly. Maak die toepassing oop, tik op \"Herwin vanaf rugsteun\" en spoor dan \'n rugsteunlêer op. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Vind meer uit</string>
     <string name="BackupsPreferenceFragment__in_progress">Aan die gang…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d tot dusver…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% tot dusver…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal benodig toestemming om ekstern te stoor ten einde rugsteunkopieë te maak, maar dit is permanent geweier. Gaan asseblief na die toepassinginstellings, kies \"Toestemmings\" en aktiveer \"Storing\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly benodig toestemming om ekstern te stoor ten einde rugsteunkopieë te maak, maar dit is permanent geweier. Gaan asseblief na die toepassinginstellings, kies \"Toestemmings\" en aktiveer \"Storing\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Stel tyd vir rugsteun</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Kletssessie het verfris</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal gebruik end-tot-end-enkriptering en gaan dalk soms van jou kletssessies moet verfris. Dit beïnvloed nie die sekuriteit van jou kletssessie nie, maar jy kon dalk ’n boodskap van hierdie kontak gemis het; jy kan hulle vra om dit weer te stuur.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly gebruik end-tot-end-enkriptering en gaan dalk soms van jou kletssessies moet verfris. Dit beïnvloed nie die sekuriteit van jou kletssessie nie, maar jy kon dalk ’n boodskap van hierdie kontak gemis het; jy kan hulle vra om dit weer te stuur.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Gebruik Signal op rekenaar of iPad. Jou boodskappe sal met jou gekoppelde toestelle gesinchroniseer word.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Koppel \'n nuwe toestel</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Boodskappe en kletsinligting word deur end-tot-end-enkriptering op alle toestelle beskerm</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal op rekenaar of iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Alle boodskappe op gekoppelde toestelle is privaat</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Molly-boodskappe word gesinchroniseer met Molly op jou selfoon nadat dit gekoppel is. Jou geskiedenis van vorige boodskappe sal nie verskyn nie.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Op jou ander toestel, besoek %1$s om Molly te installeer</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">My gekoppelde toestelle</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Ontkoppel</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s ontkoppel</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Besig om toestel te koppel…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Toestel goedgekeur</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Laai tans…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Geen gekoppelde toestelle nie</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Ontsluit om \'n toestel te koppel</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Skandeer die QR-kode wat op die toestel vertoon word om dit te koppel.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Skandeer QR-kode</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Gebruik hierdie toestel om die QR-kode te skandeer wat vertoon word op die toestel wat jy wil koppel</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Reg so</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Hierdie toestel sal jou groepe en kontakte kan sien, toegang tot jou kletse hê en boodskappe names jou stuur.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Voltooi koppeling op jou ander toestel</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Voltooi koppeling van Molly op jou ander toestel.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Kon nie toestel koppel nie</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Hierdie QR-kode is nie geldig nie. Skandeer die QR-kode wat gewys word op die toestel wat u wil koppel.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Probeer weer</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Ontkoppel \'%1$s\'?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimaliseer vir vermiste Play Services</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Hierdie toestel ondersteun nie Play Services nie. Tik om die optimering van die stelselbatterye uit te skakel wat verhoed dat Signal boodskappe ophaal terwyl hulle onaktief is.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Hierdie toestel ondersteun nie Play Services nie. Tik om die optimering van die stelselbatterye uit te skakel wat verhoed dat Molly boodskappe ophaal terwyl hulle onaktief is.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Hierdie weergawe van Signal het verval. Werk dit nou by om boodskappe te kan stuur en ontvang</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Hierdie weergawe van Molly het verval. Werk dit nou by om boodskappe te kan stuur en ontvang</string>
     <string name="ExpiredBuildReminder_update_now">Werk nou by</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Bekyk</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanente Signal-kommunikasiemislukking!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal kon nie by Google Play Services registreer nie. Signal-boodskappe en oproepe is gedeaktiveer. Probeer weer om in \"Instellings &gt; Gevorderd\" te registreer.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanente Molly-kommunikasiemislukking!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly kon nie by Google Play Services registreer nie. Molly-boodskappe en oproepe is gedeaktiveer. Probeer weer om in \"Instellings &gt; Gevorderd\" te registreer.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Ontfoutlogs help ons om die probleem te diagnoseer en reg te stel, en bevat nie identifiserende inligting nie.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal het \'n probleem ondervind. Dien ontfoutlog in?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly het \'n probleem ondervind. Dien ontfoutlog in?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Kennisgewings kan vertraag word as gevolg van batteryoptimalisering</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Jy kan batteryoptimalisering vir Signal deaktiveer om te verseker dat boodskapkennisgewings nie vertraag word nie.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Jy kan batteryoptimalisering vir Molly deaktiveer om te verseker dat boodskapkennisgewings nie vertraag word nie.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Kennisgewings kan vertraag word as gevolg van batteryoptimalisering</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Deaktiveer batteryoptimalisering vir Molly om te verseker dat boodskapkennisgewings nie vertraag word nie. Tik \"Gaan voort\" om toestelspesifieke aanwysings te sien.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Nee dankie</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Gaan voort</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Gaan voort</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Wys weg</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Nee dankie</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Hangende groepuitnodigings</string>
+    <string name="PendingMembersActivity_pending_group_invites">Versoeke &amp; uitnodigings</string>
     <string name="PendingMembersActivity_requests">Versoeke</string>
     <string name="PendingMembersActivity_invites">Uitnodigings</string>
     <string name="PendingMembersActivity_people_you_invited">Mense wat jy genooi het</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Kanselleer</string>
     <string name="InviteActivity_sending">Stuur tans…</string>
     <string name="InviteActivity_invitations_sent">Uitnodigings gestuur!</string>
-    <string name="InviteActivity_invite_to_signal">Nooi na Signal</string>
+    <string name="InviteActivity_invite_to_signal">Nooi na Molly</string>
     <string name="InviteActivity_send_sms">Stuur SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Stuur %1$d SMS uitnodiging?</item>
         <item quantity="other">Stuur %1$d SMS uitnodigings?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Kom ons skakel oor na Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Kom ons skakel oor na Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Dit lyk asof jy geen programme het om mee te deel nie.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Jou boodskap</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Agtergrondverbinding geaktiveer</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Antwoorde</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Bevestig Signal-oproep</string>
+    <string name="NotificationBarManager__establishing_signal_call">Bevestig Molly-oproep</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Besig om Signal-oproepdiens te begin</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Besig om Signal-oproepdiens te beëindig</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Besig om Molly-oproepdiens te begin</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Besig om Molly-oproepdiens te beëindig</string>
     <string name="NotificationBarManager__cancel_call">Kanselleer oproep</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Jy het Betalings geaktiveer</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s kan nou Betalings aanvaar</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Betalingsbesonderhede is nie beskikbaar nie</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Druk vir meer</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Betalingsbesonderhede nie beskikbaar nie</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Die besonderhede van hierdie betaling is nie beskikbaar nie, want jou boodskappe is herwin van \'n bron wat nie hierdie betalingsgeskiedenis bevat het nie. Dit beïnvloed nie die saldo in jou beursie of die status van vorige betalings nie.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Jy sal binnekort nie meer SMS-boodskappe vanaf Signal kan stuur nie. Nooi %1$s na Signal om die gesprek hier te hou.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Jy kan nie meer SMS-boodskappe in Signal stuur nie. Nooi %1$s na Signal om die gesprek hier te hou.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Jy kan nie meer SMS-boodskappe in Molly stuur nie. Nooi %1$s na Molly om die gesprek hier te hou.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Betaling: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Betaling</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">As slenterpos gerapporteer</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Koppel \'n Signal-toestel?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Dit lyk of jy \'n Signal-toestel probeer koppel met gebruik van \'n 3e-party-skandeerder. Vir jou beskerming, skandeer asseblief weer die kode van binne Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal het die Kamera-toestemming nodig om \'n QR-kode te skandeer, maar dit is permanent geweier. Gaan asseblief na die toepassinginstellings, kies \"Toestemmings\" en aktiveer \"Kamera\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly het die Kamera-toestemming nodig om \'n QR-kode te skandeer, maar dit is permanent geweier. Gaan asseblief na die toepassinginstellings, kies \"Toestemmings\" en aktiveer \"Kamera\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Kan nie \'n QR-kode sonder die Kameratoestemming skandeer nie</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Voorsien wagwoordfrase</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal-ikoon</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly-ikoon</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Dien wagwoordfrase in</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Ongeldige wagwoordfrase!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Ontsluit Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Sluit Skerm</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Ontsluit Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Sluit Skerm</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Kaart</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Verifieer om voort te gaan met klets</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Voltooi asb. verifikasie om gemorspos op Signal te help voorkom.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Voltooi asb. verifikasie om gemorspos op Molly te help voorkom.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Na verifikasie kan jy boodskappe stuur. Enige wagtende boodskappe sal outomaties gestuur word.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">My Storie</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal-oproep</string>
+    <string name="Recipient_signal_call">Molly-oproep</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Versper</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Lui tans…</string>
     <string name="RedPhone_busy">Besig</string>
     <string name="RedPhone_recipient_unavailable">Ontvanger is nie beskikbaar nie</string>
-    <string name="RedPhone_network_failed">Netwerk misluk!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Netwerk misluk! Gaan asseblief netwerkverbinding na en probeer weer.</string>
     <string name="RedPhone_number_not_registered">Nommer nie geregistreer nie!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Die nommer wat jy geskakel het, ondersteun nie veilige telefoonoproepe nie!</string>
     <string name="RedPhone_got_it">Ek verstaan</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Tik hier om video aan te skakel</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Om %1$s te skakel, het Signal toegang tot jou kamera nodig</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Om %1$s te skakel, het Molly toegang tot jou kamera nodig</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Besig om te skakel…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Herkoppel tans…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Uit oproep verwyder</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Iemand het jou uit die oproep verwyder.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Laat toegang tot jou kamera en mikrofoon toe</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Laat toegang tot jou mikrofoon toe</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Laat toegang tot jou kamera toe</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Om \'n oproep te begin of by een aan te sluit, laat Molly toegang tot jou kamera en mikrofoon toe.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Om \'n oproep te begin of by een aan te sluit, laat Molly toegang tot jou mikrofoon toe.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Om jou video te aktiveer, laat Molly toegang tot jou kamera toe.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly het mikrofoontoestemming nodig om video\'s op te neem.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly benodig kameratoegang om jou video te aktiveer</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Om \'n oproep te begin of by een aan te sluit:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Om jou video te aktiveer:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal-oproep</string>
-    <string name="WebRtcCallView__signal_video_call">Signal-video-oproep</string>
+    <string name="WebRtcCallView__signal_call">Molly-oproep</string>
+    <string name="WebRtcCallView__signal_video_call">Molly-video-oproep</string>
     <string name="WebRtcCallView__start_call">Begin oproep</string>
     <string name="WebRtcCallView__join_call">Sluit aan by oproep</string>
     <string name="WebRtcCallView__call_is_full">Oproep is vol</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Laat sak jou hand?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Laat sak hand</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Laat sak</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Kanselleer</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Jy het jou hand opgesteek</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Bekyk</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s het \'n hand opgesteek</item>
-        <item quantity="other">%1$s + %2$d het \'n hand opgesteek</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s het \'n hand opgesteek</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d het \'n hand opgesteek</item>
+        <item quantity="other">%1$s +%2$d het \'n hand opgesteek</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s het \'n hand opgesteek</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d het \'n hand opgesteek</item>
+        <item quantity="other">%1$s +%2$d het \'n hand opgesteek</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Jy sal ’n oproep kry om hierdie nommer te verifieer.</string>
     <string name="RegistrationActivity_edit_number">Wysig nommer</string>
     <string name="RegistrationActivity_missing_google_play_services">Geen Google Play Services nie</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Hierdie toestel het nie Google Play-dienste nie. Jy kan nog steeds Signal gebruik, maar hierdie konfigurasie kan lei tot \'n verminderde betroubaarheid of werkverrigting.\n\nAs jy nie \'n gevorderde gebruiker is nie, nie \'n na-mark Android ROM gebruik nie, of glo dat jy die foutkennisgewing per ongeluk sien, kontak support@signal.org vir hulp met die oplos van probleme.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Hierdie toestel het nie Google Play-dienste nie. Jy kan nog steeds Molly gebruik, maar hierdie konfigurasie kan lei tot \'n verminderde betroubaarheid of werkverrigting.\n\nAs jy nie \'n gevorderde gebruiker is nie, nie \'n na-mark Android ROM gebruik nie, of glo dat jy die foutkennisgewing per ongeluk sien, kontak support@molly.im vir hulp met die oplos van probleme.</string>
     <string name="RegistrationActivity_i_understand">Ek verstaan</string>
     <string name="RegistrationActivity_play_services_error">Play Services Fout</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play-dienste word bygewerk of is nie tydelik beskikbaar nie. Probeer asseblief weer.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Niestandaard-nommerformaat</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Die nommer wat jy ingesleutel het (%1$s), lyk of dit in \'n niestandaard-formaat is. \n\nHet jy %2$s bedoel?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Telefoonnommerformaat</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Telefoonnommerformaat</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Oproep versoek</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Probleme met registrasie?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Maak seker dat jou foon \'n selsein het om jou SMS of oproep te ontvang\n • Bevestig dat jy \'n foonoproep na die nommer kan ontvang\n • Kontroleer dat jy jou telefoonnommer korrek ingevoer het.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Vir meer inligting, volg asseblief hierdie foutopsporingstappe of kontak Steundiens</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Vir meer inligting, volg asseblief %1$s of %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">hierdie foutopsporingstappe</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Voeg toe by Kontakte</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Nooi na Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Nooi na Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal-boodskap</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal-oproep</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Voeg toe by Kontakte</string>
-    <string name="SharedContactView_invite_to_signal">Nooi na Signal</string>
+    <string name="SharedContactView_invite_to_signal">Nooi na Molly</string>
     <string name="SharedContactView_message">Signal-boodskap</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s behoort aan %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal-bywerking</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">’n Nuwe weergawe van Signal is beskikbaar. Tik om opdatering te doen.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal kon nie opdateer nie</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly-bywerking</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">’n Nuwe weergawe van Molly is beskikbaar. Tik om opdatering te doen.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly kon nie opdateer nie</string>
     <string name="ApkUpdateNotifications_failed_general_body">Ons sal later weer probeer.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal suksesvol opgedateer</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly suksesvol opgedateer</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Jy is outomaties na weergawe %1$s opgedateer.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Ons Signal-veiligheidsnommer:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Dit lyk asof jy geen programme het om mee te deel nie.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Geen veiligheidsnommer gevind op die knipbord om mee te vergelyk nie</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal het die Kamera-toestemming nodig om \'n QR-kode te skandeer, maar dit is permanent geweier. Gaan asseblief na die toepassingsinstellings, kies \"Toestemmings\" en aktiveer \"Kamera\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly het die Kamera-toestemming nodig om \'n QR-kode te skandeer, maar dit is permanent geweier. Gaan asseblief na die toepassingsinstellings, kies \"Toestemmings\" en aktiveer \"Kamera\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Kan nie QR-kode sonder Kameratoestemming skandeer nie</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Julle moet eers boodskappe vir mekaar stuur alvorens jy %1$s se veiligheidsnommer kan bekyk.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Raak om oop te maak</string>
-    <string name="KeyCachingService_passphrase_cached">Signal is ontsluit</string>
-    <string name="KeyCachingService_lock">Sluit Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly is ontsluit</string>
+    <string name="KeyCachingService_lock">Sluit Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Jy</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Ongesteunde lêertipe</string>
     <string name="MediaPreviewActivity_draft">Konsep</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal het die Storingstoestemming nodig om op \'n eksterne stoorplek te stoor, maar dit is permanent geweier. Gaan asseblief na die toepassingsinstellings, kies \"Toestemmings\" en aktiveer \"Storing\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly het die Storingstoestemming nodig om op \'n eksterne stoorplek te stoor, maar dit is permanent geweier. Gaan asseblief na die toepassingsinstellings, kies \"Toestemmings\" en aktiveer \"Storing\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Nie in staat om na eksterne berging te stoor sonder die nodige regte nie</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Skrap boodskap?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Die aksie sal hierdie boodskap permanent skrap.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Kon nie boodskap aflewer nie.</string>
     <string name="MessageNotifier_error_delivering_message">Fout met die aflewering van boodskap.</string>
     <string name="MessageNotifier_message_delivery_paused">Aflewering van boodskap onderbreek.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifieer om te kan aanhou boodskappe stuur op Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifieer om te kan aanhou boodskappe stuur op Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Merk alles as gelees</string>
     <string name="MessageNotifier_mark_read">Merk as gelees</string>
     <string name="MessageNotifier_turn_off_these_notifications">Skakel hierdie kennisgewings af</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Het %1$s op jou plakker gereageer.</string>
     <string name="MessageNotifier_this_message_was_deleted">Hierdie boodskap is geskrap.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Skakel kennisgewings af dat kontakte by Signal aangesluit het? Jy kan dit weer aanskakel in Signal &gt; Instellings &gt; Kennisgewings.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Skakel kennisgewings af dat kontakte by Molly aangesluit het? Jy kan dit weer aanskakel in Molly &gt; Instellings &gt; Kennisgewings.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Snelrespons nie beskikbaar as Signal gesluit is nie!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Snelrespons nie beskikbaar as Molly gesluit is nie!</string>
     <string name="QuickResponseService_problem_sending_message">Probleem met versending van boodskap!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Ongeldige kortpad</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Nuwe boodskap</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Boodskapversoek</string>
     <string name="SingleRecipientNotificationBuilder_you">Jy</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Hierdie toestel is nie meer geregistreer nie. Dit is waarskynlik omdat jou telefoonnommer op ’n ander toestel by Signal geregistreer het.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Hierdie toestel is nie meer geregistreer nie. Dit is waarskynlik omdat jou telefoonnommer op ’n ander toestel by Molly geregistreer het.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Herregistreer toestel</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Om die oproep te beantwoord, gee Signal toegang tot jou mikrofoon.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Om die oproep te beantwoord, gee Molly toegang tot jou mikrofoon.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Om die video-oproep te beantwoord, gee Signal toegang tot jou mikrofoon en kamera.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal het Mikrofoon- en Kameratoestemmings nodig om oproepe te maak en te ontvang, maar dit is permanent geweier. Gaan asseblief na die toepassinginstellings, kies \"Toestemmings\" en aktiveer \"Mikrofoon\" en \"Kamera\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Om die video-oproep te beantwoord, gee Molly toegang tot jou mikrofoon en kamera.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly het Mikrofoon- en Kameratoestemmings nodig om oproepe te maak en te ontvang, maar dit is permanent geweier. Gaan asseblief na die toepassinginstellings, kies \"Toestemmings\" en aktiveer \"Mikrofoon\" en \"Kamera\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Op \'n gekoppelde toestel beantwoord.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Op \'n gekoppelde toestel geweier.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Besig op \'n gekoppelde toestel.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Herhaal nuwe wagwoordfrase</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Nooi na Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Nooi na Molly</string>
     <string name="contact_selection_activity__new_group">Nuwe groep</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Verfris kontakte</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Sien jy iemand nie? Probeer verfris</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Vind mense wat jy ken op Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Laat toegang tot jou kontakte toe</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Meer</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Kontakfoto</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal benodig Kontaktoestemming om jou kontakte te wys, maar dit is permanent geweier. Gaan asseblief na die toepassinginstelling-kieslys, kies \"Toestemmings\" en aktiveer \"Kontakte\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly benodig Kontaktoestemming om jou kontakte te wys, maar dit is permanent geweier. Gaan asseblief na die toepassinginstelling-kieslys, kies \"Toestemmings\" en aktiveer \"Kontakte\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Fout met herwinning van kontakte, gaan jou netwerkverbinding na</string>
     <string name="ContactSelectionListFragment_username_not_found">Gebruikersnaam nie gevind nie</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" is nie \'n Signal-gebruiker nie. Kontroleer asb. die gebruikersnaam en probeer weer."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Vind volgens gebruikersnaam</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Laat toegang tot kontakte toe</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Om mense wat jy ken op Signal te vind:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Gee toegang</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Nee dankie</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Laat toegang tot jou kontakte toe. Jou kontakte is geënkripteer en is nie vir die Signal-diens sigbaar nie.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal het toegang tot jou kontakte nodig om dit te kan vertoon.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly het toegang tot jou kontakte nodig om dit te kan vertoon.</string>
     <string name="contact_selection_list_fragment__show_contacts">Wys kontakte</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Jy het hierdie persoon verwyder; deur aan hulle \'n boodskap te stuur sal jy hulle weer by jou lys voeg.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Opsies</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Werk by</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Speel … pouseer</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Borrels is \'n Android-funksie wat jy vir Signal-kletse kan afskakel.</string>
+    <string name="BubbleOptOutTooltip__description">Borrels is \'n Android-funksie wat jy vir Molly-kletse kan afskakel.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Nie nou nie</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Groepbeskrywing</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Werk Signal by</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Werk Molly by</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Hierdie weergawe van Signal het verval. Doen nou opdatering om voort te gaan om Signal te gebruik.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Hierdie weergawe van Molly het verval. Doen nou opdatering om voort te gaan om Molly te gebruik.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Werk by</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Stadig</string>
     <string name="preferences__help">Hulp</string>
     <string name="preferences__advanced">Gevorderd</string>
-    <string name="preferences__donate_to_signal">Skenk aan Signal</string>
+    <string name="preferences__donate_to_signal">Skenk aan Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Privaatheid</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Verander toepassingikoon en naam na \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal sal moet toemaak om die toepassingikoon en -naam te verander. Kennisgewings sal altyd die verstek-Signal-ikoon en -naam vertoon.</string>
+    <string name="preferences__app_icon_dialog_description">Molly sal moet toemaak om die toepassingikoon en -naam te verander. Kennisgewings sal altyd die verstek-Molly-ikoon en -naam vertoon.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Kies \'n toepassingikoon en -naam wat op jou foon se tuisskerm en toepassingkassie sigbaar sal wees. Kennisgewings sal altyd die verstek-Signal-ikoon en -naam vertoon. Vind meer uit</string>
+    <string name="preferences__app_icon_warning_learn_more">Kies \'n toepassingikoon en -naam wat op jou foon se tuisskerm en toepassingkassie sigbaar sal wees. Kennisgewings sal altyd die verstek-Molly-ikoon en -naam vertoon. Vind meer uit</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Toepassingikone en -name is sigbaar op die tuisskerm en toepassingkassie.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Kennisgewings sal altyd die verstek-Signal-ikoon en -naam vertoon.</string>
+    <string name="preferences__app_icon_notification_warning">Kennisgewings sal altyd die verstek-Molly-ikoon en -naam vertoon.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Vind meer uit</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Dit sal alle kletse permanent tot die mees onlangse %1$s boodskappe besnoei.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Dit sal permanent alle boodskapgeskiedenis en media van jou toestel skrap.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Dit sal permanent alle boodskapgeskiedenis en media van hierdie en enige gekoppelde toestelle skrap.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Is jy seker jy wil alle boodskapgeskiedenis skrap?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Alle boodskapgeskiedenis sal permanent verwyder word. Hierdie aksie kan nie ongedaan gemaak word nie.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Alle boodskapgeskiedenis sal permanent van alle toestelle verwyder word. Hierdie aksie kan nie ongedaan gemaak word nie.</string>
     <string name="preferences_storage__delete_all_now">Skrap alles nou</string>
     <string name="preferences_storage__forever">Vir ewig</string>
     <string name="preferences_storage__one_year">1 jaar</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Sensuuromseiling</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Sensuuromseiling</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Indien geaktiveer, sal Signal poog om sensuur te omseil. Moenie hierdie funksie aktiveer nie tensy jy op ’n plek is waar Signal gesensureer word.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Indien geaktiveer, sal Molly poog om sensuur te omseil. Moenie hierdie funksie aktiveer nie tensy jy op ’n plek is waar Molly gesensureer word.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Sensuuromseiling word geaktiveer volgens jou rekening se telefoonnommer.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Ons stel bekend: Betalings</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Gebruik Signal om MobileCoin, ’n nuwe privaatheidsgefokusde digitale geldeenheid, te stuur en te ontvang. Aktiveer om te begin.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Gebruik Molly om MobileCoin, ’n nuwe privaatheidsgefokusde digitale geldeenheid, te stuur en te ontvang. Aktiveer om te begin.</string>
     <string name="PaymentsHomeFragment__activate_payments">Aktiveer betalings</string>
     <string name="PaymentsHomeFragment__activating_payments">Besig om betalings te aktiveer…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Herstel betalingsrekening</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Betalings nie in jou streek beskikbaar nie.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Kon nie betalings aktiveer nie. Probeer later weer.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Deaktiveer betalings?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Jy sal nie MobileCoin in Signal kan ontvang of stuur indien jy betalings deaktiveer nie.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Jy sal nie MobileCoin in Molly kan ontvang of stuur indien jy betalings deaktiveer nie.</string>
     <string name="PaymentsHomeFragment__deactivate">Deaktiveer</string>
     <string name="PaymentsHomeFragment__continue">Gaan voort</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Saldo nie tans beskikbaar nie.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Besonderhede</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Jy kan Signal gebruik om MobileCoin te stuur en te ontvang. Alle betalings is onderhewig aan die Gebruiksvoorwaardes vir MobileCoins en die MobileCoin-beursie. Jy kan moontlik probleme ondervind en betalings en saldo\'s wat jy moontlik kan verloor, kan nie herwin word nie. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Jy kan Molly gebruik om MobileCoin te stuur en te ontvang. Alle betalings is onderhewig aan die Gebruiksvoorwaardes vir MobileCoins en die MobileCoin-beursie. Jy kan moontlik probleme ondervind en betalings en saldo\'s wat jy moontlik kan verloor, kan nie herwin word nie. </string>
     <string name="PaymentsHomeFragment__activate">Aktiveer</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Bekyk MobileCoin-bepalings</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Betalings is nie meer in Signal beskikbaar nie. Jy kan nog fondse na ’n beurs oordra maar jy kan nie meer betalings stuur en ontvang of fondse toevoeg nie.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Betalings is nie meer in Molly beskikbaar nie. Jy kan nog fondse na ’n beurs oordra maar jy kan nie meer betalings stuur en ontvang of fondse toevoeg nie.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Laat toestemmings toe</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Om jou te help om boodskappe te stuur aan mense wat jy ken, sal Signal hierdie toestemmings versoek. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Om jou te help om boodskappe te stuur aan mense wat jy ken, sal Molly hierdie toestemmings versoek. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Kennisgewings</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Volgende</string>
     <string name="PaymentsTransferFragment__invalid_address">Ongeldige adres</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Gaan die adres na van die beursie waarheen jy probeer oordra en probeer weer.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Jy kan nie na jou eie Signal-beursieadres oorplaas nie. Voer die beursieadres van jou rekening by ’n ondersteunde valuta-omskakelaar in.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Om \'n QR-kode te skandeer, het Signal toegang tot die kamera nodig.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal het Kamera-toestemming nodig om \'n QR-kode vas te lê. Gaan na die instellings, kies \"Toestemmings\" en aktiveer \"Kamera\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Om \'n QR-kode te skandeer, het Signal toegang tot die kamera nodig.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Jy kan nie na jou eie Molly-beursieadres oorplaas nie. Voer die beursieadres van jou rekening by ’n ondersteunde valuta-omskakelaar in.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Om \'n QR-kode te skandeer, het Molly toegang tot die kamera nodig.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly het Kamera-toestemming nodig om \'n QR-kode vas te lê. Gaan na die instellings, kies \"Toestemmings\" en aktiveer \"Kamera\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Om \'n QR-kode te skandeer, het Molly toegang tot die kamera nodig.</string>
     <string name="PaymentsTransferFragment__settings">Instellings</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Inkomende Signal-stemoproep</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Inkomende Molly-stemoproep</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Inkomende Signal-video-oproep</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Inkomende Molly-video-oproep</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Inkomende Signal-groepoproep</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Inkomende Molly-groepoproep</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Besig met Signal-stemoproep</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Besig met Molly-stemoproep</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Besig met Signal-video-oproep</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Besig met Molly-video-oproep</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Besig met Signal-groepoproep</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Besig met Molly-groepoproep</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Laai tans…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Verifieer</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Jy het jou wagwoordfrase suksesvol ingevoer</string>
     <string name="BackupDialog_passphrase_was_not_correct">Wagwoordfrase verkeerd</string>
-    <string name="LocalBackupJob_creating_signal_backup">Skep tans Signal-rugsteun…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Skep tans Molly-rugsteun…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Besig om Signal-rugsteun te verifieer…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Besig om Molly-rugsteun te verifieer…</string>
     <string name="LocalBackupJobApi29_backup_failed">Rugsteun het misluk</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Jou rugsteungids is geskrap of verskuif.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Jou rugsteunlêer is te groot om in hierdie volume te stoor.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Bel my (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Stuur weer Kode (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Kontak Signal-steundiens</string>
-    <string name="RegistrationActivity_code_support_subject">Signal-registrasie - verifikasiekode vir Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Kontak Molly-steundiens</string>
+    <string name="RegistrationActivity_code_support_subject">Molly-registrasie - verifikasiekode vir Android</string>
     <string name="RegistrationActivity_incorrect_code">Verkeerde kode</string>
     <string name="BackupUtil_never">Nooit</string>
     <string name="BackupUtil_unknown">Onbekend</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Telefoonnommer</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Kies wie jou telefoonnommer kan sien en wie jou daarmee op Signal kan kontak.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Kies wie jou telefoonnommer kan sien en wie jou daarmee op Molly kan kontak.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Wie my nommer kan sien</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Jy het te veel keer probeer. Probeer later weer.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Kon nie aan die diens koppel nie</string>
     <string name="preferences_chats__backups">Rugsteunkopieë</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal is gesluit</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly is gesluit</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">TIK OM TE ONTSLUIT</string>
     <string name="Recipient_unknown">Onbekend</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Jy benodig toegang tot jou ou toestel.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Herwin van rugsteun af</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Herwin jou boodskappe van ’n plaaslike rugsteun af. As jy dit nie nou herwin nie, sal jy dit nie later kan doen nie.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Herwin plaaslike rugsteun</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Herwin Signal-rugsteun</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Herwin al jou teksboodskappe + jou laaste 30 dae se media</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Meer opsies</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Kanselleer</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Teken aan sonder om oor te dra</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Gaan voort sonder om jou boodskappe en media oor te dra</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Maak Signal op jou ou Android-foon oop</string>
     <string name="NewDeviceTransferInstructions__continue">Gaan voort</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Besig om voor te berei om aan ou Android-toestel te verbind…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Dit neem \'n oomblik, behoort binnekort gereed te wees</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Wag vir ou Android-toestel om te verbind…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal benodig liggingtoestemming om jou ou Android-toestel te ontdek en daaraan te verbind.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal benodig geaktiveerde liggingsdienste om jou ou Android-toestel te ontdek en daaraan te verbind.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Wi-Fi moet aan wees vir Signal om jou ou Android-toestel te ontdek en daaraan te verbind. Wi-Fi moet aan wees, maar dit hoef nie aan \'n Wi-Fi-netwerk gekoppel te wees nie.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Jammer, dit lyk asof hierdie toestel nie Wi-Fi Direct ondersteun nie. Signal gebruik Wi-Fi Direct om jou ou Android-toestel te ontdek en daarmee te verbind. Jy kan steeds \'n rugsteun herwin om jou rekening vanaf jou ou Android-toestel te herwin.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly benodig liggingtoestemming om jou ou Android-toestel te ontdek en daaraan te verbind.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly benodig geaktiveerde liggingsdienste om jou ou Android-toestel te ontdek en daaraan te verbind.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Wi-Fi moet aan wees vir Molly om jou ou Android-toestel te ontdek en daaraan te verbind. Wi-Fi moet aan wees, maar dit hoef nie aan \'n Wi-Fi-netwerk gekoppel te wees nie.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Jammer, dit lyk asof hierdie toestel nie Wi-Fi Direct ondersteun nie. Molly gebruik Wi-Fi Direct om jou ou Android-toestel te ontdek en daarmee te verbind. Jy kan steeds \'n rugsteun herwin om jou rekening vanaf jou ou Android-toestel te herwin.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Herwin \'n rugsteunkopie</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">\'n Onverwagse fout het voorgekom terwyl daar gepoog is om met jou ou Android-toestel te verbind.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Besig om te soek vir \'n nuwe Android-toestel…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal benodig liggingtoestemming om jou ou Android-toestel te ontdek en daaraan te verbind.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal benodig geaktiveerde liggingsdienste om jou nuwe Android-toestel te ontdek en daaraan te verbind.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Wi-Fi moet aan wees vir Signal om jou nuwe Android-toestel te ontdek en daaraan te verbind. Wi-Fi moet aan wees, maar dit hoef nie aan \'n Wi-Fi-netwerk gekoppel te wees nie.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Jammer, dit lyk asof hierdie toestel nie Wi-Fi Direct ondersteun nie. Signal gebruik Wi-Fi Direct om jou nuwe Android-toestel te ontdek en daarmee te verbind. Jy kan steeds \'n rugsteun skep om jou rekening op jou nuwe Android-toestel te herwin.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly benodig liggingtoestemming om jou ou Android-toestel te ontdek en daaraan te verbind.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly benodig geaktiveerde liggingsdienste om jou nuwe Android-toestel te ontdek en daaraan te verbind.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Wi-Fi moet aan wees vir Molly om jou nuwe Android-toestel te ontdek en daaraan te verbind. Wi-Fi moet aan wees, maar dit hoef nie aan \'n Wi-Fi-netwerk gekoppel te wees nie.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Jammer, dit lyk asof hierdie toestel nie Wi-Fi Direct ondersteun nie. Molly gebruik Wi-Fi Direct om jou nuwe Android-toestel te ontdek en daarmee te verbind. Jy kan steeds \'n rugsteun skep om jou rekening op jou nuwe Android-toestel te herwin.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Skep \'n rugsteunkopie</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">\'n Onverwagse fout het voorgekom terwyl daar gepoog is om met jou nuwe Android-toestel te verbind.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Besig om data oor te dra</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Hou albei toestelle naby mekaar. Moenie die toestelle afskakel nie, en hou Signal oop. Oordragte is end-tot-end-geënkripteer.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Hou albei toestelle naby mekaar. Moenie die toestelle afskakel nie, en hou Molly oop. Oordragte is end-tot-end-geënkripteer.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d boodskappe tot dusver…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% boodskappe tot dusver…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Dra rekening oor</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Laai Signal op jou nuwe Android-foon af</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Laai Molly op jou nuwe Android-foon af</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Tik op \"Dra oor of herstel rekening\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Enigeen met hierdie skakel kan die groepnaam en -foto bekyk en versoek om aan te sluit. Deel dit met mense wie jy vertrou.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Enigeen met hierdie skakel kan die groepnaam en -foto bekyk en aansluit. Deel dit met mense wie jy vertrou.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Deel d.m.v. Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Deel d.m.v. Molly</string>
     <string name="GroupLinkBottomSheet_copy">Kopieer</string>
     <string name="GroupLinkBottomSheet_qr_code">QR-kode</string>
     <string name="GroupLinkBottomSheet_share">Deel</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">Oor MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin is ’n nuwe privaatheidgefokusde digitale geldeenheid.</string>
     <string name="payment_info_card_adding_funds">Besig om fondse toe te voeg</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Jy kan fondse vir gebruik in Signal toevoeg deur MobileCoin aan jou beursie-adres te stuur.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Jy kan fondse vir gebruik in Molly toevoeg deur MobileCoin aan jou beursie-adres te stuur.</string>
     <string name="payment_info_card_cashing_out">Betaal tans uit</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Jy kan MobileCoin enige tyd uitbetaal op ’n beurs wat MobileCoin steun. Maak bloot ’n oordrag na jou rekening by die spesifieke beurs.</string>
     <string name="payment_info_card_hide_this_card">Versteek hierdie kaart?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Deaktiveer beursie</string>
     <string name="DeactivateWalletFragment__your_balance">Jou balans</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Ons beveel aan dat jy jou fondse na ’n ander beursie-adres oordra voor jy betalings deaktiveer. Indien jy kies om nie nou jou fondse oor te dra nie, sal dit in jou beursie bly wat aan Signal gekoppel is indien jy betalings heraktiveer.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Ons beveel aan dat jy jou fondse na ’n ander beursie-adres oordra voor jy betalings deaktiveer. Indien jy kies om nie nou jou fondse oor te dra nie, sal dit in jou beursie bly wat aan Molly gekoppel is indien jy betalings heraktiveer.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Dra oorblywende balans oor</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Deaktiveer sonder oordrag</string>
     <string name="DeactivateWalletFragment__deactivate">Deaktiveer</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Deaktiveer sonder oordrag?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Jou saldo sal in jou beursie bly wat aan Signal gekoppel is indien jy kies om betalings te heraktiveer.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Jou saldo sal in jou beursie bly wat aan Molly gekoppel is indien jy kies om betalings te heraktiveer.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Fout met beursie-deaktivering.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Lisensies</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Bepalings &amp; Privaatheidsbeleid</string>
-    <string name="HelpFragment__copyright_signal_messenger">Kopiereg Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Kopiereg Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Gelisensieer onder die GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Kies ’n kleur</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Deel</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Slegs admins kan boodskappe na hierdie groep stuur.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Perk is bereik</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Jy kan nie meer as 5 kletse selekteer nie</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Vind meer uit</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Werk Signal by</string>
+    <string name="UpdateSignalExpiredDialog__title">Werk Molly by</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Hierdie weergawe van Signal het verval. Doen nou opdatering om voort te gaan om Signal te gebruik.</string>
+    <string name="UpdateSignalExpiredDialog__message">Hierdie weergawe van Molly het verval. Doen nou opdatering om voort te gaan om Molly te gebruik.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Werk by</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Toestel nie geregistreer nie</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Hierdie toestel is nie meer geregistreer nie. Herregistreer om voort te gaan om Signal op hierdie toestel te gebruik.</string>
+    <string name="ReregisterSignalDialog__message">Hierdie toestel is nie meer geregistreer nie. Herregistreer om voort te gaan om Molly op hierdie toestel te gebruik.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Herregistreer</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Kon nie kieser open nie.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Om kennisgewings te aktiveer, het Signal toestemming nodig om dit te vertoon.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Om kennisgewings te aktiveer, het Molly toestemming nodig om dit te vertoon.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Skakel aan</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Nog geen antwoorde nie</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Jy kan nie op hierdie storie antwoord nie, want jy is nie meer \'n lid van hierdie groep nie.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Het op die storie gereageer</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Het op die storie gereageer</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Het op die storie gereageer</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Kykslae</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Kies jou bank</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Bevestig jou skenking met %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Om jou herhalende skenking op te stel, tik op gaan voort om \'n €0.01-debiet by jou bank te bevestig. Dit sal outomaties terugbetaal word en laat toe dat jou €5/maand-skenking van jou rekening gedebiteer word.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Om jou herhalende skenking op te stel, tik op \"gaan voort\" om \'n €0.01-debiet by jou bank te bevestig. Dit sal outomaties terugbetaal word en laat toe dat jou %1$s/maand-skenking van jou rekening gedebiteer word.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Gaan voort</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Laai tans rugsteundata af…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Mediarugsteun is afgeskakel</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Jou Signal-mediarugsteunplan is gekanselleer omdat ons nie jou betaling kon verwerk nie. Jy het %1$d dag om enige media wat in jou rugsteun gestoor is, af te laai. Ná %1$d dag sal die media in jou rugsteun geskrap word.</item>
+        <item quantity="other">Jou Signal-mediarugsteunplan is gekanselleer omdat ons nie jou betaling kon verwerk nie. Jy het %1$d dae om enige media wat in jou rugsteun gestoor is, af te laai. Ná %1$d dae sal die media in jou rugsteun geskrap word.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Jy kan enige tyd weer vir rugsteun begin betaal sodat jy kan voortgaan om al jou media te rugsteun. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Jou media sal vandag geskrap word</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Jou Signal-mediarugsteunplan is gekanselleer omdat ons nie jou betaling kon verwerk nie. Dis jou laaste kans om die media in jou rugsteun af te laai voordat dit geskrap word.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Kan nie aflaai voltooi nie</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Jou toestel het nie genoeg vrye ruimte nie. Stel tot %1$s ruimte beskikbaar om die media wat in jou rugsteun gestoor is, af te laai.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">As jy \"Slaan oor\" kies, sal die media in jou rugsteun oor %1$d dag geskrap word.</item>
+        <item quantity="other">As jy \"Slaan oor\" kies, sal die media in jou rugsteun oor %1$d dae geskrap word.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Kan nie rugsteunbetaling verwerk nie</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Ons het probleme om jou herhalende maandelikse rugsteunbetaling in te vorder. Maak seker jou betaalmetode is op datum. Indien dit nie is nie, doen \'n opdatering daarvan in Google Pay . Signal sal oor \'n paar dae weer probeer om die betaling te verwerk.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Kon nie rugsteun voltooi nie</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Jou toestel het vir %1$d dae nog nie \'n rugsteun voltooi nie. Maak seker jou toestel is aan wi-fi gekoppel en tik \"Rugsteun nou.\" </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Vind meer uit</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Slaan oor</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Laai media nou af</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Laai later af</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Moenie media aflaai nie</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Stel %1$s ruimte beskikbaar om jou media af te laai.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Krediet- of debietkaart</string>
@@ -6874,16 +7058,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Onbekend</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Betalingsgeskiedenis</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Jou laaste rugsteun is op %1$s om %2$s gemaak.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">Kletsbeperkings</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">Kletsgetalbeperkings</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">Vee boodskapgeskiedenis uit</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Boodskappe wat ouer as die geselekteerde tyd is, sal permanent geskrap word.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Boodskappe wat die geselekteerde lengte oorskry, sal permanent geskrap word.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Pas beperkings toe op gekoppelde toestelle</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Indien geaktiveer, sal kletsgetalbeperkings ook boodskappe op jou gekoppelde toestelle skrap.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Skrapping is nou oor al jou toestelle gesinchroniseer</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Wanneer jy boodskappe of kletse skrap, sal hulle van jou foon en gekoppelde toestelle geskrap word.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">Goed</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Betalingsgeskiedenis</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Rugsteun van teks en alle media</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Betalingsbesonderhede</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Rugsteuntipe</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Datum betaal</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Deel</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal-rugsteun</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Betalingsgeskiedenis</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Rugsteunbesonderhede</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Rugsteungrootte</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Gereeldheid van rugsteun</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Rugsteun met behulp van mobiele data</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Skakel rugsteun af en skrap dit</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Rugsteun geskrap en afgeskakel.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Rugsteuntipe verander en intekening gekanselleer</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Intekening gekanselleer</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Aflaai voltooi</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Rugsteuntipe</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Rugsteun gedeaktiveer</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/maand</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Aktiveer rugsteun</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Laaste rugsteun</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s om %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Nooit</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Rugsteun nou</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Skakel rugsteun af en skrap dit?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Daar sal nie weer koste van jou verhaal word nie. Jou rugsteun sal geskrap word en geen nuwe rugsteun sal geskep word nie.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Skakel af en skrap</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Skrap tans rugsteun…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Rugsteun geskrap</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Deur op \"Rugsteun nou\" te tik"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Daagliks</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Weekliks</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Maandeliks</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Rugsteun handmatig</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Voer asseblief jou toestel se pin, wagwoord of patroon in.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Volgende</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Verander rugsteuntipe</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Kanselleer Intekening</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Bevestig kansellasie</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Daar sal nie weer koste van jou verhaal word nie. Rugsteun sal aan die einde van jou faktureringsiklus afgeskakel word. Ná daardie datum sal jy 30 dae hê om die media wat jy tans rugsteun, af te laai.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Bevestig en laai nou af</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Bevestig en laai later af</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Behou intekening</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index cac1a8651f..42adf6e0b3 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -80,7 +81,7 @@
     <string name="AttachmentKeyboard_file">ملف</string>
     <string name="AttachmentKeyboard_contact">جهة الاتصال</string>
     <string name="AttachmentKeyboard_location">الموقع</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">يحتاج Signal إلى إذن لإظهار الصور ومقاطع الفيديو الخاصة بك</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">يحتاج Molly إلى إذن لإظهار الصور ومقاطع الفيديو الخاصة بك</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">إعطاء الصلاحية</string>
     <string name="AttachmentKeyboard_payment">عملية الدفع</string>
@@ -104,7 +105,7 @@
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">لإظهار الصور والفيديوهات:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">يَحتاج Signal إلى الوصول إلى مساحة التخزين لإظهار الصور ومقاطع الفيديو الخاصة بك.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">يَحتاج Molly إلى الوصول إلى مساحة التخزين لإظهار الصور ومقاطع الفيديو الخاصة بك.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">لم يُفعّل %1$s عمليات الدفع </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">تغيير الكاميرا</string>
     <string name="CameraXFragment_open_gallery_description">فتح المعرض</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">إعطاء الصلاحية</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">امنح الوصول إلى الكاميرا والميكروفون الخاصين بك</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">اسمح بالوصول إلى الكاميرا</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">امنح الوصول إلى ميكروفونك</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">لالتقاط الصور، يُرجى السماح لـ Signal بالوصول إلى الكاميرا.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">لالتقاط الصور والفيديوهات، الرجاء السماح لسيجنال بالوصول إلي الكاميرا.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">لالتقاط الصور والفيديوهات، يُرجى السماح لـ Signal بالوصول إلى الكاميرا والميكروفون.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">لالتقاط الفيديوهات بالصوت، يُرجى السماح لـ Signal بالوصول إلى الميكروفون.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">لقراءة الرمز المربع، امنح Signal صلاحية الوصول إلى الكاميرا.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">يَحتاج Signal الوصول إلى الكاميرا لالتقاط الصور</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">يحتاج سيجال إلى الوصول إلى الكاميرا لقراءة الرموز المربعة</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">يَحتاج Signal إلى الوصول للميكروفون لالتقاط الفيديو</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">لالتقاط الصور في Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">لالتقاط الصور والفيديوهات في Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">لالتقاط الفيديوهات بالصوت:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">لقراءة الرموز المربعة:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">جهات الاتصال مؤخّراً</string>
@@ -331,8 +332,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">رسالة %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">مكالمة Molly بالصوت %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">مكالمة Molly بالفيديو %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -581,6 +582,8 @@
     <string name="ConversationFragment_delete_for_everyone">احذف للجميع</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">حذف من هذا الجهاز</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">حذف</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">احذف من كل مكان</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">ستُحذَف هذه الرسالة لكل من كان في هذه الدردشة إن كانوا يستخدمون إصدارًا حديثًا مِن سيجنال. سيتمكّنون من رؤية أنك قد حذفت رسالة.</string>
@@ -691,6 +694,15 @@
         <item quantity="many">سيؤدي هذا إلى حذف %1$d دردشة مختارة بشكل نهائي.</item>
         <item quantity="other">سيؤدي هذا إلى حذف %1$d دردشة مختارة بشكل نهائي.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="zero">سَيؤدي هذا إلى حذف كل %1$d الدردشات المُختارة بشكل نهائي من كل أجهزتك.</item>
+        <item quantity="one">سيؤدي هذا إلى حذف الدردشة المُختارة بشكل نهائي من كل أجهزتك.</item>
+        <item quantity="two">سيؤدي هذا إلى حذف كلتا %1$d الدردشتين المُختارتين بشكل نهائي من كل أجهزتك.</item>
+        <item quantity="few">سيؤدي هذا إلى حذف كل الـ %1$d دردشات المُختارة بشكل نهائي من كل أجهزتك.</item>
+        <item quantity="many">سيؤدي هذا إلى حذف كل الـ %1$d دردشة المُختارة بشكل نهائي من كل أجهزتك.</item>
+        <item quantity="other">سيؤدي هذا إلى حذف كل الـ %1$d دردشة المُختارة بشكل نهائي من كل أجهزتك.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">يجري الحذف</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="zero">جارٍ حذف الدردشات المُحدّدة…</item>
@@ -917,6 +929,61 @@
     <string name="DecryptionFailedDialog_chat_session_refreshed">لقد تم إنعاش جلسة الدردشة</string>
     <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">يَستخدم سيجنال التعمية من طرف لطرف ويحتاج بعض الأحيان لإنعاش جلسات الدردشات. إن هذا لا يؤثر على أمان دردشتك، لكن قد تفوتك رسالة من جهة الاتصال هذه، لكن يمكن الطلب منها إعادة إرسالها.</string>
 
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">استخدام سيجنال على الحاسوب أو لوحة الآيباد. ستتم مُزامنة رسائلك مع أجهزتك المرتبطة.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">يُرجى ربط جهاز جديد</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s الرسائل والدردشات محمية من خلال التشفير من طرف إلى طرف على جميع الأجهزة</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">تطبيق سيجنال على الحاسوب أو لوحة آيباد</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">تتّسم جميع الرسائل في الأجهزة المرتبطة بالسرية</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">تتم مُزامنة رسائل تطبيق Molly مع تطبيق Molly على هاتفك المحمول بعد ربطه. لن تظهر محفوظات رسائلك السابقة.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">على جهازك الآخر، يُرجى زيارة %1$s لتثبيت تطبيق سيجنال</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">الأجهزة المرتبطة</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">فصل الارتباط</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s غير مرتبط</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">جارٍ ربط جهاز…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">تمت المصادقة على الجهاز</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">قيد التحميل…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">لا توجد أجهزة مرتبطة</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">افتح لربط جهاز</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">امسح رمز الاستجابة السريع المُبين على الجهاز للربط.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">تصوير الرمز المربع</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">استخدم هذا الجهاز لِمسح رمز الاستجابة السريعة المعروض على الجهاز الذي تريد ربطه</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">حسنا</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">سيتمكن هذا الجهاز من رؤية مجموعاتك وجهات اتصالك، والوصول إلى دردشاتك، وإرسال الرسائل باسمك.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">يُرجى إنهاء الربط على جهازك الآخر</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">يُرجى إنهاء ربط سيجنال على جهازك الآخر.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">فشل ربط الجهاز</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">رمز الاستجابة السريعة هذا غير صالح. فضلاً تأكد من أنك تقوم بمسح رمز الاستجابة السريعة المعروض على الجهاز الذي تريد ربطه.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">إعادة المُحاولة</string>
+
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">إلغاء ربط \'%1$s\'؟</string>
     <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">لن يكون إرسال واستقبال الرسائل ممكنا بمجرد إلغاء ربط الجهاز.</string>
@@ -1154,13 +1221,23 @@
     <!-- Message explaining that battery saver may delay notifications -->
     <string name="PromptBatterySaverBottomSheet__message">يُمكنك إيقاف تحسينات البطارية لسيجنال لضمان وصول إشعارات الرسائل في مواعيدها.</string>
 
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">قد تتأخر الإشعارات في الوصول بسبب بعض التحسينات في البطارية</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">يُمكنك إيقاف تحسينات البطارية لسيجنال لِضمان وصول إشعارات الرسائل في مواعيدها. انقر \"متابعة\" للاطلاع على الإرشادات الخاصة بالجهاز.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">لا شكراً</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">مواصلة</string>
+
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">مواصلة</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">تجاهُل</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">لا شكراً</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">الدعوات المُعلَّقة</string>
+    <string name="PendingMembersActivity_pending_group_invites">الطلبات و الدعوات</string>
     <string name="PendingMembersActivity_requests">الطلبات</string>
     <string name="PendingMembersActivity_invites">الدعوات</string>
     <string name="PendingMembersActivity_people_you_invited">الأشخاص الذين دعوتهم</string>
@@ -1839,6 +1916,14 @@
     <string name="MessageRecord_you_activated_payments">لقد فعّلت عمليات الدفع</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">يُمكن لـ %1$s قبول عمليات الدفع الآن</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">تفاصيل الدفع غير متوفرة</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">انقر للمزيد</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">تفاصيل الدفع غير متوفرة</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">تفاصيل عملية الدفع هذه غير مُتوفرة لأنه تمت استعادة رسائلك من مصدر لم يحتوي على سِجل الدفع هذا. لا تؤثر عملية الدفع هذه على رصيد محفظتك أو وضع الدفعات السابقة.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1906,6 +1991,8 @@
     <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">لن تتمكن من إرسال رسائل SMS من سيجنال بعد الآن. قم بدعوة %1$s إلى سيجنال لإبقاء المحادثة هنا.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">عمليات الدفع: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">عمليات الدفع</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">تم الإبلاغ عنها كرِسالة غير مرغوب فيها</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -2113,7 +2200,8 @@
     <string name="RedPhone_ringing">يرن الآن…</string>
     <string name="RedPhone_busy">مشغول</string>
     <string name="RedPhone_recipient_unavailable">المتلقي غير متاح</string>
-    <string name="RedPhone_network_failed">فشل في الشبكة!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">فشل في الشبكة! يُرجى التحقّق من اتصالك بالانترنت ثم حاول مرة أُخرى.</string>
     <string name="RedPhone_number_not_registered">الرقم غير مسجل!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">الرقم المطلوب لا يدعم مكالمات صوتية مشفرة!</string>
     <string name="RedPhone_got_it">عُلم</string>
@@ -2203,6 +2291,26 @@
     <string name="WebRtcCallActivity__removed_from_call">إزالة من المكالمة</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">قام شخص ما بإزالتك من المكالمة.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">امنح الوصول إلى الكاميرا والميكروفون الخاصين بك</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">امنح الوصول إلى ميكروفونك</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">اسمح بالوصول إلى الكاميرا</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">لبدء مكالمة أو الانضمام إليها، اسمح لسيجنال بالوصول إلى الكاميرا والميكروفون.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">لبدء مكالمة أو الانضمام إليها، اسمح لسيجنال بالوصول إلى الميكروفون.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">لتفعيل الفيديو، امنح سيجنال صلاحية الوصول إلى الكاميرا.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">يَحتاج سيجنال إلى أذونات الميكروفون لبدء مكالمة أو الانضمام إليها.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">يحتاج سيجنال إلى الوصول إلى الكاميرا لتفعيل الفيديو</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">لبدء مكالمة أو الانضمام إليها:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">لتفعيل الفيديو:</string>
 
     <!-- WebRtcCallView -->
     <string name="WebRtcCallView__signal_call">مكالمة سيجنال</string>
@@ -2316,26 +2424,53 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">تريد خفض يدك؟</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">اخفض اليد</string>
+    <string name="CallOverflowPopupWindow__lower_hand">اخفض</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">إلغاء</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">لقد رفعت يدك</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">إظهار</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="zero">%1$s + %2$d رفعوا يدًا</item>
-        <item quantity="one">%1$s رفع يده</item>
-        <item quantity="two">%1$s + %2$d رفعا يديهما</item>
-        <item quantity="few">%1$s + %2$d رفعوا أيديهم</item>
-        <item quantity="many">%1$s + %2$d رفعوا أيديهم</item>
-        <item quantity="other">%1$s + %2$d رفعوا أيديهم</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s رفع يده</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="zero">%1$s +%2$d رفعتم أيديكم</item>
+        <item quantity="one">%1$s +%2$d رفع يده</item>
+        <item quantity="two">%1$s +%2$d رفعتُما أيديكُما</item>
+        <item quantity="few">%1$s +%2$d رفعتم أيديكم</item>
+        <item quantity="many">%1$s +%2$d رفعتم أيديكم</item>
+        <item quantity="other">%1$s +%2$d رفعتم أيديكم</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s رفع يده</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="zero">%1$s +%2$d رفعوا يديهما</item>
+        <item quantity="one">%1$s +%2$d رفع يده</item>
+        <item quantity="two">%1$s +%2$d رفعا أيديهما</item>
+        <item quantity="few">%1$s +%2$d رفعوا أيديهم</item>
+        <item quantity="many">%1$s +%2$d رفعوا أيديهم</item>
+        <item quantity="other">%1$s +%2$d رفعوا أيديهم</item>
+    </plurals>
+
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="zero">%1$s +%2$d</item>
+        <item quantity="one">%1$s</item>
+        <item quantity="two">%1$s +%2$d</item>
+        <item quantity="few">%1$s +%2$d</item>
+        <item quantity="many">%1$s +%2$d</item>
+        <item quantity="other">%1$s +%2$d</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="zero">%1$s +%2$d</item>
         <item quantity="one">%1$s</item>
         <item quantity="two">%1$s +%2$d</item>
@@ -2450,7 +2585,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">ستأتيك مكالمة هاتفية للتحقق من هذا الرقم.</string>
     <string name="RegistrationActivity_edit_number">تعديل الرقم</string>
     <string name="RegistrationActivity_missing_google_play_services">خدمات Google Play غير موجودة</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">خدمات Google Play غير موجودة في هذا الجهاز. لا زال بإمكانك استخدام سيجنال، ولكن هذا الضبط قد يؤدي إلى ضعف في موثوقية أو أداء البرنامج ان لم تكن مستخدما متقدما، أو لم تكن مشغلا ل Android ROM من سوق ثانوية، أو تعتقد أن رؤيتك لهذه الرسالة ناجم عن خطأ، يرجى التواصل مع support@signal.org للمساعدة فى اكتشاف المشكلة واصلاحها.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">خدمات Google Play غير موجودة في هذا الجهاز. لا زال بإمكانك استخدام سيجنال، ولكن هذا الضبط قد يؤدي إلى ضعف في موثوقية أو أداء البرنامج ان لم تكن مستخدما متقدما، أو لم تكن مشغلا ل Android ROM من سوق ثانوية، أو تعتقد أن رؤيتك لهذه الرسالة ناجم عن خطأ، يرجى التواصل مع support@molly.im للمساعدة فى اكتشاف المشكلة واصلاحها.</string>
     <string name="RegistrationActivity_i_understand">فهمت</string>
     <string name="RegistrationActivity_play_services_error">خطأ في خدمات Play</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">جاري تحديث خدمات Google Play أو أنها غير موجودة مؤقتاً. يرجى المحاولة مجدداً.</string>
@@ -2506,8 +2641,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">هل تواجه مشكلة في التسجيل؟</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• تأكد من أن هاتفك يتوفر على إشارة خلوية للتوصل بالرسالة القصيرة أو الاتصال\n • قم بتأكيد إمكانية استقبالك اتصال على الرقم\n • تحقق من أنك أدخلت رقم هاتفك بشكل صحيح.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">لِمزيد من المعلومات، يُرجى اتباع خطوات المُساعفة هذه أو الاتصال بالدعم</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">للمزيد من المعلومات، يُرجى زيارة %1$s أو %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">خطوات المُساعفة هذه</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2996,7 +3131,7 @@
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">للإجابة على المكالمة، يجب عليك منح ترخيص الوصول إلى ميكروفونك.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">للرّد على مكالمة الفيديو، يُرجى منح Signal ترخيص الوصول إلى الميكروفون و الكاميرا على هاتفك.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">للرّد على مكالمة الفيديو، يُرجى منح Molly ترخيص الوصول إلى الميكروفون و الكاميرا على هاتفك.</string>
     <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">يحتاج سيجنال إلى أذونات الميكروفون والكاميرا من أجل استقبال أو تلقّي المكالمات، ولكن الإذن لم يُمنح بشكل دائم. الرجاء زيارة إعدادات التطبيق، واختيار \"الأذونات\"، ثم تفعيل \"الميكروفون\" و\"الكاميرا\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">أجاب عبر جهاز مرتبط.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">رُفض عبر جهاز مرتبط.</string>
@@ -3049,9 +3184,9 @@
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">هل تفتقد إلى جهة اتصال؟ حاول التحديث من جديد</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">اعثر على الأشخاص الذين تعرفهم على Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">امنح الوصول إلى جهات اتصالك</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">المزيد</string>
 
@@ -3090,13 +3225,15 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">العثور عبر اسم المُستخدم</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">السماح بالوصول إلى جهات الاتصال</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">للعثور على الأشخاص الذين تعرفهم على Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">إعطاء الصلاحية</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">لا شكراً</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">امنح الوصول إلى جهات اتصالك. جهات اتصالك مشفرة وغير مرئية لخدمة Signal.</string>
 
     <!-- contact_selection_list_fragment -->
     <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">سيجنال بحاجة إلى الوصول إلى جهات الاتصال لديك وذلك بغرض عرضها.</string>
@@ -3180,6 +3317,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">لقد حذفت هذا الشخص، وبمراسلتك لهم سَتتم إضافتهم إلى قائمتك.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">الخيارات:</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">تحديث التطبيق</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">شغّل … توقف</string>
@@ -3721,8 +3860,12 @@
         <item quantity="other">سَيتم تقليم كل الدردشات إلى أحدث %1$s رسالة.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">ستُحذَف جميع محفوظات الرسائل والوسائط من جهازك بصفة نهائية.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">سيُؤدي هذا إلى حذف جميع محفوظات الرسائل والوسائط من هذا الجهاز وأي أجهزة متصلة.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">هل أنت متأكد من أنك تريد حذف كل محفوظات الرسائل؟</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">ستُحذف محفوظات الرسائل نهائيًا. لن يتم التراجع عن هذا الإجراء.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">ستُحذف جميع محفوظات الرسائل نهائيًا من كل الأجهزة. لا يُمكن التراجع عن هذا الإجراء.</string>
     <string name="preferences_storage__delete_all_now">حذف الكل الآن</string>
     <string name="preferences_storage__forever">للأبد</string>
     <string name="preferences_storage__one_year">عام واحد</string>
@@ -4517,9 +4660,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">يلزمك الوصول إلى جهازك القديم.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">الاستعادة مِن نسخة احتياطية</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">استعادة رسائلك من نسخة احتياطية محلية. إذا تجاهلت الاستعادة الآن، فسيتعذر عليك الاستعادة لاحقا.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">استعادة نسخ احتياطية محلية</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">استعادة نسخة سيجنال الاحتياطية</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">اِستعد جميع رسائلك + والوسائط التي توصلت بها آخر 30 يومًا</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">خيارات أكثر</string>
 
+    <string name="TransferOrRestoreFragment__cancel">إلغاء</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">تسجيل الدخول بدون نقل</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">اِستِمر دُون نقلِ رسائلك والوسائط</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">يُرجى فتح سيجنال في هاتف أندرويد القديم</string>
     <string name="NewDeviceTransferInstructions__continue">الاِستِمرار</string>
@@ -5471,9 +5621,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">تحديد اللون</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">رسالة قصيرة</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">المُشاركة</string>
 
@@ -5523,7 +5670,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">يُمكن فقط للمُشرفين إرسال الرسائل في هذه المجموعة.</string>
-    <string name="MultiselectForwardFragment__limit_reached">وصلت للحد الأقصى</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">لا يمكنك تحديد أكثر من 5 محادثات</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -6174,8 +6322,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">لا جواب حاليا</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">لا تستطيع الردّ على هذه القصة لأنك لم تعد عضواً في هذه المجموعة.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">المتفاعلون مع القصة</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">تفاعلتَ مع القصة</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">تفاعل مع القصة</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">المشاهدات</string>
     <!-- Label for story replies tab -->
@@ -6860,8 +7010,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">اختر مصرفك</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">تأكيد التبرّع عبر %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">لإعداد تبرّعك المُتكرر، انقر على مواصلة لتأكيد خصم €0,01 مع بنكك. سَيتم استرداد هذه القيمة تلقائيًا وسيسمح هذا بخصم تبرّعك بقيمة €5/الشهر من حسابك.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">لإعداد تبرّعك المُتكرر، انقر على مواصلة لتأكيد خصم €0,01 مع بنكك. سَيتم استرداد هذه القيمة تلقائيًا وسَيسمح هذا بخصم تبرّعك بقيمة %1$s/الشهر من حسابك.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">مواصلة</string>
 
@@ -7465,6 +7615,60 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">يَجري تنزيل البيانات الاحتياطية…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">النسخ الاحتياطي للوسائط غير مُشغل</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="zero">أُلغي اشتراك النسخ الاحتياطي لوسائط سيجنال الخاص بك لأننا لم نتمكّن من معالجة عملية الدفع الخاصة بك. أمامك %1$d يومًا لتنزيل أي وسائط مخزنة في النسخة الاحتياطية. بعد %1$d يوم، سَيتم حذف الوسائط الموجودة في النسخة الاحتياطية.</item>
+        <item quantity="one">أُلغي اشتراك النسخ الاحتياطي لوسائط سيجنال الخاص بك لأننا لم نتمكّن من معالجة عملية الدفع الخاصة بك. أمامك %1$d يوم لتنزيل أي وسائط مُخزنة في النسخة الاحتياطية. بعد %1$d يوم، سَيتم حذف الوسائط الموجودة في النسخة الاحتياطية.</item>
+        <item quantity="two">أُلغي اشتراك النسخ الاحتياطي لوسائط سيجنال الخاص بك لأننا لم نتمكن من معالجة عملية الدفع الخاصة بك. أمامك %1$d يومان لتنزيل أي وسائط مخزنة في النسخة الاحتياطية. بعد %1$d يومين، سيتم حذف الوسائط الموجودة في النسخة الاحتياطية.</item>
+        <item quantity="few">أُلغي اشتراك النسخ الاحتياطي لوسائط سيجنال الخاص بك لأننا لم نتمكن من معالجة عملية الدفع الخاصة بك. أمامك %1$d أيام لتنزيل أي وسائط مخزنة في النسخة الاحتياطية. بعد %1$d أيام، سيتم حذف الوسائط الموجودة في النسخة الاحتياطية.</item>
+        <item quantity="many">أُلغي اشتراك النسخ الاحتياطي لوسائط سيجنال الخاص بك لأننا لم نتمكن من معالجة عملية الدفع الخاصة بك. أمامك %1$d يومًا لتنزيل أي وسائط مخزنة في النسخة الاحتياطية. بعد %1$d يومًا، سيتم حذف الوسائط الموجودة في النسخة الاحتياطية.</item>
+        <item quantity="other">أُلغي اشتراك النسخ الاحتياطي لوسائط سيجنال الخاص بك لأننا لم نتمكن من معالجة عملية الدفع الخاصة بك. أمامك %1$d يوم لتنزيل أي وسائط مخزنة في النسخة الاحتياطية. بعد %1$d يوم، سيتم حذف الوسائط الموجودة في النسخة الاحتياطية.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">يُمكنك دفع ثمن النسخ الاحتياطية مرة أخرى في أي وقت لمواصلة نسخ جميع وسائطك الاحتياطية. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">ستُحذف وسائطك اليوم</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">لقد تم إلغاء خطة النسخ الاحتياطي لوسائط سيجنال الخاصة بك لأننا لم نتمكّن من معالجة عملية الدفع الخاصة بك. هذه فرصتك الأخيرة لتنزيل الوسائط الموجودة في النسخة الاحتياطية قبل حذفها.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">تعذر إكمال التنزيل</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">لا يتوفر جهازك على مساحة كافية. حرّر ما يصل إلى %1$s من المساحة لتنزيل الوسائط المُخزّنة في النسخ الاحتياطي الخاص بك.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="zero">إذا اخترت \"تخطي\" فسيتم حذف الوسائط في النسخ الاحتياطي الخاص بك في %1$d أيام.</item>
+        <item quantity="one">إذا اخترت \"تخطي\" فسيتم حذف الوسائط في النسخ الاحتياطي الخاص بك في %1$d يوم.</item>
+        <item quantity="two">إذا اخترت \"تخطي\" فسيتم حذف الوسائط في النسخ الاحتياطي الخاص بك في %1$d يومين.</item>
+        <item quantity="few">إذا اخترت \"تخطي\" فسيتم حذف الوسائط في النسخ الاحتياطي الخاص بك في %1$d أيام.</item>
+        <item quantity="many">إذا اخترت \"تخطي\" فسيتم حذف الوسائط في النسخ الاحتياطي الخاص بك في %1$d يومًا.</item>
+        <item quantity="other">إذا اخترت \"تخطي\" فسيتم حذف الوسائط في النسخ الاحتياطي الخاص بك في %1$d يوم.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">لقد تعذرت معالجة عملية دفع النَسخ الاحتياطي</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">نواجه مشكلة في تحصيل عملية دفع النَسخ الاحتياطي الشهرية. يُرجى التأكد من أن طريقة قيامك بالدفوعات حديثة. إن لم تكن كذلك، يُرجى تحديثها في Google Pay. سيُحاول سيجنال معالجة عملية الدفع مرة أخرى خلال بضعة أيام.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">تعذّر إكمال النسخ الاحتياطي</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">لم يُكمل جهازك النسخ الاحتياطي لِمدة %1$d أيام. تأكد من أن جهازك مُتصل بشبكة Wi-Fi ثم انقر فوق \"إنشاء نسخة احتياطية الآن\". </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">معرفة المزيد</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">تخطّي</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">تنزيل الوسائط الآن</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">التنزيل لاحقًا</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">لا تُنزّل الوسائط</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">حرّر %1$s من المساحة لتنزيل وسائطك.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">بطاقة الائتمان أو الخصم</string>
@@ -7478,6 +7682,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">مجهول</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">تاريخ الدفع</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">أُجريت آخر نسخة احتياطية في %1$s على الساعة %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -7488,6 +7698,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">ستُحذف الرسائل الأقدم من الوقت المُحدد بصفة نهائية.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">ستُحذف الرسائل التي تتجاوز الطول المُحدد بصفة نهائية.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">تطبيق العدد الأقصى للرسائل في الأجهزة المُتصلة</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">عند تفعيل هذه الميزة، سيُؤدي العدد الأقصى للرسائل في الدردشة إلى حذف الرسائل من أجهزتك المُتصلة أيضًا.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">عملية الحذف تتم في تزامن عبر جميع أجهزتك الآن</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">عندما تحذف رسالة أو ودردشة، فستُحذف من هاتفك وكل أجهزتك المُتصلة.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">موافق</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">تاريخ الدفع</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">النسخ الاحتياطي للنص وكل الوسائط</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">تفاصيل عمليات الدفع</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">نوع النُسخ الاحتياطية</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">تاريخ الدفع</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">شارك</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">نسخ سيجنال الاحتياطية</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">تاريخ الدفع</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">تفاصيل النسخ الاحتياطي</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">حجم النسخة الاحتياطية</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">وتيرة النسخ الاحتياطي</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">إجراء النسخ الاحتياطي باستخدام البيانات الخلوية</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">إيقاف وحذف النسخ الاحتياطية</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">تم حذف النُسخ الاحتياطية وإيقافها.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">تم تغيير نوع النُسخ الاحتياطية وإلغاء الاشتراك</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">لقد أُلغي الاشتراك</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">انتهى التنزيل</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">نوع النُسخ الاحتياطية</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">تعطيل النُسخ الاحتياطية</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/شهريًا</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">تفعيل النُسخ الإحتياطية</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">آخِر نسخة احتياطية</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s على %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">أبدا</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">أنشيء نُسخة اِحتياطية الآن</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">إيقاف وحذف النسخ الاحتياطية؟</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">لم تُحصّل أي رسوم منك مرة أخرى. ستُحذف نسخك الاحتياطية ولن تُنشأ نسخ احتياطية أخرى.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">إيقاف وحذف</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">جارٍ حذف النسخ الاحتياطية…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">جارٍ حذف النسخ الاحتياطية</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"بالنقر على إنشاء نسخة احتياطية الآن"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">يوميًا</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">أسبوعيًا</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">شهريًا</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">نسخ احتياطي يدوي</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">يُرجى إدخال الرقم التعريفي الشخصي أو كلمة المرور أو نمط تعطيل كلمة المرور لجهازك.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">التالي</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">تغيير نوع النُسخ الاحتياطية</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">إلغاء الاشتراك</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">تأكيد الإلغاء</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">لن تُحصّل أي رسوم منك مرة أخرى. سيتم إيقاف النسخ الاحتياطية في نهاية المدة الزمنية لإعداد الفواتير. وبعد هذا التاريخ، سَيكون أمامك 30 يومًا لتنزيل الوسائط التي تقوم بنسخها احتياطيًا حاليًا.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">تأكيد وتنزيل الآن</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">تأكيد وتنزيل لاحقًا</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">الاستمرار في الاشتراك</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index eaf6500989..e0ec8b221f 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal yenilənir…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly yenilənir…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Hələlik parol təyin etməmisiniz!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Parol qeyri-aktiv edilsin?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Bu, Signal-ın və mesaj bildirişlərinin kilidini birdəfəlik açacaq.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Bu, Molly-ın və mesaj bildirişlərinin kilidini birdəfəlik açacaq.</string>
     <string name="ApplicationPreferencesActivity_disable">Qeyri-aktiv et</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Serverə qoşulma xətası!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN-lər qeydiyyat kilidi üçün tələb olunur. PIN-ləri sıradan çıxartmaq üçün əvvəlcə zəhmət olmasa qeydiyyat kilidini sıradan çıxardın.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Fayl</string>
     <string name="AttachmentKeyboard_contact">Əlaqə</string>
     <string name="AttachmentKeyboard_location">Yerləşmə</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Fotolarınızı və videolarınızı göstərmək üçün Signal icazə tələb edir</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Fotolarınızı və videolarınızı göstərmək üçün Molly icazə tələb edir</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Müraciətə icazə ver</string>
     <string name="AttachmentKeyboard_payment">Ödəniş</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Media seçmək üçün tətbiq tapıla bilmədi.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal, foto, video və ya səs əlavə etmək üçün Anbara müraciət icazəsi tələb edir, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələr menyusunda \"İcazələr\"i seçib \"Anbar\"ı fəallaşdırın.</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal, əlaqə məlumatlarını əlavə etmək üçün Əlaqələrə müraciət icazəsi tələb edir, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələr menyusunda \"İcazələr\"i seçib \"Əlaqələr\"i fəallaşdırın.</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal, yerləşmə məlumatlarını əlavə etmək üçün Yerləşməyə müraciət icazəsi tələb edir, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələr menyusunda \"İcazələr\"i seçib \"Yerləşmə\"ni fəallaşdırın.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly, foto, video və ya səs əlavə etmək üçün Anbara müraciət icazəsi tələb edir, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələr menyusunda \"İcazələr\"i seçib \"Anbar\"ı fəallaşdırın.</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly, əlaqə məlumatlarını əlavə etmək üçün Əlaqələrə müraciət icazəsi tələb edir, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələr menyusunda \"İcazələr\"i seçib \"Əlaqələr\"i fəallaşdırın.</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly, yerləşmə məlumatlarını əlavə etmək üçün Yerləşməyə müraciət icazəsi tələb edir, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələr menyusunda \"İcazələr\"i seçib \"Yerləşmə\"ni fəallaşdırın.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Məkan parametrlərinə giriş icazəsi verin</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Məkan məlumatınızı göndərmək üçün:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Signal-ın məkan parametrlərinə daxil olmasına icazə verin.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Molly-ın məkan parametrlərinə daxil olmasına icazə verin.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Məkan məlumatlarınızı göndərmək üçün Signal məkan parametrlərinə giriş icazəsi tələb edir.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Məkan məlumatlarınızı göndərmək üçün Molly məkan parametrlərinə giriş icazəsi tələb edir.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Yaddaşa giriş icazəsi ver</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Fotoları və videoları göstərmək üçün:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Fotolarınızı və videolarınızı göstərmək üçün Signal yaddaşa giriş tələb edir.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Fotolarınızı və videolarınızı göstərmək üçün Molly yaddaşa giriş tələb edir.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s aktiv Ödənişlərə malik deyil </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Kameranı dəyişdir</string>
     <string name="CameraXFragment_open_gallery_description">Qalereyanı aç</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Müraciətə icazə ver</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Kamera və mikrofonuna giriş icazəsi ver</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Kameraya giriş icazəsi ver</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Mikrofona giriş icazəsi verin</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Fotolar çəkmək üçün Signal-a kameraya giriş icazəsi ver.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Foto və video çəkmək üçün, Signal-ın kameraya müraciətinə icazə verin.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Foto və video çəkmək üçün Signal-a kamera və mikrofona giriş icazəsi ver.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Səsli videolar çəkmək üçün Signal-a mikrofona giriş icazəsi ver.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">QR kodunu skan etmək üçün Signal-a kameraya giriş icazəsi ver.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Fotolar çəkmək üçün Signal kameraya giriş tələb edir</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">QR kodlarını skan etmək üçün Signal kameraya giriş tələb edir</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Video çəkmək üçün Signal mikrofona giriş tələb edir</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Signal-da fotolar çəkmək üçün:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Signal-da foto və videolar çəkmək üçün:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Səsli videolar çəkmək üçün:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR kodlarını skan etmək üçün:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Son əlaqələr</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Signal əlaqəsi yoxdur</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Fotoları Signal əlaqələrinə göndərmək üçün yalnız kamera düyməsini istifadə edə bilərsiniz. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Axtardığınızı tapa bilmirsiniz?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Əlaqəni Signal-a qoşulmağa dəvət edin</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Əlaqəni Molly-a qoşulmağa dəvət edin</string>
     <string name="CameraContacts__menu_search">Axtar</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Xeyr, təşəkkürlər</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Signal-ı yenilə</string>
+    <string name="ClientDeprecatedActivity_update_signal">Molly-ı yenilə</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Tətbiqin bu versiyası artıq dəstəklənmir. Mesaj almağa və göndərməyə davam etmək üçün ən son versiyaya yeniləyin.</string>
     <string name="ClientDeprecatedActivity_update">Yenilə</string>
     <string name="ClientDeprecatedActivity_dont_update">Yeniləmə</string>
     <string name="ClientDeprecatedActivity_warning">Xəbərdarlıq</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Signal versiyanızın istifadə müddəti bitib. Mesaj tarixçənizə baxa biləcəksiniz, ancaq yeniləyənə qədər mesaj göndərə və ya ala bilməyəcəksiniz.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Molly versiyanızın istifadə müddəti bitib. Mesaj tarixçənizə baxa biləcəksiniz, ancaq yeniləyənə qədər mesaj göndərə və ya ala bilməyəcəksiniz.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Heç bir veb səyyah tapılmadı.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Mesaj %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly audio-zəng %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly video-zəng %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal mesajı</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Mesaj göndər</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Gəlin Signal-a keçək: %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Gəlin Molly-a keçək: %1$s</string>
     <string name="ConversationActivity_specify_recipient">Zəhmət olmasa bir əlaqə seçin</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Qoşma, göndərdiyiniz mesaj növü üçün həcm limitləri aşır.</string>
     <string name="ConversationActivity_unable_to_record_audio">Səs yazıla bilmir!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Səsli mesajlar göndərmək üçün:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Səsli mesajlar göndərmək üçün Signal-ın mikrofon parametrlərinə daxil olmasına icazə verin.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Səsli mesajlar göndərmək üçün Molly-ın mikrofon parametrlərinə daxil olmasına icazə verin.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Səsli mesajı yazmaq üçün Signal mikrofon parametrlərinə giriş icazəsi tələb edir.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal, səsli mesaj göndərmək üçün Mikrofon icazəsini tələb edir, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələrində \"İcazələr\"i seçib \"Mikrofon\"u fəallaşdırın.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Səsli mesajı yazmaq üçün Molly mikrofon parametrlərinə giriş icazəsi tələb edir.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly, səsli mesaj göndərmək üçün Mikrofon icazəsini tələb edir, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələrində \"İcazələr\"i seçib \"Mikrofon\"u fəallaşdırın.</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal-ın, %1$s əlaqəsinə zəng etmək üçün Mikrofon və Kamera icazələrinə ehtiyacı var, ancaq bu icazələr birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələrində \"İcazələr\"i seçib \"Mikrofon\" və \"Kamera\"nı fəallaşdırın.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Foto və video çəkmək üçün, Signal-ın kameraya müraciətinə icazə verin.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal-ın, foto və ya video çəkmək üçün Kamera icazəsinə ehtiyacı var, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələrində \"İcazələr\"i seçib \"Kamera\"nı fəallaşdırın.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal-ın, foto və ya video çəkmək üçün Kamera icazəsinə ehtiyacı var.</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly-ın, %1$s əlaqəsinə zəng etmək üçün Mikrofon və Kamera icazələrinə ehtiyacı var, ancaq bu icazələr birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələrində \"İcazələr\"i seçib \"Mikrofon\" və \"Kamera\"nı fəallaşdırın.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Foto və video çəkmək üçün, Molly-ın kameraya müraciətinə icazə verin.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly-ın, foto və ya video çəkmək üçün Kamera icazəsinə ehtiyacı var, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələrində \"İcazələr\"i seçib \"Kamera\"nı fəallaşdırın.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly-ın, foto və ya video çəkmək üçün Kamera icazəsinə ehtiyacı var.</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Səsli video çəkmək üçün mikrofon icazəsini fəallaşdırın.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal-ın, video çəkmək üçün mikrofon icazəsinə ehtiyacı var, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələrində \"İcazələr\"i seçib \"Mikrofon\" və \"Kamera\"nı fəallaşdırın.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal-ın, video çəkmək üçün mikrofon icazəsinə ehtiyacı var.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly-ın, video çəkmək üçün mikrofon icazəsinə ehtiyacı var, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələrində \"İcazələr\"i seçib \"Mikrofon\" və \"Kamera\"nı fəallaşdırın.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly-ın, video çəkmək üçün mikrofon icazəsinə ehtiyacı var.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Xeyr</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Bir zəngə başlamaq üçün:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Bir zəngə başlamaq üçün Signal-ın mikrofon parametrlərinə daxil olmasına icazə verin.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Bir zəngə başlamaq üçün Molly-ın mikrofon parametrlərinə daxil olmasına icazə verin.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Zəng başlatmaq üçün Signal mikrofon parametrlərinə giriş icazəsi tələb edir.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Zəng başlatmaq üçün Molly mikrofon parametrlərinə giriş icazəsi tələb edir.</string>
 
 
     <string name="ConversationActivity_join">Qoşul</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">SMS mesajlaşması artıq Signal-da dəstəklənmir. Söhbəti burada davam etdirmək üçün %1$s Signal-a dəvət edin.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Bu şəxs artıq Signal-dan istifadə etmir. Söhbəti burada davam etdirmək üçün onu Signal-a dəvət edin.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Bu şəxs artıq Molly-dan istifadə etmir. Söhbəti burada davam etdirmək üçün onu Molly-a dəvət edin.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Signal-a dəvət edin</string>
+    <string name="ConversationActivity__invite_to_signal">Molly-a dəvət edin</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Sizə tezliklə yenidən xatırlatma bildirişi göndəriləcək.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Hər kəs üçün sil</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Bu cihazdan sil</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Sil</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Hər yerdən sil</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Bu mesaj bu çatda Signal-ın ən son versiyasına malik olan hər kəsdən silinəcək. Onlar mesajı sildiyinizi görə bilərlər.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Bloklandı</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Signal-ı yenilə</string>
+    <string name="ConversationFragment__update_build">Molly-ı yenilə</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Signal-da təkrar qeydiyyatdan keçin</string>
+    <string name="ConversationFragment__reregister_signal">Molly-da təkrar qeydiyyatdan keçin</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Geri qayıt.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signal-ı açın</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Molly-ı açın</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Artıq təsdiqlənmir</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Bu addımla seçilmiş çat həmişəlik silinəcək.</item>
         <item quantity="other">Bu addımla seçilmiş %1$d çat həmişəlik silinəcək.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Bununla, bütün cihazlarınızdan seçilmiş çat həmişəlik silinəcək.</item>
+        <item quantity="other">Bununla, bütün cihazlarınızdan seçilmiş bütün %1$d çat həmişəlik silinəcək.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Silinir</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Seçilmiş çat silinir…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Məni nömrəmlə kim tapa bilər?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Telefon nömrənizin olduğu istənilən şəxs Signal-da olduğunuz zaman sizi görə və çata başlaya bilər.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Telefon nömrənizin olduğu istənilən şəxs Molly-da olduğunuz zaman sizi görə və çata başlaya bilər.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Mesaj göndərənə və ya ortaq çata daxil olmayana qədər heç kim Signal-da olduğunuzu görə bilməyəcək.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Mesaj göndərənə və ya ortaq çata daxil olmayana qədər heç kim Molly-da olduğunuzu görə bilməyəcək.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Nüsxədən geri yüklənilsin?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Nüsxə parolunuzu test edin və uyğun gəldiyini təsdiqləyin</string>
     <string name="BackupsPreferenceFragment__turn_on">İşə sal</string>
     <string name="BackupsPreferenceFragment__turn_off">Söndür</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Bir nüsxəni geri yükləmək üçün, Signal-ın yeni bir kopyasını quraşdırın. Tətbiqi açıb \"Nüsxəni geri yüklə\"yə toxunun, daha sonra nüsxə faylını tapın. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Bir nüsxəni geri yükləmək üçün, Molly-ın yeni bir kopyasını quraşdırın. Tətbiqi açıb \"Nüsxəni geri yüklə\"yə toxunun, daha sonra nüsxə faylını tapın. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Daha ətraflı</string>
     <string name="BackupsPreferenceFragment__in_progress">Davam edir…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">İndiyə qədər %1$d….</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">İndiyə qədər %1$s%%…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal, nüsxələri yaratmaq üçün xarici anbar icazəsi tələb edir, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələrində \"İcazələr\"i seçib \"Anbar\"ı fəallaşdırın.</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly, nüsxələri yaratmaq üçün xarici anbar icazəsi tələb edir, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələrində \"İcazələr\"i seçib \"Anbar\"ı fəallaşdırın.</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Ehtiyat nüsxənin çıxarılması üçün vaxt təyin edin</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Çat seansı təzələndi</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal ucdan-uca şifrələmə istifadə edir və bəzən çat seansınızı təzələmək lazım gəlir. Bu, çatın təhlükəsizliyinə təsir etmir, ancaq bu şəxsdən gələn bir mesajı buraxsanız ondan mesajı təkrar göndərməsini xahiş edə bilərsiniz.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly ucdan-uca şifrələmə istifadə edir və bəzən çat seansınızı təzələmək lazım gəlir. Bu, çatın təhlükəsizliyinə təsir etmir, ancaq bu şəxsdən gələn bir mesajı buraxsanız ondan mesajı təkrar göndərməsini xahiş edə bilərsiniz.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Desktop və ya iPad-da Signal. Mesajlarınız əlaqələndirilmiş cihazlarlarınızla sinxronlaşdırılacaq.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Yeni cihazla əlaqələndir</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Mesajlar və çat məlumatları bütün cihazlarda tam şifrələmə ilə qorunur</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Desktop və ya iPad-da Signal</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Əlaqələndirilmiş cihazlardakı bütün mesajlaşmalar gizlidir</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Molly mesajları əlaqələndirildikdən sonra mobil telefonunuzdakı Molly ilə sinxronlaşdırılır. Əvvəlki mesaj tarixçəniz görünməyəcək.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Digər cihazınızda Molly-ı quraşdırmaq üçün %1$s vebsaytına daxil olun</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Əlaqələndirilmiş cihazlarım</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Əlaqəni kəs</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s ilə əlaqə kəsildi</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Cihazla əlaqə yaradılır…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Cihaz təsdiqləndi</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Yüklənir…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Əlaqələndirilmiş cihazlar yoxdur</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Cihazı əlaqələndirmək üçün kilidi açın</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Cihazla əlaqə yaratmaq üçün görüntülənən QR kodu skan edin.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">QR kodu skan edin</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Qoşulmaq istədiyiniz cihazda görünən QR kodu skan etmək üçün bu cihazdan istifadə edin</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Oldu</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Bu cihaz, qruplarınızı və əlaqələrinizi görə biləcək, söhbətlərinizə müraciət edə biləcək və adınızdan mesajlar göndərə biləcək.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Digər cihazlarınızda əlaqələndirməni tamamlayın</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Digər cihazlarınızda Molly əlaqələndirmə prosesini tamamlayın.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Cihazla əlaqə yaradılmadı</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Bu QR kod etibarsızdır. Zəhmət olmasa əlaqə yaratmaq istədiyiniz cihazda görüntülənən QR kodu skan etdiyinizə əmin olun.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Yenidən sına</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">\"%1$s\" ilə əlaqə kəsilsin?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Əskik Play Xidmətləri üçün optimallaşdırın</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Bu cihaz Play Xidmətlərini dəstəkləmir. Signal-ın aktiv olmadığı müddətdə mesajların alınmasına maneə törədən sistem batareya optimallaşdırmasını sıradan çıxartmaq üçün toxunun.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Bu cihaz Play Xidmətlərini dəstəkləmir. Molly-ın aktiv olmadığı müddətdə mesajların alınmasına maneə törədən sistem batareya optimallaşdırmasını sıradan çıxartmaq üçün toxunun.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Signal-ın bu versiyasının istifadə müddəti bitib. Mesaj göndərmək və almaq üçün indi yeniləyin.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Molly-ın bu versiyasının istifadə müddəti bitib. Mesaj göndərmək və almaq üçün indi yeniləyin.</string>
     <string name="ExpiredBuildReminder_update_now">İndi yenilə</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Bax</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Daimi Signal ünsiyyət xətası!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal, Google Play Xidmətləri ilə qeydiyyatdan keçə bilmədi. Signal mesajları və zəngləri sıradan çıxarıldı, zəhmət olmasa Tənzimləmələr &gt; Qabaqcıl seçimlərində yenidən qeydiyyatdan keçməyə çalışın.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Daimi Molly ünsiyyət xətası!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly, Google Play Xidmətləri ilə qeydiyyatdan keçə bilmədi. Molly mesajları və zəngləri sıradan çıxarıldı, zəhmət olmasa Tənzimləmələr &gt; Qabaqcıl seçimlərində yenidən qeydiyyatdan keçməyə çalışın.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Sazlama jurnalları bizə problemi təyin edib, aradan qaldırmaqda kömək edir və kimlik məlumatlarını əhatə etmir.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal problemlə üzləşdi. Sazlama jurnalı göndərilsin?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly problemlə üzləşdi. Sazlama jurnalı göndərilsin?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Bildirişlər batareyanın optimallaşdırılması səbəbilə gecikə bilər</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Mesaj bildirişlərinin gecikməməsi üçün Signal batareya optimallaşdırılmasını qeyri-aktiv edə bilərsiniz.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Mesaj bildirişlərinin gecikməməsi üçün Molly batareya optimallaşdırılmasını qeyri-aktiv edə bilərsiniz.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Bildirişlər batareyanın optimallaşdırılması səbəbilə gecikə bilər</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Mesaj bildirişlərinin gecikməməsi üçün Molly batareya optimallaşdırılmasını qeyri-aktiv edə bilərsiniz. Cihaza məxsus təlimatlara baxmaq üçün \"Davam et\" seçiminə klikləyin.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Xeyr, təşəkkürlər</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Davam et</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Davam et</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Rədd et</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Xeyr, təşəkkürlər</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Gözləyən qrup dəvətləri</string>
+    <string name="PendingMembersActivity_pending_group_invites">Tələb və dəvətlər</string>
     <string name="PendingMembersActivity_requests">Tələblər</string>
     <string name="PendingMembersActivity_invites">Dəvətlər</string>
     <string name="PendingMembersActivity_people_you_invited">Dəvət etdiyiniz şəxslər</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">İmtina</string>
     <string name="InviteActivity_sending">Göndərilir…</string>
     <string name="InviteActivity_invitations_sent">Dəvətlər göndərildi!</string>
-    <string name="InviteActivity_invite_to_signal">Signal-a dəvət et</string>
+    <string name="InviteActivity_invite_to_signal">Molly-a dəvət et</string>
     <string name="InviteActivity_send_sms">SMS göndər (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">%1$d SMS dəvətnaməsi göndərirsən?</item>
         <item quantity="other">%1$d SMS dəvəti göndərilsin?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Gəlin Signal-a keçək: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Gəlin Molly-a keçək: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Bunu paylaşmaq üçün heç bir tətbiqiniz yoxdur kimi görünür.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Mesajınız</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Arxaplan bağlantısı fəallaşdırıldı</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Cavablar</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal zəngi edilir</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly zəngi edilir</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signal zəng xidməti başladılır</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal zəng xidməti dayandırılır</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Molly zəng xidməti başladılır</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly zəng xidməti dayandırılır</string>
     <string name="NotificationBarManager__cancel_call">Zəngi ləğv et</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Ödənişləri aktivləşdirdiniz</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s artıq Ödənişləri qəbul edə bilər</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Ödəniş məlumatları mövcud deyil</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Daha Çoxu Üçün Kliklə</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Ödəniş məlumatları mövcud deyil</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Mesajlarınız bu ödəniş tarixçəsi ilə əlaqəli məzmuna malik olmayan mənbədən bərpa edildiyinə görə bu ödənişə aid müəyyən məlumatlar mövcud deyil. Bu pul kisənizin balansına, yaxud da keçmiş ödənişlərin statusuna təsir etmir.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Tezliklə artıq Signal-dan SMS mesajları göndərə bilməyəcəksiniz. Söhbəti burada davam etdirmək üçün %1$s adlı şəxsi Signal-a dəvət edin.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Artıq Signal-da SMS mesajları göndərə bilməzsiniz. Söhbəti burada davam etdirmək üçün %1$s adlı şəxsi Signal-a dəvət edin.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Artıq Molly-da SMS mesajları göndərə bilməzsiniz. Söhbəti burada davam etdirmək üçün %1$s adlı şəxsi Molly-a dəvət edin.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Ödəniş: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Ödəniş</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Spam olaraq bildirildi</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Signal cihazı ilə əlaqə yaradılsın?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Bir 3-cü tərəf skaner istifadə edərək Signal ilə əlaqə yaratmağa çalışırsınız kimi görünür. Güvənliyiniz üçün kodu zəhmət olmasa Signal daxilində skan edin.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal-ın, QR kodu skan etmək üçün Kamera icazəsinə ehtiyacı var, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələrində \"İcazələr\"i seçib \"Kamera\"nı fəallaşdırın.</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly-ın, QR kodu skan etmək üçün Kamera icazəsinə ehtiyacı var, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələrində \"İcazələr\"i seçib \"Kamera\"nı fəallaşdırın.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Kamera icazəsi olmadan QR kod skan edilə bilmir</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Parolu daxil edin</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal nişanı</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly nişanı</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Parolu təqdim edin</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Etibarsız parol!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signal-ın kilidini aç</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Kilid Ekranı</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Molly-ın kilidini aç</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Kilid Ekranı</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Xəritə</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Mesajlaşmağa davam etmək üçün təsdiqləyin</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Signal-da spam mesajların qarşısını almağa kömək etmək üçün zəhmət olmasa təsdiqləməni tamamlayın.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Molly-da spam mesajların qarşısını almağa kömək etmək üçün zəhmət olmasa təsdiqləməni tamamlayın.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Təsdiqləndikdən sonra, mesajlaşmağa davam edə bilərsiniz. Fasilə verilən bütün mesajlar avtomatik olaraq göndəriləcək.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Hekayəm</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal zəngi</string>
+    <string name="Recipient_signal_call">Molly zəngi</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Blokla</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Çağırır…</string>
     <string name="RedPhone_busy">Məşğuldur</string>
     <string name="RedPhone_recipient_unavailable">Alıcı əlçatmazdır</string>
-    <string name="RedPhone_network_failed">Şəbəkə xətası!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Şəbəkə xətası! Şəbəkə bağlantınızı yoxlayıb yenidən cəhd edin.</string>
     <string name="RedPhone_number_not_registered">Nömrə qeydiyyatdan keçirilməyib!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Daxil etdiyiniz nömrə güvənli səs sistemini dəstəkləmir!</string>
     <string name="RedPhone_got_it">Anladım</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Videonuzu açmaq üçün bura toxunun</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Signal-ın, %1$s əlaqəsinə zəng etmək üçün kameranıza müraciətinə ehtiyacı var</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Molly-ın, %1$s əlaqəsinə zəng etmək üçün kameranıza müraciətinə ehtiyacı var</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Zəng edilir…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Yenidən bağlantı qurulur…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Zəngdən çıxarıldı</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Biri sizi zəngdən çıxarıb.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Kamera və mikrofonuna giriş icazəsi ver</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Mikrofona giriş icazəsi verin</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Kameraya giriş icazəsi ver</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Zəng etmək və ya zəngə qoşulmaq üçün Molly-ın kamera və mikrofonunuza daxil olmasına icazə verin.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Zəng etmək və ya zəngə qoşulmaq üçün Molly-ın mikrofonunuza daxil olmasına icazə verin.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Videonuzu aktivləşdirmək üçün Molly-ın kameranıza daxil olmasına icazə verin.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Zəng etmək və ya zəngə qoşulmaq üçün Molly mikrofona giriş icazəsi tələb edir.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Videonuzu aktivləşdirmək üçün Molly kameraya giriş tələb edir</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Zəng etmək və ya zəngə qoşulmaq üçün:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Videonuzu aktivləşdirmək üçün:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal zəngi</string>
-    <string name="WebRtcCallView__signal_video_call">Signal görüntülü zəngi</string>
+    <string name="WebRtcCallView__signal_call">Molly zəngi</string>
+    <string name="WebRtcCallView__signal_video_call">Molly görüntülü zəngi</string>
     <string name="WebRtcCallView__start_call">Zəng başlat</string>
     <string name="WebRtcCallView__join_call">Zəngə qoşul</string>
     <string name="WebRtcCallView__call_is_full">Zəng dolub</string>
@@ -2031,19 +2135,38 @@
     <string name="CallOverflowPopupWindow__lower_hand">Əlini endir</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Ləğv et</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Əl qaldırdınız</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Bax</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s əl qaldırdı</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s əl qaldırdı</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d əl qaldırdınız</item>
+        <item quantity="other">%1$s + %2$d əl qaldırdınız</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s əl qaldırdı</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d əl qaldırdı</item>
         <item quantity="other">%1$s + %2$d əl qaldırdı</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Bu nömrəni təsdiqləmək üçün bir zəng gələcək.</string>
     <string name="RegistrationActivity_edit_number">Nömrəyə düzəliş et</string>
     <string name="RegistrationActivity_missing_google_play_services">Google Play Xidmətləri əskikdir</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Bu cihazda Google Play Xidmətləri əskikdir. Signal-ı hələ də istifadə edə bilərsiniz, ancaq bu konfiqurasiya etibarlılığın və ya performansın düşməsinə səbəb ola bilər.\n\nƏgər qabaqcıl bir istifadəçi deyilsinizsə, alternativ bir Android ROM istifadə etmirsinizsə və bunun xəta olduğuna inanırsınızsa, zəhmət olmasa nasazlıqların aşkarlanması üzrə kömək üçün support@signal.org ünvanı üzərindən bizimlə əlaqə saxlayın.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Bu cihazda Google Play Xidmətləri əskikdir. Molly-ı hələ də istifadə edə bilərsiniz, ancaq bu konfiqurasiya etibarlılığın və ya performansın düşməsinə səbəb ola bilər.\n\nƏgər qabaqcıl bir istifadəçi deyilsinizsə, alternativ bir Android ROM istifadə etmirsinizsə və bunun xəta olduğuna inanırsınızsa, zəhmət olmasa nasazlıqların aşkarlanması üzrə kömək üçün support@molly.im ünvanı üzərindən bizimlə əlaqə saxlayın.</string>
     <string name="RegistrationActivity_i_understand">Anlayıram</string>
     <string name="RegistrationActivity_play_services_error">Play Xidmətlər Xətası</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Xidmətləri yenilənir və ya müvəqqəti olaraq əlçatmazdır. Zəhmət olmasa yenidən sınayın.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Standart olmayan nömrə formatı</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Daxil etdiyiniz nömrə (%1$s) standartlara cavab vermir.\n\nBunu nəzərdə tuturdunuz: %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Telefon nömrə formatı</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Telefon nömrə formatı</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Zəng tələb olundu</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Qeydiyyatdan keçməkdə çətinlik çəkirsiniz?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• SMS qəbulu və ya zəng etmək üçün telefonunuzda mobil siqnalın aktivliyindən əmin olun \n • Nömrəyə telefon zəngi qəbul edə biləcəyinizi təsdiqləyin\n• Telefon nömrənizi düzgün daxil edib-etmədiyinizi yoxlayın.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Əlavə məlumat üçün problemlərin aradan qaldırılması ilə əlaqəli bu addımları yerinə yetirin və ya Dəstək xidmətimizlə əlaqə saxlayın</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Daha ətraflı məlumat üçün %1$s və ya %2$s bölmələrinə keçin</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">buradakı nasazlıqların aradan qaldırılması addımları</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Əlaqələrə əlavə et</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Signal-a dəvət edin</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Molly-a dəvət edin</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal Mesajı</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal Zəngi</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Əlaqələrə əlavə et</string>
-    <string name="SharedContactView_invite_to_signal">Signal-a dəvət edin</string>
+    <string name="SharedContactView_invite_to_signal">Molly-a dəvət edin</string>
     <string name="SharedContactView_message">Signal Mesajı</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s nömrəsi %2$s adlı istifadəçiyə aiddir</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal yeniləməsi</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal-ın yeni versiyası mövcuddur. Yeniləmək üçün toxunun.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal-ı yeniləmək mümkün olmadı</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly yeniləməsi</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly-ın yeni versiyası mövcuddur. Yeniləmək üçün toxunun.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly-ı yeniləmək mümkün olmadı</string>
     <string name="ApkUpdateNotifications_failed_general_body">Daha sonra yenidən cəhd edəcəyik.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal uğurla yeniləndi</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly uğurla yeniləndi</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">%1$s versiyası avtomatik yeniləndi.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Signal güvənlik nömrəmiz:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Bunu paylaşmaq üçün heç bir tətbiqiniz yoxdur kimi görünür.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Lövhədə müqayisə ediləcək heç bir güvənlik nömrəsi tapılmadı</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal-ın, QR kodu skan etmək üçün Kamera icazəsinə ehtiyacı var, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələrində \"İcazələr\"i seçib \"Kamera\"nı fəallaşdırın.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly-ın, QR kodu skan etmək üçün Kamera icazəsinə ehtiyacı var, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələrində \"İcazələr\"i seçib \"Kamera\"nı fəallaşdırın.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Kamera icazəsi olmadan QR kod skan edilə bilmir</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">%1$s adlı əlaqənin güvənlik nömrəsinə baxmaq üçün əvvəlcə onunla mesajlaşmalısınız.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Açmaq üçün toxunun.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal-ın kilidi açıldı</string>
-    <string name="KeyCachingService_lock">Signal-ı kilidlə</string>
+    <string name="KeyCachingService_passphrase_cached">Molly-ın kilidi açıldı</string>
+    <string name="KeyCachingService_lock">Molly-ı kilidlə</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Siz</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Dəstəklənməyən media növü</string>
     <string name="MediaPreviewActivity_draft">Qaralama</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal-ın, xarici anbarda saxlaması üçün Anbar icazəsinə ehtiyacı var, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələrində \"İcazələr\"i seçib \"Anbar\"ı fəallaşdırın.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly-ın, xarici anbarda saxlaması üçün Anbar icazəsinə ehtiyacı var, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələrində \"İcazələr\"i seçib \"Anbar\"ı fəallaşdırın.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">İcazə olmadan xarici anbarda saxlanıla bilmir</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Mesaj silinsin?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Bu, mesajı birdəfəlik siləcək.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Mesaj çatdırılmadı.</string>
     <string name="MessageNotifier_error_delivering_message">Mesajın çatdırılması xətası.</string>
     <string name="MessageNotifier_message_delivery_paused">Mesajın çatdırılmasına fasilə verildi.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Signal-da mesajlaşmağa davam etmək üçün təsdiqləyin.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Molly-da mesajlaşmağa davam etmək üçün təsdiqləyin.</string>
     <string name="MessageNotifier_mark_all_as_read">Hamısını oxundu olaraq işarələ</string>
     <string name="MessageNotifier_mark_read">Oxundu olaraq işarələ</string>
     <string name="MessageNotifier_turn_off_these_notifications">Bu bildirişləri söndürün</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Stikerinizə reaksiya verdi: %1$s.</string>
     <string name="MessageNotifier_this_message_was_deleted">Mesaj silindi.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Əlaqə Signal-a qoşuldu bildirişləri söndürülsün? Bunu Signal &gt; Tənzimləmələr &gt; Bildirişlər üzərindən təkrar fəallaşdıra bilərsiniz.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Əlaqə Molly-a qoşuldu bildirişləri söndürülsün? Bunu Molly &gt; Tənzimləmələr &gt; Bildirişlər üzərindən təkrar fəallaşdıra bilərsiniz.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signal kilidli ikən cəld cavab əlçatmazdır!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Molly kilidli ikən cəld cavab əlçatmazdır!</string>
     <string name="QuickResponseService_problem_sending_message">Mesajın göndərilməsində problem var!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Etibarsız qısayol</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Yeni mesaj</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Mesaj tələbi</string>
     <string name="SingleRecipientNotificationBuilder_you">Siz</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Bu cihaz artıq qeydiyyatda deyil. Böyük ehtimalla, telefon nömrəniz fərqli bir cihazdakı Signal hesabında qeydiyyata alınıb.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Bu cihaz artıq qeydiyyatda deyil. Böyük ehtimalla, telefon nömrəniz fərqli bir cihazdakı Molly hesabında qeydiyyata alınıb.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Cihazı təkrar qeydiyyatdan keçirin</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Zəngi cavablandırmaq üçün Signal-ın mikrofonunuza müraciətinə icazə verin.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Zəngi cavablandırmaq üçün Molly-ın mikrofonunuza müraciətinə icazə verin.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Video zəngə cavab vermək üçün Signal-ın cihazınızın mikrofon və kamerasına girişinə icazə verin.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal, zəng etmək və ya almaq üçün Mikrofon və Kamera icazələrini tələb edir, ancaq bu icazələr birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələrində \"İcazələr\"i seçib \"Mikrofon\" və \"Kamera\"nı fəallaşdırın.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Video zəngə cavab vermək üçün Molly-ın cihazınızın mikrofon və kamerasına girişinə icazə verin.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly, zəng etmək və ya almaq üçün Mikrofon və Kamera icazələrini tələb edir, ancaq bu icazələr birdəfəlik rədd edilib. Zəhmət olmasa tətbiq tənzimləmələrində \"İcazələr\"i seçib \"Mikrofon\" və \"Kamera\"nı fəallaşdırın.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Əlaqə yaradılmış cihazda cavablandı.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Əlaqə yaradılmış cihazda rədd edildi.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Əlaqə yaradılmış cihazda məşğuldur.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Yeni parolu təkrar yazın</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Signal-a dəvət edin</string>
+    <string name="contact_selection_activity__invite_to_signal">Molly-a dəvət edin</string>
     <string name="contact_selection_activity__new_group">Yeni qrup</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Kontaktları yenilə</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Kimsə nəzərdən qaçıb? Yeniləməyə çalışın</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Signal-da tanıdığın insanları tap</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Kontaktlara giriş icazəsi ver</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Daha çox</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Əlaqə fotosu</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal, əlaqələrinizi görüntüləmək üçün Əlaqələr icazəsini tələb edir, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiqin tənzimləmələr menyusunda \"İcazələr\"i seçib \"Əlaqələr\"i fəallaşdırın.</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly, əlaqələrinizi görüntüləmək üçün Əlaqələr icazəsini tələb edir, ancaq bu icazə birdəfəlik rədd edilib. Zəhmət olmasa tətbiqin tənzimləmələr menyusunda \"İcazələr\"i seçib \"Əlaqələr\"i fəallaşdırın.</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Əlaqələr alınmadı, şəbəkə bağlantınızı yoxlayın</string>
     <string name="ContactSelectionListFragment_username_not_found">İstifadəçi adı tapılmadı</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\", Signal istifadəçisi deyil. Zəhmət olmasa istifadəçi adını yoxlayıb yenidən sınayın."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">İstifadəçi adına görə tap</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Kontaktlara giriş icazəsi ver</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Signal-da tanıdığın insanları tapmaq üçün:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Müraciətə icazə ver</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Xeyr, təşəkkürlər</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Kontaktlara giriş icazəsi ver. Kontaktlar şifrələnib və Signal xidmətində görünmür.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal-ın, əlaqələrinizi görüntüləmək üçün müraciətə ehtiyacı var.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly-ın, əlaqələrinizi görüntüləmək üçün müraciətə ehtiyacı var.</string>
     <string name="contact_selection_list_fragment__show_contacts">Əlaqələri göstər</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Bu şəxsi sildiniz, ona yenidən mesaj göndərməklə, onu siyahınıza əlavə edə bilərsiniz.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Seçimlər</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Yenilə</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Oxut … Fasilə ver</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Şarlar Signal çatları üçün söndürə biləcəyiniz bir Android xüsusiyyətidir.</string>
+    <string name="BubbleOptOutTooltip__description">Şarlar Molly çatları üçün söndürə biləcəyiniz bir Android xüsusiyyətidir.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">İndi yox</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Qrup açıqlaması</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Signal-ı yenilə</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Molly-ı yenilə</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Signal-ın bu versiyasının vaxtı bitib. Signal-dan istifadəyə davam etmək üçün indi yeniləyin.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Molly-ın bu versiyasının vaxtı bitib. Molly-dan istifadəyə davam etmək üçün indi yeniləyin.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Yenilə</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Yavaş</string>
     <string name="preferences__help">Kömək</string>
     <string name="preferences__advanced">Qabaqcıl</string>
-    <string name="preferences__donate_to_signal">Signal-a ianə verin</string>
+    <string name="preferences__donate_to_signal">Molly-a ianə verin</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Gizlilik</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Tətbiq piktoqramını və adını \"%1$s\" kimi dəyişdirin</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Tətbiq piktoqramını və adını dəyişdirmək üçün Signal-ı bağlamalısınız. Bildirişlər həmişə standart Signal piktoqramını və adını göstərəcək.</string>
+    <string name="preferences__app_icon_dialog_description">Tətbiq piktoqramını və adını dəyişdirmək üçün Molly-ı bağlamalısınız. Bildirişlər həmişə standart Molly piktoqramını və adını göstərəcək.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Telefonunuzun ana səhifəsində və tətbiq panelində görünəcək bir tətbiq piktoqramı və adı seçin. Bildirişlər həmişə standart Signal piktoqramını və adını göstərəcək. Daha ətraflı</string>
+    <string name="preferences__app_icon_warning_learn_more">Telefonunuzun ana səhifəsində və tətbiq panelində görünəcək bir tətbiq piktoqramı və adı seçin. Bildirişlər həmişə standart Molly piktoqramını və adını göstərəcək. Daha ətraflı</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Tətbiq piktoqramları və adları ana səhifədə və tətbiq panelində görünür.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Bildirişlər həmişə standart Signal piktoqramını və adını göstərəcək.</string>
+    <string name="preferences__app_icon_notification_warning">Bildirişlər həmişə standart Molly piktoqramını və adını göstərəcək.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Daha ətraflı</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Bu, bütün çatları %1$s ən son mesaja qədər kəsəcək.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Bu, bütün mesaj tarixçəsini və medianı cihazınızdan birdəfəlik siləcək.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Çat mesaj tarixçəsinin silinməsi, bu cihazdan və bütün əlaqələndirilmiş cihazlardan bütün mesaj tarixçəsini və medianı həmişəlik siləcək.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Bütün mesaj tarixçənizi silmək istədiyinizə əminsiniz?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Bütün mesaj tarixçəniz birdəfəlik silənəcək. Bu əməliyyat geri qaytarıla bilməz.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Bütün mesaj tarixçəsi bütün cihazlardan həmişəlik silinəcək. Bu əməliyyat geri qaytarıla bilməz.</string>
     <string name="preferences_storage__delete_all_now">Hamısını indi sil</string>
     <string name="preferences_storage__forever">Həmişəlik</string>
     <string name="preferences_storage__one_year">1 il</string>
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Ödənişlər səhifəsi</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Məxfiliyə əsaslanan yeni rəqəmsal pul vahidi olan MobileCoin göndərmək və almaq üçün Signal-dan istifadə edin. Başlatmaq üçün aktivləşdirin.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Məxfiliyə əsaslanan yeni rəqəmsal pul vahidi olan MobileCoin göndərmək və almaq üçün Molly-dan istifadə edin. Başlatmaq üçün aktivləşdirin.</string>
     <string name="PaymentsHomeFragment__activate_payments">Ödənişləri aktivləşdir</string>
     <string name="PaymentsHomeFragment__activating_payments">Ödənişlər aktivləşdirilir…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Ödəniş hesabını geri yüklə</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Ödənişlər bölgənizdə əlçatmazdır.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Ödənişlər fəallaşdırıla bilmir. Daha sonra yenidən sınayın.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Ödənişlər deaktiv edilsin?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Ödənişləri deaktiv etsəniz, Signal-da MobileCoin göndərə və ya ala bilməyəcəksiniz.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Ödənişləri deaktiv etsəniz, Molly-da MobileCoin göndərə və ya ala bilməyəcəksiniz.</string>
     <string name="PaymentsHomeFragment__deactivate">Deaktiv et</string>
     <string name="PaymentsHomeFragment__continue">Davam et</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Balans hal-hazırda əlçatmazdır.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Təfsilatlar</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">MobileCoin göndərmək və almaq üçün Signal-dan istifadə edə bilərsiniz. Bütün ödənişlər MobileCoins və MobileCoin Pulqabının İstifadə Şərtləri ilə tənzimlənir. Bəzi problemlərlə üzləşə bilərsiniz, yaxud da itirə biləcəyiniz ödəniş və balansları yenidən bərpa etməyiniz mümkün olmaya bilər. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">MobileCoin göndərmək və almaq üçün Molly-dan istifadə edə bilərsiniz. Bütün ödənişlər MobileCoins və MobileCoin Pulqabının İstifadə Şərtləri ilə tənzimlənir. Bəzi problemlərlə üzləşə bilərsiniz, yaxud da itirə biləcəyiniz ödəniş və balansları yenidən bərpa etməyiniz mümkün olmaya bilər. </string>
     <string name="PaymentsHomeFragment__activate">Aktivləşdir</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoin şərtlərinə bax</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Ödənişlər, Signal-da artıq əlçatmazdır. Yenə də bir birjaya pul köçürə bilərsiniz, ancaq ödəniş göndərə və ala və ya pul əlavə edə bilməzsiniz.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Ödənişlər, Molly-da artıq əlçatmazdır. Yenə də bir birjaya pul köçürə bilərsiniz, ancaq ödəniş göndərə və ala və ya pul əlavə edə bilməzsiniz.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">İcazələri aktivləşdir</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Tanıdığınız şəxslərə mesaj atmaqda sizə kömək etmək üçün Signal bu icazələri tələb edəcək. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Tanıdığınız şəxslərə mesaj atmaqda sizə kömək etmək üçün Molly bu icazələri tələb edəcək. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Bildirişlər</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Növbəti</string>
     <string name="PaymentsTransferFragment__invalid_address">Etibarsız ünvan</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Köçürmə etməyə cəhd etdiyiniz pulqabı ünvanını yoxlayıb yenidən sınayın.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Öz Signal pulqabı ünvanınıza köçürmə edə bilməzsiniz. Dəstəklənən bir birjada hesabınızda pulqabı ünvanınızı daxil edin.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Signal-ın, QR kodu skan etmək üçün kameraya müraciətinə ehtiyacı var.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal-ın, QR kodu skan etmək üçün kamera icazəsinə ehtiyacı var. Tənzimləmələrə gedin, \"İcazələr\"i seçib \"Kamera\"nı fəallaşdırın.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Signal-ın, QR kodu skan etmək üçün kameraya müraciətinə ehtiyacı var.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Öz Molly pulqabı ünvanınıza köçürmə edə bilməzsiniz. Dəstəklənən bir birjada hesabınızda pulqabı ünvanınızı daxil edin.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Molly-ın, QR kodu skan etmək üçün kameraya müraciətinə ehtiyacı var.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly-ın, QR kodu skan etmək üçün kamera icazəsinə ehtiyacı var. Tənzimləmələrə gedin, \"İcazələr\"i seçib \"Kamera\"nı fəallaşdırın.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Molly-ın, QR kodu skan etmək üçün kameraya müraciətinə ehtiyacı var.</string>
     <string name="PaymentsTransferFragment__settings">Tənzimləmələr</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Gələn Signal audio zəngi</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Gələn Molly audio zəngi</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Gələn Signal video zəngi</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Gələn Molly video zəngi</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Gələn Signal görüntülü zəngi</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Gələn Molly görüntülü zəngi</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Davam edən Signal audio zəngi</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Davam edən Molly audio zəngi</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Davam edən Signal video zəngi</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Davam edən Molly video zəngi</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Davam edən Signal qrup zəngi</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Davam edən Molly qrup zəngi</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Yüklənir…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Təsdiqlə</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Nüsxə parolunuzu uğurla daxil etdiniz</string>
     <string name="BackupDialog_passphrase_was_not_correct">Parol doğru deyil</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signal nüsxəsi yaradılır…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Molly nüsxəsi yaradılır…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Signal ehtiyat nüsxəsi yoxlanılır…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Molly ehtiyat nüsxəsi yoxlanılır…</string>
     <string name="LocalBackupJobApi29_backup_failed">Nüsxələnmədi</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Nüsxə kataloqunuz silindi və ya köçürüldü.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Nüsxə faylınız bu sürücüdə saxlanılmaq üçün çox böyükdür.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Mənə zəng et (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">(%1$02d:%2$02d) ərzində kodu yenidən göndər</string>
-    <string name="RegistrationActivity_contact_signal_support">Signal Dəstək komandası ilə əlaqə</string>
-    <string name="RegistrationActivity_code_support_subject">Signal Qeydiyyatı - Android üçün Təsdiqləmə Kodu</string>
+    <string name="RegistrationActivity_contact_signal_support">Molly Dəstək komandası ilə əlaqə</string>
+    <string name="RegistrationActivity_code_support_subject">Molly Qeydiyyatı - Android üçün Təsdiqləmə Kodu</string>
     <string name="RegistrationActivity_incorrect_code">Yanlış kod</string>
     <string name="BackupUtil_never">Heç vaxt</string>
     <string name="BackupUtil_unknown">Bilinmir</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Telefon nömrəsi</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Telefon nömrənizi görə biləcək və nömrəniz vasitəsilə Signal-da sizinlə əlaqə saxlaya biləcək şəxsləri seçin.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Telefon nömrənizi görə biləcək və nömrəniz vasitəsilə Molly-da sizinlə əlaqə saxlaya biləcək şəxsləri seçin.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Nömrəmi kim görə bilər?</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Həddindən çox cəhd etdiniz. Zəhmət olmasa daha sonra yenidən sınayın.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Xidmətə bağlanma xətası</string>
     <string name="preferences_chats__backups">Nüsxələr</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal kilidlənib</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly kilidlənib</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">KİLİDİ AÇMAQ ÜÇÜN TOXUNUN</string>
     <string name="Recipient_unknown">Bilinmir</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Köhnə cihazınıza müraciət etməlisiniz.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Nüsxədən geri yükləyin</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Mesajlarınızı yerli bir nüsxədən geri yükləyin. Əgər indi geri yükləməsəniz, daha sonra geri yükləyə bilməyəcəksiniz.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Yerli ehtiyat nüsxəni bərpa edin</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signal ehtiyat nüsxəsini bərpa et</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Bütün mətn mesajlarınızı + son 30 günə aid media fayllarınızı bərpa edin</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Daha çox seçim</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Ləğv et</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Köçürmədən daxil olun</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Mesajlarınızı və media fayllarını ötürmədən davam edin</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Köhnə Android cihazınızda Signal-ı açın</string>
     <string name="NewDeviceTransferInstructions__continue">Davam et</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Köhnə Android cihazınızla bağlantı qurmaq üçün hazırlanır…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Bir az gözləyin, tezliklə hazır olacaqsınız</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Köhnə Android cihazınızla bağlantı qurulması üçün gözlənilir…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal-ın, köhnə Android cihazını kəşf etmək və onunla bağlantı qurmaq üçün yerləşmə xidmətlərinə ehtiyacı var.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal-ın, köhnə Android cihazını kəşf etmək və onunla bağlantı qurmaq üçün yerləşmə xidmətlərinin fəallaşdırılmasına ehtiyacı var.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal-ın, köhnə Android cihazını kəşf etmək və onunla bağlantı qurmaq üçün \"Wi-Fi\"a ehtiyacı var. Wi-Fi açıq olmalıdır, ancaq hər hansısa bir Wi-Fi şəbəkəsi ilə bağlantı qurmağınıza ehtiyac yoxdur.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Təəssüf ki, bu cihazda Wi-Fi Direct dəstəklənmir. Signal, köhnə Android cihazını kəşf etmək və onunla bağlantı qurmaq üçün Wi-Fi Direct istifadə edir. Hesabınızı yeni Android cihazınızda geri yükləmək üçün hələ də bir nüsxə yarada bilərsiniz.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly-ın, köhnə Android cihazını kəşf etmək və onunla bağlantı qurmaq üçün yerləşmə xidmətlərinə ehtiyacı var.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly-ın, köhnə Android cihazını kəşf etmək və onunla bağlantı qurmaq üçün yerləşmə xidmətlərinin fəallaşdırılmasına ehtiyacı var.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly-ın, köhnə Android cihazını kəşf etmək və onunla bağlantı qurmaq üçün \"Wi-Fi\"a ehtiyacı var. Wi-Fi açıq olmalıdır, ancaq hər hansısa bir Wi-Fi şəbəkəsi ilə bağlantı qurmağınıza ehtiyac yoxdur.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Təəssüf ki, bu cihazda Wi-Fi Direct dəstəklənmir. Molly, köhnə Android cihazını kəşf etmək və onunla bağlantı qurmaq üçün Wi-Fi Direct istifadə edir. Hesabınızı yeni Android cihazınızda geri yükləmək üçün hələ də bir nüsxə yarada bilərsiniz.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Bir nüsxəni geri yüklə</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Köhnə Android cihazınızla bağlantı qurmağa cəhd edərkən gözlənilməz bir xəta baş verdi.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Yeni Android cihazı axtarılır…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal-ın, yeni Android cihazını kəşf etmək və onunla bağlantı qurmaq üçün yerləşmə xidmətlərinə ehtiyacı var.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal-ın, yeni Android cihazını kəşf etmək və onunla bağlantı qurmaq üçün yerləşmə xidmətlərinin fəallaşdırılmasına ehtiyacı var.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal-ın, yeni Android cihazını kəşf etmək və onunla bağlantı qurmaq üçün \"Wi-Fi\"a ehtiyacı var. Wi-Fi açıq olmalıdır, ancaq hər hansısa bir Wi-Fi şəbəkəsi ilə bağlantı qurmağınıza ehtiyac yoxdur.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Təəssüf ki, bu cihazda Wi-Fi Direct dəstəklənmir. Signal, yeni Android cihazını kəşf etmək və onunla bağlantı qurmaq üçün Wi-Fi Direct istifadə edir. Hesabınızı yeni Android cihazınızda geri yükləmək üçün hələ də bir nüsxə yarada bilərsiniz.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly-ın, yeni Android cihazını kəşf etmək və onunla bağlantı qurmaq üçün yerləşmə xidmətlərinə ehtiyacı var.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly-ın, yeni Android cihazını kəşf etmək və onunla bağlantı qurmaq üçün yerləşmə xidmətlərinin fəallaşdırılmasına ehtiyacı var.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly-ın, yeni Android cihazını kəşf etmək və onunla bağlantı qurmaq üçün \"Wi-Fi\"a ehtiyacı var. Wi-Fi açıq olmalıdır, ancaq hər hansısa bir Wi-Fi şəbəkəsi ilə bağlantı qurmağınıza ehtiyac yoxdur.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Təəssüf ki, bu cihazda Wi-Fi Direct dəstəklənmir. Molly, yeni Android cihazını kəşf etmək və onunla bağlantı qurmaq üçün Wi-Fi Direct istifadə edir. Hesabınızı yeni Android cihazınızda geri yükləmək üçün hələ də bir nüsxə yarada bilərsiniz.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Bir nüsxə yarat</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Yeni Android cihazınızla bağlantı qurmağa cəhd edərkən gözlənilməz bir xəta baş verdi.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Verilənlər köçürülür</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Hər iki cihazı bir-birinə yaxın saxlayın. Cihazları söndürməyin və Signal-ı açıq saxlayın. Köçürmə, bir ucdan digərinə kimi şifrəlidir.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Hər iki cihazı bir-birinə yaxın saxlayın. Cihazları söndürməyin və Molly-ı açıq saxlayın. Köçürmə, bir ucdan digərinə kimi şifrəlidir.</string>
     <string name="DeviceTransfer__d_messages_so_far">İndiyə qədər %1$d mesaj…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">İndiyə qədər mesajların %1$s%%-i…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Hesabın köçürülməsi</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Yeni Android cihazınızda Signal-ı endirin</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Yeni Android cihazınızda Molly-ı endirin</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"\"Hesabınızı köçürün və ya geri yükləyin\"ə toxunun"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Bu bağlantıya sahib olan hər kəs qrup adını və fotosunu görə, qoşulma tələbi göndərə bilər. Güvəndiyiniz şəxslərlə paylaşın.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Bu bağlantıya sahib olan hər kəs qrup adını və fotosunu görə, qrupa qoşula bilər. Güvəndiyiniz şəxslərlə paylaşın.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Signal ilə paylaş</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Molly ilə paylaş</string>
     <string name="GroupLinkBottomSheet_copy">Kopyala</string>
     <string name="GroupLinkBottomSheet_qr_code">QR Kodu</string>
     <string name="GroupLinkBottomSheet_share">Paylaş</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">MobileCoin haqqında</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin məxfiliyə əsaslanan yeni rəqəmsal pul vahididir.</string>
     <string name="payment_info_card_adding_funds">Pul əlavə etmə</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">MobileCoin-i pulqabı ünvanınıza göndərərək Signal-da istifadə etmək üçün pul əlavə edə bilərsiniz.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">MobileCoin-i pulqabı ünvanınıza göndərərək Molly-da istifadə etmək üçün pul əlavə edə bilərsiniz.</string>
     <string name="payment_info_card_cashing_out">Nağdlaşdırma</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">MobileCoin dəstəkləyən bir birjada istənilən vaxt MobileCoin-i nağdlaşdıra bilərsiniz. Sadəcə həmin birjadakı hesabınıza bir köçürmə edin.</string>
     <string name="payment_info_card_hide_this_card">Bu kart gizlədilsin?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Pulqabını deaktiv et</string>
     <string name="DeactivateWalletFragment__your_balance">Balansınız</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Ödənişləri qeyri-aktiv etməzdən əvvəl pulunuzu başqa bir pulqabı ünvanına köçürməniz məsləhət görülür. Pulunuzu indi köçürməməyi seçsəniz, ödənişləri yenidən aktivləşdirdiyiniz təqdirdə, pulunuz Signal-la əlaqələndirilmiş pulqabınızda qalacaq.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Ödənişləri qeyri-aktiv etməzdən əvvəl pulunuzu başqa bir pulqabı ünvanına köçürməniz məsləhət görülür. Pulunuzu indi köçürməməyi seçsəniz, ödənişləri yenidən aktivləşdirdiyiniz təqdirdə, pulunuz Molly-la əlaqələndirilmiş pulqabınızda qalacaq.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Qalan balansı köçür</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Köçürmə olmadan deaktiv et</string>
     <string name="DeactivateWalletFragment__deactivate">Deaktiv et</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Köçürmə olmadan deaktiv edilsin?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Ödənişləri yenidən aktivləşdirməyi seçsəniz, balansınız Signal-a əlaqələndirilmiş pulqabınızda qalacaq.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Ödənişləri yenidən aktivləşdirməyi seçsəniz, balansınız Molly-a əlaqələndirilmiş pulqabınızda qalacaq.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Pulqabını deaktiv edərkən xəta baş verdi.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Lisenziyalar</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Şərtlər və Gizlilik Siyasəti</string>
-    <string name="HelpFragment__copyright_signal_messenger">Signal Messenger müəllif hüquqları</string>
+    <string name="HelpFragment__copyright_signal_messenger">Molly Messenger müəllif hüquqları</string>
     <string name="HelpFragment__licenced_under_the_agplv3">GNU AGPLv3-ə uyğun şəkildə lisenziyalaşdırılıb</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Bir rəng seçin</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Paylaş</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Bu qrupa yalnız adminlər mesaj göndərə bilər.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Limitə çatıldı</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">5 çatdan çoxunu seçə bilməzsiniz</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Daha ətraflı</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Signal-ı yenilə</string>
+    <string name="UpdateSignalExpiredDialog__title">Molly-ı yenilə</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Signal-ın bu versiyasının vaxtı bitib. Signal-dan istifadəyə davam etmək üçün indi yeniləyin.</string>
+    <string name="UpdateSignalExpiredDialog__message">Molly-ın bu versiyasının vaxtı bitib. Molly-dan istifadəyə davam etmək üçün indi yeniləyin.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Yenilə</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Cihaz qeydiyyatdan keçməyib</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Bu cihaz artıq qeydiyyatda deyil. Bu cihazda Signal-dan istifadəyə davam etmək üçün təkrar qeydiyyatdan keçin.</string>
+    <string name="ReregisterSignalDialog__message">Bu cihaz artıq qeydiyyatda deyil. Bu cihazda Molly-dan istifadəyə davam etmək üçün təkrar qeydiyyatdan keçin.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Təkrar qeydiyyat</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Seçici, açılmadı.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Bildirişləri aktivləşdirmək üçün Signal onları ekranda göstərmə icazəsi tələb edir.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Bildirişləri aktivləşdirmək üçün Molly onları ekranda göstərmə icazəsi tələb edir.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Aç</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Hələ ki, cavab yoxdur</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Artıq bu qrupun üzvü olmadığınız üçün bu hekayəyə cavab verə bilmirsiniz.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Hekayəyə reaksiya verildi</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Hekayəyə reaksiya verildi</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Hekayəyə reaksiya verildi</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Baxış</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Bankınızı seçin</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">%1$s ilə etdiyiniz ianəni təsdiqləyin</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Təkrar ianənizi tənzimləmək məqsədilə bankınızla 0,01€ dəyərində ödənişi təsdiqləmək üçün \"davam et\" qutucuğuna toxunun. Bu məbləğ avtomatik olaraq geri qaytarılacaq və aylıq 5€ dəyərində ianənizin hesabınızdan tutulmasına imkan verəcək.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Təkrar ianənizi tənzimləmək məqsədilə bankınızla 0,01€ dəyərində ödənişi təsdiqləmək üçün \"davam et\" üzərinə toxunun. Bu məbləğ avtomatik olaraq geri qaytarılacaq və aylıq %1$s dəyərində ianənizin hesabınızdan tutulmasına imkan verəcək.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Davam et</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Ehtiyat nüsxə verilənləri endirilir…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Media fayl; ehtiyat nüsxələri qeyri-aktivdir</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Ödənişinizi emal edə bilmədiyimizə görə Signal media faylı üçün ehtiyat nüsxə planınız ləğv edilib. Ehtiyat nüsxənizdə saxlanılan istənilən media faylını endirmək üçün %1$d gün vaxtınız var. %1$d gündən sonra ehtiyat nüsxənizdəki media faylı silinəcək.</item>
+        <item quantity="other">Ödənişinizi emal edə bilmədiyimizə görə Signal media faylı üçün ehtiyat nüsxə planınız ləğv edilib. Ehtiyat nüsxənizdə saxlanılan istənilən media faylını endirmək üçün %1$d gün vaxtınız var. %1$d gündən sonra ehtiyat nüsxənizdəki media faylı silinəcək.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Bütün media fayllarınızın ehtiyat nüsxəsini çıxarmağa davam etmək üçün istənilən vaxt yenidən ehtiyat nüsxələr üçün ödəniş etməyə başlaya bilərsiniz. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Media faylınız bu gün silinəcək</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Ödənişinizi emal edə bilmədiyimizə görə Signal media faylı üçün ehtiyat nüsxə planınız ləğv edilib. Silinməzdən əvvəl ehtiyat nüsxənizdəki media faylını endirmək üçün bu son şansınızdır.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Endirməni tamamlamaq mümkün olmadı</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Cihazınızda kifayət qədər boş yer yoxdur. Ehtiyat nüsxənizdə saxlanılmış media faylını endirmək üçün %1$s həcmində yer boşaldın.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">\"Ötür\" seçimini etsəniz ehtiyat nüsxənizdəki media faylı %1$d günə silinəcək.</item>
+        <item quantity="other">\"Ötür\" seçimini etsəniz ehtiyat nüsxənizdəki media faylı %1$d günə silinəcək.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Ehtiyat nüsxə ödənişini emal etmək mümkün deyil</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Müntəzəm aylıq ehtiyat nüsxə ödənişinizi qəbul edərkən problem yaranır. Ödəniş metodunuzun aktual olduğundan əmin olun. Əgər deyilsə, onu Google Pay-dən yeniləyin. Signal ödənişi bir neçə gün içində yenidən emal etməyə çalışacaq.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Ehtiyat nüsxəni tamamlamaq mümkün olmadı</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Cihazınız %1$d günlük ehtiyat nüsxə çıxarılmasını tamamlamayıb. Cihazınızın wi-fi-a qoşulduğundan əmin olun və \"İndi ehtiyat nüsxə çıxar\" seçiminə toxunun. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Daha ətraflı</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Ötür</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Media faylını indi endir</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Daha sonra endir</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Media faylını endirmə</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Media faylınızı endirmək üçün %1$s həcmində yer boşaldın.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Kredit və ya debet kartı</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Bilinmir</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Ödəniş tarixçəsi</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Son ehtiyat nüsxəniz çıxarılıb: %1$s tarixi saat %2$s</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Seçilmiş vaxtdan daha köhnə mesajlar daimi olaraq silinəcək.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Seçilmiş limiti keçən mesajlar daimi olaraq silinəcək.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Əlaqələndirilmiş cihazlara limitlər tətbiq et</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Aktivləşdirildikdə, əlaqələndirilmiş cihazlarınızdan çat limitləri də mesajları siləcək.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Silmə funksiyası artıq bütün cihazlarınızla sinxronlaşdırılıb</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Mesajları və çatları sildiyiniz zaman onlar telefonunuzdan və əlaqələndirilmiş cihazlarınızdan da silinir.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">Oldu</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Ödəniş tarixçəsi</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Mətn və bütün medianın ehtiyat nüsxəsi</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Ödəniş təfsilatları</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Ehtiyat nüsxə növü</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Ödəniş tarixi</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Paylaş</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal ehtiyat nüsxələri</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Ödəniş tarixçəsi</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Ehtiyat nüsxənin təfərrüatları</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Ehtiyat nüsxənin həcmi</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Ehtiyat nüsxənin tezliyi</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Mobil cihazdan istifadə edərək ehtiyat nüsxə çıxarma</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Ehtiyat nüsxəni söndür və sil</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Ehtiyat nüsxə silindi və söndürüldü.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Ehtiyat nüsxə növü dəyişdirildi və abunəlik ləğv edildi</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Abunəlik ləğv edildi</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Endirmə tamamlandı</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Ehtiyat nüsxə növü</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Ehtiyat nüsxələr qeyri-aktivdir</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/aylıq</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Nüsxələməni fəallaşdır</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Son ehtiyat nüsxə</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s, %2$s radəsində</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Heç vaxt</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">İndi Arxivləşdir</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Ehtiyat nüsxələr söndürülərək silinsin?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Sizdən təkrar ödəniş tutulmayacaq. Ehtiyat nüsxəniz silinəcək və yeni ehtiyat nüsxələri yaradılmayacaq.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Söndür və sil</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Ehtiyat nüsxə silinir…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Ehtiyat nüsxə silindi</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"\"İndi ehtiyat nüsxə çıxar\" funksiyasına toxunun"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Gündəlik</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Həftəlik</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Aylıq</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Əllə ehtiyat nüsxə çıxarmaq üçün</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Cihazın PIN kodunu, parolunu və ya qrafik şifrəsini daxil edin.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Növbəti</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Ehtiyat nüsxə növünü dəyişin</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Abunəliyi ləğv et</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Ləğvetməni təsdiqlə</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Sizdən yenidən ödəniş tutulmayacaq. Faktura dövrünüzün sonunda ehtiyat nüsxələr qeyri-aktiv ediləcək. Bu tarixdən sonra hazırda ehtiyat nüsxəsini çıxardığınız media faylını endirmək üçün 30 gün vaxtınız olacaq.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Təsdiqlə və indi endir</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Təsdiqlə və daha sonra endir</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Abunəliyi saxla</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 9eda6b9bc8..5ecd1a36bb 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal се обновява…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly се обновява…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Все още не си задал/а парола!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Деактивирай паролата?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Това ще отключи изцяло всички известия за съобщения и Signal.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Това ще отключи изцяло всички известия за съобщения и Molly.</string>
     <string name="ApplicationPreferencesActivity_disable">Изключи</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Грешка при свързване със сървъра!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">ПИН кодовете са задължителни за регистрационното заключване. За да деактивирате ПИН кодовете, моля първо деактивирайте регистрационното заключване.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Файл</string>
     <string name="AttachmentKeyboard_contact">Контакт</string>
     <string name="AttachmentKeyboard_location">Местоположение</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal има нужда от разрешение, за да показва вашите снимки и видеа</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly има нужда от разрешение, за да показва вашите снимки и видеа</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Разреши достъп</string>
     <string name="AttachmentKeyboard_payment">Плащане</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Неуспешно откриване на папка за избор на файл.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal се нуждае от достъп до вградения диск, за да може да прикачва снимки, видеа или аудио, но той му е отказан. Моля, отидете в настройки в менюто и изберете \"Разрешения\" и \"Дискове\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal се нуждае от достъп до контактите Ви, за да може да прикачва информация за тях, но той му е отказан. Моля, отидете на настройки в менюто и изберете \"Разрешения\" и \"Контакти\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal се нуждае от достъп до местоположението Ви, за да може да го прикачва, но той му е отказан. Моля, отидете на настройки в менюто и изберете \"Разрешения\" и \"Местоположение\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly се нуждае от достъп до вградения диск, за да може да прикачва снимки, видеа или аудио, но той му е отказан. Моля, отидете в настройки в менюто и изберете \"Разрешения\" и \"Дискове\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly се нуждае от достъп до контактите Ви, за да може да прикачва информация за тях, но той му е отказан. Моля, отидете на настройки в менюто и изберете \"Разрешения\" и \"Контакти\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly се нуждае от достъп до местоположението Ви, за да може да го прикачва, но той му е отказан. Моля, отидете на настройки в менюто и изберете \"Разрешения\" и \"Местоположение\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Разрешете достъп до вашето местоположение</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">За да изпратите местоположението си:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Позволете достъп на Signal, за да изпрати вашето местоположение.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Позволете достъп на Molly, за да изпрати вашето местоположение.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal се нуждае от достъп до местоположението, за да изпрати вашето местоположение.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly се нуждае от достъп до местоположението, за да изпрати вашето местоположение.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Разрешаване на достъп до хранилището</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">За показване на снимки и видеа:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal има нужда от достъп до хранилището, за да показва вашите снимки и видеа.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly има нужда от достъп до хранилището, за да показва вашите снимки и видеа.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s няма активирани Плащания </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Смяна на камерата</string>
     <string name="CameraXFragment_open_gallery_description">Отвори галерията</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Разрешаване на достъп</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Разрешаване на достъп до камерата и микрофона ви</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Разрешаване на достъп до камерата ви</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Разрешаване на достъп до микрофона ви</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">За да правите снимки, разрешете на Signal достъп до камерата.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">За да прави снимки и видеа, Signal се нуждае от достъп до камерата ви.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">За да правите снимки и видеоклипове, разрешете на Signal достъп до камерата и микрофона.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">За да снимате видеоклипове със звук, разрешете на Signal достъп до вашия микрофон.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">За да сканирате QR код, разрешете на Signal достъп до камерата.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal се нуждае от достъп до камерата, за да прави снимки</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal се нуждае от достъп до камерата, за да сканира QR кодове</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal се нуждае от достъп до микрофона, за да заснема видео</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">За да правите снимки в Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">За да правите снимки и видеоклипове в Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">За да снимате видеоклипове със звук:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">За сканиране на QR кодове:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Последни контакти</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Няма Signal контакти</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Може да използваш камера бутона за изпращане на снимки до Signal контактите. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Не откирваш това, което търсиш?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Покани контакт да се присъедини в Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Покани контакт да се присъедини в Molly</string>
     <string name="CameraContacts__menu_search">Търсене</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Не, благодаря</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Обновяване на Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Обновяване на Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Тази версия на приложението вече не е поддъражана. За да продължите да изпращате и получавате съобщения, обновете приложението до най-новата версия.</string>
     <string name="ClientDeprecatedActivity_update">Обновяване</string>
     <string name="ClientDeprecatedActivity_dont_update">Не обновявай</string>
     <string name="ClientDeprecatedActivity_warning">Внимание</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Версията ви на Signal е изтекла. Ще можете да преглеждате старите си съобщения, но няма да може да изпращате и получавате нови, докато не обновите приложението.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Версията ви на Molly е изтекла. Ще можете да преглеждате старите си съобщения, но няма да може да изпращате и получавате нови, докато не обновите приложението.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Не е открит уеб браузър.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Съобщение %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Гласово обаждане в Molly до %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Видео обаждане в Molly до %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Съобщение в Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Изпрати съобщение</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Да преминем към Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Да преминем към Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Моля, избери контакт</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Размерът на прикачения файл надминава допустимия лимит за типа съобщение, който изпращате.</string>
     <string name="ConversationActivity_unable_to_record_audio">Не може да бъде записано аудио!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">За да изпращате аудио съобщения:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">За да изпращате гласови съобщения, разрешете на Signal достъп до вашия микрофон.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">За да изпращате гласови съобщения, разрешете на Molly достъп до вашия микрофон.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal се нуждае от достъп до микрофона за запис на гласово съобщение.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal се нуждае от достъп до микрофона Ви, за да може да изпраща аудио съобщения, но той му е отказан. Моля, отидете в настройки в менюто и изберете \"Разрешения\" и \"Микрофон\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly се нуждае от достъп до микрофона за запис на гласово съобщение.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly се нуждае от достъп до микрофона Ви, за да може да изпраща аудио съобщения, но той му е отказан. Моля, отидете в настройки в менюто и изберете \"Разрешения\" и \"Микрофон\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal се нуждае от достъп до микрофона и камерта Ви, за да може да се обади на %1$s, но той му е отказан. Моля, отидете на настройки в менюто и изберете \"Разрешения\", \"Микрофон\" и \"Камера\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">За да прави снимки и видеа, Signal се нуждае от достъп до камерта Ви.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal се нуждае от достъп до камерта Ви, за да може да прави снимки или видеа, но той му е отказан. Моля, отидете в настройки в менюто и изберете \"Разрешения\" и \"Камера\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal се нуждае от достъп до камерата, за да прави снимки и видеа</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly се нуждае от достъп до микрофона и камерта Ви, за да може да се обади на %1$s, но той му е отказан. Моля, отидете на настройки в менюто и изберете \"Разрешения\", \"Микрофон\" и \"Камера\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">За да прави снимки и видеа, Molly се нуждае от достъп до камерта Ви.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly се нуждае от достъп до камерта Ви, за да може да прави снимки или видеа, но той му е отказан. Моля, отидете в настройки в менюто и изберете \"Разрешения\" и \"Камера\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly се нуждае от достъп до камерата, за да прави снимки и видеа</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Разреши използването на микрофона, за правене на видео със звук.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal се нуждае от достъп за правене на видеа, но той е отказан. Моля, отидете в настройки и изберете \"Достъп\" и активирайте \"Микрофон\" и \"Камера\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal се нуждае от достъп до микрофона за записване на видеа.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly се нуждае от достъп за правене на видеа, но той е отказан. Моля, отидете в настройки и изберете \"Достъп\" и активирайте \"Микрофон\" и \"Камера\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly се нуждае от достъп до микрофона за записване на видеа.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Не</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">За да започнете разговор:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">За да започнете разговор, разрешете на Signal достъп до вашия микрофон.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">За да започнете разговор, разрешете на Molly достъп до вашия микрофон.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal се нуждае от достъп до микрофона, за да започнете разговор.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly се нуждае от достъп до микрофона, за да започнете разговор.</string>
 
 
     <string name="ConversationActivity_join">Присъедини се</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Signal вече не поддържа SMS съобщения. Поканете %1$s в Signal, за да продължите разговора тук.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Този човек вече не използва Signal. Поканете го в Signal, за да продължите разговора тук.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Този човек вече не използва Molly. Поканете го в Molly, за да продължите разговора тук.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Покани в Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Покани в Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Скоро ще получите ново напомняне.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Изтриване за всички</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Изтриване от това устройство</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Изтриване</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Изтриване навсякъде</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Това съобщение ще бъде изтрито за всички в чата, ако ползват скорошна версия на Signal. Те ще виждат, че сте изтрили съобщение.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Блокирана</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Обновяване на Signal</string>
+    <string name="ConversationFragment__update_build">Обновяване на Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Пререгистриране на Signal</string>
+    <string name="ConversationFragment__reregister_signal">Пререгистриране на Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Връщане обратно.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Отворете Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Отворете Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Вече няма потвърждение</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Това ще изтрие избрания чат перманентно.</item>
         <item quantity="other">Това ще изтрие всичките %1$d избрани чата перманентно.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Това ще изтрие перманентно избрания чат от всички ваши устройства.</item>
+        <item quantity="other">Това ще изтрие перманентно всичките %1$d избрани чата от всички ваши устройства.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Изтриване</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Изтриване на избрания чат…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Кой може да ме намери с телефонен номер?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Всеки, който има телефонния ви номер, ще вижда, че сте в Signal и ще може да започне чат с вас.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Всеки, който има телефонния ви номер, ще вижда, че сте в Molly и ще може да започне чат с вас.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Никой няма да може да види, че сте в Signal, освен ако не му изпратите съобщение или вече нямате съществуващ чат с него.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Никой няма да може да види, че сте в Molly, освен ако не му изпратите съобщение или вече нямате съществуващ чат с него.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Възстановяване от архива?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Тествай паролата си за архивите и провери дали е правилна.</string>
     <string name="BackupsPreferenceFragment__turn_on">Включи</string>
     <string name="BackupsPreferenceFragment__turn_off">Изключи</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"За да възстановиш архива, инсталирай ново копие на Signal. Отвори приложението и натисни \"Възстановяване на архив\", след това избери файла с архива.%1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"За да възстановиш архива, инсталирай ново копие на Molly. Отвори приложението и натисни \"Възстановяване на архив\", след това избери файла с архива.%1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Научете повече</string>
     <string name="BackupsPreferenceFragment__in_progress">Архивира се…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d архивирани до тук…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% дотук…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal изисква разрешение за достъп до външните хранилища, за да може да създаде архиви, но този достъп е парманентно отказан. Моля, продължете до настройки на приложенията и изберете \"Разрешения\" и активирайте \"Хранилище\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly изисква разрешение за достъп до външните хранилища, за да може да създаде архиви, но този достъп е парманентно отказан. Моля, продължете до настройки на приложенията и изберете \"Разрешения\" и активирайте \"Хранилище\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Задаване на час за архивиране</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Чат сесията е презаредена</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal използва криптиране от край до край и понякога трябва да презареди вашата чат сесия. Това не оказва влияние на сигурността на чата, но е възможно да пропуснете съобщение от този контакт и да се наложи да го помолите да го изпрати отново.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly използва криптиране от край до край и понякога трябва да презареди вашата чат сесия. Това не оказва влияние на сигурността на чата, но е възможно да пропуснете съобщение от този контакт и да се наложи да го помолите да го изпрати отново.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Използвайте Signal на компютър или iPad. Съобщенията ви ще се синхронизират с вашите свързани устройства.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Свързване на ново устройство</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Съобщенията и информацията за чатовете са защитени чрез криптиране от край до край на всички устройства</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal на компютър или iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Всички съобщения на свързаните устройства са поверителни</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Съобщенията в Molly се синхронизират със Molly на мобилния ви телефон, след като бъде свързан. Предходната история на съобщенията ви няма да се появи.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">На другото си устройство посетете %1$s, за да инсталирате Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Моите свързани устройства</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Премахнете</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">Връзката с %1$s е прекъсната</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Свързване с устройството…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Устройството е одобрено</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Зареждане…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Няма свързани устройства</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Отключете, за да свържете устройство</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Сканирайте QR кода, показан на устройството, за да го свържете.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Сканирайте QR Код</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">С това устройство сканирайте QR кода на устройството, което искате да свържете</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Добре</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Това устройство ще може да вижда вашите групи и контакти, да има достъп до вашите чатове и да изпраща съобщения от ваше име.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Довършете свързването на другото ви устройство</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Довършете свързването на Molly на другото ви устройство.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Свързването на устройство се провали</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Този QR код е невалиден. Моля, проверете дали сканирате QR кода, показан на устройството, което искате да свържете.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Опитайте отново</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Премахни връзката \'%1$s\'?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Оптимизиране за липсващи Play услуги</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Това устройство не поддържа Play услуги. Натиснете, за да изключите оптимизациите на батерията, за да преустановите опитите на Signal да изтегля съобщения, когато не е активен.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Това устройство не поддържа Play услуги. Натиснете, за да изключите оптимизациите на батерията, за да преустановите опитите на Molly да изтегля съобщения, когато не е активен.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Тази версия на Signal е изтекла. Обновете сега, за да можете да получавате и изпращате съобщения.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Тази версия на Molly е изтекла. Обновете сега, за да можете да получавате и изпращате съобщения.</string>
     <string name="ExpiredBuildReminder_update_now">Обнови сега</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Преглед</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Перманентна Signal комуникационна грешка!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal не успя да се регистрира с Google Play Services. Signal съобщения и разговори са деактивирани, моля пререгистрирайте през менюто Настройки &gt; Допълнителни.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Перманентна Molly комуникационна грешка!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly не успя да се регистрира с Google Play Services. Molly съобщения и разговори са деактивирани, моля пререгистрирайте през менюто Настройки &gt; Допълнителни.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Докладите за грешка ни помагат да диагностицираме и коригираме проблема и не съдържат идентифицираща информация.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal срещна проблем. Желаете ли да изпратите доклад за грешка?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly срещна проблем. Желаете ли да изпратите доклад за грешка?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Известията може да се забавят поради оптимизации на батерията</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Можете да деактивирате оптимизирането на батерията за Signal, за да сте сигурни, че известията за съобщения няма да се забавят.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Можете да деактивирате оптимизирането на батерията за Molly, за да сте сигурни, че известията за съобщения няма да се забавят.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Известията може да се забавят поради оптимизации на батерията</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Деактивирайте оптимизирането на батерията за Molly, за да сте сигурни, че известията за съобщения няма да се забавят. Докоснете „Продължи“, за да видите инструкции за конкретното устройство.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Не, благодаря</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Продължаване</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Продължете</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Отказ</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Не, благодаря</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Изчакващи покани за група</string>
+    <string name="PendingMembersActivity_pending_group_invites">Заявки и покани</string>
     <string name="PendingMembersActivity_requests">Заявки</string>
     <string name="PendingMembersActivity_invites">Покани</string>
     <string name="PendingMembersActivity_people_you_invited">Поканени от вас хора</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Отказ</string>
     <string name="InviteActivity_sending">Изпращане…</string>
     <string name="InviteActivity_invitations_sent">Поканите изпратени!</string>
-    <string name="InviteActivity_invite_to_signal">Покани в Signal</string>
+    <string name="InviteActivity_invite_to_signal">Покани в Molly</string>
     <string name="InviteActivity_send_sms">Изпрати SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Изпащане на %1$d SMS покана?</item>
         <item quantity="other">Изпащане на %1$d SMS покани?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Да преминем към Signal %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Да преминем към Molly %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Изглежда нямате приложения, с които да можете да споделите.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Вашето съобщение</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Връзката във фонов режим е активирана</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Отговори</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Установяване на Signal разговор</string>
+    <string name="NotificationBarManager__establishing_signal_call">Установяване на Molly разговор</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Стартиране на услугата за разговори на Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Спиране на услугата за разговори на Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Стартиране на услугата за разговори на Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Спиране на услугата за разговори на Molly</string>
     <string name="NotificationBarManager__cancel_call">Прекратяване на обаждането</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Вие активирахте Плащания</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s вече може да приема Плащания</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Подробностите за плащане не са налични</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Докоснете за още</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Подробностите за плащане не са налични</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Подробностите за това плащане не са налични, защото вашите съобщения са възстановени от източник, който не съдържа тази хронология на плащанията. Това не засяга баланса в портфейла ви или състоянието на минали плащания.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Скоро вече няма да може да изпращате SMS съобщения от Signal. Поканете %1$s в Signal, за да продължите разговора тук.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Вече не можете да изпращате SMS съобщения в Signal. Поканете %1$s в Signal, за да продължите разговора тук.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Вече не можете да изпращате SMS съобщения в Molly. Поканете %1$s в Molly, за да продължите разговора тук.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Плащане: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Плащане</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Докладван спам</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Свързване със Signal устройство?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Изглежда се опитвате да свържете Signal устройство с външна скенер програма. За Ваша сигурност, моля сканирайте кода повторно, използвайки Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal се нуждае от достъп до камерата Ви, за да може да сканирва QR кодове, но той му е отказан. Моля, отидете на настройки в менюто и изберете \"Разрешения\" и \"Камера\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly се нуждае от достъп до камерата Ви, за да може да сканирва QR кодове, но той му е отказан. Моля, отидете на настройки в менюто и изберете \"Разрешения\" и \"Камера\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Неуспешно сканиране на QR код без разрешение за достъп до камерата</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Въведете паролата</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal икона</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly икона</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Задай паролата</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Грешна парола!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Отключи Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Заключен екран</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Отключи Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Заключен екран</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Карта</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Потвърдете, за да продължите да пишете</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">С цел да преотвратим спам в Signal, моля потвърдете.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">С цел да преотвратим спам в Molly, моля потвърдете.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">След потвърждение ще можете да продължите да пишете. Всички задържани съобщения ще бъдат автоматично изпратени.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Моята история</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal обаждане</string>
+    <string name="Recipient_signal_call">Molly обаждане</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Блокиране</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Звъни…</string>
     <string name="RedPhone_busy">Зает</string>
     <string name="RedPhone_recipient_unavailable">Получателят не е на линия</string>
-    <string name="RedPhone_network_failed">Грешка в мрежата!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Грешка в мрежата! Моля, проверете мрежовата си връзка и опитайте отново.</string>
     <string name="RedPhone_number_not_registered">Номерът не е регистриран!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Набраният от вас номер не поддържа криптирани обаждания!</string>
     <string name="RedPhone_got_it">Ясно</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Докоснете тук, за да включите вашето видео</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">За да се обадите на %1$s, Signal се нуждае от достъп до вашата камера</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">За да се обадите на %1$s, Molly се нуждае от достъп до вашата камера</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Обаждане</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Повторно свързване…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Премахнати от повикването</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Някой ви премахна от повикването.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Разрешаване на достъп до камерата и микрофона ви</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Разрешаване на достъп до микрофона ви</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Разрешаване на достъп до камерата ви</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">За да започнете или да се присъедините към разговор, разрешете на Molly достъп до вашите камера и микрофон.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">За да започнете или да се присъедините към разговор, разрешете на Molly достъп до вашия микрофон.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">За да активирате вашето видео, разрешете на Molly достъп до камерата ви.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly има нужда от разрешенията за микрофона, за да можете да започнете или да се присъедините към разговор.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly се нуждае от достъп до камерата, за да активира вашето видео</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">За да започнете или да се присъедините към разговор:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">За да активирате вашето видео:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Повикване в Signal</string>
-    <string name="WebRtcCallView__signal_video_call">Видео разговор чрез Signal</string>
+    <string name="WebRtcCallView__signal_call">Повикване в Molly</string>
+    <string name="WebRtcCallView__signal_video_call">Видео разговор чрез Molly</string>
     <string name="WebRtcCallView__start_call">Започни разговор</string>
     <string name="WebRtcCallView__join_call">Присъеди се към разговор</string>
     <string name="WebRtcCallView__call_is_full">Обаждането е пълно</string>
@@ -2028,24 +2132,43 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Сваляте ли ръка?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Свалете ръка</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Сваляне</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Отказ</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Вие вдигнахте ръка</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Преглед</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s вдигна ръка</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s вдигнахте ръка</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + още %2$d вдигнахте ръка</item>
+        <item quantity="other">%1$s + още %2$d вдигнахте ръка</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s вдигна ръка</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + още %2$d вдигнаха ръка</item>
         <item quantity="other">%1$s + още %2$d вдигнаха ръка</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
-        <item quantity="one">%1$s</item>
-        <item quantity="other">%1$s + %2$d</item>
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s +%2$d</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
+        <item quantity="one">%1$s +%2$d</item>
+        <item quantity="other">%1$s +%2$d</item>
     </plurals>
 
     <!-- An accessibility label for screen readers on a view that can be expanded -->
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Ще получите обаждане, за да потвърдите този номер.</string>
     <string name="RegistrationActivity_edit_number">Редакция на номер</string>
     <string name="RegistrationActivity_missing_google_play_services">Google Play Services не са налични</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">На това устройство няма Google Play Services. Пак можете да използвате Signal, но тази конфигурация може да доведе до влошена надеждност или производителност.\n\nАко не сте напреднали потребители, не използвате модифицирана версия на Android или смятате, че виждате това съобщение по погрешка, моля, свържете се със support@signal.org за помощ.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">На това устройство няма Google Play Services. Пак можете да използвате Molly, но тази конфигурация може да доведе до влошена надеждност или производителност.\n\nАко не сте напреднали потребители, не използвате модифицирана версия на Android или смятате, че виждате това съобщение по погрешка, моля, свържете се със support@molly.im за помощ.</string>
     <string name="RegistrationActivity_i_understand">Разбирам</string>
     <string name="RegistrationActivity_play_services_error">Грешка с Play Services</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services се обновяват или временно не са достъпни. Моля, опитайте отново.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Нестандартен формат на номера</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Въведеният от вас номер (%1$s) изглежда е в нестандартен формат.\n\nДа нямате предвид %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android – Формат на телефонен номер</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android – Формат на телефонен номер</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Поискано повикване</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Имате затруднения с регистрирането?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Уверете се, че телефонът ви има обхват, за да получите SMS или обаждане\n • Потвърдете, че можете да получавате телефонни обаждания до номера\n • Проверете дали сте въвели телефонния си номер правилно.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">За повече информация, следвайте тези стъпки за отстраняване на неизправности или се свържете с поддръжката ни</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">За повече информация, моля, следвайте %1$s или %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">тези стъпки за отстраняване на неизправности</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Добавяне към контакти</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Покани в Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Покани в Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Съобщение в Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal обаждане</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Добавяне към контакти</string>
-    <string name="SharedContactView_invite_to_signal">Покани в Signal</string>
+    <string name="SharedContactView_invite_to_signal">Покани в Molly</string>
     <string name="SharedContactView_message">Съобщение в Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s принадлежи на %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Обновление на Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Има нова версия на Signal. Докоснете за актуализиране.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal не успя да се актуализира</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Обновление на Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Има нова версия на Molly. Докоснете за актуализиране.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly не успя да се актуализира</string>
     <string name="ApkUpdateNotifications_failed_general_body">Ще опитаме отново по-късно.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal е актуализиран успешно</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly е актуализиран успешно</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Получихте автоматична актуализация до версия %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Нашите Signal числа за сигурност:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Изглежда нямате приложения, с които да можете да споделите.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Не са открити копирани числа за сигурност</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal се нуждае от достъп до камерата Ви, за да може да сканира QR кодове, но той му е отказан. Моля, отидете на настройки в менюто и изберете \"Разрешения\" и \"Камера\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly се нуждае от достъп до камерата Ви, за да може да сканира QR кодове, но той му е отказан. Моля, отидете на настройки в менюто и изберете \"Разрешения\" и \"Камера\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Неуспешно сканиране на QR код без разрешение за достъп до камерата</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Първо трябва да обменяте съобщения, за да видите %1$s номер за безопасност.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Натиснете за отворяне.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal е отключен</string>
-    <string name="KeyCachingService_lock">Заключване на Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly е отключен</string>
+    <string name="KeyCachingService_lock">Заключване на Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Ти</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Неподдържан медиен формат.</string>
     <string name="MediaPreviewActivity_draft">Чернова</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal се нуждае от достъп до вградения диск, за да може да запазва на него, но той му е отказан. Моля, отидете в настройки в менюто и изберете \"Разрешения\" и \"Дискове\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly се нуждае от достъп до вградения диск, за да може да запазва на него, но той му е отказан. Моля, отидете в настройки в менюто и изберете \"Разрешения\" и \"Дискове\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Неуспешно запазване на външен диск без нужното разрешение за достъп</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Изтриване на съобщението?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Това ще изтрие перманентно текущото съобщение.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Неуспешно изпращане на съобщението.</string>
     <string name="MessageNotifier_error_delivering_message">Грешка при изпращането на съобщението</string>
     <string name="MessageNotifier_message_delivery_paused">Съобщението е задържано.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Потвърдете, за да продължите да ползвате Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Потвърдете, за да продължите да ползвате Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Всички са прочетени</string>
     <string name="MessageNotifier_mark_read">Прочетено</string>
     <string name="MessageNotifier_turn_off_these_notifications">Изключете тези известия</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Реагира с %1$s на вашия стикер.</string>
     <string name="MessageNotifier_this_message_was_deleted">Това съобщение беше изтрито.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Да се изключат ли известията за присъединения на контакти към Signal? Можете да ги активирате отново в Signal &gt; Настройки &gt; Известия.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Да се изключат ли известията за присъединения на контакти към Molly? Можете да ги активирате отново в Molly &gt; Настройки &gt; Известия.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Бърз отговор не е възможен, когато Signal е заключен!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Бърз отговор не е възможен, когато Molly е заключен!</string>
     <string name="QuickResponseService_problem_sending_message">Проблем при изпращане на съобщение!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Невалидна препратка</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Ново съобщение</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Заявка за съобщение</string>
     <string name="SingleRecipientNotificationBuilder_you">Ти</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Това устройство вече не е регистрирано. Вероятно е така, защото сте регистрирали телефонния си номер за Signal на друго устройство.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Това устройство вече не е регистрирано. Вероятно е така, защото сте регистрирали телефонния си номер за Molly на друго устройство.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Пререгистриране на устройство</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">За да отговорите на повикването, дайте на Signal достъп до микрофона си.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">За да отговорите на повикването, дайте на Molly достъп до микрофона си.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">За да отговорите на видео повикването, дайте достъп на Signal до микрофона и камерата ви.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal се нуждае от достъп до микрофона и камерта Ви, за да може да получава обаждания, но той му е отказан. Моля, отидете на настройки в менюто и изберете \"Разрешения\", \"Микрофон\" и \"Камера\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">За да отговорите на видео повикването, дайте достъп на Molly до микрофона и камерата ви.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly се нуждае от достъп до микрофона и камерта Ви, за да може да получава обаждания, но той му е отказан. Моля, отидете на настройки в менюто и изберете \"Разрешения\", \"Микрофон\" и \"Камера\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Отговорено на свързано устройство.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Отказано на свързано устройство.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Сигнал заетo на свързано устройство.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Повторете новата парола</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Покани в Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Покани в Molly</string>
     <string name="contact_selection_activity__new_group">Нова група</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Опресняване на контактите</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Някой липсва? Пробвайте да опресните</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Намирайте хора, които познавате, в Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Разрешаване на достъп до вашите контакти</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Още</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Снимка на Контакта</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal се нуждае от достъп до контактите Ви, за да може да Ви ги показва, но той му е отказан. Моля, отидете на настройки в менюто и изберете \"Разрешения\" и \"Контакти\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly се нуждае от достъп до контактите Ви, за да може да Ви ги показва, но той му е отказан. Моля, отидете на настройки в менюто и изберете \"Разрешения\" и \"Контакти\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Грешка при получаване на конатактите, моля, проверете мобилната връзка</string>
     <string name="ContactSelectionListFragment_username_not_found">Потребителското име не е намерено</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" не е потребител на Signal. Моля, проверете потребителското име и опитайте отново."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Намиране по потребителско име</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Разрешаване на достъп до контактите</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">За да намерите хора, които познавате, в Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Разрешаване на достъп</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Не, благодаря</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Разрешете достъп до вашите контакти. Вашите контакти са криптирани и не се виждат от услугата Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal се нуждае от достъп до контактите Ви, за да може да ги покаже.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly се нуждае от достъп до контактите Ви, за да може да ги покаже.</string>
     <string name="contact_selection_list_fragment__show_contacts">Показване на контактите</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Вие сте премахнали този човек, ако отново му изпратите съобщение, ще го добавите обратно към списъка си.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Опции</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Обновяване</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Пусни … Пауза</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Балончетата са функция на Android, която можете да изключите за чатовете в Signal.</string>
+    <string name="BubbleOptOutTooltip__description">Балончетата са функция на Android, която можете да изключите за чатовете в Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Не сега</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Описание на група</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Обновяване на Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Обновяване на Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Тази версия на Signal е изтекла. Актуализирайте сега, за да продължите да използвате Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Тази версия на Molly е изтекла. Актуализирайте сега, за да продължите да използвате Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Обновяване</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Бавно</string>
     <string name="preferences__help">Помощ</string>
     <string name="preferences__advanced">Допълнителни</string>
-    <string name="preferences__donate_to_signal">Дарете на Signal</string>
+    <string name="preferences__donate_to_signal">Дарете на Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Поверителност</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Промяна на иконата и името на приложението на „%1$s“</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal ще трябва да се затвори, за да промените иконата и името на приложението. Известията винаги ще показват иконата и името на Signal по подразбиране.</string>
+    <string name="preferences__app_icon_dialog_description">Molly ще трябва да се затвори, за да промените иконата и името на приложението. Известията винаги ще показват иконата и името на Molly по подразбиране.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Изберете икона и име на приложението, които ще се виждат на началния екран и в чекмеджето за приложения на телефона ви. Известията винаги ще показват иконата и името на Signal по подразбиране. Научете повече</string>
+    <string name="preferences__app_icon_warning_learn_more">Изберете икона и име на приложението, които ще се виждат на началния екран и в чекмеджето за приложения на телефона ви. Известията винаги ще показват иконата и името на Molly по подразбиране. Научете повече</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Иконите и имената на приложението се виждат на началния екран и в чекмеджето с приложения.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Известията винаги ще показват иконата и името на Signal по подразбиране.</string>
+    <string name="preferences__app_icon_notification_warning">Известията винаги ще показват иконата и името на Molly по подразбиране.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Научете повече</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Това ще скъси за постоянно всички чатове до последните %1$s най-нови съобщения.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Това ще изтрие завинаги цялата история на съобщенията и медиите от вашето устройство.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Това ще изтрие перманентно цялата история на съобщенията и мултимедията от това устройство и всички свързани устройства.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Наистина ли искате да изтриете цялата история на съобщенията?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Цялата история на съобщенията ще бъде завинаги изтрита. Това действие не може да бъде отменено.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Цялата история на съобщенията ще бъде изтрита перманентно. Това действие не може да бъде върнато назад.</string>
     <string name="preferences_storage__delete_all_now">Изтриване на всички сега</string>
     <string name="preferences_storage__forever">Завинаги</string>
     <string name="preferences_storage__one_year">1 година</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Заобикаляне на цензурата</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Заобикаляне на цензурата</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Ако е активирано, Signal ще се опита да заобиколи цензурата. Не разрешавайте тази функция, освен ако не сте на място, където Signal е цензуриран.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Ако е активирано, Molly ще се опита да заобиколи цензурата. Не разрешавайте тази функция, освен ако не сте на място, където Molly е цензуриран.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Заобикалянето на цензурата е активирано въз основа на телефонния номер на профила Ви.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Представяме плащания</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Ползвайте Signal за изпращане и получаване на MobileCoin – нова цифрова валута с фокус върху поверителността. Активирайте, за да започнете.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Ползвайте Molly за изпращане и получаване на MobileCoin – нова цифрова валута с фокус върху поверителността. Активирайте, за да започнете.</string>
     <string name="PaymentsHomeFragment__activate_payments">Включете Плащания</string>
     <string name="PaymentsHomeFragment__activating_payments">Включване на плащания…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Възтановете акаунт за плащания</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Плащания не са налични във вашия регион.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Не успяхме да включим плащания. Опитайте пак по-късно.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Да изключим плащания?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Няма да можете да изпращате или получавате MobileCoin в Signal ако изключите плащания.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Няма да можете да изпращате или получавате MobileCoin в Molly ако изключите плащания.</string>
     <string name="PaymentsHomeFragment__deactivate">Изключи</string>
     <string name="PaymentsHomeFragment__continue">Продължи</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">В момента балансът не е достъпен.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Подробности</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Можете да използвате Signal за изпращане и получаване на MobileCoin. Всички плащания се ръководят от Условията за употреба на MobileCoins и Портфейла за MobileCoin. Може да срещнете проблеми и плащанията или балансите, които евентуално изгубите, няма да могат да бъдат възстановени. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Можете да използвате Molly за изпращане и получаване на MobileCoin. Всички плащания се ръководят от Условията за употреба на MobileCoins и Портфейла за MobileCoin. Може да срещнете проблеми и плащанията или балансите, които евентуално изгубите, няма да могат да бъдат възстановени. </string>
     <string name="PaymentsHomeFragment__activate">Включи</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Вижте условията на MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Функцията за плащания в Signal вече не е налична. Пак можете да прехвърляте средства към борса, но вече не можете да изпращате и получавате плащания или да добавяте средства.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Функцията за плащания в Molly вече не е налична. Пак можете да прехвърляте средства към борса, но вече не можете да изпращате и получавате плащания или да добавяте средства.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Позволяване на разрешения</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">За да ви помага да изпращате съобщения до хората, които познавате, Signal ще поиска тези разрешения. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">За да ви помага да изпращате съобщения до хората, които познавате, Molly ще поиска тези разрешения. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Известия</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Напред</string>
     <string name="PaymentsTransferFragment__invalid_address">Невалиден адрес</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Проверете адреса на портфейла, до който се опитвате да прехвърлите, и опитайте отново.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Не можете да прехвърлите към адреса на своя собствен портфейл в Signal. Въведете адреса на портфейл от акаунта си в поддържана борса.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">За да сканира QR код, Signal има нужда от достъп до камерата.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal се нуждае от разрешението за „Камера“, за да улови QR код. Отидете в настройките, изберете „Разрешения“ и активирайте „Камера“.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">За да сканира QR код, Signal има нужда от достъп до камерата.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Не можете да прехвърлите към адреса на своя собствен портфейл в Molly. Въведете адреса на портфейл от акаунта си в поддържана борса.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">За да сканира QR код, Molly има нужда от достъп до камерата.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly се нуждае от разрешението за „Камера“, за да улови QR код. Отидете в настройките, изберете „Разрешения“ и активирайте „Камера“.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">За да сканира QR код, Molly има нужда от достъп до камерата.</string>
     <string name="PaymentsTransferFragment__settings">Настройки</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Входящо гласово повикване в Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Входящо гласово повикване в Molly</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Входящо видео повикване в Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Входящо видео повикване в Molly</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Входящо Signal групово обаждане</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Входящо Molly групово обаждане</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Текущо гласово повикване в Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Текущо гласово повикване в Molly</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Текущо видео повикване в Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Текущо видео повикване в Molly</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Текущо групово повикване в Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Текущо групово повикване в Molly</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Зареждане…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Валидиране</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Успешно въведена парола за архива</string>
     <string name="BackupDialog_passphrase_was_not_correct">Паролата не беше правилна</string>
-    <string name="LocalBackupJob_creating_signal_backup">Създаване на резервно копие на Signal…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Създаване на резервно копие на Molly…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Проверка на Signal архива…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Проверка на Molly архива…</string>
     <string name="LocalBackupJobApi29_backup_failed">Архивирането не бе успешно</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Вашата резервна директория е изтрита или преместена.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Вашият архивен файл е твърде голям, за да се съхранява на този том.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Обадете ми се (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Повторно изпращане на кода (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Връзка с поддръжката на Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Регистрация за Signal - Код за потвърждение за Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Връзка с поддръжката на Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Регистрация за Molly - Код за потвърждение за Android</string>
     <string name="RegistrationActivity_incorrect_code">Некоректен код</string>
     <string name="BackupUtil_never">Никога</string>
     <string name="BackupUtil_unknown">Непознат</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Телефонен номер</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Изберете кой може да вижда телефонния ви номер и кой може да се свързва с вас в Signal чрез него.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Изберете кой може да вижда телефонния ви номер и кой може да се свързва с вас в Molly чрез него.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Кой може да вижда номера ми</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Направихте прекалено много опити. Моля, опитайте отново по-късно.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Неуспешно свързване с услугата</string>
     <string name="preferences_chats__backups">Архиви</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal е заключен</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly е заключен</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">НАТИСНЕТЕ ЗА ОТКЛЮЧВАНЕ</string>
     <string name="Recipient_unknown">Непознат</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Трябва да имате достъп до своето старо устройство.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Възстанови от резервно копие</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Възстановете съобщенията си от локално резервно копие. Ако не възстановите сега, няма да можете да го направите по-късно.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Възстановяване на локално резервно копие</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Възстановяване на резервно копие в Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Възстановете всичките си текстови съобщения + последните 30 дни мултимедия</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Още опции</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Отказ</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Влизане без прехвърляне</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Продължаване без прехвърляне на вашите съобщения и мултимедия</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Отворете Signal на стария ви Android телефон</string>
     <string name="NewDeviceTransferInstructions__continue">Продължи</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Приготвяме се за свързване със старото Android устройство…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Отнема малко време, би трябвало да е готово скоро</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Чакаме старото Android устройство да се свърже…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal се нуждае от позволение да ползва местоположението ви, за да открие и да се свърже със старото ви Android устройство.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal се нуждае от включена услуга за местоположение, за да открие и да се свърже със старото ви Android устройство.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal има нужда Wi-Fi да е включен, за да открие и да се свърже със старото ви Android устройство. Wi-Fi трябва да е включен, но не е нужно да е свързан към Wi-Fi мрежа.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Съжаляваме, изглежда че устройството ви не поддържа Wi-Fi Direct. Signal използва Wi-Fi Direct да открие и да се свърже със старото ви Android устройство. Все още можете да възстановите от резервно копие или да възстановите акаунта си от старо Android устройство.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly се нуждае от позволение да ползва местоположението ви, за да открие и да се свърже със старото ви Android устройство.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly се нуждае от включена услуга за местоположение, за да открие и да се свърже със старото ви Android устройство.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly има нужда Wi-Fi да е включен, за да открие и да се свърже със старото ви Android устройство. Wi-Fi трябва да е включен, но не е нужно да е свързан към Wi-Fi мрежа.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Съжаляваме, изглежда че устройството ви не поддържа Wi-Fi Direct. Molly използва Wi-Fi Direct да открие и да се свърже със старото ви Android устройство. Все още можете да възстановите от резервно копие или да възстановите акаунта си от старо Android устройство.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Възстанови от резервно копие</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Неочаквана грешка при опит за свързване със старото ви Android устройство.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Търсене на ново Android устройство…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal се нуждае от позволение да ползва местоположението ви, за да открие и да се свърже с новото ви Android устройство.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal се нуждае от включена услуга за местоположение, за да открие и да се свърже с новото ви Android устройство.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal има нужда Wi-Fi да е включен, за да открие и да се свърже с новото ви Android устройство. Wi-Fi трябва да е включен, но не е нужно да е свързан към Wi-Fi мрежа.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Съжаляваме, изглежда че устройството ви не поддържа Wi-Fi Direct. Signal използва Wi-Fi Direct да открие и да се свърже с новото ви Android устройство. Все още можете да създадете резервно копие или да възстановите акаунта си на новото си Android устройство.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly се нуждае от позволение да ползва местоположението ви, за да открие и да се свърже с новото ви Android устройство.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly се нуждае от включена услуга за местоположение, за да открие и да се свърже с новото ви Android устройство.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly има нужда Wi-Fi да е включен, за да открие и да се свърже с новото ви Android устройство. Wi-Fi трябва да е включен, но не е нужно да е свързан към Wi-Fi мрежа.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Съжаляваме, изглежда че устройството ви не поддържа Wi-Fi Direct. Molly използва Wi-Fi Direct да открие и да се свърже с новото ви Android устройство. Все още можете да създадете резервно копие или да възстановите акаунта си на новото си Android устройство.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Създайте резервно копие</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Неочаквана грешка при опит за свързване с новото ви Android устройство.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Прехвърляне на данни</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Дръжте двете устройства близо едно до друго. Не ги изключвайте и дръжте Signal отворен. Прехвърлянията са криптирани от край до край.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Дръжте двете устройства близо едно до друго. Не ги изключвайте и дръжте Molly отворен. Прехвърлянията са криптирани от край до край.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d съобщения досега…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% от съобщенията дотук…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Прехвърляне на акаунт</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Изтеглете Signal на новото си Android устройство</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Изтеглете Molly на новото си Android устройство</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Натиснете \"Прехвърли или възстанови акаунт\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Всеки с този линк може да види името и снимката на групата и да заяви да се присъедини към нея. Споделете го с хора, на които имате доверие.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Всеки с този линк може да види името и снимката на групата и да се присъедини към нея. Споделете го с хора, на които имате доверие.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Споделяне през Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Споделяне през Molly</string>
     <string name="GroupLinkBottomSheet_copy">Копирай</string>
     <string name="GroupLinkBottomSheet_qr_code">QR Код</string>
     <string name="GroupLinkBottomSheet_share">Споделяне</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">За MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin е нова дигитална валута, фокусирана върху поверителността.</string>
     <string name="payment_info_card_adding_funds">Добавяне на средства</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Можете да добавите средства за използване в Signal, като изпратите MobileCoin на адреса на портфейла си.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Можете да добавите средства за използване в Molly, като изпратите MobileCoin на адреса на портфейла си.</string>
     <string name="payment_info_card_cashing_out">Кешаут</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Можете да затворите залог с MobileCoin по всяко време на борса, която поддържа MobileCoin. Просто направете трансфер към акаунта си във въпросната борса.</string>
     <string name="payment_info_card_hide_this_card">Скрий тази карта?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Деактивиране на портфейла</string>
     <string name="DeactivateWalletFragment__your_balance">Вашият баланс</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Препоръчително е да прехвърлите средствата си на друг адрес на портфейл, преди да деактивирате плащанията. Ако решите да не прехвърляте средствата си сега, те ще останат в портфейла ви, свързан със Signal, ако активирате плащанията отново.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Препоръчително е да прехвърлите средствата си на друг адрес на портфейл, преди да деактивирате плащанията. Ако решите да не прехвърляте средствата си сега, те ще останат в портфейла ви, свързан със Molly, ако активирате плащанията отново.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Прехвърлете оставащия баланс</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Деактивиране без прехвърляне</string>
     <string name="DeactivateWalletFragment__deactivate">Изключи</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Деактивиране без прехвърляне?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Вашият баланс ще остане в портфейла ви, свързан със Signal, ако решите да активирате плащанията отново.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Вашият баланс ще остане в портфейла ви, свързан със Molly, ако решите да активирате плащанията отново.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Грешка при деактивирането на портфейла.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Лицензи</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Условия и Политика за поверителност</string>
-    <string name="HelpFragment__copyright_signal_messenger">Авторско право Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Авторско право Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Лицензирано под GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4773,7 +4911,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">Автоматично</string>
+    <string name="ChatColorSelectionFragment__auto">Авто</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Използвай ръчно зададени цветове</string>
     <string name="ChatColorSelectionFragment__chat_color">Цвят на чата</string>
     <string name="ChatColorSelectionFragment__edit">Редакция</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Изберете цвят</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Споделяне</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Само админите могат да изпращат съобщения в тази група.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Достигнат лимит</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Не можете да изберете повече от 5 чата</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Научете повече</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Обновяване на Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Обновяване на Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Тази версия на Signal е изтекла. Актуализирайте сега, за да продължите да използвате Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Тази версия на Molly е изтекла. Актуализирайте сега, за да продължите да използвате Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Обновяване</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Устройството не е регистрирано</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Това устройство вече не е регистрирано. Регистрирайте го отново, за да продължите да използвате Signal на това устройство.</string>
+    <string name="ReregisterSignalDialog__message">Това устройство вече не е регистрирано. Регистрирайте го отново, за да продължите да използвате Molly на това устройство.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Пререгистриране</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Неуспешно отваряне на инструмента за избор.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">За да активира известията, Signal има нужда от разрешение за показването им.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">За да активира известията, Molly има нужда от разрешение за показването им.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Включване</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Все още няма отговори</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Не може да отговорите на тази история, защото вече не сте член на тази група.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Реагира на историята</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Pеагирахте на историята</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Реагира на историята</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Гледания</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Изберете вашата банка</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Потвърдете дарението с %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">За да настроите своето редовно дарение, докоснете, за да потвърдите заплащането на 0,01 € от вашата банка. Сумата ще бъде възстановена автоматично и позволява дебитирането на вашето плащане от 5 €/месец от сметката ви.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">За да настроите своето редовно дарение, докоснете, за да потвърдите заплащането на 0,01 € от вашата банка. Сумата ще бъде възстановена автоматично и позволява дебитирането на вашето плащане от %1$s/месец от сметката ви.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Продължете</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Изтегляне на данни от резервно копие…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Резервното копиране на мултимедия е изключено</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Вашият план за резервно копиране на мултимедия в Signal е анулиран, защото не можахме да обработим плащането ви. Имате %1$d ден да изтеглите всичката мултимедия, съхранена във вашето резервно копие. След %1$d ден мултимедията във вашето резервно копие ще бъде изтрита.</item>
+        <item quantity="other">Вашият план за резервно копиране на мултимедия в Signal е анулиран, защото не можахме да обработим плащането ви. Имате %1$d дни да изтеглите всичката мултимедия, съхранена във вашето резервно копие. След %1$d дни мултимедията във вашето резервно копие ще бъде изтрита.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Можете да започнете отново да плащате за резервно копиране по всяко време, за да продължите да поддържате резервно копие на всичката ви мултимедия. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Вашата мултимедия ще бъде изтрита днес</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Вашият план за резервно копиране на мултимедия в Signal е анулиран, защото не можахме да обработим плащането ви. Това е последният ви шанс да изтеглите мултимедията от резервното си копие, преди да бъде изтрита.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Изтеглянето не може да бъде завършено</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Устройството ви няма достатъчно свободно място. Освободете до %1$s място, за да изтеглите мултимедията от резервното копие.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Ако изберете „Пропускане“, мултимедията във вашето резервно копие ще бъде изтрита след %1$d ден.</item>
+        <item quantity="other">Ако изберете „Пропускане“, мултимедията във вашето резервно копие ще бъде изтрита след %1$d дни.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Плащането за резервно копиране не можа да бъде обработено</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Имаме затруднение със събирането на вашето редовно месечно плащане за резервно копиране. Уверете се, че начинът ви на плащане е актуален. Ако не е, актуализирайте го в Google Pay. Signal ще се опита да обработи плащането отново след няколко дни.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Неуспешно резервно копиране</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Устройството ви не е завършвало резервно копиране от %1$d дни. Уверете се, че устройството ви е свързано към Wi-Fi и докоснете „Резервно копиране сега“. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Научете повече</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Пропускане</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Изтегляне на мултимедията сега</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Изтегляне по-късно</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Без изтегляне на мултимедията</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Освободете до %1$s място, за да изтеглите мултимедията.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Кредитна или дебитна карта</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Непознат</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">История на плащанията</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Последното ви резервно копиране е направено на %1$s в %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Съобщенията, по-стари от избраното време, ще бъдат изтрити за постоянно.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Съобщенията, надвишаващи избраната дължина, ще бъдат изтрити за постоянно.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Прилагане на лимитите към свързаните устройства</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Когато е активирано, ограниченията за чат ще изтриват съобщенията и от свързаните ви устройства.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Изтриването вече е синхронизирано на всички ваши устройства</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Когато изтриете съобщения или чатове, те ще бъдат изтрити от вашия телефон и свързаните устройства.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">ОК</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">История на плащанията</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Резервно копиране на текстови съобщения и мултимедия</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Подробности за плащане</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Вид резервно копие</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Дата на плащане</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Споделяне</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Резервни копия в Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">История на плащанията</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Подробности за резервно копие</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Размер на резервно копие</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Честота на резервно копиране</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Резервно копиране с мобилна мрежа</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Изключване и изтриване на резервното копие</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Резервното копие е изтрито и функцията е изключена.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Видът резервно копие е променен и абонаментът е отменен</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Абонаментът е отменен</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Изтеглянето е завършено</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Вид резервно копие</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Резервните копия са деактивирани</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/месец</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Активиране на архиви</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Последно резервно копиране</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s за %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Никога</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Архивиране сега</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Изключване и изтриване на резервните копия?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Няма да бъдете таксувани отново. Резервното ви копие ще бъде изтрито и няма да се създават нови резервни копия.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Изключете и изтрийте</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Изтриване на резервното копие…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Резервното копие е изтрито</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Като докоснете „Резервно копиране сега“"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Ежедневно</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Ежеседмично</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Ежемесечно</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Ръчно резервно копиране</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Моля, въведете ПИН, парола или фигура за вашето устройство.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Напред</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Промяна на типа резервно копиране</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Отмяна на абонамента</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Потвърждаване на отмяната</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Няма да бъдете таксувани отново. Резервното копиране ще бъде изключено в края на платежния ви цикъл. След тази дата ще имате 30 дни, за да изтеглите мултимедията, за която в момента имате резервно копие.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Потвърждаване и изтегляне сега</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Потвърждаване и изтегляне по-късно</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Запазване на абонамента</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 2a2f615176..21c5403659 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -43,7 +44,7 @@
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">আপনি এখনও কোনো পাসফ্রেজ স্থাপন করেন নি!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">পাসফ্রেজ নিষ্ক্রিয় করবেন?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">এটি স্থায়ীভাবে Signal এবং বার্তা নোটিফিকেশনগুলিকে আনলক করবে।</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">এটি স্থায়ীভাবে Molly এবং বার্তা নোটিফিকেশনগুলিকে আনলক করবে।</string>
     <string name="ApplicationPreferencesActivity_disable">নিষ্ক্রিয় করুন</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">সার্ভারের সাথে সংযোগ স্থাপনে ব্যর্থ!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">রেজিস্ট্রেশন লকের জন্য পিনসমূহ আবশ্যক। পিনসমূহ নিষ্ক্রিয় করতে আগে রেজিস্ট্রেশন লক নিষ্ক্রিয় করুন।</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">ফাইল</string>
     <string name="AttachmentKeyboard_contact">পরিচিতি</string>
     <string name="AttachmentKeyboard_location">স্থান</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">আপনার ছবি ও ভিডিও দেখানোর জন্য Signal-এর অনুমতি প্রয়োজন</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">আপনার ছবি ও ভিডিও দেখানোর জন্য Molly-এর অনুমতি প্রয়োজন</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">অ্যাক্সেসের অনুমতি দিন</string>
     <string name="AttachmentKeyboard_payment">পেমেন্ট</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">মিডিয়া নির্বাচন করার জন্য কোন অ্যাপ খুঁজে পাওয়া যায়নি।</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">ছবি, ভিডিও অথবা অডিও সংযুক্ত করার জন্য Signal এর স্টোরেজ ব্যাবহারের অনুমতির প্রয়োজন কিন্তু এর উপর স্থায়ী নিষেধাজ্ঞা জারি করা হয়েছে। দয়া করে আ্যপ সেটিংস-এ যান, \"অনুমতি\" নির্বাচন করুন এবং \"স্টোরেজ\" সক্ষম করুন।</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">পরিচিতিসমূহের তথ্য সংযুক্ত করার জন্য Signal এর পরিচিতিসমূহ ব্যাবহারের অনুমতির প্রয়োজন কিন্তু এর উপর স্থায়ী নিষেধাজ্ঞা জারি করা হয়েছে। দয়া করে আ্যপ সেটিংসে যান, \"অনুমতি\" নির্বাচন করুন এবং \"পরিচিতিসমূহ\" সক্ষম করুন।</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">স্থান সংযুক্ত করার জন্য Signal এর স্থান ব্যাবহারের অনুমতির প্রয়োজন কিন্তু এর উপর স্থায়ী নিষেধাজ্ঞা জারি করা হয়েছে। দয়া করে আ্যপ সেটিংসে যান, \"অনুমতি\" নির্বাচন করুন এবং \"স্থান\" সক্ষম করুন।</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">ছবি, ভিডিও অথবা অডিও সংযুক্ত করার জন্য Molly এর স্টোরেজ ব্যাবহারের অনুমতির প্রয়োজন কিন্তু এর উপর স্থায়ী নিষেধাজ্ঞা জারি করা হয়েছে। দয়া করে আ্যপ সেটিংস-এ যান, \"অনুমতি\" নির্বাচন করুন এবং \"স্টোরেজ\" সক্ষম করুন।</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">পরিচিতিসমূহের তথ্য সংযুক্ত করার জন্য Molly এর পরিচিতিসমূহ ব্যাবহারের অনুমতির প্রয়োজন কিন্তু এর উপর স্থায়ী নিষেধাজ্ঞা জারি করা হয়েছে। দয়া করে আ্যপ সেটিংসে যান, \"অনুমতি\" নির্বাচন করুন এবং \"পরিচিতিসমূহ\" সক্ষম করুন।</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">স্থান সংযুক্ত করার জন্য Molly এর স্থান ব্যাবহারের অনুমতির প্রয়োজন কিন্তু এর উপর স্থায়ী নিষেধাজ্ঞা জারি করা হয়েছে। দয়া করে আ্যপ সেটিংসে যান, \"অনুমতি\" নির্বাচন করুন এবং \"স্থান\" সক্ষম করুন।</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">আপনার অবস্থানে অ্যাক্সেসের অনুমতি দিন</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">আপনার অবস্থান পাঠাতে:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">আপনার অবস্থান পাঠাতে Signal-কে অ্যাক্সেসের অনুমতি দিন।</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">আপনার অবস্থান পাঠাতে Molly-কে অ্যাক্সেসের অনুমতি দিন।</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">আপনার অবস্থান পাঠাতে Signal-এর লোকেশনে অ্যাক্সেসের প্রয়োজন।</string>
+    <string name="AttachmentManager_signal_needs_location_access">আপনার অবস্থান পাঠাতে Molly-এর লোকেশনে অ্যাক্সেসের প্রয়োজন।</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">স্টোরেজে অ্যাক্সেসের অনুমতি দিন</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">ছবি ও ভিডিও দেখাতে:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">আপনার ছবি ও ভিডিও দেখানোর জন্য Signal-এর স্টোরেজে অ্যাক্সেসের প্রয়োজন।</string>
+    <string name="AttachmentManager_signal_needs_storage_access">আপনার ছবি ও ভিডিও দেখানোর জন্য Molly-এর স্টোরেজে অ্যাক্সেসের প্রয়োজন।</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s পেমেন্ট সক্রিয় করেননি </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">ক্যামেরা পরিবর্তন</string>
     <string name="CameraXFragment_open_gallery_description">গ্যালারী খুলুন</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">অ্যাক্সেসের অনুমতি দিন</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">আপনার ক্যামেরা ও মাইক্রোফোনে অ্যাক্সেসের অনুমতি দিন</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">আপনার ক্যামেরায় অ্যাক্সেসের অনুমতি দিন</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">আপনার মাইক্রোফোনে অ্যাক্সেসের অনুমতি দিন</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">ছবি তোলার জন্য, ক্যামেরায় Signal-এর অ্যাক্সেসের অনুমতি দিন।</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">ছবি ও ভিডিও তুলতে Signal কে ক্যামেরা ব্যাবহারের অনুমতি দিন।</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">ছবি তুলতে ও ভিডিও ধারণ করতে, ক্যামেরা ও মাইক্রোফোনে Signal-কে অ্যাক্সেসের অনুমতি দিন।</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">শব্দ সহ ভিডিও ধারণ করতে, আপনার মাইক্রোফোনে Signal-কে অ্যাক্সেসের অনুমতি দিন।</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">QR কোড স্ক্যান করতে, ক্যামেরায় Signal-কে অ্যাক্সেসের অনুমতি দিন।</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">ছবি তোলার জন্য ক্যামেরায় Signal-এর অ্যাক্সেস প্রয়োজন</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">QR কোড স্ক্যান করার জন্য ক্যামেরায় Signal-এর অ্যাক্সেস প্রয়োজন</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">ভিডিও ধারণ করতে Signal-এর মাইক্রোফোন অ্যাক্সেসের প্রয়োজন</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Signal-এ ছবি তুলতে:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Signal-এ ছবি তুলতে এবং ভিডিও ধারণ করতে:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">শব্দ সহ ভিডিও ধারণ করতে:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR কোড স্ক্যান করতে:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">সাম্প্রতিক যোগাযোগ</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">কোনও Signal পরিচিতি নেই</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">শুধুমাত্র Signal পরিচিতিদের ছবি পাঠাতে ক্যামেরা বোতাম ব্যবহার করতে পারবেন। </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">আপনি যাকে খুঁজছেন তাকে খুঁজে পাচ্ছেন না?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Signal -এ যোগ দিতে একটি পরিচিতিকে আমন্ত্রণ জানান</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Molly -এ যোগ দিতে একটি পরিচিতিকে আমন্ত্রণ জানান</string>
     <string name="CameraContacts__menu_search">খুঁজুন</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">না ধন্যবাদ</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Signal আপডেট করুন</string>
+    <string name="ClientDeprecatedActivity_update_signal">Molly আপডেট করুন</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">এই অ্যাপের এই সংস্করণ আর সাহায্য পাবে না। বার্তা পেতে ও পাঠাতে সর্বনতুন সংস্করণে হালনাগাদ(আপডেট) করো।</string>
     <string name="ClientDeprecatedActivity_update">আপডেট করুন</string>
     <string name="ClientDeprecatedActivity_dont_update">আপডেট করবেন না</string>
     <string name="ClientDeprecatedActivity_warning">সতর্কবার্তা</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">আপনার Signal-এর সংস্করণটি পুরোনো হয়ে গেছে। আপডেট না করা পর্যন্ত আপনি পুরোনো ম্যাসেজগুলো দেখতে পাবেন, কিন্তু নতুন ম্যাসেজ দেখতে বা পাঠাতে পারবেন না।</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">আপনার Molly-এর সংস্করণটি পুরোনো হয়ে গেছে। আপডেট না করা পর্যন্ত আপনি পুরোনো ম্যাসেজগুলো দেখতে পাবেন, কিন্তু নতুন ম্যাসেজ দেখতে বা পাঠাতে পারবেন না।</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">কোন ওয়েব ব্রাউজার পাওয়া যায়নি।</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">%1$sটি বার্তা</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly ভয়েস কল %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly ভিডিও কল %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal বার্তা</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">মেসেজ পাঠান</string>
-    <string name="ConversationActivity_lets_switch_to_signal">চলুন Signal এ যোগ দেই %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">চলুন Molly এ যোগ দেই %1$s</string>
     <string name="ConversationActivity_specify_recipient">দয়া করে একটি পরিচিতি চয়ন করুন</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">আপনি যে বার্তা প্রেরণ করছেন সংযুক্তি তার আকারের সীমা অতিক্রম করেছে।</string>
     <string name="ConversationActivity_unable_to_record_audio">অডিও রেকর্ড করা যাচ্ছেনা!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">অডিও মেসেজ পাঠাতে:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">ভয়েস মেসেজ পাঠাতে, আপনার মাইক্রোফোনে Signal-কে অ্যাক্সেসের অনুমতি দিন।</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">ভয়েস মেসেজ পাঠাতে, আপনার মাইক্রোফোনে Molly-কে অ্যাক্সেসের অনুমতি দিন।</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">ভয়েস মেসেজ রেকর্ড করতে Signal-এর মাইক্রোফোনে অ্যাক্সেসের প্রয়োজন।</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">অডিও বার্তাগুলি প্রেরণের জন্য Signal এর মাইক্রোফোনের অনুমতি প্রয়োজন, কিন্তু এর উপর স্থায়ীভাবে নিষেধাজ্ঞা আরোপ করা হয়েছে। দয়া করে অ্যাপ্লিকেশন সেটিংসে যান, \"অনুমতিগুলি\" নির্বাচন করুন এবং \"মাইক্রোফোন\" সক্ষম করুন|</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">ভয়েস মেসেজ রেকর্ড করতে Molly-এর মাইক্রোফোনে অ্যাক্সেসের প্রয়োজন।</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">অডিও বার্তাগুলি প্রেরণের জন্য Molly এর মাইক্রোফোনের অনুমতি প্রয়োজন, কিন্তু এর উপর স্থায়ীভাবে নিষেধাজ্ঞা আরোপ করা হয়েছে। দয়া করে অ্যাপ্লিকেশন সেটিংসে যান, \"অনুমতিগুলি\" নির্বাচন করুন এবং \"মাইক্রোফোন\" সক্ষম করুন|</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s কে ফোন করতে Signal এর মাইক্রোফোন এবং ক্যামেরা ব্যাবহারের অনুমতির প্রয়োজন, কিন্তু এর উপর স্থায়ীভাবে নিষেধাজ্ঞা আরোপ করা হয়েছে। দয়া করে এপ সেটিংসে যান, \"অনুমতি\" নির্বাচন করুন এবং \"মাইক্রোফোন\" ও \"ক্যামেরা\" এর অনুমতি সক্ষম করুন।</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">ছবি ও ভিডিও তুলতে Signal কে ক্যামেরা ব্যাবহারের অনুমতি দিন।</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">ছবি অথবা ভিডিও তুলতে Signal এর ক্যামেরা ব্যাবহারের অনুমতির প্রয়োজন, কিন্তু এর উপর স্থায়ীভাবে নিষেধাজ্ঞা আরোপ করা হয়েছে। দয়া করে অ্যাপ সেটিংসে যান, \"অনুমতি\" নির্বাচন করুন এবং \"ক্যামেরা\" এর অনুমতি সক্ষম করুন।</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">ছবি অথবা ভিডিও তুলতে Signal এর ক্যামেরা ব্যাবহারের অনুমতির প্রয়োজন।</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s কে ফোন করতে Molly এর মাইক্রোফোন এবং ক্যামেরা ব্যাবহারের অনুমতির প্রয়োজন, কিন্তু এর উপর স্থায়ীভাবে নিষেধাজ্ঞা আরোপ করা হয়েছে। দয়া করে এপ সেটিংসে যান, \"অনুমতি\" নির্বাচন করুন এবং \"মাইক্রোফোন\" ও \"ক্যামেরা\" এর অনুমতি সক্ষম করুন।</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">ছবি ও ভিডিও তুলতে Molly কে ক্যামেরা ব্যাবহারের অনুমতি দিন।</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">ছবি অথবা ভিডিও তুলতে Molly এর ক্যামেরা ব্যাবহারের অনুমতির প্রয়োজন, কিন্তু এর উপর স্থায়ীভাবে নিষেধাজ্ঞা আরোপ করা হয়েছে। দয়া করে অ্যাপ সেটিংসে যান, \"অনুমতি\" নির্বাচন করুন এবং \"ক্যামেরা\" এর অনুমতি সক্ষম করুন।</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">ছবি অথবা ভিডিও তুলতে Molly এর ক্যামেরা ব্যাবহারের অনুমতির প্রয়োজন।</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">শব্দ সহ ভিডিও ধারন করতে মাইক্রোফোন অনুমতি সক্ষম করুন।</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">ভিডিও রেকর্ড করতে Signal এর মাইক্রোফোনের অনুমতি প্রয়োজন, তবে সেগুলি অস্বীকার করা হয়েছে। দয়া করে অ্যাপ্লিকেশন সেটিংসে যান এবং, \"অনুমতিগুলি\" নির্বাচন করুন এবং \"মাইক্রোফোন\" এবং \"ক্যামেরা\" সক্ষম করুন|</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">ভিডিও রেকর্ড করতে Signal এর ক্যামেরা ব্যাবহারের অনুমতির প্রয়োজন।</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">ভিডিও রেকর্ড করতে Molly এর মাইক্রোফোনের অনুমতি প্রয়োজন, তবে সেগুলি অস্বীকার করা হয়েছে। দয়া করে অ্যাপ্লিকেশন সেটিংসে যান এবং, \"অনুমতিগুলি\" নির্বাচন করুন এবং \"মাইক্রোফোন\" এবং \"ক্যামেরা\" সক্ষম করুন|</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">ভিডিও রেকর্ড করতে Molly এর ক্যামেরা ব্যাবহারের অনুমতির প্রয়োজন।</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">না</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">একটি কল শুরু করতে:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">কল শুরু করতে, আপনার মাইক্রোফোনে Signal-কে অ্যাক্সেসের অনুমতি দিন।</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">কল শুরু করতে, আপনার মাইক্রোফোনে Molly-কে অ্যাক্সেসের অনুমতি দিন।</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">কল শুরু করতে Signal-এর মাইক্রোফোনে অ্যাক্সেসের প্রয়োজন।</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">কল শুরু করতে Molly-এর মাইক্রোফোনে অ্যাক্সেসের প্রয়োজন।</string>
 
 
     <string name="ConversationActivity_join">যোগদান করুন</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Signal-এ এসএমএস ম্যাসেজিং আর সমর্থন করে না। এখানে কথোপকথন করতে %1$s-কে Signal-এ আমন্ত্রণ জানান।</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">এই ব্যক্তি আর Signal ব্যবহার করছেন না। এখানে কথোপকথন করতে তাদেরকে Signal-এ আমন্ত্রণ জানান।</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">এই ব্যক্তি আর Molly ব্যবহার করছেন না। এখানে কথোপকথন করতে তাদেরকে Molly-এ আমন্ত্রণ জানান।</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Signal এ আমন্ত্রন জানান</string>
+    <string name="ConversationActivity__invite_to_signal">Molly এ আমন্ত্রন জানান</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">আপনাকে শীঘ্রই আবার মনে করিয়ে দেওয়া হবে।</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">প্রত্যেকের জন্য মুছে ফেলুন</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">এই ডিভাইস থেকে মুছে ফেলুন</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">মুছে ফেলুন</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">সব জায়গা থেকে মুছে ফেলুন</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">এই ম্যাসেজটি চ্যাট-এর প্রত্যেকের জন্য মুছে ফেলা হবে, যদি তাদের কাছে Signal-এর কোনো সাম্প্রতিক সংস্করণ থেকে থাকে। তারা দেখতে পাবেন যে আপনি একটি ম্যাসেজ মুছে ফেলেছেন।</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">ব্লক করা হয়েছে</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Signal আপডেট করুন</string>
+    <string name="ConversationFragment__update_build">Molly আপডেট করুন</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">পুনরায় Signal-এ নিবন্ধন করুন</string>
+    <string name="ConversationFragment__reregister_signal">পুনরায় Molly-এ নিবন্ধন করুন</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">পিছনের দিকে নেভিগেট করুন।</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signal খুলুন</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Molly খুলুন</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">আর যাচাইকৃত নয়</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">এটি নির্বাচিত চ্যাট চিরতরে মুছে ফেলবে।</item>
         <item quantity="other">এটি %1$dটি নির্বাচিত চ্যাট চিরতরে মুছে ফেলবে।</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">এটি আপনার ডিভাইস থেকে সকল নির্বাচিত চ্যাট স্থায়ীভাবে মুছে ফেলবে।</item>
+        <item quantity="other">এটি আপনার ডিভাইস থেকে নির্বাচিত সকল %1$d চ্যাট স্থায়ীভাবে মুছে ফেলবে।</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">মোছা হচ্ছে…</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">নির্বাচিত চ্যাট মুছে ফেলা হচ্ছে…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">নম্বরের মাধ্যমে কারা আমাকে খুঁজে পাবেন?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">যাদের কাছে আপনার ফোন নম্বর আছে তারা দেখতে পাবেন আপনি Signal-এ আছেন এবং আপনার সাথে চ্যাট শুরু করতে পারবেন।</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">যাদের কাছে আপনার ফোন নম্বর আছে তারা দেখতে পাবেন আপনি Molly-এ আছেন এবং আপনার সাথে চ্যাট শুরু করতে পারবেন।</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">আপনি Signal-এ আছেন তা কেউ দেখতে পাবেন না যদি না আপনি তাদের মেসেজ পাঠান বা তাদের সাথে কোনো চ্যাট বিদ্যমান থাকে।</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">আপনি Molly-এ আছেন তা কেউ দেখতে পাবেন না যদি না আপনি তাদের মেসেজ পাঠান বা তাদের সাথে কোনো চ্যাট বিদ্যমান থাকে।</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">ব্যাকআপ থেকে পুনঃস্থাপন করবেন?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">আপনার ব্যাকআপ পাসফ্রেজটি পরীক্ষা করুন এবং এটি মিলছে কিনা তা যাচাই করুন</string>
     <string name="BackupsPreferenceFragment__turn_on">চালু করুন</string>
     <string name="BackupsPreferenceFragment__turn_off">বন্ধ করুন</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"একটি ব্যাকআপ পুনরুদ্ধার করতে, নতুন করে Signal ইনস্টল করুন। অ্যাপ্লিকেশনটি খুলুন এবং \" ব্যাকআপ পুনরুদ্ধার করুন\" বাটনে আলতো চাপুন, তারপরে ব্যাকআপ ফাইলটি সনাক্ত করুন। %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"একটি ব্যাকআপ পুনরুদ্ধার করতে, নতুন করে Molly ইনস্টল করুন। অ্যাপ্লিকেশনটি খুলুন এবং \" ব্যাকআপ পুনরুদ্ধার করুন\" বাটনে আলতো চাপুন, তারপরে ব্যাকআপ ফাইলটি সনাক্ত করুন। %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">আরও জানুন</string>
     <string name="BackupsPreferenceFragment__in_progress">চলমান…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d এখন অব্দি…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">এখন পর্যন্ত %1$s %%…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">ব্যাকআপগুলি তৈরি করতে Signal এর জন্য বাহ্যিক স্টোরেজ অনুমতি প্রয়োজন, তবে এটি স্থায়ীভাবে অস্বীকার করা হয়েছে। দয়া করে অ্যাপ্লিকেশন সেটিংস যান, \"অনুমতিগুলি\" নির্বাচন করুন এবং \"স্টোরেজ\" সক্ষম করুন।</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">ব্যাকআপগুলি তৈরি করতে Molly এর জন্য বাহ্যিক স্টোরেজ অনুমতি প্রয়োজন, তবে এটি স্থায়ীভাবে অস্বীকার করা হয়েছে। দয়া করে অ্যাপ্লিকেশন সেটিংস যান, \"অনুমতিগুলি\" নির্বাচন করুন এবং \"স্টোরেজ\" সক্ষম করুন।</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">ব্যাকআপ সময় সেট করুন</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">চ্যাট সেশনটি রিফ্রেশ করা হয়েছে</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal এন্ড-টু-এন্ড এনক্রিপশন ব্যবহার করে এবং কখনো কখনো আপনার চ্যাট সেশনটি পুনরায় লোড করার প্রয়োজন হতে পারে। এটি আপনার চ্যাটের সুরক্ষাকে প্রভাবিত করবে না, তবে আপনি এই কন্টাক্টের কাছ থেকে কোনো ম্যাসেজ মিস করতে পারেন এবং আপনি তাদের এটি পুনরায় পাঠাতে বলতে পারেন।</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly এন্ড-টু-এন্ড এনক্রিপশন ব্যবহার করে এবং কখনো কখনো আপনার চ্যাট সেশনটি পুনরায় লোড করার প্রয়োজন হতে পারে। এটি আপনার চ্যাটের সুরক্ষাকে প্রভাবিত করবে না, তবে আপনি এই কন্টাক্টের কাছ থেকে কোনো ম্যাসেজ মিস করতে পারেন এবং আপনি তাদের এটি পুনরায় পাঠাতে বলতে পারেন।</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">ডেস্কটপ বা iPad-এ Signal ব্যবহার করুন। আপনার মেসেজগুলো আপনার লিংককৃত ডিভাইসে সিঙ্ক করা হবে।</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">একটি নতুন ডিভাইস লিংক করুন</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s মেসেজ এবং চ্যাটের তথ্য সকল ডিভাইসে এন্ড-টু-এন্ড এনক্রিপশন দ্বারা সুরক্ষিত</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">ডেস্কটপ বা iPad-এ Signal</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">লিংককৃত ডিভাইসে সকল মেসেজিং ব্যক্তিগত করা হয়েছে</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">এটি লিংক করার পর Molly মেসেজগুলো আপনার মোবাইল ফোনে Molly-এর সাথে সিঙ্ক করা হয়। আপনার পূর্ববর্তী মেসেজের ইতিহাস প্রদর্শিত হবে না।</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">আপনার অন্য ডিভাইসে Molly ইনস্টল করতে %1$s-এ ভিজিট করুন</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">আমার লিংককৃত ডিভাইসসমূহ</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">বিযুক্ত করুন</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s লিংক বিচ্ছিন্ন করা হয়েছে</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">ডিভাইসটি সংযুক্ত হচ্ছে…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">ডিভাইস অনুমোদিত হয়েছে</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">লোড হচ্ছে…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">কোনো লিংককৃত ডিভাইস নেই</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">একটি ডিভাইস লিংক করতে আনলক করুন</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">লিংক করার জন্য ডিভাইসে প্রদর্শিত কিউআর কোডটি স্ক্যান করুন।</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">কিউআর কোড স্ক্যান করুন</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">আপনি যে ডিভাইসটি লিংক করতে চান তাতে প্রদর্শিত QR কোডটি স্ক্যান করতে এই ডিভাইসটি ব্যবহার করুন</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">ঠিক আছে</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">এই ডিভাইসটি আপনার গ্রুপ ও কন্টাক্ট দেখতে পাবে, আপনার চ্যাট অ্যাক্সেস করতে পারবে এবং আপনার নামে ম্যাসেজ পাঠাতে পারবে।</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">আপনার অন্য ডিভাইসে লিংক করা শেষ করুন</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">আপনার অন্য ডিভাইসে Molly লিংক করা শেষ করুন।</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">ডিভাইস সংযুক্তি ব্যর্থ</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">এই কিউআর কোডটি বৈধ নয়। আপনি যে ডিভাইস লিঙ্কটি করতে চান তাতে প্রদর্শিত QR কোডটি আপনি স্ক্যান করছেন তা দয়া করে নিশ্চিত হন।</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">পুনরায় চেষ্টা করুন</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">\'%1$s\' বিচ্ছিন্ন করা হবে?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">অনুপস্থিত প্লে সার্ভিসের জন্য অনুকুল করা</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">এই ডিভাইস প্লে সার্ভিস সমর্থন করে না। সিস্টেম ব্যাটারি অপ্টিমাইজেশন অক্ষম করতে আলতো চাপুন, যা নিষ্ক্রিয় অবস্থায় বার্তা পুনরুদ্ধার থেকে Signal -কে বাধা দেয়।</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">এই ডিভাইস প্লে সার্ভিস সমর্থন করে না। সিস্টেম ব্যাটারি অপ্টিমাইজেশন অক্ষম করতে আলতো চাপুন, যা নিষ্ক্রিয় অবস্থায় বার্তা পুনরুদ্ধার থেকে Molly -কে বাধা দেয়।</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">আপনার Signal সংস্করণটির মেয়াদ শেষ হয়ে গেছে। বার্তা প্রেরণ এবং গ্রহণ করতে এখনই আপডেট করুন।</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">আপনার Molly সংস্করণটির মেয়াদ শেষ হয়ে গেছে। বার্তা প্রেরণ এবং গ্রহণ করতে এখনই আপডেট করুন।</string>
     <string name="ExpiredBuildReminder_update_now">আপডেট করুন</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">দেখান</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Signal স্থায়ীভাবে যোগাযোগ স্থাপনে ব্যর্থ!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal গুগল প্লে পরিষেবাদিতে নিবন্ধন করতে অক্ষম ছিল। Signal বার্তা এবং কল সমূহ অক্ষম করা হয়েছে, দয়া করে পুনরায় নিবন্ধকরণ চেষ্টা করুন সেটিংস &gt; উন্নত।</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Molly স্থায়ীভাবে যোগাযোগ স্থাপনে ব্যর্থ!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly গুগল প্লে পরিষেবাদিতে নিবন্ধন করতে অক্ষম ছিল। Molly বার্তা এবং কল সমূহ অক্ষম করা হয়েছে, দয়া করে পুনরায় নিবন্ধকরণ চেষ্টা করুন সেটিংস &gt; উন্নত।</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">ডিবাগ লগ আমাদের সমস্যা নির্ণয় ও সমাধান করতে সাহায্য করে এবং শনাক্তকরণের তথ্য ধারণ করে না।</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal একটি সমস্যার সম্মুখীন হয়েছে। ডিবাগ লগ জমা দেবেন?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly একটি সমস্যার সম্মুখীন হয়েছে। ডিবাগ লগ জমা দেবেন?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">ব্যাটারি অপ্টিমাইজেশনের কারণে বিজ্ঞপ্তি আসতে দেরি হতে পারে</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">মেসেজের বিজ্ঞপ্তি যেন বিলম্বিত না হয় তা নিশ্চিত করতে আপনি Signal-এর জন্য ব্যাটারি অপ্টিমাইজেশন নিষ্ক্রিয় করতে পারেন।</string>
+    <string name="PromptBatterySaverBottomSheet__message">মেসেজের বিজ্ঞপ্তি যেন বিলম্বিত না হয় তা নিশ্চিত করতে আপনি Molly-এর জন্য ব্যাটারি অপ্টিমাইজেশন নিষ্ক্রিয় করতে পারেন।</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">ব্যাটারি অপ্টিমাইজেশনের কারণে বিজ্ঞপ্তি আসতে দেরি হতে পারে</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">মেসেজের নোটিফিকেশন যেন বিলম্বিত না হয় তা নিশ্চিত করতে আপনি Molly-এর জন্য ব্যাটারি অপ্টিমাইজেশন নিষ্ক্রিয় করতে পারেন। ডিভাইস অনুযায়ী নির্দিষ্ট নির্দেশাবলী দেখতে \"এগিয়ে যান\"-এ ট্যাপ করুন।</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">না ধন্যবাদ</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">চালিয়ে যান</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">চালিয়ে যান</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">বাতিল করুন</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">না ধন্যবাদ</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">অনিষ্পন্ন গ্রুপ নিমন্ত্রণসমূহ</string>
+    <string name="PendingMembersActivity_pending_group_invites">অনুরোধ &amp; আমন্ত্রণ</string>
     <string name="PendingMembersActivity_requests">অনুরোধসমুহ</string>
     <string name="PendingMembersActivity_invites">আমন্ত্রণসমূহ</string>
     <string name="PendingMembersActivity_people_you_invited">আপনার আমন্ত্রিত লোকেরা</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">বাতিল</string>
     <string name="InviteActivity_sending">পাঠানো হচ্ছে</string>
     <string name="InviteActivity_invitations_sent">আমন্ত্রণ পাঠানো হয়েছে!</string>
-    <string name="InviteActivity_invite_to_signal">Signal এ আমন্ত্রণ জানান</string>
+    <string name="InviteActivity_invite_to_signal">Molly এ আমন্ত্রণ জানান</string>
     <string name="InviteActivity_send_sms">এসএমএস পাঠান (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">%1$d টি নিমন্ত্রন এসএমএস পাঠান?</item>
         <item quantity="other">%1$d টি নিমন্ত্রন এসএমএস পাঠান?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">চলুন Signal এ যোগ দেইঃ %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">চলুন Molly এ যোগ দেইঃ %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">আপনার কাছে শেয়ার করতে পারবেন এমন কোন অ্যাপ নেই।</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">আপনার বার্তা</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">পটভূমির সংযোগ সক্ষম করা হয়েছে</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">রিপ্লাই</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal কল স্থাপন করা হচ্ছে</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly কল স্থাপন করা হচ্ছে</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signal কল সার্ভিস চালু করা হচ্ছে</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal কল সার্ভিস বন্ধ করা হচ্ছে</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Molly কল সার্ভিস চালু করা হচ্ছে</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly কল সার্ভিস বন্ধ করা হচ্ছে</string>
     <string name="NotificationBarManager__cancel_call">কল বাতিল করুন</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">আপনি পেমেন্ট সক্রিয় করেছেন</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s এখন পেমেন্ট গ্রহণ করতে পারবেন</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">পেমেন্টের বিস্তারিত পাওয়া যাচ্ছে না</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">আরো পেতে ট্যাপ করুন</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">পেমেন্টের বিস্তারিত পাওয়া যাচ্ছে না</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">এই পেমেন্টের এই তথ্য পাওয়া যাচ্ছে না, কারণ আপনার মেসেজগুলো এমন একটি উৎস থেকে পুনরুদ্ধার করা হয়েছিল যেখানে এই পেমেন্ট সংক্রান্ত কোনো ইতিহাস নেই। এটি আপনার ওয়ালেটের ব্যালেন্স বা অতীতের পেমেন্ট স্ট্যাটাসকে প্রভাবিত করে না।</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">শীঘ্রই Signal থেকে আপনি আর এসএমএস ম্যাসেজ পাঠাতে পারবেন না। এখানে কথোপকথন করতে %1$s-কে Signal-এ আমন্ত্রণ জানান।</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Signal থেকে আপনি আর এসএমএস ম্যাসেজ পাঠাতে পারবেন না। এখানে কথোপকথন করতে %1$s-কে Signal-এ আমন্ত্রণ জানান।</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Molly থেকে আপনি আর এসএমএস ম্যাসেজ পাঠাতে পারবেন না। এখানে কথোপকথন করতে %1$s-কে Molly-এ আমন্ত্রণ জানান।</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">পেমেন্ট: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">পেমেন্ট</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">স্প্যাম হিসেবে রিপোর্ট করা হয়েছে</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">একটি Signal ডিভাইস লিঙ্ক করবেন?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">দেখে মনে হচ্ছে আপনি ৩য় পক্ষের স্ক্যানার ব্যবহার করে একটি Signal ডিভাইস লিঙ্ক করার চেষ্টা করছেন। আপনার সুরক্ষার জন্য, দয়া করে Signal এর মধ্যে থেকে আবার কোডটি স্ক্যান করুন।</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">কোনও কিউআর কোড স্ক্যান করার জন্য Signal এর ক্যামেরা অনুমতি প্রয়োজন তবে এটি স্থায়ীভাবে অস্বীকার করা হয়েছে। দয়া করে অ্যাপ সেটিংসে যান, \"অনুমতিগুলি\" নির্বাচন করুন এবং \"ক্যামেরা\" সক্ষম করুন।</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">কোনও কিউআর কোড স্ক্যান করার জন্য Molly এর ক্যামেরা অনুমতি প্রয়োজন তবে এটি স্থায়ীভাবে অস্বীকার করা হয়েছে। দয়া করে অ্যাপ সেটিংসে যান, \"অনুমতিগুলি\" নির্বাচন করুন এবং \"ক্যামেরা\" সক্ষম করুন।</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">ক্যামেরা অনুমতি ব্যতীত কোনও কিউআর কোড স্ক্যান করতে অক্ষম</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">পাসফ্রেজ প্রবেশ করান</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal আইকন</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly আইকন</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">পাসফ্রেজ সাবমিট করুন</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">অকার্যকর পাসফ্রেজ!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signal আনলক করুন</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal অ্যান্ড্রয়েড - লক স্ক্রিন</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Molly আনলক করুন</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly অ্যান্ড্রয়েড - লক স্ক্রিন</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">ম্যাপ</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">মেসেজ পাঠানো চালিয়ে যেতে ভেরিফাই করুন</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Signal-এ স্প্যাম প্রতিরোধ করতে, অনুগ্রহ করে যাচাইকরণ সম্পূর্ণ করুন।</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Molly-এ স্প্যাম প্রতিরোধ করতে, অনুগ্রহ করে যাচাইকরণ সম্পূর্ণ করুন।</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">যাচাই করার পর, আপনি মেসেজ পাঠানো চালিয়ে যেতে পারবেন। স্থগিত করা যেকোনো বার্তা স্বয়ংক্রিয়ভাবে পাঠানো হবে।</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">আমার স্টোরি</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal কল</string>
+    <string name="Recipient_signal_call">Molly কল</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">ব্লক করুন</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">রিং হচ্ছে …</string>
     <string name="RedPhone_busy">ব্যাস্ত আছে</string>
     <string name="RedPhone_recipient_unavailable">প্রাপককে পাওয়া যাচ্ছে না</string>
-    <string name="RedPhone_network_failed">নেটওয়ার্ক ব্যর্থ!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">নেটওয়ার্ক ব্যর্থ! অনুগ্রহ করে আপনার নেটওয়ার্ক সংযোগ ঠিক আছে কি না দেখুন এবং আবার চেষ্টা করুন।</string>
     <string name="RedPhone_number_not_registered">নাম্বারটি নিবন্ধিত নয়!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">আপনার ডায়াল করা নাম্বার সুরক্ষিত ভয়েস সমর্থন করে না!</string>
     <string name="RedPhone_got_it">বুঝতে পেরেছি</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">আপনার ভিডিও চালু করতে এখানে আলতো চাপুন</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s কে ফোন করতে Signal কে আপনার ক্যামেরা ব্যাবহার করতে হবে।</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s কে ফোন করতে Molly কে আপনার ক্যামেরা ব্যাবহার করতে হবে।</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">কল করা হচ্ছে…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">পুনঃসংযোগ হচ্ছে …</string>
@@ -1935,9 +2019,29 @@
     <string name="WebRtcCallActivity__removed_from_call">কল থেকে সরানো হয়েছে</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">কেউ আপনাকে কল থেকে সরিয়ে দিয়েছেন।</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">আপনার ক্যামেরা ও মাইক্রোফোনে অ্যাক্সেসের অনুমতি দিন</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">আপনার মাইক্রোফোনে অ্যাক্সেসের অনুমতি দিন</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">আপনার ক্যামেরায় অ্যাক্সেসের অনুমতি দিন</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">কোনো কল শুরু করতে বা যোগ দিতে, আপনার ক্যামেরা এবং মাইক্রোফোনে Molly-এর অ্যাক্সেসের অনুমতি দিন।</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">কোনো কল শুরু করতে বা কলে যোগ দিতে, আপনার মাইক্রোফোনে Molly-এ অ্যাক্সেসের অনুমতি দিন।</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">আপনার ভিডিও সক্রিয় করতে, আপনার ক্যামেরায় Molly-কে অ্যাক্সেসের অনুমতি দিন।</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">কোনো কল শুরু করতে বা কলে যোগ দিতে Molly-এর মাইক্রোফোনে অ্যাক্সেসের অনুমতি প্রয়োজন।</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">আপনার ভিডিও সক্রিয় করতে Molly-এর ক্যামেরা অ্যাক্সেসের প্রয়োজন</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">কোনো কল শুরু করতে বা কলে যোগ দিতে:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">আপনার ভিডিও সক্রিয় করতে:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal কল</string>
+    <string name="WebRtcCallView__signal_call">Molly কল</string>
     <string name="WebRtcCallView__signal_video_call">সিগন্যাল ভিডিও কল</string>
     <string name="WebRtcCallView__start_call">কল শুরু করুন</string>
     <string name="WebRtcCallView__join_call">কলে যোগ দিন</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">হাত নামবেন?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">হাত নামান</string>
+    <string name="CallOverflowPopupWindow__lower_hand">নামান</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">বাতিল করুন</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">আপনি হাত তুলেছেন</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">দেখুন</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s হাত তুলেছেন</item>
-        <item quantity="other">%1$s + %2$d হাত তুলেছেন</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s হাত তুলেছেন</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d হাত তুলেছেন</item>
+        <item quantity="other">%1$s +%2$d হাত তুলেছেন</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s হাত তুলেছেন</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d হাত তুলেছেন</item>
+        <item quantity="other">%1$s +%2$d হাত তুলেছেন</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">এই নম্বরটি যাচাই করার জন্য আপনি একটি কল পাবেন।</string>
     <string name="RegistrationActivity_edit_number">নম্বর সম্পাদনা</string>
     <string name="RegistrationActivity_missing_google_play_services">গুগল প্লে সার্ভিস নিখোজ</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">এই ডিভাইস টিতে গুগল প্লে পরিষেবাদি অনুপস্থিত। আপনি এখনও সিগন্যাল ব্যবহার করতে পারেন, তবে এই কনফিগারেশনের ফলে নির্ভরযোগ্যতা বা কার্যকারিতা হ্রাস পেতে পারে। \n\\ আপনি যদি এ্যাডভান্স ব্যবহারকারী না হন, তাছাড়া কোনও পরিবর্তিত অ্যানড্রয়েড রম চালিয়ে যাচ্ছেন না, বা মনে করছেন যে, আপনি এই ত্রুটি ভুল করে দেখছেন। দয়া করে সমস্যা সমাধানের জন্য support@signal.org ঠিকানায় পরিচিতি করুন।</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">এই ডিভাইস টিতে গুগল প্লে পরিষেবাদি অনুপস্থিত। আপনি এখনও সিগন্যাল ব্যবহার করতে পারেন, তবে এই কনফিগারেশনের ফলে নির্ভরযোগ্যতা বা কার্যকারিতা হ্রাস পেতে পারে। \n\\ আপনি যদি এ্যাডভান্স ব্যবহারকারী না হন, তাছাড়া কোনও পরিবর্তিত অ্যানড্রয়েড রম চালিয়ে যাচ্ছেন না, বা মনে করছেন যে, আপনি এই ত্রুটি ভুল করে দেখছেন। দয়া করে সমস্যা সমাধানের জন্য support@molly.im ঠিকানায় পরিচিতি করুন।</string>
     <string name="RegistrationActivity_i_understand">আমি বুঝতে পেরেছি</string>
     <string name="RegistrationActivity_play_services_error">প্লে সার্ভিস সমস্যা</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">গুগল প্লে পরিষেবাদি আপডেট করছে বা অস্থায়ীভাবে অনুপলব্ধ। অনুগ্রহপূর্বক আবার চেষ্টা করুন।</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">নন-স্ট্যান্ডার্ড নম্বর বিন্যাস</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">আপনি যে নম্বরটি প্রবেশ করেছেন (%1$s) সেটি একটি অ-মানক বিন্যাস বলে মনে হচ্ছে।\n\nআপনি কি %2$s বলতে চান?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal অ্যান্ড্রয়েড - ফোন নম্বর ফর্ম্যাট</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly অ্যান্ড্রয়েড - ফোন নম্বর ফর্ম্যাট</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">কল অনুরোধ করা হয়েছে</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">রেজিস্ট্রেশন করতে সমস্যা হচ্ছে?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• নিশ্চিত করুন যে আপনার ফোনে আপনার এসএমএস বা কল পাওয়ার জন্য একটি সেলুলার সিগন্যাল রয়েছে\n • নিশ্চিত করুন যে আপনি আপনার নম্বরে একটি ফোন কল পেতে পারেন\n • আপনি আপনার ফোন নম্বর সঠিকভাবে লিখেছেন কি না তা যাচাই করুন।</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">আরো তথ্যের জন্য, অনুগ্রহ করে সমস্যা সমাধানের এই ধাপগুলো অনুসরণ করুন বা সহায়তা কেন্দ্রের সাথে যোগাযোগ করুন</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">আরো তথ্য জানতে, অনুগ্রহ করে %1$s বা %2$s-কে অনুসরণ করুন</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">সমস্যা সমাধানের এই ধাপগুলো</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">পরিচিতি যুক্ত করুন</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Signal এ আমন্ত্রণ জানান</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Molly এ আমন্ত্রণ জানান</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal বার্তা</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal কল</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">পরিচিতিতে যুক্ত করুন</string>
-    <string name="SharedContactView_invite_to_signal">Signal এ আমন্ত্রণ জানান</string>
+    <string name="SharedContactView_invite_to_signal">Molly এ আমন্ত্রণ জানান</string>
     <string name="SharedContactView_message">Signal বার্তা</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s নম্বরটি %2$s-এর</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal আপডেট</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal-এর একটি নতুন সংস্করণ পাওয়া যাচ্ছে। আপডেট করতে ট্যাপ করুন।</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal আপডেট করতে ব্যর্থ হয়েছে</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly আপডেট</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly-এর একটি নতুন সংস্করণ পাওয়া যাচ্ছে। আপডেট করতে ট্যাপ করুন।</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly আপডেট করতে ব্যর্থ হয়েছে</string>
     <string name="ApkUpdateNotifications_failed_general_body">আমরা পরে আবার চেষ্টা করবো।</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal সফলভাবে আপডেট করা হয়েছে</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly সফলভাবে আপডেট করা হয়েছে</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">আপনি স্বয়ংক্রিয়ভাবে %1$s সংস্করণে আপডেট হয়েছেন।</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">আমাদের Signal নিরাপত্তা নাম্বার:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">আপনার কাছে শেয়ার করতে পারবেন এমন কোন অ্যাপ নেই।</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">ক্লিপবোর্ডে তুলনার মতো কোনও নিরাপত্তা নাম্বার পাওয়া যায় নি</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">কোনও কিউআর কোড স্ক্যান করার জন্য Signal এর ক্যামেরা অনুমতি প্রয়োজন তবে এটি স্থায়ীভাবে অস্বীকার করা হয়েছে। দয়া করে অ্যাপ সেটিংসে যান, \"অনুমতিগুলি\" নির্বাচন করুন এবং \"ক্যামেরা\" সক্ষম করুন।</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">কোনও কিউআর কোড স্ক্যান করার জন্য Molly এর ক্যামেরা অনুমতি প্রয়োজন তবে এটি স্থায়ীভাবে অস্বীকার করা হয়েছে। দয়া করে অ্যাপ সেটিংসে যান, \"অনুমতিগুলি\" নির্বাচন করুন এবং \"ক্যামেরা\" সক্ষম করুন।</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">ক্যামেরা অনুমতি ছাড়া কিউআর কোড স্ক্যান করা সম্ভব নয়</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">%1$s-এর নিরাপত্তা নাম্বার দেখতে আপনাকে প্রথমে তার সাথে মেসেজ আদান-প্রদান করতে হবে।</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">খোলার জন্য স্পর্শ করুন।</string>
-    <string name="KeyCachingService_passphrase_cached">Signal আনলক করা আছে</string>
-    <string name="KeyCachingService_lock">Signal লক্ করুন</string>
+    <string name="KeyCachingService_passphrase_cached">Molly আনলক করা আছে</string>
+    <string name="KeyCachingService_lock">Molly লক্ করুন</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">আপনি</string>
     <string name="MediaPreviewActivity_unssuported_media_type">অসমর্থিত ধরনের মিডিয়া</string>
     <string name="MediaPreviewActivity_draft">খসড়া</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">বাহ্যিক স্টোরেজে সংরক্ষণের জন্য Signalএর স্টোরেজের অনুমতি প্রয়োজন তবে এটি স্থায়ীভাবে অস্বীকার করা হয়েছে। দয়া করে অ্যাপ্লিকেশন সেটিংসে যান, \"অনুমতিগুলি\" নির্বাচন করুন এবং \"স্টোরেজ\" সক্ষম করুন।</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">বাহ্যিক স্টোরেজে সংরক্ষণের জন্য Mollyএর স্টোরেজের অনুমতি প্রয়োজন তবে এটি স্থায়ীভাবে অস্বীকার করা হয়েছে। দয়া করে অ্যাপ্লিকেশন সেটিংসে যান, \"অনুমতিগুলি\" নির্বাচন করুন এবং \"স্টোরেজ\" সক্ষম করুন।</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">অনুমতি ব্যতীত বাহ্যিক স্টোরেজে সংরক্ষণ করতে অক্ষম</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">বার্তা মুছে ফেলবেন?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">এর ফলে এই বার্তাটি চিরতরে মুছে যাবে।</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">বার্তা পৌছে দিতে ব্যর্থ।</string>
     <string name="MessageNotifier_error_delivering_message">বার্তা পৌছানোর সময় ত্রুটি।</string>
     <string name="MessageNotifier_message_delivery_paused">মেসেজ পাঠানো পজ করা আছে।</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Signal-এ মেসেজ পাঠানো চালিউয়ে যেতে যাচাই করুন।</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Molly-এ মেসেজ পাঠানো চালিউয়ে যেতে যাচাই করুন।</string>
     <string name="MessageNotifier_mark_all_as_read">সবগুলো পঠিত বলে সনাক্ত কর।</string>
     <string name="MessageNotifier_mark_read">পঠিত বলে সনাক্ত কর</string>
     <string name="MessageNotifier_turn_off_these_notifications">এই নোটিফিকেশনগুলো বন্ধ করতে চান?</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">আপনার স্টিকারে %1$s রিঅ্যাক্ট করেছেন।</string>
     <string name="MessageNotifier_this_message_was_deleted">এই বার্তাটি মুছে ফেলা হয়েছে।</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">কন্ট্যাক্টের Signal-এ যোগ দেওয়ার নোটিফিকেশনটি বন্ধ করবেন? আপনি Signal &gt; সেটিংস &gt; নোটিফিকেশন অপশনে গিয়ে এটি চালু করতে পারবেন।</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">কন্ট্যাক্টের Molly-এ যোগ দেওয়ার নোটিফিকেশনটি বন্ধ করবেন? আপনি Molly &gt; সেটিংস &gt; নোটিফিকেশন অপশনে গিয়ে এটি চালু করতে পারবেন।</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signal লক্ করা থাকলে দ্রুত প্রত্যুত্তর দেওয়া সম্ভব নয়!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Molly লক্ করা থাকলে দ্রুত প্রত্যুত্তর দেওয়া সম্ভব নয়!</string>
     <string name="QuickResponseService_problem_sending_message">বার্তা প্রেরণে সমস্যা!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">অকার্যকর শর্টকাট</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">নতুন বার্তা</string>
     <string name="SingleRecipientNotificationBuilder_message_request">মেসেজের অনুরোধ</string>
     <string name="SingleRecipientNotificationBuilder_you">আপনি</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">এই ডিভাইসটি আর নিবন্ধিত নয়। এটি হওয়ার সম্ভাব্য কারণ হলো, আপনি হয়তো একটি ভিন্ন ডিভাইসে Signal-এর সাথে আপনার ফোন নম্বর নিবন্ধন করেছেন।</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">এই ডিভাইসটি আর নিবন্ধিত নয়। এটি হওয়ার সম্ভাব্য কারণ হলো, আপনি হয়তো একটি ভিন্ন ডিভাইসে Molly-এর সাথে আপনার ফোন নম্বর নিবন্ধন করেছেন।</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">ডিভাইসটি আবারো নিবন্ধন করুন</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">কলের উত্তর দিতে, Signal-কে আপনার মাইক্রোফোন অ্যাক্সেস দিন।</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">কলের উত্তর দিতে, Molly-কে আপনার মাইক্রোফোন অ্যাক্সেস দিন।</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">ভিডিও কলের উত্তর দিতে, Signal-কে আপনার মাইক্রোফোন এবং ক্যামেরায় অ্যাক্সেস দিন।</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">কল সমূহ করতে বা গ্রহণের জন্য Signal এর মাইক্রোফোন এবং ক্যামেরা ব্যবহারের অনুমতি প্রয়োজন, তবে সেগুলি স্থায়ীভাবে অস্বীকার করা হয়েছে। দয়া করে অ্যাপ্লিকেশন সেটিংসে যান এবং \"অনুমতিগুলি\" নির্বাচন করুন এবং \"মাইক্রোফোন\" এবং \"ক্যামেরা\" সক্ষম করুন |</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">ভিডিও কলের উত্তর দিতে, Molly-কে আপনার মাইক্রোফোন এবং ক্যামেরায় অ্যাক্সেস দিন।</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">কল সমূহ করতে বা গ্রহণের জন্য Molly এর মাইক্রোফোন এবং ক্যামেরা ব্যবহারের অনুমতি প্রয়োজন, তবে সেগুলি স্থায়ীভাবে অস্বীকার করা হয়েছে। দয়া করে অ্যাপ্লিকেশন সেটিংসে যান এবং \"অনুমতিগুলি\" নির্বাচন করুন এবং \"মাইক্রোফোন\" এবং \"ক্যামেরা\" সক্ষম করুন |</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">সংযুক্ত ডিভাইসে উত্তর দেওয়া হয়েছে।</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">সংযুক্ত ডিভাইসে অস্বীকার করা হয়েছে।</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">সংযুক্ত ডিভাইসে ব্যাস্ত।</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">নতুন পাসফ্রেজ পুনরাবৃত্তি করুন</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Signal এ নিমন্ত্রণ করুন</string>
+    <string name="contact_selection_activity__invite_to_signal">Molly এ নিমন্ত্রণ করুন</string>
     <string name="contact_selection_activity__new_group">নতুন গ্রুপ</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">কন্টাক্ট রিফ্রেশ করুন</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">কাউকে মিস করছেন? রিফ্রেশ করার চেষ্টা করুন</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Signal-এ আপনার পরিচিত লোকদের খুঁজুন</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">আপনার কন্টাক্টে অ্যাক্সেসের অনুমতি দিন</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">আরো</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">পরিচিতির ছবি</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">আপনার পরিচিতিসমূহ দেখানোর জন্য Signal এর পরিচিতি পাঠের অনুমতি প্রয়োজন তবে এটি স্থায়ীভাবে অস্বীকার করা হয়েছে। দয়া করে অ্যাপ্লিকেশন সেটিংসে যান এবং \"অনুমতিগুলি\" নির্বাচন করুন এবং \"পরিচিতি\" সক্ষম করুন।</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">আপনার পরিচিতিসমূহ দেখানোর জন্য Molly এর পরিচিতি পাঠের অনুমতি প্রয়োজন তবে এটি স্থায়ীভাবে অস্বীকার করা হয়েছে। দয়া করে অ্যাপ্লিকেশন সেটিংসে যান এবং \"অনুমতিগুলি\" নির্বাচন করুন এবং \"পরিচিতি\" সক্ষম করুন।</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">পরিচিতি পুনরুদ্ধারে ত্রুটি, আপনার নেটওয়ার্ক সংযোগটি পরীক্ষা করুন</string>
     <string name="ContactSelectionListFragment_username_not_found">ব্যবহারকারীর নাম খুঁজে পাওয়া যায়নি</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" কোনো Signal ব্যবহারকারী নয়। দয়া করে ব্যবহারকারীর নামটি পরীক্ষা করুন এবং আবার চেষ্টা করুন।"</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">ব্যবহারকারীর নাম দিয়ে খুঁজুন</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">কন্টাক্টে অ্যাক্সেসের অনুমতি দিন</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Signal-এ আপনার পরিচিত লোকদের খুঁজে পেতে:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">অ্যাক্সেসের অনুমতি দিন</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">না ধন্যবাদ</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">আপনার কন্টাক্টে অ্যাক্সেসের অনুমতি দিন। আপনার কন্টাক্টগুলো এনক্রিপ্ট করা অবস্থায় আছে এবং সেগুলো Signal পরিষেবায় দৃশ্যমান নয়।</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal আপনার পরিচিতিসমূহ প্রদর্শন করতে তাদের প্রবেশাধিকার প্রয়োজন।</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly আপনার পরিচিতিসমূহ প্রদর্শন করতে তাদের প্রবেশাধিকার প্রয়োজন।</string>
     <string name="contact_selection_list_fragment__show_contacts">পরিচিতিসমূহ দেখান</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">আপনি এই ব্যক্তিকে মুছে ফেলেছেন, তাকে আবার মেসেজ পাঠালে আপনার তালিকায় তাকে আবার যোগ করা হবে।</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">অপশন</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">আপডেট করুন</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">চালু…. বিরতি</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">বাবলস একটি Android ফিচার যা আপনি Signal চ্যাটের ক্ষেত্রে বন্ধ করতে পারবেন।</string>
+    <string name="BubbleOptOutTooltip__description">বাবলস একটি Android ফিচার যা আপনি Molly চ্যাটের ক্ষেত্রে বন্ধ করতে পারবেন।</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">এখন না</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">গ্রুপের বিবরণ</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Signal আপডেট করুন</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Molly আপডেট করুন</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Signal-এর এই সংস্করণটির মেয়াদ শেষ হয়ে গেছে। Signal ব্যবহার চালিয়ে যেতে এখনই আপডেট করুন।</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Molly-এর এই সংস্করণটির মেয়াদ শেষ হয়ে গেছে। Molly ব্যবহার চালিয়ে যেতে এখনই আপডেট করুন।</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">আপডেট করুন</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">ধীর</string>
     <string name="preferences__help">সাহায্য</string>
     <string name="preferences__advanced">উন্নততর</string>
-    <string name="preferences__donate_to_signal">Signal-এ ডোনেট করুন</string>
+    <string name="preferences__donate_to_signal">Molly-এ ডোনেট করুন</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">গোপনীয়তা</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">অ্যাপ আইকন ও নাম \"%1$s\"-এ পরিবর্তন করুন</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">অ্যাপ আইকন ও নাম পরিবর্তন করতে Signal বন্ধ করতে হবে। নোটিফিকেশনে সবসময় ডিফল্ট Signal আইকন ও নাম দেখা যাবে।</string>
+    <string name="preferences__app_icon_dialog_description">অ্যাপ আইকন ও নাম পরিবর্তন করতে Molly বন্ধ করতে হবে। নোটিফিকেশনে সবসময় ডিফল্ট Molly আইকন ও নাম দেখা যাবে।</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">একটি অ্যাপ আইকন ও নাম বেছে নিন, যা আপনার ফোনের হোম স্ক্রিন এবং অ্যাপ ড্রয়ারে দেখা যাবে। নোটিফিকেশনে সবসময় ডিফল্ট Signal আইকন ও নাম দেখা যাবে। আরো জানুন</string>
+    <string name="preferences__app_icon_warning_learn_more">একটি অ্যাপ আইকন ও নাম বেছে নিন, যা আপনার ফোনের হোম স্ক্রিন এবং অ্যাপ ড্রয়ারে দেখা যাবে। নোটিফিকেশনে সবসময় ডিফল্ট Molly আইকন ও নাম দেখা যাবে। আরো জানুন</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">অ্যাপ আইকন ও নাম হোম স্ক্রিন ও অ্যাপ ড্রয়ারে দৃশ্যমান।</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">নোটিফিকেশনে সবসময় ডিফল্ট Signal আইকন ও নাম দেখা যাবে।</string>
+    <string name="preferences__app_icon_notification_warning">নোটিফিকেশনে সবসময় ডিফল্ট Molly আইকন ও নাম দেখা যাবে।</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">আরো জানুন</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">এটি সকল চ্যাটকে স্থায়ীভাবে সাজিয়ে সর্বশেষ %1$sটি ম্যাসেজ দেখাবে।</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">এটি আপনার ডিভাইস থেকে বার্তার সকল ইতিহাস ও মিডিয়া চিরতরে মুছে ফেলবে।</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">এটি এই ডিভাইস এবং যেকোনো লিংককৃত ডিভাইস থেকে সকল মেসেজের ইতিহাস এবং মিডিয়া স্থায়ীভাবে মুছে ফেলবে।</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">আপনি কি বার্তার সকল ইতিহাস মুছে ফেলার ব্যাপারে নিশ্চিত?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">বার্তার সকল ইতিহাস স্থায়ীভাবে মুছে ফেলা হবে। এই কাজটি পূর্বাবস্থায় ফেরানো যাবে না।</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">সকল মেসেজের ইতিহাস স্থায়ীভাবে সকল ডিভাইস থেকে মুছে ফেলা হবে। এই কার্যক্রমটি পূর্বাবস্থায় ফেরানো যাবে না।</string>
     <string name="preferences_storage__delete_all_now">এখনই সব মুছে ফেলুন</string>
     <string name="preferences_storage__forever">চিরতরে</string>
     <string name="preferences_storage__one_year">১ বছর</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">সেন্সরশিপ উপেক্ষা</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">সেন্সরশিপ উপেক্ষা</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">যদি সক্ষম করা থাকে তবে Signal সেন্সরশিপকে ছিন্ন করার চেষ্টা করবে। আপনি যদি এমন কোনও স্থানে না থাকেন যেখানে Signal সেন্সর করা রয়েছে তবে এই বৈশিষ্ট্যটি সচল করবেন না।</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">যদি সক্ষম করা থাকে তবে Molly সেন্সরশিপকে ছিন্ন করার চেষ্টা করবে। আপনি যদি এমন কোনও স্থানে না থাকেন যেখানে Molly সেন্সর করা রয়েছে তবে এই বৈশিষ্ট্যটি সচল করবেন না।</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">আপনার অ্যাকাউন্ট ফোন নাম্বার এর ভিত্তিতে সেন্সরশিপ এড়ানো সক্রিয় করা হয়েছে।</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">পেমেন্ট পরিচিতি</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">গোপনীয়তাকে গুরুত্ব দেয় এমন একটি নতুন ডিজিটাল মুদ্রা MobileCoin পাঠাতে ও গ্রহণ করতে Signal ব্যবহার করুন। শুরু করতে সক্রিয় করুন।</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">গোপনীয়তাকে গুরুত্ব দেয় এমন একটি নতুন ডিজিটাল মুদ্রা MobileCoin পাঠাতে ও গ্রহণ করতে Molly ব্যবহার করুন। শুরু করতে সক্রিয় করুন।</string>
     <string name="PaymentsHomeFragment__activate_payments">অর্থ প্রদানের উপায় সক্রিয় করুন</string>
     <string name="PaymentsHomeFragment__activating_payments">অর্থ প্রদানের উপায় সক্রিয় করা হচ্ছে</string>
     <string name="PaymentsHomeFragment__restore_payments_account">পেমেন্ট অ্যাকাউন্ট পুনর্বহাল করুন</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">আপনার অঞ্চল থেকে অর্থ প্রদান উপলভ্য নয়।</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">অর্থ প্রদান করা সক্ষম করা যায়নি। পরে আবার চেষ্টা করুন।</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">পেমেন্ট বন্ধ করবেন?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">আপনি পেমেন্ট বন্ধ করলে Signal-এ Mobilecoin পাঠাতে বা গ্রহণ করতে পারবেন না।</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">আপনি পেমেন্ট বন্ধ করলে Molly-এ Mobilecoin পাঠাতে বা গ্রহণ করতে পারবেন না।</string>
     <string name="PaymentsHomeFragment__deactivate">বন্ধ করুন</string>
     <string name="PaymentsHomeFragment__continue">চলতে থাকুন</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">ব্যালেন্স বর্তমানে উপলভ্য নয়।</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">খুঁটিনাটি</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">আপনি MobileCoin পাঠাতে ও গ্রহণ করতে Signal ব্যবহার করতে পারেন। সকল পেমেন্ট MobileCoins ও MobileCoin ওয়ালেট ব্যবহারের শর্তাবলী মেনে সম্পাদিত হয়। আপনি কিছু কিছু সমস্যার সম্মুখীন হতে পারেন এবং আপনার হারানো পেমেন্ট বা ব্যালেন্স পুনরুদ্ধার করা যাবে না। </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">আপনি MobileCoin পাঠাতে ও গ্রহণ করতে Molly ব্যবহার করতে পারেন। সকল পেমেন্ট MobileCoins ও MobileCoin ওয়ালেট ব্যবহারের শর্তাবলী মেনে সম্পাদিত হয়। আপনি কিছু কিছু সমস্যার সম্মুখীন হতে পারেন এবং আপনার হারানো পেমেন্ট বা ব্যালেন্স পুনরুদ্ধার করা যাবে না। </string>
     <string name="PaymentsHomeFragment__activate">সক্রিয় করুন</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoin-এর শর্তাবলী দেখুন</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Signal-এ পেমেন্ট আর উপলভ্য নেই। আপনি এখনও কোনও এক্সচেঞ্জে আপনার ফান্ডগুলি ট্রান্সফার করতে পারেন তবে আপনি আর পেমেন্টগুলি প্রেরণ এবং গ্রহণ করতে বা ফান্ড যোগ করতে পারবেন না।</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Molly-এ পেমেন্ট আর উপলভ্য নেই। আপনি এখনও কোনও এক্সচেঞ্জে আপনার ফান্ডগুলি ট্রান্সফার করতে পারেন তবে আপনি আর পেমেন্টগুলি প্রেরণ এবং গ্রহণ করতে বা ফান্ড যোগ করতে পারবেন না।</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">অনুমতি দিন</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">আপনার পরিচিত ব্যক্তিদের মেসেজ করতে সাহায্য করার জন্য, Signal এই অনুমতিগুলোর জন্য অনুরোধ করবে। </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">আপনার পরিচিত ব্যক্তিদের মেসেজ করতে সাহায্য করার জন্য, Molly এই অনুমতিগুলোর জন্য অনুরোধ করবে। </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">নোটিফিকেশন</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">পরবর্তী</string>
     <string name="PaymentsTransferFragment__invalid_address">ভুল ঠিকানা</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">আপনি যে ওয়ালেটের ঠিকানাতে স্থানান্তর করার চেষ্টা করছেন তা পরীক্ষা করে আবার চেষ্টা করুন।</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">আপনি নিজের Signal ওয়ালেট ঠিকানায় স্থানান্তর করতে পারবেন না। একটি সমর্থিত এক্সচেঞ্জ এ আপনার অ্যাকাউন্ট থেকে ওয়ালেট ঠিকানা লিখুন।</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">কোনও কিউআর কোড স্ক্যান করতে Signal এর ক্যামেরা অ্যাক্সেস করা দরকার।</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">একটি কিউআর কোড ক্যাপচারের জন্য Signal এর ক্যামেরার অনুমতি প্রয়োজন। সেটিংসে যান, \"অনুমতিগুলি\" নির্বাচন করুন এবং \"ক্যামেরা\" সক্ষম করুন।</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">কোনও কিউআর কোড স্ক্যান করতে Signal এর ক্যামেরা অ্যাক্সেস করা দরকার।</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">আপনি নিজের Molly ওয়ালেট ঠিকানায় স্থানান্তর করতে পারবেন না। একটি সমর্থিত এক্সচেঞ্জ এ আপনার অ্যাকাউন্ট থেকে ওয়ালেট ঠিকানা লিখুন।</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">কোনও কিউআর কোড স্ক্যান করতে Molly এর ক্যামেরা অ্যাক্সেস করা দরকার।</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">একটি কিউআর কোড ক্যাপচারের জন্য Molly এর ক্যামেরার অনুমতি প্রয়োজন। সেটিংসে যান, \"অনুমতিগুলি\" নির্বাচন করুন এবং \"ক্যামেরা\" সক্ষম করুন।</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">কোনও কিউআর কোড স্ক্যান করতে Molly এর ক্যামেরা অ্যাক্সেস করা দরকার।</string>
     <string name="PaymentsTransferFragment__settings">সেটিংস</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Signal ভয়েস কল আসছে</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Molly ভয়েস কল আসছে</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Signal ভিডিও কল আসছে</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Molly ভিডিও কল আসছে</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
     <string name="CallNotificationBuilder__incoming_signal_group_call">ইনকামিং সিগন্যাল গ্রুপ কল</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">চলমান Signal ভয়েস কল</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">চলমান Molly ভয়েস কল</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">চলমান Signal ভিডিও কল</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">চলমান Molly ভিডিও কল</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">চলমান Signal গ্ৰুপ কল</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">চলমান Molly গ্ৰুপ কল</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">লোড হচ্ছে…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">যাচাই করুন</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">আপনি সফলভাবে আপনার ব্যাকআপ পাসফ্রেজটি প্রবেশ করিয়েছেন</string>
     <string name="BackupDialog_passphrase_was_not_correct">পাসফ্রেজ সঠিক ছিলোনা।</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signal ব্যাকআপ তৈরি করা হচ্ছে…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Molly ব্যাকআপ তৈরি করা হচ্ছে…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Signal ব্যাকআপ যাচাই করা হচ্ছে…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Molly ব্যাকআপ যাচাই করা হচ্ছে…</string>
     <string name="LocalBackupJobApi29_backup_failed">ব্যাকআপ ব্যর্থ হয়েছে</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">আপনার ব্যাকআপ ডিরেক্টরি মুছে ফেলা হয়েছে বা সরানো হয়েছে।</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">আপনার ব্যাকআপ ফাইলটি এই স্থানে সংরক্ষণ করার জন্য খুব বড়।</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">আমাকে কল করুন (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">কোডটি আবারো পাঠান (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Signal সহায়তায় যোগাযোগ করুন</string>
-    <string name="RegistrationActivity_code_support_subject">Signal নিবন্ধন - অ্যানড্রয়েড এর জন্য যাচাইকরণ কোড</string>
+    <string name="RegistrationActivity_contact_signal_support">Molly সহায়তায় যোগাযোগ করুন</string>
+    <string name="RegistrationActivity_code_support_subject">Molly নিবন্ধন - অ্যানড্রয়েড এর জন্য যাচাইকরণ কোড</string>
     <string name="RegistrationActivity_incorrect_code">ভুল কোড</string>
     <string name="BackupUtil_never">কখনোই না</string>
     <string name="BackupUtil_unknown">অজানা</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">ফোন নম্বর</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">আপনার ফোন নম্বর কে দেখতে পাবেন এবং এটি ব্যবহার করে Signal-এ কে আপনার সাথে যোগাযোগ করতে পারবেন তা নির্বাচন করুন।</string>
+    <string name="preferences_app_protection__choose_who_can_see">আপনার ফোন নম্বর কে দেখতে পাবেন এবং এটি ব্যবহার করে Molly-এ কে আপনার সাথে যোগাযোগ করতে পারবেন তা নির্বাচন করুন।</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">আমার নম্বর কে দেখতে পাবেন</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">আপনি অনেক বেশী প্রচেষ্টা চালিয়েছেন। দয়াকরে পরবর্তীতে আবার চেষ্টা করুন।</string>
     <string name="RegistrationActivity_error_connecting_to_service">পরিষেবাতে সংযোগ করার সময় ত্রুটি</string>
     <string name="preferences_chats__backups">ব্যাকআপ সমূহ</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal লক্ করা আছে</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly লক্ করা আছে</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">লক্ খুলতে ট্যাপ করুন</string>
     <string name="Recipient_unknown">অজানা</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">আপনার পুরনো ডিভাইসে আপনার অ্যাক্সেস থাকতে হবে।</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">ব্যাকআপ থেকে পুনরুদ্ধার করুন</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">একটি স্থানীয় ব্যাকআপ থেকে আপনার মেসেজগুলো পুনরুদ্ধার করুন। আপনি এখনই পুনরুদ্ধার না করলে, পরে আর করতে পারবেন না।</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">স্থানীয় ব্যাকআপ পুনর্বহাল করুন</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signal ব্যাকআপ পুনর্বহাল করুন</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">আপনার সকল টেক্সট মেসেজ + আপনার বিগত 30 দিনের মিডিয়া পুনর্বহাল করুন</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">আরো অপশন</string>
 
+    <string name="TransferOrRestoreFragment__cancel">বাতিল করুন</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">স্থানান্তর করা ছাড়াই লগ ইন করুন</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">আপনার মেসেজ এবং মিডিয়া স্থানান্তর না করেই চালিয়ে যান</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">আপনার পুরনো Android ফোনে Signal খুলুন</string>
     <string name="NewDeviceTransferInstructions__continue">চলতে থাকুন</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">পুরনো Android ডিভাইসের সাথে সংযোগের প্রস্তুতি নিচ্ছে…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">কিছু সময় নিচ্ছে, শীঘ্রই প্রস্তুত হয়ে যাবে</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">পুরনো Android ডিভাইসের সংযোগের জন্য অপেক্ষা করছে…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">আপনার পুরনো Android ডিভাইস খুঁজে পেতে ও সংযুক্ত করতে Signal-এর লোকেশনের অনুমতি আবশ্যক।</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">আপনার পুরনো Android ডিভাইস খুঁজে পেতে ও সংযুক্ত করতে Signal-এর জন্য লোকেশন পরিষেবাটি চালু থাকতে হবে।</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">আপনার পুরনো Android ডিভাইস খুঁজে পেতে ও সংযুক্ত করতে Signal-এর ওয়াই-ফাই চালু থাকতে হবে। ওয়াই-ফাই চালু থাকতে হবে, কিন্তু এটি কোন ওয়াই-ফাই নেটওয়ার্কের সাথে সংযুক্ত থাকার দরকার নেই।</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">দুঃখিত, মনে হচ্ছে এই ডিভাইসটি Wi-Fi Direct-কে সমর্থন করে না। Signal আপনার পুরানো Android ডিভাইসটি খুঁজে পেতে এবং সংযোগ করতে Wi-Fi Direct ব্যবহার করে। আপনার পুরানো Android ডিভাইস থেকে আপনার অ্যাকাউন্টটি পুনরুদ্ধার করতে আপনি এখনও একটি ব্যাকআপ পুনরুদ্ধার করতে পারেন।</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">আপনার পুরনো Android ডিভাইস খুঁজে পেতে ও সংযুক্ত করতে Molly-এর লোকেশনের অনুমতি আবশ্যক।</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">আপনার পুরনো Android ডিভাইস খুঁজে পেতে ও সংযুক্ত করতে Molly-এর জন্য লোকেশন পরিষেবাটি চালু থাকতে হবে।</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">আপনার পুরনো Android ডিভাইস খুঁজে পেতে ও সংযুক্ত করতে Molly-এর ওয়াই-ফাই চালু থাকতে হবে। ওয়াই-ফাই চালু থাকতে হবে, কিন্তু এটি কোন ওয়াই-ফাই নেটওয়ার্কের সাথে সংযুক্ত থাকার দরকার নেই।</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">দুঃখিত, মনে হচ্ছে এই ডিভাইসটি Wi-Fi Direct-কে সমর্থন করে না। Molly আপনার পুরানো Android ডিভাইসটি খুঁজে পেতে এবং সংযোগ করতে Wi-Fi Direct ব্যবহার করে। আপনার পুরানো Android ডিভাইস থেকে আপনার অ্যাকাউন্টটি পুনরুদ্ধার করতে আপনি এখনও একটি ব্যাকআপ পুনরুদ্ধার করতে পারেন।</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">একটি ব্যাকআপ পুনরুদ্ধার করুন</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">আপনার পুরনো Android ডিভাইসে সংযুক্ত হওয়ার চেষ্টাকালীন একটি অপ্রত্যাশিত সমস্যা হয়েছে।</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">নতুন Android ডিভাইস খোঁজা হচ্ছে…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">আপনার নতুন Android ডিভাইসটি খুঁজে পেতে এবং সংযোগ করতে Signal-এর লোকেশনের অনুমতি প্রয়োজন।</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">আপনার নতুন Android ডিভাইসটি খুঁজে পেতে এবং সংযোগের জন্য Signal-এর জন্য লোকেশন পরিষেবা চালু থাকতে হবে।</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">আপনার নতুন Android ডিভাইসটি খুঁজে পেতে এবং সংযুক্ত করতে Signal-এর ওয়াই-ফাই প্রয়োজন। ওয়াই-ফাই চালু থাকা প্রয়োজন তবে এটি কোনও ওয়াই-ফাই নেটওয়ার্কের সাথে সংযুক্ত থাকার দরকার নেই।</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">দুঃখিত, মনে হচ্ছে এটি এই ডিভাইসটি Wi-Fi Direct-কে সমর্থন করে না। Signal আপনার নতুন Android ডিভাইসটি খুঁজে পেতে এবং সংযুক্ত করতে Wi-Fi Direct ব্যবহার করে। আপনার নতুন Android ডিভাইসে আপনার অ্যাকাউন্টটি পুনরুদ্ধার করতে আপনি এখনও একটি ব্যাকআপ তৈরি করতে পারেন।</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">আপনার নতুন Android ডিভাইসটি খুঁজে পেতে এবং সংযোগ করতে Molly-এর লোকেশনের অনুমতি প্রয়োজন।</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">আপনার নতুন Android ডিভাইসটি খুঁজে পেতে এবং সংযোগের জন্য Molly-এর জন্য লোকেশন পরিষেবা চালু থাকতে হবে।</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">আপনার নতুন Android ডিভাইসটি খুঁজে পেতে এবং সংযুক্ত করতে Molly-এর ওয়াই-ফাই প্রয়োজন। ওয়াই-ফাই চালু থাকা প্রয়োজন তবে এটি কোনও ওয়াই-ফাই নেটওয়ার্কের সাথে সংযুক্ত থাকার দরকার নেই।</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">দুঃখিত, মনে হচ্ছে এটি এই ডিভাইসটি Wi-Fi Direct-কে সমর্থন করে না। Molly আপনার নতুন Android ডিভাইসটি খুঁজে পেতে এবং সংযুক্ত করতে Wi-Fi Direct ব্যবহার করে। আপনার নতুন Android ডিভাইসে আপনার অ্যাকাউন্টটি পুনরুদ্ধার করতে আপনি এখনও একটি ব্যাকআপ তৈরি করতে পারেন।</string>
     <string name="OldDeviceTransferSetup__create_a_backup">একটি ব্যাকআপ তৈরি করুন</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">আপনার নতুন Android ডিভাইসে সংযোগ দেওয়ার চেষ্টা করার সময় একটি অপ্রত্যাশিত ত্রুটি ঘটেছে।</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">তথ্য স্থানান্তর করা হচ্ছে</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">উভয় ডিভাইসকে একে অপরের কাছাকাছি রাখুন। ডিভাইসগুলো বন্ধ করবেন না এবং Signal চালু রাখুন। ট্রান্সফারগুলো এক প্রান্ত থেকে অপর প্রান্তে এনক্রিপ্ট করা অবস্থায় থাকে।</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">উভয় ডিভাইসকে একে অপরের কাছাকাছি রাখুন। ডিভাইসগুলো বন্ধ করবেন না এবং Molly চালু রাখুন। ট্রান্সফারগুলো এক প্রান্ত থেকে অপর প্রান্তে এনক্রিপ্ট করা অবস্থায় থাকে।</string>
     <string name="DeviceTransfer__d_messages_so_far">এখন পর্যন্ত %1$dটি মেসেজ…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">এখন পর্যন্ত %1$s%%-টি ম্যাসেজ</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">অ্যাকাউন্ট স্থানান্তর করুন</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">আপনার নতুন Android ডিভাইসে Signal ডাউনলোড করুন</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">আপনার নতুন Android ডিভাইসে Molly ডাউনলোড করুন</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"\"অ্যাকাউন্ট ট্রান্সফার বা পুনর্বহাল করুন\"-এ ট্যাপ করুন"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">এই লিঙ্ক থেকে যে কেউ গ্রুপের নাম এবং ফটো দেখতে এবং যোগদানের জন্য অনুরোধ করতে পারেন। আপনার বিশ্বস্ত মানুষের সাথে এটি শেয়ার করুন।</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">এই লিংকে যেয়ে যে কেউ গ্রুপটির নাম ও ছবি দেখতে এবং গ্রুপটিতে যোগ দিতে পারবেন। আপনার বিশ্বস্ত লোকদের সাথে এটি শেয়ার করুন।</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Signal এর মাধ্যমে শেয়ার করুন</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Molly এর মাধ্যমে শেয়ার করুন</string>
     <string name="GroupLinkBottomSheet_copy">অনুলিপি</string>
     <string name="GroupLinkBottomSheet_qr_code">কিউআর কোড</string>
     <string name="GroupLinkBottomSheet_share">শেয়ার করুন</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">MobileCoin সম্পর্কে</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin হলো গোপনীয়তার উপর গুরুত্ব দেয় এমন একটি নতুন ডিজিটাল মুদ্রা।</string>
     <string name="payment_info_card_adding_funds">ফান্ড যোগ করছে</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">আপনার ওয়ালেটের ঠিকানায় MobileCoin পাঠানোর মাধ্যমে আপনি Signal-এ ব্যবহারের জন্য ফান্ড পাঠাতে পারেন।</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">আপনার ওয়ালেটের ঠিকানায় MobileCoin পাঠানোর মাধ্যমে আপনি Molly-এ ব্যবহারের জন্য ফান্ড পাঠাতে পারেন।</string>
     <string name="payment_info_card_cashing_out">ক্যাশ আউট</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">MobileCoin-কে সাপোর্ট করে এমন যেকোনও কিছুর বিনিময়ে আপনি MobileCoin ক্যাশ আউট করতে পারবেন। কেবল সেটির বিনিময়ে আপনার অ্যাকাউন্টে টাকা ট্রান্সফার করুন।</string>
     <string name="payment_info_card_hide_this_card">এই কার্ডটি লুকাবেন?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">ওয়ালেট বন্ধ করুন</string>
     <string name="DeactivateWalletFragment__your_balance">আপনার ব্যালেন্স</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">পেমেন্ট নিষ্ক্রিয় করার পূর্বে আপনাকে আপনার অর্থ অন্য ওয়ালেটের ঠিকানায় পাঠানোর জন্য পরামর্শ দেওয়া হচ্ছে। আপনি এখন আপনার অর্থ পাঠাতে না চাইলে, পেমেন্ট পুনরায় চালু করার পর সেগুলো আপনার Signal-এর সাথে লিংককৃত ওয়ালেটেই থাকবে।</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">পেমেন্ট নিষ্ক্রিয় করার পূর্বে আপনাকে আপনার অর্থ অন্য ওয়ালেটের ঠিকানায় পাঠানোর জন্য পরামর্শ দেওয়া হচ্ছে। আপনি এখন আপনার অর্থ পাঠাতে না চাইলে, পেমেন্ট পুনরায় চালু করার পর সেগুলো আপনার Molly-এর সাথে লিংককৃত ওয়ালেটেই থাকবে।</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">অবশিষ্ট ব্যালেন্স ট্রান্সফার করুন</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">ট্রান্সফার না করেই বন্ধ করুন</string>
     <string name="DeactivateWalletFragment__deactivate">বন্ধ করুন</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">ট্রান্সফার না করেই বন্ধ করবেন?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">আপনি পেমেন্ট পুনরায় সক্রিয় করলে আপনার ব্যালান্স Signal-এর সাথে লিংককৃত ওয়ালেটে থাকবে।</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">আপনি পেমেন্ট পুনরায় সক্রিয় করলে আপনার ব্যালান্স Molly-এর সাথে লিংককৃত ওয়ালেটে থাকবে।</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">ওয়ালেট বন্ধ করতে ত্রুটি।</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">লাইসেন্স</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">শর্তাদি এবং গোপনীয়তা নীতি</string>
-    <string name="HelpFragment__copyright_signal_messenger">Signal Messenger এর কপিরাইট</string>
+    <string name="HelpFragment__copyright_signal_messenger">Molly Messenger এর কপিরাইট</string>
     <string name="HelpFragment__licenced_under_the_agplv3">GNU AGPLv3-এর অধীনে লাইসেন্সকৃত</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4773,7 +4911,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">স্বয়ংক্রিয়</string>
+    <string name="ChatColorSelectionFragment__auto">অটো</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">কাস্টম রঙ ব্যবহার করুন</string>
     <string name="ChatColorSelectionFragment__chat_color">চ্যাটের রং</string>
     <string name="ChatColorSelectionFragment__edit">সম্পাদনা</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">একটি রঙ নির্বাচন করুন</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">এসএমএস</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">শেয়ার করুন</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">কেবলমাত্র অ্যাডমিনরা এই গ্রুপে মেসেজ পাঠাতে পারবেন।</string>
-    <string name="MultiselectForwardFragment__limit_reached">সীমায় পৌঁছেছে</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">আপনি 5টির বেশি চ্যাট নির্বাচন করতে পারবেন না</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">আরো জানুন</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Signal আপডেট করুন</string>
+    <string name="UpdateSignalExpiredDialog__title">Molly আপডেট করুন</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Signal-এর এই সংস্করণটির মেয়াদ শেষ হয়ে গেছে। Signal ব্যবহার চালিয়ে যেতে এখনই আপডেট করুন।</string>
+    <string name="UpdateSignalExpiredDialog__message">Molly-এর এই সংস্করণটির মেয়াদ শেষ হয়ে গেছে। Molly ব্যবহার চালিয়ে যেতে এখনই আপডেট করুন।</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">আপডেট করুন</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">ডিভাইসটি নিবন্ধিত নয়</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">এই ডিভাইসটি আর নিবন্ধিত নয়। এই ডিভাইসে Signal ব্যবহার চালিয়ে যেতে পুনরায় নিবন্ধন করুন।</string>
+    <string name="ReregisterSignalDialog__message">এই ডিভাইসটি আর নিবন্ধিত নয়। এই ডিভাইসে Molly ব্যবহার চালিয়ে যেতে পুনরায় নিবন্ধন করুন।</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">পূনঃ নিবন্ধন করুন</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">পিকার খুলতে ব্যর্থ হয়েছে।</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">নোটিফিকেশন চালু করতে, Signal-এর সেগুলো প্রদর্শন করার অনুমতি প্রয়োজন।</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">নোটিফিকেশন চালু করতে, Molly-এর সেগুলো প্রদর্শন করার অনুমতি প্রয়োজন।</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">চালু করুন</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">এখন পর্যন্ত কোন রিপ্লাই নেই</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">আপনি এই স্টোরির উত্তর দিতে পারবেন না, কারণ আপনি আর এই গ্রুপের সদস্য নন।</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">স্টোরিতে রিঅ্যাক্ট করেছেন</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">স্টোরিতে রিঅ্যাক্ট করেছেন</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">স্টোরিতে রিঅ্যাক্ট করেছেন</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">ভিউ</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">আপনার ব্যাংক বেছে নিন</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">%1$s-এর মাধ্যমে আপনার ডোনেশন নিশ্চিত করুন</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">আপনার পুনরাবৃত্ত ডোনেশন সেটআপ করতে, আপনার ব্যাংকের মাধ্যমে €0,01 চার্জ নিশ্চিত করতে \'চালিয়ে যান\' ট্যাপ করুন। এটি স্বয়ংক্রিয়ভাবে ফেরত দেওয়া হবে এবং এটি আপনার অ্যাকাউন্ট থেকে আপনার €5/মাসের ডোনেশন ডেবিট করার অনুমতি দেয়।</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">আপনার পুনরাবৃত্ত ডোনেশন সেটআপ করতে, আপনার ব্যাংকের মাধ্যমে €0,01 চার্জ নিশ্চিত করতে \'চালিয়ে যান\' ট্যাপ করুন। এটি স্বয়ংক্রিয়ভাবে ফেরত দেওয়া হবে এবং এটি আপনার অ্যাকাউন্ট থেকে আপনার %1$s/মাসের ডোনেশন ডেবিট করার অনুমতি দেয়।</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">চালিয়ে যান</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">ব্যাকআপ ডেটা ডাউনলোড করা হচ্ছে…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">মিডিয়া ব্যাকআপ বন্ধ আছে</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">আপনার Signal মিডিয়া ব্যাকআপ প্ল্যান বাতিল করা হয়েছে, কারণ আমরা আপনার পেমেন্ট প্রক্রিয়া করতে পারিনি। আপনার ব্যাকআপে সংরক্ষিত যেকোনো মিডিয়া ডাউনলোড করার জন্য আপনার হাতে %1$d দিন সময় আছে। %1$d দিন পরে, আপনার ব্যাকআপের মিডিয়া মুছে ফেলা হবে।</item>
+        <item quantity="other">আপনার Signal মিডিয়া ব্যাকআপ প্ল্যান বাতিল করা হয়েছে, কারণ আমরা আপনার পেমেন্ট প্রক্রিয়া করতে পারিনি। আপনার ব্যাকআপে সংরক্ষিত যেকোনো মিডিয়া ডাউনলোড করার জন্য আপনার হাতে %1$d দিন সময় আছে। %1$d দিন পরে, আপনার ব্যাকআপের মিডিয়া মুছে ফেলা হবে।</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">আপনার সকল মিডিয়ার ব্যাকআপ নেওয়া চালিয়ে যেতে আপনি যেকোনো সময় আবার ব্যাকআপের জন্য পেমেন্ট শুরু করতে পারেন। </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">আপনার মিডিয়া আজ মুছে ফেলা হবে</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">আপনার Signal মিডিয়া ব্যাকআপ প্ল্যান বাতিল করা হয়েছে, কারণ আমরা আপনার পেমেন্ট প্রক্রিয়া করতে পারিনি। মুছে ফেলার আগে আপনার ব্যাকআপে থাকা মিডিয়া ডাউনলোড করার এটিই শেষ সুযোগ।</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">ডাউনলোড সম্পন্ন করা যাচ্ছে না</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">আপনার ডিভাইসে পর্যাপ্ত খালি জায়গা নেই। আপনার ব্যাকআপে সংরক্ষিত মিডিয়া ডাউনলোড করতে %1$s পর্যন্ত জায়গা খালি করুন।</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">আপনি যদি \"এড়িয়ে যান\" নির্বাচন করেন, তাহলে আপনার ব্যাকআপে থাকা মিডিয়া %1$d দিনের মধ্যে মুছে যাবে।</item>
+        <item quantity="other">আপনি যদি \"এড়িয়ে যান\" নির্বাচন করেন, তাহলে আপনার ব্যাকআপে থাকা মিডিয়া %1$d দিনের মধ্যে মুছে যাবে।</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">ব্যাকআপ পেমেন্ট প্রক্রিয়া করা যাচ্ছে না</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">আপনার পুনরাবৃত্ত মাসিক ব্যাকআপ পেমেন্ট সংগ্রহ করতে আমাদের সমস্যা হচ্ছে। আপনার পেমেন্ট পদ্ধতি হালনাগাদ আছে কিনা তা নিশ্চিত করুন। যদি না থাকে তবে Google Pay-তে আপডেট করুন। Signal কিছু দিনের মধ্যে আবার পেমেন্ট প্রক্রিয়া করার চেষ্টা করবে।</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">ব্যাকআপ সম্পন্ন করা যায়নি</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">আপনার ডিভাইসটি %1$d দিনের ব্যাকআপ সম্পন্ন করেনি। নিশ্চিত করুন যে আপনার ডিভাইস wi-fi-এর সাথে সংযুক্ত আছে এবং \"এখনই ব্যাক আপ করুন\"-এ ট্যাপ করুন। </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">আরো জানুন</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">বাদ দিয়ে যান</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">এখনই মিডিয়া ডাউনলোড করুন</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">পরে ডাউনলোড করুন</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">মিডিয়া ডাউনলোড করবেন না</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">আপনার মিডিয়া ডাউনলোড করতে %1$s জায়গা খালি করুন।</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">ক্রেডিট বা ডেবিট কার্ড</string>
@@ -6874,16 +7058,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">অজানা</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">পেমেন্টের ইতিহাস</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">আপনার সর্বশেষ ব্যাকআপ করা হয়েছিল %1$s তারিখে %2$s-টার সময়।</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">চ্যাটের সংখ্যার সীমা</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">চ্যাট সংখ্যার সীমা</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">মেসেজের ইতিহাস মুছে ফেলুন</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">নির্বাচিত সময়ের চেয়ে পুরানো মেসেজ স্থায়ীভাবে মুছে ফেলা হবে।</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">নির্বাচিত দৈর্ঘ্যের তুলনায় অধিক দৈর্ঘ্যের মেসেজ স্থায়ীভাবে মুছে ফেলা হবে।</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">লিংককৃত ডিভাইসে সীমাবদ্ধতা আরোপ করুন</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">সক্রিয় করা হলে, চ্যাটের উপর আরোপিত সীমাবদ্ধতা আপনার লিংককৃত ডিভাইসগুলো থেকে মেসেজও মুছে ফেলবে।</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">মুছে ফেলার বিষয়টি এখন আপনার সকল ডিভাইস জুড়ে সিঙ্ক করা হয়েছে</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">আপনি মেসেজ বা চ্যাট মুছে ফেললে, সেগুলো আপনার ফোন ও লিংককৃত ডিভাইস থেকে মুছে যাবে।</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">ঠিক আছে</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">পেমেন্টের ইতিহাস</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">টেক্সট এবং সকল মিডিয়ার ব্যাকআপ</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">পেমেন্টের বিস্তারিত</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">ব্যাকআপের ধরন</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">পরিশোধের তারিখ</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">শেয়ার করুন</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal ব্যাকআপ</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">পেমেন্টের ইতিহাস</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">ব্যাকআপের বিস্তারিত</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">ব্যাকআপের আকার</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">ব্যাকআপ ফ্রিকোয়েন্সি</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">সেলুলার ব্যবহার করে ব্যাকআপ করুন</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">বন্ধ করুন এবং ব্যাকআপ মুছুন</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">ব্যাকআপ মুছে ফেলা হয়েছে এবং বন্ধ করা হয়েছে।</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">ব্যাকআপের ধরন পরিবর্তিত হয়েছে এবং সাবস্ক্রিপশন বাতিল করা হয়েছে</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">সদস্যতা বাতিল করা হয়েছে</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">ডাউনলোড সম্পন্ন হয়েছে</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">ব্যাকআপের ধরন</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">ব্যাকআপ নিষ্ক্রিয় করা হয়েছে</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/মাস</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">ব্যাকআপ সক্ষম করুন</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">সর্বশেষ ব্যাকআপ</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%2$s-তে %1$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">কখনোই না</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">এখনি ব্যাকআপ করুন</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">বন্ধ করবেন এবং ব্যাকআপ মুছবেন?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">আপনাকে আর চার্জ করা হবে না। আপনার ব্যাকআপ মুছে ফেলা হবে এবং নতুন কোনো ব্যাকআপ তৈরি করা হবে না।</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">বন্ধ করুন এবং মুছে ফেলুন</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">ব্যাকআপ মুছে ফেলা হচ্ছে…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">ব্যাকআপ মুছে ফেলা হয়েছে</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"ট্যাপ করে এখনই ব্যাকআপ নিন"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">দৈনিক</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">সাপ্তাহিক</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">মাসিক</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">ম্যানুয়ালি ব্যাকআপ</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">অনুগ্রহ করে আপনার ডিভাইসের পিন, পাসওয়ার্ড বা প্যাটার্ন লিখুন।</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">পরবর্তী</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">ব্যাকআপের ধরন পরিবর্তন করুন</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">সাবস্ক্রিপশন বাতিল করুন</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">বাতিল নিশ্চিত করুন</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">আপনাকে আর চার্জ করা হবে না। আপনার বিলিং চক্রের শেষে ব্যাকআপ বন্ধ হয়ে যাবে। সেই তারিখের পরে আপনি বর্তমানে যে মিডিয়া ব্যাকআপ করছেন তা ডাউনলোড করার জন্য আপনার কাছে 30 দিন সময় থাকবে।</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">নিশ্চিত করুন এবং এখনই ডাউনলোড করুন</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">নিশ্চিত করুন এবং পরে ডাউনলোড করুন</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">সাবস্ক্রিপশন অব্যাহত রাখুন</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index a662e34bb9..12813bf5ac 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal se ažurira …</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly se ažurira …</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Još niste zadali lozinku!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Isključiti lozinku?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Ovo će trajno otključati Signal i obavještenja o porukama.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Ovo će trajno otključati Molly i obavještenja o porukama.</string>
     <string name="ApplicationPreferencesActivity_disable">Onemogući</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Greška pri povezivanju sa serverom!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN je neophodan za zaključavanje registracije. Da biste isključili PIN, prvo isključite zaključavanje registracije.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Datoteka</string>
     <string name="AttachmentKeyboard_contact">Kontakt</string>
     <string name="AttachmentKeyboard_location">Lokacija</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signalu je potrebno dopuštenje da prikaže vaše slike i videozapise</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Mollyu je potrebno dopuštenje da prikaže vaše slike i videozapise</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Dozvoli pristup</string>
     <string name="AttachmentKeyboard_payment">Plaćanje</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Nije pronađena aplikacija za biranje priloga.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signalu je potrebno dopuštenje da pristupi memoriji uređaja kako bi mogao priložiti slike, video i audiozapise, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavku \"Prostor za pohranu\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signalu je potrebno dopuštenje da pristupi kontaktima kako bi mogao priložiti informacije o njima, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavku \"Kontakti\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signalu je potrebno dopuštenje da sazna lokaciju uređaja, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavku \"Lokacija\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Mollyu je potrebno dopuštenje da pristupi memoriji uređaja kako bi mogao priložiti slike, video i audiozapise, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavku \"Prostor za pohranu\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Mollyu je potrebno dopuštenje da pristupi kontaktima kako bi mogao priložiti informacije o njima, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavku \"Kontakti\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Mollyu je potrebno dopuštenje da sazna lokaciju uređaja, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavku \"Lokacija\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Dozvolite pristup vašoj lokaciji</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Da pošaljete lokaciju:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Dozvolite pristup Signalu za slanje vaše lokacije.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Dozvolite pristup Mollyu za slanje vaše lokacije.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal treba pristup lokaciji da pošalje vašu lokaciju.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly treba pristup lokaciji da pošalje vašu lokaciju.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Dozvolite pristup pohrani</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Za prikaz fotografija i video zapisa:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal treba pristup pohrani za prikazivanje vaših fotografija i videozapisa.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly treba pristup pohrani za prikazivanje vaših fotografija i videozapisa.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s nije aktivirao/la Plaćanja </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Promijeni kameru</string>
     <string name="CameraXFragment_open_gallery_description">Otvori galeriju</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Dozvoli pristup</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Dozvolite pristup kameri i mikrofonu</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Dozvolite pristup kameri</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Dozvolite pristup vašem mikrofonu</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Da snimite fotografije, dozvolite Signalu pristup kameri.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Da biste slikali i snimali, dozvolite Signalu da pristupi kameri.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Za snimanje fotografija i videozapisa, dozvolite Signalu pristup kameri i mikrofonu.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Za snimanje videozapisa sa zvukom, dozvolite Signalu pristup mikrofonu.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Da skenirate QR kod, dozvolite Signalu pristup kameri.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal treba pristup kameri za snimanje fotografija</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signalu treba pristup kameri za skeniranje QR kodova</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signalu treba pristup mikrofonu za snimanje videa</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Za snimanje fotografija u Signalu:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Za snimanje fotografija i videozapisa u Signalu:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Za snimanje videozapisa sa zvukom:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Za skeniranje QR kodova:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Nedavni kontakti</string>
@@ -273,7 +274,7 @@
     <string name="CameraContacts_no_signal_contacts">Nema Signal kontakata</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Okidač kamere možete koristiti samo za slanje fotografija Signal kontaktima. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Ne možete pronaći koga tražite?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Pozovite osobu da koristi Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Pozovite osobu da koristi Molly</string>
     <string name="CameraContacts__menu_search">Traži</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -287,12 +288,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Ne, hvala</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Ažurirajte Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Ažurirajte Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Ova verzija aplikacije više nije podržana. Da biste mogli slati i primati poruke, instalirajte zadnju verziju.</string>
     <string name="ClientDeprecatedActivity_update">Ažuriraj</string>
     <string name="ClientDeprecatedActivity_dont_update">Ne ažuriraj</string>
     <string name="ClientDeprecatedActivity_warning">Upozorenje</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Vaša verzija Signala je istekla. Možete pristupiti ranijim porukama, ali nećete moći slati ni primati nove poruke dok ne ažurirate aplikaciju.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Vaša verzija Mollya je istekla. Možete pristupiti ranijim porukama, ali nećete moći slati ni primati nove poruke dok ne ažurirate aplikaciju.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Nije pronađen internet-preglednik.</string>
@@ -329,8 +330,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Poruka %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly glasovni poziv %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly video poziv %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -428,7 +429,7 @@
     <string name="ConversationActivity_transport_signal">Signal poruka</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Pošalji poruku</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Pređimo na Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Pređimo na Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Molimo odaberite kontakt</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Veličina priloga veća je od dopuštene za vrstu poruke koju šaljete.</string>
     <string name="ConversationActivity_unable_to_record_audio">Nije moguće snimiti zvuk!</string>
@@ -447,18 +448,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Za slanje audio poruka:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Za slanje glasovnih poruka, dozvolite da Signal pristupi vašem mikrofonu.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Za slanje glasovnih poruka, dozvolite da Molly pristupi vašem mikrofonu.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal treba pristup mikrofonu za snimanje glasovne poruke.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signalu je potrebno dopuštenje da pristupi mikrofonu kako bi mogao slati zvučne poruke, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavku \"Mikrofon\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly treba pristup mikrofonu za snimanje glasovne poruke.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Mollyu je potrebno dopuštenje da pristupi mikrofonu kako bi mogao slati zvučne poruke, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavku \"Mikrofon\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signalu je potrebno dopuštenje da pristupi mikrofonu i kameri kako bi mogao nazvati %1$s, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavke \"Mikrofon\" i \"Kamera\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Da biste slikali i snimali, dozvolite Signalu da pristupi kameri.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signalu je potrebno dopuštenje da pristupi kameri kako bi mogao slikati i snimati, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavku \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signalu je potrebno dopuštenje da pristupi kameri kako bi mogao slikati i snimati.</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Mollyu je potrebno dopuštenje da pristupi mikrofonu i kameri kako bi mogao nazvati %1$s, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavke \"Mikrofon\" i \"Kamera\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Da biste slikali i snimali, dozvolite Mollyu da pristupi kameri.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Mollyu je potrebno dopuštenje da pristupi kameri kako bi mogao slikati i snimati, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavku \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Mollyu je potrebno dopuštenje da pristupi kameri kako bi mogao slikati i snimati.</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Omogućite pristup mikrofonu da biste snimali video sa zvukom.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signalu je potrebno dopuštenje da pristupi mikrofonu kako bi mogao snimati video, ali je ono uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavke \"Mikrofon\" i \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signalu je potrebno dopuštenje da pristupi mikrofonu kako bi mogao snimati videozapise.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Mollyu je potrebno dopuštenje da pristupi mikrofonu kako bi mogao snimati video, ali je ono uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavke \"Mikrofon\" i \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Mollyu je potrebno dopuštenje da pristupi mikrofonu kako bi mogao snimati videozapise.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Ne</string>
@@ -479,9 +480,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Da započnete poziv:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Da započnete poziv, dozvolite da Signal pristupi vašem mikrofonu.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Da započnete poziv, dozvolite da Molly pristupi vašem mikrofonu.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal treba pristup mikrofonu da započne poziv.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly treba pristup mikrofonu da započne poziv.</string>
 
 
     <string name="ConversationActivity_join">Pristupi</string>
@@ -495,9 +496,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Razmjena SMS poruka više nije podržana u Signalu. Pozovite korisnika %1$s u Signal da zadržite razgovor ovdje.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Ova osoba više ne koristi Signal. Pozovite korisnika u Signal da zadržite razgovor ovdje.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Ova osoba više ne koristi Molly. Pozovite korisnika u Molly da zadržite razgovor ovdje.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Pozovite na Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Pozovite na Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Ponovno ćemo vas ponovo podsjetiti.</string>
 
@@ -563,6 +564,8 @@
     <string name="ConversationFragment_delete_for_everyone">Izbriši za svakoga</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Izbriši na ovom uređaju</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Izbriši</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Izbriši na svemu</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Ova će se poruka izbrisati za sve učesnike u chatu ako koriste noviju verziju Signala. Moći će vidjeti da ste vi izbrisali poruku.</string>
@@ -594,13 +597,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Blokirano</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Ažurirajte Signal</string>
+    <string name="ConversationFragment__update_build">Ažurirajte Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Ponovo registrirajte Signal</string>
+    <string name="ConversationFragment__reregister_signal">Ponovo registrirajte Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Navigiraj nazad.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Otvori Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Otvori Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Više nije potvrđeno</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -669,6 +672,13 @@
         <item quantity="many">Ovim će se trajno izbrisati svih %1$d odabranih chatova.</item>
         <item quantity="other">Ovim će se trajno izbrisati svih %1$d odabranih chatova.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Ovim će se trajno izbrisati odabrani chat sa svih vaših uređaja.</item>
+        <item quantity="few">Ovim će se trajno izbrisati %1$d chata sa svih vaših uređaja.</item>
+        <item quantity="many">Ovim će se trajno izbrisati %1$d chatova sa svih vaših uređaja.</item>
+        <item quantity="other">Ovim će se trajno izbrisati %1$d chatova sa svih vaših uređaja.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Brisanje</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Brisanje odabranog chata…</item>
@@ -770,9 +780,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Ko me može pronaći po broju?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Svako ko ima vaš broj telefona vidjet će da ste na Signalu i može započeti razgovor s vama.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Svako ko ima vaš broj telefona vidjet će da ste na Mollyu i može započeti razgovor s vama.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Niko neće moći vidjeti da ste na Signalu osim ako toj osobi ne pošaljete poruku ili ne razgovarate s njom.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Niko neće moći vidjeti da ste na Mollyu osim ako toj osobi ne pošaljete poruku ili ne razgovarate s njom.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Vratiti podatke iz rezervne kopije?</string>
@@ -806,7 +816,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Provjerite svoju lozinku za rezervne kopije i potvrdite da je tačna</string>
     <string name="BackupsPreferenceFragment__turn_on">Uključi</string>
     <string name="BackupsPreferenceFragment__turn_off">Isključi</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Da biste vratili podatke, instalirajte Signal iznova. Otvorite aplikaciju i odaberite \"Vrati podatke\", a potom pronađite rezervnu kopiju. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Da biste vratili podatke, instalirajte Molly iznova. Otvorite aplikaciju i odaberite \"Vrati podatke\", a potom pronađite rezervnu kopiju. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Saznajte više</string>
     <string name="BackupsPreferenceFragment__in_progress">U toku…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -814,7 +824,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d do sada…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% do sada…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signalu je potrebno dopuštenje da pristupi memoriji uređaja kako bi mogao kreirati rezervne kopije, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavku \"Prostor za pohranu\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Mollyu je potrebno dopuštenje da pristupi memoriji uređaja kako bi mogao kreirati rezervne kopije, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavku \"Prostor za pohranu\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Podesite vrijeme rezervne kopije</string>
 
@@ -881,7 +891,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Sesija chata je osvježena</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal koristi enkripciju s kraja na kraj (end-to-end) i možda će ponekad biti potrebno konverzaciju/sesiju chata osvježiti. Ovo ne utječe na sigurnost chata, ali se može dogoditi da propustite poruku koju vam je kontakt poslao. Možete ga zamoliti da vam poruku pošalje ponovo.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly koristi enkripciju s kraja na kraj (end-to-end) i možda će ponekad biti potrebno konverzaciju/sesiju chata osvježiti. Ovo ne utječe na sigurnost chata, ali se može dogoditi da propustite poruku koju vam je kontakt poslao. Možete ga zamoliti da vam poruku pošalje ponovo.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Koristite Signal na desktopu ili iPadu. Vaše poruke će se sinhronizovati sa vašim povezanim uređajima.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Povežite novi uređaj</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Poruke i informacije o chatu su zaštićene sveobuhvatnim šifriranjem na svim uređajima</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal na desktopu ili iPadu</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Sve poruke na povezanim uređajima su privatne</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Molly poruke se sinhronizuju sa Mollyom na vašem mobilnom telefonu nakon što se poveže. Vaša prethodna historija poruka se neće pojaviti.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Na svom drugom uređaju posjetite %1$s da instalirate Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Moji povezani uređaji</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Prekini vezu</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">Prekinuta je povezanost sa uređajem %1$s</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Povezivanje uređaja…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Uređaj je odobren</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Učitavanje…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Nema povezanih uređaja</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Otključajte da povežete uređaj</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Za povezivanje skenirajte QR kōd prikazan na uređaju</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Skeniraj QR kôd</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Koristite ovaj uređaj za skeniranje QR koda prikazanog na uređaju koji želite povezati</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">U redu</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">This device will be able to see your groups and contacts, access your chats, and send messages in your name.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Završite povezivanje na drugom uređaju</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Završite povezivanje Mollya na svom drugom uređaju.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Uvezivanje uređaja nije uspjelo</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">This QR code is not valid. Please make sure you are scanning the QR code that is displayed on the device you want to link.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Pokušaj</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Prekinuti vezu sa \'%1$s\'?</string>
@@ -903,10 +968,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimizuj za nepostojanje Play Services</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Ovaj uređaj ne podržava Play Services. Pritisnite ovdje kako biste onemogućili sistemske optimizacije korištenja baterije koje sprečavaju Signal da prima poruke dok je aplikacija zatvorena.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Ovaj uređaj ne podržava Play Services. Pritisnite ovdje kako biste onemogućili sistemske optimizacije korištenja baterije koje sprečavaju Molly da prima poruke dok je aplikacija zatvorena.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Ova verzija Signala je istekla. Ažurirajte aplikaciju sada da biste mogli slati i primati poruke.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Ova verzija Mollya je istekla. Ažurirajte aplikaciju sada da biste mogli slati i primati poruke.</string>
     <string name="ExpiredBuildReminder_update_now">Ažuriraj sada</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -919,8 +984,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Pregled</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Stalna greška u komunikaciji Signalom!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Nije uspjela registracija Signala na Google Play Services. Onemogućene su sve poruke i pozivi putem Signala. Molimo pokušajte ponovo se registrovati kroz Postavke &gt; Napredno.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Stalna greška u komunikaciji Mollyom!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Nije uspjela registracija Mollya na Google Play Services. Onemogućene su sve poruke i pozivi putem Mollya. Molimo pokušajte ponovo se registrovati kroz Postavke &gt; Napredno.</string>
 
 
     <!-- GiphyActivity -->
@@ -1085,20 +1150,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Evidencije o otklanjanju grešaka nam pomažu da utvrdimo i riješimo problem, te ne sadrže informacije za identifikaciju.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal je naišao na problem. Poslati evidenciju o otklanjanju grešaka?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly je naišao na problem. Poslati evidenciju o otklanjanju grešaka?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Obavijesti mogu kasniti zbog optimizacije baterije</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Možete onemogućiti optimizaciju baterije kako bi Signal osigurao da obavijesti o porukama neće kasniti.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Možete onemogućiti optimizaciju baterije kako bi Molly osigurao da obavijesti o porukama neće kasniti.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Obavijesti mogu kasniti zbog optimizacije baterije</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Možete onemogućiti optimizaciju baterije kako bi Molly osigurao da obavijesti o porukama neće kasniti. Dodirnite \"Nastavi\" da vidite uputstva za određeni uređaj.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Ne, hvala</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Nastavi</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Nastavi</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Odbaci</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Ne, hvala</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Aktivne pozivnice u grupu</string>
+    <string name="PendingMembersActivity_pending_group_invites">Zahtjevi i pozivnice</string>
     <string name="PendingMembersActivity_requests">Zahtjevi</string>
     <string name="PendingMembersActivity_invites">Pozivnice</string>
     <string name="PendingMembersActivity_people_you_invited">Osobe koje ste pozvali</string>
@@ -1361,7 +1436,7 @@
     <string name="InviteActivity_cancel">Otkaži</string>
     <string name="InviteActivity_sending">Šaljem…</string>
     <string name="InviteActivity_invitations_sent">Pozivnica poslana!</string>
-    <string name="InviteActivity_invite_to_signal">Pozovite na Signal</string>
+    <string name="InviteActivity_invite_to_signal">Pozovite na Molly</string>
     <string name="InviteActivity_send_sms">Pošalji SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Poslati %1$d SMS pozivnicu?</item>
@@ -1369,7 +1444,7 @@
         <item quantity="many">Poslati %1$d SMS pozivnica?</item>
         <item quantity="other">Poslati %1$d SMS pozivnica?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Pređimo na Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Pređimo na Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Izgleda da nemate nijednu aplikaciju s kojom je moguće dijeljenje.</string>
 
     <!-- LearnMoreTextView -->
@@ -1383,7 +1458,7 @@
     <string name="LongMessageActivity_your_message">Vaša poruka</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Aktivirana konekcija u pozadini</string>
 
     <!-- MediaOverviewActivity -->
@@ -1462,10 +1537,10 @@
     <string name="MessageQuotesBottomSheet_replies">Odgovori</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Uspostavljam Signal poziv</string>
+    <string name="NotificationBarManager__establishing_signal_call">Uspostavljam Molly poziv</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Pokretanje usluge poziva Signala</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Zaustavljam servis za Signal pozive</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Pokretanje usluge poziva Mollya</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Zaustavljam servis za Molly pozive</string>
     <string name="NotificationBarManager__cancel_call">Prekini poziv</string>
 
     <!-- NotificationsMegaphone -->
@@ -1733,6 +1808,14 @@
     <string name="MessageRecord_you_activated_payments">Aktivirali ste Plaćanja</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s sada može prihvatiti Plaćanja</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Podaci o plaćanju nisu dostupni</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Dodirnite za više</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Podaci o plaćanju nisu dostupni</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Ovi detalji ovog plaćanja nisu dostupni jer su vaše poruke vraćene iz izvora koji nije sadržavao ovu historiju plaćanja. Ovo ne utiče na stanje vašeg novčanika ili status prošlih plaćanja.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1793,9 +1876,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Uskoro više nećete moći slati SMS poruke pomoću Signala. Pozovite korisnika %1$s u Signal da zadržite razgovor ovdje.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Više ne možete slati SMS poruke pomoću Signala. Pozovite korisnika %1$s u Signal da zadržite razgovor ovdje.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Više ne možete slati SMS poruke pomoću Mollya. Pozovite korisnika %1$s u Molly da zadržite razgovor ovdje.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Plaćanje: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Plaćanje</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Prijavljeno kao neželjena poruka</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1881,7 +1966,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Povezati Signal uređaj?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Izgleda da ste pokušali povezati Signal uređaj koristeći neki eksterni skener. Radi vlastite sigurnosti, molimo ponovo skenirajte kōd, ali kroz Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signalu je potrebno dopuštenje da pristupi kameri kako bi mogao skenirati QR kōd, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavku \"Kamera\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Mollyu je potrebno dopuštenje da pristupi kameri kako bi mogao skenirati QR kōd, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavku \"Kamera\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Nije moguće skenirati QR kōd bez dopuštenja za pristup kameri.</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1896,11 +1981,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Unesite lozinku</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal sličica</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly sličica</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Unesite lozinku</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Pogrešna lozinka!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Otključajte Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android – Zaključan ekran</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Otključajte Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android – Zaključan ekran</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Karta</string>
@@ -1969,7 +2054,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Potvrdite da biste nastavili slanje poruka</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Radi sprečavanja neželjenih poruka na Signalu, molimo dovršite proces verifikacije.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Radi sprečavanja neželjenih poruka na Mollyu, molimo dovršite proces verifikacije.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Nakon verifikacije, možete nastaviti sa slanjem poruka. Pauzirane poruke automatski će se poslati.</string>
 
     <!-- Recipient -->
@@ -1977,7 +2062,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Moja priča</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal poziv</string>
+    <string name="Recipient_signal_call">Molly poziv</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Blokiraj</string>
@@ -1991,7 +2076,8 @@
     <string name="RedPhone_ringing">Zvoni…</string>
     <string name="RedPhone_busy">Zauzeto</string>
     <string name="RedPhone_recipient_unavailable">Primalac nije dostupan</string>
-    <string name="RedPhone_network_failed">Greška u mreži!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Greška u mreži! Provjerite internet konekciju i pokušajte ponovo.</string>
     <string name="RedPhone_number_not_registered">Broj nije registrovan!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Broj koji ste birali ne podržava sigurne pozive!</string>
     <string name="RedPhone_got_it">Razumijem</string>
@@ -2002,8 +2088,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Pritisnite ovdje da uključite video</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Da biste nazvali %1$s, Signalu je potreban pristup Vašoj kameri</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Da biste nazvali %1$s, Mollyu je potreban pristup Vašoj kameri</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Pozivam…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Povezujem iznova…</string>
@@ -2069,10 +2155,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Korisnik je uklonjen iz poziva</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Neko vas je uklonio iz poziva.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Dozvolite pristup kameri i mikrofonu</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Dozvolite pristup vašem mikrofonu</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Dozvolite pristup kameri</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Da započnete poziv ili mu se pridružite, dozvolite da Molly pristupi vašoj kameri i mikrofonu.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Da započnete poziv ili mu se pridružite, dozvolite Mollyu da pristupi vašem mikrofonu.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Da omogućite svoj video, dozvolite da Molly pristupi vašoj kameri.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly treba odobrenje mikrofona da započne poziv ili da se pridruži pozivu.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly treba pristup kameri da omogući vaš video</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Da započnete ili se pridružite pozivu:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Da omogućite video:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal poziv</string>
-    <string name="WebRtcCallView__signal_video_call">Signal videopoziv</string>
+    <string name="WebRtcCallView__signal_call">Molly poziv</string>
+    <string name="WebRtcCallView__signal_video_call">Molly videopoziv</string>
     <string name="WebRtcCallView__start_call">Nazovi</string>
     <string name="WebRtcCallView__join_call">Pridruži se pozivu</string>
     <string name="WebRtcCallView__call_is_full">Poziv je popunjen</string>
@@ -2172,24 +2278,47 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Spustiti ruku?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Spusti ruku</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Spusti</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Otkaži</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Podigli ste ruku</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Pregled</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s je podigao/la ruku</item>
-        <item quantity="few">%1$s i još %2$d su podigli ruku</item>
-        <item quantity="many">%1$s i još %2$d su podigli ruku</item>
-        <item quantity="other">%1$s i još %2$d su podigli ruku</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s je podignuo/la ruku.</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s i duge osobe (njih %2$d) su podigli ruku</item>
+        <item quantity="few">%1$s i duge osobe (njih %2$d) su podigli ruku</item>
+        <item quantity="many">%1$s i duge osobe (njih %2$d) su podigli ruku</item>
+        <item quantity="other">%1$s i duge osobe (njih %2$d) su podigli ruku</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s je podignuo/la ruku.</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s i duge osobe (njih %2$d) su podigli ruku</item>
+        <item quantity="few">%1$s i duge osobe (njih %2$d) su podigli ruku</item>
+        <item quantity="many">%1$s i duge osobe (njih %2$d) su podigli ruku</item>
+        <item quantity="other">%1$s i duge osobe (njih %2$d) su podigli ruku</item>
+    </plurals>
+
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="few">%1$s +%2$d</item>
+        <item quantity="many">%1$s +%2$d</item>
+        <item quantity="other">%1$s +%2$d</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="few">%1$s +%2$d</item>
         <item quantity="many">%1$s +%2$d</item>
@@ -2292,7 +2421,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Primit ćete poziv da potvrdite ovaj broj.</string>
     <string name="RegistrationActivity_edit_number">Ispravite broj</string>
     <string name="RegistrationActivity_missing_google_play_services">Nedostaju Google Play Services</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Na ovom uređaju nisu instalirani Google Play Services. I dalje ćete moći koristiti Signal, ali ova konfiguracija može dovesti do manje pouzdanosti i lošijih performansi.\n\nAko niste napredni korisnik, ako nemate ručno instaliranu verziju Android ROM-a ili smatrate da je ova poruka greška, molimo kontaktirajte support@signal.org za pomoć.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Na ovom uređaju nisu instalirani Google Play Services. I dalje ćete moći koristiti Molly, ali ova konfiguracija može dovesti do manje pouzdanosti i lošijih performansi.\n\nAko niste napredni korisnik, ako nemate ručno instaliranu verziju Android ROM-a ili smatrate da je ova poruka greška, molimo kontaktirajte support@molly.im za pomoć.</string>
     <string name="RegistrationActivity_i_understand">Razumijem</string>
     <string name="RegistrationActivity_play_services_error">Play Services greška</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services se ažuriraju ili su privremeno nedostupni. Pokušajte ponovo.</string>
@@ -2310,7 +2439,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Nestandardni oblik broja</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Broj koji ste unijeli (%1$s) izgleda nije standardnog oblika.\n\nJeste li mislili na %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android – oblik broja telefona</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android – oblik broja telefona</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Zahtijevan poziv</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2346,8 +2475,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Imate problema s registracijom?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Provjerite ima li vaš telefon mobilni signal za primanje SMS-a ili poziva \n • Potvrdite da možete primiti telefonski poziv na broj \n • Proverite jeste li ispravno unijeli broj telefona.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Za više informacija slijedite ove korake za rješavanje problema ili kontaktirajte podršku</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Za više informacija, pratite %1$s ili %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">ove korake za rješavanje problema</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2385,13 +2514,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Dodaj među kontakte</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Pozovite na Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Pozovite na Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal poruke</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal poziv</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Dodaj među kontakte</string>
-    <string name="SharedContactView_invite_to_signal">Pozovite na Signal</string>
+    <string name="SharedContactView_invite_to_signal">Pozovite na Molly</string>
     <string name="SharedContactView_message">Signal poruka</string>
 
     <!-- SignalBottomActionBar -->
@@ -2522,11 +2651,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s pripada korisniku/ci %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Nova verzija Signala</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Dostupna je nova verzija Signala. Dodirnite za ažuriranje.</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Nova verzija Mollya</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Dostupna je nova verzija Mollya. Dodirnite za ažuriranje.</string>
     <string name="ApkUpdateNotifications_failed_general_title">Ažuriranje signala nije uspjelo</string>
     <string name="ApkUpdateNotifications_failed_general_body">Pokušat ćemo ponovo kasnije.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal je uspješno ažuriran</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly je uspješno ažuriran</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Automatski ste ažurirani na verziju %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2599,7 +2728,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Naš Signal sigurnosni broj:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Izgleda da nemate nijednu aplikaciju s kojom je moguće dijeljenje.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">U spremniku nije pronađen sigurnosni broj za upoređivanje</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signalu je potrebno dopuštenje da pristupi kameri kako bi mogao skenirati QR kōd, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavku \"Kamera\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Mollyu je potrebno dopuštenje da pristupi kameri kako bi mogao skenirati QR kōd, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavku \"Kamera\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Nije moguće skenirati QR kōd bez dopuštenja za pristup kameri.</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Morate prvo razmijeniti poruke sa %1$s da biste vidjeli njegov ili njen sigurnosni broj.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2629,14 +2758,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Dotaknite da otvorite.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal je otključan</string>
-    <string name="KeyCachingService_lock">Zaključaj Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly je otključan</string>
+    <string name="KeyCachingService_lock">Zaključaj Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Vi</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Nepodržana vrsta datoteke</string>
     <string name="MediaPreviewActivity_draft">U obradi</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signalu je potrebno dopuštenje da pristupi memoriji uređaja kako bi mogao pohranjivati podatke, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavku \"Prostor za pohranu\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Mollyu je potrebno dopuštenje da pristupi memoriji uređaja kako bi mogao pohranjivati podatke, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavku \"Prostor za pohranu\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Nije moguće bez dopuštenja pohraniti podatke u memoriju uređaja</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Izbrisati poruku?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Ovo će bespovratno izbrisati poruku.</string>
@@ -2684,7 +2813,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Neuspjelo isporučenje poruke.</string>
     <string name="MessageNotifier_error_delivering_message">Greška u isporučenju poruke.</string>
     <string name="MessageNotifier_message_delivery_paused">Pauzirana isporuka poruke.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Potvrdite da biste nastavili slanje poruka kroz Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Potvrdite da biste nastavili slanje poruka kroz Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Sve označi kao pročitano</string>
     <string name="MessageNotifier_mark_read">Označi kao pročitano</string>
     <string name="MessageNotifier_turn_off_these_notifications">Isključi ova obavještenja</string>
@@ -2706,7 +2835,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Reagirao/la je sa %1$s na vašu naljepnicu.</string>
     <string name="MessageNotifier_this_message_was_deleted">Ova je poruka izbrisana.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Isključiti obavještenja o tome da se kontakt prijavio na Signal? Možete ih ponovo aktivirati kroz Signal &gt; Podešavanja &gt; Obavještenja.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Isključiti obavještenja o tome da se kontakt prijavio na Molly? Možete ih ponovo aktivirati kroz Molly &gt; Podešavanja &gt; Obavještenja.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2745,7 +2874,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Brzi odgovori nisu dostupni kada je Signal zaključan!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Brzi odgovori nisu dostupni kada je Molly zaključan!</string>
     <string name="QuickResponseService_problem_sending_message">Problem prilikom slanja poruke!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2765,7 +2894,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Nevažeća kratica</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Nova poruka</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Zahtjev za komunikaciju</string>
     <string name="SingleRecipientNotificationBuilder_you">Vi</string>
@@ -2813,7 +2942,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Ovaj uređaj više nije registriran. To je vjerovatno zato što ste registrovali broj telefona u Signalu na drugom uređaju.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Ovaj uređaj više nije registriran. To je vjerovatno zato što ste registrovali broj telefona u Mollyu na drugom uređaju.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Ponovo registrirajte uređaj</string>
 
@@ -2826,10 +2955,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Da biste odgovorili na poziv, dozvolite Signalu pristup Vašem mikrofonu.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Da biste odgovorili na poziv, dozvolite Mollyu pristup Vašem mikrofonu.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Da odgovorite na video poziv, dozvolite Signalu pristup mikrofonu i kameri.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signalu je potrebno dopuštenje da pristupi mikrofonu i kameri kako bi mogao slati i primati pozive, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavke \"Mikrofon\" i \"Kamera\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Da odgovorite na video poziv, dozvolite Mollyu pristup mikrofonu i kameri.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Mollyu je potrebno dopuštenje da pristupi mikrofonu i kameri kako bi mogao slati i primati pozive, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavke \"Mikrofon\" i \"Kamera\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Odgovoreno na povezanom uređaju.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Odbijeno na povezanom uređaju.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Zauzeto na povezanom uređaju.</string>
@@ -2874,16 +3003,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Ponovite novu lozinku</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Pozovite u Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Pozovite u Molly</string>
     <string name="contact_selection_activity__new_group">Nova grupa</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Osvježite kontakte</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Neko nedostaje? Pokušajte osvježiti</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Pronađite ljude koje poznajete na Signalu</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Dozvolite pristup kontaktima</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Više</string>
 
@@ -2900,7 +3029,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Slika kontakta</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signalu je potrebno dopuštenje da pristupi kontaktima kako bi mogao prikazati Vaše kontakte, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavku \"Kontakti\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Mollyu je potrebno dopuštenje da pristupi kontaktima kako bi mogao prikazati Vaše kontakte, ali je ono trajno uskraćeno. Molimo nastavite do postavki aplikacije, odaberite \"Dozvole\" i aktivirajte stavku \"Kontakti\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Greška prilikom preuzimanja kontakta, provjerite internet-konekciju</string>
     <string name="ContactSelectionListFragment_username_not_found">Korisničko ime nije pronađeno</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" ne koristi Signal. Provjerite korisničko ime i pokušajte ponovo."</string>
@@ -2920,16 +3049,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Pronađite po korisničkom imenu</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Dozvolite pristup kontaktima</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Da pronađete osobe koje poznajete na Signalu:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Dozvoli pristup</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Ne, hvala</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Dozvolite pristup kontaktima. Vaši kontakti su šifrirani i nisu vidljivi usluzi Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signalu je potreban pristup Vašim kontaktima kako bi ih mogao prikazati.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Mollyu je potreban pristup Vašim kontaktima kako bi ih mogao prikazati.</string>
     <string name="contact_selection_list_fragment__show_contacts">Prikaži kontakte</string>
 
     <!-- contact_selection_list_item -->
@@ -3006,6 +3137,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Uklonili ste ovu osobu, ako joj ponovo pošaljete poruku, vratit ćete je na svoju listu.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Opcije</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Ažuriraj</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Sviraj … Pauziraj</string>
@@ -3034,7 +3167,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Balončići su opcija Androida koju možete isključiti u Signal-porukama.</string>
+    <string name="BubbleOptOutTooltip__description">Balončići su opcija Androida koju možete isključiti u Molly-porukama.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Ne sada</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3216,9 +3349,9 @@
     <string name="EditProfileFragment__group_description">Opis grupe</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Ažurirajte Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Ažurirajte Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Ova verzija Signala je istekla. Ažurirajte sada da nastavite koristiti Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Ova verzija Mollya je istekla. Ažurirajte sada da nastavite koristiti Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Ažuriraj</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3437,7 +3570,7 @@
     <string name="preferences__slow">Spora</string>
     <string name="preferences__help">Pomoć</string>
     <string name="preferences__advanced">Napredno</string>
-    <string name="preferences__donate_to_signal">Donirajte za Signal</string>
+    <string name="preferences__donate_to_signal">Donirajte za Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Privatnost</string>
     <!-- Preference label for stories -->
@@ -3474,13 +3607,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Promijenite ikonu i naziv aplikacije u \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal će se morati zatvoriti da promijenite ikonu i naziv aplikacije. Obavijesti će uvijek prikazivati zadanu ikonu i ime Signala.</string>
+    <string name="preferences__app_icon_dialog_description">Molly će se morati zatvoriti da promijenite ikonu i naziv aplikacije. Obavijesti će uvijek prikazivati zadanu ikonu i ime Mollya.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Odaberite ikonu i naziv aplikacije koji će biti vidljivi na početnom ekranu vašeg telefona i ladici za aplikacije. Obavijesti će uvijek prikazivati zadanu ikonu i ime Signala. Saznaj više</string>
+    <string name="preferences__app_icon_warning_learn_more">Odaberite ikonu i naziv aplikacije koji će biti vidljivi na početnom ekranu vašeg telefona i ladici za aplikacije. Obavijesti će uvijek prikazivati zadanu ikonu i ime Mollya. Saznaj više</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Ikone i nazivi aplikacija vidljivi su na početnom ekranu i ladici aplikacija.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Obavijesti će uvijek prikazivati zadanu ikonu i ime Signala.</string>
+    <string name="preferences__app_icon_notification_warning">Obavijesti će uvijek prikazivati zadanu ikonu i ime Mollya.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Saznaj više</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3529,8 +3662,12 @@
         <item quantity="other">Ovo će trajno smanjiti sve chatove na %1$s najnovijih poruka.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Ovime će se trajno izbrisati sva historija poruka i datoteke s vašeg uređaja.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Na ovaj način će se trajno izbrisati sva historiju poruka i medija sa ovog uređaja i svih povezanih uređaja.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Jeste li sigurni da želite izbrisati historiju poruka?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Cijela historija poruka bit će trajno uklonjena. Ova se radnja ne može poništiti.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Sva historija poruka će biti trajno uklonjena sa svih uređaja. Ova radnja ne može se poništiti.</string>
     <string name="preferences_storage__delete_all_now">Izbriši sve odmah</string>
     <string name="preferences_storage__forever">Zauvijek</string>
     <string name="preferences_storage__one_year">1 godinu</string>
@@ -3569,7 +3706,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Zaobilazak cenzure</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Zaobilazak cenzure</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Ako je omogućeno, Signal će pokušati zaobići cenzuru. Nemojte omogućiti ovu funkciju osim ako niste na mjestu gdje je Signal cenzuriran.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Ako je omogućeno, Molly će pokušati zaobići cenzuru. Nemojte omogućiti ovu funkciju osim ako niste na mjestu gdje je Molly cenzuriran.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Korištenje cenzure je aktivirano na temelju telefonskog broja vašeg računa.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3621,7 +3758,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Predstavljamo plaćanja</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Koristite Signal za slanje i primanje MobileCoina, nove digitalne valute s fokusom na privatnost. Aktivirajte da započnete.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Koristite Molly za slanje i primanje MobileCoina, nove digitalne valute s fokusom na privatnost. Aktivirajte da započnete.</string>
     <string name="PaymentsHomeFragment__activate_payments">Aktiviraj plaćanja</string>
     <string name="PaymentsHomeFragment__activating_payments">Aktiviram plaćanja…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Obnovi račun s uplatama i isplatama</string>
@@ -3647,7 +3784,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Plaćanja nisu dostupna u Vašem regionu.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Neuspjelo aktiviranje plaćanja. Pokušajte ponovo kasnije.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Deaktivirati plaćanja?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Nećete moći slati ni primati MobileCoin preko Signala ako deaktivirate plaćanja.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Nećete moći slati ni primati MobileCoin preko Mollya ako deaktivirate plaćanja.</string>
     <string name="PaymentsHomeFragment__deactivate">Deaktiviraj</string>
     <string name="PaymentsHomeFragment__continue">Nastavi</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Stanje na računu trenutno nije dostupno.</string>
@@ -3656,10 +3793,10 @@
     <string name="PaymentsHomeFragment__details">Detalji</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Signal možete koristiti za slanje i primanje MobileCoina. Sva plaćanja podliježu Uslovima korištenja za MobileCoins i MobileCoin Wallet. Možda ćete naići na neke probleme i uplate ili stanja koja možete izgubiti se ne mogu vratiti. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Molly možete koristiti za slanje i primanje MobileCoina. Sva plaćanja podliježu Uslovima korištenja za MobileCoins i MobileCoin Wallet. Možda ćete naići na neke probleme i uplate ili stanja koja možete izgubiti se ne mogu vratiti. </string>
     <string name="PaymentsHomeFragment__activate">Aktiviraj</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Pregledaj uslove korištenja MobileCoina</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Plaćanja preko Signala više nisu dostupna. Još uvijek možete prenijeti sredstva na berzu, ali više ne možete vršiti isplate i uplate niti dodavati sredstva.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Plaćanja preko Mollya više nisu dostupna. Još uvijek možete prenijeti sredstva na berzu, ali više ne možete vršiti isplate i uplate niti dodavati sredstva.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3687,7 +3824,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Dozvolite odobrenja</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Kako bi vam pomogao da šaljete poruke osobama koje poznajete, Signal će zatražiti ova odobrenja. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Kako bi vam pomogao da šaljete poruke osobama koje poznajete, Molly će zatražiti ova odobrenja. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Obavještenja</string>
     <!-- Notifications permission row description -->
@@ -3775,10 +3912,10 @@
     <string name="PaymentsTransferFragment__next">Dalje</string>
     <string name="PaymentsTransferFragment__invalid_address">Adresa nije valjana</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Provjerite adresu novčanika na koju pokušavate prenijeti sredstva i pokušajte ponovo.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Ne možete izvršiti prenos sredstava na adresu vlastitog Signal novčanika. Unesite adresu novčanika sa svoga računa na podržanoj berzi.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Da bi mogao skenirati QR kōd, Signalu je potreban pristup kameri.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signalu je potrebno odobrenje za pristup kameri kako bi mogao skenirati QR kōd. Idite na sistemska podešavanja, izaberite \"Dopuštenja\" i uključite \"Kamera\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Da bi mogao skenirati QR kōd, Signalu je potreban pristup kameri.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Ne možete izvršiti prenos sredstava na adresu vlastitog Molly novčanika. Unesite adresu novčanika sa svoga računa na podržanoj berzi.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Da bi mogao skenirati QR kōd, Mollyu je potreban pristup kameri.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Mollyu je potrebno odobrenje za pristup kameri kako bi mogao skenirati QR kōd. Idite na sistemska podešavanja, izaberite \"Dopuštenja\" i uključite \"Kamera\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Da bi mogao skenirati QR kōd, Mollyu je potreban pristup kameri.</string>
     <string name="PaymentsTransferFragment__settings">Podešavanja</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -4144,17 +4281,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Dolazni Signal glasovni poziv</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Dolazni Molly glasovni poziv</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Dolazni Signal video poziv</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Dolazni Molly video poziv</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Dolazni grupni Signal poziv</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Dolazni grupni Molly poziv</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">U toku Signal glasovni poziv</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">U toku Molly glasovni poziv</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">U toku Signal video poziv</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">U toku Molly video poziv</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">U toku Signal grupni poziv</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">U toku Molly grupni poziv</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Učitavanje…</string>
@@ -4201,9 +4338,9 @@
     <string name="BackupDialog_verify">Verifikuj</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Uspješno ste unijeli svoju lozinku za rezervne kopije</string>
     <string name="BackupDialog_passphrase_was_not_correct">Lozinka nije tačna</string>
-    <string name="LocalBackupJob_creating_signal_backup">Kreiram rezervnu kopiju Signalovih podataka…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Kreiram rezervnu kopiju Mollyovih podataka…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Provjera sigurnosne kopije Signala…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Provjera sigurnosne kopije Mollya…</string>
     <string name="LocalBackupJobApi29_backup_failed">Neuspjelo kreiranje rezervne kopije</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Direktorij sa sigurnosnim kopijama je izbrisan ili premješten.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Vaša rezervna kopija prevelika je za pohranjivanje na ovoj lokaciji.</string>
@@ -4218,15 +4355,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Pozovi me (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Ponovo pošalji kȏd ( %1$02d : %2$02d )</string>
-    <string name="RegistrationActivity_contact_signal_support">Kontaktirajte Signalovu podršku</string>
-    <string name="RegistrationActivity_code_support_subject">Signal registracija – potvrda kōda za Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Kontaktirajte Mollyovu podršku</string>
+    <string name="RegistrationActivity_code_support_subject">Molly registracija – potvrda kōda za Android</string>
     <string name="RegistrationActivity_incorrect_code">Pogrešan kôd</string>
     <string name="BackupUtil_never">Nikad</string>
     <string name="BackupUtil_unknown">Nepoznato</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Broj telefona</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Odaberite ko može vidjeti vaš broj telefona i ko vas može kontaktirati na Signalu pomoću njega.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Odaberite ko može vidjeti vaš broj telefona i ko vas može kontaktirati na Mollyu pomoću njega.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Ko može vidjeti moj broj</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4274,7 +4411,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Pokušali ste previše puta. Molimo pokušajte ponovo kasnije.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Greška pri povezivanju sa uslugom</string>
     <string name="preferences_chats__backups">Rezervne kopije</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal je zaključan</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly je zaključan</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">PRITISNITE DA OTKLJUČATE</string>
     <string name="Recipient_unknown">Nepoznato</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4305,9 +4442,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Trebate pristup svom starom uređaju.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Vrati iz rezervne kopije</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Vratite svoje poruke iz lokalne rezervne kopije. Ako to ne učinite sada, nećete biti u mogućnosti vratiti poruke kasnije.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Vratite lokalnu sigurnosnu kopiju</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Vratite sigurnosnu kopiju Signala</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Vratite sve svoje tekstualne poruke + zadnjih 30 dana medija</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Više opcija</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Otkaži</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Prijavite se bez prijenosa</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Nastavite bez prijenosa vaših poruka i medija</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Otvorite Signal na svom starom Android telefonu</string>
     <string name="NewDeviceTransferInstructions__continue">Nastavi</string>
@@ -4322,19 +4466,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">U toku su pripreme za povezivanje sa starim Android uređajem…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Trenutak, uskoro će biti spremno</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Čekam na stari Android uređaj da se poveže…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signalu je potrebno dopuštenje za pristup lokaciji kako bi pronašao i povezao se s Vašim starim Android uređajem.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signalu je potrebno da lokacija na telefonu bude aktivna kako bi mogao pronaći i povezati se s Vašim starim Android uređajem.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signalu je potrebno da Wi-Fi konekcija bude aktivna kako bi mogao pronaći i povezati se sa Vašim starim Android uređajem. Wi-Fi treba biti uključen, ali ne mora biti povezan na Wi-Fi mrežu.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Nažalost, izgleda da ovaj uređaj ne podržava Wi-Fi Direct. Signal koristi Wi-Fi Direct da pronađe i poveže se s Vašim starim Android uređajem. I dalje možete vratiti podatke iz rezervne kopije kako biste prenijeli račun sa svog starog Android uređaja.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Mollyu je potrebno dopuštenje za pristup lokaciji kako bi pronašao i povezao se s Vašim starim Android uređajem.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Mollyu je potrebno da lokacija na telefonu bude aktivna kako bi mogao pronaći i povezati se s Vašim starim Android uređajem.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Mollyu je potrebno da Wi-Fi konekcija bude aktivna kako bi mogao pronaći i povezati se sa Vašim starim Android uređajem. Wi-Fi treba biti uključen, ali ne mora biti povezan na Wi-Fi mrežu.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Nažalost, izgleda da ovaj uređaj ne podržava Wi-Fi Direct. Molly koristi Wi-Fi Direct da pronađe i poveže se s Vašim starim Android uređajem. I dalje možete vratiti podatke iz rezervne kopije kako biste prenijeli račun sa svog starog Android uređaja.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Vrati podatke iz rezervne kopije</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Došlo je do neočekivane greške prilikom pokušaja da se poveže s Vašim starim Android uređajem.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Tražim novi Android uređaj…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signalu je potrebno dopuštenje za pristup lokaciji kako bi pronašao i povezao se s Vašim novim Android uređajem.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signalu je potrebno da lokacija na telefonu bude aktivna kako bi mogao pronaći i povezati se s Vašim novim Android uređajem.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signalu je potrebno da Wi-Fi konekcija bude aktivna kako bi mogao pronaći i povezati se sa Vašim novim Android uređajem. Wi-Fi treba biti uključen, ali ne mora biti povezan na Wi-Fi mrežu.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Nažalost, izgleda da ovaj uređaj ne podržava Wi-Fi Direct. Signal koristi Wi-Fi Direct da pronađe i poveže se s Vašim novim Android uređajem. I dalje možete kreirati rezervnu kopiju podataka kako biste prenijeli račun na svoj novi Android uređaj.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Mollyu je potrebno dopuštenje za pristup lokaciji kako bi pronašao i povezao se s Vašim novim Android uređajem.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Mollyu je potrebno da lokacija na telefonu bude aktivna kako bi mogao pronaći i povezati se s Vašim novim Android uređajem.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Mollyu je potrebno da Wi-Fi konekcija bude aktivna kako bi mogao pronaći i povezati se sa Vašim novim Android uređajem. Wi-Fi treba biti uključen, ali ne mora biti povezan na Wi-Fi mrežu.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Nažalost, izgleda da ovaj uređaj ne podržava Wi-Fi Direct. Molly koristi Wi-Fi Direct da pronađe i poveže se s Vašim novim Android uređajem. I dalje možete kreirati rezervnu kopiju podataka kako biste prenijeli račun na svoj novi Android uređaj.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Kreiraj rezervnu kopiju</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Došlo je do neočekivane greške prilikom pokušaja da se poveže s Vašim novim Android uređajem.</string>
 
@@ -4375,7 +4519,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Prenos podataka</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Držite oba uređaja u blizini. Ne isključujte uređaje i držite Signal otvorenim. Prenos podataka je šifriran.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Držite oba uređaja u blizini. Ne isključujte uređaje i držite Molly otvorenim. Prenos podataka je šifriran.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d poruka do sada…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% poruka do sada…</string>
@@ -4389,7 +4533,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Prenesi račun</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Instalirajte Signal na svoj novi Android uređaj</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Instalirajte Molly na svoj novi Android uređaj</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Pritisnite \"Prenesi ili vrati račun\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4463,7 +4607,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Svako ko dobije ovaj link može vidjeti naziv i sliku grupe, kao i zatražiti da se pridruži grupi. Podijelite ga samo s osobama u koje imate povjerenja.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Svako ko dobije ovaj link može vidjeti naziv i sliku grupe, a može se i pridružiti grupi. Podijelite ga samo s osobama u koje imate povjerenja.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Podijeli preko Signala</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Podijeli preko Mollya</string>
     <string name="GroupLinkBottomSheet_copy">Kopiraj</string>
     <string name="GroupLinkBottomSheet_qr_code">QR kōd</string>
     <string name="GroupLinkBottomSheet_share">Dijeli</string>
@@ -4663,7 +4807,7 @@
     <string name="payment_info_card_about_mobilecoin">O MobileCoinu</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin je nova digitalna valuta s fokusom na privatnost.</string>
     <string name="payment_info_card_adding_funds">Uplata sredstava</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Možete dodati sredstva za korištenje putem Signala tako što ćete poslati MobileCoin na adresu svoga novčanika.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Možete dodati sredstva za korištenje putem Mollya tako što ćete poslati MobileCoin na adresu svoga novčanika.</string>
     <string name="payment_info_card_cashing_out">Unovčavanje</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">U svakom trenutku možete unovčiti MobileCoin na nekoj od berzi koje ga podržavaju. Jednostavno izvršite prenos na svoj račun koji imate otvoren na toj berzi.</string>
     <string name="payment_info_card_hide_this_card">Sakriti ovu karticu?</string>
@@ -4684,12 +4828,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Deaktivirajte novčanik</string>
     <string name="DeactivateWalletFragment__your_balance">Vaša sredstva</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Preporučuje se da svoja sredstva prenesete na adresu drugog novčanika prije nego što deaktivirate plaćanja. Ako odlučite da nećete sada prenijeti sredstva, ona će ostati u vašem novčaniku koji je povezan sa Signalom i biti dostupna kad ponovo aktivirate plaćanja.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Preporučuje se da svoja sredstva prenesete na adresu drugog novčanika prije nego što deaktivirate plaćanja. Ako odlučite da nećete sada prenijeti sredstva, ona će ostati u vašem novčaniku koji je povezan sa Mollyom i biti dostupna kad ponovo aktivirate plaćanja.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Prenesi ostatak sredstava</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Deaktiviraj bez prenosa sredstava</string>
     <string name="DeactivateWalletFragment__deactivate">Deaktiviraj</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Deaktivirati bez prenosa sredstava?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Vaša će sredstva ostati u vašem novčaniku povezanom sa Signalom, ako odlučite ponovo aktivirati plaćanja.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Vaša će sredstva ostati u vašem novčaniku povezanom sa Mollyom, ako odlučite ponovo aktivirati plaćanja.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Greška prilikom deaktiviranja novčanika.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4988,7 +5132,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licence</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Sporazum o korištenju i privatnosti</string>
-    <string name="HelpFragment__copyright_signal_messenger">Prava: Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Prava: Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Licencirano pod GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -5003,7 +5147,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">Automatski</string>
+    <string name="ChatColorSelectionFragment__auto">Autom.</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Koristi druge boje</string>
     <string name="ChatColorSelectionFragment__chat_color">Boja chata</string>
     <string name="ChatColorSelectionFragment__edit">Uredi</string>
@@ -5235,9 +5379,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Izaberite boju</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Dijeli</string>
 
@@ -5279,7 +5420,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Samo administratori mogu slati poruke u ovu grupu.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Dosegnut maksimum</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Ne možete odabrati više od 5 chatova</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5460,9 +5602,9 @@
     <string name="MySupportPreference__learn_more">Saznaj više</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Ažurirajte Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Ažurirajte Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Ova verzija Signala je istekla. Ažurirajte sada da nastavite koristiti Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Ova verzija Mollya je istekla. Ažurirajte sada da nastavite koristiti Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Ažuriraj</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5471,7 +5613,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Uređaj nije registriran</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Ovaj uređaj više nije registriran. Ponovo se registrirajte da nastavite koristiti Signal na ovom uređaju.</string>
+    <string name="ReregisterSignalDialog__message">Ovaj uređaj više nije registriran. Ponovo se registrirajte da nastavite koristiti Molly na ovom uređaju.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Re-register</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5765,7 +5907,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Neuspjelo otvaranje birača.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Da bi omogućio obavještenja, Signal treba dozvolu da ih prikaže.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Da bi omogućio obavještenja, Molly treba dozvolu da ih prikaže.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Uključi</string>
 
@@ -5920,8 +6062,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Još nema odgovora</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Ne možete odgovoriti na ovu priču jer više niste član ove grupe.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Reagirao/la je na priču</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Reagirao/la je na priču</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Reagirao/la je na priču</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Pregledi</string>
     <!-- Label for story replies tab -->
@@ -6572,8 +6716,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Odaberite banku</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Potvrdite svoju donaciju sa %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Da biste podesili svoju ponavljajuću donaciju, dodirnite \"Nastavi\" da potvrdite naplatu od 0,01 € u vašoj banci. Ovo će biti automatski vraćeno i omogućava da se vaša donacija od 5 €/mjesečno naplati s vašeg računa.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Da biste podesili svoju ponavljajuću donaciju, dodirnite \"Nastavi\" da potvrdite naplatu od 0,01 € u vašoj banci. Ovo će biti automatski vraćeno i omogućava da se vaša donacija od %1$s/mjesečno naplati s vašeg računa.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Nastavi</string>
 
@@ -7163,6 +7307,56 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Preuzimanje sigurnosne kopije podataka…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Sigurnosne kopije medija su isključene</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Vaš Signal paket sigurnosne kopije medija je otkazan jer nismo mogli obraditi vašu uplatu. Imate %1$d dan za preuzimanje svih medija pohranjenih u vašoj sigurnosnoj kopiji. Nakon %1$d dana, mediji u vašoj sigurnosnoj kopiji će biti izbrisani.</item>
+        <item quantity="few">Vaš Signal paket sigurnosne kopije medija je otkazan jer nismo mogli obraditi vašu uplatu. Imate %1$d dana za preuzimanje svih medija pohranjenih u vašoj sigurnosnoj kopiji. Nakon %1$d dana, mediji u vašoj sigurnosnoj kopiji će biti izbrisani.</item>
+        <item quantity="many">Vaš Signal paket sigurnosne kopije medija je otkazan jer nismo mogli obraditi vašu uplatu. Imate %1$d dana za preuzimanje svih medija pohranjenih u vašoj sigurnosnoj kopiji. Nakon %1$d dana, mediji u vašoj sigurnosnoj kopiji će biti izbrisani.</item>
+        <item quantity="other">Vaš Signal paket sigurnosne kopije medija je otkazan jer nismo mogli obraditi vašu uplatu. Imate %1$d dana za preuzimanje svih medija pohranjenih u vašoj sigurnosnoj kopiji. Nakon %1$d dana, mediji u vašoj sigurnosnoj kopiji će biti izbrisani.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Možete ponovo početi plaćati sigurnosne kopije u bilo kojem trenutku kako biste nastavili s kreiranjem sigurnosnih kopija svih svojih medija. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Vaši mediji će biti izbrisani danas</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Vaš Signal paket sigurnosne kopije medija je otkazan jer nismo mogli obraditi vašu uplatu. Ovo je vaša posljednja prilika da preuzmete medij u vašoj sigurnosnoj kopiji prije nego što se izbriše.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Nije moguće završiti preuzimanje</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Vaš uređaj nema dovoljno slobodnog prostora. Oslobodite do %1$s prostora za preuzimanje medija pohranjenih u vašoj sigurnosnoj kopiji.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Ako odaberete \"Preskoči\", medij u vašoj sigurnosnoj kopiji će biti izbrisan za %1$d dan.</item>
+        <item quantity="few">Ako odaberete \"Preskoči\", medij u vašoj sigurnosnoj kopiji će biti izbrisan za %1$d dana.</item>
+        <item quantity="many">Ako odaberete \"Preskoči\", medij u vašoj sigurnosnoj kopiji će biti izbrisan za %1$d dana.</item>
+        <item quantity="other">Ako odaberete \"Preskoči\", medij u vašoj sigurnosnoj kopiji će biti izbrisan za %1$d dana.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Nije moguće obraditi rezervnu uplatu</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Imamo problema s prikupljanjem vaše mjesečne rezervne uplate koja se ponavlja. Provjerite je li vaš način plaćanja ažuriran. Ako nije, ažurirajte ga u Google Payu. Signal će ponovo pokušati obraditi uplatu za nekoliko dana.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Nije moguće završiti kreiranje sigurnosne kopije</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Vaš uređaj nije izvrišio kreiranje sigurnosne kopije %1$d dan/a. Provjerite je li vaš uređaj povezan na wi-fi i dodirnite \"Kreiraj sigurnosnu kopiju sada\". </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Saznaj više</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Preskoči</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Preuzmite medije sada</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Preuzmi kasnije</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Ne preuzimaj medij</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Oslobodite %1$s prostora da preuzmete medije.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Kreditna ili debitna kartica</string>
@@ -7176,16 +7370,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Nepoznato</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Historija plaćanja</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Vaša zadnja sigurnosna kopija je napravljena %1$s u %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">Ograničenja za chatove</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">Ograničenja dužine razgovora</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">Izbriši historiju poruka</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Poruke starije od odabranog vremena bit će trajno izbrisane.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Poruke koje premašuju odabranu dužinu bit će trajno izbrisane.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Primijenite ograničenja na povezane uređaje</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Kada je omogućeno, ograničenja chata će također izbrisati poruke sa vaših povezanih uređaja.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Brisanje je sada sinhronizirano na svim vašim uređajima</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Kada izbrišete poruke ili razgovore, oni će biti izbrisani sa vašeg telefona i povezanih uređaja.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Historija plaćanja</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Sigurnosna kopija poruka i svih medija</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Detalji plaćanja</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Vrsta sigurnosne kopije</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Datum plaćanja</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Dijeli</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Sigurnosne kopije Signala</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Historija plaćanja</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Detalji sigurnosne kopije</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Veličina rezervne kopije</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Učestalost kreiranja rezervne kopije</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Kreirajte sigurnosnu kopiju pomoću mobilne mreže</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Isključiti i izbrisati sigurnosne kopije?</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Sigurnosna kopija je obrisana i isključena.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Vrsta sigurnosne kopije je promijenjena i pretplata je otkazana</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Pretplata je otkazana</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Preuzimanje je završeno</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Vrsta rezervne kopije</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Rezervne kopije su onemogućene.</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/mjesečno</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Aktiviraj</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Posljednja rezervna kopija</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s u %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Nikad</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Kreiraj kopiju sada</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Isključiti i izbrisati sigurnosne kopije?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Neće vam biti ponovo naplaćeno. Vaša sigurnosna kopija će biti izbrisana i nove sigurnosne kopije neće biti kreirane.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Isključi i izbriši</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Brisanje sigurnosne kopije…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Sigurnosna kopija je izbrisana</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Dodirom na Kreiraj sigurnosnu kopiju sada"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Dnevno</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Sedmično</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Mjesečno</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Ručno kreiranje sigurnosne kopije</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Unesite PIN za svoj uređaj, lozinku ili uzorak.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Dalje</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Promijenite vrstu sigurnosne kopije</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Otkaži pretplatu</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Potvrditi otkazivanje?</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Neće vam se ponovo naplatiti. Sigurnosne kopije će se isključiti na kraju vašeg ciklusa naplate. Nakon tog datuma imat ćete 30 dana da preuzmete medij za koji trenutno pravite sigurnosnu kopiju.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Potvrdite i preuzmite sada</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Potvrdite i preuzmite kasnije</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Zadrži pretplatu</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 348c0c1040..640281a788 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">El Signal s\'actualitza…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">El Molly s\'actualitza…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Encara no heu establert cap contrasenya.</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Voleu desactivar la contrasenya?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">El Signal i les notificacions es desblocaran permanentment.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">El Molly i les notificacions es desblocaran permanentment.</string>
     <string name="ApplicationPreferencesActivity_disable">Desactiva</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">S\'ha produït un error en connectar amb el servidor.</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">Els PIN són necessaris per al bloqueig de registre. Per desactivar-los, primer desactiveu el bloqueig de registre.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Fitxer</string>
     <string name="AttachmentKeyboard_contact">Contacte</string>
     <string name="AttachmentKeyboard_location">Ubicació</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal necessita permís per mostrar les teves fotografies i vídeos</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly necessita permís per mostrar les teves fotografies i vídeos</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Permet l\'accés</string>
     <string name="AttachmentKeyboard_payment">Pagament</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">No s\'ha trobat cap aplicació compatible.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">El Signal necessita el permís de l\'emmagatzematge per tal d\'adjuntar fotografies, vídeos o àudio, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi l\'emmagatzematge.</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">El Signal necessita el permís de l\'aplicació dels contactes per tal d\'adjuntar-ne informació, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi els contactes.</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">El Signal necessita el permís de la ubicació per tal d\'adjuntar-ne informació, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi la ubicació.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">El Molly necessita el permís de l\'emmagatzematge per tal d\'adjuntar fotografies, vídeos o àudio, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi l\'emmagatzematge.</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">El Molly necessita el permís de l\'aplicació dels contactes per tal d\'adjuntar-ne informació, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi els contactes.</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">El Molly necessita el permís de la ubicació per tal d\'adjuntar-ne informació, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi la ubicació.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Permet accés a la teva ubicació</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Per enviar la teva ubicació:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Permet l\'accés a Signal per a enviar la teva ubicació.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Permet l\'accés a Molly per a enviar la teva ubicació.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal necessita accés als serveis de localització per poder enviar la ubicació.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly necessita accés als serveis de localització per poder enviar la ubicació.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Permet accés a l\'emmagatzematge</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Per mostrar fotos i vídeos:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal necessita accés al teu emmagatzematge per mostrar les teves fotos i vídeos.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly necessita accés al teu emmagatzematge per mostrar les teves fotos i vídeos.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s no ha activat Pagaments </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Canvia la càmera</string>
     <string name="CameraXFragment_open_gallery_description">Obre la galeria</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Permet l\'accés</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Permet l\'accés a la teva càmera i al teu micròfon</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Permet l\'accés a la teva càmera</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Permet l\'accés al micròfon</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Per capturar fotos, permet que Signal accedeixi a la càmera.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Per captar fotografies i vídeos, permeteu que el Signal tingui accés a la càmera.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Per capturar fotos i vídeos, permet que Signal accedeixi a la càmera i al micròfon.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Per gravar vídeos amb so, permet que Signal accedeixi al teu micròfon.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Per escanejar un codi QR, permet que Signal accedeixi a la càmera.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal necessita accedir a la càmera per fer fotos</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal necessita accedir a la càmera per escanejar codis QR</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal necessita accedir al micròfon per gravar vídeos</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Per capturar fotos a Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Per capturar fotos i vídeos a Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Per gravar vídeos amb so:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Per escanejar codis QR:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Contactes recents</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">No hi ha contactes de Signal</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Només podeu usar el botó de la càmera per enviar fotografies a contactes de Signal. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">No trobeu qui busqueu?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Convideu un contacte a Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Convideu un contacte a Molly</string>
     <string name="CameraContacts__menu_search">Cerca</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">No, gràcies.</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Actualitza el Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Actualitza el Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Aquesta versió de l\'aplicació ja no té assistència. Per continuar enviant i rebent missatges, actualitzeu-la a la darrera versió.</string>
     <string name="ClientDeprecatedActivity_update">Actualitza-la</string>
     <string name="ClientDeprecatedActivity_dont_update">No l\'actualitzis</string>
     <string name="ClientDeprecatedActivity_warning">Advertiment</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">La versió de Signal ha vençut. Podràs veure l\'historial de missatges però no Podràs enviar-ne ni rebre\'n fins que l\'actualitzis.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">La versió de Molly ha vençut. Podràs veure l\'historial de missatges però no Podràs enviar-ne ni rebre\'n fins que l\'actualitzis.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">No s\'ha trobat cap navegador web.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Missatge %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Trucada de veu de Molly de %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Videotrucada de Molly de %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Missatge del Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Envia el missatge</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Canviem al Signal, %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Canviem al Molly, %1$s</string>
     <string name="ConversationActivity_specify_recipient">Trieu un contacte</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">El fitxer adjunt excedeix la mida màxima per a aquest tipus de missatges.</string>
     <string name="ConversationActivity_unable_to_record_audio">No s\'ha pogut enregistrar l\'àudio.</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Per enviar missatges d\'àudio</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Per enviar missatges de veu, permet a Signal accedir al micròfon.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Per enviar missatges de veu, permet a Molly accedir al micròfon.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal necessita accés al micròfon per gravar un missatge de veu.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">El Signal necessita el permís del micròfon per tal d\'enviar missatges d\'àudio, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi el micròfon.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly necessita accés al micròfon per gravar un missatge de veu.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">El Molly necessita el permís del micròfon per tal d\'enviar missatges d\'àudio, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi el micròfon.</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">El Signal necessita el permís del micròfon i de la càmera per tal de trucar a %1$s, però s\'han denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi el micròfon i la càmera.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Per captar fotografies i vídeos, permeteu que el Signal tingui accés a la càmera.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">El Signal necessita el permís de la càmera per tal de fer fotografies i vídeos, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi la càmera.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">El Signal necessita el permís de la càmera per fer fotografies i vídeos.</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">El Molly necessita el permís del micròfon i de la càmera per tal de trucar a %1$s, però s\'han denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi el micròfon i la càmera.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Per captar fotografies i vídeos, permeteu que el Molly tingui accés a la càmera.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">El Molly necessita el permís de la càmera per tal de fer fotografies i vídeos, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi la càmera.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">El Molly necessita el permís de la càmera per fer fotografies i vídeos.</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Activeu el permís del micròfon per capturar vídeos amb so.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">El Signal necessita el permís del micròfon per gravar vídeos, però s\'han denegat. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi el micròfon i la càmera.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">El Signal necessita el permís del telèfon per gravar vídeos.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">El Molly necessita el permís del micròfon per gravar vídeos, però s\'han denegat. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi el micròfon i la càmera.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">El Molly necessita el permís del telèfon per gravar vídeos.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">No</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Per iniciar una trucada:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Per iniciar la trucada, permet a Signal accedir al micròfon.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Per iniciar la trucada, permet a Molly accedir al micròfon.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal necessita accés al micròfon per iniciar una trucada.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly necessita accés al micròfon per iniciar una trucada.</string>
 
 
     <string name="ConversationActivity_join">Afegeix-m\'hi</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Els missatges SMS ja no són compatibles amb Signal. Convida %1$s a Signal per mantenir la conversa aquí.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Aquesta persona ja no utilitza Signal. Convida-la a Signal per continuar parlant per aquí.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Aquesta persona ja no utilitza Molly. Convida-la a Molly per continuar parlant per aquí.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Convida al Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Convida al Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Aviat t\'ho tornarem a recordar.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Esborrar per a tothom</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Suprimir en aquest dispositiu</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Eliminar</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Suprimir a tot arreu</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Aquest missatge s\'eliminarà per a tots els membres del xat si utilitzen una versió recent de Signal. Podran veure que has eliminat un missatge.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Bloquejat</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Actualitza el Signal</string>
+    <string name="ConversationFragment__update_build">Actualitza el Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Torna a registrar Signal</string>
+    <string name="ConversationFragment__reregister_signal">Torna a registrar Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Tornar enrere.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Obrir Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Obrir Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Ja no està verificat</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">S\'eliminarà de manera permanent el xat seleccionat.</item>
         <item quantity="other">S\'eliminarà de manera permanent els %1$d xats seleccionats.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Aquesta acció eliminarà de manera permanent el xat seleccionat de tots els teus dispositius.</item>
+        <item quantity="other">Aquesta acció eliminarà de manera permanent els %1$d xats seleccionats de tots els teus dispositius.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Se suprimeix</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Eliminant el xat seleccionat…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Qui pot trobar-me a través del meu número?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Qualsevol persona que tingui el teu número de telèfon veurà que ets a Signal i podrà iniciar un xat amb tu.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Qualsevol persona que tingui el teu número de telèfon veurà que ets a Molly i podrà iniciar un xat amb tu.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ningú podrà veure que ets a Signal tret que els enviïs un missatge o tinguis un xat obert amb ells.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ningú podrà veure que ets a Molly tret que els enviïs un missatge o tinguis un xat obert amb ells.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Voleu fer una restauració des d\'una còpia de seguretat?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Proveu la contrasenya de còpia de seguretat i verifiqueu que coincideix.</string>
     <string name="BackupsPreferenceFragment__turn_on">Activa</string>
     <string name="BackupsPreferenceFragment__turn_off">Desactiva</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Per restaurar una còpia de seguretat, instal·leu una còpia del Signal. Obriu l\'aplicació i toqueu Restaura la còpia de seguretat. Indiqueu el fitxer de còpia de seguretat. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Per restaurar una còpia de seguretat, instal·leu una còpia del Molly. Obriu l\'aplicació i toqueu Restaura la còpia de seguretat. Indiqueu el fitxer de còpia de seguretat. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Més informació</string>
     <string name="BackupsPreferenceFragment__in_progress">En curs…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d fins ara…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% fins ara…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">El Signal necessita el permís de l\'emmagatzematge extern per tal de crear còpies de seguretat. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi l\'emmagatzematge.</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">El Molly necessita el permís de l\'emmagatzematge extern per tal de crear còpies de seguretat. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi l\'emmagatzematge.</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Establir hora per la còpia de seguretat</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">S\'ha refrescat la sessió.</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal usa xifratge d\'extrem a extrem i és possible que de vegades hagis d’actualitzar la sessió del xat. Això no afecta la seguretat, però és possible que perdis algun missatge d’aquest contacte. Sempre pots demanar-li que te\'l torni a enviar.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly usa xifratge d\'extrem a extrem i és possible que de vegades hagis d’actualitzar la sessió del xat. Això no afecta la seguretat, però és possible que perdis algun missatge d’aquest contacte. Sempre pots demanar-li que te\'l torni a enviar.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Utilitzar Signal per a Escriptori o iPad. Els teus missatges se sincronitzaran a tots els teus dispositius connectats.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Vincular un nou dispositiu</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Els missatges i la informació del xat estan protegits mitjançant una codificació d\'extrem a extrem a tots els dispositius</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal per a Escriptori o iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Tots els missatges dels dispositius connectats són privats</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Els missatges de Molly se sincronitzaran amb l\'app al teu telèfon un cop l\'hagis vinculat. L\'historial de missatges anteriors no apareixerà.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">A l\'altre dispositiu, ves a %1$s per instal·lar Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Els meus dispositius connectats</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Desenllaça</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s desconnectat</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">S\'està vinculant el dispositiu…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Dispositiu aprovat</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Carregant…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">No hi ha dispositius connectats</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Desbloquejar per enllaçar un dispositiu</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Escaneja el codi QR que es mostra al dispositiu a vincular.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Escaneja el codi QR</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Utilitza aquest dispositiu per escanejar el codi QR que es mostra al dispositiu que vols vincular</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">D\'acord</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Aquest dispositiu podrà veure els teus grups i contactes, accedir als xats i enviar missatges en nom teu.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Acabar de vincular al teu altre dispositiu</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Acabar de vincular Molly a l\'altre dispositiu.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">No s\'ha pogut enllaçar el dispositiu</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Aquest codi QR no és vàlid. Si us plau, assegureu-vos que escanegeu el codi QR que es mostra al dispositiu que voleu enllaçar.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Torna a provar-ho</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Voleu desenllaçar «%1$s»?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimitza per a la no presència dels Play Services</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">El dispositiu no és compatible amb Play Services. Toqueu per desactivar les optimitzacions de la bateria que impedeixen que el Signal rebi missatges quan estigui inactiu.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">El dispositiu no és compatible amb Play Services. Toqueu per desactivar les optimitzacions de la bateria que impedeixen que el Molly rebi missatges quan estigui inactiu.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Aquesta versió del Signal ha vençut. Actualitzeu-la ara per enviar i rebre missatges.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Aquesta versió del Molly ha vençut. Actualitzeu-la ara per enviar i rebre missatges.</string>
     <string name="ExpiredBuildReminder_update_now">Actualitza-la ara</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Mostra</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">La comunicació del Signal falla contínuament!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">El Signal no s\'ha pogut registrar al Google Play Services. Els missatges i les trucades del Signal s\'han desactivat, registreu-vos de nou a Configuració &gt; Avançada.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">La comunicació del Molly falla contínuament!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">El Molly no s\'ha pogut registrar al Google Play Services. Els missatges i les trucades del Molly s\'han desactivat, registreu-vos de nou a Configuració &gt; Avançada.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Els registres de depuració ens ajuden a diagnosticar i solucionar el problema i no contenen informació que pugui identificar-te.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Hi ha hagut un problema a Signal. Vols enviar un registre de depuració?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Hi ha hagut un problema a Molly. Vols enviar un registre de depuració?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Les notificacions poden retardar-se a causa dels processos d\'optimització de la bateria</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Pots deshabilitar les opcions d\'optimització de bateria per a Signal per tal d\'assegurar-te que les notificacions de missatges no es retardin.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Pots deshabilitar les opcions d\'optimització de bateria per a Molly per tal d\'assegurar-te que les notificacions de missatges no es retardin.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Les notificacions poden retardar-se a causa dels processos d\'optimització de la bateria</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Deshabilita les opcions d\'optimització de bateria per a Molly per tal d\'assegurar-te que les notificacions de missatges no es retardin. Toca \"Continuar\" per veure les instruccions específiques del dispositiu.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">No, gràcies.</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Continuar</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Continuar</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Descarta</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">No, gràcies.</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Invitacions de grup pendents</string>
+    <string name="PendingMembersActivity_pending_group_invites">Sol·licituds i invitacions</string>
     <string name="PendingMembersActivity_requests">Sol·licituds</string>
     <string name="PendingMembersActivity_invites">Invitacions</string>
     <string name="PendingMembersActivity_people_you_invited">Persones que heu convidat</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Cancel·la</string>
     <string name="InviteActivity_sending">S\'envia…</string>
     <string name="InviteActivity_invitations_sent">Invitacions enviades!</string>
-    <string name="InviteActivity_invite_to_signal">Convida al Signal</string>
+    <string name="InviteActivity_invite_to_signal">Convida al Molly</string>
     <string name="InviteActivity_send_sms">Envia SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Voleu enviar %1$d invitació SMS?</item>
         <item quantity="other">Voleu enviar %1$d invitacions SMS?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Canviem al Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Canviem al Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Sembla que no teniu cap aplicació on compartir-ho.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">El vostre missatge</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">S\'ha activat la connexió en segon pla</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Respostes</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">S\'estableix la trucada del Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">S\'estableix la trucada del Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Començar el servei de trucada de Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">S\'atura el servei de trucades del Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Començar el servei de trucada de Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">S\'atura el servei de trucades del Molly</string>
     <string name="NotificationBarManager__cancel_call">Cancel·la la trucada</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Has activat Pagaments</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s ja pot acceptar Pagaments</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Les dades de pagament no estan disponibles</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Mostra\'n més</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Dades de pagament no disponibles</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Els detalls d\'aquest pagament no estan disponibles perquè els teus missatges s\'han restaurat des d\'una font que no incloïa aquest historial de pagaments. Això no afecta el saldo de la teva cartera ni l\'estat dels pagaments anteriors.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Aviat ja no podràs enviar missatges SMS a través de Signal. Convida %1$s a Signal per mantenir la conversa aquí.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Ja no pots enviar missatges SMS a través de Signal. Convida %1$s a Signal per mantenir la conversa aquí.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Ja no pots enviar missatges SMS a través de Molly. Convida %1$s a Molly per mantenir la conversa aquí.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Pagament: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Pagament</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Se n\'ha informat com a spam</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Voleu enllaçar un dispositiu de Signal?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Sembla que esteu provant d\'enllaçar un dispositiu de Signal amb un escàner extern. Per seguretat, torneu a escanejar el codi dins del Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">El Signal necessita el permís de la càmera per tal d\'escanejar un codi QR, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi la càmera.</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">El Molly necessita el permís de la càmera per tal d\'escanejar un codi QR, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi la càmera.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">No es pot escanejar un codi QR sense permís de la càmera.</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Escriviu la contrasenya</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Icona del Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Icona del Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Envia la contrasenya</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Contrasenya incorrecta!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Desbloca el Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Bloca la pantalla</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Desbloca el Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Bloca la pantalla</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Mapa</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Verifiqueu-ho per continuar la missatgeria</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Per ajudar a prevenir el correu brossa al Signal, completeu la verificació.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Per ajudar a prevenir el correu brossa al Molly, completeu la verificació.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Després de verificar-ho, podeu continuar enviant missatges. Qualsevol missatge interromput s\'enviarà automàticament.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">La meva història</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Trucada de Signal</string>
+    <string name="Recipient_signal_call">Trucada de Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Bloquejar</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Sona…</string>
     <string name="RedPhone_busy">Ocupat</string>
     <string name="RedPhone_recipient_unavailable">Destinatari no disponible</string>
-    <string name="RedPhone_network_failed">La xarxa ha fallat!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">La xarxa ha fallat! Comprova la connexió de xarxa i torna-ho a provar.</string>
     <string name="RedPhone_number_not_registered">Número no registrat!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">El número que heu marcat no pot rebre trucades de veu segures!</string>
     <string name="RedPhone_got_it">Entesos</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Toqueu aquí per activar el vídeo</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Per trucar a %1$s, el Signal necessita accés a la càmera.</string>
-    <string name="WebRtcCallActivity__signal_s">Trucada del Signal: %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Per trucar a %1$s, el Molly necessita accés a la càmera.</string>
+    <string name="WebRtcCallActivity__signal_s">Trucada del Molly: %1$s</string>
     <string name="WebRtcCallActivity__calling">Es truca…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Es torna a connectar…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Expulsar de la trucada</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Algú t\'ha expulsat de la trucada.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Permet l\'accés a la teva càmera i al teu micròfon</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Permet l\'accés al micròfon</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Permet l\'accés a la teva càmera</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Per iniciar o unir-se a una trucada, permet a Molly accedir al micròfon i a la càmera.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Per iniciar o unir-se a una trucada, permet a Molly accedir al micròfon.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Per activar el vídeo, permet que Molly tingui accés a la teva càmera.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly necessita permisos de micròfon per iniciar o unir-se a una trucada.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly necessita accedir a la càmera per activar el vídeo</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Per iniciar o unir-se a una trucada:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Per activar el vídeo:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Trucada del Signal</string>
-    <string name="WebRtcCallView__signal_video_call">Trucada de vídeo del Signal</string>
+    <string name="WebRtcCallView__signal_call">Trucada del Molly</string>
+    <string name="WebRtcCallView__signal_video_call">Trucada de vídeo del Molly</string>
     <string name="WebRtcCallView__start_call">Inicia una trucada</string>
     <string name="WebRtcCallView__join_call">Afegeix-me a la trucada</string>
     <string name="WebRtcCallView__call_is_full">La trucada és plena</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Baixar la mà?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Baixar la mà</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Baixar</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Cancel·lar</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Has aixecat la mà</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Vista</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s ha aixecat la mà</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s ha aixecat la mà</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d heu aixecat la mà</item>
+        <item quantity="other">%1$s + %2$d heu aixecat la mà</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s ha aixecat la mà</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d han aixecat la mà</item>
         <item quantity="other">%1$s + %2$d han aixecat la mà</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Rebreu una trucada per a verificar aquest número.</string>
     <string name="RegistrationActivity_edit_number">Edita el número</string>
     <string name="RegistrationActivity_missing_google_play_services">No hi ha el Google Play Services.</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Aquest dispositiu no té el Google Play Services. Encara podeu usar el Signal, però aquesta configuració pot resultar en una fiabilitat o un rendiment reduïts.\n\nSi no sou un usuari avançat, si no esteu fent servir una ROM d\'Android de mercat secundari o si creieu que esteu veient això com a error, si us plau, poseu-vos en contacte amb support@signal.org per a la resolució de problemes.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Aquest dispositiu no té el Google Play Services. Encara podeu usar el Molly, però aquesta configuració pot resultar en una fiabilitat o un rendiment reduïts.\n\nSi no sou un usuari avançat, si no esteu fent servir una ROM d\'Android de mercat secundari o si creieu que esteu veient això com a error, si us plau, poseu-vos en contacte amb support@molly.im per a la resolució de problemes.</string>
     <string name="RegistrationActivity_i_understand">Ho entenc</string>
     <string name="RegistrationActivity_play_services_error">Error amb el Play Services</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">El Google Play Services s\'està actualitzant o no està disponible. Torneu a provar-ho.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Format de número no estàndard</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">El número que heu introduït (%1$s) sembla d\'un format no estàndard.\n\nVoleu dir %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal d\'Android. Format del número de telèfon</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly d\'Android. Format del número de telèfon</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Trucada sol·licitada</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Problemes per registrar-te?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Assegura\'t que el teu telèfon tingui senyal per rebre el teu SMS o trucada\n • Confirma que puguis rebre una trucada telefònica al número\n • Comprova que has introduït el teu número de telèfon correctament.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Per obtenir més informació, segueix aquests passos de resolució de problemes o posa\'t en contacte amb el servei d\'assistència</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Per obtenir més informació, consulta %1$s o %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">aquests passos de resolució de problemes</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Afegeix als contactes</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Convida al Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Convida al Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Missatge del Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Trucada del Signal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Afegeix als contactes</string>
-    <string name="SharedContactView_invite_to_signal">Convida al Signal</string>
+    <string name="SharedContactView_invite_to_signal">Convida al Molly</string>
     <string name="SharedContactView_message">Missatge del Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s pertany a %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Actualització del Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Hi ha disponible una nova versió de Signal. Toca per actualitzar-lo.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">No s\'ha pogut actualitzar Signal</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Actualització del Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Hi ha disponible una nova versió de Molly. Toca per actualitzar-lo.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">No s\'ha pogut actualitzar Molly</string>
     <string name="ApkUpdateNotifications_failed_general_body">Ho tornarem a provar més tard.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal s\'ha actualitzat correctament</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly s\'ha actualitzat correctament</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">S\'ha actualitzat automàticament a la versió %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">El nostre número de seguretat:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Sembla que no teniu cap aplicació on compartir-ho.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">No s\'ha trobat cap número de seguretat al porta-retalls</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">El Signal necessita el permís de la càmera per tal d\'escanejar un codi QR, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi la càmera.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">El Molly necessita el permís de la càmera per tal d\'escanejar un codi QR, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi la càmera.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">No es pot escanejar un codi QR sense permís de la càmera.</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Primer heu d\'intercanviar missatges per tal de veure el número de seguretat de %1$s.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Toqueu per obrir-ho.</string>
-    <string name="KeyCachingService_passphrase_cached">S\'ha desblocat el Signal</string>
-    <string name="KeyCachingService_lock">Bloca el Signal</string>
+    <string name="KeyCachingService_passphrase_cached">S\'ha desblocat el Molly</string>
+    <string name="KeyCachingService_lock">Bloca el Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Jo</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Tipus de fitxer no compatible</string>
     <string name="MediaPreviewActivity_draft">Esborrany</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">El Signal necessita el permís de l\'emmagatzematge per tal de desar en un emmagatzematge extern, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi l\'emmagatzematge.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">El Molly necessita el permís de l\'emmagatzematge per tal de desar en un emmagatzematge extern, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi l\'emmagatzematge.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">No es pot desar en un emmagatzematge extern sense permís.</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Vols esborrar el missatge?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Aquest missatge s\'esborrarà permanentment.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">No s\'ha pogut entregar el missatge.</string>
     <string name="MessageNotifier_error_delivering_message">S\'ha produït un error en entregar el missatge.</string>
     <string name="MessageNotifier_message_delivery_paused">Lliurament de missatge interromput</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifiqueu-ho per continuar la missatgeria al Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifiqueu-ho per continuar la missatgeria al Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Marca-ho tot com a llegit</string>
     <string name="MessageNotifier_mark_read">Marca\'l com a llegit</string>
     <string name="MessageNotifier_turn_off_these_notifications">Desactiva aquestes notificacions</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Reacció al teu sticker: %1$s.</string>
     <string name="MessageNotifier_this_message_was_deleted">Aquest missatge s\'ha esborrat.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Voleu desactivar les notificacions de contactes afegits al Signal? Les podeu tornar a activar a Signal &gt; Configuració &gt; Notificacions.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Voleu desactivar les notificacions de contactes afegits al Molly? Les podeu tornar a activar a Molly &gt; Configuració &gt; Notificacions.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">La resposta ràpida no és disponible si el Signal està blocat!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">La resposta ràpida no és disponible si el Molly està blocat!</string>
     <string name="QuickResponseService_problem_sending_message">S\'ha produït un problema en enviar el missatge!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Drecera no vàlida</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Missatge nou</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Sol·licitud de missatge</string>
     <string name="SingleRecipientNotificationBuilder_you">Vós</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Aquest dispositiu ja no està registrat. Segurament vas registrar el número de telèfon a Signal des d\'un altre dispositiu.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Aquest dispositiu ja no està registrat. Segurament vas registrar el número de telèfon a Molly des d\'un altre dispositiu.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Tornar a registrar dispositiu</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Per respondre la trucada, permeteu que el Signal accedeixi al micròfon.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Per respondre la trucada, permeteu que el Molly accedeixi al micròfon.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Per respondre la videotrucada, permet que Signal accedeixi al micròfon i a la càmera.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">El Signal necessita el permís del micròfon i de la càmera per tal de fer o rebre trucades, però s\'han denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi el micròfon i la càmera.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Per respondre la videotrucada, permet que Molly accedeixi al micròfon i a la càmera.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">El Molly necessita el permís del micròfon i de la càmera per tal de fer o rebre trucades, però s\'han denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi el micròfon i la càmera.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">S\'ha respost en un dispositiu enllaçat.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">S\'ha rebutjat en un dispositiu enllaçat.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Ocupat/da en un dispositiu enllaçat</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Repetiu la contrasenya nova</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Convida al Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Convida al Molly</string>
     <string name="contact_selection_activity__new_group">Grup nou</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Actualitzar contactes</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Falta algú? Prova d\'actualitzar</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Troba gent que coneixes a Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Permet l\'accés als teus contactes</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Més</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Foto del contacte</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">El Signal necessita el permís de l\'aplicació dels contactes per tal de mostrar-ne els vostres, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi els contactes.</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">El Molly necessita el permís de l\'aplicació dels contactes per tal de mostrar-ne els vostres, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i activeu-hi els contactes.</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Error en recuperar els contactes. Comproveu la connexió de xarxa.</string>
     <string name="ContactSelectionListFragment_username_not_found">No s\'ha trobat l\'àlies.</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"%1$s no és un usuari del Signal. Si us plau, comproveu-ne l\'àlies i torneu-ho a provar."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Cerca per àlies</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Permet l\'accés als contactes</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Per trobar gent que coneixes a Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Permet l\'accés</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">No, gràcies.</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Permet l\'accés als teus contactes. Els teus contactes estan xifrats i no són visibles pel servei de Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">El Signal necessita accés als contactes per tal de mostrar-los.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">El Molly necessita accés als contactes per tal de mostrar-los.</string>
     <string name="contact_selection_list_fragment__show_contacts">Mostra els contactes</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Has eliminat a aquesta persona, si tornes a enviar-li un missatge se l\'afegirà de nou a la teva llista.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Opcions</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Actualitza-la</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Reprodueix… Pausa</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Les bombolles són una funció d\'Android que pots desactivar per als xats de Signal.</string>
+    <string name="BubbleOptOutTooltip__description">Les bombolles són una funció d\'Android que pots desactivar per als xats de Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Ara no</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Descripció del grup</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Actualitza el Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Actualitza el Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Aquesta versió de Signal ha caducat. Actualitza-la ara per continuar utilitzant Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Aquesta versió de Molly ha caducat. Actualitza-la ara per continuar utilitzant Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Actualitza-la</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Lent</string>
     <string name="preferences__help">Ajuda</string>
     <string name="preferences__advanced">Avançat</string>
-    <string name="preferences__donate_to_signal">Fer una donació a Signal</string>
+    <string name="preferences__donate_to_signal">Fer una donació a Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Privadesa</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Canviar la icona i el nom de l\'app per \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal s\'haurà de tancar per canviar la icona i el nom de l\'app. Les notificacions sempre mostraran la icona i el nom predeterminats de Signal.</string>
+    <string name="preferences__app_icon_dialog_description">Molly s\'haurà de tancar per canviar la icona i el nom de l\'app. Les notificacions sempre mostraran la icona i el nom predeterminats de Molly.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Selecciona la icona i el nom per a l\'app, que seran visibles a la pantalla d\'inici del telèfon i al menú d\'aplicacions. Les notificacions sempre mostraran la icona i el nom predeterminats de Signal. Més informació</string>
+    <string name="preferences__app_icon_warning_learn_more">Selecciona la icona i el nom per a l\'app, que seran visibles a la pantalla d\'inici del telèfon i al menú d\'aplicacions. Les notificacions sempre mostraran la icona i el nom predeterminats de Molly. Més informació</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Les icones i els noms de les apps són visibles a la pantalla d\'inici i al menú d\'aplicacions.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Les notificacions sempre mostraran la icona i el nom predeterminats de Signal.</string>
+    <string name="preferences__app_icon_notification_warning">Les notificacions sempre mostraran la icona i el nom predeterminats de Molly.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Més informació</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Això reduirà permanentment tots els xats als %1$s missatges més recents.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Això esborrarà permanentment tot l\'historial dels missatges i tot el contingut del dispositiu.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Això eliminarà permanentment tot l\'historial de missatges i els continguts multimèdia d\'aquest dispositiu i de qualsevol dispositiu vinculat.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Segur que vols esborrar tot l\'historial dels missatges?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">S\'esborrarà permanentment tot l\'historial dels missatges. Aquesta acció no es pot desfer.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">S\'esborrarà permanentment tot l\'historial de missatges de tots els dispositius. Aquesta acció no es pot desfer.</string>
     <string name="preferences_storage__delete_all_now">Esborrar-ho tot ara</string>
     <string name="preferences_storage__forever">Per sempre</string>
     <string name="preferences_storage__one_year">1 any</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Elusió de la censura</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Elusió de la censura</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">En activar-ho, el Signal provarà d\'eludir la censura. No activeu aquesta característica si no sou a una ubicació on el Signal és censurat.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">En activar-ho, el Molly provarà d\'eludir la censura. No activeu aquesta característica si no sou a una ubicació on el Molly és censurat.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">L\'elusió de la censura s\'ha activat basant-se en el número de telèfon del vostre compte.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Presentem els Pagaments</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Utilitza Signal per enviar i rebre MobileCoin, una nova moneda digital amb la privacitat com a prioritat. Activa-ho per començar.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Utilitza Molly per enviar i rebre MobileCoin, una nova moneda digital amb la privacitat com a prioritat. Activa-ho per començar.</string>
     <string name="PaymentsHomeFragment__activate_payments">Activa els pagaments</string>
     <string name="PaymentsHomeFragment__activating_payments">S\'activen els pagaments…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Restaura el compte de pagaments</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Els pagaments no estan disponibles a la vostra regió.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">No s\'han pogut activar els pagaments. Torneu-ho a provar més tard.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Voleu desactivar els pagaments?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">No podreu enviar ni rebre MobileCoin al Signal si desactiveu els pagaments.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">No podreu enviar ni rebre MobileCoin al Molly si desactiveu els pagaments.</string>
     <string name="PaymentsHomeFragment__deactivate">Desactiva\'ls</string>
     <string name="PaymentsHomeFragment__continue">Continua</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">El saldo actualment no està disponible.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Detalls</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Pots fer servir Signal per enviar i rebre MobileCoin. Tots els pagaments estan subjectes a les Condicions d\'ús de MobileCoins i MobileCoin Wallet. És possible que tinguis algun problema, i els pagaments o fons que perdis no podran ser recuperats. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Pots fer servir Molly per enviar i rebre MobileCoin. Tots els pagaments estan subjectes a les Condicions d\'ús de MobileCoins i MobileCoin Wallet. És possible que tinguis algun problema, i els pagaments o fons que perdis no podran ser recuperats. </string>
     <string name="PaymentsHomeFragment__activate">Activa\'ls</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Vegeu els termes de MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Els pagaments al Signal ja no estan disponibles. Encara podeu transferir fons a un intercanvi, però ja no podeu enviar ni rebre pagaments ni afegir-hi fons.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Els pagaments al Molly ja no estan disponibles. Encara podeu transferir fons a un intercanvi, però ja no podeu enviar ni rebre pagaments ni afegir-hi fons.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Permisos</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Per ajudar-te a enviar missatges a persones que coneixes, Signal sol·licitarà aquests permisos. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Per ajudar-te a enviar missatges a persones que coneixes, Molly sol·licitarà aquests permisos. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Notificacions</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Següent</string>
     <string name="PaymentsTransferFragment__invalid_address">Adreça no vàlida</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Comproveu l\'adreça de cartera a la qual intenteu fer una transferència i torneu-ho a provar.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">No podeu fer una transferència a la vostra adreça de cartera del Signal. Introduïu l\'adreça de la cartera des del compte amb un intercanvi compatible.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Per escanejar un codi QR, el Signal necessita accés a la càmera.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">El Signal necessita el permís de la càmera per capturar un codi QR. Aneu a la configuració, seleccioneu Permisos i activeu la càmera.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Per escanejar un codi QR, el Signal necessita accés a la càmera.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">No podeu fer una transferència a la vostra adreça de cartera del Molly. Introduïu l\'adreça de la cartera des del compte amb un intercanvi compatible.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Per escanejar un codi QR, el Molly necessita accés a la càmera.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">El Molly necessita el permís de la càmera per capturar un codi QR. Aneu a la configuració, seleccioneu Permisos i activeu la càmera.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Per escanejar un codi QR, el Molly necessita accés a la càmera.</string>
     <string name="PaymentsTransferFragment__settings">Configuració</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Trucada de veu Signal entrant</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Trucada de veu Molly entrant</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Videotrucada de Signal entrant</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Videotrucada de Molly entrant</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Trucada de grup de Signal rebuda</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Trucada de grup de Molly rebuda</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Trucada de veu de Signal en curs</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Trucada de veu de Molly en curs</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Trucada de vídeo de Signal en curs</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Trucada de vídeo de Molly en curs</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Trucada de grup de Signal en curs</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Trucada de grup de Molly en curs</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Es carrega…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Verificació</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Heu escrit correctament la contrasenya de còpia de seguretat.</string>
     <string name="BackupDialog_passphrase_was_not_correct">La contrasenya no és correcta.</string>
-    <string name="LocalBackupJob_creating_signal_backup">Es crea una còpia de seguretat del Signal…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Es crea una còpia de seguretat del Molly…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Verificant la còpia de seguretat de Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Verificant la còpia de seguretat de Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">Ha fallat la còpia de seguretat.</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">El directori de còpia de seguretat s\'ha suprimit o s\'ha canviat de lloc.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">El fitxer de còpia de seguretat és massa gros per desar-lo en aquest volum.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Truca\'m (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Torna a enviar el codi (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Contacteu amb el suport de Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Registre del Signal - Codi de verificació per a Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Contacteu amb el suport de Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Registre del Molly - Codi de verificació per a Android</string>
     <string name="RegistrationActivity_incorrect_code">Codi incorrecte</string>
     <string name="BackupUtil_never">Mai</string>
     <string name="BackupUtil_unknown">Desconegut</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Número de telèfon</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Tria qui pot veure el teu número de telèfon i qui pot contactar-te a Signal a través d\'ell.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Tria qui pot veure el teu número de telèfon i qui pot contactar-te a Molly a través d\'ell.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Qui pot veure el meu número</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Massa intents. Si us plau, torneu-ho a provar més tard.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Error en connectar al servei</string>
     <string name="preferences_chats__backups">Còpies de seguretat</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">El Signal està blocat</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">El Molly està blocat</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">TOQUEU PER DESBLOCAR-LO</string>
     <string name="Recipient_unknown">Desconegut</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Us cal accés al dispositiu antic.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Restaura des d\'una còpia de seguretat</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Restaureu els missatges des d\'una còpia de seguretat local. Si no la restaureu ara, no podreu restaurar-la més tard.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Restaurar la còpia de seguretat local</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Restaurar la còpia de seguretat de Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Restaurar tots els teus missatges de text + els teus últims 30 dies d\'arxius multimèdia</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Més opcions</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Cancel·lar</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Inicia sessió sense transferir</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Continua sense transferir els teus missatges i arxius multimèdia</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Obriu el Signal a l\'antic telèfon Android.</string>
     <string name="NewDeviceTransferInstructions__continue">Continua</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Es prepara la connexió amb un dispositiu Android antic…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Un moment, hauria d’estar llest aviat…</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">S\'espera que el dispositiu Android antic es connecti…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">El Signal necessita el permís d’ubicació per descobrir i connectar-se al dispositiu antic d\'Android.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">El Signal necessita els serveis d’ubicació habilitats per descobrir i connectar-se al dispositiu antic d\'Android.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">El Signal necessita la connexió Wi-Fi per descobrir i connectar-se al dispositiu antic d\'Android. La Wi-Fi ha d’estar activa, però no ha d’estar connectat a una xarxa Wi-Fi.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Sembla que aquest dispositiu no admet Wi-Fi Direct. El Signal usa Wi-Fi Direct per descobrir i connectar-se al dispositiu antic d\'Android. Encara podeu restaurar una còpia de seguretat per restaurar el compte des del dispositiu d\'Android antic.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">El Molly necessita el permís d’ubicació per descobrir i connectar-se al dispositiu antic d\'Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">El Molly necessita els serveis d’ubicació habilitats per descobrir i connectar-se al dispositiu antic d\'Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">El Molly necessita la connexió Wi-Fi per descobrir i connectar-se al dispositiu antic d\'Android. La Wi-Fi ha d’estar activa, però no ha d’estar connectat a una xarxa Wi-Fi.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Sembla que aquest dispositiu no admet Wi-Fi Direct. El Molly usa Wi-Fi Direct per descobrir i connectar-se al dispositiu antic d\'Android. Encara podeu restaurar una còpia de seguretat per restaurar el compte des del dispositiu d\'Android antic.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Restaura una còpia de seguretat</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">S\'ha produït un error inesperat en intentar connectar al dispositiu d\'Android antic.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Se cerca un dispositiu d\'Android nou…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">El Signal necessita el permís d’ubicació per descobrir i connectar-se al dispositiu d\'Android nou.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">El Signal necessita els serveis d’ubicació habilitats per descobrir i connectar-se al dispositiu d\'Android nou.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">El Signal necessita la connexió Wi-Fi per descobrir i connectar-se al dispositiu d\'Android nou. La Wi-Fi ha d’estar activa, però no ha d’estar connectat a una xarxa Wi-Fi.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Sembla que aquest dispositiu no admet Wi-Fi Direct. El Signal usa Wi-Fi Direct per descobrir i connectar-se al dispositiu d\'Android nou. Encara podeu restaurar una còpia de seguretat per restaurar el compte des del dispositiu d\'Android nou.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">El Molly necessita el permís d’ubicació per descobrir i connectar-se al dispositiu d\'Android nou.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">El Molly necessita els serveis d’ubicació habilitats per descobrir i connectar-se al dispositiu d\'Android nou.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">El Molly necessita la connexió Wi-Fi per descobrir i connectar-se al dispositiu d\'Android nou. La Wi-Fi ha d’estar activa, però no ha d’estar connectat a una xarxa Wi-Fi.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Sembla que aquest dispositiu no admet Wi-Fi Direct. El Molly usa Wi-Fi Direct per descobrir i connectar-se al dispositiu d\'Android nou. Encara podeu restaurar una còpia de seguretat per restaurar el compte des del dispositiu d\'Android nou.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Crea una còpia de seguretat</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">S\'ha produït un error inesperat en intentar connectar al dispositiu d\'Android nou.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Es transfereixen dades</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Mantingueu els dos dispositius a prop l’un de l’altre. No els apagueu i mantingueu el Signal obert. Les transferències estan encriptades d\'extrem a extrem.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Mantingueu els dos dispositius a prop l’un de l’altre. No els apagueu i mantingueu el Molly obert. Les transferències estan encriptades d\'extrem a extrem.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d missatges fins ara…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% de missatges fins ara…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Transfereix el compte</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Baixeu el Signal al dispositiu d\'Android nou.</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Baixeu el Molly al dispositiu d\'Android nou.</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Toqueu Transfereix o restaura el compte"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Qualsevol persona amb aquest enllaç pot veure el nom i la fotografia del grup i sol·licitar afegir-s\'hi. Compartiu-lo amb gent en qui confieu.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Qualsevol persona amb aquest enllaç pot veure el nom i la fotografia del grup i sol·licitar afegir-s\'hi. Compartiu-lo amb gent en qui confieu.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Comparteix per Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Comparteix per Molly</string>
     <string name="GroupLinkBottomSheet_copy">Copia</string>
     <string name="GroupLinkBottomSheet_qr_code">Codi QR</string>
     <string name="GroupLinkBottomSheet_share">Compartir-lo</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">Quant a MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin és una nova moneda digital amb la privacitat com a prioritat.</string>
     <string name="payment_info_card_adding_funds">Afegir-hi fons</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Podeu afegir fons per usar-los al Signal enviant MobileCoin a la vostra adreça de cartera.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Podeu afegir fons per usar-los al Molly enviant MobileCoin a la vostra adreça de cartera.</string>
     <string name="payment_info_card_cashing_out">Passar per caixa</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Podeu cobrar els MobileCoin en qualsevol moment amb un intercanvi que admeti MobileCoin. Només heu de fer una transferència al vostre compte amb aquest intercanvi.</string>
     <string name="payment_info_card_hide_this_card">Voleu amagar aquesta targeta?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Desactiva la cartera</string>
     <string name="DeactivateWalletFragment__your_balance">El saldo</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Es recomana transferir els fons a una altra adreça de cartera abans de desactivar els pagaments. Si decideixes no transferir els fons ara, quedaran a la cartera enllaçada al Signal si reactives els pagaments.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Es recomana transferir els fons a una altra adreça de cartera abans de desactivar els pagaments. Si decideixes no transferir els fons ara, quedaran a la cartera enllaçada al Molly si reactives els pagaments.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Transfereix el saldo restant</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Desactiveu-ho sense transferència</string>
     <string name="DeactivateWalletFragment__deactivate">Desactiva\'ls</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Voleu desactivar els fons sense transferir-los?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">El saldo es mantindrà a la cartera enllaçada amb Signal si decideixes reactivar els pagaments.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">El saldo es mantindrà a la cartera enllaçada amb Molly si decideixes reactivar els pagaments.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Error en desactivar la cartera</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Llicències</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Termes i política de privadesa</string>
-    <string name="HelpFragment__copyright_signal_messenger">Copyright Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Copyright Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Amb llicència de GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4773,7 +4911,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">Automàtic</string>
+    <string name="ChatColorSelectionFragment__auto">Auto</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Usa els colors personalitzats</string>
     <string name="ChatColorSelectionFragment__chat_color">Color del xat</string>
     <string name="ChatColorSelectionFragment__edit">Edita</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Seleccioneu un color</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Comparteix-lo</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Només els administradors poden enviar missatges a aquest grup.</string>
-    <string name="MultiselectForwardFragment__limit_reached">S\'ha arribat al límit.</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">No pots seleccionar més de 5 xats</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Més informació</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Actualitza el Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Actualitza el Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Aquesta versió de Signal ha caducat. Actualitza-la ara per continuar utilitzant Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Aquesta versió de Molly ha caducat. Actualitza-la ara per continuar utilitzant Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Actualitza-la</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Dispositiu no registrat</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Aquest dispositiu ja no està registrat. Torna a registrar-lo per continuar utilitzant Signal en aquest dispositiu.</string>
+    <string name="ReregisterSignalDialog__message">Aquest dispositiu ja no està registrat. Torna a registrar-lo per continuar utilitzant Molly en aquest dispositiu.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Torna a registrar</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Ha fallat obrir el selector.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Per activar les notificacions, Signal necessita permís per mostrar-les.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Per activar les notificacions, Molly necessita permís per mostrar-les.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Activar</string>
 
@@ -5637,7 +5773,7 @@
     <!-- Used to join views and replies when both exist on a story item -->
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
-    <string name="StoryViewerPageFragment__you">Vós</string>
+    <string name="StoryViewerPageFragment__you">Tu</string>
     <!-- Displayed when viewing a story sent to a group, placeholders are person who sent the story and the group name -->
     <string name="StoryViewerPageFragment__s_to_s">%1$s a %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Encara no té respostes</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">No pots respondre a aquesta història perquè ja no pertanys a aquest grup.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Ha reaccionat a la història</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Has reaccionat a la història</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Ha reaccionat a la història</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Visualitzacions</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Tria el teu banc</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Confirma la teva donació amb %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Per configurar la teva donació recurrent, toca continuar per confirmar un càrrec de 0,01 € amb el teu banc. Això es reemborsarà automàticament i permetrà que la teva donació de 5 €/mes es carregui al teu compte.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Per configurar la teva donació recurrent, toca continuar per confirmar un càrrec de 0,01 € amb el teu banc. Això es reemborsarà automàticament i permetrà que la teva donació de %1$s/mes es carregui al teu compte.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Continuar</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">S\'està descarregant la còpia de seguretat…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Les còpies de seguretat d\'arxius estan desactivades</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">S\'ha cancel·lat el teu pla de còpia de seguretat d\'arxius a Signal perquè no hem pogut processar el teu pagament. Tens %1$d dia per descarregar qualsevol arxiu emmagatzemat a la teva còpia de seguretat. S\'eliminaran els arxius de la teva còpia de seguretat en %1$d dia.</item>
+        <item quantity="other">S\'ha cancel·lat el teu pla de còpia de seguretat d\'arxius a Signal perquè no hem pogut processar el teu pagament. Tens %1$d dies per descarregar qualsevol arxiu emmagatzemat a la teva còpia de seguretat. S\'eliminaran els arxius de la teva còpia de seguretat en %1$d dies.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Per continuar fent còpies de seguretat de tots els teus arxius, pots tornar a pagar per aquest servei en qualsevol moment. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Els teus arxius s\'eliminaran avui</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">S\'ha cancel·lat el teu pla de còpia de seguretat d\'arxius a Signal perquè no hem pogut processar el teu pagament. Aquesta és la darrera oportunitat de descarregar els arxius de la teva còpia de seguretat abans que aquesta sigui eliminada.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">No es pot completar la descàrrega</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">El teu dispositiu no té prou espai lliure. Allibera fins a %1$s d\'espai per descarregar els arxius de la teva còpia de seguretat.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Si selecciones \"Ometre\", els arxius de la teva còpia de seguretat s\'eliminaran d\'aquí a %1$d dia.</item>
+        <item quantity="other">Si selecciones \"Ometre\", els arxius de la teva còpia de seguretat s\'eliminaran d\'aquí a %1$d dies.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">No es pot processar el pagament de la còpia de seguretat.</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Estem tenint problemes per cobrar el teu pagament mensual recurrent per les còpies de seguretat. Assegura\'t que el mètode de pagament estigui actualitzat. Si no és així, actualitza\'l a Google Pay. Signal intentarà processar el pagament de nou d\'aquí a uns dies.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">No s\'ha pogut completar la còpia de seguretat</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">El teu dispositiu no ha fet una còpia de seguretat en els últims %1$d dies. Assegura\'t que el dispositiu estigui connectat a una xarxa wifi i toca \"Fer una còpia de seguretat ara\". </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Més informació</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Omet</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Descarregar els arxius ara</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Descarregar més tard</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">No descarregar els arxius</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Allibera %1$s d\'espai per descarregar els teus arxius.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Targeta de crèdit o dèbit</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Desconegut</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Historial de pagaments</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">La teva darrera còpia de seguretat es va fer el dia %1$s a les %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Els missatges anteriors a la data seleccionada seran eliminats de manera permanent.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Els missatges que superin la longitud seleccionada seran eliminats de manera permanent.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Aplicar límits als dispositius connectats</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Quan això està activat, els límits de xat també eliminaran els missatges dels dispositius connectats.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">L\'eliminació de continguts ara es sincronitza ara a tots els teus dispositius</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Quan elimines missatges o xats, s\'eliminen del teu telèfon i dels dispositius connectats.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">D\'acord</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Historial de pagaments</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Còpia de seguretat de text i de tots els arxius multimèdia</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Detalls de pagament</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Tipus de còpia de seguretat</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Data de pagament</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Comparteix</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Còpies de seguretat de Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Historial de pagaments</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Detalls de la còpia de seguretat</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Mida de la còpia de seguretat</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Freqüència de còpia de seguretat</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Fer una còpia de seguretat amb el mòbil</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Desactivar i eliminar les còpies de seguretat</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">S\'ha eliminat i desactivat la còpia de seguretat.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">S\'ha canviat el tipus de còpia de seguretat i s\'ha cancel·lat la subscripció</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Subscripció cancel·lada</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Descàrrega completa</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Tipus de còpia de seguretat</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Còpies de seguretat desactivades</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/mes</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Activa les còpies de seguretat</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Darrera còpia de seguretat</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s a %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Mai</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Fes-ne una còpia de seguretat ara</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Desactivar i eliminar les còpies de seguretat?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">No se\'t tornarà a cobrar. S\'eliminarà la teva còpia de seguretat i no es crearan noves còpies de seguretat.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Desactivar i suprimir</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Eliminant la còpia de seguretat…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">S\'ha eliminat la còpia de seguretat</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Al tocar Fer una còpia de seguretat ara"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Diàriament</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Setmanalment</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Mensual</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Còpia de seguretat manual</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Introdueix el PIN, la contrasenya o el patró del teu dispositiu.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Següent</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Canviar el tipus de còpia de seguretat</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Cancel·la la subscripció</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Confirmar la cancel·lació</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">No se\'t tornarà a cobrar. Les còpies de seguretat es desactivaran al final del teu període de facturació. Després d\'aquesta data, tindràs 30 dies per descarregar els arxius dels quals estàs fent una còpia de seguretat.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Confirmar i descarregar ara</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Confirmar i descarregar més tard</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Mantenir la subscripció</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index ccacf23753..2c61e24dc5 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal se aktualizuje…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly se aktualizuje…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Dosud nemáte nastavené heslo!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Zakázat heslo?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Tímto trvale odemknete Signal a upozornění na zprávy.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Tímto trvale odemknete Molly a upozornění na zprávy.</string>
     <string name="ApplicationPreferencesActivity_disable">Deaktivovat</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Chyba při připojování k serveru!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN je vyžadován pro zámek registrace. Nejprve prosím zakažte zámek registrace, aby bylo možné PIN deaktivovat.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Soubor</string>
     <string name="AttachmentKeyboard_contact">Kontakt</string>
     <string name="AttachmentKeyboard_location">Poloha</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Aplikace Signal potřebuje povolení, aby mohla zobrazovat vaše fotografie a videa.</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Aplikace Molly potřebuje povolení, aby mohla zobrazovat vaše fotografie a videa.</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Povolit přístup</string>
     <string name="AttachmentKeyboard_payment">Platba</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Nemohu nalézt aplikaci pro vybraný typ dat.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal potřebuje oprávnění pro přístup k úložišti, aby mohl připojovat fotky, videa nebo audio, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Úložiště\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal potřebuje oprávnění pro přístup ke kontaktům, aby mohl připojit informace o kontaktu, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Kontakty\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal potřebuje oprávnění pro přístup k poloze, aby mohl připojit informace o poloze, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Poloha\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly potřebuje oprávnění pro přístup k úložišti, aby mohl připojovat fotky, videa nebo audio, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Úložiště\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly potřebuje oprávnění pro přístup ke kontaktům, aby mohl připojit informace o kontaktu, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Kontakty\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly potřebuje oprávnění pro přístup k poloze, aby mohl připojit informace o poloze, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Poloha\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Povolit přístup k poloze</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Jak poslat svou polohu:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Povolte pro aplikaci Signal přístup k odeslání polohy.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Povolte pro aplikaci Molly přístup k odeslání polohy.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Aplikace Signal potřebuje povolení přístupu k poloze, aby ji mohla odeslat.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Aplikace Molly potřebuje povolení přístupu k poloze, aby ji mohla odeslat.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Povolte přístup k úložišti</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Zobrazení fotografií a videí:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Aplikace Signal potřebuje povolit přístup k úložišti, aby mohla zobrazovat vaše fotografie a videa.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Aplikace Molly potřebuje povolit přístup k úložišti, aby mohla zobrazovat vaše fotografie a videa.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s nemá aktivované Platby </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Změnit kameru</string>
     <string name="CameraXFragment_open_gallery_description">Otevřít galerii</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Povolit přístup</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Povolte přístup k fotoaparátu a mikrofonu</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Povolte přístup k fotoaparátu</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Povolte přístup k mikrofonu</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Chcete-li pořizovat fotografie, povolte aplikaci Signal přístup k fotoaparátu.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Pro pořizování fotografií nebo videa potřebuje Signal přístup k fotoaparátu.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Chcete-li pořizovat fotografie a natáčet videa, povolte aplikaci Signal přístup k fotoaparátu a mikrofonu.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Chcete-li natáčet videa se zvukem, povolte aplikaci Signal přístup k mikrofonu.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Chcete-li naskenovat QR kód, povolte aplikaci Signal přístup k fotoaparátu.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">K pořizování fotografií vyžaduje Signal přístup k fotoaparátu</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Ke skenování QR kódů vyžaduje Signal přístup k fotoaparátu</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">K natáčení videa vyžaduje Signal přístup k mikrofonu</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Jak pořizovat fotografie v aplikaci Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Jak pořizovat fotografie a natáčet videa v aplikaci Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Jak natáčet videa se zvukem:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Jak skenovat QR kódy:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Nedávné kontakty</string>
@@ -273,7 +274,7 @@
     <string name="CameraContacts_no_signal_contacts">Žádné Signal kontakty</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Tlačítko fotoaparátu můžete použit pouze pro odeslání fotografií kontaktům Signal. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Nemůžete najít, koho jste hledali?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Pozvěte kontakt do Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Pozvěte kontakt do Molly</string>
     <string name="CameraContacts__menu_search">Hledat</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -287,12 +288,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Ne, díky</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Aktualizovat Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Aktualizovat Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Tato verze aplikace již není podporována. Chcete-li pokračovat v odesílání a přijímání zpráv, aktualizujte na nejnovější verzi.</string>
     <string name="ClientDeprecatedActivity_update">Aktualizovat</string>
     <string name="ClientDeprecatedActivity_dont_update">Neaktualizovat</string>
     <string name="ClientDeprecatedActivity_warning">Varování</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Verze Signal, kterou používáte, je zastaralá. Můžete zobrazit svoji historii zpráv, ale nebudete moci zprávy odesílat ani přijímat, dokud neprovedete aktualizaci.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Verze Molly, kterou používáte, je zastaralá. Můžete zobrazit svoji historii zpráv, ale nebudete moci zprávy odesílat ani přijímat, dokud neprovedete aktualizaci.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Nebyl nalezen žádný webový prohlížeč.</string>
@@ -329,8 +330,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Zpráva %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Hlasový hovor Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Videohovor Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -428,7 +429,7 @@
     <string name="ConversationActivity_transport_signal">Zpráva Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Odeslat zprávu</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Přejít na Signal: %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Přejít na Molly: %1$s</string>
     <string name="ConversationActivity_specify_recipient">Vyberte prosím kontakt</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Velikost přílohy překročila limit pro typ zprávy, kterou posíláte.</string>
     <string name="ConversationActivity_unable_to_record_audio">Nemohu nahrávat audio!</string>
@@ -447,18 +448,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Jak poslat hlasovou zprávu:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Pro odeslání hlasové zprávy povolte aplikaci Signal přístup k mikrofonu.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Pro odeslání hlasové zprávy povolte aplikaci Molly přístup k mikrofonu.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Aplikace Signal potřebuje pro nahrání hlasové zprávy povolit přístup k mikrofonu.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal potřebuje oprávnění pro přístup k mikrofonu, aby mohl poslat audio zprávu, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Mikrofon\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Aplikace Molly potřebuje pro nahrání hlasové zprávy povolit přístup k mikrofonu.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly potřebuje oprávnění pro přístup k mikrofonu, aby mohl poslat audio zprávu, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Mikrofon\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal potřebuje oprávnění pro přístup k mikrofonu a fotoaparátu, abyste mohli volat %1$s, ale tato oprávnění jsou nyní zakázána. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Mikrofon\" a \"Fotoaparát\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Pro pořizování fotografií nebo videa potřebuje Signal přístup k fotoaparátu.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal potřebuje oprávnění pro přístup k fotoaparátu, aby mohl pořizovat fotografie nebo video, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Fotoaparát\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal potřebuje přístup k fotoaparátu, aby mohl pořizovat fotografie nebo videa.</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly potřebuje oprávnění pro přístup k mikrofonu a fotoaparátu, abyste mohli volat %1$s, ale tato oprávnění jsou nyní zakázána. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Mikrofon\" a \"Fotoaparát\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Pro pořizování fotografií nebo videa potřebuje Molly přístup k fotoaparátu.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly potřebuje oprávnění pro přístup k fotoaparátu, aby mohl pořizovat fotografie nebo video, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Fotoaparát\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly potřebuje přístup k fotoaparátu, aby mohl pořizovat fotografie nebo videa.</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Povolte oprávnění k mikrofonu pro nahrávání videa se zvukem.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal potřebuje oprávnění k mikrofonu, aby mohl nahrávat videa, ale toto oprávnění bylo zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Mikrofon\" a \"Fotoaparát\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal potřebuje oprávnění k mikrofonu pro nahrávání videa.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly potřebuje oprávnění k mikrofonu, aby mohl nahrávat videa, ale toto oprávnění bylo zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Mikrofon\" a \"Fotoaparát\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly potřebuje oprávnění k mikrofonu pro nahrávání videa.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Ne</string>
@@ -479,9 +480,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Jak zahájit hovor:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Abyste mohli telefonovat, je potřeba pro aplikaci Signal povolit přístup k mikrofonu.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Abyste mohli telefonovat, je potřeba pro aplikaci Molly povolit přístup k mikrofonu.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Aplikace Signal potřebuje pro zahájení hovoru povolit přístup k mikrofonu.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Aplikace Molly potřebuje pro zahájení hovoru povolit přístup k mikrofonu.</string>
 
 
     <string name="ConversationActivity_join">Připojit</string>
@@ -495,9 +496,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Zasílání SMS zpráv již není aplikací Signal podporováno. Pozvěte kontakt %1$s do aplikace Signal a pokračujte v konverzaci zde.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Tato osoba již Signal nepoužívá. Pozvěte ji do aplikace Signal a pokračujte v konverzaci zde.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Tato osoba již Molly nepoužívá. Pozvěte ji do aplikace Molly a pokračujte v konverzaci zde.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Pozvat do Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Pozvat do Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Brzy vám to znovu připomeneme.</string>
 
@@ -563,6 +564,8 @@
     <string name="ConversationFragment_delete_for_everyone">Odstranit pro všechny</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Odstranit v tomto zařízení</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Smazat</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Odstranit všude</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Tato zpráva bude smazána pro všechny v chatu, pokud používají poslední verzi aplikace Signal. Uvidí, že jste zprávu odstranili.</string>
@@ -594,13 +597,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Zablokováno</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Aktualizovat Signal</string>
+    <string name="ConversationFragment__update_build">Aktualizovat Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Znovu se zaregistrovat do služby Signal</string>
+    <string name="ConversationFragment__reregister_signal">Znovu se zaregistrovat do služby Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Přejít zpět.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Otevřít Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Otevřít Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Již bez ověření</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -669,6 +672,13 @@
         <item quantity="many">Tímto trvale odstraníte všech %1$d vybraných chatů.</item>
         <item quantity="other">Tímto trvale odstraníte všech %1$d vybraných chatů.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Tím se trvale odstraní zvolený chat ze všech vašich zařízení.</item>
+        <item quantity="few">Tím se trvale odstraní %1$d zvolené chaty ze všech vašich zařízení.</item>
+        <item quantity="many">Tím se trvale odstraní %1$d zvolených chatů ze všech vašich zařízení.</item>
+        <item quantity="other">Tím se trvale odstraní %1$d zvolených chatů ze všech vašich zařízení.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Mažu</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Odstraňování vybraného chatu…</item>
@@ -770,9 +780,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Kdo mě může najít podle čísla?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Každý, kdo má vaše telefonní číslo, uvidí, že používáte Signal, a může s vámi začít chatovat.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Každý, kdo má vaše telefonní číslo, uvidí, že používáte Molly, a může s vámi začít chatovat.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Nikdo neuvidí, že používáte Signal, dokud mu nenapíšete nebo pokud s ním už nejste v existujícím chatu.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Nikdo neuvidí, že používáte Molly, dokud mu nenapíšete nebo pokud s ním už nejste v existujícím chatu.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Obnovit ze zálohy?</string>
@@ -806,7 +816,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Otestujte přístupovou frázi pro vaši zálohu a ověřte, že se shoduje</string>
     <string name="BackupsPreferenceFragment__turn_on">Zapnout</string>
     <string name="BackupsPreferenceFragment__turn_off">Vypnout</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Pro obnovení ze zálohy znovu nainstalujte aplikaci Signal. Spusťte aplikaci a klepněte na \"Obnovení ze zálohy\", pak najděte soubor se zálohou. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Pro obnovení ze zálohy znovu nainstalujte aplikaci Molly. Spusťte aplikaci a klepněte na \"Obnovení ze zálohy\", pak najděte soubor se zálohou. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Zjistit více</string>
     <string name="BackupsPreferenceFragment__in_progress">Probíhá…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -814,7 +824,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d dosud…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">Zatím %1$s%%…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal potřebuje oprávnění pro přístup k úložišti, aby mohl vytvářet zálohy, ale toto oprávnění je nyní trvale zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Úložiště\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly potřebuje oprávnění pro přístup k úložišti, aby mohl vytvářet zálohy, ale toto oprávnění je nyní trvale zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Úložiště\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Nastavte si čas zálohování</string>
 
@@ -881,7 +891,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Relace chatu byla obnovena</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal používá koncové šifrování a někdy může být nutné obnovit relaci chatu. Na zabezpečení komunikace to nemá vliv, ale mohlo se stát, že vám unikla zpráva od kontaktu. Můžete jej však požádat, aby vám ji poslal znovu.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly používá koncové šifrování a někdy může být nutné obnovit relaci chatu. Na zabezpečení komunikace to nemá vliv, ale mohlo se stát, že vám unikla zpráva od kontaktu. Můžete jej však požádat, aby vám ji poslal znovu.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Používejte Signal na stolním počítači nebo iPadu. Zprávy se budou synchronizovat s propojenými zařízeními.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Propojit nové zařízení</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Zprávy a informace o chatech jsou na všech zařízeních chráněny koncovým šifrováním</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Aplikace Signal ve stolním počítači nebo iPadu</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Všechny zprávy na propojených zařízeních jsou soukromé</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Po propojení jsou zprávy Molly synchronizovány se službou Molly ve vašem mobilu. Historie předchozích zpráv se nezobrazí.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">V jiném zařízení navštivte %1$s a nainstalujte aplikaci Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Moje propojená zařízení</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Zrušit propojení</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s odpojeno</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Propojování zařízení…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Zařízení schváleno</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Načítání…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Žádná propojená zařízení</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Odemknout za účelem propojení zařízení</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Pro propojení naskenujte QR kód zobrazený na zařízení.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Naskenujte QR kód</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Pomocí tohoto zařízení naskenujte QR kód zobrazený na zařízení, které chcete propojit</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">V pořádku</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Toto zařízení uvidí vaše skupiny a kontakty, bude mít přístup k vašim chatům a bude moct posílat zprávy vašim jménem.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Dokončete propojení na druhém zařízení</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Dokončete propojení aplikace Molly na druhém zařízení.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Propojení zařízení se nezdařilo</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Tento QR kód není platný. Ujistěte se, že skenujete QR kód zobrazený na zařízení, které chcete propojit.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Zkusit znovu</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Zrušit propojení s \"%1$s\"?</string>
@@ -903,10 +968,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimlizovat pro chybějící Google Play službu</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Toto zařízení nepodporuje službu Google Play. Klepnutím zakážete systémové optimalizace baterie, které způsobují nemožnost aplikaci Signal přijímat zprávy v době nečinnosti.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Toto zařízení nepodporuje službu Google Play. Klepnutím zakážete systémové optimalizace baterie, které způsobují nemožnost aplikaci Molly přijímat zprávy v době nečinnosti.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Tato verze aplikace Signal je zastaralá. Proveďte aktualizaci, abyste mohli odesílat a přijímat zprávy.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Tato verze aplikace Molly je zastaralá. Proveďte aktualizaci, abyste mohli odesílat a přijímat zprávy.</string>
     <string name="ExpiredBuildReminder_update_now">Aktualizovat nyní</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -919,8 +984,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Zobrazit</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Trvalá chyba komunikace Signal!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal se nemůže registrovat k službě Google Play. Zprávy a volání jsou proto zakázány: Prosím zkuste se znovu registrovat v menu Nastavení &gt; Rozšířené.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Trvalá chyba komunikace Molly!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly se nemůže registrovat k službě Google Play. Zprávy a volání jsou proto zakázány: Prosím zkuste se znovu registrovat v menu Nastavení &gt; Rozšířené.</string>
 
 
     <!-- GiphyActivity -->
@@ -1085,20 +1150,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Protokoly ladění nám pomáhají diagnostikovat a opravit problém a neobsahují identifikační informace.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">U aplikace Signal se vyskytl problém. Odeslat protokol ladění?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">U aplikace Molly se vyskytl problém. Odeslat protokol ladění?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Oznámení se mohou zpožďovat kvůli optimalizaci baterie</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Optimalizaci baterie pro službu Signal můžete vypnout, abyste zajistili, že se oznámení zpráv nebudou zpožďovat.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Optimalizaci baterie pro službu Molly můžete vypnout, abyste zajistili, že se oznámení zpráv nebudou zpožďovat.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Oznámení se mohou zpožďovat kvůli optimalizaci baterie</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Vypněte optimalizaci baterie pro službu Molly, aby se oznámení zpráv nezpožďovala. Klepnutím na „Pokračovat“ zobrazíte pokyny pro konkrétní zařízení.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Ne, díky</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Pokračovat</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Pokračovat</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Zavřít</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Ne, díky</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Nevyřízené skupinové pozvánky</string>
+    <string name="PendingMembersActivity_pending_group_invites">Požadavky a pozvání</string>
     <string name="PendingMembersActivity_requests">Požadavky</string>
     <string name="PendingMembersActivity_invites">Pozvánky</string>
     <string name="PendingMembersActivity_people_you_invited">Osoby, které jste pozvali</string>
@@ -1361,7 +1436,7 @@
     <string name="InviteActivity_cancel">Storno</string>
     <string name="InviteActivity_sending">Odesílaní…</string>
     <string name="InviteActivity_invitations_sent">Pozvánka odeslána!</string>
-    <string name="InviteActivity_invite_to_signal">Pozvat do Signal</string>
+    <string name="InviteActivity_invite_to_signal">Pozvat do Molly</string>
     <string name="InviteActivity_send_sms">Poslat SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Poslat %1$d SMS pozvánku?</item>
@@ -1369,7 +1444,7 @@
         <item quantity="many">Poslat %1$d SMS pozvánek?</item>
         <item quantity="other">Poslat %1$d SMS pozvánek?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Přejít na Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Přejít na Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Zdá se, že nemáte žádnou aplikaci pro sdílení.</string>
 
     <!-- LearnMoreTextView -->
@@ -1383,7 +1458,7 @@
     <string name="LongMessageActivity_your_message">Vaše zpráva</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Komunikace na pozadí povolena</string>
 
     <!-- MediaOverviewActivity -->
@@ -1462,10 +1537,10 @@
     <string name="MessageQuotesBottomSheet_replies">Odpovědi</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Navazuji hovor Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">Navazuji hovor Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Zahájení služby volání Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Zastavuji službu hovorů Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Zahájení služby volání Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Zastavuji službu hovorů Molly</string>
     <string name="NotificationBarManager__cancel_call">Zrušit hovor</string>
 
     <!-- NotificationsMegaphone -->
@@ -1733,6 +1808,14 @@
     <string name="MessageRecord_you_activated_payments">Platby máte aktivované</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s teď může přijímat Platby</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Údaje o platbě nejsou k dispozici</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Klepnutím zobrazíte více</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Údaje o platbě nejsou k dispozici</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Podrobnosti o této platbě nejsou k dispozici, protože vaše zprávy byly obnoveny ze zdroje, který historii plateb neobsahoval. Nemá to vliv na zůstatek ani stav proběhlých plateb.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1793,9 +1876,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Zprávy SMS již brzy nebude možné z aplikace Signal posílat. Pozvěte kontakt %1$s do aplikace Signal a pokračujte v konverzaci zde.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">V aplikaci Signal již nelze odesílat zprávy SMS. Pozvěte kontakt %1$s do aplikace Signal a pokračujte v konverzaci zde.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">V aplikaci Molly již nelze odesílat zprávy SMS. Pozvěte kontakt %1$s do aplikace Molly a pokračujte v konverzaci zde.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Platba: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Platba</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Nahlášeno jako spam</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1881,7 +1966,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Propojit zařízení Signal?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Zdá se, že se snažíte propojit zařízení Signal použitím jiné skenovací aplikace. Pro vaši ochranu, prosím, oskenujete kód ještě jednou z aplikace Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal potřebuje oprávnění pro přístup k fotoaparátu, aby mohl naskenovat QR kód, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Fotoaparát\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly potřebuje oprávnění pro přístup k fotoaparátu, aby mohl naskenovat QR kód, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Fotoaparát\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Nelze naskenovat QR kód bez přístupu k fotoaparátu.</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1896,11 +1981,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Zadat heslo</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Ikona Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Ikona Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Zadejte heslo</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Chybné heslo!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Odemknout Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Zamykací obrazovka</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Odemknout Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Zamykací obrazovka</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Mapa</string>
@@ -1977,7 +2062,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Můj příběh</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Hovor přes Signal</string>
+    <string name="Recipient_signal_call">Hovor přes Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Blokovat</string>
@@ -1991,7 +2076,8 @@
     <string name="RedPhone_ringing">Vyzvánění…</string>
     <string name="RedPhone_busy">Obsazeno</string>
     <string name="RedPhone_recipient_unavailable">Příjemce nedostupný</string>
-    <string name="RedPhone_network_failed">Síť selhala!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Chyba sítě! Zkontrolujte připojení k internetu a zkuste to znovu.</string>
     <string name="RedPhone_number_not_registered">Číslo není registrováno!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Volané číslo nepodporuje šifrované hovory!</string>
     <string name="RedPhone_got_it">Rozumím</string>
@@ -2002,8 +2088,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Klepnutím sem zapnete své video</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Signal potřebuje přístup k vašemu fotoaparátu pro volání %1$s</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Molly potřebuje přístup k vašemu fotoaparátu pro volání %1$s</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Volání…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Opětovné připojování…</string>
@@ -2069,10 +2155,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Byl/a jste odebrán/a z hovoru</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Někdo vás odebral z hovoru.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Povolte přístup k fotoaparátu a mikrofonu</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Povolte přístup k mikrofonu</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Povolte přístup k fotoaparátu</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Pro zahájení nebo připojení se k hovoru potřebuje aplikace Molly přístup ke kameře a mikrofonu.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Pro zahájení nebo připojení se k hovoru povolte aplikaci Molly přístup k mikrofonu.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Pro použití videa povolte aplikaci Molly přístup k fotoaparátu.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Pro zahájení nebo připojení k hovoru potřebuje aplikace Molly přístup k mikrofonu.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Pro použití videa potřebuje aplikace Molly přístup k fotoaparátu</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Zahájení hovoru nebo připojení se k němu:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Jak používat video:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal hovor</string>
-    <string name="WebRtcCallView__signal_video_call">Signal video hovor</string>
+    <string name="WebRtcCallView__signal_call">Molly hovor</string>
+    <string name="WebRtcCallView__signal_video_call">Molly video hovor</string>
     <string name="WebRtcCallView__start_call">Zahájit hovor</string>
     <string name="WebRtcCallView__join_call">Připojit se k hovoru</string>
     <string name="WebRtcCallView__call_is_full">Hovor je plný</string>
@@ -2175,21 +2281,44 @@
     <string name="CallOverflowPopupWindow__lower_hand">Dát ruku dolů</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Zrušit</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Máte zvednutou ruku</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Zobrazit</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s má zvednutou ruku</item>
-        <item quantity="few">%1$s a %2$d mají zvednutou ruku</item>
-        <item quantity="many">%1$s a %2$d mají zvednutou ruku</item>
-        <item quantity="other">%1$s a %2$d mají zvednutou ruku</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s, máte zvednutou ruku</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s a %2$d má zvednutou ruku</item>
+        <item quantity="few">%1$s a %2$d mají zvednutou ruku</item>
+        <item quantity="many">%1$s a %2$d mají zvednutou ruku</item>
+        <item quantity="other">%1$s a %2$d mají zvednutou ruku</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s má zvednutou ruku</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s a %2$d mají zvednutou ruku</item>
+        <item quantity="few">%1$s a %2$d mají zvednutou ruku</item>
+        <item quantity="many">%1$s a %2$d mají zvednutou ruku</item>
+        <item quantity="other">%1$s a %2$d mají zvednutou ruku</item>
+    </plurals>
+
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="few">%1$s a %2$d</item>
+        <item quantity="many">%1$s a %2$d</item>
+        <item quantity="other">%1$s a %2$d</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="few">%1$s a %2$d</item>
         <item quantity="many">%1$s a %2$d</item>
@@ -2292,7 +2421,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Zavoláme vám pro ověření tohoto čísla</string>
     <string name="RegistrationActivity_edit_number">Upravit číslo</string>
     <string name="RegistrationActivity_missing_google_play_services">Chybí Google Play služba</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Toto zařízení nepodporuje službu Google Play. Můžete stále používat Signal, ale tato konfigurace může mít za následek snížení spolehlivosti nebo výkonu.\n\n Jestli nejste zkušený uživatel, nepoužíváte alternativní Android ROM nebo si myslíte, že je to chyba, kontaktujte support@signal.org pro pomoc s řešením tohoto problému.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Toto zařízení nepodporuje službu Google Play. Můžete stále používat Molly, ale tato konfigurace může mít za následek snížení spolehlivosti nebo výkonu.\n\n Jestli nejste zkušený uživatel, nepoužíváte alternativní Android ROM nebo si myslíte, že je to chyba, kontaktujte support@molly.im pro pomoc s řešením tohoto problému.</string>
     <string name="RegistrationActivity_i_understand">Rozumím</string>
     <string name="RegistrationActivity_play_services_error">Chyba Google Play</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Služba Google Play se aktualizuje nebo je dočasně nedostupná. Zkuste to prosím znovu.</string>
@@ -2310,7 +2439,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Nestandardní formát čísla</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Zadané číslo (%1$s) má zřejmě nestandardní formát.\n\nMysleli jste %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal pro Android - Formát telefonního čísla</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly pro Android - Formát telefonního čísla</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Vyžádané volání</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2346,8 +2475,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Máte potíže s registrací?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Ujistěte se, že váš telefon má signál, abyste mohli přijímat SMS nebo volání\n • Potvrďte, že můžete na tomto čísle přijímat telefonní hovory\n • Zkontrolujte, že jste své telefonní číslo zadali správně.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Další informace získáte podle těchto kroků pro řešení problémů, nebo kontaktujte podporu</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Více informací na %1$s nebo %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">kroků pro řešení problémů</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2385,13 +2514,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Přidat do kontaktů</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Pozvat do Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Pozvat do Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Zpráva Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal volání</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Přidat do kontaktů</string>
-    <string name="SharedContactView_invite_to_signal">Pozvat do Signal</string>
+    <string name="SharedContactView_invite_to_signal">Pozvat do Molly</string>
     <string name="SharedContactView_message">Zpráva Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2522,11 +2651,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s patří uživateli %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Aktualizace Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">K dispozici je nová verze aplikace Signal. Klepnutím ji aktualizujete.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal se nepodařilo aktualizovat</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Aktualizace Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">K dispozici je nová verze aplikace Molly. Klepnutím ji aktualizujete.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly se nepodařilo aktualizovat</string>
     <string name="ApkUpdateNotifications_failed_general_body">Zkusíme to znovu později.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal byl úspěšně aktualizován</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly byl úspěšně aktualizován</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Byla provedena automatická aktualizace na verzi %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2629,14 +2758,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Dotykem otevřete.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal je odemčen</string>
-    <string name="KeyCachingService_lock">Zamknout Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly je odemčen</string>
+    <string name="KeyCachingService_lock">Zamknout Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Vy</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Nepodporovaný typ dat</string>
     <string name="MediaPreviewActivity_draft">Koncept</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal potřebuje oprávnění pro přístup k úložišti, aby mohl zapisovat do externího úložiště, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Úložiště\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly potřebuje oprávnění pro přístup k úložišti, aby mohl zapisovat do externího úložiště, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Úložiště\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Nelze ukládat do externího úložiště bez oprávnění.</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Odstranit zprávu?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Tímto tuto zprávu trvale odstraníte.</string>
@@ -2684,7 +2813,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Nepodařilo se zprávu doručit.</string>
     <string name="MessageNotifier_error_delivering_message">Chyba při doručení zprávy.</string>
     <string name="MessageNotifier_message_delivery_paused">Doručení zprávy pozastaveno.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Ověřte pro pokračování konverzace na Signalu.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Ověřte pro pokračování konverzace na Mollyu.</string>
     <string name="MessageNotifier_mark_all_as_read">Označit vše jako přečtené</string>
     <string name="MessageNotifier_mark_read">Označit jako přečtené</string>
     <string name="MessageNotifier_turn_off_these_notifications">Vypnout tato upozornění</string>
@@ -2706,7 +2835,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Reagoval/a %1$s na vaši nálepku.</string>
     <string name="MessageNotifier_this_message_was_deleted">Tato zpráva byla odstraněna.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Vypnout upozornění, že se kontakt připojil k Signal? Můžete je znovu zapnout v Signal &gt; Nastavení &gt; Upozornění.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Vypnout upozornění, že se kontakt připojil k Molly? Můžete je znovu zapnout v Molly &gt; Nastavení &gt; Upozornění.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2745,7 +2874,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Rychlá odpověď není dostupná, pokud je Signal uzamčen!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Rychlá odpověď není dostupná, pokud je Molly uzamčen!</string>
     <string name="QuickResponseService_problem_sending_message">Problém při odesílání zprávy!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2765,7 +2894,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Chybná klávesová zkratka</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Nová zpráva</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Žádost o zprávu</string>
     <string name="SingleRecipientNotificationBuilder_you">Vy</string>
@@ -2813,7 +2942,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Toto zařízení již není registrované. Je to pravděpodobně proto, že jste své telefonní číslo zaregistrovali v aplikaci Signal z jiného zařízení.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Toto zařízení již není registrované. Je to pravděpodobně proto, že jste své telefonní číslo zaregistrovali v aplikaci Molly z jiného zařízení.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Znovu zaregistrujte zařízení</string>
 
@@ -2826,10 +2955,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Chcete-li přijmout hovor, umožněte aplikaci Signal přístup k mikrofonu.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Chcete-li přijmout hovor, umožněte aplikaci Molly přístup k mikrofonu.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Chcete-li přijmout videohovor, umožněte aplikaci Signal přístup k mikrofonu a fotoaparátu.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal potřebuje oprávnění pro přístup k mikrofonu a fotoaparátu, abyste mohli volat nebo přijímat hovory, ale tato oprávnění jsou nyní zakázána. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Mikrofon\" a \"Fotoaparát\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Chcete-li přijmout videohovor, umožněte aplikaci Molly přístup k mikrofonu a fotoaparátu.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly potřebuje oprávnění pro přístup k mikrofonu a fotoaparátu, abyste mohli volat nebo přijímat hovory, ale tato oprávnění jsou nyní zakázána. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Mikrofon\" a \"Fotoaparát\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Odpovězeno na propojeném zařízení.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Odmítnuto na propojeném zařízení.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Obsazeno na propojeném zařízení.</string>
@@ -2874,16 +3003,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Zopakujte nové heslo</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Pozvat do Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Pozvat do Molly</string>
     <string name="contact_selection_activity__new_group">Nová skupina</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Obnovit kontakty</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Chybí někdo? Zkuste provést obnovení</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Najděte v aplikaci Signal lidi, které znáte</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Povolte přístup ke svým kontaktům</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Více</string>
 
@@ -2900,7 +3029,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Fotografie kontaktu</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal potřebuje oprávnění pro přístup ke kontaktům, aby vám je mohl zobrazit, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Kontakty\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly potřebuje oprávnění pro přístup ke kontaktům, aby vám je mohl zobrazit, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Kontakty\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Nepodařilo se načíst kontakty, zkontrolujte připojení k síti.</string>
     <string name="ContactSelectionListFragment_username_not_found">Uživatelské jméno nebylo nalezeno</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" není uživatel Signal. Zkontrolujte prosím uživatelské jméno a zkuste to znovu."</string>
@@ -2920,16 +3049,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Najít podle uživatelského jména</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Povolte přístup ke kontaktům</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Jak najít v aplikaci Signal lidi, které znáte:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Povolit přístup</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Ne, díky</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Povolte přístup ke svým kontaktům. Vaše kontakty jsou šifrované a nejsou ve službě Signal viditelné.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal potřebuje přístup k vašim kontaktům, aby je mohl zobrazit.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly potřebuje přístup k vašim kontaktům, aby je mohl zobrazit.</string>
     <string name="contact_selection_list_fragment__show_contacts">Zobrazit kontakty</string>
 
     <!-- contact_selection_list_item -->
@@ -3006,6 +3137,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Tuto osobu jste odebrali. Když jí znovu napíšete, bude přidána zpět do vašeho seznamu.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Možnosti</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Aktualizovat</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Spustit … Pozastavit</string>
@@ -3034,7 +3167,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Bubliny jsou funkcí systému Android, kterou můžete pro chaty aplikace Signal vypnout.</string>
+    <string name="BubbleOptOutTooltip__description">Bubliny jsou funkcí systému Android, kterou můžete pro chaty aplikace Molly vypnout.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Teď ne</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3216,9 +3349,9 @@
     <string name="EditProfileFragment__group_description">Popisek skupiny</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Aktualizovat Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Aktualizovat Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Platnost této verze aplikace Signal vypršela. Aktualizujte ji, ať můžete Signal dál používat.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Platnost této verze aplikace Molly vypršela. Aktualizujte ji, ať můžete Molly dál používat.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Aktualizovat</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3437,7 +3570,7 @@
     <string name="preferences__slow">Pomalu</string>
     <string name="preferences__help">Nápověda</string>
     <string name="preferences__advanced">Rozšířené možnosti</string>
-    <string name="preferences__donate_to_signal">Podpořte Signal finančně</string>
+    <string name="preferences__donate_to_signal">Podpořte Molly finančně</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Soukromí</string>
     <!-- Preference label for stories -->
@@ -3474,13 +3607,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Změnit ikonu a název aplikace na „%1$s“</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Aby bylo možné ikonu a název aplikace Signal změnit, bude nutné ji zavřít. Oznámení budou vždy zobrazovat výchozí ikonu a název Signal.</string>
+    <string name="preferences__app_icon_dialog_description">Aby bylo možné ikonu a název aplikace Molly změnit, bude nutné ji zavřít. Oznámení budou vždy zobrazovat výchozí ikonu a název Molly.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Vyberte si ikonu a název aplikace, které se budou zobrazovat na domovské obrazovce vašeho telefonu a ve složce s aplikacemi. Oznámení budou vždy zobrazovat výchozí ikonu a název Signal. Více informací</string>
+    <string name="preferences__app_icon_warning_learn_more">Vyberte si ikonu a název aplikace, které se budou zobrazovat na domovské obrazovce vašeho telefonu a ve složce s aplikacemi. Oznámení budou vždy zobrazovat výchozí ikonu a název Molly. Více informací</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Ikony a názvy aplikací se zobrazují na domovské obrazovce a ve složce s aplikacemi.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Oznámení budou vždy zobrazovat výchozí ikonu a název Signal.</string>
+    <string name="preferences__app_icon_notification_warning">Oznámení budou vždy zobrazovat výchozí ikonu a název Molly.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Více informací</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3529,8 +3662,12 @@
         <item quantity="other">Tím se trvale zkrátí všechny chaty na %1$s nejnovějších zpráv.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Tímto trvale odstraníte veškerou historii zpráv a mediální soubory z vašeho zařízení.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Trvale se tak odstraní veškerá historie zpráv a médií z tohoto zařízení a všech propojených zařízení.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Opravdu chcete odstranit veškerou historii zpráv?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Veškerá historie zpráv bude trvale odstraněna. Tuto akci nelze vrátit zpět.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Ze všech zařízení bude trvale odstraněna veškerá historie zpráv. Tuto operaci nelze vzít zpět.</string>
     <string name="preferences_storage__delete_all_now">Vše nyní odstranit</string>
     <string name="preferences_storage__forever">Navždy</string>
     <string name="preferences_storage__one_year">1 rok</string>
@@ -3569,7 +3706,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Obcházení cenzury</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Obcházení cenzury</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Pokud je povoleno, Signal se pokusí obejít cenzuru. Nepovolujte v místech, kde Signal není cenzurován.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Pokud je povoleno, Molly se pokusí obejít cenzuru. Nepovolujte v místech, kde Molly není cenzurován.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Obcházení cenzury bylo aktivováno na základě vašeho telefonního čísla.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3621,7 +3758,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Představujeme Platby</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Pomocí Signalu můžete odesílat a přijímat MobileCoin, novou digitální měnu zaměřenou na soukromí. Stačí aktivovat a můžete začít.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Pomocí Mollyu můžete odesílat a přijímat MobileCoin, novou digitální měnu zaměřenou na soukromí. Stačí aktivovat a můžete začít.</string>
     <string name="PaymentsHomeFragment__activate_payments">Aktivovat platby</string>
     <string name="PaymentsHomeFragment__activating_payments">Aktivuji platby…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Obnovit platební účet</string>
@@ -3647,7 +3784,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Platby nejsou ve vašem regionu dostupné.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Nepodařilo se povolit platby. Zkuste to znovu.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Deaktivovat platby?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Nebudete moci posílat ani přijímat MobileCoin v Signalu, pokud deaktivujete platby.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Nebudete moci posílat ani přijímat MobileCoin v Mollyu, pokud deaktivujete platby.</string>
     <string name="PaymentsHomeFragment__deactivate">Deaktivovat</string>
     <string name="PaymentsHomeFragment__continue">Pokračovat</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Zůstatek není aktuálně k dispozici.</string>
@@ -3656,10 +3793,10 @@
     <string name="PaymentsHomeFragment__details">Podrobnosti</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Pomocí služby Signal můžete odesílat a přijímat měnu MobileCoin. Na všechny platby se vztahují Podmínky používání služby MobileCoin a peněženky MobileCoin. Můžete se setkat s problémy a platby i zůstatky, o které přijdete, není možné obnovit. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Pomocí služby Molly můžete odesílat a přijímat měnu MobileCoin. Na všechny platby se vztahují Podmínky používání služby MobileCoin a peněženky MobileCoin. Můžete se setkat s problémy a platby i zůstatky, o které přijdete, není možné obnovit. </string>
     <string name="PaymentsHomeFragment__activate">Aktivovat</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Zobrazit MobileCoin podmínky</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Platby v Signal již nejsou k dispozici. Stále můžete převádět prostředky na burzu, ale již nemůžete posílat a přijímat platby ani přidávat prostředky.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Platby v Molly již nejsou k dispozici. Stále můžete převádět prostředky na burzu, ale již nemůžete posílat a přijímat platby ani přidávat prostředky.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3687,7 +3824,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Povolit oprávnění</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Abychom vám pomohli posílat zprávy lidem, které znáte, vyžádá si služba Signal tato oprávnění. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Abychom vám pomohli posílat zprávy lidem, které znáte, vyžádá si služba Molly tato oprávnění. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Oznámení</string>
     <!-- Notifications permission row description -->
@@ -3775,10 +3912,10 @@
     <string name="PaymentsTransferFragment__next">Další</string>
     <string name="PaymentsTransferFragment__invalid_address">Neplatná adresa</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Zkontrolujte adresu peněženky, na kterou se pokoušíte převést, a zkuste to znovu.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Nelze převést na svou vlastní adresu peněženky Signal. Zadejte adresu peněženky ze svého účtu na podporované burze.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Signal potřebuje přístup ke kameře pro naskenování QR kódu.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Nelze převést na svou vlastní adresu peněženky Molly. Zadejte adresu peněženky ze svého účtu na podporované burze.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Molly potřebuje přístup ke kameře pro naskenování QR kódu.</string>
     <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signál vyžaduje povolení kamery k zachycení QR kódu. Přejděte do nastavení, vyberte možnost \"Oprávnění\" a povolte možnost \"Fotoaparát\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">K naskenování QR kódu potřebuje Signal přístup ke kameře.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">K naskenování QR kódu potřebuje Molly přístup ke kameře.</string>
     <string name="PaymentsTransferFragment__settings">Nastavení</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -4144,17 +4281,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Příchozí hlasový hovor Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Příchozí hlasový hovor Molly</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Příchozí videohovor Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Příchozí videohovor Molly</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Příchozí Signal skupinový hovor</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Příchozí Molly skupinový hovor</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Probíhající hlasový hovor Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Probíhající hlasový hovor Molly</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Probíhající videohovor Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Probíhající videohovor Molly</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Probíhající skupinový hovor Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Probíhající skupinový hovor Molly</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Načítání…</string>
@@ -4201,9 +4338,9 @@
     <string name="BackupDialog_verify">Ověřit</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Úspěšně jste zadali přístupovou frázi pro vaši zálohu</string>
     <string name="BackupDialog_passphrase_was_not_correct">Přístupová fráze nebyla správná</string>
-    <string name="LocalBackupJob_creating_signal_backup">Vytvářím zálohu Signalu…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Vytvářím zálohu Mollyu…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Ověřování zálohy Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Ověřování zálohy Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">Zálohování selhalo</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Váš adresář se zálohami byl odstraněn nebo přesunut.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Soubor s vaší zálohou je příliš velký pro uložení na tento disk.</string>
@@ -4218,15 +4355,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Zavolejte mi (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Znovu odeslat kód (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Kontaktujte podporu Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Registrace Signal - ověřovací kód pro Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Kontaktujte podporu Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Registrace Molly - ověřovací kód pro Android</string>
     <string name="RegistrationActivity_incorrect_code">Špatný kód</string>
     <string name="BackupUtil_never">Nikdy</string>
     <string name="BackupUtil_unknown">Neznámý</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Telefonní číslo</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Zvolte si, kdo uvidí vaše telefonní číslo a kdo vás pomocí něj může v aplikaci Signal kontaktovat.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Zvolte si, kdo uvidí vaše telefonní číslo a kdo vás pomocí něj může v aplikaci Molly kontaktovat.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Kdo uvidí moje číslo</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4274,7 +4411,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Uskutečnili jste příliš mnoho pokusů. Prosím zkuste to znovu později</string>
     <string name="RegistrationActivity_error_connecting_to_service">Chyba při připojování k službě</string>
     <string name="preferences_chats__backups">Zálohy</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal je zamčen</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly je zamčen</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">KLEPNUTÍM ODEMKNĚTE</string>
     <string name="Recipient_unknown">Neznámý</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4305,9 +4442,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Budete potřebovat přístup ke staršímu zařízení.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Obnovit ze zálohy</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Obnovit zprávy z lokální zálohy. Pokud neobnovíte ze zálohy nyní, později to již nebude možné.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Obnovit místní zálohu</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Obnovit zálohu Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Obnovit všechny textové zprávy a média za posledních 30 dní</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Více možností</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Zrušit</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Přihlásit se bez přenosu</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Pokračovat bez přenosu zpráv a médií</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Otevřete Signal na vašem starém Android zařízení</string>
     <string name="NewDeviceTransferInstructions__continue">Pokračovat</string>
@@ -4322,19 +4466,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Připravuji na připojení ke starému Android zařízení…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Chvíli to potrvá, brzy to bude připravené</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Čekám na připojení starého Android zařízení…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal potřebuji oprávnění pro přístup k poloze pro nalezení a připojení ke staršímu Android zařízení.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal potřebuje povolené služby polohy pro nalezení a připojení ke starému Android zařízení.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal potřebuje zapnutou Wi-Fi pro nalezení a připojení ke starému Android zařízení. Wi-Fi musí být zapnuté, ale nemusí být připojené k žádné Wi-Fi síti.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Omlouváme se, ale vypadá to, že toto zařízení nepodporuje Wi-Fi Direct. Signal používá Wi-Fi Direct pro nalezení staršího Android zařízení a připojení se k němu. Můžete stále obnovit zálohu pro obnovení vašeho původního účtu na starém Android zařízení.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly potřebuji oprávnění pro přístup k poloze pro nalezení a připojení ke staršímu Android zařízení.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly potřebuje povolené služby polohy pro nalezení a připojení ke starému Android zařízení.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly potřebuje zapnutou Wi-Fi pro nalezení a připojení ke starému Android zařízení. Wi-Fi musí být zapnuté, ale nemusí být připojené k žádné Wi-Fi síti.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Omlouváme se, ale vypadá to, že toto zařízení nepodporuje Wi-Fi Direct. Molly používá Wi-Fi Direct pro nalezení staršího Android zařízení a připojení se k němu. Můžete stále obnovit zálohu pro obnovení vašeho původního účtu na starém Android zařízení.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Obnovit zálohu</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Nastala neočekávaná chyba při pokusu o připojení ke starému Android zařízení.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Hledám nové Android zařízení…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal potřebuje oprávnění k poloze pro nalezení nového Android zařízení a připojení se k němu.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal potřebuje povolené služby polohy pro nalezení a připojení k novému Android zařízení.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal potřebuje zapnutou Wi-Fi pro nalezení a připojení k novému Android zařízení. Wi-Fi musí být zapnuté, ale nemusí být připojené k žádné Wi-Fi síti.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Omlouváme se, ale vypadá to, že toto zařízení nepodporuje Wi-Fi Direct. Signal používá Wi-Fi Direct pro nalezení nového Android zařízení a připojení se k němu. Můžete stále obnovit zálohu pro obnovení vašeho původního účtu na novém Android zařízení.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly potřebuje oprávnění k poloze pro nalezení nového Android zařízení a připojení se k němu.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly potřebuje povolené služby polohy pro nalezení a připojení k novému Android zařízení.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly potřebuje zapnutou Wi-Fi pro nalezení a připojení k novému Android zařízení. Wi-Fi musí být zapnuté, ale nemusí být připojené k žádné Wi-Fi síti.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Omlouváme se, ale vypadá to, že toto zařízení nepodporuje Wi-Fi Direct. Molly používá Wi-Fi Direct pro nalezení nového Android zařízení a připojení se k němu. Můžete stále obnovit zálohu pro obnovení vašeho původního účtu na novém Android zařízení.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Vytvořit zálohu</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Nastala neočekávaná chyba při pokusu o připojení k novému Android zařízení.</string>
 
@@ -4375,7 +4519,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Přenáším data</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Ponechte obě zařízení blízko sebe. Nevypínejte zařízení a nechte spuštěnou aplikaci Signal. Přenos je koncově šifrován.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Ponechte obě zařízení blízko sebe. Nevypínejte zařízení a nechte spuštěnou aplikaci Molly. Přenos je koncově šifrován.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d zpráv zatím…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">Zatím %1$s%% zpráv…</string>
@@ -4389,7 +4533,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Přenést účet</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Stáhněte Signal na novém Android zařízení</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Stáhněte Molly na novém Android zařízení</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Klepněte na \"Přenést nebo obnovit účet\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4463,7 +4607,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Kdokoli, kdo má tento odkaz, může vidět jméno skupiny a fotografii a může požádat o připojení ke skupině. Sdílejte pouze s lidmi, kterým důvěřujete.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Kdokoli, kdo má tento odkaz, může vidět jméno skupiny a fotografii a může se připojit ke skupině. Sdílejte pouze s lidmi, kterým důvěřujete.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Sdílet přes Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Sdílet přes Molly</string>
     <string name="GroupLinkBottomSheet_copy">Kopírovat</string>
     <string name="GroupLinkBottomSheet_qr_code">QR kód</string>
     <string name="GroupLinkBottomSheet_share">Sdílet</string>
@@ -4663,7 +4807,7 @@
     <string name="payment_info_card_about_mobilecoin">O MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin je nová digitální měna zaměřená na soukromí.</string>
     <string name="payment_info_card_adding_funds">Přidávám prostředky</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Prostředky pro použití v Signal můžete přidat zasláním MobileCoin na adresu vaší peněženky.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Prostředky pro použití v Molly můžete přidat zasláním MobileCoin na adresu vaší peněženky.</string>
     <string name="payment_info_card_cashing_out">Vyplacení</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">MobileCoin můžete kdykoli vyplatit na burze, která podporuje MobileCoin. Stačí provést převod na svůj účet na této burze.</string>
     <string name="payment_info_card_hide_this_card">Schovat tuto kartu?</string>
@@ -4684,12 +4828,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Deaktivovat peněženku</string>
     <string name="DeactivateWalletFragment__your_balance">Váš zůstatek</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Před deaktivací plateb doporučujeme převést prostředky na jinou adresu peněženky. Pokud se rozhodnete své prostředky nyní nepřevádět, zůstanou ve vaší peněžence propojené se službou Signal, pokud platby znovu aktivujete.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Před deaktivací plateb doporučujeme převést prostředky na jinou adresu peněženky. Pokud se rozhodnete své prostředky nyní nepřevádět, zůstanou ve vaší peněžence propojené se službou Molly, pokud platby znovu aktivujete.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Převést zbývající zůstatek</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Deaktivovat bez převodu</string>
     <string name="DeactivateWalletFragment__deactivate">Deaktivovat</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Deaktivovat bez převodu?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Pokud se rozhodnete platby znovu aktivovat, zůstanou vaše prostředky v peněžence propojené se službou Signal.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Pokud se rozhodnete platby znovu aktivovat, zůstanou vaše prostředky v peněžence propojené se službou Molly.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Chyba při deaktivování peněženky.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4988,7 +5132,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licence</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Podmínky a zásady ochrany osobních údajů</string>
-    <string name="HelpFragment__copyright_signal_messenger">Copyright Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Copyright Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Licencováno pod GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -5235,9 +5379,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Vyberte barvu</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Sdílet</string>
 
@@ -5279,7 +5420,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Zprávy této skupině mohou posílat pouze správci.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Dosažen limit</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Nemůžete vybrat více než 5 chatů</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5460,9 +5602,9 @@
     <string name="MySupportPreference__learn_more">Více informací</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Aktualizovat Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Aktualizovat Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Platnost této verze aplikace Signal vypršela. Aktualizujte ji, ať můžete Signal dál používat.</string>
+    <string name="UpdateSignalExpiredDialog__message">Platnost této verze aplikace Molly vypršela. Aktualizujte ji, ať můžete Molly dál používat.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Aktualizovat</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5471,7 +5613,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Zařízení není registrováno</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Toto zařízení již není registrované. Zařízení znovu zaregistrujte, chcete-li na něm nadále používat službu Signal.</string>
+    <string name="ReregisterSignalDialog__message">Toto zařízení již není registrované. Zařízení znovu zaregistrujte, chcete-li na něm nadále používat službu Molly.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Znovu se zaregistrovat</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5765,7 +5907,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Nepodařilo se otevřít picker.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Aby bylo možné oznámení zapnout, Signal potřebuje povolení k jejich zobrazování.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Aby bylo možné oznámení zapnout, Molly potřebuje povolení k jejich zobrazování.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Zapnout</string>
 
@@ -5920,8 +6062,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Zatím žádné odpovědi</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Na tento příběh nemůžete reagovat, protože už nejste členem této skupiny.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Reagoval/a na příběh</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Reagoval/a jste na příběh</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Reagoval/a na příběh</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Zobrazení</string>
     <!-- Label for story replies tab -->
@@ -6572,8 +6716,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Vyberte svou banku</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Potvrďte svůj příspěvek u banky %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Chcete-li nastavit svůj pravidelný příspěvek, klepněte na pokračovat a potvrďte poplatek 0,01 € u své banky. Ten vám bude automaticky vrácen a umožní, aby se z vašeho účtu odečítal příspěvek ve výši 5 € měsíčně.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Chcete-li nastavit svůj pravidelný příspěvek, klepněte na pokračovat a potvrďte poplatek 0,01 € u své banky. Ten vám bude automaticky vrácen a umožní, aby se z vašeho účtu odečítal příspěvek ve výši %1$s měsíčně.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Pokračovat</string>
 
@@ -7163,6 +7307,56 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Stahování záložních dat…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Zálohování médií je vypnuto</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Váš plán zálohování médií v aplikaci Signal byl zrušen, protože nešlo zpracovat vaši platbu. Máte %1$d den na stažení všech médií uložených v záloze. Po %1$d dni budou média ve vaší záloze odstraněna.</item>
+        <item quantity="few">Váš plán zálohování médií v aplikaci Signal byl zrušen, protože nešlo zpracovat vaši platbu. Máte %1$d dny na stažení všech médií uložených v záloze. Po %1$d dnech budou média ve vaší záloze odstraněna.</item>
+        <item quantity="many">Váš plán zálohování médií v aplikaci Signal byl zrušen, protože nešlo zpracovat vaši platbu. Máte %1$d dní na stažení všech médií uložených v záloze. Po %1$d dnech budou média ve vaší záloze odstraněna.</item>
+        <item quantity="other">Váš plán zálohování médií v aplikaci Signal byl zrušen, protože nešlo zpracovat vaši platbu. Máte %1$d dní na stažení všech médií uložených v záloze. Po %1$d dnech budou média ve vaší záloze odstraněna.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Kdykoliv můžete opět začít platit za zálohování a pokračovat v zálohování všech svých médií. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Vaše média budou dnes odstraněna</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Váš plán zálohování médií v aplikaci Signal byl zrušen, protože nešlo zpracovat vaši platbu. Toto je poslední možnost stáhnout média ze zálohy, než budou odstraněna.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Stahování nelze dokončit</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Vaše zařízení nemá dostatek volného místa. Uvolněte minimálně %1$s místa, abyste mohli stáhnout média z vaší zálohy.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Pokud zvolíte možnost „Přeskočit“, budou média ve vaší záloze odstraněna za %1$d den.</item>
+        <item quantity="few">Pokud zvolíte možnost „Přeskočit“, budou média ve vaší záloze odstraněna za %1$d dny.</item>
+        <item quantity="many">Pokud zvolíte možnost „Přeskočit“, budou média ve vaší záloze odstraněna za %1$d dní.</item>
+        <item quantity="other">Pokud zvolíte možnost „Přeskočit“, budou média ve vaší záloze odstraněna za %1$d dní.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Nelze zpracovat platbu za zálohování</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Máme problémy se stržením vaší pravidelné měsíční platby za zálohování. Zkontrolujte, že vámi zvolená platební metoda je aktuální. Pokud ne, aktualizujte ji v Google Pay. Aplikace Signal zkusí během pár dnů zpracovat platbu znovu.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Zálohování se nepodařilo dokončit</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Vaše zařízení nedokončilo zálohování po dobu %1$d dnů. Ujistěte se, že je vaše zařízení připojeno k Wi-Fi a klepněte na „Zálohovat nyní“. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Zjistit více</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Přeskočit</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Stáhnout média</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Stáhnout později</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Nestahovat média</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Uvolněte %1$s místa pro stahování médií.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Kreditní nebo debetní karta</string>
@@ -7176,16 +7370,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Neznámý</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Historie plateb</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Poslední záloha proběhla dne %1$s v %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">Omezení chatu</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">Limity délky historie chatu</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">Smazat historii zpráv</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Zprávy starší než zvolené období budou trvale odstraněny.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Zprávy přesahující zvolenou délku budou trvale odstraněny.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Použít limity u propojených zařízení</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Pokud jsou limity chatu povoleny, budou se mazat i zprávy z propojených zařízení.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Odstraňování zpráv je nyní synchronizováno pro všechna vaše zařízení</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Pokud odstraníte zprávy nebo chaty, budou odstraněny z vašeho telefonu a propojených zařízení.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Historie plateb</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Zálohování textových zpráv a všech médií</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Podrobnosti platby</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Typ zálohování</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Datum platby</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Sdílet</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Zálohování služby Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Historie plateb</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Podrobnosti o zálohování</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Velikost zálohy</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Frekvence zálohování</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Zálohování pomocí mobilní sítě</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Vypnout a odstranit zálohování</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Zálohování odstraněno a vypnuto.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Typ zálohování změněn a předplatné zrušeno</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Předplatné zrušeno</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Stahování dokončeno</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Typ zálohování</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Zálohování zakázáno</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s / měsíčně</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Povolit zálohování</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Poslední zálohování</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s v %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Nikdy</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Zálohovat nyní</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Vypnout a odstranit zálohování?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Nebudou vám účtovány žádné další poplatky. Vaše záloha bude odstraněna a žádné nové zálohy se nebudou vytvářet.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Vypnout a smazat</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Odstraňování zálohy…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Záloha odstraněna</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Klepnutím na Zálohovat nyní"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Denně</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Týdně</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Měsíčně</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Ruční zálohování</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Zadejte prosím PIN, heslo nebo vzorec svého zařízení.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Další</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Změnit typ zálohování</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Zrušit předplatné</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Potvrdit zrušení</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Nebudou vám účtovány žádné další poplatky. Zálohování bude vypnuto na konci vašeho zúčtovacího období. Poté budete mít 30 dní na stažení médií, která právě zálohujete.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Potvrdit a stáhnout teď</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Potvrdit a stáhnout později</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Ponechat předplatné</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 15d63d5691..b3bcc66594 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal opdaterer …</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly opdaterer …</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Du har endnu ikke indtastet en adgangssætning!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Deaktiver adgangssætning?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Dette låser permanent op for Signal og besked-notifikationer.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Dette låser permanent op for Molly og besked-notifikationer.</string>
     <string name="ApplicationPreferencesActivity_disable">Deaktiver</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fejl ved oprettelse af forbindelse til serveren!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">Pinkoder er påkrævet for registreringslås. For at deaktivere pinkoder skal registreringslås først deaktiveres.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Fil</string>
     <string name="AttachmentKeyboard_contact">Kontakt</string>
     <string name="AttachmentKeyboard_location">Placering</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal skal have tilladelse til at vise dine billeder og videoer</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly skal have tilladelse til at vise dine billeder og videoer</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Tillad adgang</string>
     <string name="AttachmentKeyboard_payment">Betaling</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Kan ikke finde en app til valg af mediefil.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal beder om tilladelse til at tilgå din lagerplads, for at kunne vedhæfte billeder, videoer eller lydfiler, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Lagerplads\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal beder om tilladelse til at tilgå dine kontakter, for at kunne vedhæfte kontaktinformation, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Kontakter\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal beder om tilladelse til at tilgå din placering, for at kunne vedhæfte placeringer, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Placering\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly beder om tilladelse til at tilgå din lagerplads, for at kunne vedhæfte billeder, videoer eller lydfiler, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Lagerplads\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly beder om tilladelse til at tilgå dine kontakter, for at kunne vedhæfte kontaktinformation, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Kontakter\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly beder om tilladelse til at tilgå din placering, for at kunne vedhæfte placeringer, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Placering\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Tillad adgang til din placering</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">For at sende din placering:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Giv Signal tilladelse til at sende din placering.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Giv Molly tilladelse til at sende din placering.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal skal bruge adgang til din placering for at sende din placering.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly skal bruge adgang til din placering for at sende din placering.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Tillad adgang til lager</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Sådan viser du billeder og video:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal skal have adgang til lageret for at vise dine billeder og videoer.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly skal have adgang til lageret for at vise dine billeder og videoer.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s har ikke aktiveret betalinger </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Skift kamera</string>
     <string name="CameraXFragment_open_gallery_description">Åbn galleri</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Tillad adgang</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Giv adgang til dit kamera og din mikrofon</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Giv adgang til kameraet</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Tillad adgang til din mikrofon</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Giv Signal adgang til dit kamera for at tage billeder.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Giv Signal tilladelse til at tilgå dit kamera for at tage billeder og optage video.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Giv Signal adgang til dit kamera og din mikrofon for at tage billeder og optage video.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Giv Signal adgang til din mikrofon for at optage video med lyd.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Giv Signal adgang til dit kamera for at scanne en QR-kode.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal skal bruge adgang til dit kamera for at tage billeder</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal skal bruge adgang til dig kamera for at scanne QR-koder</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal skal bruge adgang til din mikrofon for at optage video</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">For at tage billeder i Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">For at tage billeder og optage video i Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">For at optage video med lyd:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">For at scanne QR-koder:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Seneste kontakter</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Ingen Signal-kontakter</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Du kan kun bruge kameraknappen til at sende billeder til Signal-kontakter. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Kan du ikke finde den du leder efter?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Inviter en kontakt til at bruge Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Inviter en kontakt til at bruge Molly</string>
     <string name="CameraContacts__menu_search">Søg</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Nej tak</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Opdater Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Opdater Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Denne version af appen understøttes ikke længere. Opdatér til den nyeste version for at fortsætte med at sende og modtage beskeder.</string>
     <string name="ClientDeprecatedActivity_update">Opdatér</string>
     <string name="ClientDeprecatedActivity_dont_update">Opdatér ikke</string>
     <string name="ClientDeprecatedActivity_warning">Advarsel</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Din Signal-version er udløbet. Du kan se din meddelelseshistorik, men du kan ikke sende eller modtage beskeder, før du opdaterer.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Din Molly-version er udløbet. Du kan se din meddelelseshistorik, men du kan ikke sende eller modtage beskeder, før du opdaterer.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Ingen webbrowser fundet.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Besked %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly-taleopkald %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly-videoopkald %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal-besked</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Send besked</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Lad os bruge Signal %1$s?</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Lad os bruge Molly %1$s?</string>
     <string name="ConversationActivity_specify_recipient">Vælg venligst en kontakt</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Vedhæftningen overskrider max. grænsen for filstørrelser, for den type af besked du sender.</string>
     <string name="ConversationActivity_unable_to_record_audio">Fejl ved lydoptagelse!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">For at sende talebeskeder:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Hvis du vil sende talebeskeder, skal du give Signal tilladelse til at tilgå mikrofonen.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Hvis du vil sende talebeskeder, skal du give Molly tilladelse til at tilgå mikrofonen.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal skal bruge adgang til din mikrofon for at optage en talebesked.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal beder om tilladelse til at tilgå mikrofonen for at kunne sende lydfiler, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Mikrofon\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly skal bruge adgang til din mikrofon for at optage en talebesked.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly beder om tilladelse til at tilgå mikrofonen for at kunne sende lydfiler, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Mikrofon\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal beder om tilladelse til at tilgå mikrofon og kamera, for at kunne ringe til %1$s, men er permanent blevet afvist. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Mikrofon\" og \"Kamera\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Giv Signal tilladelse til at tilgå dit kamera for at tage billeder og optage video.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal beder om tilladelse til at tilgå dit kamera, for at kunne tage billeder eller optage video, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal behøver tilladelse til at tilgå kameraet, for at tage billeder og video</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly beder om tilladelse til at tilgå mikrofon og kamera, for at kunne ringe til %1$s, men er permanent blevet afvist. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Mikrofon\" og \"Kamera\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Giv Molly tilladelse til at tilgå dit kamera for at tage billeder og optage video.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly beder om tilladelse til at tilgå dit kamera, for at kunne tage billeder eller optage video, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly behøver tilladelse til at tilgå kameraet, for at tage billeder og video</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Tildel adgang til mikrofonen for at kunne optage video med lyd.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal beder om tilladelse til at tilgå mikrofonen, for at kunne optage videoer, men er blevet afvist. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Mikrofon\" og \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal skal have adgang til mikrofonen for at kunne optage video.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly beder om tilladelse til at tilgå mikrofonen, for at kunne optage videoer, men er blevet afvist. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Mikrofon\" og \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly skal have adgang til mikrofonen for at kunne optage video.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
     <string name="ConversationActivity_no">Nej</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">For at starte et opkald:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Hvis du vil besvare opkaldet, skal du give Signal adgang til din mikrofon.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Hvis du vil besvare opkaldet, skal du give Molly adgang til din mikrofon.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal skal bruge adgang til din mikrofon for at starte et opkald.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly skal bruge adgang til din mikrofon for at starte et opkald.</string>
 
 
     <string name="ConversationActivity_join">Deltag</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Sms-beskeder understøttes ikke længere i Signal. Invitér %1$s til Signal for at holde samtalen her.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Denne person bruger ikke længere Signal. Invitér dem til Signal for at fortsætte samtalen her.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Denne person bruger ikke længere Molly. Invitér dem til Molly for at fortsætte samtalen her.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Inviter til Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Inviter til Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Du vil snart blive påmindet igen.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Slet for alle</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Slet på denne enhed</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Slet</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Slet overalt</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Denne besked slettes for alle i chatten, hvis de har den seneste version af Signal. De kan se at du har slettet en besked.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Blokering</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Opdater Signal</string>
+    <string name="ConversationFragment__update_build">Opdater Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
     <string name="ConversationFragment__reregister_signal">Genregistrering af signal</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Gå tilbage.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Åbn Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Åbn Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Ikke længere verificeret</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Dette sletter den valgte chat permanent.</item>
         <item quantity="other">Dette sletter de %1$d valgte chats permanent.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Dette sletter den valgte chat fra alle dine enheder permanent.</item>
+        <item quantity="other">Dette sletter alle %1$d valgte chats fra alle dine enheder permanent.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Sletter</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Sletter den valgte chat…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Hvem kan finde mig med mit nummer?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Alle, der har dit telefonnummer, kan se, at du er på Signal, og de kan starte en chat med dig.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Alle, der har dit telefonnummer, kan se, at du er på Molly, og de kan starte en chat med dig.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ingen vil kunne se, at du er på Signal, medmindre du sender dem en besked eller har en eksisterende chat med dem.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ingen vil kunne se, at du er på Molly, medmindre du sender dem en besked eller har en eksisterende chat med dem.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Gendan fra sikkerhedskopi?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Test din adgangssætning for sikkerhedskopi og bekræft, at den matcher</string>
     <string name="BackupsPreferenceFragment__turn_on">Aktiver</string>
     <string name="BackupsPreferenceFragment__turn_off">Deaktiver</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"For at gendanne fra sikkerhedskopi skal du installere Signal igen. Åbn appen og tryk på \"Gendan sikkerhedskopi.\" Vælg derefter en sikkerhedskopifil. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"For at gendanne fra sikkerhedskopi skal du installere Molly igen. Åbn appen og tryk på \"Gendan sikkerhedskopi.\" Vælg derefter en sikkerhedskopifil. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Læs mere</string>
     <string name="BackupsPreferenceFragment__in_progress">I gang …</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d indtil videre …</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% indtil videre…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal beder om tilladelse til at tilgå ekstern lagerplads for at oprette sikkerhedskopier, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Lagerplads\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly beder om tilladelse til at tilgå ekstern lagerplads for at oprette sikkerhedskopier, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Lagerplads\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Indstil tidspunkt for sikkerhedskopiering</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Chatsession genindlæst</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal bruger E2E-kryptering, og det kan undertiden være nødvendigt at genopfriske din chatsession. Dette påvirker ikke din chats sikkerhed, men du har muligvis gået glip af en besked fra denne kontakt, og du kan bede vedkommende om at sende den igen.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly bruger E2E-kryptering, og det kan undertiden være nødvendigt at genopfriske din chatsession. Dette påvirker ikke din chats sikkerhed, men du har muligvis gået glip af en besked fra denne kontakt, og du kan bede vedkommende om at sende den igen.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Brug Signal på computer eller iPad. Dine beskeder synkroniseres til dine forbundne enheder.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Forbind en ny enhed</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s-beskeder og -chatinfo er beskyttet af E2E-kryptering på alle enheder</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal på computer eller iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Alle beskeder på forbundne enheder er private</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Molly-beskeder synkroniseres med Molly på din mobiltelefon, når forbindelsen er oprettet. Din tidligere beskedhistorik vises ikke.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Gå ind på %1$s for at installere Molly på din anden enhed</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Mine tilknyttede enheder</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Frakobl</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s fjernet</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Forbinder enhed…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Enhed godkendt</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Indlæser…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Ingen tilknyttede enheder</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Lås op for at forbinde en enhed</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Scan QR-koden, der vises på enheden for at tilknytte.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Scan QR-kode</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Brug denne enhed til at scanne QR-koden, der vises på den enhed, du vil forbinde</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Okay</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Denne enhed vil kunne se dine grupper og kontakter, tilgå dine chats og sende beskeder i dit navn.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Færdiggør oprettelsen af forbindelse på din anden enhed</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Færdiggør oprettelsen af forbindelse til Molly på din anden enhed.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Tilkobling af ny enhed mislykkedes</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Denne QR-kode er ikke gyldig. Sørg for, at du scanner QR-koden, der vises på den enhed du vil forbinde</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Prøv igen</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Frakobl \"%1$s\"?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimér for manglende Play Services</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Enheden understøtter ikke Play Services. Tryk for at slå batterioptimering fra, som forhindrer Signal i at modtage beskeder i baggrunden.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Enheden understøtter ikke Play Services. Tryk for at slå batterioptimering fra, som forhindrer Molly i at modtage beskeder i baggrunden.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Denne version af Signal er udløbet. Opdatér nu for at sende og modtage beskeder.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Denne version af Molly er udløbet. Opdatér nu for at sende og modtage beskeder.</string>
     <string name="ExpiredBuildReminder_update_now">Opdatér nu</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Vis</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanent fejl ved Signal-kommunikationen!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal var ude af stand til at registrere med Google Play-tjenester. Signal-beskeder og opkald blev deaktiveret. Prøv venligst at registrere igen i Indstillinger -&gt; Avanceret</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanent fejl ved Molly-kommunikationen!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly var ude af stand til at registrere med Google Play-tjenester. Molly-beskeder og opkald blev deaktiveret. Prøv venligst at registrere igen i Indstillinger -&gt; Avanceret</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Fejlretningslogs hjælper os med at diagnosticere og fikse problemet, og de indeholder ikke identificerende oplysninger.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal stødte på et problem. Indsend fejlretningslog?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly stødte på et problem. Indsend fejlretningslog?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Notifikationer kan være forsinkede på grund af batterioptimering</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Du kan slå batterioptimering i Signal fra for at sikre, at beskednotifikationer ikke bliver forsinkede.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Du kan slå batterioptimering i Molly fra for at sikre, at beskednotifikationer ikke bliver forsinkede.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Notifikationer kan være forsinkede på grund af batterioptimering</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Deaktiver batterioptimering i Molly fra for at sikre, at beskednotifikationer ikke bliver forsinkede. Tryk på \"Fortsæt\" for at se enhedsspecifikke instruktioner.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Nej tak</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Fortsæt</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Fortsæt</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Afvis</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Nej tak</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Afventende gruppeinvitationer</string>
+    <string name="PendingMembersActivity_pending_group_invites">Anmodninger &amp; invitationer</string>
     <string name="PendingMembersActivity_requests">Anmodninger</string>
     <string name="PendingMembersActivity_invites">Invitationer</string>
     <string name="PendingMembersActivity_people_you_invited">Personer du har inviteret</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Afbryd</string>
     <string name="InviteActivity_sending">Sender …</string>
     <string name="InviteActivity_invitations_sent">Invitationer sendt!</string>
-    <string name="InviteActivity_invite_to_signal">Inviter til Signal</string>
+    <string name="InviteActivity_invite_to_signal">Inviter til Molly</string>
     <string name="InviteActivity_send_sms">Send SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Send %1$d SMS invitationer?</item>
         <item quantity="other">Send %1$d SMS-invitationer?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Lad os skifte til Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Lad os skifte til Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Det ser ud til, at du ikke har nogen apps at dele til.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Din besked</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Baggrundsforbindelse aktiveret</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Svar</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Foretager Signal-opkald</string>
+    <string name="NotificationBarManager__establishing_signal_call">Foretager Molly-opkald</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Starter Signal opringning</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal-opkaldstjeneste stopper</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Starter Molly opringning</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly-opkaldstjeneste stopper</string>
     <string name="NotificationBarManager__cancel_call">Afbryd opkald</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Du har aktiveret betalinger</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s kan nu acceptere betalinger</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Betalingsoplysninger er ikke tilgængelige</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Tryk for flere</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Betalingsoplysninger er ikke tilgængelige</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Oplysningerne om denne betaling er ikke tilgængelige, da dine beskeder blev gendannet fra en kilde, der ikke indeholdt denne betalingshistorik. Dette påvirker ikke saldoen i din wallet eller status for tidligere betalinger.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Snart vil du ikke længere kunne sende sms\'er fra Signal. Invitér %1$s til Signal for at fortsætte samtalen her.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Du kan ikke længere sende sms-beskeder i Signal. Invitér %1$s til Signal for at holde samtalen her.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Du kan ikke længere sende sms-beskeder i Molly. Invitér %1$s til Molly for at holde samtalen her.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Betaling: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Betaling</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Rapporteret som spam</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Tilknyt en Signal-enhed?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Det ser ud som om du forsøger at tilknytte en Signal-enhed via en tredjeparts scanner. Af sikkerhedshensyn bør du bruge den integrerede scanner i Signal-appen.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal beder om tilladelse til at tilgå dit kamera, for at kunne scanne en QR-kode, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Kamera\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly beder om tilladelse til at tilgå dit kamera, for at kunne scanne en QR-kode, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Kamera\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Kan ikke scanne en QR-kode uden tilladelse til at tilgå kameraet</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Indtast adgangssætning</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal-ikon</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly-ikon</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Tilføj adgangssætning</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Ugyldig adgangssætning!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Lås Signal op</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Låseskærm</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Lås Molly op</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Låseskærm</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Kort</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Bekræft for at fortsætte beskedskrivning</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">For at hjælpe med at forhindre spam på Signal, skal du gennemføre bekræftelsen.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">For at hjælpe med at forhindre spam på Molly, skal du gennemføre bekræftelsen.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Efter bekræftelse kan du fortsætte med at sende beskeder. Alle beskeder, der er sat på pause, sendes automatisk.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Min historie</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal-opkald</string>
+    <string name="Recipient_signal_call">Molly-opkald</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Blokér</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Ringer…</string>
     <string name="RedPhone_busy">Optaget</string>
     <string name="RedPhone_recipient_unavailable">Modtager utilgængelig</string>
-    <string name="RedPhone_network_failed">Netværksfejl!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Netværksfejl! Tjek din netværksforbindelse, og prøv igen.</string>
     <string name="RedPhone_number_not_registered">Telefonnummer ikke registreret!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Det indtastede telefonnummer understøtter ikke secure voice!</string>
     <string name="RedPhone_got_it">Forstået</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Tryk her for at starte video</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">For at ringe til %1$s har Signal brug for tilladelse til at tilgå dit kamera</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">For at ringe til %1$s har Molly brug for tilladelse til at tilgå dit kamera</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Ringer op …</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Genopretter forbindelse …</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Fjernet fra opkald</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Nogen har fjernet dig fra opkaldet.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Giv adgang til dit kamera og din mikrofon</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Tillad adgang til din mikrofon</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Giv adgang til kameraet</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">For at starte eller deltage i et opkald skal Molly have adgang til dit kamera og din mikrofon.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">For at starte eller deltage i et opkald skal Molly have adgang til din mikrofon.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">For at aktivere video skal Molly have adgang til dit kamera.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly skal bruge adgang til mikrofon for at starte eller deltage i et opkald.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly skal have adgang til dit kamera for at aktivere video</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">For at starte eller deltage i et opkald:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Sådan aktiverer du video:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal-opkald</string>
-    <string name="WebRtcCallView__signal_video_call">Signal-videoopkald</string>
+    <string name="WebRtcCallView__signal_call">Molly-opkald</string>
+    <string name="WebRtcCallView__signal_video_call">Molly-videoopkald</string>
     <string name="WebRtcCallView__start_call">Start opkald</string>
     <string name="WebRtcCallView__join_call">Deltag i opkaldet</string>
     <string name="WebRtcCallView__call_is_full">Opkaldet er fuldt</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Tag hånden ned?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Tag hånden ned</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Tag ned</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Annuller</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Du har rakt hånden op</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Vis</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s har rakt hånden op</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s har rakt hånden op</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d har rakt hånden op</item>
         <item quantity="other">%1$s + %2$d har rakt hånden op</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s har rakt hånden op</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d har rakt hånden op</item>
+        <item quantity="other">%1$s +%2$d har rakt hånden op</item>
+    </plurals>
+
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Du vil modtage et opkald for at bekræfte dette nummer.</string>
     <string name="RegistrationActivity_edit_number">Redigér nummer</string>
     <string name="RegistrationActivity_missing_google_play_services">Mangler Google Play-tjenester</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Enheden mangler Google Play-tjenester. Du kan stadig bruge Signal, men denne konfiguration kan resultere i begrænset stabilitet og ydeevne.\n\nHvis du ikke er en superbruger, ikke kører en alternativ Android ROM eller mener, at du ser denne besked ved en fejl, bedes du kontakte support@signal.org på engelsk for hjælp.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Enheden mangler Google Play-tjenester. Du kan stadig bruge Molly, men denne konfiguration kan resultere i begrænset stabilitet og ydeevne.\n\nHvis du ikke er en superbruger, ikke kører en alternativ Android ROM eller mener, at du ser denne besked ved en fejl, bedes du kontakte support@molly.im på engelsk for hjælp.</string>
     <string name="RegistrationActivity_i_understand">Forstået</string>
     <string name="RegistrationActivity_play_services_error">Play Services fejl</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play-tjenester opdateres eller er midlertidigt utilgængelig. Prøv venligst igen.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Ikke-standardiseret nummerformat</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Det nummer du har indtastet (%1$s) ser ud til at være et ikke-standardiseret format.\n\nMente du %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Telefonnummerformat</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Telefonnummerformat</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Anmodet om opkald</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Problemer ved tilmelding?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Sørg for, at din telefon har forbindelse, så du kan modtage din sms eller dit opkald\n • Bekræft, at du kan modtage et opkald på nummeret\n • Tjek, at du har angivet dit telefonnummer korrekt.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Du kan få flere oplysninger ved at følge disse fejlfindingstrin eller kontakte support</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Gå til %1$s eller %2$s for flere oplysninger</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">disse fejlfindingstrin</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Føj til kontakter</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Inviter til Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Inviter til Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal-besked</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal-opkald</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Føj til kontakter</string>
-    <string name="SharedContactView_invite_to_signal">Inviter til Signal</string>
+    <string name="SharedContactView_invite_to_signal">Inviter til Molly</string>
     <string name="SharedContactView_message">Signal-besked</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s tilhører %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Opdater Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">En ny version af Signal er tilgængelig. Tryk for at opdatere.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal kunne ikke opdateres</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Opdater Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">En ny version af Molly er tilgængelig. Tryk for at opdatere.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly kunne ikke opdateres</string>
     <string name="ApkUpdateNotifications_failed_general_body">Vi prøver igen senere.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal er hermed opdateret</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly er hermed opdateret</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Du er blevet automatisk opdateret til version %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Vores Signal-sikkerhedsnummer:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Det lader til at du ikke har nogen apps at dele til.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Sikkerhedsnummer til sammenligning kunne ikke findes i udklipsholderen</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal beder om tilladelse til at tilgå dit kamera, for at kunne scanne en QR-kode, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Kamera\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly beder om tilladelse til at tilgå dit kamera, for at kunne scanne en QR-kode, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Kamera\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Ikke muligt at scanne QR-koden uden tilladelse til at tilgå kameraet</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Du skal først udveksle beskeder, før du kan se %1$s\'s sikkerhedsnummer.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Tryk for at åbne.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal er låst op</string>
-    <string name="KeyCachingService_lock">Lås Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly er låst op</string>
+    <string name="KeyCachingService_lock">Lås Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Dig</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Medietype ikke understøttet</string>
     <string name="MediaPreviewActivity_draft">Kladde</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal beder om tilladelse til at tilgå din lagerplads, for at kunne gemme til ekstern placering, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Lagerplads\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly beder om tilladelse til at tilgå din lagerplads, for at kunne gemme til ekstern placering, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Lagerplads\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Ikke muligt at gemme til ekstern placering, uden tilladelse</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Slet besked?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Dette sletter beskeden permanent.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Kunne ikke levere besked.</string>
     <string name="MessageNotifier_error_delivering_message">Fejl ved levering af besked.</string>
     <string name="MessageNotifier_message_delivery_paused">Levering af besked sat på pause.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Bekræft for at fortsætte med at sende beskeder på Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Bekræft for at fortsætte med at sende beskeder på Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Markér alle som læst</string>
     <string name="MessageNotifier_mark_read">Markér som læst</string>
     <string name="MessageNotifier_turn_off_these_notifications">Deaktiver disse notifikationer</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Reagerede med %1$s på dit klistermærke.</string>
     <string name="MessageNotifier_this_message_was_deleted">Beskeden blev slettet.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Deaktiver notifikationer om at kontakt er begyndt at bruge Signal? Du kan aktivere dem igen i Signal &gt; Indstillinger &gt; Notifikationer</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Deaktiver notifikationer om at kontakt er begyndt at bruge Molly? Du kan aktivere dem igen i Molly &gt; Indstillinger &gt; Notifikationer</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Hurtig svar utilgængelig når Signal er låst!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Hurtig svar utilgængelig når Molly er låst!</string>
     <string name="QuickResponseService_problem_sending_message">Problem med at sende besked!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Ugyldig genvej</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Ny besked</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Beskedanmodning</string>
     <string name="SingleRecipientNotificationBuilder_you">Dig</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Denne enhed er ikke længere registreret. Det skyldes sandsynligvis, at du har registreret dit telefonnummer på Signal med en anden enhed.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Denne enhed er ikke længere registreret. Det skyldes sandsynligvis, at du har registreret dit telefonnummer på Molly med en anden enhed.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Registrér enheden igen</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Hvis du vil besvare opkaldet, skal du give Signal adgang til din mikrofon.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Hvis du vil besvare opkaldet, skal du give Molly adgang til din mikrofon.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">For at besvare videoopkaldet skal du give Signal adgang til din mikrofon og dit kamera.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal beder om tilladelse til at tilgå mikrofon og kamera, for at kunne modtage og foretage opkald, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Mikrofon\" og \"Kamera\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">For at besvare videoopkaldet skal du give Molly adgang til din mikrofon og dit kamera.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly beder om tilladelse til at tilgå mikrofon og kamera, for at kunne modtage og foretage opkald, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Mikrofon\" og \"Kamera\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Besvaret på en forbundet enhed.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Afvist på en forbundet enhed.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Optaget på en forbundet enhed</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Gentag ny adgangssætning</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Inviter til Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Inviter til Molly</string>
     <string name="contact_selection_activity__new_group">Ny gruppe</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Opdater kontakter</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Mangler der nogen? Prøv at opdatere</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Find folk, du kender på Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Giv adgang til dine kontakter</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Mere</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Kontaktbillede</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal beder om tilladelse til at tilgå dine kontakter for at kunne vise dem, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Kontakter\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly beder om tilladelse til at tilgå dine kontakter for at kunne vise dem, hvilket er blevet nægtet. Gå venligst til appindstillinger, vælg \"Tilladelser\" og tilvælg \"Kontakter\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Fejl ved modtagelse af kontakter, tjek din netværksforbindelse</string>
     <string name="ContactSelectionListFragment_username_not_found">Brugernavn ikke fundet</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"%1$s er ikke en Signal-bruger. Tjek venligst brugernavnet og prøv igen"</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Find ud fra brugernavn</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Giv adgang til kontakter</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">For at finde folk, du kender på Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Tillad adgang</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Nej tak</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Giv adgang til dine kontakter. Dine kontakter er krypterede og er ikke synlige for Signal-tjenesten.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal kræver tilladelse til at tilgå dine kontakter for at kunne vise dem.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly kræver tilladelse til at tilgå dine kontakter for at kunne vise dem.</string>
     <string name="contact_selection_list_fragment__show_contacts">Vis kontakter</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Du har fjernet denne person, og hvis du sender vedkommende en besked, tilføjes vedkommende igen til din liste.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Valgmuligheder</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Opdatér</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Afspil … Pause</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Bobler er en Android-funktion, som du kan slå fra for Signal-chats.</string>
+    <string name="BubbleOptOutTooltip__description">Bobler er en Android-funktion, som du kan slå fra for Molly-chats.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Ikke nu</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Gruppebeskrivelse</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Opdater Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Opdater Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Denne version af Signal er udløbet. Opdatér nu for at fortsætte med at bruge Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Denne version af Molly er udløbet. Opdatér nu for at fortsætte med at bruge Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Opdatér</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Langsom</string>
     <string name="preferences__help">Hjælp</string>
     <string name="preferences__advanced">Avanceret</string>
-    <string name="preferences__donate_to_signal">Donér til Signal</string>
+    <string name="preferences__donate_to_signal">Donér til Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Privatliv</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Skift appikon og -navn til \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal skal lukkes for at ændre appens ikon og navn. Notifikationer viser altid Signals standardikon og -navn.</string>
+    <string name="preferences__app_icon_dialog_description">Molly skal lukkes for at ændre appens ikon og navn. Notifikationer viser altid Mollys standardikon og -navn.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Vælg et appikon og -navn, som vil være synligt på telefonens startskærm og i appskuffen. Notifikationer viser altid Signals standardikon og -navn. Få mere at vide</string>
+    <string name="preferences__app_icon_warning_learn_more">Vælg et appikon og -navn, som vil være synligt på telefonens startskærm og i appskuffen. Notifikationer viser altid Mollys standardikon og -navn. Få mere at vide</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Appikoner og -navne er synlige på startskærmen og i appskuffen.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Notifikationer viser altid Signals standardikon og -navn.</string>
+    <string name="preferences__app_icon_notification_warning">Notifikationer viser altid Mollys standardikon og -navn.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Få mere at vide</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Dette reducerer alle chats permanent til de %1$s seneste beskeder.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Dette sletter permanent al beskedhistorik og alle medier fra din enhed.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Dette sletter permanent al beskedhistorik og alle medier fra din enhed og eventuelle forbundne enheder.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Er du sikker på, du vil slette al meddelelseshistorik?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Al beskedhistorik fjernes permanent. Handlingen kan ikke fortrydes</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Al beskedhistorik fjernes permanent fra alle forbundne enheder. Denne handling kan ikke fortrydes.</string>
     <string name="preferences_storage__delete_all_now">Slet alt nu</string>
     <string name="preferences_storage__forever">For evigt</string>
     <string name="preferences_storage__one_year">1 år</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Omgåelse af censur</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Omgåelse af censur</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Hvis aktiveret vil Signal forsøge at omgå censur. Aktivér ikke denne funktion, medmindre du er på et sted hvor Signal er censureret</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Hvis aktiveret vil Molly forsøge at omgå censur. Aktivér ikke denne funktion, medmindre du er på et sted hvor Molly er censureret</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Omgåelse af censur er blevet aktiveret baseret på din kontos telefonnummer.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Vi introducerer betalinger</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Brug Signal til at sende og modtage MobileCoin, en ny privatlivsfokuseret digital valuta. Aktivér for at komme i gang.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Brug Molly til at sende og modtage MobileCoin, en ny privatlivsfokuseret digital valuta. Aktivér for at komme i gang.</string>
     <string name="PaymentsHomeFragment__activate_payments">Aktiver Betalinger</string>
     <string name="PaymentsHomeFragment__activating_payments">Aktiverer betalinger …</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Gendan betalingskonto</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Betalinger er ikke tilgængelige i din region.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Betalinger kunne ikke aktiveres. Prøv igen senere.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Deaktiver Betalinger?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Du kan ikke sende eller modtage MobileCoin i Signal, hvis du deaktiverer betalinger.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Du kan ikke sende eller modtage MobileCoin i Molly, hvis du deaktiverer betalinger.</string>
     <string name="PaymentsHomeFragment__deactivate">Deaktiver</string>
     <string name="PaymentsHomeFragment__continue">Fortsæt</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Saldo er ikke tilgængelig i øjeblikket.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Detaljer</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Du kan bruge Signal til at sende og modtage MobileCoin. Alle betalinger er underlagt brugsbetingelserne for MobileCoins og MobileCoin Wallet. Du kan støde på nogle problemer, og betalinger eller saldi, du måtte miste, kan ikke gendannes. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Du kan bruge Molly til at sende og modtage MobileCoin. Alle betalinger er underlagt brugsbetingelserne for MobileCoins og MobileCoin Wallet. Du kan støde på nogle problemer, og betalinger eller saldi, du måtte miste, kan ikke gendannes. </string>
     <string name="PaymentsHomeFragment__activate">Aktiver</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Se vilkår for MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Betalinger i Signal er ikke længere tilgængelige. Du kan stadig overføre penge til en børs, men du kan ikke længere sende og modtage betalinger eller tilføje midler.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Betalinger i Molly er ikke længere tilgængelige. Du kan stadig overføre penge til en børs, men du kan ikke længere sende og modtage betalinger eller tilføje midler.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Giv tilladelser</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">For at hjælpe dig med at sende beskeder til folk, du kender, vil Signal bede om disse tilladelser. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">For at hjælpe dig med at sende beskeder til folk, du kender, vil Molly bede om disse tilladelser. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Notifikationer</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Næste</string>
     <string name="PaymentsTransferFragment__invalid_address">Ugyldig adresse</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Tjek wallet-adressen du forsøger at overføre til, og prøv igen.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Du kan ikke overføre til din egen wallet-adresse i Signal. Indtast wallet-adressen fra din konto på en understøttet børs.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">For at scanne en QR-kode skal Signal have adgang til kameraet.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal skal have kameratilladelsen for at fange en QR-kode. Gå til indstillinger, vælg \"Tilladelser\", og aktiver \"Kamera\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">For at scanne en QR-kode skal Signal have adgang til kameraet.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Du kan ikke overføre til din egen wallet-adresse i Molly. Indtast wallet-adressen fra din konto på en understøttet børs.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">For at scanne en QR-kode skal Molly have adgang til kameraet.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly skal have kameratilladelsen for at fange en QR-kode. Gå til indstillinger, vælg \"Tilladelser\", og aktiver \"Kamera\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">For at scanne en QR-kode skal Molly have adgang til kameraet.</string>
     <string name="PaymentsTransferFragment__settings">Indstillinger</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Indgående Signal-taleopkald</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Indgående Molly-taleopkald</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Indgående Signal-videoopkald</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Indgående Molly-videoopkald</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Indgående Signal-gruppeopkald</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Indgående Molly-gruppeopkald</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Igangværende Signal-taleopkald</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Igangværende Molly-taleopkald</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Igangværende Signal-videoopkald</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Igangværende Molly-videoopkald</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Igangværende Signal-gruppeopkald</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Igangværende Molly-gruppeopkald</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Indlæser…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Verificér</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Du indtastede den korrekte adgangssætning til sikkerhedskopi</string>
     <string name="BackupDialog_passphrase_was_not_correct">Forkert adgangssætning</string>
-    <string name="LocalBackupJob_creating_signal_backup">Opretter Signal-sikkerhedskopi …</string>
+    <string name="LocalBackupJob_creating_signal_backup">Opretter Molly-sikkerhedskopi …</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Verificerer Signal-sikkerhedskopi…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Verificerer Molly-sikkerhedskopi…</string>
     <string name="LocalBackupJobApi29_backup_failed">Sikkerhedskopiering mislykkedes</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Din mappe med sikkerhedskopier er blevet slettet eller flyttet.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Din sikkerhedskopifil er for stor til at kunne gemmes på denne lagerenhed.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Ring til mig (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Send kode igen (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Kontakt Signal Support</string>
-    <string name="RegistrationActivity_code_support_subject">Signal-registrering - Verifikationskode for Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Kontakt Molly Support</string>
+    <string name="RegistrationActivity_code_support_subject">Molly-registrering - Verifikationskode for Android</string>
     <string name="RegistrationActivity_incorrect_code">Forkert kode</string>
     <string name="BackupUtil_never">Aldrig</string>
     <string name="BackupUtil_unknown">Ukendt</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Telefonnummer</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Vælg, hvem der kan se dit telefonnummer, og hvem der kan kontakte dig på Signal med det.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Vælg, hvem der kan se dit telefonnummer, og hvem der kan kontakte dig på Molly med det.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Personer, der kan se mit nummer</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">For mange mislykkede forsøg. Prøv igen senere</string>
     <string name="RegistrationActivity_error_connecting_to_service">Fejl ved oprettelse af forbindelse til service</string>
     <string name="preferences_chats__backups">Sikkerhedskopier</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal er låst</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly er låst</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">TRYK FOR AT LÅSE OP</string>
     <string name="Recipient_unknown">Ukendt</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Du skal have adgang til din gamle enhed.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Gendan fra sikkerhedskopi</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Gendan dine beskeder fra en lokal sikkerhedskopi. Hvis du ikke gendanner nu, kan du ikke gøre det senere.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Genopret lokal sikkerhedskopi</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Genopret Signal-sikkerhedskopi</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Genopret alle dine beskeder + dine medier fra de sidste 30 dage</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Flere muligheder</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Annuller</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Log ind uden at overføre</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Fortsæt med at overføre dine beskeder og medier</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Åbn Signal på din gamle Android-telefon</string>
     <string name="NewDeviceTransferInstructions__continue">Fortsæt</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Forbereder forbindelse til den gamle Android-enhed…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Tager et øjeblik. Vil snart være klar</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Venter på, at den gamle Android-enhed forbinder …</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal kræver placeringstilladelsen for at opspore og forbinde din gamle Android-enhed.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal kræver placeringstjenester aktiveret for at opspore og forbinde med din gamle Android-enhed.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal kræver Wi-Fi til for at opspore og forbinde med din gamle Android-enhed. Wi-Fi skal være tændt, men det behøver ikke at være forbundet til et Wi-Fi-netværk.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Beklager, denne enhed understøtter ikke Wi-Fi Direct. Signal bruger Wi-Fi Direct til at opspore og forbinde med din gamle Android-enhed. Du kan stadig gendanne en sikkerhedskopi for at gendanne din konto fra din gamle Android-enhed.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly kræver placeringstilladelsen for at opspore og forbinde din gamle Android-enhed.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly kræver placeringstjenester aktiveret for at opspore og forbinde med din gamle Android-enhed.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly kræver Wi-Fi til for at opspore og forbinde med din gamle Android-enhed. Wi-Fi skal være tændt, men det behøver ikke at være forbundet til et Wi-Fi-netværk.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Beklager, denne enhed understøtter ikke Wi-Fi Direct. Molly bruger Wi-Fi Direct til at opspore og forbinde med din gamle Android-enhed. Du kan stadig gendanne en sikkerhedskopi for at gendanne din konto fra din gamle Android-enhed.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Gendan en sikkerhedskopi</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Der opstod en uventet fejl under forbindelsesforsøg til din gamle Android-enhed.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Søger efter ny Android-enhed …</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal kræver placeringstilladelsen for at opspore og forbinde med din nye Android-enhed.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal kræver placeringstjenester aktiveret for at opspore og forbinde med din nye Android-enhed.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal kræver Wi-Fi til for at opspore og forbinde med din nye Android-enhed. Wi-Fi skal være tændt, men det behøver ikke at være forbundet til et Wi-Fi-netværk.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Beklager, denne enhed understøtter ikke Wi-Fi Direct. Signal bruger Wi-Fi Direct til at opspore og forbinde med din nye Android-enhed. Du kan stadig gendanne en sikkerhedskopi for at gendanne din konto fra din nye Android-enhed.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly kræver placeringstilladelsen for at opspore og forbinde med din nye Android-enhed.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly kræver placeringstjenester aktiveret for at opspore og forbinde med din nye Android-enhed.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly kræver Wi-Fi til for at opspore og forbinde med din nye Android-enhed. Wi-Fi skal være tændt, men det behøver ikke at være forbundet til et Wi-Fi-netværk.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Beklager, denne enhed understøtter ikke Wi-Fi Direct. Molly bruger Wi-Fi Direct til at opspore og forbinde med din nye Android-enhed. Du kan stadig gendanne en sikkerhedskopi for at gendanne din konto fra din nye Android-enhed.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Opret en sikkerhedskopi</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Der opstod en uventet fejl under forbindelsesforsøg til din nye Android-enhed.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Overfører data</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Hold begge enheder tæt ved hinanden. Sluk ikke for enhederne, og hold Signal åbent. Overførsler er end-to-end krypteret.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Hold begge enheder tæt ved hinanden. Sluk ikke for enhederne, og hold Molly åbent. Overførsler er end-to-end krypteret.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d beskeder indtil videre …</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% af beskeder indtil videre…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Overfør konto</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Hent Signal på din nye Android-enhed</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Hent Molly på din nye Android-enhed</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Tryk på \"Overfør eller gendan konto\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Alle med dette link kan se gruppens navn og billede, og anmode om at deltage. Del det med personer, du stoler på.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Alle med dette link kan se gruppens navn og billede, og deltage i gruppen. Del det med personer, du stoler på.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Del via Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Del via Molly</string>
     <string name="GroupLinkBottomSheet_copy">Kopiér</string>
     <string name="GroupLinkBottomSheet_qr_code">QR-kode</string>
     <string name="GroupLinkBottomSheet_share">Del</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">Om MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin er en ny privatlivsfokuseret digital valuta.</string>
     <string name="payment_info_card_adding_funds">Tilføjelse af midler</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Du kan tilføje midler til brug i Signal ved at sende MobileCoin til din wallet-adresse.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Du kan tilføje midler til brug i Molly ved at sende MobileCoin til din wallet-adresse.</string>
     <string name="payment_info_card_cashing_out">Udbetaling</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Du kan når som helst få udbetalt MobileCoin på en børs, der understøtter MobileCoin. Foretag blot en overførsel til din konto ved denne børs.</string>
     <string name="payment_info_card_hide_this_card">Skjul dette kort?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Deaktiver wallet</string>
     <string name="DeactivateWalletFragment__your_balance">Din saldo</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Det anbefales, at du overfører dine midler til en anden wallet-adresse, før du deaktiverer betalinger. Hvis du vælger ikke at overføre dine midler nu, forbliver de i din wallet, der er knyttet til Signal, hvis du genaktiverer betalinger.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Det anbefales, at du overfører dine midler til en anden wallet-adresse, før du deaktiverer betalinger. Hvis du vælger ikke at overføre dine midler nu, forbliver de i din wallet, der er knyttet til Molly, hvis du genaktiverer betalinger.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Overfør resterende saldo</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Deaktiver uden at overføre</string>
     <string name="DeactivateWalletFragment__deactivate">Deaktiver</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Deaktiver uden at overføre?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Din saldo forbliver i din wallet, der er knyttet til Signal, hvis du vælger at genaktivere betalinger.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Din saldo forbliver i din wallet, der er knyttet til Molly, hvis du vælger at genaktivere betalinger.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Fejl ved deaktivering af wallet.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licenser</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Vilkår &amp; privatlivspolitik</string>
-    <string name="HelpFragment__copyright_signal_messenger">Ophavsret Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Ophavsret Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Licenseret under GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Vælg en farve</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Del</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Kun administratorer kan sende beskeder til denne gruppe.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Grænse nået</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Du kan ikke vælge mere end fem chats</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Få mere at vide</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Opdater Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Opdater Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Denne version af Signal er udløbet. Opdatér nu for at fortsætte med at bruge Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Denne version af Molly er udløbet. Opdatér nu for at fortsætte med at bruge Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Opdatér</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Enheden er ikke registreret</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Denne enhed er ikke længere registreret. Genregistrer for at fortsætte med at bruge Signal på denne enhed.</string>
+    <string name="ReregisterSignalDialog__message">Denne enhed er ikke længere registreret. Genregistrer for at fortsætte med at bruge Molly på denne enhed.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Genregistrering</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Kunne ikke åbne vælgeren.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">For at aktivere notifikationer, skal Signal have tilladelse til at vise dem.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">For at aktivere notifikationer, skal Molly have tilladelse til at vise dem.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Aktiver</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Ingen svar endnu</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Du kan ikke svare på denne historie, da du ikke længere er medlem af denne gruppe.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Reagerede på historien</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Reagerede på historien</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Reagerede på historien</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Visninger</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Vælg din bank</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Bekræft din donation med %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Tryk \"fortsæt\" for at bekræfte opkrævningen af et gebyr på 0,01 EUR hos din bank. Beløbet refunderes automatisk og gør det muligt at opkræve din donation på 5 EUR/måneden fra din konto.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Tryk fortsæt for at bekræfte opkrævningen af et gebyr på 0,01 EUR hos din bank. Beløbet refunderes automatisk og gør det muligt at opkræve din donation på %1$s R/måned fra din konto.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Fortsæt</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Downloader sikkerhedskopidata…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Sikkerhedskopiering af medier er slået fra</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Dit abonnement for sikkerhedskopiering af Signal-medier er blevet opsagt, fordi vi ikke kunne behandle din betaling. Du har %1$d dage til at downloade alle medier, der er gemt i din sikkerhedskopi. Efter %1$d dage slettes medierne i din sikkerhedskopi.</item>
+        <item quantity="other">Dit abonnement for sikkerhedskopiering af Signal-medier er blevet opsagt, fordi vi ikke kunne behandle din betaling. Du har %1$d dage til at downloade alle medier, der er gemt i din sikkerhedskopi. Efter %1$d dage slettes medierne i din sikkerhedskopi.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Du kan til enhver tid begynde at betale for sikkerhedskopier igen for at fortsætte med at sikkerhedskopiere alle dine medier. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Dine medier slettes i dag</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Dit abonnement for sikkerhedskopiering af Signal medier er blevet opsagt, fordi vi ikke kunne behandle din betaling. Dette er din sidste chance for at downloade medierne i din sikkerhedskopi, før de slettes.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Kan ikke fuldføre download</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Din enhed har ikke nok ledig plads. Frigør op til %1$s plads for at downloade de medier, der er gemt i din sikkerhedskopi.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Hvis du vælger \"Spring over\", slettes medierne i sikkerhedskopien inden for %1$d dage.</item>
+        <item quantity="other">Hvis du vælger \"Spring over\", slettes medierne i sikkerhedskopien inden for %1$d dage.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Kunne ikke behandle betaling for sikkerhedskopiering</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Vi har problemer med at opkræve din tilbagevendende månedlige sikkerhedskopieringsbetaling. Tjek, at din betalingsmetode er opdateret. Hvis den ikke er det, skal du opdatere den i Google Pay. Signal vil forsøge at behandle betalingen igen om et par dage.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Kunne ikke gennemføre sikkerhedskopieringen</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Din enhed har ikke udført en sikkerhedskopiering i %1$d dage. Tjek, at din enhed er forbundet til et wi-fi-netværk, og tryk på \"Sikkerhedskopiér nu\". </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Få mere at vide</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Spring over</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Download medier nu</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Download senere</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Download ikke medier</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Frigør %1$s i lagerplads for at downloade dine medier.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Kredit- eller debetkort</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Ukendt</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Betalingshistorik</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Din sidste sikkerhedskopi blev lavet %1$s kl. %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Beskeder, der er ældre end det valgte tidspunkt, slettes permanent.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Beskeder, der overstiger den valgte længde, slettes permanent.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Anvend grænser for forbundne enheder</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Når dette er aktiveret, sletter chatgrænser også beskeder fra dine forbundne enheder.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Sletning synkroniseres nu på tværs af alle dine enheder</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Når du sletter beskeder eller chats, slettes de fra din telefon og tilknyttede enheder.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Betalingshistorik</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Sikkerhedskopiering af tekst og alle medier</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Betalingsoplysninger</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Sikkerhedskopitype</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Dato for betaling</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Del</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal-sikkerhedskopier</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Betalingshistorik</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Sikkerhedskopioplysninger</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Sikkerhedskopistørrelse</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Sikkerhedskopieringshyppighed</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Sikkerhedskopiér via mobildata</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Slå fra og slet sikkerhedskopi</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Sikkerhedskopiering slettet og slukket.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Sikkerhedskopieringstype ændret og abonnement annulleret</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Abonnement annulleret</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Download fuldført</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Sikkerhedskopitype</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Sikkerhedskopiering deaktiveret</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/måned</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Aktiver sikkerhedskopier</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Seneste sikkerhedskopi</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s ved %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Aldrig</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Sikkerhedskopier nu</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Slå fra og slet sikkerhedskopier?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Du bliver ikke opkrævet igen. Din sikkerhedskopi bliver slettet, og der oprettes ingen nye sikkerhedskopier.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Deaktivér og slet</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Sletter sikkerhedskopi…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Sikkerhedskopi slettet</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Ved at trykke på Sikkerhedskopiér nu"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Daglig</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Ugentlig</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Månedlig</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Lav manuel sikkerhedskopi</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Angiv din enheds pinkode, adgangskode eller dit mønster.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Næste</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Skift sikkerhedskopitype</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Opsig abonnement</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Bekræft annullering</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Du bliver ikke opkrævet igen. Sikkerhedskopier slås fra når din faktureringsperiode slutter. Efter denne dato har du 30 dage til at downloade de medier, du i øjeblikket sikkerhedskopierer.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Bekræft og download nu</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Bekræft og download senere</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Behold abonnementet</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9551681db8..0b271b992c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal wird aktualisiert …</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly wird aktualisiert …</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Du hast noch keine Passphrase festgelegt!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Passphrase deaktivieren?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Dies entsperrt Signal und Benachrichtigungen über Nachrichten dauerhaft.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Dies entsperrt Molly und Benachrichtigungen über Nachrichten dauerhaft.</string>
     <string name="ApplicationPreferencesActivity_disable">Deaktivieren</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fehler beim Verbinden mit dem Server!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PINs sind für die Registrierungssperre erforderlich. Zum Deaktivieren deiner PIN musst du daher zuerst auch die Registrierungssperre deaktivieren.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Datei</string>
     <string name="AttachmentKeyboard_contact">Kontakt</string>
     <string name="AttachmentKeyboard_location">Standort</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal benötigt die Berechtigung, um deine Fotos und Videos anzuzeigen.</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly benötigt die Berechtigung, um deine Fotos und Videos anzuzeigen.</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Zugriff erlauben</string>
     <string name="AttachmentKeyboard_payment">Zahlung</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Keine App zur Auswahl der Medieninhalte gefunden.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal benötigt die Berechtigung »Speicher« für das Anhängen von Fotos, Videos oder Audiodateien, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Speicher«.</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal benötigt die Berechtigung »Kontakte« für das Anhängen von Kontaktinformationen, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Kontakte«.</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal benötigt die Berechtigung »Standort« für das Anhängen von Standorten, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Standort«.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly benötigt die Berechtigung »Speicher« für das Anhängen von Fotos, Videos oder Audiodateien, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Speicher«.</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly benötigt die Berechtigung »Kontakte« für das Anhängen von Kontaktinformationen, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Kontakte«.</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly benötigt die Berechtigung »Standort« für das Anhängen von Standorten, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Standort«.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Zugriff auf Standort erlauben</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">So sendest du deinen Standort:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Erlaube Signal, deinen Standort zu senden.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Erlaube Molly, deinen Standort zu senden.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal benötigt Zugriff auf deine Standortdaten, um deinen Standort senden zu können.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly benötigt Zugriff auf deine Standortdaten, um deinen Standort senden zu können.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Zugriff auf Speicher erlauben</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Um Fotos und Videos zu zeigen:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal benötigt Zugriff auf den Speicher, um deine Fotos und Videos anzuzeigen.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly benötigt Zugriff auf den Speicher, um deine Fotos und Videos anzuzeigen.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s hat Zahlungen nicht aktiviert </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Kamera wechseln</string>
     <string name="CameraXFragment_open_gallery_description">Galerie öffnen</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Zugriff erlauben</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Zugriff auf deine Kamera und dein Mikrofon erlauben</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Zugriff auf deine Kamera erlauben</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Zugriff auf dein Mikrofon erlauben</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Zum Aufnehmen von Fotos erlaube Signal Zugriff auf deine Kamera.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Zum Aufnehmen von Fotos und Videos erlaube Signal Zugriff auf deine Kamera.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Zum Aufnehmen von Fotos und Videos erlaube Signal Zugriff auf deine Kamera und dein Mikrofon.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Signal benötigt Zugriff auf dein Mikrofon, um Videos mit Ton aufzunehmen.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Um QR-Codes zu scannen, erlaube Signal Zugriff auf deine Kamera.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Um Aufnahmen zu machen, benötigt Signal Zugriff auf deine Kamera</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Um QR-Codes zu scannen, benötigt Signal Zugriff auf deine Kamera</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Um Videos aufzunehmen, benötigt Signal Zugriff auf dein Mikrofon</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Um in Signal Fotos zu machen:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Um in Signal Fotos und Videos aufzunehmen:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Um Videos mit Ton aufzunehmen:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Um QR-Codes zu scannen:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Letzte Kontakte</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Keine Signal-Kontakte</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Mit der Kameraschaltfläche kannst du Fotos nur an Signal-Kontakte senden. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Die gesuchte Person nicht gefunden?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Lade einen Kontakt zu Signal ein</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Lade einen Kontakt zu Molly ein</string>
     <string name="CameraContacts__menu_search">Suchen</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Nein danke</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Signal aktualisieren</string>
+    <string name="ClientDeprecatedActivity_update_signal">Molly aktualisieren</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Diese Signal-Version wird nicht mehr unterstützt. Um weiterhin Nachrichten senden und empfangen zu können, aktualisiere auf die neueste Version.</string>
     <string name="ClientDeprecatedActivity_update">Aktualisieren</string>
     <string name="ClientDeprecatedActivity_dont_update">Nicht aktualisieren</string>
     <string name="ClientDeprecatedActivity_warning">Warnung</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Deine Signal-Version ist veraltet. Bis du Signal aktualisiert hast, kannst du deinen Nachrichtenverlauf einsehen, jedoch keine neuen Nachrichten senden oder empfangen.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Deine Molly-Version ist veraltet. Bis du Molly aktualisiert hast, kannst du deinen Nachrichtenverlauf einsehen, jedoch keine neuen Nachrichten senden oder empfangen.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Kein Webbrowser gefunden.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Nachricht %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly-Sprachanruf %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly-Videoanruf %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal-Nachricht</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Nachricht senden</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Lass uns zu »Signal« wechseln: %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Lass uns zu »Molly« wechseln: %1$s</string>
     <string name="ConversationActivity_specify_recipient">Bitte einen Kontakt auswählen</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Anhang zu groß für die zu sendende Nachrichtenart.</string>
     <string name="ConversationActivity_unable_to_record_audio">Audioaufnahme nicht möglich!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">So versendest du Sprachnachrichten:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Erlaube Signal Zugriff auf dein Mikrofon, um Sprachnachrichten zu versenden.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Erlaube Molly Zugriff auf dein Mikrofon, um Sprachnachrichten zu versenden.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal benötigt Zugriff auf das Mikrofon, um eine Sprachnachricht aufzunehmen.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal benötigt die Berechtigung »Mikrofon« für das Senden von Sprachnachrichten, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Mikrofon«.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly benötigt Zugriff auf das Mikrofon, um eine Sprachnachricht aufzunehmen.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly benötigt die Berechtigung »Mikrofon« für das Senden von Sprachnachrichten, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Mikrofon«.</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal benötigt die Berechtigungen »Mikrofon« und »Kamera«, um %1$s anzurufen, diese wurden jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Mikrofon« und »Kamera«.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Zum Aufnehmen von Fotos und Videos erlaube Signal Zugriff auf deine Kamera.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal benötigt die Berechtigung »Kamera« für die Aufnahme von Fotos oder Videos, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Kamera«.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal benötigt die Berechtigung »Kamera«, um Fotos oder Videos aufzunehmen.</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly benötigt die Berechtigungen »Mikrofon« und »Kamera«, um %1$s anzurufen, diese wurden jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Mikrofon« und »Kamera«.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Zum Aufnehmen von Fotos und Videos erlaube Molly Zugriff auf deine Kamera.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly benötigt die Berechtigung »Kamera« für die Aufnahme von Fotos oder Videos, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Kamera«.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly benötigt die Berechtigung »Kamera«, um Fotos oder Videos aufzunehmen.</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Aktiviere die Berechtigung »Mikrofon«, um Videos mit Ton aufzunehmen.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal benötigt die Berechtigung »Mikrofon«, um Videos aufzunehmen, diese wurde jedoch abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Mikrofon« und »Kamera«.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal benötigt die Berechtigung »Mikrofon«, um Videos aufzunehmen.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly benötigt die Berechtigung »Mikrofon«, um Videos aufzunehmen, diese wurde jedoch abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Mikrofon« und »Kamera«.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly benötigt die Berechtigung »Mikrofon«, um Videos aufzunehmen.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Nein</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">So startest du einen Anruf:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Signal benötigt Zugriff auf dein Mikrofon, um einen Anruf zu starten.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Molly benötigt Zugriff auf dein Mikrofon, um einen Anruf zu starten.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal benötigt Zugriff auf das Mikrofon, um einen Anruf zu starten.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly benötigt Zugriff auf das Mikrofon, um einen Anruf zu starten.</string>
 
 
     <string name="ConversationActivity_join">Beitreten</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Die SMS-Nachrichtübermittlung wird in Signal nicht länger unterstützt. Lade %1$s zu Signal ein, damit die Unterhaltung hier weitergeht.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Diese Person verwendet Signal nicht mehr. Lade sie zu Signal ein, damit die Unterhaltung hier weitergeht.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Diese Person verwendet Molly nicht mehr. Lade sie zu Molly ein, damit die Unterhaltung hier weitergeht.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Zu Signal einladen</string>
+    <string name="ConversationActivity__invite_to_signal">Zu Molly einladen</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Du wirst bald erneut daran erinnert.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Für alle löschen</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Auf diesem Gerät löschen</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Löschen</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Auf allen Geräten löschen</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Diese Nachricht wird für alle Chat-Teilnehmer gelöscht, die eine aktuelle Version von Signal verwenden. Sie werden sehen können, dass du eine Nachricht gelöscht hast.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Blockiert</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Signal aktualisieren</string>
+    <string name="ConversationFragment__update_build">Molly aktualisieren</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Signal erneut registrieren</string>
+    <string name="ConversationFragment__reregister_signal">Molly erneut registrieren</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Gehe zurück.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signal öffnen</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Molly öffnen</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Nicht mehr verifiziert</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Dies wird den ausgewählten Chat unwiderruflich löschen.</item>
         <item quantity="other">Dies wird alle %1$d ausgewählten Chats unwiderruflich löschen.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Dies wird den ausgewählten Chat dauerhaft von all deinen Geräten löschen.</item>
+        <item quantity="other">Dies wird alle %1$d ausgewählten Chats dauerhaft von all deinen Geräten löschen.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Löschen</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Ausgewählten Chat löschen …</item>
@@ -672,7 +680,7 @@
     <string name="ConversationListFragment_pin">Anheften</string>
     <string name="ConversationListFragment_unpin">Lösen</string>
     <string name="ConversationListFragment_mute">Stumm schalten</string>
-    <string name="ConversationListFragment_unmute">Laut schalten</string>
+    <string name="ConversationListFragment_unmute">Stummschaltung aufheben</string>
     <string name="ConversationListFragment_select">Auswählen</string>
     <string name="ConversationListFragment_archive">Archivieren</string>
     <string name="ConversationListFragment_unarchive">Dearchivieren</string>
@@ -736,14 +744,14 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Wer kann mich anhand der Telefonnummer finden?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Wer deine Telefonnummer hat, sieht, dass du bei Signal bist und kann mit dir chatten.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Wer deine Telefonnummer hat, sieht, dass du bei Molly bist und kann mit dir chatten.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Niemand kann sehen, dass du auf Signal bist, es sei denn, du schreibst eine Nachricht oder hast mit der Person einen bereits bestehenden Chat.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Niemand kann sehen, dass du auf Molly bist, es sei denn, du schreibst eine Nachricht oder hast mit der Person einen bereits bestehenden Chat.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Aus Sicherung wiederherstellen?</string>
     <string name="ChooseBackupFragment__restore_your_messages_and_media">Stelle deine Nachrichten und Medieninhalte aus einer lokalen Datensicherung wieder her. Falls du sie jetzt nicht wiederherstellst, wirst du dies später nicht mehr nachholen können.</string>
-    <string name="ChooseBackupFragment__icon_content_description">»Aus Datensicherung wiederherstellen«-Symbol</string>
+    <string name="ChooseBackupFragment__icon_content_description">»Aus Sicherung wiederherstellen«-Symbol</string>
     <string name="ChooseBackupFragment__choose_backup">Datensicherung wählen</string>
     <string name="ChooseBackupFragment__learn_more">Mehr erfahren</string>
     <string name="ChooseBackupFragment__no_file_browser_available">Kein Dateimanager verfügbar</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Teste die Passphrase deiner Datensicherung und vergewissere dich, dass du sie öffnen kannst</string>
     <string name="BackupsPreferenceFragment__turn_on">Einschalten</string>
     <string name="BackupsPreferenceFragment__turn_off">Ausschalten</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Um eine Datensicherung wiederherzustellen, installiere Signal neu. Öffne die App, tippe auf »Sicherung wiederherstellen« und wähle dann eine Sicherungsdatei. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Um eine Datensicherung wiederherzustellen, installiere Molly neu. Öffne die App, tippe auf »Sicherung wiederherstellen« und wähle dann eine Sicherungsdatei. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Mehr erfahren</string>
     <string name="BackupsPreferenceFragment__in_progress">In Bearbeitung …</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d bisher …</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% bisher …</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal benötigt zum Erstellen von Datensicherungen die Berechtigung »Speicher«, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Speicher«.</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly benötigt zum Erstellen von Datensicherungen die Berechtigung »Speicher«, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Speicher«.</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Datensicherungszeit festlegen</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Chat-Sitzung aktualisiert</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal verwendet Ende-zu-Ende-Verschlüsselung und muss gelegentlich deine Chat-Sitzung aktualisieren. Dies beeinflusst nicht die Sicherheit deiner Chats, aber es besteht die Möglichkeit, dass du eine Nachricht von diesem Kontakt verpasst hast. Du kannst ihn bitten, die Nachricht erneut zu senden.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly verwendet Ende-zu-Ende-Verschlüsselung und muss gelegentlich deine Chat-Sitzung aktualisieren. Dies beeinflusst nicht die Sicherheit deiner Chats, aber es besteht die Möglichkeit, dass du eine Nachricht von diesem Kontakt verpasst hast. Du kannst ihn bitten, die Nachricht erneut zu senden.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Signal auf dem Computer oder iPad verwenden. Deine Nachrichten werden mit deinen gekoppelten Geräten synchronisiert.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Ein neues Gerät koppeln</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Nachrichten und Chat-Infos sind auf allen Geräten durch eine Ende-zu-Ende-Verschlüsselung geschützt</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal für Computer oder iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Alle Nachrichten auf gekoppelten Geräten sind vertraulich</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Molly-Nachrichten werden nach der Kopplung mit deinem Mobiltelefon synchronisiert. Dein bisheriger Nachrichtenverlauf wird nicht angezeigt.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Besuche %1$s auf deinem anderen Gerät, um Molly zu installieren</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Meine gekoppelten Geräte</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Entkoppeln</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s entkoppelt</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Gerät wird gekoppelt…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Gerät freigeschaltet</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Wird geladen …</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Keine gekoppelten Geräte</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Entsperren, um ein Gerät zu koppeln</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Scanne den QR-Code, der auf dem Gerät, das du koppeln möchtest, angezeigt wird.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">QR-Code scannen</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Verwende dieses Gerät, um den QR-Code zu scannen, der auf dem Gerät angezeigt wird, das du koppeln möchtest</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">OK</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Dieses Gerät kann deine Gruppen und Kontakte sehen, auf deine Chats zugreifen und Nachrichten in deinem Namen versenden.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Die Kopplung auf deinem anderen Gerät beenden</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Beende die Kopplung von Molly auf deinem anderen Gerät.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Gerät konnte nicht gekoppelt werden</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Dieser QR-Code ist ungültig. Achte darauf, dass du den QR-Code einscannst, der auf dem zu koppelnden Gerät angezeigt wird.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Erneut versuchen</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">»%1$s« entkoppeln?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Für Betrieb ohne Google-Play-Dienste optimieren</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Dieses Gerät unterstützt keine Google-Play-Dienste. Antippen, um Akkuoptimierungen zu deaktivieren, die Signal daran hindern, Nachrichten im Hintergrund zu empfangen.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Dieses Gerät unterstützt keine Google-Play-Dienste. Antippen, um Akku-Optimierungen zu deaktivieren, die Molly daran hindern, Nachrichten im Hintergrund zu empfangen.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Diese Signal-Version ist veraltet. Aktualisiere jetzt, um Nachrichten senden und empfangen zu können.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Diese Molly-Version ist veraltet. Aktualisiere jetzt, um Nachrichten senden und empfangen zu können.</string>
     <string name="ExpiredBuildReminder_update_now">Jetzt aktualisieren</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Anzeigen</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Dauerhafter Signal-Kommunikationsfehler!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal konnte nicht für die Google-Play-Dienste registriert werden. Signal-Nachrichten und ‑Anrufe wurden daher deaktiviert. Bitte registriere Signal erneut in Signal → Einstellungen → Datenschutz → Erweiterte Einstellungen.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Dauerhafter Molly-Kommunikationsfehler!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly konnte nicht für die Google-Play-Dienste registriert werden. Molly-Nachrichten und ‑Anrufe wurden daher deaktiviert. Bitte registriere Molly erneut in Molly → Einstellungen → Datenschutz → Erweiterte Einstellungen.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Diagnoseprotokolle helfen uns, das Problem zu erkennen und zu beheben; sie enthalten keine persönlichen Informationen.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal hat ein Problem festgestellt. Diagnoseprotokoll übermitteln?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly hat ein Problem festgestellt. Diagnoseprotokoll übermitteln?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Benachrichtigungen können sich wegen der Funktion Akku-Optimierung verzögern</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Du kannst die Funktion Akku-Optimierung für Signal deaktivieren, um sicherzustellen, dass sich Nachrichten-Benachrichtigungen nicht verzögern.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Du kannst die Funktion Akku-Optimierung für Molly deaktivieren, um sicherzustellen, dass sich Nachrichten-Benachrichtigungen nicht verzögern.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Benachrichtigungen können sich wegen Akku-Optimierungen verzögern</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Deaktiviere die Akku-Optimierung für Molly, um sicherzustellen, dass Benachrichtigungen nicht verzögert angezeigt werden. Tippe auf »Weiter«, um gerätespezifische Anweisungen anzuzeigen.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Nein danke</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Fortfahren</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Fortfahren</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Verwerfen</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Nein danke</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Ausstehende Gruppeneinladungen</string>
+    <string name="PendingMembersActivity_pending_group_invites">Anfragen &amp; Einladungen</string>
     <string name="PendingMembersActivity_requests">Anfragen</string>
     <string name="PendingMembersActivity_invites">Einladungen</string>
     <string name="PendingMembersActivity_people_you_invited">Von dir eingeladene Personen</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Abbrechen</string>
     <string name="InviteActivity_sending">Wird versendet …</string>
     <string name="InviteActivity_invitations_sent">Einladungen versendet!</string>
-    <string name="InviteActivity_invite_to_signal">Zu Signal einladen</string>
+    <string name="InviteActivity_invite_to_signal">Zu Molly einladen</string>
     <string name="InviteActivity_send_sms">SMS senden (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">%1$d SMS-Einladung senden?</item>
         <item quantity="other">%1$d SMS-Einladungen senden?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Lass uns zu »Signal« wechseln: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Lass uns zu »Molly« wechseln: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Es sieht so aus, als hättest du keine zum Teilen geeignete Apps installiert.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Deine Nachricht</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Hintergrundverbindung aktiviert</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Antworten</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal-Anruf wird gestartet</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly-Anruf wird gestartet</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Den Signal-Anrufdienst starten</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal-Anrufdienst wird gestoppt</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Den Molly-Anrufdienst starten</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly-Anrufdienst wird gestoppt</string>
     <string name="NotificationBarManager__cancel_call">Anruf abbrechen</string>
 
     <!-- NotificationsMegaphone -->
@@ -1531,9 +1604,9 @@
     <string name="MessageRecord_the_group_description_has_changed">Die Gruppenbeschreibung wurde geändert.</string>
 
     <!-- GV2 avatar change -->
-    <string name="MessageRecord_you_changed_the_group_avatar">Du hast den Gruppenavatar geändert.</string>
-    <string name="MessageRecord_s_changed_the_group_avatar">%1$s hat den Gruppenavatar geändert.</string>
-    <string name="MessageRecord_the_group_group_avatar_has_been_changed">Der Gruppenavatar wurde geändert.</string>
+    <string name="MessageRecord_you_changed_the_group_avatar">Du hast das Gruppenbild geändert.</string>
+    <string name="MessageRecord_s_changed_the_group_avatar">%1$s hat das Gruppenbild geändert.</string>
+    <string name="MessageRecord_the_group_group_avatar_has_been_changed">Das Gruppenbild wurde geändert.</string>
 
     <!-- GV2 attribute access level change -->
     <string name="MessageRecord_you_changed_who_can_edit_group_info_to_s">Du hast die Berechtigung »Gruppendetails bearbeiten« zu »%1$s« geändert.</string>
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Du hast Zahlungen aktiviert</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s kann Zahlungen jetzt akzeptieren.</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Zahlungsinformationen sind nicht verfügbar</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Antippen für mehr</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Zahlungsinformationen nicht verfügbar</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Die Details dieser Zahlung sind nicht verfügbar, weil deine Nachrichten aus einer Quelle wiederhergestellt wurden, die diesen Zahlungsverlauf nicht enthielt. Dies hat keine Auswirkungen auf deinen Kontostand oder den Status vergangener Zahlungen.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Du wirst bald keine SMS-Nachrichten mehr von Signal aus versenden können. Lade %1$s zu Signal ein, damit die Unterhaltung hier weitergeht.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Du kannst in Signal keine SMS-Nachrichten mehr versenden. Lade %1$s zu Signal ein, damit die Unterhaltung hier weitergeht.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Du kannst in Molly keine SMS-Nachrichten mehr versenden. Lade %1$s zu Molly ein, damit die Unterhaltung hier weitergeht.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Zahlung: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Zahlung</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Als Spam gemeldet</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Signal-Gerät koppeln?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Du versuchst offenbar, ein Signal-Gerät mithilfe einer fremden Scanner-App zu koppeln. Bitte scanne den QR-Code zu deinem Schutz direkt in Signal ein.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal benötigt die Berechtigung »Kamera« für das Einscannen von QR-Codes, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Kamera«.</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly benötigt die Berechtigung »Kamera« für das Einscannen von QR-Codes, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Kamera«.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">QR-Codes können ohne die Berechtigung »Kamera« nicht eingescannt werden.</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Passphrase eingeben</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal-Symbol</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly-Symbol</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Passphrase übermitteln</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Passphrase ungültig!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signal entsperren</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android – Sperrbildschirm</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Molly entsperren</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android – Sperrbildschirm</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Karte</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Verifizieren um weiter Nachrichten zu versenden</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Hilf dabei, Spam auf Signal zu verhindern, und schließe die Verifizierung ab.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Hilf dabei, Spam auf Molly zu verhindern, und schließe die Verifizierung ab.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Nach abgeschlossener Verifizierung kannst du wieder Nachrichten senden. Alle pausierten Nachrichten werden dann automatisch versendet.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Meine Story</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal-Anruf</string>
+    <string name="Recipient_signal_call">Molly-Anruf</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Blockieren</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Klingelt …</string>
     <string name="RedPhone_busy">Besetzt</string>
     <string name="RedPhone_recipient_unavailable">Empfänger nicht erreichbar</string>
-    <string name="RedPhone_network_failed">Netzwerkfehler!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Netzwerkfehler! Bitte überprüfe deine Netzwerkverbindung und versuche es erneut.</string>
     <string name="RedPhone_number_not_registered">Telefonnummer nicht registriert!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Die gewählte Telefonnummer unterstützt keine verschlüsselten Anrufe!</string>
     <string name="RedPhone_got_it">Verstanden</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Hier antippen, um Videoübertragung zu aktivieren</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Um %1$s anzurufen, benötigt Signal Zugriff auf deine Kamera</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Um %1$s anzurufen, benötigt Molly Zugriff auf deine Kamera</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Anrufen …</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Verbindung wird neu hergestellt …</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Aus dem Anruf entfernen</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Jemand hat dich aus dem Anruf entfernt.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Zugriff auf deine Kamera und dein Mikrofon erlauben</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Zugriff auf dein Mikrofon erlauben</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Zugriff auf deine Kamera erlauben</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Molly benötigt Zugriff auf deine Kamera und dein Mikrofon, um einen Anruf zu starten oder einem Anruf beizutreten.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Molly benötigt Zugriff auf dein Mikrofon, um einen Anruf zu starten oder einem Anruf beizutreten.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Erlaube Molly Zugriff auf deine Kamera, um die Videoübertragung zu aktivieren.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly benötigt die Berechtigung »Mikrofon«, um einen Anruf zu starten oder einem Anruf beizutreten.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly benötigt Zugriff auf deine Kamera, um die Videoübertragung zu aktivieren</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Anruf starten oder Anruf beitreten:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Die Videoübertragung aktivieren:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal-Anruf</string>
-    <string name="WebRtcCallView__signal_video_call">Signal-Videoanruf</string>
+    <string name="WebRtcCallView__signal_call">Molly-Anruf</string>
+    <string name="WebRtcCallView__signal_video_call">Molly-Videoanruf</string>
     <string name="WebRtcCallView__start_call">Anruf starten</string>
     <string name="WebRtcCallView__join_call">Anruf beitreten</string>
     <string name="WebRtcCallView__call_is_full">Anruf ist voll</string>
@@ -2031,20 +2135,39 @@
     <string name="CallOverflowPopupWindow__lower_hand">Hand senken</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Abbrechen</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Du hast deine Hand gehoben</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Anzeigen</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s hat die Hand gehoben</item>
-        <item quantity="other">%1$s + %2$d haben ihre Hand gehoben</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s hast die Hand gehoben</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d haben die Hand gehoben</item>
+        <item quantity="other">%1$s + %2$d haben die Hand gehoben</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s hat die Hand gehoben</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d haben die Hand gehoben</item>
+        <item quantity="other">%1$s + %2$d haben die Hand gehoben</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
-        <item quantity="one">%1$s</item>
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s +%2$d</item>
+        <item quantity="other">%1$s + %2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
+        <item quantity="one">%1$s +%2$d</item>
         <item quantity="other">%1$s + %2$d</item>
     </plurals>
 
@@ -2082,8 +2205,8 @@
         <item quantity="other">In diesem Anruf (%1$d)</item>
     </plurals>
     <plurals name="CallParticipantsListDialog__signal_will_ring">
-        <item quantity="one">Signal ruft an (%1$d)</item>
-        <item quantity="other">Signal ruft an (%1$d)</item>
+        <item quantity="one">Signal wird klingeln (%1$d)</item>
+        <item quantity="other">Signal wird klingeln (%1$d)</item>
     </plurals>
     <plurals name="CallParticipantsListDialog__signal_will_notify">
         <item quantity="one">Signal sendet eine Nachricht (%1$d)</item>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Du erhältst einen Anruf zur Verifizierung dieser Telefonnummer.</string>
     <string name="RegistrationActivity_edit_number">Telefonnummer bearbeiten</string>
     <string name="RegistrationActivity_missing_google_play_services">Fehlende Google-Play-Dienste</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Auf diesem Gerät fehlen die Google-Play-Dienste. Signal kann immer noch verwendet werden, allerdings beeinträchtigt diese Konfiguration eventuell die Zuverlässigkeit oder die Leistung.\n\nFalls du kein erfahrener Nutzer bist, kein Custom-ROM verwendest oder glaubst, dass diese Meldung irrtümlich angezeigt wird, kontaktiere bitte support@signal.org für Hilfe bei der Problembehandlung.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Auf diesem Gerät fehlen die Google-Play-Dienste. Molly kann immer noch verwendet werden, allerdings beeinträchtigt diese Konfiguration eventuell die Zuverlässigkeit oder die Leistung.\n\nFalls du kein erfahrener Nutzer bist, kein Custom-ROM verwendest oder glaubst, dass diese Meldung irrtümlich angezeigt wird, kontaktiere bitte support@molly.im für Hilfe bei der Problembehandlung.</string>
     <string name="RegistrationActivity_i_understand">Verstanden</string>
     <string name="RegistrationActivity_play_services_error">Fehler bei den Google-Play-Diensten</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google-Play-Dienste werden aktualisiert oder sind vorübergehend nicht verfügbar. Bitte versuche es erneut.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Nicht standardisiertes Zahlenformat</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Die eingegebene Telefonnummer (%1$s) scheint nicht im Standardformat zu sein.\n\nHast du %2$s gemeint?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Telefonnummernformat</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Telefonnummernformat</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Anruf angefordert</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Probleme bei der Anmeldung?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Vergewissere dich, dass dein Mobiltelefon ein Mobilfunksignal hat, um deine SMS oder deinen Anruf zu empfangen\n • Bestätige, dass du unter dieser Telefonnummer einen Anruf empfangen kannst\n • Überprüfe, ob du deine Telefonnummer richtig eingegeben hast.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Für weitere Infos folge bitte diesen Schritten zur Fehlerbehebung oder kontaktiere den Support</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Um weitere Informationen zu erhalten, folge bitte %1$s oder wähle %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">diesen Schritten zur Fehlerbehebung</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2196,7 +2319,7 @@
     <!-- RegistrationLockV2Dialog -->
     <string name="RegistrationLockV2Dialog_turn_on_registration_lock">Registrierungssperre einschalten?</string>
     <string name="RegistrationLockV2Dialog_turn_off_registration_lock">Registrierungssperre ausschalten?</string>
-    <string name="RegistrationLockV2Dialog_if_you_forget_your_signal_pin_when_registering_again">Falls du beim erneuten Registrieren von Signal deine Signal-PIN vergisst, wird dein Konto für sieben Tage gesperrt.</string>
+    <string name="RegistrationLockV2Dialog_if_you_forget_your_signal_pin_when_registering_again">Falls du beim erneuten Registrieren von Signal deine Signal-PIN nicht mehr weißt, wird dein Konto für sieben Tage gesperrt.</string>
     <string name="RegistrationLockV2Dialog_turn_on">Einschalten</string>
     <string name="RegistrationLockV2Dialog_turn_off">Ausschalten</string>
 
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Zu Kontakten hinzufügen</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Zu Signal einladen</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Zu Molly einladen</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal-Nachricht</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal-Anruf</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Zu Kontakten hinzufügen</string>
-    <string name="SharedContactView_invite_to_signal">Zu Signal einladen</string>
+    <string name="SharedContactView_invite_to_signal">Zu Molly einladen</string>
     <string name="SharedContactView_message">Signal-Nachricht</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s gehört zu %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal-Aktualisierung</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Eine neue Signal-Version ist verfügbar. Zum Aktualisieren antippen.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal konnte nicht aktualisiert werden</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly-Aktualisierung</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Eine neue Molly-Version ist verfügbar. Zum Aktualisieren antippen.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly konnte nicht aktualisiert werden</string>
     <string name="ApkUpdateNotifications_failed_general_body">Wir versuchen es später erneut.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal wurde erfolgreich aktualisiert</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly wurde erfolgreich aktualisiert</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Du wurdest automatisch auf Version %1$s aktualisiert.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Unsere Signal-Sicherheitsnummer:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Anscheinend hast du keine zum Teilen geeigneten Apps installiert.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Keine zu vergleichende Sicherheitsnummer in der Zwischenablage gefunden</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal benötigt die Berechtigung »Kamera« für das Einscannen von QR-Codes, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Kamera«.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly benötigt die Berechtigung »Kamera« für das Einscannen von QR-Codes, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Kamera«.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">QR-Codes können ohne die Berechtigung »Kamera« nicht eingescannt werden.</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Du musst zuerst Nachrichten mit %1$s austauschen, um die Sicherheitsnummer sehen zu können.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Zum Öffnen antippen.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal ist entsperrt</string>
-    <string name="KeyCachingService_lock">Signal sperren</string>
+    <string name="KeyCachingService_passphrase_cached">Molly ist entsperrt</string>
+    <string name="KeyCachingService_lock">Molly sperren</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Du</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Nicht unterstützter Medieninhalt</string>
     <string name="MediaPreviewActivity_draft">Entwurf</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal benötigt die Berechtigung »Speicher« für das Speichern in den Gerätespeicher, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Speicher«.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly benötigt die Berechtigung »Speicher« für das Speichern in den Gerätespeicher, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Speicher«.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Speichern in den Gerätespeicher ohne Berechtigungen nicht möglich.</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Nachricht löschen?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Dies wird diese Nachricht unwiderruflich löschen.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Nachricht konnte nicht zugestellt werden.</string>
     <string name="MessageNotifier_error_delivering_message">Fehler beim Zustellen der Nachricht</string>
     <string name="MessageNotifier_message_delivery_paused">Nachrichtenzustellung pausiert.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifizieren zum Senden weiterer Nachrichten mit Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifizieren zum Senden weiterer Nachrichten mit Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Alle gelesen</string>
     <string name="MessageNotifier_mark_read">Gelesen</string>
     <string name="MessageNotifier_turn_off_these_notifications">Diese Benachrichtigungen ausschalten</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Hat mit %1$s auf deinen Sticker reagiert.</string>
     <string name="MessageNotifier_this_message_was_deleted">Diese Nachricht wurde gelöscht.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Benachrichtigungen über neue Signal-Kontakte ausschalten? Du kannst sie wieder einschalten in Signal → Einstellungen → Benachrichtigungen.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Benachrichtigungen über neue Molly-Kontakte ausschalten? Du kannst sie wieder einschalten in Molly → Einstellungen → Benachrichtigungen.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2565,7 +2688,7 @@
     <string name="NotificationChannel_group_chats">Chats</string>
     <string name="NotificationChannel_missing_display_name">Unbekannt</string>
     <string name="NotificationChannel_voice_notes">Sprachnachrichten</string>
-    <string name="NotificationChannel_contact_joined_signal">Neuer Signal-Kontakt</string>
+    <string name="NotificationChannel_contact_joined_signal">Neuer Kontakt nutzt Signal</string>
     <string name="NotificationChannels__no_activity_available_to_open_notification_channel_settings">Keine Aktivität verfügbar, um die Einstellungen für den Benachrichtigungskanal zu öffnen.</string>
     <!-- Notification channel name for showing persistent background connection on devices without push notifications -->
     <string name="NotificationChannel_background_connection">Hintergrundverbindung</string>
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Schnellantwort nicht verfügbar, solange Signal gesperrt ist!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Schnellantwort nicht verfügbar, solange Molly gesperrt ist!</string>
     <string name="QuickResponseService_problem_sending_message">Problem beim Senden der Nachricht!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Ungültige Verknüpfung</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Neue Nachricht</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Unterhaltungsanfrage</string>
     <string name="SingleRecipientNotificationBuilder_you">Du</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Dieses Gerät ist nicht mehr registriert. Das liegt wahrscheinlich daran, dass du deine Telefonnummer mit Signal auf einem anderen Gerät registriert hast.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Dieses Gerät ist nicht mehr registriert. Das liegt wahrscheinlich daran, dass du deine Telefonnummer mit Molly auf einem anderen Gerät registriert hast.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Gerät erneut registrieren</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Zum Annehmen des Anrufs benötigt Signal Zugriff auf dein Mikrofon.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Zum Annehmen des Anrufs benötigt Molly Zugriff auf dein Mikrofon.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Um den Videoanruf zu beantworten, musst du Signal Zugriff auf dein Mikrofon und deine Kamera geben.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal benötigt für Anrufe die Berechtigungen »Mikrofon« und »Kamera«, diese wurden jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Mikrofon« und »Kamera«.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Um den Videoanruf zu beantworten, musst du Molly Zugriff auf dein Mikrofon und deine Kamera geben.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly benötigt für Anrufe die Berechtigungen »Mikrofon« und »Kamera«, diese wurden jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Mikrofon« und »Kamera«.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Auf einem gekoppelten Gerät angenommen.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Auf einem gekoppelten Gerät abgelehnt.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Auf einem gekoppelten Gerät besetzt.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Neue Passphrase wiederholen</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Zu Signal einladen</string>
+    <string name="contact_selection_activity__invite_to_signal">Zu Molly einladen</string>
     <string name="contact_selection_activity__new_group">Neue Gruppe</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Kontakte aktualisieren</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Fehlt jemand? Versuche es mit Aktualisieren</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Leute auf Signal finden, die du kennst</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Zugriff auf deine Kontakte erlauben</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Mehr</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Kontaktbild</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal benötigt zum Anzeigen deiner Kontakte die Berechtigung »Kontakte«, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Kontakte«.</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly benötigt zum Anzeigen deiner Kontakte die Berechtigung »Kontakte«, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Kontakte«.</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Kontakte konnten nicht abgerufen werden. Überprüfe bitte deine Netzverbindung.</string>
     <string name="ContactSelectionListFragment_username_not_found">Nutzername nicht gefunden</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"»%1$s« ist kein Signal-Nutzer. Bitte überprüfe den Nutzernamen und versuche es erneut."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Nach Nutzernamen suchen</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Zugriff auf Kontakte erlauben</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Um auf Signal Leute zu finden, die du kennst:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Zugriff erlauben</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Nein danke</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Zugriff auf deine Kontakte erlauben. Deine Kontakte sind verschlüsselt und für den Signal-Dienst nicht sichtbar.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal benötigt Zugriff auf deine Kontakte, um sie anzeigen zu können.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly benötigt Zugriff auf deine Kontakte, um sie anzeigen zu können.</string>
     <string name="contact_selection_list_fragment__show_contacts">Kontakte anzeigen</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Diese Person wurde entfernt. Wenn du ihr erneut eine Nachricht schickst, wird sie wieder zur Liste hinzugefügt.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Optionen</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Aktualisieren</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Abspielen … Pause</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Bubbles sind eine Android-Funktion, die du für Signal-Chats deaktivieren kannst.</string>
+    <string name="BubbleOptOutTooltip__description">Bubbles sind eine Android-Funktion, die du für Molly-Chats deaktivieren kannst.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Jetzt nicht</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Gruppenbeschreibung</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Signal aktualisieren</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Molly aktualisieren</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Diese Signal-Version ist abgelaufen. Jetzt aktualisieren, um Signal weiterhin verwenden zu können.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Diese Molly-Version ist abgelaufen. Jetzt aktualisieren, um Molly weiterhin verwenden zu können.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Aktualisieren</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3175,7 +3302,7 @@
 
     <string name="arrays__name_and_message">Name und Nachricht</string>
     <string name="arrays__name_only">Nur Name</string>
-    <string name="arrays__no_name_or_message">Weder Name noch Nachricht</string>
+    <string name="arrays__no_name_or_message">Kein Name und Inhalt</string>
 
     <string name="arrays__images">Bilder</string>
     <string name="arrays__audio">Audio</string>
@@ -3208,7 +3335,7 @@
     <!-- Preference menu item description for a toggle switch for preserving the archived state of muted chats. -->
     <string name="preferences__muted_chats_that_are_archived_will_remain_archived">Stummgeschaltete Chats, die archiviert sind, bleiben beim Eintreffen einer neuen Nachricht archiviert.</string>
     <string name="preferences__generate_link_previews">Link-Vorschauen erzeugen</string>
-    <string name="preferences__retrieve_link_previews_from_websites_for_messages">Für zu versendende Nachrichten Link-Vorschauen direkt von den verlinkten Webseiten abrufen</string>
+    <string name="preferences__retrieve_link_previews_from_websites_for_messages">Für zu versendende Nachrichten Link-Vorschauen direkt von den verlinkten Webseiten abrufen.</string>
     <string name="preferences__change_passphrase">Passphrase ändern</string>
     <string name="preferences__change_your_passphrase">Deine Passphrase ändern</string>
     <string name="preferences__enable_passphrase">Passphrasengeschützte Bildschirmsperre aktivieren</string>
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Langsam</string>
     <string name="preferences__help">Hilfe</string>
     <string name="preferences__advanced">Erweiterte Einstellungen</string>
-    <string name="preferences__donate_to_signal">An Signal spenden</string>
+    <string name="preferences__donate_to_signal">An Molly spenden</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Datenschutz</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Ändere App-Symbol und Name zu »%1$s«</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal muss beendet werden, um das App-Symbol und den Namen zu ändern. Bei Benachrichtigungen werden immer das Standardsymbol von Signal und der Name angezeigt.</string>
+    <string name="preferences__app_icon_dialog_description">Molly muss beendet werden, um das App-Symbol und den Namen zu ändern. Bei Benachrichtigungen werden immer das Standardsymbol von Molly und der Name angezeigt.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Wähle ein App-Symbol und einen Namen aus, die dann auf dem Startbildschirm und im App-Drawer deines Mobiltelefons angezeigt werden. Bei Benachrichtigungen werden immer das Standard-Icon von Signal und der Name angezeigt. Mehr erfahren</string>
+    <string name="preferences__app_icon_warning_learn_more">Wähle ein App-Symbol und einen Namen aus, die dann auf dem Startbildschirm und im App-Drawer deines Mobiltelefons angezeigt werden. Bei Benachrichtigungen werden immer das Standard-Icon von Molly und der Name angezeigt. Mehr erfahren</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">App-Symbole und Namen werden auf dem Startbildschirm und im App-Drawer deines Mobiltelefons angezeigt.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Bei Benachrichtigungen werden immer das Standard-Icon von Signal und der Name angezeigt.</string>
+    <string name="preferences__app_icon_notification_warning">Bei Benachrichtigungen werden immer das Standard-Icon von Molly und der Name angezeigt.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Mehr erfahren</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Dies wird alle Chats bis auf die letzten %1$s Nachrichten je Chat unwiderruflich löschen.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Dies wird alle Nachrichtenverläufe und Medieninhalte unwiderruflich von deinem Gerät löschen.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Dadurch werden alle Nachrichtenverläufe und Medien von diesem Gerät und allen gekoppelten Geräten dauerhaft gelöscht.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Möchtest du wirklich alle Nachrichtenverläufe löschen?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Alle Nachrichtenverläufe werden dauerhaft gelöscht. Dies kann nicht rückgängig gemacht werden.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Alle Nachrichtenverläufe werden dauerhaft von allen Geräten gelöscht Dies kann nicht rückgängig gemacht werden.</string>
     <string name="preferences_storage__delete_all_now">Alle jetzt löschen</string>
     <string name="preferences_storage__forever">Für immer</string>
     <string name="preferences_storage__one_year">1 Jahr</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Zensurumgehung</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Zensurumgehung</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Bei Aktivierung wird Signal versuchen, Zensurmaßnahmen zu umgehen. Aktiviere diese Funktion nur dann, wenn du dich an einem Ort befindest, an dem Signal zensiert wird.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Bei Aktivierung wird Molly versuchen, Zensurmaßnahmen zu umgehen. Aktiviere diese Funktion nur dann, wenn du dich an einem Ort befindest, an dem Molly zensiert wird.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Die Zensurumgehung wurde aufgrund der Telefonnummer deines Nutzerkontos aktiviert.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Neu: Zahlungen</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Nutze Signal für das Senden und Empfangen von MobileCoin, einer neuen, auf Datenschutz ausgerichteten digitalen Währung.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Nutze Molly für das Senden und Empfangen von MobileCoin, einer neuen, auf Datenschutz ausgerichteten digitalen Währung.</string>
     <string name="PaymentsHomeFragment__activate_payments">Zahlungen aktivieren</string>
     <string name="PaymentsHomeFragment__activating_payments">Zahlungen werden aktiviert …</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Zahlungskonto wiederherstellen</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Zahlungen sind in deiner Region nicht verfügbar.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Zahlungen konnten nicht aktiviert werden. Bitte versuche es später erneut.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Zahlungen deaktivieren?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Du wirst in Signal keine MobileCoin senden oder empfangen können, falls du Zahlungen deaktivierst.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Du wirst in Molly keine MobileCoin senden oder empfangen können, falls du Zahlungen deaktivierst.</string>
     <string name="PaymentsHomeFragment__deactivate">Deaktivieren</string>
     <string name="PaymentsHomeFragment__continue">Fortfahren</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Kontostand ist aktuell nicht verfügbar.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Details</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Du kannst Signal verwenden, um MobileCoin zu senden und zu empfangen. Alle Zahlungen unterliegen den Nutzungsbedingungen für MobileCoins und der MobileCoin-Wallet. Möglicherweise können einige Probleme auftreten und eventuell verlorene Zahlungen oder Kontostände nicht wiederhergestellt werden. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Du kannst Molly verwenden, um MobileCoin zu senden und zu empfangen. Alle Zahlungen unterliegen den Nutzungsbedingungen für MobileCoins und der MobileCoin-Wallet. Möglicherweise können einige Probleme auftreten und eventuell verlorene Zahlungen oder Kontostände nicht wiederhergestellt werden. </string>
     <string name="PaymentsHomeFragment__activate">Aktivieren</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoin-Bedingungen anzeigen</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Zahlungen in Signal sind nicht mehr verfügbar. Du kannst weiterhin Guthaben an eine Handelsplattform überweisen, aber keine Zahlungen senden und empfangen oder Guthaben hinzufügen.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Zahlungen in Molly sind nicht mehr verfügbar. Du kannst weiterhin Guthaben an eine Handelsplattform überweisen, aber keine Zahlungen senden und empfangen oder Guthaben hinzufügen.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Berechtigungen gewähren</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Signal fordert diese Berechtigungen an, damit du Nachrichten an Personen verschicken kannst, die du kennst. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Molly fordert diese Berechtigungen an, damit du Nachrichten an Personen verschicken kannst, die du kennst. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Benachrichtigungen</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Weiter</string>
     <string name="PaymentsTransferFragment__invalid_address">Ungültige Adresse</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Überprüfe die Wallet-Adresse, an die du überweisen möchtest, und versuche es erneut.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Du kannst nicht an die Adresse deines eigenen Signal-Wallets überweisen. Gib die Wallet-Adresse deines Kontos bei einer unterstützen Handelsplattform ein.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Um QR-Codes einzuscannen, benötigt Signal Zugriff auf deine Kamera</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal benötigt die Berechtigung »Kamera« für das Einscannen von QR-Codes. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Kamera«.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Um QR-Codes einzuscannen, benötigt Signal Zugriff auf deine Kamera</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Du kannst nicht an die Adresse deines eigenen Molly-Wallets überweisen. Gib die Wallet-Adresse deines Kontos bei einer unterstützen Handelsplattform ein.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Um QR-Codes einzuscannen, benötigt Molly Zugriff auf deine Kamera</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly benötigt die Berechtigung »Kamera« für das Einscannen von QR-Codes. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Kamera«.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Um QR-Codes einzuscannen, benötigt Molly Zugriff auf deine Kamera</string>
     <string name="PaymentsTransferFragment__settings">Einstellungen</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3784,7 +3915,7 @@
     <!-- text_secure_normal -->
     <string name="text_secure_normal__menu_new_group">Neue Gruppe</string>
     <string name="text_secure_normal__menu_settings">Einstellungen</string>
-    <string name="text_secure_normal__menu_clear_passphrase">Signal sperren</string>
+    <string name="text_secure_normal__menu_clear_passphrase">Molly sperren</string>
     <string name="text_secure_normal__mark_all_as_read">Alle gelesen</string>
     <string name="text_secure_normal__invite_friends">Freunde einladen</string>
     <!-- Overflow menu entry to filter unread chats -->
@@ -3797,7 +3928,7 @@
     <string name="verify_display_fragment_context_menu__compare_with_clipboard">Mit Zwischenablage vergleichen</string>
 
     <!-- reminder_header -->
-    <string name="reminder_header_service_outage_text">Signal hat derzeit technische Schwierigkeiten. Wir arbeiten hart daran, den Betrieb so schnell wie möglich wiederherzustellen.</string>
+    <string name="reminder_header_service_outage_text">Signal hat derzeit technische Schwierigkeiten. Wir arbeiten daran, den Betrieb so schnell wie möglich wiederherzustellen.</string>
     <string name="reminder_header_progress">%1$d %%</string>
     <!-- Body text of a banner that will show at the top of the chat list when we temporarily cannot process the user\'s contacts -->
     <string name="reminder_cds_warning_body">Die private Kontaktsuche von Signal kann die Kontakte deines Mobiltelefons vorübergehend nicht verarbeiten.</string>
@@ -3840,7 +3971,7 @@
         <item quantity="other">PIN muss aus mindestens %1$d Ziffern bestehen</item>
     </plurals>
     <string name="CreateKbsPinFragment__create_a_new_pin">Neue PIN erstellen</string>
-    <string name="CreateKbsPinFragment__you_can_choose_a_new_pin_as_long_as_this_device_is_registered">Du kannst deine PIN solange ändern, wie dieses Gerät registriert ist.</string>
+    <string name="CreateKbsPinFragment__you_can_choose_a_new_pin_as_long_as_this_device_is_registered">Du kannst deine PIN ändern, solange dieses Gerät registriert ist.</string>
     <string name="CreateKbsPinFragment__create_your_pin">Deine PIN erstellen</string>
     <string name="CreateKbsPinFragment__pins_can_help_you_restore_your_account">PINs können dir helfen, dein Konto wiederherzustellen und deine Daten bei Signal verschlüsselt zu halten. </string>
     <string name="CreateKbsPinFragment__choose_a_stronger_pin">Wähle eine stärkere PIN</string>
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Eingehender Signal-Sprachanruf</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Eingehender Molly-Sprachanruf</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Eingehender Signal-Videoanruf</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Eingehender Molly-Videoanruf</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Eingehender Signal-Gruppenanruf</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Eingehender Molly-Gruppenanruf</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Laufender Signal-Sprachanruf</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Laufender Molly-Sprachanruf</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Laufender Signal-Videoanruf</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Laufender Molly-Videoanruf</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Laufender Signal-Gruppenanruf</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Laufender Molly-Gruppenanruf</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Wird geladen …</string>
@@ -3974,7 +4105,7 @@
     <string name="RegistrationActivity_restore_from_backup">Aus Sicherung wiederherstellen?</string>
     <string name="RegistrationActivity_restore_your_messages_and_media_from_a_local_backup">Stelle deine Nachrichten und Medieninhalte aus einer lokalen Datensicherung wieder her. Falls du sie jetzt nicht wiederherstellst, wirst du dies später nicht mehr nachholen können.</string>
     <string name="RegistrationActivity_backup_size_s">Sicherungsgröße: %1$s</string>
-    <string name="RegistrationActivity_backup_timestamp_s">Sicherungszeitstempel: %1$s</string>
+    <string name="RegistrationActivity_backup_timestamp_s">Zeitpunkt der Sicherung: %1$s</string>
     <string name="BackupDialog_enable_local_backups">Lokale Sicherungen aktivieren?</string>
     <string name="BackupDialog_enable_backups">Sicherungen aktivieren</string>
     <string name="BackupDialog_please_acknowledge_your_understanding_by_marking_the_confirmation_check_box">Bitte bestätige durch Markieren des Kästchens, dass du alles verstanden hast.</string>
@@ -3984,17 +4115,17 @@
     <string name="BackupDialog_to_enable_backups_choose_a_folder">Um Datensicherungen zu aktivieren, wähle einen Ordner. Sicherungen werden dort gespeichert.</string>
     <string name="BackupDialog_choose_folder">Ordner wählen</string>
     <string name="BackupDialog_copied_to_clipboard">In Zwischenablage kopiert</string>
-    <string name="BackupDialog_no_file_picker_available">Keine Dateimanager verfügbar.</string>
+    <string name="BackupDialog_no_file_picker_available">Kein Dateimanager verfügbar.</string>
     <string name="BackupDialog_enter_backup_passphrase_to_verify">Gib deine Sicherungspassphrase ein</string>
     <string name="BackupDialog_verify">Bestätigen</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Du hast deine Sicherungspassphrase richtig eingegeben</string>
     <string name="BackupDialog_passphrase_was_not_correct">Sicherungspassphrase war falsch</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signal-Sicherung wird erstellt …</string>
+    <string name="LocalBackupJob_creating_signal_backup">Molly-Sicherung wird erstellt …</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Signal-Datensicherung wird überprüft…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Molly-Sicherung wird überprüft…</string>
     <string name="LocalBackupJobApi29_backup_failed">Datensicherung gescheitert</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Dein Verzeichnis für die Datensicherung wurde gelöscht oder verschoben.</string>
-    <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Deine Sicherungsdatei ist zu groß, um auf diesem Laufwerk gespeichert zu werden.</string>
+    <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Deine Sicherungsdatei ist zu groß, um auf diesem Datenträger gespeichert zu werden.</string>
     <string name="LocalBackupJobApi29_there_is_not_enough_space">Es ist nicht genug Speicherplatz verfügbar, um deine Datensicherung zu speichern.</string>
     <!-- Error message shown if a newly created backup could not be verified as accurate -->
     <string name="LocalBackupJobApi29_your_backup_could_not_be_verified">Deine letzte Datensicherung konnte nicht erstellt und überprüft werden. Bitte erstelle eine neue Datensicherung.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Ruf mich an (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Code erneut senden (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Signal-Support kontaktieren</string>
-    <string name="RegistrationActivity_code_support_subject">Signal-Registrierung – Verifizierungscode für Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Molly-Support kontaktieren</string>
+    <string name="RegistrationActivity_code_support_subject">Molly-Registrierung – Verifizierungscode für Android</string>
     <string name="RegistrationActivity_incorrect_code">Falscher Code</string>
     <string name="BackupUtil_never">Nie</string>
     <string name="BackupUtil_unknown">Unbekannt</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Telefonnummer</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Festlegen wer deine Telefonnummer sehen kann und wer dich auf Signal mit ihr kontaktieren kann.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Festlegen wer deine Telefonnummer sehen kann und wer dich auf Molly mit ihr kontaktieren kann.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Wer kann meine Telefonnummer sehen</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4041,7 +4172,7 @@
     <string name="PhoneNumberPrivacy_nobody">Niemand</string>
     <string name="preferences_app_protection__screen_lock">Bildschirmsperre</string>
     <string name="preferences_app_protection__lock_signal_access_with_android_screen_lock_or_fingerprint">Zugriff auf Signal mit Android-Bildschirmsperre oder Fingerabdruck sperren</string>
-    <string name="preferences_app_protection__screen_lock_inactivity_timeout">Autom. Sperre bei Inaktivität</string>
+    <string name="preferences_app_protection__screen_lock_inactivity_timeout">Automatische Sperre bei Inaktivität</string>
     <string name="preferences_app_protection__signal_pin">Signal-PIN</string>
     <string name="preferences_app_protection__create_a_pin">Erstelle eine PIN</string>
     <string name="preferences_app_protection__change_your_pin">PIN ändern</string>
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Du hast zu viele Versuche benötigt. Bitte versuche es später erneut.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Fehler beim Verbinden mit Dienst</string>
     <string name="preferences_chats__backups">Datensicherungen</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal ist gesperrt</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly ist gesperrt</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">ZUM ENTSPERREN ANTIPPEN</string>
     <string name="Recipient_unknown">Unbekannt</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4091,11 +4222,18 @@
     <string name="TransferOrRestoreFragment__transfer_from_android_device">Von Android-Gerät übertragen</string>
     <string name="TransferOrRestoreFragment__transfer_your_account_and_messages_from_your_old_android_device">Übertrage dein Konto und deinen Nachrichtenverlauf von deinem alten Android-Gerät. Du benötigst Zugriff auf dein altes Gerät.</string>
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Du benötigst Zugriff auf dein altes Gerät.</string>
-    <string name="TransferOrRestoreFragment__restore_from_backup">Aus Datensicherung wiederherstellen</string>
+    <string name="TransferOrRestoreFragment__restore_from_backup">Aus Sicherung wiederherstellen</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Stelle deine Nachrichten aus einer lokalen Datensicherung wieder her. Falls du sie jetzt nicht wiederherstellst, wirst du dies später nicht mehr nachholen können.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Lokale Datensicherung wiederherstellen</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signal Datensicherung wiederherstellen</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Stelle all deine Textnachrichten und Medien der letzten 30 Tage wieder her</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Weitere Optionen</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Abbrechen</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Ohne Übertragung einloggen</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Fortfahren, ohne deine Nachrichten und Medien zu übertragen</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Öffne Signal auf deinem alten Android-Mobiltelefon</string>
     <string name="NewDeviceTransferInstructions__continue">Fortfahren</string>
@@ -4108,21 +4246,21 @@
 
     <!-- NewDeviceTransferSetupFragment -->
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Verbindung zum alten Android-Gerät wird vorbereitet …</string>
-    <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Etwas Geduld bitte, sollte bald bereit sein</string>
+    <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Einen Moment bitte, sollte bald bereit sein</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Warten auf Verbindung mit altem Android-Gerät …</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal benötigt die Berechtigung »Standort«, um dein altes Android-Gerät zu erkennen und zu verbinden.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal benötigt aktivierte Standortdienste, um dein altes Android-Gerät zu erkennen und zu verbinden.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal benötigt eingeschaltetes WLAN, um dein altes Android-Gerät zu erkennen und zu verbinden. WLAN muss zwar eingeschaltet, aber nicht mit einem WLAN-Netzwerk verbunden sein.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Leider scheint dieses Gerät »Wi-Fi Direct« nicht zu unterstützen. Signal verwendet »Wi-Fi Direct«, um dein altes Android-Gerät zu erkennen und zu verbinden. Du kannst jedoch stattdessen eine Datensicherung wiederherstellen, um das Konto deines alten Android-Geräts zu verwenden.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly benötigt die Berechtigung »Standort«, um dein altes Android-Gerät zu erkennen und zu verbinden.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly benötigt aktivierte Standortdienste, um dein altes Android-Gerät zu erkennen und zu verbinden.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly benötigt eingeschaltetes WLAN, um dein altes Android-Gerät zu erkennen und zu verbinden. WLAN muss zwar eingeschaltet, aber nicht mit einem WLAN-Netzwerk verbunden sein.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Leider scheint dieses Gerät »Wi-Fi Direct« nicht zu unterstützen. Molly verwendet »Wi-Fi Direct«, um dein altes Android-Gerät zu erkennen und zu verbinden. Du kannst jedoch stattdessen eine Datensicherung wiederherstellen, um das Konto deines alten Android-Geräts zu verwenden.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Eine Datensicherung wiederherstellen</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Beim Versuch, eine Verbindung zu deinem alten Android-Gerät herzustellen, ist ein unerwarteter Fehler aufgetreten.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Nach neuem Android-Gerät wird gesucht …</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal benötigt die Berechtigung »Standort«, um dein neues Android-Gerät zu erkennen und zu verbinden.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal benötigt aktivierte Standortdienste, um dein neues Android-Gerät zu erkennen und zu verbinden.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal benötigt eingeschaltetes WLAN, um dein neues Android-Gerät zu erkennen und zu verbinden. WLAN muss zwar eingeschaltet, aber nicht mit einem WLAN-Netzwerk verbunden sein.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Leider scheint dieses Gerät »Wi-Fi Direct« nicht zu unterstützen. Signal verwendet »Wi-Fi Direct«, um dein neues Android-Gerät zu erkennen und zu verbinden. Du kannst jedoch stattdessen eine Datensicherung erstellen, um dein Konto auf deinem neuen Android-Gerät wiederherzustellen.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly benötigt die Berechtigung »Standort«, um dein neues Android-Gerät zu erkennen und zu verbinden.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly benötigt aktivierte Standortdienste, um dein neues Android-Gerät zu erkennen und zu verbinden.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly benötigt eingeschaltetes WLAN, um dein neues Android-Gerät zu erkennen und zu verbinden. WLAN muss zwar eingeschaltet, aber nicht mit einem WLAN-Netzwerk verbunden sein.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Leider scheint dieses Gerät »Wi-Fi Direct« nicht zu unterstützen. Molly verwendet »Wi-Fi Direct«, um dein neues Android-Gerät zu erkennen und zu verbinden. Du kannst jedoch stattdessen eine Datensicherung erstellen, um dein Konto auf deinem neuen Android-Gerät zu verwenden.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Eine Datensicherung erstellen</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Beim Versuch, eine Verbindung zu deinem neuen Android-Gerät herzustellen, ist ein unerwarteter Fehler aufgetreten.</string>
 
@@ -4138,7 +4276,7 @@
     <string name="DeviceTransferSetup__verify_that_the_code_below_matches_on_both_of_your_devices">Bestätige, dass der folgende Code auf beiden Geräten übereinstimmt. Tippe anschließend auf »Fortfahren«.</string>
     <string name="DeviceTransferSetup__the_numbers_do_not_match">Die Nummern stimmen nicht überein</string>
     <string name="DeviceTransferSetup__continue">Fortfahren</string>
-    <string name="DeviceTransferSetup__if_the_numbers_on_your_devices_do_not_match_its_possible_you_connected_to_the_wrong_device">Falls die Nummern auf deinen Geräten nicht übereinstimmen, sind Letztere womöglich mit einem falschen Gerät verbunden. Beende in diesem Fall die Übertragung und versuche es erneut. Positioniere hierbei deine beiden Geräte nahe beieinander.</string>
+    <string name="DeviceTransferSetup__if_the_numbers_on_your_devices_do_not_match_its_possible_you_connected_to_the_wrong_device">Falls die Nummern auf deinen Geräten nicht übereinstimmen, bist du womöglich mit einem falschen Gerät verbunden. Beende in diesem Fall die Übertragung und versuche es erneut. Positioniere deine beiden Geräte dafür nahe nebeneinander.</string>
     <string name="DeviceTransferSetup__stop_transfer">Übertragung abbrechen</string>
     <string name="DeviceTransferSetup__unable_to_discover_old_device">Altes Gerät wird nicht erkannt</string>
     <string name="DeviceTransferSetup__unable_to_discover_new_device">Neues Gerät wird nicht erkannt</string>
@@ -4153,8 +4291,8 @@
     <string name="DeviceTransferSetup__go_to_support_page">Zur Support-Seite</string>
     <string name="DeviceTransferSetup__try_again">Erneut versuchen</string>
     <string name="DeviceTransferSetup__waiting_for_other_device">Warten auf anderes Gerät</string>
-    <string name="DeviceTransferSetup__tap_continue_on_your_other_device_to_start_the_transfer">Tippe auf auf deinem anderen Gerät auf »Fortfahren«, um mit der Übertragung zu beginnen.</string>
-    <string name="DeviceTransferSetup__tap_continue_on_your_other_device">Tippe auf auf deinem anderen Gerät auf »Fortfahren« …</string>
+    <string name="DeviceTransferSetup__tap_continue_on_your_other_device_to_start_the_transfer">Tippe auf deinem anderen Gerät auf »Fortfahren«, um mit der Übertragung zu beginnen.</string>
+    <string name="DeviceTransferSetup__tap_continue_on_your_other_device">Tippe auf deinem anderen Gerät auf »Fortfahren« …</string>
 
     <!-- NewDeviceTransferFragment -->
     <string name="NewDeviceTransfer__cannot_transfer_from_a_newer_version_of_signal">Übertragung von neueren Signal-Versionen nicht möglich</string>
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Datenübertragung</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Positioniere beide Geräte nahe beieinander. Schalte keines davon aus und lass Signal geöffnet. Übertragungen sind Ende-zu-Ende-verschlüsselt.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Positioniere beide Geräte nahe beieinander. Schalte keines davon aus und lass Molly geöffnet. Übertragungen sind Ende-zu-Ende-verschlüsselt.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d Nachrichten bisher …</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% Nachrichten bisher …</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Konto übertragen</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Installiere Signal auf deinem neuen Android-Gerät</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Installiere Molly auf deinem neuen Android-Gerät</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Tippe auf »Konto übertragen oder wiederherstellen«"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Jeder mit diesem Link kann Name und Foto der Gruppe sehen und auch Beitrittsanfragen stellen. Teile ihn mit Personen, denen du vertraust.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Jeder mit diesem Link kann Name und Foto der Gruppe sehen und ihr auch beitreten. Teile ihn mit Personen, denen du vertraust.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Über Signal teilen</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Über Molly teilen</string>
     <string name="GroupLinkBottomSheet_copy">Kopieren</string>
     <string name="GroupLinkBottomSheet_qr_code">QR-Code</string>
     <string name="GroupLinkBottomSheet_share">Teilen</string>
@@ -4323,9 +4461,9 @@
         <item quantity="other">%1$s, %2$s und %3$d weitere Personen sind dem Anruf beigetreten</item>
     </plurals>
     <!-- Toast/popup text shown when someone leaves a group call -->
-    <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s ist ausgetreten</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s und %2$s sind ausgetreten</string>
-    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s und %3$s sind ausgetreten</string>
+    <string name="CallParticipantsListUpdatePopupWindow__s_left">%1$s hat den Anruf verlassen</string>
+    <string name="CallParticipantsListUpdatePopupWindow__s_and_s_left">%1$s und %2$s haben den Anruf verlassen</string>
+    <string name="CallParticipantsListUpdatePopupWindow__s_s_and_s_left">%1$s, %2$s und %3$s haben den Anruf verlassen</string>
     <!-- Toast message shown in group call when 3 or more people leave -->
     <plurals name="CallParticipantsListUpdatePopupWindow__s_s_and_d_others_left">
         <item quantity="one">%1$s, %2$s und %3$d weitere Person haben den Anruf verlassen</item>
@@ -4384,7 +4522,7 @@
     <string name="ShareActivity__send">Senden</string>
     <string name="ShareActivity__comma_s">, %1$s</string>
     <!-- Toast when the incoming intent is invalid -->
-    <string name="ShareActivity__could_not_get_share_data_from_intent">Ich konnte keine Freigabedaten abrufen.</string>
+    <string name="ShareActivity__could_not_get_share_data_from_intent">Konnte keine Freigabedaten abrufen.</string>
 
     <!-- MultiShareDialogs -->
     <string name="MultiShareDialogs__failed_to_send_to_some_users">Die Nachricht konnte nicht an alle Nutzer gesendet werden</string>
@@ -4402,9 +4540,9 @@
     <string name="ChatWallpaperFragment__contact_name">Kontaktname</string>
     <string name="ChatWallpaperFragment__reset">Zurücksetzen</string>
     <string name="ChatWallpaperFragment__wallpaper_preview_description">Hintergrundvorschau</string>
-    <string name="ChatWallpaperFragment__would_you_like_to_override_all_chat_colors">Möchtest du alle Chat-Farben überschreiben?</string>
-    <string name="ChatWallpaperFragment__would_you_like_to_override_all_wallpapers">Möchtest du alle Hintergründe überschreiben?</string>
-    <string name="ChatWallpaperFragment__reset_default_colors">Standardfarbe zurücksetzen</string>
+    <string name="ChatWallpaperFragment__would_you_like_to_override_all_chat_colors">Möchtest du alle Chat-Farben zurücksetzen?</string>
+    <string name="ChatWallpaperFragment__would_you_like_to_override_all_wallpapers">Möchtest du alle Hintergründe zurücksetzen?</string>
+    <string name="ChatWallpaperFragment__reset_default_colors">Standardfarben zurücksetzen</string>
     <string name="ChatWallpaperFragment__reset_all_colors">Alle Farben zurücksetzen</string>
     <string name="ChatWallpaperFragment__reset_default_wallpaper">Standardhintergrund zurücksetzen</string>
     <string name="ChatWallpaperFragment__reset_all_wallpapers">Alle Hintergründe zurücksetzen</string>
@@ -4421,7 +4559,7 @@
     <string name="ChatWallpaperPreviewActivity__set_wallpaper">Hintergrund festlegen</string>
     <string name="ChatWallpaperPreviewActivity__swipe_to_preview_more_wallpapers">Wische, um dir weitere Hintergründe anzusehen.</string>
     <string name="ChatWallpaperPreviewActivity__set_wallpaper_for_all_chats">Hintergrund für alle Chats festlegen.</string>
-    <string name="ChatWallpaperPreviewActivity__set_wallpaper_for_s">Leg den Hintergrund für %1$s fest.</string>
+    <string name="ChatWallpaperPreviewActivity__set_wallpaper_for_s">Den Hintergrund für %1$s festlegen.</string>
     <string name="ChatWallpaperPreviewActivity__viewing_your_gallery_requires_the_storage_permission">Zum Anzeigen der Galerie ist die Berechtigung »Speicher« erforderlich.</string>
 
     <!-- WallpaperImageSelectionActivity -->
@@ -4429,7 +4567,7 @@
     <!-- WallpaperCropActivity -->
     <string name="WallpaperCropActivity__pinch_to_zoom_drag_to_adjust">Passe die Vergrößerung des Fotos mit zwei Fingern oder den Bildausschnitt mit einem Finger an.</string>
     <string name="WallpaperCropActivity__set_wallpaper_for_all_chats">Hintergrund für alle Unterhaltungen festlegen.</string>
-    <string name="WallpaperCropActivity__set_wallpaper_for_s">Leg den Hintergrund für %1$s fest.</string>
+    <string name="WallpaperCropActivity__set_wallpaper_for_s">Den Hintergrund für %1$s festlegen.</string>
     <string name="WallpaperCropActivity__error_setting_wallpaper">Fehler beim Festlegen des Hintergrunds.</string>
     <string name="WallpaperCropActivity__blur_photo">Foto verwischen</string>
 
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">Über MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin ist eine neue, auf Datenschutz ausgerichtete digitale Währung.</string>
     <string name="payment_info_card_adding_funds">Hinzufügen von Guthaben</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Du kannst Guthaben für die Verwendung in Signal hinzufügen, indem du MobileCoin an deine Wallet-Adresse sendest.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Du kannst Guthaben für die Verwendung in Molly hinzufügen, indem du MobileCoin an deine Wallet-Adresse sendest.</string>
     <string name="payment_info_card_cashing_out">Auszahlungen</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Du kannst MobileCoin jederzeit auf einer Handelsplattform, die MobileCoin unterstützt, auszahlen lassen. Überweise das Guthaben einfach auf dein Konto bei dieser Handelsplattform.</string>
     <string name="payment_info_card_hide_this_card">Diese Karte ausblenden?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Wallet deaktivieren</string>
     <string name="DeactivateWalletFragment__your_balance">Dein Kontostand</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Es ist empfehlenswert, vor dem Deaktivieren von Zahlungen dein Guthaben an eine andere Wallet-Adresse zu überweisen. Falls du entscheidest, dein Guthaben nicht jetzt zu überweisen, verbleibt es in deinem mit Signal verbundenen Wallet, bis du Zahlungen wieder aktivierst.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Es ist empfehlenswert, vor dem Deaktivieren von Zahlungen dein Guthaben an eine andere Wallet-Adresse zu überweisen. Falls du entscheidest, dein Guthaben nicht jetzt zu überweisen, verbleibt es in deinem mit Molly verbundenen Wallet, bis du Zahlungen wieder aktivierst.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Verbleibenden Kontostand überweisen</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Ohne Überweisen deaktivieren</string>
     <string name="DeactivateWalletFragment__deactivate">Deaktivieren</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Ohne Überweisen deaktivieren?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Dein Kontostand verbleibt in deinem mit Signal verbundenen Wallet, falls du Zahlungen wieder aktivierst.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Dein Kontostand verbleibt in deinem mit Molly verbundenen Wallet, falls du Zahlungen wieder aktivierst.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Fehler beim Deaktivieren des Wallets.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4572,7 +4710,7 @@
 
     <!-- AccountSettingsFragment -->
     <string name="AccountSettingsFragment__account">Konto</string>
-    <string name="AccountSettingsFragment__youll_be_asked_less_frequently">PIN-Erinnerungen aktivieren. Diese werden seltener angezeigt, wenn du die PIN regelmäßig korrekt eingibst.</string>
+    <string name="AccountSettingsFragment__youll_be_asked_less_frequently">PIN-Erinnerungen werden seltener angezeigt, wenn du die PIN regelmäßig korrekt eingibst.</string>
     <string name="AccountSettingsFragment__require_your_signal_pin">Erfordert Signal-PIN Eingabe, sobald du deine Telefonnummer erneut bei Signal registrierst.</string>
     <string name="AccountSettingsFragment__change_phone_number">Telefonnummer ändern</string>
     <!-- Account setting that allows user to request and export their signal account data -->
@@ -4718,7 +4856,7 @@
     <!-- Alert dialog title when payment lock cannot be enabled -->
     <string name="PrivacySettingsFragment__cant_enable_title">Zahlungssperre kann nicht aktiviert werden</string>
     <!-- Alert dialog description to setup screen lock or fingerprint in phone settings -->
-    <string name="PrivacySettingsFragment__cant_enable_description">Um die Zahlungssperre zu verwenden, müsst du zuerst eine Bildschirmsperre oder eine Fingerabdruck-ID in deinen Telefoneinstellungen aktivieren.</string>
+    <string name="PrivacySettingsFragment__cant_enable_description">Um die Zahlungssperre zu verwenden, musst du zuerst eine Bildschirmsperre oder eine Fingerabdruck-ID in deinen Telefoneinstellungen aktivieren.</string>
     <!-- Shown in a toast when we can\'t navigate to the user\'s system fingerprint settings -->
     <string name="PrivacySettingsFragment__failed_to_navigate_to_system_settings">Systemeinstellungen konnten nicht angezeigt werden</string>
     <!-- Alert dialog button to go to phone settings -->
@@ -4726,7 +4864,7 @@
 
     <!-- AdvancedPrivacySettingsFragment -->
   <!-- Removed by excludeNonTranslatables <string name="AdvancedPrivacySettingsFragment__sealed_sender_link" translatable="false">https://signal.org/blog/sealed-sender</string> -->
-    <string name="AdvancedPrivacySettingsFragment__show_status_icon">Statussymbol anzeigen</string>
+    <string name="AdvancedPrivacySettingsFragment__show_status_icon">Symbol anzeigen</string>
     <string name="AdvancedPrivacySettingsFragment__show_an_icon">Symbol unter »Nachrichtendetails« anzeigen bei Nachrichten, die mittels »Vertraulicher Absender« zugestellt wurden</string>
 
     <!-- ExpireTimerSettingsFragment -->
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Lizenzen</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Nutzungsbedingungen und Datenschutzerklärung</string>
-    <string name="HelpFragment__copyright_signal_messenger">Urheberrecht Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Copyright Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Lizenziert unter GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4820,7 +4958,7 @@
     <string name="CustomChatColorCreatorFragment__drag_to_change_the_direction_of_the_gradient">Ziehen, um die Richtung des Farbverlaufs zu ändern</string>
 
     <!-- AddAProfilePhotoMegaphone -->
-    <string name="AddAProfilePhotoMegaphone__add_a_profile_photo">Füg ein Profilfoto hinzu</string>
+    <string name="AddAProfilePhotoMegaphone__add_a_profile_photo">Profilfoto hinzufügen</string>
     <string name="AddAProfilePhotoMegaphone__choose_a_look_and_color">Wähle Aussehen und Farbe oder passe deine Initialen an.</string>
     <string name="AddAProfilePhotoMegaphone__not_now">Jetzt nicht</string>
     <string name="AddAProfilePhotoMegaphone__add_photo">Foto hinzufügen</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Wähle eine Farbe</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Teilen</string>
 
@@ -5010,7 +5145,7 @@
     <string name="MultiselectForwardFragment__forward_to">Weiterleiten an</string>
     <!-- Displayed when sharing content via the fragment -->
     <string name="MultiselectForwardFragment__share_with">Teilen mit</string>
-    <string name="MultiselectForwardFragment__add_a_message">Füg eine Nachricht hinzu</string>
+    <string name="MultiselectForwardFragment__add_a_message">Nachricht hinzufügen</string>
     <string name="MultiselectForwardFragment__faster_forwards">Schnellere Weiterleitungen</string>
     <!-- Displayed when user selects a video that will be clipped before sharing to a story -->
     <string name="MultiselectForwardFragment__videos_will_be_trimmed">Die Videos werden auf 30-Sekunden-Clips gekürzt und als mehrere Storys verschickt.</string>
@@ -5035,14 +5170,15 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Nur Admins können in dieser Gruppe Nachrichten senden.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Höchstzahl erreicht</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Du kannst maximal fünf Chats auswählen</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
     <string name="MediaReviewFragment__add_to_the_group_story">»%1$s« zur Gruppen-Story hinzufügen</string>
     <!-- Positive dialog action when sending a story via an add to group story button -->
     <string name="MediaReviewFragment__add_to_story">Zu Story hinzufügen</string>
-    <string name="MediaReviewFragment__add_a_message">Füg eine Nachricht hinzu</string>
+    <string name="MediaReviewFragment__add_a_message">Nachricht hinzufügen</string>
     <string name="MediaReviewFragment__add_a_reply">Antwort hinzufügen</string>
     <string name="MediaReviewFragment__send_to">Senden an</string>
     <string name="MediaReviewFragment__view_once_message">Medien zur Einmalansicht</string>
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Mehr erfahren</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Signal aktualisieren</string>
+    <string name="UpdateSignalExpiredDialog__title">Molly aktualisieren</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Diese Signal-Version ist abgelaufen. Jetzt aktualisieren, um Signal weiterhin verwenden zu können.</string>
+    <string name="UpdateSignalExpiredDialog__message">Diese Molly-Version ist abgelaufen. Jetzt aktualisieren, um Molly weiterhin verwenden zu können.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Aktualisieren</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Gerät nicht registriert</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Dieses Gerät ist nicht mehr registriert. Registriere dich erneut, um Signal auf diesem Gerät weiterhin verwenden zu können.</string>
+    <string name="ReregisterSignalDialog__message">Dieses Gerät ist nicht mehr registriert. Registriere dich erneut, um Molly auf diesem Gerät weiterhin verwenden zu können.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Erneut registrieren</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5284,7 +5420,7 @@
     <string name="DonationsErrors__failed_to_cancel_subscription">Regelmäßige Spende konnte nicht gekündigt werden</string>
     <string name="DonationsErrors__subscription_cancellation_requires_an_internet_connection">Die Kündigung regelmäßiger Spenden benötigt eine Internetverbindung.</string>
     <string name="ViewBadgeBottomSheetDialogFragment__your_device_doesn_t_support_google_pay_so_you_can_t_subscribe_to_earn_a_badge_you_can_still_support_signal_by_making_a_donation_on_our_website">Dein Gerät unterstützt Google Pay nicht, daher kannst du nicht spenden, um ein Abzeichen zu erhalten. Aber durch eine Spende auf unserer Website kannst du Signal trotzdem unterstützen.</string>
-    <string name="NetworkFailure__network_error_check_your_connection_and_try_again">Netzfehler. Überprüfe deine Internetverbindung und versuche es erneut.</string>
+    <string name="NetworkFailure__network_error_check_your_connection_and_try_again">Netzwerkfehler. Überprüfe deine Internetverbindung und versuche es erneut.</string>
     <string name="NetworkFailure__retry">Erneut versuchen</string>
     <!-- Displayed as a dialog title when the selected recipient for a gift doesn\'t support gifting -->
     <string name="DonationsErrors__cannot_send_donation">Spende kann nicht gesendet werden</string>
@@ -5385,7 +5521,7 @@
     <!-- Title of edit notification profile screen -->
     <string name="EditNotificationProfileFragment__edit_this_profile">Profil bearbeiten</string>
     <!-- Error message shown when attempting to create or edit a profile name to an existing profile name -->
-    <string name="EditNotificationProfileFragment__a_profile_with_this_name_already_exists">Es existiert bereits ein Profil mit demselben Namen</string>
+    <string name="EditNotificationProfileFragment__a_profile_with_this_name_already_exists">Es existiert bereits ein Profil mit diesem Namen</string>
     <!-- Preset selectable name for a profile name, shown as list in edit/create screen -->
     <string name="EditNotificationProfileFragment__work">Geschäftlich</string>
     <!-- Preset selectable name for a profile name, shown as list in edit/create screen -->
@@ -5397,7 +5533,7 @@
     <!-- Preset selectable name for a profile name, shown as list in edit/create screen -->
     <string name="EditNotificationProfileFragment__focus">Konzentration</string>
     <!-- Error message shown when attempting to next/save without a profile name -->
-    <string name="EditNotificationProfileFragment__profile_must_have_a_name">Profil muss einen Namen besitzen</string>
+    <string name="EditNotificationProfileFragment__profile_must_have_a_name">Profil muss einen Namen haben</string>
 
     <!-- Title for add recipients to notification profile screen in create flow -->
     <string name="AddAllowedMembers__allowed_notifications">Erlaubte Benachrichtigungen</string>
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Tonauswahlmenü konnte nicht geöffnet werden.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Um Benachrichtigungen zu aktivieren, benötigt Signal die Erlaubnis, diese anzuzeigen.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Um Benachrichtigungen zu aktivieren, benötigt Molly die Erlaubnis, diese anzuzeigen.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Einschalten</string>
 
@@ -5633,7 +5769,7 @@
     <!-- Label on group stories to add a story -->
     <string name="StoryViewerPageFragment__add">Hinzufügen</string>
     <!-- Used when view receipts are disabled -->
-    <string name="StoryViewerPageFragment__views_off">Anzeigen aus</string>
+    <string name="StoryViewerPageFragment__views_off">Aufrufe aus</string>
     <!-- Used to join views and replies when both exist on a story item -->
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Bisher keine Antworten</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Du kannst nicht auf diese Story antworten, weil du nicht mehr Mitglied in dieser Gruppe bist.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Hat auf Story reagiert</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Hat auf Story reagiert</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Hat auf Story reagiert</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Aufrufe</string>
     <!-- Label for story replies tab -->
@@ -5733,7 +5871,7 @@
     <!-- Signal connections sheet bullet point 3 -->
     <string name="SignalConnectionsBottomSheet__having_them_in_your_system_contacts">In deinen Telefonkontakten gespeichert</string>
     <!-- Note at the bottom of the Signal connections sheet -->
-    <string name="SignalConnectionsBottomSheet__your_connections_can_see_your_name">"Deine Verbindungen können deinen Namen und dein Foto sowie Beiträge unter »Meine Story« sehen, es sei denn, du verbirgst sie vor ihnen."</string>
+    <string name="SignalConnectionsBottomSheet__your_connections_can_see_your_name">"Deine Kontakte können deinen Namen und dein Foto sowie Beiträge unter »Meine Story« sehen, es sei denn, du verbirgst sie vor ihnen."</string>
     <!-- Clickable option to add a viewer to a custom story -->
     <string name="PrivateStorySettingsFragment__add_viewer">Betrachter hinzufügen</string>
     <!-- Clickable option to delete a custom story -->
@@ -5929,7 +6067,7 @@
     <!-- Expired gift sheet top description text -->
     <string name="ExpiredGiftSheetConfiguration__your_badge_has_expired_and_is">Dein Abzeichen ist abgelaufen. Es ist für andere nicht mehr in deinem Profil sichtbar.</string>
     <!-- Expired gift sheet bottom description text -->
-    <string name="ExpiredGiftSheetConfiguration__to_continue">Um auch weiterhin eine Technologie zu unterstützen, die für dich entwickelt wird, zieh bitte eine monatliche Spende in Betracht.</string>
+    <string name="ExpiredGiftSheetConfiguration__to_continue">Um auch weiterhin eine App zu unterstützen, die für dich entwickelt wird, ziehe bitte eine monatliche Spende in Betracht.</string>
     <!-- Expired gift sheet make a monthly donation button -->
     <string name="ExpiredGiftSheetConfiguration__make_a_monthly_donation">Monatlich spenden</string>
     <!-- Expired gift sheet not now button -->
@@ -6022,7 +6160,7 @@
     <!-- Title of safety number changes bottom sheet when not showing individual records and user has seen review screen -->
     <string name="SafetyNumberBottomSheetFragment__safety_number_checkup_complete">Prüfung der Sicherheitsnummer abgeschlossen</string>
     <!-- Message of safety number changes bottom sheet when not showing individual records and user has seen review screen -->
-    <string name="SafetyNumberBottomSheetFragment__all_connections_have_been_reviewed">Alle Verbindungen wurden geprüft, tippe auf »Senden«, um fortzufahren.</string>
+    <string name="SafetyNumberBottomSheetFragment__all_connections_have_been_reviewed">Alle Kontakte wurden geprüft, tippe auf »Senden«, um fortzufahren.</string>
     <!-- Message of safety number changes bottom sheet when not showing individual records -->
     <plurals name="SafetyNumberBottomSheetFragment__you_have_d_connections_plural">
         <item quantity="one">%1$d Kontakt hat Signal möglicherweise erneut installiert oder das Gerät gewechselt. Optional kannst du dessen Sicherheitsnummer vor dem Senden überprüfen.</item>
@@ -6035,7 +6173,7 @@
     <!-- Action button at bottom of SafetyNumberBottomSheetFragment to send anyway -->
     <string name="SafetyNumberBottomSheetFragment__send_anyway">Trotzdem versenden</string>
     <!-- Action button at bottom of SafetyNumberBottomSheetFragment to review connections -->
-    <string name="SafetyNumberBottomSheetFragment__review_connections">Verbindungen prüfen</string>
+    <string name="SafetyNumberBottomSheetFragment__review_connections">Kontakte prüfen</string>
     <!-- Empty state copy for SafetyNumberBottomSheetFragment -->
     <string name="SafetyNumberBottomSheetFragment__no_more_recipients_to_show">Keine weiteren Empfänger vorhanden</string>
     <!-- Done button on safety number review fragment -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Wähle deine Bank</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Bestätige deine Spende bei %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Wenn du deine wiederkehrende monatliche Spende einrichtest, tippe auf »Weiter«, um die Abbuchung von 0,01 € bei deiner Bank zu bestätigen. Dieser Betrag wird automatisch erstattet und erlaubt die Abbuchung deiner Spende in Höhe von 5 € pro Monat von deinem Konto.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Um deine monatliche Spende einzurichten, tippe auf »Weiter«. Damit bestätigst du auch die Abbuchung von 0,01 € bei deiner Bank. Dieser Betrag wird dir automatisch rückerstattet und erlaubt die Abbuchung deiner Spende in Höhe von %1$s € pro Monat von deinem Konto.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Fortfahren</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Sicherungsdaten werden heruntergeladen…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Medien-Datensicherungen deaktiviert</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Dein Signal Medien-Datensicherungsplan wurde gekündigt, weil wir deine Zahlung nicht bearbeiten konnten. Du hast %1$d Tag Zeit, um die in deiner Datensicherung gespeicherten Medien herunterzuladen. Nach %1$d Tag werden die Medien aus der Datensicherung gelöscht.</item>
+        <item quantity="other">Dein Signal Medien-Datensicherungsplan wurde gekündigt, weil wir deine Zahlung nicht bearbeiten konnten. Du hast %1$d Tage Zeit, um die in deiner Datensicherung gespeicherten Medien herunterzuladen. Nach %1$d Tagen werden die Medien aus der Datensicherung gelöscht.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Um weiterhin all deine Medien zu sichern, kannst du jederzeit wieder für die Datensicherungen bezahlen. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Deine Medien werden heute gelöscht.</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Dein Signal Medien-Datensicherungsplan wurde gekündigt, weil wir deine Zahlung nicht bearbeiten konnten. Dies ist deine letzte Chance, die Medien in deiner Datensicherung herunterzuladen, bevor sie gelöscht werden.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Download kann nicht abgeschlossen werden</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Dein Gerät hat nicht genug Speicherplatz. Gib %1$s Speicherplatz frei, um die in deiner Datensicherung gespeicherten Medien herunterzuladen.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Wenn du »Überspringen« wählst, werden die Medien in der Datensicherung in %1$d Tag gelöscht.</item>
+        <item quantity="other">Wenn du »Überspringen« wählst, werden die Medien in der Datensicherung in %1$d Tagen gelöscht.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Die Zahlung für die Datensicherung kann nicht verarbeitet werden</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Wir haben Probleme mit dem Einzug deiner wiederkehrenden monatlichen Zahlung zur Datensicherung. Stelle sicher, dass deine Zahlungsmethode auf dem neuesten Stand ist. Wenn dies nicht der Fall ist, aktualisiere sie in Google Pay. Signal wird versuchen, die Zahlung in ein paar Tagen erneut abzuwickeln.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Die Datensicherung konnte nicht abgeschlossen werden</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Dein Gerät hat seit %1$d Tagen keine Datensicherung mehr durchgeführt. Stelle sicher, dass dein Gerät mit dem WLAN verbunden ist und tippe auf »Jetzt sichern«. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Mehr erfahren</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Überspringen</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Medien jetzt herunterladen</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Später herunterladen</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Medien nicht herunterladen</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Du musst %1$s Speicherplatz freigeben, um deine Medien herunterladen zu können.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Kredit- oder Debitkarte</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Unbekannt</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Zahlungsverlauf</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Deine letzte Datensicherung wurde am %1$s um %2$s durchgeführt.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Nachrichten, die älter sind als die ausgewählte Zeitspanne, werden dauerhaft gelöscht.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Nachrichten, die die ausgewählte Anzahl überschreiten, werden dauerhaft gelöscht.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Beschränkungen auf gekoppelte Geräte anwenden</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Wenn die Funktion Chat-Beschränkungen aktiviert ist, werden auch Nachrichten von deinen gekoppelten Geräten gelöscht.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Der Löschvorgang wird jetzt auf all deinen Geräten synchronisiert</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Wenn du Nachrichten oder Chats löschst, werden sie von deinem Telefon und von deinen gekoppelten Geräten gelöscht.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Zahlungsverlauf</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Sicherung von Text und allen anderen Medien</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Zahlungsdetails</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Art der Datensicherung</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Zahlungsdatum</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Teilen</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal-Datensicherungen</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Zahlungsverlauf</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Details zur Datensicherung</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Größe der Datensicherung</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Häufigkeit der Datensicherung</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Datensicherung über das Mobilfunknetz</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Datensicherung ausschalten und löschen</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Datensicherung gelöscht und ausgeschaltet.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Art der Datensicherung geändert und regelmäßige Spende storniert</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Regelmäßige Spende gekündigt</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Download abgeschlossen</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Art der Datensicherung</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Datensicherung deaktiviert</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s pro Monat</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Sicherungen aktivieren</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Letzte Datensicherung</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s um %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Nie</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Jetzt sichern</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Datensicherungen ausschalten und löschen?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Du wirst nicht erneut gefragt. Deine Datensicherung wird gelöscht und es werden keine neuen Datensicherungen erstellt.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Ausschalten und löschen</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Datensicherung wird gelöscht…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Datensicherung gelöscht</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Indem du auf »Jetzt sichern« tippst"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Täglich</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Wöchentlich</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Monatlich</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Daten manuell sichern</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Bitte gib deine Geräte-Pin, dein Passwort oder dein Sperrmuster ein.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Weiter</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Datensicherungsart ändern</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Regelmäßige Spende kündigen</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Kündigung bestätigen</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Es wird nichts mehr abgebucht. Die Datensicherungen werden am Ende deines Abrechnungszeitraums deaktiviert. Nach diesem Datum hast du 30 Tage Zeit, um die Medien herunterzuladen, die du gesichert hast.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Jetzt bestätigen und herunterladen</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Später bestätigen und herunterladen</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Regelmäßige Zahlung beibehalten</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 6330b67977..9822b7b388 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Το Signal αναβαθμίζεται…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Το Molly αναβαθμίζεται…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Δεν έχεις ορίσει ακόμα συνθηματικό!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Απενεργοποίηση συνθηματικού;</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Αυτό θα ξεκλειδώσει μόνιμα το Signal και τις ειδοποιήσεις μηνυμάτων.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Αυτό θα ξεκλειδώσει μόνιμα το Molly και τις ειδοποιήσεις μηνυμάτων.</string>
     <string name="ApplicationPreferencesActivity_disable">Απενεργοποίηση</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Σφάλμα κατά τη σύνδεση με τον διακομιστή!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">Τα PIN χρειάζονται για το κλείδωμα εγγραφής. Για να απενεργοποιήσεις τα PIN, πρέπει πρώτα να απενεργοποιήσεις το κλείδωμα εγγραφής.</string>
@@ -80,16 +81,16 @@
     <string name="AttachmentKeyboard_file">Αρχείο</string>
     <string name="AttachmentKeyboard_contact">Επαφή</string>
     <string name="AttachmentKeyboard_location">Τοποθεσία</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Το Signal χρειάζεται άδεια για να εμφανίσει τις φωτογραφίες και τα βίντεό σου</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Το Molly χρειάζεται άδεια για να εμφανίσει τις φωτογραφίες και τα βίντεό σου</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Να δοθεί πρόσβαση</string>
     <string name="AttachmentKeyboard_payment">Πληρωμή</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Δεν μπορεί να βρεθεί εφαρμογή για επιλογή πολυμέσων.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Το Signal χρειάζεται τα δικαιώματα Αποθηκευτικού Χώρου για την επισύναψη φωτογραφιών, βίντεο ή κομματιών ήχου, αλλά αυτά δεν έχουν δοθεί μόνιμα. Πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα «Δικαιώματα», και ενεργοποίησε τον «Αποθηκευτικό Χώρο».</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Το Signal χρειάζεται τα δικαιώματα Επαφών για την επισύναψη πληροφοριών επαφών, αλλά αυτά δεν έχουν δοθεί μόνιμα. Πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα «Δικαιώματα», και ενεργοποίησε τις «Επαφές».</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Το Signal χρειάζεται τα δικαιώματα Τοποθεσίας για την επισύναψη τοποθεσιών, αλλά αυτά δεν έχουν δοθεί μόνιμα. Πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα «Δικαιώματα», και ενεργοποίησε την «Τοποθεσία».</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Το Molly χρειάζεται τα δικαιώματα Αποθηκευτικού Χώρου για την επισύναψη φωτογραφιών, βίντεο ή κομματιών ήχου, αλλά αυτά δεν έχουν δοθεί μόνιμα. Πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα «Δικαιώματα», και ενεργοποίησε τον «Αποθηκευτικό Χώρο».</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Το Molly χρειάζεται τα δικαιώματα Επαφών για την επισύναψη πληροφοριών επαφών, αλλά αυτά δεν έχουν δοθεί μόνιμα. Πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα «Δικαιώματα», και ενεργοποίησε τις «Επαφές».</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Το Molly χρειάζεται τα δικαιώματα Τοποθεσίας για την επισύναψη τοποθεσιών, αλλά αυτά δεν έχουν δοθεί μόνιμα. Πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα «Δικαιώματα», και ενεργοποίησε την «Τοποθεσία».</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Να δοθεί πρόσβαση στην τοποθεσία σου</string>
@@ -98,13 +99,13 @@
     <!-- Alert dialog description asking for location permission -->
     <string name="AttachmentManager_signal_allow_signal_access_location">Να δοθεί πρόσβαση στο Singal για αποστολή της τοποθεσίας σου.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Το Signal χρειάζεται πρόσβαση στην τοποθεσία σου για να στείλει την τοποθεσία σου.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Το Molly χρειάζεται πρόσβαση στην τοποθεσία σου για να στείλει την τοποθεσία σου.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Να δοθεί πρόσβαση στον αποθηκευτικό χώρο</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Για την προβολή φωτογραφιών και βίντεο:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Το Signal χρειάζεται πρόσβαση στον αποθηκευτικό χώρο για να εμφανίσει τις φωτογραφίες και τα βίντεό σου.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Το Molly χρειάζεται πρόσβαση στον αποθηκευτικό χώρο για να εμφανίσει τις φωτογραφίες και τα βίντεό σου.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">Ο χρήστης %1$s δεν έχει ενεργοποιήσει τις πληρωμές </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Αλλαγή κάμερας</string>
     <string name="CameraXFragment_open_gallery_description">Άνοιγμα συλλογής</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Να δοθεί πρόσβαση</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Να δοθεί πρόσβαση στην κάμερα και στο μικρόφωνο</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Να δοθεί πρόσβαση στην κάμερα</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Να δοθεί πρόσβαση στο μικρόφωνο</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Για να τραβήξεις φωτογραφίες, δώσε στο Signal πρόσβαση στην κάμερα.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Για να τραβήξεις φωτογραφίες και βίντεο, δώσε στο Signal πρόσβαση στην κάμερα.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Για να τραβήξεις φωτογραφίες και βίντεο, δώσε στο Signal πρόσβαση στην κάμερα και στο μικρόφωνο.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Για να τραβήξεις βίντεο με ήχο, δώσε στο Signal πρόσβαση στο μικρόφωνο.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Για να σαρώσεις έναν κωδικό QR, δώσε στο Signal πρόσβαση στην κάμερά.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Το Signal χρειάζεται πρόσβαση στην κάμερα για τη λήψη φωτογραφιών</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Το Signal χρειάζεται πρόσβαση στην κάμερα για τη σάρωση κωδικών QR</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Το Signal χρειάζεται πρόσβαση στο μικρόφωνο για τη λήψη βίντεο</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Για τη λήψη φωτογραφιών στο Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Για τη λήψη φωτογραφιών και βίντεο στο Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Για τη λήψη βίντεο με ήχο:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Για τη σάρωση κωδικών QR:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Πρόσφατες επαφές</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Δεν υπάρχουν επαφές Signal</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Μπορείς να στείλεις φωτογραφίες σε επαφές Signal μόνο χρησιμοποιώντας το κουμπί της κάμερας. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Δεν βρήκες αυτόν ή αυτήν που ψάχνεις;</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Προσκάλεσε μια επαφή σου να έρθει στο Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Προσκάλεσε μια επαφή σου να έρθει στο Molly</string>
     <string name="CameraContacts__menu_search">Αναζήτηση</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Όχι, ευχαριστώ</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Αναβάθμιση του Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Αναβάθμιση του Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Αυτή η έκδοση της εφαρμογής δεν υποστηρίζεται πιά. Για να συνεχίσεις να στέλνεις και να λαμβάνεις μηνύματα, αναβάθμισε στην πιο πρόσφατη έκδοση.</string>
     <string name="ClientDeprecatedActivity_update">Ενημέρωση</string>
     <string name="ClientDeprecatedActivity_dont_update">Να μην αναβαθμιστεί</string>
     <string name="ClientDeprecatedActivity_warning">Προσοχή</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Η έκδοση του Signal έχει λήξει. Μπορείς να δεις το ιστορικό μηνυμάτων αλλά δεν θα μπορείς να στέλνεις ή να λαμβάνεις μηνύματα μέχρι να κάνεις αναβάθμιση.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Η έκδοση του Molly έχει λήξει. Μπορείς να δεις το ιστορικό μηνυμάτων αλλά δεν θα μπορείς να στέλνεις ή να λαμβάνεις μηνύματα μέχρι να κάνεις αναβάθμιση.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Δεν βρέθηκε περιηγητής.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Μήνυμα %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Φωνητική κλήση Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Βιντεοκλήση Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Μήνυμα Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Αποστολή μηνύματος</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Έλα να χρησιμοποιήσουμε το Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Έλα να χρησιμοποιήσουμε το Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Επίλεξε μια επαφή</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Το συνημμένο υπερβαίνει τα όρια μεγέθους για τον τύπο μηνύματος που στέλνεις.</string>
     <string name="ConversationActivity_unable_to_record_audio">Η ηχογράφηση απέτυχε!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Για να στείλεις ηχητικά μηνύματα:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Για να στείλεις φωνητικά μηνύματα, δώσε στο Signal πρόσβαση στο μικρόφωνο.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Για να στείλεις φωνητικά μηνύματα, δώσε στο Molly πρόσβαση στο μικρόφωνο.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Το Signal χρειάζεται πρόσβαση στο μικρόφωνο για ηχογράφηση φωνητικού μηνύματος.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Το Signal χρειάζεται τα δικαιώματα μικροφώνου για την αποστολή μηνυμάτων ήχου, αλλά αυτά δεν έχουν δοθεί μόνιμα. Πήγαινε στις ρυθμίσεις εφαρμογών, επίλεξε τα «Δικαιώματα», και ενεργοποίησε το «Μικρόφωνο».</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Το Molly χρειάζεται πρόσβαση στο μικρόφωνο για ηχογράφηση φωνητικού μηνύματος.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Το Molly χρειάζεται τα δικαιώματα μικροφώνου για την αποστολή μηνυμάτων ήχου, αλλά αυτά δεν έχουν δοθεί μόνιμα. Πήγαινε στις ρυθμίσεις εφαρμογών, επίλεξε τα «Δικαιώματα», και ενεργοποίησε το «Μικρόφωνο».</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Το Signal χρειάζεται τα δικαιώματα μικροφώνου και κάμερας για να καλέσεις τον/την %1$s, αλλά αυτά δεν έχουν δοθεί μόνιμα. Πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα «Δικαιώματα», και ενεργοποίησε το «Μικρόφωνο» και «Κάμερα».</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Για να τραβήξεις φωτογραφίες και βίντεο, δώσε στο Signal πρόσβαση στην κάμερα.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Το Signal χρειάζεται τα δικαιώματα κάμερας για τη λήψη φωτογραφίων και βίντεο, αλλά αυτά δεν έχουν δοθεί μόνιμα. Πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα «Δικαιώματα», και ενεργοποίησε την «Κάμερα».</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Το Signal χρειάζεται τα δικαιώματα κάμερας για λήψη φωτογραφιών ή βίντεο</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Το Molly χρειάζεται τα δικαιώματα μικροφώνου και κάμερας για να καλέσεις τον/την %1$s, αλλά αυτά δεν έχουν δοθεί μόνιμα. Πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα «Δικαιώματα», και ενεργοποίησε το «Μικρόφωνο» και «Κάμερα».</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Για να τραβήξεις φωτογραφίες και βίντεο, δώσε στο Molly πρόσβαση στην κάμερα.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Το Molly χρειάζεται τα δικαιώματα κάμερας για τη λήψη φωτογραφίων και βίντεο, αλλά αυτά δεν έχουν δοθεί μόνιμα. Πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα «Δικαιώματα», και ενεργοποίησε την «Κάμερα».</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Το Molly χρειάζεται τα δικαιώματα κάμερας για λήψη φωτογραφιών ή βίντεο</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Ενεργοποίησε την άδεια μικροφώνου για λήψη βίντεο με ήχο.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Το Signal χρειάζεται τα δικαιώματα μικροφώνου για τη λήψη βίντεο , αλλά αυτά δεν έχουν δοθεί. Πήγαινε στις ρυθμίσεις εφαρμογών, επίλεξε τα «Δικαιώματα», και ενεργοποίησε το «Μικρόφωνο» και την «Κάμερα».</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Το Signal χρειάζεται τα δικαιώματα μικροφώνου για να τραβήξει βίντεο.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Το Molly χρειάζεται τα δικαιώματα μικροφώνου για τη λήψη βίντεο , αλλά αυτά δεν έχουν δοθεί. Πήγαινε στις ρυθμίσεις εφαρμογών, επίλεξε τα «Δικαιώματα», και ενεργοποίησε το «Μικρόφωνο» και την «Κάμερα».</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Το Molly χρειάζεται τα δικαιώματα μικροφώνου για να τραβήξει βίντεο.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Όχι</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Για να ξεκινήσεις μία κλήση:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Για να ξεκινήσεις μια κλήση, δώσε στο Signal την πρόσβαση στο μικρόφωνο.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Για να ξεκινήσεις μια κλήση, δώσε στο Molly την πρόσβαση στο μικρόφωνο.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Το Signal χρειάζεται πρόσβαση στο μικρόφωνο για να ξεκινήσει μια κλήση.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Το Molly χρειάζεται πρόσβαση στο μικρόφωνο για να ξεκινήσει μια κλήση.</string>
 
 
     <string name="ConversationActivity_join">Μπες στην κλήση</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Η ανταλλαγή μηνυμάτων SMS δεν υποστηρίζεται πλέον στο Signal. Προσκάλεσε τον χρήστη %1$s στο Signal για να κρατήσεις εδώ τη συνομιλία.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Αυτό το άτομο δεν χρησιμοποιεί πλέον το Signal. Προσκάλεσέ το στο Signal για να κρατήσεις εδώ τη συνομιλία.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Αυτό το άτομο δεν χρησιμοποιεί πλέον το Molly. Προσκάλεσέ το στο Molly για να κρατήσεις εδώ τη συνομιλία.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Πρόσκληση στο Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Πρόσκληση στο Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Θα σου το θυμίσουμε ξανά σύντομα.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Διαγραφή για όλους</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Διαγραφή από αυτή τη συσκευή</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Διαγραφή</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Διαγραφή από όλες τις συσκευές</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Αυτό το μήνυμα θα διαγραφεί για όλα τα άτομα στη συνομιλία, αν έχουν μια πρόσφατη έκδοση του Signal. Θα μπορούν να δουν ότι διέγραψες ένα μήνυμα.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Λίστα αποκλεισμού</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Αναβάθμιση του Signal</string>
+    <string name="ConversationFragment__update_build">Αναβάθμιση του Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Νέα εγγραφή στο Signal</string>
+    <string name="ConversationFragment__reregister_signal">Νέα εγγραφή στο Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Περιήγηση προς τα πίσω.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Άνοιγμα Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Άνοιγμα Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Δεν έχει πλέον επαλήθευση</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Η επιλεγμένη συνομιλία θα διαγραφεί οριστικά.</item>
         <item quantity="other">Και οι %1$d επιλεγμένες συνομιλίες θα διαγραφούν οριστικά.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Αυτή η ενέργεια θα διαγράψει οριστικά και την επιλεγμένη συνομιλία από όλες σου τις συσκευές.</item>
+        <item quantity="other">Αυτή η ενέργεια θα διαγράψει οριστικά όλες τις %1$d επιλεγμένες συνομιλίες από όλες σου τις συσκευές.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Γίνεται διαγραφή</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Διαγραφή επιλεγμένης συνομιλίας…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Ποιοί μπορούν να με βρουν με τον αριθμό μου;</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Όποιος έχει τον αριθμό τηλεφώνου σου θα βλέπει ότι είσαι στο Signal και θα μπορεί να ξεκινήσει συνομιλία μαζί σου.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Όποιος έχει τον αριθμό τηλεφώνου σου θα βλέπει ότι είσαι στο Molly και θα μπορεί να ξεκινήσει συνομιλία μαζί σου.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Κανείς δεν θα μπορεί να δει ότι είσαι στο Signal εκτός και αν στείλεις μήνυμα ή δεν έχεις ήδη μια συνομιλία μαζί του.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Κανείς δεν θα μπορεί να δει ότι είσαι στο Molly εκτός και αν στείλεις μήνυμα ή δεν έχεις ήδη μια συνομιλία μαζί του.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Επαναφορά από αντίγραφο ασφαλείας;</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Δοκίμασε το συνθηματικό του αντιγράφου ασφαλείας σου και επιβεβαίωσε ότι ταιριάζει.</string>
     <string name="BackupsPreferenceFragment__turn_on">Ενεργοποίηση</string>
     <string name="BackupsPreferenceFragment__turn_off">Απενεργοποίηση</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Για να ανακτήσεις ένα αντίγραφο ασφαλείας, εγκατέστησε από την αρχή το Signal. Άνοιξε την εφαρμογή, πάτα \"Επαναφορά αντίγραφου ασφαλείας\" και εντόπισε ένα αρχείο - αντίγραφο ασφαλείας. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Για να ανακτήσεις ένα αντίγραφο ασφαλείας, εγκατέστησε από την αρχή το Molly. Άνοιξε την εφαρμογή, πάτα \"Επαναφορά αντίγραφου ασφαλείας\" και εντόπισε ένα αρχείο - αντίγραφο ασφαλείας. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Μάθε περισσότερα</string>
     <string name="BackupsPreferenceFragment__in_progress">Σε εξέλιξη…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d μέχρι τώρα…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% μέχρι τώρα…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Το Signal χρειάζεται τα δικαιώματα πρόσβασης εξωτερικής μνήμης για τη δημιουργία αντιγράφων ασφαλείας, αλλά αυτά δεν έχουν δοθεί μόνιμα. Παρακαλώ πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα \"Δικαιώματα\", και ενεργοποίησε το \"Αποθηκευτικός Χώρος\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Το Molly χρειάζεται τα δικαιώματα πρόσβασης εξωτερικής μνήμης για τη δημιουργία αντιγράφων ασφαλείας, αλλά αυτά δεν έχουν δοθεί μόνιμα. Παρακαλώ πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα \"Δικαιώματα\", και ενεργοποίησε το \"Αποθηκευτικός Χώρος\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Ορισμός ώρας δημιουργίας αντίγραφου ασφαλείας</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Η συνομιλία ανανεώθηκε</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Το Signal χρησιμοποιεί κρυπτογράφηση από άκρο σε άκρο και ίσως χρειάζεται να ανανεώσει τη συνέδρια της συνομιλίας σου μερικές φορές. Αυτό δεν επηρεάζει την ασφάλεια της συνομιλίας, αλλά ίσως χάσεις κάποιο μήνυμα από αυτή την επαφή, οπότε μπορείς να του/της ζητήσεις να το ξαναστείλει.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Το Molly χρησιμοποιεί κρυπτογράφηση από άκρο σε άκρο και ίσως χρειάζεται να ανανεώσει τη συνέδρια της συνομιλίας σου μερικές φορές. Αυτό δεν επηρεάζει την ασφάλεια της συνομιλίας, αλλά ίσως χάσεις κάποιο μήνυμα από αυτή την επαφή, οπότε μπορείς να του/της ζητήσεις να το ξαναστείλει.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Χρησιμοποίησε το Signal σε υπολογιστή ή iPad. Τα μηνύματά σου θα συγχρονιστούν στις συνδεδεμένες συσκευές σου.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Σύνδεση νέας συσκευής</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Τα μηνύματα και οι πληροφορίες συνομιλίας προστατεύονται με κρυπτογράφηση από άκρο σε άκρο σε όλες τις συσκευές</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal στον υπολογιστή ή το iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Όλα τα μηνύματα στις συνδεδεμένες συσκευές είναι ιδιωτικά</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Τα μηνύματα Molly συγχρονίζονται με το Molly στο τηλέφωνό σου, αφού αυτό συνδεθεί. Το προηγούμενο ιστορικό μηνυμάτων σου δεν θα εμφανιστεί.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Στην άλλη συσκευή σου, επισκέψου το %1$s για να εγκαταστήσεις το Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Οι συνδεδεμένες συσκευές μου</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Αποσύνδεση</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s αποσυνδέθηκε</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Σύνδεση συσκευής…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Η συσκευή εγκρίθηκε</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Φόρτωση…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Δεν υπάρχουν συνδεδεμένες συσκευές</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Ξεκλείδωμα για σύνδεση συσκευής</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Σκάναρε το QR code που εμφανίζεται στη συσκευή για να γίνει η σύνδεση.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Σκανάρισμα κωδικού QR</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Χρησιμοποίησε αυτή τη συσκευή για να σκανάρεις τον κωδικό QR που εμφανίζεται στη συσκευή που θέλεις να συνδέσεις</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Εντάξει</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Αυτή η συσκευή θα μπορεί να βλέπει τις ομάδες και τις επαφές σου, να έχει πρόσβαση στις συνομιλίες σου και να στέλνει μηνύματα σαν να είναι εσύ.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Ολοκλήρωσε τη σύνδεση στην άλλη συσκευή σου</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Ολοκλήρωσε τη σύνδεση του Molly στην άλλη συσκευή σου.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Αποτυχία σύνδεσης συσκευής</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Αυτός ο κωδικός QR δεν είναι έγκυρος. Βεβαιώσου ότι σκανάρεις τον κωδικό QR που εμφανίζεται στη συσκευή που θέλεις να συνδέσεις.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Επανάληψη</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Αποσύνδεση του \'%1$s\';</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Βελτιστοποίηση για τις υπηρεσίες Play που λείπουν</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Αυτή η συσκευή δεν υποστηρίζει τις υπηρεσίες Play. Πάτα για απενεργοποίηση των βελτιστοποιήσεων μπαταρίας του συστήματος που εμποδίζουν το Signal από το να λαμβάνει μηνύματα όταν είναι ανενεργό.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Αυτή η συσκευή δεν υποστηρίζει τις υπηρεσίες Play. Πάτα για απενεργοποίηση των βελτιστοποιήσεων μπαταρίας του συστήματος που εμποδίζουν το Molly από το να λαμβάνει μηνύματα όταν είναι ανενεργό.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Αυτή η έκδοση Signal έχει λήξει. Αναβάθμισε τώρα για να στείλεις και να λάβεις μηνύματα.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Αυτή η έκδοση Molly έχει λήξει. Αναβάθμισε τώρα για να στείλεις και να λάβεις μηνύματα.</string>
     <string name="ExpiredBuildReminder_update_now">Αναβάθμιση τώρα</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Εμφάνιση</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Μόνιμη αποτυχία επικοινωνίας του Signal!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Το Signal δεν μπόρεσε να εγγραφτεί στις Υπηρεσίες Google Play. Τα μηνύματα και οι κλήσεις του Signal έχουν απενεργοποιηθεί. Παρακαλώ προσπάθησε να επανεγγραφτείς στις Ρυθμίσεις &gt; Προχωρημένες Ρυθμίσεις.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Μόνιμη αποτυχία επικοινωνίας του Molly!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Το Molly δεν μπόρεσε να εγγραφτεί στις Υπηρεσίες Google Play. Τα μηνύματα και οι κλήσεις του Molly έχουν απενεργοποιηθεί. Παρακαλώ προσπάθησε να επανεγγραφτείς στις Ρυθμίσεις &gt; Προχωρημένες Ρυθμίσεις.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Τα αρχεία συμβάντων αποσφαλμάτωσης βοηθούν να διαγνώσουμε και να διορθώσουμε το πρόβλημα και δεν περιλαμβάνουν πληροφορίες ταυτοποίησης.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Το Signal αντιμετώπισε πρόβλημα. Αποστολή αρχείου συμβάντων αποσφαλμάτωσης;</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Το Molly αντιμετώπισε πρόβλημα. Αποστολή αρχείου συμβάντων αποσφαλμάτωσης;</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Οι ειδοποιήσεις ενδέχεται να καθυστερήσουν λόγω βελτιστοποιήσεων της μπαταρίας</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Μπορείς να απενεργοποιήσεις τις βελτιστοποιήσεις μπαταρίας για το Signal για να διασφαλίσεις ότι οι ειδοποιήσεις μηνυμάτων δεν θα καθυστερούν.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Μπορείς να απενεργοποιήσεις τις βελτιστοποιήσεις μπαταρίας για το Molly για να διασφαλίσεις ότι οι ειδοποιήσεις μηνυμάτων δεν θα καθυστερούν.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Οι ειδοποιήσεις ενδέχεται να καθυστερήσουν λόγω βελτιστοποιήσεων της μπαταρίας</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Απενεργοποίησε τις βελτιστοποιήσεις μπαταρίας για το Molly για να διασφαλίσεις ότι οι ειδοποιήσεις μηνυμάτων δεν θα καθυστερούν. Πάτα \"Συνέχεια\" για να δεις τις οδηγίες που αφορούν την εκάστοτε συσκευή.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Όχι, ευχαριστώ</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Συνέχεια</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Συνέχεια</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Απόρριψη</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Όχι, ευχαριστώ</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Προσκλήσεις σε ομάδες που εκκρεμούν</string>
+    <string name="PendingMembersActivity_pending_group_invites">Αιτήματα &amp; προσκλήσεις</string>
     <string name="PendingMembersActivity_requests">Αιτήματα</string>
     <string name="PendingMembersActivity_invites">Προσκλήσεις</string>
     <string name="PendingMembersActivity_people_you_invited">Άτομα που έχεις προσκαλέσει</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Ακύρωση</string>
     <string name="InviteActivity_sending">Στέλνεται…</string>
     <string name="InviteActivity_invitations_sent">Οι προσκλήσεις στάλθηκαν!</string>
-    <string name="InviteActivity_invite_to_signal">Πρόσκληση στο Signal</string>
+    <string name="InviteActivity_invite_to_signal">Πρόσκληση στο Molly</string>
     <string name="InviteActivity_send_sms">Αποστολή SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Αποστολή %1$d πρόσκλησης με SMS;</item>
         <item quantity="other">Αποστολή %1$d προσκλήσεων με SMS;</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Έλα να χρησιμοποιήσουμε το Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Έλα να χρησιμοποιήσουμε το Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Φαίνεται πως δεν έχεις κάποια εφαρμογή στην οποία μπορείς να μοιραστείς.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Το μήνυμά σου</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Η σύνδεση στο παρασκήνιο ενεργοποιήθηκε</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Απαντήσεις</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Γίνεται κλήση Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">Γίνεται κλήση Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Έναρξη υπηρεσίας κλήσεων Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Η υπηρεσία κλήσεων του Signal σταματάει</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Έναρξη υπηρεσίας κλήσεων Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Η υπηρεσία κλήσεων του Molly σταματάει</string>
     <string name="NotificationBarManager__cancel_call">Ακύρωση κλήσης</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Ενεργοποίησες τις πληρωμές</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">Ο χρήστης %1$s μπορεί να αποδεχτεί πληρωμές</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Τα στοιχεία πληρωμής δεν είναι διαθέσιμα</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Πάτα για περισσότερα</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Τα στοιχεία πληρωμής δεν είναι διαθέσιμα</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Τα στοιχεία αυτής της πληρωμής δεν είναι διαθέσιμα, επειδή τα μηνύματά σου αποκαταστάθηκαν από μια πηγή που δεν περιείχε αυτό το ιστορικό πληρωμών. Αυτό δεν επηρεάζει το υπόλοιπο του πορτοφολιού σου ή την κατάσταση των προηγούμενων πληρωμών.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Σύντομα, δεν θα μπορείς πια να στείλεις μηνύματα SMS στο Signal. Προσκάλεσε τον χρήστη %1$s στο Signal για να κρατήσεις εδώ τη συνομιλία.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Δεν θα μπορείς πια να στείλεις μηνύματα SMS στο Signal. Προσκάλεσε τον χρήστη %1$s στο Signal για να κρατήσεις εδώ τη συνομιλία.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Δεν θα μπορείς πια να στείλεις μηνύματα SMS στο Molly. Προσκάλεσε τον χρήστη %1$s στο Molly για να κρατήσεις εδώ τη συνομιλία.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Πληρωμή: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Πληρωμή</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Έγινε αναφορά ως ανεπιθύμητο</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Σύνδεση κάποιας συσκευής Signal;</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Φαίνεται πως προσπαθείς να συνδέσεις μια συσκευή Signal χρησιμοποιώντας κάποιο άλλο πρόγραμμα σκαναρίσματος. Για την προστασία σου, παρακαλώ σκάναρε ξανά τον κωδικό μέσω του Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Το Signal χρειάζεται τα δικαιώματα Κάμερας για το σκανάρισμα του κωδικού QR, αλλά αυτά δεν έχουν δοθεί μόνιμα. Παρακαλώ πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα \"Δικαιώματα\", και ενεργοποίησε την \"Κάμερα\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Το Molly χρειάζεται τα δικαιώματα Κάμερας για το σκανάρισμα του κωδικού QR, αλλά αυτά δεν έχουν δοθεί μόνιμα. Παρακαλώ πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα \"Δικαιώματα\", και ενεργοποίησε την \"Κάμερα\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Δεν μπορούμε να σκανάρουμε QR κωδικούς χωρίς τα δικαιώματα Κάμερας</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Εισαγωγή συνθηματικού</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Εικονίδιο Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Εικονίδιο Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Καταχώρηση συνθηματικού</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Μη έγκυρο συνθηματικό!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Ξεκλείδωσε το Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Κλείδωμα οθόνης</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Ξεκλείδωσε το Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Κλείδωμα οθόνης</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Χάρτης</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Επιβεβαίωσε για να συνεχίσεις να συνομιλείς</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Για να περιορίσουμε το spam στο Signal, παρακαλούμε ολοκλήρωσε την επιβεβαίωση.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Για να περιορίσουμε το spam στο Molly, παρακαλούμε ολοκλήρωσε την επιβεβαίωση.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Αφού επιβεβαιώσεις, θα μπορέσεις να συνεχίσεις να στέλνεις μηνύματα. Όσα μηνύματα βρίσκονται σε αναμονή θα αποσταλλούν αυτόματα.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Η ιστορία μου</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Κλήση Signal</string>
+    <string name="Recipient_signal_call">Κλήση Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Αποκλεισμός</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Χτυπάει…</string>
     <string name="RedPhone_busy">Απασχολημένος/η</string>
     <string name="RedPhone_recipient_unavailable">Μη διαθέσιμος αποδέκτης</string>
-    <string name="RedPhone_network_failed">Αποτυχία δικτύου!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Αποτυχία δικτύου! Έλεγξε τη σύνδεση στο δίκτυο και προσπάθησε ξανά.</string>
     <string name="RedPhone_number_not_registered">Ο αριθμός δεν είναι εγγεγραμμένος!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Ο αριθμός που κάλεσες δεν υποστηρίζει ασφαλή φωνή!</string>
     <string name="RedPhone_got_it">Εντάξει</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Πάτα εδώ για να ενεργοποιήσεις το βίντεό σου</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Για να καλέσεις τον/την %1$s, το Signal χρειάζεται πρόσβαση στην κάμερά σου</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Για να καλέσεις τον/την %1$s, το Molly χρειάζεται πρόσβαση στην κάμερά σου</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Καλεί…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Επανασύνδεση…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Αφαιρέθηκε από την κλήση</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Κάποιος σε αφαίρεσε από την κλήση.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Να δοθεί πρόσβαση στην κάμερα και στο μικρόφωνο</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Να δοθεί πρόσβαση στο μικρόφωνο</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Να δοθεί πρόσβαση στην κάμερα</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Για να ξεκινήσεις ή να μπεις σε μια κλήση, δώσε στο Molly πρόσβαση στην κάμερα και στο μικρόφωνό σου.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Για να ξεκινήσεις ή να μπεις σε μια κλήση, δώσε στο Molly πρόσβαση στο μικρόφωνό σου.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Για να ενεργοποιήσεις το βίντεο, δώσε στο Molly πρόσβαση στην κάμερά σου.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Το Molly χρειάζεται τα δικαιώματα μικροφώνου για να ξεκινήσεις ή να μπεις σε μία συνομιλία.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Το Molly χρειάζεται πρόσβαση στην κάμερα για ενεργοποίηση του βίντεο</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Για να ξεκινήσεις ή να μπεις σε μία κλήση:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Για να ενεργοποιήσεις το βίντεο:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Κλήση Signal</string>
-    <string name="WebRtcCallView__signal_video_call">Βιντεοκλήση Signal</string>
+    <string name="WebRtcCallView__signal_call">Κλήση Molly</string>
+    <string name="WebRtcCallView__signal_video_call">Βιντεοκλήση Molly</string>
     <string name="WebRtcCallView__start_call">Έναρξη κλήσης</string>
     <string name="WebRtcCallView__join_call">Είσοδος στην κλήση</string>
     <string name="WebRtcCallView__call_is_full">Η κλήση είναι γεμάτη</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Θες να κατεβάσεις το χέρι σου;</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Κατέβασε το χέρι σου</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Κατέβασέ το</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Ακύρωση</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Σήκωσες το χέρι σου</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Εμφάνιση</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">Ο χρήστης %1$s σήκωσε χέρι</item>
-        <item quantity="other">Οι χρήστες %1$s + %2$d σήκωσαν χέρι</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s σήκωσες το χέρι σου</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d χρήστης σηκώσατε το χέρι σας</item>
+        <item quantity="other">%1$s + %2$d χρήστες σηκώσατε το χέρι σας</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">Ο χρήστης %1$s σήκωσε το χέρι του</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">Οι χρήστες %1$s +%2$d σήκωσαν το χέρι τους</item>
+        <item quantity="other">Οι χρήστες %1$s + %2$d σήκωσαν το χέρι τους</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Θα λάβεις μια κλήση για την επαλήθευση αυτού του αριθμού.</string>
     <string name="RegistrationActivity_edit_number">Επεξεργασία αριθμού</string>
     <string name="RegistrationActivity_missing_google_play_services">Υπηρεσίες Google Play που λείπουν</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Αυτή η συσκευή δεν έχει τις Υπηρεσίες Google Play. Μπορείς και πάλι να χρησιμοποιήσεις το Signal, αλλά αυτή η διαμόρφωση μπορεί να οδηγήσει σε μειωμένη αξιοπιστία και επιδόσεις.\n\nΑν δεν είσαι προηγμένος/η χρήστης, αν δεν έχεις εγκαταστήσει κάποιο εναλλακτικό Android ROM, ή αν νομίζεις πως βλέπεις αυτό το μήνυμα από λάθος, παρακαλώ επικοινώνησε με το support@signal.org για να σε βοηθήσουμε με την αποσφαλμάτωση.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Αυτή η συσκευή δεν έχει τις Υπηρεσίες Google Play. Μπορείς και πάλι να χρησιμοποιήσεις το Molly, αλλά αυτή η διαμόρφωση μπορεί να οδηγήσει σε μειωμένη αξιοπιστία και επιδόσεις.\n\nΑν δεν είσαι προηγμένος/η χρήστης, αν δεν έχεις εγκαταστήσει κάποιο εναλλακτικό Android ROM, ή αν νομίζεις πως βλέπεις αυτό το μήνυμα από λάθος, παρακαλώ επικοινώνησε με το support@molly.im για να σε βοηθήσουμε με την αποσφαλμάτωση.</string>
     <string name="RegistrationActivity_i_understand">Καταλαβαίνω</string>
     <string name="RegistrationActivity_play_services_error">Σφάλμα υπηρεσιών Play</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Οι υπηρεσίες Google Play αναβαθμίζονται ή είναι προσωρινά μη διαθέσιμες. Παρακαλώ ξαναπροσπάθησε.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Μη-τυπική μορφή αριθμού</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Ο αριθμός που έγραψες (%1$s) φαίνεται να μην έχει μια τυπική μορφή.n\nΜήπως εννοούσες %2$s;</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Μορφή αριθμού τηλεφώνου</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Μορφή αριθμού τηλεφώνου</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Ζητήθηκε κλήση</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Αντιμετωπίζεις προβλήματα με την εγγραφή;</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Βεβαιώσου ότι το τηλέφωνό σου διαθέτει σήμα κινητής τηλεφωνίας για να λάβεις το SMS ή την κλήση σου \n • Επιβεβαίωσε ότι μπορείς να δεχτείς τηλεφωνικές κλήσεις στον αριθμό \n • Έλεγξε ότι έχεις εισαγάγει σωστά τον αριθμό τηλεφώνου σου.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Για περισσότερες πληροφορίες, ακολούθησε αυτά τα βήματα αντιμετώπισης προβλημάτων ή Επικοινώνησε με την Υποστήριξη</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Για περισσότερες πληροφορίες, ακολούθησε τα εξής: %1$s ή %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">αυτά τα βήματα αντιμετώπισης προβλημάτων</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Προσθήκη στις επαφές</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Πρόσκληση στο Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Πρόσκληση στο Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Μήνυμα Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Κλήση Signal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Προσθήκη στις επαφές</string>
-    <string name="SharedContactView_invite_to_signal">Πρόσκληση στο Signal</string>
+    <string name="SharedContactView_invite_to_signal">Πρόσκληση στο Molly</string>
     <string name="SharedContactView_message">Μήνυμα Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">Ο αριθμός %1$s ανήκει στον χρήστη %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Αναβάθμιση Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Μια νέα έκδοση του Signal είναι διαθέσιμη. Πάτα για ενημέρωση.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Αποτυχία ενημέρωσης Signal</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Αναβάθμιση Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Μια νέα έκδοση του Molly είναι διαθέσιμη. Πάτα για ενημέρωση.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Αποτυχία ενημέρωσης Molly</string>
     <string name="ApkUpdateNotifications_failed_general_body">Θα προσπαθήσουμε ξανά αργότερα.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Το Signal ενημερώθηκε με επιτυχία</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Το Molly ενημερώθηκε με επιτυχία</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Έγινε αυτόματη ενημέρωση της εφαρμογής σου στην έκδοση %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Ο αριθμός ασφαλείας μας:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Φαινεται πως δεν έχεις κάποια εφαρμογή με την οποία να μπορείς να μοιραστείς.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Δε βρέθηκε αριθμός ασφαλείας στο πρόχειρο για να γίνει σύγκριση</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Το Signal χρειάζεται τα δικαιώματα Κάμερας για το σκανάρισμα του κωδικού QR, αλλά αυτά δεν έχουν δοθεί μόνιμα. Παρακαλώ πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα \"Δικαιώματα\", και ενεργοποίησε την \"Κάμερα\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Το Molly χρειάζεται τα δικαιώματα Κάμερας για το σκανάρισμα του κωδικού QR, αλλά αυτά δεν έχουν δοθεί μόνιμα. Παρακαλώ πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα \"Δικαιώματα\", και ενεργοποίησε την \"Κάμερα\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Δεν μπορούμε να σκανάρουμε τον QR κωδικό χωρίς τα δικαιώματα Κάμερας</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Θα πρέπει πρώτα να ανταλλάξετε μηνύματα για να δείς τον αριθμό ασφαλείας του/της %1$s.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Πάτα για άνοιγμα.</string>
-    <string name="KeyCachingService_passphrase_cached">Το Signal ξεκλειδώθηκε</string>
-    <string name="KeyCachingService_lock">Κλείδωμα του Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Το Molly ξεκλειδώθηκε</string>
+    <string name="KeyCachingService_lock">Κλείδωμα του Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Εσύ</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Μη υποστηριζόμενος τύπος πολυμέσων</string>
     <string name="MediaPreviewActivity_draft">Πρόχειρο</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Το Signal χρειάζεται τα δικαιώματα Αποθηκευτικού Χώρου για αποθήκευση στην εξωτερική μνήμη, αλλά αυτά δεν έχουν δοθεί μόνιμα. Παρακαλώ πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα \"Δικαιώματα\", και ενεργοποίησε το \"Αποθηκευτικός Χώρος\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Το Molly χρειάζεται τα δικαιώματα Αποθηκευτικού Χώρου για αποθήκευση στην εξωτερική μνήμη, αλλά αυτά δεν έχουν δοθεί μόνιμα. Παρακαλώ πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα \"Δικαιώματα\", και ενεργοποίησε το \"Αποθηκευτικός Χώρος\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Αδυναμία αποθήκευσης στην εξωτερική μνήμη χωρίς δικαιώματα</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Διαγραφή μηνύματος;</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Αυτή η επιλογή θα διαγράψει οριστικά αυτό το μήνυμα.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Αποτυχία παράδοσης του μηνύματος.</string>
     <string name="MessageNotifier_error_delivering_message">Σφάλμα κατά την παράδοση του μηνύματος.</string>
     <string name="MessageNotifier_message_delivery_paused">Αποστολή μηνύματος σε παύση.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Επαληθεύστε για να συνεχίσετε να αποστέλλετε μηνύματα στο Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Επαληθεύστε για να συνεχίσετε να αποστέλλετε μηνύματα στο Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Σημείωση όλων ως αναγνωσμένα</string>
     <string name="MessageNotifier_mark_read">Σημείωση ως αναγνωσμένο</string>
     <string name="MessageNotifier_turn_off_these_notifications">Απενεργοποίηση αυτών των ειδοποιήσεων</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Αντέδρασε με %1$s στο αυτοκόλλητό σου.</string>
     <string name="MessageNotifier_this_message_was_deleted">Αυτό το μήνυμα διαγράφηκε.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Απενεργοποίηση των ειδοποιήσεων για επαφές που έρχονται στο Signal; Μπορείς να τις ενεργοποιήσεις ξανά στο Signal &gt; Ρυθμίσεις &gt; Ειδοποιήσεις.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Απενεργοποίηση των ειδοποιήσεων για επαφές που έρχονται στο Molly; Μπορείς να τις ενεργοποιήσεις ξανά στο Molly &gt; Ρυθμίσεις &gt; Ειδοποιήσεις.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Η γρήγορη απάντηση δεν είναι διαθέσιμη όταν το Signal είναι κλειδωμένο!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Η γρήγορη απάντηση δεν είναι διαθέσιμη όταν το Molly είναι κλειδωμένο!</string>
     <string name="QuickResponseService_problem_sending_message">Πρόβλημα με την αποστολή μηνύματος!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Μη έγκυρη συντόμευση</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Νέο μήνυμα</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Αίτημα μηνύματος</string>
     <string name="SingleRecipientNotificationBuilder_you">Εσύ</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Αυτή η συσκευή δεν είναι πλέον εγγεγραμμένη. Αυτό συνέβη μάλλον επειδή καταχώρησες τον αριθμό τηλεφώνου σου στο Signal σε άλλη συσκευή.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Αυτή η συσκευή δεν είναι πλέον εγγεγραμμένη. Αυτό συνέβη μάλλον επειδή καταχώρησες τον αριθμό τηλεφώνου σου στο Molly σε άλλη συσκευή.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Επανεγγραφή συσκευής</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Για να απαντήσεις στη κλήση, δώσε στο Signal πρόσβαση στο μικρόφωνο.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Για να απαντήσεις στη κλήση, δώσε στο Molly πρόσβαση στο μικρόφωνο.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Για να απαντήσεις στη βιντεοκλήση, δώσε στο Signal πρόσβαση στο μικρόφωνο και στην κάμερα.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Το Signal χρειάζεται τα δικαιώματα Μικροφώνου και Κάμερας για την πραγματοποίηση κλήσεων, αλλά αυτά δεν έχουν δοθεί μόνιμα. Παρακαλώ πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα \"Δικαιώματα\", και ενεργοποίησε το \"Μικρόφωνο\" και \"Κάμερα\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Για να απαντήσεις στη βιντεοκλήση, δώσε στο Molly πρόσβαση στο μικρόφωνο και στην κάμερα.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Το Molly χρειάζεται τα δικαιώματα Μικροφώνου και Κάμερας για την πραγματοποίηση κλήσεων, αλλά αυτά δεν έχουν δοθεί μόνιμα. Παρακαλώ πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα \"Δικαιώματα\", και ενεργοποίησε το \"Μικρόφωνο\" και \"Κάμερα\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Απαντήθηκε από συνδεμένη συσκευή.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Απορρίφθηκε απο συνδεμένη συσκευή.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Απασχολημένος/η από συνδεμένη συσκευή.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Νέο συνθηματικό (ξανά)</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Πρόσκληση στο Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Πρόσκληση στο Molly</string>
     <string name="contact_selection_activity__new_group">Νέα ομάδα</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Ανανέωση επαφών</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Λείπει κάποια επαφή; Κάνε ανανέωση</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Βρες άτομα που γνωρίζεις στο Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Να δοθεί πρόσβαση στις επαφές</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Περισσότερα</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Φωτογραφία επαφής</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Το Signal χρειάζεται τα δικαιώματα Επαφών για την εμφάνιση των επαφών σου, αλλά αυτά δεν έχουν δοθεί μόνιμα. Παρακαλώ πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα \"Δικαιώματα\", και ενεργοποίησε τις \"Επαφές\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Το Molly χρειάζεται τα δικαιώματα Επαφών για την εμφάνιση των επαφών σου, αλλά αυτά δεν έχουν δοθεί μόνιμα. Παρακαλώ πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα \"Δικαιώματα\", και ενεργοποίησε τις \"Επαφές\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Σφάλμα κατά τη λήψη επαφών, έλεγξε τη σύνδεσή σου στο δίκτυο</string>
     <string name="ContactSelectionListFragment_username_not_found">Το όνομα χρήστη δε βρέθηκε</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"Ο/Η \"%1$s\" δεν είναι χρήστης του Signal. Παρακαλώ επιβεβαίωσε το όνομα χρήστη και ξαναδοκίμασε."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Αναζήτηση ως όνομα χρήστη</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Να δοθεί πρόσβαση στις επαφές</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Για να βρεις άτομα που γνωρίζεις στο Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Να δοθεί πρόσβαση</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Όχι, ευχαριστώ</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Να δοθεί πρόσβαση στις επαφές σου. Οι επαφές σου είναι κρυπτογραφημένες και δεν είναι ορατές στην υπηρεσία Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Το Signal χρειάζεται πρόσβαση στις επαφές σου για να μπορέσει να τις εμφανίσει.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Το Molly χρειάζεται πρόσβαση στις επαφές σου για να μπορέσει να τις εμφανίσει.</string>
     <string name="contact_selection_list_fragment__show_contacts">Εμφάνιση επαφών</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Έχεις καταργήσει αυτό το άτομο, αν του στείλεις ξανά μήνυμα θα το προσθέσεις ξανά στη λίστα σου.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Επιλογές</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Ενημέρωση</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Αναπαραγωγή … Παύση</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Τα Bubbles είναι ένα χαρακτηριστικό του Android που μπορείς να απενεργοποιήσεις για συνομιλίες Signal</string>
+    <string name="BubbleOptOutTooltip__description">Τα Bubbles είναι ένα χαρακτηριστικό του Android που μπορείς να απενεργοποιήσεις για συνομιλίες Molly</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Όχι τώρα</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Περιγραφή ομάδας</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Αναβάθμιση του Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Αναβάθμιση του Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Αυτή η έκδοση Signal έχει λήξει. Αναβάθμισε τώρα για να συνεχίσεις να χρησιμοποιείς το Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Αυτή η έκδοση Molly έχει λήξει. Αναβάθμισε τώρα για να συνεχίσεις να χρησιμοποιείς το Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Ενημέρωση</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Αργό</string>
     <string name="preferences__help">Βοήθεια</string>
     <string name="preferences__advanced">Για προχωρημένους</string>
-    <string name="preferences__donate_to_signal">Κάνε μια δωρεά στο Signal</string>
+    <string name="preferences__donate_to_signal">Κάνε μια δωρεά στο Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Ιδιωτικότητα</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Αλλαγή του εικονιδίου και ονόματος της εφαρμογής σε \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Θα πρέπει να κλείσεις το Signal για να αλλάξεις το εικονίδιο και το όνομα της εφαρμογής. Οι ειδοποιήσεις θα εμφανίζουν πάντα το προεπιλεγμένο εικονίδιο και το όνομα Signal.</string>
+    <string name="preferences__app_icon_dialog_description">Θα πρέπει να κλείσεις το Molly για να αλλάξεις το εικονίδιο και το όνομα της εφαρμογής. Οι ειδοποιήσεις θα εμφανίζουν πάντα το προεπιλεγμένο εικονίδιο και το όνομα Molly.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Επίλεξε ένα εικονίδιο και ένα όνομα της εφαρμογής, τα οποία θα είναι ορατά στην αρχική οθόνη και στο συρτάρι εφαρμογών του τηλεφώνου σου. Οι ειδοποιήσεις θα εμφανίζουν πάντα το προεπιλεγμένο εικονίδιο και το όνομα Signal. Μάθε περισσότερα</string>
+    <string name="preferences__app_icon_warning_learn_more">Επίλεξε ένα εικονίδιο και ένα όνομα της εφαρμογής, τα οποία θα είναι ορατά στην αρχική οθόνη και στο συρτάρι εφαρμογών του τηλεφώνου σου. Οι ειδοποιήσεις θα εμφανίζουν πάντα το προεπιλεγμένο εικονίδιο και το όνομα Molly. Μάθε περισσότερα</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Τα εικονίδια και τα ονόματα εφαρμογών είναι ορατά στην αρχική οθόνη και στο συρτάρι εφαρμογών.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Οι ειδοποιήσεις θα εμφανίζουν πάντα το προεπιλεγμένο εικονίδιο και το όνομα Signal.</string>
+    <string name="preferences__app_icon_notification_warning">Οι ειδοποιήσεις θα εμφανίζουν πάντα το προεπιλεγμένο εικονίδιο και το όνομα Molly.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Μάθε περισσότερα</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Περιορίζει όλες τις συνομιλίες στα %1$s πιο πρόσφατα μηνύματα.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Με αυτή την ενέργεια, θα διαγραφεί μόνιμα όλο το ιστορικό μηνυμάτων και τα πολυμέσα από τη συσκευή σου.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Αυτό θα διαγράψει μόνιμα όλο το ιστορικό μηνυμάτων και τα πολυμέσα από τη συσκευή σου και τυχόν συνδεδεμένες συσκευές.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Θέλεις σίγουρα να διαγράψεις όλο το ιστορικό των μηνυμάτων;</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Όλο το ιστορικό των μηνυμάτων θα αφαιρεθεί μόνιμα. Δεν θα έχεις τη δυνατότητα να αναιρέσεις την ενέργεια.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Όλο το ιστορικό των μηνυμάτων θα αφαιρεθεί μόνιμα από όλες τις συσκευές. Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.</string>
     <string name="preferences_storage__delete_all_now">Διαγραφή όλων τώρα</string>
     <string name="preferences_storage__forever">Για πάντα</string>
     <string name="preferences_storage__one_year">1 έτος</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Παράκαμψη λογοκρισίας</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Παράκαμψη λογοκρισίας</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Αν είναι ενεργοποιημένο, το Signal θα προσπαθήσει να παρακάμψει την λογοκρισία. Μην ενεργοποιήσεις αυτή την επιλογή εκτός και αν βρίσκεσαι σε περιοχή όπου το Signal έχει λογοκριθεί/μπλοκαριστεί.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Αν είναι ενεργοποιημένο, το Molly θα προσπαθήσει να παρακάμψει την λογοκρισία. Μην ενεργοποιήσεις αυτή την επιλογή εκτός και αν βρίσκεσαι σε περιοχή όπου το Molly έχει λογοκριθεί/μπλοκαριστεί.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Η παράκαμψη λογοκρισίας ενεργοποιήθηκε βάσει του αριθμού τηλεφώνου του λογαριασμού σου.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Παρουσίαση των πληρωμών</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Ενεργοποίησε το MobileCoin, ένα νέο ψηφιακό νόμισμα με εστίαση στο απόρρητο, για να στέλνεις και να δέχεσαι στο Signal.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Ενεργοποίησε το MobileCoin, ένα νέο ψηφιακό νόμισμα με εστίαση στο απόρρητο, για να στέλνεις και να δέχεσαι στο Molly.</string>
     <string name="PaymentsHomeFragment__activate_payments">Ενεργοποίηση πληρωμών</string>
     <string name="PaymentsHomeFragment__activating_payments">Ενεργοποίηση πληρωμών…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Επαναφορά λογαριασμού πληρωμών</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Οι πληρωμές δεν είναι διαθέσιμες στην περιοχή σας.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Δεν ήταν δυνατή η ενεργοποίηση πληρωμών. Δοκιμάστε ξανά αργότερα.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Απενεργοποίηση πληρωμών;</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Δεν θα μπορείτε να στείλετε ή να λάβετε MobileCoin στο Signal εάν απενεργοποιήσετε τις πληρωμές.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Δεν θα μπορείτε να στείλετε ή να λάβετε MobileCoin στο Molly εάν απενεργοποιήσετε τις πληρωμές.</string>
     <string name="PaymentsHomeFragment__deactivate">Απενεργοποίηση</string>
     <string name="PaymentsHomeFragment__continue">Συνέχεια</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Το υπόλοιπο δεν είναι διαθέσιμο αυτήν τη στιγμή.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Λεπτομέρειες</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Μπορείς να χρησιμοποιήσεις το Signal για να στέλνεις και να λαμβάνεις MobileCoin. Όλες οι πληρωμές υπόκεινται στους Όρους Χρήσης για τα MobileCoin και το πορτοφόλι MobileCoin. Ενδέχεται να αντιμετωπίσεις ορισμένα ζητήματα και οι πληρωμές ή τα υπόλοιπα που μπορεί να χάσεις δεν μπορούν να ανακτηθούν. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Μπορείς να χρησιμοποιήσεις το Molly για να στέλνεις και να λαμβάνεις MobileCoin. Όλες οι πληρωμές υπόκεινται στους Όρους Χρήσης για τα MobileCoin και το πορτοφόλι MobileCoin. Ενδέχεται να αντιμετωπίσεις ορισμένα ζητήματα και οι πληρωμές ή τα υπόλοιπα που μπορεί να χάσεις δεν μπορούν να ανακτηθούν. </string>
     <string name="PaymentsHomeFragment__activate">Ενεργοποίηση</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Προβολή όρων MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Οι πληρωμές στο Signal δεν είναι πλέον διαθέσιμες. Μπορείτε ακόμα να μεταφέρετε χρήματα προς ένα ανταλλακτήριο, αλλά δεν μπορείτε πλέον να στέλνετε και να λαμβάνετε πληρωμές ή να προσθέτετε χρήματα.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Οι πληρωμές στο Molly δεν είναι πλέον διαθέσιμες. Μπορείτε ακόμα να μεταφέρετε χρήματα προς ένα ανταλλακτήριο, αλλά δεν μπορείτε πλέον να στέλνετε και να λαμβάνετε πληρωμές ή να προσθέτετε χρήματα.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Να δοθούν δικαιώματα</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Η Signal θα ζητήσει αυτές τις άδειες, για να σε βοηθήσει να στέλνεις μηνύματα σε άτομα που γνωρίζεις. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Η Molly θα ζητήσει αυτές τις άδειες, για να σε βοηθήσει να στέλνεις μηνύματα σε άτομα που γνωρίζεις. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Ειδοποιήσεις</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Επόμενο</string>
     <string name="PaymentsTransferFragment__invalid_address">Μη έγκυρη διεύθυνση</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Ελέγξτε τη διεύθυνση πορτοφολιού στην οποία προσπαθείτε να μεταφέρετε και δοκιμάστε ξανά.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Δεν μπορείτε να πραγματοποιήσετε μεταφορά στη δική σας διεύθυνση πορτοφολιού Signal. Εισαγάγετε τη διεύθυνση πορτοφολιού στον λογαριασμό σας σε ένα υποστηριζόμενο ανταλλακτήριο.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Για να σαρώσει έναν κωδικό QR, το Signal χρειάζεται πρόσβαση στην κάμερα.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Το Signal χρειάζεται την άδεια της κάμερας για να καταγράψει έναν κωδικό QR. Μεταβείτε στις ρυθμίσεις, επιλέξτε Άδειες και ενεργοποιήστε την Κάμερα.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Για να σαρώσετε έναν κωδικό QR, το Signal χρειάζεται πρόσβαση στην κάμερά σας.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Δεν μπορείτε να πραγματοποιήσετε μεταφορά στη δική σας διεύθυνση πορτοφολιού Molly. Εισαγάγετε τη διεύθυνση πορτοφολιού στον λογαριασμό σας σε ένα υποστηριζόμενο ανταλλακτήριο.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Για να σαρώσει έναν κωδικό QR, το Molly χρειάζεται πρόσβαση στην κάμερα.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Το Molly χρειάζεται την άδεια της κάμερας για να καταγράψει έναν κωδικό QR. Μεταβείτε στις ρυθμίσεις, επιλέξτε Άδειες και ενεργοποιήστε την Κάμερα.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Για να σαρώσετε έναν κωδικό QR, το Molly χρειάζεται πρόσβαση στην κάμερά σας.</string>
     <string name="PaymentsTransferFragment__settings">Ρυθμίσεις</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Εισερχόμενη ηχητική κλήση Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Εισερχόμενη ηχητική κλήση Molly</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Εισερχόμενη βιντεοκλήση Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Εισερχόμενη βιντεοκλήση Molly</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Εισερχόμενη ομαδική κλήση Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Εισερχόμενη ομαδική κλήση Molly</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Ηχητική κλήση Signal σε εξέλιξη</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Ηχητική κλήση Molly σε εξέλιξη</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Βιντεοκλήση Signal σε εξέλιξη</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Βιντεοκλήση Molly σε εξέλιξη</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Ομαδική κλήση Signal σε εξέλιξη</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Ομαδική κλήση Molly σε εξέλιξη</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Φόρτωση…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Επιβεβαίωση</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Εισάγατε το συνθηματικό αντιγράφου ασφαλείας με επιτυχία</string>
     <string name="BackupDialog_passphrase_was_not_correct">Το συνθηματικό δεν ήταν σωστό</string>
-    <string name="LocalBackupJob_creating_signal_backup">Δημιουργείται το αντίγραφο ασφαλείας Signal…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Δημιουργείται το αντίγραφο ασφαλείας Molly…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Επιβεβαίωση αντιγράφου ασφαλείας Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Επιβεβαίωση αντιγράφου ασφαλείας Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">Ή δημιουργία αντίγραφου ασφαλείας απέτυχε</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Ο φάκελος αντίγραφων ασφαλείας έχει διαγραφεί ή μετακινηθεί.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Το αρχείο - αντίγραφο ασφαλείας είναι πολύ μεγάλο για να αποθηκευτεί σε αυτή τη συσκευή.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Κάλεσέ με (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Επαναποστολή κωδικού σε(%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Επικοινωνία με την Υποστήριξη Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Εγγραφή Signal - Κωδικός επαλήθευσης για Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Επικοινωνία με την Υποστήριξη Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Εγγραφή Molly - Κωδικός επαλήθευσης για Android</string>
     <string name="RegistrationActivity_incorrect_code">Λάθος κωδικός</string>
     <string name="BackupUtil_never">Ποτέ</string>
     <string name="BackupUtil_unknown">Άγνωστο</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Αριθμός τηλεφώνου</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Επίλεξε ποια άτομα μπορούν να δουν τον αριθμό τηλεφώνου σου και ποια μπορούν να τον χρησιμοποιήσουν για να επικοινωνήσουν μαζί σου στο Signal.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Επίλεξε ποια άτομα μπορούν να δουν τον αριθμό τηλεφώνου σου και ποια μπορούν να τον χρησιμοποιήσουν για να επικοινωνήσουν μαζί σου στο Molly.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Ποιοι χρήστες μπορούν να δουν τον αριθμό μου</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Προσπάθησες πάρα πολλές φορές. Παρακαλώ ξαναδοκίμασε αργότερα.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Σφάλμα κατά τη σύνδεση στην υπηρεσία</string>
     <string name="preferences_chats__backups">Αντίγραφα ασφαλείας</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Το Signal είναι κλειδωμένο</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Το Molly είναι κλειδωμένο</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">ΠΑΤΑ ΓΙΑ ΞΕΚΛΕΙΔΩΜΑ</string>
     <string name="Recipient_unknown">Άγνωστο</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Χρειάζεται να έχεις πρόσβαση στη παλιά σου συσκευή.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Επαναφορά από αντίγραφο ασφαλείας</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Επανάφερε τα μηνύματά σου από ένα τοπικό αντίγραφο ασφαλείας. Αν δεν τα επαναφέρεις τώρα, δε θα μπορείς να τα επαναφέρεις αργότερα.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Επαναφορά τοπικού αντιγράφου ασφαλείας</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Επαναφορά αντίγραφου ασφαλείας Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Επαναφορά όλων των μηνυμάτων κειμένου + των πολυμέσων των τελευταίων 30 ημερών</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Περισσότερες επιλογές</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Ακύρωση</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Σύνδεση χωρίς μεταφορά</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Συνέχεια χωρίς μεταφορά μηνυμάτων και πολυμέσων</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Άνοιξε το Signal στη παλιά σου συσκευή Android</string>
     <string name="NewDeviceTransferInstructions__continue">Συνέχεια</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Προετοιμαζόμαστε να συνδεθούμε με τη παλιά συσκευή Android…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Θα πάρει μερικές στιγμές, θα είμαστε έτοιμοι σύντομα</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Περιμένουμε να συνδεθεί η παλιά συσκευή Android…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Το Signal χρειάζεται την άδεια τοποθεσίας για να ανακαλύψει και να συνδεθεί στη παλιά σου συσκευή Android.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Το Signal χρειάζεται να έχεις την τοποθεσία ενεργοποιημένη για να ανακαλύψει και να συνδεθεί στη παλιά σου συσκευή Android.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Το Signal χρειάζεται ενεργοποιημένο το Wi-Fi για να ανακαλύψει και να συνδεθεί στη παλιά σου συσκευή Android. Το Wi-Fi χρειάζεται να είναι ενεργοποιημένο αλλά δεν χρειάζεται να είναι συνδεδεμένο σε κάποιο δίκτυο Wi-Fi.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Συγγνώμη, φαίνεται πως αυτή η συσκευή δεν υποστηρίζει το Wi-Fi Direct. Το Signal χρησιμοποιεί το Wi-Fi Direct για να ανακαλύψει και να συνδεθεί με τη παλιά σου συσκευή Android. Μπορείς παρ\' όλα αυτά να επαναφέρεις ένα αντίγραφο ασφαλείας, για να επαναφέρεις τον λογαριασμό σου από τη παλιά σου συσκευή Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Το Molly χρειάζεται την άδεια τοποθεσίας για να ανακαλύψει και να συνδεθεί στη παλιά σου συσκευή Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Το Molly χρειάζεται να έχεις την τοποθεσία ενεργοποιημένη για να ανακαλύψει και να συνδεθεί στη παλιά σου συσκευή Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Το Molly χρειάζεται ενεργοποιημένο το Wi-Fi για να ανακαλύψει και να συνδεθεί στη παλιά σου συσκευή Android. Το Wi-Fi χρειάζεται να είναι ενεργοποιημένο αλλά δεν χρειάζεται να είναι συνδεδεμένο σε κάποιο δίκτυο Wi-Fi.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Συγγνώμη, φαίνεται πως αυτή η συσκευή δεν υποστηρίζει το Wi-Fi Direct. Το Molly χρησιμοποιεί το Wi-Fi Direct για να ανακαλύψει και να συνδεθεί με τη παλιά σου συσκευή Android. Μπορείς παρ\' όλα αυτά να επαναφέρεις ένα αντίγραφο ασφαλείας, για να επαναφέρεις τον λογαριασμό σου από τη παλιά σου συσκευή Android.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Επαναφορά αντίγραφου ασφαλείας</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Συνέβη ένα μη αναμενόμενο σφάλμα κατά την απόπειρα σύνδεσης στη παλιά σου συσκευή Android.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Αναζητούμε τη νέα συσκευή Android…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Το Signal χρειάζεται την άδεια τοποθεσίας για να ανακαλύψει και να συνδεθεί στη νέα σου συσκευή Android.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Το Signal χρειάζεται να έχεις την τοποθεσία ενεργοποιημένη για να ανακαλύψει και να συνδεθεί στη νέα σου συσκευή Android.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Το Signal χρειάζεται ενεργοποιημένο το Wi-Fi για να ανακαλύψει και να συνδεθεί στη νέα σου συσκευή Android. Το Wi-Fi χρειάζεται να είναι ενεργοποιημένο αλλά δεν χρειάζεται να είναι συνδεδεμένο σε κάποιο δίκτυο Wi-Fi.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Συγγνώμη, φαίνεται πως αυτή η συσκευή δεν υποστηρίζει το Wi-Fi Direct. Το Signal χρησιμοποιεί το Wi-Fi Direct για να ανακαλύψει και να συνδεθεί με τη νέα σου συσκευή Android. Μπορείς παρ\' όλα αυτά να επαναφέρεις ένα αντίγραφο ασφαλείας, για να επαναφέρεις τον λογαριασμό σου από τη παλιά σου συσκευή Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Το Molly χρειάζεται την άδεια τοποθεσίας για να ανακαλύψει και να συνδεθεί στη νέα σου συσκευή Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Το Molly χρειάζεται να έχεις την τοποθεσία ενεργοποιημένη για να ανακαλύψει και να συνδεθεί στη νέα σου συσκευή Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Το Molly χρειάζεται ενεργοποιημένο το Wi-Fi για να ανακαλύψει και να συνδεθεί στη νέα σου συσκευή Android. Το Wi-Fi χρειάζεται να είναι ενεργοποιημένο αλλά δεν χρειάζεται να είναι συνδεδεμένο σε κάποιο δίκτυο Wi-Fi.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Συγγνώμη, φαίνεται πως αυτή η συσκευή δεν υποστηρίζει το Wi-Fi Direct. Το Molly χρησιμοποιεί το Wi-Fi Direct για να ανακαλύψει και να συνδεθεί με τη νέα σου συσκευή Android. Μπορείς παρ\' όλα αυτά να επαναφέρεις ένα αντίγραφο ασφαλείας, για να επαναφέρεις τον λογαριασμό σου από τη παλιά σου συσκευή Android.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Δημιουργία αντίγραφου ασφαλείας</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Συνέβη ένα μη αναμενόμενο σφάλμα κατά την απόπειρα σύνδεσης στη νέα σου συσκευή Android.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Μεταφορά δεδομένων</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Κράτα και τις δύο συσκευές κοντά τη μια στην άλλη. Μην απενεργοποιήσεις τις συσκευές και άφησε το Signal ανοιχτό. Οι μεταφορές είναι κρυπτογραφημένες από άκρο σε άκρο.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Κράτα και τις δύο συσκευές κοντά τη μια στην άλλη. Μην απενεργοποιήσεις τις συσκευές και άφησε το Molly ανοιχτό. Οι μεταφορές είναι κρυπτογραφημένες από άκρο σε άκρο.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d μηνύματα μέχρι τώρα…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% των μηνυμάτων μέχρι τώρα…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Μεταφορά Λογαριασμού</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Κατέβασε το Signal στη νέα σου συσκευή Android</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Κατέβασε το Molly στη νέα σου συσκευή Android</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Πάτα \"Μεταφορά ή επαναφορά λογαριασμού\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Με αυτό τον σύνδεσμο, οποιοσδήποτε μπορεί να δεί το όνομα και τη φωτογραφία της ομάδας, και να ζητήσει να μπει σε αυτήν. Μοιράσου τον μόνο με άτομα που εμπιστεύεσαι.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Με αυτό τον σύνδεσμο, οποιοσδήποτε μπορεί να δεί το όνομα και τη φωτογραφία της ομάδας, και να μπει σε αυτήν. Μοιράσου τον μόνο με άτομα που εμπιστεύεσαι.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Μοιράσου μέσω Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Μοιράσου μέσω Molly</string>
     <string name="GroupLinkBottomSheet_copy">Αντιγραφή</string>
     <string name="GroupLinkBottomSheet_qr_code">Κωδικός QR</string>
     <string name="GroupLinkBottomSheet_share">Μοιράσου</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">Σχετικά με το MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">Το MobileCoin είναι ένα νέο ψηφιακό νόμισμα που επικεντρώνεται στο απόρρητο.</string>
     <string name="payment_info_card_adding_funds">Προσθήκη χρημάτων</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Μπορείτε να προσθέσετε χρήματα για χρήση στο Signal στέλνοντας MobileCoin στη διεύθυνση πορτοφολιού σας.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Μπορείτε να προσθέσετε χρήματα για χρήση στο Molly στέλνοντας MobileCoin στη διεύθυνση πορτοφολιού σας.</string>
     <string name="payment_info_card_cashing_out">Εξαργύρωση</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Μπορείτε να εξαργυρώσετε MobileCoin ανά πάσα στιγμή σε ένα ανταλλακτήριο που υποστηρίζει το MobileCoin. Απλά κάντε μεταφορά στον λογαριασμό σας στο εν λόγω ανταλλακτήριο.</string>
     <string name="payment_info_card_hide_this_card">Απόκρυψη αυτής της κάρτας;</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Απενεργοποίηση Πορτοφολιού</string>
     <string name="DeactivateWalletFragment__your_balance">Το Υπόλοιπό Σας</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Συνιστάται να μεταφέρεις τα χρήματά σου σε άλλη διεύθυνση πορτοφολιού πριν απενεργοποιήσεις τις πληρωμές. Εάν επιλέξεις να μη μεταφέρεις τα χρήματά σου τώρα, θα παραμείνουν στο πορτοφόλι σου που είναι συνδεδεμένο με το Signal εάν ενεργοποιήσεις εκ νέου τις πληρωμές.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Συνιστάται να μεταφέρεις τα χρήματά σου σε άλλη διεύθυνση πορτοφολιού πριν απενεργοποιήσεις τις πληρωμές. Εάν επιλέξεις να μη μεταφέρεις τα χρήματά σου τώρα, θα παραμείνουν στο πορτοφόλι σου που είναι συνδεδεμένο με το Molly εάν ενεργοποιήσεις εκ νέου τις πληρωμές.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Μεταφορά εναπομείναντος υπολοίπου</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Απενεργοποίηση χωρίς μεταφορά</string>
     <string name="DeactivateWalletFragment__deactivate">Απενεργοποίηση</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Απενεργοποίηση χωρίς μεταφορά;</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Το υπόλοιπό σου θα παραμείνει στο πορτοφόλι που είναι συνδεδεμένο με το Signal, εάν επιλέξεις να ενεργοποιήσεις εκ νέου τις πληρωμές.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Το υπόλοιπό σου θα παραμείνει στο πορτοφόλι που είναι συνδεδεμένο με το Molly, εάν επιλέξεις να ενεργοποιήσεις εκ νέου τις πληρωμές.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Σφάλμα κατά την απενεργοποίηση πορτοφολιού.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Άδειες</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Όροι &amp; Πολιτική Απορρήτου</string>
-    <string name="HelpFragment__copyright_signal_messenger">Copyright Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Copyright Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Υπό τους όρους της άδειας GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4773,7 +4911,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">Αυτόματο</string>
+    <string name="ChatColorSelectionFragment__auto">Αυτ.</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Χρήση προσαρμοσένων χρωμάτων</string>
     <string name="ChatColorSelectionFragment__chat_color">Χρώμα συνομιλίας</string>
     <string name="ChatColorSelectionFragment__edit">Eπεξεργασία</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Επιλογή χρώματος</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Μοιράσου</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Μόνο οι διαχειριστές μπορούν να στέλνουν μηνύματα σε αυτή την ομάδα.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Το όριο ξεπεράστηκε</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Δεν μπορείς να επιλέξεις πάνω από 5 συνομιλίες</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Μάθε περισσότερα</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Αναβάθμιση του Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Αναβάθμιση του Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Αυτή η έκδοση Signal έχει λήξει. Αναβάθμισε τώρα για να συνεχίσεις να χρησιμοποιείς το Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Αυτή η έκδοση Molly έχει λήξει. Αναβάθμισε τώρα για να συνεχίσεις να χρησιμοποιείς το Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Ενημέρωση</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Η συσκευή δεν είναι καταχωρημένη</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Αυτή η συσκευή δεν είναι πλέον καταχωρημένη. Κάνε επανεγγραφή για να συνεχίσεις να χρησιμοποιείς το Signal σε αυτήν τη συσκευή.</string>
+    <string name="ReregisterSignalDialog__message">Αυτή η συσκευή δεν είναι πλέον καταχωρημένη. Κάνε επανεγγραφή για να συνεχίσεις να χρησιμοποιείς το Molly σε αυτήν τη συσκευή.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Επανεγγραφή</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Αποτυχία ανοίγματος επιλογέα.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Για να ενεργοποιήσεις τις ειδοποιήσεις, το Signal χρειάζεται άδεια για να τις εμφανίσει.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Για να ενεργοποιήσεις τις ειδοποιήσεις, το Molly χρειάζεται άδεια για να τις εμφανίσει.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Ενεργοποίηση</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Καμία απάντηση ακόμα</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Δεν μπορείς να απαντήσεις σε αυτήν την ιστορία γιατί δεν είσαι πια μέλος της ομάδας.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Αντέδρασε στην ιστορία</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Αντέδρασες στην ιστορία</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Αντέδρασε στην ιστορία</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Προβολές</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Διάλεξε την τράπεζά σου</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">%1$s: Επιβεβαίωσε τη δωρεά σου</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Για να ρυθμίσεις την επαναλαμβανόμενη δωρεά σου, πάτα \"Συνέχεια\" για να επιβεβαιώσεις μια χρέωση 0,01 € στην τράπεζά σου. Το ποσό θα επιστραφεί αυτόματα και θα επιτρέψει τη χρέωση της δωρεάς σου για 5€/μήνα από τον λογαριασμό σου.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Για να ρυθμίσεις την επαναλαμβανόμενη δωρεά σου, πάτα \"Συνέχεια\" για να επιβεβαιώσεις μια χρέωση 0,01 € στην τράπεζά σου. Το ποσό θα επιστραφεί αυτόματα και θα επιτρέψει τη χρέωση της δωρεάς σου για %1$s/μήνα από τον λογαριασμό σου.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Συνέχεια</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Λήψη δεδομένων αντιγράφου ασφαλείας…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Η δημιουργία αντιγράφων ασφαλείας των πολυμέσων είναι απενεργοποιημένη</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Το πρόγραμμα δημιουργίας αντιγράφων ασφαλείας των πολυμέσων Signal ακυρώθηκε επειδή δεν μπορέσαμε να επεξεργαστούμε την πληρωμή σου. Έχεις %1$d ημέρα για να κατεβάσεις όλα τα πολυμέσα που είναι αποθηκευμένα ως αντίγραφα ασφαλείας. Μετά από %1$d ημέρα, τα πολυμέσα στο αντίγραφο ασφαλείας σου θα διαγραφούν.</item>
+        <item quantity="other">Το πρόγραμμα δημιουργίας αντιγράφων ασφαλείας των πολυμέσων Signal ακυρώθηκε επειδή δεν μπορέσαμε να επεξεργαστούμε την πληρωμή σου. Έχεις %1$d ημέρες για να κατεβάσεις όλα τα πολυμέσα που είναι αποθηκευμένα ως αντίγραφα ασφαλείας. Μετά από %1$d ημέρες, τα πολυμέσα στο αντίγραφο ασφαλείας σου θα διαγραφούν.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Μπορείς να αρχίσετε να πληρώνετε ξανά για τα αντίγραφα ασφαλείας ανά πάσα στιγμή για να συνεχίσεις να δημιουργείς αντίγραφα ασφαλείας για όλα τα πολυμέσα σου. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Τα πολυμέσα σου θα διαγραφούν σήμερα</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Το πρόγραμμα δημιουργίας αντιγράφων ασφαλείας των πολυμέσων Signal ακυρώθηκε επειδή δεν μπορέσαμε να επεξεργαστούμε την πληρωμή σου. Αυτή είναι η τελευταία σου ευκαιρία να κατεβάσετε τα πολυμέσα σου ως αντίγραφα ασφαλείας πριν διαγραφούν.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Δεν είναι δυνατή η ολοκλήρωση της λήψης</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Η συσκευή σου δεν διαθέτει αρκετό ελεύθερο χώρο. Απελευθέρωσε έως και %1$s χώρου και κάνε λήψη των πολυμέσων που είναι αποθηκευμένα ως αντίγραφα ασφαλείας.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Αν επιλέξεις \"Παράλειψη\", τα πολυμέσα στο αντίγραφο ασφαλείας θα διαγραφούν σε %1$d ημέρα.</item>
+        <item quantity="other">Αν επιλέξεις \"Παράλειψη\", τα πολυμέσα στο αντίγραφο ασφαλείας θα διαγραφούν σε %1$d ημέρες.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Δεν ήταν δυνατή η διαδικασία πληρωμής της δημιουργίας αντιγράφων ασφαλείας</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Έχουμε δυσκολίες με το να λάβουμε την επαναλαμβανόμενη πληρωμή για τη μηνιαία δημιουργία αντιγράφων ασφαλείας. Επιβεβαίωσε πως η μέθοδος πληρωμής είναι επικαιροποιημένη. Αν δεν είναι, επικαιροποίησέ την στο Google Pay. Το Signal θα προσπαθήσει να πραγματοποιήσει αυτή τη πληρωμή ξανά σε μερικές ημέρες.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Δεν ήταν δυνατή η ολοκλήρωση δημιουργίας αντιγράφων ασφαλείας</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Η συσκευή σου δεν έχει ολοκληρώσει τη δημιουργία αντιγράφων ασφαλείας για %1$d ημέρες. Βεβαιώσου ότι η συσκευή σου είναι συνδεδεμένη σε wi-fi και πατήστε \"Δημιουργία αντιγράφων ασφαλείας τώρα.\" </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Μάθε περισσότερα</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Παράλειψη</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Λήψη πολυμέσων τώρα</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Λήψη αργότερα</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Να μην γίνει λήψη των πολυμέσων</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Απελευθέρωσε έως και %1$s χώρου και κάνε λήψη των πολυμέσων σου.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Πιστωτική ή χρεωστική κάρτα</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Άγνωστο</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Ιστορικό πληρωμών</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Το τελευταίο σου αντίγραφο ασφαλείας έγινε στις %1$s στις %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Τα μηνύματα που είναι παλαιότερα από τον επιλεγμένο χρόνο θα διαγραφούν οριστικά.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Τα μηνύματα που υπερβαίνουν το επιλεγμένο μέγεθος θα διαγραφούν οριστικά.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Εφαρμογή ορίων σε συνδεδεμένες συσκευές</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Όταν η επιλογή είναι ενεργοποιημένη, τα όρια συνομιλίας θα διαγράφουν επίσης μηνύματα από τις συνδεδεμένες συσκευές σου.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Η διαγραφή έχει συγχρονιστεί με όλες τις συσκευές σου</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Όταν διαγράφεις μηνύματα ή συνομιλίες, θα διαγραφούν από το τηλέφωνό σου και από τις συνδεδεμένες συσκευές.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Ιστορικό πληρωμών</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Αντίγραφα ασφαλείας κειμένου και όλων των πολυμέσων</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Στοιχεία πληρωμής</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Τύπος αντιγράφου ασφαλείας</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Ημερομηνία πληρωμής</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Μοιράσου</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Αντίγραφα ασφαλείας Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Ιστορικό πληρωμών</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Λεπτομέρειες αντιγράφου ασφαλείας</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Μέγεθος αντίγραφου ασφαλείας</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Συχνότητα αντιγράφου ασφαλείας</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Αντίγραφο ασφαλείας με δεδομένα κινητής</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Απενεργοποίηση και διαγραφή αντιγράφων ασφαλείας</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Το αντίγραφο ασφαλείας διαγράφηκε και απενεργοποιήθηκε.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Ο τύπος αντιγράφου ασφαλείας άλλαξε και η συνδρομή ακυρώθηκε</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Η συνδρομή ακυρώθηκε</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Η λήψη ολοκληρώθηκε</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Τύπος αντιγράφου ασφαλείας</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Τα αντίγραφα ασφαλείας απενεργοποιήθηκαν</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/μήνα</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Ενεργοποίηση αντίγραφων ασφαλείας</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Τελευταίο αντίγραφο ασφαλείας</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s στις %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Ποτέ</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Δημιουργία αντίγραφου τώρα</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Απενεργοποίηση και διαγραφή αντιγράφων ασφαλείας;</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Δεν θα χρεωθείς ξανά. Το αντίγραφο ασφαλείας σου θα διαγραφεί και δεν θα δημιουργηθούν νέα αντίγραφα ασφαλείας.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Απενεργοποίηση και διαγραφή</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Διαγραφή αντιγράφων ασφαλείας…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Το αντίγραφο ασφαλείας διαγράφηκε</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Πατώντας Δημιουργία αντίγραφου τώρα"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Καθημερινά</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Κάθε εβδομάδα</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Μηνιαία</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Δημιουργία αντιγράφων ασφαλείας χειροκίνητα</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Γράψε τον κωδικό PIN, τον κωδικό πρόσβασης ή το μοτίβο της συσκευής σου.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Επόμενο</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Αλλαγή τύπου αντιγράφων ασφαλείας</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Ακύρωση συνδρομής</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Επιβεβαίωση ακύρωσης</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Δεν θα χρεωθείς ξανά. Η δημιουργία αντιγράφων ασφαλείας θα απενεργοποιηθεί στο τέλος του κύκλου χρέωσης. Μετά από αυτή την ημερομηνία θα έχεις 30 ημέρες για να κατεβάσεις τα πολυμέσα για τα οποία δημιουργείς αντίγραφα ασφαλείας αυτήν τη στιγμή.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Επιβεβαίωση και λήψη τώρα</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Επιβεβαίωση και λήψη αργότερα</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Διατήρηση συνδρομής</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 518d9f413a..0bdf07b23a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -21,7 +22,7 @@
     <string name="yes">Sí</string>
     <string name="no">No</string>
     <string name="delete">Eliminar</string>
-    <string name="please_wait">Espera, por favor…</string>
+    <string name="please_wait">Espera un momento…</string>
     <string name="save">Guardar</string>
     <string name="note_to_self">Notas privadas</string>
 
@@ -38,20 +39,20 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal se está actualizando …</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly se está actualizando…</string>
 
     <!-- ApplicationPreferencesActivity -->
-    <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">¡Todavía no has fijado una clave de acceso!</string>
+    <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Todavía no has creado una clave de acceso.</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">¿Desactivar clave de acceso?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Esto desbloqueará permanentemente Signal y las notificaciones por mensajes.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Esto desbloqueará Molly y las notificaciones de mensajes de forma permanente.</string>
     <string name="ApplicationPreferencesActivity_disable">Desactivar</string>
-    <string name="ApplicationPreferencesActivity_error_connecting_to_server">¡Fallo al conectarse al servidor!</string>
-    <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">El bloqueo de registro necesita el PIN. Desactiva primero el bloqueo de registro y después el PIN.</string>
+    <string name="ApplicationPreferencesActivity_error_connecting_to_server">Error de conexión con el servidor</string>
+    <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">Se necesita el PIN para el bloqueo de registro. Desactiva primero el bloqueo de registro y después el PIN.</string>
     <string name="ApplicationPreferencesActivity_pin_created">PIN creado.</string>
     <string name="ApplicationPreferencesActivity_pin_disabled">PIN desactivado.</string>
-    <string name="ApplicationPreferencesActivity_record_payments_recovery_phrase">Mostrar frase de recuperación</string>
-    <string name="ApplicationPreferencesActivity_record_phrase">Frase de recuperación</string>
-    <string name="ApplicationPreferencesActivity_before_you_can_disable_your_pin">Antes de desactivar tu PIN, debes guardar la frase de recuperación de tu cartera de pagos para asegurarte que puedas recuperar tu cuenta de pagos en un futuro.</string>
+    <string name="ApplicationPreferencesActivity_record_payments_recovery_phrase">Registrar clave de recuperación de pagos</string>
+    <string name="ApplicationPreferencesActivity_record_phrase">Registrar clave</string>
+    <string name="ApplicationPreferencesActivity_before_you_can_disable_your_pin">Antes de desactivar tu PIN, debes registrar la clave de recuperación de tu cartera de pagos para asegurarte de que puedas recuperar tu cuenta de pagos si lo necesitas.</string>
 
     <!-- NumericKeyboardView -->
   <!-- Removed by excludeNonTranslatables <string name="NumericKeyboardView__1" translatable="false">1</string> -->
@@ -71,40 +72,40 @@
     <string name="DraftDatabase_Draft_image_snippet">(imagen)</string>
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(vídeo)</string>
-    <string name="DraftDatabase_Draft_location_snippet">(posición)</string>
+    <string name="DraftDatabase_Draft_location_snippet">(ubicación)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(responder)</string>
-    <string name="DraftDatabase_Draft_voice_note">(Nota de voz)</string>
+    <string name="DraftDatabase_Draft_voice_note">(Mensaje de voz)</string>
 
     <!-- AttachmentKeyboard -->
     <string name="AttachmentKeyboard_gallery">Galería</string>
     <string name="AttachmentKeyboard_file">Archivo</string>
     <string name="AttachmentKeyboard_contact">Contacto</string>
-    <string name="AttachmentKeyboard_location">Posición</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal necesita permiso para mostrar tus fotos y vídeos</string>
+    <string name="AttachmentKeyboard_location">Ubicación</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly necesita permiso para mostrar tus fotos y vídeos</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Permitir acceso</string>
     <string name="AttachmentKeyboard_payment">Pago</string>
 
     <!-- AttachmentManager -->
-    <string name="AttachmentManager_cant_open_media_selection">No se pudo encontrar una aplicación para el contenido seleccionado.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal necesita acceso al almacenamiento de tu teléfono para adjuntar fotos, vídeos o audio. Por favor, ve a la aplicación «Ajustes», selecciona Signal en el menú «Aplicaciones y notificaciones» y en «Permisos» activa «Almacenamiento».</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal necesita acceso a los contactos en tu teléfono para adjuntar información de personas en tus chats. Por favor, ve a la aplicación «Ajustes», selecciona Signal en el menú «Aplicaciones y notificaciones» y en «Permisos» activa «Contactos».</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal necesita acceso a tu posición para adjuntar la información en tus chats. Por favor, ve a la aplicación «Ajustes», selecciona Signal en el menú «Aplicaciones y notificaciones» y en «Permisos» activa «Ubicación».</string>
+    <string name="AttachmentManager_cant_open_media_selection">No se puede encontrar una aplicación para el archivo seleccionado.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly necesita acceso al almacenamiento de tu teléfono para adjuntar fotos, vídeos o audio. Ve al menú «Ajustes» de tu dispositivo y selecciona Aplicaciones y notificaciones &gt; Molly &gt; Permisos de la aplicación &gt; Almacenamiento &gt; Permitir. Estos pasos pueden variar dependiendo de tu dispositivo.</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly necesita acceso a los contactos de tu teléfono para añadir información de tus contactos. Ve al menú «Ajustes» de tu dispositivo y selecciona Aplicaciones y notificaciones &gt; Molly &gt; Permisos de la aplicación &gt; Contactos &gt; Permitir. Estos pasos pueden variar dependiendo de tu dispositivo.</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly necesita acceso a tu ubicación para añadir una ubicación geográfica. Ve al menú «Ajustes» de tu dispositivo y selecciona Aplicaciones y notificaciones &gt; Molly &gt; Permisos de la aplicación &gt; Ubicación &gt; Permitir. Estos pasos pueden variar dependiendo de tu dispositivo.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Permitir acceso a tu ubicación</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Para enviar tu ubicación:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Permitir a Signal acceso para enviar tu ubicación.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Permite a Molly acceso para enviar tu ubicación.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal necesita acceso a los servicios de localización para enviar tu ubicación.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly necesita acceso a tu localización para enviar tu ubicación.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Permitir acceso al almacenamiento</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Para mostrar fotos y vídeos:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal necesita acceso a tu almacenamiento para mostrar tus fotos y vídeos.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly necesita acceso a tu almacenamiento para mostrar tus fotos y vídeos.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s no ha activado Pagos </string>
@@ -116,11 +117,11 @@
     <string name="AttachmentManager__cancel">Cancelar</string>
 
     <!-- AttachmentUploadJob -->
-    <string name="AttachmentUploadJob_uploading_media">Transfiriendo adjunto …</string>
-    <string name="AttachmentUploadJob_compressing_video_start">Comprimiendo vídeo …</string>
+    <string name="AttachmentUploadJob_uploading_media">Cargando archivo multimedia…</string>
+    <string name="AttachmentUploadJob_compressing_video_start">Comprimiendo vídeo…</string>
 
     <!-- BackgroundMessageRetriever -->
-    <string name="BackgroundMessageRetriever_checking_for_messages">Comprobando mensajes …</string>
+    <string name="BackgroundMessageRetriever_checking_for_messages">Comprobando mensajes…</string>
 
     <!-- Fcm notifications -->
     <!-- Notification we show when there may be messages for you, but we cannot connect to the server to check -->
@@ -132,7 +133,7 @@
     <string name="BlockedUsersActivity__blocked_users_will">Las personas bloqueadas no podrán llamarte ni enviarte mensajes.</string>
     <string name="BlockedUsersActivity__no_blocked_users">No hay personas bloqueadas</string>
     <string name="BlockedUsersActivity__block_user">¿Bloquear a esta persona?</string>
-    <string name="BlockedUserActivity__s_will_not_be_able_to">%1$s no podrá llamarte o enviarte mensajes.</string>
+    <string name="BlockedUserActivity__s_will_not_be_able_to">%1$s no podrá llamarte ni enviarte mensajes.</string>
     <string name="BlockedUsersActivity__block">Bloquear</string>
 
     <!-- CreditCardFragment -->
@@ -178,13 +179,13 @@
     <!-- BlockUnblockDialog -->
     <string name="BlockUnblockDialog_block_and_leave_s">¿Bloquear y abandonar «%1$s»?</string>
     <string name="BlockUnblockDialog_block_s">¿Bloquear a %1$s?</string>
-    <string name="BlockUnblockDialog_you_will_no_longer_receive_messages_or_updates">No podrás enviar ni recibir más mensajes en este grupo y sus participantes no podrán añadirte de nuevo.</string>
-    <string name="BlockUnblockDialog_group_members_wont_be_able_to_add_you">L@s participantes del grupo no podrán añadirte de nuevo.</string>
-    <string name="BlockUnblockDialog_group_members_will_be_able_to_add_you">L@s participantes del grupo podrán añadirte de nuevo.</string>
+    <string name="BlockUnblockDialog_you_will_no_longer_receive_messages_or_updates">No podrás recibir más mensajes ni actualizaciones de este grupo y sus participantes no podrán añadirte de nuevo.</string>
+    <string name="BlockUnblockDialog_group_members_wont_be_able_to_add_you">Los participantes del grupo no podrán añadirte de nuevo.</string>
+    <string name="BlockUnblockDialog_group_members_will_be_able_to_add_you">Los participantes del grupo podrán añadirte de nuevo.</string>
     <!-- Text that is shown when unblocking a Signal contact -->
-    <string name="BlockUnblockDialog_you_will_be_able_to_call_and_message_each_other">Podréis chatear y llamaros mutuamente. Tu nombre y foto se compartirá con esta persona.</string>
+    <string name="BlockUnblockDialog_you_will_be_able_to_call_and_message_each_other">Podrás chatear y hablar por teléfono, y tu nombre y foto se compartirán con esta persona.</string>
     <!-- Text that is shown when unblocking an SMS contact -->
-    <string name="BlockUnblockDialog_you_will_be_able_to_message_each_other">Podréis chatear y llamaros mutuamente.</string>
+    <string name="BlockUnblockDialog_you_will_be_able_to_message_each_other">Podrás chatear y hablar por teléfono con esta persona.</string>
     <string name="BlockUnblockDialog_blocked_people_wont_be_able_to_call_you_or_send_you_messages">Las personas bloqueadas no podrán llamarte o enviarte mensajes.</string>
     <string name="BlockUnblockDialog_blocked_people_wont_be_able_to_send_you_messages">Las personas bloqueadas no podrán llamarte ni enviarte mensajes.</string>
     <!-- Message shown on block dialog when blocking the Signal release notes recipient -->
@@ -201,66 +202,66 @@
     <!-- Dialog button to report as spam only -->
     <string name="BlockUnblockDialog_report_spam">Denunciar spam</string>
     <!-- Dialog message when reporting spam of an individual (1:1 conversation) -->
-    <string name="BlockUnblockDialog_report_spam_description">Signal será notificado de que esta persona puede estar enviando spam. Signal no puede ver el contenido de ningún chat.</string>
+    <string name="BlockUnblockDialog_report_spam_description">Se notificará a Signal que esta persona puede estar enviando spam. Signal no puede ver el contenido de ningún chat.</string>
     <!-- Dialog message when reporting spam of a group and we can determine the group member that invited you, placeholder is a name -->
-    <string name="BlockUnblockDialog_report_spam_group_named_adder">Signal será notificado de que %1$s, la persona que te invitó a este grupo, puede estar enviando spam. Signal no puede ver el contenido de ningún chat.</string>
+    <string name="BlockUnblockDialog_report_spam_group_named_adder">Se notificará a Signal que %1$s, la persona que te invitó a este grupo, puede estar enviando spam. Signal no puede ver el contenido de ningún chat.</string>
     <!-- Dialog message when reporting spam of a group and we cannot determine the group member that invited you -->
-    <string name="BlockUnblockDialog_report_spam_group_unknown_adder">Signal será notificado de que la persona que te invitó a este grupo puede estar enviando spam. Signal no puede ver el contenido de ningún chat.</string>
+    <string name="BlockUnblockDialog_report_spam_group_unknown_adder">Se notificará a Signal que la persona que te invitó a este grupo puede estar enviando spam. Signal no puede ver el contenido de ningún chat.</string>
 
     <!-- BucketedThreadMedia -->
     <string name="BucketedThreadMedia_Today">Hoy</string>
     <string name="BucketedThreadMedia_Yesterday">Ayer</string>
     <string name="BucketedThreadMedia_This_week">Esta semana</string>
     <string name="BucketedThreadMedia_This_month">Este mes</string>
-    <string name="BucketedThreadMedia_Large">Grande</string>
-    <string name="BucketedThreadMedia_Medium">Mediana</string>
-    <string name="BucketedThreadMedia_Small">Pequeña</string>
+    <string name="BucketedThreadMedia_Large">Tamaño grande</string>
+    <string name="BucketedThreadMedia_Medium">Tamaño mediano</string>
+    <string name="BucketedThreadMedia_Small">Tamaño pequeño</string>
 
     <!-- CameraFragment -->
     <!-- Toasted when user device does not support video recording -->
     <string name="CameraFragment__video_recording_is_not_supported_on_your_device">La grabación de vídeo no es compatible con tu dispositivo</string>
 
     <!-- CameraXFragment -->
-    <string name="CameraXFragment_tap_for_photo_hold_for_video">Toca para foto o mantén presionado para grabar vídeo</string>
+    <string name="CameraXFragment_tap_for_photo_hold_for_video">Toca para hacer una foto o mantén pulsado para grabar un vídeo</string>
     <string name="CameraXFragment_capture_description">Capturar</string>
     <string name="CameraXFragment_change_camera_description">Cambiar cámara</string>
     <string name="CameraXFragment_open_gallery_description">Abrir galería de fotos</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Permitir acceso</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Permite acceso a tu cámara y micrófono</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Permite acceso a tu cámara</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Permitir acceso a tu micrófono</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Para hacer fotos, permite que Signal acceda a la cámara.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Para hacer fotos y grabar vídeos, permite que Signal acceda a la cámara.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Para hacer fotos y grabar vídeos, permite que Signal acceda a la cámara y al micrófono.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Para grabar vídeos con sonido, permite que Signal acceda a tu micrófono.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Para escanear el código QR, permite que Signal acceda a la cámara.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal necesita acceder a la cámara para hacer fotos</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal necesita acceder a la cámara para escanear códigos QR</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal necesita acceder al micrófono para grabar vídeos</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Para hacer fotos en Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Para hacer fotos y grabar vídeos en Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Para grabar vídeos con sonido:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Para escanear códigos QR:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Contactos recientes</string>
-    <string name="CameraContacts_signal_contacts">Personas en Signal</string>
+    <string name="CameraContacts_signal_contacts">Contactos de Signal</string>
     <string name="CameraContacts_signal_groups">Grupos de Signal</string>
     <!-- A warning shown in a toast when  -->
     <plurals name="CameraContacts_you_can_share_with_a_maximum_of_n_conversations">
@@ -269,38 +270,38 @@
     </plurals>
     <string name="CameraContacts_select_signal_recipients">Selecciona contactos de Signal</string>
     <string name="CameraContacts_no_signal_contacts">No hay contactos de Signal</string>
-    <string name="CameraContacts_you_can_only_use_the_camera_button">El botón de la cámara lo puedes usar para enviar fotos a personas en Signal sólamente. </string>
-    <string name="CameraContacts_cant_find_who_youre_looking_for">¿No encuentras a quién buscas?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Invita a una amistad a usar Signal.</string>
+    <string name="CameraContacts_you_can_only_use_the_camera_button">Puedes usar el botón de la cámara solo para enviar fotos a personas en Signal. </string>
+    <string name="CameraContacts_cant_find_who_youre_looking_for">¿No encuentras a quien que buscas?</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Invita a una persona a usar Molly</string>
     <string name="CameraContacts__menu_search">Buscar</string>
 
     <!-- Censorship Circumvention Megaphone -->
     <!-- Title for an alert that shows at the bottom of the chat list letting people know that circumvention is no longer needed -->
-    <string name="CensorshipCircumventionMegaphone_turn_off_censorship_circumvention">¿Desactivar la opción de evitar la censura?</string>
+    <string name="CensorshipCircumventionMegaphone_turn_off_censorship_circumvention">¿Desactivar la opción Evitar censura?</string>
     <!-- Body for an alert that shows at the bottom of the chat list letting people know that circumvention is no longer needed -->
-    <string name="CensorshipCircumventionMegaphone_you_can_now_connect_to_the_signal_service">Desde ahora, Signal se conecta directamente sin necesidad de evitar la censura.</string>
+    <string name="CensorshipCircumventionMegaphone_you_can_now_connect_to_the_signal_service">Ahora puedes conectarte a Signal directamente sin necesidad de activar la opción Evitar censura.</string>
     <!-- Action to prompt the user to disable circumvention since it is no longer needed -->
     <string name="CensorshipCircumventionMegaphone_turn_off">Desactivar</string>
     <!-- Action to prompt the user to dismiss the alert at the bottom of the chat list -->
-    <string name="CensorshipCircumventionMegaphone_no_thanks">No gracias</string>
+    <string name="CensorshipCircumventionMegaphone_no_thanks">No, gracias</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Actualiza Signal</string>
-    <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Esta versión de Signal es antigua y ya no está soportada. Para continuar recibiendo y enviando mensajes, actualiza a la versión más reciente.</string>
+    <string name="ClientDeprecatedActivity_update_signal">Actualizar Molly</string>
+    <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Esta versión de Signal es antigua y ya no se admite. Para continuar recibiendo y enviando mensajes, actualiza a la versión más reciente.</string>
     <string name="ClientDeprecatedActivity_update">Actualizar</string>
     <string name="ClientDeprecatedActivity_dont_update">No actualizar</string>
     <string name="ClientDeprecatedActivity_warning">Advertencia</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Esta versión de Signal ha caducado. Puedes consultar tus mensajes, pero no podrás enviar ni recibir mensajes hasta que actualices.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Esta versión de Molly ha caducado. Puedes consultar tus mensajes, pero no podrás enviar ni recibir mensajes hasta que actualices.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">No se ha encontrado un navegador web.</string>
-    <string name="CommunicationActions_send_email">Enviar email</string>
-    <string name="CommunicationActions_a_cellular_call_is_already_in_progress">Hay una llamada en progreso en la red móvil.</string>
+    <string name="CommunicationActions_send_email">Enviar correo electrónico</string>
+    <string name="CommunicationActions_a_cellular_call_is_already_in_progress">Hay una llamada en progreso en tu teléfono.</string>
     <string name="CommunicationActions_start_voice_call">¿Iniciar llamada?</string>
     <string name="CommunicationActions_cancel">Cancelar</string>
     <string name="CommunicationActions_call">Llamar</string>
     <string name="CommunicationActions_insecure_call">Llamada no segura</string>
-    <string name="CommunicationActions_carrier_charges_may_apply">Se pueden generar gastos del operador móvil. El número al que llamas no está registrado en Signal. Esta llamada se realizará por la red de tu operador móvil, no por internet.</string>
+    <string name="CommunicationActions_carrier_charges_may_apply">Es posible que se apliquen cargos del operador móvil. El número al que llamas no está registrado en Signal. Esta llamada se realizará por la red de tu operador móvil, no por Internet.</string>
     <string name="CommunicationActions_cant_join_call">Imposible unirse a la llamada</string>
     <string name="CommunicationActions_this_call_link_is_no_longer_valid">Este enlace de llamada ya no es válido.</string>
     <!-- Title on dialog when call link url cannot be parsed -->
@@ -312,7 +313,7 @@
 
     <!-- ContactsCursorLoader -->
     <string name="ContactsCursorLoader_recent_chats">Chats recientes</string>
-    <string name="ContactsCursorLoader_contacts">Personas</string>
+    <string name="ContactsCursorLoader_contacts">Contactos</string>
     <string name="ContactsCursorLoader_groups">Grupos</string>
     <!-- Contact search header for individuals who the user has not started a conversation with but is in a group with -->
     <string name="ContactsCursorLoader_group_members">Participantes del grupo</string>
@@ -326,14 +327,14 @@
     <string name="ContactsCursorLoader__messages">Mensajes</string>
 
     <!-- ContactsDatabase -->
-    <string name="ContactsDatabase_message_s">Mensaje %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_message_s">Enviar mensaje a %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Llamada de Molly de %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Videollamada de Molly de %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
     <string name="ContactNameEditActivity_given_name">Nombre</string>
-    <string name="ContactNameEditActivity_family_name">Apellido(s)</string>
+    <string name="ContactNameEditActivity_family_name">Apellido</string>
     <string name="ContactNameEditActivity_prefix">Prefijo</string>
     <string name="ContactNameEditActivity_suffix">Sufijo</string>
     <string name="ContactNameEditActivity_middle_name">Segundo nombre</string>
@@ -341,27 +342,27 @@
     <!-- ContactShareEditActivity -->
     <!-- ContactShareEditActivity toolbar title -->
     <string name="ContactShareEditActivity__send_contact">Enviar contacto</string>
-    <string name="ContactShareEditActivity_type_home">Privado</string>
-    <string name="ContactShareEditActivity_type_mobile">Móvil</string>
-    <string name="ContactShareEditActivity_type_work">Trabajo</string>
-    <string name="ContactShareEditActivity_type_missing">Otros</string>
-    <string name="ContactShareEditActivity_invalid_contact">La persona que has seleccionado no es válida.</string>
+    <string name="ContactShareEditActivity_type_home">casa</string>
+    <string name="ContactShareEditActivity_type_mobile">móvil</string>
+    <string name="ContactShareEditActivity_type_work">trabajo</string>
+    <string name="ContactShareEditActivity_type_missing">otro</string>
+    <string name="ContactShareEditActivity_invalid_contact">El contacto que has seleccionado no es válido</string>
     <!-- Content descrption for name edit button on contact share edit activity -->
     <string name="ContactShareEditActivity__edit_name">Editar nombre</string>
     <!-- Content description for user avatar in edit activity -->
-    <string name="ContactShareEditActivity__avatar">Foto</string>
+    <string name="ContactShareEditActivity__avatar">Avatar</string>
 
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_sent_tap_for_details">Fallo al enviar. Toca para más detalles.</string>
-    <string name="ConversationItem_error_partially_not_delivered">Enviado parcialmente, toca para más detalles</string>
-    <string name="ConversationItem_error_network_not_delivered">Fallo al enviar</string>
+    <string name="ConversationItem_error_not_sent_tap_for_details">No se ha enviado. Toca para ver más información.</string>
+    <string name="ConversationItem_error_partially_not_delivered">Enviado parcialmente. Toca para ver más información.</string>
+    <string name="ConversationItem_error_network_not_delivered">No se ha podido enviar</string>
     <string name="ConversationItem_group_action_left">%1$s ha abandonado el grupo.</string>
     <string name="ConversationItem_send_paused">Envío pausado</string>
     <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">¿Enviar como SMS no cifrado?</string>
     <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">¿Enviar como MMS no cifrado?</string>
     <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Este mensaje <b>no</b> se cifrará porque esta persona ya no usa Signal.\n\n¿Enviar mensaje sin cifrar?</string>
-    <string name="ConversationItem_unable_to_open_media">No se pudo encontrar una aplicación para mostrar este contenido.</string>
-    <string name="ConversationItem_copied_text">%1$s copiado(s)</string>
+    <string name="ConversationItem_unable_to_open_media">No se puede encontrar una aplicación para mostrar este archivo.</string>
+    <string name="ConversationItem_copied_text">Mensajes copiados: %1$s</string>
     <string name="ConversationItem_from_s">de %1$s</string>
     <string name="ConversationItem_to_s">a %1$s</string>
     <string name="ConversationItem_read_more">  Leer más</string>
@@ -395,9 +396,9 @@
     <!-- Accessibility text associated with image button to send an edited message. -->
     <string name="ConversationActivity_send_edit">Enviar versión editada</string>
     <string name="ConversationActivity_compose_message">Redactar mensaje</string>
-    <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Lo sentimos, ha habido un fallo al adjuntar el archivo.</string>
-    <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">¡Esta persona no tiene un número que pueda recibir SMS o un correo válido!</string>
-    <string name="ConversationActivity_message_is_empty_exclamation">¡El mensaje está vacío!</string>
+    <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">No se ha podido adjuntar el archivo.</string>
+    <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">El destinatario no tiene un número de teléfono móvil o una dirección de correo electrónico válidos.</string>
+    <string name="ConversationActivity_message_is_empty_exclamation">El mensaje está vacío.</string>
     <string name="ConversationActivity_group_members">Participantes del grupo</string>
     <!-- Warning dialog text shown to user if they try to send a message edit that is too old where %1$d is replaced with the amount of hours, e.g. 3 -->
     <plurals name="ConversationActivity_edit_message_too_old">
@@ -410,8 +411,8 @@
         <item quantity="other">Solo se pueden hacer %1$d cambios en este mensaje de texto.</item>
     </plurals>
 
-    <string name="ConversationActivity_invalid_recipient">¡Destinatari@ inválid@!</string>
-    <string name="ConversationActivity_added_to_home_screen">Añadido a la pantalla de inicio</string>
+    <string name="ConversationActivity_invalid_recipient">Destinatario no válido</string>
+    <string name="ConversationActivity_added_to_home_screen">Se ha añadido a la pantalla de inicio</string>
     <string name="ConversationActivity_calls_not_supported">Llamadas no disponibles</string>
     <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Este dispositivo no es compatible con la función de realizar llamadas.</string>
     <string name="ConversationActivity_transport_insecure_sms">SMS no seguro</string>
@@ -422,45 +423,45 @@
     <string name="ConversationActivity_transport_signal">Mensaje de Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Enviar mensaje</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Pasémonos a Signal: %1$s</string>
-    <string name="ConversationActivity_specify_recipient">Por favor, selecciona una persona</string>
-    <string name="ConversationActivity_attachment_exceeds_size_limits">El adjunto excede los límites de tamaño para el mensaje.</string>
-    <string name="ConversationActivity_unable_to_record_audio">¡No se ha podido grabar la nota de voz!</string>
-    <string name="ConversationActivity_you_cant_send_messages_to_this_group">No puedes enviar mensajes a este grupo porque ya no participas.</string>
-    <string name="ConversationActivity_only_s_can_send_messages">Solo %1$s pueden enviar mensajes</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Pasémonos a Molly %1$s</string>
+    <string name="ConversationActivity_specify_recipient">Selecciona un contacto</string>
+    <string name="ConversationActivity_attachment_exceeds_size_limits">El archivo adjunto excede el límite de tamaño para el tipo de mensaje que intentas enviar.</string>
+    <string name="ConversationActivity_unable_to_record_audio">No se ha podido grabar el mensaje de voz</string>
+    <string name="ConversationActivity_you_cant_send_messages_to_this_group">No puedes enviar mensajes porque ya no formas parte de este grupo.</string>
+    <string name="ConversationActivity_only_s_can_send_messages">Solo %1$s pueden enviar mensajes.</string>
     <string name="ConversationActivity_admins">admins</string>
-    <string name="ConversationActivity_message_an_admin">Contactar con un admin</string>
-    <string name="ConversationActivity_cant_start_group_call">Imposible iniciar llamada de grupo</string>
+    <string name="ConversationActivity_message_an_admin">Enviar mensaje a un admin</string>
+    <string name="ConversationActivity_cant_start_group_call">No se puede iniciar la llamada de grupo</string>
     <string name="ConversationActivity_only_admins_of_this_group_can_start_a_call">Solo admins del grupo pueden iniciar una llamada.</string>
-    <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">No hay ninguna aplicación disponible para abrir este enlace.</string>
-    <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Se ha enviado tu solicitud para unirte al grupo al admin. Te llegará una notificación con su respuesta.</string>
+    <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">No hay ninguna aplicación disponible para abrir este enlace en tu dispositivo.</string>
+    <string name="ConversationActivity_your_request_to_join_has_been_sent_to_the_group_admin">Se ha enviado tu solicitud al admin del grupo para unirte. Te llegará una notificación con su respuesta.</string>
     <string name="ConversationActivity_cancel_request">Cancelar solicitud</string>
 
     <!-- Dialog title asking users for microphone permission -->
     <string name="ConversationActivity_allow_access_microphone">Permitir acceso a tu micrófono</string>
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
-    <string name="ConversationActivity_signal_to_send_audio_messages">Para enviar notas de voz:</string>
+    <string name="ConversationActivity_signal_to_send_audio_messages">Para enviar mensajes de voz:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Para enviar notas de voz y hacer llamadas, permite a Signal acceder al micrófono.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Para enviar mensajes de voz y hacer llamadas, permite a Molly acceso al micrófono.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal necesita acceso al micrófono para grabar una nota de voz.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal necesita acceso al micrófono para enviar notas de voz. Por favor, ve a la aplicación «Ajustes», selecciona Signal en el menú «Aplicaciones y notificaciones» y en «Permisos» activa «Micrófono».</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly necesita acceso al micrófono para grabar un mensaje de voz.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly necesita acceso al micrófono para enviar mensajes de voz. Ve al menú «Ajustes» de tu dispositivo y selecciona Aplicaciones y notificaciones &gt; Molly &gt; Permisos de la aplicación &gt; Micrófono &gt; Permitir. Estos pasos pueden variar dependiendo de tu dispositivo.</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal necesita acceso al micrófono y cámara para llamar a %1$s. Por favor, ve a la aplicación «Ajustes», selecciona Signal en el menú «Aplicaciones y notificaciones» y en «Permisos» activa «Micrófono» y «Cámara».</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Para hacer fotos y vídeos, permite el acceso de Signal a la cámara.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal necesita acceso a la cámara para tomar fotos o vídeos. Por favor, ve a la aplicación «Ajustes», selecciona Signal en el menú «Aplicaciones y notificaciones» y en «Permisos» activa «Cámara».</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal necesita acceder a la cámara para tomar fotos o vídeo.</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly necesita acceso al micrófono y a la cámara para llamar a %1$s. Ve al menú «Ajustes» de tu dispositivo y selecciona Aplicaciones y notificaciones &gt; Molly &gt; Permisos de la aplicación, y activa el acceso al micrófono y a la cámara. Estos pasos pueden variar dependiendo de tu dispositivo.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Para hacer fotos y grabar vídeos, permite a Molly acceso a la cámara.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly necesita acceso a la cámara para hacer fotos o grabar vídeos. Ve al menú «Ajustes» de tu dispositivo y selecciona Aplicaciones y notificaciones &gt; Molly &gt; Permisos de la aplicación &gt; Cámara &gt; Permitir. Estos pasos pueden variar dependiendo de tu dispositivo.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly necesita acceso a la cámara para hacer fotos o grabar vídeos.</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Activa el acceso al micrófono para grabar vídeos con sonido.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal necesita el micrófono para grabar vídeos, pero no tiene acceso. Ve a los ajustes se la aplicación, selecciona Permisos y activa Micrófono y Cámara.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal necesita acceso al micrófono para grabar vídeos.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly necesita acceso al micrófono para grabar vídeos. Ve al menú «Ajustes» de tu dispositivo y selecciona Aplicaciones y notificaciones &gt; Molly &gt; Permisos de la aplicación, y activa el acceso al micrófono y a la cámara. Estos pasos pueden variar dependiendo de tu dispositivo.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly necesita acceso al micrófono para grabar vídeos.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">No</string>
     <string name="ConversationActivity_search_position">%1$d de %2$d</string>
-    <string name="ConversationActivity_no_results">Sin resultados</string>
+    <string name="ConversationActivity_no_results">No hay resultados</string>
 
     <string name="ConversationActivity_sticker_pack_installed">Paquete de stickers instalado</string>
-    <string name="ConversationActivity_new_say_it_with_stickers">¡Novedad!: Dilo con stickers</string>
+    <string name="ConversationActivity_new_say_it_with_stickers">¡Nuevo! Ahora di lo que quieras con stickers</string>
 
     <string name="ConversationActivity_cancel">Cancelar</string>
     <string name="ConversationActivity_delete_conversation">¿Eliminar chat?</string>
@@ -473,25 +474,25 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Para iniciar una llamada:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Para iniciar la llamada, permite a Signal el acceso al micrófono.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Para iniciar una llamada, permite a Molly acceso al micrófono.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal necesita acceso al micrófono para iniciar una llamada.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly necesita acceso al micrófono para iniciar una llamada.</string>
 
 
     <string name="ConversationActivity_join">Unirse</string>
     <!-- Button text for an active group call but the call is currently full and unjoinable -->
     <string name="ConversationActivity_full">Completa</string>
 
-    <string name="ConversationActivity_error_sending_media">Fallo al enviar adjunto</string>
+    <string name="ConversationActivity_error_sending_media">No se ha podido enviar el archivo multimedia</string>
 
     <!-- Message shown when opening an MMS group conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported">Los mensajes SMS ya no son compatibles con Signal.</string>
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Los mensajes SMS ya no son compatibles con Signal. Invita a %1$s a Signal para mantener aquí tu conversación.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Esta persona ya no usa Signal. Invítala a Signal para seguir charlando aquí.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Esta persona ya no usa Molly. Invítala a Molly para seguir chateando aquí.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Invitar a Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Invitar a Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Se te volverá a recordar pronto.</string>
 
@@ -512,63 +513,65 @@
 
     <!-- ConversationFragment -->
     <!-- Toast text when contacts activity is not found -->
-    <string name="ConversationFragment__contacts_app_not_found">No se han encontrado contactos en la app.</string>
+    <string name="ConversationFragment__contacts_app_not_found">No se han encontrado contactos en la aplicación.</string>
     <plurals name="ConversationFragment_delete_selected_messages">
         <item quantity="one">¿Eliminar el mensaje seleccionado?</item>
         <item quantity="other">¿Eliminar los mensajes seleccionados?</item>
     </plurals>
-    <string name="ConversationFragment_save_to_sd_card">¿Guardar?</string>
+    <string name="ConversationFragment_save_to_sd_card">¿Guardar en el almacenamiento?</string>
     <plurals name="ConversationFragment_saving_n_media_to_storage_warning">
         <item quantity="one">Guardar el archivo en el almacenamiento del teléfono permitirá que cualquier otra aplicación en tu dispositivo acceda a él.\n\n¿Continuar?</item>
-        <item quantity="other">Guardar los %1$d archivos en el almacenamiento del teléfono permitirá que cualquier otra aplicación en tu dispositivo acceda a ellos.\n\n¿Continuar?</item>
+        <item quantity="other">Si se guardan todos los %1$d archivos multimedia en el almacenamiento del teléfono, cualquier otra aplicación de tu dispositivo podrá acceder a ellos.\n\n¿Continuar?</item>
     </plurals>
     <plurals name="ConversationFragment_error_while_saving_attachments_to_sd_card">
-        <item quantity="one">¡Fallo al guardar el archivo adjunto!</item>
-        <item quantity="other">¡Fallo al guardar los archivos adjuntos!</item>
+        <item quantity="one">No se ha podido guardar el archivo adjunto</item>
+        <item quantity="other">No se han podido guardar los archivos adjuntos</item>
     </plurals>
-    <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">¡No se pudo guardar en el almacenamiento!</string>
+    <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">No se ha podido guardar en el almacenamiento</string>
     <plurals name="ConversationFragment_saving_n_attachments">
-        <item quantity="one">Guardando el archivo adjunto</item>
+        <item quantity="one">Guardando archivo adjunto</item>
         <item quantity="other">Guardando %1$d archivos adjuntos</item>
     </plurals>
     <plurals name="ConversationFragment_saving_n_attachments_to_sd_card">
-        <item quantity="one">Guardando el archivo adjunto…</item>
+        <item quantity="one">Guardando archivo adjunto…</item>
         <item quantity="other">Guardando %1$d archivos adjuntos…</item>
     </plurals>
-    <string name="ConversationFragment_pending">Pendiente …</string>
+    <string name="ConversationFragment_pending">Pendiente…</string>
     <string name="ConversationFragment_push">Datos (Signal)</string>
     <string name="ConversationFragment_mms">MMS</string>
     <string name="ConversationFragment_sms">SMS</string>
-    <string name="ConversationFragment_deleting">Eliminar</string>
-    <string name="ConversationFragment_deleting_messages">Eliminando mensajes …</string>
+    <string name="ConversationFragment_deleting">Eliminando</string>
+    <string name="ConversationFragment_deleting_messages">Eliminando mensajes…</string>
     <string name="ConversationFragment_delete_for_me">Eliminar solo para mí</string>
     <string name="ConversationFragment_delete_for_everyone">Eliminar del chat</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Eliminar en este dispositivo</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Eliminar</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Eliminar en todas partes</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Este mensaje se eliminará para todxs en el chat si usan una versión reciente de Signal. En el chat se mostrará que lo has eliminado.</string>
     <string name="ConversationFragment_quoted_message_not_found">No se encuentra el mensaje original</string>
     <string name="ConversationFragment_quoted_message_no_longer_available">El mensaje original ya no está disponible</string>
-    <string name="ConversationFragment_failed_to_open_message">Fallo al abrir mensaje</string>
+    <string name="ConversationFragment_failed_to_open_message">No se ha podido abrir el mensaje</string>
     <string name="ConversationFragment_you_can_swipe_to_the_right_reply">Puedes deslizar hacia la derecha sobre cualquier mensaje para responder rápidamente</string>
     <string name="ConversationFragment_you_can_swipe_to_the_left_reply">Puedes deslizar hacia la izquierda sobre cualquier mensaje para responder rápidamente</string>
     <string name="ConversationFragment_view_once_media_is_deleted_after_sending">Los archivos multimedia para ver solo una vez se eliminan después de ser enviados</string>
     <string name="ConversationFragment_you_already_viewed_this_message">Ya has visto este mensaje</string>
-    <string name="ConversationFragment__you_can_add_notes_for_yourself_in_this_conversation">En este chat puedes añadir notas, mensajes personales, fotos… que solo tú puedes ver. Si tu cuenta tiene dispositivos enlazados, el contenido nuevo se sincronizará.</string>
+    <string name="ConversationFragment__you_can_add_notes_for_yourself_in_this_conversation">En este chat puedes añadir notas que solo tú podrás ver. Si tu cuenta tiene dispositivos vinculados, las notas nuevas se sincronizarán.</string>
     <string name="ConversationFragment__d_group_members_have_the_same_name">%1$d participantes usan el mismo nombre.</string>
     <string name="ConversationFragment__tap_to_review">Toca para revisar</string>
     <!-- The body of a banner that can show up at the top of a chat, letting the user know that you have two contacts with the same name -->
     <string name="ConversationFragment__review_banner_body">Esta persona tiene el mismo nombre que otro contacto</string>
-    <string name="ConversationFragment_contact_us">Contáctanos</string>
+    <string name="ConversationFragment_contact_us">Contacta con nosotros</string>
     <string name="ConversationFragment_verify">Verificar</string>
     <string name="ConversationFragment_not_now">Ahora no</string>
-    <string name="ConversationFragment_your_safety_number_with_s_changed">Tus cifras de seguridad con %1$s han cambiado</string>
-    <string name="ConversationFragment_your_safety_number_with_s_changed_likey_because_they_reinstalled_signal">Tus cifras de seguridad con %1$s han cambiado. Probablemente porque ha reinstalado Signal o cambiado de dispositivo. Toca para verificar las nuevas cifras de seguridad. Esta verificación es opcional.</string>
+    <string name="ConversationFragment_your_safety_number_with_s_changed">Tu número de seguridad con %1$s ha cambiado</string>
+    <string name="ConversationFragment_your_safety_number_with_s_changed_likey_because_they_reinstalled_signal">Tu número de seguridad con %1$s ha cambiado probablemente porque ha reinstalado Signal o cambiado de dispositivo. Toca «Verificar» para confirmar el nuevo número de seguridad. Esta verificación es opcional.</string>
     <!-- Dialog title for block group link join requests -->
     <string name="ConversationFragment__block_request">¿Vetar solicitudes?</string>
     <!-- Dialog message for block group link join requests -->
-    <string name="ConversationFragment__s_will_not_be_able_to_join_or_request_to_join_this_group_via_the_group_link">%1$s no podrá unirse al grupo o solicitarlo vía enlace, pero esta persona podrá ser añadida al grupo manualmente.</string>
+    <string name="ConversationFragment__s_will_not_be_able_to_join_or_request_to_join_this_group_via_the_group_link">%1$s no podrá unirse al grupo ni solicitar unirse mediante el enlace al grupo, pero se le puede añadir manualmente.</string>
     <!-- Dialog confirm block request button -->
     <string name="ConversationFragment__block_request_button">Vetar solicitudes</string>
     <!-- Dialog cancel block request button -->
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Vetada</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Actualiza Signal</string>
+    <string name="ConversationFragment__update_build">Actualiza Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Registrarse de nuevo en Signal</string>
+    <string name="ConversationFragment__reregister_signal">Registrarse de nuevo en Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Volver atrás.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Abrir Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Abrir Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Ya no está verificado</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -598,22 +601,22 @@
     <!-- Menu option to unblock in a conversation -->
     <string name="ConversationFragment_unblock">Desbloquear</string>
     <!-- Dialog title shown after reporting spam and tapping the conversation item -->
-    <string name="ConversationFragment_reported_spam">Spam denunciado</string>
+    <string name="ConversationFragment_reported_spam">Denunciado como spam</string>
     <!-- Dialog message shown after reporting spam and tapping the conversation item -->
-    <string name="ConversationFragment_reported_spam_message">Signal ha sido notificado de que esta persona puede estar enviando spam. Signal no puede ver el contenido de ningún chat.</string>
+    <string name="ConversationFragment_reported_spam_message">Se ha notificado a Signal que esta persona puede estar enviando spam. Signal no puede ver el contenido de ningún chat.</string>
     <!-- Toast shown after reporting spam and tapping the conversation item -->
     <string name="ConversationFragment_reported_as_spam">Denunciado como spam</string>
     <!-- Toast shown after reporting and blocking a conversation -->
     <string name="ConversationFragment_reported_as_spam_and_blocked">Denunciado como spam y bloqueado</string>
     <!-- Dialog message shown after accepting a message request and tapping on options from the conversation event -->
-    <string name="ConversationFragment_you_accepted_a_message_request_from_s">Has aceptado la solicitud de chat de %1$s. Si se trata de un error, puedes elegir una de las acciones que hay a continuación.</string>
+    <string name="ConversationFragment_you_accepted_a_message_request_from_s">Has aceptado la solicitud de mensaje de %1$s. Si se trata de un error, puedes elegir una de las acciones que hay a continuación.</string>
 
     <!-- Title of Safety Tips bottom sheet dialog -->
     <string name="SafetyTips_title">Consejos de seguridad</string>
     <!-- Dialog subtitle when showign tips for a 1:1 conversation -->
     <string name="SafetyTips_subtitle_individual">Ten cuidado al aceptar solicitudes de mensajes de personas que no conoces. Presta atención a:</string>
     <!-- Dialog subtitle when showing tips for a group conversation -->
-    <string name="SafetyTips_subtitle_group">Revisa cuidadosamente esta solicitud. Ninguno de tus contactos o personas con las que chateas están en este grupo. Aquí hay algunas cosas a tener en cuenta:</string>
+    <string name="SafetyTips_subtitle_group">Revisa detenidamente esta solicitud. Ninguno de tus contactos o personas con las que chateas están en este grupo. Aquí hay algunas cosas a tener en cuenta:</string>
     <!-- Button text to move to the previous tip-->
     <string name="SafetyTips_previous_tip">Consejo anterior</string>
     <!-- Button text to move to the next tip -->
@@ -621,19 +624,19 @@
     <!-- Title of tip 1 -->
     <string name="SafetyTips_tip1_title">Estafas de criptomonedas o dinero</string>
     <!-- Message of tip 1 -->
-    <string name="SafetyTips_tip1_message">Si alguien a quién no conoces te envía mensajes sobre criptomonedas (como Bitcoin) o con una oportunidad financiera: ten cuidado, es probable que se trate de spam.</string>
+    <string name="SafetyTips_tip1_message">Ten cuidado si alguien a quien no conoces te envía mensajes sobre criptomonedas (como Bitcoin) o sobre una oportunidad financiera. Es probable que se trate de spam.</string>
     <!-- Title of tip 2 -->
     <string name="SafetyTips_tip2_title">Mensajes confusos o irrelevantes</string>
     <!-- Message of tip 2 -->
-    <string name="SafetyTips_tip2_message">Los spammers a menudo comienzan con un mensaje simple, como \"Hola\", para atraer tu atención. Si respondes, es posible que te involucren más.</string>
+    <string name="SafetyTips_tip2_message">Los spammers a menudo comienzan con un mensaje simple como «Hola» para captar tu atención. Si respondes, es posible que interactúen más.</string>
     <!-- Title of tip 3 -->
     <string name="SafetyTips_tip3_title">Mensajes con enlaces</string>
     <!-- Message of tip 3 -->
-    <string name="SafetyTips_tip3_message">Ten cuidado con los mensajes de personas que no conoces y que tienen enlaces a sitios web. Nunca visites enlaces de personas en las que no confíes.</string>
+    <string name="SafetyTips_tip3_message">Ten cuidado con los mensajes de personas que no conoces y que tienen enlaces a sitios web. Nunca abras enlaces de personas en las que no confías.</string>
     <!-- Title of tip 4 -->
     <string name="SafetyTips_tip4_title">Empresas e instituciones falsas</string>
     <!-- Message of tip 4 -->
-    <string name="SafetyTips_tip4_message">Ten cuidado con las empresas o agencias gubernamentales que se pongan en contacto contigo. Los mensajes que involucren a agencias tributarias y servicios de mensajería, entre otros, pueden ser spam.</string>
+    <string name="SafetyTips_tip4_message">Ten cuidado con las empresas o agencias gubernamentales que se pongan en contacto contigo. Los mensajes que involucren a entidades como agencias tributarias y empresas de mensajería pueden ser spam.</string>
 
     <!-- Label for a button displayed in conversation list to clear the chat filter -->
     <string name="ConversationListFragment__clear_filter">Restablecer filtros</string>
@@ -647,7 +650,12 @@
         <item quantity="one">Esto eliminará permanentemente el chat seleccionado.</item>
         <item quantity="other">Esto eliminará permanentemente los %1$d chats seleccionados.</item>
     </plurals>
-    <string name="ConversationListFragment_deleting">Eliminar</string>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Esto eliminará permanentemente de todos tus dispositivos el chat seleccionado.</item>
+        <item quantity="other">Esto eliminará permanentemente de todos tus dispositivos los %1$d chats seleccionados.</item>
+    </plurals>
+    <string name="ConversationListFragment_deleting">Eliminando</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Eliminando chat seleccionado…</item>
         <item quantity="other">Eliminando chats seleccionados…</item>
@@ -689,7 +697,7 @@
     <!-- Tooltip shown after you have created your first notification profile -->
     <string name="ConversationListFragment__turn_your_notification_profile_on_or_off_here">Activa o desactiva tu perfil de notificaciones aquí.</string>
     <!-- Message shown in top toast to indicate the named profile is on -->
-    <string name="ConversationListFragment__s_on">«%1$s» activo</string>
+    <string name="ConversationListFragment__s_on">%1$s en línea</string>
     <!-- -->
     <string name="ConversationListFragment_username_recovered_toast">Tu código QR y tu enlace se han restablecido y tu alias es %1$s</string>
 
@@ -720,33 +728,33 @@
 
     <!-- CreateProfileActivity -->
     <string name="CreateProfileActivity__profile">Perfil</string>
-    <string name="CreateProfileActivity_error_setting_profile_photo">Fallo al establecer la foto de perfil</string>
-    <string name="CreateProfileActivity_problem_setting_profile">Problema al crear el perfil</string>
+    <string name="CreateProfileActivity_error_setting_profile_photo">No se ha podido establecer la foto de perfil</string>
+    <string name="CreateProfileActivity_problem_setting_profile">No se ha podido crear el perfil</string>
     <string name="CreateProfileActivity_set_up_your_profile">Completa tu perfil</string>
-    <string name="CreateProfileActivity_signal_profiles_are_end_to_end_encrypted">Tu perfil y los cambios que hagas en él serán visibles para la gente a la que mandes mensajes, tus contactos y tus grupos.</string>
-    <string name="CreateProfileActivity_set_avatar_description">Configurar avatar de perfil</string>
+    <string name="CreateProfileActivity_signal_profiles_are_end_to_end_encrypted">Tu perfil y los cambios que hagas en él serán visibles para las personas a las que envíes mensajes, tus contactos y tus grupos.</string>
+    <string name="CreateProfileActivity_set_avatar_description">Configurar avatar</string>
 
     <!-- ProfileCreateFragment -->
     <!-- Displayed at the top of the screen and explains how profiles can be viewed. -->
-    <string name="ProfileCreateFragment__profiles_are_visible_to_contacts_and_people_you_message">Los perfiles serán visibles para la gente a la que mandes mensajes, tus contactos y tus grupos.</string>
+    <string name="ProfileCreateFragment__profiles_are_visible_to_contacts_and_people_you_message">Los perfiles son visibles para las personas a las que envías mensajes, tus contactos y tus grupos.</string>
     <!-- Title of clickable row to select phone number privacy settings -->
-    <string name="ProfileCreateFragment__who_can_find_me">¿Quién puede encontrarme a través de mi número?</string>
+    <string name="ProfileCreateFragment__who_can_find_me">¿Quién puede encontrarme con mi número?</string>
 
     <!-- WhoCanSeeMyPhoneNumberFragment -->
     <!-- Toolbar title for this screen -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">¿Quién puede encontrarme a través de mi número?</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">¿Quién puede encontrarme con mi número?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Cualquiera que tenga tu número de teléfono verá que estás en Signal y podrá iniciar chats contigo.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Cualquiera que tenga tu número de teléfono verá que estás en Molly y podrá iniciar chats contigo.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Nadie podrá ver que estás en Signal a menos que les envíes un mensaje o tengas un chat abierto con ellxs.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Nadie podrá ver que estás en Molly a menos que les envíes un mensaje o ya tengas un chat con esta persona en concreto.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">¿Restaurar desde copia de seguridad?</string>
-    <string name="ChooseBackupFragment__restore_your_messages_and_media">Restaura tus mensajes y adjuntos desde una copia de seguridad local. Si no lo haces ahora, no podrás restaurar más tarde.</string>
-    <string name="ChooseBackupFragment__icon_content_description">Símbolo de restaurar desde copia de seguridad</string>
-    <string name="ChooseBackupFragment__choose_backup">Selecciona copia</string>
-    <string name="ChooseBackupFragment__learn_more">Saber más</string>
-    <string name="ChooseBackupFragment__no_file_browser_available">Navegador de archivos no disponible</string>
+    <string name="ChooseBackupFragment__restore_your_messages_and_media">Restaura tus mensajes y archivos multimedia desde una copia de seguridad local. Si no lo haces ahora, no podrás restaurarlos más tarde.</string>
+    <string name="ChooseBackupFragment__icon_content_description">Icono Restaurar desde copia de seguridad</string>
+    <string name="ChooseBackupFragment__choose_backup">Seleccionar copia</string>
+    <string name="ChooseBackupFragment__learn_more">Más información</string>
+    <string name="ChooseBackupFragment__no_file_browser_available">No hay navegador de archivos disponible</string>
 
     <!-- RestoreBackupFragment -->
     <string name="RestoreBackupFragment__restore_complete">Recuperación completada</string>
@@ -756,43 +764,43 @@
     <!-- Couldn\'t find the selected backup -->
     <string name="RestoreBackupFragment__backup_not_found">Copia de seguridad no encontrada.</string>
     <!-- Couldn\'t read the selected backup -->
-    <string name="RestoreBackupFragment__backup_could_not_be_read">Fallo al leer la copia de seguridad.</string>
+    <string name="RestoreBackupFragment__backup_could_not_be_read">No se ha podido leer la copia de seguridad.</string>
     <!-- Backup has an unsupported file extension -->
     <string name="RestoreBackupFragment__backup_has_a_bad_extension">La copia de seguridad tiene una extensión incorrecta.</string>
 
     <!-- BackupsPreferenceFragment -->
     <string name="BackupsPreferenceFragment__chat_backups">Copias de seguridad de chats</string>
-    <string name="BackupsPreferenceFragment__backups_are_encrypted_with_a_passphrase">Las copias de seguridad se cifran con una clave (passphrase) y se guardan en este dispositivo.</string>
+    <string name="BackupsPreferenceFragment__backups_are_encrypted_with_a_passphrase">Las copias de seguridad se cifran con una clave y se guardan en tu dispositivo.</string>
     <string name="BackupsPreferenceFragment__create_backup">Crear copia de seguridad</string>
     <string name="BackupsPreferenceFragment__last_backup">Última copia: %1$s</string>
-    <string name="BackupsPreferenceFragment__backup_folder">Carpeta de copias</string>
+    <string name="BackupsPreferenceFragment__backup_folder">Carpeta de copias de seguridad</string>
     <!-- Title for a preference item allowing the user to selected the hour of the day when their chats are backed up. -->
     <string name="BackupsPreferenceFragment__backup_time">Hora de la copia de seguridad</string>
     <string name="BackupsPreferenceFragment__verify_backup_passphrase">Verificar clave de copia de seguridad</string>
-    <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Verifica que la clave (passphrase) de tu copia de seguridad es correcta</string>
+    <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Verifica que la clave de tu copia de seguridad sea correcta</string>
     <string name="BackupsPreferenceFragment__turn_on">Activar</string>
     <string name="BackupsPreferenceFragment__turn_off">Desactivar</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Para restaurar tus chat con una copia de seguridad, reinstala Signal. Abre Signal y toca en «Restaurar copia» y busca la copia de seguridad. %1$s"</string>
-    <string name="BackupsPreferenceFragment__learn_more">Saber más</string>
-    <string name="BackupsPreferenceFragment__in_progress">En curso …</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Para restaurar una copia de seguridad, reinstala Molly. Abre Molly, toca «Restaurar copia» y busca la copia de seguridad. %1$s"</string>
+    <string name="BackupsPreferenceFragment__learn_more">Más información</string>
+    <string name="BackupsPreferenceFragment__in_progress">En curso…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
     <string name="BackupsPreferenceFragment__verifying_backup">Verificando copia de seguridad…</string>
-    <string name="BackupsPreferenceFragment__d_so_far">%1$d por el momento …</string>
+    <string name="BackupsPreferenceFragment__d_so_far">%1$d completado…</string>
     <!-- Show percentage of completion of backup -->
-    <string name="BackupsPreferenceFragment__s_so_far">%1$s de %% de momento …</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal necesita acceso al almacenamiento para crear copias de seguridad. Por favor, ve a la aplicación «Ajustes», selecciona Signal en el menú «Aplicaciones y notificaciones» y en «Permisos» activa «Almacenamiento».</string>
+    <string name="BackupsPreferenceFragment__s_so_far">%1$s %% completado…</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly necesita acceso al almacenamiento para crear copias de seguridad. Ve al menú «Ajustes» de tu dispositivo y selecciona Aplicaciones y notificaciones &gt; Molly &gt; Permisos de la aplicación &gt; Almacenamiento &gt; Permitir. Estos pasos pueden variar dependiendo de tu dispositivo.</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Establecer hora para la copia de seguridad</string>
 
 
     <!-- CustomDefaultPreference -->
-    <string name="CustomDefaultPreference_using_custom">Usar personalizado: %1$s</string>
-    <string name="CustomDefaultPreference_using_default">Usar predeterminado: %1$s</string>
+    <string name="CustomDefaultPreference_using_custom">Personalizado: %1$s</string>
+    <string name="CustomDefaultPreference_using_default">Predeterminado: %1$s</string>
     <string name="CustomDefaultPreference_none">Ninguno</string>
 
     <!-- AvatarSelectionBottomSheetDialogFragment -->
-    <string name="AvatarSelectionBottomSheetDialogFragment__taking_a_photo_requires_the_camera_permission">Para tomar una foto, Signal necesita acceso a la cámara.</string>
-    <string name="AvatarSelectionBottomSheetDialogFragment__viewing_your_gallery_requires_the_storage_permission">Signal necesita acceso al almacenamiento para mostrar la galería.</string>
+    <string name="AvatarSelectionBottomSheetDialogFragment__taking_a_photo_requires_the_camera_permission">Para hacer una foto, se necesita acceso a la cámara.</string>
+    <string name="AvatarSelectionBottomSheetDialogFragment__viewing_your_gallery_requires_the_storage_permission">Para mostrar la galería, se necesita acceso al almacenamiento.</string>
 
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Ahora</string>
@@ -847,32 +855,87 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Sesión de chat reiniciada</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal usa cifrado de extremo a extremo y puede necesitar reiniciar la sesión de un chat en determinados casos. Este reinicio no afecta a la seguridad, pero puede ocurrir que el último mensaje de esta persona antes del reinicio sea ilegible. Solicita que lo envíe de nuevo, si se da el caso.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly usa cifrado de extremo a extremo y puede necesitar reiniciar la sesión de un chat en determinados casos. Este reinicio no afecta a la seguridad, pero puede ocurrir que el último mensaje de esta persona antes del reinicio sea ilegible. Solicita que lo envíe de nuevo, si se da el caso.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Usa Signal para escritorio o iPad. Tus mensajes se sincronizarán en todos tus dispositivos vinculados.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Vincular un nuevo dispositivo</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Los mensajes y la información del chat están protegidos por cifrado de extremo a extremo en todos los dispositivos</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal para escritorio o iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Todos los mensajes de los dispositivos vinculados son privados</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Los mensajes de Molly se sincronizan con Molly en tu teléfono después de que lo vinculas. No aparecerá tu historial de mensajes anterior.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">En tu otro dispositivo, ve a %1$s para instalar Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Mis dispositivos vinculados</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Desvincular</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s desvinculado</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Vinculando dispositivo…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Dispositivo aprobado</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Cargando…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">No hay dispositivos vinculados</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Desbloquear para vincular un dispositivo</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Escanea el código QR que se muestra en el dispositivo que quieres vincular.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Escanear código QR</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Usa este dispositivo para escanear el código QR que se muestra en el dispositivo que quieres vincular</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">De acuerdo</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Desde este dispositivo podrás ver tus grupos y contactos, leer todos tus mensajes y enviar mensajes en tu nombre.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Termina de vincular tu otro dispositivo</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Termina de vincular Molly en tu otro dispositivo.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">No se ha podido vincular el dispositivo</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Este código QR no es válido. Asegúrate de estar escaneando el código QR que se muestra en el dispositivo que quieres vincular.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Reintentar</string>
 
     <!-- DeviceListActivity -->
-    <string name="DeviceListActivity_unlink_s">¿Desenlazar «%1$s»?</string>
-    <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Al desenlazar este dispositivo ya no podrás enviar ni recibir mensajes.</string>
-    <string name="DeviceListActivity_network_connection_failed">Fallo en la conexión de red</string>
-    <string name="DeviceListActivity_try_again">Intentar de nuevo</string>
-    <string name="DeviceListActivity_unlinking_device">Desenlazando dispositivo …</string>
-    <string name="DeviceListActivity_unlinking_device_no_ellipsis">Desenlazar dispositivo</string>
-    <string name="DeviceListActivity_network_failed">¡Fallo de red!</string>
+    <string name="DeviceListActivity_unlink_s">¿Desvincular «%1$s»?</string>
+    <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Si se desvincula este dispositivo, ya no podrás enviar ni recibir mensajes allí.</string>
+    <string name="DeviceListActivity_network_connection_failed">Error en la conexión de red</string>
+    <string name="DeviceListActivity_try_again">Inténtalo de nuevo</string>
+    <string name="DeviceListActivity_unlinking_device">Desvinculando dispositivo…</string>
+    <string name="DeviceListActivity_unlinking_device_no_ellipsis">Desvinculando dispositivo</string>
+    <string name="DeviceListActivity_network_failed">Error de red</string>
 
     <!-- DeviceListItem -->
     <string name="DeviceListItem_unnamed_device">Dispositivo sin nombre</string>
-    <string name="DeviceListItem_linked_s">%1$s enlazado</string>
-    <string name="DeviceListItem_last_active_s">Activo por última vez el %1$s</string>
+    <string name="DeviceListItem_linked_s">%1$s vinculado</string>
+    <string name="DeviceListItem_last_active_s">Última actividad: %1$s</string>
     <string name="DeviceListItem_today">Hoy</string>
 
     <!-- DocumentView -->
     <string name="DocumentView_unnamed_file">Archivo sin nombre</string>
 
     <!-- DozeReminder -->
-    <string name="DozeReminder_optimize_for_missing_play_services">Optimizar sin servicios de Google Play</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Este dispositivo no dispone de los servicios de Google Play. Toca para desactivar las optimizaciones de batería del sistema que impiden a Signal obtener mensajes mientras está inactivo.</string>
+    <string name="DozeReminder_optimize_for_missing_play_services">Optimizar sin Servicios de Google Play</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Este dispositivo no es compatible con los Servicios de Google Play. Toca para desactivar las optimizaciones de batería del sistema que impiden a Molly recuperar mensajes mientras está inactivo.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Esta versión de Signal ha caducado. Actualízala ahora para seguir enviando y recibiendo mensajes.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Esta versión de Molly ha caducado. Actualízala ahora para seguir enviando y recibiendo mensajes.</string>
     <string name="ExpiredBuildReminder_update_now">Actualizar ahora</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,12 +946,12 @@
     <string name="PendingGroupJoinRequestsReminder_view">Ver</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">¡Fallo permanente de comunicación de Signal!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal fué incapaz de registrarse con Google Play Services. Los mensajes y llamadas de Signal han sido desactivados, por favor, intenta registrarte otra vez en Configuración &gt; Avanzado.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Fallo permanente de comunicación de Molly</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly no ha podido completar el registro en Servicios de Google Play. Se han desactivado los mensajes y las llamadas de Molly. Intenta registrarte otra vez en Ajustes &gt; Ajustes avanzados.</string>
 
 
     <!-- GiphyActivity -->
-    <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Fallo al obtener el GIF a resolución completa</string>
+    <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">No se ha podido recuperar el GIF en resolución completa</string>
 
     <!-- GiphyFragmentPageAdapter -->
 
@@ -903,8 +966,8 @@
     <string name="AddToGroupActivity_add_to_a_group">Añadir a un grupo</string>
 
     <!-- ChooseNewAdminActivity -->
-    <string name="ChooseNewAdminActivity_choose_new_admin">Selecciona nuev@ admin</string>
-    <string name="ChooseNewAdminActivity_done">Hecho</string>
+    <string name="ChooseNewAdminActivity_choose_new_admin">Designa a otra persona como admin</string>
+    <string name="ChooseNewAdminActivity_done">Listo</string>
     <string name="ChooseNewAdminActivity_you_left">Has abandonado «%1$s».</string>
 
     <!-- GroupMembersDialog -->
@@ -912,7 +975,7 @@
 
     <!-- GV2 access levels -->
     <string name="GroupManagement_access_level_anyone">Cualquiera</string>
-    <string name="GroupManagement_access_level_all_members">Cualquiera</string>
+    <string name="GroupManagement_access_level_all_members">Todos los participantes</string>
     <string name="GroupManagement_access_level_only_admins">Solo admins</string>
     <string name="GroupManagement_access_level_no_one">Nadie</string>
   <!-- Removed by excludeNonTranslatables <string name="GroupManagement_access_level_unknown" translatable="false">Unknown</string> -->
@@ -931,17 +994,17 @@
         <item quantity="other">%1$d invitaciones enviadas</item>
     </plurals>
     <!-- Dialog message shown when you are attempting to add a single contact to a group and you don\'t have enough information about them to do it automatically, so must do it via an invite instead. Placeholder is name/username/phone number. -->
-    <string name="GroupManagement_invite_single_user">No se puede añadir automáticamente a %1$s al grupo. Ha recibido una invitación y no podrá ver ningún mensaje hasta que la acepte.</string>
-    <string name="GroupManagement_invite_multiple_users">No se puede añadir automáticamente a estas personas al grupo. Han recibido una invitación y no podrán ver ningún mensaje hasta que la acepten.</string>
+    <string name="GroupManagement_invite_single_user">No se puede añadir automáticamente a %1$s al grupo.\n\nEsta persona ha recibido una invitación y no podrá ver ningún mensaje hasta que la acepte.</string>
+    <string name="GroupManagement_invite_multiple_users">No se puede añadir automáticamente a estas personas al grupo.\n\nHan recibido una invitación y no podrán ver ningún mensaje hasta que la acepten.</string>
 
     <!-- GroupsV1MigrationLearnMoreBottomSheetDialogFragment -->
     <string name="GroupsV1MigrationLearnMore_what_are_new_groups">¿Qué son los nuevos grupos?</string>
-    <string name="GroupsV1MigrationLearnMore_new_groups_have_features_like_mentions">Funciones de los nuevos grupos incluyen @menciones, admins y más en el futuro.</string>
+    <string name="GroupsV1MigrationLearnMore_new_groups_have_features_like_mentions">Los nuevos grupos incluyen funciones como @menciones y admins, y se añadirán más en el futuro.</string>
     <string name="GroupsV1MigrationLearnMore_all_message_history_and_media_has_been_kept">Todos los mensajes y adjuntos se han mantenido tras la actualización.</string>
-    <string name="GroupsV1MigrationLearnMore_you_will_need_to_accept_an_invite_to_join_this_group_again">Deberás aceptar una invitación para volver a unirte a este grupo y no recibirás ningún mensaje del grupo hasta que lo hagas.</string>
+    <string name="GroupsV1MigrationLearnMore_you_will_need_to_accept_an_invite_to_join_this_group_again">Deberás aceptar una invitación para volver a unirte a este grupo y no recibirás ningún mensaje del grupo hasta que aceptes.</string>
     <plurals name="GroupsV1MigrationLearnMore_these_members_will_need_to_accept_an_invite">
-        <item quantity="one">Esta persona tiene que aceptar la invitación para unirse al grupo de nuevo y no recibirá ningún mensaje del grupo hasta que acepte:</item>
-        <item quantity="other">Estas personas tienen que aceptar la invitación para unirse al grupo de nuevo y no recibirán ningún mensaje del grupo hasta que acepten:</item>
+        <item quantity="one">Esta persona tiene que aceptar la invitación para volver a unirse al grupo y no recibirá ningún mensaje del grupo hasta que acepte:</item>
+        <item quantity="other">Estas personas tienen que aceptar la invitación para volver a unirse al grupo y no recibirán ningún mensaje del grupo hasta que acepten:</item>
     </plurals>
     <plurals name="GroupsV1MigrationLearnMore_these_members_were_removed_from_the_group">
         <item quantity="one">Se ha expulsado a esta persona del grupo pero podrá volver a unirse tras actualizar Signal:</item>
@@ -951,13 +1014,13 @@
     <!-- GroupsV1MigrationInitiationBottomSheetDialogFragment -->
     <string name="GroupsV1MigrationInitiation_upgrade_to_new_group">Actualizar al nuevo sistema de grupos</string>
     <string name="GroupsV1MigrationInitiation_upgrade_this_group">Actualizar este grupo</string>
-    <string name="GroupsV1MigrationInitiation_new_groups_have_features_like_mentions">Funciones de los nuevos grupos incluyen @menciones, admins y más en el futuro.</string>
+    <string name="GroupsV1MigrationInitiation_new_groups_have_features_like_mentions">Los nuevos grupos incluyen funciones como @menciones y admins, y se añadirán más en el futuro.</string>
     <string name="GroupsV1MigrationInitiation_all_message_history_and_media_will_be_kept">Los mensajes y adjuntos se mantendrán tras la actualización.</string>
-    <string name="GroupsV1MigrationInitiation_encountered_a_network_error">Fallo en la conexión de red. Inténtalo más tarde.</string>
-    <string name="GroupsV1MigrationInitiation_failed_to_upgrade">Fallo al actualizar.</string>
+    <string name="GroupsV1MigrationInitiation_encountered_a_network_error">Error en la conexión de red. Inténtalo de nuevo más tarde.</string>
+    <string name="GroupsV1MigrationInitiation_failed_to_upgrade">No se ha podido actualizar.</string>
     <plurals name="GroupsV1MigrationInitiation_these_members_will_need_to_accept_an_invite">
-        <item quantity="one">Esta persona tiene que aceptar la invitación para unirse al grupo de nuevo y no recibirá ningún mensaje del grupo hasta que acepte:</item>
-        <item quantity="other">Estas personas tienen que aceptar la invitación para unirse al grupo de nuevo y no recibirán ningún mensaje del grupo hasta que acepten:</item>
+        <item quantity="one">Esta persona tiene que aceptar la invitación para volver a unirse al grupo y no recibirá ningún mensaje del grupo hasta que acepte:</item>
+        <item quantity="other">Estas personas tienen que aceptar la invitación para volver a unirse al grupo y no recibirán ningún mensaje del grupo hasta que acepten:</item>
     </plurals>
     <plurals name="GroupsV1MigrationInitiation_these_members_are_not_capable_of_joining_new_groups">
         <item quantity="one">Esta persona no puede unirse a nuevos grupos y se la expulsará del grupo:</item>
@@ -966,14 +1029,14 @@
 
     <!-- GroupsV1MigrationSuggestionsReminder -->
     <plurals name="GroupsV1MigrationSuggestionsReminder_members_couldnt_be_added_to_the_new_group">
-        <item quantity="one">No se ha podido añadir a %1$d participante al nuevo grupo. ¿Deseas hacerlo ahora?</item>
-        <item quantity="other">No se ha podido añadir a %1$d participantes al nuevo grupo. ¿Deseas hacerlo ahora?</item>
+        <item quantity="one">No se ha podido volver a añadir a %1$d participante al nuevo grupo. ¿Deseas hacerlo ahora?</item>
+        <item quantity="other">No se ha podido volver a añadir a %1$d participantes al nuevo grupo. ¿Deseas hacerlo ahora?</item>
     </plurals>
     <plurals name="GroupsV1MigrationSuggestionsReminder_add_members">
         <item quantity="one">Añadir participante</item>
         <item quantity="other">Añadir participantes</item>
     </plurals>
-    <string name="GroupsV1MigrationSuggestionsReminder_no_thanks">No gracias</string>
+    <string name="GroupsV1MigrationSuggestionsReminder_no_thanks">No, gracias</string>
 
     <!-- GroupsV1MigrationSuggestionsDialog -->
     <plurals name="GroupsV1MigrationSuggestionsDialog_add_members_question">
@@ -981,33 +1044,33 @@
         <item quantity="other">¿Añadir participantes?</item>
     </plurals>
     <plurals name="GroupsV1MigrationSuggestionsDialog_these_members_couldnt_be_automatically_added">
-        <item quantity="one">No se ha podido añadir a esta persona al actualizar el nuevo grupo:</item>
-        <item quantity="other">No se ha podido añadir a estas personas al actualizar el nuevo grupo:</item>
+        <item quantity="one">No se ha podido añadir automáticamente a esta persona al actualizar el nuevo grupo:</item>
+        <item quantity="other">No se ha podido añadir automáticamente a estas personas al actualizar el nuevo grupo:</item>
     </plurals>
     <plurals name="GroupsV1MigrationSuggestionsDialog_add_members">
         <item quantity="one">Añadir participante</item>
         <item quantity="other">Añadir participantes</item>
     </plurals>
     <plurals name="GroupsV1MigrationSuggestionsDialog_failed_to_add_members_try_again_later">
-        <item quantity="one">Fallo al añadir participante. Inténtalo más tarde.</item>
-        <item quantity="other">Fallo al añadir participantes. Inténtalo más tarde.</item>
+        <item quantity="one">No se ha podido añadir participante. Inténtalo de nuevo más tarde.</item>
+        <item quantity="other">No se han podido añadir participantes. Inténtalo de nuevo más tarde.</item>
     </plurals>
     <plurals name="GroupsV1MigrationSuggestionsDialog_cannot_add_members">
-        <item quantity="one">Imposible añadir participante.</item>
-        <item quantity="other">Imposible añadir participantes.</item>
+        <item quantity="one">No se puede añadir participante.</item>
+        <item quantity="other">No se puede añadir participantes.</item>
     </plurals>
 
     <!-- LeaveGroupDialog -->
     <string name="LeaveGroupDialog_leave_group">¿Abandonar grupo?</string>
-    <string name="LeaveGroupDialog_you_will_no_longer_be_able_to_send_or_receive_messages_in_this_group">No podrás enviar o recibir más mensajes en este grupo.</string>
+    <string name="LeaveGroupDialog_you_will_no_longer_be_able_to_send_or_receive_messages_in_this_group">No podrás enviar ni recibir más mensajes en este grupo.</string>
     <string name="LeaveGroupDialog_leave">Abandonar</string>
-    <string name="LeaveGroupDialog_choose_new_admin">Selecciona nuev@ admin</string>
-    <string name="LeaveGroupDialog_before_you_leave_you_must_choose_at_least_one_new_admin_for_this_group">Antes de abandonar, selecciona un@ nuev@ admin para este grupo.</string>
+    <string name="LeaveGroupDialog_choose_new_admin">Designa a otra persona como admin</string>
+    <string name="LeaveGroupDialog_before_you_leave_you_must_choose_at_least_one_new_admin_for_this_group">Antes de abandonar el grupo, designa a otra persona como admin.</string>
     <string name="LeaveGroupDialog_choose_admin">Seleccionar admin</string>
 
     <!-- LinkPreviewView -->
-    <string name="LinkPreviewView_no_link_preview_available">Vista previa no disponible</string>
-    <string name="LinkPreviewView_this_group_link_is_not_active">El enlace al grupo no está disponible</string>
+    <string name="LinkPreviewView_no_link_preview_available">Vista previa del enlace no disponible</string>
+    <string name="LinkPreviewView_this_group_link_is_not_active">El enlace a este grupo no está activo</string>
     <string name="LinkPreviewView_domain_date">%1$s · %2$s</string>
     <!-- Description for Call Link url previews -->
     <string name="LinkPreviewView__use_this_link_to_join_a_signal_call">Usar este enlace para unirse a llamada de Signal</string>
@@ -1023,27 +1086,37 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Los registros de depuración nos ayudan a diagnosticar y solucionar el problema y no contienen información que pueda identificarte.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal ha encontrado un problema. ¿Enviar registro de depuración?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly ha encontrado un problema. ¿Enviar registro de depuración?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Las notificaciones pueden retrasarse debido a los procesos de optimización de la batería</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Puedes deshabilitar las opciones de optimización de batería para Signal para asegurarte de que las notificaciones de mensajes no se retrasen.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Puedes deshabilitar las opciones de optimización de batería para Molly para asegurarte de que las notificaciones de mensajes no se retrasen.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Las notificaciones pueden retrasarse debido a los procesos de optimización de la batería</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Deshabilita las opciones de optimización de batería para Molly para asegurarte de que las notificaciones de mensajes no se retrasen. Toca «Continuar» para ver las instrucciones específicas del dispositivo.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">No, gracias</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Continuar</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Continuar</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Ignorar</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">No, gracias</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Invitaciones pendientes</string>
+    <string name="PendingMembersActivity_pending_group_invites">Solicitudes e invitaciones</string>
     <string name="PendingMembersActivity_requests">Solicitudes</string>
     <string name="PendingMembersActivity_invites">Invitaciones</string>
-    <string name="PendingMembersActivity_people_you_invited">Personas invitadas por ti</string>
+    <string name="PendingMembersActivity_people_you_invited">Personas que has invitado</string>
     <string name="PendingMembersActivity_you_have_no_pending_invites">No tienes invitaciones pendientes.</string>
-    <string name="PendingMembersActivity_invites_by_other_group_members">Más personas invitadas</string>
-    <string name="PendingMembersActivity_no_pending_invites_by_other_group_members">No hay invitaciones pendientes de otr@s participantes.</string>
-    <string name="PendingMembersActivity_missing_detail_explanation">No se muestra el alias y foto de las personas invitadas por otr@s. Su alias y foto de perfil se mostrarán a partir del momento en que decidan participar en el grupo. También verán los mensajes del grupo a partir de ese momento.</string>
+    <string name="PendingMembersActivity_invites_by_other_group_members">Personas invitadas por otros participantes</string>
+    <string name="PendingMembersActivity_no_pending_invites_by_other_group_members">No hay invitaciones pendientes de otros participantes.</string>
+    <string name="PendingMembersActivity_missing_detail_explanation">No se muestra la información de las personas invitadas por otros participantes. Su información se mostrarán a partir del momento en que decidan formar parte del grupo. También verán los mensajes del grupo a partir de ese momento.</string>
 
     <string name="PendingMembersActivity_revoke_invite">Retirar invitación</string>
     <string name="PendingMembersActivity_revoke_invites">Retirar invitaciones</string>
@@ -1052,37 +1125,37 @@
         <item quantity="other">Retirar %1$d invitaciones</item>
     </plurals>
     <plurals name="PendingMembersActivity_error_revoking_invite">
-        <item quantity="one">Fallo al retirar invitación</item>
-        <item quantity="other">Fallo al retirar invitaciones</item>
+        <item quantity="one">No se ha podido retirar la invitación</item>
+        <item quantity="other">No se han podido retirar las invitaciones</item>
     </plurals>
 
     <!-- RequestingMembersFragment -->
     <string name="RequestingMembersFragment_pending_member_requests">Solicitudes pendientes</string>
-    <string name="RequestingMembersFragment_no_member_requests_to_show">No hay solicitudes que ver.</string>
-    <string name="RequestingMembersFragment_explanation">Las personas en esta lista han solicitado unirse al grupo vía enlace.</string>
+    <string name="RequestingMembersFragment_no_member_requests_to_show">No hay solicitudes que mostrar.</string>
+    <string name="RequestingMembersFragment_explanation">Las personas de esta lista han solicitado unirse al grupo mediante enlace.</string>
     <string name="RequestingMembersFragment_added_s">"Se ha añadido a %1$s"</string>
-    <string name="RequestingMembersFragment_denied_s">"%1$s denegad@"</string>
+    <string name="RequestingMembersFragment_denied_s">"Se ha rechazado a %1$s"</string>
 
     <!-- AddMembersActivity -->
-    <string name="AddMembersActivity__done">Hecho</string>
+    <string name="AddMembersActivity__done">Listo</string>
     <string name="AddMembersActivity__this_person_cant_be_added_to_legacy_groups">No se puede añadir a esta persona a grupos antiguos.</string>
     <plurals name="AddMembersActivity__add_d_members_to_s">
-        <item quantity="one">¿Añadir \"%1$s\" a \"%2$s\"?</item>
-        <item quantity="other">¿Añadir %3$d participantes a \"%2$s\"?</item>
+        <item quantity="one">¿Añadir a «%1$s» a «%2$s»?</item>
+        <item quantity="other">¿Añadir %3$d participantes a «%2$s»?</item>
     </plurals>
     <string name="AddMembersActivity__add">Añadir</string>
     <string name="AddMembersActivity__add_members">Añadir participantes</string>
 
     <!-- AddGroupDetailsFragment -->
-    <string name="AddGroupDetailsFragment__name_this_group">Nombra este grupo</string>
+    <string name="AddGroupDetailsFragment__name_this_group">Asigna un nombre a este grupo</string>
     <string name="AddGroupDetailsFragment__create_group">Crear grupo</string>
     <string name="AddGroupDetailsFragment__create">Crear</string>
     <string name="AddGroupDetailsFragment__members">Participantes</string>
-    <string name="AddGroupDetailsFragment__you_can_add_or_invite_friends_after_creating_this_group">Puedes añadir o invitar amistades tras crear este grupo.</string>
-    <string name="AddGroupDetailsFragment__group_name_required">Nombre del grupo (necesario)</string>
+    <string name="AddGroupDetailsFragment__you_can_add_or_invite_friends_after_creating_this_group">Puedes añadir o invitar a personas después de crear este grupo.</string>
+    <string name="AddGroupDetailsFragment__group_name_required">Nombre del grupo (obligatorio)</string>
     <string name="AddGroupDetailsFragment__group_name_optional">Nombre del grupo (opcional)</string>
-    <string name="AddGroupDetailsFragment__this_field_is_required">Este campo es necesario.</string>
-    <string name="AddGroupDetailsFragment__group_creation_failed">Fallo al crear el grupo.</string>
+    <string name="AddGroupDetailsFragment__this_field_is_required">Este campo es obligatorio.</string>
+    <string name="AddGroupDetailsFragment__group_creation_failed">No se ha podido crear el grupo.</string>
     <string name="AddGroupDetailsFragment__try_again_later">Inténtalo de nuevo más tarde.</string>
     <string name="AddGroupDetailsFragment__remove">Eliminar</string>
     <string name="AddGroupDetailsFragment__sms_contact">Contacto SMS</string>
@@ -1094,7 +1167,7 @@
 
     <!-- ManageGroupActivity -->
     <string name="ManageGroupActivity_who_can_add_new_members">¿Quién puede añadir participantes?</string>
-    <string name="ManageGroupActivity_who_can_edit_this_groups_info">¿Quién puede modificar los detalles del grupo?</string>
+    <string name="ManageGroupActivity_who_can_edit_this_groups_info">¿Quién puede editar los detalles del grupo?</string>
 
     <plurals name="ManageGroupActivity_added">
         <item quantity="one">Se ha añadido %1$d participante.</item>
@@ -1102,41 +1175,41 @@
     </plurals>
 
     <string name="ManageGroupActivity_you_dont_have_the_rights_to_do_this">No dispones de permisos para hacerlo</string>
-    <string name="ManageGroupActivity_not_capable">Alguien a quien has añadido no soporta el nuevo sistema de grupos y debe actualizar Signal.</string>
-    <string name="ManageGroupActivity_not_announcement_capable">Alguien a quien has añadido no soporta el nuevo sistema de grupos de difusión y debe actualizar Signal.</string>
-    <string name="ManageGroupActivity_failed_to_update_the_group">Fallo al actualizar el grupo</string>
-    <string name="ManageGroupActivity_youre_not_a_member_of_the_group">No participas en el grupo</string>
-    <string name="ManageGroupActivity_failed_to_update_the_group_please_retry_later">Fallo al actualizar el grupo, por favor inténtalo más tarde</string>
-    <string name="ManageGroupActivity_failed_to_update_the_group_due_to_a_network_error_please_retry_later">Fallo al actualizar el grupo por un problema de red, por favor inténtalo más tarde</string>
+    <string name="ManageGroupActivity_not_capable">Alguien a quien has añadido no tiene una versión compatible con el nuevo sistema de grupos y debe actualizar Signal</string>
+    <string name="ManageGroupActivity_not_announcement_capable">Alguien a quien has añadido no tiene una versión compatible con el nuevo sistema de grupos de difusión y debe actualizar Signal</string>
+    <string name="ManageGroupActivity_failed_to_update_the_group">No se ha podido actualizar el grupo</string>
+    <string name="ManageGroupActivity_youre_not_a_member_of_the_group">No formas parte del grupo</string>
+    <string name="ManageGroupActivity_failed_to_update_the_group_please_retry_later">No se ha podido actualizar el grupo. Inténtalo de nuevo más tarde.</string>
+    <string name="ManageGroupActivity_failed_to_update_the_group_due_to_a_network_error_please_retry_later">No se ha podido actualizar el grupo por un error de red. Inténtalo de nuevo más tarde.</string>
 
     <string name="ManageGroupActivity_edit_name_and_picture">Editar nombre e imagen</string>
     <string name="ManageGroupActivity_legacy_group">Grupo antiguo</string>
     <!-- This is placed inside a "Learn More" text view, which automatically appends LearnMoreTextView_learn_more in code -->
-    <string name="ManageGroupActivity_legacy_group_learn_more">Este grupo usa el sistema antiguo de Signal. Funciones como admins de grupo o menciones solo están disponibles en el nuevo sistema.</string>
+    <string name="ManageGroupActivity_legacy_group_learn_more">Este es un grupo del sistema antiguo de Signal. Algunas funciones, como admins de grupo o @menciones, solo están disponibles en el nuevo sistema.</string>
     <!-- This is placed inside a "Learn More" text view, which automatically appends LearnMoreTextView_learn_more in code to the end of the string -->
-    <string name="ManageGroupActivity_legacy_group_upgrade">Este es un grupo del sistema antiguo. Para acceder a funciones como @menciones y admins,</string>
-    <string name="ManageGroupActivity_legacy_group_too_large">Este grupo no se puede actualizar al nuevo sistema porque es demasiado grande. El tamaño máximo de grupo es de%1$d participantes.</string>
+    <string name="ManageGroupActivity_legacy_group_upgrade">Este es un grupo del sistema antiguo de Signal. Para acceder a funciones como @menciones y admins,</string>
+    <string name="ManageGroupActivity_legacy_group_too_large">Este grupo no se puede actualizar al nuevo sistema porque es demasiado grande. Se permite un máximo de %1$d participantes.</string>
     <string name="ManageGroupActivity_upgrade_this_group">actualiza este grupo.</string>
     <string name="ManageGroupActivity_this_is_an_insecure_mms_group">Este es un grupo de MMS sin cifrar. Para chatear en privado, invita a tus amistades a usar Signal.</string>
     <string name="ManageGroupActivity_invite_now">Invitar ahora</string>
     <string name="ManageGroupActivity_more">más</string>
-    <string name="ManageGroupActivity_add_group_description">Añade la descripción del grupo …</string>
+    <string name="ManageGroupActivity_add_group_description">Añadir descripción del grupo…</string>
 
     <!-- GroupMentionSettingDialog -->
-    <string name="GroupMentionSettingDialog_notify_me_for_mentions">Notificar cuando alguien me mencione</string>
+    <string name="GroupMentionSettingDialog_notify_me_for_mentions">Notificarme cuando alguien me mencione</string>
     <string name="GroupMentionSettingDialog_receive_notifications_when_youre_mentioned_in_muted_chats">¿Deseas recibir notificationes si te mencionan en un chat silenciado?</string>
-    <string name="GroupMentionSettingDialog_always_notify_me">Notificar siempre</string>
-    <string name="GroupMentionSettingDialog_dont_notify_me">No notificar</string>
+    <string name="GroupMentionSettingDialog_always_notify_me">Notificarme siempre</string>
+    <string name="GroupMentionSettingDialog_dont_notify_me">No notificarme</string>
 
     <!-- ManageProfileFragment -->
     <!-- Explanation text about usernames etc displayed underneath buttons to view and edit username etc -->
-    <string name="ManageProfileFragment__your_username">Tu alias, código QR y enlace no son visibles en tu perfil. Comparte tu alias solo con personas de confianza.</string>
+    <string name="ManageProfileFragment__your_username">Tu alias, código QR y enlace no se muestran en tu perfil. Comparte tu alias solo con personas de confianza.</string>
     <!-- Explanation text about usernames etc displayed underneath buttons to view and edit username etc, shown when you have no username -->
-    <string name="ManageProfileFragment__username_footer_no_username">Ahora, la gente puede enviarte mensajes usando tu alias opcional, con lo que no necesitas dar tu número de teléfono. </string>
+    <string name="ManageProfileFragment__username_footer_no_username">Ahora, las personas pueden enviarte mensajes usando tu alias opcional, con lo que no necesitas dar tu número de teléfono. </string>
     <string name="ManageProfileFragment_profile_name">Nombre de perfil</string>
     <string name="ManageProfileFragment_username">Alias</string>
-    <string name="ManageProfileFragment_about">Biografía</string>
-    <string name="ManageProfileFragment_failed_to_set_avatar">Fallo al seleccionar foto de perfil</string>
+    <string name="ManageProfileFragment_about">Información</string>
+    <string name="ManageProfileFragment_failed_to_set_avatar">No se ha podido seleccionar el avatar</string>
     <string name="ManageProfileFragment_badges">Insignias</string>
     <!-- Text for a button that will take the user to the screen to manage their username link and QR code -->
     <string name="ManageProfileFragment_link_setting_text">Código QR o enlace</string>
@@ -1190,49 +1263,49 @@
     <string name="CustomNotificationsDialogFragment__change_sound_and_vibration">Modificar sonido y vibración</string>
     <string name="CustomNotificationsDialogFragment__call_settings">Ajustes de llamada</string>
     <string name="CustomNotificationsDialogFragment__ringtone">Tono de llamada</string>
-    <string name="CustomNotificationsDialogFragment__default">Por defecto</string>
-    <string name="CustomNotificationsDialogFragment__unknown">Desconocid@</string>
+    <string name="CustomNotificationsDialogFragment__default">Predeterminado</string>
+    <string name="CustomNotificationsDialogFragment__unknown">Desconocido</string>
 
     <!-- ShareableGroupLinkDialogFragment -->
     <string name="ShareableGroupLinkDialogFragment__group_link">Enlace al grupo</string>
     <string name="ShareableGroupLinkDialogFragment__share">Compartir</string>
     <string name="ShareableGroupLinkDialogFragment__reset_link">Restablecer enlace</string>
-    <string name="ShareableGroupLinkDialogFragment__approve_new_members">Aprobar solicitudes</string>
-    <string name="ShareableGroupLinkDialogFragment__require_an_admin_to_approve_new_members_joining_via_the_group_link">Con la opción activa se genera una solicitud de acceso al grupo que debe ser aprobada por un@ admin.</string>
+    <string name="ShareableGroupLinkDialogFragment__approve_new_members">Aprobar solicitudes nuevas</string>
+    <string name="ShareableGroupLinkDialogFragment__require_an_admin_to_approve_new_members_joining_via_the_group_link">Una persona que sea admin del grupo debe aprobar las solicitudes de acceso para unirse mediante enlace.</string>
     <string name="ShareableGroupLinkDialogFragment__are_you_sure_you_want_to_reset_the_group_link">¿Deseas restablecer el enlace para unirse al grupo? Si lo restableces, nadie podrá unirse al chat usando el enlace actual.</string>
 
     <!-- GroupLinkShareQrDialogFragment -->
     <string name="GroupLinkShareQrDialogFragment__qr_code">Código QR</string>
-    <string name="GroupLinkShareQrDialogFragment__people_who_scan_this_code_will">Las personas que escaneen este código podrán unirse al grupo. L@s admins deberán aprobar nuev@s participantes si se ha activado esa opción.</string>
+    <string name="GroupLinkShareQrDialogFragment__people_who_scan_this_code_will">Las personas que escaneen este código podrán unirse al grupo. Aun así, los admins deben aceptar a nuevos participantes si esa opción está activa.</string>
     <string name="GroupLinkShareQrDialogFragment__share_code">Compartir código</string>
 
     <!-- GV2 Invite Revoke confirmation dialog -->
-    <string name="InviteRevokeConfirmationDialog_revoke_own_single_invite">¿Deseas retirar la invitación enviada a %1$s?</string>
+    <string name="InviteRevokeConfirmationDialog_revoke_own_single_invite">¿Deseas retirar la invitación que has enviado a %1$s?</string>
     <plurals name="InviteRevokeConfirmationDialog_revoke_others_invites">
-        <item quantity="one">¿Deseas retirar la invitación enviadas por %1$s?</item>
-        <item quantity="other">¿Deseas retirar las %2$d invitaciones enviadas por %1$s?</item>
+        <item quantity="one">¿Deseas retirar la invitación que %1$s ha enviado?</item>
+        <item quantity="other">¿Deseas retirar las %2$d invitaciones que %1$s ha enviado?</item>
     </plurals>
 
     <!-- GroupJoinBottomSheetDialogFragment -->
-    <string name="GroupJoinBottomSheetDialogFragment_you_are_already_a_member">Ya participas</string>
+    <string name="GroupJoinBottomSheetDialogFragment_you_are_already_a_member">Ya formas parte del grupo</string>
     <string name="GroupJoinBottomSheetDialogFragment_join">Unirse</string>
     <string name="GroupJoinBottomSheetDialogFragment_request_to_join">Solicitar unirse</string>
-    <string name="GroupJoinBottomSheetDialogFragment_unable_to_join_group_please_try_again_later">Fallo al unirse al grupo. Por favor, inténtalo más tarde</string>
-    <string name="GroupJoinBottomSheetDialogFragment_encountered_a_network_error">Fallo en la conexión de red.</string>
-    <string name="GroupJoinBottomSheetDialogFragment_this_group_link_is_not_active">Este enlace al grupo no está disponible</string>
+    <string name="GroupJoinBottomSheetDialogFragment_unable_to_join_group_please_try_again_later">No es posible unirse al grupo. Inténtalo de nuevo más tarde.</string>
+    <string name="GroupJoinBottomSheetDialogFragment_encountered_a_network_error">Error en la conexión de red.</string>
+    <string name="GroupJoinBottomSheetDialogFragment_this_group_link_is_not_active">El enlace a este grupo no está activo</string>
     <!-- Title shown when there was an known issue getting group information from a group link -->
-    <string name="GroupJoinBottomSheetDialogFragment_cant_join_group">Imposible unirse al grupo</string>
+    <string name="GroupJoinBottomSheetDialogFragment_cant_join_group">No es posible unirse al grupo</string>
     <!-- Message shown when you try to get information for a group via link but an admin has removed you -->
     <string name="GroupJoinBottomSheetDialogFragment_you_cant_join_this_group_via_the_group_link_because_an_admin_removed_you">No puedes volver a unirte a este grupo vía enlace porque un admin te ha vetado.</string>
     <!-- Message shown when you try to get information for a group via link but the link is no longer valid -->
-    <string name="GroupJoinBottomSheetDialogFragment_this_group_link_is_no_longer_valid">Este enlace de grupo es inválido.</string>
+    <string name="GroupJoinBottomSheetDialogFragment_this_group_link_is_no_longer_valid">El enlace a este grupo no es válido.</string>
     <!-- Title shown when there was an unknown issue getting group information from a group link -->
-    <string name="GroupJoinBottomSheetDialogFragment_link_error">Fallo en el enlace</string>
+    <string name="GroupJoinBottomSheetDialogFragment_link_error">Error en el enlace</string>
     <!-- Message shown when you try to get information for a group via link but an unknown issue occurred -->
-    <string name="GroupJoinBottomSheetDialogFragment_joining_via_this_link_failed_try_joining_again_later">Fallo al unirse a través del enlace. Inténtalo más tarde.</string>
+    <string name="GroupJoinBottomSheetDialogFragment_joining_via_this_link_failed_try_joining_again_later">No te puedes unir mediante enlace. Inténtalo de nuevo más tarde.</string>
 
     <string name="GroupJoinBottomSheetDialogFragment_direct_join">¿Deseas unirte a este grupo y compartir tu nombre y foto con sus participantes?</string>
-    <string name="GroupJoinBottomSheetDialogFragment_admin_approval_needed">Un@ admin de este grupo debe aprobar tu solicitud de acceso para unirte al grupo. Al solicitar unirte, tu nombre y foto se compartirán con sus participantes.</string>
+    <string name="GroupJoinBottomSheetDialogFragment_admin_approval_needed">Una persona que sea admin de este grupo debe aprobar tu solicitud de acceso para unirte. Al solicitar unirte al grupo, tu nombre y foto se compartirán con sus participantes.</string>
     <plurals name="GroupJoinBottomSheetDialogFragment_group_dot_d_members">
         <item quantity="one">Grupo · %1$d participante</item>
         <item quantity="other">Grupo · %1$d participantes</item>
@@ -1240,33 +1313,33 @@
 
     <!-- GroupJoinUpdateRequiredBottomSheetDialogFragment -->
     <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_update_signal_to_use_group_links">Actualiza Signal para usar enlaces a grupos</string>
-    <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_update_message">La versión de Signal que usas no soporta este enlace para unirse a grupos. Actualiza Signal para unirte a este grupo vía enlace.</string>
-    <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_update_signal">Actualiza Signal</string>
-    <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_group_link_is_not_valid">Enlace a grupo inválido</string>
+    <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_update_message">La versión de Signal que usas no es compatible con el enlace para unirse a este grupo. Actualiza Signal para unirte al grupo mediante enlace.</string>
+    <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_update_signal">Actualizar Signal</string>
+    <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_group_link_is_not_valid">Enlace al grupo no válido</string>
 
     <!-- GroupInviteLinkEnableAndShareBottomSheetDialogFragment -->
-    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_invite_friends">Invitar amistades</string>
-    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_share_a_link_with_friends_to_let_them_quickly_join_this_group">Comparte con tus amistades el enlace a este grupo para que se unan.</string>
+    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_invite_friends">Invitar personas</string>
+    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_share_a_link_with_friends_to_let_them_quickly_join_this_group">Comparte el enlace con las personas que quieras que se unan a este grupo.</string>
 
     <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_enable_and_share_link">Activar y compartir enlace</string>
     <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_share_link">Compartir enlace</string>
 
-    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_unable_to_enable_group_link_please_try_again_later">Fallo al activar el enlace para unirse al grupo. Inténtalo más tarde</string>
-    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_encountered_a_network_error">Fallo en la conexión de red.</string>
-    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_you_dont_have_the_right_to_enable_group_link">No dispones de permisos para activar el enlace al grupo. Solicítalo a un@ admin.</string>
-    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_you_are_not_currently_a_member_of_the_group">Todavía no participas en este grupo.</string>
+    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_unable_to_enable_group_link_please_try_again_later">No se ha podido habilitar el enlace para unirse al grupo. Inténtalo de nuevo más tarde.</string>
+    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_encountered_a_network_error">Se ha producido un error de red.</string>
+    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_you_dont_have_the_right_to_enable_group_link">No dispones de permisos para activar el enlace al grupo. Solicítalo a una persona que sea admin.</string>
+    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_you_are_not_currently_a_member_of_the_group">No formas parte de este grupo.</string>
 
     <!-- GV2 Request confirmation dialog -->
     <string name="RequestConfirmationDialog_add_s_to_the_group">¿Añadir a %1$s al grupo?</string>
     <string name="RequestConfirmationDialog_deny_request_from_s">¿Denegar la solicitud de %1$s?</string>
     <!-- Confirm dialog message shown when deny a group link join request and group link is enabled. -->
-    <string name="RequestConfirmationDialog_deny_request_from_s_they_will_not_be_able_to_request">¿Vetar solicitudes de %1$s? Esta persona ya no podrá solicitar ser añadida de nuevo al grupo vía enlace.</string>
+    <string name="RequestConfirmationDialog_deny_request_from_s_they_will_not_be_able_to_request">¿Denegar solicitudes de %1$s? Esta persona ya no podrá solicitar mediante enlace que la añadan al grupo.</string>
     <string name="RequestConfirmationDialog_add">Añadir</string>
     <string name="RequestConfirmationDialog_deny">Denegar</string>
 
     <!-- ImageEditorHud -->
     <string name="ImageEditorHud_blur_faces">Difuminar caras</string>
-    <string name="ImageEditorHud_new_blur_faces_or_draw_anywhere_to_blur">Nuevo: Difumina caras o zonas de la foto.</string>
+    <string name="ImageEditorHud_new_blur_faces_or_draw_anywhere_to_blur">¡Nuevo! Difumina caras o zonas de la foto</string>
     <string name="ImageEditorHud_draw_anywhere_to_blur">Toca sobre la foto para difuminar</string>
     <string name="ImageEditorHud_draw_to_blur_additional_faces_or_areas">Toca sobre la foto para difuminar más caras o zonas</string>
 
@@ -1278,39 +1351,39 @@
     <!-- InviteActivity -->
     <string name="InviteActivity_share">Compartir</string>
     <string name="InviteActivity_share_with_contacts">Compartir con contactos</string>
-    <string name="InviteActivity_share_via">Compartir por …</string>
+    <string name="InviteActivity_share_via">Compartir por…</string>
 
     <string name="InviteActivity_cancel">Cancelar</string>
-    <string name="InviteActivity_sending">Enviando …</string>
+    <string name="InviteActivity_sending">Enviando…</string>
     <string name="InviteActivity_invitations_sent">¡Invitaciones enviadas!</string>
-    <string name="InviteActivity_invite_to_signal">Invitar a Signal</string>
+    <string name="InviteActivity_invite_to_signal">Invitar a Molly</string>
     <string name="InviteActivity_send_sms">Enviar SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">¿Enviar %1$d invitación por SMS?</item>
         <item quantity="other">¿Enviar %1$d invitaciones por SMS?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Pasémonos a Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Pasémonos a Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Parece que no hay ninguna aplicación con la que compartir.</string>
 
     <!-- LearnMoreTextView -->
-    <string name="LearnMoreTextView_learn_more">Saber más</string>
+    <string name="LearnMoreTextView_learn_more">Más información</string>
 
-    <string name="SpanUtil__read_more">Leer más</string>
+    <string name="SpanUtil__read_more">Más información</string>
 
     <!-- LongMessageActivity -->
-    <string name="LongMessageActivity_unable_to_find_message">Imposible encontrar el mensaje</string>
+    <string name="LongMessageActivity_unable_to_find_message">No se ha podido encontrar el mensaje</string>
     <string name="LongMessageActivity_message_from_s">Mensaje de %1$s</string>
     <string name="LongMessageActivity_your_message">Tu mensaje</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Conexión en segundo plano activada</string>
 
     <!-- MediaOverviewActivity -->
-    <string name="MediaOverviewActivity_Media">Adjuntos</string>
+    <string name="MediaOverviewActivity_Media">Archivos multimedia</string>
     <string name="MediaOverviewActivity_Files">Archivos</string>
     <string name="MediaOverviewActivity_Audio">Audio</string>
-    <string name="MediaOverviewActivity_All">Todo</string>
+    <string name="MediaOverviewActivity_All">Todos</string>
     <plurals name="MediaOverviewActivity_Media_delete_confirm_title">
         <item quantity="one">¿Eliminar elemento seleccionado?</item>
         <item quantity="other">¿Eliminar elementos seleccionados?</item>
@@ -1320,8 +1393,8 @@
         <item quantity="other">Se eliminarán permanentemente los %1$d archivos seleccionados. Todos los mensajes asociados con estos archivos también se eliminarán.</item>
     </plurals>
     <string name="MediaOverviewActivity_Media_delete_progress_title">Eliminar</string>
-    <string name="MediaOverviewActivity_Media_delete_progress_message">Eliminando mensajes …</string>
-    <string name="MediaOverviewActivity_collecting_attachments">Recopilando adjuntos …</string>
+    <string name="MediaOverviewActivity_Media_delete_progress_message">Eliminando mensajes…</string>
+    <string name="MediaOverviewActivity_collecting_attachments">Recopilando archivos adjuntos…</string>
     <string name="MediaOverviewActivity_Sort_by">Ordenar por</string>
     <string name="MediaOverviewActivity_Newest">Más reciente</string>
     <string name="MediaOverviewActivity_Oldest">Más antiguo</string>
@@ -1342,8 +1415,8 @@
 
     <!-- Screen title shown when selecting multiple items in the media overview screen. The first placeholder is the number of items, the second number is the cumulative file size in bytes. -->
     <plurals name="MediaOverviewActivity_d_selected_s">
-        <item quantity="one">%1$d seleccionado (%2$s)</item>
-        <item quantity="other">%1$d seleccionados (%2$s)</item>
+        <item quantity="one">%1$d elemento seleccionado (%2$s)</item>
+        <item quantity="other">%1$d elementos seleccionados (%2$s)</item>
     </plurals>
     <string name="MediaOverviewActivity_file">Archivo</string>
     <string name="MediaOverviewActivity_audio">Audio</string>
@@ -1358,24 +1431,24 @@
     <string name="MediaOverviewActivity_sent_by_you_to_s">Enviado por ti a %1$s</string>
 
     <!-- Megaphones -->
-    <string name="Megaphones_remind_me_later">Recordar más tarde</string>
+    <string name="Megaphones_remind_me_later">Recordarme más tarde</string>
     <string name="Megaphones_verify_your_signal_pin">Verifica tu PIN de Signal</string>
-    <string name="Megaphones_well_occasionally_ask_you_to_verify_your_pin">Te preguntaremos ocasionalmente verificar tu PIN para que así lo puedas recordar.</string>
+    <string name="Megaphones_well_occasionally_ask_you_to_verify_your_pin">De vez en cuando te pediremos verificar tu PIN para que lo puedas recordar.</string>
     <string name="Megaphones_verify_pin">Verificar PIN</string>
     <string name="Megaphones_get_started">Comenzar</string>
     <string name="Megaphones_new_group">Nuevo grupo</string>
-    <string name="Megaphones_invite_friends">Añadir amistades</string>
+    <string name="Megaphones_invite_friends">Invitar personas</string>
     <string name="Megaphones_chat_colors">Colores del chat</string>
-    <string name="Megaphones_add_a_profile_photo">Foto de perfil</string>
+    <string name="Megaphones_add_a_profile_photo">Añadir una foto de perfil</string>
 
     <!-- Title of a bottom sheet to render messages that all quote a specific message -->
     <string name="MessageQuotesBottomSheet_replies">Respuestas</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Estableciendo llamada de Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">Estableciendo llamada de Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Empezar el servicio de llamada de Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Deteniendo el servicio de llamadas de Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Empezar el servicio de llamadas de Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Detener el servicio de llamadas de Molly</string>
     <string name="NotificationBarManager__cancel_call">Cancelar llamada</string>
 
     <!-- NotificationsMegaphone -->
@@ -1387,7 +1460,7 @@
     <!-- NotificationMmsMessageRecord -->
     <string name="NotificationMmsMessageRecord_multimedia_message">Mensaje multimedia</string>
     <string name="NotificationMmsMessageRecord_downloading_mms_message">Descargando mensaje MMS</string>
-    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Fallo al descargar mensaje MMS, toca para reintentar</string>
+    <string name="NotificationMmsMessageRecord_error_downloading_mms_message">No se ha podido descargar el mensaje MMS. Toca para reintentar.</string>
 
     <!-- MediaPickerActivity -->
     <string name="MediaPickerActivity__menu_open_camera">Abrir cámara</string>
@@ -1396,15 +1469,15 @@
     <string name="MediaSendActivity_camera_unavailable">Cámara no disponible.</string>
 
     <!-- MediaRepository -->
-    <string name="MediaRepository_all_media">Archivos adjuntos</string>
+    <string name="MediaRepository_all_media">Todos los archivos multimedia</string>
     <string name="MediaRepository__camera">Cámara</string>
 
     <!-- MessageRecord -->
-    <string name="MessageRecord_unknown">Desconocid@</string>
-    <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Has recibido un mensaje cifrado con una versión de Signal antigua que ya no está disponible. Por favor, solicita a esta persona a actualizar a la versión más reciente y a reenviar el mensaje.</string>
+    <string name="MessageRecord_unknown">Desconocido</string>
+    <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Has recibido un mensaje cifrado con una versión de Signal antigua que ya no está disponible. Pide a esta persona que actualice a la versión más reciente y reenvíe el mensaje.</string>
     <string name="MessageRecord_left_group">Has abandonado el grupo.</string>
     <string name="MessageRecord_you_updated_group">Has actualizado el grupo.</string>
-    <string name="MessageRecord_the_group_was_updated">Se actualizó el grupo.</string>
+    <string name="MessageRecord_the_group_was_updated">Se ha actualizado el grupo.</string>
     <!-- Update message shown when placing an outgoing 1:1 voice/audio call -->
     <string name="MessageRecord_outgoing_voice_call">Llamada realizada</string>
     <!-- Update message shown when placing an outgoing 1:1 video call -->
@@ -1425,17 +1498,17 @@
     <string name="MessageRecord_call_message_with_date">%1$s · %2$s</string>
     <string name="MessageRecord_s_updated_group">%1$s ha actualizado el grupo.</string>
     <string name="MessageRecord_s_joined_signal">¡%1$s usa Signal!</string>
-    <string name="MessageRecord_you_disabled_disappearing_messages">Has desactivado la desaparición de mensajes.</string>
-    <string name="MessageRecord_s_disabled_disappearing_messages">%1$s ha desactivado la desaparición de mensajes.</string>
-    <string name="MessageRecord_you_set_disappearing_message_time_to_s">Has fijado la desaparición de mensajes a %1$s.</string>
-    <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s ha fijado la desaparición de mensajes a %2$s.</string>
-    <string name="MessageRecord_disappearing_message_time_set_to_s">El tiempo de desaparición de mensajes se ha fijado en %1$s.</string>
+    <string name="MessageRecord_you_disabled_disappearing_messages">Has desactivado los mensajes temporales.</string>
+    <string name="MessageRecord_s_disabled_disappearing_messages">%1$s ha desactivado los mensajes temporales.</string>
+    <string name="MessageRecord_you_set_disappearing_message_time_to_s">Has establecido la duración de los mensajes temporales en %1$s.</string>
+    <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s ha establecido la duración de los mensajes temporales en %2$s.</string>
+    <string name="MessageRecord_disappearing_message_time_set_to_s">Se ha establecido la duración de los mensajes temporales en %1$s.</string>
     <string name="MessageRecord_this_group_was_updated_to_a_new_group">Este grupo se ha actualizado al nuevo sistema de grupos.</string>
-    <string name="MessageRecord_you_couldnt_be_added_to_the_new_group_and_have_been_invited_to_join">No te han podido añadir al nuevo grupo pero te han invitado a unirte.</string>
+    <string name="MessageRecord_you_couldnt_be_added_to_the_new_group_and_have_been_invited_to_join">No te han podido añadir al nuevo grupo, pero te han invitado a unirte.</string>
     <string name="MessageRecord_chat_session_refreshed">Sesión de chat reiniciada</string>
     <plurals name="MessageRecord_members_couldnt_be_added_to_the_new_group_and_have_been_invited">
-        <item quantity="one">No se puede añadir automáticamente a esta persona al nuevo grupo. Se le ha enviado una invitación para unirse.</item>
-        <item quantity="other">No se puede añadir automáticamente a %1$s personas al nuevo grupo. Se les ha enviado una invitación para unirse.</item>
+        <item quantity="one">No se ha podido añadir automáticamente a esta persona al nuevo grupo. Se le ha enviado una invitación para unirse.</item>
+        <item quantity="other">No se ha podido añadir automáticamente a %1$s personas al nuevo grupo. Se les ha enviado una invitación para unirse.</item>
     </plurals>
 
     <plurals name="MessageRecord_members_couldnt_be_added_to_the_new_group_and_have_been_removed">
@@ -1444,16 +1517,16 @@
     </plurals>
 
     <!-- Profile change updates -->
-    <string name="MessageRecord_changed_their_profile_name_to">%1$s ha cambiado su nombre de perfil a %2$s.</string>
-    <string name="MessageRecord_changed_their_profile_name_from_to">%1$s ha cambiado su nombre de perfil de %2$s a %3$s.</string>
-    <string name="MessageRecord_changed_their_profile">%1$s ha cambiado su nombre.</string>
+    <string name="MessageRecord_changed_their_profile_name_to">%1$s ha cambiado su nombre de perfil a «%2$s».</string>
+    <string name="MessageRecord_changed_their_profile_name_from_to">%1$s ha cambiado su nombre de perfil de «%2$s» a «%3$s».</string>
+    <string name="MessageRecord_changed_their_profile">%1$s ha cambiado su perfil.</string>
     <!-- Conversation update event message shown when you\'ve started a conversation by phone number or username and then learn their profile name. placeholder is username or phone number -->
     <string name="MessageRecord_started_this_chat">Iniciaste este chat con %1$s.</string>
 
     <!-- GV2 specific -->
     <string name="MessageRecord_you_created_the_group">Has creado el grupo.</string>
     <string name="MessageRecord_group_updated">Grupo actualizado.</string>
-    <string name="MessageRecord_invite_friends_to_this_group">Invita amistades a participar en ese grupo vía enlace</string>
+    <string name="MessageRecord_invite_friends_to_this_group">Comparte el enlace a este grupo para invitar a quien quieras</string>
 
     <!-- GV2 member additions -->
     <string name="MessageRecord_you_added_s">Has añadido a %1$s.</string>
@@ -1468,13 +1541,13 @@
     <string name="MessageRecord_s_removed_you_from_the_group">%1$s te ha expulsado del grupo.</string>
     <string name="MessageRecord_you_left_the_group">Has abandonado el grupo.</string>
     <string name="MessageRecord_s_left_the_group">%1$s ha abandonado el grupo.</string>
-    <string name="MessageRecord_you_are_no_longer_in_the_group">Ya no participas en el grupo.</string>
-    <string name="MessageRecord_s_is_no_longer_in_the_group">%1$s ya no participa en el grupo.</string>
+    <string name="MessageRecord_you_are_no_longer_in_the_group">Ya no formas parte del grupo.</string>
+    <string name="MessageRecord_s_is_no_longer_in_the_group">%1$s ya no forma parte del grupo.</string>
 
     <!-- GV2 role change -->
-    <string name="MessageRecord_you_made_s_an_admin">Has promovido a %1$s a admin.</string>
-    <string name="MessageRecord_s_made_s_an_admin">%1$s ha promovido a %2$s a admin.</string>
-    <string name="MessageRecord_s_made_you_an_admin">%1$s te ha promovido a admin.</string>
+    <string name="MessageRecord_you_made_s_an_admin">Has designado a %1$s como admin.</string>
+    <string name="MessageRecord_s_made_s_an_admin">%1$s ha designado a %2$s como admin.</string>
+    <string name="MessageRecord_s_made_you_an_admin">%1$s te ha designado como admin.</string>
     <string name="MessageRecord_you_revoked_admin_privileges_from_s">Has retirado los permisos de admin a %1$s.</string>
     <string name="MessageRecord_s_revoked_your_admin_privileges">%1$s te ha retirado los permisos de admin.</string>
     <string name="MessageRecord_s_revoked_admin_privileges_from_s">%1$s ha retirado los permisos de admin a %2$s.</string>
@@ -1493,65 +1566,65 @@
     <string name="MessageRecord_you_were_invited_to_the_group">Te han invitado al grupo.</string>
     <plurals name="MessageRecord_d_people_were_invited_to_the_group">
         <item quantity="one">Se ha invitado a 1 persona al grupo.</item>
-        <item quantity="other">Se han invitado a %1$d personas al grupo.</item>
+        <item quantity="other">Se ha invitado a %1$d personas al grupo.</item>
     </plurals>
 
     <!-- GV2 invitation revokes -->
     <plurals name="MessageRecord_you_revoked_invites">
-        <item quantity="one">Has retirado la invitación para el grupo.</item>
-        <item quantity="other">Has retirado %1$d invitaciones para el grupo.</item>
+        <item quantity="one">Has retirado la invitación a unirse al grupo.</item>
+        <item quantity="other">Has retirado %1$d invitaciones a unirse al grupo.</item>
     </plurals>
     <plurals name="MessageRecord_s_revoked_invites">
-        <item quantity="one">%1$s ha retirado la invitación para el grupo.</item>
-        <item quantity="other">%1$s ha retirado %2$d invitaciones para el grupo.</item>
+        <item quantity="one">%1$s ha retirado la invitación a unirse al grupo.</item>
+        <item quantity="other">%1$s ha retirado %2$d invitaciones a unirse al grupo.</item>
     </plurals>
-    <string name="MessageRecord_someone_declined_an_invitation_to_the_group">Alguien ha rechazado la invitación a participar en el grupo.</string>
-    <string name="MessageRecord_you_declined_the_invitation_to_the_group">Has rechazado la invitación a participar en el grupo.</string>
-    <string name="MessageRecord_s_revoked_your_invitation_to_the_group">%1$s retiró tu invitación del grupo.</string>
-    <string name="MessageRecord_an_admin_revoked_your_invitation_to_the_group">Un@ admin retiró tu invitavión del grupo.</string>
+    <string name="MessageRecord_someone_declined_an_invitation_to_the_group">Alguien ha rechazado la invitación al grupo.</string>
+    <string name="MessageRecord_you_declined_the_invitation_to_the_group">Has rechazado la invitación al grupo.</string>
+    <string name="MessageRecord_s_revoked_your_invitation_to_the_group">%1$s ha retirado tu invitación al grupo.</string>
+    <string name="MessageRecord_an_admin_revoked_your_invitation_to_the_group">Un admin ha retirado tu invitación al grupo.</string>
     <plurals name="MessageRecord_d_invitations_were_revoked">
-        <item quantity="one">Se ha retirado la invitación para el grupo.</item>
-        <item quantity="other">Se han retirado %1$d invitaciones para el grupo.</item>
+        <item quantity="one">Se ha retirado 1 invitación a unirse al grupo.</item>
+        <item quantity="other">Se han retirado %1$d invitaciones a unirse al grupo.</item>
     </plurals>
 
     <!-- GV2 invitation acceptance -->
-    <string name="MessageRecord_you_accepted_invite">Has aceptado la invitación para participar en el grupo.</string>
-    <string name="MessageRecord_s_accepted_invite">%1$s ha aceptado la invitación para el grupo.</string>
+    <string name="MessageRecord_you_accepted_invite">Has aceptado la invitación al grupo.</string>
+    <string name="MessageRecord_s_accepted_invite">%1$s ha aceptado la invitación al grupo.</string>
     <string name="MessageRecord_you_added_invited_member_s">Has añadido a %1$s.</string>
     <string name="MessageRecord_s_added_invited_member_s">%1$s ha añadido a %2$s.</string>
 
     <!-- GV2 title change -->
-    <string name="MessageRecord_you_changed_the_group_name_to_s">Has modificado el nombre del grupo a «%1$s».</string>
-    <string name="MessageRecord_s_changed_the_group_name_to_s">%1$s ha modificado el nombre del grupo a «%2$s».</string>
+    <string name="MessageRecord_you_changed_the_group_name_to_s">Has cambiado el nombre del grupo a «%1$s».</string>
+    <string name="MessageRecord_s_changed_the_group_name_to_s">%1$s ha cambiado el nombre del grupo a «%2$s».</string>
     <string name="MessageRecord_the_group_name_has_changed_to_s">El nombre del grupo ha cambiado a «%1$s».</string>
 
     <!-- GV2 description change -->
-    <string name="MessageRecord_you_changed_the_group_description">Has actualizado la descripción del grupo</string>
-    <string name="MessageRecord_s_changed_the_group_description">%1$s ha actualizado la descripción del grupo.</string>
-    <string name="MessageRecord_the_group_description_has_changed">Se ha actualizado la descripción del grupo.</string>
+    <string name="MessageRecord_you_changed_the_group_description">Has cambiado la descripción del grupo.</string>
+    <string name="MessageRecord_s_changed_the_group_description">%1$s ha cambiado la descripción del grupo.</string>
+    <string name="MessageRecord_the_group_description_has_changed">Se ha cambiado la descripción del grupo.</string>
 
     <!-- GV2 avatar change -->
-    <string name="MessageRecord_you_changed_the_group_avatar">Has modificado la imagen del grupo.</string>
-    <string name="MessageRecord_s_changed_the_group_avatar">%1$s ha modificado la imagen del grupo.</string>
-    <string name="MessageRecord_the_group_group_avatar_has_been_changed">La imagen del grupo ha cambiado.</string>
+    <string name="MessageRecord_you_changed_the_group_avatar">Has cambiado la imagen del grupo.</string>
+    <string name="MessageRecord_s_changed_the_group_avatar">%1$s ha cambiado la imagen del grupo.</string>
+    <string name="MessageRecord_the_group_group_avatar_has_been_changed">Se ha cambiado la imagen del grupo.</string>
 
     <!-- GV2 attribute access level change -->
-    <string name="MessageRecord_you_changed_who_can_edit_group_info_to_s">Has actualizado quien puede editar los detalles del grupo a «%1$s».</string>
-    <string name="MessageRecord_s_changed_who_can_edit_group_info_to_s">%1$s ha actualizado quien puede editar los detalles del grupo a «%2$s».</string>
-    <string name="MessageRecord_who_can_edit_group_info_has_been_changed_to_s">Se ha modificado quien puede editar los detalles del grupo a «%1$s».</string>
+    <string name="MessageRecord_you_changed_who_can_edit_group_info_to_s">Has cambiado quién puede editar los detalles del grupo a «%1$s».</string>
+    <string name="MessageRecord_s_changed_who_can_edit_group_info_to_s">%1$s ha cambiado quién puede editar los detalles del grupo a «%2$s».</string>
+    <string name="MessageRecord_who_can_edit_group_info_has_been_changed_to_s">Se ha cambiado quién puede editar los detalles del grupo a «%1$s».</string>
 
     <!-- GV2 membership access level change -->
-    <string name="MessageRecord_you_changed_who_can_edit_group_membership_to_s">Has actualizado quien puede añadir participantes al grupo a «%1$s».</string>
-    <string name="MessageRecord_s_changed_who_can_edit_group_membership_to_s">%1$s ha actualizado quien puede añadir participantes al grupo a «%2$s».</string>
-    <string name="MessageRecord_who_can_edit_group_membership_has_been_changed_to_s">Ahora, «%1$s» pueden añadir participantes al grupo.</string>
+    <string name="MessageRecord_you_changed_who_can_edit_group_membership_to_s">Has cambiado quién puede editar la lista de participantes del grupo a «%1$s».</string>
+    <string name="MessageRecord_s_changed_who_can_edit_group_membership_to_s">%1$s ha cambiado quién puede editar la lista de participantes del grupo a «%2$s».</string>
+    <string name="MessageRecord_who_can_edit_group_membership_has_been_changed_to_s">Se ha cambiado quién puede editar la lista de participantes del grupo a «%1$s».</string>
 
     <!-- GV2 announcement group change -->
-    <string name="MessageRecord_you_allow_all_members_to_send">Has modificado los ajustes del grupo para permitir a cualquiera enviar mensajes.</string>
-    <string name="MessageRecord_you_allow_only_admins_to_send">Has modificado los ajustes del grupo para permitir solo a admins enviar mensajes.</string>
-    <string name="MessageRecord_s_allow_all_members_to_send">%1$s ha modificado los ajustes del grupo para permitir a cualquiera enviar mensajes.</string>
-    <string name="MessageRecord_s_allow_only_admins_to_send">%1$s ha modificado los ajustes del grupo para permitir solo a admins enviar mensajes.</string>
-    <string name="MessageRecord_allow_all_members_to_send">Los ajustes del grupo han cambiado para permitir a cualquiera enviar mensajes.</string>
-    <string name="MessageRecord_allow_only_admins_to_send">Se han modificado los ajustes del grupo para permitir a cualquiera enviar mensajes.</string>
+    <string name="MessageRecord_you_allow_all_members_to_send">Has cambiado los ajustes del grupo para que cualquiera pueda enviar mensajes.</string>
+    <string name="MessageRecord_you_allow_only_admins_to_send">Has cambiado los ajustes del grupo para que solo admins puedan enviar mensajes.</string>
+    <string name="MessageRecord_s_allow_all_members_to_send">%1$s ha cambiado los ajustes del grupo para que cualquiera pueda enviar mensajes.</string>
+    <string name="MessageRecord_s_allow_only_admins_to_send">%1$s ha cambiado los ajustes del grupo para que solo admins puedan enviar mensajes.</string>
+    <string name="MessageRecord_allow_all_members_to_send">Se han cambiado los ajustes del grupo para que cualquiera pueda enviar mensajes.</string>
+    <string name="MessageRecord_allow_only_admins_to_send">Se han cambiado los ajustes del grupo para que solo admins puedan enviar mensajes.</string>
 
     <!-- GV2 group link invite access level change -->
     <string name="MessageRecord_you_turned_on_the_group_link_with_admin_approval_off">Has activado el enlace para unirse al grupo sin confirmación de admin.</string>
@@ -1563,12 +1636,12 @@
     <string name="MessageRecord_the_group_link_has_been_turned_on_with_admin_approval_off">Se ha activado el enlace para unirse al grupo sin confirmación de admin.</string>
     <string name="MessageRecord_the_group_link_has_been_turned_on_with_admin_approval_on">Se ha activado el enlace para unirse al grupo tras confirmación de admin.</string>
     <string name="MessageRecord_the_group_link_has_been_turned_off">Se ha desactivado el enlace para unirse al grupo.</string>
-    <string name="MessageRecord_you_turned_off_admin_approval_for_the_group_link">Has desactivado la confirmación de admin para unirse al grupo vía enlace.</string>
-    <string name="MessageRecord_s_turned_off_admin_approval_for_the_group_link">%1$s ha desactivado la confirmación de admin para unirse al grupo vía enlace.</string>
-    <string name="MessageRecord_the_admin_approval_for_the_group_link_has_been_turned_off">Se a confirmación de admin para unirse al grupo vía enlace.</string>
-    <string name="MessageRecord_you_turned_on_admin_approval_for_the_group_link">Has activado la confirmación de admin para unirse al grupo vía enlace.</string>
-    <string name="MessageRecord_s_turned_on_admin_approval_for_the_group_link">%1$s ha activado la confirmación de admin para unirse al grupo vía enlace.</string>
-    <string name="MessageRecord_the_admin_approval_for_the_group_link_has_been_turned_on">Se ha activado la confirmación de admin para unirse al grupo vía enlace.</string>
+    <string name="MessageRecord_you_turned_off_admin_approval_for_the_group_link">Has desactivado la confirmación de admin para unirse al grupo mediante enlace.</string>
+    <string name="MessageRecord_s_turned_off_admin_approval_for_the_group_link">%1$s ha desactivado la confirmación de admin para unirse al grupo mediante enlace.</string>
+    <string name="MessageRecord_the_admin_approval_for_the_group_link_has_been_turned_off">Se ha desactivado la confirmación de admin para unirse al grupo mediante enlace.</string>
+    <string name="MessageRecord_you_turned_on_admin_approval_for_the_group_link">Has activado la confirmación de admin para unirse al grupo mediante enlace.</string>
+    <string name="MessageRecord_s_turned_on_admin_approval_for_the_group_link">%1$s ha activado la confirmación de admin para unirse al grupo mediante enlace.</string>
+    <string name="MessageRecord_the_admin_approval_for_the_group_link_has_been_turned_on">Se ha activado la confirmación de admin para unirse al grupo mediante enlace.</string>
 
     <!-- GV2 group link reset -->
     <string name="MessageRecord_you_reset_the_group_link">Has restablecido el enlace para unirse al grupo.</string>
@@ -1576,16 +1649,16 @@
     <string name="MessageRecord_the_group_link_has_been_reset">Se ha restablecido el enlace para unirse al grupo.</string>
 
     <!-- GV2 group link joins -->
-    <string name="MessageRecord_you_joined_the_group_via_the_group_link">Te has unido al grupo vía enlace.</string>
-    <string name="MessageRecord_s_joined_the_group_via_the_group_link">%1$s se ha unido al grupo vía enlace.</string>
+    <string name="MessageRecord_you_joined_the_group_via_the_group_link">Te has unido al grupo mediante enlace.</string>
+    <string name="MessageRecord_s_joined_the_group_via_the_group_link">%1$s se ha unido al grupo mediante enlace.</string>
 
     <!-- GV2 group link requests -->
     <string name="MessageRecord_you_sent_a_request_to_join_the_group">Has enviado una solicitud para unirte al grupo.</string>
-    <string name="MessageRecord_s_requested_to_join_via_the_group_link">%1$s ha solicitado unirse al grupo vía enlace.</string>
+    <string name="MessageRecord_s_requested_to_join_via_the_group_link">%1$s ha solicitado unirse al grupo mediante enlace.</string>
     <!-- Update message shown when someone requests to join via group link and cancels the request back to back -->
     <plurals name="MessageRecord_s_requested_and_cancelled_their_request_to_join_via_the_group_link">
-        <item quantity="one">%1$s ha solicitado y cancelado su solicitud para participar en el grupo vía enlace.</item>
-        <item quantity="other">%1$s ha solicitado y cancelado %2$d veces participar en el grupo vía enlace.</item>
+        <item quantity="one">%1$s ha solicitado y cancelado su solicitud para unirse al grupo mediante enlace.</item>
+        <item quantity="other">%1$s ha solicitado y cancelado %2$d veces unirse al grupo mediante enlace.</item>
     </plurals>
 
     <!-- GV2 group link approvals -->
@@ -1596,20 +1669,20 @@
     <string name="MessageRecord_a_request_to_join_the_group_from_s_has_been_approved">Se ha aprobado la solicitud de %1$s para unirse al grupo.</string>
 
     <!-- GV2 group link deny -->
-    <string name="MessageRecord_your_request_to_join_the_group_has_been_denied_by_an_admin">Un@ admin ha denegado tu solicitud para unirte al grupo.</string>
+    <string name="MessageRecord_your_request_to_join_the_group_has_been_denied_by_an_admin">Un admin ha denegado tu solicitud para unirte al grupo.</string>
     <string name="MessageRecord_s_denied_a_request_to_join_the_group_from_s">%1$s ha denegado la solicitud de %2$s para unirse al grupo.</string>
     <string name="MessageRecord_a_request_to_join_the_group_from_s_has_been_denied">Se ha denegado la solicitud de %1$s para unirse al grupo.</string>
-    <string name="MessageRecord_you_canceled_your_request_to_join_the_group">Has retirado tu solicitud para unirte al grupo.</string>
-    <string name="MessageRecord_s_canceled_their_request_to_join_the_group">%1$s ha retirado su solicitud para unirse al grupo.</string>
+    <string name="MessageRecord_you_canceled_your_request_to_join_the_group">Has cancelado tu solicitud para unirte al grupo.</string>
+    <string name="MessageRecord_s_canceled_their_request_to_join_the_group">%1$s ha cancelado su solicitud para unirse al grupo.</string>
 
     <!-- End of GV2 specific update messages -->
 
-    <string name="MessageRecord_your_safety_number_with_s_has_changed">Tus cifras de seguridad con %1$s han cambiado.</string>
-    <string name="MessageRecord_you_marked_your_safety_number_with_s_verified">Has marcado tus cifras de seguridad con %1$s como verificadas.</string>
-    <string name="MessageRecord_you_marked_your_safety_number_with_s_verified_from_another_device">Has marcado tus cifras de seguridad con %1$s como verificadas desde otro dispositivo</string>
-    <string name="MessageRecord_you_marked_your_safety_number_with_s_unverified">Has retirado la marca de verificación de tus cifras de seguridad con %1$s.</string>
-    <string name="MessageRecord_you_marked_your_safety_number_with_s_unverified_from_another_device">Has retirado la marca de verificación de tus cifras de seguridad con %1$s desde otro dispositivo</string>
-    <string name="MessageRecord_a_message_from_s_couldnt_be_delivered">No se pudo recibir un mensaje de %1$s</string>
+    <string name="MessageRecord_your_safety_number_with_s_has_changed">Tu número de seguridad con %1$s ha cambiado.</string>
+    <string name="MessageRecord_you_marked_your_safety_number_with_s_verified">Has marcado tu número de seguridad con %1$s como verificado</string>
+    <string name="MessageRecord_you_marked_your_safety_number_with_s_verified_from_another_device">Has marcado tu número de seguridad con %1$s como verificado desde otro dispositivo</string>
+    <string name="MessageRecord_you_marked_your_safety_number_with_s_unverified">Has retirado la marca de verificación de tu número de seguridad con %1$s</string>
+    <string name="MessageRecord_you_marked_your_safety_number_with_s_unverified_from_another_device">Has retirado la marca de verificación de tu número de seguridad con %1$s desde otro dispositivo</string>
+    <string name="MessageRecord_a_message_from_s_couldnt_be_delivered">No se ha podido recibir un mensaje de %1$s</string>
     <string name="MessageRecord_s_changed_their_phone_number">%1$s ha cambiado su número de teléfono.</string>
     <!-- Update item message shown in the release channel when someone is already a sustainer so we ask them if they want to boost. -->
     <string name="MessageRecord_like_this_new_feature_help_support_signal_with_a_one_time_donation">¿Te gusta esta nueva función? ¡Ayuda a Signal con una donación puntual!</string>
@@ -1627,20 +1700,28 @@
     <string name="MessageRecord_you_activated_payments">Has activado Pagos</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s ya puede aceptar Pagos</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Los detalles de pago no están disponibles</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Toca para ver más</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Detalles de pago no disponibles</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Los detalles de este pago no están disponibles porque tus mensajes se restauraron desde una fuente que no contenía este historial de pagos. Esto no afecta el saldo de tu cartera ni el estado de los pagos anteriores.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
-    <string name="MessageRecord_s_is_in_the_call_s">%1$s participa en la llamada · %2$s</string>
+    <string name="MessageRecord_s_is_in_the_call_s">%1$s está en la llamada · %2$s</string>
     <!-- Chat log text for an ongoing group call only the local user has joined with a placeholder for formatted time -->
-    <string name="MessageRecord_you_are_in_the_call_s1">Participas en la llamada · %1$s</string>
+    <string name="MessageRecord_you_are_in_the_call_s1">Estás en la llamada · %1$s</string>
     <!-- Chat log text for an ongoing group call with two participants with two placeholders for the short display name of the users that joined and a placeholder for formatted time -->
-    <string name="MessageRecord_s_and_s_are_in_the_call_s1">%1$s y %2$s participan en la llamada · %3$s</string>
+    <string name="MessageRecord_s_and_s_are_in_the_call_s1">%1$s y %2$s están en la llamada · %3$s</string>
     <!-- Chat log text for an ongoing group call that has one participant -->
-    <string name="MessageRecord_s_is_in_the_call">%1$s participa en la llamada</string>
+    <string name="MessageRecord_s_is_in_the_call">%1$s está en la llamada</string>
     <!-- Chat log text for an ongoing group call only the local user has joined -->
-    <string name="MessageRecord_you_are_in_the_call">Participas en la llamada</string>
+    <string name="MessageRecord_you_are_in_the_call">Estás en la llamada</string>
     <!-- Chat log text for an ongoing group call with two participants with two placeholders, each for the short display name of the users that joined -->
-    <string name="MessageRecord_s_and_s_are_in_the_call">%1$s y %2$s participan en la llamada</string>
+    <string name="MessageRecord_s_and_s_are_in_the_call">%1$s y %2$s están en la llamada</string>
     <!-- Chat log text for a group call that ended within the last 5 minutes -->
     <string name="MessageRecord__the_video_call_has_ended">La videollamada ha finalizado</string>
     <!-- Chat log text for a group call that ended within the last 5 minutes with a placeholder for formatted time -->
@@ -1654,52 +1735,54 @@
     <!-- Chat log text for a group call that ended that the local user did not start with a placeholder for formatted time -->
     <string name="MessageRecord__incoming_video_call_s">Videollamada entrante · %1$s</string>
     <!-- Chat log text for a group call that ended that the local user started -->
-    <string name="MessageRecord__outgoing_video_call">Videollamada realizada</string>
+    <string name="MessageRecord__outgoing_video_call">Videollamada saliente</string>
     <!-- Chat log text for a group call that ended that the local user started with a placeholder for formatted time -->
-    <string name="MessageRecord__outgoing_video_call_s">Videollamada realizada · %1$s</string>
+    <string name="MessageRecord__outgoing_video_call_s">Videollamada saliente · %1$s</string>
     <!-- Chat log text for an ongoing group call that the local user started -->
-    <string name="MessageRecord__you_started_a_video_call">Iniciaste una videollamada</string>
+    <string name="MessageRecord__you_started_a_video_call">Has iniciado una videollamada</string>
     <!-- Chat log text for an ongoing group call that the local user started with a placeholder for formatted time -->
-    <string name="MessageRecord__you_started_a_video_call_s">Iniciaste una videollamada · %1$s</string>
+    <string name="MessageRecord__you_started_a_video_call_s">Has iniciado una videollamada · %1$s</string>
     <!-- Chat log text for an ongoing group call that the local user has not joined with a placeholder for user\'s short display name -->
-    <string name="MessageRecord__s_started_a_video_call">%1$s inició una videollamada</string>
+    <string name="MessageRecord__s_started_a_video_call">%1$s ha iniciado una videollamada</string>
     <!-- Chat log text for an ongoing group call that the local user has not joined with a placeholder for user\'s short display name and a placeholder for formatted time -->
-    <string name="MessageRecord__s_started_a_video_call_s">%1$s inició una videollamada · %2$s</string>
+    <string name="MessageRecord__s_started_a_video_call_s">%1$s ha iniciado una videollamada · %2$s</string>
 
     <string name="MessageRecord_you">Tú</string>
 
     <!-- Chat log text for an ongoing group call with more than two participants with placeholders for the first two joined users, a placeholder for the number of users in the call, and a placeholder for formatted time -->
     <plurals name="MessageRecord_s_s_and_d_others_are_in_the_call_s">
-        <item quantity="one">%1$s, %2$s y %3$d persona más participan en la llamada · %4$s</item>
-        <item quantity="other">%1$s, %2$s y %3$d personas más participan en la llamada · %4$s</item>
+        <item quantity="one">%1$s, %2$s y %3$d persona más están en la llamada · %4$s</item>
+        <item quantity="other">%1$s, %2$s y %3$d personas más están en la llamada · %4$s</item>
     </plurals>
 
     <!-- Chat log text for an ongoing group call with more than two participants with placeholders for the first two joined users and a placeholder for the number of users in the call -->
     <plurals name="MessageRecord_s_s_and_d_others_are_in_the_call">
-        <item quantity="one">%1$s, %2$s y %3$d persona más participan en la llamada</item>
-        <item quantity="other">%1$s, %2$s y %3$d personas más participan en la llamada</item>
+        <item quantity="one">%1$s, %2$s y %3$d persona más están en la llamada</item>
+        <item quantity="other">%1$s, %2$s y %3$d personas más están en la llamada</item>
     </plurals>
 
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Pronto ya no podrás enviar mensajes SMS desde Signal. Invita a %1$s a Signal para mantener aquí tu conversación.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Ya no puedes enviar mensajes SMS desde Signal. Invita a %1$s a Signal para mantener aquí tu conversación.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Ya no puedes enviar mensajes SMS desde Molly. Invita a %1$s a Molly para mantener aquí tu conversación.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Pago: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Pago</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Denunciado como spam</string>
     <!-- Update message shown in chat after accept a message request -->
-    <string name="MessageRecord_you_accepted_the_message_request">Has aceptado la solicitud de chat</string>
+    <string name="MessageRecord_you_accepted_the_message_request">Has aceptado la solicitud de mensaje</string>
 
     <!-- MessageRequestBottomView -->
     <string name="MessageRequestBottomView_accept">Aceptar</string>
-    <string name="MessageRequestBottomView_continue">Adelante</string>
+    <string name="MessageRequestBottomView_continue">Continuar</string>
     <string name="MessageRequestBottomView_delete">Eliminar</string>
     <string name="MessageRequestBottomView_block">Bloquear</string>
     <string name="MessageRequestBottomView_unblock">Desbloquear</string>
     <!-- Text explaining a message request from someone you\'ve removed before -->
     <string name="MessageRequestBottomView_do_you_want_to_let_s_message_you_you_removed_them_before">¿Quieres compartir tu nombre y foto con %1$s y permitir que te mande un mensaje? En el pasado, eliminaste a esta persona.</string>
-    <string name="MessageRequestBottomView_do_you_want_to_let_s_message_you_they_wont_know_youve_seen_their_messages_until_you_accept">¿Deseas que %1$s te envíe mensajes y compartir tu nombre y foto? Esta persona no sabrá que has visto sus mensajes hasta que aceptes.</string>
+    <string name="MessageRequestBottomView_do_you_want_to_let_s_message_you_they_wont_know_youve_seen_their_messages_until_you_accept">¿Permitir que %1$s te envíe mensajes y compartir tu nombre y foto con esta persona? No sabrá que has visto sus mensajes hasta que aceptes.</string>
     <!-- Shown in message request flow. Describes what will happen if you unblock a Signal user -->
     <string name="MessageRequestBottomView_do_you_want_to_let_s_message_you_wont_receive_any_messages_until_you_unblock_them">¿Deseas que %1$s te envíe mensajes y compartir tu nombre y foto? Esta persona no sabrá que has visto sus mensajes hasta lx desbloquees.</string>
     <!-- Shown in message request flow. Describes what will happen if you unblock an SMS user -->
@@ -1707,17 +1790,17 @@
     <string name="MessageRequestBottomView_get_updates_and_news_from_s_you_wont_receive_any_updates_until_you_unblock_them">¿Deseas recibir noticias y novedades de %1$s? No recibirás ninguna hasta que desbloquees a esta persona.</string>
     <string name="MessageRequestBottomView_continue_your_conversation_with_this_group_and_share_your_name_and_photo">¿Deseas chatear con este grupo y compartir tu nombre y foto con sus participantes?</string>
     <string name="MessageRequestBottomView_upgrade_this_group_to_activate_new_features">Este es un grupo antiguo y ya no puede usarse. Crea un nuevo grupo para activar funciones nuevas como @menciones y admins.</string>
-    <string name="MessageRequestBottomView_this_legacy_group_can_no_longer_be_used">Este grupo antiguo no es válido porque es demasiado grande. El tamaño máximo de grupo es de %1$d participantes.</string>
+    <string name="MessageRequestBottomView_this_legacy_group_can_no_longer_be_used">Este grupo del sistema antiguo no es válido porque es demasiado grande. Se permite un máximo de %1$d participantes.</string>
     <string name="MessageRequestBottomView_continue_your_conversation_with_s_and_share_your_name_and_photo">¿Deseas seguir chateando con %1$s y compartir tu nombre y foto con esta persona?</string>
-    <string name="MessageRequestBottomView_do_you_want_to_join_this_group_they_wont_know_youve_seen_their_messages_until_you_accept">¿Deseas unirte a este grupo y compartir tu nombre y foto con sus participantes? No sabrán que has visto sus mensajes hasta que aceptes.</string>
-    <string name="MessageRequestBottomView_do_you_want_to_join_this_group_you_wont_see_their_messages">¿Deseas unirte a este grupo y compartir tu nombre y foto con sus participantes? No sabrán que has visto sus mensajes hasta que aceptes.</string>
-    <string name="MessageRequestBottomView_join_this_group_they_wont_know_youve_seen_their_messages_until_you_accept">¿Deseas unirte a este grupo? Sus participantes no sabrán que has visto sus mensajes hasta que aceptes.</string>
+    <string name="MessageRequestBottomView_do_you_want_to_join_this_group_they_wont_know_youve_seen_their_messages_until_you_accept">¿Unirte a este grupo y compartir tu nombre y foto con sus participantes? No sabrán que has visto sus mensajes hasta que aceptes.</string>
+    <string name="MessageRequestBottomView_do_you_want_to_join_this_group_you_wont_see_their_messages">¿Unirte a este grupo y compartir tu nombre y foto con sus participantes? No podrás ver sus mensajes hasta que aceptes.</string>
+    <string name="MessageRequestBottomView_join_this_group_they_wont_know_youve_seen_their_messages_until_you_accept">¿Unirte a este grupo? Sus participantes no sabrán que has visto sus mensajes hasta que aceptes.</string>
     <string name="MessageRequestBottomView_unblock_this_group_and_share_your_name_and_photo_with_its_members">¿Desbloquear este grupo y compartir tu nombre y foto con sus participantes? No recibirás ningún mensaje del grupo hasta que lo desbloquees.</string>
   <!-- Removed by excludeNonTranslatables <string name="MessageRequestBottomView_legacy_learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <string name="MessageRequestProfileView_view">Ver</string>
-    <string name="MessageRequestProfileView_member_of_one_group">Participa en %1$s</string>
-    <string name="MessageRequestProfileView_member_of_two_groups">Participa en %1$s y %2$s</string>
-    <string name="MessageRequestProfileView_member_of_many_groups">Participa en %1$s, %2$s y %3$s</string>
+    <string name="MessageRequestProfileView_member_of_one_group">Está en %1$s</string>
+    <string name="MessageRequestProfileView_member_of_two_groups">Está en %1$s y %2$s</string>
+    <string name="MessageRequestProfileView_member_of_many_groups">Está en %1$s, %2$s y %3$s</string>
     <plurals name="MessageRequestProfileView_members">
         <item quantity="one">%1$d participante</item>
         <item quantity="other">%1$d participantes</item>
@@ -1737,33 +1820,33 @@
         <item quantity="other">%1$d grupos adicionales</item>
     </plurals>
     <!-- Button label to report spam for a conversation when in a message request state -->
-    <string name="MessageRequestBottomView_report">Denunciar…</string>
+    <string name="MessageRequestBottomView_report">Denunciar</string>
 
     <!-- PassphraseChangeActivity -->
-    <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">¡Las claves no coinciden!</string>
-    <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">¡Clave de acceso antigua incorrecta!</string>
-    <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">¡Introduce una nueva clave de acceso!</string>
+    <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Las claves no coinciden.</string>
+    <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Clave de acceso antigua incorrecta</string>
+    <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Introduce una clave de acceso nueva.</string>
 
     <!-- DeviceProvisioningActivity -->
-    <string name="DeviceProvisioningActivity_link_this_device">¿Enlazar este dispositivo?</string>
+    <string name="DeviceProvisioningActivity_link_this_device">¿Vincular este dispositivo?</string>
     <string name="DeviceProvisioningActivity_continue">Continuar</string>
 
     <string name="DeviceProvisioningActivity_content_intro">Podrá</string>
     <string name="DeviceProvisioningActivity_content_bullets">
         • Leer todos tus mensajes \n• Enviar mensajes en tu nombre
     </string>
-    <string name="DeviceProvisioningActivity_content_progress_title">Enlazar dispositivo</string>
-    <string name="DeviceProvisioningActivity_content_progress_content">Enlazando nuevo dispositivo …</string>
+    <string name="DeviceProvisioningActivity_content_progress_title">Vinculando dispositivo</string>
+    <string name="DeviceProvisioningActivity_content_progress_content">Vinculando nuevo dispositivo…</string>
     <string name="DeviceProvisioningActivity_content_progress_success">¡Dispositivo aprobado!</string>
     <string name="DeviceProvisioningActivity_content_progress_no_device">No se encontró ningun dispositivo.</string>
     <string name="DeviceProvisioningActivity_content_progress_network_error">Fallo de red.</string>
     <string name="DeviceProvisioningActivity_content_progress_key_error">Código QR no válido.</string>
-    <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Lo sentimos, ya tienes demasiados dispositivos enlazados. Elimina alguno</string>
-    <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Lo sentimos, este código QR no es ​​válido.</string>
-    <string name="DeviceProvisioningActivity_link_a_signal_device">¿Enlazar un dispositivo Signal?</string>
-    <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Parece que estás intentando enlazar un dispositivo Signal usando una aplicación de escáner desconocida. Para tu protección, escanea el código otra vez desde Signal.</string>
+    <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Tienes demasiados dispositivos vinculados. Elimina alguno.</string>
+    <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Este código QR no es válido.</string>
+    <string name="DeviceProvisioningActivity_link_a_signal_device">¿Vincular un dispositivo Signal?</string>
+    <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Parece que estás intentando vincular un dispositivo Signal usando una aplicación de escáner desconocida. Para tu seguridad, escanea el código otra vez desde Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal necesita acceso a la cámara para escanear el código QR. Por favor, ve a la aplicación «Ajustes», selecciona Signal en el menú «Aplicaciones y notificaciones» y en «Permisos» activa «Cámara».</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly necesita acceso a la cámara para escanear el código QR. Ve al menú «Ajustes» de tu dispositivo y selecciona Aplicaciones y notificaciones &gt; Molly &gt; Permisos de la aplicación &gt; Cámara &gt; Permitir. Estos pasos pueden variar dependiendo de tu dispositivo.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">No se puede escanear un código QR sin acceso a la cámara.</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1771,45 +1854,45 @@
     <string name="OutdatedBuildReminder_your_version_of_signal_will_expire_today">Esta versión de Signal caduca hoy. Actualiza a la versión más reciente.</string>
     <plurals name="OutdatedBuildReminder_your_version_of_signal_will_expire_in_n_days">
         <item quantity="one">Esta versión de Signal caduca mañana. Actualiza a la versión más reciente.</item>
-        <item quantity="other">Esta versión de Signal caduca en %1$d días. Actualiza a la versión más reciente.</item>
+        <item quantity="other">Esta versión de Signal caduca en %1$d días. Actualiza a la versión más reciente.</item>
     </plurals>
 
     <!-- PassphrasePromptActivity -->
-    <string name="PassphrasePromptActivity_enter_passphrase">Introduce clave de acceso</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Icono de Signal</string>
+    <string name="PassphrasePromptActivity_enter_passphrase">Introducir clave de acceso</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Icono de Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Enviar clave de acceso</string>
-    <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">¡Clave de acceso no válida!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Desbloquear Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Pantalla bloqueada</string>
+    <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Clave de acceso no válida.</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Desbloquear Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android: Pantalla de bloqueo</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Mapa</string>
 
-    <string name="PlacePickerActivity_drop_pin">Situar chincheta</string>
+    <string name="PlacePickerActivity_drop_pin">Situar marcador</string>
     <string name="PlacePickerActivity_accept_address">Aceptar dirección</string>
 
     <!-- PlayServicesProblemFragment -->
-    <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">La versión de Google Play Services que has instalado no funciona correctamente. Por favor, reinstala Google Play Services e inténtalo de nuevo.</string>
+    <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">La versión de Servicios de Google Play que has instalado no funciona correctamente. Reinstala Servicios de Google Play e inténtalo de nuevo.</string>
 
     <!-- PinRestoreEntryFragment -->
     <string name="PinRestoreEntryFragment_incorrect_pin">PIN incorrecto</string>
-    <string name="PinRestoreEntryFragment_skip_pin_entry">¿Omitir selección de PIN?</string>
+    <string name="PinRestoreEntryFragment_skip_pin_entry">¿No introducir PIN?</string>
     <string name="PinRestoreEntryFragment_need_help">¿Necesitas ayuda?</string>
-    <string name="PinRestoreEntryFragment_your_pin_is_a_d_digit_code">El PIN de Signal es un código de %1$d+ dígitos creado por ti que puede constar de cifras y letras o solo cifras. Si no recuerdas tu PIN, podrás crear uno nuevo. Podrás registrar y usar tu cuenta pero perderás tu perfil, contactos, grupos y personas bloqueadas.</string>
-    <string name="PinRestoreEntryFragment_if_you_cant_remember_your_pin">Si no puedes recordar tu PIN, puedes crear uno nuevo. Podrás registrar y usar tu cuenta pero perderás tu perfil, contactos, grupos y personas bloqueadas.</string>
+    <string name="PinRestoreEntryFragment_your_pin_is_a_d_digit_code">Tu PIN es un código numérico o alfanumérico de %1$d o más dígitos que has creado.\n\nSi no recuerdas tu PIN, puedes crear uno nuevo. Podrás registrar y usar tu cuenta, pero se perderán algunos ajustes ya guardados, como tu información de perfil.</string>
+    <string name="PinRestoreEntryFragment_if_you_cant_remember_your_pin">Si no recuerdas tu PIN, puedes crear uno nuevo. Podrás registrar y usar tu cuenta, pero se perderán algunos ajustes ya guardados, como tu información de perfil.</string>
     <string name="PinRestoreEntryFragment_create_new_pin">Crear nuevo PIN</string>
-    <string name="PinRestoreEntryFragment_contact_support">Contactar soporte técnico</string>
+    <string name="PinRestoreEntryFragment_contact_support">Contactar con asistencia</string>
     <string name="PinRestoreEntryFragment_cancel">Cancelar</string>
     <string name="PinRestoreEntryFragment_skip">Omitir</string>
     <plurals name="PinRestoreEntryFragment_you_have_d_attempt_remaining">
-        <item quantity="one">Te queda %1$d intento. Cuando lo agotes, podrás crear un nuevo PIN. Podrás registrar y usar tu cuenta pero perderás tu perfil, contactos, grupos y personas bloqueadas.</item>
-        <item quantity="other">Te quedan %1$d intentos. Cuando los agotes, podrás crear un nuevo PIN. Podrás registrar y usar tu cuenta pero perderás tu perfil, contactos, grupos y personas bloqueadas.</item>
+        <item quantity="one">Te queda %1$d intento. Cuando lo agotes, podrás crear un nuevo PIN. Podrás registrar y usar tu cuenta, pero se perderán algunos ajustes ya guardados, como tu información de perfil.</item>
+        <item quantity="other">Te quedan %1$d intentos. Cuando los agotes, podrás crear un nuevo PIN. Podrás registrar y usar tu cuenta, pero se perderán algunos ajustes ya guardados, como tu información de perfil.</item>
     </plurals>
-    <string name="PinRestoreEntryFragment_signal_registration_need_help_with_pin">Registro en Signal - Ayuda con el PIN en Android</string>
+    <string name="PinRestoreEntryFragment_signal_registration_need_help_with_pin">Registro en Signal: Ayuda con el PIN en Android</string>
 
     <!-- PinRestoreLockedFragment -->
     <string name="PinRestoreLockedFragment_create_your_pin">Crea tu PIN</string>
-    <string name="PinRestoreLockedFragment_youve_run_out_of_pin_guesses">Te has quedado sin intentos para verificar el PIN. Podrás acceder a tu cuenta de Signal si creas un PIN nuevo. Por tu seguridad y para proteger tu privacidad, se restaurará tu cuenta eliminando todos sus datos y ajustes adicionales.</string>
+    <string name="PinRestoreLockedFragment_youve_run_out_of_pin_guesses">Te has quedado sin intentos para verificar el PIN. Podrás acceder a tu cuenta de Signal si creas un PIN nuevo. Por tu seguridad y para proteger tu privacidad, se restaurará tu cuenta y se eliminará toda la información de perfil y los ajustes ya guardados.</string>
     <string name="PinRestoreLockedFragment_create_new_pin">Crear nuevo PIN</string>
   <!-- Removed by excludeNonTranslatables <string name="PinRestoreLockedFragment_learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007059792</string> -->
 
@@ -1831,8 +1914,8 @@
 
     <!-- RatingManager -->
     <string name="RatingManager_rate_this_app">Valora esta aplicación</string>
-    <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Si disfrutas usando esta aplicación, por favor, tómate un momento para ayudarnos valorándola.</string>
-    <string name="RatingManager_rate_now">¡Valorar ahora!</string>
+    <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Si disfrutas usando Signal, ayúdanos tomándote un momento para calificarla.</string>
+    <string name="RatingManager_rate_now">Valorar ahora</string>
     <string name="RatingManager_no_thanks">No, gracias</string>
     <string name="RatingManager_later">Más tarde</string>
 
@@ -1847,15 +1930,15 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Verificar para continuar chateando</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Para prevenir el spam en Signal, completa por favor la verificación.</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Tras la verificación, podrás seguir enviando mensajes. Todos los mensajes pausados se enviarán.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Para ayudar a prevenir spam en Molly, completa la verificación.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Tras la verificación, podrás seguir chateando y se enviarán todos los mensajes pausados.</string>
 
     <!-- Recipient -->
     <string name="Recipient_you">Tú</string>
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Mi historia</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Llamada de Signal</string>
+    <string name="Recipient_signal_call">Llamada de Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Bloquear</string>
@@ -1864,14 +1947,15 @@
     <!-- RecipientProvider -->
 
     <!-- RedPhone -->
-    <string name="RedPhone_answering">Respondiendo …</string>
-    <string name="RedPhone_ending_call">Finalizando llamada …</string>
-    <string name="RedPhone_ringing">Sonando …</string>
-    <string name="RedPhone_busy">Ocupado</string>
+    <string name="RedPhone_answering">Atendiendo…</string>
+    <string name="RedPhone_ending_call">Finalizando llamada…</string>
+    <string name="RedPhone_ringing">Llamando…</string>
+    <string name="RedPhone_busy">No disponible</string>
     <string name="RedPhone_recipient_unavailable">Persona no disponible</string>
-    <string name="RedPhone_network_failed">¡Fallo de red!</string>
-    <string name="RedPhone_number_not_registered">¡Número no registrado!</string>
-    <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">¡El número marcado no admite llamadas seguras!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Fallo de red. Comprueba tu conexión e inténtalo de nuevo.</string>
+    <string name="RedPhone_number_not_registered">Número no registrado</string>
+    <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">El número que has marcado no admite llamadas seguras</string>
     <string name="RedPhone_got_it">Entendido</string>
 
     <!-- Valentine\'s Day Megaphone -->
@@ -1880,15 +1964,15 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Toca aquí para activar tu cámara</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Signal necesita acceder a tu cámara para llamar a %1$s.</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
-    <string name="WebRtcCallActivity__calling">Llamando …</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Para llamar a %1$s, Molly necesita acceder a tu cámara</string>
+    <string name="WebRtcCallActivity__signal_s">Llamada de Molly: %1$s</string>
+    <string name="WebRtcCallActivity__calling">Llamando…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
-    <string name="WebRtcCallActivity__reconnecting">Reconectando …</string>
+    <string name="WebRtcCallActivity__reconnecting">Reconectando…</string>
     <!-- Title for dialog warning about lacking bluetooth permissions during a call -->
-    <string name="WebRtcCallActivity__bluetooth_permission_denied">Permiso de acceso a bluetooth denegado</string>
+    <string name="WebRtcCallActivity__bluetooth_permission_denied">Acceso a Bluetooth denegado</string>
     <!-- Message for dialog warning about lacking bluetooth permissions during a call and references the permission needed by name -->
-    <string name="WebRtcCallActivity__please_enable_the_nearby_devices_permission_to_use_bluetooth_during_a_call">Por favor, permite el acceso al permiso «dispositivos cercanos» para usar bluetooth durante una llamada</string>
+    <string name="WebRtcCallActivity__please_enable_the_nearby_devices_permission_to_use_bluetooth_during_a_call">Permite el acceso a «dispositivos cercanos» para usar Bluetooth durante una llamada.</string>
     <!-- Positive action for bluetooth warning dialog to open settings -->
     <string name="WebRtcCallActivity__open_settings">Abrir ajustes</string>
     <!-- Negative action for bluetooth warning dialog to dismiss dialog -->
@@ -1935,24 +2019,44 @@
     <string name="WebRtcCallActivity__removed_from_call">Expulsado de la llamada</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Alguien te ha expulsado de la llamada.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Permite acceso a tu cámara y micrófono</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Permite acceso a tu micrófono</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Permite acceso a tu cámara</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Para iniciar o unirte a una llamada, permite a Molly acceso a la cámara y al micrófono.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Para iniciar o unirte a una llamada, permite a Molly acceso al micrófono.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Para habilitar el vídeo, permite a Molly acceso a la cámara.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly necesita permisos de micrófono para iniciar o unirte a una llamada.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly necesita acceso a la cámara para habilitar tu vídeo</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Para iniciar o unirte a una llamada:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Para habilitar tu vídeo:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Llamada de Signal</string>
-    <string name="WebRtcCallView__signal_video_call">Videollamada de Signal</string>
+    <string name="WebRtcCallView__signal_call">Llamada de Molly</string>
+    <string name="WebRtcCallView__signal_video_call">Videollamada de Molly</string>
     <string name="WebRtcCallView__start_call">Iniciar llamada</string>
     <string name="WebRtcCallView__join_call">Unirse</string>
-    <string name="WebRtcCallView__call_is_full">La llamada está llena</string>
-    <string name="WebRtcCallView__the_maximum_number_of_d_participants_has_been_Reached_for_this_call">Se alcanzó el número máximo de participantes (%1$d) para esta llamada. Inténtalo más tarde.</string>
-    <string name="WebRtcCallView__your_video_is_off">Tu vídeo está desactivado</string>
-    <string name="WebRtcCallView__reconnecting">Reconectando …</string>
-    <string name="WebRtcCallView__joining">Uniéndose …</string>
+    <string name="WebRtcCallView__call_is_full">La llamada está completa</string>
+    <string name="WebRtcCallView__the_maximum_number_of_d_participants_has_been_Reached_for_this_call">Se alcanzó el número máximo de participantes (%1$d) para esta llamada. Inténtalo de nuevo más tarde.</string>
+    <string name="WebRtcCallView__your_video_is_off">Tu cámara está desactivada</string>
+    <string name="WebRtcCallView__reconnecting">Reconectando…</string>
+    <string name="WebRtcCallView__joining">Uniéndome…</string>
     <string name="WebRtcCallView__disconnected">Desconectada</string>
     <!-- Utilized in the lobby before joining a call link -->
     <string name="WebRtcCallView__signal_call_link">Enlace de llamada de Signal</string>
     <!-- Warning displayed when entering a call via a link and you have Phone Number Privacy disabled-->
-    <string name="WebRtcCallView__anyone_who_joins_pnp_disabled">Cualquier persona que se una a esta llamada a través del enlace podrá ver tu nombre, foto y número de teléfono.</string>
+    <string name="WebRtcCallView__anyone_who_joins_pnp_disabled">Cualquier persona que se una a esta llamada usando el enlace podrá ver tu nombre, foto y número de teléfono.</string>
     <!-- Warning displayed when entering a call via a link and you have Phone Number Privacy enabled-->
-    <string name="WebRtcCallView__anyone_who_joins_pnp_enabled">Cualquier persona que se una a esta llamada a través del enlace podrá ver tu nombre y tu foto.</string>
+    <string name="WebRtcCallView__anyone_who_joins_pnp_enabled">Cualquier persona que se una a esta llamada usando el enlace podrá ver tu nombre y foto.</string>
     <!-- Displayed on the call screen as the status when waiting to be let into a call link by an admin -->
     <string name="WebRtcCallView__waiting_to_be_let_in">Esperando para entrar…</string>
 
@@ -1986,13 +2090,13 @@
     </plurals>
 
     <string name="WebRtcCallView__no_one_else_is_here">No hay nadie más</string>
-    <string name="WebRtcCallView__s_is_in_this_call">%1$s en esta llamada</string>
-    <string name="WebRtcCallView__s_are_in_this_call">%1$s participan en esta llamada</string>
-    <string name="WebRtcCallView__s_and_s_are_in_this_call">%1$s y %2$s en esta llamada</string>
+    <string name="WebRtcCallView__s_is_in_this_call">%1$s está en esta llamada</string>
+    <string name="WebRtcCallView__s_are_in_this_call">%1$s están en esta llamada</string>
+    <string name="WebRtcCallView__s_and_s_are_in_this_call">%1$s y %2$s están en esta llamada</string>
 
     <plurals name="WebRtcCallView__s_s_and_d_others_are_in_this_call">
-        <item quantity="one">%1$s, %2$s y %3$d persona más participan en esta llamada</item>
-        <item quantity="other">%1$s, %2$s y %3$d personas más participan en esta llamada</item>
+        <item quantity="one">%1$s, %2$s y %3$d persona más están en esta llamada</item>
+        <item quantity="other">%1$s, %2$s y %3$d personas más están en esta llamada</item>
     </plurals>
 
     <!-- Toggle content description for toggling camera direction  -->
@@ -2028,24 +2132,43 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">¿Bajar la mano?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Bajar la mano</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Bajar</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Cancelar</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Has levantado la mano</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Ver</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s ha levantado la mano</item>
-        <item quantity="other">%1$s + %2$d han levantado la mano</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s has levantado la mano</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d persona más han levantado la mano</item>
+        <item quantity="other">%1$s +%2$d personas más han levantado la mano</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s ha levantado la mano</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d persona más han levantado la mano</item>
+        <item quantity="other">%1$s +%2$d personas más han levantado la mano</item>
+    </plurals>
+
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s +%2$d persona más</item>
+        <item quantity="other">%1$s +%2$d personas más</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
-        <item quantity="one">%1$s</item>
-        <item quantity="other">%1$s +%2$d</item>
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
+        <item quantity="one">%1$s +%2$d persona más</item>
+        <item quantity="other">%1$s +%2$d personas más</item>
     </plurals>
 
     <!-- An accessibility label for screen readers on a view that can be expanded -->
@@ -2053,24 +2176,24 @@
 
     <!-- AboutSheet -->
     <!-- Displayed in a sheet row and allows user to open signal connection explanation on tap -->
-    <string name="AboutSheet__signal_connection">Conexión de Signal</string>
+    <string name="AboutSheet__signal_connection">Contacto de Signal</string>
     <!-- Displayed in a sheet row describing that the user has marked this contact as \'verified\' from within the app -->
-    <string name="AboutSheet__verified">Pago verificado</string>
+    <string name="AboutSheet__verified">Persona verificada</string>
     <!-- Displayed in bottom sheet describing that the user has no direct messages with this person. The placeholder is a person\'s name. -->
-    <string name="AboutSheet__no_direct_message">No hay mensajes directos con %1$s</string>
+    <string name="AboutSheet__no_direct_message">No hay mensajes privados con %1$s</string>
     <!-- Explains that the given user (placeholder is short name) is in the users system contact -->
-    <string name="AboutSheet__s_is_in_your_system_contacts">%1$s está entre tus contactos del teléfono</string>
+    <string name="AboutSheet__s_is_in_your_system_contacts">%1$s está en tus contactos del teléfono</string>
     <!-- Notice in a row when user has no groups in common -->
     <string name="AboutSheet__you_have_no_groups_in_common">No tienes grupos en común</string>
     <!-- Notice when a user is not a connection to review requests carefully -->
-    <string name="AboutSheet__review_requests_carefully">Revisa cuidadosamente las solicitudes</string>
+    <string name="AboutSheet__review_requests_carefully">Revisa detenidamente las solicitudes</string>
     <!-- Text used when user has groups in common. Placeholder is the count -->
     <plurals name="AboutSheet__d_groups_in">
         <item quantity="one">%1$d grupo en común</item>
         <item quantity="other">%1$d grupos en común</item>
     </plurals>
     <!-- Text displayed in title for external recipients -->
-    <string name="AboutSheet__about">Biografía</string>
+    <string name="AboutSheet__about">Información</string>
     <!-- Text displayed in title for you -->
     <string name="AboutSheet__you">Tú</string>
     <!-- Displays the name of a contact. The first placeholder is the name the user has assigned to that contact, the second name is the name the contact assigned to themselves -->
@@ -2097,7 +2220,7 @@
     <!-- CallParticipantView -->
     <string name="CallParticipantView__s_is_blocked">%1$s está bloqueadx</string>
     <string name="CallParticipantView__more_info">Más detalles</string>
-    <string name="CallParticipantView__you_wont_receive_their_audio_or_video">No recibirás su audio ni vídeo y ni ell@s el tuyo.</string>
+    <string name="CallParticipantView__you_wont_receive_their_audio_or_video">No recibirás el audio ni el vídeo de esta persona y ella no recibirá los tuyos.</string>
     <string name="CallParticipantView__cant_receive_audio_video_from_s">No se puede recibir audio ni vídeo de %1$s</string>
     <string name="CallParticipantView__cant_receive_audio_and_video_from_s">No se puede recibir audio ni vídeo de %1$s</string>
     <string name="CallParticipantView__this_may_be_Because_they_have_not_verified_your_safety_number_change">Esto se puede deber a que no han verificado el cambio de tus cifras de seguridad, hay un problema con su dispositivo, o te han bloqueado.</string>
@@ -2110,10 +2233,10 @@
     <string name="ProxyBottomSheetFragment_proxy_address">Dirección del proxy</string>
     <string name="ProxyBottomSheetFragment_do_you_want_to_use_this_proxy_address">¿Deseas usar esta dirección de proxy?</string>
     <string name="ProxyBottomSheetFragment_use_proxy">Usar proxy</string>
-    <string name="ProxyBottomSheetFragment_successfully_connected_to_proxy">Proxy conectado.</string>
+    <string name="ProxyBottomSheetFragment_successfully_connected_to_proxy">Proxy conectado correctamente.</string>
 
     <!-- RecaptchaProofActivity -->
-    <string name="RecaptchaProofActivity_failed_to_submit">Fallo al enviar</string>
+    <string name="RecaptchaProofActivity_failed_to_submit">No se ha podido enviar</string>
     <string name="RecaptchaProofActivity_complete_verification">Completar verificación</string>
 
     <!-- RegistrationActivity -->
@@ -2121,7 +2244,7 @@
     <string name="RegistrationActivity_you_must_specify_your_country_code">Debes especificar el código de país
     </string>
     <string name="RegistrationActivity_please_enter_a_valid_phone_number_to_register">Para registrarte introduce un número de teléfono válido.</string>
-    <string name="RegistrationActivity_invalid_number">Número inválido</string>
+    <string name="RegistrationActivity_invalid_number">Número no válido</string>
     <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">El número especificado (%1$s) no es válido.
     </string>
 
@@ -2131,28 +2254,28 @@
     <string name="RegistrationActivity_additional_verification_required">Verificación adicional necesaria</string>
     <!-- Dialog message shown when we need to verify sms and carrier rates may apply. -->
     <string name="RegistrationActivity_a_verification_code_will_be_sent_to_this_number">Se enviará un código de verificación a este número. Se pueden aplicar tarifas de operador.</string>
-    <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Recibirás un código de verificación en este número.</string>
+    <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Recibirás una llamada para verificar este número.</string>
     <string name="RegistrationActivity_edit_number">Editar número</string>
     <string name="RegistrationActivity_missing_google_play_services">Servicios de Google Play no instalados</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Este dispositivo no dispone de los Servicios de Google Play. Aún así puedes usar Signal pero esta configuración puede resultar en un bajo rendimiento o fiabilidad.\n\nSi no eres un@ usuari@ avanzad@, no estás ejecutando una ROM personalizada de Android, o crees que estás viendo esto indebidamente, contacta con support@signal.org para solucionar el problema.</string>
-    <string name="RegistrationActivity_i_understand">Entiendo</string>
-    <string name="RegistrationActivity_play_services_error">Fallo en «Play Services»</string>
-    <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services se está actualizando o está temporalmente suspendido. Por favor, inténtalo de nuevo.</string>
-    <string name="RegistrationActivity_terms_and_privacy">Términos y política de privacidad</string>
-    <string name="RegistrationActivity_signal_needs_access_to_your_contacts_and_media_in_order_to_connect_with_friends">Signal necesita los permisos de acceso a tus contactos y medios para chatear y contactar con tus amistades. Tu lista de contactos se cifra en tu teléfono y se trasmite al servicio de Signal para descubrir contactos. Como la lista está cifrada, ni Signal ni nadie tienen acceso.</string>
-    <string name="RegistrationActivity_signal_needs_access_to_your_contacts_in_order_to_connect_with_friends">Signal necesita los permisos de acceso a tus contactos para chatear y contactar con tus amistades. Tu lista de contactos se cifra en tu teléfono y se trasmite al servicio de Signal para descubrir contactos. Como la lista está cifrada, ni Signal ni nadie tienen acceso.</string>
-    <string name="RegistrationActivity_rate_limited_to_service">Has hecho demasiados intentos para registrar este número. Inténtalo de nuevo más tarde.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Este dispositivo no dispone de los Servicios de Google Play. Puedes seguir usando Molly, pero esta configuración puede generar una fiabilidad o un rendimiento limitados.\n\nSi no tienes experiencia como usuario, no estás ejecutando una ROM personalizada de Android, o crees que estás viendo esto por error, contacta con support@molly.im para solucionar el problema.</string>
+    <string name="RegistrationActivity_i_understand">Entendido</string>
+    <string name="RegistrationActivity_play_services_error">Error de Servicios de Google Play</string>
+    <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Servicios de Google Play se está actualizando o está temporalmente no disponible. Inténtalo de nuevo.</string>
+    <string name="RegistrationActivity_terms_and_privacy">Términos y Política de privacidad</string>
+    <string name="RegistrationActivity_signal_needs_access_to_your_contacts_and_media_in_order_to_connect_with_friends">Signal necesita acceso a tus contactos y archivos multimedia para ayudarte a conectar y chatear con otras personas. Tu lista de contactos se carga a través del método privado para encontrar contactos de Signal. Como la lista está cifrada de extremo a extremo, ni Signal ni nadie tienen acceso.</string>
+    <string name="RegistrationActivity_signal_needs_access_to_your_contacts_in_order_to_connect_with_friends">Signal necesita acceso a tus contactos para ayudarte a conectar con otras personas. Tu lista de contactos se carga a través del método privado para encontrar contactos de Signal. Como la lista está cifrada de extremo a extremo, ni Signal ni nadie tienen acceso.</string>
+    <string name="RegistrationActivity_rate_limited_to_service">Has intentado registrar este número demasiadas veces. Inténtalo de nuevo más tarde.</string>
     <!--    During registration, if the user attempts (and fails) to register, we display this error message with a number of minutes timer they are allowed to try again.-->
     <string name="RegistrationActivity_rate_limited_to_try_again">Has hecho demasiados intentos para registrar este número. Inténtalo de nuevo en %1$s.</string>
-    <string name="RegistrationActivity_unable_to_connect_to_service">No se puede conectar con el servidor. Por favor, comprueba la conexión de red e inténtalo de nuevo.</string>
+    <string name="RegistrationActivity_unable_to_connect_to_service">No se ha podido conectar con el servidor. Comprueba la conexión de red e inténtalo de nuevo.</string>
     <!-- A description text for an alert dialog when the entered phone number is not eligible for a verification SMS. -->
     <string name="RegistrationActivity_we_couldnt_send_you_a_verification_code">No hemos podido enviarte el código de verificación por SMS. Intenta recibir tu código a través de una llamada de voz.</string>
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
-    <string name="RegistrationActivity_unable_to_request_verification_code">No se puede solicitar el código de verificación. Por favor, comprueba tu conexión y vuelve a intentarlo.</string>
+    <string name="RegistrationActivity_unable_to_request_verification_code">No se ha podido solicitar el código de verificación. Comprueba la conexión de red e inténtalo de nuevo.</string>
     <string name="RegistrationActivity_non_standard_number_format">Número en formato no estándar</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
-    <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">El número que has introducido (%1$s) parece usar un formato no estándar.\n\n ¿Es %2$s el correcto?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Formato de número</string>
+    <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Parece que el número que has introducido (%1$s) tiene un formato no estándar.\n\n ¿Es %2$s el número correcto?</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android: Formato de número de teléfono</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Llamada solicitada</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2160,8 +2283,8 @@
     <!--    Small "toast" notification to the user confirming that they have requested a new code (through an unspecified channel).-->
     <string name="RegistrationActivity_code_requested">Código de verificación solicitado</string>
     <plurals name="RegistrationActivity_debug_log_hint">
-        <item quantity="one">Estás a %1$d paso de enviar un informe de depuración.</item>
-        <item quantity="other">Estás a %1$d pasos de enviar un informe de depuración.</item>
+        <item quantity="one">Estás a %1$d paso de enviar un registro de depuración.</item>
+        <item quantity="other">Estás a %1$d pasos de enviar un registro de depuración.</item>
     </plurals>
     <string name="RegistrationActivity_we_need_to_verify_that_youre_human">Necesitamos verificar que eres una persona.</string>
     <!-- Button label to trigger a phone call to provide the registration code, in lieu of an SMS code -->
@@ -2169,8 +2292,8 @@
     <!-- Dialog button to cancel the pending action and return to the previous state. -->
     <string name="RegistrationActivity_cancel">Cancelar</string>
     <string name="RegistrationActivity_next">Siguiente</string>
-    <string name="RegistrationActivity_continue">Adelante</string>
-    <string name="RegistrationActivity_take_privacy_with_you_be_yourself_in_every_message">Lleva la privacidad contigo.\nSé tú mism@ en todos tus mensajes.</string>
+    <string name="RegistrationActivity_continue">Continuar</string>
+    <string name="RegistrationActivity_take_privacy_with_you_be_yourself_in_every_message">Lleva la privacidad contigo.\nSé tú en cada mensaje.</string>
     <!-- Title of registration screen when asking for the users phone number -->
     <string name="RegistrationActivity_phone_number">Número de teléfono</string>
     <!-- Subtitle of registration screen when asking for the users phone number -->
@@ -2186,17 +2309,17 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">¿Tienes problemas para registrarte?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Asegúrate de que tu teléfono tenga señal para recibir tu SMS o llamada\n • Confirma que puedes recibir una llamada telefónica al número\n • Verifica que hayas ingresado tu número de teléfono correctamente.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Para más información, sigue estos pasos de resolución de problemas o ponte en contacto con el soporte técnico</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Para obtener más información, consulta %1$s o %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">estos pasos de resolución de problemas</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
-    <string name="RegistrationActivity_support_bottom_sheet_cta_contact_support_substring">Contactar con el soporte técnico</string>
+    <string name="RegistrationActivity_support_bottom_sheet_cta_contact_support_substring">Contactar con asistencia</string>
 
     <!-- RegistrationLockV2Dialog -->
     <string name="RegistrationLockV2Dialog_turn_on_registration_lock">¿Activar el bloqueo de registro?</string>
     <string name="RegistrationLockV2Dialog_turn_off_registration_lock">¿Desactivar el bloqueo de registro?</string>
-    <string name="RegistrationLockV2Dialog_if_you_forget_your_signal_pin_when_registering_again">Si olvidas el PIN de Signal al registrarte tras reinstalar la aplicación, tu cuenta se bloqueará durante 7 días.</string>
+    <string name="RegistrationLockV2Dialog_if_you_forget_your_signal_pin_when_registering_again">Si olvidas el PIN de Signal al registrarte nuevamente en Signal, no podrás acceder a tu cuenta durante 7 días.</string>
     <string name="RegistrationLockV2Dialog_turn_on">Activar</string>
     <string name="RegistrationLockV2Dialog_turn_off">Desactivar</string>
 
@@ -2204,7 +2327,7 @@
     <string name="RevealableMessageView_view_photo">Ver foto</string>
     <string name="RevealableMessageView_view_video">Ver vídeo</string>
     <string name="RevealableMessageView_viewed">Visto</string>
-    <string name="RevealableMessageView_media">Adjuntos</string>
+    <string name="RevealableMessageView_media">Archivos multimedia</string>
 
     <!-- ReviewBannerView -->
     <!-- ReviewBannerView text when a name conflict has been found -->
@@ -2224,26 +2347,26 @@
   <!-- Removed by excludeNonTranslatables <string name="ShakeToReport_share" translatable="false">Share</string> -->
 
     <!-- SharedContactDetailsActivity -->
-    <string name="SharedContactDetailsActivity_add_to_contacts">Añadir a Contactos</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Invitar a Signal</string>
+    <string name="SharedContactDetailsActivity_add_to_contacts">Añadir a contactos</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Invitar a Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Mensaje de Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Llamada de Signal</string>
 
     <!-- SharedContactView -->
-    <string name="SharedContactView_add_to_contacts">Añadir a Contactos</string>
-    <string name="SharedContactView_invite_to_signal">Invitar a Signal</string>
+    <string name="SharedContactView_add_to_contacts">Añadir a contactos</string>
+    <string name="SharedContactView_invite_to_signal">Invitar a Molly</string>
     <string name="SharedContactView_message">Mensaje de Signal</string>
 
     <!-- SignalBottomActionBar -->
     <string name="SignalBottomActionBar_more">Más</string>
 
     <!-- SignalPinReminders -->
-    <string name="SignalPinReminders_well_remind_you_again_later">PIN verificado con éxito. Te lo recordaremos más tarde.</string>
-    <string name="SignalPinReminders_well_remind_you_again_tomorrow">PIN verificado con éxito. Te lo recordaremos de nuevo mañana.</string>
-    <string name="SignalPinReminders_well_remind_you_again_in_a_few_days">PIN verificado con éxito. Te lo recordaremos de nuevo en unos días.</string>
-    <string name="SignalPinReminders_well_remind_you_again_in_a_week">PIN verificado con éxito. Te lo recordaremos de nuevo en una semana.</string>
-    <string name="SignalPinReminders_well_remind_you_again_in_a_couple_weeks">PIN verificado con éxito. Te lo recordaremos de nuevo en unas semanas.</string>
-    <string name="SignalPinReminders_well_remind_you_again_in_a_month">PIN verificado con éxito. Te lo recordaremos de nuevo en un mes.</string>
+    <string name="SignalPinReminders_well_remind_you_again_later">PIN verificado correctamente. Te lo volveremos a recordar más tarde.</string>
+    <string name="SignalPinReminders_well_remind_you_again_tomorrow">PIN verificado correctamente. Te lo volveremos a recordar mañana.</string>
+    <string name="SignalPinReminders_well_remind_you_again_in_a_few_days">PIN verificado correctamente. Te lo volveremos a recordar en unos días.</string>
+    <string name="SignalPinReminders_well_remind_you_again_in_a_week">PIN verificado correctamente. Te lo volveremos a recordar en una semana.</string>
+    <string name="SignalPinReminders_well_remind_you_again_in_a_couple_weeks">PIN verificado correctamente. Te lo volveremos a recordar en unas semanas.</string>
+    <string name="SignalPinReminders_well_remind_you_again_in_a_month">PIN verificado correctamente. Te lo volveremos a recordar en un mes.</string>
 
     <!-- Slide -->
     <string name="Slide_image">Imagen</string>
@@ -2253,7 +2376,7 @@
 
     <!-- SmsMessageRecord -->
     <string name="SmsMessageRecord_secure_session_reset">Has restablecido la sesión segura.</string>
-    <string name="SmsMessageRecord_secure_session_reset_s">%1$s restableció la sesión segura.</string>
+    <string name="SmsMessageRecord_secure_session_reset_s">%1$s ha restablecido la sesión segura.</string>
     <string name="SmsMessageRecord_duplicate_message">Duplicar mensaje.</string>
 
     <!-- StickerManagementActivity -->
@@ -2262,9 +2385,9 @@
     <!-- StickerManagementAdapter -->
     <string name="StickerManagementAdapter_installed_stickers">Stickers instalados</string>
     <string name="StickerManagementAdapter_stickers_you_received">Stickers recibidos</string>
-    <string name="StickerManagementAdapter_signal_artist_series">Paquetes de Artistas de Signal</string>
+    <string name="StickerManagementAdapter_signal_artist_series">Paquetes de artistas de Signal</string>
     <string name="StickerManagementAdapter_no_stickers_installed">No hay ningún sticker instalado</string>
-    <string name="StickerManagementAdapter_stickers_from_incoming_messages_will_appear_here">Los stickers recibidos en mensajes aparecerán aquí</string>
+    <string name="StickerManagementAdapter_stickers_from_incoming_messages_will_appear_here">Los stickers que recibas en mensajes aparecerán aquí</string>
     <string name="StickerManagementAdapter_untitled">Sin nombre</string>
     <string name="StickerManagementAdapter_unknown">Desconocido</string>
 
@@ -2275,29 +2398,29 @@
     <!-- Label for a button that, if pressed, will uninstall the sticker pack that is currently being previewed. -->
     <string name="StickerPackPreviewActivity_remove">Desinstalar</string>
     <string name="StickerPackPreviewActivity_stickers">Stickers</string>
-    <string name="StickerPackPreviewActivity_failed_to_load_sticker_pack">Fallo al cargar el paquete de stickers</string>
+    <string name="StickerPackPreviewActivity_failed_to_load_sticker_pack">No se ha podido cargar el paquete de stickers</string>
 
     <!-- SubmitDebugLogActivity -->
     <string name="SubmitDebugLogActivity_edit">Editar</string>
-    <string name="SubmitDebugLogActivity_done">Hecho</string>
+    <string name="SubmitDebugLogActivity_done">Listo</string>
     <!-- Menu option to save a debug log file to disk. -->
     <string name="SubmitDebugLogActivity_save">Guardar</string>
     <!-- Error that is show in a toast when we fail to save a debug log file to disk. -->
-    <string name="SubmitDebugLogActivity_failed_to_save">Error al guardar</string>
+    <string name="SubmitDebugLogActivity_failed_to_save">No se ha podido guardar</string>
     <!-- Toast that is show to notify that we have saved the debug log file to disk. -->
-    <string name="SubmitDebugLogActivity_save_complete">Guardado con éxito</string>
+    <string name="SubmitDebugLogActivity_save_complete">Guardado correctamente</string>
     <string name="SubmitDebugLogActivity_tap_a_line_to_delete_it">Toca sobre una línea para eliminarla</string>
-    <string name="SubmitDebugLogActivity_submit">Solicitar</string>
-    <string name="SubmitDebugLogActivity_failed_to_submit_logs">Fallo al enviar el registro de depuración</string>
-    <string name="SubmitDebugLogActivity_success">¡Completado!</string>
-    <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Copia esta URL y añádela a tu correo para el soporte o informe de incidencia:\n\n<b>%1$s</b></string>
+    <string name="SubmitDebugLogActivity_submit">Enviar</string>
+    <string name="SubmitDebugLogActivity_failed_to_submit_logs">No se ha podido enviar el registro de depuración</string>
+    <string name="SubmitDebugLogActivity_success">¡Todo listo!</string>
+    <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Copia esta URL y envíala junto con tu informe de incidencia o correo al equipo de asistencia:\n\n<b>%1$s</b></string>
     <string name="SubmitDebugLogActivity_share">Compartir</string>
-    <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Este registro se publicará online y nuestr@s colaborador@s tendrán acceso. Puedes examinarlo y editarlo antes de enviarlo.</string>
+    <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Este registro se publicará online y las personas que colaboran con nosotros tendrán acceso. Lo puedes examinar y editar antes de enviarlo.</string>
 
     <!-- SupportEmailUtil -->
   <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_support_email" translatable="false">support@signal.org</string> -->
     <string name="SupportEmailUtil_filter">Filtro:</string>
-    <string name="SupportEmailUtil_device_info">Información de dispositivo:</string>
+    <string name="SupportEmailUtil_device_info">Información del dispositivo:</string>
     <string name="SupportEmailUtil_android_version">Versión de Android:</string>
   <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_signal_version" translatable="false">Signal version:</string> -->
   <!-- Removed by excludeNonTranslatables <string name="SupportEmailUtil_signal_package" translatable="false">Signal package:</string> -->
@@ -2311,9 +2434,9 @@
     <string name="ThreadRecord_draft">Borrador:</string>
     <string name="ThreadRecord_media_message">Mensaje multimedia</string>
     <string name="ThreadRecord_sticker">Sticker</string>
-    <string name="ThreadRecord_view_once_photo">Foto para ver una vez</string>
-    <string name="ThreadRecord_view_once_video">Vídeo para ver una vez</string>
-    <string name="ThreadRecord_view_once_media">Adjunto para ver una vez</string>
+    <string name="ThreadRecord_view_once_photo">Foto de visualización única</string>
+    <string name="ThreadRecord_view_once_video">Vídeo de visualización única</string>
+    <string name="ThreadRecord_view_once_media">Archivo de visualización única</string>
     <string name="ThreadRecord_this_message_was_deleted">Este mensaje ha sido eliminado.</string>
     <string name="ThreadRecord_you_deleted_this_message">Mensaje eliminado.</string>
     <!-- Displayed in the notification when the user sends a request to activate payments -->
@@ -2325,20 +2448,20 @@
     <!-- Displayed in the notification when the recipient can accept payments -->
     <string name="ThreadRecord_can_accept_payments">%1$s ya puede aceptar Pagos</string>
     <string name="ThreadRecord_s_is_on_signal">¡%1$s usa Signal!</string>
-    <string name="ThreadRecord_disappearing_messages_disabled">Desaparición de mensajes desactivada.</string>
-    <string name="ThreadRecord_disappearing_message_time_updated_to_s">El tiempo de desaparición de mensajes se ha fijado en %1$s</string>
-    <string name="ThreadRecord_safety_number_changed">Las cifras de seguridad han cambiado</string>
-    <string name="ThreadRecord_your_safety_number_with_s_has_changed">Tus cifras de seguridad con %1$s han cambiado.</string>
-    <string name="ThreadRecord_you_marked_verified">Identidad verificada por ti</string>
-    <string name="ThreadRecord_you_marked_unverified">Identidad no verificada</string>
-    <string name="ThreadRecord_message_could_not_be_processed">Ha sido mposible procesar el mensaje</string>
+    <string name="ThreadRecord_disappearing_messages_disabled">Mensajes temporales activados</string>
+    <string name="ThreadRecord_disappearing_message_time_updated_to_s">La duración de los mensajes temporales se ha establecido en %1$s</string>
+    <string name="ThreadRecord_safety_number_changed">El número de seguridad ha cambiado</string>
+    <string name="ThreadRecord_your_safety_number_with_s_has_changed">Tu número de seguridad con %1$s ha cambiado.</string>
+    <string name="ThreadRecord_you_marked_verified">Has verificado la identidad</string>
+    <string name="ThreadRecord_you_marked_unverified">Has retirado la marca de verificación</string>
+    <string name="ThreadRecord_message_could_not_be_processed">No se ha podido procesar el mensaje</string>
     <string name="ThreadRecord_delivery_issue">Fallo en la entrega</string>
     <string name="ThreadRecord_message_request">Solicitud de chat</string>
     <!-- Thread preview for a recipient that has been hidden -->
     <string name="ThreadRecord_hidden_recipient">Has ocultado a esta persona, envíale un mensaje de nuevo y se la volverá a agregar a tu lista.</string>
     <string name="ThreadRecord_photo">Foto</string>
     <string name="ThreadRecord_gif">GIF</string>
-    <string name="ThreadRecord_voice_message">Nota de voz</string>
+    <string name="ThreadRecord_voice_message">Mensaje de voz</string>
     <string name="ThreadRecord_file">Archivo</string>
     <string name="ThreadRecord_video">Vídeo</string>
     <string name="ThreadRecord_chat_session_refreshed">Sesión de chat reiniciada</string>
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s pertenece a %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Actualizar Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Una nueva versión de Signal está disponible. Toca para actualizar.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal no se ha podido actualizar</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Actualizar Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Una nueva versión de Molly está disponible. Toca para actualizar.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly no se ha podido actualizar</string>
     <string name="ApkUpdateNotifications_failed_general_body">Lo intentaremos de nuevo más tarde.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal se ha actualizado con éxito</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly se ha actualizado con éxito</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Se actualizó automáticamente a la versión %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2389,9 +2512,9 @@
     <string name="UsernameEditFragment_successfully_removed_username">Alias eliminado con éxito.</string>
     <string name="UsernameEditFragment_encountered_a_network_error">Fallo en la conexión de red.</string>
     <!-- Toast message shown if user exceeds the rate limit for reserving usernames -->
-    <string name="UsernameEditFragment_rate_limit_exceeded_error">Se han realizado demasiados intentos; inténtalo de nuevo más tarde.</string>
-    <string name="UsernameEditFragment_this_username_is_taken">Alias en uso por otra persona.</string>
-    <string name="UsernameEditFragment_usernames_can_only_include">Tu alias solo puede contener a–Z, 0–9 y _.</string>
+    <string name="UsernameEditFragment_rate_limit_exceeded_error">Se han realizado demasiados intentos. Inténtalo de nuevo más tarde.</string>
+    <string name="UsernameEditFragment_this_username_is_taken">Este alias ya existe.</string>
+    <string name="UsernameEditFragment_usernames_can_only_include">El alias solo puede contener los caracteres de la A a la Z, del 0 al 9 y guiones bajos.</string>
     <string name="UsernameEditFragment_usernames_cannot_begin_with_a_number">El alias no puede comenzar por un número.</string>
     <string name="UsernameEditFragment_username_is_invalid">Alias no válido.</string>
     <string name="UsernameEditFragment_usernames_must_be_between_a_and_b_characters">El alias debe contener entre %1$d y %2$d caracteres.</string>
@@ -2403,21 +2526,21 @@
     <!-- Button to allow user to skip -->
     <string name="UsernameEditFragment__skip">Omitir</string>
     <!-- Content description for done button -->
-    <string name="UsernameEditFragment__done">Hecho</string>
+    <string name="UsernameEditFragment__done">Listo</string>
     <!-- Displayed when the chosen discriminator is not available for the given nickname -->
-    <string name="UsernameEditFragment__this_username_is_not_available_try_another_number">Este alias no está disponible, prueba con otro número.</string>
+    <string name="UsernameEditFragment__this_username_is_not_available_try_another_number">Este alias no está disponible. Prueba con otro número.</string>
     <!-- Displayed when the chosen discriminator is too short -->
-    <string name="UsernameEditFragment__invalid_username_enter_a_minimum_of_d_digits">Alias no válido, ingresa un mínimo de %1$d dígitos.</string>
+    <string name="UsernameEditFragment__invalid_username_enter_a_minimum_of_d_digits">Alias no válido. Ingresa un mínimo de %1$d dígitos.</string>
     <!-- Displayed when the chosen discriminator is too long -->
-    <string name="UsernameEditFragment__invalid_username_enter_a_maximum_of_d_digits">Alias no válido, ingresa un máximo de %1$d dígitos.</string>
+    <string name="UsernameEditFragment__invalid_username_enter_a_maximum_of_d_digits">Alias no válido. Ingresa un máximo de %1$d dígitos.</string>
     <!-- Displayed when the chosen discriminator is 00 -->
-    <string name="UsernameEditFragment__this_number_cant_be_00">Este número no puede ser 00. Introduce un dígito del 1 al 9</string>
+    <string name="UsernameEditFragment__this_number_cant_be_00">Este número no puede ser 00. Introduce un dígito del 1 al 9.</string>
     <!-- Displayed when the chosen discriminator starts with 0 and has a length > 2 -->
     <string name="UsernameEditFragment__this_number_cant_start_with_0">Los números con más de 2 dígitos no pueden comenzar con 0</string>
     <!-- The body of an alert dialog asking the user to confirm that they want to recover their username -->
-    <string name="UsernameEditFragment_recovery_dialog_confirmation">Recuperar tu alias restablecerá tu código QR y tu enlace. ¿Seguro que quieres hacer esto? ¿Seguro que quieres hacer esto?</string>
+    <string name="UsernameEditFragment_recovery_dialog_confirmation">Recuperar tu alias restablecerá tu código QR y tu enlace. ¿Quieres hacerlo de todos modos? ¿Quieres hacerlo de todos modos?</string>
     <!-- The body of an alert dialog asking the user to confirm that they want to change their username, even if it resets their link -->
-    <string name="UsernameEditFragment_change_confirmation_message">Cambiar tu alias restablecerá tu código QR y tu enlace. ¿Seguro que quieres hacer esto?</string>
+    <string name="UsernameEditFragment_change_confirmation_message">Si cambias tu alias, se restablecerá tu código QR y tu enlace. ¿Deseas cambiarlo de todos modos?</string>
     <!-- Text for a button in a dialog asking if the user would like to continue the operation of changing their username -->
     <string name="UsernameEditFragment_continue">Continuar</string>
 
@@ -2431,15 +2554,15 @@
     <string name="UsernameShareBottomSheet__copy_or_share_a_username_link">Copiar o compartir un enlace de alias</string>
 
     <!-- VerifyIdentityActivity -->
-    <string name="VerifyIdentityActivity_your_contact_is_running_a_newer_version_of_Signal">Esta persona usa una versión de Signal con un formato de código QR incompatible. Por favor, pídele que actualice para verificar.</string>
-    <string name="VerifyIdentityActivity_the_scanned_qr_code_is_not_a_correctly_formatted_safety_number">El código QR escaneado no tiene un formato de código de verificación de cifras de seguridad correcto. Por favor, intenta escanearlo de nuevo.</string>
-    <string name="VerifyIdentityActivity_share_safety_number_via">Compartir cifras de seguridad por …</string>
-    <string name="VerifyIdentityActivity_our_signal_safety_number">Nuestras cifras de seguridad de Signal:</string>
+    <string name="VerifyIdentityActivity_your_contact_is_running_a_newer_version_of_Signal">Esta persona usa una versión nueva de Signal con un formato de código QR incompatible. Actualiza tu versión para completar la verificación.</string>
+    <string name="VerifyIdentityActivity_the_scanned_qr_code_is_not_a_correctly_formatted_safety_number">El código QR escaneado no tiene un formato correcto de código de verificación de número de seguridad. Intenta escanearlo de nuevo.</string>
+    <string name="VerifyIdentityActivity_share_safety_number_via">Compartir número de seguridad por…</string>
+    <string name="VerifyIdentityActivity_our_signal_safety_number">Nuestro número de seguridad de Signal:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Parece que no tiene ninguna aplicación con la que compartir.</string>
-    <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">No se encontraron cifras de seguridad en el portapapeles para comparar</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal necesita acceso a la cámara para escanear el código QR. Por favor, ve a la aplicación «Ajustes», selecciona Signal en el menú «Aplicaciones y notificaciones» y en «Permisos» activa «Cámara».</string>
+    <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">No se encontró ningún número de seguridad para comparar en el portapapeles</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly necesita acceso a la cámara para escanear el código QR. Ve al menú «Ajustes» de tu dispositivo y selecciona Aplicaciones y notificaciones &gt; Molly &gt; Permisos de la aplicación &gt; Cámara &gt; Permitir. Estos pasos pueden variar dependiendo de tu dispositivo.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">No se puede escanear un código QR sin acceso a la cámara</string>
-    <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Tienes que intercambiar mensajes con %1$s para poder ver sus cifras de seguridad.</string>
+    <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Tienes que intercambiar mensajes con %1$s para poder ver su número de seguridad.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_message">Se creará un número de seguridad con esta persona una vez que se intercambien mensajes.</string>
     <!-- Confirmation option for dialog explaining to user they must exchange messages first to create a safety number  -->
@@ -2456,38 +2579,38 @@
   <!-- Removed by excludeNonTranslatables <string name="AudioView_duration" translatable="false">%1$d:%2$02d</string> -->
 
     <!-- MessageDisplayHelper -->
-    <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">El mensaje ha sido cifrado para una sesión inexistente</string>
+    <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">El mensaje se ha cifrado para una sesión que no existe</string>
 
     <!-- MmsMessageRecord -->
-    <string name="MmsMessageRecord_bad_encrypted_mms_message">Mensaje MMS cifrado erróneo</string>
-    <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">El mensaje MMS ha sido cifrado para una sesión inexistente</string>
+    <string name="MmsMessageRecord_bad_encrypted_mms_message">Error de cifrado de mensaje MMS</string>
+    <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">El mensaje MMS se ha cifrado para una sesión que no existe</string>
 
     <!-- MuteDialog -->
     <string name="MuteDialog_mute_notifications">Silenciar notificaciones</string>
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Toca para abrir.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal está desbloqueado</string>
-    <string name="KeyCachingService_lock">Bloquear Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly se ha desbloqueado</string>
+    <string name="KeyCachingService_lock">Bloquear Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Tú</string>
-    <string name="MediaPreviewActivity_unssuported_media_type">Formato de contenido incompatible</string>
+    <string name="MediaPreviewActivity_unssuported_media_type">Formato de archivo no compatible</string>
     <string name="MediaPreviewActivity_draft">Borrador</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal necesita acceso al almacenamiento del teléfono para guardar adjuntos en la tarjeta SD. Por favor, ve a la aplicación «Ajustes», selecciona Signal en el menú «Aplicaciones y notificaciones» y en «Permisos» activa «Almacenamiento».</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly necesita acceso al almacenamiento del teléfono para guardar archivos en el almacenamiento externo. Ve al menú «Ajustes» de tu dispositivo y selecciona Aplicaciones y notificaciones &gt; Molly &gt; Permisos de la aplicación &gt; Almacenamiento&gt; Permitir. Estos pasos pueden variar dependiendo de tu dispositivo.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">No se puede guardar en una unidad de almacenamiento externo si Signal no tiene acceso</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">¿Eliminar mensaje?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Este mensaje se eliminará permanentemente.</string>
-    <string name="MediaPreviewActivity_s_to_s">%1$s de %2$s</string>
+    <string name="MediaPreviewActivity_s_to_s">De %1$s para %2$s</string>
     <!-- All media preview title when viewing media send by you to another recipient (allows changing of \'You\' based on context) -->
     <string name="MediaPreviewActivity_you_to_s">De ti para %1$s</string>
     <!-- All media preview title when viewing media sent by another recipient to you (allows changing of \'You\' based on context) -->
     <string name="MediaPreviewActivity_s_to_you">De %1$s para ti</string>
-    <string name="MediaPreviewActivity_media_no_longer_available">El adjunto original ya no está disponible.</string>
+    <string name="MediaPreviewActivity_media_no_longer_available">El archivo multimedia ya no está disponible.</string>
     <!-- Notifying the user that the device has encountered a technical issue and is unable to render a video. -->
     <string name="MediaPreviewActivity_unable_to_play_media">No se ha podido reproducir el archivo.</string>
     <string name="MediaPreviewActivity_error_finding_message">Error al encontrar el mensaje.</string>
-    <string name="MediaPreviewActivity_cant_find_an_app_able_to_share_this_media">Fallo al encontrar la aplicación para mostrar este adjunto.</string>
+    <string name="MediaPreviewActivity_cant_find_an_app_able_to_share_this_media">No se puede encontrar una aplicación para mostrar este archivo.</string>
     <string name="MediaPreviewActivity_dismiss_due_to_error">Cerrar</string>
     <string name="MediaPreviewFragment_edit_media_error">Error de archivos</string>
     <!-- This is displayed as a toast notification when we encounter an error deleting a message, including potentially on other people\'s devices -->
@@ -2510,20 +2633,20 @@
     </plurals>
     <string name="MessageNotifier_most_recent_from_s">Más recientes desde: %1$s</string>
     <string name="MessageNotifier_locked_message">Mensaje bloqueado</string>
-    <string name="MessageNotifier_message_delivery_failed">Fallo al entregar mensaje.</string>
+    <string name="MessageNotifier_message_delivery_failed">No se ha podido entregar el mensaje.</string>
     <!-- Shown in a notification when a story the user tries to send fails to be sent -->
     <string name="MessageNotifier_story_delivery_failed">No se ha podido enviar la historia</string>
     <!-- Shown as notification title for when a notification about a story sent to a group story %1$s replaced with the group name -->
     <string name="MessageNotifier_group_story_title">De ti para %1$s</string>
-    <string name="MessageNotifier_failed_to_deliver_message">Fallo al entregar mensaje.</string>
-    <string name="MessageNotifier_error_delivering_message">Fallo al entregar el mensaje.</string>
+    <string name="MessageNotifier_failed_to_deliver_message">No se ha podido entregar el mensaje.</string>
+    <string name="MessageNotifier_error_delivering_message">No se ha podido entregar el mensaje.</string>
     <string name="MessageNotifier_message_delivery_paused">Entrega de mensajes pausada.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verificar para continuar chateando en Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verificar para continuar chateando en Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Marcar todos como leídos</string>
     <string name="MessageNotifier_mark_read">Marcar como leído</string>
     <string name="MessageNotifier_turn_off_these_notifications">Desactivar estas notificaciones</string>
-    <string name="MessageNotifier_view_once_photo">Foto para ver una vez</string>
-    <string name="MessageNotifier_view_once_video">Vídeo para ver una vez</string>
+    <string name="MessageNotifier_view_once_photo">Foto de visualización única</string>
+    <string name="MessageNotifier_view_once_video">Vídeo de visualización única</string>
     <string name="MessageNotifier_reply">Responder</string>
     <string name="MessageNotifier_signal_message">Mensaje de Signal</string>
     <string name="MessageNotifier_contact_message">%1$s %2$s</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Reacción a tu sticker: %1$s.</string>
     <string name="MessageNotifier_this_message_was_deleted">Mensaje eliminado.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">¿Desactivar las notificaciones cuando una persona comience a usar Signal? Puedes volver a activarlas en los ajustes de Signal &gt; Notificaciones.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">¿Desactivar las notificaciones cuando una persona comience a usar Molly? Puedes volver a activarlas en los ajustes de Molly &gt; Notificaciones.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2560,17 +2683,17 @@
     <string name="NotificationChannel_failures">Fallos</string>
     <string name="NotificationChannel_backups">Copias de seguridad</string>
     <string name="NotificationChannel_locked_status">Estado de bloqueo</string>
-    <string name="NotificationChannel_app_updates">Actualizaciones de la aplicación</string>
+    <string name="NotificationChannel_app_updates">Actualizaciones de la app</string>
     <string name="NotificationChannel_other">Otros</string>
     <string name="NotificationChannel_group_chats">Chats</string>
-    <string name="NotificationChannel_missing_display_name">Desconocid@</string>
+    <string name="NotificationChannel_missing_display_name">Desconocido</string>
     <string name="NotificationChannel_voice_notes">Notas de voz</string>
     <string name="NotificationChannel_contact_joined_signal">Alguien comienza a usar Signal</string>
-    <string name="NotificationChannels__no_activity_available_to_open_notification_channel_settings">No hay actividad disponible para abrir el canal de notificaciones en «Ajustes».</string>
+    <string name="NotificationChannels__no_activity_available_to_open_notification_channel_settings">No hay actividad disponible para abrir los ajustes del canal de notificaciones.</string>
     <!-- Notification channel name for showing persistent background connection on devices without push notifications -->
-    <string name="NotificationChannel_background_connection">Estado de conexión</string>
+    <string name="NotificationChannel_background_connection">Conexión en segundo plano</string>
     <!-- Notification channel name for showing call status information (like connection, ongoing, etc.) Not ringing. -->
-    <string name="NotificationChannel_call_status">Estado de llamada</string>
+    <string name="NotificationChannel_call_status">Estado de la llamada</string>
     <!-- Notification channel name for occasional alerts to the user. Will appear in the system notification settings as the title of this notification channel. -->
     <string name="NotificationChannel_critical_app_alerts">Alertas críticas de apps</string>
     <!-- Notification channel name for other notifications related to messages. Will appear in the system notification settings as the title of this notification channel. -->
@@ -2579,8 +2702,8 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">¡La respuesta rápida no está disponible cuando Signal está bloqueado!</string>
-    <string name="QuickResponseService_problem_sending_message">¡Hubo un problema al enviar el mensaje!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">La función de respuesta rápida no está disponible cuando Molly está bloqueado.</string>
+    <string name="QuickResponseService_problem_sending_message">No se ha podido enviar el mensaje</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
     <string name="SaveAttachmentTask_saved">Archivo multimedia guardado</string>
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Atajo no válido</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Nuevo mensaje</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Solicitud de chat</string>
     <string name="SingleRecipientNotificationBuilder_you">Tú</string>
@@ -2612,15 +2735,15 @@
     <!-- Row item title for phone number privacy explainer -->
     <string name="NewWaysToConnectDialogFragment__phone_number_privacy">Privacidad del número de teléfono</string>
     <!-- Row item description for phone number privacy explainer -->
-    <string name="NewWaysToConnectDialogFragment__your_phone_number_is_no_longer_shared">Tu número de teléfono ya no se comparte con los chats. Incluso aunque tu amigx tenga tu número guardado en sus contactos, no le aparecerá.</string>
+    <string name="NewWaysToConnectDialogFragment__your_phone_number_is_no_longer_shared">Tu número de teléfono ya no se comparte en los chats. Si alguien tiene tu número guardado en sus contactos, sí podrá verlo.</string>
     <!-- Row item title for usernames explainer -->
     <string name="NewWaysToConnectDialogFragment__usernames">Alias</string>
     <!-- Row item description for usernames explainer -->
-    <string name="NewWaysToConnectDialogFragment__people_can_now_message_you_using_your_optional_username">Ahora, la gente puede enviarte mensajes usando tu alias opcional, con lo que no necesitas dar tu número de teléfono. Los alias no son visibles en tu perfil.</string>
+    <string name="NewWaysToConnectDialogFragment__people_can_now_message_you_using_your_optional_username">Ahora, las personas pueden enviarte mensajes usando tu alias opcional, con lo que no necesitas dar tu número de teléfono. Los alias no se muestran en tu perfil.</string>
     <!-- Row item title for qr code and links explainer -->
     <string name="NewWaysToConnectDialogFragment__qr_codes_and_links">Códigos QR y enlaces</string>
     <!-- Row item description for qr code and links explainer -->
-    <string name="NewWaysToConnectDialogFragment__usernames_have_a_unique_qr_code">Los alias tienen un código QR único que puedes compartir con tus amigxs para que inicien un chat contigo.</string>
+    <string name="NewWaysToConnectDialogFragment__usernames_have_a_unique_qr_code">Los alias tienen un código QR único que puedes compartir con otras personas para que inicien un chat contigo.</string>
     <!-- Button label for not right now -->
     <string name="NewWaysToConnectDialogFragment__not_now">Ahora no</string>
     <!-- Button label for continue -->
@@ -2628,7 +2751,7 @@
 
     <!-- ThumbnailView -->
     <string name="ThumbnailView_Play_video_description">Reproducir vídeo</string>
-    <string name="ThumbnailView_Has_a_caption_description">Contiene una explicación</string>
+    <string name="ThumbnailView_Has_a_caption_description">Contiene una descripción</string>
 
     <!-- TransferControlView -->
     <plurals name="TransferControlView_n_items">
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Este dispositivo ya no está registrado. Probablemente se debe a que se registró el número en Signal con un dispositivo distinto.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Este dispositivo ya no está registrado. Probablemente se debe a que se registró el número en Molly con un dispositivo distinto.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Volver a registrar el dispositivo</string>
 
@@ -2658,17 +2781,17 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Para atender la llamada, permite a Signal el acceso al micrófono.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Para atender la llamada, permite a Molly acceder al micrófono.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Para atender la videollamada, permite a Signal el acceso al micrófono y a la cámara.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal necesita acceso al micrófono y cámara para hacer o atender llamadas. Por favor, ve a la aplicación «Ajustes», selecciona Signal en el menú «Aplicaciones y notificaciones» y en «Permisos» activa «Micrófono» y «Cámara».</string>
-    <string name="WebRtcCallActivity__answered_on_a_linked_device">Atendida en dispositivo enlazado.</string>
-    <string name="WebRtcCallActivity__declined_on_a_linked_device">Rechazada en dispositivo enlazado.</string>
-    <string name="WebRtcCallActivity__busy_on_a_linked_device">Ocupado en dispositivo enlazado.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Para atender la videollamada, permite a Molly el acceso al micrófono y a la cámara.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly necesita acceso al micrófono y a la cámara para hacer o atender llamadas. Ve al menú «Ajustes» de tu dispositivo y selecciona Aplicaciones y notificaciones &gt; Molly &gt; Permisos de la aplicación, y activa el acceso al micrófono y a la cámara. Estos pasos pueden variar dependiendo de tu dispositivo.</string>
+    <string name="WebRtcCallActivity__answered_on_a_linked_device">Atendida en dispositivo vinculado.</string>
+    <string name="WebRtcCallActivity__declined_on_a_linked_device">Rechazada en dispositivo vinculado.</string>
+    <string name="WebRtcCallActivity__busy_on_a_linked_device">No disponible en dispositivo vinculado.</string>
     <!-- Tooltip message shown first time user is in a video call after switch camera button moved -->
     <string name="WebRtcCallActivity__flip_camera_tooltip">El botón para cambiar de cámara se ha movido para aquí; pulsa tu vídeo para probarlo</string>
 
-    <string name="GroupCallSafetyNumberChangeNotification__someone_has_joined_this_call_with_a_safety_number_that_has_changed">Las cifras de seguridad de alguien que se ha unido a esta llamada han cambiado.</string>
+    <string name="GroupCallSafetyNumberChangeNotification__someone_has_joined_this_call_with_a_safety_number_that_has_changed">El número de seguridad de alguien que se ha unido a esta llamada ha cambiado.</string>
 
     <!-- WebRtcCallScreen -->
     <string name="WebRtcCallScreen_swipe_up_to_change_views">Desliza hacia arriba para cambiar la vista</string>
@@ -2685,9 +2808,9 @@
     <!-- Label for a dialog asking the user to switch the audio output device during a call -->
     <string name="WebRtcAudioOutputToggle__audio_output">Salida de audio</string>
     <!-- Audio output option referring to the earpiece built into the phone -->
-    <string name="WebRtcAudioOutputToggle__phone_earpiece">Auricular del celular/móvil</string>
+    <string name="WebRtcAudioOutputToggle__phone_earpiece">Auricular del teléfono</string>
     <!-- Audio output option referring to the louder speaker built into the phone -->
-    <string name="WebRtcAudioOutputToggle__speaker">Altavoz del dispositivo</string>
+    <string name="WebRtcAudioOutputToggle__speaker">Altavoz</string>
     <!-- Audio output option referring to an external audio device connected via wireless Bluetooth -->
     <string name="WebRtcAudioOutputToggle__bluetooth">Bluetooth</string>
     <!-- Audio output option referring to a pair of headphones that do not contain a microphone connected via a 3.5mm headphone jack -->
@@ -2701,66 +2824,68 @@
     <string name="WebRtcCallControls_reject_call_description">Rechazar llamada</string>
 
     <!-- change_passphrase_activity -->
-    <string name="change_passphrase_activity__old_passphrase">Clave de acceso previa</string>
+    <string name="change_passphrase_activity__old_passphrase">Clave de acceso anterior</string>
     <string name="change_passphrase_activity__new_passphrase">Nueva clave de acceso</string>
     <string name="change_passphrase_activity__repeat_new_passphrase">Repetir nueva clave de acceso</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Invitar a Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Invitar a Molly</string>
     <string name="contact_selection_activity__new_group">Nuevo grupo</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Actualizar contactos</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">¿Falta alguien? Prueba a actualizar</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Encuentra a personas que conoces en Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Permite acceso a tus contactos</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Más</string>
 
     <!-- contact_filter_toolbar -->
-    <string name="contact_filter_toolbar__clear_entered_text_description">Eliminar texto introducido</string>
+    <string name="contact_filter_toolbar__clear_entered_text_description">Borrar texto introducido</string>
     <string name="contact_filter_toolbar__show_keyboard_description">Mostrar teclado</string>
     <string name="contact_filter_toolbar__show_dial_pad_description">Mostrar teclado numérico</string>
 
     <!-- contact_selection_group_activity -->
     <string name="contact_selection_group_activity__no_contacts">No hay contactos.</string>
-    <string name="contact_selection_group_activity__finding_contacts">Cargando contactos …</string>
+    <string name="contact_selection_group_activity__finding_contacts">Cargando contactos…</string>
 
     <!-- single_contact_selection_activity -->
-    <string name="SingleContactSelectionActivity_contact_photo">Foto del contacto</string>
+    <string name="SingleContactSelectionActivity_contact_photo">Foto de contacto</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal necesita acceso a los contactos para mostrar quien usa Signal. Por favor, ve a la aplicación «Ajustes», selecciona Signal en el menú «Aplicaciones y notificaciones» y en «Permisos» activa «Contactos».</string>
-    <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Fallo al comprobar contactos, comprueba la conexión a la red.</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly necesita acceso a los contactos en tu teléfono para mostrar tus contactos. Ve al menú «Ajustes» de tu dispositivo y selecciona Aplicaciones y notificaciones &gt; Molly &gt; Permisos de la aplicación &gt; Contactos &gt; Permitir. Estos pasos pueden variar dependiendo de tu dispositivo.</string>
+    <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">No se han podido encontrar contactos. Comprueba tu conexión de red.</string>
     <string name="ContactSelectionListFragment_username_not_found">Alias no encontrado</string>
-    <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"%1$s no usa Signal. Asegúrate de introducir el alias correcto."</string>
-    <string name="ContactSelectionListFragment_you_do_not_need_to_add_yourself_to_the_group">No necesitas añadirte a ti mism@ al grupo</string>
+    <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"%1$s no usa Signal. Asegúrate de introducir el alias correcto e inténtalo de nuevo."</string>
+    <string name="ContactSelectionListFragment_you_do_not_need_to_add_yourself_to_the_group">No necesitas añadirte como participante en el grupo</string>
     <string name="ContactSelectionListFragment_maximum_group_size_reached">Se alcanzó el número máximo de participantes en el grupo.</string>
-    <string name="ContactSelectionListFragment_signal_groups_can_have_a_maximum_of_d_members">Los grupos de Signal aceptan un máximo de %1$d participantes.</string>
+    <string name="ContactSelectionListFragment_signal_groups_can_have_a_maximum_of_d_members">Los grupos de Signal permiten un máximo de %1$d participantes.</string>
     <string name="ContactSelectionListFragment_recommended_member_limit_reached">Se alcanzó el límite máximo recomendado</string>
-    <string name="ContactSelectionListFragment_signal_groups_perform_best_with_d_members_or_fewer">Los grupos de Signal funcionan mejor con %1$d o menos participantes. Añadir más participantes causará retrasos al enviar y recibir mensajes.</string>
+    <string name="ContactSelectionListFragment_signal_groups_perform_best_with_d_members_or_fewer">Los grupos de Signal funcionan mejor con %1$d o menos participantes. Añadir más participantes causará retrasos para enviar y recibir mensajes.</string>
     <plurals name="ContactSelectionListFragment_d_members">
         <item quantity="one">%1$d participante</item>
         <item quantity="other">%1$d participantes</item>
     </plurals>
     <!-- Text on row item to find user by phone number -->
-    <string name="ContactSelectionListFragment__find_by_phone_number">Buscar por núm. de teléfono</string>
+    <string name="ContactSelectionListFragment__find_by_phone_number">Buscar por número de teléfono</string>
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Buscar por alias</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Permite acceso a los contactos</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Para encontrar a personas que conoces en Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Permitir acceso</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">No, gracias</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Permite acceso a tus contactos. Tus contactos están cifrados y no son visibles para Signal ni nadie.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal necesita acceso a tus contactos para poder mostrarlos.</string>
-    <string name="contact_selection_list_fragment__show_contacts">Ver personas</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly necesita acceso a tus contactos para poder mostrarlos.</string>
+    <string name="contact_selection_list_fragment__show_contacts">Mostrar contactos</string>
 
     <!-- contact_selection_list_item -->
     <plurals name="contact_selection_list_item__number_of_members">
@@ -2769,24 +2894,24 @@
     </plurals>
     <!-- Displays number of viewers for a story -->
     <plurals name="contact_selection_list_item__number_of_viewers">
-        <item quantity="one">%1$d vista</item>
-        <item quantity="other">%1$d vistas</item>
+        <item quantity="one">%1$d persona</item>
+        <item quantity="other">%1$d personas</item>
     </plurals>
 
     <!-- conversation_activity -->
     <string name="conversation_activity__type_message_push">Mensaje de Signal</string>
-    <string name="conversation_activity__type_message_sms_insecure">SMS sin cifrado</string>
-    <string name="conversation_activity__type_message_mms_insecure">MMS sin cifrado</string>
+    <string name="conversation_activity__type_message_sms_insecure">SMS no seguro</string>
+    <string name="conversation_activity__type_message_mms_insecure">MMS no seguro</string>
     <!-- Option in send button context menu to schedule the message instead of sending it directly -->
     <string name="conversation_activity__sim_n">SIM %1$d</string>
     <string name="conversation_activity__send">Enviar</string>
     <string name="conversation_activity__compose_description">Redactar mensaje</string>
-    <string name="conversation_activity__emoji_toggle_description">Cambiar a teclado emoji</string>
-    <string name="conversation_activity__attachment_thumbnail">Miniatura del adjunto</string>
+    <string name="conversation_activity__emoji_toggle_description">Cambiar a teclado de emojis</string>
+    <string name="conversation_activity__attachment_thumbnail">Miniatura del archivo adjunto</string>
     <string name="conversation_activity__quick_attachment_drawer_toggle_camera_description">Activar panel rápido de la cámara</string>
-    <string name="conversation_activity__quick_attachment_drawer_record_and_send_audio_description">Grabar y enviar nota de voz</string>
-    <string name="conversation_activity__quick_attachment_drawer_lock_record_description">Fijar grabación para nota de voz larga</string>
-    <string name="conversation_activity__message_could_not_be_sent">No se ha podido enviar el mensaje. Comprueba tu conexión a internet e inténtalo de nuevo.</string>
+    <string name="conversation_activity__quick_attachment_drawer_record_and_send_audio_description">Grabar y enviar archivo de audio</string>
+    <string name="conversation_activity__quick_attachment_drawer_lock_record_description">Fijar grabación para archivo de audio</string>
+    <string name="conversation_activity__message_could_not_be_sent">No se ha podido enviar el mensaje. Comprueba tu conexión e inténtalo de nuevo.</string>
 
     <!-- conversation_input_panel -->
     <string name="conversation_input_panel__slide_to_cancel">Desliza para cancelar</string>
@@ -2794,10 +2919,10 @@
 
     <!-- conversation_item -->
     <string name="conversation_item__mms_image_description">Mensaje multimedia</string>
-    <string name="conversation_item__secure_message_description">Mensaje cifrado</string>
+    <string name="conversation_item__secure_message_description">Mensaje seguro</string>
 
     <!-- conversation_item_sent -->
-    <string name="conversation_item_sent__send_failed_indicator_description">Fallo al enviar</string>
+    <string name="conversation_item_sent__send_failed_indicator_description">No se ha podido enviar</string>
     <string name="conversation_item_sent__pending_approval_description">Pendiente de aprobación</string>
     <string name="conversation_item_sent__delivered_description">Entregado</string>
     <string name="conversation_item_sent__message_read">Mensaje leído</string>
@@ -2807,21 +2932,21 @@
 
     <!-- ConversationUpdateItem -->
     <string name="ConversationUpdateItem_loading">Cargando</string>
-    <string name="ConversationUpdateItem_learn_more">Saber más</string>
+    <string name="ConversationUpdateItem_learn_more">Más información</string>
     <string name="ConversationUpdateItem_join_call">Unirse a la llamada</string>
     <!-- Action button label for starting a new call in the current conversation -->
     <string name="ConversationUpdateItem_call_back">Devolver llamada</string>
     <string name="ConversationUpdateItem_return_to_call">Volver a la llamada</string>
-    <string name="ConversationUpdateItem_call_is_full">La llamada está llena</string>
+    <string name="ConversationUpdateItem_call_is_full">La llamada está completa</string>
     <string name="ConversationUpdateItem_invite_friends">Invitar personas</string>
     <string name="ConversationUpdateItem_enable_call_notifications">Habilitar notificaciones de llamada</string>
     <string name="ConversationUpdateItem_update_contact">Actualizar contacto</string>
     <!-- Update item button text to show to block a recipient from requesting to join via group link -->
     <string name="ConversationUpdateItem_block_request">Vetar solicitud</string>
-    <string name="ConversationUpdateItem_no_groups_in_common_review_requests_carefully">Sin grupos en común. Revisar solicitud.</string>
-    <string name="ConversationUpdateItem_no_contacts_in_this_group_review_requests_carefully">Sin participantes conocid@s. Revisar solicitud.</string>
+    <string name="ConversationUpdateItem_no_groups_in_common_review_requests_carefully">No tienes grupos en común. Revisa las solicitudes detenidamente.</string>
+    <string name="ConversationUpdateItem_no_contacts_in_this_group_review_requests_carefully">Ninguno de los participantes de este grupo está en tus contactos. Revisa las solicitudes detenidamente.</string>
     <string name="ConversationUpdateItem_view">Ver</string>
-    <string name="ConversationUpdateItem_the_disappearing_message_time_will_be_set_to_s_when_you_message_them">El tiempo de desaparición de mensajes será de %1$s cuando inicies un chat con alguien.</string>
+    <string name="ConversationUpdateItem_the_disappearing_message_time_will_be_set_to_s_when_you_message_them">La duración de los mensajes temporales será de %1$s cuando inicies un chat con alguien.</string>
     <!-- Update item button text to show to boost a feature -->
     <string name="ConversationUpdateItem_donate">Donar</string>
     <!-- Update item button text to send payment -->
@@ -2832,9 +2957,11 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Has eliminado a esta persona, envíale un mensaje de nuevo y se la volverá a agregar a tu lista.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Opciones</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Actualizar</string>
 
     <!-- audio_view -->
-    <string name="audio_view__play_pause_accessibility_description">reproducir o pausar audio</string>
+    <string name="audio_view__play_pause_accessibility_description">Reproducir … Pausar</string>
     <string name="audio_view__download_accessibility_description">Descargar</string>
 
     <!-- QuoteView -->
@@ -2842,16 +2969,16 @@
     <string name="QuoteView_video">Vídeo</string>
     <string name="QuoteView_photo">Foto</string>
     <string name="QuoteView_gif">GIF</string>
-    <string name="QuoteView_view_once_media">Adjunto para ver una vez</string>
+    <string name="QuoteView_view_once_media">Archivo de visualización única</string>
     <string name="QuoteView_sticker">Sticker</string>
     <string name="QuoteView_you">Tú</string>
-    <string name="QuoteView_original_missing">No se encuentra el mensaje original</string>
+    <string name="QuoteView_original_missing">No se ha encontrado el mensaje original</string>
     <!-- Author formatting for group stories -->
     <string name="QuoteView_s_story">%1$s · Historia</string>
     <!-- Label indicating that a quote is for a reply to a story you created -->
     <string name="QuoteView_your_story">Tú · Historia</string>
     <!-- Label indicating that the story being replied to no longer exists -->
-    <string name="QuoteView_no_longer_available">Historia caducada</string>
+    <string name="QuoteView_no_longer_available">Ya no está disponible</string>
     <!-- Label for quoted gift -->
     <string name="QuoteView__donation_for_a_friend">Donación en nombre de un amigo</string>
 
@@ -2860,54 +2987,54 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Las burbujas son una función de Android que puedes activar o desactivar para chats de Signal.</string>
+    <string name="BubbleOptOutTooltip__description">Las burbujas son una función de Android que puedes activar o desactivar para chats de Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Ahora no</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
     <string name="BubbleOptOutTooltip__turn_off">Desactivar</string>
 
     <!-- safety_number_change_dialog -->
-    <string name="safety_number_change_dialog__safety_number_changes">Cambios en cifras de seguridad</string>
+    <string name="safety_number_change_dialog__safety_number_changes">Cambios en el número de seguridad</string>
     <string name="safety_number_change_dialog__accept">Aceptar</string>
     <string name="safety_number_change_dialog__call_anyway">Llamar de todas formas</string>
     <string name="safety_number_change_dialog__join_call">Unirse a la llamada</string>
     <string name="safety_number_change_dialog__continue_call">Continuar llamada</string>
     <string name="safety_number_change_dialog__leave_call">Abandonar llamada</string>
-    <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Las siguentes personas pueden haber reinstalado Signal o cambiado su dispositivo. Verifica tus cifras de seguridas con ellas para asegurar vuestra privacidad.</string>
+    <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Es posible que las siguientes personas hayan reinstalado Signal o cambiado su dispositivo. Verifica tu número de seguridad con ellas para asegurar vuestra privacidad.</string>
     <string name="safety_number_change_dialog__view">Ver</string>
     <!-- Subtitle shown for a single contact and that their safety number was previously verified and is now no longer verified. -->
-    <string name="safety_number_change_dialog__previous_verified">Identidad previamente verificada</string>
+    <string name="safety_number_change_dialog__previous_verified">Verificado anteriormente</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
-    <string name="EnableCallNotificationSettingsDialog__call_notifications_enabled">Notificaciones de llamada activas.</string>
+    <string name="EnableCallNotificationSettingsDialog__call_notifications_enabled">Notificaciones de llamada habilitadas.</string>
     <string name="EnableCallNotificationSettingsDialog__enable_call_notifications">Habilitar notificaciones de llamada</string>
-    <string name="EnableCallNotificationSettingsDialog__enable_background_activity">Activar actividad en segundo plano</string>
+    <string name="EnableCallNotificationSettingsDialog__enable_background_activity">Habilitar actividad en segundo plano</string>
     <string name="EnableCallNotificationSettingsDialog__everything_looks_good_now">¡Todo parece estar bien!</string>
     <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_here_and_turn_on_show_notifications">Para recibir notificaciones de llamadas, toca aquí y activa «Mostrar notificaciones».</string>
-    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_here_and_turn_on_notifications">Para recibir notificaciones de llamadas, toca aquí para activarlas y asegúrate que el sonido y las notificaciones emergentes estén habilitadas.</string>
+    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_here_and_turn_on_notifications">Para recibir notificaciones de llamadas, toca aquí para activarlas y asegúrate de que el sonido y las notificaciones emergentes estén habilitados.</string>
     <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_here_and_enable_background_activity_in_battery_settings">Para recibir notificaciones de llamadas, toca aquí y habilita la actividad en segundo plano en los ajustes de la «Batería». </string>
     <string name="EnableCallNotificationSettingsDialog__settings">Ajustes</string>
-    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_settings_and_turn_on_show_notifications">Para recibir notificaciones de llamadas, toca en «Ajustes» y activa «Mostrar notificaciones».</string>
-    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_settings_and_turn_on_notifications">Para recibir notificaciones de llamadas, toca en «Ajustes» para activarlas y asegúrate que el sonido y las notificaciones emergentes estén habilitadas.</string>
-    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_settings_and_enable_background_activity_in_battery_settings">Para recibir notificaciones de llamadas, toca en «Ajustes» y habilita la actividad en segundo plano en los ajustes de la «Batería».</string>
+    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_settings_and_turn_on_show_notifications">Para recibir notificaciones de llamadas, toca «Ajustes» y activa «Mostrar notificaciones».</string>
+    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_settings_and_turn_on_notifications">Para recibir notificaciones de llamadas, toca «Ajustes» para activarlas y asegúrate de que el sonido y las notificaciones emergentes estén habilitados.</string>
+    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_settings_and_enable_background_activity_in_battery_settings">Para recibir notificaciones de llamadas, toca «Ajustes» y habilita la actividad en segundo plano en los ajustes de la «Batería».</string>
 
     <!-- country_selection_fragment -->
-    <string name="country_selection_fragment__loading_countries">Cargando países …</string>
+    <string name="country_selection_fragment__loading_countries">Cargando países…</string>
     <string name="country_selection_fragment__search">Buscar</string>
-    <string name="country_selection_fragment__no_matching_countries">Sin resultado al buscar países</string>
+    <string name="country_selection_fragment__no_matching_countries">No hay países que coincidan</string>
 
     <!-- device_add_fragment -->
-    <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Escanea el código QR mostrado en el dispositivo a enlazar</string>
+    <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Escanea el código QR que se muestra en el dispositivo que quieres vincular</string>
 
     <!-- device_link_fragment -->
-    <string name="device_link_fragment__link_device">Enlazar dispositivo</string>
+    <string name="device_link_fragment__link_device">Vincular dispositivo</string>
 
     <!-- device_list_fragment -->
-    <string name="device_list_fragment__no_devices_linked">No hay dispositivos enlazados</string>
-    <string name="device_list_fragment__link_new_device">Enlazar nuevo dispositivo</string>
+    <string name="device_list_fragment__no_devices_linked">No hay dispositivos vinculados</string>
+    <string name="device_list_fragment__link_new_device">Vincular nuevo dispositivo</string>
 
     <!-- expiration -->
-    <string name="expiration_off">Inactivo</string>
+    <string name="expiration_off">Desactivado</string>
 
     <plurals name="expiration_seconds">
         <item quantity="one">%1$d segundo</item>
@@ -2921,7 +3048,7 @@
         <item quantity="other">%1$d minutos</item>
     </plurals>
 
-    <string name="expiration_minutes_abbreviated">%1$d m</string>
+    <string name="expiration_minutes_abbreviated">%1$d min</string>
 
     <plurals name="expiration_hours">
         <item quantity="one">%1$d hora</item>
@@ -2946,17 +3073,17 @@
     <string name="expiration_combined">%1$s %2$s</string>
 
     <!-- unverified safety numbers -->
-    <string name="IdentityUtil_unverified_banner_one">Tus cifras de seguridad con %1$s han cambiado y ya no están verificadas</string>
-    <string name="IdentityUtil_unverified_banner_two">Tus cifras de seguridad con %1$s y %2$s ya no están verificadas</string>
-    <string name="IdentityUtil_unverified_banner_many">Tus cifras de seguridad con %1$s, %2$s, y %3$s ya no están verificadas</string>
+    <string name="IdentityUtil_unverified_banner_one">Tu número de seguridad con %1$s ha cambiado y ya no está verificado</string>
+    <string name="IdentityUtil_unverified_banner_two">Tus números de seguridad con %1$s y %2$s ya no están verificados</string>
+    <string name="IdentityUtil_unverified_banner_many">Tus números de seguridad con %1$s, %2$s y %3$s ya no están verificados</string>
 
-    <string name="IdentityUtil_unverified_dialog_one">Tu cifras de seguridad con %1$s han cambiado y ya no están verificadas. Esto podría significar que alguien está tratando de interceptar la comunicación, o simplemente que %1$s ha reinstalado Signal.</string>
-    <string name="IdentityUtil_unverified_dialog_two">Tus cifras de seguridad con %1$s y %2$s ya no están verificadas. Esto podría significar que alguien está tratando de interceptar la comunicación, o simplemente que han reinstalado Signal.</string>
-    <string name="IdentityUtil_unverified_dialog_many">Tus cifras de seguridad con %1$s, %2$s, y %3$s ya no están verificadas. Esto podría significar que alguien está tratando de interceptar la comunicación, o simplemente que han reinstalado Signal.</string>
+    <string name="IdentityUtil_unverified_dialog_one">Tu número de seguridad con %1$s ha cambiado y ya no está verificado. Podría deberse a que alguien está tratando de interceptar la comunicación o, simplemente, que %1$s ha reinstalado Signal.</string>
+    <string name="IdentityUtil_unverified_dialog_two">Tus números de seguridad con %1$s y %2$s ya no están verificados. Podría deberse a que alguien está tratando de interceptar la comunicación o, simplemente, que han reinstalado Signal.</string>
+    <string name="IdentityUtil_unverified_dialog_many">Tus números de seguridad con %1$s, %2$s y %3$s ya no están verificados. Podría deberse a que alguien está tratando de interceptar la comunicación o, simplemente, que han reinstalado Signal.</string>
 
-    <string name="IdentityUtil_untrusted_dialog_one">Tus cifras de seguridad con %1$s acaban de cambiar.</string>
-    <string name="IdentityUtil_untrusted_dialog_two">Tus cifras de seguridad con %1$s y %2$s acaban de cambiar.</string>
-    <string name="IdentityUtil_untrusted_dialog_many">Tus cifras de seguridad con %1$s, %2$s, y %3$s acaban de cambiar.</string>
+    <string name="IdentityUtil_untrusted_dialog_one">Tu número de seguridad con %1$s acaba de cambiar.</string>
+    <string name="IdentityUtil_untrusted_dialog_two">Tus números de seguridad con %1$s y %2$s acaban de cambiar.</string>
+    <string name="IdentityUtil_untrusted_dialog_many">Tus números de seguridad con %1$s, %2$s y %3$s acaban de cambiar.</string>
 
     <plurals name="identity_others">
         <item quantity="one">%1$d persona más</item>
@@ -2964,23 +3091,23 @@
     </plurals>
 
     <!-- giphy_activity -->
-    <string name="giphy_activity_toolbar__search_gifs">Buscar GIFs</string>
+    <string name="giphy_activity_toolbar__search_gifs">Buscar GIF</string>
 
     <!-- giphy_fragment -->
-    <string name="giphy_fragment__nothing_found">No se encontró nada</string>
+    <string name="giphy_fragment__nothing_found">No se ha encontrado nada</string>
 
     <!-- load_more_header -->
     <string name="load_more_header__loading">Cargando</string>
 
     <!-- media_overview_activity -->
-    <string name="media_overview_activity__no_media">No hay adjuntos</string>
+    <string name="media_overview_activity__no_media">No hay archivos multimedia</string>
 
     <!-- message_recipients_list_item -->
     <string name="message_recipients_list_item__view">Ver</string>
     <string name="message_recipients_list_item__resend">Reenviar</string>
 
     <!-- Displayed in a toast when user long presses an item in MyStories -->
-    <string name="MyStoriesFragment__copied_sent_timestamp_to_clipboard">Tiempo de envío copiado al portapapeles.</string>
+    <string name="MyStoriesFragment__copied_sent_timestamp_to_clipboard">La marca de tiempo de envío se ha copiado al portapapeles.</string>
     <!-- Displayed when there are no outgoing stories -->
     <string name="MyStoriesFragment__updates_to_your_story_will_show_up_here">Las actualizaciones de tu historia se mostrarán aquí.</string>
 
@@ -2995,8 +3122,8 @@
     <string name="prompt_passphrase_activity__unlock">Desbloquear</string>
 
     <!-- prompt_mms_activity -->
-    <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">Signal necesita una configuración de MMS válida para enviar los mensajes multimedia y de grupo a través del proveedor móvil. Tu dispositivo no proporciona esta información, algo que ocasionalmente ocurre con dispositivos bloqueados y otras configuraciones restrictivas.</string>
-    <string name="prompt_mms_activity__to_send_media_and_group_messages_tap_ok">Para enviar mensajes multimedia y de grupo, toca «Aceptar» y completa las configuraciones solicitadas. Las configuraciones de MMS para tu proveedor generalmente se pueden localizar buscando por «APN de proveedor». Solo necesitarás hacer esto una vez.</string>
+    <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">Signal necesita una configuración de MMS válida para enviar mensajes multimedia y de grupo a través del operador de servicios inalámbricos. Tu dispositivo no proporciona esta información, algo que ocasionalmente ocurre con dispositivos bloqueados y otras configuraciones restrictivas.</string>
+    <string name="prompt_mms_activity__to_send_media_and_group_messages_tap_ok">Para enviar mensajes multimedia y de grupo, toca «Aceptar» y completa la configuración solicitada. Por lo general, se puede buscar por «APN del operador» para localizar la configuración de MMS para el operador. Solo necesitarás hacer esto una vez.</string>
 
     <!-- BadDecryptLearnMoreDialog -->
     <string name="BadDecryptLearnMoreDialog_delivery_issue">Fallo en la entrega</string>
@@ -3004,51 +3131,51 @@
     <string name="BadDecryptLearnMoreDialog_couldnt_be_delivered_group">No se ha podido recibir un mensaje, sticker, reacción o notificación de lectura de %1$s.</string>
 
     <!-- profile_create_activity -->
-    <string name="CreateProfileActivity_first_name_required">Nombre (necesario)</string>
-    <string name="CreateProfileActivity_last_name_optional">Apellido(s) (opcional)</string>
+    <string name="CreateProfileActivity_first_name_required">Nombre (obligatorio)</string>
+    <string name="CreateProfileActivity_last_name_optional">Apellido (opcional)</string>
     <string name="CreateProfileActivity_next">Siguiente</string>
-    <string name="CreateProfileActivity_custom_mms_group_names_and_photos_will_only_be_visible_to_you">Los nombres e imágenes de grupos MMS solo son visibles para ti.</string>
-    <string name="CreateProfileActivity_group_descriptions_will_be_visible_to_members_of_this_group_and_people_who_have_been_invited">La descripción del grupo será visible para participantes en este grupo y gente que ha sido invitada.</string>
+    <string name="CreateProfileActivity_custom_mms_group_names_and_photos_will_only_be_visible_to_you">Los nombres e imágenes de grupos MMS solo serán visibles para ti.</string>
+    <string name="CreateProfileActivity_group_descriptions_will_be_visible_to_members_of_this_group_and_people_who_have_been_invited">La descripción del grupo será visible para personas que formen parte de este grupo y que hayan sido invitadas.</string>
 
     <!-- EditAboutFragment -->
-    <string name="EditAboutFragment_about">Biografía</string>
-    <string name="EditAboutFragment_write_a_few_words_about_yourself">Escribe unas pocas palabras sobre ti …</string>
+    <string name="EditAboutFragment_about">Sobre mí</string>
+    <string name="EditAboutFragment_write_a_few_words_about_yourself">Escribe algunas palabras sobre ti…</string>
     <string name="EditAboutFragment_count">%1$d/%2$d</string>
     <string name="EditAboutFragment_speak_freely">Habla con libertad</string>
     <string name="EditAboutFragment_encrypted">Cifrado</string>
     <string name="EditAboutFragment_be_kind">Sé amable</string>
     <string name="EditAboutFragment_coffee_lover">Amante del café</string>
     <string name="EditAboutFragment_free_to_chat">Libre para chatear</string>
-    <string name="EditAboutFragment_taking_a_break">Tomando un descanso</string>
+    <string name="EditAboutFragment_taking_a_break">Tomándome un descanso</string>
     <string name="EditAboutFragment_working_on_something_new">Trabajando en cosas nuevas</string>
 
     <!-- EditProfileFragment -->
-    <string name="EditProfileFragment__edit_group">Modificar grupo</string>
+    <string name="EditProfileFragment__edit_group">Editar grupo</string>
     <string name="EditProfileFragment__group_name">Nombre del grupo</string>
     <string name="EditProfileFragment__group_description">Descripción del grupo</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Actualiza Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Actualiza Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Esta versión de Signal ha caducado. Actualízala ahora para continuar usando Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Esta versión de Molly ha caducado. Actualízala ahora para continuar usando Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Actualizar</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
     <string name="EditProfileFragment_unregistered_dialog_title">Dispositivo no registrado</string>
     <!-- The body of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
-    <string name="EditProfileFragment_unregistered_dialog_body">Este dispositivo ya no está registrado. Vuelve a registrarte para realizar cambios en tu cuenta.</string>
+    <string name="EditProfileFragment_unregistered_dialog_body">Este dispositivo ya no está registrado. Vuelve a registrarte para hacer cambios en tu cuenta.</string>
     <!-- The button on a dialog informing the user that they cannot use this app feature when they are unregistered. When clicked, the user will be taken to a screen to help them re-register. -->
     <string name="EditProfileFragment_unregistered_dialog_reregister_button">Registrarse de nuevo</string>
 
     <!-- EditProfileNameFragment -->
     <string name="EditProfileNameFragment_your_name">Tu nombre</string>
     <string name="EditProfileNameFragment_first_name">Nombre</string>
-    <string name="EditProfileNameFragment_last_name_optional">Apellido(s) (opcional)</string>
+    <string name="EditProfileNameFragment_last_name_optional">Apellido (opcional)</string>
     <string name="EditProfileNameFragment_save">Guardar</string>
-    <string name="EditProfileNameFragment_failed_to_save_due_to_network_issues_try_again_later">Fallo al guardar debido a problemas de red. Vuelve a intentarlo más tarde.</string>
+    <string name="EditProfileNameFragment_failed_to_save_due_to_network_issues_try_again_later">No se ha podido guardar debido a problemas de red. Inténtalo de nuevo más tarde.</string>
 
     <!-- recipient_preferences_activity -->
-    <string name="recipient_preference_activity__shared_media">Adjuntos compartidos</string>
+    <string name="recipient_preference_activity__shared_media">Archivos compartidos</string>
 
     <!-- recipients_panel -->
 
@@ -3056,30 +3183,30 @@
     <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
     <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">Para verificar el cifrado con %1$s, compara las cifras de arriba con las del dispositivo de esa persona. También puedes escanear el código de su dispositivo.</string>
     <string name="verify_display_fragment__tap_to_scan">Toca para escanear</string>
-    <string name="verify_display_fragment__successful_match">Las cifras coinciden</string>
-    <string name="verify_display_fragment__failed_to_verify_safety_number">Fallo al verificar las cifras de seguridad</string>
-    <string name="verify_display_fragment__loading">Cargando …</string>
+    <string name="verify_display_fragment__successful_match">Los números coinciden</string>
+    <string name="verify_display_fragment__failed_to_verify_safety_number">No se ha podido verificar el número de seguridad</string>
+    <string name="verify_display_fragment__loading">Cargando…</string>
     <string name="verify_display_fragment__mark_as_verified">Marcar persona como verificada</string>
     <string name="verify_display_fragment__clear_verification">Retirar marca de verificación</string>
 
     <!-- verity_scan_fragment -->
-    <string name="verify_scan_fragment__scan_the_qr_code_on_your_contact">Escanea el código QR mostrado en el dispositivo de tu contacto.</string>
+    <string name="verify_scan_fragment__scan_the_qr_code_on_your_contact">Escanea el código QR que se muestra en el dispositivo de tu contacto.</string>
 
     <!-- webrtc_answer_decline_button -->
     <string name="webrtc_answer_decline_button__swipe_up_to_answer">Desliza hacia arriba para atender</string>
     <string name="webrtc_answer_decline_button__swipe_down_to_reject">Desliza hacia abajo para rechazar</string>
 
     <!-- message_details_header -->
-    <string name="message_details_header__issues_need_your_attention">Hay un problema que necesita tu atención.</string>
-    <string name="message_details_header_sent">Enviados</string>
-    <string name="message_details_header_received">Recibidos</string>
-    <string name="message_details_header_disappears">Desaparición de mensajes</string>
-    <string name="message_details_header_via">Vía</string>
+    <string name="message_details_header__issues_need_your_attention">Hay un problema que requiere tu atención.</string>
+    <string name="message_details_header_sent">Enviado</string>
+    <string name="message_details_header_received">Recibido</string>
+    <string name="message_details_header_disappears">Mensaje temporal</string>
+    <string name="message_details_header_via">Por</string>
 
     <!-- message_details_recipient_header -->
     <string name="message_details_recipient_header__pending_send">Pendiente</string>
     <string name="message_details_recipient_header__sent_to">Enviado a</string>
-    <string name="message_details_recipient_header__sent_from">Recibido de</string>
+    <string name="message_details_recipient_header__sent_from">Enviado desde</string>
     <string name="message_details_recipient_header__delivered_to">Entregado a</string>
     <string name="message_details_recipient_header__read_by">Leído por</string>
     <string name="message_details_recipient_header__not_sent">No enviado</string>
@@ -3087,8 +3214,8 @@
     <string name="message_details_recipient_header__skipped">Omitido</string>
 
     <!-- message_Details_recipient -->
-    <string name="message_details_recipient__failed_to_send">Fallo al enviar</string>
-    <string name="message_details_recipient__new_safety_number">Nuevas cifras de seguridad</string>
+    <string name="message_details_recipient__failed_to_send">No se ha podido enviar</string>
+    <string name="message_details_recipient__new_safety_number">Nuevo número de seguridad</string>
     <!-- Button text shown in message details when the message has an edit history and this will let them view the history -->
     <string name="MessageDetails__view_edit_history">Ver historial de ediciones</string>
 
@@ -3096,21 +3223,21 @@
     <string name="AndroidManifest__create_passphrase">Crear clave de acceso</string>
     <string name="AndroidManifest__select_contacts">Seleccionar contactos</string>
     <string name="AndroidManifest__change_passphrase">Cambiar clave de acceso</string>
-    <string name="AndroidManifest__verify_safety_number">Verificar cifras de seguridad</string>
-    <string name="AndroidManifest__media_preview">Previsualizar adjunto</string>
+    <string name="AndroidManifest__verify_safety_number">Verificar número de seguridad</string>
+    <string name="AndroidManifest__media_preview">Previsualizar archivo</string>
     <string name="AndroidManifest__message_details">Detalles del mensaje</string>
-    <string name="AndroidManifest__linked_devices">Dispositivos enlazados</string>
+    <string name="AndroidManifest__linked_devices">Dispositivos vinculados</string>
     <string name="AndroidManifest__invite_friends">Invitar personas</string>
     <string name="AndroidManifest_archived_conversations">Chats archivados</string>
 
     <!-- HelpFragment -->
-    <string name="HelpFragment__have_you_read_our_faq_yet">¿Ya has leído nuestras FAQ?</string>
+    <string name="HelpFragment__have_you_read_our_faq_yet">¿Ya has leído nuestra sección de preguntas frecuentes?</string>
     <string name="HelpFragment__next">Siguiente</string>
-    <string name="HelpFragment__contact_us">Contáctanos</string>
-    <string name="HelpFragment__tell_us_whats_going_on">Cuéntanos que pasa</string>
-    <string name="HelpFragment__include_debug_log">Incluir registro de depuración</string>
+    <string name="HelpFragment__contact_us">Contacta con nosotros</string>
+    <string name="HelpFragment__tell_us_whats_going_on">Cuéntanos qué pasa</string>
+    <string name="HelpFragment__include_debug_log">Incluir registro de depuración.</string>
     <string name="HelpFragment__whats_this">¿Qué es esto?</string>
-    <string name="HelpFragment__how_do_you_feel">¿Cómo te sientes? (Opcional)</string>
+    <string name="HelpFragment__how_do_you_feel">¿Cómo te sientes? (opcional)</string>
     <string name="HelpFragment__tell_us_why_youre_reaching_out">Cuéntanos qué pasa.</string>
   <!-- Removed by excludeNonTranslatables <string name="HelpFragment__emoji_5" translatable="false">emoji_5</string> -->
   <!-- Removed by excludeNonTranslatables <string name="HelpFragment__emoji_4" translatable="false">emoji_4</string> -->
@@ -3119,13 +3246,13 @@
   <!-- Removed by excludeNonTranslatables <string name="HelpFragment__emoji_1" translatable="false">emoji_1</string> -->
   <!-- Removed by excludeNonTranslatables <string name="HelpFragment__link__debug_info" translatable="false">https://support.signal.org/hc/articles/360007318591</string> -->
   <!-- Removed by excludeNonTranslatables <string name="HelpFragment__link__faq" translatable="false">https://support.signal.org</string> -->
-    <string name="HelpFragment__support_info">Información de soporte</string>
-    <string name="HelpFragment__signal_android_support_request">Petición de soporte Signal Android</string>
+    <string name="HelpFragment__support_info">Información de asistencia</string>
+    <string name="HelpFragment__signal_android_support_request">Solicitud de asistencia de Signal Android</string>
   <!-- Removed by excludeNonTranslatables <string name="HelpFragment__debug_log" translatable="false">Debug Log:</string> -->
-    <string name="HelpFragment__could_not_upload_logs">Imposible transmitir logs</string>
-    <string name="HelpFragment__please_be_as_descriptive_as_possible">Por favor, sé lo más descriptivo posible para ayudarnos a entender la incidencia.</string>
+    <string name="HelpFragment__could_not_upload_logs">No se han podido cargar los registros</string>
+    <string name="HelpFragment__please_be_as_descriptive_as_possible">Describe el problema detalladamente para ayudarnos a entender la incidencia.</string>
     <string-array name="HelpFragment__categories_5">
-        <item>Por favor, selecciona una opción</item>
+        <item>Selecciona una opción</item>
         <item>Algo no está funcionando</item>
         <item>Solicitud de función</item>
         <item>Pregunta</item>
@@ -3167,7 +3294,7 @@
     <string name="arrays__mute_for_eight_hours">Durante 8 horas</string>
     <string name="arrays__mute_for_one_day">Durante un día</string>
     <string name="arrays__mute_for_seven_days">Durante 7 días</string>
-    <string name="arrays__always">Para siempre</string>
+    <string name="arrays__always">Siempre</string>
 
     <string name="arrays__settings_default">Ajustes predeterminados</string>
     <string name="arrays__enabled">Activado</string>
@@ -3182,38 +3309,38 @@
     <string name="arrays__video">Vídeo</string>
     <string name="arrays__documents">Documentos</string>
 
-    <string name="arrays__small">Pequeña</string>
+    <string name="arrays__small">Pequeño</string>
     <string name="arrays__normal">Normal</string>
     <string name="arrays__large">Grande</string>
-    <string name="arrays__extra_large">Extra grande</string>
+    <string name="arrays__extra_large">Muy grande</string>
 
-    <string name="arrays__default">Por defecto</string>
+    <string name="arrays__default">Predeterminado</string>
     <string name="arrays__high">Alta</string>
     <!-- Setting title that represent an abstract priority to assign to notifications as the max/highest priority a notification can be within the system. -->
     <string name="arrays__max">Máxima</string>
 
     <!-- plurals.xml -->
     <plurals name="hours_ago">
-        <item quantity="one">%1$dh</item>
-        <item quantity="other">%1$dh</item>
+        <item quantity="one">%1$d h</item>
+        <item quantity="other">%1$d h</item>
     </plurals>
 
     <!-- preferences.xml -->
     <string name="preferences_beta">Beta</string>
     <string name="preferences__sms_mms">SMS y MMS</string>
-    <string name="preferences__pref_use_address_book_photos">Usar fotos de la libreta de contactos de Android</string>
-    <string name="preferences__display_contact_photos_from_your_address_book_if_available">Mostrar fotos de la libreta de contactos de Android, si están disponibles</string>
+    <string name="preferences__pref_use_address_book_photos">Usar fotos de la libreta de contactos</string>
+    <string name="preferences__display_contact_photos_from_your_address_book_if_available">Mostrar fotos de la libreta de contactos (si están disponibles)</string>
     <!-- Preference menu item title for a toggle switch for preserving the archived state of muted chats. -->
     <string name="preferences__pref_keep_muted_chats_archived">Dejar archivados los chats silenciados</string>
     <!-- Preference menu item description for a toggle switch for preserving the archived state of muted chats. -->
     <string name="preferences__muted_chats_that_are_archived_will_remain_archived">Los chats silenciados archivados permanecerán archivados aunque recibas un nuevo mensaje.</string>
     <string name="preferences__generate_link_previews">Generar vista previa de enlaces</string>
-    <string name="preferences__retrieve_link_previews_from_websites_for_messages">Esta opción trasmite la vista previa de los enlaces en los mensajes que envíes. La imagen de la vista previa se descarga directamente desde la página web correspondiente generando una visita (adicional) a esa página web desde tu dispositivo.</string>
+    <string name="preferences__retrieve_link_previews_from_websites_for_messages">Esta opción muestra la vista previa de los enlaces en los mensajes que envíes. La imagen de la vista previa se descarga directamente desde la página web correspondiente.</string>
     <string name="preferences__change_passphrase">Cambiar clave de acceso</string>
     <string name="preferences__change_your_passphrase">Cambia tu clave de acceso</string>
-    <string name="preferences__enable_passphrase">Activa bloqueo de pantalla con clave de acceso</string>
-    <string name="preferences__lock_signal_and_message_notifications_with_a_passphrase">Bloquea la pantalla y notificaciones con una clave de acceso</string>
-    <string name="preferences__screen_security">Seguridad de pantalla</string>
+    <string name="preferences__enable_passphrase">Activar bloqueo de pantalla con clave de acceso</string>
+    <string name="preferences__lock_signal_and_message_notifications_with_a_passphrase">Bloquea la pantalla y las notificaciones con una clave de acceso</string>
+    <string name="preferences__screen_security">Seguridad de la pantalla</string>
     <string name="preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity">Bloquea automáticamente Signal tras un intervalo de inactividad especificado</string>
     <string name="preferences__inactivity_timeout_passphrase">Clave de acceso por inactividad</string>
     <string name="preferences__inactivity_timeout_interval">Intervalo para suspensión por inactividad</string>
@@ -3225,7 +3352,7 @@
     <string name="preferences__change_sound_and_vibration">Cambiar sonido y vibración</string>
     <string name="preferences__sound">Sonido</string>
     <string name="preferences__silent">Silenciar</string>
-    <string name="preferences__default">Por defecto</string>
+    <string name="preferences__default">Predeterminado</string>
     <string name="preferences__repeat_alerts">Repetir alertas</string>
     <string name="preferences__never">Nunca</string>
     <string name="preferences__one_time">Una vez</string>
@@ -3238,7 +3365,7 @@
     <string name="preferences__red">Rojo</string>
     <string name="preferences__blue">Azul</string>
     <string name="preferences__orange">Naranja</string>
-    <string name="preferences__cyan">Turquesa</string>
+    <string name="preferences__cyan">Cian</string>
     <string name="preferences__magenta">Magenta</string>
     <string name="preferences__white">Blanco</string>
     <string name="preferences__none">Ninguno</string>
@@ -3247,12 +3374,12 @@
     <string name="preferences__slow">Lento</string>
     <string name="preferences__help">Ayuda</string>
     <string name="preferences__advanced">Avanzado</string>
-    <string name="preferences__donate_to_signal">Donar a Signal</string>
+    <string name="preferences__donate_to_signal">Donar a Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Privacidad</string>
     <!-- Preference label for stories -->
     <string name="preferences__stories">Historias</string>
-    <string name="preferences__mms_user_agent">Agente de usuari@ de MMS</string>
+    <string name="preferences__mms_user_agent">Agente de usuario de MMS</string>
     <string name="preferences__advanced_mms_access_point_names">Configuración manual de MMS</string>
     <string name="preferences__mmsc_url">URL de MMSC</string>
     <string name="preferences__mms_proxy_host">Proxy MMS</string>
@@ -3265,11 +3392,11 @@
     <string name="preferences__storage">Almacenamiento</string>
     <string name="preferences__payments">Pagos</string>
     <!-- Privacy settings payments section description -->
-    <string name="preferences__payment_lock">Bloqueo de pago</string>
+    <string name="preferences__payment_lock">Bloqueo de pagos</string>
     <string name="preferences__conversation_length_limit">Límite de longitud de chat</string>
-    <string name="preferences__keep_messages">Preservar mensajes</string>
+    <string name="preferences__keep_messages">Conservar mensajes</string>
     <string name="preferences__clear_message_history">Eliminar historial de mensajes</string>
-    <string name="preferences__linked_devices">Dispositivos enlazados</string>
+    <string name="preferences__linked_devices">Dispositivos vinculados</string>
     <string name="preferences__light_theme">Claro</string>
     <string name="preferences__dark_theme">Oscuro</string>
     <string name="preferences__appearance">Apariencia</string>
@@ -3284,42 +3411,42 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Cambiar el icono y el nombre de la app a \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal deberá cerrarse para cambiar el icono y el nombre de la app. Las notificaciones siempre mostrarán el icono y el nombre predeterminados de Signal.</string>
+    <string name="preferences__app_icon_dialog_description">Molly deberá cerrarse para cambiar el icono y el nombre de la app. Las notificaciones siempre mostrarán el icono y el nombre predeterminados de Molly.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Selecciona un icono y un nombre para la app, que serán visibles en la pantalla de inicio y en el menú de aplicaciones de tu teléfono. Las notificaciones siempre mostrarán el icono y el nombre predeterminados de Signal. Saber más</string>
+    <string name="preferences__app_icon_warning_learn_more">Selecciona un icono y un nombre para la app, que serán visibles en la pantalla de inicio y en el menú de aplicaciones de tu teléfono. Las notificaciones siempre mostrarán el icono y el nombre predeterminados de Molly. Saber más</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Los iconos y nombres de las apps son visibles en la pantalla de inicio y en el menú de aplicaciones.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Las notificaciones siempre mostrarán el icono y el nombre predeterminados de Signal.</string>
+    <string name="preferences__app_icon_notification_warning">Las notificaciones siempre mostrarán el icono y el nombre predeterminados de Molly.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Saber más</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
     <string name="preferences__graphic_illustrating_where_the_replacement_app_icon_will_be_visible">Gráfico que ilustra dónde será visible el icono alternativo para la app.</string>
     <string name="preferences__disable_pin">Desactivar PIN</string>
     <string name="preferences__enable_pin">Activar PIN</string>
-    <string name="preferences__if_you_disable_the_pin_you_will_lose_all_data">Al desactivar el PIN perderás todos los datos de tu cuenta al volver a instalar Signal, a menos que hagas una copia de seguridad manual y la restaures. No puedes activar el bloqueo de registro mientras el PIN esté desactivado.</string>
-    <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">El PIN permite activar el bloqueo de registro de tu número y almacena tu cuenta cifrada en el servidor de Signal de forma que solo tú puedes acceder a ella. Ni siquiera la gente de Signal tiene acceso. Con el PIN, tu perfil, contactos, grupos y personas bloqueadas se recuperarán al reinstalar Signal. No necesitas el PIN para abrir la aplicación.</string>
+    <string name="preferences__if_you_disable_the_pin_you_will_lose_all_data">Si desactivas el PIN, perderás todos los datos de tu cuenta al volver a instalar Signal, a menos que hagas una copia de seguridad manual y la restaures. No puedes activar el bloqueo de registro mientras el PIN esté desactivado.</string>
+    <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">El PIN permite almacenar la información de tu cuenta cifrada en el servidor de Signal de forma que solo tú puedes acceder a ella. Tu perfil, tus ajustes y tus contactos se recuperarán al reinstalar Signal. No necesitarás el PIN para abrir la aplicación.</string>
     <string name="preferences__system_default">Predeterminado del sistema</string>
     <string name="preferences__language">Idioma</string>
     <string name="preferences__signal_messages_and_calls">Mensajes y llamadas de Signal</string>
     <string name="preferences__advanced_pin_settings">Ajustes avanzados del PIN</string>
-    <string name="preferences__free_private_messages_and_calls">Llamadas y mensajes cifrados a través de Signal ¡gratis!</string>
+    <string name="preferences__free_private_messages_and_calls">Llamadas y mensajes confidenciales y gratuitos a través de Signal</string>
     <string name="preferences__submit_debug_log">Enviar registro de depuración</string>
     <string name="preferences__delete_account">Eliminar cuenta</string>
     <string name="preferences__support_wifi_calling">Modo de compatibilidad «Llamada por Wi-Fi»</string>
-    <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Actívalo si tu dispositivo utiliza entrega de SMS/MMS vía Wi-Fi (actívalo solo cuando «Llamada por Wi-Fi» esté activada en el dispositivo)</string>
+    <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Activa esta opción si tu dispositivo utiliza entrega de SMS/MMS por Wi-Fi (actívala solo cuando la opción «Llamada por Wi-Fi» esté activada en tu dispositivo)</string>
     <string name="preferences__incognito_keyboard">Teclado en modo incógnito</string>
-    <string name="preferences__read_receipts">Notificaciones de lectura</string>
-    <string name="preferences__if_read_receipts_are_disabled_you_wont_be_able_to_see_read_receipts">Si las notificaciones de lectura están desactivadas, no podrás comprobar cuándo se han leído tus mensajes.</string>
-    <string name="preferences__typing_indicators">Indicadores de tecleo</string>
-    <string name="preferences__if_typing_indicators_are_disabled_you_wont_be_able_to_see_typing_indicators">Si desactivas los indicadores de tecleo, no podrás ver cuándo otr@s participantes están tecleando.</string>
+    <string name="preferences__read_receipts">Confirmaciones de lectura</string>
+    <string name="preferences__if_read_receipts_are_disabled_you_wont_be_able_to_see_read_receipts">Si las confirmaciones de lectura están desactivadas, no podrás comprobar cuándo se han leído tus mensajes.</string>
+    <string name="preferences__typing_indicators">Indicadores de escritura</string>
+    <string name="preferences__if_typing_indicators_are_disabled_you_wont_be_able_to_see_typing_indicators">Si desactivas los indicadores de escritura, no podrás ver cuándo otros participantes están escribiendo.</string>
     <string name="preferences__request_keyboard_to_disable">Solicitar al teclado deshabilitar el aprendizaje personalizado.</string>
-    <string name="preferences__this_setting_is_not_a_guarantee">Activar esta opción no garantiza que tu teclado no analice tus mensajes.</string>
+    <string name="preferences__this_setting_is_not_a_guarantee">Aunque actives esta opción, es posible que tu teclado la ignore.</string>
   <!-- Removed by excludeNonTranslatables <string name="preferences__incognito_keyboard_learn_more" translatable="false">https://support.signal.org/hc/articles/360055276112</string> -->
     <string name="preferences_chats__when_using_mobile_data">Al usar datos móviles</string>
     <string name="preferences_chats__when_using_wifi">Al usar Wi-Fi</string>
-    <string name="preferences_chats__when_roaming">En itinerancia (roaming)</string>
-    <string name="preferences_chats__media_auto_download">Descarga automática de adjuntos</string>
+    <string name="preferences_chats__when_roaming">En itinerancia</string>
+    <string name="preferences_chats__media_auto_download">Descarga automática de archivos</string>
     <string name="preferences_chats__message_history">Historial de mensajes</string>
     <string name="preferences_storage__storage_usage">Uso de almacenamiento</string>
     <string name="preferences_storage__photos">Fotos</string>
@@ -3329,7 +3456,7 @@
     <string name="preferences_storage__review_storage">Comprobar almacenamiento</string>
     <string name="preferences_storage__delete_older_messages">¿Eliminar mensajes antiguos?</string>
     <!-- Dialog title shown when selecting delete message history from manage storage -->
-    <string name="preferences_storage__delete_message_history">¿Eliminar el historial de mensajes?</string>
+    <string name="preferences_storage__delete_message_history">¿Eliminar historial de mensajes?</string>
     <string name="preferences_storage__this_will_permanently_delete_all_message_history_and_media">Esto eliminará permanentemente todos los mensajes y adjuntos de este dispositivo con más antigüedad de %1$s.</string>
     <!-- The body of an alert dialog that is shown when confirming a trim operation. Trimming will delete all but the most recent messages in a chat. The placeholder represents how many messages are kept in each chat. All older messages are deleted. -->
     <plurals name="preferences_storage__this_will_permanently_trim_all_conversations_to_the_d_most_recent_messages">
@@ -3337,8 +3464,12 @@
         <item quantity="other">Esto recortará permanentemente todos los chats y mantendrá los %1$s mensajes más recientes.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Esto eliminará permanentemente todos los mensajes y adjuntos de este dispositivo.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Esto eliminará permanentemente todo el historial de mensajes y archivos multimedia de este dispositivo y de cualquier dispositivo vinculado.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">¿Estás segurx de que deseas eliminar todo tu historial de mensajes?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">El historial completo de mensajes se eliminará permanentemente. Esta acción no se puede deshacer.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">El historial completo de mensajes se eliminará permanentemente de todos tus dispositivos. Esta acción no se puede deshacer.</string>
     <string name="preferences_storage__delete_all_now">Borrar todos ahora</string>
     <string name="preferences_storage__forever">Siempre</string>
     <string name="preferences_storage__one_year">1 año</string>
@@ -3351,8 +3482,8 @@
     </plurals>
 
     <string name="preferences_storage__custom">Personalizado</string>
-    <string name="preferences_advanced__use_system_emoji">Usar emoji del sistema</string>
-    <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Redirige todas las llamadas a través del servidor de Signal para evitar revelar tu dirección IP. Activar la opción reducirá la calidad de las llamadas.</string>
+    <string name="preferences_advanced__use_system_emoji">Usar emojis del sistema</string>
+    <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Redirige todas las llamadas a través del servidor de Signal para evitar revelar tu dirección IP. Activar esta opción reducirá la calidad de las llamadas.</string>
     <string name="preferences_advanced__always_relay_calls">Redirigir llamadas siempre</string>
     <!-- Privacy settings payments section title -->
     <string name="preferences_app_protection__payments">Pagos</string>
@@ -3361,9 +3492,9 @@
     <string name="preferences_data_and_storage__manage_storage">Gestionar almacenamiento</string>
     <string name="preferences_data_and_storage__use_less_data_for_calls">Ahorrar datos en llamadas</string>
     <string name="preferences_data_and_storage__never">Nunca</string>
-    <string name="preferences_data_and_storage__wifi_and_mobile_data">WiFi y red móvil</string>
-    <string name="preferences_data_and_storage__mobile_data_only">Solo red móvil</string>
-    <string name="preference_data_and_storage__using_less_data_may_improve_calls_on_bad_networks">Al ahorrar datos, mejora la calidad de las llamadas en redes móviles con mala cobertura</string>
+    <string name="preferences_data_and_storage__wifi_and_mobile_data">Wi-Fi y datos móviles</string>
+    <string name="preferences_data_and_storage__mobile_data_only">Solo datos móviles</string>
+    <string name="preference_data_and_storage__using_less_data_may_improve_calls_on_bad_networks">Ahorrar datos puede mejorar la calidad de las llamadas en redes con mala cobertura</string>
     <string name="preferences_notifications__in_chat_sounds">Sonidos en el chat</string>
     <string name="preferences_notifications__show">Mostrar</string>
     <string name="preferences_notifications__ringtone">Tono de llamada</string>
@@ -3375,33 +3506,33 @@
     <string name="preferences_communication__category_censorship_circumvention">Evitar censura</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Evitar censura</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Al activar la opción, Signal intentará enviar mensajes evitando la censura. Activa la opción solo si te encuentras en un país que bloquee Signal.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Al activar Evitar censura, Molly intentará enviar mensajes evitando la censura. Activa esta función solo si te encuentras en un país que bloquee Molly.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
-    <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">La opción para evitar censura se ha activado automáticamente basándose en el número de teléfono de tu cuenta de Signal.</string>
+    <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Evitar censura se ha activado automáticamente basándose en el número de teléfono de tu cuenta de Signal.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
-    <string name="preferences_communication__censorship_circumvention_you_have_manually_disabled">Has desactivado manualmente la opción de evitar la censura.</string>
+    <string name="preferences_communication__censorship_circumvention_you_have_manually_disabled">Has desactivado manualmente la opción Evitar censura.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you cannot use it because you\'re already connected to the Signal service -->
-    <string name="preferences_communication__censorship_circumvention_is_not_necessary_you_are_already_connected">La opción para evitar censura no es necesaria: Signal está conectada con su servidor.</string>
+    <string name="preferences_communication__censorship_circumvention_is_not_necessary_you_are_already_connected">No es necesario activar la opción Evitar censura: ya tienes acceso al servicio de Signal.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you cannot use it because you\'re not connected to the internet -->
-    <string name="preferences_communication__censorship_circumvention_can_only_be_activated_when_connected_to_the_internet">La opción para evitar censura solo se puede activar con acceso a internet.</string>
+    <string name="preferences_communication__censorship_circumvention_can_only_be_activated_when_connected_to_the_internet">La opción Evitar censura solo se puede activar si tienes conexión a Internet.</string>
     <string name="preferences_communication__category_sealed_sender">Remitente confidencial</string>
     <string name="preferences_communication__sealed_sender_allow_from_anyone">Permitir de cualquiera</string>
-    <string name="preferences_communication__sealed_sender_allow_from_anyone_description">Activar la opción permite usar la función de «remitente confidencial» con personas que no están entre tus contactos y con las que no has compartido tu perfil.</string>
+    <string name="preferences_communication__sealed_sender_allow_from_anyone_description">Activa la función Remitente confidencial para los mensajes que recibas de personas que no están en tus contactos y con las que no has compartido tu perfil.</string>
     <string name="preferences_proxy">Proxy</string>
     <string name="preferences_use_proxy">Usar proxy</string>
-    <string name="preferences_off">Inactivo</string>
-    <string name="preferences_on">Activo</string>
+    <string name="preferences_off">Desactivado</string>
+    <string name="preferences_on">Activado</string>
     <string name="preferences_proxy_address">Dirección del proxy</string>
-    <string name="preferences_only_use_a_proxy_if">Usa un proxy si Signal no se puede conectar en una Wi-Fi o en la red móvil.</string>
+    <string name="preferences_only_use_a_proxy_if">Usa un proxy si no puedes conectarte a Signal con datos móviles o con Wi-Fi.</string>
     <string name="preferences_share">Compartir</string>
     <string name="preferences_save">Guardar</string>
-    <string name="preferences_connecting_to_proxy">Conectando con el proxy …</string>
-    <string name="preferences_connected_to_proxy">Conectada con el proxy</string>
-    <string name="preferences_connection_failed">Fallo al conectarse</string>
-    <string name="preferences_couldnt_connect_to_the_proxy">No se ha podido conectar con el proxy. Comprueba la dirección e inténtalo de nuevo.</string>
-    <string name="preferences_you_are_connected_to_the_proxy">Signal está conectada con el proxy. Puedes desactivar el proxy en cualquier momento desde los Ajustes.</string>
-    <string name="preferences_success">Funcionó</string>
-    <string name="preferences_failed_to_connect">Fallo al conectar</string>
+    <string name="preferences_connecting_to_proxy">Conectando con el proxy…</string>
+    <string name="preferences_connected_to_proxy">Se ha conectado al proxy</string>
+    <string name="preferences_connection_failed">Error de conexión</string>
+    <string name="preferences_couldnt_connect_to_the_proxy">No se ha podido conectar al proxy. Comprueba la dirección del proxy e inténtalo de nuevo.</string>
+    <string name="preferences_you_are_connected_to_the_proxy">Signal ya se ha conectado al proxy. Puedes desactivar el proxy en cualquier momento en Ajustes.</string>
+    <string name="preferences_success">¡Listo!</string>
+    <string name="preferences_failed_to_connect">No se ha podido conectar</string>
     <string name="preferences_enter_proxy_address">Introduce la dirección del proxy</string>
     <!-- Preference title for changing navigation (bottom) bar size -->
     <string name="preferences_navigation_bar_size">Tamaño de la barra de navegación</string>
@@ -3427,18 +3558,18 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">¡Los pagos han llegado!</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Usa Signal para enviar y recibir MobileCoin, una nueva moneda digital enfocada en la privacidad. Activa la opción para empezar.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Usa Molly para enviar y recibir MobileCoin, una nueva moneda digital enfocada en la privacidad. Activa la opción para empezar.</string>
     <string name="PaymentsHomeFragment__activate_payments">Activar pagos</string>
-    <string name="PaymentsHomeFragment__activating_payments">Activando pagos …</string>
-    <string name="PaymentsHomeFragment__restore_payments_account">Recuperar una cuenta de pagos</string>
+    <string name="PaymentsHomeFragment__activating_payments">Activando pagos…</string>
+    <string name="PaymentsHomeFragment__restore_payments_account">Restaurar cuenta de pagos</string>
     <string name="PaymentsHomeFragment__no_recent_activity_yet">Todavía no hay actividad reciente</string>
     <string name="PaymentsHomeFragment__recent_activity">Actividad reciente</string>
     <string name="PaymentsHomeFragment__see_all">Ver todos</string>
     <string name="PaymentsHomeFragment__add_funds">Añadir fondos</string>
     <string name="PaymentsHomeFragment__send">Enviar</string>
-    <string name="PaymentsHomeFragment__sent_s">Enviado %1$s</string>
-    <string name="PaymentsHomeFragment__received_s">Recibido %1$s</string>
-    <string name="PaymentsHomeFragment__transfer_to_exchange">Transferir a un «exchange»</string>
+    <string name="PaymentsHomeFragment__sent_s">Enviado: %1$s</string>
+    <string name="PaymentsHomeFragment__received_s">Recibido: %1$s</string>
+    <string name="PaymentsHomeFragment__transfer_to_exchange">Transferir a plataforma de intercambio</string>
     <string name="PaymentsHomeFragment__currency_conversion">Moneda de cambio</string>
     <string name="PaymentsHomeFragment__deactivate_payments">Desactivar pagos</string>
     <string name="PaymentsHomeFragment__recovery_phrase">Frase de recuperación</string>
@@ -3447,31 +3578,31 @@
     <string name="PaymentsHomeFragment__sent_payment">Pago enviado</string>
     <string name="PaymentsHomeFragment__received_payment">Pago recibido</string>
     <string name="PaymentsHomeFragment__processing_payment">Procesando pago</string>
-    <string name="PaymentsHomeFragment__unknown_amount">—</string>
+    <string name="PaymentsHomeFragment__unknown_amount">---</string>
     <string name="PaymentsHomeFragment__currency_conversion_not_available">Conversión de moneda no disponible</string>
-    <string name="PaymentsHomeFragment__cant_display_currency_conversion">No se puede mostrar la conversión de moneda. Comprueba tu conexión e inténtalo de nuevo.</string>
-    <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Los pagos no están disponibles en tu ubicación.</string>
-    <string name="PaymentsHomeFragment__could_not_enable_payments">Fallo al activar los pagos. Inténtalo más tarde.</string>
+    <string name="PaymentsHomeFragment__cant_display_currency_conversion">No se puede mostrar la conversión de moneda. Comprueba la conexión de tu teléfono e inténtalo de nuevo.</string>
+    <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Los pagos no están disponibles en tu región.</string>
+    <string name="PaymentsHomeFragment__could_not_enable_payments">No se han podido activar los pagos. Inténtalo de nuevo más tarde.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">¿Desactivar pagos?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">No podrás enviar o recibir más MobileCoin a través de Signal si desactivas los pagos.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">No podrás enviar ni recibir MobileCoin en Molly si desactivas los pagos.</string>
     <string name="PaymentsHomeFragment__deactivate">Desactivar</string>
-    <string name="PaymentsHomeFragment__continue">Adelante</string>
-    <string name="PaymentsHomeFragment__balance_is_not_currently_available">El balance no está disponible en este momento.</string>
+    <string name="PaymentsHomeFragment__continue">Continuar</string>
+    <string name="PaymentsHomeFragment__balance_is_not_currently_available">El saldo no está disponible en este momento.</string>
     <string name="PaymentsHomeFragment__payments_deactivated">Pagos desactivados.</string>
-    <string name="PaymentsHomeFragment__payment_failed">Fallo en el pago</string>
+    <string name="PaymentsHomeFragment__payment_failed">No se ha podido completar el pago</string>
     <string name="PaymentsHomeFragment__details">Detalles</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Puedes usar Signal para recibir y enviar MobileCoin. Todos los pagos están sujetos a las condiciones de uso de MobileCoin y su cartera. Puede que te encuentres con problemas, y los pagos o fondos que pierdas no podrán ser recuperados. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Puedes usar Molly para recibir y enviar MobileCoin. Todos los pagos están sujetos a las condiciones de uso de MobileCoin y su cartera. Puede que te encuentres con problemas, y los pagos o fondos que pierdas no podrán ser recuperados. </string>
     <string name="PaymentsHomeFragment__activate">Activar</string>
-    <string name="PaymentsHomeFragment__view_mobile_coin_terms">Términos de uso MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Los pagos en Signal no están disponibles. Todavía puedes transferir tus fondos a un «exchange» pero no podrás recibir o enviar más pagos a través de Signal.</string>
+    <string name="PaymentsHomeFragment__view_mobile_coin_terms">Términos del uso de MobileCoin</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Los pagos en Molly no están disponibles. Podrás seguir transfiriendo tus fondos a una plataforma de intercambio de monedas, pero ya no podrás recibir ni enviar pagos, ni añadir fondos.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
-    <string name="PaymentsHomeFragment__turn_on">¿Quieres activar el bloqueo de pago para futuros envíos?</string>
+    <string name="PaymentsHomeFragment__turn_on">¿Activar el bloqueo de pago para futuros envíos?</string>
     <!-- Alert dialog description for why payment lock should be enabled before sending payments -->
-    <string name="PaymentsHomeFragment__add_an_additional_layer">Añade una capa extra de seguridad y pide el bloqueo de pantalla de Android o la huella dactilar para transferir fondos.</string>
+    <string name="PaymentsHomeFragment__add_an_additional_layer">Añade una capa extra de seguridad y activa el bloqueo de pantalla o la huella dactilar de Android para poder transferir fondos.</string>
     <!-- Alert dialog button to enable payment lock -->
     <string name="PaymentsHomeFragment__enable">Activar</string>
     <!-- Alert dialog button to not enable payment lock for now -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Activar permisos</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Para ayudarte a enviar mensajes a personas que conoces, Signal solicitará estos permisos. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Para ayudarte a enviar mensajes a personas que conoces, Molly solicitará estos permisos. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Notificaciones</string>
     <!-- Notifications permission row description -->
@@ -3513,9 +3644,9 @@
 
     <!-- PermissionDeniedBottomSheet -->
     <!-- Sheet describing step 1 on how to give permissions by opening settings -->
-    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Pulsa \"Ajustes\" más abajo</string>
+    <string name="PermissionDeniedBottomSheet__1_tap_settings_below">1. Toca «Ajustes» más abajo</string>
     <!-- Sheet describing step 2 on how to give permissions by checking the permissions button in settings where %s will be replaced with an image of a checked button -->
-    <string name="PermissionDeniedBottomSheet__2_allow_permission">2. %1$s Activar permiso</string>
+    <string name="PermissionDeniedBottomSheet__2_allow_permission">2. %1$s Activa el permiso</string>
     <!-- Label for button at the bottom of the sheet which opens the system permission settings -->
     <string name="PermissionDeniedBottomSheet__settings">Ajustes</string>
 
@@ -3544,57 +3675,57 @@
     <string name="PaymentsAddMoneyFragment__your_wallet_address">Dirección de tu cartera</string>
     <string name="PaymentsAddMoneyFragment__copy">Copiar</string>
     <string name="PaymentsAddMoneyFragment__copied_to_clipboard">Copiado al portapapeles</string>
-    <string name="PaymentsAddMoneyFragment__to_add_funds">Para añadir fondos, envía MobileCoin a la dirección de tu cartera. Inicia una transferencia desde tu cuenta en un «exchange» que soporte MobileCoin. Después puedes escanear el código QR o copiar la dirección de tu cartera.</string>
+    <string name="PaymentsAddMoneyFragment__to_add_funds">Para añadir fondos, envía MobileCoin a la dirección de tu cartera. Inicia una transacción desde tu cuenta en una plataforma de intercambio de monedas que admita MobileCoin. Después, escanea el código QR o copia la dirección de tu cartera.</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsAddMoneyFragment__learn_more__information" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_transfer_from_exchange</string> -->
 
     <!-- PaymentsDetailsFragment -->
     <string name="PaymentsDetailsFragment__details">Detalles</string>
     <string name="PaymentsDetailsFragment__status">Estado</string>
-    <string name="PaymentsDetailsFragment__submitting_payment">Enviando pago …</string>
-    <string name="PaymentsDetailsFragment__processing_payment">Procesando pago …</string>
+    <string name="PaymentsDetailsFragment__submitting_payment">Enviando pago…</string>
+    <string name="PaymentsDetailsFragment__processing_payment">Procesando pago…</string>
     <string name="PaymentsDetailsFragment__payment_complete">Pago completado</string>
-    <string name="PaymentsDetailsFragment__payment_failed">Fallo en el pago</string>
+    <string name="PaymentsDetailsFragment__payment_failed">No se ha podido completar el pago</string>
     <string name="PaymentsDetailsFragment__network_fee">Tasa de la red</string>
     <string name="PaymentsDetailsFragment__sent_by">Enviado por</string>
     <string name="PaymentsDetailsFragment__sent_to_s">Enviado a %1$s</string>
-    <string name="PaymentsDetailsFragment__you_on_s_at_s">Tú el %1$s a las %2$s</string>
-    <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s el %2$s a las %3$s</string>
+    <string name="PaymentsDetailsFragment__you_on_s_at_s">Tú (fecha y hora: %1$s - %2$s)</string>
+    <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s (fecha y hora: %2$s - %3$s)</string>
     <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Para</string>
     <string name="PaymentsDetailsFragment__from">De</string>
     <string name="PaymentsDetailsFragment__information">Los detalles de la transacción incluyen la cantidad y fecha del pago, pero no su origen o destino y figuran en el libro mayor de MobileCoin.</string>
     <string name="PaymentsDetailsFragment__coin_cleanup_fee">Tasa de limpieza de monedas</string>
-    <string name="PaymentsDetailsFragment__coin_cleanup_information">La tasa de «limpieza de monedas» se aplica cuando tus monedas no se pueden combinar para completar un pago. La limpieza te permite continuar enviado pagos.</string>
+    <string name="PaymentsDetailsFragment__coin_cleanup_information">Se cobra una «tasa de limpieza de monedas» cuando las monedas que tienes no pueden combinarse para completar una transacción. La limpieza te permite continuar enviado pagos.</string>
     <string name="PaymentsDetailsFragment__no_details_available">No hay más detalles disponibles para esta transacción</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsDetailsFragment__learn_more__information" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_details</string> -->
   <!-- Removed by excludeNonTranslatables <string name="PaymentsDetailsFragment__learn_more__cleanup_fee" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_details_fees</string> -->
     <string name="PaymentsDetailsFragment__sent_payment">Pago enviado</string>
     <string name="PaymentsDetailsFragment__received_payment">Pago recibido</string>
-    <string name="PaymentsDeatilsFragment__payment_completed_s">Pago completado el %1$s</string>
+    <string name="PaymentsDeatilsFragment__payment_completed_s">Pago completado: %1$s</string>
     <string name="PaymentsDetailsFragment__block_number">Número de bloque</string>
 
     <!-- PaymentsTransferFragment -->
     <string name="PaymentsTransferFragment__transfer">Transferencia</string>
     <string name="PaymentsTransferFragment__scan_qr_code">Escanear código QR</string>
-    <string name="PaymentsTransferFragment__to_scan_or_enter_wallet_address">A: Escanea o introduce la dirección de la cartera</string>
-    <string name="PaymentsTransferFragment__you_can_transfer">Puedes transferir MobileCoin al hacer un pago a la dirección de la cartera indicada en tu cuenta del «exchange». La dirección de la cartera es la cadena de números y letras que suele aparecer debajo del código QR.</string>
+    <string name="PaymentsTransferFragment__to_scan_or_enter_wallet_address">Para: Escanear o introducir la dirección de la cartera</string>
+    <string name="PaymentsTransferFragment__you_can_transfer">Puedes transferir MobileCoin haciendo una transferencia a la dirección de la cartera que se indica en plataforma de intercambio. La dirección de la cartera es la cadena de números y letras que suele aparecer debajo del código QR.</string>
     <string name="PaymentsTransferFragment__next">Siguiente</string>
-    <string name="PaymentsTransferFragment__invalid_address">Dirección inválida</string>
-    <string name="PaymentsTransferFragment__check_the_wallet_address">Comprueba de nuevo la dirección de la cartera a la que estás intentando hacer el pago e inténtalo de nuevo.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">No puedes enviar pagos a tu propia cartera de Signal. Introduce la dirección de tu cartera en un «exchange» que soporte MobileCoin.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Para escanear el código QR, Signal necesita acceso a la cámara.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal necesita acceso a la cámara para analizar el código QR. Por favor, ve a la aplicación «Ajustes» y en «Permisos» activa «Cámara».</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Para escanear el código QR, Signal necesita acceso a la cámara.</string>
+    <string name="PaymentsTransferFragment__invalid_address">Dirección no válida</string>
+    <string name="PaymentsTransferFragment__check_the_wallet_address">Comprueba la dirección de la cartera a la que estás intentando transferir e inténtalo de nuevo.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">No puedes transferir a tu propia cartera de Molly. Introduce la dirección de la cartera de tu cuenta en una plataforma de intercambio que admita MobileCoin.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Para escanear el código QR, Molly necesita acceso a la cámara.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly necesita acceso a la cámara para leer un código QR. Ve a «Ajustes» y selecciona Aplicaciones y notificaciones &gt; Molly &gt; Permisos de la aplicación &gt; Cámara &gt; Permitir. Estos pasos pueden variar dependiendo de tu dispositivo.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Para escanear el código QR, Molly necesita acceso a la cámara.</string>
     <string name="PaymentsTransferFragment__settings">Ajustes</string>
 
     <!-- PaymentsTransferQrScanFragment -->
-    <string name="PaymentsTransferQrScanFragment__scan_address_qr_code">Escanear código QR</string>
-    <string name="PaymentsTransferQrScanFragment__scan_the_address_qr_code_of_the_payee">Escanea el código QR de quien vas a pagar.</string>
+    <string name="PaymentsTransferQrScanFragment__scan_address_qr_code">Escanear código QR de la dirección</string>
+    <string name="PaymentsTransferQrScanFragment__scan_the_address_qr_code_of_the_payee">Escanea el código QR de la persona que recibirá el pago</string>
 
     <!-- CreatePaymentFragment -->
     <string name="CreatePaymentFragment__request">Solicitud</string>
     <string name="CreatePaymentFragment__pay">Pagar</string>
-    <string name="CreatePaymentFragment__available_balance_s">Balance disponible: %1$s</string>
+    <string name="CreatePaymentFragment__available_balance_s">Saldo disponible: %1$s</string>
     <string name="CreatePaymentFragment__toggle_content_description">Mostrar</string>
     <string name="CreatePaymentFragment__1">1</string>
     <string name="CreatePaymentFragment__2">2</string>
@@ -3625,21 +3756,21 @@
     <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Para</string>
     <string name="ConfirmPayment__total_amount">Suma total</string>
-    <string name="ConfirmPayment__balance_s">Balance: %1$s</string>
-    <string name="ConfirmPayment__submitting_payment">Enviando pago …</string>
-    <string name="ConfirmPayment__processing_payment">Procesando pago …</string>
+    <string name="ConfirmPayment__balance_s">Saldo: %1$s</string>
+    <string name="ConfirmPayment__submitting_payment">Enviando pago…</string>
+    <string name="ConfirmPayment__processing_payment">Procesando pago…</string>
     <string name="ConfirmPayment__payment_complete">Pago completado</string>
-    <string name="ConfirmPayment__payment_failed">Fallo en el pago</string>
-    <string name="ConfirmPayment__payment_will_continue_processing">Se continuará con el proceso del pago</string>
-    <string name="ConfirmPaymentFragment__invalid_recipient">Destinatari@ inválid@</string>
+    <string name="ConfirmPayment__payment_failed">No se ha podido completar el pago</string>
+    <string name="ConfirmPayment__payment_will_continue_processing">Se seguirá procesando el pago</string>
+    <string name="ConfirmPaymentFragment__invalid_recipient">Destinatario no válido</string>
     <!-- Title of a dialog show when we were unable to present the user\'s screenlock before sending a payment -->
     <string name="ConfirmPaymentFragment__failed_to_show_payment_lock">No se ha podido mostrar el bloqueo de pago</string>
     <!-- Body of a dialog show when we were unable to present the user\'s screenlock before sending a payment -->
     <string name="ConfirmPaymentFragment__you_enabled_payment_lock_in_the_settings">Has activado el bloqueo de pago en Ajustes, pero no puede mostrarse.</string>
     <!-- Button in a dialog that will take the user to the privacy settings -->
-    <string name="ConfirmPaymentFragment__go_to_settings">Ir a ajustes</string>
+    <string name="ConfirmPaymentFragment__go_to_settings">Ir a Ajustes</string>
     <string name="ConfirmPaymentFragment__this_person_has_not_activated_payments">Esta persona no ha activado los pagos</string>
-    <string name="ConfirmPaymentFragment__unable_to_request_a_network_fee">No es posible calcular la tasa de la red. Para continuar con este pago, toca en OK e inténtalo de nuevo.</string>
+    <string name="ConfirmPaymentFragment__unable_to_request_a_network_fee">No es posible calcular la tasa de la red. Para continuar con este pago, toca Aceptar e inténtalo de nuevo.</string>
 
     <!-- BiometricDeviceAuthentication -->
     <!-- Biometric/Device authentication prompt title -->
@@ -3647,11 +3778,11 @@
 
 
     <!-- CurrencyAmountFormatter_s_at_s -->
-    <string name="CurrencyAmountFormatter_s_at_s">%1$s a las %2$s</string>
+    <string name="CurrencyAmountFormatter_s_at_s">%1$s a %2$s</string>
 
     <!-- SetCurrencyFragment -->
     <string name="SetCurrencyFragment__set_currency">Establecer moneda</string>
-    <string name="SetCurrencyFragment__all_currencies">Moneda</string>
+    <string name="SetCurrencyFragment__all_currencies">Todas las monedas</string>
 
     <!-- **************************************** -->
     <!-- menus -->
@@ -3660,7 +3791,7 @@
     <!-- contact_selection_list -->
     <!-- Displayed in a row on the new call screen when searching by phone number. -->
     <string name="contact_selection_list__new_call">Nueva llamada a…</string>
-    <string name="contact_selection_list__unknown_contact">Nuevo mensaje para …</string>
+    <string name="contact_selection_list__unknown_contact">Nuevo mensaje para…</string>
     <string name="contact_selection_list__unknown_contact_block">Bloquear persona</string>
     <string name="contact_selection_list__unknown_contact_add_to_group">Añadir al grupo</string>
 
@@ -3683,7 +3814,7 @@
     <!-- Button to save a message attachment (image, file etc.) -->
 
     <!-- conversation_expiring_off -->
-    <string name="conversation_expiring_off__disappearing_messages">Desaparición de mensajes</string>
+    <string name="conversation_expiring_off__disappearing_messages">Mensajes temporales</string>
 
     <!-- conversation_selection -->
     <!-- Button to view detailed information for a message; Action item with hyphenation. Translation can use soft hyphen - Unicode U+00AD  -->
@@ -3775,9 +3906,9 @@
 
     <!-- DoubleTapEditEducationSheet -->
     <!-- Displayed as the title of the education bottom sheet -->
-    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Pulsa dos veces para editar</string>
+    <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Toca dos veces para editar</string>
     <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
-    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Pulsa rápidamente dos veces tus mensajes para editarlos. Puedes editar tus mensajes hasta 24 horas después de haberlos enviado.</string>
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Tuca rápidamente dos veces tus mensajes para editarlos. Puedes editar tus mensajes hasta 24 horas después de haberlos enviado.</string>
     <!-- Button label to dismiss sheet -->
     <string name="DoubleTapEditEducationSheet__got_it">Entendido</string>
 
@@ -3836,8 +3967,8 @@
         <item quantity="other">El PIN debe constar de al menos %1$d caracteres</item>
     </plurals>
     <plurals name="CreateKbsPinFragment__pin_must_be_at_least_digits">
-        <item quantity="one">El PIN debe constar al menos de %1$d cifra</item>
-        <item quantity="other">El PIN debe constar al menos de %1$d cifras</item>
+        <item quantity="one">El PIN debe tener al menos %1$d dígito</item>
+        <item quantity="other">El PIN debe tener al menos %1$d dígitos</item>
     </plurals>
     <string name="CreateKbsPinFragment__create_a_new_pin">Crear nuevo PIN</string>
     <string name="CreateKbsPinFragment__you_can_choose_a_new_pin_as_long_as_this_device_is_registered">Puedes modificar tu PIN, siempre que este dispositivo esté registrado.</string>
@@ -3854,11 +3985,11 @@
     <string name="ConfirmKbsPinFragment__your_pin_was_not_saved">Tu PIN no se ha guardado. Volveremos a preguntarte más tarde para crearlo.</string>
     <string name="ConfirmKbsPinFragment__pin_created">PIN creado.</string>
     <string name="ConfirmKbsPinFragment__re_enter_your_pin">Vuelve a introducir tu PIN.</string>
-    <string name="ConfirmKbsPinFragment__creating_pin">Creando PIN …</string>
+    <string name="ConfirmKbsPinFragment__creating_pin">Creando PIN…</string>
 
     <!-- KbsSplashFragment -->
     <string name="KbsSplashFragment__introducing_pins">¡El PIN ha llegado!</string>
-    <string name="KbsSplashFragment__pins_keep_information_stored_with_signal_encrypted">El PIN permite activar el bloqueo de registro de tu número y almacena tu cuenta cifrada en el servidor de Signal de forma que solo tú puedes acceder a ella. Ni siquiera la gente de Signal tiene acceso. Con el PIN, tu perfil, contactos, grupos y personas bloqueadas se recuperarán al reinstalar Signal. No necesitas el PIN para abrir la aplicación.</string>
+    <string name="KbsSplashFragment__pins_keep_information_stored_with_signal_encrypted">El PIN permite activar el bloqueo de registro de tu número y almacena tu cuenta cifrada en el servidor de Signal de forma que solo tú puedes acceder a ella. Ni siquiera la gente de Signal tiene acceso. Con el PIN, tu perfil, contactos, grupos y personas bloqueadas se recuperarán al reinstalar Signal. No necesitas el PIN para abrir la app.</string>
     <string name="KbsSplashFragment__learn_more">Saber más</string>
   <!-- Removed by excludeNonTranslatables <string name="KbsSplashFragment__learn_more_link" translatable="false">https://support.signal.org/hc/articles/360007059792</string> -->
     <string name="KbsSplashFragment__registration_lock_equals_pin">Bloqueo de registro = PIN</string>
@@ -3932,23 +4063,23 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Recibiendo llamada de voz de Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Recibiendo llamada de voz de Molly</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Videollamada de Signal entrante</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Videollamada de Molly entrante</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Llamada en grupo de Signal entrante</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Llamada en grupo de Molly entrante</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Llamada de Signal en curso</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Llamada de Molly en curso</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Videollamada de Signal en curso</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Videollamada de Molly en curso</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Llamada en grupo de Signal en curso</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Llamada en grupo de Molly en curso</string>
 
     <!-- transport_selection_list_item -->
-    <string name="ConversationListFragment_loading">Cargando …</string>
-    <string name="CallNotificationBuilder_connecting">Conectando …</string>
+    <string name="ConversationListFragment_loading">Cargando…</string>
+    <string name="CallNotificationBuilder_connecting">Conectando…</string>
     <string name="Permissions_permission_required">Permiso necesario</string>
-    <string name="Permissions_continue">Adelante</string>
+    <string name="Permissions_continue">Continuar</string>
     <string name="Permissions_not_now">Ahora no</string>
     <string name="SQLCipherMigrationHelper_migrating_signal_database">Migrar base de datos de Signal</string>
     <string name="enter_backup_passphrase_dialog__backup_passphrase">Clave de la copia de seguridad</string>
@@ -3969,15 +4100,15 @@
     <!-- Error message indicating that we could not restore the user\'s backup. Displayed in a toast at the bottom of the screen. -->
     <string name="RegistrationActivity_backup_failure_foreign_key">La copia de seguridad contiene datos mal formados</string>
     <string name="RegistrationActivity_incorrect_backup_passphrase">La clave de la copia de seguridad es incorrecta</string>
-    <string name="RegistrationActivity_checking">Comprobando …</string>
-    <string name="RegistrationActivity_d_messages_so_far">%1$d mensajes de momento …</string>
+    <string name="RegistrationActivity_checking">Comprobando…</string>
+    <string name="RegistrationActivity_d_messages_so_far">%1$d mensajes por el momento…</string>
     <string name="RegistrationActivity_restore_from_backup">¿Restaurar desde copia de seguridad?</string>
     <string name="RegistrationActivity_restore_your_messages_and_media_from_a_local_backup">Restaura tus mensajes y adjuntos desde una copia de seguridad local. Si no lo haces ahora, no podrás restaurar más tarde.</string>
     <string name="RegistrationActivity_backup_size_s">Tamaño de la copia de seguridad: %1$s</string>
     <string name="RegistrationActivity_backup_timestamp_s">Fecha de la copia de seguridad: %1$s</string>
     <string name="BackupDialog_enable_local_backups">¿Activar copias de seguridad locales?</string>
     <string name="BackupDialog_enable_backups">Activar copias</string>
-    <string name="BackupDialog_please_acknowledge_your_understanding_by_marking_the_confirmation_check_box">Por favor, indica que lo has comprendido marcando la casilla de confirmación.</string>
+    <string name="BackupDialog_please_acknowledge_your_understanding_by_marking_the_confirmation_check_box">Marca la casilla de confirmación para indicarnos que lo has comprendido.</string>
     <string name="BackupDialog_delete_backups">¿Eliminar copias de seguridad?</string>
     <string name="BackupDialog_disable_and_delete_all_local_backups">¿Desactivar y eliminar todas las copias de seguridad locales?</string>
     <string name="BackupDialog_delete_backups_statement">Eliminar copias de seguridad</string>
@@ -3989,52 +4120,52 @@
     <string name="BackupDialog_verify">Verificar</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">La clave es correcta</string>
     <string name="BackupDialog_passphrase_was_not_correct">La clave es incorrecta</string>
-    <string name="LocalBackupJob_creating_signal_backup">Creando copia de seguridad …</string>
+    <string name="LocalBackupJob_creating_signal_backup">Creando copia de seguridad…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Verificando copia de seguridad de Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Verificando copia de seguridad de Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">Fallo en la copia</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Parece que tu carpeta de copias de seguridad se ha eliminado o movido.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">La copia de seguridad es demasiado grande para guardarla en este dispositivo.</string>
     <string name="LocalBackupJobApi29_there_is_not_enough_space">No hay suficiente espacio para guardar tu copia de seguridad.</string>
     <!-- Error message shown if a newly created backup could not be verified as accurate -->
-    <string name="LocalBackupJobApi29_your_backup_could_not_be_verified">Tu copia de seguridad más reciente no pudo ser creada ni verificada. Por favor, crea una nueva.</string>
+    <string name="LocalBackupJobApi29_your_backup_could_not_be_verified">No se ha podido crear ni verificar tu copia de seguridad más reciente. Crea una nueva.</string>
     <!-- Error message shown if a very large attachment is encountered during the backup creation and causes the backup to fail -->
-    <string name="LocalBackupJobApi29_your_backup_contains_a_very_large_file">Tu copia de seguridad contiene un archivo muy grande que no puede ser copiado. Por favor, bórralo y crea una nueva copia de seguridad.</string>
+    <string name="LocalBackupJobApi29_your_backup_contains_a_very_large_file">Tu copia de seguridad contiene un archivo muy grande y no se puede crear una copia de seguridad. Bórralo y crea una copia de seguridad nueva.</string>
     <string name="LocalBackupJobApi29_tap_to_manage_backups">Toca para gestionar las copias.</string>
     <string name="RegistrationActivity_wrong_number">¿Número erróneo?</string>
     <!--    Countdown to when the user can request a new code via phone call during registration.-->
     <string name="RegistrationActivity_call_me_instead_available_in">Llámame (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Volver a enviar código (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Contacta con el Centro de Asistencia de Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Registro de Signal - Código de verificación para Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Contacta con el Centro de Asistencia de Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Registro de Molly - Código de verificación para Android</string>
     <string name="RegistrationActivity_incorrect_code">Código incorrecto</string>
     <string name="BackupUtil_never">Nunca</string>
     <string name="BackupUtil_unknown">Desconocido</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Número de teléfono</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Elige quién puede ver tu número de teléfono y quién puede contactarte en Signal con él.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Elige quién puede ver tu número de teléfono y quién puede contactarte en Molly con él.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Quién puede ver mi número</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
-    <string name="PhoneNumberPrivacySettingsFragment_sharing_on_description">Tu número de teléfono será visible para la gente a quien envíes mensajes y para lxs participantes de tus grupos.</string>
+    <string name="PhoneNumberPrivacySettingsFragment_sharing_on_description">Tu número de teléfono será visible para las personas y los grupos a los que envíes mensajes.</string>
     <!-- Subtext below radio buttons when who can see my number is set to nobody and who can find me by number is set to everybody -->
     <string name="PhoneNumberPrivacySettingsFragment_sharing_off_discovery_on_description">Tu número de teléfono no será visible para nadie a menos que lo tenga guardado en los contactos de su teléfono.</string>
     <!-- Subtext below radio buttons when who can see my number is set to nobody and who can find me by number is set to nobody -->
-    <string name="PhoneNumberPrivacySettingsFragment_sharing_off_discovery_off_description">Tu número de teléfono ya no es visible para nadie.</string>
+    <string name="PhoneNumberPrivacySettingsFragment_sharing_off_discovery_off_description">Tu número de teléfono no será visible para nadie.</string>
     <!-- Section title above two radio buttons for enabling and disabling whether users can find me by my phone number  -->
-    <string name="PhoneNumberPrivacySettingsFragment_who_can_find_me_by_number_heading">Quién puede encontrarme a través de mi número</string>
+    <string name="PhoneNumberPrivacySettingsFragment_who_can_find_me_by_number_heading">Quién puede encontrarme con mi número</string>
     <!-- Subtext below radio buttons when who can find me by number is set to everyone -->
     <string name="PhoneNumberPrivacySettingsFragment_discovery_on_description">Cualquiera que tenga tu número de teléfono verá que estás en Signal y podrá iniciar chats contigo.</string>
     <!-- Subtext below radio buttons when who can find me by number is set to nobody -->
-    <string name="PhoneNumberPrivacySettingsFragment_discovery_off_description">Nadie podrá ver que estás en Signal a menos que les envíes un mensaje o tengas un chat abierto con ellxs.</string>
+    <string name="PhoneNumberPrivacySettingsFragment_discovery_off_description">Nadie podrá ver que estás en Signal a menos que les envíes un mensaje o tengas un chat con esta persona en concreto.</string>
     <!-- Snackbar text when pressing invalid radio item -->
-    <string name="PhoneNumberPrivacySettingsFragment__to_change_this_setting">"Para cambiar esto, selecciona Nadie en el ajuste Quién puede ver mi número."</string>
+    <string name="PhoneNumberPrivacySettingsFragment__to_change_this_setting">"Para cambiar este ajuste, selecciona la opción «Nadie» en «Quién puede ver mi número»."</string>
     <!-- Dialog title shown when selecting "Nobody" in phone number privacy settings for who can find me by number -->
     <string name="PhoneNumberPrivacySettingsFragment__nobody_can_find_me_warning_title">¿Seguro que quieres hacer esto?</string>
     <!-- Dialog warning message shown when selecting "Nobody" in phone number privacy settings for who can find me by number -->
-    <string name="PhoneNumberPrivacySettingsFragment__nobody_can_find_me_warning_message">Si configuras el ajuste \"¿Quién puede encontrarme a través de mi número?\" a \"Nadie\" será más difícil que la gente pueda encontrarte en Signal.</string>
+    <string name="PhoneNumberPrivacySettingsFragment__nobody_can_find_me_warning_message">Si cambias el ajuste «¿Quién puede encontrarme con mi número?» a «Nadie», será más difícil que las personas te encuentren en Signal.</string>
     <!-- Dialog button text for canceling change action -->
     <string name="PhoneNumberPrivacySettingsFragment__cancel">Cancelar</string>
     <string name="PhoneNumberPrivacy_everyone">Cualquiera</string>
@@ -4056,15 +4187,15 @@
     <string name="AppProtectionPreferenceFragment_none">Ninguno</string>
     <string name="preferences_app_protection__registration_lock">Bloqueo de registro</string>
     <string name="RegistrationActivity_you_must_enter_your_registration_lock_PIN">Debes introducir tu PIN de bloqueo de registro</string>
-    <string name="RegistrationActivity_your_pin_has_at_least_d_digits_or_characters">Tu PIN debe constar de al menos %1$d cifras o caracteres</string>
+    <string name="RegistrationActivity_your_pin_has_at_least_d_digits_or_characters">Tu PIN debe tener al menos %1$d dígitos o caracteres</string>
     <string name="RegistrationActivity_too_many_attempts">Demasiados intentos</string>
-    <string name="RegistrationActivity_you_have_made_too_many_incorrect_registration_lock_pin_attempts_please_try_again_in_a_day">Has realizado demasiados intentos incorrectos del PIN de bloqueo de registro. Por favor, inténtalo de nuevo pasado un día.</string>
+    <string name="RegistrationActivity_you_have_made_too_many_incorrect_registration_lock_pin_attempts_please_try_again_in_a_day">Has realizado demasiados intentos incorrectos del PIN de bloqueo de registro. Inténtalo de nuevo en 24 horas.</string>
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Demasiados intentos fallidos. Inténtalo de nuevo más tarde.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Fallo al conectar con el servicio</string>
     <string name="preferences_chats__backups">Copias de seguridad</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal está bloqueada</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly está bloqueada</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">TOCA PARA DESBLOQUEAR</string>
-    <string name="Recipient_unknown">Desconocid@</string>
+    <string name="Recipient_unknown">Desconocido</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
     <string name="Recipient_deleted_account">Cuenta eliminada</string>
 
@@ -4093,36 +4224,43 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Debes tener acceso a tu dispositivo antiguo.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Restaurar desde copia de seguridad</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Restaura tus mensajes y adjuntos desde una copia de seguridad local. Si no lo haces ahora, no podrás restaurar más tarde.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Restaurar copia de seguridad local</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Restaurar copia de seguridad de Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Restaurar todos tus mensajes de texto y tus archivos multimedia de los últimos 30 días</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Más opciones</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Cancelar</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Iniciar sesión sin transferir</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Continuar sin transferir tus mensajes ni archivos multimedia</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Abre Signal en tu dispositivo Android antiguo</string>
-    <string name="NewDeviceTransferInstructions__continue">Adelante</string>
+    <string name="NewDeviceTransferInstructions__continue">Continuar</string>
     <string name="NewDeviceTransferInstructions__first_bullet">1.</string>
     <string name="NewDeviceTransferInstructions__tap_on_your_profile_photo_in_the_top_left_to_open_settings">Toca sobre tu foto de perfil en la parte superior izquierda para abrir los ajustes</string>
     <string name="NewDeviceTransferInstructions__second_bullet">2.</string>
     <string name="NewDeviceTransferInstructions__tap_on_account">"Toca en «Cuenta»"</string>
     <string name="NewDeviceTransferInstructions__third_bullet">3.</string>
-    <string name="NewDeviceTransferInstructions__tap_transfer_account_and_then_continue_on_both_devices">"Toca en «Transferir cuenta» y en «Adelante» en ambos dispositivos"</string>
+    <string name="NewDeviceTransferInstructions__tap_transfer_account_and_then_continue_on_both_devices">"Toca en «Transferir cuenta» y en «Continuar» en ambos dispositivos"</string>
 
     <!-- NewDeviceTransferSetupFragment -->
-    <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Preparando la conexión con tu dispositivo Android antiguo …</string>
+    <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Preparando la conexión con tu dispositivo Android antiguo…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Solo necesita un momento, debería estar listo pronto</string>
-    <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Esperando a la conexión del dispositivo Android antiguo …</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal necesita acceso a la ubicación para encontrar y conectarse a tu dispositivo Android antiguo.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal necesita acceso a los servicios de localización para encontrar y conectarse con tu dispositivo Android antiguo.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal necesita la Wi-Fi activa para encontrar y conectarse con tu dispositivo Android antiguo. La Wi-Fi debe estar activa pero el dispositivo no necesita estar conectado a una red Wi-Fi concreta.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Lo sentimos. Parece que tu dispositivo no soporta una conexión Wi-Fi Direct. Signal usa una conexión directa para buscar y encontrar tu dispositivo Android antiguo. Todavía puedes restaurar tu cuenta con una copia de seguridad de Signal de tu dispositivo antiguo.</string>
+    <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Esperando a la conexión del dispositivo Android antiguo…</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly necesita acceso a la ubicación para encontrar y conectarse a tu dispositivo Android antiguo.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly necesita acceso a los servicios de localización para encontrar y conectarse con tu dispositivo Android antiguo.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly necesita la Wi-Fi activa para encontrar y conectarse con tu dispositivo Android antiguo. La Wi-Fi debe estar activa pero el dispositivo no necesita estar conectado a una red Wi-Fi concreta.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Lo sentimos. Parece que tu dispositivo no soporta una conexión Wi-Fi Direct. Molly usa una conexión directa para buscar y encontrar tu dispositivo Android antiguo. Todavía puedes restaurar tu cuenta con una copia de seguridad de Molly de tu dispositivo antiguo.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Restaurar copia de seguridad</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Fallo al conectar con tu dispositivo Android antiguo.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
-    <string name="OldDeviceTransferSetup__searching_for_new_android_device">Buscando dispositivo Android nuevo …</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal necesita acceso a la ubicación para encontrar y conectarse a tu dispositivo Android nuevo.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal necesita acceso a los servicios de localización para encontrar y conectarse con tu dispositivo Android nuevo.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal necesita la Wi-Fi activa para encontrar y conectarse con tu dispositivo Android nuevo. La Wi-Fi debe estar activa pero el dispositivo no necesita estar conectado a una red Wi-Fi concreta.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Lo sentimos. Parece que tu dispositivo no soporta una conexión Wi-Fi Direct. Signal usa una conexión directa para buscar y encontrar tu dispositivo Android nuevo. Todavía puedes restaurar tu cuenta con una copia de seguridad de Signal en tu dispositivo nuevo.</string>
+    <string name="OldDeviceTransferSetup__searching_for_new_android_device">Buscando dispositivo Android nuevo…</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly necesita acceso a la ubicación para encontrar y conectarse a tu dispositivo Android nuevo.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly necesita acceso a los servicios de localización para encontrar y conectarse con tu dispositivo Android nuevo.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly necesita la Wi-Fi activa para encontrar y conectarse con tu dispositivo Android nuevo. La Wi-Fi debe estar activa pero el dispositivo no necesita estar conectado a una red Wi-Fi concreta.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Lo sentimos. Parece que tu dispositivo no soporta una conexión Wi-Fi Direct. Molly usa una conexión directa para buscar y encontrar tu dispositivo Android nuevo. Todavía puedes restaurar tu cuenta con una copia de seguridad de Molly en tu dispositivo nuevo.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Crear copia de seguridad</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Fallo al conectar con tu dispositivo Android nuevo.</string>
 
@@ -4135,10 +4273,10 @@
     <string name="DeviceTransferSetup__retry">Reintentar</string>
     <string name="DeviceTransferSetup__submit_debug_logs">Enviar registro de depuración</string>
     <string name="DeviceTransferSetup__verify_code">Verificar código</string>
-    <string name="DeviceTransferSetup__verify_that_the_code_below_matches_on_both_of_your_devices">Verifica que el código de debajo coincide en ambos dispositivos. Si es así, toca «Adelante».</string>
-    <string name="DeviceTransferSetup__the_numbers_do_not_match">Las cifras no coinciden</string>
-    <string name="DeviceTransferSetup__continue">Adelante</string>
-    <string name="DeviceTransferSetup__if_the_numbers_on_your_devices_do_not_match_its_possible_you_connected_to_the_wrong_device">Si las cifras en ambos dispositivos no coinciden, es posible que no hayas conectado los dispositivos correctos. Para arreglarlo, detén la transferencia e inténtalo de nuevo. Mantén ambos dispositivos cerca.</string>
+    <string name="DeviceTransferSetup__verify_that_the_code_below_matches_on_both_of_your_devices">Verifica que el código de debajo coincide en ambos dispositivos. Si es así, toca «Continuar».</string>
+    <string name="DeviceTransferSetup__the_numbers_do_not_match">Los números no coinciden</string>
+    <string name="DeviceTransferSetup__continue">Continuar</string>
+    <string name="DeviceTransferSetup__if_the_numbers_on_your_devices_do_not_match_its_possible_you_connected_to_the_wrong_device">Si los números en ambos dispositivos no coinciden, es posible que no te hayas conectado al dispositivo correcto. Para solucionarlo, detén la transferencia e inténtalo de nuevo. Mantén ambos dispositivos cerca.</string>
     <string name="DeviceTransferSetup__stop_transfer">Detener transferencia</string>
     <string name="DeviceTransferSetup__unable_to_discover_old_device">Imposible encontrar dispositivo antiguo</string>
     <string name="DeviceTransferSetup__unable_to_discover_new_device">Imposible encontrar dispositivo nuevo</string>
@@ -4146,15 +4284,15 @@
     <string name="DeviceTransferSetup__location_permission">Acesso a la ubicación</string>
     <string name="DeviceTransferSetup__location_services">Servicios de posición</string>
     <string name="DeviceTransferSetup__wifi">Wi-Fi</string>
-    <string name="DeviceTransferSetup__on_the_wifi_direct_screen_remove_all_remembered_groups_and_unlink_any_invited_or_connected_devices">En la pantalla de Wi-Fi Direct, elimina todos los grupos guardados y desenlaza todo dispositivo invitado o conectado.</string>
+    <string name="DeviceTransferSetup__on_the_wifi_direct_screen_remove_all_remembered_groups_and_unlink_any_invited_or_connected_devices">En la pantalla de Wi-Fi Direct, elimina todos los grupos guardados y desvincula cualquier dispositivo invitado o conectado.</string>
     <string name="DeviceTransferSetup__wifi_direct_screen">Pantalla Wi-Fi Direct</string>
     <string name="DeviceTransferSetup__try_turning_wifi_off_and_on_on_both_devices">Desactiva y vuelve a activar la Wi-Fi en ambos dispositivos.</string>
     <string name="DeviceTransferSetup__make_sure_both_devices_are_in_transfer_mode">Asegúrate que ambos dispositivos están en modo de transferencia.</string>
     <string name="DeviceTransferSetup__go_to_support_page">Ve a la página de soporte</string>
     <string name="DeviceTransferSetup__try_again">Inténtalo de nuevo</string>
     <string name="DeviceTransferSetup__waiting_for_other_device">Esperando por el otro dispositivo</string>
-    <string name="DeviceTransferSetup__tap_continue_on_your_other_device_to_start_the_transfer">Toca «Adelante» en tu otro dispositivo para comenzar con la transferencia.</string>
-    <string name="DeviceTransferSetup__tap_continue_on_your_other_device">Toca «Adelante» en tu otro dispositivo …</string>
+    <string name="DeviceTransferSetup__tap_continue_on_your_other_device_to_start_the_transfer">Toca «Continuar» en tu otro dispositivo para comenzar con la transferencia.</string>
+    <string name="DeviceTransferSetup__tap_continue_on_your_other_device">Toca «Continuar» en tu otro dispositivo…</string>
 
     <!-- NewDeviceTransferFragment -->
     <string name="NewDeviceTransfer__cannot_transfer_from_a_newer_version_of_signal">No se puede transferir desde una versión más nueva de Signal</string>
@@ -4163,10 +4301,10 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Transfiriendo datos</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Mantén próximos ambos dispositivos. Conéctalos a su cargador y mantén Signal abierto. La transferencia entre ambos dispositivos está cifrada de extremo a extremo.</string>
-    <string name="DeviceTransfer__d_messages_so_far">%1$d mensajes de momento …</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Mantén próximos ambos dispositivos. Conéctalos a su cargador y mantén Molly abierto. La transferencia entre ambos dispositivos está cifrada de extremo a extremo.</string>
+    <string name="DeviceTransfer__d_messages_so_far">%1$d mensajes por el momento…</string>
     <!-- Filled in with total percentage of messages transferred -->
-    <string name="DeviceTransfer__s_of_messages_so_far">%1$s de %% mensajes de momento …</string>
+    <string name="DeviceTransfer__s_of_messages_so_far">%1$s %% de los mensajes por el momento…</string>
     <string name="DeviceTransfer__cancel">Cancelar</string>
     <string name="DeviceTransfer__try_again">Inténtalo de nuevo</string>
     <string name="DeviceTransfer__stop_transfer">Detener transferencia</string>
@@ -4177,12 +4315,12 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Transferir cuenta</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Descarga Signal en tu dispositivo Android nuevo</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Descarga Molly en tu dispositivo Android nuevo</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Toca en «Transferir o restaurar cuenta»"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
-    <string name="OldDeviceTransferInstructions__select_transfer_from_android_device_when_prompted_and_then_continue">"Selecciona «Transferir desde dispositivo Android» y después en «Adelante». Mantén ambos dispositivos cerca."</string>
-    <string name="OldDeviceTransferInstructions__continue">Adelante</string>
+    <string name="OldDeviceTransferInstructions__select_transfer_from_android_device_when_prompted_and_then_continue">"Selecciona «Transferir desde dispositivo Android» y después en «Continuar». Mantén ambos dispositivos cerca."</string>
+    <string name="OldDeviceTransferInstructions__continue">Continuar</string>
 
     <!-- OldDeviceTransferComplete -->
     <string name="OldDeviceTransferComplete__go_to_your_new_device">Comprueba tu dispositivo nuevo</string>
@@ -4197,12 +4335,12 @@
 
     <!-- DeviceToDeviceTransferService -->
     <string name="DeviceToDeviceTransferService_content_title">Transferir cuenta</string>
-    <string name="DeviceToDeviceTransferService_status_ready">Preparando a conectarse con tu otro dispositivo Android …</string>
-    <string name="DeviceToDeviceTransferService_status_starting_up">Preparando a conectarse con tu otro dispositivo Android …</string>
-    <string name="DeviceToDeviceTransferService_status_discovery">Buscando tu otro dispositivo Android …</string>
-    <string name="DeviceToDeviceTransferService_status_network_connected">Conectándose a tu otro dispositivo Android …</string>
+    <string name="DeviceToDeviceTransferService_status_ready">Preparando para conectarse con tu otro dispositivo Android…</string>
+    <string name="DeviceToDeviceTransferService_status_starting_up">Preparando para conectarse con tu otro dispositivo Android…</string>
+    <string name="DeviceToDeviceTransferService_status_discovery">Buscando tu otro dispositivo Android…</string>
+    <string name="DeviceToDeviceTransferService_status_network_connected">Conectándose a tu otro dispositivo Android…</string>
     <string name="DeviceToDeviceTransferService_status_verification_required">Verificación necesaria</string>
-    <string name="DeviceToDeviceTransferService_status_service_connected">Transfiriendo cuenta …</string>
+    <string name="DeviceToDeviceTransferService_status_service_connected">Transfiriendo cuenta…</string>
 
     <!-- OldDeviceTransferLockedDialog -->
     <string name="OldDeviceTransferLockedDialog__complete_registration_on_your_new_device">Completa el proceso de registro en el nuevo dispositivo</string>
@@ -4220,7 +4358,7 @@
     <string name="RecipientBottomSheet_unable_to_open_contacts">Fallo al encontrar una aplicación para abrir contactos.</string>
     <string name="RecipientBottomSheet_add_to_a_group">Añadir a un grupo</string>
     <string name="RecipientBottomSheet_add_to_another_group">Añadir a otro grupo</string>
-    <string name="RecipientBottomSheet_view_safety_number">Ver cifras de seguridad</string>
+    <string name="RecipientBottomSheet_view_safety_number">Ver número de seguridad</string>
     <string name="RecipientBottomSheet_make_admin">Promover a admin</string>
     <string name="RecipientBottomSheet_remove_as_admin">Retirar permisos de admin</string>
     <string name="RecipientBottomSheet_remove_from_group">Expulsar del grupo</string>
@@ -4245,13 +4383,13 @@
     <string name="GroupsLearnMore_what_are_legacy_groups">¿Qué son los grupos antiguos?</string>
     <string name="GroupsLearnMore_paragraph_1">Los grupos antiguos no son compatibles con las funciones de los grupos nuevos como admins o actualizaciones más descriptivas.</string>
     <string name="GroupsLearnMore_can_i_upgrade_a_legacy_group">¿Cómo actualizo un grupo antiguo?</string>
-    <string name="GroupsLearnMore_paragraph_2">Los grupos antiguos todavía no pueden convertirse en grupos nuevos, pero puedes crear un grupo nuevo con la misma gente, si tod@s usan la versión más reciente de Signal.</string>
+    <string name="GroupsLearnMore_paragraph_2">Los grupos antiguos todavía no pueden convertirse en grupos nuevos, pero puedes crear un grupo nuevo con las mismas personas, si todas tienen la versión más reciente de Signal.</string>
     <string name="GroupsLearnMore_paragraph_3">Signal ofrecerá la manera de actualizar un grupo antiguo en el futuro.</string>
 
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Quienquiera que reciba este enlace puede ver el nombre del grupo, su avatar y solicitar unirse. Compártelo con gente en quien confíes.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Quienquiera que reciba este enlace puede ver el nombre del grupo, su avatar y unirse al grupo. Compártelo con gente en quien confíes.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Compartir vía Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Compartir vía Molly</string>
     <string name="GroupLinkBottomSheet_copy">Copiar</string>
     <string name="GroupLinkBottomSheet_qr_code">Código QR</string>
     <string name="GroupLinkBottomSheet_share">Compartir</string>
@@ -4279,13 +4417,13 @@
     <string name="ReviewCardDialogFragment__review_request">Revisar solicitud</string>
     <!-- Message of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <plurals name="ReviewCardDialogFragment__d_group_members_have_the_same_name">
-        <item quantity="one">%1$d participante del grupo usa el mismo nombre. Revisa la lista de participantes debajo y selecciona la opción adecuada.</item>
-        <item quantity="other">%1$d participantes del grupo usan el mismo nombre. Revisa la lista de participantes debajo y selecciona la opción adecuada.</item>
+        <item quantity="one">%1$d participante del grupo tiene el mismo nombre. Revisa la lista de participantes debajo y selecciona la opción adecuada.</item>
+        <item quantity="other">%1$d participantes del grupo tienen el mismo nombre. Revisa la lista de participantes debajo y selecciona la opción adecuada.</item>
     </plurals>
     <!-- Message of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <plurals name="ReviewCardDialogFragment__if_youre_not_sure">
-        <item quantity="one">Si no sabes quién ha enviado esta solicitud, revisa el contacto debajo para tomar la decisión correcta.</item>
-        <item quantity="other">Si no sabes quién ha enviado esta solicitud, revisa la lista de contactos debajo para tomar la decisión correcta.</item>
+        <item quantity="one">Si no sabes quién ha enviado esta solicitud, revisa el contacto debajo para decidir qué quieres hacer.</item>
+        <item quantity="other">Si no sabes quién ha enviado esta solicitud, revisa la lista de contactos debajo para decidir qué quieres hacer.</item>
     </plurals>
     <string name="ReviewCardDialogFragment__no_other_groups_in_common">No hay otros grupos en común.</string>
     <string name="ReviewCardDialogFragment__no_groups_in_common">No hay grupos en común.</string>
@@ -4311,7 +4449,7 @@
     <!-- Displayed when a recent name change has occurred. First placeholder is new short name, second is previous name, third is new name. -->
     <string name="ReviewCard__s_recently_changed">%1$s ha cambiado su nombre de perfil recientemente de %2$s a %3$s</string>
     <!-- Displayed when a review user is in your system contacts. Placeholder is short name. -->
-    <string name="ReviewCard__s_is_in_your_system_contacts">%1$s está entre tus contactos del teléfono</string>
+    <string name="ReviewCard__s_is_in_your_system_contacts">%1$s está en tus contactos del teléfono</string>
 
     <!-- CallParticipantsListUpdatePopupWindow -->
     <string name="CallParticipantsListUpdatePopupWindow__s_joined">%1$s se ha unido</string>
@@ -4355,9 +4493,9 @@
     <string name="DeleteAccountFragment__failed_to_delete_local_data">Fallo al eliminar los datos locales. Puedes hacerlo manualmente desde los ajustes del sistema para la aplicación.</string>
     <string name="DeleteAccountFragment__launch_app_settings">Ir a los ajustes de aplicaciones</string>
     <!-- Title of progress dialog shown when a user deletes their account and the process is leaving all groups -->
-    <string name="DeleteAccountFragment__leaving_groups">Abandonando grupos …</string>
+    <string name="DeleteAccountFragment__leaving_groups">Abandonando grupos…</string>
     <!-- Title of progress dialog shown when a user deletes their account and the process has left all groups -->
-    <string name="DeleteAccountFragment__deleting_account">Eliminando cuenta …</string>
+    <string name="DeleteAccountFragment__deleting_account">Eliminando cuenta…</string>
     <!-- Message of progress dialog shown when a user deletes their account and the process is canceling their subscription -->
     <string name="DeleteAccountFragment__canceling_your_subscription">Cancelando tu suscripción…</string>
     <!-- Message of progress dialog shown when a user deletes their account and the process is leaving groups -->
@@ -4367,7 +4505,7 @@
     <!-- Title of error dialog shown when a network error occurs during account deletion -->
     <string name="DeleteAccountFragment__account_not_deleted">Cuenta no eliminada</string>
     <!-- Message of error dialog shown when a network error occurs during account deletion -->
-    <string name="DeleteAccountFragment__there_was_a_problem">Ha ocurrido un fallo al completar el proceso de eliminar tu cuenta. Comprueba tu conexión e inténtalo de nuevo.</string>
+    <string name="DeleteAccountFragment__there_was_a_problem">No se ha podido completar el proceso de eliminación de tu cuenta. Comprueba tu conexión de red e inténtalo de nuevo.</string>
 
     <!-- DeleteAccountCountryPickerFragment -->
     <string name="DeleteAccountCountryPickerFragment__search_countries">Buscar país</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">Sobre MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin es una nueva moneda digital enfocada en la privacidad.</string>
     <string name="payment_info_card_adding_funds">Añadir fondos</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Puedes añadir fondos para hacer pagos a personas a través de Signal al enviar MobileCoin a la dirección de tu cartera de Signal.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Puedes añadir fondos para hacer pagos a personas a través de Molly al enviar MobileCoin a la dirección de tu cartera de Molly.</string>
     <string name="payment_info_card_cashing_out">Recuperar</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Siempre puedes recuperar tus fondos al transferirlos a un «exchange» que soporte MobileCoin. Tan solo tienes que hacer una transferencia a tu cuenta en ese «exchange».</string>
     <string name="payment_info_card_hide_this_card">¿Ocultar esta tarjeta?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Desactivar cartera</string>
     <string name="DeactivateWalletFragment__your_balance">Tu balance</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Te recomendamos transferir tus fondos a otra cartera antes de desactivar los pagos. Si seleccionas no transferir los fondos ahora, permanecerán en la cartera asociada a tu cuenta de Signal cuando vuelvas a activar los pagos.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Te recomendamos transferir tus fondos a otra cartera antes de desactivar los pagos. Si seleccionas no transferir los fondos ahora, permanecerán en la cartera asociada a tu cuenta de Molly cuando vuelvas a activar los pagos.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Transferir balance restante</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Desactivar sin transferir</string>
     <string name="DeactivateWalletFragment__deactivate">Desactivar</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">¿Desactivar sin transferir?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Tu balance permanecerá en la cartera asociada a tu cuenta de Signal para cuando decidas reactivar los pagos.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Tu balance permanecerá en la cartera asociada a tu cuenta de Molly para cuando decidas reactivar los pagos.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Fallo al desactivar cartera.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4498,7 +4636,7 @@
     <string name="PaymentsRecoveryPasteFragment__paste_recovery_phrase">Pegar frase de recuperación</string>
     <string name="PaymentsRecoveryPasteFragment__recovery_phrase">Frase de recuperación</string>
     <string name="PaymentsRecoveryPasteFragment__next">Siguiente</string>
-    <string name="PaymentsRecoveryPasteFragment__invalid_recovery_phrase">Frase de recuperación inválida</string>
+    <string name="PaymentsRecoveryPasteFragment__invalid_recovery_phrase">Frase de recuperación no válida</string>
     <string name="PaymentsRecoveryPasteFragment__make_sure">Asegúrate que has introducido las %1$d palabras correctas e inténtalo de nuevo.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsRecoveryStartFragment__learn_more__view" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_wallet_view_passphrase</string> -->
@@ -4512,7 +4650,7 @@
     <string name="PaymentsRecoveryPhraseFragment__make_sure_youve_entered">Asegúrate que has introducido la frase de recuperación correcta.</string>
     <string name="PaymentsRecoveryPhraseFragment__do_not_screenshot_or_send_by_email">No hagas una captura de pantalla y sobre todo, no la envíes por correo electrónico.</string>
     <string name="PaymentsRecoveryPhraseFragment__payments_account_restored">Cuenta de pagos restaurada.</string>
-    <string name="PaymentsRecoveryPhraseFragment__invalid_recovery_phrase">Frase de recuperación inválida</string>
+    <string name="PaymentsRecoveryPhraseFragment__invalid_recovery_phrase">Frase de recuperación no válida</string>
     <string name="PaymentsRecoveryPhraseFragment__make_sure_youve_entered_your_phrase_correctly_and_try_again">Asegúrate que has introducido la frase de recuperación correcta e inténtalo de nuevo.</string>
     <string name="PaymentsRecoveryPhraseFragment__copy_to_clipboard">¿Copiar al portapapeles?</string>
     <string name="PaymentsRecoveryPhraseFragment__if_you_choose_to_store">Si seleccionas guardar tu frase de recuperación de forma digital, asegúrate que está almacenada en un sitio de confianza: P.ej. en el gestor de contraseñas.</string>
@@ -4564,11 +4702,11 @@
     <!-- Label for our high quality media conversion. This has better quality than standard. -->
     <string name="QualitySelectorBottomSheetDialog__slower_more_data">Lenta, más datos</string>
     <!-- Title heading for our media conversion quality selector. -->
-    <string name="QualitySelectorBottomSheetDialog__media_quality">Calidad de fotos y vídeos</string>
+    <string name="QualitySelectorBottomSheetDialog__media_quality">Calidad de archivos multimedia</string>
 
     <!-- AppSettingsFragment -->
     <string name="AppSettingsFragment__invite_your_friends">¡Invita a tus amistades!</string>
-    <string name="AppSettingsFragment__copied_subscriber_id_to_clipboard">Id de usiari@ copiada al portapapeles</string>
+    <string name="AppSettingsFragment__copied_subscriber_id_to_clipboard">ID de usuario copiada al portapapeles</string>
 
     <!-- AccountSettingsFragment -->
     <string name="AccountSettingsFragment__account">Cuenta</string>
@@ -4621,7 +4759,7 @@
 
     <!-- ChangeNumberFragment -->
     <string name="ChangeNumberFragment__use_this_to_change_your_current_phone_number_to_a_new_phone_number">Esta opción te permite cambiar tu número de teléfono actual en Signal a un número de teléfono nuevo. Este cambio no se puede deshacer.\n\n Antes de continuar, asegúrate que tu número nuevo puede recibir SMS o llamadas.</string>
-    <string name="ChangeNumberFragment__continue">Adelante</string>
+    <string name="ChangeNumberFragment__continue">Continuar</string>
     <!-- Message shown on dialog after your number has been changed successfully. -->
     <string name="ChangeNumber__your_phone_number_has_changed_to_s">Tu número de teléfono ha cambiado a %1$s</string>
     <!-- Confirmation button to dismiss number changed dialog -->
@@ -4661,11 +4799,11 @@
 
     <!-- ChangeNumberLockActivity -->
     <!-- Info message shown to user if something crashed the app during the change number attempt and we were unable to confirm the change so we force them into this screen to check before letting them use the app -->
-    <string name="ChangeNumberLockActivity__it_looks_like_you_tried_to_change_your_number_but_we_were_unable_to_determine_if_it_was_successful_rechecking_now">Parece que has intentado cambiar tu número de teléfono pero Signal no puede determinar si el cambio se ha completado con éxito.\n\nVolviendo a comprobar ahora …</string>
+    <string name="ChangeNumberLockActivity__it_looks_like_you_tried_to_change_your_number_but_we_were_unable_to_determine_if_it_was_successful_rechecking_now">Parece que has intentado cambiar tu número de teléfono, pero Signal no puede determinar si el cambio se ha completado correctamente.\n\nVolviendo a comprobar ahora…</string>
     <!-- Dialog title shown if we were able to confirm your change number status (meaning we now know what the server thinks our number is) after a crash during the regular flow -->
     <string name="ChangeNumberLockActivity__change_status_confirmed">Cambio de número confirmado</string>
     <!-- Dialog message shown if we were able to confirm your change number status (meaning we now know what the server thinks our number is) after a crash during the regular flow -->
-    <string name="ChangeNumberLockActivity__your_number_has_been_confirmed_as_s">Hemos confirmado tu nuevo número en Signal: %1$s. Si este no es tu nuevo número, por favor anótalo e inicia el proceso de cambio de número de nuevo.</string>
+    <string name="ChangeNumberLockActivity__your_number_has_been_confirmed_as_s">Hemos confirmado tu nuevo número en Signal: %1$s. Si este no es tu nuevo número, vuelve a iniciar el proceso de cambio de número.</string>
     <!-- Dialog title shown if we were not able to confirm your phone number with the server and thus cannot let leave the change flow yet after a crash during the regular flow -->
     <string name="ChangeNumberLockActivity__change_status_unconfirmed">Cambio de número no confirmado</string>
     <!-- Dialog message shown when we can\'t verify the phone number on the server, only shown if there was a network error communicating with the server after a crash during the regular flow -->
@@ -4683,7 +4821,7 @@
     <!-- NotificationsSettingsFragment -->
     <string name="NotificationsSettingsFragment__messages">Mensajes</string>
     <string name="NotificationsSettingsFragment__calls">Llamadas</string>
-    <string name="NotificationsSettingsFragment__notify_when">Notificarme cuando …</string>
+    <string name="NotificationsSettingsFragment__notify_when">Notificarme cuando…</string>
     <string name="NotificationsSettingsFragment__contact_joins_signal">Alguien comienza a usar Signal</string>
     <!-- Notification preference header -->
     <string name="NotificationsSettingsFragment__notification_profiles">Perfiles de notificaciones</string>
@@ -4757,8 +4895,8 @@
     <string name="HelpSettingsFragment__debug_log">Registro de depuración (log)</string>
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licencias</string>
-    <string name="HelpSettingsFragment__terms_amp_privacy_policy">Términos y política de privacidad</string>
-    <string name="HelpFragment__copyright_signal_messenger">Derechos de Signal Messenger</string>
+    <string name="HelpSettingsFragment__terms_amp_privacy_policy">Términos y Política de privacidad</string>
+    <string name="HelpFragment__copyright_signal_messenger">Derechos de Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">App liberada bajo GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4880,7 +5018,7 @@
     <string name="ConversationSettingsFragment__sounds_and_notifications">Sonidos y notificaciones</string>
   <!-- Removed by excludeNonTranslatables <string name="ConversationSettingsFragment__internal_details" translatable="false">Internal details</string> -->
     <string name="ConversationSettingsFragment__contact_details">Información de contacto del teléfono</string>
-    <string name="ConversationSettingsFragment__view_safety_number">Ver cifras de seguridad</string>
+    <string name="ConversationSettingsFragment__view_safety_number">Ver número de seguridad</string>
     <string name="ConversationSettingsFragment__block">Bloquear</string>
     <string name="ConversationSettingsFragment__block_group">Bloquear grupo</string>
     <string name="ConversationSettingsFragment__unblock">Desbloquear</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Selecciona un color</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Compartir</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Solo admins pueden enviar mensajes en este grupo.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Límite alcanzado</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">No se puede seleccionar más de 5 chats</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5063,13 +5199,13 @@
     <string name="MediaReviewFragment__photo_set_to_standard_quality">Foto configurada en calidad estándar</string>
     <!-- Small notification presented to the user when they set multiple media items to be sent in high visual quality. -->
     <plurals name="MediaReviewFragment__items_set_to_high_quality">
-        <item quantity="one">%1$d artículo configurado en alta calidad</item>
-        <item quantity="other">%1$d artículos configurados en alta calidad</item>
+        <item quantity="one">%1$d elemento configurado en alta calidad</item>
+        <item quantity="other">%1$d elementos configurados en alta calidad</item>
     </plurals>
     <!-- Small notification presented to the user when they set multiple media items to be sent in standard (lower than high) visual quality. -->
     <plurals name="MediaReviewFragment__items_set_to_standard_quality">
-        <item quantity="one">%1$d artículo configurado en calidad estándar</item>
-        <item quantity="other">%1$d artículos configurados en calidad estándar</item>
+        <item quantity="one">%1$d elemento configurado en calidad estándar</item>
+        <item quantity="other">%1$d elementos configurados en calidad estándar</item>
     </plurals>
 
     <string name="ImageEditorHud__cancel">Cancelar</string>
@@ -5096,16 +5232,16 @@
     <string name="MediaReviewImagePageFragment__youll_lose_any_changes">Perderás todos los cambios que has hecho a esta imagen.</string>
 
     <!-- The title of a dialog notifying that a user was found matching a scanned QR code. The placeholder is a username. Usernames are always latin characters. -->
-    <string name="MediaCaptureFragment_username_dialog_title">Encontramos a %1$s</string>
+    <string name="MediaCaptureFragment_username_dialog_title">Hemos encontrado a %1$s</string>
     <!-- The body of a dialog notifying that a user was found matching a scanned QR code, prompting the user to start a chat with them. The placeholder is a username. Usernames are always latin characters. -->
-    <string name="MediaCaptureFragment_username_dialog_body">Iniciar un chat con \"%1$s\"</string>
+    <string name="MediaCaptureFragment_username_dialog_body">Iniciar un chat con «%1$s»</string>
     <!-- The label of a dialog asking the user if they would like to start a chat with a specific user. -->
     <string name="MediaCaptureFragment_username_dialog_go_to_chat_button">Ir al chat</string>
 
     <!-- The title of a dialog notifying that the user scanned a QR code that could be used to link a Signal device. -->
-    <string name="MediaCaptureFragment_device_link_dialog_title">¿Enlazar dispositivo?</string>
+    <string name="MediaCaptureFragment_device_link_dialog_title">¿Vincular dispositivo?</string>
     <!-- The body of a dialog notifying that the user scanned a QR code that could be used to link a Signal device. -->
-    <string name="MediaCaptureFragment_device_link_dialog_body">Parece que estás intentando enlazar un dispositivo Signal. Pulsa continuar y vuelve a escanear el código para enlazarlo.</string>
+    <string name="MediaCaptureFragment_device_link_dialog_body">Parece que estás intentando vincular un dispositivo Signal. Toca «Continuar» y vuelve a escanear el código para vincularlo.</string>
     <!-- The label of a dialog asking the user if they would like to continue to the linked device settings screen. -->
     <string name="MediaCaptureFragment_device_link_dialog_continue">Continuar</string>
 
@@ -5188,11 +5324,11 @@
     <!-- Preference label to launch badge gifting -->
     <string name="ManageDonationsFragment__donate_for_a_friend">Donar en nombre de un amigo</string>
     <!-- Dialog title shown when a donation requires verifying/confirmation outside of the app and the user hasn\'t done that yet -->
-    <string name="ManageDonationsFragment__couldnt_confirm_donation">No se pudo confirmar la donación</string>
+    <string name="ManageDonationsFragment__couldnt_confirm_donation">No se ha podido confirmar la donación</string>
     <!-- Dialog message shown when a monthly donation requires verifying/confirmation outside of the app and the user hasn\'t done that yet, placeholder is money amount -->
-    <string name="ManageDonationsFragment__your_monthly_s_donation_couldnt_be_confirmed">No se pudo procesar tu donación mensual de %1$s. Consulta tu app bancaria para aprobar tu pago a través de iDEAL.</string>
+    <string name="ManageDonationsFragment__your_monthly_s_donation_couldnt_be_confirmed">No se ha podido procesar tu donación mensual de %1$s. Consulta la aplicación de tu banco para aprobar el pago a través de iDEAL.</string>
     <!-- Dialog message shown when a one-time donation requires verifying/confirmation outside of the app and the user hasn\'t done that yet, placeholder is money amount -->
-    <string name="ManageDonationsFragment__your_one_time_s_donation_couldnt_be_confirmed">No se pudo procesar tu donación única de %1$s. Consulta tu app bancaria para aprobar tu pago a través de iDEAL.</string>
+    <string name="ManageDonationsFragment__your_one_time_s_donation_couldnt_be_confirmed">No se ha podido procesar tu donación única de %1$s. Consulta la aplicación de tu banco para aprobar el pago a través de iDEAL.</string>
 
     <string name="Boost__enter_custom_amount">Introduce una cantidad personalizada</string>
     <!-- Error label when the amount is smaller than what we can accept -->
@@ -5200,21 +5336,21 @@
 
     <string name="MySupportPreference__s_per_month">%1$s al mes</string>
     <string name="MySupportPreference__renews_s">Se renueva el %1$s</string>
-    <string name="MySupportPreference__processing_transaction">Procesando transacción …</string>
+    <string name="MySupportPreference__processing_transaction">Procesando transacción…</string>
     <!-- Displayed on "My Support" screen when user badge failed to be added to their account -->
     <string name="MySupportPreference__couldnt_add_badge_s">Fallo al añadir insignia. %1$s</string>
-    <string name="MySupportPreference__please_contact_support">Por favor, contacta con nuestro soporte.</string>
+    <string name="MySupportPreference__please_contact_support">Contacta con el equipo de asistencia.</string>
     <!-- Displayed as a subtitle on a row in the Manage Donations screen when payment for a donation is pending -->
     <string name="MySupportPreference__payment_pending">Pago pendiente</string>
     <!-- Displayed as a dialog message when clicking on a donation row that is pending. Placeholder is a formatted fiat amount -->
-    <string name="MySupportPreference__your_bank_transfer_of_s">Tu transferencia bancaria de %1$s está pendiente. Las transferencias bancarias pueden tardar 14 días hábiles en completarse.  </string>
+    <string name="MySupportPreference__your_bank_transfer_of_s">Tu transferencia bancaria de %1$s está pendiente. Las transferencias bancarias pueden tardar de 1 a 14 días hábiles en completarse.  </string>
     <!-- Displayed in the pending help dialog, used to launch user to more details about bank transfers -->
     <string name="MySupportPreference__learn_more">Saber más</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Actualiza Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Actualiza Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Esta versión de Signal ha caducado. Actualízala ahora para continuar usando Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Esta versión de Molly ha caducado. Actualízala ahora para continuar usando Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Actualizar</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Dispositivo no registrado</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Este dispositivo ya no está registrado. Vuelve a registrarte para seguir usando Signal en este dispositivo.</string>
+    <string name="ReregisterSignalDialog__message">Este dispositivo ya no está registrado. Vuelve a registrarte para seguir usando Molly en este dispositivo.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Registrarse de nuevo</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5256,7 +5392,7 @@
     <string name="CantProcessSubscriptionPaymentBottomSheetDialogFragment__were_having_trouble">Tenemos problemas con el cargo de tu sostén para Signal. Asegúrate que tu método de pago está al día. Si no es así, actualízalo en Google Pay. Signal intentará procesar el pago de nuevo en unos pocos días.</string>
     <string name="CantProcessSubscriptionPaymentBottomSheetDialogFragment__dont_show_this_again">No mostrar de nuevo</string>
 
-    <string name="Subscription__contact_support">Contactar con el soporte técnico</string>
+    <string name="Subscription__contact_support">Contactar con asistencia</string>
     <string name="Subscription__get_a_s_badge">Consigue la insignia «%1$s»</string>
 
     <string name="SubscribeFragment__processing_payment">Procesando donación…</string>
@@ -5268,32 +5404,32 @@
     <string name="DonationsErrors__learn_more">Saber más</string>
     <!-- Displayed on "My Support" screen when user subscription payment method failed. -->
     <string name="DonationsErrors__error_processing_payment_s">Fallo al procesar la donación. %1$s</string>
-    <string name="DonationsErrors__your_payment">No se ha podido procesar tu donación y no hemos hecho el cargo. Inténtalo de nuevo. Por favor, inténtalo de nuevo.</string>
-    <string name="DonationsErrors__still_processing">En proceso …</string>
+    <string name="DonationsErrors__your_payment">No se ha podido procesar tu donación y no hemos realizado el cargo. Inténtalo de nuevo.</string>
+    <string name="DonationsErrors__still_processing">En proceso</string>
     <string name="DonationsErrors__couldnt_add_badge">Fallo al añadir insignia</string>
     <!-- Displayed when badge credential couldn\'t be verified -->
     <string name="DonationsErrors__failed_to_validate_badge">Fallo al validar la insignia</string>
     <!-- Displayed when badge credential couldn\'t be verified -->
-    <string name="DonationsErrors__could_not_validate">Fallo al validar la respuesta del servidor. Por favor, contacta con el soporte.</string>
+    <string name="DonationsErrors__could_not_validate">No se ha podido validar la respuesta del servidor. Contacta con el equipo de asistencia.</string>
     <!-- Displayed as title when some generic error happens during sending donation on behalf of another user -->
     <string name="DonationsErrors__donation_failed">Donación fallida</string>
     <!-- Displayed as message when some generic error happens during sending donation on behalf of another user -->
-    <string name="DonationsErrors__your_payment_was_processed_but">Tu donación ha sido procesada, pero Signal no ha podido enviar tu mensaje de donación. Por favor, contacta con nuestro soporte.</string>
-    <string name="DonationsErrors__your_badge_could_not">No se ha podido añadir la insignia a tu perfil, pero puede haberse tramitado tu pago. Por favor, contacta con el soporte.</string>
-    <string name="DonationsErrors__your_payment_is_still">Todavía se está procesando tu donación. Puede tomar unos minutos dependiendo de tu conexión.</string>
+    <string name="DonationsErrors__your_payment_was_processed_but">Tu donación se ha procesado, pero Signal no ha podido enviar tu mensaje de donación. Contacta con el equipo de asistencia.</string>
+    <string name="DonationsErrors__your_badge_could_not">No se ha podido añadir la insignia a tu perfil, pero es posible que se haya realizado el cargo. Contacta con el equipo de asistencia.</string>
+    <string name="DonationsErrors__your_payment_is_still">Tu donación todavía se está procesando. Este proceso puede tardar unos minutos dependiendo de tu conexión.</string>
     <string name="DonationsErrors__failed_to_cancel_subscription">Fallo al cancelar la suscripción</string>
-    <string name="DonationsErrors__subscription_cancellation_requires_an_internet_connection">Necesitas una conexión a internet para cancelar la suscripción.</string>
+    <string name="DonationsErrors__subscription_cancellation_requires_an_internet_connection">Necesitas conexión a Internet para cancelar la suscripción.</string>
     <string name="ViewBadgeBottomSheetDialogFragment__your_device_doesn_t_support_google_pay_so_you_can_t_subscribe_to_earn_a_badge_you_can_still_support_signal_by_making_a_donation_on_our_website">Tu dispositivo no tiene Google Pay activado, por lo que no puedes crear una suscripción y conseguir una insignia. También puedes contribuir a Signal al hacer una donación en la página web de Signal.</string>
-    <string name="NetworkFailure__network_error_check_your_connection_and_try_again">Fallo en la red. Comprueba tu conexión e inténtalo de nuevo.</string>
+    <string name="NetworkFailure__network_error_check_your_connection_and_try_again">Error de red. Comprueba tu conexión e inténtalo de nuevo.</string>
     <string name="NetworkFailure__retry">Reintentar</string>
     <!-- Displayed as a dialog title when the selected recipient for a gift doesn\'t support gifting -->
     <string name="DonationsErrors__cannot_send_donation">No se puede enviar la donación</string>
     <!-- Displayed as a dialog message when the selected recipient for a gift doesn\'t support gifting -->
     <string name="DonationsErrors__this_user_cant_receive_donations_until">Esta persona no puede recibir donaciones hasta que actualice Signal.</string>
     <!-- Displayed as a dialog message when the user\'s profile could not be fetched, likely due to lack of internet -->
-    <string name="DonationsErrors__your_donation_could_not_be_sent">No se ha podido mandar tu donación a causa de un error de la red. Comprueba tu conexión y vuelve a intentarlo.</string>
+    <string name="DonationsErrors__your_donation_could_not_be_sent">No se ha podido mandar tu donación debido a un error de red. Comprueba tu conexión e inténtalo de nuevo.</string>
     <!-- Displayed as a dialog message when the user encounters an error during an iDEAL donation -->
-    <string name="DonationsErrors__your_ideal_couldnt_be_processed">No se pudo procesar tu donación a través de iDEAL. Selecciona otro método de pago o contacta a tu banco para más información.</string>
+    <string name="DonationsErrors__your_ideal_couldnt_be_processed">No se ha podido procesar tu donación a través de iDEAL. Selecciona otro método de pago o contacta a tu banco para más información.</string>
 
     <!-- Gift message view title -->
     <string name="GiftMessageView__donation_on_behalf_of_s">Donación en nombre de %1$s</string>
@@ -5304,7 +5440,7 @@
     <!-- Gift badge view action label -->
     <string name="GiftMessageView__view">Ver</string>
     <!-- Gift badge redeeming action label -->
-    <string name="GiftMessageView__redeeming">Canjeando …</string>
+    <string name="GiftMessageView__redeeming">Canjeando…</string>
     <!-- Gift badge redeemed label -->
     <string name="GiftMessageView__redeemed">Canjeado</string>
 
@@ -5410,7 +5546,7 @@
     <!-- List preference to toggle that allows calls through the notification profile during create flow -->
     <string name="AddAllowedMembers__allow_all_calls">Permitir todas las llamadas</string>
     <!-- List preference to toggle that allows mentions through the notification profile during create flow -->
-    <string name="AddAllowedMembers__notify_for_all_mentions">Notificar al mencionarme</string>
+    <string name="AddAllowedMembers__notify_for_all_mentions">Notificarme cuando alguien me mencione</string>
 
     <!-- Call to action button on contact picker for adding to profile -->
     <string name="SelectRecipientsFragment__add">Añadir</string>
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Fallo al abrir el selector.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Para activar las notificaciones, Signal necesita permiso para mostrarlas.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Para activar las notificaciones, Molly necesita permiso para mostrarlas.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Activar</string>
 
@@ -5549,7 +5685,7 @@
     <!-- Donation receipts amount title -->
     <string name="DonationReceiptDetailsFragment__amount">Cantidad</string>
     <!-- Donation receipts thanks -->
-    <string name="DonationReceiptDetailsFragment__thank_you_for_supporting">Gracias por apoyar Signal. Tu apoyo alienta nuestro propósito de desarrollar tecnología segura de código abierto que protege la libre expresión y permite comunicaciones globales seguras a millones de personas en el mundo. Si eres residente en los Estados Unidos de América, por favor, conserva este justificante para tus declaraciones tributarias. La Signal Technology Foundation es una organización sin ánimo de lucro exenta de impuestos en los Estados Unidos de América bajo la sección 501c3 del Código de Rentas Interno. Nuestro número federal tributario de identificación es 82-4506840.</string>
+    <string name="DonationReceiptDetailsFragment__thank_you_for_supporting">Gracias por apoyar a Signal. Tu contribución ayuda a impulsar nuestra misión de desarrollar tecnología de código abierto basada en la privacidad que protege la libre expresión y hace posible una comunicación segura a nivel global para millones de personas en todo el mundo. Si resides en Estados Unidos, conserva este justificante para tus declaraciones fiscales. Signal Technology Foundation es una organización sin ánimo de lucro exenta de impuestos en Estados Unidos bajo la sección 501(c)(3) del Código Tributario Interno de EE. UU. Nuestro número de identificación fiscal es 82-4506840.</string>
     <!-- Donation receipt type -->
     <string name="DonationReceiptDetailsFragment__s_dash_s">%1$s - %2$s</string>
     <!-- Donation reciepts screen empty state title -->
@@ -5580,15 +5716,15 @@
     <!-- Context menu option to forward a story -->
     <string name="StoriesLandingItem__forward">Reenviar</string>
     <!-- Context menu option to share a story -->
-    <string name="StoriesLandingItem__share">Compartir …</string>
+    <string name="StoriesLandingItem__share">Compartir…</string>
     <!-- Context menu option to go to story chat -->
     <string name="StoriesLandingItem__go_to_chat">Ir al chat</string>
     <!-- Context menu option to go to story info -->
     <string name="StoriesLandingItem__info">Detalles</string>
     <!-- Label when a story is pending sending -->
-    <string name="StoriesLandingItem__sending">Enviando …</string>
+    <string name="StoriesLandingItem__sending">Enviando…</string>
     <!-- Label when multiple stories are pending sending -->
-    <string name="StoriesLandingItem__sending_d">Enviando %1$d …</string>
+    <string name="StoriesLandingItem__sending_d">Enviando %1$d…</string>
     <!-- Label when a story fails to send due to networking -->
     <string name="StoriesLandingItem__send_failed">Fallo al enviar</string>
     <!-- Label when a story fails to send due to identity mismatch -->
@@ -5665,9 +5801,11 @@
     <!-- Displayed when a story has no replies yet -->
     <string name="StoryGroupReplyFragment__no_replies_yet">Sin respuestas por ahora</string>
     <!-- Displayed when no longer a group member -->
-    <string name="StoryGroupReplyFragment__you_cant_reply">No puedes responder a esta historia porque ya no perteneces a este grupo.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Reaccionó a la historia</string>
+    <string name="StoryGroupReplyFragment__you_cant_reply">No puedes responder a esta historia porque ya no formas parte de este grupo.</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Has reaccionado a la historia</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Reaccionó a la historia</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Vistas</string>
     <!-- Label for story replies tab -->
@@ -5694,7 +5832,7 @@
     <string name="MyStorySettingsFragment__who_can_view_this_story">Quién puede ver esta historia</string>
     <!-- Clickable option for selecting people to hide your story from -->
     <!-- Privacy setting title for sending stories to all your signal connections -->
-    <string name="MyStorySettingsFragment__all_signal_connections">Todas las conexiones de Signal</string>
+    <string name="MyStorySettingsFragment__all_signal_connections">Todos los contactos de Signal</string>
     <!-- Privacy setting description for sending stories to all your signal connections -->
     <!-- Privacy setting title for sending stories to all except the specified connections -->
     <string name="MyStorySettingsFragment__all_except">Todos excepto…</string>
@@ -5723,17 +5861,17 @@
     <!-- Summary for switchable option allowing replies and reactions on your story -->
     <string name="MyStorySettingsFragment__let_people_who_can_view_your_story_react_and_reply">Permite a personas que pueden ver tu historia responder y reaccionar</string>
     <!-- Signal connections bolded text in the Signal Connections sheet -->
-    <string name="SignalConnectionsBottomSheet___signal_connections">Conexiones de Signal</string>
+    <string name="SignalConnectionsBottomSheet___signal_connections">Contactos de Signal</string>
     <!-- Displayed at the top of the signal connections sheet. Please remember to insert strong tag as required. -->
-    <string name="SignalConnectionsBottomSheet__signal_connections_are_people">Las Conexiones de Signal son personas en las que has indicado que confías, ya sea a través de:</string>
+    <string name="SignalConnectionsBottomSheet__signal_connections_are_people">Los contactos de Signal son personas en las que has decidido confiar, ya que:</string>
     <!-- Signal connections sheet bullet point 1 -->
     <string name="SignalConnectionsBottomSheet__starting_a_conversation">Iniciar un chat</string>
     <!-- Signal connections sheet bullet point 2 -->
     <string name="SignalConnectionsBottomSheet__accepting_a_message_request">Has aceptado una solicitud de chat</string>
     <!-- Signal connections sheet bullet point 3 -->
-    <string name="SignalConnectionsBottomSheet__having_them_in_your_system_contacts">Están entre tus contactos del teléfono</string>
+    <string name="SignalConnectionsBottomSheet__having_them_in_your_system_contacts">Están en tus contactos del teléfono</string>
     <!-- Note at the bottom of the Signal connections sheet -->
-    <string name="SignalConnectionsBottomSheet__your_connections_can_see_your_name">"Tus conexiones en Signal pueden ver tu nombre y foto, así como tus «historias», a no ser que decidas ocultarlas para personas específicas."</string>
+    <string name="SignalConnectionsBottomSheet__your_connections_can_see_your_name">"Tus contactos pueden ver tu nombre y foto, así como las historias que subas, a no ser que decidas ocultarlas para personas específicas."</string>
     <!-- Clickable option to add a viewer to a custom story -->
     <string name="PrivateStorySettingsFragment__add_viewer">Añadir quién puede verla</string>
     <!-- Clickable option to delete a custom story -->
@@ -5770,7 +5908,7 @@
     <string name="TextStoryPostSendFragment__search">Buscar</string>
     <!-- Toast shown when an unexpected error occurs while sending a text story -->
     <!-- Toast shown when a trying to add a link preview to a text story post and the link/url is not valid (e.g., missing .com at the end) -->
-    <string name="TextStoryPostSendFragment__please_enter_a_valid_link">Por favor, introduce un enlace válido.</string>
+    <string name="TextStoryPostSendFragment__please_enter_a_valid_link">Introduce un enlace válido.</string>
     <!-- Title for screen allowing user to exclude "My Story" entries from specific people -->
     <string name="ChangeMyStoryMembershipFragment__all_except">Todos excepto…</string>
     <!-- Title for screen allowing user to only share "My Story" entries with specific people -->
@@ -5796,7 +5934,7 @@
     <!-- First time share to story dialog: Positive action to go ahead and add to story -->
     <!-- First time share to story dialog: Neutral action to edit who can view "My Story" -->
     <!-- Error message shown when a failure occurs during story send -->
-    <string name="StoryDialogs__story_could_not_be_sent">Fallo al enviar la historia. Comprueba tu conexión e inténtalo de nuevo.</string>
+    <string name="StoryDialogs__story_could_not_be_sent">No se ha podido enviar la historia. Comprueba tu conexión e inténtalo de nuevo.</string>
     <!-- Error message dialog button to resend a previously failed story send -->
     <string name="StoryDialogs__send">Enviar</string>
     <!-- Action button for turning off stories when stories are present on the device -->
@@ -5845,13 +5983,13 @@
     <!-- Displayed in story caption when content is longer than 5 lines -->
     <string name="StoryViewerPageFragment__see_more">Ver más</string>
     <!-- Displayed in toast after sending a direct reply -->
-    <string name="StoryDirectReplyDialogFragment__sending_reply">Enviando respuesta …</string>
+    <string name="StoryDirectReplyDialogFragment__sending_reply">Enviando respuesta…</string>
     <!-- Displayed in the viewer when a story is no longer available -->
     <string name="StorySlateView__this_story_is_no_longer_available">Esta historia ya no está disponible.</string>
     <!-- Displayed in the viewer when a story has permanently failed to download. -->
     <string name="StorySlateView__cant_download_story_s_will_need_to_share_it_again">No se puede descargar la historia. %1$s tendrá que compartirla de nuevo.</string>
     <!-- Displayed in the viewer when the network is not available -->
-    <string name="StorySlateView__no_internet_connection">Sin conexión a internet</string>
+    <string name="StorySlateView__no_internet_connection">Sin conexión a Internet</string>
     <!-- Displayed in the viewer when network is available but content could not be downloaded -->
     <string name="StorySlateView__couldnt_load_content">Imposible cargar contenido</string>
     <!-- Toasted when the user externally shares to a text story successfully -->
@@ -5895,7 +6033,7 @@
     <!-- Action button label for start fragment for gifting a badge -->
     <string name="GiftFlowStartFragment__next">Siguiente</string>
     <!-- Title text on choose recipient page for badge gifting -->
-    <string name="GiftFlowRecipientSelectionFragment__choose_recipient">Seleccionar persona</string>
+    <string name="GiftFlowRecipientSelectionFragment__choose_recipient">Seleccionar contacto</string>
     <!-- Title text on confirm gift page -->
     <string name="GiftFlowConfirmationFragment__confirm_donation">Confirmar donación</string>
     <!-- Heading text specifying who the gift will be sent to -->
@@ -5907,7 +6045,7 @@
     <!-- Hint for add message input -->
     <string name="GiftFlowConfirmationFragment__add_a_message">Añadir mensaje</string>
     <!-- Displayed in the dialog while verifying the chosen recipient -->
-    <string name="GiftFlowConfirmationFragment__verifying_recipient">Verificando persona …</string>
+    <string name="GiftFlowConfirmationFragment__verifying_recipient">Verificando contacto…</string>
     <!-- Title for sheet shown when opening a redeemed gift -->
     <string name="ViewReceivedGiftBottomSheet__s_made_a_donation_for_you">%1$s ha hecho una donación por ti</string>
     <!-- Title for sheet shown when opening a sent gift -->
@@ -6016,20 +6154,20 @@
     <!-- Title of safety number changes bottom sheet when showing individual records -->
     <string name="SafetyNumberBottomSheetFragment__safety_number_changes">Cambios en el número de seguridad</string>
     <!-- Message of safety number changes bottom sheet when showing individual records -->
-    <string name="SafetyNumberBottomSheetFragment__the_following_people">Las siguientes personas pueden haber reinstalado Signal o cambiado de dispositivo. Toca sobre un destinatario para confirmar su nuevo número de seguridad. Esto es opcional.</string>
+    <string name="SafetyNumberBottomSheetFragment__the_following_people">Es posible que las siguientes personas hayan reinstalado Signal o cambiado de dispositivo. Toca sobre un destinatario para confirmar su nuevo número de seguridad. Esta acción es opcional.</string>
     <!-- Title of safety number changes bottom sheet when not showing individual records -->
     <string name="SafetyNumberBottomSheetFragment__safety_number_checkup">Revisión del número de seguridad</string>
     <!-- Title of safety number changes bottom sheet when not showing individual records and user has seen review screen -->
     <string name="SafetyNumberBottomSheetFragment__safety_number_checkup_complete">Revisión del número de seguridad completada</string>
     <!-- Message of safety number changes bottom sheet when not showing individual records and user has seen review screen -->
-    <string name="SafetyNumberBottomSheetFragment__all_connections_have_been_reviewed">Se han revisado todos los contactos. Toca enviar para continuar.</string>
+    <string name="SafetyNumberBottomSheetFragment__all_connections_have_been_reviewed">Se han revisado todos los contactos. Toca «Enviar» para continuar.</string>
     <!-- Message of safety number changes bottom sheet when not showing individual records -->
     <plurals name="SafetyNumberBottomSheetFragment__you_have_d_connections_plural">
-        <item quantity="one">%1$d contacto puede haber reinstalado Signal o cambiado de dispositivo. Revisa su número de seguridad o continua con el envío.</item>
-        <item quantity="other">%1$d contactos pueden haber reinstalado Signal o cambiado de dispositivo. Revisa sus números de seguridad o continua con el envío.</item>
+        <item quantity="one">Es posible que %1$d contacto haya reinstalado Signal o cambiado de dispositivo. Revisa su número de seguridad o sigue enviando mensajes.</item>
+        <item quantity="other">Es posible que %1$d contactos hayan reinstalado Signal o cambiado de dispositivo. Revisa sus números de seguridad o sigue enviando mensajes.</item>
     </plurals>
     <!-- Menu action to launch safety number verification screen -->
-    <string name="SafetyNumberBottomSheetFragment__verify_safety_number">Verificar cifras de seguridad</string>
+    <string name="SafetyNumberBottomSheetFragment__verify_safety_number">Verificar número de seguridad</string>
     <!-- Menu action to remove user from story -->
     <string name="SafetyNumberBottomSheetFragment__remove_from_story">Retirar de la historia</string>
     <!-- Action button at bottom of SafetyNumberBottomSheetFragment to send anyway -->
@@ -6044,8 +6182,8 @@
     <string name="SafetyNumberReviewConnectionsFragment__safety_number_changes">Cambios en el número de seguridad</string>
     <!-- Message of safety number review fragment -->
     <plurals name="SafetyNumberReviewConnectionsFragment__d_recipients_may_have">
-        <item quantity="one">%1$d destinatario puede haber reinstalado Signal o cambiado de dispositivo. Toca sobre un destinatario para confirmar su nuevo número de seguridad. Esto es opcional.</item>
-        <item quantity="other">%1$d destinatarios pueden haber reinstalado Signal o cambiado de dispositivo. Toca sobre un destinatario para confirmar su nuevo número de seguridad. Esto es opcional.</item>
+        <item quantity="one">Es posible que %1$d destinatario haya reinstalado Signal o cambiado de dispositivo. Toca sobre un destinatario para confirmar su nuevo número de seguridad. Esta acción es opcional.</item>
+        <item quantity="other">Es posible que %1$d destinatarios hayan reinstalado Signal o cambiado de dispositivo. Toca sobre un destinatario para confirmar su nuevo número de seguridad. Esta acción es opcional.</item>
     </plurals>
     <!-- Section header for 1:1 contacts in review fragment -->
     <string name="SafetyNumberBucketRowItem__contacts">Personas</string>
@@ -6059,7 +6197,7 @@
     <!-- Subtitle of initial My Story settings configuration shown when sending to My Story for the first time -->
     <string name="ChooseInitialMyStoryMembershipFragment__choose_who_can_see_posts_to_my_story_you_can_always_make_changes_in_settings">Elige quién puede ver lo que subes a tu historia. Siempre puedes hacer cambios en tus ajustes.</string>
     <!-- All connections option for initial My Story settings configuration shown when sending to My Story for the first time -->
-    <string name="ChooseInitialMyStoryMembershipFragment__all_signal_connections">Todas las conexiones de Signal</string>
+    <string name="ChooseInitialMyStoryMembershipFragment__all_signal_connections">Todos los contactos de Signal</string>
     <!-- All connections except option for initial My Story settings configuration shown when sending to My Story for the first time -->
     <string name="ChooseInitialMyStoryMembershipFragment__all_except">Todos excepto…</string>
     <!-- Only with selected connections option for initial My Story settings configuration shown when sending to My Story for the first time -->
@@ -6151,13 +6289,13 @@
     <!-- Dialog title when a user tries to donate while they already have a pending donation. -->
     <string name="DonateToSignalFragment__you_have_a_donation_pending">Tienes una donación pendiente</string>
     <!-- Dialog body when a user tries to donate while they already have a pending monthly donation. -->
-    <string name="DonateToSignalFragment__bank_transfers_usually_take_1_business_day_to_process_monthly">Las transferencias bancarias pueden tardar 14 días hábiles en completarse. Por favor, espera hasta que se complete este pago antes de actualizar tu suscripción.</string>
+    <string name="DonateToSignalFragment__bank_transfers_usually_take_1_business_day_to_process_monthly">Las transferencias bancarias pueden tardar de 1 a 14 días hábiles en completarse. Espera hasta que se complete este pago antes de actualizar tu suscripción.</string>
     <!-- Dialog body when a user tries to donate while they already have a pending one time donation. -->
-    <string name="DonateToSignalFragment__bank_transfers_usually_take_1_business_day_to_process_onetime">Las transferencias bancarias pueden tardar 14 días hábiles en completarse. Por favor, espera hasta que se complete este pago antes de realizar otra donación.</string>
+    <string name="DonateToSignalFragment__bank_transfers_usually_take_1_business_day_to_process_onetime">Las transferencias bancarias pueden tardar de 1 a 14 días hábiles en completarse. Espera hasta que se complete este pago antes de realizar otra donación.</string>
     <!-- Dialog body when a user tries to donate while they already have a pending monthly donation. -->
-    <string name="DonateToSignalFragment__your_payment_is_still_being_processed_monthly">Todavía se está procesando tu donación. Puede tomar unos minutos dependiendo de tu conexión. Por favor, espera hasta que se complete este pago antes de actualizar tu suscripción.</string>
+    <string name="DonateToSignalFragment__your_payment_is_still_being_processed_monthly">Tu donación aún se está procesando. Puede tardar unos minutos dependiendo de tu conexión. Espera hasta que se complete este pago antes de actualizar tu suscripción.</string>
     <!-- Dialog body when a user tries to donate while they already have a pending one time donation. -->
-    <string name="DonateToSignalFragment__your_payment_is_still_being_processed_onetime">Todavía se está procesando tu donación. Puede tomar unos minutos dependiendo de tu conexión. Por favor, espera hasta que se complete este pago antes de realizar otra donación.</string>
+    <string name="DonateToSignalFragment__your_payment_is_still_being_processed_onetime">Tu donación aún se está procesando. Puede tardar unos minutos dependiendo de tu conexión. Espera hasta que se complete este pago antes de realizar otra donación.</string>
     <!-- Dialog body when a user opens the manage donations main screen and they have a pending iDEAL donation -->
     <string name="DonateToSignalFragment__your_ideal_payment_is_still_processing">Tu donación a través de iDEAL aún se está procesando. Consulta tu app bancaria para aprobar el pago antes de realizar otra donación.</string>
     <!-- Dialog title shown when a user tries to donate an amount higher than is allowed for a given payment method. -->
@@ -6235,7 +6373,7 @@
     <!-- Button label to read more of the bank mandate that is currently off screen -->
     <string name="BankTransferMandateFragment__read_more">Leer más</string>
     <!-- Text displayed when mandate load fails -->
-    <string name="BankTransferMandateFragment__failed_to_load_mandate">No se pudo cargar el mandato</string>
+    <string name="BankTransferMandateFragment__failed_to_load_mandate">No se ha podido cargar el mandato</string>
 
     <!-- BankTransferDetailsFragment -->
     <!-- Subtext explaining how email is used. Placeholder is \'Learn more\' -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Elige tu banco</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Confirma tu donación con %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Para configurar tu donación recurrente, pulsa continuar para confirmar un cargo de 0,01 € con tu banco. Esto se reembolsará automáticamente y permitirá que tu donación de 5 €/mes se cargue a tu cuenta.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Si quieres configurar tu donación recurrente, toca «Continuar» para confirmar un cargo de 0,01 € con tu banco. Esto se reembolsará automáticamente y permitirá que tu donación de %1$s/mes se cargue a tu cuenta.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Continuar</string>
 
@@ -6305,14 +6443,14 @@
     <!-- Top text block of donation pending sheet displayed after one-time donation via a bank transfer. Placeholder is the badge name. -->
     <string name="DonationPendingBottomSheet__your_one_time_donation_is_pending">Tu donación única está pendiente. Podrás mostrar la insignia %1$s en tu perfil cuando recibamos tu donación.</string>
     <!-- Bottom text block of donation pending sheet displayed after donating via a bank transfer. Placeholder is for learn more. -->
-    <string name="DonationPendingBottomSheet__bank_transfers_usually_take">Las transferencias bancarias pueden tardar 14 días hábiles en completarse. %1$s</string>
+    <string name="DonationPendingBottomSheet__bank_transfers_usually_take">Las transferencias bancarias pueden tardar de 1 a 14 días hábiles en completarse. %1$s</string>
     <!-- Learn more text for donation pending sheet displayed after donating via a bank transfer. -->
     <string name="DonationPendingBottomSheet__learn_more">Saber más</string>
     <!-- Confirmation button for donation pending sheet displayed after donating via a bank transfer. -->
     <string name="DonationPendingBottomSheet__done">Hecho</string>
 
     <!-- Title of donation error sheet displayed after making a bank transfer that fails -->
-    <string name="DonationErrorBottomSheet__donation_couldnt_be_processed">No se pudo procesar la donación</string>
+    <string name="DonationErrorBottomSheet__donation_couldnt_be_processed">No se ha podido procesar la donación</string>
     <!-- Text block of donation error sheet displayed after making a bank transfer that fails -->
     <string name="DonationErrorBottomSheet__were_having_trouble">Estamos teniendo problemas para procesar tu transferencia bancaria. No se te ha cobrado. Selecciona otro método de pago o contacta a tu banco para más información.</string>
     <!-- Button label for retry button of donation error sheet displayed after making a bank transfer that fails -->
@@ -6399,7 +6537,7 @@
     <!-- Displayed as an action on a megaphone which prompts user to set up a username -->
     <string name="SetUpYourUsername__dismiss">Ignorar</string>
     <!-- Displayed as an action on a megaphone which prompts user to set up a username -->
-    <string name="SetUpYourUsername__learn_more">Saber más</string>
+    <string name="SetUpYourUsername__learn_more">Más información</string>
 
     <!-- Displayed as a title on a megaphone which prompts user to set up a username -->
     <string name="PnpLaunchMegaphone_title">Nuevas formas de conectarte</string>
@@ -6485,8 +6623,8 @@
     <string name="CallLogFragment__deletion_failed">Fallo al eliminar.</string>
     <!-- Displayed as message in error dialog when can\'t delete links -->
     <plurals name="CallLogFragment__cant_delete_call_link">
-        <item quantity="one">No se ha podido eliminar el enlace. Comprueba tu conexión a internet e inténtalo de nuevo.</item>
-        <item quantity="other">No fue posible eliminar todos los enlace de llamada. Comprueba tu conexión a internet e inténtalo de nuevo.</item>
+        <item quantity="one">No se ha podido eliminar el enlace de la llamada. Comprueba tu conexión a Internet e inténtalo de nuevo.</item>
+        <item quantity="other">No se han podido eliminar todos los enlaces de las llamadas. Comprueba tu conexión a Internet e inténtalo de nuevo.</item>
     </plurals>
     <!-- Snackbar text after clearing the call history -->
     <string name="CallLogFragment__cleared_call_history">Eliminar historial de llamadas</string>
@@ -6657,14 +6795,14 @@
     <!-- Displayed in a text row, allowing the user to delete the call link -->
     <string name="CallLinkDetailsFragment__delete_call_link">Eliminar enlace de llamada</string>
     <!-- Displayed whenever a name change, revocation, etc, fails. -->
-    <string name="CallLinkDetailsFragment__couldnt_save_changes">No se han podido guardar los cambios. Comprueba tu conexión y vuelve a intentarlo.</string>
+    <string name="CallLinkDetailsFragment__couldnt_save_changes">No se han podido guardar los cambios. Comprueba tu conexión de red e inténtalo de nuevo.</string>
     <!-- Displayed as title in dialog when user attempts to delete the link -->
     <string name="CallLinkDetailsFragment__delete_link">¿Eliminar enlace?</string>
     <!-- Displayed as body in dialog when user attempts to delete the link -->
     <string name="CallLinkDetailsFragment__this_link_will_no_longer_work">Este enlace ya no funcionará para nadie.</string>
 
     <!-- Button label for the link button in the username link settings -->
-    <string name="UsernameLinkSettings_link_button_label">enlace</string>
+    <string name="UsernameLinkSettings_link_button_label">Enlace</string>
     <!-- Button label for the share button in the username link settings -->
     <string name="UsernameLinkSettings_share_button_label">Compartir</string>
     <!-- Button label for the color selector button in the username link settings -->
@@ -6700,19 +6838,19 @@
     <!-- Body of a dialog that is displayed when we failed to read a username QR code. -->
     <string name="UsernameLinkSettings_qr_result_invalid">El código QR no es válido.</string>
     <!-- Body of a dialog that is displayed when the username we looked up could not be found. -->
-    <string name="UsernameLinkSettings_qr_result_not_found">No se pudo encontrar al usuario con el alias %1$s.</string>
+    <string name="UsernameLinkSettings_qr_result_not_found">No se ha podido encontrar al usuario con el alias %1$s.</string>
     <!-- Body of a dialog that is displayed when the username we looked up could not be found and we also could not parse the username. -->
-    <string name="UsernameLinkSettings_qr_result_not_found_no_username">No se pudo encontrar a este usuario.</string>
+    <string name="UsernameLinkSettings_qr_result_not_found_no_username">No se ha podido encontrar a este usuario.</string>
     <!-- Body of a dialog that is displayed when we experienced a network error when looking up a username. -->
-    <string name="UsernameLinkSettings_qr_result_network_error">Fallo en la conexión de red. Por favor, inténtalo de nuevo.</string>
+    <string name="UsernameLinkSettings_qr_result_network_error">Error en la conexión de red. Inténtalo de nuevo.</string>
     <!-- Body of a dialog that is displayed when we failed to reset your username link because you had no internet. -->
     <string name="UsernameLinkSettings_reset_link_result_network_unavailable">No tienes acceso a la red. No se ha reiniciado tu enlace. Inténtalo de nuevo más tarde.</string>
     <!-- Body of a dialog that is displayed when we failed to reset your username link because of a transient network issue. -->
     <string name="UsernameLinkSettings_reset_link_result_network_error">Se ha producido un fallo al tratar de reiniciar tu enlace. Inténtalo de nuevo más tarde.</string>
     <!-- Body of a dialog that is displayed when we failed to reset your username link because of an unknown error. -->
-    <string name="UsernameLinkSettings_reset_link_result_unknown_error">Se ha producido un fallo inesperado al tratar de reiniciar tu enlace. Inténtalo de nuevo más tarde.</string>
+    <string name="UsernameLinkSettings_reset_link_result_unknown_error">Se ha producido un error inesperado al intentar restablecer tu enlace. Inténtalo de nuevo más tarde.</string>
     <!-- Body of a dialog that is displayed when we successfully reset you username link. -->
-    <string name="UsernameLinkSettings_reset_link_result_success">Tu código QR y tu enlace se han restablecido, y se han creado un código QR y enlace nuevos.</string>
+    <string name="UsernameLinkSettings_reset_link_result_success">Se han restablecido tu código QR y tu enlace, y se han creado un código QR y un enlace nuevos.</string>
     <!-- Shown on the generated username qr code image to explain how to use it. -->
     <string name="UsernameLinkSettings_scan_this_qr_code">Escanea este código QR con tu teléfono para chatear conmigo en Signal.</string>
     <!-- Dialog title shown when scanning an image from the gallery for a username QR code and there is no qr code in the image. -->
@@ -6779,7 +6917,7 @@
     <!-- Title of activity when finding by username -->
     <string name="FindByActivity__find_by_username">Buscar por alias</string>
     <!-- Title of activity when finding by phone number -->
-    <string name="FindByActivity__find_by_phone_number">Buscar por núm. de teléfono</string>
+    <string name="FindByActivity__find_by_phone_number">Buscar por número de teléfono</string>
     <!-- Title of screen to select a country code -->
     <string name="FindByActivity__select_country_code">Seleccionar código de país</string>
     <!-- Entry placeholder for find by username -->
@@ -6795,17 +6933,17 @@
     <!-- Dialog title for invalid username -->
     <string name="FindByActivity__invalid_username">Alias no válido</string>
     <!-- Dialog title for invalid phone number -->
-    <string name="FindByActivity__invalid_phone_number">Número inválido</string>
+    <string name="FindByActivity__invalid_phone_number">Número no válido</string>
     <!-- Dialog title when phone number is not a registered signal user -->
     <string name="FindByActivity__invite_to_signal">Invitar a Signal</string>
     <!-- Dialog title when username is not found -->
     <string name="FindByActivity__username_not_found">Alias no encontrado</string>
     <!-- Dialog body for invalid username. Placeholder is the entered username. -->
-    <string name="FindByActivity__s_is_not_a_valid_username">%1$s no es un alias válido. Asegúrate de haber introducido el alias correcto seguido de su conjunto de dígitos.</string>
+    <string name="FindByActivity__s_is_not_a_valid_username">%1$s no es un alias válido. Asegúrate de haber introducido el alias completo seguido de su conjunto de dígitos.</string>
     <!-- Dialog body for an invalid phone number. Placeholder is the entered phone number. -->
     <string name="FindByActivity__s_is_not_a_valid_phone_number">%1$s no es un número de teléfono válido. Inténtalo de nuevo con un número de teléfono válido</string>
     <!-- Dialog body for not found username -->
-    <string name="FindByActivity__s_is_not_a_signal_user">%1$s no usa Signal. Asegúrate de introducir el alias correcto.</string>
+    <string name="FindByActivity__s_is_not_a_signal_user">%1$s no usa Signal. Asegúrate de introducir el alias correcto e inténtalo de nuevo.</string>
     <!-- Dialog body for not found phone number -->
     <string name="FindByActivity__s_is_not_a_signal_user_would">%1$s no usa Signal. ¿Deseas invitar este número a usar Signal?</string>
     <!-- Dialog action to invite the phone number to Signal -->
@@ -6813,14 +6951,14 @@
     <!-- Button label for a button that will launch a camera to scan a username QR code -->
     <string name="FindByActivity__qr_scan_button">Escanear código QR</string>
     <!-- Content of a dialog indicating that we could not perform the requested action because we encountered a network error. -->
-    <string name="FindByActivity__network_error_dialog">Fallo en la conexión de red. Inténtalo más tarde.</string>
+    <string name="FindByActivity__network_error_dialog">Se ha producido un error de red. Inténtalo de nuevo más tarde.</string>
 
     <!-- Title for an alert letting someone know that one of their linked devices is inactive. -->
-    <string name="LinkedDeviceInactiveMegaphone_title">Dispositivo enlazado inactivo</string>
+    <string name="LinkedDeviceInactiveMegaphone_title">Dispositivo vinculado inactivo</string>
     <!-- Body for an alert letting someone know that one of their linked devices is inactive. The string placeholder is the name of the device, and the number placeholder is the number of days before device is unlinked. -->
     <plurals name="LinkedDeviceInactiveMegaphone_body">
-        <item quantity="one">Para mantener \"%1$s\" enlazado, abre Signal en ese dispositivo dentro de %2$d día.</item>
-        <item quantity="other">Para mantener \"%1$s\" enlazado, abre Signal en ese dispositivo dentro de %2$d días.</item>
+        <item quantity="one">Para mantener «%1$s» vinculado, abre Signal en ese dispositivo en un plazo de %2$d día.</item>
+        <item quantity="other">Para mantener «%1$s» vinculado, abre Signal en ese dispositivo en un plazo de %2$d días.</item>
     </plurals>
     <!-- Button label for an alert letting someone know that one of their linked devices is inactive. When clicked, the user will opt out of all future alerts. -->
     <string name="LinkedDeviceInactiveMegaphone_dont_remind_button_label">No me lo recuerdes</string>
@@ -6837,7 +6975,7 @@
     <!-- Content description for first name clear button -->
     <string name="NicknameActivity__clear_first_name">Borrar nombre</string>
     <!-- Field label for family name -->
-    <string name="NicknameActivity__last_name">Apellido(s)</string>
+    <string name="NicknameActivity__last_name">Apellido</string>
     <!-- Content description for last name clear button -->
     <string name="NicknameActivity__clear_last_name">Borrar apellido</string>
     <!-- Field label for note -->
@@ -6847,13 +6985,13 @@
     <!-- Dialog title for note and name deletion -->
     <string name="NicknameActivity__delete_nickname">¿Eliminar?</string>
     <!-- Dialog message for note and name deletion -->
-    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">Esto eliminará permanentemente cualquier apodo y nota que hayas establecido.</string>
+    <string name="NicknameActivity__this_will_permanently_delete_this_nickname_and_note">Esto eliminará de forma permanente cualquier apodo y nota que hayas creado.</string>
 
     <!-- ViewNoteBottomSheetDialogFragment -->
     <!-- Sheet title -->
     <string name="ViewNoteSheet__note">Notas</string>
     <!-- Content description for opening the note editor -->
-    <string name="ViewNoteSheet__edit_note">Editar nota</string>
+    <string name="ViewNoteSheet__edit_note">Editar notas</string>
 
     <!-- BackupProgressService -->
     <!-- Notification title shown while backup restore job is running -->
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Descargando copia de seguridad…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Copias de seguridad de archivos multimedia desactivadas</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Se ha cancelado tu plan de copia de seguridad de archivos multimedia en Signal porque no se ha podido procesar tu pago. Tienes %1$d día para descargar cualquier archivo almacenado en tu copia de seguridad. Transcurrido %1$d día, se eliminarán los archivo de tu copia de seguridad.</item>
+        <item quantity="other">Se ha cancelado tu plan de copia de seguridad de archivos multimedia en Signal porque no se ha podido procesar tu pago. Tienes %1$d días para descargar cualquier archivo almacenado en tu copia de seguridad. Transcurridos %1$d días, se eliminarán los archivo de tu copia de seguridad.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Puedes volver a pagar por las copias de seguridad en cualquier momento para seguir haciendo copias de todos tus archivos multimedia. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Tus archivos multimedia se eliminarán hoy</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Se ha cancelado tu plan de copia de seguridad de archivos multimedia en Signal porque no se ha podido procesar tu pago. Esta es tu última oportunidad de descargar los archivos de tu copia de seguridad antes de que se elimine.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">No se puede completar la descarga</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Tu dispositivo no tiene suficiente espacio libre. Libera hasta %1$s de espacio para descargar los archivos multimedia de tu copia de seguridad.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Si eliges «Omitir», los archivos multimedia de tu copia de seguridad se eliminarán en %1$d día.</item>
+        <item quantity="other">Si eliges «Omitir», los archivos multimedia de tu copia de seguridad se eliminarán en %1$d días.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">No se ha podido procesar el pago de la copia de seguridad</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Estamos teniendo problemas con el cargo de tu pago mensual recurrente de las copias de seguridad. Asegúrate de que tu método de pago esté al día. Si no es así, actualízalo en Google Pay. Signal intentará procesar el pago de nuevo en unos días.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">No se ha podido completar la copia de seguridad</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Hace %1$d días que no se completa una copia de seguridad de tu dispositivo. Asegúrate de que tu dispositivo esté conectado a una red Wi-Fi y toca «Iniciar copia». </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Más información</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Omitir</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Descargar archivos ahora</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Descargar más tarde</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">No descargar los archivos</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Libera %1$s de espacio para descargar tus archivos.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Tarjeta de crédito o débito</string>
@@ -6874,16 +7058,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Desconocido</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Historial de pagos</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Fecha y hora de tu última copia de seguridad: %1$s, %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
     <string name="ManageStorageSettingsFragment_chat_limit">Límite del chat</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
-    <string name="ManageStorageSettingsFragment_delete_message_history">Eliminar el historial de mensajes</string>
+    <string name="ManageStorageSettingsFragment_delete_message_history">Eliminar historial de mensajes</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
-    <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Los mensajes anteriores a la fecha seleccionada serán eliminados de forma permanente</string>
+    <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Los mensajes anteriores a la fecha seleccionada se eliminarán de forma permanente.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
-    <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Los mensajes que excedan la longitud seleccionada serán eliminados de forma permanente.</string>
-
+    <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Los mensajes que excedan la longitud seleccionada se eliminarán de forma permanente.</string>
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Aplicar límites a los dispositivos vinculados</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Cuando los límites del chat están habilitados, también se eliminarán los mensajes de tus dispositivos vinculados.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Ahora, la eliminación de mensajes se sincroniza en todos tus dispositivos</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Cuando elimines mensajes o chats, se eliminarán de tu teléfono y de todos los dispositivos vinculados.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">Aceptar</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Historial de pagos</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Copia de seguridad de mensajes texto y de todos los archivos multimedia</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Detalles de pago</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Tipo de copia de seguridad</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Fecha del pago</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Compartir</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Copias de seguridad de Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Historial de pagos</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Detalles de la copia de seguridad</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Tamaño de la copia de seguridad</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Frecuencia de la copia de seguridad</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Copia de seguridad usando una conexión móvil</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Desactivar y eliminar copias de seguridad</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Copia de seguridad eliminada y desactivada.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Se ha cambiado el tipo de copia de seguridad y se ha cancelado la suscripción</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Suscripción cancelada</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Descarga completa</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Tipo de copia de seguridad</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Copias de seguridad desactivadas</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/mes</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Activar copias</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Última copia de seguridad</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s, %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Nunca</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Iniciar copia</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">¿Desactivar y eliminar copias de seguridad?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">No se te volverá a cobrar. Se eliminará tu copia de seguridad y no se crearán nuevas copias de seguridad.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Desactivar y eliminar</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Eliminando copia de seguridad…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Copia de seguridad eliminada</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Al pulsar Iniciar copia"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Diaria</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Semanal</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Mensual</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Copia de seguridad manual</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Introduce el PIN, la contraseña o el patrón de tu dispositivo.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Siguiente</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Cambiar el tipo de copia de seguridad</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Cancelar suscripción</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Confirmar cancelación</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">No se te volverá a cobrar. Las copias de seguridad se desactivarán al final de tu periodo de facturación. Después de esa fecha, tendrás 30 días para descargar los archivos multimedia de los que estás haciendo una copia de seguridad.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Confirmar y descargar ahora</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Confirmar y descargar más tarde</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Mantener suscripción</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 12ef2a678f..69bd1443e5 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signalit uuendatakse…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Mollyit uuendatakse…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Sa pole veel salasõna määranud!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Kas keelata salasõna?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">See lukustab Signali ja teavitused püsivalt lahti.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">See lukustab Mollyi ja teavitused püsivalt lahti.</string>
     <string name="ApplicationPreferencesActivity_disable">Keela</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Serveriga ühendumisel tekkis viga!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN-koode on registreerimisluku jaoks vaja. PIN-koodide keelamiseks keela kõigepealt registreerimislukk.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Fail</string>
     <string name="AttachmentKeyboard_contact">Kontakt</string>
     <string name="AttachmentKeyboard_location">Asukoht</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal vajab sinu fotode ja videote näitamiseks luba</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly vajab sinu fotode ja videote näitamiseks luba</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Luba ligipääs</string>
     <string name="AttachmentKeyboard_payment">Makse</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Ei leia rakendust meediafaili valimiseks.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal vajab fotode, videote või audiofailide manustamiseks ligipääsu salvestusmeediale, kuid see on püsivalt keelatud. Palun ava rakenduse seadete menüü, vali \"Õigused\" ja luba \"Salvestusmeedia\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal vajab kontaktide manustamiseks ligipääsu kontaktidele, kuid see on püsivalt keelatud. Palun ava rakenduse sätete menüü, vali \"Õigused\" ja luba \"Kontaktid\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal vajab asukoha manustamiseks ligipääsu seadme asukohale, kuid see on püsivalt keelatud. Palun ava rakenduse sätete menüü, vali \"Õigused\" ja luba \"Asukoht\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly vajab fotode, videote või audiofailide manustamiseks ligipääsu salvestusmeediale, kuid see on püsivalt keelatud. Palun ava rakenduse seadete menüü, vali \"Õigused\" ja luba \"Salvestusmeedia\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly vajab kontaktide manustamiseks ligipääsu kontaktidele, kuid see on püsivalt keelatud. Palun ava rakenduse sätete menüü, vali \"Õigused\" ja luba \"Kontaktid\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly vajab asukoha manustamiseks ligipääsu seadme asukohale, kuid see on püsivalt keelatud. Palun ava rakenduse sätete menüü, vali \"Õigused\" ja luba \"Asukoht\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Anna ligipääs oma asukohale</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Oma asukoha saatmiseks toimi järgmiselt.</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Oma asukoha saatmiseks anna Signalile luba.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Oma asukoha saatmiseks anna Mollyile luba.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Sinu asukoha saatmiseks vajab Signal ligipääsu asukohale.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Sinu asukoha saatmiseks vajab Molly ligipääsu asukohale.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Luba ligipääs salvestusruumile</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Fotode ja videote näitamiseks:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal vajab su fotode ja videote näitamiseks ligipääsu salvestusruumile.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly vajab su fotode ja videote näitamiseks ligipääsu salvestusruumile.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s ei ole makseid aktiveerinud </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Vaheta kaamerat</string>
     <string name="CameraXFragment_open_gallery_description">Ava galerii</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Luba ligipääs</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Anna ligipääs oma kaamerale ja mikrofonile</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Luba ligipääs oma kaamerale</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Anna ligipääs oma mikrofonile</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Anna Signalile ligipääs kaamerale fotode salvestamiseks.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Luba Signalile ligipääs kaamerale fotode ja videote salvestamiseks.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Anna Signalile ligipääs kaamerale ja mikrofonile fotode ja videote salvestamiseks.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Heliga videote salvestamiseks anna Signalile ligipääs mikrofonile.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">QR-koodi skannimiseks vajab Signal ligipääsu kaamerale.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signalil on fotode tegemiseks vaja ligipääsu kaamerale</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal vajab QR-koodide skannimiseks ligipääsu kaamerale</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal vajab video salvestamiseks ligipääsu mikrofonile</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Fotode tegemiseks Signalis:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Fotode ja videote tegemiseks Signalis:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Heliga videote tegemiseks:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR-koodide skannimiseks:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Hiljutised kontaktid</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Signali kontaktid puuduvad</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Sa saad kasutada vaid kaameranuppu, et saata fotosid Signali kontaktidele. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Ei leia, keda otsid?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Kutsu kontakt Signaliga liituma</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Kutsu kontakt Mollyiga liituma</string>
     <string name="CameraContacts__menu_search">Otsi</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Tänan, ei</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Uuenda Signalit</string>
+    <string name="ClientDeprecatedActivity_update_signal">Uuenda Mollyit</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">See rakenduse versioon ei ole enam toetatud. Sõnumite saatmise ja vastuvõtmise jätkamiseks uuenda uusimale versioonile.</string>
     <string name="ClientDeprecatedActivity_update">Uuenda</string>
     <string name="ClientDeprecatedActivity_dont_update">Ära uuenda</string>
     <string name="ClientDeprecatedActivity_warning">Hoiatus</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Sinu Signali versioon on aegunud. Sa saad vaadata sõnumiajalugu, kuid ei saa enne uuendamist sõnumeid saata ega vastu võtta.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Sinu Mollyi versioon on aegunud. Sa saad vaadata sõnumiajalugu, kuid ei saa enne uuendamist sõnumeid saata ega vastu võtta.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Veebibrauserit ei leitud.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Sõnum %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Mollyi häälkõne %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Mollyi videokõne %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signali sõnum</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Saada sõnum</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Lähme Signalile üle %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Lähme Mollyile üle %1$s</string>
     <string name="ConversationActivity_specify_recipient">Palun vali kontakt</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Manus ületab saadetava sõnumitüübi suuruspiiranguid.</string>
     <string name="ConversationActivity_unable_to_record_audio">Ei saa heli salvestada!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Häälsõnumite saatmiseks toimi järgmiselt.</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Häälsõnumite saatmiseks luba Signalil kasutada oma mikrofoni.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Häälsõnumite saatmiseks luba Mollyil kasutada oma mikrofoni.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal vajab häälsõnumi salvestamiseks ligipääsu mikrofonile.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal vajab audiosõnumite saatmiseks ligipääsu seadme mikrofonile, kuid see on püsivalt keelatud. Palun ava rakenduse sätete menüü, vali \"Õigused\" ja luba \"Mikrofon\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly vajab häälsõnumi salvestamiseks ligipääsu mikrofonile.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly vajab audiosõnumite saatmiseks ligipääsu seadme mikrofonile, kuid see on püsivalt keelatud. Palun ava rakenduse sätete menüü, vali \"Õigused\" ja luba \"Mikrofon\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal vajab kasutajale %1$s helistamiseks ligipääsu kaamerale ja mikrofonile, kuid need on püsivalt keelatud. Palun ava rakenduse sätete menüü, vali \"Õigused\" ja luba \"Mikrofon\" ning \"Kaamera\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Luba Signalile ligipääs kaamerale fotode ja videote salvestamiseks.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal vajab ligipääsu kaamerale, et salvestada fotosid ja videosid, kuid see on püsivalt keelatud. Palun ava rakenduse sätete menüü, vali \"Õigused\" ja luba \"Kaamera\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal vajab fotode ja videote salvestamiseks ligipääsu kaamerale</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly vajab kasutajale %1$s helistamiseks ligipääsu kaamerale ja mikrofonile, kuid need on püsivalt keelatud. Palun ava rakenduse sätete menüü, vali \"Õigused\" ja luba \"Mikrofon\" ning \"Kaamera\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Luba Mollyile ligipääs kaamerale fotode ja videote salvestamiseks.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly vajab ligipääsu kaamerale, et salvestada fotosid ja videosid, kuid see on püsivalt keelatud. Palun ava rakenduse sätete menüü, vali \"Õigused\" ja luba \"Kaamera\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly vajab fotode ja videote salvestamiseks ligipääsu kaamerale</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Luba mikrofoni kasutus, et teha heliga videoid.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal vajab videote salvestamiseks mikrofoni luba, kuid see on keelatud. Palun järka rakenduse seadetes, vali \"Load\" ning luba \"Mikrofon\" ja \"Kaamera\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal vajab videote salvestamiseks mikrofoniluba.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly vajab videote salvestamiseks mikrofoni luba, kuid see on keelatud. Palun järka rakenduse seadetes, vali \"Load\" ning luba \"Mikrofon\" ja \"Kaamera\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly vajab videote salvestamiseks mikrofoniluba.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Ei</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Kõne alustamiseks toimi järgmiselt.</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Kõne alustamiseks anna Signalile juurdepääs mikrofonile.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Kõne alustamiseks anna Mollyile juurdepääs mikrofonile.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal vajab kõne alustamiseks ligipääsu mikrofonile.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly vajab kõne alustamiseks ligipääsu mikrofonile.</string>
 
 
     <string name="ConversationActivity_join">Liitu</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Signal ei toeta enam SMS-sõnumeid. Kutsu %1$s Signalisse ja jätkake vestlust siin.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">See isik ei kasuta enam Signalit. Kutsu ta Signalisse ja jätkake vestlust siin.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">See isik ei kasuta enam Mollyit. Kutsu ta Mollyisse ja jätkake vestlust siin.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Kutsu Signalisse</string>
+    <string name="ConversationActivity__invite_to_signal">Kutsu Mollyisse</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Saadame sulle varsti jälle meeldetuletuse.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Kustuta kõigi jaoks</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Kustuta sellest seadmest</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Kustuta</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Kustuta kõikjalt</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">See sõnum kustutatakse kõigilt vestluse liikmetelt, kui nad kasutavad Signali värsket versiooni. Nad näevad, et sa kustutasid sõnumi.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Blokeeritud</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Uuenda Signalit</string>
+    <string name="ConversationFragment__update_build">Uuenda Mollyit</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Registreeri Signal uuesti</string>
+    <string name="ConversationFragment__reregister_signal">Registreeri Molly uuesti</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Liigu tagasi</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Ava Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Ava Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Ei ole enam kinnitatud</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">See kustutab valitud vestluse jäädavalt.</item>
         <item quantity="other">See kustutab kõik %1$d valitud vestlust jäädavalt.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">See kustutab valitud vestluse jäädavalt kõigist su seadmetest.</item>
+        <item quantity="other">See kustutab kõik %1$d valitud vestlust jäädavalt kõigist su seadmetest.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Kustutan</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Valitud vestluse kustutamine …</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Kes mind numbri järgi leida saavad?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Kõik, kellel on sinu telefoninumber, näevad, et sa kasutad Signalit ja saavad sinuga vestlust alustada.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Kõik, kellel on sinu telefoninumber, näevad, et sa kasutad Mollyit ja saavad sinuga vestlust alustada.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Mitte keegi ei näe, et sa oled Signalis, kui sa neile sõnumit ei saada või sul nendega juba vestlust pooleli ei ole.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Mitte keegi ei näe, et sa oled Mollyis, kui sa neile sõnumit ei saada või sul nendega juba vestlust pooleli ei ole.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Kas taastada varukoopiast?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Testi varukoopia salaväljendit ja kontrolli, et see vastaks.</string>
     <string name="BackupsPreferenceFragment__turn_on">Lülita sisse</string>
     <string name="BackupsPreferenceFragment__turn_off">Lülita välja</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Varukoopiast taastamiseks paigalda uus Signali koopia. Ava rakendus ja klõpsa \"Taasta varukoopia\", seejärel vali varukoopia fail. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Varukoopiast taastamiseks paigalda uus Mollyi koopia. Ava rakendus ja klõpsa \"Taasta varukoopia\", seejärel vali varukoopia fail. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Rohkem infot</string>
     <string name="BackupsPreferenceFragment__in_progress">Töötamine…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">Siiani %1$d…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s/ %% …</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal vajab varukoopiate loomiseks välismälu õigust, ent see on püsivalt keelatud. Palun jätka rakenduse seadetes, vali \"Load\" ning luba \"Mäluruum\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly vajab varukoopiate loomiseks välismälu õigust, ent see on püsivalt keelatud. Palun jätka rakenduse seadetes, vali \"Load\" ning luba \"Mäluruum\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Vali varukoopia tegemise aeg</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Vestluse seanss on värskendatud</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal kasutab otspunkt krüptimist ja see võib mõnikord vajada vestluse seansi värskendamist. See ei mõjuta vestluse turvalisust, aga sa võisid mõnest selle kontakti sõnumist ilma jääda, seepärast palu neil vajadusel need uuesti saata.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly kasutab otspunkt krüptimist ja see võib mõnikord vajada vestluse seansi värskendamist. See ei mõjuta vestluse turvalisust, aga sa võisid mõnest selle kontakti sõnumist ilma jääda, seepärast palu neil vajadusel need uuesti saata.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Kasuta Signalit arvutis või iPadis. Sinu sõnumid sünkroonitakse sinu lingitud seadmetega.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Lingi uus seade</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Sõnumid ja vestluse info on kaitstud kõigis seadmetes otspunktkrüpteeringuga</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal arvutis või iPadis</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Kogu sõnumivahetus lingitud seadmetes on privaatne</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Mollyi sõnumid sünkroonitakse Mollyiga sinu mobiiltelefonis pärast selle linkimist. Sinu eelnevat sõnumiajalugu ei kuvata.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Mollyi paigaldamiseks külasta oma teises seadmes lehte %1$s</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Minu lingitud seadmed</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Eemalda ühendus</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s ühendus eemaldatud</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Seadme linkimine …</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Seade heaks kiidetud</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Laadimine…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Lingitud seadmeid pole</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Seadme linkimiseks tee lukust lahti</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Skanneeri linkimiseks seadmes kuvatavat QR-koodi.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Skanni QR-kood</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Kasuta seda seadet, et skannida QR-kood, mida kuvatakse seadmes, mida soovid linkida</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Olgu</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">See seade hakkab nägema sinu gruppe ja kontakte, saab ligipääsu sinu vestlustele ja võimalusele sinu nime alt sõnumeid saata.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Vii teises seadmes linkimine lõpule</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Vii Mollyi linkimine teises seadmes lõpule.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Seadme linkimine ei õnnestunud</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">See ei ole kehtiv QR-kood. Palun kontrolli, et skannid QR-koodi selle seadme ekraanilt, mida soovid ühendada.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Proovi uuesti</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Eemaldada \"%1$s\" linkimine?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimeeri puuduvate Play teenuste jaoks</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">See seade ei toeta Play teenuseid. Koputa, et keelata süsteemi aku optimeerimine, kuna see ei lase Signalil sõnumeid hankida, kui seade on ebaaktiivne.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">See seade ei toeta Play teenuseid. Koputa, et keelata süsteemi aku optimeerimine, kuna see ei lase Mollyil sõnumeid hankida, kui seade on ebaaktiivne.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">See Signali versioon on aegunud. Sõnumite saatmiseks ja vastuvõtmiseks uuenda kohe.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">See Mollyi versioon on aegunud. Sõnumite saatmiseks ja vastuvõtmiseks uuenda kohe.</string>
     <string name="ExpiredBuildReminder_update_now">Uuenda kohe</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Näita</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Püsiv Signali ühendusviga!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal ei saanud registreerida teenusega Google Play Services. Signali sõnumid ja kõned on keelatud, palun proovi taas-registreerida menüüs Seaded &gt; Täpsem.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Püsiv Mollyi ühendusviga!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly ei saanud registreerida teenusega Google Play Services. Mollyi sõnumid ja kõned on keelatud, palun proovi taas-registreerida menüüs Seaded &gt; Täpsem.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Silumislogid aitavad meil probleemi diagnoosida ja lahendada ega sisalda isikuandmeid.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signalis esines viga. Kas saata silumislogi?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Mollyis esines viga. Kas saata silumislogi?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Teavitused võivad aku optimeerimise tõttu hilineda</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Võid aku optimeerimise Signali jaoks keelata tagamaks, et sõnumiteavitused ei hilineks.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Võid aku optimeerimise Mollyi jaoks keelata tagamaks, et sõnumiteavitused ei hilineks.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Teavitused võivad aku optimeerimise tõttu hilineda</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Keela aku optimeerimine Mollyi jaoks, et tagada, et sõnumiteavitused ei hiline. Seadmespetsiifiliste juhiste nägemiseks toksa „Jätka“.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Tänan, ei</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Jätka</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Jätka</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Tühista</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Tänan, ei</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Ootel grupikutsed</string>
+    <string name="PendingMembersActivity_pending_group_invites">Taotlused &amp; kutsed</string>
     <string name="PendingMembersActivity_requests">Taotlused</string>
     <string name="PendingMembersActivity_invites">Kutsed</string>
     <string name="PendingMembersActivity_people_you_invited">Sinu kutsutud inimesed</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Tühista</string>
     <string name="InviteActivity_sending">Saatmine…</string>
     <string name="InviteActivity_invitations_sent">Kutsed saadetud!</string>
-    <string name="InviteActivity_invite_to_signal">Kutsu Signalisse</string>
+    <string name="InviteActivity_invite_to_signal">Kutsu Mollyisse</string>
     <string name="InviteActivity_send_sms">Saada SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Saadad %1$d SMS-kutse?</item>
         <item quantity="other">Saadad %1$d SMS-kutset?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Lähme Signalile üle: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Lähme Mollyile üle: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Tundub, et sul pole ühtegi rakendust, kuhu jagada.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Sinu sõnum</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Taustaühendus lubatud</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Vastused</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Alustan Signali kõnet</string>
+    <string name="NotificationBarManager__establishing_signal_call">Alustan Mollyi kõnet</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signali kõneteenuse käivitamine</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signali kõneteenuse peatamine</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Mollyi kõneteenuse käivitamine</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Mollyi kõneteenuse peatamine</string>
     <string name="NotificationBarManager__cancel_call">Tühista kõne</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Aktiveerisid maksed</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s saab nüüd makseid vastu võtta</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Makseinfo pole saadaval</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Klõpsa rohkema nägemiseks</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Makseinfo pole saadaval</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Selle makse üksikasjad pole saadaval, kuna sinu sõnumid taastati allikast, mis seda maksete ajalugu ei sisaldanud. See ei mõjuta sinu rahakoti saldot ega varasemate maksete olekut.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Varsti ei ole enam võimalik Signalist SMS-sõnumeid saata. Kutsu %1$s Signalisse ja jätkake vestlust siin.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Signalist ei ole enam võimalik SMS-sõnumeid saata. Kutsu %1$s Signalisse ja jätkake vestlust siin.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Mollyist ei ole enam võimalik SMS-sõnumeid saata. Kutsu %1$s Mollyisse ja jätkake vestlust siin.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Makse: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Makse</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Rämpspostist teatatud</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Lingid Signali seadme?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Tundub, et proovid linkida Signali seadet, kasutades 3. osapoole skannerit. Sinu kaitseks, palun skanneeri kood uuesti Signali siseselt.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal vajab kaamera luba, et skanneerida QR-koodi, ent see on püsivalt keelatud. Palun jätka rakenduse seadetes, vali \"Load\" ja luba \"Kaamera\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly vajab kaamera luba, et skanneerida QR-koodi, ent see on püsivalt keelatud. Palun jätka rakenduse seadetes, vali \"Load\" ja luba \"Kaamera\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">QR-koodi ei saa skanneerida ilma kaamera loata</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Sisesta salasõna</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signali ikoon</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Mollyi ikoon</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Saada salasõna</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Sobimatu salasõna!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Lukusta Signal lahti</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android: ekraanilukk</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Lukusta Molly lahti</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android: ekraanilukk</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Kaart</string>
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Minu lugu</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signali kõne</string>
+    <string name="Recipient_signal_call">Mollyi kõne</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Blokeeri</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Helistamine…</string>
     <string name="RedPhone_busy">Hõivatud</string>
     <string name="RedPhone_recipient_unavailable">Kontakt pole saadaval</string>
-    <string name="RedPhone_network_failed">Võrk ebaõnnestus!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Võrk ebaõnnestus! Palun kontrolli oma võrguühendust ja proovi uuesti.</string>
     <string name="RedPhone_number_not_registered">Number pole registreeritud!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Number, kuhu helistasid ei toeta turvalist kõnet!</string>
     <string name="RedPhone_got_it">Sain aru</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Klõpsa siia enda video käivitamiseks</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Signal vajab kasutajale %1$s helistamiseks juurdepääsu seadme kaamerale</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Molly vajab kasutajale %1$s helistamiseks juurdepääsu seadme kaamerale</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Helistamine…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Ühenduse taastamine…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Kõnest eemaldatud</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Keegi eemaldas su kõnest.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Anna ligipääs oma kaamerale ja mikrofonile</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Anna ligipääs oma mikrofonile</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Luba ligipääs oma kaamerale</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Kõne alustamiseks või sellega liitumiseks anna Mollyile juurdepääs oma kaamerale ja mikrofonile.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Kõne alustamiseks või sellega liitumiseks anna Mollyile juurdepääs oma mikrofonile.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Oma video lubamiseks anna Mollyile ligipääs oma kaamerale.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly vajab kõne alustamiseks või sellega liitumiseks mikrofoniluba.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Mollyil on sinu video lubamiseks vaja ligipääsu kaamerale</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Kõne alustamiseks või sellega liitumiseks toimi järgmiselt.</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Oma video lubamiseks toimi järgmiselt.</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signali kõne</string>
-    <string name="WebRtcCallView__signal_video_call">Signali videokõne</string>
+    <string name="WebRtcCallView__signal_call">Mollyi kõne</string>
+    <string name="WebRtcCallView__signal_video_call">Mollyi videokõne</string>
     <string name="WebRtcCallView__start_call">Alusta kõnet</string>
     <string name="WebRtcCallView__join_call">Liitu kõnega</string>
     <string name="WebRtcCallView__call_is_full">Kõne on täis</string>
@@ -2028,24 +2132,43 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Kas soovid käe langetada?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Langeta käsi</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Langeta</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Loobu</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Sa tõstsid käe</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Näita</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s tõstis käe</item>
-        <item quantity="other">%1$s + %2$d tõstsid käe</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s tõstsid käe</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d tõstsid käe</item>
+        <item quantity="other">%1$s +%2$d tõstsid käe</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s tõstis käe</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d tõstsid käe</item>
+        <item quantity="other">%1$s +%2$d tõstsid käe</item>
+    </plurals>
+
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s +%2$d</item>
+        <item quantity="other">%1$s +%2$d</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
-        <item quantity="one">%1$s</item>
-        <item quantity="other">%1$s + %2$d</item>
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
+        <item quantity="one">%1$s +%2$d</item>
+        <item quantity="other">%1$s +%2$d</item>
     </plurals>
 
     <!-- An accessibility label for screen readers on a view that can be expanded -->
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Selle numbri kinnitamiseks tehakse sulle kõne.</string>
     <string name="RegistrationActivity_edit_number">Muuda numbrit</string>
     <string name="RegistrationActivity_missing_google_play_services">Puuduvad Google Play teenused</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Seadmest puuduvad Google Play teenused. Sa saad siiski Signalit kasutada, kuid see konfiguratsioon võib põhjustada vähendatud stabiilsust või jõudlust.\n\nKui sa pole edasijõudnud kasutaja, ei käita järelturu Androidi ROMi või arvad, et see on viga, palun kontakteeru support@signal.org, et saada abi probleemi lahendamisel.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Seadmest puuduvad Google Play teenused. Sa saad siiski Mollyit kasutada, kuid see konfiguratsioon võib põhjustada vähendatud stabiilsust või jõudlust.\n\nKui sa pole edasijõudnud kasutaja, ei käita järelturu Androidi ROMi või arvad, et see on viga, palun kontakteeru support@molly.im, et saada abi probleemi lahendamisel.</string>
     <string name="RegistrationActivity_i_understand">Saan aru</string>
     <string name="RegistrationActivity_play_services_error">Play teenuste viga</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play teenused uuenevad või pole hetkel saadaval. Palun proovi uuesti.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Ebastandardne numbriformaat</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Sisestatud number (%1$s) tundub olevat mittestandardses formaadis.\n\nKas mõtlesid hoopis %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - telefoninumbri formaat</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - telefoninumbri formaat</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Kõnepäring esitatud</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Probleemid registreerimisega?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Veendu, et su telefonil on levi, et sõnumeid ja kõnesid vastu võtta\n • Kinnita, et saad sellel numbril kõnesid vastu võtta\n • Kontrolli, kas sisestasid telefoninumbri õigesti.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Täiendava teabe saamiseks ava need tõrkeotsingu juhised või võta ühendust kasutajatoega.</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Täiendav teave: %1$s või %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">need tõrkeotsingu juhised</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Lisa kontaktidesse</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Kutsu Signalisse</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Kutsu Mollyisse</string>
     <string name="SharedContactDetailsActivity_signal_message">Signali sõnum</string>
     <string name="SharedContactDetailsActivity_signal_call">Signali kõne</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Lisa kontaktidesse</string>
-    <string name="SharedContactView_invite_to_signal">Kutsu Signalisse</string>
+    <string name="SharedContactView_invite_to_signal">Kutsu Mollyisse</string>
     <string name="SharedContactView_message">Signali sõnum</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s omanik on %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signali uuendus</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signali uus versioon on saadaval. Toksa uuendamiseks.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signali uuendamine ebaõnnestus</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Mollyi uuendus</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Mollyi uus versioon on saadaval. Toksa uuendamiseks.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Mollyi uuendamine ebaõnnestus</string>
     <string name="ApkUpdateNotifications_failed_general_body">Proovime hiljem uuesti.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal on edukalt uuendatud</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly on edukalt uuendatud</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Sinu versioon on automaatselt uuendatud versioonile %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Meie Signali turvanumber:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Tundub, et sul pole ühtegi rakendust, kuhu jagada.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Lõikelaualt ei leitud turvanumbrit, millega võrrelda</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal vajab kaamera luba, et skanneerida QR-koodi, ent see on püsivalt keelatud. Palun jätka rakenduse seadetes, vali \"Load\" ja luba \"Kaamera\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly vajab kaamera luba, et skanneerida QR-koodi, ent see on püsivalt keelatud. Palun jätka rakenduse seadetes, vali \"Load\" ja luba \"Kaamera\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">QR-koodi ei saa skanneerida ilma kaamera loata</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Kasutaja %1$s turvanumbri nägemiseks pead kõigepealt temaga sõnumeid vahetama.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Koputa avamiseks.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal on avatud</string>
-    <string name="KeyCachingService_lock">Lukusta Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly on avatud</string>
+    <string name="KeyCachingService_lock">Lukusta Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Sina</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Mittetoetatud meediatüüp</string>
     <string name="MediaPreviewActivity_draft">Mustand</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal vajab mäluruumi luba, et salvestada välismällu, ent see on püsivalt keelatud. Palun jätka rakenduse seadetes, vali \"Load\" ja luba \"Mäluruum\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly vajab mäluruumi luba, et salvestada välismällu, ent see on püsivalt keelatud. Palun jätka rakenduse seadetes, vali \"Load\" ja luba \"Mäluruum\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Õiguste puudumise tõttu pole võimalik välisele andmekandjale salvestada.</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Kustutad sõnumi?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">See kustutab püsivalt valitud sõnumi.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Sõnumi kohale toimetamine ebaõnnestus.</string>
     <string name="MessageNotifier_error_delivering_message">Sõnumi kohale toimetamisel tekkis viga.</string>
     <string name="MessageNotifier_message_delivery_paused">Sõnumite edastamine on peatatud.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Sõnumite saatmise jätkamiseks Signalis kinnita</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Sõnumite saatmise jätkamiseks Mollyis kinnita</string>
     <string name="MessageNotifier_mark_all_as_read">Märgi kõik loetuks</string>
     <string name="MessageNotifier_mark_read">Märgi loetuks</string>
     <string name="MessageNotifier_turn_off_these_notifications">Lülita need teavitused välja</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Reageeris sinu kleebisele: %1$s</string>
     <string name="MessageNotifier_this_message_was_deleted">See sõnum kustutati.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Kas lülitada Signaliga liitumise teavitused välja? Neid saab uuesti lubada, valides Signal &gt; Seaded &gt; Teavitused.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Kas lülitada Mollyiga liitumise teavitused välja? Neid saab uuesti lubada, valides Molly &gt; Seaded &gt; Teavitused.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Kiirvastus pole saadaval, kui Signal on lukustatud!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Kiirvastus pole saadaval, kui Molly on lukustatud!</string>
     <string name="QuickResponseService_problem_sending_message">Sõnumi saatmisel esines probleem!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Sobimatu otsetee</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Uus sõnum</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Sõnumitaotlus</string>
     <string name="SingleRecipientNotificationBuilder_you">Sina</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">See seade ei ole enam registreeritud. Tõenäoliselt seepärast, et sa registreerisid oma telefoninumbri Signalis teises seadmes.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">See seade ei ole enam registreeritud. Tõenäoliselt seepärast, et sa registreerisid oma telefoninumbri Mollyis teises seadmes.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Registreeri seade uuesti</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Kõnele vastamiseks anna Signalile juurdepääs mikrofonile.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Kõnele vastamiseks anna Mollyile juurdepääs mikrofonile.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Videokõnele vastamiseks anna Signalile juurdepääs oma mikrofonile ja kaamerale.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal vajab mikrofoni ja kaamera lubasid, et teha ja vastu võtta kõnesid, ent need on püsivalt keelatud. Palun jätka rakenduse seadetes, vali \"Load\" ja luba \"Mikrofon\" ning \"Kaamera\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Videokõnele vastamiseks anna Mollyile juurdepääs oma mikrofonile ja kaamerale.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly vajab mikrofoni ja kaamera lubasid, et teha ja vastu võtta kõnesid, ent need on püsivalt keelatud. Palun jätka rakenduse seadetes, vali \"Load\" ja luba \"Mikrofon\" ning \"Kaamera\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Vastatud ühendatud seadmes.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Keeldutud ühendatud seadmes.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Hõivatud ühendatud seadmes.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Korda uut salasõna</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Kutsu Signalisse</string>
+    <string name="contact_selection_activity__invite_to_signal">Kutsu Mollyisse</string>
     <string name="contact_selection_activity__new_group">Uus grupp</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Värskenda kontaktiloendit</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Keegi on puudu? Ehk aitab värskendamine</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Leia Signalis inimesi, keda tunned</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Anna ligipääs oma kontaktidele</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Rohkem</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Kontakti pilt</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal vajab kontaktide kuvamiseks neile ligipääsu, kuid see on püsivalt keelatud. Palun ava rakenduse sätete menüü, vali \"Õigused\" ja luba \"Kontaktid\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly vajab kontaktide kuvamiseks neile ligipääsu, kuid see on püsivalt keelatud. Palun ava rakenduse sätete menüü, vali \"Õigused\" ja luba \"Kontaktid\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Kontaktide laadimisel tekkis tõrge. Kontrolli võrguühendust.</string>
     <string name="ContactSelectionListFragment_username_not_found">Kasutajanime ei leitud</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"„%1$s“ ei ole Signali kasutaja. Palun kontrolli kasutajanime ja proovi uuesti."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Otsi kasutajanime järgi</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Anna ligipääs kontaktidele</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Signalis tuttavate leidmiseks:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Luba ligipääs</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Tänan, ei</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Anna ligipääs oma kontaktidele. Sinu kontaktid on krüptitud ega ole Signali teenusele nähtavad.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal vajab kontaktide kuvamiseks nendele ligipääsu.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly vajab kontaktide kuvamiseks nendele ligipääsu.</string>
     <string name="contact_selection_list_fragment__show_contacts">Näita kontakte</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Oled selle isiku eemaldanud. Kui talle sõnumi saadad, lisatakse ta uuesti sinu kontaktide hulka.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Valikud</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Uuenda</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Esita … Peata</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Mullid on Androidi funktsionaalsus, mida saad Signali vestlustes välja lülitada.</string>
+    <string name="BubbleOptOutTooltip__description">Mullid on Androidi funktsionaalsus, mida saad Mollyi vestlustes välja lülitada.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Mitte praegu</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Grupi kirjeldus</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Uuenda Signalit</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Uuenda Mollyit</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">See Signali versioon on aegunud. Signali kasutamise jätkamiseks uuenda nüüd.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">See Mollyi versioon on aegunud. Mollyi kasutamise jätkamiseks uuenda nüüd.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Uuenda</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Aeglane</string>
     <string name="preferences__help">Abi</string>
     <string name="preferences__advanced">Täpsem</string>
-    <string name="preferences__donate_to_signal">Anneta Signalile</string>
+    <string name="preferences__donate_to_signal">Anneta Mollyile</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Privaatsus</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Vali rakenduse ikooniks ja nimetuseks „%1$s“</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Rakenduse ikooni ja nimetuse muutmiseks tuleb rakendus sulgeda. Teavitustes kuvatakse alati vaikimisi Signali ikoon ja nimetus.</string>
+    <string name="preferences__app_icon_dialog_description">Rakenduse ikooni ja nimetuse muutmiseks tuleb rakendus sulgeda. Teavitustes kuvatakse alati vaikimisi Mollyi ikoon ja nimetus.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Vali rakenduse ikoon ja nimetus, mida kuvatakse telefoni avakuval ja rakenduste lehel. Teavitustes kuvatakse alati vaikimisi Signali ikoon ja nimetus. Rohkem teavet</string>
+    <string name="preferences__app_icon_warning_learn_more">Vali rakenduse ikoon ja nimetus, mida kuvatakse telefoni avakuval ja rakenduste lehel. Teavitustes kuvatakse alati vaikimisi Mollyi ikoon ja nimetus. Rohkem teavet</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Rakenduse ikoonid ja nimetused kuvatakse avakuval ja rakenduste lehel.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Teavitustes kuvatakse alati vaikimisi Signali ikoon ja nimetus.</string>
+    <string name="preferences__app_icon_notification_warning">Teavitustes kuvatakse alati vaikimisi Mollyi ikoon ja nimetus.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Rohkem teavet</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">See kärbib kõik vestlused %1$s viimase sõnumini.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Sellega kustutad seadmest püsivalt kõik sõnumid ja meediafailid.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Sellega kustutad seadmest ja kõigist lingitud seadmetest püsivalt kogu sõnumiajaloo ja meedia.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Kas soovid tõesti kogu sõnumiajalugu kustutada?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Kogu sõnumiajalugu kustutatakse püsivalt. Seda tegevust ei saa tagasi võtta.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Kogu sõnumiajalugu kustutatakse püsivalt. Seda toimingut ei saa tagasi võtta.</string>
     <string name="preferences_storage__delete_all_now">Kustuta kõik kohe</string>
     <string name="preferences_storage__forever">Igaveseks</string>
     <string name="preferences_storage__one_year">1 aasta</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Tsensuuri vältimine</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Tsensuuri vältimine</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Kui on lubatud, siis püüab Signal tsenseerimisest mööda hiilida. Luba see funktsioon vaid siis, kui oled kohas, kus Signal on tsenseeritud.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Kui on lubatud, siis püüab Molly tsenseerimisest mööda hiilida. Luba see funktsioon vaid siis, kui oled kohas, kus Molly on tsenseeritud.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Tsenseerimisest möödahiilimine on aktiveeritud sinu konto telefoninumbri järgi.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Tutvustame makseid</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Kasuta Signalit uue privaatsusele keskendunud digitaalse valuuta MobileCoin saatmiseks ja vastuvõtmiseks. Aktiveeri, et proovida.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Kasuta Mollyit uue privaatsusele keskendunud digitaalse valuuta MobileCoin saatmiseks ja vastuvõtmiseks. Aktiveeri, et proovida.</string>
     <string name="PaymentsHomeFragment__activate_payments">Aktiivsed maksed</string>
     <string name="PaymentsHomeFragment__activating_payments">Maksete aktiveerimine…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Taasta maksete konto</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Maksed pole sinu regioonis veel saadaval.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Maksete lubamine ei õnnestunud. Proovi hiljem uuesti.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Kas deaktiveerida maksed?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Kui deaktiveerid maksed, siis pole sul enam võimalik MobileCoine Signali kaudu saata ega saada.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Kui deaktiveerid maksed, siis pole sul enam võimalik MobileCoine Mollyi kaudu saata ega saada.</string>
     <string name="PaymentsHomeFragment__deactivate">Deaktiveeri</string>
     <string name="PaymentsHomeFragment__continue">Jätka</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Saldo ei ole praegu saadaval.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Üksikasjad</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Signali kaudu on võimalik saata ja vastu võtta MobileCoine. Kõik maksed toimuvad kooskõlas MobileCoinsi ja MobileCoin Walleti kasutustingimustega. Siin võib ilmneda teatavaid probleeme ning kaotatud makseid või saldosid ei pruugi olla võimalik taastada. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Mollyi kaudu on võimalik saata ja vastu võtta MobileCoine. Kõik maksed toimuvad kooskõlas MobileCoinsi ja MobileCoin Walleti kasutustingimustega. Siin võib ilmneda teatavaid probleeme ning kaotatud makseid või saldosid ei pruugi olla võimalik taastada. </string>
     <string name="PaymentsHomeFragment__activate">Aktiveeri</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Näita MobileCoini kasutustingimusi</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Maksed pole enam Signalis saadaval. Sul on võimalik kanda vahendid valuutavahetusse, aga sul pole enam võimalik saata või saada makseid ega lisada vahendeid.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Maksed pole enam Mollyis saadaval. Sul on võimalik kanda vahendid valuutavahetusse, aga sul pole enam võimalik saata või saada makseid ega lisada vahendeid.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Õiguste lubamine</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Selleks, et sul oleks lihtsam tuttavatele sõnumeid saata, küsib Signal järgmisi nõusolekuid. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Selleks, et sul oleks lihtsam tuttavatele sõnumeid saata, küsib Molly järgmisi nõusolekuid. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Teavitused</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Edasi</string>
     <string name="PaymentsTransferFragment__invalid_address">Vigane aadress</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Kontrolli walleti aadressi, millele üritad ülekannet teha, ning proovi uuesti.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Sa ei saa teha ülekannet omaenda Signali walleti aadressile. Sisesta oma kontolt walleti aadress toetatud vahetuskeskuses.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR-koodi skannimiseks vajab Signal ligipääsu kaamerale.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QR-koodi skannimiseks vajab Signal luba kaamera kasutamiseks. Mine sätetesse, vali \"Load\" ning märgi \"Kaamera\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR-koodi skannimiseks vajab Signal ligipääsu kaamerale.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Sa ei saa teha ülekannet omaenda Mollyi walleti aadressile. Sisesta oma kontolt walleti aadress toetatud vahetuskeskuses.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR-koodi skannimiseks vajab Molly ligipääsu kaamerale.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QR-koodi skannimiseks vajab Molly luba kaamera kasutamiseks. Mine sätetesse, vali \"Load\" ning märgi \"Kaamera\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR-koodi skannimiseks vajab Molly ligipääsu kaamerale.</string>
     <string name="PaymentsTransferFragment__settings">Sätted</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Sissetulev Signali häälkõne</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Sissetulev Mollyi häälkõne</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Sissetulev Signali videokõne</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Sissetulev Mollyi videokõne</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Sissetulev Signali grupikõne</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Sissetulev Mollyi grupikõne</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Pooleliolev Signali häälkõne</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Pooleliolev Mollyi häälkõne</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Pooleliolev Signali videokõne</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Pooleliolev Mollyi videokõne</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Pooleliolev Signali grupikõne</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Pooleliolev Mollyi grupikõne</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Laadimine…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Kinnita</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Sisestasid varukoopia salasõna edukalt</string>
     <string name="BackupDialog_passphrase_was_not_correct">Salasõna ei olnud õige</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signali varukoopia loomine…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Mollyi varukoopia loomine…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Signali varukoopia kontrollimine …</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Mollyi varukoopia kontrollimine …</string>
     <string name="LocalBackupJobApi29_backup_failed">Varundamine ebaõnnestus</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Sinu varukoopiate kataloog on kustutatud või teisaldatud.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Sinu varukoopia fail on sellele kettale salvestamiseks liiga suur.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Helista mulle (%1$02d.%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Saada kood uuesti (%1$02d.%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Võta ühendust Signali kasutajatoega</string>
-    <string name="RegistrationActivity_code_support_subject">Signali registreerimine - kinnituskood Androidile</string>
+    <string name="RegistrationActivity_contact_signal_support">Võta ühendust Mollyi kasutajatoega</string>
+    <string name="RegistrationActivity_code_support_subject">Mollyi registreerimine - kinnituskood Androidile</string>
     <string name="RegistrationActivity_incorrect_code">Sobimatu kood</string>
     <string name="BackupUtil_never">Mitte kunagi</string>
     <string name="BackupUtil_unknown">Tundmatu</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Telefoninumber</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Vali, kes sinu telefoninumbrit näevad ja sinuga selle kaudu Signalis ühendust saavad võtta.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Vali, kes sinu telefoninumbrit näevad ja sinuga selle kaudu Mollyis ühendust saavad võtta.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Kes mu numbrit näevad</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Oled sooritanud liiga palju katseid. Palun proovi hiljem uuesti.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Teenusega ühendamisel esines viga</string>
     <string name="preferences_chats__backups">Varukoopiad</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal on lukus</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly on lukus</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">KOPUTA AVAMISEKS</string>
     <string name="Recipient_unknown">Tundmatu</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Sul peab olema ligipääs vanale seadmele.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Taasta varukoopiast</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Taasta sõnumid lokaalsest varukoopiast. Kui sa nüüd ei taasta, siis sa ei saa ka hiljem taastada.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Taasta kohalik varukoopia</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Taasta Signali varukoopia</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Taasta kõik oma tekstisõnumid + viimase 30 päeva meedia</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Rohkem valikuid</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Loobu</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Logi sisse ilma andmeid üle kandmata</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Jätka ilma sõnumeid ja meediat üle kandmata</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Ava Signal vanas Android-seadmes</string>
     <string name="NewDeviceTransferInstructions__continue">Jätka</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Valmistun ühenduma vanasse Android-seadmesse…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">See võtab hetke aega, peaks varsti valmis olema</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Ootan vana Android-seadme ühendumist…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal vajab vana Android-seadme leidmiseks ja ühendamiseks juurdepääsu asukohainfole.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal vajab sinu eelmise Android-seadme leidmiseks ja ühendumiseks ligipääsu asukohateenustele.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal vajab sinu eelmise Android-seadme leidmiseks ja ühendumiseks WiFi-t. WiFi peab olema sees, aga ei pea olema ühtegi WiFi võrku ühendatud.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Vabandust, nähtavasti ei toeta see seade Wi-Fi Directi. Signal kasutab Wi-Fi Directi sinu vana Android-seadme tuvastamiseks ja sellega ühenduse loomiseks. Siiski saad taastada oma konto vanast seadmest ka varukoopia kaudu.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly vajab vana Android-seadme leidmiseks ja ühendamiseks juurdepääsu asukohainfole.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly vajab sinu eelmise Android-seadme leidmiseks ja ühendumiseks ligipääsu asukohateenustele.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly vajab sinu eelmise Android-seadme leidmiseks ja ühendumiseks WiFi-t. WiFi peab olema sees, aga ei pea olema ühtegi WiFi võrku ühendatud.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Vabandust, nähtavasti ei toeta see seade Wi-Fi Directi. Molly kasutab Wi-Fi Directi sinu vana Android-seadme tuvastamiseks ja sellega ühenduse loomiseks. Siiski saad taastada oma konto vanast seadmest ka varukoopia kaudu.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Taasta varukoopia</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Sinu vana Android-seadmega ühenduse loomisel tekkis ootamatu tõrge.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Uue Android-seadme otsimine…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal vajab sinu uue Android-seadmega ühenduse loomiseks asukoha kasutamise luba.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal vajab sinu uue Android-seadme leidmiseks ja ühendumiseks ligipääsu asukohateenustele.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal vajab sinu uue Android-seadme leidmiseks ja ühendumiseks WiFi-t. WiFi peab olema sees, aga ei pea olema ühtegi WiFi võrku ühendatud.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Vabandust, nähtavasti ei toeta see seade Wi-Fi Directi. Signal kasutab Wi-Fi Directi sinu uue Android-seadme tuvastamiseks ja sellega ühenduse loomiseks. Siiski saad luua oma konto taastamiseks uues seadmes ka varukoopia.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly vajab sinu uue Android-seadmega ühenduse loomiseks asukoha kasutamise luba.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly vajab sinu uue Android-seadme leidmiseks ja ühendumiseks ligipääsu asukohateenustele.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly vajab sinu uue Android-seadme leidmiseks ja ühendumiseks WiFi-t. WiFi peab olema sees, aga ei pea olema ühtegi WiFi võrku ühendatud.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Vabandust, nähtavasti ei toeta see seade Wi-Fi Directi. Molly kasutab Wi-Fi Directi sinu uue Android-seadme tuvastamiseks ja sellega ühenduse loomiseks. Siiski saad luua oma konto taastamiseks uues seadmes ka varukoopia.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Loo varukoopia</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Sinu uue Android-seadmega ühenduse loomisel tekkis ootamatu tõrge.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Andmete ülekandmine</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Hoia seadmeid teineteise lähedal. Ära lülita seadmeid välja ja hoia Signal avatuna. Ülekandmine on otspunktkrüptitud.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Hoia seadmeid teineteise lähedal. Ära lülita seadmeid välja ja hoia Molly avatuna. Ülekandmine on otspunktkrüptitud.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d sõnumit siiani…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% sõnumitest…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Kanna konto üle</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Laadi Signal alla uues Android-seadmes</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Laadi Molly alla uues Android-seadmes</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Toksa \"Konto ülekandmine või taastamine\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Igaüks saab selle lingi kaudu näha grupi nime ja fotot ning saata taotluse liitumiseks. Jaga seda isikutega, keda usaldad.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Igaüks saab selle lingi kaudu näha grupi nime ja fotot ning liituda grupiga. Jaga seda isikutega, keda usaldad.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Jaga Signali kaudu</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Jaga Mollyi kaudu</string>
     <string name="GroupLinkBottomSheet_copy">Kopeeri</string>
     <string name="GroupLinkBottomSheet_qr_code">QR-kood</string>
     <string name="GroupLinkBottomSheet_share">Jaga</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">Teave MobileCoini kohta</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin on uus privaatsusele suunatud digitaalne valuuta.</string>
     <string name="payment_info_card_adding_funds">Vahendite lisamine</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Sul on võimalik lisada Signalis kasutamiseks vahendeid, saates MobileCoinid sinu rahakoti aadressile.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Sul on võimalik lisada Mollyis kasutamiseks vahendeid, saates MobileCoinid sinu rahakoti aadressile.</string>
     <string name="payment_info_card_cashing_out">Raha välja võtmine</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Saad MobileCoine igal ajal rahana välja võtta MobileCoine toetavas vahetuskeskuses. Lihtsalt tee vastavas vahetuskeskuses oma kontole ülekanne.</string>
     <string name="payment_info_card_hide_this_card">Kas peita see kaart?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Deaktiveeri rahakott</string>
     <string name="DeactivateWalletFragment__your_balance">Sinu kontojääk</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Soovitatav on enne maksete desaktiveerimist kanda enda vahendid teisele rahakoti aadressile. Kui otsustad praegu vahendeid mitte kanda, jäävad need sinu Signaliga lingitud rahakotti, kuni sa Signali maksed uuesti aktiveerid.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Soovitatav on enne maksete desaktiveerimist kanda enda vahendid teisele rahakoti aadressile. Kui otsustad praegu vahendeid mitte kanda, jäävad need sinu Mollyiga lingitud rahakotti, kuni sa Mollyi maksed uuesti aktiveerid.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Kanna kontojääk üle</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Deaktiveeri ilma ülekandeta</string>
     <string name="DeactivateWalletFragment__deactivate">Deaktiveeri</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Kas deaktiveerida ilma ülekandeta?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Sinu saldo jääb sinu Signaliga lingitud rahakotti, kuni sa Signali maksed uuesti aktiveerid.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Sinu saldo jääb sinu Mollyiga lingitud rahakotti, kuni sa Mollyi maksed uuesti aktiveerid.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Rahakoti deaktiveerimisel tekkis tõrge.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Litsentsid</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Tingimused ja privaatsuspoliitika</string>
-    <string name="HelpFragment__copyright_signal_messenger">Autoriõigus Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Autoriõigus Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Litsentsitud GNU AGPLv3 litsentsiga</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4773,7 +4911,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">Automaatne</string>
+    <string name="ChatColorSelectionFragment__auto">Autom.</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Kasuta kohandatud värve</string>
     <string name="ChatColorSelectionFragment__chat_color">Vestluse värv</string>
     <string name="ChatColorSelectionFragment__edit">Muuda</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Vali värv</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Jaga</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Ainult administraatorid saavad sõnumeid saata sellesse gruppi.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Limiit ületatud</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Sa ei saa valida rohkem kui 5 vestlust</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Rohkem teavet</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Uuenda Signalit</string>
+    <string name="UpdateSignalExpiredDialog__title">Uuenda Mollyit</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">See Signali versioon on aegunud. Signali kasutamise jätkamiseks uuenda nüüd.</string>
+    <string name="UpdateSignalExpiredDialog__message">See Mollyi versioon on aegunud. Mollyi kasutamise jätkamiseks uuenda nüüd.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Uuenda</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Seade ei ole registreeritud</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">See seade ei ole enam registreeritud. Registreeri uuesti, et jätkata Signali kasutamist selles seadmes.</string>
+    <string name="ReregisterSignalDialog__message">See seade ei ole enam registreeritud. Registreeri uuesti, et jätkata Mollyi kasutamist selles seadmes.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Eemalda registreerimine</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Valija avamine nurjus.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Teavituste näitamiseks vajab Signal nende kuvamise luba.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Teavituste näitamiseks vajab Molly nende kuvamise luba.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Lülita sisse</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Vastuseid veel pole</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Sa ei saa sellele loole vastata, sest sa ei ole enam selle grupi liige.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Reageeris loole</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Reageerisid loole</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Reageerisid loole</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Vaaamised</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Vali oma pank</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">%1$s annetuse kinnitamine</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Korduva annetuse seadistamiseks toksa Jätka, et kinnitada 0,01 € tasumine oma pangast. See tagastatakse sulle automaatselt ning edaspidi võetakse su kontolt 5 € kuus annetuseks.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Korduva annetuse seadistamiseks toksa Jätka, et kinnitada 0,01 € tasumine oma pangast. See tagastatakse sulle automaatselt ning edaspidi võetakse su kontolt %1$s kuus annetuseks.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Jätka</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Varukoopia andmete allalaadimine …</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Meedia varundamine on välja lülitatud</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Sinu Signali meedia varundamise plaan on tühistatud, sest me ei saanud su makset töödelda. Sul on %1$d päev aega varundatud meedia alla laadimiseks. Pärast %1$d päeva varukoopias olev meedia kustutatakse.</item>
+        <item quantity="other">Sinu Signali meedia varundamise plaan on tühistatud, sest me ei saanud su makset töödelda. Sul on %1$d päeva aega varundatud meedia alla laadimiseks. Pärast %1$d päeva varukoopias olev meedia kustutatakse.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Selleks, et oma meedia varundamist jätkata, saad igal ajal uuesti varundamise eest tasumist alustada. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Sinu meedia kustutatakse täna</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Sinu Signali meedia varundamise plaan on tühistatud, sest meil ei õnnestunud su makset töödelda. See on su viimane võimalus varundatud meediat alla laadida enne kui need kustutatakse.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Allalaadimist ei saa lõpule viia</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Sinu seadmes ei ole piisavalt vaba ruumi. Varukoopiasse salvestatud meedia alla laadimiseks vabasta %1$s ruumi.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Kui valid „Jäta vahele“, kustutatakse su varukoopias olev meedia %1$d päeva pärast.</item>
+        <item quantity="other">Kui valid „Jäta vahele“, kustutatakse su varukoopias olev meedia %1$d päeva pärast.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Varundamise makset ei õnnestu töödelda</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Meil on probleeme sinu igakuise varundamise makse töötlemisega. Palun veendu, et sinu maksemeetod on ajakohane. Kui ei ole, siis palun uuenda seda Google Pay kaudu. Signal proovib makset paari päeva pärast uuesti töödelda.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Varundamine ei õnnestunud</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Sinu seadet ei ole varundatud %1$d päeva. Veendu, et su seade on võrku ühendatud ja toksa „Varunda nüüd“. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Rohkem teavet</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Jäta vahele</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Lae meedia alla</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Lae hiljem alla</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Ära lae meediat alla</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Meedia allalaadimiseks vabasta %1$s ruumi.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Krediit- või deebetkaart</string>
@@ -6874,16 +7058,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Tundmatu</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Maksete ajalugu</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Sinu viimane varukoopia tehti %1$s kell %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">Vestluse piirangud</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">Vestluse pikkuse piirangud</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">Kustuta sõnumiajalugu</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Valitud ajast vanemad sõnumid kustutatakse jäädavalt.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Valitud pikkusest pikemad sõnumid kustutatakse jäädavalt.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Rakenda piiranguid lingitud seadmetele</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Kui see on sisse lülitatud, kustutavad vestluse pikkuse piirangud sõnumid ka sinu lingitud seadmetest.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Kustutamine on nüüd kõigi su seadmete üleselt sünkroniseeritud</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Kui kustutad sõnumid või vestlused, kustutatakse need sinu telefonist ja lingitud seadmetest.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Maksete ajalugu</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Sõnumite ja kogu meedia varukoopia</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Makse andmed</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Varukoopia tüüp</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Tasumiskuupäev</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Jaga</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signali varukoopiad</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Maksete ajalugu</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Varukoopia andmed</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Varukoopia suurus</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Varundamise sagedus</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Varunda mobiiliside kaudu</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Lülita välja ja kustuta varukoopia</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Varukoopia kustutati ja varundamine lülitati välja.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Varukoopia tüüpi muudeti ja tellimus tühistati</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Tellimus tühistatud</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Allalaadimine on lõpetatud</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Varukoopia tüüp</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Varundamine on keelatud</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s kuus</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Luba varundamine</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Viimane varukoopia</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s kell %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Mitte kunagi</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Varunda kohe</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Kas lülitada välja ja kustutada varukoopiad?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Sul ei tule rohkem maksta. Sinu varukoopia kustutatakse ja uusi varukoopiaid ei looda.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Lülita välja ja kustuta</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Varukoopia kustutamine …</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Varukoopia kustutatud</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Toksates „Varunda nüüd“"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Iga päev</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Kord nädalas</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Kord kuus</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Varunda käsitsi</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Sisesta oma seadme PIN-kood, salasõna või muster.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Edasi</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Muuda varundamise tüüpi</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Tühista tellimus</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Kinnita tühistamine</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Sul ei tule rohkem maksta. Varundamine lülitatakse sinu arveldusperioodi lõpus välja. Pärast seda kuupäeva on sul 30 päeva, et praegu varundatav meedia alla laadida.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Kinnita ja lae kohe alla</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Kinnita ja lae hiljem alla</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Säilita tellimus</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 3231c4e12b..866f718e6b 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal eguneratzen ari da…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly eguneratzen ari da…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Oraindik ez duzu pasaesaldia ezarri!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Desaktibatu nahi duzu pasaesaldia?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Signal eta mezu jakinarazpenak iraunkorki desbloketuako dira.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Molly eta mezu jakinarazpenak iraunkorki desbloketuako dira.</string>
     <string name="ApplicationPreferencesActivity_disable">Desaktibatu</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Errorea zerbitzariarekin konektatzerakoan!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PINak beharrezkoak dira erregistratzeko blokeoa aktibatzeko. Pinak desaktibatzeko, mesedez, lehenago desaktibatu erregistratzeko blokeoa.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Artxiboa</string>
     <string name="AttachmentKeyboard_contact">Kontaktua</string>
     <string name="AttachmentKeyboard_location">Kokalekua</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal-ek baimena behar du argazki eta bideoak erakusteko</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly-ek baimena behar du argazki eta bideoak erakusteko</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Sartzeko Baimena Eman</string>
     <string name="AttachmentKeyboard_payment">Ordainketa</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Ez da multimedia fitxategia aukeratzeko aplikaziorik aurkitu.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal aplikazioak Gordailurako baimena behar du argazkiak, bideoak edo audioak bidaltzeko, baina ukatu egin diozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Gordailua\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal aplikazioak Kontaktuetarako baimena behar du kontaktuak atzitu ahal izateko, baina ukatu egin diozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Kontaktuak\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal aplikazioak Kokapenerako baimena behar du kokalekuak bidali ahal izateko baina ukatu egin diozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Kokalekua\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly aplikazioak Gordailurako baimena behar du argazkiak, bideoak edo audioak bidaltzeko, baina ukatu egin diozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Gordailua\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly aplikazioak Kontaktuetarako baimena behar du kontaktuak atzitu ahal izateko, baina ukatu egin diozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Kontaktuak\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly aplikazioak Kokapenerako baimena behar du kokalekuak bidali ahal izateko baina ukatu egin diozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Kokalekua\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Eman kokapena atzitzeko baimena</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Kokapena bidaltzeko:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Eman Signal-i kokapena bidaltzeko baimena.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Eman Molly-i kokapena bidaltzeko baimena.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal-ek kokapena atzitu behar du zure kokapena bidaltzeko.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly-ek kokapena atzitu behar du zure kokapena bidaltzeko.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Eman biltegia atzitzeko baimena</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Argazkiak eta bideoak erakusteko:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal-ek biltegia atzitzeko baimena behar du argazki eta bideoak erakusteko.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly-ek biltegia atzitzeko baimena behar du argazki eta bideoak erakusteko.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s(e)k ez ditu aktibatu ordainketak </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Aldatu kamera</string>
     <string name="CameraXFragment_open_gallery_description">Ireki galeria</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Sartzeko Baimena Eman</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Eman kamera eta mikrofonorako sarbidea</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Eman kamerarako sarbidea</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Eman mikrofonoa atzitzeko baimena</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Argazkiak ateratzeko, eman Signal-i kamera erabiltzeko baimena.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Argazkiak eta bideoak grabatzeko, eman baimena Signali kamera erabiltzeko.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Argazkiak atera eta bideoak grabatzeko, eman Signal-i kamera eta mikrofonoa erabiltzeko baimena.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Soinua duten bideoak grabatzeko, eman Signal-i mikrofonoa erabiltzeko baimena.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">QR kodeak eskaneatzeko, eman Signal-i kamera erabiltzeko baimena.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal-ek kamera erabili behar du argazkiak ateratzeko</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal-ek kamera erabili behar du QR kodeak eskaneatzeko</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal-ek mikrofonoa erabili behar du bideoak grabatzeko</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Signal-en argazkiak ateratzeko:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Signal-en argazkiak atera eta bideoak grabatzeko:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Soinua duten bideoak grabatzeko:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR kodeak eskaneatzeko:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Azkenaldiko kontaktuak</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Signal kontakturik ez</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Signal kontaktuei argazkiak bidaltzeko kamerako botoia erabil dezakezu soilik. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Ez al duzu aurkitzen bilatzen ari zarena?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Gonbidatu kontaktu bat Signal aplikazaiora batzeko</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Gonbidatu kontaktu bat Molly aplikazaiora batzeko</string>
     <string name="CameraContacts__menu_search">Bilatu</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Ez eskerrik asko</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Eguneratu Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Eguneratu Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Aplikazioaren bertsio honek jadanik ez dauka bermerik. Mezuak jasotzen eta bidaltzen jarraitzeko, eguneratu azken bertsiora.</string>
     <string name="ClientDeprecatedActivity_update">Eguneratu</string>
     <string name="ClientDeprecatedActivity_dont_update">Ez Eguneratu</string>
     <string name="ClientDeprecatedActivity_warning">Markatutako zenbakia ez dago Signalen erregistratuta. SMS bidez gonbidatu nahiko zenuke?</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Signal-en bertsio hau iraungi egin da. Zure mezuen historia ikusi dezakezu, baina, aplikazioa eguneratu arte, ezingo duzu mezurik bidali edo jaso.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Molly-en bertsio hau iraungi egin da. Zure mezuen historia ikusi dezakezu, baina, aplikazioa eguneratu arte, ezingo duzu mezurik bidali edo jaso.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Ezin izan da nabigatzailerik aurkitu.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Mezu %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly-eko ahots-deia %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly-eko bideodeia %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal mezua</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Bidali mezua</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Signalera aldatu dezagun %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Mollyera aldatu dezagun %1$s</string>
     <string name="ConversationActivity_specify_recipient">Kontaktu bat aukeratu, mesedez</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Eranskina handiegia da bidaltzen ari zaren mezu motarako.</string>
     <string name="ConversationActivity_unable_to_record_audio">Ezgai audioa grabatzeko!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Audio-mezuak bidaltzeko:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Ahots-mezuak bidaltzeko, eman Signal-i mikrofonoa atzitzeko baimena.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Ahots-mezuak bidaltzeko, eman Molly-i mikrofonoa atzitzeko baimena.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal-ek mikrofonoa atzitu behar du ahots-mezua grabatzeko.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signalek Mikrofonorako baimena behar du audio mezuak bidaltzeko, baina ukatu egin diozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Mikrofonoa\"</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly-ek mikrofonoa atzitu behar du ahots-mezua grabatzeko.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Mollyek Mikrofonorako baimena behar du audio mezuak bidaltzeko, baina ukatu egin diozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Mikrofonoa\"</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal aplikazioak Mikronofoa eta Kamera baimenak behar ditu %1$skontaktuari deitzeko, baina ukatu egin dizkiozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Mikrofonoa\" eta \"Kamera\"</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Argazkiak eta bideoak grabatzeko, eman baimena Signali kamera erabiltzeko.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal aplikazioak Kamera baimena behar du argazkiak eta bideoak egiteko, baina ukatu egin diozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signalek Kamera baimena behar du argazkiak eta bideoak egiteko</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly aplikazioak Mikronofoa eta Kamera baimenak behar ditu %1$skontaktuari deitzeko, baina ukatu egin dizkiozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Mikrofonoa\" eta \"Kamera\"</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Argazkiak eta bideoak grabatzeko, eman baimena Mollyi kamera erabiltzeko.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly aplikazioak Kamera baimena behar du argazkiak eta bideoak egiteko, baina ukatu egin diozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Mollyek Kamera baimena behar du argazkiak eta bideoak egiteko</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Gaitu mikrofonorako baimena soinua duten bideoak grabatu ahal izateko.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal aplikazioak bideoak grabatu ahal izateko mikrofonorako baimenak behar ditu, baina ukatu egin dira. Mesedez, joan zaitez aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta gaitu \"Mikrofonoa\" eta \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal aplikazioak mikrofonorako baimena behar du bideoak grabatu ahal izateko.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly aplikazioak bideoak grabatu ahal izateko mikrofonorako baimenak behar ditu, baina ukatu egin dira. Mesedez, joan zaitez aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta gaitu \"Mikrofonoa\" eta \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly aplikazioak mikrofonorako baimena behar du bideoak grabatu ahal izateko.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
     <string name="ConversationActivity_no">Ez</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Deia hasteko:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Deia hasteko, eman Signal-i mikrofonoa atzitzeko baimena.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Deia hasteko, eman Molly-i mikrofonoa atzitzeko baimena.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal-ek mikrofonoa atzitu behar du deia hasteko.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly-ek mikrofonoa atzitu behar du deia hasteko.</string>
 
 
     <string name="ConversationActivity_join">Batu</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Signal-en jada ez dira onartzen SMS mezuak. %1$s(r)ekin duzun elkarrizketa mantentzeko, gonbida ezazu Signal-era.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Pertsona honek jada ez du Signal erabiltzen. Harekin duzun elkarrizketa mantentzeko, gonbida ezazu Signal-era.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Pertsona honek jada ez du Molly erabiltzen. Harekin duzun elkarrizketa mantentzeko, gonbida ezazu Molly-era.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Gonbidatu Signal erabiltzera</string>
+    <string name="ConversationActivity__invite_to_signal">Gonbidatu Molly erabiltzera</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Laster gogoraraziko zaizu berriro.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Ezabatu guztientzat</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Ezabatu gailu honetan</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Ezabatu</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Ezabatu gailu guztietan</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Mezu hau txatean dauden guztientzat ezabatuko da Signal-en bertsio berrienetan badaude. Ezabatu duzula ikusi ahal izango dute.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Blokeatuta</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Eguneratu Signal</string>
+    <string name="ConversationFragment__update_build">Eguneratu Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Erregistratu Signal berriro</string>
+    <string name="ConversationFragment__reregister_signal">Erregistratu Molly berriro</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Egin atzera.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Ireki Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Ireki Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Jada ez dago egiaztatuta</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Behin betiko ezabatuko da hautatutako txata.</item>
         <item quantity="other">Behin betiko ezabatuko dira hautatutako %1$d txatak.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Hautatutako txata betiko ezabatuko da gailu guztietan.</item>
+        <item quantity="other">Hautatutako %1$d txatak betiko ezabatuko dira gailu guztietan.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Ezabatzen</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Hautatutako txata ezabatzen…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Nork topa nazake nire telefono-zenbakia bilatuta?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Zure telefono-zenbakia daukaten pertsonek Signal-en zaudela ikusi eta zurekin txateatu ahalko dute.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Zure telefono-zenbakia daukaten pertsonek Molly-en zaudela ikusi eta zurekin txateatu ahalko dute.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ezingo du inork ikusi Signal-en zaudela, salbu eta mezuak bidaltzen badituzu edo lehendik txaten bat baduzu norbaitekin.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ezingo du inork ikusi Molly-en zaudela, salbu eta mezuak bidaltzen badituzu edo lehendik txaten bat baduzu norbaitekin.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Babeskopia berreskuratu?</string>
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d dagoeneko…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%% %1$s oraingoz…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal-ek kanpoko memorian gordetzeko baimena behar du babeskopiak egin ahal izateko baina baimena ukatuta izan du beti. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta gaitu \"Biltegiratzea\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly-ek kanpoko memorian gordetzeko baimena behar du babeskopiak egin ahal izateko baina baimena ukatuta izan du beti. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta gaitu \"Biltegiratzea\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Ezarri babeskopiak egiteko ordua</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Txat-saioa eguneratu da</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signalek muturretik-muturrerako enkriptatzea erabiltzen du eta noizbehinka txat-saioa eguneratu beharko duzu. Horrek ez du eraginik zure txataren segurtasunean, baina agian kontaktu horren mezuren bat galdu duzu, eta berriz bidaltzeko eskatu beharko zenioke.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Mollyek muturretik-muturrerako enkriptatzea erabiltzen du eta noizbehinka txat-saioa eguneratu beharko duzu. Horrek ez du eraginik zure txataren segurtasunean, baina agian kontaktu horren mezuren bat galdu duzu, eta berriz bidaltzeko eskatu beharko zenioke.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Erabili Signal ordenagailuan edo iPad-ean. Mezuak lotutako gailu guztietan sinkronizatuko dira.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Lotu beste gailu bat</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Mezuak eta txat-informazioa muturreko enkriptatzeaz babestuta daude gailu guztietan</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal mahaigainean edo iPad-en</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Lotutako gailuetako mezuak pribatuak dira</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Molly-mezuak Molly-ekin sinkronizatzen dira telefono mugikorrean, lotu ondoren. Zure aurreko mezuen historia ez da agertuko.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Beste gailuan, joan hona Molly instalatzeko:%1$s</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Nire lotutako gailuak</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Askatu gailuaren lotura</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s deskonektatu da</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Gailua lotzen…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Gailua onartu da</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Kargatzen…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Ez dago lotutako gailurik</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Desblokeatu gailu bat lotzeko</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Eskaneatu gailuan bistaratzen den QR kodea lotzeko.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">QR kodea eskaneatu</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Erabili gailu hau lotu nahi duzun gailuan agertzen den QR kodea eskaneatzeko</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Ados</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Gailu hau gai izango da zure talde eta kontaktuak ikusteko, zure solasaldietan sartzeko eta zure izenean mezuak bidaltzeko.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Osatu lotzeko prozesua beste gailuan</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Amaitu Molly beste gailuan lotzen.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Gailua lotzeak huts egin du.</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">QR kode hau baliogabea da. Mesedez, egiazta ezazu lotu nahi duzun gailuan agertzen den QR kodea eskaneatzen ari zarela.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Berriro saiatu</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">\'%1$s\'-rekin lotura ezabatu?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimizatu Google Play-ren zerbitzuetarko</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Gailu honek ez du onartzen Play Services. Signal inaktibo dagoenean mezuak eskuratzea galarazten dioten sistemaren bateria-optimizazioak desgaitzeko, sakatu hau.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Gailu honek ez du onartzen Play Services. Molly inaktibo dagoenean mezuak eskuratzea galarazten dioten sistemaren bateria-optimizazioak desgaitzeko, sakatu hau.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Signalen bertsio hau iraungi da. Eguneratu orain mezuak bidali eta jaso ahal izateko.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Mollyen bertsio hau iraungi da. Eguneratu orain mezuak bidali eta jaso ahal izateko.</string>
     <string name="ExpiredBuildReminder_update_now">Eguneratu orain</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Ikusi</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Signal behin betiko komunikazio hutsegitea!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal ez da gai izan Google Play Zerbitzuekin erregistratzeko. Signal mezu eta deiak desgaitu egin dira; mesedez, saiatu bererregistratzen Ezarpenak &gt; Aurreratua menuan.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Molly behin betiko komunikazio hutsegitea!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly ez da gai izan Google Play Zerbitzuekin erregistratzeko. Molly mezu eta deiak desgaitu egin dira; mesedez, saiatu bererregistratzen Ezarpenak &gt; Aurreratua menuan.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Arazte-erregistroak arazoa diagnostikatzen eta konpontzen laguntzen digu, eta ez dute identifikazio-informaziorik.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal-ek arazo bat aurkitu du. Arazketa-erregistroa bidali nahi duzu?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly-ek arazo bat aurkitu du. Arazketa-erregistroa bidali nahi duzu?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Bateriaren optimizazioak direla eta, baliteke jakinarazpenak atzeratzea</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Mezuen jakinarazpenak atzeratuko ez direla ziurtatzeko, Signal-en bateria-optimizazioak desgatu ditzakezu.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Mezuen jakinarazpenak atzeratuko ez direla ziurtatzeko, Molly-en bateria-optimizazioak desgatu ditzakezu.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Bateriaren optimizazioak direla eta, baliteke jakinarazpenak atzeratzea</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Mezuen jakinarazpenak atzeratuko ez direla ziurtatzeko, desgaitu Molly-en bateria-optimizazioak. Gailu honetarako jarraibideak ikusteko, sakatu \"Jarraitu\".</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Ez eskerrik asko</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Jarraitu</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Jarraitu</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Baztertu</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Ez eskerrik asko</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Falta diren talde gonbidapenak</string>
+    <string name="PendingMembersActivity_pending_group_invites">Eskaerak &amp; gonbidapenak</string>
     <string name="PendingMembersActivity_requests">Eskaerak</string>
     <string name="PendingMembersActivity_invites">Gonbidapenak</string>
     <string name="PendingMembersActivity_people_you_invited">Gondibatu duzun jendea</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Utzi</string>
     <string name="InviteActivity_sending">Bidaltzen…</string>
     <string name="InviteActivity_invitations_sent">Gonbidapenak bidali dira!</string>
-    <string name="InviteActivity_invite_to_signal">Gonbidatu Signal erabiltzera</string>
+    <string name="InviteActivity_invite_to_signal">Gonbidatu Molly erabiltzera</string>
     <string name="InviteActivity_send_sms">Bidali SMS bat (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Bidali SMS gonbidapen %1$d?</item>
         <item quantity="other">Bidali %1$d SMS gonbidapen?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Signalera alda dezagun: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Mollyera alda dezagun: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Dirudienez ez duzu partekatzeko aplikazio bakar bat ere.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Zure mezua</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Atzeko planoko konexioa gaituta</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Erantzunak</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal deia finkatzen</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly deia finkatzen</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signal-en dei-zerbitzua abiarazten</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal-en dei-zerbitzua geldiarazten</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Molly-en dei-zerbitzua abiarazten</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly-en dei-zerbitzua geldiarazten</string>
     <string name="NotificationBarManager__cancel_call">Deia utzi</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Ordainketak aktibatu dituzu</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s(e)k orain ordainketak onar ditzake</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Ordainketa-xehetasunak ez daude eskuragarri</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Egin klik gehiago ikusteko</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Ordainketa-xehetasunak ez daude eskuragarri</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Ordainketa honen xehetasunak ez daude eskuragarri, ordainketa-historia hau ez zeukan iturburu batetik leheneratu baitira mezuak. Horrek ez dio eragiten diru-zorroko saldoari edo azken ordainketen egoerari.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Laster, ezin izango duzu SMS mezurik bidali Signal-etik. %1$s(r)ekin duzun elkarrizketa mantentzeko, gonbida ezazu Signal-era.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Jada ezin duzu SMS mezurik bidali Signal-en. %1$s(r)ekin duzun elkarrizketa mantentzeko, gonbida ezazu Signal-era.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Jada ezin duzu SMS mezurik bidali Molly-en. %1$s(r)ekin duzun elkarrizketa mantentzeko, gonbida ezazu Molly-era.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Ordainketa: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Ordainketa</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Spama dela salatu da</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Lotu Signal gailu bat?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Signalez kanpoko eskaner batez parekatzen omen duzu Signal gailu bat. Zure segurtasunerako, eskaneatu kodea Signaletik mesedez.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signalek Kamera baimena behar du QR kodea eskaneatzeko baina ukatu egin diozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Kamera\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Mollyek Kamera baimena behar du QR kodea eskaneatzeko baina ukatu egin diozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Kamera\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Ezin da QR koderik eskaneatu Kamera baimen gabe</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Pasaesaldia idatzi</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal ikonoa</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly ikonoa</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Bidali pasaesaldia</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Pasaesaldi baliogabea!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Desblokeatu Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Blokeatu pantaila</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Desblokeatu Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Blokeatu pantaila</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Mapa</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Mezuak bidaltzen jarraitzeko, egiaztatu.</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Signal-en spamik ez dagoela ziurtatzeko, osatu egiaztapena.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Molly-en spamik ez dagoela ziurtatzeko, osatu egiaztapena.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Egiaztatu ondoren, mezuak bidaltzen jarraitu ahalko duzu. Pausatutako mezuak automatikoki bidaliko dira.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Nire istorioa</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal deia</string>
+    <string name="Recipient_signal_call">Molly deia</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Blokeatu</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Deitzen…</string>
     <string name="RedPhone_busy">Lanpetuta</string>
     <string name="RedPhone_recipient_unavailable">Hartzaile eskuraezina</string>
-    <string name="RedPhone_network_failed">Sareak huts egin du!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Sareak huts egin du! Egiaztatu sarera konektatuta zaudela eta saiatu berriro.</string>
     <string name="RedPhone_number_not_registered">Zenbakia ez da erregistratu!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Markatu duzun zenbakiak ez du dei segururik babesten!</string>
     <string name="RedPhone_got_it">Ulertu dut</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Sakatu hau bideoa aktibatzeko</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s erabiltzaileari deitzeko, Signalek zure kamera erabiltzeko baimena behar du</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s erabiltzaileari deitzeko, Mollyek zure kamera erabiltzeko baimena behar du</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Deitzen…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Berriro konektatzen…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Deitik kendu da</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Norbaitek deitik kendu zaitu.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Eman kamera eta mikrofonorako sarbidea</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Eman mikrofonoa atzitzeko baimena</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Eman kamerarako sarbidea</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Dei bat hasteko edo dei batean sartzeko, eman Molly-i kamera eta mikrofonoa erabiltzeko baimena.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Dei bat hasteko edo dei batean sartzeko, eman Molly-i mikrofonoa erabiltzeko baimena.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Bideoa gaitzeko, eman Molly-i kamera atzitzeko baimena.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Dei bat hasteko edo dei batean sartzeko, Molly-ek mikrofonoa erabiltzeko baimena behar du.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Bideoa gaitzeko, Molly-ek kamera erabiltzeko baimena behar du</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Dei bat hasteko edo dei batean sartzeko:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Bideoa gaitzeko:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal deia</string>
-    <string name="WebRtcCallView__signal_video_call">Signal-eko bideodeia</string>
+    <string name="WebRtcCallView__signal_call">Molly deia</string>
+    <string name="WebRtcCallView__signal_video_call">Molly-eko bideodeia</string>
     <string name="WebRtcCallView__start_call">Hasi Deia</string>
     <string name="WebRtcCallView__join_call">Deira Sartu</string>
     <string name="WebRtcCallView__call_is_full">Deia beteta dago</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Eskua jaitsi nahi duzu?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Jaitsi eskua</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Jaitsi</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Utzi</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Eskua jaso duzu</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Ikusi</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s erabiltzaileak eskua jaso du</item>
-        <item quantity="other">%1$s + %2$d erabiltzailek eskua jaso dute</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s eskua jasota zaude</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d erabiltzailek eskua jaso duzue</item>
+        <item quantity="other">%1$s +%2$d erabiltzailek eskua jaso duzue</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s erabiltzaileak eskua jaso du</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d esku bat altxatu du</item>
+        <item quantity="other">%1$s +%2$d esku bat altxatu dute</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s + %2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s + %2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Zenbaki hau egiaztatzeko deia jasoko duzu.</string>
     <string name="RegistrationActivity_edit_number">Zenbakia editatu</string>
     <string name="RegistrationActivity_missing_google_play_services">Ez dira topatzen Google Play-ren zerbitzuak</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Ez dago Google Play Services-ik gailu honetan. Signal erabili dezakezu, baina konfigurazio honek fidagarritasuna edo errendimendua gutxiagotu dezake.\n\nErabiltzaile aurreratua ez bazara, jatorrizkoa ez den Android ROM bat erabiltzen ari ez bazara edo hau errore bat dela uste baduzu, mesedez jarri zaitez harremanetan support@signal.org helbidean.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Ez dago Google Play Services-ik gailu honetan. Molly erabili dezakezu, baina konfigurazio honek fidagarritasuna edo errendimendua gutxiagotu dezake.\n\nErabiltzaile aurreratua ez bazara, jatorrizkoa ez den Android ROM bat erabiltzen ari ez bazara edo hau errore bat dela uste baduzu, mesedez jarri zaitez harremanetan support@molly.im helbidean.</string>
     <string name="RegistrationActivity_i_understand">Ulertzen dut</string>
     <string name="RegistrationActivity_play_services_error">Play Services-en Errorea</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services eguneratzen ari da edo tenporalki ez dago erabilgarri. Mesedez, berriro saia zaitez.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Zenbaki-formatu ez-estandarra</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Idatzi duzun zenbakiak (%1$s) formatu ez-estandar bat du.\n\n%2$s esan nahi al zenuen?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Telefono-zenbakien formatua</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Telefono-zenbakien formatua</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Deia eskatu da</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Erregistratzeko arazoak dituzu?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Ziurtatu telefonoak seinalea duela SMSa edo deia jasotzeko.\n • Egiaztatu zure zenbakian telefono-deiak jaso ditzakezula.\n • Egiaztatu telefono-zenbakia zuzen idatzi duzula.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Informazio gehiago lortzeko, jarraitu arazoak konpontzeko urrats hauei edo jarri laguntza-zerbitzuarekin harremanetan</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Informazio gehiago lortzeko, egin %1$s edo %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">arazoak konpontzeko urrats hauek</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Gehitu kontaktu-zerrendan</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Gonbidatu Signal erabiltzera</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Gonbidatu Molly erabiltzera</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal mezua</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal deia</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Gehitu kontaktu-zerrendan</string>
-    <string name="SharedContactView_invite_to_signal">Gonbidatu Signal erabiltzera</string>
+    <string name="SharedContactView_invite_to_signal">Gonbidatu Molly erabiltzera</string>
     <string name="SharedContactView_message">Signal mezua</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s zenbakia %2$s erabiltzailearena da</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal eguneratu</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal-en bertsio berri bat dago. Eguneratzeko, sakatu hau.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Ezin izan da eguneratu Signal</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly eguneratu</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly-en bertsio berri bat dago. Eguneratzeko, sakatu hau.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Ezin izan da eguneratu Molly</string>
     <string name="ApkUpdateNotifications_failed_general_body">Berriro saiatuko gara geroago.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Eguneratu da Signal</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Eguneratu da Molly</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">%1$s bertsioa automatikoki instalatu da.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Gure Signal-en segurtasun zenbakia:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Dirudienez ez duzu partekatzeko aplikazio bakar bat ere.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Ez da aurkitu konparantzeko segurtasun zenbakirik arbelean</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signalek Kamera baimena behar du QR kodea eskaneatzeko baina ukatu egin diozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Kamera\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Mollyek Kamera baimena behar du QR kodea eskaneatzeko baina ukatu egin diozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Kamera\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Ezin da QR kodea eskaneatu Kamera baimen gabe</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Mezuak trukatu behar duzu %1$s erabiltzailearen segurtasun zenbakia ikusi ahal izateko.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Ukitu irekitzeko.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal desblokeatuta dago</string>
-    <string name="KeyCachingService_lock">Blokeatu Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly desblokeatuta dago</string>
+    <string name="KeyCachingService_lock">Blokeatu Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Zu</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Multimedia fitxategi mota ez-onartua</string>
     <string name="MediaPreviewActivity_draft">Zirriborroa</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signalek Gordailu baimena behar du kanpoko gordailuan datuak idazteko baina baimena ukatu egin diozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Gordailua\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Mollyek Gordailu baimena behar du kanpoko gordailuan datuak idazteko baina baimena ukatu egin diozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Gordailua\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Ezin izan da kanpoko gordailuan idatzi baimen faltagatik</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Mezua ezabatu nahi duzu?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Behin betiko ezabatuko du mezua.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Mezuaren banaketak huts egin du.</string>
     <string name="MessageNotifier_error_delivering_message">Errorea mezua banatzen.</string>
     <string name="MessageNotifier_message_delivery_paused">Mezuaren entrega pausatu egin da.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Signal-en mezuak bidaltzen jarraitzeko, egiaztatu.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Molly-en mezuak bidaltzen jarraitzeko, egiaztatu.</string>
     <string name="MessageNotifier_mark_all_as_read">Markatu denak irrakurritako gisa</string>
     <string name="MessageNotifier_mark_read">Markatu irakurritako gisa</string>
     <string name="MessageNotifier_turn_off_these_notifications">Desaktibatu jakinarazpen hauek</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Zure eranskailuari bidalitako erreakzioa: %1$s.</string>
     <string name="MessageNotifier_this_message_was_deleted">Mezu hau ezabatu egin da.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Desaktibatu nahi duzu kontaktu bat batzen denean bidaltzen diren jakinarazpenak? Berriro aktiba ditzakezu Signal &gt; Ezarpenak &gt; Jakinarazpenak atalean.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Desaktibatu nahi duzu kontaktu bat batzen denean bidaltzen diren jakinarazpenak? Berriro aktiba ditzakezu Molly &gt; Ezarpenak &gt; Jakinarazpenak atalean.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2558,7 +2681,7 @@
     <string name="NotificationChannel_channel_messages">Mezuak</string>
     <string name="NotificationChannel_calls">Deiak</string>
     <string name="NotificationChannel_failures">Hutsegiteak</string>
-    <string name="NotificationChannel_backups">Babes-kopiak</string>
+    <string name="NotificationChannel_backups">Babeskopiak</string>
     <string name="NotificationChannel_locked_status">Blokeo egoera</string>
     <string name="NotificationChannel_app_updates">Aplikazioaren eguneraketak</string>
     <string name="NotificationChannel_other">Besteak</string>
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Erantzun bizkorra eskuraezina Signal blokeatuta badago!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Erantzun bizkorra eskuraezina Molly blokeatuta badago!</string>
     <string name="QuickResponseService_problem_sending_message">Arazoa mezua bidaltzen!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Lasterbide baliogabea</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Mezu berria</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Mezu-eskaera</string>
     <string name="SingleRecipientNotificationBuilder_you">Zu</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Gailu hau jada ez dago erregistratuta. Ziurrenik zure telefono-zenbakia Signal-ekin beste gailu batean erregistratu duzulako gertatu da hori.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Gailu hau jada ez dago erregistratuta. Ziurrenik zure telefono-zenbakia Molly-ekin beste gailu batean erregistratu duzulako gertatu da hori.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Erregistratu gailua berriro</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Deiari erantzuteko, eman Signal-i mikrofonoa atzitzeko baimena.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Deiari erantzuteko, eman Molly-i mikrofonoa atzitzeko baimena.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Bideo-deiari erantzuteko, eman Signal-i mikrofonorako eta kamerarako sarbidea.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signalek Mikronofoa eta Kamera baimenak behar ditu deiak egin edo jasotzeko baina ukatu egin dizkiozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Mikrofonoa\" eta \"Kamera\"</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Bideo-deiari erantzuteko, eman Molly-i mikrofonorako eta kamerarako sarbidea.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Mollyek Mikronofoa eta Kamera baimenak behar ditu deiak egin edo jasotzeko baina ukatu egin dizkiozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Mikrofonoa\" eta \"Kamera\"</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Erantzunda lotutako gailu batean.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Ukatuta lotutako gailu batean.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Okupatuta lotutako gailu batean.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Errepikatu pasaesaldi berria</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Gonbidatu Signal erabiltzera</string>
+    <string name="contact_selection_activity__invite_to_signal">Gonbidatu Molly erabiltzera</string>
     <string name="contact_selection_activity__new_group">Talde berria</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Freskatu kontaktuak</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Norbait faltan? Saiatu freskatzen</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Aurkitu ezagutzen duzun jendea Signal-en</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Eman kontaktuetarako sarbidea</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Gehiago</string>
 
@@ -2750,13 +2873,15 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Bilatu erabiltzaile-izenaren arabera</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Eman kontaktuetarako sarbidea</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Signal-en ezagutzen duzun jendea aurkitzeko:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Sartzeko Baimena Eman</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Ez eskerrik asko</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Eman kontaktuetarako sarbidea. Zure kontaktuak enkriptatuta daude eta ez daude ikusgai Signal zerbitzuan.</string>
 
     <!-- contact_selection_list_fragment -->
     <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Singalek zure kontaktuak lortzeko baimena behar du erakutsi ahal izateko.</string>
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Pertsona hau kendu duzu, berriro mezuak bidaliz gero, zure zerrendara gehituko da.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Aukerak</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Eguneratu</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Erreproduzitu … Pausatu</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Burbuilak Android-eko eginbide bat dira, eta Signal-en txatetarako desaktibatu egin ditzakezu.</string>
+    <string name="BubbleOptOutTooltip__description">Burbuilak Android-eko eginbide bat dira, eta Molly-en txatetarako desaktibatu egin ditzakezu.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Orain ez</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Taldearen deskribapena</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Eguneratu Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Eguneratu Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Signal-en bertsio hau zaharkituta dago. Eguneratu orain Signal erabiltzen jarraitzeko.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Molly-en bertsio hau zaharkituta dago. Eguneratu orain Molly erabiltzen jarraitzeko.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Eguneratu</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Motela</string>
     <string name="preferences__help">Laguntza</string>
     <string name="preferences__advanced">Aurreratua</string>
-    <string name="preferences__donate_to_signal">Egin dohaintza bat Signal-i</string>
+    <string name="preferences__donate_to_signal">Egin dohaintza bat Molly-i</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Pribatutasuna</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Ezarri \"%1$s\" aplikazioaren ikono eta izen gisa</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Aplikazioaren ikonoa eta izena aldatzeko, Signal itxi egin beharko da. Jakinarazpenek beti erakutsiko dituzte Signal-en ikono eta izen lehenetsiak.</string>
+    <string name="preferences__app_icon_dialog_description">Aplikazioaren ikonoa eta izena aldatzeko, Molly itxi egin beharko da. Jakinarazpenek beti erakutsiko dituzte Molly-en ikono eta izen lehenetsiak.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Hautatu aplikazioaren zer ikono eta izen nahi duzun telefonoaren hasierako pantailan eta aplikazio-menuan ikusgai egotea. Jakinarazpenek beti erakutsiko dituzte Signal-en ikono eta izen lehenetsiak. Informazio gehiago</string>
+    <string name="preferences__app_icon_warning_learn_more">Hautatu aplikazioaren zer ikono eta izen nahi duzun telefonoaren hasierako pantailan eta aplikazio-menuan ikusgai egotea. Jakinarazpenek beti erakutsiko dituzte Molly-en ikono eta izen lehenetsiak. Informazio gehiago</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Aplikazioen ikonoak eta izenak hasierako pantailan eta aplikazio-menuan daude ikusgai.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Jakinarazpenek beti erakutsiko dituzte Signal-en ikono eta izen lehenetsiak.</string>
+    <string name="preferences__app_icon_notification_warning">Jakinarazpenek beti erakutsiko dituzte Molly-en ikono eta izen lehenetsiak.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Informazio gehiago</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Honen bidez, azken %1$s mezuak soilik erakutsiko dira txat guztietan.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Betiko ezabatuko dira gailutik mezuen historia eta multimedia-edukiak.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Betiko ezabatu dira gailu honetako eta lotutako gailuetako mezuen historiak eta multimedia-edukiak.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Ziur zaude mezuen historia osoa ezabatu nahi duzula?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Betiko kenduko da mezuen historia osoa. Ekintza hau ezin da desegin.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Mezuen historia betiko ezabatu da gailu guztietan. Ekintza hau ezin da desegin.</string>
     <string name="preferences_storage__delete_all_now">Ezabatu dena orain</string>
     <string name="preferences_storage__forever">Betirako</string>
     <string name="preferences_storage__one_year">Urte 1</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Zentsura ekiditeko aukera</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Zentsura ekiditeko aukera</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Aukera aktibatuta egonez gero, Signal zentsura ekiditen saiatuko da. Ez aktibatu aukera hau Signal zentsuratuta dagoen kokaen batean egon ezik.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Aukera aktibatuta egonez gero, Molly zentsura ekiditen saiatuko da. Ez aktibatu aukera hau Molly zentsuratuta dagoen kokaen batean egon ezik.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Zentsura ekiditeko aukera zure kontuaren telefono-zenbakian oinarrituta aktibatu da.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Ordainketen aurkezpena</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Erabili Signal MobileCoin-ak (pribatutasunaren inguruan ardaztutako dibisa digital berria) bidali eta jasotzeko. Erabiltzeko, aktiba ezazu.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Erabili Molly MobileCoin-ak (pribatutasunaren inguruan ardaztutako dibisa digital berria) bidali eta jasotzeko. Erabiltzeko, aktiba ezazu.</string>
     <string name="PaymentsHomeFragment__activate_payments">Aktibatu Ordainketak</string>
     <string name="PaymentsHomeFragment__activating_payments">Ordainketak aktibatzen…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Berrezarri ordainketen kontua</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Ordainketak eginbidea ez dago erabilgarri zure lurraldean.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Ezin izan dira gaitu ordainketak. Saiatu geroago.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Ordainketak eginbidea desaktibatu nahi duzu?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Ordainketak eginbidea desaktibatzen baduzu, ezingo duzu bidali edo jaso MobileCoin-ik Signal-en.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Ordainketak eginbidea desaktibatzen baduzu, ezingo duzu bidali edo jaso MobileCoin-ik Molly-en.</string>
     <string name="PaymentsHomeFragment__deactivate">Desaktibatu</string>
     <string name="PaymentsHomeFragment__continue">Jarraitu</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Saldoa ez dago erabilgarri une honetan.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Xehetasunak</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">MobileCoin bidali eta jasotzeko erabil dezakezu Signal. Ordainketa guztiak MobileCoin-en eta MobileCoin Wallet-en Erabilera-baldintzen menpe daude. Baliteke arazoak izatea, eta haien ondorioz galdutako ordainketa eta saldoak ezin dira berreskuratu. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">MobileCoin bidali eta jasotzeko erabil dezakezu Molly. Ordainketa guztiak MobileCoin-en eta MobileCoin Wallet-en Erabilera-baldintzen menpe daude. Baliteke arazoak izatea, eta haien ondorioz galdutako ordainketa eta saldoak ezin dira berreskuratu. </string>
     <string name="PaymentsHomeFragment__activate">Aktibatu</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Ikusi MobileCoin-en baldintzak</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Signal-eko ordainketak jada ez daude erabilgarri. Funtsak truke-plataformetara transferitzen jarrai dezakezu, baina jada ezin dituzu bidali eta jaso ordainketak, ezta funtsak gehitu ere.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Molly-eko ordainketak jada ez daude erabilgarri. Funtsak truke-plataformetara transferitzen jarrai dezakezu, baina jada ezin dituzu bidali eta jaso ordainketak, ezta funtsak gehitu ere.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Onartu baimenak</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Ezagutzen dituzun pertsonei mezuak bidaltzen laguntzeko, Signal-ek baimen hauek eskatuko ditu. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Ezagutzen dituzun pertsonei mezuak bidaltzen laguntzeko, Molly-ek baimen hauek eskatuko ditu. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Jakinarazpenak</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Hurrengoa</string>
     <string name="PaymentsTransferFragment__invalid_address">Helbide baliogabea</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Begiratu tranferentzia egin nahi duzun diru-zorroaren helbidea eta saiatu berriro.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Ezin duzu zure Signal diru-zorroaren helbidera transferitu. Sartu diru-zorroaren helbidean zure kontutik, baliozko trukean.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR kode bat eskaneatzeko, Signal-ek zure kamera erabiltzeko baimena behar du</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal-ek kamera erabiltzeko baimena behar du QR kode bat harrapatzeko. Joan ezarpenetara, aukeratu \"baimenak\" eta ahalbidetu \"kamera\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR kode bat eskaneatzeko, Signalek zure kamera erabiltzeko baimena behar du</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Ezin duzu zure Molly diru-zorroaren helbidera transferitu. Sartu diru-zorroaren helbidean zure kontutik, baliozko trukean.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR kode bat eskaneatzeko, Molly-ek zure kamera erabiltzeko baimena behar du</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly-ek kamera erabiltzeko baimena behar du QR kode bat harrapatzeko. Joan ezarpenetara, aukeratu \"baimenak\" eta ahalbidetu \"kamera\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR kode bat eskaneatzeko, Mollyek zure kamera erabiltzeko baimena behar du</string>
     <string name="PaymentsTransferFragment__settings">Ezarpenak</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Signal-eko sarrerako ahots-deia</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Molly-eko sarrerako ahots-deia</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Signal-eko sarrerako bideodeia</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Molly-eko sarrerako bideodeia</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Signal-eko sarrerako talde-deia</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Molly-eko sarrerako talde-deia</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Signal-eko ahots-dei bat abian</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Molly-eko ahots-dei bat abian</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Signal-eko bideodei bat abian</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Molly-eko bideodei bat abian</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Signal-eko taldeko dei bat abian</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Molly-eko taldeko dei bat abian</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Kargatzen…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Baieztatu</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Ondo sartu duzu zure babeskopiaren pasaesaldia</string>
     <string name="BackupDialog_passphrase_was_not_correct">Pasaesaldi ez da zuzena</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signal babeskopia sortzen…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Molly babeskopia sortzen…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Signal-en babeskopia egiaztatzen…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Molly-en babeskopia egiaztatzen…</string>
     <string name="LocalBackupJobApi29_backup_failed">Babeskopiak huts egin du</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Babeskopiak gordetzeko karpeta ezabatu edo mugitu egin da.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Zure babeskopia duen fitxategia handiegia da bolumen honetan gordetzeko.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Dei iezadazu (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Bidali berriro kodea (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Harremanetan jarri Signal Laguntza Taldearekin</string>
-    <string name="RegistrationActivity_code_support_subject">Signal Errejistratzea - Androiderako Egiaztatze Kodea</string>
+    <string name="RegistrationActivity_contact_signal_support">Harremanetan jarri Molly Laguntza Taldearekin</string>
+    <string name="RegistrationActivity_code_support_subject">Molly Errejistratzea - Androiderako Egiaztatze Kodea</string>
     <string name="RegistrationActivity_incorrect_code">Kodea ez da zuzena</string>
     <string name="BackupUtil_never">Inoiz ez</string>
     <string name="BackupUtil_unknown">Ezezaguna</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Telefono-zenbakia</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Aukeratu nork ikus dezakeen zure telefono-zenbakia eta nor jar daitekeen zurekin harremanetan Signal-en.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Aukeratu nork ikus dezakeen zure telefono-zenbakia eta nor jar daitekeen zurekin harremanetan Molly-en.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Nork ikus dezake nire zenbakia?</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Saiakera asko egin dituzu. Mesedez, saia zaitez berriro beranduago.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Errorea zerbitzura konektatzean</string>
     <string name="preferences_chats__backups">Babes-kopiak</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal blokeatuta dago</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly blokeatuta dago</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">SAKATU DESBLOKEATZEKO</string>
     <string name="Recipient_unknown">Ezezaguna</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Zure gailu zaharrerako sarbidea behar duzu.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Babeskopia berreskuratu</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Berreskuratu babeskopia lokal bateko mezuak. Orain ez baduzu egiten, ezingo duzu geroago berreskuratu.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Leheneratu babeskopia lokala</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Leheneratu Signal-en babeskopia</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Leheneratu zure testu-mezu guztiak + azken 30 egunetako artxiboak</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Aukera gehiago</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Utzi</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Hasi saioa transferitu gabe</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Jarraitu zure mezuak eta artxiboak transferitu gabe</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Ireki Signal zure Android telefono zaharrean</string>
     <string name="NewDeviceTransferInstructions__continue">Jarraitu</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Android gailu zaharrera konektatzeko prestatzen…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Itxaron momentu batez, laster prest egon beharko litzateke</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Android gailu zaharra konektatzeko zain…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal-ek kokapen-baimena behar du zure Android gailu zaharra ezagutzeko eta konektatzeko.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal-ek kokapen-zerbitzu gaituak behar ditu zure Android gailu zaharra ezagutzeko eta harekin konektatzeko.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal-ek Wi-Fi aktibatuta behar du zure Android gailu zaharra ezagutzeko eta harekin konektatzeko. Wi-Fi-a aktibatuta egon behar da, baina ez da zertan Wi-Fi sare batera konektatuta egon behar.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Barkatu, badirudi gailu honek ez duela Wi-Fi Direct onartzen. Signal-ek Wi-Fi Direct erabiltzen du zure Android gailu zaharra ezagutzeko eta harekin konektatzeko. Hala ere, babeskopia bat leheneratu dezakezu zure kontua zure Android gailu zaharretik leheneratzeko.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly-ek kokapen-baimena behar du zure Android gailu zaharra ezagutzeko eta konektatzeko.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly-ek kokapen-zerbitzu gaituak behar ditu zure Android gailu zaharra ezagutzeko eta harekin konektatzeko.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly-ek Wi-Fi aktibatuta behar du zure Android gailu zaharra ezagutzeko eta harekin konektatzeko. Wi-Fi-a aktibatuta egon behar da, baina ez da zertan Wi-Fi sare batera konektatuta egon behar.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Barkatu, badirudi gailu honek ez duela Wi-Fi Direct onartzen. Molly-ek Wi-Fi Direct erabiltzen du zure Android gailu zaharra ezagutzeko eta harekin konektatzeko. Hala ere, babeskopia bat leheneratu dezakezu zure kontua zure Android gailu zaharretik leheneratzeko.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Berreskuratu babeskopia</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Ustekabeko errore bat gertatu da Android gailu zaharrera konektatzen saiatzean.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Android gailu berri baten bila…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal-ek kokapen-baimena behar du zure Android gailu berria ezagutzeko eta konektatzeko.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal-ek kokapen-zerbitzu gaituak behar ditu zure Android gailu berria ezagutzeko eta harekin konektatzeko.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal-ek Wi-Fi aktibatuta behar du zure Android gailu berria ezagutzeko eta harekin konektatzeko. Wi-Fi-a aktibatuta egon behar da, baina ez da zertan Wi-Fi sare batera konektatuta egon behar.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Barkatu, badirudi gailu honek ez duela Wi-Fi Direct onartzen. Signal-ek Wi-Fi Direct erabiltzen du zure Android gailu berria ezagutzeko eta harekin konektatzeko. Hala ere, babeskopia bat leheneratu dezakezu zure kontua zure Android gailu berritik leheneratzeko.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly-ek kokapen-baimena behar du zure Android gailu berria ezagutzeko eta konektatzeko.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly-ek kokapen-zerbitzu gaituak behar ditu zure Android gailu berria ezagutzeko eta harekin konektatzeko.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly-ek Wi-Fi aktibatuta behar du zure Android gailu berria ezagutzeko eta harekin konektatzeko. Wi-Fi-a aktibatuta egon behar da, baina ez da zertan Wi-Fi sare batera konektatuta egon behar.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Barkatu, badirudi gailu honek ez duela Wi-Fi Direct onartzen. Molly-ek Wi-Fi Direct erabiltzen du zure Android gailu berria ezagutzeko eta harekin konektatzeko. Hala ere, babeskopia bat leheneratu dezakezu zure kontua zure Android gailu berritik leheneratzeko.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Sortu babeskopia</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Ustekabeko errore bat gertatu da Android gailu berrira konektatzen saiatzean.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Datuak transferitzen</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Mantendu bi gailuak elkarrengandik gertu. Ez itzali gailuak eta Signal irekita mantendu. Tranferentziak muturretik-muturrera enkriptatuta daude.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Mantendu bi gailuak elkarrengandik gertu. Ez itzali gailuak eta Molly irekita mantendu. Tranferentziak muturretik-muturrera enkriptatuta daude.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d mezu orain arte…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% mezu orain arte…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Transferitu kontua</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Deskargatu Signal zure Android gailu berrian</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Deskargatu Molly zure Android gailu berrian</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Sakatu \"Transferitu edo leheneratu kontua\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Esteka hau duen edonork ikus ditzake taldearen izena eta argazkia eta sartzeko eska dezake. Partekatu konfiantzako jendearekin.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Esteka hau duen edonork taldearen izena eta argazkia ikus ditzake eta taldean sartu. Partekatu konfiantzako jendearekin</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Partekatu Signal bidez</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Partekatu Molly bidez</string>
     <string name="GroupLinkBottomSheet_copy">Kopiatu</string>
     <string name="GroupLinkBottomSheet_qr_code">QR Kodea</string>
     <string name="GroupLinkBottomSheet_share">Elkarbanatu</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">MobileCoin-i buruz</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin pribatutasunean ardaztutako dibisa digital berri bat da.</string>
     <string name="payment_info_card_adding_funds">Funtsak gehitzen</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Signal-en erabiltzeko funtsak gehi ditzakezu MobileCoin zure diru-zorroaren helbidera bidalita.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Molly-en erabiltzeko funtsak gehi ditzakezu MobileCoin zure diru-zorroaren helbidera bidalita.</string>
     <string name="payment_info_card_cashing_out">Kobratzen</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">MobileCoin edonoiz atera dezakezu MobileCoin onartzen duen truke batean. Egin transferentzia bat truke horretan zure kontura.</string>
     <string name="payment_info_card_hide_this_card">Txartel hau ezkutatu?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Diru-zorroa deskatibatu</string>
     <string name="DeactivateWalletFragment__your_balance">Zure balantzea</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Ordainketak desaktibatu aurretik, funtsak beste zorro baten helbidera transferitzea gomendatzen da. Dirua orain ez transferitzea aukeratzen baduzu, ordainketak berriro aktibatzen badituzu, Signal-ekin lotutako zorroan jarraituko du.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Ordainketak desaktibatu aurretik, funtsak beste zorro baten helbidera transferitzea gomendatzen da. Dirua orain ez transferitzea aukeratzen baduzu, ordainketak berriro aktibatzen badituzu, Molly-ekin lotutako zorroan jarraituko du.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Transferitu gainerako balantzea</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Desaktibatu transferitu gabe</string>
     <string name="DeactivateWalletFragment__deactivate">Desaktibatu</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Desaktibatu transferitu gabe?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Ordainketak berriro aktibatzea aukeratzen baduzu, saldoa Signal-ekin lotutako zorroan geratuko da.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Ordainketak berriro aktibatzea aukeratzen baduzu, saldoa Molly-ekin lotutako zorroan geratuko da.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Errorea diru-zorroa desaktibatzean.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Lizentziak</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Baldintzak eta Pribatutasun Arauak</string>
-    <string name="HelpFragment__copyright_signal_messenger">Copyright Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Copyright Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">GNU AGPLv3 lizentziapean</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Hautatu kolorea</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Partekatu</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Administratzaileek soilik bidali ditzakete mezuak talde honetara.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Muga iritsi da</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Ezin dira hautatu 5 txat baino gehiago</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Informazio gehiago</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Eguneratu Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Eguneratu Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Signal-en bertsio hau zaharkituta dago. Eguneratu orain Signal erabiltzen jarraitzeko.</string>
+    <string name="UpdateSignalExpiredDialog__message">Molly-en bertsio hau zaharkituta dago. Eguneratu orain Molly erabiltzen jarraitzeko.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Eguneratu</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Gailua ez dago erregistratuta</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Gailu hau jada ez dago erregistratuta. Erregistra ezazu berriro gailu honetan Signal erabiltzen jarraitzeko.</string>
+    <string name="ReregisterSignalDialog__message">Gailu hau jada ez dago erregistratuta. Erregistra ezazu berriro gailu honetan Molly erabiltzen jarraitzeko.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Bierregistratu</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Ezin izan da hautatzailea ireki.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Jakinarazpenak gaitzeko, Signal-ek haiek bistaratzeko baimena behar du.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Jakinarazpenak gaitzeko, Molly-ek haiek bistaratzeko baimena behar du.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Aktibatu</string>
 
@@ -5637,7 +5773,7 @@
     <!-- Used to join views and replies when both exist on a story item -->
     <string name="StoryViewerFragment__s_s">%1$s%2$s</string>
     <!-- Displayed when viewing a post you sent -->
-    <string name="StoryViewerPageFragment__you">Zu</string>
+    <string name="StoryViewerPageFragment__you">Zuk</string>
     <!-- Displayed when viewing a story sent to a group, placeholders are person who sent the story and the group name -->
     <string name="StoryViewerPageFragment__s_to_s">%1$s tik %2$s ra</string>
     <!-- Displayed when viewing a post from another user with no replies -->
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Erantzunik ez oraindik</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Ezin diozu erantzun istorio honi, jada ez zarelako talde honetako kidea.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Erreakzio bat bidali dio istorioari</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Erreakzio bat bidali diozu istorioari</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Erreakzio bat bidali dio istorioari</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Ikustaldiak</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Aukeratu zure bankua</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Berretsi dohaintza %1$s bidez</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Dohaintza errepikaria konfiguratzeko, sakatu \"Jarraitu\" eta berretsi banku-kontuan 0,01 € kargatzea. Zenbateko hori automatikoki itzuliko zaizu, eta hilean 5 €-ko dohaintza zure kontuan zorduntzeko aukera emango dizu.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Dohaintza errepikaria konfiguratzeko, sakatu \"Jarraitu\" eta berretsi banku-kontuan 0,01€ kargatzea. Zenbateko hori automatikoki itzuliko zaizu, eta dohaintza (%1$s/hil) zure kontutik kobratzeko aukera izango duzu.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Jarraitu</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Babeskopietako datuak deskargatzen…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Multimedia-edukiaren babeskopiak desaktibatuta daude</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Signal-eko multimedia-edukiaren babeskopia-plana bertan behera utzi da, ezin izan dugulako prozesatu zure ordainketa. %1$d egun duzu babeskopian gordetako multimedia-edukia deskargatzeko. %1$d egunen buruan, babeskopiako multimedia-edukia ezabatu egingo da.</item>
+        <item quantity="other">Signal-eko multimedia-edukiaren babeskopia-plana bertan behera utzi da, ezin izan dugulako prozesatu zure ordainketa. %1$d egun dituzu babeskopian gordetako multimedia-edukia deskargatzeko. %1$d egunen buruan, babeskopiako multimedia-edukia ezabatu egingo da.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Multimedia-edukiaren babeskopiak egiten jarraitzeko, babeskopiak berriro ordaintzen has zaitezke. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Multimedia-edukia gaur ezabatuko da</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Signal-eko multimedia-edukiaren babeskopia-plana bertan behera utzi da, ezin izan dugulako prozesatu zure ordainketa. Babeskopiako multimedia-edukia ezabatu aurretik deskargatzeko azken aukera duzu hau.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Ezin da deskarga osatu</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Zure gailuak ez du leku libre nahikoa. Babeskopian gordetako multimedia-edukia deskargatzeko, utzi %1$s libre.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">\"Saltatu\" aukeratzen baduzu, babeskopiako multimedia-edukia %1$d egunen buruan ezabatuko da.</item>
+        <item quantity="other">\"Saltatu\" aukeratzen baduzu, babeskopiako multimedia-edukia %1$d egunen buruan ezabatuko da.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Ezin da prozesatu babeskopien ordainketa</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Arazoak izaten ari gara hileroko babeskopien ordainketa kobratzeko. Ziurtatu ordainketa-metodoa eguneratuta dagoela. Hala ez bada, egunera ezazu Google Pay-n. Egun batzuen buruan, Signal berriro saiatuko da ordainketa kobratzen.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Ezin izan da osatu babeskopia</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Gailuak ez du babeskopiarik egin %1$d egunez. Ziurtatu gailua wifira konektatuta dagoela eta sakatu \"Egin babeskopia\". </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Informazio gehiago</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Saltatu</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Deskargatu multimedia-edukia</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Deskargatu geroago</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Ez deskargatu multimedia-edukia</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Utzi %1$s libre multimedia-edukia deskargatzeko.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Kreditu- edo zordunketa-txartela</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Ezezaguna</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Ordainketen historia</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Azken babeskopia: %1$s (%2$s).</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Hautatutako denbora baino zaharragoak diren mezuak betiko ezabatuko dira.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Hautatutako muga gainditzen duten mezuak betiko ezabatuko dira.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Aplikatu mugak lotutako gailuetan</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Gaitutakoan, txaten mugak ere ezabatuko dituzte mezuak lotutako gailuetan.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Orain, ezabatzeko ekintza gailu guztietan sinkronizatzen da</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Mezuak edo txatak ezabatzen dituzunean, zure telefonotik eta lotuta dauden gailuetatik ezabatuko dira.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">Ados</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Ordainketen historia</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Testuaren eta mutimediaren babeskopia</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Ordainketaren xehetasunak</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Babeskopia mota</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Ordainketa data</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Partekatu</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal-en babeskopiak</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Ordainketen historia</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Babeskopiaren xehetasunak</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Babeskopiaren tamaina</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Babeskopien maiztasuna</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Egin babeskopiak mugikorra erabiliz</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Desaktibatu eta ezabatu babeskopiak</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Babeskopia ezabatu eta desaktibatu da.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Babeskopia-mota aldatu da eta harpidetza bertan behera utzi da</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Harpidetza bertan behera utzi da</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Deskarga osatuta</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Babeskopia mota</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Babeskopiak desgaituta daude</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/hilabete</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Gaitu babeskopiak</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d / %2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Azken babeskopia</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s (%2$s)</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Inoiz ez</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Egin babeskopia</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Babeskopiak desaktibatu eta ezabatu nahi dituzu?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Ez zaizu berriro kobratuko. Babeskopia ezabatu egingo da, eta ez da beste babeskopiarik sortuko.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Itzali eta ezabatu</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Babeskopia ezabatzen…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Babeskopia ezabatu da</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Babeskopia orain sakatuta"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Egunero</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Astero</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Hilero</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Egin babeskopiak eskuz</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Sartu gailuaren PIN, pasahitz edo patroia.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Hurrengoa</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Aldatu babeskopia mota</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Ezereztu harpidetza</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Berretsi bertan behera uzteko ekintza</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Ez zaizu berriro kobratuko. Babeskopiak fakturazio-zikloaren amaieran desaktibatuko dira. Data horren ondoren, 30 egun izango dituzu babeskopietan daukazun multimedia-edukia deskargatzeko.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Berretsi eta deskargatu orain</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Berretsi eta deskargatu geroago</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Mantendu harpidetza</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index e38d924b73..189781a736 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">تغییر دوربین</string>
     <string name="CameraXFragment_open_gallery_description">باز کردن گالری</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">اجازۀ دسترسی بدهید</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">اجازه دسترسی به دوربین و میکروفن</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">اجازه دسترسی به دوربین</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">اجازۀ دسترسی به میکروفون‌تان</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">برای گرفتن عکس، به سیگنال اجازه دهید به دوربین دسترسی داشته باشد.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">برای ضبط عکس و ویدئو، به سیگنال اجازه دهید به دوربین شما دسترسی داشته باشد.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">برای گرفتن عکس و ویدیو، به سیگنال اجازه دهید به دوربین و میکروفن دسترسی داشته باشد.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">برای گرفتن ویدیوهای صدادار، به سیگنال اجازه دهید به میکروفن شما دسترسی داشته باشد.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">برای اسکن کد QR، به سیگنال اجازه دهید به دوربین دسترسی داشته باشد.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">سیگنال برای گرفتن عکس نیاز به دسترسی به دوربین دارد</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">سیگنال برای اسکن کردن کدهای QR نیاز به دسترسی به دوربین دارد</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">سیگنال برای گرفتن ویدیو نیاز به دسترسی به میکروفن دارد</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">برای گرفتن عکس در سیگنال:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">برای گرفتن عکس و ویدیو در سیگنال:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">برای گرفتن ویدیوهای صدادار:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">برای اسکن کردن کدهای QR:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">آخرین مخاطبین</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">ارسال پیام به %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">تماس صوتی سیگنال %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">تماس تصویری سیگنال %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">پاک کردن برای همه</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">پاک کردن در این دستگاه</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">پاک کردن</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">پاک کردن در همه‌جا</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">این پیام برای همه در این گفتگو در صورتی که از نسخهٔ اخیر سیگنال استفاده کنند، پاک خواهد شد. آن‌ها قادر خواهند بود ببینند که شما پیامی را پاک کردید.</string>
@@ -647,6 +650,11 @@
         <item quantity="one">این کار موجب پاک شدن دائمی گفتگوی انتخاب‌شده می‌شود.</item>
         <item quantity="other">این کار موجب پاک شدن دائمی همۀ %1$d گفتگوی انتخاب‌شده می‌شود.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">با این کار گفتگوی انتخابی برای همیشه از همه دستگاه‌های شما حذف می‌شود.</item>
+        <item quantity="other">با این کار همه %1$d گفتگوی انتخابی برای همیشه از همه دستگاه‌های شما حذف می‌شوند.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">در حال حذف</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">درحال حذف گفتگوی انتخاب‌شده…</item>
@@ -849,6 +857,61 @@
     <string name="DecryptionFailedDialog_chat_session_refreshed">نشست گفتگو تازه‌سازی شد</string>
     <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">سیگنال از رمزگذاری سرتاسر استفاده می‌کند و شاید گاهی نیاز به تازه‌سازی نشست گفتگو‌ی شما داشته باشد. این کار روی امنیت گفتگو‌‌ی شما تأثیری نمی‌گذارد، اما ممکن است شما پیامی را از این مخاطب از دست داده باشید، و می‌توانید از آن‌ها بخواهید که آن را دوباره ارسال کنند.</string>
 
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">از سیگنال روی دسکتاپ یا آی‌پد استفاده کنید. پیام‌های شما با دستگاه‌های متصل شما همگام‌سازی می‌شوند.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">اتصال دستگاه جدید</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s پیام‌ها و اطلاعات گفتگو با رمزگذاری سرتاسری در همه دستگاه‌ها محافظت می‌شوند</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">سیگنال روی دسک‌تاپ یا آی‌پد</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">همۀ پیام‌ها در دستگاه‌های متصل خصوصی هستند</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">پس از متصل شدن تلفن، پیام‌های سیگنال با سیگنال در تلفن همراهتان همگام‌سازی می‌شوند. تاریخچه پیام‌های قبلی شما ظاهر نخواهد شد.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">در دستگاه دیگر خود، برای نصب سیگنال به %1$s بروید</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">دستگاه‌های متصل من</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">قطع ارتباط</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s جدا شد</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">در حال اتصال دستگاه…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">دستگاه تأیید شد</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">در حال بارگیری…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">هیچ دستگاه متصلی وجود ندارد</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">برای متصل کردن دستگاه، قفل را باز کنید</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">برای اتصال، کد QR نمایش‌داده‌شده در دستگاه را اسکن کنید.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">کد QR را اسکن کنید</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">از این دستگاه برای اسکن کد QR نمایش‌داده‌شده در دستگاهی که می‌خواهید متصل شود استفاده کنید</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">تأیید</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">این دستگاه قادر خواهد بود مخاطبین و گروه‌های شما را ببیند، به گفتگوهای شما دسترسی داشته باشد، و با نام شما پیام ارسال کند.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">اتصال را در دستگاه دیگر خود به پایان برسانید</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">اتصال سیگنال را در دستگاه دیگر خود به پایان برسانید.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">خطا در اتصال دستگاه جدید</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">کد QR معتبر نمی باشد. لطفا مطمئن شوید که در حال اسکن کد QR نمایش داده روی دستگاهی که قصد پیوند به آن را دارید می باشید.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">تلاش مجدد</string>
+
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">جدا کردن \'%1$s\'؟</string>
     <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">با جدا کردن این دستگاه، دیگر قادر به ارسال و دریافت پیام نخواهد بود.</string>
@@ -1030,13 +1093,23 @@
     <!-- Message explaining that battery saver may delay notifications -->
     <string name="PromptBatterySaverBottomSheet__message">می‌توانید برای اطمینان از عدم تأخیر اعلان‌های پیام، بهینه‌سازی باتری را برای سیگنال غیرفعال کنید.</string>
 
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">اعلان‌ها ممکن است به‌دلیل بهینه‌سازی باتری تأخیر داشته باشند</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">برای اطمینان از عدم تأخیر اعلان‌های پیام، بهینه‌سازی باتری را برای سیگنال غیرفعال کنید. برای مشاهده دستورالعمل‌های مخصوص دستگاه، روی «ادامه» ضربه بزنید.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">نه ممنون</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">ادامه</string>
+
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">ادامه</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">رد کردن</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">نه ممنون</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">دعوت‌های در حال انتظار</string>
+    <string name="PendingMembersActivity_pending_group_invites">درخواست‌ها و دعوت‌ها</string>
     <string name="PendingMembersActivity_requests">درخواست‌ها</string>
     <string name="PendingMembersActivity_invites">دعوت‌ها</string>
     <string name="PendingMembersActivity_people_you_invited">افرادی که شما دعوت کردید</string>
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">شما پرداخت‌ها را فعال کردید</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s اکنون می‌تواند پرداخت‌ها را بپذیرد</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">جزئیات پرداخت در دسترس نیست</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">برای قالب‌های بیشتر لمس کنید</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">جزئیات پرداخت در دسترس نیست</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">جزئیات این پرداخت در دسترس نیست زیرا پیام‌های شما از منبعی بازیابی شده که شامل تاریخچه این پرداخت نبوده است. این امر بر موجودی کیف پول شما یا وضعیت پرداخت‌های گذشته تأثیری ندارد.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1686,6 +1767,8 @@
     <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">دیگر نمی‌توانید در سیگنال پیامک ارسال کنید. برای ادامه مکالمه در اینجا، %1$s را به سیگنال دعوت کنید.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">پرداخت: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">پرداخت</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">به‌عنوان هرزنامه گزارش شد</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">در حال زنگ خوردن…</string>
     <string name="RedPhone_busy">مشغول</string>
     <string name="RedPhone_recipient_unavailable">گیرنده در دسترس نیست</string>
-    <string name="RedPhone_network_failed">خرابی شبکه!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">خرابی شبکه! لطفاً اتصال شبکه خود را بررسی و دوباره امتحان کنید.</string>
     <string name="RedPhone_number_not_registered">شماره ثبت نشده است!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">شماره‌ای که گرفتید از تماس امن پشتیبانی نمی‌کند!</string>
     <string name="RedPhone_got_it">فهمیدم</string>
@@ -1935,6 +2019,26 @@
     <string name="WebRtcCallActivity__removed_from_call">از تماس حذف شد</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">کسی شما را از تماس حذف کرده است.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">اجازه دسترسی به دوربین و میکروفن</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">اجازۀ دسترسی به میکروفون‌تان</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">اجازه دسترسی به دوربین</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">برای شروع یا پیوستن به تماس، به سیگنال اجازه دسترسی به دوربین و میکروفون را بدهید.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">برای شروع یا پیوستن به تماس، به سیگنال اجازه دسترسی به میکروفون را بدهید.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">برای فعال کردن ویدیو، اجازه دسترسی سیگنال به دوربین خود را بدهید.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">سیگنال برای شروع یا پیوستن به تماس به مجوزهای میکروفون نیاز دارد.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">سیگنال برای فعال کردن ویدیو نیاز به دسترسی به دوربین دارد</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">برای شروع یا پیوستن به تماس:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">برای فعال کردن ویدیو:</string>
 
     <!-- WebRtcCallView -->
     <string name="WebRtcCallView__signal_call">تماس سیگنال</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">دستتان را پایین می‌آورید؟</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">پایین آوردن دست</string>
+    <string name="CallOverflowPopupWindow__lower_hand">پایین آوردن</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">لغو</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">شما دستتان را بالا بردید</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">مشاهده</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s دستش را بالا برده است</item>
-        <item quantity="other">%1$s + %2$d دستشان را بالا برده‌اند</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s دست‌تان را بالا برده‌اید</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s و %2$d دستشان را بالا برده‌اند</item>
+        <item quantity="other">%1$s و %2$d دستشان را بالا برده‌اند</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s دستش را بالا برده است</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s و %2$d دستشان را بالا برده‌اند</item>
+        <item quantity="other">%1$s و %2$d دستشان را بالا برده‌اند</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">شما تماسی برای وارسی این شماره دریافت خواهید کرد.</string>
     <string name="RegistrationActivity_edit_number">ویرایش شماره</string>
     <string name="RegistrationActivity_missing_google_play_services">فاقد خدمات Google Play</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">این دستگاه فاقد خدمات Google Play است. شما می‌توانید به استفاده از سیگنال ادامه دهید، اما این پیکربندی می‌تواند باعث کاهش اطمینان‌پذیری یا عملکرد شود.\n\n اگر یک کاربر حرفه‌ای یا در حال اجرای یک ROM سفارشی اندروید نیستید یا فکر می‌کنید که این پیام به اشتباه به شما نشان داده شده است، برای دریافت کمک در فرآیند عیب‌یابی با support@signal.org تماس بگیرید.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">این دستگاه فاقد خدمات Google Play است. شما می‌توانید به استفاده از سیگنال ادامه دهید، اما این پیکربندی می‌تواند باعث کاهش اطمینان‌پذیری یا عملکرد شود.\n\n اگر یک کاربر حرفه‌ای یا در حال اجرای یک ROM سفارشی اندروید نیستید یا فکر می‌کنید که این پیام به اشتباه به شما نشان داده شده است، برای دریافت کمک در فرآیند عیب‌یابی با support@molly.im تماس بگیرید.</string>
     <string name="RegistrationActivity_i_understand">متوجهم</string>
     <string name="RegistrationActivity_play_services_error">خطای خدمات Play</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">خدمات Google Play در حال به‌روزرسانی است یا موقتاً در دسترس نیست. لطفاً دوباره تلاش کنید.</string>
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">مشکلی در ثبت‌نام دارید؟</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• مطمئن شوید که تلفنتان برای دریافت پیامک یا تماس آنتن دارد\n • تأیید کنید که می‌توانید با این شماره تلفن تماس دریافت کنید\n • بررسی کنید که شماره تلفن خود را به‌درستی وارد کرده‌اید.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">برای اطلاعات بیشتر، لطفاً این مراحل عیب‌یابی را دنبال کنید یا با پشتیبانی تماس بگیرید</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">برای اطلاعات بیشتر، لطفاً %1$s یا %2$s را دنبال کنید</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">این مراحل عیب‌یابی</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2713,9 +2836,9 @@
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">کسی از قلم افتاده است؟ تازه‌سازی کنید</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">آشنایان خود را در سیگنال پیدا کنید</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">اجازه دسترسی به مخاطبان</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">بیشتر</string>
 
@@ -2750,13 +2873,15 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">جستجو با نام کاربری</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">اجازه دسترسی به مخاطبان</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">برای پیدا کردن آشنایان در سیگنال:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">اجازۀ دسترسی بدهید</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">نه ممنون</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">اجازه دسترسی به مخاطبان خود را بدهید. مخاطبان شما رمزگذاری‌شده و برای سرویس سیگنال قابل‌مشاهده نیستند.</string>
 
     <!-- contact_selection_list_fragment -->
     <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">سیگنال به دسترسی مخاطبین برای نمایش آن‌ها نیاز دارد.</string>
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">این شخص را حذف کرده‌اید، ارسال مجدد پیام به او موجب افزودن دوباره او به لیست شما می‌شود.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">گزینه‌ها</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">به‌روزرسانی</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">پخش … توقف</string>
@@ -3337,8 +3464,12 @@
         <item quantity="other">این کار موجب کوتاه کردن دائمی همه گفتگوها به %1$s پیام اخیر می‌شود.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">این گزینه تمامی تاریخچهٔ پیام و رسانه را از روی دستگاه شما پاک می‌کند.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">با این کار کل تاریخچه پیام و رسانه از این دستگاه و هر دستگاه متصلی برای همیشه حذف می‌شود.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">آیا از پاک کردن کل تاریخچهٔ پیام‌ مطمئن هستید؟</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">کل تاریخچهٔ پیام‌ به طور دائم پاک خواهد شد. این کار بازگشت‌پذیر نیست.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">کل تاریخچه پیام برای همیشه از همه دستگاه‌ها حذف خواهد شد. این کار بازگشت‌پذیر نیست.</string>
     <string name="preferences_storage__delete_all_now">پاک کردن همه، اکنون</string>
     <string name="preferences_storage__forever">برای همیشه</string>
     <string name="preferences_storage__one_year">۱ سال</string>
@@ -3991,7 +4122,7 @@
     <string name="BackupDialog_passphrase_was_not_correct">گذرواژه نادرست بود</string>
     <string name="LocalBackupJob_creating_signal_backup">در حال ایجاد پشتیبان سیگنال…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">در حال تایید پشتیبان Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">در حال تایید پشتیبان Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">پشتیبان‌گیری ناموفق بود</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">آدرس ذخیره‌سازی پشتیبان شما پاک شده یا به جای دیگری انتقال یافته است.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">حجم فایل پشتیبان شما برای نگهداری در این محل زیاد است.</string>
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">به دسترسی به دستگاه قدیمی خود نیاز دارید.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">بازگردانی از پشتیبان</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">پیام‌های خود را از یک پشتیبان محلی بازگردانی کنید. اگر هم‌اکنون بازگردانی نکنید، در آینده قادر به بازگردانی نخواهید بود.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">بازیابی پشتیبان محلی</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">بازیابی پشتیبان سیگنال</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">همۀ پیام‌های متنی + رسانه ۳۰ روز گذشته خود را بازیابی کنید</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">گزینه‌های بیشتر</string>
 
+    <string name="TransferOrRestoreFragment__cancel">لغو</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">ورود بدون انتقال</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">ادامه بدون انتقال پیام‌ها و رسانه‌های خود</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">سیگنال را روی گوشی اندروید خود باز کنید</string>
     <string name="NewDeviceTransferInstructions__continue">ادامه</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">یک رنگ انتخاب کنید</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">پیامک</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">اشتراک‌گذاری</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">فقط مدیران می‌توانند در این گروه پیام ارسال کنند.</string>
-    <string name="MultiselectForwardFragment__limit_reached">به محدودیت رسیدید</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">نمی‌توانید بیش از 5 گفتگو را انتخاب کنید</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">هنوز پاسخی داده نشده است</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">شما نمی‌توانید به این استوری پاسخ دهید زیرا دیگر عضو این گروه نیستید.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">به استوری واکنش نشان داد</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">به استوری واکنش نشان داد</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">به استوری واکنش نشان داد</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">بازدیدها</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">انتخاب بانک‌تان</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">کمک مالی خود را با %1$s تأیید کنید</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">برای راه‌اندازی کمک مالی مکرر خود، روی «ادامه» ضربه بزنید تا هزینه ۰,۰۱ یورو را با بانک خود تأیید کنید. این مبلغ به‌طور خودکار به شما برگردانده می‌شود و اجازه می‌دهد که کمک مالی شما به مبلغ ۵ یورو در ماه از حساب‌تان برداشت شود.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">برای راه‌اندازی کمک مالی مکرر خود، روی «ادامه» ضربه بزنید تا هزینه ۰,۰۱ یورو را با بانک خود تأیید کنید. این مبلغ به‌طور خودکار به شما برگردانده می‌شود و امکان برداشت کمک مالی شما به مبلغ %1$s در ماه از حساب‌تان را فراهم می‌کند.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">ادامه</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">در حال بارگیری داده‌های پشتیبان…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">پشتیبان‌گیری رسانه غیرفعال است</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">طرح پشتیبان‌گیری رسانه سیگنال شما لغو شده است زیرا نتوانستیم پرداخت شما را پردازش کنیم. شما %1$d روز فرصت دارید تا هر رسانه ذخیره‌شده در نسخه پشتیبان خود را دانلود کنید. پس از %1$d روز، رسانه موجود در نسخه پشتیبان حذف خواهد شد.</item>
+        <item quantity="other">طرح پشتیبان‌گیری رسانه سیگنال شما لغو شده است زیرا نتوانستیم پرداخت شما را پردازش کنیم. شما %1$d روز فرصت دارید تا هر رسانه ذخیره‌شده در نسخه پشتیبان خود را دانلود کنید. پس از %1$d روز، رسانه موجود در نسخه پشتیبان حذف خواهد شد.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">برای ادامه پشتیبان‌گیری از تمام رسانه‌های خود، می‌توانید هر زمان که خواستید دوباره هزینه پشتیبان‌گیری خود را پرداخت کنید. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">رسانه شما امروز حذف خواهد شد</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">طرح پشتیبان‌گیری رسانه سیگنال شما لغو شده است زیرا نتوانستیم پرداخت شما را پردازش کنیم. این آخرین فرصت شما برای دانلود رسانه موجود در نسخه پشتیبان قبل از حذف آن است.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">دانلود انجام نشد</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">دستگاه شما فضای خالی کافی ندارد. برای دانلود رسانه ذخیره‌شده در نسخه پشتیبان خود، تا %1$s فضای ذخیره‌سازی خالی کنید.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">اگر «رد کردن» را انتخاب کنید، رسانه موجود در نسخه پشتیبان شما ظرف %1$d روز حذف خواهد شد.</item>
+        <item quantity="other">اگر «رد کردن» را انتخاب کنید، رسانه موجود در نسخه پشتیبان شما ظرف %1$d روز حذف خواهد شد.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">پرداخت پشتیبان‌گیری پردازش نمی‌شود</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">در دریافت هزینه پشتیبان‌گیری ماهانه شما با مشکل روبرو هستیم. مطمئن شوید که روش پرداخت شما به‌روز است. در غیر این صورت، آن را در Google Play به‌روزرسانی کنید. سیگنال پردازش پرداخت را دوباره طی چند روز آینده امتحان خواهد کرد.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">پشتیبان‌گیری انجام نشد</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">دستگاه شما به‌‍مدت %1$d روز پشتیبان‌گیری نکرده است. مطمئن شوید که دستگاه به وای‌فای متصل است و روی «اکنون پشتیبان‌گیری شود» ضربه بزنید. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">اطلاعات بیشتر</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">رد کردن</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">اکنون رسانه را دانلود کنید</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">بعداً دانلود شود</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">رسانه دانلود نشود</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">برای دانلود رسانه خود، %1$s فضای ذخیره‌سازی خالی کنید.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">کارت اعتباری یا دبیت کارت</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">ناشناخته</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">تاریخچه پرداخت</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">آخرین پشتیبان‌گیری در %1$s در %2$s انجام شده است.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">پیام‌های قدیمی‌تر از مدت انتخاب‌شده برای همیشه پاک خواهند شد.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">پیام‌های بلندتر از طول انتخاب‌شده برای همیشه پاک خواهند شد.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">محدودیت‌هایی را برای دستگاه‌های متصل اعمال کنید</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">در صورت فعال بودن محدودیت‌های گفتگو، پیام‌ها از دستگاه‌های متصل نیز حذف می‌شود.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">اکنون حذف در همه دستگاه‌های شما همگام‌سازی می‌شود</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">وقتی پیام‌ها یا گفتگوها را پاک می‌کنید، از تلفن شما و دستگاه‌های متصل پاک می‌شوند.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">تأیید</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">تاریخچه پرداخت</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">پشتیبان‌گیری متن و تمام رسانه‌ها</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">جزئیات پرداخت</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">نوع پشتیبان</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">تاریخ پرداخت</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">اشتراک‌گذاری</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">پشتیبان‌های سیگنال</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">تاریخچه پرداخت</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">جزئیات پشتیبان</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">اندازه پشتیبان</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">تناوب پشتیبان</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">پشتیبان‌گیری با استفاده از اینترنت همراه</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">خاموش کردن و پاک کردن پشتیبان</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">پشتیبان پاک و خاموش شد.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">نوع پشتیبان تغییر کرد و اشتراک لغو شد</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">اشتراک لغو شد</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">دانلود کامل شد</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">نوع پشتیبان</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">پشتیبان‌ها غیرفعال شده‌اند</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/ماه</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">فعال‌سازی پشتیبان‌ها</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">آخرین پشتیبان‌گیری</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s در %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">هرگز</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">اکنون پشتیبان‌گیری شود</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">پشتیبان‌ها خاموش و پاگ شوند؟</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">دیگر هزینه‌ای از شما دریافت نمی‌شود. پشتیبان شما پاک خواهد شد و هیچ پشتیبان جدیدی ایجاد نخواهد شد.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">خاموش و پاک کردن</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">در حال پاک کردن پشتیبان…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">پشتیبان پاک شد</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"با ضربه زدن روی «اکنون پشتیبان‌گیری شود»"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">روزانه</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">هفتگی</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">ماهانه</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">پشتیبان‌گیری دستی</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">لطفا پین، رمز عبور یا الگوی دستگاه خود را وارد کنید.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">بعدی</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">تغییر نوع پشتیبان‌گیری</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">لغو اشتراک</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">تأیید لغو</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">دیگر هزینه‌ای از شما دریافت نمی‌شود. پشتیبان‌گیری در پایان دوره پرداخت شما غیرفعال می‌شود. پس از آن تاریخ، ۳۰ روز فرصت دارید تا رسانه‌ای را که در حال حاضر از آن پشتیبان می‌گیرید دانلود کنید.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">هم اکنون تأیید و دانلود شود</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">بعداً تأیید و دانلود شود</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">حفظ اشتراک</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index c4bc655ba9..c4d84393c4 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal päivittyy…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly päivittyy…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Et ole vielä määritellyt salalausetta!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Poista salalause käytöstä?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Tämä avaa Signalin ja viesti-ilmoitusten lukituksen pysyvästi.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Tämä avaa Mollyin ja viesti-ilmoitusten lukituksen pysyvästi.</string>
     <string name="ApplicationPreferencesActivity_disable">Poista käytöstä</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Virhe yhdistettäessä palvelimeen!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">Rekisteröintiesto vaatii tunnusluvun. Poista rekisteröintiesto käytöstä ennen tunnusluvun poistamista.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Tiedosto</string>
     <string name="AttachmentKeyboard_contact">Yhteystieto</string>
     <string name="AttachmentKeyboard_location">Sijainti</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal tarvitsee käyttöoikeuden kuvien ja videoiden näyttämiseksi</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly tarvitsee käyttöoikeuden kuvien ja videoiden näyttämiseksi</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Myönnä käyttöoikeus</string>
     <string name="AttachmentKeyboard_payment">Maksu</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Median valintaan ei löytynyt sovellusta.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal tarvitsee luvan käyttää laitteesi tallennustilaa kuvien, videoiden tai äänitiedostojen liittämistä varten, mutta tämä käyttöoikeus on pysyvästi evätty Signalilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Tallennustila\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal tarvitsee luvan käyttää laitteesi yhteystietoja oman yhteystietolistansa käsittelyä varten, mutta tämä käyttöoikeus on pysyvästi evätty Signalilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Yhteystiedot\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal tarvitsee luvan käyttää sijaintitietoja sijainnin liittämistä varten, mutta tämä käyttöoikeus on pysyvästi evätty Signalilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Sijainti\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly tarvitsee luvan käyttää laitteesi tallennustilaa kuvien, videoiden tai äänitiedostojen liittämistä varten, mutta tämä käyttöoikeus on pysyvästi evätty Mollyilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Tallennustila\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly tarvitsee luvan käyttää laitteesi yhteystietoja oman yhteystietolistansa käsittelyä varten, mutta tämä käyttöoikeus on pysyvästi evätty Mollyilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Yhteystiedot\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly tarvitsee luvan käyttää sijaintitietoja sijainnin liittämistä varten, mutta tämä käyttöoikeus on pysyvästi evätty Mollyilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Sijainti\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Myönnä sijaintisi käyttöoikeus</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Sijaintisi lähettäminen:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Myönnä Signalille oikeus lähettää sijaintisi.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Myönnä Mollyille oikeus lähettää sijaintisi.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal tarvitsee sijaintitietojen oikeudet sijaintisi lähettämiseksi.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly tarvitsee sijaintitietojen oikeudet sijaintisi lähettämiseksi.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Myönnä pääsy tallennustilaan</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Kuvien ja videoiden näyttäminen:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal tarvitsee tallennustilan käyttöoikeuden kuvien ja videoiden näyttämiseksi.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly tarvitsee tallennustilan käyttöoikeuden kuvien ja videoiden näyttämiseksi.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s ei ole aktivoinut Signal-maksuja </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Vaihda kamera</string>
     <string name="CameraXFragment_open_gallery_description">Avaa galleria</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Myönnä käyttöoikeus</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Anna kameran ja mikrofonin käyttöoikeus</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Anna kameran käyttöoikeus</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Myönnä mikrofonin käyttöoikeus</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Kuvien ottaminen edellyttää, että annat Signalille kameran käyttöoikeuden.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Kuvien ja videoiden ottaminen edellyttää, että annat Signalille kameran käyttöoikeuden.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Kuvien ja videoiden ottaminen edellyttää, että annat Signalille kameran ja mikrofonin käyttöoikeuden.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Jos haluat tallentaa videoita äänellä, anna Signalille mikrofonin käyttöoikeus.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Jotta voit skannata QR-koodin, anna Signalille kameran käyttöoikeus.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal tarvitsee kameran käyttöoikeuden kuvien ottamiseksi</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal tarvitsee kameran käyttöoikeuden QR-koodien skannaamiseksi</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal tarvitsee mikrofonin käyttöoikeuden videon tallentamiseksi</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Kuvien ottaminen Signalissa:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Valokuvien ja videoiden ottaminen Signalissa:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Videoiden tallentaminen äänellä:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR-koodien skannaus:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Viimeisimmät yhteystiedot</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Ei Signal-yhteystietoja</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Voit lähettää valokuvia Signal-yhteystiedoillesi vain kamerapainikkeella. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Etkö löydä etsimääsi?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Kutsu kavereita Signaliin</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Kutsu kavereita Mollyiin</string>
     <string name="CameraContacts__menu_search">Haku</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Ei kiitos</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Päivitä Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Päivitä Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Tätä sovelluksen versiota ei enää tueta. Voit lähettää ja vastaanottaa viestejä päivittämällä uusimpaan versioon.</string>
     <string name="ClientDeprecatedActivity_update">Päivitä</string>
     <string name="ClientDeprecatedActivity_dont_update">Älä päivitä</string>
     <string name="ClientDeprecatedActivity_warning">Varoitus</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Signal-versiosi on vanhentunut. Voit tarkastella viestihistoriaasi, mutta et voi lähettää tai vastaanottaa viestejä ennen sovelluksen päivittämistä.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Molly-versiosi on vanhentunut. Voit tarkastella viestihistoriaasi, mutta et voi lähettää tai vastaanottaa viestejä ennen sovelluksen päivittämistä.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Verkkoselainta ei löytynyt.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Viesti: %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly-äänipuhelu %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly-videopuhelu %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal-viesti</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Lähetä viesti</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Hei, vaihdetaan Signaliin %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Hei, vaihdetaan Mollyiin %1$s</string>
     <string name="ConversationActivity_specify_recipient">Valitse yhteystieto</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Liitetiedosto ylittää lähettämäsi viestityypin kokorajoituksen.</string>
     <string name="ConversationActivity_unable_to_record_audio">Äänen tallennus ei onnistunut!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Ääniviestien lähettäminen:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Myönnä Signalille mikrofonin käyttöoikeus lähettääksesi ääniviestejä.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Myönnä Mollyille mikrofonin käyttöoikeus lähettääksesi ääniviestejä.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal tarvitsee mikrofonin käyttöoikeuden ääniviestin tallennusta varten.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal tarvitsee luvan käyttää mikrofonia äänitiedostojen lähettämistä varten, mutta tämä käyttöoikeus on pysyvästi evätty Signalilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Mikrofoni\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly tarvitsee mikrofonin käyttöoikeuden ääniviestin tallennusta varten.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly tarvitsee luvan käyttää mikrofonia äänitiedostojen lähettämistä varten, mutta tämä käyttöoikeus on pysyvästi evätty Mollyilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Mikrofoni\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal tarvitsee luvan käyttää laitteesi mikrofonia ja kameraa yhteystiedolle %1$s soittamista varten, mutta tämä käyttöoikeus on pysyvästi evätty Signalilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Mikrofoni\" ja \"Kamera\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Kuvien ja videoiden ottaminen edellyttää, että annat Signalille kameran käyttöoikeuden.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal tarvitsee luvan käyttää laitteesi kameraa kuvien ja videoiden ottamista varten, mutta tämä käyttöoikeus on pysyvästi evätty Signalilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal tarvitsee käyttöoikeuden kuvien ja videoiden ottamiseksi.</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly tarvitsee luvan käyttää laitteesi mikrofonia ja kameraa yhteystiedolle %1$s soittamista varten, mutta tämä käyttöoikeus on pysyvästi evätty Mollyilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Mikrofoni\" ja \"Kamera\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Kuvien ja videoiden ottaminen edellyttää, että annat Mollyille kameran käyttöoikeuden.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly tarvitsee luvan käyttää laitteesi kameraa kuvien ja videoiden ottamista varten, mutta tämä käyttöoikeus on pysyvästi evätty Mollyilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly tarvitsee käyttöoikeuden kuvien ja videoiden ottamiseksi.</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Myönnä mikrofonin käyttöoikeus, jotta voit tallentaa videoita, joissa on ääni.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal tarvitsee mikrofonin käyttöoikeuden videoiden tallennusta varten, mutta se on evätty. Jatka sovellusasetuksiin, valitse \"käyttöoikeudet\" ja ota käyttöön \"mikrofoni\" ja \"kamera\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal tarvitsee mikrofonin käyttöoikeuden videoiden tallennusta varten.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly tarvitsee mikrofonin käyttöoikeuden videoiden tallennusta varten, mutta se on evätty. Jatka sovellusasetuksiin, valitse \"käyttöoikeudet\" ja ota käyttöön \"mikrofoni\" ja \"kamera\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly tarvitsee mikrofonin käyttöoikeuden videoiden tallennusta varten.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Ei</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Puhelun aloittaminen:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Myönnä Signalille mikrofonin käyttöoikeus soittaaksesi puhelun.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Myönnä Mollyille mikrofonin käyttöoikeus soittaaksesi puhelun.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal tarvitsee mikrofonin käyttöoikeuden puhelun aloittamiseksi.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly tarvitsee mikrofonin käyttöoikeuden puhelun aloittamiseksi.</string>
 
 
     <string name="ConversationActivity_join">Liity</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Signal ei enää tue tekstiviestejä. Kutsu %1$s Signaliin, niin voit jatkaa keskustelua täällä.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Tämä henkilö ei enää käytä Signalia. Kutsu hänet mukaan Signaliin, niin voit jatkaa keskustelua täällä.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Tämä henkilö ei enää käytä Mollyia. Kutsu hänet mukaan Mollyiin, niin voit jatkaa keskustelua täällä.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Kutsu Signaliin</string>
+    <string name="ConversationActivity__invite_to_signal">Kutsu Mollyiin</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Saat pian uuden muistutuksen.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Poista kaikilta</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Poista tältä laitteelta</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Poista</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Poista kaikkialta</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Tämä viesti poistetaan kaikilta keskustelussa olevilta, jos he käyttävät Signalin uusinta versiota. He näkevät, että poistit viestin.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Estetty</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Päivitä Signal</string>
+    <string name="ConversationFragment__update_build">Päivitä Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Rekisteröi Signal uudelleen</string>
+    <string name="ConversationFragment__reregister_signal">Rekisteröi Molly uudelleen</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Siirry takaisin.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Avaa Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Avaa Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Ei enää varmennettu</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Tämä poistaa valitun keskustelun pysyvästi.</item>
         <item quantity="other">Tämä poistaa kaikki %1$d valittua keskustelua pysyvästi.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Tämä poistaa valitun keskustelun pysyvästi kaikista laitteistasi.</item>
+        <item quantity="other">Tämä poistaa valitut %1$d keskustelua pysyvästi kaikista laitteistasi.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Poistetaan</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Poistetaan valittu keskustelu…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Kuka voi löytää minut puhelinnumeron avulla?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Kuka tahansa, jolla on puhelinnumerosi, näkee, että olet Signalissa, ja voi aloittaa keskustelut kanssasi.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Kuka tahansa, jolla on puhelinnumerosi, näkee, että olet Mollyissa, ja voi aloittaa keskustelut kanssasi.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Kukaan ei näe, että olet Signalissa, ellet lähetä heille viestiä tai keskustele heidän kanssaan.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Kukaan ei näe, että olet Mollyissa, ellet lähetä heille viestiä tai keskustele heidän kanssaan.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Palautetaanko varmuuskopiosta?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Tarkista varmuuskopion salalause ja varmista että se täsmää</string>
     <string name="BackupsPreferenceFragment__turn_on">Ota käyttöön</string>
     <string name="BackupsPreferenceFragment__turn_off">Poista käytöstä</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Palauta varmuuskopio asentamalla Signal uudelleen tai uuteen laitteeseen. Avaa sovellus, napauta Palauta varmuuskopio ja etsi sitten varmuuskopiotiedosto. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Palauta varmuuskopio asentamalla Molly uudelleen tai uuteen laitteeseen. Avaa sovellus, napauta Palauta varmuuskopio ja etsi sitten varmuuskopiotiedosto. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Lue lisää</string>
     <string name="BackupsPreferenceFragment__in_progress">Käsitellään…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d tähän mennessä…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% tähän mennessä…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal tarvitsee luvan käyttää laitteesi tallennustilaa varmuuskopioiden luomista varten, mutta tämä käyttöoikeus on pysyvästi evätty Signalilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Tallennustila\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly tarvitsee luvan käyttää laitteesi tallennustilaa varmuuskopioiden luomista varten, mutta tämä käyttöoikeus on pysyvästi evätty Mollyilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Tallennustila\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Aseta varmuuskopiointiaika</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Keskustelu on päivitetty</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signalin sisältö salataan päästä päähän. Tästä syystä keskustelu täytyy joskus päivittää. Tämä ei vaikuta tietoturvaan. Tämän yhteyshenkilön viimeisin viesti ei välttämättä näy. Voit pyytää häntä lähettämään sen uudelleen.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Mollyin sisältö salataan päästä päähän. Tästä syystä keskustelu täytyy joskus päivittää. Tämä ei vaikuta tietoturvaan. Tämän yhteyshenkilön viimeisin viesti ei välttämättä näy. Voit pyytää häntä lähettämään sen uudelleen.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Käytä Signalia tietokoneella tai iPadilla. Viestisi synkronoidaan yhdistettyihin laitteisiin.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Yhdistä uusi laite</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Viestit ja keskustelujen tiedot on suojattu päästä päähän -salauksella kaikilla laitteilla</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal tietokoneille tai iPadille</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Kaikki viestit yhdistetyillä laitteilla ovat yksityisiä</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Mollyin viestit synkronoidaan matkapuhelimesi Molly-sovelluksen kanssa, kun laite on yhdistetty. Aiempi viestihistoriasi ei tule näkyviin.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Asenna Molly toiselle laitteellesi osoitteesta %1$s</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Omat yhdistetyt laitteet</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Poista yhdistäminen</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s yhdistäminen poistettu</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Yhdistetään laitetta…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Laite hyväksytty</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Ladataan…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Ei yhdistettyjä laitteita</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Avaa lukitus yhdistääksesi laitteen</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Skannaa yhdistettävän laitteen ruudulla näkyvä QR-koodi.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Skannaa QR-koodi</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Käytä tätä laitetta QR-koodin skannaamiseen siinä laitteessa, jonka haluat yhdistää</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Selvä</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Tämä laite voi jatkossa nähdä ryhmäsi ja yhteystietosi, lukea kaikki viestisi ja lähettää viestejä sinun nimissäsi.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Viimeistele yhdistäminen toisella laitteellasi</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Viimeistele Mollyin yhdistäminen toisella laitteellasi.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Laitteen yhdistäminen epäonnistui</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Tämä QR-koodi ei kelpaa. Tarkista, että olet skannaamassa sen laitteen näytöllä näkyvää QR-koodia, johon haluat yhdistää.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Yritä uudelleen</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Poista \'%1$s\'?</string>
@@ -872,7 +935,7 @@
     <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Laite ei tue Play-palveluita. Virransäästöominaisuudet estävät viestien hakemisen taustalla. Ota toiminto pois käytöstä napauttamalla.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Tämä Signal-versio on vanhentunut. Päivitä nyt lähettääksesi ja vastaanottaaksesi viestejä.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Tämä Molly-versio on vanhentunut. Päivitä nyt lähettääksesi ja vastaanottaaksesi viestejä.</string>
     <string name="ExpiredBuildReminder_update_now">Päivitä nyt</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Näytä</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Pysyvä Signal-yhteysvirhe!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal ei voinut rekisteröityä Google Play Services -palveluun. Tästä syystä Signal-viestit ja puhelut ovat pois käytöstä. Yritä rekisteröityä uudelleen Signalin lisäasetuksista.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Pysyvä Molly-yhteysvirhe!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly ei voinut rekisteröityä Google Play Services -palveluun. Tästä syystä Molly-viestit ja puhelut ovat pois käytöstä. Yritä rekisteröityä uudelleen Mollyin lisäasetuksista.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Virheenkorjauslokit auttavat meitä diagnosoimaan ja korjaamaan ongelman, eivätkä ne sisällä tunnistetietoja.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal kohtasi ongelman. Lähetetäänkö virheenkorjausloki?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly kohtasi ongelman. Lähetetäänkö virheenkorjausloki?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Akun käytön optimointi voi aiheuttaa viiveitä ilmoituksissa</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Voit poistaa akun käytön optimoinnin käytöstä Signalin osalta varmistaaksesi, etteivät viesti-ilmoitukset viivästy.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Voit poistaa akun käytön optimoinnin käytöstä Mollyin osalta varmistaaksesi, etteivät viesti-ilmoitukset viivästy.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Akun käytön optimointi voi aiheuttaa viiveitä ilmoituksissa</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Voit poistaa akun käytön optimoinnin käytöstä Mollyin osalta varmistaaksesi, etteivät viesti-ilmoitukset viivästy. Napauta Jatka nähdäksesi laitekohtaiset ohjeet.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Ei kiitos</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Jatka</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Jatka</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Hylkää</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Ei kiitos</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Odottavat ryhmäkutsut</string>
+    <string name="PendingMembersActivity_pending_group_invites">Liittymispyynnöt ja kutsut</string>
     <string name="PendingMembersActivity_requests">Pyynnöt</string>
     <string name="PendingMembersActivity_invites">Kutsut</string>
     <string name="PendingMembersActivity_people_you_invited">Kutsumasi henkilöt</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Peruuta</string>
     <string name="InviteActivity_sending">Lähetetään…</string>
     <string name="InviteActivity_invitations_sent">Kutsut lähetetty!</string>
-    <string name="InviteActivity_invite_to_signal">Kutsu Signaliin</string>
+    <string name="InviteActivity_invite_to_signal">Kutsu Mollyiin</string>
     <string name="InviteActivity_send_sms">Lähetä SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Lähetetäänkö %1$d tekstiviestikutsu?</item>
         <item quantity="other">Lähetetäänkö %1$d tekstiviestikutsua?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Hei, vaihdetaan Signaliin: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Hei, vaihdetaan Mollyiin: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Sinulla ole yhtään sovellusta, joihin voi jakaa sisältöä.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Sinun viestisi</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Taustayhteys päällä</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Vastaukset</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Muodostetaan Signal-puhelua</string>
+    <string name="NotificationBarManager__establishing_signal_call">Muodostetaan Molly-puhelua</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Käynnistetään Signalin puhelupalvelu</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Pysäytetään Signalin puhelupalvelua</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Käynnistetään Mollyin puhelupalvelu</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Pysäytetään Mollyin puhelupalvelua</string>
     <string name="NotificationBarManager__cancel_call">Peru puhelu</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Olet aktivoinut Signal-maksut</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s voi nyt hyväksyä maksuja</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Maksutietoja ei ole saatavilla</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Näytä lisää napauttamalla</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Maksutietoja ei ole saatavilla</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Tämän maksun tiedot eivät ole saatavilla, koska viestisi palautettiin lähteestä, joka ei sisällä maksuhistoriaa. Tämä ei vaikuta lompakon saldoon tai aiempien maksujen tilaan.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Pian et voi enää lähettää tekstiviestejä Signalista. Kutsu %1$s Signaliin, niin voit jatkaa keskustelua täällä.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Et voi enää lähettää tekstiviestejä Signalissa. Kutsu %1$s Signaliin, niin voit jatkaa keskustelua täällä.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Et voi enää lähettää tekstiviestejä Mollyissa. Kutsu %1$s Mollyiin, niin voit jatkaa keskustelua täällä.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Maksu: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Maksu</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Ilmoitettu roskapostista</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Yhdistetäänkö Signal-laite?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Vaikuttaa siltä, että yrität yhdistää laitetta käyttämällä Signalin ulkopuolista skannaussovellusta. Oman turvallisuutesi vuoksi skannaa QR-koodi uudelleen Signalilla itsellään.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal tarvitsee luvan käyttää kameraa QR-koodien skannaamista varten, mutta tämä käyttöoikeus on pysyvästi evätty Signalilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Kamera\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly tarvitsee luvan käyttää kameraa QR-koodien skannaamista varten, mutta tämä käyttöoikeus on pysyvästi evätty Mollyilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Kamera\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">QR-koodin skannaus ei onnistu ilman kameran käyttöoikeutta.</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Syötä salalause</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal-kuvake</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly-kuvake</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Syötä salalause</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Salalause ei kelpaa!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Avaa Signalin lukitus</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Lukitusnäyttö</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Avaa Mollyin lukitus</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Lukitusnäyttö</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Kartta</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Vahvista jatkaaksesi viestintää</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Auta vähentämään roskapostia Signalissa ja suorita vahvistaminen.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Auta vähentämään roskapostia Mollyissa ja suorita vahvistaminen.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Voit jatkaa viestintää vahvistamisen jälkeen. Kaikki odottavat viestit lähetetään automaattisesti.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Oma tarina</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal-puhelu</string>
+    <string name="Recipient_signal_call">Molly-puhelu</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Estä</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Soitetaan…</string>
     <string name="RedPhone_busy">Varattu</string>
     <string name="RedPhone_recipient_unavailable">Vastaanottaja ei ole tavoitettavissa</string>
-    <string name="RedPhone_network_failed">Verkkoyhteysvirhe!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Verkkoyhteysvirhe! Tarkista verkkoyhteys ja yritä uudelleen.</string>
     <string name="RedPhone_number_not_registered">Numeroa ei rekisteröity!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Numero, johon yritit soittaa, ei tue salattuja puheluita!</string>
     <string name="RedPhone_got_it">Selvä</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Ota video käyttöön napauttamalla tästä</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Jotta voit soittaa yhteystiedolle %1$s, Signal tarvitsee luvan käyttää kameraa.</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Jotta voit soittaa yhteystiedolle %1$s, Molly tarvitsee luvan käyttää kameraa.</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Soitetaan…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Yhdistetään uudelleen…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Poistettu puhelusta</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Joku on poistanut sinut puhelusta.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Anna kameran ja mikrofonin käyttöoikeus</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Myönnä mikrofonin käyttöoikeus</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Anna kameran käyttöoikeus</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Myönnä Mollyille kameran ja mikrofonin käyttöoikeus puhelun aloittamiseksi tai siihen liittymiseksi.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Myönnä Mollyille mikrofonin käyttöoikeus puhelun aloittamiseksi tai siihen liittymiseksi.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Videon käyttöönotto edellyttää, että annat Mollyille kameran käyttöoikeuden.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly tarvitsee mikrofonin käyttöoikeuden puhelun aloittamiseksi tai siihen liittymiseksi.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly tarvitsee kameran käyttöoikeuden kuvien ottamiseksi</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Puhelun aloittaminen tai puheluun liittyminen:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Videon käyttöönotto:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal -puhelu</string>
-    <string name="WebRtcCallView__signal_video_call">Signal-videopuhelu</string>
+    <string name="WebRtcCallView__signal_call">Molly -puhelu</string>
+    <string name="WebRtcCallView__signal_video_call">Molly-videopuhelu</string>
     <string name="WebRtcCallView__start_call">Aloita puhelu</string>
     <string name="WebRtcCallView__join_call">Liity puheluun</string>
     <string name="WebRtcCallView__call_is_full">Puhelu on täynnä</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Laske käsi?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Laske käsi</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Laske</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Peruuta</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Nostit kätesi</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Näytä</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s nosti kätensä</item>
-        <item quantity="other">%1$s ja %2$d nostivat kätensä</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s nostit kätesi</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s ja %2$d muu nostitte kätenne</item>
+        <item quantity="other">%1$s ja %2$d muuta nostitte kätenne</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s nosti kätensä</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s ja %2$d muu nostivat kätensä</item>
+        <item quantity="other">%1$s ja %2$d muuta nostivat kätensä</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s + %2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s + %2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Saat puhelun, jolla voit vahvistaa tämän puhelinnumeron.</string>
     <string name="RegistrationActivity_edit_number">Muokkaa numeroa</string>
     <string name="RegistrationActivity_missing_google_play_services">Google Play -palvelut puuttuvat</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Google Play -palvelut puuttuvat tästä laitteesta. Signal toimii myös ilman niitä, mutta kaikki ominaisuudet eivät välttämättä toimi yhtä hyvin.\n\nJos et ole edistyneempi käyttäjä, et käytä epävirallista Android-versiota tai tämä viesti on mielestäsi aiheeton, pyydä apua osoitteesta support@signal.org.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Google Play -palvelut puuttuvat tästä laitteesta. Molly toimii myös ilman niitä, mutta kaikki ominaisuudet eivät välttämättä toimi yhtä hyvin.\n\nJos et ole edistyneempi käyttäjä, et käytä epävirallista Android-versiota tai tämä viesti on mielestäsi aiheeton, pyydä apua osoitteesta support@molly.im.</string>
     <string name="RegistrationActivity_i_understand">Selvä</string>
     <string name="RegistrationActivity_play_services_error">Play-palvelujen virhe</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play -palveluita päivitetään tai ne eivät ole käytettävissä. Yritä myöhemmin uudelleen.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Epästandardi numeron muoto</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Syöttämäsi numero (%1$s) ei näytä olevan vakiomuotoinen.\n\nTarkoititko %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Androidille - Puhelinnumeron muoto</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Androidille - Puhelinnumeron muoto</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Puhelu pyydetty</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Onko sinulla ongelmia rekisteröitymisessä?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Varmista, että puhelimesi on yhteydessä matkapuhelinverkkoon ja voi vastaanottaa tekstiviestin tai puhelun\n • Varmista, että voit vastaanottaa puhelun numeroon\n • Tarkista, että olet syöttänyt puhelinnumerosi oikein.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Jos haluat lisätietoja, noudata näitä vianmääritysvaiheita tai ota yhteyttä tukeen</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Löydät lisätietoja seuraavista: %1$s tai %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">näitä vianmääritysvaiheita</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Lisää yhteystietoihin</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Kutsu Signaliin</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Kutsu Mollyiin</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal-viesti</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal-puhelu</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Lisää yhteystietoihin</string>
-    <string name="SharedContactView_invite_to_signal">Kutsu Signaliin</string>
+    <string name="SharedContactView_invite_to_signal">Kutsu Mollyiin</string>
     <string name="SharedContactView_message">Signal-viesti</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s kuuluu henkilölle %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal-päivitys</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Uusi versio Signalista on saatavilla. Päivitä napauttamalla.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signalin päivitys epäonnistui</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly-päivitys</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Uusi versio Mollyista on saatavilla. Päivitä napauttamalla.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Mollyin päivitys epäonnistui</string>
     <string name="ApkUpdateNotifications_failed_general_body">Yritämme myöhemmin uudelleen.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signalin päivitys onnistui</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Mollyin päivitys onnistui</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Päivitettiin automaattisesti versioon %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Signal-turvanumeromme:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Sinulla ole yhtään sovellusta, joihin voi jakaa sisältöä.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Leikepöydältä ei löytynyt turvanumeroa, johon verrata</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal tarvitsee luvan käyttää kameraa QR-koodien skannaamista varten, mutta tämä käyttöoikeus on pysyvästi evätty Signalilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla Sovelluksen käyttöoikeudet ja laittamalla päälle Kamera.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly tarvitsee luvan käyttää kameraa QR-koodien skannaamista varten, mutta tämä käyttöoikeus on pysyvästi evätty Mollyilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla Sovelluksen käyttöoikeudet ja laittamalla päälle Kamera.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">QR-koodin skannaus ei onnistu ilman kameran käyttöoikeutta.</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Voit nähdä käyttäjän %1$s turvanumeron viestimällä hänen kanssaan.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Siirry takaisin sovellukseen koskettamalla tästä.</string>
-    <string name="KeyCachingService_passphrase_cached">Signalin lukitus on avattu</string>
-    <string name="KeyCachingService_lock">Lukitse Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Mollyin lukitus on avattu</string>
+    <string name="KeyCachingService_lock">Lukitse Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Sinä</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Median tyyppiä ei tueta</string>
     <string name="MediaPreviewActivity_draft">Luonnos</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal tarvitsee luvan käyttää laitteesi tallennustilaa tallentaakseen sinne, mutta tämä käyttöoikeus on pysyvästi evätty Signalilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Tallennustila\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly tarvitsee luvan käyttää laitteesi tallennustilaa tallentaakseen sinne, mutta tämä käyttöoikeus on pysyvästi evätty Mollyilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Tallennustila\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Tallennus ulkoiseen tallennustilaan ei onnistu ilman käyttöoikeutta.</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Poistetaanko viesti?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Viesti poistetaan pysyvästi.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Viestin lähetys ei onnistunut.</string>
     <string name="MessageNotifier_error_delivering_message">Virhe viestiä toimitettaessa.</string>
     <string name="MessageNotifier_message_delivery_paused">Viestin toimitus keskeytetty.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Vahvista jatkaaksesi viestintää Signalissa.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Vahvista jatkaaksesi viestintää Mollyissa.</string>
     <string name="MessageNotifier_mark_all_as_read">Merkitse kaikki luetuiksi</string>
     <string name="MessageNotifier_mark_read">Luettu</string>
     <string name="MessageNotifier_turn_off_these_notifications">Poista nämä ilmoitukset käytöstä</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Lähetti reaktion %1$s tarraasi.</string>
     <string name="MessageNotifier_this_message_was_deleted">Viesti poistettiin.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Poistetaanko Yhteystietosi liittyi Signaliin -ilmoitukset käytöstä? Voit ottaa ne uudelleen käyttöön avaamalla Signal &gt; Asetukset &gt; Ilmoitukset.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Poistetaanko Yhteystietosi liittyi Mollyiin -ilmoitukset käytöstä? Voit ottaa ne uudelleen käyttöön avaamalla Molly &gt; Asetukset &gt; Ilmoitukset.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Pikavastaus ei toimi, kun Signal on lukittu!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Pikavastaus ei toimi, kun Molly on lukittu!</string>
     <string name="QuickResponseService_problem_sending_message">Ongelma viestin lähettämisessä!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Virheellinen pikakuvake</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Uusi viesti</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Viestipyyntö</string>
     <string name="SingleRecipientNotificationBuilder_you">Sinä</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Tämä laite ei ole enää rekisteröity. Todennäköisesti olet rekisteröinyt puhelinnumerosi Signaliin toisella laitteella.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Tämä laite ei ole enää rekisteröity. Todennäköisesti olet rekisteröinyt puhelinnumerosi Mollyiin toisella laitteella.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Rekisteröi laite uudelleen</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Jotta voit vastata puheluun, anna Signalille lupa käyttää mikrofonia.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Jotta voit vastata puheluun, anna Mollyille lupa käyttää mikrofonia.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Anna Signalille mikrofonin ja kameran käyttöoikeus, jotta voit vastata videopuheluun.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal tarvitsee luvan käyttää mikrofonia ja kameraa puheluiden soittamista ja vastaanottamista varten, mutta nämä käyttöoikeudet ovat pysyvästi evätty Signalilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Mikrofoni\" ja \"Kamera\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Anna Mollyille mikrofonin ja kameran käyttöoikeus, jotta voit vastata videopuheluun.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly tarvitsee luvan käyttää mikrofonia ja kameraa puheluiden soittamista ja vastaanottamista varten, mutta nämä käyttöoikeudet ovat pysyvästi evätty Mollyilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Mikrofoni\" ja \"Kamera\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Vastattu yhdistetyllä laitteella.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Hylätty yhdistetyllä laitteella.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Varattu yhdistetyllä laitteella.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Toista uusi salalause</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Kutsu Signaliin</string>
+    <string name="contact_selection_activity__invite_to_signal">Kutsu Mollyiin</string>
     <string name="contact_selection_activity__new_group">Uusi ryhmä</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Päivitä yhteystiedot</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Puuttuuko joku? Kokeile päivittää</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Löydä tuntemiasi ihmisiä Signalista</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Salli yhteystietojesi käyttöoikeus</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Lisää</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Yhteystiedon kuva</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal tarvitsee luvan käyttää laitteesi yhteystietoja voidakseen näyttää ne, mutta tämä käyttöoikeus on pysyvästi evätty Signalilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Yhteystiedot\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly tarvitsee luvan käyttää laitteesi yhteystietoja voidakseen näyttää ne, mutta tämä käyttöoikeus on pysyvästi evätty Mollyilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Yhteystiedot\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Yhteystietojen haussa tapahtui virhe. Tarkista verkkoyhteytesi.</string>
     <string name="ContactSelectionListFragment_username_not_found">Käyttäjänimeä ei löydy</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"%1$s ei käytä Signalia. Tarkista käyttäjänimi ja yritä uudelleen."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Etsi käyttäjänimellä</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Anna yhteystietojen käyttöoikeus</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Näin löydät tuntemasi ihmiset Signalista:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Myönnä käyttöoikeus</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Ei kiitos</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Salli yhteystietojesi käyttöoikeus. Yhteystietosi salataan, eivätkä ne näy Signal-palvelussa.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal tarvitsee luvan käyttää yhteystietojasi, jotta se voi näyttää ne.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly tarvitsee luvan käyttää yhteystietojasi, jotta se voi näyttää ne.</string>
     <string name="contact_selection_list_fragment__show_contacts">Näytä yhteystiedot</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Olet poistanut tämän henkilön. Jos lähetät hänelle viestin uudelleen, hänet lisätään takaisin luetteloosi.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Valinnat</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Päivitä</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Soita … keskeytä</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Kuplat on Android-ominaisuus, jonka voit poistaa käytöstä Signalin keskusteluista.</string>
+    <string name="BubbleOptOutTooltip__description">Kuplat on Android-ominaisuus, jonka voit poistaa käytöstä Mollyin keskusteluista.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Ei nyt</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Ryhmän kuvaus</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Päivitä Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Päivitä Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Tämä Signal-versio on vanhentunut. Päivitä nyt jatkaaksesi Signalin käyttöä.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Tämä Molly-versio on vanhentunut. Päivitä nyt jatkaaksesi Mollyin käyttöä.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Päivitä</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Hidas</string>
     <string name="preferences__help">Tuki</string>
     <string name="preferences__advanced">Lisäasetukset</string>
-    <string name="preferences__donate_to_signal">Lahjoita Signalille</string>
+    <string name="preferences__donate_to_signal">Lahjoita Mollyille</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Yksityisyys</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Vaihda sovelluskuvakkeeksi ja nimeksi \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal on suljettava sovelluskuvakkeen ja nimen vaihtamiseksi. Ilmoituksissa näytetään aina Signalin oletuskuvake ja nimi.</string>
+    <string name="preferences__app_icon_dialog_description">Molly on suljettava sovelluskuvakkeen ja nimen vaihtamiseksi. Ilmoituksissa näytetään aina Mollyin oletuskuvake ja nimi.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Valitse sovelluskuvake ja nimi, jotka näkyvät puhelimesi aloitusnäytössä ja sovellusvalikossa. Ilmoituksissa näytetään aina Signalin oletuskuvake ja nimi. Lue lisää</string>
+    <string name="preferences__app_icon_warning_learn_more">Valitse sovelluskuvake ja nimi, jotka näkyvät puhelimesi aloitusnäytössä ja sovellusvalikossa. Ilmoituksissa näytetään aina Mollyin oletuskuvake ja nimi. Lue lisää</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Sovelluskuvakkeet ja nimet näkyvät aloitusnäytössä ja sovellusvalikossa.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Ilmoituksissa näytetään aina Signalin oletuskuvake ja nimi.</string>
+    <string name="preferences__app_icon_notification_warning">Ilmoituksissa näytetään aina Mollyin oletuskuvake ja nimi.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Lue lisää</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Keskustelut rajataan pysyvästi %1$s viimeisimpään viestiin.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Koko viestihistoria ja kaikki mediatiedostot poistetaan laitteesta.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Koko viestihistoria ja kaikki mediatiedostot poistetaan laitteesta ja kaikista yhdistetyistä laitteista.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Haluatko varmasti poistaa koko viestihistorian?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Koko viestihistoria poistetaan pysyvästi. Toimintoa ei voi kumota.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Koko viestihistoria poistetaan pysyvästi kaikista laitteista. Toimintoa ei voi kumota. Tätä toimintoa ei voi perua.</string>
     <string name="preferences_storage__delete_all_now">Poista kaikki nyt</string>
     <string name="preferences_storage__forever">Pysyvästi</string>
     <string name="preferences_storage__one_year">1 vuosi</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Sensuurin kiertäminen</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Sensuurin kiertäminen</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Signal yrittää kiertää sensuuria toiminnon ollessa käytössä. Käytä toimintoa vain paikassa, jossa Signal on sensuroitu.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Molly yrittää kiertää sensuuria toiminnon ollessa käytössä. Käytä toimintoa vain paikassa, jossa Molly on sensuroitu.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Puhelinnumerosi sijaintiin perustuva sensuurin kiertäminen otettu käyttöön.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Esittelyssä maksut</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Voit lähettää ja vastaanottaa Signalissa uutta, yksityisyyteen panostavaa digitaalista MobileCoin-valuuttaa. Aloita ottamalla se käyttöön.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Voit lähettää ja vastaanottaa Mollyissa uutta, yksityisyyteen panostavaa digitaalista MobileCoin-valuuttaa. Aloita ottamalla se käyttöön.</string>
     <string name="PaymentsHomeFragment__activate_payments">Aktivoi maksut</string>
     <string name="PaymentsHomeFragment__activating_payments">Aktivoidaan maksut…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Palauta maksutili</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Maksutoiminto ei ole saatavilla alueellasi.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Maksutoiminnon käyttöönotto epäonnistui. Yritä myöhemmin uudelleen.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Poistetaanko maksut käytöstä?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">MobileCoin-maksuja ei voi lähettää tai vastaanottaa Signalissa, jos maksut poistetaan käytöstä.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">MobileCoin-maksuja ei voi lähettää tai vastaanottaa Mollyissa, jos maksut poistetaan käytöstä.</string>
     <string name="PaymentsHomeFragment__deactivate">Poista käytöstä</string>
     <string name="PaymentsHomeFragment__continue">Jatka</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Saldo ei ole saatavilla tällä hetkellä.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Lisätietoja</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Signalissa voi lähettää tai vastaanottaa MobileCoineja. Maksujen siirto tapahtuu MobileCoinsin ja MobileCoin Walletin käyttöehtojen mukaisesti. Mahdollisten teknisten ongelmien takia keskeytyneitä siirtoja tai katemenetyksiä ei korvata. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Mollyissa voi lähettää tai vastaanottaa MobileCoineja. Maksujen siirto tapahtuu MobileCoinsin ja MobileCoin Walletin käyttöehtojen mukaisesti. Mahdollisten teknisten ongelmien takia keskeytyneitä siirtoja tai katemenetyksiä ei korvata. </string>
     <string name="PaymentsHomeFragment__activate">Aktivoi</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Näytä MobileCoinin ehdot</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Signalin maksutoiminto ei ole enää käytettävissä. Varat voi yhä siirtää toiseen kauppapaikkaan, mutta varojen lisääminen tai maksujen lähettäminen ja vastaanottaminen ei ole enää mahdollista.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Mollyin maksutoiminto ei ole enää käytettävissä. Varat voi yhä siirtää toiseen kauppapaikkaan, mutta varojen lisääminen tai maksujen lähettäminen ja vastaanottaminen ei ole enää mahdollista.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Myönnä käyttöoikeudet</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Signal pyytää näitä käyttöoikeuksia, jotta voisit viestiä tuntemillesi ihmisille helpommin. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Molly pyytää näitä käyttöoikeuksia, jotta voisit viestiä tuntemillesi ihmisille helpommin. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Ilmoitukset</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Seuraava</string>
     <string name="PaymentsTransferFragment__invalid_address">Virheellinen osoite</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Tarkista vastaanottajan lompakko-osoite ja yritä uudelleen.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Siirtoa ei voi tehdä Signalin lompakko-osoitteeseen. Syötä yhteensopivan kauppapaikan tilin lompakko-osoite.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Jotta voit skannata QR-koodin, Signal tarvitsee luvan käyttää kameraa.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal tarvitsee luvan käyttää laitteesi kameraa QR-koodin lukemiseen. Siirry kohtaan Asetukset, valitse Sovelluksen käyttöoikeudet ja salli kameran käyttö.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Jotta voit skannata QR-koodin, Signal tarvitsee luvan käyttää kameraa.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Siirtoa ei voi tehdä Mollyin lompakko-osoitteeseen. Syötä yhteensopivan kauppapaikan tilin lompakko-osoite.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Jotta voit skannata QR-koodin, Molly tarvitsee luvan käyttää kameraa.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly tarvitsee luvan käyttää laitteesi kameraa QR-koodin lukemiseen. Siirry kohtaan Asetukset, valitse Sovelluksen käyttöoikeudet ja salli kameran käyttö.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Jotta voit skannata QR-koodin, Molly tarvitsee luvan käyttää kameraa.</string>
     <string name="PaymentsTransferFragment__settings">Asetukset</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Saapuva Signal-äänipuhelu</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Saapuva Molly-äänipuhelu</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Saapuva Signal-videopuhelu</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Saapuva Molly-videopuhelu</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Saapuva Signal-ryhmäpuhelu</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Saapuva Molly-ryhmäpuhelu</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Signal-äänipuhelu käynnissä</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Molly-äänipuhelu käynnissä</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Signal-videopuhelu käynnissä</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Molly-videopuhelu käynnissä</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Signal-ryhmäpuhelu käynnissä</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Molly-ryhmäpuhelu käynnissä</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Ladataan…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Varmenna</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Varmuuskopion salalauseen syöttö onnistui</string>
     <string name="BackupDialog_passphrase_was_not_correct">Salalause ei ollut oikea</string>
-    <string name="LocalBackupJob_creating_signal_backup">Luodaan Signal-varmuuskopiota…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Luodaan Molly-varmuuskopiota…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Vahvistetaan Signal-varmuuskopiota…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Vahvistetaan Molly-varmuuskopiota…</string>
     <string name="LocalBackupJobApi29_backup_failed">Varmuuskopio epäonnistui</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Varmuuskopiohakemisto on poistettu tai siirretty.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Varmuuskopiotiedosto on liian suuri tallennettavaksi tähän tallennustilaan.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Soita minulle (%1$02d.%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Lähetä koodi uudelleen (%1$02d.%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Ota yhteyttä Signalin tukeen</string>
-    <string name="RegistrationActivity_code_support_subject">Signalin rekisteröinti – vahvistuskoodi Androidille</string>
+    <string name="RegistrationActivity_contact_signal_support">Ota yhteyttä Mollyin tukeen</string>
+    <string name="RegistrationActivity_code_support_subject">Mollyin rekisteröinti – vahvistuskoodi Androidille</string>
     <string name="RegistrationActivity_incorrect_code">Väärä koodi</string>
     <string name="BackupUtil_never">ei koskaan</string>
     <string name="BackupUtil_unknown">Tuntematon</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Puhelinnumero</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Valitse, kuka voi nähdä puhelinnumerosi ja kuka voi ottaa sinuun yhteyttä Signalissa sen avulla.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Valitse, kuka voi nähdä puhelinnumerosi ja kuka voi ottaa sinuun yhteyttä Mollyissa sen avulla.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Kuka voi nähdä numeroni</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Olet yrittänyt liian monta kertaa. Yritä myöhemmin uudelleen.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Virhe yhdistettäessä palveluun</string>
     <string name="preferences_chats__backups">Varmuuskopiot</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal on lukittu</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly on lukittu</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">AVAA NAPAUTTAMALLA</string>
     <string name="Recipient_unknown">Tuntematon</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Sinulla täytyy olla pääsy vanhaan laitteeseesi.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Palauta varmuuskopiosta</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Palauta viestisi paikallisesta varmuuskopiostasi. Jos et palauta niitä nyt, et voi palauttaa niitä enää myöhemmin.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Palauta paikallinen varmuuskopio</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Palauta Signal-varmuuskopio</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Palauta kaikki tekstiviestit + media viimeisten 30 päivän ajalta</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Lisää valintoja</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Peruuta</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Kirjaudu sisään ilman siirtoa</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Jatka ilman viestien ja median siirtoa</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Avaa Signal vanhassa Android-laitteessasi</string>
     <string name="NewDeviceTransferInstructions__continue">Jatka</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Valmistellaan yhteyttä vanhaan Android-laitteeseesi…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Vielä hetki</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Odotetaan yhteyttä vanhasta Android-laitteesta…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal tarvitsee luvan käyttää sijaintitietojasi vanhan Android-laitteesi löytämiseen ja yhdistämiseen.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly tarvitsee luvan käyttää sijaintitietojasi vanhan Android-laitteesi löytämiseen ja yhdistämiseen.</string>
     <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Sijaintipalveluiden täytyy olla päällä, jotta vanha Android-laitteesi voidaan löytää ja yhdistää.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal tarvitsee Wi-Fi:ä vanhan Android-laitteesi löytämiseen ja yhdistämiseen. Wi-Fi:n pitää olla päällä, mutta sen ei tarvitse olla yhdistettynä langattomaan verkkoon.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Näyttää siltä että laitteesi ei tue Wi-Fi Direct -toimintoa. Signal käyttää Wi-Fi Direct -toimintoa vanhan Android-laitteesi löytämiseen ja yhdistämiseen. Voit silti siirtää tiedot vanhasta laitteesta varmuuskopion avulla.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly tarvitsee Wi-Fi:ä vanhan Android-laitteesi löytämiseen ja yhdistämiseen. Wi-Fi:n pitää olla päällä, mutta sen ei tarvitse olla yhdistettynä langattomaan verkkoon.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Näyttää siltä että laitteesi ei tue Wi-Fi Direct -toimintoa. Molly käyttää Wi-Fi Direct -toimintoa vanhan Android-laitteesi löytämiseen ja yhdistämiseen. Voit silti siirtää tiedot vanhasta laitteesta varmuuskopion avulla.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Palauta varmuuskopio</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Tapahtui odottamaton virhe yritettäessä luoda yhteyttä vanhaan Android-laitteeseesi.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Etsitään uutta Android-laitetta…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal tarvitsee luvan käyttää sijaintitietojasi uuden Android-laitteesi löytämiseen ja yhdistämiseen.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly tarvitsee luvan käyttää sijaintitietojasi uuden Android-laitteesi löytämiseen ja yhdistämiseen.</string>
     <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Sijaintipalveluiden täytyy olla päällä, jotta uusi Android-laitteesi voidaan löytää ja yhdistää.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal tarvitsee Wi-Fi:ä uuden Android-laitteesi löytämiseen ja yhdistämiseen. Wi-Fi:n pitää olla päällä, mutta sen ei tarvitse olla yhdistettynä langattomaan verkkoon.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Näyttää siltä että laitteesi ei tue Wi-Fi Direct -toimintoa. Signal käyttää Wi-Fi Direct -toimintoa uuden Android-laitteesi löytämiseen ja yhdistämiseen. Voit silti siirtää tiedot luomalla varmuuskopion ja palauttamalla sen uudessa Android-laitteessa.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly tarvitsee Wi-Fi:ä uuden Android-laitteesi löytämiseen ja yhdistämiseen. Wi-Fi:n pitää olla päällä, mutta sen ei tarvitse olla yhdistettynä langattomaan verkkoon.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Näyttää siltä että laitteesi ei tue Wi-Fi Direct -toimintoa. Molly käyttää Wi-Fi Direct -toimintoa uuden Android-laitteesi löytämiseen ja yhdistämiseen. Voit silti siirtää tiedot luomalla varmuuskopion ja palauttamalla sen uudessa Android-laitteessa.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Luo varmuuskopio</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Tapahtui odottamaton virhe yritettäessä luoda yhteyttä uuteen Android-laitteeseesi.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Siirretään tietoja</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Pidä laitteet lähekkäin. Älä sammuta niitä ja pidä Signal käynnissä. Siirto on päästä päähän salattu.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Pidä laitteet lähekkäin. Älä sammuta niitä ja pidä Molly käynnissä. Siirto on päästä päähän salattu.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d viestiä tähän mennessä…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% viestiä tähän mennessä…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Siirrä tili</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Lataa Signal uuteen Android-laitteeseesi</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Lataa Molly uuteen Android-laitteeseesi</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Napauta Siirrä tai palauta tili"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Kuka tahansa, jolla on tämä linkki, näkee ryhmän nimen ja kuvan ja voi pyytää liittymistä jäseneksi. Jaa linkki vain henkilöille, joihin luotat.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Kuka tahansa, jolla on tämä linkki, näkee ryhmän nimen ja kuvan ja voi liittyä jäseneksi. Jaa linkki vain henkilöille, joihin luotat.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Jaa Signalin kautta</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Jaa Mollyin kautta</string>
     <string name="GroupLinkBottomSheet_copy">Kopioi</string>
     <string name="GroupLinkBottomSheet_qr_code">QR-koodi</string>
     <string name="GroupLinkBottomSheet_share">Jaa</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">Tietoa MobileCoinista</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin on uusi yksityisyyden suojaan keskittyvä digitaalinen valuutta.</string>
     <string name="payment_info_card_adding_funds">Varojen lisääminen</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Voit lisätä rahaa käytettäväksi Signalissa lähettämällä MobileCoineja lompakko-osoitteeseen.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Voit lisätä rahaa käytettäväksi Mollyissa lähettämällä MobileCoineja lompakko-osoitteeseen.</string>
     <string name="payment_info_card_cashing_out">Nostaminen</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">MobileCoinit voi nostaa rahana milloin tahansa MobileCoin-yhteensopivalla kauppapaikalla siirtämällä rahat sillä sijaitsevalle tilille.</string>
     <string name="payment_info_card_hide_this_card">Piilota tämä kortti?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Poista Wallet käytöstä</string>
     <string name="DeactivateWalletFragment__your_balance">Saldosi</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Varat kannattaa siirtää toiseen lompakko-osoitteeseen ennen maksujen poistamista käytöstä. Jos varoja ei siirretä nyt, ne säilyvät Signal-tiliin liitetyssä lompakossa siltä varalta, että maksut otetaan taas käyttöön.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Varat kannattaa siirtää toiseen lompakko-osoitteeseen ennen maksujen poistamista käytöstä. Jos varoja ei siirretä nyt, ne säilyvät Molly-tiliin liitetyssä lompakossa siltä varalta, että maksut otetaan taas käyttöön.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Siirrä koko saldo</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Poista käytöstä siirtämättä varoja</string>
     <string name="DeactivateWalletFragment__deactivate">Poista käytöstä</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Poistetaanko käytöstä siirtämättä varoja?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Varat säilytetään Signal-tiliin liitetyssä lompakossa siltä varalta, että maksut otetaan uudestaan käyttöön.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Varat säilytetään Molly-tiliin liitetyssä lompakossa siltä varalta, että maksut otetaan uudestaan käyttöön.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Lompakon poisto käytöstä epäonnistui.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Lisenssit</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Käyttöehdot ja yksityisyydensuoja</string>
-    <string name="HelpFragment__copyright_signal_messenger">Copyright Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Copyright Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Käyttöoikeus: GNU AGPLv3 -lisenssi</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4773,7 +4911,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">Automaattinen</string>
+    <string name="ChatColorSelectionFragment__auto">Autom.</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Käytä omia värejä</string>
     <string name="ChatColorSelectionFragment__chat_color">Keskustelun väri</string>
     <string name="ChatColorSelectionFragment__edit">Muokkaa</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Valitse väri</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">Tekstiviesti</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Jaa</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Vain järjestelmänvalvojat voivat lähettää viestejä tähän ryhmään.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Yläraja saavutettu</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Et voi valita enempää kuin 5 keskustelua</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Lue lisää</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Päivitä Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Päivitä Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Tämä Signal-versio on vanhentunut. Päivitä nyt jatkaaksesi Signalin käyttöä.</string>
+    <string name="UpdateSignalExpiredDialog__message">Tämä Molly-versio on vanhentunut. Päivitä nyt jatkaaksesi Mollyin käyttöä.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Päivitä</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Laitetta ei ole rekisteröity</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Tämä laite ei ole enää rekisteröity. Rekisteröi uudelleen jatkaaksesi Signalin käyttöä tällä laitteella.</string>
+    <string name="ReregisterSignalDialog__message">Tämä laite ei ole enää rekisteröity. Rekisteröi uudelleen jatkaaksesi Mollyin käyttöä tällä laitteella.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Rekisteröidy uudelleen</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Valitsimen avaus epäonnistui.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Signal tarvitsee luvan ilmoitusten näyttämiseen, jotta ne voidaan ottaa käyttöön.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Molly tarvitsee luvan ilmoitusten näyttämiseen, jotta ne voidaan ottaa käyttöön.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Ota käyttöön</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Ei vastauksia vielä</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Et voi vastata tähän tarinaan, koska et ole enää tämän ryhmän jäsen.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Lähetti reaktion tarinaan</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Lähetit reaktion tarinaan</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Lähetti reaktion tarinaan</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Näytöt</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Valitse pankki</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Vahvista lahjoitus %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Määritä toistuva lahjoitus napauttamalla Jatka. Tämä vahvistaa 0,01 euron veloituksen pankkitiiltäsi. Veloitus mahdollistaa jatkuvan lahjoituksen veloituksen tilitäsi summalla 5 € / kk ja se hyvitetään automaattisesti.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Määritä toistuva lahjoitus napauttamalla Jatka. Tämä vahvistaa 0,01 euron veloituksen pankkitiiltäsi. Veloitus mahdollistaa jatkuvan lahjoituksen veloituksen tilitäsi summalla %1$s / kk ja se hyvitetään automaattisesti.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Jatka</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Ladataan varmuuskopion tietoja…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Median varmuuskopiointi on pois päältä</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Signal-median varmuuskopiointi on peruutettu, koska emme voineet käsitellä maksuasi. Sinulla on %1$d päivä aikaa ladata kaikki varmuuskopioon tallennettu media. Varmuuskopiossa oleva media poistetaan %1$d päivän kuluttua.</item>
+        <item quantity="other">Signal-median varmuuskopiointi on peruutettu, koska emme voineet käsitellä maksuasi. Sinulla on %1$d päivää aikaa ladata kaikki varmuuskopioon tallennettu media. Varmuuskopiossa oleva media poistetaan %1$d päivän kuluttua.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Voit jatkaa varmuuskopiopalvelun maksamista uudelleen milloin tahansa jatkaaksesi kaiken mediasi varmuuskopiointia. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Mediasisältösi poistetaan tänään</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Signal-median varmuuskopiointi on peruutettu, koska emme voineet käsitellä maksua. Tämä on viimeinen mahdollisuutesi ladata varmuuskopiossasi oleva media ennen sen poistamista.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Lataus ei onnistu</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Laitteessasi ei ole tarpeeksi vapaata tilaa. Vapauta vähintään %1$s tilaa, jotta voit ladata varmuuskopioon tallennetun median.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Jos valitset Ohita, varmuuskopiossasi oleva media poistetaan %1$d päivän kuluttua.</item>
+        <item quantity="other">Jos valitset Ohita, varmuuskopiossasi oleva media poistetaan %1$d päivän kuluttua.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Varmuuskopion maksua ei voida käsitellä</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Varmuuskopion maksun veloituksessa on ongelmia. Varmista, että maksutapasi on ajan tasalla. Jos näin ei ole, päivitä se Google Payssa. Signal yrittää veloitusta uudelleen muutaman päivän kuluessa.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Varmuuskopiointia ei voitu suorittaa loppuun</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Laittettasi ei ole varmuuskopioitu %1$d päivään. Varmista, että laitteesi on yhdistetty Wi-Fi-verkkoon, ja napauta Varmuuskopioi nyt. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Lue lisää</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Ohita</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Lataa media nyt</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Lataa myöhemmin</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Älä lataa mediaa</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Vapauta %1$s tilaa, jotta voit ladata mediaa.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Luotto- tai pankkikortti</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Tuntematon</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Maksuhistoria</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Viimeisin varmuuskopio tehtiin %1$s klo %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Määriteltyä aikaa vanhemmat viestit poistetaan pysyvästi.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Määritellyn pituuden ylittävät viestit poistetaan pysyvästi.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Käytä rajoituksia yhdistetyille laitteille</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Kun keskustelurajoitukset ovat käytössä, ne poistavat viestit myös yhdistetyistä laitteistasi.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Poistaminen synkronoidaan nyt kaikkien laitteidesi välillä</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Kun poistat viestejä tai keskusteluja, ne poistetaan puhelimestasi ja yhdistetyistä laitteista.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Maksuhistoria</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Tekstin ja kaiken median varmuuskopio</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Maksun tiedot</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Varmuuskopion tyyppi</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Maksun päivämäärä</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Jaa</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal-varmuuskopiot</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Maksuhistoria</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Varmuuskopion tiedot</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Varmuuskopion koko</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Varmuuskopiointitiheys</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Varmuuskopioi matkapuhelinverkon kautta</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Kytke varmuuskopio pois käytöstä ja poista se</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Varmuuskopio poistettu ja kytketty pois käytöstä.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Varmuuskopion tyyppi muutettu ja tilaus peruutettu</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Tilaus on peruttu</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Lataus valmis</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Varmuuskopion tyyppi</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Varmuuskopiot poistettu käytöstä</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s / kk</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Ota varmuuskopiot käyttöön</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Viimeisin varmuuskopio</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s klo %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">ei koskaan</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Varmuuskopioi nyt</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Kytketäänkö varmuuskopio pois käytöstä ja poistetaanko se?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Sinua ei veloiteta uudelleen. Varmuuskopiosi poistetaan, eikä uusia varmuuskopioita luoda.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Poista käytöstä ja poista</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Poistetaan varmuuskopiota…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Varmuuskopio poistettu</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Napauttamalla Varmuuskopioi nyt"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Päivittäin</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Viikoittain</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Kuukausittain</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Varmuuskopioi manuaalisesti</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Anna laitteesi PIN-koodi, salasana tai kuvio.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Seuraava</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Muuta varmuuskopion tyyppiä</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Peruuta tilaus</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Vahvista peruutus</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Sinua ei veloiteta uudelleen. Varmuuskopiointi poistetaan käytöstä laskutusjakson lopussa. Sen jälkeen sinulla on 30 päivää aikaa ladata media, jota parhaillaan varmuuskopioit.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Vahvista ja lataa nyt</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Vahvista ja lataa myöhemmin</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Säilytä tilaus</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index cc9a0ba2c1..aac0844c29 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Mise à jour de Signal…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Mise à jour de Molly…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Vous n’avez pas encore défini de phrase de passe.</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Désactiver la phrase de passe ?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Signal et les notifications de message seront accessibles en permanence.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Molly et les notifications de message seront accessibles en permanence.</string>
     <string name="ApplicationPreferencesActivity_disable">Désactiver</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Erreur de connexion au serveur.</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">Le blocage d’inscription nécessite l’utilisation d’un code PIN. Pour désactiver le code PIN, commencez par désactiver le blocage d’inscription.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Fichier</string>
     <string name="AttachmentKeyboard_contact">Contact</string>
     <string name="AttachmentKeyboard_location">Position</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Autorisez Signal à afficher vos photos et vidéos.</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Autorisez Molly à afficher vos photos et vidéos.</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Accorder l’accès</string>
     <string name="AttachmentKeyboard_payment">Paiement</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Impossible de trouver une appli pour sélectionner le média.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Pour joindre des photos, des vidéos ou de l’audio, Signal doit accéder au stockage de l’appareil, mais vous lui en avez interdit l’accès. Ouvrez l’application « Paramètres » de votre appareil, puis touchez Applications &gt; Signal &gt; Autorisations &gt; Stockage.</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Pour joindre les coordonnées d’un contact, Signal doit accéder à l’application Contacts mais vous lui en avez interdit l’accès. Ouvrez l’application « Paramètres » de votre appareil, puis touchez Applications &gt; Signal &gt; Autorisations &gt; Contacts &gt; Autoriser.</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Pour joindre une position géographique, Signal doit accéder à l’application Position mais vous lui en avez interdit l’accès. Ouvrez l’application « Paramètres » de votre appareil, puis touchez Applications &gt; Signal &gt; Autorisations &gt; Position et activer l’autorisation appropriée.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Pour joindre des photos, des vidéos ou de l’audio, Molly doit accéder au stockage de l’appareil, mais vous lui en avez interdit l’accès. Ouvrez l’application « Paramètres » de votre appareil, puis touchez Applications &gt; Molly &gt; Autorisations &gt; Stockage.</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Pour joindre les coordonnées d’un contact, Molly doit accéder à l’application Contacts mais vous lui en avez interdit l’accès. Ouvrez l’application « Paramètres » de votre appareil, puis touchez Applications &gt; Molly &gt; Autorisations &gt; Contacts &gt; Autoriser.</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Pour joindre une position géographique, Molly doit accéder à l’application Position mais vous lui en avez interdit l’accès. Ouvrez l’application « Paramètres » de votre appareil, puis touchez Applications &gt; Molly &gt; Autorisations &gt; Position et activer l’autorisation appropriée.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Autoriser l’accès à votre position</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Pour partager votre position :</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Autorisez Signal à accéder à votre position.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Autorisez Molly à accéder à votre position.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Pour partager votre position, autorisez Signal à accéder aux services de localisation de votre téléphone.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Pour partager votre position, autorisez Molly à accéder aux services de localisation de votre téléphone.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Autoriser l’accès au stockage</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Pour afficher les photos et vidéos :</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Pour afficher vos photos et vidéos, Signal a besoin d’accéder au stockage.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Pour afficher vos photos et vidéos, Molly a besoin d’accéder au stockage.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s n’a pas activé les paiements </string>
@@ -120,7 +121,7 @@
     <string name="AttachmentUploadJob_compressing_video_start">Compression de la vidéo…</string>
 
     <!-- BackgroundMessageRetriever -->
-    <string name="BackgroundMessageRetriever_checking_for_messages">Vérification de la présence de messages…</string>
+    <string name="BackgroundMessageRetriever_checking_for_messages">Vérification des nouveaux messages…</string>
 
     <!-- Fcm notifications -->
     <!-- Notification we show when there may be messages for you, but we cannot connect to the server to check -->
@@ -129,10 +130,10 @@
     <!-- BlockedUsersActivity -->
     <string name="BlockedUsersActivity__blocked_users">Utilisateurs bloqués</string>
     <string name="BlockedUsersActivity__add_blocked_user">Ajouter un utilisateur bloqué</string>
-    <string name="BlockedUsersActivity__blocked_users_will">Les utilisateurs bloqués ne pourront ni vous appeler ni vous envoyer des messages.</string>
+    <string name="BlockedUsersActivity__blocked_users_will">Les utilisateurs bloqués ne pourront ni vous appeler, ni vous envoyer des messages.</string>
     <string name="BlockedUsersActivity__no_blocked_users">Aucun utilisateur bloqué</string>
     <string name="BlockedUsersActivity__block_user">Bloquer cet utilisateur ?</string>
-    <string name="BlockedUserActivity__s_will_not_be_able_to">« %1$s » ne pourra ni vous appeler ni vous envoyer des messages.</string>
+    <string name="BlockedUserActivity__s_will_not_be_able_to">« %1$s » ne pourra ni vous appeler, ni vous envoyer des messages.</string>
     <string name="BlockedUsersActivity__block">Bloquer</string>
 
     <!-- CreditCardFragment -->
@@ -178,19 +179,19 @@
     <!-- BlockUnblockDialog -->
     <string name="BlockUnblockDialog_block_and_leave_s">Bloquer et quitter %1$s ?</string>
     <string name="BlockUnblockDialog_block_s">Bloquer %1$s ?</string>
-    <string name="BlockUnblockDialog_you_will_no_longer_receive_messages_or_updates">Vous ne recevrez plus ni message ni mise à jour de ce groupe et les membres ne pourront plus vous rajouter à ce groupe.</string>
-    <string name="BlockUnblockDialog_group_members_wont_be_able_to_add_you">Les membres du groupe ne pourront plus vous rajouter à ce groupe.</string>
-    <string name="BlockUnblockDialog_group_members_will_be_able_to_add_you">Les membres du groupe pourront vous rajouter à ce groupe.</string>
+    <string name="BlockUnblockDialog_you_will_no_longer_receive_messages_or_updates">Ce groupe ne pourra plus vous envoyer de messages, ni vous tenir informé des dernières actualités, et ses membres ne pourront plus vous y ajouter.</string>
+    <string name="BlockUnblockDialog_group_members_wont_be_able_to_add_you">Les membres ne pourront plus vous ajouter à ce groupe.</string>
+    <string name="BlockUnblockDialog_group_members_will_be_able_to_add_you">Les membres pourront de nouveau vous ajouter à ce groupe.</string>
     <!-- Text that is shown when unblocking a Signal contact -->
-    <string name="BlockUnblockDialog_you_will_be_able_to_call_and_message_each_other">Vous pourrez échanger des messages et des appels, et vos nom et photo seront partagés avec eux.</string>
+    <string name="BlockUnblockDialog_you_will_be_able_to_call_and_message_each_other">Vous pourrez échanger des messages et des appels avec ce contact, et il aura accès à votre nom et à votre photo.</string>
     <!-- Text that is shown when unblocking an SMS contact -->
-    <string name="BlockUnblockDialog_you_will_be_able_to_message_each_other">Vous pourrez vous envoyer des messages.</string>
+    <string name="BlockUnblockDialog_you_will_be_able_to_message_each_other">Vous pourrez échanger des messages.</string>
     <string name="BlockUnblockDialog_blocked_people_wont_be_able_to_call_you_or_send_you_messages">Les personnes bloquées ne pourront ni vous appeler ni vous envoyer de messages.</string>
     <string name="BlockUnblockDialog_blocked_people_wont_be_able_to_send_you_messages">Les personnes bloquées ne pourront pas vous envoyer de messages.</string>
     <!-- Message shown on block dialog when blocking the Signal release notes recipient -->
     <string name="BlockUnblockDialog_block_getting_signal_updates_and_news">Bloquer la réception des mises à jour et des actualités de Signal.</string>
     <!-- Message shown on unblock dialog when unblocking the Signal release notes recipient -->
-    <string name="BlockUnblockDialog_resume_getting_signal_updates_and_news">Reprendre la réception des mises à jour et des actualités de Signal.</string>
+    <string name="BlockUnblockDialog_resume_getting_signal_updates_and_news">Je veux de nouveau recevoir les mises à jour et les actualités de Signal.</string>
     <string name="BlockUnblockDialog_unblock_s">Débloquer %1$s ?</string>
     <string name="BlockUnblockDialog_block">Bloquer</string>
     <string name="BlockUnblockDialog_block_and_leave">Bloquer et quitter</string>
@@ -211,10 +212,10 @@
     <string name="BucketedThreadMedia_Today">Aujourd’hui</string>
     <string name="BucketedThreadMedia_Yesterday">Hier</string>
     <string name="BucketedThreadMedia_This_week">Cette semaine</string>
-    <string name="BucketedThreadMedia_This_month">Ce mois</string>
-    <string name="BucketedThreadMedia_Large">Volumineux</string>
-    <string name="BucketedThreadMedia_Medium">Taille moyenne</string>
-    <string name="BucketedThreadMedia_Small">Petite taille</string>
+    <string name="BucketedThreadMedia_This_month">Ce mois-ci</string>
+    <string name="BucketedThreadMedia_Large">Fichier volumineux</string>
+    <string name="BucketedThreadMedia_Medium">Fichier de taille moyenne</string>
+    <string name="BucketedThreadMedia_Small">Petit fichier</string>
 
     <!-- CameraFragment -->
     <!-- Toasted when user device does not support video recording -->
@@ -222,41 +223,41 @@
 
     <!-- CameraXFragment -->
     <string name="CameraXFragment_tap_for_photo_hold_for_video">Touchez pour une photo, maintenez pour une vidéo</string>
-    <string name="CameraXFragment_capture_description">Prendre</string>
-    <string name="CameraXFragment_change_camera_description">Changer d’appareil photo</string>
+    <string name="CameraXFragment_capture_description">Prendre une photo ou une vidéo</string>
+    <string name="CameraXFragment_change_camera_description">Changer de caméra</string>
     <string name="CameraXFragment_open_gallery_description">Ouvrir la galerie</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Accorder l’accès</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Autoriser l’accès à l’appareil photo et au microphone</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Autoriser l’accès à l’appareil photo</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Autoriser l’accès au microphone</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Pour prendre des photos, autorisez Signal à accéder à l’appareil photo.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Pour prendre des photos et des vidéos, autorisez Signal à accéder à l’appareil photo.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Pour prendre des photos et des vidéos, autorisez Signal à accéder au microphone et à l’appareil photo.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Pour enregistrer des vidéos avec du son, autorisez Signal à accéder au microphone.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Pour scanner un code QR, autorisez Signal à accéder à l’appareil photo.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Pour prendre des photos, Signal doit accéder à l’appareil photo.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Pour scanner des codes QR, Signal doit accéder à l’appareil photo.</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Pour prendre des vidéos, Signal doit accéder au microphone.</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Pour prendre des photos dans Signal :</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Pour prendre des photos et des vidéos dans Signal :</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Pour enregistrer des vidéos avec du son dans Signal :</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Pour scanner des codes QR :</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Contacts récents</string>
@@ -269,38 +270,38 @@
     </plurals>
     <string name="CameraContacts_select_signal_recipients">Sélectionner les destinataires Signal</string>
     <string name="CameraContacts_no_signal_contacts">Aucun contact Signal</string>
-    <string name="CameraContacts_you_can_only_use_the_camera_button">Vous ne pouvez utiliser le bouton Appareil photo que pour envoyer des photos à des contacts Signal. </string>
+    <string name="CameraContacts_you_can_only_use_the_camera_button">Le bouton Appareil photo ne vous permet d’envoyer des photos qu’à vos contacts Signal. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Vous ne trouvez pas ce que vous recherchez ?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Inviter un contact à rejoindre Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Inviter un contact à rejoindre Molly</string>
     <string name="CameraContacts__menu_search">Rechercher</string>
 
     <!-- Censorship Circumvention Megaphone -->
     <!-- Title for an alert that shows at the bottom of the chat list letting people know that circumvention is no longer needed -->
     <string name="CensorshipCircumventionMegaphone_turn_off_censorship_circumvention">Désactiver le contournement de la censure ?</string>
     <!-- Body for an alert that shows at the bottom of the chat list letting people know that circumvention is no longer needed -->
-    <string name="CensorshipCircumventionMegaphone_you_can_now_connect_to_the_signal_service">Vous pouvez désormais vous connecter directement au service Signal pour une meilleure expérience.</string>
+    <string name="CensorshipCircumventionMegaphone_you_can_now_connect_to_the_signal_service">Pour une meilleure expérience, vous pouvez maintenant vous connecter directement au service Signal.</string>
     <!-- Action to prompt the user to disable circumvention since it is no longer needed -->
     <string name="CensorshipCircumventionMegaphone_turn_off">Désactiver</string>
     <!-- Action to prompt the user to dismiss the alert at the bottom of the chat list -->
     <string name="CensorshipCircumventionMegaphone_no_thanks">Non merci</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Mettre Signal à jour</string>
-    <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Cette version de l’appli n’est plus prise en charge. Pour continuer à échanger des messages, veuillez mettre Signal à jour vers la version la plus récente.</string>
-    <string name="ClientDeprecatedActivity_update">Mise à jour</string>
-    <string name="ClientDeprecatedActivity_dont_update">Ne pas mettre à jour</string>
+    <string name="ClientDeprecatedActivity_update_signal">Installer la dernière version de Molly</string>
+    <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Cette version de l’appli n’est plus prise en charge. Pour continuer à échanger des messages, passez à la dernière version de Signal.</string>
+    <string name="ClientDeprecatedActivity_update">Installer la mise à jour</string>
+    <string name="ClientDeprecatedActivity_dont_update">Ne pas installer la mise à jour</string>
     <string name="ClientDeprecatedActivity_warning">Avertissement</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Votre version de Signal est expirée. Vous pouvez afficher l’historique de vos messages, mais vous ne pourrez pas échanger de messages tant que vous n’aurez pas mis Signal à jour.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Votre version de Molly est expirée. Vous pouvez afficher l’historique de vos messages, mais vous ne pourrez pas échanger de messages tant que vous n’aurez pas mis Molly à jour.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Navigateur web introuvable.</string>
-    <string name="CommunicationActions_send_email">Envoyer un courriel</string>
-    <string name="CommunicationActions_a_cellular_call_is_already_in_progress">Un appel cellulaire est déjà en cours.</string>
+    <string name="CommunicationActions_send_email">Envoyer un e-mail</string>
+    <string name="CommunicationActions_a_cellular_call_is_already_in_progress">Un appel est déjà en cours sur votre mobile.</string>
     <string name="CommunicationActions_start_voice_call">Passer un appel vocal ?</string>
     <string name="CommunicationActions_cancel">Annuler</string>
     <string name="CommunicationActions_call">Appeler</string>
     <string name="CommunicationActions_insecure_call">Appel non sécurisé</string>
-    <string name="CommunicationActions_carrier_charges_may_apply">Les frais de l’opérateur pourraient s’appliquer. Le numéro que vous appelez n’est pas inscrit auprès de Signal. Cet appel sera effectué par votre opérateur de réseau mobile et non par Internet.</string>
+    <string name="CommunicationActions_carrier_charges_may_apply">Des frais d’opérateur peuvent s’appliquer. Le numéro que vous appelez n’est pas inscrit auprès de Signal. Cet appel sera effectué par votre opérateur de réseau mobile et non via Internet.</string>
     <string name="CommunicationActions_cant_join_call">Impossible de rejoindre l’appel</string>
     <string name="CommunicationActions_this_call_link_is_no_longer_valid">Le lien de cet appel n’est plus valide.</string>
     <!-- Title on dialog when call link url cannot be parsed -->
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Message %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Appel vocal Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Appel vidéo Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -345,7 +346,7 @@
     <string name="ContactShareEditActivity_type_mobile">Mobile</string>
     <string name="ContactShareEditActivity_type_work">Travail</string>
     <string name="ContactShareEditActivity_type_missing">Autre</string>
-    <string name="ContactShareEditActivity_invalid_contact">Le contact sélectionné était invalide</string>
+    <string name="ContactShareEditActivity_invalid_contact">Le contact sélectionné est incorrect</string>
     <!-- Content descrption for name edit button on contact share edit activity -->
     <string name="ContactShareEditActivity__edit_name">Modifier le nom</string>
     <!-- Content description for user avatar in edit activity -->
@@ -395,7 +396,7 @@
     <!-- Accessibility text associated with image button to send an edited message. -->
     <string name="ConversationActivity_send_edit">Envoyer les modifications</string>
     <string name="ConversationActivity_compose_message">Rédiger un message</string>
-    <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Désolé, une erreur de mise en place de votre fichier joint est survenue.</string>
+    <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Oups ! Une erreur s’est produite lors de l’ajout de la pièce jointe.</string>
     <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Le destinataire n’est pas une adresse texto ou courriel valide.</string>
     <string name="ConversationActivity_message_is_empty_exclamation">Le message est vide.</string>
     <string name="ConversationActivity_group_members">Membres du groupe</string>
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Message Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Envoyer un message</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Passons à Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Passons à Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Veuillez choisir un contact</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Le fichier joint dépasse la limite de taille pour le type de message que vous envoyez.</string>
     <string name="ConversationActivity_unable_to_record_audio">Enregistrement audio impossible.</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Pour envoyer des messages vocaux :</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Pour envoyer des messages vocaux, autorisez Signal à accéder au microphone.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Pour envoyer des messages vocaux, autorisez Molly à accéder au microphone.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Pour enregistrer un message vocal, autorisez Signal à accéder au microphone de votre téléphone.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Pour envoyer des messages audio, Signal doit être autorisé à accéder à l’application Microphone, mais vous lui en avez interdit l’accès. Pour l’autoriser à y accéder, ouvrez l’application « Paramètres » de votre appareil, appuyez sur « Applications », puis sélectionnez « Autorisations » et activez « Microphone ».</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Pour enregistrer un message vocal, autorisez Molly à accéder au microphone de votre téléphone.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Pour envoyer des messages audio, Molly doit être autorisé à accéder à l’application Microphone, mais vous lui en avez interdit l’accès. Pour l’autoriser à y accéder, ouvrez l’application « Paramètres » de votre appareil, appuyez sur « Applications », puis sélectionnez « Autorisations » et activez « Microphone ».</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal a besoin des autorisations Microphone et Appareil photo pour appeler %1$s, mais elles ont été refusées définitivement. Veuillez accéder aux paramètres de l’appli, sélectionner Autorisations et activer Microphone et Appareil photo.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Pour prendre des photos et des vidéos, autorisez l’accès de Signal à l’appareil photo.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal a besoin de l’autorisation Appareil photo afin de prendre des photos ou des vidéos, mais elle a été refusée définitivement. Veuillez accéder aux paramètres de l’appli, sélectionner Autorisations et activer Appareil photo.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal a besoin de l’autorisation Appareil photo pour prendre des photos ou des vidéos</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly a besoin des autorisations Microphone et Appareil photo pour appeler %1$s, mais elles ont été refusées définitivement. Veuillez accéder aux paramètres de l’appli, sélectionner Autorisations et activer Microphone et Appareil photo.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Pour prendre des photos et des vidéos, autorisez l’accès de Molly à l’appareil photo.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly a besoin de l’autorisation Appareil photo afin de prendre des photos ou des vidéos, mais elle a été refusée définitivement. Veuillez accéder aux paramètres de l’appli, sélectionner Autorisations et activer Appareil photo.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly a besoin de l’autorisation Appareil photo pour prendre des photos ou des vidéos</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Autoriser l’accès au microphone afin de prendre des vidéos avec du son.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal a besoin de l’autorisation Microphone afin d’enregistrer des vidéos, mais elle a été refusée. Veuillez accéder aux paramètres de l’appli, sélectionner Autorisations et activer Microphone et Appareil photo.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal a besoin de l’autorisation Microphone afin d’enregistrer des vidéos.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Pour enregistrer des vidéos, Molly a besoin de l’autorisation Microphone, mais elle a été refusée. Dans les paramètres Android, touchez Applications &gt; Molly &gt; Autorisations, puis activez « Microphone » et « Appareil photo ».</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly doit accéder au Microphone pour enregistrer des vidéos.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Non</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Pour passer un appel :</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Pour passer un appel, autorisez Signal à accéder à votre microphone.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Pour passer un appel, autorisez Molly à accéder à votre microphone.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Pour passer un appel, autorisez Signal à accéder au microphone de votre téléphone.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Pour passer un appel, autorisez Molly à accéder au microphone de votre téléphone.</string>
 
 
     <string name="ConversationActivity_join">Me joindre</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">La messagerie SMS n’est plus prise en charge par Signal. Invitez %1$s à rejoindre Signal pour continuer cette conversation.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Ce contact n’utilise plus Signal. Invitez-le à rejoindre la plateforme pour reprendre votre conversation.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Ce contact n’utilise plus Molly. Invitez-le à rejoindre la plateforme pour reprendre votre conversation.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Inviter à Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Inviter à Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Vous recevrez un rappel bientôt.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Supprimer pour tout le monde</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Supprimer de cet appareil</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Supprimer</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Supprimer de tous les appareils</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Ce message sera supprimé pour tous les membres participant à la conversation s’ils utilisent une version récente de Signal. Ils pourront voir que vous avez supprimé un message.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Bloqué</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Mettre Signal à jour</string>
+    <string name="ConversationFragment__update_build">Installez la dernière version de Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Se réinscrire à Signal</string>
+    <string name="ConversationFragment__reregister_signal">Se réinscrire à Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Retour</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Ouvrez Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Ouvrez Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">N’est plus marqué comme vérifié</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -644,8 +647,13 @@
         <item quantity="other">Supprimer les conversations sélectionnées ?</item>
     </plurals>
     <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
-        <item quantity="one">La conversation sélectionnée sera supprimée de manière permanente.</item>
-        <item quantity="other">Les %1$d conversations sélectionnées seront supprimées de manière permanente.</item>
+        <item quantity="one">La conversation sélectionnée sera définitivement supprimée.</item>
+        <item quantity="other">Les %1$d conversations sélectionnées seront définitivement supprimées.</item>
+    </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Vous allez définitivement supprimer cette conversation de tous vos appareils.</item>
+        <item quantity="other">Vous allez définitivement supprimer ces %1$d conversations de tous vos appareils.</item>
     </plurals>
     <string name="ConversationListFragment_deleting">Suppression</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
@@ -680,8 +688,8 @@
     <string name="ConversationListFragment_select_all">Tout sélect.</string>
     <!-- Screen title shown when selecting multiple items from a list like conversation threads or call logs. -->
     <plurals name="ConversationListFragment_s_selected">
-        <item quantity="one">%1$d sélectionné</item>
-        <item quantity="other">%1$d sélectionnés</item>
+        <item quantity="one">%1$d élément sélectionné</item>
+        <item quantity="other">%1$d éléments sélectionnés</item>
     </plurals>
 
     <!-- Show in conversation list overflow menu to open selection bottom sheet -->
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Qui peut me trouver grâce à mon numéro de téléphone ?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Toutes les personnes disposant de votre numéro de téléphone pourront voir que vous utilisez Signal et lancer une conversation avec vous.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Toutes les personnes disposant de votre numéro de téléphone pourront voir que vous utilisez Molly et lancer une conversation avec vous.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Personne ne saura que vous utilisez Signal, hormis les utilisateurs à qui vous envoyez un message ou avec qui vous avez déjà démarré une conversation.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Personne ne saura que vous utilisez Molly, hormis les utilisateurs à qui vous envoyez un message ou avec qui vous avez déjà démarré une conversation.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Restaurer d’une sauvegarde ?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Essayez la phrase de passe de la sauvegarde et confirmez qu’elle correspond</string>
     <string name="BackupsPreferenceFragment__turn_on">Activer</string>
     <string name="BackupsPreferenceFragment__turn_off">Désactiver</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Pour restaurer une sauvegarde, installez un nouvel exemplaire de Signal. Ouvrez l’appli, touchez « Restaurer la sauvegarde », puis trouvez un fichier de sauvegarde. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Pour restaurer une sauvegarde, installez un nouvel exemplaire de Molly. Ouvrez l’appli, touchez « Restaurer la sauvegarde », puis trouvez un fichier de sauvegarde. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">En savoir plus</string>
     <string name="BackupsPreferenceFragment__in_progress">En cours…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d jusqu’à présent…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% jusqu’à présent…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal exige l’autorisation d’accès à l\'espace de stockage externe afin de créer des sauvegardes, mais elle a été refusée définitivement. Veuillez accéder au menu des paramètres des applis, sélectionner « Autorisations » et activer « Stockage ».</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly exige l’autorisation d’accès à l\'espace de stockage externe afin de créer des sauvegardes, mais elle a été refusée définitivement. Veuillez accéder au menu des paramètres des applis, sélectionner « Autorisations » et activer « Stockage ».</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Définir l’heure de sauvegarde</string>
 
@@ -830,7 +838,7 @@
     <!-- Disclaimer in message scheduling dialog. %1$s replaced with a GMT offset (e.g. GMT-05:00), and %2$s is replaced with the time zone name (e.g. Eastern Standard Time) -->
     <string name="ScheduleMessageTimePickerBottomSheet__timezone_disclaimer">Toutes les heures sont indiquées en (%1$s) %2$s</string>
     <!-- Warning dialog message text shown when select time for scheduled send is in the past resulting in an immediate send if scheduled. -->
-    <string name="ScheduleMessageTimePickerBottomSheet__select_time_in_past_dialog_warning">L\'horaire sélectionné est passé. En le sélectionnant, le message sera envoyé immédiatement.</string>
+    <string name="ScheduleMessageTimePickerBottomSheet__select_time_in_past_dialog_warning">Vous avez sélectionné une heure passée. Si vous conservez cette sélection, le message est envoyé immédiatement.</string>
     <!-- Positive button text for warning dialog shown when scheduled send is in the past -->
     <string name="ScheduleMessageTimePickerBottomSheet__select_time_in_past_dialog_positive_button">Envoyer immédiatement</string>
 
@@ -841,13 +849,68 @@
     <!-- Button in dialog asking user if they are sure they want to delete the selected scheduled message -->
     <string name="ScheduledMessagesBottomSheet_delete_dialog_action">Supprimer</string>
     <!-- Button in dialog asking user if they are sure they want to delete the selected scheduled message -->
-    <string name="ScheduledMessagesBottomSheet_delete_dialog_message">Supprimer le message programmé sélectionné ?</string>
+    <string name="ScheduledMessagesBottomSheet_delete_dialog_message">Supprimer ce message programmé ?</string>
     <!-- Progress message shown while deleting selected scheduled message -->
     <string name="ScheduledMessagesBottomSheet_deleting_progress_message">Suppression du message programmé…</string>
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">La session de dialogue en ligne a été actualisée</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal utilise un chiffrement de bout en bout, et l’actualisation de votre session de dialogue en ligne pourrait parfois être nécessaire. Cela n’affecte pas la sécurité de votre conversation, mais vous pourriez avoir manqué un message de ce contact. Vous pouvez lui demander de vous le renvoyer.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly utilise un chiffrement de bout en bout, et l’actualisation de votre session de dialogue en ligne pourrait parfois être nécessaire. Cela n’affecte pas la sécurité de votre conversation, mais vous pourriez avoir manqué un message de ce contact. Vous pouvez lui demander de vous le renvoyer.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Utilisez Signal sur ordinateur ou sur iPad. Vos messages seront synchronisés sur vos appareils associés.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Associer un nouvel appareil</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Avec son protocole de chiffrement de bout en bout, Signal protège les messages et les conversations sur tous vos appareils.</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal sur ordinateur ou sur iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Même sur les appareils associés, toutes les communications Signal restent privées.</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Une fois les appareils associés, les messages Molly sont synchronisés sur votre téléphone mobile. L’historique des messages existants ne s’affiche pas sur l’appareil nouvellement associé.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Avec l’autre appareil, rendez-vous sur %1$s pour installer Molly.</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Mes appareils associés</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Dissocier</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s dissocié</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Association en cours…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Appareil approuvé.</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Chargement…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Aucun appareil associé</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Déverrouiller pour associer un appareil</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Scannez le code QR affiché sur l’appareil pour l’associer.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Scanner le code QR</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Utilisez cet appareil pour scanner le code QR affiché sur l’appareil à associer.</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">OK</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Cet appareil pourra afficher vos groupes et vos contacts, accéder à vos conversations et envoyer des messages via votre profil.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Terminer l’association sur l’autre appareil</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Utilisez votre autre appareil pour finaliser l’association de Molly.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Impossible d’associer l’appareil</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Ce code QR est incorrect. Veuillez scanner le code QR affiché sur l’appareil à associer.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Réessayer</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Annuler le lien avec « %1$s » ?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimiser pour palier l’absence des Services Play</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Cet appareil ne prend pas les Services Google Play en charge. Touchez pour désactiver les optimisations système de la batterie/pile qui empêchent à Signal de récupérer les messages lors d’inactivité.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Cet appareil ne prend pas les Services Google Play en charge. Touchez pour désactiver les optimisations système de la batterie/pile qui empêchent à Molly de récupérer les messages lors d’inactivité.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Votre version de Signal est expirée. Mettez-la à jour maintenant afin d’échanger des messages.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Votre version de Molly est expirée. Mettez-la à jour maintenant afin d’échanger des messages.</string>
     <string name="ExpiredBuildReminder_update_now">Mettre Signal à jour maintenant</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Afficher</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Échec permanent de communication de Signal.</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal n’a pas réussi à s’inscrire auprès des services Google Play. Les appels et messages Signal ont été désactivés. Veuillez essayer de vous réinscrire dans Paramètres &gt; Avancé.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Échec permanent de communication de Molly.</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly n’a pas réussi à s’inscrire auprès des services Google Play. Les appels et messages Molly ont été désactivés. Veuillez essayer de vous réinscrire dans Paramètres &gt; Avancé.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Les journaux de débogage nous aident à diagnostiquer et résoudre les problèmes. Ils ne contiennent aucune information d’identification.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal a rencontré un problème. Envoyer un journal de débogage ?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly a rencontré un problème. Envoyer un journal de débogage ?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">L’envoi des notifications peut être retardé en raison de l’optimisation de la batterie.</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Vous pouvez désactiver l’optimisation de la batterie pour Signal afin de garantir que les notifications de messages ne seront pas retardées.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Vous pouvez désactiver l’optimisation de la batterie pour Molly afin de garantir que les notifications de messages ne seront pas retardées.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">L’optimisation de la batterie peut retarder les notifications</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Pour être averti de la réception de messages dès leur arrivée, désactivez l’optimisation de la batterie pour Molly. Appuyez sur &lt;strong&gt;Continuer&lt;/strong&gt; pour afficher les instructions propres à votre appareil.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Non merci</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Continuer</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Poursuivre</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Fermer</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Non merci</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Invitations au groupe en attente</string>
+    <string name="PendingMembersActivity_pending_group_invites">Demandes d’ajout et invitations</string>
     <string name="PendingMembersActivity_requests">Demandes</string>
     <string name="PendingMembersActivity_invites">Invitations</string>
     <string name="PendingMembersActivity_people_you_invited">Personnes que vous avez invitées</string>
@@ -1088,9 +1161,9 @@
     <string name="AddGroupDetailsFragment__sms_contact">Contact texto</string>
     <string name="AddGroupDetailsFragment__remove_s_from_this_group">Retirer %1$s de ce groupe ?</string>
     <!-- Info message shown in the middle of the screen, displayed when adding group details to an MMS Group -->
-    <string name="AddGroupDetailsFragment__youve_selected_a_contact_that_doesnt_support">Vous avez sélectionné un contact qui ne prend pas en charge les groupes Signal. Les échanges de ce groupe se feront donc par MMS. Le nom personnalisé du groupe, ainsi que les photos, ne seront visibles que par vous.</string>
+    <string name="AddGroupDetailsFragment__youve_selected_a_contact_that_doesnt_support">Le contact sélectionné ne peut pas utiliser les groupes Signal. Les échanges de ce groupe se feront donc par MMS. Vous seul pourrez afficher le nom personnalisé du groupe et ses photos.</string>
     <!-- Info message shown in the middle of the screen, displayed when adding group details to an MMS Group after SMS Phase 0 -->
-    <string name="AddGroupDetailsFragment__youve_selected_a_contact_that_doesnt_support_signal_groups_mms_removal">Vous avez sélectionné un contact qui ne prend pas en charge les groupes Signal, donc ce groupe sera un groupe de messages MMS. Les noms et les photos des groupes de messages MMS personnalisés ne seront visibles que par vous. La prise en charge des groupes MMS sera bientôt supprimée pour se concentrer sur les messages chiffrés.</string>
+    <string name="AddGroupDetailsFragment__youve_selected_a_contact_that_doesnt_support_signal_groups_mms_removal">Le contact sélectionné ne peut pas utiliser les groupes Signal. Les échanges de ce groupe se feront donc par MMS. Vous seul pourrez afficher le nom personnalisé du groupe et ses photos. Signal ne prendra bientôt plus en charge les groupes MMS, afin de donner la priorité aux messages chiffrés.</string>
 
     <!-- ManageGroupActivity -->
     <string name="ManageGroupActivity_who_can_add_new_members">Qui peut ajouter de nouveaux membres ?</string>
@@ -1102,8 +1175,8 @@
     </plurals>
 
     <string name="ManageGroupActivity_you_dont_have_the_rights_to_do_this">Vous n’avez pas les droits pour ce faire</string>
-    <string name="ManageGroupActivity_not_capable">Une personne que vous avez ajoutée ne prend pas en charge les Nouveaux groupes et doit mettre Signal à jour.</string>
-    <string name="ManageGroupActivity_not_announcement_capable">Une personne que vous avez ajoutée ne prend pas en charge les groupes de diffusion et doit mettre à jour Signal</string>
+    <string name="ManageGroupActivity_not_capable">Un des membres que vous avez ajoutés ne peut utiliser les Nouveaux groupes et doit installer la dernière version de Signal.</string>
+    <string name="ManageGroupActivity_not_announcement_capable">Un des membres que vous avez ajoutés ne peut utiliser les groupes de diffusion et doit installer la dernière version de Signal.</string>
     <string name="ManageGroupActivity_failed_to_update_the_group">Échec de mise à jour du groupe</string>
     <string name="ManageGroupActivity_youre_not_a_member_of_the_group">Vous n’êtes pas un membre du groupe</string>
     <string name="ManageGroupActivity_failed_to_update_the_group_please_retry_later">Échec de mise à jour du groupe, veuillez réessayer plus tard</string>
@@ -1115,12 +1188,12 @@
     <string name="ManageGroupActivity_legacy_group_learn_more">Ce groupe est un groupe hérité. Les fonctions telles que l’administration des groupes ne sont proposées que pour les Nouveaux groupes.</string>
     <!-- This is placed inside a "Learn More" text view, which automatically appends LearnMoreTextView_learn_more in code to the end of the string -->
     <string name="ManageGroupActivity_legacy_group_upgrade">Ce groupe est un groupe hérité. Pour accéder aux nouvelles fonctions telles que les @mentions et l’administration,</string>
-    <string name="ManageGroupActivity_legacy_group_too_large">Ce groupe hérité ne peut pas être converti en Nouveau groupe, car il comporte trop de membres. Le nombre maximal de membres d’un groupe est %1$d.</string>
+    <string name="ManageGroupActivity_legacy_group_too_large">Ce groupe hérité ne peut pas être converti en Nouveau groupe, car il comporte un trop grand nombre de membres. Un groupe ne peut compter plus de %1$d membres.</string>
     <string name="ManageGroupActivity_upgrade_this_group">convertissez ce groupe</string>
     <string name="ManageGroupActivity_this_is_an_insecure_mms_group">Ce groupe est un groupe de messages multimédias non sécurisé. Pour converser en toute confidentialité, invitez vos contacts sur Signal.</string>
     <string name="ManageGroupActivity_invite_now">Inviter maintenant</string>
     <string name="ManageGroupActivity_more">plus</string>
-    <string name="ManageGroupActivity_add_group_description">Ajouter une description au groupe…</string>
+    <string name="ManageGroupActivity_add_group_description">Ajouter une description du groupe…</string>
 
     <!-- GroupMentionSettingDialog -->
     <string name="GroupMentionSettingDialog_notify_me_for_mentions">Me signaler les mentions</string>
@@ -1140,7 +1213,7 @@
     <string name="ManageProfileFragment_badges">Macarons</string>
     <!-- Text for a button that will take the user to the screen to manage their username link and QR code -->
     <string name="ManageProfileFragment_link_setting_text">Code QR ou lien</string>
-    <string name="ManageProfileFragment__edit_photo">Modifier la photo</string>
+    <string name="ManageProfileFragment__edit_photo">Changer de photo</string>
     <!-- Title of a tooltip educating the user about a button on the screen that will take them to the username share screen -->
     <string name="ManageProfileFragment__link_tooltip_title">Partagez votre nom d’utilisateur</string>
     <!-- Body of a tooltip educating the user about a button on the screen that will take them to the username share screen -->
@@ -1239,9 +1312,9 @@
     </plurals>
 
     <!-- GroupJoinUpdateRequiredBottomSheetDialogFragment -->
-    <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_update_signal_to_use_group_links">Mettez Signal à jour pour utiliser les liens de groupe</string>
+    <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_update_signal_to_use_group_links">Pour utiliser les liens de groupe, installez la dernière version de Signal.</string>
     <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_update_message">La version de Signal que vous utilisez ne prend pas en charge ce lien de groupe. Installez la dernière version de Signal pour vous joindre à ce groupe grâce à un lien.</string>
-    <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_update_signal">Mettre Signal à jour</string>
+    <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_update_signal">Installez la dernière version de Signal</string>
     <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_group_link_is_not_valid">Le lien de groupe est invalide</string>
 
     <!-- GroupInviteLinkEnableAndShareBottomSheetDialogFragment -->
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Annuler</string>
     <string name="InviteActivity_sending">Envoi…</string>
     <string name="InviteActivity_invitations_sent">L’invitation a été envoyée.</string>
-    <string name="InviteActivity_invite_to_signal">Inviter à Signal</string>
+    <string name="InviteActivity_invite_to_signal">Inviter à Molly</string>
     <string name="InviteActivity_send_sms">Envoyer un texto (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Envoyer %1$d invitation par SMS ?</item>
         <item quantity="other">Envoyer %1$d invitations par SMS ?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Passons à Signal : %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Passons à Molly : %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Vous semblez n’avoir aucune appli vers laquelle partager.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Votre message</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">La connexion d’arrière-plan est activée</string>
 
     <!-- MediaOverviewActivity -->
@@ -1316,8 +1389,8 @@
         <item quantity="other">Supprimer les éléments sélectionnés ?</item>
     </plurals>
     <plurals name="MediaOverviewActivity_Media_delete_confirm_message">
-        <item quantity="one">Cela supprimera définitivement le fichier sélectionné. Tout texto associé à cet élément sera aussi supprimé.</item>
-        <item quantity="other">Cela supprimera définitivement les %1$d fichiers sélectionnés. Tout texto associé à ces éléments sera aussi supprimé.</item>
+        <item quantity="one">Cela supprimera définitivement le fichier sélectionné. Le message associé à cet élément sera aussi supprimé.</item>
+        <item quantity="other">Cela supprimera définitivement les %1$d fichiers sélectionnés. Les messages associés à ces éléments seront aussi supprimés.</item>
     </plurals>
     <string name="MediaOverviewActivity_Media_delete_progress_title">Suppression</string>
     <string name="MediaOverviewActivity_Media_delete_progress_message">Suppression des messages…</string>
@@ -1342,8 +1415,8 @@
 
     <!-- Screen title shown when selecting multiple items in the media overview screen. The first placeholder is the number of items, the second number is the cumulative file size in bytes. -->
     <plurals name="MediaOverviewActivity_d_selected_s">
-        <item quantity="one">%1$d sélectionnée (%2$s)</item>
-        <item quantity="other">%1$d sélectionnées (%2$s)</item>
+        <item quantity="one">%1$d élément sélectionné (%2$s)</item>
+        <item quantity="other">%1$d éléments sélectionnés (%2$s)</item>
     </plurals>
     <string name="MediaOverviewActivity_file">Fichier</string>
     <string name="MediaOverviewActivity_audio">Audio</string>
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Réponses</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Établissement de l’appel Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">Établissement de l’appel Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Démarrage du service d\'appel Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Arrêt du service d’appel de Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Démarrage du service d\'appel Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Arrêt du service d’appel de Molly</string>
     <string name="NotificationBarManager__cancel_call">Annuler l’appel</string>
 
     <!-- NotificationsMegaphone -->
@@ -1622,11 +1695,19 @@
     <!-- Message to notify sender that activate payments request has been sent to the recipient -->
     <string name="MessageRecord_you_sent_request">Vous avez envoyé une demande d’activation des paiements à %1$s</string>
     <!-- Request message from recipient to activate payments -->
-    <string name="MessageRecord_wants_you_to_activate_payments">%1$s souhaite que vous activiez les paiements. Envoyer des paiements uniquement aux personnes en qui vous avez confiance.</string>
+    <string name="MessageRecord_wants_you_to_activate_payments">%1$s souhaite que vous activiez les paiements. N’envoyez de paiements qu’aux personnes en qui vous avez confiance.</string>
     <!-- Message to inform user that payments was activated-->
     <string name="MessageRecord_you_activated_payments">Vous avez activé les paiements</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s accepte désormais les paiements</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Infos de paiement indisponibles</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">En savoir plus</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Infos de paiement indisponibles</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Les informations de paiement sont indisponibles, car Signal a récupéré vos messages à partir d’un appareil qui ne contenait pas l’historique de cette transaction. Cela n’a aucune incidence sur le solde de votre compte, ni sur l’état de vos anciens paiements.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Vous ne pourrez bientôt plus envoyer de SMS depuis Signal. Invitez %1$s à rejoindre Signal pour continuer la conversation ici.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Vous ne pouvez plus envoyer de SMS dans Signal. Invitez %1$s à rejoindre Signal pour continuer la conversation ici.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Vous ne pouvez plus envoyer de SMS dans Molly. Invitez %1$s à rejoindre Molly pour continuer la conversation ici.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Paiement : %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Paiement</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Signalé comme spam</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1707,7 +1790,7 @@
     <string name="MessageRequestBottomView_get_updates_and_news_from_s_you_wont_receive_any_updates_until_you_unblock_them">Recevoir voir des nouvelles de%1$s ? Vous ne recevrez aucune nouvelle tant que vous ne l’aurez pas débloqué.</string>
     <string name="MessageRequestBottomView_continue_your_conversation_with_this_group_and_share_your_name_and_photo">Poursuivre votre conversation avec ce groupe et partager vos nom et photo avec ses membres ?</string>
     <string name="MessageRequestBottomView_upgrade_this_group_to_activate_new_features">Les groupes hérités ne peuvent plus être utilisés. Créez un nouveau groupe pour activer les nouvelles fonctionnalités telles que les @mentions et les administrateurs.</string>
-    <string name="MessageRequestBottomView_this_legacy_group_can_no_longer_be_used">Ce groupe hérité ne peut plus être utilisé, car il comporte trop de membres. Le nombre maximal de membres d’un groupe est %1$d.</string>
+    <string name="MessageRequestBottomView_this_legacy_group_can_no_longer_be_used">Vous ne pouvez plus utiliser ce groupe hérité, car il comporte un trop grand nombre de membres. Un groupe ne peut compter plus de %1$d membres.</string>
     <string name="MessageRequestBottomView_continue_your_conversation_with_s_and_share_your_name_and_photo">Poursuivre votre conversation avec %1$s et partager vos nom et photo avec cette personne ?</string>
     <string name="MessageRequestBottomView_do_you_want_to_join_this_group_they_wont_know_youve_seen_their_messages_until_you_accept">Rejoindre ce groupe et partager votre nom et votre photo avec ses membres ? Aucune confirmation de lecture n’est envoyée tant que vous n’avrez pas accepté.</string>
     <string name="MessageRequestBottomView_do_you_want_to_join_this_group_you_wont_see_their_messages">Vous joindre à ce groupe et partager votre nom et votre photo avec ses membres ? Vous ne verrez pas leurs messages tant que vous n’aurez pas accepté.</string>
@@ -1737,7 +1820,7 @@
         <item quantity="other">%1$d groupes supplémentaires</item>
     </plurals>
     <!-- Button label to report spam for a conversation when in a message request state -->
-    <string name="MessageRequestBottomView_report">Signaler…</string>
+    <string name="MessageRequestBottomView_report">Signaler</string>
 
     <!-- PassphraseChangeActivity -->
     <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Les phrases de passe ne correspondent pas.</string>
@@ -1752,18 +1835,18 @@
     <string name="DeviceProvisioningActivity_content_bullets">
         • Lire tous vos messages \n• Envoyer des messages en votre nom
     </string>
-    <string name="DeviceProvisioningActivity_content_progress_title">Liaison de l’appareil</string>
-    <string name="DeviceProvisioningActivity_content_progress_content">Liaison du nouvel appareil…</string>
+    <string name="DeviceProvisioningActivity_content_progress_title">Association de l’appareil</string>
+    <string name="DeviceProvisioningActivity_content_progress_content">Association du nouvel appareil…</string>
     <string name="DeviceProvisioningActivity_content_progress_success">L’appareil a été approuvé.</string>
     <string name="DeviceProvisioningActivity_content_progress_no_device">Aucun appareil n’a été trouvé.</string>
     <string name="DeviceProvisioningActivity_content_progress_network_error">Erreur réseau.</string>
     <string name="DeviceProvisioningActivity_content_progress_key_error">Le code QR est invalide</string>
-    <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Vous avez associé un trop grand nombre d’appareils. Veuillez en supprimer quelques-uns.</string>
-    <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Désolé, ce n’est pas un code QR valide de liaison d’appareil.</string>
+    <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Vous avez déjà associé un trop grand nombre d’appareils. Veuillez en supprimer quelques-uns.</string>
+    <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Le code QR utilisé pour associer l’appareil n’est pas un code valide.</string>
     <string name="DeviceProvisioningActivity_link_a_signal_device">Associer un appareil Signal ?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Il semble que vous tentiez d’associer un appareil Signal via un lecteur tiers. Pour votre sécurité, veuillez rescanner le code à partir de Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal a besoin de l’autorisation Appareil photo afin de lire un code QR, mais elle a été refusée définitivement. Veuillez accéder aux paramètres de l’appli, sélectionner Autorisations et activer Appareil photo.</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly a besoin de l’autorisation Appareil photo afin de lire un code QR, mais elle a été refusée définitivement. Veuillez accéder aux paramètres de l’appli, sélectionner Autorisations et activer Appareil photo.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Impossible de lire un code QR sans l’autorisation Appareil photo</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Saisissez la phrase de passe</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Icône de Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Icône de Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Envoyer la phrase de passe</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">La phrase de passe est erronée.</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Déverrouiller Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal pour Android – Écran de verrouillage</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Déverrouiller Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly pour Android – Écran de verrouillage</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Carte</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Confirmer pour continuer à communiquer</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Pour aider à prévenir le spam sur Signal, veuillez procéder à la confirmation.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Pour aider à prévenir le spam sur Molly, veuillez procéder à la confirmation.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Après la confirmation, vous pourrez continuer à communiquer. Tout les messages en attente seront automatiquement envoyés.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Ma story</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Appel Signal</string>
+    <string name="Recipient_signal_call">Appel Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Bloquer</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Sonnerie…</string>
     <string name="RedPhone_busy">Occupé</string>
     <string name="RedPhone_recipient_unavailable">Le destinataire n’est pas disponible</string>
-    <string name="RedPhone_network_failed">Erreur du réseau.</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Erreur réseau. Veuillez vérifier votre connexion réseau et réessayer.</string>
     <string name="RedPhone_number_not_registered">Le numéro n’est pas inscrit.</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Le numéro que vous avez composé ne prend pas en charge les communications vocales sécurisées.</string>
     <string name="RedPhone_got_it">J’ai compris</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Touchez ici pour activer votre vidéo</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Pour appeler %1$s, Signal a besoin d’accéder à votre appareil photo</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Pour appeler %1$s, Molly a besoin d’accéder à votre appareil photo</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Appel…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Reconnexion…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Vous avez été retiré de l’appel</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Une personne vous a retiré de l’appel.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Autoriser l’accès à l’appareil photo et au microphone</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Autoriser l’accès au microphone</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Autoriser l’accès à l’appareil photo</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Pour passer ou rejoindre un appel, autorisez Molly à accéder à votre appareil photo et à votre microphone.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Pour passer ou rejoindre un appel, autorisez Molly à accéder à votre microphone.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Pour prendre des vidéos, autorisez Molly à accéder à votre appareil photo.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Pour passer ou rejoindre un appel, autorisez Molly à accéder au Microphone.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Pour prendre des vidéos, Molly doit accéder à l’appareil photo.</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Pour passer ou rejoindre un appel :</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Pour prendre des vidéos :</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Appel Signal</string>
-    <string name="WebRtcCallView__signal_video_call">Appel vidéo Signal</string>
+    <string name="WebRtcCallView__signal_call">Appel Molly</string>
+    <string name="WebRtcCallView__signal_video_call">Appel vidéo Molly</string>
     <string name="WebRtcCallView__start_call">Lancer un appel</string>
     <string name="WebRtcCallView__join_call">Me joindre à l’appel</string>
     <string name="WebRtcCallView__call_is_full">L’appel est complet</string>
@@ -2031,20 +2135,39 @@
     <string name="CallOverflowPopupWindow__lower_hand">Baisser la main</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Annuler</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Vous avez levé la main</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Afficher</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s a levé la main</item>
-        <item quantity="other">%1$s + %2$d ont levé la main</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s avez levé la main</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d autre personne avez levé la main</item>
+        <item quantity="other">%1$s + %2$d autres personnes avez levé la main</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s a levé la main.</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d autre personne ont levé la main</item>
+        <item quantity="other">%1$s + %2$d autres personnes ont levé la main</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
-        <item quantity="one">%1$s</item>
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s + %2$d</item>
+        <item quantity="other">%1$s + %2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
+        <item quantity="one">%1$s + %2$d</item>
         <item quantity="other">%1$s + %2$d</item>
     </plurals>
 
@@ -2097,7 +2220,7 @@
     <!-- CallParticipantView -->
     <string name="CallParticipantView__s_is_blocked">%1$s est bloqué</string>
     <string name="CallParticipantView__more_info">Plus de précisions</string>
-    <string name="CallParticipantView__you_wont_receive_their_audio_or_video">Vous ne recevrez ni l’audio, ni la vidéo de cet utilisateur, et il ne recevra pas les vôtres.</string>
+    <string name="CallParticipantView__you_wont_receive_their_audio_or_video">Vous ne recevez ni l’audio, ni la vidéo de cet utilisateur et il ne reçoit pas les vôtres.</string>
     <string name="CallParticipantView__cant_receive_audio_video_from_s">Impossible de recevoir l’audio et la vidéo de %1$s</string>
     <string name="CallParticipantView__cant_receive_audio_and_video_from_s">Impossible de recevoir l’audio et la vidéo de %1$s</string>
     <string name="CallParticipantView__this_may_be_Because_they_have_not_verified_your_safety_number_change">Cette personne n’a peut-être pas confirmé le changement de votre numéro de sécurité, il y a peut-être un problème avec son appareil ou elle vous a bloqué.</string>
@@ -2106,11 +2229,11 @@
     <string name="CallToastPopupWindow__swipe_to_view_screen_share">Balayez pour visualiser le partage d’écran</string>
 
     <!-- ProxyBottomSheetFragment -->
-    <string name="ProxyBottomSheetFragment_proxy_server">Serveur mandataire</string>
-    <string name="ProxyBottomSheetFragment_proxy_address">Adresse du mandataire</string>
-    <string name="ProxyBottomSheetFragment_do_you_want_to_use_this_proxy_address">Voulez-vous utiliser cette adresse de mandataire ?</string>
-    <string name="ProxyBottomSheetFragment_use_proxy">Utiliser un mandataire</string>
-    <string name="ProxyBottomSheetFragment_successfully_connected_to_proxy">Connectée avec succès au mandataire.</string>
+    <string name="ProxyBottomSheetFragment_proxy_server">Serveur proxy</string>
+    <string name="ProxyBottomSheetFragment_proxy_address">Adresse du proxy</string>
+    <string name="ProxyBottomSheetFragment_do_you_want_to_use_this_proxy_address">Voulez-vous utiliser cette adresse de proxy ?</string>
+    <string name="ProxyBottomSheetFragment_use_proxy">Utiliser un proxy</string>
+    <string name="ProxyBottomSheetFragment_successfully_connected_to_proxy">Vous êtes bien connecté au proxy.</string>
 
     <!-- RecaptchaProofActivity -->
     <string name="RecaptchaProofActivity_failed_to_submit">Échec de l’envoi</string>
@@ -2134,11 +2257,11 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Vous recevrez un appel afin de confirmer ce numéro.</string>
     <string name="RegistrationActivity_edit_number">Modifier le numéro</string>
     <string name="RegistrationActivity_missing_google_play_services">Absence des services Google Play</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Cet appareil ne dispose pas des services Google Play. Vous pouvez quand même utiliser Signal, mais cette configuration pourrait entraîner une fiabilité ou des performances moindres.\n\nSi vous n’êtes pas un utilisateur expérimenté, que vous n’utilisez pas une image Android de remplacement ou si vous pensez voir cela par erreur, veuillez contacter support@signal.org pour obtenir une aide au dépannage.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Cet appareil ne dispose pas des services Google Play. Vous pouvez quand même utiliser Molly, mais cette configuration pourrait entraîner une fiabilité ou des performances moindres.\n\nSi vous n’êtes pas un utilisateur expérimenté, que vous n’utilisez pas une image Android de remplacement ou si vous pensez voir cela par erreur, veuillez contacter support@molly.im pour obtenir une aide au dépannage.</string>
     <string name="RegistrationActivity_i_understand">Je comprends</string>
     <string name="RegistrationActivity_play_services_error">Erreur des Services Google Play</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Les services Google Play sont en cours de mise à jour ou temporairement non disponibles. Veuillez réessayer.</string>
-    <string name="RegistrationActivity_terms_and_privacy">Conditions générales et politique de confidentialité</string>
+    <string name="RegistrationActivity_terms_and_privacy">Conditions générales et règles de confidentialité</string>
     <string name="RegistrationActivity_signal_needs_access_to_your_contacts_and_media_in_order_to_connect_with_friends">Pour vous permettre de contacter vos amis et d’envoyer des messages, Signal a besoin des autorisations Contacts et Médias. Vos contacts sont importés grâce au service de découverte confidentielle de Signal : autrement dit, ils sont chiffrés de bout en bout et nous n’y avons jamais accès.</string>
     <string name="RegistrationActivity_signal_needs_access_to_your_contacts_in_order_to_connect_with_friends">Pour vous permettre de contacter vos amis, Signal a besoin de l’autorisation Contacts. Vos contacts sont importés grâce au service de découverte confidentielle de Signal•: autrement dit, ils sont chiffrés de bout en bout et nous n’y avons jamais accès.</string>
     <string name="RegistrationActivity_rate_limited_to_service">Vous avez fait trop d’essais pour inscrire ce numéro. Veuillez réessayer plus tard.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Format de numéro non standard</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Le numéro que vous avez saisi (%1$s) semble avoir un format atypique.\n\nSerait-ce plutôt %2$s ?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal pour Android – Format de numéro de téléphone</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly pour Android – Format de numéro de téléphone</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Appel demandé</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Un problème d’inscription ?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Assurez-vous que votre téléphone dispose d’un signal cellulaire pour recevoir votre SMS ou votre appel.\n • Confirmez que vous pouvez recevoir un appel à ce numéro.\n • Vérifiez que vous avez renseigné votre numéro de téléphone correctement.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Pour plus d’informations, veuillez suivre ces étapes de dépannage ou contacter le service d’assistance.</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Pour plus d\'informations, veuillez suivre %1$s ou %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">ces étapes de dépannage</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Ajouter aux contacts</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Inviter à Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Inviter à Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Message Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Appel Signal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Ajouter aux contacts</string>
-    <string name="SharedContactView_invite_to_signal">Inviter à Signal</string>
+    <string name="SharedContactView_invite_to_signal">Inviter à Molly</string>
     <string name="SharedContactView_message">Message Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2290,7 +2413,7 @@
     <string name="SubmitDebugLogActivity_submit">Envoyer</string>
     <string name="SubmitDebugLogActivity_failed_to_submit_logs">Échec d’envoi des journaux</string>
     <string name="SubmitDebugLogActivity_success">C’est réussi !</string>
-    <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Copiez cette URL et ajoutez-la à votre relevé d’erreur ou à votre courriel de demande d’assistance :\n\n<b>%1$s</b></string>
+    <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Copiez cette URL et ajoutez-la à votre rapport d’erreur ou à votre e-mail de demande d’assistance :\n\n<b>%1$s</b></string>
     <string name="SubmitDebugLogActivity_share">Partager</string>
     <string name="SubmitDebugLogActivity_this_log_will_be_posted_publicly_online_for_contributors">Ce journal sera publiquement disponible sur le web, où les contributeurs pourront le consulter. Vous pouvez l’examiner avant de l’importer.</string>
 
@@ -2325,7 +2448,7 @@
     <!-- Displayed in the notification when the recipient can accept payments -->
     <string name="ThreadRecord_can_accept_payments">%1$s accepte désormais les paiements</string>
     <string name="ThreadRecord_s_is_on_signal">%1$s est sur Signal.</string>
-    <string name="ThreadRecord_disappearing_messages_disabled">Les messages éphémères sont désactivés</string>
+    <string name="ThreadRecord_disappearing_messages_disabled">Messages éphémères désactivés</string>
     <string name="ThreadRecord_disappearing_message_time_updated_to_s">L’expiration des messages éphémères a été définie à %1$s</string>
     <string name="ThreadRecord_safety_number_changed">Le numéro de sécurité a changé</string>
     <string name="ThreadRecord_your_safety_number_with_s_has_changed">Votre numéro de sécurité avec %1$s a changé.</string>
@@ -2349,9 +2472,9 @@
     <!-- Displayed in the notification when the user has opened a received gift -->
     <string name="ThreadRecord__you_redeemed_a_badge">Vous avez récupéré un macaron</string>
     <!-- Displayed in the conversation list when someone reacted to your story -->
-    <string name="ThreadRecord__reacted_s_to_your_story">A réagi par %1$s à votre Story</string>
+    <string name="ThreadRecord__reacted_s_to_your_story">a réagi par %1$s à votre story</string>
     <!-- Displayed in the conversation list when you reacted to someone\'s story -->
-    <string name="ThreadRecord__reacted_s_to_their_story">A réagi par %1$s à leur Story</string>
+    <string name="ThreadRecord__reacted_s_to_their_story">avez réagi par %1$s à la story</string>
     <!-- Displayed in the conversation list when your most recent message is a payment to or from the person the conversation is with -->
     <string name="ThreadRecord_payment">Paiement</string>
     <!-- Displayed in the conversation list when your only message in a conversation is a scheduled send. -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s appartient à %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Mise à jour de Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Une nouvelle version de Signal est disponible. Appuyez pour lancer la mise à jour.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal n’a pas pu être mis à jour</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Mise à jour de Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Une nouvelle version de Molly est disponible. Appuyez pour lancer la mise à jour.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly n’a pas pu être mis à jour</string>
     <string name="ApkUpdateNotifications_failed_general_body">Nous réessaierons plus tard.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal a été mis à jour avec succès</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly a été mis à jour avec succès</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">La version %1$s a été automatiquement installée.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Notre numéro de sécurité Signal :</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Vous semblez n’avoir aucune appli vers laquelle partager.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Aucun numéro de sécurité à comparer n’a été trouvé dans le presse-papiers</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal a besoin de l’autorisation Appareil photo afin de lire un code QR, mais elle a été refusée définitivement. Veuillez accéder aux paramètres de l’appli, sélectionner Autorisations et activer Appareil photo.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly a besoin de l’autorisation Appareil photo afin de lire un code QR, mais elle a été refusée définitivement. Veuillez accéder aux paramètres de l’appli, sélectionner Autorisations et activer Appareil photo.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Impossible de lire le code QR sans l’autorisation Appareil photo</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Vous devez d’abord échanger des messages afin d’afficher le numéro de sécurité de %1$s.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Touchez pour ouvrir</string>
-    <string name="KeyCachingService_passphrase_cached">Signal est déverrouillée</string>
-    <string name="KeyCachingService_lock">Verrouiller Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly est déverrouillée</string>
+    <string name="KeyCachingService_lock">Verrouiller Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Vous</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Type de média non pris en charge</string>
     <string name="MediaPreviewActivity_draft">Brouillon</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal a besoin de l’autorisation Stockage afin d’enregistrer sur l\'espace de stockage externe, mais elle a été refusée définitivement. Veuillez accéder aux paramètres de l’appli, sélectionner Autorisations et activer Stockage.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly a besoin de l’autorisation Stockage afin d’enregistrer sur l\'espace de stockage externe, mais elle a été refusée définitivement. Veuillez accéder aux paramètres de l’appli, sélectionner Autorisations et activer Stockage.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Impossible d’enregistrer sur l\'espace de stockage sans autorisation</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Supprimer le message ?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Ce message sera irrémédiablement supprimé.</string>
@@ -2512,13 +2635,13 @@
     <string name="MessageNotifier_locked_message">Message verrouillé</string>
     <string name="MessageNotifier_message_delivery_failed">Échec de remise du message.</string>
     <!-- Shown in a notification when a story the user tries to send fails to be sent -->
-    <string name="MessageNotifier_story_delivery_failed">Échec de l’envoi de la Story</string>
+    <string name="MessageNotifier_story_delivery_failed">Impossible d’envoyer la story</string>
     <!-- Shown as notification title for when a notification about a story sent to a group story %1$s replaced with the group name -->
     <string name="MessageNotifier_group_story_title">Vous à %1$s</string>
     <string name="MessageNotifier_failed_to_deliver_message">Échec de remise du message.</string>
     <string name="MessageNotifier_error_delivering_message">Erreur de remise du message.</string>
     <string name="MessageNotifier_message_delivery_paused">Remise des messages en attente.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Confirmez pour continuer à communiquer sur Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Confirmez pour continuer à communiquer sur Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Tout marquer comme lu</string>
     <string name="MessageNotifier_mark_read">Marquer comme lu</string>
     <string name="MessageNotifier_turn_off_these_notifications">Désactiver ces notifications</string>
@@ -2528,19 +2651,19 @@
     <string name="MessageNotifier_signal_message">Message Signal</string>
     <string name="MessageNotifier_contact_message">%1$s %2$s</string>
     <string name="MessageNotifier_unknown_contact_message">Contact</string>
-    <string name="MessageNotifier_reacted_s_to_s">A réagi par %1$s à : « %2$s ».</string>
-    <string name="MessageNotifier_reacted_s_to_your_video">A réagi par %1$s à votre vidéo.</string>
-    <string name="MessageNotifier_reacted_s_to_your_image">A réagi par %1$s à votre image.</string>
-    <string name="MessageNotifier_reacted_s_to_your_gif">A réagi par %1$s à votre GIF.</string>
-    <string name="MessageNotifier_reacted_s_to_your_file">A réagi par %1$s à votre fichier.</string>
-    <string name="MessageNotifier_reacted_s_to_your_audio">a réagi par %1$s à votre message vocal.</string>
-    <string name="MessageNotifier_reacted_s_to_your_view_once_media">A réagi par %1$s à votre média éphémère.</string>
+    <string name="MessageNotifier_reacted_s_to_s">a réagi par %1$s à : « %2$s ».</string>
+    <string name="MessageNotifier_reacted_s_to_your_video">a réagi par %1$s à votre vidéo.</string>
+    <string name="MessageNotifier_reacted_s_to_your_image">a réagi par %1$s à votre image.</string>
+    <string name="MessageNotifier_reacted_s_to_your_gif">a réagi par %1$s à votre GIF.</string>
+    <string name="MessageNotifier_reacted_s_to_your_file">a réagi par %1$s à votre fichier.</string>
+    <string name="MessageNotifier_reacted_s_to_your_audio">a réagi par %1$s à votre fichier audio.</string>
+    <string name="MessageNotifier_reacted_s_to_your_view_once_media">a réagi par %1$s à votre média éphémère.</string>
     <!-- Body of notification shown to user when someone they sent a payment to reacts to it. Placeholder is the emoji used in the reaction. -->
-    <string name="MessageNotifier_reacted_s_to_your_payment">A réagi par %1$s à votre paiement.</string>
+    <string name="MessageNotifier_reacted_s_to_your_payment">a réagi par %1$s à votre paiement.</string>
     <string name="MessageNotifier_reacted_s_to_your_sticker">a réagi par %1$s à votre sticker.</string>
     <string name="MessageNotifier_this_message_was_deleted">Ce message a été supprimé.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Désactiver les notifications pour les contacts qui se sont joints à Signal ? Vous pouvez les réactiver dans Signal &gt; Paramètres &gt; Notifications</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Désactiver les notifications pour les contacts qui se sont joints à Molly ? Vous pouvez les réactiver dans Molly &gt; Paramètres &gt; Notifications</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2565,7 +2688,7 @@
     <string name="NotificationChannel_group_chats">Conversations</string>
     <string name="NotificationChannel_missing_display_name">Inconnu</string>
     <string name="NotificationChannel_voice_notes">Notes vocales</string>
-    <string name="NotificationChannel_contact_joined_signal">Un contact s’est joint à Signal</string>
+    <string name="NotificationChannel_contact_joined_signal">Un contact a rejoint Signal</string>
     <string name="NotificationChannels__no_activity_available_to_open_notification_channel_settings">Aucune activité n’est disponible pour ouvrir les paramètres du canal de notification.</string>
     <!-- Notification channel name for showing persistent background connection on devices without push notifications -->
     <string name="NotificationChannel_background_connection">Connexion en arrière-plan</string>
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">La réponse rapide n’est pas proposée quand Signal est verrouillée.</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">La réponse rapide n’est pas proposée quand Molly est verrouillée.</string>
     <string name="QuickResponseService_problem_sending_message">Un problème d’envoi du message est survenu.</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,12 +2722,12 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Le raccourci est invalide</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Nouveau message</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Invitation par message</string>
     <string name="SingleRecipientNotificationBuilder_you">Vous</string>
     <!-- Notification subtext for group stories -->
-    <string name="SingleRecipientNotificationBuilder__s_dot_story">%1$s • Story</string>
+    <string name="SingleRecipientNotificationBuilder__s_dot_story">Story • %1$s</string>
 
     <!-- NewWaysToConnectDialogFragment -->
     <!-- Fragment title, displayed at the top of the content -->
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Cet appareil n’est plus enregistré. Vous avez probablement inscrit votre numéro de téléphone sur Signal depuis un autre appareil.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Cet appareil n’est plus enregistré. Vous avez probablement inscrit votre numéro de téléphone sur Molly depuis un autre appareil.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Enregistrer l’appareil de nouveau</string>
 
@@ -2654,21 +2777,21 @@
 
     <!-- EnclaveFailureReminder -->
     <!-- Banner message to update app to use payments -->
-    <string name="EnclaveFailureReminder_update_signal">Mettez Signal à jour pour continuer à utiliser les paiements. Il se peut que votre solde ne soit pas à jour.</string>
+    <string name="EnclaveFailureReminder_update_signal">Pour continuer à utiliser les paiements, installez la dernière version de Signal. Il est possible que le solde affiché ne soit pas à jour.</string>
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Pour répondre à l’appel, accordez à Signal l’accès à votre microphone.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Pour répondre à l’appel, accordez à Molly l’accès à votre microphone.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Pour répondre à l’appel vidéo, veuillez autoriser Signal à accéder à votre micro et votre appareil photo.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal exige les autorisations Microphone et Appareil photo afin d’effectuer et de recevoir des appels, mais elles ont été refusées définitivement. Veuillez accéder au menu des paramètres des applis, sélectionner « Autorisations » et activer « Microphone » et « Appareil photo ».</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Pour répondre à l’appel vidéo, veuillez autoriser Molly à accéder à votre micro et votre appareil photo.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly exige les autorisations Microphone et Appareil photo afin d’effectuer et de recevoir des appels, mais elles ont été refusées définitivement. Veuillez accéder au menu des paramètres des applis, sélectionner « Autorisations » et activer « Microphone » et « Appareil photo ».</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Vous avez répondu à cet appel sur un appareil associé.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Vous avez refusé cet appel via un appareil associé.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Occupé sur un appareil associé.</string>
     <!-- Tooltip message shown first time user is in a video call after switch camera button moved -->
     <string name="WebRtcCallActivity__flip_camera_tooltip">L’icône « Changer de caméra » se trouve désormais ici. Touchez la vidéo pour l’essayer.</string>
 
-    <string name="GroupCallSafetyNumberChangeNotification__someone_has_joined_this_call_with_a_safety_number_that_has_changed">Quelqu’un s’est joint à cet appel avec un numéro de sécurité qui a changé.</string>
+    <string name="GroupCallSafetyNumberChangeNotification__someone_has_joined_this_call_with_a_safety_number_that_has_changed">Un utilisateur dont le numéro de sécurité a changé a rejoint cet appel.</string>
 
     <!-- WebRtcCallScreen -->
     <string name="WebRtcCallScreen_swipe_up_to_change_views">Balayer vers le haut pour changer de vue</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Répéter la nouvelle phrase de passe</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Inviter à Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Inviter à Molly</string>
     <string name="contact_selection_activity__new_group">Nouveau groupe</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Actualiser la liste des contacts</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Il vous manque quelqu\'un ? Essayez d\'actualiser la page</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Rechercher des personnes que vous connaissez sur Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Autorisez l’accès à vos contacts</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Plus</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Photo du contact</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal exige l’autorisation Contacts afin d’afficher vos contacts, mais elle a été refusée définitivement. Veuillez accéder au menu des paramètres des applis, sélectionner « Autorisations » et activer « Contacts ».</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly exige l’autorisation Contacts afin d’afficher vos contacts, mais elle a été refusée définitivement. Veuillez accéder au menu des paramètres des applis, sélectionner « Autorisations » et activer « Contacts ».</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Erreur de récupération des contacts, veuillez vérifier votre connexion réseau</string>
     <string name="ContactSelectionListFragment_username_not_found">Le nom d’utilisateur est introuvable</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"« %1$s » n’utilise pas Signal. Veuillez vérifier le nom d’utilisateur et réessayer."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Rechercher par nom d’utilisateur</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Autoriser l’accès aux contacts</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Pour rechercher des personnes que vous connaissez sur Signal :</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Accorder l’accès</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Non merci</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Autorisez l’accès à vos contacts. La liste de vos contacts est chiffrée et le service Signal n’y a pas accès.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal a besoin d’accéder à vos contacts afin de les afficher.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly a besoin d’accéder à vos contacts afin de les afficher.</string>
     <string name="contact_selection_list_fragment__show_contacts">Afficher les contacts</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Vous avez supprimé ce contact. Si vous écrivez de nouveau à ce contact, il apparaîtra sur votre liste.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Options</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Mettre à jour</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Lecture … Mettre en pause</string>
@@ -2847,7 +2974,7 @@
     <string name="QuoteView_you">Vous</string>
     <string name="QuoteView_original_missing">Le message original est introuvable</string>
     <!-- Author formatting for group stories -->
-    <string name="QuoteView_s_story">%1$s · Story</string>
+    <string name="QuoteView_s_story">Story · %1$s</string>
     <!-- Label indicating that a quote is for a reply to a story you created -->
     <string name="QuoteView_your_story">Vous · Story</string>
     <!-- Label indicating that the story being replied to no longer exists -->
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Les bulles sont une fonctionnalité d’Android que vous pouvez désactiver pour les conversations de Signal.</string>
+    <string name="BubbleOptOutTooltip__description">Les bulles sont une fonctionnalité d’Android que vous pouvez désactiver pour les conversations de Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Plus tard</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -2982,7 +3109,7 @@
     <!-- Displayed in a toast when user long presses an item in MyStories -->
     <string name="MyStoriesFragment__copied_sent_timestamp_to_clipboard">L’estampille temporelle d’envoi a été copiée dans le presse-papiers.</string>
     <!-- Displayed when there are no outgoing stories -->
-    <string name="MyStoriesFragment__updates_to_your_story_will_show_up_here">Les mises à jour de votre Story apparaîtront ici.</string>
+    <string name="MyStoriesFragment__updates_to_your_story_will_show_up_here">Vos nouvelles stories s’afficheront ici.</string>
 
     <!-- GroupUtil -->
     <plurals name="GroupUtil_joined_the_group">
@@ -3007,8 +3134,8 @@
     <string name="CreateProfileActivity_first_name_required">Prénom (requis)</string>
     <string name="CreateProfileActivity_last_name_optional">Nom de famille (facultatif)</string>
     <string name="CreateProfileActivity_next">Suivant</string>
-    <string name="CreateProfileActivity_custom_mms_group_names_and_photos_will_only_be_visible_to_you">Les noms et les photos des groupes de messages multimédias personnalisés ne seront visibles que par vous.</string>
-    <string name="CreateProfileActivity_group_descriptions_will_be_visible_to_members_of_this_group_and_people_who_have_been_invited">Les descriptions de groupe seront visibles aux membres de ce groupe et aux personnes qui ont été invitées.</string>
+    <string name="CreateProfileActivity_custom_mms_group_names_and_photos_will_only_be_visible_to_you">Vous seul pouvez afficher le nom personnalisé du groupe MMS et ses photos.</string>
+    <string name="CreateProfileActivity_group_descriptions_will_be_visible_to_members_of_this_group_and_people_who_have_been_invited">La description du groupe sera visible aux membres de ce groupe et aux personnes invitées.</string>
 
     <!-- EditAboutFragment -->
     <string name="EditAboutFragment_about">À propos</string>
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Description du groupe</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Installez la dernière version de Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Installez la dernière version de Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Cette version de Signal est arrivée à expiration. Pour continuer d’utiliser l’application, une mise à jour est nécessaire.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Cette version de Molly est arrivée à expiration. Pour continuer d’utiliser l’application, une mise à jour est nécessaire.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Mettre à jour</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3104,13 +3231,13 @@
     <string name="AndroidManifest_archived_conversations">Conversations archivées</string>
 
     <!-- HelpFragment -->
-    <string name="HelpFragment__have_you_read_our_faq_yet">Avez-vous déjà lu notre FAQ ?</string>
+    <string name="HelpFragment__have_you_read_our_faq_yet">Avez-vous parcouru notre FAQ ?</string>
     <string name="HelpFragment__next">Suivant</string>
     <string name="HelpFragment__contact_us">Nous contacter</string>
-    <string name="HelpFragment__tell_us_whats_going_on">Expliquez-nous ce qu’il se passe</string>
-    <string name="HelpFragment__include_debug_log">Inclure le journal de débogage.</string>
+    <string name="HelpFragment__tell_us_whats_going_on">Que se passe-t-il ? Dites-nous pourquoi vous nous contactez.</string>
+    <string name="HelpFragment__include_debug_log">Joindre le journal de débogage.</string>
     <string name="HelpFragment__whats_this">Qu’est-ce donc ?</string>
-    <string name="HelpFragment__how_do_you_feel">Comment vous sentez-vous ? (facultatif)</string>
+    <string name="HelpFragment__how_do_you_feel">Quel émoji reflète le mieux votre humeur ? (Facultatif)</string>
     <string name="HelpFragment__tell_us_why_youre_reaching_out">Dites-nous pourquoi vous nous contactez.</string>
   <!-- Removed by excludeNonTranslatables <string name="HelpFragment__emoji_5" translatable="false">emoji_5</string> -->
   <!-- Removed by excludeNonTranslatables <string name="HelpFragment__emoji_4" translatable="false">emoji_4</string> -->
@@ -3127,7 +3254,7 @@
     <string-array name="HelpFragment__categories_5">
         <item>Veuillez sélectionner une option</item>
         <item>Quelque chose ne fonctionne pas</item>
-        <item>Demande de fonction</item>
+        <item>Suggestion relative aux fonctionnalités</item>
         <item>Question</item>
         <item>Commentaires</item>
         <item>Autre</item>
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Lent</string>
     <string name="preferences__help">Aide</string>
     <string name="preferences__advanced">Avancés</string>
-    <string name="preferences__donate_to_signal">Faire un don à Signal</string>
+    <string name="preferences__donate_to_signal">Faire un don à Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Confidentialité</string>
     <!-- Preference label for stories -->
@@ -3255,12 +3382,12 @@
     <string name="preferences__mms_user_agent">Agent utilisateur MMS</string>
     <string name="preferences__advanced_mms_access_point_names">Paramètres manuels de messagerie multimédia</string>
     <string name="preferences__mmsc_url">URL MMSC</string>
-    <string name="preferences__mms_proxy_host">Hôte du mandataire MMS</string>
-    <string name="preferences__mms_proxy_port">Port du mandataire MMS</string>
+    <string name="preferences__mms_proxy_host">Hôte proxy MMS</string>
+    <string name="preferences__mms_proxy_port">Port proxy MMS</string>
     <string name="preferences__mmsc_username">Nom d’utilisateur MMSC</string>
     <string name="preferences__mmsc_password">Mot de passe MMSC</string>
-    <string name="preferences__sms_delivery_reports">Relevés de remise des textos</string>
-    <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Demander un relevé de remise pour chaque texto envoyé</string>
+    <string name="preferences__sms_delivery_reports">Rapports de remise de SMS</string>
+    <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Demander un rapport de remise pour les SMS envoyés</string>
     <string name="preferences__data_and_storage">Données et espace de stockage</string>
     <string name="preferences__storage">Mémoire</string>
     <string name="preferences__payments">Paiements</string>
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Remplacer l’icône et le nom de l’appli par « %1$s »</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">L’icône et le nom de l’appli seront modifiés au redémarrage de Signal. Les notifications afficheront toujours l’icône et le nom par défaut de Signal.</string>
+    <string name="preferences__app_icon_dialog_description">L’icône et le nom de l’appli seront modifiés au redémarrage de Molly. Les notifications afficheront toujours l’icône et le nom par défaut de Molly.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Sélectionnez l’icône et le nom de l’appli. Ils seront visibles sur l’écran d’accueil et dans le tiroir d’applications de votre téléphone. Les notifications afficheront toujours l’icône et le nom par défaut de Signal. En savoir plus</string>
+    <string name="preferences__app_icon_warning_learn_more">Sélectionnez l’icône et le nom de l’appli. Ils seront visibles sur l’écran d’accueil et dans le tiroir d’applications de votre téléphone. Les notifications afficheront toujours l’icône et le nom par défaut de Molly. En savoir plus</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Les icônes et les noms des applis seront visibles sur l’écran d’accueil et dans le tiroir d’applications de votre téléphone.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Les notifications afficheront toujours l’icône et le nom par défaut de Signal.</string>
+    <string name="preferences__app_icon_notification_warning">Les notifications afficheront toujours l’icône et le nom par défaut de Molly.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">En savoir plus</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3316,8 +3443,8 @@
     <string name="preferences__request_keyboard_to_disable">Demander au clavier de désactiver l’apprentissage personnalisé.</string>
     <string name="preferences__this_setting_is_not_a_guarantee">Ce paramètre n’est pas une garantie et votre clavier peut l’ignorer.</string>
   <!-- Removed by excludeNonTranslatables <string name="preferences__incognito_keyboard_learn_more" translatable="false">https://support.signal.org/hc/articles/360055276112</string> -->
-    <string name="preferences_chats__when_using_mobile_data">En utilisant les données mobiles</string>
-    <string name="preferences_chats__when_using_wifi">En utilisant le WI-FI</string>
+    <string name="preferences_chats__when_using_mobile_data">Via les données mobiles</string>
+    <string name="preferences_chats__when_using_wifi">Via le Wi-Fi</string>
     <string name="preferences_chats__when_roaming">En itinérance</string>
     <string name="preferences_chats__media_auto_download">Téléchargement automatique des médias</string>
     <string name="preferences_chats__message_history">Historique des messages</string>
@@ -3337,8 +3464,12 @@
         <item quantity="other">Toutes les conversations seront réduites de manière permanente pour contenir les %1$s messages les plus récents.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Tout l’historique et tous les contenus multimédias des messages seront irrémédiablement supprimés de votre appareil.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Cela supprimera définitivement tout l’historique des messages et tous les fichiers de cet appareil et des appareils associés.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Voulez-vous vraiment supprimer tout l’historique des messages ?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Tout l’historique des messages sera irrémédiablement effacé. Cette action ne peut être annulée.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Vous allez définitivement supprimer tout l’historique de vos messages de tous vos appareils. Cette action est irréversible.</string>
     <string name="preferences_storage__delete_all_now">Tout supprimer maintenant</string>
     <string name="preferences_storage__forever">Pour toujours</string>
     <string name="preferences_storage__one_year">1 an</string>
@@ -3359,11 +3490,11 @@
     <string name="preferences_chats__chats">Conversations</string>
     <string name="preferences_app_updates__title">Mises à jour de l’appli</string>
     <string name="preferences_data_and_storage__manage_storage">Gérer l\'espace de stockage</string>
-    <string name="preferences_data_and_storage__use_less_data_for_calls">Utiliser moins de données pour les appels</string>
+    <string name="preferences_data_and_storage__use_less_data_for_calls">Limiter la consommation de données lors des appels</string>
     <string name="preferences_data_and_storage__never">Jamais</string>
     <string name="preferences_data_and_storage__wifi_and_mobile_data">Wi-Fi et données mobiles</string>
     <string name="preferences_data_and_storage__mobile_data_only">Données mobiles uniquement</string>
-    <string name="preference_data_and_storage__using_less_data_may_improve_calls_on_bad_networks">Sur les réseaux peu performants, utiliser moins de données pourrait améliorer la qualité des appels</string>
+    <string name="preference_data_and_storage__using_less_data_may_improve_calls_on_bad_networks">Utiliser moins de données peut améliorer la qualité des appels en cas de mauvaise couverture réseau.</string>
     <string name="preferences_notifications__in_chat_sounds">Sons des conversations</string>
     <string name="preferences_notifications__show">Afficher</string>
     <string name="preferences_notifications__ringtone">Sonnerie</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Contournement de la censure</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Contournement de la censure</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Si cette option est activée, Signal tentera de contourner la censure. N’activez cette fonction que si vous êtes situé en un lieu où Signal est censurée.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Si cette option est activée, Molly tentera de contourner la censure. N’activez cette fonction que si vous êtes situé en un lieu où Molly est censurée.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Le contournement de la censure a été activé d’après le numéro de téléphone de votre compte.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3387,22 +3518,22 @@
     <string name="preferences_communication__category_sealed_sender">Expéditeur scellé</string>
     <string name="preferences_communication__sealed_sender_allow_from_anyone">Autoriser de n’importe qui</string>
     <string name="preferences_communication__sealed_sender_allow_from_anyone_description">Activer l’option « expéditeur scellé » pour les messages entrants provenant d’expéditeurs qui ne sont pas dans vos contacts et de personnes avec qui vous n’avez pas partagé votre profil.</string>
-    <string name="preferences_proxy">Mandataire</string>
-    <string name="preferences_use_proxy">Utiliser un mandataire</string>
+    <string name="preferences_proxy">Proxy</string>
+    <string name="preferences_use_proxy">Utiliser un proxy</string>
     <string name="preferences_off">Désactivé</string>
     <string name="preferences_on">Activé</string>
-    <string name="preferences_proxy_address">Adresse du mandataire</string>
-    <string name="preferences_only_use_a_proxy_if">N’utilisez un mandataire que si vous n’arrivez pas à vous connecter à Signal par les données mobiles ou par Wi-Fi.</string>
+    <string name="preferences_proxy_address">Adresse du proxy</string>
+    <string name="preferences_only_use_a_proxy_if">N’utilisez un proxy que s’il vous est impossible de vous connecter à Signal via les données mobiles ou via le Wi-Fi.</string>
     <string name="preferences_share">Partager</string>
     <string name="preferences_save">Enregistrer</string>
-    <string name="preferences_connecting_to_proxy">Connexion au mandataire…</string>
-    <string name="preferences_connected_to_proxy">Connectée au mandataire</string>
+    <string name="preferences_connecting_to_proxy">Connexion au proxy…</string>
+    <string name="preferences_connected_to_proxy">Vous êtes connecté au proxy.</string>
     <string name="preferences_connection_failed">Échec de connexion</string>
-    <string name="preferences_couldnt_connect_to_the_proxy">Impossible de se connecter au mandataire. Veuillez vérifier l’adresse du mandataire et réessayer.</string>
-    <string name="preferences_you_are_connected_to_the_proxy">Signal est connectée au mandataire. Vous pouvez désactiver le mandataire n’importe quand dans les paramètres.</string>
+    <string name="preferences_couldnt_connect_to_the_proxy">Impossible de se connecter au proxy. Veuillez vérifier l’adresse du proxy et réessayer.</string>
+    <string name="preferences_you_are_connected_to_the_proxy">Vous êtes connecté au proxy. Vous pouvez désactiver le proxy à tout moment depuis les paramètres.</string>
     <string name="preferences_success">Réussite</string>
     <string name="preferences_failed_to_connect">Échec de connexion</string>
-    <string name="preferences_enter_proxy_address">Saisissez l’adresse du mandataire</string>
+    <string name="preferences_enter_proxy_address">Saisissez l’adresse du proxy</string>
     <!-- Preference title for changing navigation (bottom) bar size -->
     <string name="preferences_navigation_bar_size">Taille de la barre de navigation</string>
     <!-- Preference summary for normal navigation bar size -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Découvrez la fonction de paiements</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Utilisez Signal pour envoyer et recevoir des MobileCoin, une monnaie numérique visant à protéger vos données. Activez pour commencer.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Utilisez Molly pour envoyer et recevoir des MobileCoin, une monnaie numérique visant à protéger vos données. Activez pour commencer.</string>
     <string name="PaymentsHomeFragment__activate_payments">Activer les paiements</string>
     <string name="PaymentsHomeFragment__activating_payments">Activation des paiements…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Récupérer un compte de paiement</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Paiements n’est pas disponible dans votre région.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Échec de l’activation des paiements. Veuillez réessayer plus tard.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Désactiver Paiements ?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Vous ne pourrez plus ni envoyer ni recevoir de MobileCoin dans Signal si vous désactivez les paiements.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Vous ne pourrez plus ni envoyer ni recevoir de MobileCoin dans Molly si vous désactivez les paiements.</string>
     <string name="PaymentsHomeFragment__deactivate">Désactiver</string>
     <string name="PaymentsHomeFragment__continue">Poursuivre</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Le solde n’est pas disponible actuellement.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Détails</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Vous pouvez désormais utiliser Signal pour envoyer et recevoir des MobileCoin. Tous les paiements sont soumis aux conditions d’utilisation de MobileCoins et de MobileCoin Wallet. Des problèmes pourraient survenir. Les paiements et les soldes que vous pourriez perdre sont irrécupérables. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Vous pouvez désormais utiliser Molly pour envoyer et recevoir des MobileCoin. Tous les paiements sont soumis aux conditions d’utilisation de MobileCoins et de MobileCoin Wallet. Des problèmes pourraient survenir. Les paiements et les soldes que vous pourriez perdre sont irrécupérables. </string>
     <string name="PaymentsHomeFragment__activate">Activer</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Afficher les CGU de MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Les paiements ne sont plus proposés dans Signal. Vous pouvez encore transférer des fonds vers une plateforme de change, mais vous ne pouvez plus ni envoyer, ni recevoir de paiements, ni ajouter de fonds.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Les paiements ne sont plus proposés dans Molly. Vous pouvez encore transférer des fonds vers une plateforme de change, mais vous ne pouvez plus ni envoyer, ni recevoir de paiements, ni ajouter de fonds.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Activer les autorisations</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Afin de vous aider à envoyer un message aux personnes que vous connaissez, Signal exige d’activer ces autorisations. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Afin de vous aider à envoyer un message aux personnes que vous connaissez, Molly exige d’activer ces autorisations. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Notifications</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Suivant</string>
     <string name="PaymentsTransferFragment__invalid_address">Adresse invalide</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Vérifiez l’adresse de porte-monnaie vers laquelle vous tentez de faire un transfert, puis réessayez.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Vous ne pouvez pas effectuer de transferts vers l’adresse de votre propre porte-monnaie Signal. Saisissez l’adresse de porte-monnaie de votre compte sur une plateforme de change prise en charge.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Pour lire un code QR, Signal a besoin d’accéder à l’appareil photo.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal a besoin de l’autorisation Appareil photo afin de capturer un code QR. Veuillez accéder aux paramètres, sélectionnez Autorisations et activez Appareil photo.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Pour lire un code QR, Signal a besoin d’accéder à l’appareil photo.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Vous ne pouvez pas effectuer de transferts vers l’adresse de votre propre porte-monnaie Molly. Saisissez l’adresse de porte-monnaie de votre compte sur une plateforme de change prise en charge.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Pour lire un code QR, Molly a besoin d’accéder à l’appareil photo.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly a besoin de l’autorisation Appareil photo afin de capturer un code QR. Veuillez accéder aux paramètres, sélectionnez Autorisations et activez Appareil photo.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Pour lire un code QR, Molly a besoin d’accéder à l’appareil photo.</string>
     <string name="PaymentsTransferFragment__settings">Paramètres</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3675,8 +3806,8 @@
 
     <!-- Heading which shows how many messages are currently selected -->
     <plurals name="conversation_context__s_selected">
-        <item quantity="one">%1$d sélectionné</item>
-        <item quantity="other">%1$d sélectionnés</item>
+        <item quantity="one">%1$d message sélectionné</item>
+        <item quantity="other">%1$d messages sélectionnés</item>
     </plurals>
 
     <!-- conversation_context_image -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Appel vocal Signal entrant</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Appel vocal Molly entrant</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Appel vidéo Signal entrant</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Appel vidéo Molly entrant</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Appel de groupe entrant sur Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Appel de groupe entrant sur Molly</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Appel vocal Signal en cours</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Appel vocal Molly en cours</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Appel vidéo Signal en cours</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Appel vidéo Molly en cours</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Appel de groupe Signal en cours</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Appel de groupe Molly en cours</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Chargement…</string>
@@ -3989,12 +4120,12 @@
     <string name="BackupDialog_verify">Confirmer</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Vous avez saisi avec succès la phrase de passe de votre sauvegarde</string>
     <string name="BackupDialog_passphrase_was_not_correct">La phrase de passe était erronée</string>
-    <string name="LocalBackupJob_creating_signal_backup">Création de la sauvegarde de Signal…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Création de la sauvegarde de Molly…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Vérification de la sauvegarde Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Vérification de la sauvegarde Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">La sauvegarde a échoué</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Votre répertoire de sauvegarde a été supprimé ou déplacé.</string>
-    <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Votre fichier de sauvegarde est trop gros pour être enregistré sur ce volume.</string>
+    <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Votre fichier de sauvegarde est trop volumineux pour être enregistré sur ce volume.</string>
     <string name="LocalBackupJobApi29_there_is_not_enough_space">Il manque d’espace pour enregistrer votre sauvegarde.</string>
     <!-- Error message shown if a newly created backup could not be verified as accurate -->
     <string name="LocalBackupJobApi29_your_backup_could_not_be_verified">La création et la vérification de votre dernière sauvegarde ont échoué. Veuillez réessayer.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Appelez-moi dans (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Renvoyer un code (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Contacter l’assistance de Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Inscription à Signal – Code de confirmation pour Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Contacter l’assistance de Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Inscription à Molly – Code de confirmation pour Android</string>
     <string name="RegistrationActivity_incorrect_code">Code incorrect</string>
     <string name="BackupUtil_never">Jamais</string>
     <string name="BackupUtil_unknown">Inconnu</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Numéro de téléphone</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Choisissez qui peut voir votre numéro de téléphone et qui peut l’utiliser pour vous rechercher sur Signal.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Choisissez qui peut voir votre numéro de téléphone et qui peut l’utiliser pour vous rechercher sur Molly.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Qui peut voir mon numéro de téléphone</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Vous avez fait trop d’essais. Veuillez réessayer plus tard.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Erreur de connexion au service</string>
     <string name="preferences_chats__backups">Sauvegardes</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal est verrouillée</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly est verrouillée</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">TOUCHEZ POUR DÉVERROUILLER</string>
     <string name="Recipient_unknown">Inconnu</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4071,7 +4202,7 @@
     <!-- Option in settings that will take use to re-register if they are no longer registered -->
     <string name="preferences_account_reregister">Réinscrire le compte</string>
     <!-- Option in settings that will take user to our website or playstore to update their expired build -->
-    <string name="preferences_account_update_signal">Mettre Signal à jour</string>
+    <string name="preferences_account_update_signal">Installer la dernière version de Signal</string>
     <!-- Option in settings shown when user is no longer registered or expired client that will WIPE ALL THEIR DATA -->
     <string name="preferences_account_delete_all_data">Supprimer toutes les données</string>
     <!-- Title for confirmation dialog confirming user wants to delete all their data -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Vous avez besoin d’accéder à votre ancien appareil.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Restaurer depuis une sauvegarde</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Restaurez vos messages depuis une sauvegarde locale. Si vous ne les restaurez pas maintenant, vous ne pourrez pas le faire plus tard.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Récupérer une sauvegarde locale</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Récupérer une sauvegarde Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Récupérer tous vos messages + vos médias des 30 derniers jours</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Plus d’options</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Annuler</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Se connecter sans transfert</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Continuer sans transférer vos messages et médias</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Ouvrez Signal sur votre ancien téléphone Android</string>
     <string name="NewDeviceTransferInstructions__continue">Poursuivre</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Préparation de la connexion à votre ancien appareil Android…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Cela prend un moment, mais ça devrait bientôt être prêt</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Attente de connexion de l’ancien appareil Android…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal a besoin de l’autorisation de localisation pour découvrir et se connecter à votre ancien appareil Android.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal nécessite l’activation des services de localisation pour découvrir et se connecter à votre ancien appareil Android.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Le Wi-Fi doit être activé pour que Signal découvre votre ancien appareil Android et s’y connecte. Le Wi-Fi doit être activé, mais il n’a pas à être connecté à un réseau Wi-Fi.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Désolé, il semble que cet appareil ne prend pas Wi-Fi Direct en charge. Signal utilise Wi-Fi Direct pour découvrir votre ancien appareil Android et s’y connecter. Il vous est aussi possible de restaurer une sauvegarde pour récupérer votre compte de votre ancien appareil Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly a besoin de l’autorisation de localisation pour découvrir et se connecter à votre ancien appareil Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly nécessite l’activation des services de localisation pour découvrir et se connecter à votre ancien appareil Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Le Wi-Fi doit être activé pour que Molly découvre votre ancien appareil Android et s’y connecte. Le Wi-Fi doit être activé, mais il n’a pas à être connecté à un réseau Wi-Fi.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Il semblerait que cet appareil soit incompatible avec le Wi-Fi Direct. Molly utilise le Wi-Fi Direct pour détecter votre ancien appareil Android et s’y connecter. Pour récupérer votre compte depuis votre ancien appareil Android, vous avez toujours la possibilité de restaurer une sauvegarde.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Restaurer une sauvegarde</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Une erreur inattendu s’est produite lors de la tentative de connexion à votre ancien appareil Android.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Recherche d’un nouvel appareil Android…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal a besoin de l’autorisation Localisation pour découvrir votre ancien appareil Android et s’y connecter.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal a besoin que les services de localisation soient activés pour découvrir votre ancien appareil Android et s’y connecter.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Le Wi-Fi doit être activé pour que Signal découvre votre nouvel appareil Android et s’y connecte. Le Wi-Fi doit être activé, mais il n’a pas à être connecté à un réseau Wi-Fi.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Désolé, il semble que cet appareil ne prend pas Wi-Fi Direct en charge. Signal utilise Wi-Fi Direct pour découvrir votre nouvel appareil Android et s’y connecter. Il vous est toujours possible de créer une sauvegarde pour restaurer votre compte sur votre nouvel appareil Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly a besoin de l’autorisation Localisation pour découvrir votre ancien appareil Android et s’y connecter.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly a besoin que les services de localisation soient activés pour découvrir votre ancien appareil Android et s’y connecter.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Le Wi-Fi doit être activé pour que Molly découvre votre nouvel appareil Android et s’y connecte. Le Wi-Fi doit être activé, mais il n’a pas à être connecté à un réseau Wi-Fi.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Il semblerait que cet appareil soit incompatible avec le Wi-Fi•Direct. Molly utilise le Wi-Fi Direct pour détecter votre ancien appareil Android et s’y connecter. Pour récupérer votre compte sur votre nouvel appareil Android, vous avez toujours la possibilité d’effectuer une sauvegarde.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Créer une sauvegarde</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Une erreur inattendue s’est produite lors de la tentative de connexion à votre nouvel appareil Android.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Transfert des données</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Gardez les deux appareils proches l’un de l’autre. N’éteignez ni l’un ni l’autre des appareils et gardez Signal ouvert. Les transferts sont chiffrés de bout en bout.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Gardez les deux appareils proches l’un de l’autre. N’éteignez ni l’un ni l’autre des appareils et gardez Molly ouvert. Les transferts sont chiffrés de bout en bout.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d messages jusqu’à présent…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% messages jusqu’à présent…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Transférer le compte</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Téléchargez Signal sur votre nouvel appareil Android</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Téléchargez Molly sur votre nouvel appareil Android</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Appuyez sur « Transférer ou restaurer le compte »"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Toute personne disposant de ce lien peut visualiser le nom et la photo du groupe et demander à s’y joindre. Partagez-le avec les personnes en qui vous avez confiance.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Toute personne disposant de ce lien peut visualiser le nom et la photo du groupe et s’y joindre. Partagez-le avec les personnes en qui vous avez confiance.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Partager avec Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Partager avec Molly</string>
     <string name="GroupLinkBottomSheet_copy">Copier</string>
     <string name="GroupLinkBottomSheet_qr_code">Code QR</string>
     <string name="GroupLinkBottomSheet_share">Partager</string>
@@ -4437,11 +4575,11 @@
     <string name="payment_info_card_about_mobilecoin">À propos de MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin est une nouvelle monnaie numérique axée sur la protection des données personnelles.</string>
     <string name="payment_info_card_adding_funds">Ajouter des fonds</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Vous pouvez ajouter des fonds à utiliser dans Signal en envoyant des MobileCoin à l’adresse de votre portefeuille.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Vous pouvez ajouter des fonds à utiliser dans Molly en envoyant des MobileCoin à l’adresse de votre portefeuille.</string>
     <string name="payment_info_card_cashing_out">Encaisser</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Vous pouvez encaisser des MobileCoins n’importe quand sur une plateforme de change qui accepte les MobileCoins. Il vous suffit d’effectuer un transfert vers votre compte sur cette plateforme de change.</string>
-    <string name="payment_info_card_hide_this_card">Cacher cette carte ?</string>
-    <string name="payment_info_card_hide">Cacher</string>
+    <string name="payment_info_card_hide_this_card">Masquer cette carte ?</string>
+    <string name="payment_info_card_hide">Masquer</string>
     <!-- Title of save recovery phrase card -->
     <string name="payment_info_card_save_recovery_phrase">Enregistrer une phrase de récupération</string>
     <string name="payment_info_card_your_recovery_phrase_gives_you">La phrase de récupération est un autre moyen de restaurer votre compte de paiement.</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Désactiver le portefeuille</string>
     <string name="DeactivateWalletFragment__your_balance">Votre solde</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Il est recommandé de transférer vos fonds vers une autre adresse de portefeuille avant de désactiver les paiements. Si vous choisissez de ne pas transférer vos fonds maintenant, ils resteront dans votre portefeuille lié à Signal si vous réactivez les paiements.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Il est recommandé de transférer vos fonds vers une autre adresse de portefeuille avant de désactiver les paiements. Si vous choisissez de ne pas transférer vos fonds maintenant, ils resteront dans votre portefeuille lié à Molly si vous réactivez les paiements.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Transférer le solde restant</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Désactiver dans transférer</string>
     <string name="DeactivateWalletFragment__deactivate">Désactiver</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Désactiver sans transférer ?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Votre solde restera dans votre porte-monnaie lié à Signal si vous choisissez de réactiver les paiements.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Votre solde restera dans votre porte-monnaie lié à Molly si vous choisissez de réactiver les paiements.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Erreur lors de la désactivation du portefeuille.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4510,7 +4648,7 @@
     <string name="PaymentsRecoveryPhraseFragment__your_recovery_phrase">Votre phrase de récupération</string>
     <string name="PaymentsRecoveryPhraseFragment__write_down_the_following_d_words">Notez les %1$d mots suivants dans l’ordre. Conservez votre liste dans un endroit sûr.</string>
     <string name="PaymentsRecoveryPhraseFragment__make_sure_youve_entered">Assurez-vous d’avoir correctement saisi votre phrase.</string>
-    <string name="PaymentsRecoveryPhraseFragment__do_not_screenshot_or_send_by_email">Ne faites pas de capture d’écran et ne l’envoyez pas par courriel.</string>
+    <string name="PaymentsRecoveryPhraseFragment__do_not_screenshot_or_send_by_email">Ne pas enregistrer de capture d’écran, ni envoyer par e-mail.</string>
     <string name="PaymentsRecoveryPhraseFragment__payments_account_restored">Compte Paiements restauré.</string>
     <string name="PaymentsRecoveryPhraseFragment__invalid_recovery_phrase">Phrase de récupération invalide</string>
     <string name="PaymentsRecoveryPhraseFragment__make_sure_youve_entered_your_phrase_correctly_and_try_again">Assurez-vous d’avoir correctement saisi votre phrase et réessayez.</string>
@@ -4549,7 +4687,7 @@
     <string name="GroupsInCommonMessageRequest__okay">Valider</string>
   <!-- Removed by excludeNonTranslatables <string name="GroupsInCommonMessageRequest__support_article" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <string name="ChatColorSelectionFragment__heres_a_preview_of_the_chat_color">Voici un aperçu de la couleur de la conversation.</string>
-    <string name="ChatColorSelectionFragment__the_color_is_visible_to_only_you">La couleur n’est visible que par vous.</string>
+    <string name="ChatColorSelectionFragment__the_color_is_visible_to_only_you">Vous seul pouvez voir cette couleur.</string>
 
     <!-- GroupDescriptionDialog -->
     <string name="GroupDescriptionDialog__group_description">Description du groupe</string>
@@ -4582,7 +4720,7 @@
     <!-- Part of requesting account data flow, this is the section title for requesting that account data -->
     <string name="ExportAccountDataFragment__your_account_data">Données du compte</string>
     <!-- Explanation of account data the user can request. %1$s is replaced with Learn more with a link -->
-    <string name="ExportAccountDataFragment__export_explanation">Exporter un rapport contenant les données de votre compte Signal. Ce rapport ne contient aucun message ou contenu multimédia. %1$s</string>
+    <string name="ExportAccountDataFragment__export_explanation">Exporter un rapport contenant les données de votre compte Signal. Ce rapport ne contient aucun message ni contenu multimédia. %1$s</string>
     <!-- Learn more link to more information about requesting account data -->
     <string name="ExportAccountDataFragment__learn_more">En savoir plus</string>
     <!-- Button action to export the report data to another app (e.g. email) -->
@@ -4603,7 +4741,7 @@
     <!-- Acknowledgement for download failure -->
     <string name="ExportAccountDataFragment__ok_action">OK</string>
     <!-- Title of dialog shown when report fails to generate -->
-    <string name="ExportAccountDataFragment__report_generation_failed">Impossible de générer un rapport</string>
+    <string name="ExportAccountDataFragment__report_generation_failed">Impossible de générer le rapport</string>
     <!-- Message of dialog shown when report fails to generate asking user to check network connection -->
     <string name="ExportAccountDataFragment__check_network">Vérifiez votre connexion et réessayez.</string>
 
@@ -4617,7 +4755,7 @@
     <!-- Shown in a dialog with a spinner while the report is downloading -->
     <string name="ExportAccountDataFragment__download_progress">Création du rapport…</string>
     <!-- Explanation that the report is only generated on export and is not saved on the device -->
-    <string name="ExportAccountDataFragment__report_not_stored_disclaimer">Le rapport est généré uniquement lors de l’exportation et n’est pas stocké par Signal sur votre appareil.</string>
+    <string name="ExportAccountDataFragment__report_not_stored_disclaimer">Le rapport n’est généré qu’au moment de l’exportation et Signal ne le stocke pas sur votre appareil.</string>
 
     <!-- ChangeNumberFragment -->
     <string name="ChangeNumberFragment__use_this_to_change_your_current_phone_number_to_a_new_phone_number">Utilisez cette fonction pour changer votre numéro de téléphone actuel pour un nouveau. Vous ne pouvez pas annuler ce changement.\nAvant de continuer, assurez-vous que votre nouveau numéro puisse recevoir des SMS ou des appels.</string>
@@ -4757,8 +4895,8 @@
     <string name="HelpSettingsFragment__debug_log">Journal de débogage</string>
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licences</string>
-    <string name="HelpSettingsFragment__terms_amp_privacy_policy">Conditions générales et politique de confidentialité</string>
-    <string name="HelpFragment__copyright_signal_messenger">Tous droits réservés Messagerie Signal</string>
+    <string name="HelpSettingsFragment__terms_amp_privacy_policy">Conditions générales et règles de confidentialité</string>
+    <string name="HelpFragment__copyright_signal_messenger">Copyright Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Sous licence GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4805,7 +4943,7 @@
     <!-- Title text for prompt to donate. Shown in a popup at the bottom of the chat list. -->
     <string name="Donate2022Q2Megaphone_donate_to_signal">Faire un don à Signal</string>
     <!-- Body text for prompt to donate. Shown in a popup at the bottom of the chat list. -->
-    <string name="Donate2022Q2Megaphone_signal_is_powered_by_people_like_you">Signal est alimenté par des personnes comme vous. Faites un don mensuel et recevez un macaron.</string>
+    <string name="Donate2022Q2Megaphone_signal_is_powered_by_people_like_you">Signal dépend de personnes comme vous. Faites un don mensuel et recevez un macaron.</string>
     <!-- Button label that brings a user to the donate screen. Shown in a popup at the bottom of the chat list. -->
     <string name="Donate2022Q2Megaphone_donate">Faire un don</string>
     <!-- Button label that dismissed a prompt to donate. Shown in a popup at the bottom of the chat list. -->
@@ -4828,7 +4966,7 @@
     <!-- BecomeASustainerMegaphone -->
     <string name="BecomeASustainerMegaphone__become_a_sustainer">Devenir donateur mensuel</string>
     <!-- Displayed in the Become a Sustainer megaphone -->
-    <string name="BecomeASustainerMegaphone__signal_is_powered_by">Signal est alimenté par des gens comme vous. Faites un don et recevez un macaron.</string>
+    <string name="BecomeASustainerMegaphone__signal_is_powered_by">Signal dépend de personnes comme vous. Faites un don et recevez un macaron.</string>
     <string name="BecomeASustainerMegaphone__not_now">Plus tard</string>
     <string name="BecomeASustainerMegaphone__donate">Faire un don</string>
 
@@ -4853,13 +4991,13 @@
 
     <!-- ConversationSettingsFragment -->
     <!-- Dialog title displayed when non-admin tries to add a story to an audience group -->
-    <string name="ConversationSettingsFragment__cant_add_to_group_story">Vous ne pouvez pas ajouter du contenu à une Story de groupe</string>
+    <string name="ConversationSettingsFragment__cant_add_to_group_story">Impossible d’ajouter du contenu à une story de groupe</string>
     <!-- Dialog message displayed when non-admin tries to add a story to an audience group -->
-    <string name="ConversationSettingsFragment__only_admins_of_this_group_can_add_to_its_story">Les administrateurs de ce groupe sont les seuls à pouvoir ajouter du contenu à la Story de groupe</string>
+    <string name="ConversationSettingsFragment__only_admins_of_this_group_can_add_to_its_story">Seuls les administrateurs peuvent ajouter du contenu à la story du groupe</string>
     <!-- Error toasted when no activity can handle the add contact intent -->
     <string name="ConversationSettingsFragment__contacts_app_not_found">Application Contacts non trouvée</string>
     <string name="ConversationSettingsFragment__start_video_call">Lancer un appel vidéo</string>
-    <string name="ConversationSettingsFragment__start_audio_call">Démarrer un appel vocal</string>
+    <string name="ConversationSettingsFragment__start_audio_call">Passer un appel vocal</string>
     <!-- Button label with hyphenation. Translation can use soft hyphen - Unicode U+00AD -->
     <string name="ConversationSettingsFragment__story">Story</string>
     <!-- Button label with hyphenation. Translation can use soft hyphen - Unicode U+00AD -->
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Choisir une couleur</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">Texto</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Partager</string>
 
@@ -5035,20 +5170,21 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Seuls les administrateurs peuvent envoyer des messages à ce groupe.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Limite atteinte</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Impossible de sélectionner plus de 5 conversations.</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
-    <string name="MediaReviewFragment__add_to_the_group_story">Ajouter « %1$s » à la Story de groupe</string>
+    <string name="MediaReviewFragment__add_to_the_group_story">Ajouter à la story de groupe « %1$s »</string>
     <!-- Positive dialog action when sending a story via an add to group story button -->
-    <string name="MediaReviewFragment__add_to_story">Ajouter à la Story</string>
+    <string name="MediaReviewFragment__add_to_story">Ajouter à la story</string>
     <string name="MediaReviewFragment__add_a_message">Ajouter un message</string>
     <string name="MediaReviewFragment__add_a_reply">Ajouter une réponse</string>
     <string name="MediaReviewFragment__send_to">Envoyer à</string>
     <string name="MediaReviewFragment__view_once_message">Média à vue unique</string>
-    <string name="MediaReviewFragment__one_or_more_items_were_too_large">Un élément ou plus étaient trop grands</string>
+    <string name="MediaReviewFragment__one_or_more_items_were_too_large">Un ou plusieurs fichiers sont trop volumineux.</string>
     <string name="MediaReviewFragment__one_or_more_items_were_invalid">Un élément ou plus étaient invalides</string>
-    <string name="MediaReviewFragment__too_many_items_selected">Trop d’éléments sélectionnés</string>
+    <string name="MediaReviewFragment__too_many_items_selected">Vous avez sélectionné un trop grand nombre d’éléments</string>
     <!-- Small notification presented to the user when they set their video to view-once mode -->
     <string name="MediaReviewFragment__video_set_to_view_once">Vue unique activée pour cette vidéo</string>
     <!-- Small notification presented to the user when they set their photo to view-once mode -->
@@ -5150,13 +5286,13 @@
     <string name="Subscription__expires_s">Expire le %1$s</string>
 
     <!-- Title of learn more sheet -->
-    <string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_different">Signal est différent.</string>
+    <string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_different">Une messagerie pas comme les autres.</string>
     <!-- First small text blurb on learn more sheet -->
-    <string name="SubscribeLearnMoreBottomSheetDialogFragment__private_messaging">Messagerie privée. Aucune publicité, aucun traqueur, aucune surveillance.</string>
+    <string name="SubscribeLearnMoreBottomSheetDialogFragment__private_messaging">Signal est une messagerie (vraiment) privée. Sans publicité, sans cookie de suivi, sans surveillance. </string>
     <!-- Second small text blurb on learn more sheet -->
-    <string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_supported_by">Signal étant financé par des dons, votre vie privée est au centre de nos préoccupations. Signal est construit pour vous et non pour notre profit ou pour que nous puissions collecter vos données.</string>
+    <string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_supported_by">Signal est financé par des dons. Autrement dit, la protection de votre vie privée est au cœur de toutes nos actions. Nous avons conçu Signal pour vous. Pas pour collecter vos données, ni pour accumuler des profits.</string>
     <!-- Third small text blurb on learn more sheet -->
-    <string name="SubscribeLearnMoreBottomSheetDialogFragment__if_you_can">Si vous le pouvez, faites un don sans attendre pour que Signal reste un outil amusant, fiable et disponible pour tous.</string>
+    <string name="SubscribeLearnMoreBottomSheetDialogFragment__if_you_can">Si vous le pouvez, faites un don aujourd’hui pour que Signal reste une messagerie conviviale, fiable et disponible pour tous.</string>
 
     <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__thanks_for_your_support">Merci pour votre soutien !</string>
     <!-- Subtext underneath the dialog title on the thanks sheet -->
@@ -5194,7 +5330,7 @@
     <!-- Dialog message shown when a one-time donation requires verifying/confirmation outside of the app and the user hasn\'t done that yet, placeholder is money amount -->
     <string name="ManageDonationsFragment__your_one_time_s_donation_couldnt_be_confirmed">Votre don ponctuel de %1$s n\'a pas pu être confirmé. Consultez votre application bancaire pour approuver votre paiement iDEAL.</string>
 
-    <string name="Boost__enter_custom_amount">Saisissez un montant personnalisé</string>
+    <string name="Boost__enter_custom_amount">Saisir un montant personnalisé</string>
     <!-- Error label when the amount is smaller than what we can accept -->
     <string name="Boost__the_minimum_amount_you_can_donate_is_s">Le montant minimum que vous pouvez donner est de %1$s</string>
 
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">En savoir plus</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Mettre Signal à jour</string>
+    <string name="UpdateSignalExpiredDialog__title">Installez la dernière version de Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Cette version de Signal a expiré. Mettez Signal à jour pour continuer à utiliser l’appli.</string>
+    <string name="UpdateSignalExpiredDialog__message">Cette version de Molly a expiré. Mettez Molly à jour pour continuer à utiliser l’appli.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Mise à jour</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Appareil non enregistré</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Cet appareil n’est plus enregistré. Inscrivez-vous à nouveau pour continuer à utiliser Signal sur cet appareil.</string>
+    <string name="ReregisterSignalDialog__message">Cet appareil n’est plus enregistré. Inscrivez-vous à nouveau pour continuer à utiliser Molly sur cet appareil.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Réenregistrer l’appareil</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Échec d’ouverture du sélecteur.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Pour activer les notifications, Signal doit être autorisé à les afficher.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Pour activer les notifications, Molly doit être autorisé à les afficher.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Activer</string>
 
@@ -5574,9 +5710,9 @@
     <!-- Displayed when there are no stories to display -->
     <string name="StoriesLandingFragment__no_recent_updates_to_show_right_now">Aucune mise à jour récente à afficher pour l’instant.</string>
     <!-- Context menu option to hide a story -->
-    <string name="StoriesLandingItem__hide_story">Cacher la Story</string>
+    <string name="StoriesLandingItem__hide_story">Masquer la story</string>
     <!-- Context menu option to unhide a story -->
-    <string name="StoriesLandingItem__unhide_story">Afficher la Story</string>
+    <string name="StoriesLandingItem__unhide_story">Afficher la story</string>
     <!-- Context menu option to forward a story -->
     <string name="StoriesLandingItem__forward">Transférer</string>
     <!-- Context menu option to share a story -->
@@ -5596,15 +5732,15 @@
     <!-- Status label when a story fails to send indicating user action to retry -->
     <string name="StoriesLandingItem__tap_to_retry">Appuyez pour réessayer</string>
     <!-- Title of dialog confirming decision to hide a story -->
-    <string name="StoriesLandingFragment__hide_story">Cacher la story ?</string>
+    <string name="StoriesLandingFragment__hide_story">Masquer la story ?</string>
     <!-- Message of dialog confirming decision to hide a story -->
     <string name="StoriesLandingFragment__new_story_updates">Les nouvelles Stories de %1$s n’apparaîtront plus en haut de la liste des Stories.</string>
     <!-- Positive action of dialog confirming decision to hide a story -->
-    <string name="StoriesLandingFragment__hide">Cacher</string>
+    <string name="StoriesLandingFragment__hide">Masquer</string>
     <!-- Displayed in Snackbar after story is hidden -->
-    <string name="StoriesLandingFragment__story_hidden">La story a été cachée</string>
+    <string name="StoriesLandingFragment__story_hidden">Story masquée</string>
     <!-- Section header for hidden stories -->
-    <string name="StoriesLandingFragment__hidden_stories">Stories cachées</string>
+    <string name="StoriesLandingFragment__hidden_stories">Stories masquées</string>
     <!-- Displayed on each sent story under My Stories -->
     <plurals name="MyStories__d_views">
         <item quantity="one">%1$d vue</item>
@@ -5617,7 +5753,7 @@
     <!-- Title of dialog to confirm deletion of story -->
     <string name="MyStories__delete_story">Supprimer la story ?</string>
     <!-- Message of dialog to confirm deletion of story -->
-    <string name="MyStories__this_story_will_be_deleted">Cette Story sera supprimée pour vous et quiconque l’a reçue.</string>
+    <string name="MyStories__this_story_will_be_deleted">Cette story sera supprimée pour vous et tous ses destinataires.</string>
     <!-- Toast shown when story media cannot be saved -->
     <string name="MyStories__unable_to_save">Échec de la sauvegarde</string>
     <!-- Displayed at bottom of story viewer when current item has views -->
@@ -5665,22 +5801,24 @@
     <!-- Displayed when a story has no replies yet -->
     <string name="StoryGroupReplyFragment__no_replies_yet">Aucune réponse pour le moment</string>
     <!-- Displayed when no longer a group member -->
-    <string name="StoryGroupReplyFragment__you_cant_reply">Vous ne pouvez pas interagir sur cette Story, car vous n\'êtes plus membre de ce groupe.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">A réagi à la Story</string>
+    <string name="StoryGroupReplyFragment__you_cant_reply">Vous ne pouvez pas interagir avec cette story, car vous n\'êtes plus membre de ce groupe.</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">avez réagi à la story</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">a réagi à la story</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Vues</string>
     <!-- Label for story replies tab -->
     <string name="StoryViewsAndRepliesDialogFragment__replies">Réponses</string>
     <!-- Description of action for reaction button -->
-    <string name="StoryReplyComposer__react_to_this_story">Réagir à cette Story</string>
+    <string name="StoryReplyComposer__react_to_this_story">Réagir à cette story</string>
     <!-- Displayed when the user is replying privately to someone who replied to one of their stories -->
     <string name="StoryReplyComposer__reply_to_s">Répondre à %1$s</string>
     <!-- Context menu item to privately reply to a story response -->
     <!-- Context menu item to copy a story response -->
     <string name="StoryGroupReplyItem__copy">Copier</string>
     <!-- Context menu item to delete a story response -->
-    <string name="StoryGroupReplyItem__delete">Effacer</string>
+    <string name="StoryGroupReplyItem__delete">Supprimer</string>
     <!-- Page title for My Story options -->
     <string name="MyStorySettingsFragment__my_story">Ma story</string>
     <!-- Number of total signal connections displayed in "All connections" row item -->
@@ -5699,7 +5837,7 @@
     <!-- Privacy setting title for sending stories to all except the specified connections -->
     <string name="MyStorySettingsFragment__all_except">Tous mes contacts Signal, sauf…</string>
     <!-- Privacy setting description for sending stories to all except the specified connections -->
-    <string name="MyStorySettingsFragment__hide_your_story_from_specific_people">Cacher votre Story de certains contacts</string>
+    <string name="MyStorySettingsFragment__hide_your_story_from_specific_people">Masquer votre story pour certains contacts</string>
     <!-- Summary of clickable option displaying how many people you have excluded from your story -->
     <plurals name="MyStorySettingsFragment__d_people_excluded">
         <item quantity="one">%1$d personne exclue</item>
@@ -5721,7 +5859,7 @@
     <!-- Switchable option for allowing replies and reactions on your stories -->
     <string name="MyStorySettingsFragment__allow_replies_amp_reactions">Autoriser les réponses et réactions</string>
     <!-- Summary for switchable option allowing replies and reactions on your story -->
-    <string name="MyStorySettingsFragment__let_people_who_can_view_your_story_react_and_reply">Autoriser les contacts qui peuvent voir votre story à y réagir et à y répondre</string>
+    <string name="MyStorySettingsFragment__let_people_who_can_view_your_story_react_and_reply">Les spectateurs de votre story peuvent y réagir et y répondre.</string>
     <!-- Signal connections bolded text in the Signal Connections sheet -->
     <string name="SignalConnectionsBottomSheet___signal_connections">Contacts Signal</string>
     <!-- Displayed at the top of the signal connections sheet. Please remember to insert strong tag as required. -->
@@ -5737,19 +5875,19 @@
     <!-- Clickable option to add a viewer to a custom story -->
     <string name="PrivateStorySettingsFragment__add_viewer">Ajouter un spectateur</string>
     <!-- Clickable option to delete a custom story -->
-    <string name="PrivateStorySettingsFragment__delete_custom_story">Supprimer la Story personnalisée</string>
+    <string name="PrivateStorySettingsFragment__delete_custom_story">Supprimer la story personnalisée</string>
     <!-- Dialog title when attempting to remove someone from a custom story -->
     <string name="PrivateStorySettingsFragment__remove_s">Retirer %1$s ?</string>
     <!-- Dialog message when attempting to remove someone from a custom story -->
-    <string name="PrivateStorySettingsFragment__this_person_will_no_longer">Cette personne ne verra plus votre Story.</string>
+    <string name="PrivateStorySettingsFragment__this_person_will_no_longer">Ce contact n’aura plus accès à votre story.</string>
     <!-- Positive action label when attempting to remove someone from a custom story -->
     <string name="PrivateStorySettingsFragment__remove">Retirer</string>
     <!-- Dialog title when deleting a custom story -->
     <!-- Dialog message when deleting a custom story -->
     <!-- Page title for editing a custom story name -->
-    <string name="EditPrivateStoryNameFragment__edit_story_name">Modifier le nom de la Story</string>
+    <string name="EditPrivateStoryNameFragment__edit_story_name">Modifier le titre de la story</string>
     <!-- Input field hint when editing a custom story name -->
-    <string name="EditPrivateStoryNameFragment__story_name">Nom de la story</string>
+    <string name="EditPrivateStoryNameFragment__story_name">Titre de la story</string>
     <!-- Save button label when editing a custom story name -->
     <!-- Displayed in text post creator before user enters text -->
     <string name="TextStoryPostCreationFragment__tap_to_add_text">Touchez pour ajouter du texte</string>
@@ -5765,7 +5903,7 @@
     <!-- Hint for entering a URL for a text post -->
     <string name="TextStoryPostLinkEntryFragment__type_or_paste_a_url">Tapez ou collez une URL</string>
     <!-- Displayed prior to the user entering a URL for a text post -->
-    <string name="TextStoryPostLinkEntryFragment__share_a_link_with_viewers_of_your_story">Partager un lien avec les personnes qui voient votre Story</string>
+    <string name="TextStoryPostLinkEntryFragment__share_a_link_with_viewers_of_your_story">Partager un lien avec les spectateurs de votre story</string>
     <!-- Hint text for searching for a story text post recipient. -->
     <string name="TextStoryPostSendFragment__search">Rechercher</string>
     <!-- Toast shown when an unexpected error occurs while sending a text story -->
@@ -5778,15 +5916,15 @@
     <!-- Done button label for hide story from screen -->
     <string name="HideStoryFromFragment__done">Terminé</string>
     <!-- Dialog title for removing a group story -->
-    <string name="StoryDialogs__remove_group_story">Supprimer la Story de groupe ?</string>
+    <string name="StoryDialogs__remove_group_story">Supprimer cette story de groupe ?</string>
     <!-- Dialog message for removing a group story -->
     <string name="StoryDialogs__s_will_be_removed">« %1$s » sera supprimée.</string>
     <!-- Dialog positive action for removing a group story -->
     <string name="StoryDialogs__remove">Supprimer</string>
     <!-- Dialog title for deleting a custom story -->
-    <string name="StoryDialogs__delete_custom_story">Supprimer la Story personnalisée ?</string>
+    <string name="StoryDialogs__delete_custom_story">Supprimer la story personnalisée ?</string>
     <!-- Dialog message for deleting a custom story -->
-    <string name="StoryDialogs__s_and_updates_shared">« %1$s » et les nouveaux contenus partagés dans cette Story seront supprimés.</string>
+    <string name="StoryDialogs__s_and_updates_shared">« %1$s » et les nouveaux contenus partagés dans cette story seront supprimés.</string>
     <!-- Dialog positive action for deleting a custom story -->
     <string name="StoryDialogs__delete">Supprimer</string>
     <!-- Dialog title for first time sending something to a beta story -->
@@ -5796,7 +5934,7 @@
     <!-- First time share to story dialog: Positive action to go ahead and add to story -->
     <!-- First time share to story dialog: Neutral action to edit who can view "My Story" -->
     <!-- Error message shown when a failure occurs during story send -->
-    <string name="StoryDialogs__story_could_not_be_sent">La story n’a pas pu être envoyée. Veuillez vérifier votre connexion et réessayer.</string>
+    <string name="StoryDialogs__story_could_not_be_sent">Impossible d’envoyer la story. Vérifiez votre connexion et réessayez.</string>
     <!-- Error message dialog button to resend a previously failed story send -->
     <string name="StoryDialogs__send">Envoyer</string>
     <!-- Action button for turning off stories when stories are present on the device -->
@@ -5813,11 +5951,11 @@
         <item quantity="other">%1$d spectateurs</item>
     </plurals>
     <!-- Name story screen title -->
-    <string name="CreateStoryWithViewersFragment__name_story">Nommer la Story</string>
+    <string name="CreateStoryWithViewersFragment__name_story">Nommer la story</string>
     <!-- Name story screen note under text field -->
-    <string name="CreateStoryWithViewersFragment__only_you_can">Vous seul.e pouvez voir le nom de cette Story.</string>
+    <string name="CreateStoryWithViewersFragment__only_you_can">Vous seul pouvez voir le titre de cette story.</string>
     <!-- Name story screen label hint -->
-    <string name="CreateStoryWithViewersFragment__story_name_required">Nom de la story (requis)</string>
+    <string name="CreateStoryWithViewersFragment__story_name_required">Titre de la story (requis)</string>
     <!-- Name story screen viewers subheading -->
     <string name="CreateStoryWithViewersFragment__viewers">Spectateurs</string>
     <!-- Name story screen create button label -->
@@ -5825,13 +5963,13 @@
     <!-- Name story screen error when save attempted with no label -->
     <string name="CreateStoryWithViewersFragment__this_field_is_required">Ce champ est requis.</string>
     <!-- Name story screen error when save attempted but label is duplicate -->
-    <string name="CreateStoryWithViewersFragment__there_is_already_a_story_with_this_name">Une Story qui porte ce nom existe déjà.</string>
+    <string name="CreateStoryWithViewersFragment__there_is_already_a_story_with_this_name">Titre déjà utilisé pour une autre story.</string>
     <!-- Text for select all action when editing recipients for a story -->
     <string name="BaseStoryRecipientSelectionFragment__select_all">Tout sélectionner</string>
     <!-- Choose story type bottom sheet title -->
-    <string name="ChooseStoryTypeBottomSheet__choose_your_story_type">Choisir votre type de Story</string>
+    <string name="ChooseStoryTypeBottomSheet__choose_your_story_type">Choisir le type de story</string>
     <!-- Choose story type bottom sheet new story row title -->
-    <string name="ChooseStoryTypeBottomSheet__new_custom_story">Nouvelle Story personnalisée</string>
+    <string name="ChooseStoryTypeBottomSheet__new_custom_story">Nouvelle story personnalisée</string>
     <!-- Choose story type bottom sheet new story row summary -->
     <string name="ChooseStoryTypeBottomSheet__visible_only_to">Visible pour certaines personnes seulement</string>
     <!-- Choose story type bottom sheet group story title -->
@@ -5847,9 +5985,9 @@
     <!-- Displayed in toast after sending a direct reply -->
     <string name="StoryDirectReplyDialogFragment__sending_reply">Envoi de la réponse…</string>
     <!-- Displayed in the viewer when a story is no longer available -->
-    <string name="StorySlateView__this_story_is_no_longer_available">Cette Story n’est plus disponible.</string>
+    <string name="StorySlateView__this_story_is_no_longer_available">Cette story n’est plus disponible.</string>
     <!-- Displayed in the viewer when a story has permanently failed to download. -->
-    <string name="StorySlateView__cant_download_story_s_will_need_to_share_it_again">Impossible de télécharger la Story. %1$s doit l’envoyer à nouveau.</string>
+    <string name="StorySlateView__cant_download_story_s_will_need_to_share_it_again">Impossible de télécharger la story. %1$s doit la partager de nouveau.</string>
     <!-- Displayed in the viewer when the network is not available -->
     <string name="StorySlateView__no_internet_connection">Pas de connexion internet</string>
     <!-- Displayed in the viewer when network is available but content could not be downloaded -->
@@ -5857,9 +5995,9 @@
     <!-- Toasted when the user externally shares to a text story successfully -->
     <string name="TextStoryPostCreationFragment__sent_story">Story envoyée</string>
     <!-- Toasted when the user external share to a text story fails -->
-    <string name="TextStoryPostCreationFragment__failed_to_send_story">Échec de l\'envoi de la Story</string>
+    <string name="TextStoryPostCreationFragment__failed_to_send_story">Impossible d’envoyer la story</string>
     <!-- Displayed in a dialog to let the user select a given users story -->
-    <string name="StoryDialogs__view_story">Afficher la Story</string>
+    <string name="StoryDialogs__view_story">Afficher la story</string>
     <!-- Displayed in a dialog to let the user select a given users profile photo -->
     <string name="StoryDialogs__view_profile_photo">Afficher la photo de profil</string>
 
@@ -5869,11 +6007,11 @@
     <!-- Label for a button in a notification at the bottom of the chat list to turn off censorship circumvention -->
 
     <!-- Conversation Item label for when you react to someone else\'s story -->
-    <string name="ConversationItem__you_reacted_to_s_story">Vous avez réagi à la Story de %1$s</string>
+    <string name="ConversationItem__you_reacted_to_s_story">Vous avez réagi à la story de %1$s</string>
     <!-- Conversation Item label for reactions to your story -->
-    <string name="ConversationItem__reacted_to_your_story">A réagi à votre Story</string>
+    <string name="ConversationItem__reacted_to_your_story">a réagi à votre story</string>
     <!-- Conversation Item label for reactions to an unavailable story -->
-    <string name="ConversationItem__reacted_to_a_story">A réagi à une Story</string>
+    <string name="ConversationItem__reacted_to_a_story">a réagi à une story</string>
 
     <!-- endregion -->
     <!-- Content description for expand contacts chevron -->
@@ -5889,8 +6027,8 @@
     <string name="GiftFlowStartFragment__donate_for_a_friend">Faire un don pour un ami</string>
     <!-- Description text on start fragment for gifting a badge -->
     <plurals name="GiftFlowStartFragment__support_signal_by">
-        <item quantity="one">Soutenez Signal en effectuant un don pour un ami ou un membre de votre famille qui utilise Signal. Ils recevront un macaron à afficher sur leur profil pendant %1$d jour.</item>
-        <item quantity="other">Soutenez Signal en effectuant un don pour un ami ou un membre de votre famille qui utilise Signal. Ils recevront un macaron à afficher sur leur profil pendant %1$d jours.</item>
+        <item quantity="one">Un ami ou un membre de votre famille utilise Signal ? Faites un don pour cette personne et elle recevra un macaron à afficher sur son profil pendant %1$d jour.</item>
+        <item quantity="other">Un ami ou un membre de votre famille utilise Signal ? Faites un don pour cette personne et elle recevra un macaron à afficher sur son profil pendant %1$d jours.</item>
     </plurals>
     <!-- Action button label for start fragment for gifting a badge -->
     <string name="GiftFlowStartFragment__next">Suivant</string>
@@ -5966,19 +6104,19 @@
     <!-- Label for context menu item to open story settings -->
     <string name="ContactSearchItems__story_settings">Paramètres des stories</string>
     <!-- Label for context menu item to remove a group story from contact results -->
-    <string name="ContactSearchItems__remove_story">Supprimer la Story</string>
+    <string name="ContactSearchItems__remove_story">Supprimer la story</string>
     <!-- Label for context menu item to delete a custom story -->
-    <string name="ContactSearchItems__delete_story">Supprimer la Story</string>
+    <string name="ContactSearchItems__delete_story">Supprimer la story</string>
     <!-- Dialog title for removing a group story -->
-    <string name="ContactSearchMediator__remove_group_story">Supprimer la Story de groupe ?</string>
+    <string name="ContactSearchMediator__remove_group_story">Supprimer la story de groupe ?</string>
     <!-- Dialog message for removing a group story -->
-    <string name="ContactSearchMediator__this_will_remove">Cette action supprimera la Story de cette liste. Vous pourrez toujours consulter les Stories de ce groupe.</string>
+    <string name="ContactSearchMediator__this_will_remove">La story sera supprimée de cette liste, mais vous pourrez toujours consulter les stories de ce groupe.</string>
     <!-- Dialog action item for removing a group story -->
     <string name="ContactSearchMediator__remove">Supprimer</string>
     <!-- Dialog title for deleting a custom story -->
     <string name="ContactSearchMediator__delete_story">Supprimer la story ?</string>
     <!-- Dialog message for deleting a custom story -->
-    <string name="ContactSearchMediator__delete_the_custom">Supprimer la Story personnalisée « %1$s » ?</string>
+    <string name="ContactSearchMediator__delete_the_custom">Supprimer la story personnalisée « %1$s » ?</string>
     <!-- Dialog action item for deleting a custom story -->
     <string name="ContactSearchMediator__delete">Supprimer</string>
     <!-- Donation for a friend expiry days remaining -->
@@ -6031,7 +6169,7 @@
     <!-- Menu action to launch safety number verification screen -->
     <string name="SafetyNumberBottomSheetFragment__verify_safety_number">Confirmer le numéro de sécurité</string>
     <!-- Menu action to remove user from story -->
-    <string name="SafetyNumberBottomSheetFragment__remove_from_story">Retirer de la Story</string>
+    <string name="SafetyNumberBottomSheetFragment__remove_from_story">Retirer de la story</string>
     <!-- Action button at bottom of SafetyNumberBottomSheetFragment to send anyway -->
     <string name="SafetyNumberBottomSheetFragment__send_anyway">Envoyer quand même</string>
     <!-- Action button at bottom of SafetyNumberBottomSheetFragment to review connections -->
@@ -6057,7 +6195,7 @@
     <!-- Title of initial My Story settings configuration shown when sending to My Story for the first time -->
     <string name="ChooseInitialMyStoryMembershipFragment__my_story_privacy">Confidentialité de ma story</string>
     <!-- Subtitle of initial My Story settings configuration shown when sending to My Story for the first time -->
-    <string name="ChooseInitialMyStoryMembershipFragment__choose_who_can_see_posts_to_my_story_you_can_always_make_changes_in_settings">Choisissez les contacts autorisés à voir votre story. Vous pouvez modifier ces préférences à tout moment dans les paramètres.</string>
+    <string name="ChooseInitialMyStoryMembershipFragment__choose_who_can_see_posts_to_my_story_you_can_always_make_changes_in_settings">Choisissez les contacts autorisés à voir votre story. Vous pouvez modifier ces préférences à tout moment via les paramètres.</string>
     <!-- All connections option for initial My Story settings configuration shown when sending to My Story for the first time -->
     <string name="ChooseInitialMyStoryMembershipFragment__all_signal_connections">Tous mes contacts Signal</string>
     <!-- All connections except option for initial My Story settings configuration shown when sending to My Story for the first time -->
@@ -6078,11 +6216,11 @@
 
     <!-- StoriesPrivacySettingsFragment -->
     <!-- Explanation about how stories are deleted and managed -->
-    <string name="StoriesPrivacySettingsFragment__story_updates_automatically_disappear">Les nouveaux contenus ajoutés aux Stories sont automatiquement supprimés après 24 heures. Identifiez les spectateurs autorisés à voir votre Story ou créez de nouvelles Stories en identifiant des spectateurs ou des groupes spécifiques.</string>
+    <string name="StoriesPrivacySettingsFragment__story_updates_automatically_disappear">Les nouveaux contenus ajoutés aux stories sont automatiquement supprimés au bout de 24 heures. Vous pouvez sélectionner les spectateurs autorisés à voir votre story ou créer de nouvelles stories, puis définir les contacts ou les groupes autorisés à les afficher.</string>
     <!-- Preference title to turn off stories -->
-    <string name="StoriesPrivacySettingsFragment__turn_off_stories">Quitter la fonction Stories</string>
+    <string name="StoriesPrivacySettingsFragment__turn_off_stories">Désactiver les stories</string>
     <!-- Preference summary to turn off stories -->
-    <string name="StoriesPrivacySettingsFragment__if_you_opt_out">Si vous décidez de quitter la fonction Stories, vous ne pourrez plus en partager ni en consulter.</string>
+    <string name="StoriesPrivacySettingsFragment__if_you_opt_out">Si vous décidez de désactiver les stories, vous ne pourrez plus en partager ni en consulter.</string>
     <!-- Preference title to turn on stories -->
     <string name="StoriesPrivacySettingsFragment__turn_on_stories">Activer la fonction Stories</string>
     <!-- Preference summary to turn on stories -->
@@ -6099,18 +6237,18 @@
     <!-- Story view receipts toggle title -->
     <string name="StoriesPrivacySettingsFragment__view_receipts">Confirmation de vue</string>
     <!-- Story view receipts toggle message -->
-    <string name="StoriesPrivacySettingsFragment__see_and_share">Voir et partager lorsque les Stories sont visionnées. Si cette option est désactivée, vous ne pourrez pas savoir si un spectateur regarde votre Story.</string>
+    <string name="StoriesPrivacySettingsFragment__see_and_share">Vous êtes informé lorsque vos contacts voient vos stories. Si cette option est désactivée, vous ne saurez pas si des spectateurs les ont vues.</string>
 
     <!-- NewStoryItem -->
-    <string name="NewStoryItem__new_story">Nouvelle Story</string>
+    <string name="NewStoryItem__new_story">Nouvelle story</string>
 
     <!-- GroupStorySettingsFragment -->
     <!-- Section header for who can view a group story -->
     <string name="GroupStorySettingsFragment__who_can_view_this_story">Qui peut voir cette story ?</string>
     <!-- Explanation of who can view a group story -->
-    <string name="GroupStorySettingsFragment__members_of_the_group_s">"Les membres de ce groupe \" %1$s \" peuvent consulter et commenter votre Story. Vous pouvez modifier les participants du groupe en question."</string>
+    <string name="GroupStorySettingsFragment__members_of_the_group_s">"Les membres du groupe « %1$s » peuvent afficher votre story et la commenter. Vous pouvez modifier les participants du groupe en question."</string>
     <!-- Preference label for removing this group story -->
-    <string name="GroupStorySettingsFragment__remove_group_story">Supprimer la Story du groupe</string>
+    <string name="GroupStorySettingsFragment__remove_group_story">Supprimer cette story de groupe</string>
 
     <!-- Generic title for overflow menus -->
     <string name="OverflowMenu__overflow_menu">Menu de débordement</string>
@@ -6147,7 +6285,7 @@
     <!-- Continue button label -->
     <string name="DonateToSignalFragment__continue">Poursuivre</string>
     <!-- Description below title -->
-    <string name="DonateToSignalFragment__private_messaging">Une messagerie privée, financée par vous. Aucune publicité, aucun traqueur, aucun compromis. Faites un don pour soutenir Signal.</string>
+    <string name="DonateToSignalFragment__private_messaging">Une messagerie privée, financée par des personnes comme vous. Aucune publicité, aucun cookie de suivi, zéro compromis. Faites un don pour soutenir Signal.</string>
     <!-- Dialog title when a user tries to donate while they already have a pending donation. -->
     <string name="DonateToSignalFragment__you_have_a_donation_pending">Un don en attente</string>
     <!-- Dialog body when a user tries to donate while they already have a pending monthly donation. -->
@@ -6166,7 +6304,7 @@
     <string name="DonateToSignalFragment__you_can_send_up_to_s_via_bank_transfer">Vous pouvez envoyer jusqu’à %1$s par virement bancaire. Veuillez saisir un autre montant ou choisir une méthode de paiement différente.</string>
 
     <!-- Donation pill toggle monthly text -->
-    <string name="DonationPillToggle__monthly">Mensuel</string>
+    <string name="DonationPillToggle__monthly">Don mensuel</string>
     <!-- Donation pill toggle one-time text -->
     <string name="DonationPillToggle__one_time">Ponctuel</string>
 
@@ -6247,7 +6385,7 @@
     <!-- Text field label for IBAN -->
     <string name="BankTransferDetailsFragment__iban">IBAN</string>
     <!-- Text field label for email -->
-    <string name="BankTransferDetailsFragment__email">Adresse courriel</string>
+    <string name="BankTransferDetailsFragment__email">E-mail</string>
     <!-- Text label for button to show user how to find their IBAN -->
     <string name="BankTransferDetailsFragment__find_account_info">Trouver les détails du compte</string>
     <!-- Donate button label for monthly subscription -->
@@ -6279,13 +6417,13 @@
     <!-- Hint label for text entry box for name on bank account -->
     <string name="IdealTransferDetailsFragment__name_on_bank_account">Nom associé au compte bancaire</string>
     <!-- Hint label for text entry box for email -->
-    <string name="IdealTransferDetailsFragment__email">Adresse courriel</string>
+    <string name="IdealTransferDetailsFragment__email">E-mail</string>
     <!-- Default label for bank selection -->
     <string name="IdealTransferDetailsFragment__choose_your_bank">Choisissez votre banque</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Confirmez votre don %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Pour configurer votre don mensuel, appuyez sur « Continuer ». Vous confirmez ainsi le prélèvement de 0,01 € auprès de votre banque. Cette somme sera automatiquement remboursée et permettra de confirmer le prélèvement de 5 €/mois sur votre compte.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Pour mettre en place votre don mensuel, appuyez sur &lt;strong&gt;Continuer&lt;/strong&gt;. Vous confirmez ainsi le prélèvement de 0,01 € auprès de votre banque. Cette somme sera automatiquement remboursée et permettra de confirmer le prélèvement de la somme mensuelle de %1$s sur votre compte.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Poursuivre</string>
 
@@ -6372,9 +6510,9 @@
     <!-- Line item on the sheet explaining group stories -->
     <string name="GroupStoryEducationSheet__share_story_updates_to">Partagez des Stories à des conversations de groupe auxquelles vous participez.</string>
     <!-- Line item on the sheet explaining that anyone in the group can share to group stories -->
-    <string name="GroupStoryEducationSheet__anyone_in_the_group">Tous les membres de la conversation de groupe peuvent contribuer à la Story.</string>
+    <string name="GroupStoryEducationSheet__anyone_in_the_group">Tous les participants à la conversation de groupe peuvent contribuer à la story.</string>
     <!-- Line item on the sheet explaining that anyone in the group can view replies -->
-    <string name="GroupStoryEducationSheet__all_group_chat_members">Tous les membres de la conversation peuvent voir les réponses à la Story de groupe.</string>
+    <string name="GroupStoryEducationSheet__all_group_chat_members">Tous les participants à la conversation de groupe peuvent voir les réponses à la story.</string>
     <!-- Button label to dismiss sheet -->
     <string name="GroupStoryEducationSheet__next">Suivant</string>
     <string name="Registration_country_code_entry_hint">+0</string>
@@ -6462,7 +6600,7 @@
     <!-- Accessibility description for the video call button -->
     <string name="CallLogAdapter__start_a_video_call">Lancer un appel vidéo</string>
     <!-- Accessibility description for the voice call button -->
-    <string name="CallLogAdapter__start_a_voice_call">Démarrer un appel vocal</string>
+    <string name="CallLogAdapter__start_a_voice_call">Passer un appel vocal</string>
 
     <!-- Call Log context menu -->
     <!-- Displayed as a context menu item to start a video call -->
@@ -6489,13 +6627,13 @@
         <item quantity="other">Impossible de supprimer tous les liens d’appels. Veuillez vérifier votre connexion et réessayer.</item>
     </plurals>
     <!-- Snackbar text after clearing the call history -->
-    <string name="CallLogFragment__cleared_call_history">Historique des appels effacé</string>
+    <string name="CallLogFragment__cleared_call_history">Historique des appels supprimé</string>
     <!-- Dialog title to clear all call events -->
-    <string name="CallLogFragment__clear_call_history_question">Effacer l’historique des appels ?</string>
+    <string name="CallLogFragment__clear_call_history_question">Supprimer l’historique des appels ?</string>
     <!-- Dialog body to clear all call events -->
-    <string name="CallLogFragment__this_will_permanently_delete_all_call_history">Cette action supprimera l’historique des appels de manière permanente.</string>
+    <string name="CallLogFragment__this_will_permanently_delete_all_call_history">Cela supprimera définitivement l’historique des appels.</string>
     <!-- Action bar menu item to delete all call events -->
-    <string name="CallLogFragment__clear_call_history">Effacer l’historique des appels</string>
+    <string name="CallLogFragment__clear_call_history">Supprimer l’historique des appels</string>
     <!-- Action bar menu item to only display missed calls -->
     <string name="CallLogFragment__filter_missed_calls">Filtrer les appels manqués</string>
     <!-- Action bar menu item to clear missed call filter -->
@@ -6538,7 +6676,7 @@
     <!-- Displayed when the user disables group call ringing -->
     <string name="CallStateUpdatePopupWindow__ringing_off">Sonnerie désactivée</string>
     <!-- Displayed when the user cannot enable group call ringing -->
-    <string name="CallStateUpdatePopupWindow__group_is_too_large">Le groupe est composé d\'un trop grand nombre de membres pour tous les appeler.</string>
+    <string name="CallStateUpdatePopupWindow__group_is_too_large">Appel impossible : le groupe compte un trop grand nombre de participants.</string>
     <!-- Displayed when the user turns on their mic -->
     <string name="CallStateUpdatePopupWindow__mic_on">Micro activé</string>
     <!-- Displayed when the user turns off their mic -->
@@ -6591,9 +6729,9 @@
     <!-- Displayed on a small button to allow user to instantly join call -->
     <string name="CreateCallLinkBottomSheetDialogFragment__join">Rejoindre</string>
     <!-- Option to open a full screen dialog to add a call name -->
-    <string name="CreateCallLinkBottomSheetDialogFragment__add_call_name">Ajouter un libellé d’appel</string>
+    <string name="CreateCallLinkBottomSheetDialogFragment__add_call_name">Nommer l’appel</string>
     <!-- Option to open a full screen dialog to edit a call name -->
-    <string name="CreateCallLinkBottomSheetDialogFragment__edit_call_name">Modifier le libellé de l’appel</string>
+    <string name="CreateCallLinkBottomSheetDialogFragment__edit_call_name">Renommer l’appel</string>
     <!-- Toggle to require approval for all members before joining -->
     <string name="CreateCallLinkBottomSheetDialogFragment__approve_all_members">Approuver tous les membres</string>
     <!-- Row label to share the link via Signal -->
@@ -6617,11 +6755,11 @@
 
     <!-- EditCallLinkNameDialogFragment -->
     <!-- App bar title for editing a call name -->
-    <string name="EditCallLinkNameDialogFragment__edit_call_name">Modifier le libellé de l’appel</string>
+    <string name="EditCallLinkNameDialogFragment__edit_call_name">Renommer l’appel</string>
     <!-- Text on button to confirm edit -->
     <string name="EditCallLinkNameDialogFragment__save">Enregistrer</string>
     <!-- Placeholder text on input field when editing call name -->
-    <string name="EditCallLinkNameDialogFragment__call_name">Libellé de l’appel</string>
+    <string name="EditCallLinkNameDialogFragment__call_name">Nom de l’appel</string>
 
     <!-- ChooseNavigationBarStyleFragment -->
     <!-- Dialog title, displayed below the header image -->
@@ -6636,7 +6774,7 @@
     <!-- Title of dialog shown alerting user that edit message is in beta only -->
     <string name="SendingEditMessageBetaOnlyDialog_title">Modifier le message</string>
     <!-- Body of dialog shown alerting user that edit message is in beta only and only sent to beta users. -->
-    <string name="SendingEditMessageBetaOnlyDialog_body">Les modifications apportées aux messages ne seront visibles que par les personnes utilisant les dernières versions de Signal. Elles pourront voir que vous avez modifié un message.</string>
+    <string name="SendingEditMessageBetaOnlyDialog_body">Lorsque vous modifiez un message, seules les personnes utilisant les dernières versions de Signal peuvent afficher les modifications. Elles sont aussi informées qu’il s’agit d’un message modifié.</string>
     <!-- Button to cancel sending edit message as it is beta only -->
     <string name="SendingEditMessageBetaOnlyDialog_cancel">Annuler</string>
     <!-- Button to continue sending edit message despite it being beta only -->
@@ -6647,9 +6785,9 @@
     <!-- Displayed in action bar at the top of the fragment -->
     <string name="CallLinkDetailsFragment__call_details">Détails de l’appel</string>
     <!-- Displayed in a text row, allowing the user to click and edit a call name -->
-    <string name="CallLinkDetailsFragment__edit_call_name">Modifier le libellé de l’appel</string>
+    <string name="CallLinkDetailsFragment__edit_call_name">Renommer l’appel</string>
     <!-- Displayed in a text row, allowing the user to click and add a call name -->
-    <string name="CallLinkDetailsFragment__add_call_name">Ajouter un libellé d’appel</string>
+    <string name="CallLinkDetailsFragment__add_call_name">Nommer l’appel</string>
     <!-- Displayed in a toggle row, allowing the user to click to enable or disable member approval -->
     <string name="CallLinkDetailsFragment__approve_all_members">Approuver tous les membres</string>
     <!-- Displayed in a text row, allowing the user to share the call link -->
@@ -6729,7 +6867,7 @@
 
     <!-- PendingParticipantsView -->
     <!-- Displayed in the popup card when a remote user attempts to join a call link -->
-    <string name="PendingParticipantsView__would_like_to_join">Souhaite rejoindre l’appel…</string>
+    <string name="PendingParticipantsView__would_like_to_join">voudrait rejoindre l’appel…</string>
     <!-- Displayed in a button on the popup card denoting that there are other pending requests to join a call link -->
     <plurals name="PendingParticipantsView__plus_d_requests">
         <item quantity="one">+%1$d demande</item>
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Téléchargement des données sauvegardées…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">La sauvegarde des médias est désactivée</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Votre forfait de sauvegarde de médias Signal a été résilié, car nous n’avons pas pu traiter votre paiement. Vous disposez de %1$d jour pour télécharger les médias stockés dans votre sauvegarde. Passé ce délai de %1$d jour, ils seront supprimés.</item>
+        <item quantity="other">Votre forfait de sauvegarde de médias Signal a été résilié, car nous n’avons pas pu traiter votre paiement. Vous disposez de %1$d jours pour télécharger les médias stockés dans votre sauvegarde. Passé ce délai de %1$d jours, ils seront supprimés.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Pour continuer de sauvegarder vos fichiers multimédias, vous pouvez de nouveau souscrire un forfait. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Vos médias vont être supprimés aujourd’hui</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Votre forfait de sauvegarde de médias Signal a été résilié, car nous n’avons pas pu traiter votre paiement. Téléchargez les fichiers de votre sauvegarde avant qu’ils ne soient supprimés.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Téléchargement impossible</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">L’espace libre disponible sur votre appareil est insuffisant. Pour télécharger les médias stockés dans votre sauvegarde, libérez %1$s d’espace.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Si vous choisissez d’ignorer ce message, les fichiers stockés dans votre sauvegarde seront supprimés d’ici %1$d jour.</item>
+        <item quantity="other">Si vous choisissez d’ignorer ce message, les fichiers stockés dans votre sauvegarde seront supprimés d’ici %1$d jours.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Impossible de traiter le paiement du forfait de sauvegarde</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Nous ne parvenons pas à prélever le montant mensuel de votre forfait de sauvegarde. Veuillez vérifier que votre mode de paiement est à jour. Si ce n’est pas le cas, nous vous invitons à le modifier dans Google Pay. Signal retentera de traiter le paiement dans quelques jours.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Impossible de terminer la sauvegarde</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Votre appareil n’a pas effectué de sauvegarde complète depuis %1$d jours. Vérifiez qu’il est connecté au Wi-Fi et appuyez sur &lt;strong&gt;Sauvegarder maintenant&lt;/strong&gt; </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">En savoir plus</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Ignorer</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Télécharger les médias maintenant</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Télécharger plus tard</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Ne pas télécharger</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Libérez %1$s d’espace pour télécharger vos médias.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Carte de crédit ou de débit</string>
@@ -6874,16 +7058,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Inconnu</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Historique des paiements</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Dernière sauvegarde effectuée le %1$s à %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">Nombre maximal de messages</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">Définir des limites de stockage</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">Supprimer l’historique des messages</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Une fois ce délai dépassé, Signal supprime définitivement les messages.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Une fois cette limite atteinte, Signal supprime définitivement les messages.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Appliquer ces limites aux appareils associés</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Si vous activez cette option, les limites de stockage s’appliqueront aussi à vos appareils associés : les messages qui y sont stockés seront également supprimés.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">La suppression des messages est maintenant synchronisée sur tous vos appareils.</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Lorsque vous supprimez des messages ou des conversations, ils sont supprimés de votre téléphone et de vos appareils associés.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Historique des paiements</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Sauvegarde des messages et de tous les médias</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Détails des paiements</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Type de sauvegarde</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Date de paiement</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Partager</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Sauvegardes Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Historique des paiements</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Détails de la sauvegarde</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Taille de la sauvegarde</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Fréquence de sauvegarde</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Sauvegarder via les données cellulaires</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Désactiver et supprimer la sauvegarde</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Sauvegarde supprimée et désactivée.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Type de sauvegarde modifié et abonnement résilié</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Abonnement résilié</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Sauvegarde téléchargée</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Type de sauvegarde</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Sauvegardes désactivées</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/mois</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Activer les sauvegardes</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Dernière sauvegarde</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s à %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Jamais</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Sauvegarder maintenant</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Désactiver et supprimer les sauvegardes ?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Vous ne serez plus facturé. Signal supprimera votre sauvegarde et aucune nouvelle sauvegarde ne sera créée.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Désactiver et supprimer</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Suppression de la sauvegarde</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Sauvegarde supprimée</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"via l’option &lt;strong&gt;Sauvegarder maintenant&lt;/strong&gt;"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Quotidienne</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Hebdomadaire</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Mensuelle</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Sauvegarde manuelle</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Saisissez le code PIN, mot de passe ou schéma de déverrouillage de votre appareil.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Suivant</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Modifier le type de sauvegarde</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Annuler l’abonnement</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Confirmer l’annulation</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Vous ne serez plus facturé. Les sauvegardes seront désactivées à la fin de votre période de facturation. Après cette date, vous disposerez de 30 jours pour télécharger les médias sauvegardés.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Confirmer et télécharger maintenant</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Confirmer et télécharger plus tard</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Conserver le forfait</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml
index 9eb471a24b..591d2146df 100644
--- a/app/src/main/res/values-ga/strings.xml
+++ b/app/src/main/res/values-ga/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Tá Signal ag nuashonrú…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Tá Molly ag nuashonrú…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Níl nath faire socraithe agat fós!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Díchumasaigh an nath faire?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Baineann sé seo glas de Signal agus de fógraí teachtaireachta go deo.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Baineann sé seo glas de Molly agus de fógraí teachtaireachta go deo.</string>
     <string name="ApplicationPreferencesActivity_disable">Díchumasaigh</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Tharla botún ag déanamh teagmháil leis an bhfreastalaí!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">Tá UAP de dhíth chun glas clárúcháin a úsáid. Caithfidh tú an glas clárúcháin a dhíchumasú sula mbeidh tú in ann an UAP a dhíchumasú.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Comhad</string>
     <string name="AttachmentKeyboard_contact">Teagmhálaí</string>
     <string name="AttachmentKeyboard_location">Suíomh</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Teastaíonn cead ó Signal chun do ghrianghraif agus físeáin a thaispeáint</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Teastaíonn cead ó Molly chun do ghrianghraif agus físeáin a thaispeáint</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Ceadaigh Rochtain</string>
     <string name="AttachmentKeyboard_payment">Íocaíocht</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Ní féidir teacht ar fheidhmchláirín chun meán a roghnú.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Tá gá ag Signal le cead stóras chun griangraif a thógáil, ach ní ceadaítear é go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Stóras\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Tá gá ag Signal le cead teagmhálaí chun eolas teagmhálaí a cheangail, ach ní ceadaítear é go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Teagmhálaí\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Tá gá ag Signal le cead áite i gcomhair do áit a cheangail, ach ní ceadaítear é go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Áit\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Tá gá ag Molly le cead stóras chun griangraif a thógáil, ach ní ceadaítear é go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Stóras\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Tá gá ag Molly le cead teagmhálaí chun eolas teagmhálaí a cheangail, ach ní ceadaítear é go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Teagmhálaí\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Tá gá ag Molly le cead áite i gcomhair do áit a cheangail, ach ní ceadaítear é go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Áit\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Tabhair cead rochtana ar do shuíomh</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Chun do shuíomh a sheoladh:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Tabhair cead rochtana do Signal chun do shuíomh a sheoladh.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Tabhair cead rochtana do Molly chun do shuíomh a sheoladh.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Teastaíonn rochtain ar shuíomh ó Signal chun do shuíomh a sheoladh.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Teastaíonn rochtain ar shuíomh ó Molly chun do shuíomh a sheoladh.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Ceadaigh rochtain ar stóras</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Chun grianghraif agus físeáin a thaispeáint:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Teastaíonn rochtain ar stóras ó Signal chun do ghrianghraif agus físeáin a thaispeáint.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Teastaíonn rochtain ar stóras ó Molly chun do ghrianghraif agus físeáin a thaispeáint.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">Níor ghníomhachtaigh %1$s Íocaíochtaí </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Athraigh an grianghrafadán</string>
     <string name="CameraXFragment_open_gallery_description">Oscail an gailearaí</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Ceadaigh Rochtain</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Ceadaigh rochtain ar do cheamara agus ar do mhicreafón</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Ceadaigh rochtain ar do cheamara</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Tabhair cead rochtana ar do mhicreafón</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Chun grianghraif a ghabháil, ceadaigh do Signal rochtain a fháil ar an gceamara.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Ceadaigh Signal do cheamara a úsáid chun grianghraif a thógáil nó físéan a dhéanamh.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Chun grianghraif agus físeán a ghabháil, ceadaigh do Signal rochtain a fháil ar an gceamara agus ar an micreafón.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Chun físeáin le fuaim a ghabháil, ceadaigh do Signal rochtain a fháil ar do mhicreafón.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Chun cód QR a scanadh, ceadaigh do Signal rochtain a fháil ar an gceamara.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Teastaíonn rochtain ar an gceamara ó Signal chun grianghraif a ghabháil</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Teastaíonn rochtain ar an gceamara ó Signal chun cóid QR a scanadh</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Teastaíonn rochtain ar an micreafón ó Signal chun físeán a ghabháil</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Chun grianghraif a ghabháil in Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Chun grianghraif agus físeáin a ghabháil in Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Chun físeáin le fuaim a ghabháil:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Chun cóid QR a scanadh:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Teagmhálaithe le déanaí</string>
@@ -274,7 +275,7 @@
     <string name="CameraContacts_no_signal_contacts">Níl aon teagmhálaithe Signal ann</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Ní féidir feidhm a bhaint as cnaipe an cheamara chun grianghraif a sheoladh ach le teagmhálaithe ar Signal amháin. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Nach féidir an duine atá lorg agat a aimsiú?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Tabhair cuireadh do theagmhálaí chuig Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Tabhair cuireadh do theagmhálaí chuig Molly</string>
     <string name="CameraContacts__menu_search">Cuardaigh</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -288,12 +289,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Ní raibh maith agaibh</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Nuashonraigh Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Nuashonraigh Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Ní thacaítear leis an leagan seo den aip a thuilleadh. Le leanúint le teachtaireachtaí a sheoladh agus a fháil, nuashonraigh chuig an leagan is déanaí.</string>
     <string name="ClientDeprecatedActivity_update">Nuashonraigh</string>
     <string name="ClientDeprecatedActivity_dont_update">Ná Nuashonraigh É</string>
     <string name="ClientDeprecatedActivity_warning">Rabhadh</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Tá do leagan de Signal as feidhm. Is féidir leat féachaint ar stair do theachtaireachtaí ach ní bheidh tú in ann teachtaireachtaí a sheoladh ná a fháil go dtí go ndéanfaidh tú nuashonrú.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Tá do leagan de Molly as feidhm. Is féidir leat féachaint ar stair do theachtaireachtaí ach ní bheidh tú in ann teachtaireachtaí a sheoladh ná a fháil go dtí go ndéanfaidh tú nuashonrú.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Níor aimsíodh aon líonléitheoir.</string>
@@ -330,8 +331,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Teachtaireacht %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Guthghlao Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Físghlao Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -431,7 +432,7 @@
     <string name="ConversationActivity_transport_signal">Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Seol teachtaireacht</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Téimís i muinín Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Téimís i muinín Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Roghnaigh teagmhálaí</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Tá an ceangaltán ró-mhór don teachtaireacht atá á sheoladh agat.</string>
     <string name="ConversationActivity_unable_to_record_audio">Ní féidir fuaim a thaifeadadh!</string>
@@ -450,18 +451,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Chun teachtaireachtaí gutha a sheoladh:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Chun glórphoist a sheoladh, tabhair cead rochtana ar do mhicreafón do Signal.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Chun glórphoist a sheoladh, tabhair cead rochtana ar do mhicreafón do Molly.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Teastaíonn rochtain ar an micreafón ó Signal chun glórphost a thaifeadadh.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Tá gá ag Signal le cead micreafóin chun teachtaireachtaí fuaime a sheoladh, ach ní ceadaítear é go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Micreafón\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Teastaíonn rochtain ar an micreafón ó Molly chun glórphost a thaifeadadh.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Tá gá ag Molly le cead micreafóin chun teachtaireachtaí fuaime a sheoladh, ach ní ceadaítear é go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Micreafón\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Tá gá ag Signal le cead micreafóin agus cheamara chun %1$s a ghlaoigh, ach ní ceadaítear iad go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Micreafón\" agus \"Ceamara\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Ceadaigh Signal do cheamara a úsáid chun grianghraif a thógáil nó físéan a dhéanamh.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Tá gá ag Signal le cead cheamara chun griangraif a thógáil nó físéan a dhéanamh, ach ní ceadaítear é go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Ceamara\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Tá gá ag Signal le ceadanna cheamara chun griangraif a thógáil nó físéan a dhéanamh.</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Tá gá ag Molly le cead micreafóin agus cheamara chun %1$s a ghlaoigh, ach ní ceadaítear iad go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Micreafón\" agus \"Ceamara\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Ceadaigh Molly do cheamara a úsáid chun grianghraif a thógáil nó físéan a dhéanamh.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Tá gá ag Molly le cead cheamara chun griangraif a thógáil nó físéan a dhéanamh, ach ní ceadaítear é go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Ceamara\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Tá gá ag Molly le ceadanna cheamara chun griangraif a thógáil nó físéan a dhéanamh.</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Tabhair cead don aip an micreafón a úsáid chun físeáin le fuaim a thaifeadadh.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Tá ceadanna micreafóin de dhíth ar Signal chun físeáin a thaifeadadh, ach diúltaíodh dóibh. Lean ar aghaidh chuig socruithe na haipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Micreafón\" agus \"Ceamara\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Tá ceadanna micreafóin de dhíth ar Signal chun físeáin a thaifeadadh.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Tá ceadanna micreafóin de dhíth ar Molly chun físeáin a thaifeadadh, ach diúltaíodh dóibh. Lean ar aghaidh chuig socruithe na haipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Micreafón\" agus \"Ceamara\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Tá ceadanna micreafóin de dhíth ar Molly chun físeáin a thaifeadadh.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Níl</string>
@@ -482,9 +483,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Chun tosú ar ghlao:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Chun tosú ar ghlao, tabhair cead rochtana ar do mhicreafón do Signal.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Chun tosú ar ghlao, tabhair cead rochtana ar do mhicreafón do Molly.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Teastaíonn rochtain ar an micreafón ó Signal chun tosú ar ghlao.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Teastaíonn rochtain ar an micreafón ó Molly chun tosú ar ghlao.</string>
 
 
     <string name="ConversationActivity_join">Téigh le</string>
@@ -498,9 +499,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Ní thacaítear le cur teachtaireachtaí SMS in Signal a thuilleadh. Tabhair cuireadh do %1$s teacht isteach in Signal leis an gcomhrá a choinneáil anseo.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Níl Signal á úsáid ag an duine seo a thuilleadh. Tabhair cuireadh chun Signal don duine leis an gcomhrá a choinneáil anseo.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Níl Molly á úsáid ag an duine seo a thuilleadh. Tabhair cuireadh chun Molly don duine leis an gcomhrá a choinneáil anseo.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Tabhair cuireadh chuig Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Tabhair cuireadh chuig Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Cuirfear i gcuimhne duit arís go luath.</string>
 
@@ -572,6 +573,8 @@
     <string name="ConversationFragment_delete_for_everyone">Scrios do chách</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Scrios ar an ngléas seo</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Scrios</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Scrios gach áit</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Scriosfar an teachtaireacht seo do chách sa chomhrá má tá leagan le déanaí de Signal acu. Feicfidh siad gur scrios tú teachtaireacht.</string>
@@ -603,13 +606,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Bac curtha</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Nuashonraigh Signal</string>
+    <string name="ConversationFragment__update_build">Nuashonraigh Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Athchláraigh Signal</string>
+    <string name="ConversationFragment__reregister_signal">Athchláraigh Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Déan nascleanúint siar.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Oscail Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Oscail Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Ní fíoraithe a thuilleadh</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -680,6 +683,14 @@
         <item quantity="many">Scriosfar na comhráite roghnaithe go buan leis sin.</item>
         <item quantity="other">Scriosfar na comhráite roghnaithe go buan leis sin.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Scriosfar an comhrá roghnaithe go buan ó do ghléasanna uile leis sin.</item>
+        <item quantity="two">Scriosfar an %1$d chomhrá roghnaithe go buan ó do ghléasanna uile leis sin.</item>
+        <item quantity="few">Scriosfar na %1$d chomhrá roghnaithe go buan ó do ghléasanna uile leis sin.</item>
+        <item quantity="many">Scriosfar na %1$d gcomhrá roghnaithe go buan ó do ghléasanna uile leis sin.</item>
+        <item quantity="other">Scriosfar na %1$d comhrá roghnaithe go buan ó do ghléasanna uile leis sin.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Ag scriosadh</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Comhrá roghnaithe á scriosadh…</item>
@@ -787,9 +798,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Cé hiad na daoine ar féidir leo m\'uimhir a úsáid chun mise a aimsiú?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Aon duine a bhfuil d\'uimhir ghutháin aige/aici, feicfidh sé/sí go bhfuil tú ar Signal agus beidh sé/sí in ann tosú ar chomhrá leat.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Aon duine a bhfuil d\'uimhir ghutháin aige/aici, feicfidh sé/sí go bhfuil tú ar Molly agus beidh sé/sí in ann tosú ar chomhrá leat.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Beidh tú dofheicthe ar Signal ag daoine ach amháin má sheolann tú teachtaireacht chucu nó má tá comhrá ar siúl agat leo.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Beidh tú dofheicthe ar Molly ag daoine ach amháin má sheolann tú teachtaireacht chucu nó má tá comhrá ar siúl agat leo.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">An bhfuil fonn ort cúltaca a athchóiriú?</string>
@@ -823,7 +834,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Dearbháil do nath cúltaca agus deimhnigh go bhfuil siad mar an gcéanna</string>
     <string name="BackupsPreferenceFragment__turn_on">Cuir ar siúl</string>
     <string name="BackupsPreferenceFragment__turn_off">Múch</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Chun cúltaca a aischur, suiteáil cóip nua de Signal. Oscail an aip agus tapáil Aischuir cúltaca, ansin aimsigh comhad cúltaca. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Chun cúltaca a aischur, suiteáil cóip nua de Molly. Oscail an aip agus tapáil Aischuir cúltaca, ansin aimsigh comhad cúltaca. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Foghlaim tuilleadh</string>
     <string name="BackupsPreferenceFragment__in_progress">Ar bun…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -831,7 +842,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d go dtí seo…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% go dtí seo…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Éilíonn Signal cead stórais sheachtraigh chun cúltacaí a chruthú ach diúltaíodh go buan dó. Lean ar aghaidh chuig socruithe na haipe, roghnaigh \"Ceadanna\" agus cumasaigh \"Stóras\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Éilíonn Molly cead stórais sheachtraigh chun cúltacaí a chruthú ach diúltaíodh go buan dó. Lean ar aghaidh chuig socruithe na haipe, roghnaigh \"Ceadanna\" agus cumasaigh \"Stóras\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Socraigh am cúltacaithe</string>
 
@@ -898,7 +909,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Chat session refreshed</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Úsáideann Signal criptiú ó cheann ceann agus seans go mbeidh air do sheisiún comhrá a athnuachan uaireanta. Ní chuireann sé sin isteach ar shlándáil do chomhrá, ach is féidir gur chaill tú teachtaireacht ón teagmhálaí seo, agus is féidir leat iarraidh ar an duine sin í a sheoladh arís.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Úsáideann Molly criptiú ó cheann ceann agus seans go mbeidh air do sheisiún comhrá a athnuachan uaireanta. Ní chuireann sé sin isteach ar shlándáil do chomhrá, ach is féidir gur chaill tú teachtaireacht ón teagmhálaí seo, agus is féidir leat iarraidh ar an duine sin í a sheoladh arís.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Úsáid Signal ar Desktop nó iPad. Déanfar do theachtaireachtaí a shioncronú le do ghléasanna nasctha.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Nasc gléas nua</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Déantar teachtaireachtaí agus faisnéis comhráite a chosaint le criptiú ó cheann ceann ar gach gléas</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal ar deasc nó ar iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Tá cur teachtaireachtaí ar ghléasanna nasctha príobháideach</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Déanfar teachtaireachtaí Molly a shioncronú le Molly ar do ghuthán póca tar éis nascadh leis. Ní thaispeánfar stair do theachtaireachtaí roimhe.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Ar do ghléas eile, téigh chuig %1$s chun Molly a shuiteáil</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Mo ghléasanna nasctha</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Dínasc</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">Dínascadh %1$s</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Gléas á nascadh…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Faomhadh an gléas</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Á lódáil…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Níl aon ghléasanna nasctha ann</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Díghlasáil le gléas a nascadh</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Scan an cód QR atá ar taispeáint ar an ngléas le nascadh leis.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Scan cód QR</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Úsáid an gléas seo chun an cód QR, atá ar taispeáint ar an ngléas lenar mian leat nascadh, a scanadh</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Cgl</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Beidh an gléas seo in ann do ghrúpaí agus do theagmhálaithe a fheiceáil, do chomhráite a rochtain, agus teachtaireachtaí a sheoladh faoi d\'ainm féin.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Críochnaigh nascadh ar do ghléas eile</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Críochnaigh nascadh le Molly ar do ghléas eile.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Theip ar nascadh an ghléis</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Níl an cód QR seo bailí. Cinntigh gur scan tú an cód QR ar an ngléas a bhfuil tú ag iarraidh nascadh leis.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Bain triail eile as</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Dínasc \'%1$s\'?</string>
@@ -920,10 +986,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optamaigh le haghaidh Play Services atá ar iarraidh</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Níl tacú sa ghléas seo do Play Services. Tapáil le hoptamú ceallra an chórais a dhíchumasú, rud a chuireann srian ar Signal teachtaireachtaí a aisghabháil agus é neamhghníomhach.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Níl tacú sa ghléas seo do Play Services. Tapáil le hoptamú ceallra an chórais a dhíchumasú, rud a chuireann srian ar Molly teachtaireachtaí a aisghabháil agus é neamhghníomhach.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Chuaigh an leagan seo de Signal i léig. Nuashonraigh anois é chun teachtaireachtaí a sheoladh agus a fháil.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Chuaigh an leagan seo de Molly i léig. Nuashonraigh anois é chun teachtaireachtaí a sheoladh agus a fháil.</string>
     <string name="ExpiredBuildReminder_update_now">Nuashonraigh anois é</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -937,8 +1003,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Amharc</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Fadhb cumarsáid Signal buan!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Níorbh fhéidir le Signal clárú le Google Play Services. Díchumasaíodh teachtaireachtaí agus glaonna Signal, triail clárú arís i Socruithe &gt; Ardsocruithe.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Fadhb cumarsáid Molly buan!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Níorbh fhéidir le Molly clárú le Google Play Services. Díchumasaíodh teachtaireachtaí agus glaonna Molly, triail clárú arís i Socruithe &gt; Ardsocruithe.</string>
 
 
     <!-- GiphyActivity -->
@@ -1116,20 +1182,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Cabhraíonn logaí dífhabhtaithe linn an fhadhb a dhiagnóisiú agus a réiteach, agus ní bhíonn faisnéis aitheantais iontu.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Bhí fadhb le Signal. Cuir isteach loga dífhabhtaithe?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Bhí fadhb le Molly. Cuir isteach loga dífhabhtaithe?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">D\'fhéadfaí go mbeadh moill ar fhógraí mar gheall ar bharrfheabhsú ceallra</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Is féidir leat barrfheabhsú ceallra a dhíchumasú le haghaidh Signal chun a chinntiú nach gcuirfear moill ar fhógraí teachtaireachtaí.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Is féidir leat barrfheabhsú ceallra a dhíchumasú le haghaidh Molly chun a chinntiú nach gcuirfear moill ar fhógraí teachtaireachtaí.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">D\'fhéadfaí go mbeadh moill ar fhógraí mar gheall ar bharrfheabhsú ceallra</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Díchumasaigh barrfheabhsú ceallra le haghaidh Molly chun a chinntiú nach gcuirfear moill ar fhógraí teachtaireachtaí. Tapáil \"Ar Aghaidh\" le treoracha a bhaineann go sonrach leis an ngléas a fheiceáil.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Níl, go raibh maith agat</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Ar aghaidh</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Ar aghaidh</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Ruaig</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Níl, go raibh maith agat</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Cuirí ar Feitheamh</string>
+    <string name="PendingMembersActivity_pending_group_invites">Iarratais agus Cuirí</string>
     <string name="PendingMembersActivity_requests">Iarratais</string>
     <string name="PendingMembersActivity_invites">Cuirí</string>
     <string name="PendingMembersActivity_people_you_invited">Daoine ar thug tú cuirí dóibh</string>
@@ -1400,7 +1476,7 @@
     <string name="InviteActivity_cancel">Cealaigh</string>
     <string name="InviteActivity_sending">Ag seoladh…</string>
     <string name="InviteActivity_invitations_sent">Seoladh na cuirí!</string>
-    <string name="InviteActivity_invite_to_signal">Tabhair cuireadh chuig Signal</string>
+    <string name="InviteActivity_invite_to_signal">Tabhair cuireadh chuig Molly</string>
     <string name="InviteActivity_send_sms">Seol SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Seol %1$d chuireadh SMS?</item>
@@ -1409,7 +1485,7 @@
         <item quantity="many">Seol %1$d gcuireadh SMS?</item>
         <item quantity="other">Seol %1$d cuireadh SMS?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Téimís i muinín Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Téimís i muinín Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Tá an dealramh air nach bhfuil aon fheidhmchláirín agat lena roinnt leis.</string>
 
     <!-- LearnMoreTextView -->
@@ -1423,7 +1499,7 @@
     <string name="LongMessageActivity_your_message">Do theachtaireacht</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Nasc sa chúlra cumasaithe</string>
 
     <!-- MediaOverviewActivity -->
@@ -1507,10 +1583,10 @@
     <string name="MessageQuotesBottomSheet_replies">Freagraí</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Ag cruthú glao Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">Ag cruthú glao Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Tosú ar sheirbhís glaonna Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Stopadh sheirbhís glaonna Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Tosú ar sheirbhís glaonna Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Stopadh sheirbhís glaonna Molly</string>
     <string name="NotificationBarManager__cancel_call">Cealaigh an glao</string>
 
     <!-- NotificationsMegaphone -->
@@ -1786,6 +1862,14 @@
     <string name="MessageRecord_you_activated_payments">Ghníomhachtaigh tú Íocaíochtaí</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">Is féidir le %1$s glacadh le hÍocaíochtaí anois</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Níl sonraí íocaíochta ar fáil</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Tapáil le haghaidh tuilleadh faisnéise</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Níl sonraí na híocaíochta ar fáil</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Níl sonraí na híocaíochta seo ar fáil toisc gur aischuireadh do theachtaireachtaí ó fhoinse nach raibh stair na híocaíochta seo ar fáil inti. Ní chuirfidh sé sin isteach ar an iarmhéid i do sparán ná ar stádas na sean-íocaíochtaí.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1848,9 +1932,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Ní bheidh tú in ann teachtaireachtaí SMS a sheoladh ó Signal a thuilleadh go luath. Tabhair cuireadh do %1$s teacht isteach in Signal leis an gcomhrá a choinneáil anseo.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Ní féidir leat teachtaireachtaí SMS a sheoladh in Signal a thuilleadh. Tabhair cuireadh do %1$s teacht isteach in Signal leis an gcomhrá a choinneáil anseo.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Ní féidir leat teachtaireachtaí SMS a sheoladh in Molly a thuilleadh. Tabhair cuireadh do %1$s teacht isteach in Molly leis an gcomhrá a choinneáil anseo.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Íocaíocht: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Íocaíocht</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Tuairiscithe mar thurscar</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1940,7 +2026,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Nasc gléas Signal?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Is cosúil go bhfuil tú ag iarraidh gléas Signal a nascadh le scanóir tríú páirtí. Ar mhaithe le do chosaint, scan an cód arís ó laistigh de Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Tá gá ag Signal cead cheamara chun QR code a scanadh, ach ní ceadaítear é go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Ceamara\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Tá gá ag Molly cead cheamara chun QR code a scanadh, ach ní ceadaítear é go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Ceamara\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Ní féidir QR code a scanadh gan cead Cheamara.</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1956,11 +2042,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Cuir isteach nath faire</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Deilbhín Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Deilbhín Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Seol isteach an nath faire</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Nath faire neamhbhailí!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Díghlasáil Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android — Scáileán Glasála</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Díghlasáil Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android — Scáileán Glasála</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Léarscáil</string>
@@ -2030,7 +2116,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Verify to Continue Messaging</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Chun cabhrú le turscar ar Signal a chosc, comhlánaigh an fíorú.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Chun cabhrú le turscar ar Molly a chosc, comhlánaigh an fíorú.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Tar éis fíorú a dhéanamh, is féidir leat leanúint le cur teachtaireachtaí. Seolfar aon teachtaireachtaí a cuireadh ar sos go huathoibríoch.</string>
 
     <!-- Recipient -->
@@ -2038,7 +2124,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Mo Scéal</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Glao Signal</string>
+    <string name="Recipient_signal_call">Glao Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Cuir bac</string>
@@ -2052,7 +2138,8 @@
     <string name="RedPhone_ringing">Ag glaoch</string>
     <string name="RedPhone_busy">Gnóthach</string>
     <string name="RedPhone_recipient_unavailable">Níl an faighteoir ar fáil</string>
-    <string name="RedPhone_network_failed">Theip ar an líonra!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Theip ar an líonra! Seiceáil an nasc líonra agus triail arís.</string>
     <string name="RedPhone_number_not_registered">Níor chláraíodh an uimhir!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Ní thugann an uimhir atá diailiú agat físeán slán!</string>
     <string name="RedPhone_got_it">Tuigim</string>
@@ -2063,8 +2150,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Tapáil anseo chun fís a chur ar siúl</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Chun glaoch ar %1$s, ní mór do Signal cead a bheith aige chun do cheamara a rochtain</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Chun glaoch ar %1$s, ní mór do Molly cead a bheith aige chun do cheamara a rochtain</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Glaoch…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Athnascadh…</string>
@@ -2136,10 +2223,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Bainte den ghlao</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Bhain duine éigin tusa den ghlao.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Ceadaigh rochtain ar do cheamara agus ar do mhicreafón</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Ceadaigh rochtain ar do mhicreafón</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Ceadaigh rochtain ar do cheamara</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Tabhair cead rochtana ar do cheamara agus ar do mhicreafón do Molly chun tús a chur le glao nó chun dul isteach i nglao.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Tabhair cead rochtana ar do mhicreafón do Molly chun tús a chur le glao nó chun dul isteach i nglao.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Tabhair cead rochtana ar do cheamara do Molly chun d\'fhíseán a chumasú.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Teastaíonn ceadanna micreafóin ó Molly chun tús a chur le glao nó chun dul isteach i nglao.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Teastaíonn rochtain ar an gceamara ó Molly chun d\'fhíseán a chumasú</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Chun tús a chur le glao nó chun dul isteach i nglao:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Chun d\'fhíseán a chumasú:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Glao Signal</string>
-    <string name="WebRtcCallView__signal_video_call">Físghlao Signal</string>
+    <string name="WebRtcCallView__signal_call">Glao Molly</string>
+    <string name="WebRtcCallView__signal_video_call">Físghlao Molly</string>
     <string name="WebRtcCallView__start_call">Tosaigh an glao</string>
     <string name="WebRtcCallView__join_call">Téigh isteach sa ghlao</string>
     <string name="WebRtcCallView__call_is_full">Call is Full</string>
@@ -2244,25 +2351,50 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Ísligh do lámh?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Ísligh Lámh</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Ísligh</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Cuir ar ceal</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">D\'ardaigh tú do lámh</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">AMHARC</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">D\'ardaigh %1$s lámh</item>
-        <item quantity="two">D\'ardaigh %1$s + %2$d lámh</item>
-        <item quantity="few">D\'ardaigh %1$s + %2$d lámh</item>
-        <item quantity="many">D\'ardaigh %1$s + %2$d lámh</item>
-        <item quantity="other">D\'ardaigh %1$s + %2$d lámh</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">D\'ardaigh %1$s lámh</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">D\'ardaigh %1$s +%2$d lámh</item>
+        <item quantity="two">D\'ardaigh %1$s + %2$d dhuine lámh</item>
+        <item quantity="few">D\'ardaigh %1$s + %2$d dhuine lámh</item>
+        <item quantity="many">D\'ardaigh %1$s + %2$d nduine lámh</item>
+        <item quantity="other">D\'ardaigh %1$s + %2$d duine lámh</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">D\'ardaigh %1$s lámh</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">D\'ardaigh %1$s + %2$d lámh</item>
+        <item quantity="two">D\'ardaigh %1$s + %2$d dhuine lámh</item>
+        <item quantity="few">D\'ardaigh %1$s + %2$d dhuine lámh</item>
+        <item quantity="many">D\'ardaigh %1$s + %2$d nduine lámh</item>
+        <item quantity="other">D\'ardaigh %1$s + %2$d duine lámh</item>
+    </plurals>
+
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="two">%1$s + %2$d</item>
+        <item quantity="few">%1$s + %2$d</item>
+        <item quantity="many">%1$s + %2$d</item>
+        <item quantity="other">%1$s + %2$d</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="two">%1$s + %2$d</item>
         <item quantity="few">%1$s + %2$d</item>
@@ -2371,7 +2503,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Cuirfear glao ort chun an uimhir seo a dheimhniú.</string>
     <string name="RegistrationActivity_edit_number">Edit Number</string>
     <string name="RegistrationActivity_missing_google_play_services">Níl Google Play Services le fáil.</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Níl Seirbhísí Google Play ar fáil ar an ngléas seo. Is féidir leat Signal a úsáid mar sin féin, ach d\'fhéadfadh sé go mbeadh sé níos éagobhsaí nó níos moille.\n\nMura bhfuil tú i d\'ardúsáideoir, nó mura bhfuil ROM Android iardhíola agat, nó má chreideann tú gur botún é an teachtaireacht seo, déan teagmháil le support@signal.org chun cúnamh a fháil.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Níl Seirbhísí Google Play ar fáil ar an ngléas seo. Is féidir leat Molly a úsáid mar sin féin, ach d\'fhéadfadh sé go mbeadh sé níos éagobhsaí nó níos moille.\n\nMura bhfuil tú i d\'ardúsáideoir, nó mura bhfuil ROM Android iardhíola agat, nó má chreideann tú gur botún é an teachtaireacht seo, déan teagmháil le support@molly.im chun cúnamh a fháil.</string>
     <string name="RegistrationActivity_i_understand">Tuigim</string>
     <string name="RegistrationActivity_play_services_error">Botún le Play Services</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Tá Seirbhísí Google Play á nuashonrú, nó níl aon fháil orthu faoi láthair. Bain triail eile as.</string>
@@ -2389,7 +2521,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Formáid uimhreacha neamhchaighdeánach</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Is cosúil go bhfuil formáid neamhchaighdeánach ar an uimhir a chuir tú isteach (%1$s).\n\nAn raibh %2$s i gceist agat?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android — Formáid don Uimhir Ghutháin</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android — Formáid don Uimhir Ghutháin</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Glao iarrtha</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2426,8 +2558,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Deacracht agat le clárú?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Cinntigh go bhfuil comhartha móibíleach ag do ghuthán chun do SMS nó glao a fháil\n • Deimhnigh gur féidir leat glao gutháin a fháil ar an uimhir\n • Cinntigh gur chuir tú d\'uimhir ghutháin isteach i gceart.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Le tuilleadh faisnéise a fháil, lean na céimeanna fabhtcheartaithe seo nó déan teagmháil leis an bhFoireann Tacaíochta</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Chun tuilleadh faisnéise a fháil, lean %1$s nó %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">na céimeanna fabhtcheartaithe seo</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2465,13 +2597,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Cuir leis na teagmhálacha</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Tabhair cuireadh chuig Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Tabhair cuireadh chuig Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Teachtaireacht Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Glao Signal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Cuir leis na teagmhálacha</string>
-    <string name="SharedContactView_invite_to_signal">Tabhair cuireadh chuig Signal</string>
+    <string name="SharedContactView_invite_to_signal">Tabhair cuireadh chuig Molly</string>
     <string name="SharedContactView_message">Teachtaireacht Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2602,11 +2734,11 @@
     <string name="ThreadRecord_s_belongs_to_s">Is le %2$s %1$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Nuashonrú Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Tá leagan nua de Signal ar fáil. Tapáil lena nuashonrú.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Theip ar nuashonrú Signal</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Nuashonrú Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Tá leagan nua de Molly ar fáil. Tapáil lena nuashonrú.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Theip ar nuashonrú Molly</string>
     <string name="ApkUpdateNotifications_failed_general_body">Triailfimid arís níos déanaí.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">D\'éirigh le nuashonrú Signal</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">D\'éirigh le nuashonrú Molly</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Nuashonraíodh go huathoibríoch chuig leagan %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2680,7 +2812,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Ár uimhir shábhála Signal:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Tá an dealramh air nach bhfuil aon fheidhmchláirín agat lena roinnt leis.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Níl aon uimhir shábhála sa ghearrthaisce chun cuir i gcomórtas leis.</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Tá gá ag Signal cead cheamara chun QR code a scanadh, ach ní ceadaítear é go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Ceamara\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Tá gá ag Molly cead cheamara chun QR code a scanadh, ach ní ceadaítear é go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Ceamara\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Ní féidir QR code a scanadh gan cead Cheamara.</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Ní mór duit teachtaireachtaí a mhalartú ar dtús chun amharc ar uimhir sábháilteachta %1$s.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2710,14 +2842,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Tadhaill chun é a oscailt.</string>
-    <string name="KeyCachingService_passphrase_cached">Tá an glas bainte de Signal</string>
-    <string name="KeyCachingService_lock">Cuir Signal faoi ghlas</string>
+    <string name="KeyCachingService_passphrase_cached">Tá an glas bainte de Molly</string>
+    <string name="KeyCachingService_lock">Cuir Molly faoi ghlas</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Tusa</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Cineál meán nach dtugtar tacaíocht dó</string>
     <string name="MediaPreviewActivity_draft">Dréacht</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Tá Cead stórála ag teastáil ó Signal chun sábháil chuig stóras seachtrach, ach diúltaíodh go buan dó. Lean ar aghaidh chuig socruithe na haipe, roghnaigh \"Ceadanna\" agus cumasaigh \"Stóras\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Tá Cead stórála ag teastáil ó Molly chun sábháil chuig stóras seachtrach, ach diúltaíodh go buan dó. Lean ar aghaidh chuig socruithe na haipe, roghnaigh \"Ceadanna\" agus cumasaigh \"Stóras\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Ní féidir sábháil chuig stóras seachtrach gan ceadanna</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Scrios an teachtaireacht?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Scriosfar an teachtaireacht seo go buan leis sin.</string>
@@ -2767,7 +2899,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Theip ar an theachtaireacht a thabhairt.</string>
     <string name="MessageNotifier_error_delivering_message">Tharla botún ag tabhairt an teachtaireacht.</string>
     <string name="MessageNotifier_message_delivery_paused">Cuireadh seachadadh na teachtaireachta ar sos.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Fíoraigh chun leanúint le cur teachtaireachtaí ar Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Fíoraigh chun leanúint le cur teachtaireachtaí ar Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Rianaigh uile mar léite</string>
     <string name="MessageNotifier_mark_read">Rianaigh mar léite</string>
     <string name="MessageNotifier_turn_off_these_notifications">Múch na fógraí seo</string>
@@ -2789,7 +2921,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Tugadh freagairt %1$s do do ghreamán.</string>
     <string name="MessageNotifier_this_message_was_deleted">Scriosadh an teachtaireacht seo.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Ar mhúch tú na fógraí gur thosaigh teagmhálaithe ag baint feidhm as Signal? Is féidir leat iad a chumasú arís i Signal &gt; Socruithe &gt; Fógraí.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Ar mhúch tú na fógraí gur thosaigh teagmhálaithe ag baint feidhm as Molly? Is féidir leat iad a chumasú arís i Molly &gt; Socruithe &gt; Fógraí.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2828,7 +2960,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Níl freagairt tapa le fáil agus Signal faoi ghlas.</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Níl freagairt tapa le fáil agus Molly faoi ghlas.</string>
     <string name="QuickResponseService_problem_sending_message">Tharla fadhb ag seoladh na teachtaireachta!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2848,7 +2980,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Aicearra neamhbhailí</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Teachtaireacht nua</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Iarratas Teachtaireachta</string>
     <string name="SingleRecipientNotificationBuilder_you">Tusa</string>
@@ -2897,7 +3029,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Níl an gléas seo cláraithe a thuilleadh. Is dócha gur chláraigh tú d’uimhir ghutháin le Signal ar ghléas eile is cúis leis.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Níl an gléas seo cláraithe a thuilleadh. Is dócha gur chláraigh tú d’uimhir ghutháin le Molly ar ghléas eile is cúis leis.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Athchláraigh an Gléas</string>
 
@@ -2910,10 +3042,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Chun an glao a fhreagairt, tabhair rochtain do Signal ar do mhicreafón.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Chun an glao a fhreagairt, tabhair rochtain do Molly ar do mhicreafón.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Tabhair rochtain do Signal ar do mhicreafón agus ceamara leis an bhfísghlao a fhreagairt.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Tá gá ag Signal le ceadanna micreafóin agus cheamara chun glaonna a chuir nó a fháil, ach ní ceadaítear iad go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Micreafón\" agus \"Ceamara\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Tabhair rochtain do Molly ar do mhicreafón agus ceamara leis an bhfísghlao a fhreagairt.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Tá gá ag Molly le ceadanna micreafóin agus cheamara chun glaonna a chuir nó a fháil, ach ní ceadaítear iad go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Micreafón\" agus \"Ceamara\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Freagartha ar ghléas nasctha.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Diúltaithe dó ar ghléas nasctha.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Gnóthach ar ghléas nasctha.</string>
@@ -2958,16 +3090,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Scríobh arís an nath faire nua</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Tabhair cuireadh chuig Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Tabhair cuireadh chuig Molly</string>
     <string name="contact_selection_activity__new_group">Baicle nua</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Athnuaigh teagmhálaithe</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Duine ar iarraidh? Triail athnuachan</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Aimsigh daoine a bhfuil aithne agat orthu ar Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Ceadaigh rochtain ar do theagmhálaithe</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Tuilleadh</string>
 
@@ -2984,7 +3116,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Grianghraf den teagmhálaí</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Tá gá ag Signal le cead teagmhálaí chun teagmháláithe a léiriú, ach ní ceadaítear é go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Teagmhálaí\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Tá gá ag Molly le cead teagmhálaí chun teagmháláithe a léiriú, ach ní ceadaítear é go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Teagmhálaí\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Tharla earráid le teagmhálaithe a aisghabháil, seiceáil do nasc líonra</string>
     <string name="ContactSelectionListFragment_username_not_found">Níor aimsíodh an t-ainm úsáideora sin</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"Ní úsáideoir Signal é/í %1$s. Seiceáil an t-ainm úsáideora agus triail arís."</string>
@@ -3005,16 +3137,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Aimsigh de réir ainm úsáideora</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Ceadaigh rochtain ar na teagmhálaithe</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Chun daoine a bhfuil aithne agat orthu a aimsiú ar Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Ceadaigh Rochtain</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Níl, go raibh maith agat</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Ceadaigh rochtain ar do theagmhálaithe. Tá do theagmhálaithe criptithe agus dofheicthe ag seirbhís Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Tá gá ag Signal riochtain ar do theagmhálaithe chun iad a thaispeáint.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Tá gá ag Molly riochtain ar do theagmhálaithe chun iad a thaispeáint.</string>
     <string name="contact_selection_list_fragment__show_contacts">Táispeáin teagmhálaithe</string>
 
     <!-- contact_selection_list_item -->
@@ -3093,6 +3227,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Bhain tú an duine sin, má sheolann tú teachtaireachtaí chuige/chuici arís cuirfear ar do liosta arís é/í.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Roghanna</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Nuashonraigh</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Seinn … Cuir ar sos</string>
@@ -3121,7 +3257,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Is gné de chuid Android iad bolgáin, ar féidir leat í a chasadh air nó as do chomhráite Signal.</string>
+    <string name="BubbleOptOutTooltip__description">Is gné de chuid Android iad bolgáin, ar féidir leat í a chasadh air nó as do chomhráite Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Ní anois</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3310,9 +3446,9 @@
     <string name="EditProfileFragment__group_description">Group Description</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Nuashonraigh Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Nuashonraigh Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Tá an leagan seo de Signal imithe as feidhm. Nuashonraigh anois le leanúint le húsáid Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Tá an leagan seo de Molly imithe as feidhm. Nuashonraigh anois le leanúint le húsáid Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Nuashonraigh</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3532,7 +3668,7 @@
     <string name="preferences__slow">Mall</string>
     <string name="preferences__help">Cabhair</string>
     <string name="preferences__advanced">Ardroghanna</string>
-    <string name="preferences__donate_to_signal">Tabhair airgead do Signal</string>
+    <string name="preferences__donate_to_signal">Tabhair airgead do Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Príobháideachas</string>
     <!-- Preference label for stories -->
@@ -3569,13 +3705,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Athraigh deilbhín agus ainm na haipe go \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Beidh ar Signal dúnadh chun deilbhín agus ainm na haipe a athrú. Taispeánfar deilbhín agus ainm réamhshocraithe Signal i gcónaí i bhFógraí.</string>
+    <string name="preferences__app_icon_dialog_description">Beidh ar Molly dúnadh chun deilbhín agus ainm na haipe a athrú. Taispeánfar deilbhín agus ainm réamhshocraithe Molly i gcónaí i bhFógraí.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Roghnaigh deilbhín agus ainm aipe, rud a bheidh infheicthe ar scáileán baile agus tarraiceán aipeanna do ghléis. Taispeánfar deilbhín agus ainm réamhshocraithe Signal i gcónaí i bhFógraí. Tuilleadh faisnéise</string>
+    <string name="preferences__app_icon_warning_learn_more">Roghnaigh deilbhín agus ainm aipe, rud a bheidh infheicthe ar scáileán baile agus tarraiceán aipeanna do ghléis. Taispeánfar deilbhín agus ainm réamhshocraithe Molly i gcónaí i bhFógraí. Tuilleadh faisnéise</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Tá deilbhíní agus ainmneacha aipe infheicthe ar an scáileán baile agus tarraiceán aipeanna.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Taispeánfar deilbhín agus ainm réamhshocraithe Signal i gcónaí i bhFógraí.</string>
+    <string name="preferences__app_icon_notification_warning">Taispeánfar deilbhín agus ainm réamhshocraithe Molly i gcónaí i bhFógraí.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Tuilleadh faisnéise</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3625,8 +3761,12 @@
         <item quantity="other">Bearrfar gach comhrá go buan chuig na %1$s teachtaireacht is déanaí leis sin.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Scriosfar go buan an stair teachtaireachtaí ar fad agus na meáin go léir ó do ghléas leis sin.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Scriosfar an stair teachtaireachtaí agus na meáin go léir ón ngléas seo agus ó aon ghléasanna nasctha leis sin.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">An bhfuil tú cinnte gur mhaith leat an stair teachtaireachtaí ar fad a scriosadh?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Bainfear go buan an stair teachtaireachtaí ar fad. Ní féidir an gníomh seo a chealú.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Bainfear an stair teachtaireachtaí go léir ó gach gléas go buan. Ní féidir an gníomh sin a chealú.</string>
     <string name="preferences_storage__delete_all_now">Scrios iad uile anois</string>
     <string name="preferences_storage__forever">Choíche</string>
     <string name="preferences_storage__one_year">1 bhliain amháin</string>
@@ -3666,7 +3806,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Sárú na Cinsireachta</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Sárú na Cinsireachta</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Leis an rogha seo, déanfaidh Signal iarracht an chinsireacht a shárú. Ná húsáid an rogha seo mura bhfuil tú i dtír a dhéanann cinsireacht ar Signal.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Leis an rogha seo, déanfaidh Molly iarracht an chinsireacht a shárú. Ná húsáid an rogha seo mura bhfuil tú i dtír a dhéanann cinsireacht ar Molly.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Cuireadh sárú na cinsireachta i bhfeidhm bunaithe ar an uimhir ghutháin atá agat.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3718,7 +3858,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Tús Eolais ar Íocaíochtaí</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Úsáid Signal le MobileCoin a sheoladh agus a fháil, airgeadra digiteach úrnua atá dírithe ar phríobháideachas. Gníomhachtaigh le tosú air.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Úsáid Molly le MobileCoin a sheoladh agus a fháil, airgeadra digiteach úrnua atá dírithe ar phríobháideachas. Gníomhachtaigh le tosú air.</string>
     <string name="PaymentsHomeFragment__activate_payments">Gníomhachtaigh Íocaíochtaí</string>
     <string name="PaymentsHomeFragment__activating_payments">Íocaíochtaí á ngníomhachtú…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Aischuir an cuntas íocaíochtaí</string>
@@ -3744,7 +3884,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Níl íocaíochtaí ar fáil i do réigiún.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Níorbh fhéidir íocaíochtaí a chumasú. Triail arís níos déanaí.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Deactivate Payments?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">You will not be able to send or receive Mobilecoin in Signal if you deactivate payments.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">You will not be able to send or receive Mobilecoin in Molly if you deactivate payments.</string>
     <string name="PaymentsHomeFragment__deactivate">Díchumasaigh</string>
     <string name="PaymentsHomeFragment__continue">Ar Aghaidh</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Níl an t-iarmhéid ar fáil faoi láthair.</string>
@@ -3753,10 +3893,10 @@
     <string name="PaymentsHomeFragment__details">Mionsonraí</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Is féidir leat Signal a úsáid chun MobileCoin a sheoladh agus a fháil. Tá gach íocaíocht faoi réir Téarmaí Úsáide MobileCoin agus MobileCoin Wallet. Seans go mbeidh roinnt fadhbanna agat agus nach mbeidh tú in ann íocaíochtaí nó iarmhéideanna, a d\'fhéadfá a chailleadh, a fháil ar ais. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Is féidir leat Molly a úsáid chun MobileCoin a sheoladh agus a fháil. Tá gach íocaíocht faoi réir Téarmaí Úsáide MobileCoin agus MobileCoin Wallet. Seans go mbeidh roinnt fadhbanna agat agus nach mbeidh tú in ann íocaíochtaí nó iarmhéideanna, a d\'fhéadfá a chailleadh, a fháil ar ais. </string>
     <string name="PaymentsHomeFragment__activate">Cuir i ngníomh é</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Amharc ar théarmaí MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Payments in Signal is no longer available. You can still transfer funds to an exchange but you can no longer send and receive payments or add funds.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Payments in Molly is no longer available. You can still transfer funds to an exchange but you can no longer send and receive payments or add funds.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3784,7 +3924,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Tabhair Ceadanna</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Chun cabhrú leat teachtaireacht a sheoladh chuig daoine a bhfuil aithne agat orthu, iarrfaidh Signal na ceadanna seo. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Chun cabhrú leat teachtaireacht a sheoladh chuig daoine a bhfuil aithne agat orthu, iarrfaidh Molly na ceadanna seo. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Fógraí</string>
     <!-- Notifications permission row description -->
@@ -3872,10 +4012,10 @@
     <string name="PaymentsTransferFragment__next">Ar Aghaidh</string>
     <string name="PaymentsTransferFragment__invalid_address">Seoladh neamhbhailí</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Seiceáil seoladh an sparáin a bhfuil tú ag iarraidh aistriú chuige agus triail arís.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Ní féidir leat aistriú chuig do sheoladh sparáin Signal féin. Cuir isteach seoladh an sparáin ó do chuntas ag malartán tacaithe.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Chun cód QR a scanadh, tá rochtain ar an gceamara ag teastáil ó Signal.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Teastaíonn Cead ceamara ó Signal chun cód QR a ghabháil. Téigh chuig socruithe, roghnaigh \"Ceadanna\", agus cumasaigh \"Ceamara\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Chun cód QR a scanadh, tá rochtain ar an gceamara ag teastáil ó Signal.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Ní féidir leat aistriú chuig do sheoladh sparáin Molly féin. Cuir isteach seoladh an sparáin ó do chuntas ag malartán tacaithe.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Chun cód QR a scanadh, tá rochtain ar an gceamara ag teastáil ó Molly.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Teastaíonn Cead ceamara ó Molly chun cód QR a ghabháil. Téigh chuig socruithe, roghnaigh \"Ceadanna\", agus cumasaigh \"Ceamara\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Chun cód QR a scanadh, tá rochtain ar an gceamara ag teastáil ó Molly.</string>
     <string name="PaymentsTransferFragment__settings">Socruithe</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -4250,17 +4390,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Guthghlao Signal isteach</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Guthghlao Molly isteach</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Físghlao Signal isteach</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Físghlao Molly isteach</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Glao grúpa Signal isteach</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Glao grúpa Molly isteach</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Guthghlao leanúnach Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Guthghlao leanúnach Molly</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Físghlao leanúnach Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Físghlao leanúnach Molly</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Grúpghlao leanúnach Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Grúpghlao leanúnach Molly</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Ag luchtú…</string>
@@ -4307,9 +4447,9 @@
     <string name="BackupDialog_verify">Deimhnigh</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">D\'éirigh leat do phasfhrása cúltaca a chur isteach</string>
     <string name="BackupDialog_passphrase_was_not_correct">Ní raibh an pasfhrása ceart</string>
-    <string name="LocalBackupJob_creating_signal_backup">Cúltaca Signal á chruthú…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Cúltaca Molly á chruthú…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Cúltaca Signal á fhíorú…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Cúltaca Molly á fhíorú…</string>
     <string name="LocalBackupJobApi29_backup_failed">Theip ar an gCúltaca</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Scriosadh nó bogadh d\'eolaire cúltaca.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Tá do chomhad cúltaca rómhór le stóráil san imleabhar seo.</string>
@@ -4324,15 +4464,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Glaoigh orm (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Athsheol Cód (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Déan teagmháil le foireann tacaíochta Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Clárúchán Signal — Cód Deimhniúcháin ar Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Déan teagmháil le foireann tacaíochta Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Clárúchán Molly — Cód Deimhniúcháin ar Android</string>
     <string name="RegistrationActivity_incorrect_code">Cód mícheart</string>
     <string name="BackupUtil_never">Choíche</string>
     <string name="BackupUtil_unknown">Anaithnid</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Uimhir ghutháin</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Roghnaigh na daoine atá in ann d\'uimhir ghutháin a fheiceáil agus teagmháil a dhéanamh leat ar Signal léi.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Roghnaigh na daoine atá in ann d\'uimhir ghutháin a fheiceáil agus teagmháil a dhéanamh leat ar Molly léi.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Na daoine atá in ann m\'uimhir a fheiceáil</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4380,7 +4520,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Rinne tú an iomarca iarrachtaí. Bain triail eile as ar ball.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Earráid agus ceangal á bhunú leis an tseirbhís</string>
     <string name="preferences_chats__backups">Cúltacaithe</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Tá Signal faoi ghlas</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Tá Molly faoi ghlas</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">CNAG CHUN É A DHÍGHLASÁIL</string>
     <string name="Recipient_unknown">Anaithnid</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4411,9 +4551,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Beidh rochtain ar do sheanghléas de dhíth ort.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Aischuir ó chúltaca</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Aischuir do theachtaireachtaí ó chúltaca logánta. Mura ndéanann tú an t-aischur anois, ní bheidh tú in ann iad a aischur níos déanaí.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Aischuir cúltaca logánta</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Aischuir cúltaca Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Aischuir do theachtaireachtaí téacs uile + na 30 lá deiridh de do mheáin</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Tuilleadh roghanna</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Cuir ar ceal</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Logáil isteach gan aistriú</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Lean leis gan do theachtaireachtaí agus meáin a aistriú</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Oscail Signal ar do sheanghuthán Android</string>
     <string name="NewDeviceTransferInstructions__continue">Ar Aghaidh</string>
@@ -4428,19 +4575,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Nascadh le seanghléas Android á ullmhú…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Fan nóiméad, beidh sé réidh ar ball beag</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Ag fanacht leis an seanghléas Android nascadh…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Tá cead suímh ag teastáil ó Signal chun do sheanghléas Android a aimsiú agus nascadh leis.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Tá cumasú seirbhísí suímh ag teastáil ó Signal chun do sheanghléas Android a aimsiú agus nascadh leis.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Tá Wi-Fi air ag teastáil ó Signal chun do sheanghléas Android a aimsiú agus nascadh leis. Is gá Wi-Fi a bheith air ach ní gá dó a bheith nasctha le líonra Wi-Fi.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Ár leithscéal, is cosúil nach dtacaíonn an gléas seo le Wi-Fi Direct. Úsáideann Signal Wi-Fi Direct chun do sheanghléas Android a aimsiú agus nascadh leis. Is féidir leat cúltaca a aischur fós chun do chuntas a aischur ó do sheanghléas Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Tá cead suímh ag teastáil ó Molly chun do sheanghléas Android a aimsiú agus nascadh leis.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Tá cumasú seirbhísí suímh ag teastáil ó Molly chun do sheanghléas Android a aimsiú agus nascadh leis.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Tá Wi-Fi air ag teastáil ó Molly chun do sheanghléas Android a aimsiú agus nascadh leis. Is gá Wi-Fi a bheith air ach ní gá dó a bheith nasctha le líonra Wi-Fi.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Ár leithscéal, is cosúil nach dtacaíonn an gléas seo le Wi-Fi Direct. Úsáideann Molly Wi-Fi Direct chun do sheanghléas Android a aimsiú agus nascadh leis. Is féidir leat cúltaca a aischur fós chun do chuntas a aischur ó do sheanghléas Android.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Aischuir cúltaca</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Tharla earráid gan choinne agus iarracht á déanamh nascadh le do sheanghléas Android.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Gléas nua Android á chuardach…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Tá cead suímh ag teastáil ó Signal chun do ghléas nua Android a aimsiú agus nascadh leis.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Tá cumasú seirbhísí suímh ag teastáil ó Signal chun do ghléas nua Android a aimsiú agus nascadh leis.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Tá Wi-Fi air ag teastáil ó Signal chun do ghléas nua Android a aimsiú agus nascadh leis. Is gá Wi-Fi a bheith air ach ní gá dó a bheith nasctha le líonra Wi-Fi.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Ár leithscéal, is cosúil nach dtacaíonn an gléas seo le Wi-Fi Direct. Úsáideann Signal Wi-Fi Direct chun do ghléas nua Android a aimsiú agus nascadh leis. Is féidir leat cúltaca a chruthú fós chun do chuntas a aischur ar do ghléas nua Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Tá cead suímh ag teastáil ó Molly chun do ghléas nua Android a aimsiú agus nascadh leis.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Tá cumasú seirbhísí suímh ag teastáil ó Molly chun do ghléas nua Android a aimsiú agus nascadh leis.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Tá Wi-Fi air ag teastáil ó Molly chun do ghléas nua Android a aimsiú agus nascadh leis. Is gá Wi-Fi a bheith air ach ní gá dó a bheith nasctha le líonra Wi-Fi.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Ár leithscéal, is cosúil nach dtacaíonn an gléas seo le Wi-Fi Direct. Úsáideann Molly Wi-Fi Direct chun do ghléas nua Android a aimsiú agus nascadh leis. Is féidir leat cúltaca a chruthú fós chun do chuntas a aischur ar do ghléas nua Android.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Cruthaigh cúltaca</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Tharla earráid gan choinne agus iarracht á déanamh nascadh le do ghléas nua Android.</string>
 
@@ -4481,7 +4628,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Sonraí á nAistriú</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Coinnigh an dá ghléas gar dá chéile. Ná cas as na gléasanna agus coinnigh Signal oscailte. Tá traschur criptithe ó cheann ceann.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Coinnigh an dá ghléas gar dá chéile. Ná cas as na gléasanna agus coinnigh Molly oscailte. Tá traschur criptithe ó cheann ceann.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d teachtaireachtaí go nuige seo…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% de theachtaireachtaí go dtí seo…</string>
@@ -4495,7 +4642,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Cuntas a Aistriú</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Íosluchtaigh Signal ar do ghléas Android nua</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Íosluchtaigh Molly ar do ghléas Android nua</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Tapáil ar Traschuir nó aischuir an cuntas"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4569,7 +4716,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Is féidir le haon duine leis an nasc seo amharc ar ainm agus grianghraf an ghrúpa agus iarraidh ar dhul isteach ann. Comhroinn le daoine a bhfuil muinín agat astu é.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Is féidir le haon duine leis an nasc seo amharc ar ainm agus grianghraf an ghrúpa agus dul isteach sa ghrúpa. Comhroinn le daoine a bhfuil muinín agat astu é.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Comhroinn trí Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Comhroinn trí Molly</string>
     <string name="GroupLinkBottomSheet_copy">Cóipeáil</string>
     <string name="GroupLinkBottomSheet_qr_code">Tagairt QR</string>
     <string name="GroupLinkBottomSheet_share">Comhroinn</string>
@@ -4776,7 +4923,7 @@
     <string name="payment_info_card_about_mobilecoin">Maidir le MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">Airgeadra digiteach úrnua atá dírithe ar phríobháideachas is ea MobileCoin.</string>
     <string name="payment_info_card_adding_funds">Adding Funds</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">You can add funds for use in Signal by sending MobileCoin to your wallet address.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">You can add funds for use in Molly by sending MobileCoin to your wallet address.</string>
     <string name="payment_info_card_cashing_out">Cashing out</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">You can cash out MobileCoin anytime on an exchange that supports MobileCoin. Just make a transfer to your account at that exchange.</string>
     <string name="payment_info_card_hide_this_card">Cuir an cárta seo i bhfolach?</string>
@@ -4797,12 +4944,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Díchumasaigh Sparán</string>
     <string name="DeactivateWalletFragment__your_balance">An t-iarmhéid agat</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Moltar duit do chistí a aistriú chuig seoladh sparáin eile roimh íocaíochtaí a dhíchumasú. Má roghnaíonn tú gan do chistí a aistriú anois, fanfaidh siad i do sparán atá nasctha le Signal má chumasaíonn tú íocaíochtaí arís.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Moltar duit do chistí a aistriú chuig seoladh sparáin eile roimh íocaíochtaí a dhíchumasú. Má roghnaíonn tú gan do chistí a aistriú anois, fanfaidh siad i do sparán atá nasctha le Molly má chumasaíonn tú íocaíochtaí arís.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Transfer Remaining Balance</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Deactivate Without Transferring</string>
     <string name="DeactivateWalletFragment__deactivate">Díchumasaigh</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Deactivate Without Transferring?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Fanfaidh d\'iarmhéid i do sparán atá nasctha le Signal má roghnaíonn tú íocaíochtaí a athghníomhachtú.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Fanfaidh d\'iarmhéid i do sparán atá nasctha le Molly má roghnaíonn tú íocaíochtaí a athghníomhachtú.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Tharla earráid le díghníomhachtú an sparáin.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -5103,7 +5250,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Ceadúnais</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Téarmaí Úsáide ⁊ Polasaí Príobháideachais</string>
-    <string name="HelpFragment__copyright_signal_messenger">Cóipcheart Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Cóipcheart Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Ceadúnaithe faoi GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -5118,7 +5265,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">auto</string>
+    <string name="ChatColorSelectionFragment__auto">Uath</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Úsáid dathanna saincheaptha</string>
     <string name="ChatColorSelectionFragment__chat_color">Dath an chomhrá</string>
     <string name="ChatColorSelectionFragment__edit">Eagar</string>
@@ -5353,9 +5500,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Roghnaigh dath</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Comhroinn</string>
 
@@ -5401,7 +5545,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Níl cead ach ag riarthóirí teachtaireachtaí a sheoladh chuig an ngrúpa seo.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Teorainn bainte amach</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Ní féidir leat níos mó ná 5 chomhrá a roghnú</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5584,9 +5729,9 @@
     <string name="MySupportPreference__learn_more">Tuilleadh faisnéise</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Nuashonraigh Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Nuashonraigh Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Tá an leagan seo de Signal imithe as feidhm. Nuashonraigh anois le leanúint le húsáid Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Tá an leagan seo de Molly imithe as feidhm. Nuashonraigh anois le leanúint le húsáid Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Nuashonraigh</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5595,7 +5740,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Níl an gléas cláraithe</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Níl an gléas seo cláraithe a thuilleadh. Athchláraigh le leanúint le húsáid Signal ar an ngléas seo.</string>
+    <string name="ReregisterSignalDialog__message">Níl an gléas seo cláraithe a thuilleadh. Athchláraigh le leanúint le húsáid Molly ar an ngléas seo.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Athchláraigh</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5889,7 +6034,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Theip air an roghnóir a oscailt.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Chun fógraí a chumasú, teastaíonn cead ó Signal lena dtaispeáint.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Chun fógraí a chumasú, teastaíonn cead ó Molly lena dtaispeáint.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Cas orthu</string>
 
@@ -6047,8 +6192,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">No replies yet</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Ní féidir leat freagairt don scéal seo mar níl tú i do bhall den ghrúpa seo a thuilleadh.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Tugadh freagairt don scéal</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">a thug freagairt don scéal</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">a thug freagairt don scéal</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Amhairc</string>
     <!-- Label for story replies tab -->
@@ -6716,8 +6863,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Roghnaigh do bhanc</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Deimhnigh do Thabhartas le %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Chun tabhartas athfhillteach a shocrú, tapáil Lean leis le táille €0.01 le do bhanc a dheimhniú. Aisíocfar é sin go huathoibríoch agus tabharfaidh sé cead dúinn do thabhartas €5/sa mhí a ghearradh ar do chuntas.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Chun do thabhartas athfhillteach a shocrú, tapáil Lean leis le táille €0.01 le do bhanc a dheimhniú. Aisíocfar é sin go huathoibríoch agus tabharfaidh sé cead do thabhartas %1$s/sa mhí a ghearradh ar do chuntas.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Ar aghaidh</string>
 
@@ -7314,6 +7461,58 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Sonraí cúltaca á n-íoslódáil…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Tá cúltacaí meán casta as</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Cuireadh do phlean Signal um chúltacú meán ar ceal toisc nárbh fhéidir linn d\'íocaíocht a phróiseáil. Tá %1$d lá agat le haon mheáin atá stóráilte i do chúltaca a íoslódáil. Tar éis %1$d lá, scriosfar na meáin i do chúltaca.</item>
+        <item quantity="two">Cuireadh do phlean Signal um chúltacú meán ar ceal toisc nárbh fhéidir linn d\'íocaíocht a phróiseáil. Tá %1$d lá agat le haon mheáin atá stóráilte i do chúltaca a íoslódáil. Tar éis %1$d lá, scriosfar na meáin i do chúltaca.</item>
+        <item quantity="few">Cuireadh do phlean Signal um chúltacú meán ar ceal toisc nárbh fhéidir linn d\'íocaíocht a phróiseáil. Tá %1$d lá agat le haon mheáin atá stóráilte i do chúltaca a íoslódáil. Tar éis %1$d lá, scriosfar na meáin i do chúltaca.</item>
+        <item quantity="many">Cuireadh do phlean Signal um chúltacú meán ar ceal toisc nárbh fhéidir linn d\'íocaíocht a phróiseáil. Tá %1$d lá agat le haon mheáin atá stóráilte i do chúltaca a íoslódáil. Tar éis %1$d lá, scriosfar na meáin i do chúltaca.</item>
+        <item quantity="other">Cuireadh do phlean Signal um chúltacú meán ar ceal toisc nárbh fhéidir linn d\'íocaíocht a phróiseáil. Tá %1$d lá agat le haon mheáin atá stóráilte i do chúltaca a íoslódáil. Tar éis %1$d lá, scriosfar na meáin i do chúltaca.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Is féidir leat tosú ag íoc as cúltacaí arís am ar bith le leanúint le cúltacú do mheán uile. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Scriosfar do mheáin inniu</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Cuireadh do phlean Signal um chúltacú meán ar ceal toisc nárbh fhéidir linn d\'íocaíocht a phróiseáil. Seo do dheis dheiridh na meáin i do chúltaca a íoslódáil sula scriosfar é.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Ní féidir an íoslódáil a chur i gcrích</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Ní leor an spás saor i do ghléas. Saor suas le %1$s de spás leis na meáin atá stóráilte i do chúltaca a íoslódáil.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Má roghnaíonn tú \"Gabh thar\" scriosfar na meáin i do chúltaca i gceann %1$d lá.</item>
+        <item quantity="two">Má roghnaíonn tú \"Gabh thar\" scriosfar na meáin i do chúltaca i gceann %1$d lá.</item>
+        <item quantity="few">Má roghnaíonn tú \"Gabh thar\" scriosfar na meáin i do chúltaca i gceann %1$d lá.</item>
+        <item quantity="many">Má roghnaíonn tú \"Gabh thar\" scriosfar na meáin i do chúltaca i gceann %1$d lá.</item>
+        <item quantity="other">Má roghnaíonn tú \"Gabh thar\" scriosfar na meáin i do chúltaca i gceann %1$d lá..</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Ní féidir an íocaíocht as cúltacú a phróiseáil</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Tá fadhb againn d\'íocaíocht mhíosúil athfhillteach as cúltacú a bhailiú. Cinntigh go bhfuil do mhodh íocaíochta suas chun dáta. Mura bhfuil, nuashonraigh in Google Pay é. Triailfidh Signal an íocaíocht a phróiseáil arís i gceann cúpla lá.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Níorbh fhéidir an cúltaca a chur i gcrích</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Níor cuireadh cúltacú i gcrích ar do ghléas le %1$d lá anuas. Cinntigh go bhfuil do ghléas nasctha le wi-fi agus tapáil \"Cúltacaigh anois.\" </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Tuilleadh faisnéise</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Léim thar seo</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Íoslódáil meáin anois</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Íoslódáil níos déanaí</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Ná híoslódáil meáin</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Saor %1$s de spás le do mheáin a íoslódáil.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Cárta creidmheasa nó dochair</string>
@@ -7327,6 +7526,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Anaithnid</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Stair íocaíochtaí</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Rinneadh do chúltaca deiridh %1$s ag %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -7337,6 +7542,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Scriosfar go buan teachtaireachtaí atá níos sine ná an t-am roghnaithe.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Scriosfar go buan teachtaireachtaí a sháraíonn an fad roghnaithe.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Cuir teorainneacha i bhfeidhm ar ghléasanna nasctha</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Agus teorainneacha le comhráite cumasaithe, scriosfar teachtaireachtaí ó do ghléasanna nasctha freisin.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Tá scriosadh sioncronaithe trasna do ghléasanna uile anois</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Nuair a scriosann tú teachtaireachtaí nó comhráite, scriosfar ó do ghuthán agus ó ghléasanna nasctha iad.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">CGL</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Stair íocaíochtaí</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Cúltaca téacs agus gach meáin</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Sonraí na híocaíochta</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Cineál cúltaca</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Date paid</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Comhroinn</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Cúltacaí Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Stair íocaíochtaí</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Sonraí an chúltaca</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Méid an chúltaca</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Minicíocht an chúltaca</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Déan cúltaca le nasc móibíleach</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Cas as agus scrios cúltaca</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Scriosadh an cúltaca agus casadh as é.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Athraíodh an cineál cúltaca agus cuireadh an síntiús ar ceal</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Cuireadh an síntiús ar ceal</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Íoslódáil críochnaithe</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Cineál cúltaca</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Cúltacaí díchumasaithe</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/sa mhí</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Cumasaigh cúltacaithe</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d / %2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Cúltaca deiridh</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s ag %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Choíche</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Déan cúltaca anois</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Cas as agus scrios cúltacaí?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Ní ghearrfar síntiús ort arís. Scriosfar do chúltaca agus ní chruthófar aon chúltacaí nua.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Cas as agus scrios</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Cúltaca á scriosadh…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Scriosadh an cúltaca</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Trí \"Déan cúltaca anois\" a thapáil"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Gach lá</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Gach seachtain</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Gach mí</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Déan cúltaca de láimh</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Cuir isteach UAP, pasfhocal, nó patrún do ghléis.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Ar aghaidh</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Athraigh cineál cúltaca</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Cuir Síntiús ar Ceal</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Deimhnigh cur ar ceal</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Ní ghearrfar síntiús ort arís. Casfar as cúltacaí ag deireadh do thimthrialla billeála. Tar éis an dáta sin, beidh 30 lá agat leis na meáin atá á gcúltacú agat faoi láthair a íoslódáil.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Deimhnigh agus íoslódáil anois</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Deimhnigh agus íoslódáil níos déanaí</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Coinnigh an síntiús</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index e473e834ff..3fc2a048f2 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal está actualizándose…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly está actualizándose…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Aínda non estableceches unha frase de acceso!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Desactivar frase de acceso?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Isto desbloqueará de xeito permanente Signal e as notificacións de mensaxes.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Isto desbloqueará de xeito permanente Molly e as notificacións de mensaxes.</string>
     <string name="ApplicationPreferencesActivity_disable">Desactivar</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Erro ao se conectar ao servidor!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PINs requírense para o bloqueo do rexistro. Para desactivar PINs, primeiro desactiva o bloqueo do rexistro.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Ficheiro</string>
     <string name="AttachmentKeyboard_contact">Contacto</string>
     <string name="AttachmentKeyboard_location">Localización</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal necesita permiso para mostrar as túas fotografías e vídeos</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly necesita permiso para mostrar as túas fotografías e vídeos</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Permitir acceso</string>
     <string name="AttachmentKeyboard_payment">Pagamento</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Non se atopa unha aplicación para seleccionar contido multimedia.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal require permiso de almacenamento para poder anexar fotografías, vídeos ou ficheiros de audio, pero este denegouse de forma permanente. Vai aos axustes da aplicación, selecciona «Permisos» e activa «Almacenamento».</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal require permiso para poder anexar información dos contactos, pero este denegouse de forma permanente. Vai a configuración da aplicación, selecciona «Permisos» e activa «Contactos».</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal require permiso para poder anexar a localización, pero este denegouse de forma permanente. Vai a configuración da aplicación, selecciona «Permisos» e activa «Localización».</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly require permiso de almacenamento para poder anexar fotografías, vídeos ou ficheiros de audio, pero este denegouse de forma permanente. Vai aos axustes da aplicación, selecciona «Permisos» e activa «Almacenamento».</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly require permiso para poder anexar información dos contactos, pero este denegouse de forma permanente. Vai a configuración da aplicación, selecciona «Permisos» e activa «Contactos».</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly require permiso para poder anexar a localización, pero este denegouse de forma permanente. Vai a configuración da aplicación, selecciona «Permisos» e activa «Localización».</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Permite o acceso á túa localización</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Para enviar a túa localización:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Permite que Signal acceda á túa localización.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Permite que Molly acceda á túa localización.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal necesita acceder á túa localización para compartila.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly necesita acceder á túa localización para compartila.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Permitir acceso ao almacenamento</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Para mostrar fotografías e vídeos:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal necesita ter acceso ao almacenamento para mostrar as túas fotografías e vídeos.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly necesita ter acceso ao almacenamento para mostrar as túas fotografías e vídeos.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s non activou os Pagamentos </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Cambiar cámara</string>
     <string name="CameraXFragment_open_gallery_description">Abrir galería</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Permitir acceso</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Permitir acceso á cámara e ao micrófono</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Permitir acceso á cámara</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Permite o acceso ao micrófono</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Para tirar fotografías, permite que Signal acceda á cámara.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Para tirar fotografías e facer vídeos, Signal necesita acceder á cámara.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Para tirar fotografías e facer vídeos, permite que Signal acceda á cámara e ao micrófono.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Para facer vídeos con son, permite que Signal acceda ao micrófono.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Para escanear un código QR, permite que Signal acceda á cámara.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal necesita acceder á cámara para tirar fotografías</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal necesita acceder á cámara para escanear códigos QR</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal necesita acceder ao micrófono para facer vídeos</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Para tirar fotografías en Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Para tirar fotografías e facer vídeos en Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Para facer vídeos con son:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Para escanear códigos QR:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Contactos recentes</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Sen contactos en Signal</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Só podes usar o botón da cámara para enviar fotos a contactos de Signal. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Non atopas o que andas a buscar?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Convida a un contacto a se unir a Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Convida a un contacto a se unir a Molly</string>
     <string name="CameraContacts__menu_search">Buscar</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Non, grazas</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Actualizar Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Actualizar Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Esta versión da aplicación non é compatible. Para continuares a enviar e recibir mensaxes, actualiza á última versión.</string>
     <string name="ClientDeprecatedActivity_update">Actualizar</string>
     <string name="ClientDeprecatedActivity_dont_update">Non actualizar</string>
     <string name="ClientDeprecatedActivity_warning">Aviso</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">A túa versión de Signal caducou. Podes ver o historial de mensaxes, mais non poderás enviar ou recibir mensaxes ata que a actualices.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">A túa versión de Molly caducou. Podes ver o historial de mensaxes, mais non poderás enviar ou recibir mensaxes ata que a actualices.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Non se atopou ningún navegador web.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Mensaxe %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Chamada de voz de Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Videochamada de Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Mensaxe de Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Enviar mensaxe</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Conversa comigo en Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Conversa comigo en Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Por favor, elixe un contacto</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">O anexo excede o límite para o tipo de mensaxe que estás a enviar.</string>
     <string name="ConversationActivity_unable_to_record_audio">Non é posible gravar son!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Para mandar unha mensaxe de voz:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Para enviar unha mensaxe de voz, Signal necesita acceder ao teu micrófono.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Para enviar unha mensaxe de voz, Molly necesita acceder ao teu micrófono.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal necesita acceder ao micrófono para gravar unha mensaxe de voz.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal require permiso para poder enviar mensaxes de son, pero este denegouse de forma permanente. Vai a configuración da aplicación, selecciona «Permisos» e activa «Micrófono».</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly necesita acceder ao micrófono para gravar unha mensaxe de voz.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly require permiso para poder enviar mensaxes de son, pero este denegouse de forma permanente. Vai a configuración da aplicación, selecciona «Permisos» e activa «Micrófono».</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal necesita permisos para acceder ao micrófono e á cámara para poder chamar a %1$s, pero denegáronse de forma permanente. Vai a configuración da aplicación, selecciona «Permisos» e activa «Micrófono» e «Cámara».</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Para tirar fotografías e facer vídeos, Signal necesita acceder á cámara.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal necesita permiso para acceder á cámara e poder tirar fotografías, pero denegouse de forma permanente. Vai a configuración da aplicación, selecciona «Permisos» e activa «Cámara».</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal necesita permiso para acceder á cámara e tirar fotografías ou facer vídeos.</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly necesita permisos para acceder ao micrófono e á cámara para poder chamar a %1$s, pero denegáronse de forma permanente. Vai a configuración da aplicación, selecciona «Permisos» e activa «Micrófono» e «Cámara».</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Para tirar fotografías e facer vídeos, Molly necesita acceder á cámara.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly necesita permiso para acceder á cámara e poder tirar fotografías, pero denegouse de forma permanente. Vai a configuración da aplicación, selecciona «Permisos» e activa «Cámara».</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly necesita permiso para acceder á cámara e tirar fotografías ou facer vídeos.</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Habilitar o permiso ao micrófono para gravar vídeos con son.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal necesita permiso para acceder ao micrófono e poder gravar vídeos, pero denegouse. Vai a configuración da aplicación, selecciona «Permisos» e activa «Micrófono» e «Cámara».</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal necesita acceder ao micrófono para gravar vídeos.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly necesita permiso para acceder ao micrófono e poder gravar vídeos, pero denegouse. Vai a configuración da aplicación, selecciona «Permisos» e activa «Micrófono» e «Cámara».</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly necesita acceder ao micrófono para gravar vídeos.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Non</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Para iniciar unha chamada:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Para iniciar unha chamada, permite que Signal acceda ao teu micrófono.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Para iniciar unha chamada, permite que Molly acceda ao teu micrófono.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal necesita acceder ao micrófono para iniciar a chamada.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly necesita acceder ao micrófono para iniciar a chamada.</string>
 
 
     <string name="ConversationActivity_join">Unirse</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Xa non se poden mandar mensaxes SMS en Signal. Convida a %1$s a Signal para seguir falando.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Esta persoa xa non emprega Signal. Convídaa a Signal para seguirdes falando.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Esta persoa xa non emprega Molly. Convídaa a Molly para seguirdes falando.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Convidar a Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Convidar a Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Lembrarémoscho de novo pronto.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Eliminar para todos</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Eliminar deste dispositivo</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Borrar</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Eliminar de todos os dispositivos</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Esta mensaxe eliminarase para todos na conversa se teñen unha versión recente de Signal. Poderán ver que borraches unha mensaxe.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Bloqueado</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Actualizar Signal</string>
+    <string name="ConversationFragment__update_build">Actualizar Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Volve rexistrarte en Signal</string>
+    <string name="ConversationFragment__reregister_signal">Volve rexistrarte en Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Retroceder.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Abrir Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Abrir Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Non verificado</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Isto borrará a conversa seleccionada para sempre.</item>
         <item quantity="other">Isto borrará as %1$d conversas seleccionadas para sempre.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Isto borrará a conversa seleccionada de forma permanente de todos os teus dispositivos.</item>
+        <item quantity="other">Isto borrará as %1$d conversas seleccionadas de forma permanente de todos os teus dispositivos.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Borrando</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Borrando conversa seleccionada…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Quen me pode atopar polo meu número?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Calquera persoa que teña o teu número de teléfono poderá comprobar se estás en Signal e poderá iniciar conversas contigo.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Calquera persoa que teña o teu número de teléfono poderá comprobar se estás en Molly e poderá iniciar conversas contigo.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ninguén poderá ver que estás en Signal a menos que lles envíes unha mensaxe ou xa teñas unha conversa con eles.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ninguén poderá ver que estás en Molly a menos que lles envíes unha mensaxe ou xa teñas unha conversa con eles.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Restaurar desde a copia de seguranza?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Comproba a frase de seguridade da copia e verifica que concorda</string>
     <string name="BackupsPreferenceFragment__turn_on">Acender</string>
     <string name="BackupsPreferenceFragment__turn_off">Apagar</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Para restablecer a copia, instala de novo Signal. Abre a aplicación e toca en «Restablecer copia de seguranza» e despois busca o ficheiro da copia. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Para restablecer a copia, instala de novo Molly. Abre a aplicación e toca en «Restablecer copia de seguranza» e despois busca o ficheiro da copia. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Saber máis</string>
     <string name="BackupsPreferenceFragment__in_progress">En progreso…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d por agora…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% por agora…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal require permiso de almacenamento para poder crear copias de seguranza, pero este denegouseo de forma permanente. Vai a configuración da aplicación, selecciona «Permisos» e activa «Almacenamento».</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly require permiso de almacenamento para poder crear copias de seguranza, pero este denegouseo de forma permanente. Vai a configuración da aplicación, selecciona «Permisos» e activa «Almacenamento».</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Configurar hora para copia de seguranza</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Sesión de conversa actualizada</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal emprega cifrado de extremo a extremo e podería ter que actualizar a sesión de conversa ocasionalmente. Isto non afecta á seguridade da conversa, pero poderías perder algunha mensaxe deste contacto, polo que igual ten que volver a enviarcho.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly emprega cifrado de extremo a extremo e podería ter que actualizar a sesión de conversa ocasionalmente. Isto non afecta á seguridade da conversa, pero poderías perder algunha mensaxe deste contacto, polo que igual ten que volver a enviarcho.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Usa Signal no teu ordenador o no iPad. As túas mensaxes sincronizaranse en todos os dispositivos vinculados.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Vincula un novo dispositivo</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s As mensaxes e a información das conversas están protexidas por unha encriptación de extremo a extremo en todos os dispositivos</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal para ordenador ou iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Todas as mensaxes dos dispositivos vinculados son privadas</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">As mensaxes de Molly quedarán sincronizadas coa aplicación Molly do teu móbil tras a vinculación. O historial de mensaxes anterior non aparecerá.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">No teu outro dispositivo, visita %1$s para instalar Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Os meus dispositivos vinculados</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Desvincular</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s sen vincular</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Vinculando dispositivo…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Dispositivo aprobado</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Cargando…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Sen dispositivos vinculados</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Desbloquea para vincular un dispositivo</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Escanea o código QR que se mostra no dispositivo para vinculalo.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Escanear código QR</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Emprega este dispositivo para escanear o código QR que se mostra no dispositivo que queres vincular</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">De acordo</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Este dispositivo poderá ver os teus grupos e contactos, acceder ás túas conversas e enviar mensaxes no teu nome.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Remata a vinculación no outro dispositivo</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Remata de vincular Molly no outro dispositivo.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Erro ao vincular o dispositivo</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Este código QR non é válido. Asegúrate de escanear o código QR que aparece no dispositivo que queres vincular.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Tentar de novo</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Desvincular \'%1$s\'?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimizar cando falte Servizos Play.</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Este dispositivo non é compatible con Servizos Play. Toca para desactivar as optimizacións da batería do sistema que evitan que Signal recupere mensaxes mentres está inactivo.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Este dispositivo non é compatible con Servizos Play. Toca para desactivar as optimizacións da batería do sistema que evitan que Molly recupere mensaxes mentres está inactivo.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Esta versión de Signal caducou. Actualiza para poder enviar e recibir mensaxes.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Esta versión de Molly caducou. Actualiza para poder enviar e recibir mensaxes.</string>
     <string name="ExpiredBuildReminder_update_now">Actualiza</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -884,7 +947,7 @@
 
     <!-- GcmRefreshJob -->
     <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Erro de comunicación permanente!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Non foi posible rexistrar Signal con Servizos de Google Play. As mensaxes e chamadas de Signal desactiváronse; tenta rexistrarte de novo en Configuración &gt; Avanzado.</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Non foi posible rexistrar Molly con Servizos de Google Play. As mensaxes e chamadas de Molly desactiváronse; tenta rexistrarte de novo en Configuración &gt; Avanzado.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Os rexistros de depuración axúdannos a diagnosticar e solucionar os erros e non conteñen ningunha información identificadora.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal atopou un problema. Enviar rexistro de depuración?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly atopou un problema. Enviar rexistro de depuración?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">As notificacións poden atrasarse debido ás optimizacións da batería</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Podes desactivar as optimizacións da batería de Signal para asegurarte de que as notificacións das mensaxes non se atrasen.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Podes desactivar as optimizacións da batería de Molly para asegurarte de que as notificacións das mensaxes non se atrasen.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">As notificacións poden atrasarse debido ás optimizacións da batería</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Desactiva as optimizacións da batería de Molly para asegurarte de que as notificacións das mensaxes non se atrasen. Preme en «Continuar» para consultar as instrucións específicas de cada dispositivo.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Non, grazas</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Continuar</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Continuar</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Rexeitar</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Non, grazas</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Invitacións de grupo pendentes</string>
+    <string name="PendingMembersActivity_pending_group_invites">Solicitudes e convites</string>
     <string name="PendingMembersActivity_requests">Solicitudes</string>
     <string name="PendingMembersActivity_invites">Invitacións</string>
     <string name="PendingMembersActivity_people_you_invited">Persoas que convidaches</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Cancelar</string>
     <string name="InviteActivity_sending">Enviando…</string>
     <string name="InviteActivity_invitations_sent">Invitacións enviadas!</string>
-    <string name="InviteActivity_invite_to_signal">Convidar a Signal</string>
+    <string name="InviteActivity_invite_to_signal">Convidar a Molly</string>
     <string name="InviteActivity_send_sms">Enviar SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Enviar %1$d SMS de convite?</item>
         <item quantity="other">Enviar %1$d invitacións pro SMS?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Conversa comigo en Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Conversa comigo en Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Semella que non hai ningunha aplicación coa que poidas compartir.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">A túa mensaxe</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Activada conexión en segundo plano</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,7 +1445,7 @@
     <string name="MessageQuotesBottomSheet_replies">Respostas</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Establecendo chamada Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">Establecendo chamada Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
     <string name="NotificationBarManager__starting_signal_call_service">Iniciando chamada</string>
     <string name="NotificationBarManager__stopping_signal_call_service">Colgar chamada</string>
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Activaches os Pagamentos</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s agora pode aceptar Pagamentos</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">A información de pagamento non está dispoñible</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Preme para saber máis</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">A información de pagamento non está dispoñible</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">A información de pagamento non está dispoñible porque as túas mensaxes restauráronse dunha fonte que non contiña este historial de pagamentos. Isto non afecta o saldo da túa carteira ou o estado de pagamentos anteriores.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Pronto non poderás enviar mensaxes SMS dende Signal. Convida a %1$s a Signal para seguir falando.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Xa non podes enviar mensaxes SMS en Signal. Convida a %1$s a Signal para seguir falando.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Xa non podes enviar mensaxes SMS en Molly. Convida a %1$s a Molly para seguir falando.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Pagamento: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Pagamento</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Denunciada como correo lixo</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Vincular un dispositivo a Signal?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Semella que estás tentando vincular un dispositivo a Signal usando un escáner de terceiros. Para a túa protección, escanea o código de novo desde Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal necesita permiso para acceder á cámara e poder escanear un código QR, pero foi denegado de forma permanente. Vai aos axustes da aplicación, selecciona \"Permisos\" e activa \"Cámara\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly necesita permiso para acceder á cámara e poder escanear un código QR, pero foi denegado de forma permanente. Vai aos axustes da aplicación, selecciona \"Permisos\" e activa \"Cámara\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Non é posible escanear o código QR sen permiso para acceder á cámara</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Inserir frase de acceso</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Icona de Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Icona de Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Enviar frase de acceso</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Frase de acceso non válida!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Desbloquear Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Bloqueo de pantalla</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Desbloquear Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Bloqueo de pantalla</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Mapa</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Verifica para seguir conversando</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Axuda a previr o spam en Signal, por favor completa a verificación.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Axuda a previr o spam en Molly, por favor completa a verificación.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Tras verificar poderás seguir conversando. Tódalas mensaxes en pausa serán enviadas automáticamente.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">A miña historia</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Chamada de Signal</string>
+    <string name="Recipient_signal_call">Chamada de Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Bloquear</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Soando…</string>
     <string name="RedPhone_busy">Ocupado</string>
     <string name="RedPhone_recipient_unavailable">Destinatario non dispoñible</string>
-    <string name="RedPhone_network_failed">Erro de rede!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Erro de rede! Comproba a conexión a Internet e inténtao de novo.</string>
     <string name="RedPhone_number_not_registered">Número non rexistrado!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">O número que marcaches non admite chamadas de voz seguras!</string>
     <string name="RedPhone_got_it">Entendo</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Toca aquí para activar o teu vídeo</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Para chamar a %1$s, Signal necesita acceder á túa cámara</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Para chamar a %1$s, Molly necesita acceder á túa cámara</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Chamando…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Volvendo conectar…</string>
@@ -1935,9 +2019,29 @@
     <string name="WebRtcCallActivity__removed_from_call">Eliminar da chamada</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Alguén te eliminou da chamada.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Permitir acceso á cámara e ao micrófono</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Permite o acceso ao micrófono</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Permitir acceso á cámara</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Para iniciar ou unirse a unha chamada, permite que Molly acceda á cámara e ao micrófono.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Para iniciar ou unirse a unha chamada, permite que Molly acceda ao teu micrófono.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Para facer vídeos, Molly necesita acceder á cámara.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly necesita acceder ao micrófono para iniciar o unirse a unha chamada.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly necesita acceder á cámara para facer vídeos</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Para iniciar ou unirse a unha chamada:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Para activar o vídeo:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Chamada Signal</string>
+    <string name="WebRtcCallView__signal_call">Chamada Molly</string>
     <string name="WebRtcCallView__signal_video_call">Comezar videochamada</string>
     <string name="WebRtcCallView__start_call">Iniciar chamada</string>
     <string name="WebRtcCallView__join_call">Unirse á chamada</string>
@@ -2028,23 +2132,42 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Queres baixar a man?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Baixar a man</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Baixar</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Cancelar</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Alzaches a man</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Ver</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s alzou a man</item>
-        <item quantity="other">%1$s + %2$d alzaron a man</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s alzaches a man</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d alzastes a man</item>
+        <item quantity="other">%1$s +%2$d alzastes a man</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s alzou a man</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d alzaron a man</item>
+        <item quantity="other">%1$s +%2$d alzaron a man</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
-        <item quantity="one">%1$s</item>
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s + %2$d</item>
+        <item quantity="other">%1$s + %2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
+        <item quantity="one">%1$s + %2$d</item>
         <item quantity="other">%1$s + %2$d</item>
     </plurals>
 
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Recibirás unha chamada para verificar este número.</string>
     <string name="RegistrationActivity_edit_number">Editar número</string>
     <string name="RegistrationActivity_missing_google_play_services">Falta Servizos de Google Play</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Este dispositivo non dispón de Servizos de Google Play. Podes continuar a usar Signal, mais é posible que o seu rendemento ou fiabilidade se vexan reducidos.\n\nSe non es un usuario avanzado, se non estás a executar unha ROM de Android modificada ou pensas que isto é un erro, contacta con support@signal.org para che axudar a solucionalo.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Este dispositivo non dispón de Servizos de Google Play. Podes continuar a usar Molly, mais é posible que o seu rendemento ou fiabilidade se vexan reducidos.\n\nSe non es un usuario avanzado, se non estás a executar unha ROM de Android modificada ou pensas que isto é un erro, contacta con support@molly.im para che axudar a solucionalo.</string>
     <string name="RegistrationActivity_i_understand">Entendo</string>
     <string name="RegistrationActivity_play_services_error">Erro de Servizos Play</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Servizos de Google Play está actualizándose ou non está temporalmente dispoñible. Volve tentalo.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Número con formato non-estándar</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">O número escrito (%1$s) non semella estar nun formato estándar.\n\nSerá máis ben %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal para Android - Formato de número de teléfono</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly para Android - Formato de número de teléfono</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Chamada solicitada</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Tes problemas para rexistrarte?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Asegúrate de que o teu teléfono teña sinal móbil para recibir mensaxes SMS ou chamadas\n • Comproba que podes recibir unha chamada a ese número\n • Revisa se introduciches o número de teléfono correctamente.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Para obter máis información, segue estes pasos para solucionar o problema ou contacta coa Axuda</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Para obter máis información, consulta %1$s ou %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">estes pasos para solucionar o problema</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Engadir a contactos</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Convidar a Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Convidar a Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Mensaxe de Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Chamada Signal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Engadir a contactos</string>
-    <string name="SharedContactView_invite_to_signal">Convidar a Signal</string>
+    <string name="SharedContactView_invite_to_signal">Convidar a Molly</string>
     <string name="SharedContactView_message">Mensaxe de Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s pertence a %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Actualizar Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Hai dispoñible unha nova versión de Signal. Preme para actualizar.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal non se puido actualizar</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Actualizar Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Hai dispoñible unha nova versión de Molly. Preme para actualizar.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly non se puido actualizar</string>
     <string name="ApkUpdateNotifications_failed_general_body">Volveremos intentalo de novo máis tarde.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal actualizouse con éxito</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly actualizouse con éxito</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Actualización automática á versión %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">O noso número de seguranza en Signal:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Semella que non hai ningunha que permita compartir.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Non se atopou no portapapeis número de seguranza ningún para comparar</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal necesita permiso para acceder á cámara e poder escanear un código QR, pero foi denegado de forma permanente. Vai aos axustes da aplicación, selecciona \"Permisos\" e activa \"Cámara\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly necesita permiso para acceder á cámara e poder escanear un código QR, pero foi denegado de forma permanente. Vai aos axustes da aplicación, selecciona \"Permisos\" e activa \"Cámara\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Non é posible escanear o código QR sen permiso para acceder á cámara</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Primeiramente debes intercambiar mensaxes para ver o número de seguranza de %1$s.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Toca para abrir</string>
-    <string name="KeyCachingService_passphrase_cached">Signal está desbloqueado</string>
-    <string name="KeyCachingService_lock">Bloquear Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly está desbloqueado</string>
+    <string name="KeyCachingService_lock">Bloquear Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Ti</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Tipo multimedia non compatible</string>
     <string name="MediaPreviewActivity_draft">Borrador</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal necesita permiso para acceder ao almacenamento externo e poder gardar nel, pero foi denegado de forma permanente. Vai aos axustes da aplicación, selecciona \"Permisos\" e activa \"Almacenamento\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly necesita permiso para acceder ao almacenamento externo e poder gardar nel, pero foi denegado de forma permanente. Vai aos axustes da aplicación, selecciona \"Permisos\" e activa \"Almacenamento\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Non é posible gardar no almacenamento externo sen permiso</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Borrar mensaxe?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Isto borrará de xeito permanente esta mensaxe.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Erro ao entregar a mensaxe.</string>
     <string name="MessageNotifier_error_delivering_message">Erro entregando a mensaxe.</string>
     <string name="MessageNotifier_message_delivery_paused">Entrega da mensaxe en pausa</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifica para continuar utilizando Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifica para continuar utilizando Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Marcar todas como lidas</string>
     <string name="MessageNotifier_mark_read">Marcar como lida</string>
     <string name="MessageNotifier_turn_off_these_notifications">Desactivar estas notificacións</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Reaccionou con %1$s ao teu sticker.</string>
     <string name="MessageNotifier_this_message_was_deleted">Eliminouse a mensaxe.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Desactivar as notificacións de quen se une a Signal? Poderás volver activalas en Signal&gt; Axustes &gt; Notificacións.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Desactivar as notificacións de quen se une a Molly? Poderás volver activalas en Molly&gt; Axustes &gt; Notificacións.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">A resposta rápida non está dispoñible cando Signal está bloqueado!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">A resposta rápida non está dispoñible cando Molly está bloqueado!</string>
     <string name="QuickResponseService_problem_sending_message">Problema ao enviar a mensaxe!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Atallo non válido</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Nova mensaxe</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Solicitude de mensaxe</string>
     <string name="SingleRecipientNotificationBuilder_you">Ti</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Este dispositivo xa non está rexistrado. Probablemente porque rexistraches o teu número de teléfono en Signal nun dispositivo diferente.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Este dispositivo xa non está rexistrado. Probablemente porque rexistraches o teu número de teléfono en Molly nun dispositivo diferente.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Volver rexistrar un dispositivo</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Para responder a chamada, permite que Signal acceda ao teu micrófono.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Para responder a chamada, permite que Molly acceda ao teu micrófono.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Para responder a videochamada, permite que Signal acceda ao teu micrófono e cámara.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal require permiso para poder facer e recibir chamadas, pero este foi denegado de forma permanente. Vai aos axustes da aplicación, selecciona \"Permisos\" e activa \"Micrófono\" e \"Cámara\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Para responder a videochamada, permite que Molly acceda ao teu micrófono e cámara.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly require permiso para poder facer e recibir chamadas, pero este foi denegado de forma permanente. Vai aos axustes da aplicación, selecciona \"Permisos\" e activa \"Micrófono\" e \"Cámara\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Respondido nun dispositivo ligado.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Rexeitado nun dispositivo ligado.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Ocupado desde un dispositivo ligado.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Repetir nova frase de acceso</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Convidar a Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Convidar a Molly</string>
     <string name="contact_selection_activity__new_group">Novo grupo</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Actualizar contactos</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Botas en falla a alguén? Actualiza a listaxe</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Para atopar persoas que coñezas en Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Permitir acceso á listaxe de contactos</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Máis</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Foto do contacto</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal require permiso para poder mostrar os teus contactos, pero este foi denegado de forma permanente. Vai aos axustes da aplicación, selecciona \"Permisos\" e activa \"Contactos\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly require permiso para poder mostrar os teus contactos, pero este foi denegado de forma permanente. Vai aos axustes da aplicación, selecciona \"Permisos\" e activa \"Contactos\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Erro ao recuperar os contactos; comproba a túa conexión á rede</string>
     <string name="ContactSelectionListFragment_username_not_found">Nome de usuario non atopado</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" non é usuario de Signal. Comproba o nome de usuario e téntao outra vez."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Buscar por usuario</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Permitir acceso á listaxe de contactos</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Para atopar persoas que coñezas en Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Permitir acceso</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Non, grazas</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Permite o acceso á listaxe de contactos. Os teus contactos están encriptados e non son visibles para o servizo de Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal necesita acceder aos teus contactos para poder mostralos.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly necesita acceder aos teus contactos para poder mostralos.</string>
     <string name="contact_selection_list_fragment__show_contacts">Mostrar contactos</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Eliminaches a esta persoa, se volves mandarlle unha mensaxe engadirase de novo á túa lista.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Opcións</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Actualizar</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Reproducir … Deter</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">As burbullas son unha característica de Android que podes desactivar nas conversas de Signal.</string>
+    <string name="BubbleOptOutTooltip__description">As burbullas son unha característica de Android que podes desactivar nas conversas de Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Agora non</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Descrición do grupo</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Actualizar Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Actualizar Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Esta versión de Signal caducou. Actualízaa xa para seguir empregando Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Esta versión de Molly caducou. Actualízaa xa para seguir empregando Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Actualizar</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Lenta</string>
     <string name="preferences__help">Axuda</string>
     <string name="preferences__advanced">Avanzado</string>
-    <string name="preferences__donate_to_signal">Doar a Signal</string>
+    <string name="preferences__donate_to_signal">Doar a Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Privacidade</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Cambiar o nome e a icona da aplicación a «%1$s»</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal necesitará pecharse para cambiar o nome e a icona da aplicación. As notificacións sempre mostrarán o nome e a icona por defecto de Signal.</string>
+    <string name="preferences__app_icon_dialog_description">Molly necesitará pecharse para cambiar o nome e a icona da aplicación. As notificacións sempre mostrarán o nome e a icona por defecto de Molly.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Selecciona un nome e icona para a aplicación, que serán visibles na pantalla de inicio e no caixón de aplicacións do teu teléfono. As notificacións sempre mostrarán o nome e a icona por defecto de Signal. Máis información</string>
+    <string name="preferences__app_icon_warning_learn_more">Selecciona un nome e icona para a aplicación, que serán visibles na pantalla de inicio e no caixón de aplicacións do teu teléfono. As notificacións sempre mostrarán o nome e a icona por defecto de Molly. Máis información</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Os nomes e as iconas serán visibles na pantalla de inicio e no caixón de aplicacións.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">As notificacións sempre mostrarán o nome e a icona por defecto de Signal.</string>
+    <string name="preferences__app_icon_notification_warning">As notificacións sempre mostrarán o nome e a icona por defecto de Molly.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Máis información</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Isto eliminará todas as mensaxes de todas as conversas salvo as %1$s mensaxes máis recentes.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Isto eliminará permanentemente todo o historial de mensaxes e multimedia do teu dispositivo.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Borrarase todo o historial de mensaxes e arquivos de forma permanente, tanto deste dispositivo como de todos os dispositivos vinculados.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Tes a certeza de querer eliminar todo o historial de mensaxes?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Eliminarase todo o historial de mensaxes. Esta acción non se pode desfacer.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Borrarase o historial de mensaxes de forma permanente de todos os dispositivos. Esta acción non se pode desfacer.</string>
     <string name="preferences_storage__delete_all_now">Borrar todo agora</string>
     <string name="preferences_storage__forever">Para sempre</string>
     <string name="preferences_storage__one_year">1 ano</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Eludir censura</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Eludir censura</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Se se activa, Signal intentará eludir a censura. Non activar esta función se non estás nun país no que Signal está censurada.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Se se activa, Molly intentará eludir a censura. Non activar esta función se non estás nun país no que Molly está censurada.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Activouse a función Eludir censura debido ao número de teléfono da túa conta.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Presentámosche pagamentos</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Emprega Signal para enviar e recibir MobileCoin, unha nova moeda dixital que se centra na privacidade. Actívao para comezar.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Emprega Molly para enviar e recibir MobileCoin, unha nova moeda dixital que se centra na privacidade. Actívao para comezar.</string>
     <string name="PaymentsHomeFragment__activate_payments">Activar Pagamentos</string>
     <string name="PaymentsHomeFragment__activating_payments">Activando pagamentos…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Restablecer conta de pagamentos</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Detalles</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Podes empregar Signal para enviar e recibir MobileCoin. Todos os pagamentos están suxeitos aos Termos de uso de MobileCoins e a Carteira MobileCoin. Pode que teñas problemas e non poderás recuperar os pagamentos e saldo que poidas perder. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Podes empregar Molly para enviar e recibir MobileCoin. Todos os pagamentos están suxeitos aos Termos de uso de MobileCoins e a Carteira MobileCoin. Pode que teñas problemas e non poderás recuperar os pagamentos e saldo que poidas perder. </string>
     <string name="PaymentsHomeFragment__activate">Activar</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Ver as condicións de MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Os pagamentos en Signal xa non están dispoñibles. Podes seguir transferindo fondos para intercambiar pero non podes enviar e recibir pagamentos nin engadir fondos.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Os pagamentos en Molly xa non están dispoñibles. Podes seguir transferindo fondos para intercambiar pero non podes enviar e recibir pagamentos nin engadir fondos.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Activar permisos</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Para que poidas mandar mensaxes ás persoas que coñeces, Signal pedirache que actives estes permisos. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Para que poidas mandar mensaxes ás persoas que coñeces, Molly pedirache que actives estes permisos. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Notificacións</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Seguinte</string>
     <string name="PaymentsTransferFragment__invalid_address">Enderezo incorrecto</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Comproba o enderezo da carteira ao que intentas transferir e proba de novo.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Non podes transferir ao teu propio enderezo da carteira de Signal. Introduce o enderezo da carteira da túa conta nunha plataforma compatible.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Signal necesita acceso á cámara para escanear un código QR.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal necesita acceder á cámara para capturar o código QR. Vai a «Configuración», logo a «Permisos» e activa «Cámara».</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Signal necesita acceso á cámara para escanear un código QR.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Non podes transferir ao teu propio enderezo da carteira de Molly. Introduce o enderezo da carteira da túa conta nunha plataforma compatible.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Molly necesita acceso á cámara para escanear un código QR.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly necesita acceder á cámara para capturar o código QR. Vai a «Configuración», logo a «Permisos» e activa «Cámara».</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Molly necesita acceso á cámara para escanear un código QR.</string>
     <string name="PaymentsTransferFragment__settings">Configuración</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Chamada de voz de Signal entrante</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Chamada de voz de Molly entrante</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Videochamada de Signal entrante</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Videochamada de Molly entrante</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
     <string name="CallNotificationBuilder__incoming_signal_group_call">Chamada grupal entrante</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Chamada de voz de Signal en curso</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Chamada de voz de Molly en curso</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Videochamada de Signal en curso</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Videochamada de Molly en curso</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Chamada de grupo de Signal en curso</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Chamada de grupo de Molly en curso</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Cargando…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Comprobar</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Inseriches satisfactoriamente a túa frase de acceso</string>
     <string name="BackupDialog_passphrase_was_not_correct">Frase de acceso incorrecta</string>
-    <string name="LocalBackupJob_creating_signal_backup">Creando unha copia de seguranza de Signal</string>
+    <string name="LocalBackupJob_creating_signal_backup">Creando unha copia de seguranza de Molly</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Verificando copia de seguranza de Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Verificando copia de seguranza de Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">Erro na copia de seguranza</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">O directorio da túa copia de seguranza eliminouse ou moveuse.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">O ficheiro da túa copia de seguranza é demasiado grande para almacenalo neste volume.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Chámame (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Volver enviar código (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Contacta co Centro de Axuda de Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Rexistrarse en Signal - Código de verificación para Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Contacta co Centro de Axuda de Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Rexistrarse en Molly - Código de verificación para Android</string>
     <string name="RegistrationActivity_incorrect_code">Código incorrecto</string>
     <string name="BackupUtil_never">Nunca</string>
     <string name="BackupUtil_unknown">Descoñecido</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Número de teléfono</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Escolle quen pode ver o teu número de teléfono e quen pode contactar contigo en Signal con el.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Escolle quen pode ver o teu número de teléfono e quen pode contactar contigo en Molly con el.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Quen pode ver o meu número de teléfono</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Levas demasiados intentos. Téntao máis tarde.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Erro ao conectarse ao servizo</string>
     <string name="preferences_chats__backups">Copias de seguranza</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal está bloqueado</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly está bloqueado</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">TOCA PARA DESBLOQUEAR</string>
     <string name="Recipient_unknown">Descoñecido</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Debes ter acceso ao teu dispositivo antigo.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Restaurar desde copia de apoio</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Restaura as mensaxes desde a copia de apoio local. Se non o fas agora non poderás restaurala posteriormente.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Restaurar copia de seguranza local</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Restaurar copia de seguranza de Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Recupera todas as mensaxes de texto e os arquivos dos últimos 30 días</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Máis opcións</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Cancelar</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Iniciar sesión sen transferencia</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Continúa o proceso sen transferir as mensaxes e arquivos</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Abre Signal no teu dispositivo Android anterior</string>
     <string name="NewDeviceTransferInstructions__continue">Continuar</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Preparándose para conectar co antigo dispositivo Android…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Agarda un intre, axiña estará listo</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Agardando a que o antigo dispositivo Android conecte…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal precisa o permiso de localización para descubrir e conectar co teu antigo dispositivo Android.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal precisa que actives os servizos de localización para descubrir e conectar co teu antigo dispositivo Android.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal precisa Wi-Fi para descubrir e conectar co teu antigo dispositivo Android. A Wi-Fi debe estar acesa pero non precisa estar conectada a unha rede Wi-Fi.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Lamentámolo, mais semella que este dispositivo non soporta Wi-Fi Direct. Signal usa Wi-Fi Direct para descubrir e conectar co teu antigo dispositivo Android. Porén podes restaurar a copia de apoio da túa conta desde o teu antigo dispositivo Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly precisa o permiso de localización para descubrir e conectar co teu antigo dispositivo Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly precisa que actives os servizos de localización para descubrir e conectar co teu antigo dispositivo Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly precisa Wi-Fi para descubrir e conectar co teu antigo dispositivo Android. A Wi-Fi debe estar acesa pero non precisa estar conectada a unha rede Wi-Fi.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Lamentámolo, mais semella que este dispositivo non soporta Wi-Fi Direct. Molly usa Wi-Fi Direct para descubrir e conectar co teu antigo dispositivo Android. Porén podes restaurar a copia de apoio da túa conta desde o teu antigo dispositivo Android.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Restaurar Copia de apoio</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Houbo un fallo non agardado ao intentar conectar co teu dispositivo Android antigo.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Buscando o novo dispositivo Android…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal precisa o permiso de localización para descubrir e conectar co teu novo dispositivo Android.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal precisa que os servizos de localización estén activos para descubrir e conectar co teu novo dispositivo Android.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal precisa Wi-Fi para descubrir e conectar co teu novo dispositivo Android. A Wi-Fi ten que estar acesa, mais non precisa estar conectada a unha rede Wi-Fi.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Lamentámolo, semella que este dispositivo non soporta Wi-Fi Direct. Signal usa Wi-Fi Direct para descubrir e conectar co teu novo dispositivo Android. Porén aínda podes crear unha copia de apoio para restaurar a túa conta no novo dispositivo Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly precisa o permiso de localización para descubrir e conectar co teu novo dispositivo Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly precisa que os servizos de localización estén activos para descubrir e conectar co teu novo dispositivo Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly precisa Wi-Fi para descubrir e conectar co teu novo dispositivo Android. A Wi-Fi ten que estar acesa, mais non precisa estar conectada a unha rede Wi-Fi.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Lamentámolo, semella que este dispositivo non soporta Wi-Fi Direct. Molly usa Wi-Fi Direct para descubrir e conectar co teu novo dispositivo Android. Porén aínda podes crear unha copia de apoio para restaurar a túa conta no novo dispositivo Android.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Crear copia de apoio</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Houbo un erro non agardado ao intentar conectar co teu novo dispositivo Android.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Transferindo datos</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Mantén ambos dispositivos preto un do outro. Non apagues os dispositivos e mantén Signal aberta. As transferencias están cifradas de extremo-a-extremo.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Mantén ambos dispositivos preto un do outro. Non apagues os dispositivos e mantén Molly aberta. As transferencias están cifradas de extremo-a-extremo.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d das mensaxes ata agora…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% de mensaxes por agora…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Traspasar Conta</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Descarga Signal no teu novo dispositivo Android</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Descarga Molly no teu novo dispositivo Android</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Toca en \"Transferir ou restaurar conta\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Calquera que con esta ligazón pode ver o nome e foto do grupo e solicitar unirse. Compártea coas persoas da túa confianza.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Calquera con esta ligazón pode ver o nome e foto do grupo e unirse a el. Compártea con persoas da túa confianza.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Compartir vía Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Compartir vía Molly</string>
     <string name="GroupLinkBottomSheet_copy">Copiar</string>
     <string name="GroupLinkBottomSheet_qr_code">Código QR</string>
     <string name="GroupLinkBottomSheet_share">Compartir</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">Información de MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin é unha nova moeda dixital que se centra na privacidade.</string>
     <string name="payment_info_card_adding_funds">Engadir fondos</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Podes engadir fondos para usar en Signal ao mandar MobileCoin á túa carteira.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Podes engadir fondos para usar en Molly ao mandar MobileCoin á túa carteira.</string>
     <string name="payment_info_card_cashing_out">Retirar</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Podes retirar MobileCoin en calquera momento nunha plataforma que soporte MobileCoin. Só necesitas facer unha transferencia a esa plataforma.</string>
     <string name="payment_info_card_hide_this_card">Ocultar esta tarxeta?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Desactivar carteira</string>
     <string name="DeactivateWalletFragment__your_balance">O teu saldo</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Recomendámosche que transfiras os teus fondos a outra carteira antes de desactivar os pagamentos. Se decides non transferir os teus fondos agora, permanecerán na túa carteira vinculada a Signal por se volves activar os pagamentos.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Recomendámosche que transfiras os teus fondos a outra carteira antes de desactivar os pagamentos. Se decides non transferir os teus fondos agora, permanecerán na túa carteira vinculada a Molly por se volves activar os pagamentos.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Transferir saldo restante</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Desactivar sen transferir</string>
     <string name="DeactivateWalletFragment__deactivate">Desactivar</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Desactivar sen transferir?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">O teu saldo permanecerá na túa carteira vinculada a Signal se elixes volver activar os pagamentos.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">O teu saldo permanecerá na túa carteira vinculada a Molly se elixes volver activar os pagamentos.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Erro ao desactivar a carteira.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licenzas</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Termos e política de privacidade</string>
-    <string name="HelpFragment__copyright_signal_messenger">Dereitos de autor de Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Dereitos de autor de Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Licenza GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4773,7 +4911,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">Auto</string>
+    <string name="ChatColorSelectionFragment__auto">Auto.</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Empregar cores personalizadas</string>
     <string name="ChatColorSelectionFragment__chat_color">Cor da conversa</string>
     <string name="ChatColorSelectionFragment__edit">Editar</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Seleccionar unha cor</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Compartir</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Só os administradores poden enviar mensaxes neste grupo.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Límite alcanzado</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Non podes seleccionar máis de 5 conversas</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Máis información</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Actualizar Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Actualizar Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Esta versión de Signal caducou. Actualízaa xa para seguir empregando Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Esta versión de Molly caducou. Actualízaa xa para seguir empregando Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Actualizar</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Dispositivo non rexistrado</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Este dispositivo xa non está rexistrado. Volve rexistralo para seguir empregando Signal neste dispositivo.</string>
+    <string name="ReregisterSignalDialog__message">Este dispositivo xa non está rexistrado. Volve rexistralo para seguir empregando Molly neste dispositivo.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Re-register</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Erro ao abrir o selector.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Para activar as notificacións, Signal necesita permisos para poder mostralas.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Para activar as notificacións, Molly necesita permisos para poder mostralas.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Acender</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Sen respostas</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Non podes responder a esta historia porque xa non formas parte deste grupo.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Reaccionou á túa historia</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Reaccionaches á historia</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Reaccionou á historia</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Visualizacións</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Elixe o teu banco</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Confirma a túa doazón con %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Para configurar unha doazón mensual preme en «Continuar» para confirmar un cargo de 0,01 € ao teu banco. Reembolsarase automaticamente e permitirá activar a túa doazón de 5 € ao mes para que se cargue na túa conta.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Para configurar unha doazón mensual preme en «Continuar» para confirmar un cargo de 0,01 € ao teu banco. Reembolsarase automaticamente e permitirá activar a túa doazón de %1$s ao mes para que se cargue na túa conta.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Continuar</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Descargando copia de seguranza…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Desactivouse as copias de seguranza para arquivos multimedia</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">O teu plan de copia de seguranza para arquivos multimedia de Signal cancelouse porque non puidemos procesar o pagamento. Tes %1$d día para descargar calquera contido multimedia que teñas almacenado na copia, porque despois de %1$d día, eliminarase todo o seu contido.</item>
+        <item quantity="other">O teu plan de copia de seguranza para arquivos multimedia de Signal cancelouse porque non puidemos procesar o pagamento. Tes %1$d días para descargar calquera contido multimedia que teñas almacenado na copia, porque despois de %1$d días, eliminarase todo o seu contido.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Se queres volver a facer unha copia de seguranza de todos os teus arquivos multimedia, podes ter acceso de novo ao plan pagando en calquera momento. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Hoxe eliminarase o teu contido multimedia</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Cancelouse o teu plan de copia de seguranza de Signal porque non se puido procesar o pagamento. Esta é a túa última oportunidade de descargar os teus arquivos almacenados na copia antes de que se eliminen.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Non se pode completar a descarga</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">O teu dispositivo non ten espazo libre suficiente. Libera %1$s de espazo para descargar os arquivos multimedia almacenados na copia de seguranza.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Se escolles «Omitir», os arquivos multimedia da túa copia de seguranza eliminaranse en %1$d día.</item>
+        <item quantity="other">Se escolles «Omitir», os arquivos multimedia da túa copia de seguranza eliminaranse en %1$d días.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Non se procesou o teu pagamento da copia de seguranza</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Algo pasou! Non podemos recadar o teu pagamento mensual do plan de copia de seguranza. Asegúrate de que o teu método de pago está actualizado. Se non o está, actualízao mediante Google Pay. Signal tentará procesar o pagamento de novo nuns días.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Non se realizou a copia de seguranza</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Non se realizou unha copia de seguranza neste dispositivo en %1$d días. Conecta o dispositivo a unha rede wi-fi e preme «Facer copia agora». </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Máis información</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Omitir</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Descargar contido agora</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Descargar máis tarde</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Non descargar contido</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Libera %1$s de espazo para descargar os arquivos multimedia.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Tarxeta de débito ou crédito</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Descoñecido</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Historial de pagamentos</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">A túa última copia de seguranza foi o %1$s ás %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">As mensaxes anteriores á data seleccionada eliminaranse de forma permanente.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">As mensaxes que superen a cantidade seleccionada eliminaranse de forma permanente.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Aplicar límites nos dispositivos vinculados</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Ao activarse, estes límites tamén borrarán mensaxes dos teus dispositivos vinculados.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Agora a acción de borrar está sincronizada en todos os teus dispositivos</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Cando borres mensaxes ou conversas, borraranse tanto no teu teléfono coma nos teus dispositivos vinculados.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">Aceptar</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Historial de pagamentos</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Copia de seguranza de mensaxes de texto e arquivos multimedia</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Información do pagamento</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Tipo de copia de seguranza</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Data de pagamento</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Compartir</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Copias de seguranza de Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Historial de pagamentos</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Información da copia de seguranza</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Tamaño da copia de seguranza</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Periodicidade da copia de seguranza</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Realizar cos datos móbiles</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Desactivar e eliminar a copia de seguranza</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Copia de seguranza eliminada e desactivada.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Cambiouse o tipo de copia de seguranza e cancelouse a subscrición</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Cancelouse a subscrición</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Descarga completa</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Tipo de copia de seguranza</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Copia de seguranza desactivada</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s %2$s/mes</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Activar copias de seguranza</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Última copia de seguranza</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s ás %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Nunca</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Facer copia agora</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Desactivar e eliminar a copia de seguranza?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Non se che cobrará de novo. Eliminarase a copia de seguranza e non se creará unha nova.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Desactivar e eliminar</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Borrando copia de seguranza…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Copia de seguranza borrada</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Ao premer «Facer copia agora»"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Diariamente</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Semanalmente</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Mensualmente</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Facer manualmente</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Escribe o PIN, contrasinal ou patrón do dispositivo.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Seguinte</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Cambiar tipo de copia</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Cancelar subscrición</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Confirmar cancelación</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Non se che cobrará de novo. Desactivaranse as copias de seguranza ao finalizar o último ciclo de facturación. Despois dese día, terás 30 días para descargar o contido que teñas almacenado.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Confirmar e descargar agora</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Confirmar e descargar máis tarde</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Manter subscrición</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-gu/strings.xml b/app/src/main/res/values-gu/strings.xml
index 450aa7485d..94b51d464c 100644
--- a/app/src/main/res/values-gu/strings.xml
+++ b/app/src/main/res/values-gu/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal અપડેટ થઈ રહ્યું છે…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly અપડેટ થઈ રહ્યું છે…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">તમે પાસફ્રેઝ હજુ સુધી સેટ કર્યો નથી!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">પાસફ્રેઝ અક્ષમ કરો?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">આ કાયમી ધોરણે Signal અને મેસેજ સૂચનાઓને અનલૉક કરશે.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">આ કાયમી ધોરણે Molly અને મેસેજ સૂચનાઓને અનલૉક કરશે.</string>
     <string name="ApplicationPreferencesActivity_disable">અક્ષમ</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">સર્વર સાથે કનેક્ટ થવામાં ભૂલ</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">રજીસ્ટ્રેશન લૉક માટે પિન આવશ્યક છે. પિન અક્ષમ કરવા માટે, કૃપા કરીને પહેલા રજીસ્ટ્રેશન લૉક ને અક્ષમ કરો.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">ફાઇલ</string>
     <string name="AttachmentKeyboard_contact">સંપર્ક</string>
     <string name="AttachmentKeyboard_location">સ્થળ</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">તમારા ફોટા અને વીડિયો બતાવવા માટે Signalને પરવાનગીની જરૂર છે</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">તમારા ફોટા અને વીડિયો બતાવવા માટે Mollyને પરવાનગીની જરૂર છે</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">ઍક્સેસ આપો</string>
     <string name="AttachmentKeyboard_payment">પેમેન્ટ</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">મીડિયા પસંદ કરવા માટે કોઈ એપ્લિકેશન મળતું નથી.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">ફોટા, વિડિયો અથવા ઓડિયો ને જોડવા માટે Signal ને સ્ટોરેજ પરવાનગીની જરૂર હોય છે, પરંતુ તે કાયમી ધોરણે નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ મેનૂ પર ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"સ્ટોરેજ\" સક્ષમ કરો.</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">સંપર્ક માહિતીને જોડવા માટે Signal ને સંપર્કોની પરવાનગીની જરૂર હોય છે, પરંતુ તે કાયમી ધોરણે નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ મેનૂ પર ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"સંપર્કો\" સક્ષમ કરો.</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">કોઈ સ્થળ જોડવા માટે Signal ને સ્થાનની પરવાનગીની જરૂર હોય છે, પરંતુ તે કાયમી ધોરણે નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ મેનૂ પર ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"સ્થાન\" સક્ષમ કરો.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">ફોટા, વિડિયો અથવા ઓડિયો ને જોડવા માટે Molly ને સ્ટોરેજ પરવાનગીની જરૂર હોય છે, પરંતુ તે કાયમી ધોરણે નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ મેનૂ પર ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"સ્ટોરેજ\" સક્ષમ કરો.</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">સંપર્ક માહિતીને જોડવા માટે Molly ને સંપર્કોની પરવાનગીની જરૂર હોય છે, પરંતુ તે કાયમી ધોરણે નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ મેનૂ પર ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"સંપર્કો\" સક્ષમ કરો.</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">કોઈ સ્થળ જોડવા માટે Molly ને સ્થાનની પરવાનગીની જરૂર હોય છે, પરંતુ તે કાયમી ધોરણે નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ મેનૂ પર ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"સ્થાન\" સક્ષમ કરો.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">તમારા લોકેશનનો ઍક્સેસ આપો</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">તમારું લોકેશન મોકલવા માટે:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Signalને તમારું લોકેશન મોકલવા માટે ઍક્સેસ આપો.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Mollyને તમારું લોકેશન મોકલવા માટે ઍક્સેસ આપો.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">તમારું લોકેશન મોકલવા માટે Signalને લોકેશન ઍક્સેસની જરૂર છે.</string>
+    <string name="AttachmentManager_signal_needs_location_access">તમારું લોકેશન મોકલવા માટે Mollyને લોકેશન ઍક્સેસની જરૂર છે.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">સ્ટોરેજના એક્સેસની મંજૂરી આપો</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">ફોટા અને વીડિયો બતાવવા માટે:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">તમારા ફોટા અને વીડિયો બતાવવા માટે Signalને સ્ટોરેજ એક્સેસની જરૂર છે.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">તમારા ફોટા અને વીડિયો બતાવવા માટે Mollyને સ્ટોરેજ એક્સેસની જરૂર છે.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$sએ પેમેન્ટ સક્રિય કરેલ નથી </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">કેમેરો બદલો</string>
     <string name="CameraXFragment_open_gallery_description">ગેલેરી ખોલો</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">ઍક્સેસ આપો</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">તમારા કૅમેરા અને માઇક્રોફોનની ઍક્સેસ આપો</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">તમારા કૅમેરા પર ઍક્સેસની મંજૂરી આપો</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">તમારા માઇક્રોફોનનો ઍક્સેસ આપો</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">ફોટા કેપ્ચર કરવા માટે, કૅમેરા પર Signal ઍક્સેસની મંજૂરી આપો.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">ફોટા અને વિડિયો મેળવવા માટે, કેમેરામાં Signal એક્સેસની મંજૂરી આપો.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">ફોટા અને વીડિયો કેપ્ચર કરવા માટે, કૅમેરા અને માઇક્રોફોન પર Signal ઍક્સેસની મંજૂરી આપો.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">સાઉન્ડ સાથે વીડિયો કેપ્ચર કરવા માટે, તમારા માઇક્રોફોન પર Signal ઍક્સેસની મંજૂરી આપો.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">QR કોડ સ્કેન કરવા માટે, કૅમેરા પર Signal ઍક્સેસની મંજૂરી આપો.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">ફોટા કેપ્ચર કરવા માટે Signalને કૅમેરા ઍક્સેસની જરૂર છે</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">QR કોડ સ્કેન કરવા માટે Signalને કૅમેરાની ઍક્સેસની જરૂર છે</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">વીડિયો કેપ્ચર કરવા માટે Signalને માઇક્રોફોન ઍક્સેસની જરૂર છે</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Signalમાં ફોટા કેપ્ચર કરવા માટે:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Signalમાં ફોટા અને વીડિયો કેપ્ચર કરવા માટે:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">સાઉન્ડ સાથે વીડિયો કેપ્ચર કરવા માટે:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR કોડ સ્કેન કરવા માટે:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">તાજેતરના સંપર્કો</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">કોઈ Signal સંપર્કો નથી</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">તમે ફક્ત Signal સંપર્કોને ફોટા મોકલવા માટે કેમેરા બટનનો ઉપયોગ કરી શકો છો. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">તમે જેને શોધી રહ્યા છો તે શોધી શક્યા નથી?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Signal માં જોડાવા માટે સંપર્કને આમંત્રણ આપો</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Molly માં જોડાવા માટે સંપર્કને આમંત્રણ આપો</string>
     <string name="CameraContacts__menu_search">શોધો</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -290,7 +291,7 @@
     <string name="ClientDeprecatedActivity_update">અપડેટ</string>
     <string name="ClientDeprecatedActivity_dont_update">અપડેટ કરશો નહીં</string>
     <string name="ClientDeprecatedActivity_warning">ચેતવણી</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">તમારી Signal ઍપનું વર્ઝન જૂનું થઈ ગયું છે. તમે તમારો મેસેજ હિસ્ટ્રી જોઈ શકો છો પરંતુ તમે અપડેટ ન કરો ત્યાં સુધી તમે મેસેજ મોકલી અથવા પ્રાપ્ત નહીં કરી શકો.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">તમારી Molly ઍપનું વર્ઝન જૂનું થઈ ગયું છે. તમે તમારો મેસેજ હિસ્ટ્રી જોઈ શકો છો પરંતુ તમે અપડેટ ન કરો ત્યાં સુધી તમે મેસેજ મોકલી અથવા પ્રાપ્ત નહીં કરી શકો.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">કોઈ વેબ બ્રાઉઝર મળ્યું નથી.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">મેસેજ %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">%1$sને Molly વૉઇસ કૉલ કરો</string>
+    <string name="ContactsDatabase_signal_video_call_s">%1$sને Molly વીડિયો કૉલ કરો</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">ઓડિયો મેસેજ મોકલવા માટે:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">વૉઇસ મેસેજ મોકલવા માટે, Signalને તમારા માઇક્રોફોન પર ઍક્સેસ આપો.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">વૉઇસ મેસેજ મોકલવા માટે, Mollyને તમારા માઇક્રોફોન પર ઍક્સેસ આપો.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">વૉઇસ મેસેજ રેકોર્ડ કરવા માટે Signalને માઇક્રોફોન ઍક્સેસની જરૂર છે.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">ઓડિયો મેસેજ મોકલવા માટે Signal ને માઇક્રોફોન પરવાનગીની આવશ્યકતા છે, પરંતુ તે કાયમી ધોરણે નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"માઇક્રોફોન\" સક્ષમ કરો.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">વૉઇસ મેસેજ રેકોર્ડ કરવા માટે Mollyને માઇક્રોફોન ઍક્સેસની જરૂર છે.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">ઓડિયો મેસેજ મોકલવા માટે Molly ને માઇક્રોફોન પરવાનગીની આવશ્યકતા છે, પરંતુ તે કાયમી ધોરણે નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"માઇક્રોફોન\" સક્ષમ કરો.</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">કૉલ કરવા માટે Signal ને માઇક્રોફોન અને કેમેરાની પરવાનગીની જરૂર છે %1$s, પરંતુ તેઓને કાયમી નામંજૂર કરવામાં આવ્યા છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"માઇક્રોફોન\" અને \"કેમેરો\" સક્ષમ કરો.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">ફોટા અને વિડિયો મેળવવા માટે, કેમેરામાં Signal એક્સેસની મંજૂરી આપો.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">ફોટા અથવા વિડિયો લેવા માટે Signal ને કૅમેરાની પરવાનગીની જરૂર હોય છે, પરંતુ તે કાયમી ધોરણે નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"કૅમેરા\" સક્ષમ કરો.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal ને ફોટા અથવા વિડિયો લેવા માટે કૅમેરાની પરવાનગીની જરૂર હોય છે</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">કૉલ કરવા માટે Molly ને માઇક્રોફોન અને કેમેરાની પરવાનગીની જરૂર છે %1$s, પરંતુ તેઓને કાયમી નામંજૂર કરવામાં આવ્યા છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"માઇક્રોફોન\" અને \"કેમેરો\" સક્ષમ કરો.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">ફોટા અને વિડિયો મેળવવા માટે, કેમેરામાં Molly એક્સેસની મંજૂરી આપો.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">ફોટા અથવા વિડિયો લેવા માટે Molly ને કૅમેરાની પરવાનગીની જરૂર હોય છે, પરંતુ તે કાયમી ધોરણે નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"કૅમેરા\" સક્ષમ કરો.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly ને ફોટા અથવા વિડિયો લેવા માટે કૅમેરાની પરવાનગીની જરૂર હોય છે</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">અવાજ સાથે વિડિયોને કેપ્ચર કરવા માટે માઇક્રોફોન પરવાનગીને સક્ષમ કરો</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">વિડિયોને રેકોર્ડ કરવા માટે Signal ને માઇક્રોફોન પરવાનગીની જરૂર છે, પરંતુ તે નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"માઇક્રોફોન\" અને \"કેમેરા\" સક્ષમ કરો.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">વિડિયો રેકોર્ડ કરવા માટે Signal ને માઇક્રોફોન પરવાનગીની જરૂર છે.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">વિડિયોને રેકોર્ડ કરવા માટે Molly ને માઇક્રોફોન પરવાનગીની જરૂર છે, પરંતુ તે નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"માઇક્રોફોન\" અને \"કેમેરા\" સક્ષમ કરો.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">વિડિયો રેકોર્ડ કરવા માટે Molly ને માઇક્રોફોન પરવાનગીની જરૂર છે.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">ના</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">કૉલ શરૂ કરવા માટે:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">કૉલ શરૂ કરવા માટે, તમારા Signalને તમારા માઇક્રોફોન પર ઍક્સેસ આપો.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">કૉલ શરૂ કરવા માટે, તમારા Mollyને તમારા માઇક્રોફોન પર ઍક્સેસ આપો.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">કૉલ શરૂ કરવા માટે Signalને માઇક્રોફોન ઍક્સેસની જરૂર છે.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">કૉલ શરૂ કરવા માટે Mollyને માઇક્રોફોન ઍક્સેસની જરૂર છે.</string>
 
 
     <string name="ConversationActivity_join">જોડાઓ</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Signalમાં હવે SMS મેસેજિંગ સમર્થિત નથી. વાતચીત અહીં રાખવા માટે %1$s ને Signal પર આમંત્રિત કરો.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">આ વ્યક્તિ હવે Signalનો ઉપયોગ કરી રહી નથી. વાતચીત અહીં રાખવા માટે તેમને Signal પર આમંત્રિત કરો.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">આ વ્યક્તિ હવે Mollyનો ઉપયોગ કરી રહી નથી. વાતચીત અહીં રાખવા માટે તેમને Molly પર આમંત્રિત કરો.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Signal માટે આમંત્રણ આપો</string>
+    <string name="ConversationActivity__invite_to_signal">Molly માટે આમંત્રણ આપો</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">તમને ટૂંક સમયમાં ફરીથી યાદ અપાવવામાં આવશે.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">મારા માટે ડિલીટ કરો</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">આ ડિવાઇસ પર ડિલીટ કરો</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">ડિલીટ કરો</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">દરેક જગ્યાએથી ડિલીટ કરો</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">જો દરેક વ્યક્તિ પાસે Signalનું તાજેતરનું વર્ઝન હશે તો આ મેસેજ ચેટમાં રહેલ દરેક માટે ડિલીટ કરવામાં આવશે. તેઓ જોઈ શકશે કે તમે મેસેજ ડિલીટ કર્યો છે.</string>
@@ -578,11 +581,11 @@
     <!-- Action shown to allow a user to update their application because it has expired -->
     <string name="ConversationFragment__update_build">સિગ્નલ ને અપડેટ કરો</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Signal પર ફરીથી રજીસ્ટર કરો</string>
+    <string name="ConversationFragment__reregister_signal">Molly પર ફરીથી રજીસ્ટર કરો</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">પાછળ નેવિગેટ કરો.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signal ઓપન કરો</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Molly ઓપન કરો</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">હવે ચકસાયેલ રહ્યો નથી</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">આ પસંદ કરેલી ચેટને કાયમ માટે ડિલીટ કરશે.</item>
         <item quantity="other">આ પસંદ કરેલી બધી %1$d ચેટને કાયમ માટે ડિલીટ કરશે.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">આ પસંદ કરેલી ચેટને તમારા બધા ડિવાઇસમાંથી કાયમ માટે ડિલીટ કરશે.</item>
+        <item quantity="other">આ %1$d પસંદ કરેલી બધી ચેટને તમારા બધા ડિવાઇસમાંથી કાયમ માટે ડિલીટ કરશે.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">કાઢી નાખો</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">પસંદ કરેલી ચેટ ડિલીટ થઈ રહી છે…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">મને નંબરથી કોણ શોધી શકે?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">જેમની પાસે તમારો ફોન નંબર હોય તે કોઈ પણને દેખાશે કે તમે Signal પર છો અને તમારી સાથે ચેટ શરૂ કરી શકે છે.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">જેમની પાસે તમારો ફોન નંબર હોય તે કોઈ પણને દેખાશે કે તમે Molly પર છો અને તમારી સાથે ચેટ શરૂ કરી શકે છે.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">તમે Signal પર છો તે કોઈ જોઈ શકશે નહીં, જ્યાં સુધી તમે તેમને મેસેજ ન કરો અથવા તેમની સાથે તમારી કોઈ ચેટ અસ્તિત્વમાં હોય.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">તમે Molly પર છો તે કોઈ જોઈ શકશે નહીં, જ્યાં સુધી તમે તેમને મેસેજ ન કરો અથવા તેમની સાથે તમારી કોઈ ચેટ અસ્તિત્વમાં હોય.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">બૅકઅપમાંથી રિસ્ટોર કરીએ?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">તમારા બૅકઅપ પાસફ્રેઝનું પરીક્ષણ કરો અને ચકાસો કે તે મેચ કરે છે</string>
     <string name="BackupsPreferenceFragment__turn_on">ચાલુ કરો</string>
     <string name="BackupsPreferenceFragment__turn_off">બંધ કરો</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"બૅકઅપ રિસ્ટોર કરવા માટે, Signal ની નવી કૉપી ઇન્સ્ટોલ કરો. એપ્લિકેશન ખોલો અને \"રિસ્ટોર બૅકઅપ\" ટેપ કરો, પછી બૅકઅપ ફાઇલ શોધો. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"બૅકઅપ રિસ્ટોર કરવા માટે, Molly ની નવી કૉપી ઇન્સ્ટોલ કરો. એપ્લિકેશન ખોલો અને \"રિસ્ટોર બૅકઅપ\" ટેપ કરો, પછી બૅકઅપ ફાઇલ શોધો. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">વધુ શીખો</string>
     <string name="BackupsPreferenceFragment__in_progress">થાય છે…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$dઅત્યાર સુધી…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% અત્યાર સુધી…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">બૅકઅપ બનાવવા માટે Signal ને બાહ્ય સ્ટોરેજ પરવાનગીની જરૂર હોય છે, પરંતુ તે કાયમી ધોરણે નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"સ્ટોરેજ\" સક્ષમ કરો.</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">બૅકઅપ બનાવવા માટે Molly ને બાહ્ય સ્ટોરેજ પરવાનગીની જરૂર હોય છે, પરંતુ તે કાયમી ધોરણે નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"સ્ટોરેજ\" સક્ષમ કરો.</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">બેકઅપ સમય સેટ કરો</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">ચેટ સેશન રિફ્રેશ તાજું થયું</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal એન્ડ-ટુ-એન્ડ એન્ક્રિપ્શનનો ઉપયોગ કરે છે અને તેને ક્યારેક તમારા ચેટ સત્રને રિફ્રેશ કરવાની જરૂર પડી શકે છે. આ તમારી ચેટ ની સુરક્ષાને અસર કરતું નથી, પરંતુ તમે કદાચ આ સંપર્કમાંથી કોઈ મેસેજ ચૂકી ગયા છો, અને તમે તેને ફરીથી મોકલવા માટે કહી શકો છો.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly એન્ડ-ટુ-એન્ડ એન્ક્રિપ્શનનો ઉપયોગ કરે છે અને તેને ક્યારેક તમારા ચેટ સત્રને રિફ્રેશ કરવાની જરૂર પડી શકે છે. આ તમારી ચેટ ની સુરક્ષાને અસર કરતું નથી, પરંતુ તમે કદાચ આ સંપર્કમાંથી કોઈ મેસેજ ચૂકી ગયા છો, અને તમે તેને ફરીથી મોકલવા માટે કહી શકો છો.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">ડેસ્કટોપ અથવા iPad પર Signalનો ઉપયોગ કરો. તમારા મેસેજ તમારા લિંક કરેલા ડિવાઇસ સાથે સિંક થશે.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">નવું ડિવાઇસ લિંક કરો</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s મેસેજ અને ચેટ માહિતી બધા ડિવાઇસ પર એન્ડ-ટૂ-એન્ડ એન્ક્રિપ્શન દ્વારા સુરક્ષિત છે</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">ડેસ્કટોપ અથવા iPad પર Signal</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">લિંક કરેલા ડિવાઇસ પરના તમામ મેસેજિંગ ખાનગી છે</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">તમારા મોબાઇલ ફોન પર લિંક થયા પછી Molly મેસેજ તેની સાથે સિંક્રનાઇઝ થાય છે. તમારી પાછલી મેસેજ હિસ્ટ્રી દેખાશે નહીં.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">તમારા અન્ય ડિવાઇસ પર, Molly ઇન્સ્ટોલ કરવા માટે %1$sની મુલાકાત લો</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">મારા લિંક કરેલા ડિવાઇસ</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">અનલિંક કરો</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s અનલિંક કર્યું</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">ડિવાઇસ લિંક થઈ રહ્યું છે…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">ડિવાઇસ મંજૂર કર્યું</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">લોડ કરી રહ્યું છે</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">કોઈ લિંક કરેલા ડિવાઇસ નથી</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">ડિવાઇસ લિંક કરવા માટે અનલૉક કરો</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">લિંક કરવા માટે ડિવાઇસ પર પ્રદર્શિત QR કોડને સ્કેન કરો.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">QR કોડ સ્કેન કરો</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">તમે જે ડિવાઇસને લિંક કરવા માંગો છો તેના પર પ્રદર્શિત QR કોડને સ્કેન કરવા માટે આ ડિવાઇસનો ઉપયોગ કરો</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">બરાબર</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">આ ડિવાઇસ તમારા ગ્રૂપ અને સંપર્કો જોઈ શકશે, તમારી ચેટને ઍક્સેસ કરી શકશે અને તમારા નામે મેસેજ મોકલી શકશે.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">તમારા અન્ય ડિવાઇસ પર લિંક કરવાનું પૂર્ણ કરો</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">તમારા અન્ય ડિવાઇસ પર Mollyને લિંક કરવાનું પૂર્ણ કરો.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">ડિવાઇસને જોડવાનું નિષ્ફળ થયું</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">આ QR કોડ માન્ય નથી. કૃપા કરીને ખાતરી કરો કે તમે QR કોડને સ્કેન કરી રહ્યાં છો કે જે ડિવાઇસને તમે લિંક કરવા માંગો છો તેના પર પ્રદર્શિત થાય છે.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">ફરી પ્રયાસ કરો</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">અનલિંક કરો \'%1$s\'?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">ખૂટતી Play Services માટે ઓપ્ટિમાઇઝ કરો</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">આ ડિવાઇસ Play Servicesનું સમર્થન કરતું નથી. સિસ્ટમ બેટરી ઓપ્ટિમાઇઝેશંસને અક્ષમ કરવા માટે ટેપ કરો જે Signal ને નિષ્ક્રિય હોવા પર મેસેજ પ્રાપ્ત કરવામાં અટકાવે છે.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">આ ડિવાઇસ Play Servicesનું સમર્થન કરતું નથી. સિસ્ટમ બેટરી ઓપ્ટિમાઇઝેશંસને અક્ષમ કરવા માટે ટેપ કરો જે Molly ને નિષ્ક્રિય હોવા પર મેસેજ પ્રાપ્ત કરવામાં અટકાવે છે.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Signal નું આ વર્ઝન સમાપ્ત થઈ ગયું છે. મેસેજ મોકલવા અને મેળવવા કરવા માટે અત્યારે અપડેટ કરો.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Molly નું આ વર્ઝન સમાપ્ત થઈ ગયું છે. મેસેજ મોકલવા અને મેળવવા કરવા માટે અત્યારે અપડેટ કરો.</string>
     <string name="ExpiredBuildReminder_update_now">અત્યારે અપડેટ કરો</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">વ્યૂ</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">કાયમી Signal ની વાતચીત નિષ્ફળ!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal Google Play Services સાથે રજીસ્ટર કરવામાં અસમર્થ હતું. Signal મેસેજ અને કૉલ્સ અક્ષમ કરવામાં આવ્યુ છે, કૃપા કરીને સેટિંગ્સ &gt; માં ફરીથી રજીસ્ટર કરવાનો પ્રયાસ કરો; વધુ.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">કાયમી Molly ની વાતચીત નિષ્ફળ!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly Google Play Services સાથે રજીસ્ટર કરવામાં અસમર્થ હતું. Molly મેસેજ અને કૉલ્સ અક્ષમ કરવામાં આવ્યુ છે, કૃપા કરીને સેટિંગ્સ &gt; માં ફરીથી રજીસ્ટર કરવાનો પ્રયાસ કરો; વધુ.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">ડીબગ લૉગ અમને સમસ્યાનું નિદાન કરવામાં અને તેને ઠીક કરવામાં મદદ કરે છે અને તેમાં ઓળખ થઈ શકે તેવી માહિતી શામેલ હોતી નથી.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signalને એક સમસ્યા આવી. ડીબગ લૉગ સબમિટ કરવો છે?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Mollyને એક સમસ્યા આવી. ડીબગ લૉગ સબમિટ કરવો છે?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">બેટરી ઑપ્ટિમાઇઝેશનને કારણે નોટિફિકેશનમાં વિલંબ થઈ શકે છે</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">મેસેજ નોટિફિકેશન વિલંબિત ન થાય તેની ખાતરી કરવા માટે તમે Signal માટે બેટરી ઑપ્ટિમાઇઝેશનને અક્ષમ કરી શકો છો.</string>
+    <string name="PromptBatterySaverBottomSheet__message">મેસેજ નોટિફિકેશન વિલંબિત ન થાય તેની ખાતરી કરવા માટે તમે Molly માટે બેટરી ઑપ્ટિમાઇઝેશનને અક્ષમ કરી શકો છો.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">બેટરી ઑપ્ટિમાઇઝેશનને કારણે નોટિફિકેશનમાં વિલંબ થઈ શકે છે</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">મેસેજ નોટિફિકેશન વિલંબિત ન થાય તેની ખાતરી કરવા માટે તમે Molly માટે બેટરી ઑપ્ટિમાઇઝેશનને અક્ષમ કરો. ડિવાઇસ-વિશિષ્ટ સૂચનાઓ જોવા માટે \"ચાલુ રાખો\" પર ટૅપ કરો.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">ના, આભાર</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">ચાલુ રાખો</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">ચાલુ રાખો</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">કાઢી નાખો</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">ના, આભાર</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">ગ્રુપ આમંત્રણો બાકી</string>
+    <string name="PendingMembersActivity_pending_group_invites">વિનંતીઓ &amp; આમંત્રણ</string>
     <string name="PendingMembersActivity_requests">વિનંતીઓ</string>
     <string name="PendingMembersActivity_invites">આમંત્રણ</string>
     <string name="PendingMembersActivity_people_you_invited">તમે આમંત્રિત કરેલા લોકો</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">રદ કરો</string>
     <string name="InviteActivity_sending">મોકલી રહ્યો છે…</string>
     <string name="InviteActivity_invitations_sent">આમંત્રણો મોકલ્યા!</string>
-    <string name="InviteActivity_invite_to_signal">Signal માટે આમંત્રણ આપો</string>
+    <string name="InviteActivity_invite_to_signal">Molly માટે આમંત્રણ આપો</string>
     <string name="InviteActivity_send_sms">SMS મોકલો (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">SMS %1$dઆમંત્રણ મોકલો?</item>
         <item quantity="other">SMS %1$d આમંત્રણો મોકલો?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">ચાલો Signal પર સ્વિચ કરીએ: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">ચાલો Molly પર સ્વિચ કરીએ: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">એવું લાગે છે કે તમારી પાસે શેર કરવા માટે કોઈ એપ્લિકેશન નથી.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">તમારો મેસેજ</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">બેકગ્રાઉંડ કનેક્શન સક્ષમ કર્યું</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">જવાબો</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal કૉલ સ્થાપિત કરી રહ્યા છીએ</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly કૉલ સ્થાપિત કરી રહ્યા છીએ</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signal કૉલ સર્વિસ શરૂ કરીએ છીએ</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal કોલ સેવા બંધ કરી રહ્યા છીએ</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Molly કૉલ સર્વિસ શરૂ કરીએ છીએ</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly કોલ સેવા બંધ કરી રહ્યા છીએ</string>
     <string name="NotificationBarManager__cancel_call">કૉલ ને રદ કરો</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">તમે પેમેન્ટ સક્રિય કર્યું</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s હવે પેમેન્ટ સ્વીકારી શકે છે</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">ચુકવણીની વિગતો ઉપલબ્ધ નથી</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">વધુ માટે ટૅપ કરો</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">ચુકવણીની વિગતો ઉપલબ્ધ નથી</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">આ ચુકવણીની આ વિગતો ઉપલબ્ધ નથી કારણ કે તમારા મેસેજ એવા સ્રોતમાંથી રિસ્ટોર કરવામાં આવ્યા હતા જેમાં આ જૂની ચુકવણી શામેલ ન હતી. આ તમારા વૉલેટ બેલેન્સ અથવા ભૂતકાળની ચુકવણીની સ્થિતિને અસર કરતું નથી.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">તમે Signalમાંથી હવે SMS મેસેજ મોકલી શકશો નહીં. વાતચીત અહીં રાખવા માટે %1$s ને Signal પર આમંત્રિત કરો.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">તમે Signalમાં હવે SMS મેસેજ મોકલી શકતા નથી. વાતચીત અહીં રાખવા માટે %1$s ને Signal પર આમંત્રિત કરો.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">તમે Mollyમાં હવે SMS મેસેજ મોકલી શકતા નથી. વાતચીત અહીં રાખવા માટે %1$s ને Molly પર આમંત્રિત કરો.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">પેમેન્ટ: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">ચુકવણી</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">સ્પામ તરીકે જાણ કરી</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Signal ડિવાઇસ ને લિંક કરીએ?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">એવું લાગે છે કે તમે 3જી પાર્ટી સ્કેનરનો ઉપયોગ કરીને Signal ડિવાઇસ ને લિંક કરવાનો પ્રયાસ કરી રહ્યાં છો. તમારી સુરક્ષા માટે, કૃપા કરીને Signal ની અંદરથી ફરીથી કોડ સ્કેન કરો.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">QR કોડને સ્કેન કરવા માટે Signal ને કેમેરાની પરવાનગીની જરૂર હોય છે, પરંતુ તે કાયમી ધોરણે નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"કેમેરો\" સક્ષમ કરો.</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">QR કોડને સ્કેન કરવા માટે Molly ને કેમેરાની પરવાનગીની જરૂર હોય છે, પરંતુ તે કાયમી ધોરણે નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"કેમેરો\" સક્ષમ કરો.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">કેમેરાની પરવાનગી વિના QR કોડ સ્કેન કરવામાં અસમર્થ</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">પાસફ્રેઝ દાખલ કરો</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal ચિહ્ન</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly ચિહ્ન</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">પાસફ્રેઝ સબમિટ કરો</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">અમાન્ય પાસફ્રેઝ!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signal અનલૉક કરો</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal એન્ડ્રોઇડ - લૉક સ્ક્રીન</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Molly અનલૉક કરો</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly એન્ડ્રોઇડ - લૉક સ્ક્રીન</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">નકશો</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">મેસેજિંગ ચાલુ રાખવા માટે ચકાસો</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Signal પર સ્પામ અટકાવવા માટે, કૃપા કરીને ચકાસણી પૂર્ણ કરો.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Molly પર સ્પામ અટકાવવા માટે, કૃપા કરીને ચકાસણી પૂર્ણ કરો.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">ચકાસણી કર્યા પછી, તમે મેસેજિંગ ચાલુ રાખી શકો છો. થોભાવેલા કોઈપણ સંદેશા આપમેળે મોકલવામાં આવશે.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">મારી સ્ટોરી</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal કૉલ</string>
+    <string name="Recipient_signal_call">Molly કૉલ</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">બ્લૉક કરો</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">રિંગ વાગે છે…</string>
     <string name="RedPhone_busy">વ્યસ્ત</string>
     <string name="RedPhone_recipient_unavailable">પ્રાપ્તકર્તા અનુપલબ્ધ</string>
-    <string name="RedPhone_network_failed">નેટવર્ક નિષ્ફળ થયું!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">નેટવર્ક નિષ્ફળ થયું! કૃપા કરીને તમારું નેટવર્ક કનેક્શન તપાસો અને ફરી પ્રયાસ કરો.</string>
     <string name="RedPhone_number_not_registered">નંબર રજીસ્ટર નથી!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">તમે ડાયલ કરેલ નંબર સુરક્ષિત ઑડિયોને સપોર્ટ કરતું નથી!</string>
     <string name="RedPhone_got_it">સમજાઈ ગયું</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">તમારી વિડિયો ચાલુ કરવા માટે અહીં ટેપ કરો</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">કૉલ કરવા માટે %1$s, Signal ને તમારા માઇક્રોફોન અને કૅમેરાની ઍક્સેસની જરૂર છે.</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">કૉલ કરવા માટે %1$s, Molly ને તમારા માઇક્રોફોન અને કૅમેરાની ઍક્સેસની જરૂર છે.</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">કોલિંગ…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">ફરીથી કનેક્ટ કરી રહ્યાં છીએ…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">કૉલમાંથી દૂર કર્યા</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">કોઈએ તમને કૉલમાંથી દૂર કર્યા છે.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">તમારા કૅમેરા અને માઇક્રોફોનનું એક્સેસ આપો</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">તમારા માઇક્રોફોનનું એક્સેસ આપો</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">તમારા કૅમેરા પર એક્સેસની મંજૂરી આપો</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">કૉલ શરૂ કરવા અથવા તેમાં જોડાવા માટે, તમારા કૅમેરા અને માઇક્રોફોનને Mollyને એક્સેસ કરવાની મંજૂરી આપો.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">કૉલ શરૂ કરવા અથવા તેમાં જોડાવા માટે, Mollyને તમારા માઇક્રોફોન પર એક્સેસ આપો.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">તમારા વીડિયોને ચાલુ કરવા માટે, તમારા કૅમેરામાં Molly એક્સેસની મંજૂરી આપો.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">કૉલ શરૂ કરવા અથવા જોડાવા માટે Mollyને માઇક્રોફોનની પરવાનગીની જરૂર છે.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">તમારા વીડિયોને ચાલુ કરવા માટે Mollyને કૅમેરાના એક્સેસની જરૂર છે</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">કૉલ શરૂ કરવા અથવા તેમાં જોડાવા માટે:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">તમારો વીડિયો ચાલુ કરવા:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal કૉલ</string>
-    <string name="WebRtcCallView__signal_video_call">Signal વિડિયો kol</string>
+    <string name="WebRtcCallView__signal_call">Molly કૉલ</string>
+    <string name="WebRtcCallView__signal_video_call">Molly વિડિયો kol</string>
     <string name="WebRtcCallView__start_call">કૉલ શરૂ કરો</string>
     <string name="WebRtcCallView__join_call">કૉલમાં જોડાઓ</string>
     <string name="WebRtcCallView__call_is_full">કૉલ પૂર્ણ છે</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">તમારો હાથ નીચો કરવો છે?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">હાથ નીચે કરો</string>
+    <string name="CallOverflowPopupWindow__lower_hand">નીચે કરો</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">રદ કરો</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">તમે તમારો હાથ ઊંચો કર્યો</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">જુઓ</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$sએ હાથ ઊંચો કર્યો</item>
-        <item quantity="other">%1$s + %2$d એ હાથ ઊંચા કર્યા</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$sએ હાથ ઊંચો કર્યો</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$dએ હાથ ઊંચો કર્યો</item>
+        <item quantity="other">%1$s + %2$dએ હાથ ઊંચા કર્યા</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$sએ હાથ ઊંચો કર્યો</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$dએ હાથ ઊંચો કર્યો</item>
+        <item quantity="other">%1$s + %2$dએ હાથ ઊંચા કર્યા</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">આ નંબરની ચકાસણી કરવા માટે તમને એક કૉલ આવશે.</string>
     <string name="RegistrationActivity_edit_number">નંબરમાં ફેરફાર કરો</string>
     <string name="RegistrationActivity_missing_google_play_services">Google Play Services ખૂટે છે</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">આ ડિવાઇસ માં Google Play Services ખૂટે છે. તમે હજી પણ Signal નો ઉપયોગ કરી શકો છો, પરંતુ આ પદ્ધતિનું પરિણામ વિશ્વસનીયતા અથવા પ્રભાવમાં ઘટાડો થઈ શકે છે.\n\nજો તમે અદ્યતન વપરાશકર્તા નથી, તો પછીની Android ROM ચલાવી રહ્યાં નથી, અથવા માનો છો કે તમે આ ત્રુટિથી જોયા છો, કૃપા કરીને સહાય મુશ્કેલીનિવારણ માટે support@signal.org નો સંપર્ક કરો.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">આ ડિવાઇસ માં Google Play Services ખૂટે છે. તમે હજી પણ Molly નો ઉપયોગ કરી શકો છો, પરંતુ આ પદ્ધતિનું પરિણામ વિશ્વસનીયતા અથવા પ્રભાવમાં ઘટાડો થઈ શકે છે.\n\nજો તમે અદ્યતન વપરાશકર્તા નથી, તો પછીની Android ROM ચલાવી રહ્યાં નથી, અથવા માનો છો કે તમે આ ત્રુટિથી જોયા છો, કૃપા કરીને સહાય મુશ્કેલીનિવારણ માટે support@molly.im નો સંપર્ક કરો.</string>
     <string name="RegistrationActivity_i_understand">મને સમજાયુ</string>
     <string name="RegistrationActivity_play_services_error">Play Services ભૂલ</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services અપડેટ થઈ રહી છે અથવા અસ્થાયીરૂપે અનુપલબ્ધ છે. મેહરબાની કરી ને ફરીથી પ્રયાસ કરો.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">બિન-પ્રમાણભૂત નંબર ફોર્મેટ</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">તમે દાખલ કરેલ નંબર (%1$s) બિન-પ્રમાણભૂત ફોર્મેટ હોય તેમ લાગે છે.\n\n શું તમારો અર્થ %2$s હતો?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - ફોન નંબર ફોર્મેટ</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - ફોન નંબર ફોર્મેટ</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">કૉલની વિનંતી કરી</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">રજિસ્ટર કરવામાં મુશ્કેલી આવી રહી છે?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• ખાતરી કરો કે તમારા ફોનમાં તમારો SMS અથવા કૉલ મેળવવા માટે સેલ્યુલર સિગ્નલ હોય છે\n • ખાતરી કરો કે તમે નંબર પર ફોન કૉલ મેળવી શકો છો\n • તપાસો કે તમે તમારો ફોન નંબર યોગ્ય રીતે દાખલ કર્યો છે.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">વધુ માહિતી માટે, કૃપા કરીને આ મુશ્કેલી નિવારણના પગલાં અનુસરો અથવા સપોર્ટનો સંપર્ક કરો</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">વધુ માહિતી માટે, કૃપા કરીને %1$s અથવા %2$sને ફોલો કરો</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">આ મુશ્કેલી નિવારણ પગલાં</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">સંપર્કોમાં ઉમેરો</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Signal માટે આમંત્રણ આપો</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Molly માટે આમંત્રણ આપો</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal મેસેજ</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal કૉલ</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">સંપર્કોમાં ઉમેરો</string>
-    <string name="SharedContactView_invite_to_signal">Signal માટે આમંત્રણ આપો</string>
+    <string name="SharedContactView_invite_to_signal">Molly માટે આમંત્રણ આપો</string>
     <string name="SharedContactView_message">Signal મેસેજ</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$sએ %2$s નો નંબર છે</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal અપડેટ</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signalનું નવું વર્ઝન ઉપલબ્ધ છે. અપડેટ કરવા માટે ટૅપ કરો.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal અપડેટ થવામાં નિષ્ફળ રહ્યું</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly અપડેટ</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Mollyનું નવું વર્ઝન ઉપલબ્ધ છે. અપડેટ કરવા માટે ટૅપ કરો.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly અપડેટ થવામાં નિષ્ફળ રહ્યું</string>
     <string name="ApkUpdateNotifications_failed_general_body">અમે પછીથી ફરી પ્રયાસ કરીશું.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal સફળતાપૂર્વક અપડેટ થઈ ગયું</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly સફળતાપૂર્વક અપડેટ થઈ ગયું</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">તમને આપમેળે વર્ઝન %1$s પર અપડેટ કરવામાં આવ્યા હતા.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">અમારો Signal સલામતી નંબર:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">એવું લાગે છે કે તમારી પાસે શેર કરવા માટે કોઈ એપ્લિકેશન નથી.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">ક્લિપબોર્ડમાં તુલના કરવા માટેનો સલામતી નંબર મળ્યો નથી</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">QR કોડને સ્કેન કરવા માટે Signal ને કેમેરાની પરવાનગીની જરૂર હોય છે, પરંતુ તે કાયમી ધોરણે નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ ચાલુ રાખો, \"પરવાનગી\", પસંદ કરો અને \"કેમેરો\" સક્ષમ કરો.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">QR કોડને સ્કેન કરવા માટે Molly ને કેમેરાની પરવાનગીની જરૂર હોય છે, પરંતુ તે કાયમી ધોરણે નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ ચાલુ રાખો, \"પરવાનગી\", પસંદ કરો અને \"કેમેરો\" સક્ષમ કરો.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">કેમેરાની મંજૂરી વિના QR કોડ સ્કેન કરવામાં અસમર્થ</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">%1$s નો સલામતી નંબર જોવા માટે તમારે પહેલા મેસેજ એક્સચેન્જ કરવુ આવશ્યક છે.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">ખોલવા માટે ટચ કરો.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal અનલોક થયેલ છે</string>
-    <string name="KeyCachingService_lock">Signal લૉક</string>
+    <string name="KeyCachingService_passphrase_cached">Molly અનલોક થયેલ છે</string>
+    <string name="KeyCachingService_lock">Molly લૉક</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">તમે</string>
     <string name="MediaPreviewActivity_unssuported_media_type">અસમર્થિત મીડિયા પ્રકાર</string>
     <string name="MediaPreviewActivity_draft">ડ્રાફ્ટ</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">બાહ્ય સ્ટોરેજ માં સેવ કરવા માટે Signal ને સ્ટોરેજ પરવાનગીની જરૂર છે, પરંતુ તેનો કાયમી નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ ચાલુ રાખો \"પરવાનગી\" પસંદ કરો, અને \"સ્ટોરેજ\" સક્ષમ કરો.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">બાહ્ય સ્ટોરેજ માં સેવ કરવા માટે Molly ને સ્ટોરેજ પરવાનગીની જરૂર છે, પરંતુ તેનો કાયમી નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ ચાલુ રાખો \"પરવાનગી\" પસંદ કરો, અને \"સ્ટોરેજ\" સક્ષમ કરો.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">પરવાનગી વિના બાહ્ય સ્ટોરેજમાં સેવ કરવામાં અસમર્થ</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">મેસેજ ડિલીટ કરવો છે?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">આ મેસેજ ને કાયમી ધોરણે ડિલીટ કરવામાં આવશે.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">મેસેજ પહોંચાડવામાં નિષ્ફળ.</string>
     <string name="MessageNotifier_error_delivering_message">મેસેજ પહોંચાડવામાં ભૂલ.</string>
     <string name="MessageNotifier_message_delivery_paused">મેસેજ ડિલિવરી થોભાવ્યું.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Signal પર મેસેજિંગ ચાલુ રાખવા માટે ચકાસો.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Molly પર મેસેજિંગ ચાલુ રાખવા માટે ચકાસો.</string>
     <string name="MessageNotifier_mark_all_as_read">બધાને વાંચેલા તરીકે માર્ક કરો</string>
     <string name="MessageNotifier_mark_read">વાંચેલા તરીકે માર્ક કરો</string>
     <string name="MessageNotifier_turn_off_these_notifications">આ સૂચનાઓ બંધ કરો</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">તમારા સ્ટીકર પર %1$s પ્રતિક્રિયા આપી.</string>
     <string name="MessageNotifier_this_message_was_deleted">આ મેસેજ ડિલીટ કર્યો.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Signal નોટિફિકેશનમાં જોડાયેલા સંપર્કને બંધ કરીએ? તમે તેમને ફરી સક્ષમ કરી શકો છો Signal &gt; સેટિંગ્સ &gt; સૂચનાઓ.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Molly નોટિફિકેશનમાં જોડાયેલા સંપર્કને બંધ કરીએ? તમે તેમને ફરી સક્ષમ કરી શકો છો Molly &gt; સેટિંગ્સ &gt; સૂચનાઓ.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">જ્યારે Signal લૉક થાય ત્યારે ઝડપી પ્રતિસાદ ઉપલબ્ધ નથી!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">જ્યારે Molly લૉક થાય ત્યારે ઝડપી પ્રતિસાદ ઉપલબ્ધ નથી!</string>
     <string name="QuickResponseService_problem_sending_message">મેસેજ મોકલવામાં સમસ્યા!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">અમાન્ય શોર્ટકટ</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">નવો મેસેજ</string>
     <string name="SingleRecipientNotificationBuilder_message_request">મેસેજ વિનંતી</string>
     <string name="SingleRecipientNotificationBuilder_you">તમે</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">આ ડિવાઇસ હવે રજિસ્ટર્ડ નથી. આ સંભવ છે કારણ કે તમે તમારા ફોન નંબરને Signal સાથે કોઈ બીજા ડિવાઇસ પર રજિસ્ટર કરાવ્યો છે.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">આ ડિવાઇસ હવે રજિસ્ટર્ડ નથી. આ સંભવ છે કારણ કે તમે તમારા ફોન નંબરને Molly સાથે કોઈ બીજા ડિવાઇસ પર રજિસ્ટર કરાવ્યો છે.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">ડિવાઇસને ફરીથી રજિસ્ટર કરાવો</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">કૉલનો જવાબ આપવા માટે, Signalને તમારા માઇક્રોફોન પર ઍક્સેસ આપો.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">કૉલનો જવાબ આપવા માટે, Mollyને તમારા માઇક્રોફોન પર ઍક્સેસ આપો.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">વીડિયો કૉલનો જવાબ આપવા માટે, Signalને તમારા માઇક્રોફોન અને કૅમેરાનો ઍક્સેસ આપો.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">કૉલ કરવા અથવા પ્રાપ્ત કરવા માટે Signal ને માઇક્રોફોન અને કેમેરાની પરવાનગીની જરૂર હોય છે, પરંતુ તેઓને કાયમી નામંજૂર કરવામાં આવ્યા છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"માઇક્રોફોન\" અને \"કેમેરો\" સક્ષમ કરો.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">વીડિયો કૉલનો જવાબ આપવા માટે, Mollyને તમારા માઇક્રોફોન અને કૅમેરાનો ઍક્સેસ આપો.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">કૉલ કરવા અથવા પ્રાપ્ત કરવા માટે Molly ને માઇક્રોફોન અને કેમેરાની પરવાનગીની જરૂર હોય છે, પરંતુ તેઓને કાયમી નામંજૂર કરવામાં આવ્યા છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"માઇક્રોફોન\" અને \"કેમેરો\" સક્ષમ કરો.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">લિંક્ડ ડિવાઇસ પર જવાબ આપ્યો.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">લિંક્ડ ડિવાઇસ પર નકારી.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">લિંક્ડ ડિવાઇસ પર વ્યસ્ત.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">નવો પાસફ્રેઝ પુનરાવર્તન કરો</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Signal માટે આમંત્રણ આપો</string>
+    <string name="contact_selection_activity__invite_to_signal">Molly માટે આમંત્રણ આપો</string>
     <string name="contact_selection_activity__new_group">નવું ગ્રુપ</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">સંપર્કો રિફ્રેશ કરો</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">કોઈ ખૂટે છે? રિફ્રેશ કરી જુઓ</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Signal પર તમે જાણતા હો તે લોકોને શોધો</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">તમારા સંપર્કો પર ઍક્સેસની મંજૂરી આપો</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">વધુ</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">સંપર્ક ફોટો</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">તમારા સંપર્કોને પ્રદર્શિત કરવા માટે Signal ને સંપર્કોની પરવાનગીની જરૂર હોય છે, પરંતુ તે કાયમી ધોરણે નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ મેનૂ પર ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"સંપર્કો\" ને સક્ષમ કરો.</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">તમારા સંપર્કોને પ્રદર્શિત કરવા માટે Molly ને સંપર્કોની પરવાનગીની જરૂર હોય છે, પરંતુ તે કાયમી ધોરણે નામંજૂર કરવામાં આવી છે. કૃપા કરીને એપ્લિકેશન સેટિંગ્સ મેનૂ પર ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"સંપર્કો\" ને સક્ષમ કરો.</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">કૃપા કરીને એપ્લિકેશન સેટિંગ્સ મેનૂ પર ચાલુ રાખો, \"પરવાનગી\" પસંદ કરો અને \"સંપર્કો\" ને સક્ષમ કરો.</string>
     <string name="ContactSelectionListFragment_username_not_found">યુઝરનેમ મળ્યું નથી</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" Signal ઉપયોગકર્તા નથી. કૃપા કરીને યુઝરનેમ તપાસો અને ફરીથી પ્રયાસ કરો."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">ઉપયોગકર્તા નામ દ્વારા શોધો</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">સંપર્કો પર ઍક્સેસની મંજૂરી આપો</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Signal પર તમે જાણતા હોય તેવા લોકોને શોધવા માટે:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">ઍક્સેસ આપો</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">ના આભાર</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">તમારા સંપર્કો પર ઍક્સેસની મંજૂરી આપો. તમારા સંપર્કો એન્ક્રિપ્ટેડ છે અને Signal સેવાને જોઈ શકતા નથી.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal ને તમારા સંપર્કોને પ્રદર્શિત કરવા માટે તેમને એક્સેસની જરૂર છે.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly ને તમારા સંપર્કોને પ્રદર્શિત કરવા માટે તેમને એક્સેસની જરૂર છે.</string>
     <string name="contact_selection_list_fragment__show_contacts">સંપર્કો બતાવો</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">તમે આ વ્યક્તિને દૂર કરી છે, તેમને ફરીથી મેસેજ કરવાથી તેઓ તમારી સૂચિમાં પાછા ઉમેરાઈ જશે.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">વિકલ્પો</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">અપડેટ</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">ચાલુ કરો … અટકાવો</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">બબલ્સ એક Android સુવિધા છે જેને તમે Signal ચેટમાં બંધ કરી શકો છો.</string>
+    <string name="BubbleOptOutTooltip__description">બબલ્સ એક Android સુવિધા છે જેને તમે Molly ચેટમાં બંધ કરી શકો છો.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">અત્યારે નહીં</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3030,7 +3157,7 @@
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
     <string name="EditProfileFragment_deprecated_dialog_title">સિગ્નલ ને અપડેટ કરો</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Signalનું આ વર્ઝન સમાપ્ત થઈ ગયું છે. Signalનો ઉપયોગ ચાલુ રાખવા માટે હમણાં જ અપડેટ કરો.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Mollyનું આ વર્ઝન સમાપ્ત થઈ ગયું છે. Mollyનો ઉપયોગ ચાલુ રાખવા માટે હમણાં જ અપડેટ કરો.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">અપડેટ</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">ધીમું</string>
     <string name="preferences__help">મદદ</string>
     <string name="preferences__advanced">વધુ</string>
-    <string name="preferences__donate_to_signal">Signal માટે ફાળો આપો</string>
+    <string name="preferences__donate_to_signal">Molly માટે ફાળો આપો</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">ગોપનીયતા</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">ઍપ આઇકન અને નામને બદલીને \"%1$s\" કરો</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">ઍપ આઇકન અને નામ બદલવા માટે Signalને બંધ કરવાની જરૂર પડશે. નોટિફિકેશન હંમેશા ડિફોલ્ટ Signal આઇકન અને નામ પ્રદર્શિત કરશે.</string>
+    <string name="preferences__app_icon_dialog_description">ઍપ આઇકન અને નામ બદલવા માટે Mollyને બંધ કરવાની જરૂર પડશે. નોટિફિકેશન હંમેશા ડિફોલ્ટ Molly આઇકન અને નામ પ્રદર્શિત કરશે.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">એવું ઍપ આઇકન અને નામ પસંદ કરો, જે તમારા ફોનની હોમ સ્ક્રીન અને ઍપ ડ્રોઅર પર દેખાશે. નોટિફિકેશન હંમેશા ડિફોલ્ટ Signal આઇકન અને નામ પ્રદર્શિત કરશે. વધુ જાણો</string>
+    <string name="preferences__app_icon_warning_learn_more">એવું ઍપ આઇકન અને નામ પસંદ કરો, જે તમારા ફોનની હોમ સ્ક્રીન અને ઍપ ડ્રોઅર પર દેખાશે. નોટિફિકેશન હંમેશા ડિફોલ્ટ Molly આઇકન અને નામ પ્રદર્શિત કરશે. વધુ જાણો</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">ઍપ આઇકન અને નામ હોમ સ્ક્રીન અને ઍપ ડ્રોઅર પર દેખાય છે.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">નોટિફિકેશન હંમેશા ડિફોલ્ટ Signal આઇકન અને નામ પ્રદર્શિત કરશે.</string>
+    <string name="preferences__app_icon_notification_warning">નોટિફિકેશન હંમેશા ડિફોલ્ટ Molly આઇકન અને નામ પ્રદર્શિત કરશે.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">વધુ જાણો</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">આ તમામ ચેટને %1$s સૌથી તાજેતરના મેસેજ માટે કાયમી રીતે ટ્રિમ કરશે.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">આનાથી તમારા ડિવાઇસમાંથી તમામ મેસેજ હિસ્ટ્રી અને મીડિયા કાયમ માટે ડિલીટ થઈ જશે.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">આમ કરવાથી આ ડિવાઇસ અને કોઈ પણ લિંક કરેલા ડિવાઇસમાંથી તમામ મેસેજ હિસ્ટ્રી અને મીડિયા કાયમ માટે ડિલીટ થઈ જશે.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">તમે ખરેખર આ બધી મેસેજ હિસ્ટ્રી ડિલીટ કરવા માંગો છો?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">તમામ મેસેજ હિસ્ટ્રી કાયમ માટે દૂર કરવામાં આવશે. આ ક્રિયાને પૂર્વવત્ કરી શકાશે નહીં.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">બધી મેસેજ હિસ્ટ્રી આ ડિવાઇસ પરથી કાયમ માટે ડિલીટ કરવામાં આવશે. આ ક્રિયાને પૂર્વવત કરી શકાશે નહીં.</string>
     <string name="preferences_storage__delete_all_now">બધુ હમણાં ડિલીટ કરો</string>
     <string name="preferences_storage__forever">હમેશા</string>
     <string name="preferences_storage__one_year">1 વર્ષ</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">સેન્સરશીપ પ્રયુક્તિ</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">સેન્સરશીપ પ્રયુક્તિ</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">જો સક્ષમ હોય, તો Signal સેન્સરશીપને અવળું કરવાનો પ્રયાસ કરશે. જ્યાં સુધી તમે Signal સેન્સર કરેલ નથી ત્યાં સુધી આ સુવિધાને સક્ષમ કરશો નહીં.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">જો સક્ષમ હોય, તો Molly સેન્સરશીપને અવળું કરવાનો પ્રયાસ કરશે. જ્યાં સુધી તમે Molly સેન્સર કરેલ નથી ત્યાં સુધી આ સુવિધાને સક્ષમ કરશો નહીં.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">તમારા એકાઉન્ટના ફોન નંબરના આધારે સેન્સરશીપ પ્રયુક્તિ સક્રિય કરવામાં આવી છે.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">પ્રસ્તુત છે ચુકવણીઓ</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">MobileCoin મોકલવા અને પ્રાપ્ત કરવા માટે Signalનો ઉપયોગ કરો, જે એક નવી ગોપનીયતા કેન્દ્રિત ડિજિટલ ચલણ છે. શરૂ કરવા માટે સક્રિય કરો.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">MobileCoin મોકલવા અને પ્રાપ્ત કરવા માટે Mollyનો ઉપયોગ કરો, જે એક નવી ગોપનીયતા કેન્દ્રિત ડિજિટલ ચલણ છે. શરૂ કરવા માટે સક્રિય કરો.</string>
     <string name="PaymentsHomeFragment__activate_payments">પેમેન્ટ સક્રિય કરો</string>
     <string name="PaymentsHomeFragment__activating_payments">પેમેન્ટ સક્રિય કરી રહ્યું છે…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">પેમેન્ટ એકાઉન્ટને રિસ્ટોર કરો</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">તમારા પ્રદેશમાં ચુકવણીઓ ઉપલબ્ધ નથી.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">પેમેન્ટ સક્ષમ કરી શક્યા નથી. પછી ફરી પ્રયાસ કરો.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">પેમેન્ટને નિષ્ક્રિય કરવું છે?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">જો તમે પેમેન્ટ્સ નિષ્ક્રિય કરો છો તો તમે Signal માં Mobilecoin મોકલી શકશો નહીં અથવા પ્રાપ્ત કરી શકશો નહીં.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">જો તમે પેમેન્ટ્સ નિષ્ક્રિય કરો છો તો તમે Molly માં Mobilecoin મોકલી શકશો નહીં અથવા પ્રાપ્ત કરી શકશો નહીં.</string>
     <string name="PaymentsHomeFragment__deactivate">નિષ્ક્રિય કરો</string>
     <string name="PaymentsHomeFragment__continue">ચાલુ રાખો</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">હાલમાં બેલેન્સ ઉપલબ્ધ નથી</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">વિગતો</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">તમે હવે MobileCoin મોકલવા અને મેળવવા માટે Signalનો ઉપયોગ કરી શકો છો. તમામ ચુકવણીઓ MobileCoins અને MobileCoin Walletની ઉપયોગની શરતોને આધીન છે. તમને થોડી સમસ્યાઓ આવી શકે છે અને તમે ગુમાવી શકો તેવી ચુકવણીઓ કે બેલેન્સ પાછું ન પણ આવી શકે. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">તમે હવે MobileCoin મોકલવા અને મેળવવા માટે Mollyનો ઉપયોગ કરી શકો છો. તમામ ચુકવણીઓ MobileCoins અને MobileCoin Walletની ઉપયોગની શરતોને આધીન છે. તમને થોડી સમસ્યાઓ આવી શકે છે અને તમે ગુમાવી શકો તેવી ચુકવણીઓ કે બેલેન્સ પાછું ન પણ આવી શકે. </string>
     <string name="PaymentsHomeFragment__activate">સક્રિય કરો</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoin ના નિયમો જુઓ</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Signal માં પેમેન્ટ હવે ઉપલબ્ધ નથી. તમે હજી પણ એક્સચેન્જમાં ફંડ સ્થાનાંતરિત કરી શકો છો પરંતુ તમે હવે પેમેન્ટ મોકલી શકતા નથી અને મેળવી શકતા નથી અથવા ફંડ ઉમેરી શકતા નથી.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Molly માં પેમેન્ટ હવે ઉપલબ્ધ નથી. તમે હજી પણ એક્સચેન્જમાં ફંડ સ્થાનાંતરિત કરી શકો છો પરંતુ તમે હવે પેમેન્ટ મોકલી શકતા નથી અને મેળવી શકતા નથી અથવા ફંડ ઉમેરી શકતા નથી.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">પરવાનગીઓને મંજૂરી આપો</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">તમે જાણતા હોય તેવા લોકોને મેસેજ મોકલવામાં તમારી સહાય કરવા માટે, Signal આ પરવાનગીઓની વિનંતી કરશે. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">તમે જાણતા હોય તેવા લોકોને મેસેજ મોકલવામાં તમારી સહાય કરવા માટે, Molly આ પરવાનગીઓની વિનંતી કરશે. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">નોટિફિકેશન</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">આગળ</string>
     <string name="PaymentsTransferFragment__invalid_address">અમાન્ય સરનામું</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">તમે જે વૉલેટ એડ્રેસ પર ટ્રાન્સફર કરવાનો પ્રયાસ કરી રહ્યા છો તે ચકાસો અને ફરીથી પ્રયાસ કરો.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">તમે તમારા પોતાના Signal વૉલેટ એડ્રેસ પર ટ્રાન્સફર કરી શકતા નથી. સપોર્ટેડ એક્સચેન્જ પર તમારા ખાતામાંથી વૉલેટ એડ્રેસ દાખલ કરો.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR કોડ સ્કેન કરવા માટે Signal ને તમારા માઇક્રોફોન અને કૅમેરાના ઍક્સેસની જરૂર છે.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QR કોડ કેપચર કરવા માટે Signal ને કૅમેરાની પરવાનગીની જરૂર હોય છે. સેટિંગ્સમાં જાઓ, \"પરવાનગી\" પસંદ કરો અને \" કૅમેરા \" સક્ષમ કરો.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR કોડ સ્કેન કરવા માટે Signal ને તમારા માઇક્રોફોન અને કૅમેરાના ઍક્સેસની જરૂર છે.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">તમે તમારા પોતાના Molly વૉલેટ એડ્રેસ પર ટ્રાન્સફર કરી શકતા નથી. સપોર્ટેડ એક્સચેન્જ પર તમારા ખાતામાંથી વૉલેટ એડ્રેસ દાખલ કરો.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR કોડ સ્કેન કરવા માટે Molly ને તમારા માઇક્રોફોન અને કૅમેરાના ઍક્સેસની જરૂર છે.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QR કોડ કેપચર કરવા માટે Molly ને કૅમેરાની પરવાનગીની જરૂર હોય છે. સેટિંગ્સમાં જાઓ, \"પરવાનગી\" પસંદ કરો અને \" કૅમેરા \" સક્ષમ કરો.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR કોડ સ્કેન કરવા માટે Molly ને તમારા માઇક્રોફોન અને કૅમેરાના ઍક્સેસની જરૂર છે.</string>
     <string name="PaymentsTransferFragment__settings">સેટિંગ્સ</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">ઇનકમિંગ Signal વૉઇસ કૉલ</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">ઇનકમિંગ Molly વૉઇસ કૉલ</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">ઇનકમિંગ Signal વીડિયો કૉલ</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">ઇનકમિંગ Molly વીડિયો કૉલ</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Signal ગ્રુપ કૉલ આવી રહ્યો છે</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Molly ગ્રુપ કૉલ આવી રહ્યો છે</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">ચાલુ Signal વૉઇસ કૉલ</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">ચાલુ Molly વૉઇસ કૉલ</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">ચાલુ Signal વીડિયો કૉલ</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">ચાલુ Molly વીડિયો કૉલ</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">ચાલુ Signal ગ્રૂપ કૉલ</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">ચાલુ Molly ગ્રૂપ કૉલ</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">લોડ કરી રહ્યું છે</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">ચકાસો</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">તમે સફળતાપૂર્વક તમારો બૅકઅપ પાસફ્રેઝ દાખલ કર્યો</string>
     <string name="BackupDialog_passphrase_was_not_correct">પાસફ્રેઝ સાચો ન હતો</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signal બૅકઅપ બની રહ્યું છે…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Molly બૅકઅપ બની રહ્યું છે…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Signal બૅકઅપ ચકાસી રહ્યા છીએ…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Molly બૅકઅપ ચકાસી રહ્યા છીએ…</string>
     <string name="LocalBackupJobApi29_backup_failed">બૅકઅપ નિષ્ફળ</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">તમારી બૅકઅપ ડિરેક્ટરી ડિલીટ કરવામાં આવી છે અથવા ખસેડવામાં આવી છે.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">આ વોલ્યુમ પર સ્ટોર કરવા માટે તમારી બૅકઅપ ફાઇલ ખૂબ મોટી છે.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">મને કૉલ કરો (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">કોડ ફરીથી મોકલો (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Signal સપોર્ટનો સંપર્ક કરો</string>
-    <string name="RegistrationActivity_code_support_subject">Signal રજીસ્ટ્રેશન - Android માટે ચકાસણી કોડ</string>
+    <string name="RegistrationActivity_contact_signal_support">Molly સપોર્ટનો સંપર્ક કરો</string>
+    <string name="RegistrationActivity_code_support_subject">Molly રજીસ્ટ્રેશન - Android માટે ચકાસણી કોડ</string>
     <string name="RegistrationActivity_incorrect_code">ખોટો કોડ</string>
     <string name="BackupUtil_never">ક્યારેય નહિ</string>
     <string name="BackupUtil_unknown">અજાણ્યું</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">ફોન નંબર</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">તમારો ફોન નંબર કોણ જોઈ શકે અને Signal પર તેના વડે કોણ તમારો સંપર્ક કરી શકે તે પસંદ કરો.</string>
+    <string name="preferences_app_protection__choose_who_can_see">તમારો ફોન નંબર કોણ જોઈ શકે અને Molly પર તેના વડે કોણ તમારો સંપર્ક કરી શકે તે પસંદ કરો.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">મારો નંબર કોણ જોઈ શકે</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">તમે ઘણા પ્રયત્નો કર્યા છે. પછીથી ફરી પ્રયત્ન કરો.</string>
     <string name="RegistrationActivity_error_connecting_to_service">સેવાથી કનેક્ટ કરવામાં ભૂલ</string>
     <string name="preferences_chats__backups">બેકઅપ્સ</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal લૉક છે</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly લૉક છે</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">અનલૉક કરવા માટે ટેપ કરો</string>
     <string name="Recipient_unknown">અજાણ્યું</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">તમારે તમારા જૂના ડિવાઇસના ઍક્સેસની જરૂર છે.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">બેકઅપમાંથી રિસ્ટોર કરો</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">સ્થાનિક બેકઅપમાંથી તમારા મેસેજ રિસ્ટોર કરો. જો તમે હમણાં રિસ્ટોર કરશો નહીં, તો તમે પછીથી રિસ્ટોર કરી શકશો નહીં.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">લોકલ બેકઅપ રિસ્ટોર કરો</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signal બેકઅપ રિસ્ટોર કરો</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">તમારા બધા ટેક્સ્ટ મેસેજ + તમારા છેલ્લા 30 દિવસના મીડિયાને રિસ્ટોર કરો</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">વધુ વિકલ્પો</string>
 
+    <string name="TransferOrRestoreFragment__cancel">રદ કરો</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">ટ્રાન્સફર કર્યા વગર લૉગ ઇન કરો</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">તમારા મેસેજ અને મીડિયાને ટ્રાન્સફર કર્યા વિના ચાલુ રાખો</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">તમારા જૂના Android ફોન પર Signal ખોલો</string>
     <string name="NewDeviceTransferInstructions__continue">ચાલુ રાખો</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">જૂના Android ડિવાઇસ સાથે જોડાવાની તૈયારી કરી રહ્યાં છીએ…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">થોડીક જ વારમાં, જલ્દી તૈયાર થવું જોઈએ</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">જૂના Android ડિવાઇસને કનેક્ટ કરવાની રાહ જોઇ રહ્યા છીએ…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">તમારા જૂના Android ડિવાઇસને શોધવા અને કનેક્ટ કરવા માટે Signalને સ્થાન પરવાનગીની જરૂર છે.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">તમારા જૂના એન્ડ્રોઇડ ડિવાઇસને શોધવા અને કનેક્ટ કરવા માટે Signalને સ્થાન સેવાઓ સક્ષમ કરવાની જરૂર છે.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">તમારા જૂના Android ડિવાઇસને શોધવા અને કનેક્ટ કરવા માટે Signal ને વાઇ-ફાઇની જરૂર છે. વાઇ-ફાઇ ચાલુ હોવું જરૂરી છે પરંતુ તેને વાઇ-ફાઇ નેટવર્ક સાથે કનેક્ટ કરવાની જરૂર નથી.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">માફ કરશો, એવું લાગે છે કે આ ઉપકરણ વાઇ-ફાઇ ડાયરેક્ટને સપોર્ટ કરતું નથી. Signal તમારા જૂના Android ઉપકરણને શોધવા અને કનેક્ટ કરવા માટે વાઇ-ફાઇ ડાયરેક્ટનો ઉપયોગ કરે છે. તમે તમારા જૂના Android ઉપકરણથી તમારા એકાઉન્ટને રિસ્ટોર કરવા માટે હજુ પણ બેકઅપ રિસ્ટોર કરી શકો છો.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">તમારા જૂના Android ડિવાઇસને શોધવા અને કનેક્ટ કરવા માટે Mollyને સ્થાન પરવાનગીની જરૂર છે.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">તમારા જૂના એન્ડ્રોઇડ ડિવાઇસને શોધવા અને કનેક્ટ કરવા માટે Mollyને સ્થાન સેવાઓ સક્ષમ કરવાની જરૂર છે.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">તમારા જૂના Android ડિવાઇસને શોધવા અને કનેક્ટ કરવા માટે Molly ને વાઇ-ફાઇની જરૂર છે. વાઇ-ફાઇ ચાલુ હોવું જરૂરી છે પરંતુ તેને વાઇ-ફાઇ નેટવર્ક સાથે કનેક્ટ કરવાની જરૂર નથી.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">માફ કરશો, એવું લાગે છે કે આ ઉપકરણ વાઇ-ફાઇ ડાયરેક્ટને સપોર્ટ કરતું નથી. Molly તમારા જૂના Android ઉપકરણને શોધવા અને કનેક્ટ કરવા માટે વાઇ-ફાઇ ડાયરેક્ટનો ઉપયોગ કરે છે. તમે તમારા જૂના Android ઉપકરણથી તમારા એકાઉન્ટને રિસ્ટોર કરવા માટે હજુ પણ બેકઅપ રિસ્ટોર કરી શકો છો.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">બૅકઅપ રિસ્ટોર કરો</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">તમારા જૂના Android ડિવાઇસ સાથે કનેક્ટ કરવાનો પ્રયાસ કરતી વખતે એક અનપેક્ષિત ભૂલ આવી.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">નવા Android ડિવાઇસ માટે શોધ કરી રહ્યા છીએ…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">તમારા નવા Android ડિવાઇસને શોધવા અને કનેક્ટ કરવા માટે Signal ને સ્થાન પરવાનગીની જરૂર છે.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">તમારા નવા Android ડિવાઇસને શોધવા અને કનેક્ટ કરવા માટે Signal ને સ્થાન સેવાઓ સક્ષમ કરવાની જરૂર છે.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">તમારા નવા Android ડિવાઇસને શોધવા અને કનેક્ટ કરવા માટે Signal ને વાઇ-ફાઇની જરૂર છે. વાઇ-ફાઇ ચાલુ હોવું જરૂરી છે પરંતુ તેને વાઇ-ફાઇ નેટવર્ક સાથે કનેક્ટ કરવાની જરૂર નથી.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">માફ કરશો, એવું લાગે છે કે આ ઉપકરણ વાઇ-ફાઇ ડાયરેક્ટને સપોર્ટ કરતું નથી. Signal તમારા નવા Android ઉપકરણને શોધવા અને તેની સાથે જોડાવા માટે Wi-Fi ડાયરેક્ટનો ઉપયોગ કરે છે. તમે તમારા નવા Android ઉપકરણ પર તમારા એકાઉન્ટને રિસ્ટોર કરવા માટે હજુ પણ બૅકઅપ બનાવી શકો છો.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">તમારા નવા Android ડિવાઇસને શોધવા અને કનેક્ટ કરવા માટે Molly ને સ્થાન પરવાનગીની જરૂર છે.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">તમારા નવા Android ડિવાઇસને શોધવા અને કનેક્ટ કરવા માટે Molly ને સ્થાન સેવાઓ સક્ષમ કરવાની જરૂર છે.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">તમારા નવા Android ડિવાઇસને શોધવા અને કનેક્ટ કરવા માટે Molly ને વાઇ-ફાઇની જરૂર છે. વાઇ-ફાઇ ચાલુ હોવું જરૂરી છે પરંતુ તેને વાઇ-ફાઇ નેટવર્ક સાથે કનેક્ટ કરવાની જરૂર નથી.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">માફ કરશો, એવું લાગે છે કે આ ઉપકરણ વાઇ-ફાઇ ડાયરેક્ટને સપોર્ટ કરતું નથી. Molly તમારા નવા Android ઉપકરણને શોધવા અને તેની સાથે જોડાવા માટે Wi-Fi ડાયરેક્ટનો ઉપયોગ કરે છે. તમે તમારા નવા Android ઉપકરણ પર તમારા એકાઉન્ટને રિસ્ટોર કરવા માટે હજુ પણ બૅકઅપ બનાવી શકો છો.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">બૅકઅપ બનાવો</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">તમારા નવા Android ડિવાઇસ સાથે કનેક્ટ કરવાનો પ્રયાસ કરતી વખતે એક અનપેક્ષિત ભૂલ આવી.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">ડેટા ટ્રાન્સફર કરી રહ્યા છીએ</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">બંને ડિવાઇસને એકબીજાની નજીક રાખો. ડિવાઇસ બંધ ન કરો અને Signal ચાલુ કરો. ટ્રાન્સફર એન્ડ-ટુ-એન્ડ એન્ક્રિપ્ટેડ છે.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">બંને ડિવાઇસને એકબીજાની નજીક રાખો. ડિવાઇસ બંધ ન કરો અને Molly ચાલુ કરો. ટ્રાન્સફર એન્ડ-ટુ-એન્ડ એન્ક્રિપ્ટેડ છે.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d અત્યાર સુધીના મેસેજ…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% મેસેજ અત્યાર સુધી…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">ટ્રાન્સફર એકાઉન્ટ</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">તમારા નવા Android ડિવાઇસ પર Signal ડાઉનલોડ કરો</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">તમારા નવા Android ડિવાઇસ પર Molly ડાઉનલોડ કરો</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"\"એકાઉન્ટ ટ્રાન્સફર કરો અથવા રિસ્ટોર કરો\" પર ટેપ કરો"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">આ લિંક ધરાવનાર કોઈપણ ગ્રુપનું નામ અને ફોટો જોઈ શકે છે અને જોડાવા માટે વિનંતી કરી શકે છે. તમે વિશ્વાસ કરો છો તે લોકો સાથે તેને શેર કરો.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">આ લિંક ધરાવનાર કોઈપણ ગ્રુપનું નામ અને ફોટો જોઈ શકે છે અને ગ્રુપમાં જોડાઈ શકે છે. તમે વિશ્વાસ કરો છો તે લોકો સાથે તેને શેર કરો.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Signal દ્વારા શેર કરો</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Molly દ્વારા શેર કરો</string>
     <string name="GroupLinkBottomSheet_copy">કૉપિ</string>
     <string name="GroupLinkBottomSheet_qr_code">QR કોડ</string>
     <string name="GroupLinkBottomSheet_share">શેર કરો</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">MobileCoin વિશે</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin એ એક નવું ગોપનીયતા કેન્દ્રિત ડિજિટલ ચલણ છે.</string>
     <string name="payment_info_card_adding_funds">ફંડ ઉમેરી રહ્યા છીએ</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">તમે તમારા વૉલેટ સરનામાં પર MobileCoin મોકલીને Signal માં ઉપયોગ માટે ફંડ ઉમેરી શકો છો.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">તમે તમારા વૉલેટ સરનામાં પર MobileCoin મોકલીને Molly માં ઉપયોગ માટે ફંડ ઉમેરી શકો છો.</string>
     <string name="payment_info_card_cashing_out">કેશ આઉટ કરી રહ્યા છીએ</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">તમે MobileCoin ને સપોર્ટ કરતી એક્સચેન્જ પર ગમે ત્યારે MobileCoin ને કેશ આઉટ કરી શકો છો. ફક્ત તે એક્સચેન્જ પર તમારા એકાઉન્ટમાં ટ્રાન્સફર કરો.</string>
     <string name="payment_info_card_hide_this_card">આ કાર્ડ છુપાવું છે?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">વોલેટને નિષ્ક્રિય કરો</string>
     <string name="DeactivateWalletFragment__your_balance">તમારું બેલેન્સ</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">એવી ભલામણ કરવામાં આવે છે કે તમે પેમેન્ટને નિષ્ક્રિય કરતા પહેલા તમારા ફંડને બીજા વૉલેટ એડ્રેસ પર ટ્રાન્સફર કરો. જો તમે અત્યારે તમારા ફંડને ટ્રાન્સફર ન કરવાનું પસંદ કરો છો, તો જો તમે પેમેન્ટને ફરીથી સક્રિય કરો તો તે તમારા Signal સાથે જોડાયેલા વૉલેટમાં રહેશે.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">એવી ભલામણ કરવામાં આવે છે કે તમે પેમેન્ટને નિષ્ક્રિય કરતા પહેલા તમારા ફંડને બીજા વૉલેટ એડ્રેસ પર ટ્રાન્સફર કરો. જો તમે અત્યારે તમારા ફંડને ટ્રાન્સફર ન કરવાનું પસંદ કરો છો, તો જો તમે પેમેન્ટને ફરીથી સક્રિય કરો તો તે તમારા Molly સાથે જોડાયેલા વૉલેટમાં રહેશે.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">બાકીનું બેલેન્સ સ્થાનાંતરિત કરો</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">સ્થાનાંતરિત કર્યા વિના નિષ્ક્રિય કરો</string>
     <string name="DeactivateWalletFragment__deactivate">નિષ્ક્રિય કરો</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">સ્થાનાંતરિત કર્યા વિના નિષ્ક્રિય કરવું છે?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">જો તમે પેમેન્ટને ફરીથી સક્રિય કરવાનું પસંદ કરો છો તો તમારું બેલેન્સ તમારા Signal સાથે જોડાયેલા વૉલેટમાં રહેશે.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">જો તમે પેમેન્ટને ફરીથી સક્રિય કરવાનું પસંદ કરો છો તો તમારું બેલેન્સ તમારા Molly સાથે જોડાયેલા વૉલેટમાં રહેશે.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">વોલેટ નિષ્ક્રિય કરવામાં ભૂલ.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">લાઇસન્સ</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">શરતો &amp; ગોપનીયતા નીતિ</string>
-    <string name="HelpFragment__copyright_signal_messenger">કોપીરાઇટ Signal મેસેન્જર</string>
+    <string name="HelpFragment__copyright_signal_messenger">કોપીરાઇટ Molly મેસેન્જર</string>
     <string name="HelpFragment__licenced_under_the_agplv3">GNU AGPLv3 હેઠળ લાઇસન્સ પ્રાપ્ત</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4773,7 +4911,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">આપમેળે</string>
+    <string name="ChatColorSelectionFragment__auto">ઓટો</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">કસ્ટમ કલર્સનો ઉપયોગ કરો</string>
     <string name="ChatColorSelectionFragment__chat_color">ચેટ કલર</string>
     <string name="ChatColorSelectionFragment__edit">ફેરફાર કરો</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">કલર પસંદ કરો</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">શેર કરો</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">આ ગ્રુપને ફક્ત એડમિન જ મેસેજ મોકલી શકે છે.</string>
-    <string name="MultiselectForwardFragment__limit_reached">મર્યાદા સુધી પહોંચી ગયા</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">તમે 5 કરતાં વધુ ચેટ પસંદ કરી શકતા નથી</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5214,7 +5350,7 @@
     <!-- Title of dialog telling user they need to update signal as it expired -->
     <string name="UpdateSignalExpiredDialog__title">સિગ્નલ ને અપડેટ કરો</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Signalનું આ વર્ઝન સમાપ્ત થઈ ગયું છે. Signalનો ઉપયોગ ચાલુ રાખવા માટે હમણાં જ અપડેટ કરો.</string>
+    <string name="UpdateSignalExpiredDialog__message">Mollyનું આ વર્ઝન સમાપ્ત થઈ ગયું છે. Mollyનો ઉપયોગ ચાલુ રાખવા માટે હમણાં જ અપડેટ કરો.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">અપડેટ</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">ડિવાઇસ રજીસ્ટર થયેલું નથી</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">આ ડિવાઇસ રજીસ્ટર થયેલું નથી. આ ડિવાઇસ પર Signalનો ઉપયોગ ચાલુ રાખવા માટે ફરીથી રજીસ્ટર કરો.</string>
+    <string name="ReregisterSignalDialog__message">આ ડિવાઇસ રજીસ્ટર થયેલું નથી. આ ડિવાઇસ પર Mollyનો ઉપયોગ ચાલુ રાખવા માટે ફરીથી રજીસ્ટર કરો.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">ફરીથી રજીસ્ટર</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">પીકર ખોલવામાં નિષ્ફળ.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">નોટિફિકેશનને સક્ષમ કરવા માટે, Signalને તેમને પ્રદર્શિત કરવાની પરવાનગીની જરૂર છે.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">નોટિફિકેશનને સક્ષમ કરવા માટે, Mollyને તેમને પ્રદર્શિત કરવાની પરવાનગીની જરૂર છે.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">ચાલુ કરો</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">હજી કોઈ જવાબો નથી</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">તમે આ સ્ટોરીનો જવાબ આપી શકતા નથી કારણ કે તમે હવે આ ગ્રુપના સભ્ય નથી.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">સ્ટોરી પર પ્રતિક્રિયા આપી</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">સ્ટોરી પર પ્રતિક્રિયા આપી</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">સ્ટોરી પર પ્રતિક્રિયા આપી</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">દ્રશ્યો</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">તમારી બેંક પસંદ કરો</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">%1$s સાથે તમારા દાનની પુષ્ટિ કરો</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">તમારા પુનરાવર્તિત દાનનું સેટ અપ કરવા માટે, તમારી બેંક સાથે €0,01 ચાર્જની ખાતરી કરવા, ચાલુ રાખો પર ટેપ કરો. આ આપમેળે રિફંડ કરવામાં આવશે અને તમારા અકાઉન્ટમાંથી તમારા €5/મહિનાના દાનને ડેબિટ કરવાની મંજૂરી આપે છે.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">તમારું પુનરાવર્તિત દાન સેટ કરવા માટે, તમારી બેંક સાથે €0,01 ચાર્જની ખાતરી કરવા, ચાલુ રાખો પર ટેપ કરો. આ આપમેળે રિફંડ કરવામાં આવશે અને તમારા એકાઉન્ટમાંથી તમારા %1$s/મહિનાનું દાન ડેબિટ કરવાની મંજૂરી આપે છે.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">ચાલુ રાખો</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">બેકઅપ ડેટા ડાઉનલોડ કરી રહ્યાં છીએ…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">મીડિયા બેકઅપ બંધ છે</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">તમારો Signal મીડિયા બેકઅપ પ્લાન રદ કરવામાં આવ્યો છે કારણ કે અમે તમારી ચુકવણી પર પ્રક્રિયા કરી શક્યા નથી. તમારા બેકઅપમાં સ્ટોર થયેલા કોઈ પણ મીડિયા ડાઉનલોડ કરવા માટે તમારી પાસે %1$d દિવસ છે. %1$d દિવસ પછી, તમારા બેકઅપમાંના મીડિયાને ડિલીટ કરવામાં આવશે.</item>
+        <item quantity="other">તમારો Signal મીડિયા બેકઅપ પ્લાન રદ કરવામાં આવ્યો છે કારણ કે અમે તમારી ચુકવણી પર પ્રક્રિયા કરી શક્યા નથી. તમારા બેકઅપમાં સ્ટોર થયેલા કોઈ પણ મીડિયા ડાઉનલોડ કરવા માટે તમારી પાસે %1$d દિવસ છે. %1$d દિવસ પછી, તમારા બેકઅપમાંના મીડિયાને ડિલીટ કરવામાં આવશે.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">તમે તમારા તમામ મીડિયાનું બેકઅપ લેવાનું ચાલુ રાખવા માટે કોઈ પણ સમયે ફરીથી બેકઅપ માટે ચુકવણી કરવાનું શરૂ કરી શકો છો. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">તમારા મીડિયા આજે ડિલીટ કરવામાં આવશે</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">તમારો Signal મીડિયા બેકઅપ પ્લાન રદ કરવામાં આવ્યો છે કારણ કે અમે તમારી ચુકવણી પર પ્રક્રિયા કરી શક્યા નથી. તમારા બેકઅપમાં મીડિયાને ડિલીટ કરવામાં આવે તે પહેલાં તેને ડાઉનલોડ કરવાની આ તમારી છેલ્લી તક છે.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">ડાઉનલોડ પૂર્ણ કરી શકાયું નથી</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">તમારા ડિવાઇસમાં પૂરતી ખાલી જગ્યા નથી. તમારા બેકઅપમાં સ્ટોર કરેલા મીડિયાને ડાઉનલોડ કરવા માટે %1$s જેટલી જગ્યા ખાલી કરો.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">જો તમે \"છોડો\" પસંદ કરો છો, તો તમારા બેકઅપમાંના મીડિયા %1$d દિવસમાં ડિલીટ કરવામાં આવશે.</item>
+        <item quantity="other">જો તમે \"છોડો\" પસંદ કરો છો, તો તમારા બેકઅપમાંના મીડિયા %1$d દિવસમાં ડિલીટ કરવામાં આવશે.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">બેકઅપ ચુકવણીની પ્રક્રિયા કરી શકતા નથી</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">અમને તમારી પુનરાવર્તિત માસિક બેકઅપ ચુકવણી એકત્રિત કરવામાં મુશ્કેલી આવી રહી છે. ખાતરી કરો કે તમારી ચુકવણી પદ્ધતિ અદ્યતન છે. જો તે અપડેટ થયેલા ન હોય, તો તેને Google Payમાં અપડેટ કરો. Signal થોડા દિવસોમાં ફરીથી ચુકવણીની પ્રક્રિયા કરવાનો પ્રયાસ કરશે.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">બેકઅપ પૂર્ણ કરી શકાયું નથી</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">તમારા ડિવાઇસે %1$d દિવસથી બેકઅપ પૂર્ણ કર્યું નથી. ખાતરી કરો કે તમારું ડિવાઇસ વાઇ-ફાઇ સાથે જોડાયેલ છે અને \"હમણાં બેક અપ લો\" પર ટેપ કરો. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">વધુ જાણો</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">અવગણો</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">હમણાં જ મીડિયા ડાઉનલોડ કરો</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">પછી ડાઉનલોડ કરો</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">મીડિયા ડાઉનલોડ કરશો નહીં</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">તમારા મીડિયાને ડાઉનલોડ કરવા માટે %1$s જગ્યા ખાલી કરો.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">ક્રેડિટ અથવા ડેબિટ કાર્ડ</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">અજાણ્યું</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">પેમેન્ટ હિસ્ટ્રી</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">તમારું છેલ્લું બેકઅપ %1$sના રોજ %2$s વાગ્યે લેવામાં આવ્યું હતું.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">પસંદ કરેલા સમય કરતાં જૂના મેસેજ કાયમ માટે ડિલીટ કરવામાં આવશે.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">પસંદ કરેલ લંબાઈથી વધુના મેસેજ કાયમ માટે ડિલીટ કરવામાં આવશે.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">લિંક કરેલા ડિવાઇસ પર મર્યાદા લાગુ કરવું</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">જ્યારે ચાલુ કરેલ હોય, ત્યારે ચેટ મર્યાદા તમારા લિંક કરેલા ડિવાઇસમાંથી પણ મેસેજ ડિલીટ કરશે.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">ડિલીટ કરવાનું હવે તમારા બધા ડિવાઇસ પર સિંક કરવામાં આવ્યું છે</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">જ્યારે તમે મેસેજ અથવા ચેટને ડિલીટ કરો છો, ત્યારે તે તમારા ફોન અને લિંક કરેલા ડિવાઇસમાંથી ડિલીટ કરવામાં આવશે.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">ઓકે</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">પેમેન્ટ હિસ્ટ્રી</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">ટેક્સ્ટ અને બધા મીડિયાનું બેકઅપ</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">પેમેન્ટની વિગતો</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">બેકઅપનો પ્રકાર</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">ચુકવણીની તારીખ</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">શેર કરો</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal બેકઅપ</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">પેમેન્ટ હિસ્ટ્રી</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">બેકઅપની વિગતો</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">બેકઅપની સાઇઝ</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">બેકઅપનું આવર્તન</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">સેલ્યુલર ડેટાનો ઉપયોગ કરીને બેકઅપ લો</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">બેકઅપ બંધ કરો અને ડિલીટ કરો</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">બેકઅપ ડિલીટ કર્યું અને બંધ કર્યું.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">બેકઅપ પ્રકાર બદલાયો અને સબ્સ્ક્રિપ્શન રદ કર્યું</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">સબ્સ્ક્રિપ્શન રદ કર્યું</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">ડાઉનલોડ પૂર્ણ</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">બેકઅપનો પ્રકાર</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">બેકઅપ અક્ષમ છે</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/મહિને</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">બૅકઅપ સક્ષમ કરીએ</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">છેલ્લું બેકઅપ</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s %2$s વાગ્યે</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">ક્યારેય નહિ</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">હમણાં બૅકઅપ</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">બેકઅપ બંધ કરી અને ડિલીટ કરીએ?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">તમારી પાસેથી ફરીથી ચાર્જ લેવામાં આવશે નહીં. તમારું બેકઅપ ડિલીટ કરવામાં આવશે અને કોઈ નવા બેકઅપ બનાવવામાં આવશે નહીં.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">બંધ કરો અને ડિલીટ કરો</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">બેકઅપ ડિલીટ કરી રહ્યાં છીએ…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">બેકઅપ ડિલીટ કર્યું</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"હમણાં બેકઅપ લો પર ટેપ કરવાથી"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">દૈનિક</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">સાપ્તાહિક</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">માસિક</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">મેન્યુઅલી બેકઅપ</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">કૃપા કરીને તમારો ડિવાઇસ પિન, પાસવર્ડ અથવા પેટર્ન દાખલ કરો.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">આગળ</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">બેકઅપનો પ્રકાર બદલો</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">સબ્સ્ક્રિપ્શન રદ કરો</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">રદ કરવાનું કન્ફર્મ કરો</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">તમારી પાસેથી ફરીથી ચાર્જ લેવામાં આવશે નહીં. તમારા બિલિંગ સાયકલના અંતે બેકઅપ્સ બંધ કરવામાં આવશે. તે તારીખ પછી તમે હાલમાં બેકઅપ લઈ રહ્યાં છો તે મીડિયાને ડાઉનલોડ કરવા માટે તમારી પાસે 30 દિવસ હશે.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">કન્ફર્મ કરો અને અત્યારે ડાઉનલોડ કરો</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">કન્ફર્મ કરો અને પછીથી ડાઉનલોડ કરો</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">સબ્સ્ક્રિપ્શન ચાલુ રાખો</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 861e2fa32d..7f6ee5da14 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal का अद्यतन हो रहा है…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly का अद्यतन हो रहा है…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">आपने अभी तक पासफ़्रेज सेट नहीं किया है!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">पासफ़्रेज़ अक्षम करें?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">यह Signal और मेसेज नोटिफिकेशन को स्थायी रूप से अनलॉक करेगा</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">यह Molly और मेसेज नोटिफिकेशन को स्थायी रूप से अनलॉक करेगा</string>
     <string name="ApplicationPreferencesActivity_disable">अक्षम</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">सर्वर से कनेक्ट करने में त्रुटि!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">पंजीकरण लॉक के लिए पिन की आवश्यकता होती है। पिन को अक्षम करने के लिए, कृपया पहले पंजीकरण लॉक को अक्षम करें।</string>
@@ -80,25 +81,25 @@
     <string name="AttachmentKeyboard_file">फ़ाइल</string>
     <string name="AttachmentKeyboard_contact">संपर्क</string>
     <string name="AttachmentKeyboard_location">स्थान</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal को आपके फ़ोटो और वीडियो दिखाने के लिय अनुमति चाहिए।</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly को आपके फ़ोटो और वीडियो दिखाने के लिय अनुमति चाहिए।</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">अनुमति दें</string>
     <string name="AttachmentKeyboard_payment">भुगतान</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">मीडिया का चयन करने के लिए कोई ऐप नहीं मिल सकता है</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">फ़ोटो, वीडियो या ऑडियो संलग्न करने के लिए Signal को संग्रहण अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स मेनू पर जारी रखें, \"अनुमतियां\" चुनें, और \"संग्रहण\" सक्षम करें।</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">संपर्क जानकारी संलग्न करने के लिए Signal को संपर्क अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स मेनू पर जारी रखें, \"अनुमतियां\" चुनें, और \"संपर्क\" सक्षम करें।</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">किसी स्थान को संलग्न करने के लिए Signal को स्थान अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स मेनू पर जारी रखें, \"अनुमतियां\" चुनें, और \"स्थान\" सक्षम करें।</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">फ़ोटो, वीडियो या ऑडियो संलग्न करने के लिए Molly को संग्रहण अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स मेनू पर जारी रखें, \"अनुमतियां\" चुनें, और \"संग्रहण\" सक्षम करें।</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">संपर्क जानकारी संलग्न करने के लिए Molly को संपर्क अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स मेनू पर जारी रखें, \"अनुमतियां\" चुनें, और \"संपर्क\" सक्षम करें।</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">किसी स्थान को संलग्न करने के लिए Molly को स्थान अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स मेनू पर जारी रखें, \"अनुमतियां\" चुनें, और \"स्थान\" सक्षम करें।</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">अपने स्थान तक पहुंच की अनुमति दें</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">अपना स्थान भेजने के लिए:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">अपना स्थान भेजने के लिए Signal एक्सेस की अनुमति दें।</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">अपना स्थान भेजने के लिए Molly एक्सेस की अनुमति दें।</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal को अपना स्थान भेजने के लिए लोकेशन एक्सेस की आवश्यकता होती है।</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly को अपना स्थान भेजने के लिए लोकेशन एक्सेस की आवश्यकता होती है।</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">स्टोरेज को एक्सेस करने की अनुमति दें</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">कैमरा बदलें</string>
     <string name="CameraXFragment_open_gallery_description">गैलरी खोलें</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">अनुमति दें</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">कैमरा और माइक्रोफोन इस्तेमाल करने की अनुमति दें</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">कैमरा के एक्सेस की अनुमति दें</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">माइक्रोफोन इस्तेमाल करने की अनुमति दें</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">फ़ोटो कैप्चर करने के लिए, Signal को कैमरे एक्सेस की अनुमति दें।</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">फोटो और वीडियो कैप्चर करने के लिए, कैमरे को Signal पहुंच की अनुमति दें।</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">फ़ोटो और वीडियो कैप्चर करने के लिए, Signal को कैमरे और माइक्रोफोन एक्सेस की अनुमति दें।</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">आवाज़ के साथ वीडियो कैप्चर करने के लिए, Signal को कैमरे और माइक्रोफोन एक्सेस की अनुमति दें।</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">QR कोड को स्कैन करने के लिए Signal को कैमरा एक्सेस की अनुमति दें।</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal को फ़ोटोज़ लेने के लिए आपके कैमरा एक्सेस की ज़रुरत है</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">QR कोड को स्कैन करने के लिए Signal को कैमरा एक्सेस की ज़रुरत हैं</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">वीडियो कैप्चर करने के लिए Signal को माइक्रोफोन एक्सेस की ज़रुरत हैं</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Signal में फोटो कैप्चर करने के लिए:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Signal में फ़ोटोज़ और वीडियोस कैप्चर करने के लिए:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">आवाज़ के साथ वीडियोस कैप्चर करने के लिए:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR कोड्स स्कैन करने के लिए:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">हाल ही के संपर्क</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">कोई Signal प्राप्तकर्ता नहीं</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">कैमरा बटन का प्रयोग कर आप केवल Signal के सम्पर्कों को ही छवियाँ भेज सकते हैं। </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">जिसे ढूँढ रहे वो नहीं मिला?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">संपर्क को Signal में जुड़ने के लिए आमंत्रित करें</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">संपर्क को Molly में जुड़ने के लिए आमंत्रित करें</string>
     <string name="CameraContacts__menu_search">सर्च</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">नहीं धन्यवाद</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Signal अपडेट करें</string>
+    <string name="ClientDeprecatedActivity_update_signal">Molly अपडेट करें</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">ऍप का यह संस्करण अब समर्थित नहीं है। संदेश भेजना और प्राप्त करना जारी रखने के लिए, नवीनतम संस्करण में अपडेट करें।</string>
     <string name="ClientDeprecatedActivity_update">अपडेट</string>
     <string name="ClientDeprecatedActivity_dont_update">अपडेट न करें</string>
     <string name="ClientDeprecatedActivity_warning">चेतावनी</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Signal के आपके वर्ज़न की समय सीमा समाप्त हो गई है। आप अपना मेसेज इतिहास देख सकते हैं लेकिन जब तक आप अपडेट नहीं करते तब तक आप मेसेज भेज या प्राप्त नहीं कर पाएंगे।</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Molly के आपके वर्ज़न की समय सीमा समाप्त हो गई है। आप अपना मेसेज इतिहास देख सकते हैं लेकिन जब तक आप अपडेट नहीं करते तब तक आप मेसेज भेज या प्राप्त नहीं कर पाएंगे।</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">कोई वेब ब्राउजर नहीं मिला।</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">%1$s को मेसेज</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly वॉयस कॉल %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly वीडियो कॉल %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal मेसेज</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">संदेश भेजें</string>
-    <string name="ConversationActivity_lets_switch_to_signal">%1$s चलो Signal पर स्विच करें</string>
+    <string name="ConversationActivity_lets_switch_to_signal">%1$s चलो Molly पर स्विच करें</string>
     <string name="ConversationActivity_specify_recipient">कृपया एक संपर्क चुनें</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">आपके द्वारा भेजे जा रहे मेसेज के प्रकार के लिए अनुलग्नक आकार सीमा से अधिक है।</string>
     <string name="ConversationActivity_unable_to_record_audio">ऑडियो रिकॉर्ड करने में असमर्थ</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">ऑडियो संदेश भेजने के लिए:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">वॉयस संदेश भेजने के लिए, अपने माइक्रोफ़ोन पर Signal पहुंच की अनुमति दें।</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">वॉयस संदेश भेजने के लिए, अपने माइक्रोफ़ोन पर Molly पहुंच की अनुमति दें।</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">वॉयस संदेश रिकॉर्ड करने के लिए Signal को माइक्रोफ़ोन एक्सेस की आवश्यकता होती है।</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">ऑडियो मेसेज को भेजने के लिए Signal को माइक्रोफ़ोन अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स जारी रखें, \"अनुमतियां\" चुनें, और \"माइक्रोफ़ोन\" सक्षम करें।</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">वॉयस संदेश रिकॉर्ड करने के लिए Molly को माइक्रोफ़ोन एक्सेस की आवश्यकता होती है।</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">ऑडियो मेसेज को भेजने के लिए Molly को माइक्रोफ़ोन अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स जारी रखें, \"अनुमतियां\" चुनें, और \"माइक्रोफ़ोन\" सक्षम करें।</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s को कॉल करने के लिए Signal को माइक्रोफ़ोन और कैमरा अनुमतियों की आवश्यकता होती है, लेकिन उन्हें स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स जारी रखें, \"अनुमतियां\" चुनें, और \"माइक्रोफ़ोन\" और \"कैमरा\" सक्षम करें।</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">फोटो और वीडियो कैप्चर करने के लिए, कैमरे को Signal पहुंच की अनुमति दें।</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal को फ़ोटो या वीडियो लेने के लिए कैमरा अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स जारी रखें, \"अनुमतियां\" चुनें, और \"कैमरा\" सक्षम करें।</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal को फ़ोटो या वीडियो लेने के लिए कैमरा अनुमतियां चाहिए</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s को कॉल करने के लिए Molly को माइक्रोफ़ोन और कैमरा अनुमतियों की आवश्यकता होती है, लेकिन उन्हें स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स जारी रखें, \"अनुमतियां\" चुनें, और \"माइक्रोफ़ोन\" और \"कैमरा\" सक्षम करें।</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">फोटो और वीडियो कैप्चर करने के लिए, कैमरे को Molly पहुंच की अनुमति दें।</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly को फ़ोटो या वीडियो लेने के लिए कैमरा अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स जारी रखें, \"अनुमतियां\" चुनें, और \"कैमरा\" सक्षम करें।</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly को फ़ोटो या वीडियो लेने के लिए कैमरा अनुमतियां चाहिए</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">ध्वनि के साथ वीडियो कैप्चर करने के लिए माइक्रोफोन अनुमति सक्षम करें।</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal को वीडियो रिकॉर्ड करने के लिए माइक्रोफोन की अनुमति की आवश्यकता होती है, लेकिन उसे अस्वीकार कर दिया गया है। कृपया एप्प विन्यास जारी रखें, \"अनुमतियां\" चुनें, और \"माइक्रोफोन\" और \"कैमरा\" सक्षम करें।</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal को वीडियो रिकॉर्ड करने के लिए माइक्रोफोन की अनुमति की आवश्यकता होती है।</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly को वीडियो रिकॉर्ड करने के लिए माइक्रोफोन की अनुमति की आवश्यकता होती है, लेकिन उसे अस्वीकार कर दिया गया है। कृपया एप्प विन्यास जारी रखें, \"अनुमतियां\" चुनें, और \"माइक्रोफोन\" और \"कैमरा\" सक्षम करें।</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly को वीडियो रिकॉर्ड करने के लिए माइक्रोफोन की अनुमति की आवश्यकता होती है।</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
     <string name="ConversationActivity_no">नहीं</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">कॉल शुरू करने के लिए:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">कॉल शुरू करने के लिए, Signal को अपने माइक्रोफ़ोन तक पहुंचने दें।</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">कॉल शुरू करने के लिए, Molly को अपने माइक्रोफ़ोन तक पहुंचने दें।</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">कॉल शुरू करने के लिए Signal को माइक्रोफ़ोन एक्सेस की आवश्यकता होती है।</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">कॉल शुरू करने के लिए Molly को माइक्रोफ़ोन एक्सेस की आवश्यकता होती है।</string>
 
 
     <string name="ConversationActivity_join">जुड़ें</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">SMS संदेश सेवा अब Signal में समर्थित नहीं है। %1$s को Signal पर आमंत्रित करें और बातचीत यहीं पर रखें।</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">यह व्यक्ति अब Signal का उपयोग नहीं कर रहा है। बातचीत को यहीं रखने के लिए उन्हें Signal पर आमंत्रित करें।</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">यह व्यक्ति अब Molly का उपयोग नहीं कर रहा है। बातचीत को यहीं रखने के लिए उन्हें Molly पर आमंत्रित करें।</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Signal का उपयोग करने के लिए आमंत्रित करें</string>
+    <string name="ConversationActivity__invite_to_signal">Molly का उपयोग करने के लिए आमंत्रित करें</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">आपको जल्द ही फिर से याद दिलाया जाएगा।</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">सब के लिये डिलीट करें</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">इस डिवाइस से डिलीट करें</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">डिलीट करें</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">हर कहीं से डिलीट करें</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">यह संदेश चैट में शामिल सभी के लिए डिलीट कर दिया जाएगा यदि वे Signal के नवीनमत वर्ज़न पर हैं। वे देख सकेंगे कि आपने एक संदेश को डिलीट कर दिया है।</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">ब्लॉक किया गया</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Signal अपडेट करें</string>
+    <string name="ConversationFragment__update_build">Molly अपडेट करें</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Signal को फिर से पंजीकृत करें</string>
+    <string name="ConversationFragment__reregister_signal">Molly को फिर से पंजीकृत करें</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">वापस नेविगेट करें।</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signal खोलें</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Molly खोलें</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">अब सत्यापित नहीं है</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">ऐसा करने पर चयनित चैट को स्थायी रूप से हटा दिया जाएगा।</item>
         <item quantity="other">ऐसा करने से सभी %1$d चयनित चैट स्थायी रूप से हट जाएंगी।</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">यह आपकी सभी डिवाइस से चयनित चैट को स्थायी रूप से डिलीट कर देगा।</item>
+        <item quantity="other">यह आपकी सभी डिवाइस से सभी %1$d चयनित चैट को स्थायी रूप से डिलीट कर देगा।</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">हटाया जा रहा है</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">चयनित चैट डिलीट हो रही है…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">मुझे नंबर द्वारा कौन ढूँढ़ सकता है?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">जिस किसी के पास आपका फोन नंबर है, वो आपको Signal पर देख सकेगा और आपसे चैट शुरू कर सकता है।</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">जिस किसी के पास आपका फोन नंबर है, वो आपको Molly पर देख सकेगा और आपसे चैट शुरू कर सकता है।</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">कोई भी यह नहीं देख पाएगा कि आप Signal पर हैं, जब तक कि आप उन्हें संदेश न भेजें या उनके साथ चैट न करें।</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">कोई भी यह नहीं देख पाएगा कि आप Molly पर हैं, जब तक कि आप उन्हें संदेश न भेजें या उनके साथ चैट न करें।</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">बैकअप से बहाल करना?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">अपने बैकअप पासफ्रेज की जाँच करें और इसके मेल खाने की पुष्टि करें</string>
     <string name="BackupsPreferenceFragment__turn_on">शुरु करें</string>
     <string name="BackupsPreferenceFragment__turn_off">बंद करें</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"किसी बैकअप को बहाल करने के लिए, Signal की एक नई कॉपी इंस्टॉल करें। ऐप को खोलें और \"बैकअप को बहाल करें\" पर टैप करें, और फिर बैकअप फाइल को ढूँढें। %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"किसी बैकअप को बहाल करने के लिए, Molly की एक नई कॉपी इंस्टॉल करें। ऐप को खोलें और \"बैकअप को बहाल करें\" पर टैप करें, और फिर बैकअप फाइल को ढूँढें। %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">अधिक जानें</string>
     <string name="BackupsPreferenceFragment__in_progress">प्रगति में</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d अब तक</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">अब तक %1$s%%…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">बैकअप बनाने के लिए Signal को बाहरी संग्रहण अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स को जारी रखें, \"अनुमतियां\" चुनें और \"संग्रहण\" सक्षम करें।</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">बैकअप बनाने के लिए Molly को बाहरी संग्रहण अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स को जारी रखें, \"अनुमतियां\" चुनें और \"संग्रहण\" सक्षम करें।</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">बैकअप समय निर्धारित करें</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">चैट सेशन रीफ्रेश हुआ</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal एंड-टू-एंड एन्क्रिप्शन का उपयोग करता है और इसे कभी-कभी आपके चैट सेशन को रीफ्रेश करने की ज़रूरत हो सकती है। इससे आपकी चैट की सुरक्षा प्रभावित नहीं होती, पर हो सकता है कि इस संपर्क से कोई संदेश छूट गया हो, और आप उन्हें इसे दोबारा भेजने के लिए कह सकते हैं।</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly एंड-टू-एंड एन्क्रिप्शन का उपयोग करता है और इसे कभी-कभी आपके चैट सेशन को रीफ्रेश करने की ज़रूरत हो सकती है। इससे आपकी चैट की सुरक्षा प्रभावित नहीं होती, पर हो सकता है कि इस संपर्क से कोई संदेश छूट गया हो, और आप उन्हें इसे दोबारा भेजने के लिए कह सकते हैं।</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">डेस्कटॉप या iPad पर Signal का उपयोग करें। आपके संदेश आपके लिंक किए गए डिवाइस से सिंक हो जाएंगे।</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">नया डिवाइस लिंक करें</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s संदेश और चैट जानकारी सभी डिवाइस पर शुरू से अंत तक एन्क्रिप्शन द्वारा सुरक्षित हैं</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">डेस्कटॉप या आईपैड पर Signal</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">लिंक किए गए डिवाइस पर सभी संदेश निजी हैं</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">आपके मोबाइल फोन के लिंक होने के बाद Molly संदेशों को Molly के साथ सिंक्रनाइज़ किया जाता है। आपका पिछला संदेश इतिहास दिखाई नहीं देगा।</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">अपने अन्य डिवाइस पर, Molly इंस्टॉल करने के लिए %1$s पर जाएं</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">मेरे लिंक किए गए डिवाइस</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">अनलिंक</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s अनलिंक किया गया</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">डिवाइस लिंक किया जा रहा है…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">डिवाइस मंजूर</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">लोड हो रहा है</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">कोई लिंक किए गए डिवाइस नहीं</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">किसी डिवाइस को लिंक करने के लिए अनलॉक करें</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">लिंक करने के लिए डिवाइस पर प्रदर्शित QR कोड स्कैन करें।</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">QR कोड स्कैन करें</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">जिस डिवाइस को आप लिंक करना चाहते हैं उस पर प्रदर्शित QR कोड को स्कैन करने के लिए इस डिवाइस का उपयोग करें</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">ठीक है</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">यह डिवाइस आपके ग्रुप और संपर्क देख पाएगा, आपके चैट को ऐक्सेस कर पाएगा, और आपके नाम से मेसेज भेज पायेगा।</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">अपने दूसरे डिवाइस पर लिंक करना समाप्त करें</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Molly को अपने अन्य डिवाइस पर लिंक करना समाप्त करें।</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">डिवाइस लिंक करना असफल रहा</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">यह QR कोड सही नहीं है। कृपया जांच लें कि आप उसी डिवाइस का QR कोड स्कैन कर रहे हैं जिसे आपको लिंक करना है।</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">दोबारा कोशिश करें</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">%1$sको अनलिंक?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">लापता प्ले सेवाओं के लिए अनुकूलित करें</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">यह डिवाइस Play सेवाओं का समर्थन नहीं करता है। सिस्टम बैटरी ऑप्टिमाइज़ेशन को अक्षम करने के लिए टैप करें, जो निष्क्रिय होने पर संदेशों को पुनर्प्राप्त करने से Signal को रोकता है।</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">यह डिवाइस Play सेवाओं का समर्थन नहीं करता है। सिस्टम बैटरी ऑप्टिमाइज़ेशन को अक्षम करने के लिए टैप करें, जो निष्क्रिय होने पर संदेशों को पुनर्प्राप्त करने से Molly को रोकता है।</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Signal का यह वर्ज़न एक्सपायर हो गया है। मेसेज भेजने और प्राप्त करने के लिए अभी अपडेट करें।</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Molly का यह वर्ज़न एक्सपायर हो गया है। मेसेज भेजने और प्राप्त करने के लिए अभी अपडेट करें।</string>
     <string name="ExpiredBuildReminder_update_now">अभी अपडेट करें</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">देखना</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">स्थायी Signal संचार विफलता</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal Google Play सेवाओं के साथ पंजीकरण करने में असमर्थ था। Signal मेसेज और कॉल अक्षम कर दिए गए हैं, कृपया सेटिंग्स &gt; उन्नत में पुनः पंजीकरण करने का प्रयास करें।</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">स्थायी Molly संचार विफलता</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly Google Play सेवाओं के साथ पंजीकरण करने में असमर्थ था। Molly मेसेज और कॉल अक्षम कर दिए गए हैं, कृपया सेटिंग्स &gt; उन्नत में पुनः पंजीकरण करने का प्रयास करें।</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">डीबग लॉग समस्या का निदान करने और उसे ठीक करने में हमारी मदद करते हैं, और इसमें पहचान संबंधी जानकारी नहीं होती है।</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal में कोई समस्या आई है। डीबग लॉग जमा करें?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly में कोई समस्या आई है। डीबग लॉग जमा करें?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">बैटरी अनुकूलन के कारण नोटिफ़िकेशन में देरी हो सकती है</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">यह सुनिश्चित करने के लिए कि संदेश नोटिफ़िकेशन में देरी न हो, आप Signal के लिए बैटरी अनुकूलन को अक्षम कर सकते हैं।</string>
+    <string name="PromptBatterySaverBottomSheet__message">यह सुनिश्चित करने के लिए कि संदेश नोटिफ़िकेशन में देरी न हो, आप Molly के लिए बैटरी अनुकूलन को अक्षम कर सकते हैं।</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">बैटरी अनुकूलन के कारण नोटिफ़िकेशन में देरी हो सकती है</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">यह सुनिश्चित करने के लिए कि संदेश नोटिफ़िकेशन में देरी न हो, आप Molly के लिए बैटरी अनुकूलन को अक्षम कर सकते हैं। डिवाइस-विशिष्ट निर्देश देखने के लिए “जारी रखें” पर टैप करें।</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">नहीं धन्यवाद</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">जारी रखें</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">जारी रखें</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">हटाएँ</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">नहीं धन्यवाद</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">लंंबित ग्रुप आमंत्रण</string>
+    <string name="PendingMembersActivity_pending_group_invites">अनुरोध और आमंत्रण</string>
     <string name="PendingMembersActivity_requests">अनुरोध</string>
     <string name="PendingMembersActivity_invites">आमंत्रण</string>
     <string name="PendingMembersActivity_people_you_invited">आपके द्वारा आमंत्रित लोग</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">रद्द करें</string>
     <string name="InviteActivity_sending">भेजा जा रहा है…</string>
     <string name="InviteActivity_invitations_sent">आमंत्रण भेजा गया</string>
-    <string name="InviteActivity_invite_to_signal">Signal को आमंत्रित करें</string>
+    <string name="InviteActivity_invite_to_signal">Molly को आमंत्रित करें</string>
     <string name="InviteActivity_send_sms">(%1$d) SMS भेजें</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">%1$d एसएमएस आमंत्रण भेजें?</item>
         <item quantity="other">%1$d SMS आमंत्रण भेजें?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">चलो Signal पर स्विच करें: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">चलो Molly पर स्विच करें: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">ऐसा लगता है कि आपके पास साझा करने के लिए कोई ऐप नहीं है।</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">आपका मेसेज</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">पृष्ठभूमि कनेक्शन सक्षम</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">जवाब</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal कॉल की स्थापना की जा रही है</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly कॉल की स्थापना की जा रही है</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signal कॉल सेवा शुरू की जा रही है</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal कॉल सेवा बंद की जा रही है</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Molly कॉल सेवा शुरू की जा रही है</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly कॉल सेवा बंद की जा रही है</string>
     <string name="NotificationBarManager__cancel_call">कॉल रद्द करें</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">आपने भुगतान सक्रीय किए</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s अब भुगतान स्वीकार कर सकते हैं</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">भुगतान विवरण उपलब्ध नहीं हैं</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">आगे देखने के लिये टैप करें</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">भुगतान विवरण उपलब्ध नहीं है</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">इस भुगतान का विवरण उपलब्ध नहीं है, क्योंकि आपके संदेश ऐसे स्रोत से रीस्टोर किए गए थे जिसमें इस भुगतान का इतिहास नहीं था। इससे आपके वॉलेट बैलेंस या पिछले भुगतानों की स्थिति प्रभावित नहीं होती है।</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">जल्द ही आप Signal से SMS संदेश नहीं भेज पाएंगे। %1$s को Signal पर आमंत्रित करें और बातचीत यहीं पर रखें।</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">अब आप Signal में SMS संदेश नहीं भेज सकते। %1$s को Signal पर आमंत्रित करें और बातचीत यहीं पर रखें।</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">अब आप Molly में SMS संदेश नहीं भेज सकते। %1$s को Molly पर आमंत्रित करें और बातचीत यहीं पर रखें।</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">भुगतान : %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">भुगतान</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">स्पैम के रूप में रिपोर्ट किया गया</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Signal डिवाइस को लिंक करें?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">ऐसा लगता है कि आप किसी 3 पक्ष स्कैनर का उपयोग करके Signal डिवाइस को लिंक करने का प्रयास कर रहे हैं। अपनी सुरक्षा के लिए, कृपया Signal के भीतर से कोड फिर से स्कैन करें।</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">एक क्यूआर कोड स्कैन करने के लिए Signal को कैमरा अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स जारी रखें, \"अनुमतियां\" चुनें, और \"कैमरा\" सक्षम करें।</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">एक क्यूआर कोड स्कैन करने के लिए Molly को कैमरा अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स जारी रखें, \"अनुमतियां\" चुनें, और \"कैमरा\" सक्षम करें।</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">कैमरा अनुमति के बिना एक क्यूआर कोड स्कैन करने में असमर्थ</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">पासफ्रेज दर्ज करें</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal आइकन</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly आइकन</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">पासफ्रेज जमा करें</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">अमान्य पासफ्रेज</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signal खोलो</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - लॉक स्क्रीन</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Molly खोलो</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - लॉक स्क्रीन</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">नक्शा</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">संदेश भेजना जारी रखने के लिए सत्यापित करें</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Signal पर स्पैम रोकने में मदद करने के लिए, कृपया सत्यापन पूर्ण करें।</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Molly पर स्पैम रोकने में मदद करने के लिए, कृपया सत्यापन पूर्ण करें।</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">सत्यापित करने के बाद, आप संदेश भेजना जारी रख सकते हैं। कोई भी रोके गए संदेश स्वचालित रूप से भेजे जाएंगे।</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">मेरी स्टोरी</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal कॉल</string>
+    <string name="Recipient_signal_call">Molly कॉल</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">ब्लॉक करें</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">बज रहा है</string>
     <string name="RedPhone_busy">व्यस्त</string>
     <string name="RedPhone_recipient_unavailable">प्राप्तकर्ता अनुपलब्ध</string>
-    <string name="RedPhone_network_failed">नेटवर्क असफल रहा</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">नेटवर्क असफल रहा कृपया नेटवर्क जाँचें और फिर से प्रयास करें।</string>
     <string name="RedPhone_number_not_registered">नंबर पंजीकृत नहीं है</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">आपके द्वारा डायल किया गया नंबर सुरक्षित आवाज का समर्थन नहीं करता है!</string>
     <string name="RedPhone_got_it">समझ गया</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">वीडियो शुरु करने के लिये यहाँ टैप करें</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s को कॉल करने के लिए, Signal को आपके कैमरा तक पहुँच करने की ज़रूरत है</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s को कॉल करने के लिए, Molly को आपके कैमरा तक पहुँच करने की ज़रूरत है</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">कॉल की जा रही है…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">फिर से जोङ रहे हैं…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">कॉल से हटाया गया</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">किसी ने आपको कॉल से हटा दिया।</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">कैमरा और माइक्रोफोन इस्तेमाल करने की अनुमति दें</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">माइक्रोफोन इस्तेमाल करने की अनुमति दें</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">कैमरा के एक्सेस की अनुमति दें</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">कॉल शुरू करने या उससे जुड़ने के लिए, Molly को अपने कैमरे और माइक्रोफोन तक पहुंच प्रदान करें।</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">कॉल शुरू करने या उससे जुड़ने के लिए, Molly को अपने माइक्रोफ़ोन तक पहुंच प्रदान करें।</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">अपना वीडियो सक्षम करने के लिए, Molly को अपने कैमरे तक पहुंच प्रदान करें।</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">कॉल शुरू करने या उससे जुड़ने के लिए Molly को माइक्रोफोन अनुमतियों की ज़रूरत होती है।</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">आपके वीडियो को सक्षम करने के लिए Molly को कैमरे तक पहुंच चाहिए</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">कॉल शुरू करने या उससे जुड़ने के लिए:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">अपना वीडियो सक्षम करने के लिए:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal ऑडियो</string>
-    <string name="WebRtcCallView__signal_video_call">Signal वीडियो कॉल</string>
+    <string name="WebRtcCallView__signal_call">Molly ऑडियो</string>
+    <string name="WebRtcCallView__signal_video_call">Molly वीडियो कॉल</string>
     <string name="WebRtcCallView__start_call">कॉल शुरू करें</string>
     <string name="WebRtcCallView__join_call">कॉल से जुड़ें</string>
     <string name="WebRtcCallView__call_is_full">कॉल पूर्ण है</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">अपना हाथ नीचे करें?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">हाथ नीचे करें</string>
+    <string name="CallOverflowPopupWindow__lower_hand">नीचे करें</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">रद्द करें</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">आपने अपना हाथ उठाया है</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">देखना</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s ने हाथ उठाया है</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s ने हाथ उठाया</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d ने हाथ उठाया</item>
+        <item quantity="other">%1$s + %2$d ने हाथ उठाया है</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s ने हाथ उठाया</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d ने हाथ उठाया</item>
         <item quantity="other">%1$s + %2$d ने हाथ उठाया है</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">इस नंबर को वेरिफाई करने के लिए आपको एक कॉल आएगी।</string>
     <string name="RegistrationActivity_edit_number">नंबर संपादित करें</string>
     <string name="RegistrationActivity_missing_google_play_services">लापता Google Play Services</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">इस डिवाइस में Google Play सेवाएं अनुपलब्ध हैं। आप अभी भी Signal का उपयोग कर सकते हैं, लेकिन इस कॉन्फ़िगरेशन के परिणामस्वरूप कम विश्वसनीयता या प्रदर्शन हो सकता है। \n\n अगर आप एक उन्नत उपयोगकर्ता नहीं हैं, बाद वाले Android ROM नहीं चला रहे हैं, या मानते हैं कि आप इसे गलती से देख रहे हैं, तो कृपया support@signal.org पर निवारण कीजिए</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">इस डिवाइस में Google Play सेवाएं अनुपलब्ध हैं। आप अभी भी Molly का उपयोग कर सकते हैं, लेकिन इस कॉन्फ़िगरेशन के परिणामस्वरूप कम विश्वसनीयता या प्रदर्शन हो सकता है। \n\n अगर आप एक उन्नत उपयोगकर्ता नहीं हैं, बाद वाले Android ROM नहीं चला रहे हैं, या मानते हैं कि आप इसे गलती से देख रहे हैं, तो कृपया support@molly.im पर निवारण कीजिए</string>
     <string name="RegistrationActivity_i_understand">मै समझता हुँ…</string>
     <string name="RegistrationActivity_play_services_error">Play Services त्रुटि</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play सेवाएं अपडेट हो रही है या अस्थायी रूप से अनुपलब्ध है। कृपया पुन: प्रयास करें।</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">नॉन-स्टैंडर्ड नंबर फ़ॉर्मैट</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">आपके ज़रिए दर्ज किया गया नंबर (%1$s) एक नॉन-स्टैंडर्ड फ़ॉर्मैट लगता है.\n\nक्या आपका मतलब %2$s था?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal एंड्रॉइड - फोन नंबर का फ़ॉर्मेट</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly एंड्रॉइड - फोन नंबर का फ़ॉर्मेट</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">कॉल की मांग की गई</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">पंजीकरण में परेशानी हो रही है?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• सुनिश्चित करें कि आपके फोन में आपका SMS या कॉल प्राप्त करने के लिए सेल्यूलर सिग्नल है\n • पुष्टि करें कि आप नंबर पर फोन कॉल प्राप्त कर सकते हैं\n • जांचें कि आपने अपना फोन नंबर सही दर्ज किया है।</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">अधिक जानकारी के लिए, कृपया इन समस्या निवारण चरणों का पालन करें या सपोर्ट से संपर्क करें</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">अधिक जानकारी के लिए, कृपया %1$s या %2$sका अनुसरण करें</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">ये समस्या निवारण चरण</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">संपर्क के खाते में जोड़ दे</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Signal का उपयोग करने के लिए आमंत्रित करें</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Molly का उपयोग करने के लिए आमंत्रित करें</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal मेसेज</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal कॉल</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">संपर्क के खाते में जोड़ दे</string>
-    <string name="SharedContactView_invite_to_signal">Signal को आमंत्रित करें</string>
+    <string name="SharedContactView_invite_to_signal">Molly को आमंत्रित करें</string>
     <string name="SharedContactView_message">Signal मेसेज</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s %2$s का है</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal अपडेट</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal का नया संस्करण उपलब्ध है। अपडेट करने के लिए टैप करें।</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal अपडेट करने में विफल रहे</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly अपडेट</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly का नया संस्करण उपलब्ध है। अपडेट करने के लिए टैप करें।</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly अपडेट करने में विफल रहे</string>
     <string name="ApkUpdateNotifications_failed_general_body">हम बाद में पुनः प्रयास करेंगे।</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal सफलतापूर्वक अपडेट किया गया</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly सफलतापूर्वक अपडेट किया गया</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">आपको अपने आप %1$s संस्करण पर अपडेट कर दिया गया है।</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">हमारा Signal सुरक्षा नंबर:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">ऐसा लगता है कि आपके पास साझा करने के लिए कोई ऐप नहीं है।</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">तुलना करने के लिए कोई सुरक्षा संख्या क्लिपबोर्ड में नहीं मिली थी</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">एक क्यूआर कोड स्कैन करने के लिए Signal को कैमरा अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स जारी रखें, \"अनुमतियां\" चुनें, और \"कैमरा\" सक्षम करें।</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">एक क्यूआर कोड स्कैन करने के लिए Molly को कैमरा अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स जारी रखें, \"अनुमतियां\" चुनें, और \"कैमरा\" सक्षम करें।</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">कैमरा अनुमति के बिना क्यूआर कोड स्कैन करने में असमर्थ</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">%1$s का सुरक्षा नंबर देखने के लिए आपको पहले मेसेजेस का आदान-प्रदान करना होगा।</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">खोलने के लिए स्पर्श करें</string>
-    <string name="KeyCachingService_passphrase_cached">Signal खुला है</string>
-    <string name="KeyCachingService_lock">Signal पर ताला लगाओ</string>
+    <string name="KeyCachingService_passphrase_cached">Molly खुला है</string>
+    <string name="KeyCachingService_lock">Molly पर ताला लगाओ</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">आप</string>
     <string name="MediaPreviewActivity_unssuported_media_type">असमर्थित मीडिया प्रकार</string>
     <string name="MediaPreviewActivity_draft">ड्राफ्ट</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">बाहरी स्टॉरेज में सेव करने के लिए Signal को स्टोरेज अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स जारी रखें, \"अनुमतियां\" चुनें, और \"स्टॉरेज\" सक्षम करें।</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">बाहरी स्टॉरेज में सेव करने के लिए Molly को स्टोरेज अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स जारी रखें, \"अनुमतियां\" चुनें, और \"स्टॉरेज\" सक्षम करें।</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">अनुमति के बिना बाहरी स्टॉरेज में सहेजने में असमर्थ</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">चयनित मेसेज डिलीट करें?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">यह इस मेसेज को स्थायी रूप से डिलीट कर देगा।</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">मेसेज देने में विफल रहा</string>
     <string name="MessageNotifier_error_delivering_message">मेसेज देने में त्रुटि</string>
     <string name="MessageNotifier_message_delivery_paused">संदेश प्रेषण रोका गया</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Signal पर संदेश भेजना जारी रखने के लिए सत्यापित करें</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Molly पर संदेश भेजना जारी रखने के लिए सत्यापित करें</string>
     <string name="MessageNotifier_mark_all_as_read">सभी को पढ़ा हुआ मार्क करें</string>
     <string name="MessageNotifier_mark_read">पढ़ा हुआ मार्क करें</string>
     <string name="MessageNotifier_turn_off_these_notifications">इन सूचनाओं को बंद करें</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">आपके स्टिकर पर %1$sको पुन: सक्रिय किया।</string>
     <string name="MessageNotifier_this_message_was_deleted">यह मेसेज डिलीट कर दिया गया है।</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">संपर्क से जुड़ी Signal की सूचनाओं को बंद करना है? आप उन्हें Signal &gt; सेटिंग्स &gt; सूचनाएँ में जाकर फिर से एनेबल कर सकते हैं।</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">संपर्क से जुड़ी Molly की सूचनाओं को बंद करना है? आप उन्हें Molly &gt; सेटिंग्स &gt; सूचनाएँ में जाकर फिर से एनेबल कर सकते हैं।</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signal लॉक होने पर त्वरित प्रतिक्रिया अनुपलब्ध है!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Molly लॉक होने पर त्वरित प्रतिक्रिया अनुपलब्ध है!</string>
     <string name="QuickResponseService_problem_sending_message">मेसेज भेजने में दिक्कत हुआ</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">अमान्य शॉर्टकट</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">नया Signal मेसेज</string>
     <string name="SingleRecipientNotificationBuilder_message_request">संदेश अनुरोध</string>
     <string name="SingleRecipientNotificationBuilder_you">आप</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">यह डिवाइस अब पंजीकृत नहीं है। ऐसा शायद इसलिए हो सकता है कि आपने अपना फोन नंबर किसी दूसरी डिवाइस पर Signal के साथ पंजीकृत किया है।</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">यह डिवाइस अब पंजीकृत नहीं है। ऐसा शायद इसलिए हो सकता है कि आपने अपना फोन नंबर किसी दूसरी डिवाइस पर Molly के साथ पंजीकृत किया है।</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">डिवाइस को पुन: पंजीकृत करें</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">कॉल का जवाब देने के लिए Signal को अपने माइक्रोफ़ोन का ऐक्सेस दें।</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">कॉल का जवाब देने के लिए Molly को अपने माइक्रोफ़ोन का ऐक्सेस दें।</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">वीडियो कॉल का उत्तर देने के लिए, Signal को अपने माइक्रोफ़ोन और कैमरे तक पहुंच प्रदान करें।</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">कॉल करने या प्राप्त करने के लिए Signal को माइक्रोफ़ोन और कैमरा अनुमतियों की आवश्यकता होती है, लेकिन उन्हें स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स जारी रखें, \"अनुमतियां\" चुनें, और \"माइक्रोफ़ोन\" और \"कैमरा\" सक्षम करें।</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">वीडियो कॉल का उत्तर देने के लिए, Molly को अपने माइक्रोफ़ोन और कैमरे तक पहुंच प्रदान करें।</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">कॉल करने या प्राप्त करने के लिए Molly को माइक्रोफ़ोन और कैमरा अनुमतियों की आवश्यकता होती है, लेकिन उन्हें स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स जारी रखें, \"अनुमतियां\" चुनें, और \"माइक्रोफ़ोन\" और \"कैमरा\" सक्षम करें।</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">एक लिंक किए हुए डिवाइस पर जवाब दिया गया।</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">एक लिंक किए हुए डिवाइस पर रद्द किया गया।</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">एक लिंक किए डिवाइस पर व्यस्त हैं।</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">नया पासफ्रेज दोहराएं</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Signal का उपयोग करने के लिए आमंत्रित करें</string>
+    <string name="contact_selection_activity__invite_to_signal">Molly का उपयोग करने के लिए आमंत्रित करें</string>
     <string name="contact_selection_activity__new_group">नया समूह</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">संपर्क रिफ्रेश करें</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">कोई लापता है? रिफ्रेश करने का प्रयास करें</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Signal पर उन लोगों को ढूंढें जिन्हें आप जानते हैं</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">कॉन्टैक्ट्स के एक्सेस की अनुमति दें</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">अधिक</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">संपर्क फोटो</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal को आपके संपर्कों को प्रदर्शित करने के लिए संपर्क अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स मेनू पर जारी रखें, \"अनुमतियां\" चुनें, और \"संपर्क\" सक्षम करें।</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly को आपके संपर्कों को प्रदर्शित करने के लिए संपर्क अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स मेनू पर जारी रखें, \"अनुमतियां\" चुनें, और \"संपर्क\" सक्षम करें।</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">संपर्क पुनर्प्राप्त करने में त्रुटि, अपना नेटवर्क कनेक्शन जांचें</string>
     <string name="ContactSelectionListFragment_username_not_found">यूज़रनेम नहीं मिला</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"%1$s एक Signal यूज़र नहीं है। कृपया यूज़रनेम जांचें और पुनः प्रयास करें।"</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">यूज़रनेम द्वारा खोजें</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">कॉन्टैक्ट्स के एक्सेस की अनुमति दें</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Signal पर उन लोगों को खोजने के लिए जिन्हें आप जानते हैं:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">अनुमति दें</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">नहीं धन्यवाद</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">कॉन्टैक्ट्स के एक्सेस की अनुमति दें। आपके संपर्क एनक्रिप्टेड हैं और Signal सेवा को दिखाई नहीं देते हैं।</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">आपके संपर्कों को प्रदर्शित करने के लिए Signal को आपके संपर्कों तक पहुंच की आवश्यकता है।</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">आपके संपर्कों को प्रदर्शित करने के लिए Molly को आपके संपर्कों तक पहुंच की आवश्यकता है।</string>
     <string name="contact_selection_list_fragment__show_contacts">संपर्क दिखाओ</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">आपने इस व्यक्ति को हटा दिया है, उन्हें दोबारा संदेश भेजने से वे आपकी सूची में वापस जुड़ जाएंगे।</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">विकल्प</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">अपडेट</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">चलाएं … रोकें</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">बबल्स, ऐंड्रॉयड का एक फ़ीचर हैं जिन्हें आप Signal की चैट्स के लिए बंद कर सकते हैं।</string>
+    <string name="BubbleOptOutTooltip__description">बबल्स, ऐंड्रॉयड का एक फ़ीचर हैं जिन्हें आप Molly की चैट्स के लिए बंद कर सकते हैं।</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">अभी नहीं</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">अच्छा विवरण</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Signal अपडेट करें</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Molly अपडेट करें</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Signal का यह संस्करण समाप्त हो गया है। Signal का इस्तेमाल जारी रखने के लिए अभी अपडेट करें।</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Molly का यह संस्करण समाप्त हो गया है। Molly का इस्तेमाल जारी रखने के लिए अभी अपडेट करें।</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">अपडेट</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">धीमा</string>
     <string name="preferences__help">मदद</string>
     <string name="preferences__advanced">अधिक</string>
-    <string name="preferences__donate_to_signal">Signal को दान करें</string>
+    <string name="preferences__donate_to_signal">Molly को दान करें</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">गोपनियता</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">ऐप आइकन और नाम को \"%1$s\" में बदलें</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">ऐप आइकन और नाम बदलने के लिए Signal को बंद करना होगा। नोटिफ़िकेशन हमेशा डिफ़ॉल्ट Signal आइकन और नाम प्रदर्शित करेंगी।</string>
+    <string name="preferences__app_icon_dialog_description">ऐप आइकन और नाम बदलने के लिए Molly को बंद करना होगा। नोटिफ़िकेशन हमेशा डिफ़ॉल्ट Molly आइकन और नाम प्रदर्शित करेंगी।</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">वह ऐप आइकन और नाम चुनें, जो आपके फोन की होम स्क्रीन और ऐप ड्रावर पर दिखाई देगा। नोटिफ़िकेशन हमेशा डिफ़ॉल्ट Signal आइकन और नाम प्रदर्शित करेंगी। अधिक जानें</string>
+    <string name="preferences__app_icon_warning_learn_more">वह ऐप आइकन और नाम चुनें, जो आपके फोन की होम स्क्रीन और ऐप ड्रावर पर दिखाई देगा। नोटिफ़िकेशन हमेशा डिफ़ॉल्ट Molly आइकन और नाम प्रदर्शित करेंगी। अधिक जानें</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">ऐप आइकन एवं नाम होम स्क्रीन और ऐप ड्रावर पर दिखाई देते हैं।</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">नोटिफ़िकेशन हमेशा डिफ़ॉल्ट Signal आइकन और नाम प्रदर्शित करेंगी।</string>
+    <string name="preferences__app_icon_notification_warning">नोटिफ़िकेशन हमेशा डिफ़ॉल्ट Molly आइकन और नाम प्रदर्शित करेंगी।</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">अधिक जानें</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">यह स्थाई रूप से सभी चैट को हाल ही के %1$s संदेश में ट्रिम कर देगा।</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">इससे आपके डिवाइस से सारा संदेश इतिहास और मीडिया स्थायी रूप से डिलीट कर दिया जाएगा।</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">ऐसा करने से इस डिवाइस और लिंक की गईं किसी भी डिवाइस से सभी संदेश इतिहास और मीडिया स्थायी रूप से डिलीट हो जाएंगे।</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">क्या आप वाकई में सारे संदेश इतिहास को डिलीट करना चाहते हैं?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">सारे संदेश इतिहास को स्थाई रूप से हटा दिया जाएगा। यह कार्रवाई होने के बाद वापस नहीं ली जा सकती।</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">सभी संदेश इतिहास सभी डिवाइस से स्थायी रूप से हटा दिए जाएंगे। इसे फिर से पहले जैसा नहीं किया जा सकेगा।</string>
     <string name="preferences_storage__delete_all_now">सभी कुछ अभी डिलीट करें</string>
     <string name="preferences_storage__forever">हमेशा के लिए</string>
     <string name="preferences_storage__one_year">1 वर्ष</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">सेंसरशिप उपाय</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">सेंसरशिप उपाय</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">यदि चालू किया गया तो Signal आपके लिए सेंसर-कार्य तोड़ने की कोशिश करेगा। यदि आप किसी सेन्सरशिप वाली जगह पर नहीं हैं तो इस फ़ीचर को चालू ना करें।</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">यदि चालू किया गया तो Molly आपके लिए सेंसर-कार्य तोड़ने की कोशिश करेगा। यदि आप किसी सेन्सरशिप वाली जगह पर नहीं हैं तो इस फ़ीचर को चालू ना करें।</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">आपके खाते के फोन नंबर के आधार पर सेंसरशिप से बचाव सक्षम कर दिया गया है।</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">भुगतान का परिचय</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">एक नई गोपनीयता केंद्रित डिजिटल मुद्रा, MobileCoin भेजने और प्राप्त करने के लिए Signal का उपयोग करें। शुरू करने के लिए सक्रीय करें।</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">एक नई गोपनीयता केंद्रित डिजिटल मुद्रा, MobileCoin भेजने और प्राप्त करने के लिए Molly का उपयोग करें। शुरू करने के लिए सक्रीय करें।</string>
     <string name="PaymentsHomeFragment__activate_payments">भुगतान सक्रिय करें</string>
     <string name="PaymentsHomeFragment__activating_payments">भुगतान सक्रिय हो रहा है…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">भुगतान खाता बहाल करें</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">आपके क्षेत्र में भुगतान उपलब्ध नहीं है।</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">भुगतान सक्रिय नहीं किए जा सके। बाद में प्रयास करें।</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">भुगतान निष्क्रिय करें?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">यदि आप भुगतान निष्क्रिय करते हैं तो आप Signal में MobileCoin भेजने या प्राप्त करने में सक्षम नहीं रहेंगे।</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">यदि आप भुगतान निष्क्रिय करते हैं तो आप Molly में MobileCoin भेजने या प्राप्त करने में सक्षम नहीं रहेंगे।</string>
     <string name="PaymentsHomeFragment__deactivate">निष्क्रिय करें</string>
     <string name="PaymentsHomeFragment__continue">आगे</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">इस समय बैलेंस उपलब्ध नहीं है।</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">माहिती</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">आप मोबाइलकॉइन भेजने और प्राप्त करने के लिए Signal इस्तेमाल कर सकते हैं। सभी भुगतान मोबाइलकॉइन्स और मोबाइलकॉइन वॉलेट के उपयोग की शर्तों के अधीन हैं। आपको कुछ समस्याएँ आ सकती हैं और जो भुगतान या बैलेंस आप खोते हैं उन्हें रिकवर नहीं किया जा सकता। </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">आप मोबाइलकॉइन भेजने और प्राप्त करने के लिए Molly इस्तेमाल कर सकते हैं। सभी भुगतान मोबाइलकॉइन्स और मोबाइलकॉइन वॉलेट के उपयोग की शर्तों के अधीन हैं। आपको कुछ समस्याएँ आ सकती हैं और जो भुगतान या बैलेंस आप खोते हैं उन्हें रिकवर नहीं किया जा सकता। </string>
     <string name="PaymentsHomeFragment__activate">सक्रिय करें</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoin शर्तें देखें</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Signal में भुगतान अब उपलब्ध नहीं है। अब भी आप किसी एक्सचेंज में धनराशि ट्रांसफ़र कर सकते हैं लेकिन अब आप भुगतान भेज या प्राप्त नहीं कर सकते या धनराशि नहीं जोड़ सकते।</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Molly में भुगतान अब उपलब्ध नहीं है। अब भी आप किसी एक्सचेंज में धनराशि ट्रांसफ़र कर सकते हैं लेकिन अब आप भुगतान भेज या प्राप्त नहीं कर सकते या धनराशि नहीं जोड़ सकते।</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">अनुमतियाँ दें</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">जिन लोगों को आप जानते हैं उन्हें संदेश भेजने में आपकी मदद के लिए, Signal इन अनुमतियों का अनुरोध करेगा। </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">जिन लोगों को आप जानते हैं उन्हें संदेश भेजने में आपकी मदद के लिए, Molly इन अनुमतियों का अनुरोध करेगा। </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">नोटिफ़िकेशन</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">अगला</string>
     <string name="PaymentsTransferFragment__invalid_address">अमान्य पता</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">आप जिस वॉलेट पते पर ट्रांसफ़र करने का प्रयास कर रहे हैं उसकी जाँच करें और दोबारा प्रयास करें।</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">आप स्वयं अपने Signal वॉलेट पते पर ट्रांसफ़र नहीं कर सकते। अपने खाते से किसी समर्थित एक्सचेंज पर वॉलेट पता दर्ज करें।</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR कोड को स्कैन करने के लिए Signal को कैमरा एक्सेस की आवश्यकता है।</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QR कोड को कैपचर करने के लिए Signal को कैमरा अनुमति की आवश्यकता है। सेटिंग्ज़ पर जाएँ, \"अनुमतियाँ\" चुनें, और \"कैमरा\" सक्षम करें।</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR कोड को स्कैन करने के लिए Signal को कैमरा एक्सेस की आवश्यकता है।</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">आप स्वयं अपने Molly वॉलेट पते पर ट्रांसफ़र नहीं कर सकते। अपने खाते से किसी समर्थित एक्सचेंज पर वॉलेट पता दर्ज करें।</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR कोड को स्कैन करने के लिए Molly को कैमरा एक्सेस की आवश्यकता है।</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QR कोड को कैपचर करने के लिए Molly को कैमरा अनुमति की आवश्यकता है। सेटिंग्ज़ पर जाएँ, \"अनुमतियाँ\" चुनें, और \"कैमरा\" सक्षम करें।</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR कोड को स्कैन करने के लिए Molly को कैमरा एक्सेस की आवश्यकता है।</string>
     <string name="PaymentsTransferFragment__settings">सेटिंग्स</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">आने वाली Signal वॉयस कॉल</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">आने वाली Molly वॉयस कॉल</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">आने वाली Signal वीडियो कॉल</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">आने वाली Molly वीडियो कॉल</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
     <string name="CallNotificationBuilder__incoming_signal_group_call">इनकमिंग सिग्नल ग्रूप कॉल</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">जारी Signal वॉइस कॉल</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">जारी Molly वॉइस कॉल</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">जारी Signal वीडियो कॉल</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">जारी Molly वीडियो कॉल</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">जारी Signal ग्रुप कॉल</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">जारी Molly ग्रुप कॉल</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">लोड हो रहा है</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">सत्यापित करें</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">आप अपना बैकअप पासफ्रेज दर्ज करने में सफल रहे हैं</string>
     <string name="BackupDialog_passphrase_was_not_correct">पासफ्रेज गलत</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signal बैकअप बनाया जा रहा है…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Molly बैकअप बनाया जा रहा है…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Signal बैकअप सत्यापित किया जा रहा है…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Molly बैकअप सत्यापित किया जा रहा है…</string>
     <string name="LocalBackupJobApi29_backup_failed">बैकअप विफल</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">आपकी बैकअप डायरेक्टरी या तो डिलीट कर दी गयी है या यहाँ से कहीं और हटा दी गयी है.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">इस वॉल्यूम में आपकी बैकअप फाइल को संगृहीत करने के लिए पर्याप्त जगह नहीं है।</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">मुझे कॉल करें (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">पुन: कोड भेजे (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Signal समर्थन से संपर्क करें</string>
-    <string name="RegistrationActivity_code_support_subject">Signal पंजीकरण - Android के लिये वेरीफिकेशन कोड</string>
+    <string name="RegistrationActivity_contact_signal_support">Molly समर्थन से संपर्क करें</string>
+    <string name="RegistrationActivity_code_support_subject">Molly पंजीकरण - Android के लिये वेरीफिकेशन कोड</string>
     <string name="RegistrationActivity_incorrect_code">गलत कोड</string>
     <string name="BackupUtil_never">कभी नहीं</string>
     <string name="BackupUtil_unknown">अनजान</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">फोन नंबर</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">चुनें कि कौन आपका फोन नंबर देख सकता है और कौन इसके साथ Signal पर आपसे संपर्क कर सकता है।</string>
+    <string name="preferences_app_protection__choose_who_can_see">चुनें कि कौन आपका फोन नंबर देख सकता है और कौन इसके साथ Molly पर आपसे संपर्क कर सकता है।</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">मेरा नंबर कौन देख सकता है</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">आपके द्वारा पहले ही बहुत बार प्रयास किया जा चुका है। कुछ देर बाद फिर से कोशिश करें।</string>
     <string name="RegistrationActivity_error_connecting_to_service">सेवा से कनेक्ट करने में त्रुटि</string>
     <string name="preferences_chats__backups">बैकअप</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal लॉक किया गया है</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly लॉक किया गया है</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">अनलॉक करने के लिए टैप करें</string>
     <string name="Recipient_unknown">अनजान</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">आपको अपने पुराने डिवाइस के एक्सेस की आवश्यकता है।</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">बैकअप से रीस्टोर करें</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">किसी लोकल बैकअप से अपने संदेश रीस्टोर करें। यदि आप अभी रीस्टोर नहीं करते, तो आप बाद में रीस्टोर नहीं कर सकेंगे।</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">स्थानीय बैकअप को रीस्टोर करें</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">बैकअप रीस्टोर करें</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">अपने सभी टेक्स्ट संदेशों को रीस्टोर करें + अपने पिछले 30 दिनों के मीडिया</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">अधिक विकल्प</string>
 
+    <string name="TransferOrRestoreFragment__cancel">रद्द करें</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">बिना ट्रांसफर किए लॉग इन करें</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">अपने संदेशों और मीडिया को स्थानांतरित किए बिना जारी रखें</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">अपने पुराने Android फ़ोन पर Signal खोलें</string>
     <string name="NewDeviceTransferInstructions__continue">आगे</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">पुराने Android डिवाइस से कनेक्ट करने की तैयारी कर रहा है…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">कुछ समय लग रहा है, जल्द ही तैयार होगा</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">पुराने Android डिवाइस के कनेक्ट होने की प्रतीक्षा कर रहा है…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal को आपके पुराने Android डिवाइस की खोज करने और उससे कनेक्ट होने के लिए लोकेशन अनुमति की आवश्यकता है।</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal को आपके पुराने Android डिवाइस की खोज करने और उससे कनेक्ट होने के लिए लोकेशन सेवाओं का चालू होना आवश्यक है।</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal को आपके पुराने Android डिवाइस की खोज करने और उससे कनेक्ट होने के लिए चालू Wi-Fi की आवश्यकता है। Wi-Fi का चालू होना आवश्यक है लेकिन उसका किसी Wi-Fi नेटवर्क से कनेक्ट होना आवश्यक नहीं है।</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">क्षमा करें, ऐसा लगता है कि यह डिवाइस Wi-Fi डायरेक्ट पर काम नहीं करता है। Signal आपके पुराने Android डिवाइस को खोजने और उससे कनेक्ट होने के लिए Wi-Fi डायरेक्ट का उपयोग करता है। अपने खाते को रीस्टोर करने के लिए आप अब भी अपने पुराने Android डिवाइस से किसी बैकअप को रीस्टोर कर सकते हैं।</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly को आपके पुराने Android डिवाइस की खोज करने और उससे कनेक्ट होने के लिए लोकेशन अनुमति की आवश्यकता है।</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly को आपके पुराने Android डिवाइस की खोज करने और उससे कनेक्ट होने के लिए लोकेशन सेवाओं का चालू होना आवश्यक है।</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly को आपके पुराने Android डिवाइस की खोज करने और उससे कनेक्ट होने के लिए चालू Wi-Fi की आवश्यकता है। Wi-Fi का चालू होना आवश्यक है लेकिन उसका किसी Wi-Fi नेटवर्क से कनेक्ट होना आवश्यक नहीं है।</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">क्षमा करें, ऐसा लगता है कि यह डिवाइस Wi-Fi डायरेक्ट पर काम नहीं करता है। Molly आपके पुराने Android डिवाइस को खोजने और उससे कनेक्ट होने के लिए Wi-Fi डायरेक्ट का उपयोग करता है। अपने खाते को रीस्टोर करने के लिए आप अब भी अपने पुराने Android डिवाइस से किसी बैकअप को रीस्टोर कर सकते हैं।</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">बैकअप रीस्टोर करें</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">आपके पुराने Android डिवाइस से कनेक्ट करते समय कोई अवांछित त्रुटि हुई।</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">नए Android डिवाइस को खोज रहे हैं…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">आपके नए Android डिवाइस को खोजने और उससे कनेक्ट होने के लिए Signal को लोकेशन अनुमति की आवश्यकता है।</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">आपके नए Android डिवाइस को खोजने और उससे कनेक्ट होने के लिए Signal को लोकेशन सेवाओं के सक्षम रखे जाने की आवश्यकता है।</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">आपके नए Android डिवाइस को खोजने और उससे कनेक्ट होने के लिए Signal को चालू Wi-Fi की आवश्यकता है। Wi-Fi का चालू होना आवश्यक है लेकिन उसका किसी Wi-Fi नेटवर्क से कनेक्ट होना आवश्यक नहीं है।</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">क्षमा करें, ऐसा लगता है कि यह डिवाइस Wi-Fi डायरेक्ट पर काम नहीं करता है। Signal आपके नए Android डिवाइस को खोजने और उससे कनेक्ट होने के लिए Wi-Fi डायरेक्ट का उपयोग करता है। आपके नए Android डिवाइस पर अपने खाते को रीस्टोर करने के लिए आप अब भी एक बैकअप बना सकते हैं।</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">आपके नए Android डिवाइस को खोजने और उससे कनेक्ट होने के लिए Molly को लोकेशन अनुमति की आवश्यकता है।</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">आपके नए Android डिवाइस को खोजने और उससे कनेक्ट होने के लिए Molly को लोकेशन सेवाओं के सक्षम रखे जाने की आवश्यकता है।</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">आपके नए Android डिवाइस को खोजने और उससे कनेक्ट होने के लिए Molly को चालू Wi-Fi की आवश्यकता है। Wi-Fi का चालू होना आवश्यक है लेकिन उसका किसी Wi-Fi नेटवर्क से कनेक्ट होना आवश्यक नहीं है।</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">क्षमा करें, ऐसा लगता है कि यह डिवाइस Wi-Fi डायरेक्ट पर काम नहीं करता है। Molly आपके नए Android डिवाइस को खोजने और उससे कनेक्ट होने के लिए Wi-Fi डायरेक्ट का उपयोग करता है। आपके नए Android डिवाइस पर अपने खाते को रीस्टोर करने के लिए आप अब भी एक बैकअप बना सकते हैं।</string>
     <string name="OldDeviceTransferSetup__create_a_backup">बैकअप बनाएँ</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">आपके नए Android डिवाइस से कनेक्ट करते समय कोई अवांछित त्रुटि हुई।</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">डेटा ट्रांसफ़र हो रहा है</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">दोनों डिवाइस एक-दूसरे के पास रखें। डिवाइस बंद ना करें और Signal खुला रखें। ट्रांसफ़र एंड-टू-एंड एन्क्रिप्टेड होते हैं।</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">दोनों डिवाइस एक-दूसरे के पास रखें। डिवाइस बंद ना करें और Molly खुला रखें। ट्रांसफ़र एंड-टू-एंड एन्क्रिप्टेड होते हैं।</string>
     <string name="DeviceTransfer__d_messages_so_far">अब तक %1$d संदेश…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">अब तक %1$s%% संदेश…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">खाता ट्रान्सफर करें</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">अपने नए Android डिवाइस पर Signal डाउनलोड करें</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">अपने नए Android डिवाइस पर Molly डाउनलोड करें</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"\"खाता ट्रांसफ़र या रीस्टोर करें\" पर टैप करें"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">जिस भी व्यक्ति के पास यह लिंक होगा, वह ग्रुप का नाम और फोटो देख सकता है और शामिल होने का अनुरोध कर सकता है। इसे अपने भरोसेमंद लोगों के साथ शेयर करें।</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">जिस भी व्यक्ति के पास यह लिंक होगा, वह ग्रुप का नाम और फोटो देख सकता है और ग्रुप में शामिल हो सकता है। इसे अपने भरोसेमंद लोगों के साथ शेयर करें।</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Signal के ज़रिये शेयर करें</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Molly के ज़रिये शेयर करें</string>
     <string name="GroupLinkBottomSheet_copy">कॉपी</string>
     <string name="GroupLinkBottomSheet_qr_code">QR कोड</string>
     <string name="GroupLinkBottomSheet_share">साझा करें</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">MobileCoin के बारे में</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin एक नई निजता केंद्रित डिजिटल मुद्रा है।</string>
     <string name="payment_info_card_adding_funds">धनराशि जोड़ना</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">आप अपने वॉलेट पते में MobileCoin भेज कर Signal में उपयोग करने के लिए धनराशि जोड़ सकते हैं।</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">आप अपने वॉलेट पते में MobileCoin भेज कर Molly में उपयोग करने के लिए धनराशि जोड़ सकते हैं।</string>
     <string name="payment_info_card_cashing_out">भुनाना</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">आप MobileCoin का समर्थन करने वाले एक्सचेंज पर किसी भी समय MobileCoin को भुना सकते हैं। बस उस एक्सचेंज में अपने खाते पर ट्रांसफ़र करें।</string>
     <string name="payment_info_card_hide_this_card">यह कार्ड छिपाएँ?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">वॉलेट निष्क्रिय करें</string>
     <string name="DeactivateWalletFragment__your_balance">आपका बैलेंस</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">हमारा सुझाव है कि भुगतान निष्क्रिय करने से पहले आप अपनी धनराशि को दूसरे वॉलेट पते पर ट्रांसफ़र कर लें।यदि आप अपनी धनराशि को अभी ट्रांसफर करना नहीं चुनते हैं तो भुगतानों को फिर से सक्रिय करने की स्थिति में वह धनराशि Signal से लिंक किए गए आपके वॉलेट में बनी रहेगी।</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">हमारा सुझाव है कि भुगतान निष्क्रिय करने से पहले आप अपनी धनराशि को दूसरे वॉलेट पते पर ट्रांसफ़र कर लें।यदि आप अपनी धनराशि को अभी ट्रांसफर करना नहीं चुनते हैं तो भुगतानों को फिर से सक्रिय करने की स्थिति में वह धनराशि Molly से लिंक किए गए आपके वॉलेट में बनी रहेगी।</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">बचे हुए बैलेंस को ट्रांसफ़र करें</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">ट्रांसफ़र किए बिना निष्क्रिय करें</string>
     <string name="DeactivateWalletFragment__deactivate">निष्क्रिय करें</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">ट्रांसफ़र किए बिना निष्क्रिय करें?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">यदि आप भुगतान फिर से सक्रिय करना चुनते हैं तो आपका बैलेंस Signal से लिंक किए हुए आपके वॉलेट में ही रहेगा।</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">यदि आप भुगतान फिर से सक्रिय करना चुनते हैं तो आपका बैलेंस Molly से लिंक किए हुए आपके वॉलेट में ही रहेगा।</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">वॉलेट निष्क्रिय करने में त्रुटि हुई।</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">लाइसेंस</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">नियम और गोपनीयता नीति</string>
-    <string name="HelpFragment__copyright_signal_messenger">कॉपीराइट Signal मेसेंजर</string>
+    <string name="HelpFragment__copyright_signal_messenger">कॉपीराइट Molly मेसेंजर</string>
     <string name="HelpFragment__licenced_under_the_agplv3">GNU AGPLv3 के तहत लाइसेंस प्राप्त</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4773,7 +4911,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">स्वतः</string>
+    <string name="ChatColorSelectionFragment__auto">ऑटो</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">कस्टम रंगों का उपयोग करें</string>
     <string name="ChatColorSelectionFragment__chat_color">चैट का रंग</string>
     <string name="ChatColorSelectionFragment__edit">बदलें</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">कोई रंग चुनें</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">साझा करें</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">केवल व्यवस्थापक ही इस समूह मे संदेश भेज सकते हैं।</string>
-    <string name="MultiselectForwardFragment__limit_reached">लिमिट तक पहुंच गए</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">आप 5 से अधिक चैट नहीं चुन सकते</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">अधिक जानें</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Signal अपडेट करें</string>
+    <string name="UpdateSignalExpiredDialog__title">Molly अपडेट करें</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Signal का यह संस्करण समाप्त हो गया है। Signal का इस्तेमाल जारी रखने के लिए अभी अपडेट करें।</string>
+    <string name="UpdateSignalExpiredDialog__message">Molly का यह संस्करण समाप्त हो गया है। Molly का इस्तेमाल जारी रखने के लिए अभी अपडेट करें।</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">अपडेट</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">डिवाइस पंजीकृत नहीं है</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">यह डिवाइस अब पंजीकृत नहीं है। इस डिवाइस पर Signal का इस्तेमाल जारी रखने के लिए पुनः पंजीकरण करें।</string>
+    <string name="ReregisterSignalDialog__message">यह डिवाइस अब पंजीकृत नहीं है। इस डिवाइस पर Molly का इस्तेमाल जारी रखने के लिए पुनः पंजीकरण करें।</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">पुनः पंजीकरन</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">पिकर ओपेन करने में असफ़ल.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">नोटिफ़िकेशन सक्षम करने के लिए, Signal को उन्हें प्रदर्शित करने की अनुमति चाहिए।</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">नोटिफ़िकेशन सक्षम करने के लिए, Molly को उन्हें प्रदर्शित करने की अनुमति चाहिए।</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">शुरु करें</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">कोई जवाब नहीं</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">आप इस स्टोरी का जवाब नहीं दे सकते क्योंकि अब आप इस ग्रुप के सदस्य नहीं हैं।</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">स्टोरी पर प्रतिक्रिया दी</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">स्टोरी पर प्रतिक्रिया दी</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">स्टोरी पर प्रतिक्रिया दी</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">व्यू</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">अपना बैंक चुनें</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">%1$s से अपने दान की पुष्टि करें</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">अपना आवर्ती दान सेटअप करने के लिए, अपने बैंक से €0,01 शुल्क की पुष्टि करने के लिए जारी रखें पर टैप करें। यह स्वचालित रूप से वापस कर दिया जाएगा और आपके €5/माह के दान को आपके अकाउंट से डेबिट किया जा सकेगा।</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">अपना आवर्ती दान सेटअप करने के लिए, अपने बैंक से €0,01 शुल्क की पुष्टि करने के लिए जारी रखें पर टैप करें। यह स्वचालित रूप से वापस कर दिया जाएगा और आपके %1$s/माह के दान को आपके अकाउंट से डेबिट किया जा सकेगा।</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">जारी रखें</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">बैकअप डाटा डाउनलोड हो रहा है…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">मीडिया बैकअप बंद हैं</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">आपका सिग्नल मीडिया बैकअप प्लान रद्द कर दिया गया है क्योंकि हम आपके भुगतान को प्रोसेस नहीं कर सके। आपके पास अपने बैकअप में संग्रहीत किसी भी मीडिया को डाउनलोड करने के लिए %1$d दिन है। %1$d दिन के बाद, आपके बैकअप में मौजूद मीडिया डिलीट कर दिया जाएगा।</item>
+        <item quantity="other">आपका सिग्नल मीडिया बैकअप प्लान रद्द कर दिया गया है क्योंकि हम आपके भुगतान को प्रोसेस नहीं कर सके। आपके पास अपने बैकअप में संग्रहीत किसी भी मीडिया को डाउनलोड करने के लिए %1$d दिन है। %1$d दिन के बाद, आपके बैकअप में मौजूद मीडिया डिलीट कर दिया जाएगा।</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">आप अपने सभी मीडिया का बैकअप लेना जारी रखने के लिए किसी भी समय फिर से बैकअप के लिए भुगतान करना शुरू कर सकते हैं। </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">आपका मीडिया आज डिलीट कर दिया जाएगा</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">आपका सिग्नल मीडिया बैकअप प्लान रद्द कर दिया गया है क्योंकि हम आपके भुगतान को प्रोसेस नहीं कर सके। डिलीट होने से पहले अपने बैकअप में मीडिया को डाउनलोड करने का यह आपका आखिरी मौका है।</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">डाउनलोड पूरा नहीं किया जा सका</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">आपके डिवाइस में पर्याप्त खाली स्थान नहीं है। आपके बैकअप में संग्रहीत मीडिया को डाउनलोड करने के लिए %1$s तक जगह खाली करें।</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">यदि आप \"छोड़ें\" चुनते हैं तो आपके बैकअप में मौजूद मीडिया %1$d दिनों में डिलीट कर दिया जाएगा।</item>
+        <item quantity="other">यदि आप \"छोड़ें\" चुनते हैं तो आपके बैकअप में मौजूद मीडिया %1$d दिनों में डिलीट कर दिया जाएगा।</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">बैकअप के लिए भुगतान प्रोसेस नहीं किया जा सकता</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">हमें आपका आवर्ती मासिक बैकअप भुगतान एकत्र करने में समस्या हो रही है। सुनिश्चित करें कि आपकी भुगतान विधि अद्यतित है। यदि ऐसा नहीं है, तो इसे Google Pay में अपडेट करें। सिग्नल कुछ दिनों में फिर से भुगतान को संसाधित करने का प्रयास करेगा।</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">बैकअप पूरा नहीं कर सका</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">आपके डिवाइस ने %1$d दिनों से बैकअप पूरा नहीं किया है. सुनिश्चित करें कि आपका डिवाइस वाई-फ़ाई से कनेक्ट है और \" बैक अप नाउ\" पर टैप करें। </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">अधिक जानें</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">छोड़ दे</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">अभी मीडिया डाउनलोड करें</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">कुछ समय बाद डाउनलोड करें</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">मीडिया डाउनलोड न करें</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">अपने मीडिया को डाउनलोड करने के लिए %1$s स्थान खाली करें।</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">डेबिट कार्ड के लिए क्रेडिट</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">अनजान</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">भुगतान का इतिहास</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">आपका पिछला बैकअप %1$s को %2$s पर बनाया गया था।</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">चयनित समय से अधिक पुराने संदेश स्थायी रूप से हटा दिए जाएंगे।</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">चयनित लंबाई से अधिक के संदेश स्थायी रूप से डिलीट कर दिए जाएंगे।</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">लिंक की गईं डिवाइस पर सीमाएं लागू करें</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">सक्षम होने पर, चैट सीमाएं आपकी लिंक की गईं डिवाइस से संदेश भी डिलीट कर देंगी।</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">डिलीट करना अब आपकी सभी डिवाइस पर सिंक हो गया है</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">जब आप संदेश या चैट डिलीट करते हैं, तो वे आपके फोन और लिंक की गईं डिवाइस से डिलीट हो जाएंगे।</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">ठीक</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">भुगतान का इतिहास</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">टेक्स्ट और सभी मीडिया बैकअप</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">भुगतान विवरण</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">बैकअप प्रकार</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">भुगतान तिथि</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">साझा करें</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal बैकअप</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">भुगतान का इतिहास</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">बैकअप की जानकारी</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">बैकअप आकार</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">बैकअप फ़्रीक्वेंसी</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">सेल्यूलर का उपयोग करके बैकअप लें</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">बैकअप बंद करें और डिलीट करें</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">बैकअप डिलीट कर दिया गया और बंद कर दिया गया।</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">बैकअप प्रकार बदला गया और सब्सक्रिप्शन रद्द कर दी गई</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">सब्सक्रिप्शन रद्द किया गया</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">डाउनलोड पूरा हुआ</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">बैकअप प्रकार</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">बैकअप बंद किया गया</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/महीना</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">बैकअप सक्षम करें</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">पिछला बैकअप</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s से %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">कभी नहीं</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">अभी बैकअप लें।</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">बैकअप बंद करें और डिलीट करें?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">आपसे फिर से शुल्क नहीं लिया जाएगा। आपका बैकअप डिलीट कर दिया जाएगा और कोई नया बैकअप नहीं बनाया जाएगा।</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">बंद करें और डिलीट करें</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">बैकअप डिलीट किया जा रहा है…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">बैकअप डिलीट किया गया</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"अभी बैक अप पर टैप करके"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">रोज़ाना</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">साप्ताहिक</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">मासिक</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">मैन्युअल रूप से बैकअप लें</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">कृपया अपना डिवाइस पिन, पासवर्ड या पैटर्न डालें।</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">अगला</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">बैकअप क़िस्म बदलें</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">सब्सक्रिप्शन रद्द करें</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">रद्द करने की पुष्टि करें</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">आपसे फिर से शुल्क नहीं लिया जाएगा। आपके बिलिंग साइकिल के अंत में बैकअप बंद कर दिए जाएंगे। उस तारीख के बाद आपके पास उस मीडिया को डाउनलोड करने के लिए 30 दिन का समय होगा जिसका आप वर्तमान में बैकअप ले रहे हैं।</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">पुष्टि करें और अभी डाउनलोड करें</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">पुष्टि करें और बाद में डाउनलोड करें</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">सब्सक्रिप्शन बनाए रखें</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index ec4a1bf1b7..a53c3b65bb 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal se ažurira…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly se ažurira…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Još niste postavili lozinku!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Onemogući lozinku?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Trajno će te otključati Signal i obavijesti o porukama.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Trajno će te otključati Molly i obavijesti o porukama.</string>
     <string name="ApplicationPreferencesActivity_disable">Onemogući</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Pogreška prilikom povezivanja na poslužitelj!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN-ovi su potrebni za Zaključavanje registracjie. Da biste onemogućili PIN-ove, prvo onemogućite Zaključavanje registracije.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Datoteka</string>
     <string name="AttachmentKeyboard_contact">Kontakt</string>
     <string name="AttachmentKeyboard_location">Lokacija</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal zahtijeva dopuštenje za prikazivanje vaših fotografija i videozapisa</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly zahtijeva dopuštenje za prikazivanje vaših fotografija i videozapisa</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Omogući pristup</string>
     <string name="AttachmentKeyboard_payment">Plaćanja</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Nije moguće pronaći aplikaciju za odabir medijskih zapisa.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal zahtijeva dopuštenje za prostor za pohranu kako bi priložio fotografije, videozapise ili zvuk, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Prostor za pohranu\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal zahtijeva dopuštenje za kontakte kako bi priložio podatke o kontaktu, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Kontakti\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal zahtijeva dopuštenje za lokaciju kako bi priložio lokaciju, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Lokacija\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly zahtijeva dopuštenje za prostor za pohranu kako bi priložio fotografije, videozapise ili zvuk, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Prostor za pohranu\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly zahtijeva dopuštenje za kontakte kako bi priložio podatke o kontaktu, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Kontakti\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly zahtijeva dopuštenje za lokaciju kako bi priložio lokaciju, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Lokacija\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Omogućite pristup lokaciji</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Za dijeljenje vaše lokacije:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Omogućite Signalu pristup za slanje vaše lokacije.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Omogućite Mollyu pristup za slanje vaše lokacije.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signalu je potreban pristup vašoj lokaciji za dijeljenje trenutne lokacije.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Mollyu je potreban pristup vašoj lokaciji za dijeljenje trenutne lokacije.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Omogućite pristup prostoru za pohranu</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Za prikaz fotografija i videozapisa:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal zahtijeva pristup prostoru za pohranu za prikazivanje vaših fotografija i videozapisa.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly zahtijeva pristup prostoru za pohranu za prikazivanje vaših fotografija i videozapisa.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">Korisnik %1$s nije omogućio Plaćanja </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Promijeni kameru</string>
     <string name="CameraXFragment_open_gallery_description">Otvori galeriju</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Omogući pristup</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Omogućite pristup kameri i mikrofonu</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Omogućite pristup kameri</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Omogućite pristup mikrofonu</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Za snimanje fotografija omogućite Signalu pristup vašoj kameri.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Za snimanje slika i videozapisa omogućite Signalu pristup vašoj kameri.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Za snimanje fotografija i videozapisa omogućite Signalu pristup kameri i mikrofonu.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Za snimanje videozapisa sa zvukom omogućite Signalu pristup vašem mikrofonu.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Za skeniranje QR koda omogućite Signalu pristup vašoj kameri.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signalu je potreban pristup vašoj kameri za snimanje fotografija</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signalu je potreban pristup vašoj kameri za skeniranje QR kodova</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signalu je potreban pristup vašem mikrofonu za snimanje videozapisa</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Za snimanje fotografija na Signalu:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Za snimanje fotografija i videozapisa na Signalu:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Za snimanje videozapisa sa zvukom:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Za skeniranje QR kodova:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Nedavni kontakti</string>
@@ -273,7 +274,7 @@
     <string name="CameraContacts_no_signal_contacts">Nema Signal kontakata</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Okidač kamere možete samo koristiti za slanje fotografija Signal kontaktima. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Niste našli što tražite?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Pozovite kontakt da pridruži Signalu</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Pozovite kontakt da pridruži Mollyu</string>
     <string name="CameraContacts__menu_search">Pretraži</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -287,12 +288,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Ne, hvala</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Ažuriraj Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Ažuriraj Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Ova verzija aplikacije više nije podržana. Da biste nastavili slati i primati poruke, ažurirajte na najnoviju verziju.</string>
     <string name="ClientDeprecatedActivity_update">Ažuriraj</string>
     <string name="ClientDeprecatedActivity_dont_update">Ne ažuriraj</string>
     <string name="ClientDeprecatedActivity_warning">Upozorenje</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Vaša verzija Signala je istekla. Možete pregledati svoju povijest poruka, ali nećete moći slati ili primati poruke dok ne ažurirate aplikaciju.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Vaša verzija Mollya je istekla. Možete pregledati svoju povijest poruka, ali nećete moći slati ili primati poruke dok ne ažurirate aplikaciju.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Nije pronađen nijedan web preglednik.</string>
@@ -329,8 +330,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Poruka %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly glasovni poziv %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly videopoziv %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -428,7 +429,7 @@
     <string name="ConversationActivity_transport_signal">Signal poruka</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Pošalji poruku</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Prebaci se na Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Prebaci se na Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Odaberite kontakt</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Privitak premašuje ograničenja veličine za vrstu poruke koju šaljete.</string>
     <string name="ConversationActivity_unable_to_record_audio">Nije moguće snimiti zvuk!</string>
@@ -447,18 +448,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Za slanje glasovnih poruka:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Za slanje glasovnih poruka, omogućite Signalu pristup vašem mikrofonu.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Za slanje glasovnih poruka, omogućite Mollyu pristup vašem mikrofonu.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signalu je potreban pristup mikrofonu za snimanje glasovne poruke.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal zahtijeva dopuštenje za mikrofon za slanje zvučnih poruka, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Mikrofon\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Mollyu je potreban pristup mikrofonu za snimanje glasovne poruke.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly zahtijeva dopuštenje za mikrofon za slanje zvučnih poruka, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Mikrofon\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal zahtijeva dopuštenja za mikrofon i kameru kako bi nazvao %1$s, ali ona su trajno odbijena. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Mikrofon\" i \"Kamera\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Za snimanje slika i video zapisa, omogućite Signalu pristup vašoj kameri.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal zahtijeva dopuštenje za kameru kako bi mogao fotografirati ili snimati videe, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal zahtijeva dopuštenje za kameru kako bi mogao fotografirati ili snimati videe</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly zahtijeva dopuštenja za mikrofon i kameru kako bi nazvao %1$s, ali ona su trajno odbijena. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Mikrofon\" i \"Kamera\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Za snimanje slika i video zapisa, omogućite Mollyu pristup vašoj kameri.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly zahtijeva dopuštenje za kameru kako bi mogao fotografirati ili snimati videe, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly zahtijeva dopuštenje za kameru kako bi mogao fotografirati ili snimati videe</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Omogućite dopuštenje za mikrofon za snimanje videozapisa sa zvukom.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal zahtijeva dopuštenje za mikrofon za snimanje videa, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Mikrofon\" i \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal zahtijeva dopuštenje za mikrofon kako bi mogao snimati videe.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly zahtijeva dopuštenje za mikrofon za snimanje videa, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Mikrofon\" i \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly zahtijeva dopuštenje za mikrofon kako bi mogao snimati videe.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
     <string name="ConversationActivity_no">Ne</string>
@@ -479,9 +480,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Za početak poziva:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Za početak poziva, omogućite Signalu pristup vašem mikrofonu.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Za početak poziva, omogućite Mollyu pristup vašem mikrofonu.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signalu je potreban pristup mikrofonu za početak poziva.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Mollyu je potreban pristup mikrofonu za početak poziva.</string>
 
 
     <string name="ConversationActivity_join">Pridruži se</string>
@@ -495,9 +496,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Signal više ne podržava slanje SMS poruka. Pozovite korisnika %1$s u Signal da bi vaš razgovor ostao ovdje.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Ova osoba više ne koristi Signal. Pozovite ju da se vrati u Signal kako bi vaš razgovor ostao ovdje.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Ova osoba više ne koristi Molly. Pozovite ju da se vrati u Molly kako bi vaš razgovor ostao ovdje.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Pozovi u Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Pozovi u Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Uskoro ćete ponovno dobiti podsjetnik.</string>
 
@@ -563,6 +564,8 @@
     <string name="ConversationFragment_delete_for_everyone">Izbriši za sve</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Izbriši s ovog uređaja</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Izbriši</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Izbriši sa svih uređaja</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Ova će poruka biti trajno izbrisana za sve osobe u razgovoru ako su na najnovijoj verziji Signala, a oni će moći vidjeti da ste izbrisali poruku.</string>
@@ -594,13 +597,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Korisnik je blokiran</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Ažuriraj Signal</string>
+    <string name="ConversationFragment__update_build">Ažuriraj Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Ponovno se registrirajte na Signalu</string>
+    <string name="ConversationFragment__reregister_signal">Ponovno se registrirajte na Mollyu</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Vrati se nazad.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Otvori Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Otvori Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Više nije provjereno</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -669,6 +672,13 @@
         <item quantity="many">Ovo će trajno izbrisati %1$d odabranih razgovora.</item>
         <item quantity="other">Ovo će trajno izbrisati %1$d odabranih razgovora.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Ovo će trajno izbrisati odabrani razgovor sa svih vaših uređaja.</item>
+        <item quantity="few">Ovo će trajno izbrisati %1$d odabrana razgovora sa svih vaših uređaja.</item>
+        <item quantity="many">Ovo će trajno izbrisati %1$d odabranih razgovora sa svih vaših uređaja.</item>
+        <item quantity="other">Ovo će trajno izbrisati %1$d odabranih razgovora sa svih vaših uređaja.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Brisanje</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Brisanje odabranog razgovora…</item>
@@ -770,9 +780,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Tko me može pronaći po broju telefona?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Svi korisnici koji imaju vaš broj telefona vidjet će da ste na Signalu i moći će započeti razgovor s vama.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Svi korisnici koji imaju vaš broj telefona vidjet će da ste na Mollyu i moći će započeti razgovor s vama.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Nitko neće moći vidjeti da ste na Signalu, osim ako nekome ne pošaljete poruku ili ako već imate postojeći razgovor s nekime.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Nitko neće moći vidjeti da ste na Mollyu, osim ako nekome ne pošaljete poruku ili ako već imate postojeći razgovor s nekime.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Vrati iz sigurnosne kopije?</string>
@@ -806,7 +816,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Testirajte vašu lozinku sigurnosne kopije i provjerite je li točna</string>
     <string name="BackupsPreferenceFragment__turn_on">Uključi</string>
     <string name="BackupsPreferenceFragment__turn_off">Isključi</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Da biste vratili sigurnosnu kopiju, instalirajte novu kopiju Signala. Otvorite aplikaciju i pritisnite \"Vrati sigurnosnu kopiju\", a zatim pronađite datoteku sigurnosne kopije. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Da biste vratili sigurnosnu kopiju, instalirajte novu kopiju Mollya. Otvorite aplikaciju i pritisnite \"Vrati sigurnosnu kopiju\", a zatim pronađite datoteku sigurnosne kopije. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Saznajte više</string>
     <string name="BackupsPreferenceFragment__in_progress">U tijeku…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -814,7 +824,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d za sada…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% do sada…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal zahtijeva dopuštenje za vanjski prostor za pohranu kako bi stvorio sigurnosne kopije, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Prostor za pohranu\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly zahtijeva dopuštenje za vanjski prostor za pohranu kako bi stvorio sigurnosne kopije, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Prostor za pohranu\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Postavite vrijeme sigurnosnog kopiranja</string>
 
@@ -881,7 +891,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Sesija razgovora je osvježena</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal koristi end-to-end šifriranje i možda će ponekad trebati osvježiti sesiju razgovora. To ne utječe na sigurnost vašeg razgovora, ali ste možda propustili poruku od ovog kontakta i možete zatražiti da je ponovno pošalje.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly koristi end-to-end šifriranje i možda će ponekad trebati osvježiti sesiju razgovora. To ne utječe na sigurnost vašeg razgovora, ali ste možda propustili poruku od ovog kontakta i možete zatražiti da je ponovno pošalje.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Koristite Signal na računalu ili iPadu. Vaše će se poruke sinkronizirati s vašim povezanim uređajima.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Poveži novi uređaj</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Poruke i podaci o razgovorima zaštićeni su sveobuhvatnim šifriranjem na svim uređajima</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal za desktop ili iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Sve poruke na povezanim uređajima su privatne</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Molly poruke sinkronizirat će se sa Mollyom na vašem mobilnom uređaju nakon što ga povežete. Vaša povijest poruka neće biti vidljiva na novom uređaju.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Posjetite %1$s na novom uređaju kako biste instalirali Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Moji povezani uređaji</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Poništi vezu</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">Veza s uređajem %1$s je poništena</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Povezivanje uređaja…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Uređaj je uspješno povezan</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Učitavanje…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Nema povezanih uređaja</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Otključajte uređaj da biste ga povezali</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Skenirajte QR kôd prikazan na uređaju koji želite povezati.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Skeniraj QR kôd</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Koristite ovaj uređaj za skeniranje QR koda prikazanog na uređaju koji želite povezati</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">U redu</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Ovaj će uređaj moći vidjeti vaše grupe i kontakte, pristupiti vašim razgovorima i slati poruke u vaše ime.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Dovršite povezivanje na drugom uređaju</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Dovršite povezivanje sa Mollyom na drugom uređaju.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Povezivanje uređaja nije uspjelo</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Ovaj QR kôd nije valjan. Provjerite skenirate li QR kôd prikazan na uređaju koji želite povezati.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Pokušajte ponovno</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Poništi vezu \'%1$s\'?</string>
@@ -903,10 +968,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimiziraj za nedostatak Play Services</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Ovaj uređaj ne podržava Play Services. Pritisnite kako biste onemogućili sistemsku optimizaciju baterije koja spriječava Signal da dohvaća poruke dok je uređaj neaktivan.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Ovaj uređaj ne podržava Play Services. Pritisnite kako biste onemogućili sistemsku optimizaciju baterije koja spriječava Molly da dohvaća poruke dok je uređaj neaktivan.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Ova verzija Signala je istekla. Ažurirajte odmah da biste slali i primali poruke.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Ova verzija Mollya je istekla. Ažurirajte odmah da biste slali i primali poruke.</string>
     <string name="ExpiredBuildReminder_update_now">Ažuriraj sada</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -919,8 +984,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Pregledaj</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Trajna pogreška u komunikaciji Signala!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal se nije uspješno registrirao na Google Play Services. Signal poruke i pozivi su onemogućeni. Pokušajte se ponovno registrirati kroz Postavke &gt; Napredno.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Trajna pogreška u komunikaciji Mollya!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly se nije uspješno registrirao na Google Play Services. Molly poruke i pozivi su onemogućeni. Pokušajte se ponovno registrirati kroz Postavke &gt; Napredno.</string>
 
 
     <!-- GiphyActivity -->
@@ -1085,20 +1150,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Zapisi pogrešaka pomažu nam pri dijagnosticiranju i rješavanju problema i ne sadrže podatke za identifikaciju.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Došlo je do pogreške na Signalu. Poslati zapisnik pogreške?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Došlo je do pogreške na Mollyu. Poslati zapisnik pogreške?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Obavijesti mogu kasniti zbog optimizacije baterije</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Možete onemogućiti optimizaciju baterije za Signal kako biste osigurali da obavijesti o porukama ne kasne.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Možete onemogućiti optimizaciju baterije za Molly kako biste osigurali da obavijesti o porukama ne kasne.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Obavijesti mogu kasniti zbog optimizacije baterije</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Onemogućite optimizaciju baterije za Molly kako biste osigurali da obavijesti o porukama ne kasne. Dodirnite \"Nastavi\" za prikaz uputa za pojedine uređaje.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Ne, hvala</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Nastavi</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Nastavi</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Odbaci</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Ne, hvala</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Pozivnice grupe na čekanju</string>
+    <string name="PendingMembersActivity_pending_group_invites">Zahtjevi i pozivnice</string>
     <string name="PendingMembersActivity_requests">Zahtjevi</string>
     <string name="PendingMembersActivity_invites">Pozivnice</string>
     <string name="PendingMembersActivity_people_you_invited">Osobe koje ste pozvali</string>
@@ -1361,7 +1436,7 @@
     <string name="InviteActivity_cancel">Poništi</string>
     <string name="InviteActivity_sending">Slanje…</string>
     <string name="InviteActivity_invitations_sent">Pozivnice su poslane!</string>
-    <string name="InviteActivity_invite_to_signal">Pozovi u Signal</string>
+    <string name="InviteActivity_invite_to_signal">Pozovi u Molly</string>
     <string name="InviteActivity_send_sms">Pošalji SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Poslati %1$d SMS pozivnicu?</item>
@@ -1369,7 +1444,7 @@
         <item quantity="many">Poslati %1$d SMS pozivnica?</item>
         <item quantity="other">Poslati %1$d SMS pozivnica?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Prebacimo se na Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Prebacimo se na Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Izgleda da nemate nijednu aplikaciju za dijeljenje.</string>
 
     <!-- LearnMoreTextView -->
@@ -1383,7 +1458,7 @@
     <string name="LongMessageActivity_your_message">Vaša poruka</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Pozadinska veza je omogućena</string>
 
     <!-- MediaOverviewActivity -->
@@ -1462,10 +1537,10 @@
     <string name="MessageQuotesBottomSheet_replies">Odgovori</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Uspostavljanje Signal poziva</string>
+    <string name="NotificationBarManager__establishing_signal_call">Uspostavljanje Molly poziva</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Pokretanje usluge Signal poziv</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Zaustavljanje Signalove usluge za pozive</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Pokretanje usluge Molly poziv</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Zaustavljanje Mollyove usluge za pozive</string>
     <string name="NotificationBarManager__cancel_call">Otkaži poziv</string>
 
     <!-- NotificationsMegaphone -->
@@ -1733,6 +1808,14 @@
     <string name="MessageRecord_you_activated_payments">Omogućili ste Plaćanja</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s sada može prihvaćati uplate</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Podaci o plaćanju nisu dostupni</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Dodirni za više opcija</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Podaci o plaćanju nisu dostupni</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Podaci o plaćanju nisu dostupni jer su vaše poruke vraćene s mjesta na kojem ova povijest plaćanja nije zapisana. To ne utječe na stanje vašeg novčanika ili status prošlih plaćanja.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1793,9 +1876,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Uskoro više nećete moći slati SMS poruke sa Signala. Pozovite korisnika %1$s u Signal da bi vaš razgovor ostao ovdje.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Više nije moguće slati SMS poruke preko Signala. Pozovite korisnika %1$s u Signal da bi vaš razgovor ostao ovdje.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Više nije moguće slati SMS poruke preko Mollya. Pozovite korisnika %1$s u Molly da bi vaš razgovor ostao ovdje.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Plaćanje: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Plaćanje</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Prijavljeno kao neželjeni sadržaj</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1881,7 +1966,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Poveži Signal uređaj?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Čini se da pokušavate povezati Signal uređaj pomoću skenera treće strane. Radi vaše zaštite ponovo skenirajte kôd unutar Signal aplikacije.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal zahtijeva dopuštenje za kameru kako bi mogao skenirati QR kôd, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Kamera\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly zahtijeva dopuštenje za kameru kako bi mogao skenirati QR kôd, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Kamera\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Nije moguće skenirati QR kôd bez dozvole pristupa kamere</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1896,11 +1981,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Unesite lozinku</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal ikona</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly ikona</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Pošaljite lozinku</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Nevažeća lozinka!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Otključaj Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Zaključani zaslon</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Otključaj Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Zaključani zaslon</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Mapa</string>
@@ -1969,7 +2054,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Provjeri za nastavak razmjene poruka</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Da bismo spriječili neželjene poruke na Signalu, molimo dovršite provjeru.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Da bismo spriječili neželjene poruke na Mollyu, molimo dovršite provjeru.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Nakon provjere možete nastaviti s razmjenom poruka. Sve pauzirane poruke automatski će se poslati.</string>
 
     <!-- Recipient -->
@@ -1977,7 +2062,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Moja priča</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal poziv</string>
+    <string name="Recipient_signal_call">Molly poziv</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Blokiraj</string>
@@ -1991,7 +2076,8 @@
     <string name="RedPhone_ringing">Pozivanje…</string>
     <string name="RedPhone_busy">Zauzeto</string>
     <string name="RedPhone_recipient_unavailable">Primatelj nije dostupan</string>
-    <string name="RedPhone_network_failed">Mrežna pogreška!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Mrežna pogreška! Provjerite mrežnu vezu i pokušajte ponovno.</string>
     <string name="RedPhone_number_not_registered">Broj nije registriran!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Broj koji ste birali ne podržava sigurno glasovno pozivanje!</string>
     <string name="RedPhone_got_it">Shvaćam</string>
@@ -2002,8 +2088,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Pritisnite ovdje da biste uključili vaš video</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Da biste uputili poziv za %1$s, omogućite Signalu pristup vašoj kameri</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Da biste uputili poziv za %1$s, omogućite Mollyu pristup vašoj kameri</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Uspostava poziva</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Ponovno povezivanje…</string>
@@ -2069,10 +2155,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Uklonjeni iz poziva</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Netko vas je uklonio iz poziva.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Omogućite pristup kameri i mikrofonu</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Omogućite pristup mikrofonu</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Omogućite pristup kameri</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Za novi poziv ili pridruživanje pozivu omogućite Mollyu pristup vašoj kameri i mikrofonu.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Za novi poziv ili pridruživanje pozivu omogućite Mollyu pristup vašem mikrofonu.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Za korištenje videopoziva omogućite Mollyu pristup vašoj kameri.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Za novi poziv ili pridruživanje pozivu Molly treba dopuštenje za pristup vašem mikrofonu.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly treba pristup vašoj kameri za videopoziv</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Za novi poziv ili pridruživanje pozivu:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Za korištenje videopoziva:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal poziv</string>
-    <string name="WebRtcCallView__signal_video_call">Signal videopoziv</string>
+    <string name="WebRtcCallView__signal_call">Molly poziv</string>
+    <string name="WebRtcCallView__signal_video_call">Molly videopoziv</string>
     <string name="WebRtcCallView__start_call">Započni poziv</string>
     <string name="WebRtcCallView__join_call">Pridruži se pozivu</string>
     <string name="WebRtcCallView__call_is_full">Poziv je pun</string>
@@ -2172,25 +2278,48 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Želite spustiti ruku?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Spusti ruku</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Spusti</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Poništi</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Podigli ste ruku</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Prikaz</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s podiže ruku</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s podižete ruku</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s i %2$d podižete ruku</item>
+        <item quantity="few">%1$s i još %2$d korisnika podižete ruku</item>
+        <item quantity="many">%1$s i još %2$d korisnika podižete ruku</item>
+        <item quantity="other">%1$s i još %2$d korisnika podižete ruku</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s podiže ruku</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s i %2$d podižu ruku</item>
         <item quantity="few">%1$s i još %2$d korisnika podižu ruku</item>
         <item quantity="many">%1$s i još %2$d korisnika podižu ruku</item>
         <item quantity="other">%1$s i još %2$d korisnika podižu ruku</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
-        <item quantity="one">%1$s</item>
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s +%2$d</item>
+        <item quantity="few">%1$s +%2$d</item>
+        <item quantity="many">%1$s +%2$d</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
+        <item quantity="one">%1$s +%2$d</item>
         <item quantity="few">%1$s +%2$d</item>
         <item quantity="many">%1$s +%2$d</item>
         <item quantity="other">%1$s +%2$d</item>
@@ -2292,7 +2421,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Primiti će te poziv za potvrdu ovog broja telefona.</string>
     <string name="RegistrationActivity_edit_number">Uredi broj</string>
     <string name="RegistrationActivity_missing_google_play_services">Google Play Services nije dostupno</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Ovom uređaju nedostaje Google Play Services. I dalje možete koristiti Signal, ali ova konfiguracija može rezultirati smanjenom pouzdanošću ili performansama.\n\nAko niste napredni korisnik, ili ne koristite prilagođeni Android ROM ili vjerujete da ovo greškom vidite, kontaktirajte nas na support@signal.org za pomoć u rješavanju problema.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Ovom uređaju nedostaje Google Play Services. I dalje možete koristiti Molly, ali ova konfiguracija može rezultirati smanjenom pouzdanošću ili performansama.\n\nAko niste napredni korisnik, ili ne koristite prilagođeni Android ROM ili vjerujete da ovo greškom vidite, kontaktirajte nas na support@molly.im za pomoć u rješavanju problema.</string>
     <string name="RegistrationActivity_i_understand">Shvaćam</string>
     <string name="RegistrationActivity_play_services_error">Pogreška Play Servicesa</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services se trenutno ažurira ili je nedostupno. Pokušajte ponovno kasnije.</string>
@@ -2310,7 +2439,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Nestandardni format broja</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Čini se da je broj koji ste unijeli (%1$s) nestandardnog formata.\n\nJeste li mislili %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android – format broja telefona</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android – format broja telefona</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Zatražen poziv</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2346,8 +2475,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Imate poteškoća s registriranjem?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Provjerite ima li vaš telefon signala za primanje SMS poruka ili poziva\n • Potvrdite da možete primati pozive na ovaj broj telefona\n • Provjerite jeste li ispravno unijeli broj telefona.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Za više informacija, slijedite ove korake za rješavanje problema ili kontaktirajte podršku</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Za više informacija slijedite %1$s ili %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">ove korake za rješavanje problema</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2385,13 +2514,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Dodaj u kontakte</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Pozovi u Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Pozovi u Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal poruka</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal poziv</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Dodaj u kontakte</string>
-    <string name="SharedContactView_invite_to_signal">Pozovi u Signal</string>
+    <string name="SharedContactView_invite_to_signal">Pozovi u Molly</string>
     <string name="SharedContactView_message">Signal poruka</string>
 
     <!-- SignalBottomActionBar -->
@@ -2522,11 +2651,11 @@
     <string name="ThreadRecord_s_belongs_to_s">Broj %1$s pripada korisniku %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal ažuriranje</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Dostupna je nova verzija Signala. Dodirnite za ažuriranje.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Ažuriranje Signala nije uspjelo</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly ažuriranje</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Dostupna je nova verzija Mollya. Dodirnite za ažuriranje.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Ažuriranje Mollya nije uspjelo</string>
     <string name="ApkUpdateNotifications_failed_general_body">Pokušat ćemo ponovno kasnije.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal je uspješno ažuriran</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly je uspješno ažuriran</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Aplikacija je automatski ažurirana na verziju %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2599,7 +2728,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Naš Signal sigurnosni broj:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Izgleda da nemate aplikacije s kojima je moguće dijeljenje.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">U međuspremniku nije pronađen sigurnosni broj za usporedbu</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal zahtijeva dopuštenje za kameru kako bi mogao skenirati QR kôd, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Kamera\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly zahtijeva dopuštenje za kameru kako bi mogao skenirati QR kôd, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Kamera\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Nije moguće skenirati QR kôd bez dozvole pristupa kamere</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Prvo morate razmijeniti poruke da biste vidjeli sigurnosni broj od %1$s.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2629,14 +2758,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Pritisnite za otvaranje.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal je otključan</string>
-    <string name="KeyCachingService_lock">Zaključaj Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly je otključan</string>
+    <string name="KeyCachingService_lock">Zaključaj Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Vi</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Nepodržana vrsta medijskog zapisa</string>
     <string name="MediaPreviewActivity_draft">Skica</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal zahtijeva dopuštenje za prostor za pohranu kako bi mogao spremiti u vanjski prostor za pohranu, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Prostor za pohranu\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly zahtijeva dopuštenje za prostor za pohranu kako bi mogao spremiti u vanjski prostor za pohranu, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Prostor za pohranu\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Nije moguće spremiti u vanjski prostor za pohranu bez dozvola</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Izbriši poruku?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">To će trajno izbrisati ovu poruku.</string>
@@ -2684,7 +2813,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Isporuka poruke nije uspjela.</string>
     <string name="MessageNotifier_error_delivering_message">Pogreška prilikom isporuke poruke.</string>
     <string name="MessageNotifier_message_delivery_paused">Isporuka poruke je zaustavljena.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Provjeri za nastavak razmjene poruka na Signalu.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Provjeri za nastavak razmjene poruka na Mollyu.</string>
     <string name="MessageNotifier_mark_all_as_read">Označi sve kao pročitano</string>
     <string name="MessageNotifier_mark_read">Označi kao pročitano</string>
     <string name="MessageNotifier_turn_off_these_notifications">Onemogući ove obavijesti</string>
@@ -2706,7 +2835,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Reagira s %1$s na vašu naljepnicu.</string>
     <string name="MessageNotifier_this_message_was_deleted">Ova poruka je izbrisana.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Isključiti obavijesti o novim kontaktima na Signalu? Možete ih ponovo omogućiti u Signal &amp;gt Postavke &amp;gt Obavijesti.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Isključiti obavijesti o novim kontaktima na Mollyu? Možete ih ponovo omogućiti u Molly &amp;gt Postavke &amp;gt Obavijesti.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2745,7 +2874,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Brzi odgovor nije dostupan kada je Signal zaključan!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Brzi odgovor nije dostupan kada je Molly zaključan!</string>
     <string name="QuickResponseService_problem_sending_message">Pogreška prilikom slanja poruke!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2765,7 +2894,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Nevažeći prečac</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Nova poruka</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Zahtjev za razgovorom</string>
     <string name="SingleRecipientNotificationBuilder_you">Vi</string>
@@ -2813,7 +2942,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Ovaj uređaj više nije registriran. To je vjerojatno zato što ste svoj broj telefona na Signalu registrirali na drugom uređaju.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Ovaj uređaj više nije registriran. To je vjerojatno zato što ste svoj broj telefona na Mollyu registrirali na drugom uređaju.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Ponovno registrirajte uređaj</string>
 
@@ -2826,10 +2955,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Da biste odgovorili na poziv, omogućite Signalu pristup vašem mikrofonu.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Da biste odgovorili na poziv, omogućite Mollyu pristup vašem mikrofonu.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Da biste odgovorili na videopoziv, omogućite Signalu pristup vašem mikrofonu i kameri.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal zahtijeva dopuštenja za mikrofon i kameru za upućivanje ili primanje poziva, ali ona su trajno odbijena. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Mikrofon\" i \"Kamera\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Da biste odgovorili na videopoziv, omogućite Mollyu pristup vašem mikrofonu i kameri.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly zahtijeva dopuštenja za mikrofon i kameru za upućivanje ili primanje poziva, ali ona su trajno odbijena. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Mikrofon\" i \"Kamera\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Odgovoreno na povezanom uređaju.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Odbijeno na povezanom uređaju.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Zauzeto na povezanom uređaju.</string>
@@ -2874,16 +3003,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Ponovite novu lozinku</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Pozovi u Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Pozovi u Molly</string>
     <string name="contact_selection_activity__new_group">Nova grupa</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Osvježi popis kontakata</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Nedostaje li netko? Pokušajte osvježiti popis kontakata</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Pronađite ljude koje poznajete na Signalu</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Omogućite pristup vašim kontaktima</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Više</string>
 
@@ -2900,7 +3029,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Slika kontakta</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal zahtijeva dopuštenje za kontakte kako bi prikazao vaše kontakte, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Kontakti\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly zahtijeva dopuštenje za kontakte kako bi prikazao vaše kontakte, ali je trajno odbijen. Otvorite postavke aplikacije, odaberite \"Dozvole\" i omogućite \"Kontakti\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Pogreška pri dohvaćanju kontakata, provjerite mrežnu vezu</string>
     <string name="ContactSelectionListFragment_username_not_found">Korisničko ime nije pronađeno</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" nije korisnik Signala. Provjerite korisničko ime i pokušajte ponovno."</string>
@@ -2920,16 +3049,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Traži po korisničkom imenu</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Omogućite pristup kontaktima</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Da biste pronašli ljude koje poznajete na Signalu:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Omogući pristup</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Ne, hvala</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Omogućite pristup vašim kontaktima. Vaši kontakti su šifrirani i nisu vidljivi usluzi Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal zahtjeva pristup vašim kontaktima kako bi ih mogao prikazati.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly zahtjeva pristup vašim kontaktima kako bi ih mogao prikazati.</string>
     <string name="contact_selection_list_fragment__show_contacts">Prikaži kontakte</string>
 
     <!-- contact_selection_list_item -->
@@ -3006,6 +3137,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Uklonili ste ovu osobu, ponovnim slanjem poruke vratit ćete je na svoj popis.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Mogućnosti</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Ažuriraj</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Reproduciraj … Pauziraj</string>
@@ -3034,7 +3167,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Oblačići su značajka Androida koju možete isključiti za razgovore na Signalu.</string>
+    <string name="BubbleOptOutTooltip__description">Oblačići su značajka Androida koju možete isključiti za razgovore na Mollyu.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Ne sada</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3216,9 +3349,9 @@
     <string name="EditProfileFragment__group_description">Opis grupe</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Ažuriraj Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Ažuriraj Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Ova verzija Signala je zastarjela. Ažurirajte je odmah da biste nastavili koristiti Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Ova verzija Mollya je zastarjela. Ažurirajte je odmah da biste nastavili koristiti Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Ažuriraj</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3437,7 +3570,7 @@
     <string name="preferences__slow">Sporo</string>
     <string name="preferences__help">Pomoć</string>
     <string name="preferences__advanced">Napredno</string>
-    <string name="preferences__donate_to_signal">Donirajte Signalu</string>
+    <string name="preferences__donate_to_signal">Donirajte Mollyu</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Privatnost</string>
     <!-- Preference label for stories -->
@@ -3474,13 +3607,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Promjena ikone i naziva aplikacije u \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal će se morati zatvoriti kako bi se ažurirali ikona i naziv aplikacije. Obavijesti će uvijek prikazivati zadanu ikonu i naziv Signala.</string>
+    <string name="preferences__app_icon_dialog_description">Molly će se morati zatvoriti kako bi se ažurirali ikona i naziv aplikacije. Obavijesti će uvijek prikazivati zadanu ikonu i naziv Mollya.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Odaberite ikonu i naziv aplikacije koji će biti vidljivi na početnom zaslonu vašeg telefona i u ladici za aplikacije. Obavijesti će uvijek prikazivati zadanu ikonu i naziv Signala. Saznajte više</string>
+    <string name="preferences__app_icon_warning_learn_more">Odaberite ikonu i naziv aplikacije koji će biti vidljivi na početnom zaslonu vašeg telefona i u ladici za aplikacije. Obavijesti će uvijek prikazivati zadanu ikonu i naziv Mollya. Saznajte više</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Ikone i nazivi aplikacije će biti vidljivi na početnom zaslonu vašeg telefona i u ladici za aplikacije.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Obavijesti će uvijek prikazivati zadanu ikonu i naziv Signala.</string>
+    <string name="preferences__app_icon_notification_warning">Obavijesti će uvijek prikazivati zadanu ikonu i naziv Mollya.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Saznajte više</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3529,8 +3662,12 @@
         <item quantity="other">Ovo će trajno skratiti sve razgovore na %1$s najnovijih poruka.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Ovo će trajno izbrisati svu povijest razgovora i medijske zapise s vašeg uređaja.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Ovo će trajno izbrisati svu povijest razgovora i medijske zapise s ovog i svih povezanih uređaja.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Jeste li sigurni da želite izbrisati svu povijest razgovora?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Sva povijest razgovora bit će trajno uklonjena. Ova se radnja ne može poništiti.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Sva povijest razgovora bit će trajno uklonjena sa svih uređaja. Ova se radnja ne može poništiti.</string>
     <string name="preferences_storage__delete_all_now">Izbriši sve</string>
     <string name="preferences_storage__forever">Zauvijek</string>
     <string name="preferences_storage__one_year">1 godina</string>
@@ -3569,7 +3706,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Zaobilaženje cenzure</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Zaobilaženje cenzure</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Ako je omogućeno, Signal će pokušati zaobići cenzuru. Omogućite ovu značajku samo ako ste u mjestu gdje je Signal cenzuriran.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Ako je omogućeno, Molly će pokušati zaobići cenzuru. Omogućite ovu značajku samo ako ste u mjestu gdje je Molly cenzuriran.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Zaobilaženje cenzure aktivirano je na temelju broja telefona vašeg računa.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3621,7 +3758,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Predstavljamo plaćanja</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Koristite Signal za slanje i primanje MobileCoina, nove digitalne valute usmjerene na privatnost. Omogućite za početak.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Koristite Molly za slanje i primanje MobileCoina, nove digitalne valute usmjerene na privatnost. Omogućite za početak.</string>
     <string name="PaymentsHomeFragment__activate_payments">Omogući plaćanja</string>
     <string name="PaymentsHomeFragment__activating_payments">Omogućavanje plaćanja…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Oporavi račun za plaćanja</string>
@@ -3647,7 +3784,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Plaćanja nisu dostupna u vašoj regiji.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Neuspješno omogućavanje plaćanja. Pokušajte ponovno kasnije.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Onemogući plaćanja?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Nećete više biti u mogućnosti slati i primati MobileCoin na Signalu ako onemogućite plaćanja.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Nećete više biti u mogućnosti slati i primati MobileCoin na Mollyu ako onemogućite plaćanja.</string>
     <string name="PaymentsHomeFragment__deactivate">Onemogući</string>
     <string name="PaymentsHomeFragment__continue">Nastavi</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Stanje trenutno nije dostupno.</string>
@@ -3656,10 +3793,10 @@
     <string name="PaymentsHomeFragment__details">Detalji</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Signal možete koristiti za slanje i primanje MobileCoina. Sva plaćanja podliježu Uvjetima korištenja za MobileCoins i MobileCoin Wallet. Mogli biste naići na neke probleme i gubitke u plaćanjima ili saldu koje neće biti moguće vratiti. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Molly možete koristiti za slanje i primanje MobileCoina. Sva plaćanja podliježu Uvjetima korištenja za MobileCoins i MobileCoin Wallet. Mogli biste naići na neke probleme i gubitke u plaćanjima ili saldu koje neće biti moguće vratiti. </string>
     <string name="PaymentsHomeFragment__activate">Omogući</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Prikaži MobileCoin uvjete</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Uplate na Signalu više nisu dostupne. I dalje možete prenijeti sredstva na burzu, ali više ne možete slati i primati uplate niti dodavati sredstva.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Uplate na Mollyu više nisu dostupne. I dalje možete prenijeti sredstva na burzu, ali više ne možete slati i primati uplate niti dodavati sredstva.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3687,7 +3824,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Omogući dopuštenja</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Signal traži ova dopuštenja kako bi vam pomogao u slanju poruka vašim poznanicima. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Molly traži ova dopuštenja kako bi vam pomogao u slanju poruka vašim poznanicima. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Obavijesti</string>
     <!-- Notifications permission row description -->
@@ -3775,10 +3912,10 @@
     <string name="PaymentsTransferFragment__next">Sljedeće</string>
     <string name="PaymentsTransferFragment__invalid_address">Nevažeća adresa</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Provjerite adresu novčanika na koju pokušavate prenijeti i pokušajte ponovo.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Ne možete prenijeti na vašu Signal adresu novčanika. Unesite adresu novčanika od vašeg računa na podržanoj burzi.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Da bi skenirao QR kôd, Signal treba pristup kameri.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal zahtijeva dopuštenje za kameru kako bi snimio QR kôd. Otvorite postavke, odaberite \"Dozvole\" i omogućite \"Kamera\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Da bi skenirao QR kôd, Signal treba pristup kameri.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Ne možete prenijeti na vašu Molly adresu novčanika. Unesite adresu novčanika od vašeg računa na podržanoj burzi.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Da bi skenirao QR kôd, Molly treba pristup kameri.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly zahtijeva dopuštenje za kameru kako bi snimio QR kôd. Otvorite postavke, odaberite \"Dozvole\" i omogućite \"Kamera\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Da bi skenirao QR kôd, Molly treba pristup kameri.</string>
     <string name="PaymentsTransferFragment__settings">Postavke</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -4144,17 +4281,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Dolazni Signal glasovni poziv</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Dolazni Molly glasovni poziv</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Dolazni Signal videopoziv</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Dolazni Molly videopoziv</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Dolazni Signal grupni poziv</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Dolazni Molly grupni poziv</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Signal glasovni poziv u tijeku</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Molly glasovni poziv u tijeku</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Signal videopoziv u tijeku</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Molly videopoziv u tijeku</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Signal grupni poziv u tijeku</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Molly grupni poziv u tijeku</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Učitavanje…</string>
@@ -4201,9 +4338,9 @@
     <string name="BackupDialog_verify">Potvrdi</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Uspješno ste unijeli lozinku sigurnosne kopije</string>
     <string name="BackupDialog_passphrase_was_not_correct">Lozinka nije točna</string>
-    <string name="LocalBackupJob_creating_signal_backup">Stvaranje sigurnosne kopije Signala…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Stvaranje sigurnosne kopije Mollya…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Provjera sigurnosne kopije Signala…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Provjera sigurnosne kopije Mollya…</string>
     <string name="LocalBackupJobApi29_backup_failed">Sigurnosno kopiranje nije uspjelo</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Vaša mapa sigurnosnih kopija je izbrisana ili premještena.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Datoteka vaše sigurnosne kopije prevelika je za pohranu na ovom volumenu.</string>
@@ -4218,15 +4355,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Nazovi me (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Ponovno pošalji kôd (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Kontaktirajte Signalovu podršku</string>
-    <string name="RegistrationActivity_code_support_subject">Registracija Signala - Potvrdni kôd za Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Kontaktirajte Mollyovu podršku</string>
+    <string name="RegistrationActivity_code_support_subject">Registracija Mollya - Potvrdni kôd za Android</string>
     <string name="RegistrationActivity_incorrect_code">Pogrešan kôd</string>
     <string name="BackupUtil_never">Nikada</string>
     <string name="BackupUtil_unknown">Nepoznato</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Broj telefona</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Odaberite tko može vidjeti vaš broj telefona i tko vas može kontaktirati putem njega na Signalu.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Odaberite tko može vidjeti vaš broj telefona i tko vas može kontaktirati putem njega na Mollyu.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Tko može vidjeti moj broj</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4274,7 +4411,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Previše neuspjelih pokušaja. Pokušajte ponovo kasnije.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Pogreška prilikom povezivanja s uslugom</string>
     <string name="preferences_chats__backups">Sigurnosne kopije</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal je zaključan</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly je zaključan</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">PRITISNITE ZA OTKLJUČAVANJE</string>
     <string name="Recipient_unknown">Nepoznato</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4305,9 +4442,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Morate imati pristup svom starom uređaju.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Vraćanje iz sigurnosne kopije</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Vratite svoje poruke iz lokalne sigurnosne kopije. Ako ne vratite sada, nećete kasnije moći vratiti.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Vratite podatke iz lokalne sigurnosne kopije</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Vratite podatke iz sigurnosne kopije Signala</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Vratite sve svoje poruke + medijske zapise od zadnjih 30 dana</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Više opcija</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Poništi</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Prijavite se bez prijenosa podataka</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Nastavite bez prijenosa poruka i medijskih zapisa</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Otvorite Signal na starom Android uređaju</string>
     <string name="NewDeviceTransferInstructions__continue">Nastavi</string>
@@ -4322,19 +4466,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Priprema za povezivanje s starim Android uređajem…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Pričekajte trenutak, uskoro će biti spremno</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Čekanje da se stari Android uređaj poveže…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal zahtijeva dopuštenje za lokaciju za otkrivanje i povezivanje s vašim starim Android uređajem.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal zahtijeva da su lokacijske usluge omogućene za otkrivanje i povezivanje s vašim starim Android uređajem.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signalu je potreban Wi-Fi da bi otkrio i povezao se sa vašim starim Android uređajem. Wi-Fi mora biti uključen, ali ne mora biti povezan s Wi-Fi mrežom.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Nažalost, čini se da ovaj uređaj ne podržava Wi-Fi Direct. Signal koristi Wi-Fi Direct za otkrivanje i povezivanje sa vašim starim Android uređajem. I dalje možete vratiti sigurnosnu kopiju da biste vratili račun sa starog Android uređaja.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly zahtijeva dopuštenje za lokaciju za otkrivanje i povezivanje s vašim starim Android uređajem.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly zahtijeva da su lokacijske usluge omogućene za otkrivanje i povezivanje s vašim starim Android uređajem.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Mollyu je potreban Wi-Fi da bi otkrio i povezao se sa vašim starim Android uređajem. Wi-Fi mora biti uključen, ali ne mora biti povezan s Wi-Fi mrežom.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Nažalost, čini se da ovaj uređaj ne podržava Wi-Fi Direct. Molly koristi Wi-Fi Direct za otkrivanje i povezivanje sa vašim starim Android uređajem. I dalje možete vratiti sigurnosnu kopiju da biste vratili račun sa starog Android uređaja.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Vrati iz sigurnosne kopije</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Došlo je do neočekivane pogreške prilikom pokušaja povezivanja sa vašim starim Android uređajem.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Traženje novog Android uređaja…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal zahtijeva dopuštenje za lokaciju za otkrivanje i povezivanje s vašim novim Android uređajem.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal zahtijeva da su lokacijske usluge omogućene za otkrivanje i povezivanje s vašim novim Android uređajem.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signalu je potreban Wi-Fi da bi otkrio i povezao se sa vašim novim Android uređajem. Wi-Fi mora biti uključen, ali ne mora biti povezan s Wi-Fi mrežom.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Nažalost, čini se da ovaj uređaj ne podržava Wi-Fi Direct. Signal koristi Wi-Fi Direct za otkrivanje i povezivanje sa vašim novim Android uređajem. I dalje možete stvoriti sigurnosnu kopiju da biste vratili račun na novom Android uređaju.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly zahtijeva dopuštenje za lokaciju za otkrivanje i povezivanje s vašim novim Android uređajem.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly zahtijeva da su lokacijske usluge omogućene za otkrivanje i povezivanje s vašim novim Android uređajem.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Mollyu je potreban Wi-Fi da bi otkrio i povezao se sa vašim novim Android uređajem. Wi-Fi mora biti uključen, ali ne mora biti povezan s Wi-Fi mrežom.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Nažalost, čini se da ovaj uređaj ne podržava Wi-Fi Direct. Molly koristi Wi-Fi Direct za otkrivanje i povezivanje sa vašim novim Android uređajem. I dalje možete stvoriti sigurnosnu kopiju da biste vratili račun na novom Android uređaju.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Stvori sigurnosnu kopiju</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Došlo je do neočekivane pogreške prilikom pokušaja povezivanja sa vašim novim Android uređajem.</string>
 
@@ -4375,7 +4519,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Prijenos podataka</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Držite oba uređaja blizu jedan drugog. Ne isključujte nijedan uređaj i držite Signal otvorenim. Prijenosi su end-to-end šifrirani.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Držite oba uređaja blizu jedan drugog. Ne isključujte nijedan uređaj i držite Molly otvorenim. Prijenosi su end-to-end šifrirani.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d poruka do sada…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">Dosad preneseno: %1$s%% poruka</string>
@@ -4389,7 +4533,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Prenesi račun</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Preuzmite Signal na novom Android uređaju</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Preuzmite Molly na novom Android uređaju</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Pritisnite \"Prijenos ili vraćanje računa\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4463,7 +4607,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Bilo tko s ovom poveznicom može vidjeti naziv grupe i sliku kao i poslati zahtjev za pridruživanje. Podijelite s osobama kojima vjerujete.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Bilo tko s ovom poveznicom može vidjeti naziv grupe i sliku kao i pridružiti se grupi. Podijelite s osobama kojima vjerujete.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Podijeli putem Signala</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Podijeli putem Mollya</string>
     <string name="GroupLinkBottomSheet_copy">Kopiraj</string>
     <string name="GroupLinkBottomSheet_qr_code">QR kôd</string>
     <string name="GroupLinkBottomSheet_share">Podijeli</string>
@@ -4663,7 +4807,7 @@
     <string name="payment_info_card_about_mobilecoin">O MobileCoinu</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin je nova digitalna valuta usmjerena na privatnost.</string>
     <string name="payment_info_card_adding_funds">Dodavanje sredstava</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Sredstva za upotrebu u Signalu možete dodati slanjem MobileCoina na adresu novčanika.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Sredstva za upotrebu u Mollyu možete dodati slanjem MobileCoina na adresu novčanika.</string>
     <string name="payment_info_card_cashing_out">Isplata novca</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">MobileCoin možete unovčiti bilo kada na burzi koja podržava MobileCoin. Samo izvršite prijenos na vaš račun na toj burzi.</string>
     <string name="payment_info_card_hide_this_card">Sakrij ovu karticu?</string>
@@ -4684,12 +4828,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Onemogući novčanik</string>
     <string name="DeactivateWalletFragment__your_balance">Vaše stanje</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Prije onemogućavanja plaćanja, preporučujemo vam da sredstva prebacite na drugu adresu novčanika. Ako odlučite ne prenijeti svoja sredstva sada, ona će ostati u vašem novčaniku povezana sa Signalom dok ponovno ne aktivirate plaćanja.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Prije onemogućavanja plaćanja, preporučujemo vam da sredstva prebacite na drugu adresu novčanika. Ako odlučite ne prenijeti svoja sredstva sada, ona će ostati u vašem novčaniku povezana sa Mollyom dok ponovno ne aktivirate plaćanja.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Prenesi preostalo stanje</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Onemogući bez prijenosa</string>
     <string name="DeactivateWalletFragment__deactivate">Onemogući</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Onemogućiti bez prijenosa?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Vaše će stanje ostati u novčaniku povezanim sa Signalom ako odlučite ponovno aktivirati plaćanja.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Vaše će stanje ostati u novčaniku povezanim sa Mollyom ako odlučite ponovno aktivirati plaćanja.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Pogreška prilikom onemogućavanja novčanika.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4988,7 +5132,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licence</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Uvjeti korištenja i Politika privatnosti</string>
-    <string name="HelpFragment__copyright_signal_messenger">Copyright Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Copyright Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Licencirano pod licencom GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -5235,9 +5379,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Izaberi boju</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Podijeli</string>
 
@@ -5279,7 +5420,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Samo administratori mogu slati poruke u ovoj grupi.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Dosegnut je limit</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Ne možete odabrati više od 5 razgovora</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5460,9 +5602,9 @@
     <string name="MySupportPreference__learn_more">Saznajte više</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Ažuriraj Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Ažuriraj Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Ova verzija Signala je zastarjela. Ažurirajte je odmah da biste nastavili koristiti Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Ova verzija Mollya je zastarjela. Ažurirajte je odmah da biste nastavili koristiti Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Ažuriraj</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5471,7 +5613,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Uređaj nije registriran</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Ovaj uređaj više nije registriran. Za nastavak korištenja Signala na ovom uređaju ponovno se registrirajte.</string>
+    <string name="ReregisterSignalDialog__message">Ovaj uređaj više nije registriran. Za nastavak korištenja Mollya na ovom uređaju ponovno se registrirajte.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Ponovno registriraj</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5765,7 +5907,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Otvaranje alata za odabir nije uspjelo.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Kako biste omogućili obavijesti, Signal treba dopuštenje za njihovo prikazivanje.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Kako biste omogućili obavijesti, Molly treba dopuštenje za njihovo prikazivanje.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Uključi</string>
 
@@ -5920,8 +6062,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Još nema odgovora</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Ne možete odgovoriti na ovu priču jer više niste član grupe.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Reakcija na priču</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Reagirate na priču</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Reagira na priču</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Pregledi</string>
     <!-- Label for story replies tab -->
@@ -6572,8 +6716,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Odaberite banku</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Potvrdite svoju donaciju u banci %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Da biste postavili svoju automatsku mjesečnu donaciju, dodirnite \"Nastavi\" i potvrdite naplatu u iznosu od 0,01 € u svojoj banci. Taj će vam iznos automatski biti vraćen, a omogućuje da se naplata vaše mjesečne donacije u iznosu od 5 € izvrši s vašeg računa.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Da biste postavili svoju automatsku mjesečnu donaciju, dodirnite \"Nastavi\" i potvrdite naplatu u iznosu od 0,01 € u svojoj banci. Taj će vam iznos automatski biti vraćen, a omogućuje da se naplata vaše mjesečne donacije u iznosu od %1$s € izvrši s vašeg računa.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Nastavi</string>
 
@@ -7163,6 +7307,56 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Preuzimanje sigurnosne kopije podataka…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Sigurnosno kopiranje medijskih zapisa je isključeno</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Sigurnosno kopiranje medijskih zapisa je otkazano jer nije bilo moguće provesti plaćanje. Imate %1$d dan za preuzimanje svih medijskih zapisa pohranjenih u vašoj sigurnosnoj kopiji. Nakon %1$d dana medijski zapisi u vašoj sigurnosnoj kopiji bit će izbrisani.</item>
+        <item quantity="few">Sigurnosno kopiranje medijskih zapisa je otkazano jer nije bilo moguće provesti plaćanje. Imate %1$d dana za preuzimanje svih medijskih zapisa pohranjenih u vašoj sigurnosnoj kopiji. Nakon %1$d dana medijski zapisi u vašoj sigurnosnoj kopiji bit će izbrisani.</item>
+        <item quantity="many">Sigurnosno kopiranje medijskih zapisa je otkazano jer nije bilo moguće provesti plaćanje. Imate %1$d dana za preuzimanje svih medijskih zapisa pohranjenih u vašoj sigurnosnoj kopiji. Nakon %1$d dana medijski zapisi u vašoj sigurnosnoj kopiji bit će izbrisani.</item>
+        <item quantity="other">Sigurnosno kopiranje medijskih zapisa je otkazano jer nije bilo moguće provesti plaćanje. Imate %1$d dana za preuzimanje svih medijskih zapisa pohranjenih u vašoj sigurnosnoj kopiji. Nakon %1$d dana medijski zapisi u vašoj sigurnosnoj kopiji bit će izbrisani.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">U bilo kojem trenutku možete ponovno početi plaćati sigurnosno kopiranje kako biste sačuvali sve svoje medijske zapise. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Vaši medijski zapisi bit će izbrisani danas</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Sigurnosno kopiranje medijskih zapisa je otkazano jer nije bilo moguće provesti plaćanje. Ovo je vaša posljednja prilika za preuzimanje medijskih zapisa iz sigurnosne kopije prije nego što budu izbrisani.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Nije moguće dovršiti preuzimanje</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Nema dovoljno slobodnog prostora na vašem uređaju. Oslobodite do %1$s prostora da biste preuzeli medijske zapise spremljene u vašoj sigurnosnoj kopiji.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Ako preskočite ovaj korak, medijski zapisi spremljeni u sigurnosnoj kopiji bit će izbrisani za %1$d dan.</item>
+        <item quantity="few">Ako preskočite ovaj korak, medijski zapisi spremljeni u sigurnosnoj kopiji bit će izbrisani za %1$d dana.</item>
+        <item quantity="many">Ako preskočite ovaj korak, medijski zapisi spremljeni u sigurnosnoj kopiji bit će izbrisani za %1$d dana.</item>
+        <item quantity="other">Ako preskočite ovaj korak, medijski zapisi spremljeni u sigurnosnoj kopiji bit će izbrisani za %1$d dana.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Nije moguće provesti plaćanje pretplate za sigurnosno kopiranje</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Nije bilo moguće obraditi mjesečnu naplatu pretplate za sigurnosno kopiranje. Provjerite je li vaš način plaćanja ažuran. Ako nije, ažurirajte ga u aplikaciji Google Pay. Signal će ponovno pokušati obraditi naplatu za nekoliko dana.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Nije moguće dovršiti sigurnosno kopiranje</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Posljednje sigurnosno kopiranje podataka izvršeno je prije %1$d dan(a). Provjerite je li vaš uređaj spojen na Wi-fi i dodirnite \"Izradi sigurnosnu kopiju sada.\" </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Saznajte više</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Preskoči</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Preuzmi medijske zapise</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Kasnije</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Nemoj preuzeti</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Oslobodite %1$s prostora da biste preuzeli svoje medijske zapise.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Kreditna ili debitna kartica</string>
@@ -7176,16 +7370,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Nepoznato</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Povijest plaćanja</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Posljednje sigurnosno kopiranje obavljeno je %1$s u %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">Maksimalan broj poruka u razgovoru</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">Ograničenje broja poruka u razgovoru</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">Brisanje povijesti poruka</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Poruke starije od odabranog vremenskog razdoblja bit će trajno izbrisane.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Poruke koje prelaze odabrana ograničenja bit će trajno izbrisane.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Primijeni ograničenja na povezane uređaje</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Kada su omogućena, ograničenja broja poruka izbrisat će i poruke s povezanih uređaja.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Brisanje je sada sinkronizirano na svim vašim uređajima</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Kada izbrišete poruke ili razgovore, oni će biti izbrisani s ovog uređaja i sa svih povezanih uređaja.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">U redu</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Povijest plaćanja</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Sigurnosna kopija poruka i svih medijskih zapisa</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Pojedinosti o plaćanju</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Postavke sigurnosnog kopiranja</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Datum plaćanja</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Podijeli</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Sigurnosne kopije Signala</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Povijest plaćanja</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Pojedinosti sigurnosne kopije</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Veličina sigurnosne kopije</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Učestalost sigurnosnog kopiranja</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Sigurnosno kopiranje putem mobilne mreže</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Isključi i izbriši sigurnosnu kopiju</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Sigurnosna kopija je izbrisana i sigurnosno kopiranje je isključeno.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Postavke sigurnosnog kopiranja su ažurirane i pretplata je otkazana</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Pretplata je otkazana</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Preuzimanje je dovršeno</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Postavke sigurnosnog kopiranja</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Sigurnosno kopiranje je onemogućeno</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s mjesečno</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Omogući sigurnosne kopije</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Posljednje sigurnosno kopiranje</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s u %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Nikada</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Sigurnosno kopiraj sada</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Isključiti i izbrisati sigurnosne kopije?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Naplata se neće obnoviti. Vaša sigurnosna kopija bit će izbrisana i neće se stvarati nove sigurnosne kopije.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Isključi i izbriši</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Brisanje sigurnosne kopije…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Sigurnosna kopija je izbrisana</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Dodirom na \"Izradi sigurnosnu kopiju sada\""</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Dnevno</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Tjedno</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Mjesečno</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Ručno sigurnosno kopiranje</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Unesite PIN, lozinku ili uzorak svoga uređaja.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Sljedeće</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Promijenite vrstu sigurnosnog kopiranja</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Otkažite pretplatu</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Potvrdite otkazivanje</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Naplata se neće obnoviti. Sigurnosne kopije bit će isključene na kraju vašeg ciklusa naplate. Nakon tog datuma imat ćete 30 dana za preuzimanje medijskih zapisa čiju sigurnosnu kopiju trenutačno izrađujete.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Potvrdi i preuzmi sada</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Potvrdi, ali preuzmi kasnije</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Zadrži pretplatu</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 43b3126ab8..6dc94f45f7 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">A Signal frissít…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">A Molly frissít…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Még nem állítottál be jelmondatot!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Jelmondat letiltása?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Ez véglegesen fel fogja oldani a Signalt és az üzenet értesítéseket.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Ez véglegesen fel fogja oldani a Mollyt és az üzenet értesítéseket.</string>
     <string name="ApplicationPreferencesActivity_disable">Letiltás</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Hiba történt a kiszolgálóhoz történő kapcsolódás során!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">A regisztrációs zárhoz PIN kódra van szükség. A PIN kód letiltásához előbb ki kell kapcsolni a regisztrációs zárat.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Fájl</string>
     <string name="AttachmentKeyboard_contact">Névjegy</string>
     <string name="AttachmentKeyboard_location">Hely</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">A Signalnak engedélyre van szüksége a fotók és videók megjelenítéséhez.</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">A Mollynak engedélyre van szüksége a fotók és videók megjelenítéséhez.</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Hozzáférés engedélyezése</string>
     <string name="AttachmentKeyboard_payment">Fizetés</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Nem található alkalmazás médiafájl kiválasztásához.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">A Signalnak szüksége van a Tárhely engedélyre, hogy fotókat, videókat vagy hangokat csatolhasson, de ez jelenleg meg van tagadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Tárhely\"-t.</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">A Signalnak szüksége van a Névjegyek engedélyre, hogy névjegy információt csatolhasson, de ez jelenleg meg van tagadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Névjegyek\"-et.</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">A Signalnak szüksége van a Helyadatok engedélyre, hogy helyzetet csatolhasson, de ez jelenleg meg van tagadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Helyadatok\"-at.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">A Mollynak szüksége van a Tárhely engedélyre, hogy fotókat, videókat vagy hangokat csatolhasson, de ez jelenleg meg van tagadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Tárhely\"-t.</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">A Mollynak szüksége van a Névjegyek engedélyre, hogy névjegy információt csatolhasson, de ez jelenleg meg van tagadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Névjegyek\"-et.</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">A Mollynak szüksége van a Helyadatok engedélyre, hogy helyzetet csatolhasson, de ez jelenleg meg van tagadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Helyadatok\"-at.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Engedélyezd a helyzetedhez való hozzáférést</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Helyzet elküldéséhez:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Adj hozzáférést a Signalnak a helyzeted elküldéséhez.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Adj hozzáférést a Mollynak a helyzeted elküldéséhez.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">A helyzeted elküldéséhez a Signalnak hozzá kell férnie a helyadatokhoz.</string>
+    <string name="AttachmentManager_signal_needs_location_access">A helyzeted elküldéséhez a Mollynak hozzá kell férnie a helyadatokhoz.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Hozzáférés engedélyezése a tárhelyhez</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Fotók és videók megjelenítése:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">A Signalnak hozzá kell férnie a tárhelyhez a fotók és videók megjelenítéséhez.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">A Mollynak hozzá kell férnie a tárhelyhez a fotók és videók megjelenítéséhez.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s nem aktiválta a Kifizetéseket </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Kamera váltása</string>
     <string name="CameraXFragment_open_gallery_description">Galéria megnyitása</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Hozzáférés engedélyezése</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Engedélyezd a hozzáférést a kamerához és a mikrofonhoz</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Engedélyezd a kamerához való hozzáférést</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Hozzáférés engedélyezése a mikrofonodhoz</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Fotók készítéséhez engedélyezd a Signalnak a kamerához való hozzáférést.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Fotók és videók készítéséhez engedélyezd a Signalnak a kamerához való hozzáférést!</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Fotók és videók készítéséhez engedélyezd a Signalnak a kamerához és a mikrofonhoz való hozzáférést.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Hangos videók rögzítéséhez engedélyezd a Signalnak a mikrofonhoz való hozzáférést.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">QR-kód beolvasásához engedélyezd a Signalnak a kamerához való hozzáférést.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Fotók készítéséhez a Signalnak hozzá kell férnie a kamerához</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">QR-kód beolvasásához a Signalnak hozzá kell férnie a kamerához</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Videó rögzítéséhez a Signalnak hozzá kell férnie a mikrofonhoz</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Fotók rögzítése a Signalban:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Fotók és videók rögzítése a Signalban:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Videók rögzítése hanggal:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR-kódok beolvasása:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Friss kontaktok</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Nincs Signal kontakt</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">A kamera gombbal csak Signal kontaktoknak küldhetsz fotókat. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Nem találod, akit keresel?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Hívd meg egy ismerősödet Signalra!</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Hívd meg egy ismerősödet Mollyra!</string>
     <string name="CameraContacts__menu_search">Keresés</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Nem, köszönöm</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Signal frissítése</string>
+    <string name="ClientDeprecatedActivity_update_signal">Molly frissítése</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Az app jelenlegi verziója elavult. Üzenetek küldése és fogadása előtt frissítened újabb verzióra.</string>
     <string name="ClientDeprecatedActivity_update">Frissítés</string>
     <string name="ClientDeprecatedActivity_dont_update">Nincs frissítés</string>
     <string name="ClientDeprecatedActivity_warning">Figyelmeztetés</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">A Signal általad használt verziója elavult. Megtekintheted a beszélgetés-előzményeket, de a frissítésig nem fogsz tudni üzeneteket küldeni és fogadni.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">A Molly általad használt verziója elavult. Megtekintheted a beszélgetés-előzményeket, de a frissítésig nem fogsz tudni üzeneteket küldeni és fogadni.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Nem található böngésző.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Üzenet %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly hanghívás %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly videohívás %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal üzenet</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Üzenet küldése</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Váltsunk Signalra: %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Váltsunk Mollyra: %1$s</string>
     <string name="ConversationActivity_specify_recipient">Kérlek válassz egy kontaktot</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">A melléklet mérete meghaladja az adott típushoz tartozó mérethatárt.</string>
     <string name="ConversationActivity_unable_to_record_audio">Nem lehet hangot rögzíteni!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Hangüzenetek küldéséhez:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Hangüzenetek küldéséhez adj hozzáférést a Signalnak a mikrofonodhoz.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Hangüzenetek küldéséhez adj hozzáférést a Mollynak a mikrofonodhoz.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Hangüzenet rögzítéséhez a Signalnak hozzá kell férnie a mikrofonhoz.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">A Signalnak szüksége van a Mikrofon engedélyre, hogy hangüzeneteket küldhessen, de ez jelenleg nincs megadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd az \"Mikrofon\"-t.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Hangüzenet rögzítéséhez a Mollynak hozzá kell férnie a mikrofonhoz.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">A Mollynak szüksége van a Mikrofon engedélyre, hogy hangüzeneteket küldhessen, de ez jelenleg nincs megadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd az \"Mikrofon\"-t.</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">A Signalnak szüksége van Mikrofon és Kamera engedélyekre %1$s felhívásához, de ez jelenleg nincs megadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Mikrofon\"-t és a \"Kamera\"-t.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Fotók és videók készítéséhez engedélyezd a Signalnak a kamerához való hozzáférést!</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">A Signalnak szüksége van a Kamera engedélyre, hogy fotót vagy videót készíthessen, de ez jelenleg nincs megadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Kamera\"-t.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">A Signalnak szüksége van Kamera engedélyekre fotók és videók készítéséhez</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">A Mollynak szüksége van Mikrofon és Kamera engedélyekre %1$s felhívásához, de ez jelenleg nincs megadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Mikrofon\"-t és a \"Kamera\"-t.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Fotók és videók készítéséhez engedélyezd a Mollynak a kamerához való hozzáférést!</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">A Mollynak szüksége van a Kamera engedélyre, hogy fotót vagy videót készíthessen, de ez jelenleg nincs megadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Kamera\"-t.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">A Mollynak szüksége van Kamera engedélyekre fotók és videók készítéséhez</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Engedélyezd a mikrofon-hozzáférést, hogy a videóhoz hangot is lehessen rögzíteni</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">A Signalnak szüksége van mikrofon-hozzáférési engedélyre, de ez jelenleg meg van tagadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Mikrofon\"-t, valamint a \"Kamera\"-t.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">A Signalnak mikrofon-hozzáférési engedélyre van szüksége videók rögzítéséhez.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">A Mollynak szüksége van mikrofon-hozzáférési engedélyre, de ez jelenleg meg van tagadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Mikrofon\"-t, valamint a \"Kamera\"-t.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">A Mollynak mikrofon-hozzáférési engedélyre van szüksége videók rögzítéséhez.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Nem</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Hívás indításához:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Hívás indításához adj hozzáférést a Signalnak a mikrofonodhoz.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Hívás indításához adj hozzáférést a Mollynak a mikrofonodhoz.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Hívás indításához a Signalnak hozzá kell férnie a mikrofonhoz.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Hívás indításához a Mollynak hozzá kell férnie a mikrofonhoz.</string>
 
 
     <string name="ConversationActivity_join">Csatlakozás</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">A Signal már nem támogatja az SMS-ek küldését. Hívd meg %1$s ismerősöd a Signal-szolgáltatásba, és beszélgessetek itt.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Ez a személy már nem használja a Signalt. Hívd meg őket a Signalba, és beszélgessetek itt.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Ez a személy már nem használja a Mollyt. Hívd meg őket a Mollyba, és beszélgessetek itt.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Meghívás a Signalra</string>
+    <string name="ConversationActivity__invite_to_signal">Meghívás a Mollyra</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Hamarosan ismét kapsz egy emlékeztetőt.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Törlés mindenki számára</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Törlés ezen a készüléken</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Törlés</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Törlés mindenhol</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Ez az üzenet a csevegés minden tagja számára törlésre kerül, ha a Signal legújabb verzióját használják. A többiek számára látható lesz, hogy töröltél egy üzenetet.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Letiltva</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Signal frissítése</string>
+    <string name="ConversationFragment__update_build">Molly frissítése</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Újraregisztrálás a Signalra</string>
+    <string name="ConversationFragment__reregister_signal">Újraregisztrálás a Mollyra</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Visszalépés.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signal megnyitása</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Molly megnyitása</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Már nem ellenőrzött</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Ezzel véglegesen törlöd a kiválasztott csevegést.</item>
         <item quantity="other">Ezzel véglegesen törlöd az összes kiválasztott %1$d csevegést.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Ez véglegesen törölni fogja a kiválasztott csevegést az összes eszközödről.</item>
+        <item quantity="other">Ez véglegesen törölni fogja mind a(z) %1$d kiválasztott csevegést az összes eszközödről.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Törlés</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">A kiválasztott csevegés törlése…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Ki találhat meg a telefonszámom alapján?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Bárki, aki tudja a telefonszámodat, látni fogja, hogy használod a Signalt, és csevegést kezdeményezhet veled.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Bárki, aki tudja a telefonszámodat, látni fogja, hogy használod a Mollyt, és csevegést kezdeményezhet veled.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Senki sem láthatja, hogy használod a Signalt, hacsak nem küldesz valakinek üzenetet, vagy nem folytatsz csevegést valakivel.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Senki sem láthatja, hogy használod a Mollyt, hacsak nem küldesz valakinek üzenetet, vagy nem folytatsz csevegést valakivel.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Visszaállítás biztonsági mentésből?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Ellenőrzi, hogy a biztonsági mentés jelmondata megfelelő-e</string>
     <string name="BackupsPreferenceFragment__turn_on">Bekapcsolás</string>
     <string name="BackupsPreferenceFragment__turn_off">Kikapcsolás</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Egy biztonsági mentés visszaállításához először is telepítsd a Signalt! Nyisd meg az alkalmazást, koppints a \"Biztonsági mentés visszaállítása\" feliratra, majd keresd ki a biztonsági mentést tartalmazó fájlt! %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Egy biztonsági mentés visszaállításához először is telepítsd a Mollyt! Nyisd meg az alkalmazást, koppints a \"Biztonsági mentés visszaállítása\" feliratra, majd keresd ki a biztonsági mentést tartalmazó fájlt! %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Tudj meg többet!</string>
     <string name="BackupsPreferenceFragment__in_progress">Folyamatban…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d eddig…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% eddig…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">A Signalnak külső tárhely engedélyre van szüksége ahhoz, hogy biztonsági mentést hozzon létre, de ez jelenleg meg van tagadva. Kérlek menj az alkalmazás-beállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Tárhely\"-t.</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">A Mollynak külső tárhely engedélyre van szüksége ahhoz, hogy biztonsági mentést hozzon létre, de ez jelenleg meg van tagadva. Kérlek menj az alkalmazás-beállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Tárhely\"-t.</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Állítsd be a biztonsági mentés idejét</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">A munkamenet alaphelyzetbe állt</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">A Signal végpontok közti titkosítást használ, és nagy ritkán újra be kell állítania a két végpont közti adatkapcsolatot. Ennek nincs hatása a biztonságra, de előfordulhat, hogy pont ezalatt nem kaptál meg egy üzenetet ettől a névjegytől. Ilyen esetben azt javasoljuk, hogy kérd meg partneredet az elveszett üzenetek újraküldésére.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">A Molly végpontok közti titkosítást használ, és nagy ritkán újra be kell állítania a két végpont közti adatkapcsolatot. Ennek nincs hatása a biztonságra, de előfordulhat, hogy pont ezalatt nem kaptál meg egy üzenetet ettől a névjegytől. Ilyen esetben azt javasoljuk, hogy kérd meg partneredet az elveszett üzenetek újraküldésére.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">A Signal használata asztali számítógépen vagy iPaden. Üzeneteid szinkronizálódnak a kapcsolt eszközökkel.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Új eszköz összekapcsolása</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Az üzeneteket és a csevegési információkat végpontok közötti titkosítás védi minden eszközön</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">A Signal asztali számítógépen vagy iPaden</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">A kapcsolt eszközökön minden üzenet privát</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">A Molly-üzenetek szinkronizálva vannak a mobiltelefonodon megtalálható Mollylal, miután összekapcsolásra kerültek. A korábbi üzenetek előzményei nem jelennek meg.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">A Molly telepítéséhez a másik eszközödön keresd fel a(z) %1$s weboldalt</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Kapcsolt eszközeim</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Társítás megszüntetése</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s leválasztva</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Eszköz összekapcsolása…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Eszköz jóváhagyva</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Betöltés…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Nincsenek kapcsolt eszközök</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Eszköz összekapcsolásához oldd fel a zárolást</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Szkenneld be az eszközön megjelenített QR-kódot a társításhoz!</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">QR kód beolvasása</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Ezzel az eszközzel beolvashatod az összekapcsolni kívánt eszközön megjelenő QR-kódot</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">OK</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Ez az eszköz a továbbiakban hozzáfér a Signal-csevegéseidhez, a névjegy- és csoportlistádhoz, valamint üzenetet tud küldeni a nevedben.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Fejezd be az összekapcsolást a másik eszközödön</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Fejezd be a Molly összekapcsolását a másik eszközödön.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Készülék társítása sikertelen</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Érvénytelen QR-kód. Ellenőrizd, hogy valóban a társítani kívánt készüléken megjelent QR-kódot olvasod be.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Újra</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Társítás megszüntetése ezzel: \'%1$s\'?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimalizálás hiányzó Play Szolgáltatásokra</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Ez a készülék nem támogatja a Play Szolgáltatásokat. Koppints a rendszer akkumulátor-optimalizációinak letiltásához, ami megakadályozza a Signalt abban, hogy inaktív állapotban is letöltse az üzeneteket.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Ez a készülék nem támogatja a Play Szolgáltatásokat. Koppints a rendszer akkumulátor-optimalizációinak letiltásához, ami megakadályozza a Mollyt abban, hogy inaktív állapotban is letöltse az üzeneteket.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Az általad használt Signal verziója elavult. Üzenetek küldéséhez és fogadásához frissíts most!</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Az általad használt Molly verziója elavult. Üzenetek küldéséhez és fogadásához frissíts most!</string>
     <string name="ExpiredBuildReminder_update_now">Frissítés most</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Megtekintés</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Elhúzódó Signal kommunikációs hiba!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">A Signal nem tudott beregisztrálni a Google Play Szolgáltatásokra. A Signal üzenetek és hívások ezért le lettek tiltva. Kérlek próbálj meg újraregisztrálni a Beállítások &gt; Haladó-ban!</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Elhúzódó Molly kommunikációs hiba!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">A Molly nem tudott beregisztrálni a Google Play Szolgáltatásokra. A Molly üzenetek és hívások ezért le lettek tiltva. Kérlek próbálj meg újraregisztrálni a Beállítások &gt; Haladó-ban!</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">A hibakeresési naplók segítenek diagnosztizálni és kijavítani a problémát, és nem tartalmaznak azonosító információkat.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">A Signal problémába ütközött. Hibakeresési napló küldése?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">A Molly problémába ütközött. Hibakeresési napló küldése?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Az akkumulátor optimalizálása miatt az értesítések késhetnek</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Letilthatod a Signalban az akkumulátoroptimalizálást, hogy az üzenetértesítések ne késsenek.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Letilthatod a Mollyban az akkumulátoroptimalizálást, hogy az üzenetértesítések ne késsenek.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Az akkumulátor optimalizálása miatt az értesítések késhetnek</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Kapcsold ki a Mollyban az akkumulátoroptimalizálást, hogy az üzenetértesítések ne késsenek. Az eszközspecifikus utasítások megtekintéséhez koppints a „Folytatás” gombra.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Nem, köszönöm</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Tovább</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Tovább</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Elvetés</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Nem, köszönöm</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Függőben lévő csoportmeghívók</string>
+    <string name="PendingMembersActivity_pending_group_invites">Kérelmek &amp; meghívók</string>
     <string name="PendingMembersActivity_requests">Kérések</string>
     <string name="PendingMembersActivity_invites">Meghívók</string>
     <string name="PendingMembersActivity_people_you_invited">Általad meghívott személyek</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Mégse</string>
     <string name="InviteActivity_sending">Küldés…</string>
     <string name="InviteActivity_invitations_sent">Meghívók elküldve!</string>
-    <string name="InviteActivity_invite_to_signal">Meghívás a Signalra</string>
+    <string name="InviteActivity_invite_to_signal">Meghívás a Mollyra</string>
     <string name="InviteActivity_send_sms">SMS küldése (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Elküldesz %1$d SMS meghívót?</item>
         <item quantity="other">Elküldesz %1$d db SMS meghívót?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Váltsunk Signalra: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Váltsunk Mollyra: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Úgy néz ki, hogy egy alkalmazásod sincs a megosztás kezeléséhez.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Saját üzenet</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Háttérkapcsolat engedélyezve</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Válaszok</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal hívás létesítése</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly hívás létesítése</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signal hívó szolgáltatás indítása</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">A Signal hívás szolgáltatás leállítása</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Molly hívó szolgáltatás indítása</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">A Molly hívás szolgáltatás leállítása</string>
     <string name="NotificationBarManager__cancel_call">Hívás megszakítása</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Aktiváltad a Kifizetéseket</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s mostantól fogadhat Kifizetéseket</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">A fizetési részletek nem állnak rendelkezésre</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Továbbiakért koppints</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">A fizetési adatok nem állnak rendelkezésre</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">A fizetés részletei nem állnak rendelkezésre, mert az üzeneteidet olyan forrásból állítottuk vissza, amely nem tartalmazta ezt a fizetési előzményt. Ez nincs hatással a tárcaegyenlegedre vagy a korábbi fizetések állapotára.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Hamarosan többé nem fogsz tudni SMS-eket küldeni a Signalból. Hívd meg %1$s ismerősöd a Signal-szolgáltatásba, és beszélgessetek itt.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">A továbbiakban nem küldhetsz SMS-eket a Signal-alkalmazásban. Hívd meg %1$s ismerősöd a Signal-szolgáltatásba, és beszélgessetek itt.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">A továbbiakban nem küldhetsz SMS-eket a Molly-alkalmazásban. Hívd meg %1$s ismerősöd a Molly-szolgáltatásba, és beszélgessetek itt.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Fizetés: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Kifizetés</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Megjelölve kéretlen üzenetként</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Signal eszköz társítása?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Úgy tűnik, hogy egy harmadik féltől származó vonalkódolvasóval próbálsz Signal eszközt társítani. A saját védelmed érdekében kérlek szkenneld újra a kódot Signalon belül!</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">A Signalnak szüksége van a Kamera engedélyre, hogy QR kódot szkennelhessen, de ez jelenleg nincs megadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Kamera\"-t.</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">A Mollynak szüksége van a Kamera engedélyre, hogy QR kódot szkennelhessen, de ez jelenleg nincs megadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Kamera\"-t.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Nem lehet QR kódot szkennelni Kamera hozzáférési engedély nélkül</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Add meg a jelmondatot</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal ikon</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly ikon</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Jelmondat küldése</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Érvénytelen jelmondat!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signal feloldása</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Képernyőzár</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Molly feloldása</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Képernyőzár</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Térkép</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Az üzenetküldés folytatásához ellenőrzés szükséges</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">A Signal hálózatán küldött kéretlen üzenetek megelőzése érdekében kérlek végezd el az alábbi ellenőrzést!</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">A Molly hálózatán küldött kéretlen üzenetek megelőzése érdekében kérlek végezd el az alábbi ellenőrzést!</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Az ellenőrzést követően folytathatod az üzenetküldést. Az összes felfüggesztett üzenetet automatikusan elküldjük.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Történetem</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal-hívás</string>
+    <string name="Recipient_signal_call">Molly-hívás</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Letiltás</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Kicseng…</string>
     <string name="RedPhone_busy">Foglalt</string>
     <string name="RedPhone_recipient_unavailable">A címzett nem elérhető</string>
-    <string name="RedPhone_network_failed">Hálózati hiba!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Hálózati hiba! Kérjük, ellenőrizd a hálózati kapcsolatot, és próbáld újra!</string>
     <string name="RedPhone_number_not_registered">A szám nincs regisztrálva!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Az általad tárcsázott szám nem támogatja a biztonságos hangátvitelt!</string>
     <string name="RedPhone_got_it">Rendben</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Koppintsd ide a videókép bekapcsolásához</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s hívásához a Signalnak hozzá kell férnie kamerádhoz</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s hívásához a Mollynak hozzá kell férnie kamerádhoz</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Hívás…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Újracsatlakozás…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Eltávolítva a hívásból</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Valaki eltávolított téged a hívásból.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Engedélyezd a hozzáférést a kamerához és a mikrofonhoz</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Hozzáférés engedélyezése a mikrofonodhoz</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Engedélyezd a kamerához való hozzáférést</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Hívás indításához vagy híváshoz való csatlakozáshoz adj hozzáférést a Mollynak a kamerádhoz és a mikrofonodhoz.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Hívás indításához vagy híváshoz való csatlakozáshoz adj hozzáférést a Mollynak a mikrofonodhoz.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">A videó engedélyezéséhez adj a Mollynak hozzáférést a kamerádhoz.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">A Mollynak mikrofonengedélyekre van szüksége ahhoz, hogy hívást kezdeményezzen vagy híváshoz csatlakozzon.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">A videó készítéséhez a Mollynak hozzá kell férnie a kamerádhoz</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Hívás indításához vagy csatlakozáshoz:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">A videó engedélyezése:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal hívás</string>
-    <string name="WebRtcCallView__signal_video_call">Signal videóhívás</string>
+    <string name="WebRtcCallView__signal_call">Molly hívás</string>
+    <string name="WebRtcCallView__signal_video_call">Molly videóhívás</string>
     <string name="WebRtcCallView__start_call">Hívás indítása</string>
     <string name="WebRtcCallView__join_call">Belépés a hívásba</string>
     <string name="WebRtcCallView__call_is_full">A hívás betelt</string>
@@ -2028,24 +2132,43 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Leteszed a kezed?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Kéz letétele</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Letétel</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Mégse</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Felemelted a kezed</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Megtekintés</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s felemelte a kezét</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s felemelted a kezed</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s és %2$d felemelte a kezét</item>
         <item quantity="other">%1$s + %2$d felemelte a kezét</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
-        <item quantity="one">%1$s</item>
-        <item quantity="other">%1$s + %2$d</item>
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s felemelte a kezét</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d felemelte a kezét</item>
+        <item quantity="other">%1$s + %2$d felemelte a kezét</item>
+    </plurals>
+
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s +%2$d</item>
+        <item quantity="other">%1$s+%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
+        <item quantity="one">%1$s +%2$d</item>
+        <item quantity="other">%1$s+%2$d</item>
     </plurals>
 
     <!-- An accessibility label for screen readers on a view that can be expanded -->
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">A számod megerősítése érdekében hamarosan egy hívást indítunk a megadott számra.</string>
     <string name="RegistrationActivity_edit_number">Szám szerkesztése</string>
     <string name="RegistrationActivity_missing_google_play_services">Hiányzó Google Play Szolgáltatások</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Ezen a készüléken hiányzik a Google Play Szolgáltatások. Továbbra is használhatod a Signalt, de ez a konfiguráció csökkent megbízhatóságot vagy teljesítményt eredményezhet.\n\nHa nem egy hozzáértő felhasználó vagy, aki egy utángyártott Android ROM-ot futtat, vagy ez egy hibának tűnik neked, akkor kérlek vedd fel a kapcsolatot a probléma megoldása érdekében a support@signal.org -gal.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Ezen a készüléken hiányzik a Google Play Szolgáltatások. Továbbra is használhatod a Mollyt, de ez a konfiguráció csökkent megbízhatóságot vagy teljesítményt eredményezhet.\n\nHa nem egy hozzáértő felhasználó vagy, aki egy utángyártott Android ROM-ot futtat, vagy ez egy hibának tűnik neked, akkor kérlek vedd fel a kapcsolatot a probléma megoldása érdekében a support@molly.im -gal.</string>
     <string name="RegistrationActivity_i_understand">Megértettem</string>
     <string name="RegistrationActivity_play_services_error">Play Szolgáltatások hiba</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">A Google Play Szolgáltatások épp frissítés alatt áll, vagy átmenetileg nem elérhető. Kérlek próbáld újra.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Nem szabványos számformátum</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">A begépelt szám (%1$s) nem tűnik szabványos formátumúnak.\n\nNem erre gondoltál: %2$s ?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Telefonszám formátum</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Telefonszám formátum</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Hívás kérve</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Problémáid vannak a regisztrációval?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Győződj meg róla, hogy telefonod rendelkezik térerővel az SMS vagy a hívás fogadásához\n • Erősítsd meg, hogy fogadhatsz-e hívást a számra\n • Ellenőrizd, hogy helyesen adtad-e meg a telefonszámod.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">További információért kövesd ezeket a hibaelhárítási lépéseket, vagy lépj kapcsolatba az ügyfélszolgálattal</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">További információért, kövesd a(z) %1$s vagy a(z) %2$s lépést</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">ezeket a hibaelhárítási lépéseket</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Hozzáadás a Névjegyzékhez</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Meghívás a Signalra</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Meghívás a Mollyra</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal üzenet</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal hívás</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Hozzáadás a névjegyzékhez</string>
-    <string name="SharedContactView_invite_to_signal">Meghívás a Signalra</string>
+    <string name="SharedContactView_invite_to_signal">Meghívás a Mollyra</string>
     <string name="SharedContactView_message">Signal üzenet</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">A(z) %1$s telefonszám %2$s felhasználóhoz tartozik</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal frissítés</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Megjelent a Signal új verziója. A frissítéshez koppints.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">A Signal frissítése sikertelen</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly frissítés</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Megjelent a Molly új verziója. A frissítéshez koppints.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">A Molly frissítése sikertelen</string>
     <string name="ApkUpdateNotifications_failed_general_body">Később újra megpróbáljuk.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal sikeresen frissítve</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly sikeresen frissítve</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Automatikusan frissítettél a(z) %1$s verzióra.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Signal biztonsági számunk:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Úgy néz ki, egy alkalmazásod sem alkalmas a megosztás kezeléséhez.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">A vágólapon nem található biztonsági szám, amellyel össze lehetne hasonlítani</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">A Signalnak szüksége van a Kamera engedélyre, hogy QR kódot szkennelhessen, de ez jelenleg nincs megadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Kamera\"-t.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">A Mollynak szüksége van a Kamera engedélyre, hogy QR kódot szkennelhessen, de ez jelenleg nincs megadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Kamera\"-t.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Nem lehet QR kódot szkennelni Kamera engedély nélkül</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Ahhoz, hogy megtekinthesd %1$s biztonsági számát, előbb üzenetet kell váltanotok.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Koppints a megnyitáshoz!</string>
-    <string name="KeyCachingService_passphrase_cached">Signal feloldva</string>
-    <string name="KeyCachingService_lock">Signal zárolása</string>
+    <string name="KeyCachingService_passphrase_cached">Molly feloldva</string>
+    <string name="KeyCachingService_lock">Molly zárolása</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Te</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Nem támogatott médiatípus</string>
     <string name="MediaPreviewActivity_draft">Piszkozat</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">A Signalnak szüksége van a Tárhely engedélyre ahhoz, hogy külső tárolóra menthessen, de ez jelenleg nincs megadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Tárhely\"-t.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">A Mollynak szüksége van a Tárhely engedélyre ahhoz, hogy külső tárolóra menthessen, de ez jelenleg nincs megadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Tárhely\"-t.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Nem lehet engedély nélkül menteni a külső tárolóra</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Törlöd az üzenetet?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Ez véglegesen törölni fogja ezt az üzenetet.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Nem sikerült az üzenet kézbesítése.</string>
     <string name="MessageNotifier_error_delivering_message">Hiba történt az üzenet kézbesítése során.</string>
     <string name="MessageNotifier_message_delivery_paused">Üzenetek kézbesítése felfüggesztve</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">A Signal hálózatán történő üzenetküldéshez ellenőrzés szükséges.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">A Molly hálózatán történő üzenetküldéshez ellenőrzés szükséges.</string>
     <string name="MessageNotifier_mark_all_as_read">Összes megjelölése olvasottként</string>
     <string name="MessageNotifier_mark_read">Olvasottnak jelöl</string>
     <string name="MessageNotifier_turn_off_these_notifications">Értesítések kikapcsolása</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Reagált a matricádra: %1$s.</string>
     <string name="MessageNotifier_this_message_was_deleted">Ez az üzenet ki lett törölve.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Kikapcsolod az új kontakt érhető el Signalon értesítést? Újra engedélyezheted a Signal &gt; Beállítások &gt; Értesítések menüpontban.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Kikapcsolod az új kontakt érhető el Mollyon értesítést? Újra engedélyezheted a Molly &gt; Beállítások &gt; Értesítések menüpontban.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">A gyors válasz nem érhető el, ha a Signal zárolva van!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">A gyors válasz nem érhető el, ha a Molly zárolva van!</string>
     <string name="QuickResponseService_problem_sending_message">Probléma lépett fel az üzenet küldése során!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Érvénytelen parancsikon</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Új üzenet</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Felkérés csevegésre</string>
     <string name="SingleRecipientNotificationBuilder_you">Te</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Ez az eszköz már nincs regisztrálva. Ennek valószínűleg az az oka, hogy egy másik eszközön regisztráltad a telefonszámod a Signalon.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Ez az eszköz már nincs regisztrálva. Ennek valószínűleg az az oka, hogy egy másik eszközön regisztráltad a telefonszámod a Mollyon.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Regisztráld újra az eszközt</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">A hívás fogadásához engedélyezd, hogy a Signal hozzáférhessen a mikrofonhoz!</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">A hívás fogadásához engedélyezd, hogy a Molly hozzáférhessen a mikrofonhoz!</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">A videohívás fogadásához engedélyezd, hogy a Signal hozzáférhessen a mikrofonhoz és a kamerához!</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">A Signalnak szüksége van a Mikrofon és Kamera engedélyekre, hogy képes legyen hívások indítására és fogadására, de ez jelenleg nincs megadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Mikrofon\"-t és a \"Kamera\"-t.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">A videohívás fogadásához engedélyezd, hogy a Molly hozzáférhessen a mikrofonhoz és a kamerához!</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">A Mollynak szüksége van a Mikrofon és Kamera engedélyekre, hogy képes legyen hívások indítására és fogadására, de ez jelenleg nincs megadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Mikrofon\"-t és a \"Kamera\"-t.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Fogadva egy társított eszközön.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Elutasítva egy társított eszközön.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Foglalt jelzés egy társított eszközön.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Új jelmondat megismétlése</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Meghívás a Signalra</string>
+    <string name="contact_selection_activity__invite_to_signal">Meghívás a Mollyra</string>
     <string name="contact_selection_activity__new_group">Új csoport</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Névjegyek frissítése</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Hiányzik valaki? Próbáld meg frissíteni</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Keress ismerősöket a Signalban</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Engedélyezd a névjegyeidhez való hozzáférést</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Továbbiak</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Kontakt fotó</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">A Signalnak szüksége van a Névjegyek engedélyre annak érdekében, hogy megjelenítse a névjegyeid, de ez jelenleg nincs megadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Névjegyek\"-et.</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">A Mollynak szüksége van a Névjegyek engedélyre annak érdekében, hogy megjelenítse a névjegyeid, de ez jelenleg nincs megadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Névjegyek\"-et.</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Hiba történt a névjegyek betöltése során, ellenőrizd a hálózati kapcsolatod</string>
     <string name="ContactSelectionListFragment_username_not_found">A felhasználónév nem található</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"%1$s nem Signal-felhasználó. Kérjük, ellenőrizd a felhasználónevet, majd próbáld újra."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Keresés felhasználónév alapján</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Hozzáférés engedélyezése a névjegyekhez</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Ismerősök keresése a Signalban:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Hozzáférés engedélyezése</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Nem, köszönöm</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Engedélyezd a névjegyeidhez való hozzáférést. A névjegyeid titkosítva vannak, és nem láthatók a Signal számára.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">A Signalnak szüksége van a névjegyeidhez való hozzáférésre annak érdekében, hogy megjelenítse őket.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">A Mollynak szüksége van a névjegyeidhez való hozzáférésre annak érdekében, hogy megjelenítse őket.</string>
     <string name="contact_selection_list_fragment__show_contacts">Kontaktok mutatása</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Eltávolítottad ezt a személyt. Ha újból üzenetet küldesz neki, újra felveszed a listádra.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Opciók</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Frissítés</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Lejátszás … Szünet</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">A Buborék egy Android funkció, amit letilthatsz a Signal-csevegések esetén.</string>
+    <string name="BubbleOptOutTooltip__description">A Buborék egy Android funkció, amit letilthatsz a Molly-csevegések esetén.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Később</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Csoportleírás</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Signal frissítése</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Molly frissítése</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">A Signal jelenlegi verziója lejárt. A Signal használatának folytatásához frissítsd most.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">A Molly jelenlegi verziója lejárt. A Molly használatának folytatásához frissítsd most.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Frissítés</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Lassú</string>
     <string name="preferences__help">Súgó</string>
     <string name="preferences__advanced">Haladó</string>
-    <string name="preferences__donate_to_signal">Adomány a Signal számára</string>
+    <string name="preferences__donate_to_signal">Adomány a Molly számára</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Adatvédelem</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Módosítsd az alkalmazás ikonját és nevét a következőre: „%1$s”</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Az alkalmazás ikonjának és nevének módosításához be kell zárni a Signalt. Az Értesítések mindig az alapértelmezett Signal-ikont és nevet jelenítik meg.</string>
+    <string name="preferences__app_icon_dialog_description">Az alkalmazás ikonjának és nevének módosításához be kell zárni a Mollyt. Az Értesítések mindig az alapértelmezett Molly-ikont és nevet jelenítik meg.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Válassz ki egy alkalmazásikont és -nevet, amely látható lesz a telefon kezdőképernyőjén és a telepített alkalmazásaid listájában. Az Értesítések mindig az alapértelmezett Signal-ikont és nevet jelenítik meg. Tudj meg többet</string>
+    <string name="preferences__app_icon_warning_learn_more">Válassz ki egy alkalmazásikont és -nevet, amely látható lesz a telefon kezdőképernyőjén és a telepített alkalmazásaid listájában. Az Értesítések mindig az alapértelmezett Molly-ikont és nevet jelenítik meg. Tudj meg többet</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Az alkalmazások ikonjai és nevei a kezdőképernyőn és a telepített alkalmazásaid listájában láthatók.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Az Értesítések mindig az alapértelmezett Signal-ikont és nevet jelenítik meg.</string>
+    <string name="preferences__app_icon_notification_warning">Az Értesítések mindig az alapértelmezett Molly-ikont és nevet jelenítik meg.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Tudj meg többet</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Ezzel véglegesen kitörlöd az összes csevegés régi üzeneteit, és csak a(z) %1$s legfrissebb marad meg.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Ez véglegesen törölni fogja eszközödről az üzenet-előzményeket és médiafájlokat.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Ezzel véglegesen törlöd az összes üzenetelőzményt és médiafájlt erről és a kapcsolódó eszközökről.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Biztosan törölni szeretnéd az összes üzenet-előzményt?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">A teljes üzenet-előzmény törlésre kerül. A műveletet nem lehet visszavonni.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">A teljes üzenetelőzmény véglegesen törlésre kerül minden eszközről. Ez a művelet nem vonható vissza.</string>
     <string name="preferences_storage__delete_all_now">Összes törlése most</string>
     <string name="preferences_storage__forever">örökké</string>
     <string name="preferences_storage__one_year">1 év</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Cenzúramegkerülés</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Cenzúramegkerülés</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Ha engedélyezed, a Signal megpróbálja megkerülni a cenzúrát. Ne engedélyezd ezt a funkciót, ha tartózkodási helyeden nem cenzúrázzák a Signalt!</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Ha engedélyezed, a Molly megpróbálja megkerülni a cenzúrát. Ne engedélyezd ezt a funkciót, ha tartózkodási helyeden nem cenzúrázzák a Mollyt!</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Telefonszámod alapján bekapcsoltuk számodra a cenzúramegkerülés-funkciót.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Bemutatjuk a Fizetések szolgáltatást</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Küldj és fogadj MobileCoint a Signallal. A MobileCoin egy új, adatvédelemre fókuszáló digitális pénznem. Aktiváld, hogy kipróbálhasd!</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Küldj és fogadj MobileCoint a Mollylal. A MobileCoin egy új, adatvédelemre fókuszáló digitális pénznem. Aktiváld, hogy kipróbálhasd!</string>
     <string name="PaymentsHomeFragment__activate_payments">Fizetések aktiválása</string>
     <string name="PaymentsHomeFragment__activating_payments">Fizetések aktiválása…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Fizetési fiók helyreállítása</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Részletek</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">A Signal segítségével küldhetsz és fogadhatsz MobileCoint. Minden fizetésre a MobileCoins és a MobileCoin Wallet felhasználási feltételei vonatkoznak. Előfordulhat, hogy hibákba futsz bele, és az elveszett fizetéseket és egyenlegeket nem lehet helyreállítani. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">A Molly segítségével küldhetsz és fogadhatsz MobileCoint. Minden fizetésre a MobileCoins és a MobileCoin Wallet felhasználási feltételei vonatkoznak. Előfordulhat, hogy hibákba futsz bele, és az elveszett fizetéseket és egyenlegeket nem lehet helyreállítani. </string>
     <string name="PaymentsHomeFragment__activate">Bekapcsolás</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoin feltételek megtekintése</string>
-    <string name="PaymentsHomeFragment__payments_not_available">A továbbiakban nem érhető el a Fizetések a Signalban. Az egyenlegedet továbbra is átutalhatod egy tőzsdére, de a továbbiakban már nem fogsz tudni pénzt küldeni vagy fogadni, sem pedig feltölteni az egyenlegedet.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">A továbbiakban nem érhető el a Fizetések a Mollyban. Az egyenlegedet továbbra is átutalhatod egy tőzsdére, de a továbbiakban már nem fogsz tudni pénzt küldeni vagy fogadni, sem pedig feltölteni az egyenlegedet.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Jogosultságok engedélyezése</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">A Signal kérni fogja ezeket az engedélyeket, hogy segítsen üzenetet küldeni az ismerőseinek. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">A Molly kérni fogja ezeket az engedélyeket, hogy segítsen üzenetet küldeni az ismerőseinek. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Értesítések</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Tovább</string>
     <string name="PaymentsTransferFragment__invalid_address">Érvénytelen cím</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Ellenőrizd a címzett tárcájának címét, majd próbáld újra!</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Nem utalhatsz a saját Signal tárcád címére. Add meg egy támogatott tőzsdéhez tartozó tárca címét!</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR kód beolvasásához a Signalnak szüksége van kamera-hozzáférésre.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">A Signalnak Kamera hozzáférésre van szüksége QR kódok beolvasásához. Nyisd meg a beállításokokat, válaszd ki az \"Engedélyek\" menüpontot, majd engedélyezd a \"Kamera\" hozzáférést!</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR kód beolvasásához engedélyezned kell, hogy a Signal hozzáférhessen kamerádhoz.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Nem utalhatsz a saját Molly tárcád címére. Add meg egy támogatott tőzsdéhez tartozó tárca címét!</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR kód beolvasásához a Mollynak szüksége van kamera-hozzáférésre.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">A Mollynak Kamera hozzáférésre van szüksége QR kódok beolvasásához. Nyisd meg a beállításokokat, válaszd ki az \"Engedélyek\" menüpontot, majd engedélyezd a \"Kamera\" hozzáférést!</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR kód beolvasásához engedélyezned kell, hogy a Molly hozzáférhessen kamerádhoz.</string>
     <string name="PaymentsTransferFragment__settings">Beállítások</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Bejövő Signal-hanghívás</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Bejövő Molly-hanghívás</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Bejövő Signal-videóhívás</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Bejövő Molly-videóhívás</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Bejövő Signal csoporthívás</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Bejövő Molly csoporthívás</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Folyamatban lévő Signal-hanghívás</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Folyamatban lévő Molly-hanghívás</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Folyamatban lévő Signal-videohívás</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Folyamatban lévő Molly-videohívás</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Folyamatban lévő Signal-csoporthívás</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Folyamatban lévő Molly-csoporthívás</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Betöltés…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Hitelesítés</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">A biztonsági mentés jelmondat megadása sikeres volt</string>
     <string name="BackupDialog_passphrase_was_not_correct">A jelmondat nem megfelelő</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signal biztonsági mentés létrehozása…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Molly biztonsági mentés létrehozása…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Signal biztonsági mentés ellenőrzése…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Molly biztonsági mentés ellenőrzése…</string>
     <string name="LocalBackupJobApi29_backup_failed">Sikertelen biztonsági mentés</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">A biztonsági mentéseket tartalmazó könyvtár törölve lett, vagy át lett helyezve.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">A biztonsági mentés mérete túl nagy ahhoz, hogy itt legyen létrehozva.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Hívjon (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Kód újraküldése (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Kapcsolatfelvétel a Signal támogatással</string>
-    <string name="RegistrationActivity_code_support_subject">Signal regisztráció - megerősítő kód Androidhoz</string>
+    <string name="RegistrationActivity_contact_signal_support">Kapcsolatfelvétel a Molly támogatással</string>
+    <string name="RegistrationActivity_code_support_subject">Molly regisztráció - megerősítő kód Androidhoz</string>
     <string name="RegistrationActivity_incorrect_code">Helytelen kód</string>
     <string name="BackupUtil_never">Soha</string>
     <string name="BackupUtil_unknown">Ismeretlen</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Telefonszám</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Válaszd ki, hogy ki láthatja a telefonszámod, és ki léphet kapcsolatba veled a Signalon keresztül.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Válaszd ki, hogy ki láthatja a telefonszámod, és ki léphet kapcsolatba veled a Mollyon keresztül.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Ki láthatja a telefonszámomat?</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Túl sokszor próbálkoztál. Kérlek próbáld újra később!</string>
     <string name="RegistrationActivity_error_connecting_to_service">Hiba történt a szolgáltatáshoz történő csatlakozás során</string>
     <string name="preferences_chats__backups">Biztonsági mentések</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal zárolva</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly zárolva</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">KOPPINTS A FELOLDÁSHOZ</string>
     <string name="Recipient_unknown">Ismeretlen</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Hozzá kell férned a régi eszközödhöz.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Visszaállítás biztonsági mentésből</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Üzeneteid helyreállítása egy helyi mentésből. Ha nem állítod őket helyre most, akkor később már nem lesz rá lehetőséged.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Helyi biztonsági mentés visszaállítása</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signal biztonsági mentésének visszaállítása</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Az összes szöveges üzenet + az elmúlt 30 nap médiafájljának visszaállítása</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">További lehetőségek</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Mégse</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Bejelentkezés átvitel nélkül</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Folytatás az üzenetek és a médiafájlok átvitele nélkül</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Nyisd meg a Signalt régi Android készülékeden!</string>
     <string name="NewDeviceTransferInstructions__continue">Folytatás</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Előkészülés a régi Android eszközhöz csatlakozáshoz…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Kis türelmet, hamarosan készen van</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Várakozás a régi Android eszközre a csatlakozáshoz…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">A Signalnak szüksége van hely engedélyekre, hogy felderíthesse és csatlakozhasson régi Android eszközödhöz.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">A Signalnak szüksége van hely szolgáltatások engedélyezésére, hogy felderíthesse és csatlakozhasson régi Android eszközödhöz.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">A Signalnak szüksége Wi-Fi-re, hogy felderíthesse és csatlakozhasson régi Android eszközödhöz. A Wi-Finek bekapcsolva kell lennie, de nem muszáj csatlakozva lennie.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Sajnáljuk, de úgy tűnik, hogy ez az eszköz nem támogatja a Wi-Fi Directet. A Signal Wi-Fi Directet használ, hogy felderítse és csatlakozzon régi Android eszközödhöz. Továbbra is használhatod a biztonsági mentés által létrehozott fájlokat, hogy a fiókodat áthozd régi Android eszközödről.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">A Mollynak szüksége van hely engedélyekre, hogy felderíthesse és csatlakozhasson régi Android eszközödhöz.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">A Mollynak szüksége van hely szolgáltatások engedélyezésére, hogy felderíthesse és csatlakozhasson régi Android eszközödhöz.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">A Mollynak szüksége Wi-Fi-re, hogy felderíthesse és csatlakozhasson régi Android eszközödhöz. A Wi-Finek bekapcsolva kell lennie, de nem muszáj csatlakozva lennie.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Sajnáljuk, de úgy tűnik, hogy ez az eszköz nem támogatja a Wi-Fi Directet. A Molly Wi-Fi Directet használ, hogy felderítse és csatlakozzon régi Android eszközödhöz. Továbbra is használhatod a biztonsági mentés által létrehozott fájlokat, hogy a fiókodat áthozd régi Android eszközödről.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Biztonsági mentés visszaállítása</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Váratlan hiba történt a régi Android eszközödhöz történő csatlakozás során.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Az új Android eszköz keresése…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">A Signalnak helymeghatározás engedélyre van szüksége ahhoz, hogy felderíthesse új Android eszközödet, és csatlakozhasson hozzá.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">A Signalnak a helymeghatározás szolgáltatásra van szüksége ahhoz, hogy felderíthesse új Android eszközödet, és csatlakozhasson hozzá.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">A Signalnak Wi-Fi-re van szüksége, hogy felderíthesse új Android eszközödet és csatlakozhasson hozzá. A Wi-Finek bekapcsolt állapotban kell lennie, de nem muszáj hálózathoz csatlakoznia.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Sajnáljuk, de úgy tűnik, hogy ez az eszköz nem támogatja a Wi-Fi Directet. A Signal Wi-Fi Directet használ, hogy felderítse és csatlakozzon új Android eszközödhöz. Továbbra is használhatod a biztonsági mentés által létrehozott fájlokat, hogy a fiókodat áthozd új Android eszközödre.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">A Mollynak helymeghatározás engedélyre van szüksége ahhoz, hogy felderíthesse új Android eszközödet, és csatlakozhasson hozzá.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">A Mollynak a helymeghatározás szolgáltatásra van szüksége ahhoz, hogy felderíthesse új Android eszközödet, és csatlakozhasson hozzá.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">A Mollynak Wi-Fi-re van szüksége, hogy felderíthesse új Android eszközödet és csatlakozhasson hozzá. A Wi-Finek bekapcsolt állapotban kell lennie, de nem muszáj hálózathoz csatlakoznia.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Sajnáljuk, de úgy tűnik, hogy ez az eszköz nem támogatja a Wi-Fi Directet. A Molly Wi-Fi Directet használ, hogy felderítse és csatlakozzon új Android eszközödhöz. Továbbra is használhatod a biztonsági mentés által létrehozott fájlokat, hogy a fiókodat áthozd új Android eszközödre.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Biztonsági mentés létrehozása</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Váratlan hiba történt az új Android eszközödhöz történő csatlakozás során.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Adat áttöltése</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Tartsd a két eszközt egymás közelében. Ne kapcsold ki egyik eszközt sem, és tartsd a Signalt nyitva. Az adatvitel végpontok közti titkosítással védett.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Tartsd a két eszközt egymás közelében. Ne kapcsold ki egyik eszközt sem, és tartsd a Mollyt nyitva. Az adatvitel végpontok közti titkosítással védett.</string>
     <string name="DeviceTransfer__d_messages_so_far">Eddig %1$d db üzenet…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">Eddig %1$s%% üzenet…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Fiók átvitele</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Töltsd le a Signalt új Android eszközödre</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Töltsd le a Mollyt új Android eszközödre</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Koppints a \"Fiók átvitele vagy helyreállítása\" opcióra!"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Ezzel a hivatkozással bárki megtekintheti a csoport nevét, a tagok listáját, valamint csatlakozási kérelmet nyújthat be. Csak olyan személyekkel oszd meg, akikben megbízol.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Ezzel a hivatkozással bárki megtekintheti a csoport nevét, a tagok listáját, valamint csatlakozhat a csoporthoz. Csak olyan személyekkel oszd meg, akikben megbízol.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Megosztás Signallal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Megosztás Mollylal</string>
     <string name="GroupLinkBottomSheet_copy">Másolás</string>
     <string name="GroupLinkBottomSheet_qr_code">QR kód</string>
     <string name="GroupLinkBottomSheet_share">Megosztás</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">A MobileCoin-ról</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">A MobileCoin egy új, adatvédelemre fókuszáló digitális pénznem.</string>
     <string name="payment_info_card_adding_funds">Feltöltés</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">A Signalban történő költekezéshez küldj MobileCoin-t a pénztárcád címére!</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">A Mollyban történő költekezéshez küldj MobileCoin-t a pénztárcád címére!</string>
     <string name="payment_info_card_cashing_out">Pénzkivét</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Bármikor hozzájuthatsz MobileCoin egyenlegedhez egy olyan tőzsde használatával, amely támogatja a MobileCoint. Egyszerűen indíts egy utalást a tőzsdéhez tartozó tárcád címére.</string>
     <string name="payment_info_card_hide_this_card">Elrejtsük ezt a kártyát?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Tárca kikapcsolása</string>
     <string name="DeactivateWalletFragment__your_balance">Egyenleged</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">A fizetések kikapcsolása előtt javasolt a pénzösszegeidet egy másik tárca címére átutalni. Ha mégis úgy döntesz, hogy most nem utalod át az egyenleged, az továbbra is a Signalhoz kapcsolt tárcádban lesz. A fizetések újraaktiválásakor az egyenleg újra elérhető lesz.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">A fizetések kikapcsolása előtt javasolt a pénzösszegeidet egy másik tárca címére átutalni. Ha mégis úgy döntesz, hogy most nem utalod át az egyenleged, az továbbra is a Mollyhoz kapcsolt tárcádban lesz. A fizetések újraaktiválásakor az egyenleg újra elérhető lesz.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Maradék egyenleg átutalása</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Kikapcsolás átutalás nélkül</string>
     <string name="DeactivateWalletFragment__deactivate">Kikapcsolás</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Kikapcsolás átutalás nélkül?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Az egyenleg a Signalhoz kapcsolt tárcádban marad. A fizetések újraaktiválásakor az egyenleged újra elérhető lesz.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Az egyenleg a Mollyhoz kapcsolt tárcádban marad. A fizetések újraaktiválásakor az egyenleged újra elérhető lesz.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Hiba a tárca kikapcsolásakor.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licencek</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Feltételek &amp; Adatvédelmi irányelvek</string>
-    <string name="HelpFragment__copyright_signal_messenger">Copyright Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Copyright Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Licenc: GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Szín választása</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Megosztás</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Csak adminok küldhetnek üzenetet ebbe a csoportba.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Korlát elérve</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Legfeljebb 5 csevegést választhatsz ki</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Tudj meg többet</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Signal frissítése</string>
+    <string name="UpdateSignalExpiredDialog__title">Molly frissítése</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">A Signal jelenlegi verziója lejárt. A Signal használatának folytatásához frissítsd most.</string>
+    <string name="UpdateSignalExpiredDialog__message">A Molly jelenlegi verziója lejárt. A Molly használatának folytatásához frissítsd most.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Frissítés</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Az eszköz nincs regisztrálva</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Ez az eszköz már nincs regisztrálva. Regisztráld újra, hogy továbbra is használhasd a Signalt ezen az eszközön.</string>
+    <string name="ReregisterSignalDialog__message">Ez az eszköz már nincs regisztrálva. Regisztráld újra, hogy továbbra is használhasd a Mollyt ezen az eszközön.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Újraregisztrálás</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Sikertelen tallózás.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Az értesítések engedélyezéséhez a Signalnak engedélyre van szüksége azok megjelenítéséhez.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Az értesítések engedélyezéséhez a Mollynak engedélyre van szüksége azok megjelenítéséhez.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Bekapcsolás</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Még nem érkeztek reakciók</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Nem válaszolhatsz erre a Történetre, mert már nem vagy tagja ennek a csoportnak.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Reagált a Történetre</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Reagáltál a történetre</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Reagált a történetre</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Megtekintések</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Válaszd ki a bankot</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Erősítsd meg az adományod a(z) %1$s banknál</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Az ismétlődő adományozás beállításához koppints a Tovább gombra és erősítsd meg a 0,01 € összegű terhelést a bankodnál. Ez automatikusan visszatérítésre kerül, és lehetővé teszi, hogy a havi 5 € adományodat levonják a számládról.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Az ismétlődő adományozás beállításához koppints a Tovább gombra és erősítsd meg a 0,01 € összegű terhelést a bankodnál. Ez automatikusan visszatérítésre kerül, és lehetővé teszi, hogy a havi %1$s adományodat levonják a számládról.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Tovább</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Biztonsági mentés adatainak letöltése…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">A médiafájlok biztonsági mentése ki van kapcsolva</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">A médiafájlok biztonsági mentésére vonatkozó Signal-előfizetésedet töröltük, mert nem tudtuk feldolgozni a fizetésedet. %1$d napod van a biztonsági mentésben tárolt médiafájlok letöltésére. %1$d nap elteltével a biztonsági mentésben lévő médiafájl törlődik.</item>
+        <item quantity="other">A médiafájlok biztonsági mentésére vonatkozó Signal-csomagodat töröltük, mert nem tudtuk feldolgozni a fizetésedet. %1$d napod van a biztonsági mentésben tárolt médiafájlok letöltésére. %1$d nap elteltével a biztonsági mentésben lévő médiafájl törlődik.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Bármikor újra elkezdhetsz fizetni a biztonsági mentésekért, hogy folytathasd az összes médiafájl biztonsági mentését. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">A médiafájlod ma törlésre kerül</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">A médiafájlok biztonsági mentésére vonatkozó Signal-előfizetésedet töröltük, mert nem tudtuk feldolgozni a tranzakciót. Ez az utolsó lehetőséged arra, hogy letöltsd a biztonsági mentésben lévő médiafájlt, mielőtt törlésre kerül.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">A letöltés nem végezhető el</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Az eszközödön nincs elég szabad hely. Szabadíts fel akár %1$s helyet a biztonsági mentésben tárolt médiafájlok letöltéséhez.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Ha a „Kihagyás” lehetőséget választod, a biztonsági mentésben tárolt médiafájlok %1$d napon belül törlődnek.</item>
+        <item quantity="other">Ha a „Kihagyás” lehetőséget választod, a biztonsági mentésben tárolt médiafájlok %1$d napon belül törlődnek.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Nem sikerült feldolgozni a biztonsági mentésre vonatkozó tranzakciót</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Problémába ütköztünk az ismétlődő havi biztonsági mentésre vonatkozó tranzakció levonása során. Ellenőrizd, hogy a megadott fizetési mód naprakész-e. Ha nem az, frissítsd a Google Pay-jen. A Signal néhány napon belül újra megpróbálja feldolgozni a fizetést.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Nem sikerült elvégezni a biztonsági mentést</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Eszközöd %1$d napja nem végzett biztonsági mentést. Ellenőrizd, hogy az eszközöd csatlakozik-e wifi-hálózathoz, és koppints a „Biztonsági mentés most” lehetőségre. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Tudj meg többet</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Kihagyás</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Médiafájl letöltése most</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Letöltés később</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Nem töltöm le a médiafájlt</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Szabadíts fel %1$s helyet a médiafájlok letöltéséhez.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Hitel- vagy betéti kártya</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Ismeretlen</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Fizetési előzmények</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Az utolsó biztonsági mentés dátuma: %1$s, %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">A kiválasztott időpontnál régebbi üzenetek véglegesen törlődnek.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">A megadott hosszúságot meghaladó üzenetek véglegesen törlődnek.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Korlátozások alkalmazása a kapcsolt eszközökre</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Ha engedélyezve van, a csevegési korlátok a kapcsolt eszközökről is törlik az üzeneteket.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">A törlés mostantól az összes eszközödön szinkronizálva van</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Amikor üzeneteket vagy csevegéseket törölsz, azok a telefonodról és az összes kapcsolt eszközről is törlésre kerülnek.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Fizetési előzmények</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Szöveg és minden médiafájl biztonsági mentése</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Fizetés részletei</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Biztonsági mentés típusa</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Fizetés dátuma</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Megosztás</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">A Signal biztonsági mentései</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Fizetési előzmények</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Biztonsági mentés részletei</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Biztonsági mentés mérete</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Biztonsági mentés gyakorisága</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Biztonsági mentés mobilhálózaton keresztül</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Biztonsági mentés kikapcsolása és törlése</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">A biztonsági mentés törlésre és kikapcsolásra került.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">A biztonsági mentés típusa megváltozott, és az előfizetés törlésre került</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Előfizetés törölve</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">A letöltés kész</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Biztonsági mentés típusa</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Biztonsági mentés kikapcsolva</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/hó</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Biztonsági mentések bekapcsolása</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Utolsó biztonsági mentés</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s ekkor: %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Soha</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Biztonsági mentés készítése</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Biztonsági mentések kikapcsolása és törlése?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">A számládat nem terheljük meg újra. A biztonsági másolat törlődik, és nem jön létre új biztonsági másolat.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Kikapcsolás és törlés</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Biztonsági mentés törlése…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Biztonsági mentés törölve</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"A Mentés most lehetőségre koppintva"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Naponta</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Hetente</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Havonta</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Manuális biztonsági mentés</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Kérjük, add meg az eszköz PIN-kódját, jelszavát vagy mintáját.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Tovább</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Biztonsági mentés típusának módosítása</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Előfizetés megszüntetése</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Törlés megerősítése</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Nem fogjuk újra megterhelni a számládat. A biztonsági mentéseket a számlázási ciklus végén kikapcsoljuk. Ezt a dátumot követően 30 nap áll rendelkezésedre a jelenleg biztonsági mentés alatt álló médiafájlok letöltésére.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Megerősítés és letöltés most</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Megerősítés és letöltés később</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Előfizetés megtartása</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 66d66cda90..5a57550bc8 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal sedang diperbarui…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly sedang diperbarui…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Anda belum mengatur frasa sandi!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Nonaktifkan frasa sandi?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Aksi ini akan membuka kunci Signal dan notifikasi pesan secara permanen.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Aksi ini akan membuka kunci Molly dan notifikasi pesan secara permanen.</string>
     <string name="ApplicationPreferencesActivity_disable">Nonaktifkan</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Gagal menyambung ke peladen!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN dibutuhkan untuk kunci pendaftaran. Untuk menonaktifkan PIN, nonaktifkan kunci pendaftaran dahulu.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Berkas</string>
     <string name="AttachmentKeyboard_contact">Kontak</string>
     <string name="AttachmentKeyboard_location">Lokasi</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal memerlukan izin untuk menampilkan foto dan video Anda</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly memerlukan izin untuk menampilkan foto dan video Anda</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Izinkan Akses</string>
     <string name="AttachmentKeyboard_payment">Pembayaran</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Tidak bisa menemukan aplikasi untuk membuka media yang dipilih.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal memerlukan izin Penyimpanan untuk melampirkan foto, video, atau audio, tetapi saat ini izin ditolak secara permanen. Harap lanjutkan ke menu pengaturan aplikasi, Pilih \"Izin\", dan aktifkan \"Penyimpanan\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal memerlukan izin Kontak untuk melampirkan informasi kontak, tetapi saat ini izin ditolak secara permanen. Harap melanjutkan ke menu pengaturan aplikasi, Pilih \"Izin\", dan aktifkan \"Kontak\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal memerlukan izin Lokasi untuk melampirkan lokasi, tetapi saat ini izin ditolak secara permanen. Harap melanjutkan ke menu pengaturan aplikasi, Pilih \"Izin\", dan aktifkan \"Lokasi\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly memerlukan izin Penyimpanan untuk melampirkan foto, video, atau audio, tetapi saat ini izin ditolak secara permanen. Harap lanjutkan ke menu pengaturan aplikasi, Pilih \"Izin\", dan aktifkan \"Penyimpanan\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly memerlukan izin Kontak untuk melampirkan informasi kontak, tetapi saat ini izin ditolak secara permanen. Harap melanjutkan ke menu pengaturan aplikasi, Pilih \"Izin\", dan aktifkan \"Kontak\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly memerlukan izin Lokasi untuk melampirkan lokasi, tetapi saat ini izin ditolak secara permanen. Harap melanjutkan ke menu pengaturan aplikasi, Pilih \"Izin\", dan aktifkan \"Lokasi\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Izinkan akses ke lokasi Anda</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Untuk mengirim info lokasi Anda:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Beri Signal akses untuk mengirim info lokasi Anda.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Beri Molly akses untuk mengirim info lokasi Anda.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal butuh akses lokasi untuk mengirim info lokasi Anda.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly butuh akses lokasi untuk mengirim info lokasi Anda.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Izinkan akses ke penyimpanan</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Untuk menampilkan foto dan video:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal memerlukan akses penyimpanan untuk menampilkan foto dan video Anda.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly memerlukan akses penyimpanan untuk menampilkan foto dan video Anda.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s belum mengaktifkan Pembayaran </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Ganti kamera</string>
     <string name="CameraXFragment_open_gallery_description">Buka galeri</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Izinkan akses</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Izinkan akses ke kamera dan mikrofon</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Izinkan akses ke kamera</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Izinkan akses ke mikrofon Anda</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Untuk mengambil foto, izinkan Signal mengakses kamera.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Untuk mengambil foto dan video, izinkan Signal mengakses kamera.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Untuk mengambil foto dan video, izinkan Signal mengakses kamera dan mikrofon.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Untuk mengambil video dengan suara, izinkan Signal mengakses mikrofon.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Untuk memindai kode QR, izinkan Signal mengakses kamera.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal butuh akses kamera untuk mengambil foto</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal butuh akses kamera untuk memindai kode QR</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal butuh akses mikrofon untuk mengambil video</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Untuk mengambil foto di Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Untuk mengambil foto dan video di Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Untuk mengambil video dengan suara:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Untuk memindai kode QR:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Kontak-kontak terbaru</string>
@@ -270,7 +271,7 @@
     <string name="CameraContacts_no_signal_contacts">Tidak ada kontak Signal</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Anda hanya dapat menggunakan tombol kamera ini untuk mengirim foto-foto ke kontak Signal. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Tidak dapat menemukan kontak yang Anda cari?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Undang kontak untuk bergabung dengan Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Undang kontak untuk bergabung dengan Molly</string>
     <string name="CameraContacts__menu_search">Pencarian</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -284,12 +285,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Tidak, terima kasih</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Perbarui Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Perbarui Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Versi dari aplikasi ini tidak lagi didukung. Untuk melanjutkan mengirim dan menerima pesan, perbarui ke versi terakhir.</string>
     <string name="ClientDeprecatedActivity_update">Perbarui</string>
     <string name="ClientDeprecatedActivity_dont_update">Jangan Perbarui</string>
     <string name="ClientDeprecatedActivity_warning">Peringatan</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Versi Signal Anda telah kedaluwarsa. Anda dapat melihat riwayat pesan Anda tetapi tidak akan dapat mengirim atau menerima pesan sampai Anda memperbaruinya.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Versi Molly Anda telah kedaluwarsa. Anda dapat melihat riwayat pesan Anda tetapi tidak akan dapat mengirim atau menerima pesan sampai Anda memperbaruinya.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Peramban web tidak ditemukan.</string>
@@ -326,8 +327,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Pesan %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Panggilan Suara Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Panggilan Video Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -419,7 +420,7 @@
     <string name="ConversationActivity_transport_signal">Pesan Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Kirim pesan</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Ayo pindah ke Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Ayo pindah ke Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Silahkan pilih kontak</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Lampiran melebihi batas ukuran untuk tipe pesan yang Anda kirimkan.</string>
     <string name="ConversationActivity_unable_to_record_audio">Tidak bisa merekam audio!</string>
@@ -438,18 +439,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Untuk mengirimkan pesan audio:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Untuk mengirim pesan suara, izinkan Signal mengakses mikrofon Anda.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Untuk mengirim pesan suara, izinkan Molly mengakses mikrofon Anda.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal butuh akses mikrofon untuk merekam pesan suara.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal memerlukan izin Mikrofon untuk mengirim pesan audio, tetapi saat ini izin ditolak secara permanen. Mohon lanjutkan ke pengaturan aplikasi, pilih \"Izin\" dan aktifkan \"Mikrofon\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly butuh akses mikrofon untuk merekam pesan suara.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly memerlukan izin Mikrofon untuk mengirim pesan audio, tetapi saat ini izin ditolak secara permanen. Mohon lanjutkan ke pengaturan aplikasi, pilih \"Izin\" dan aktifkan \"Mikrofon\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal memerlukan izin Mikrofon dan Kamera untuk memanggil %1$s, tetapi saat ini izin ditolak secara permanen. Mohon lanjutkan ke pengaturan aplikasi, pilih \"Izin\" dan aktifkan \"Mikrofon\" serta \"Kamera\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Untuk mengambil foto dan video, izinkan Signal mengakses kamera.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal memerlukan izin Kamera untuk mengambil foto dan video, tetapi saat ini izin ditolak secara permanen. Mohon lanjutkan ke pengaturan aplikasi, pilih \"Izin\" dan aktifkan \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal memerlukan izin Kamera untuk mengambil foto atau video.</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly memerlukan izin Mikrofon dan Kamera untuk memanggil %1$s, tetapi saat ini izin ditolak secara permanen. Mohon lanjutkan ke pengaturan aplikasi, pilih \"Izin\" dan aktifkan \"Mikrofon\" serta \"Kamera\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Untuk mengambil foto dan video, izinkan Molly mengakses kamera.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly memerlukan izin Kamera untuk mengambil foto dan video, tetapi saat ini izin ditolak secara permanen. Mohon lanjutkan ke pengaturan aplikasi, pilih \"Izin\" dan aktifkan \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly memerlukan izin Kamera untuk mengambil foto atau video.</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Aktifkan izin mikrofon untuk mengambil video dengan suara.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal membutuhkan izin mikrofon untuk merekam video, tapi saat ini ditolak. Mohon lanjutkan ke pengaturan aplikasi, pilih \"Izin\", dan aktifkan \"Mikrofon\" serta \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal membutuhkan izin mikrofon untuk merekam video.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly membutuhkan izin mikrofon untuk merekam video, tapi saat ini ditolak. Mohon lanjutkan ke pengaturan aplikasi, pilih \"Izin\", dan aktifkan \"Mikrofon\" serta \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly membutuhkan izin mikrofon untuk merekam video.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
     <string name="ConversationActivity_no">Tidak</string>
@@ -470,9 +471,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Untuk memulai panggilan:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Untuk memulai panggilan, izinkan Signal mengakses mikrofon Anda.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Untuk memulai panggilan, izinkan Molly mengakses mikrofon Anda.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal butuh akses mikrofon untuk memulai panggilan.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly butuh akses mikrofon untuk memulai panggilan.</string>
 
 
     <string name="ConversationActivity_join">Bergabung</string>
@@ -486,9 +487,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Pengiriman pesan SMS tidak lagi didukung di Signal. Undang %1$s ke Signal untuk menyimpan percakapan di sini.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Orang ini sudah tidak menggunakan Signal. Undang dia ke Signal untuk melakukan percakapan di sini.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Orang ini sudah tidak menggunakan Molly. Undang dia ke Molly untuk melakukan percakapan di sini.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Undang ke Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Undang ke Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Anda akan segera diingatkan lagi.</string>
 
@@ -536,6 +537,8 @@
     <string name="ConversationFragment_delete_for_everyone">Hapus untuk semua</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Hapus di perangkat ini</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Hapus</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Hapus di semua perangkat</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Pesan ini akan dihapus untuk semua orang yang ada dalam obrolan jika mereka menggunakan Signal versi terbaru. Mereka akan bisa melihat bahwa Anda telah menghapus sebuah pesan.</string>
@@ -567,13 +570,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Diblokir</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Perbarui Signal</string>
+    <string name="ConversationFragment__update_build">Perbarui Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Daftar ulang Signal</string>
+    <string name="ConversationFragment__reregister_signal">Daftar ulang Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Kembali.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Buka Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Buka Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Sudah tidak terverifikasi</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -636,6 +639,10 @@
     <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
         <item quantity="other">Ini akan menghapus %1$d obrolan terpilih secara permanen.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="other">Ini akan menghapus secara permanen %1$d obrolan terpilih dari semua perangkat Anda.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Menghapus</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="other">Menghapus obrolan terpilih…</item>
@@ -719,9 +726,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Siapa yang bisa menemukan saya dengan nomor telepon?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Siapa pun yang punya nomor telepon Anda akan melihat Anda ada di Signal dan dapat memulai obrolan.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Siapa pun yang punya nomor telepon Anda akan melihat Anda ada di Molly dan dapat memulai obrolan.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Tidak seorang pun bisa melihat Anda di Signal kecuali Anda mengirimi mereka pesan atau sudah pernah mengobrol dengan mereka.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Tidak seorang pun bisa melihat Anda di Molly kecuali Anda mengirimi mereka pesan atau sudah pernah mengobrol dengan mereka.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Pulihkan dari cadangan?</string>
@@ -755,7 +762,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Uji frasa sandi cadangan Anda dan verifikasi kecocokannya</string>
     <string name="BackupsPreferenceFragment__turn_on">Nyalakan</string>
     <string name="BackupsPreferenceFragment__turn_off">Matikan</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Untuk memulihkan sebuah cadangan, pasang ulang Signal. Buka aplikasinya dan ketuk \"Pulihkan cadangan\", lalu arahkan ke berkas cadangan. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Untuk memulihkan sebuah cadangan, pasang ulang Molly. Buka aplikasinya dan ketuk \"Pulihkan cadangan\", lalu arahkan ke berkas cadangan. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Pelajari lebih lanjut</string>
     <string name="BackupsPreferenceFragment__in_progress">Sedang berjalan…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -763,7 +770,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d sejauh ini…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% sejauh ini…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal memerlukan izin penyimpanan eksternal untuk membuat cadangan, tetapi saat ini izin ditolak secara permanen. Harap lanjutkan ke menu pengaturan aplikasi, pilih \"Izin\", dan aktifkan \"Penyimpanan\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly memerlukan izin penyimpanan eksternal untuk membuat cadangan, tetapi saat ini izin ditolak secara permanen. Harap lanjutkan ke menu pengaturan aplikasi, pilih \"Izin\", dan aktifkan \"Penyimpanan\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Atur waktu pencadangan</string>
 
@@ -830,7 +837,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Sesi obrolan disegarkan</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal menggunakan enkripsi end-to-end dan mungkin ada kalanya perlu menyegarkan sesi obrolan Anda. Ini tidak akan berdampak pada keamanan obrolan, tetapi bisa saja ada pesan yang gagal diterima dari kontak ini, dan untuk itu Anda bisa memintanya mengirim ulang.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly menggunakan enkripsi end-to-end dan mungkin ada kalanya perlu menyegarkan sesi obrolan Anda. Ini tidak akan berdampak pada keamanan obrolan, tetapi bisa saja ada pesan yang gagal diterima dari kontak ini, dan untuk itu Anda bisa memintanya mengirim ulang.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Gunakan Signal di Desktop atau iPad. Pesan akan disinkronkan ke perangkat Anda yang terhubung.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Hubungkan perangkat baru</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Pesan dan info obrolan dilindungi dengan enkripsi ujung-ke-ujung di semua perangkat</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal di Desktop atau iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Semua pesan di perangkat terhubung bersifat privat</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Pesan Molly akan disinkronkan di ponsel Anda setelah terhubung. Riwayat pesan Anda sebelumnya tidak akan muncul.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Di perangkat Anda yang lain, buka %1$s untuk menginstal Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Perangkat terhubung saya</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Putus penautan</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s sudah tidak terhubung</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Menghubungkan perangkat …</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Perangkat disetujui</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Memuat …</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Tidak ada perangkat terhubung</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Buka kunci untuk menautkan perangkat</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Pindai kode QR yang ditampilkan di perangkat yang akan dihubungkan.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Pindai kode QR</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Gunakan perangkat ini untuk memindai kode QR yang ditampilkan di perangkat yang ingin Anda hubungkan</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Oke</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Perangkat ini akan dapat melihat grup dan kontak Anda, mengakses obrolan Anda, dan mengirimkan pesan atas nama Anda.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Selesaikan penautan di perangkat Anda yang lain</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Selesaikan penautan Molly ke perangkat Anda yang lain.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Gagal Menghubungkan Perangkat</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Kode QR ini tidak valid. Mohon pastikan Anda memindai kode QR yang ditampilkan di perangkat yang ingin Anda hubungkan.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Coba lagi</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Batalkan tautan \'%1$s\'?</string>
@@ -852,10 +914,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimalkan untuk mengabaikan Play Services</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Perangkat ini tidak mendukung Play Services. Ketuk untuk menonaktifkan pengoptimalan baterai sistem yang mencegah Signal untuk mengambil pesan saat tidak aktif.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Perangkat ini tidak mendukung Play Services. Ketuk untuk menonaktifkan pengoptimalan baterai sistem yang mencegah Molly untuk mengambil pesan saat tidak aktif.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Versi Signal ini telah kedaluwarsa. Perbarui sekarang untuk mengirim dan menerima pesan.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Versi Molly ini telah kedaluwarsa. Perbarui sekarang untuk mengirim dan menerima pesan.</string>
     <string name="ExpiredBuildReminder_update_now">Perbarui sekarang</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -865,8 +927,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Lihat</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Kegagalan komunikasi Signal permanen!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal tidak dapat melakukan registrasi melalui Google Play Services. Fitur Signal seperti pesan dan panggilan dinonaktifkan, mohon registrasi ulang melalui Pengaturan &gt; Lanjutan.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Kegagalan komunikasi Molly permanen!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly tidak dapat melakukan registrasi melalui Google Play Services. Fitur Molly seperti pesan dan panggilan dinonaktifkan, mohon registrasi ulang melalui Pengaturan &gt; Lanjutan.</string>
 
 
     <!-- GiphyActivity -->
@@ -992,20 +1054,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Catatan debug membantu kami mendiagnosis dan memperbaiki masalah, dan tidak berisi informasi identifikasi.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal mengalami masalah. Kirim catatan debug?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly mengalami masalah. Kirim catatan debug?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Notifikasi dapat tertunda karena pengoptimalan baterai</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Anda dapat menonaktifkan pengoptimalan baterai untuk Signal guna memastikan pesan notifikasi tidak tertunda.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Anda dapat menonaktifkan pengoptimalan baterai untuk Molly guna memastikan pesan notifikasi tidak tertunda.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Notifikasi bisa jadi tertunda karena pengoptimalan baterai</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Nonaktifkan pengoptimalan baterai untuk Molly agar notifikasi pesan tidak tertunda. Ketuk \"Lanjutkan\" untuk melihat instruksi spesifik untuk perangkat.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Tidak, terima kasih</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Lanjutkan</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Lanjutkan</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Tutup</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Tidak, terima kasih</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Undangan grup yang tertunda</string>
+    <string name="PendingMembersActivity_pending_group_invites">Permintaan &amp; undangan</string>
     <string name="PendingMembersActivity_requests">Permintaan</string>
     <string name="PendingMembersActivity_invites">Undangan</string>
     <string name="PendingMembersActivity_people_you_invited">Orang yang Anda undang</string>
@@ -1244,12 +1316,12 @@
     <string name="InviteActivity_cancel">Batal</string>
     <string name="InviteActivity_sending">Mengirimkan…</string>
     <string name="InviteActivity_invitations_sent">Undangan terkirim!</string>
-    <string name="InviteActivity_invite_to_signal">Undang ke Signal!</string>
+    <string name="InviteActivity_invite_to_signal">Undang ke Molly!</string>
     <string name="InviteActivity_send_sms">Kirim SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="other">Kirim %1$d undangan SMS?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Ayo pindah ke Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Ayo pindah ke Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Sepertinya Anda tidak memiliki aplikasi untuk berbagi.</string>
 
     <!-- LearnMoreTextView -->
@@ -1263,7 +1335,7 @@
     <string name="LongMessageActivity_your_message">Pesan Anda</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Koneksi belakang layar diaktifkan</string>
 
     <!-- MediaOverviewActivity -->
@@ -1327,10 +1399,10 @@
     <string name="MessageQuotesBottomSheet_replies">Balasan</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Menyiapkan panggilan Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">Menyiapkan panggilan Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Memulai layanan panggilan Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Menghentikan layanan panggilan Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Memulai layanan panggilan Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Menghentikan layanan panggilan Molly</string>
     <string name="NotificationBarManager__cancel_call">Batalkan panggilan</string>
 
     <!-- NotificationsMegaphone -->
@@ -1574,6 +1646,14 @@
     <string name="MessageRecord_you_activated_payments">Anda mengaktifkan Pembayaran</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s sekarang dapat menerima Pembayaran</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Detail pembayaran tidak tersedia</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Ketuk untuk selengkapnya</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Detail pembayaran tidak tersedia</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Detail pembayaran ini tidak tersedia karena pesan Anda dipulihkan dari sumber yang tidak berisi riwayat pembayaran ini. Ini tidak memengaruhi saldo dompet atau status pembayaran Anda sebelumnya.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1628,9 +1708,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Dalam waktu dekat, Anda tidak dapat lagi mengirim pesan SMS dari Signal. Undang %1$s ke Signal untuk menyimpan percakapan di sini.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Anda tidak dapat lagi mengirim pesan SMS di Signal. Undang %1$s ke Signal untuk menyimpan percakapan di sini.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Anda tidak dapat lagi mengirim pesan SMS di Molly. Undang %1$s ke Molly untuk menyimpan percakapan di sini.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Pembayaran: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Pembayaran</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Dilaporkan sebagai spam</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1704,7 +1786,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Hubungkan perangkat Signal?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Sepertinya Anda mencoba untuk menghubungkan perangkat Signal menggunakan pemindai pihak ke-3. Untuk perlindungan Anda, mohon memindai kode lagi menggunakan Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal memerlukan izin Kamera untuk memindai kode QR, tetapi saat ini izin ditolak secara permanen. Silakan lanjut ke pengaturan aplikasi, pilih \"Izin\" dan aktifkan \"Kamera\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly memerlukan izin Kamera untuk memindai kode QR, tetapi saat ini izin ditolak secara permanen. Silakan lanjut ke pengaturan aplikasi, pilih \"Izin\" dan aktifkan \"Kamera\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Tidak bisa memindai kode QR tanpa izin Kamera</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1716,11 +1798,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Masukkan frasa sandi</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Ikon Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Ikon Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Kirim frasa sandi</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Frasa sandi tidak valid!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Buka kunci Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Kunci Layar</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Buka kunci Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Kunci Layar</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Peta</string>
@@ -1786,7 +1868,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Verifikasi untuk melanjutkan bertukar pesan</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Untuk membantu mencegah spam di Signal, mohon selesaikan verifikasi.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Untuk membantu mencegah spam di Molly, mohon selesaikan verifikasi.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Setelah memverifikasi, Anda dapat melanjutkan bertukar pesan. Pesan yang tertunda akan dikirimkan secara otomatis.</string>
 
     <!-- Recipient -->
@@ -1794,7 +1876,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Cerita Saya</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Panggilan Signal</string>
+    <string name="Recipient_signal_call">Panggilan Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Blokir</string>
@@ -1808,7 +1890,8 @@
     <string name="RedPhone_ringing">Berdering…</string>
     <string name="RedPhone_busy">Sibuk</string>
     <string name="RedPhone_recipient_unavailable">Penerima tidak tersedia</string>
-    <string name="RedPhone_network_failed">Jaringan gagal!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Jaringan gagal! Harap periksa koneksi internet dan coba lagi.</string>
     <string name="RedPhone_number_not_registered">Nomor tidak terdaftar!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Nomor yang Anda panggil tidak mendukung panggilan aman!</string>
     <string name="RedPhone_got_it">Mengerti</string>
@@ -1819,8 +1902,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Ketuk di sini untuk menyalakan video Anda</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Untuk menelepon %1$s, Signal memerlukan akses kamera Anda</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Untuk menelepon %1$s, Molly memerlukan akses kamera Anda</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Memanggil…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Menyambungkan ulang…</string>
@@ -1868,10 +1951,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Dihapus dari panggilan</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Seseorang menghapus Anda dari panggilan.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Izinkan akses ke kamera dan mikrofon</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Izinkan akses ke mikrofon</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Izinkan akses ke kamera</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Untuk memulai atau gabung ke panggilan, beri Molly izin ke kamera dan mikrofon Anda.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Untuk memulai atau gabung ke panggilan, beri Molly izin ke mikrofon Anda.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Untuk mengaktifkan video, beri Molly izin ke kamera Anda.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly butuh izin mikrofon untuk memulai atau gabung ke panggilan.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly butuh akses kamera untuk mengaktifkan video Anda</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Untuk memulai atau gabung ke panggilan:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Untuk mengaktifkan video Anda:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Panggilan Signal</string>
-    <string name="WebRtcCallView__signal_video_call">Panggilan Video Signal</string>
+    <string name="WebRtcCallView__signal_call">Panggilan Molly</string>
+    <string name="WebRtcCallView__signal_video_call">Panggilan Video Molly</string>
     <string name="WebRtcCallView__start_call">Mulai Panggilan</string>
     <string name="WebRtcCallView__join_call">Bergabung Panggilan</string>
     <string name="WebRtcCallView__call_is_full">Panggilan penuh</string>
@@ -1956,21 +2059,38 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Turunkan tangan?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Turunkan Tangan</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Turunkan</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Batal</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Anda angkat tangan</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Lihat</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="other">%1$s + %2$d angkat tangan</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s mengangkat tangan</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s + %2$d mengangkat tangan</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s mengangkat tangan</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s + %2$d mengangkat tangan</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
 
@@ -2055,7 +2175,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Anda akan menerima panggilan untuk memverifikasi nomor ini.</string>
     <string name="RegistrationActivity_edit_number">Sunting nomor</string>
     <string name="RegistrationActivity_missing_google_play_services">Google Play Services tidak ditemukan</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Perangkat ini tidak memiliki Google Play Services. Anda tetap dapat menggunakan Signal, namun pengaturan ini bisa mengakibatkan berkurangnya keandalan dan kinerja Signal.\n\nJika Anda bukan pengguna tingkat lanjut, tidak menjalankan Android ROM setelah pembelian, atau yakin yang Anda lihat ini adalah sebuah kekeliruan, mohon menghubungi support@signal.org untuk membantu penyelesaian masalah.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Perangkat ini tidak memiliki Google Play Services. Anda tetap dapat menggunakan Molly, namun pengaturan ini bisa mengakibatkan berkurangnya keandalan dan kinerja Molly.\n\nJika Anda bukan pengguna tingkat lanjut, tidak menjalankan Android ROM setelah pembelian, atau yakin yang Anda lihat ini adalah sebuah kekeliruan, mohon menghubungi support@molly.im untuk membantu penyelesaian masalah.</string>
     <string name="RegistrationActivity_i_understand">Saya mengerti</string>
     <string name="RegistrationActivity_play_services_error">Play Services gagal</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services diperbarui atau untuk sementara tidak tersedia. Silahkan coba lagi.</string>
@@ -2073,7 +2193,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Format nomor tidak umum</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Nomor yang Anda masukkan (%1$s) terlihat bukan format nomor yang umum.\n\nApakah maksud Anda %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Format Nomor Telepon</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Format Nomor Telepon</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Panggilan diminta</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2106,8 +2226,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Ada masalah saat mendaftar?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Pastikan ponsel Anda memiliki sinyal seluler untuk menerima SMS atau panggilan\n • Pastikan Anda dapat menerima panggilan telepon ke nomor tersebut\n • Pastikan Anda telah memasukkan nomor ponsel yang benar.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Untuk informasi selengkapnya, ikuti langkah pemecahan masalah berikut atau Hubungi Dukungan</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Untuk informasi selengkapnya, ikuti %1$s atau %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">langkah pemecahan masalah berikut</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2145,13 +2265,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Tambahkan ke Kontak</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Undang ke Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Undang ke Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Pesan Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Panggilan Signal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Tambahkan ke Kontak</string>
-    <string name="SharedContactView_invite_to_signal">Undang ke Signal</string>
+    <string name="SharedContactView_invite_to_signal">Undang ke Molly</string>
     <string name="SharedContactView_message">Pesan Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2282,11 +2402,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s milik %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Pembaharuan Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal versi baru telah tersedia. Ketuk untuk memperbarui.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal gagal diperbarui</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Pembaharuan Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly versi baru telah tersedia. Ketuk untuk memperbarui.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly gagal diperbarui</string>
     <string name="ApkUpdateNotifications_failed_general_body">Kami akan coba lagi nanti.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal berhasil diperbarui</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly berhasil diperbarui</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Aplikasi secara otomatis diperbarui ke versi %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2356,7 +2476,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Nomor keamanan Signal kami:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Sepertinya Anda tidak memiliki aplikasi untuk berbagi.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Tidak ada nomor keamanan untuk dibandingkan yang ditemukan di papan klip</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal memerlukan izin Kamera untuk memindai kode QR, tetapi saat ini izin ditolak secara permanen. Silakan lanjut ke pengaturan aplikasi, pilih \"Izin\" dan aktifkan \"Kamera\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly memerlukan izin Kamera untuk memindai kode QR, tetapi saat ini izin ditolak secara permanen. Silakan lanjut ke pengaturan aplikasi, pilih \"Izin\" dan aktifkan \"Kamera\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Tidak bisa memindai kode QR tanpa izin Kamera</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Anda harus bertukar pesan terlebih dulu untuk melihat nomor keamanan %1$s.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2386,14 +2506,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Sentuh untuk membuka.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal tidak terkunci</string>
-    <string name="KeyCachingService_lock">Kunci Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly tidak terkunci</string>
+    <string name="KeyCachingService_lock">Kunci Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Anda</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Tipe media tidak didukung</string>
     <string name="MediaPreviewActivity_draft">Draf</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal memerlukan izin Penyimpanan untuk menyimpan di penyimpanan eksternal, tetapi saat ini izin ditolak secara permanen. Harap lanjutkan ke pengaturan aplikasi, pilih \"Izin\" dan aktifkan \"Penyimpanan\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly memerlukan izin Penyimpanan untuk menyimpan di penyimpanan eksternal, tetapi saat ini izin ditolak secara permanen. Harap lanjutkan ke pengaturan aplikasi, pilih \"Izin\" dan aktifkan \"Penyimpanan\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Tidak bisa menyimpan ke penyimpanan eksternal tanpa izin</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Hapus pesan?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Ini akan menghapus pesan secara permanen.</string>
@@ -2435,7 +2555,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Gagal mengirimkan pesan.</string>
     <string name="MessageNotifier_error_delivering_message">Kesalahan dalam mengirimkan pesan.</string>
     <string name="MessageNotifier_message_delivery_paused">Pengiriman pesan ditunda.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifikasi untuk lanjut bertukar pesan di Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifikasi untuk lanjut bertukar pesan di Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Tandai telah dibaca semuanya</string>
     <string name="MessageNotifier_mark_read">Tandai sudah dibaca</string>
     <string name="MessageNotifier_turn_off_these_notifications">Matikan notifikasi ini</string>
@@ -2457,7 +2577,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Menanggapi %1$s pada stiker Anda.</string>
     <string name="MessageNotifier_this_message_was_deleted">Pesan ini telah dihapus.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Matikan notifikasi kontak bergabung Signal? Anda dapat menyalakannya kembali di Signal &gt; Pengaturan &gt; Notifikasi.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Matikan notifikasi kontak bergabung Molly? Anda dapat menyalakannya kembali di Molly &gt; Pengaturan &gt; Notifikasi.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2496,7 +2616,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Tanggapan cepat tidak tersedia ketika Signal sedang dikunci!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Tanggapan cepat tidak tersedia ketika Molly sedang dikunci!</string>
     <string name="QuickResponseService_problem_sending_message">Terjadi masalah saat mengirim pesan!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2516,7 +2636,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Pintasan tidak valid</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Pesan baru</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Permintaan pesan</string>
     <string name="SingleRecipientNotificationBuilder_you">Anda</string>
@@ -2561,7 +2681,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Perangkat ini sudah tidak terdaftar. Hal ini mungkin karena Anda telah mendaftarkan nomor telepon Anda untuk Signal pada perangkat yang berbeda.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Perangkat ini sudah tidak terdaftar. Hal ini mungkin karena Anda telah mendaftarkan nomor telepon Anda untuk Molly pada perangkat yang berbeda.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Daftarkan Ulang Perangkat</string>
 
@@ -2574,10 +2694,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Untuk menjawab panggilan, berikan Signal akses ke mikrofon Anda.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Untuk menjawab panggilan, berikan Molly akses ke mikrofon Anda.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Untuk menjawab panggilan video, beri Signal akses ke mikrofon dan kamera.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal memerlukan izin Mikrofon dan Kamera untuk menerima atau melakukan panggilan, tetapi saat ini izin ditolak secara permanen. Mohon lanjutkan ke pengatuaran aplikasi, pilih \"Izin\" lalu aktifkan \"Mikrofon\" serta \"Kamera\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Untuk menjawab panggilan video, beri Molly akses ke mikrofon dan kamera.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly memerlukan izin Mikrofon dan Kamera untuk menerima atau melakukan panggilan, tetapi saat ini izin ditolak secara permanen. Mohon lanjutkan ke pengatuaran aplikasi, pilih \"Izin\" lalu aktifkan \"Mikrofon\" serta \"Kamera\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Dijawab dari perangkat terhubung.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Ditolak dari perangkat terhubung.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Sibuk di perangkat tersambung.</string>
@@ -2622,16 +2742,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Ulangi frasa sandi baru</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Undang ke Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Undang ke Molly</string>
     <string name="contact_selection_activity__new_group">Grup baru</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Segarkan kontak</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Ada yang belum muncul? Coba segarkan</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Temukan orang yang Anda kenal di Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Izinkan akses ke kontak Anda</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Selanjutnya</string>
 
@@ -2648,7 +2768,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Foto Kontak</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal memerlukan izin Kontak untuk menampilkan daftar kontak Anda, tetapi saat ini izin ditolak secara permanen. Mohon lanjutkan ke pengaturan aplikasi, pilih \"Izin\" dan aktifkan \"Kontak\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly memerlukan izin Kontak untuk menampilkan daftar kontak Anda, tetapi saat ini izin ditolak secara permanen. Mohon lanjutkan ke pengaturan aplikasi, pilih \"Izin\" dan aktifkan \"Kontak\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Kesalahan saat mengambil kontak, periksa koneksi jaringan Anda</string>
     <string name="ContactSelectionListFragment_username_not_found">Nama pengguna tidak ditemukan</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" bukan pengguna Signal. Cek kembali dan coba lagi."</string>
@@ -2665,16 +2785,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Cari menurut nama pengguna</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Izinkan akses ke kontak</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Untuk menemukan orang yang Anda kenal di Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Izinkan akses</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Tidak, terima kasih</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Izinkan akses ke kontak Anda. Kontak Anda dienkripsi dan tidak terlihat oleh layanan Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal memerlukan akses ke daftar kontak Anda supaya dapat menampilkannya.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly memerlukan akses ke daftar kontak Anda supaya dapat menampilkannya.</string>
     <string name="contact_selection_list_fragment__show_contacts">Tampilkan kontak</string>
 
     <!-- contact_selection_list_item -->
@@ -2745,6 +2867,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Anda telah menghapus orang ini, mengirim pesan lagi akan menambahkannya kembali ke daftar Anda.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Opsi</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Perbarui</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Putar … Jeda</string>
@@ -2773,7 +2897,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Bubbles adalah fitur Android yang dapat Anda matikan untuk obrolan Signal.</string>
+    <string name="BubbleOptOutTooltip__description">Bubbles adalah fitur Android yang dapat Anda matikan untuk obrolan Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Nanti saja</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -2934,9 +3058,9 @@
     <string name="EditProfileFragment__group_description">Deskripsi grup</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Perbarui Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Perbarui Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Versi Signal ini sudah kedaluwarsa. Perbarui sekarang untuk terus menggunakan Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Versi Molly ini sudah kedaluwarsa. Perbarui sekarang untuk terus menggunakan Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Perbarui</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3152,7 +3276,7 @@
     <string name="preferences__slow">Lambat</string>
     <string name="preferences__help">Bantuan</string>
     <string name="preferences__advanced">Lanjutan</string>
-    <string name="preferences__donate_to_signal">Donasi ke Signal</string>
+    <string name="preferences__donate_to_signal">Donasi ke Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Privasi</string>
     <!-- Preference label for stories -->
@@ -3189,13 +3313,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Ubah ikon dan nama aplikasi menjadi \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Aplikasi Signal perlu ditutup terlebih dahulu agar ikon dan nama aplikasi dapat berubah. Notifikasi akan selalu menampilkan ikon dan nama default Signal.</string>
+    <string name="preferences__app_icon_dialog_description">Aplikasi Molly perlu ditutup terlebih dahulu agar ikon dan nama aplikasi dapat berubah. Notifikasi akan selalu menampilkan ikon dan nama default Molly.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Pilih ikon dan nama aplikasi, yang akan terlihat di layar beranda dan laci aplikasi ponsel Anda. Notifikasi akan selalu menampilkan ikon dan nama default Signal. Pelajari selengkapnya</string>
+    <string name="preferences__app_icon_warning_learn_more">Pilih ikon dan nama aplikasi, yang akan terlihat di layar beranda dan laci aplikasi ponsel Anda. Notifikasi akan selalu menampilkan ikon dan nama default Molly. Pelajari selengkapnya</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Ikon dan nama aplikasi terlihat di layar beranda dan laci aplikasi.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Notifikasi akan selalu menampilkan ikon dan nama default Signal.</string>
+    <string name="preferences__app_icon_notification_warning">Notifikasi akan selalu menampilkan ikon dan nama default Molly.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Pelajari selengkapnya</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3241,8 +3365,12 @@
         <item quantity="other">Ini akan secara permanen memangkas semua obrolan ke %1$s pesan terbaru.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Ini akan menghapus semua riwayat pesan dan media secara permanen dari perangkat Anda.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Ini akan menghapus secara permanen semua riwayat pesan dan media dari perangkat ini dan perangkat terhubung lainnya.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Yakin ingin menghapus semua riwayat pesan?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Semua riwayat pesan akan dihapus secara permanen. Tindakan ini tidak dapat diurungkan.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Semua riwayat pesan akan dihapus dari semua perangkat secara permanen. Tindakan ini tidak dapat dibatalkan.</string>
     <string name="preferences_storage__delete_all_now">Hapus semua sekarang</string>
     <string name="preferences_storage__forever">Selamanya</string>
     <string name="preferences_storage__one_year">1 tahun</string>
@@ -3278,7 +3406,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Hindari penyensoran</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Hindari penyensoran</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Jika diaktifkan, Signal akan menggagalkan penyensoran. Jangan nonaktifkan fitur ini kecuali Anda berada di lokasi di mana Signal disensor.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Jika diaktifkan, Molly akan menggagalkan penyensoran. Jangan nonaktifkan fitur ini kecuali Anda berada di lokasi di mana Molly disensor.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Pengelabuan Penyensoran telah diaktifkan berdasarkan nomor telepon Anda.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3330,7 +3458,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Memperkenalkan Pembayaran</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Gunakan Signal untuk mengirim dan menerima MobileCoin, mata uang digital yang berfokus pada privasi. Aktifkan integrasi untuk memulainya.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Gunakan Molly untuk mengirim dan menerima MobileCoin, mata uang digital yang berfokus pada privasi. Aktifkan integrasi untuk memulainya.</string>
     <string name="PaymentsHomeFragment__activate_payments">Aktifkan Pembayaran</string>
     <string name="PaymentsHomeFragment__activating_payments">Mengaktifkan pembayaran…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Pulihkan akun pembayaran</string>
@@ -3356,7 +3484,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Pembauaran tidak tersedia di wilayah Anda.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Tidak dapat mengaktifkan pembayaran. Coba lagi nanti.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Nonaktifkan Pembayaran?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Anda tidak akan dapat mengirim dan menerima MobileCoin di Signal jika Anda menonaktifkan pembayaran.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Anda tidak akan dapat mengirim dan menerima MobileCoin di Molly jika Anda menonaktifkan pembayaran.</string>
     <string name="PaymentsHomeFragment__deactivate">Nonaktifkan</string>
     <string name="PaymentsHomeFragment__continue">Lanjut</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Saldo sementara tidak tersedia.</string>
@@ -3365,10 +3493,10 @@
     <string name="PaymentsHomeFragment__details">Detail</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Anda dapat menggunakan Signal untuk mengirim dan menerima MobileCoin. Semua pembayaran tunduk pada Ketentuan Layanan untuk MobileCoins dan MobileCoin Wallet. Anda bisa saja mengalami beberapa masalah, dan pembayaran atau saldo yang mungkin hilang tidak dapat dipulihkan. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Anda dapat menggunakan Molly untuk mengirim dan menerima MobileCoin. Semua pembayaran tunduk pada Ketentuan Layanan untuk MobileCoins dan MobileCoin Wallet. Anda bisa saja mengalami beberapa masalah, dan pembayaran atau saldo yang mungkin hilang tidak dapat dipulihkan. </string>
     <string name="PaymentsHomeFragment__activate">Aktifkan</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Lihat persyaratan MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Pembayaran di Signal tidak lagi tersedia. Anda dapat memindahkan dana ke sebuah exchange namun Anda tidak lagi dapat mengirim dan menerima pembayaran atau menambahkan dana.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Pembayaran di Molly tidak lagi tersedia. Anda dapat memindahkan dana ke sebuah exchange namun Anda tidak lagi dapat mengirim dan menerima pembayaran atau menambahkan dana.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3396,7 +3524,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Berikan Perizinan</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Untuk membantu Anda mengirim pesan kepada orang yang dikenal, Signal akan meminta izin berikut. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Untuk membantu Anda mengirim pesan kepada orang yang dikenal, Molly akan meminta izin berikut. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Notifikasi</string>
     <!-- Notifications permission row description -->
@@ -3484,10 +3612,10 @@
     <string name="PaymentsTransferFragment__next">Berikutnya</string>
     <string name="PaymentsTransferFragment__invalid_address">Alamat salah</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Periksa alamat wallet yang coba Anda kirimkan dan coba lagi.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Anda tidak dapat mentransfer ke alamat wallet Signal Anda sendiri. Masukkan alamat wallet dari akun Anda di sebuah exchange yang didukung.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Untuk memindai kode QR, Signal membutuhkan akses ke kamera.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal membutuhkan perijinan Kamera untuk menangkap kode QR. Pergi ke pengaturan, pilih \"Perijinan\", dan akrifkan \"Kamera\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Untuk memindai kode QR, Signal membutuhkan akses ke kamera.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Anda tidak dapat mentransfer ke alamat wallet Molly Anda sendiri. Masukkan alamat wallet dari akun Anda di sebuah exchange yang didukung.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Untuk memindai kode QR, Molly membutuhkan akses ke kamera.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly membutuhkan perijinan Kamera untuk menangkap kode QR. Pergi ke pengaturan, pilih \"Perijinan\", dan akrifkan \"Kamera\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Untuk memindai kode QR, Molly membutuhkan akses ke kamera.</string>
     <string name="PaymentsTransferFragment__settings">Pengaturan</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3826,17 +3954,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Panggilan suara Signal masuk</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Panggilan suara Molly masuk</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Panggilan video Signal masuk</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Panggilan video Molly masuk</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Panggilan masuk grup Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Panggilan masuk grup Molly</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Panggilan suara Signal berlangsung</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Panggilan suara Molly berlangsung</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Panggilan video Signal berlangsung</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Panggilan video Molly berlangsung</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Panggilan grup Signal berlangsung</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Panggilan grup Molly berlangsung</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Memuat…</string>
@@ -3883,9 +4011,9 @@
     <string name="BackupDialog_verify">Memeriksa</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Anda sukses memasukkan frasa sandi cadangan</string>
     <string name="BackupDialog_passphrase_was_not_correct">Frasa sandi salah</string>
-    <string name="LocalBackupJob_creating_signal_backup">Membuat cadangan Signal…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Membuat cadangan Molly…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Memverifikasi pencadangan Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Memverifikasi pencadangan Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">Cadangan gagal</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Direktori cadangan telah dihapus atau dipindahkan.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Berkas cadangan kamu terlalu besar untuk disimpan pada lokasi ini.</string>
@@ -3900,15 +4028,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Panggil saya (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Kirim Kode Lagi (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Kontak Pusat Bantuan Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Pendaftaran Signal - Kode Verifikasi untuk Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Kontak Pusat Bantuan Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Pendaftaran Molly - Kode Verifikasi untuk Android</string>
     <string name="RegistrationActivity_incorrect_code">Kode Salah</string>
     <string name="BackupUtil_never">Tidak pernah</string>
     <string name="BackupUtil_unknown">Tidak dikenal</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Nomor telepon</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Pilih siapa yang bisa melihat nomor telepon Anda dan siapa yang bisa menghubungi Anda di Signal dengan nomor tersebut.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Pilih siapa yang bisa melihat nomor telepon Anda dan siapa yang bisa menghubungi Anda di Molly dengan nomor tersebut.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Siapa bisa melihat nomor saya</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -3956,7 +4084,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Kamu telah membuat banyak kesalahan, coba lagi nanti.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Gagal menyambung ke layanan</string>
     <string name="preferences_chats__backups">Cadangan</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal terkunci</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly terkunci</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">KETUK UNTUK MEMBUKA</string>
     <string name="Recipient_unknown">Tidak dikenal</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -3987,9 +4115,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Anda memerlukan akses ke perangkat lama Anda.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Pulihkan dari cadangan</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Pulihkan pesan-pesan Anda dari cadangan internal. Jika Anda tidak memulihkannya sekarang, Anda tidak akan dapat melakukannya nanti.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Pulihkan pencadangan lokal</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Pulihkan pencadangan Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Pulihkan semua pesan teks+media Anda 30 hari terakhir</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Opsi lainnya</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Batal</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Masuk tanpa mentransfer</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Lanjutkan tanpa mentransfer pesan dan media Anda</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Buka Signal pada ponsel Android lama Anda.</string>
     <string name="NewDeviceTransferInstructions__continue">Lanjut</string>
@@ -4004,19 +4139,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Menyiapkan untuk menghubungkan ke perangkat Android lama…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Sedang dalam proses, akan siap segera</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Menunggu perangkat Android lama tersambung…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal memerlukan akses ke perijinan lokasi untuk menemukan dan menyambungkan dengan perangkat Android lama Anda.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal memerluhkan layanan lokasi diaktifkan untuk menemukan dan menyambungkan dengan perangkat Android lama Anda.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal memerlukan Wi-Fi untuk menemukan dan menyambungkan dengan perangkat Android lama Anda. Wi-Fi diperukan untuk diaktifkan namun tidak harus tersambung ke jaringan Wi-Fi.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Maaf, sepertinya perangkat ini tidak mendukung Wi-Fi Direct. Signal menggunakan Wi-Fi Direct untuk mencari dan menyambungkan dengan perangkat Android lama Anda. Anda tetap dapat memulihkan cadangan untuk mengembalikan akun dari perangkat Android lama Anda.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly memerlukan akses ke perijinan lokasi untuk menemukan dan menyambungkan dengan perangkat Android lama Anda.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly memerluhkan layanan lokasi diaktifkan untuk menemukan dan menyambungkan dengan perangkat Android lama Anda.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly memerlukan Wi-Fi untuk menemukan dan menyambungkan dengan perangkat Android lama Anda. Wi-Fi diperukan untuk diaktifkan namun tidak harus tersambung ke jaringan Wi-Fi.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Maaf, sepertinya perangkat ini tidak mendukung Wi-Fi Direct. Molly menggunakan Wi-Fi Direct untuk mencari dan menyambungkan dengan perangkat Android lama Anda. Anda tetap dapat memulihkan cadangan untuk mengembalikan akun dari perangkat Android lama Anda.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Pulihkan cadangan</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Kesalahan tidak terduga terjadi saat mencoba menyambungkan ke perangkat Android lama Anda.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Mencari perangkat Android baru…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal memerlukan akses ke perijinan lokasi untuk menemukan dan menyambungkan dengan perangkat Android baru Anda.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal memerluhkan layanan lokasi diaktifkan untuk menemukan dan menyambungkan dengan perangkat Android baru Anda.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal memerlukan Wi-Fi untuk menemukan dan menyambungkan dengan perangkat Android baru Anda. Wi-Fi diperukan untuk diaktifkan namun tidak harus tersambung ke jaringan Wi-Fi.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Maaf, sepertinya perangkat ini tidak mendukung Wi-Fi Direct. Signal menggunakan Wi-Fi Direct untuk mencari dan menyambungkan dengan perangkat Android baru Anda. Anda tetap dapat memulihkan cadangan untuk mengembalikan akun dari perangkat Android baru Anda.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly memerlukan akses ke perijinan lokasi untuk menemukan dan menyambungkan dengan perangkat Android baru Anda.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly memerluhkan layanan lokasi diaktifkan untuk menemukan dan menyambungkan dengan perangkat Android baru Anda.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly memerlukan Wi-Fi untuk menemukan dan menyambungkan dengan perangkat Android baru Anda. Wi-Fi diperukan untuk diaktifkan namun tidak harus tersambung ke jaringan Wi-Fi.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Maaf, sepertinya perangkat ini tidak mendukung Wi-Fi Direct. Molly menggunakan Wi-Fi Direct untuk mencari dan menyambungkan dengan perangkat Android baru Anda. Anda tetap dapat memulihkan cadangan untuk mengembalikan akun dari perangkat Android baru Anda.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Buat cadangan</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Kesalahan tidak terduga terjadi saat mencoba menyambungkan ke perangkat Android baru Anda.</string>
 
@@ -4057,7 +4192,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Mentransfer data</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Letakkan kedua perangkat berdekatan satu sama lain. Jangan matikan perangkat dan biarkan Signal terbuka. Proses transfer dienkripsi ujung-ke-ujung.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Letakkan kedua perangkat berdekatan satu sama lain. Jangan matikan perangkat dan biarkan Molly terbuka. Proses transfer dienkripsi ujung-ke-ujung.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d pesan sejauh ini…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% pesan sejauh ini…</string>
@@ -4071,7 +4206,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Transfer Akun</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Unduh Signal di perangkat Android baru Anda</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Unduh Molly di perangkat Android baru Anda</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Ketuk pada \"Transfer atau pulihkan akun\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4145,7 +4280,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Siapapun dengan tautan ini dapat melihat nama dan foto grup ini dan dapat meminta untuk bergabung. Bagikan dengan orang yang Anda percaya.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Siapapun dengan tautan ini dapat melihat nama dan foto grup ini dan dapat bergabung dalam grup. Bagikan dengan orang yang Anda percaya.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Bagikan melalui Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Bagikan melalui Molly</string>
     <string name="GroupLinkBottomSheet_copy">Salin</string>
     <string name="GroupLinkBottomSheet_qr_code">Kode QR</string>
     <string name="GroupLinkBottomSheet_share">Bagikan</string>
@@ -4324,7 +4459,7 @@
     <string name="payment_info_card_about_mobilecoin">Tentang MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin adalah mata uang digital yang berfokus pada privasi.</string>
     <string name="payment_info_card_adding_funds">Menambahkan dana</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Anda dapat menambahkan dana untuk digunakan di Signal dengan mengirimkan MobileCoin ke alamat wallet Anda.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Anda dapat menambahkan dana untuk digunakan di Molly dengan mengirimkan MobileCoin ke alamat wallet Anda.</string>
     <string name="payment_info_card_cashing_out">Menarik saldo</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Anda dapat menarik saldo MobileCoin kapan saja pada layanan exchange yang mendukung MobileCoin. Hanya dengan melakukan transfer ke akun Anda di exchange tersebut.</string>
     <string name="payment_info_card_hide_this_card">Sembunyikan kartu ini?</string>
@@ -4345,12 +4480,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Nonaktifkan Wallet</string>
     <string name="DeactivateWalletFragment__your_balance">Saldo Anda</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Disarankan untuk mentransfer dana Anda ke alamat dompet lain sebelum menonaktifkan pembayaran. Jika Anda memilih untuk tidak mentransfernya sekarang, dana Anda akan tetap ada di dompet yang terhubung dengan Signal jika Anda mengaktifkan kembali pembayaran.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Disarankan untuk mentransfer dana Anda ke alamat dompet lain sebelum menonaktifkan pembayaran. Jika Anda memilih untuk tidak mentransfernya sekarang, dana Anda akan tetap ada di dompet yang terhubung dengan Molly jika Anda mengaktifkan kembali pembayaran.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Transfer saldo yang tersisa</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Nonaktifkan tanpa transfer</string>
     <string name="DeactivateWalletFragment__deactivate">Nonaktifkan</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Nonaktifkan tanpa transfer?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Saldo Anda akan tetap ada di dompet yang terhubung dengan Signal jika Anda memilih untuk mengaktifkan kembali pembayaran.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Saldo Anda akan tetap ada di dompet yang terhubung dengan Molly jika Anda memilih untuk mengaktifkan kembali pembayaran.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Gagal menonaktifkan wallet.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4643,7 +4778,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Lisensi</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Istilah &amp; Kebijakan Privasi</string>
-    <string name="HelpFragment__copyright_signal_messenger">Hak Cipta Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Hak Cipta Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Berlisensi GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4881,9 +5016,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Pilih warna</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Bagikan</string>
 
@@ -4913,7 +5045,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Hanya admin yang dapat mengirimkan pesan ke grup ini.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Batas tercapai</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Anda tidak dapat memilih lebih dari 5 obrolan</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5088,9 +5221,9 @@
     <string name="MySupportPreference__learn_more">Pelajari selengkapnya</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Perbarui Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Perbarui Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Versi Signal ini sudah kedaluwarsa. Perbarui sekarang untuk terus menggunakan Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Versi Molly ini sudah kedaluwarsa. Perbarui sekarang untuk terus menggunakan Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Perbarui</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5099,7 +5232,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Perangkat tidak terdaftar</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Perangkat ini sudah tidak terdaftar. Daftar ulang untuk terus menggunakan Signal di perangkat ini.</string>
+    <string name="ReregisterSignalDialog__message">Perangkat ini sudah tidak terdaftar. Daftar ulang untuk terus menggunakan Molly di perangkat ini.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Daftar ulang</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5393,7 +5526,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Gagal membuka pemilih dering.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Untuk mengaktifkan notifikasi, Signal memerlukan izin untuk menampilkannya.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Untuk mengaktifkan notifikasi, Molly memerlukan izin untuk menampilkannya.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Aktifkan</string>
 
@@ -5539,8 +5672,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Belum ada balasan</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Anda tidak dapat membalas cerita ini karena Anda bukan lagi anggota grup ini.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Menanggapi cerita</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Menanggapi cerita</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Menanggapi cerita</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Dilihat</string>
     <!-- Label for story replies tab -->
@@ -6140,8 +6275,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Pilih bank Anda</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Konfirmasi Donasi Anda dengan %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Untuk atur donasi berulang, ketuk lanjutkan untuk konfirmasi biaya €0,01 di bank Anda. Biaya ini otomatis akan dikembalikan kepada Anda dan mengizinkan donasi €5/bulan ditarik dari rekening Anda.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Untuk atur donasi berulang, ketuk lanjutkan untuk konfirmasi biaya €0,01 di bank Anda. Dengan begitu, Anda akan otomatis menerima pengembalian dana dan donasi %1$s/bulan bisa ditarik dari rekening Anda.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Lanjutkan</string>
 
@@ -6710,6 +6845,50 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Mengunduh data cadangan …</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Pencadangan media dinonaktifkan</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="other">Paket pencadangan media di Signal telah dibatalkan karena kami tidak dapat memproses pembayaran Anda. Anda punya waktu %1$d hari untuk mengunduh semua media yang disimpan di cadangan. Setelah %1$d hari, media di cadangan Anda akan dihapus.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Anda dapat kembali membayar paket pencadangan data kapan saja agar bisa lanjut mencadangkan semua media Anda. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Media Anda akan dihapus hari ini</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Paket pencadangan media di Signal telah dibatalkan karena kami tidak dapat memproses pembayaran Anda. Ini kesempatan terakhir Anda untuk mengunduh media di cadangan sebelum dihapus.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Tidak dapat menyelesaikan pengunduhan</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Perangkat Anda tidak punya cukup ruang kosong. Kosongkan ruang sebesar %1$s untuk mengunduh media yang disimpan di cadangan Anda.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="other">Jika Anda memilih \"Lewati\", media di cadangan Anda akan dihapus dalam %1$d hari.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Tidak dapat memproses pembayaran paket pencadangan</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Kami mengalami masalah saat mengumpulkan pembayaran paket pencadangan bulanan Anda. Pastikan metode pembayaran Anda sudah yang terbaru. Jika belum, perbarui di Google Pay. Signal akan mencoba memproses pembayarannya lagi dalam beberapa hari.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Tidak dapat menyelesaikan pencadangan</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Perangkat Anda belum menyelesaikan pencadangan selama hari %1$d. Pastikan perangkat Anda terhubung ke wi-fi dan ketuk \"Cadangkan sekarang\". </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Pelajari selengkapnya</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Lewati</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Unduh media sekarang</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Unduh nanti</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Jangan unduh media</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Kosongkan ruang sebesar %1$s untuk mengunduh media Anda.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Kartu kredit atau debit</string>
@@ -6723,16 +6902,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Tidak dikenal</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Riwayat pembayaran</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Pencadangan terakhir Anda dibuat pada %1$s pukul %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">Batas obrolan</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">Batas pesan</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">Hapus riwayat pesan</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Pesan yang sudah melewati batas waktu yang dipilih akan dihapus permanen.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Pesan yang melebihi batas panjang obrolan yang dipilih akan dihapus permanen.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Terapkan batas untuk perangkat terhubung</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Jika diaktifkan, batas pesan juga akan menghapus pesan di perangkat terhubung.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Penghapusan kini disinkronkan di semua perangkat Anda</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Saat Anda menghapus pesan atau obrolan, penghapusan juga akan dilakukan di ponsel dan perangkat yang terhubung.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OKE</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Riwayat pembayaran</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Pencadangan teks dan semua media</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Detail pembayaran</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Tipe pencadangan</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Tanggal dibayar</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Bagikan</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Pencadangan Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Riwayat pembayaran</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Detail pencadangan</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Ukuran pencadangan</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Frekuensi pencadangan</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Cadangkan dengan data seluler</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Nonaktifkan dan hapus pencadangan</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Pencadangan dihapus dan dinonaktifkan.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Tipe pencadangan diubah dan langganan dibatalkan</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Langganan dibatalkan</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Unduhan selesai</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Tipe pencadangan</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Pencadangan dinonaktifkan</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/bulan</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Aktifkan pencadangan</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Pencadangan terakhir</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s pukul %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Tidak pernah</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Cadangkan sekarang</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Nonaktifkan dan hapus pencadangan?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Anda tidak akan ditagih lagi. Pencadangan Anda akan dihapus dan pencadangan baru tidak akan dibuat.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Nonaktifkan dan hapus</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Menghapus pencadangan …</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Pencadangan dihapus</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Dengan mengetuk \"Cadangkan sekarang\""</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Harian</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Mingguan</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Bulanan</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Cadangkan manual</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Masukkan pin, kata sandi, atau pola kunci perangkat Anda.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Berikutnya</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Ubah tipe pencadangan</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Batalkan Langganan</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Konfirmasi pembatalan</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Anda tidak akan ditagih lagi. Pencadangan akan dinonaktifkan pada akhir siklus penagihan. Setelah tanggal tersebut, Anda memiliki waktu 30 hari untuk mengunduh media yang telah dicadangkan.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Konfirmasi dan unduh sekarang</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Konfirmasi dan unduh nanti</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Tetap langganan</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0aa04ba1ac..2d3f5f911c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal si sta aggiornando…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly si sta aggiornando…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Non hai ancora impostato una password!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Disabilitare la password?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Saranno sbloccati definitivamente Signal e le relative notifiche.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Saranno sbloccati definitivamente Molly e le relative notifiche.</string>
     <string name="ApplicationPreferencesActivity_disable">Disabilita</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Errore durante la connessione al server!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">I PIN sono richiesti per il blocco registrazione. Per disabilitare i PIN, disabilita prima il blocco registrazione.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">File</string>
     <string name="AttachmentKeyboard_contact">Contatto</string>
     <string name="AttachmentKeyboard_location">Posizione</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal ha bisogno della tua autorizzazione per mostrare le tue foto e video</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly ha bisogno della tua autorizzazione per mostrare le tue foto e video</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Consenti accesso</string>
     <string name="AttachmentKeyboard_payment">Pagamento</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Impossibile trovare un\'app per selezionare il file.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal richiede l\'autorizzazione per accedere alla galleria e quindi allegare foto, video o audio, ma è stata negata in modo definitivo. Apri il menu delle impostazioni dell\'app, seleziona \"Autorizzazioni\" e abilita \"Archiviazione\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal richiede l\'autorizzazione per accedere ai contatti e quindi allegare le informazioni di contatto, ma è stata negata in modo definitivo. Apri il menu delle impostazioni dell\'app, seleziona \"Autorizzazioni\" e abilita \"Contatti\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal richiede l\'autorizzazione per accedere alla geolocalizzazione e quindi allegare la posizione, ma è stata negata in modo definitivo. Apri il menu delle impostazioni dell\'app, seleziona \"Autorizzazioni\" e abilita \"Posizione\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly richiede l\'autorizzazione per accedere alla galleria e quindi allegare foto, video o audio, ma è stata negata in modo definitivo. Apri il menu delle impostazioni dell\'app, seleziona \"Autorizzazioni\" e abilita \"Archiviazione\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly richiede l\'autorizzazione per accedere ai contatti e quindi allegare le informazioni di contatto, ma è stata negata in modo definitivo. Apri il menu delle impostazioni dell\'app, seleziona \"Autorizzazioni\" e abilita \"Contatti\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly richiede l\'autorizzazione per accedere alla geolocalizzazione e quindi allegare la posizione, ma è stata negata in modo definitivo. Apri il menu delle impostazioni dell\'app, seleziona \"Autorizzazioni\" e abilita \"Posizione\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Consenti l\'accesso alla tua posizione</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Per inviare la tua posizione:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Autorizza Signal ad accedere alla tua posizione per inviarla.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Autorizza Molly ad accedere alla tua posizione per inviarla.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal deve accedere alla tua posizione per poterla inviare.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly deve accedere alla tua posizione per poterla inviare.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Consenti l\'accesso alla galleria</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Per mostrare foto e video:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal ha bisogno dell\'autorizzazione per accedere alla tua galleria e mostrare foto e video.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly ha bisogno dell\'autorizzazione per accedere alla tua galleria e mostrare foto e video.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s non ha attivato la funzione per i pagamenti </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Cambia camera</string>
     <string name="CameraXFragment_open_gallery_description">Apri galleria</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Consenti accesso</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Consenti l\'accesso a fotocamera e microfono</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Consenti l\'accesso alla tua fotocamera</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Consenti l\'accesso al tuo microfono</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Per scattare delle foto, devi consentire a Signal di accedere alla fotocamera.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Per poter catturare foto e video, permetti a Signal di accedere alla fotocamera del tuo dispositivo</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Per scattare foto e fare video, devi consentire a Signal di accedere a fotocamera e microfono.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Per fare dei video con audio, devi consentire a Signal di accedere al tuo microfono.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Per scansionare un codice QR, consenti a Signal di accedere alla fotocamera.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal deve accedere alla tua fotocamera per scattare foto</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal deve accedere alla tua fotocamera per scansionare i codici QR</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal deve accedere al tuo microfono per fare i video</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Per scattare foto su Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Per scattare foto e fare video su Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Per fare video con audio su Signal:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Per scansionare i codici QR:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Contatti recenti</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Nessun contatto Signal</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Puoi solo usare il bottone camera per inviare foto a contatti Signal. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Non riesci a trovare chi stai cercando?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Invita un contatto a unirsi a Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Invita un contatto a unirsi a Molly</string>
     <string name="CameraContacts__menu_search">Cerca</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">No grazie</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Aggiorna Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Aggiorna Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Questa versione dell\'app non è più supportata. Per continuare a inviare e ricevere messaggi, aggiorna alla versione più recente.</string>
     <string name="ClientDeprecatedActivity_update">Aggiorna</string>
     <string name="ClientDeprecatedActivity_dont_update">Non aggiornare</string>
     <string name="ClientDeprecatedActivity_warning">Attenzione</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">La tua versione di Signal è scaduta. Puoi visualizzare la cronologia dei messaggi, ma non sarai in grado di inviare o ricevere messaggi finché non aggiorni.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">La tua versione di Molly è scaduta. Puoi visualizzare la cronologia dei messaggi, ma non sarai in grado di inviare o ricevere messaggi finché non aggiorni.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Nessun browser web trovato.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Messaggio %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Chiamata vocale di Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Videochiamata di Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Messaggio Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Invia messaggio</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Passiamo a Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Passiamo a Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Scegli un contatto</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">L\'allegato che stai cercando di inviare supera le dimensioni consentite.</string>
     <string name="ConversationActivity_unable_to_record_audio">Impossibile registrare il messaggio!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Per inviare dei messaggi audio:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Per poter inviare dei messaggi vocali, permetti a Signal di accedere al tuo microfono.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Per poter inviare dei messaggi vocali, permetti a Molly di accedere al tuo microfono.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal deve accedere al tuo microfono per poter registrare un messaggio vocale.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal richiede l\'autorizzazione all\'uso del microfono per inviare messaggi audio, ma è stata negata in modo permanente. Si prega di aprire il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Microfono\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly deve accedere al tuo microfono per poter registrare un messaggio vocale.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly richiede l\'autorizzazione all\'uso del microfono per inviare messaggi audio, ma è stata negata in modo permanente. Si prega di aprire il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Microfono\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal richiede le autorizzazioni all\'uso del microfono e della fotocamera per chiamare %1$s, ma sono state negate in modo permanente. Si prega di aprire il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Microfono\" e \"Fotocamera\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Per poter catturare foto e video, permetti a Signal di accedere alla fotocamera del tuo dispositivo</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal richiede l\'autorizzazione all\'uso della fotocamera per scattare foto o registrare video, ma è stata negata in modo permanente. Si prega di aprire il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Fotocamera\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal richiede l\'autorizzazione all\'uso della fotocamera per scattare foto o registrare video</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly richiede le autorizzazioni all\'uso del microfono e della fotocamera per chiamare %1$s, ma sono state negate in modo permanente. Si prega di aprire il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Microfono\" e \"Fotocamera\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Per poter catturare foto e video, permetti a Molly di accedere alla fotocamera del tuo dispositivo</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly richiede l\'autorizzazione all\'uso della fotocamera per scattare foto o registrare video, ma è stata negata in modo permanente. Si prega di aprire il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Fotocamera\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly richiede l\'autorizzazione all\'uso della fotocamera per scattare foto o registrare video</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Abilita l\'autorizzazione all\'uso del microfono per registrare video con audio.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal richiede l\'autorizzazione all\'uso del microfono per registrare video, ma è stata negata. Si prega di aprire il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Microfono\" e \"Fotocamera\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal richiede l\'autorizzazione all\'uso del microfono per registrare video.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly richiede l\'autorizzazione all\'uso del microfono per registrare video, ma è stata negata. Si prega di aprire il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Microfono\" e \"Fotocamera\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly richiede l\'autorizzazione all\'uso del microfono per registrare video.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">No</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Per iniziare una chiamata:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Per iniziare una chiamata, consenti a Signal di accedere al tuo microfono.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Per iniziare una chiamata, consenti a Molly di accedere al tuo microfono.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal deve accedere al tuo microfono per poter iniziare una chiamata.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly deve accedere al tuo microfono per poter iniziare una chiamata.</string>
 
 
     <string name="ConversationActivity_join">Unisciti</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">La messaggistica via SMS non è più supportata su Signal. Invita %1$s su Signal per continuare la conversazione in app.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Questa persona non sta più usando Signal. Invitala su Signal per continuare la conversazione in app.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Questa persona non sta più usando Molly. Invitala su Molly per continuare la conversazione in app.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Invita a Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Invita a Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Te lo ricorderemo fra un po\'.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Elimina per tutti</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Elimina su questo dispositivo</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Elimina</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Elimina su tutti i dispositivi</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Questo messaggio verrà eliminato per tutti i partecipanti alla chat se utilizzano una versione recente di Signal. Potranno vedere che hai eliminato un messaggio.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Richiesta bloccata</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Aggiorna Signal</string>
+    <string name="ConversationFragment__update_build">Aggiorna Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Registra di nuovo Signal</string>
+    <string name="ConversationFragment__reregister_signal">Registra di nuovo Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Torna indietro.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Apri Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Apri Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Non più verificato</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Quest\'azione rimuoverà per sempre la chat selezionata.</item>
         <item quantity="other">Quest\'azione rimuoverà per sempre tutte le %1$d chat selezionate.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Quest\'azione rimuoverà definitivamente la chat selezionata da tutti i tuoi dispositivi.</item>
+        <item quantity="other">Quest\'azione rimuoverà definitivamente le chat selezionate (%1$d) da tutti i tuoi dispositivi.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Eliminazione</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Eliminazione della chat selezionata in corso…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Chi può trovarmi tramite il mio numero di telefono?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Chiunque abbia il tuo numero di telefono può vedere che sei su Signal e iniziare una chat con te.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Chiunque abbia il tuo numero di telefono può vedere che sei su Molly e iniziare una chat con te.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Nessuna persona potrà sapere che sei su Signal, a meno che tu non invii un messaggio (o se avete già una chat in corso).</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Nessuna persona potrà sapere che sei su Molly, a meno che tu non invii un messaggio (o se avete già una chat in corso).</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Ripristinare da backup?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Prova la frase segreta del tuo backup e verifica che corrisponda</string>
     <string name="BackupsPreferenceFragment__turn_on">Attiva</string>
     <string name="BackupsPreferenceFragment__turn_off">Disattiva</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Per ripristinare un backup, installa una nuova copia di Signal. Apri l\'app e tocca \"Ripristina backup\", quindi individua un file di backup. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Per ripristinare un backup, installa una nuova copia di Molly. Apri l\'app e tocca \"Ripristina backup\", quindi individua un file di backup. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Scopri di più</string>
     <string name="BackupsPreferenceFragment__in_progress">In corso…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d finora…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% finora…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal richiede l\'autorizzazione per creare backup in memoria, ma è stata negata in modo permanente. Si prega di continuare con le impostazioni dell\'app, selezionare \"Autorizzazioni\", quindi abilitare \"Archiviazione\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly richiede l\'autorizzazione per creare backup in memoria, ma è stata negata in modo permanente. Si prega di continuare con le impostazioni dell\'app, selezionare \"Autorizzazioni\", quindi abilitare \"Archiviazione\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Imposta orario per il backup</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Sessione di chat aggiornata</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal utilizza la crittografia end-to-end e potrebbe essere necessario aggiornare la tua sessione di chat a volte. Ciò non influisce sulla sicurezza della tua chat, ma potresti aver perso un messaggio da questo contatto e puoi chiedere loro di inviarlo di nuovo.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly utilizza la crittografia end-to-end e potrebbe essere necessario aggiornare la tua sessione di chat a volte. Ciò non influisce sulla sicurezza della tua chat, ma potresti aver perso un messaggio da questo contatto e puoi chiedere loro di inviarlo di nuovo.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Usa Signal su Desktop o iPad. I tuoi messaggi verranno sincronizzati sui tuoi dispositivi collegati.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Collega un nuovo dispositivo</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s I messaggi e le informazioni delle chat sono protetti da una crittografia end-to-end su tutti i dispositivi</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal su Desktop o iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Tutti i messaggi sui dispositivi collegati sono privati</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">I messaggi di Molly vengono sincronizzati con l\'app di Molly sul tuo dispositivo mobile dopo aver effettuato il collegamento. Ricorda che la cronologia dei messaggi precedenti non verrà mostrata.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Sull\'altro dispositivo, visita la pagina %1$s per installare Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">I miei dispositivi collegati</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Scollega</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s scollegato</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Collegamento dispositivo in corso…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Dispositivo approvato</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Caricamento in corso…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Nessun dispositivo collegato</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Sblocca per collegare un dispositivo</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Scansiona il codice QR visualizzato sul dispositivo per collegarlo.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Scansiona codice QR</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Usa questo dispositivo per scansionare il codice QR mostrato sul dispositivo che vuoi collegare</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Ok</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Su questo dispositivo potrai vedere i tuoi gruppi e contatti, accedere alle chat e inviare messaggi a tuo nome.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Completa il collegamento sull\'altro dispositivo</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Completa il collegamento di Molly sull\'altro dispositivo.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Collegamento dispositivo non riuscito</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Questo codice QR non è valido. Assicurati di scansionare il codice QR visualizzato sul dispositivo che desideri collegare.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Riprova</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Scollegare \'%1$s\'?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Ottimizza per la mancanza di Google Play Services</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Questo dispositivo non supporta Google Play Services. Premi per disabilitare l\'ottimizzazione di sistema del consumo della batteria che impedisce a Signal di ricevere messaggi quando è inattivo.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Questo dispositivo non supporta Google Play Services. Premi per disabilitare l\'ottimizzazione di sistema del consumo della batteria che impedisce a Molly di ricevere messaggi quando è inattivo.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Questa versione di Signal è scaduta. Aggiorna ora per inviare e ricevere messaggi.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Questa versione di Molly è scaduta. Aggiorna ora per inviare e ricevere messaggi.</string>
     <string name="ExpiredBuildReminder_update_now">Aggiorna ora</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Mostra</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Comunicazione Signal fallita definitivamente!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal è stato impossibilitato a registrarsi con i sevizi di Google Play. I suoi messaggi e le chiamate sono state disabilitate, si prega di provare e ri-registrare in Impostazioni &gt; Avanzate.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Comunicazione Molly fallita definitivamente!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly è stato impossibilitato a registrarsi con i sevizi di Google Play. I suoi messaggi e le chiamate sono state disabilitate, si prega di provare e ri-registrare in Impostazioni &gt; Avanzate.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">I log di debug ci aiutano a individuare e risolvere il problema. Non preoccuparti, non contengono informazioni identificative o personali.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal ha riscontrato un problema. Vuoi inviarci un log di debug?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly ha riscontrato un problema. Vuoi inviarci un log di debug?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Le notifiche potrebbero subire un rallentamento per via dell\'ottimizzazione della batteria</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Puoi disattivare l\'opzione di ottimizzazione della batteria per evitare che le notifiche dei messaggi di Signal arrivino in ritardo.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Puoi disattivare l\'opzione di ottimizzazione della batteria per evitare che le notifiche dei messaggi di Molly arrivino in ritardo.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Le notifiche potrebbero subire un rallentamento per via dell\'ottimizzazione della batteria</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Disattiva l\'opzione di ottimizzazione della batteria per evitare che le notifiche dei messaggi di Molly arrivino in ritardo. Tocca su \"Continua\" per vedere le istruzioni da seguire a seconda del dispositivo.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">No grazie</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Continua</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Continua</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Chiudi</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">No grazie</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Inviti al gruppo in attesa</string>
+    <string name="PendingMembersActivity_pending_group_invites">Richieste e inviti</string>
     <string name="PendingMembersActivity_requests">Richieste</string>
     <string name="PendingMembersActivity_invites">Inviti</string>
     <string name="PendingMembersActivity_people_you_invited">Persone che hai invitato</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Annulla</string>
     <string name="InviteActivity_sending">Invio in corso…</string>
     <string name="InviteActivity_invitations_sent">Inviti mandati!</string>
-    <string name="InviteActivity_invite_to_signal">Invita su Signal</string>
+    <string name="InviteActivity_invite_to_signal">Invita su Molly</string>
     <string name="InviteActivity_send_sms">Invia SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Mandare %1$d invito via SMS?</item>
         <item quantity="other">Mandare %1$d inviti via SMS?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Passiamo a Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Passiamo a Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Sembra che tu non abbia applicazioni per condividere.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Il tuo messaggio</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Connessione in background attivata</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Risposte</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Preparazione chiamata Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">Preparazione chiamata Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Inizio chiamata su Signal in corso</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Interruzione del servizio di chiamata di Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Inizio chiamata su Molly in corso</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Interruzione del servizio di chiamata di Molly</string>
     <string name="NotificationBarManager__cancel_call">Annulla chiamata</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Hai attivato la funzione per i pagamenti</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">Ora %1$s può accettare e ricevere i pagamenti</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Le informazioni sul pagamento non sono disponibili</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Mostra tutto</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Informazioni sul pagamento non disponibili</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">I dati di questo pagamento non sono disponibili perché i tuoi messaggi sono stati ripristinati da una fonte che non contiene la cronologia di questo pagamento. Tutto ciò non influisce sul saldo del tuo wallet o sullo stato dei precedenti pagamenti.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">A breve non potrai più inviare messaggi SMS da Signal. Invita %1$s su Signal per continuare la conversazione in app.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Non puoi più inviare messaggi SMS su Signal. Invita %1$s su Signal per continuare la conversazione in app.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Non puoi più inviare messaggi SMS su Molly. Invita %1$s su Molly per continuare la conversazione in app.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Pagamento: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Pagamento</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Segnalato come spam</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Collegare un dispositivo Signal?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Sembrerebbe che tu stia provando a connettere un dispositivo Signal usando uno scanner di terze parti. Per la tua protezione ti preghiamo di scansionare nuovamente il codice usando Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal richiede l\'autorizzazione all\'uso della fotocamera per leggere codici QR, ma questa è stata negata in modo permanente. Si prega di aprire il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Fotocamera\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly richiede l\'autorizzazione all\'uso della fotocamera per leggere codici QR, ma questa è stata negata in modo permanente. Si prega di aprire il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Fotocamera\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Signal richiede l\'autorizzazione all\'uso della fotocamera per leggere codici QR.</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Inserire la password</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Icona Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Icona Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Inserisci password</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Password non valida!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Sblocca Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Blocco schermo</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Sblocca Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Blocco schermo</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Mappa</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Verifica per continuare a inviare messaggi</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Per aiutare a prevenire lo spam su Signal, completa la verifica.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Per aiutare a prevenire lo spam su Molly, completa la verifica.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Dopo la verifica, puoi continuare a inviare messaggi. Tutti i messaggi in pausa verranno inviati automaticamente.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">La mia Storia</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Chiamata Signal</string>
+    <string name="Recipient_signal_call">Chiamata Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Blocca</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Sta squillando…</string>
     <string name="RedPhone_busy">Occupato</string>
     <string name="RedPhone_recipient_unavailable">Destinatario non disponibile</string>
-    <string name="RedPhone_network_failed">Errore di rete!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Errore di rete! Controlla la tua connessione di rete e riprova.</string>
     <string name="RedPhone_number_not_registered">Numero non registrato!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Il numero che hai composto non supporta le chiamate sicure!</string>
     <string name="RedPhone_got_it">Capito</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Fai clic per abilitare la tua videocamera</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Per chiamare %1$s, Signal necessita dell\'accesso alla tua fotocamera</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Per chiamare %1$s, Molly necessita dell\'accesso alla tua fotocamera</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Chiamata…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Riconnessione…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Sei fuori dalla chiamata</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Ti hanno rimosso dalla chiamata.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Consenti l\'accesso a fotocamera e microfono</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Consenti l\'accesso al tuo microfono</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Consenti l\'accesso alla tua fotocamera</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Per iniziare o unirti a una chiamata, devi consentire a Molly di accedere alla fotocamera e al microfono.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Per iniziare o unirti a una chiamata, devi consentire a Molly di accedere al tuo microfono.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Per mostrare il tuo video, devi consentire a Molly di accedere alla tua fotocamera.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly deve accedere al tuo microfono per consentirti di iniziare o di unirti a una chiamata.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly deve accedere alla tua fotocamera per poter mostrare il tuo video</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Per iniziare o unirti a una chiamata:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Per mostrare il tuo video:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Chiamata Signal</string>
-    <string name="WebRtcCallView__signal_video_call">Videochiamata Signal</string>
+    <string name="WebRtcCallView__signal_call">Chiamata Molly</string>
+    <string name="WebRtcCallView__signal_video_call">Videochiamata Molly</string>
     <string name="WebRtcCallView__start_call">Inizia chiamata</string>
     <string name="WebRtcCallView__join_call">Unisciti alla chiamata</string>
     <string name="WebRtcCallView__call_is_full">La chiamata è piena</string>
@@ -2031,20 +2135,39 @@
     <string name="CallOverflowPopupWindow__lower_hand">Abbassa la mano</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Annulla</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Hai alzato la mano</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Mostra</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s ha alzato la mano</item>
-        <item quantity="other">%1$s + %2$d hanno alzato la mano</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s hai alzato la mano</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d avete alzato la mano</item>
+        <item quantity="other">%1$s +%2$d avete alzato la mano</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s ha alzato la mano</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d hanno alzato la mano</item>
+        <item quantity="other">%1$s +%2$d hanno alzato la mano</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
-        <item quantity="one">%1$s</item>
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s +%2$d</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
+        <item quantity="one">%1$s +%2$d</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
 
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Riceverai una chiamata per verificare questo numero.</string>
     <string name="RegistrationActivity_edit_number">Modifica numero</string>
     <string name="RegistrationActivity_missing_google_play_services">Google Play Services mancanti</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Il dispositivo non ha Google Play Services. Puoi comunque usare Signal, ma questa configurazione potrebbe essere meno affidabile o performante.\n\nSe non sei un utente avanzato, non usi una ROM Android alternativa o credi che questo messaggio sia un errore, contatta support@signal.org per ricevere aiuto.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Il dispositivo non ha Google Play Services. Puoi comunque usare Molly, ma questa configurazione potrebbe essere meno affidabile o performante.\n\nSe non sei un utente avanzato, non usi una ROM Android alternativa o credi che questo messaggio sia un errore, contatta support@molly.im per ricevere aiuto.</string>
     <string name="RegistrationActivity_i_understand">Ho capito</string>
     <string name="RegistrationActivity_play_services_error">Errore di Google Play Services</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services si sta aggiornando o non è al momento disponibile. Per favore riprovare.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Formato del numero non standard</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Il numero che hai inserito (%1$s) sembra essere in un formato non standard.\n\nIntendevi %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Formato Numero di Telefono</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Formato Numero di Telefono</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Chiamata richiesta</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Problemi con la tua registrazione?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Assicurati che il tuo telefono sia collegato a una rete dati cellulare per poter ricevere il tuo SMS o la chiamata\n • Accertati di poter ricevere una chiamata sul tuo numero\n • Controlla di aver inserito correttamente il tuo numero di telefono.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Per maggiori info, segui questi passaggi per risolvere eventuali problemi oppure contatta la nostra assistenza</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Per maggiori informazioni, segui %1$s o %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">questi passaggi per risolvere eventuali problemi</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Aggiungi ai contatti</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Invita su Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Invita su Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Messaggio Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Chiamata Signal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Aggiungi ai contatti</string>
-    <string name="SharedContactView_invite_to_signal">Invita su Signal</string>
+    <string name="SharedContactView_invite_to_signal">Invita su Molly</string>
     <string name="SharedContactView_message">Messaggio Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s appartiene a %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Aggiornamento Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">È disponibile una nuova versione di Signal. Tocca qui per aggiornare.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal non è riuscito ad aggiornarsi</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Aggiornamento Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">È disponibile una nuova versione di Molly. Tocca qui per aggiornare.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly non è riuscito ad aggiornarsi</string>
     <string name="ApkUpdateNotifications_failed_general_body">Proveremo di nuovo più tardi.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Aggiornamento di Signal riuscito!</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Aggiornamento di Molly riuscito!</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">La tua app è stata automaticamente aggiornata alla versione %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">I nostri codice di sicurezza Signal:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Sembra che tu non abbia applicazioni per condividere.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Negli appunti non c\'è un codice di sicurezza da confrontare</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal richiede l\'autorizzazione all\'uso della fotocamera per leggere codici QR, ma questa è stata negata in modo permanente. Si prega di aprire il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Fotocamera\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly richiede l\'autorizzazione all\'uso della fotocamera per leggere codici QR, ma questa è stata negata in modo permanente. Si prega di aprire il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Fotocamera\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Impossibile scannerizzare i codici QR senza il permesso all\'uso della fotocamera</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">È necessario prima scambiarsi messaggi per poter visualizzare il codice di sicurezza di %1$s.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Tocca per aprire.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal è sbloccato</string>
-    <string name="KeyCachingService_lock">Blocca Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly è sbloccato</string>
+    <string name="KeyCachingService_lock">Blocca Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Tu</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Tipo di media non supportato</string>
     <string name="MediaPreviewActivity_draft">Bozza</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal richiede l\'autorizzazione per salvare in memoria, ma questa è stata negata in modo permanente. Si prega di aprire il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\", quindi abilitare \"Archiviazione\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly richiede l\'autorizzazione per salvare in memoria, ma questa è stata negata in modo permanente. Si prega di aprire il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\", quindi abilitare \"Archiviazione\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Impossibile salvare nella memoria esterna senza l\'autorizzazione</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Eliminare il messaggio?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Questo messaggio verrà eliminato definitivamente.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">L\'invio del messaggio non è riuscito.</string>
     <string name="MessageNotifier_error_delivering_message">C\'è stato un errore durante l\'invio del messaggio.</string>
     <string name="MessageNotifier_message_delivery_paused">Consegna del messaggio in pausa.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifica per continuare a inviare messaggi su Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifica per continuare a inviare messaggi su Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Segna tutto come già letto</string>
     <string name="MessageNotifier_mark_read">Segna come già letto</string>
     <string name="MessageNotifier_turn_off_these_notifications">Disattiva queste notifiche</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Ha reagito con %1$s al tuo sticker.</string>
     <string name="MessageNotifier_this_message_was_deleted">Questo messaggio è stato eliminato.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Disattivare le notifiche quando un contatto si unisce a Signal? Puoi attivarle di nuovo in Signal &gt; Impostazioni &gt; Notifiche.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Disattivare le notifiche quando un contatto si unisce a Molly? Puoi attivarle di nuovo in Molly &gt; Impostazioni &gt; Notifiche.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Risposta veloce non disponibile quando Signal è bloccato!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Risposta veloce non disponibile quando Molly è bloccato!</string>
     <string name="QuickResponseService_problem_sending_message">Problema nell\'invio del messaggio!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Scorciatoia non valida</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Nuovo messaggio</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Richiesta di messaggio</string>
     <string name="SingleRecipientNotificationBuilder_you">Tu</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Questo dispositivo non è più registrato. Probabilmente perché hai registrato il tuo numero di telefono con Signal su un altro dispositivo.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Questo dispositivo non è più registrato. Probabilmente perché hai registrato il tuo numero di telefono con Molly su un altro dispositivo.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Registra di nuovo il dispositivo</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Per rispondere alla chiamata, dai a Signal l\'autorizzazione ad accedere al tuo microfono.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Per rispondere alla chiamata, dai a Molly l\'autorizzazione ad accedere al tuo microfono.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Per rispondere alla videochiamata, dai a Signal l\'autorizzazione ad accedere al tuo microfono e alla fotocamera.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal richiede le autorizzazioni all\'uso del microfono e della fotocamera per fare e ricevere chiamate, ma questo sono state negate in modo permanente. Si prega di aprire il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Microfono\" e \"Fotocamera\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Per rispondere alla videochiamata, dai a Molly l\'autorizzazione ad accedere al tuo microfono e alla fotocamera.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly richiede le autorizzazioni all\'uso del microfono e della fotocamera per fare e ricevere chiamate, ma questo sono state negate in modo permanente. Si prega di aprire il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Microfono\" e \"Fotocamera\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Hai risposto su un dispositivo collegato.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Hai rifiutato su un dispositivo collegato.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Occupato su un dispositivo collegato.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Ripeti la nuova password</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Invita ad usare Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Invita ad usare Molly</string>
     <string name="contact_selection_activity__new_group">Nuovo gruppo</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Aggiorna contatti</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Non è presente un contatto? Aggiorna la pagina</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Trova le persone che conosci su Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Consenti l\'accesso ai tuoi contatti</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Altro</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Foto del contatto</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal richiede l\'autorizzazione alla lettura dei contatti per permetterti la ricerca, ma questa è stata negata in modo permanente. Si prega di aprire il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Contatti\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly richiede l\'autorizzazione alla lettura dei contatti per permetterti la ricerca, ma questa è stata negata in modo permanente. Si prega di aprire il menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Contatti\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Errore di rilevamento dei contatti, controlla la connessione di rete</string>
     <string name="ContactSelectionListFragment_username_not_found">Nome utente non trovato</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" non è un utente Signal. Controlla il nome utente e riprova."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Cerca tramite nome utente</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Consenti l\'accesso ai contatti</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Per trovare le persone che conosci su Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Consenti accesso</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">No grazie</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Consenti l\'accesso ai tuoi contatti. I tuoi contatti vengono protetti con crittografia e non sono visibili a Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal richiede l\'accesso ai tuoi contatti per poterli mostrare.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly richiede l\'accesso ai tuoi contatti per poterli mostrare.</string>
     <string name="contact_selection_list_fragment__show_contacts">Mostra contatti</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Hai rimosso questo utente: se mandi un messaggio, verrà aggiunto di nuovo al tuo elenco.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Opzioni</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Aggiorna</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Riproduci … Metti in pausa</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Le bolle sono una funzionalità di Android che puoi disattivare per le chat di Signal.</string>
+    <string name="BubbleOptOutTooltip__description">Le bolle sono una funzionalità di Android che puoi disattivare per le chat di Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Non ora</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Descrizione gruppo</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Aggiorna Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Aggiorna Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Questa versione di Signal è scaduta. Aggiorna subito l\'app per continuare a usare Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Questa versione di Molly è scaduta. Aggiorna subito l\'app per continuare a usare Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Aggiorna</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Lento</string>
     <string name="preferences__help">Aiuto</string>
     <string name="preferences__advanced">Avanzate</string>
-    <string name="preferences__donate_to_signal">Dona a Signal</string>
+    <string name="preferences__donate_to_signal">Dona a Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Privacy</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Cambiare l\'icona dell\'app e il nome in \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal dovrà essere chiuso per poter aggiornare l\'icona e il nome dell\'app. Ricorda che le notifiche che ricevi mostreranno sempre l\'icona standard e il nome di Signal.</string>
+    <string name="preferences__app_icon_dialog_description">Molly dovrà essere chiuso per poter aggiornare l\'icona e il nome dell\'app. Ricorda che le notifiche che ricevi mostreranno sempre l\'icona standard e il nome di Molly.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Scegli un\'icona e un nome per l\'app, che saranno visibili sulla home del tuo telefono e nell\'elenco di tutte le tue app. Ricorda che le notifiche che ricevi mostreranno sempre l\'icona standard e il nome di Signal. Scopri di più</string>
+    <string name="preferences__app_icon_warning_learn_more">Scegli un\'icona e un nome per l\'app, che saranno visibili sulla home del tuo telefono e nell\'elenco di tutte le tue app. Ricorda che le notifiche che ricevi mostreranno sempre l\'icona standard e il nome di Molly. Scopri di più</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Le icone e i nomi dell\'app sono visibili sulla home del tuo telefono e nell\'elenco di tutte le tue app.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Ricorda che le notifiche che ricevi mostreranno sempre l\'icona standard e il nome di Signal.</string>
+    <string name="preferences__app_icon_notification_warning">Ricorda che le notifiche che ricevi mostreranno sempre l\'icona standard e il nome di Molly.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Scopri di più</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Quest\'azione ridurrà per sempre tutte le chat ai %1$s messaggi più recenti.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Questo eliminerà definitivamente tutta la cronologia dei messaggi e i contenuti multimediali dal tuo dispositivo.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Quest\'azione rimuoverà per sempre tutta la cronologia dei messaggi e media da questo dispositivo ed eventuali altri dispositivi collegati.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Confermi di voler eliminare tutta la cronologia dei messaggi?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Tutta la cronologia dei messaggi verrà rimossa definitivamente. Questa azione non può essere annullata.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Tutta la cronologia messaggi verrà rimossa definitivamente da tutti i dispositivi. Quest\'azione non può essere annullata.</string>
     <string name="preferences_storage__delete_all_now">Elimina tutto ora</string>
     <string name="preferences_storage__forever">Per sempre</string>
     <string name="preferences_storage__one_year">1 anno</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Raggiro della censura</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Raggiro della censura</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Se attivo, Signal cercherà di raggirare la censura. Non attivare questa funzione se non ti trovi in un luogo dove Signal è soggetto a censura.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Se attivo, Molly cercherà di raggirare la censura. Non attivare questa funzione se non ti trovi in un luogo dove Molly è soggetto a censura.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Il raggiro della censura è stato attivato sulla base del tuo numero di telefono.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Ecco i pagamenti su Signal</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Usa Signal per inviare e ricevere MobileCoin, una nuova valuta digitale incentrata sulla privacy. Attiva per integrare questa funzione.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Usa Molly per inviare e ricevere MobileCoin, una nuova valuta digitale incentrata sulla privacy. Attiva per integrare questa funzione.</string>
     <string name="PaymentsHomeFragment__activate_payments">Attiva pagamenti</string>
     <string name="PaymentsHomeFragment__activating_payments">Attivazione pagamenti…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Ripristina account pagamenti</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">I pagamenti non sono disponibili nella tua regione.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Impossibile abilitare i pagamenti. Riprova più tardi.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Disattivare pagamenti?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Non sarai in grado di inviare o ricevere MobileCoin in Signal se disattivi i pagamenti.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Non sarai in grado di inviare o ricevere MobileCoin in Molly se disattivi i pagamenti.</string>
     <string name="PaymentsHomeFragment__deactivate">Disattiva</string>
     <string name="PaymentsHomeFragment__continue">Continua</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Il saldo non è attualmente disponibile.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Dettagli</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Puoi usare Signal per inviare e ricevere i MobileCoin. Tutti i pagamenti sono soggetti ai Termini di Utilizzo dei MobileCoin e del MobileCoin Wallet. Ricorda che potresti riscontrare alcuni problemi. Inoltre, in caso di perdite nei pagamenti o nei saldi dei Wallet, potrebbe non essere possibile recuperare la somma persa. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Puoi usare Molly per inviare e ricevere i MobileCoin. Tutti i pagamenti sono soggetti ai Termini di Utilizzo dei MobileCoin e del MobileCoin Wallet. Ricorda che potresti riscontrare alcuni problemi. Inoltre, in caso di perdite nei pagamenti o nei saldi dei Wallet, potrebbe non essere possibile recuperare la somma persa. </string>
     <string name="PaymentsHomeFragment__activate">Attiva</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Visualizza i termini di MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">I pagamenti in Signal non sono più disponibili. Puoi ancora trasferire i fondi a un exchange ma non puoi più inviare e ricevere pagamenti o aggiungere fondi.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">I pagamenti in Molly non sono più disponibili. Puoi ancora trasferire i fondi a un exchange ma non puoi più inviare e ricevere pagamenti o aggiungere fondi.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Consenti permessi</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Per aiutarti a usare Signal al meglio, abbiamo bisogno della tua autorizzazione per quanto segue. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Per aiutarti a usare Molly al meglio, abbiamo bisogno della tua autorizzazione per quanto segue. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Notifiche</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Avanti</string>
     <string name="PaymentsTransferFragment__invalid_address">Indirizzo non valido</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Controlla l\'indirizzo del portafoglio a cui stai tentando di trasferire e riprova.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Non puoi trasferire all\'indirizzo del tuo portafoglio Signal. Inserisci l\'indirizzo del portafoglio dal tuo account in uno exchange supportato.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Per scansionare un codice QR, Signal deve accedere alla fotocamera.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal richiede l\'autorizzazione all\'uso della fotocamera per acquisire un codice QR. Vai nelle impostazioni, selezionare \"Autorizzazioni\" e abilita \"Fotocamera\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Per scansionare un codice QR, Signal deve accedere alla fotocamera.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Non puoi trasferire all\'indirizzo del tuo portafoglio Molly. Inserisci l\'indirizzo del portafoglio dal tuo account in uno exchange supportato.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Per scansionare un codice QR, Molly deve accedere alla fotocamera.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly richiede l\'autorizzazione all\'uso della fotocamera per acquisire un codice QR. Vai nelle impostazioni, selezionare \"Autorizzazioni\" e abilita \"Fotocamera\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Per scansionare un codice QR, Molly deve accedere alla fotocamera.</string>
     <string name="PaymentsTransferFragment__settings">Impostazioni</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Chiamata vocale Signal in entrata</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Chiamata vocale Molly in entrata</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Videochiamata Signal in entrata</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Videochiamata Molly in entrata</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Chiamata di gruppo Signal in arrivo</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Chiamata di gruppo Molly in arrivo</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Chiamata vocale Signal in corso</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Chiamata vocale Molly in corso</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Videochiamata Signal in corso</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Videochiamata Molly in corso</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Chiamata di gruppo Signal in corso</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Chiamata di gruppo Molly in corso</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Caricamento…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Verifica</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Hai inserito correttamente la passphrase del tuo backup</string>
     <string name="BackupDialog_passphrase_was_not_correct">La passphrase non è corretta</string>
-    <string name="LocalBackupJob_creating_signal_backup">Creazione backup di Signal…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Creazione backup di Molly…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Verifica del backup di Signal in corso…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Verifica del backup di Molly in corso…</string>
     <string name="LocalBackupJobApi29_backup_failed">Backup fallito</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">La cartella di backup è stata eliminata o spostata.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Il tuo file di backup è troppo grande per essere memorizzato su questo volume.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Chiamami (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Invia di nuovo il codice (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Contatta l\'assistenza Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Registrazione Signal - Codice di verifica per Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Contatta l\'assistenza Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Registrazione Molly - Codice di verifica per Android</string>
     <string name="RegistrationActivity_incorrect_code">Codice errato</string>
     <string name="BackupUtil_never">Mai</string>
     <string name="BackupUtil_unknown">Sconosciuto</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Numero di telefono</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Scegli chi può vedere il tuo numero di telefono e chi può contattarti su Signal tramite il tuo numero.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Scegli chi può vedere il tuo numero di telefono e chi può contattarti su Molly tramite il tuo numero.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Chi può vedere il mio numero di telefono</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Hai fatto troppi tentativi. Riprova più tardi.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Errore durante la connessione al servizio</string>
     <string name="preferences_chats__backups">Backup</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal è bloccato</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly è bloccato</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">TOCCA PER SBLOCCARE</string>
     <string name="Recipient_unknown">Sconosciuto</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Hai bisogno dell\'accesso al tuo vecchio dispositivo.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Ripristina da backup</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Ripristina i tuoi messaggi da un backup locale. Se non lo ripristini ora, non sarai in grado di ripristinarlo in seguito</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Ripristina backup locale</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Ripristina il backup di Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Ripristina tutti i tuoi messaggi in chat + i tuoi ultimi 30 giorni di foto e video</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Più opzioni</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Annulla</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Accedi senza il trasferimento dati</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Continua senza trasferire i tuoi messaggi, foto e video</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Apri Signal sul tuo vecchio telefono Android</string>
     <string name="NewDeviceTransferInstructions__continue">Continua</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Preparazione alla connessione al vecchio dispositivo Android…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Ci vorrà un momento, dovrebbe essere pronto tra poco</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">In attesa che il vecchio dispositivo Android si connetta…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal necessita dell\'autorizzazione alla posizione per trovare e connettersi al tuo vecchio dispositivo Android.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal ha bisogno che i servizi di localizzazione siano attivi per trovare e connettersi con il tuo vecchio dispositivo Android.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal ha bisogno che il Wi-Fi sia attivo per trovare e connettersi con il tuo vecchio dispositivo Android. Il Wi-Fi deve essere attivo ma non è necessario che sia connesso a una rete Wi-Fi.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Spiacenti, sembra che questo dispositivo non supporti il Wi-Fi Direct. Signal utilizza il Wi-Fi Direct per trovare e connettersi con il tuo vecchio dispositivo Android. Puoi comunque ripristinare un backup per ripristinare il tuo account dal tuo vecchio dispositivo Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly necessita dell\'autorizzazione alla posizione per trovare e connettersi al tuo vecchio dispositivo Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly ha bisogno che i servizi di localizzazione siano attivi per trovare e connettersi con il tuo vecchio dispositivo Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly ha bisogno che il Wi-Fi sia attivo per trovare e connettersi con il tuo vecchio dispositivo Android. Il Wi-Fi deve essere attivo ma non è necessario che sia connesso a una rete Wi-Fi.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Spiacenti, sembra che questo dispositivo non supporti il Wi-Fi Direct. Molly utilizza il Wi-Fi Direct per trovare e connettersi con il tuo vecchio dispositivo Android. Puoi comunque ripristinare un backup per ripristinare il tuo account dal tuo vecchio dispositivo Android.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Ripristina un backup</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Si è verificato un errore imprevisto durante il tentativo di connessione al tuo vecchio dispositivo Android.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Ricerca del nuovo dispositivo Android…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal necessita dell\'autorizzazione alla posizione per trovare e connettersi al tuo nuovo dispositivo Android.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal ha bisogno che i servizi di localizzazione siano attivi per trovare e connettersi con il tuo nuovo dispositivo Android.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal ha bisogno che il Wi-Fi sia attivo per trovare e connettersi con il tuo nuovo dispositivo Android. Il Wi-Fi deve essere attivo ma non è necessario che sia connesso a una rete Wi-Fi.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Spiacenti, sembra che questo dispositivo non supporti il Wi-Fi Direct. Signal utilizza il Wi-Fi Direct per trovare e connettersi con il tuo nuovo dispositivo Android. Puoi comunque creare un backup per ripristinare il tuo account sul tuo nuovo dispositivo Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly necessita dell\'autorizzazione alla posizione per trovare e connettersi al tuo nuovo dispositivo Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly ha bisogno che i servizi di localizzazione siano attivi per trovare e connettersi con il tuo nuovo dispositivo Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly ha bisogno che il Wi-Fi sia attivo per trovare e connettersi con il tuo nuovo dispositivo Android. Il Wi-Fi deve essere attivo ma non è necessario che sia connesso a una rete Wi-Fi.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Spiacenti, sembra che questo dispositivo non supporti il Wi-Fi Direct. Molly utilizza il Wi-Fi Direct per trovare e connettersi con il tuo nuovo dispositivo Android. Puoi comunque creare un backup per ripristinare il tuo account sul tuo nuovo dispositivo Android.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Crea un backup</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Si è verificato un errore imprevisto durante il tentativo di connessione al tuo nuovo dispositivo Android.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Trasferimento dati</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Tieni entrambi i dispositivi vicini. Non spegnere i dispositivi e tieni aperto Signal. I trasferimenti sono crittografati end-to-end.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Tieni entrambi i dispositivi vicini. Non spegnere i dispositivi e tieni aperto Molly. I trasferimenti sono crittografati end-to-end.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d messaggi finora…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% dei messaggi finora…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Trasferisci account</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Scarica Signal sul tuo nuovo dispositivo Android</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Scarica Molly sul tuo nuovo dispositivo Android</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Clicca su \"Trasferisci o ripristina account\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Chiunque con questo link può vedere il nome e la foto del gruppo e inviare una richiesta di unirsi. Condividilo con persone di cui ti fidi.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Chiunque con questo link può vedere il nome e la foto del gruppo e unirsi al gruppo. Condividilo con persone di cui ti fidi.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Condividi tramite Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Condividi tramite Molly</string>
     <string name="GroupLinkBottomSheet_copy">Copia</string>
     <string name="GroupLinkBottomSheet_qr_code">Codice QR</string>
     <string name="GroupLinkBottomSheet_share">Condividi</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">Informazioni su MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin è una nuova valuta digitale incentrata sulla privacy.</string>
     <string name="payment_info_card_adding_funds">Aggiungere fondi</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Puoi aggiungere fondi da utilizzare in Signal inviando MobileCoin all\'indirizzo del tuo portafoglio.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Puoi aggiungere fondi da utilizzare in Molly inviando MobileCoin all\'indirizzo del tuo portafoglio.</string>
     <string name="payment_info_card_cashing_out">Incassare</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Puoi incassare i MobileCoin in qualsiasi momento su un exchange che supporta MobileCoin. Effettua un trasferimento sul tuo account in quel exchange.</string>
     <string name="payment_info_card_hide_this_card">Nascondere questa scheda?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Disattiva portafoglio</string>
     <string name="DeactivateWalletFragment__your_balance">Il tuo saldo</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Ti consigliamo di trasferire i fondi su un altro indirizzo del wallet prima di disattivare i pagamenti. Se scegli di non trasferirli ora, i tuoi fondi rimarranno nel tuo wallet collegato a Signal se riattivi i pagamenti.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Ti consigliamo di trasferire i fondi su un altro indirizzo del wallet prima di disattivare i pagamenti. Se scegli di non trasferirli ora, i tuoi fondi rimarranno nel tuo wallet collegato a Molly se riattivi i pagamenti.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Trasferisci il saldo rimanente</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Disattiva senza trasferire</string>
     <string name="DeactivateWalletFragment__deactivate">Disattiva</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Disattivare senza trasferire?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Il tuo saldo rimarrà nel tuo wallet collegato a Signal se scegli di riattivare i pagamenti.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Il tuo saldo rimarrà nel tuo wallet collegato a Molly se scegli di riattivare i pagamenti.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Errore durante la disattivazione del portafoglio.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licenze</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Termini &amp; Politica sulla privacy</string>
-    <string name="HelpFragment__copyright_signal_messenger">Copyright Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Copyright Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Distribuito con licenza GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4773,7 +4911,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">Auto</string>
+    <string name="ChatColorSelectionFragment__auto">Base</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Usa colori personalizzati</string>
     <string name="ChatColorSelectionFragment__chat_color">Colore chat</string>
     <string name="ChatColorSelectionFragment__edit">Modifica</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Seleziona un colore</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Condividi</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Solo gli amministratori possono inviare messaggi in questo gruppo.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Limite raggiunto</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Non puoi selezionare più di 5 chat</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Scopri di più</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Aggiorna Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Aggiorna Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Questa versione di Signal è scaduta. Aggiorna subito l\'app per continuare a usare Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Questa versione di Molly è scaduta. Aggiorna subito l\'app per continuare a usare Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Aggiorna</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Dispositivo non registrato</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Questo dispositivo non è più registrato. Registralo di nuovo per continuare a usare Signal su questo dispositivo.</string>
+    <string name="ReregisterSignalDialog__message">Questo dispositivo non è più registrato. Registralo di nuovo per continuare a usare Molly su questo dispositivo.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Registra di nuovo</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Impossibile aprire il menu di selezione.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Per attivare le notifiche, Signal ha bisogno della tua autorizzazione per mostrarle.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Per attivare le notifiche, Molly ha bisogno della tua autorizzazione per mostrarle.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Attiva</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Ancora nessuna risposta</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Non puoi rispondere o reagire a questa Storia perché non fai più parte di questo gruppo.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Ha reagito alla Storia</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Hai reagito alla storia</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Ha reagito alla storia</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Visualizzazioni</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Scegli la tua banca</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Conferma la tua donazione con %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Per impostare la tua donazione ricorrente, tocca su Continua per confermare un addebito di 0,01€ sulla tua carta o sul tuo conto. Questa transazione sarà rimborsata automaticamente e ci consentirà di addebitarti la tua donazione di 5€ al mese.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Per impostare la tua donazione ricorrente, tocca su Continua per confermare un addebito di 0,01€ sulla tua carta o sul tuo conto. Questa transazione sarà rimborsata automaticamente e ci consentirà di addebitarti la tua donazione di %1$s al mese.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Continua</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Download dati di backup…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">I backup dei media sono disattivati</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Il tuo abbonamento per il backup dei media su Signal è stato annullato perché non siamo riusciti ad elaborare il tuo pagamento. Hai ancora %1$d giorno per scaricare i media presenti nel tuo backup. Passato %1$d giorno, i media presenti nel tuo backup verranno rimossi.</item>
+        <item quantity="other">Il tuo abbonamento per il backup dei media su Signal è stato annullato perché non siamo riusciti ad elaborare il tuo pagamento. Hai ancora %1$d giorni per scaricare i media presenti nel tuo backup. Passati %1$d giorni, i media presenti nel tuo backup verranno rimossi.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Puoi tornare a pagare per il backup dei tuoi media in qualsiasi momento. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">I tuoi media verranno eliminati oggi</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Il tuo abbonamento per il backup dei media su Signal è stato annullato perché non siamo riusciti ad elaborare il tuo pagamento. Questa è la tua ultima possibilità per scaricare i media presenti nel tuo backup prima che vengano eliminati.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Impossibile completare il download</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Il tuo dispositivo non ha spazio libero a sufficienza. Libera %1$s di spazio per scaricare i media archiviati nel tuo backup.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Se scegli \"Salta\", i media presenti nel tuo backup verranno eliminati tra %1$d giorno.</item>
+        <item quantity="other">Se scegli \"Salta\", i media presenti nel tuo backup verranno eliminati tra %1$d giorni.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Impossibile elaborare il pagamento per il backup</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Stiamo riscontrando dei problemi nell\'elaborare il tuo pagamento ricorrente mensile per il servizio di backup. Assicurati che il tuo metodo di pagamento sia aggiornato. In caso contrario, aggiornalo su Google Pay. Signal proverà ad elaborare di nuovo il pagamento fra qualche giorno.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Impossibile completare il backup</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Il tuo dispositivo non ha completato un backup da %1$d giorni. Assicurati che il tuo dispositivo sia collegato a una rete Wi-Fi e tocca su \"Fai ora il backup\". </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Scopri di più</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Salta</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Scarica ora i media</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Scarica dopo</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Non scaricare i media</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Libera %1$s di spazio per scaricare i tuoi media.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Carta di credito o di debito</string>
@@ -6874,16 +7058,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Sconosciuto</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Cronologia dei pagamenti</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Il tuo ultimo backup è stato eseguito alle ore %2$s del giorno %1$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">Limiti chat</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">Limiti messaggi chat</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">Elimina cronologia messaggi</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">I messaggi precedenti al periodo di tempo selezionato verranno eliminati definitivamente.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">I messaggi che superano la lunghezza selezionata verranno eliminati definitivamente.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Applica i limiti ai dispositivi collegati</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Se attivi questa opzione, i limiti per le chat elimineranno i messaggi anche dai tuoi dispositivi collegati.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Il processo di eliminazione è ora sincronizzato su tutti i tuoi dispositivi</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Quando elimini messaggi o chat, la rimozione avverrà sul tuo telefono e sui dispositivi collegati.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">Ok</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Cronologia dei pagamenti</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Backup messaggi e media</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Informazioni sul pagamento</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Tipo di backup</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Data pagamento</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Condividi</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Backup di Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Cronologia dei pagamenti</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Dettagli sul backup</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Dimensioni del backup</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Frequenza dei backup</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Backup usando i dati cellulare</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Disattiva ed elimina backup</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Backup eliminati e disattivati.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Tipo di backup cambiato e donazione annullata</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Contributo annullato</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Download completato</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Tipo di backup</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Backup disattivati</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s al mese</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Abilitare i backup</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Ultimo backup</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s alle %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Mai</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Fai ora il backup</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Disattivare ed eliminare i backup?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Non ti verrà addebitato un altro importo. Il tuo backup verrà eliminato e non ne verranno creati di nuovi.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Disattiva ed elimina</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Eliminazione backup in corso…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Backup eliminato</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Scegliendo \"Fai ora il backup\""</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Ogni giorno</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Ogni settimana</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Ogni mese</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Backup manuale</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Inserisci PIN, password o pattern del dispositivo.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Avanti</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Cambia il tipo di backup</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Annulla contributo</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Conferma l\'operazione</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Non riceverai altri addebiti. I backup verranno disattivati alla fine del tuo ciclo di fatturazione. Dopo la data in questione, avrai 30 giorni per scaricare i media che stai salvando ora con il backup.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Conferma e scarica ora</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Conferma e scarica dopo</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Mantieni l\'abbonamento</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index dd072165ee..de5ca1b2f2 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal מתעדכן…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly מתעדכן…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">עדין לא הגדרת משפט־סיסמה!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">להשבית משפט־סיסמה?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">זה ישחרר נעילה של Signal והתראות הודעה באופן קבוע.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">זה ישחרר נעילה של Molly והתראות הודעה באופן קבוע.</string>
     <string name="ApplicationPreferencesActivity_disable">השבת</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">שגיאה בהתחברות לשרת!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">קודי PIN נדרשים עבור נעילת הרשמה. כדי להשבית קודי PIN, אנא השבת תחילה נעילת הרשמה.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">קובץ</string>
     <string name="AttachmentKeyboard_contact">איש קשר</string>
     <string name="AttachmentKeyboard_location">מיקום</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal צריכה הרשאה כדי להציג את התמונות והסרטונים שלך</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly צריכה הרשאה כדי להציג את התמונות והסרטונים שלך</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">התר גישה</string>
     <string name="AttachmentKeyboard_payment">תשלום</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">לא ניתן למצוא יישום לבחירת מדיה.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal דורש את הרשאת האחסון על מנת לצרף תמונות, סרטונים, או שמע, אבל היא נדחתה לצמיתות. אנא המשך אל תפריט הגדרות היישום, בחר \"הרשאות\" ואפשר את \"אחסון\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal דורש הרשאת אנשי קשר על מנת לצרף מידע איש קשר, אבל היא נדחתה לצמיתות. אנא המשך אל תפריט הגדרות היישום, בחר \"הרשאות\" ואפשר את \"אנשי קשר\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal דורש הרשאת מיקום על מנת לצרף מיקום, אבל היא נדחתה לצמיתות. אנא המשך אל תפריט הגדרות היישום, בחר \"הרשאות\" ואפשר את \"מיקום\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly דורש את הרשאת האחסון על מנת לצרף תמונות, סרטונים, או שמע, אבל היא נדחתה לצמיתות. אנא המשך אל תפריט הגדרות היישום, בחר \"הרשאות\" ואפשר את \"אחסון\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly דורש הרשאת אנשי קשר על מנת לצרף מידע איש קשר, אבל היא נדחתה לצמיתות. אנא המשך אל תפריט הגדרות היישום, בחר \"הרשאות\" ואפשר את \"אנשי קשר\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly דורש הרשאת מיקום על מנת לצרף מיקום, אבל היא נדחתה לצמיתות. אנא המשך אל תפריט הגדרות היישום, בחר \"הרשאות\" ואפשר את \"מיקום\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">מתן גישה למיקום שלך</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">כדי לשלוח את המיקום שלך:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">צריך לתת ל–Signal גישה כדי לשלוח את המיקום שלך.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">צריך לתת ל–Molly גישה כדי לשלוח את המיקום שלך.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal צריכה גישה למיקום כדי לשלוח את המיקום שלך.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly צריכה גישה למיקום כדי לשלוח את המיקום שלך.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">מתן גישה לאחסון</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">כדי להציג תמונות וסרטונים:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal צריכה גישה לאחסון כדי להציג את התמונות והסרטונים שלך.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly צריכה גישה לאחסון כדי להציג את התמונות והסרטונים שלך.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s לא הפעיל/ה תשלומים </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">שנה מצלמה</string>
     <string name="CameraXFragment_open_gallery_description">פתח גלריה</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">התר גישה</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">מתן גישה למצלמה והמיקרופון שלך</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">מתן גישה למצלמה שלך</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">מתן גישה למיקרופון שלך</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">כדי לצלם תמונות, צריך לתת ל–Signal גישה למצלמה שלך.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">כדי ללכוד תצלומים וסרטונים, התר אל Signal גישה אל המצלמה.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">כדי לצלם תמונות וסרטונים, צריך לתת ל–Signal גישה למצלמה ולמיקרופון שלך.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">כדי לצלם סרטונים עם צליל, צריך לתת ל–Signal גישה למיקרופון שלך.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">כדי לסרוק קוד QR, צריך לתת ל–Signal גישה למצלמה שלך.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal צריכה גישה למצלמה שלך כדי לצלם תמונות</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal צריכה גישה למצלמה שלך כדי לסרוק קודי QR</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal צריכה גישה למיקרופון שלך כדי לצלם סרטונים</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">כדי לצלם תמונות ב–Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">כדי לצלם תמונות וסרטונים ב–Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">כדי לצלם סרטונים עם צליל:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">כדי לסרוק קודי QR:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">אנשי קשר אחרונים</string>
@@ -273,7 +274,7 @@
     <string name="CameraContacts_no_signal_contacts">אין אנשי קשר של Signal</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">אתה יכול להשתמש רק בכפתור המצלמה כדי לשלוח תמונות אל אנשי קשר של Signal. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">אינך מוצא מה שאתה מחפש?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">הזמן איש קשר להצטרף אל Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">הזמן איש קשר להצטרף אל Molly</string>
     <string name="CameraContacts__menu_search">חפש</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -287,12 +288,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">לא תודה</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">עדכן את Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">עדכן את Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">גרסה זו של היישום אינה נתמכת יותר. כדי להמשיך לשלוח ולקבל הודעות, עדכן אל הגרסה האחרונה.</string>
     <string name="ClientDeprecatedActivity_update">עדכן</string>
     <string name="ClientDeprecatedActivity_dont_update">אל תעדכן</string>
     <string name="ClientDeprecatedActivity_warning">אזהרה</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">גרסת Signal שלך כבר לא בתוקף. אפשר לצפות בהיסטוריית ההודעות שלך אבל לא תהיה לך אפשרות לשלוח או לקבל הודעות עד לעדכון האפליקציה.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">גרסת Molly שלך כבר לא בתוקף. אפשר לצפות בהיסטוריית ההודעות שלך אבל לא תהיה לך אפשרות לשלוח או לקבל הודעות עד לעדכון האפליקציה.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">דפדפן רשת לא נמצא.</string>
@@ -329,8 +330,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">%1$s של הודעה</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">שיחה קולית של Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">שיחת וידאו של Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -428,7 +429,7 @@
     <string name="ConversationActivity_transport_signal">הודעת Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">שלח הודעה</string>
-    <string name="ConversationActivity_lets_switch_to_signal">בוא נחליף אל Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">בוא נחליף אל Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">אנא בחר איש קשר</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">הצרופה חורגת ממגבלות הגודל עבור הסוג של ההודעה שאתה שולח.</string>
     <string name="ConversationActivity_unable_to_record_audio">לא היה ניתן להקליט שמע!</string>
@@ -447,18 +448,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">כדי לשלוח הודעות קוליות:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">כדי לשלוח הודעות קוליות, צריך לתת ל–Signal גישה למיקרופון שלך.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">כדי לשלוח הודעות קוליות, צריך לתת ל–Molly גישה למיקרופון שלך.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal צריכה גישה למיקרופון כדי להקליט הודעה קולית.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal דורש את הרשאת המיקרופון על מנת לשלוח הודעות שמע, אבל היא נדחתה לצמיתות. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"מיקרופון\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly צריכה גישה למיקרופון כדי להקליט הודעה קולית.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly דורש את הרשאת המיקרופון על מנת לשלוח הודעות שמע, אבל היא נדחתה לצמיתות. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"מיקרופון\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal צריך את ההרשאות של המיקרופון והמצלמה על מנת לחייג אל %1$s, אבל הן נדחו לצמיתות. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"מיקרופון\" ואת \"מצלמה\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">כדי ללכוד תצלומים וסרטונים, התר אל Signal גישה אל המצלמה.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal צריך את הרשאת המצלמה כדי לצלם תצלומים או להקליט סרטונים, אבל היא נדחתה לצמיתות. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"מצלמה\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal צריך הרשאות מצלמה כדי לצלם תצלומים או להקליט סרטון</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly צריך את ההרשאות של המיקרופון והמצלמה על מנת לחייג אל %1$s, אבל הן נדחו לצמיתות. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"מיקרופון\" ואת \"מצלמה\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">כדי ללכוד תצלומים וסרטונים, התר אל Molly גישה אל המצלמה.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly צריך את הרשאת המצלמה כדי לצלם תצלומים או להקליט סרטונים, אבל היא נדחתה לצמיתות. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"מצלמה\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly צריך הרשאות מצלמה כדי לצלם תצלומים או להקליט סרטון</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">אפשר את הרשאת המיקרופון כדי ללכוד סרטונים עם צליל.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal צריך הרשאות מיקרופון כדי להקליט סרטונים, אבל הן נדחו. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"מיקרופון\" ואת \"מצלמה\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal צריך הרשאות מיקרופון כדי להקליט סרטונים.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly צריך הרשאות מיקרופון כדי להקליט סרטונים, אבל הן נדחו. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"מיקרופון\" ואת \"מצלמה\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly צריך הרשאות מיקרופון כדי להקליט סרטונים.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
     <string name="ConversationActivity_no">לא</string>
@@ -479,9 +480,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">כדי להתחיל שיחה:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">כדי להתחיל שיחה, צריך לתת ל–Signal גישה למיקרופון שלך.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">כדי להתחיל שיחה, צריך לתת ל–Molly גישה למיקרופון שלך.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal צריכה גישה למיקרופון כדי להתחיל שיחה.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly צריכה גישה למיקרופון כדי להתחיל שיחה.</string>
 
 
     <string name="ConversationActivity_join">הצטרף</string>
@@ -495,9 +496,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">הודעות SMS כבר לא נתמכות ב–Signal. אפשר להזמין את %1$s ל–Signal כדי להשאיר את השיחה כאן.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">האדם הזה כבר לא משתמש ב–Signal. אפשר להזמין אותו או אותה ל–Signal כדי להשאיר את השיחה כאן.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">האדם הזה כבר לא משתמש ב–Molly. אפשר להזמין אותו או אותה ל–Molly כדי להשאיר את השיחה כאן.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">הזמנה אל Signal</string>
+    <string name="ConversationActivity__invite_to_signal">הזמנה אל Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">נזכיר לך שוב בקרוב.</string>
 
@@ -563,6 +564,8 @@
     <string name="ConversationFragment_delete_for_everyone">מחיקה עבור כולם</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">מחיקה במכשיר זה</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">מחיקה</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">מחיקה בכל מקום</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">הודעה זו תימחק עבור כל מי שנמצא בצ\'אט אם הם משתמשים בגרסה עדכנית של Signal. הם יוכלו לראות שמחקת הודעה.</string>
@@ -594,13 +597,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">חסום/ה</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">עדכן את Signal</string>
+    <string name="ConversationFragment__update_build">עדכן את Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">רישום מחדש של Signal</string>
+    <string name="ConversationFragment__reregister_signal">רישום מחדש של Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">ניווט חזרה.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">פתיחת Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">פתיחת Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">כבר לא מאומת</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -669,6 +672,13 @@
         <item quantity="many">זה ימחק לצמיתות את כל %1$d הצ׳אטים שנבחרו.</item>
         <item quantity="other">זה ימחק לצמיתות את כל %1$d הצ׳אטים שנבחרו.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">זה ימחק לצמיתות את הצ׳אט שנבחר מכל המכשירים שלך.</item>
+        <item quantity="two">זה ימחק לצמיתות את %1$d הצ׳אטים שנבחרו מכל המכשירים שלך.</item>
+        <item quantity="many">זה ימחק לצמיתות את %1$d הצ׳אטים שנבחרו מכל המכשירים שלך.</item>
+        <item quantity="other">זה ימחק לצמיתות את %1$d הצ׳אטים שנבחרו מכל המכשירים שלך.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">מוחק</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">מוחקים את הצ׳אט שנבחר…</item>
@@ -770,9 +780,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">מי יכול למצוא אותי לפי המספר שלי?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">כל מי שיש להם את מספר הטלפון שלך יראו אותך ב–Signal ויוכלו להתחיל איתך צ׳אט.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">כל מי שיש להם את מספר הטלפון שלך יראו אותך ב–Molly ויוכלו להתחיל איתך צ׳אט.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">אנשים לא יוכלו לראות אותך ב–Signal אלא אם שלחת להם הודעה או שיש לך צ\'אט קיים איתם.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">אנשים לא יוכלו לראות אותך ב–Molly אלא אם שלחת להם הודעה או שיש לך צ\'אט קיים איתם.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">לשחזר מגיבוי?</string>
@@ -806,7 +816,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">בחן את משפט־סיסמת הגיבוי שלך ווודא שהוא תואם</string>
     <string name="BackupsPreferenceFragment__turn_on">הפעל</string>
     <string name="BackupsPreferenceFragment__turn_off">כבה</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"כדי לשחזר גיבוי, התקן עותק חדש של Signal. פתח את היישום והקש על \"שחזר גיבוי\", לאחר מכן אתר קובץ גיבוי. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"כדי לשחזר גיבוי, התקן עותק חדש של Molly. פתח את היישום והקש על \"שחזר גיבוי\", לאחר מכן אתר קובץ גיבוי. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">למד עוד</string>
     <string name="BackupsPreferenceFragment__in_progress">בתהליך…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -814,7 +824,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d עד כה…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% עד כה…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal דורש הרשאת אחסון חיצוני על מנת ליצור גיבויים, אבל היא נדחתה לצמיתות. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"אחסון\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly דורש הרשאת אחסון חיצוני על מנת ליצור גיבויים, אבל היא נדחתה לצמיתות. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"אחסון\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">הגדרת זמן גיבוי</string>
 
@@ -881,7 +891,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">צ\'אט רוענן</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal משתמשת בהצפנה מקצה לקצה ויכול להיות שהיא תצטרך לרענן את הצ׳אט שלך מדי פעם. זה לא משפיע על אבטחת הצ׳אט שלך אבל ייתכן שפספסת הודעה מאיש הקשר הזה, ואפשר לבקש ממנו לשלוח אותה שוב.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly משתמשת בהצפנה מקצה לקצה ויכול להיות שהיא תצטרך לרענן את הצ׳אט שלך מדי פעם. זה לא משפיע על אבטחת הצ׳אט שלך אבל ייתכן שפספסת הודעה מאיש הקשר הזה, ואפשר לבקש ממנו לשלוח אותה שוב.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">שימוש ב–Signal לשולחן העבודה או ל–iPad. ההודעות שלך יסונכרנו עם המכשירים המקושרים שלך.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">קישור מכשיר חדש</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s הודעות ופרטי צ׳אט מוגנים באמצעות הצפנה מקצה לקצה בכל המכשירים</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal לשולחן העבודה או ל–iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">כל התכתבות במכשירים המקושרים היא פרטית</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">הודעות Molly יסונכרנו עם Molly בטלפון הנייד שלך לאחר שהוא יקושר. היסטוריית ההודעות הקודמת שלך לא תופיע.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">במכשיר האחר שלך, יש לבקר ב–%1$s כדי להתקין את Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">המכשירים המקושרים שלי</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">בטל קישור</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s לא מקושר</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">מקשרים מכשיר…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">המכשיר אושר</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">טוען…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">אין מכשירים מקושרים</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">יש לפתוח את הנעילה כדי לקשר מכשיר</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">יש לסרוק את קוד ה–QR המוצג במכשיר כדי לקשר.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">סריקת קוד QR</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">יש להשתמש במכשיר הזה כדי לסרוק את קוד ה–QR שמוצג במכשיר שברצונך לקשר</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">בסדר</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">מכשיר זה יוכל לראות את הקבוצות ואנשי הקשר שלך, לקבל גישה לצ׳אטים שלך ולשלוח הודעות בשמך.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">יש לסיים את הקישור במכשיר האחר שלך</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">יש לסיים את הקישור של Molly במכשיר האחר שלך.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">קישור מכשיר נכשל</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">קוד QR זה אינו תקף. אנא וודא שאתה סורק את קוד ה־QR המוצג על המכשיר שאתה רוצה לקשר.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">נסה שוב</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">לבטל קישור \'%1$s\'?</string>
@@ -903,10 +968,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">מטב עבור שירותי Play חסרים</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">מכשיר זה אינו תומך בשירותי Play. הקש כדי להשבית מיטובי סוללה של מערכת שמונעים מ־Signal לאחזר הודעות בעת אי־פעילות.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">מכשיר זה אינו תומך בשירותי Play. הקש כדי להשבית מיטובי סוללה של מערכת שמונעים מ־Molly לאחזר הודעות בעת אי־פעילות.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">גרסה זו של Signal פגה. עדכן עכשיו כדי לשלוח ולקבל הודעות.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">גרסה זו של Molly פגה. עדכן עכשיו כדי לשלוח ולקבל הודעות.</string>
     <string name="ExpiredBuildReminder_update_now">עדכן עכשיו</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -919,8 +984,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">הצג</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">כישלון תקשורת קבוע של Signal!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal לא היה יכול להירשם עם שירותי Google Play. הודעות ושיחות של Signal הושבתו, אנא נסה להירשם מחדש בהגדרות &lt; מתקדם.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">כישלון תקשורת קבוע של Molly!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly לא היה יכול להירשם עם שירותי Google Play. הודעות ושיחות של Molly הושבתו, אנא נסה להירשם מחדש בהגדרות &lt; מתקדם.</string>
 
 
     <!-- GiphyActivity -->
@@ -1085,20 +1150,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">יומני ניפוי באגים עוזרים לנו לאבחן ולתקן את הבעיה ולא מכילים מידע מזהה.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal נתקלה בבעיה. רוצה להגיש יומן ניפוי באגים?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly נתקלה בבעיה. רוצה להגיש יומן ניפוי באגים?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">התראות עשויות להתעכב בגלל אופטימיזציה של הסוללה</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">אפשר להשבית אופטימיזציה של הסוללה כדי ש‑Signal תוכל לוודא שהתראות על הודעות לא יעוכבו.</string>
+    <string name="PromptBatterySaverBottomSheet__message">אפשר להשבית אופטימיזציה של הסוללה כדי ש‑Molly תוכל לוודא שהתראות על הודעות לא יעוכבו.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">התראות עשויות להתעכב בגלל אופטימיזציה של הסוללה</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">אפשר להשבית אופטימיזציה של הסוללה כדי ש‑Molly תוכל לוודא שהתראות על הודעות לא יעוכבו. יש ללחוץ על ״המשך״ כדי לראות הוראות ספציפיות למכשיר.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">לא תודה</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">המשך</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">המשך</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">ביטול</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">לא תודה</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">הזמנות קבוצה ממתינות</string>
+    <string name="PendingMembersActivity_pending_group_invites">בקשות והזמנות</string>
     <string name="PendingMembersActivity_requests">בקשות</string>
     <string name="PendingMembersActivity_invites">הזמנות</string>
     <string name="PendingMembersActivity_people_you_invited">אנשים שהזמנת</string>
@@ -1361,7 +1436,7 @@
     <string name="InviteActivity_cancel">בטל</string>
     <string name="InviteActivity_sending">שולח…</string>
     <string name="InviteActivity_invitations_sent">הזמנות נשלחו!</string>
-    <string name="InviteActivity_invite_to_signal">הזמן אל Signal</string>
+    <string name="InviteActivity_invite_to_signal">הזמן אל Molly</string>
     <string name="InviteActivity_send_sms">שלח מסרון (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">לשלוח הזמנה %1$d במסרון?</item>
@@ -1369,7 +1444,7 @@
         <item quantity="many">לשלוח %1$d הזמנות במסרון?</item>
         <item quantity="other">לשלוח %1$d הזמנות במסרון?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">בוא נחליף אל Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">בוא נחליף אל Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">נראה שאין לך יישומים כלשהם לשתף בהם.</string>
 
     <!-- LearnMoreTextView -->
@@ -1383,7 +1458,7 @@
     <string name="LongMessageActivity_your_message">ההודעה שלך</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">חיבור רקע מאופשר</string>
 
     <!-- MediaOverviewActivity -->
@@ -1462,10 +1537,10 @@
     <string name="MessageQuotesBottomSheet_replies">תשובות</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">מקים שיחת Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">מקים שיחת Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">שירות השיחות של Signal מופעל</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">עוצר את שירות השיחות של Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">שירות השיחות של Molly מופעל</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">עוצר את שירות השיחות של Molly</string>
     <string name="NotificationBarManager__cancel_call">בטל שיחה</string>
 
     <!-- NotificationsMegaphone -->
@@ -1733,6 +1808,14 @@
     <string name="MessageRecord_you_activated_payments">הפעלת תשלומים</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">ל%1$s יש אפשרות לקבל תשלומים עכשיו</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">פרטי התשלום לא זמינים</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">יש ללחוץ כדי להציג עוד</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">פרטי התשלום לא זמינים</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">פרטי התשלום הזה לא זמינים בגלל שההודעות שלך שוחזרו ממקור שלא הכיל את היסטוריית התשלומים הזו. זה לא משפיע על יתרת הארנק שלך או על הסטטוס של תשלומים קודמים.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1793,9 +1876,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">בקרוב לא תהיה לך יותר אפשרות לשלוח הודעות SMS מ–Signal. אפשר להזמין את %1$s ל–Signal כדי להשאיר את השיחה כאן.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">אין לך יותר אפשרות לשלוח הודעות SMS ב–Signal. אפשר להזמין את %1$s ל–Signal כדי להשאיר את השיחה כאן.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">אין לך יותר אפשרות לשלוח הודעות SMS ב–Molly. אפשר להזמין את %1$s ל–Molly כדי להשאיר את השיחה כאן.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">תשלום: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">תשלום</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">דוּוח/ה כספאם</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1881,7 +1966,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">לקשר מכשיר Signal?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">נראה שאתה מנסה לקשר מכשיר Signal ע״י שימוש בסורק צד־שלישי. למען הגנתך, אנא סרוק את הקוד שוב מתוך Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal צריך את הרשאת המצלמה על מנת לסרוק קוד QR, אבל היא נדחתה לצמיתות. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"מצלמה\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly צריך את הרשאת המצלמה על מנת לסרוק קוד QR, אבל היא נדחתה לצמיתות. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"מצלמה\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">לא היה ניתן לסרוק קוד QR ללא הרשאת המצלמה</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1896,11 +1981,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">הכנס משפט־סיסמה</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">איקון Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">איקון Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">הגש משפט־סיסמה</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">משפט־סיסמה בלתי תקף!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">שחרר נעילת Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - מסך נעילה</string>
+    <string name="PassphrasePromptActivity_unlock_signal">שחרר נעילת Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - מסך נעילה</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">מפה</string>
@@ -1969,7 +2054,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">וודא כדי להמשיך להתכתב</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">כדי לעזור למנוע זבל ב‏‏־Signal, אנא השלם וידוא.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">כדי לעזור למנוע זבל ב‏‏־Molly, אנא השלם וידוא.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">לאחר וידוא, אתה יכול להמשיך להתכתב. הודעות מושהות כלשהן יישלחו באופן אוטומטי.</string>
 
     <!-- Recipient -->
@@ -1977,7 +2062,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">הסטורי שלי</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">שיחת Signal</string>
+    <string name="Recipient_signal_call">שיחת Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">חסימה</string>
@@ -1991,7 +2076,8 @@
     <string name="RedPhone_ringing">מצלצל…</string>
     <string name="RedPhone_busy">תפוס</string>
     <string name="RedPhone_recipient_unavailable">המקבל בלתי זמין</string>
-    <string name="RedPhone_network_failed">הרשת נכשלה!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">הרשת נכשלה! כדאי לבדוק את חיבור הרשת שלך ולנסות שוב.</string>
     <string name="RedPhone_number_not_registered">המספר אינו רשום!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">המספר שחייגת אינו תומך בשיחה קולית מאובטחת!</string>
     <string name="RedPhone_got_it">הבנתי</string>
@@ -2002,8 +2088,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">הקש כאן כדי להפעיל את צילום הוידאו שלך</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">כדי להתקשר אל %1$s, היישום Signal צריך גישה אל המצלמה שלך</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">כדי להתקשר אל %1$s, היישום Molly צריך גישה אל המצלמה שלך</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">מתקשר…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">מתחבר מחדש…</string>
@@ -2069,10 +2155,30 @@
     <string name="WebRtcCallActivity__removed_from_call">הסרה מהשיחה</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">מישהו הסיר אותך מהשיחה.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">מתן גישה למצלמה והמיקרופון שלך</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">מתן גישה למיקרופון שלך</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">מתן גישה למצלמה שלך</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">כדי להתחיל או להצטרף לשיחה, צריך לתת ל–Molly גישה למצלמה ולמיקרופון שלך.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">כדי להתחיל או להצטרף לשיחה, צריך לתת ל–Molly גישה למיקרופון שלך.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">כדי להפעיל וידאו, צריך לתת ל–Molly גישה למצלמה שלך.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly צריכה הרשאות מיקרופון כדי להתחיל או להצטרף לשיחה.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly צריכה גישה למצלמה כדי להפעיל את הווידאו שלך</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">כדי להתחיל או להצטרף לשיחה:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">כדי להפעיל וידאו:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">שיחת Signal</string>
-    <string name="WebRtcCallView__signal_video_call">שיחת וידאו של Signal</string>
+    <string name="WebRtcCallView__signal_call">שיחת Molly</string>
+    <string name="WebRtcCallView__signal_video_call">שיחת וידאו של Molly</string>
     <string name="WebRtcCallView__start_call">התחל שיחה</string>
     <string name="WebRtcCallView__join_call">הצטרף לשיחה</string>
     <string name="WebRtcCallView__call_is_full">השיחה מלאה</string>
@@ -2172,24 +2278,47 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">להוריד את היד?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">הורדת יד</string>
+    <string name="CallOverflowPopupWindow__lower_hand">הורדה</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">ביטול</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">הרמת יד</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">הצגה</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s הרים/ה יד</item>
-        <item quantity="two">%1$s + %2$d הרימו יד</item>
-        <item quantity="many">%1$s + %2$d הרימו יד</item>
-        <item quantity="other">%1$s + %2$d הרימו יד</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s הרמת יד</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d הרמתם יד</item>
+        <item quantity="two">%1$s +%2$d הרמתם יד</item>
+        <item quantity="many">%1$s +%2$d הרמתם יד</item>
+        <item quantity="other">%1$s +%2$d הרמתם יד</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s הרימ/ה יד</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d הרימו יד</item>
+        <item quantity="two">%1$s +%2$d הרימו יד</item>
+        <item quantity="many">%1$s +%2$d הרימו יד</item>
+        <item quantity="other">%1$s +%2$d הרימו יד</item>
+    </plurals>
+
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="two">%1$s +%2$d</item>
+        <item quantity="many">%1$s +%2$d</item>
+        <item quantity="other">%1$s +%2$d</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="two">%1$s +%2$d</item>
         <item quantity="many">%1$s +%2$d</item>
@@ -2292,7 +2421,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">תקבל שיחה כדי לוודא מספר זה.</string>
     <string name="RegistrationActivity_edit_number">ערוך מספר</string>
     <string name="RegistrationActivity_missing_google_play_services">שירותי Google Play חסרים</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">במכשיר זה חסרים שירותי Google Play. אתה יכול עדין להשתמש ב־Signal, אבל תצורה זו עשויה לגרום לאמינות מופחתת או לביצועים מופחתים.\n\nאם אינך משתמש מתקדם, אינך מריץ ROM של Android שהותקן לאחר רכישה, או שאתה מאמין שאתה רואה זאת בטעות, אנא צור קשר עם support@signal.org לעזרה באיתור תקלות.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">במכשיר זה חסרים שירותי Google Play. אתה יכול עדין להשתמש ב־Molly, אבל תצורה זו עשויה לגרום לאמינות מופחתת או לביצועים מופחתים.\n\nאם אינך משתמש מתקדם, אינך מריץ ROM של Android שהותקן לאחר רכישה, או שאתה מאמין שאתה רואה זאת בטעות, אנא צור קשר עם support@molly.im לעזרה באיתור תקלות.</string>
     <string name="RegistrationActivity_i_understand">אני מבין</string>
     <string name="RegistrationActivity_play_services_error">שגיאת שירותי Play</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">שירותי Google Play מתעדכנים או שהם בלתי זמינים באופן זמני. אנא נסה שוב.</string>
@@ -2310,7 +2439,7 @@
     <string name="RegistrationActivity_non_standard_number_format">תסדיר אי־תקני של מספר</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">המספר שהכנסת (%1$s) כנראה בתסדיר בלתי תקני.\n\nהאם התכוונת אל %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - תסדיר מספר טלפון</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - תסדיר מספר טלפון</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">שיחה התבקשה</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2346,8 +2475,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">נתקלת בבעיות בהרשמה?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• לוודא שלטלפון שלך יש אות סלולרי שמאפשר לו לקבל את ה–SMS או השיחה\n • לוודא שיש לך אפשרות לקבל שיחת טלפון למספר\n • לבדוק שהכנסת את מספר הטלפון שלך נכון.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">למידע נוסף, יש לבצע את השלבים הבאים לפתרון תקלות או ליצור קשר עם התמיכה</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">למידע נוסף, יש לבצע את %1$s או %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">השלבים הבאים לפתרון תקלות</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2385,13 +2514,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">הוסף לאנשי קשר</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">הזמן אל Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">הזמן אל Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">הודעת Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">שיחת Signal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">הוסף לאנשי קשר</string>
-    <string name="SharedContactView_invite_to_signal">הזמן אל Signal</string>
+    <string name="SharedContactView_invite_to_signal">הזמן אל Molly</string>
     <string name="SharedContactView_message">הודעת Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2522,11 +2651,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s שייך ל%2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">עדכון Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">גרסה חדשה של Signal זמינה. יש ללחוץ כדי לעדכן.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">עדכון Signal נכשל</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">עדכון Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">גרסה חדשה של Molly זמינה. יש ללחוץ כדי לעדכן.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">עדכון Molly נכשל</string>
     <string name="ApkUpdateNotifications_failed_general_body">ננסה שוב מאוחר יותר.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal עודכנה בהצלחה</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly עודכנה בהצלחה</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">עודכנת אוטומטית לגרסה %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2599,7 +2728,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">מספר ביטחון Signal שלנו:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">נראה שאין לך יישומים לשתף בהם.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">מספר ביטחון להשוואה לא נמצא בלוח העריכה</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal צריך את הרשאת המצלמה על מנת לסרוק קוד QR, אבל היא נדחתה לצמיתות. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"מצלמה\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly צריך את הרשאת המצלמה על מנת לסרוק קוד QR, אבל היא נדחתה לצמיתות. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"מצלמה\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">לא היה ניתן לסרוק קוד QR ללא הרשאת מצלמה</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">אתה חייב תחילה להחליף הודעות על מנת להציג את מספר הביטחון של %1$s.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2629,14 +2758,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">גע כדי לפתוח.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal אינו נעול</string>
-    <string name="KeyCachingService_lock">נעל את Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly אינו נעול</string>
+    <string name="KeyCachingService_lock">נעל את Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">אתה</string>
     <string name="MediaPreviewActivity_unssuported_media_type">סוג מדיה בלתי נתמך</string>
     <string name="MediaPreviewActivity_draft">טיוטה</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal צריך את הרשאת האחסון על מנת לשמור באחסון חיצוני, אבל היא נדחתה לצמיתות. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"אחסון\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly צריך את הרשאת האחסון על מנת לשמור באחסון חיצוני, אבל היא נדחתה לצמיתות. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"אחסון\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">לא היה ניתן לשמור באחסון חיצוני ללא הרשאות</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">למחוק הודעה?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">זה ימחק לצמיתות הודעה זו.</string>
@@ -2684,7 +2813,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">נכשל למסור הודעה.</string>
     <string name="MessageNotifier_error_delivering_message">שגיאה במסירת הודעה.</string>
     <string name="MessageNotifier_message_delivery_paused">מסירת הודעה הושהתה.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">וודא כדי להמשיך להתכתב ב־Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">וודא כדי להמשיך להתכתב ב־Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">סמן הכול כנקרא</string>
     <string name="MessageNotifier_mark_read">סמן כנקרא</string>
     <string name="MessageNotifier_turn_off_these_notifications">כבה התראות אלו</string>
@@ -2706,7 +2835,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">הגיב/ה %1$s לסטיקר שלך.</string>
     <string name="MessageNotifier_this_message_was_deleted">הודעה זו נמחקה.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">לכבות התראות של איש קשר הצטרף אל Signal? אתה יכול לאפשר אותן שוב דרך Signal &lt; הגדרות &lt; התראות.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">לכבות התראות של איש קשר הצטרף אל Molly? אתה יכול לאפשר אותן שוב דרך Molly &lt; הגדרות &lt; התראות.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2745,7 +2874,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">תגובה מהירה אינה זמינה כאשר Signal נעול!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">תגובה מהירה אינה זמינה כאשר Molly נעול!</string>
     <string name="QuickResponseService_problem_sending_message">בעיה בשליחת הודעה!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2765,7 +2894,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">קיצור דרך בלתי תקף</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">הודעה חדשה</string>
     <string name="SingleRecipientNotificationBuilder_message_request">בקשת הודעה</string>
     <string name="SingleRecipientNotificationBuilder_you">את/ה</string>
@@ -2813,7 +2942,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">המכשיר הזה כבר לא רשום. זה כנראה בגלל שרשמת את מספר הטלפון שלך ב–Signal על מכשיר אחר.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">המכשיר הזה כבר לא רשום. זה כנראה בגלל שרשמת את מספר הטלפון שלך ב–Molly על מכשיר אחר.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">רישום מכשיר מחדש</string>
 
@@ -2826,10 +2955,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">כדי לענות אל השיחה, תן אל Signal גישה אל המיקרופון שלך.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">כדי לענות אל השיחה, תן אל Molly גישה אל המיקרופון שלך.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">כדי לענות לשיחת וידאו, Signal צריכה גישה למיקרופון ולמצלמה שלך.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal דורש את ההרשאות של המיקרופון והמצלמה על מנת לבצע שיחות ולענות לשיחות, אבל הן נדחו לצמיתות. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"מיקרופון\" ואת \"מצלמה\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">כדי לענות לשיחת וידאו, Molly צריכה גישה למיקרופון ולמצלמה שלך.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly דורש את ההרשאות של המיקרופון והמצלמה על מנת לבצע שיחות ולענות לשיחות, אבל הן נדחו לצמיתות. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"מיקרופון\" ואת \"מצלמה\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">נענתה על מכשיר מקושר.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">נדחתה על מכשיר מקושר.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">תפוס על מכשיר מקושר.</string>
@@ -2874,16 +3003,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">חזור על משפט־סיסמה חדש</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">הזמן אל Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">הזמן אל Molly</string>
     <string name="contact_selection_activity__new_group">קבוצה חדשה</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">רענון אנשי קשר</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">מישהו חסר? אפשר לנסות לרענן</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">למצוא אנשים שמכירים ב–Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">מתן גישה לאנשי הקשר שלך</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">עוד</string>
 
@@ -2900,7 +3029,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">תמונת איש קשר</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal דורש את הרשאת אנשי הקשר על מנת להציג את אנשי הקשר שלך, אבל היא נדחתה לצמיתות. אנא המשך אל תפריט הגדרות היישום, בחר \"הרשאות\" ואפשר את \"אנשי קשר\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly דורש את הרשאת אנשי הקשר על מנת להציג את אנשי הקשר שלך, אבל היא נדחתה לצמיתות. אנא המשך אל תפריט הגדרות היישום, בחר \"הרשאות\" ואפשר את \"אנשי קשר\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">שגיאה באחזור אנשי קשר, בדוק את חיבור הרשת שלך</string>
     <string name="ContactSelectionListFragment_username_not_found">שם משתמש לא נמצא</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"%1$s לא משתמש/ת Signal. יש לבדוק את שם המשתמש ולנסות שוב."</string>
@@ -2920,16 +3049,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">מצא לפי שם משתמש</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">מתן גישה לאנשי קשר</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">כדי למצוא אנשים שמכירים ב–Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">התר גישה</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">לא תודה</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">צריך לאפשר גישה לאנשי הקשר שלך. אנשי הקשר שלך מוצפנים ואינם גלויים לשירות Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal צריך הרשאה אל אנשי הקשר שלך על מנת להציגם.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly צריך הרשאה אל אנשי הקשר שלך על מנת להציגם.</string>
     <string name="contact_selection_list_fragment__show_contacts">הראה אנשי קשר</string>
 
     <!-- contact_selection_list_item -->
@@ -3006,6 +3137,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">הסרת את האדם הזה, שליחת הודעה תוסיף אותו או אותה מחדש לרשימה שלך.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">אפשרויות</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">עדכן</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">נגן … השהה</string>
@@ -3034,7 +3167,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">בועות הן פיצ׳ר של Android שאפשר לכבות עבור צ׳אטים של Signal.</string>
+    <string name="BubbleOptOutTooltip__description">בועות הן פיצ׳ר של Android שאפשר לכבות עבור צ׳אטים של Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">לא עכשיו</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3216,9 +3349,9 @@
     <string name="EditProfileFragment__group_description">תיאור קבוצה</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">עדכן את Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">עדכן את Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">גרסה זו של Signal כבר לא בתוקף. אפשר לעדכן עכשיו כדי להמשיך להשתמש ב–Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">גרסה זו של Molly כבר לא בתוקף. אפשר לעדכן עכשיו כדי להמשיך להשתמש ב–Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">עדכן</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3437,7 +3570,7 @@
     <string name="preferences__slow">איטי</string>
     <string name="preferences__help">עזרה</string>
     <string name="preferences__advanced">מתקדם</string>
-    <string name="preferences__donate_to_signal">ביצוע תרומה ל–Signal</string>
+    <string name="preferences__donate_to_signal">ביצוע תרומה ל–Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">פרטיות</string>
     <!-- Preference label for stories -->
@@ -3474,13 +3607,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">שינוי סמל ושם אפליקציה ל״%1$s״</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">צריך לסגור את Signal כדי לשנות את סמל ושם האפליקציה. התראות יציגו תמיד את סמל ושם ברירת המחדל של Signal.</string>
+    <string name="preferences__app_icon_dialog_description">צריך לסגור את Molly כדי לשנות את סמל ושם האפליקציה. התראות יציגו תמיד את סמל ושם ברירת המחדל של Molly.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">בוחרים שם וסמל אפליקציה שיהיו גלויים במסך הבית ובמגירת האפליקציות של הטלפון שלך. התראות יציגו תמיד את סמל ושם ברירת המחדל של Signal. למידע נוסף</string>
+    <string name="preferences__app_icon_warning_learn_more">בוחרים שם וסמל אפליקציה שיהיו גלויים במסך הבית ובמגירת האפליקציות של הטלפון שלך. התראות יציגו תמיד את סמל ושם ברירת המחדל של Molly. למידע נוסף</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">סמלי ושמות אפליקציות גלויים במסך הבית ובמגירת האפליקציות.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">התראות יציגו תמיד את סמל ושם ברירת המחדל של Signal.</string>
+    <string name="preferences__app_icon_notification_warning">התראות יציגו תמיד את סמל ושם ברירת המחדל של Molly.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">למידע נוסף</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3529,8 +3662,12 @@
         <item quantity="other">זה יקצץ לצמיתות את כל הצ׳אטים שלך ל–%1$s ההודעות האחרונות.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">זה ימחק לצמיתות את כל היסטוריית ההודעות והמדיה מהמכשיר שלך.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">זה ימחק לצמיתות את כל היסטוריית ההודעות והמדיה מהמכשיר הזה ומכל מכשיר מקושר.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">בטוח שבא לך למחוק את כל היסטוריית ההודעות?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">כל היסטוריית ההודעות תימחק לצמיתות. פעולה זו אינה ניתנת לביטול.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">כל היסטוריית ההודעות תוסר לצמיתות מכל המכשירים. פעולה זו לא ניתנת לביטול.</string>
     <string name="preferences_storage__delete_all_now">למחוק הכל עכשיו</string>
     <string name="preferences_storage__forever">לנצח</string>
     <string name="preferences_storage__one_year">שנה 1</string>
@@ -3569,7 +3706,7 @@
     <string name="preferences_communication__category_censorship_circumvention">עקיפת צנזורה</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">עקיפת צנזורה</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">אם מאופשר, Signal ינסה לעקוף צנזורה. אל תאפשר מאפיין זה אלא אם אתה במיקום שבו Signal מצונזר.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">אם מאופשר, Molly ינסה לעקוף צנזורה. אל תאפשר מאפיין זה אלא אם אתה במיקום שבו Molly מצונזר.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">עקיפת צנזורה הופעלה על סמך מספר הטלפון של החשבון שלך.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3621,7 +3758,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">נעים להכיר: תשלומים</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">משתמשים ב–Signal כדי לשלוח ולקבל MobileCoin, מטבע דיגיטלי חדש ממוקד פרטיות. אפשר להפעיל כדי להתחיל.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">משתמשים ב–Molly כדי לשלוח ולקבל MobileCoin, מטבע דיגיטלי חדש ממוקד פרטיות. אפשר להפעיל כדי להתחיל.</string>
     <string name="PaymentsHomeFragment__activate_payments">הפעל תשלומים</string>
     <string name="PaymentsHomeFragment__activating_payments">מפעיל תשלומים…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">שחזר חשבון תשלומים</string>
@@ -3647,7 +3784,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">תשלומים אינם זמינים באזור שלך.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">לא היה ניתן לאפשר תשלומים. נסה שוב מאוחר יותר.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">לבטל הפעלת תשלומים?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">לא תוכל לשלוח או לקבל MobileCoin ב־Signal אם תבטל הפעלת תשלומים.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">לא תוכל לשלוח או לקבל MobileCoin ב־Molly אם תבטל הפעלת תשלומים.</string>
     <string name="PaymentsHomeFragment__deactivate">בטל הפעלה</string>
     <string name="PaymentsHomeFragment__continue">המשך</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">מאזן אינו זמין כרגע.</string>
@@ -3656,10 +3793,10 @@
     <string name="PaymentsHomeFragment__details">פרטים</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">אפשר להשתמש ב–Signal כדי לשלוח ולקבל MobileCoin. כל התשלומים כפופים לתנאי השימוש עבור MobileCoin וארנק MobileCoin. יש סיכוי להיתקל בבעיות או תשלומים/יתרות שיאבדו לך ולא יהיה ניתן לשחזר. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">אפשר להשתמש ב–Molly כדי לשלוח ולקבל MobileCoin. כל התשלומים כפופים לתנאי השימוש עבור MobileCoin וארנק MobileCoin. יש סיכוי להיתקל בבעיות או תשלומים/יתרות שיאבדו לך ולא יהיה ניתן לשחזר. </string>
     <string name="PaymentsHomeFragment__activate">הפעל</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">הצג תנאי MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">תשלומים ב־Signal אינם זמינים יותר. אתה עדיין יכול להעביר כספים אל מסחר אבל אתה לא יכול יותר לשלוח ולקבל תשלומים או להוסיף כספים.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">תשלומים ב־Molly אינם זמינים יותר. אתה עדיין יכול להעביר כספים אל מסחר אבל אתה לא יכול יותר לשלוח ולקבל תשלומים או להוסיף כספים.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3687,7 +3824,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">הפעלת הרשאות</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">כדי שתהיה אפשרות לשלוח הודעות לאנשים שאת.ה מכיר.ה, Signal תבקש את ההרשאות האלה. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">כדי שתהיה אפשרות לשלוח הודעות לאנשים שאת.ה מכיר.ה, Molly תבקש את ההרשאות האלה. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">התראות</string>
     <!-- Notifications permission row description -->
@@ -3775,10 +3912,10 @@
     <string name="PaymentsTransferFragment__next">הבא</string>
     <string name="PaymentsTransferFragment__invalid_address">כתובת בלתי תקפה</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">בדוק את כתובת הארנק שאתה מנסה להעביר אליה ונסה שוב.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">אתה לא יכול להעביר אל כתובת הארנק של Signal של עצמך. הכנס את כתובת הארנק מהחשבון שלך במסחר נתמך.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">כדי לסרוק קוד QR, היישום Signal צריך גישה אל המצלמה.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal צריך את הרשאת המצלמה כדי ללכוד קוד QR. לך אל הגדרות, בחר \"הרשאות\", ואפשר את \"מצלמה\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">כדי לסרוק קוד QR, היישום Signal צריך גישה אל המצלמה.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">אתה לא יכול להעביר אל כתובת הארנק של Molly של עצמך. הכנס את כתובת הארנק מהחשבון שלך במסחר נתמך.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">כדי לסרוק קוד QR, היישום Molly צריך גישה אל המצלמה.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly צריך את הרשאת המצלמה כדי ללכוד קוד QR. לך אל הגדרות, בחר \"הרשאות\", ואפשר את \"מצלמה\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">כדי לסרוק קוד QR, היישום Molly צריך גישה אל המצלמה.</string>
     <string name="PaymentsTransferFragment__settings">הגדרות</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -4144,17 +4281,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">שיחה קולית נכנסת של Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">שיחה קולית נכנסת של Molly</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">שיחת וידאו נכנסת של Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">שיחת וידאו נכנסת של Molly</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">שיחה קבוצתית נכנסת של Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">שיחה קבוצתית נכנסת של Molly</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">שיחה קולית של Signal מתקיימת עכשיו</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">שיחה קולית של Molly מתקיימת עכשיו</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">שיחת וידאו של Signal מתקיימת עכשיו</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">שיחת וידאו של Molly מתקיימת עכשיו</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">שיחה קבוצתית של Signal מתקיימת עכשיו</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">שיחה קבוצתית של Molly מתקיימת עכשיו</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">טוען…</string>
@@ -4201,9 +4338,9 @@
     <string name="BackupDialog_verify">וודא</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">הכנסת בהצלחה את משפט־סיסמת הגיבוי שלך</string>
     <string name="BackupDialog_passphrase_was_not_correct">משפט־הסיסמה לא היה נכון</string>
-    <string name="LocalBackupJob_creating_signal_backup">יוצר גיבוי Signal…</string>
+    <string name="LocalBackupJob_creating_signal_backup">יוצר גיבוי Molly…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">מאמתים גיבוי של Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">מאמתים גיבוי של Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">גיבוי נכשל</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">תיקיית הגיבוי שלך נמחקה או הועברה.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">קובץ הגיבוי שלך גדול מדי לאחסון בכרך זה.</string>
@@ -4218,15 +4355,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">תתקשרו אלי (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">שליחה מחדש של קוד (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">צור קשר עם תמיכת Signal</string>
-    <string name="RegistrationActivity_code_support_subject">הרשמת Signal - קוד וידוא עבור Android</string>
+    <string name="RegistrationActivity_contact_signal_support">צור קשר עם תמיכת Molly</string>
+    <string name="RegistrationActivity_code_support_subject">הרשמת Molly - קוד וידוא עבור Android</string>
     <string name="RegistrationActivity_incorrect_code">קוד שגוי</string>
     <string name="BackupUtil_never">אף פעם</string>
     <string name="BackupUtil_unknown">בלתי ידוע</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">מספר טלפון</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">אפשר לבחור מי יוכל לראות את מספר הטלפון שלך ומי יוכל ליצור איתך קשר באמצעותו ב–Signal.</string>
+    <string name="preferences_app_protection__choose_who_can_see">אפשר לבחור מי יוכל לראות את מספר הטלפון שלך ומי יוכל ליצור איתך קשר באמצעותו ב–Molly.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">מי יכול לראות את המספר שלי</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4274,7 +4411,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">עשית יותר מדי ניסיונות. אנא נסה שוב מאוחר יותר.</string>
     <string name="RegistrationActivity_error_connecting_to_service">שגיאה בהתחברות אל שירות</string>
     <string name="preferences_chats__backups">גיבויים</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal נעול</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly נעול</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">הקש כדי לשחרר נעילה</string>
     <string name="Recipient_unknown">בלתי ידוע</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4305,9 +4442,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">אתה צריך גישה אל המכשיר הישן שלך.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">שחזר מגיבוי</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">שחזר את ההודעות שלך מגיבוי מקומי. אם לא תשחזר עכשיו, לא תוכל לשחזר מאוחר יותר.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">שחזור גיבוי מקומי</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">שחזור גיבוי Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">שחזור כל הודעות הטקסט + מדיה מ–30 הימים האחרונים</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">עוד אפשרויות</string>
 
+    <string name="TransferOrRestoreFragment__cancel">ביטול</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">להתחבר בלי להעביר</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">להמשיך בלי להעביר את ההודעות והמדיה שלך</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">פתח את Signal בטלפון Android הישן שלך</string>
     <string name="NewDeviceTransferInstructions__continue">המשך</string>
@@ -4322,19 +4466,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">מתכונן להתחבר אל מכשיר Android ישן…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">רק רגע, זה יהיה מוכן בקרוב</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">ממתין אל מכשיר Android ישן שיתחבר…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal צריך את הרשאת המיקום כדי לגלות ולהתחבר אל מכשיר ה־Android הישן שלך.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal צריך שירותי מיקום מופעלים כדי לגלות ולהתחבר אל מכשיר ה־Android הישן שלך.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal צריך Wi-Fi מופעל כדי לגלות להתחבר אל מכשיר ה־Android הישן שלך. Wi-Fi צריך להיות מופעל אבל הוא לא חייב להיות מחובר אל רשת Wi-Fi.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">סליחה, נראה שמכשיר זה אינו תומך ב־Wi-Fi Direct. היישום Signal משתמש ב־Wi-Fi Direct כדי לגלות להתחבר אל מכשיר Android הישן שלך. אתה עדין יכול לשחזר גיבוי כדי לשחזר את החשבון שלך ממכשיר ה־Android הישן שלך.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly צריך את הרשאת המיקום כדי לגלות ולהתחבר אל מכשיר ה־Android הישן שלך.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly צריך שירותי מיקום מופעלים כדי לגלות ולהתחבר אל מכשיר ה־Android הישן שלך.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly צריך Wi-Fi מופעל כדי לגלות להתחבר אל מכשיר ה־Android הישן שלך. Wi-Fi צריך להיות מופעל אבל הוא לא חייב להיות מחובר אל רשת Wi-Fi.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">סליחה, נראה שמכשיר זה אינו תומך ב־Wi-Fi Direct. היישום Molly משתמש ב־Wi-Fi Direct כדי לגלות להתחבר אל מכשיר Android הישן שלך. אתה עדין יכול לשחזר גיבוי כדי לשחזר את החשבון שלך ממכשיר ה־Android הישן שלך.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">שחזר גיבוי</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">שגיאה בלתי צפויה התרחשה בזמן ניסיון להתחבר אל מכשיר ה־Android הישן שלך.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">מחפש מכשיר Android חדש…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal צריך את הרשאת המיקום כדי לגלות ולהתחבר אל מכשיר ה־Android החדש שלך.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal צריך שירותי מיקום מופעלים כדי לגלות ולהתחבר אל מכשיר ה־Android החדש שלך.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal צריך Wi-Fi מופעל כדי לגלות להתחבר אל מכשיר ה־Android החדש שלך. Wi-Fi צריך להיות מופעל אבל הוא לא חייב להיות מחובר אל רשת Wi-Fi.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">סליחה, נראה שמכשיר זה אינו תומך ב־Wi-Fi Direct. היישום Signal משתמש ב־Wi-Fi Direct כדי לגלות להתחבר אל מכשיר Android החדש שלך. אתה עדין יכול ליצור גיבוי כדי לשחזר את החשבון שלך במכשיר ה־Android החדש שלך.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly צריך את הרשאת המיקום כדי לגלות ולהתחבר אל מכשיר ה־Android החדש שלך.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly צריך שירותי מיקום מופעלים כדי לגלות ולהתחבר אל מכשיר ה־Android החדש שלך.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly צריך Wi-Fi מופעל כדי לגלות להתחבר אל מכשיר ה־Android החדש שלך. Wi-Fi צריך להיות מופעל אבל הוא לא חייב להיות מחובר אל רשת Wi-Fi.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">סליחה, נראה שמכשיר זה אינו תומך ב־Wi-Fi Direct. היישום Molly משתמש ב־Wi-Fi Direct כדי לגלות להתחבר אל מכשיר Android החדש שלך. אתה עדין יכול ליצור גיבוי כדי לשחזר את החשבון שלך במכשיר ה־Android החדש שלך.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">צור גיבוי</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">שגיאה בלתי צפויה התרחשה בזמן ניסיון להתחבר אל מכשיר ה־Android החדש שלך.</string>
 
@@ -4375,7 +4519,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">מעביר נתונים</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">השאר את שני המכשירים קרובים זה לזה. אל תכבה את המכשירים והשאר את Signal פתוח. העברות מוצפנות מקצה־אל־קצה.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">השאר את שני המכשירים קרובים זה לזה. אל תכבה את המכשירים והשאר את Molly פתוח. העברות מוצפנות מקצה־אל־קצה.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d הודעות עד כה…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% מההודעות עד כה…</string>
@@ -4389,7 +4533,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">העבר חשבון</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">הורד את Signal במכשיר Android החדש שלך</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">הורד את Molly במכשיר Android החדש שלך</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"הקש על \"העבר או שחזר חשבון\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4463,7 +4607,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">כל אחד עם קישור זה יכול לראות את השם והתמונה של הקבוצה ולבקש להצטרף. שתף אותו עם אנשים שאתה בוטח בהם.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">כל אחד עם קישור זה יכול לראות את השם והתמונה של הקבוצה ולהצטרף אל הקבוצה. שתף אותו עם אנשים שאתה בוטח בהם.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">שתף באמצעות Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">שתף באמצעות Molly</string>
     <string name="GroupLinkBottomSheet_copy">העתק</string>
     <string name="GroupLinkBottomSheet_qr_code">קוד QR:</string>
     <string name="GroupLinkBottomSheet_share">שתף</string>
@@ -4663,7 +4807,7 @@
     <string name="payment_info_card_about_mobilecoin">על אודות MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin הוא מטבע דיגיטלי ממוקד פרטיות חדש.</string>
     <string name="payment_info_card_adding_funds">הוספת כספים</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">אתה יכול להוסיף כספים לשימוש ב־Signal ע״י שליחת MobileCoin אל כתובת הארנק שלך.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">אתה יכול להוסיף כספים לשימוש ב־Molly ע״י שליחת MobileCoin אל כתובת הארנק שלך.</string>
     <string name="payment_info_card_cashing_out">פדיון</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">אתה יכול לפדות MobileCoin בכל זמן במסחר שתומך ב־MobileCoin. פשוט בצע העברה אל החשבון שלך במסחר הזה.</string>
     <string name="payment_info_card_hide_this_card">להסתיר כרטיס זה?</string>
@@ -4684,12 +4828,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">בטל הפעלת ארנק</string>
     <string name="DeactivateWalletFragment__your_balance">המאזן שלך</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">מומלץ להעביר את הכספים שלך לכתובת ארנק אחרת לפני ביטול ההפעלה של תשלומים. במקרה של בחירה לא להעביר את הכספים עכשיו, הם יישארו בארנק שמקושר אל Signal בעת הפעלה מחדש של תשלומים.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">מומלץ להעביר את הכספים שלך לכתובת ארנק אחרת לפני ביטול ההפעלה של תשלומים. במקרה של בחירה לא להעביר את הכספים עכשיו, הם יישארו בארנק שמקושר אל Molly בעת הפעלה מחדש של תשלומים.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">העבר מאזן נותר</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">בטל הפעלה בלי להעביר</string>
     <string name="DeactivateWalletFragment__deactivate">בטל הפעלה</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">לבטל הפעלה בלי להעביר?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">היתרה שלך תישאר בארנק שמקושר אל Signal במקרה של בחירה להפעיל מחדש את תשלומים.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">היתרה שלך תישאר בארנק שמקושר אל Molly במקרה של בחירה להפעיל מחדש את תשלומים.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">שגיאה בביטול הפעלת ארנק.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4988,7 +5132,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">רישיונות</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">תנאים ומדיניות פרטיות</string>
-    <string name="HelpFragment__copyright_signal_messenger">זכויות יוצרים Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">זכויות יוצרים Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">ברישיון תחת GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -5003,7 +5147,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">אוטומטי</string>
+    <string name="ChatColorSelectionFragment__auto">אוטומט</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">השתמש בצבעים מותאמים אישית</string>
     <string name="ChatColorSelectionFragment__chat_color">צבע צ\'אט</string>
     <string name="ChatColorSelectionFragment__edit">ערוך</string>
@@ -5235,9 +5379,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">בחר צבע</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">מסרון</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">שתף</string>
 
@@ -5279,7 +5420,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">רק מנהלים יכולים לשלוח הודעות לקבוצה זו.</string>
-    <string name="MultiselectForwardFragment__limit_reached">מגבלה הושגה</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">אי אפשר לבחור יותר מ–5 צ׳אטים</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5460,9 +5602,9 @@
     <string name="MySupportPreference__learn_more">למידע נוסף</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">עדכן את Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">עדכן את Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">גרסה זו של Signal כבר לא בתוקף. אפשר לעדכן עכשיו כדי להמשיך להשתמש ב–Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">גרסה זו של Molly כבר לא בתוקף. אפשר לעדכן עכשיו כדי להמשיך להשתמש ב–Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">עדכן</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5471,7 +5613,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">המכשיר לא רשום</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">המכשיר הזה כבר לא רשום. אפשר לרשום אותו מחדש כדי להמשיך להשתמש ב–Signal במכשיר הזה.</string>
+    <string name="ReregisterSignalDialog__message">המכשיר הזה כבר לא רשום. אפשר לרשום אותו מחדש כדי להמשיך להשתמש ב–Molly במכשיר הזה.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">רשום מחדש</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5765,7 +5907,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">נכשל בפתיחת בורר.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">כדי לאפשר התראות, Signal צריכה הרשאה להציג אותן.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">כדי לאפשר התראות, Molly צריכה הרשאה להציג אותן.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">הפעלה</string>
 
@@ -5920,8 +6062,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">אין תשובות עדין</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">אין לך אפשרות להשיב לסטורי הזה בגלל שאינך חלק מהקבוצה הזו יותר.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">הגיב/ה לסטורי</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">הגבת לסטורי</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">הגיב/ה לסטורי</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">צפיות</string>
     <!-- Label for story replies tab -->
@@ -6572,8 +6716,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">בחירת הבנק שלך</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">אישור התרומה שלך עם %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">כדי להגדיר את התרומה החוזרת שלך, יש ללחוץ על המשך כדי לאשר חיוב של €0.01 בבנק שלך. זה יוחזר אוטומטית ויאפשר לחייב את התרומה החוזרת שלך על סך €5 לחודש מהחשבון שלך.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">כדי להגדיר את התרומה החוזרת שלך, יש ללחוץ על המשך כדי לאשר חיוב של €0.01 בבנק שלך. זה יוחזר אוטומטית ויאפשר לחייב את התרומה החוזרת שלך על סך %1$s לחודש מהחשבון שלך.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">המשך</string>
 
@@ -7163,6 +7307,56 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">מורידים נתוני גיבוי…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">גיבויי המדיה כבויים</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">תכנית גיבוי המדיה שלך ב–Signal בוטלה כי לא הצלחנו לעבד את התשלום שלך. יש לך יום %1$d להוריד כל מדיה שמאוחסנת בגיבוי שלך. אחרי יום %1$d, המדיה בגיבוי שלך תימחק.</item>
+        <item quantity="two">תכנית גיבוי המדיה שלך ב–Signal בוטלה כי לא הצלחנו לעבד את התשלום שלך. יש לך יומיים להוריד כל מדיה שמאוחסנת בגיבוי שלך. אחרי יומיים, המדיה בגיבוי שלך תימחק.</item>
+        <item quantity="many">תכנית גיבוי המדיה שלך ב–Signal בוטלה כי לא הצלחנו לעבד את התשלום שלך. יש לך %1$d ימים להוריד כל מדיה שמאוחסנת בגיבוי שלך. אחרי %1$d ימים, המדיה בגיבוי שלך תימחק.</item>
+        <item quantity="other">תכנית גיבוי המדיה שלך ב–Signal בוטלה כי לא הצלחנו לעבד את התשלום שלך. יש לך %1$d ימים להוריד כל מדיה שמאוחסנת בגיבוי שלך. אחרי %1$d ימים, המדיה בגיבוי שלך תימחק.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">אפשר לחזור לשלם על גיבויים בכל עת כדי להמשיך לגבות את כל המדיה שלך. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">המדיה שלך תימחק היום</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">תכנית גיבוי המדיה שלך ב–Signal בוטלה כי לא הצלחנו לעבד את התשלום שלך. זו ההזדמנות האחרונה שלך להוריד את המדיה שבגיבוי שלך לפני שהיא נמחקת.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">לא ניתן להשלים את ההורדה</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">אין מספיק מקום פנוי במכשיר שלך. יש לפנות שטח של %1$s כדי להוריד את המדיה שמאוחסנת בגיבוי שלך.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">בחירה ב״דילוג״ תגרום למחיקת המדיה בגיבוי שלך בעוד יום %1$d.</item>
+        <item quantity="two">בחירה ב״דילוג״ תגרום למחיקת המדיה בגיבוי שלך בעוד יומיים.</item>
+        <item quantity="many">בחירה ב״דילוג״ תגרום למחיקת המדיה בגיבוי שלך בעוד %1$d ימים.</item>
+        <item quantity="other">בחירה ב״דילוג״ תגרום למחיקת המדיה בגיבוי שלך בעוד %1$d ימים.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">לא ניתן לעבד תשלום על גיבוי</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">נתקלנו בבעיה באיסוף תשלום הגיבוי החודשי שלך. חשוב לוודא שאמצעי התשלום שלך מעודכן. אם לא, צריך לעדכן אותו ב–Google Play. Signal תנסה לעבד את התשלום שוב בעוד כמה ימים.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">לא היה ניתן להשלים את הגיבוי</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">המכשיר שלך לא השלים גיבוי במשך %1$d ימים. חשוב לוודא שהמכשיר מחובר ל–Wi-Fi וללחוץ ״לגבות כעת״. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">למידע נוסף</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">דלג</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">הורדת מדיה כעת</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">הורדה אחר כך</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">לא להוריד מדיה</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">יש לפנות שטח של %1$s כדי להוריד את המדיה שלך.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">כרטיס אשראי או דביט</string>
@@ -7176,16 +7370,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">בלתי ידוע</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">היסטוריית תשלומים</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">הגיבוי האחרון שלך התבצע ב–%1$s בשעה %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">מגבלת צ׳אט</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">מגבלות אורך צ׳אט</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">מחיקת היסטוריית הודעות</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">הודעות ישנות יותר מטווח הזמן שנבחר יימחקו לצמיתות.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">הודעות החורגות מהאורך שנבחר יימחקו לצמיתות.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">החלת מגבלות על מכשירים מקושרים</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">כשאפשרות זו מופעלת, מגבלות הצ׳אט ימחקו הודעות גם מהמכשירים המקושרים שלך.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">המחיקה מסונכרנת כעת בכל המכשירים שלך</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">בעת מחיקת הודעות או צ׳אטים, הם יימחקו מהטלפון שלך ומהמכשירים המקושרים.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">אישור</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">היסטוריית תשלומים</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">גיבוי טקסט וכל המדיה</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">פרטי תשלום</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">סוג גיבוי</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">תאריך תשלום</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">שתף</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">גיבויי Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">היסטוריית תשלומים</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">פרטי גיבוי</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">נפח גיבוי</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">תדירות גיבוי</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">גיבוי באמצעות נתונים ניידים</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">כיבוי ומחיקת גיבויים</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">הגיבוי נמחק וכובה.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">סוג הגיבוי השתנה והמנוי בוטל</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">מינוי בוטל</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">ההורדה הושלמה</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">סוג גיבוי</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">גיבויים הושבתו</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s לחודש</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">אפשר גיבויים</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">גיבוי אחרון</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s בשעה %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">אף פעם</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">לגבות כעת</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">לכבות ולמחוק גיבויים?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">לא נחייב אותך שוב. הגיבוי שלך יימחק ולא ייווצרו גיבויים חדשים.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">כיבוי ומחיקה</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">מוחקים גיבוי…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">הגיבוי נמחק</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"באמצעות לחיצה על ׳לגבות כעת׳"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">יומית</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">שבועית</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">חודשית</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">גיבוי ידני</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">יש להכניס את קוד ה–PIN, הסיסמה, או התבנית של המכשיר שלך.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">הבא</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">שינוי סוג גיבוי</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">ביטול מנוי</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">אישור ביטול</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">לא נחייב אותך שוב. הגיבויים יכובו בסוף מחזור החיוב הנוכחי שלך. אחרי התאריך הזה, יהיו לך 30 יום להוריד את המדיה שנמצאת בגיבוי כרגע.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">אישור והורדה כעת</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">אישור והורדה אחר כך</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">שמירה על מנוי</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index d7a0894229..248d9947f2 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signalをアップデートしています…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Mollyをアップデートしています…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">パスフレーズが設定されていません！</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">パスフレーズを無効にしますか？</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">これにより、Signalとメッセージ通知のロックが完全に解除されます。</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">これにより、Mollyとメッセージ通知のロックが完全に解除されます。</string>
     <string name="ApplicationPreferencesActivity_disable">無効</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">サーバ接続中にエラーが発生しました！</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">登録ロックを使うにはPINが必要です。PINを無効にするには、まず登録ロックを無効にしてください。</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">ファイル</string>
     <string name="AttachmentKeyboard_contact">連絡先</string>
     <string name="AttachmentKeyboard_location">場所</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signalで写真や動画を表示するためには、許可が必要です</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Mollyで写真や動画を表示するためには、許可が必要です</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">アクセスを許可する</string>
     <string name="AttachmentKeyboard_payment">決済</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">メディアを選択するアプリが見つかりません。</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">写真や動画、音声データを添付するには、Signalにストレージへのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アクセス許可」で「ストレージ」を有効にしてください。</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">連絡先情報を添付するには、Signalに連絡先へのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「連絡先」を有効にしてください。</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">位置情報を添付するには、Signalに位置情報へのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「位置情報」を有効にしてください。</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">写真や動画、音声データを添付するには、Mollyにストレージへのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アクセス許可」で「ストレージ」を有効にしてください。</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">連絡先情報を添付するには、Mollyに連絡先へのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「連絡先」を有効にしてください。</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">位置情報を添付するには、Mollyに位置情報へのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「位置情報」を有効にしてください。</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">現在地へのアクセスを許可する</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">現在地の送信に必要です：</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">現在地を送信するために、Signalにアクセスを許可する。</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">現在地を送信するために、Mollyにアクセスを許可する。</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signalは、現在地を送信するために位置情報へのアクセスが必要です。</string>
+    <string name="AttachmentManager_signal_needs_location_access">Mollyは、現在地を送信するために位置情報へのアクセスが必要です。</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">ストレージへのアクセスを許可する</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">写真や動画を表示するには：</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signalで写真や動画を表示するためには、ストレージへのアクセスが必要です。</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Mollyで写真や動画を表示するためには、ストレージへのアクセスが必要です。</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s さんは決済機能を有効にしていません </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">カメラを変更</string>
     <string name="CameraXFragment_open_gallery_description">ギャラリーを開く</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">アクセスを許可する</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">カメラとマイクへのアクセスを許可する</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">カメラへのアクセスを許可する</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">マイクへのアクセスの許可</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">写真を撮るために、Signalにカメラへのアクセスを許可してください。</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">写真や動画を撮るには、Signalにカメラへのアクセスを許可してください。</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">写真や動画を撮るには、Signalにカメラとマイクへのアクセスを許可してください。</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">音声付きの動画を撮るには、Signalにマイクへのアクセスを許可してください。</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">QRコードをスキャンするには、Signalにカメラへのアクセスを許可してください。</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signalは、写真を撮るためにカメラへのアクセスが必要です</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signalは、QRコードをスキャンするためにカメラへのアクセスが必要です</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signalは、動画を撮るためにマイクへのアクセスが必要です</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Signalで写真を撮るには：</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Signalで写真や動画を撮るには：</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">音声付きの動画を撮るには：</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QRコードをスキャンするには：</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">最近使った連絡先</string>
@@ -270,7 +271,7 @@
     <string name="CameraContacts_no_signal_contacts">Signalの連絡先はありません</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">カメラボタンだけでSignalの連絡先へ写真を送信できます。 </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">探している人が見つかりませんか？</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">連絡先をSignalへ招待する</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">連絡先をMollyへ招待する</string>
     <string name="CameraContacts__menu_search">検索</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -284,12 +285,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">今はしない</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Signalをアップデートしてください</string>
+    <string name="ClientDeprecatedActivity_update_signal">Mollyをアップデートしてください</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">このバージョンはサポートされていません。メッセージの送受信を続けるには、最新バージョンにアップデートしてください。</string>
     <string name="ClientDeprecatedActivity_update">アップデートする</string>
     <string name="ClientDeprecatedActivity_dont_update">アップデートしない</string>
     <string name="ClientDeprecatedActivity_warning">ご注意ください</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">このバージョンのSignalは期限が切れています。メッセージの履歴は閲覧できますが、アップデートするまで送受信はできません。</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">このバージョンのMollyは期限が切れています。メッセージの履歴は閲覧できますが、アップデートするまで送受信はできません。</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">ウェブブラウザが見つかりません。</string>
@@ -326,8 +327,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">%1$s にメッセージを送る</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly音声通話 %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Mollyビデオ通話 %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -419,7 +420,7 @@
     <string name="ConversationActivity_transport_signal">Signalメッセージ</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">メッセージを送信</string>
-    <string name="ConversationActivity_lets_switch_to_signal">メッセージアプリをSignalにしましょう %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">メッセージアプリをMollyにしましょう %1$s</string>
     <string name="ConversationActivity_specify_recipient">連絡先を選択してください</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">添付ファイルのサイズが、送信するメッセージタイプに応じた制限を超えています。</string>
     <string name="ConversationActivity_unable_to_record_audio">録音できません！</string>
@@ -438,18 +439,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">音声メッセージ送信に必要です：</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">音声メッセージを送信するには、Signalのマイクへのアクセスを許可してください。</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">音声メッセージを送信するには、Mollyのマイクへのアクセスを許可してください。</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signalは、音声メッセージを録音するためにマイクへのアクセスが必要です。</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">音声メッセージを添付するには、Signalにマイクへのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「マイク」を有効にしてください。</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Mollyは、音声メッセージを録音するためにマイクへのアクセスが必要です。</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">音声メッセージを添付するには、Mollyにマイクへのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「マイク」を有効にしてください。</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s と通話するには、Signalにマイクとカメラへのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「マイク」と「カメラ」を有効にしてください。</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">写真や動画を撮るには、Signalにカメラへのアクセスを許可してください。</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">写真や動画を撮るには、Signalにカメラへのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「カメラ」を有効にしてください。</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">写真や動画を撮るにはSignalにカメラへのアクセス許可が必要です</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s と通話するには、Mollyにマイクとカメラへのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「マイク」と「カメラ」を有効にしてください。</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">写真や動画を撮るには、Mollyにカメラへのアクセスを許可してください。</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">写真や動画を撮るには、Mollyにカメラへのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「カメラ」を有効にしてください。</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">写真や動画を撮るにはMollyにカメラへのアクセス許可が必要です</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">音声付きで動画を撮影するためにマイクへのアクセスを許可します。</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">動画を撮るには、Signalにマイクへのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「マイク」と「カメラ」を有効にしてください。</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">動画を撮るには、Signalにマイクへのアクセス許可が必要です。</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">動画を撮るには、Mollyにマイクへのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「マイク」と「カメラ」を有効にしてください。</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">動画を撮るには、Mollyにマイクへのアクセス許可が必要です。</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">いいえ</string>
@@ -470,9 +471,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">通話開始に必要です：</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">通話を開始するには、Signalにマイクへのアクセスを許可してください。</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">通話を開始するには、Mollyにマイクへのアクセスを許可してください。</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signalは、通話を開始するためにマイクへのアクセスが必要です。</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Mollyは、通話を開始するためにマイクへのアクセスが必要です。</string>
 
 
     <string name="ConversationActivity_join">参加する</string>
@@ -486,9 +487,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">SMSメッセージはSignalでサポートされなくなりました。%1$sをSignalへ招待して会話を続けてください。</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">この方は、もうSignalを使っていません。Signalへ招待して会話を続けてください。</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">この方は、もうMollyを使っていません。Mollyへ招待して会話を続けてください。</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Signalへの招待</string>
+    <string name="ConversationActivity__invite_to_signal">Mollyへの招待</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">まもなくリマインドされます。</string>
 
@@ -536,6 +537,8 @@
     <string name="ConversationFragment_delete_for_everyone">全員分を消去</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">この端末から消去する</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">消去する</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">すべての端末から消去する</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">このメッセージは、チャットの参加者全員が最新バージョンのSignalを使用している場合、全員に対して消去されます。参加者には、あなたがメッセージを消去したことがわかります。</string>
@@ -567,13 +570,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">ブロック済</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Signalをアップデートしてください</string>
+    <string name="ConversationFragment__update_build">Mollyをアップデートしてください</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Signal を再登録する</string>
+    <string name="ConversationFragment__reregister_signal">Molly を再登録する</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">戻る</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signalを開きます</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Mollyを開きます</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">連絡先の相手を確認できません</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -636,6 +639,10 @@
     <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
         <item quantity="other">選択した %1$d 件のチャットを完全に消去します。</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="other">選択した%1$d件のチャットを、すべての端末から完全に消去します。</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">削除しています</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="other">選択したチャットを消去中です…</item>
@@ -719,9 +726,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">私を電話番号から検索できる人は？</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">あなたの電話番号を知っている人は誰でも、あなたがSignal利用者であることがわかり、チャットを始めることができます。</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">あなたの電話番号を知っている人は誰でも、あなたがMolly利用者であることがわかり、チャットを始めることができます。</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">あなたからメッセージを送るか、以前からチャットをやりとりしていない限り、あなたがSignalを利用していることは誰にもわかりません。</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">あなたからメッセージを送るか、以前からチャットをやりとりしていない限り、あなたがMollyを利用していることは誰にもわかりません。</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">バックアップから復元しますか？</string>
@@ -755,7 +762,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">バックアップ用パスフレーズが合っているか確認してください</string>
     <string name="BackupsPreferenceFragment__turn_on">有効にする</string>
     <string name="BackupsPreferenceFragment__turn_off">無効にする</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"バックアップを復元するには、新しいSignalをインストールしてください。その後アプリを開き、「バックアップを復元する」をタップしてバックアップファイルの場所を指定します。 %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"バックアップを復元するには、新しいMollyをインストールしてください。その後アプリを開き、「バックアップを復元する」をタップしてバックアップファイルの場所を指定します。 %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">詳しく見る</string>
     <string name="BackupsPreferenceFragment__in_progress">実行しています…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -763,7 +770,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">これまで %1$d…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%%完了</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">バックアップを作成するには、Signalに外部ストレージへのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「ストレージ」を有効にしてください。</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">バックアップを作成するには、Mollyに外部ストレージへのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「ストレージ」を有効にしてください。</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">バックアップする時間を設定する</string>
 
@@ -830,7 +837,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">セッションが更新されました</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signalはエンドツーエンドの暗号化を使用しており、時々セッションの更新が必要な場合があります。これはチャットのセキュリティには影響しませんが、この連絡先からのメッセージを失った可能性があるため、再送を依頼することができます。</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Mollyはエンドツーエンドの暗号化を使用しており、時々セッションの更新が必要な場合があります。これはチャットのセキュリティには影響しませんが、この連絡先からのメッセージを失った可能性があるため、再送を依頼することができます。</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">DesktopまたはiPadでSignalを使用してください。メッセージはリンク済み端末で同期されます。</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">新しい端末をリンクする</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$sのメッセージ情報とチャット情報は、すべての端末でエンドツーエンドの暗号化で保護されています</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">DesktopまたはiPad上のSignal</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">リンク済み端末上のすべてのメッセージはプライバシーが保護されています</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Molly メッセージは、リンク後にお使いのスマートフォンの Molly と同期されます。以前のメッセージ履歴は表示されません。</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">他の端末でMollyをインストールするには、%1$sにアクセスしてください</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">リンク済み端末</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">リンクを解除する</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$sのリンクが解除されました</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">端末をリンクしています</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">端末がリンクされました</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">読み込んでいます…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">リンク済み端末はありません</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">端末をリンクするためにロックを解除する</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">リンクする端末に表示されているQRコードをスキャンしてください。</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">QRコードをスキャンする</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">この端末を使用して、リンクしたい端末に表示されているQRコードをスキャンします</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">OK</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">この端末は、あなたのグループや連絡先を確認したり、チャットにアクセスしたり、自分の名前でメッセージを送信することができるようになります。</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">他の端末でのリンクを終了します</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">他の端末でのMollyのリンクを終了します。</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">端末のリンクに失敗しました</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">このQRコードは無効です。リンクしたい端末に表示されているQRコードであるか確認してください。</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">再試行</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">「%1$s」のリンクを解除しますか？</string>
@@ -852,10 +914,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Google Play開発者サービスの不在に対応する</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">この端末はGoogle Play開発者サービスをサポートしていません。Signalがいつでもメッセージを受信できるよう、タップしてバッテリー最適化機能を無効にしてください。</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">この端末はGoogle Play開発者サービスをサポートしていません。Mollyがいつでもメッセージを受信できるよう、タップしてバッテリー最適化機能を無効にしてください。</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">このバージョンのSignalは期限が切れています。メッセージを送受信するには、アップデートしてください。</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">このバージョンのMollyは期限が切れています。メッセージを送受信するには、アップデートしてください。</string>
     <string name="ExpiredBuildReminder_update_now">アップデートする</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -865,8 +927,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">表示する</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Signalの永続的な通信エラー！</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Google Play開発者サービスにSignalを登録できなかったため、Signalのメッセージと通話は無効になっています。設定 &gt; 詳細設定で再登録を試してください。</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Mollyの永続的な通信エラー！</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Google Play開発者サービスにMollyを登録できなかったため、Mollyのメッセージと通話は無効になっています。設定 &gt; 詳細設定で再登録を試してください。</string>
 
 
     <!-- GiphyActivity -->
@@ -992,20 +1054,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">デバッグログは、問題の診断と修正に役立てられます。個人を特定する情報は含まれません。</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signalに問題が発生しました。 デバッグログを送信しますか？</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Mollyに問題が発生しました。 デバッグログを送信しますか？</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">バッテリーの最適化のために通知が遅れることがあります</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Signal のアプリ情報でバッテリーの最適化を無効にすると、メッセージ通知がすみやかに表示されます。</string>
+    <string name="PromptBatterySaverBottomSheet__message">Molly のアプリ情報でバッテリーの最適化を無効にすると、メッセージ通知がすみやかに表示されます。</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">バッテリーの最適化のために通知が遅れることがあります</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Mollyのアプリ情報でバッテリーの最適化を無効にすると、メッセージ通知がすみやかに表示されます。「続ける」をタップすると、端末ごとの手順が表示されます。</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">今はしない</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">続行</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">続行</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">キャンセル</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">今はしない</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">保留中のグループ招待</string>
+    <string name="PendingMembersActivity_pending_group_invites">申請と招待</string>
     <string name="PendingMembersActivity_requests">申請</string>
     <string name="PendingMembersActivity_invites">招待</string>
     <string name="PendingMembersActivity_people_you_invited">あなたが招待した人々</string>
@@ -1244,12 +1316,12 @@
     <string name="InviteActivity_cancel">キャンセル</string>
     <string name="InviteActivity_sending">送信しています…</string>
     <string name="InviteActivity_invitations_sent">招待状を送信しました！</string>
-    <string name="InviteActivity_invite_to_signal">Signalへの招待</string>
+    <string name="InviteActivity_invite_to_signal">Mollyへの招待</string>
     <string name="InviteActivity_send_sms">SMSを送信する (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="other">%1$d件のSMS招待状を送信しますか？</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">メッセージアプリをSignalにしましょう: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">メッセージアプリをMollyにしましょう: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">共有先として使えるアプリがないようです。</string>
 
     <!-- LearnMoreTextView -->
@@ -1263,7 +1335,7 @@
     <string name="LongMessageActivity_your_message">あなたのメッセージ</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">バックグラウンド通信は有効です</string>
 
     <!-- MediaOverviewActivity -->
@@ -1327,10 +1399,10 @@
     <string name="MessageQuotesBottomSheet_replies">返信</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal通話を接続しています</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly通話を接続しています</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signalコールサービスを開始する</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal通話サービスを停止しています</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Mollyコールサービスを開始する</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly通話サービスを停止しています</string>
     <string name="NotificationBarManager__cancel_call">通話をキャンセル</string>
 
     <!-- NotificationsMegaphone -->
@@ -1574,6 +1646,14 @@
     <string name="MessageRecord_you_activated_payments">決済機能を有効にしました</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s さんが決済機能を有効にしました</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">決済の詳細は表示できません</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">タップして他の候補を表示</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">決済の詳細は表示できません</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">この決済に関する詳細は、この決済履歴が含まれていないソースからメッセージが復元されたため表示できません。ですが、これによるウォレット残高や過去の支払い状況への影響はありません。</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1628,9 +1708,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Signalでは、まもなくSMSメッセージを送信できなくなります。%1$sをSignalへ招待して会話を続けてください。</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">SignalでSMSメッセージを送信できなくなりました。%1$sをSignalへ招待して会話を続けてください。</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">MollyでSMSメッセージを送信できなくなりました。%1$sをMollyへ招待して会話を続けてください。</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">支払い： %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">決済</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">スパムとして報告する</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1704,7 +1786,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Signal端末をリンクしますか？</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">サードパーティのスキャナを使って端末をリンクしようとしていますが、安全のためSignal内からもう一度コードをスキャンしてください。</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">QRコードをスキャンするには、Signalにカメラへのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「カメラ」を有効にしてください。</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">QRコードをスキャンするには、Mollyにカメラへのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「カメラ」を有効にしてください。</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">カメラへのアクセス許可がないとQRコードをスキャンできません</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1716,11 +1798,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">パスフレーズを入力してください</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signalアイコン</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Mollyアイコン</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">パスフレーズを設定する</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">不正なパスフレーズです！</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signalのロックを解除する</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - ロック画面</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Mollyのロックを解除する</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - ロック画面</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">地図</string>
@@ -1786,7 +1868,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">メッセージ送受信のため認証してください</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Signalがスパムを回避するために、認証を完了していください。</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Mollyがスパムを回避するために、認証を完了していください。</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">認証後は、メッセージの送受信を再開できます。保留中のメッセージは、自動で送信されます。</string>
 
     <!-- Recipient -->
@@ -1794,7 +1876,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">マイストーリー</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal 通話</string>
+    <string name="Recipient_signal_call">Molly 通話</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">ブロックする</string>
@@ -1808,7 +1890,8 @@
     <string name="RedPhone_ringing">呼び出しています…</string>
     <string name="RedPhone_busy">話し中</string>
     <string name="RedPhone_recipient_unavailable">応答なし</string>
-    <string name="RedPhone_network_failed">ネットワークエラー！</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">ネットワークエラー！ ネットワーク接続を確認して再度試してください。</string>
     <string name="RedPhone_number_not_registered">未登録番号です！</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">ダイヤル先は安全な音声通話をサポートしていません！</string>
     <string name="RedPhone_got_it">わかりました</string>
@@ -1819,8 +1902,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">タップして動画を有効にする</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s と通話するには、Signalにカメラへのアクセスを許可してください。</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s と通話するには、Mollyにカメラへのアクセスを許可してください。</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">呼び出しています…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">再接続しています…</string>
@@ -1868,10 +1951,30 @@
     <string name="WebRtcCallActivity__removed_from_call">通話から退出しました</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">メンバーがあなたを通話から退出させました。</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">カメラとマイクへのアクセスを許可する</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">マイクへのアクセスの許可</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">カメラへのアクセスを許可する</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">通話を開始したり参加したりするには、Mollyにカメラとマイクへのアクセスを許可してください。</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">通話を開始するには、Mollyにマイクへのアクセスを許可してください。</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">動画を有効にするには、Mollyにカメラへのアクセスを許可してください。</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Mollyが通話を開始したり参加したりするには、マイクへのアクセス許可が必要です。</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Mollyは、動画を有効にするためにカメラへのアクセスが必要です</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">通話を開始、または参加するには：</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">動画を有効にする：</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal通話</string>
-    <string name="WebRtcCallView__signal_video_call">Signalビデオ通話</string>
+    <string name="WebRtcCallView__signal_call">Molly通話</string>
+    <string name="WebRtcCallView__signal_video_call">Mollyビデオ通話</string>
     <string name="WebRtcCallView__start_call">通話を開始する</string>
     <string name="WebRtcCallView__join_call">通話に参加する</string>
     <string name="WebRtcCallView__call_is_full">満席です</string>
@@ -1959,18 +2062,35 @@
     <string name="CallOverflowPopupWindow__lower_hand">手を降ろす</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">キャンセル</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">あなたは手を挙げています</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">表示する</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="other">%1$s と %2$d 人が手を挙げています</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$sが手を挙げています</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="other">%1$sと%2$dが手を挙げています</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$sが手を挙げています</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="other">%1$sと%2$dが手を挙げています</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="other">%1$s + %2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="other">%1$s + %2$d</item>
     </plurals>
 
@@ -2055,7 +2175,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">この番号を認証するため、通話が着信します。</string>
     <string name="RegistrationActivity_edit_number">番号を編集する</string>
     <string name="RegistrationActivity_missing_google_play_services">Google Play開発者サービスがありません</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">この端末にはGoogle Play開発者サービスがありません。Signalは使用できますが、信頼性や性能は下がる可能性があります。\n\n上級者でない方や、メーカー公式のAndroidをご利用の方、何かの間違いだと思う方などは support@signal.org まで連絡してください。</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">この端末にはGoogle Play開発者サービスがありません。Mollyは使用できますが、信頼性や性能は下がる可能性があります。\n\n上級者でない方や、メーカー公式のAndroidをご利用の方、何かの間違いだと思う方などは support@molly.im まで連絡してください。</string>
     <string name="RegistrationActivity_i_understand">分かりました</string>
     <string name="RegistrationActivity_play_services_error">Google Play開発者サービスのエラー</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play開発者サービスは更新中か一時的に使用不能です。再度試してください。</string>
@@ -2073,7 +2193,7 @@
     <string name="RegistrationActivity_non_standard_number_format">非標準の数字フォーマット</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">あなたが入力した数字 (%1$s) は、非標準のフォーマットのようです。\n\n%2$s を意図していすか？</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - 電話番号フォーマット</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - 電話番号フォーマット</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">通話を要求されました</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2106,8 +2226,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">登録でお困りですか？</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• お使いの携帯電話が圏内にあってSMSまたは通話が可能かどうかを確認してください\n • 電話番号への着信が可能か確認してください\n • 電話番号が正しく入力されていることを確認してください。</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">詳細については、これらのトラブルシューティングの手順に従うか、サポートにお問い合わせください</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">詳しくは、%1$sまたは%2$sをご覧ください</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">これらのトラブルシューティングの手順</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2145,13 +2265,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">連絡先に追加</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Signalに招待する</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Mollyに招待する</string>
     <string name="SharedContactDetailsActivity_signal_message">Signalメッセージ</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal通話</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">連絡先に追加</string>
-    <string name="SharedContactView_invite_to_signal">Signalに招待する</string>
+    <string name="SharedContactView_invite_to_signal">Mollyに招待する</string>
     <string name="SharedContactView_message">Signalメッセージ</string>
 
     <!-- SignalBottomActionBar -->
@@ -2282,11 +2402,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s は %2$s の番号です</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signalアップデート</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">新バージョンのSignalが利用可能です。タップして更新します。</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signalの更新に失敗しました</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Mollyアップデート</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">新バージョンのMollyが利用可能です。タップして更新します。</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Mollyの更新に失敗しました</string>
     <string name="ApkUpdateNotifications_failed_general_body">後で再度試してみます。</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signalが正常に更新されました</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Mollyが正常に更新されました</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">バージョン%1$sに自動的に更新されました。</string>
 
     <!-- UntrustedSendDialog -->
@@ -2356,7 +2476,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">私たちのSignal安全番号:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">共有先として使えるアプリがないようです。</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">クリップボードで安全番号が見つかりませんでした</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">QRコードをスキャンするには、Signalにカメラへのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「カメラ」を有効にしてください。</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">QRコードをスキャンするには、Mollyにカメラへのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「カメラ」を有効にしてください。</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">カメラへのアクセス許可がないとQRコードをスキャンできません</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">%1$s の安全番号を表示するには、初めにメッセージの交換が必要です。</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2386,14 +2506,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">タッチして開く</string>
-    <string name="KeyCachingService_passphrase_cached">Signalのロックが解除されています</string>
-    <string name="KeyCachingService_lock">Signalをロック</string>
+    <string name="KeyCachingService_passphrase_cached">Mollyのロックが解除されています</string>
+    <string name="KeyCachingService_lock">Mollyをロック</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">あなた</string>
     <string name="MediaPreviewActivity_unssuported_media_type">サポートされないメディアタイプ</string>
     <string name="MediaPreviewActivity_draft">下書き</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">外部ストレージにデータを保存するには、Signalにストレージへのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「ストレージ」を有効にしてください。</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">外部ストレージにデータを保存するには、Mollyにストレージへのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「ストレージ」を有効にしてください。</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">ストレージへのアクセス許可がないと外部ストレージに保存できません</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">メッセージを消去しますか？</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">このメッセージを完全に消去します。</string>
@@ -2435,7 +2555,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">メッセージを配送できませんでした。</string>
     <string name="MessageNotifier_error_delivering_message">メッセージの配送中にエラーが発生しました。</string>
     <string name="MessageNotifier_message_delivery_paused">メッセージの配送が保留されました。</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Signalでのメッセージ送受信を続けるため、認証してください。</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Mollyでのメッセージ送受信を続けるため、認証してください。</string>
     <string name="MessageNotifier_mark_all_as_read">すべて既読にする</string>
     <string name="MessageNotifier_mark_read">既読にする</string>
     <string name="MessageNotifier_turn_off_these_notifications">これらの通知を無効にする</string>
@@ -2457,7 +2577,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">あなたのステッカーに %1$sのリアクションがありました。</string>
     <string name="MessageNotifier_this_message_was_deleted">このメッセージは消去されました。</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">連絡先のSignal参加時の通知を受け取らないようにしますか？この設定はあとでSignal &gt; 設定 &gt; 通知から元に戻せます。</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">連絡先のMolly参加時の通知を受け取らないようにしますか？この設定はあとでMolly &gt; 設定 &gt; 通知から元に戻せます。</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2496,7 +2616,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signalのロック中はクイックレスポンスを使えません！</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Mollyのロック中はクイックレスポンスを使えません！</string>
     <string name="QuickResponseService_problem_sending_message">メッセージ送信中に問題が発生しました！</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2516,7 +2636,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">無効なショートカット</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">新着メッセージ</string>
     <string name="SingleRecipientNotificationBuilder_message_request">メッセージ申請</string>
     <string name="SingleRecipientNotificationBuilder_you">あなた</string>
@@ -2561,7 +2681,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">この端末は登録されていません。以前、おそらく別の端末で Signal に電話番号を登録したことが原因です。</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">この端末は登録されていません。以前、おそらく別の端末で Molly に電話番号を登録したことが原因です。</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">端末を再登録する</string>
 
@@ -2574,10 +2694,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">着信に出るには、Signalにマイクへのアクセスを許可してください。</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">着信に出るには、Mollyにマイクへのアクセスを許可してください。</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">ビデオ通話に出るには、Signal にマイクとカメラへのアクセスを許可してください。</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">通話するには、Signalにマイクとカメラへのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「マイク」と「カメラ」を有効にしてください。</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">ビデオ通話に出るには、Molly にマイクとカメラへのアクセスを許可してください。</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">通話するには、Mollyにマイクとカメラへのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「マイク」と「カメラ」を有効にしてください。</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">リンクした端末で応答しました。</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">リンクした端末で拒否しました。</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">リンクした端末で通話中です。</string>
@@ -2622,16 +2742,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">新しいパスフレーズを再入力</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Signalに招待する</string>
+    <string name="contact_selection_activity__invite_to_signal">Mollyに招待する</string>
     <string name="contact_selection_activity__new_group">新規グループ</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">連絡先を更新</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">連絡先が見つからない場合は更新してみましょう</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Signalで知り合いを探しましょう</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">連絡先へのアクセスを許可する</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">その他</string>
 
@@ -2648,7 +2768,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">連絡先の写真</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">連絡先を表示するには、Signalに連絡先へのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「連絡先」を有効にしてください。</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">連絡先を表示するには、Mollyに連絡先へのアクセス許可が必要ですが、無効になっています。アプリ設定メニューの「アプリの権限」で「連絡先」を有効にしてください。</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">連絡先の取得中にエラーが発生しました。ネットワーク接続を確認してください。</string>
     <string name="ContactSelectionListFragment_username_not_found">ユーザーネームが見つかりませんでした</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"「%1$s」はSignalユーザーではありません。ユーザーネームを確認してもう一度試してください。"</string>
@@ -2665,16 +2785,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">ユーザーネームで検索</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">連絡先へのアクセスを許可する</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Signalで知り合いを探すには：</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">アクセスを許可する</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">今はしない</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">連絡先へのアクセスを許可しましょう。連絡先は暗号化され、私たちSignalからは見えません。</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">連絡先を表示するには、Signalに連絡先へのアクセスを許可してください。</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">連絡先を表示するには、Mollyに連絡先へのアクセスを許可してください。</string>
     <string name="contact_selection_list_fragment__show_contacts">連絡先を表示</string>
 
     <!-- contact_selection_list_item -->
@@ -2745,6 +2867,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">過去に削除したメンバーです。メッセージを送ると、このメンバーはリストに再度追加されます。</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">オプション</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">アップデートする</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">再生 … 停止</string>
@@ -2773,7 +2897,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">バブルはAndroidの機能で、Signalのチャットでは無効にできます。</string>
+    <string name="BubbleOptOutTooltip__description">バブルはAndroidの機能で、Mollyのチャットでは無効にできます。</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">今はしない</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -2934,9 +3058,9 @@
     <string name="EditProfileFragment__group_description">グループの説明</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Signalをアップデートしてください</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Mollyをアップデートしてください</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">このバージョンの Signal は期限が切れています。引き続きご利用いただくために、Signal をアップデートしてください。</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">このバージョンの Molly は期限が切れています。引き続きご利用いただくために、Molly をアップデートしてください。</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">アップデートする</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3152,7 +3276,7 @@
     <string name="preferences__slow">遅い</string>
     <string name="preferences__help">ヘルプ</string>
     <string name="preferences__advanced">詳細設定</string>
-    <string name="preferences__donate_to_signal">Signalへの寄付</string>
+    <string name="preferences__donate_to_signal">Mollyへの寄付</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">プライバシー</string>
     <!-- Preference label for stories -->
@@ -3189,13 +3313,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">アプリのアイコンと名前を「%1$s」に変更します</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">アプリのアイコンと名前を変更するためには、Signalを閉じる必要があります。通知には常にデフォルトのSignalのアイコンと名前が表示されます。</string>
+    <string name="preferences__app_icon_dialog_description">アプリのアイコンと名前を変更するためには、Mollyを閉じる必要があります。通知には常にデフォルトのMollyのアイコンと名前が表示されます。</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">アプリのアイコンと名前を選択すると、お使いの携帯電話のホーム画面とアプリ一覧に反映されます。通知には常にデフォルトのSignalのアイコンと名前が表示されます。詳しく見る</string>
+    <string name="preferences__app_icon_warning_learn_more">アプリのアイコンと名前を選択すると、お使いの携帯電話のホーム画面とアプリ一覧に反映されます。通知には常にデフォルトのMollyのアイコンと名前が表示されます。詳しく見る</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">アプリのアイコンと名前は、ホーム画面とアプリ一覧に表示されます。</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">通知には常にデフォルトのSignalのアイコンと名前が表示されます。</string>
+    <string name="preferences__app_icon_notification_warning">通知には常にデフォルトのMollyのアイコンと名前が表示されます。</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">詳しく見る</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3241,8 +3365,12 @@
         <item quantity="other">すべてのチャットで最新 %1$s 件のメッセージを残して完全に消去します。</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">すべてのメッセージ履歴とメディアを、この端末から完全に消去します。</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">この端末と、リンク済み端末からすべてのメッセージ履歴とメディアが完全に消去されます。</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">本当にすべてのメッセージ履歴を消去しますか？</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">すべてのメッセージ履歴を完全に削除します。取り消しはできません。</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">すべてのメッセージ履歴を、すべての端末から完全に削除します。削除すると復元することはできません。</string>
     <string name="preferences_storage__delete_all_now">すべて消去する</string>
     <string name="preferences_storage__forever">無期限</string>
     <string name="preferences_storage__one_year">1年</string>
@@ -3278,7 +3406,7 @@
     <string name="preferences_communication__category_censorship_circumvention">閲覧回避</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">閲覧回避</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">有効にすると、Signalは検閲回避を試行します。Signalが検閲される場所にいない場合は、有効にしないでください。</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">有効にすると、Mollyは検閲回避を試行します。Mollyが検閲される場所にいない場合は、有効にしないでください。</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">アカウントの電話番号に基づいた、検閲回避が有効になりました。</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3330,7 +3458,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">決済機能のご紹介</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Signalを使って、プライバシーを重視した新しいデジタル通貨であるMobileCoinを送受信できます。利用するには機能を有効化してください。</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Mollyを使って、プライバシーを重視した新しいデジタル通貨であるMobileCoinを送受信できます。利用するには機能を有効化してください。</string>
     <string name="PaymentsHomeFragment__activate_payments">決済機能を有効化</string>
     <string name="PaymentsHomeFragment__activating_payments">決済機能を有効化しています…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">決済口座を復元</string>
@@ -3356,7 +3484,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">あなたの地域では決済機能は利用できません。</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">決済機能を有効にできませんでした。あとで再度試してください。</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">決済機能を停止しますか？</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">決済機能を停止すると、SignalでMobileCoinを利用できなくなります。</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">決済機能を停止すると、MollyでMobileCoinを利用できなくなります。</string>
     <string name="PaymentsHomeFragment__deactivate">停止する</string>
     <string name="PaymentsHomeFragment__continue">続ける</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">残高は現在利用できません。</string>
@@ -3365,10 +3493,10 @@
     <string name="PaymentsHomeFragment__details">詳細</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">MobileCoinの送受信にはSignalをご利用ください。すべての決済は、MobileCoinsとMobileCoin Walletの利用規約に準じます。おこなった決済が取り消されたり、残高の回復ができないといった問題などが発生する可能性があります。 </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">MobileCoinの送受信にはMollyをご利用ください。すべての決済は、MobileCoinsとMobileCoin Walletの利用規約に準じます。おこなった決済が取り消されたり、残高の回復ができないといった問題などが発生する可能性があります。 </string>
     <string name="PaymentsHomeFragment__activate">有効にする</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoinの利用規約</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Signalの決済機能は、利用できなくなりました。取引所への振替は可能ですが、送金や受け取り、入金はできません。</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Mollyの決済機能は、利用できなくなりました。取引所への振替は可能ですが、送金や受け取り、入金はできません。</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3396,7 +3524,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">権限を許可する</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">友人にメッセージを送信するには、Signalに権限を与える必要があります。 </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">友人にメッセージを送信するには、Mollyに権限を与える必要があります。 </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">通知</string>
     <!-- Notifications permission row description -->
@@ -3484,10 +3612,10 @@
     <string name="PaymentsTransferFragment__next">次へ</string>
     <string name="PaymentsTransferFragment__invalid_address">無効なアドレスです</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">振替先のウォレットアドレスを確認して、再度試してください。</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">あなた自身のSignalのウォレットアドレスには振替できません。取引所のあなたの口座のウォレットアドレスを入力してください。</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QRコードをスキャンするには、Signalにカメラへのアクセス許可が必要です。</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QRコードをスキャンするには、Signalにカメラへのアクセス許可が必要です。設定メニューの「アプリの権限」で「カメラ」を有効にしてください。</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QRコードをスキャンするには、Signalにカメラへのアクセス許可が必要です。</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">あなた自身のMollyのウォレットアドレスには振替できません。取引所のあなたの口座のウォレットアドレスを入力してください。</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QRコードをスキャンするには、Mollyにカメラへのアクセス許可が必要です。</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QRコードをスキャンするには、Mollyにカメラへのアクセス許可が必要です。設定メニューの「アプリの権限」で「カメラ」を有効にしてください。</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QRコードをスキャンするには、Mollyにカメラへのアクセス許可が必要です。</string>
     <string name="PaymentsTransferFragment__settings">設定</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3826,17 +3954,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Signal音声通話の着信</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Molly音声通話の着信</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Signalビデオ通話の着信</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Mollyビデオ通話の着信</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Signalグループ着信</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Mollyグループ着信</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Signal音声通話中</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Molly音声通話中</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Signalビデオ通話中</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Mollyビデオ通話中</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Signalグループ通話中</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Mollyグループ通話中</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">読み込んでいます…</string>
@@ -3883,9 +4011,9 @@
     <string name="BackupDialog_verify">確認する</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">正しいバックアップ用パスフレーズが入力されました</string>
     <string name="BackupDialog_passphrase_was_not_correct">パスフレーズが違います</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signalのバックアップを作成しています…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Mollyのバックアップを作成しています…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Signalのバックアップを検証しています…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Mollyのバックアップを検証しています…</string>
     <string name="LocalBackupJobApi29_backup_failed">バックアップに失敗しました</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">バックアップディレクトリは消去または移動されています。</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">あなたのバックアップファイルは、このボリュームに保存するには大きすぎます。</string>
@@ -3900,15 +4028,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">電話で確認 (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">コードの再送信まで (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Signalサポートに問い合わせ</string>
-    <string name="RegistrationActivity_code_support_subject">Signal登録 - Android用認証コード</string>
+    <string name="RegistrationActivity_contact_signal_support">Mollyサポートに問い合わせ</string>
+    <string name="RegistrationActivity_code_support_subject">Molly登録 - Android用認証コード</string>
     <string name="RegistrationActivity_incorrect_code">コードが違います</string>
     <string name="BackupUtil_never">なし</string>
     <string name="BackupUtil_unknown">不明</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">電話番号</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">あなたの電話番号を見ることができる人と、Signalであなたに連絡できる人を選択してください。</string>
+    <string name="preferences_app_protection__choose_who_can_see">あなたの電話番号を見ることができる人と、Mollyであなたに連絡できる人を選択してください。</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">電話番号を見ることができる人</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -3956,7 +4084,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">試行回数が多すぎます。あとで再度試してください。</string>
     <string name="RegistrationActivity_error_connecting_to_service">サービスへの接続中にエラーが発生しました</string>
     <string name="preferences_chats__backups">バックアップ</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signalはロックされています</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Mollyはロックされています</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">タップしてロック解除</string>
     <string name="Recipient_unknown">不明</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -3987,9 +4115,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">古い端末へのアクセスが必要です。</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">バックアップから復元</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">ローカルバックアップからメッセージを復元します。いま復元しないと、あとから復元することはできません。</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">ローカルバックアップを復元する</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signalバックアップの復元</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">すべてのテキストメッセージと過去30日間のメディアを復元する</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">その他のオプション</string>
 
+    <string name="TransferOrRestoreFragment__cancel">キャンセル</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">転送せずにログインする</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">メッセージやメディアを転送せずに続ける</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">古いAndroid端末でSignalを開きます</string>
     <string name="NewDeviceTransferInstructions__continue">続ける</string>
@@ -4004,19 +4139,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">古いAndroid端末への接続を準備しています…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">しばらくお待ちください</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">古いAndroid端末との接続を待っています…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">古いAndroid端末を検出し接続するには、Signalに位置情報へのアクセス許可が必要です。</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">古いAndroid端末を検出し接続するには、Mollyに位置情報へのアクセス許可が必要です。</string>
     <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">古いAndroid端末を検出し接続するには、位置情報サービスを有効にする必要があります。</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signalが古いAndroid端末を検出して接続するには、Wi-Fiが有効になっている必要があります。ただし、Wi-Fiネットワークに接続されている必要はありません。</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">この端末はWi-Fi Directに対応していないようです。Signalは、Wi-Fi Directを使って古いAndroid端末を検出し、接続します。古いAndroid端末からアカウントを復元するために、バックアップを復元することは可能です。</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Mollyが古いAndroid端末を検出して接続するには、Wi-Fiが有効になっている必要があります。ただし、Wi-Fiネットワークに接続されている必要はありません。</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">この端末はWi-Fi Directに対応していないようです。Mollyは、Wi-Fi Directを使って古いAndroid端末を検出し、接続します。古いAndroid端末からアカウントを復元するために、バックアップを復元することは可能です。</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">バックアップを復元</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">古いAndroid端末への接続時に、予期しないエラーが発生しました。</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">新しいAndroid端末を探しています…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">新しいAndroid端末を検出し接続するには、Signalに位置情報へのアクセス許可が必要です。</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">新しいAndroid端末を検出し接続するには、Mollyに位置情報へのアクセス許可が必要です。</string>
     <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">新しいAndroid端末を検出し接続するには、位置情報サービスを有効にする必要があります。</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signalが新しいAndroid端末を検出して接続するには、Wi-Fiが有効になっている必要があります。ただし、Wi-Fiネットワークに接続されている必要はありません。</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">申し訳ありませんが、この端末はWi-Fi Directに対応していないようです。Signalは、Wi-Fi Directを使って新しいAndroid端末を検出し、接続します。新しいAndroid端末でアカウントを復元するために、バックアップを作成することは可能です。</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Mollyが新しいAndroid端末を検出して接続するには、Wi-Fiが有効になっている必要があります。ただし、Wi-Fiネットワークに接続されている必要はありません。</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">申し訳ありませんが、この端末はWi-Fi Directに対応していないようです。Mollyは、Wi-Fi Directを使って新しいAndroid端末を検出し、接続します。新しいAndroid端末でアカウントを復元するために、バックアップを作成することは可能です。</string>
     <string name="OldDeviceTransferSetup__create_a_backup">バックアップを作成</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">新しいAndroid端末への接続時に、予期しないエラーが発生しました。</string>
 
@@ -4057,7 +4192,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">データを移行しています</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">端末同士を近づけてください。どちらの端末も電源を切らず、Signalを開いたままにしてください。転送はエンドツーエンドで暗号化されます。</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">端末同士を近づけてください。どちらの端末も電源を切らず、Mollyを開いたままにしてください。転送はエンドツーエンドで暗号化されます。</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d件のメッセージ…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%%転送完了</string>
@@ -4071,7 +4206,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">アカウントの移行</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">新しいAndroid端末でSignalをダウンロードしてください</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">新しいAndroid端末でMollyをダウンロードしてください</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"「アカウントの移行または復元」をタップしてください"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4145,7 +4280,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">誰でもこのリンクから、グループの名前やアイコンを見たり、参加を申請できます。信頼できる人と共有してください。</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">誰でもこのリンクから、グループの名前やアイコンを見たり、グループに参加できます。信頼できる人と共有してください。</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Signal経由で共有</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Molly経由で共有</string>
     <string name="GroupLinkBottomSheet_copy">コピー</string>
     <string name="GroupLinkBottomSheet_qr_code">QRコード</string>
     <string name="GroupLinkBottomSheet_share">共有</string>
@@ -4324,7 +4459,7 @@
     <string name="payment_info_card_about_mobilecoin">MobileCoinについて</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoinは、プライバシーを重視した新しいデジタル通貨です。</string>
     <string name="payment_info_card_adding_funds">入金</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">ウォレットアドレスにMobileCoinを送信することで、Signalで使う口座に入金できます。</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">ウォレットアドレスにMobileCoinを送信することで、Mollyで使う口座に入金できます。</string>
     <string name="payment_info_card_cashing_out">出金</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">MobileCoinを扱っている取引所では、その取引所のあなたの口座に振り込むだけで、いつでもMobileCoinを現金化することができます。</string>
     <string name="payment_info_card_hide_this_card">このカードを隠しますか？</string>
@@ -4345,12 +4480,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">ウォレットの停止</string>
     <string name="DeactivateWalletFragment__your_balance">あなたの残高</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">決済機能を停止する前に、別のウォレットアドレスに残高を振り替えることをお勧めします。振り替えない残高は、決済機能を再開する場合、Signalにリンクされたウォレットに残ります。</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">決済機能を停止する前に、別のウォレットアドレスに残高を振り替えることをお勧めします。振り替えない残高は、決済機能を再開する場合、Mollyにリンクされたウォレットに残ります。</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">残高を振り替える</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">振り替えずに停止する</string>
     <string name="DeactivateWalletFragment__deactivate">停止する</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">振り替えずに停止しますか？</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">残高は、決済機能を再開する場合、Signalにリンクされたウォレットに残ります。</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">残高は、決済機能を再開する場合、Mollyにリンクされたウォレットに残ります。</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">ウォレットの停止でエラーが発生しました。</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4643,7 +4778,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">ライセンス</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">使用条件とプライバシーポリシー</string>
-    <string name="HelpFragment__copyright_signal_messenger">Copyright Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Copyright Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Licensed under the GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4881,9 +5016,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">色を選択</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">共有</string>
 
@@ -4913,7 +5045,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">グループ管理者のみがメッセージを送信できます。</string>
-    <string name="MultiselectForwardFragment__limit_reached">制限に達しました</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">5件以上のチャットは選択できません</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5088,9 +5221,9 @@
     <string name="MySupportPreference__learn_more">詳しく見る</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Signalをアップデートしてください</string>
+    <string name="UpdateSignalExpiredDialog__title">Mollyをアップデートしてください</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">このバージョンの Signal は期限が切れています。引き続きご利用いただくために、Signal をアップデートしてください。</string>
+    <string name="UpdateSignalExpiredDialog__message">このバージョンの Molly は期限が切れています。引き続きご利用いただくために、Molly をアップデートしてください。</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">アップデートする</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5099,7 +5232,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">端末が登録されていません</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">この端末は登録されていません。この端末で Signal を引き続きご利用になるには、再登録が必要です。</string>
+    <string name="ReregisterSignalDialog__message">この端末は登録されていません。この端末で Molly を引き続きご利用になるには、再登録が必要です。</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">再登録する</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5393,7 +5526,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">ファイルピッカーを開けませんでした</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">通知を有効にするには、Signalに通知を表示する権限を与える必要があります。</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">通知を有効にするには、Mollyに通知を表示する権限を与える必要があります。</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">有効にする</string>
 
@@ -5539,8 +5672,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">返信 なし</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">このグループのメンバーではなくなったので、このストーリーに返信することはできません。</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">ストーリーにリアクションしました</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">ストーリーにリアクションしました</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">ストーリーにリアクションしました</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">閲覧</string>
     <!-- Label for story replies tab -->
@@ -6140,8 +6275,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">銀行を選択する</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">%1$sを通しての寄付をご確認ください</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">定期的な寄付を設定するには「続ける」をタップして、銀行で0.01ユーロの手数料がかかることをご確認ください。この手数料は自動的に返金され、毎月5ユーロの寄付金がお口座から引き落とされます。</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">定期的な寄付を設定するには「続ける」をタップして、銀行で0.01ユーロの手数料がかかることをご確認ください。この手数料は自動的に返金され、毎月%1$sの寄付金がお口座から引き落とされます。</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">続行</string>
 
@@ -6710,6 +6845,50 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">バックアップデータをダウンロードしています…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">メディアのバックアップがオフになっています</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="other">決済手続きができなかったため、Signalメディアのバックアッププランが無効になりました。バックアップ内に保存されているメディアをダウンロードできる期間はあと%1$d日です。%1$d日後には、バックアップ内のメディアは消去されます。</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">決済の再開はいつでも可能であり、すべてのメディアのバックアップは継続されます。 </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">メディアは今日消去されます</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">決済手続きができなかったため、Signalメディアのバックアッププランが無効になりました。バックアップ内のメディアをダウンロードできるのは今日が最終日となります。</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">ダウンロードを完了できません</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">ご利用の端末には十分な空き容量がありません。バックアップに保存されているメディアをダウンロードするには、最大%1$sの空き容量を確保してください。</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="other">「スキップ」を選択すると、バックアップ内のメディアは%1$d日後に消去されます。</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">バックアップの決済ができませんでした</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">毎月の定期的なバックアップの決済に問題が生じています。決済方法が最新のものかご確認ください。最新のものでない場合は、Google Payでお手続きし直してください。Signalは、数日後に再度決済処理を行います。</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">バックアップが完了していません</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">ご利用の端末では %1$d 日間バックアップが実行されていません。端末がWi-Fiに接続されていることをご確認の上、「今すぐバックアップを実行する」をタップしてください。 </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">詳しく見る</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">スキップ</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">今すぐメディアをダウンロードする</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">後でダウンロードする</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">メディアをダウンロードしない</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">メディアをダウンロードするために、%1$sの空き容量を確保してください。</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">クレジットカードまたはデビットカード</string>
@@ -6723,6 +6902,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">不明</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">決済履歴</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">最終バックアップは%1$sの%2$sです。</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6733,6 +6918,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">選択した期間を超えた古いメッセージは完全に消去されます。</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">選択した最大件数を超えたメッセージは完全に消去されます。</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">リンク済み端末に制限を適用する</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">有効にすると、チャット内の最大メッセージ件数が制限を超えた際にリンク済み端末からも消去されます。</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">消去機能がすべての端末で同期されるようになりました</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">メッセージやチャットを消去した場合、ご利用のスマートフォンやリンク済み端末からも消去されます。</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">決済履歴</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">テキストとすべてのメディアのバックアップ</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">決済の詳細</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">バックアップの種類</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">支払い日</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">共有</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signalバックアップ</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">決済履歴</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">バックアップの詳細</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">バックアップの容量</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">バックアップの頻度</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">モバイルデータ通信を使ってバックアップする</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">バックアップをオフにして消去しますか？</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">バックアップが消去され、オフになっています。</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">バックアップの種類が変更され、サブスクリプションがキャンセルされました</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">サブスクリプションが解除されました</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">ダウンロード完了</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">バックアップの種類</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">バックアップがオフになりました</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/月</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">バックアップを有効にする</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">最終バックアップ</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">なし</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">いますぐバックアップする</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">バックアップをオフにして消去しますか？</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">次からは課金されません。これまでのバックアップは消去されて、以降のバックアップはされません。</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">非表示にして消去する</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">バックアップを消去しています</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">バックアップは消去されました</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"「今すぐバックアップする」をタップした時"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">毎日</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">1週間ごと</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">1か月ごと</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">手動でバックアップ</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">ご利用の端末のPIN、パスワード、またはパターンを入力してください。</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">次へ</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">バックアップの種類を変更する</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">サブスクリプションを解除する</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">解除する</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">再度課金されることはありません。課金の期間が終了するとバックアップがされなくなります。その日から30日間は、バックアップされている（課金終了時点までの）メディアをダウンロードすることが可能です。</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">確認して今すぐダウンロードする</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">確認して後でダウンロードする</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">サブスクリプションを継続する</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index ba54fa3629..fcf6fc5a64 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">მიმდინარეობს Signal-ის განახლება…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">მიმდინარეობს Molly-ის განახლება…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">შენ ჯერ არ დაგიყენებია პაროლფრაზა!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">გამოვრთოთ პაროლფრაზა?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">ეს სამუდამოდ განბლოკავს Signal-ს და მიმოწერის შეტყობინებებს.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">ეს სამუდამოდ განბლოკავს Molly-ს და მიმოწერის შეტყობინებებს.</string>
     <string name="ApplicationPreferencesActivity_disable">გამორთვა</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">სერვერთან დაკავშირებისას დაფიქსირდა შეცდომა!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">პინ-კოდი საჭიროა რეგისტრაციის ბლოკირებისთვის. პინ-კოდის გასათიშად, ჯერ უნდა გათიშო რეგისტრაციის ბლოკირება.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">ფაილი</string>
     <string name="AttachmentKeyboard_contact">კონტაქტი</string>
     <string name="AttachmentKeyboard_location">ადგილმდებარეობა</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">შენი ფოტოებისა და ვიდეოების საჩვენებლად Signal-ს ნებართვა სჭირდება</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">შენი ფოტოებისა და ვიდეოების საჩვენებლად Molly-ს ნებართვა სჭირდება</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">წვდომის მიცემა</string>
     <string name="AttachmentKeyboard_payment">ტრანზაქცია</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">მედიის ასარჩევი აპლიკაცია ვერ მოიძებნა.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">სურათების, ვიდეოების ან აუდიოს მისამაგრებლად Signal-ს მეხსიერებაზე წვდომის ნებართვა სჭირდება, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ გადახვიდე აპის პარამეტრების მენიუში, აირჩიე \"ნებართვები\" და გააქტიურე \"მეხსიერება\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">საკონტაქტო ინფორმაციის მისაბმელად Signal-ს კონტაქტებზე წვდომის ნებართვა სჭირდება, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ გადახვიდე აპის პარამეტრების მენიუში, აირჩიე \"ნებართვები\" და გააქტიურე \"კონტაქტები\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">ადგილმდებარეობის საჩვენებლად Signal-ს ადგილმდებარეობაზე წვდომის ნებართვა სჭირდება, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ, გადახვიდე აპის პარამეტრების მენიუში, აირჩიე \"ნებართვები\" და გააქტიურე \"ადგილმდებარეობა\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">სურათების, ვიდეოების ან აუდიოს მისამაგრებლად Molly-ს მეხსიერებაზე წვდომის ნებართვა სჭირდება, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ გადახვიდე აპის პარამეტრების მენიუში, აირჩიე \"ნებართვები\" და გააქტიურე \"მეხსიერება\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">საკონტაქტო ინფორმაციის მისაბმელად Molly-ს კონტაქტებზე წვდომის ნებართვა სჭირდება, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ გადახვიდე აპის პარამეტრების მენიუში, აირჩიე \"ნებართვები\" და გააქტიურე \"კონტაქტები\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">ადგილმდებარეობის საჩვენებლად Molly-ს ადგილმდებარეობაზე წვდომის ნებართვა სჭირდება, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ, გადახვიდე აპის პარამეტრების მენიუში, აირჩიე \"ნებართვები\" და გააქტიურე \"ადგილმდებარეობა\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">მიეცი წვდომა შენს ლოკაციაზე</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">შენი მდებარეობის გასაგზავნად:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">შენი მდებარეობის გასაგზავნად, მიეცი Signal-ს წვდომა.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">შენი მდებარეობის გასაგზავნად, მიეცი Molly-ს წვდომა.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal-ს შენი მდებარეობის გასაგზავნად ლოკაციაზე წვდომა სჭირდება.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly-ს შენი მდებარეობის გასაგზავნად ლოკაციაზე წვდომა სჭირდება.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">მეხსიერებაზე წვდომის მიცემა</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">ფოტოებისა და ვიდეოების საჩვენებლად:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">შენი ფოტოებისა და ვიდეოების საჩვენებლად Signal-ს მეხსიერებაზე წვდომა სჭირდება.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">შენი ფოტოებისა და ვიდეოების საჩვენებლად Molly-ს მეხსიერებაზე წვდომა სჭირდება.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s-ს ტრანზაქციები არ გაუაქტიურებია </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">კამერის შეცვლა</string>
     <string name="CameraXFragment_open_gallery_description">გალერეის გახსნა</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">წვდომის მიცემა</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">შენს კამერასა და მიკროფონზე წვდომის მიცემა</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">შენს კამერაზე წვდომის მიცემა</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">მიკროფონზე წვდომის მიცემა</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">ფოტოს გადასაღებად, მიეცი Signal-ს კამერაზე წვდომა.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">სურათების და ვიდეოების გადასაღებად, მიეცი Signal-ს წვდომა კამერაზე.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">ფოტოებისა და ვიდეოს გადასაღებად, მიეცი Signal-ს კამერასა და მიკროფონზე წვდომა.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">ხმით ვიდეოების გადასაღებად, მიეცი Signal-ს წვდომა შენს მიკროფონზე.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">QR კოდის დასასკანირებლად, მიეცი Signal-ს წვდომა შენს კამერაზე.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal-ს ფოტოების გადასაღებად კამერაზე წვდომა სჭირდება</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">QR კოდების დასასკანირებლად Signal-ს კამერაზე წვდომა სჭირდება</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">ვიდეოს გადასაღებად Signal-ს მიკროფონზე წვდომა სჭირდება</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Signal-ში ფოტოების გადასაღებად:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Signal-ში ფოტოებისა და ვიდეოების გადასაღებად:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">ვიდეოების ხმით გადასაღებად:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR კოდების დასასკანირებლად:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">ბოლო კონტაქტები</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Signal-ის კონტაქტები ვერ მოიძებნა</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">მხოლოდ კამერის ღილაკის გამოყენებით შეგიძლია Signal-ის კონტაქტებისთვის სურათების გადაგზავნა. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">ვერ პოულობ ვისაც ეძებ?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">მოიწვიე კონტაქტი Signal-ში</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">მოიწვიე კონტაქტი Molly-ში</string>
     <string name="CameraContacts__menu_search">ძიება</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">არა, მადლობა</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Signal-ის განახლება</string>
+    <string name="ClientDeprecatedActivity_update_signal">Molly-ის განახლება</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">აპის ამ ვერსიას აღარ აქვს მხარდაჭერა. შეტყობინებების გაგზავნისა და მიღების გასაგრძელებლად გადმოწერე უახლესი ვერსია.</string>
     <string name="ClientDeprecatedActivity_update">განახლება</string>
     <string name="ClientDeprecatedActivity_dont_update">არ განაახლო</string>
     <string name="ClientDeprecatedActivity_warning">გაფრთხილება</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Signal-ის შენს ვერსიას ვადა გაუვიდა. შეგიძლია ნახო შენი შეტყობინებების ისტორია, მაგრამ სანამ აპს არ განაახლებ შეტყობინებების გაგზავნას ან მიღებას ვერ შეძლებ.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Molly-ის შენს ვერსიას ვადა გაუვიდა. შეგიძლია ნახო შენი შეტყობინებების ისტორია, მაგრამ სანამ აპს არ განაახლებ შეტყობინებების გაგზავნას ან მიღებას ვერ შეძლებ.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">ვებ ბრაუზერი ვერ მოიძებნა.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">შეტყობინება %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly-ის ხმოვანი ზარი %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly-ის ვიდეო ზარი %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal-ის შეტყობინება</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">შეტყობინების გაგზავნა</string>
-    <string name="ConversationActivity_lets_switch_to_signal">მოდი, გადავერთოთ Signal-ზე %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">მოდი, გადავერთოთ Molly-ზე %1$s</string>
     <string name="ConversationActivity_specify_recipient">გთხოვთ აირჩიო კონტაქტი</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">მიმაგრებული ფაილი აღემატება იმ შეტყობინების ზომების ლიმიტებს, რომლის გაგზავნასაც შენ ცდილობ.</string>
     <string name="ConversationActivity_unable_to_record_audio">აუდიოს ჩაწერა შეუძლებელია!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">აუდიო შეტყობინებების გასაგზავნად:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">ხმოვანი შეტყობინებების გასაგზავნად, Signal-ს შენს მიკროფონზე წვდომა მიეცი.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">ხმოვანი შეტყობინებების გასაგზავნად, Molly-ს შენს მიკროფონზე წვდომა მიეცი.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">ხმოვანი შეტყობინების ჩასაწერად Signal-ს მიკროფონზე წვდომა სჭირდება.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">აუდიო შეტყობინებების გადასაგზავნად Signal-ს მიკროფონზე წვდომის ნებართვა სჭირდება, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ, გადახვიდე აპის პარამეტრების მენიუში, აირჩიო \"უფლებები\" და ჩართო \"მიკროფონი\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">ხმოვანი შეტყობინების ჩასაწერად Molly-ს მიკროფონზე წვდომა სჭირდება.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">აუდიო შეტყობინებების გადასაგზავნად Molly-ს მიკროფონზე წვდომის ნებართვა სჭირდება, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ, გადახვიდე აპის პარამეტრების მენიუში, აირჩიო \"უფლებები\" და ჩართო \"მიკროფონი\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s-თან დასარეკად Signal-ს მიკროფონსა და კამერაზე წვდომის ნებართვა სჭირდება, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ, გადახვიდე აპის პარამეტრების მენიუში, აირჩიო \"უფლებები\" და ჩართოთ \"მიკროფონი\" და \"კამერა\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">სურათების და ვიდეოების გადასაღებად, მიეცი Signal-ს წვდომა კამერაზე.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">სურათების და ვიდეოების გადასაღებად Signal-ს კამერაზე წვდომის ნებართვა სჭირდება, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ, გადახვიდე აპის პარამეტრების მენიუში, აირჩიო \"უფლებები\" და ჩართოთ \"კამერა\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">სურათების და ვიდეოების გადასაღებლად Signal-ს კამერაზე წვდომის ნებართვა სჭირდება</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s-თან დასარეკად Molly-ს მიკროფონსა და კამერაზე წვდომის ნებართვა სჭირდება, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ, გადახვიდე აპის პარამეტრების მენიუში, აირჩიო \"უფლებები\" და ჩართოთ \"მიკროფონი\" და \"კამერა\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">სურათების და ვიდეოების გადასაღებად, მიეცი Molly-ს წვდომა კამერაზე.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">სურათების და ვიდეოების გადასაღებად Molly-ს კამერაზე წვდომის ნებართვა სჭირდება, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ, გადახვიდე აპის პარამეტრების მენიუში, აირჩიო \"უფლებები\" და ჩართოთ \"კამერა\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">სურათების და ვიდეოების გადასაღებლად Molly-ს კამერაზე წვდომის ნებართვა სჭირდება</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">გააქტიურე მიკროფონზე წვდომის ნებართვა ხმიანი ვიდეოების გადასაღებად.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">ვიდეოების გადასაღებად Signal-ს სჭირდება მიკროფონზე წვდომის უფლება, მაგრამ იგი სამუდამოდ იქნა უარყოფილი. გთხოვთ, გადახვიდე აპის პარამეტრების მენიუში, აირჩიო \"უფლებები\" და ჩართო \"მიკროფონი\" და \"კამერა\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">ვიდეოების გადასაღებად Signal-ს მიკროფონზე წვდომის ნებართვა სჭირდება.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">ვიდეოების გადასაღებად Molly-ს სჭირდება მიკროფონზე წვდომის უფლება, მაგრამ იგი სამუდამოდ იქნა უარყოფილი. გთხოვთ, გადახვიდე აპის პარამეტრების მენიუში, აირჩიო \"უფლებები\" და ჩართო \"მიკროფონი\" და \"კამერა\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">ვიდეოების გადასაღებად Molly-ს მიკროფონზე წვდომის ნებართვა სჭირდება.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">არა</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">ზარის დასაწყებად:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">ზარის დასაწყებად, Signal-ს შენს მიკროფონზე წვდომა მიეცი.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">ზარის დასაწყებად, Molly-ს შენს მიკროფონზე წვდომა მიეცი.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">ზარის დასაწყებად Signal-ს მიკროფონზე წვდომა სჭირდება.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">ზარის დასაწყებად Molly-ს მიკროფონზე წვდომა სჭირდება.</string>
 
 
     <string name="ConversationActivity_join">შემოუერთდი</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">SMS მიმოწერები Signal-ში აღარ არის ხელმისაწვდომი. მოიწვიე %1$s Signal-ში, რათა მიმოწერა აქ განაგრძოთ.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">ეს ადამიანი Signal-ს აღარ იყენებს. მოიწვიე ის Signal-ში, რათა მიმოწერა აქ განაგრძოთ.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">ეს ადამიანი Molly-ს აღარ იყენებს. მოიწვიე ის Molly-ში, რათა მიმოწერა აქ განაგრძოთ.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">მოიწვიე Signal-ში</string>
+    <string name="ConversationActivity__invite_to_signal">მოიწვიე Molly-ში</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">მალე ისევ შეგახსენებთ.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">ყველასთვის წაშლა</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">ამ მოწყობილობაზე წაშლა</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">წაშლა</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">ყველგან წაშლა</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">ეს წერილი ჩატში ყველასთვის წაიშლება, თუ ისინი Signal-ის უახლეს ვერსიას იყენებენ. ისინი დაინახავენ, რომ შეტყობინება წაშალე.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">დაბლოკილია</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Signal-ის განახლება</string>
+    <string name="ConversationFragment__update_build">Molly-ის განახლება</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Signal-ის ხელახლა რეგისტრაცია</string>
+    <string name="ConversationFragment__reregister_signal">Molly-ის ხელახლა რეგისტრაცია</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">უკან გასვლა.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signal-ის გახსნა</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Molly-ის გახსნა</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">ვერიფიცირებული აღარაა</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">ეს სამუდამოდ წაშლის არჩეულ ჩატს.</item>
         <item quantity="other">ეს სამუდამოდ წაშლის ყველა %1$d არჩეულ ჩატს.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">ეს არჩეულ ჩატს შენი ყველა მოწყობილობიდან სამუდამოდ წაშლის.</item>
+        <item quantity="other">ეს არჩეულ %1$d-ვე ჩატს შენი ყველა მოწყობილობიდან სამუდამოდ წაშლის.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">იშლება</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">მიმდინარეობს არჩეული ჩატის წაშლა…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">ვის შეუძლია ნომრით მიპოვოს?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">ნებისმიერს, ვისაც შენი მობილურის ნომერი აქვს, დაინახავს, რომ Signal-ზე ხარ და შენთან ჩატის წამოწყებას შეძლებს.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">ნებისმიერს, ვისაც შენი მობილურის ნომერი აქვს, დაინახავს, რომ Molly-ზე ხარ და შენთან ჩატის წამოწყებას შეძლებს.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">ვერავინ დაინახავს, რომ Signal-ზე ხარ, სანამ არ მისწერ ან თუ არსებული ჩატი არ გექნებათ.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">ვერავინ დაინახავს, რომ Molly-ზე ხარ, სანამ არ მისწერ ან თუ არსებული ჩატი არ გექნებათ.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">აღვადგინოთ სარეზერვო კოპიიდან?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">გატესტე შენი სათადარიგო ასლების პაროლ-ფრაზა და დარწმუნდი, რომ ის შეესაბამება</string>
     <string name="BackupsPreferenceFragment__turn_on">ჩართვა</string>
     <string name="BackupsPreferenceFragment__turn_off">გამორთვა</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"სათადარიგო ასლის აღსადგენად გადმოწერე Signal-ის ახალი ვერსია. გახსენი აპლიკაცია და დააჭირე \"სარეზერვო ასლის აღდგენას\", შემდეგ იპოვე სათადარიგო ფაილი. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"სათადარიგო ასლის აღსადგენად გადმოწერე Molly-ის ახალი ვერსია. გახსენი აპლიკაცია და დააჭირე \"სარეზერვო ასლის აღდგენას\", შემდეგ იპოვე სათადარიგო ფაილი. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">გაიგე მეტი</string>
     <string name="BackupsPreferenceFragment__in_progress">იტვირთება…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d ჯერ…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% ჯერ…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">სათადარიგო ასლების შესაქმნელად Signal-ი საჭიროებს გარე მეხსიერებაზე წვდომის ნებართვას, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ, შეხვიდე აპის პარამეტრებში, აირჩიო „ნებართვები“ და ჩართო „შენახვა“.</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">სათადარიგო ასლების შესაქმნელად Molly-ი საჭიროებს გარე მეხსიერებაზე წვდომის ნებართვას, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ, შეხვიდე აპის პარამეტრებში, აირჩიო „ნებართვები“ და ჩართო „შენახვა“.</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">დააყენე სარეზერვო კოპიების შექმნის დრო</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">ჩატის სესია განახლდა</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal-ი სრულ დაშიფვრას იყენებს, რის გამოც შეიძლება ზოგჯერ შენი ჩატის სესიის განახლება დასჭირდეს. ეს არ იმოქმედებს შენი ჩატის უსაფრთხოებაზე, მაგრამ შესაძლოა ამ კონტაქტისგან შეტყობინება გამოგრჩეს, რის შედეგადაც შესაძლოა მისთვის შეტყობინების ხელახლა გამოგზავნის თხოვნა მოგიწიოს.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly-ი სრულ დაშიფვრას იყენებს, რის გამოც შეიძლება ზოგჯერ შენი ჩატის სესიის განახლება დასჭირდეს. ეს არ იმოქმედებს შენი ჩატის უსაფრთხოებაზე, მაგრამ შესაძლოა ამ კონტაქტისგან შეტყობინება გამოგრჩეს, რის შედეგადაც შესაძლოა მისთვის შეტყობინების ხელახლა გამოგზავნის თხოვნა მოგიწიოს.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">გამოიყენე Signal-ი Desktop-ზე ან iPad-ზე. შენი შეტყობინებები შენს მიბმულ მოწყობილობებზე დასინქრონიზდება.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">ახალი მოწყობილობის მიბმა</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s შეტყობინებები და ჩატის ინფორმაცია ბოლომდე დაშიფრულია ყველა მოწყობილობაზე</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal-ი Desktop-ისთვის ან iPad-ითვის</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">დაკავშირებულ მოწყობილობებზე ნებისმიერი მიმოწერა კონფიდენციალურია</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">დაკავშირების შემდეგ Molly-ის შეტყობინებები შენს მობილურ ტელეფონში Molly-თან სინქრონიზდება. შენი წინა შეტყობინებების ისტორია არ გამოჩნდება.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">შენს სხვა მოწყობილობაზე Molly-ის დასაყენებლად %1$s-ს ეწვიე</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">ჩემი დაკავშირებული მოწყობილობები</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">გაუქმება</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s არაა დაკავშირებული</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">ვაკავშირებთ მოწყობილობას…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">მოწყობილობა დადასტურებულია</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">იტვირთება…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">დაკავშირებული მოწყობილობები ვერ მოიძნებნა</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">მოწყობილობის მისაბმელად განბლოკე</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">დასაკავშირებლად დაასკანირე მოწყობილობაზე ნაჩვენები QR კოდი.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">QR კოდის დასკანირება</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">გამოიყენე ეს მოწყობილობა იმ მოწყობილობაზე ნაჩვენები QR კოდის დასასკანირებლად, რომლის მიბმაც გსურს</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">კარგი</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">ეს მოწყობილობა შენი ჯგუფებისა და კონტაქტების ნახვას, შენს ჩატებზე წვდომასა და შენი სახელით შეტყობინებების გაგზავნას შეძლებს.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">დაასრულე შენს სხვა მოწყობილობასთან დაკავშირება</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">დაასრულე Molly-ის დაკავშირება შენს სხვა მოწყობილობასთან.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">მოწყობილობის დაკავშირება ვერ მოხერხდა</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">ეს QR კოდი არ არის მოქმედი. გთხოვთ, დარწმუნდე, რომ იმ მოწყობილობაზე ნაჩვენებ QR კოდს ასკანირებ, რომლის მიბმაც გსურს.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">თავიდან ცდა</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">ჩავხსნა კავშირი \'%1$s\'?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">ოპტიმიზაცია გამოტოვებული Play Service-ებისთვის</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">ამ მოწყობილობას არ აქვს Play Services-ის მხარდაჭერა. დააჭირე, რათა გამორთო ბატარეის სისტემური ოპტიმიზაცია, რაც ხელს უშლის Signal-ს შეტყობინებების მოძიებაში, როცა აპლიკაციას არ იყენებ.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">ამ მოწყობილობას არ აქვს Play Services-ის მხარდაჭერა. დააჭირე, რათა გამორთო ბატარეის სისტემური ოპტიმიზაცია, რაც ხელს უშლის Molly-ს შეტყობინებების მოძიებაში, როცა აპლიკაციას არ იყენებ.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Signal-ის ამ ვერსიას ვადა გაუვიდა. განაახლე ახლავე, რათა გააგზავნო და მიიღო შეტყობინებები.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Molly-ის ამ ვერსიას ვადა გაუვიდა. განაახლე ახლავე, რათა გააგზავნო და მიიღო შეტყობინებები.</string>
     <string name="ExpiredBuildReminder_update_now">განაახლე ახლავე</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">ნახვა</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Signal-ის კავშირის მუდმივი ხარვეზი!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">სიგნალმა ვერ მოახერხა Google Play Service-თან რეგისტრაცია. Signalს შეტყობინებები და ზარები გათიშულია, გთხოვთ სცადოთ ხელახალი რეგისტრაცია პარამეტრები &gt; დამატებითი.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Molly-ის კავშირის მუდმივი ხარვეზი!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">სიგნალმა ვერ მოახერხა Google Play Service-თან რეგისტრაცია. Mollyს შეტყობინებები და ზარები გათიშულია, გთხოვთ სცადოთ ხელახალი რეგისტრაცია პარამეტრები &gt; დამატებითი.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">გამართვის ჟურნალები გვეხმარება პრობლემის დიაგნოსტიკასა და გამოსწორებაში და არ შეიცავს საიდენტიფიკაციო ინფორმაციას.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal-ი პრობლემას გადააწყდა. ატვირთოთ გამართვის ჟურნალი?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly-ი პრობლემას გადააწყდა. ატვირთოთ გამართვის ჟურნალი?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">შეტყობინებები შეიძლება ბატარეის ოპტიმიზაციის გამო დაგვიანდეს</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">შეგიძლია Signal-ისთვის ბატარეის ოპტიმიზაცია გამორთო, რათა დარწმუნდე, რომ შეტყობინებებზე ინფორმირება არ დაგვიანდება.</string>
+    <string name="PromptBatterySaverBottomSheet__message">შეგიძლია Molly-ისთვის ბატარეის ოპტიმიზაცია გამორთო, რათა დარწმუნდე, რომ შეტყობინებებზე ინფორმირება არ დაგვიანდება.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">შეტყობინებები შეიძლება ბატარეის ოპტიმიზაციის გამო დაგვიანდეს</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">შეგიძლია Molly-ისთვის ბატარეის ოპტიმიზაცია გამორთო, რათა დარწმუნდე, რომ შეტყობინებებზე ინფორმირება არ დაგვიანდება. მოწყობილობის სპეციფიკური ინსტრუქციების სანახავად დააჭირე \"გაგრძელება\"-ს.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">არა, მადლობა</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">გაგრძელება</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">გაგრძელება</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">გაუქმება</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">არა, მადლობა</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">განსახილველი ჯგუფის მოსაწვევები</string>
+    <string name="PendingMembersActivity_pending_group_invites">მოთხოვნები &amp; მოწვევები</string>
     <string name="PendingMembersActivity_requests">მოთხოვნები</string>
     <string name="PendingMembersActivity_invites">მოწვევები</string>
     <string name="PendingMembersActivity_people_you_invited">ხალხი, რომელიც შენ მოიწვიე</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">გაუქმება</string>
     <string name="InviteActivity_sending">იგზავნება…</string>
     <string name="InviteActivity_invitations_sent">მოსაწვევები გაგზავნილია!</string>
-    <string name="InviteActivity_invite_to_signal">მოიწვიე Signal-ში</string>
+    <string name="InviteActivity_invite_to_signal">მოიწვიე Molly-ში</string>
     <string name="InviteActivity_send_sms">SMS-ის გაგზავნა (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">გავაგზავნოთ %1$d SMS-მოწვევა?</item>
         <item quantity="other">გავაგზავნოთ %1$d SMS-მოწვევა?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">მოდი, Signal-ზე გადავიდეთ: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">მოდი, Molly-ზე გადავიდეთ: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">როგორც ჩანს, არ გაქვს ისეთი აპი, იქ რომ გადააზიარო.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">შენი შეტყობინება</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">ფონური კავშირი ჩართულია</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">პასუხები</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">ვახორციელებთ Signal-ის ზარს</string>
+    <string name="NotificationBarManager__establishing_signal_call">ვახორციელებთ Molly-ის ზარს</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">ვიწყებთ Signal-ის სერვისის ზარს</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">ვაჩერებთ Signal-ის სერვისის ზარს</string>
+    <string name="NotificationBarManager__starting_signal_call_service">ვიწყებთ Molly-ის სერვისის ზარს</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">ვაჩერებთ Molly-ის სერვისის ზარს</string>
     <string name="NotificationBarManager__cancel_call">ზარის გაუქმება</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">შენ გაააქტიურე ტრანზაქციები</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s-ს უკვე შეუძლია ტრანზაქციები მიიღოს</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">ტრანზაქციის დეტალები მიუწვდომელია</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">გაიგე მეტი</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">ტრანზაქციის დეტალები მიუწვდომელია</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">ამ გადახდის ეს დეტალები მიუწვდომელია, რადგან შენი წერილები აღდგენილია წყაროდან, რომელიც არ შეიცავდა ამ გადახდის ისტორიას. ეს არ იმოქმედებს შენი საფულის ბალანსზე ან წარსული გადახდების სტატუსზე.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">მალე SMS შეტყობინებების გაგზავნას Signal-იდან ვეღარ შეძლებ. მოიწვიე %1$s Signal-ში, რათა მიმოწერა აქ განაგრძოთ.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Signal-ით SMS შეტყობინებების გაგზავნას ვეღარ შეძლებ. მოიწვიე %1$s Signal-ში, რათა მიმოწერა აქ განაგრძოთ.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Molly-ით SMS შეტყობინებების გაგზავნას ვეღარ შეძლებ. მოიწვიე %1$s Molly-ში, რათა მიმოწერა აქ განაგრძოთ.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">ტრანზაქცია: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">ტრანზაქცია</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">დარეპორტებულია, როგორც სპამი</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">მივაბათ Signal-ს მოწყობილობა?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">როგორც ჩანს, Signal-ისთვის მოწყობილობის მიბმას მე-3 მხარის სკანერის გამოყენებით ცდილობ. შენი უსაფრთხოებისთვის გთხოვთ, ხელახლა დაასკანერო კოდი Signal-იდან.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal-ს QR კოდის დასასკანერებლად კამერის ნებართვა სჭირდება, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ, შეხვიდე აპის პარამეტრებში, აირჩიო „ნებართვები“ და ჩართო „კამერა“.</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly-ს QR კოდის დასასკანერებლად კამერის ნებართვა სჭირდება, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ, შეხვიდე აპის პარამეტრებში, აირჩიო „ნებართვები“ და ჩართო „კამერა“.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">QR კოდის სკანირება კამერის ნებართვის გარეშე შეუძლებელია</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">შეიყვანე პაროლ-ფრაზა</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal-ის ხატულა</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly-ის ხატულა</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">პაროლ-ფრაზის დადასტურება</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">არასწორი პაროლ-ფრაზა!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signal-ის გახსნა</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - დაბლოკილი ეკრანი</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Molly-ის გახსნა</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - დაბლოკილი ეკრანი</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">რუკა</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">გაიარე ვერიფიკაცია მიმოწერის გასაგრძელებლად</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Signal-ზე სპამის თავიდან ასაცილებლად, გთხოვთ, დაასრულო ვერიფიკაცია.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Molly-ზე სპამის თავიდან ასაცილებლად, გთხოვთ, დაასრულო ვერიფიკაცია.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">ვერიფიკაციის გავლის შემდეგ მიმოწერის გაგრძელებას შეძლებ. ნებისმიერი შეჩერებული შეტყობინება ავტომატურად გაიგზავნება.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">ჩემი Story-ი</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal-ის ზარი</string>
+    <string name="Recipient_signal_call">Molly-ის ზარი</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">დაბლოკვა</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">ირეკება…</string>
     <string name="RedPhone_busy">დაკავებულია</string>
     <string name="RedPhone_recipient_unavailable">მიმღები მიუწვდომელია</string>
-    <string name="RedPhone_network_failed">ქსელი ჩავარდა!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">ქსელის ხარვეხი! გთხოვთ, შეამოწმო შენი ქსელის კავშირი და თავიდან სცადო.</string>
     <string name="RedPhone_number_not_registered">ნომერი არ არის რეგისტრირებული!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">შენ მიერ აკრეფილ ნომერს არ აქვს ხმის უსაფრთხო მხარდაჭერა!</string>
     <string name="RedPhone_got_it">გასაგებია</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">დააჭირე აქ შენი ვიდეოს ჩასართავად</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s-თან დასარეკად, Signal-ს შენს კამერაზე წვდომა დასჭირდება</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s-თან დასარეკად, Molly-ს შენს კამერაზე წვდომა დასჭირდება</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">ვრეკავთ…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">ხელახლა დაკავშირება…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">ზარიდან გაითიშა</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">ვიღაცამ ზარიდან გაგთიშა.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">შენს კამერასა და მიკროფონზე წვდომის მიცემა</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">მიკროფონზე წვდომის მიცემა</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">შენს კამერაზე წვდომის მიცემა</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">ზარის დასაწყებად ან მასში შესასვლელად, Molly-ს შენს კამერასა და მიკროფონზე წვდომა სჭირდება.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">ზარის დასაწყებად ან მასში შესასვლელად, Molly-ს შენს კამერასა და მიკროფონზე წვდომა მიეცი.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">ვიდეოს ჩასართავად, Molly-ს შენ კამერაზე წვდომა მიეცი.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">ზარის დასაწყებად ან მასში შესასვლელად Molly-ს მიკროფონზე წვდომა სჭირდება.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">ვიდეოს ჩასართვად Molly-ს კამერაზე წვდომა სჭირდება</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">ზარის წამოსაწყებად, ან მასში შესასვლელად:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">შენი ვიდეოს ჩასართავად:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal-ის ზარი</string>
-    <string name="WebRtcCallView__signal_video_call">Signal-ის ვიდეო ზარი</string>
+    <string name="WebRtcCallView__signal_call">Molly-ის ზარი</string>
+    <string name="WebRtcCallView__signal_video_call">Molly-ის ვიდეო ზარი</string>
     <string name="WebRtcCallView__start_call">ზარის დაწყება</string>
     <string name="WebRtcCallView__join_call">ზარზე შესვლა</string>
     <string name="WebRtcCallView__call_is_full">ზარი გადავსებულია</string>
@@ -2028,23 +2132,42 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">გსურს, ხელი ჩამოწიო?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">ხელის ჩაწევა</string>
+    <string name="CallOverflowPopupWindow__lower_hand">ჩაწევა</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">გაუქმება</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">შენ აიწიე ხელი</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">View</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s-მა ხელი აიწია</item>
-        <item quantity="other">%1$s + %2$d-მა ხელი აიწიეს</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s-მა ხელი ასწია</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d-მა ხელი ასწია</item>
+        <item quantity="other">%1$s + %2$d-მა ხელი ასწიეს</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s-მა ხელი ასწია</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d-მა ხელი ასწია</item>
+        <item quantity="other">%1$s + %2$d-მა ხელი ასწიეს</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
-        <item quantity="one">%1$s</item>
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s +%2$d</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
+        <item quantity="one">%1$s +%2$d</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
 
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">თქვენ მიიღებთ ზარს ამ ნომრის დასამოწმებლად.</string>
     <string name="RegistrationActivity_edit_number">ნომრის რედაქტირება</string>
     <string name="RegistrationActivity_missing_google_play_services">აკლია Google Play-ის სერვისები</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">ამ მოწყობილობას აკლია Google Play-ის სერვისები. შეგიძლიათ, კვლავ გამოიყენოთ Signal,მაგრამ ამ კონფიგურაციამ შეიძლება გამოიწვიოს საიმედოობის ან ფუნქციონირების შემცირება.\n\nთუ არ ხართ კვალიფიციური მომხმარებელი, არ სარგებლობთ გაყიდვისშემდგომი მომსახურების Android ROM-ით ან ფიქრობთ, რომ ამას შეცდომით ხედავთ, გთხოვთ დაუკავშირდეთ support@signal.org პრობლემების მოგვარებაში დასახმარებლად.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">ამ მოწყობილობას აკლია Google Play-ის სერვისები. შეგიძლიათ, კვლავ გამოიყენოთ Molly,მაგრამ ამ კონფიგურაციამ შეიძლება გამოიწვიოს საიმედოობის ან ფუნქციონირების შემცირება.\n\nთუ არ ხართ კვალიფიციური მომხმარებელი, არ სარგებლობთ გაყიდვისშემდგომი მომსახურების Android ROM-ით ან ფიქრობთ, რომ ამას შეცდომით ხედავთ, გთხოვთ დაუკავშირდეთ support@molly.im პრობლემების მოგვარებაში დასახმარებლად.</string>
     <string name="RegistrationActivity_i_understand">გასაგებია</string>
     <string name="RegistrationActivity_play_services_error">სერვისების ჩართვის შეცდომა</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">მიმდინარეობს Google Play-ის სერვისები ს განახლება ან ისინი დროებით მიუწვდომელია. გთხოვთ სცადოთ ხელახლა.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">ნომრის არასტანდარტული ფორმატი</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">შენ მიერ შეყვანილი ნომერი (%1$s), როგორც ჩანს, არასტანდარტული ფორმატისაა. %2$s-ს გულისხმობდი?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android-ი - ტელეფონის ნომრის ფორმატი</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android-ი - ტელეფონის ნომრის ფორმატი</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">დარეკვა მოთხოვნილია</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">ვერ რეგისტრირდები?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• დარწმუნდი, რომ შენს ტელეფონს SMS-ის ან ზარის მისაღებად ქსელის კავშირი აქვს\n • დაადასტურე, რომ შეგიძლია ნომერზე სატელეფონო ზარი მიიღო\n • შეამოწმე, რომ სწორად შეიყვანე შენი ტელეფონის ნომერი.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">მეტი ინფორმაციისთვის, გთხოვთ, მიჰყვე პრობლემების მოგვარების ამ ნაბიჯებს ან მხარდაჭერის გუნდს დაუკავშირდე</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">მეტი ინფორმაციისთვის, გთხოვთ, მიჰყვე %1$s ან %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">პრობლემების მოგვარების ამ ნაბიჯებს</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">კონტაქტებში დამატება</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">მოიწვიე Signal-ში</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">მოიწვიე Molly-ში</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal-ის შეტყობინება</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal-ის ზარი</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">კონტაქტებში დამატება</string>
-    <string name="SharedContactView_invite_to_signal">მოიწვიე Signal-ში</string>
+    <string name="SharedContactView_invite_to_signal">მოიწვიე Molly-ში</string>
     <string name="SharedContactView_message">Signal-ის შეტყობინება</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s %2$s-ს ეკუთვნის</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal-ის განახლება</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal-ის ახალი ვერსია ხელმისაწვდომია. დააჭირე განახლებისთვის.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal-ის განახლება ვერ მოხერხდა</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly-ის განახლება</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly-ის ახალი ვერსია ხელმისაწვდომია. დააჭირე განახლებისთვის.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly-ის განახლება ვერ მოხერხდა</string>
     <string name="ApkUpdateNotifications_failed_general_body">მოგვიანებით ისევ ვცდით.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal-ი წარმატებით განახლდა</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly-ი წარმატებით განახლდა</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">შენ ავტომატურად გადახვედი %1$s ვერსიაზე.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">ჩვენი Signal-ის უსაფრთხოების ნომერი:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">როგორც ჩანს, არ გაქვს ისეთი აპი, რითაც შეძლებ გაზიარებას.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">შესადარებელი უსაფრთხოების ნომერი ბუფერში ვერ მოიძებნა</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">QR კოდის დასასკანერებლად Signal-ს კამერაზე წვდომის ნებართვა სჭირდება, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ, შეხვიდე აპის პარამეტრებში, აირჩიო „ნებართვები“ და ჩართო „კამერა“.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">QR კოდის დასასკანერებლად Molly-ს კამერაზე წვდომის ნებართვა სჭირდება, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ, შეხვიდე აპის პარამეტრებში, აირჩიო „ნებართვები“ და ჩართო „კამერა“.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">QR კოდის სკანირება კამერის ნებართვის გარეშე შეუძლებელია</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">%1$s-ის უსაფრთხოების ნომრის სანახავად ჯერ შეტყობინებები უნდა გაცვალოთ.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">დააჭირე გასახსნელად.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal-ი გახსნილია</string>
-    <string name="KeyCachingService_lock">Signal-ის დახურვა</string>
+    <string name="KeyCachingService_passphrase_cached">Molly-ი გახსნილია</string>
+    <string name="KeyCachingService_lock">Molly-ის დახურვა</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">შენ</string>
     <string name="MediaPreviewActivity_unssuported_media_type">შეუთავსებელი მედია-ფაილის ტიპი</string>
     <string name="MediaPreviewActivity_draft">მონახაზი</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">გარე მეხსიერებაში შესანახად Signal-ს შენახვის ნებართვა სჭირდება, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ, შეხვიდე აპის პარამეტრებში, აირჩიო „ნებართვები“ და ჩართო „შენახვა“.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">გარე მეხსიერებაში შესანახად Molly-ს შენახვის ნებართვა სჭირდება, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ, შეხვიდე აპის პარამეტრებში, აირჩიო „ნებართვები“ და ჩართო „შენახვა“.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">ნებართვების გარეშე გარე მეხსიერებაში შენახვა შეუძლებელია</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">წავშალოთ შეტყობინება?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">ეს ამ შეტყობინებას სამუდამოდ წაშლის.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">შეტყობინების გაგზავნა ვერ მოხერხდა.</string>
     <string name="MessageNotifier_error_delivering_message">ხარვეზი შეტყობინების გაგზავნისას.</string>
     <string name="MessageNotifier_message_delivery_paused">შეტყობინების გაგზავნა შეჩერდა.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">გაიარე ვერიფიკაცია, რომ Signal-ზე მიმოწერა გააგრძელო.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">გაიარე ვერიფიკაცია, რომ Molly-ზე მიმოწერა გააგრძელო.</string>
     <string name="MessageNotifier_mark_all_as_read">ყველას წაკითხულად მონიშვნა.</string>
     <string name="MessageNotifier_mark_read">წაკითხულად მონიშვნა</string>
     <string name="MessageNotifier_turn_off_these_notifications">ამ შეტყობინებების გამორთვა</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">გამოეხმაურა %1$s შენს სტიკერს.</string>
     <string name="MessageNotifier_this_message_was_deleted">ეს შეტყობინება იქნა წაშლილი.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">გამოვრთოთ კონტაქტის Signal-ში დამატების შეტყობინებები? მათი ხელახლა ჩართვა შეგიძლია Signal &gt; პარამეტრები &gt; შეტყობინებები.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">გამოვრთოთ კონტაქტის Molly-ში დამატების შეტყობინებები? მათი ხელახლა ჩართვა შეგიძლია Molly &gt; პარამეტრები &gt; შეტყობინებები.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">სწრაფი პასუხი შეუძლებელია, როცა Signal-ი გამორთულია!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">სწრაფი პასუხი შეუძლებელია, როცა Molly-ი გამორთულია!</string>
     <string name="QuickResponseService_problem_sending_message">პრობლემა შეტყობინების გაგზავნისას!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">არასწორი მალსახმობი</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">ახალი შეტყობინება</string>
     <string name="SingleRecipientNotificationBuilder_message_request">მოთხოვნა მიმოწერაზე</string>
     <string name="SingleRecipientNotificationBuilder_you">შენ</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">ეს მოწყობილობა აღარ არის რეგისტრირებული. ეს სავარაუდოდ იმიტომ ხდება, რომ შენი ტელეფონის ნომერი Signal-ზე სხვა მოწყობილობაზე დაარეგისტრირე.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">ეს მოწყობილობა აღარ არის რეგისტრირებული. ეს სავარაუდოდ იმიტომ ხდება, რომ შენი ტელეფონის ნომერი Molly-ზე სხვა მოწყობილობაზე დაარეგისტრირე.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">ხელახლა დაარეგისტრირე მოწყობილობა</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">ზარზე პასუხისთვის მიეცი Signal-ს წვდომა შენს მიკროფონზე.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">ზარზე პასუხისთვის მიეცი Molly-ს წვდომა შენს მიკროფონზე.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">მიეცი Signal-ს წვდომა შენს მიკროფონსა და კამერაზე, რათა ვიდეო ზარს უპასუხო.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">ზარების განსახორციელებლად ან მისაღებად Signal-ს მიკროფონსა და კამერაზე წვდომის ნებართვა სჭირდება, მაგრამ ისინი სამუდამოდ იქნა უარყოფილია. გთხოვთ, შეხვიდე აპის პარამეტრებში, აირჩიო „ნებართვები“ და ჩართო „მიკროფონი“ და „კამერა“.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">მიეცი Molly-ს წვდომა შენს მიკროფონსა და კამერაზე, რათა ვიდეო ზარს უპასუხო.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">ზარების განსახორციელებლად ან მისაღებად Molly-ს მიკროფონსა და კამერაზე წვდომის ნებართვა სჭირდება, მაგრამ ისინი სამუდამოდ იქნა უარყოფილია. გთხოვთ, შეხვიდე აპის პარამეტრებში, აირჩიო „ნებართვები“ და ჩართო „მიკროფონი“ და „კამერა“.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">ზარი მიღებულია დაკავშირებულ მოწყობილობაზე.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">ზარი უარყოფილია დაკავშირებულ მოწყობილობაზე.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">დაკავებაა დაკავშირებულ მოწყობილობაზე.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">გაიმეორე ახალი პაროლ-ფრაზა</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">მოიწვიე Signal-ში</string>
+    <string name="contact_selection_activity__invite_to_signal">მოიწვიე Molly-ში</string>
     <string name="contact_selection_activity__new_group">ახალი ჯგუფი</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">კონტაქტების გადატვირთვა</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">ვინმე ვერ იპოვე? გადატვირთვა სცადე</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">იპოვე შენი ნაცნობები Signal-ზე</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">შენს კონტაქტებზე წვდომის მიცემა</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">მეტი</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">კონტაქტის ფოტო</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">შენი კონტაქტების საჩვენებლად Signal-ს კონტაქტებზე წვდომის ნებართვა სჭირდება, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ, გადახვიდე აპლიკაციის პარამეტრების მენიუში, აირჩიო „ნებართვები“ და ჩართო „კონტაქტები“.</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">შენი კონტაქტების საჩვენებლად Molly-ს კონტაქტებზე წვდომის ნებართვა სჭირდება, მაგრამ ის სამუდამოდ იქნა უარყოფილი. გთხოვთ, გადახვიდე აპლიკაციის პარამეტრების მენიუში, აირჩიო „ნებართვები“ და ჩართო „კონტაქტები“.</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">შეცდომა კონტაქტების მოძიებისას, შეამოწმე შენი ქსელის კავშირი</string>
     <string name="ContactSelectionListFragment_username_not_found">მომხმარებლის სახელი ვერ მოიძებნა</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"%1$s არაა Signal-ის მომხმარებელი. გთხოვთ, გადაამოწმო მომხმარებლის სახელი და თავიდან სცადო."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">ძებნა მომხმარებლის სახელით</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">კონტაქტებზე წვდომის მიცემა</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Signal-ზე შენი ნაცნობების მოსაძებნად:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">წვდომის მიცემა</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">არა, მადლობა</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">შენს კონტაქტებზე წვდომის მიცემა. შენი კონტაქტები დაშიფრულია და Signal-ის სერვისისთვის უხილავია.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal-ს შენს კონტაქტებზე წვდომა სჭირდება, რათა ისინი აჩვენოს.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly-ს შენს კონტაქტებზე წვდომა სჭირდება, რათა ისინი აჩვენოს.</string>
     <string name="contact_selection_list_fragment__show_contacts">კონტაქტების ჩვენება</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">შენ წაშალე ეს ადამიანი, ხელახლა მიწერით მას ისევ დაამატებ შენს სიაში.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">ოფციები</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">განახლება</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">ჩართვა … დაპაუზება</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Bubbles-ი Android-ის ფუნქციაა, რომელიც შეგიძლია Signal-ის ჩატებისთვის გამორთო.</string>
+    <string name="BubbleOptOutTooltip__description">Bubbles-ი Android-ის ფუნქციაა, რომელიც შეგიძლია Molly-ის ჩატებისთვის გამორთო.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">ახლა არა</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">ჯგუფის აღწერილობა</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Signal-ის განახლება</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Molly-ის განახლება</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Signal-ის ამ ვერსიას ვადა გაუვიდა. განაახლე ახლავე, რათა Signal-ის გამოყენება განაგრძო.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Molly-ის ამ ვერსიას ვადა გაუვიდა. განაახლე ახლავე, რათა Molly-ის გამოყენება განაგრძო.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">განახლება</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">ნელი</string>
     <string name="preferences__help">დახმარება</string>
     <string name="preferences__advanced">დეტალური</string>
-    <string name="preferences__donate_to_signal">Signal-ისთვის დონაციის გაკეთება</string>
+    <string name="preferences__donate_to_signal">Molly-ისთვის დონაციის გაკეთება</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">კონფიდენციალურობა</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">შეცვალე აპის ხატულა და სახელი „%1$s“-ზე</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">აპის ხატულასა და სახელის შესაცვლელად Signal-ი უნდა დაიხუროს. შეტყობინებები ყოველთვის გამოჩნდება Signal-ის ნაგულისხმევი ხატულათი და სახელით.</string>
+    <string name="preferences__app_icon_dialog_description">აპის ხატულასა და სახელის შესაცვლელად Molly-ი უნდა დაიხუროს. შეტყობინებები ყოველთვის გამოჩნდება Molly-ის ნაგულისხმევი ხატულათი და სახელით.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">აირჩიე აპის ხატულა და სახელი, რომელიც შენი ტელეფონის მთავარ ეკრანზე და აპის პანელზე გამოჩნდება. შეტყობინებები ყოველთვის გამოჩნდება Signal-ის ნაგულისხმევი ხატულათი და სახელით. გაიგე მეტი</string>
+    <string name="preferences__app_icon_warning_learn_more">აირჩიე აპის ხატულა და სახელი, რომელიც შენი ტელეფონის მთავარ ეკრანზე და აპის პანელზე გამოჩნდება. შეტყობინებები ყოველთვის გამოჩნდება Molly-ის ნაგულისხმევი ხატულათი და სახელით. გაიგე მეტი</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">აპის ხატულები და სახელები ხილვადია მთავარ ეკრანზე და აპის პანელზე.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">შეტყობინებები ყოველთვის გამოჩნდება Signal-ის ნაგულისხმევი ხატულათი და სახელით.</string>
+    <string name="preferences__app_icon_notification_warning">შეტყობინებები ყოველთვის გამოჩნდება Molly-ის ნაგულისხმევი ხატულათი და სახელით.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">გაიგე მეტი</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">ეს სამუდამოდ დაამოკლებს ყველა ჩატს %1$s უახლეს შეტყობინებებამდე.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">ეს სამუდამოდ წაშლის შეტყობინებების მთელ ისტორიას და მედია-ფაილებს შენი მოწყობილობიდან.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">ეს სამუდამოდ წაშლის წერილების მთელ ისტორიას და მედია ფაილებს ამ და ნებისმიერი დაკავშირებული მოწყობილობიდან.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">დარწმუნებული ხარ, რომ შეტყობინებების მთელი ისტორიის წაშლა გსურს?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">შეტყობინებების მთელი ისტორია სამუდამოდ წაიშლება. ამ მოქმედების გაუქმება შეუძლებელია.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">წერილების მთელი ისტორია სამუდამოდ წაიშლება ყველა მოწყობილობიდან. ეს მოქმედება ვეღარ გაუქმდება.</string>
     <string name="preferences_storage__delete_all_now">ყველას წაშლა ახლავე</string>
     <string name="preferences_storage__forever">სამუდამოდ</string>
     <string name="preferences_storage__one_year">1 წლით</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">ცენზურისთვის გვერდის ავლა</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">ცენზურისთვის გვერდის ავლა</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">თუ ამას ჩართავ, Signal-ი შეეცდება გვერდი აარიდოს ცენზურას. არ ჩართო ეს ფუნქცია, თუ არ იმყოფები ისეთ ადგილას, სადაც Signal-ი ცენზურადადებულია.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">თუ ამას ჩართავ, Molly-ი შეეცდება გვერდი აარიდოს ცენზურას. არ ჩართო ეს ფუნქცია, თუ არ იმყოფები ისეთ ადგილას, სადაც Molly-ი ცენზურადადებულია.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">ცენზურისთვის გვერდის ავლა გააქტიურებულია შენს მონაცემებში არსებული ტელეფონის ნომრის საფუძველზე.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">წარმოგიდგენთ გადახდებს</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">გამოიყენე Signal-ი ახალი, კონფიდენციალურობაზე ორიენტირებული, ციფრული ვალუტის MobileCoin-ის გასაგზავნად და მისაღებად. დასაწყებად გააქტიურე.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">გამოიყენე Molly-ი ახალი, კონფიდენციალურობაზე ორიენტირებული, ციფრული ვალუტის MobileCoin-ის გასაგზავნად და მისაღებად. დასაწყებად გააქტიურე.</string>
     <string name="PaymentsHomeFragment__activate_payments">ტრანზაქციების აქტივაცია</string>
     <string name="PaymentsHomeFragment__activating_payments">ვააქტიურებთ ტრანზაქციებს…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">ტრანზაქციების მონაცემების აღდგენა</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">ტრანზაქციები შენს რეგიონში ხელმისაწვდომი არაა.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">ტრანზაქციების ჩართვა ვერ მოხერხდა. მოგვიანებით კიდევ სცადე.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">გსურს ტრანზაქციების დეაქტივაცია?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">შენ ვერ შეძლებ MobileCoin-ის Signal-ში გაგზავანას ან მიღებას , თუ ტრანზაქციებს გამორთავ.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">შენ ვერ შეძლებ MobileCoin-ის Molly-ში გაგზავანას ან მიღებას , თუ ტრანზაქციებს გამორთავ.</string>
     <string name="PaymentsHomeFragment__deactivate">დეაქტივაცია</string>
     <string name="PaymentsHomeFragment__continue">გაგრძელება</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">ბალანსი ამჟამად ხელმისაწვდომი არაა.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Details</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">შეგიძლია Signal-ი MobileCoin-ის გასაგზავნად და მისაღებად გამოიყენო. ყველა გადახდა ექვემდებარება MobileCoins-ისა და MobileCoin Wallet-ის გამოყენების პირობებს. შეიძლება პრობლემები შეგექმნას და გადახდები ან ნაშთები, რომლებიც შეიძლება დაკარგო, ვერ აღდგება. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">შეგიძლია Molly-ი MobileCoin-ის გასაგზავნად და მისაღებად გამოიყენო. ყველა გადახდა ექვემდებარება MobileCoins-ისა და MobileCoin Wallet-ის გამოყენების პირობებს. შეიძლება პრობლემები შეგექმნას და გადახდები ან ნაშთები, რომლებიც შეიძლება დაკარგო, ვერ აღდგება. </string>
     <string name="PaymentsHomeFragment__activate">გააქტიურება</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoin-ის პირობების ნახვა</string>
-    <string name="PaymentsHomeFragment__payments_not_available">ტრანზაქციები Signal-ში აღარ არის ხელმისაწვდომი. ისევ შეგიძლია თანხების გადარიცხვა ბირჟაზე, მაგრამ აღარ შეგიძლია ტრანზაქციების გაგზავნა და მიღება, ან თანხის დამატება.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">ტრანზაქციები Molly-ში აღარ არის ხელმისაწვდომი. ისევ შეგიძლია თანხების გადარიცხვა ბირჟაზე, მაგრამ აღარ შეგიძლია ტრანზაქციების გაგზავნა და მიღება, ან თანხის დამატება.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">ნებართვების დაშვება</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">იმისათვის, რომ შენს ნაცნობებთან მიმოწერაში დაგეხმაროთ, Signal-ი ამ ნებართვებს მოითხოვს. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">იმისათვის, რომ შენს ნაცნობებთან მიმოწერაში დაგეხმაროთ, Molly-ი ამ ნებართვებს მოითხოვს. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">შეტყობინებები</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">შემდეგი</string>
     <string name="PaymentsTransferFragment__invalid_address">არასწორი მისამართი</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">შეამოწმე საფულის მისამართი, რომელზეც ცდილობ გადარიცხვას და სცადე ხელახლა.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">შენი Signal-ის საფულის მისამართზე გადარიცხვა არ შეგიძლია. შეიყვანე საფულის მისამართი მხარდაჭერილი ბირჟის შენი ანგარიშიდან .</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR კოდის დასასკანირებლად Signal-ს კამერაზე წვდომა სჭირდება.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QR კოდის დასასკანირებლად Signal-ს კამერაზე წვდომა სჭირდება. შედი პარამეტრებში, აირჩიე \"ნებართვები\" და ჩართე \"კამერა\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR კოდის დასასკანირებლად Signal-ს კამერაზე წვდომა სჭირდება.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">შენი Molly-ის საფულის მისამართზე გადარიცხვა არ შეგიძლია. შეიყვანე საფულის მისამართი მხარდაჭერილი ბირჟის შენი ანგარიშიდან .</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR კოდის დასასკანირებლად Molly-ს კამერაზე წვდომა სჭირდება.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QR კოდის დასასკანირებლად Molly-ს კამერაზე წვდომა სჭირდება. შედი პარამეტრებში, აირჩიე \"ნებართვები\" და ჩართე \"კამერა\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR კოდის დასასკანირებლად Molly-ს კამერაზე წვდომა სჭირდება.</string>
     <string name="PaymentsTransferFragment__settings">Settings</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Signal-ის შემომავალი ხმოვანი ზარი</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Molly-ის შემომავალი ხმოვანი ზარი</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Signal-ის შემომავალი ვიდეო ზარი</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Molly-ის შემომავალი ვიდეო ზარი</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Signal-ის შემომავალი ჯგუფური ზარი</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Molly-ის შემომავალი ჯგუფური ზარი</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Signal-ის მიმდინარე ხმოვანი ზარი</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Molly-ის მიმდინარე ხმოვანი ზარი</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Signal-ის მიმდინარე ვიდეო ზარი</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Molly-ის მიმდინარე ვიდეო ზარი</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Signal-ის მიმდინარე ჯგუფის ზარი</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Molly-ის მიმდინარე ჯგუფის ზარი</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">იტვირთება…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">ვერიფიკაცია</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">შენ წარმატებით შეიყვანე სარეზერვო კოპიების პაროლ-ფრაზა</string>
     <string name="BackupDialog_passphrase_was_not_correct">პაროლ-ფრაზა არასწორი იყო</string>
-    <string name="LocalBackupJob_creating_signal_backup">ვქმნით Signal-ის სარეზერვო კოპიებს…</string>
+    <string name="LocalBackupJob_creating_signal_backup">ვქმნით Molly-ის სარეზერვო კოპიებს…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">მიმდინარეობს Signal-ის სარეზერვო კოპიების ვერიფიცირება…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">მიმდინარეობს Molly-ის სარეზერვო კოპიების ვერიფიცირება…</string>
     <string name="LocalBackupJobApi29_backup_failed">სარეზერვო კოპიების შენახვა ვერ მოხერხდა</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">შენი სარეზერვო კოპიების შესანახი ადგილი იქნა წაშლილი ან გადატანილი.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">შენი სარეზერვო კოპიის ფაილი ზედმეტად დიდია აქ შესანახად.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">დამირეკეთ (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">კოდის თავიდან გაგზავნა (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">დაუკავშირდით Signal-ის მხარდაჭერას</string>
-    <string name="RegistrationActivity_code_support_subject">Signal-ის რეგისტრაცია - დადასტურების კოდი Android-ითვის</string>
+    <string name="RegistrationActivity_contact_signal_support">დაუკავშირდით Molly-ის მხარდაჭერას</string>
+    <string name="RegistrationActivity_code_support_subject">Molly-ის რეგისტრაცია - დადასტურების კოდი Android-ითვის</string>
     <string name="RegistrationActivity_incorrect_code">არასწორი კოდი</string>
     <string name="BackupUtil_never">არასდროს</string>
     <string name="BackupUtil_unknown">უცნობი</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">ტელეფონის ნომერი</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">შეარჩიე, ვის შეუძლია ნახოს შენი ტელეფონის ნომერი და ვინ შეიძლება დაგიკავშირდეს Signal-ზე მისი დახმარებით.</string>
+    <string name="preferences_app_protection__choose_who_can_see">შეარჩიე, ვის შეუძლია ნახოს შენი ტელეფონის ნომერი და ვინ შეიძლება დაგიკავშირდეს Molly-ზე მისი დახმარებით.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">ვის შეუძლია ჩემი ნომრის ნახვა</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">თქვენ განახორციელეთ ძალიან ბევრი მცდელობა. გთხოვთ ხელახლა სცადოთ მოგვიანებით.</string>
     <string name="RegistrationActivity_error_connecting_to_service">სერვისთან დაკავშირების შეცდომა</string>
     <string name="preferences_chats__backups">სარეზერვო კოპიები</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal-ი დაბლოკილია</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly-ი დაბლოკილია</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">დააჭირე განბლოკვისთვის</string>
     <string name="Recipient_unknown">უცნობი</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">შენს ძველ მოწყობილობაზე წვდომა გჭირდება.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">სარეზერვო კოპიიდან აღდგენა</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">აღადგინე შენი შეტყობინებები ადგილობრივი სარეზერვო კოპიიდან. თუ ახლა არ აღადგენ, მოგვიანებით აღდგენას ვეღარ შეძლებ.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">ადგილობრივი სარეზერვო კოპიების აღდგენა</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signal-ის სარეზერვო კოპიების აღდგენა</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">აღადგინე შენი ყველა შეტყობინება + ბოლო 30 დღის მედია ფაილები</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">მეტი ოფცია</string>
 
+    <string name="TransferOrRestoreFragment__cancel">გაუქმება</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">სისტემაში შესვლა გადატანის გარეშე</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">განაგრძე შენი შეტყობინებების და მედია ფაილების გადატანის გარეშე</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">გახსენი Signal-ი შენს ძველ Android მობილურზე</string>
     <string name="NewDeviceTransferInstructions__continue">გაგრძელება</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">ვემზადებით ძველ Android მოწყობილობასთან დასაკავშირებლად…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">დაელოდე, მალე მზად უნდა იყოს</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">ველოდებით ძველ Android მოწყობილობას, რომ დავაკავშიროთ…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">შენი ძველი Android მოწყობილობის აღმოსაჩენად და მასთან დასაკავშირებლად, Signal-ს მდებარეობაზე წვდომის ნებართვა სჭირდება.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal-ს სჭირდება მდებარეობის სერვისების ჩართვა შენი ძველი Android მოწყობილობის აღმოსაჩენად და მასთან დასაკავშირებლად.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal-ს სჭირდება ჩართული Wi-Fi შენი ძველი Android მოწყობილობის აღმოსაჩენად და მასთან დასაკავშირებლად. Wi-Fi უნდა იყოს ჩართული, მაგრამ არ უნდა იყოს დაკავშირებული Wi-Fi ქსელთან.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">ბოდიში, როგორც ჩანს, ამ მოწყობილობას არ აქვს Wi-Fi Direct-ის მხარდაჭერა. Signal-ი Wi-Fi Direct-ს შენი ძველი Android მოწყობილობის აღმოსაჩენად და მასთან დასაკავშირებლად იყენებს. თუმცა შენი მონაცემების აღსადგენად, შეგიძლია შენი ძველი Android მოწყობილობის სარეზერვო კოპია აღადგინო.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">შენი ძველი Android მოწყობილობის აღმოსაჩენად და მასთან დასაკავშირებლად, Molly-ს მდებარეობაზე წვდომის ნებართვა სჭირდება.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly-ს სჭირდება მდებარეობის სერვისების ჩართვა შენი ძველი Android მოწყობილობის აღმოსაჩენად და მასთან დასაკავშირებლად.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly-ს სჭირდება ჩართული Wi-Fi შენი ძველი Android მოწყობილობის აღმოსაჩენად და მასთან დასაკავშირებლად. Wi-Fi უნდა იყოს ჩართული, მაგრამ არ უნდა იყოს დაკავშირებული Wi-Fi ქსელთან.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">ბოდიში, როგორც ჩანს, ამ მოწყობილობას არ აქვს Wi-Fi Direct-ის მხარდაჭერა. Molly-ი Wi-Fi Direct-ს შენი ძველი Android მოწყობილობის აღმოსაჩენად და მასთან დასაკავშირებლად იყენებს. თუმცა შენი მონაცემების აღსადგენად, შეგიძლია შენი ძველი Android მოწყობილობის სარეზერვო კოპია აღადგინო.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">სარეზერვო კოპიის აღდგენა</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">შენს ძველ Android მოწყობილობასთან დაკავშირების მცდელობისას მოხდა მოულოდნელი შეცდომა.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">ვეძებთ ახალ Android მოწყობილობას…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">შენი ახალი Android მოწყობილობის აღმოსაჩენად და მასთან დასაკავშირებლად Signal-ს მდებარეობაზე წვდომის ნებართვა სჭირდება.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal-ს სჭირდება ჩართული მდებარეობის სერვისები შენი ახალი Android მოწყობილობის აღმოსაჩენად და მასთან დასაკავშირებლად.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal-ს სჭირდება ჩართული Wi-Fi შენი ახალი Android მოწყობილობის აღმოსაჩენად და მასთან დასაკავშირებლად. Wi-Fi უნდა იყოს ჩართული, მაგრამ არ უნდა იყოს დაკავშირებული Wi-Fi ქსელთან.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">ბოდიში, როგორც ჩანს, ამ მოწყობილობას არ აქვს Wi-Fi Direct-ის მხარდაჭერა. Signal-ი Wi-Fi Direct-ს შენი ახალი Android მოწყობილობის აღმოსაჩენად და მასთან დასაკავშირებლად იყენებს. თუმცა შენი მონაცემების აღსადგენად, შენი ახალი Android მოწყობილობაზე შეგიძლია სარეზერვო კოპია შექმნა.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">შენი ახალი Android მოწყობილობის აღმოსაჩენად და მასთან დასაკავშირებლად Molly-ს მდებარეობაზე წვდომის ნებართვა სჭირდება.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly-ს სჭირდება ჩართული მდებარეობის სერვისები შენი ახალი Android მოწყობილობის აღმოსაჩენად და მასთან დასაკავშირებლად.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly-ს სჭირდება ჩართული Wi-Fi შენი ახალი Android მოწყობილობის აღმოსაჩენად და მასთან დასაკავშირებლად. Wi-Fi უნდა იყოს ჩართული, მაგრამ არ უნდა იყოს დაკავშირებული Wi-Fi ქსელთან.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">ბოდიში, როგორც ჩანს, ამ მოწყობილობას არ აქვს Wi-Fi Direct-ის მხარდაჭერა. Molly-ი Wi-Fi Direct-ს შენი ახალი Android მოწყობილობის აღმოსაჩენად და მასთან დასაკავშირებლად იყენებს. თუმცა შენი მონაცემების აღსადგენად, შენი ახალი Android მოწყობილობაზე შეგიძლია სარეზერვო კოპია შექმნა.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">სარეზერვო კოპიის შექმნა</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">შენს ახალ Android მოწყობილობასთან დაკავშირების მცდელობისას მოხდა მოულოდნელი შეცდომა.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">მონაცემთა გადატანა</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">ორივე მოწყობილობა ერთმანეთთან ახლოს გეჭიროს. არ გამორთო მოწყობილობები და Signal-ი გახსნილი გქონდეს. გადატანა ბოლომდეა დაშიფრული.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">ორივე მოწყობილობა ერთმანეთთან ახლოს გეჭიროს. არ გამორთო მოწყობილობები და Molly-ი გახსნილი გქონდეს. გადატანა ბოლომდეა დაშიფრული.</string>
     <string name="DeviceTransfer__d_messages_so_far">ჯერ-ჯერობი %1$d შეტყობინება…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">ჯერ-ჯერობით %%-დან %1$s შეტყობინება…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">მონაცემების გადატანა</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">ჩამოტვირთე Signal-ი შენს ახალ Android მოწყობილობაზე</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">ჩამოტვირთე Molly-ი შენს ახალ Android მოწყობილობაზე</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"დააჭირე \"მონაცემების გადატანა ან აღდგენა\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">ნებისმიერს, ვისაც აქვს ეს ბმული, შეუძლია ნახოს ჯგუფის სახელი და ფოტო და მოითხოვოს გაწევრიანება. გაუზიარე ის ადამიანებს, რომლებსაც ენდობი.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">ნებისმიერს, ვისაც აქვს ეს ბმული, შეუძლია ნახოს ჯგუფის სახელი და ფოტო და შეუერთდეს ჯგუფს. გაუზიარე ის ადამიანებს, რომლებსაც ენდობი.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Signal-ით გაზიარება</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Molly-ით გაზიარება</string>
     <string name="GroupLinkBottomSheet_copy">დაკოპირება</string>
     <string name="GroupLinkBottomSheet_qr_code">QR კოდი</string>
     <string name="GroupLinkBottomSheet_share">გაზიარება</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">MobileCoin-ის შესახებ</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin-ი არის კონფიდენციალურობაზე ორიენტირებული ახალი ციფრული ვალუტა.</string>
     <string name="payment_info_card_adding_funds">თანხის დამატება</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">შეგიძლია Signal-ში გამოსაყენებლად თანხა დაამატო MobileCoin-ის შენი საფულის მისამართზე გაგზავნით.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">შეგიძლია Molly-ში გამოსაყენებლად თანხა დაამატო MobileCoin-ის შენი საფულის მისამართზე გაგზავნით.</string>
     <string name="payment_info_card_cashing_out">განაღდება</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">შეგიძლია გაანაღდო MobileCoin ნებისმიერ დროს იმ ბირჟაზე, რომელიც ემსახურება MobileCoin-ს. უბრალოდ გადარიცხე მაგ ბირჟის შენს ანგარიშზე.</string>
     <string name="payment_info_card_hide_this_card">დავმალოთ ეს ბარათი?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">საფულის დეაქტივაცია</string>
     <string name="DeactivateWalletFragment__your_balance">შენი ბალანსი</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">გადახდების დეაქტივაციამდე რეკომენდებულია, შენი თანხები სხვა საფულის მისამართზე გადარიცხო. თუ გადაწყვეტ, რომ შენი თანხები ახლა არ გადარიცხო, ისინი დარჩება Signal-თან დაკავშირებულ შენს საფულეში, თუ გადახდებს ხელახლა გააქტიურებ.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">გადახდების დეაქტივაციამდე რეკომენდებულია, შენი თანხები სხვა საფულის მისამართზე გადარიცხო. თუ გადაწყვეტ, რომ შენი თანხები ახლა არ გადარიცხო, ისინი დარჩება Molly-თან დაკავშირებულ შენს საფულეში, თუ გადახდებს ხელახლა გააქტიურებ.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">დარჩენილი ბალანსის გადატანა</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">დეაქტივაცია გადატანის გარეშე</string>
     <string name="DeactivateWalletFragment__deactivate">დეაქტივაცია</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">გსურს გადატანის გარეშე დეაქტივაცია?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">თუ ტრანზაქციების ხელახლა გააქტიურებას გადაწყვეტ, შენი ბალანსი შენს საფულეში დარჩება, რომელიც Signal-თანაა დაკავშირებული.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">თუ ტრანზაქციების ხელახლა გააქტიურებას გადაწყვეტ, შენი ბალანსი შენს საფულეში დარჩება, რომელიც Molly-თანაა დაკავშირებული.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">საფულის დეაქტივაციისას ხარვეზი მოხდა.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">ლიცენზიები</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">პირობები &amp; კონფიდენციალურობის პოლიტიკა</string>
-    <string name="HelpFragment__copyright_signal_messenger">Copyright Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Copyright Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">ლიცენზირებულია GNU AGPLv3-ით</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4773,7 +4911,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">ავტომატური</string>
+    <string name="ChatColorSelectionFragment__auto">Auto</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">ფერების მორგება</string>
     <string name="ChatColorSelectionFragment__chat_color">ჩატის ფერი</string>
     <string name="ChatColorSelectionFragment__edit">რედაქტირება</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">ფერის არჩევა</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">გაზიარება</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">ამ ჯგუფში შეტყობინებების გამოგზავნა მხოლოდ ადმინებს შეუძლიათ.</string>
-    <string name="MultiselectForwardFragment__limit_reached">ლიმიტი მიღწეულია</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">5-ზე მეტი ჩატის მონიშვნას ვერ შეძლებ</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">გაიგე მეტი</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Signal-ის განახლება</string>
+    <string name="UpdateSignalExpiredDialog__title">Molly-ის განახლება</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Signal-ის ამ ვერსიას ვადა გაუვიდა. განაახლე ახლავე, რათა Signal-ის გამოყენება განაგრძო.</string>
+    <string name="UpdateSignalExpiredDialog__message">Molly-ის ამ ვერსიას ვადა გაუვიდა. განაახლე ახლავე, რათა Molly-ის გამოყენება განაგრძო.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">განახლება</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">მოწყობილობა არ არის რეგისტრირებული</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">ეს მოწყობილობა აღარ არის რეგისტრირებული. ხელახლა დარეგისტრირდი, რომ გააგრძელო Signal-ის გამოყენება ამ მოწყობილობაზე.</string>
+    <string name="ReregisterSignalDialog__message">ეს მოწყობილობა აღარ არის რეგისტრირებული. ხელახლა დარეგისტრირდი, რომ გააგრძელო Molly-ის გამოყენება ამ მოწყობილობაზე.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">ხელახლა რეგისტრაცია</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">ამომრჩევის გახსნა ვერ მოხერხდა.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">შეტყობინებების ჩასართავად, Signal-ს მათი ჩვენების ნებართვა სჭირდება.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">შეტყობინებების ჩასართავად, Molly-ს მათი ჩვენების ნებართვა სჭირდება.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">ჩართვა</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">პასუხები ჯერ არაა</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">ამ Story-ის ვერ გამოეხმაურები, რადგან ამ ჯგუფის წევრი აღარ ხარ.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Story-ის გამოეხმაურა</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Story-ის გამოეხმაურა</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Story-ის გამოეხმაურა</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">ნახვები</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">აირჩიე შენი ბანკი</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">დაადასტურე შენი დონაცია %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">შენი განმეორებადი დონაციის დასაყენებლად, დააჭირე გააგრძელებას, რათა დაადასტურო შენს ბანკთან €0,01 გადახდა. ეს თანხა ავტომატურად დაგიბრუნდება და შენი ანგარიშიდან €5/თვეში დონაციის დებეტირების საშუალებას მოგცემს.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">შენი განმეორებადი დონაციის ჩასართავად, დააჭირე გააგრძელებას, რათა დაადასტურო შენს ბანკთან €0,01 გადახდა. ეს თანხა ავტომატურად დაგიბრუნდება და შენი ანგარიშიდან %1$s/თვეში დონაციის დებეტირების საშუალებას მოგცემს.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">გაგრძელება</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">მიმდინარეობს სარეზერვო მონაცემების გადმოწერა…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">მედია ფაილების სარეზერვო კოპირება გამორთულია</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">შენი Signal-ის მედია ფაილების სარეზერვო კოპირების გამოწერა გაუქმდა, რადგან შენი ტრანზაქციის დამუშავება ვერ მოვახერხეთ. შენს სარეზერვო კოპიებში შენახული მედია ფაილების გადმოსაწერად %1$d დღე გაქვს. %1$d დღის შემდეგ, შენს სარეზერვო კოპიებში არსებული მედია ფაილები წაიშლება.</item>
+        <item quantity="other">შენი Signal-ის მედია ფაილების სარეზერვო კოპირების გამოწერა გაუქმდა, რადგან შენი ტრანზაქციის დამუშავება ვერ მოვახერხეთ. შენს სარეზერვო კოპიებში შენახული მედია ფაილების გადმოსაწერად %1$d დღე გაქვს. %1$d დღის შემდეგ, შენს სარეზერვო კოპიებში არსებული მედია ფაილები წაიშლება.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">ნებისმიერ დროს შეგიძლია სარეზერვო კოპირების საფასურის გადახდა ისევ დაიწყო, რათა შენი ყველა მედია ფაილის სარეზერვო კოპიების შექმნა გააგრძელო. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">შენი მედია ფაილები დღეს წაიშლება</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">შენი Signal-ის მედია ფაილების სარეზერვო კოპირების გამოწერა გაუქმდა, რადგან შენი ტრანზაქციის დამუშავება ვერ მოვახერხეთ. შენს სარეზერვო კოპიებში არსებული მედია ფაილების წაშლამდე მათი გადმოწერისთვის ბოლო შანსი გაქვს.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">ჩამოტვირთვის დასრულება ვერ მოხერხდა</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">შენს მოწყობილობას საკმარისი თავისუფალი ადგილი არ აქვს. გაათავისუფლე %1$s-მდე ადგილი, რათა შენს სარეზერვო კოპიებში შენახული მედია ფაილების გადმოწერა შეძლო.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">თუ აირჩევ მედია ფაილების სარეზერვო კოპიების შექმნის \"გამოტოვება\", ისინი %1$d დღეში წაიშლება.</item>
+        <item quantity="other">თუ აირჩევ მედია ფაილების სარეზერვო კოპიების შექმნის \"გამოტოვება\", ისინი %1$d დღეში წაიშლება.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">სარეზერვო კოპირების ტრანზაქციის დამუშავება ვერ მოხერხდა</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">შენი სარეზერვო კოპირების ყოველთვიური ტრანზაქციის მიღებას ვერ ვახერხებთ. დარწმუნდი, რომ შენი გადახდის მეთოდი განახლებულია. თუ არა, განაახლე ის Google Pay-ში. Signal-ი ტრანზაქციის დამუშავებას რამდენიმე დღეში ისევ ეცდება.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">სარეზერვო კოპირება ვერ მოხერხდა</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">%1$d დღეა შენს მოწყობილობას სარეზერვო კოპიები არ შეუქმნია. დარწმუნდი, რომ შენი მოწყობილობა Wi-Fi-სთან დაკავშირებულია და დააჭირე \"სარეზერვო კოპიების შექმნა\". </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">გაიგე მეტი</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">გამოტოვება</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">ჩამოტვირთე მედია ფაილები ახლა</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">მოგვიანებით ჩამოტვირთვა</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">არ გადმოწერო მედია ფაილები</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">გაათავისუფლე %1$s ადგილი შენი მედია ფაილების გადმოსაწერად.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">საკრედიტო ან სადებეტო ბარათი</string>
@@ -6874,16 +7058,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">უცნობი</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">ტრანზაქციის ისტორია</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">შენი ბოლო სარეზერვო კოპია შეიქმნა %1$s-ში %2$s-ზე.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">ჩატის ლიმიტები</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">მიმოწერის სიგრძის ლიმიტები</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">მიმოწერის ისტორიის წაშლა</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">შეტყობინებები, რომლებიც მონიშნულ დროს სცდებიან, სამუდამოდ წაიშლება.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">შეტყობინებები, რომლებიც მონიშნულ სიგრძეს აღემატება, სამუდამოდ წაიშლება.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">გამოიყენე ლიმიტები დაკავშირებულ მოწყობილობებზე</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">ჩართვის შემთხვევაში, ჩატის ლიმიტები ასევე წაშლის წერილებს შენი დაკავშირებული მოწყობილობებიდან.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">წაშლის ბრძანება ახლა შენს ყველა მოწყობილობაში სინქრონიზებულია</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">როცა შეტყობინებებს ან ჩატებს შლი, ისინი შენი მობილურიდან და დაკავშირებული მოწყობილობებიდან იშლება.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">ტრანზაქციის ისტორია</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">ტექსტისა და ყველა მედია ფაილის სარეზერვო კოპია</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">ტრანზაქციის დეტალები</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">სარეზერვო კოპირების ტიპი</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">გადახდის დღე</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">გაზიარება</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal-ის სარეზერვო კოპიები</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">ტრანზაქციის ისტორია</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">სარეზერვო კოპიების დეტალები</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">სარეზერვო კოპიების ზომა</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">სარეზერვო კოპიების შექმნის სიხშირე</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">სარეზერვო კოპიების შექმნა მობილური ინტერნეტის გამოყენებით</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">გამორთვა და სარეზერვო კოპიების წაშლა</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">სარეზერვო კოპია წაიშალა და გამოირთო.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">სარეზერვო კოპირების ტიპი შეცვლილია და გამოწერა გაუქმდა</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">გამოწერა გაუქმებულია</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">ჩამოტვირთვა დასრულებულია</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">სარეზერვო კოპირების ტიპი</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">სარეზერვო კოპირება გამორთულია</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/თვეში</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">სარეზერვო კოპირების ჩართვა</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">ბოლოს შექმნილი სარეზერვო კოპია</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s-ში %2$s-ზე</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">არასდროს</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">სარეზერვო კოპიია ახლავე შექმნა</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">გამოვრთოთ და წავშალოთ სარეზერვო კოპიები?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">თანხა აღარ ჩამოგეჭრება. შენი სარეზერვო კოპიები წაიშლება და ახალი სარეზერვო კოპიები აღარ შეიქმნება.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">გამორთვა და წაშლა</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">მიმდინარეობს სარეზერვო კოპიების წაშლა…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">სარეზერვო კოპიები წაიშალა</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"\"სარეზერვო კოპიის შექმნა ახლავე\" დაჭერით"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">ყოველდღიური</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">ყოველკვირეული</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">ყოველთვიური</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">შენით შექმენი სარეზერვო კოპია</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">გთხოვთ, შენი მოწყობილობის პინ-კოდი, პაროლი ან პატერნი შეიყვანო.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">შემდეგი</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">სარეზერვო კოპირების ტიპის შეცვლა</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">გამოწერის გაუქმება</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">გაუქმების დადასტურება</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">თანხა აღარ ჩამოგეჭრება. სარეზერვო კოპიების შექმნა შენი გადახდის ციკლის ბოლოს გამოირთვება. ამ თარიღის შემდეგ 30 დღე გექნება იმ მედია ფაილების ჩამოსატვირთად, რომლის სარეზერვო კოპირებასაც ახდენ.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">დადასტურება და ახლავე ჩამოტვირთვა</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">დადასტურება და მოგვიანებით ჩამოტვირთვა</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">გამოწერის შენარჩუნება</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-kk/strings.xml b/app/src/main/res/values-kk/strings.xml
index 6ea4b735a3..d239fc4d7d 100644
--- a/app/src/main/res/values-kk/strings.xml
+++ b/app/src/main/res/values-kk/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal жаңартылуда…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly жаңартылуда…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Сіз әлі құпия сөйлемді орнатқан жоқсыз!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Құпия сөйлемді өшіру керек пе?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Ол Signal-дың және хабарландырулардың біржола құлпын ашады.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Ол Molly-дың және хабарландырулардың біржола құлпын ашады.</string>
     <string name="ApplicationPreferencesActivity_disable">Өшіру</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Серверге қосылу кезінде қате шықты!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">Тіркелу құлпы үшін PIN-кодтар қажет. PIN-кодарды өшіргіңіз келсе, әуелі тіркелу құлпын өшіріңіз.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Файл</string>
     <string name="AttachmentKeyboard_contact">Контакт</string>
     <string name="AttachmentKeyboard_location">Орналасқан жері</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal фотосуреттер мен видеоларды көрсету үшін рұқсат сұрайды</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly фотосуреттер мен видеоларды көрсету үшін рұқсат сұрайды</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Пайдалануға рұқсат беру</string>
     <string name="AttachmentKeyboard_payment">Төлем</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Мультимедиа таңдайтын қолданбаны табу мүмкін емес.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Фотосурет, видео немесе аудионы тіркеу үшін Signal қолданбасына құрылғы жады ашық болу керек, бірақ параметрлерде оған кіруге рұқсат берілмеген. Қолданба параметрлері мәзіріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Жад\" функциясын қосыңыз.</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Контакт туралы ақпаратты тіркеу үшін Signal қолданбасына Контактілер ашық болу керек, бірақ параметрлерде оған кіруге рұқсат берілмеген. Қолданба параметрлері мәзіріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Контактілер\" функциясын қосыңыз.</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Геолокацияны тіркеу үшін Signal қолданбасына Геолокация ашық болу керек, бірақ параметрлерде оған кіруге рұқсат берілмеген. Қолданба параметрлері мәзіріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Геолокация\" функциясын қосыңыз.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Фотосурет, видео немесе аудионы тіркеу үшін Molly қолданбасына құрылғы жады ашық болу керек, бірақ параметрлерде оған кіруге рұқсат берілмеген. Қолданба параметрлері мәзіріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Жад\" функциясын қосыңыз.</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Контакт туралы ақпаратты тіркеу үшін Molly қолданбасына Контактілер ашық болу керек, бірақ параметрлерде оған кіруге рұқсат берілмеген. Қолданба параметрлері мәзіріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Контактілер\" функциясын қосыңыз.</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Геолокацияны тіркеу үшін Molly қолданбасына Геолокация ашық болу керек, бірақ параметрлерде оған кіруге рұқсат берілмеген. Қолданба параметрлері мәзіріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Геолокация\" функциясын қосыңыз.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Орныңыз туралы ақпартаты пайдалануға рұқсат ету</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Орныңызды жіберу үшін:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Signal қолданбасына орналасқан жеріңіз туралы ақпаратты жіберуге рұқсат етіңіз.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Molly қолданбасына орналасқан жеріңіз туралы ақпаратты жіберуге рұқсат етіңіз.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Орналасқан жеріңізді жіберу үшін Signal қолданбасына орныңыз туралы ақпаратты пайдалануға керек.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Орналасқан жеріңізді жіберу үшін Molly қолданбасына орныңыз туралы ақпаратты пайдалануға керек.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Жадты пайдалануға рұқсат ету</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Фотосуреттер мен видеоларды көрсету үшін:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Фотосуреттеріңіз бен видеоларыңызды көрсету үшін Signal қолданбасы жадты пайдалана алуы керек.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Фотосуреттеріңіз бен видеоларыңызды көрсету үшін Molly қолданбасы жадты пайдалана алуы керек.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s Төлемдерді белсендірмеді </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Камераны ауыстыру</string>
     <string name="CameraXFragment_open_gallery_description">Галереяны ашу</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Пайдалануға рұқсат беру</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Камера мен микрофонды пайдалануға рұқсат етіңіз</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Камераны пайдалануға рұқсат ету</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Микрофонды пайдалануға рұқсат етіңіз</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Фотосуреттер түсіру үшін Signal қолданбасына камераны пайдалануға рұқсат керек.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Фотосуреттер мен видео түсіру үшін Signal қолданбасына камера ашық болу керек.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Фотосуреттер мен видео түсіру үшін Signal қолданбасына камера мен микрофонды пайдалануға рұқсат керек.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Видеоларды дауыспен түсіру үшін Signal қолданбасына микрофонды пайдалануға рұқсат керек.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">QR кодты сканерлеу үшін Signal қолданбасына камераны пайдалануға рұқсат керек.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Фотосуретке түсіру үшін Signal қолданбасына камераны пайдалануға рұқсат керек</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">QR кодтарды сканерлеу үшін Signal қолданбасына камераны пайдалануға рұқсат керек</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Видео түсіру үшін Signal қолданбасына микрофонды пайдалануға рұқсат керек</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Signal-да фотосуреттер түсіру үшін:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Signal-да фотосуреттер мен видеоларды түсіру үшін:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Видеоларды дауыспен түсіру үшін:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR кодтарды сканерлеу үшін:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Соңғы контактілер</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Signal контактілері жоқ</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Фотосуреттерді Signal контактілеріне жіберу үшін ғана камера түймесін қолдана аласыз. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Іздеген адамыңызды таба алмай жатырсыз ба?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Контактіні Signal-ға қосылуға шақырыңыз</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Контактіні Molly-ға қосылуға шақырыңыз</string>
     <string name="CameraContacts__menu_search">Іздеу</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Жоқ, рақмет</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Signal-ды жаңарту</string>
+    <string name="ClientDeprecatedActivity_update_signal">Molly-ды жаңарту</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Қолданбаның бұл нұсқасына енді қолдау көрсетілмейді. Әрі қарай да хаттарды жіберу және алу үшін, ең соңғы нұсқасын орнатыңыз.</string>
     <string name="ClientDeprecatedActivity_update">Жаңарту</string>
     <string name="ClientDeprecatedActivity_dont_update">Жаңартпау</string>
     <string name="ClientDeprecatedActivity_warning">Ескерту</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Signal қолданбасы ескіріп кетті. Қазір хаттар тарихын көре аласыз, бірақ қолданбаны жаңартпайынша, хаттармен алмаса алмайсыз.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Molly қолданбасы ескіріп кетті. Қазір хаттар тарихын көре аласыз, бірақ қолданбаны жаңартпайынша, хаттармен алмаса алмайсыз.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Веб-браузер табылмады.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">%1$s нөміріне хат жазу</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly дауыстық қоңырауы %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly видеоқоңырауы %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal хаты</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Хат жіберу</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Signal %1$s қолданбасына ауысайық</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Molly %1$s қолданбасына ауысайық</string>
     <string name="ConversationActivity_specify_recipient">Контактіні таңдаңыз</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Сіз жіберіп жатқан хат түрі үшін тіркеменің өлшемі бекітілген шектен асып кетті.</string>
     <string name="ConversationActivity_unable_to_record_audio">Аудио жазу мүмкін болмады!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Аудиохаттарды жіберу үшін:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Дауыстық хаттар жіберу үшін Signal қолданбасына микрофонды пайдалануға рұқсат етіңіз.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Дауыстық хаттар жіберу үшін Molly қолданбасына микрофонды пайдалануға рұқсат етіңіз.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Дауыстық хат жазу үшін Signal қолданбасына микрофонды пайдалануға рұқсат керек.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Аудио хаттар жіберу үшін Signal-ға микрофон ашық болу керек, бірақ параметрлерде микрофонды пайдалануға рұқсат берілмеген. Қолданба параметрлеріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Микрофон\" параметрін қосыңыз.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Дауыстық хат жазу үшін Molly қолданбасына микрофонды пайдалануға рұқсат керек.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Аудио хаттар жіберу үшін Molly-ға микрофон ашық болу керек, бірақ параметрлерде микрофонды пайдалануға рұқсат берілмеген. Қолданба параметрлеріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Микрофон\" параметрін қосыңыз.</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s қоңырау шалу үшін Signal қолданбасына микрофон мен камераны пайдалануға рұқсат керек, бірақ параметрлерде оларды пайдалануға рұқсат берілмеген. Қолданба параметрлеріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Микрофон\" және \"Камера\" параметрлерін қосыңыз.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Фотосуреттер мен видео түсіру үшін Signal қолданбасына камера ашық болу керек.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Фотосурет немесе видео түсіру үшін Signal қолданбасына камера ашық болу керек, бірақ параметрлерде оны пайдалануға рұқсат берілмеген. Қолданба параметрлеріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Камера\" параметрін қосыңыз.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Фотосуреттер немесе видео түсіру үшін Signal қолданбасына камера ашық болу керек</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s қоңырау шалу үшін Molly қолданбасына микрофон мен камераны пайдалануға рұқсат керек, бірақ параметрлерде оларды пайдалануға рұқсат берілмеген. Қолданба параметрлеріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Микрофон\" және \"Камера\" параметрлерін қосыңыз.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Фотосуреттер мен видео түсіру үшін Molly қолданбасына камера ашық болу керек.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Фотосурет немесе видео түсіру үшін Molly қолданбасына камера ашық болу керек, бірақ параметрлерде оны пайдалануға рұқсат берілмеген. Қолданба параметрлеріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Камера\" параметрін қосыңыз.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Фотосуреттер немесе видео түсіру үшін Molly қолданбасына камера ашық болу керек</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Видеоларды дауыспен түсіру үшін микрофонды пайдалануға рұқсатты қосыңыз.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Видео түсіру үшін Signal қолданбасына микрофон ашық болу керек, бірақ параметрлерде оны пайдалануға рұқсат берілмеген. Қолданба параметрлеріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Микрофон\" және \"Камера\" параметрлерін қосыңыз.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Видеолар түсіру үшін Signal қолданбасына микрофонды пайдалануға рұқсат керек.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Видео түсіру үшін Molly қолданбасына микрофон ашық болу керек, бірақ параметрлерде оны пайдалануға рұқсат берілмеген. Қолданба параметрлеріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Микрофон\" және \"Камера\" параметрлерін қосыңыз.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Видеолар түсіру үшін Molly қолданбасына микрофонды пайдалануға рұқсат керек.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Жоқ</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Қоңырау шалып, сөйлесу үшін:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Қоңырау шалып, сөйлесу үшін Signal қолданбасына микрофонды пайдалануға рұқсат етіңіз.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Қоңырау шалып, сөйлесу үшін Molly қолданбасына микрофонды пайдалануға рұқсат етіңіз.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Қоңырау шалып, сөйлесу үшін Signal қолданбасына микрофонды пайдалануға рұқсат керек.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Қоңырау шалып, сөйлесу үшін Molly қолданбасына микрофонды пайдалануға рұқсат керек.</string>
 
 
     <string name="ConversationActivity_join">Қосылу</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Енді Signal-да SMS-пен алмасу мүмкін емес. Әңгімелеріңізді осы жерде жалғастыру үшін %1$s деген кісіні Signal-ға шақырыңыз.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Бұл адам бұдан былай Signal қолданбайды. Әңгімелеріңізді осы жерде жалғастыру үшін оны Signal-ға шақырыңыз.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Бұл адам бұдан былай Molly қолданбайды. Әңгімелеріңізді осы жерде жалғастыру үшін оны Molly-ға шақырыңыз.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Signal қолданбасына шақыру</string>
+    <string name="ConversationActivity__invite_to_signal">Molly қолданбасына шақыру</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Жақында сізге қайта еске салғыш хат жіберіледі.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Барлығынан жою</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Бұл құрылғыдан жою</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Жою</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Барлық жерден жою</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Signal-дың соңғы нұсқасы орнатылған болса, бұл хат чаттағы әрбір адамда жойылады. Олар сіздің хатты жойғаныңызды көретін болады.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Блокталған</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Signal-ды жаңарту</string>
+    <string name="ConversationFragment__update_build">Molly-ды жаңарту</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Signal-ға қайта тіркелу</string>
+    <string name="ConversationFragment__reregister_signal">Molly-ға қайта тіркелу</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Алдыңғы экранға қайтыңыз.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signal-ды ашу</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Molly-ды ашу</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Бұдан былай верификацияланбайды</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Бұл опция таңдалған чатты біржола жойып тастайды.</item>
         <item quantity="other">Бұл опция барлық таңдалған %1$d чатты біржола жойып тастайды.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Бұл функция таңдалған чатты барлық құрылғыңыздан жойып тастайды.</item>
+        <item quantity="other">Бұл функция таңдалған %1$d чатты барлық құрылғыңыздан жойып тастайды.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Жою</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Таңдалған чатты жою…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Мені нөмірім арқылы кім таба алады?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Телефон нөміріңізді білетін кез келген адам сіздің Signal қолданбасын пайдаланатыныңызды біле алады және сізбен чат аша алады.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Телефон нөміріңізді білетін кез келген адам сіздің Molly қолданбасын пайдаланатыныңызды біле алады және сізбен чат аша алады.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Сіз біреуге хат жазбайынша немесе біреумен ортақ чатыңыз болмайынша, сіздің Signal қолданбасын пайдаланатыныңызды ешкім көре алмайды.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Сіз біреуге хат жазбайынша немесе біреумен ортақ чатыңыз болмайынша, сіздің Molly қолданбасын пайдаланатыныңызды ешкім көре алмайды.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Сақтық көшірмеден қалпына келтіру керек пе?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Резервтік көшірменің құпия сөйлемін тексеріп, оның сәйкес келетініне көз жеткізіңіз</string>
     <string name="BackupsPreferenceFragment__turn_on">Іске қосу</string>
     <string name="BackupsPreferenceFragment__turn_off">Өшіру</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Резервтік көшірмені қалпына келтіру үшін, Signal-дың жаңа көшірмесін орнатыңыз. Қолданбаны ашып, \"Резервтік көшірмені қалпына келтіру\" опциясын басыңыз да, резервтік көшірме файлын тауып алыңыз.%1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Резервтік көшірмені қалпына келтіру үшін, Molly-дың жаңа көшірмесін орнатыңыз. Қолданбаны ашып, \"Резервтік көшірмені қалпына келтіру\" опциясын басыңыз да, резервтік көшірме файлын тауып алыңыз.%1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Толық ақпарат</string>
     <string name="BackupsPreferenceFragment__in_progress">Орындалуда…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">Әзірге %1$d …</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">Әзірге %1$s%% …</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Резервтік көшірмелерді жасау үшін Signal қолданбасына сыртқы жадты пайдалануға рұқсат керек, бірақ ол біржола өшірілген. Қолданба параметрлерін ашып, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Жад\" параметрін қосыңыз.</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Резервтік көшірмелерді жасау үшін Molly қолданбасына сыртқы жадты пайдалануға рұқсат керек, бірақ ол біржола өшірілген. Қолданба параметрлерін ашып, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Жад\" параметрін қосыңыз.</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Резервтік көшірме жасау уақытын орнату</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Чат сеансы жаңартылды</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal өтпелі шифрлау функциясын пайдаланады, сондықтан кейде чат сеансын жаңартып тұруы керек болуы мүмкін. Бұл чаттың қауіпсіздігіне әсер етпейді, бірақ осы контактіден жіберілген хат келмей қалуы мүмкін. Оны қайта жіберуін сұрауыңызға болады.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly өтпелі шифрлау функциясын пайдаланады, сондықтан кейде чат сеансын жаңартып тұруы керек болуы мүмкін. Бұл чаттың қауіпсіздігіне әсер етпейді, бірақ осы контактіден жіберілген хат келмей қалуы мүмкін. Оны қайта жіберуін сұрауыңызға болады.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Компьютерге немесе iPad-қа арналған Signal-ды пайдалану Хаттарыңыз байланыстырылған құрылғыларыңызға синхрондалады.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Жаңа құрылғыны байланыстыру</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Хаттар мен чаттағы ақпарат барлық құрылғыда өтпелі шифрлау функциясымен қорғалған</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Компьютерге немесе iPad-қа арналған Signal</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Байланыстырылған құрылғылардағы хаттардың барлығы құпия сақталады</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Байланыстырылғаннан кейін Molly-дағы хаттар мобильдік телефоныңыздағы Molly қолданбасымен синхрондалады. Алдыңғы хаттар тарихы пайда болмайды.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Екінші құрылғыда %1$s веб-сайтына кіріп, Molly-ды орнатыңыз</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Байланыстырылған құрылғыларым</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Байланыстырмау</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s байланысы ажыратылды</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Құрылғыны байланыстыру…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Құрылғы мақұлданды</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Жүктелуде…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Байланыстырылған құрылғылар жоқ</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Құрылғыны байланыстыру үшін құлпын ашыңыз</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Байланыстырылатын құрылғыда көрсетілген QR кодты сканерлеңіз.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">QR кодты сканерлеу</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Осы құрылғыны пайдаланып, байланыстырғыңыз келетін құрылғыда көрсетілген QR кодын сканерлеңіз</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Жарайды</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">This device will be able to see your groups and contacts, access your chats, and send messages in your name.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Екінші құрылғыңызда байланыстыруды аяқтаңыз</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Екінші құрылғыңызда Molly-ды байланыстыруды аяқтаңыз.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Құрылғыны байланыстыру сәтсіз болды</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">QR код дұрыс емес. Байланыстырғыңыз келетін құрылғының экранында көрінетін QR кодты сканерлеп жатқаныңызға көз жеткізіңіз.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Қайтадан байқап көру</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">\"%1$s\" байланысын жою керек пе?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Қолданыста жоқ Play қызметтерін оңтайландыру</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Бұл құрылғыда Play қызметтері жұмыс істемейді. Signal жұмыс істемей тұрғанда хат алуға кедергі ететін жүйе батареясын оңтайландыру параметрлерін өшіру үшін түртіңіз.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Бұл құрылғыда Play қызметтері жұмыс істемейді. Molly жұмыс істемей тұрғанда хат алуға кедергі ететін жүйе батареясын оңтайландыру параметрлерін өшіру үшін түртіңіз.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Signal-дың бұл нұсқасы ескіріп кетті. Хаттар жіберу және алу үшін қазір жаңартыңыз.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Molly-дың бұл нұсқасы ескіріп кетті. Хаттар жіберу және алу үшін қазір жаңартыңыз.</string>
     <string name="ExpiredBuildReminder_update_now">Қазір жаңарту</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">View</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Тұрақты Signal байланысының ақауы!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal қолданбасы Google Play қызметтерімен тіркеле алмады. Signal хаттары мен қоңыраулары өшірілді, оны \"Параметрлер &gt; Қосымша\" бөлімінде қайта тіркеп көріңіз.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Тұрақты Molly байланысының ақауы!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly қолданбасы Google Play қызметтерімен тіркеле алмады. Molly хаттары мен қоңыраулары өшірілді, оны \"Параметрлер &gt; Қосымша\" бөлімінде қайта тіркеп көріңіз.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Ақауларды түзету журналдары диагностика жасап, ақауларды түзетуге мүмкіндік береді және онда жеке басты анықтайтын ақпарат болмайды.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal жұмысында ақау шықты. Ақауларды түзету журналын жіберу керек пе?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly жұмысында ақау шықты. Ақауларды түзету журналын жіберу керек пе?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Батареяны оңтайландыру процестеріне байланысты хабарландырулар аздап кешігуі мүмкін</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Хабарландырулар кешікпеуі үшін, Signal үшін батареяны оңтайландыру процестерін өшіріп қоюыңызға болады.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Хабарландырулар кешікпеуі үшін, Molly үшін батареяны оңтайландыру процестерін өшіріп қоюыңызға болады.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Батареяны оңтайландыру процестеріне байланысты хабарландырулар аздап кешігуі мүмкін</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Хабарландырулар кешікпеуі үшін, Molly үшін батареяны оңтайландыру процестерін өшіріп қойыңыз. Құрылғыға тән нұсқауларды көру үшін «Жалғастыру» түймесін түртіңіз.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Жоқ, рақмет</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Жалғастыру</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Жалғастыру</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Жабу</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Жоқ, рақмет</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Әлі қабылданбаған шақырулар</string>
+    <string name="PendingMembersActivity_pending_group_invites">Өтініштер және шақырулар</string>
     <string name="PendingMembersActivity_requests">Өтініштер</string>
     <string name="PendingMembersActivity_invites">Шақырулар</string>
     <string name="PendingMembersActivity_people_you_invited">Сіз шақырған адамдар</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Болдырмау</string>
     <string name="InviteActivity_sending">Жіберілуде…</string>
     <string name="InviteActivity_invitations_sent">Шақырулар жіберілді!</string>
-    <string name="InviteActivity_invite_to_signal">Signal қолданбасына шақыру</string>
+    <string name="InviteActivity_invite_to_signal">Molly қолданбасына шақыру</string>
     <string name="InviteActivity_send_sms">SMS (%1$d) жіберу</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">%1$d SMS шақыруын жіберу керек пе?</item>
         <item quantity="other">%1$d SMS шақыруларын жіберу керек пе?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Signal-ға ауысайық: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Molly-ға ауысайық: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Бөлісетін бірде-бір қолданбаңыз жоқ сияқты.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Сіздің хатыңыз</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Фондық байланыс қосылды</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Жауаптар</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal қоңырауы орнатылуда</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly қоңырауы орнатылуда</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signal қоңырау қызметі іске қосылуда</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal қоңырау қызметі тоқтатылуда</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Molly қоңырау қызметі іске қосылуда</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly қоңырау қызметі тоқтатылуда</string>
     <string name="NotificationBarManager__cancel_call">Қоңыраудан бас тарту</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Төлемдерді белсендірдіңіз</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s енді Төлемдер қабылдай алады</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Төлем туралы мәлімет қолжетімді емес</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Көбірек көру үшін түрту</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Төлем туралы мәлімет қолжетімді емес</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Бұл төлем туралы мәлімет қолжетімді емес, себебі хатттарыңыз бұл төлемдер тарихын қамтылмаған көзден қалпына келтіріледі. Ол сіздің әмияныңыздың балансына немесе өткен төлемдеріңіздің статусына әсер етпейді.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Жақында Signal арқылы SMS хаттар жібере алмайтын боласыз. Әңгімелеріңізді осы жерде жалғастыру үшін %1$s деген кісіні Signal-ға шақырыңыз.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Енді Signal-да SMS хаттар жібере алмайсыз. Әңгімелеріңізді осы жерде жалғастыру үшін %1$s деген кісіні Signal-ға шақырыңыз.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Енді Molly-да SMS хаттар жібере алмайсыз. Әңгімелеріңізді осы жерде жалғастыру үшін %1$s деген кісіні Molly-ға шақырыңыз.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Төлем: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Төлем</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Спам деп хабарланды</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Signal құрылғысын байланыстыру керек пе?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Signal құрылғысын 3-тарап сканерімен байланыстырайын деп жатқан сияқтысыз. Өз қауіпсіздігіңіз үшін кодты Signal қолданбасынан қайта сканерлеңіз.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal қолданбасы QR кодты сканерлеу үшін камераны пайдалануға рұқсат болу керек, бірақ параметрлерде оны пайдалануға рұқсат берілмеген. Қолданба параметрлеріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Камера\" функциясын қосыңыз.</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly қолданбасы QR кодты сканерлеу үшін камераны пайдалануға рұқсат болу керек, бірақ параметрлерде оны пайдалануға рұқсат берілмеген. Қолданба параметрлеріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Камера\" функциясын қосыңыз.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Камераны пайдалануға рұқсат берілмесе, QR кодын сканерлей алмайсыз</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Құпия сөйлемді енгізіңіз</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal белгішесі</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly белгішесі</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Құпия сөйлемді жіберу</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Құпия сөйлем дұрыс емес!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signal қолданбасының құлпын ағыту</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Құлыптау экраны</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Molly қолданбасының құлпын ағыту</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Құлыптау экраны</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Карта</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Хат алмасуды жалғастыру үшін тексеру</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Signal-да спам келмеу үшін верификациядан өтіңіз.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Molly-да спам келмеу үшін верификациядан өтіңіз.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Верификациядан өткен соң, әрі қарай хат алмаса аласыз. Жіберілмей қалған хаттардың барлығы автоматты түрде жіберіледі.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Менің сторисім</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal қоңырауы</string>
+    <string name="Recipient_signal_call">Molly қоңырауы</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Блоктау</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Қоңырау соғылуда…</string>
     <string name="RedPhone_busy">Бос емес</string>
     <string name="RedPhone_recipient_unavailable">Алушы қолжетімді емес</string>
-    <string name="RedPhone_network_failed">Желі қосылмады!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Желі қосылмады! Желі байланысын тексеріп, қайталап көріңіз.</string>
     <string name="RedPhone_number_not_registered">Нөмір тіркелмеген!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Сіз терген нөмір қауіпсіз дауыстық байланысқа қолдау көрсетпейді!</string>
     <string name="RedPhone_got_it">Түсінікті</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Бейнефайлды іске қосу үшін түрту</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s қоңырау шалу үшін Signal қолданбасына камераны пайдалануға рұқсат керек</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s қоңырау шалу үшін Molly қолданбасына камераны пайдалануға рұқсат керек</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Қоңырау шалынуда…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Қайта жалғануда…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Қоңыраудан шығарылды</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Біреу сізді қоңыраудан шығарып тастады.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Камера мен микрофонды пайдалануға рұқсат етіңіз</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Микрофонды пайдалануға рұқсат етіңіз</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Камераны пайдалануға рұқсат ету</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Қоңырауды бастау немесе қоңырауға қосылу үшін Molly қолданбасы камераны және микрофонды қолдана алуы керек.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Қоңырау шалу немесе оған қосылу үшін Molly қолданбасына микрофонды пайдалануға рұқсат етіңіз.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Бұл видеоны қосу үшін Molly қолданбасына камераны пайдалануға рұқсат етіңіз.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Қоңырауды бастау немесе оған қосылу үшін Molly қолданбасына микрофон рұқсаты керек.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Видеоңызды қосу үшін Molly қолданбасы камераңызды пайдалана алуы керек</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Қоңырауды бастау немесе оған қосылу:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Видеоны қосу үшін:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal қоңырауы</string>
-    <string name="WebRtcCallView__signal_video_call">Signal видеоқоңырауы</string>
+    <string name="WebRtcCallView__signal_call">Molly қоңырауы</string>
+    <string name="WebRtcCallView__signal_video_call">Molly видеоқоңырауы</string>
     <string name="WebRtcCallView__start_call">Қоңырауды бастау</string>
     <string name="WebRtcCallView__join_call">Қоңырауға қосылу</string>
     <string name="WebRtcCallView__call_is_full">Қоңырауға бұдан артық адам қосыла алмайды</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Қолыңызды түсіресіз бе?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Қолды түсіру</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Түсіру</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Бас тарту</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Қолыңызды көтердіңіз</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">View</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s қолын көтерді</item>
-        <item quantity="other">%1$s + %2$d қолдарын көтерді</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s қолыңызды көтердіңіз</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d қолын көтерді</item>
+        <item quantity="other">%1$s + %2$d қолын көтерді</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s қол көтерді</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d қолын көтерді</item>
+        <item quantity="other">%1$s + %2$d қолын көтерді</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Осы нөмірді растау үшін сізге қоңырау соғылады.</string>
     <string name="RegistrationActivity_edit_number">Нөмірді өзгерту</string>
     <string name="RegistrationActivity_missing_google_play_services">Google Play қызметтері жоқ</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Бұл құрылғыда Google Play қызметтері жоқ. Signal қолданбасын әлі де пайдалануға болады, бірақ бұл конфигурация сенімділік пен жұмыс өнімділігін азайтуы мүмкін.\n\nЕгер сіз тәжірибелі пайдаланушы болмасаңыз, сатылымнан кейінгі Android ROM жадын қолданбасаңыз немесе мұны қате көріп отырмын деп ойласаңыз, ақайлықты анықтауда көмек алу үшін support@signal.org қызметіне хабарласыңыз.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Бұл құрылғыда Google Play қызметтері жоқ. Molly қолданбасын әлі де пайдалануға болады, бірақ бұл конфигурация сенімділік пен жұмыс өнімділігін азайтуы мүмкін.\n\nЕгер сіз тәжірибелі пайдаланушы болмасаңыз, сатылымнан кейінгі Android ROM жадын қолданбасаңыз немесе мұны қате көріп отырмын деп ойласаңыз, ақайлықты анықтауда көмек алу үшін support@molly.im қызметіне хабарласыңыз.</string>
     <string name="RegistrationActivity_i_understand">Түсінемін</string>
     <string name="RegistrationActivity_play_services_error">Play қызметтерінің қатесі</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play қызметтері жаңартылуда немесе уақытша жұмыс істемейді. Тағы да байқап көріңіз.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Стандартты емес нөмір форматы</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Сіз енгізген нөмірдің (%1$s) форматы стандартты емес екен.\n\n%2$s деп жазғыңыз келіп пе еді?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Телефон нөмірінің форматы</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Телефон нөмірінің форматы</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Қоңырау шалу сұралды</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Тіркелу кезінде қиындыққа тап болып жатырсыз ба?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• SMS немесе қоңырау қабылдай алатындай телефоныңызда ұялы байланыс болуы керек. \n • Сол нөмірге телефон қоңырауын қабылдай алатын болуыңыз керек\n • Телефон нөміріңізді дұрыс енгізгеніңізді тексеріңіз.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Толық ақпарат алу үшін ақауларды түзету қадамдарын орындаңыз немесе қолдау көрсету қызметіне хабарласыңыз</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Толық ақпарат алғыңыз келсе, %1$s немесе %2$s бөліміндегі нұсқауларды орындаңыз</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">бұл ақауларды түзету қадамдары</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Байланыстық тұлғаларға қосу</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Signal қолданбасына шақыру</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Molly қолданбасына шақыру</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal хаты</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal қоңырауы</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Байланыстық тұлғаларға қосу</string>
-    <string name="SharedContactView_invite_to_signal">Signal қолданбасына шақыру</string>
+    <string name="SharedContactView_invite_to_signal">Molly қолданбасына шақыру</string>
     <string name="SharedContactView_message">Signal хаты</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s нөмірі %2$s деген кісіге тиесілі</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal-ды жаңарту</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal-дың жаңа нұсқасы шықты. Жаңарту үшін түртіңіз.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal жаңартылмады</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly-ды жаңарту</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly-дың жаңа нұсқасы шықты. Жаңарту үшін түртіңіз.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly жаңартылмады</string>
     <string name="ApkUpdateNotifications_failed_general_body">Кейінірек тағы қайталап көреміз.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal жаңартылды</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly жаңартылды</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">%1$s нұсқасына автоматты түрде жаңартылды.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Біздің Signal қауіпсіздік нөміріміз:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Бөлісетін бірде-бір қолданбаңыз жоқ сияқты.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Буферде салыстыратын қауіпсіздік нөмірі табылмады</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal қолданбасы QR кодты сканерлеу үшін камераны пайдалануға рұқсат болу керек, бірақ параметрлерде оны пайдалануға рұқсат берілмеген. Қолданба параметрлеріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Камера\" функциясын қосыңыз.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly қолданбасы QR кодты сканерлеу үшін камераны пайдалануға рұқсат болу керек, бірақ параметрлерде оны пайдалануға рұқсат берілмеген. Қолданба параметрлеріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Камера\" функциясын қосыңыз.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Камера рұқсатынсыз QR кодын сканерлеу мүмкін емес</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">%1$s қауіпсіздік нөмірін көру үшін алдымен хат алмасуыңыз керек.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Ашу үшін түртіңіз.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal-дың құлпы ашылды.</string>
-    <string name="KeyCachingService_lock">Signal-ды құлыптау</string>
+    <string name="KeyCachingService_passphrase_cached">Molly-дың құлпы ашылды.</string>
+    <string name="KeyCachingService_lock">Molly-ды құлыптау</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Сіз</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Қолдау көрсетілмейтін мультимедиа түрі</string>
     <string name="MediaPreviewActivity_draft">Нобай</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Сыртқы жадқа сақтау үшін Signal қолданбасына Жадты пайдалануға рұқсат керек, бірақ параметрлерде оны пайдалануға рұқсат берілмеген. Қолданба параметрлеріне кіріп, \"Рұқсаттар\" опциясын таңдаңыз да, \"Жад\" функциясын қосыңыз.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Сыртқы жадқа сақтау үшін Molly қолданбасына Жадты пайдалануға рұқсат керек, бірақ параметрлерде оны пайдалануға рұқсат берілмеген. Қолданба параметрлеріне кіріп, \"Рұқсаттар\" опциясын таңдаңыз да, \"Жад\" функциясын қосыңыз.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Рұқсаттарсыз сыртқы жадқа сақтау мүмкін болмады</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Хатты жою керек пе?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Бұл функция хатты біржола жойып тастайды.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Хатты жеткізу мүмкін болмады.</string>
     <string name="MessageNotifier_error_delivering_message">Хатты жеткізу кезінде қате шықты.</string>
     <string name="MessageNotifier_message_delivery_paused">Хатты жеткізу уақытша тоқтатылды.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Signal-да хат алмасуды жалғастыру үшін растаңыз.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Molly-да хат алмасуды жалғастыру үшін растаңыз.</string>
     <string name="MessageNotifier_mark_all_as_read">Барлығын \"оқылды\" деп белгілеу</string>
     <string name="MessageNotifier_mark_read">\"Оқылды\" деп белгілеу</string>
     <string name="MessageNotifier_turn_off_these_notifications">Осы хабарландыруларды өшіру</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Стикеріңізге %1$s деп реакция білдірді.</string>
     <string name="MessageNotifier_this_message_was_deleted">Бұл хат жойылды.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Signal-ға контакт қосылғандығы туралы хабарландыруларды өшіру керек пе? Оларды \"Signal &gt; Параметрлер &gt; Хабарландырулар\" бөлімінен қайта қосып қоюыңызға болады. </string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Molly-ға контакт қосылғандығы туралы хабарландыруларды өшіру керек пе? Оларды \"Molly &gt; Параметрлер &gt; Хабарландырулар\" бөлімінен қайта қосып қоюыңызға болады. </string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signal құлыпталып тұрғанда, жылдам жауап беру мүмкін емес!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Molly құлыпталып тұрғанда, жылдам жауап беру мүмкін емес!</string>
     <string name="QuickResponseService_problem_sending_message">Хатты жіберу кезінде мәселе туындады!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Жарамсыз таңба</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Жаңа хабарлама</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Хат алмасуға өтініш</string>
     <string name="SingleRecipientNotificationBuilder_you">Сіз</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Бұл құрылғы бұдан былай тіркелмеген. Телефон нөміріңізді Signal орнатылған басқа құрылғыда тіркегендіктен осындай болуы мүмкін.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Бұл құрылғы бұдан былай тіркелмеген. Телефон нөміріңізді Molly орнатылған басқа құрылғыда тіркегендіктен осындай болуы мүмкін.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Құрылғыны қайта тіркеу</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Қоңырауға жауап беру үшін Signal қолданбасының микрофонды пайдалануына рұқсат етіңіз.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Қоңырауға жауап беру үшін Molly қолданбасының микрофонды пайдалануына рұқсат етіңіз.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Видеоқоңырауға жауап беру үшін Signal қолданбасының микрофоныңызды және камераңызды пайдалануына рұқсат етіңіз.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Қоңырау шалу немесе қабылдау үшін Signal қолданбасына микрофон мен камераны пайдалануға рұқсат керек, бірақ параметрлерде оларды пайдалануға рұқсат берілмеген. Қолданба параметрлеріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Микрофон\" және \"Камера\" параметрлерін қосыңыз.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Видеоқоңырауға жауап беру үшін Molly қолданбасының микрофоныңызды және камераңызды пайдалануына рұқсат етіңіз.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Қоңырау шалу немесе қабылдау үшін Molly қолданбасына микрофон мен камераны пайдалануға рұқсат керек, бірақ параметрлерде оларды пайдалануға рұқсат берілмеген. Қолданба параметрлеріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Микрофон\" және \"Камера\" параметрлерін қосыңыз.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Байланыстырылған құрылғыда жауап берілді.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Байланыстырылған құрылғыда қабылданбады.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Байланыстырылған құрылғыда бос емес.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Жаңа құпия сөйлемді қайталау</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Signal қолданбасына шақыру</string>
+    <string name="contact_selection_activity__invite_to_signal">Molly қолданбасына шақыру</string>
     <string name="contact_selection_activity__new_group">Жаңа топ</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Контактілерді жаңарту</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Біреу жоқ па? Жаңартып көріңіз</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Signal-да өзіңіз танитын адамдарды табу</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Контактілеріңізді пайдалануға рұқсат етіңіз</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Толығырақ</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Контакт фотосуреті</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal қолданбасында контактілеріңіз көрсетілуі үшін Контактілерді пайдалануға рұқсат болу керек, бірақ параметрлерде оны пайдалануға рұқсат берілмеген. Қолданба параметрлері мәзіріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Контактілер\" параметрін қосыңыз.</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly қолданбасында контактілеріңіз көрсетілуі үшін Контактілерді пайдалануға рұқсат болу керек, бірақ параметрлерде оны пайдалануға рұқсат берілмеген. Қолданба параметрлері мәзіріне кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Контактілер\" параметрін қосыңыз.</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Контактілерді алу кезінде қате шықты, желі байланысын тексеріңіз</string>
     <string name="ContactSelectionListFragment_username_not_found">Пайдаланушы аты табылмады</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" Signal пайдаланушысы емес. Пайдаланушы атын тексеріп, қайталап көріңіз."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Пайдаланушы аты бойынша іздеу</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Контактілерді пайдалануға рұқсат етіңіз</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Signal-да өзіңіз танитын адамдарды табу үшін:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Пайдалануға рұқсат беру</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Жоқ, рақмет</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Контактілеріңізді пайдалануға рұқсат етіңіз. Контактілеріңіз шифрланған және Signal қызметі оларды көре алмайды.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Контактілеріңізді көрсету үшін Signal-да оларды ашуға рұқсат болу керек.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Контактілеріңізді көрсету үшін Molly-да оларды ашуға рұқсат болу керек.</string>
     <string name="contact_selection_list_fragment__show_contacts">Контактілерді көрсету</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Бұл адамды өшіріп тастағансыз, онымен қайта хат алмассаңыз, ол кісі тізіміңізге тағы қосылады.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Опциялар</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Жаңарту</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Ойнату … Кідірту</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Көпіршіктер – Signal чаттары үшін өшіріп қоюға болатын Android функциясы.</string>
+    <string name="BubbleOptOutTooltip__description">Көпіршіктер – Molly чаттары үшін өшіріп қоюға болатын Android функциясы.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Кейін</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Топ сипаттамасы</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Signal-ды жаңарту</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Molly-ды жаңарту</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Signal-дың бұл нұсқасы ескіріп кетті. Signal-ды бұрынғыдай қолдана алуыңыз үшін, оны жаңартыңыз.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Molly-дың бұл нұсқасы ескіріп кетті. Molly-ды бұрынғыдай қолдана алуыңыз үшін, оны жаңартыңыз.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Жаңарту</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Баяу</string>
     <string name="preferences__help">Анықтама</string>
     <string name="preferences__advanced">Озық</string>
-    <string name="preferences__donate_to_signal">Signal-ды демеу</string>
+    <string name="preferences__donate_to_signal">Molly-ды демеу</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Құпиялық</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Қолданба белгішесі мен атын \"%1$s\" деп өзгерту</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Қолданбаның белгішесі мен атын өзгерту үшін Signal-дың жабылуына тура келеді. Хабарландыруларда міндетті түрде әдепкі Signal белгішесі мен аты көрсетіледі.</string>
+    <string name="preferences__app_icon_dialog_description">Қолданбаның белгішесі мен атын өзгерту үшін Molly-дың жабылуына тура келеді. Хабарландыруларда міндетті түрде әдепкі Molly белгішесі мен аты көрсетіледі.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Қолданбаның белгішесі мен атын таңдаңыз, олар телефоныңыздың басты экранында және қолданбалар панелінде көрсетіледі. Хабарландыруларда міндетті түрде әдепкі Signal белгішесі мен аты көрсетіледі. Толық ақпарат</string>
+    <string name="preferences__app_icon_warning_learn_more">Қолданбаның белгішесі мен атын таңдаңыз, олар телефоныңыздың басты экранында және қолданбалар панелінде көрсетіледі. Хабарландыруларда міндетті түрде әдепкі Molly белгішесі мен аты көрсетіледі. Толық ақпарат</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Қолданба белгішелері мен аттары басты экранда және қолданба панелінде көрініп тұрады.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Хабарландыруларда міндетті түрде әдепкі Signal белгішесі мен аты көрсетіледі.</string>
+    <string name="preferences__app_icon_notification_warning">Хабарландыруларда міндетті түрде әдепкі Molly белгішесі мен аты көрсетіледі.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Толық ақпарат</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Бұл функция чаттың барлығын ең соңғы %1$s хатқа дейін біржола қысқартып тастайды.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Бұл функция құрылғыңыздағы хаттар тарихын және мультимедианы біржола жойып тастайды.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Бұл функция осы құрылғыдан және қандай да бір байланыстырылған құрылғылардан барлық хаттар тарихын және мультимедианы жояды.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Хаттар тарихын шынымен де түгелдей жойып тастағыңыз келе ме?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Хаттар тарихы түгелдей біржола өшіп қалады. Өшіріп тастасаңыз, оны қайтарып ала алмайсыз.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Хаттар тарихы барлық құрылғыдан түгелдей біржола өшіп қалады. Өшіріп тастасаңыз, оны қайтарып ала алмайсыз.</string>
     <string name="preferences_storage__delete_all_now">Барлығын қазір жою</string>
     <string name="preferences_storage__forever">Біржола</string>
     <string name="preferences_storage__one_year">1 жыл</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Цензураны айналып өту</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Цензураны айналып өту</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Егер Signal іске қосулы болса, ол цензураны айналып өтуге тырысады. Signal цензураға ұшырайтын жерде болмайынша, бұл функцияны іске қосуға болмайды.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Егер Molly іске қосулы болса, ол цензураны айналып өтуге тырысады. Molly цензураға ұшырайтын жерде болмайынша, бұл функцияны іске қосуға болмайды.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Цензураны айналып өту функциясы тіркелгіңіздің телефон нөмірінің негізінде белсендірілді.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Төлемдер туралы ақпарат</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Жаңа цифрлық валюта болып есептелетін MobileCoin жіберу және алу үшін Signal қолданбасын пайдаланыңыз. Бастау үшін белсендіріңіз.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Жаңа цифрлық валюта болып есептелетін MobileCoin жіберу және алу үшін Molly қолданбасын пайдаланыңыз. Бастау үшін белсендіріңіз.</string>
     <string name="PaymentsHomeFragment__activate_payments">Төлемдерді іске қосу</string>
     <string name="PaymentsHomeFragment__activating_payments">Төлемдер іске қосылуда…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Төлемдер шотын қалпына келтіру</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Сіз тұратын аймақта төлемдер қолжетімді емес.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Төлемдер қосылмады. Кейінірек қайталап көріңіз.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Төлемдерді өшіру керек пе?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Төлемдерді өшіріп қойсаңыз, Signal қолданбасында MobileCoin жіберу немесе қабылдау мүмкін болмай қалады.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Төлемдерді өшіріп қойсаңыз, Molly қолданбасында MobileCoin жіберу немесе қабылдау мүмкін болмай қалады.</string>
     <string name="PaymentsHomeFragment__deactivate">Өшіру</string>
     <string name="PaymentsHomeFragment__continue">Жалғастыру</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Баланс қазірше қолжетімді емес.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Details</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Signal қолданбасын пайдаланып, MobileCoin жіберуге және алуға болады. Барлық төлемдер MobileCoins және MobileCoin Wallet қолдану шарттары негізінде жүзеге асады. Біраз мәселелерге тап болуыңыз мүмкін және жоғалтқан төлемдеріңізді немесе баланстарыңызды қайтара алмай қалуыңыз мүмкін. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Molly қолданбасын пайдаланып, MobileCoin жіберуге және алуға болады. Барлық төлемдер MobileCoins және MobileCoin Wallet қолдану шарттары негізінде жүзеге асады. Біраз мәселелерге тап болуыңыз мүмкін және жоғалтқан төлемдеріңізді немесе баланстарыңызды қайтара алмай қалуыңыз мүмкін. </string>
     <string name="PaymentsHomeFragment__activate">Іске қосу</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoin шарттарын көру</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Signal қолданбасындағы төлемдер бұдан былай қолжетімді емес. Сонда да қаражатты айырбастау платформасына жіберуіңізге болады, дегенмен енді төлемдер жіберу және қабылдау немесе қаражатты қосу мүмкін емес.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Molly қолданбасындағы төлемдер бұдан былай қолжетімді емес. Сонда да қаражатты айырбастау платформасына жіберуіңізге болады, дегенмен енді төлемдер жіберу және қабылдау немесе қаражатты қосу мүмкін емес.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Рұқсаттар беру</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Сіз білетін адамдарға хат жазуға көмектесу үшін Signal осы рұқсаттарды сұрайды. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Сіз білетін адамдарға хат жазуға көмектесу үшін Molly осы рұқсаттарды сұрайды. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Хабарландырулар</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Келесі</string>
     <string name="PaymentsTransferFragment__invalid_address">Мекенжай дұрыс емес</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Койн аударайын деп жатқан әмиян мекенжайын тексеріп, қайталап көріңіз.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Өзіңіздің Signal әмияныңыздың мекенжайына аудара алмайсыз. Қолдау көрсетілетін айырбастау платформасындағы аккаунтыңыздың әмиян мекенжайын енгізіңіз.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR-кодты сканерлеу үшін Signal қолданбасына камераны пайдалануға рұқсат керек.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QR-кодты түсіру үшін Signal қолданбасына камераны пайдалануға рұқсат керек. Параметрлерге кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Камера\" параметрін қосыңыз.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR кодты сканерлеу үшін Signal қолданбасына камераны пайдалануға рұқсат керек.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Өзіңіздің Molly әмияныңыздың мекенжайына аудара алмайсыз. Қолдау көрсетілетін айырбастау платформасындағы аккаунтыңыздың әмиян мекенжайын енгізіңіз.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR-кодты сканерлеу үшін Molly қолданбасына камераны пайдалануға рұқсат керек.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QR-кодты түсіру үшін Molly қолданбасына камераны пайдалануға рұқсат керек. Параметрлерге кіріп, \"Рұқсаттар\" бөлімін таңдаңыз да, \"Камера\" параметрін қосыңыз.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR кодты сканерлеу үшін Molly қолданбасына камераны пайдалануға рұқсат керек.</string>
     <string name="PaymentsTransferFragment__settings">Параметрлер</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Кіріс Signal дауыстық қоңырауы</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Кіріс Molly дауыстық қоңырауы</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Кіріс Signal видео қоңырауы</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Кіріс Molly видео қоңырауы</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Кіріс Signal топтық қоңырауы</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Кіріс Molly топтық қоңырауы</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Ағымдағы Signal дауыстық қоңырауы</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Ағымдағы Molly дауыстық қоңырауы</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Ағымдағы Signal видео қоңырауы</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Ағымдағы Molly видео қоңырауы</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Ағымдағы Signal топтық қоңырауы</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Ағымдағы Molly топтық қоңырауы</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Жүктелуде…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Тексеру</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Резервтік құпия сөйлеміңізді дұрыс енгіздіңіз</string>
     <string name="BackupDialog_passphrase_was_not_correct">Құпия сөйлем дұрыс болмады</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signal резервтік көшірмесі жасалуда…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Molly резервтік көшірмесі жасалуда…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Signal резервтік көшірмесі верификациядан өтуде…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Molly резервтік көшірмесі верификациядан өтуде…</string>
     <string name="LocalBackupJobApi29_backup_failed">Резервтік көшірме жасалмады</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Резервтік каталог жойылды немесе басқа жаққа көшірілді.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Резервтік файл өте үлкен, сондықтан бұл көлемде сақтау мүмкін емес.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Маған қоңырау шалу (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Кодты қайта жіберу (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Signal қолдау қызметіне хабарласу</string>
-    <string name="RegistrationActivity_code_support_subject">Signal қолданбасында тіркелу - Android жүйесіне арналған тексеру коды</string>
+    <string name="RegistrationActivity_contact_signal_support">Molly қолдау қызметіне хабарласу</string>
+    <string name="RegistrationActivity_code_support_subject">Molly қолданбасында тіркелу - Android жүйесіне арналған тексеру коды</string>
     <string name="RegistrationActivity_incorrect_code">Код дұрыс емес</string>
     <string name="BackupUtil_never">Ешқашан</string>
     <string name="BackupUtil_unknown">Белгісіз</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Телефон нөмірі</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Телефон нөміріңізді кім көре алатынын және Signal-да сізге кім жаза алатынын таңдаңыз.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Телефон нөміріңізді кім көре алатынын және Molly-да сізге кім жаза алатынын таңдаңыз.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Менің нөмірімді кім көре алады?</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Сіз тым көп әрекет жасадыңыз. Кейінірек тағы бір рет байқап көріңіз.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Қызметке жалғану кезіндегі қате</string>
     <string name="preferences_chats__backups">Резервтік көшірмелер</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal құлыптаулы</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly құлыптаулы</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">ҚҰЛПЫН АШУ ҮШІН ТҮРТІҢІЗ</string>
     <string name="Recipient_unknown">Белгісіз</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Ескі құрылғыңызды пайдалана алуыңыз керек.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Резервтік көшірмеден қалпына келтіру</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Хаттарды жергілікті резервтік көшірмеден қалпына келтіріңіз. Оны қазір қалпына келтірмесеңіз, оны кейінірек қалпына келтіре алмайсыз.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Жергілікті резервтік көшірмені қалпына келтіру</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signal резервтік көшірмесін қалпына келтіру</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Балық мәтіндік хатыңызды және соңғы 30 күндегі мультимедианы қалпына келтіріңіз</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Қосымша опциялар</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Бас тарту</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Тасымалдамай кіру</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Хаттар мен мультимедианы тасымалдамай жалғастыру</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Ескі Android телефоныңызда Signal-ды ашыңыз</string>
     <string name="NewDeviceTransferInstructions__continue">Жалғастыру</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Ескі Android құрылғысына қосылуға дайындалуда…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Күте тұрыңыз, дайын болып қалды</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Ескі Android құрылғысының қосылғаны күтілуде…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Ескі Android құрылғыңызды анықтап, оған қосылу үшін Signal қолданбасына геолокация рұқсаты керек.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Ескі Android құрылғыңызды анықтап, оған қосылу үшін Signal локация қызметтерін пайдалана алуы керек.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Ескі Android құрылғыңызды анықтау және оған қосылу үшін Signal қолданбасына Wi-Fi керек. Wi-Fi қосылып тұруы керек, бірақ Wi-Fi желісінен ажыратылып тұруы тиіс.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Кешіріңіз, бұл құрылғыда Wi-Fi Direct істемейді екен. Signal қолданбасы Wi-Fi Direct-ті пайдаланып, ескі Android құрылғыңызды анықтайды және оған қосылады. Ескі Android құрылғыңыздан аккаунтыңызды қалпына келтіру үшін резервтік көшірмені қалпына келтіруіңізге болады.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Ескі Android құрылғыңызды анықтап, оған қосылу үшін Molly қолданбасына геолокация рұқсаты керек.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Ескі Android құрылғыңызды анықтап, оған қосылу үшін Molly локация қызметтерін пайдалана алуы керек.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Ескі Android құрылғыңызды анықтау және оған қосылу үшін Molly қолданбасына Wi-Fi керек. Wi-Fi қосылып тұруы керек, бірақ Wi-Fi желісінен ажыратылып тұруы тиіс.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Кешіріңіз, бұл құрылғыда Wi-Fi Direct істемейді екен. Molly қолданбасы Wi-Fi Direct-ті пайдаланып, ескі Android құрылғыңызды анықтайды және оған қосылады. Ескі Android құрылғыңыздан аккаунтыңызды қалпына келтіру үшін резервтік көшірмені қалпына келтіруіңізге болады.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Резервтік көшірмені қалпына келтіру</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Ескі Android құрылғыңызға қосылып жатқанда, күтпеген қате пайда болды.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Жаңа Android құрылғысы ізделуде…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Жаңа Android құрылғыңызды анықтау және оған қосылу үшін Signal қолданбасына геолокацияны пайдалануға рұқсат керек.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Жаңа Android құрылғыңызды анықтау және оған қосылу үшін Signal қолданбасына геолокация қызметтері қосылып тұруы керек.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Жаңа Android құрылғыңызды анықтау және оған қосылу үшін Signal қолданбасына Wi-Fi керек. Wi-Fi керек болғанымен, құрылғы Wi-Fi желісіне жалғанып тұрмауы тиіс.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Кешіріңіз, бұл құрылғыда Wi-Fi Direct жұмыс істемейді екен. Signal қолданбасы Wi-Fi Direct пайдаланып, сіздің жаңа Android құрылғыңызды анықтайды және оған қосылады. Жаңа Android құрылғыңыздағы аккаунтыңызды қалпына келтіру үшін резервтік көшірме жасауыңызға болады.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Жаңа Android құрылғыңызды анықтау және оған қосылу үшін Molly қолданбасына геолокацияны пайдалануға рұқсат керек.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Жаңа Android құрылғыңызды анықтау және оған қосылу үшін Molly қолданбасына геолокация қызметтері қосылып тұруы керек.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Жаңа Android құрылғыңызды анықтау және оған қосылу үшін Molly қолданбасына Wi-Fi керек. Wi-Fi керек болғанымен, құрылғы Wi-Fi желісіне жалғанып тұрмауы тиіс.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Кешіріңіз, бұл құрылғыда Wi-Fi Direct жұмыс істемейді екен. Molly қолданбасы Wi-Fi Direct пайдаланып, сіздің жаңа Android құрылғыңызды анықтайды және оған қосылады. Жаңа Android құрылғыңыздағы аккаунтыңызды қалпына келтіру үшін резервтік көшірме жасауыңызға болады.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Резервтік көшірмені жасау</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Жаңа Android құрылғыңызға қосылу кезінде күтпеген қате шықты.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Деректер тасымалдануда</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Екі құрылғыны бір-біріне жақын ұстаңыз. Құрылғыларды өшірмеңіз және Signal ашық тұруы керек. Тасымалданатын файлдар өтпелі шифрлаумен қорғалған.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Екі құрылғыны бір-біріне жақын ұстаңыз. Құрылғыларды өшірмеңіз және Molly ашық тұруы керек. Тасымалданатын файлдар өтпелі шифрлаумен қорғалған.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d хат тасымалданды…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">Хаттардың ішінен %1$s%% хат тасымалданды…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Тіркелгіні көшіру</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Жаңа Android құрылғыңызға Signal-ды жүктеп алу</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Жаңа Android құрылғыңызға Molly-ды жүктеп алу</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"\"Аккаунтты тасымалдау немесе қалпына келтіру\" түймесін басыңыз"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Осы сілтеме арқылы кез келген адам топтың атауы мен фотосуретін көре алады және топқа қосылуға өтініш бере алады. Оны сенімді адамдармен ғана бөлісіңіз.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Осы сілтеме арқылы кез келген адам топтың атауы мен фотосуретін көре алады және топқа қосыла алады. Оны сенімді адамдармен ғана бөлісіңіз.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Signal арқылы бөлісу</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Molly арқылы бөлісу</string>
     <string name="GroupLinkBottomSheet_copy">Көшірме жасау</string>
     <string name="GroupLinkBottomSheet_qr_code">QR коды</string>
     <string name="GroupLinkBottomSheet_share">Бөлісу</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">MobileCoin туралы ақпарат</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin – анонимді транзакцияға негізделген жаңа цифрлық валюта.</string>
     <string name="payment_info_card_adding_funds">Қаражат қосу</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">MobileCoin-ды әмияныңыздың мекенжайына жіберіп, Signal-да қолдануға болатын қаражатты қосуыңызға болады.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">MobileCoin-ды әмияныңыздың мекенжайына жіберіп, Molly-да қолдануға болатын қаражатты қосуыңызға болады.</string>
     <string name="payment_info_card_cashing_out">Ақшаны шығарып алу</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">MobileCoin-ға қолдау көрсететін айырбастау платформасында кез келген уақытта MobileCoin-ды ақшамен шығарып алуыңызға болады. Сол айырбастау платформасында аккаунтыңызға аударма жасасаңыз болғаны.</string>
     <string name="payment_info_card_hide_this_card">Бұл картаны жасыру керек пе?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Әмиянды өшіру</string>
     <string name="DeactivateWalletFragment__your_balance">Балансыңыз</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Төлемдерді өшірмес бұрын, қаражатты басқа әмиян мекенжайына аударып алғаныңыз жөн. Егер қаражатты қазір аудармасаңыз, төлемдерді қайта іске қосқан жағдайда, олар Signal-ға байланыстырылған әмиянда қала береді.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Төлемдерді өшірмес бұрын, қаражатты басқа әмиян мекенжайына аударып алғаныңыз жөн. Егер қаражатты қазір аудармасаңыз, төлемдерді қайта іске қосқан жағдайда, олар Molly-ға байланыстырылған әмиянда қала береді.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Қалған балансты аудару</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Аудармастан өшіру</string>
     <string name="DeactivateWalletFragment__deactivate">Өшіру</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Аудармастан өшіру керек пе?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Төлемдерді қайта іске қосқыңыз келсе, балансыңыз Signal-ға байланыстырылған әмиянда қала береді.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Төлемдерді қайта іске қосқыңыз келсе, балансыңыз Molly-ға байланыстырылған әмиянда қала береді.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Әмиянды өшіру кезінде қате шықты.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Лицензиялар</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Шарттар және Құпиялық саясаты</string>
-    <string name="HelpFragment__copyright_signal_messenger">Авторлық құқығы қорғалған Signal мессенджері</string>
+    <string name="HelpFragment__copyright_signal_messenger">Авторлық құқығы қорғалған Molly мессенджері</string>
     <string name="HelpFragment__licenced_under_the_agplv3">GNU AGPLv3 лицензиясымен жұмыс істейді</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4773,7 +4911,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">Авто</string>
+    <string name="ChatColorSelectionFragment__auto">Автом.</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Реттелмелі түстерді қолдану</string>
     <string name="ChatColorSelectionFragment__chat_color">Чат түсі</string>
     <string name="ChatColorSelectionFragment__edit">Өңдеу</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Түсті таңдау</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Бөлісу</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Бұл топқа әкімшілер ғана хат жаза алады.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Шекке жетті</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Сіз 5-тен көбірек чатты таңдай алмайсыз</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Толық ақпарат</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Signal-ды жаңарту</string>
+    <string name="UpdateSignalExpiredDialog__title">Molly-ды жаңарту</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Signal-дың бұл нұсқасы ескіріп кетті. Signal-ды бұрынғыдай қолдана алуыңыз үшін, оны жаңартыңыз.</string>
+    <string name="UpdateSignalExpiredDialog__message">Molly-дың бұл нұсқасы ескіріп кетті. Molly-ды бұрынғыдай қолдана алуыңыз үшін, оны жаңартыңыз.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Жаңарту</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Құрылғы тіркелмеген</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Бұл құрылғы бұдан былай тіркелмеген. Бұл құрылғыда Signal қолданбасын бұрынғыдай қолдану үшін, оны қайта тіркеңіз.</string>
+    <string name="ReregisterSignalDialog__message">Бұл құрылғы бұдан былай тіркелмеген. Бұл құрылғыда Molly қолданбасын бұрынғыдай қолдану үшін, оны қайта тіркеңіз.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Қайтадан тіркелу</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Таңдағышты ашу мүмкін болмады.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Хабарландыруларды қосу үшін Signal-дың оларды көрсететін рұқсаты болуы керек.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Хабарландыруларды қосу үшін Molly-дың оларды көрсететін рұқсаты болуы керек.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Іске қосу</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Ешкім жауап жазбаған</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Бұл сториске жауап бере алмайсыз, себебі сіз ендігәрі бұл топтың мүшесі емессіз.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Осы сториске реакция қалдырды</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Сториске реакция қалдырдыңыз</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Сториске реакция қалдырды</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Көру саны</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Банкіңізді таңдаңыз</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">%1$s арқылы жасаған демеушілігіңізді растаңыз</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Мерзімді түрде демеушілік жасағыңыз келсе, банктегі шотыңыздан алынған 0,01 еуроны растаңыз. Бұл сома автоматты түрде қайтарылады және шотыңыздан ай сайын 5 еуро алуға мүмкіндік береді.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Мерзімді түрде демеушілік жасағыңыз келсе, банктегі шотыңыздан алынған 0,01 еуроны растаңыз. Бұл сома автоматты түрде қайтарылады және шотыңыздан ай сайын %1$s алуға мүмкіндік береді.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Жалғастыру</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Резервтік дерек жүктеп алынуда…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Мультимедианың резервтік көшірмелері өшірулі</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Signal мультимедиасының резервтік көшірме жоспарынан бас тартылды, себебі төлеміңізді қабылдай алмадық. %1$d күннің ішінде резервтік көшірмеде сақталған қандай да бір мультимедианы жүктеп алыңыз. %1$d күннен кейін резервтік көшірмеңіздегі мультимедиа жойылады.</item>
+        <item quantity="other">Signal мультимедиасының резервтік көшірме жоспарынан бас тартылды, себебі төлеміңізді қабылдай алмадық. %1$d күннің ішінде резервтік көшірмеде сақталған қандай да бір мультимедианы жүктеп алыңыз. %1$d күннен кейін резервтік көшірмеңіздегі мультимедиа жойылады.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Барлық мультимедианың резервтік көшірмесін қайта жасай бастау үшін кез келген уақытта резервтік көшірмелер үшін төлей бастауыңызға болады. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Мультмедиаңыз бүгін жойылады</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Signal мультимедиасының резервтік көшірмесі жоспарынан бас тартылды, себебі төлеміңізді қабылдай алмадық. Резервтік көшірмеңіздегі мультимедианы жүктеп алудың соңғы мүмкіндігі, одан кейін ол жойылады.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Жүктеп алу мүмкін емес</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Құрылғыңыздағы бос орын жеткіліксіз. Резервтік көшірмеңізде сақталған мультимедианы жүктеп алу үшін %1$s орын босатыңыз.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">«Өткізіп жіберу» опциясын таңдасаңыз, резервтік көшірмедегі мультимедиа %1$d күннен кейін жойылады.</item>
+        <item quantity="other">«Өткізіп жіберу» опциясын таңдасаңыз, резервтік көшірмедегі мультимедиа %1$d күннен кейін жойылады.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Резервтік төлемді өңдеу мүмкін емес</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Ай сайын алынатын резервтік көшірме төлеміңізді алу кезінде қиындыққа тап болдық. Төлеу әдісіңіздің жаңартылғанына көз жеткізіңіз. Ол жаңартылмаған болса, Google Pay қызметіне кіріп, жаңартыңыз. Signal төлеміңізді бірнеше күннен кейін қайта өңдеп көреді.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Резервтік көшірмелеуді аяқтау мүмкін болмады</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Құрылғыңыз %1$d күн бойы резервтік көшірме жасамады. Құрылғыңызды Wi-Fi желісіне қосып, «Резервтік көшірмені қазір жасау» түймесін түртіңіз. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Толық ақпарат</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Өткізіп жіберу</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Мультмедианы қазір жүктеп алыңыз</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Кейінірек жүктеп алу</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Мультимедианы жүктеп алмау</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Мультимедианы жүктеп алу үшін %1$s орын босатыңыз.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Несиелік немесе дебеттік карта</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Белгісіз</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Төлемдер тарихы</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Соңғы резервтік көшірме %1$s күні сағат%2$s жасалды.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Таңдалған уақыттан ескі хаттар біржола жойылады.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Таңдалған ұзындықтан асып кеткен хаттар біржола жойылады.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Байланыстырылған құрылғыларға лимиттер қолдану</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Іске қосылып тұрғанда, чат лимиттері де байланыстырылған құрылғылардан хаттарды жояды.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Жою процедурасы барлық құрылғыңызда синхрондалады.</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Хаттарды немесе чаттарды жою кезінде, олар сіздің телефоныңыздан және байланыстырылған құрылғыларыңыздан жойылады.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Төлемдер тарихы</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Мәтіннің және бүкіл мультимедианың резервтік көшірмесі</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Төлем туралы мәлімет</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Резервтік көшірме түрі</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Төленген күні</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Бөлісу</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal-дың сақтық көшірмелері</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Төлемдер тарихы</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Резервтік көшірме туралы мәліметтер</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Резервтік көшірме өлшемі</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Резервтік көшірме жиілігі</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Резервтік көшірмесін ұялы байланыс арқылы жасау</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Резервтік көшірмелерді өшіру және жою</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Резервтік көшірме жойылды және өшірілді.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Резервтік көшірме түрі өзгерді де, жазылымнан бас тартылды</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Жазылымнан бас тартылды</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Жүктеп алынды</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Резервтік көшірме түрі</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Резервтік көшірме өшірілді</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/ай</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Резервтік көшірмелерді қосу</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Соңғы резервтік көшірме</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s / %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Ешқашан</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Қазір сақтық көшірме жасау</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Резервтік көшірмелерді өшіру және жою керек пе?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Сізден екінші рет ақы алынбайды. Резервтік көшірмеңіз жойылады және резервтік көшірме жасалмайды.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Өшіру және жою</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Резервтік көшірме жойылып жатыр…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Резервтік көшірме жойылды</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"«Резервтік көшірмесін қазір жасау» түймесін түртіңіз"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Күнделікті</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Апта сайын</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Ай сайын</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Резервтік көшірмесін қолмен жасау</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Құрылғыңыздың PIN кодын, құпиясөзін немесе өрнегін енгізіңіз.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Келесі</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Резервтік көшірме түрін өзгерту</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Жазылымнан бас тарту</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Бас тартуды растау</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Сізден енді ақша алынбайды. Төлем мерзімінің соңында резервтік көшірмелеріңіз өшіп қалады. Сол күннен кейін 30 күннің ішінде резервтік көшірмесін қазір жасап жатқан мультимедианы жүктеп алуыңыз керек.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Растау және қазір жүктеп алу</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Растау және кейінірек жүктеп алу</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Жазылымды қалдыру</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-km/strings.xml b/app/src/main/res/values-km/strings.xml
index e34c3ed032..7d97c8b04a 100644
--- a/app/src/main/res/values-km/strings.xml
+++ b/app/src/main/res/values-km/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal កំពុងធ្វើបច្ចុប្បន្នភាព…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly កំពុងធ្វើបច្ចុប្បន្នភាព…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">អ្នកមិនទាន់បានកំណត់ឃ្លាសម្ងាត់ទេ!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">បិទឃ្លាសម្ងាត់?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">វានឹងដោះសោ Signal និងសារជូនដំណឹងជាអចិន្ត្រៃយ៍។</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">វានឹងដោះសោ Molly និងសារជូនដំណឹងជាអចិន្ត្រៃយ៍។</string>
     <string name="ApplicationPreferencesActivity_disable">បិទចោល</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">បញ្ហាភ្ជាប់ទៅម៉ាស៊ីនមេ!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN ត្រូវបានទាមទារសម្រាប់ការចុះឈ្មោះចាក់សោ។ ដើម្បីបិទកូដ PIN សូមបិទការចុះឈ្មោះចាក់សោ។</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">ឯកសារ</string>
     <string name="AttachmentKeyboard_contact">ទំនាក់ទំនង</string>
     <string name="AttachmentKeyboard_location">ទីតាំង</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal ត្រូវការការអនុញ្ញាតដើម្បីបង្ហាញរូបថត និងវីដេអូរបស់អ្នក</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly ត្រូវការការអនុញ្ញាតដើម្បីបង្ហាញរូបថត និងវីដេអូរបស់អ្នក</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">អនុញ្ញាតចូលប្រើប្រាស់</string>
     <string name="AttachmentKeyboard_payment">ការទូទាត់</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">មិនអាចស្វែងរកកម្មវិធីដើម្បីជ្រើសរើសព័ត៌មាន</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal ទាមទារសិទ្ធិប្រើប្រាស់អង្គរក្សាទុកដើម្បីភ្ជាប់រូបថត វីដេអូ ឬសំឡេង ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅការកំណត់របស់ប្រព័ន្ធ ជ្រើសរើស \"អនុញ្ញាត\" និងបើក \"អង្គរក្សាទុក\" ។</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal ទាមទារសិទ្ធិប្រើប្រាស់បញ្ជីទំនាក់ទំនងដើម្បីភ្ជាប់ព័ត៌មានបញ្ជីទំនាក់ទំនង ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅការកំណត់របស់ប្រព័ន្ធ ជ្រើសរើស \"អនុញ្ញាត\" និងបើក \"បញ្ជីទំនាក់ទំនង\" ។</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signalត្រូវការសិទ្ធិប្រើប្រាស់ទីតាំងដើម្បីភ្ជាប់ទីតាំង ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅការកំណត់ជ្រើសរើស \"អនុញ្ញាត\" និងបើក \"ទីតាំង\" ។</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly ទាមទារសិទ្ធិប្រើប្រាស់អង្គរក្សាទុកដើម្បីភ្ជាប់រូបថត វីដេអូ ឬសំឡេង ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅការកំណត់របស់ប្រព័ន្ធ ជ្រើសរើស \"អនុញ្ញាត\" និងបើក \"អង្គរក្សាទុក\" ។</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly ទាមទារសិទ្ធិប្រើប្រាស់បញ្ជីទំនាក់ទំនងដើម្បីភ្ជាប់ព័ត៌មានបញ្ជីទំនាក់ទំនង ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅការកំណត់របស់ប្រព័ន្ធ ជ្រើសរើស \"អនុញ្ញាត\" និងបើក \"បញ្ជីទំនាក់ទំនង\" ។</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Mollyត្រូវការសិទ្ធិប្រើប្រាស់ទីតាំងដើម្បីភ្ជាប់ទីតាំង ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅការកំណត់ជ្រើសរើស \"អនុញ្ញាត\" និងបើក \"ទីតាំង\" ។</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">អនុញ្ញាតឱ្យចូលប្រើទីតាំងរបស់អ្នក</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">ដើម្បីផ្ញើទីតាំងរបស់អ្នក៖</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">អនុញ្ញាតឱ្យ Signal ចូលផ្ញើទីតាំងរបស់អ្នក។</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">អនុញ្ញាតឱ្យ Molly ចូលផ្ញើទីតាំងរបស់អ្នក។</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal ត្រូវការសិទ្ធិចូលប្រើទីតាំងដើម្បីផ្ញើទីតាំងរបស់អ្នក។</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly ត្រូវការសិទ្ធិចូលប្រើទីតាំងដើម្បីផ្ញើទីតាំងរបស់អ្នក។</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">អនុញ្ញាតឱ្យចូលប្រើកន្លែងផ្ទុក</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">ដើម្បីបង្ហាញរូបថត និងវីដេអូ៖</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal ត្រូវការចូលប្រើកន្លែងផ្ទុកដើម្បីបង្ហាញរូបថត និងវីដេអូរបស់អ្នក។</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly ត្រូវការចូលប្រើកន្លែងផ្ទុកដើម្បីបង្ហាញរូបថត និងវីដេអូរបស់អ្នក។</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s មិនទាន់បានបើកដំណើរការការបង់ប្រាក់ </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">ប្តូរកាមេរ៉ា</string>
     <string name="CameraXFragment_open_gallery_description">បើកវិចិត្រសាល</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">អនុញ្ញាតចូលប្រើប្រាស់</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">អនុញ្ញាតឱ្យចូលប្រើកាមេរ៉ា និងមីក្រូហ្វូនរបស់អ្នក</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">អនុញ្ញាតឱ្យចូលប្រើកាមេរ៉ារបស់អ្នក</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">អនុញ្ញាតឱ្យចូលប្រើមីក្រូហ្វូនរបស់អ្នក</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">ដើម្បីថតរូប សូមអនុញ្ញាតឱ្យ Signal ចូលប្រើកាមេរ៉ា។</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">ដើម្បីថតរូបភាព និងវីដេអូ, សូមអនុញ្ញាត Signal ចូលប្រើប្រាស់កាមេរ៉ា។</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">ដើម្បីថតរូប និងវីដេអូ សូមអនុញ្ញាតឱ្យ Signal ចូលប្រើកាមេរ៉ា និងមីក្រូហ្វូន។</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">ដើម្បីថតវីដេអូមានសំឡេង សូមអនុញ្ញាតឱ្យ Signal ចូលប្រើមីក្រូហ្វូនរបស់អ្នក។</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">ដើម្បីស្គែនកូដ QR សូមអនុញ្ញាតឱ្យ Signal ចូលប្រើកាមេរ៉ា។</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal ត្រូវការសិទ្ធិចូលប្រើកាមេរ៉ាដើម្បីថតរូប</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal ត្រូវការសិទ្ធិចូលប្រើកាមេរ៉ាដើម្បីស្គែនកូដ QR</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal ត្រូវការសិទ្ធិចូលប្រើមីក្រូហ្វូនដើម្បីថតវីដេអូ</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">ដើម្បីថតរូបក្នុង Signal៖</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">ដើម្បីថតរូប និងវីដេអូក្នុង Signal៖</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">ដើម្បីថតវីដេអូមានសំឡេង៖</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">ដើម្បីស្គែនកូដ QR៖</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">បញ្ជីទំនាក់ទំនងថ្មីៗ</string>
@@ -270,7 +271,7 @@
     <string name="CameraContacts_no_signal_contacts">គ្មានបញ្ជីទំនាក់ទំនង Signal</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">អ្នកអាចប្រើប៊ូតុងកាមេរ៉ា ដើម្បីផ្ញើរូបភាពទៅបញ្ជីទំនាក់ទំនង Signal តែប៉ុណ្ណោះ។ </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">មិនអាចស្វែងរកមនុស្សដែលអ្នកកំពុងរក?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">អញ្ជើញអ្នកទំនាក់ទំនងមកចូលរួម Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">អញ្ជើញអ្នកទំនាក់ទំនងមកចូលរួម Molly</string>
     <string name="CameraContacts__menu_search">ស្វែងរក</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -284,12 +285,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">ទេ អរគុណ</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">ដំឡើង Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">ដំឡើង Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">កំណែកម្មវិធីនេះមិនត្រូវបានគាំទ្រទៀតទេ។ ដើម្បីបន្តការផ្ញើនិងទទួលសារធ្វើបច្ចុប្បន្នភាពទៅកំណែចុងក្រោយ។</string>
     <string name="ClientDeprecatedActivity_update">បច្ចុប្បន្នភាព</string>
     <string name="ClientDeprecatedActivity_dont_update">កុំធ្វើបច្ចុប្បន្នភាព</string>
     <string name="ClientDeprecatedActivity_warning">ព្រមាន</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">កំណែ Signal របស់អ្នកបានផុតកំណត់ហើយ។ អ្នកអាចមើលប្រវត្តិសាររបស់អ្នកបាន ប៉ុន្តែអ្នកនឹងមិនអាចផ្ញើ ឬទទួលសារបានទេ រហូតទាល់តែអ្នកដំឡើងកំណែសិន។</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">កំណែ Molly របស់អ្នកបានផុតកំណត់ហើយ។ អ្នកអាចមើលប្រវត្តិសាររបស់អ្នកបាន ប៉ុន្តែអ្នកនឹងមិនអាចផ្ញើ ឬទទួលសារបានទេ រហូតទាល់តែអ្នកដំឡើងកំណែសិន។</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">ទំព័រវែបសាយរកមិនឃើញ.</string>
@@ -326,8 +327,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">សារ %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">ការហៅជាសំឡេងតាម Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">ការហៅជាវីដេអូតាម Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -419,7 +420,7 @@
     <string name="ConversationActivity_transport_signal">សារ Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">ផ្ញើសារ</string>
-    <string name="ConversationActivity_lets_switch_to_signal">តោះដូរទៅកាន់ Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">តោះដូរទៅកាន់ Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">សូមជ្រើសរើសលេខទំនាក់ទំនង១</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">ឯកសារភ្ជាប់លើសទំហំកំណត់ សម្រាប់ប្រភេទសារដែលអ្នកកំពុងផ្ញើ។</string>
     <string name="ConversationActivity_unable_to_record_audio">មិនអាចថតសំឡេងបាន!</string>
@@ -438,18 +439,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">ដើម្បីផ្ញើសារសំឡេង៖</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">ដើម្បីផ្ញើសារជាសំឡេង សូមអនុញ្ញាតឱ្យ Signal ចូលប្រើមីក្រូហ្វូនរបស់អ្នក។</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">ដើម្បីផ្ញើសារជាសំឡេង សូមអនុញ្ញាតឱ្យ Molly ចូលប្រើមីក្រូហ្វូនរបស់អ្នក។</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal ត្រូវការសិទ្ធិចូលប្រើមីក្រូហ្វូនដើម្បីថតសារជាសំឡេង។</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal សុំសិទ្ធិប្រើប្រាស់ម៉ៃក្រូហ្វូន ដើម្បីផ្ញើសារជាសំឡេង, ប៉ុន្តែ វាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅកាន់ ការកំណត់កម្មវិធី, ជ្រើសរើស \"ការអនុញ្ញាត\", និងបើក \"ប្រដាប់ស្រូបសំឡេង\"។</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly ត្រូវការសិទ្ធិចូលប្រើមីក្រូហ្វូនដើម្បីថតសារជាសំឡេង។</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly សុំសិទ្ធិប្រើប្រាស់ម៉ៃក្រូហ្វូន ដើម្បីផ្ញើសារជាសំឡេង, ប៉ុន្តែ វាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅកាន់ ការកំណត់កម្មវិធី, ជ្រើសរើស \"ការអនុញ្ញាត\", និងបើក \"ប្រដាប់ស្រូបសំឡេង\"។</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signalត្រូវការសិទ្ធិប្រើប្រាស់ម៉ៃក្រូហ្វូន និងកាមេរ៉ាដើម្បីហៅទៅកាន់ %1$s, ប៉ុន្តែពួកវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅការកំណត់ជ្រើសរើស \"អនុញ្ញាត\" ហើយបើក \"ម៉ៃក្រូហ្វូន\" និង \"កាមេរ៉ា\"។</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">ដើម្បីថតរូបភាព និងវីដេអូ, សូមអនុញ្ញាត Signal ចូលប្រើប្រាស់កាមេរ៉ា។</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signalត្រូវការសិទ្ធិប្រើប្រាស់កាមេរ៉ាដើម្បីថតរូប ឬវីដេអូ ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅការកំណត់ជ្រើសរើស \"អនុញ្ញាត\" ហើយបើក \"កាមេរ៉ា\"។</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal​ សុំសិទ្ធិប្រើប្រាស់កាមេរ៉ា ដើម្បីថតរូបភាព ឬវីដេអូ</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Mollyត្រូវការសិទ្ធិប្រើប្រាស់ម៉ៃក្រូហ្វូន និងកាមេរ៉ាដើម្បីហៅទៅកាន់ %1$s, ប៉ុន្តែពួកវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅការកំណត់ជ្រើសរើស \"អនុញ្ញាត\" ហើយបើក \"ម៉ៃក្រូហ្វូន\" និង \"កាមេរ៉ា\"។</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">ដើម្បីថតរូបភាព និងវីដេអូ, សូមអនុញ្ញាត Molly ចូលប្រើប្រាស់កាមេរ៉ា។</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Mollyត្រូវការសិទ្ធិប្រើប្រាស់កាមេរ៉ាដើម្បីថតរូប ឬវីដេអូ ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅការកំណត់ជ្រើសរើស \"អនុញ្ញាត\" ហើយបើក \"កាមេរ៉ា\"។</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly​ សុំសិទ្ធិប្រើប្រាស់កាមេរ៉ា ដើម្បីថតរូបភាព ឬវីដេអូ</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">បើកការអនុញ្ញាតមីក្រូហ្វូន ដើម្បីចាប់យកវីដេអូជាមួយសំឡេង។</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal ត្រូវការការអនុញ្ញាតមីក្រូហ្វូន ដើម្បីថតវីដេអូ តែវាត្រូវបានបដិសេធ។ សូមបន្តក្នុងការកំណត់កម្មវិធី ជ្រើសរើស \"ការអនុញ្ញាត\" និងបើក \"មីក្រូហ្វូន\" និង \"កាមេរ៉ា\"។</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal ត្រូវការការអនុញ្ញាត ដើម្បីថតវីដេអូ។</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly ត្រូវការការអនុញ្ញាតមីក្រូហ្វូន ដើម្បីថតវីដេអូ តែវាត្រូវបានបដិសេធ។ សូមបន្តក្នុងការកំណត់កម្មវិធី ជ្រើសរើស \"ការអនុញ្ញាត\" និងបើក \"មីក្រូហ្វូន\" និង \"កាមេរ៉ា\"។</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly ត្រូវការការអនុញ្ញាត ដើម្បីថតវីដេអូ។</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">ទេ</string>
@@ -470,9 +471,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">ដើម្បីចាប់ផ្តើមការហៅទូរសព្ទ៖</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">ដើម្បីចាប់ផ្តើមការហៅទូរសព្ទ សូមអនុញ្ញាតឱ្យ Signal ចូលប្រើមីក្រូហ្វូនរបស់អ្នក។</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">ដើម្បីចាប់ផ្តើមការហៅទូរសព្ទ សូមអនុញ្ញាតឱ្យ Molly ចូលប្រើមីក្រូហ្វូនរបស់អ្នក។</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal ត្រូវការសិទ្ធិចូលប្រើមីក្រូហ្វូនដើម្បីចាប់ផ្តើមការហៅទូរសព្ទ។</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly ត្រូវការសិទ្ធិចូលប្រើមីក្រូហ្វូនដើម្បីចាប់ផ្តើមការហៅទូរសព្ទ។</string>
 
 
     <string name="ConversationActivity_join">ចូលរួម</string>
@@ -486,9 +487,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">មិនអាចផ្ញើសារជាអក្សរបាននៅក្នុង Signal ទៀតទេ។ បបួល %1$s ឲ្យប្រើ Signal ដើម្បីរក្សាការសន្ទនានៅទីនេះ។</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">បុគ្គលនេះលែងប្រើ Signal ហើយ។ អញ្ជើញគាត់ឱ្យប្រើ Signal ដើម្បីរក្សាការសន្ទនានៅទីនេះ។</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">បុគ្គលនេះលែងប្រើ Molly ហើយ។ អញ្ជើញគាត់ឱ្យប្រើ Molly ដើម្បីរក្សាការសន្ទនានៅទីនេះ។</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">អញ្ជើញចូលប្រើSignal</string>
+    <string name="ConversationActivity__invite_to_signal">អញ្ជើញចូលប្រើMolly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">អ្នកនឹងត្រូវបានរំលឹកម្តងទៀតក្នុងពេលឆាប់ៗនេះ។</string>
 
@@ -536,6 +537,8 @@
     <string name="ConversationFragment_delete_for_everyone">លុបសម្រាប់អ្នករាល់គ្នា</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">លុបនៅលើឧបករណ៍នេះ</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">លុប</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">លុបគ្រប់ទីកន្លែង</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">សារនេះនឹងត្រូវលុបចោលសម្រាប់អ្នករាល់គ្នានៅក្នុងការជជែកនេះ បើពួកគេប្រើកំណែថ្មីៗនេះរបស់ Signal។ ពួកគេនឹងអាចមើលឃើញថា អ្នកបានលុបសារមួយ។</string>
@@ -567,13 +570,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">បានទប់ស្កាត់</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">ដំឡើង Signal</string>
+    <string name="ConversationFragment__update_build">ដំឡើង Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">ចុះឈ្មោះ Signal ឡើងវិញ</string>
+    <string name="ConversationFragment__reregister_signal">ចុះឈ្មោះ Molly ឡើងវិញ</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">ត្រឡប់ទៅក្រោយ។</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">បើក Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">បើក Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">លែងបានផ្ទៀងផ្ទាត់ទៀតហើយ</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -636,6 +639,10 @@
     <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
         <item quantity="other">វានឹងលុបការជជែកដែលបានជ្រើសរើសទាំងអស់ %1$d ជាអចិន្ត្រៃយ៍។</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="other">ការធ្វើបែបនេះនឹងលុបការជជែក %1$d ដែលបានជ្រើសរើសទាំងអស់ពីឧបករណ៍របស់អ្នកទាំងអស់ជារៀងរហូត។</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">កំពុងលុប</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="other">កំពុងលុបការជជែកដែលបានជ្រើសរើស…</item>
@@ -719,9 +726,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">តើនរណាខ្លះអាចរកខ្ញុំតាមលេខទូរសព្ទបាន?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">នរណាក៏ដោយដែលមានលេខទូរសព្ទរបស់អ្នកនឹងមើលឃើញអ្នកនៅលើ Signal ហើយអាចចាប់ផ្តើមជជែកជាមួយអ្នកបាន។</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">នរណាក៏ដោយដែលមានលេខទូរសព្ទរបស់អ្នកនឹងមើលឃើញអ្នកនៅលើ Molly ហើយអាចចាប់ផ្តើមជជែកជាមួយអ្នកបាន។</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">គ្មាននរណាម្នាក់អាចមើលឃើញអ្នកនៅលើ Signal ទេ លើកលែងតែអ្នកផ្ញើសារទៅពួកគេ ឬមានការជជែកដែលមានស្រាប់ជាមួយពួកគេ។</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">គ្មាននរណាម្នាក់អាចមើលឃើញអ្នកនៅលើ Molly ទេ លើកលែងតែអ្នកផ្ញើសារទៅពួកគេ ឬមានការជជែកដែលមានស្រាប់ជាមួយពួកគេ។</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">ស្តារចេញពីការបម្រុងទុក?</string>
@@ -755,7 +762,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">សាកល្បងឃ្លាសម្ងាត់បម្រុងទុករបស់អ្នក និងផ្ទៀងផ្ទាត់ថាវាត្រូវគ្នា</string>
     <string name="BackupsPreferenceFragment__turn_on">បើក</string>
     <string name="BackupsPreferenceFragment__turn_off">បិទ</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"ដើម្បីស្តារការបម្រុងទុក ដំឡើងកម្មវិធី Signal ថ្មី។ បើកកម្មវិធី និងចុច \"ស្តារការបម្រុងទុក\" បន្ទាប់មកជ្រើសរើសទីតាំងឯកសារបម្រុងទុក។ %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"ដើម្បីស្តារការបម្រុងទុក ដំឡើងកម្មវិធី Molly ថ្មី។ បើកកម្មវិធី និងចុច \"ស្តារការបម្រុងទុក\" បន្ទាប់មកជ្រើសរើសទីតាំងឯកសារបម្រុងទុក។ %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">សិក្សាបន្ថែម</string>
     <string name="BackupsPreferenceFragment__in_progress">កំពុងដំណើរការ…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -763,7 +770,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d ឥឡូវនេះ …</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% ឥឡូវនេះ​…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal ត្រូវការសិទ្ធិប្រើប្រាស់អង្គរក្សាទុកខាងក្រៅដើម្បីបង្កើតការស្តារឡើងវិញ ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅកាន់ ការកំណត់ ការជ្រើសរើស \"ការអនុញ្ញាត\" និងបើក \"អង្គរក្សាទុក\"។</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly ត្រូវការសិទ្ធិប្រើប្រាស់អង្គរក្សាទុកខាងក្រៅដើម្បីបង្កើតការស្តារឡើងវិញ ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅកាន់ ការកំណត់ ការជ្រើសរើស \"ការអនុញ្ញាត\" និងបើក \"អង្គរក្សាទុក\"។</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">កំណត់ពេលវេលាបម្រុងទុក</string>
 
@@ -830,7 +837,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">វគ្គឈែតត្រូវបានផ្ទុកឡើងវិញ</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal ប្រើប្រាស់កូដនីយកម្មសងខាង ហើយជួនកាល​វាអាចត្រូវការផ្ទុកឡើងវិញ​នូវវគ្គឈែតរបស់អ្នក។ នេះមិនប៉ះពាល់សន្តិសុខនៃការឈែតរបស់អ្នកទេ តែអ្នកអាចខកខានសារមួយពីលេខទំនាក់ទំនងនេះ និងអ្នកអាចសុំគេឲ្យផ្ញើម្តងទៀត។</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly ប្រើប្រាស់កូដនីយកម្មសងខាង ហើយជួនកាល​វាអាចត្រូវការផ្ទុកឡើងវិញ​នូវវគ្គឈែតរបស់អ្នក។ នេះមិនប៉ះពាល់សន្តិសុខនៃការឈែតរបស់អ្នកទេ តែអ្នកអាចខកខានសារមួយពីលេខទំនាក់ទំនងនេះ និងអ្នកអាចសុំគេឲ្យផ្ញើម្តងទៀត។</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">ប្រើ Signal នៅលើ Desktop ឬ iPad។ សាររបស់អ្នកនឹងធ្វើសមកាលកម្មទៅឧបករណ៍ដែលបានភ្ជាប់របស់អ្នក។</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">ភ្ជាប់ឧបករណ៍ថ្មី</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s សារ និងព័ត៌មានជជែកត្រូវបានការពារដោយការអ៊ីនគ្រីបទាំងសងខាងនៅលើឧបករណ៍ទាំងអស់</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal នៅលើ Desktop ឬ iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">ការផ្ញើសារទាំងអស់នៅលើឧបករណ៍ដែលបានភ្ជាប់គឺមានលក្ខណៈឯកជន</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">សារ Molly ត្រូវបានធ្វើសមកាលកម្មជាមួយ Molly នៅលើទូរសព្ទដៃរបស់អ្នកបន្ទាប់ពីវាត្រូវបានភ្ជាប់។ ប្រវត្តិសារពីមុនរបស់អ្នកនឹងមិនបង្ហាញទេ។</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">នៅលើឧបករណ៍ផ្សេងទៀតរបស់អ្នក សូមចូលទៅកាន់ %1$s ដើម្បីដំឡើង Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">ឧបករណ៍ដែលបានភ្ជាប់របស់ខ្ញុំ</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">ផ្តាច់</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s ត្រូវបានផ្តាច់</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">កំពុងភ្ជាប់ឧបករណ៍…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">ឧបករណ៍ត្រូវបានអនុញ្ញាត</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">កំពុងផ្ទុក…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">មិនមានឧបករណ៍ដែលបានភ្ជាប់ទេ</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">ដោះសោដើម្បីភ្ជាប់ឧបករណ៍</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">ស្គែនកូដ QR ដែលបានបង្ហាញនៅលើឧបករណ៍ដើម្បីភ្ជាប់។</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">ស្គែនកូដ QR</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">ប្រើឧបករណ៍នេះដើម្បីស្គែនកូដ QR ដែលបង្ហាញនៅលើឧបករណ៍ដែលអ្នកចង់ភ្ជាប់</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">យល់ព្រម</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">ឧបករណ៍នេះនឹងអាចមើលឃើញក្រុមនិងបញ្ជីទំនាក់ទំនងរបស់អ្នក ចូលមើលការជជែករបស់អ្នក និងផ្ញើសារដោយប្រើឈ្មោះរបស់អ្នកបាន។</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">បញ្ចប់ការភ្ជាប់នៅលើឧបករណ៍ផ្សេងទៀតរបស់អ្នក</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">បញ្ចប់ការភ្ជាប់ Molly នៅលើឧបករណ៍ផ្សេងទៀតរបស់អ្នក។</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">ការភ្ជាប់ឧបករណ៍បានបរាជ័យ</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">កូដ QR នេះមិនត្រឹមត្រូវទេ។ សូមឱ្យប្រាកដថា អ្នកកំពុងតែស្គែនកូដ QR ដែលបង្ហាញនៅលើឧបករណ៍ដែលអ្នកចង់ភ្ជាប់។</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">ព្យាយាមម្តងទៀត</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">ផ្តាត់តំណភ្ជាប់ \'%1$s\'?</string>
@@ -852,10 +914,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">បង្កើនប្រសិទ្ធភាពសម្រាប់ការបាត់ Play Services</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">ឧបករណ៍នេះ មិនគាំទ្រ Play Services។ ចុច ដើម្បីបិទការបង្កើនប្រសិទ្ធិភាពប្រព័ន្ធថ្ម ដែលរារាំង Signal ពីទាញយកសារនានា នៅពេលឧបករណ៍ទុកចោល។</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">ឧបករណ៍នេះ មិនគាំទ្រ Play Services។ ចុច ដើម្បីបិទការបង្កើនប្រសិទ្ធិភាពប្រព័ន្ធថ្ម ដែលរារាំង Molly ពីទាញយកសារនានា នៅពេលឧបករណ៍ទុកចោល។</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">កំណែ Signal នេះបានផុតកំណត់។ ធ្វើបច្ចុប្បន្នភាពឥឡូវ ដើម្បីផ្ញើ និងទទួលសារ។</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">កំណែ Molly នេះបានផុតកំណត់។ ធ្វើបច្ចុប្បន្នភាពឥឡូវ ដើម្បីផ្ញើ និងទទួលសារ។</string>
     <string name="ExpiredBuildReminder_update_now">ធ្វើបច្ចុប្បន្នភាពឥឡូវនេះ</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -865,8 +927,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">បង្ហាញ</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">ការបរាជ័យក្នុងការទំនាក់ទំនង Signal អចិន្រ្តៃយ៍!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal មិនអាចចុះឈ្មោះជាមួយ Google Play Services។ ការផ្ញើសារ​ និងការហៅចេញSignal ត្រូវបានបិទ សូមព្យាយាមចុះឈ្មោះសារជាថ្មីក្នុង ការកំណត់ &gt; កម្រិតខ្ពស់។</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">ការបរាជ័យក្នុងការទំនាក់ទំនង Molly អចិន្រ្តៃយ៍!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly មិនអាចចុះឈ្មោះជាមួយ Google Play Services។ ការផ្ញើសារ​ និងការហៅចេញMolly ត្រូវបានបិទ សូមព្យាយាមចុះឈ្មោះសារជាថ្មីក្នុង ការកំណត់ &gt; កម្រិតខ្ពស់។</string>
 
 
     <!-- GiphyActivity -->
@@ -992,20 +1054,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">កំណត់ហេតុបញ្ហាជួយឲ្យយើងវិភាគ និងដោះស្រាយបញ្ហានេះ ហើយមិនមានព័ត៌មានកំណត់អត្តសញ្ញាណទេ។</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal បានជួបប្រទះបញ្ហាមួយ។ ដាក់បញ្ជូនកំណត់ហេតុបំបាត់បញ្ហា?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly បានជួបប្រទះបញ្ហាមួយ។ ដាក់បញ្ជូនកំណត់ហេតុបំបាត់បញ្ហា?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">ការជូនដំណឹងអាចនឹងពន្យារពេល ដោយសារការបង្កើនប្រសិទ្ធភាពថ្ម</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">អ្នកអាចបិទការបង្កើនប្រសិទ្ធភាពថ្មសម្រាប់ Signal ដើម្បីធានាថាការជូនដំណឹងអំពីសារនឹងមិនត្រូវបានពន្យារពេលឡើយ។</string>
+    <string name="PromptBatterySaverBottomSheet__message">អ្នកអាចបិទការបង្កើនប្រសិទ្ធភាពថ្មសម្រាប់ Molly ដើម្បីធានាថាការជូនដំណឹងអំពីសារនឹងមិនត្រូវបានពន្យារពេលឡើយ។</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">ការជូនដំណឹងអាចនឹងពន្យារពេល ដោយសារការបង្កើនប្រសិទ្ធភាពថ្ម</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">បិទការបង្កើនប្រសិទ្ធភាពថ្មសម្រាប់ Molly ដើម្បីធានាថាការជូនដំណឹងអំពីសារនឹងមិនត្រូវបានពន្យារពេលឡើយ។ ចុច “បន្ត” ដើម្បីមើលការណែនាំអំពីឧបករណ៍ជាក់លាក់។</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">ទេ អរគុណ</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">បន្ត</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">បន្ត</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">បិទ</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">ទេ អរគុណ</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">ការអញ្ជើញចូលក្នុងក្រុមស្ថិតក្នុងការសម្រេច</string>
+    <string name="PendingMembersActivity_pending_group_invites">សំណើ និងការអញ្ជើញ</string>
     <string name="PendingMembersActivity_requests">ស្នើសុំ</string>
     <string name="PendingMembersActivity_invites">អញ្ជើញ</string>
     <string name="PendingMembersActivity_people_you_invited">មនុស្សដែលអ្នកបានអញ្ជើញ</string>
@@ -1244,12 +1316,12 @@
     <string name="InviteActivity_cancel">បោះបង់</string>
     <string name="InviteActivity_sending">កំពុងផ្ញើ…</string>
     <string name="InviteActivity_invitations_sent">លិខិតអញ្ជើញបានផ្ញើ!</string>
-    <string name="InviteActivity_invite_to_signal">អញ្ជើញចូលប្រើSignal</string>
+    <string name="InviteActivity_invite_to_signal">អញ្ជើញចូលប្រើMolly</string>
     <string name="InviteActivity_send_sms">ផ្ញើសារ SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="other">ផ្ញើសារ SMS អញ្ជើញ %1$d ?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">តោះដូរទៅប្រើSignal ៖ %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">តោះដូរទៅប្រើMolly ៖ %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">វាហាក់ដូចជាមិនមានកម្មវិធីណាមួយដើម្បីចែករំលែក។</string>
 
     <!-- LearnMoreTextView -->
@@ -1263,7 +1335,7 @@
     <string name="LongMessageActivity_your_message">សាររបស់អ្នក</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">បានបើកការតភ្ជាប់ពីក្រោយ</string>
 
     <!-- MediaOverviewActivity -->
@@ -1327,10 +1399,10 @@
     <string name="MessageQuotesBottomSheet_replies">ការឆ្លើយតប</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">ការហៅចេញ តាមSignal</string>
+    <string name="NotificationBarManager__establishing_signal_call">ការហៅចេញ តាមMolly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">ចាប់ផ្តើមសេវាកម្មហៅទូរសព្ទរបស់ Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">បញ្ឈប់សេវាកម្មការហៅ Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">ចាប់ផ្តើមសេវាកម្មហៅទូរសព្ទរបស់ Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">បញ្ឈប់សេវាកម្មការហៅ Molly</string>
     <string name="NotificationBarManager__cancel_call">បោះបង់ការហៅ</string>
 
     <!-- NotificationsMegaphone -->
@@ -1574,6 +1646,14 @@
     <string name="MessageRecord_you_activated_payments">អ្នកបានបើកដំណើរការការបង់ប្រាក់</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s ឥឡូវអាចទទួលយកការបង់ប្រាក់បាន</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">ព័ត៌មានលម្អិតអំពីការបង់ប្រាក់មិនមានទេ</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">ចុចដើម្បីស្វែងយល់បន្ថែម</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">ព័ត៌មានលម្អិតអំពីការបង់ប្រាក់មិនមានទេ</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">ព័ត៌មានលម្អិតនៃការបង់ប្រាក់នេះមិនមានទេ ព្រោះតែសាររបស់អ្នកត្រូវបានស្ដារមកវិញពីប្រភពមួយដែលមិនមានប្រវត្តិនៃការបង់ប្រាក់នេះ។ វាមិនប៉ះពាល់ដល់សមតុល្យកាបូបរបស់អ្នក ឬស្ថានភាពនៃការបង់ប្រាក់ពីមុនទេ។</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1628,9 +1708,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">អ្នកនឹងមិនអាចផ្ញើសារជាអក្សរពី Signal បានទៀតទេក្នុងពេលឆាប់ៗនេះ។ បបួល %1$s ឲ្យប្រើ Signal ដើម្បីរក្សាការសន្ទនានៅទីនេះ។</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">អ្នកមិនអាចផ្ញើសារជាអក្សរនៅក្នុង Signal ទៀតទេ។ បបួល %1$s ឲ្យប្រើ Signal ដើម្បីរក្សាការសន្ទនានៅទីនេះ។</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">អ្នកមិនអាចផ្ញើសារជាអក្សរនៅក្នុង Molly ទៀតទេ។ បបួល %1$s ឲ្យប្រើ Molly ដើម្បីរក្សាការសន្ទនានៅទីនេះ។</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">ការបង់ប្រាក់៖ %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">ការបង់ប្រាក់</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">បានរាយការណ៍ជាសារឥតបានការ</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1704,7 +1786,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">ភ្ជាប់ឧបករណ៍ Signal ១?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">អ្នកហាក់ដូចជាព្យាយាមភ្ជាប់ឧបករណ៍Signal ដោយប្រើកម្មវិធីស្កែនជនទី3។ ដើម្បីការពារសុវត្ថិភាពរបស់អ្នក សូមស្កែនកូដម្តងទៀត នៅក្នុងកម្មវិធីSignal ។</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signalត្រូវការសិទ្ធិប្រើប្រាស់កាមេរ៉ាដើម្បីស្កេនកូដ QR ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅកាន់ ការកំណត់ជ្រើសរើស \"ការអនុញ្ញាត\" និងបើក \"កាមេរ៉ា\"។</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Mollyត្រូវការសិទ្ធិប្រើប្រាស់កាមេរ៉ាដើម្បីស្កេនកូដ QR ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅកាន់ ការកំណត់ជ្រើសរើស \"ការអនុញ្ញាត\" និងបើក \"កាមេរ៉ា\"។</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">មិនអាចស្កេនកូដ QR ដោយគ្មានការអនុញ្ញាតសិទ្ធិប្រើប្រាស់កាមេរ៉ា</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1716,11 +1798,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">បញ្ចូលឃ្លាសម្ងាត់</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">រូប Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">រូប Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">បញ្ជូនឃ្លាសម្ងាត់</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">ឃ្លាសម្ងាត់មិនត្រឹមត្រូវ!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">ដោះសោរSignal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - អេក្រង់ចាក់សោ</string>
+    <string name="PassphrasePromptActivity_unlock_signal">ដោះសោរMolly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - អេក្រង់ចាក់សោ</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">ផែនទី</string>
@@ -1786,7 +1868,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">ផ្ទៀងផ្ទាត់ដើម្បីបន្តផ្ញើសារ</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">ដើម្បីជួយបង្ការសារឥតបានការនៅលើ Signal សូមបញ្ចប់ការផ្ទៀងផ្ទាត់។</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">ដើម្បីជួយបង្ការសារឥតបានការនៅលើ Molly សូមបញ្ចប់ការផ្ទៀងផ្ទាត់។</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">បន្ទាប់ពីការផ្ទៀងផ្ទាត់ អ្នកអាចបន្តផ្ញើសារ។ សារដែលបានផ្អាកណាមួយ នឹងត្រូវផ្ញើដោយស្វ័យប្រវត្តិ។</string>
 
     <!-- Recipient -->
@@ -1794,7 +1876,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">រឿងរ៉ាវរបស់ខ្ញុំ</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">ការហៅតាម Signal</string>
+    <string name="Recipient_signal_call">ការហៅតាម Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">ទប់ស្កាត់</string>
@@ -1808,7 +1890,8 @@
     <string name="RedPhone_ringing">កំពុងរោទិ៍…</string>
     <string name="RedPhone_busy">រវល់</string>
     <string name="RedPhone_recipient_unavailable">អ្នកទទួលមិនទំនេរ</string>
-    <string name="RedPhone_network_failed">បណ្តាញបរាជ័យ!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">មិនអាចភ្ជាប់បណ្តាញបានទេ! សូមពិនិត្យមើលការតភ្ជាប់បណ្តាញរបស់អ្នក រួចព្យាយាមម្តងទៀត។</string>
     <string name="RedPhone_number_not_registered">លេខមិនទាន់ចុះឈ្មោះ!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">លេខដែលអ្នកកំពុងហៅ មិនគាំទ្រសំឡេងសុវត្ថិភាពទេ!</string>
     <string name="RedPhone_got_it">យល់ហើយ</string>
@@ -1819,8 +1902,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">ចុច​ នៅទីនេះ ដើម្បីបើកវីដេអូរបស់អ្នក</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">ដើម្បីហៅទៅ%1$s, Signal ត្រូវការចូលប្រើប្រាស់កាមេរ៉ារបស់អ្នក</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">ដើម្បីហៅទៅ%1$s, Molly ត្រូវការចូលប្រើប្រាស់កាមេរ៉ារបស់អ្នក</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">កំពុងហៅ…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">កំពុងតភ្ជាប់ម្តងទៀត…</string>
@@ -1868,10 +1951,30 @@
     <string name="WebRtcCallActivity__removed_from_call">បានដកចេញពីការហៅ</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">មាននរណាម្នាក់បានដកអ្នកចេញពីការហៅនេះ។</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">អនុញ្ញាតឱ្យចូលប្រើកាមេរ៉ា និងមីក្រូហ្វូនរបស់អ្នក</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">អនុញ្ញាតឱ្យចូលប្រើមីក្រូហ្វូនរបស់អ្នក</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">អនុញ្ញាតឱ្យចូលប្រើកាមេរ៉ារបស់អ្នក</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">ដើម្បីចាប់ផ្តើម ឬចូលរួមការហៅទូរសព្ទ សូមអនុញ្ញាតឱ្យ Molly ចូលប្រើកាមេរ៉ា និងមីក្រូហ្វូនរបស់អ្នក។</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">ដើម្បីចាប់ផ្តើម ឬចូលរួមការហៅទូរសព្ទ សូមអនុញ្ញាតឱ្យ Molly ចូលប្រើមីក្រូហ្វូនរបស់អ្នក។</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">ដើម្បីបើកវីដេអូរបស់អ្នក សូមអនុញ្ញាតឱ្យ Molly ចូលប្រើកាមេរ៉ារបស់អ្នក។</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly ត្រូវការសិទ្ធិអនុញ្ញាតឱ្យចូលប្រើមីក្រូហ្វូនដើម្បីចាប់ផ្តើម ឬចូលរួមការហៅ។</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly ត្រូវការសិទ្ធិចូលប្រើកាមេរ៉ាដើម្បីបើកវីដេអូរបស់អ្នក</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">ដើម្បីចាប់ផ្តើម ឬចូលរួមការហៅ៖</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">ដើម្បីបើកវីដេអូរបស់អ្នក៖</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">ការហៅ Signal</string>
-    <string name="WebRtcCallView__signal_video_call">ការហៅវីដេអូ Signal</string>
+    <string name="WebRtcCallView__signal_call">ការហៅ Molly</string>
+    <string name="WebRtcCallView__signal_video_call">ការហៅវីដេអូ Molly</string>
     <string name="WebRtcCallView__start_call">ចាប់ផ្តើមការហៅ</string>
     <string name="WebRtcCallView__join_call">ចូលរួមការហៅ</string>
     <string name="WebRtcCallView__call_is_full">ការហៅពេញ</string>
@@ -1959,18 +2062,35 @@
     <string name="CallOverflowPopupWindow__lower_hand">ដាក់ដៃចុះ</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">បោះបង់</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">អ្នកបានលើកដៃ</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">បង្ហាញ</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s បានលើកដៃ</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s + %2$d បានលើកដៃ</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s បានលើកដៃ</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
         <item quantity="other">%1$s + %2$d បានលើកដៃ</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
 
@@ -2055,7 +2175,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">អ្នកនឹងទទួលបានការហៅមួយដើម្បីផ្ទៀងផ្ទាត់លេខនេះ។</string>
     <string name="RegistrationActivity_edit_number">កែប្រែលេខ</string>
     <string name="RegistrationActivity_missing_google_play_services">រកមិនឃើញ Google Play Services</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">ឧបករណ៍នេះមិនមាន Google Play Services។ អ្នកនៅតែអាចប្រើប្រាស់Signalបាន ប៉ុន្តែលទ្ធផលការកំណត់នេះអាចកាត់បន្ថយទំនុកចិត្ត ឬល្បឿន។ \n\n បើអ្នកមិនមែនជាអ្នកប្រើប្រាស់កម្រិតខ្ពស់ទេ មិនប្រើប្រាស់ Android ROM ផ្សេង ឬជឿជាក់ថាអ្នកកំពុងឃើញបញ្ហានេះ សូមទំនាក់ទំនង support@signal.org សម្រាប់ជួយក្នុងការដោះស្រាយបញ្ហា។</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">ឧបករណ៍នេះមិនមាន Google Play Services។ អ្នកនៅតែអាចប្រើប្រាស់Mollyបាន ប៉ុន្តែលទ្ធផលការកំណត់នេះអាចកាត់បន្ថយទំនុកចិត្ត ឬល្បឿន។ \n\n បើអ្នកមិនមែនជាអ្នកប្រើប្រាស់កម្រិតខ្ពស់ទេ មិនប្រើប្រាស់ Android ROM ផ្សេង ឬជឿជាក់ថាអ្នកកំពុងឃើញបញ្ហានេះ សូមទំនាក់ទំនង support@molly.im សម្រាប់ជួយក្នុងការដោះស្រាយបញ្ហា។</string>
     <string name="RegistrationActivity_i_understand">ខ្ញុំយល់</string>
     <string name="RegistrationActivity_play_services_error">Play Services មានបញ្ហាា</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services កំពុងធ្វើបច្ចុប្បន្នភាព ឬមិនអាចប្រើបានជាបណ្តោះអាសន្ន។ សូមព្យាយាមម្តងទៀត។</string>
@@ -2073,7 +2193,7 @@
     <string name="RegistrationActivity_non_standard_number_format">ទម្រង់លេខមិនស្តង់ដារ</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">លេខដែលអ្នកបានបញ្ចូល (%1$s) មានទម្រង់លេខមិនស្តង់ដារ.\n\nតើអ្នកមានន័យថា %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - ទម្រង់លេខទូរស័ព្ទ</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - ទម្រង់លេខទូរស័ព្ទ</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">បានស្នើសុំការហៅ</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2106,8 +2226,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">មានបញ្ហាក្នុងការចុះឈ្មោះឬ?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• ត្រូវប្រាកដថាទូរសព្ទរបស់អ្នកមានសញ្ញាសេវាទូរសព្ទ ដើម្បីអាចទទួលសារជាអក្សរ ឬការហៅចូលបាន\n • ត្រូវបញ្ជាក់ថាអ្នកអាចទទួលការហៅចូលទៅលេខទូរសព្ទនោះបាន\n • ត្រូវពិនិត្យមើលថាអ្នកបានបញ្ចូលលេខទូរសព្ទរបស់អ្នកបានត្រឹមត្រូវហើយ។</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">សម្រាប់ព័ត៌មានបន្ថែម សូមធ្វើតាមជំហានដោះស្រាយបញ្ហាទាំងនេះ ឬទាក់ទងផ្នែកជំនួយ</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">សម្រាប់ព័ត៌មានបន្ថែម សូមអនុវត្តតាម %1$s ឬ %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">ជំហានដោះស្រាយបញ្ហាទាំងនេះ</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2145,13 +2265,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">បន្ថែមចូល បញ្ជីទំនាក់ទំនង</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">អញ្ជើញចូលប្រើSignal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">អញ្ជើញចូលប្រើMolly</string>
     <string name="SharedContactDetailsActivity_signal_message">សារ Signal </string>
     <string name="SharedContactDetailsActivity_signal_call">ការហៅSignal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">បន្ថែមចូល បញ្ជីទំនាក់ទំនង</string>
-    <string name="SharedContactView_invite_to_signal">អញ្ជើញចូលប្រើSignal</string>
+    <string name="SharedContactView_invite_to_signal">អញ្ជើញចូលប្រើMolly</string>
     <string name="SharedContactView_message">សារ Signal </string>
 
     <!-- SignalBottomActionBar -->
@@ -2282,11 +2402,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s ជាលេខរបស់ %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">បច្ចុប្បន្នភាព Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal មានកំណែថ្មីមួយ។ ចុចដើម្បីដំឡើងកំណែ។</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal មិនអាចដំឡើងកំណែបានទេ</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">បច្ចុប្បន្នភាព Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly មានកំណែថ្មីមួយ។ ចុចដើម្បីដំឡើងកំណែ។</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly មិនអាចដំឡើងកំណែបានទេ</string>
     <string name="ApkUpdateNotifications_failed_general_body">យើងនឹងព្យាយាមម្តងទៀតនៅពេលក្រោយ។</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal ត្រូវបានដំឡើងកំណែដោយជោគជ័យ</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly ត្រូវបានដំឡើងកំណែដោយជោគជ័យ</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">អ្នកត្រូវបានដំឡើងកំណែដោយស្វ័យប្រវត្តិទៅកំណែ %1$s។</string>
 
     <!-- UntrustedSendDialog -->
@@ -2356,7 +2476,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">លេខសុវត្ថិភាព Signalរបស់យើង៖</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">អ្នកហាក់ដូចជាមិនមានកម្មវិធីណាមួយដើម្បីចែករំលែក។</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">ពុំមានលេខសុវត្ថិភាព ដើម្បីប្រៀបធៀបក្នុង clipboard</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signalត្រូវការសិទ្ធិប្រើប្រាស់កាមេរ៉ាដើម្បីស្កេនកូដ QR ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅកាន់ ការកំណត់ ជ្រើសរើស \"ការអនុញ្ញាត\" និងបើក \"កាមេរ៉ា\"។</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Mollyត្រូវការសិទ្ធិប្រើប្រាស់កាមេរ៉ាដើម្បីស្កេនកូដ QR ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅកាន់ ការកំណត់ ជ្រើសរើស \"ការអនុញ្ញាត\" និងបើក \"កាមេរ៉ា\"។</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">មិនអាចស្កេនកូដ QR ដោយគ្មានការអនុញ្ញាតសិទ្ធប្រើប្រាស់កាមេរ៉ា</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">ដំបូង អ្នកត្រូវផ្លាស់ប្តូរសារ ដើម្បីបង្ហាញលេខសុវត្ថិភាពរបស់ %1$s។</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2386,14 +2506,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">ចុច ដើម្បីបើក។</string>
-    <string name="KeyCachingService_passphrase_cached">Signal បានដោះសោ</string>
-    <string name="KeyCachingService_lock">ចាក់សោរSignal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly បានដោះសោ</string>
+    <string name="KeyCachingService_lock">ចាក់សោរMolly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">អ្នក</string>
     <string name="MediaPreviewActivity_unssuported_media_type">ប្រភេទឯកសារមិនគាំទ្រ</string>
     <string name="MediaPreviewActivity_draft">ព្រាង</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signalត្រូវការសិទ្ធិប្រើប្រាស់អង្គរក្សាទុកដើម្បីរក្សាឯកសារក្នុងអង្គរក្សាទុកខាងក្រៅ ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅកាន់ ការកំណត់ ជ្រើសរើស \"ការអនុញ្ញាត\" និងបើក \"អង្គរក្សាទុក\"។</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Mollyត្រូវការសិទ្ធិប្រើប្រាស់អង្គរក្សាទុកដើម្បីរក្សាឯកសារក្នុងអង្គរក្សាទុកខាងក្រៅ ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅកាន់ ការកំណត់ ជ្រើសរើស \"ការអនុញ្ញាត\" និងបើក \"អង្គរក្សាទុក\"។</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">មិនអាចរក្សាទុកក្នុងអង្គរក្សាទុកខាងក្រៅ ដោយគ្មានការអនុញ្ញាត</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">លុបសារ?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">វានឹងលុបសារនេះជារៀងរហូត។</string>
@@ -2435,7 +2555,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">ការបញ្ជូនសារបរាជ័យ។</string>
     <string name="MessageNotifier_error_delivering_message">ការបញ្ជូនសារមានបញ្ហា។</string>
     <string name="MessageNotifier_message_delivery_paused">ការបញ្ជូនសារត្រូវបានផ្អាក។</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">ផ្ទៀងផ្ទាត់ដើម្បីបន្តផ្ញើសារលើ Signal។</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">ផ្ទៀងផ្ទាត់ដើម្បីបន្តផ្ញើសារលើ Molly។</string>
     <string name="MessageNotifier_mark_all_as_read">សម្គាល់ថាបានអានទាំងអស់</string>
     <string name="MessageNotifier_mark_read">សម្គាល់ថាបានអាន</string>
     <string name="MessageNotifier_turn_off_these_notifications">បិទសារជូនដំណឹងទាំងនេះ</string>
@@ -2457,7 +2577,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">បានប្រតិកម្ម %1$s ទៅនឹងស្ទីគ័ររបស់អ្នក។</string>
     <string name="MessageNotifier_this_message_was_deleted">សារនេះត្រូវបានលុប។</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">បិទសារជូនដំណឹងលេខទំនាក់ទំនងចូលរួម Signal? អ្នកអាចបើកវាម្តងទៀតក្នុង Signal &gt; ការកំណត់ &gt; សារជូនដំណឹង។</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">បិទសារជូនដំណឹងលេខទំនាក់ទំនងចូលរួម Molly? អ្នកអាចបើកវាម្តងទៀតក្នុង Molly &gt; ការកំណត់ &gt; សារជូនដំណឹង។</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2496,7 +2616,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">មិនមានការឆ្លើយតបភ្លាមៗ នៅពេល Signal ត្រូវបានចាក់សោរ!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">មិនមានការឆ្លើយតបភ្លាមៗ នៅពេល Molly ត្រូវបានចាក់សោរ!</string>
     <string name="QuickResponseService_problem_sending_message">សារដែលបានបញ្ជូនមានបញ្ហា!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2516,7 +2636,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">រូបតំណាងផ្លូវកាត់មិនត្រឹមត្រូវ</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">សារថ្មី</string>
     <string name="SingleRecipientNotificationBuilder_message_request">សារស្នើសុំ</string>
     <string name="SingleRecipientNotificationBuilder_you">អ្នក</string>
@@ -2561,7 +2681,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">លែងចុះឈ្មោះឧបករណ៍នេះទៀតហើយ។ ទំនងជាអ្នកបានចុះឈ្មោះលេខទូរសព្ទរបស់អ្នកជាមួយ Signal នៅលើឧបករណ៍ផ្សេង។</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">លែងចុះឈ្មោះឧបករណ៍នេះទៀតហើយ។ ទំនងជាអ្នកបានចុះឈ្មោះលេខទូរសព្ទរបស់អ្នកជាមួយ Molly នៅលើឧបករណ៍ផ្សេង។</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">ចុះឈ្មោះឧបករណ៍ឡើងវិញ</string>
 
@@ -2574,10 +2694,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">ដើម្បីឆ្លើយតបការហៅ សូមឲ្យ Signal ប្រើប្រាស់ម៉ៃក្រូហ្វូនរបស់អ្នក។</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">ដើម្បីឆ្លើយតបការហៅ សូមឲ្យ Molly ប្រើប្រាស់ម៉ៃក្រូហ្វូនរបស់អ្នក។</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">ដើម្បីលើកទទួលការហៅជាវីដេអូ សូមឲ្យ Signal ប្រើប្រាស់មីក្រូហ្វូន និងកាមេរ៉ារបស់អ្នក។</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signalត្រូវការសិទ្ធិប្រើប្រាស់ម៉ៃក្រូហ្វូន និងកាមេរ៉ា ដើម្បីហៅចេញ ឬទទួលការហៅចូល ប៉ុន្តែពួកវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅកាន់ ការកំណត់ ជ្រើសរើស \"ការអនុញ្ញាត\" និងបើក \"ម៉ៃក្រូហ្វូន\" និង \"កាមេរ៉ា\"។</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">ដើម្បីលើកទទួលការហៅជាវីដេអូ សូមឲ្យ Molly ប្រើប្រាស់មីក្រូហ្វូន និងកាមេរ៉ារបស់អ្នក។</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Mollyត្រូវការសិទ្ធិប្រើប្រាស់ម៉ៃក្រូហ្វូន និងកាមេរ៉ា ដើម្បីហៅចេញ ឬទទួលការហៅចូល ប៉ុន្តែពួកវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅកាន់ ការកំណត់ ជ្រើសរើស \"ការអនុញ្ញាត\" និងបើក \"ម៉ៃក្រូហ្វូន\" និង \"កាមេរ៉ា\"។</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">បានឆ្លើយលើឧបករណ៍ដែលបានតភ្ជាប់។</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">បានបដិសេធលើឧបករណ៍ដែលបានតភ្ជាប់។</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">ជាប់រវល់លើឧបករណ៍ដែលបានតភ្ជាប់។</string>
@@ -2622,16 +2742,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">ឃ្លាសម្ងាត់ថ្មីម្តងទៀត</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">អញ្ជើញចូលប្រើSignal</string>
+    <string name="contact_selection_activity__invite_to_signal">អញ្ជើញចូលប្រើMolly</string>
     <string name="contact_selection_activity__new_group">ក្រុមថ្មី</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">ផ្ទុកឈ្មោះទំនាក់ទំនងឡើងវិញ</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">បាត់នរណាម្នាក់ឬ? សាកល្បងផ្ទុកឡើងវិញ</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">ស្វែងរកមនុស្សដែលអ្នកស្គាល់នៅលើ Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">អនុញ្ញាតឱ្យចូលប្រើបញ្ជីទំនាក់ទំនងរបស់អ្នក</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">ច្រើនទៀត</string>
 
@@ -2648,7 +2768,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">រូបភាពទំនាក់ទំនង</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signalត្រូវការសិទ្ធិប្រើប្រាស់បញ្ជី​ទំនាក់ទំនង ដើម្បីបង្ហាញបញ្ជីទំនាក់ទំនងរបស់អ្នក ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅ ការកំណត់ ជ្រើសរើស \"អនុញ្ញាត\" និងបើក \"បញ្ជីទំនាក់ទំនង\"។</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Mollyត្រូវការសិទ្ធិប្រើប្រាស់បញ្ជី​ទំនាក់ទំនង ដើម្បីបង្ហាញបញ្ជីទំនាក់ទំនងរបស់អ្នក ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅ ការកំណត់ ជ្រើសរើស \"អនុញ្ញាត\" និងបើក \"បញ្ជីទំនាក់ទំនង\"។</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">មានបញ្ហាក្នុងការទាញយកបញ្ជីទំនាក់ទំនង, សូមពិនិត្យការតភ្ជាប់បណ្តាញរបស់អ្នក</string>
     <string name="ContactSelectionListFragment_username_not_found">រកមិនឃើញឈ្មោះអ្នកប្រើ</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"%1$s មិនមែនជាអ្នកប្រើ Signal ទេ។ សូមពិនិត្យឈ្មោះអ្នកប្រើ រួចព្យាយាមម្តងទៀត។"</string>
@@ -2665,16 +2785,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">ស្វែងរកតាមឈ្មោះអ្នកប្រើ</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">អនុញ្ញាតឱ្យចូលប្រើបញ្ជីទំនាក់ទំនង</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">ដើម្បីស្វែងរកមនុស្សដែលអ្នកស្គាល់នៅលើ Signal៖</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">អនុញ្ញាតចូលប្រើប្រាស់</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">ទេ អរគុណ</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">អនុញ្ញាតឱ្យចូលប្រើបញ្ជីទំនាក់ទំនងរបស់អ្នក។ បញ្ជីទំនាក់ទំនងរបស់អ្នកត្រូវបានអ៊ីនគ្រីប និងមិនអាចមើលឃើញដោយសេវាកម្ម Signal បានទេ។</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal ត្រូវការចូលប្រើប្រាស់បញ្ជីទំនាក់ទំនងរបស់អ្នក ដើម្បីបង្ហាញវា។</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly ត្រូវការចូលប្រើប្រាស់បញ្ជីទំនាក់ទំនងរបស់អ្នក ដើម្បីបង្ហាញវា។</string>
     <string name="contact_selection_list_fragment__show_contacts">បង្ហាញបញ្ជីលេខទំនាក់ទំនង</string>
 
     <!-- contact_selection_list_item -->
@@ -2745,6 +2867,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">អ្នកបានដកបុគ្គលនេះចេញហើយ។ ការផ្ញើសារទៅគេម្តងទៀតនឹងបញ្ចូលគេទៅក្នុងបញ្ជីរបស់អ្នកវិញ។</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">ជម្រើស</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">ធ្វើបច្ចុប្បន្នភាព</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">លេង … ផ្អាក</string>
@@ -2773,7 +2897,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Bubbles ជាមុខងារមួយរបស់ Android ដែលអ្នកអាចបិទសម្រាប់ការជជែក Signal។</string>
+    <string name="BubbleOptOutTooltip__description">Bubbles ជាមុខងារមួយរបស់ Android ដែលអ្នកអាចបិទសម្រាប់ការជជែក Molly។</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">ពេលក្រោយ</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -2934,9 +3058,9 @@
     <string name="EditProfileFragment__group_description">ការពិពណ៌នាពីក្រុម</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">ដំឡើង Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">ដំឡើង Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">កំណែ Signal នេះបានផុតកំណត់ហើយ។ ដំឡើងកំណែឥឡូវនេះដើម្បីបន្តប្រើប្រាស់ Signal។</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">កំណែ Molly នេះបានផុតកំណត់ហើយ។ ដំឡើងកំណែឥឡូវនេះដើម្បីបន្តប្រើប្រាស់ Molly។</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">បច្ចុប្បន្នភាព</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3152,7 +3276,7 @@
     <string name="preferences__slow">យឺត</string>
     <string name="preferences__help">ជំនួយ</string>
     <string name="preferences__advanced">កម្រិតខ្ពស់</string>
-    <string name="preferences__donate_to_signal">បរិច្ចាគទៅ Signal</string>
+    <string name="preferences__donate_to_signal">បរិច្ចាគទៅ Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">ឯកជនភាព</string>
     <!-- Preference label for stories -->
@@ -3189,13 +3313,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">ប្តូរឈ្មោះ និងរូបកម្មវិធីទៅជា \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">ត្រូវបិទ Signal ដើម្បីប្តូរឈ្មោះ និងរូបកម្មវិធី។ ការជូនដំណឹងនឹងបង្ហាញឈ្មោះ និងរូបកម្មវិធី Signal លំនាំដើមជានិច្ច។</string>
+    <string name="preferences__app_icon_dialog_description">ត្រូវបិទ Molly ដើម្បីប្តូរឈ្មោះ និងរូបកម្មវិធី។ ការជូនដំណឹងនឹងបង្ហាញឈ្មោះ និងរូបកម្មវិធី Molly លំនាំដើមជានិច្ច។</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">ជ្រើសរើសឈ្មោះ និងរូបកម្មវិធីដែលនឹងអាចមើលឃើញបាននៅលើអេក្រង់ទំព័រដើម និងថតកម្មវិធីរបស់ទូរសព្ទអ្នក។ ការជូនដំណឹងនឹងបង្ហាញឈ្មោះ និងរូបកម្មវិធី Signal លំនាំដើមជានិច្ច។ ស្វែងយល់បន្ថែម</string>
+    <string name="preferences__app_icon_warning_learn_more">ជ្រើសរើសឈ្មោះ និងរូបកម្មវិធីដែលនឹងអាចមើលឃើញបាននៅលើអេក្រង់ទំព័រដើម និងថតកម្មវិធីរបស់ទូរសព្ទអ្នក។ ការជូនដំណឹងនឹងបង្ហាញឈ្មោះ និងរូបកម្មវិធី Molly លំនាំដើមជានិច្ច។ ស្វែងយល់បន្ថែម</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">ឈ្មោះ និងរូបកម្មវិធីអាចមើលឃើញបាននៅលើអេក្រង់ទំព័រដើម និងថតកម្មវិធី។</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">ការជូនដំណឹងនឹងបង្ហាញឈ្មោះ និងរូបកម្មវិធី Signal លំនាំដើមជានិច្ច។</string>
+    <string name="preferences__app_icon_notification_warning">ការជូនដំណឹងនឹងបង្ហាញឈ្មោះ និងរូបកម្មវិធី Molly លំនាំដើមជានិច្ច។</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">ស្វែងយល់បន្ថែម</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3241,8 +3365,12 @@
         <item quantity="other">វានឹងកាត់តម្រឹមជាអចិន្រ្តៃយ៍នូវការជជែកទាំងអស់មកនៅត្រឹមសារថ្មីៗបំផុត %1$s។</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">ការធ្វើបែបនេះនឹងលុបប្រវត្តិសារ និងមេឌៀទាំងអស់ពីឧបករណ៍របស់អ្នកជាអចិន្ត្រៃយ៍។</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">ការធ្វើបែបនេះនឹងលុបជារៀងរហូតនូវប្រវត្តិសារ និងមេឌៀទាំងអស់ពីឧបករណ៍នេះ និងឧបករណ៍ដែលបានភ្ជាប់ណាមួយ។</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">តើអ្នកប្រាកដថាចង់លុបប្រវត្តិសារទាំងអស់ឬ?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">ប្រវត្តិសារទាំងអស់នឹងត្រូវលុបចោលជាអចិន្ត្រៃយ៍។ សកម្មភាពនេះមិនអាចត្រឡប់ក្រោយទេ។</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">ប្រវត្តិសារទាំងអស់នឹងត្រូវបានលុបពីឧបករណ៍ទាំងអស់ជារៀងរហូត។ សកម្មភាពនេះមិនអាចត្រឡប់វិញបានទេ។</string>
     <string name="preferences_storage__delete_all_now">លុបទាំងអស់ឥឡូវនេះ</string>
     <string name="preferences_storage__forever">ជារៀងរហូត</string>
     <string name="preferences_storage__one_year">1 ឆ្នាំ</string>
@@ -3278,7 +3406,7 @@
     <string name="preferences_communication__category_censorship_circumvention">ការចៀសវាងការឃ្លាំមើល</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">ការចៀសវាងការឃ្លាំមើល</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">បើសិនបើក Signalនឹងព្យាយាមចៀសវាងការឃ្លាំមើល។ កុំបើកមុខងារនេះ លុះត្រាអ្នកកំពុងស្ថិតនៅទីតាំងដែល Signal ត្រូវបានឃ្លាំមើល។</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">បើសិនបើក Mollyនឹងព្យាយាមចៀសវាងការឃ្លាំមើល។ កុំបើកមុខងារនេះ លុះត្រាអ្នកកំពុងស្ថិតនៅទីតាំងដែល Molly ត្រូវបានឃ្លាំមើល។</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">ការចៀសវាងការឃ្លាំមើល ត្រូវបានដំណើរការ ផ្អែកលើលេខទូរស័ព្ទរបស់គណនីអ្នក។</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3330,7 +3458,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">សូមណែនាំអំពីការបង់ប្រាក់</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">ប្រើប្រាស់ Signal ដើម្បីផ្ញើ និងទទួល MobileCoin ដែលជារូបិយបណ្ណឌីជីថលថ្មីមួយផ្តោតលើឯកជនភាព។ បើកដំណើរការ ដើម្បីចាប់ផ្តើម។</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">ប្រើប្រាស់ Molly ដើម្បីផ្ញើ និងទទួល MobileCoin ដែលជារូបិយបណ្ណឌីជីថលថ្មីមួយផ្តោតលើឯកជនភាព។ បើកដំណើរការ ដើម្បីចាប់ផ្តើម។</string>
     <string name="PaymentsHomeFragment__activate_payments">បើកដំណើរការការទូទាត់</string>
     <string name="PaymentsHomeFragment__activating_payments">កំពុងបើកដំណើរការ ការទូទាត់…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">ស្តារគណនីទូទាត់</string>
@@ -3356,7 +3484,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">ការទូទាត់មិនមាននៅក្នុងតំបន់របស់អ្នកទេ។</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">មិនអាចបើកការទូទាត់។ សាកល្បងម្តងទៀតពេលក្រោយ។</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">បិទដំណើរការ ការទូទាត់?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">អ្នកនឹងមិនអាចផ្ញើនិងទទួល Mobilecoin ក្នុង Signal ​បើអ្នកបិទដំណើរការ ការទូទាត់។</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">អ្នកនឹងមិនអាចផ្ញើនិងទទួល Mobilecoin ក្នុង Molly ​បើអ្នកបិទដំណើរការ ការទូទាត់។</string>
     <string name="PaymentsHomeFragment__deactivate">បិទ</string>
     <string name="PaymentsHomeFragment__continue">បន្ត</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">សមតុល្យ មិនមានទេបច្ចុប្បន្ននេះ។</string>
@@ -3365,10 +3493,10 @@
     <string name="PaymentsHomeFragment__details">លម្អិត</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">អ្នកអាចប្រើ Signal ដើម្បីផ្ញើ និងទទួល MobileCoin។ ការបង់ប្រាក់ទាំងអស់ត្រូវអនុវត្តតាមលក្ខខណ្ឌប្រើប្រាស់សម្រាប់ MobileCoins និង MobileCoin Wallet។ អ្នកអាចនឹងជួបប្រទះបញ្ហាមួយចំនួន ហើយការបង់ប្រាក់ ឬសមតុល្យដែលអ្នកអាចនឹងបាត់បង់ មិនអាចស្តារមកវិញបានទេ។ </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">អ្នកអាចប្រើ Molly ដើម្បីផ្ញើ និងទទួល MobileCoin។ ការបង់ប្រាក់ទាំងអស់ត្រូវអនុវត្តតាមលក្ខខណ្ឌប្រើប្រាស់សម្រាប់ MobileCoins និង MobileCoin Wallet។ អ្នកអាចនឹងជួបប្រទះបញ្ហាមួយចំនួន ហើយការបង់ប្រាក់ ឬសមតុល្យដែលអ្នកអាចនឹងបាត់បង់ មិនអាចស្តារមកវិញបានទេ។ </string>
     <string name="PaymentsHomeFragment__activate">ធ្វើឱ្យសកម្ម</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">មើលលក្ខខណ្ឌ MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">ការទូទាត់នៅក្នុង Signal លែងមានហើយ។ អ្នកនៅតែអាចផ្ទេរប្រាក់ទៅកន្លែងប្តូរប្រាក់បាន ប៉ុន្តែអ្នកមិនអាចផ្ញើ និងទទួលការទូទាត់ ឬបន្ថែមថវិកាបានទេ។</string>
+    <string name="PaymentsHomeFragment__payments_not_available">ការទូទាត់នៅក្នុង Molly លែងមានហើយ។ អ្នកនៅតែអាចផ្ទេរប្រាក់ទៅកន្លែងប្តូរប្រាក់បាន ប៉ុន្តែអ្នកមិនអាចផ្ញើ និងទទួលការទូទាត់ ឬបន្ថែមថវិកាបានទេ។</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3396,7 +3524,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">បើកការអនុញ្ញាត</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">ដើម្បីជួយអ្នកក្នុងការផ្ញើសារទៅកាន់មនុស្សដែលអ្នកស្គាល់ Signal នឹងស្នើសុំការអនុញ្ញាតទាំងនេះ។ </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">ដើម្បីជួយអ្នកក្នុងការផ្ញើសារទៅកាន់មនុស្សដែលអ្នកស្គាល់ Molly នឹងស្នើសុំការអនុញ្ញាតទាំងនេះ។ </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">ការជូនដំណឹង</string>
     <!-- Notifications permission row description -->
@@ -3484,10 +3612,10 @@
     <string name="PaymentsTransferFragment__next">បន្ទាប់</string>
     <string name="PaymentsTransferFragment__invalid_address">អាសយដ្ឋានមិនត្រឹមត្រូវ</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">ពិនិត្យអាសយដ្ឋានកាបូប ដែលអ្នកព្យាយាមផ្ទេរទៅ ហើយសាកល្បងម្តងទៀត។</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">អ្នកមិនអាចផ្ទេរទៅអាសយដ្ឋានកាបូប Signal ខ្លួនឯងទេ។ បញ្ចូលអាសយដ្ឋានកាបូបពីគណនីរបស់អ្នក នៅការផ្លាស់ប្តូរដែលគាំទ្រ។</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">ដើម្បីស្កេនកូដ QR Signal ត្រូវការប្រើប្រាស់កាមេរ៉ា។</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal​ត្រូវការសិទ្ធិប្រើប្រាស់កាមេរ៉ា ដើម្បថតកូដ QR ។ ចូលទៅ ការកំណត់​ ជ្រើសរើស \"អនុញ្ញាត\" ហើយបើក \"កាមេរ៉ា\"។</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Signal ត្រូវការប្រើប្រាស់កាមេរ៉ា ដើម្បីស្គែន QR Code។</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">អ្នកមិនអាចផ្ទេរទៅអាសយដ្ឋានកាបូប Molly ខ្លួនឯងទេ។ បញ្ចូលអាសយដ្ឋានកាបូបពីគណនីរបស់អ្នក នៅការផ្លាស់ប្តូរដែលគាំទ្រ។</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">ដើម្បីស្កេនកូដ QR Molly ត្រូវការប្រើប្រាស់កាមេរ៉ា។</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly​ត្រូវការសិទ្ធិប្រើប្រាស់កាមេរ៉ា ដើម្បថតកូដ QR ។ ចូលទៅ ការកំណត់​ ជ្រើសរើស \"អនុញ្ញាត\" ហើយបើក \"កាមេរ៉ា\"។</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Molly ត្រូវការប្រើប្រាស់កាមេរ៉ា ដើម្បីស្គែន QR Code។</string>
     <string name="PaymentsTransferFragment__settings">ការកំណត់</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3826,17 +3954,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">ការហៅចូលជាសំឡេងតាម Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">ការហៅចូលជាសំឡេងតាម Molly</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">ការហៅចូលជាវីដេអូតាម Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">ការហៅចូលជាវីដេអូតាម Molly</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">ការហៅចូល Signal ជាក្រុម</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">ការហៅចូល Molly ជាក្រុម</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">កំពុងហៅជាសំឡេងតាម Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">កំពុងហៅជាសំឡេងតាម Molly</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">កំពុងហៅជាវីដេអូតាម Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">កំពុងហៅជាវីដេអូតាម Molly</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">កំពុងហៅជាក្រុមតាម Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">កំពុងហៅជាក្រុមតាម Molly</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">កំពុងផ្ទុក…</string>
@@ -3883,9 +4011,9 @@
     <string name="BackupDialog_verify">ផ្ទៀងផ្ទាត់</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">អ្នកបានបញ្ចូលឃ្លាសម្ងាត់បម្រុងទុករបស់អ្នកដោយជោគជ័យ</string>
     <string name="BackupDialog_passphrase_was_not_correct">ឃ្លាសម្ងាត់មិនត្រឹមត្រូវ</string>
-    <string name="LocalBackupJob_creating_signal_backup">កំពុងបង្កើតការបម្រុងទុក Signal…</string>
+    <string name="LocalBackupJob_creating_signal_backup">កំពុងបង្កើតការបម្រុងទុក Molly…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">កំពុងផ្ទៀងផ្ទាត់ការបម្រុងទុក Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">កំពុងផ្ទៀងផ្ទាត់ការបម្រុងទុក Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">ការបម្រុងទុកបរាជ័យ</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">ថតឯកសារបម្រុងទុករបស់អ្នក ត្រូវបានលុបចោល ឬប្តូរទីតាំង។</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">ឯកសារបម្រុងទុករបស់អ្នក រក្សាទុកនៅទីតាំងនេះ​ មានទំហំធំពេក។</string>
@@ -3900,15 +4028,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">ហៅមកខ្ញុំ (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">ផ្ញើលេខកូដឡើងវិញ (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">ទាក់ទងជំនួយ Signal</string>
-    <string name="RegistrationActivity_code_support_subject">ការចុះឈ្មោះ Signal - ការផ្ទៀងផ្ទាត់កូដសម្រាប់ Android</string>
+    <string name="RegistrationActivity_contact_signal_support">ទាក់ទងជំនួយ Molly</string>
+    <string name="RegistrationActivity_code_support_subject">ការចុះឈ្មោះ Molly - ការផ្ទៀងផ្ទាត់កូដសម្រាប់ Android</string>
     <string name="RegistrationActivity_incorrect_code">លេខកូដមិនត្រឹមត្រូវ</string>
     <string name="BackupUtil_never">មិនធ្លាប់</string>
     <string name="BackupUtil_unknown">មិនស្គាល់</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">លេខទូរសព្ទ</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">ជ្រើសរើសអ្នកដែលអាចមើលឃើញលេខទូរសព្ទរបស់អ្នក និងអ្នកណាដែលអាចប្រើវាទាក់ទងអ្នកបាននៅលើ Signal។</string>
+    <string name="preferences_app_protection__choose_who_can_see">ជ្រើសរើសអ្នកដែលអាចមើលឃើញលេខទូរសព្ទរបស់អ្នក និងអ្នកណាដែលអាចប្រើវាទាក់ទងអ្នកបាននៅលើ Molly។</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">អ្នកដែលអាចមើលឃើញលេខរបស់ខ្ញុំ</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -3956,7 +4084,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">អ្នកបានសាកល្បងច្រើនដងពេក។ សូមសាកល្បងម្តងទៀតនៅពេលក្រោយ។</string>
     <string name="RegistrationActivity_error_connecting_to_service">បញ្ហាការតភ្ជាប់សេវា</string>
     <string name="preferences_chats__backups">បម្រុងទុក</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal ជាប់សោរ</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly ជាប់សោរ</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">ចុច ដើម្បីដោះសោរ</string>
     <string name="Recipient_unknown">មិនស្គាល់</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -3987,9 +4115,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">អ្នកត្រូវចូលប្រើប្រាស់ឧបករណ៍ចាស់របស់អ្នក។</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">ស្តារចេញពីការបម្រុងទុក</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">ស្តារឡើងវិញសាររបស់អ្នកចេញពីការបម្រុងទុកខាងក្នុង។ បើអ្នកមិនស្តារឡើងវិញឥឡូវទេ អ្នកនឹងមិនអាចស្តារឡើងវិញបានទេនៅពេលក្រោយ។</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">ស្តារការបម្រុងទុកក្នុងឧបករណ៍</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">ស្តារការបម្រុងទុក Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">ស្តារមកវិញនូវសារជាអក្សរទាំងអស់របស់អ្នក + មេឌៀក្នុងរយៈពេល 30 ថ្ងៃចុងក្រោយរបស់អ្នក</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">ជម្រើសច្រើនទៀត</string>
 
+    <string name="TransferOrRestoreFragment__cancel">បោះបង់</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">ចូលដោយមិនចាំបាច់ផ្ទេរ</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">បន្តដោយមិនបាច់ផ្ទេរសារ និងមេឌៀរបស់អ្នក</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">បើក Signal នៅលើទូរស័ព្ទ Android ចាស់របស់អ្នក</string>
     <string name="NewDeviceTransferInstructions__continue">បន្ត</string>
@@ -4004,19 +4139,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">កំពុងរៀបចំតភ្ជាប់ទៅឧបករណ៍​ Android ចាស់…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">ចំណាយពេលបន្តិច គួរតែរួចរាល់ឆាប់ៗនេះ</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">កំពុងរង់ចាំឧបករណ៍ Android ចាស់ដើម្បីតភ្ជាប់…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal ត្រូវការការអនុញ្ញាតទីតាំង ដើម្បីរកមើលនិងតភ្ជាប់ទៅកាន់ឧបករណ៍ Android ចាស់របស់អ្នក។</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal ត្រូវការបើកសេវាកម្មទីតាំង ដើម្បីរកមើលនិងតភ្ជាប់ទៅកាន់ឧបករណ៍ Android ចាស់របស់អ្នក។</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal ត្រូវការបើក Wi-Fi ដើម្បីរកមើលនិងតភ្ជាប់ជាមួយឧបករណ៍​ Android ចាស់របស់អ្នក។ Wi-Fi ត្រូវតែបើក ប៉ុន្តែវាមិនចាំបាច់តភ្ជាប់បណ្តាញ Wi-Fi ទេ។</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">សុំទោស ហាក់បីដូចជាឧបករណ៍នេះមិនគាំទ្រ Wi-Fi Direct។ Signal ប្រើប្រាស់ Wi-Fi Direct ដើម្បីរកមើលនិងតភ្ជាប់ឧបករណ៍ Android ចាស់របស់អ្នក។ អ្នកនៅតែអាចស្តារការបម្រុងទុកឡើងវិញ ដើម្បីស្តារគណនីរបស់អ្នកចេញពីឧបករណ៍ Android ចាស់របស់អ្នក។</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly ត្រូវការការអនុញ្ញាតទីតាំង ដើម្បីរកមើលនិងតភ្ជាប់ទៅកាន់ឧបករណ៍ Android ចាស់របស់អ្នក។</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly ត្រូវការបើកសេវាកម្មទីតាំង ដើម្បីរកមើលនិងតភ្ជាប់ទៅកាន់ឧបករណ៍ Android ចាស់របស់អ្នក។</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly ត្រូវការបើក Wi-Fi ដើម្បីរកមើលនិងតភ្ជាប់ជាមួយឧបករណ៍​ Android ចាស់របស់អ្នក។ Wi-Fi ត្រូវតែបើក ប៉ុន្តែវាមិនចាំបាច់តភ្ជាប់បណ្តាញ Wi-Fi ទេ។</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">សុំទោស ហាក់បីដូចជាឧបករណ៍នេះមិនគាំទ្រ Wi-Fi Direct។ Molly ប្រើប្រាស់ Wi-Fi Direct ដើម្បីរកមើលនិងតភ្ជាប់ឧបករណ៍ Android ចាស់របស់អ្នក។ អ្នកនៅតែអាចស្តារការបម្រុងទុកឡើងវិញ ដើម្បីស្តារគណនីរបស់អ្នកចេញពីឧបករណ៍ Android ចាស់របស់អ្នក។</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">ស្តារការបម្រុងទុកមួយ</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">កំហុសមិនរំពឹងទុកមួយកើតឡើង នៅពេលព្យាយាមតភ្ជាប់ទៅកាន់ឧបករណ៍ Android ចាស់របស់អ្នក។</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">កំពុងស្វែងរកឧបករណ៍ Android ថ្មី…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal ត្រូវការការអនុញ្ញាតទីតាំង ដើម្បីរកមើលនិងតភ្ជាប់ទៅកាន់ឧបករណ៍ Android ថ្មីរបស់អ្នក។</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal ត្រូវការបើកសេវាកម្មទីតាំង ដើម្បីរកមើលនិងតភ្ជាប់ទៅកាន់ឧបករណ៍ Android ថ្មីរបស់អ្នក។</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal ត្រូវការបើក Wi-Fi ដើម្បីរកមើលនិងតភ្ជាប់ជាមួយឧបករណ៍​ Android ថ្មីរបស់អ្នក។ Wi-Fi ត្រូវតែបើក ប៉ុន្តែវាមិនចាំបាច់តភ្ជាប់បណ្តាញ Wi-Fi ទេ។</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">សុំទោស ហាក់បីដូចជាឧបករណ៍នេះមិនគាំទ្រ Wi-Fi Direct។ Signal ប្រើប្រាស់ Wi-Fi Direct ដើម្បីរកមើលនិងតភ្ជាប់ឧបករណ៍ Android ថ្មីរបស់អ្នក។ អ្នកនៅតែអាចស្តារការបម្រុងទុកឡើងវិញ ដើម្បីស្តារគណនីរបស់អ្នកចេញពីឧបករណ៍ Android ថ្មីរបស់អ្នក។</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly ត្រូវការការអនុញ្ញាតទីតាំង ដើម្បីរកមើលនិងតភ្ជាប់ទៅកាន់ឧបករណ៍ Android ថ្មីរបស់អ្នក។</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly ត្រូវការបើកសេវាកម្មទីតាំង ដើម្បីរកមើលនិងតភ្ជាប់ទៅកាន់ឧបករណ៍ Android ថ្មីរបស់អ្នក។</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly ត្រូវការបើក Wi-Fi ដើម្បីរកមើលនិងតភ្ជាប់ជាមួយឧបករណ៍​ Android ថ្មីរបស់អ្នក។ Wi-Fi ត្រូវតែបើក ប៉ុន្តែវាមិនចាំបាច់តភ្ជាប់បណ្តាញ Wi-Fi ទេ។</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">សុំទោស ហាក់បីដូចជាឧបករណ៍នេះមិនគាំទ្រ Wi-Fi Direct។ Molly ប្រើប្រាស់ Wi-Fi Direct ដើម្បីរកមើលនិងតភ្ជាប់ឧបករណ៍ Android ថ្មីរបស់អ្នក។ អ្នកនៅតែអាចស្តារការបម្រុងទុកឡើងវិញ ដើម្បីស្តារគណនីរបស់អ្នកចេញពីឧបករណ៍ Android ថ្មីរបស់អ្នក។</string>
     <string name="OldDeviceTransferSetup__create_a_backup">បង្កើតការបម្រុងទុកមួយ</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">កំហុសមិនរំពឹងទុកមួយកើតឡើង នៅពេលព្យាយាមតភ្ជាប់ទៅកាន់ឧបករណ៍ Android ថ្មីរបស់អ្នក។</string>
 
@@ -4057,7 +4192,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">កំពុងផ្ទេរទិន្នន័យ</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">សូមទុកឧបករណ៍ទាំងពីរនៅជិតគ្នា។ កុំបិទឧបករណ៍ណាមួយ ហើយបើកកម្មវិធី Signal ។ ការផ្ទេរគឺមានកូដនីយកម្មសងខាង។</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">សូមទុកឧបករណ៍ទាំងពីរនៅជិតគ្នា។ កុំបិទឧបករណ៍ណាមួយ ហើយបើកកម្មវិធី Molly ។ ការផ្ទេរគឺមានកូដនីយកម្មសងខាង។</string>
     <string name="DeviceTransfer__d_messages_so_far">សារចំនួន %1$d</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">សារចំនួន %1$s%%</string>
@@ -4071,7 +4206,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">បញ្ជូនគណនី</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">ទាញយក Signal លើឧបករណ៍ Android ថ្មីរបស់អ្នក</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">ទាញយក Molly លើឧបករណ៍ Android ថ្មីរបស់អ្នក</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"ចុចលើពាក្យ \"ផ្ទេរចេញ​ ឬស្ដារគណនីមកវិញ\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4145,7 +4280,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">អ្នកដែលមានតំណរភ្ជាប់នេះនឹងអាចមើលឃើញឈ្មោះក្រុម រូបថត និងស្មើសុំចូលក្រុមបាន។ សូមចែករំលែកតែជាមួយអ្នកដែលទុកចិត្ត។</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">អ្នកដែលមានតំណរភ្ជាប់នេះនឹងអាចមើលឃើញឈ្មោះក្រុម រូបថត និងចូលក្រុមបាន។ សូមចែករំលែកតែជាមួយអ្នកដែលទុកចិត្ត។</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">ចែករំលែកតាមរយៈ Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">ចែករំលែកតាមរយៈ Molly</string>
     <string name="GroupLinkBottomSheet_copy">ចម្លង</string>
     <string name="GroupLinkBottomSheet_qr_code">កូដ QR</string>
     <string name="GroupLinkBottomSheet_share">ចែករំលែក</string>
@@ -4324,7 +4459,7 @@
     <string name="payment_info_card_about_mobilecoin">អំពី MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin គឺជារូបិយបណ្ណឌីជីថលថ្មីមួយដែលផ្តោតលើឯកជនភាព។</string>
     <string name="payment_info_card_adding_funds">បន្ថែមសាច់ប្រាក់</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">អ្នកអាចដាក់លុយដើម្បីប្រើនៅក្នុង Signal ដោយផ្ញើ MobileCoin ទៅកាន់អាសយដ្ឋានកាបូបរបស់អ្នក។</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">អ្នកអាចដាក់លុយដើម្បីប្រើនៅក្នុង Molly ដោយផ្ញើ MobileCoin ទៅកាន់អាសយដ្ឋានកាបូបរបស់អ្នក។</string>
     <string name="payment_info_card_cashing_out">ដកប្រាក់</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">អ្នកអាចដកប្រាក់ចេញ MobileCoin គ្រប់ពេលវេលានៅកន្លែងប្តូរប្រាក់ដែលគាំទ្រ MobileCoin ។ គ្រាន់តែធ្វើការផ្ទេរប្រាក់ទៅកាន់គណនីរបស់អ្នកនៅកន្លែងប្តូរប្រាក់នោះ។</string>
     <string name="payment_info_card_hide_this_card">លាក់កាតនេះ?</string>
@@ -4345,12 +4480,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">បិទដំណើរការ Wallet</string>
     <string name="DeactivateWalletFragment__your_balance">សមតុល្យរបស់អ្នក</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">អ្នកគួរតែផ្ទេរប្រាក់របស់អ្នកទៅកាន់អាសយដ្ឋានកាបូបមួយផ្សេងទៀត មុនពេលបិទដំណើរការការបង់ប្រាក់។ ប្រសិនបើអ្នកជ្រើសរើសមិនផ្ទេរប្រាក់របស់អ្នកឥឡូវនេះទេ ប្រាក់នោះនឹងនៅតែមាននៅក្នុងកាបូបរបស់អ្នកដែលបានភ្ជាប់ជាមួយ Signal ប្រសិនបើអ្នកសម្រេចឲ្យការបង់ប្រាក់បើកដំណើរការឡើងវិញ។</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">អ្នកគួរតែផ្ទេរប្រាក់របស់អ្នកទៅកាន់អាសយដ្ឋានកាបូបមួយផ្សេងទៀត មុនពេលបិទដំណើរការការបង់ប្រាក់។ ប្រសិនបើអ្នកជ្រើសរើសមិនផ្ទេរប្រាក់របស់អ្នកឥឡូវនេះទេ ប្រាក់នោះនឹងនៅតែមាននៅក្នុងកាបូបរបស់អ្នកដែលបានភ្ជាប់ជាមួយ Molly ប្រសិនបើអ្នកសម្រេចឲ្យការបង់ប្រាក់បើកដំណើរការឡើងវិញ។</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">ផ្ទេរសមតុល្យដែលនៅសល់</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">បិទដំណើរការដោយមិនចាំបាច់ផ្ទេរ</string>
     <string name="DeactivateWalletFragment__deactivate">បិទ</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">បិទដំណើរការដោយមិនចាំបាច់ផ្ទេរ?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">សមតុល្យរបស់អ្នកនឹងនៅតែមាននៅក្នុងកាបូបរបស់អ្នកដែលបានភ្ជាប់ជាមួយ Signal ប្រសិនបើអ្នកសម្រេចឲ្យការបង់ប្រាក់បើកដំណើរការឡើងវិញ។</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">សមតុល្យរបស់អ្នកនឹងនៅតែមាននៅក្នុងកាបូបរបស់អ្នកដែលបានភ្ជាប់ជាមួយ Molly ប្រសិនបើអ្នកសម្រេចឲ្យការបង់ប្រាក់បើកដំណើរការឡើងវិញ។</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">មានបញ្ហាក្នុងការបិទកាបូបលុយ</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4643,7 +4778,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">អាជ្ញាបណ្ណ</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">លក្ខខណ្ឌ &amp; គោលនយោបាយឯកជនភាព</string>
-    <string name="HelpFragment__copyright_signal_messenger">កម្មសិទ្ធបញ្ញា Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">កម្មសិទ្ធបញ្ញា Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">មានអាជ្ញាបណ្ណក្រោម GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4658,7 +4793,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">ស្វ័យប្រវត្តិ</string>
+    <string name="ChatColorSelectionFragment__auto">អូតូ</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">ប្រើពណ៌បង្កើតខ្លួនឯង</string>
     <string name="ChatColorSelectionFragment__chat_color">ពណ៌ការជជែក</string>
     <string name="ChatColorSelectionFragment__edit">កែប្រែ</string>
@@ -4881,9 +5016,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">ជ្រើសរើសពណ៌មួយ</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">ចែករំលែក</string>
 
@@ -4913,7 +5045,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">មានតែអ្នកគ្រប់គ្រងប៉ុណ្ណោះទើបអាចផ្ញើសារទៅក្រុមនេះបាន។</string>
-    <string name="MultiselectForwardFragment__limit_reached">ដែនកំណត់ការចែកចាយ</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">អ្នកមិនអាចជ្រើសរើសការជជែកលើសពី 5 ទេ</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5088,9 +5221,9 @@
     <string name="MySupportPreference__learn_more">ស្វែងយល់បន្ថែម</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">ដំឡើង Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">ដំឡើង Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">កំណែ Signal នេះបានផុតកំណត់ហើយ។ ដំឡើងកំណែឥឡូវនេះដើម្បីបន្តប្រើប្រាស់ Signal។</string>
+    <string name="UpdateSignalExpiredDialog__message">កំណែ Molly នេះបានផុតកំណត់ហើយ។ ដំឡើងកំណែឥឡូវនេះដើម្បីបន្តប្រើប្រាស់ Molly។</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">បច្ចុប្បន្នភាព</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5099,7 +5232,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">ឧបករណ៍មិនបានចុះឈ្មោះទេ</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">លែងចុះឈ្មោះឧបករណ៍នេះទៀតហើយ។ ចុះឈ្មោះឡើងវិញដើម្បីបន្តប្រើប្រាស់ Signal នៅលើឧបករណ៍នេះ។</string>
+    <string name="ReregisterSignalDialog__message">លែងចុះឈ្មោះឧបករណ៍នេះទៀតហើយ។ ចុះឈ្មោះឡើងវិញដើម្បីបន្តប្រើប្រាស់ Molly នៅលើឧបករណ៍នេះ។</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">ចុះឈ្មោះម្តងទៀត</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5393,7 +5526,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">បរាជ័យក្នុងការបើកសារ</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">ដើម្បីបើកការជូនដំណឹង Signal ត្រូវការការអនុញ្ញាតដើម្បីបង្ហាញពួកវា។</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">ដើម្បីបើកការជូនដំណឹង Molly ត្រូវការការអនុញ្ញាតដើម្បីបង្ហាញពួកវា។</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">បើក</string>
 
@@ -5539,8 +5672,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">មិនទាន់មានការឆ្លើយតបទេ</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">អ្នកមិនអាចឆ្លើយតបទៅនឹងរឿងរ៉ាវនេះទេ ដោយសារអ្នកលែងជាសមាជិកនៃក្រុមនេះទៀតហើយ។</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">បានប្រតិកម្មនឹងរឿងរ៉ាវ</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">បានប្រតិកម្មនឹងរឿងរ៉ាវ</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">បានប្រតិកម្មនឹងរឿងរ៉ាវ</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">ចំនួនមើល</string>
     <!-- Label for story replies tab -->
@@ -6140,8 +6275,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">ជ្រើសរើសធនាគាររបស់អ្នក</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">បញ្ជាក់ការបរិច្ចាគរបស់អ្នកជាមួយ %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">ដើម្បីរៀបចំសម្រាប់ការបរិច្ចាគជាថ្មីទៀតរបស់អ្នក សូមចុច បន្ត ដើម្បីបញ្ជាក់ការគិតប្រាក់ €0,01 ជាមួយធនាគាររបស់អ្នក។ វានឹងត្រូវបានបង្វិលសងវិញដោយស្វ័យប្រវត្តិ ហើយអនុញ្ញាតឱ្យមានការដកប្រាក់ពីគណនីរបស់អ្នក សម្រាប់ការបរិច្ចាគ €5/ខែរបស់អ្នក។</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">ដើម្បីរៀបចំសម្រាប់ការបរិច្ចាគជាថ្មីទៀតរបស់អ្នក សូមចុច បន្ត ដើម្បីបញ្ជាក់ការគិតប្រាក់ €0,01 ជាមួយធនាគាររបស់អ្នក។ វានឹងត្រូវបានបង្វិលសងវិញដោយស្វ័យប្រវត្តិ ហើយអនុញ្ញាតឱ្យមានការដកប្រាក់ពីគណនីរបស់អ្នក សម្រាប់ការបរិច្ចាគ %1$s/ខែរបស់អ្នក។</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">បន្ត</string>
 
@@ -6710,6 +6845,50 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">កំពុងទាញយកទិន្នន័យបម្រុងទុក…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">ការបម្រុងទុកមេឌៀត្រូវបានបិទ</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="other">គម្រោងបម្រុងទុកមេឌៀ Signal របស់អ្នកត្រូវបានបោះបង់ ដោយសារយើងមិនអាចដំណើរការការបង់ប្រាក់របស់អ្នកបានទេ។ អ្នកមានរយៈពេល %1$d ថ្ងៃដើម្បីទាញយកមេឌៀណាមួយដែលបានរក្សាទុកនៅក្នុងការបម្រុងទុករបស់អ្នក។ បន្ទាប់ពីរយៈពេល %1$d ថ្ងៃ មេឌៀនៅក្នុងការបម្រុងទុករបស់អ្នកនឹងត្រូវបានលុបចោល។</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">អ្នកអាចចាប់ផ្តើមបង់ប្រាក់សម្រាប់ការបម្រុងទុកម្តងទៀតនៅពេលណាក៏បាន ដើម្បីបន្តការបម្រុងទុកមេឌៀរបស់អ្នកទាំងអស់។ </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">មេឌៀរបស់អ្នកនឹងត្រូវបានលុបចោលនៅថ្ងៃនេះ</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">គម្រោងបម្រុងទុកមេឌៀ Signal របស់អ្នកត្រូវបានលុបចោល ដោយសារយើងមិនអាចដំណើរការការបង់ប្រាក់របស់អ្នកបាន។ នេះជាឱកាសចុងក្រោយរបស់អ្នកក្នុងការទាញយកមេឌៀនៅក្នុងការបម្រុងទុករបស់អ្នក មុនពេលវាត្រូវបានលុបចោល។</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">មិនអាចបញ្ចប់ការទាញយកបានទេ</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">ឧបករណ៍របស់អ្នកមិនមានទំហំផ្ទុកគ្រប់គ្រាន់ទេ។ បង្កើនទំហំផ្ទុករហូតដល់ %1$s ដើម្បីទាញយកមេឌៀដែលបានរក្សាទុកនៅក្នុងការបម្រុងទុករបស់អ្នក។</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="other">ប្រសិនបើអ្នកជ្រើសរើស \"រំលង\" នោះមេឌៀនៅក្នុងការបម្រុងទុករបស់អ្នកនឹងត្រូវបានលុបក្នុងរយៈពេល %1$d ថ្ងៃ។</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">មិនអាចដំណើរការការបង់ប្រាក់លើការបម្រុងទុកបានទេ</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">យើងកំពុងមានបញ្ហាក្នុងការប្រមូលការបង់ប្រាក់ឡើងវិញប្រចាំខែសម្រាប់ការបម្រុងទុករបស់អ្នក។ ត្រូវប្រាកដថាវិធីបង់ប្រាក់របស់អ្នកជាវិធីបង់ប្រាក់ទាន់សម័យ។ ប្រសិនបើវាមិនទាន់សម័យទេ សូមធ្វើបច្ចុប្បន្នភាពវានៅក្នុង Google Pay។ Signal នឹងព្យាយាមដំណើរការការបង់ប្រាក់ម្តងទៀតក្នុងរយៈពេលពីរបីថ្ងៃទៀត។</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">មិនអាចបញ្ចប់ការបម្រុងទុកបានទេ</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">ឧបករណ៍របស់អ្នកមិនបានបញ្ចប់ការបម្រុងទុករយៈពេល %1$d ថ្ងៃ។ ត្រូវប្រាកដថាឧបករណ៍របស់អ្នកបានភ្ជាប់ Wi-Fi រួចចុច \"បម្រុងទុកឥឡូវនេះ\"។ </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">ស្វែងយល់បន្ថែម</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">រំលង</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">ទាញយកមេឌៀឥឡូវនេះ</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">ទាញយកនៅពេលក្រោយ</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">កុំទាញយកមេឌៀ</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">បង្កើនទំហំផ្ទុក %1$s ដើម្បីទាញយកមេឌៀរបស់អ្នក។</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">កាតឥណទាន ឬឥណពន្ធ</string>
@@ -6723,6 +6902,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">មិនស្គាល់</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">ប្រវត្តិបង់ប្រាក់</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">ការបម្រុងទុកចុងក្រោយរបស់អ្នកត្រូវបានធ្វើឡើងនៅ %1$s ម៉ោង %2$s។</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6733,6 +6918,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">សារនៅមុនពេលវេលាដែលបានជ្រើសរើសនឹងត្រូវបានលុបជាអចិន្ត្រៃយ៍។</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">សារដែលលើសពីប្រវែងដែលបានជ្រើសរើសនឹងត្រូវបានលុបជាអចិន្ត្រៃយ៍។</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">អនុវត្តដែនកំណត់ចំពោះឧបករណ៍ដែលបានភ្ជាប់</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">នៅពេលបើក ដែនកំណត់នៃចំនួនសារជជែកក៏នឹងលុបសារពីឧបករណ៍ដែលបានភ្ជាប់របស់អ្នកដែរ។</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">ឥឡូវនេះការលុបត្រូវបានធ្វើសមកាលកម្មនៅលើឧបករណ៍របស់អ្នកទាំងអស់</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">នៅពេលអ្នកលុបសារ ឬការជជែក ពួកវានឹងត្រូវបានលុបចេញពីទូរសព្ទរបស់អ្នក និងឧបករណ៍ដែលបានភ្ជាប់។</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">យល់ព្រម</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">ប្រវត្តិបង់ប្រាក់</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">ការបម្រុងទុកមេឌៀទាំងអស់ និងអត្ថបទ</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">ព័ត៌មានលម្អិតអំពីការបង់ប្រាក់</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">ប្រភេទបម្រុងទុក</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">កាលបរិច្ឆេទបង់ប្រាក់</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">ចែករំលែក</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">ការបម្រុងទុក Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">ប្រវត្តិការទូទាត់</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">ព័ត៌មានលម្អិតអំពីការបម្រុងទុក</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">ទំហំបម្រុងទុក</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">ភាពញឹកញាប់នៃការបម្រុងទុក</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">បម្រុងទុកដោយប្រើអ៊ីនធឺណិតទូរសព្ទ</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">បិទ និងលុបការបម្រុងទុក</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">ការបម្រុងទុកត្រូវបានលុប និងបិទ។</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">ប្រភេទបម្រុងទុកបានផ្លាស់ប្តូរ ហើយការជាវត្រូវបានបោះបង់</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">ការជាវត្រូវបានបោះបង់</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">ការទាញយកបានបញ្ចប់</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">ប្រភេទបម្រុងទុក</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">ការបម្រុងទុកត្រូវបានបិទ</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/ខែ</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">បើកការបម្រុងទុក</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">ការបម្រុងទុកចុងក្រោយ</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s ម៉ោង %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">មិនធ្លាប់</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">បម្រុងទុកឥឡូវនេះ</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">បិទ និងលុបការបម្រុងទុកឬ?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">អ្នកនឹងមិនត្រូវបានគិតប្រាក់ម្តងទៀតទេ។ ការបម្រុងទុករបស់អ្នកនឹងត្រូវបានលុប ហើយគ្មានការបម្រុងទុកថ្មីនឹងត្រូវបានបង្កើតឡើងទេ។</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">បិទ និងលុប</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">កំពុងលុបការបម្រុងទុក…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">បានលុបការបម្រុងទុក</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"ដោយចុចបម្រុងទុកឥឡូវនេះ"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">រាល់ថ្ងៃ</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">រាល់សប្តាហ៍</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">រាល់ខែ</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">បម្រុងទុកដោយដៃ</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">សូមបញ្ចូលលេខកូដសម្ងាត់ ពាក្យសម្ងាត់ ឬលំនាំឧបករណ៍របស់អ្នក។</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">បន្ទាប់</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">ផ្លាស់ប្តូរប្រភេទបម្រុងទុក</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">បោះបង់ការជាវ</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">បញ្ជាក់ការបោះបង់</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">អ្នកនឹងមិនត្រូវបានគិតប្រាក់ម្តងទៀតទេ។ ការបម្រុងទុកនឹងត្រូវបានបិទនៅចុងបញ្ចប់នៃវដ្តវិក្កយបត្ររបស់អ្នក។ បន្ទាប់ពីកាលបរិច្ឆេទនោះ អ្នកនឹងមានរយៈពេល 30 ថ្ងៃដើម្បីទាញយកមេឌៀដែលអ្នកកំពុងបម្រុងទុកបច្ចុប្បន្ន។</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">បញ្ជាក់ និងទាញយកឥឡូវនេះ</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">បញ្ជាក់ និងទាញយកនៅពេលក្រោយ</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">រក្សាការជាវ</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index 6b41d8badc..f09360e08d 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal ನವೀಕರಣಗೊಳ್ಳುತ್ತಿದೆ…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly ನವೀಕರಣಗೊಳ್ಳುತ್ತಿದೆ…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">ನೀವು ಇನ್ನೂ ಪಾಸ್‌ಫ್ರೇಸ್ ಹೊಂದಿಸಿಲ್ಲ!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">ಪಾಸ್‌ಫ್ರೇಸ್‌ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದೇ?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">ಇದು Signal ಮತ್ತು ಸಂದೇಶ ಅಧಿಸೂಚನೆಗಳನ್ನು ಶಾಶ್ವತವಾಗಿ ಅನ್ಲಾಕ್ ಮಾಡುತ್ತದೆ.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">ಇದು Molly ಮತ್ತು ಸಂದೇಶ ಅಧಿಸೂಚನೆಗಳನ್ನು ಶಾಶ್ವತವಾಗಿ ಅನ್ಲಾಕ್ ಮಾಡುತ್ತದೆ.</string>
     <string name="ApplicationPreferencesActivity_disable">ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">ಸರ್ವರ್‌ ಗೆ ಸಂಪರ್ಕಿಸುವಾಗ ದೋಷ!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">ನೋಂದಣಿ ಲಾಕ್ ಆಗಿಸಲು PINಗಳು ಬೇಕು. PINಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು, ದಯವಿಟ್ಟು ಮೊದಲು ನೋಂದಣಿ ಲಾಕ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">ಫೈಲ್</string>
     <string name="AttachmentKeyboard_contact">ಸಂಪರ್ಕ</string>
     <string name="AttachmentKeyboard_location">ಸ್ಥಳ</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">ನಿಮ್ಮ ಫೊಟೋ ಮತ್ತು ವೀಡಿಯೊಗಳನ್ನು ತೋರಿಸಲು Signal ಗೆ ಅನುಮತಿಯ ಅಗತ್ಯವಿದೆ</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">ನಿಮ್ಮ ಫೊಟೋ ಮತ್ತು ವೀಡಿಯೊಗಳನ್ನು ತೋರಿಸಲು Molly ಗೆ ಅನುಮತಿಯ ಅಗತ್ಯವಿದೆ</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">ಪ್ರವೇಶ ಅನುಮತಿಸಿ</string>
     <string name="AttachmentKeyboard_payment">ಪೇಮೆಂಟ್</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">ಈ ಮೀಡಿಯಾ ತೆರೆಯಲು ಸಾಮರ್ಥ್ಯವಿರುವ ಅಪ್ಲಿಕೇಶನ್ ಹುಡುಕಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">ಫೋಟೊಗಳು, ವೀಡಿಯೋಗಳು ಅಥವಾ ಆಡಿಯೋಗಳನ್ನು ಲಗತ್ತಿಸಲು Signal ಗೆ ಸ್ಟೋರೇಜ್ ಅನುಮತಿಯ ಅಗತ್ಯವಿರುತ್ತದೆ, ಆದರೆ ಅದನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್ಸ್ ಮೆನುಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ ಮತ್ತು \"ಸ್ಟೋರೇಜ್\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">ಸಂಪರ್ಕ ಮಾಹಿತಿಯನ್ನು ಲಗತ್ತಿಸಲು Signal ಸಂಪರ್ಕಗಳ ಅನುಮತಿ ಅಗತ್ಯವಿರುತ್ತದೆ, ಆದರೆ ಅದನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಅಪ್ಲಿಕೇಶನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಮೆನುಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆಮಾಡಿ ಮತ್ತು \"ಸಂಪರ್ಕಗಳು\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಲಗತ್ತಿಸಲು Signal ಗೆ ಸ್ಥಳ ಅನುಮತಿಯ ಅಗತ್ಯವಿರುತ್ತದೆ, ಆದರೆ ಅದನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಮೆನುಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆಮಾಡಿ ಮತ್ತು \"ಸ್ಥಳ\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">ಫೋಟೊಗಳು, ವೀಡಿಯೋಗಳು ಅಥವಾ ಆಡಿಯೋಗಳನ್ನು ಲಗತ್ತಿಸಲು Molly ಗೆ ಸ್ಟೋರೇಜ್ ಅನುಮತಿಯ ಅಗತ್ಯವಿರುತ್ತದೆ, ಆದರೆ ಅದನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್ಸ್ ಮೆನುಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ ಮತ್ತು \"ಸ್ಟೋರೇಜ್\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">ಸಂಪರ್ಕ ಮಾಹಿತಿಯನ್ನು ಲಗತ್ತಿಸಲು Molly ಸಂಪರ್ಕಗಳ ಅನುಮತಿ ಅಗತ್ಯವಿರುತ್ತದೆ, ಆದರೆ ಅದನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಅಪ್ಲಿಕೇಶನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಮೆನುಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆಮಾಡಿ ಮತ್ತು \"ಸಂಪರ್ಕಗಳು\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಲಗತ್ತಿಸಲು Molly ಗೆ ಸ್ಥಳ ಅನುಮತಿಯ ಅಗತ್ಯವಿರುತ್ತದೆ, ಆದರೆ ಅದನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಮೆನುಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆಮಾಡಿ ಮತ್ತು \"ಸ್ಥಳ\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">ನಿಮ್ಮ ಲೊಕೇಶನ್‍ಗೆ ಆಕ್ಸೆಸ್ ಅನುಮತಿಸಿ</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">ನಿಮ್ಮ ಲೊಕೇಶನ್‍ ಕಳುಹಿಸಲು:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">ನಿಮ್ಮ ಲೊಕೇಶನ್ ಕಳುಹಿಸಲು Signal ಗೆ ಆಕ್ಸೆಸ್‍ ಅನ್ನು ಅನುಮತಿಸಿ.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">ನಿಮ್ಮ ಲೊಕೇಶನ್ ಕಳುಹಿಸಲು Molly ಗೆ ಆಕ್ಸೆಸ್‍ ಅನ್ನು ಅನುಮತಿಸಿ.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">ನಿಮ್ಮ ಲೊಕೇಶನ್ ಕಳುಹಿಸಲು Signal ಗೆ ಲೊಕೇಶನ್ ಆಕ್ಸೆಸ್ ಅಗತ್ಯವಿದೆ.</string>
+    <string name="AttachmentManager_signal_needs_location_access">ನಿಮ್ಮ ಲೊಕೇಶನ್ ಕಳುಹಿಸಲು Molly ಗೆ ಲೊಕೇಶನ್ ಆಕ್ಸೆಸ್ ಅಗತ್ಯವಿದೆ.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">ಸ್ಟೊರೇಜ್‌ಗೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸಿ</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">ಫೊಟೋ ಮತ್ತು ವೀಡಿಯೊಗಳನ್ನು ತೋರಿಸಲು:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">ನಿಮ್ಮ ಫೊಟೋ ಮತ್ತು ವೀಡಿಯೊಗಳನ್ನು ತೋರಿಸಲು Signal ಗೆ ಸ್ಟೊರೇಜ್‌ ನ ಆಕ್ಸೆಸ್‍ ಅಗತ್ಯವಿದೆ.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">ನಿಮ್ಮ ಫೊಟೋ ಮತ್ತು ವೀಡಿಯೊಗಳನ್ನು ತೋರಿಸಲು Molly ಗೆ ಸ್ಟೊರೇಜ್‌ ನ ಆಕ್ಸೆಸ್‍ ಅಗತ್ಯವಿದೆ.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s ಅವರು ಪಾವತಿಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿಲ್ಲ </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">ಕ್ಯಾಮರಾ ಬದಲಾಯಿಸಿ</string>
     <string name="CameraXFragment_open_gallery_description">ಗ್ಯಾಲರಿ ತೆರೆಯಿರಿ</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">ಪ್ರವೇಶ ಅನುಮತಿಸಿ</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">ನಿಮ್ಮ ಕ್ಯಾಮರಾ ಮತ್ತು ಮೈಕ್ರೋಫೋನ್‌ಗೆ ಆ್ಯಕ್ಸೆಸ್ ಅನುಮತಿಸಿ</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">ನಿಮ್ಮ ಕ್ಯಾಮರಾಕ್ಕೆ ಆ್ಯಕ್ಸೆಸ್ ಅನುಮತಿಸಿ</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">ನಿಮ್ಮ ಮೈಕ್ರೋಫೋನ್‌ಗೆ ಆಕ್ಸೆಸ್‍ ಅನ್ನು ಅನುಮತಿಸಿ</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">ಫೋಟೋಗಳನ್ನು ಸೆರೆಹಿಡಿಯಲು, Signal ಗೆ ಕ್ಯಾಮರಾ ಆ್ಯಕ್ಸೆಸ್ ಅನುಮತಿಸಿ.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">ಫೋಟೋಗಳನ್ನು ಮತ್ತು ವಿಡಿಯೊ ಸೆರೆಹಿಡಿಯಲು, Signal ಗೆ ಕ್ಯಾಮರಾ ಪ್ರವೇಶ ಅನುಮತಿಸಿ.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">ಫೋಟೋಗಳು ಮತ್ತು ವೀಡಿಯೊವನ್ನು ಸೆರೆಹಿಡಿಯಲು, Signal ಗೆ ಕ್ಯಾಮರಾ ಮತ್ತು ಮೈಕ್ರೋಫೋನ್ ಆ್ಯಕ್ಸೆಸ್ ಅನುಮತಿಸಿ.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">ಶಬ್ದದೊಂದಿಗೆ ವೀಡಿಯೊಗಳನ್ನು ಸೆರೆಹಿಡಿಯಲು, Signal ಗೆ ನಿಮ್ಮ ಮೈಕ್ರೋಫೋನ್ ಆ್ಯಕ್ಸೆಸ್ ಅನುಮತಿಸಿ.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">QR ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಲು, Signal ಗೆ ಕ್ಯಾಮರಾ ಆ್ಯಕ್ಸೆಸ್ ಅನುಮತಿಸಿ.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">ಫೋಟೋಗಳನ್ನು ಸೆರೆಹಿಡಿಯಲು Signal ಗೆ ಕ್ಯಾಮರಾ ಆ್ಯಕ್ಸೆಸ್ ಅಗತ್ಯವಿದೆ</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">QR ಕೋಡ್‌ಗಳನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಲು Signal ಗೆ ಕ್ಯಾಮರಾ ಆ್ಯಕ್ಸೆಸ್ ಅಗತ್ಯವಿದೆ</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">ವೀಡಿಯೊವನ್ನು ಸೆರೆಹಿಡಿಯಲು Signal ಗೆ ಮೈಕ್ರೋಫೋನ್ ಆ್ಯಕ್ಸೆಸ್ ಅಗತ್ಯವಿದೆ</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Signal ನಲ್ಲಿ ಫೋಟೋಗಳನ್ನು ಸೆರೆಹಿಡಿಯಲು:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Signal ನಲ್ಲಿ ಫೋಟೋಗಳು ಮತ್ತು ವೀಡಿಯೊಗಳನ್ನು ಸೆರೆಹಿಡಿಯಲು:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">ಶಬ್ದದೊಂದಿಗೆ ವೀಡಿಯೊಗಳನ್ನು ಸೆರೆಹಿಡಿಯಲು:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR ಕೋಡ್‌ಗಳನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಲು:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">ಇತ್ತೀಚಿನ ಸಂಪರ್ಕಗಳು</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Signal ಸಂಪರ್ಕಗಳಿಲ್ಲ</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Signal ಸಂಪರ್ಕಗಳಿಗೆ ಫೋಟೋಗಳನ್ನು ಕಳುಹಿಸಲು ನೀವು ಕ್ಯಾಮರಾ ಬಟನ್ ಅನ್ನು ಮಾತ್ರ ಬಳಸಬಹುದು. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">ನೀವು ಹುಡುಕುತ್ತಿರುವುದನ್ನು ಕಂಡುಹಿಡಿಯಲಾಗುತ್ತಿಲ್ಲವೇ?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Signal ಗೆ ಸೇರಲು ಸಂಪರ್ಕವನ್ನು ಆಹ್ವಾನಿಸಿ</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Molly ಗೆ ಸೇರಲು ಸಂಪರ್ಕವನ್ನು ಆಹ್ವಾನಿಸಿ</string>
     <string name="CameraContacts__menu_search">ಹುಡುಕಿ</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">ಇಲ್ಲ, ಧನ್ಯವಾದಗಳು</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Signal ಅನ್ನು ನವೀಕರಿಸಿ</string>
+    <string name="ClientDeprecatedActivity_update_signal">Molly ಅನ್ನು ನವೀಕರಿಸಿ</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">ಅಪ್ಲಿಕೇಶನ್‌ನ ಈ ಆವೃತ್ತಿಯನ್ನು ಇನ್ನು ಮುಂದೆ ಬೆಂಬಲಿಸುವುದಿಲ್ಲ. ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸುವುದು ಮತ್ತು ಸ್ವೀಕರಿಸುವುದನ್ನು ಮುಂದುವರಿಸಲು, ನೂತನ ಆವೃತ್ತಿಗೆ ನವೀಕರಿಸಿ.</string>
     <string name="ClientDeprecatedActivity_update">ನವೀಕರಿಸಿ</string>
     <string name="ClientDeprecatedActivity_dont_update">ಇದನ್ನು ನವೀಕರಿಸಬೇಡಿ</string>
     <string name="ClientDeprecatedActivity_warning">ಎಚ್ಚರಿಕೆ</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">ನಿಮ್ಮ Signal ಆವೃತ್ತಿಯ ವಾಯಿದೆ ಮುಗಿದಿದೆ. ನೀವು ನಿಮ್ಮ ಹಳೆಯ ಸಂದೇಶಗಳನ್ನು ನೋಡಬಹುದು ಆದರೆ ಹೊಸ ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಲು ಅಥವಾ ಪಡೆಯಲು ದಯವಿಟ್ಟು ನವೀಕರಿಸಿ.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">ನಿಮ್ಮ Molly ಆವೃತ್ತಿಯ ವಾಯಿದೆ ಮುಗಿದಿದೆ. ನೀವು ನಿಮ್ಮ ಹಳೆಯ ಸಂದೇಶಗಳನ್ನು ನೋಡಬಹುದು ಆದರೆ ಹೊಸ ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಲು ಅಥವಾ ಪಡೆಯಲು ದಯವಿಟ್ಟು ನವೀಕರಿಸಿ.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">ಯಾವುದೇ ವೆಬ್ ಬ್ರೌಸರ್ ಕಂಡುಬಂದಿಲ್ಲ.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">ಸಂದೇಶ %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly ಧ್ವನಿ ಕರೆ %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly ವೀಡಿಯೊ ಕರೆ %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal ಸಂದೇಶ</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">ಸಂದೇಶ ಕಳುಹಿಸಿ</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Signal %1$s ಗೆ ಬದಲಾಯಿಸೋಣ</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Molly %1$s ಗೆ ಬದಲಾಯಿಸೋಣ</string>
     <string name="ConversationActivity_specify_recipient">ದಯವಿಟ್ಟು ಒಂದು ಸಂಪರ್ಕವನ್ನು ಆರಿಸಿಕೊಳ್ಳಿ</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">ನೀವು ಕಳುಹಿಸುತ್ತಿರುವ ಲಗತ್ತು ಸಂದೇಶದ ವಿಧವು ಗಾತ್ರದ ಮಿತಿಗಳನ್ನು ಮೀರಿದೆ.</string>
     <string name="ConversationActivity_unable_to_record_audio">ಆಡಿಯೋ ರೆಕಾರ್ಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">ಆಡಿಯೊ ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಲು:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">ಧ್ವನಿ ಮೆಸೇಜ್‌ಗಳನ್ನು ಕಳುಹಿಸಲು, ನಿಮ್ಮ ಮೈಕ್ರೋಫೋನ್‌ಗೆ Signal ಆಕ್ಸೆಸ್‍ ಅನ್ನು ಅನುಮತಿಸಿ.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">ಧ್ವನಿ ಮೆಸೇಜ್‌ಗಳನ್ನು ಕಳುಹಿಸಲು, ನಿಮ್ಮ ಮೈಕ್ರೋಫೋನ್‌ಗೆ Molly ಆಕ್ಸೆಸ್‍ ಅನ್ನು ಅನುಮತಿಸಿ.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">ಧ್ವನಿ ಮೆಸೇಜ್ ಅನ್ನು ರೆಕಾರ್ಡ್ ಮಾಡಲು Signal ಗೆ ಮೈಕ್ರೊಫೋನ್ ಆಕ್ಸೆಸ್‍ನ ಅಗತ್ಯವಿದೆ.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">ಆಡಿಯೊ ಸಂದೇಶ ಕಳುಹಿಸುವ ಸಲುವಾಗಿ Signal ಗೆ ಮೈಕ್ರೊಫೋನ್ ಅನುಮತಿ ಅಗತ್ಯವಿದೆ, ಆದರೆ ಅದನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಅಪ್ಲಿಕೇಶನ್ ಸಂಯೋಜನೆಗೆ ಮುಂದುವರಿಸಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ, ಮತ್ತು \"ಮೈಕ್ರೊಫೋನ್\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">ಧ್ವನಿ ಮೆಸೇಜ್ ಅನ್ನು ರೆಕಾರ್ಡ್ ಮಾಡಲು Molly ಗೆ ಮೈಕ್ರೊಫೋನ್ ಆಕ್ಸೆಸ್‍ನ ಅಗತ್ಯವಿದೆ.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">ಆಡಿಯೊ ಸಂದೇಶ ಕಳುಹಿಸುವ ಸಲುವಾಗಿ Molly ಗೆ ಮೈಕ್ರೊಫೋನ್ ಅನುಮತಿ ಅಗತ್ಯವಿದೆ, ಆದರೆ ಅದನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಅಪ್ಲಿಕೇಶನ್ ಸಂಯೋಜನೆಗೆ ಮುಂದುವರಿಸಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ, ಮತ್ತು \"ಮೈಕ್ರೊಫೋನ್\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s ಗೆ ಕರೆ ಮಾಡಲು Signal ಗೆ ಮೈಕ್ರೊಫೋನ್ ಹಾಗೂ ಕ್ಯಾಮರಾ ಅನುಮತಿಗಳು ಅಗತ್ಯವಿರುತ್ತವೆ, ಆದರೆ ಅವುಗಳನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್‌ ಗಳಿಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ, ಮತ್ತು \"ಮೈಕ್ರೊಫೋನ್\" ಮತ್ತು \"ಕ್ಯಾಮೆರಾ\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">ಫೋಟೋಗಳನ್ನು ಮತ್ತು ವಿಡಿಯೊ ಸೆರೆಹಿಡಿಯಲು, Signal ಗೆ ಕ್ಯಾಮರಾ ಪ್ರವೇಶ ಅನುಮತಿಸಿ.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">ಫೋಟೊಗಳು ಅಥವಾ ವೀಡಿಯೊಗಳನ್ನು ತೆಗೆದುಕೊಳ್ಳಲು Signal ಗೆ ಕ್ಯಾಮೆರಾ ಅನುಮತಿಯ ಅಗತ್ಯವಿರುತ್ತದೆ, ಆದರೆ ಇದನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ ಮತ್ತು \"ಕ್ಯಾಮರಾ\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">ಫೋಟೋಗಳು ಅಥವಾ ವೀಡಿಯೊ ತೆಗೆದುಕೊಳ್ಳಲು Signal ಗೆ ಕ್ಯಾಮರಾ ಅನುಮತಿ ಅಗತ್ಯವಿದೆ</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s ಗೆ ಕರೆ ಮಾಡಲು Molly ಗೆ ಮೈಕ್ರೊಫೋನ್ ಹಾಗೂ ಕ್ಯಾಮರಾ ಅನುಮತಿಗಳು ಅಗತ್ಯವಿರುತ್ತವೆ, ಆದರೆ ಅವುಗಳನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್‌ ಗಳಿಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ, ಮತ್ತು \"ಮೈಕ್ರೊಫೋನ್\" ಮತ್ತು \"ಕ್ಯಾಮೆರಾ\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">ಫೋಟೋಗಳನ್ನು ಮತ್ತು ವಿಡಿಯೊ ಸೆರೆಹಿಡಿಯಲು, Molly ಗೆ ಕ್ಯಾಮರಾ ಪ್ರವೇಶ ಅನುಮತಿಸಿ.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">ಫೋಟೊಗಳು ಅಥವಾ ವೀಡಿಯೊಗಳನ್ನು ತೆಗೆದುಕೊಳ್ಳಲು Molly ಗೆ ಕ್ಯಾಮೆರಾ ಅನುಮತಿಯ ಅಗತ್ಯವಿರುತ್ತದೆ, ಆದರೆ ಇದನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ ಮತ್ತು \"ಕ್ಯಾಮರಾ\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">ಫೋಟೋಗಳು ಅಥವಾ ವೀಡಿಯೊ ತೆಗೆದುಕೊಳ್ಳಲು Molly ಗೆ ಕ್ಯಾಮರಾ ಅನುಮತಿ ಅಗತ್ಯವಿದೆ</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">ವೀಡಿಯೊಗಳನ್ನು ಧ್ವನಿಯೊಂದಿಗೆ ಸೆರೆಹಿಡಿಯಲು ಮೈಕ್ರೊಫೋನ್ ಅನುಮತಿ ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">ವೀಡಿಯೊಗಳನ್ನು ರೆಕಾರ್ಡ್ ಮಾಡಲು Signal ಗೆ ಮೈಕ್ರೋಫೋನ್ ಅನುಮತಿಗಳು ಅಗತ್ಯವಿರುತ್ತವೆ, ಆದರೆ ಅವುಗಳನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್‌ ಗಳಿಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ, ಮತ್ತು \"ಮೈಕ್ರೊಫೋನ್\" ಮತ್ತು \"ಕ್ಯಾಮರಾ\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">ವೀಡಿಯೊಗಳನ್ನು ರೆಕಾರ್ಡ್ ಮಾಡಲು Signal ಗೆ ಮೈಕ್ರೋಫೋನ್ ಅನುಮತಿಗಳು ಅಗತ್ಯವಿರುತ್ತವೆ.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">ವೀಡಿಯೊಗಳನ್ನು ರೆಕಾರ್ಡ್ ಮಾಡಲು Molly ಗೆ ಮೈಕ್ರೋಫೋನ್ ಅನುಮತಿಗಳು ಅಗತ್ಯವಿರುತ್ತವೆ, ಆದರೆ ಅವುಗಳನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್‌ ಗಳಿಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ, ಮತ್ತು \"ಮೈಕ್ರೊಫೋನ್\" ಮತ್ತು \"ಕ್ಯಾಮರಾ\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">ವೀಡಿಯೊಗಳನ್ನು ರೆಕಾರ್ಡ್ ಮಾಡಲು Molly ಗೆ ಮೈಕ್ರೋಫೋನ್ ಅನುಮತಿಗಳು ಅಗತ್ಯವಿರುತ್ತವೆ.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">ಇಲ್ಲ</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">ಕರೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲು:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">ಕರೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲು, ನಿಮ್ಮ ಮೈಕ್ರೋಫೋನ್‌ಗೆ Signal ಆಕ್ಸೆಸ್‍ ಅನ್ನು ಅನುಮತಿಸಿ.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">ಕರೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲು, ನಿಮ್ಮ ಮೈಕ್ರೋಫೋನ್‌ಗೆ Molly ಆಕ್ಸೆಸ್‍ ಅನ್ನು ಅನುಮತಿಸಿ.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">ಕರೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲು Signal ಗೆ ಮೈಕ್ರೊಫೋನ್ ಆಕ್ಸೆಸ್‍ನ ಅಗತ್ಯವಿದೆ.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">ಕರೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲು Molly ಗೆ ಮೈಕ್ರೊಫೋನ್ ಆಕ್ಸೆಸ್‍ನ ಅಗತ್ಯವಿದೆ.</string>
 
 
     <string name="ConversationActivity_join">ಸೇರು</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">SMS ಮೆಸೇಜಿಂಗ್ ಅನ್ನು Signal ಇನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ. ಇಲ್ಲಿ ಸಂಭಾಷಣೆಯನ್ನು ಉಳಿಸಿಕೊಳ್ಳಲು %1$s ಅವರನ್ನು Signal ಗೆ ಆಹ್ವಾನಿಸಿ.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">ಪ್ರಸ್ತುತವಾಗಿ ಈ ವ್ಯಕ್ತಿಯು Signal ಅನ್ನು ಬಳಸುತ್ತಿಲ್ಲ. ಸಂಭಾಷಣೆಯನ್ನು ಇಲ್ಲಿ ಶುರುಹಚ್ಚಿಕೊಳ್ಳಲು ಅವರನ್ನು Signal ಗೆ ಆಹ್ವಾನಿಸಿ.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">ಪ್ರಸ್ತುತವಾಗಿ ಈ ವ್ಯಕ್ತಿಯು Molly ಅನ್ನು ಬಳಸುತ್ತಿಲ್ಲ. ಸಂಭಾಷಣೆಯನ್ನು ಇಲ್ಲಿ ಶುರುಹಚ್ಚಿಕೊಳ್ಳಲು ಅವರನ್ನು Molly ಗೆ ಆಹ್ವಾನಿಸಿ.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Signal ಗೆ ಆಮಂತ್ರಿಸಿ</string>
+    <string name="ConversationActivity__invite_to_signal">Molly ಗೆ ಆಮಂತ್ರಿಸಿ</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">ಶೀಘ್ರದಲ್ಲೇ ನಿಮಗೆ ಮತ್ತೆ ನೆನೆಪಿಸಲಾಗುತ್ತದೆ.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">ಎಲ್ಲರಿಗೂ ಅಳಿಸಿ</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">ಈ ಡಿವೈಸ್‌ನಲ್ಲಿ ಅಳಿಸಿ</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">ಅಳಿಸಿ</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">ಎಲ್ಲಾ ಕಡೆ ಅಳಿಸಿ</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">ಅವರು Signal ನ ಇತ್ತೀಚಿನ ಆವೃತ್ತಿಯಲ್ಲಿದ್ದರೆ ಚಾಟ್‌ನಲ್ಲಿರುವ ಪ್ರತಿಯೊಬ್ಬರಿಗೂ ಈ ಮೆಸೇಜ್ ಅನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ. ನೀವು ಮೆಸೇಜ್ ಅನ್ನು ಅಳಿಸಿದ್ದೀರಿ ಎಂಬುದನ್ನು ಅವರು ನೋಡಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Signal ಅನ್ನು ನವೀಕರಿಸಿ</string>
+    <string name="ConversationFragment__update_build">Molly ಅನ್ನು ನವೀಕರಿಸಿ</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Signal ಅನ್ನು ಮರುನೋಂದಾಯಿಸಿ</string>
+    <string name="ConversationFragment__reregister_signal">Molly ಅನ್ನು ಮರುನೋಂದಾಯಿಸಿ</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">ಹಿಂದಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signal ತೆರೆಯಿರಿ</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Molly ತೆರೆಯಿರಿ</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">ಇನ್ನು ಮುಂದೆ ದೃಢೀಕೃತಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">ಇದು ಆಯ್ಕೆ ಮಾಡಿದ ಚಾಟ್ ಅನ್ನು ಶಾಶ್ವತವಾಗಿ ಅಳಿಸುತ್ತದೆ.</item>
         <item quantity="other">ಇದು ಆಯ್ಕೆ ಮಾಡಿದ ಎಲ್ಲಾ %1$d ಚಾಟ್‌ಗಳನ್ನು ಶಾಶ್ವತವಾಗಿ ಅಳಿಸುತ್ತದೆ.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">ಆಯ್ಕೆಮಾಡಿದ ಚಾಟ್ ಅನ್ನು ಇದು ನಿಮ್ಮ ಎಲ್ಲಾ ಸಾಧನಗಳಿಂದ ಶಾಶ್ವತವಾಗಿ ಅಳಿಸುತ್ತದೆ.</item>
+        <item quantity="other">ಆಯ್ಕೆಮಾಡಿದ ಎಲ್ಲಾ %1$d ಚಾಟ್‌ಗಳನ್ನು ಇದು ನಿಮ್ಮ ಸಾಧನಗಳಿಂದ ಶಾಶ್ವತವಾಗಿ ಅಳಿಸುತ್ತದೆ.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">ಅಳಿಸಲಾಗುತ್ತಿದೆ</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">ಆಯ್ಕೆಮಾಡಿದ ಚಾಟ್ ಅನ್ನು ಅಳಿಸುವುದು…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">ಸಂಖ್ಯೆಯ ಮೂಲಕ ನನ್ನನ್ನು ಯಾರು ನೋಡಬಹುದು?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">ನಿಮ್ಮ ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ಹೊಂದಿರುವ ಯಾರಾದರೂ ನೀವು Signal ‌ನಲ್ಲಿರುವುದನ್ನು ನೋಡುತ್ತಾರೆ ಮತ್ತು ನಿಮ್ಮೊಂದಿಗೆ ಚಾಟ್‌ಗಳನ್ನು ಪ್ರಾರಂಭಿಸಬಹುದು.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">ನಿಮ್ಮ ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ಹೊಂದಿರುವ ಯಾರಾದರೂ ನೀವು Molly ‌ನಲ್ಲಿರುವುದನ್ನು ನೋಡುತ್ತಾರೆ ಮತ್ತು ನಿಮ್ಮೊಂದಿಗೆ ಚಾಟ್‌ಗಳನ್ನು ಪ್ರಾರಂಭಿಸಬಹುದು.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">ನೀವು ಮೆಸೇಜ್ ಕಳುಹಿಸದ ಹೊರತು ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಚಾಟ್ ಅನ್ನು ಹೊಂದಿರದ ಹೊರತು ನೀವು Signal ‌ನಲ್ಲಿದ್ದೀರಿ ಎಂದು ಯಾರಿಗೂ ನೋಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">ನೀವು ಮೆಸೇಜ್ ಕಳುಹಿಸದ ಹೊರತು ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಚಾಟ್ ಅನ್ನು ಹೊಂದಿರದ ಹೊರತು ನೀವು Molly ‌ನಲ್ಲಿದ್ದೀರಿ ಎಂದು ಯಾರಿಗೂ ನೋಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">ಬ್ಯಾಕಪ್ ನಿಂದ ಮರುಸ್ಥಾಪಿಸುವುದೇ?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">ನಿಮ್ಮ ಬ್ಯಾಕಪ್ ಪಾಸ್‌ಫ್ರೇಸ್ ಅನ್ನು ಪರೀಕ್ಷಿಸಿ ಮತ್ತು ಇದು ಹೊಂದುತ್ತದೆಯೇ ಎಂದು ದೃಢೀಕರಿಸಿ</string>
     <string name="BackupsPreferenceFragment__turn_on">ಆನ್‌ ಮಾಡಿ</string>
     <string name="BackupsPreferenceFragment__turn_off">ಆಫ್ ಮಾಡಿ</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"ಬ್ಯಾಕಪ್ ಅನ್ನು ಮರುಸ್ಥಾಪಿಸಲು, Signal‌ನ ಹೊಸ ನಕಲನ್ನು ಸ್ಥಾಪಿಸಿ. ಅಪ್ಲಿಕೇಶನ್ ತೆರೆಯಿರಿ ಮತ್ತು \"ಬ್ಯಾಕಪ್ ಮರುಸ್ಥಾಪಿಸು\" ಟ್ಯಾಪ್ ಮಾಡಿ, ನಂತರ ಬ್ಯಾಕಪ್ ಫೈಲ್ ಅನ್ನು ಹುಡುಕಿ. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"ಬ್ಯಾಕಪ್ ಅನ್ನು ಮರುಸ್ಥಾಪಿಸಲು, Molly‌ನ ಹೊಸ ನಕಲನ್ನು ಸ್ಥಾಪಿಸಿ. ಅಪ್ಲಿಕೇಶನ್ ತೆರೆಯಿರಿ ಮತ್ತು \"ಬ್ಯಾಕಪ್ ಮರುಸ್ಥಾಪಿಸು\" ಟ್ಯಾಪ್ ಮಾಡಿ, ನಂತರ ಬ್ಯಾಕಪ್ ಫೈಲ್ ಅನ್ನು ಹುಡುಕಿ. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ</string>
     <string name="BackupsPreferenceFragment__in_progress">ಪ್ರಗತಿಯಲ್ಲಿದೆ…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">ಇಲ್ಲಿಯವರೆಗು %1$d…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% ಈ ತನಕ…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">ಬ್ಯಾಕಪ್ ಗಳನ್ನು ರಚಿಸಲು Signal ಗೆ ಬಾಹ್ಯ ಸ್ಟೋರೇಜ್ ಅನುಮತಿ ಅಗತ್ಯವಿರುತ್ತದೆ, ಆದರೆ ಅದನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್ಸ್ ಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ ಮತ್ತು \"ಸ್ಟೋರೇಜ್\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">ಬ್ಯಾಕಪ್ ಗಳನ್ನು ರಚಿಸಲು Molly ಗೆ ಬಾಹ್ಯ ಸ್ಟೋರೇಜ್ ಅನುಮತಿ ಅಗತ್ಯವಿರುತ್ತದೆ, ಆದರೆ ಅದನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್ಸ್ ಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ ಮತ್ತು \"ಸ್ಟೋರೇಜ್\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">ಬ್ಯಾಕಪ್ ಸಮಯವನ್ನು ಸೆಟ್ ಮಾಡಿ</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">ಚಾಟ್ ಸೆಷನ್ ರಿಫ್ರೆಶ್ ಮಾಡಲಾಗಿದೆ</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal ಎಂಡ್‌-ಟು-ಎಂಡ್‌ ಎನ್‌ಕ್ರಿಪ್ಷನ್ ಅನ್ನು ಬಳಸುತ್ತದೆ ಮತ್ತು ಕೆಲವು ಬಾರಿ ನಿಮ್ಮ ಚಾಟ್ ಸೆಷನ್‌ಗಳನ್ನು ರಿಫ್ರೆಶ್ ಮಾಡಬೇಕಾಗಬಹುದು. ಇದರಿಂದ ನಿಮ್ಮ ಚಾಟ್‌ನ ಭದ್ರತೆಗೆ ಯಾವುದೇ ಬಾಧೆಯಾಗುವುದಿಲ್ಲ. ಆದರೆ, ಈ ಸಂಪರ್ಕದಿಂದ ಒಂದು ಸಂದೇಶವನ್ನು ನೀವು ತಪ್ಪಿಸಿಕೊಂಡಿರಬಹುದು ಮತ್ತು ಪುನಃ ಕಳುಹಿಸುವಂತೆ ನೀವು ಅವರನ್ನು ಕೇಳಬಹುದು.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly ಎಂಡ್‌-ಟು-ಎಂಡ್‌ ಎನ್‌ಕ್ರಿಪ್ಷನ್ ಅನ್ನು ಬಳಸುತ್ತದೆ ಮತ್ತು ಕೆಲವು ಬಾರಿ ನಿಮ್ಮ ಚಾಟ್ ಸೆಷನ್‌ಗಳನ್ನು ರಿಫ್ರೆಶ್ ಮಾಡಬೇಕಾಗಬಹುದು. ಇದರಿಂದ ನಿಮ್ಮ ಚಾಟ್‌ನ ಭದ್ರತೆಗೆ ಯಾವುದೇ ಬಾಧೆಯಾಗುವುದಿಲ್ಲ. ಆದರೆ, ಈ ಸಂಪರ್ಕದಿಂದ ಒಂದು ಸಂದೇಶವನ್ನು ನೀವು ತಪ್ಪಿಸಿಕೊಂಡಿರಬಹುದು ಮತ್ತು ಪುನಃ ಕಳುಹಿಸುವಂತೆ ನೀವು ಅವರನ್ನು ಕೇಳಬಹುದು.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">ಡೆಸ್ಕ್‌ಟಾಪ್ ಅಥವಾ iPad ನಲ್ಲಿ Signal ಅನ್ನು ಬಳಸಿ. ನಿಮ್ಮ ಮೆಸೇಜ್‌ಗಳನ್ನು ನಿಮ್ಮ ಲಿಂಕ್ ಮಾಡಲಾದ ಸಾಧನಗಳಿಗೆ ಸಿಂಕ್ ಮಾಡಲಾಗುತ್ತದೆ.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">ಹೊಸ ಸಾಧನವನ್ನು ಲಿಂಕ್ ಮಾಡಿ</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s ಎಲ್ಲಾ ಸಾಧನಗಳಲ್ಲಿ ಎಂಡ್-ಟು-ಎಂಡ್ ಎನ್‌ಕ್ರಿಪ್ಶನ್ ಮೂಲಕ ಮೆಸೇಜ್‌ಗಳು ಮತ್ತು ಚಾಟ್ ಮಾಹಿತಿಯನ್ನು ರಕ್ಷಿಸಲಾಗಿದೆ</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">ಡೆಸ್ಕ್‌ಟಾಪ್ ಅಥವಾ iPad ನಲ್ಲಿ Signal</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">ಲಿಂಕ್ ಮಾಡಲಾದ ಸಾಧನಗಳಲ್ಲಿನ ಎಲ್ಲಾ ಮೆಸೇಜ್ ಮಾಡುವಿಕೆಯು ಖಾಸಗಿಯಾಗಿರುತ್ತದೆ</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Molly ಮೆಸೇಜ್‌ಗಳನ್ನು ಲಿಂಕ್ ಮಾಡಿದ ನಂತರ ನಿಮ್ಮ ಮೊಬೈಲ್ ಫೋನ್‌ನಲ್ಲಿ Molly ಜೊತೆಗೆ ಸಿಂಕ್ರೋನೈಸ್ ಮಾಡಲಾಗುತ್ತದೆ. ನಿಮ್ಮ ಹಿಂದಿನ ಮೆಸೇಜ್ ಇತಿಹಾಸ ಕಾಣಿಸುವುದಿಲ್ಲ.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">ನಿಮ್ಮ ಇತರ ಸಾಧನದಲ್ಲಿ, Molly ಅನ್ನು ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಲು %1$s ಗೆ ಭೇಟಿಕೊಡಿ</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">ನನ್ನ ಲಿಂಕ್ ಮಾಡಲಾದ ಸಾಧನಗಳು</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">ಅನ್‌ಲಿಂಕ್‌ ಮಾಡಿ</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s ಅನ್‌ಲಿಂಕ್ ಮಾಡಲಾಗಿದೆ</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">ಸಾಧನ ಲಿಂಕ್ ಮಾಡಲಾಗುತ್ತಿದೆ…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">ಸಾಧನ ಅನುಮೋದಿಸಲಾಗಿದೆ</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">ಲಿಂಕ್ ಮಾಡಲಾದ ಯಾವುದೇ ಸಾಧನಗಳಿಲ್ಲ</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">ಸಾಧನವನ್ನು ಲಿಂಕ್ ಮಾಡಲು ಅನ್‌ಲಾಕ್ ಮಾಡಿ</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">ಲಿಂಕ್ ಮಾಡುವುದಕ್ಕೆ ಸಾಧನದ ಮೇಲೆ ಪ್ರದರ್ಶಿಸಿದ QR ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">ಕ್ಯುಆರ್‌ ಕೋಡ್ ಅನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">ನೀವು ಲಿಂಕ್ ಮಾಡಲು ಬಯಸುವ ಸಾಧನದಲ್ಲಿ ಪ್ರದರ್ಶಿಸಲಾದ QR ಕೋಡ್ ಅನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಈ ಸಾಧನವನ್ನು ಬಳಸಿ</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">ಸರಿ</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">ಈ ಸಾಧನಕ್ಕೆ ನಿಮ್ಮ ಗುಂಪುಗಳನ್ನು ಮತ್ತು ಸಂಪರ್ಕಗಳನ್ನು ನೋಡಲು, ನಿಮ್ಮ ಚಾಟ್‌ಗಳನ್ನು ಪ್ರವೇಶಿಸಲು ಹಾಗೂ ನಿಮ್ಮ ಹೆಸರಿನಲ್ಲಿ ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">ನಿಮ್ಮ ಇತರ ಸಾಧನದಲ್ಲಿ ಲಿಂಕ್ ಮಾಡುವುದನ್ನು ಪೂರ್ಣಗೊಳಿಸಿ</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">ನಿಮ್ಮ ಇತರ ಸಾಧನದಲ್ಲಿ Molly ಅನ್ನು ಲಿಂಕ್ ಮಾಡುವುದನ್ನು ಪೂರ್ಣಗೊಳಿಸಿ.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">ಸಾಧನವನ್ನು ಲಿಂಕ್ ಮಾಡುವುದು ವಿಫಲವಾಗಿದೆ</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">ಈ ಕ್ಯೂಆರ್‌ ಕೋಡ್ ಮಾನ್ಯವಾಗಿಲ್ಲ. ನೀವು ಲಿಂಕ್ ಮಾಡಲು ಬಯಸುವ ಸಾಧನದಲ್ಲಿ ಪ್ರದರ್ಶಿಸಲಾದ ಕ್ಯುಆರ್‌ ಕೋಡ್ ಅನ್ನು ನೀವು ಸ್ಕ್ಯಾನ್ ಮಾಡುತ್ತಿದ್ದೀರಿ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">ಮರುಪ್ರಯತ್ನಿಸಿ</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">%1$sಯನ್ನು ಅನ್‌ಲಿಂಕ್‌ ಮಾಡುವುದೇ?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">ಕಾಣೆಯಾದ ಪ್ಲೇ ಸೇವೆಗಳನ್ನು ಅತ್ಯುತ್ತಮವಾಗಿಸಿ</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">ಈ ಸಾಧನವು ಪ್ಲೇ ಸರ್ವೀಸಸ್ ಅನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ. ನಿಷ್ಕ್ರಿಯವಾಗಿದ್ದಾಗ Signal ಸಂದೇಶಗಳನ್ನು ಹಿಂದಕ್ಕೆ ಪಡೆಯದಂತೆ ತಡೆಯಲು ಸಿಸ್ಟಂ ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಶನ್‌ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ ಅನ್ನು ಒತ್ತಿ.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">ಈ ಸಾಧನವು ಪ್ಲೇ ಸರ್ವೀಸಸ್ ಅನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ. ನಿಷ್ಕ್ರಿಯವಾಗಿದ್ದಾಗ Molly ಸಂದೇಶಗಳನ್ನು ಹಿಂದಕ್ಕೆ ಪಡೆಯದಂತೆ ತಡೆಯಲು ಸಿಸ್ಟಂ ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಶನ್‌ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ ಅನ್ನು ಒತ್ತಿ.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">ನಿಮ್ಮ Signal ಆವೃತ್ತಿಯ ವಾಯಿದೆ ಮುಗಿದಿದೆ. ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಲು ಮತ್ತೆ ಪಡೆಯಲು ನವೀಕರಿಸಿ.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">ನಿಮ್ಮ Molly ಆವೃತ್ತಿಯ ವಾಯಿದೆ ಮುಗಿದಿದೆ. ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಲು ಮತ್ತೆ ಪಡೆಯಲು ನವೀಕರಿಸಿ.</string>
     <string name="ExpiredBuildReminder_update_now">ಈಗ ನವೀಕರಿಸಿ</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">ತೋರಿಸು</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Signalಗೆ ಶಾಶ್ವತವಾದ ಸಂಪರ್ಕ ವೈಫಲ್ಯ!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal ಅನ್ನು Google ಪ್ಲೇ ಸರ್ವೀಸಸ್ ನಲ್ಲಿ ನೋಂದಾಯಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ. Signal ಸಂದೇಶಗಳು ಹಾಗೂ ಕರೆಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ, ದಯವಿಟ್ಟು ಸೆಟ್ಟಿಂಗ್‌ಗಳು &gt; ಅಡ್ವಾನ್ಸ್ಡ್ ನಲ್ಲಿ ಪುನಃ ನೋಂದಾಯಿಸಲು ಯತ್ನಿಸಿ.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Mollyಗೆ ಶಾಶ್ವತವಾದ ಸಂಪರ್ಕ ವೈಫಲ್ಯ!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly ಅನ್ನು Google ಪ್ಲೇ ಸರ್ವೀಸಸ್ ನಲ್ಲಿ ನೋಂದಾಯಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ. Molly ಸಂದೇಶಗಳು ಹಾಗೂ ಕರೆಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ, ದಯವಿಟ್ಟು ಸೆಟ್ಟಿಂಗ್‌ಗಳು &gt; ಅಡ್ವಾನ್ಸ್ಡ್ ನಲ್ಲಿ ಪುನಃ ನೋಂದಾಯಿಸಲು ಯತ್ನಿಸಿ.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">ಡೀಬಗ್ ಲಾಗ್‌ಗಳು ಸಮಸ್ಯೆಯನ್ನು ನಿರ್ಣಯಿಸಲು ಮತ್ತು ಸರಿಪಡಿಸಲು ನೆರವಾಗುತ್ತವೆ ಮತ್ತು ಗುರುತಿಸುವ ಮಾಹಿತಿಯನ್ನು ಹೊಂದಿಲ್ಲ.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal ಸಮಸ್ಯೆಯೊಂದನ್ನು ಎದುರಿಸಿದೆ. ಡೀಬಗ್ ಲಾಗ್ ಸಲ್ಲಿಸಬೇಕೆ?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly ಸಮಸ್ಯೆಯೊಂದನ್ನು ಎದುರಿಸಿದೆ. ಡೀಬಗ್ ಲಾಗ್ ಸಲ್ಲಿಸಬೇಕೆ?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಶನ್‌ನಿಂದಾಗಿ ಅಧಿಸೂಚನೆಗಳು ವಿಳಂಬಗೊಳ್ಳಬಹುದು</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">ಮೆಸೇಜ್ ಅಧಿಸೂಚನೆಗಳು ವಿಳಂಬಗೊಳ್ಳದಂತೆ ಖಾತ್ರಿಪಡಿಸಲು ನೀವು Signal ಗೆ ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಶನ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಬಹುದು.</string>
+    <string name="PromptBatterySaverBottomSheet__message">ಮೆಸೇಜ್ ಅಧಿಸೂಚನೆಗಳು ವಿಳಂಬಗೊಳ್ಳದಂತೆ ಖಾತ್ರಿಪಡಿಸಲು ನೀವು Molly ಗೆ ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಶನ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಬಹುದು.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಶನ್‌ನಿಂದಾಗಿ ಅಧಿಸೂಚನೆಗಳು ವಿಳಂಬಗೊಳ್ಳಬಹುದು</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">ಮೆಸೇಜ್ ಅಧಿಸೂಚನೆಗಳು ವಿಳಂಬಗೊಳ್ಳುವುದಿಲ್ಲ ಎಂಬುದನ್ನು ಖಾತ್ರಿಪಡಿಸಲು Molly ಗೆ ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಶನ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ. ಸಾಧನ-ನಿರ್ದಿಷ್ಟ ಸೂಚನೆಗಳನ್ನು ನೋಡಲು \"ಮುಂದುವರಿಸಿ\" ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">ಇಲ್ಲ, ಧನ್ಯವಾದಗಳು</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">ಮುಂದುವರಿಸಿ</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">ಮುಂದುವರಿಸಿ</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">ವಜಾಗೊಳಿಸಿ</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">ಇಲ್ಲ, ಧನ್ಯವಾದಗಳು</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">ಬಾಕಿ ಉಳಿದಿರುವ ಗುಂಪು ಆಹ್ವಾನಗಳು</string>
+    <string name="PendingMembersActivity_pending_group_invites">ವಿನಂತಿಗಳು ಮತ್ತು ಆಹ್ವಾನಗಳು</string>
     <string name="PendingMembersActivity_requests">ಕೋರಿಕೆಗಳು</string>
     <string name="PendingMembersActivity_invites">ಆಮಂತ್ರಣಗಳು</string>
     <string name="PendingMembersActivity_people_you_invited">ನೀವು ಆಹ್ವಾನಿಸಿದ ಜನರು</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">ರದ್ದುಗೊಳಿಸಿ</string>
     <string name="InviteActivity_sending">ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ…</string>
     <string name="InviteActivity_invitations_sent">ಆಮಂತ್ರಣಗಳನ್ನು ಕಳುಹಿಸಲಾಗಿದೆ!</string>
-    <string name="InviteActivity_invite_to_signal">Signalಗೆ ಆಮಂತ್ರಿಸಿ</string>
+    <string name="InviteActivity_invite_to_signal">Mollyಗೆ ಆಮಂತ್ರಿಸಿ</string>
     <string name="InviteActivity_send_sms">SMS ಕಳುಹಿಸಿ (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">ಕಳುಹಿಸು %1$d ಎಸ್‌ಎಂಎಸ್ ಆಹ್ವಾನ?</item>
         <item quantity="other">ಎಸ್‌ಎಂಎಸ್‌ ಆಹ್ವಾನಗಳನ್ನು %1$dಗೆ ಕಳುಹಿಸುವುದೇ?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Signal ಗೆ ಬದಲಾಯಿಸೋಣ: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Molly ಗೆ ಬದಲಾಯಿಸೋಣ: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">ಹಂಚಿಕೊಳ್ಳಲು ತಾವು ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್ ಗಳನ್ನು ಹೊಂದಿಲ್ಲ ಎಂದು ಕಂಡುಬರುತ್ತಿದೆ.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">ನಿಮ್ಮ ಸಂದೇಶ</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">ಹಿನ್ನಲೆಯ ಸಂಪರ್ಕವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">ಪ್ರತಿಕ್ರಿಯೆಗಳು</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal ಕರೆ ಸ್ಥಾಪಿಸಲಾಗುತ್ತಿದೆ</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly ಕರೆ ಸ್ಥಾಪಿಸಲಾಗುತ್ತಿದೆ</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signal ಕರೆ ಸೇವೆ ಆರಂಭಿಸಲಾಗುತ್ತಿದೆ</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal ಕಾಲ್ ಸರ್ವೀಸ್ ಅನ್ನು ನಿಲ್ಲಿಸಲಾಗುತ್ತಿದೆ</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Molly ಕರೆ ಸೇವೆ ಆರಂಭಿಸಲಾಗುತ್ತಿದೆ</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly ಕಾಲ್ ಸರ್ವೀಸ್ ಅನ್ನು ನಿಲ್ಲಿಸಲಾಗುತ್ತಿದೆ</string>
     <string name="NotificationBarManager__cancel_call">ಕರೆ ರದ್ದುಗೊಳಿಸಿ</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">ನೀವು ಪಾವತಿಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿದ್ದೀರಿ</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s ಅವರು ಈಗ ಪಾವತಿಗಳನ್ನು ಸ್ವೀಕರಿಸಬಹುದು</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">ಪಾವತಿ ವಿವರಗಳು ಲಭ್ಯವಿಲ್ಲ</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">ಹೆಚ್ಚಿನದ್ದಕ್ಕಾಗಿ ಟ್ಯಾಪ್ ಮಾಡಿ</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">ಪಾವತಿ ವಿವರಗಳು ಲಭ್ಯವಿಲ್ಲ</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">ಈ ಪಾವತಿಯ ಈ ವಿವರಗಳು ಲಭ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ ಈ ಪಾವತಿ ಇತಿಹಾಸವನ್ನು ಹೊಂದಿರದ ಮೂಲದಿಂದ ನಿಮ್ಮ ಮೆಸೇಜ್‌ಗಳನ್ನು ಮರುಸ್ಥಾಪಿಸಲಾಗಿದೆ. ಇದು ನಿಮ್ಮ ವ್ಯಾಲೆಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಅಥವಾ ಹಿಂದಿನ ಪಾವತಿಗಳ ಸ್ಥಿತಿಯ ಮೇಲೆ ಪರಿಣಾಮ ಬೀರುವುದಿಲ್ಲ.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">ಶೀಘ್ರದಲ್ಲೇ Signal ನಿಂದ SMS ಮೆಸೇಜ್ ಗಳನ್ನು ಕಳುಹಿಸಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಇಲ್ಲಿ ಸಂಭಾಷಣೆಯನ್ನು ಉಳಿಸಿಕೊಳ್ಳಲು %1$s ಅವರನ್ನು Signal ಗೆ ಆಹ್ವಾನಿಸಿ.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Signal ನಲ್ಲಿ SMS ಮೆಸೇಜ್ ಗಳನ್ನು ಕಳುಹಿಸಲು ನಿಮಗೆ ಇನ್ನು ಸಾಧ್ಯವಿಲ್ಲ. ಇಲ್ಲಿ ಸಂಭಾಷಣೆಯನ್ನು ಉಳಿಸಿಕೊಳ್ಳಲು %1$s ಅವರನ್ನು Signal ಗೆ ಆಹ್ವಾನಿಸಿ.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Molly ನಲ್ಲಿ SMS ಮೆಸೇಜ್ ಗಳನ್ನು ಕಳುಹಿಸಲು ನಿಮಗೆ ಇನ್ನು ಸಾಧ್ಯವಿಲ್ಲ. ಇಲ್ಲಿ ಸಂಭಾಷಣೆಯನ್ನು ಉಳಿಸಿಕೊಳ್ಳಲು %1$s ಅವರನ್ನು Molly ಗೆ ಆಹ್ವಾನಿಸಿ.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">ಪಾವತಿ: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">ಪಾವತಿ</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">ಸ್ಪ್ಯಾಮ್ ಎಂದು ವರದಿ ಮಾಡಲಾಗಿದೆ</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">ಒಂದು Signal ಸಾಧನ ಲಿಂಕ್ ಮಾಡುವುದೇ?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">ನೀವು 3ನೆ ಪಾರ್ಟಿ ಸ್ಕ್ಯಾನರ್ ಬಳಸಿ Signal ಸಾಧನ ಲಿಂಕ್ ಮಾಡಲು ಯತ್ನಿಸುತ್ತಿರುವಂತೆ ಕಂಡುಬರುತ್ತಿದೆ. ನಿಮ್ಮ ರಕ್ಷಣೆಗಾಗಿ, Signal ಒಳಗೆ ದಯವಿಟ್ಟು ಕೋಡ್ ಅನ್ನು ಮತ್ತೊಮ್ಮೆ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">ಕ್ಯುಆರ್‌ ಕೋಡ್‌ಗಳನ್ನು ತೆಗೆದುಕೊಳ್ಳಲು Signal ಗೆ ಕ್ಯಾಮರಾ ಅನುಮತಿಯ ಅಗತ್ಯವಿದೆ, ಆದರೆ ಇದನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ ಮತ್ತು \"ಕ್ಯಾಮೆರಾ\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">ಕ್ಯುಆರ್‌ ಕೋಡ್‌ಗಳನ್ನು ತೆಗೆದುಕೊಳ್ಳಲು Molly ಗೆ ಕ್ಯಾಮರಾ ಅನುಮತಿಯ ಅಗತ್ಯವಿದೆ, ಆದರೆ ಇದನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ ಮತ್ತು \"ಕ್ಯಾಮೆರಾ\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">ಕ್ಯಾಮರಾ ಅನುಮತಿ ಇಲ್ಲದೆ ಕ್ಯುಆರ್‌ ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">ಪಾಸ್‌ಫ್ರೇಸ್‌ ನಮೂದಿಸಿ</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal ಐಕನ್</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly ಐಕನ್</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">ಪಾಸ್‌ಫ್ರೇಸ್‌ ಸಲ್ಲಿಸಿ</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">ಪಾಸ್‌ಫ್ರೇಸ್‌ ಮಾನ್ಯವಾದದ್ದಲ್ಲ!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signal ಅನ್ಲಾಕ್ ಮಾಡಿ</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal ಆಂಡ್ರಾಯ್ಡ್‌ - ಲಾಕ್ ಸ್ಕ್ರೀನ್</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Molly ಅನ್ಲಾಕ್ ಮಾಡಿ</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly ಆಂಡ್ರಾಯ್ಡ್‌ - ಲಾಕ್ ಸ್ಕ್ರೀನ್</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">ನಕ್ಷೆ</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">ಸಂದೇಶ ಕಳುಹಿಸುವುದನ್ನು ಮುಂದುವರಿಸಲು ಪರಿಶೀಲಿಸಿ</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Signal ನಲ್ಲಿ ಸ್ಪ್ಯಾಮ್ ತಡೆಯಲು ಸಹಾಯ ಮಾಡುವುದಕ್ಕಾಗಿ, ದಯವಿಟ್ಟು ಪರಿಶೀಲನೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಿ.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Molly ನಲ್ಲಿ ಸ್ಪ್ಯಾಮ್ ತಡೆಯಲು ಸಹಾಯ ಮಾಡುವುದಕ್ಕಾಗಿ, ದಯವಿಟ್ಟು ಪರಿಶೀಲನೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಿ.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">ಪರಿಶೀಲಿಸಿದ ನಂತರ, ಮೆಸೇಜ್ ಮಾಡುವುದನ್ನು ನೀವು ಮುಂದುವರಿಸಬಹುದು. ಯಾವುದೇ ವಿರಾಮಗೊಳಿಸಿದ ಮೆಸೇಜ್‌ಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಕಳುಹಿಸಲಾಗುತ್ತದೆ.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">ನನ್ನ ಸ್ಟೋರಿ</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal ಕರೆ</string>
+    <string name="Recipient_signal_call">Molly ಕರೆ</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">ನಿರ್ಬಂಧಿಸಿ</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">ರಿಂಗ್ ಆಗುತ್ತಿದೆ…</string>
     <string name="RedPhone_busy">ನಿರತವಾಗಿದೆ</string>
     <string name="RedPhone_recipient_unavailable">ಸ್ವೀಕರಿಸುವವರು ಲಭ್ಯವಿಲ್ಲ</string>
-    <string name="RedPhone_network_failed">ನೆಟ್‌ವರ್ಕ್‌ ದೋಷ!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">ನೆಟ್‌ವರ್ಕ್‌ ದೋಷ! ದಯವಿಟ್ಟು ನಿಮ್ಮ ನೆಟ್‌ವರ್ಕ್ ಸಂಪರ್ಕವನ್ನು ಪರಿಶೀಲಿಸಿ ಹಾಗೂ ಮತ್ತೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ.</string>
     <string name="RedPhone_number_not_registered">ಸಂಖ್ಯೆ ನೋಂದಾಯಿಸಲಾಗಿಲ್ಲ!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">ನೀವು ಡಯಲ್ ಮಾಡಿದ ಸಂಖ್ಯೆಗೆ ಸುರಕ್ಷಿತ ಧ್ವನಿ ಬೆಂಬಲವಿಲ್ಲ !</string>
     <string name="RedPhone_got_it">ಅರ್ಥವಾಯಿತು</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">ನಿಮ್ಮ ವೀಡಿಯೊವನ್ನು ಆನ್ ಮಾಡಲು ಇಲ್ಲಿ ಟ್ಯಾಪ್ ಮಾಡಿ</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s ಗೆ ಕರೆ ಮಾಡಲು, Signal ಗೆ ನಿಮ್ಮ ಕ್ಯಾಮರಾ ಪ್ರವೇಶ ಬೇಕಾಗುತ್ತದೆ</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s ಗೆ ಕರೆ ಮಾಡಲು, Molly ಗೆ ನಿಮ್ಮ ಕ್ಯಾಮರಾ ಪ್ರವೇಶ ಬೇಕಾಗುತ್ತದೆ</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ..</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">ಮರುಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">ಕರೆಯಿಂದ ತೆಗೆದುಹಾಕಲಾಗಿದೆ</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">ಕರೆಯಿಂದ ನಿಮ್ಮನ್ನು ಯಾರೋ ತೆಗೆದುಹಾಕಿದ್ದಾರೆ.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">ನಿಮ್ಮ ಕ್ಯಾಮರಾ ಮತ್ತು ಮೈಕ್ರೋಫೋನ್‌ಗೆ ಆ್ಯಕ್ಸೆಸ್ ಅನುಮತಿಸಿ</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">ನಿಮ್ಮ ಮೈಕ್ರೋಫೋನ್‌ಗೆ ಆಕ್ಸೆಸ್‍ ಅನ್ನು ಅನುಮತಿಸಿ</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">ನಿಮ್ಮ ಕ್ಯಾಮರಾಕ್ಕೆ ಆ್ಯಕ್ಸೆಸ್ ಅನುಮತಿಸಿ</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">ಕರೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲು ಅಥವಾ ಸೇರಲು, ನಿಮ್ಮ ಕ್ಯಾಮರಾ ಮತ್ತು ಮೈಕ್ರೋಫೋನ್‌ಗೆ Molly ಆಕ್ಸೆಸ್‍ ಅನ್ನು ಅನುಮತಿಸಿ.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">ಕರೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲು ಅಥವಾ ಸೇರಲು, ನಿಮ್ಮ ಮೈಕ್ರೋಫೋನ್‌ಗೆ Molly ಆಕ್ಸೆಸ್‍ ಅನ್ನು ಅನುಮತಿಸಿ.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">ನಿಮ್ಮ ವೀಡಿಯೊವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು, ನಿಮ್ಮ ಕ್ಯಾಮರಾಗೆ Molly ಆಕ್ಸೆಸ್‍ ಅನ್ನು ಅನುಮತಿಸಿ.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">ಕರೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲು ಅಥವಾ ಸೇರಿಕೊಳ್ಳಲು Molly ಗೆ ಮೈಕ್ರೋಫೋನ್ ಅನುಮತಿಗಳ ಅಗತ್ಯವಿದೆ.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">ನಿಮ್ಮ ವೀಡಿಯೊವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು Molly ಗೆ ಕ್ಯಾಮರಾ ಆಕ್ಸೆಸ್‍ ಅಗತ್ಯವಿದೆ</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">ಕರೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲು ಅಥವಾ ಸೇರಿಕೊಳ್ಳಲು:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">ನಿಮ್ಮ ವೀಡಿಯೊವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal ಕರೆ</string>
-    <string name="WebRtcCallView__signal_video_call">Signal ವೀಡಿಯೊ ಕರೆ</string>
+    <string name="WebRtcCallView__signal_call">Molly ಕರೆ</string>
+    <string name="WebRtcCallView__signal_video_call">Molly ವೀಡಿಯೊ ಕರೆ</string>
     <string name="WebRtcCallView__start_call">ಕರೆ ಆರಂಭಿಸಿ</string>
     <string name="WebRtcCallView__join_call">ಕರೆಗೆ ಸೇರಿ</string>
     <string name="WebRtcCallView__call_is_full">ಕರೆ ಭರ್ತಿಯಾಗಿದೆ</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">ನಿಮ್ಮ ಕೈಯನ್ನು ಕೆಳಗಿಳಿಸಬೇಕೇ?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">ಕೈ ಕೆಳಗಿಳಿಸಿ</string>
+    <string name="CallOverflowPopupWindow__lower_hand">ಕೆಳಗಿಳಿಸಿ</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">ರದ್ದುಮಾಡಿ</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">ನೀವು ಕೈ ಎತ್ತಿದ್ದೀರಿ</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">ತೋರಿಸು</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s ಕೈ ಎತ್ತಿದ್ದಾರೆ</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s ಕೈ ಎತ್ತಿದ್ದೀರಿ</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d ಕೈ ಎತ್ತಿದ್ದಾರೆ</item>
+        <item quantity="other">%1$s + %2$d ಕೈ ಎತ್ತಿದ್ದಾರೆ</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s ಕೈ ಎತ್ತಿದ್ದಾರೆ</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d ಕೈ ಎತ್ತಿದ್ದಾರೆ</item>
         <item quantity="other">%1$s + %2$d ಕೈ ಎತ್ತಿದ್ದಾರೆ</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">ಈ ಸಂಖ್ಯೆಯನ್ನು ಪರಿಶೀಲನೆ ಮಾಡಲು ನಿಮಗೆ ಒಂದು ಕರೆ ಬರುತ್ತದೆ.</string>
     <string name="RegistrationActivity_edit_number">ನಂಬರ್ ಎಡಿಟ್ ಮಾಡಿ</string>
     <string name="RegistrationActivity_missing_google_play_services">Google ಪ್ಲೇ ಸರ್ವೀಸಸ್‌‌ಗಳು ಕಾಣೆಯಾಗಿದೆ</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">ಈ ಸಾಧನದಲ್ಲಿ Google ಪ್ಲೇ ಸರ್ವೀಸಸ್ ಕಾಣುತ್ತಿಲ್ಲ. ನೀವು ಇನ್ನೂ Signal ಅನ್ನು ಬಳಸಬಹುದು, ಆದರೆ ಈ ಕಾನ್ಫಿಗರೇಶನ್ ವಿಶ್ವಾಸಾರ್ಹತೆ ಅಥವಾ ಕಾರ್ಯಕ್ಷಮತೆಯನ್ನು ಕಡಿಮೆ ಮಾಡುತ್ತದೆ.\n\nನೀವು ಸುಧಾರಿತ ಬಳಕೆದಾರರು ಅಲ್ಲದೇ ಇದ್ದಲ್ಲಿ, ನೀವು ಆಫ್ಟರ್ ಮಾರ್ಕೆಟ್ ಆಂಡ್ರಾಯ್ಡ್ ರಾಮ್ ಅನ್ನು ರನ್ ಮಾಡುತ್ತಿರುವುದಿಲ್ಲ ಅಥವಾ ನೀವಿದನ್ನು ದೋಷಗಳಲ್ಲಿ ಕಾಣುತ್ತಿದ್ದಲ್ಲಿ support@signal.org ಗೆ ಟ್ರಬಲ್‌ಶೂಟಿಂಗ್‌ಗಾಗಿ ದಯವಿಟ್ಟು ಸಂಪರ್ಕಿಸಿ,</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">ಈ ಸಾಧನದಲ್ಲಿ Google ಪ್ಲೇ ಸರ್ವೀಸಸ್ ಕಾಣುತ್ತಿಲ್ಲ. ನೀವು ಇನ್ನೂ Molly ಅನ್ನು ಬಳಸಬಹುದು, ಆದರೆ ಈ ಕಾನ್ಫಿಗರೇಶನ್ ವಿಶ್ವಾಸಾರ್ಹತೆ ಅಥವಾ ಕಾರ್ಯಕ್ಷಮತೆಯನ್ನು ಕಡಿಮೆ ಮಾಡುತ್ತದೆ.\n\nನೀವು ಸುಧಾರಿತ ಬಳಕೆದಾರರು ಅಲ್ಲದೇ ಇದ್ದಲ್ಲಿ, ನೀವು ಆಫ್ಟರ್ ಮಾರ್ಕೆಟ್ ಆಂಡ್ರಾಯ್ಡ್ ರಾಮ್ ಅನ್ನು ರನ್ ಮಾಡುತ್ತಿರುವುದಿಲ್ಲ ಅಥವಾ ನೀವಿದನ್ನು ದೋಷಗಳಲ್ಲಿ ಕಾಣುತ್ತಿದ್ದಲ್ಲಿ support@molly.im ಗೆ ಟ್ರಬಲ್‌ಶೂಟಿಂಗ್‌ಗಾಗಿ ದಯವಿಟ್ಟು ಸಂಪರ್ಕಿಸಿ,</string>
     <string name="RegistrationActivity_i_understand">ನನಗೆ ಅರ್ಥವಾಯಿತು</string>
     <string name="RegistrationActivity_play_services_error">ಪ್ಲೇ ಸರ್ವೀಸಸ್ ದೋಷ</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google ಪ್ಲೇ ಸರ್ವೀಸಸ್ ಅಪ್‌ಡೇಟ್ ಆಗುತ್ತಿದೆ ಅಥವಾ ತಾತ್ಕಾಲಿಕವಾಗಿ ಲಭ್ಯವಿಲ್ಲ. ದಯವಿಟ್ಟು ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">ಪ್ರಮಾಣೀಕೃತವಲ್ಲದ ಸಂಖ್ಯಾ ಸ್ವರೂಪ</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">ನೀವು ನಮೂದಿಸಿದ ಸಂಖ್ಯೆ (%1$s) ಪ್ರಮಾಣೀಕೃತವಲ್ಲದ ಸ್ವರೂಪದಲ್ಲಿ ಕಾಣಿಸುತ್ತಿದೆ.\n\nನೀವು ಅಂದುಕೊಂಡಿದ್ದು ಇದೇನಾ %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal ಆಂಡ್ರಾಯ್ಡ್ - ಫೋನ್ ಸಂಖ್ಯೆ ಸ್ವರೂಪ</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly ಆಂಡ್ರಾಯ್ಡ್ - ಫೋನ್ ಸಂಖ್ಯೆ ಸ್ವರೂಪ</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">ಕರೆ ವಿನಂತಿಸಲಾಗಿದೆ</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">ನೋಂದಾಯಿಸುವಲ್ಲಿ ಸಮಸ್ಯೆ ಎದುರಿಸುತ್ತಿದ್ದೀರಾ?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• ನಿಮ್ಮ SMS ಅಥವಾ ಕರೆಯನ್ನು ಸ್ವೀಕರಿಸಲು ನಿಮ್ಮ ಫೋನ್ ಸೆಲ್ಯುಲಾರ್ ಸಿಗ್ನಲ್ ಅನ್ನು ಹೊಂದಿದೆ ಎಂದು ಖಚಿತಪಡಿಸಿ\n • ಈ ಸಂಖ್ಯೆಗೆ ನೀವು ಫೋನ್ ಕರೆಯನ್ನು ಸ್ವೀಕರಿಸಬಹುದು ಎಂದು ಖಚಿತಪಡಿಸಿ\n • ನಿಮ್ಮ ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ಸರಿಯಾಗಿ ನಮೂದಿಸಿದ್ದೀರಾ ಎಂದು ಪರಿಶೀಲಿಸಿ.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ, ದಯವಿಟ್ಟು ಈ ಸಮಸ್ಯೆ ಪರಿಹಾರದ ಹಂತಗಳನ್ನು ಅನುಸರಿಸಿ ಅಥವಾ ಬೆಂಬಲವನ್ನು ಸಂಪರ್ಕಿಸಿ</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ, %1$s ಅಥವಾ %2$s ಅನುಸರಿಸಿ</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">ಈ ಸಮಸ್ಯೆ ಪರಿಹಾರದ ಹಂತಗಳನ್ನು</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">ಸಂಪರ್ಕಗಳಿಗೆ ಸೇರಿಸಿ</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Signal ಗೆ ಆಮಂತ್ರಿಸಿ</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Molly ಗೆ ಆಮಂತ್ರಿಸಿ</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal ಸಂದೇಶ</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal ಕರೆ</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">ಸಂಪರ್ಕಗಳಿಗೆ ಸೇರಿಸಿ</string>
-    <string name="SharedContactView_invite_to_signal">Signalಗೆ ಆಮಂತ್ರಿಸಿ</string>
+    <string name="SharedContactView_invite_to_signal">Mollyಗೆ ಆಮಂತ್ರಿಸಿ</string>
     <string name="SharedContactView_message">Signal ಸಂದೇಶ</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s ಯು %2$s ಅವರದ್ದಾಗಿದೆ</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal ನವೀಕರಿಸಿ</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal ನ ಹೊಸ ಆವೃತ್ತಿ ಲಭ್ಯವಿದೆ. ಅಪ್‌ಡೇಟ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal ಅಪ್‌ಡೇಟ್ ವಿಫಲಗೊಂಡಿದೆ</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly ನವೀಕರಿಸಿ</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly ನ ಹೊಸ ಆವೃತ್ತಿ ಲಭ್ಯವಿದೆ. ಅಪ್‌ಡೇಟ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly ಅಪ್‌ಡೇಟ್ ವಿಫಲಗೊಂಡಿದೆ</string>
     <string name="ApkUpdateNotifications_failed_general_body">ನಾವು ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸುತ್ತೇವೆ.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಣಗೊಂಡಿದೆ</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಣಗೊಂಡಿದೆ</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">ನೀವು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆವೃತ್ತಿ %1$s ಗೆ ನವೀಕರಣಗೊಂಡಿದ್ದೀರಿ.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">ನಮ್ಮ Signal ಸುರಕ್ಷತಾ ಸಂಖ್ಯೆ:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">ಹಂಚಿಕೊಳ್ಳಲು ತಾವು ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್‌‌‌ಗಳನ್ನು ಹೊಂದಿಲ್ಲದಿರುವಂತೆ ಕಂಡುಬರುತ್ತಿದೆ.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">ಹೋಲಿಸುವುದಕ್ಕಾಗಿ ಯಾವುದೇ ಸುರಕ್ಷತಾ ಸಂಖ್ಯೆ ಕ್ಲಿಪ್‌ಬೋರ್ಡಿನಲ್ಲಿ ಕಂಡುಬಂದಿಲ್ಲ</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">ಒಂದು ಕ್ಯುಆರ್‌ ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಲು Signal ಗೆ ಕ್ಯಾಮರಾ ಅನುಮತಿ ಅಗತ್ಯವಿದೆ, ಆದರೆ ಇದನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ ಮತ್ತು \"ಕ್ಯಾಮೆರಾ\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">ಒಂದು ಕ್ಯುಆರ್‌ ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಲು Molly ಗೆ ಕ್ಯಾಮರಾ ಅನುಮತಿ ಅಗತ್ಯವಿದೆ, ಆದರೆ ಇದನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ ಮತ್ತು \"ಕ್ಯಾಮೆರಾ\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">ಕ್ಯಾಮರಾ ಅನುಮತಿ ಇಲ್ಲದೆ ಕ್ಯುಆರ್‌ ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">%1$s ಅವರ ಸುರಕ್ಷತೆ ಸಂಖ್ಯೆಯನ್ನು ನೋಡಲು ನೀವು ಮೊದಲು ಸಂದೇಶಗಳನ್ನು ವಿನಿಮಯ ಮಾಡಿಕೊಳ್ಳಬೇಕು.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">ತೆರೆಯಲು ಸ್ಪರ್ಶಿಸಿ.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal ಅನ್ಲಾಕ್ ಆಗಿದೆ</string>
-    <string name="KeyCachingService_lock">Signal ಲಾಕ್ ಮಾಡಿ</string>
+    <string name="KeyCachingService_passphrase_cached">Molly ಅನ್ಲಾಕ್ ಆಗಿದೆ</string>
+    <string name="KeyCachingService_lock">Molly ಲಾಕ್ ಮಾಡಿ</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">ನೀವು</string>
     <string name="MediaPreviewActivity_unssuported_media_type">ಬೆಂಬಲವಿಲ್ಲದ ಮೀಡಿಯಾ ವಿಧ</string>
     <string name="MediaPreviewActivity_draft">ಡ್ರಾಫ್ಟ್</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">ಬಾಹ್ಯ ಸ್ಟೋರೇಜ್ ಗೆ ಉಳಿಸುವುದಕ್ಕೆ Signal ಗೆ ಸ್ಟೊರೇಜ್ ಅನುಮತಿ ಅಗತ್ಯವಿದೆ , ಆದರೆ ಅದನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಆ್ಯಪ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ, ಮತ್ತು \"ಸ್ಟೊರೇಜ್\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">ಬಾಹ್ಯ ಸ್ಟೋರೇಜ್ ಗೆ ಉಳಿಸುವುದಕ್ಕೆ Molly ಗೆ ಸ್ಟೊರೇಜ್ ಅನುಮತಿ ಅಗತ್ಯವಿದೆ , ಆದರೆ ಅದನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಆ್ಯಪ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ, ಮತ್ತು \"ಸ್ಟೊರೇಜ್\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">ಅನುಮತಿಗಳಿಲ್ಲದೆ ಬಾಹ್ಯ ಸ್ಟೊರೇಜ್‌ಗೆ ಉಳಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">ಮೆಸೇಜನ್ನು ಅಳಿಸುವುದೇ?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">ಇದು ಶಾಶ್ವತವಾಗಿ ಈ ಸಂದೇಶವನ್ನು ಅಳಿಸುತ್ತದೆ.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">ಸಂದೇಶ ತಲುಪಿಸಲು ವಿಫಲವಾಗಿದೆ.</string>
     <string name="MessageNotifier_error_delivering_message">ಸಂದೇಶವನ್ನು ತಲುಪಿಸುವುದರಲ್ಲಿ ದೋಷ ಸಂಭವಿಸಿದೆ.</string>
     <string name="MessageNotifier_message_delivery_paused">ಮೆಸೇಜ್ ಡೆಲಿವರಿ ವಿರಾಮಗೊಳಿಸಲಾಗಿದೆ.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Signal ನಲ್ಲಿ ಮೆಸೇಜ್ ಮಾಡುವುದನ್ನು ಮುಂದುವರಿಸಲು ಪರಿಶೀಲಿಸಿ.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Molly ನಲ್ಲಿ ಮೆಸೇಜ್ ಮಾಡುವುದನ್ನು ಮುಂದುವರಿಸಲು ಪರಿಶೀಲಿಸಿ.</string>
     <string name="MessageNotifier_mark_all_as_read">ಎಲ್ಲವನ್ನು ಓದಿದೆ ಎಂದು ಗುರುತು ಮಾಡಿ</string>
     <string name="MessageNotifier_mark_read">ಓದಿದೆ ಎಂದು ಗುರುತು ಮಾಡಿ</string>
     <string name="MessageNotifier_turn_off_these_notifications">ಈ ನೊಟಿಫಿಕೇಶನ್‌ಗಳನ್ನು ಆಫ್ ಮಾಡಿ</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">%1$s ಅವರು ನಿಮ್ಮ ಸ್ಟಿಕ್ಕರ್‌ಗೆ ಪ್ರತಿಕ್ರಿಯಿಸಿದ್ದಾರೆ.</string>
     <string name="MessageNotifier_this_message_was_deleted">ಈ ಮೆಸೇಜನ್ನು ಅಳಿಸಲಾಗಿದೆ.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">ಸಂಪರ್ಕ Signal ಗೆ ಸೇರಿದ ನೊಟಿಫಿಕೇಶನ್‌ಗಳನ್ನು ಆಫ್ ಮಾಡುವುದೇ? Signal &gt; ಸೆಟ್ಟಿಂಗ್‌ಗಳು &gt; ನೊಟಿಫಿಕೇಶನ್‌ಗಳಲ್ಲಿ ಇದನ್ನು ನೀವು ಪುನಃ ಸಕ್ರಿಯಗೊಳಿಸಬಹುದು.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">ಸಂಪರ್ಕ Molly ಗೆ ಸೇರಿದ ನೊಟಿಫಿಕೇಶನ್‌ಗಳನ್ನು ಆಫ್ ಮಾಡುವುದೇ? Molly &gt; ಸೆಟ್ಟಿಂಗ್‌ಗಳು &gt; ನೊಟಿಫಿಕೇಶನ್‌ಗಳಲ್ಲಿ ಇದನ್ನು ನೀವು ಪುನಃ ಸಕ್ರಿಯಗೊಳಿಸಬಹುದು.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">ಯಾವಾಗ Signal ಲಾಕ್ ಮಾಡಲಾಗಿದೆಯೋ ಆವಾಗ ತ್ವರಿತ ಪ್ರತಿಕ್ರಿಯೆ ಲಭ್ಯವಿಲ್ಲ!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">ಯಾವಾಗ Molly ಲಾಕ್ ಮಾಡಲಾಗಿದೆಯೋ ಆವಾಗ ತ್ವರಿತ ಪ್ರತಿಕ್ರಿಯೆ ಲಭ್ಯವಿಲ್ಲ!</string>
     <string name="QuickResponseService_problem_sending_message">ಸಂದೇಶ ಕಳುಹಿಸುವಲ್ಲಿ ಸಮಸ್ಯೆ!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">ಅಮಾನ್ಯವಾದ ಶಾರ್ಟ್‌ಕಟ್</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">ಹೊಸ ಸಂದೇಶ</string>
     <string name="SingleRecipientNotificationBuilder_message_request">ಸಂದೇಶ ವಿನಂತಿ</string>
     <string name="SingleRecipientNotificationBuilder_you">ನೀವು</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">ಈ ಸಾಧನವು ಇನ್ನು ನೋಂದಾಯಿತವಾಗಿರುವುದಿಲ್ಲ. ನಿಮ್ಮ ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ನೀವು Signal ನೊಂದಿಗೆ ಬೇರೆ ಸಾಧನದಲ್ಲಿ ನೋಂದಾಯಿಸಿದ್ದರಿಂದ ಇದು ಉಂಟಾಗಿರಬಹುದು.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">ಈ ಸಾಧನವು ಇನ್ನು ನೋಂದಾಯಿತವಾಗಿರುವುದಿಲ್ಲ. ನಿಮ್ಮ ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ನೀವು Molly ನೊಂದಿಗೆ ಬೇರೆ ಸಾಧನದಲ್ಲಿ ನೋಂದಾಯಿಸಿದ್ದರಿಂದ ಇದು ಉಂಟಾಗಿರಬಹುದು.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">ಸಾಧನವನ್ನು ಮರುನೋಂದಾಯಿಸಿ</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">ಕರೆಗೆ ಉತ್ತರಿಸಲು, ನಿಮ್ಮ ಮೈಕ್ರೋಫೋನ್‌ಗೆ Signal ಪ್ರವೇಶ ನೀಡಿ.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">ಕರೆಗೆ ಉತ್ತರಿಸಲು, ನಿಮ್ಮ ಮೈಕ್ರೋಫೋನ್‌ಗೆ Molly ಪ್ರವೇಶ ನೀಡಿ.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">ವೀಡಿಯೊ ಕರೆಗೆ ಉತ್ತರಿಸಲು, ನಿಮ್ಮ ಮೈಕ್ರೋಫೋನ್ ಮತ್ತು ಕ್ಯಾಮರಾಗೆ Signal ಆ್ಯಕ್ಸೆಸ್ ನೀಡಿ.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">ಕರೆಗಳನ್ನು ಮಾಡಲು ಅಥವಾ ಪಡೆಯಲು Signal ಗೆ ಮೈಕ್ರೊಫೋನ್ ಹಾಗೂ ಕ್ಯಾಮರಾ ಅನುಮತಿಗಳು ಅಗತ್ಯವಿರುತ್ತವೆ, ಆದರೆ ಅವುಗಳನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್‌ ಗಳಿಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ, ಮತ್ತು \"ಮೈಕ್ರೊಫೋನ್\" ಮತ್ತು \"ಕ್ಯಾಮೆರಾ\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">ವೀಡಿಯೊ ಕರೆಗೆ ಉತ್ತರಿಸಲು, ನಿಮ್ಮ ಮೈಕ್ರೋಫೋನ್ ಮತ್ತು ಕ್ಯಾಮರಾಗೆ Molly ಆ್ಯಕ್ಸೆಸ್ ನೀಡಿ.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">ಕರೆಗಳನ್ನು ಮಾಡಲು ಅಥವಾ ಪಡೆಯಲು Molly ಗೆ ಮೈಕ್ರೊಫೋನ್ ಹಾಗೂ ಕ್ಯಾಮರಾ ಅನುಮತಿಗಳು ಅಗತ್ಯವಿರುತ್ತವೆ, ಆದರೆ ಅವುಗಳನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್‌ ಗಳಿಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ, ಮತ್ತು \"ಮೈಕ್ರೊಫೋನ್\" ಮತ್ತು \"ಕ್ಯಾಮೆರಾ\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">ಲಿಂಕ್ ಮಾಡಿದ ಸಾಧನದಲ್ಲಿ ಉತ್ತರಿಸಲಾಗಿದೆ.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">ಲಿಂಕ್ ಮಾಡಿದ ಸಾಧನದಲ್ಲಿ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">ಲಿಂಕ್ ಮಾಡಿದ ಸಾಧನದಲ್ಲಿ ಕಾರ್ಯನಿರತವಾಗಿದೆ.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">ಹೊಸ ಪಾಸ್‌‌ಫ್ರೇಸ್ ಪುನರಾವರ್ತಿಸಿ</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Signalಗೆ ಆಮಂತ್ರಿಸಿ</string>
+    <string name="contact_selection_activity__invite_to_signal">Mollyಗೆ ಆಮಂತ್ರಿಸಿ</string>
     <string name="contact_selection_activity__new_group">ಹೊಸ ಗುಂಪು</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">ಸಂಪರ್ಕಗಳನ್ನು ರಿಫ್ರೆಶ್ ಮಾಡಿ</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">ಯಾರಾದರೂ ತಪ್ಪಿಹೋದಂತೆ ಅನಿಸುತ್ತಿದೆಯೇ? ರಿಫ್ರೆಶ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">ನಿಮಗೆ ಗೊತ್ತಿರುವ ಜನರನ್ನು Signal ನಲ್ಲಿ ಹುಡುಕಿ</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">ನಿಮ್ಮ ಸಂಪರ್ಕಗಳಿಗೆ ಆ್ಯಕ್ಸೆಸ್ ಅನುಮತಿಸಿ</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">ಇನ್ನಷ್ಟು</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">ಸಂಪರ್ಕದ ಛಾಯಾಚಿತ್ರ</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">ನಿಮ್ಮ ಸಂಪರ್ಕಗಳನ್ನು ತೋರಿಸಲು Signal ಗೆ ಸಂಪರ್ಕಗಳ ಅನುಮತಿ ಅಗತ್ಯವಿದೆ, ಆದರೆ ಅದನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಅಪ್ಲಿಕೇಶನ್ ಸೆಟ್ಟಿಂಗ್‌ ಮೆನುಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆಮಾಡಿ ಮತ್ತು \"ಸಂಪರ್ಕಗಳು\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">ನಿಮ್ಮ ಸಂಪರ್ಕಗಳನ್ನು ತೋರಿಸಲು Molly ಗೆ ಸಂಪರ್ಕಗಳ ಅನುಮತಿ ಅಗತ್ಯವಿದೆ, ಆದರೆ ಅದನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಅಪ್ಲಿಕೇಶನ್ ಸೆಟ್ಟಿಂಗ್‌ ಮೆನುಗೆ ಮುಂದುವರಿಯಿರಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆಮಾಡಿ ಮತ್ತು \"ಸಂಪರ್ಕಗಳು\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">ಸಂಪರ್ಕಗಳನ್ನು ಹಿಂಪಡೆಯುವಲ್ಲಿ ದೋಷ, ನಿಮ್ಮ ನೆಟ್‌ವರ್ಕ್ ಸಂಪರ್ಕ ಪರಿಶೀಲಿಸಿ</string>
     <string name="ContactSelectionListFragment_username_not_found">ಯೂಸರ್ ನೇಮ್ ಕಂಡುಬಂದಿಲ್ಲ</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" Signal ಬಳಕೆದಾರರಲ್ಲ. ದಯವಿಟ್ಟು ಯೂಸರ್ ನೇಮ್ ಅನ್ನು ಪರಿಶೀಲಿಸಿ ಮತ್ತು ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">ಯೂಸರ್‌ನೇಮ್‌ನಿಂದ ಹುಡುಕಿ</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">ಸಂಪರ್ಕಗಳಿಗೆ ಆ್ಯಕ್ಸೆಸ್ ಅನುಮತಿಸಿ</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">ನಿಮಗೆ ಗೊತ್ತಿರುವ ಜನರನ್ನು Signal ನಲ್ಲಿ ಹುಡುಕಲು:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">ಪ್ರವೇಶ ಅನುಮತಿಸಿ</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">ಇಲ್ಲ, ಧನ್ಯವಾದಗಳು</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">ನಿಮ್ಮ ಸಂಪರ್ಕಗಳಿಗೆ ಆ್ಯಕ್ಸೆಸ್ ಅನುಮತಿಸಿ. ನಿಮ್ಮ ಸಂಪರ್ಕಗಳು ಎನ್ಕ್ರಿಪ್ಟ್ ಆಗಿವೆ ಮತ್ತು Signal ಸೇವೆಗೆ ಗೋಚರಿಸುವುದಿಲ್ಲ.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal ಗೆ ನಿಮ್ಮ ಸಂಪರ್ಕಗಳನ್ನು ಪ್ರದರ್ಶಿಸಲು ಪ್ರವೇಶ ಅಗತ್ಯವಿದೆ.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly ಗೆ ನಿಮ್ಮ ಸಂಪರ್ಕಗಳನ್ನು ಪ್ರದರ್ಶಿಸಲು ಪ್ರವೇಶ ಅಗತ್ಯವಿದೆ.</string>
     <string name="contact_selection_list_fragment__show_contacts">ಸಂಪರ್ಕಗಳನ್ನು ತೋರಿಸಿ</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">ಈ ವ್ಯಕ್ತಿಯನ್ನು ನೀವು ತೆಗೆದುಹಾಕಿದ್ದೀರಿ, ಅವರಿಗೆ ಮೆಸೇಜ್ ಮಾಡುವುದರಿಂದ ಅವರು ಮತ್ತೆ ನಿಮ್ಮ ಪಟ್ಟಿಗೆ ಸೇರುತ್ತಾರೆ.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">ಆಯ್ಕೆಗಳು</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">ನವೀಕರಿಸಿ</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">ಪ್ಲೇ… ವಿರಾಮ</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">ಬಬಲ್‌ಗಳು ಆಂಡ್ರಾಯ್ಡ್ ಫೀಚರ್ ಆಗಿದ್ದು, Signal ಚಾಟ್‌ಗಳಿಗಾಗಿ ನೀವು ಅದನ್ನು ಆಫ್ ಮಾಡಬಹುದು.</string>
+    <string name="BubbleOptOutTooltip__description">ಬಬಲ್‌ಗಳು ಆಂಡ್ರಾಯ್ಡ್ ಫೀಚರ್ ಆಗಿದ್ದು, Molly ಚಾಟ್‌ಗಳಿಗಾಗಿ ನೀವು ಅದನ್ನು ಆಫ್ ಮಾಡಬಹುದು.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">ಈಗಲ್ಲ</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">ಗುಂಪಿನ ವಿವರಣೆ</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Signal ಅನ್ನು ನವೀಕರಿಸಿ</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Molly ಅನ್ನು ನವೀಕರಿಸಿ</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Signal ನ ಈ ಆವೃತ್ತಿಯ ವಾಯಿದೆ ಮುಗಿದಿದೆ. Signal ಬಳಕೆ ಮುಂದುವರಿಸಲು ಈಗಲೇ ಅಪ್‌ಡೇಟ್ ಮಾಡಿ.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Molly ನ ಈ ಆವೃತ್ತಿಯ ವಾಯಿದೆ ಮುಗಿದಿದೆ. Molly ಬಳಕೆ ಮುಂದುವರಿಸಲು ಈಗಲೇ ಅಪ್‌ಡೇಟ್ ಮಾಡಿ.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">ನವೀಕರಿಸಿ</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">ನಿಧಾನ</string>
     <string name="preferences__help">ಸಹಾಯ</string>
     <string name="preferences__advanced">ಸುಧಾರಿತ</string>
-    <string name="preferences__donate_to_signal">Signal ಗೆ ದೇಣಿಗೆ ನೀಡಿ</string>
+    <string name="preferences__donate_to_signal">Molly ಗೆ ದೇಣಿಗೆ ನೀಡಿ</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">ಖಾಸಗಿತನ</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">ಆ್ಯಪ್ ಐಕಾನ್ ಬದಲಾಯಿಸಿ ಮತ್ತು \"%1$s\" ಎಂಬುದಾಗಿ ಹೆಸರಿಸಿ</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">ಆ್ಯಪ್ ಐಕಾನ್ ಮತ್ತು ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು Signal ಅನ್ನು ಮುಚ್ಚಬೇಕಾಗುತ್ತದೆ. ಅಧಿಸೂಚನೆಗಳು ಯಾವತ್ತೂ ಡೀಫಾಲ್ಟ್ Signal ಐಕಾನ್ ಮತ್ತು ಹೆಸರನ್ನು ಪ್ರದರ್ಶಿಸುತ್ತವೆ.</string>
+    <string name="preferences__app_icon_dialog_description">ಆ್ಯಪ್ ಐಕಾನ್ ಮತ್ತು ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು Molly ಅನ್ನು ಮುಚ್ಚಬೇಕಾಗುತ್ತದೆ. ಅಧಿಸೂಚನೆಗಳು ಯಾವತ್ತೂ ಡೀಫಾಲ್ಟ್ Molly ಐಕಾನ್ ಮತ್ತು ಹೆಸರನ್ನು ಪ್ರದರ್ಶಿಸುತ್ತವೆ.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">ಒಂದು ಆ್ಯಪ್ ಐಕಾನ್ ಮತ್ತು ಹೆಸರು ಆಯ್ಕೆ ಮಾಡಿ, ಅದು ನಿಮ್ಮ ಫೋನ್‌ನ ಹೋಮ್ ಸ್ಕ್ರೀನ್ ಮತ್ತು ಆ್ಯಪ್ ಡ್ರಾಯರ್‌ನಲ್ಲಿ ಕಾಣಿಸುತ್ತದೆ. ಅಧಿಸೂಚನೆಗಳು ಯಾವತ್ತೂ ಡೀಫಾಲ್ಟ್ Signal ಐಕಾನ್ ಮತ್ತು ಹೆಸರನ್ನು ಪ್ರದರ್ಶಿಸುತ್ತವೆ. ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ</string>
+    <string name="preferences__app_icon_warning_learn_more">ಒಂದು ಆ್ಯಪ್ ಐಕಾನ್ ಮತ್ತು ಹೆಸರು ಆಯ್ಕೆ ಮಾಡಿ, ಅದು ನಿಮ್ಮ ಫೋನ್‌ನ ಹೋಮ್ ಸ್ಕ್ರೀನ್ ಮತ್ತು ಆ್ಯಪ್ ಡ್ರಾಯರ್‌ನಲ್ಲಿ ಕಾಣಿಸುತ್ತದೆ. ಅಧಿಸೂಚನೆಗಳು ಯಾವತ್ತೂ ಡೀಫಾಲ್ಟ್ Molly ಐಕಾನ್ ಮತ್ತು ಹೆಸರನ್ನು ಪ್ರದರ್ಶಿಸುತ್ತವೆ. ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">ಆ್ಯಪ್ ಐಕಾನ್‌ಗಳು ಮತ್ತು ಹೆಸರುಗಳು ಹೋಮ್ ಸ್ಕ್ರೀನ್ ಮತ್ತು ಆ್ಯಪ್ ಡ್ರಾಯರ್‌ನಲ್ಲಿ ಕಾಣಿಸುತ್ತವೆ.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">ಅಧಿಸೂಚನೆಗಳು ಯಾವತ್ತೂ ಡೀಫಾಲ್ಟ್ Signal ಐಕಾನ್ ಮತ್ತು ಹೆಸರನ್ನು ಪ್ರದರ್ಶಿಸುತ್ತವೆ.</string>
+    <string name="preferences__app_icon_notification_warning">ಅಧಿಸೂಚನೆಗಳು ಯಾವತ್ತೂ ಡೀಫಾಲ್ಟ್ Molly ಐಕಾನ್ ಮತ್ತು ಹೆಸರನ್ನು ಪ್ರದರ್ಶಿಸುತ್ತವೆ.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">ಇದು ಎಲ್ಲಾ ಚಾಟ್‌ಗಳನ್ನು %1$s ಅತ್ಯಂತ ಇತ್ತೀಚಿನ ಮೆಸೇಜ್‌ಗಳಿಗೆ ಶಾಶ್ವತವಾಗಿ ಟ್ರಿಮ್ ಮಾಡುತ್ತದೆ.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">ಎಲ್ಲಾ ಮೆಸೇಜ್‌ಗಳ ಇತಿಹಾಸ ಮತ್ತು ಮಾಧ್ಯಮವನ್ನು ಇದು ನಿಮ್ಮ ಸಾಧನದಿಂದ ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಿಹಾಕುತ್ತದೆ.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">ಇದು ಈ ಸಾಧನ ಮತ್ತು ಯಾವುದೇ ಲಿಂಕ್ ಮಾಡಲಾದ ಸಾಧನಗಳಿಂದ ಎಲ್ಲಾ ಮೆಸೇಜ್ ಇತಿಹಾಸ ಮತ್ತು ಮೀಡಿಯಾವನ್ನು ಶಾಶ್ವತವಾಗಿ ಅಳಿಸುತ್ತದೆ.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">ಎಲ್ಲಾ ಮೆಸೇಜ್ ಇತಿಹಾಸವನ್ನು ನೀವು ಖಚಿತವಾಗಿ ಅಳಿಸಲು ಬಯಸುವಿರಾ?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">ಎಲ್ಲಾ ಮೆಸೇಜ್ ಇತಿಹಾಸವನ್ನು ಶಾಶ್ವತವಾಗಿ ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ. ಈ ಕ್ರಿಯೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">ಎಲ್ಲಾ ಸಾಧನಗಳಿಂದ ಎಲ್ಲಾ ಮೆಸೇಜ್ ಇತಿಹಾಸವನ್ನು ಶಾಶ್ವತವಾಗಿ ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ. ಈ ಕ್ರಮವನ್ನು ರದ್ದುಪಡಿಸಲಾಗುವುದಿಲ್ಲ.</string>
     <string name="preferences_storage__delete_all_now">ಎಲ್ಲವನ್ನೂ ಈಗಲೇ ಅಳಿಸಿ</string>
     <string name="preferences_storage__forever">ಎಂದೆಂದಿಗೂ</string>
     <string name="preferences_storage__one_year">1 ವರ್ಷ</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">ಸೆನ್ಸಾರ್‌‌ಶಿಪ್ ದಾಟಿಹೋಗುವುದು</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">ಸೆನ್ಸಾರ್‌‌ಶಿಪ್ ದಾಟಿಹೋಗುವುದು</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">ಸಕ್ರಿಯಗೊಳಿಸಿದಲ್ಲಿ, Signal ಸೆನ್ಸಾರ್ಶಿಪ್ ಅನ್ನು ತಪ್ಪಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತದೆ. ನೀವು Signal ಸೆನ್ಸಾರ್ ಮಾಡಿದ ಸ್ಥಳದಲ್ಲಿ ಇಲ್ಲದಿದ್ದರೆ ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಬೇಡಿ.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">ಸಕ್ರಿಯಗೊಳಿಸಿದಲ್ಲಿ, Molly ಸೆನ್ಸಾರ್ಶಿಪ್ ಅನ್ನು ತಪ್ಪಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತದೆ. ನೀವು Molly ಸೆನ್ಸಾರ್ ಮಾಡಿದ ಸ್ಥಳದಲ್ಲಿ ಇಲ್ಲದಿದ್ದರೆ ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಬೇಡಿ.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">ನಿಮ್ಮ ಖಾತೆಯ ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ಆಧರಿಸಿ ಸೆನ್ಸಾರ್ಶಿಪ್ ತಪ್ಪಿಸುವಿಕೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">ಪಾವತಿಗಳನ್ನು ಪರಿಚಯಿಸಲಾಗುತ್ತಿದೆ</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">ಗೌಪ್ಯತೆಯ ಮೇಲೆ ಕೇಂದ್ರೀಕರಿಸಿದ ಹೊಸ ಡಿಜಿಟಲ್ ಕರೆನ್ಸಿ ಮೊಬೈಲ್‌ ಕಾಯಿನ್ ಕಳುಹಿಸಲು ಮತ್ತು ಸ್ವೀಕರಿಸಲು Signal ಬಳಸಿ. ಆರಂಭಿಸಲು ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">ಗೌಪ್ಯತೆಯ ಮೇಲೆ ಕೇಂದ್ರೀಕರಿಸಿದ ಹೊಸ ಡಿಜಿಟಲ್ ಕರೆನ್ಸಿ ಮೊಬೈಲ್‌ ಕಾಯಿನ್ ಕಳುಹಿಸಲು ಮತ್ತು ಸ್ವೀಕರಿಸಲು Molly ಬಳಸಿ. ಆರಂಭಿಸಲು ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
     <string name="PaymentsHomeFragment__activate_payments">ಪೇಮೆಂಟ್ಸ್ ಸಕ್ರಿಯಗೊಳಿಸಿ</string>
     <string name="PaymentsHomeFragment__activating_payments">ಪೇಮೆಂಟ್ಸ್ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತಿದೆ…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">ಪೇಮೆಂಟ್ಸ್ ಖಾತೆ ಮರುಸ್ಥಾಪಿಸಿ</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">ನಿಮ್ಮ ವಲಯದಲ್ಲಿ ಪೇಮೆಂಟ್ಸ್ ಲಭ್ಯವಿಲ್ಲ.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">ಪೇಮೆಂಟ್ಸ್ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗದು. ದಯವಿಟ್ಟು ಪುನಃ ನಂತರ ಪ್ರಯತ್ನಿಸಿ.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">ಪೇಮೆಂಟ್‌ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದೇ?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">ನೀವು ಪೇಮೆಂಟ್ಸ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದರೆ Signal ನಲ್ಲಿ Mobilecoin ಅನ್ನು ಕಳುಹಿಸಲು ಅಥವಾ ಸ್ವೀಕರಿಸಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">ನೀವು ಪೇಮೆಂಟ್ಸ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದರೆ Molly ನಲ್ಲಿ Mobilecoin ಅನ್ನು ಕಳುಹಿಸಲು ಅಥವಾ ಸ್ವೀಕರಿಸಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.</string>
     <string name="PaymentsHomeFragment__deactivate">ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</string>
     <string name="PaymentsHomeFragment__continue">ಮುಂದುವರಿಸಿ</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">ಬ್ಯಾಲೆನ್ಸ್ ಸದ್ಯ ಲಭ್ಯವಿಲ್ಲ.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">ವಿವರಗಳು</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">MobileCoin ಅನ್ನು ಕಳುಹಿಸಲು ಮತ್ತು ಸ್ವೀಕರಿಸಲು ನೀವು Signal ಅನ್ನು ಬಳಸಬಹುದು. ಎಲ್ಲಾ ಪಾವತಿಗಳು MobileCoins ಮತ್ತು MobileCoin Wallet ನ ಬಳಕೆಯ ಕರಾರುಗಳಿಗೆ ಒಳಪಟ್ಟಿವೆ. ನೀವು ಕೆಲವು ಸಮಸ್ಯೆಗಳನ್ನು ಎದುರಿಸಬಹುದು ಮತ್ತು ಪಾವತಿಗಳು ಅಥವಾ ಬ್ಯಾಲೆನ್ಸ್ ಅನ್ನು ನೀವು ಕಳೆದುಕೊಳ್ಳಬಹುದು ಹಾಗೂ ಅವುಗಳನ್ನು ಮರುಪಡೆಯಲು ಸಾಧ್ಯವಾಗದು. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">MobileCoin ಅನ್ನು ಕಳುಹಿಸಲು ಮತ್ತು ಸ್ವೀಕರಿಸಲು ನೀವು Molly ಅನ್ನು ಬಳಸಬಹುದು. ಎಲ್ಲಾ ಪಾವತಿಗಳು MobileCoins ಮತ್ತು MobileCoin Wallet ನ ಬಳಕೆಯ ಕರಾರುಗಳಿಗೆ ಒಳಪಟ್ಟಿವೆ. ನೀವು ಕೆಲವು ಸಮಸ್ಯೆಗಳನ್ನು ಎದುರಿಸಬಹುದು ಮತ್ತು ಪಾವತಿಗಳು ಅಥವಾ ಬ್ಯಾಲೆನ್ಸ್ ಅನ್ನು ನೀವು ಕಳೆದುಕೊಳ್ಳಬಹುದು ಹಾಗೂ ಅವುಗಳನ್ನು ಮರುಪಡೆಯಲು ಸಾಧ್ಯವಾಗದು. </string>
     <string name="PaymentsHomeFragment__activate">ಸಕ್ರಿಯಗೊಳಿಸಿ</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoin ನಿಯಮಗಳನ್ನು ವೀಕ್ಷಿಸಿ</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Signal ನಲ್ಲಿ ಪೇಮೆಂಟ್ಸ್‌ ಇನ್ನು ಲಭ್ಯವಿರುವುದಿಲ್ಲ. ನೀವು ಇನ್ನೂ ಎಕ್ಸ್‌ಚೇಂಜ್‌ಗೆ ಹಣವನ್ನು ವರ್ಗಾವಣೆ ಮಾಡಬಹುದು. ಆದರೆ, ನೀವು ಇನ್ನು ಪೇಮೆಂಟ್‌ಗಳನ್ನು ಕಳುಹಿಸಲಾಗದು ಮತ್ತು ಸ್ವೀಕರಿಸಲಾಗದು ಅಥವಾ ಫಂಡ್‌ಗಳನ್ನು ಸೇರಿಸಲಾಗದು.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Molly ನಲ್ಲಿ ಪೇಮೆಂಟ್ಸ್‌ ಇನ್ನು ಲಭ್ಯವಿರುವುದಿಲ್ಲ. ನೀವು ಇನ್ನೂ ಎಕ್ಸ್‌ಚೇಂಜ್‌ಗೆ ಹಣವನ್ನು ವರ್ಗಾವಣೆ ಮಾಡಬಹುದು. ಆದರೆ, ನೀವು ಇನ್ನು ಪೇಮೆಂಟ್‌ಗಳನ್ನು ಕಳುಹಿಸಲಾಗದು ಮತ್ತು ಸ್ವೀಕರಿಸಲಾಗದು ಅಥವಾ ಫಂಡ್‌ಗಳನ್ನು ಸೇರಿಸಲಾಗದು.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">ಅನುಮತಿಗಳನ್ನು ಅನುಮತಿಸಿ</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">ನಿಮಗೆ ತಿಳಿದಿರುವ ಜನರಿಗೆ ಮೆಸೇಜ್ ಕಳುಹಿಸಲು ನಿಮಗೆ ಸಹಾಯವಾಗಲು, Signal ಈ ಅನುಮತಿಗಳನ್ನು ವಿನಂತಿಸುತ್ತದೆ. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">ನಿಮಗೆ ತಿಳಿದಿರುವ ಜನರಿಗೆ ಮೆಸೇಜ್ ಕಳುಹಿಸಲು ನಿಮಗೆ ಸಹಾಯವಾಗಲು, Molly ಈ ಅನುಮತಿಗಳನ್ನು ವಿನಂತಿಸುತ್ತದೆ. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">ಅಧಿಸೂಚನೆಗಳು</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">ಮುಂದೆ</string>
     <string name="PaymentsTransferFragment__invalid_address">ಅಮಾನ್ಯ ವಿಳಾಸ</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">ವರ್ಗಾವಣೆ ಮಾಡಲು ನೀವು ಪ್ರಯತ್ನಿಸುತ್ತಿರುವ ವಾಲೆಟ್ ವಿಳಾಸವನ್ನು ಪರಿಶೀಲಿಸಿ ಮತ್ತು ಪುನಃ ಪ್ರಯತ್ನಿಸಿ.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">ನೀವು ನಿಮ್ಮದೇ Signal ವಾಲೆಟ್ ವಿಳಾಸಕ್ಕೆ ವರ್ಗಾವಣೆ ಮಾಡಿ. ಬೆಂಬಲಿಸಿದ ವಿನಿಮಯದಲ್ಲಿ ನಿಮ್ಮ ಖಾತೆಯಿಂದ ವಾಲೆಟ್ ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">ಕ್ಯುಆರ್‌ ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಲು, ಕ್ಯಾಮರಾ ಪ್ರವೇಶಾವಕಾಶವು Signal ಗೆ ಅಗತ್ಯವಿದೆ.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">ಕ್ಯುಆರ್‌ ಕೋಡ್ ಸೆರೆಹಿಡಿಯಲು ಕ್ಯಾಮರಾ ಅನುಮತಿಯು Signal ಗೆ ಅಗತ್ಯವಿದೆ. ಸೆಟ್ಟಿಂಗ್ಸ್‌ಗೆ ಹೋಗಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ ಮತ್ತು \"ಕ್ಯಾಮೆರಾ\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">ಕ್ಯುಆರ್‌ ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಲು, ಕ್ಯಾಮರಾ ಪ್ರವೇಶಾವಕಾಶವು Signal ಗೆ ಅಗತ್ಯವಿದೆ.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">ನೀವು ನಿಮ್ಮದೇ Molly ವಾಲೆಟ್ ವಿಳಾಸಕ್ಕೆ ವರ್ಗಾವಣೆ ಮಾಡಿ. ಬೆಂಬಲಿಸಿದ ವಿನಿಮಯದಲ್ಲಿ ನಿಮ್ಮ ಖಾತೆಯಿಂದ ವಾಲೆಟ್ ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">ಕ್ಯುಆರ್‌ ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಲು, ಕ್ಯಾಮರಾ ಪ್ರವೇಶಾವಕಾಶವು Molly ಗೆ ಅಗತ್ಯವಿದೆ.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">ಕ್ಯುಆರ್‌ ಕೋಡ್ ಸೆರೆಹಿಡಿಯಲು ಕ್ಯಾಮರಾ ಅನುಮತಿಯು Molly ಗೆ ಅಗತ್ಯವಿದೆ. ಸೆಟ್ಟಿಂಗ್ಸ್‌ಗೆ ಹೋಗಿ, \"ಅನುಮತಿಗಳು\" ಆಯ್ಕೆ ಮಾಡಿ ಮತ್ತು \"ಕ್ಯಾಮೆರಾ\" ಸಕ್ರಿಯಗೊಳಿಸಿ.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">ಕ್ಯುಆರ್‌ ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಲು, ಕ್ಯಾಮರಾ ಪ್ರವೇಶಾವಕಾಶವು Molly ಗೆ ಅಗತ್ಯವಿದೆ.</string>
     <string name="PaymentsTransferFragment__settings">ಸೆಟ್ಟಿಂಗ್‌ಗಳು</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">ಒಳಬರುವ Signal ಧ್ವನಿ ಕರೆ</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">ಒಳಬರುವ Molly ಧ್ವನಿ ಕರೆ</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">ಒಳಬರುವ Signal ವೀಡಿಯೊ ಕರೆ</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">ಒಳಬರುವ Molly ವೀಡಿಯೊ ಕರೆ</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">ಒಳಬರುವ Signal ಗ್ರೂಪ್ ಕರೆ</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">ಒಳಬರುವ Molly ಗ್ರೂಪ್ ಕರೆ</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">ಚಾಲ್ತಿಯಲ್ಲಿರುವ Signal ಧ್ವನಿ ಕರೆ</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">ಚಾಲ್ತಿಯಲ್ಲಿರುವ Molly ಧ್ವನಿ ಕರೆ</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">ಚಾಲ್ತಿಯಲ್ಲಿರುವ Signal ವೀಡಿಯೊ ಕರೆ</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">ಚಾಲ್ತಿಯಲ್ಲಿರುವ Molly ವೀಡಿಯೊ ಕರೆ</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">ಚಾಲ್ತಿಯಲ್ಲಿರುವ Signal ಗ್ರೂಪ್ ಕರೆ</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">ಚಾಲ್ತಿಯಲ್ಲಿರುವ Molly ಗ್ರೂಪ್ ಕರೆ</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">ದೃಢೀಕರಿಸಿ</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">ನೀವು ನಿಮ್ಮ ಬ್ಯಾಕಪ್ ಪಾಸ್‌ಫ್ರೇಸ್ ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ನಮೂದಿಸಿದ್ದೀರಿ</string>
     <string name="BackupDialog_passphrase_was_not_correct">ಪಾಸ್‌ಫ್ರೇಸ್ ಸರಿಯಾಗಿರಲಿಲ್ಲ</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signal ಬ್ಯಾಕಪ್ ರಚಿಸಲಾಗುತ್ತಿದೆ…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Molly ಬ್ಯಾಕಪ್ ರಚಿಸಲಾಗುತ್ತಿದೆ…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Signal ಬ್ಯಾಕಪ್ ದೃಢೀಕರಿಸಲಾಗುತ್ತಿದೆ…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Molly ಬ್ಯಾಕಪ್ ದೃಢೀಕರಿಸಲಾಗುತ್ತಿದೆ…</string>
     <string name="LocalBackupJobApi29_backup_failed">ಬ್ಯಾಕಪ್ ವಿಫಲವಾಗಿದೆ</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">ನಿಮ್ಮ ಬ್ಯಾಕಪ್ ಡೈರೆಕ್ಟರಿಯನ್ನು ಅಳಿಸಲಾಗಿದೆ ಅಥವಾ ಸರಿಸಲಾಗಿದೆ.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">ನಿಮ್ಮ ಬ್ಯಾಕಪ್ ಫೈಲ್ ಈ ಪ್ರಮಾಣದಲ್ಲಿ ಸಂಗ್ರಹಿಸಲು ತುಂಬಾ ದೊಡ್ಡದಾಗಿದೆ.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">(%1$02d:%2$02d) ರ ಬಳಿಕ ನನಗೆ ಕರೆ ಮಾಡಿ</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">ಕೋಡ್ ಮರುಕಳುಹಿಸಿ (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">ಸಂಪರ್ಕಿಸಿ Signal ಬೆಂಬಲ</string>
-    <string name="RegistrationActivity_code_support_subject">Signal ನೋಂದಣಿ - ಆಂಡ್ರಾಯ್ಡ್‌ಗೆ ದೃಢೀಕರಣ ಕೋಡ್</string>
+    <string name="RegistrationActivity_contact_signal_support">ಸಂಪರ್ಕಿಸಿ Molly ಬೆಂಬಲ</string>
+    <string name="RegistrationActivity_code_support_subject">Molly ನೋಂದಣಿ - ಆಂಡ್ರಾಯ್ಡ್‌ಗೆ ದೃಢೀಕರಣ ಕೋಡ್</string>
     <string name="RegistrationActivity_incorrect_code">ತಪ್ಪಾದ ಕೋಡ್</string>
     <string name="BackupUtil_never">ಎಂದಿಗೂ ಇಲ್ಲ</string>
     <string name="BackupUtil_unknown">ತಿಳಿಯದಿಲ್ಲ</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">ದೂರವಾಣಿ ಸಂಖ್ಯೆ</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">ನಿಮ್ಮ ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ಯಾರು ನೋಡಬಹುದು ಮತ್ತು ಅದರ ಮೂಲಕ Signal ನಲ್ಲಿ ನಿಮ್ಮನ್ನು ಯಾರು ಸಂಪರ್ಕಿಸಬಹುದು ಎಂಬುದನ್ನು ಆಯ್ಕೆಮಾಡಿ.</string>
+    <string name="preferences_app_protection__choose_who_can_see">ನಿಮ್ಮ ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ಯಾರು ನೋಡಬಹುದು ಮತ್ತು ಅದರ ಮೂಲಕ Molly ನಲ್ಲಿ ನಿಮ್ಮನ್ನು ಯಾರು ಸಂಪರ್ಕಿಸಬಹುದು ಎಂಬುದನ್ನು ಆಯ್ಕೆಮಾಡಿ.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">ನನ್ನ ಸಂಖ್ಯೆಯನ್ನು ಯಾರು ನೋಡಬಹುದು</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">ನೀವು ಹಲವಾರು ಪ್ರಯತ್ನಗಳನ್ನು ಮಾಡಿದ್ದೀರಿ. ಮರಳಿ ಪ್ರಯತ್ನಿಸಿ.</string>
     <string name="RegistrationActivity_error_connecting_to_service">ಸೇವೆಗೆ ಸಂಪರ್ಕಿಸುವಲ್ಲಿ ದೋಷ</string>
     <string name="preferences_chats__backups">ಬ್ಯಾಕಪ್‌ಗಳು</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal ಅನ್‌‌ಲಾಕ್ ಆಗಿದೆ</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly ಅನ್‌‌ಲಾಕ್ ಆಗಿದೆ</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ</string>
     <string name="Recipient_unknown">ತಿಳಿದಿಲ್ಲ</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">ನಿಮ್ಮ ಹಳೆಯ ಸಾಧನಕ್ಕೆ ನಿಮಗೆ ಪ್ರವೇಶ ಅಗತ್ಯವಿದೆ.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">ಬ್ಯಾಕಪ್‌ನಿಂದ ರಿಸ್ಟೋರ್ ಮಾಡಿ</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">ಸ್ಥಳೀಯ ಬ್ಯಾಕಪ್‌ನಿಂದ ನಿಮ್ಮ ಮೆಸೇಜ್‌ಗಳನ್ನು ರಿಸ್ಟೋರ್ ಮಾಡಿ. ನೀವು ಈಗ ರಿಸ್ಟೋರ್ ಮಾಡದಿದ್ದರೆ, ನಂತರ ರಿಸ್ಟೋರ್ ಮಾಡಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">ಸ್ಥಳೀಯ ಬ್ಯಾಕಪ್ ಅನ್ನು ರಿಸ್ಟೋರ್ ಮಾಡಿ</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signal ಬ್ಯಾಕಪ್ ಅನ್ನು ರಿಸ್ಟೋರ್ ಮಾಡಿ</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">ನಿಮ್ಮ ಎಲ್ಲಾ ಟೆಕ್ಸ್ಟ್ ಮೆಸೇಜ್‌ಗಳನ್ನು + ನಿಮ್ಮ ಕೊನೆಯ 30 ದಿನಗಳ ಮೀಡಿಯಾವನ್ನು ರಿಸ್ಟೋರ್ ಮಾಡಿ</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು</string>
 
+    <string name="TransferOrRestoreFragment__cancel">ರದ್ದುಮಾಡಿ</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">ವರ್ಗಾವಣೆ ಮಾಡದೆಯೇ ಲಾಗ್ ಇನ್ ಮಾಡಿ</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">ನಿಮ್ಮ ಮೆಸೇಜ್‌ಗಳು ಮತ್ತು ಮೀಡಿಯಾವನ್ನು ವರ್ಗಾಯಿಸದೆಯೇ ಮುಂದುವರಿಸಿ</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">ನಿಮ್ಮ ಹಳೆಯ ಆಂಡ್ರಾಯ್ಡ್‌ ಫೋನ್‌ನಲ್ಲಿ Signal ತೆರೆಯಿರಿ</string>
     <string name="NewDeviceTransferInstructions__continue">ಮುಂದುವರಿಸಿ</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">ಹಳೆಯ ಆಂಡ್ರಾಯ್ಡ್ ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಿಸಲು ಸಿದ್ಧವಾಗುತ್ತಿದೆ…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">ಒಂದು ಕ್ಷಣ ತೆಗೆದುಕೊಳ್ಳುತ್ತಿದೆ, ಶೀಘ್ರದಲ್ಲೇ ಸಿದ್ಧವಾಗುತ್ತದೆ</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">ಸಂಪರ್ಕಿಸಲು ಹಳೆಯ ಆಂಡ್ರಾಯ್ಡ್‌ ಸಾಧನಕ್ಕೆ ನಿರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">ನಿಮ್ಮ ಹಳೆಯ ಆಂಡ್ರಾಯ್ಡ್‌ ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಿಸಲು ಮತ್ತು ಶೋಧಿಸಲು ಸ್ಥಳ ಅನುಮತಿಯು Signal ಗೆ ಅಗತ್ಯವಿದೆ.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">ನಿಮ್ಮ ಹಳೆಯ ಆಂಡ್ರಾಯ್ಡ್ ಸಾಧನದೊಂದಿಗೆ ಸಂಪರ್ಕಿಸಲು ಮತ್ತು ಶೋಧಿಸಲು Signal ಗೆ ಸ್ಥಳ ಸೇವೆಗಳು ಸಕ್ರಿಯಗೊಳ್ಳಬೇಕು.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">ನಿಮ್ಮ ಹಳೆಯ ಆಂಡ್ರಾಯ್ಡ್‌ ಸಾಧನದೊಂದಿಗೆ ಸಂಪರ್ಕಿಸಲು ಮತ್ತು ಶೋಧಿಸಲು Signal ಗೆ ವೈಫೈ ಆನ್ ಆಗಿರುವುದು ಅಗತ್ಯವಿದೆ. ವೈಫೈ ಆನ್ ಆಗಿರಬೇಕು. ಆದರೆ, ಇದು ವೈಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿರಬೇಕಿಲ್ಲ.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">ಕ್ಷಮಿಸಿ, ಈ ಸಾಧನವು ವೈಫೈ ಡೈರೆಕ್ಟ್ ಅನ್ನು ಬೆಂಬಲಿಸುವಂತೆ ತೋರುತ್ತಿಲ್ಲ. ನಿಮ್ಮ ಹಳೆಯ ಆಂಡ್ರಾಯ್ಡ್ ಸಾಧನದೊಂದಿಗೆ ಸಂಪರ್ಕಿಸಲು ಮತ್ತು ಶೋಧಿಸಲು ವೈಫೈ ಡೈರೆಕ್ಟ್ ಅನ್ನು Signal ಬಳಸುತ್ತದೆ. ನಿಮ್ಮ ಹಳೆಯ ಆಂಡ್ರಾಯ್ಡ್ ಸಾಧನದಿಂದ ನಿಮ್ಮ ಖಾತೆಯನ್ನು ರಿಸ್ಟೋರ್ ಮಾಡಲು ಬ್ಯಾಕಪ್‌ ಅನ್ನು ಇನ್ನೂ ನೀವು ರಿಸ್ಟೋರ್ ಮಾಡಬಹುದು.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">ನಿಮ್ಮ ಹಳೆಯ ಆಂಡ್ರಾಯ್ಡ್‌ ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಿಸಲು ಮತ್ತು ಶೋಧಿಸಲು ಸ್ಥಳ ಅನುಮತಿಯು Molly ಗೆ ಅಗತ್ಯವಿದೆ.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">ನಿಮ್ಮ ಹಳೆಯ ಆಂಡ್ರಾಯ್ಡ್ ಸಾಧನದೊಂದಿಗೆ ಸಂಪರ್ಕಿಸಲು ಮತ್ತು ಶೋಧಿಸಲು Molly ಗೆ ಸ್ಥಳ ಸೇವೆಗಳು ಸಕ್ರಿಯಗೊಳ್ಳಬೇಕು.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">ನಿಮ್ಮ ಹಳೆಯ ಆಂಡ್ರಾಯ್ಡ್‌ ಸಾಧನದೊಂದಿಗೆ ಸಂಪರ್ಕಿಸಲು ಮತ್ತು ಶೋಧಿಸಲು Molly ಗೆ ವೈಫೈ ಆನ್ ಆಗಿರುವುದು ಅಗತ್ಯವಿದೆ. ವೈಫೈ ಆನ್ ಆಗಿರಬೇಕು. ಆದರೆ, ಇದು ವೈಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿರಬೇಕಿಲ್ಲ.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">ಕ್ಷಮಿಸಿ, ಈ ಸಾಧನವು ವೈಫೈ ಡೈರೆಕ್ಟ್ ಅನ್ನು ಬೆಂಬಲಿಸುವಂತೆ ತೋರುತ್ತಿಲ್ಲ. ನಿಮ್ಮ ಹಳೆಯ ಆಂಡ್ರಾಯ್ಡ್ ಸಾಧನದೊಂದಿಗೆ ಸಂಪರ್ಕಿಸಲು ಮತ್ತು ಶೋಧಿಸಲು ವೈಫೈ ಡೈರೆಕ್ಟ್ ಅನ್ನು Molly ಬಳಸುತ್ತದೆ. ನಿಮ್ಮ ಹಳೆಯ ಆಂಡ್ರಾಯ್ಡ್ ಸಾಧನದಿಂದ ನಿಮ್ಮ ಖಾತೆಯನ್ನು ರಿಸ್ಟೋರ್ ಮಾಡಲು ಬ್ಯಾಕಪ್‌ ಅನ್ನು ಇನ್ನೂ ನೀವು ರಿಸ್ಟೋರ್ ಮಾಡಬಹುದು.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">ಬ್ಯಾಕಪ್ ಅನ್ನು ರಿಸ್ಟೋರ್ ಮಾಡಿ</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">ನಿಮ್ಮ ಹಳೆಯ ಆಂಡ್ರಾಯ್ಡ್ ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತಿರುವಾಗ ಒಂದು ಅನಿರೀಕ್ಷಿತ ದೋಷ ಕಂಡುಬಂದಿದೆ.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">ಹೊಸ ಆಂಡ್ರಾಯ್ಡ್ ಸಾಧನ ಹುಡುಕಲಾಗುತ್ತಿದೆ…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">ನಿಮ್ಮ ಹೊಸ ಆಂಡ್ರಾಯ್ಡ್ ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಿಸಲು ಮತ್ತು ಶೋಧಿಸಲು ಸ್ಥಳ ಅನುಮತಿಯು Signal ಗೆ ಅಗತ್ಯವಿದೆ.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">ನಿಮ್ಮ ಹೊಸ ಆಂಡ್ರಾಯ್ಡ್ ಸಾಧನದೊಂದಿಗೆ ಸಂಪರ್ಕಿಸಲು ಮತ್ತು ಶೋಧಿಸಲು Signal ಗೆ ಸ್ಥಳ ಸೇವೆಗಳು ಸಕ್ರಿಯಗೊಳ್ಳಬೇಕು.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">ನಿಮ್ಮ ಹೊಸ ಆಂಡ್ರಾಯ್ಡ್‌ ಸಾಧನದೊಂದಿಗೆ ಸಂಪರ್ಕಿಸಲು ಮತ್ತು ಶೋಧಿಸಲು Signal ಗೆ ವೈಫೈ ಆನ್ ಆಗಿರುವುದು ಅಗತ್ಯವಿದೆ. ವೈಫೈ ಆನ್ ಆಗಿರಬೇಕು. ಆದರೆ, ಇದು ವೈಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿರಬೇಕಿಲ್ಲ.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">ಕ್ಷಮಿಸಿ, ಈ ಸಾಧನವು ವೈಫೈ ಡೈರೆಕ್ಟ್ ಅನ್ನು ಬೆಂಬಲಿಸುವಂತೆ ತೋರುತ್ತಿಲ್ಲ. ನಿಮ್ಮ ಹೊಸ ಆಂಡ್ರಾಯ್ಡ್ ಸಾಧನದೊಂದಿಗೆ ಸಂಪರ್ಕಿಸಲು ಮತ್ತು ಶೋಧಿಸಲು ವೈಫೈ ಡೈರೆಕ್ಟ್ ಅನ್ನು Signal ಬಳಸುತ್ತದೆ. ನಿಮ್ಮ ಹೊಸ ಆಂಡ್ರಾಯ್ಡ್ ಸಾಧನದಿಂದ ನಿಮ್ಮ ಖಾತೆಯನ್ನು ರಿಸ್ಟೋರ್ ಮಾಡಲು ಬ್ಯಾಕಪ್‌ ಅನ್ನು ಇನ್ನೂ ನೀವು ರಿಸ್ಟೋರ್ ಮಾಡಬಹುದು.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">ನಿಮ್ಮ ಹೊಸ ಆಂಡ್ರಾಯ್ಡ್ ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಿಸಲು ಮತ್ತು ಶೋಧಿಸಲು ಸ್ಥಳ ಅನುಮತಿಯು Molly ಗೆ ಅಗತ್ಯವಿದೆ.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">ನಿಮ್ಮ ಹೊಸ ಆಂಡ್ರಾಯ್ಡ್ ಸಾಧನದೊಂದಿಗೆ ಸಂಪರ್ಕಿಸಲು ಮತ್ತು ಶೋಧಿಸಲು Molly ಗೆ ಸ್ಥಳ ಸೇವೆಗಳು ಸಕ್ರಿಯಗೊಳ್ಳಬೇಕು.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">ನಿಮ್ಮ ಹೊಸ ಆಂಡ್ರಾಯ್ಡ್‌ ಸಾಧನದೊಂದಿಗೆ ಸಂಪರ್ಕಿಸಲು ಮತ್ತು ಶೋಧಿಸಲು Molly ಗೆ ವೈಫೈ ಆನ್ ಆಗಿರುವುದು ಅಗತ್ಯವಿದೆ. ವೈಫೈ ಆನ್ ಆಗಿರಬೇಕು. ಆದರೆ, ಇದು ವೈಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿರಬೇಕಿಲ್ಲ.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">ಕ್ಷಮಿಸಿ, ಈ ಸಾಧನವು ವೈಫೈ ಡೈರೆಕ್ಟ್ ಅನ್ನು ಬೆಂಬಲಿಸುವಂತೆ ತೋರುತ್ತಿಲ್ಲ. ನಿಮ್ಮ ಹೊಸ ಆಂಡ್ರಾಯ್ಡ್ ಸಾಧನದೊಂದಿಗೆ ಸಂಪರ್ಕಿಸಲು ಮತ್ತು ಶೋಧಿಸಲು ವೈಫೈ ಡೈರೆಕ್ಟ್ ಅನ್ನು Molly ಬಳಸುತ್ತದೆ. ನಿಮ್ಮ ಹೊಸ ಆಂಡ್ರಾಯ್ಡ್ ಸಾಧನದಿಂದ ನಿಮ್ಮ ಖಾತೆಯನ್ನು ರಿಸ್ಟೋರ್ ಮಾಡಲು ಬ್ಯಾಕಪ್‌ ಅನ್ನು ಇನ್ನೂ ನೀವು ರಿಸ್ಟೋರ್ ಮಾಡಬಹುದು.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">ಬ್ಯಾಕಪ್ ರಚಿಸಿ</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">ನಿಮ್ಮ ಹೊಸ ಆಂಡ್ರಾಯ್ಡ್ ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತಿರುವಾಗ ಒಂದು ಅನಿರೀಕ್ಷಿತ ದೋಷ ಕಂಡುಬಂದಿದೆ.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">ಡೇಟಾ ವರ್ಗಾವಣೆ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">ಎರಡೂ ಸಾಧನಗಳನ್ನು ಪರಸ್ಪರ ಹತ್ತಿರ ಇರಿಸಿ. ಸಾಧನಗಳನ್ನು ಆಫ್ ಮಾಡಬೇಡಿ ಮತ್ತು Signal ಅನ್ನು ತೆರೆದೇ ಇರಿಸಿ. ವರ್ಗಾವಣೆಗಳು ಎಂಡ್-ಟು-ಎಂಡ್ ಎನ್‌ಕ್ರಿಪ್ಟ್‌ ಆಗಿರುತ್ತವೆ.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">ಎರಡೂ ಸಾಧನಗಳನ್ನು ಪರಸ್ಪರ ಹತ್ತಿರ ಇರಿಸಿ. ಸಾಧನಗಳನ್ನು ಆಫ್ ಮಾಡಬೇಡಿ ಮತ್ತು Molly ಅನ್ನು ತೆರೆದೇ ಇರಿಸಿ. ವರ್ಗಾವಣೆಗಳು ಎಂಡ್-ಟು-ಎಂಡ್ ಎನ್‌ಕ್ರಿಪ್ಟ್‌ ಆಗಿರುತ್ತವೆ.</string>
     <string name="DeviceTransfer__d_messages_so_far">ಇಲ್ಲಿಯವರೆಗೆ %1$d ಸಂದೇಶಗಳು…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">ಈ ತನಕದ ಮೆಸೇಜ್‌ಗಳ %1$s%% …</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">ಖಾತೆ ವರ್ಗಾಯಿಸಿ</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">ನಿಮ್ಮ ಹೊಸ ಆಂಡ್ರಾಯ್ಡ್‌ ಸಾಧನದಲ್ಲಿ Signal ಡೌನ್‌ಲೋಡ್‌ ಮಾಡಿ</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">ನಿಮ್ಮ ಹೊಸ ಆಂಡ್ರಾಯ್ಡ್‌ ಸಾಧನದಲ್ಲಿ Molly ಡೌನ್‌ಲೋಡ್‌ ಮಾಡಿ</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"\"ಖಾತೆ ವರ್ಗಾವಣೆ ಮಾಡಿ ಅಥವಾ ರಿಸ್ಟೋರ್ ಮಾಡಿ\" ಮೇಲೆ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">ಈ ಲಿಂಕ್‌ನೊಂದಿಗೆ ಯಾರಾದರೂ ಈ ಗುಂಪಿನ ಹೆಸರು ಮತ್ತು ಸದಸ್ಯರನ್ನು ನೋಡಬಹುದು ಹಾಗೂ ಸೇರಲು ವಿನಂತಿಸಬಹುದು. ನೀವು ನಂಬುವ ಜನರೊಂದಿಗೆ ಇದನ್ನು ಹಂಚಿಕೊಳ್ಳಿ.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">ಈ ಲಿಂಕ್‌ನೊಂದಿಗೆ ಯಾರಾದರೂ ಈ ಗುಂಪಿನ ಹೆಸರು ಮತ್ತು ಸದಸ್ಯರನ್ನು ನೋಡಬಹುದು ಹಾಗೂ ಗ್ರೂಪ್ ಸೇರಬಹುದು. ನೀವು ನಂಬುವ ಜನರೊಂದಿಗೆ ಇದನ್ನು ಹಂಚಿಕೊಳ್ಳಿ.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Signal ನಿಂದ ಹಂಚಿಕೊಳ್ಳಿ</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Molly ನಿಂದ ಹಂಚಿಕೊಳ್ಳಿ</string>
     <string name="GroupLinkBottomSheet_copy">ನಕಲಿಸು</string>
     <string name="GroupLinkBottomSheet_qr_code">ಕ್ಯುಆರ್‌ ಕೋಡ್</string>
     <string name="GroupLinkBottomSheet_share">ಹಂಚಿಕೊಳ್ಳಿ</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">ಮೊಬೈಲ್‌ಕಾಯಿನ್‌ ಬಗ್ಗೆ</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">ಮೊಬೈಲ್ ಕಾಯಿನ್ ಹೊಸ ಗೌಪ್ಯತೆ ಆಧರಿತ ಡಿಜಿಟಲ್ ಕರೆನ್ಸಿ.</string>
     <string name="payment_info_card_adding_funds">ಫಂಡ್‌ಗಳನ್ನು ಸೇರಿಸಲಾಗುತ್ತಿದೆ</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">ನಿಮ್ಮ ವಾಲೆಟ್ ವಿಳಾಸಕ್ಕೆ ಮೊಬೈಲ್‌ಕಾಯಿನ್ ಅನ್ನು ಕಳುಹಿಸುವ ಮೂಲಕ Signal ನಲ್ಲಿ ಬಳಸಲು ನೀವು ಫಂಡ್‌ಗಳನ್ನು ಸೇರಿಸಬಹುದು.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">ನಿಮ್ಮ ವಾಲೆಟ್ ವಿಳಾಸಕ್ಕೆ ಮೊಬೈಲ್‌ಕಾಯಿನ್ ಅನ್ನು ಕಳುಹಿಸುವ ಮೂಲಕ Molly ನಲ್ಲಿ ಬಳಸಲು ನೀವು ಫಂಡ್‌ಗಳನ್ನು ಸೇರಿಸಬಹುದು.</string>
     <string name="payment_info_card_cashing_out">ನಗದು ಮಾಡಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">MobileCoin ಬೆಂಬಲಿಸುವ ವಿನಿಮಯದಲ್ಲಿ ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ನೀವು MobileCoin ಅನ್ನು ನಗದು ಮಾಡಿಕೊಳ್ಳಬಹುದು. ಆ ವಿನಿಮಯದಲ್ಲಿ ನಿಮ್ಮ ಖಾತೆಗೆ ಕೇವಲ ವರ್ಗಾವಣೆ ಮಾಡಿಕೊಳ್ಳಿ.</string>
     <string name="payment_info_card_hide_this_card">ಈ ಕಾರ್ಡ್ ಮರೆ ಮಾಡುವುದೇ?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">ವಾಲೆಟ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</string>
     <string name="DeactivateWalletFragment__your_balance">ನಿಮ್ಮ ಬ್ಯಾಲೆನ್ಸ್</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">ಪಾವತಿಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದಕ್ಕೂ ಮುನ್ನ ಇನ್ನೊಂದು ವಾಲೆಟ್ ವಿಳಾಸಕ್ಕೆ ನಿಮ್ಮ ಹಣವನ್ನು ವರ್ಗಾವಣೆ ಮಾಡಿಕೊಳ್ಳುವುದನ್ನು ನಿಮಗೆ ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ. ಈಗ ನಿಮ್ಮ ಹಣವನ್ನು ವರ್ಗಾವಣೆ ಮಾಡದಿರಲು ನೀವು ಆಯ್ಕೆ ಮಾಡಿಕೊಂಡರೆ, ಪಾವತಿಗಳನ್ನು ನೀವು ಪುನಃ ಸಕ್ರಿಯಗೊಳಿಸಿದರೆ Signal ಗೆ ಲಿಂಕ್‌ ಮಾಡಿದ ನಿಮ್ಮ ವಾಲೆಟ್‌ನಲ್ಲಿಯೇ ಅವು ಇರುತ್ತವೆ.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">ಪಾವತಿಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದಕ್ಕೂ ಮುನ್ನ ಇನ್ನೊಂದು ವಾಲೆಟ್ ವಿಳಾಸಕ್ಕೆ ನಿಮ್ಮ ಹಣವನ್ನು ವರ್ಗಾವಣೆ ಮಾಡಿಕೊಳ್ಳುವುದನ್ನು ನಿಮಗೆ ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ. ಈಗ ನಿಮ್ಮ ಹಣವನ್ನು ವರ್ಗಾವಣೆ ಮಾಡದಿರಲು ನೀವು ಆಯ್ಕೆ ಮಾಡಿಕೊಂಡರೆ, ಪಾವತಿಗಳನ್ನು ನೀವು ಪುನಃ ಸಕ್ರಿಯಗೊಳಿಸಿದರೆ Molly ಗೆ ಲಿಂಕ್‌ ಮಾಡಿದ ನಿಮ್ಮ ವಾಲೆಟ್‌ನಲ್ಲಿಯೇ ಅವು ಇರುತ್ತವೆ.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">ಉಳಿದ ಬ್ಯಾಲೆನ್ಸ್ ಅನ್ನು ವರ್ಗಾವಣೆ ಮಾಡಿ</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">ವರ್ಗಾಯಿಸದೆ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</string>
     <string name="DeactivateWalletFragment__deactivate">ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">ವರ್ಗಾವಣೆ ಮಾಡದೇ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದೇ?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">ನೀವು ಪಾವತಿಗಳನ್ನು ಪುನಃ ಸಕ್ರಿಯಗೊಳಿಸಲು ಆಯ್ಕೆ ಮಾಡಿಕೊಂಡರೆ, Signal ಗೆ ಲಿಂಕ್ ಮಾಡಿದ ನಿಮ್ಮ ವಾಲೆಟ್‌ನಲ್ಲಿ ನಿಮ್ಮ ಬ್ಯಾಲೆನ್ಸ್ ಇರುತ್ತದೆ.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">ನೀವು ಪಾವತಿಗಳನ್ನು ಪುನಃ ಸಕ್ರಿಯಗೊಳಿಸಲು ಆಯ್ಕೆ ಮಾಡಿಕೊಂಡರೆ, Molly ಗೆ ಲಿಂಕ್ ಮಾಡಿದ ನಿಮ್ಮ ವಾಲೆಟ್‌ನಲ್ಲಿ ನಿಮ್ಮ ಬ್ಯಾಲೆನ್ಸ್ ಇರುತ್ತದೆ.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">ವಾಲೆಟ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವಲ್ಲಿ ದೋಷ.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">ಪರವಾನಗಿಗಳು</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">ನಿಯಮಗಳು &amp; ಖಾಸಗಿತನ ನೀತಿ</string>
-    <string name="HelpFragment__copyright_signal_messenger">ಹಕ್ಕುಸ್ವಾಮ್ಯ Signal ಮೆಸೆಂಜರ್</string>
+    <string name="HelpFragment__copyright_signal_messenger">ಹಕ್ಕುಸ್ವಾಮ್ಯ Molly ಮೆಸೆಂಜರ್</string>
     <string name="HelpFragment__licenced_under_the_agplv3">GNU AGPLv3 ಅಡಿಯಲ್ಲಿ ಪರವಾನಗಿ ಹೊಂದಿದೆ</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4773,7 +4911,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">ಸ್ವಯಂಚಾಲಿತ</string>
+    <string name="ChatColorSelectionFragment__auto">ಸ್ವಯಂ</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">ಕಸ್ಟಮ್ ಬಣ್ಣಗಳನ್ನು ಬಳಸಿ</string>
     <string name="ChatColorSelectionFragment__chat_color">ಚಾಟ್ ಬಣ್ಣ</string>
     <string name="ChatColorSelectionFragment__edit">ತಿದ್ದಿ</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">ಬಣ್ಣವನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">ಎಸ್‌ಎಂಎಸ್‌</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">ಹಂಚಿಕೊಳ್ಳಿ</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">ಈ ಗುಂಪಿಗೆ ಅಡ್ಮಿನ್‌ಗಳು ಮಾತ್ರ ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಬಹುದು.</string>
-    <string name="MultiselectForwardFragment__limit_reached">ಮಿತಿ ತಲುಪಿದೆ</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">ನಿಮಗೆ 5 ಕ್ಕಿಂತ ಹೆಚ್ಚಿನ ಚಾಟ್‌ಗಳನ್ನು ಆಯ್ಕೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Signal ಅನ್ನು ನವೀಕರಿಸಿ</string>
+    <string name="UpdateSignalExpiredDialog__title">Molly ಅನ್ನು ನವೀಕರಿಸಿ</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Signal ನ ಈ ಆವೃತ್ತಿಯ ವಾಯಿದೆ ಮುಗಿದಿದೆ. Signal ಬಳಕೆ ಮುಂದುವರಿಸಲು ಈಗಲೇ ಅಪ್‌ಡೇಟ್ ಮಾಡಿ.</string>
+    <string name="UpdateSignalExpiredDialog__message">Molly ನ ಈ ಆವೃತ್ತಿಯ ವಾಯಿದೆ ಮುಗಿದಿದೆ. Molly ಬಳಕೆ ಮುಂದುವರಿಸಲು ಈಗಲೇ ಅಪ್‌ಡೇಟ್ ಮಾಡಿ.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">ನವೀಕರಿಸಿ</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">ಸಾಧನವು ನೋಂದಾಯಿತಗೊಂಡಿಲ್ಲ</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">ಈ ಸಾಧನವು ಇನ್ನು ನೋಂದಾಯಿತವಾಗಿರುವುದಿಲ್ಲ. ಈ ಸಾಧನದಲ್ಲಿ Signal ಬಳಕೆಯನ್ನು ಮುಂದುವರಿಸಲು ಮರುನೋಂದಾಯಿಸಿ.</string>
+    <string name="ReregisterSignalDialog__message">ಈ ಸಾಧನವು ಇನ್ನು ನೋಂದಾಯಿತವಾಗಿರುವುದಿಲ್ಲ. ಈ ಸಾಧನದಲ್ಲಿ Molly ಬಳಕೆಯನ್ನು ಮುಂದುವರಿಸಲು ಮರುನೋಂದಾಯಿಸಿ.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">ಪುನಃ ನೋಂದಾಯಿಸಿ</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">ಪಿಕರ್ ತೆರೆಯಲು ವಿಫಲವಾಗಿದೆ</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">ಅಧಿಸೂಚನೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು, ಅವುಗಳನ್ನು ಪ್ರದರ್ಶಿಸಲು Signal ಗೆ ಅನುಮತಿಯ ಅಗತ್ಯವಿದೆ.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">ಅಧಿಸೂಚನೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು, ಅವುಗಳನ್ನು ಪ್ರದರ್ಶಿಸಲು Molly ಗೆ ಅನುಮತಿಯ ಅಗತ್ಯವಿದೆ.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">ಆನ್‌ ಮಾಡಿ</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">ಇನ್ನೂ ಯಾವುದೇ ಪ್ರತ್ಯುತ್ತರವಿಲ್ಲ</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">ಈ ಸ್ಟೋರಿಗೆ ನೀವು ಉತ್ತರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ, ಯಾಕೆಂದರೆ ನೀವೀಗ ಈ ಗ್ರೂಪ್ ನ  ಸದಸ್ಯರಾಗಿ ಉಳಿದಿಲ್ಲ.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">ಸ್ಟೋರಿಗೆ ಪ್ರತಿಕ್ರಿಯಿಸಲಾಗಿದೆ</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">ಸ್ಟೋರಿಗೆ ಪ್ರತಿಕ್ರಿಯಿಸಿದ್ದೀರಿ</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">ಸ್ಟೋರಿಗೆ ಪ್ರತಿಕ್ರಿಯಿಸಿದ್ದಾರೆ</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">ವೀಕ್ಷಣೆಗಳು</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">ನಿಮ್ಮ ಬ್ಯಾಂಕ್ ಆರಿಸಿ</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">%1$s ನೊಂದಿಗೆ ನಿಮ್ಮ ದೇಣಿಗೆಯನ್ನು ದೃಢೀಕರಿಸಿ</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">ನಿಮ್ಮ ಮರುಕಳಿಸುವ ದೇಣಿಗೆಯನ್ನು ಸೆಟಪ್ ಮಾಡಲು ನಿಮ್ಮ ಬ್ಯಾಂಕ್‌ನೊಂದಿಗೆ €0,01 ಶುಲ್ಕವನ್ನು ಖಚಿತಪಡಿಸಲು ಮುಂದುವರಿಸಿ. ಇದನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮರುಪಾವತಿಸಲಾಗುತ್ತದೆ ಮತ್ತು ನಿಮ್ಮ €5/ತಿಂಗಳ ದೇಣಿಗೆಯನ್ನು ನಿಮ್ಮ ಖಾತೆಯಿಂದ ಡೆಬಿಟ್ ಮಾಡಲು ಅನುಮತಿಸುತ್ತದೆ.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">ನಿಮ್ಮ ಮರುಕಳಿಸುವ ದೇಣಿಗೆಯನ್ನು ಸೆಟಪ್ ಮಾಡಲು ನಿಮ್ಮ ಬ್ಯಾಂಕ್‌ನೊಂದಿಗೆ €0,01 ಶುಲ್ಕವನ್ನು ಖಚಿತಪಡಿಸಲು ಮುಂದುವರಿಸಿ. ಇದನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮರುಪಾವತಿಸಲಾಗುತ್ತದೆ ಮತ್ತು ನಿಮ್ಮ %1$s/ತಿಂಗಳ ದೇಣಿಗೆಯನ್ನು ನಿಮ್ಮ ಖಾತೆಯಿಂದ ಡೆಬಿಟ್ ಮಾಡಲು ಅನುಮತಿಸುತ್ತದೆ.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">ಮುಂದುವರಿಸಿ</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">ಬ್ಯಾಕಪ್ ಡೇಟಾವನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">ಮೀಡಿಯಾ ಬ್ಯಾಕಪ್‌ಗಳು ಆಫ್ ಆಗಿವೆ</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">ನಿಮ್ಮ ಪಾವತಿಯನ್ನು ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ನಮಗೆ ಸಾಧ್ಯವಾಗದ ಕಾರಣ ನಿಮ್ಮ Signal ಮೀಡಿಯಾ ಬ್ಯಾಕಪ್ ಪ್ಲಾನ್ ಅನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ. ನಿಮ್ಮ ಬ್ಯಾಕಪ್‌ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಯಾವುದೇ ಮೀಡಿಯಾವನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ನಿಮಗೆ %1$d ದಿನವಿದೆ. %1$d ದಿನದ ನಂತರ, ನಿಮ್ಮ ಬ್ಯಾಕಪ್‌ನಲ್ಲಿರುವ ಮೀಡಿಯಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ.</item>
+        <item quantity="other">ನಿಮ್ಮ ಪಾವತಿಯನ್ನು ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ನಮಗೆ ಸಾಧ್ಯವಾಗದ ಕಾರಣ ನಿಮ್ಮ Signal ಮೀಡಿಯಾ ಬ್ಯಾಕಪ್ ಪ್ಲಾನ್ ಅನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ. ನಿಮ್ಮ ಬ್ಯಾಕಪ್‌ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಯಾವುದೇ ಮೀಡಿಯಾವನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ನಿಮಗೆ %1$d ದಿನಗಳಿವೆ. %1$d ದಿನಗಳ ನಂತರ, ನಿಮ್ಮ ಬ್ಯಾಕಪ್‌ನಲ್ಲಿರುವ ಮೀಡಿಯಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">ನಿಮ್ಮ ಎಲ್ಲಾ ಮೀಡಿಯಾವನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡುವುದನ್ನು ಮುಂದುವರಿಸಲು ನೀವು ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ಬ್ಯಾಕ್‌ಅಪ್‌ಗಳಿಗೆ ಪುನಃ ಪಾವತಿಸಲು ಪ್ರಾರಂಭಿಸಬಹುದು. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">ನಿಮ್ಮ ಮೀಡಿಯಾವನ್ನು ಇಂದು ಅಳಿಸಲಾಗುತ್ತದೆ</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">ನಿಮ್ಮ ಪಾವತಿಯನ್ನು ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ನಮಗೆ ಸಾಧ್ಯವಾಗದ ಕಾರಣ ನಿಮ್ಮ Signal ಮೀಡಿಯಾ ಬ್ಯಾಕಪ್ ಪ್ಲಾನ್ ಅನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ. ಅಳಿಸುವ ಮೊದಲು ನಿಮ್ಮ ಬ್ಯಾಕಪ್‌ನಲ್ಲಿ ಮೀಡಿಯಾವನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ಇದು ನಿಮಗೆ ಕೊನೆಯ ಅವಕಾಶವಾಗಿದೆ.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">ಡೌನ್‌ಲೋಡ್ ಪೂರ್ಣಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">ನಿಮ್ಮ ಸಾಧನವು ಸಾಕಷ್ಟು ಸ್ಥಳಾವಕಾಶವನ್ನು ಹೊಂದಿಲ್ಲ. ನಿಮ್ಮ ಬ್ಯಾಕಪ್‌ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಮೀಡಿಯಾವನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು %1$s ಸ್ಥಳಾವಕಾಶವನ್ನು ಮುಕ್ತಗೊಳಿಸಿ.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">ನೀವು \"ಸ್ಕಿಪ್\" ಅನ್ನು ಆರಿಸಿದರೆ, ನಿಮ್ಮ ಬ್ಯಾಕಪ್‌ನಲ್ಲಿರುವ ಮೀಡಿಯಾವನ್ನು %1$d ದಿನದಲ್ಲಿ ಅಳಿಸಲಾಗುತ್ತದೆ.</item>
+        <item quantity="other">ನೀವು \"ಸ್ಕಿಪ್\" ಅನ್ನು ಆರಿಸಿದರೆ, ನಿಮ್ಮ ಬ್ಯಾಕಪ್‌ನಲ್ಲಿರುವ ಮೀಡಿಯಾವನ್ನು %1$d ದಿನಗಳಲ್ಲಿ ಅಳಿಸಲಾಗುತ್ತದೆ.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">ಬ್ಯಾಕಪ್ ಪಾವತಿಯನ್ನು ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">ನಿಮ್ಮ ಮರುಕಳಿಸುವ ಮಾಸಿಕ ಬ್ಯಾಕಪ್ ಪಾವತಿಯನ್ನು ಸಂಗ್ರಹಿಸುವಲ್ಲಿ ನಾವು ಸಮಸ್ಯೆಯನ್ನು ಹೊಂದಿದ್ದೇವೆ. ನಿಮ್ಮ ಪಾವತಿ ವಿಧಾನವು ಅಪ್ ಟು ಡೇಟ್ ಆಗಿದೆ ಎಂಬುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ಅದು ಅಪ್ ಟು ಡೇಟ್ ಆಗಿರದಿದ್ದರೆ, Google Pay ನಲ್ಲಿ ಅಪ್‌ಡೇಟ್ ಮಾಡಿ. Signal ಕೆಲವೇ ದಿನಗಳಲ್ಲಿ ಮತ್ತೆ ಪಾವತಿಯನ್ನು ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತದೆ.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">ಬ್ಯಾಕಪ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">ನಿಮ್ಮ ಸಾಧನವು %1$d ದಿನಗಳವರೆಗೆ ಬ್ಯಾಕಪ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿಲ್ಲ. ನಿಮ್ಮ ಸಾಧನವು ವೈ-ಫೈಗೆ ಕನೆಕ್ಟ್ ಆಗಿದೆ ಎಂಬುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಮತ್ತು \"ಈಗ ಬ್ಯಾಕಪ್ ಮಾಡಿ\" ಎಂಬುದನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">ಬಿಟ್ಟು ಮುಂದುವರಿ</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">ಈಗ ಮೀಡಿಯಾವನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಿ</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">ನಂತರ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿ</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">ಮೀಡಿಯಾವನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಬೇಡಿ</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">ನಿಮ್ಮ ಮೀಡಿಯಾವನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು %1$s ಸ್ಥಳಾವಕಾಶವನ್ನು ಮುಕ್ತಗೊಳಿಸಿ.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">ಕ್ರೆಡಿಟ್ ಅಥವಾ ಡೆಬಿಟ್ ಕಾರ್ಡ್</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">ತಿಳಿದಿಲ್ಲ</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">ಪಾವತಿ ಇತಿಹಾಸ</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">ನಿಮ್ಮ ಕೊನೆಯ ಬ್ಯಾಕಪ್ ಅನ್ನು %1$s ರಂದು %2$s ಕ್ಕೆ ಮಾಡಲಾಗಿದೆ.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">ಆಯ್ಕೆ ಮಾಡಲಾದ ಸಮಯಕ್ಕಿಂತ ಹಳೆಯದಾದ ಮೆಸೇಜ್‌ಗಳನ್ನು ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಲಾಗುತ್ತದೆ.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">ಆಯ್ಕೆ ಮಾಡಲಾದ ಉದ್ದವನ್ನು ಮೀರಿದ ಮೆಸೇಜ್‌ಗಳನ್ನು ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಲಾಗುತ್ತದೆ.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">ಲಿಂಕ್ ಮಾಡಲಾದ ಸಾಧನಗಳಿಗೆ ಮಿತಿಗಳನ್ನು ಅನ್ವಯಿಸಿ</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">ಸಕ್ರಿಯಗೊಳಿಸಿದಾಗ, ಸಂವಹನ ಉದ್ದದ ಮಿತಿಗಳು ಸಹ ನಿಮ್ಮ ಲಿಂಕ್ ಮಾಡಲಾದ ಸಾಧನಗಳಿಂದ ಮೆಸೇಜ್‌ಗಳನ್ನು ಅಳಿಸುತ್ತವೆ.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">ಅಳಿಸುವಿಕೆಯನ್ನು ಇದೀಗ ನಿಮ್ಮ ಎಲ್ಲಾ ಸಾಧನಗಳಲ್ಲಿ ಸಿಂಕ್ ಮಾಡಲಾಗಿದೆ</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">ನೀವು ಮೆಸೇಜ್‌ಗಳು ಅಥವಾ ಚಾಟ್‌ಗಳನ್ನು ಅಳಿಸಿದಾಗ, ಅವು ನಿಮ್ಮ ಫೋನ್ ಮತ್ತು ಲಿಂಕ್ ಮಾಡಲಾದ ಎಲ್ಲಾ ಸಾಧನಗಳಿಂದ ಅಳಿಸಿ ಹೋಗುತ್ತವೆ.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">ಓಕೆ</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">ಪಾವತಿ ಇತಿಹಾಸ</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">ಪಠ್ಯ ಮತ್ತು ಎಲ್ಲಾ ಮೀಡಿಯಾ ಬ್ಯಾಕಪ್</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">ಪಾವತಿ ವಿವರಗಳು</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">ಬ್ಯಾಕಪ್ ಪ್ರಕಾರ</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">ಪಾವತಿಸಿದ ದಿನಾಂಕ</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">ಹಂಚಿಕೊಳ್ಳಿ</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal ಬ್ಯಾಕಪ್‌ಗಳು</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">ಪಾವತಿ ಇತಿಹಾಸ</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">ಬ್ಯಾಕಪ್ ವಿವರಗಳು</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">ಬ್ಯಾಕಪ್ ಗಾತ್ರ</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">ಬ್ಯಾಕಪ್ ಆವರ್ತನ</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">ಸೆಲ್ಯುಲರ್ ಬಳಸಿಕೊಂಡು ಬ್ಯಾಕಪ್ ಮಾಡಿ</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">ಬ್ಯಾಕಪ್ ಆಫ್ ಮಾಡಿ ಮತ್ತು ಅಳಿಸಿ</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">ಬ್ಯಾಕಪ್ ಅನ್ನು ಅಳಿಸಲಾಗಿದೆ ಮತ್ತು ಆಫ್ ಮಾಡಲಾಗಿದೆ.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">ಬ್ಯಾಕಪ್ ಪ್ರಕಾರವನ್ನು ಬದಲಾಯಿಸಲಾಗಿದೆ ಮತ್ತು ಚಂದಾದಾರಿಕೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">ಚಂದಾದಾರಿಕೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">ಡೌನ್‌ಲೋಡ್ ಪೂರ್ಣಗೊಂಡಿದೆ</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">ಬ್ಯಾಕಪ್ ಪ್ರಕಾರ</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">ಬ್ಯಾಕಪ್‌ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/ತಿಂಗಳು</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">ಬ್ಯಾಕಪ್‌ಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d/</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">ಕೊನೆಯ ಬ್ಯಾಕಪ್</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%2$s ರಲ್ಲಿ %1$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">ಎಂದಿಗೂ ಇಲ್ಲ</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">ಈಗ ಬ್ಯಾಕಪ್‌‌ ಮಾಡಿ</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">ಬ್ಯಾಕಪ್‌ಗಳನ್ನು ಆಫ್ ಮಾಡಿ ಮತ್ತು ಅಳಿಸಬೇಕೇ?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">ನಿಮಗೆ ಮತ್ತೆ ಶುಲ್ಕ ವಿಧಿಸಲಾಗುವುದಿಲ್ಲ. ನಿಮ್ಮ ಬ್ಯಾಕಪ್ ಅನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ ಮತ್ತು ಯಾವುದೇ ಹೊಸ ಬ್ಯಾಕಪ್‌ಗಳನ್ನು ರಚಿಸಲಾಗುವುದಿಲ್ಲ.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">ಆಫ್ ಮಾಡಿ ಮತ್ತು ಅಳಿಸಿ</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">ಬ್ಯಾಕಪ್ ಅನ್ನು ಅಳಿಸಲಾಗುತ್ತಿದೆ…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">ಬ್ಯಾಕಪ್ ಅಳಿಸಲಾಗಿದೆ</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"ಈಗ ಬ್ಯಾಕ್ ಅಪ್ ಮಾಡಿ ಎಂಬುದನ್ನು ಟ್ಯಾಪ್ ಮಾಡುವ ಮೂಲಕ"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">ಪ್ರತಿದಿನ</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">ವಾರಕ್ಕೊಮ್ಮೆ</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">ಮಾಸಿಕ</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">ಹಸ್ತಚಾಲಿತವಾಗಿ ಬ್ಯಾಕಪ್ ಮಾಡಿ</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">ನಿಮ್ಮ ಸಾಧನದ PIN, ಪಾಸ್‌ವರ್ಡ್ ಅಥವಾ ಪ್ಯಾಟರ್ನ್ ಅನ್ನು ನಮೂದಿಸಿ.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">ಮುಂದೆ</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">ಬ್ಯಾಕಪ್ ಪ್ರಕಾರವನ್ನು ಬದಲಾಯಿಸಿ</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">ಚಂದಾ ರದ್ದುಗೊಳಿಸಿ</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">ರದ್ದತಿಯನ್ನು ದೃಢೀಕರಿಸಿ</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">ನಿಮಗೆ ಮತ್ತೆ ಶುಲ್ಕ ವಿಧಿಸಲಾಗುವುದಿಲ್ಲ. ನಿಮ್ಮ ಬಿಲ್ಲಿಂಗ್ ಸೈಕಲ್‌ನ ಕೊನೆಯಲ್ಲಿ ಬ್ಯಾಕಪ್‌ಗಳನ್ನು ಆಫ್ ಮಾಡಲಾಗುತ್ತದೆ. ಆ ದಿನಾಂಕದ ನಂತರ ನೀವು ಪ್ರಸ್ತುತ ಬ್ಯಾಕಪ್ ಮಾಡುತ್ತಿರುವ ಮೀಡಿಯಾವನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು 30 ದಿನಗಳನ್ನು ಹೊಂದಿರುತ್ತೀರಿ.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">ದೃಢೀಕರಿಸಿ ಮತ್ತು ಈಗಲೇ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿ</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">ದೃಢೀಕರಿಸಿ ಮತ್ತು ನಂತರ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿ</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">ಚಂದಾದಾರಿಕೆಯನ್ನು ಇಟ್ಟುಕೊಳ್ಳಿ</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index d3064a38fa..164cc18a6b 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal 업데이트 중…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly 업데이트 중…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">암호를 설정하지 않았습니다!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">암호 사용을 비활성화하시겠습니까?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Signal이 잠금 해제되어 메시지 알림이 표시됩니다.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Molly이 잠금 해제되어 메시지 알림이 표시됩니다.</string>
     <string name="ApplicationPreferencesActivity_disable">사용 안 함</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">서버에 연결할 수 없습니다!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">등록 잠금을 위해 PIN이 필요합니다. PIN을 비활성화하려면 먼저 등록 잠금을 비활성화하세요.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">파일</string>
     <string name="AttachmentKeyboard_contact">연락처</string>
     <string name="AttachmentKeyboard_location">위치</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">사진과 동영상을 표시하려면 Signal에 권한이 필요합니다.</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">사진과 동영상을 표시하려면 Molly에 권한이 필요합니다.</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">권한 허용</string>
     <string name="AttachmentKeyboard_payment">결제</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">미디어를 선택할 수 있는 앱이 없습니다.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal에서 사진, 동영상 또는 오디오를 첨부하려면 저장 공간 접근 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'저장 공간\' 항목을 허용해 주세요.</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal에서 연락처 정보를 첨부하려면 연락처 접근 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'연락처\' 항목을 허용해 주세요.</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal에서 위치 정보를 첨부하려면 위치 접근 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'위치\' 항목을 허용해 주세요.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly에서 사진, 동영상 또는 오디오를 첨부하려면 저장 공간 접근 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'저장 공간\' 항목을 허용해 주세요.</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly에서 연락처 정보를 첨부하려면 연락처 접근 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'연락처\' 항목을 허용해 주세요.</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly에서 위치 정보를 첨부하려면 위치 접근 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'위치\' 항목을 허용해 주세요.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">내 위치를 사용하도록 허용</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">위치를 보내려면 다음을 수행하세요.</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">위치를 보내려면 Signal에서 내 위치를 사용할 수 있도록 허용하세요.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">위치를 보내려면 Molly에서 내 위치를 사용할 수 있도록 허용하세요.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">위치를 보내려면 Signal에서 내 위치를 사용할 수 있어야 합니다.</string>
+    <string name="AttachmentManager_signal_needs_location_access">위치를 보내려면 Molly에서 내 위치를 사용할 수 있어야 합니다.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">저장 공간 권한 허용</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">사진과 동영상 표시 방법:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">사진과 동영상을 표시하려면 Signal에 권한이 필요합니다.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">사진과 동영상을 표시하려면 Molly에 권한이 필요합니다.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s 님이 결제를 아직 활성화하지 않았습니다. </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">카메라 변경</string>
     <string name="CameraXFragment_open_gallery_description">갤러리 열기</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">권한 허용</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">카메라와 마이크 접근을 허용해 주세요.</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">카메라 접근을 허용해 주세요.</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">마이크 접근을 허용해 주세요.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">사진을 찍으려면 Signal에 카메라 접근을 허용해 주세요.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">사진이나 동영상을 찍으려면 Signal에 카메라 접근을 허용해 주세요.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">사진이나 동영상을 찍으려면 Signal에 카메라와 마이크 접근을 허용해 주세요.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">소리와 함께 동영상을 찍으려면 Signal에 마이크 접근을 허용해 주세요.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">QR 코드를 스캔하려면 Signal에 카메라 접근을 허용해 주세요.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">사진을 찍으려면 Signal에 카메라 접근 권한이 필요합니다.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">QR 코드를 스캔하려면 Signal에 카메라 접근 권한이 필요합니다.</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">동영상을 찍으려면 Signal에 마이크 접근 권한이 필요합니다.</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Signal에서 사진을 찍으려면 다음을 수행하세요.</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Signal에서 사진과 동영상을 찍으려면 다음을 수행하세요.</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">소리와 함께 동영상을 찍으려면 다음을 수행하세요.</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR 코드를 스캔하려면 다음을 수행하세요.</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">최근 연락처</string>
@@ -270,7 +271,7 @@
     <string name="CameraContacts_no_signal_contacts">Signal 연락처 없음</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">카메라 버튼은 Signal 연락처에 사진을 보내는 용도로만 사용할 수 있습니다. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">원하는 사람을 찾지 못하셨나요?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Signal에 등록하도록 연락처 초대</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Molly에 등록하도록 연락처 초대</string>
     <string name="CameraContacts__menu_search">검색</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -289,7 +290,7 @@
     <string name="ClientDeprecatedActivity_update">업데이트</string>
     <string name="ClientDeprecatedActivity_dont_update">업데이트하지 않음</string>
     <string name="ClientDeprecatedActivity_warning">경고</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Signal 버전이 만료되었습니다. 이전 메세지 기록은 읽을 수 있지만 업데이트하기 전까지 메세지를 보내거나 받을 수 없습니다.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Molly 버전이 만료되었습니다. 이전 메세지 기록은 읽을 수 있지만 업데이트하기 전까지 메세지를 보내거나 받을 수 없습니다.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">웹 브라우저를 찾을 수 없습니다.</string>
@@ -326,8 +327,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">%1$s에 메시지 보내기</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly 음성 통화 %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly 화상 통화 %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -419,7 +420,7 @@
     <string name="ConversationActivity_transport_signal">Signal 메시지</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">문자 보내기</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Signal로 대화해요! %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Molly로 대화해요! %1$s</string>
     <string name="ConversationActivity_specify_recipient">연락처를 선택해 주세요.</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">첨부 파일이 전송 메시지의 사이즈 제한을 초과합니다.</string>
     <string name="ConversationActivity_unable_to_record_audio">오디오를 녹음할 수 없습니다!</string>
@@ -438,18 +439,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">음성 메시지를 보내려면 다음을 수행하세요.</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">음성 메시지를 보내려면 Signal에서 마이크를 사용할 수 있도록 허용하세요.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">음성 메시지를 보내려면 Molly에서 마이크를 사용할 수 있도록 허용하세요.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">음성 메시지를 녹음하려면 Signal에서 마이크를 사용할 수 있어야 합니다.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal에서 오디오 메시지를 보내려면 마이크 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'마이크\' 항목을 허용해 주세요.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">음성 메시지를 녹음하려면 Molly에서 마이크를 사용할 수 있어야 합니다.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly에서 오디오 메시지를 보내려면 마이크 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'마이크\' 항목을 허용해 주세요.</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal에서 %1$s에게 전화하려면 마이크와 카메라 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'마이크\'와 \'카메라\' 항목을 허용해 주세요.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Signal에서 사진과 동영상을 찍으려면 카메라 권한이 필요합니다.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal에서 사진이나 동영상을 찍으려면 카메라 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'카메라\' 항목을 허용해 주세요.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal에서 사진이나 동영상을 찍으려면 카메라 권한이 필요합니다.</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly에서 %1$s에게 전화하려면 마이크와 카메라 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'마이크\'와 \'카메라\' 항목을 허용해 주세요.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Molly에서 사진과 동영상을 찍으려면 카메라 권한이 필요합니다.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly에서 사진이나 동영상을 찍으려면 카메라 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'카메라\' 항목을 허용해 주세요.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly에서 사진이나 동영상을 찍으려면 카메라 권한이 필요합니다.</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">소리가 나는 동영상을 찍으려면 마이크 권한을 허용해 주세요.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal에서 동영상을 찍으려면 마이크 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'마이크\'와 \'카메라\'를 허용해 주세요.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal에서 동영상을 찍으려면 마이크 권한이 필요합니다.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly에서 동영상을 찍으려면 마이크 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'마이크\'와 \'카메라\'를 허용해 주세요.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly에서 동영상을 찍으려면 마이크 권한이 필요합니다.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">아니요</string>
@@ -470,9 +471,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">통화를 시작하려면 다음을 수행하세요.</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">통화를 시작하려면 Signal에서 마이크를 사용할 수 있도록 허용하세요.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">통화를 시작하려면 Molly에서 마이크를 사용할 수 있도록 허용하세요.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">통화를 시작하려면 Signal에서 마이크를 사용할 수 있어야 합니다.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">통화를 시작하려면 Molly에서 마이크를 사용할 수 있어야 합니다.</string>
 
 
     <string name="ConversationActivity_join">참가</string>
@@ -486,9 +487,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Signal에서 더 이상 SMS 메시지를 지원하지 않습니다. %1$s 님을 Signal로 초대하여 대화를 이어가세요.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">이 사용자는 더 이상 Signal을 사용하지 않습니다. Signal로 초대하여 대화를 이어가세요.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">이 사용자는 더 이상 Molly을 사용하지 않습니다. Molly로 초대하여 대화를 이어가세요.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Signal로 초대</string>
+    <string name="ConversationActivity__invite_to_signal">Molly로 초대</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">알림이 곧 다시 표시됩니다.</string>
 
@@ -536,6 +537,8 @@
     <string name="ConversationFragment_delete_for_everyone">모두에게서 삭제</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">이 기기에서 삭제</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">삭제</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">전체에서 삭제</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">이 메시지는 최신 Signal을 설치한 모두에게서 삭제됩니다. 멤버는 내가 메시지를 삭제했다는 것을 확인할 수 있습니다.</string>
@@ -569,11 +572,11 @@
     <!-- Action shown to allow a user to update their application because it has expired -->
     <string name="ConversationFragment__update_build">시그널 최신 버전으로 업데이트</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Signal 다시 등록</string>
+    <string name="ConversationFragment__reregister_signal">Molly 다시 등록</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">돌아가기</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signal 열기</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Molly 열기</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">더 이상 유효하지 않음</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -636,6 +639,10 @@
     <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
         <item quantity="other">대화 %1$d개를 모두 영구 삭제합니다.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="other">모든 기기에서 선택한 대화 %1$d개를 모두 영구 삭제합니다.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">삭제 중</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="other">선택한 대화를 삭제하는 중…</item>
@@ -719,9 +726,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">전화번호로 나를 찾을 수 있는 사람은 누구인가요?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">내 전화번호가 있는 사람은 Signal에서 나를 보고 나와 대화를 시작할 수 있습니다.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">내 전화번호가 있는 사람은 Molly에서 나를 보고 나와 대화를 시작할 수 있습니다.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">내가 메시지를 보내는 사용자 또는 기존 대화 기록이 있는 사용자를 제외하고는 아무도 Signal에서 나를 볼 수 없습니다.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">내가 메시지를 보내는 사용자 또는 기존 대화 기록이 있는 사용자를 제외하고는 아무도 Molly에서 나를 볼 수 없습니다.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">백업으로 복원하시겠습니까?</string>
@@ -755,7 +762,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">백업 암호를 테스트하고 일치함을 인증</string>
     <string name="BackupsPreferenceFragment__turn_on">켜기</string>
     <string name="BackupsPreferenceFragment__turn_off">끄기</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"백업을 복원하려면 Signal의 새 사본을 설치하세요. 앱을 열고 \'백업 복원\'을 탭한 후 백업 파일을 찾으세요. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"백업을 복원하려면 Molly의 새 사본을 설치하세요. 앱을 열고 \'백업 복원\'을 탭한 후 백업 파일을 찾으세요. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">더 알아보기</string>
     <string name="BackupsPreferenceFragment__in_progress">진행 중…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -763,7 +770,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">지금까지 %1$d…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% 진행중…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal에서 백업을 저장하려면 저장 공간 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'저장 공간\' 항목을 허용해 주세요.</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly에서 백업을 저장하려면 저장 공간 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'저장 공간\' 항목을 허용해 주세요.</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">백업 시간 설정</string>
 
@@ -830,7 +837,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">대화 세션을 새로 고침</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal은 엔드투엔드 암호화를 사용하므로 때때로 대화 세션을 새로 고쳐야 할 수 있습니다. 이 작업은 대화 보안에 영향을 미치지 않으나, 이로 인해 해당 연락처가 보낸 메시지를 놓쳤을 수 있습니다. 메시지를 다시 보내달라고 요청하세요.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly은 엔드투엔드 암호화를 사용하므로 때때로 대화 세션을 새로 고쳐야 할 수 있습니다. 이 작업은 대화 보안에 영향을 미치지 않으나, 이로 인해 해당 연락처가 보낸 메시지를 놓쳤을 수 있습니다. 메시지를 다시 보내달라고 요청하세요.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">데스크톱 또는 iPad에서 Signal을 이용하세요. 메시지가 연결된 기기와 동기화됩니다.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">새 기기 연결</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s 메시지와 대화 정보는 모든 장치에서 엔드투엔드 암호화로 보호됩니다.</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">데스크톱 또는 iPad의 Signal</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">연결된 기기의 모든 메시지는 비공개입니다.</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">휴대폰의 Molly과 연결하면 Molly 메시지가 동기화됩니다. 이전 메시지 내역은 표시되지 않습니다.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">다른 기기에서 %1$s을(를) 방문하여 Molly을 설치하세요.</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">내 연결된 기기</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">연결 해제</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s 연결 해제</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">기기를 연결하는 중…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">기기가 승인되었습니다.</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">불러오는 중…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">연결된 기기 없음</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">잠금 해제하여 기기 연결</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">기기에 표시된 QR 코드를 스캔하여 기기를 연결하세요.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">QR 코드 스캔</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">이 기기를 사용하여 연결하려는 기기에 표시된 QR 코드를 스캔하세요.</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">확인</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">이 기기에서 내 그룹과 연락처를 보고, 대화에 접근하고, 내 이름으로 메시지를 보낼 수 있습니다.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">다른 기기에서 연결 완료</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">다른 기기에서 Molly 연결을 완료하세요.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">기기 연결 실패</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">QR 코드가 올바르지 않습니다. 스캔하고자 하는 기기에 있는 QR 코드를 읽었는지 다시 한 번 확인하세요.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">재시도</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">\'%1$s\' 기기를 연결 해제하시겠습니까?</string>
@@ -852,10 +914,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">누락된 Play Services에 최적화</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">기기에서는 Play Services를 지원하지 않습니다. 탭하여 시스템 배터리 최적화 기능을 사용하지 않을 수 있습니다. 해당 기능은 Signal이 비활성화된 동안에 메시지를 검색하지 못하게 합니다.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">기기에서는 Play Services를 지원하지 않습니다. 탭하여 시스템 배터리 최적화 기능을 사용하지 않을 수 있습니다. 해당 기능은 Molly이 비활성화된 동안에 메시지를 검색하지 못하게 합니다.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Signal 버전이 만료되었습니다. 메시지를 송수신 하기 위해 지금 업데이트 하십시오.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Molly 버전이 만료되었습니다. 메시지를 송수신 하기 위해 지금 업데이트 하십시오.</string>
     <string name="ExpiredBuildReminder_update_now">지금 업데이트하세요.</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -865,8 +927,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">보기</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">영구적으로 Signal 연결에 실패했습니다!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal은 Google Play Services에 등록될 수 없습니다. Signal 메시지와 전화는 비활성화되었습니다. Signal 설정 - 고급 메뉴에서 다시 등록해 주세요.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">영구적으로 Molly 연결에 실패했습니다!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly은 Google Play Services에 등록될 수 없습니다. Molly 메시지와 전화는 비활성화되었습니다. Molly 설정 - 고급 메뉴에서 다시 등록해 주세요.</string>
 
 
     <!-- GiphyActivity -->
@@ -992,20 +1054,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">디버그 로그를 제출하면 문제를 진단하고 수정하는 데 도움이 됩니다. 디버그 로그에는 식별 정보가 포함되지 않습니다.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal에 오류가 발생했습니다. 디버그 로그를 제출할까요?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly에 오류가 발생했습니다. 디버그 로그를 제출할까요?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">배터리 최적화로 인해 알림이 지연될 수 있습니다.</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Signal 배터리 최적화를 비활성화하여 메시지 알림이 지연되지 않도록 할 수 있습니다.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Molly 배터리 최적화를 비활성화하여 메시지 알림이 지연되지 않도록 할 수 있습니다.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">배터리 최적화로 인해 알림이 지연될 수 있습니다.</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Molly 배터리 최적화를 비활성화하여 메시지 알림이 지연되지 않도록 하세요. \'계속\'을 탭하여 기기별 지침을 확인하세요.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">아니요</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">계속</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">계속</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">취소</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">아니요</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">대기 중인 그룹 초대</string>
+    <string name="PendingMembersActivity_pending_group_invites">요청 및 초대</string>
     <string name="PendingMembersActivity_requests">요청</string>
     <string name="PendingMembersActivity_invites">초대</string>
     <string name="PendingMembersActivity_people_you_invited">초대한 사람들</string>
@@ -1244,12 +1316,12 @@
     <string name="InviteActivity_cancel">취소</string>
     <string name="InviteActivity_sending">보내는 중…</string>
     <string name="InviteActivity_invitations_sent">초대를 보냈습니다!</string>
-    <string name="InviteActivity_invite_to_signal">Signal로 초대</string>
+    <string name="InviteActivity_invite_to_signal">Molly로 초대</string>
     <string name="InviteActivity_send_sms">SMS 보내기 (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="other">SMS 초대 %1$d개를 보내시겠습니까?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Signal로 같이 옮겨요! %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Molly로 같이 옮겨요! %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">공유하기 위해 사용할 수 있는 앱이 없습니다.</string>
 
     <!-- LearnMoreTextView -->
@@ -1263,7 +1335,7 @@
     <string name="LongMessageActivity_your_message">내 메시지</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">백그라운드 연결이 활성화됨</string>
 
     <!-- MediaOverviewActivity -->
@@ -1327,10 +1399,10 @@
     <string name="MessageQuotesBottomSheet_replies">회신</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal 전화 연결 중</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly 전화 연결 중</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signal 통화 서비스 시작</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal 통화 서비스 중지</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Molly 통화 서비스 시작</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly 통화 서비스 중지</string>
     <string name="NotificationBarManager__cancel_call">전화 취소</string>
 
     <!-- NotificationsMegaphone -->
@@ -1574,6 +1646,14 @@
     <string name="MessageRecord_you_activated_payments">결제를 활성화했습니다.</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s 님이 이제 결제를 수락할 수 있습니다.</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">결제 세부 정보 사용 불가</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">탭하여 더 보기</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">결제 세부 정보 사용 불가</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">이 결제 기록을 포함하지 않는 원본에서 메시지를 복원했으므로 이 결제의 세부 정보를 사용할 수 없습니다. 지갑 잔액 또는 지난 결제 상태에는 영향을 미치지 않습니다.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1628,9 +1708,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">곧 Signal에서 SMS 메시지를 보낼 수 없게 됩니다. %1$s 님을 Signal로 초대하여 대화를 이어가세요.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Signal에서 더 이상 SMS 메시지를 보낼 수 없습니다. %1$s 님을 Signal로 초대하여 대화를 이어가세요.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Molly에서 더 이상 SMS 메시지를 보낼 수 없습니다. %1$s 님을 Molly로 초대하여 대화를 이어가세요.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">결제: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">결제</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">스팸으로 신고함</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1704,7 +1786,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Signal 기기를 연결하시겠습니까?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">제삼자 스캐너를 사용해 Signal 기기를 연결하려는 것 같습니다. 안전한 사용을 위해 Signal에서 다시 코드를 스캔해 주세요.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal에서 QR 코드를 읽으려면 카메라 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'카메라\' 항목을 허용해 주세요.</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly에서 QR 코드를 읽으려면 카메라 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'카메라\' 항목을 허용해 주세요.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">카메라 권한이 없어 QR 코드를 스캔할 수 없음</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1716,11 +1798,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">암호 입력</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal 아이콘</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly 아이콘</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">암호 제출</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">잘못된 암호입니다!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signal 잠금 해제</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - 잠금 화면</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Molly 잠금 해제</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - 잠금 화면</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">지도</string>
@@ -1786,7 +1868,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">메시지를 계속 보내려면 확인하세요.</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Signal에서 스팸을 방지하려면 확인을 완료하세요.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Molly에서 스팸을 방지하려면 확인을 완료하세요.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">확인 후 메시지를 계속 전송할 수 있습니다. 일시 중지된 메시지는 자동으로 전송됩니다.</string>
 
     <!-- Recipient -->
@@ -1794,7 +1876,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">내 스토리</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal 통화</string>
+    <string name="Recipient_signal_call">Molly 통화</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">차단</string>
@@ -1808,7 +1890,8 @@
     <string name="RedPhone_ringing">발신 중…</string>
     <string name="RedPhone_busy">전화 중</string>
     <string name="RedPhone_recipient_unavailable">응답 없음</string>
-    <string name="RedPhone_network_failed">네트워크 연결에 실패했습니다!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">네트워크 연결에 실패했습니다! 네트워크 연결을 확인하고 다시 시도하세요.</string>
     <string name="RedPhone_number_not_registered">전화번호가 Signal에 등록되지 않았습니다!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">지금 거신 전화번호는 보안 전화를 지원하지 않습니다.</string>
     <string name="RedPhone_got_it">확인</string>
@@ -1819,7 +1902,7 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">비디오를 사용하려면 탭하세요</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s 님에게 전화하려면 Signal에서 카메라 권한이 필요합니다.</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s 님에게 전화하려면 Molly에서 카메라 권한이 필요합니다.</string>
     <string name="WebRtcCallActivity__signal_s">시그널 %1$s</string>
     <string name="WebRtcCallActivity__calling">전화 진행 중…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
@@ -1868,10 +1951,30 @@
     <string name="WebRtcCallActivity__removed_from_call">통화에서 제거됨</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">통화에서 제거됐습니다.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">카메라와 마이크 접근을 허용해 주세요.</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">마이크 접근을 허용해 주세요.</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">카메라 접근을 허용해 주세요.</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">통화를 시작하거나 통화에 참여하려면 Molly에 카메라와 마이크 접근을 허용해 주세요.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">통화를 시작하거나 통화에 참여하려면 Molly에 마이크 접근을 허용해 주세요.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">동영상을 사용하려면 Molly에 카메라 접근을 허용해 주세요.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">통화를 시작하거나 통화에 참여하려면 Molly에 마이크 사용 권한이 필요합니다.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">동영상을 사용하려면 Molly에 카메라 접근 권한이 필요합니다.</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">통화 시작 또는 참여 방법:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">동영상 사용 방법:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal 전화</string>
-    <string name="WebRtcCallView__signal_video_call">Signal 영상 통화</string>
+    <string name="WebRtcCallView__signal_call">Molly 전화</string>
+    <string name="WebRtcCallView__signal_video_call">Molly 영상 통화</string>
     <string name="WebRtcCallView__start_call">전화 시작하기</string>
     <string name="WebRtcCallView__join_call">전화 참여하기</string>
     <string name="WebRtcCallView__call_is_full">통화 참가자 수 최대</string>
@@ -1959,19 +2062,36 @@
     <string name="CallOverflowPopupWindow__lower_hand">손 내리기</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">취소</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">손을 들었습니다.</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">보기</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="other">%1$s + %2$d명이 손을 들었습니다.</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s이(가) 손을 들었습니다.</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s 외 %2$d명이 손을 들었습니다.</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s 님이 손을 들었습니다.</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s 님 외 %2$d명이 손을 들었습니다.</item>
+    </plurals>
+
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="other">%1$s 외 %2$d명</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
-        <item quantity="other">%1$s +%2$d명</item>
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
+        <item quantity="other">%1$s 님 외 %2$d명</item>
     </plurals>
 
     <!-- An accessibility label for screen readers on a view that can be expanded -->
@@ -2055,7 +2175,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">이 전화번호를 인증하는 데 필요한 전화를 수신하게 됩니다.</string>
     <string name="RegistrationActivity_edit_number">전화번호 수정</string>
     <string name="RegistrationActivity_missing_google_play_services">Google Play Services가 설치되어 있지 않음</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">기기에 Google Play Services가 없습니다. Signal을 사용할 수는 있지만, 안정성이나 성능이 떨어질 수 있습니다.\n\n맞춤형 안드로이드 ROM을 사용하는 고급 사용자가 아니거나, 이 메시지가 오류라고 생각한다면 문제 해결을 위해 이메일로 support@signal.org에 문의해 주세요.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">기기에 Google Play Services가 없습니다. Molly을 사용할 수는 있지만, 안정성이나 성능이 떨어질 수 있습니다.\n\n맞춤형 안드로이드 ROM을 사용하는 고급 사용자가 아니거나, 이 메시지가 오류라고 생각한다면 문제 해결을 위해 이메일로 support@molly.im에 문의해 주세요.</string>
     <string name="RegistrationActivity_i_understand">이해했습니다.</string>
     <string name="RegistrationActivity_play_services_error">Play Services 오류</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services가 업데이트 중이거나 잠시 제공되지 않고 있습니다. 다시 시도해 주세요.</string>
@@ -2073,7 +2193,7 @@
     <string name="RegistrationActivity_non_standard_number_format">비표준 전화번호 형식</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">입력한 번호(%1$s)가 표준 형식이 아닙니다.\n\n혹시 입력하려던 번호가 %2$s인가요?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - 전화번호 형식</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - 전화번호 형식</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">통화 요청함</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2106,8 +2226,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">등록에 어려움이 있나요?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• SMS나 통화에 휴대폰에 셀룰러 데이터를 사용할 수 있는지 확인하세요.\n • 해당 번호로 전화를 받을 수 있는지 확인하세요.\n • 올바른 전화번호를 입력했는지 확인하세요.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">자세한 내용은 다음 문제 해결 단계를 따르거나 지원팀에 문의하세요.</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">자세한 내용은 %1$s 또는 %2$s의 지침을 따르세요.</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">이 문제 해결 단계</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2145,13 +2265,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">연락처에 추가</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Signal로 초대</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Molly로 초대</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal 메시지</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal 전화</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">연락처에 추가</string>
-    <string name="SharedContactView_invite_to_signal">Signal로 초대</string>
+    <string name="SharedContactView_invite_to_signal">Molly로 초대</string>
     <string name="SharedContactView_message">Signal 메시지</string>
 
     <!-- SignalBottomActionBar -->
@@ -2282,11 +2402,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s번은 %2$s 님의 전화번호입니다.</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal 업데이트</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">새 Signal 버전을 이용할 수 있습니다. 탭하여 업데이트하세요.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal 업데이트 실패</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly 업데이트</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">새 Molly 버전을 이용할 수 있습니다. 탭하여 업데이트하세요.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly 업데이트 실패</string>
     <string name="ApkUpdateNotifications_failed_general_body">나중에 다시 시도하겠습니다.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal을 업데이트했습니다.</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly을 업데이트했습니다.</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">%1$s 버전으로 자동 업데이트되었습니다.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2356,7 +2476,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">우리 Signal 안전 번호:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">공유에 사용할 수 있는 앱이 없습니다.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">클립보드에 비교할 수 있는 안전 번호가 없음</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal에서 QR 코드를 읽으려면 카메라 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'카메라\' 항목을 허용해 주세요.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly에서 QR 코드를 읽으려면 카메라 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'카메라\' 항목을 허용해 주세요.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">QR 코드를 읽으려면 카메라 권한이 필요함</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">%1$s의 안전 번호를 보려면 먼저 메시지를 교환해야 합니다.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2386,14 +2506,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">터치하여 여세요.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal이 잠금 해제됨</string>
-    <string name="KeyCachingService_lock">Signal 잠금</string>
+    <string name="KeyCachingService_passphrase_cached">Molly이 잠금 해제됨</string>
+    <string name="KeyCachingService_lock">Molly 잠금</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">나</string>
     <string name="MediaPreviewActivity_unssuported_media_type">지원되지 않는 미디어 형식</string>
     <string name="MediaPreviewActivity_draft">초안</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal에서 외부 저장 공간에 저장하려면 저장 공간 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'저장 공간\' 항목을 허용해 주세요.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly에서 외부 저장 공간에 저장하려면 저장 공간 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'저장 공간\' 항목을 허용해 주세요.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">외부 저장 공간에 저장하려면 저장 공간 권한이 필요함</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">메시지를 삭제하시겠습니까?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">메시지를 영구적으로 삭제합니다.</string>
@@ -2435,7 +2555,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">메시지 전송에 실패했습니다.</string>
     <string name="MessageNotifier_error_delivering_message">메시지 전송 중 오류가 발생했습니다.</string>
     <string name="MessageNotifier_message_delivery_paused">메시지 전달이 일시 중지되었습니다.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Signal에서 메시지를 계속 보내려면 확인하세요.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Molly에서 메시지를 계속 보내려면 확인하세요.</string>
     <string name="MessageNotifier_mark_all_as_read">모두 읽음으로 표시</string>
     <string name="MessageNotifier_mark_read">읽음으로 표시</string>
     <string name="MessageNotifier_turn_off_these_notifications">이 알림 끄기</string>
@@ -2457,7 +2577,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">내 스티커에 %1$s 이모지로 반응했습니다.</string>
     <string name="MessageNotifier_this_message_was_deleted">이 메시지는 삭제되었습니다.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">연락처 인물이 Signal에 가입했다는 알림을 끄시겠습니까? Signal &gt; 설정 &gt; 알림에서 다시 활성화할 수 있습니다.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">연락처 인물이 Molly에 가입했다는 알림을 끄시겠습니까? Molly &gt; 설정 &gt; 알림에서 다시 활성화할 수 있습니다.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2496,7 +2616,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signal가 잠겨 있는 경우 빠른 답장을 사용할 수 없습니다!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Molly가 잠겨 있는 경우 빠른 답장을 사용할 수 없습니다!</string>
     <string name="QuickResponseService_problem_sending_message">메시지를 보내는 중에 오류가 발생했습니다!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2516,7 +2636,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">잘못된 단축키</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">새 메시지</string>
     <string name="SingleRecipientNotificationBuilder_message_request">메시지 요청</string>
     <string name="SingleRecipientNotificationBuilder_you">나</string>
@@ -2561,7 +2681,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">이 기기의 등록이 해제됐습니다. 다른 기기에서 Signal에 전화번호를 등록했기 때문일 가능성이 높습니다.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">이 기기의 등록이 해제됐습니다. 다른 기기에서 Molly에 전화번호를 등록했기 때문일 가능성이 높습니다.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">기기 다시 등록</string>
 
@@ -2574,10 +2694,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">통화를 수락하려면 Signal에서 마이크를 사용하도록 허용하세요.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">통화를 수락하려면 Molly에서 마이크를 사용하도록 허용하세요.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">영상 통화를 수락하려면 Signal에서 마이크와 카메라를 사용하도록 허용하세요.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal에서 전화 기능을 사용하려면 마이크와 카메라 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'마이크\'와 \'카메라\' 항목을 허용해 주세요.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">영상 통화를 수락하려면 Molly에서 마이크와 카메라를 사용하도록 허용하세요.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly에서 전화 기능을 사용하려면 마이크와 카메라 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'마이크\'와 \'카메라\' 항목을 허용해 주세요.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">연결된 기기에서 응답했습니다.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">연결된 기기에서 거부했습니다.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">연결된 기기에서 사용 중입니다.</string>
@@ -2622,16 +2742,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">새 암호 다시 입력</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Signal로 초대</string>
+    <string name="contact_selection_activity__invite_to_signal">Molly로 초대</string>
     <string name="contact_selection_activity__new_group">새 그룹</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">연락처 새로 고침</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">안 보이는 사람이 있나요? 새로 고쳐보세요.</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Signal에서 내가 아는 사람을 찾아보세요.</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">연락처 접근을 허용해 주세요.</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">더 보기</string>
 
@@ -2648,7 +2768,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">연락처 사진</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal에서 연락처 정보를 표시하려면 연락처 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'연락처\' 항목을 허용해 주세요.</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly에서 연락처 정보를 표시하려면 연락처 권한이 필요하지만 현재 거부되어 있습니다. 앱 설정 메뉴에서 \'권한\'을 선택한 후 \'연락처\' 항목을 허용해 주세요.</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">연락처를 가져오는 중 오류 발생, 네트워크 연결 확인</string>
     <string name="ContactSelectionListFragment_username_not_found">사용자 이름을 찾을 수 없음</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\'%1$s\' 님은 Signal 사용자가 아닙니다. 사용자 이름 확인 후 다시 시도해 주세요."</string>
@@ -2665,16 +2785,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">사용자명으로 검색</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">연락처 접근 허용</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Signal에서 내가 아는 사람을 찾으려면 다음을 수행하세요.</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">권한 허용</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">아니요</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">연락처 접근을 허용해 주세요. 연락처는 암호화되며 Signal 서비스에 표시되지 않습니다.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal에서 연락처를 표시하려면 연락처 권한이 필요합니다.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly에서 연락처를 표시하려면 연락처 권한이 필요합니다.</string>
     <string name="contact_selection_list_fragment__show_contacts">연락처 표시</string>
 
     <!-- contact_selection_list_item -->
@@ -2745,6 +2867,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">이전에 제거한 사용자입니다. 해당 사용자에게 메시지를 보내면 사용자가 목록에 다시 추가됩니다.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">옵션</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">업데이트</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">재생 … 일시 정지</string>
@@ -2773,7 +2897,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">도움말 풍선은 Signal 대화에서 끌 수 있는 Android 기능입니다.</string>
+    <string name="BubbleOptOutTooltip__description">도움말 풍선은 Molly 대화에서 끌 수 있는 Android 기능입니다.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">나중에</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -2936,7 +3060,7 @@
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
     <string name="EditProfileFragment_deprecated_dialog_title">시그널 최신 버전으로 업데이트</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">이 Signal 버전은 만료되었습니다. Signal을 계속 사용하려면 지금 업데이트하세요.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">이 Molly 버전은 만료되었습니다. Molly을 계속 사용하려면 지금 업데이트하세요.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">업데이트</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3152,7 +3276,7 @@
     <string name="preferences__slow">느리게</string>
     <string name="preferences__help">도움</string>
     <string name="preferences__advanced">고급</string>
-    <string name="preferences__donate_to_signal">Signal에 기부</string>
+    <string name="preferences__donate_to_signal">Molly에 기부</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">개인 정보</string>
     <!-- Preference label for stories -->
@@ -3189,13 +3313,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">앱 아이콘과 이름을 \"%1$s\"(으)로 변경</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">앱 아이콘과 이름을 변경하려면 Signal을 종료해야 합니다. 알림은 항상 기본 Signal 아이콘과 이름을 표시합니다.</string>
+    <string name="preferences__app_icon_dialog_description">앱 아이콘과 이름을 변경하려면 Molly을 종료해야 합니다. 알림은 항상 기본 Molly 아이콘과 이름을 표시합니다.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">휴대폰 홈 화면과 앱 서랍에 표시될 앱 아이콘과 이름을 선택하세요. 알림은 항상 기본 Signal 아이콘과 이름을 표시합니다. 자세히 알아보기</string>
+    <string name="preferences__app_icon_warning_learn_more">휴대폰 홈 화면과 앱 서랍에 표시될 앱 아이콘과 이름을 선택하세요. 알림은 항상 기본 Molly 아이콘과 이름을 표시합니다. 자세히 알아보기</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">앱 아이콘과 이름이 홈 화면과 앱 서랍에 표시됩니다.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">알림은 항상 기본 Signal 아이콘과 이름을 표시합니다.</string>
+    <string name="preferences__app_icon_notification_warning">알림은 항상 기본 Molly 아이콘과 이름을 표시합니다.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">자세히 알아보기</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3241,8 +3365,12 @@
         <item quantity="other">모든 대화에서 최근 메시지 %1$s개만 남기고 나머지를 영구 삭제합니다.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">이 기기의 모든 메시지 기록과 미디어를 영구 삭제합니다.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">이 기기와 모든 연결된 기기에서 영구적으로 모든 메시지 기록과 미디어를 삭제합니다.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">모든 메시지 기록을 삭제할까요?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">모든 메시지 기록을 영구적으로 제거합니다. 이 작업은 다시 되돌릴 수 없습니다.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">모든 기기에서 모든 메시지 기록을 영구적으로 제거합니다. 이 작업은 취소할 수 없습니다.</string>
     <string name="preferences_storage__delete_all_now">지금 모두 삭제</string>
     <string name="preferences_storage__forever">영원히</string>
     <string name="preferences_storage__one_year">1년</string>
@@ -3278,7 +3406,7 @@
     <string name="preferences_communication__category_censorship_circumvention">검열 우회</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">검열 우회</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">이 기능을 켠다면 Signal이 검열 우회를 시도합니다. Signal이 검열된 곳이 아니라면 이 기능을 켜지 마십시오.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">이 기능을 켠다면 Molly이 검열 우회를 시도합니다. Molly이 검열된 곳이 아니라면 이 기능을 켜지 마십시오.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">검열 우회가 계정의 휴대전화에서 활성화되습니다.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3330,7 +3458,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">결제 소개</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Signal을 사용하여 개인정보 보호에 중점을 둔 새로운 디지털 통화인 MobileCoin을 보내고 받으세요. 지금 활성화하여 시작해 보세요.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Molly을 사용하여 개인정보 보호에 중점을 둔 새로운 디지털 통화인 MobileCoin을 보내고 받으세요. 지금 활성화하여 시작해 보세요.</string>
     <string name="PaymentsHomeFragment__activate_payments">결제 활성화</string>
     <string name="PaymentsHomeFragment__activating_payments">결제 활성화 중…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">결제 계정 복원</string>
@@ -3356,7 +3484,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">귀하의 지역에서는 결제가 불가능합니다.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">결제를 활성화할 수 없습니다. 나중에 다시 시도하세요.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">결제를 비활성화하시겠습니까?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">결제를 비활성화하면 Signal에서 MobileCoin을 보내거나 받을 수 없습니다.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">결제를 비활성화하면 Molly에서 MobileCoin을 보내거나 받을 수 없습니다.</string>
     <string name="PaymentsHomeFragment__deactivate">비활성화</string>
     <string name="PaymentsHomeFragment__continue">계속</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">현재 잔액을 사용할 수 없습니다.</string>
@@ -3365,10 +3493,10 @@
     <string name="PaymentsHomeFragment__details">세부 정보</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Signal을 사용하여 MobileCoin을 주고받으세요. 모든 결제에는 MobileCoins와 MobileCoin Wallet의 사용 약관이 적용됩니다. 일부 문제가 발생할 수 있으며, 손실된 결제나 잔액은 복구할 수 없습니다. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Molly을 사용하여 MobileCoin을 주고받으세요. 모든 결제에는 MobileCoins와 MobileCoin Wallet의 사용 약관이 적용됩니다. 일부 문제가 발생할 수 있으며, 손실된 결제나 잔액은 복구할 수 없습니다. </string>
     <string name="PaymentsHomeFragment__activate">활성화</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoin 용어 보기</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Signal 결제는 더 이상 사용할 수 없습니다. 여전히 거래소로 자금을 이체할 수 있지만 더 이상 지불을 주고받거나 자금을 추가할 수 없습니다.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Molly 결제는 더 이상 사용할 수 없습니다. 여전히 거래소로 자금을 이체할 수 있지만 더 이상 지불을 주고받거나 자금을 추가할 수 없습니다.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3396,7 +3524,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">권한 허용</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">아는 사람에게 메시지를 보낼 수 있도록 Signal에서 이 권한을 요청합니다. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">아는 사람에게 메시지를 보낼 수 있도록 Molly에서 이 권한을 요청합니다. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">알림</string>
     <!-- Notifications permission row description -->
@@ -3484,10 +3612,10 @@
     <string name="PaymentsTransferFragment__next">다음</string>
     <string name="PaymentsTransferFragment__invalid_address">유효하지 않은 주소</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">이체하려는 지갑 주소를 확인하고 다시 시도하세요.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">내 Signal 지갑 주소로 이체할 수 없습니다. 지원되는 거래소에서 귀하의 계정에서 지갑 주소를 입력하세요.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR 코드를 스캔하려면 Signal이 카메라에 액세스할 수 있어야 합니다.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal이 QR 코드를 캡처하려면 카메라 권한이 필요합니다. 설정으로 이동하여 \'권한\'을 선택하고 \'카메라\'를 활성화하세요.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR 코드를 스캔하려면 Signal이 카메라에 액세스할 수 있어야 합니다.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">내 Molly 지갑 주소로 이체할 수 없습니다. 지원되는 거래소에서 귀하의 계정에서 지갑 주소를 입력하세요.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR 코드를 스캔하려면 Molly이 카메라에 액세스할 수 있어야 합니다.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly이 QR 코드를 캡처하려면 카메라 권한이 필요합니다. 설정으로 이동하여 \'권한\'을 선택하고 \'카메라\'를 활성화하세요.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR 코드를 스캔하려면 Molly이 카메라에 액세스할 수 있어야 합니다.</string>
     <string name="PaymentsTransferFragment__settings">설정</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3826,17 +3954,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Signal 음성 통화 수신 중</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Molly 음성 통화 수신 중</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Signal 영상 통화 수신 중</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Molly 영상 통화 수신 중</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Signal 단체 통화 수신</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Molly 단체 통화 수신</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Signal 음성 통화 진행 중</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Molly 음성 통화 진행 중</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Signal 영상 통화 진행 중</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Molly 영상 통화 진행 중</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Signal 그룹 통화 진행 중</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Molly 그룹 통화 진행 중</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">로드 중…</string>
@@ -3883,9 +4011,9 @@
     <string name="BackupDialog_verify">확인</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">백업 암호가 성공적으로 입력됨</string>
     <string name="BackupDialog_passphrase_was_not_correct">암호가 올바르지 않음</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signal 백업 만드는 중…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Molly 백업 만드는 중…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Signal 백업을 확인하는 중…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Molly 백업을 확인하는 중…</string>
     <string name="LocalBackupJobApi29_backup_failed">백업을 실패했습니다.</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">백업 경로가 삭제되었거나 이동했습니다.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">백업 파일이 너무 커서 이 볼륨에 저장할 수 없습니다.</string>
@@ -3900,15 +4028,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">나한테 전화(%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">코드 다시 보내기(%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Signal 지원 팀에 문의</string>
-    <string name="RegistrationActivity_code_support_subject">Signal 등록 - 안드로이드용 인증 코드</string>
+    <string name="RegistrationActivity_contact_signal_support">Molly 지원 팀에 문의</string>
+    <string name="RegistrationActivity_code_support_subject">Molly 등록 - 안드로이드용 인증 코드</string>
     <string name="RegistrationActivity_incorrect_code">올바르지 않은 코드</string>
     <string name="BackupUtil_never">없음</string>
     <string name="BackupUtil_unknown">알 수 없음</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">전화번호</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">내 전화번호를 볼 수 있고, Signal에서 내 전화번호로 나한테 연락할 수 있는 사람을 선택하세요.</string>
+    <string name="preferences_app_protection__choose_who_can_see">내 전화번호를 볼 수 있고, Molly에서 내 전화번호로 나한테 연락할 수 있는 사람을 선택하세요.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">내 전화번호를 볼 수 있는 사람</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -3956,7 +4084,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">많이 시도했습니다. 다시 시도해 주세요.</string>
     <string name="RegistrationActivity_error_connecting_to_service">서비스 연결 중 오류 발생</string>
     <string name="preferences_chats__backups">백업</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal이 잠김</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly이 잠김</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">탭하여 잠금 해제</string>
     <string name="Recipient_unknown">알 수 없음</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -3987,9 +4115,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">이전 장치에 액세스해야 합니다.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">백업에서 복원</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">로컬 백업에서 메시지를 복원합니다. 지금 복원하지 않으면 나중에 복원할 수 없습니다.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">로컬 백업 복원</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signal 백업 복원</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">모든 문자 메시지와 지난 30일간의 미디어를 복원합니다.</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">옵션 더 보기</string>
 
+    <string name="TransferOrRestoreFragment__cancel">취소</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">전송하지 않고 로그인</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">메시지와 미디어를 전송하지 않고 계속합니다.</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">이전 Android 휴대전화에서 Signal을 여세요.</string>
     <string name="NewDeviceTransferInstructions__continue">계속</string>
@@ -4004,19 +4139,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">이전 Android 장치에 연결 준비 중…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">잠시만요, 곧 준비가 될 겁니다.</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">이전 Android 장치 연결을 기다리는 중…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal이 이전 Android 장치를 검색하고 연결하려면 위치 권한이 필요합니다.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal이 이전 Android 장치를 검색하고 연결하려면 위치 서비스를 활성화해야 합니다.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal이 기존 Android 장치를 검색하고 연결하려면 Wi-Fi가 켜져 있어야 합니다. Wi-Fi가 켜져 있어야 하지만 Wi-Fi 네트워크에 연결되어 있지 않아도 됩니다.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">죄송합니다. 이 장치는 Wi-Fi Direct를 지원하지 않는 것 같습니다. Signal은 Wi-Fi Direct를 사용하여 이전 Android 장치를 검색하고 연결합니다. 여전히 백업을 복원하여 이전 Android 장치에서 계정을 복원할 수 있습니다.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly이 이전 Android 장치를 검색하고 연결하려면 위치 권한이 필요합니다.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly이 이전 Android 장치를 검색하고 연결하려면 위치 서비스를 활성화해야 합니다.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly이 기존 Android 장치를 검색하고 연결하려면 Wi-Fi가 켜져 있어야 합니다. Wi-Fi가 켜져 있어야 하지만 Wi-Fi 네트워크에 연결되어 있지 않아도 됩니다.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">죄송합니다. 이 장치는 Wi-Fi Direct를 지원하지 않는 것 같습니다. Molly은 Wi-Fi Direct를 사용하여 이전 Android 장치를 검색하고 연결합니다. 여전히 백업을 복원하여 이전 Android 장치에서 계정을 복원할 수 있습니다.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">백업 복원</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">이전 Android 장치에 연결하는 동안 예기치 않은 오류가 발생했습니다.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">새 Android 장치 검색 중…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal이 새 Android 장치를 검색하고 연결하려면 위치 권한이 필요합니다.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal에서 새 Android 장치를 검색하고 연결하려면 위치 서비스를 활성화해야 합니다.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal이 새 Android 장치를 검색하고 연결하려면 Wi-Fi가 켜져 있어야 합니다. Wi-Fi가 켜져 있어야 하지만 Wi-Fi 네트워크에 연결되어 있지 않아도 됩니다.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">죄송합니다. 이 장치는 Wi-Fi Direct를 지원하지 않는 것 같습니다. Signal은 Wi-Fi Direct를 사용하여 새 Android 장치를 검색하고 연결합니다. 새 Android 장치에서 계정을 복원하기 위해 백업을 생성할 수 있습니다.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly이 새 Android 장치를 검색하고 연결하려면 위치 권한이 필요합니다.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly에서 새 Android 장치를 검색하고 연결하려면 위치 서비스를 활성화해야 합니다.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly이 새 Android 장치를 검색하고 연결하려면 Wi-Fi가 켜져 있어야 합니다. Wi-Fi가 켜져 있어야 하지만 Wi-Fi 네트워크에 연결되어 있지 않아도 됩니다.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">죄송합니다. 이 장치는 Wi-Fi Direct를 지원하지 않는 것 같습니다. Molly은 Wi-Fi Direct를 사용하여 새 Android 장치를 검색하고 연결합니다. 새 Android 장치에서 계정을 복원하기 위해 백업을 생성할 수 있습니다.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">백업 만들기</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">새 Android 장치에 연결하는 동안 예기치 않은 오류가 발생했습니다.</string>
 
@@ -4057,7 +4192,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">데이터 전송 중</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">두 장치를 서로 가까이 두세요. 장치를 끄지 말고 Signal을 켜두세요. 전송은 종단 간 암호화됩니다.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">두 장치를 서로 가까이 두세요. 장치를 끄지 말고 Molly을 켜두세요. 전송은 종단 간 암호화됩니다.</string>
     <string name="DeviceTransfer__d_messages_so_far">지금까지 %1$d개의 메시지…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">현재까지 메시지 %1$s%% 전송 완료</string>
@@ -4071,7 +4206,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">계정 이동</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">새 Android 장치에서 Signal을 다운로드하세요.</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">새 Android 장치에서 Molly을 다운로드하세요.</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"계정 이전 또는 복원을 탭하세요."</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4324,7 +4459,7 @@
     <string name="payment_info_card_about_mobilecoin">모바일 코인 소개</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin은 새로운 개인정보 보호 중심의 디지털 통화입니다.</string>
     <string name="payment_info_card_adding_funds">자금 추가</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">MobileCoin을 지갑 주소로 전송하여 Signal에서 사용할 자금을 추가할 수 있습니다.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">MobileCoin을 지갑 주소로 전송하여 Molly에서 사용할 자금을 추가할 수 있습니다.</string>
     <string name="payment_info_card_cashing_out">현금화</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">MobileCoin을 지원하는 거래소에서 언제든지 MobileCoin을 현금화할 수 있습니다. 해당 거래소에서 계좌로 이체하기만 하면 됩니다.</string>
     <string name="payment_info_card_hide_this_card">이 카드를 숨기시겠습니까?</string>
@@ -4345,12 +4480,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">지갑 비활성화</string>
     <string name="DeactivateWalletFragment__your_balance">잔액</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">결제를 비활성화하기 전에 다른 지갑 주소로 자금을 이체하는 것이 좋습니다. 지금 자금을 이체하지 않기로 선택할 경우 결제를 다시 활성화하면 자금이 Signal에 연결된 지갑에 남아 있게 됩니다.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">결제를 비활성화하기 전에 다른 지갑 주소로 자금을 이체하는 것이 좋습니다. 지금 자금을 이체하지 않기로 선택할 경우 결제를 다시 활성화하면 자금이 Molly에 연결된 지갑에 남아 있게 됩니다.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">잔액 이체</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">전송하지 않고 비활성화</string>
     <string name="DeactivateWalletFragment__deactivate">비활성화</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">이전하지 않고 비활성화하시겠습니까?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">결제를 다시 활성화하기로 선택할 경우 잔액이 Signal에 연결된 지갑에 남아 있게 됩니다.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">결제를 다시 활성화하기로 선택할 경우 잔액이 Molly에 연결된 지갑에 남아 있게 됩니다.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">지갑을 비활성화하는 동안 오류가 발생했습니다.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4643,7 +4778,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">라이선스</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">이용 약관 &amp; 개인 정보 보호 정책</string>
-    <string name="HelpFragment__copyright_signal_messenger">Signal Messenger 저작권</string>
+    <string name="HelpFragment__copyright_signal_messenger">Molly Messenger 저작권</string>
     <string name="HelpFragment__licenced_under_the_agplv3">GNU AGPLv3에 따라 라이선스가 부여됨</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4881,9 +5016,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">색상 선택</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">공유</string>
 
@@ -4913,7 +5045,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">관리자만 이 그룹에 메시지를 전송할 수 있습니다.</string>
-    <string name="MultiselectForwardFragment__limit_reached">한계에 도달함</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">대화는 5개 이상 선택할 수 없습니다.</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5090,7 +5223,7 @@
     <!-- Title of dialog telling user they need to update signal as it expired -->
     <string name="UpdateSignalExpiredDialog__title">시그널 최신 버전으로 업데이트</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">이 Signal 버전은 만료되었습니다. Signal을 계속 사용하려면 지금 업데이트하세요.</string>
+    <string name="UpdateSignalExpiredDialog__message">이 Molly 버전은 만료되었습니다. Molly을 계속 사용하려면 지금 업데이트하세요.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">업데이트</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5099,7 +5232,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">기기를 등록 해제함</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">이 기기를 등록 해제했습니다. 이 기기에서 Signal을 계속 사용하려면 다시 등록하세요.</string>
+    <string name="ReregisterSignalDialog__message">이 기기를 등록 해제했습니다. 이 기기에서 Molly을 계속 사용하려면 다시 등록하세요.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">재등록</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5393,7 +5526,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">선택창을 열지 못했습니다.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">알림을 사용하려면 Signal에 알림을 표시할 권한을 부여해야 합니다.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">알림을 사용하려면 Molly에 알림을 표시할 권한을 부여해야 합니다.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">사용</string>
 
@@ -5539,8 +5672,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">답장 없음</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">더 이상 이 그룹의 멤버가 아니므로 이 스토리에 답장할 수 없습니다.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">스토리에 반응함</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">스토리에 반응함</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">스토리에 반응함</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">조회</string>
     <!-- Label for story replies tab -->
@@ -6140,8 +6275,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">은행 선택하기</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">%1$s을(를) 통한 기부 확인</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">정기 기부를 설정하려면 계속을 탭하여 은행을 통한 €0,01 청구를 확인해 주세요. 이렇게 하면 청구 금액은 자동으로 환불되고 계정에서 월 €5 기부가 승인됩니다.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">정기 기부를 설정하려면 계속을 탭하여 은행을 통한 €0,01 청구를 확인해 주세요. 이렇게 하면 청구 금액은 자동으로 환불되고 계정에서 월 %1$s 기부가 승인됩니다.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">계속</string>
 
@@ -6710,6 +6845,50 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">백업 데이터를 다운로드하는 중…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">미디어 백업 사용 안 함</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="other">결제를 처리할 수 없어 Signal 미디어 백업 플랜을 취소했습니다. 다음 %1$d일 동안 백업에 저장된 미디어를 다운로드할 수 있습니다. %1$d일이 지나면 백업의 미디어를 삭제합니다.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">언제든 백업 비용을 다시 결제하기 시작하여 모든 미디어를 계속 백업할 수 있습니다. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">오늘 미디어 삭제됨</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">결제를 처리할 수 없어 Signal 미디어 백업 플랜을 취소했습니다. 미디어가 삭제되기 전에 다운로드할 수 있는 마지막 기회입니다.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">다운로드를 완료할 수 없음</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">기기에 여유 공간이 부족합니다. 백업에 저장된 미디어를 다운로드하려면 %1$s의 여유 공간을 확보하세요.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="other">\'건너 뛰기\'를 선택하면 %1$d일 후 백업의 미디어가 삭제됩니다.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">백업 결제를 처리할 수 없음</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">월간 백업 결제를 처리하는 도중 문제가 발생했습니다. 결제 수단이 최신 상태인지 확인해 주세요. 최신 상태가 아니라면 Google Pay에서 업데이트하세요. Signal에서 며칠 후 다시 결제 처리를 시도합니다.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">백업을 완료할 수 없음</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">기기에서 %1$d일 동안 백업을 완료하지 않았습니다. 기기가 Wi-Fi에 연결되어 있는지 확인하고 \'지금 백업\'을 탭하세요. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">자세히 알아보기</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">건너뛰기</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">지금 미디어 다운로드</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">나중에 다운로드</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">미디어 다운로드 안 함</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">미디어를 다운로드하려면 %1$s의 여유 공간을 확보하세요.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">신용 또는 직불 카드</string>
@@ -6723,6 +6902,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">알 수 없음</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">결제 기록</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">마지막 백업이 완료된 시간은 %1$s %2$s입니다.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6733,6 +6918,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">선택한 기간보다 오래된 메시지를 영구 삭제합니다.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">선택한 길이를 초과하는 메시지를 영구 삭제합니다.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">연결된 기기에 제한 적용</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">대화 제한을 사용하도록 설정할 경우 연결된 기기에서도 메시지를 삭제합니다.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">이제 모든 기기에서 삭제를 동기화합니다</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">메시지 또는 대화를 삭제할 때 휴대폰과 연결된 기기에서 해당 내용을 삭제합니다.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">확인</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">결제 기록</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">텍스트 및 모든 미디어 백업</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">결제 세부 정보</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">백업 종류</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">지불 날짜</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">공유</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal 백업</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">결제 기록</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">백업 세부 정보</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">백업 크기</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">백업 빈도</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">백업 셀룰러 데이터 사용</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">백업 끄기 및 삭제</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">백업을 삭제하고 껐습니다.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">백업 종류를 변경하고 구독을 취소했습니다.</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">구독 취소 완료</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">다운로드 완료</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">백업 종류</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">백업 사용 안 함</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/월</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">백업 활성화</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">마지막 백업</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%2$s %1$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">없음</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">지금 백업</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">백업을 끄고 삭제할까요?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">요금이 다시 청구되지 않습니다. 백업이 삭제되고 새로운 백업이 생성되지 않습니다.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">끄기 및 삭제</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">백업을 삭제하는 중…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">백업 삭제 완료</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"\'지금 백업\'을 탭하여 수행"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">매일</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">매주</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">매월</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">수동 백업</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">기기 PIN, 암호 또는 패턴을 입력하세요.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">다음</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">백업 유형 변경</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">구독 취소</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">취소 확인</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">요금이 다시 청구되지 않습니다. 청구 주기가 끝나면 백업이 비활성화됩니다. 해당 날짜부터 30일 동안 현재 백업 중인 미디어를 다운로드할 수 있습니다.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">확인 및 지금 다운로드</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">확인 및 나중에 다운로드</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">구독 유지</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ky/strings.xml b/app/src/main/res/values-ky/strings.xml
index b72fe88428..f52b37f11e 100644
--- a/app/src/main/res/values-ky/strings.xml
+++ b/app/src/main/res/values-ky/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal жаңырууда…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly жаңырууда…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Сыр сөз айкашын али кое элексиз!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Сыр сөз айкашын өчүрөсүзбү?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Ушуну менен, Signal колдонмосу такыр кулпуланбай, билдирмелери сырсөзсүз көрүнө берет.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Ушуну менен, Molly колдонмосу такыр кулпуланбай, билдирмелери сырсөзсүз көрүнө берет.</string>
     <string name="ApplicationPreferencesActivity_disable">Өчүрүү</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Серверге туташууда ката кетти!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN-коддор катталууну кулпулоо үчүн керек. Алгач катталууну кулпулоо функциясын өчүрүп, кийин PIN-коддорду өчүрүңүз.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Файл</string>
     <string name="AttachmentKeyboard_contact">Байланыш</string>
     <string name="AttachmentKeyboard_location">Жүргөн жер</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal сүрөттөрүңүз менен видеолоруңузду сиздин уруксатыңыз менен көрсөтөт</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly сүрөттөрүңүз менен видеолоруңузду сиздин уруксатыңыз менен көрсөтөт</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Кирүүгө уруксат берүү</string>
     <string name="AttachmentKeyboard_payment">Төлөм</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Медиафайлдарды тандай турган колдонмо табылган жок.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal колдонмосуна сүрөттөрдү, видеолорду же аудиолорду тиркөө үчүн Сактагычка кирүүгө уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Сактагыч\" дегенди иштетиңиз.</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal колдонмосуна байланыштын маалыматын тиркөө үчүн Байланыштарды колдонууга уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Байланыштар\" дегенди иштетиңиз.</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal колдонмосуна турган жериңизди тиркөө үчүн Жүргөн жерди аныктоо функциясын колдонууга уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Жүргөн жерди аныктоо\" дегенди иштетиңиз.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly колдонмосуна сүрөттөрдү, видеолорду же аудиолорду тиркөө үчүн Сактагычка кирүүгө уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Сактагыч\" дегенди иштетиңиз.</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly колдонмосуна байланыштын маалыматын тиркөө үчүн Байланыштарды колдонууга уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Байланыштар\" дегенди иштетиңиз.</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly колдонмосуна турган жериңизди тиркөө үчүн Жүргөн жерди аныктоо функциясын колдонууга уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Жүргөн жерди аныктоо\" дегенди иштетиңиз.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Жүргөн жериңизди көрсөтүңүз</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Жүргөн жериңизди жөнөтүү үчүн:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Жүргөн жериңизди жөнөткөнгө Signal\'га уруксат бериңиз.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Жүргөн жериңизди жөнөткөнгө Molly\'га уруксат бериңиз.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Жүргөн жериңизди жөнөтүү үчүн Signal кайда жүргөнүңүздү көрүшү керек.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Жүргөн жериңизди жөнөтүү үчүн Molly кайда жүргөнүңүздү көрүшү керек.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Сактагычка мүмкүнчүлүк берүү</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Сүрөттөр менен видеолорду көрсөтүү үчүн:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Сүрөттөрүңүз менен видеолоруңузду көрсөтүү үчүн Signal сактагычыңызга кире алышы керек.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Сүрөттөрүңүз менен видеолоруңузду көрсөтүү үчүн Molly сактагычыңызга кире алышы керек.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s төлөмдөр кызматын иштете элек </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Камераны алмаштыруу</string>
     <string name="CameraXFragment_open_gallery_description">Галереяны ачуу</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Кирүүгө уруксат берүү</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Камерага жана микрофонго кирүүгө уруксат бериңиз</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Камераңызга кирүүгө уруксат бериңиз</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Микрофонуңузга уруксат бериңиз</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Сүрөт тартуу үчүн Signal колдонмосуна камерага кирүүсүнө уруксат бериңиз.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Сүрөт же видео тартуу үчүн Signal колдонмосуна камераны колдонууга уруксат беришиңиз керек.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Сүрөт жана видео тартуу үчүн Signal колдонмосуна камерага жана микрофонго кирүүсүнө уруксат бериңиз.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Үн менен видео тартуу үчүн Signal колдонмосуна микрофонуңузга кирүүгө уруксат бериңиз.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">QR кодун скандоо үчүн Signal колдонмосуна камерага кирүүсүнө уруксат бериңиз.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Сүрөт тартуу үчүн Signal камерага кирүү мүмкүнчүлүгүн талап кылат</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">QR коддорун скандоо үчүн Signal колдонмосу камерага кирүүсү керек</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Видеого тартуу үчүн Signal микрофонду колдонушу керек</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Signal\'да сүрөт тартуу үчүн:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Signal\'да сүрөт жана видео тартуу үчүн:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Үн менен видео тартуу үчүн:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR коддорун скандоо үчүн:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Соңку байланыштар</string>
@@ -270,7 +271,7 @@
     <string name="CameraContacts_no_signal_contacts">Signal байланыштары жок</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Сүрөттөрдү камеранын баскычы менен Signal\'дын колдонуучуларына гана жөнөтө аласыз. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Керектүү адамды таппай жатасызбы?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Байланышыңызды Signal\'га чакырыңыз</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Байланышыңызды Molly\'га чакырыңыз</string>
     <string name="CameraContacts__menu_search">Издөө</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -284,12 +285,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Жок, рахмат</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Signal\'ды жаңыртуу</string>
+    <string name="ClientDeprecatedActivity_update_signal">Molly\'ды жаңыртуу</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Колдонмонун бул версиясы жарабай калган. Башкалар менен жазыша берүү үчүн аны жаңыртыңыз.</string>
     <string name="ClientDeprecatedActivity_update">Жаңыртуу</string>
     <string name="ClientDeprecatedActivity_dont_update">Жок, жаңыртпайм</string>
     <string name="ClientDeprecatedActivity_warning">Эскертүү</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Signal\'дын версиясы эскирип калган. Буга чейин жазышкан билдирүүлөрүңүздү көрө алганыңыз менен, колдонмону жаңыртмайынча, башкалар менен жазыша албайсыз.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Molly\'дын версиясы эскирип калган. Буга чейин жазышкан билдирүүлөрүңүздү көрө алганыңыз менен, колдонмону жаңыртмайынча, башкалар менен жазыша албайсыз.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Серепчи табылган жок.</string>
@@ -326,8 +327,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Билдирүү %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly Аудио чалуу %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly Видео чалуу %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -419,7 +420,7 @@
     <string name="ConversationActivity_transport_signal">Signal билдирүүсү</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Билдирүү жөнөтүү</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Signal\'га өтүп алыңыз: %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Molly\'га өтүп алыңыз: %1$s</string>
     <string name="ConversationActivity_specify_recipient">Байланыш тандаңыз</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Тиркеменин көлөмү жөнөтүлүп жаткан билдирүү үчүн белгиленген чектен ашып кетти.</string>
     <string name="ConversationActivity_unable_to_record_audio">Аудио жазылбай жатат!</string>
@@ -438,18 +439,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Аудио билдирүү жөнөтүү үчүн:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Аудио билдирүү жаздыруу үчүн Signal\'га микрофонуңуз керек.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Аудио билдирүү жаздыруу үчүн Molly\'га микрофонуңуз керек.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Аудио билдирүү жаздыруу үчүн Signal\'га микрофон керек.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal колдонмосуна аудио билдирүүлөрдү жөнөтүү үчүн микрофонду колдонууга уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Микрофон\" дегенди иштетиңиз.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Аудио билдирүү жаздыруу үчүн Molly\'га микрофон керек.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly колдонмосуна аудио билдирүүлөрдү жөнөтүү үчүн микрофонду колдонууга уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Микрофон\" дегенди иштетиңиз.</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal колдонмосуна %1$s чалуу үчүн микрофон менен камераны колдонууга уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Микрофон\" жана \"Камера\" дегенди иштетиңиз.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Сүрөт же видео тартуу үчүн Signal колдонмосуна камераны колдонууга уруксат беришиңиз керек.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal колдонмосуна сүрөт же видео тартуу үчүн камераны колдонууга уруксат беришиңиз керек, бирок сиз аны четке каккансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Камера\" дегенди иштетиңиз.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Сүрөт же видео тартуу үчүн Signal колдонмосуна камераны колдонууга уруксат беришиңиз керек.</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly колдонмосуна %1$s чалуу үчүн микрофон менен камераны колдонууга уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Микрофон\" жана \"Камера\" дегенди иштетиңиз.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Сүрөт же видео тартуу үчүн Molly колдонмосуна камераны колдонууга уруксат беришиңиз керек.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly колдонмосуна сүрөт же видео тартуу үчүн камераны колдонууга уруксат беришиңиз керек, бирок сиз аны четке каккансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Камера\" дегенди иштетиңиз.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Сүрөт же видео тартуу үчүн Molly колдонмосуна камераны колдонууга уруксат беришиңиз керек.</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Видеону үнү менен тартуу үчүн микрофонду колдонууга уруксат бериңиз.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal колдонмосуна видео тартуу үчүн микрофонду колдонууга уруксат беришиңиз керек, бирок сиз баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Микрофон\" дегенди иштетиңиз.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Видео тартуу үчүн Signal колдонмосуна микрофонду колдонууга уруксат керек.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly колдонмосуна видео тартуу үчүн микрофонду колдонууга уруксат беришиңиз керек, бирок сиз баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Микрофон\" дегенди иштетиңиз.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Видео тартуу үчүн Molly колдонмосуна микрофонду колдонууга уруксат керек.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Жок</string>
@@ -470,9 +471,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Чалып баштоо үчүн:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Чалып баштоо үчүн Signal\'га микрофонуңуз керек.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Чалып баштоо үчүн Molly\'га микрофонуңуз керек.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Чалып баштоо үчүн Signal\'га микрофон керек.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Чалып баштоо үчүн Molly\'га микрофон керек.</string>
 
 
     <string name="ConversationActivity_join">Кошулуу</string>
@@ -486,9 +487,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Signal кызматында мындан ары SMS менен жазыша албайсыз. %1$s менен бул жерден сүйлөшө берүү үчүн аны Signal\'га чакырыңыз.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Бул адам Signal\'ды колдонбой калган. Бул жерден сүйлөшө берүү үчүн аны Signal\'га чакырыңыз.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Бул адам Molly\'ды колдонбой калган. Бул жерден сүйлөшө берүү үчүн аны Molly\'га чакырыңыз.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Signal\'га чакыруу</string>
+    <string name="ConversationActivity__invite_to_signal">Molly\'га чакыруу</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Жакында дагы бир жолу эстетип коебуз.</string>
 
@@ -536,6 +537,8 @@
     <string name="ConversationFragment_delete_for_everyone">Бардык жерде өчсүн</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Бул түзмөктө өчүрүү</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Өчүрүү</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Бардык жерде өчүрүү</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Бул билдирүү Signal\'дын акыркы версиясын колдонуп жаткандардын баары үчүн өчүрүлөт. Билдирүүнү өчүргөнүңүз аларга көрүнөт.</string>
@@ -567,13 +570,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Бөгөттөлдү</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Signal\'ды жаңыртуу</string>
+    <string name="ConversationFragment__update_build">Molly\'ды жаңыртуу</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Signal\'га кайра катталыңыз</string>
+    <string name="ConversationFragment__reregister_signal">Molly\'га кайра катталыңыз</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Артка өтүү.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signal\'ды ачуу</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Molly\'ды ачуу</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Мындан ары ырасталбайт</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -636,6 +639,10 @@
     <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
         <item quantity="other">Бардык тандалган %1$d маек биротоло өчөт.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="other">Тандалган %1$d маектин баары бардык түзмөктөрүңүздөн биротоло өчүп калат.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Өчүрүлүүдө</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="other">Тандалган маектер өчүрүлүүдө…</item>
@@ -719,9 +726,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Мени телефон номерим аркылуу кимдер таба алышат?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Телефон номериңизди билген адам сизди Signal\'да көрүп, сүйлөшө алат.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Телефон номериңизди билген адам сизди Molly\'да көрүп, сүйлөшө алат.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Билдирүү жазмайынча же маектешип баштамайынча, сиздин Signal\'да отурганыңызды эч ким билбейт.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Билдирүү жазмайынча же маектешип баштамайынча, сиздин Molly\'да отурганыңызды эч ким билбейт.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Резервдик көчүрмөлөрдөн калыбына келтирилсинби?</string>
@@ -755,7 +762,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Камдык көчүрмөңүздүн сыр сөз айкашын сынап көрүп, анын иштеп жатканын текшериңиз</string>
     <string name="BackupsPreferenceFragment__turn_on">Күйгүзүү</string>
     <string name="BackupsPreferenceFragment__turn_off">Өчүрүү</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Камдык көчүрмөдөн калыбына келтирүү үчүн Signal\'дын жаңы көчүрмөсүн орнотуңуз. Колдонмону ачып, \"Камдык көчүрмөнү калыбына келтирүү\" дегенди басып, камдык көчүрмөнүн файлын тандаңыз. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Камдык көчүрмөдөн калыбына келтирүү үчүн Molly\'дын жаңы көчүрмөсүн орнотуңуз. Колдонмону ачып, \"Камдык көчүрмөнү калыбына келтирүү\" дегенди басып, камдык көчүрмөнүн файлын тандаңыз. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Кененирээк маалымат</string>
     <string name="BackupsPreferenceFragment__in_progress">Иштелип жатат…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -763,7 +770,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d болуп калды …</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% болуп калды…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal колдонмосуна камдык көчүрмөлөрдү түзүү үчүн сактагычты колдонууга уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Сактагыч\" дегенди иштетиңиз.</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly колдонмосуна камдык көчүрмөлөрдү түзүү үчүн сактагычты колдонууга уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Сактагыч\" дегенди иштетиңиз.</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Камдык көчүрмөнүн убакытын коюңуз</string>
 
@@ -830,7 +837,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Маектин сессиясы жаңырды</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal баштан аяк шифрлөөнү колдонгондуктан, кээде маегиңиздин сессиясын жаңыртууга туура келет. Маегиңиздин коопсуздугу бузулбаганы менен, ушул адамдан келген билдирүүнү көрбөй калышыңыз мүмкүн. Андыктан билдирүүсүн дагы бир жолу жөнөтүп койсун.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly баштан аяк шифрлөөнү колдонгондуктан, кээде маегиңиздин сессиясын жаңыртууга туура келет. Маегиңиздин коопсуздугу бузулбаганы менен, ушул адамдан келген билдирүүнү көрбөй калышыңыз мүмкүн. Андыктан билдирүүсүн дагы бир жолу жөнөтүп койсун.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Signal\'ды компьютерде же iPad\'да колдоно аласыз. Билдирүүлөрүңүз бардык байланышкан түзмөктөрүңүздө шайкештирилет.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Жаңы түзмөктү байланыштыруу</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Билдирүүлөр менен маектеги нерселер бардык түзмөктөрдө баштан аяк шифрлөө менен корголот</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal\'ды компьютерде же iPad\'да колдоно аласыз</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Байланышкан түзмөктөрдө купуя жазышасыз</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Мобилдик телефонуңуз байланыштырылгандан кийин, Molly\'дагы билдирүүлөр андагы Molly менен шайкештирилет. Ага чейинки билдирүүлөрүңүз көрүнбөйт.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Molly\'ды орнотуу үчүн башка түзмөктөн бул жерге өтүңүз: %1$s</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Байланышкан түзмөктөрүм</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Ажыратуу</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s ажыратылган</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Түзмөк байланыштырылууда…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Түзмөк ырасталды</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Жүктөлүүдө…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Байланышкан түзмөк жок</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Түзмөккө байланышуу үчүн кулпуну ачыңыз</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Түзмөктү байланыштыруу үчүн анда көрүнүп турган QR кодду скандаңыз.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">QR кодун скандоо</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Байланыштырыла турган түзмөктөгү QR кодду ушул түзмөк менен скандаңыз</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Макул</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Байланыштырсаңыз, бул түзмөк топторуңуз менен байланыштарыңызды, маектериңизди жана сиздин атыңызга жөнөтүлгөн билдирүүлөрдү көрө алат.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Башка түзмөктөн ажыратуу</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Molly\'ды башка түзмөгүңүздөн ажыратасыз.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Түзмөк байланышпай калды</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Бул QR код жараксыз. Байланыштырыла турган түзмөктөгү QR кодду скандаңыз.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Кайра аракет кылуу</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">\'%1$s\' ажыратасызбы?</string>
@@ -852,10 +914,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Google Play кызматтары жок болгондо оптималдаштыруу</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Бул түзмөктө Google Play кызматтары иштебейт. Signal колдонулбаганда билдирүүлөрдү алганга мүмкүнчүлүк бербеген батареяны үнөмдөө функциясын өчүрүү үчүн бул жерди басып коюңуз.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Бул түзмөктө Google Play кызматтары иштебейт. Molly колдонулбаганда билдирүүлөрдү алганга мүмкүнчүлүк бербеген батареяны үнөмдөө функциясын өчүрүү үчүн бул жерди басып коюңуз.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Signal\'дын бул версиясы эскирип калган. Жазышкыңыз келсе, аны жаңыртыңыз.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Molly\'дын бул версиясы эскирип калган. Жазышкыңыз келсе, аны жаңыртыңыз.</string>
     <string name="ExpiredBuildReminder_update_now">Жаңыртуу</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -866,7 +928,7 @@
 
     <!-- GcmRefreshJob -->
     <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Оңдолбой турган байланыш катасы кетти!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal колдонмосу Google Play кызматтарында каттала алган жок. Signal аркылуу чалуу жана жазышуу мүмкүнчүлүгү өчүрүлдү. Кайрадан Тууралоо &gt; Өркүндөтүлгөн бөлүмү аркылуу катталып көрүңүз.</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly колдонмосу Google Play кызматтарында каттала алган жок. Molly аркылуу чалуу жана жазышуу мүмкүнчүлүгү өчүрүлдү. Кайрадан Тууралоо &gt; Өркүндөтүлгөн бөлүмү аркылуу катталып көрүңүз.</string>
 
 
     <!-- GiphyActivity -->
@@ -992,20 +1054,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Мүчүлүштүктөр журналдары аркылуу маселени аныктап, чече алабыз. Аларда сизди аныктаган маалымат болбойт.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal\'да ката кетти. Мүчүлүштүктөр журналын жөнөтөсүзбү?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly\'да ката кетти. Мүчүлүштүктөр журналын жөнөтөсүзбү?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Батареяны үнөмдөө режиминен улам, билдирмелер кечигип келүүдө</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Билдирмелер кечикпей келиши үчүн Signal\'дын батареяны үнөмдөө режимин өчүрүп койсоңуз болот.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Билдирмелер кечикпей келиши үчүн Molly\'дын батареяны үнөмдөө режимин өчүрүп койсоңуз болот.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Батареяны үнөмдөө режиминен улам, билдирмелер кечигип келүүдө</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Билдирмелер кечикпей келиши үчүн Molly\'дын батареяны үнөмдөө режимин өчүрүп койсоңуз болот. Түзмөккө байланыштуу нускамаларды көрүү үчүн \"Улантуу\" дегенди басыңыз.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Жок, рахмат</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Улантуу</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Улантуу</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Жок</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Жок, рахмат</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Топко чакыруулар</string>
+    <string name="PendingMembersActivity_pending_group_invites">Өтүнүчтөр жана чакыруулар</string>
     <string name="PendingMembersActivity_requests">Өтүнүчтөр</string>
     <string name="PendingMembersActivity_invites">Чакыруулар</string>
     <string name="PendingMembersActivity_people_you_invited">Сиз чакырган адамдар</string>
@@ -1244,12 +1316,12 @@
     <string name="InviteActivity_cancel">Жокко чыгаруу</string>
     <string name="InviteActivity_sending">Жөнөтүлүүдө…</string>
     <string name="InviteActivity_invitations_sent">Чакыруулар жөнөтүлдү!</string>
-    <string name="InviteActivity_invite_to_signal">Signal\'га чакыруу</string>
+    <string name="InviteActivity_invite_to_signal">Molly\'га чакыруу</string>
     <string name="InviteActivity_send_sms">SMS жөнөтүү (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="other">Бул байланышка (%1$d) SMS чакырууларын жөнөтөсүзбү?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Signal\'га өтүп алыңыз: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Molly\'га өтүп алыңыз: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Бөлүшө турган колдонмолоруңуз жок окшойт.</string>
 
     <!-- LearnMoreTextView -->
@@ -1263,7 +1335,7 @@
     <string name="LongMessageActivity_your_message">Сиздин билдирүүңүз</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Фондук байланыш күйгүзүлдү</string>
 
     <!-- MediaOverviewActivity -->
@@ -1327,10 +1399,10 @@
     <string name="MessageQuotesBottomSheet_replies">Жооптор</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal аркылуу чалып баштадыңыз</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly аркылуу чалып баштадыңыз</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signal аркылуу чалуу кызматы</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal аркылуу чалуу кызматы токтотулууда</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Molly аркылуу чалуу кызматы</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly аркылуу чалуу кызматы токтотулууда</string>
     <string name="NotificationBarManager__cancel_call">Чалууну токтотуу</string>
 
     <!-- NotificationsMegaphone -->
@@ -1574,6 +1646,14 @@
     <string name="MessageRecord_you_activated_payments">Төлөмдөр кызматын иштеттиңиз</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s эми төлөмдөрдү ала алат</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Төлөмдүн чоо-жайы көрүнбөйт</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Кененирээк маалымат</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Төлөмдүн чоо-жайын көрө албайсыз</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Билдирүүлөрүңүз ушул төлөм сакталбаган булактан алынгандыктан, анын чоо-жайын көрө албайсыз. Капчыгыңыздагы каражаттарга же буга чейинки төлөмдөрдүн абалына таасири тийбейт.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1628,9 +1708,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Жакында Signal\'дан SMS билдирүүлөрүн жөнөтө албай каласыз. %1$s менен бул жерден сүйлөшө берүү үчүн аны Signal\'га чакырыңыз.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Мындан ары Signal\'дан SMS билдирүүлөрүн жөнөтө албайсыз. %1$s менен бул жерден сүйлөшө берүү үчүн аны Signal\'га чакырыңыз.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Мындан ары Molly\'дан SMS билдирүүлөрүн жөнөтө албайсыз. %1$s менен бул жерден сүйлөшө берүү үчүн аны Molly\'га чакырыңыз.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Төлөм: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Төлөм</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Спам деп кабарланды</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1704,7 +1786,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Signal түзмөгүн байланыштырасызбы?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Signal түзмөгүн үчүнчү тараптын сканери аркылуу байланыштырганы жатат окшойсуз. Коопсуздук максатында, кодду Signal аркылуу скандаңыз.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal колдонмосуна QR кодун скандоо үчүн камераны колдонууга уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Камера\" дегенди иштетиңиз.</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly колдонмосуна QR кодун скандоо үчүн камераны колдонууга уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Камера\" дегенди иштетиңиз.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">QR кодду скандоо үчүн камерага уруксат алышыңыз керек</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1716,11 +1798,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Сыр сөз айкашын киргизиңиз</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal сүрөтчөсү</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly сүрөтчөсү</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Сыр сөз айкашын тапшыруу</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Сыр сөз айкашы туура эмес!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signal\'ды бөгөттөн чыгаруу</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Кулпу экраны</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Molly\'ды бөгөттөн чыгаруу</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Кулпу экраны</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Карта</string>
@@ -1786,7 +1868,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Жазышууну улантуу үчүн текшерүүдөн өтүп коюңуз</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Signal кызматында спамдарга жол бербөө үчүн текшерүүдөн өтүп коюңуз.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Molly кызматында спамдарга жол бербөө үчүн текшерүүдөн өтүп коюңуз.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Текшерүүдөн өткөндөн кийин мурункудай жазыша бересиз. Токтоп турган билдирүүлөрдүн баары дароо жөнөтүлөт.</string>
 
     <!-- Recipient -->
@@ -1794,7 +1876,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Менин окуям</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal аркылуу чалуу</string>
+    <string name="Recipient_signal_call">Molly аркылуу чалуу</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Бөгөттөө</string>
@@ -1808,7 +1890,8 @@
     <string name="RedPhone_ringing">Чалып жатасыз…</string>
     <string name="RedPhone_busy">Бош эмес</string>
     <string name="RedPhone_recipient_unavailable">Абонент бош эмес</string>
-    <string name="RedPhone_network_failed">Ката кетти!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Ката кетти! Байланышыңызды текшерип, кайталап көрүңүз.</string>
     <string name="RedPhone_number_not_registered">Мындай номер жок</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Сиз чалып жаткан номерде чалуулар корголбойт!</string>
     <string name="RedPhone_got_it">Түшүндүм</string>
@@ -1819,8 +1902,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Видеоңузду ойнотуу үчүн бул жерди басыңыз</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s чалуу үчүн Signal колдонмосуна камераңыз керек</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s чалуу үчүн Molly колдонмосуна камераңыз керек</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Байланышка чыктыңыз…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Кайра байланышып жатасыз…</string>
@@ -1868,10 +1951,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Чалуудан чыгарылды</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Сизди кимдир-бирөө чалуудан чыгарып салды.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Камерага жана микрофонго кирүүгө уруксат бериңиз</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Микрофонуңузга уруксат бериңиз</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Камераңызга кирүүгө уруксат бериңиз</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Чалып баштоо же чалууга кошулуу үчүн Molly\'га камераңыз жана микрофонуңуз керек.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Чалып баштоо же чалууга кошулуу үчүн Molly\'га микрофонуңуз керек.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Видео режимди иштетүү үчүн Molly\'га камераңызды колдонгонго уруксат беришиңиз керек.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Чалып баштоо же чалууга кошулуу үчүн Molly\'га микрофонуңуз керек.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Видеоңузду иштетүү үчүн Molly\'га камераңыз керек</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Чалып баштоо же чалууга кошулуу үчүн:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Видеоңузду иштетүү үчүн:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal аркылуу чалуу</string>
-    <string name="WebRtcCallView__signal_video_call">Signal аркылуу видео чалуу</string>
+    <string name="WebRtcCallView__signal_call">Molly аркылуу чалуу</string>
+    <string name="WebRtcCallView__signal_video_call">Molly аркылуу видео чалуу</string>
     <string name="WebRtcCallView__start_call">Чалып баштоо</string>
     <string name="WebRtcCallView__join_call">Чалууга кошулуу</string>
     <string name="WebRtcCallView__call_is_full">Орун жок</string>
@@ -1956,21 +2059,38 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Колуңузду түшүрөсүзбү?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Колду түшүрүү</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Түшүрүү</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Жок</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Колуңузду көтөрдүңүз</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Карап көрүү</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s колун көтөрдү</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s жана дагы %2$d колдорун көтөрүштү</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s колун көтөрдү</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
         <item quantity="other">%1$s жана дагы %2$d колдорун көтөрүштү</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="other">%1$s жана дагы %2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="other">%1$s жана дагы %2$d</item>
     </plurals>
 
@@ -2055,7 +2175,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Номерди текшерүү үчүн сизге чалуу келет.</string>
     <string name="RegistrationActivity_edit_number">Номерди алмаштыруу</string>
     <string name="RegistrationActivity_missing_google_play_services">Google Play кызматтары көрсөтүлбөй жатат</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Бул жабдыкта Google Play кызматтары көрсөтүлбөй жатат. Сиз дагы эле Signal\'ды колдонууну улантууңуз мүмкүн, бирок бул кофигурациянын ишенимдүүлүгү жана натыйжалуулугу төмөндөшү мүмкүн. \\ N \\ nЭгер сиз көп тажрыйбалуу колдонуучу болбосоңуз, кийинчерээк Android ROM\'ун иштетпесеңиз же бул катаны жаңылыштык аркылуу көрүп жатам деп ойлосоңуз, сураныч, көйгөйдү чечүү үчүн support@signal.org почта адресине жазып, жардам сурап кайрылыңыз.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Бул жабдыкта Google Play кызматтары көрсөтүлбөй жатат. Сиз дагы эле Molly\'ды колдонууну улантууңуз мүмкүн, бирок бул кофигурациянын ишенимдүүлүгү жана натыйжалуулугу төмөндөшү мүмкүн. \\ N \\ nЭгер сиз көп тажрыйбалуу колдонуучу болбосоңуз, кийинчерээк Android ROM\'ун иштетпесеңиз же бул катаны жаңылыштык аркылуу көрүп жатам деп ойлосоңуз, сураныч, көйгөйдү чечүү үчүн support@molly.im почта адресине жазып, жардам сурап кайрылыңыз.</string>
     <string name="RegistrationActivity_i_understand">Түшүнүктүү</string>
     <string name="RegistrationActivity_play_services_error">Google Play сервистерин жүргүзүүдө ката бар</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play кызматтары жаңыртылууда же убактылуу иштебей жатат. Сураныч, дагы бир жолу аракет кылып көрүңүз.</string>
@@ -2073,7 +2193,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Телефон номери туура эмес</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Телефон номерин туура эмес киргиздиңиз окшойт (%1$s).\n\nМындай эмес беле %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Телефон номеринин форматы</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Телефон номеринин форматы</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Чалуу суралды</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2106,8 +2226,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Каттала албай жатасызбы?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• SMS билдирүү алуу же чалуу үчүн телефонуңузда байланыш болушу керек\n • Адамдар телефон номериңизге чала алышы керек\n • Телефон номериңизди туура киргизиңиз.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Кененирээк маалымат алуу үчүн төмөнкү кадамдарды аткарыңыз же Кардарларды тейлеген кызматка кайрылыңыз</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Кененирээк маалымат алуу үчүн бул жерге өтүңүз: %1$s же %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">ушул кадамдарды</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2145,13 +2265,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Байланыштарга кошуу</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Signal\'га чакыруу</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Molly\'га чакыруу</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal билдирүүсү</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal аркылуу чалуу</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Байланыштарга кошуу</string>
-    <string name="SharedContactView_invite_to_signal">Signal\'га чакыруу</string>
+    <string name="SharedContactView_invite_to_signal">Molly\'га чакыруу</string>
     <string name="SharedContactView_message">Signal билдирүүсү</string>
 
     <!-- SignalBottomActionBar -->
@@ -2282,11 +2402,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s номери %2$s деген кишиге таандык</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal\'ды жаңыртуу</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal\'дын жаңы версиясы чыкты. Жаңыртуу үчүн басыңыз.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal жаңырбай калды</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly\'ды жаңыртуу</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly\'дын жаңы версиясы чыкты. Жаңыртуу үчүн басыңыз.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly жаңырбай калды</string>
     <string name="ApkUpdateNotifications_failed_general_body">Бир аздан соң аракет кылып көрөбүз.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal ийгиликтүү жаңырды</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly ийгиликтүү жаңырды</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Автоматтык түрдө %1$s версиясына жаңырды.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2356,7 +2476,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Signal\'дагы коопсуздук кодубуз:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Бөлүшө турган колдонмолоруңуз жок окшойт.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Алмашуу буферинде коопсуздук коду жок</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal колдонмосуна QR кодун скандоо үчүн камераны колдонууга уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Камера\" дегенди иштетиңиз.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly колдонмосуна QR кодун скандоо үчүн камераны колдонууга уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Камера\" дегенди иштетиңиз.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Камерага уруксат алынбагандыктан, QR код скандалган жок</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">%1$s менен болгон коопсуздук кодун көрүү үчүн жазышып башташыңар керек.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2386,14 +2506,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Ачуу үчүн тийип коюңуз</string>
-    <string name="KeyCachingService_passphrase_cached">Signal\'дын кулпусу ачылды</string>
-    <string name="KeyCachingService_lock">Signal\'ды кулпулоо</string>
+    <string name="KeyCachingService_passphrase_cached">Molly\'дын кулпусу ачылды</string>
+    <string name="KeyCachingService_lock">Molly\'ды кулпулоо</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Сиз</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Медиафайлдын мындай түрү колдоого алынбайт</string>
     <string name="MediaPreviewActivity_draft">Долбоор</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Тышкы сактагычка сактоо үчүн Signal колдонмосуна сактагычты колдонууга уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Сактагыч\" дегенди иштетиңиз.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Тышкы сактагычка сактоо үчүн Molly колдонмосуна сактагычты колдонууга уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Сактагыч\" дегенди иштетиңиз.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Уруксат алмайынча, тышкы сактагычка сактай албайт.</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Билдирүүнү өчүрөсүзбү?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Билдирүү биротоло өчөт.</string>
@@ -2435,7 +2555,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Билдирүү жеткен жок.</string>
     <string name="MessageNotifier_error_delivering_message">Билдирүүнү жеткирүүдө ката кетти.</string>
     <string name="MessageNotifier_message_delivery_paused">Билдирүүнү жеткирүү тындырылды.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Signal\'да жазышууну улантуу үчүн текшерүүдөн өтүңүз.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Molly\'да жазышууну улантуу үчүн текшерүүдөн өтүңүз.</string>
     <string name="MessageNotifier_mark_all_as_read">Баарын окулду деп белгилөө</string>
     <string name="MessageNotifier_mark_read">Окулду деп белгилөө</string>
     <string name="MessageNotifier_turn_off_these_notifications">Бул билдирмелерди өчүрүү</string>
@@ -2457,7 +2577,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Стикериңизге %1$s деген сезимин билдирди.</string>
     <string name="MessageNotifier_this_message_was_deleted">Бул билдирүү өчүрүлгөн.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">«Signal\'га байланыш кошулду» деген билдирмени өчүрөсүзбү? Аны кайра Signal\'дан &gt; Тууралоо &gt; Билдирмелер бөлүмүнөн иштете аласыз.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">«Molly\'га байланыш кошулду» деген билдирмени өчүрөсүзбү? Аны кайра Molly\'дан &gt; Тууралоо &gt; Билдирмелер бөлүмүнөн иштете аласыз.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2496,7 +2616,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signal бекилип турганда ыкчам жооп бере албайсыз!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Molly бекилип турганда ыкчам жооп бере албайсыз!</string>
     <string name="QuickResponseService_problem_sending_message">Билдирүү жөнөтүлбөй калды!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2516,7 +2636,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Туура эмес ыкчам баскыч</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Жаңы билдирүү</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Жазышуу өтүнүчү</string>
     <string name="SingleRecipientNotificationBuilder_you">Сиз</string>
@@ -2561,7 +2681,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Бул түзмөк каттоодон чыгарылды. Телефон номериңизди Signal\'га башка түзмөктөн каттаган окшойсуз.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Бул түзмөк каттоодон чыгарылды. Телефон номериңизди Molly\'га башка түзмөктөн каттаган окшойсуз.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Түзмөктү кайра каттаңыз</string>
 
@@ -2574,10 +2694,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Чалууга жооп берүү үчүн Signal колдонмосуна микрофонуңуз керек.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Чалууга жооп берүү үчүн Molly колдонмосуна микрофонуңуз керек.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Видео чалууга жооп берүү үчүн Signal колдонмосуна микрофонуңуз менен камераңызды колдонгонго уруксат бериңиз.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Чалуу же чалууларды кабыл алуу үчүн Signal колдонмосуна микрофон менен камераны колдонууга уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Микрофон\" жана \"Камера\" дегенди иштетиңиз.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Видео чалууга жооп берүү үчүн Molly колдонмосуна микрофонуңуз менен камераңызды колдонгонго уруксат бериңиз.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Чалуу же чалууларды кабыл алуу үчүн Molly колдонмосуна микрофон менен камераны колдонууга уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Микрофон\" жана \"Камера\" дегенди иштетиңиз.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Байланышкан түзмөктө жооп берилди.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Байланышкан түзмөктө четке кагылды.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Байланышкан түзмөктө бош эмес.</string>
@@ -2622,16 +2742,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Жаңы сыр сөз айкашын кайталаңыз</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Signal\'га чакыруу</string>
+    <string name="contact_selection_activity__invite_to_signal">Molly\'га чакыруу</string>
     <string name="contact_selection_activity__new_group">Жаңы топ</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Байланыштарды жаңыртуу</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Кимдир-бирөө жетишпей жатабы? Жаңыртып көрүңүз</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Signal\'дан тааныштарыңызды табыңыз</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Байланыштарыңызга кирүүгө уруксат бериңиз</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Дагы</string>
 
@@ -2648,7 +2768,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Байланыштын сүрөтү</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal колдонмосуна байланыштарды көрсөтүү үчүн Байланыштарды колдонууга уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Байланыштар\" дегенди иштетиңиз.</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly колдонмосуна байланыштарды көрсөтүү үчүн Байланыштарды колдонууга уруксат беришиңиз керек, бирок сиз андан баш тарткансыз. Колдонмонун параметрлерине кирүү үчүн \"Улантуу\" дегенди басып, \"Уруксаттар\" дегенди тандап, \"Байланыштар\" дегенди иштетиңиз.</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Байланыштар алынып жатканда ката кетти, тармакты текшерип көрүңүз</string>
     <string name="ContactSelectionListFragment_username_not_found">Колдонуучунун аты табылган жок</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" Signal колдонуучусу эмес. Колдонуучу атын текшерип, кайталап көрүңүз."</string>
@@ -2665,16 +2785,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Колдонуучу аты боюнча издөө</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Байланыштарга кирүүгө уруксат бериңиз</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Signal\'да тааныштарыңызды табуу үчүн:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Кирүүгө уруксат берүү</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Жок, рахмат</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Байланыштарыңызга кирүүгө уруксат бериңиз. Байланыштарыңыз шифрленип, Signal кызматына көрүнбөйт.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Байланыштарды көрсөтүү үчүн Signal\'га алар жеткиликтүү болушу керек.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Байланыштарды көрсөтүү үчүн Molly\'га алар жеткиликтүү болушу керек.</string>
     <string name="contact_selection_list_fragment__show_contacts">Байланыштарды көрсөтүү</string>
 
     <!-- contact_selection_list_item -->
@@ -2745,6 +2867,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Бул адамды өчүрдүңүз, ага билдирүү жөнөтсөңүз, тизмеңизге кайра кошулат.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Параметрлер</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Жаңыртуу</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Ойнотуу … Тындыруу</string>
@@ -2773,7 +2897,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Калкып чыкма маектер — Android функциясы. Аны Signal маектери үчүн өчүрүп койсоңуз болот.</string>
+    <string name="BubbleOptOutTooltip__description">Калкып чыкма маектер — Android функциясы. Аны Molly маектери үчүн өчүрүп койсоңуз болот.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Азыр эмес</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -2934,9 +3058,9 @@
     <string name="EditProfileFragment__group_description">Топ тууралуу учкай маалымат</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Signal\'ды жаңыртуу</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Molly\'ды жаңыртуу</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Signal\'дын бул версиясы эскирип калды. Signal\'ды колдоно берүү үчүн аны жаңыртыңыз.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Molly\'дын бул версиясы эскирип калды. Molly\'ды колдоно берүү үчүн аны жаңыртыңыз.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Жаңыртуу</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3152,7 +3276,7 @@
     <string name="preferences__slow">Жай</string>
     <string name="preferences__help">Жардам</string>
     <string name="preferences__advanced">Өркүндөтүлгөн</string>
-    <string name="preferences__donate_to_signal">Signal\'га колдоо көрсөтүү</string>
+    <string name="preferences__donate_to_signal">Molly\'га колдоо көрсөтүү</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Купуялык</string>
     <!-- Preference label for stories -->
@@ -3189,13 +3313,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Колдонмонун сүрөтчөсү жана аталышы \"%1$s\" болуп өзгөрүлөт</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Колдонмонун сүрөтчөсү менен аталышы өзгөрүшү үчүн Signal\'ды жабышыңыз керек. Билдирмелерде такай демейки Signal сүрөтчөсү менен аталышы көрүнүп турат.</string>
+    <string name="preferences__app_icon_dialog_description">Колдонмонун сүрөтчөсү менен аталышы өзгөрүшү үчүн Molly\'ды жабышыңыз керек. Билдирмелерде такай демейки Molly сүрөтчөсү менен аталышы көрүнүп турат.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Телефонуңуздун башкы экранында жана колдонмонун тактасында көрүнө турган колдонмонун сүрөтчөсү менен аталышын тандаңыз. Билдирмелерде такай демейки Signal сүрөтчөсү менен аталышы көрүнүп турат. Кененирээк маалымат</string>
+    <string name="preferences__app_icon_warning_learn_more">Телефонуңуздун башкы экранында жана колдонмонун тактасында көрүнө турган колдонмонун сүрөтчөсү менен аталышын тандаңыз. Билдирмелерде такай демейки Molly сүрөтчөсү менен аталышы көрүнүп турат. Кененирээк маалымат</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Колдонмолордун сүрөтчөлөрү менен аталыштары башкы экранда жана колдонмонун тактасында көрүнөт.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Билдирмелерде такай демейки Signal сүрөтчөсү менен аталышы көрүнүп турат.</string>
+    <string name="preferences__app_icon_notification_warning">Билдирмелерде такай демейки Molly сүрөтчөсү менен аталышы көрүнүп турат.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Кененирээк маалымат</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3241,8 +3365,12 @@
         <item quantity="other">Бардык маектер эң акыркы %1$s билдирүүгө чейин кыскарат.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Түзмөгүңүздөн бардык билдирүүлөр жана медиа файлдар биротоло өчүрүлөт.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Ушул түзмөктөгү жана башка байланышкан түзмөктөрдөгү билдирүүлөр жана медиа файлдар биротоло өчүп калат.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Бардык билдирүүлөрдү чын эле өчүрөсүзбү?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Бардык билдирүүлөр биротоло өчүп, аларды кайра калыбына келтире албайсыз.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Бардык түзмөктөрдөгү бардык билдирүүлөр биротоло өчүп калат. Кайра калыбына келбейт.</string>
     <string name="preferences_storage__delete_all_now">Бардыгын өчүрүү</string>
     <string name="preferences_storage__forever">Биротоло</string>
     <string name="preferences_storage__one_year">1 жылга</string>
@@ -3278,7 +3406,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Цензураны кыйгап өтүү</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Цензураны кыйгап өтүү</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Эгер иштетилсе, Signal цензураны кыйгап өтүүгө аракет кылат. Signal цензураланган жерде болбосоңуз, бул функцияны иштетпеңиз.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Эгер иштетилсе, Molly цензураны кыйгап өтүүгө аракет кылат. Molly цензураланган жерде болбосоңуз, бул функцияны иштетпеңиз.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Аккаунтуңуздун телефон номеринин негизинде цензураны кыйгап өтүү иштетилди.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3330,7 +3458,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Төлөмдөр</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Коопсуздук максатында, MobileCoin жаңы санарип акчасын жөнөтүү жана алуу үчүн Signal\'ды колдонуңуз. Баштоо үчүн иштетиңиз.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Коопсуздук максатында, MobileCoin жаңы санарип акчасын жөнөтүү жана алуу үчүн Molly\'ды колдонуңуз. Баштоо үчүн иштетиңиз.</string>
     <string name="PaymentsHomeFragment__activate_payments">Төлөмдөрдү активдештирүү</string>
     <string name="PaymentsHomeFragment__activating_payments">Төлөмдөрдү активдештирүү…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Төлөм аккаунтун калыбына келтирүү</string>
@@ -3356,7 +3484,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Төлөмдөр сиздин аймакта жеткиликтүү эмес.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Төлөмдөр иштетилген жок. Кийинчерээк кайра аракет кылыңыз.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Төлөмдөр өчүрүлсүнбү?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Төлөмдөрдү өчүрсөңүз, Signal\'дагы MobileCoin жөнөтө албай же ала албайсыз.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Төлөмдөрдү өчүрсөңүз, Molly\'дагы MobileCoin жөнөтө албай же ала албайсыз.</string>
     <string name="PaymentsHomeFragment__deactivate">Деактивдештирүү</string>
     <string name="PaymentsHomeFragment__continue">Улантуу</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Баланс учурда жеткиликтүү эмес.</string>
@@ -3365,7 +3493,7 @@
     <string name="PaymentsHomeFragment__details">Чоо-жайы</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">MobileCoin\'дерди Signal аркылуу жөнөтүп, ала аласыз. Бардык төлөмдөр MobileCoins жана MobileCoin Wallet кызматтарын Пайдалануу шарттары боюнча жүргүзүлөт. Көйгөйлөр келип чыгышы мүмкүн жана жоголгон төлөмдөр менен каражаттарыңыз кайра калыбына келбейт. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">MobileCoin\'дерди Molly аркылуу жөнөтүп, ала аласыз. Бардык төлөмдөр MobileCoins жана MobileCoin Wallet кызматтарын Пайдалануу шарттары боюнча жүргүзүлөт. Көйгөйлөр келип чыгышы мүмкүн жана жоголгон төлөмдөр менен каражаттарыңыз кайра калыбына келбейт. </string>
     <string name="PaymentsHomeFragment__activate">Активдештирүү</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoin шарттарын көрүү</string>
     <string name="PaymentsHomeFragment__payments_not_available">Сигналдагы төлөмдөр мындан ары жеткиликсиз. Сиз дагы эле биржага акча которо аласыз, бирок мындан ары төлөмдөрдү жөнүү жана алуу же каражат кошуу болбойт.</string>
@@ -3396,7 +3524,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Уруксаттарды иштетүү</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Тааныган адамдар менен жазышууга жардам берүү үчүн Signal ушул уруксаттарды сурайт. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Тааныган адамдар менен жазышууга жардам берүү үчүн Molly ушул уруксаттарды сурайт. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Билдирмелер</string>
     <!-- Notifications permission row description -->
@@ -3484,10 +3612,10 @@
     <string name="PaymentsTransferFragment__next">Кийинки</string>
     <string name="PaymentsTransferFragment__invalid_address">Жараксыз дарек</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Которууга аракет кылып жаткан капчык дарегин текшерип, кайра аракет кылыңыз.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Сиз өзүңүздүн Signal капчыгыңыздын дарегине которо албайсыз. Колдоого алынган биржадагы аккаунтуңуздан капчыктын дарегин киргизиңиз.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR кодун сканерлөө үчүн Signal камерага кирүү уруксатын алышы керек.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QR кодун сканерлөө үчүн Signal\'га камерага кирүүгө уруксат керек. Тууралоого өтүп, \"Уруксаттарды\" тандап, \"Камераны\" иштетиңиз.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR кодун сканерлөө үчүн Signal камерага кирүү уруксатын алышы керек.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Сиз өзүңүздүн Molly капчыгыңыздын дарегине которо албайсыз. Колдоого алынган биржадагы аккаунтуңуздан капчыктын дарегин киргизиңиз.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR кодун сканерлөө үчүн Molly камерага кирүү уруксатын алышы керек.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QR кодун сканерлөө үчүн Molly\'га камерага кирүүгө уруксат керек. Тууралоого өтүп, \"Уруксаттарды\" тандап, \"Камераны\" иштетиңиз.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR кодун сканерлөө үчүн Molly камерага кирүү уруксатын алышы керек.</string>
     <string name="PaymentsTransferFragment__settings">Тууралоо</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3826,17 +3954,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Signal\'да кимдир бирөө үн режиминде чалып жатат</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Molly\'да кимдир бирөө үн режиминде чалып жатат</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Signal\'да кимдир бирөө видео режимде чалып жатат</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Molly\'да кимдир бирөө видео режимде чалып жатат</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Signal аркылуу топтун ичинде чалып жатат</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Molly аркылуу топтун ичинде чалып жатат</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Учурдагы Signal аудио чалуусу</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Учурдагы Molly аудио чалуусу</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Учурдагы Signal видео чалуусу</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Учурдагы Molly видео чалуусу</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Учурдагы Signal топтук чалуусу</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Учурдагы Molly топтук чалуусу</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Жүктөлүүдө…</string>
@@ -3883,9 +4011,9 @@
     <string name="BackupDialog_verify">Ооба</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Сиз камдык купуя сөз айкашыңызды ийгиликтүү киргиздиңиз</string>
     <string name="BackupDialog_passphrase_was_not_correct">Купуя сөз айкашы туура эмес</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signal\'дын камдык көчүрмөсү түзүлүүдө…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Molly\'дын камдык көчүрмөсү түзүлүүдө…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Signal камдык көчүрмөсү ырасталууда…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Molly камдык көчүрмөсү ырасталууда…</string>
     <string name="LocalBackupJobApi29_backup_failed">Камдык көчүрмө сакталган жок</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Камдык папкаңыз жок кылынды же жылдырылды.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Камдык файлыңыз бул томдо сактоо үчүн өтө чоң.</string>
@@ -3900,15 +4028,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Мага чал (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Код кайра жөнөтүлөт (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Signal\'дын кардарларды колдоо кызматы менен байланышыңыз</string>
-    <string name="RegistrationActivity_code_support_subject">Signal\'ды каттоо - Android үчүн текшерүү коду</string>
+    <string name="RegistrationActivity_contact_signal_support">Molly\'дын кардарларды колдоо кызматы менен байланышыңыз</string>
+    <string name="RegistrationActivity_code_support_subject">Molly\'ды каттоо - Android үчүн текшерүү коду</string>
     <string name="RegistrationActivity_incorrect_code">Код туура эмес</string>
     <string name="BackupUtil_never">Эч качан</string>
     <string name="BackupUtil_unknown">Белгисиз</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Телефон номериңиз</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Телефон номериңиз кимдерге көрүнүп, Signal\'да сиз менен кимдер байланыша алышат.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Телефон номериңиз кимдерге көрүнүп, Molly\'да сиз менен кимдер байланыша алышат.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Менин номерим кимге көрүнөт</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -3956,7 +4084,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Сиз ашыкча көп ирет аракет кылып көрдүңүз. Сураныч, кийинчерээк дагы аракет кылып көрүңүз.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Сервиске ката байланышуу</string>
     <string name="preferences_chats__backups">Камдык көчүрмөлөр</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal кулпуланган</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly кулпуланган</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">КУЛПУНУ АЧУУ ҮЧҮН БАСЫҢЫЗ</string>
     <string name="Recipient_unknown">Белгисиз</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -3987,9 +4115,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Эски түзмөгүңүзгө кирүү керек.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Камдык көчүрмөдөн калыбына келтирүү</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Жергиликтүү камдык көчүрмөдөн билдирүүлөрүңүздү калыбына келтириңиз. Эгер азыр калыбына келтирбесеңиз, кийинчерээк калыбына келтире албайсыз.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Түзмөктөгү камдык көчүрмөлөрдү калыбына келтирүү</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signal\'дын камдык көчүрмөлөрүн калыбына келтирүү</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Бардык билдирүүлөрүңүз менен акыркы 30 күндөгү медиа файлдарыңыз калыбына келет</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Дагы параметрлер</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Жок</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Өткөрбөй туруп кирүү</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Билдирүүлөрүңүз менен медиа файлдарыңызды өткөрбөй туруп улантасыз</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Эски Android телефонуңузда Signal ачыңыз</string>
     <string name="NewDeviceTransferInstructions__continue">Улантуу</string>
@@ -4004,19 +4139,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Эски Android түзмөгүнө туташууга даярдалууда…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Бир аздан кийин даяр болот</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Эски Android түзмөгүнүн туташуусу күтүлүүдө…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Эски Android түзмөгүңүздү таап, ага туташуу үчүн Signal жүргөн жерди аныктоо уруксаты талап кылынат.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Эски Android түзмөгүңүздү таап, ага туташуу үчүн Signal жүргөн жерди аныктоо кызматтарын иштетиши керек.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal эски Android түзмөгүңүздү таап, ага туташуу үчүн Wi-Fi иштетилиши керек. Сиз эч кандай Wi-Fi тармагына туташуунун кереги жок.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Кечиресиз, бирок бул түзмөк Wi-Fi Direct\'ти колдобойт окшойт. Signal эски Android түзмөгүңүздү аныктоо жана ага туташуу үчүн Wi-Fi Direct\'ти колдонот. Бирок, сиз аккаунтуңузду камдык көчүрмөдөн калыбына келтире аласыз.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Эски Android түзмөгүңүздү таап, ага туташуу үчүн Molly жүргөн жерди аныктоо уруксаты талап кылынат.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Эски Android түзмөгүңүздү таап, ага туташуу үчүн Molly жүргөн жерди аныктоо кызматтарын иштетиши керек.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly эски Android түзмөгүңүздү таап, ага туташуу үчүн Wi-Fi иштетилиши керек. Сиз эч кандай Wi-Fi тармагына туташуунун кереги жок.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Кечиресиз, бирок бул түзмөк Wi-Fi Direct\'ти колдобойт окшойт. Molly эски Android түзмөгүңүздү аныктоо жана ага туташуу үчүн Wi-Fi Direct\'ти колдонот. Бирок, сиз аккаунтуңузду камдык көчүрмөдөн калыбына келтире аласыз.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Камдык көчүрмөнү калыбына келтирүү</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Эски Android түзмөгүңүзгө туташуу аракетинде күтүлбөгөн ката кетти.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Жаңы Android түзмөгү изделүүдө…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Жаңы Android түзмөгүңүздү таап, ага туташуу үчүн Signal\'га жүргөн жерди аныктоо уруксаты керек.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal жаңы Android түзмөгүңүздү таап, ага туташуу үчүн жүргөн жерди аныктоо кызматтары иштетилиши керек.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal жаңы Android түзмөгүңүздү аныктоо жана ага туташуу үчүн Wi-Fi иштетилиши керек. Сиз эч кандай Wi-Fi тармагына туташуунун кереги жок.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Кечиресиз, бул түзмөк Wi-Fi Direct\'ти колдобойт окшойт. Signal жаңы Android түзмөгүңүздү таап, ага туташуу үчүн Wi-Fi Direct\'ти колдонот. Жаңы Android түзмөгүңүздө каттоо эсебиңизди калыбына келтирүү үчүн дагы эле камдык көчүрмөнү түзө аласыз.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Жаңы Android түзмөгүңүздү таап, ага туташуу үчүн Molly\'га жүргөн жерди аныктоо уруксаты керек.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly жаңы Android түзмөгүңүздү таап, ага туташуу үчүн жүргөн жерди аныктоо кызматтары иштетилиши керек.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly жаңы Android түзмөгүңүздү аныктоо жана ага туташуу үчүн Wi-Fi иштетилиши керек. Сиз эч кандай Wi-Fi тармагына туташуунун кереги жок.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Кечиресиз, бул түзмөк Wi-Fi Direct\'ти колдобойт окшойт. Molly жаңы Android түзмөгүңүздү таап, ага туташуу үчүн Wi-Fi Direct\'ти колдонот. Жаңы Android түзмөгүңүздө каттоо эсебиңизди калыбына келтирүү үчүн дагы эле камдык көчүрмөнү түзө аласыз.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Камдык көчүрмөсүн түзүү</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Жаңы Android түзмөгүңүзгө туташуу аракетинде күтүлбөгөн ката кетти.</string>
 
@@ -4057,7 +4192,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Берилмелер которулууда</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Эки түзмөктү бири-бирине жакын кармаңыз. Түзмөктөрүңүздү күйгүзүп, Signal\'ды ачык калтырыңыз. Которуу баштан аяк шифрленген.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Эки түзмөктү бири-бирине жакын кармаңыз. Түзмөктөрүңүздү күйгүзүп, Molly\'ды ачык калтырыңыз. Которуу баштан аяк шифрленген.</string>
     <string name="DeviceTransfer__d_messages_so_far">Азырынча %1$d билдирүү…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">Азырынча %1$s%% билдирүү…</string>
@@ -4071,7 +4206,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Аккаунтту которуу</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Жаңы Android түзмөгүңүзгө Signal жүктөп алыңыз</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Жаңы Android түзмөгүңүзгө Molly жүктөп алыңыз</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"\"Аккаунтту которуу же калыбына келтирүү\" баскычын басыңыз"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4145,7 +4280,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Бул шилтемеси бар ар бир адам топтун атын жана сүрөтүн көрүп, кошулуу өтүнүчүн жөнөтө алат. Аны ишенген адамдарыңыз менен бөлүшүңүз.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Бул шилтеме менен каалаган адам топтун атын жана сүрөтүн көрүп, топко кошула алат. Аны ишенген адамдарыңыз менен бөлүшүңүз.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Signal аркылуу бөлүшүү</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Molly аркылуу бөлүшүү</string>
     <string name="GroupLinkBottomSheet_copy">Көчүрүү</string>
     <string name="GroupLinkBottomSheet_qr_code">QR коду</string>
     <string name="GroupLinkBottomSheet_share">Бөлүшүү</string>
@@ -4324,7 +4459,7 @@
     <string name="payment_info_card_about_mobilecoin">MobileCoin жөнүндө</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin - жаңы коопсуз санариптик акча бирдиги.</string>
     <string name="payment_info_card_adding_funds">Каражаттарды кошуу</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Капчыгыңыздын дарегине MobileCoin жөнөтүү аркылуу Signal\'да колдонуу үчүн каражат кошсоңуз болот.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Капчыгыңыздын дарегине MobileCoin жөнөтүү аркылуу Molly\'да колдонуу үчүн каражат кошсоңуз болот.</string>
     <string name="payment_info_card_cashing_out">Акчаны алуу</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">MobileCoin\'ди колдогон биржада MobileCoin\'ди каалаган убакта накталай аласыз. Жөн гана ошол биржадагы аккаунтуңузга каражат которуңуз.</string>
     <string name="payment_info_card_hide_this_card">Бул карта жашырылсынбы?</string>
@@ -4345,12 +4480,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Капчыкты өчүрүү</string>
     <string name="DeactivateWalletFragment__your_balance">Балансыңыз</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Төлөмдөрдү өчүрүүдөн мурун акчаңызды башка капчыкка которуп коюңуз. Эгер акчаңызды азыр которбосоңуз, төлөмдөрдү кайра иштеткенде, алар Signal\'га байланган капчыгыңызда кала берет.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Төлөмдөрдү өчүрүүдөн мурун акчаңызды башка капчыкка которуп коюңуз. Эгер акчаңызды азыр которбосоңуз, төлөмдөрдү кайра иштеткенде, алар Molly\'га байланган капчыгыңызда кала берет.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Калган балансты которуу</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Которуусуз өчүрүү</string>
     <string name="DeactivateWalletFragment__deactivate">Деактивдештирүү</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Которуусуз өчүрүлсүнбү?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Төлөмдөрдү кайра иштеткениңизде, каражаттар Signal\'га байланган капчыгыңызда кала берет.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Төлөмдөрдү кайра иштеткениңизде, каражаттар Molly\'га байланган капчыгыңызда кала берет.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Капчыкты өчүрүү катасы.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4643,7 +4778,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Уруксаттамалар</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Шарттар жана жоболор; Купуялык Саясаты</string>
-    <string name="HelpFragment__copyright_signal_messenger">Signal Mesenger автордук укугу</string>
+    <string name="HelpFragment__copyright_signal_messenger">Molly Mesenger автордук укугу</string>
     <string name="HelpFragment__licenced_under_the_agplv3">GNU AGPLv3 боюнча уруксаттамаланган</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4881,9 +5016,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Түстү тандоо</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Бөлүшүү</string>
 
@@ -4913,7 +5045,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Бул топко администраторлор гана билдирүү жөнөтө алышат.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Чекке жетти</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">5 чейин маек тандай аласыз</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5088,9 +5221,9 @@
     <string name="MySupportPreference__learn_more">Кененирээк маалымат</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Signal\'ды жаңыртуу</string>
+    <string name="UpdateSignalExpiredDialog__title">Molly\'ды жаңыртуу</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Signal\'дын бул версиясы эскирип калды. Signal\'ды колдоно берүү үчүн аны жаңыртыңыз.</string>
+    <string name="UpdateSignalExpiredDialog__message">Molly\'дын бул версиясы эскирип калды. Molly\'ды колдоно берүү үчүн аны жаңыртыңыз.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Жаңыртуу</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5099,7 +5232,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Түзмөк катталган жок</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Бул түзмөк каттоодон чыгарылды. Бул түзмөктө Signal\'ды колдоно берүү үчүн аны каттаңыз.</string>
+    <string name="ReregisterSignalDialog__message">Бул түзмөк каттоодон чыгарылды. Бул түзмөктө Molly\'ды колдоно берүү үчүн аны каттаңыз.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Кайра каттоо</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5393,7 +5526,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Тандоочу ачылбай койду.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Билдирмелерди күйгүзүү үчүн Signal\'га аларды көрсөткөнгө уруксат беришиңиз керек.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Билдирмелерди күйгүзүү үчүн Molly\'га аларды көрсөткөнгө уруксат беришиңиз керек.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Күйгүзүү</string>
 
@@ -5539,8 +5672,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Азырынча жооп жок</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Бул топтон чыгып кеткениңизден улам, бул окуяга жооп бере албайсыз.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Окуяга сезимин билдирди</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Окуяга сезимиңизди билдирдиңиз</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Окуяга сезимин билдирди</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Көрүүлөр</string>
     <!-- Label for story replies tab -->
@@ -6140,8 +6275,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Банкыңызды тандаңыз</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Салымыңызды %1$s менен ырастаңыз</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Салымыңыз ай сайын алынып турушу үчүн банк эсебиңизден €0,01 төлөңүз. Автоматтык түрдө кайтарылып, эсебиңизден айында €5 алынып турат.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Банк эсебиңизден ай сайын €0,01 өлчөмүндө салым алынып тургандай кылсаңыз болот. Автоматтык түрдө кайтарылып, эсебиңизден айына %1$s өлчөмүндө салым алынып турат.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Улантуу</string>
 
@@ -6710,6 +6845,50 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Камдык көчүрмөлөр жүктөлүп алынууда…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Медиа файлдардын көчүрмөсү сакталган жок</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="other">Акы төлөнбөгөндүктөн, Signal\'дагы медиа файлдардын камдык көчүрмөлөрүнүн планы токтотулду. Медиа файлдарыңыздын камдык көчүрмөлөрүн %1$d ичинде жүктөп алышыңыз керек. %1$d күндөн кийин көчүрмөлөр өчүп калат.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Медиа файлдар сактала бериши үчүн алардын акысын төлөшүңүз керек. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Бүгүн медиа файлдарыңыз өчөт</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Акы төлөнбөгөндүктөн, Signal\'дагы медиа файлдардын камдык көчүрмөлөрүнүн планы токтотулду. Аларды жоготуп алгыңыз келбесе, бүгүнтөн калбай жүктөп алыңыз.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Жүктөлбөй жатат</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Түзмөгүңүздө бош орун калбай калды. Медиа файлдарыңыздын көчүрмөлөрүн жүктөп алуу үчүн %1$s чейин орун бошотуңуз.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="other">\"Өткөрүп жиберүү\" дегенди тандасаңыз, медиа файлдарыңызды көчүрмөлөрү %1$d күндөн кийин өчүп калат.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Акысын төлөө мүмкүн болбой жатат</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Ай сайын төлөнүүчү акы алынбай жатат. Төлөм ыкмаңыз жаңыртылганын текшериңиз. Эскирип калса, Google Pay\'ден жаңыртып коюңуз. Signal төлөмдү бир нече күндөн кийин кайра иштетүүгө аракет кылат.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Камдык көчүрмөлөр сакталган жок</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Түзмөгүңүздөгү нерселердин камдык көчүрмөлөрү %1$d күндөн бери сактала элек. Түзмөгүңүздү wi-fi тармагына туташтырып, \"Камдык көчүрмөнү сактоо\" дегенди басыңыз. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Кененирээк маалымат</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Өткөрүп жиберүү</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Медиа файлдарды жүктөп алуу</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Кийинчерээк жүктөп алуу</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Жок, жүктөбөйм</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Медиа файлдарды жүктөп алуу үчүн %1$s чейин орун бошотуңуз.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Насыя же дебет картасы</string>
@@ -6723,6 +6902,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Белгисиз</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Төлөмдөр</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Камдык көчүрмө акыркы жолу качан сакталган: %1$s, %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6733,6 +6918,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Көрсөтүлгөн убакыттан ашкан билдирүүлөр биротоло өчүрүлөт.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Көрсөтүлгөн узундуктан ашкан билдирүүлөр биротоло өчүрүлөт.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Байланышкан түзмөктөргө чектөөлөрдү коюу</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Иштетилгенде, маектин чектөөлөрү байланышкан түзмөктөрүңүздөгү билдирүүлөрдү да өчүрүп салат.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Бардык түзмөктөрүңүздө өчүрүлөт</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Билдирүүлөрдү же маектерди өчүргөнүңүздө, алар телефонуңуздан жана бардык байланышкан түзмөктөрүңүздөн өчүп калат.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Төлөмдөр</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Тексттик билдирүүлөр менен медиа файлдар</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Төлөмдүн чоо-жайы</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Камдык көчүрмөнүн түрү</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Төлөгөн күн</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Бөлүшүү</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal\'дын камдык көчүрмөлөрү</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Төлөмдөр</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Камдык көчүрмөнүн чоо-жайы</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Камдык көчүрмөнүн өлчөмү</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Канча убакытта сакталып турат</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Камдык көчүрмөлөрдү мобилдик байланыш аркылуу сактоо</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Өчүрүп, камдык көчүрмөлөрдү жок кылуу</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Камдык көчүрмө жок кылынып, өчүрүлдү.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Камдык көчүрмөнүн түрү өзгөрүп, жазылуу токтотулду</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Жазылуу токтотулду</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Жүктөлүп бүттү</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Камдык көчүрмөнүн түрү</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Камдык көчүрмөлөр өчүрүлгөн</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · айына %2$s</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Камдык көчүрмөлөрдү иштетүү</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Акыркы жолу качан сакталган</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s - %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Кайталанбайт</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Көчүрмөлөрдү азыр сактоо</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Өчүрүп, камдык көчүрмөлөрдү жок кыласызбы?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Сизден экинчи суралбайт. Камдык көчүрмөлөр өчүрүлүп, жаңылары сакталбайт.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Өчүрүү жана жок кылуу</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Өчүрүлүүдө…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Көчүрмө өчүрүлдү</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"\"Камдык көчүрмөлөрдү азыр сактоо\" дегенди басуу менен"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Күн сайын</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Апта сайын</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Ай сайын</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Камдык көчүрмөлөрдү кол менен сактоо</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Түзмөгүңүздүн pin кодун, сырсөзүн же графикалык ачкычын киргизиңиз.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Кийинки</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Камдык көчүрмөнүн түрүн өзгөртүү</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Жазылууну токтотуу</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Токтотуу</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Мындан ары сизден акы алынбайт. Эсептешүү мезгилиңиз бүткөндөн кийин камдык көчүрмөлөр сакталбай калат. Ошол күндөн тарта 30 күндүн ичинде медиа файлдарды жүктөп алышыңыз керек.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Ырастап, жүктөп алуу</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Кийинчерээк ырастап, жүктөп алуу</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Жазыла берүү</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 486b3f15fa..a0c1e262f4 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal yra atnaujinama…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly yra atnaujinama…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Jūs dar nesate nustatę slaptafrazės!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Išjungti slaptafrazę?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Tai visiems laikams atrakins Signal ir žinučių pranešimus.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Tai visiems laikams atrakins Molly ir žinučių pranešimus.</string>
     <string name="ApplicationPreferencesActivity_disable">Išjungti</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Klaida prisijungiant prie serverio!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN kodai yra reikalingi registracijos užraktui. Norėdami išjungti PIN kodus, iš pradžių, išjunkite registracijos užraktą.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Failas</string>
     <string name="AttachmentKeyboard_contact">Adresatas</string>
     <string name="AttachmentKeyboard_location">Vieta</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">„Signal“ reikia leidimo rodyti jūsų nuotraukas ir vaizdo įrašus</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">„Molly“ reikia leidimo rodyti jūsų nuotraukas ir vaizdo įrašus</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Leisti prieigą</string>
     <string name="AttachmentKeyboard_payment">Mokėjimas</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Nerasta programėlė medijos pasirinkimui.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Norint pridėti nuotraukas, vaizdo įrašus ar garsą, Signal reikia saugyklos leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymų meniu, pasirinkite „Leidimai“ ir įjunkite „Saugyklą“.</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Norint pridėti kontaktinę informaciją, Signal reikia adresatų leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymų meniu, pasirinkite „Leidimai“ ir įjunkite „Adresatus“.</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Norint pridėti vietą, Signal reikia vietos leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymų meniu, pasirinkite „Leidimai“ ir įjunkite „Vietą“.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Norint pridėti nuotraukas, vaizdo įrašus ar garsą, Molly reikia saugyklos leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymų meniu, pasirinkite „Leidimai“ ir įjunkite „Saugyklą“.</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Norint pridėti kontaktinę informaciją, Molly reikia adresatų leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymų meniu, pasirinkite „Leidimai“ ir įjunkite „Adresatus“.</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Norint pridėti vietą, Molly reikia vietos leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymų meniu, pasirinkite „Leidimai“ ir įjunkite „Vietą“.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Leisti prieigą prie buvimo vietos</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Norėdami siųsti savo buvimo vietą:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Leiskite „Signal“ siųsti jūsų buvimo vietą.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Leiskite „Molly“ siųsti jūsų buvimo vietą.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Tam, kad „Signal“ galėtų nusiųsti jūsų buvimo vietą, reikalinga prieiga prie jūsų buvimo vietos duomenų.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Tam, kad „Molly“ galėtų nusiųsti jūsų buvimo vietą, reikalinga prieiga prie jūsų buvimo vietos duomenų.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Leisti prieigą prie saugyklos</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Jei norite, kad būtų rodomos nuotraukos ir vaizdo įrašai:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">„Signal“ reikia prieigos prie saugyklos, kad galėtų rodyti jūsų nuotraukas ir vaizdo įrašus.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">„Molly“ reikia prieigos prie saugyklos, kad galėtų rodyti jūsų nuotraukas ir vaizdo įrašus.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s neįjungė Mokėjimų </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Keisti kamerą</string>
     <string name="CameraXFragment_open_gallery_description">Atverti galeriją</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Leisti prieigą</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Leiskite prieigą prie kameros ir mikrofono</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Leiskite prieigą prie kameros</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Leisti prieigą prie mikrofono</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Jei norite fotografuoti, leiskite „Signal“ prieigą prie kameros.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Norėdami fotografuoti ir filmuoti vaizdo įrašus, leiskite Signal prieigą prie kameros.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Jei norite fotografuoti ir filmuoti, leiskite „Signal“ prieigą prie kameros ir mikrofono.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Jei norite filmuoti su garsu, leiskite „Signal“ prieigą prie mikrofono.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Jei norite nuskenuoti QR kodą, leiskite „Signal“ prieigą prie kameros.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Kad būtų galima fotografuoti, „Signal“ reikalinga prieiga prie kameros</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Kad būtų galima nuskaityti QR kodus, „Signal“ reikalinga prieiga prie kameros</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Kad būtų galima filmuoti, „Signal“ reikalinga prieiga prie mikrofono</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Jei norite fotografuoti per „Signal“:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Jei norite fotografuoti ir filmuoti per „Signal“:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Jei norite filmuoti vaizdo įrašus su garsu:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Jei norite nuskenuoti QR kodus:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Paskiausi adresatai</string>
@@ -273,7 +274,7 @@
     <string name="CameraContacts_no_signal_contacts">Nėra Signal adresatų</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Galite naudoti kameros mygtuką tik tam, kad siųstumėte nuotraukas Signal adresatams. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Nerandate ieškomo žmogaus?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Pakvieskite adresatą prisijungti prie Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Pakvieskite adresatą prisijungti prie Molly</string>
     <string name="CameraContacts__menu_search">Ieškoti</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -287,12 +288,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Ne, ačiū</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Atnaujinti Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Atnaujinti Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Ši programėlės versija daugiau nebepalaikoma. Norėdami ir toliau siųsti bei gauti žinutes, atnaujinkite programėlę iki naujausios versijos.</string>
     <string name="ClientDeprecatedActivity_update">Atnaujinti</string>
     <string name="ClientDeprecatedActivity_dont_update">Neatnaujinti</string>
     <string name="ClientDeprecatedActivity_warning">Įspėjimas</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Tavo „Signal“ versija nebegalioja. Gali žiūrėti žinučių istoriją, tačiau nebegalėsi nei siųsti, nei gauti žinučių, kol neatnaujinsi programėlės.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Tavo „Molly“ versija nebegalioja. Gali žiūrėti žinučių istoriją, tačiau nebegalėsi nei siųsti, nei gauti žinučių, kol neatnaujinsi programėlės.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Nerasta jokios saityno naršyklės.</string>
@@ -329,8 +330,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Žinutė %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">„Molly“ balso skambutis %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Mollyinis vaizdo skambutis %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -428,7 +429,7 @@
     <string name="ConversationActivity_transport_signal">Signal žinutė</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Siųsti žinutę</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Bendraukime per Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Bendraukime per Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Pasirinkite adresatą</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Priedas viršija jūsų siunčiamos žinutės tipui leidžiamą dydį.</string>
     <string name="ConversationActivity_unable_to_record_audio">Nepavyksta įrašyti garso!</string>
@@ -447,18 +448,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Norėdami siųsti garso žinutes:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Norėdami siųsti balso žinutes, leiskite „Signal“ prieigą prie mikrofono.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Norėdami siųsti balso žinutes, leiskite „Molly“ prieigą prie mikrofono.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Kad būtų galima įrašyti balso žinutę, „Signal“ reikia prieigos prie mikrofono.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Norint siųsti garso žinutes, Signal reikia mikrofono leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymus, pasirinkite „Leidimai“ ir įjunkite „Mikrofoną“.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Kad būtų galima įrašyti balso žinutę, „Molly“ reikia prieigos prie mikrofono.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Norint siųsti garso žinutes, Molly reikia mikrofono leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymus, pasirinkite „Leidimai“ ir įjunkite „Mikrofoną“.</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Norint skambinti %1$s, programai Signal reikia mikrofono ir kameros leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymus, pasirinkite „Leidimai“ ir įjunkite „Mikrofoną“ ir „Kamerą“.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Norėdami fotografuoti ir filmuoti vaizdo įrašus, leiskite Signal prieigą prie kameros.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Norint fotografuoti, Signal reikia kameros leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymų meniu, pasirinkite „Leidimai“ ir įjunkite „Kamerą“.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Norint fotografuoti ar filmuoti, Signal reikalinga prieiga prie kameros</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Norint skambinti %1$s, programai Molly reikia mikrofono ir kameros leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymus, pasirinkite „Leidimai“ ir įjunkite „Mikrofoną“ ir „Kamerą“.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Norėdami fotografuoti ir filmuoti vaizdo įrašus, leiskite Molly prieigą prie kameros.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Norint fotografuoti, Molly reikia kameros leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymų meniu, pasirinkite „Leidimai“ ir įjunkite „Kamerą“.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Norint fotografuoti ar filmuoti, Molly reikalinga prieiga prie kameros</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Norėdami įrašinėti vaizdo įrašus su garsu, įjunkite prieigą prie mikrofono.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Norint įrašinėti vaizdo įrašus, Signal reikia mikrofono leidimo, tačiau jis buvo uždraustas. Pereikite į programėlės nustatymus, pasirinkite „Leidimai“ ir įjunkite „Mikrofoną“ ir „Kamerą“.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Norint įrašinėti vaizdo įrašus, Signal reikalingas mikrofono leidimas.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Norint įrašinėti vaizdo įrašus, Molly reikia mikrofono leidimo, tačiau jis buvo uždraustas. Pereikite į programėlės nustatymus, pasirinkite „Leidimai“ ir įjunkite „Mikrofoną“ ir „Kamerą“.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Norint įrašinėti vaizdo įrašus, Molly reikalingas mikrofono leidimas.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Ne</string>
@@ -479,9 +480,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Norėdami pradėti skambutį:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Norėdami pradėti skambutį, leiskite „Signal“ prieigą prie mikrofono.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Norėdami pradėti skambutį, leiskite „Molly“ prieigą prie mikrofono.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Kad būtų galima pradėti skambutį, „Signal“ reikia prieigos prie mikrofono.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Kad būtų galima pradėti skambutį, „Molly“ reikia prieigos prie mikrofono.</string>
 
 
     <string name="ConversationActivity_join">Prisijungti</string>
@@ -495,9 +496,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">SMS žinutės programėlėje „Signal“ nebepalaikomos. Pakviesk %1$s į „Signal“ ir pratęsk pokalbį čia.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Šis žmogus nebenaudoja „Signal“. Pakvieskite jį (ją) į „Signal“ ir pratęskite pokalbį čia.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Šis žmogus nebenaudoja „Molly“. Pakvieskite jį (ją) į „Molly“ ir pratęskite pokalbį čia.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Pakviesti į Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Pakviesti į Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Netrukus gausi dar vieną priminimą.</string>
 
@@ -563,6 +564,8 @@
     <string name="ConversationFragment_delete_for_everyone">Ištrinti visiems</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Ištrinti šiame įrenginyje</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Ištrinti</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Ištrinti visur</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Ši žinutė bus ištrinta visiems žmonėms šiame pokalbyje, jeigu jie naudoja naujausią „Signal“ versiją. Jie matys, kad ištrynei žinutę.</string>
@@ -594,13 +597,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Užblokuotas</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Atnaujinti Signal</string>
+    <string name="ConversationFragment__update_build">Atnaujinti Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Iš naujo registruoti „Signal“</string>
+    <string name="ConversationFragment__reregister_signal">Iš naujo registruoti „Molly“</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Grįžti atgal.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Atidaryti „Signal“</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Atidaryti „Molly“</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Nebepatvirtintas</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -669,6 +672,13 @@
         <item quantity="many">Visi %1$d pasirinkti pokalbiai bus negrįžtamai ištrinti.</item>
         <item quantity="other">Visi %1$d pasirinktų pokalbių bus negrįžtamai ištrinti.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Pasirinktas pokalbis bus negrįžtamai ištrintas iš visų jūsų įrenginių.</item>
+        <item quantity="few">Visi %1$d pasirinkti pokalbiai bus negrįžtamai ištrinti iš visų jūsų įrenginių.</item>
+        <item quantity="many">Visi %1$d pasirinkti pokalbiai bus negrįžtamai ištrinti iš visų jūsų įrenginių.</item>
+        <item quantity="other">Visi %1$d pasirinktų pokalbių bus negrįžtamai ištrinti iš visų jūsų įrenginių.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Ištrinama</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Ištrinamas pasirinktas pokalbis…</item>
@@ -770,9 +780,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Kas gali mane rasti pagal numerį?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Visi jūsų telefono numerį turintys žmonės matys, kad naudojatės „Signal“, ir galės su jumis pradėti pokalbį.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Visi jūsų telefono numerį turintys žmonės matys, kad naudojatės „Molly“, ir galės su jumis pradėti pokalbį.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Niekas nematys, kad naudojatės „Signal“, nebent išsiųsite jiems žinutę arba jau esate pradėję pokalbį.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Niekas nematys, kad naudojatės „Molly“, nebent išsiųsite jiems žinutę arba jau esate pradėję pokalbį.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Atkurti iš atsarginės kopijos?</string>
@@ -806,7 +816,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Išbandyti savo atsarginės kopijos slaptafrazę ir patikrinti ar ji sutampa</string>
     <string name="BackupsPreferenceFragment__turn_on">Įjungti</string>
     <string name="BackupsPreferenceFragment__turn_off">Išjungti</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Norėdami atkurti atsarginę kopiją, įsidiekite naują Signal kopiją. Atverkite programėlę ir bakstelėkite ant „Atkurti atsarginę kopiją“, o tuomet nustatykite atsarginės kopijos failo vietą. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Norėdami atkurti atsarginę kopiją, įsidiekite naują Molly kopiją. Atverkite programėlę ir bakstelėkite ant „Atkurti atsarginę kopiją“, o tuomet nustatykite atsarginės kopijos failo vietą. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Sužinoti daugiau</string>
     <string name="BackupsPreferenceFragment__in_progress">Vykdoma…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -814,7 +824,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">Jau %1$d…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">Jau %1$s%%…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Norint daryti atsargines kopijas, Signal reikia išorinės saugyklos leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymus, pasirinkite „Leidimai“ ir įjunkite „Saugyklą“.</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Norint daryti atsargines kopijas, Molly reikia išorinės saugyklos leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymus, pasirinkite „Leidimai“ ir įjunkite „Saugyklą“.</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Nustatyti atsarginės kopijos atlikimo laiką</string>
 
@@ -881,7 +891,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Pokalbio seansas atnaujintas</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal programėlė naudoja ištisinį šifravimą ir jai kartais gali tekti atnaujinti jūsų pokalbio seansą. Tai neįtakoja jūsų pokalbio saugumo, bet gali būti, kad praleidote ir negavote žinutės nuo šio adresato, todėl galite jo paprašyti, kad išsiųstų žinutę dar kartą.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly programėlė naudoja ištisinį šifravimą ir jai kartais gali tekti atnaujinti jūsų pokalbio seansą. Tai neįtakoja jūsų pokalbio saugumo, bet gali būti, kad praleidote ir negavote žinutės nuo šio adresato, todėl galite jo paprašyti, kad išsiųstų žinutę dar kartą.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Naudokite „Signal“ kompiuteriams arba „iPad“. Jūsų žinutės bus sinchronizuojamos su susietais įrenginiais.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Susieti naują įrenginį</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Žinutės ir pokalbių informacija yra visiškai užšifruoti visuose įrenginiuose</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">„Signal“ kompiuteriams arba „iPad“</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Žinutės visuose susietuose įrenginiuose yra privačios</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">„Molly“ žinutės sinchronizuojamos su „Molly“ jūsų mobiliajame telefone, kai jis susietas. Ankstesnių žinučių istorija nebus rodoma.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Kitame įrenginyje apsilankykite %1$s, kad įdiegtumėte „Molly“</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Mano susieti įrenginiai</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Atsieti</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s atsietas</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Susiejamas įrenginys…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Įrenginys patvirtintas</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Įkeliama…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Nėra susietų įrenginių</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Atrakinkite, kad susietumėte įrenginį</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Norėdami susieti, nuskaitykite įrenginyje rodomą QR kodą.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Skenuoti QR kodą</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Šiuo įrenginiu nuskaitykite QR kodą įrenginyje, kurį norite susieti</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Gerai</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Šis įrenginys galės matyti jūsų grupes ir adresatus, gauti prieigą prie jūsų pokalbių bei siųsti žinutes jūsų vardu.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Užbaikite susiejimą kitame įrenginyje</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Užbaikite „Molly“ susiejimą kitame įrenginyje.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Įrenginio susiejimas nepavyko</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Šis QR kodas yra neteisingas. Įsitikinkite, kad skenuojate įrenginio, kurį norite susieti, ekrane rodomą QR kodą.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Bandyti dar kartą</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Atsieti „%1$s“?</string>
@@ -903,10 +968,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimizuoti trūkstamoms „Play“ paslaugoms</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Šis įrenginys nepalaiko „Play“ paslaugų. Bakstelėkite, norėdami išjungti sistemos baterijos optimizavimus, kurie neleidžia Signal gauti žinučių tol, kol įrenginys yra neaktyvus.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Šis įrenginys nepalaiko „Play“ paslaugų. Bakstelėkite, norėdami išjungti sistemos baterijos optimizavimus, kurie neleidžia Molly gauti žinučių tol, kol įrenginys yra neaktyvus.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Ši Signal versija nebegalioja. Norėdami siųsti ir gauti žinutes, atnaujinkite programėlę dabar.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Ši Molly versija nebegalioja. Norėdami siųsti ir gauti žinutes, atnaujinkite programėlę dabar.</string>
     <string name="ExpiredBuildReminder_update_now">Atnaujinti dabar</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -919,8 +984,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Rodyti</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Ilgalaikė Signal susisiekimo triktis!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal nepavyko prisiregistruoti prie „Google Play“ paslaugų. Signal žinutės ir skambučiai buvo išjungti, prašome pabandyti iš naujo registruotis skyrelyje Nustatymai (angl. Settings) &gt; Išplėstiniai (angl. Advanced).</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Ilgalaikė Molly susisiekimo triktis!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly nepavyko prisiregistruoti prie „Google Play“ paslaugų. Molly žinutės ir skambučiai buvo išjungti, prašome pabandyti iš naujo registruotis skyrelyje Nustatymai (angl. Settings) &gt; Išplėstiniai (angl. Advanced).</string>
 
 
     <!-- GiphyActivity -->
@@ -1085,20 +1150,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Derinimo žurnalai padeda mums diagnozuoti ir išspręsti problemą, juose nėra identifikavimo informacijos.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">„Signal“ susidūrė su problema. Pateikti derinimo žurnalą?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">„Molly“ susidūrė su problema. Pateikti derinimo žurnalą?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Pranešimai gali vėluoti dėl baterijos optimizavimo</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Gali išjungti baterijos optimizavimą programėlei „Signal“ ir taip užtikrinti, kad žinučių pranešimai nevėluotų.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Gali išjungti baterijos optimizavimą programėlei „Molly“ ir taip užtikrinti, kad žinučių pranešimai nevėluotų.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Pranešimai gali vėluoti dėl baterijos optimizavimo</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Išjunkite baterijos optimizavimą programėlei „Molly“ ir taip užtikrinkite, kad žinučių pranešimai nevėluotų. Bakstelėkite „Tęsti“, kad pamatytumėte konkrečiam įrenginiui skirtas instrukcijas.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Ne, ačiū</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Tęsti</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Tęsti</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Atmesti</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Ne, ačiū</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Laukiantys pakvietimai į grupę</string>
+    <string name="PendingMembersActivity_pending_group_invites">Prašymai ir pakvietimai</string>
     <string name="PendingMembersActivity_requests">Prašymai</string>
     <string name="PendingMembersActivity_invites">Pakvietimai</string>
     <string name="PendingMembersActivity_people_you_invited">Jūsų pakviesti žmonės</string>
@@ -1361,7 +1436,7 @@
     <string name="InviteActivity_cancel">Atsisakyti</string>
     <string name="InviteActivity_sending">Siunčiama…</string>
     <string name="InviteActivity_invitations_sent">Pakvietimai išsiųsti!</string>
-    <string name="InviteActivity_invite_to_signal">Pakviesti į Signal</string>
+    <string name="InviteActivity_invite_to_signal">Pakviesti į Molly</string>
     <string name="InviteActivity_send_sms">Siųsti SMS žinutę (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Siųsti %1$d SMS pakvietimą?</item>
@@ -1369,7 +1444,7 @@
         <item quantity="many">Siųsti %1$d SMS pakvietimų?</item>
         <item quantity="other">Siųsti %1$d SMS pakvietimų?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Bendraukime per Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Bendraukime per Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Atrodo, kad neturite programėlių su kuriomis bendrinti.</string>
 
     <!-- LearnMoreTextView -->
@@ -1383,7 +1458,7 @@
     <string name="LongMessageActivity_your_message">Jūsų žinutė</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Foninis ryšys įjungtas</string>
 
     <!-- MediaOverviewActivity -->
@@ -1462,10 +1537,10 @@
     <string name="MessageQuotesBottomSheet_replies">Atsakymai</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Užmezgiamas Signal skambutis</string>
+    <string name="NotificationBarManager__establishing_signal_call">Užmezgiamas Molly skambutis</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Pradedama tekti „Signal“ skambučių paslauga</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Stabdoma Signal skambučių paslauga</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Pradedama tekti „Molly“ skambučių paslauga</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Stabdoma Molly skambučių paslauga</string>
     <string name="NotificationBarManager__cancel_call">Atsisakyti skambučio</string>
 
     <!-- NotificationsMegaphone -->
@@ -1733,6 +1808,14 @@
     <string name="MessageRecord_you_activated_payments">Tu įjungei Mokėjimus</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s dabar gali priimti Mokėjimus</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Mokėjimo informacijos nėra</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Bakstelėkite, norėdami pamatyti daugiau</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Išsamios mokėjimo informacijos nėra</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Informacija apie šį mokėjimą neprieinama, nes jūsų žinutės atkurtos iš šaltinio, kuriame nebuvo šios mokėjimų istorijos. Tai neturi įtakos jūsų piniginės likučiui ar ankstesnių mokėjimų būsenai.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1793,9 +1876,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Greitai nebegalėsi siųsti SMS žinučių per programėlę „Signal“. Pakviesk %1$s į „Signal“ ir pratęsk pokalbį čia.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Per programėlę „Signal“ nebegalima siųsti SMS žinučių. Pakviesk %1$s į „Signal“ ir pratęsk pokalbį čia.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Per programėlę „Molly“ nebegalima siųsti SMS žinučių. Pakviesk %1$s į „Molly“ ir pratęsk pokalbį čia.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Mokėjimas: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Mokėjimas</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Pranešta apie šlamštą</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1881,7 +1966,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Susieti Signal įrenginį?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Atrodo, kad bandote susieti Signal įrenginį, naudodami trečiųjų šalių skenerį. Jūsų saugumui, dar kartą nuskenuokite kodą, naudodami Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Norint skenuoti QR kodą, Signal reikia kameros leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymų meniu, pasirinkite „Leidimai“ ir įjunkite „Kamerą“.</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Norint skenuoti QR kodą, Molly reikia kameros leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymų meniu, pasirinkite „Leidimai“ ir įjunkite „Kamerą“.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Nepavyksta nuskenuoti QR kodo be kameros leidimo</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1896,11 +1981,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Įveskite slaptafrazę</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal piktograma</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly piktograma</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Pateikti slaptafrazę</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Neteisinga slaptafrazė!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Atrakinti Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal „Android“ - Ekrano užraktas</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Atrakinti Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly „Android“ - Ekrano užraktas</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Žemėlapis</string>
@@ -1969,7 +2054,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Patvirtinkite norėdami tęsti susirašinėjimą</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Siekdami neleisti brukalo Signal programėlėje, prašome jūsų užbaigti patvirtinimą.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Siekdami neleisti brukalo Molly programėlėje, prašome jūsų užbaigti patvirtinimą.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Po patvirtinimo galėsite tęsti susirašinėjimą. Visos pristabdytos žinutės bus automatiškai išsiųstos.</string>
 
     <!-- Recipient -->
@@ -1977,7 +2062,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">„Mano istorija“</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">„Signal“ skambutis</string>
+    <string name="Recipient_signal_call">„Molly“ skambutis</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Užblokuoti</string>
@@ -1991,7 +2076,8 @@
     <string name="RedPhone_ringing">Skambinama…</string>
     <string name="RedPhone_busy">Užimta</string>
     <string name="RedPhone_recipient_unavailable">Gavėjas neprieinamas</string>
-    <string name="RedPhone_network_failed">Tinklas patyrė nesėkmę!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Tinklas patyrė nesėkmę! Patikrink tinklo ryšį ir bandyk dar kartą.</string>
     <string name="RedPhone_number_not_registered">Numeris nėra registruotas!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Numeris, kurį rinkote nepalaiko saugaus balso funkcijos!</string>
     <string name="RedPhone_got_it">Supratau</string>
@@ -2002,8 +2088,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Bakstelėkite čia norėdami įjungti savo vaizdą</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Norint skambinti %1$s, Signal reikia prieigos prie jūsų kameros</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Norint skambinti %1$s, Molly reikia prieigos prie jūsų kameros</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Skambinama…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Jungiamasi iš naujo…</string>
@@ -2069,10 +2155,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Pašalinimas iš skambučio</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Kažkas tave pašalino iš skambučio.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Leiskite prieigą prie kameros ir mikrofono</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Leisti prieigą prie mikrofono</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Leiskite prieigą prie kameros</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Jei norite pradėti skambutį arba prie jo prisijungti, leiskite „Molly“ prieigą prie kameros ir mikrofono.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Jei norite pradėti skambutį arba prie jo prisijungti, leiskite „Molly“ prieigą prie mikrofono.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Jei norite įjungti vaizdą, leiskite „Molly“ prieigą prie kameros.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Norint pradėti skambutį arba prie jo prisijungti, „Molly“ reikalingas mikrofono leidimas.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Norint įjungti vaizdą, „Molly“ reikalinga prieiga prie jūsų kameros</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Norėdami pradėti skambutį arba prie jo prisijungti:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Jei norite įjungti vaizdą:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">„Signal“ skambutis</string>
-    <string name="WebRtcCallView__signal_video_call">Signal vaizdo skambutis</string>
+    <string name="WebRtcCallView__signal_call">„Molly“ skambutis</string>
+    <string name="WebRtcCallView__signal_video_call">Molly vaizdo skambutis</string>
     <string name="WebRtcCallView__start_call">Pradėti skambutį</string>
     <string name="WebRtcCallView__join_call">Prisijungti prie skambučio</string>
     <string name="WebRtcCallView__call_is_full">Skambutis yra pilnas</string>
@@ -2172,24 +2278,47 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Nuleisti ranką?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Nuleisti ranką</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Nuleisti</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Atšaukti</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Pakėlėte ranką</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Rodyti</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">Rankas pakėlė %1$s</item>
-        <item quantity="few">Rankas pakėlė %1$s + %2$d</item>
-        <item quantity="many">Rankas pakėlė %1$s + %2$d</item>
-        <item quantity="other">Rankas pakėlė %1$s + %2$d</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s pakėlėte ranką</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d pakėlė ranką</item>
+        <item quantity="few">%1$s +%2$d pakėlė rankas</item>
+        <item quantity="many">%1$s +%2$d pakėlė rankas</item>
+        <item quantity="other">%1$s + %2$d pakėlė rankas</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s pakėlė ranką</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d pakėlė ranką</item>
+        <item quantity="few">%1$s +%2$d pakėlė rankas</item>
+        <item quantity="many">%1$s +%2$d pakėlė rankas</item>
+        <item quantity="other">%1$s + %2$d pakėlė rankas</item>
+    </plurals>
+
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="few">%1$s + %2$d</item>
+        <item quantity="many">%1$s + %2$d</item>
+        <item quantity="other">%1$s + %2$d</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="few">%1$s + %2$d</item>
         <item quantity="many">%1$s + %2$d</item>
@@ -2292,7 +2421,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Sulauksite skambučio, kad patvirtintumėte šį numerį.</string>
     <string name="RegistrationActivity_edit_number">Taisyti numerį</string>
     <string name="RegistrationActivity_missing_google_play_services">Trūksta „Google Play“ paslaugų</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Šiame įrenginyje nėra „Google Play“ paslaugų. Jūs vis tiek galite naudoti Signal, tačiau tokia konfigūracija gali sąlygoti mažesnį patikimumą ir našumą.\n\nJeigu jūs nesate pažengęs naudotojas, nenaudojate atsarginių dalių „Android“ ROM ar manote, jog matote tai per klaidą, tuomet pagalbai ir nesklandumų šalinimui susisiekite su support@signal.org.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Šiame įrenginyje nėra „Google Play“ paslaugų. Jūs vis tiek galite naudoti Molly, tačiau tokia konfigūracija gali sąlygoti mažesnį patikimumą ir našumą.\n\nJeigu jūs nesate pažengęs naudotojas, nenaudojate atsarginių dalių „Android“ ROM ar manote, jog matote tai per klaidą, tuomet pagalbai ir nesklandumų šalinimui susisiekite su support@molly.im.</string>
     <string name="RegistrationActivity_i_understand">Aš suprantu</string>
     <string name="RegistrationActivity_play_services_error">„Play“ paslaugų klaida</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">„Google Play“ paslaugos yra atnaujinamos arba laikinai neprieinamos. Prašome bandyti dar kartą.</string>
@@ -2310,7 +2439,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Nestandartinis numerio formatas</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Atrodo, kad jūsų įvestas numeris (%1$s) yra nestandartinio formato.\n\nAr turėjote omenyje %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal „Android“ - Telefono numerio formatas</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly „Android“ - Telefono numerio formatas</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Užklausta skambučio</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2346,8 +2475,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Nepavyksta prisiregistruoti?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Įsitikink, kad telefone yra mobilusis ryšys ir gali gauti SMS ar priimti skambutį.\n • Patvirtink, kad gali atsiliepti į skambutį šiuo numeriu.\n • Patikrink, ar teisingai įvedei savo telefono numerį.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Jei reikia daugiau informacijos, atlik šiuos nesklandumų šalinimo veiksmus arba kreipkis į aptarnavimo komandą</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Jei norite gauti daugiau informacijos, vadovaukitės %1$s arba %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">šiuos nesklandumų šalinimo veiksmus</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2385,13 +2514,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Pridėti į adresatus</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Pakviesti į Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Pakviesti į Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal žinutė</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal skambutis</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Pridėti į adresatus</string>
-    <string name="SharedContactView_invite_to_signal">Pakviesti į Signal</string>
+    <string name="SharedContactView_invite_to_signal">Pakviesti į Molly</string>
     <string name="SharedContactView_message">Signal žinutė</string>
 
     <!-- SignalBottomActionBar -->
@@ -2522,11 +2651,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s priklauso %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal atnaujinimas</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Galima nauja „Signal“ versija. Bakstelėk, jei nori atnaujinti.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Nepavyko atnaujinti „Signal“</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly atnaujinimas</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Galima nauja „Molly“ versija. Bakstelėk, jei nori atnaujinti.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Nepavyko atnaujinti „Molly“</string>
     <string name="ApkUpdateNotifications_failed_general_body">Vėliau pabandysime dar kartą.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">„Signal“ sėkmingai atnaujinta</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">„Molly“ sėkmingai atnaujinta</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Automatiškai atnaujinta į versiją %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2599,7 +2728,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Mūsų Signal saugumo numeris:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Atrodo, kad neturite programėlių su kuriomis dalintis.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Iškarpinėje palyginimui nebuvo rasta jokio saugumo numerio</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Norint skenuoti QR kodą, Signal reikia kameros leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymų meniu, pasirinkite „Leidimai“ ir įjunkite „Kamerą“.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Norint skenuoti QR kodą, Molly reikia kameros leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymų meniu, pasirinkite „Leidimai“ ir įjunkite „Kamerą“.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Nepavyksta nuskenuoti QR kodo be kameros leidimo</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Norėdami matyti naudotojo %1$s saugumo numerį, iš pradžių, turite apsikeisti su juo žinutėmis.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2629,14 +2758,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Prilieskite, kad atvertumėte.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal yra atrakinta</string>
-    <string name="KeyCachingService_lock">Užrakinti Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly yra atrakinta</string>
+    <string name="KeyCachingService_lock">Užrakinti Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Jūs</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Nepalaikomas medijos tipas</string>
     <string name="MediaPreviewActivity_draft">Juodraštis</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Norint įrašyti į išorinę saugyklą, Signal reikia saugyklos leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymus, pasirinkite „Leidimai“ ir įjunkite „Saugyklą“.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Norint įrašyti į išorinę saugyklą, Molly reikia saugyklos leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymus, pasirinkite „Leidimai“ ir įjunkite „Saugyklą“.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Nepavyksta įrašyti į išorinę saugyklą be leidimų</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Ištrinti žinutę?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Tai visiems laikams ištrins šią žinutę.</string>
@@ -2684,7 +2813,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Nepavyko pristatyti žinutės.</string>
     <string name="MessageNotifier_error_delivering_message">Klaida, pristatant žinutę.</string>
     <string name="MessageNotifier_message_delivery_paused">Žinučių pristatymas pristabdytas.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Patvirtinkite, norėdami tęsti susirašinėjimą per Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Patvirtinkite, norėdami tęsti susirašinėjimą per Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Žymėti visas kaip skaitytas</string>
     <string name="MessageNotifier_mark_read">Žymėti kaip skaitytą</string>
     <string name="MessageNotifier_turn_off_these_notifications">Išjungti šiuos pranešimus</string>
@@ -2706,7 +2835,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Sureagavo į tavo lipduką %1$s.</string>
     <string name="MessageNotifier_this_message_was_deleted">Ši žinutė buvo ištrinta.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Išjungti pranešimus apie tai, kad adresatai prisijungė prie Signal? Galėsite ir vėl įjungti šiuos pranešimus, perėję į Signal &gt; Nustatymai &gt; Pranešimai.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Išjungti pranešimus apie tai, kad adresatai prisijungė prie Molly? Galėsite ir vėl įjungti šiuos pranešimus, perėję į Molly &gt; Nustatymai &gt; Pranešimai.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2745,7 +2874,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Spartusis atsakymas neprieinamas, kai Signal yra užrakinta!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Spartusis atsakymas neprieinamas, kai Molly yra užrakinta!</string>
     <string name="QuickResponseService_problem_sending_message">Problemos siunčiant žinutę!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2765,7 +2894,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Neteisingas šaukinys</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Nauja žinutė</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Žinutės užklausa</string>
     <string name="SingleRecipientNotificationBuilder_you">Jūs</string>
@@ -2813,7 +2942,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Šis įrenginys nebėra registruotas. Taip gali būti dėl to, kad registravai savo telefono numerį „Signal“ programėlėje kitame įrenginyje.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Šis įrenginys nebėra registruotas. Taip gali būti dėl to, kad registravai savo telefono numerį „Molly“ programėlėje kitame įrenginyje.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Iš naujo registruoti įrenginį</string>
 
@@ -2826,10 +2955,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Norėdami atsiliepti, suteikite Signal prieigą prie mikrofono.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Norėdami atsiliepti, suteikite Molly prieigą prie mikrofono.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Kad atsilieptum į vaizdo skambutį, suteik „Signal“ prieigą prie mikrofono ir kameros.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Norint skambinti ar gauti skambučius, Signal reikia mikrofono ir kameros leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymus, pasirinkite „Leidimai“ ir įjunkite „Mikrofoną“ ir „Kamerą“.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Kad atsilieptum į vaizdo skambutį, suteik „Molly“ prieigą prie mikrofono ir kameros.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Norint skambinti ar gauti skambučius, Molly reikia mikrofono ir kameros leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymus, pasirinkite „Leidimai“ ir įjunkite „Mikrofoną“ ir „Kamerą“.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Atsiliepta susietame įrenginyje.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Atmesta susietame įrenginyje.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Užimta susietame įrenginyje.</string>
@@ -2874,16 +3003,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Pakartokite naują slaptafrazę</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Pakviesti į Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Pakviesti į Molly</string>
     <string name="contact_selection_activity__new_group">Nauja grupė</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Atnaujinti kontaktus</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Kažko trūksta? Bandyk atnaujinti</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Raskite pažįstamų žmonių per „Signal“</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Leiskite prieigą prie savo kontaktų</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Daugiau</string>
 
@@ -2900,7 +3029,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Adresato nuotrauka</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Norint rodyti jūsų adresatus, Signal reikia adresatų leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymų meniu, pasirinkite „Leidimai“ ir įjunkite „Adresatus“.</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Norint rodyti jūsų adresatus, Molly reikia adresatų leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymų meniu, pasirinkite „Leidimai“ ir įjunkite „Adresatus“.</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Klaida gaunant adresatus, patikrinkite tinklo ryšį</string>
     <string name="ContactSelectionListFragment_username_not_found">Naudotojo vardas nerastas</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"„%1$s“ nėra „Signal“ naudotojas. Patikrinkite naudotojo vardą ir bandykite dar kartą."</string>
@@ -2920,16 +3049,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Rasti pagal naudotojo vardą</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Leiskite prieigą prie kontaktų</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Jei norite rasti pažįstamų žmonių „Signal“:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Leisti prieigą</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Ne, ačiū</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Leiskite prieigą prie savo kontaktų. Jūsų kontaktai yra užšifruoti ir „Signal“ jų nemato.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Norint rodyti jūsų adresatus, Signal reikia prieigos prie jų.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Norint rodyti jūsų adresatus, Molly reikia prieigos prie jų.</string>
     <string name="contact_selection_list_fragment__show_contacts">Rodyti adresatus</string>
 
     <!-- contact_selection_list_item -->
@@ -3006,6 +3137,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Tu pašalinai šį asmenį. Jei vėl išsiųsi šiam žmogui žinutę, jis bus vėl įtrauktas į tavo sąrašą.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Parinktys</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Atnaujinti</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Atkurti … Pristabdyti</string>
@@ -3034,7 +3167,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Burbulai yra „Android“ ypatybė, kurią Signal pokalbiams galite išjungti.</string>
+    <string name="BubbleOptOutTooltip__description">Burbulai yra „Android“ ypatybė, kurią Molly pokalbiams galite išjungti.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Ne dabar</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3216,9 +3349,9 @@
     <string name="EditProfileFragment__group_description">Grupės aprašas</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Atnaujinti Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Atnaujinti Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Ši „Signal“ versija nebegalioja. Atnaujink programėlę dabar ir naudokis toliau.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Ši „Molly“ versija nebegalioja. Atnaujink programėlę dabar ir naudokis toliau.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Atnaujinti</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3437,7 +3570,7 @@
     <string name="preferences__slow">Lėtas</string>
     <string name="preferences__help">Pagalba</string>
     <string name="preferences__advanced">Išplėstiniai</string>
-    <string name="preferences__donate_to_signal">Paremk „Signal“</string>
+    <string name="preferences__donate_to_signal">Paremk „Molly“</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Privatumas</string>
     <!-- Preference label for stories -->
@@ -3474,13 +3607,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Keisti programėlės piktogramą ir pavadinimą į „%1$s“</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Keičiant programėlės piktogramą ir pavadinimą, „Signal“ turės užsiverti. Pranešimuose visada bus rodoma numatytoji „Signal“ piktograma ir pavadinimas.</string>
+    <string name="preferences__app_icon_dialog_description">Keičiant programėlės piktogramą ir pavadinimą, „Molly“ turės užsiverti. Pranešimuose visada bus rodoma numatytoji „Molly“ piktograma ir pavadinimas.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Pasirink programėlės piktogramą ir pavadinimą, kurie bus matomi telefono pradžios ekrane ir programėlių aplanke. Pranešimuose visada bus rodoma numatytoji „Signal“ piktograma ir pavadinimas. Sužinoti daugiau</string>
+    <string name="preferences__app_icon_warning_learn_more">Pasirink programėlės piktogramą ir pavadinimą, kurie bus matomi telefono pradžios ekrane ir programėlių aplanke. Pranešimuose visada bus rodoma numatytoji „Molly“ piktograma ir pavadinimas. Sužinoti daugiau</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Programėlių piktogramos ir pavadinimai matomi telefono pradžios ekrane ir programėlių aplanke.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Pranešimuose visada bus rodoma numatytoji „Signal“ piktograma ir pavadinimas.</string>
+    <string name="preferences__app_icon_notification_warning">Pranešimuose visada bus rodoma numatytoji „Molly“ piktograma ir pavadinimas.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Sužinoti daugiau</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3529,8 +3662,12 @@
         <item quantity="other">Visi pokalbiai bus negrįžtamai apkarpyti iki %1$s naujausių žinučių.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Tai visam laikui iš tavo įrenginio ištrins visą žinučių istoriją ir įrašus.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Tai visam laikui iš šio įrenginio ir bet kokių susietų įrenginių ištrins visą žinučių istoriją ir įrašus.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Ar tikrai nori ištrinti visą žinučių istoriją?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Visa žinučių istorija bus pašalinta visam laikui. Šio veiksmo nebus galima atšaukti.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Iš visų įrenginių visam laikui bus pašalinta visa žinučių istorija. Šio veiksmo bus neįmanoma atšaukti.</string>
     <string name="preferences_storage__delete_all_now">Ištrinti viską dabar</string>
     <string name="preferences_storage__forever">Amžinai</string>
     <string name="preferences_storage__one_year">1 metus</string>
@@ -3569,7 +3706,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Cenzūravimo apėjimas</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Cenzūravimo apėjimas</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Jei įjungta, Signal bandys apeiti cenzūravimą. Neįjunkite šios ypatybės, nebent esate vietoje, kurioje Signal yra cenzūruojama.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Jei įjungta, Molly bandys apeiti cenzūravimą. Neįjunkite šios ypatybės, nebent esate vietoje, kurioje Molly yra cenzūruojama.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Cenzūravimo apėjimas buvo aktyvuotas pagal jūsų paskyros telefono numerį.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3621,7 +3758,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Pristatome: mokėjimai</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Su „Signal“ siųsk ir gauk „MobileCoin“ – naują į privatumą orientuotą skaitmeninę valiutą. Įjunk ir pradėk.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Su „Molly“ siųsk ir gauk „MobileCoin“ – naują į privatumą orientuotą skaitmeninę valiutą. Įjunk ir pradėk.</string>
     <string name="PaymentsHomeFragment__activate_payments">Aktyvuoti mokėjimus</string>
     <string name="PaymentsHomeFragment__activating_payments">Aktyvuojami mokėjimai…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Atkurti mokėjimų paskyrą</string>
@@ -3647,7 +3784,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Mokėjimai yra neprieinami jūsų regione.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Nepavyko įjungti mokėjimų. Vėliau bandykite dar kartą.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Pasyvinti mokėjimus?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Pasyvinę mokėjimus, negalėsite Signal programėlėje siųsti ar gauti „MobileCoin“ valiutą.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Pasyvinę mokėjimus, negalėsite Molly programėlėje siųsti ar gauti „MobileCoin“ valiutą.</string>
     <string name="PaymentsHomeFragment__deactivate">Pasyvinti</string>
     <string name="PaymentsHomeFragment__continue">Tęsti</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Šiuo metu likutis neprieinamas.</string>
@@ -3656,10 +3793,10 @@
     <string name="PaymentsHomeFragment__details">Išsamesnė informacija</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Naudojant „Signal“ galima siųsti ir gauti „Mobile Coin“. Visiems mokėjimams taikomos „Mobile Coin“ ir „Mobile Coin Wallet“ naudojimo sąlygos. Gali būti, kad susidursi su tam tikromis problemomis, ir mokėjimai ar likučiai, kuriuos galbūt prarasi, nebus atkurti. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Naudojant „Molly“ galima siųsti ir gauti „Mobile Coin“. Visiems mokėjimams taikomos „Mobile Coin“ ir „Mobile Coin Wallet“ naudojimo sąlygos. Gali būti, kad susidursi su tam tikromis problemomis, ir mokėjimai ar likučiai, kuriuos galbūt prarasi, nebus atkurti. </string>
     <string name="PaymentsHomeFragment__activate">Aktyvuoti</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Rodyti „MobileCoin“ sąlygas</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Mokėjimai Signal programėlėje daugiau nebeprieinami. Jūs vis dar galite pervesti lėšas į valiutos keitimo punktą, bet nebegalite siųsti ir gauti mokėjimų ar pridėti lėšų.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Mokėjimai Molly programėlėje daugiau nebeprieinami. Jūs vis dar galite pervesti lėšas į valiutos keitimo punktą, bet nebegalite siųsti ir gauti mokėjimų ar pridėti lėšų.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3687,7 +3824,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Suteik leidimus</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Kad padėtų tau siųsti žinutes savo pažįstamiems, „Signal“ paprašys šių leidimų. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Kad padėtų tau siųsti žinutes savo pažįstamiems, „Molly“ paprašys šių leidimų. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Pranešimai</string>
     <!-- Notifications permission row description -->
@@ -3775,10 +3912,10 @@
     <string name="PaymentsTransferFragment__next">Kitas</string>
     <string name="PaymentsTransferFragment__invalid_address">Neteisingas adresas</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Patikrinkite piniginės, į kurią bandote pervesti, adresą ir bandykite dar kartą.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Negalite pervesti į savo asmeninės Signal piniginės adresą. Įveskite piniginės adresą iš paskyros, kuri yra palaikomame valiutos keitimo punkte.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Norint nuskenuoti QR kodą, Signal reikia prieigos prie kameros.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Norint nuskenuoti QR kodą, Signal reikia kameros leidimo. Pereikite į Nustatymus, pasirinkite „Leidimai“ ir įjunkite „Kamerą“.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Norint nuskenuoti QR kodą, Signal reikia prieigos prie kameros.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Negalite pervesti į savo asmeninės Molly piniginės adresą. Įveskite piniginės adresą iš paskyros, kuri yra palaikomame valiutos keitimo punkte.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Norint nuskenuoti QR kodą, Molly reikia prieigos prie kameros.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Norint nuskenuoti QR kodą, Molly reikia kameros leidimo. Pereikite į Nustatymus, pasirinkite „Leidimai“ ir įjunkite „Kamerą“.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Norint nuskenuoti QR kodą, Molly reikia prieigos prie kameros.</string>
     <string name="PaymentsTransferFragment__settings">Nustatymai</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -4144,17 +4281,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Gaunamasis „Signal“ balso skambutis</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Gaunamasis „Molly“ balso skambutis</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Gaunamasis „Signal“ vaizdo skambutis</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Gaunamasis „Molly“ vaizdo skambutis</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Gaunamasis Signal grupės skambutis</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Gaunamasis Molly grupės skambutis</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Vykstantis „Signal“ balso skambutis</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Vykstantis „Molly“ balso skambutis</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Vykstantis „Signal“ vaizdo skambutis</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Vykstantis „Molly“ vaizdo skambutis</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Vykstantis „Signal“ grupės skambutis</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Vykstantis „Molly“ grupės skambutis</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Įkeliama…</string>
@@ -4201,9 +4338,9 @@
     <string name="BackupDialog_verify">Patvirtinti</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Jūs sėkmingai įvedėte savo atsarginės kopijos slaptafrazę</string>
     <string name="BackupDialog_passphrase_was_not_correct">Slaptafrazė buvo neteisinga</string>
-    <string name="LocalBackupJob_creating_signal_backup">Daroma Signal atsarginė kopija…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Daroma Molly atsarginė kopija…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Tvirtinama „Signal“ atsarginė kopija…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Tvirtinama „Molly“ atsarginė kopija…</string>
     <string name="LocalBackupJobApi29_backup_failed">Atsarginė kopija nepavyko</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Tavo atsarginių kopijų katalogas buvo ištrintas ar perkeltas.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Jūsų atsarginės kopijos failas yra per didelis, kad jį galima būtų laikyti šiame tome.</string>
@@ -4218,15 +4355,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Skambinti man (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Siųsti kodą iš naujo (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Susisiekti su Signal palaikymu</string>
-    <string name="RegistrationActivity_code_support_subject">Signal registracija - Patvirtinimo kodas, skirtas „Android“</string>
+    <string name="RegistrationActivity_contact_signal_support">Susisiekti su Molly palaikymu</string>
+    <string name="RegistrationActivity_code_support_subject">Molly registracija - Patvirtinimo kodas, skirtas „Android“</string>
     <string name="RegistrationActivity_incorrect_code">Neteisingas kodas</string>
     <string name="BackupUtil_never">Niekada</string>
     <string name="BackupUtil_unknown">Nežinoma</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Telefono numeris</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Pasirink, kas gali matyti tavo telefono numerį, ir kas gali juo su tavimi susisiekti per „Signal“.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Pasirink, kas gali matyti tavo telefono numerį, ir kas gali juo su tavimi susisiekti per „Molly“.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Kas gali matyti mano tel. numerį</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4274,7 +4411,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Atlikote per daug bandymų. Vėliau bandykite dar kartą.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Klaida, jungiantis prie paslaugos</string>
     <string name="preferences_chats__backups">Atsarginės kopijos</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal yra užrakinta</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly yra užrakinta</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">BAKSTELĖKITE, NORĖDAMI ATRAKINTI</string>
     <string name="Recipient_unknown">Nežinoma</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4305,9 +4442,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Jums reikia prieigos prie savo senojo įrenginio.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Atkurti iš atsarginės kopijos</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Atkurkite savo žinutes iš vietinės atsarginės kopijos. Jeigu neatkursite dabar, vėliau to padaryti nebegalėsite.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Atkurti vietinę atsarginę kopiją</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Atkurti „Signal“ atsarginę kopiją</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Atkurti visas jūsų tekstines žinutes ir paskutinių 30 dienų įrašus</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Daugiau parinkčių</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Atšaukti</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Prisijungti be perkėlimo</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Tęsti neperkeliant savo žinučių ir įrašų</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Savo senajame „Android“ telefone atverkite Signal</string>
     <string name="NewDeviceTransferInstructions__continue">Tęsti</string>
@@ -4322,19 +4466,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Ruošiamasi prisijungti prie senojo „Android“ įrenginio…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Dar minutėlę, netrukus turėtų būti paruošta</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Laukiama, kol prisijungs senasis „Android“ įrenginys…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal yra reikalingas įrenginio vietos leidimas tam, kad galėtų atrasti ir prisijungti prie jūsų senojo „Android“ įrenginio.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal reikia įjungtų vietos paslaugų, kad galėtų atrasti ir prisijungti prie jūsų senojo „Android“ įrenginio.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal reikia įjungto belaidžio (Wi-Fi) ryšio, kad atrastų ir prisijungtų prie jūsų senojo „Android“ įrenginio. Belaidis (Wi-Fi) ryšys turi būti įjungtas, tačiau įrenginys neprivalo būti prisijungęs prie belaidžio (Wi-Fi) tinklo.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Atleiskite, atrodo, kad šis įrenginys nepalaiko „Wi-Fi Direct“. Signal naudoja „Wi-Fi Direct“, kad atrastų ir prisijungtų prie jūsų senojo „Android“ įrenginio. Norėdami atkurti savo paskyrą iš senojo „Android“ įrenginio, vis dar galite atkurti atsarginę kopiją.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly yra reikalingas įrenginio vietos leidimas tam, kad galėtų atrasti ir prisijungti prie jūsų senojo „Android“ įrenginio.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly reikia įjungtų vietos paslaugų, kad galėtų atrasti ir prisijungti prie jūsų senojo „Android“ įrenginio.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly reikia įjungto belaidžio (Wi-Fi) ryšio, kad atrastų ir prisijungtų prie jūsų senojo „Android“ įrenginio. Belaidis (Wi-Fi) ryšys turi būti įjungtas, tačiau įrenginys neprivalo būti prisijungęs prie belaidžio (Wi-Fi) tinklo.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Atleiskite, atrodo, kad šis įrenginys nepalaiko „Wi-Fi Direct“. Molly naudoja „Wi-Fi Direct“, kad atrastų ir prisijungtų prie jūsų senojo „Android“ įrenginio. Norėdami atkurti savo paskyrą iš senojo „Android“ įrenginio, vis dar galite atkurti atsarginę kopiją.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Atkurti atsarginę kopiją</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Atsirado netikėta klaida, bandant prisijungti prie jūsų senojo „Android“ įrenginio.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Ieškoma naujojo „Android“ įrenginio…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal yra reikalingas įrenginio vietos leidimas tam, kad galėtų atrasti ir prisijungti prie jūsų naujojo „Android“ įrenginio.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal reikia įjungtų vietos paslaugų, kad galėtų atrasti ir prisijungti prie jūsų naujojo „Android“ įrenginio.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal reikia įjungto belaidžio (Wi-Fi) ryšio, kad atrastų ir prisijungtų prie jūsų naujojo „Android“ įrenginio. Belaidis (Wi-Fi) ryšys turi būti įjungtas, tačiau įrenginys neprivalo būti prisijungęs prie belaidžio (Wi-Fi) tinklo.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Atleiskite, atrodo, kad šis įrenginys nepalaiko „Wi-Fi Direct“. Signal naudoja „Wi-Fi Direct“, kad atrastų ir prisijungtų prie jūsų naujojo „Android“ įrenginio. Norėdami atkurti savo paskyrą naujajame „Android“ įrenginyje, vis dar galite padaryti atsarginę kopiją.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly yra reikalingas įrenginio vietos leidimas tam, kad galėtų atrasti ir prisijungti prie jūsų naujojo „Android“ įrenginio.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly reikia įjungtų vietos paslaugų, kad galėtų atrasti ir prisijungti prie jūsų naujojo „Android“ įrenginio.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly reikia įjungto belaidžio (Wi-Fi) ryšio, kad atrastų ir prisijungtų prie jūsų naujojo „Android“ įrenginio. Belaidis (Wi-Fi) ryšys turi būti įjungtas, tačiau įrenginys neprivalo būti prisijungęs prie belaidžio (Wi-Fi) tinklo.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Atleiskite, atrodo, kad šis įrenginys nepalaiko „Wi-Fi Direct“. Molly naudoja „Wi-Fi Direct“, kad atrastų ir prisijungtų prie jūsų naujojo „Android“ įrenginio. Norėdami atkurti savo paskyrą naujajame „Android“ įrenginyje, vis dar galite padaryti atsarginę kopiją.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Daryti atsarginę kopiją</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Atsirado netikėta klaida, bandant prisijungti prie jūsų naujojo „Android“ įrenginio.</string>
 
@@ -4375,7 +4519,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Duomenų perkėlimas</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Laikykite įrenginius vieną šalia kito. Neišjunkite įrenginių ir palikite Signal atvertą. Perkėlimai yra šifruoti ištisiniu būdu.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Laikykite įrenginius vieną šalia kito. Neišjunkite įrenginių ir palikite Molly atvertą. Perkėlimai yra šifruoti ištisiniu būdu.</string>
     <string name="DeviceTransfer__d_messages_so_far">Jau %1$d žinučių…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">Jau %1$s%% žinučių…</string>
@@ -4389,7 +4533,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Perkelti paskyrą</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Savo naujajame „Android“ įrenginyje atsisiųskite Signal</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Savo naujajame „Android“ įrenginyje atsisiųskite Molly</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Bakstelėkite ant „Perkelti ar atkurti paskyrą“"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4463,7 +4607,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Kiekvienas, turintis šią nuorodą, gali peržiūrėti grupės pavadinimą ir nuotrauką bei gali prašyti prisijungti prie grupės. Bendrinkite nuorodą su žmonėmis, kuriais pasitikite.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Kiekvienas, turintis šią nuorodą, gali peržiūrėti grupės pavadinimą ir nuotrauką bei gali prisijungti prie grupės. Bendrinkite nuorodą su žmonėmis, kuriais pasitikite.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Bendrinti per Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Bendrinti per Molly</string>
     <string name="GroupLinkBottomSheet_copy">Kopijuoti</string>
     <string name="GroupLinkBottomSheet_qr_code">QR kodas</string>
     <string name="GroupLinkBottomSheet_share">Bendrinti</string>
@@ -4663,7 +4807,7 @@
     <string name="payment_info_card_about_mobilecoin">Apie „MobileCoin“</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">„MobileCoin“ yra nauja į privatumą orientuota skaitmeninė valiuta.</string>
     <string name="payment_info_card_adding_funds">Lėšų pridėjimas</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Galite pridėti lėšas, skirtas naudoti Signal programėlėje, išsiųsdami „MobileCoin“ valiutą į savo piniginės adresą.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Galite pridėti lėšas, skirtas naudoti Molly programėlėje, išsiųsdami „MobileCoin“ valiutą į savo piniginės adresą.</string>
     <string name="payment_info_card_cashing_out">Pinigų išgryninimas</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">„MobileCoin“ valiutą bet kuriuo metu galite išgryninti valiutos keitimo punktuose, kurie palaiko „MobileCoin“. Tiesiog, atlikite pervedimą į savo sąskaitą tame valiutos keitimo punkte.</string>
     <string name="payment_info_card_hide_this_card">Slėpti šią kortelę?</string>
@@ -4684,12 +4828,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Pasyvinti piniginę</string>
     <string name="DeactivateWalletFragment__your_balance">Jūsų likutis</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Prieš deaktyvinant mokėjimus rekomenduojama pervesti savo lėšas į kitos piniginės adresą. Jei dabar pasirinksi nepervesti savo lėšų, jos liks su „Signal“ susietoje tavo piniginėje, jei iš naujo aktyvinsi mokėjimus.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Prieš deaktyvinant mokėjimus rekomenduojama pervesti savo lėšas į kitos piniginės adresą. Jei dabar pasirinksi nepervesti savo lėšų, jos liks su „Molly“ susietoje tavo piniginėje, jei iš naujo aktyvinsi mokėjimus.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Pervesti likusį likutį</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Pasyvinti be pervedimo</string>
     <string name="DeactivateWalletFragment__deactivate">Pasyvinti</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Pasyvinti be pervedimo?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Tavo likutis liks su „Signal“ susietoje tavo piniginėje, jei pasirinksi iš naujo aktyvinti mokėjimus.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Tavo likutis liks su „Molly“ susietoje tavo piniginėje, jei pasirinksi iš naujo aktyvinti mokėjimus.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Klaida pasyvinant piniginę.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4988,7 +5132,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licencijos</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Sąlygos ir Privatumo politika</string>
-    <string name="HelpFragment__copyright_signal_messenger">Autorių teisės Signal pokalbių programėlė</string>
+    <string name="HelpFragment__copyright_signal_messenger">Autorių teisės Molly pokalbių programėlė</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Licencijuota pagal GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -5235,9 +5379,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Pasirinkti spalvą</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Bendrinti</string>
 
@@ -5279,7 +5420,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Siųsti žinutes į šią grupę gali tik administratoriai.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Pasiekta riba</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Negalite pasirinkti daugiau kaip 5 pokalbių</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5460,9 +5602,9 @@
     <string name="MySupportPreference__learn_more">Sužinoti daugiau</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Atnaujinti Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Atnaujinti Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Ši „Signal“ versija nebegalioja. Atnaujink programėlę dabar ir naudokis toliau.</string>
+    <string name="UpdateSignalExpiredDialog__message">Ši „Molly“ versija nebegalioja. Atnaujink programėlę dabar ir naudokis toliau.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Atnaujinti</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5471,7 +5613,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Įrenginys neregistruotas</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Šis įrenginys nebėra registruotas. Registruok iš naujo ir toliau naudok „Signal“ šiame įrenginyje.</string>
+    <string name="ReregisterSignalDialog__message">Šis įrenginys nebėra registruotas. Registruok iš naujo ir toliau naudok „Molly“ šiame įrenginyje.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Iš naujo registruoti</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5765,7 +5907,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Nepavyko atverti parinkiklio.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Kad įgalintų pranešimus, „Signal“ reikalingas leidimas juos rodyti.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Kad įgalintų pranešimus, „Molly“ reikalingas leidimas juos rodyti.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Įjungti</string>
 
@@ -5920,8 +6062,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Atsakymų kol kas nėra</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Negali atsakyti į šią istoriją, nes nebesi šios grupės narys.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Sureagavo į istoriją</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">sureagavote į istoriją</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">sureagavo į istoriją</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Peržiūros</string>
     <!-- Label for story replies tab -->
@@ -6572,8 +6716,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Pasirink savo banką</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Patvirtinkite savo paramą su %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Jei norite nustatyti pasikartojančią paramą, bakstelėkite „Tęsti“, kad patvirtintumėte 0,01 € mokestį iš savo banko. Ši suma bus automatiškai grąžinta ir galėsime iš jūsų sąskaitos nurašyti po 5 € paramą kas mėnesį.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Jei norite nustatyti pasikartojančią paramą, bakstelėkite „Tęsti“, kad patvirtintumėte 0,01 € mokestį iš savo banko. Ši suma bus automatiškai grąžinta ir galėsime iš jūsų sąskaitos nurašyti po %1$s paramą kas mėnesį.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Tęsti</string>
 
@@ -7163,6 +7307,56 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Atsiunčiami atsarginės kopijos duomenys…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Įrašų atsarginės kopijos išjungtos</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Jūsų „Signal“ įrašų atsarginės kopijos planas atšauktas, nes negalėjome apdoroti mokėjimo. Turite %1$d d. atsisiųsti bet kokius atsarginėje kopijoje saugomus įrašus. Po %1$d d. įrašai iš atsarginių kopijų bus ištrinti.</item>
+        <item quantity="few">Jūsų „Signal“ įrašų atsarginės kopijos planas atšauktas, nes negalėjome apdoroti mokėjimo. Turite %1$d d. atsisiųsti bet kokius atsarginėje kopijoje saugomus įrašus. Po %1$d d. įrašai iš atsarginių kopijų bus ištrinti.</item>
+        <item quantity="many">Jūsų „Signal“ įrašų atsarginės kopijos planas atšauktas, nes negalėjome apdoroti mokėjimo. Turite %1$d d. atsisiųsti bet kokius atsarginėje kopijoje saugomus įrašus. Po %1$d d. įrašai iš atsarginių kopijų bus ištrinti.</item>
+        <item quantity="other">Jūsų „Signal“ įrašų atsarginės kopijos planas buvo atšauktas, nes negalėjome apdoroti mokėjimo. Turite %1$d d. atsisiųsti bet kokius atsarginėje kopijoje saugomus įrašus. Po %1$d d. įrašai iš atsarginių kopijų bus ištrinti.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Bet kada galite vėl pradėti mokėti už atsargines kopijas ir toliau kopijuoti visus savo įrašus. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Jūsų įrašai bus ištrinti šiandien</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Jūsų „Signal“ įrašų atsarginės kopijos planas buvo atšauktas, nes negalėjome apdoroti mokėjimo. Tai paskutinė galimybė atsisiųsti įrašus iš atsarginės kopijos prieš ją ištrinant.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Nepavyko užbaigti atsisiuntimo</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Jūsų įrenginyje trūksta vietos. Atlaisvinkite iki %1$s vietos, kad galėtumėte atsisiųsti įrašus iš atsarginės kopijos.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Jei pasirinksite „Praleisti“, įrašai iš atsarginių kopijų bus ištrinti po %1$d d.</item>
+        <item quantity="few">Jei pasirinksite „Praleisti“, įrašai iš atsarginių kopijų bus ištrinti po %1$d d.</item>
+        <item quantity="many">Jei pasirinksite „Praleisti“, įrašai iš atsarginių kopijų bus ištrinti po %1$d d.</item>
+        <item quantity="other">Jei pasirinksite „Praleisti“, įrašai iš atsarginių kopijų bus ištrinti po %1$d d.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Nepavyksta apdoroti mokėjimo už atsargines kopijas</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Iškilo sunkumų nuskaitant jūsų pasikartojantį mėnesinį mokėjimą už atsargines kopijas. Įsitikinkite, kad jūsų mokėjimo būdas atnaujintas. Jeigu jis pasenęs, atnaujinkite jį sistemoje „Google Pay“. Po kelių dienų „Signal“ vėl pabandys apdoroti mokėjimą.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Nepavyko sukurti atsarginės kopijos</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Jūsų įrenginys nesukūrė atsarginės kopijos jau %1$d d. Įsitikinkite, kad įrenginys prijungtas prie „Wi-Fi“, ir bakstelėkite „Kurti atsarginę kopiją dabar“. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Sužinoti daugiau</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Praleisti</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Atsisiųsti įrašus dabar</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Atsisiųsti vėliau</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Neatsisiųsti įrašų</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Atlaisvinkite iki %1$s vietos, kad galėtumėte atsisiųsti savo įrašą.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Kredito arba debeto kortelė</string>
@@ -7176,16 +7370,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Nežinoma</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Mokėjimų istorija</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Paskutinė atsarginė kopija buvo sukurta %1$s, %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">Pokalbio ribojimai</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">Pokalbio ilgio ribojimai</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">Ištrinti žinučių istoriją</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Už pasirinktą laiką senesnės žinutės bus visam laikui ištrintos.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Pasirinktą ilgį viršijančios žinutės bus visam laikui ištrintos.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Taikyti apribojimus susietiems įrenginiams</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Kai įjungta, pokalbio ilgio ribojimo funkcija ištrins žinutes iš susietų įrenginių.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Ištrynimas dabar sinchronizuojamas visuose jūsų įrenginiuose</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Jei ištrinate žinutes ar pokalbius, jie bus ištrinti iš jūsų telefono ir susietų įrenginių.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">Gerai</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Mokėjimų istorija</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Žinučių ir visų įrašų atsarginė kopija</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Mokėjimo informacija</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Atsarginio kopijavimo tipas</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Mokėjimo data</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Bendrinti</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">„Signal“ atsarginės kopijos</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Mokėjimų istorija</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Informacija apie atsarginę kopiją</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Atsarginės kopijos dydis</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Atsarginės kopijos atlikimo dažnis</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Daryti atsargines kopijas naudojant mobilųjį ryšį</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Išjungti ir ištrinti atsargines kopijas</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Atsarginė kopija ištrinta, o kopijavimas išjungtas.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Pakeistas atsarginio kopijavimo tipas ir prenumerata atšaukta</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Prenumerata nutraukta</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Atsisiuntimas baigtas</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Atsarginio kopijavimo tipas</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Atsarginis kopijavimas išjungtas</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/mėn.</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Įjungti atsargines kopijas</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Paskutinė atsarginė kopija</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s, %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Niekada</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Daryti atsarginę kopiją dabar</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Išjungti ir ištrinti atsargines kopijas?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Pinigai nebus nuskaičiuoti dar kartą. Jūsų atsarginė kopija bus ištrinta ir nebus sukurtos naujos atsarginės kopijos.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Išjungti ir ištrinti</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Ištrinama atsarginė kopija…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Atsarginė kopija ištrinta</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Bakstelėjus „Daryti atsarginę kopiją dabar“"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Kasdien</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Kas savaitę</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Kas mėnesį</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Atsarginę kopiją sukurti rankiniu būdu</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Įveskite įrenginio PIN kodą, slaptažodį arba šabloną.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Kitas</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Keisti atsarginės kopijos tipą</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Nutraukti prenumeratą</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Patvirtinti nutraukimą</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Pinigai nebus nuskaičiuoti dar kartą. Pasibaigus atsiskaitymo ciklui atsarginių kopijų paslauga bus išjungta. Po šios datos turėsite 30 dienų atsisiųsti įrašus, kurių atsarginės kopijos šiuo metu atliekamos.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Patvirtinti ir atsisiųsti dabar</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Patvirtinti ir atsisiųsti vėliau</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Išsaugoti prenumeratą</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index e077b77d4f..a3094d6881 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal atjaunina informāciju…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly atjaunina informāciju…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Jūs vēl neesat iestatījuši paroles frāzi!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Atspējot paroles frāzi?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Šī opcija pastāvīgi atbloķēs Signal un jaunu ziņojumu paziņojumus.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Šī opcija pastāvīgi atbloķēs Molly un jaunu ziņojumu paziņojumus.</string>
     <string name="ApplicationPreferencesActivity_disable">Atspējot</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Kļūda savienojoties ar serveri!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN kodi ir nepieciešami reģistrācijas bloķēšanai. Lai atspējotu PIN, vispirms atspējojiet reģistrācijas bloķēšanu.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Fails</string>
     <string name="AttachmentKeyboard_contact">Kontakts</string>
     <string name="AttachmentKeyboard_location">Atrašanās vieta</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal ir nepieciešama atļauja rādīt jūsu fotoattēlus un videoklipus</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly ir nepieciešama atļauja rādīt jūsu fotoattēlus un videoklipus</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Atļaut piekļuvi</string>
     <string name="AttachmentKeyboard_payment">Maksājums</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Nevar atrast aplikāciju, ar kuru iespējams izvēlēties pievienojamo mediju failu.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Lai pievienoto fotogrāfijas, videoierakstus un audioierakstus, Signal nepieciešama atļauja pieejai pie Noliktavas, bet tā ir liegta. Dodieties uz lietotnes iestatījumu izvēlni, izvēlieties \"Atļaujas\" un iespējojiet opciju \"Krātuve\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal nepieciešama atļauja pieejai pie Kontaktiem, bet tā ir liegta. Dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas\" un iespējojiet \"Kontakti\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal nepieciešama atļauja pieejai pie atrašanās vietas pakalpojumiem, bet tā ir liegta. Dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas\" un iespējojiet \"Atrašanās vieta\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Lai pievienoto fotogrāfijas, videoierakstus un audioierakstus, Molly nepieciešama atļauja pieejai pie Noliktavas, bet tā ir liegta. Dodieties uz lietotnes iestatījumu izvēlni, izvēlieties \"Atļaujas\" un iespējojiet opciju \"Krātuve\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly nepieciešama atļauja pieejai pie Kontaktiem, bet tā ir liegta. Dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas\" un iespējojiet \"Kontakti\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly nepieciešama atļauja pieejai pie atrašanās vietas pakalpojumiem, bet tā ir liegta. Dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas\" un iespējojiet \"Atrašanās vieta\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Atļaujiet piekļuvi atrašanās vietai</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Lai nosūtītu atrašanās vietu:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Atļaujiet Signal piekļuvi jūsu atrašanās vietai, lai to nosūtītu citiem.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Atļaujiet Molly piekļuvi jūsu atrašanās vietai, lai to nosūtītu citiem.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal ir nepieciešama piekļuve jūsu atrašanās vietai, lai to būtu iespējams nosūtīt citiem.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly ir nepieciešama piekļuve jūsu atrašanās vietai, lai to būtu iespējams nosūtīt citiem.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Atļaujiet piekļuvi krātuvei</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Lai rādītu fotoattēlus un videoklipus:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal ir nepieciešama piekļuve krātuvei, lai rādītu jūsu fotoattēlus un videoklipus.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly ir nepieciešama piekļuve krātuvei, lai rādītu jūsu fotoattēlus un videoklipus.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">Lietotājs %1$s nav aktivizējis maksājumus </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Nomainīt kameru</string>
     <string name="CameraXFragment_open_gallery_description">Atvērt galeriju</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Atļaut piekļuvi</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Atļaujiet piekļuvi kamerai un mikrofonam</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Atļaujiet piekļuvi kamerai</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Atļaujiet piekļuvi mikrofonam</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Lai uzņemtu fotoattēlus, atļaujiet Signal piekļuvi kamerai.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Lai uzņemtu fotogrāfijas un video, ļaujiet Signal piekļūt kamerai.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Lai uzņemtu fotoattēlus un videoklipus, atļaujiet Signal piekļuvi kamerai un mikrofonam.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Lai ierakstītu videoklipus un skaņu, atļaujiet Signal piekļuvi mikrofonam.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Lai skenētu QR kodu, atļaujiet Signal piekļuvi kamerai.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Lai varētu uzņemtu fotoattēlus, Signal ir nepieciešama piekļuve kamerai</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Lai varētu skenēt QR kodus, Signal ir nepieciešama piekļuve kamerai</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Lai varētu uzņemt videoklipus, Signal ir nepieciešama piekļuve mikrofonam</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Lai uzņemtu fotoattēlus platformā Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Lai uzņemtu fotoattēlus un videoklipus platformā Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Lai uzņemtu videoklipus ar skaņu:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Lai skenētu QR kodus:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Pēdējie kontakti</string>
@@ -272,7 +273,7 @@
     <string name="CameraContacts_no_signal_contacts">Nav Signal kontaktu</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Jūs variet izmantot kameru tikai, lai sūtītu attēlus Signal kontaktiem. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Neatradāt, ko meklējāt?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Uzaicināt kontaktpersonu pievienoties Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Uzaicināt kontaktpersonu pievienoties Molly</string>
     <string name="CameraContacts__menu_search">Meklēt</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -286,12 +287,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Nē, paldies</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Atjaunināt Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Atjaunināt Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Šī lietotnes versija vairs netiek atbalstīta. Lai turpinātu sūtīt un saņemt ziņas, aktualizējiet uz pēdējo versiju.</string>
     <string name="ClientDeprecatedActivity_update">Atjaunināt</string>
     <string name="ClientDeprecatedActivity_dont_update">Neatjaunināt</string>
     <string name="ClientDeprecatedActivity_warning">Brīdinājums</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Jūsu Signal versijas lietošanas termiņš ir beidzies. Jūs varat aplūkot ziņu vēsturi, taču nevarēsiet nosūtīt vai saņemt ziņas, kamēr to neatjaunināsiet.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Jūsu Molly versijas lietošanas termiņš ir beidzies. Jūs varat aplūkot ziņu vēsturi, taču nevarēsiet nosūtīt vai saņemt ziņas, kamēr to neatjaunināsiet.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Neizdevās atrast interneta pārlūku.</string>
@@ -328,8 +329,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Ziņa %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly balss zvans %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly video zvans %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -425,7 +426,7 @@
     <string name="ConversationActivity_transport_signal">Signal ziņa</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Nosūtīt ziņu</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Pārslēdzamies uz Signal %1$s!</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Pārslēdzamies uz Molly %1$s!</string>
     <string name="ConversationActivity_specify_recipient">Lūdzu, izvēlieties kontaktu!</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Pielikuma izmērs pārsniedz ierobežojumu šāda veida ziņai, kuru sūtāt.</string>
     <string name="ConversationActivity_unable_to_record_audio">Neizdevās ierakstīt audio!</string>
@@ -444,18 +445,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Lai nosūtītu audio ziņas:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Lai nosūtītu balss ziņas, atļaujiet Signal piekļūt jūsu mikrofonam.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Lai nosūtītu balss ziņas, atļaujiet Molly piekļūt jūsu mikrofonam.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Lai ierakstītu balss ziņu, Signal ir nepieciešama piekļuve mikrofonam.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Lai nosūtītu audio ziņas, Signal nepieciešama atļauja pieejai mikrofonam, bet tā ir liegta. Dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas\" un iespējojiet \"Mikrofons\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Lai ierakstītu balss ziņu, Molly ir nepieciešama piekļuve mikrofonam.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Lai nosūtītu audio ziņas, Molly nepieciešama atļauja pieejai mikrofonam, bet tā ir liegta. Dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas\" un iespējojiet \"Mikrofons\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Lai zvanītu %1$s, Signal nepieciešama atļauja piekļuvei mikrofonam un kamerai, bet tā ir liegta. Dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas\" un iespējojiet \"Mikrofons\" un \"Kamera\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Lai uzņemtu fotogrāfijas un video, ļaujiet Signal piekļūt kamerai.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Lai uzņemtu fotogrāfijas vai video, Signal nepieciešama atļauja piekļūt kamerai, bet tā ir liegta. Dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas\" un iespējojiet \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Lai uzņemtu fotogrāfijas vai video, Signal nepieciešama atļauja piekļūt kamerai</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Lai zvanītu %1$s, Molly nepieciešama atļauja piekļuvei mikrofonam un kamerai, bet tā ir liegta. Dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas\" un iespējojiet \"Mikrofons\" un \"Kamera\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Lai uzņemtu fotogrāfijas un video, ļaujiet Molly piekļūt kamerai.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Lai uzņemtu fotogrāfijas vai video, Molly nepieciešama atļauja piekļūt kamerai, bet tā ir liegta. Dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas\" un iespējojiet \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Lai uzņemtu fotogrāfijas vai video, Molly nepieciešama atļauja piekļūt kamerai</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Ļaujiet Signal piekļūt mikrofonam, lai video tiktu ierakstīts ar skaņu.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal ir vajadzīgas mikrofona atļaujas video ierakstīšanai, taču tās tika liegtas. Lūdzu, dodieties uz lietotnes iestatījumiem, izvēlieties “Atļaujas” un iespējojiet “Mikrofons” un “Kamera”.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal nepieciešamas mikrofona atļaujas, lai ierakstītu video.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly ir vajadzīgas mikrofona atļaujas video ierakstīšanai, taču tās tika liegtas. Lūdzu, dodieties uz lietotnes iestatījumiem, izvēlieties “Atļaujas” un iespējojiet “Mikrofons” un “Kamera”.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly nepieciešamas mikrofona atļaujas, lai ierakstītu video.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Nē</string>
@@ -476,9 +477,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Lai uzsāktu zvanu:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Lai uzsāktu zvanu, atļaujiet Signal piekļūt jūsu mikrofonam.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Lai uzsāktu zvanu, atļaujiet Molly piekļūt jūsu mikrofonam.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Lai uzsāktu zvanu, Signal ir nepieciešama piekļuve mikrofonam.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Lai uzsāktu zvanu, Molly ir nepieciešama piekļuve mikrofonam.</string>
 
 
     <string name="ConversationActivity_join">Pievienoties</string>
@@ -492,9 +493,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Signal vairs netiek atbalstīta SMS ziņu sūtīšana. Uzaiciniet lietotāju %1$s izmantot Signal, lai turpinātu sarunu šeit.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Šī persona vairs neizmanto Signal. Lai turpinātu sarunāties šajā platformā, uzaiciniet šo personu izmantot Signal.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Šī persona vairs neizmanto Molly. Lai turpinātu sarunāties šajā platformā, uzaiciniet šo personu izmantot Molly.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Uzaicināt uz Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Uzaicināt uz Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Drīz vēlreiz saņemsiet atgādinājumu.</string>
 
@@ -554,6 +555,8 @@
     <string name="ConversationFragment_delete_for_everyone">Dzēst visiem</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Dzēst šajā ierīcē</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Dzēst</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Dzēst visur</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Šī ziņa tiks izdzēsta visiem sarunas dalībniekiem, ja viņi izmanto jaunāko Signal versiju. Dalībnieki varēs redzēt, ka ziņa ir dzēsta.</string>
@@ -585,13 +588,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Bloķēts</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Atjaunināt Signal</string>
+    <string name="ConversationFragment__update_build">Atjaunināt Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Atkārtoti reģistrēt Signal</string>
+    <string name="ConversationFragment__reregister_signal">Atkārtoti reģistrēt Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Pārvietoties atpakaļ.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Atvērt Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Atvērt Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Vairs nav verificēts</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -658,6 +661,12 @@
         <item quantity="one">Tiks neatgriezeniski dzēsta atlasītā saruna.</item>
         <item quantity="other">Tiks neatgriezeniski dzēstas visas %1$d atlasītās sarunas.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="zero">Visas %1$d atlasītās sarunas tiks neatgriezeniski dzēstas no visām jūsu ierīcēm.</item>
+        <item quantity="one">Atlasītā saruna tiks neatgriezeniski dzēsta no visām jūsu ierīcēm.</item>
+        <item quantity="other">Visas %1$d atlasītās sarunas tiks neatgriezeniski dzēstas no visām jūsu ierīcēm.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Dzēš</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="zero">Notiek atlasīto sarunu dzēšana…</item>
@@ -753,9 +762,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Kas var mani atrast pēc numura?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Ikviens, kuram ir jūsu tālruņa numurs, redzēs, ka izmantojat Signal, un varēs uzsākt ar jums sarunas.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Ikviens, kuram ir jūsu tālruņa numurs, redzēs, ka izmantojat Molly, un varēs uzsākt ar jums sarunas.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Neviens neredzēs, ka izmantojat Signal, izņemot tos, kuriem nosūtīsiet ziņu vai ar kuriem jau esat sarunājušies iepriekš.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Neviens neredzēs, ka izmantojat Molly, izņemot tos, kuriem nosūtīsiet ziņu vai ar kuriem jau esat sarunājušies iepriekš.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Atjaunot no rezerves kopijas?</string>
@@ -789,7 +798,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Pārbaudiet rezerves kopijas paroles frāzi, un pārliecinieties, ka tā sakrīt</string>
     <string name="BackupsPreferenceFragment__turn_on">Ieslēgt</string>
     <string name="BackupsPreferenceFragment__turn_off">Izslēgt</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Lai atjaunotu rezerves kopiju, instalējiet Signal no jauna. Atveriet lietotni un pieskarieties “Atjaunot rezerves kopiju”, pēc tam norādiet rezerves kopijas failu. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Lai atjaunotu rezerves kopiju, instalējiet Molly no jauna. Atveriet lietotni un pieskarieties “Atjaunot rezerves kopiju”, pēc tam norādiet rezerves kopijas failu. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Lasīt vairāk</string>
     <string name="BackupsPreferenceFragment__in_progress">Procesā…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -797,7 +806,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d līdz šim…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% līdz šim…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Lai izveidotu rezerves kopijas, Signal nepieciešama pieejas atļauja ārējai datu krātuvei, bet tā tiek pastāvīgi liegta. Lūdzu, dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas\" un iespējojiet \"Krātuve\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Lai izveidotu rezerves kopijas, Molly nepieciešama pieejas atļauja ārējai datu krātuvei, bet tā tiek pastāvīgi liegta. Lūdzu, dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas\" un iespējojiet \"Krātuve\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Dublēšanas laika iestatīšana</string>
 
@@ -864,7 +873,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Sarunas sesija atsvaidzināta</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal izmanto pilnīgu šifrēšanu, un, iespējams, dažreiz būs jāatsvaidzina jūsu sarunas sesija. Tas neietekmē jūsu sarunas drošību, taču, iespējams, esat palaiduši garām kādu šīs kontaktpersonas sūtītu ziņu un būs jālūdz nosūtīt to vēlreiz.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly izmanto pilnīgu šifrēšanu, un, iespējams, dažreiz būs jāatsvaidzina jūsu sarunas sesija. Tas neietekmē jūsu sarunas drošību, taču, iespējams, esat palaiduši garām kādu šīs kontaktpersonas sūtītu ziņu un būs jālūdz nosūtīt to vēlreiz.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Izmantojiet Signal datorā vai iPad. Ziņas tiks sinhronizētas jūsu saistītajās ierīcēs.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Piesaistīt jaunu ierīci</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Ziņas un sarunu informāciju aizsargā pilnīga šifrēšana visās ierīcēs</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal datorā vai iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Visas ziņas saistītajās ierīcēs ir privātas</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Molly ziņas tiek sinhronizētas ar Molly jūsu mobilajā tālrunī, kad tas tiek piesaistīts. Iepriekšējo ziņu vēsture netiks rādīta.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Lai instalētu Molly citā ierīcē, atveriet šo saiti: %1$s</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Manas saistītās ierīces</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Atsaistīt</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">Ierīce %1$s atsaistīta</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Notiek ierīces piesaistīšana…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Ierīce apstiprināta</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Notiek ielāde…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Nav saistītu ierīču</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Atbloķējiet ierīci, lai to saistītu</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Lai piesaistītu ierīci, noskenējiet QR kodu tās ekrānā.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Skenēt kvadrātkodu</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Ar šo ierīci skenējiet QR kodu, kas tiek rādīts ierīcē, ko vēlaties piesaistīt.</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Labi</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Šajā ierīcē varēs redzēt jūsu grupas un kontaktpersonas, piekļūt jūsu tērzēšanām un sūtīt ziņas jūsu vārdā.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Pabeidziet piesaistīšanu otrā ierīcē</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Pabeidziet Molly piesaistīšanu otrā ierīcē.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Neizdevās piesaistīt ierīci</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">QR kods nav derīgs. Pārliecinieties, vai skenējat to QR kodu, kas tiek parādīts piesaistāmajā ierīcē.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Mēģināt vēlreiz</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Atvienot \"%1$s\"</string>
@@ -886,10 +950,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimizē situācijai, kurā iztrūkst proprietārie Google Play pakalpojumi</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Šajā ierīcē nav Google Play pakalpojumu atbalsta. Pieskaries, lai atspējotu sistēmas baterijas optimizāciju, kas traucē Signal saņemt ziņas, kamēr tas ir neaktīvs.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Šajā ierīcē nav Google Play pakalpojumu atbalsta. Pieskaries, lai atspējotu sistēmas baterijas optimizāciju, kas traucē Molly saņemt ziņas, kamēr tas ir neaktīvs.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Šīs Signal versijas lietošanas termiņš ir beidzies. Lai nosūtītu un saņemtu ziņas, tā jānomaina ar jaunāku.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Šīs Molly versijas lietošanas termiņš ir beidzies. Lai nosūtītu un saņemtu ziņas, tā jānomaina ar jaunāku.</string>
     <string name="ExpiredBuildReminder_update_now">Aktualizēt tagad</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -901,8 +965,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Skatīt</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Signal sakaru permanenta kļūme!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal neizdevās reģistrēties Google Play pakalpojumos. Signal ziņas un zvani ir atspējoti. Lūdzu, mēģiniet vēlreiz piereģistrēties sadaļā Iestatījumi -&gt; Papildu.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Molly sakaru permanenta kļūme!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly neizdevās reģistrēties Google Play pakalpojumos. Molly ziņas un zvani ir atspējoti. Lūdzu, mēģiniet vēlreiz piereģistrēties sadaļā Iestatījumi -&gt; Papildu.</string>
 
 
     <!-- GiphyActivity -->
@@ -1054,20 +1118,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Atkļūdošanas žurnāli palīdz mums diagnosticēt un novērst problēmu, un tie nesatur identificējošu informāciju.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal radās problēma. Vai nosūtīt atkļūdošanas žurnālu?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly radās problēma. Vai nosūtīt atkļūdošanas žurnālu?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Paziņojumi var aizkavēties akumulatora optimizācijas dēļ</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Varat atspējot akumulatora optimizāciju lietotnei Signal, lai nodrošinātu, ka netiks aizkavēti paziņojumi par ziņām.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Varat atspējot akumulatora optimizāciju lietotnei Molly, lai nodrošinātu, ka netiks aizkavēti paziņojumi par ziņām.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Paziņojumi var aizkavēties akumulatora optimizācijas dēļ</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Atspējojiet akumulatora optimizāciju lietotnei Molly, lai pārliecinātos, ka saņemat ziņu paziņojumus. Lai skatītu instrukcijas konkrētām ierīcēm, pieskarieties pie \"Turpināt\".</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Nē, paldies</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Turpināt</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Turpināt</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Nerādīt</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Nē, paldies</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Neapstiprinātie grupu ielūgumi</string>
+    <string name="PendingMembersActivity_pending_group_invites">Pieprasījumi un uzaicinājumi</string>
     <string name="PendingMembersActivity_requests">Pieprasījumi</string>
     <string name="PendingMembersActivity_invites">Uzaicinājumi</string>
     <string name="PendingMembersActivity_people_you_invited">Jūsu ielūgumi</string>
@@ -1322,14 +1396,14 @@
     <string name="InviteActivity_cancel">Atcelt</string>
     <string name="InviteActivity_sending">Tiek sūtīts…</string>
     <string name="InviteActivity_invitations_sent">Uzaicinājums nosutīts</string>
-    <string name="InviteActivity_invite_to_signal">Uzaicināt uz Signal</string>
+    <string name="InviteActivity_invite_to_signal">Uzaicināt uz Molly</string>
     <string name="InviteActivity_send_sms">Sūtīt SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="zero">Sūtīt %1$dSMS ielūgumus?</item>
         <item quantity="one">Sūtīt %1$d SMS Ielūgumu?</item>
         <item quantity="other">Sūtīt %1$d SMS uzaicinājumus?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Pārejam uz Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Pārejam uz Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Izskatās, ka jums nav nevienas aplikācijas, caur kuru kopīgot.</string>
 
     <!-- LearnMoreTextView -->
@@ -1343,7 +1417,7 @@
     <string name="LongMessageActivity_your_message">Jūsu ziņa</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Fona savienojums iespējots</string>
 
     <!-- MediaOverviewActivity -->
@@ -1417,10 +1491,10 @@
     <string name="MessageQuotesBottomSheet_replies">Atbildes</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal zvana savienojuma izveide</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly zvana savienojuma izveide</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Tiek palaists Signal zvana pakalpojums</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Tiek apturēts Signal zvana pakalpojums</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Tiek palaists Molly zvana pakalpojums</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Tiek apturēts Molly zvana pakalpojums</string>
     <string name="NotificationBarManager__cancel_call">Atcelt zvanu</string>
 
     <!-- NotificationsMegaphone -->
@@ -1680,6 +1754,14 @@
     <string name="MessageRecord_you_activated_payments">Jūs aktivizējāt maksājumus</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s tagad var pieņemt maksājumus</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Maksājuma informācija nav pieejama</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Pieskarieties, lai redzētu vairāk</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Maksājuma informācija nav pieejama</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Šī maksājuma informācija nav pieejama, jo jūsu ziņas tika atjaunotas no avota, kas nesaturēja šī maksājuma vēsturi. Tas neietekmē jūsu maka atlikumu un iepriekšējo maksājumu statusu.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1738,9 +1820,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Drīzumā vairs nevarēsiet sūtīt SMS ziņas lietotnē Signal. Uzaiciniet lietotāju %1$s izmantot Signal, lai turpinātu sarunu šeit.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Lietotnē Signal vairs nav iespējams sūtīt SMS ziņas. Uzaiciniet lietotāju %1$s izmantot Signal, lai turpinātu sarunu šeit.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Lietotnē Molly vairs nav iespējams sūtīt SMS ziņas. Uzaiciniet lietotāju %1$s izmantot Molly, lai turpinātu sarunu šeit.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Maksājums: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Maksājums</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Atzīmēts kā surogātpasts</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1822,7 +1906,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Piesaistīt Signal ierīci?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Izskatās, ka jūs mēģināt piesaistīt Signal ierīci, izmantojot 3. puses skeneri. Jūsu drošībai, lūdzu, skenējiet kodu vēlreiz, izmantojot Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal ir nepieciešama piekļuve kamerai, lai skenētu kvadrātkodu, bet tai nav dotas šādas atļaujas. Dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas\" un iespējojiet \"Kamera\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly ir nepieciešama piekļuve kamerai, lai skenētu kvadrātkodu, bet tai nav dotas šādas atļaujas. Dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas\" un iespējojiet \"Kamera\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Nav iespējams skenēt kvadrātkodu bez kameras lietošanas atļaujas</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1836,11 +1920,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Ievadiet paroles frāzi</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal ikona</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly ikona</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Iesniegt paroles frāzi</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Nederīga paroles frāze!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Atbloķēt Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - bloķēt ekrānu</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Atbloķēt Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - bloķēt ekrānu</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Karte</string>
@@ -1908,7 +1992,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Pārbaudīt, lai turpinātu ziņapmaiņu</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Lai palīdzētu nepieļaut surogātpasta izplatīšanu Signal, lūdzu, pabeidziet pārbaudi.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Lai palīdzētu nepieļaut surogātpasta izplatīšanu Molly, lūdzu, pabeidziet pārbaudi.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Pēc verifikācijas varat turpināt ziņapmaiņu. Visas pauzētās ziņas tiks automātiski nosūtītas.</string>
 
     <!-- Recipient -->
@@ -1916,7 +2000,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Mans stāsts</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal audiozvans</string>
+    <string name="Recipient_signal_call">Molly audiozvans</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Bloķēt</string>
@@ -1930,7 +2014,8 @@
     <string name="RedPhone_ringing">Zvana…</string>
     <string name="RedPhone_busy">Aizņemts</string>
     <string name="RedPhone_recipient_unavailable">Adresāts nav pieejams</string>
-    <string name="RedPhone_network_failed">Tīkla kļūme!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Tīkla kļūme! Lūdzu, pārbaudiet tīkla savienojumu un mēģiniet vēlreiz.</string>
     <string name="RedPhone_number_not_registered">Numurs nav reģistrēts!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Numurs, uz kuru zvanījāt, neatbalsta drošu zvanu!</string>
     <string name="RedPhone_got_it">Skaidrs</string>
@@ -1941,8 +2026,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Pieskarieties, lai ieslēgtu video</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Lai zvanītu %1$s, Signal ir nepieciešama piekļuve jūsu kamerai</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Lai zvanītu %1$s, Molly ir nepieciešama piekļuve jūsu kamerai</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Zvana…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Savienojas vēlreiz…</string>
@@ -2002,10 +2087,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Noņemts no zvana</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Kāds jūs noņēma no zvana.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Atļaujiet piekļuvi kamerai un mikrofonam</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Atļaujiet piekļuvi mikrofonam</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Atļaujiet piekļuvi kamerai</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Lai uzsāktu zvanu vai pievienotos zvanam, ļaujiet Molly piekļūt kamerai un mikrofonam.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Lai uzsāktu zvanu vai pievienotos zvanam, ļaujiet Molly piekļūt mikrofonam.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Lai iespējotu video, ļaujiet Molly piekļūt kamerai.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Lai uzsāktu zvanu vai pievienotos zvanam, Molly ir nepieciešama atļauja piekļūt kamerai.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Lai varētu iespējot video, Molly ir nepieciešama piekļuve kamerai</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Lai uzsāktu zvanu vai pievienotos zvanam:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Lai iespējotu video:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal zvans</string>
-    <string name="WebRtcCallView__signal_video_call">Signal videozvans</string>
+    <string name="WebRtcCallView__signal_call">Molly zvans</string>
+    <string name="WebRtcCallView__signal_video_call">Molly videozvans</string>
     <string name="WebRtcCallView__start_call">Sākt zvanu</string>
     <string name="WebRtcCallView__join_call">Pievienoties zvanam</string>
     <string name="WebRtcCallView__call_is_full">Zvana dalībnieku limits izsmelts</string>
@@ -2100,23 +2205,44 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Nolaist roku?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Nolaist roku</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Nolaist</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Atcelt</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Jūs pacēlāt roku</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Skatīt</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s pacēla roku</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="zero">%1$s +%2$d pacēla roku</item>
+        <item quantity="one">%1$s +%2$d pacēla roku</item>
+        <item quantity="other">%1$s +%2$d pacēla roku</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s pacēla roku</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
         <item quantity="zero">%1$s +%2$d pacēla roku</item>
-        <item quantity="one">%1$s pacēla roku</item>
+        <item quantity="one">%1$s +%2$d pacēla roku</item>
         <item quantity="other">%1$s +%2$d pacēla roku</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="zero">%1$s +%2$d</item>
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="zero">%1$s +%2$d</item>
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
@@ -2213,7 +2339,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Jūs saņēmāt zvanu, lai verificētu šo numuru.</string>
     <string name="RegistrationActivity_edit_number">Rediģēt numuru</string>
     <string name="RegistrationActivity_missing_google_play_services">Jocīgi, trūkst izspiegojošo Google Play pakalpojumu</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Šajā ierīcei trūkst Google Play pakalpojumu. Jūs varat izmantot Signal, taču šī ierīces konfigurācija, iespējams, var pasliktināt uzticamību un veiktspēju.\n\nJa jūs neesat pieredzējis lietotājs, ierīcē neizmantojiet \"pēctirgus\" Android operētājsistēmu vai arī uzskatiet, ka šo paziņojumu redziet kļūdas pēc, lūdzu, sazinieties ar support@signal.org, lai saņemtu palīdzību.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Šajā ierīcei trūkst Google Play pakalpojumu. Jūs varat izmantot Molly, taču šī ierīces konfigurācija, iespējams, var pasliktināt uzticamību un veiktspēju.\n\nJa jūs neesat pieredzējis lietotājs, ierīcē neizmantojiet \"pēctirgus\" Android operētājsistēmu vai arī uzskatiet, ka šo paziņojumu redziet kļūdas pēc, lūdzu, sazinieties ar support@molly.im, lai saņemtu palīdzību.</string>
     <string name="RegistrationActivity_i_understand">Es saprotu</string>
     <string name="RegistrationActivity_play_services_error">Google Play pakalpojumu kļūme</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play pakalpojumi tiek aktualizēti vai īslaicīgi nav pieejami. Lūdzu, mēģiniet vēlreiz.</string>
@@ -2231,7 +2357,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Nestandarta numura formāts</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Izskatās, ka numurs, kuru ievadījāt (%1$s), ir nestandarta formātā.\n\nVai domājāt %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - tālruņa Numura Formāts</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - tālruņa Numura Formāts</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Pieprasīts zvans</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2266,8 +2392,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Vai jums ir problēmas ar reģistrāciju?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Pārbaudiet, vai tālrunim ir mobilā tīkla signāls, lai saņemtu īsziņu vai zvanu \n • Pārbaudiet, vai varat uz šo numuru saņemt tālruņa zvanu\n • Pārbaudiet, vai esat pareizi ievadījis tālruņa numuru.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Lai iegūtu vairāk informācijas, veiciet šīs problēmu novēršanas darbības vai sazinieties ar atbalstu</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Lai iegūtu plašāku informāciju, dodieties uz %1$s vai %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">šīs problēmu novēršanas darbības</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2305,13 +2431,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Pievienot kontaktiem</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Uzaicināt uz Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Uzaicināt uz Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal ziņa</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal zvans</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Pievienot kontaktiem</string>
-    <string name="SharedContactView_invite_to_signal">Uzaicināt uz Signal</string>
+    <string name="SharedContactView_invite_to_signal">Uzaicināt uz Molly</string>
     <string name="SharedContactView_message">Signal ziņa</string>
 
     <!-- SignalBottomActionBar -->
@@ -2442,11 +2568,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s ir kontakta %2$s tālruņa numurs</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal atjauninājums</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Ir pieejama jauna Signal versija. Pieskarieties, lai atjauninātu.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal atjaunināšana neizdevās</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly atjauninājums</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Ir pieejama jauna Molly versija. Pieskarieties, lai atjauninātu.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly atjaunināšana neizdevās</string>
     <string name="ApkUpdateNotifications_failed_general_body">Vēlāk mēģināsim vēlreiz.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal ir sekmīgi atjaunināts</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly ir sekmīgi atjaunināts</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Automātiski tika veikts atjauninājums uz versiju %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2518,7 +2644,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Mūsu Signal drošības numurs:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Izskatās, ka jums nav nevienas aplikācijas, caur kurām kopīgot.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Starpliktuvē netika atrasts drošības kods</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal ir nepieciešama piekļuve kamerai, lai skenētu kvadrātkodu, bet tā nav dota. Dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas\" un iespējojiet \"Kamera\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly ir nepieciešama piekļuve kamerai, lai skenētu kvadrātkodu, bet tā nav dota. Dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas\" un iespējojiet \"Kamera\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Nebija iespējams noskenēt kvadrātkodu bez kameras lietošanas atļaujas</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Lai skatītu %1$s drošības numuru, vispirms jums savstarpēji ir jāapmainās ar ziņām.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2548,14 +2674,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Pieskarieties, lai atvērtu.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal ir atslēgts</string>
-    <string name="KeyCachingService_lock">Noslēgt Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly ir atslēgts</string>
+    <string name="KeyCachingService_lock">Noslēgt Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Jūs</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Neatbalstīts faila tips</string>
     <string name="MediaPreviewActivity_draft">Melnraksts</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal ir nepieciešama pieejas atļauja krātuvei, lai varētu saglabāt datus ārējā krātuvē, bet tā tiek pastāvīgi liegta. Dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas\" un iespējojiet \"Krātuve\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly ir nepieciešama pieejas atļauja krātuvei, lai varētu saglabāt datus ārējā krātuvē, bet tā tiek pastāvīgi liegta. Dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas\" un iespējojiet \"Krātuve\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Nav iespējams saglabāt ārējā krātuvē bez atļaujas.</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Izdzēst ziņu?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Šis neatgriezeniski izdzēsīs ziņu.</string>
@@ -2601,7 +2727,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Neizdevās piegādāt ziņu.</string>
     <string name="MessageNotifier_error_delivering_message">Kļūda piegādājot ziņu.</string>
     <string name="MessageNotifier_message_delivery_paused">Ziņas piegāde pauzēta.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Pārbaudiet, lai turpinātu ziņapmaiņu lietotnē Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Pārbaudiet, lai turpinātu ziņapmaiņu lietotnē Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Atzīmēt visas kā lasītas</string>
     <string name="MessageNotifier_mark_read">Atzīmēt kā lasītu</string>
     <string name="MessageNotifier_turn_off_these_notifications">Izslēgt šos paziņojumus</string>
@@ -2623,7 +2749,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Reakcija uz jūsu uzlīmi: %1$s.</string>
     <string name="MessageNotifier_this_message_was_deleted">Ziņojums ir izdzēsts.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Vai izslēgt paziņojumus par kontaktpersonām, kas sākušās lietot Signal? Paziņojumus var atkal iespējot sadaļā Signal &gt; Iestatījumi &gt; Paziņojumi.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Vai izslēgt paziņojumus par kontaktpersonām, kas sākušās lietot Molly? Paziņojumus var atkal iespējot sadaļā Molly &gt; Iestatījumi &gt; Paziņojumi.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2662,7 +2788,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Ātrās atbildes nav pieejamas, kad Signal ir bloķēts!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Ātrās atbildes nav pieejamas, kad Molly ir bloķēts!</string>
     <string name="QuickResponseService_problem_sending_message">Problēma sūtot ziņu!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2682,7 +2808,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Nepareiza saīsne</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Jauna ziņa</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Ziņas pieprasījums</string>
     <string name="SingleRecipientNotificationBuilder_you">Jūs</string>
@@ -2729,7 +2855,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Šī ierīce vairs nav reģistrēta. Iespējams, ka reģistrējāt tālruņa numuru lietotnē Signal citā ierīcē.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Šī ierīce vairs nav reģistrēta. Iespējams, ka reģistrējāt tālruņa numuru lietotnē Molly citā ierīcē.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Atkārtoti reģistrēt ierīci</string>
 
@@ -2742,10 +2868,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Lai atbildētu uz zvanu, atļaujiet Signal piekļūt jūsu mikrofonam.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Lai atbildētu uz zvanu, atļaujiet Molly piekļūt jūsu mikrofonam.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Lai atbildētu uz video zvanu, atļaujiet Signal piekļūt jūsu mikrofonam un kamerai.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal nepieciešama atļauja piekļuvei mikrofonam un kamerai, lai zvanītu un saņemtu zvanus, bet tā nav dota. Dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas\" un iespējojiet \"Mikrofons\" un \"Kamera\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Lai atbildētu uz video zvanu, atļaujiet Molly piekļūt jūsu mikrofonam un kamerai.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly nepieciešama atļauja piekļuvei mikrofonam un kamerai, lai zvanītu un saņemtu zvanus, bet tā nav dota. Dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas\" un iespējojiet \"Mikrofons\" un \"Kamera\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Atbildēts no savienotās ierīces</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Atteikts no savienotās ierīces.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Aizņemts no savienotās ierīces.</string>
@@ -2790,16 +2916,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Atkārtot jauno paroli</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Uzaicināt uz Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Uzaicināt uz Molly</string>
     <string name="contact_selection_activity__new_group">Jauna grupa</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Atsvaidzināt kontaktus</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Kāda pietrūkst? Mēģiniet atsvaidzināt</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Atrodiet pazīstamas personas platformā Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Atļaujiet piekļuvi kontaktpersonām</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Vēl</string>
 
@@ -2816,7 +2942,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Kontakta attēls</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Lai parādītu Jūsu kontaktus, Signal ir nepieciešama piekļuve kontaktiem, bet tā nav dota. Dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas“ un iespējojiet \"Kontakti\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Lai parādītu Jūsu kontaktus, Molly ir nepieciešama piekļuve kontaktiem, bet tā nav dota. Dodieties uz lietotnes iestatījumiem, izvēlieties \"Atļaujas“ un iespējojiet \"Kontakti\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Kļūda, ielādējot kontaktus, pārbaudiet ierīces tīkla savienojumu.</string>
     <string name="ContactSelectionListFragment_username_not_found">Lietotājvārds netika atrasts</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" nav Signal lietotājs. Lūdzu, pārbaudiet, vai lietotājvārds uzrakstīts pareizi."</string>
@@ -2835,16 +2961,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Atrast pēc lietotājvārda</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Atļaujiet piekļuvi kontaktpersonām</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Lai atrastu pazīstamas personas platformā Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Atļaut piekļuvi</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Nē, paldies</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Atļaujiet piekļuvi kontaktpersonām. Jūsu kontaktpersonas tiek šifrētas un nav redzamas pakalpojumam Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal nepieciešama pieeja jūsu kontaktiem, lai varētu tos parādīt.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly nepieciešama pieeja jūsu kontaktiem, lai varētu tos parādīt.</string>
     <string name="contact_selection_list_fragment__show_contacts">Rādīt kontaktpersonas</string>
 
     <!-- contact_selection_list_item -->
@@ -2919,6 +3047,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Jūs esat noņēmis šo personu. Vēlreiz nosūtot ziņojumu, tā tiks pievienota atpakaļ jūsu sarakstam.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Iespējas</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Aktualizēt</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Atskaņot … Pauzēt</string>
@@ -2947,7 +3077,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Sarunu burbuļi ir Android iezīme, kuru jūs varat aslēgt Signal sarunām.</string>
+    <string name="BubbleOptOutTooltip__description">Sarunu burbuļi ir Android iezīme, kuru jūs varat aslēgt Molly sarunām.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Ne tagad</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3122,9 +3252,9 @@
     <string name="EditProfileFragment__group_description">Grupas apraksts</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Atjaunināt Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Atjaunināt Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Šī Signal versija ir novecojusi. Atjauniniet to, lai turpinātu izmantot Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Šī Molly versija ir novecojusi. Atjauniniet to, lai turpinātu izmantot Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Aktualizēt</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3342,7 +3472,7 @@
     <string name="preferences__slow">Lēns</string>
     <string name="preferences__help">Palīdzība</string>
     <string name="preferences__advanced">Papildu</string>
-    <string name="preferences__donate_to_signal">Ziedot Signal</string>
+    <string name="preferences__donate_to_signal">Ziedot Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Privātums</string>
     <!-- Preference label for stories -->
@@ -3379,13 +3509,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Mainīt lietotnes ikonu un nosaukumu uz \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Lai mainītu lietotnes ikonu un nosaukumu, Signal būs jāaizver. Paziņojumos vienmēr tiks rādīta Signal noklusējuma ikona un nosaukums.</string>
+    <string name="preferences__app_icon_dialog_description">Lai mainītu lietotnes ikonu un nosaukumu, Molly būs jāaizver. Paziņojumos vienmēr tiks rādīta Molly noklusējuma ikona un nosaukums.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Atlasiet lietotnes ikonu un nosaukumu, kas būs redzams tālruņa sākuma ekrānā un lietotņu panelī. Paziņojumos vienmēr tiks rādīta Signal noklusējuma ikona un nosaukums. Lasīt vairāk</string>
+    <string name="preferences__app_icon_warning_learn_more">Atlasiet lietotnes ikonu un nosaukumu, kas būs redzams tālruņa sākuma ekrānā un lietotņu panelī. Paziņojumos vienmēr tiks rādīta Molly noklusējuma ikona un nosaukums. Lasīt vairāk</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Lietotņu ikonas un nosaukumi ir redzami sākuma ekrānā un lietotņu panelī.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Paziņojumos vienmēr tiks rādīta Signal noklusējuma ikona un nosaukums.</string>
+    <string name="preferences__app_icon_notification_warning">Paziņojumos vienmēr tiks rādīta Molly noklusējuma ikona un nosaukums.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Lasīt vairāk</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3433,8 +3563,12 @@
         <item quantity="other">Tiks saīsināta visu sarunu vēsture un tiks paturētas tikai %1$s jaunākās ziņas.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Tādējādi no jūsu ierīces tiks neatgriezeniski dzēsta visa ziņu vēsture un multivides saturs.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Pabeidzot šo darbību, no jūsu ierīces un visām saistītajām ierīcēm tiks neatgriezeniski dzēsta visa ziņu vēsture un multivides saturs.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Vai tiešām vēlaties dzēst visu ziņu vēsturi?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Visu ziņu vēsture tiks neatgriezeniski dzēsta. Šo darbību nevar atsaukt.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">No visām ierīcēm tiks neatgriezeniski dzēsta visa ziņu vēsture. Šo darbību nevar atsaukt.</string>
     <string name="preferences_storage__delete_all_now">Izdzēst visas tagad</string>
     <string name="preferences_storage__forever">Uz visiem laikiem</string>
     <string name="preferences_storage__one_year">1 gadu</string>
@@ -3472,7 +3606,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Cenzūras apiešana</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Cenzūras apiešana</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Ja šī funkcija ir iespējota, Signal mēģinās apiet cenzūru. Neieslēdziet šo funkciju, ja atrodaties vietā, kur Signal tiek cenzēta.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Ja šī funkcija ir iespējota, Molly mēģinās apiet cenzūru. Neieslēdziet šo funkciju, ja atrodaties vietā, kur Molly tiek cenzēta.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Cenzūras apiešana ir aktivizēta, pamatojoties uz jūsu konta tālruņa numuru.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3524,7 +3658,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Jauna funkcija: maksājumi</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Izmantojiet lietotni Signal, lai nosūtītu un saņemtu MobileCoin — jaunu, uz privātumu vērstu digitālo valūtu. Aktivizējiet, lai sāktu.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Izmantojiet lietotni Molly, lai nosūtītu un saņemtu MobileCoin — jaunu, uz privātumu vērstu digitālo valūtu. Aktivizējiet, lai sāktu.</string>
     <string name="PaymentsHomeFragment__activate_payments">Aktivizēt maksājumus</string>
     <string name="PaymentsHomeFragment__activating_payments">Tiek aktivizēti maksājumi…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Atjaunot maksājumu kontu</string>
@@ -3550,7 +3684,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Maksājumi jūsu reģionā nav pieejami.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Nevarējām iespējot maksājumus. Mēģiniet vēlāk.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Deaktivēt maksājumus?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Deaktivizējot maksājumus, jūs nevarēsiet nosūtīt vai saņemt MobileCoin lietotnē Signal.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Deaktivizējot maksājumus, jūs nevarēsiet nosūtīt vai saņemt MobileCoin lietotnē Molly.</string>
     <string name="PaymentsHomeFragment__deactivate">Deaktivēt</string>
     <string name="PaymentsHomeFragment__continue">Turpināt</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Atlikums pašlaik nav pieejams.</string>
@@ -3559,10 +3693,10 @@
     <string name="PaymentsHomeFragment__details">Rekvizīti</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Lietotni Signal var izmantot, lai nosūtītu un saņemtu MobileCoin. Uz visiem maksājumiem attiecas MobileCoin un MobileCoin Wallet lietošanas noteikumi. Var rasties dažas problēmas, un maksājumus vai atlikumus, kurus iespējams zaudēt, nevar atgūt. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Lietotni Molly var izmantot, lai nosūtītu un saņemtu MobileCoin. Uz visiem maksājumiem attiecas MobileCoin un MobileCoin Wallet lietošanas noteikumi. Var rasties dažas problēmas, un maksājumus vai atlikumus, kurus iespējams zaudēt, nevar atgūt. </string>
     <string name="PaymentsHomeFragment__activate">Aktivēt</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Skatīt MobileCoin lietošanas noteikumus</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Maksājumu opcija lietotnē Signal vairs nav pieejama. Jūs joprojām varat pārskaitīt līdzekļus uz biržu, bet vairs nevarat nosūtīt un saņemt maksājumus vai pievienot līdzekļus.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Maksājumu opcija lietotnē Molly vairs nav pieejama. Jūs joprojām varat pārskaitīt līdzekļus uz biržu, bet vairs nevarat nosūtīt un saņemt maksājumus vai pievienot līdzekļus.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3590,7 +3724,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Sniegt atļaujas</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Lai jūs varētu nosūtīt ziņas cilvēkiem, kurus pazīstat, Signal pieprasīs šīs atļaujas. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Lai jūs varētu nosūtīt ziņas cilvēkiem, kurus pazīstat, Molly pieprasīs šīs atļaujas. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Paziņojumi</string>
     <!-- Notifications permission row description -->
@@ -3678,10 +3812,10 @@
     <string name="PaymentsTransferFragment__next">Tālāk</string>
     <string name="PaymentsTransferFragment__invalid_address">Nederīga adrese</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Pārbaudiet naudas maka adresi, uz kuru mēģināt pārsūtīt, un mēģiniet vēlreiz.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Jūs nevarat veikt pārskaitījumu uz savu Signal naudas maka adresi. Ievadiet naudas maka adresi no sava konta atbalstītā biržā.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Lai skenētu kvadrātkodu, lietotnei Signal ir nepieciešama piekļuve kamerai.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Lai uzņemtu fotoattēlus vai video, lietotnei Signal ir nepieciešama atļauja piekļūt kamerai. Atveriet iestatījumus, atlasiet Atļaujas un iespējojiet Kamera.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Lai skenētu kvadrātkodu, lietotnei Signal ir nepieciešama piekļuve kamerai.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Jūs nevarat veikt pārskaitījumu uz savu Molly naudas maka adresi. Ievadiet naudas maka adresi no sava konta atbalstītā biržā.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Lai skenētu kvadrātkodu, lietotnei Molly ir nepieciešama piekļuve kamerai.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Lai uzņemtu fotoattēlus vai video, lietotnei Molly ir nepieciešama atļauja piekļūt kamerai. Atveriet iestatījumus, atlasiet Atļaujas un iespējojiet Kamera.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Lai skenētu kvadrātkodu, lietotnei Molly ir nepieciešama piekļuve kamerai.</string>
     <string name="PaymentsTransferFragment__settings">Iestatījumi</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -4038,17 +4172,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Ienākošs Signal balss zvans</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Ienākošs Molly balss zvans</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Ienākošs Signal video zvans</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Ienākošs Molly video zvans</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Ienākošs Signal grupas zvans</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Ienākošs Molly grupas zvans</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Aktīvs Signal balss zvans</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Aktīvs Molly balss zvans</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Aktīvs Signal video zvans</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Aktīvs Molly video zvans</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Aktīvs Signal grupas zvans</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Aktīvs Molly grupas zvans</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Notiek ielāde…</string>
@@ -4095,9 +4229,9 @@
     <string name="BackupDialog_verify">Pārbaudīt</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Jūs sekmīgi ievadījāt rezerves ieejas paroli</string>
     <string name="BackupDialog_passphrase_was_not_correct">Parole nav pareiza</string>
-    <string name="LocalBackupJob_creating_signal_backup">Veido Signal rezerves kopiju…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Veido Molly rezerves kopiju…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Tiek pārbaudīta Signal rezerves kopija…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Tiek pārbaudīta Molly rezerves kopija…</string>
     <string name="LocalBackupJobApi29_backup_failed">Rezerves kopēšana neizdevās</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Jūsu rezerves kopiju direktorijs ir dzēsts vai pārvietots.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Jūsu rezerves kopijas fails ir pārāk liels saglabāšanai šajā vietā.</string>
@@ -4112,15 +4246,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Piezvaniet man (%1$02d.%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Atkārtoti nosūtīt kodu (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Sazināties ar Signal tehnisko atbalstu</string>
-    <string name="RegistrationActivity_code_support_subject">Signal reģistrācija - Android ierīces verifikācijas kods</string>
+    <string name="RegistrationActivity_contact_signal_support">Sazināties ar Molly tehnisko atbalstu</string>
+    <string name="RegistrationActivity_code_support_subject">Molly reģistrācija - Android ierīces verifikācijas kods</string>
     <string name="RegistrationActivity_incorrect_code">Nepareizs kods</string>
     <string name="BackupUtil_never">Nekad</string>
     <string name="BackupUtil_unknown">Nezināms</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Tālruņa numurs</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Izvēlieties, kas var redzēt jūsu tālruņa numuru un kas var ar jums sazināties lietotnē Signal, izmantojot to.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Izvēlieties, kas var redzēt jūsu tālruņa numuru un kas var ar jums sazināties lietotnē Molly, izmantojot to.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Kas var redzēt manu numuru</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4168,7 +4302,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Pārāk daudz mēģinājumu. Vēlāk mēģiniet vēlreiz.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Nebija iespējams savienoties ar pakalpojumu!</string>
     <string name="preferences_chats__backups">Rezerves kopijas</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal ir slēgts</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly ir slēgts</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">PIESKARIETIES, LAI ATBLOĶĒTU</string>
     <string name="Recipient_unknown">Nezināms</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4199,9 +4333,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Jums ir nepieciešama piekļuve vecajai ierīcei.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Atjaunot no rezerves kopijas</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Atjaunojiet ziņas no lokālas rezerves kopijas. Ja neatjaunosiet tagad, vēlāk to vairs nebūs iespējams izdarīt.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Lokālās rezerves kopijas atjaunošana</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signal rezerves kopijas atjaunošana</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Atjaunojiet visas teksta ziņas un pēdējo 30 dienu multivides saturu</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Papildu iespējas</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Atcelt</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Pieteikšanās, nepārsūtot datus</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Turpiniet, nepārsūtot ziņas un multivides saturu</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Atvērt Signal vecajā Android ierīcē</string>
     <string name="NewDeviceTransferInstructions__continue">Turpināt</string>
@@ -4216,19 +4357,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Gatavojas savienojuma izveidei ar veco Android ierīci…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Brīdi uzgaidiet, drīz viss būs kārtībā</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Gaida savienojumu ar veco Android ierīci…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Lietotnei Signal ir nepieciešama atrašanās vietas atļauja, lai atrastu veco Android ierīci un izveidotu ar to savienojumu.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Lietotnē Signal ir jābūt iespējotiem atrašanās vietas pakalpojumiem, lai atrastu veco Android ierīci un izveidotu ar to savienojumu.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Lietotnē Signal ir jāieslēdz Wi-Fi, lai varētu noteikt veco Android ierīci un izveidot ar to savienojumu. Wi-Fi ir jābūt ieslēgtam, bet ierīcei nav jābūt pievienotai Wi-Fi tīklam.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Diemžēl šķiet, ka šī ierīce neatbalsta Wi-Fi Direct. Lietotne Signal izmanto Wi-Fi Direct, lai noteiktu veco Android ierīci un izveidotu ar to savienojumu. Joprojām varat atjaunot rezerves kopiju konta atjaunošanai no vecās Android ierīces.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Lietotnei Molly ir nepieciešama atrašanās vietas atļauja, lai atrastu veco Android ierīci un izveidotu ar to savienojumu.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Lietotnē Molly ir jābūt iespējotiem atrašanās vietas pakalpojumiem, lai atrastu veco Android ierīci un izveidotu ar to savienojumu.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Lietotnē Molly ir jāieslēdz Wi-Fi, lai varētu noteikt veco Android ierīci un izveidot ar to savienojumu. Wi-Fi ir jābūt ieslēgtam, bet ierīcei nav jābūt pievienotai Wi-Fi tīklam.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Diemžēl šķiet, ka šī ierīce neatbalsta Wi-Fi Direct. Lietotne Molly izmanto Wi-Fi Direct, lai noteiktu veco Android ierīci un izveidotu ar to savienojumu. Joprojām varat atjaunot rezerves kopiju konta atjaunošanai no vecās Android ierīces.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Atjaunot rezerves kopiju</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Mēģinot izveidot savienojumu ar veco Android ierīci, radās neparedzēta kļūda.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Meklē jauno Android ierīci…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Lietotnei Signal ir nepieciešama atrašanās vietas atļauja, lai atrastu jauno Android ierīci un izveidotu ar to savienojumu.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Lietotnē Signal ir jābūt iespējotiem atrašanās vietas pakalpojumiem, lai atrastu jauno Android ierīci un izveidotu ar to savienojumu.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Lietotnē Signal ir jāieslēdz Wi-Fi, lai varētu noteikt jauno Android ierīci un izveidot ar to savienojumu. Wi-Fi ir jābūt ieslēgtam, bet ierīcei nav jābūt pievienotai Wi-Fi tīklam.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Diemžēl šķiet, ka šī ierīce neatbalsta Wi-Fi Direct. Lietotne Signal izmanto Wi-Fi Direct, lai atrastu jauno Android ierīci un izveidotu ar to savienojumu. Joprojām varat izveidot rezerves kopiju konta atjaunošanai jaunajā Android ierīcē.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Lietotnei Molly ir nepieciešama atrašanās vietas atļauja, lai atrastu jauno Android ierīci un izveidotu ar to savienojumu.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Lietotnē Molly ir jābūt iespējotiem atrašanās vietas pakalpojumiem, lai atrastu jauno Android ierīci un izveidotu ar to savienojumu.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Lietotnē Molly ir jāieslēdz Wi-Fi, lai varētu noteikt jauno Android ierīci un izveidot ar to savienojumu. Wi-Fi ir jābūt ieslēgtam, bet ierīcei nav jābūt pievienotai Wi-Fi tīklam.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Diemžēl šķiet, ka šī ierīce neatbalsta Wi-Fi Direct. Lietotne Molly izmanto Wi-Fi Direct, lai atrastu jauno Android ierīci un izveidotu ar to savienojumu. Joprojām varat izveidot rezerves kopiju konta atjaunošanai jaunajā Android ierīcē.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Izveidot rezerves kopiju</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Mēģinot izveidot savienojumu ar jauno Android ierīci, radās neparedzēta kļūda.</string>
 
@@ -4269,7 +4410,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Notiek datu pārsūtīšana</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Turiet abas ierīces tuvu vienu otrai. Neslēdziet ārā nevienu no ierīcēm un neaizveriet lietotni Signal. Pārsūtīšana ir pilnībā šifrēta.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Turiet abas ierīces tuvu vienu otrai. Neslēdziet ārā nevienu no ierīcēm un neaizveriet lietotni Molly. Pārsūtīšana ir pilnībā šifrēta.</string>
     <string name="DeviceTransfer__d_messages_so_far">Pagaidām %1$d ziņas…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% no ziņām līdz šim…</string>
@@ -4283,7 +4424,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Pārnest kontu</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Lejupielādēt Signal jaunajā Android ierīcē</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Lejupielādēt Molly jaunajā Android ierīcē</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Pieskarieties pie Pārsūtīt vai atjaunot kontu"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4357,7 +4498,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Ikviens ar šo saiti var skatīt grupas nosaukumu un fotoattēlu un nosūtīt pieprasījumu tai pievienoties. Nosūtiet šo saiti tikai cilvēkiem, kuriem uzticaties.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Ikviens ar šo saiti var skatīt grupas nosaukumu un fotoattēlu un pievienoties šai grupai. Nosūtiet šo saiti tikai cilvēkiem, kuriem uzticaties.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Kopīgot, izmantojot Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Kopīgot, izmantojot Molly</string>
     <string name="GroupLinkBottomSheet_copy">Kopēt</string>
     <string name="GroupLinkBottomSheet_qr_code">Kvadrātkods</string>
     <string name="GroupLinkBottomSheet_share">Kopīgot</string>
@@ -4550,7 +4691,7 @@
     <string name="payment_info_card_about_mobilecoin">Par MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin ir jauna uz privātumu vērsta digitālā valūta.</string>
     <string name="payment_info_card_adding_funds">Līdzekļu papildināšana</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Naudas līdzekļus izmantošanai lietotnē Signal varat pievienot, nosūtot MobileCoin uz sava naudas maka adresi.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Naudas līdzekļus izmantošanai lietotnē Molly varat pievienot, nosūtot MobileCoin uz sava naudas maka adresi.</string>
     <string name="payment_info_card_cashing_out">Naudas izmaksa</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Jūs varat izņemt MobileCoin jebkurā laikā biržā, kas atbalsta MobileCoin. Vienkārši veiciet pārskaitījumu uz savu kontu attiecīgajā biržā.</string>
     <string name="payment_info_card_hide_this_card">Vai paslēpt šo karti?</string>
@@ -4571,12 +4712,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Deaktivizēt naudas maku</string>
     <string name="DeactivateWalletFragment__your_balance">Jūsu atlikums</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Pirms maksājumu deaktivizēšanas ieteicams pārskaitīt līdzekļus uz citu naudas maka adresi. Ja izvēlēsieties nepārskaitīt savus līdzekļus tūlīt, tie paliks ar lietotni Signal saistītajā naudas makā, ja atkārtoti aktivizēsiet maksājumus.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Pirms maksājumu deaktivizēšanas ieteicams pārskaitīt līdzekļus uz citu naudas maka adresi. Ja izvēlēsieties nepārskaitīt savus līdzekļus tūlīt, tie paliks ar lietotni Molly saistītajā naudas makā, ja atkārtoti aktivizēsiet maksājumus.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Pārskaitīt atlikumu</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Deaktivizēt, neveicot pārskaitīšanu</string>
     <string name="DeactivateWalletFragment__deactivate">Deaktivēt</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Vai deaktivizēt, neveicot pārskaitīšanu?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Ja izvēlēsieties atkārtoti aktivizēt maksājumus, atlikums paliks jūsu ar lietotni Signal saistītajā naudas makā.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Ja izvēlēsieties atkārtoti aktivizēt maksājumus, atlikums paliks jūsu ar lietotni Molly saistītajā naudas makā.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Naudas maka deaktivizēšanas kļūda.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4873,7 +5014,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licences</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Noteikumi &amp; privātuma politika</string>
-    <string name="HelpFragment__copyright_signal_messenger">Autortiesības Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Autortiesības Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Licencēta saskaņā ar GPLv3 AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4888,7 +5029,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">Automātiski</string>
+    <string name="ChatColorSelectionFragment__auto">Autom.</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Lietot pielāgotas krāsas</string>
     <string name="ChatColorSelectionFragment__chat_color">Sarunas krāsa</string>
     <string name="ChatColorSelectionFragment__edit">Rediģēt</string>
@@ -5117,9 +5258,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Atlasīt krāsu</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Kopīgot</string>
 
@@ -5157,7 +5295,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Tikai administratori drīkst sūtīt ziņas uz šo grupu.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Sasniegts ierobežojums</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Nav iespējams atlasīt vairāk par 5 sarunām.</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5336,9 +5475,9 @@
     <string name="MySupportPreference__learn_more">Uzzināt vairāk</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Atjaunināt Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Atjaunināt Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Šī Signal versija ir novecojusi. Atjauniniet to, lai turpinātu izmantot Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Šī Molly versija ir novecojusi. Atjauniniet to, lai turpinātu izmantot Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Aktualizēt</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5347,7 +5486,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Ierīce nav reģistrēta</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Šī ierīce vairs nav reģistrēta. Reģistrējiet atkārtoti, lai turpinātu izmantot Signal šajā ierīcē.</string>
+    <string name="ReregisterSignalDialog__message">Šī ierīce vairs nav reģistrēta. Reģistrējiet atkārtoti, lai turpinātu izmantot Molly šajā ierīcē.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Atkārtoti reģistrēties</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5641,7 +5780,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Neizdevās atvērt atlasītāju.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Lai iespējotu paziņojumus, Signal ir nepieciešama atļauja tos rādīt.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Lai iespējotu paziņojumus, Molly ir nepieciešama atļauja tos rādīt.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Ieslēgt</string>
 
@@ -5793,8 +5932,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Vēl nav atbilžu</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Jūs nevarat atbildēt uz šo stāstu, jo vairs neesat šīs grupas dalībnieks.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Reaģēja uz stāstu</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Reaģēja uz stāstu</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Reaģēja uz stāstu</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Skatījumi</string>
     <!-- Label for story replies tab -->
@@ -6428,8 +6569,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Izvēlieties savu banku</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Apstipriniet ziedojumu: %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Lai iestatītu regulāro ziedojumu, pieskarieties pie \"Turpināt\", lai apstiprinātu 0,01 € iekasēšanu no jūsu bankas konta. Šī summa jums tiks automātiski atmaksāta, un šī darbība ir nepieciešama, lai atļautu 5 € ikmēneša ziedojuma iekasēšanu no jūsu konta.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Lai iestatītu regulāro ziedojumu, pieskarieties pie \"Turpināt\", lai apstiprinātu 0,01 € iekasēšanu no jūsu bankas konta. Maksājums jums tiks automātiski atgriezts. Šī darbība ir nepieciešama, lai atļautu ikmēneša ziedojuma %1$s apmērā iekasēšanu no jūsu konta.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Turpināt</string>
 
@@ -7012,6 +7153,54 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Lejupielādē rezerves kopijas datus…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Multivides rezerves kopiju izveidošana ir izslēgta</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="zero">Jūsu Signal multivides rezerves kopiju plāns tika atcelts, jo nevarējām apstrādāt maksājumu. Jums ir %1$d dienas laika, lai lejupielādētu multivides rezerves kopiju. Pēc %1$d d. multivides rezerves kopija tiks dzēsta.</item>
+        <item quantity="one">Jūsu Signal multivides rezerves kopiju plāns tika atcelts, jo nevarējām apstrādāt maksājumu. Jums ir %1$d diena laika, lai lejupielādētu multivides rezerves kopiju. Pēc %1$d d. multivides rezerves kopija tiks dzēsta.</item>
+        <item quantity="other">Jūsu Signal multivides rezerves kopiju plāns tika atcelts, jo nevarējām apstrādāt maksājumu. Jums ir %1$d dienas laika, lai lejupielādētu multivides rezerves kopiju. Pēc %1$d d. multivides rezerves kopija tiks dzēsta.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Lai turpinātu multivides rezerves kopiju izveidošanu, jebkurā brīdī varat atsākt maksājumu veikšanu. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Multivide tiks dzēsta šodien</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Jūsu Signal multivides rezerves kopiju plāns tika atcelts, jo nevarējām apstrādāt maksājumu. Šī ir jūsu pēdējā iespēja lejupielādēt multivides rezerves kopiju, pirms tā tiks dzēsta.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Nevar pabeigt lejupielādēšanu</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Jūsu ierīces krātuvē nav pietiekami daudz brīvas vietas. Lai lejupielādētu multivides rezerves kopiju, atbrīvojiet vietu (līdz %1$s).</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="zero">Izvēloties \"Izlaist\", multivides rezerves kopija tiks dzēsta pēc %1$d dienām.</item>
+        <item quantity="one">Izvēloties \"Izlaist\", multivides rezerves kopija tiks dzēsta pēc %1$d dienas.</item>
+        <item quantity="other">Izvēloties \"Izlaist\", multivides rezerves kopija tiks dzēsta pēc %1$d dienām.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Nevar apstrādāt rezerves kopiju maksājumu</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Mums neizdodas iekasēt regulāro maksājumu par ikmēneša rezerves kopiju izveidi. Pārliecinieties, ka maksājuma veids ir atjaunināts. Ja nav, atjauniniet to Google Pay. Signal mēģinās apstrādāt maksājumu vēlreiz pēc dažām dienām.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Neizdevās izveidot rezerves kopiju</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Jūsu ierīce nav izveidojusi rezerves kopiju jau %1$d d. Pārliecinieties, ka ierīce ir savienota ar Wi-Fi, un pieskarieties pie \"Izveidot rezerves kopiju tūlīt\". </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Uzzināt vairāk</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Izlaist</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Lejupielādēt multividi tūlīt</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Lejupielādēt vēlāk</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Nelejupielādēt multividi</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Lai lejupielādētu multividi, atbrīvojiet krātuvē vietu (%1$s).</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Kredītkarte vai debetkarte</string>
@@ -7025,6 +7214,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Nezināms</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Maksājumu vēsture</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Pēdējā rezerves kopija tika izveidota: %1$s plkst. %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -7035,6 +7230,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Ziņas, kas ir vecākas par iestatīto laika periodu, tiks neatgriezeniski dzēstas.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Ziņas, kuru garums pārsniedz iestatīto rakstzīmju skaitu, tiks neatgriezeniski dzēstas.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Piemērot ierobežojumus saistītajām ierīcēm</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Iespējojot ziņu ierobežojumus sarunās, ziņas tiks dzēstas arī no jūsu saistītajām ierīcēm.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Dzēšana tagad ir sinhronizēta visās jūsu ierīcēs</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Dzēšot ziņas vai sarunas, tās tiks dzēstas arī no jūsu tālruņa un saistītajām ierīcēm.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">Ok</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Maksājumu vēsture</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Teksta un visas multivides rezerves kopija</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Maksājuma informācija</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Rezerves kopijas veids</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Samaksas datums</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Kopīgot</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal rezerves kopijas</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Maksājumu vēsture</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Rezerves kopijas informācija</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Rezerves kopijas izmērs</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Rezerves kopijas izveides biežums</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Izveidot rezerves kopiju, izmantojot mobilos datus</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Izslēgt rezerves kopijas izveidi un dzēst to</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Rezerves kopija dzēsta, un tās izveide izslēgta.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Rezerves kopijas veids mainīts, un abonements atcelts</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Abonements atcelts</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Lejupielāde pabeigta</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Rezerves kopijas veids</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Rezerves kopijas ir atspējotas</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/mēnesī</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Iespējot rezerves kopēšanu</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Pēdējās rezerves kopijas izveide</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s plkst. %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Nekad</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Dublēt tūlīt</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Vai izslēgt rezerves kopiju izveidi un dzēst tās?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">No jums vairs netiks iekasēta maksa. Rezerves kopija tiks dzēsta un jaunas kopijas netiks izveidotas.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Izslēgt un izdzēst</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Dzēš rezerves kopiju…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Rezerves kopija dzēsta</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Pieskaroties pie \"Izveidot rezerves kopiju tūlīt\""</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Reizi dienā</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Reizi nedēļā</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Reizi mēnesī</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Pašrocīgi izveidot rezerves kopiju</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Ievadiet ierīces PIN kodu, paroli vai atbloķēšanas kombināciju.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Tālāk</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Mainīt rezerves kopijas veidu</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Atcelt abonementu</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Apstiprināt atcelšanu</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">No jums vairs netiks iekasēta maksa. Rezerves kopiju izveidošana tiks izslēgta norēķinu cikla beigās. Pēc šī datuma jums būs 30 dienas laika, lai lejupielādētu šobrīd izveidoto multivides rezerves kopiju.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Apstiprināt un lejupielādēt tagad</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Apstiprināt un lejupielādēt vēlāk</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Saglabāt abonementu</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 76ef14aa0a..328f6543e2 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal се ажурира…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly се ажурира…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Сѐ уште не сте поставиле лозинка!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Да ја исклучам лозинката?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Ова трајно ќе ги отклучи известувањата за Signal.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Ова трајно ќе ги отклучи известувањата за Molly.</string>
     <string name="ApplicationPreferencesActivity_disable">Исклучи</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Грешка при поврзување со серверот!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN-от е потребен за заклучување на регистрацијата. За да го исклучите PIN-от, ве молиме прво исклучете го заклучувањето на регистрацијата.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Датотека</string>
     <string name="AttachmentKeyboard_contact">Контакт</string>
     <string name="AttachmentKeyboard_location">Локација</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal бара дозвола за да ги прикаже вашите фотографии и видеа</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly бара дозвола за да ги прикаже вашите фотографии и видеа</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Дозволи пристап</string>
     <string name="AttachmentKeyboard_payment">Плаќање</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Не е пронајдена апликација за избор на медиумска датотека.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal има потреба од дозвола до складот за да можете да прикачите слики, видеа или аудио. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставувања, изберете „Дозволи“, и вклучете „Склад“</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal има потреба од дозвола до контактите за да можете да прикачите информации за контакти. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставување на апликациите, изберете „Дозволи“ и вклучете \"Контакти\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal има потреба од дозвола за локација за да може да прикачи локација. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставувања, изберете „Дозволи“, и вклучете „Локација“.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly има потреба од дозвола до складот за да можете да прикачите слики, видеа или аудио. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставувања, изберете „Дозволи“, и вклучете „Склад“</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly има потреба од дозвола до контактите за да можете да прикачите информации за контакти. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставување на апликациите, изберете „Дозволи“ и вклучете \"Контакти\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly има потреба од дозвола за локација за да може да прикачи локација. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставувања, изберете „Дозволи“, и вклучете „Локација“.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Дозволете пристап до вашата локација</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">За да ја испратите вашата локација:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Дозволете му на Signal пристап за да може да ја испрати вашата локација.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Дозволете му на Molly пристап за да може да ја испрати вашата локација.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">На Signal му треба пристап до вашата локација за да може да ја испрати локацијата.</string>
+    <string name="AttachmentManager_signal_needs_location_access">На Molly му треба пристап до вашата локација за да може да ја испрати локацијата.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Дозволи пристап до меморија</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">За прикажување фотографии и видеа:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal бара дозвола за пристап до меморијата за да ги прикаже вашите фотографии и видеа.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly бара дозвола за пристап до меморијата за да ги прикаже вашите фотографии и видеа.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s нема активирано плаќања </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Смени камера</string>
     <string name="CameraXFragment_open_gallery_description">Отвори галерија</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Дозволи пристап</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Дозволете пристап до камерата и микрофонот</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Дозволете пристап до камерата</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Дозволи пристап до микрофонот</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">За да сликате, дозволете му на Signal пристап до камерата.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">За да снимате фотографии и видеа, дозволете му на Signal пристап до камерата.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">За да снимате фотографии и видеа, дозволете му на Signal пристап до камерата и микрофонот.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">За да снимате видеа со звук, дозволете му на Signal пристап до вашиот микрофон.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">За да скенирате QR код, дозволете му на Signal пристап до камерата.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">На Signal му треба пристап до вашата камера за да слика</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">На Signal му треба пристап до камерата за да скенира QR кодови</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">На Signal му треба пристап до вашиот микрофон за да снима видео</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">За да сликате со Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">За да снимате фотографии и видеа преку Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">За да снимате видеа со звук:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">За да скенирате QR кодови:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Скорешни контакти</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Нема Signal контакти</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Можете да го користите само копчето за камерата за да испраќате слики на Signal контакти. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Не можете да го најдете контактот што го барате?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Поканете контакт да се приклучи на Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Поканете контакт да се приклучи на Molly</string>
     <string name="CameraContacts__menu_search">Барај</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Не, благодарам</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Ажурирај го Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Ажурирај го Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Оваа верзија на апликацијата повеќе не е поддржана. За да продолжите да испраќате и примате пораки, ажурирајте на најновата верзија.</string>
     <string name="ClientDeprecatedActivity_update">Aжурирај</string>
     <string name="ClientDeprecatedActivity_dont_update">Не ажурирај</string>
     <string name="ClientDeprecatedActivity_warning">Предупредување</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Вашата верзија на Signal е застарена. Можете да ја видите историјата на вашите пораки, но нема да можете да испраќате или примате пораки сè додека не ја ажурирате апликацијата.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Вашата верзија на Molly е застарена. Можете да ја видите историјата на вашите пораки, но нема да можете да испраќате или примате пораки сè додека не ја ажурирате апликацијата.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Не е пронајден веб прелистувач.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Порака %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly гласовен повик %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly видео повик %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal порака</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Испрати порака</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Ајде да се префрлиме на Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Ајде да се префрлиме на Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Ве молиме изберете контакт</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Прилогот ги надминува ограничувањата на големината за видот на пораката што ја испраќате.</string>
     <string name="ConversationActivity_unable_to_record_audio">Не може да се снима аудио!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">За да испратите аудио порака:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">За да испраќате аудио пораки дозволете му на Signal пристап до вашиот микрофон.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">За да испраќате аудио пораки дозволете му на Molly пристап до вашиот микрофон.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">На Signal му треба пристап до вашиот микрофон за да сними аудио порака.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal има потреба од дозвола до микрофонот за да може да испраќа аудио пораки. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставувања, изберете „Дозволи“ и вклучете „Микрофон“.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">На Molly му треба пристап до вашиот микрофон за да сними аудио порака.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly има потреба од дозвола до микрофонот за да може да испраќа аудио пораки. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставувања, изберете „Дозволи“ и вклучете „Микрофон“.</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal има потреба од дозвола до микрофонот и камерата за да може да воспостави повик со %1$s. Овие дозволи се трајно одбиени. Ве молиме продолжете до менито за поставувањата, изберете „Дозволи“ и вклучете „Микрофон“ и „Камера“.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">За да снимате фотографии и видеа, дозволете му на Signal пристап до камерата.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal има потреба од дозвола до камерата за да слика и снима видео. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставувања, изберете „Дозволи“ и вклучете „Камера”.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal има потреба од дозвола до камерата за да слика и снима видео</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly има потреба од дозвола до микрофонот и камерата за да може да воспостави повик со %1$s. Овие дозволи се трајно одбиени. Ве молиме продолжете до менито за поставувањата, изберете „Дозволи“ и вклучете „Микрофон“ и „Камера“.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">За да снимате фотографии и видеа, дозволете му на Molly пристап до камерата.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly има потреба од дозвола до камерата за да слика и снима видео. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставувања, изберете „Дозволи“ и вклучете „Камера”.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly има потреба од дозвола до камерата за да слика и снима видео</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Вклучете дозвола за микрофонот за снимање на видеа со звук.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal има потреба од дозвола до микрофонот за да може да снима видеа. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставувањата, изберете „Дозволи“ и вклучете „Микрофон“ и „Камера“.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal има потреба од дозвола до микрофонот за да снима видеа.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly има потреба од дозвола до микрофонот за да може да снима видеа. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставувањата, изберете „Дозволи“ и вклучете „Микрофон“ и „Камера“.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly има потреба од дозвола до микрофонот за да снима видеа.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Не</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">За да започнете повик:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">За да започнете повик дозволете пристап на Signal до вашиот микрофон.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">За да започнете повик дозволете пристап на Molly до вашиот микрофон.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">На Signal му треба пристап до вашиот микрофон за да започне повик.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">На Molly му треба пристап до вашиот микрофон за да започне повик.</string>
 
 
     <string name="ConversationActivity_join">Приклучи сѐ</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Signal повеќе не поддржува SMS пораки. Испратете покана на %1$s за користење Signal за да продолжите со разговорот тука.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Оваа личност повеќе не користи Signal. Поканете ја на Signal за да продолжите со разговорот тука.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Оваа личност повеќе не користи Molly. Поканете ја на Molly за да продолжите со разговорот тука.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Испрати покана за Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Испрати покана за Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Ќе ве потсетиме повторно наскоро.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Избриши за сите</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Избриши на овој уред</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Избриши</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Избриши секаде</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Оваа порака ќе биде избришана за сите во разговорот ако ја користат најновата верзија на Signal. Тие ќе можат да видат дека сте ја избришале пораката.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Барањето е блокирано</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Ажурирај го Signal</string>
+    <string name="ConversationFragment__update_build">Ажурирај го Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Повторно регистрирање на Signal</string>
+    <string name="ConversationFragment__reregister_signal">Повторно регистрирање на Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Оди назад.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Отворете го Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Отворете го Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Повеќе не се верификувани</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Ова трајно ќе го избрише избраниот разговор.</item>
         <item quantity="other">Ова трајно ќе ги избрише сите %1$d избрани разговори.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Ова трајно ќе го избрише избраниот разговор од сите ваши уреди.</item>
+        <item quantity="other">Ова трајно ќе ги избрише сите %1$d избрани разговори од сите ваши уреди.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Бришење</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Се брише избраниот разговор…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Кој може да ме пронајде со мојот телефонски број?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Сите кои го имаат зачувано вашиот телефонски број ќе можат да ве видат на Signal и да започнат разговори со вас.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Сите кои го имаат зачувано вашиот телефонски број ќе можат да ве видат на Molly и да започнат разговори со вас.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Никој нема да може да види дека сте на Signal освен ако не им испратите порака или имате постоечки разговор со нив.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Никој нема да може да види дека сте на Molly освен ако не им испратите порака или имате постоечки разговор со нив.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Да се ​​врати од резервна копија?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Тестирајте ја лозинката за резервната копија и проверете дали е точна</string>
     <string name="BackupsPreferenceFragment__turn_on">Вклучи</string>
     <string name="BackupsPreferenceFragment__turn_off">Исклучи</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"За да вратите резервна копија, инсталирајте нова копија на Signal. Отворете ја апликацијата и допрете „Врати резервна копија“, потоа лоцирајте ја датотеката со резервната копија. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"За да вратите резервна копија, инсталирајте нова копија на Molly. Отворете ја апликацијата и допрете „Врати резервна копија“, потоа лоцирајте ја датотеката со резервната копија. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Дознајте повеќе</string>
     <string name="BackupsPreferenceFragment__in_progress">Во тек…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d до сега…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% до сега…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal има потреба од дозвола до надворешен склад за да може да создава резервни копии. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставувања, изберете „Дозволи“ и вклучете „Склад“.</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly има потреба од дозвола до надворешен склад за да може да создава резервни копии. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставувања, изберете „Дозволи“ и вклучете „Склад“.</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Поставете време за правење резервна копија</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Сесијата со разговорот е освежена</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal користи шифрирање од-крај-до-крај и можно е да има потреба да ги освежи Вашите разговори понекогаш. Ова нема никаков ефект на безбедноста на разговорите, но може да се случи да пропуштите порака од овој контакт. Затоа можете да го прашате повторно да ја испрати пораката.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly користи шифрирање од-крај-до-крај и можно е да има потреба да ги освежи Вашите разговори понекогаш. Ова нема никаков ефект на безбедноста на разговорите, но може да се случи да пропуштите порака од овој контакт. Затоа можете да го прашате повторно да ја испрати пораката.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Користете Signal на десктоп или iPad. Вашите пораки ќе се синхронизираат на поврзаните уреди.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Поврзете нов уред</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Пораките и информациите за разговорите се заштитени со целосно шифрирање на сите уреди</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal за Desktop или iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Допишувањето на поврзаните уреди е приватно</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Molly пораките се синхрoнизираат со Molly на вашиот телефон откако ќе се поврзе. Нема да се појави претходната историја на разговори.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Посетете ја %1$s на вашиот друг уред за да инсталирате Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Мои поврзани уреди</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Неповрзан</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">Неповрзан: %1$s</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Поврзување на уред…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Уредот е одобрен</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Се вчитува…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Нема поврзани уреди</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Отклучете за да поврзете уред</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Скенирајте го QR кодот прикажан на уредот за да се поврзете.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Скенирајте го QR кодот</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Користете го овој уред за да го скенирате QR кодот прикажан на уредот што сакате да го поврзете</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Во ред</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Овој уред ќе може да ги види Вашите групи и контакти, да им пристапи на Вашите разговори и да испраќа пораки во Ваше име.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Завршете со поврзувањето на вашиот друг уред</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Завршете со поврзувањето на Molly на вашиот друг уред.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Неуспешно поврзување на уредот</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Овој QR код не е валиден. Ве молиме осигурајте се дека сте го скенирале QR кодот кој што е прикажан на уредот на кој сакате да се поврзете.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Обидете се повторно</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Да го одврзам \'%1$s\'?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Оптимизација за недостапни Play услуги</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Овој уред не поддржува Play услуги. Допрете овде за да исклучите системска оптимизација на батеријата што го спречува Signal да прима пораки додека е неактивен.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Овој уред не поддржува Play услуги. Допрете овде за да исклучите системска оптимизација на батеријата што го спречува Molly да прима пораки додека е неактивен.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Оваа верзија на Signal е истечена. Ажурирајте веднаш за да испраќате и примате пораки.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Оваа верзија на Molly е истечена. Ажурирајте веднаш за да испраќате и примате пораки.</string>
     <string name="ExpiredBuildReminder_update_now">Ажурирај веднаш</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Преглед</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Трајно неуспешна комуникација со Signal</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal не успеа да се регистрира со Google Play услуги. Пораките и повиците од Signal се оневозможени. Ве молиме пробајте да се регистрирате повторно во Поставувања &gt; Напредно.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Трајно неуспешна комуникација со Molly</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly не успеа да се регистрира со Google Play услуги. Пораките и повиците од Molly се оневозможени. Ве молиме пробајте да се регистрирате повторно во Поставувања &gt; Напредно.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Записите за отстранување грешки ни помагаат при дијагностицирање и отстранување на грешката и не содржат лични податоци.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal наиде на проблем. Сакате да испратите запис за отстранување грешки?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly наиде на проблем. Сакате да испратите запис за отстранување грешки?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Известувањата може да бидат одложени поради оптимизација на батеријата</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Можете да оневозможите оптимизација на батерија за Signal со цел да не доцнат известувањата за пораки.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Можете да оневозможите оптимизација на батерија за Molly со цел да не доцнат известувањата за пораки.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Известувањата може да бидат одложени поради оптимизација на батеријата</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Можете да оневозможите оптимизација на батерија за Molly со цел да не доцнат известувањата за пораки. Допрете „Продолжи“ за да ги видите упатствата според вид на уред.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Не, благодарам</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Продолжи</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Продолжи</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Откажи</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Не, благодарам</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Групни покани на чекање</string>
+    <string name="PendingMembersActivity_pending_group_invites">Барања и покани</string>
     <string name="PendingMembersActivity_requests">Барања</string>
     <string name="PendingMembersActivity_invites">Покани</string>
     <string name="PendingMembersActivity_people_you_invited">Луѓе кои ги поканивте</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Откажи</string>
     <string name="InviteActivity_sending">Се испраќа…</string>
     <string name="InviteActivity_invitations_sent">Поканите се испратени!</string>
-    <string name="InviteActivity_invite_to_signal">Покани на Signal</string>
+    <string name="InviteActivity_invite_to_signal">Покани на Molly</string>
     <string name="InviteActivity_send_sms">Испрати SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Испрати %1$d SMS покана?</item>
         <item quantity="other">Испрати %1$d SMS покани?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Ајде да се префрлиме на Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Ајде да се префрлиме на Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Изгледа дека немате апликации преку кои може да споделите.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Вашата целосна порака</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Позадинската врска е вклучена</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Одговори</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Воспоставување Signal повик</string>
+    <string name="NotificationBarManager__establishing_signal_call">Воспоставување Molly повик</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Започнување повик преку Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Го стопирам Signal сервисот за повикување</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Започнување повик преку Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Го стопирам Molly сервисот за повикување</string>
     <string name="NotificationBarManager__cancel_call">Откажи повик</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Активиравте плаќања</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s сега може да прифаќа плаќања</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Не се достапни детали за плаќањето</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Допрете за повеќе</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Не се достапни детали за плаќањето</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Деталите за ова плаќање не се достапни зашто вашите пораки се вратени од извор кој не ја содржел историјата на ова плаќање. Ова не влијае на средствата на вашата сметка или на статусот на поранешните плаќања.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Уште малку и повеќе нема да можете да испраќате SMS пораки од Signal. Испратете покана на %1$s за користење Signal за да продолжите со разговорот тука.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Повеќе не можете да испраќате SMS пораки на Signal. Испратете покана на %1$s за користење Signal за да продолжите со разговорот тука.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Повеќе не можете да испраќате SMS пораки на Molly. Испратете покана на %1$s за користење Molly за да продолжите со разговорот тука.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Плаќања: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Плаќања</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Пријавено како спам</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Да поврзам уред со Signal?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Изгледа дека сакате да поврзете Signal уред користејќи скенер од 3та страна. За Ваша заштита, Ве молиме повторно скенирајте го кодот преку Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal има потреба од дозвола до камерата за да може да го скенира QR кодот. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставувања, изберете „Дозволи“ и вклучете „Камера“.</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly има потреба од дозвола до камерата за да може да го скенира QR кодот. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставувања, изберете „Дозволи“ и вклучете „Камера“.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Не може да се скенира QR кодот без дозвола до камерата</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Внесете лозинка</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal иконка</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly иконка</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Испрати лозинка</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Погрешна лозинка!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Отклучи го Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Заклучувен екран</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Отклучи го Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Заклучувен екран</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Мапа</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Потврдете за да продолжите со испраќање пораки</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">За да спречите несакани пораки на Signal, Ве молиме завршете ја проверката.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">За да спречите несакани пораки на Molly, Ве молиме завршете ја проверката.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">По проверката, можете да продолжите со испраќање пораки. Сите паузирани пораки ќе бидат испратени автоматски.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Моја приказна</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal повик</string>
+    <string name="Recipient_signal_call">Molly повик</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Блокирај</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Ѕвонам…</string>
     <string name="RedPhone_busy">Зафатено</string>
     <string name="RedPhone_recipient_unavailable">Примателот не е достапен.</string>
-    <string name="RedPhone_network_failed">Мрежата падна!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Мрежата падна! Ве молиме проверете ја вашата мрежна поврзаност и обидете се повторно.</string>
     <string name="RedPhone_number_not_registered">Бројот не е регистриран!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Бројот што го биравте не поддржува безбедни гласовни повици!</string>
     <string name="RedPhone_got_it">Во ред</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Допрете овде за да го вклучите Вашето видео</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">За да го/ја повикате %1$s, на Signal му е потребен пристап до Вашата камера</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">За да го/ја повикате %1$s, на Molly му е потребен пристап до Вашата камера</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Повикувам…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Повторно поврзување…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Отстранети сте од повикот</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Некој ве отстранил од повикот.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Дозволете пристап до камерата и микрофонот</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Дозволи пристап до микрофонот</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Дозволете пристап до камерата</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Дозволете пристап на Molly до вашите камера и микрофон за да започнете или да се приклучите на повик.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Дозволете пристап на Molly до вашиот микрофон за да започнете или да се приклучите на повик.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">За да снимате видеа, дозволете му на Molly пристап до камерата.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly има потреба од дозвола до микрофонот за да започнете или да се приклучите на повик.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">На Molly му треба пристап до вашата камера за да снима</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">За да започнете или да се приклучите на повик:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">За да снимате:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal повик</string>
-    <string name="WebRtcCallView__signal_video_call">Signal видео повик</string>
+    <string name="WebRtcCallView__signal_call">Molly повик</string>
+    <string name="WebRtcCallView__signal_video_call">Molly видео повик</string>
     <string name="WebRtcCallView__start_call">Започни повик</string>
     <string name="WebRtcCallView__join_call">Приклучи се на повикот</string>
     <string name="WebRtcCallView__call_is_full">Повикот е полн</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Сакате да ја спуштите раката?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Спуштете ја раката</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Спуштете</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Откажи</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Кренавте рака</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Поглед</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s има кренато рака</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s кренавте рака</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d имате кренато рака</item>
         <item quantity="other">%1$s + %2$d имаат кренато рака</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s крена рака</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d имаат кренато рака</item>
+        <item quantity="other">%1$s +%2$d имаат кренато рака</item>
+    </plurals>
+
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Ќе примите повик за проверка на овој број.</string>
     <string name="RegistrationActivity_edit_number">Уреди го бројот</string>
     <string name="RegistrationActivity_missing_google_play_services">Недостасуваат Google Play услуги</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Овој уред нема Google Play услуги. Сѐ уште можете да го користите Signal, но оваа конфигурација може да резултира со намалување на доверливоста или на перформансите.\n\nАко не сте напреден корисник, ако не користи прилагоден Android ROM или верувате дека го гледате ова по грешка, Ве молиме контактирајте нѐ на support@signal.org за помош околу решавање на проблемот.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Овој уред нема Google Play услуги. Сѐ уште можете да го користите Molly, но оваа конфигурација може да резултира со намалување на доверливоста или на перформансите.\n\nАко не сте напреден корисник, ако не користи прилагоден Android ROM или верувате дека го гледате ова по грешка, Ве молиме контактирајте нѐ на support@molly.im за помош околу решавање на проблемот.</string>
     <string name="RegistrationActivity_i_understand">Разбирам</string>
     <string name="RegistrationActivity_play_services_error">Грешка со Play услуги</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play услугите се ажурираат или привремено се недостапни. Ве молиме обидете се повторно.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Нестандарден формат на број</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Бројот што го внесовте (%1$s) изгледа дека е нестандарден формат.\n\nДали мислевте на %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Формат на телефонски број</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Формат на телефонски број</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Повикот е побаран</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Имате проблеми при регистрација?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Проверете дали вашиот телефон има сигнал за да ја прими пораката или повикот\n• Проверете дали можете да примите повик на овој број\n• Проверете дали точно го внесовте телефонскиот број.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">За повеќе информации, следете ги овие чекори за решавање на проблеми или контактирајте го тимот за корисничка поддршка</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">За повеќе информации ве молиме следете ги %1$s или %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">овие чекори за решавање на проблеми</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Додај во контакти</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Испрати покана за Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Испрати покана за Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal порака</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal повик</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Додај во контакти</string>
-    <string name="SharedContactView_invite_to_signal">Покани на Signal</string>
+    <string name="SharedContactView_invite_to_signal">Покани на Molly</string>
     <string name="SharedContactView_message">Signal порака</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s припаѓа на %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal ажурирање</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Достапна е нова верзија на Signal. Допрете за ажурирање.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal не успеа да се ажурира</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly ажурирање</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Достапна е нова верзија на Molly. Допрете за ажурирање.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly не успеа да се ажурира</string>
     <string name="ApkUpdateNotifications_failed_general_body">Ќе се обидеме повторно подоцна.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal се ажурираше успешно</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly се ажурираше успешно</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Апликацијата автоматски се ажурираше на верзија %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Нашиот Signal  безбедносен број:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Изгледа дека немате апликации преку кои може да споделите.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">На таблата со исечоци не е пронајден  безбедносен број за споредба</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal има потреба од дозвола до камерата за да може да го скенира QR кодот. Оваа дозвола е трајно одбиена. Ве молиме продолжете во поставувања, изберете „Дозволи“ и вклучете „Камера“.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly има потреба од дозвола до камерата за да може да го скенира QR кодот. Оваа дозвола е трајно одбиена. Ве молиме продолжете во поставувања, изберете „Дозволи“ и вклучете „Камера“.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Не може да се скенира QR кодот без дозвола до камерата</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Мора да размените пораки за да можете да го видите безбедносниот број на %1$s.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Допрете за да отворите.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal е отклучен</string>
-    <string name="KeyCachingService_lock">Заклучи го Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly е отклучен</string>
+    <string name="KeyCachingService_lock">Заклучи го Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Вие</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Неподдржан тип на медиумска датотека</string>
     <string name="MediaPreviewActivity_draft">Нацрт</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal има потреба од дозвола до складот за да може да зачувува на надворешен склад. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставувањата, изберете „Дозволи“ и вклучете „Склад“.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly има потреба од дозвола до складот за да може да зачувува на надворешен склад. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставувањата, изберете „Дозволи“ и вклучете „Склад“.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Не може да се зачува на надворешен склад без дозвола</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Да се избрише пораката?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Ова трајно ќе ја избрише оваа порака.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Неуспешно доставување на пораката.</string>
     <string name="MessageNotifier_error_delivering_message">Грешка при доставувањето на пораката.</string>
     <string name="MessageNotifier_message_delivery_paused">Испораката на пораката е паузирана.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Потврдете за да продолжите со испраќање пораки на Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Потврдете за да продолжите со испраќање пораки на Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Обележи сѐ како прочитано</string>
     <string name="MessageNotifier_mark_read">Обележи како прочитано</string>
     <string name="MessageNotifier_turn_off_these_notifications">Исклучи ги овие известувања</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Реагираше со %1$s на вашата налепница.</string>
     <string name="MessageNotifier_this_message_was_deleted">Оваа порака е избришана.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Дали да се исклучат известувања кога контакт ќе се приклучи на Signal? Можете да ги вклучите повторно во Signal &gt; Поставувања &gt; Известувања.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Дали да се исклучат известувања кога контакт ќе се приклучи на Molly? Можете да ги вклучите повторно во Molly &gt; Поставувања &gt; Известувања.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Брз одговор е недостапен кога Signal е заклучен!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Брз одговор е недостапен кога Molly е заклучен!</string>
     <string name="QuickResponseService_problem_sending_message">Проблем со испраќање на порака!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Невалидна кратенка</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Нова порака</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Барање за разговор</string>
     <string name="SingleRecipientNotificationBuilder_you">Вие</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Уредот повеќе не е регистриран. Ова е најверојатно поради тоа што сте го регистрирале вашиот телефонски број на Signal со друг уред.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Уредот повеќе не е регистриран. Ова е најверојатно поради тоа што сте го регистрирале вашиот телефонски број на Molly со друг уред.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Повторно регистрирајте го уредот</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">За да одговорите на повикот, дозволете пристап на Signal до Вашиот микрофон.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">За да одговорите на повикот, дозволете пристап на Molly до Вашиот микрофон.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">За да одговорите на видео повикот, дозволете Signal да има пристап до микрофонот и камерата.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal има потреба од дозвола до микрофонот и камерата за да може да воспоставува повици. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставувањата, изберете „Дозволи“ и вклучете „Микрофон“ и „Камера“.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">За да одговорите на видео повикот, дозволете Molly да има пристап до микрофонот и камерата.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly има потреба од дозвола до микрофонот и камерата за да може да воспоставува повици. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставувањата, изберете „Дозволи“ и вклучете „Микрофон“ и „Камера“.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Одговорено на поврзаниот уред.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Одбиено на поврзаниот уред.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Зафатено на поврзаниот уред.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Повторете ја новата лозинка</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Испрати покана за Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Испрати покана за Molly</string>
     <string name="contact_selection_activity__new_group">Нова група</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Освежете ги контактите</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Ви недостига некој? Пробајте да ги освежите контактите</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Пронајдете луѓе кои ги познавате на Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Дозволете пристап до вашите контакти</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Повеќе</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Слика на контакт</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal има потреба од дозвола до контакти за да може да ги прикаже Вашите контакти. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставувањата, изберете „Дозволи“ и вклучете „Контакти“.</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly има потреба од дозвола до контакти за да може да ги прикаже Вашите контакти. Оваа дозвола е трајно одбиена. Ве молиме продолжете до менито за поставувањата, изберете „Дозволи“ и вклучете „Контакти“.</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Грешка при преземање на контакти, проверете ја Вашата интернет конекција.</string>
     <string name="ContactSelectionListFragment_username_not_found">Корисничкото име не е пронајдено</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" не е корисник на Signal. Ве молиме проверете го корисничкото име и обидете се повторно."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Пронајдете со корисничко име</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Дозолете пристап до контактите</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">За да пронајдете луѓе кои ги познавате на Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Дозволи пристап</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Не, благодарам</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Дозволете пристап до вашите контакти. Вашите контакти се шифрирани и не се видливи за услугата Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">На Signal му треба пристап до Вашите контакти за да може да ги прикаже.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">На Molly му треба пристап до Вашите контакти за да може да ги прикаже.</string>
     <string name="contact_selection_list_fragment__show_contacts">Прикажи контакти</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Ја имате отстрането оваа личност, испраќањето порака го враќа контактот во вашата листа.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Опции</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Aжурирај</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Пушти … Пауза</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Балончиња се функција на Android која можете да ја исклучите за Signal разговори.</string>
+    <string name="BubbleOptOutTooltip__description">Балончиња се функција на Android која можете да ја исклучите за Molly разговори.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Не сега</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Опис на група</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Ажурирај го Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Ажурирај го Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Оваа верзија на Signal е истечена. Ажурирајте веднаш за да продолжите со користење на Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Оваа верзија на Molly е истечена. Ажурирајте веднаш за да продолжите со користење на Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Aжурирај</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Бавно</string>
     <string name="preferences__help">Помош</string>
     <string name="preferences__advanced">Напредно</string>
-    <string name="preferences__donate_to_signal">Донирајте на Signal</string>
+    <string name="preferences__donate_to_signal">Донирајте на Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Приватност</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Смени ги иконата и името на апликацијата на „%1$s“</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Треба да се затвори Signal за да се променат иконата и името на апликацијата. Известувањата секогаш ќе ги прикажуваат стандардните икона и име на Signal.</string>
+    <string name="preferences__app_icon_dialog_description">Треба да се затвори Molly за да се променат иконата и името на апликацијата. Известувањата секогаш ќе ги прикажуваат стандардните икона и име на Molly.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Изберете икона и име на апликацијата кои ќе бидат видливи на почетниот екран на вашиот телефон и фиоката за апликации. Известувањата секогаш ќе ги прикажуваат стандардните икона и име на Signal. Дознајте повеќе</string>
+    <string name="preferences__app_icon_warning_learn_more">Изберете икона и име на апликацијата кои ќе бидат видливи на почетниот екран на вашиот телефон и фиоката за апликации. Известувањата секогаш ќе ги прикажуваат стандардните икона и име на Molly. Дознајте повеќе</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Иконите и имињата на апликациите се видливи на почетниот екран и фиоката за апликации.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Известувањата секогаш ќе ги прикажуваат стандардните икона и име на Signal.</string>
+    <string name="preferences__app_icon_notification_warning">Известувањата секогаш ќе ги прикажуваат стандардните икона и име на Molly.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Дознајте повеќе</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Ова трајно ќе ги скрати сите разговори до најскорешните %1$s пораки.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Ова трајно ќе ја избрише цела историја на пораки и медиумски датотеки од вашиот уред.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Ова трајно ќе ја избрише цела историја на пораки и медиумски датотеки од овој и сите поврзани уреди.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Дали сте сигурни дека сакате да ја избришете цела историја на пораки?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Целата историја на пораки ќе биде трајно отстранета. Ова дејство е неповратно.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Целата историја на пораки ќе биде трајно отстранета од сите уреди. Ова дејство е неповратно.</string>
     <string name="preferences_storage__delete_all_now">Избриши сѐ веднаш</string>
     <string name="preferences_storage__forever">Засекогаш</string>
     <string name="preferences_storage__one_year">1 година</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Заобиколување на цензура</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Заобиколување на цензура</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Ако е вклучено, Signal ќе се обиде да ја заобиколи цензурата. Вклучете ја оваа опција само ако сте на локација каде Signal е цензуриран.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Ако е вклучено, Molly ќе се обиде да ја заобиколи цензурата. Вклучете ја оваа опција само ако сте на локација каде Molly е цензуриран.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Заобиколување на цензурата е активирано врз основа на телефонскиот број на Вашата сметка.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Воведуваме плаќања</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Користете го Signal за испраќање и примање на MobileCoin, нова дигитална валута фокусирана на приватност. Активирајте за да започнете.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Користете го Molly за испраќање и примање на MobileCoin, нова дигитална валута фокусирана на приватност. Активирајте за да започнете.</string>
     <string name="PaymentsHomeFragment__activate_payments">Активираj плаќања</string>
     <string name="PaymentsHomeFragment__activating_payments">Активирање на плаќања…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Врати ја сметката за плаќања</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Плаќањата не се достапни во Вашиот регион.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Не може да се овозможат плаќања. Обидете се повторно подоцна.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Да деактивирам плаќања?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Нема да можете да испраќате или примате MobileCoin во Signal ако ги деактивирате плаќањата.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Нема да можете да испраќате или примате MobileCoin во Molly ако ги деактивирате плаќањата.</string>
     <string name="PaymentsHomeFragment__deactivate">Деактивирај</string>
     <string name="PaymentsHomeFragment__continue">Продолжи</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Балансот моментално не е достапен.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Детали</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Можете да го користите Signal за испраќање и примање MobileCoin. Сите плаќања се предмет на Условите за користење на MobileCoins и MobileCoin паричник. Може да наидете на некои проблеми и плаќањата или достапните средства што може да ги изгубите не може да се вратат. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Можете да го користите Molly за испраќање и примање MobileCoin. Сите плаќања се предмет на Условите за користење на MobileCoins и MobileCoin паричник. Може да наидете на некои проблеми и плаќањата или достапните средства што може да ги изгубите не може да се вратат. </string>
     <string name="PaymentsHomeFragment__activate">Активирај</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Погледни ги условите за употреба на MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Плаќањата во Signal не се повеќе достапни. Сѐ уште можете да префрлате средства за менување но не можете да испраќате и примате или пак додавате средства.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Плаќањата во Molly не се повеќе достапни. Сѐ уште можете да префрлате средства за менување но не можете да испраќате и примате или пак додавате средства.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Овозможи дозволи</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">За да ви помогне да пишувате на лица кои ги знаете, Signal ќе ги побара следните дозволи. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">За да ви помогне да пишувате на лица кои ги знаете, Molly ќе ги побара следните дозволи. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Известувања</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Следно</string>
     <string name="PaymentsTransferFragment__invalid_address">Невалидна адреса</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Проверете ја адресата на паричникот на која се обидувате да префрлите и обидете се повторно.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Не можете да префрлате на адресата на Вашиот Signal паричник. Внесете адреса на паричник од Вашата сметка на поддржана берза.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">За да скенира QR код, на Signal му е потребен пристап до камерата.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal има потреба од дозвола од камерата за да сними QR-код. Одете во поставувања, изберете „Дозволи“ и вклучете „Камера“.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">За да скенира QR код, на Signal му е потребен пристап до камерата.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Не можете да префрлате на адресата на Вашиот Molly паричник. Внесете адреса на паричник од Вашата сметка на поддржана берза.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">За да скенира QR код, на Molly му е потребен пристап до камерата.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly има потреба од дозвола од камерата за да сними QR-код. Одете во поставувања, изберете „Дозволи“ и вклучете „Камера“.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">За да скенира QR код, на Molly му е потребен пристап до камерата.</string>
     <string name="PaymentsTransferFragment__settings">Поставувања</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Дојдовен Signal гласовен повик</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Дојдовен Molly гласовен повик</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Дојдовен Signal видео повик</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Дојдовен Molly видео повик</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Дојдовен групен Signal повик</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Дојдовен групен Molly повик</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Тековен Signal гласовен повик</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Тековен Molly гласовен повик</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Тековен Signal видео повик</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Тековен Molly видео повик</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Тековен Signal групен повик</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Тековен Molly групен повик</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Се вчитува…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Провери</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Успешно ја внесовте лозинката за резервна копија</string>
     <string name="BackupDialog_passphrase_was_not_correct">Лозинката не е точна</string>
-    <string name="LocalBackupJob_creating_signal_backup">Создавам резервна копија од Signal…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Создавам резервна копија од Molly…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Проверување на резервната копија на Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Проверување на резервната копија на Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">Создавањето на резервна копија не успеа</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Вашиот директориум за резервни копии е избришан или преместен.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Вашата резервна копија е преголема за да се складира на овој уред.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Јави ми се (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Препраќање на код (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Контактирај Signal Поддршка</string>
-    <string name="RegistrationActivity_code_support_subject">Регистрација на Signal - Код за проверка за Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Контактирај Molly Поддршка</string>
+    <string name="RegistrationActivity_code_support_subject">Регистрација на Molly - Код за проверка за Android</string>
     <string name="RegistrationActivity_incorrect_code">Погрешен код</string>
     <string name="BackupUtil_never">Никогаш</string>
     <string name="BackupUtil_unknown">Непознато</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Телефонски број</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Одберете кој може да го види вашиот телефонски број и да ве контактира на Signal со тој број.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Одберете кој може да го види вашиот телефонски број и да ве контактира на Molly со тој број.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Кој може да го види мојот број</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Направивте премногу обиди. Ве молиме обидете се повторно подоцна.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Грешка при поврзување со сервисот.</string>
     <string name="preferences_chats__backups">Резервни копии</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal е заклучен</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly е заклучен</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">ДОПРЕТЕ ЗА ДА ОТКЛУЧИТЕ</string>
     <string name="Recipient_unknown">Непознато</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Потребен ви е пристап до стариот уред.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Врати од резервна копија</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Вратете ги Вашите пораки од локална резервна копија. Ако не ги вратите сега нема да можете да го направите тоа подоцна.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Вратете податоци од локална резервна копија</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Вратете податоци од Signal резервна копија</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Вратете ги сите ваши текстуални пораки + медиумските датотеки од последните 30 дена</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Повеќе опции</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Откажи</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Најавете се без пренос</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Продолжете без пренос на вашите пораки и медиумски датотеки</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Отворете го Signal на Вашиот стар телефон</string>
     <string name="NewDeviceTransferInstructions__continue">Продолжи</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Се припрема за да се поврзам на стариот Android уред…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Само момент, би требало да е готово наскоро</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Чекам да се поврзе стариот Android уред…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">На Signal му е потребна дозвола за локација за да го открие и да се поврзе со Вашиот стар Android уред.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">На Signal му е потребно да се вклучени локациските сервиси за да го открие и да се поврзе со Вашиот стар Android уред.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">На Signal му е потребно Wi-Fi за да го открие и за да се поврзе на Вашиот стар Android уред. Wi-Fi треба да е вклучено, но не мора да сте поврзани на Wi-Fi мрежа.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Извинете, изгледа дека овој уред не поддржува Wi-Fi Direct. Signal користи Wi-Fi Direct за откривање и поврзување со Вашиот стар Android уред. Сѐ уште можете да ги вратите податоците од резервна копија за да ја префрлите сметката од Вашиот стар Android уред.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">На Molly му е потребна дозвола за локација за да го открие и да се поврзе со Вашиот стар Android уред.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">На Molly му е потребно да се вклучени локациските сервиси за да го открие и да се поврзе со Вашиот стар Android уред.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">На Molly му е потребно Wi-Fi за да го открие и за да се поврзе на Вашиот стар Android уред. Wi-Fi треба да е вклучено, но не мора да сте поврзани на Wi-Fi мрежа.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Извинете, изгледа дека овој уред не поддржува Wi-Fi Direct. Molly користи Wi-Fi Direct за откривање и поврзување со Вашиот стар Android уред. Сѐ уште можете да ги вратите податоците од резервна копија за да ја префрлите сметката од Вашиот стар Android уред.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Врати резервна копија</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Се случи неочекувана грешка при обидот за пристап на Вашиот стар Android уред.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Го барам новиот Android уред…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">На Signal му е потребна дозвола за локација за да го открие и да се поврзе со Вашиот нов Android уред.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">На Signal му е потребно да се вклучени локациските сервиси за да го открие и да се поврзе со Вашиот нов Android уред.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal има потреба од Wi-Fi за да открие и да се поврзе со Вашиот нов Android уред. Wi-Fi мора да биде вклучено, но не мора да биде поврзано со Wi-Fi мрежа.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Извинете, изгледа дека овој уред не поддржува Wi-Fi Direct. Signal користи Wi-Fi Direct за откривање и поврзување со Вашиот нов Android уред. Сѐ уште можете да креирате резервна копија на податоците за да ја префрлите Вашата сметка на Вашиот нов Android уред.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">На Molly му е потребна дозвола за локација за да го открие и да се поврзе со Вашиот нов Android уред.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">На Molly му е потребно да се вклучени локациските сервиси за да го открие и да се поврзе со Вашиот нов Android уред.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly има потреба од Wi-Fi за да открие и да се поврзе со Вашиот нов Android уред. Wi-Fi мора да биде вклучено, но не мора да биде поврзано со Wi-Fi мрежа.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Извинете, изгледа дека овој уред не поддржува Wi-Fi Direct. Molly користи Wi-Fi Direct за откривање и поврзување со Вашиот нов Android уред. Сѐ уште можете да креирате резервна копија на податоците за да ја префрлите Вашата сметка на Вашиот нов Android уред.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Создај резервна копија</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Се случи неочекувана грешка при обидот за поврзување со Вашиот нов Android уред.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Префрлување податоци</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Држете ги двата уреди еден до друг. Не ги исклучувајте уредите и задржете го Signal отворен. Преносот на податоци е шифриран од-крај-до-крај.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Држете ги двата уреди еден до друг. Не ги исклучувајте уредите и задржете го Molly отворен. Преносот на податоци е шифриран од-крај-до-крај.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d пораки до сега…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% пораки до сега…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Префрли сметка</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Преземете го Signal на Вашиот нов Android уред</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Преземете го Molly на Вашиот нов Android уред</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Допрете „Трансфер или враќање на сметка“"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Секој кој што го има линкот може да ги види името и сликата на групата и да побара да се приклучи. Споделете го линкот само со луѓе на кои им верувате.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Секој кој што го има линкот може да ги види името и сликата на групата и да се приклучи на групата. Споделете го линкот само со луѓе на кои им верувате.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Сподели преку Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Сподели преку Molly</string>
     <string name="GroupLinkBottomSheet_copy">Копирај</string>
     <string name="GroupLinkBottomSheet_qr_code">QR код</string>
     <string name="GroupLinkBottomSheet_share">Сподели</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">За MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin е нова дигитална валута фокусирана на приватност.</string>
     <string name="payment_info_card_adding_funds">Додавање на средства</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Можете да додадете средства за користење во Signal со испраќање MobileCoin на адресата на Вашиот паричник.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Можете да додадете средства за користење во Molly со испраќање MobileCoin на адресата на Вашиот паричник.</string>
     <string name="payment_info_card_cashing_out">Исплата</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Можете да си ги исплатите MobileCoin било кога на берза што поддржува MobileCoin. Само направете трансакциска сметка на таа берза.</string>
     <string name="payment_info_card_hide_this_card">Да ја сокријам оваа картичка?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Деактивирај го паричникот</string>
     <string name="DeactivateWalletFragment__your_balance">Вашиот баланс</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Се препорачува да ги префрлите средствата до друга адреса на паричник пред да ги деактивирате плаќањата. Ако решите да не ги префрлите средствата сега, тие ќе останат во вашиот паричник кој е поврзан за Signal ако ги реактивирате плаќањата.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Се препорачува да ги префрлите средствата до друга адреса на паричник пред да ги деактивирате плаќањата. Ако решите да не ги префрлите средствата сега, тие ќе останат во вашиот паричник кој е поврзан за Molly ако ги реактивирате плаќањата.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Префли го преостанатиот баланс</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Деактивирај без пренос</string>
     <string name="DeactivateWalletFragment__deactivate">Деактивирај</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Да деактивирам без пренос?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Средствата на вашатата сметка ќе останат во вашиот паричник врзан со Signal ако изберете да ги реактивирате плаќањата.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Средствата на вашатата сметка ќе останат во вашиот паричник врзан со Molly ако изберете да ги реактивирате плаќањата.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Грешка при деактивирање на паричникот.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Лиценци</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Услови и Политика на приватност</string>
-    <string name="HelpFragment__copyright_signal_messenger">Авторски права Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Авторски права Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Лиценцирано под GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4773,7 +4911,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">Автоматски</string>
+    <string name="ChatColorSelectionFragment__auto">Дадена</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Користи сопствени бои</string>
     <string name="ChatColorSelectionFragment__chat_color">Боја на разговор</string>
     <string name="ChatColorSelectionFragment__edit">Измени</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Избери боја</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Сподели</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Само администраторите можат да испраќаат пораки во оваа група.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Постигнат максимум</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Не можете да изберете повеќе од 5 разговори</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Дознајте повеќе</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Ажурирај го Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Ажурирај го Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Оваа верзија на Signal е истечена. Ажурирајте веднаш за да продолжите со користење на Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Оваа верзија на Molly е истечена. Ажурирајте веднаш за да продолжите со користење на Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Aжурирај</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Уредот не е регистриран</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Уредот повеќе не е регистриран. Регистрирајте го повторно за да можете да користите Signal на овој уред.</string>
+    <string name="ReregisterSignalDialog__message">Уредот повеќе не е регистриран. Регистрирајте го повторно за да можете да користите Molly на овој уред.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Повторно регистрирање</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Не успеа да се отвори менито за избор.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">За да се овозможат известувања, треба да се даде дозвола на Signal за приказ.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">За да се овозможат известувања, треба да се даде дозвола на Molly за приказ.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Вклучи</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Сè уште нема одговори</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Не можете да одговорите на приказната бидејќи повеќе не сте член на оваа група.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Реагираше на приказната</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Реагиравте на приказната</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Реагираше на приказната</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Прегледи</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Одберете ја вашата банка</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Потврдете ја вашата донација со %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">За да ја поставите вашата периодична донација допрете на „продолжи“ за да потврдите наплата од €0.01 преку вашата банка. Оваа наплата ќе ви биде автоматски рефундирана и истата овозможува да ви се наплатува донација од €5/месечно од сметката.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">За да ја поставите вашата периодична донација допрете на „Продолжи“ за да потврдите наплата од €0.01 преку вашата банка. Оваа наплата ќе ви биде автоматски рефундирана и истата овозможува да ви се наплатува донација од %1$s/месечно од сметката.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Продолжи</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Се преземаат податоците од резервната копија…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Резервните копии за медиумски датотеки се исклучени</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Вашиот претплатен пакет на резервни копии за медиумски датотеки на Signal е откажан зашто не можевме да го обработиме вашето плаќање. Имате %1$d ден за да ги преземете медиумските датотеки од вашата резервна копија. По %1$d ден, медиумските датотеки од вашата резервна копија ќе бидат избришани.</item>
+        <item quantity="other">Вашиот претплатен пакет на резервни копии за медиумски датотеки на Signal е откажан зашто не можевме да го обработиме вашето плаќање. Имате %1$d дена за да ги преземете медиумските датотеки од вашата резервна копија. По %1$d дена, медиумските датотеки од вашата резервна копија ќе бидат избришани.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Можете во кое било време да почнете одново да плаќате за резервни копии за да продолжите да правите резервни копии од сите ваши медиумски датотеки. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Вашите медиумски датотеки ќе бидат избришани денес</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Вашиот претплатен пакет на резервни копии за медиумски датотеки на Signal е откажан зашто не можевме да го обработиме вашето плаќање. Ова ви е последна можност да ги преземете медиумските датотеки од вашата резервна копија пред да се избришат.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Преземањето не може да се заврши</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">На вашиот уред нема доволно слободен простор. Ослободете простор од %1$s за да ги преземете медиумските датотеки од вашата резервна копија.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Ако изберете „Прескокни“, медиумските датотеки во вашата резервна копија ќе бидат избришани за %1$d ден.</item>
+        <item quantity="other">Ако изберете „Прескокни“, медиумските датотеки во вашата резервна копија ќе бидат избришани за %1$d дена.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Не може да се обработи плаќањето за резервни копии</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Наидовме на проблем при собирање на средства за периодичното месечно плаќање за резервни копии. Проверете дали внесените податоци за начин на плаќање се ажурни. Ако не, ажурирајте во Google Pay. Signal ќе се обиде повторно да го процесира плаќањето за неколку дена.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Не можеше да се направи резервна копија</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Вашиот уред нема направено резервна копија %1$d дена. Проверете дали уредот e поврзан на Wi-Fi и допрете на „Направи резервна копија сега“. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Дознајте повеќе</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Прескокни</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Преземете ги медиумските датотеки сега</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Преземете подоцна</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Не преземајте медиумски датотеки</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Ослободете простор од %1$s за да ги преземете вашите медиумски датотеки.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Кредитна или дебитна картичка</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Непознато</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Историја на плаќања</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Вашата последна резервна копија беше направена на %1$s во %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Пораките постари од избраниот период ќе бидат трајно избришани.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Пораките што ја надминуваат избраната должина ќе бидат трајно избришани.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Примени ги ограничувањата на поврзани уреди</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Кога ограничувањето за максимален број на пораки во разговор е овозможено, ќе се бришат и пораките од поврзаните уреди.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Бришењето сега е синхронизирано на сите ваши уреди</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Кога бришете пораки или разговори, тие ќе бидат избришани од вашиот телефон и сите поврзани уреди.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">Во ред</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Историја на плаќања</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Резервна копија на сите текстуални пораки и медиумски датотеки</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Детали за плаќањето</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Вид на резервна копија</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Датум на плаќање</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Сподели</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal резервни копии</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Историја на плаќања</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Детали за резервната копија</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Големина на резервната копија</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Зачестеност на правење резервни копии</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Правење резервна копија користејќи мобилен интернет</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Исклучи и избриши ги резервните копии</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Резервната копија е избришана и исклучена.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Видот на резервна копија е сменет и претплатата е откажана</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Претплатата е откажана</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Преземањето е завршено</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Вид на резервна копија</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Резервните копии се оневозможени</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/месечно</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Вклучи резервна копија</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Последна резервна копија</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s во %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Никогаш</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Направи резервна копија сега</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Исклучи и избриши ги резервните копии?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Нема да ви се наплати повторно. Вашата резервна копија ќе биде избришана и нема да се направат нови резервни копии.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Исклучи и избриши</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Се брише резервната копија…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Резервната копија е избришана</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Со допирање на „Направи резервна копија сега“"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Дневно</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Неделно</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Месечно</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Направете резервна копија рачно</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Ве молиме внесете го вашиот PIN, лозинка или шема за отклучување.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Следно</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Променете го видот на резервна копија</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Откажете претплата</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Потврдете го откажувањето</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Нема да ви се наплати повторно. Резервните копии ќе бидат исклучени на крајот од вашиот претплатнички период. По тој датум, ќе имате 30 дена да ги преземете медиумските датотеки од кои моментално правите резервни копии.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Потврдете и преземете сега</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Потврдете и преземете подоцна</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Задржете ја претплатата</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 1773b06fac..40e02cc411 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal അപ്ഡേറ്റ് ചെയ്യുന്നു…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly അപ്ഡേറ്റ് ചെയ്യുന്നു…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">നിങ്ങൾ ഒരു രഹസ്യവാചകം ഇതു വരെ ക്രമീകരിച്ചിട്ടില്ല!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">രഹസ്യവാചകം പ്രവർത്തനരഹിതമാക്കണോ?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">ഇത് Signal, സന്ദേശ അറിയിപ്പുകളെ ശാശ്വതമായി അൺലോക്ക് ചെയ്യും.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">ഇത് Molly, സന്ദേശ അറിയിപ്പുകളെ ശാശ്വതമായി അൺലോക്ക് ചെയ്യും.</string>
     <string name="ApplicationPreferencesActivity_disable">പ്രവർത്തനരഹിതമാക്കുക</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">സെർവറിലേക്ക് കണക്റ്റുചെയ്യുന്നതിൽ പിശക്!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">രജിസ്ട്രേഷൻ ലോക്കിന് PIN ആവശ്യമാണ്. PIN പ്രവർത്തനരഹിതമാക്കുന്നതിന് ആദ്യം രജിസ്‌ട്രേഷൻ ലോക്ക് പ്രവർത്തനരഹിതമാക്കുക.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">ഫയൽ</string>
     <string name="AttachmentKeyboard_contact">കോൺ‌ടാക്റ്റ്</string>
     <string name="AttachmentKeyboard_location">സ്ഥാനം</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">നിങ്ങളുടെ ഫോട്ടോകളും വീഡിയോകളും കാണിക്കാൻ Signal-ന് അനുമതി ആവശ്യമാണ്</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">നിങ്ങളുടെ ഫോട്ടോകളും വീഡിയോകളും കാണിക്കാൻ Molly-ന് അനുമതി ആവശ്യമാണ്</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">ആക്സസ് അനുവദിക്കുക</string>
     <string name="AttachmentKeyboard_payment">പേയ്മെന്റ്</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">മീഡിയ തിരഞ്ഞെടുക്കുന്നതിന് ഒരു ആപ്പ് കണ്ടെത്താനായില്ല.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">ചിത്രങ്ങളോ ദൃശ്യങ്ങളോ ഓഡിയോയോ അറ്റാച്ച് ചെയ്യുന്നതിന് Signal-ന് സ്റ്റോറേജ് അനുമതി ആവശ്യമാണ്. പക്ഷേ ഇത് ശാശ്വതമായി നിരസിച്ചിരിക്കുകയാണ്. ആപ്പ് ക്രമീകരണങ്ങൾ മെനുവിൽ ചെന്ന്, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"സ്റ്റോറേജ്\" പ്രവർത്തനക്ഷമമാക്കുക.</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">കോൺ‌ടാക്റ്റ് വിവരങ്ങൾ‌ അറ്റാച്ച് ചെയ്യുന്നതിന് Signal-ന് കോൺ‌ടാക്റ്റുകളുടെ അനുമതി ആവശ്യമാണ്, പക്ഷേ ഇത് ശാശ്വതമായി നിരസിച്ചിരിക്കുകയാണ്. ആപ്പ് ക്രമീകരണങ്ങൾ മെനുവിൽ ചെന്ന്, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"കോൺടാക്റ്റുകൾ\" പ്രവർത്തനക്ഷമമാക്കുക.</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">ഒരു ലൊക്കേഷൻ അറ്റാച്ച് ചെയ്യുന്നതിന് Signal-ന് ലൊക്കേഷൻ അനുമതി ആവശ്യമാണ്, പക്ഷേ ഇത് ശാശ്വതമായി നിരസിച്ചിരിക്കുകയാണ്. ആപ്പ് ക്രമീകരണങ്ങൾ മെനുവിൽ ചെന്ന്, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"ലൊക്കേഷൻ\" പ്രവർത്തനക്ഷമമാക്കുക.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">ചിത്രങ്ങളോ ദൃശ്യങ്ങളോ ഓഡിയോയോ അറ്റാച്ച് ചെയ്യുന്നതിന് Molly-ന് സ്റ്റോറേജ് അനുമതി ആവശ്യമാണ്. പക്ഷേ ഇത് ശാശ്വതമായി നിരസിച്ചിരിക്കുകയാണ്. ആപ്പ് ക്രമീകരണങ്ങൾ മെനുവിൽ ചെന്ന്, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"സ്റ്റോറേജ്\" പ്രവർത്തനക്ഷമമാക്കുക.</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">കോൺ‌ടാക്റ്റ് വിവരങ്ങൾ‌ അറ്റാച്ച് ചെയ്യുന്നതിന് Molly-ന് കോൺ‌ടാക്റ്റുകളുടെ അനുമതി ആവശ്യമാണ്, പക്ഷേ ഇത് ശാശ്വതമായി നിരസിച്ചിരിക്കുകയാണ്. ആപ്പ് ക്രമീകരണങ്ങൾ മെനുവിൽ ചെന്ന്, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"കോൺടാക്റ്റുകൾ\" പ്രവർത്തനക്ഷമമാക്കുക.</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">ഒരു ലൊക്കേഷൻ അറ്റാച്ച് ചെയ്യുന്നതിന് Molly-ന് ലൊക്കേഷൻ അനുമതി ആവശ്യമാണ്, പക്ഷേ ഇത് ശാശ്വതമായി നിരസിച്ചിരിക്കുകയാണ്. ആപ്പ് ക്രമീകരണങ്ങൾ മെനുവിൽ ചെന്ന്, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"ലൊക്കേഷൻ\" പ്രവർത്തനക്ഷമമാക്കുക.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">നിങ്ങളുടെ ലൊക്കേഷനിലേക്ക് ആക്സസ് അനുവദിക്കുക</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">നിങ്ങളുടെ ലൊക്കേഷൻ അയയ്ക്കാൻ:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">നിങ്ങളുടെ ലൊക്കേഷൻ അയയ്ക്കാൻ Signal-ന് ആക്സസ് അനുവദിക്കുക.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">നിങ്ങളുടെ ലൊക്കേഷൻ അയയ്ക്കാൻ Molly-ന് ആക്സസ് അനുവദിക്കുക.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">നിങ്ങളുടെ ലൊക്കേഷൻ അയയ്‌ക്കാൻ Signal-ന് ലൊക്കേഷൻ ആക്‌സസ് ആവശ്യമാണ്.</string>
+    <string name="AttachmentManager_signal_needs_location_access">നിങ്ങളുടെ ലൊക്കേഷൻ അയയ്‌ക്കാൻ Molly-ന് ലൊക്കേഷൻ ആക്‌സസ് ആവശ്യമാണ്.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">സ്റ്റോറേജിലേക്ക് ആക്‌സസ് അനുവദിക്കുക</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">ഫോട്ടോകളും വീഡിയോകളും കാണിക്കാൻ:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">നിങ്ങളുടെ ഫോട്ടോകളും വീഡിയോകളും കാണിക്കാൻ Signal-ന് സ്റ്റോറേജ് ആക്‌സസ് ആവശ്യമാണ്.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">നിങ്ങളുടെ ഫോട്ടോകളും വീഡിയോകളും കാണിക്കാൻ Molly-ന് സ്റ്റോറേജ് ആക്‌സസ് ആവശ്യമാണ്.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s എന്നത് പേയ്മെന്റുകൾ ആക്‌ടിവേറ്റ് ചെയ്‌തിട്ടില്ല </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">ക്യാമറ മാറ്റുക</string>
     <string name="CameraXFragment_open_gallery_description">ഗാലറി തുറക്കുക</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">ആക്സസ് അനുവദിക്കുക</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">നിങ്ങളുടെ ക്യാമറയിലേക്കും മൈക്രോഫോണിലേക്കും ആക്‌സസ് അനുവദിക്കുക</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">നിങ്ങളുടെ ക്യാമറയിലേക്ക് ആക്സസ് അനുവദിക്കുക</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">നിങ്ങളുടെ മൈക്രോഫോണിലേക്ക് ആക്‌സസ് അനുവദിക്കുക</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">ഫോട്ടോകൾ എടുക്കാൻ, ക്യാമറയിലേക്ക് Signal-ന് ആക്‌സസ് അനുവദിക്കുക.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">ഫോട്ടോകളും വീഡിയോയും എടുക്കാൻ ക്യാമറയിലേക്ക് Signal-ന് ആക്സസ് അനുവദിക്കുക.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">ഫോട്ടോകളും വീഡിയോയും എടുക്കാൻ, ക്യാമറയിലേക്കും മൈക്രോഫോണിലേക്കും Signal-ന് ആക്‌സസ് അനുവദിക്കുക.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">ശബ്ദത്തോടെ വീഡിയോകൾ ക്യാചർ ചെയ്യാൻ, നിങ്ങളുടെ മൈക്രോഫോണിലേക്ക് Signal-ന് ആക്‌സസ് അനുവദിക്കുക.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">ഒരു QR കോഡ് സ്കാൻ ചെയ്യാൻ, ക്യാമറയിലേക്ക് Signal-ന് ആക്സസ് അനുവദിക്കുക.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">ഫോട്ടോകൾ എടുക്കാൻ Signal-ന് ക്യാമറ ആക്സസ് ആവശ്യമാണ്</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">QR കോഡുകൾ സ്കാൻ ചെയ്യാൻ Signal-ന് ക്യാമറ ആക്സസ് ആവശ്യമാണ്</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">വീഡിയോ ക്യാപ്‌ചർ ചെയ്യാൻ Signal-ന് മൈക്രോഫോൺ ആക്‌സസ് ആവശ്യമാണ്</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Signal-ൽ ഫോട്ടോകൾ എടുക്കാൻ:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Signal-ൽ ഫോട്ടോകളും വീഡിയോകളും എടുക്കാൻ:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">ശബ്ദം ഉപയോഗിച്ച് വീഡിയോകൾ പകർത്താൻ:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR കോഡുകൾ സ്കാൻ ചെയ്യാൻ:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">സമീപകാല കോൺടാക്റ്റുകൾ</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Signal കോൺടാക്റ്റുകളൊന്നുമില്ല</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Signal കോൺടാക്റ്റുകളിലേക്ക് ഫോട്ടോകൾ അയയ്ക്കാൻ മാത്രമെ നിങ്ങൾക്ക് ക്യാമറ ബട്ടൺ ഉപയോഗിക്കാൻ കഴിയൂ. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">നിങ്ങൾ തിരയുന്ന ആളെ കണ്ടെത്താൻ കഴിയുന്നില്ലേ?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">ഒരു കോൺടാക്റ്റിനെ Signal-ൽ ചേരാൻ ക്ഷണിക്കുക</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">ഒരു കോൺടാക്റ്റിനെ Molly-ൽ ചേരാൻ ക്ഷണിക്കുക</string>
     <string name="CameraContacts__menu_search">തിരയൽ</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">വേണ്ട</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Signal അപ്ഡേറ്റ് ചെയ്യുക</string>
+    <string name="ClientDeprecatedActivity_update_signal">Molly അപ്ഡേറ്റ് ചെയ്യുക</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">ആപ്പിന്റെ ഈ പതിപ്പിന് ഇനി മുതല്‍ പിന്തുണയില്ല. സന്ദേശങ്ങൾ അയയ്‌ക്കുന്നതും ലഭിക്കുന്നതും തുടരാൻ ഏറ്റവും പുതിയ പതിപ്പിലേക്ക് അപ്ഡേറ്റ് ചെയ്യുക..</string>
     <string name="ClientDeprecatedActivity_update">അപ്‌ഡേറ്റ്</string>
     <string name="ClientDeprecatedActivity_dont_update">അപ്ഡേറ്റ് ചെയ്യരുത്</string>
     <string name="ClientDeprecatedActivity_warning">മുന്നറിയിപ്പ്</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">നിങ്ങളുടെ Signal പതിപ്പ് കാലഹരണപ്പെട്ടിരിക്കുന്നു. നിങ്ങളുടെ സന്ദേശ ചരിത്രം നിങ്ങൾക്ക് കാണാൻ കഴിയും, പക്ഷേ നിങ്ങൾ അപ്‌ഡേറ്റ് ചെയ്യുന്നതുവരെ നിങ്ങൾക്ക് സന്ദേശങ്ങൾ അയയ്‌ക്കാനോ സ്വീകരിക്കാനോ കഴിയില്ല.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">നിങ്ങളുടെ Molly പതിപ്പ് കാലഹരണപ്പെട്ടിരിക്കുന്നു. നിങ്ങളുടെ സന്ദേശ ചരിത്രം നിങ്ങൾക്ക് കാണാൻ കഴിയും, പക്ഷേ നിങ്ങൾ അപ്‌ഡേറ്റ് ചെയ്യുന്നതുവരെ നിങ്ങൾക്ക് സന്ദേശങ്ങൾ അയയ്‌ക്കാനോ സ്വീകരിക്കാനോ കഴിയില്ല.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">വെബ്‌ബ്രൗസറൊന്നും കണ്ടെത്തിയില്ല.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">സന്ദേശ൦ %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly വോയ്സ് കോൾ %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly വീഡിയോ കോൾ %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal സന്ദേശം</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">സന്ദേശം അയയ്ക്കുക</string>
-    <string name="ConversationActivity_lets_switch_to_signal">നമുക്ക് Signal-ലേക്ക് മാറാം %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">നമുക്ക് Molly-ലേക്ക് മാറാം %1$s</string>
     <string name="ConversationActivity_specify_recipient">ഒരു കോൺ‌ടാക്റ്റ് തിരഞ്ഞെടുക്കുക</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">അറ്റാച്ച്മെന്റ് നിങ്ങൾ അയയ്‌ക്കുന്ന സന്ദേശ ഇനത്തിന്റെ വലുപ്പ പരിധി കവിഞ്ഞിരിക്കുന്നു.</string>
     <string name="ConversationActivity_unable_to_record_audio">ഓഡിയോ റെക്കോർഡുചെയ്യാനായില്ല!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">ഓഡിയോ മെസേജുകൾ അയക്കാൻ:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">ശബ്ദ സന്ദേശങ്ങൾ അയയ്‌ക്കാൻ, നിങ്ങളുടെ മൈക്രോഫോണിലേക്ക് Signal-ന് ആക്‌സസ് അനുവദിക്കുക.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">ശബ്ദ സന്ദേശങ്ങൾ അയയ്‌ക്കാൻ, നിങ്ങളുടെ മൈക്രോഫോണിലേക്ക് Molly-ന് ആക്‌സസ് അനുവദിക്കുക.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">ഒരു ശബ്ദ സന്ദേശം റെക്കോർഡ് ചെയ്യാൻ Signal-ന് മൈക്രോഫോൺ ആക്സസ് ആവശ്യമാണ്.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">ഓഡിയോ സന്ദേശങ്ങൾ അയയ്‌ക്കാൻ Signal-ന് മൈക്രോഫോൺ അനുമതി ആവശ്യമാണ്, പക്ഷേ ഇത് ശാശ്വതമായി നിരസിച്ചിരിക്കുകയാണ്. ആപ്പ് ക്രമീകരണങ്ങളിൽ ചെന്ന്, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"മൈക്രോഫോൺ\" പ്രവർത്തനക്ഷമമാക്കുക.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">ഒരു ശബ്ദ സന്ദേശം റെക്കോർഡ് ചെയ്യാൻ Molly-ന് മൈക്രോഫോൺ ആക്സസ് ആവശ്യമാണ്.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">ഓഡിയോ സന്ദേശങ്ങൾ അയയ്‌ക്കാൻ Molly-ന് മൈക്രോഫോൺ അനുമതി ആവശ്യമാണ്, പക്ഷേ ഇത് ശാശ്വതമായി നിരസിച്ചിരിക്കുകയാണ്. ആപ്പ് ക്രമീകരണങ്ങളിൽ ചെന്ന്, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"മൈക്രോഫോൺ\" പ്രവർത്തനക്ഷമമാക്കുക.</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s എന്നയാളെ വിളിക്കുന്നതിന് Signal-ന് മൈക്രോഫോൺ, ക്യാമറ അനുമതികൾ ആവശ്യമാണ്, പക്ഷേ അവ ശാശ്വതമായി നിരസിച്ചിരിക്കുകയാണ്. ആപ്പ് ക്രമീകരണങ്ങളിൽ ചെന്ന്, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"മൈക്രോഫോൺ\", \"ക്യാമറ\" എന്നിവ പ്രവർത്തനക്ഷമമാക്കുക.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">ഫോട്ടോകളും വീഡിയോയും എടുക്കാൻ ക്യാമറയിലേക്ക് Signal-ന് ആക്സസ് അനുവദിക്കുക.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">ഫോട്ടോകളോ വീഡിയോയോ എടുക്കാൻ Signal-ന് ക്യാമറാ അനുമതി ആവശ്യമാണ്, പക്ഷേ ഇത് ശാശ്വതമായി നിരസിച്ചിരിക്കുകയാണ്. ആപ്പ് ക്രമീകരണങ്ങളിൽ ചെന്ന്, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"ക്യാമറ\" പ്രവർത്തനക്ഷമമാക്കുക.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">ഫോട്ടോകളോ വീഡിയോയോ എടുക്കാൻ Signal-ന് ക്യാമറ അനുമതി ആവശ്യമാണ്</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s എന്നയാളെ വിളിക്കുന്നതിന് Molly-ന് മൈക്രോഫോൺ, ക്യാമറ അനുമതികൾ ആവശ്യമാണ്, പക്ഷേ അവ ശാശ്വതമായി നിരസിച്ചിരിക്കുകയാണ്. ആപ്പ് ക്രമീകരണങ്ങളിൽ ചെന്ന്, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"മൈക്രോഫോൺ\", \"ക്യാമറ\" എന്നിവ പ്രവർത്തനക്ഷമമാക്കുക.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">ഫോട്ടോകളും വീഡിയോയും എടുക്കാൻ ക്യാമറയിലേക്ക് Molly-ന് ആക്സസ് അനുവദിക്കുക.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">ഫോട്ടോകളോ വീഡിയോയോ എടുക്കാൻ Molly-ന് ക്യാമറാ അനുമതി ആവശ്യമാണ്, പക്ഷേ ഇത് ശാശ്വതമായി നിരസിച്ചിരിക്കുകയാണ്. ആപ്പ് ക്രമീകരണങ്ങളിൽ ചെന്ന്, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"ക്യാമറ\" പ്രവർത്തനക്ഷമമാക്കുക.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">ഫോട്ടോകളോ വീഡിയോയോ എടുക്കാൻ Molly-ന് ക്യാമറ അനുമതി ആവശ്യമാണ്</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">ശബ്‌ദം ഉപയോഗിച്ച് വീഡിയോകൾ പകർത്താൻ മൈക്രോഫോൺ അനുമതി പ്രവർത്തനക്ഷമമാക്കുക.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">വീഡിയോകൾ റെക്കോർഡുചെയ്യാൻ Signal-ന് മൈക്രോഫോൺ അനുമതി ആവശ്യമാണ്, പക്ഷേ അവ നിരസിക്കപ്പെട്ടു. അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങളിൽ തുടരുക, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"മൈക്രോഫോൺ\", \"ക്യാമറ\" എന്നിവ പ്രവർത്തനക്ഷമമാക്കുക.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">വീഡിയോകൾ റെക്കോർഡുചെയ്യാൻ Signal-ന് മൈക്രോഫോൺ അനുമതി ആവശ്യമാണ്.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">വീഡിയോകൾ റെക്കോർഡുചെയ്യാൻ Molly-ന് മൈക്രോഫോൺ അനുമതി ആവശ്യമാണ്, പക്ഷേ അവ നിരസിക്കപ്പെട്ടു. അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങളിൽ തുടരുക, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"മൈക്രോഫോൺ\", \"ക്യാമറ\" എന്നിവ പ്രവർത്തനക്ഷമമാക്കുക.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">വീഡിയോകൾ റെക്കോർഡുചെയ്യാൻ Molly-ന് മൈക്രോഫോൺ അനുമതി ആവശ്യമാണ്.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">അല്ല</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">ഒരു കോൾ ആരംഭിക്കാൻ:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">ഒരു കോൾ ആരംഭിക്കാൻ, നിങ്ങളുടെ മൈക്രോഫോണിലേക്ക് Signal-ന് ആക്സസ് അനുവദിക്കുക.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">ഒരു കോൾ ആരംഭിക്കാൻ, നിങ്ങളുടെ മൈക്രോഫോണിലേക്ക് Molly-ന് ആക്സസ് അനുവദിക്കുക.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">ഒരു കോൾ ആരംഭിക്കാൻ Signal-ന് മൈക്രോഫോൺ ആക്സസ് ആവശ്യമാണ്.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">ഒരു കോൾ ആരംഭിക്കാൻ Molly-ന് മൈക്രോഫോൺ ആക്സസ് ആവശ്യമാണ്.</string>
 
 
     <string name="ConversationActivity_join">ചേരുക</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">SMS സന്ദേശമയയ്‌ക്കൽ ഇനിമുതൽ Signal-ൽ പിന്തുണയ്‌ക്കുന്നില്ല. സംഭാഷണം ഇവിടെ നിലനിർത്താൻ %1$s എന്നയാളെ Signal-ലേക്ക് ക്ഷണിക്കുക.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">ഈ വ്യക്തി ഇപ്പോൾ Signal ഉപയോഗിക്കുന്നില്ല. സംഭാഷണം ഇവിടെ നിലനിർത്താൻ അവരെ Signal-ലേക്ക് ക്ഷണിക്കുക.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">ഈ വ്യക്തി ഇപ്പോൾ Molly ഉപയോഗിക്കുന്നില്ല. സംഭാഷണം ഇവിടെ നിലനിർത്താൻ അവരെ Molly-ലേക്ക് ക്ഷണിക്കുക.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Signal-ലേക്ക് ക്ഷണിക്കുക</string>
+    <string name="ConversationActivity__invite_to_signal">Molly-ലേക്ക് ക്ഷണിക്കുക</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">ഉടൻ തന്നെ നിങ്ങളെ വീണ്ടും ഓർമ്മിപ്പിക്കും.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">എല്ലാവർക്കുമായി ഇല്ലാതാക്കൂ</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">ഈ ഉപകരണത്തിൽ ഇല്ലാതാക്കുക</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">ഇല്ലാതാക്കൂ</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">എല്ലായിടത്തും ഇല്ലാതാക്കുക</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">സംഭാഷണത്തിലെ എല്ലാവർ‌ക്കും അവർ‌ Signal-ന്റെ സമീപകാല പതിപ്പിലാണെങ്കിൽ‌ ഈ സന്ദേശം ഇല്ലാതാക്കും. നിങ്ങൾ ഒരു സന്ദേശം ഇല്ലാതാക്കിയത് അവർക്ക് കാണാൻ കഴിയും.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">ബ്ലോക്ക് ചെയ്തു</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Signal അപ്ഡേറ്റ് ചെയ്യുക</string>
+    <string name="ConversationFragment__update_build">Molly അപ്ഡേറ്റ് ചെയ്യുക</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Signal വീണ്ടും രജിസ്റ്റർ ചെയ്യുക</string>
+    <string name="ConversationFragment__reregister_signal">Molly വീണ്ടും രജിസ്റ്റർ ചെയ്യുക</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">തിരികെ നാവിഗേറ്റ് ചെയ്യുക.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signal തുറക്കുക</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Molly തുറക്കുക</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">ഇപ്പോൾ പരിശോധിച്ചുറപ്പിച്ചതല്ല</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">ഇത് തിരഞ്ഞെടുത്ത ചാറ്റിനെ ശാശ്വതമായി ഇല്ലാതാക്കും.</item>
         <item quantity="other">ഇത് തിരഞ്ഞെടുത്ത %1$d ചാറ്റുകളും ശാശ്വതമായി ഇല്ലാതാക്കും.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">ഇത് നിങ്ങളുടെ എല്ലാ ഉപകരണങ്ങളിൽ നിന്നും തിരഞ്ഞെടുത്ത ചാറ്റ് ശാശ്വതമായി ഇല്ലാതാക്കും.</item>
+        <item quantity="other">ഇത് നിങ്ങളുടെ എല്ലാ ഉപകരണങ്ങളിൽ നിന്നും തിരഞ്ഞെടുത്ത %1$d എല്ലാ ചാറ്റുകളും ശാശ്വതമായി ഇല്ലാതാക്കും.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">ഇല്ലാതാക്കുന്നു</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">തിരഞ്ഞെടുത്ത ചാറ്റ് ഇല്ലാതാക്കുന്നു…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">നമ്പർ ഉപയോഗിച്ച് എന്നെ കണ്ടെത്താൻ കഴിയുന്നത് ആർക്കൊക്കെ?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">നിങ്ങളുടെ ഫോൺ നമ്പറുള്ള ആർക്കും നിങ്ങൾ Signal-ൽ ഉണ്ടെന്ന് കാണാനും നിങ്ങളുമായി ചാറ്റുകൾ ആരംഭിക്കാനും കഴിയും.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">നിങ്ങളുടെ ഫോൺ നമ്പറുള്ള ആർക്കും നിങ്ങൾ Molly-ൽ ഉണ്ടെന്ന് കാണാനും നിങ്ങളുമായി ചാറ്റുകൾ ആരംഭിക്കാനും കഴിയും.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">നിങ്ങൾ സന്ദേശമയയ്‌ക്കുകയോ മുമ്പ് ചാറ്റ് ചെയ്തിട്ടുണ്ടെങ്കിലോ മാത്രമേ നിങ്ങൾ Signal-ൽ ഉണ്ടെന്ന് കാണാനാകൂ.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">നിങ്ങൾ സന്ദേശമയയ്‌ക്കുകയോ മുമ്പ് ചാറ്റ് ചെയ്തിട്ടുണ്ടെങ്കിലോ മാത്രമേ നിങ്ങൾ Molly-ൽ ഉണ്ടെന്ന് കാണാനാകൂ.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">ബാക്കപ്പിൽ വീണ്ടെടുക്കണോ?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">നിങ്ങളുടെ ബാക്കപ്പ് രഹസ്യവാക്യം പരിശോധിച്ച് അത് പൊരുത്തപ്പെടുന്നുണ്ടോയെന്ന് പരിശോധിക്കുക</string>
     <string name="BackupsPreferenceFragment__turn_on">ഓൺ ചെയ്യുക</string>
     <string name="BackupsPreferenceFragment__turn_off">ഓഫ് ആക്കുക</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"ഒരു ബാക്കപ്പ് റീസ്റ്റോര്‍ ചെയ്യാന്‍, Signal-ന്റെ ഒരു പുതിയ പകർപ്പ് ഇൻസ്റ്റാൾ ചെയ്യുക. അപ്ലിക്കേഷൻ തുറന്ന് \"റിസ്റ്റോർ ചെയ്യുക\" ടാപ്പുചെയ്യുക, തുടർന്ന് ഒരു ബാക്കപ്പ് ഫയൽ കണ്ടെത്തുക. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"ഒരു ബാക്കപ്പ് റീസ്റ്റോര്‍ ചെയ്യാന്‍, Molly-ന്റെ ഒരു പുതിയ പകർപ്പ് ഇൻസ്റ്റാൾ ചെയ്യുക. അപ്ലിക്കേഷൻ തുറന്ന് \"റിസ്റ്റോർ ചെയ്യുക\" ടാപ്പുചെയ്യുക, തുടർന്ന് ഒരു ബാക്കപ്പ് ഫയൽ കണ്ടെത്തുക. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">കൂടുതൽ അറിയുക</string>
     <string name="BackupsPreferenceFragment__in_progress">പുരോഗതിയിൽ…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d ഇതുവരെ….</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% ഇതുവരെ…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">ബാക്കപ്പുകൾ സൃഷ്ടിക്കുന്നതിന് Signal-ന് ബാഹ്യ സ്റ്റോറജ് ​​അനുമതി ആവശ്യമാണ്, പക്ഷേ ഇത് ശാശ്വതമായി നിരസിക്കപ്പെട്ടു. അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങളിലേക്കു പോയി , \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"സ്റ്റോറജ്\" ഉപയോഗാനുമതി നൽകുക .</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">ബാക്കപ്പുകൾ സൃഷ്ടിക്കുന്നതിന് Molly-ന് ബാഹ്യ സ്റ്റോറജ് ​​അനുമതി ആവശ്യമാണ്, പക്ഷേ ഇത് ശാശ്വതമായി നിരസിക്കപ്പെട്ടു. അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങളിലേക്കു പോയി , \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"സ്റ്റോറജ്\" ഉപയോഗാനുമതി നൽകുക .</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">ബാക്കപ്പ് സമയം സജ്ജീകരിക്കുക</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">ചാറ്റ് സെഷൻ പുതുക്കി</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal ആദ്യാവസാന-എൻക്രിപ്ഷൻ ഉപയോക്കുന്നതിനാൽ ചിലപ്പോൾ മുമ്പത്തെ ചാറ്റുകൾ പുതുക്കേണ്ടി വരും. ഇത് ചാറ്റിന്റെ സുരക്ഷയെ ബാധിക്കില്ല, പക്ഷെ ഈ കോണ്ടാക്ടിൽ നിന്നുള്ളൊരു മെസ്സേജ് നിങ്ങൾക്ക് നഷ്ടപെട്ടിരിക്കാം, എങ്കിൽ അതവരോട് നിങ്ങൾക്ക് വീണ്ടുമയക്കാൻ പറയാം.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly ആദ്യാവസാന-എൻക്രിപ്ഷൻ ഉപയോക്കുന്നതിനാൽ ചിലപ്പോൾ മുമ്പത്തെ ചാറ്റുകൾ പുതുക്കേണ്ടി വരും. ഇത് ചാറ്റിന്റെ സുരക്ഷയെ ബാധിക്കില്ല, പക്ഷെ ഈ കോണ്ടാക്ടിൽ നിന്നുള്ളൊരു മെസ്സേജ് നിങ്ങൾക്ക് നഷ്ടപെട്ടിരിക്കാം, എങ്കിൽ അതവരോട് നിങ്ങൾക്ക് വീണ്ടുമയക്കാൻ പറയാം.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">ഡെസ്ക്ടോപ്പിലോ iPad-ലോ Signal ഉപയോഗിക്കുക. നിങ്ങളുടെ സന്ദേശങ്ങൾ ലിങ്ക് ചെയ്‌ത ഉപകരണങ്ങളുമായി സമന്വയിപ്പിക്കും.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">ഒരു പുതിയ ഉപകരണം ലിങ്ക് ചെയ്യുക</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s എല്ലാ ഉപകരണങ്ങളിലും എൻഡ്-ടു-എൻഡ് എൻക്രിപ്ഷൻ മുഖേന സന്ദേശങ്ങളും ചാറ്റ് വിവരങ്ങളും പരിരക്ഷിച്ചിരിക്കുന്നു</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">ഡെസ്ക്ടോപ്പിലോ iPad-ലോ Signal</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">ലിങ്ക് ചെയ്‌ത ഉപകരണങ്ങളിലെ എല്ലാ സന്ദേശമയയ്‌ക്കലും സ്വകാര്യമാണ്</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Molly സന്ദേശങ്ങൾ ലിങ്ക് ചെയ്‌ത ശേഷം നിങ്ങളുടെ മൊബൈൽ ഫോണിലെ Molly-മായി സമന്വയിപ്പിക്കപ്പെടുന്നു. നിങ്ങളുടെ മുമ്പത്തെ സന്ദേശ ചരിത്രം ദൃശ്യമാകില്ല.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">നിങ്ങളുടെ മറ്റേ ഉപകരണത്തിൽ, Molly ഇൻസ്റ്റാൾ ചെയ്യാൻ %1$s സന്ദർശിക്കുക</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">എൻ്റെ ലിങ്ക് ചെയ്‌ത ഉപകരണങ്ങൾ</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">അൺലിങ്ക് ചെയ്യുക</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s അൺലിങ്ക് ചെയ്‌തു</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">ഉപകരണം ലിങ്ക് ചെയ്യുന്നു…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">ഉപകരണം അംഗീകരിച്ചു</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">ലഭ്യമാക്കുന്നു</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">ലിങ്ക് ചെയ്‌ത ഉപകരണങ്ങളൊന്നുമില്ല</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">ഒരു ഉപകരണം ലിങ്ക് ചെയ്യാൻ അൺലോക്ക് ചെയ്യുക</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">ലിങ്ക് ചെയ്യുന്നതിന് ഉപകരണത്തിൽ പ്രദർശിപ്പിച്ചിരിക്കുന്ന QR കോഡ് സ്കാൻ ചെയ്യുക.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">QR കോഡ് സ്‌കാൻ ചെയ്യുക</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">നിങ്ങൾ ലിങ്ക് ചെയ്യാൻ ആഗ്രഹിക്കുന്ന ഉപകരണത്തിൽ പ്രദർശിപ്പിച്ചിരിക്കുന്ന QR കോഡ് സ്കാൻ ചെയ്യാൻ ഈ ഉപകരണം ഉപയോഗിക്കുക</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">ശരി</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">ഈ ഉപകരണത്തിന് നിങ്ങളുടെ ഗ്രൂപ്പുകളും കോൺടാക്റ്റുകളും കാണാനും നിങ്ങളുടെ ചാറ്റുകൾ ആക്‌സസ് ചെയ്യാനും നിങ്ങളുടെ പേരിൽ സന്ദേശങ്ങൾ അയയ്‌ക്കാനും കഴിയും.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">നിങ്ങളുടെ മറ്റേ ഉപകരണത്തിൽ ലിങ്ക് ചെയ്യുന്നത് പൂർത്തിയാക്കുക</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">നിങ്ങളുടെ മറ്റേ ഉപകരണത്തിൽ Molly ലിങ്ക് ചെയ്യുന്നത് പൂർത്തിയാക്കുക.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">ഡിവൈസ് ലിങ്ക് ചെയ്യുന്നത് പരാജയപ്പെട്ടിരിക്കുന്നു</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">ഈ QR കോഡ് സാധുവല്ല.  നിങ്ങൾ ലിങ്ക് ചെയ്യാൻ ആഗ്രഹിക്കുന്ന ഡിവൈസിൽ ഡിസ്പ്ലേ ചെയ്തിരിക്കുന്ന QR കോഡ് തന്നെയാണ് നിങ്ങൾ സ്കാൻ ചെയ്യുന്നതെന്ന് ദയവായി ഉറപ്പാക്കുക.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">വീണ്ടും ശ്രമിക്കുക</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">\'%1$s\' വിച്ഛേദിക്കണോ?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Play Services ഇല്ലാത്തതിനാൽ ഡിവൈസ് ഒപ്റ്റിമൈസ് ചെയ്യുക</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">ഈ ഉപകരണം Play Services പിന്തുണയ്ക്കുന്നില്ല. നിഷ്‌ക്രിയമായിരിക്കുമ്പോൾ സന്ദേശങ്ങൾ വീണ്ടെടുക്കുന്നതിൽ നിന്ന് Signal നെ തടയുന്ന സിസ്റ്റം ബാറ്ററി ഒപ്റ്റിമൈസേഷനുകൾ പ്രവർത്തനരഹിതമാക്കാൻ ടാപ്പുചെയ്യുക.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">ഈ ഉപകരണം Play Services പിന്തുണയ്ക്കുന്നില്ല. നിഷ്‌ക്രിയമായിരിക്കുമ്പോൾ സന്ദേശങ്ങൾ വീണ്ടെടുക്കുന്നതിൽ നിന്ന് Molly നെ തടയുന്ന സിസ്റ്റം ബാറ്ററി ഒപ്റ്റിമൈസേഷനുകൾ പ്രവർത്തനരഹിതമാക്കാൻ ടാപ്പുചെയ്യുക.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Signal-ന്റെ ഈ പതിപ്പ് കാലഹരണപ്പെട്ടു. സന്ദേശങ്ങൾ അയയ്‌ക്കുന്നതിനും സ്വീകരിക്കുന്നതിനും ഇപ്പോൾ തന്നെ പുതുക്കുക.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Molly-ന്റെ ഈ പതിപ്പ് കാലഹരണപ്പെട്ടു. സന്ദേശങ്ങൾ അയയ്‌ക്കുന്നതിനും സ്വീകരിക്കുന്നതിനും ഇപ്പോൾ തന്നെ പുതുക്കുക.</string>
     <string name="ExpiredBuildReminder_update_now">ഇപ്പോൾ അപ്ഡേറ്റ് ചെയ്യുക</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">കാണുക</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">സ്ഥിരമായ Signal ആശയവിനിമയ പരാജയം!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Google Play Services രജിസ്റ്റർ ചെയ്യാൻ Signal ന് കഴിഞ്ഞില്ല. Signal സന്ദേശങ്ങളും കോളുകളും പ്രവർത്തനരഹിതമാക്കി. ക്രമീകരണം &gt; വിപുലമായ ക്രമീകരണം ൽ വീണ്ടും രജിസ്റ്റർ ചെയ്യാൻ ശ്രമിക്കുക.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">സ്ഥിരമായ Molly ആശയവിനിമയ പരാജയം!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Google Play Services രജിസ്റ്റർ ചെയ്യാൻ Molly ന് കഴിഞ്ഞില്ല. Molly സന്ദേശങ്ങളും കോളുകളും പ്രവർത്തനരഹിതമാക്കി. ക്രമീകരണം &gt; വിപുലമായ ക്രമീകരണം ൽ വീണ്ടും രജിസ്റ്റർ ചെയ്യാൻ ശ്രമിക്കുക.</string>
 
 
     <!-- GiphyActivity -->
@@ -1028,15 +1091,25 @@
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">ബാറ്ററി ഒപ്റ്റിമൈസേഷനുകൾ കൊണ്ടാകാം അറിയിപ്പുകൾ വൈകുന്നത്</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">സന്ദേശ അറിയിപ്പുകൾ വൈകുന്നില്ലെന്ന് ഉറപ്പാക്കാൻ നിങ്ങൾക്ക് Signal-നായുള്ള ബാറ്ററി ഒപ്റ്റിമൈസേഷനുകൾ പ്രവർത്തനരഹിതമാക്കാം.</string>
+    <string name="PromptBatterySaverBottomSheet__message">സന്ദേശ അറിയിപ്പുകൾ വൈകുന്നില്ലെന്ന് ഉറപ്പാക്കാൻ നിങ്ങൾക്ക് Molly-നായുള്ള ബാറ്ററി ഒപ്റ്റിമൈസേഷനുകൾ പ്രവർത്തനരഹിതമാക്കാം.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">ബാറ്ററി ഒപ്റ്റിമൈസേഷനുകൾ കൊണ്ടാകാം അറിയിപ്പുകൾ വൈകുന്നത്</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">സന്ദേശ അറിയിപ്പുകൾ വൈകുന്നില്ലെന്ന് ഉറപ്പാക്കാൻ നിങ്ങൾ Molly-നായുള്ള ബാറ്ററി ഒപ്റ്റിമൈസേഷനുകൾ പ്രവർത്തനരഹിതമാക്കുക. ഉപകരണ-നിർദ്ദിഷ്ട നിർദ്ദേശങ്ങൾ കാണാൻ \"തുടരുക\" ടാപ്പ് ചെയ്യുക.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">വേണ്ട</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">തുടരുക</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">തുടരുക</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">ഒഴിവാക്കുക</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">വേണ്ട</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">ശേഷിക്കുന്ന ഗ്രൂപ്പ് ക്ഷണങ്ങൾ</string>
+    <string name="PendingMembersActivity_pending_group_invites">അഭ്യർത്ഥനകൾ &amp; ക്ഷണങ്ങൾ</string>
     <string name="PendingMembersActivity_requests">അഭ്യർത്ഥനകൾ</string>
     <string name="PendingMembersActivity_invites">ക്ഷണങ്ങൾ</string>
     <string name="PendingMembersActivity_people_you_invited">നിങ്ങൾ ക്ഷണിച്ച ആളുകൾ</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">റദ്ദാക്കുക</string>
     <string name="InviteActivity_sending">അയയ്ക്കുന്നു…</string>
     <string name="InviteActivity_invitations_sent">ക്ഷണങ്ങൾ അയച്ചു!</string>
-    <string name="InviteActivity_invite_to_signal">Signal-ലേക്ക് ക്ഷണിക്കുക</string>
+    <string name="InviteActivity_invite_to_signal">Molly-ലേക്ക് ക്ഷണിക്കുക</string>
     <string name="InviteActivity_send_sms">(%1$d) SMS അയയ്ക്കുക</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">%1$d SMS ക്ഷണം അയയ്‌ക്കണോ?</item>
         <item quantity="other">%1$d SMS ക്ഷണങ്ങൾ അയയ്‌ക്കണോ?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Signal ലേക്ക് മാറാം: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Molly ലേക്ക് മാറാം: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">നിങ്ങൾക്ക് പങ്കിടാൻ അപ്ലിക്കേഷനുകളൊന്നുമില്ലെന്ന് തോന്നുന്നു.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">നിങ്ങളുടെ സന്ദേശം</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">പശ്ചാത്തല കണക്ഷൻ പ്രാപ്തമാക്കി</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">മറുപടികൾ</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal കോൾ സ്ഥാപിക്കുന്നു</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly കോൾ സ്ഥാപിക്കുന്നു</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signal കോൾ സേവനം ആരംഭിക്കുന്നു</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal കോൾ സേവനം നിർത്തുന്നു</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Molly കോൾ സേവനം ആരംഭിക്കുന്നു</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly കോൾ സേവനം നിർത്തുന്നു</string>
     <string name="NotificationBarManager__cancel_call">കോൾ റദ്ദാക്കുക</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">നിങ്ങൾ പേയ്മെന്റുകൾ ആക്‌ടിവേറ്റ് ചെയ്‌തു</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s എന്നയാൾക്ക് ഇപ്പോൾ പേയ്മെന്റുകൾ സ്വീകരിക്കാൻ കഴിയും</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">പേയ്‌മെൻ്റ് വിശദാംശങ്ങൾ ലഭ്യമല്ല</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">കൂടുതൽ ലഭിക്കുന്നതിനായി ടാപ് ചെയ്യുക</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">പേയ്‌മെൻ്റ് വിശദാംശങ്ങൾ ലഭ്യമല്ല</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">ഈ പേയ്‌മെൻ്റ് ചരിത്രം അടങ്ങിയിട്ടില്ലാത്ത ഒരു ഉറവിടത്തിൽ നിന്ന് നിങ്ങളുടെ സന്ദേശങ്ങൾ പുനഃസ്ഥാപിച്ചതിനാൽ ഈ പേയ്‌മെൻ്റിൻ്റെ വിശദാംശങ്ങൾ ലഭ്യമല്ല. ഇത് നിങ്ങളുടെ വാലറ്റ് ബാലൻസിനെയോ മുൻകാല പേയ്‌മെൻ്റുകളുടെ നിലയെയോ ബാധിക്കില്ല.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">ഉടൻ തന്നെ നിങ്ങൾക്ക് Signal-ൽ നിന്ന് SMS സന്ദേശങ്ങൾ അയയ്‌ക്കാൻ കഴിയാതാകുന്നതാണ്. സംഭാഷണം ഇവിടെ നിലനിർത്താൻ %1$s എന്നയാളെ Signal-ലേക്ക് ക്ഷണിക്കുക.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">നിങ്ങൾക്ക് ഇനി മുതൽ Signal-ൽ നിന്ന് SMS സന്ദേശങ്ങൾ അയയ്ക്കാൻ കഴിയുന്നതല്ല. സംഭാഷണം ഇവിടെ നിലനിർത്താൻ %1$s എന്നയാളെ Signal-ലേക്ക് ക്ഷണിക്കുക.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">നിങ്ങൾക്ക് ഇനി മുതൽ Molly-ൽ നിന്ന് SMS സന്ദേശങ്ങൾ അയയ്ക്കാൻ കഴിയുന്നതല്ല. സംഭാഷണം ഇവിടെ നിലനിർത്താൻ %1$s എന്നയാളെ Molly-ലേക്ക് ക്ഷണിക്കുക.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">പേയ്മെന്റ്: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">പേയ്മെന്റ്</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">സ്പാം റിപ്പോർട്ട് ചെയ്തു</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">ഒരു Signal ഉപകരണം ബന്ധിപ്പിക്കണോ?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">ഒരു മൂന്നാം കക്ഷി സ്കാനർ ഉപയോഗിച്ച് നിങ്ങൾ ഒരു Signal ഉപകരണം ബന്ധിപ്പിക്കാൻ ശ്രമിക്കുന്നതായി തോന്നുന്നു. നിങ്ങളുടെ പരിരക്ഷയ്‌ക്കായി, Signal-നുള്ളിൽ നിന്ന് കോഡ് വീണ്ടും സ്‌കാൻ ചെയ്യുക.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">ഒരു QR കോഡ് സ്കാൻ ചെയ്യുന്നതിന് Signal-ന് ക്യാമറ അനുമതി ആവശ്യമാണ്, പക്ഷേ ഇത് ശാശ്വതമായി നിരസിക്കപ്പെട്ടു. അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങളിൽ തുടരുക, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"ക്യാമറ\" പ്രവർത്തനക്ഷമമാക്കുക.</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">ഒരു QR കോഡ് സ്കാൻ ചെയ്യുന്നതിന് Molly-ന് ക്യാമറ അനുമതി ആവശ്യമാണ്, പക്ഷേ ഇത് ശാശ്വതമായി നിരസിക്കപ്പെട്ടു. അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങളിൽ തുടരുക, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"ക്യാമറ\" പ്രവർത്തനക്ഷമമാക്കുക.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">ക്യാമറ അനുമതിയില്ലാതെ ഒരു QR കോഡ് സ്കാൻ ചെയ്യാൻ കഴിയില്ല</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">രഹസ്യവാചകം നൽകുക</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal ഐക്കൺ</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly ഐക്കൺ</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">രഹസ്യവാചകം സമർപ്പിക്കുക</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">രഹസ്യവാചകം അസാധുവാണ്!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signal തുറക്കൂ</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - ലോക്ക് സ്‌ക്രീൻ</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Molly തുറക്കൂ</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - ലോക്ക് സ്‌ക്രീൻ</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">ഭൂപടം</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">സന്ദേശ വിനിമയം തുടരാൻ പരിശോധിക്കുക</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Signal-ലെ സ്പാം തടയാൻ സഹായിക്കുന്നതിന്, ദയവായി പരിശോധന പൂർത്തിയാക്കുക.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Molly-ലെ സ്പാം തടയാൻ സഹായിക്കുന്നതിന്, ദയവായി പരിശോധന പൂർത്തിയാക്കുക.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">പരിശോധിച്ചുറപ്പിച്ച ശേഷം, നിങ്ങൾക്ക് സന്ദേശ വിനിമയം തുടരാം. താൽ‌ക്കാലികമായി നിർത്തിയ ഏതെങ്കിലും സന്ദേശങ്ങള്‍ സ്വപ്രേരിതമായി അയയ്‌ക്കും.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">എന്റെ സ്റ്റോറി</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal കോൾ</string>
+    <string name="Recipient_signal_call">Molly കോൾ</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">ബ്ലോക്ക് ചെയ്യുക</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">റിംഗിംഗ്…</string>
     <string name="RedPhone_busy">തിരക്കിലാണ്</string>
     <string name="RedPhone_recipient_unavailable">സ്വീകർത്താവ് ലഭ്യമല്ല</string>
-    <string name="RedPhone_network_failed">നെറ്റ്‌വർക്ക് പരാജയപ്പെട്ടു!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">നെറ്റ്‌വർക്ക് പരാജയപ്പെട്ടു! നിങ്ങളുടെ നെറ്റ്‌വർക്ക് കണക്ഷൻ പരിശോധിച്ചശേഷം വീണ്ടും ശ്രമിക്കുക.</string>
     <string name="RedPhone_number_not_registered">നമ്പർ രജിസ്റ്റർ ചെയ്തിട്ടില്ല!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">നിങ്ങൾ ഡയൽ ചെയ്ത നമ്പർ സുരക്ഷിത ശബ്ദത്തെ പിന്തുണയ്ക്കുന്നില്ല!</string>
     <string name="RedPhone_got_it">മനസ്സിലായി</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">നിങ്ങളുടെ വീഡിയോ ഓൺ ചെയ്യാൻ ഇവിടെ തൊടുക</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s-യെ വിളിക്കാൻ, Signal-ന് നിങ്ങളുടെ ക്യാമറയിലേക്ക് ആക്സസ് ആവശ്യമാണ്</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s-യെ വിളിക്കാൻ, Molly-ന് നിങ്ങളുടെ ക്യാമറയിലേക്ക് ആക്സസ് ആവശ്യമാണ്</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">വിളിക്കുന്നു…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">റീകണക്ടിംഗ്…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">കോളിൽ നിന്ന് നീക്കം ചെയ്‌തു</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">നിങ്ങളെ ആരോ കോളിൽ നിന്ന് നീക്കം ചെയ്‌തു.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">നിങ്ങളുടെ ക്യാമറയിലേക്കും മൈക്രോഫോണിലേക്കും ആക്‌സസ് അനുവദിക്കുക</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">നിങ്ങളുടെ മൈക്രോഫോണിലേക്ക് ആക്‌സസ് അനുവദിക്കുക</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">നിങ്ങളുടെ ക്യാമറയിലേക്ക് ആക്സസ് അനുവദിക്കുക</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">ഒരു കോൾ ആരംഭിക്കുന്നതിനോ അതിൽ ചേരുന്നതിനോ, നിങ്ങളുടെ ക്യാമറയിലേക്കും മൈക്രോഫോണിലേക്കും Molly-ന് ആക്‌സസ് അനുവദിക്കുക.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">ഒരു കോൾ ആരംഭിക്കുന്നതിനോ അതിൽ ചേരുന്നതിനോ, നിങ്ങളുടെ മൈക്രോഫോണിലേക്ക് Molly-ന് ആക്‌സസ് അനുവദിക്കുക.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">വീഡിയോ പ്രവർത്തനക്ഷമമാക്കാൻ, നിങ്ങളുടെ ക്യാമറയിലേക്ക് Molly-ന് ആക്‌സസ് അനുവദിക്കുക.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">ഒരു കോൾ ആരംഭിക്കുന്നതിനോ അതിൽ ചേരുന്നതിനോ Molly-ന് മൈക്രോഫോൺ അനുമതികൾ ആവശ്യമാണ്.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">നിങ്ങളുടെ വീഡിയോ പ്രവർത്തനക്ഷമമാക്കാൻ Molly-ന് ക്യാമറ ആക്സസ് ആവശ്യമാണ്</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">ഒരു കോൾ ആരംഭിക്കുന്നതിനോ ചേരുന്നതിനോ:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">നിങ്ങളുടെ വീഡിയോ പ്രവർത്തനക്ഷമമാക്കാൻ:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal കോൾ</string>
-    <string name="WebRtcCallView__signal_video_call">Signal വീഡിയോ കോൾ</string>
+    <string name="WebRtcCallView__signal_call">Molly കോൾ</string>
+    <string name="WebRtcCallView__signal_video_call">Molly വീഡിയോ കോൾ</string>
     <string name="WebRtcCallView__start_call">കോൾ ആരംഭിക്കുക</string>
     <string name="WebRtcCallView__join_call">കോളിൽ ചേരുക</string>
     <string name="WebRtcCallView__call_is_full">കോൾ നിറഞ്ഞു</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">കൈ താഴ്ത്തണോ?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">കൈ താഴ്ത്തുക</string>
+    <string name="CallOverflowPopupWindow__lower_hand">താഴ്ത്തുക</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">റദ്ദാക്കുക</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">നിങ്ങൾ കൈ ഉയർത്തി</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">കാണുക</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s ഒരു കൈ ഉയർത്തി</item>
-        <item quantity="other">%1$s ഉം %2$d ഉം ഒരു കൈ ഉയർത്തി</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s ഒരു കൈ ഉയർത്തി</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d എന്നിവർ ഒരു കൈ ഉയർത്തി</item>
+        <item quantity="other">%1$s +%2$d എന്നിവർ ഒരു കൈ ഉയർത്തി</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s ഒരു കൈ ഉയർത്തി</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d എന്നിവർ ഒരു കൈ ഉയർത്തി</item>
+        <item quantity="other">%1$s +%2$d എന്നിവർ ഒരു കൈ ഉയർത്തി</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">ഈ നമ്പർ പരിശോധിക്കാൻ വേണ്ടി നിങ്ങൾക്ക് ഒരു കോൾ വരും.</string>
     <string name="RegistrationActivity_edit_number">നമ്പർ തിരുത്തുക</string>
     <string name="RegistrationActivity_missing_google_play_services">Google Play Services കാണുന്നില്ല</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">ഈ ഉപകരണത്തിന് Google Play Services കാണുന്നില്ല. നിങ്ങൾക്ക് ഇപ്പോഴും Signal ഉപയോഗിക്കാം, പക്ഷേ ഈ കോൺഫിഗറേഷൻ വിശ്വാസ്യതയോ പ്രകടനമോ കുറയാൻ കാരണമായേക്കാം.\n\nനിങ്ങൾ ഒരു നൂതന ഉപയോക്താവല്ലെങ്കിൽ, അഥവാ ഒരു വിപണനാനന്തര Android റോം പ്രവർത്തിപ്പിക്കുന്നില്ല, അല്ലെങ്കിൽ നിങ്ങൾ ഇത് തെറ്റായി കാണുന്നുവെന്ന് വിശ്വസിക്കുന്നുവെങ്കിൽ, പ്രശ്‌നപരിഹാരത്തിന്ദ യവായി support@signal.org-നെ ബന്ധപ്പെടുക.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">ഈ ഉപകരണത്തിന് Google Play Services കാണുന്നില്ല. നിങ്ങൾക്ക് ഇപ്പോഴും Molly ഉപയോഗിക്കാം, പക്ഷേ ഈ കോൺഫിഗറേഷൻ വിശ്വാസ്യതയോ പ്രകടനമോ കുറയാൻ കാരണമായേക്കാം.\n\nനിങ്ങൾ ഒരു നൂതന ഉപയോക്താവല്ലെങ്കിൽ, അഥവാ ഒരു വിപണനാനന്തര Android റോം പ്രവർത്തിപ്പിക്കുന്നില്ല, അല്ലെങ്കിൽ നിങ്ങൾ ഇത് തെറ്റായി കാണുന്നുവെന്ന് വിശ്വസിക്കുന്നുവെങ്കിൽ, പ്രശ്‌നപരിഹാരത്തിന്ദ യവായി support@molly.im-നെ ബന്ധപ്പെടുക.</string>
     <string name="RegistrationActivity_i_understand">എനിക്ക് മനസിലായി</string>
     <string name="RegistrationActivity_play_services_error">Play Services പിശക്</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services അപ്‌ഡേറ്റുചെയ്യുന്നു അല്ലെങ്കിൽ താൽക്കാലികമായി ലഭ്യമല്ല. ദയവായി വീണ്ടും ശ്രമിക്കുക.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">അംഗീകൃതമല്ലാത്ത നമ്പര്‍ രൂപം</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">നിങ്ങൾ നൽകിയ നമ്പർ (%1$s) അംഗീകൃതമല്ലാത്ത നമ്പര്‍ രൂപത്തില്‍ ആണെന്ന് തോന്നുന്നു.\n\nനിങ്ങൾ ഉദ്ദേശിച്ചത് %2$s എന്നാണോ?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal ആൻഡ്രോയിഡ് - ഫോണ്‍ നമ്പര്‍ രുപം</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly ആൻഡ്രോയിഡ് - ഫോണ്‍ നമ്പര്‍ രുപം</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">കോള്‍ അഭ്യർത്ഥിച്ചു</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">രജിസ്റ്റർ ചെയ്യുന്നതിൽ ബുദ്ധിമുട്ട് നേരിടുന്നുണ്ടോ?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• SMS-ഓ കോളോ ലഭിക്കാൻ നിങ്ങളുടെ ഫോണിൽ സെല്ലുലാർ സേവനമുണ്ടെന്ന് ഉറപ്പാക്കുക\n • ആ നമ്പറിലേക്ക് നിങ്ങൾക്ക് ഫോൺ കോൾ ലഭിക്കുമെന്ന് സ്ഥിരീകരിക്കുക • നിങ്ങളുടെ ഫോൺ നമ്പർ ശരിയായാണോ നൽകിയിരിക്കുന്നത് എന്ന് പരിശോധിക്കുക.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">കൂടുതൽ വിവരങ്ങൾക്ക്, ഈ ട്രബിൾഷൂട്ടിംഗ് ഘട്ടങ്ങൾ പാലിക്കുക അല്ലെങ്കിൽ പിന്തുണയുമായി ബന്ധപ്പെടുക</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">കൂടുതൽ വിവരങ്ങൾക്ക്, %1$s അല്ലെങ്കിൽ %2$s പിന്തുടരുക</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">ഈ ട്രബിൾഷൂട്ടിംഗ് ഘട്ടങ്ങൾ</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">കോൺടാക്റ്റുകളിൽ ചേർക്കൂ</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Signal-ലേക്ക് ക്ഷണിക്കുക</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Molly-ലേക്ക് ക്ഷണിക്കുക</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal സന്ദേശം</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal കോൾ</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">കോൺടാക്റ്റുകളിൽ ചേർക്കൂ</string>
-    <string name="SharedContactView_invite_to_signal">Signal-ലേക്ക് ക്ഷണിക്കുക</string>
+    <string name="SharedContactView_invite_to_signal">Molly-ലേക്ക് ക്ഷണിക്കുക</string>
     <string name="SharedContactView_message">Signal സന്ദേശം</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s %2$s എന്നയാളുടെ നമ്പറാണ്</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal അപ്‌ഡേറ്റ്</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal-ന്റെ ഒരു പുതിയ പതിപ്പ് ലഭ്യമാണ്. അപ്ഡേറ്റ് ചെയ്യാൻ ടാപ്പ് ചെയ്യുക.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal അപ്ഡേറ്റ് ചെയ്യാനായില്ല</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly അപ്‌ഡേറ്റ്</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly-ന്റെ ഒരു പുതിയ പതിപ്പ് ലഭ്യമാണ്. അപ്ഡേറ്റ് ചെയ്യാൻ ടാപ്പ് ചെയ്യുക.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly അപ്ഡേറ്റ് ചെയ്യാനായില്ല</string>
     <string name="ApkUpdateNotifications_failed_general_body">ഞങ്ങൾ പിന്നീട് വീണ്ടും ശ്രമിക്കും.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal അപ്ഡേറ്റ് ആയി</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly അപ്ഡേറ്റ് ആയി</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">%1$s പതിപ്പിലേക്ക് ഓട്ടോമാറ്റിക്കായി അപ്ഡേറ്റ് ആയി.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">ഞങ്ങളുടെ Signal സുരക്ഷാ നമ്പർ:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">നിങ്ങൾക്ക് പങ്കിടാൻ അപ്ലിക്കേഷനുകളൊന്നുമില്ലെന്ന് തോന്നുന്നു.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">താരതമ്യം ചെയ്യാനുള്ള സുരക്ഷാ നമ്പറൊന്നും ക്ലിപ്പ്ബോർഡിൽ കണ്ടെത്തിയില്ല</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">ഒരു ക്യുആർ കോഡ് സ്കാൻ ചെയ്യുന്നതിന് Signal-ന് ക്യാമറ അനുമതി ആവശ്യമാണ്, പക്ഷേ ഇത് ശാശ്വതമായി നിരസിക്കപ്പെട്ടു. അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങളിൽ തുടരുക, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"ക്യാമറ\" പ്രവർത്തനക്ഷമമാക്കുക.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">ഒരു ക്യുആർ കോഡ് സ്കാൻ ചെയ്യുന്നതിന് Molly-ന് ക്യാമറ അനുമതി ആവശ്യമാണ്, പക്ഷേ ഇത് ശാശ്വതമായി നിരസിക്കപ്പെട്ടു. അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങളിൽ തുടരുക, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"ക്യാമറ\" പ്രവർത്തനക്ഷമമാക്കുക.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">ക്യാമറ അനുമതിയില്ലാതെ QR കോഡ് സ്കാൻ ചെയ്യാൻ കഴിയില്ല</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">%1$s - ന്റെ സുരക്ഷാ നമ്പർ കാണുന്നതിന് നിങ്ങൾ ആദ്യം സന്ദേശങ്ങൾ കൈമാറണം.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">തുറക്കാൻ തൊടുക</string>
-    <string name="KeyCachingService_passphrase_cached">Signal തുറന്നിരിക്കുന്നൂ</string>
-    <string name="KeyCachingService_lock">Signal പൂട്ടുക</string>
+    <string name="KeyCachingService_passphrase_cached">Molly തുറന്നിരിക്കുന്നൂ</string>
+    <string name="KeyCachingService_lock">Molly പൂട്ടുക</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">നിങ്ങൾ</string>
     <string name="MediaPreviewActivity_unssuported_media_type">പിന്തുണയ്‌ക്കാത്ത മീഡിയ തരം</string>
     <string name="MediaPreviewActivity_draft">ഡ്രാഫ്റ്റ്</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">ബാഹ്യ സ്റ്റോറേജിലെക് സംരക്ഷിക്കുന്നതിന് Signal-ന് സ്റ്റോറജ് ​​അനുമതി ആവശ്യമാണ്, പക്ഷേ ഇത് ശാശ്വതമായി നിരസിക്കപ്പെട്ടു. അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങളിൽ തുടരുക, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"സ്റ്റോറജ്\" പ്രവർത്തനക്ഷമമാക്കുക.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">ബാഹ്യ സ്റ്റോറേജിലെക് സംരക്ഷിക്കുന്നതിന് Molly-ന് സ്റ്റോറജ് ​​അനുമതി ആവശ്യമാണ്, പക്ഷേ ഇത് ശാശ്വതമായി നിരസിക്കപ്പെട്ടു. അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങളിൽ തുടരുക, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"സ്റ്റോറജ്\" പ്രവർത്തനക്ഷമമാക്കുക.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">അനുമതിയില്ലാതെ ബാഹ്യ സ്റ്റോറേജിലേക്ക് സംരക്ഷിക്കാൻ കഴിയില്ല</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">സന്ദേശം ഇല്ലാതാക്കണോ?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">ഇത് ഈ സന്ദേശം ശാശ്വതമായി ഇല്ലാതാക്കും.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">സന്ദേശം കൈമാറുന്നതിൽ പരാജയപ്പെട്ടു.</string>
     <string name="MessageNotifier_error_delivering_message">സന്ദേശം കൈമാറുന്നതിൽ പിശക്.</string>
     <string name="MessageNotifier_message_delivery_paused">സന്ദേശ ഡെലിവറി താൽക്കാലികമായി നിർത്തി.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Signal-ൽ സന്ദേശ വിനിമയം തുടരാൻ പരിശോധിക്കുക.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Molly-ൽ സന്ദേശ വിനിമയം തുടരാൻ പരിശോധിക്കുക.</string>
     <string name="MessageNotifier_mark_all_as_read">എല്ലാം വായിച്ചതായി കാണിക്കുക</string>
     <string name="MessageNotifier_mark_read">വായിച്ചതായി കാണിക്കുക</string>
     <string name="MessageNotifier_turn_off_these_notifications">ഈ അറിയിപ്പുകൾ ഓഫ് ആക്കുക</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">നിങ്ങളുടെ സ്റ്റിക്കറിനോട് %1$s നൽകി പ്രതികരിച്ചു.</string>
     <string name="MessageNotifier_this_message_was_deleted">ഈ സന്ദേശം ഇല്ലാതാക്കി.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">\"കോൺ‌ടാക്റ്റ് Signal-ഇൽ (സിഗ്‌നലിൽ)‌ ചേർ‌ന്നു\" എന്ന അറിയിപ്പുകൾ ഓഫാക്കണോ? നിങ്ങൾക്ക് അവ വീണ്ടും പ്രവർത്തനക്ഷമമാക്കാം: Signal-ഇൽ (സിഗ്നലിൽ) &gt; ക്രമീകരണങ്ങൾ &gt; അറിയിപ്പുകൾ.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">\"കോൺ‌ടാക്റ്റ് Molly-ഇൽ (സിഗ്‌നലിൽ)‌ ചേർ‌ന്നു\" എന്ന അറിയിപ്പുകൾ ഓഫാക്കണോ? നിങ്ങൾക്ക് അവ വീണ്ടും പ്രവർത്തനക്ഷമമാക്കാം: Molly-ഇൽ (സിഗ്നലിൽ) &gt; ക്രമീകരണങ്ങൾ &gt; അറിയിപ്പുകൾ.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signal പൂട്ടിയിരിക്കുമ്പോൾ ദ്രുത പ്രതികരണം ലഭ്യമല്ല!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Molly പൂട്ടിയിരിക്കുമ്പോൾ ദ്രുത പ്രതികരണം ലഭ്യമല്ല!</string>
     <string name="QuickResponseService_problem_sending_message">സന്ദേശം അയയ്‌ക്കുന്നതിൽ പ്രശ്‌നം!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">കുറുക്കുവഴി അസാധുവാണ്</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">പുതിയ സന്ദേശം</string>
     <string name="SingleRecipientNotificationBuilder_message_request">സന്ദേശം അഭ്യർത്ഥന</string>
     <string name="SingleRecipientNotificationBuilder_you">നിങ്ങൾ</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">ഈ ഡിവൈസ് ഇനി രജിസ്റ്റർ ചെയ്‌തതല്ല. ഇതിന് കാരണം നിങ്ങളുടെ ഫോൺ നമ്പർ മറ്റൊരു ഡിവൈസിൽ Signal-ലിൽ രജിസ്റ്റർ ചെയ്‌തതാകാം.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">ഈ ഡിവൈസ് ഇനി രജിസ്റ്റർ ചെയ്‌തതല്ല. ഇതിന് കാരണം നിങ്ങളുടെ ഫോൺ നമ്പർ മറ്റൊരു ഡിവൈസിൽ Molly-ലിൽ രജിസ്റ്റർ ചെയ്‌തതാകാം.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">ഡിവൈസ് വീണ്ടും രജിസ്റ്റർ ചെയ്യുക</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">ഈ കോളിന് മറുപടി നൽകാൻ, നിങ്ങളുടെ മൈക്രോഫോണ്‍ ഉപയോഗിക്കാന്‍ Signal-നെ അനുവദിക്കുക.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">ഈ കോളിന് മറുപടി നൽകാൻ, നിങ്ങളുടെ മൈക്രോഫോണ്‍ ഉപയോഗിക്കാന്‍ Molly-നെ അനുവദിക്കുക.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">വീഡിയോ കോളിന് മറുപടി നൽകാൻ, Signal-ന് നിങ്ങളുടെ മൈക്രോഫോണും ക്യാമറയും ആക്‌സസ് ചെയ്യാനുള്ള അനുമതി നൽകുക.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">കോളുകൾ വിളിക്കുന്നതിനോ സ്വീകരിക്കുന്നതിനോ Signal-ന് മൈക്രോഫോൺ, ക്യാമറ അനുമതികൾ ആവശ്യമാണ്, പക്ഷേ അവ ശാശ്വതമായി നിരസിക്കപ്പെട്ടു. അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങളിൽ തുടരുക, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"മൈക്രോഫോൺ\", \"ക്യാമറ\" എന്നിവ പ്രവർത്തനക്ഷമമാക്കുക.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">വീഡിയോ കോളിന് മറുപടി നൽകാൻ, Molly-ന് നിങ്ങളുടെ മൈക്രോഫോണും ക്യാമറയും ആക്‌സസ് ചെയ്യാനുള്ള അനുമതി നൽകുക.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">കോളുകൾ വിളിക്കുന്നതിനോ സ്വീകരിക്കുന്നതിനോ Molly-ന് മൈക്രോഫോൺ, ക്യാമറ അനുമതികൾ ആവശ്യമാണ്, പക്ഷേ അവ ശാശ്വതമായി നിരസിക്കപ്പെട്ടു. അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങളിൽ തുടരുക, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"മൈക്രോഫോൺ\", \"ക്യാമറ\" എന്നിവ പ്രവർത്തനക്ഷമമാക്കുക.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">ഒരു ബന്ധിപ്പിച്ച ഉപകരണത്തിൽ ഉത്തരം നൽകി.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">ബന്ധിപ്പിച്ച ഉപകരണത്തിൽ നിരസിച്ചു.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">ബന്ധിപ്പിച്ച ഉപകരണത്തിൽ തിരക്കിലാണ്.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">പുതിയ രഹസ്യവാചകം ആവർത്തിക്കുക</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Signal-ലേക്ക് ക്ഷണിക്കുക</string>
+    <string name="contact_selection_activity__invite_to_signal">Molly-ലേക്ക് ക്ഷണിക്കുക</string>
     <string name="contact_selection_activity__new_group">പുതിയ ഗ്രൂപ്പ്</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">കോൺടാക്റ്റുകൾ പുതുക്കുക</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">ആരെയെങ്കിലും മിസ് ചെയ്യുന്നുണ്ടോ? റീഫ്രഷ് ചെയ്ത് നോക്കൂ</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">നിങ്ങൾക്ക് അറിയാവുന്ന ആളുകളെ Signal-ൽ കണ്ടെത്തുക</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">നിങ്ങളുടെ കോൺടാക്റ്റുകളിലേക്ക് ആക്സസ് അനുവദിക്കുക</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">കൂടുതൽ</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">കോൺ‌ടാക്റ്റിന്റെ ഫോട്ടോ</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">നിങ്ങളുടെ കോൺ‌ടാക്റ്റുകൾ പ്രദർശിപ്പിക്കുന്നതിന് Signal-ന് കോൺ‌ടാക്റ്റുകളുടെ അനുമതി ആവശ്യമാണ്, പക്ഷേ ഇത് ശാശ്വതമായി നിരസിക്കപ്പെട്ടു. അപ്ലിക്കേഷൻ ക്രമീകരണ മെനുവിൽ തുടരുക, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"കോൺടാക്റ്റുകൾ\" പ്രവർത്തനക്ഷമമാക്കുക.</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">നിങ്ങളുടെ കോൺ‌ടാക്റ്റുകൾ പ്രദർശിപ്പിക്കുന്നതിന് Molly-ന് കോൺ‌ടാക്റ്റുകളുടെ അനുമതി ആവശ്യമാണ്, പക്ഷേ ഇത് ശാശ്വതമായി നിരസിക്കപ്പെട്ടു. അപ്ലിക്കേഷൻ ക്രമീകരണ മെനുവിൽ തുടരുക, \"അനുമതികൾ\" തിരഞ്ഞെടുത്ത് \"കോൺടാക്റ്റുകൾ\" പ്രവർത്തനക്ഷമമാക്കുക.</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">കോൺ‌ടാക്റ്റുകൾ വീണ്ടെടുക്കുന്നതിൽ പിശക്, നിങ്ങളുടെ നെറ്റ്‌വർക്ക് കണക്ഷൻ പരിശോധിക്കുക</string>
     <string name="ContactSelectionListFragment_username_not_found">ഉപയോക്തൃനാമം കണ്ടെത്തിയില്ല</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" ഒരു Signal ഉപയോക്താവല്ല. ഉപയോക്തൃനാമം പരിശോധിച്ച് വീണ്ടും ശ്രമിക്കുക."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">ഉപയോക്തൃനാമം ഉപയോഗിച്ച് കണ്ടെത്തുക</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">കോൺടാക്‌റ്റുകളിലേക്ക് ആക്‌സസ് അനുവദിക്കുക</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">നിങ്ങൾക്ക് അറിയാവുന്ന ആളുകളെ Signal-ൽ കണ്ടെത്താൻ:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">ആക്സസ് അനുവദിക്കുക</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">വേണ്ട</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">നിങ്ങളുടെ കോൺടാക്റ്റുകളിലേക്ക് ആക്സസ് അനുവദിക്കുക. നിങ്ങളുടെ കോൺടാക്റ്റുകൾ എൻക്രിപ്റ്റ് ചെയ്‌തിരിക്കുന്നു, അത് Signal സേവനത്തിന് കാണാനാകില്ല.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal-ന് നിങ്ങളുടെ കോൺടാക്റ്റുകൾ പ്രദർശിപ്പിക്കുന്നതിന് അവയിലേക്ക് ആക്സസ് ആവശ്യമാണ്.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly-ന് നിങ്ങളുടെ കോൺടാക്റ്റുകൾ പ്രദർശിപ്പിക്കുന്നതിന് അവയിലേക്ക് ആക്സസ് ആവശ്യമാണ്.</string>
     <string name="contact_selection_list_fragment__show_contacts">കോൺ‌ടാക്റ്റുകൾ കാണിക്കുക</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">നിങ്ങൾ ഈ വ്യക്തിയെ നീക്കം ചെയ്തു, അവർക്ക് വീണ്ടും സന്ദേശം അയയ്ക്കുന്നതിലൂടെ വീണ്ടും അവരെ ലിസ്റ്റിലേക്ക് ചേർക്കും.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">ഓപ്ഷനുകൾ</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">അപ്‌ഡേറ്റ്</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">പ്ലേ … പോസ്</string>
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">ഗ്രൂപ്പ് വിവരണം</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Signal അപ്ഡേറ്റ് ചെയ്യുക</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Molly അപ്ഡേറ്റ് ചെയ്യുക</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Signal-ന്റെ ഈ പതിപ്പ് കാലഹരണപ്പെട്ടു. Signal ഉപയോഗിക്കുന്നത് തുടരാൻ ഇപ്പോൾ തന്നെ അപ്ഡേറ്റ് ചെയ്യുക.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Molly-ന്റെ ഈ പതിപ്പ് കാലഹരണപ്പെട്ടു. Molly ഉപയോഗിക്കുന്നത് തുടരാൻ ഇപ്പോൾ തന്നെ അപ്ഡേറ്റ് ചെയ്യുക.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">അപ്‌ഡേറ്റ്</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">പതുക്കെ</string>
     <string name="preferences__help">സഹായം</string>
     <string name="preferences__advanced">വിപുലമായ</string>
-    <string name="preferences__donate_to_signal">Signal-ന് സംഭാവന നൽകുക</string>
+    <string name="preferences__donate_to_signal">Molly-ന് സംഭാവന നൽകുക</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">സ്വകാര്യത</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">ആപ്പ് ഐക്കണും പേരും \"%1$s\" എന്നതായി മാറ്റുക</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">ആപ്പ് ഐക്കണും പേരും മാറ്റാൻ Signal അടയ്‌‌ക്കേണ്ടതുണ്ട്. അറിയിപ്പുകൾ എപ്പോഴും ഡിഫോൾട്ട് Signal ഐക്കണും പേരും ഡിസ്പ്ലേ ചെയ്യും.</string>
+    <string name="preferences__app_icon_dialog_description">ആപ്പ് ഐക്കണും പേരും മാറ്റാൻ Molly അടയ്‌‌ക്കേണ്ടതുണ്ട്. അറിയിപ്പുകൾ എപ്പോഴും ഡിഫോൾട്ട് Molly ഐക്കണും പേരും ഡിസ്പ്ലേ ചെയ്യും.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">ആപ്പ് ഐക്കണും പേരും തിരഞ്ഞെടുക്കുക, ഇത് നിങ്ങളുടെ ഫോണിന്റെ ഹോം സ്ക്രീനിലും ആപ്പ് ഡ്രോവറിലും കാണാനാകും. അറിയിപ്പുകൾ എപ്പോഴും ഡിഫോൾട്ട് Signal ഐക്കണും പേരും ഡിസ്പ്ലേ ചെയ്യും. കൂടുതലറിയുക</string>
+    <string name="preferences__app_icon_warning_learn_more">ആപ്പ് ഐക്കണും പേരും തിരഞ്ഞെടുക്കുക, ഇത് നിങ്ങളുടെ ഫോണിന്റെ ഹോം സ്ക്രീനിലും ആപ്പ് ഡ്രോവറിലും കാണാനാകും. അറിയിപ്പുകൾ എപ്പോഴും ഡിഫോൾട്ട് Molly ഐക്കണും പേരും ഡിസ്പ്ലേ ചെയ്യും. കൂടുതലറിയുക</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">ആപ്പ് ഐക്കണുകളും പേരുകളും ഹോം സ്ക്രീനിലും ആപ്പ് ഡ്രോവറിലും ദൃശ്യമാകും.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">അറിയിപ്പുകൾ എപ്പോഴും ഡിഫോൾട്ട് Signal ഐക്കണും പേരും ഡിസ്പ്ലേ ചെയ്യും.</string>
+    <string name="preferences__app_icon_notification_warning">അറിയിപ്പുകൾ എപ്പോഴും ഡിഫോൾട്ട് Molly ഐക്കണും പേരും ഡിസ്പ്ലേ ചെയ്യും.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">കൂടുതലറിയുക</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">ഇത് എല്ലാ ചാറ്റുകളും ഏറ്റവും പുതിയ %1$s സന്ദേശങ്ങളിലേക്ക് ശാശ്വതമായി ട്രിം ചെയ്യും.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">ഇത് നിങ്ങളുടെ ഉപകരണത്തിൽ നിന്ന് എല്ലാ സന്ദേശ ചരിത്രവും മീഡിയയും ശാശ്വതമായി ഇല്ലാതാക്കും</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">ഇത് ഈ ഉപകരണത്തിൽ നിന്നും ലിങ്ക് ചെയ്‌തിരിക്കുന്ന എല്ലാ ഉപകരണങ്ങളിൽ നിന്നും എല്ലാ സന്ദേശ ചരിത്രവും മീഡിയയും ശാശ്വതമായി ഇല്ലാതാക്കും.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">എല്ലാ സന്ദേശ ചരിത്രവും നീക്കം ചെയ്യണം എന്ന് ഉറപ്പാണോ?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">എല്ലാ സന്ദേശ ചരിത്രവും ശാശ്വതമായി നീക്കം ചെയ്യും. പിന്നീടിത് പഴയപടിയാക്കാൻ കഴിയില്ല.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">എല്ലാ സന്ദേശ ചരിത്രവും എല്ലാ ഉപകരണങ്ങളിൽ നിന്നും ശാശ്വതമായി നീക്കം ചെയ്യപ്പെടും. ഈ പ്രവൃത്തി പഴയപടിയാക്കാനാകില്ല.</string>
     <string name="preferences_storage__delete_all_now">എല്ലാം ഇപ്പോൾ ഇല്ലാതാക്കുക</string>
     <string name="preferences_storage__forever">എന്നേക്കും</string>
     <string name="preferences_storage__one_year">1 വർഷം</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">സെൻസർഷിപ്പ് ഒഴിവാക്കൽ</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">സെൻസർഷിപ്പ് ഒഴിവാക്കൽ</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">പ്രാപ്യമാക്കിയിട്ടുണ്ടെങ്കിൽ, സെൻസർഷിപ്പ് ഒഴിവാക്കാൻ Signal ശ്രമം നടത്തും. Signal സെൻസർ ചെയ്യുന്ന ഒരു ലൊക്കേഷനിൽ ആണ് നിങ്ങളെങ്കിൽ ഈ ഫീച്ചർ പ്രാപ്യമാക്കരുത്.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">പ്രാപ്യമാക്കിയിട്ടുണ്ടെങ്കിൽ, സെൻസർഷിപ്പ് ഒഴിവാക്കാൻ Molly ശ്രമം നടത്തും. Molly സെൻസർ ചെയ്യുന്ന ഒരു ലൊക്കേഷനിൽ ആണ് നിങ്ങളെങ്കിൽ ഈ ഫീച്ചർ പ്രാപ്യമാക്കരുത്.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">നിങ്ങളുടെ അക്കൗണ്ടിലെ ഫോൺ നമ്പർ അടിസ്ഥാനമാക്കി സെൻസർഷിപ്പ് ഒഴിവാക്കൽ പ്രാപ്തമാക്കിയിട്ടുണ്ട്.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">പേയ്മെന്റുകൾ അവതരിപ്പിക്കുന്നു</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">സ്വകാര്യതയ്ക്ക് പ്രാധാന്യം നൽകുന്ന പുതിയ ഡിജിറ്റൽ കറൻസിയായ MobileCoin അയയ്ക്കാനും സ്വീകരിക്കാനും Signal ഉപയോഗിക്കൂ. ആരംഭിക്കാൻ സജീവമാക്കൂ.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">സ്വകാര്യതയ്ക്ക് പ്രാധാന്യം നൽകുന്ന പുതിയ ഡിജിറ്റൽ കറൻസിയായ MobileCoin അയയ്ക്കാനും സ്വീകരിക്കാനും Molly ഉപയോഗിക്കൂ. ആരംഭിക്കാൻ സജീവമാക്കൂ.</string>
     <string name="PaymentsHomeFragment__activate_payments">പേയ്മെന്റുകൾ സജീവമാക്കുക</string>
     <string name="PaymentsHomeFragment__activating_payments">പേയ്‌മെന്റുകൾ സജീവമാക്കുന്നു…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">പേയ്മെന്റ് അക്കൗണ്ട് പുനഃസ്ഥാപിക്കുക</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">നിങ്ങളുടെ മേഖലയിൽ പേയ്‌മെന്റുകൾ ലഭ്യമല്ല.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">പേയ്‌മെന്റുകൾ പ്രാപ്തമാക്കാൻ കഴിഞ്ഞില്ല. പിന്നീട് വീണ്ടും ശ്രമിക്കുക.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">പേയ്‌മെന്റുകൾ നിർജ്ജീവമാക്കണോ?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">നിങ്ങൾ പേയ്മെന്റുകൾ നിർജ്ജീവമാക്കിയാൽ നിങ്ങൾക്ക് Signal-ൽ മൊബൈൽ കോയിൻ അയയ്ക്കാനോ സ്വീകരിക്കാനോ കഴിയില്ല.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">നിങ്ങൾ പേയ്മെന്റുകൾ നിർജ്ജീവമാക്കിയാൽ നിങ്ങൾക്ക് Molly-ൽ മൊബൈൽ കോയിൻ അയയ്ക്കാനോ സ്വീകരിക്കാനോ കഴിയില്ല.</string>
     <string name="PaymentsHomeFragment__deactivate">നിർജ്ജീവമാക്കുക</string>
     <string name="PaymentsHomeFragment__continue">തുടരുക</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">ബാലൻസ് നിലവിൽ ലഭ്യമല്ല.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">വിശദാംശങ്ങൾ</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">MobileCoin അയയ്ക്കാനും സ്വീകരിക്കാനും നിങ്ങൾക്ക് Signal ഉപയോഗിക്കാനാകും. എല്ലാ പേയ്മെന്റുകളും MobileCoins, MobileCoin വാലറ്റ് എന്നിവയുടെ ഉപയോഗ നയങ്ങൾക്ക് വിധേയമായിരിക്കും. നിങ്ങൾക്ക് ചില പ്രശ്‍നങ്ങൾ നേരിട്ടേക്കാം, നിങ്ങൾക്ക് നഷ്ടപ്പെട്ടേക്കാവുന്ന പേയ്മെന്റുകളോ ബാലൻസുകളോ വീണ്ടെടുക്കാനാകില്ല. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">MobileCoin അയയ്ക്കാനും സ്വീകരിക്കാനും നിങ്ങൾക്ക് Molly ഉപയോഗിക്കാനാകും. എല്ലാ പേയ്മെന്റുകളും MobileCoins, MobileCoin വാലറ്റ് എന്നിവയുടെ ഉപയോഗ നയങ്ങൾക്ക് വിധേയമായിരിക്കും. നിങ്ങൾക്ക് ചില പ്രശ്‍നങ്ങൾ നേരിട്ടേക്കാം, നിങ്ങൾക്ക് നഷ്ടപ്പെട്ടേക്കാവുന്ന പേയ്മെന്റുകളോ ബാലൻസുകളോ വീണ്ടെടുക്കാനാകില്ല. </string>
     <string name="PaymentsHomeFragment__activate">സജീവമാക്കുക</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">മൊബൈൽ കോയിൻ നിബന്ധനകൾ കാണുക</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Signal-ലെ പേയ്‌മെന്റുകൾ ഇനി ലഭ്യമല്ല. നിങ്ങൾക്ക് ഇപ്പോഴും ഒരു എക്സ്ചേഞ്ചിലേക്ക് ഫണ്ടുകൾ ട്രാൻസ്ഫർ ചെയ്യാൻ കഴിയും, എന്നാൽ നിങ്ങൾക്ക് ഇനി പേയ്മെന്റുകൾ അയയ്ക്കാനും കൂടാതെ സ്വീകരിക്കാനും അല്ലെങ്കിൽ ഫണ്ടുകൾ ചേർക്കാനോ കഴിയില്ല.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Molly-ലെ പേയ്‌മെന്റുകൾ ഇനി ലഭ്യമല്ല. നിങ്ങൾക്ക് ഇപ്പോഴും ഒരു എക്സ്ചേഞ്ചിലേക്ക് ഫണ്ടുകൾ ട്രാൻസ്ഫർ ചെയ്യാൻ കഴിയും, എന്നാൽ നിങ്ങൾക്ക് ഇനി പേയ്മെന്റുകൾ അയയ്ക്കാനും കൂടാതെ സ്വീകരിക്കാനും അല്ലെങ്കിൽ ഫണ്ടുകൾ ചേർക്കാനോ കഴിയില്ല.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">അനുമതികൾ അനുവദിക്കുക</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">നിങ്ങൾക്ക് സന്ദേശം അയയ്ക്കാനാകുന്ന ആളുകൾക്ക് സന്ദേശം എത്തിക്കാൻ നിങ്ങളെ സഹായിക്കാൻ, Signal ഈ അനുമതികൾ ചോദിക്കും. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">നിങ്ങൾക്ക് സന്ദേശം അയയ്ക്കാനാകുന്ന ആളുകൾക്ക് സന്ദേശം എത്തിക്കാൻ നിങ്ങളെ സഹായിക്കാൻ, Molly ഈ അനുമതികൾ ചോദിക്കും. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">അറിയിപ്പുകൾ</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">അടുത്തത്</string>
     <string name="PaymentsTransferFragment__invalid_address">അസാധുവായ വിലാസം</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">നിങ്ങൾ ട്രാൻസ്ഫർ ചെയ്യാൻ ശ്രമിക്കുന്ന വാലറ്റ് വിലാസം പരിശോധിക്കുക, വീണ്ടും ശ്രമിക്കുക.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">നിങ്ങളുടെ സ്വന്തം Signal വാലറ്റ് വിലാസത്തിലേക്ക് നിങ്ങൾക്ക് ട്രാൻസ്ഫർ ചെയ്യാൻ കഴിയില്ല. പിന്തുണയുള്ള എക്സ്ചേഞ്ചിൽ നിങ്ങളുടെ അക്കൗണ്ടിൽ നിന്ന് വാലറ്റ് വിലാസം നൽകുക.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">ഒരു ക്യുആർ കോഡ് സ്കാൻ ചെയ്യുന്നതിന്, Signal-ന് ക്യാമറയിലേക്ക് ആക്സസ് ആവശ്യമാണ്.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">ഒരു ക്യുആർ കോഡ് ക്യാപ്ച്വർ ചെയ്യുന്നതിന് Signal-ന് ക്യാമറയുടെ അനുമതി ആവശ്യമാണ്. ക്രമീകരണങ്ങളിലേക്ക് പോവുക, \"അനുമതികൾ\" തിരഞ്ഞെടുക്കുക, \"ക്യാമറ\" പ്രാപ്തമാക്കുക.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">ഒരു ക്യുആർ കോഡ് സ്കാൻ ചെയ്യുന്നതിന്, Signal-ന് ക്യാമറയിലേക്ക് ആക്സസ് ആവശ്യമാണ്.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">നിങ്ങളുടെ സ്വന്തം Molly വാലറ്റ് വിലാസത്തിലേക്ക് നിങ്ങൾക്ക് ട്രാൻസ്ഫർ ചെയ്യാൻ കഴിയില്ല. പിന്തുണയുള്ള എക്സ്ചേഞ്ചിൽ നിങ്ങളുടെ അക്കൗണ്ടിൽ നിന്ന് വാലറ്റ് വിലാസം നൽകുക.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">ഒരു ക്യുആർ കോഡ് സ്കാൻ ചെയ്യുന്നതിന്, Molly-ന് ക്യാമറയിലേക്ക് ആക്സസ് ആവശ്യമാണ്.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">ഒരു ക്യുആർ കോഡ് ക്യാപ്ച്വർ ചെയ്യുന്നതിന് Molly-ന് ക്യാമറയുടെ അനുമതി ആവശ്യമാണ്. ക്രമീകരണങ്ങളിലേക്ക് പോവുക, \"അനുമതികൾ\" തിരഞ്ഞെടുക്കുക, \"ക്യാമറ\" പ്രാപ്തമാക്കുക.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">ഒരു ക്യുആർ കോഡ് സ്കാൻ ചെയ്യുന്നതിന്, Molly-ന് ക്യാമറയിലേക്ക് ആക്സസ് ആവശ്യമാണ്.</string>
     <string name="PaymentsTransferFragment__settings">ക്രമീകരണങ്ങൾ</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">ഇൻകമിംഗ് Signal വോയ്‌സ് കോൾ</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">ഇൻകമിംഗ് Molly വോയ്‌സ് കോൾ</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">ഇൻകമിംഗ് Signal വീഡിയോ കോൾ</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">ഇൻകമിംഗ് Molly വീഡിയോ കോൾ</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Signal ഗ്രൂപ്പ് കോള്‍ വരുന്നു</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Molly ഗ്രൂപ്പ് കോള്‍ വരുന്നു</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">നടന്നുകൊണ്ടിരിക്കുന്ന Signal വോയ്‌സ് കോൾ</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">നടന്നുകൊണ്ടിരിക്കുന്ന Molly വോയ്‌സ് കോൾ</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">നടന്നുകൊണ്ടിരിക്കുന്ന Signal വീഡിയോ കോൾ</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">നടന്നുകൊണ്ടിരിക്കുന്ന Molly വീഡിയോ കോൾ</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">നടന്നുകൊണ്ടിരിക്കുന്ന Signal ഗ്രൂപ്പ് കോൾ</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">നടന്നുകൊണ്ടിരിക്കുന്ന Molly ഗ്രൂപ്പ് കോൾ</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">ലഭ്യമാക്കുന്നു…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">പരിശോധിക്കുക</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">നിങ്ങൾ ബാക്കപ്പിന്റെ രഹസ്യവാചകം വിജയകരമായി നൽകി</string>
     <string name="BackupDialog_passphrase_was_not_correct">രഹസ്യവാചകം ശരിയായിരുന്നില്ല</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signal ബാക്കപ്പ് സൃഷ്‌ടിക്കുന്നു…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Molly ബാക്കപ്പ് സൃഷ്‌ടിക്കുന്നു…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Signal ബാക്കപ്പ് പരിശോധിച്ചുറപ്പിക്കുന്നു…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Molly ബാക്കപ്പ് പരിശോധിച്ചുറപ്പിക്കുന്നു…</string>
     <string name="LocalBackupJobApi29_backup_failed">ബാക്കപ്പ് പരാജയപ്പെട്ടു </string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">നിങ്ങളുടെ ബാക്കപ്പ് ഡയറക്ടറി ഇല്ലാതാക്കി അല്ലെങ്കിൽ നീക്കി.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">ഈ വോളിയത്തിൽ സംഭരിക്കാനുംമാത്രം നിങ്ങളുടെ ബാക്കപ്പ് ഫയൽ വളരെ വലുതാണ്.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">എന്നെ വിളിക്കൂ (%1$02d%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">കോഡ് വീണ്ടും അയയ്ക്കുക (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Signal പിന്തുണ ബന്ധപ്പെടുക</string>
-    <string name="RegistrationActivity_code_support_subject">Signal രജിസ്ട്രേഷൻ - Android-നായുള്ള സ്ഥിരീകരണ കോഡ്</string>
+    <string name="RegistrationActivity_contact_signal_support">Molly പിന്തുണ ബന്ധപ്പെടുക</string>
+    <string name="RegistrationActivity_code_support_subject">Molly രജിസ്ട്രേഷൻ - Android-നായുള്ള സ്ഥിരീകരണ കോഡ്</string>
     <string name="RegistrationActivity_incorrect_code">കോഡ് തെറ്റാണ്</string>
     <string name="BackupUtil_never">ഒരിക്കലും വേണ്ട</string>
     <string name="BackupUtil_unknown">അജ്ഞാതം</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">ഫോൺ നമ്പർ</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">നിങ്ങളുടെ ഫോൺ നമ്പർ ആർക്കൊക്കെ കാണാനാകുമെന്നും ആർക്കൊക്കെ നിങ്ങളെ Signal-ൽ ബന്ധപ്പെടാനാകുമെന്നും തിരഞ്ഞെടുക്കൂ.</string>
+    <string name="preferences_app_protection__choose_who_can_see">നിങ്ങളുടെ ഫോൺ നമ്പർ ആർക്കൊക്കെ കാണാനാകുമെന്നും ആർക്കൊക്കെ നിങ്ങളെ Molly-ൽ ബന്ധപ്പെടാനാകുമെന്നും തിരഞ്ഞെടുക്കൂ.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">എന്റെ നമ്പർ ആർക്കൊക്കെ കാണാനാകും</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">നിങ്ങൾ വളരെയധികം ശ്രമങ്ങൾ നടത്തി. പിന്നീട് വീണ്ടും ശ്രമിക്കുക.</string>
     <string name="RegistrationActivity_error_connecting_to_service">സേവനത്തിലേക്ക് ബന്ധപ്പിക്കുന്നതിൽ പിശക്</string>
     <string name="preferences_chats__backups">ബാക്കപ്പുകൾ</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal പൂട്ടിയിരിക്കുന്നൂ</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly പൂട്ടിയിരിക്കുന്നൂ</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">തുറക്കാൻ തൊടുക</string>
     <string name="Recipient_unknown">അജ്ഞാതം</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">നിങ്ങളുടെ പഴയ ഉപകരണത്തിലേക്ക് നിങ്ങൾക്ക് ആക്സസ് ആവശ്യമാണ്.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">ബാക്കപ്പിൽ നിന്ന് പുനഃസ്ഥാപിക്കുക</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">ഒരു പ്രാദേശിക ബാക്കപ്പിൽ നിന്ന് നിങ്ങളുടെ സന്ദേശങ്ങള്‍ പുന:സ്ഥാപിക്കുക. നിങ്ങൾ ഇപ്പോൾ പുന:സ്ഥാപിക്കുന്നില്ലെങ്കിൽ, നിങ്ങൾക്ക് പിന്നീട് പുന:സ്ഥാപിക്കാൻ കഴിയില്ല.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">ലോക്കൽ ബാക്കപ്പ് പുനഃസ്ഥാപിക്കുക</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signal ബാക്കപ്പ് പുനഃസ്ഥാപിക്കുക</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">നിങ്ങളുടെ എല്ലാ വാചക സന്ദേശങ്ങളും + നിങ്ങളുടെ കഴിഞ്ഞ 30 ദിവസത്തെ മീഡിയയും പുനഃസ്ഥാപിക്കുക</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">കൂടുതൽ ഓപ്‌ഷനുകൾ</string>
 
+    <string name="TransferOrRestoreFragment__cancel">റദ്ദാക്കുക</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">കൈമാറ്റം ചെയ്യാതെ ലോഗിൻ ചെയ്യുക</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">നിങ്ങളുടെ സന്ദേശങ്ങളും മീഡിയയും കൈമാറാതെ തുടരുക</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">നിങ്ങളുടെ പഴയ ആൻഡ്രോയിഡ് ഫോണിൽ Signal തുറക്കുക</string>
     <string name="NewDeviceTransferInstructions__continue">തുടരുക</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">പഴയ ആൻഡ്രോയിഡ് ഉപകരണവുമായി ബന്ധിപ്പിക്കാൻ തയ്യാറെടുക്കുന്നു…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">ഒരു നിമിഷം എടുക്കുന്നു, ഉടൻ തയ്യാറാകണം</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">പഴയ ആൻഡ്രോയിഡ് ഉപകരണം ബന്ധിപ്പിക്കാൻ കാത്തിരിക്കുന്നു…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">നിങ്ങളുടെ പഴയ ആൻഡ്രോയിഡ് ഉപകരണവുമായി കണ്ടെത്തുന്നതിനും ബന്ധിപ്പിക്കുന്നതിനും Signal-ന് ലൊക്കേഷൻ അനുമതി ആവശ്യമാണ്.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">നിങ്ങളുടെ പഴയ ആൻഡ്രോയിഡ് ഉപകരണം കണ്ടെത്തുന്നതിനും ബന്ധിപ്പിക്കുന്നതിനും പ്രാപ്തമാക്കിയ ലൊക്കേഷൻ സേവനങ്ങൾ Signal-ന് ആവശ്യമാണ്.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">നിങ്ങളുടെ പഴയ ആൻഡ്രോയിഡ് ഉപകരണം കണ്ടെത്തുന്നതിനും ബന്ധിപ്പിക്കുന്നതിനും Signal-ന് വൈ-ഫൈ ആവശ്യമാണ്. വൈ-ഫൈ ഓണായിരിക്കേണ്ടതുണ്ട്, പക്ഷേ അത് ഒരു വൈ-ഫൈ നെറ്റ്‌വർക്കുമായി ബന്ധിപ്പിക്കേണ്ടതില്ല.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">ക്ഷമിക്കണം, ഈ ഉപകരണം വൈ-ഫൈ ഡയറക്റ്റിനെ പിന്തുണയ്ക്കുന്നില്ലെന്ന് തോന്നുന്നു. നിങ്ങളുടെ പഴയ ആൻഡ്രോയിഡ് ഉപകരണം കണ്ടെത്തുന്നതിനും ബന്ധിപ്പിക്കുന്നതിനും Signal വൈ-ഫൈ ഡയറക്റ്റ് ഉപയോഗിക്കുന്നു. നിങ്ങളുടെ പഴയ ആൻഡ്രോയിഡ് ഉപകരണത്തിൽ നിന്ന് നിങ്ങളുടെ അക്കൗണ്ട് പുന:സ്ഥാപിക്കുന്നതിന് നിങ്ങൾക്ക് ഇപ്പോഴും ഒരു ബാക്കപ്പ് പുന:സ്ഥാപിക്കാൻ കഴിയും.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">നിങ്ങളുടെ പഴയ ആൻഡ്രോയിഡ് ഉപകരണവുമായി കണ്ടെത്തുന്നതിനും ബന്ധിപ്പിക്കുന്നതിനും Molly-ന് ലൊക്കേഷൻ അനുമതി ആവശ്യമാണ്.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">നിങ്ങളുടെ പഴയ ആൻഡ്രോയിഡ് ഉപകരണം കണ്ടെത്തുന്നതിനും ബന്ധിപ്പിക്കുന്നതിനും പ്രാപ്തമാക്കിയ ലൊക്കേഷൻ സേവനങ്ങൾ Molly-ന് ആവശ്യമാണ്.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">നിങ്ങളുടെ പഴയ ആൻഡ്രോയിഡ് ഉപകരണം കണ്ടെത്തുന്നതിനും ബന്ധിപ്പിക്കുന്നതിനും Molly-ന് വൈ-ഫൈ ആവശ്യമാണ്. വൈ-ഫൈ ഓണായിരിക്കേണ്ടതുണ്ട്, പക്ഷേ അത് ഒരു വൈ-ഫൈ നെറ്റ്‌വർക്കുമായി ബന്ധിപ്പിക്കേണ്ടതില്ല.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">ക്ഷമിക്കണം, ഈ ഉപകരണം വൈ-ഫൈ ഡയറക്റ്റിനെ പിന്തുണയ്ക്കുന്നില്ലെന്ന് തോന്നുന്നു. നിങ്ങളുടെ പഴയ ആൻഡ്രോയിഡ് ഉപകരണം കണ്ടെത്തുന്നതിനും ബന്ധിപ്പിക്കുന്നതിനും Molly വൈ-ഫൈ ഡയറക്റ്റ് ഉപയോഗിക്കുന്നു. നിങ്ങളുടെ പഴയ ആൻഡ്രോയിഡ് ഉപകരണത്തിൽ നിന്ന് നിങ്ങളുടെ അക്കൗണ്ട് പുന:സ്ഥാപിക്കുന്നതിന് നിങ്ങൾക്ക് ഇപ്പോഴും ഒരു ബാക്കപ്പ് പുന:സ്ഥാപിക്കാൻ കഴിയും.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">ഒരു ബാക്കപ്പ് വീണ്ടെടുക്കുക</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">നിങ്ങളുടെ പഴയ ആൻഡ്രോയിഡ് ഉപകരണവുമായി ബന്ധിപ്പിക്കാൻ ശ്രമിക്കുമ്പോൾ അപ്രതീക്ഷിത പിശക് സംഭവിച്ചു.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">പുതിയ ആൻഡ്രോയിഡ് ഉപകരണം തിരയുന്നു…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">നിങ്ങളുടെ പുതിയ ആൻഡ്രോയിഡ് ഉപകരണം കണ്ടെത്തുന്നതിനും ബന്ധിപ്പിക്കുന്നതിനും Signal-ന് ലൊക്കേഷൻ അനുമതി ആവശ്യമാണ്.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">നിങ്ങളുടെ പുതിയ ആൻഡ്രോയിഡ് ഉപകരണം കണ്ടെത്തുന്നതിനും ബന്ധിപ്പിക്കുന്നതിനും പ്രാപ്തമാക്കിയ ലൊക്കേഷൻ സേവനങ്ങൾ Signal-ന് ആവശ്യമാണ്.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">നിങ്ങളുടെ പുതിയ ആൻഡ്രോയിഡ് ഉപകരണം കണ്ടെത്തുന്നതിനും ബന്ധിപ്പിക്കുന്നതിനും Signal-ന് വൈ-ഫൈ ആവശ്യമാണ്. വൈ-ഫൈ ഓണായിരിക്കേണ്ടതുണ്ട്, പക്ഷേ അത് ഒരു വൈ-ഫൈ നെറ്റ്‌വർക്കിലേക്ക് ബന്ധിപ്പിക്കേണ്ടതില്ല.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">ക്ഷമിക്കണം, ഈ ഉപകരണം വൈ-ഫൈ ഡയറക്റ്റിനെ പിന്തുണയ്ക്കുന്നില്ലെന്ന് പ്രത്യക്ഷപ്പെടുന്നു. നിങ്ങളുടെ പുതിയ ആൻഡ്രോയിഡ് ഉപകരണം കണ്ടെത്തുന്നതിനും ബന്ധിപ്പിക്കുന്നതിനും Signal വൈ-ഫൈ ഡയറക്റ്റ് ഉപയോഗിക്കുന്നു. നിങ്ങളുടെ പുതിയ ആൻഡ്രോയിഡ് ഉപകരണത്തിൽ നിങ്ങളുടെ അക്കൗണ്ട് പുന:സ്ഥാപിക്കുന്നതിന് നിങ്ങൾക്ക് ഇപ്പോഴും ഒരു ബാക്കപ്പ് സൃഷ്ടിക്കാൻ കഴിയും.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">നിങ്ങളുടെ പുതിയ ആൻഡ്രോയിഡ് ഉപകരണം കണ്ടെത്തുന്നതിനും ബന്ധിപ്പിക്കുന്നതിനും Molly-ന് ലൊക്കേഷൻ അനുമതി ആവശ്യമാണ്.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">നിങ്ങളുടെ പുതിയ ആൻഡ്രോയിഡ് ഉപകരണം കണ്ടെത്തുന്നതിനും ബന്ധിപ്പിക്കുന്നതിനും പ്രാപ്തമാക്കിയ ലൊക്കേഷൻ സേവനങ്ങൾ Molly-ന് ആവശ്യമാണ്.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">നിങ്ങളുടെ പുതിയ ആൻഡ്രോയിഡ് ഉപകരണം കണ്ടെത്തുന്നതിനും ബന്ധിപ്പിക്കുന്നതിനും Molly-ന് വൈ-ഫൈ ആവശ്യമാണ്. വൈ-ഫൈ ഓണായിരിക്കേണ്ടതുണ്ട്, പക്ഷേ അത് ഒരു വൈ-ഫൈ നെറ്റ്‌വർക്കിലേക്ക് ബന്ധിപ്പിക്കേണ്ടതില്ല.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">ക്ഷമിക്കണം, ഈ ഉപകരണം വൈ-ഫൈ ഡയറക്റ്റിനെ പിന്തുണയ്ക്കുന്നില്ലെന്ന് പ്രത്യക്ഷപ്പെടുന്നു. നിങ്ങളുടെ പുതിയ ആൻഡ്രോയിഡ് ഉപകരണം കണ്ടെത്തുന്നതിനും ബന്ധിപ്പിക്കുന്നതിനും Molly വൈ-ഫൈ ഡയറക്റ്റ് ഉപയോഗിക്കുന്നു. നിങ്ങളുടെ പുതിയ ആൻഡ്രോയിഡ് ഉപകരണത്തിൽ നിങ്ങളുടെ അക്കൗണ്ട് പുന:സ്ഥാപിക്കുന്നതിന് നിങ്ങൾക്ക് ഇപ്പോഴും ഒരു ബാക്കപ്പ് സൃഷ്ടിക്കാൻ കഴിയും.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">ഒരു ബാക്കപ്പ് സൃഷ്ടിക്കുക</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">നിങ്ങളുടെ പുതിയ ആൻഡ്രോയിഡ് ഉപകരണവുമായി ബന്ധിപ്പിക്കാൻ ശ്രമിക്കുമ്പോൾ അപ്രതീക്ഷിത പിശക് സംഭവിച്ചു.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">ഡാറ്റ കൈമാറുന്നു</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">രണ്ട് ഉപകരണങ്ങളും പരസ്പരം അടുത്ത് വയ്ക്കുക. ഉപകരണങ്ങൾ ഓഫ് ചെയ്യരുത്, Signal തുറന്നിടുക. ട്രാൻസ്ഫറുകൾ ആദ്യാവസാനം എൻക്രിപ്റ്റ് ചെയ്തിരിക്കുന്നു.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">രണ്ട് ഉപകരണങ്ങളും പരസ്പരം അടുത്ത് വയ്ക്കുക. ഉപകരണങ്ങൾ ഓഫ് ചെയ്യരുത്, Molly തുറന്നിടുക. ട്രാൻസ്ഫറുകൾ ആദ്യാവസാനം എൻക്രിപ്റ്റ് ചെയ്തിരിക്കുന്നു.</string>
     <string name="DeviceTransfer__d_messages_so_far">ഇതുവരെ %1$d സന്ദേശങ്ങൾ</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">ഇതുവരെ %1$s %% സന്ദേശങ്ങള്‍ …</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">അക്കൗണ്ട് കൈമാറ്റം ചെയ്യുക</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">നിങ്ങളുടെ പുതിയ Android ഉപകരണത്തിൽ Signal ഡൗൺലോഡുചെയ്യുക</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">നിങ്ങളുടെ പുതിയ Android ഉപകരണത്തിൽ Molly ഡൗൺലോഡുചെയ്യുക</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"\"അക്കൗണ്ട് ട്രാൻസ്ഫർ അല്ലെങ്കിൽ പുന:സ്ഥാപിക്കുക\" തൊടുക"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">ഈ ലിങ്കുള്ള ആർക്കും ഗ്രൂപ്പിന്റെ പേരും ഫോട്ടോയും കാണാനും ഗ്രൂപ്പിൽ ചേരാനും കഴിയും. നിങ്ങൾ വിശ്വസിക്കുന്ന ആളുകളുമായി ഇത് പങ്കിടുക.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">ഈ ലിങ്കുള്ള ആർക്കും ഗ്രൂപ്പിന്റെ പേരും ഫോട്ടോയും കാണാനും ഗ്രൂപ്പിൽ ചേരാനും കഴിയും. നിങ്ങൾ വിശ്വസിക്കുന്ന ആളുകളുമായി ഇത് പങ്കിടുക.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Signal വഴി പങ്കിടുക</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Molly വഴി പങ്കിടുക</string>
     <string name="GroupLinkBottomSheet_copy">പകർത്തുക</string>
     <string name="GroupLinkBottomSheet_qr_code">QR കോഡ്</string>
     <string name="GroupLinkBottomSheet_share">പങ്കിടുക</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">MobileCoin-നെ കുറിച്ച്</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin ഒരു പുതിയ സ്വകാര്യതാ കേന്ദ്രീകൃതമായ ഡിജിറ്റൽ കറൻസിയാണ്.</string>
     <string name="payment_info_card_adding_funds">ഫണ്ടുകൾ ചേർക്കുന്നു</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">നിങ്ങളുടെ വാലറ്റ് വിലാസത്തിലേക്ക് മൊബൈൽകോയിൻ അയച്ചുകൊണ്ട് Signal-ൽ ഉപയോഗിക്കുന്നതിനുള്ള ഫണ്ടുകൾ നിങ്ങൾക്ക് ചേർക്കാം.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">നിങ്ങളുടെ വാലറ്റ് വിലാസത്തിലേക്ക് മൊബൈൽകോയിൻ അയച്ചുകൊണ്ട് Molly-ൽ ഉപയോഗിക്കുന്നതിനുള്ള ഫണ്ടുകൾ നിങ്ങൾക്ക് ചേർക്കാം.</string>
     <string name="payment_info_card_cashing_out">പണമാക്കുക</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">മൊബൈൽ കോയിൻ പിന്തുണയ്ക്കുന്ന ഒരു എക്സ്ചേഞ്ചിൽ നിങ്ങൾക്ക് ഏത് സമയത്തും മൊബൈൽ കോയിൻ ക്യാഷ് ചെയ്യാം. ആ എക്സ്ചേഞ്ചിൽ നിങ്ങളുടെ അക്കൗണ്ടിലേക്ക് ഒരു ട്രാൻസ്ഫർ നടത്തുക.</string>
     <string name="payment_info_card_hide_this_card">ഈ കാർഡ് മറയ്ക്കുക</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">വാലറ്റ് നിർജ്ജീവമാക്കുക</string>
     <string name="DeactivateWalletFragment__your_balance">നിങ്ങളുടെ ബാലൻസ്</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">പേയ്‌മെന്റുകൾ നിർജ്ജീവമാക്കുന്നതിന് മുമ്പ് നിങ്ങളുടെ ഫണ്ടുകൾ മറ്റൊരു വാലറ്റ് വിലാസത്തിലേക്ക് ട്രാൻസ്ഫർ ചെയ്യാൻ ശുപാർശ ചെയ്യുന്നു. നിങ്ങളുടെ ഫണ്ടുകൾ ഇപ്പോൾ ട്രാൻസ്ഫർ ചെയ്യാതിരിക്കാൻ നിങ്ങൾ തീരുമാനിക്കുകയും, നിങ്ങൾ പേയ്‌മെന്റുകൾ വീണ്ടും സജീവമാക്കുകയുമാണെങ്കിൽ, Signal-മായി ബന്ധിപ്പിച്ചിട്ടുള്ള നിങ്ങളുടെ വാലറ്റിൽ അവ തുടരും.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">പേയ്‌മെന്റുകൾ നിർജ്ജീവമാക്കുന്നതിന് മുമ്പ് നിങ്ങളുടെ ഫണ്ടുകൾ മറ്റൊരു വാലറ്റ് വിലാസത്തിലേക്ക് ട്രാൻസ്ഫർ ചെയ്യാൻ ശുപാർശ ചെയ്യുന്നു. നിങ്ങളുടെ ഫണ്ടുകൾ ഇപ്പോൾ ട്രാൻസ്ഫർ ചെയ്യാതിരിക്കാൻ നിങ്ങൾ തീരുമാനിക്കുകയും, നിങ്ങൾ പേയ്‌മെന്റുകൾ വീണ്ടും സജീവമാക്കുകയുമാണെങ്കിൽ, Molly-മായി ബന്ധിപ്പിച്ചിട്ടുള്ള നിങ്ങളുടെ വാലറ്റിൽ അവ തുടരും.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">ബാക്കിയുള്ള ബാലൻസ് ട്രാൻസ്ഫർ ചെയ്യുക</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">ട്രാൻസ്ഫർ ചെയ്യാതെ നിർജ്ജീവമാക്കുക</string>
     <string name="DeactivateWalletFragment__deactivate">നിർജ്ജീവമാക്കുക</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">ട്രാൻസ്ഫർ ചെയ്യാതെ നിർജ്ജീവമാക്കുക?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">പേയ്‌മെന്റുകൾ വീണ്ടും സജീവമാക്കാൻ നിങ്ങൾ തീരുമാനിക്കുകയാണെങ്കിൽ, Signal-മായി ബന്ധിപ്പിച്ചിട്ടുള്ള നിങ്ങളുടെ വാലറ്റിൽ നിങ്ങളുടെ ബാലൻസ് തുടരും.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">പേയ്‌മെന്റുകൾ വീണ്ടും സജീവമാക്കാൻ നിങ്ങൾ തീരുമാനിക്കുകയാണെങ്കിൽ, Molly-മായി ബന്ധിപ്പിച്ചിട്ടുള്ള നിങ്ങളുടെ വാലറ്റിൽ നിങ്ങളുടെ ബാലൻസ് തുടരും.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">വാലറ്റ് നിർജ്ജീവമാക്കുന്നതിൽ പിശക്.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">ലൈസൻസുകൾ</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">നിബന്ധനകളും സ്വകാര്യതാ നയവും</string>
-    <string name="HelpFragment__copyright_signal_messenger">പകർപ്പവകാശ Signal സന്ദേശകന്‍</string>
+    <string name="HelpFragment__copyright_signal_messenger">പകർപ്പവകാശ Molly സന്ദേശകന്‍</string>
     <string name="HelpFragment__licenced_under_the_agplv3">GNU AGPLv3-യ്ക്ക് കീഴിൽ ലൈസൻസ് ചെയ്‌തത്</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">ഒരു നിറം തിരഞ്ഞെടുക്കുക</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">പങ്കിടുക</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">അഡ്‌മിൻമാർക്ക് മാത്രമേ ഈ ഗ്രൂപ്പിലേക്ക് സന്ദേശങ്ങള്‍ അയയ്‌ക്കാൻ കഴിയൂ.</string>
-    <string name="MultiselectForwardFragment__limit_reached">പരിധി എത്തി</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">നിങ്ങൾക്ക് 5 ചാറ്റുകളിൽ കൂടുതൽ തിരഞ്ഞെടുക്കാനാകില്ല</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">കൂടുതലറിയുക</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Signal അപ്ഡേറ്റ് ചെയ്യുക</string>
+    <string name="UpdateSignalExpiredDialog__title">Molly അപ്ഡേറ്റ് ചെയ്യുക</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Signal-ന്റെ ഈ പതിപ്പ് കാലഹരണപ്പെട്ടു. Signal ഉപയോഗിക്കുന്നത് തുടരാൻ ഇപ്പോൾ തന്നെ അപ്ഡേറ്റ് ചെയ്യുക.</string>
+    <string name="UpdateSignalExpiredDialog__message">Molly-ന്റെ ഈ പതിപ്പ് കാലഹരണപ്പെട്ടു. Molly ഉപയോഗിക്കുന്നത് തുടരാൻ ഇപ്പോൾ തന്നെ അപ്ഡേറ്റ് ചെയ്യുക.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">അപ്‌ഡേറ്റ്</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">ഡിവൈസ് രജിസ്റ്റർ ചെയ്‌തിട്ടില്ല</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">ഈ ഡിവൈസ് ഇനി രജിസ്റ്റർ ചെയ്‌തതല്ല. ഈ ഉപകരണത്തിൽ Signal ഉപയോഗിക്കുന്നത് തുടരാൻ വീണ്ടും രജിസ്റ്റർ ചെയ്യുക.</string>
+    <string name="ReregisterSignalDialog__message">ഈ ഡിവൈസ് ഇനി രജിസ്റ്റർ ചെയ്‌തതല്ല. ഈ ഉപകരണത്തിൽ Molly ഉപയോഗിക്കുന്നത് തുടരാൻ വീണ്ടും രജിസ്റ്റർ ചെയ്യുക.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">റീ-രജിസ്റ്റർ ചെയ്യുക</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">പിക്കർ തുറക്കുന്നത് പരാജയപ്പെട്ടു.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">അറിയിപ്പുകൾ പ്രവർത്തനക്ഷമമാക്കാൻ, Signal-ന് അവ പ്രദർശിപ്പിക്കാനുള്ള അനുമതി വേണം.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">അറിയിപ്പുകൾ പ്രവർത്തനക്ഷമമാക്കാൻ, Molly-ന് അവ പ്രദർശിപ്പിക്കാനുള്ള അനുമതി വേണം.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">ഓൺ ചെയ്യുക</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">ഇതുവരെ മറുപടികളൊന്നുമില്ല</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">നിങ്ങൾ നിലവിൽ ഈ ഗ്രൂപ്പിൽ അംഗമല്ലാത്തതിനാൽ, നിങ്ങൾക്ക് ഈ സ്റ്റോറിക്ക് മറുപടി അയയ്‌ക്കാൻ കഴിയില്ല.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">സ്റ്റോറിയോട് പ്രതികരിച്ചു</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">സ്റ്റോറിയോട് പ്രതികരിച്ചു</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">സ്റ്റോറിയോട് പ്രതികരിച്ചു</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">കാഴ്ച്ചകൾ</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">നിങ്ങളുടെ ബാങ്ക് തിരഞ്ഞെടുക്കുക</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">%1$s എന്നതുമായുള്ള നിങ്ങളുടെ സംഭാവന സ്ഥിരീകരിക്കുക</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">ആവർത്തിച്ചുള്ള സംഭാവന സജ്ജീകരിക്കാൻ, €0,01 നിരക്ക് നിങ്ങളുടെ ബാങ്കുമായി സ്ഥിരീകരിക്കാൻ \'തുടരുക\' ടാപ്പ് ചെയ്യുക. ഇത് ഓട്ടോമാറ്റിയ്ക്കായി റീഫണ്ട് ചെയ്യുകയും നിങ്ങളുടെ അക്കൗണ്ടിൽ നിന്ന് €5/മാസം സംഭാവന ഡെബിറ്റ് ചെയ്യാൻ അനുവദിക്കുകയും ചെയ്യും.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">ആവർത്തിച്ചുള്ള സംഭാവന സജ്ജീകരിക്കാൻ, €0,01 നിരക്ക് നിങ്ങളുടെ ബാങ്കുമായി സ്ഥിരീകരിക്കാൻ \'തുടരുക\' ടാപ്പ് ചെയ്യുക. ഇത് ഓട്ടോമാറ്റിയ്ക്കായി റീഫണ്ട് ചെയ്യുകയും നിങ്ങളുടെ അക്കൗണ്ടിൽ നിന്ന് %1$s/മാസം സംഭാവന ഡെബിറ്റ് ചെയ്യാൻ അനുവദിക്കുകയും ചെയ്യും.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">തുടരുക</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">ബാക്കപ്പ് ഡാറ്റ ഡൗൺലോഡ് ചെയ്യുന്നു…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">മീഡിയ ബാക്കപ്പുകൾ ഓഫാണ്</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">നിങ്ങളുടെ പേയ്‌മെൻ്റ് പ്രോസസ്സ് ചെയ്യാൻ കഴിയാത്തതിനാൽ നിങ്ങളുടെ Signal മീഡിയ ബാക്കപ്പ് പ്ലാൻ റദ്ദാക്കപ്പെട്ടു. നിങ്ങളുടെ ബാക്കപ്പിൽ സംഭരിച്ചിരിക്കുന്ന ഏതെങ്കിലും മീഡിയ ഡൗൺലോഡ് ചെയ്യാൻ നിങ്ങൾക്ക് %1$d ദിവസമുണ്ട്. %1$d ദിവസത്തിന് ശേഷം, നിങ്ങളുടെ ബാക്കപ്പിലെ മീഡിയ ഇല്ലാതാക്കപ്പെടും.</item>
+        <item quantity="other">നിങ്ങളുടെ പേയ്‌മെൻ്റ് പ്രോസസ്സ് ചെയ്യാൻ കഴിയാത്തതിനാൽ നിങ്ങളുടെ Signal മീഡിയ ബാക്കപ്പ് പ്ലാൻ റദ്ദാക്കപ്പെട്ടു. നിങ്ങളുടെ ബാക്കപ്പിൽ സംഭരിച്ചിരിക്കുന്ന ഏതെങ്കിലും മീഡിയ ഡൗൺലോഡ് ചെയ്യാൻ നിങ്ങൾക്ക് %1$d ദിവസമുണ്ട്. %1$d ദിവസത്തിന് ശേഷം, നിങ്ങളുടെ ബാക്കപ്പിലെ മീഡിയ ഇല്ലാതാക്കപ്പെടും.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">നിങ്ങളുടെ എല്ലാ മീഡിയയും ബാക്കപ്പ് ചെയ്യുന്നത് തുടരാൻ നിങ്ങൾക്ക് എപ്പോൾ വേണമെങ്കിലും ബാക്കപ്പുകൾക്കായി വീണ്ടും പണമടച്ച് തുടങ്ങാം. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">നിങ്ങളുടെ മീഡിയ ഇന്ന് ഇല്ലാതാക്കപ്പെടും</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">നിങ്ങളുടെ പേയ്‌മെൻ്റ് പ്രോസസ്സ് ചെയ്യാൻ കഴിയാത്തതിനാൽ നിങ്ങളുടെ Signal മീഡിയ ബാക്കപ്പ് പ്ലാൻ റദ്ദാക്കപ്പെട്ടു. നിങ്ങളുടെ ബാക്കപ്പിൽ മീഡിയ ഇല്ലാതാക്കുന്നതിന് മുമ്പ് അത് ഡൗൺലോഡ് ചെയ്യാനുള്ള അവസാന അവസരമാണിത്.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">ഡൗൺലോഡ് പൂർത്തിയാക്കാൻ കഴിയുന്നില്ല</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">നിങ്ങളുടെ ഉപകരണത്തിന് മതിയായ ഇടമില്ല. നിങ്ങളുടെ ബാക്കപ്പിൽ സംഭരിച്ചിരിക്കുന്ന മീഡിയ ഡൗൺലോഡ് ചെയ്യാൻ %1$s വരെ ഇടം ഉണ്ടാക്കുക.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">നിങ്ങൾ \"ഒഴിവാക്കുക\" തിരഞ്ഞെടുത്താൽ, നിങ്ങളുടെ ബാക്കപ്പിലെ മീഡിയ %1$d ദിവസത്തിനുള്ളിൽ ഇല്ലാതാക്കപ്പെടും.</item>
+        <item quantity="other">നിങ്ങൾ \"ഒഴിവാക്കുക\" തിരഞ്ഞെടുത്താൽ, നിങ്ങളുടെ ബാക്കപ്പിലെ മീഡിയ %1$d ദിവസത്തിനുള്ളിൽ ഇല്ലാതാക്കപ്പെടും.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">ബാക്കപ്പ് പേയ്‌മെൻ്റ് പ്രോസസ്സ് ചെയ്യാനാകില്ല</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">നിങ്ങളുടെ ആവർത്തിച്ചുള്ള പ്രതിമാസ ബാക്കപ്പ് പേയ്‌മെൻ്റ് ശേഖരിക്കുന്നതിൽ ഞങ്ങൾക്ക് പ്രശ്‌നമുണ്ട്. നിങ്ങളുടെ പേയ്‌മെൻ്റ് രീതി അപ്-ടു-ഡേറ്റ് ആണെന്ന് ഉറപ്പാക്കുക. അങ്ങനെയല്ലെങ്കിൽ, അത് Google Pay-യിൽ അപ്ഡേറ്റ് ചെയ്യുക. കുറച്ച് ദിവസത്തിനുള്ളിൽ പേയ്‌മെൻ്റ് വീണ്ടും പ്രോസസ്സ് ചെയ്യാൻ Signal ശ്രമിക്കും.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">ബാക്കപ്പ് പൂർത്തിയാക്കാൻ കഴിഞ്ഞില്ല</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">നിങ്ങളുടെ ഉപകരണം %1$d ദിവസത്തേക്ക് ഒരു ബാക്കപ്പ് പൂർത്തിയാക്കിയിട്ടില്ല. നിങ്ങളുടെ ഉപകരണം wi-fi-യിലേക്ക് കണക്‌റ്റ് ചെയ്‌തിട്ടുണ്ടെന്ന് ഉറപ്പുവരുത്തി \"ഇപ്പോൾ ബാക്കപ്പ് ചെയ്യുക\" ടാപ്പ് ചെയ്യുക. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">കൂടുതലറിയുക</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">ഒഴിവാക്കുക</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">മീഡിയ ഇപ്പോൾ ഡൗൺലോഡ് ചെയ്യുക</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">പിന്നീട് ഡൗൺലോഡ് ചെയ്യുക</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">മീഡിയ ഡൗൺലോഡ് ചെയ്യരുത്</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">നിങ്ങളുടെ മീഡിയ ഡൗൺലോഡ് ചെയ്യാൻ %1$s ഇടം സൃഷ്‌ടിക്കുക.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">ക്രെഡിറ്റ് കാർഡ് അല്ലെങ്കിൽ ഡെബിറ്റ് കാർഡ്</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">അജ്ഞാതം</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">പേയ്മെൻ്റ് ചരിത്രം</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">നിങ്ങളുടെ അവസാന ബാക്കപ്പ് %1$s, %2$s -ന് ചെയ്തു.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">തിരഞ്ഞെടുത്ത സമയത്തിലും പഴയ സന്ദേശങ്ങൾ ശാശ്വതമായി ഇല്ലാതാക്കപ്പെടും.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">തിരഞ്ഞെടുത്ത ദൈർഘ്യത്തിൽ കൂടുതലുള്ള സന്ദേശങ്ങൾ ശാശ്വതമായി ഇല്ലാതാക്കപ്പെടും.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">ലിങ്ക് ചെയ്‌ത ഉപകരണങ്ങൾക്ക് പരിധികൾ ബാധകമാക്കുക</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">പ്രവർത്തനക്ഷമമാക്കുമ്പോൾ, നിങ്ങളുടെ ലിങ്ക് ചെയ്‌ത ഉപകരണങ്ങളിൽ നിന്നുള്ള സന്ദേശങ്ങളും ചാറ്റ് പരിധികൾ ഇല്ലാതാക്കും.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">ഇല്ലാതാക്കുന്നത് ഇപ്പോൾ നിങ്ങളുടെ എല്ലാ ഉപകരണങ്ങളിലും സമന്വയിപ്പിച്ചിരിക്കുന്നു</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">നിങ്ങൾ സന്ദേശങ്ങളോ ചാറ്റുകളോ ഇല്ലാതാക്കുമ്പോൾ, നിങ്ങളുടെ ഫോണിൽ നിന്നും ലിങ്ക് ചെയ്‌ത ഉപകരണങ്ങളിൽ നിന്നും അവ ഇല്ലാതാക്കപ്പെടും.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">ശരി</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">പേയ്മെൻ്റ് ചരിത്രം</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">വാചകവും എല്ലാ മീഡിയ ബാക്കപ്പും</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">പേയ്മെന്റ് വിശദാംശങ്ങൾ</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">ബാക്കപ്പ് തരം</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">പണം നൽകിയ തീയതി</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">പങ്കിടുക</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal ബാക്കപ്പുകൾ</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">പേയ്മെൻ്റ് ചരിത്രം</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">ബാക്കപ്പ് വിശദാംശങ്ങൾ</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">ബാക്കപ്പ് വലുപ്പം</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">ബാക്കപ്പ് ആവൃത്തി</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">മൊബൈൽ ഡാറ്റ ഉപയോഗിച്ച് ബാക്കപ്പ് ചെയ്യുക</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">ബാക്കപ്പ് ഓഫാക്കി ഇല്ലാതാക്കുക</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">ബാക്കപ്പ് ഇല്ലാതാക്കിയിട്ട് ഓഫാക്കി.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">ബാക്കപ്പ് തരം മാറ്റി, സബ്സ്ക്രിപ്ഷൻ റദ്ദാക്കി</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">സബ്‌സ്‌ക്രിപ്‌ഷൻ റദ്ദാക്കി</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">ഡൗൺലോഡ് പൂർത്തിയായി</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">ബാക്കപ്പ് തരം</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">ബാക്കപ്പുകൾ പ്രവർത്തനരഹിതമാക്കി</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/മാസം</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">ബാക്കപ്പുകൾ പ്രവർത്തനക്ഷമമാക്കുക</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">അവസാന ബാക്കപ്പ്</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%2$s %1$s-ന്</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">ഒരിക്കലും വേണ്ട</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">ഇപ്പോൾ ബാക്കപ്പ് ചെയ്യുക</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">ബാക്കപ്പുകൾ ഓഫാക്കി ഇല്ലാതാക്കണോ?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">നിങ്ങളിൽ നിന്ന് വീണ്ടും നിരക്ക് ഈടാക്കില്ല. നിങ്ങളുടെ ബാക്കപ്പ് ഇല്ലാതാക്കപ്പെടും, പുതിയ ബാക്കപ്പുകളൊന്നും സൃഷ്ടിക്കപ്പെടില്ല.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">ഓഫ് ചെയ്‌ത ശേഷം ഇല്ലാതാക്കുക</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">ബാക്കപ്പ് ഇല്ലാതാക്കുന്നു…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">ബാക്കപ്പ് ഇല്ലാതാക്കി</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"ഇപ്പോൾ ബാക്കപ്പ് ടാപ്പ് ചെയ്യുന്നതിലൂടെ"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">ദിവസേന</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">പ്രതിവാരം</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">പ്രതിമാസം</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">സ്വമേധയാ ബാക്കപ്പ് ചെയ്യുക</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">നിങ്ങളുടെ ഉപകരണ PIN, പാസ്‌വേഡ് അല്ലെങ്കിൽ പാറ്റേൺ നൽകുക.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">അടുത്തത്</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">ബാക്കപ്പ് തരം മാറ്റുക</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">സബ്‍സ്ക്രിപ്ഷൻ റദ്ദാക്കുക</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">റദ്ദാക്കൽ സ്ഥിരീകരിക്കുക</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">നിങ്ങളിൽ നിന്ന് വീണ്ടും നിരക്ക് ഈടാക്കില്ല. നിങ്ങളുടെ ബില്ലിംഗ് സൈക്കിളിൻ്റെ അവസാനം ബാക്കപ്പുകൾ ഓഫാക്കപ്പെടും. ആ തീയതിക്ക് ശേഷം നിങ്ങൾ നിലവിൽ ബാക്കപ്പ് ചെയ്യുന്ന മീഡിയ ഡൗൺലോഡ് ചെയ്യാൻ 30 ദിവസങ്ങൾ ലഭിക്കും.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">ഇപ്പോൾ സ്ഥിരീകരിച്ച് ഡൗൺലോഡ് ചെയ്യുക</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">സ്ഥിരീകരിച്ച് പിന്നീട് ഡൗൺലോഡ് ചെയ്യുക</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">സബ്സ്ക്രിപ്ഷൻ നിലനിർത്തുക</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml
index cc593eb8ac..3e78f09aa5 100644
--- a/app/src/main/res/values-mr/strings.xml
+++ b/app/src/main/res/values-mr/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal अद्यतनित होत आहे…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly अद्यतनित होत आहे…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">आपण अजून पासफ्रेझ ठेवले नाही!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">पासफ्रेझ अक्षम करायचे?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">हे Signal आणि संदेश सूचना कायमचे अनलॉक करेल.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">हे Molly आणि संदेश सूचना कायमचे अनलॉक करेल.</string>
     <string name="ApplicationPreferencesActivity_disable">अक्षम करा</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">सर्व्हर सोबत कनेक्ट करण्यात त्रुटी!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">नोंदणी लॉकसाठी पिन आवश्यक आहेत. पिन अक्षम करण्यासाठी, कृपया प्रथम नोंदणी लॉक अक्षम करा.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">फाईल</string>
     <string name="AttachmentKeyboard_contact">संपर्क</string>
     <string name="AttachmentKeyboard_location">स्थान</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">आपले फोटो आणि व्हिडिओ दाखवण्यासाठी Signal ला परवानगी आवश्यक आहे</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">आपले फोटो आणि व्हिडिओ दाखवण्यासाठी Molly ला परवानगी आवश्यक आहे</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">अॅक्सेस अनुमती द्या</string>
     <string name="AttachmentKeyboard_payment">पेमेंट</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">मिडिया निवडण्यासाठी अॅप सापडत नाही.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">फोटो, व्हिडिओ, किंवा ऑडिओ, संलग्न करण्यासाठी Signal ला संचयन परवानगीची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"संचयन\" सक्षम करा.</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">संपर्क माहिती संलग्न करण्यासाठी Signal ला संपर्क परवानगीची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"संपर्क\" सक्षम करा.</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">स्थान संलग्न करण्यासाठी Signal ला स्थान परवानगीची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"स्थान\" सक्षम करा.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">फोटो, व्हिडिओ, किंवा ऑडिओ, संलग्न करण्यासाठी Molly ला संचयन परवानगीची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"संचयन\" सक्षम करा.</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">संपर्क माहिती संलग्न करण्यासाठी Molly ला संपर्क परवानगीची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"संपर्क\" सक्षम करा.</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">स्थान संलग्न करण्यासाठी Molly ला स्थान परवानगीची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"स्थान\" सक्षम करा.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">आपले स्थान ॲक्सेस करण्याची अनुमती द्या</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">आपले स्थान पाठवण्यास:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Signal ला आपले स्थान पाठवण्यास ॲक्सेसची अनुमती द्या.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Molly ला आपले स्थान पाठवण्यास ॲक्सेसची अनुमती द्या.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal ला आपले स्थान पाठवण्यास स्थान ॲक्सेसची गरज आहे.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly ला आपले स्थान पाठवण्यास स्थान ॲक्सेसची गरज आहे.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">संग्रहणाला ॲक्सेसची अनुमती द्या</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">फोटो आणि व्हिडिओज दाखवण्यासाठी:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">आपले फोटो आणि व्हिडिओ दाखवण्यासाठी Signal ला संग्रहण ॲक्सेसची गरज आहे.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">आपले फोटो आणि व्हिडिओ दाखवण्यासाठी Molly ला संग्रहण ॲक्सेसची गरज आहे.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s ने पेमेंट्स सक्रिय केलेले नाहीत </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">कॅमेरा बदला</string>
     <string name="CameraXFragment_open_gallery_description">गॅलरी उघडा</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">अॅक्सेस अनुमती द्या</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">आपला कॅमेरा आणि मायक्रोफोन ॲक्सेस करण्याची अनुमती द्या</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">आपल्या कॅमेऱ्याच्या ॲक्सेसची अनुमती द्या</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">आपल्या मायक्रोफोन ॲक्सेस करण्याची अनुमती द्या</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">फोटो कॅप्चर करण्यासाठी, Signal ला कॅमेरा ॲक्सेसची अनुमती द्या.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">फोटो आणि व्हिडिओ कॅप्चर करण्यासाठी, Signal ला कॅमेरा अॅक्सेसची अनुमती द्या.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">फोटो आणि व्हिडिओ कॅप्चर करण्यासाठी, Signal ला कॅमेरा आणि मायक्रोफोनच्या ॲक्सेसची अनुमती द्या.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">आवाजासह व्हिडीओ कॅप्चर करण्यासाठी, आपल्या Signal ला आपल्या मायक्रोफोनच्या ॲक्सेसची अनुमती द्या.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">QR कोड स्कॅन, कॅमेरा ॲक्सेस करण्याची Signal ला अनुमती द्या.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal ला फोटो घेण्यासाठी कॅमेऱ्याच्या ॲक्सेसची गरज आहे</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal ला QR कोड स्कॅन करण्याच्या ॲक्सेसची गरज आहे</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal ला व्हिडीओ कॅप्चर करण्यासाठी मायक्रोफोनला ॲक्सेस करण्याची गरज आहे</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Signal मध्ये फोटोज कॅप्चर करण्यासाठी:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Signal मध्ये फोटोज आणि व्हिडिओ कॅप्चर करण्यासाठी:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">ध्वनीसह व्हिडिओ कॅप्चर करण्यासाठी:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR कोड्स स्कॅन करण्यासाठी:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">अलीकडील संपर्क</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">कुठलेही Signal संपर्क नाहीत</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">आपण फक्त कॅमेरा बटण वापरून Signal संपर्कांना फोटो पाठवू शकता. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">आपण ज्यांना शोधत आहात ते आपणास सापडले?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">एका संपर्काला Signal मध्ये सामील होण्यास आमंत्रित करा</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">एका संपर्काला Molly मध्ये सामील होण्यास आमंत्रित करा</string>
     <string name="CameraContacts__menu_search">शोध</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">नाही धन्यवाद</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Signal अद्यतनित करा</string>
+    <string name="ClientDeprecatedActivity_update_signal">Molly अद्यतनित करा</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">अ‍ॅपची ही आवृत्ती यापुढे समर्थित नाही. संदेश पाठविणे आणि प्राप्त करणे सुरू ठेवण्यासाठी, नवीनतम आवृत्तीवर अद्यतनित करा.</string>
     <string name="ClientDeprecatedActivity_update">अद्यतन</string>
     <string name="ClientDeprecatedActivity_dont_update">अद्यतन करू नका</string>
     <string name="ClientDeprecatedActivity_warning">चेतावणी</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">आपली Signal ची आवृत्ती कालबाह्य झाली आहे. आपण आपला संदेश इतिहास पाहू शकता परंतु आपण अद्यतनित करेपर्यंत आपण संदेश पाठविण्यात किंवा प्राप्त करण्यास सक्षम राहणार नाही.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">आपली Molly ची आवृत्ती कालबाह्य झाली आहे. आपण आपला संदेश इतिहास पाहू शकता परंतु आपण अद्यतनित करेपर्यंत आपण संदेश पाठविण्यात किंवा प्राप्त करण्यास सक्षम राहणार नाही.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">कुठलाही वेब ब्राऊझर सापडला नाही.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">संदेश %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly व्हॉईस कॉल %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly व्हिडिओ कॉल %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal संदेश</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">संदेश पाठवा</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Signal %1$s वर स्विच करूया</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Molly %1$s वर स्विच करूया</string>
     <string name="ConversationActivity_specify_recipient">कृपया एक संपर्क निवडा</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">संलग्नचा आकार आपण पाठवत असलेल्या संदेशाच्या प्रकारासाठीच्या मर्यादेपेक्षा जास्त आहे</string>
     <string name="ConversationActivity_unable_to_record_audio">ऑडिओ रेकॉर्ड करण्यास अक्षम!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">ऑडिओ संदेश पाठवण्यास:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">ध्वनी संदेश पाठवण्यास, Signal ला आपला मायक्रोफोन ॲक्सेस करण्याची अनुमती द्या.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">ध्वनी संदेश पाठवण्यास, Molly ला आपला मायक्रोफोन ॲक्सेस करण्याची अनुमती द्या.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal ला ध्वनी संदेश रेकॉर्ड करण्यास मायक्रोफोन ॲक्सेसची गरज आहे.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">ऑडिओ संदेश पाठवण्यासाठी Signal ला मायक्रोफोन परवानगीची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"मायक्रोफोन\" सक्षम करा.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly ला ध्वनी संदेश रेकॉर्ड करण्यास मायक्रोफोन ॲक्सेसची गरज आहे.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">ऑडिओ संदेश पाठवण्यासाठी Molly ला मायक्रोफोन परवानगीची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"मायक्रोफोन\" सक्षम करा.</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s ला कॉल करण्यासाठी Signal ला मायक्रोफोन आणि कॅमेरा परवानग्यांची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"मायक्रोफोन\" आणि \"कॅमेरा\" सक्षम करा.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">फोटो आणि व्हिडिओ कॅप्चर करण्यासाठी, Signal ला कॅमेरा अॅक्सेसची अनुमती द्या.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">फोटो किंवा व्हिडिओ काढण्यासाठी Signal ला कॅमेरा परवानगीची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"कॅमेरा\" सक्षम करा.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">फोटो किंवा व्हिडिओ घेण्यासाठी Signal ला कॅमेरा परवानग्यांची गरज आहे</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s ला कॉल करण्यासाठी Molly ला मायक्रोफोन आणि कॅमेरा परवानग्यांची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"मायक्रोफोन\" आणि \"कॅमेरा\" सक्षम करा.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">फोटो आणि व्हिडिओ कॅप्चर करण्यासाठी, Molly ला कॅमेरा अॅक्सेसची अनुमती द्या.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">फोटो किंवा व्हिडिओ काढण्यासाठी Molly ला कॅमेरा परवानगीची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"कॅमेरा\" सक्षम करा.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">फोटो किंवा व्हिडिओ घेण्यासाठी Molly ला कॅमेरा परवानग्यांची गरज आहे</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">ध्वनी सोबतचे व्हिडिओ कॅप्चर करण्यासाठी मायक्रोफोन परवानगी सक्षम करा.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">व्हिडिओ रेकॉर्ड करण्यासाठी Signal ला मायक्रोफोन परवानग्यांची आवश्यकता असते, पण त्या नाकारल्या गेल्या आहेत. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"मायक्रोफोन\" आणि \"कॅमेरा\" सक्षम करा.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">व्हिडिओ रेकॉर्ड करण्यासाठी Signal यास मायक्रोफोन परवानग्यांची गरज आहे.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">व्हिडिओ रेकॉर्ड करण्यासाठी Molly ला मायक्रोफोन परवानग्यांची आवश्यकता असते, पण त्या नाकारल्या गेल्या आहेत. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"मायक्रोफोन\" आणि \"कॅमेरा\" सक्षम करा.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">व्हिडिओ रेकॉर्ड करण्यासाठी Molly यास मायक्रोफोन परवानग्यांची गरज आहे.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">नाही</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">कॉल सुरू करण्यासाठी:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">कॉल सुरू करण्यास, Signal ला आपला मायक्रोफोन ॲक्सेस करण्याची अनुमती द्या.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">कॉल सुरू करण्यास, Molly ला आपला मायक्रोफोन ॲक्सेस करण्याची अनुमती द्या.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal ला कॉल सुरू करण्यासाठी मायक्रोफोन ॲक्सेसची गरज आहे.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly ला कॉल सुरू करण्यासाठी मायक्रोफोन ॲक्सेसची गरज आहे.</string>
 
 
     <string name="ConversationActivity_join">सामील व्हा</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">SMS संदेशन यापुढे Signal मध्ये समर्थित नाही. संभाषण येथे ठेवण्यासाठी %1$s ला Signal वर आमंत्रित करा.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">ही व्यक्ती आता Signal वापरत नाही. संभाषण येथे ठेवण्यासाठी त्यांना Signal वर आमंत्रित करा.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">ही व्यक्ती आता Molly वापरत नाही. संभाषण येथे ठेवण्यासाठी त्यांना Molly वर आमंत्रित करा.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Signal वर आमंत्रित करा</string>
+    <string name="ConversationActivity__invite_to_signal">Molly वर आमंत्रित करा</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">आपणाला पुन्हा लवकरच आठवण करून दिली जाईल.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">प्रत्येकासाठी हटवा</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">या डिव्हाइस वरून हटवा</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">हटवा</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">सर्वत्र हटवा</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Signal च्या अलिकडील आवृत्तीवर असल्यास हा संदेश चॅटमधील प्रत्येकासाठी हटवला जाईल. आपण संदेश हटवला हे पाहण्यात ते सक्षम असतील.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">अवरोधित केले</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Signal अद्यतनित करा</string>
+    <string name="ConversationFragment__update_build">Molly अद्यतनित करा</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Signal वर पुन्हा नोंदणी करा</string>
+    <string name="ConversationFragment__reregister_signal">Molly वर पुन्हा नोंदणी करा</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">पुन्हा नेव्हिगेट करा.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signal उघडा</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Molly उघडा</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">सत्यापित केली जाणार नाही</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">यामुळे निवडलेला चॅट्स कायमस्वरुपी हटवला जाईल.</item>
         <item quantity="other">यामुळे निवडलेले सर्व %1$d चॅट्स कायमस्वरुपी हटवले जातील.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">हे आपल्या सर्व डिव्हाइसेसरून निवडलेल्या चॅट्स कायमस्वरूपी हटवेल.</item>
+        <item quantity="other">हे आपल्या सर्व डिव्हाईसेसवरून निवडलेल्या सर्व %1$d चॅट्स कायमस्वरूपी हटवेल.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">हटवत आहे</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">निवडलेला चॅट हटवत आहे…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">नंबराने माझा शोध कोण घेऊ शकतात?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">आपला फोन नंबर असणारा कोणीही आपण Signal वर असल्याचे पाहू शकतो आणि आपणासह चॅट्स सुरु करू शकतो.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">आपला फोन नंबर असणारा कोणीही आपण Molly वर असल्याचे पाहू शकतो आणि आपणासह चॅट्स सुरु करू शकतो.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">आपण त्यांना संदेश पाठवल्याशिवाय किंवा त्यांच्यासोबत सध्याचे चॅट्स असल्यााशिवाय आपणाला कोणीही Signal वर पाहू शकणार नाही.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">आपण त्यांना संदेश पाठवल्याशिवाय किंवा त्यांच्यासोबत सध्याचे चॅट्स असल्यााशिवाय आपणाला कोणीही Molly वर पाहू शकणार नाही.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">बॅकअप वरून पुनर्स्थापना करायची?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">आपल्या बॅकअप सांकेतिक वाक्यांशाची चाचणी घ्या आणि ते जुळत असल्याचे सत्यापित करा</string>
     <string name="BackupsPreferenceFragment__turn_on">चालू करा</string>
     <string name="BackupsPreferenceFragment__turn_off">बंद करा</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"बॅकअप पुनर्संचयित करण्यासाठी, Signal ची नवीन प्रत स्थापित करा. अ‍ॅप उघडा आणि \"बॅकअप पुनर्स्थापना करा\" टॅप करा, नंतर एक बॅकअप फाईल शोधा. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"बॅकअप पुनर्संचयित करण्यासाठी, Molly ची नवीन प्रत स्थापित करा. अ‍ॅप उघडा आणि \"बॅकअप पुनर्स्थापना करा\" टॅप करा, नंतर एक बॅकअप फाईल शोधा. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">अधिक जाणा</string>
     <string name="BackupsPreferenceFragment__in_progress">प्रगतीपथावर…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d आतापर्यंत…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% आत्तापर्यंत…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">बॅकअप तयार करण्यासाठी Signal ला संचयन परवानगी ची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"संचयन\" सक्षम करा.</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">बॅकअप तयार करण्यासाठी Molly ला संचयन परवानगी ची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"संचयन\" सक्षम करा.</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">बॅकअप वेळ सेट करा</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">चॅट सत्र रिफ्रेश झाले</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal एंड-टू-एंड एन्क्रिप्शन वापरते आणि त्यास काही वेळा आपले चॅट रीफ्रेश करावे लागू शकते. यामुळे आपल्या चॅट्सच्या सुरक्षिततेवर कुठलाही प्रभाव पडत नाही, पण आपल्याकडून या संपर्काचा एखादा संदेश चुकलेला असू शकतो, आणि आपण त्यांना तो पुन्हा पाठविण्यास सांगू शकता.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly एंड-टू-एंड एन्क्रिप्शन वापरते आणि त्यास काही वेळा आपले चॅट रीफ्रेश करावे लागू शकते. यामुळे आपल्या चॅट्सच्या सुरक्षिततेवर कुठलाही प्रभाव पडत नाही, पण आपल्याकडून या संपर्काचा एखादा संदेश चुकलेला असू शकतो, आणि आपण त्यांना तो पुन्हा पाठविण्यास सांगू शकता.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">डेस्कटॉप किंवा iPad वर Signal वापरा. आपले संदेश आपल्या लिंक केलेल्या डिव्हाइसेसशी सिंक केले जातील.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">नवीन डिव्हाइस लिंक करा</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s संदेश आणि चॅट माहिती सर्व डिव्हाइसेसवर एन्ड-टू-एन्ड एन्क्रिप्शन द्वारे संरक्षित आहे</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">डेस्कटॉप किंवा iPad वर Signal</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">लिंंक केलेल्या डिव्हाइसेसवरील सर्व संदेशन गोपनीय आहे</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Molly संदेश हे आपल्या मोबाइल फोन वरील Molly सोबत लिंक केल्यानंतर सिंक्रोनाईज केले जातात. आपला मागील संदेश इतिहास दृश्यमान होणार नाही.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">आपल्या दुसऱ्या डिव्हाइसवर, Molly इन्स्टॉल करण्यास %1$s ला भेट द्या</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">माझी लिंक केलेले डिव्हाइसेस</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">अनलिंक करा</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s लिंक न केलेले</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">डिव्हाइस लिंक करत आहे…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">डिव्हाइसला मान्यता मिळाली</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">लोड होत आहे…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">कोणताही लिंक केला डिव्हाइस नाही</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">डिव्हाइस लिंक करण्यासाठी अनलॉक करा</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">लिंक करण्यासाठी डिव्हाइस वर दाखवलेला QR कोड स्कॅन करा.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">QR कोड स्कॅन करा</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">आपणाला लिंक करावयाच्या डिव्हाइसेसवर प्रदर्शित केलेला QR कोड स्कॅन करण्यासाठी हे डिव्हाइस वापरा</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">ठीक आहे</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">हे डिव्हाईस आपले गट आणि संपर्क पाहू शकेल, आपले चॅट ॲक्सेस करू शकेल, आणि आपल्या नावाने संदेश पाठवू शकेल.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">आपल्या दुसऱ्या डिव्हाइसवर लिंक करणे पूर्ण करा</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">आपल्या दुसऱ्या डिव्हाइस वर Molly लिंक करणे पूर्ण करा.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">डिव्हाईस लिंक करणे अयशस्वी</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">हा QR कोड वैध नाही. आपल्याला लिंक करावयाचा डिव्हाईस वर प्रदर्शित केलेला QR कोड आपण स्कॅन करत आहात याची कृपया खात्री करा.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">पुन्हा प्रयत्न करा</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">\'%1$s\' अनलिंक करायचे?</string>
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">बघा</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">स्थायी Signal संदेशन अपयश!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Google प्ले सेवांसोबत नोंदणी करण्यात Signal अक्षम झाला. Signal संदेश आणि कॉल अक्षम केले गेले आहेत, कृपया सेटिंग आणि प्रगत मधून पुन्हा-नोंदणी करण्याचा प्रयत्न करा.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">स्थायी Molly संदेशन अपयश!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Google प्ले सेवांसोबत नोंदणी करण्यात Molly अक्षम झाला. Molly संदेश आणि कॉल अक्षम केले गेले आहेत, कृपया सेटिंग आणि प्रगत मधून पुन्हा-नोंदणी करण्याचा प्रयत्न करा.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">डीबग लॉग आम्हाला समस्येचे निदान करण्यास आणि निश्चित करण्यास मदत करते, आणि त्यामध्ये ओळखणारी माहिती नसते.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal ला एक समस्या आली. डीबग लॉग सबमिट करायचा?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly ला एक समस्या आली. डीबग लॉग सबमिट करायचा?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">अधिसूचना या बॅटरी अनुकूलनामुळे विलंबित होऊ शकतात</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">आपण Signal साठी बॅटरी अनुकूलन अक्षम करू शकता ज्यामुळे संदेश अधिसूचना विलंबित होणार नाहीत.</string>
+    <string name="PromptBatterySaverBottomSheet__message">आपण Molly साठी बॅटरी अनुकूलन अक्षम करू शकता ज्यामुळे संदेश अधिसूचना विलंबित होणार नाहीत.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">अधिसूचना या बॅटरी अनुकूलनामुळे विलंबित होऊ शकतात</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Molly साठी बॅटरी अनुकूलन अक्षम करा ज्यामुळे संदेश अधिसूचना विलंबित होणार नाहीत. डिव्हाइस विशिष्ट सूचना पाहण्यासाठी Tap “पुढे सुरू ठेवा” वर टॅप करा.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">नाही धन्यवाद</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">सुरू ठेवा</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">सुरू ठेवा</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">रद्द करा</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">नाही धन्यवाद</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">प्रलंबित गट आमंत्रणे</string>
+    <string name="PendingMembersActivity_pending_group_invites">विनंत्या आणि आमंत्रण</string>
     <string name="PendingMembersActivity_requests">विनंत्या</string>
     <string name="PendingMembersActivity_invites">आमंत्रण</string>
     <string name="PendingMembersActivity_people_you_invited">आपण आमंत्रित केलेल्या व्यक्ती</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">रद्द करा</string>
     <string name="InviteActivity_sending">पाठवत आहे…</string>
     <string name="InviteActivity_invitations_sent">आमंत्रणे पाठविली!</string>
-    <string name="InviteActivity_invite_to_signal">Signal वर आमंत्रित करा</string>
+    <string name="InviteActivity_invite_to_signal">Molly वर आमंत्रित करा</string>
     <string name="InviteActivity_send_sms">SMS पाठवा (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">%1$d SMS आमंत्रण पाठवायचे?</item>
         <item quantity="other">%1$d SMS आमंत्रणे पाठवायची?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Signal वर स्विच करूया: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Molly वर स्विच करूया: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">असे दिसते की आपल्याकडे सामायिक करण्यासाठी कुठलेही अॅप नाहीत.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">आपला संदेश</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">पार्श्वभूमी कनेक्शन सक्षम केले</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">प्रत्युत्तरे</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal कॉल प्रस्थापित करत आहे</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly कॉल प्रस्थापित करत आहे</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signal कॉल सेवा सुरू करत आहे</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal कॉल सेवा बंद करत आहे</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Molly कॉल सेवा सुरू करत आहे</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly कॉल सेवा बंद करत आहे</string>
     <string name="NotificationBarManager__cancel_call">कॉल रद्द करा</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">आपण पेमेंट्स सक्रिय केले आहे</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s आता पेमेंट्स स्विकारु शकतात</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">पेमेंट तपशील उपलब्ध नाही</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">अधिक करिता टॅप करा</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">पेमेंट्स तपशील उपलब्ध नाही</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">या पेमेंट्सचा हा तपशील उपलब्ध नाही कारण आपले संदेश पेमेंट इतिहास समाविष्ट नसलेल्या एका स्त्रोताकडून पुनर्संचयित केले गेले. याचा आपल्या वॉलेट शिल्लकेवर किंवा मागील पेमेंट्सच्या स्थितीवर परिणाम होत नाही.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">आपण यापुढे लवकरच Signal वरून SMS संदेश पाठवू शकणार नाही. संभाषण येथे ठेवण्यासाठी %1$s ला Signal वर आमंत्रित करा.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">आपण यापुढे Signal मध्ये SMS संदेश पाठवू शकणार नाही. संभाषण येथे ठेवण्यासाठी %1$s ला Signal वर आमंत्रित करा.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">आपण यापुढे Molly मध्ये SMS संदेश पाठवू शकणार नाही. संभाषण येथे ठेवण्यासाठी %1$s ला Molly वर आमंत्रित करा.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">पेमेंट: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">पेमेंट</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">स्पॅम म्हणून रिपोर्ट केले</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">एक Signal डिव्हाईस लिंक करायचा?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">आपण 3य पक्ष स्कॅनर वापरून Signal डिव्हाईस लिंक करण्याचा प्रयत्न करत आहात. आपल्या सुरक्षेसाठी, कृपया Signal मध्ये कोड पुन्हा स्कॅन करा.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">QR कोड स्कॅन करण्यासाठी Signal ला कॅमेरा परवानगीची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"कॅमेरा\" सक्षम करा.</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">QR कोड स्कॅन करण्यासाठी Molly ला कॅमेरा परवानगीची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"कॅमेरा\" सक्षम करा.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">कॅमेरा परवानगी विना QR कोड स्कॅन करण्यास अक्षम</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">पासफ्रेझ प्रविष्ट करा</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal चिन्ह</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly चिन्ह</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">पासफ्रेझ प्रविष्ट करा</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">अवैध पासफ्रेझ!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signal अनलॉक करा</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - लॉक स्क्रीन</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Molly अनलॉक करा</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - लॉक स्क्रीन</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">नकाशा</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">संदेश पाठवणे सुरू ठेवण्यासाठी सत्यापित करा</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Signal वर स्पॅम प्रतिबंधित करण्यात मदत करण्यासाठी, कृपया सत्यापन पूर्ण करा.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Molly वर स्पॅम प्रतिबंधित करण्यात मदत करण्यासाठी, कृपया सत्यापन पूर्ण करा.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">सत्यापन केल्यानंतर, आपण संदेश पाठवणे सुरू ठेवू शकता. कुठलेही विराम दिलेले संदेश स्वयंचलितपणे पाठवले जातील.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">माझी स्टोरी</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal कॉल</string>
+    <string name="Recipient_signal_call">Molly कॉल</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">अवरोधित करा</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">रिंग होत आहे…</string>
     <string name="RedPhone_busy">व्यस्त</string>
     <string name="RedPhone_recipient_unavailable">प्राप्तकर्ता अनुपलब्ध</string>
-    <string name="RedPhone_network_failed">नेटवर्क अयशस्वी!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">नेटवर्क अयशस्वी! कृपया आपले नेटवर्क कनेक्शन तपासा आणि पुन्हा प्रयत्न करा.</string>
     <string name="RedPhone_number_not_registered">नंबर नोंदवलेला नाही!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">आपण डायल केलेला नंबर सुरक्षित व्हॉईसचे समर्थन करत नाही!</string>
     <string name="RedPhone_got_it">कळले</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">आपला व्हिडिओ चालू करण्यासाठी येथे टॅप करा</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s ला कॉल करण्यासाठी, Signal ला आपल्या कॅमेराचा अॅक्सेस हवा आहे</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s ला कॉल करण्यासाठी, Molly ला आपल्या कॅमेराचा अॅक्सेस हवा आहे</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">कॉलिंग…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">पुनःकनेक्ट करत आहे…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">कॉलमधून काढण्यात आले</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">कोणीतरी आपणाला कॉल मधून काढले.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">आपला कॅमेरा आणि मायक्रोफोन ॲक्सेस करण्याची अनुमती द्या</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">आपल्या मायक्रोफोन ॲक्सेस करण्याची अनुमती द्या</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">आपल्या कॅमेऱ्याच्या ॲक्सेसची अनुमती द्या</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">कॉल सुरू करण्यास, Molly ला आपला कॅमेरा आणि मायक्रोफोन ॲक्सेस करण्याची अनुमती द्या.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">कॉल सुरू करण्यास, Molly ला आपला मायक्रोफोन ॲक्सेस करण्याची अनुमती द्या.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">आपला व्हिडिओ सक्षम करण्यासाठी, Molly ला आपला कॅमेरा ॲक्सेस करण्याची अनुमती द्या.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly ला कॉल सुरू करण्यासाठी किंवा त्यात सामील होण्यासाठी मायक्रोफोन परवानगीची गरज आहे.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">आपला व्हिडिओ समक्ष करण्यासाठी Molly ला कॅमेरा ॲक्सेसची गरज आहे</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">कॉल सुरू करण्यासाठी किंवा त्यात सामील होण्यासाठी:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">आपला व्हिडिओ सक्षम करण्यासाठी:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal कॉल</string>
-    <string name="WebRtcCallView__signal_video_call">Signal व्हिडिओ कॉल</string>
+    <string name="WebRtcCallView__signal_call">Molly कॉल</string>
+    <string name="WebRtcCallView__signal_video_call">Molly व्हिडिओ कॉल</string>
     <string name="WebRtcCallView__start_call">कॉल चालू करा</string>
     <string name="WebRtcCallView__join_call">कॉलमध्ये सामील व्हा</string>
     <string name="WebRtcCallView__call_is_full">कॉल पूर्ण आहे</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">आपल्याला हात खाली करायचा आहे?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">हात खाली घ्या</string>
+    <string name="CallOverflowPopupWindow__lower_hand">खाली घ्या</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">रद्द करा</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">आपण आपला हात वर केला आहे</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">बघा</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s ने हात वर केला आहे</item>
-        <item quantity="other">%1$s + %2$d नी हात वर केला आहे</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s ने हात वर केला</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d ने हात वर केला</item>
+        <item quantity="other">%1$s + %2$d नी हात वर केला</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s ने हात वर केला</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d ने हात वर केला</item>
+        <item quantity="other">%1$s + %2$d नी हात वर केला</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">हा नंबर सत्यापित करण्यासाठी आपल्याला कॉल येईल.</string>
     <string name="RegistrationActivity_edit_number">नंबर संपादित करा</string>
     <string name="RegistrationActivity_missing_google_play_services">Google प्ले सेवा नाहीत</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">ह्या डिव्हाईस मध्ये Google प्ले सेवा नाही. तरीही आपण Signal वापरू शकता, पण ह्या कॉन्फिगरेशनमुळे विश्वसनीयता किंवा कार्यक्षमता कमी होऊ शकते.\n\nजर आपण प्रगत वापरकर्ते नसाल, आफ्टरमार्केट Android ROM वापरत नसाल, किंवा आपल्याला हे त्रुटी म्हणून दिसत आहे असे वाटत असेल, तर ट्रबलशूट करण्यात मदतीसाठी कृपया support@signal.org वर संपर्क करा.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">ह्या डिव्हाईस मध्ये Google प्ले सेवा नाही. तरीही आपण Molly वापरू शकता, पण ह्या कॉन्फिगरेशनमुळे विश्वसनीयता किंवा कार्यक्षमता कमी होऊ शकते.\n\nजर आपण प्रगत वापरकर्ते नसाल, आफ्टरमार्केट Android ROM वापरत नसाल, किंवा आपल्याला हे त्रुटी म्हणून दिसत आहे असे वाटत असेल, तर ट्रबलशूट करण्यात मदतीसाठी कृपया support@molly.im वर संपर्क करा.</string>
     <string name="RegistrationActivity_i_understand">मला समजले</string>
     <string name="RegistrationActivity_play_services_error">प्ले सेवा त्रुटी</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google प्ले सेवा अद्ययावत होत आहे किंवा तात्पुर्ते अनुपलब्ध आहे. कृपया पुन्हा प्रयत्न करा.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">अ-मानक क्रमांक स्वरूप</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">तुम्ही प्रविष्‍ट केलेला क्रमांक (%1$s) हा अ-मानक स्वरूपाचा असल्याचे दिसते. \n\nतुम्हाला %2$s म्हणायचे होते का?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - फोन नंबर स्वरूप</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - फोन नंबर स्वरूप</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">कॉलची विनंती केली</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">नोंदणी करण्यामध्ये समस्या आली?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• कृपया आपल्या फोनला आपले SMS किंवा कॉल प्राप्त करण्यास सेल्युलर सिग्नल असल्याची खात्री करा\n • तुम्ही या क्रमांकावर फोन कॉल प्राप्त करु शकता याची पुष्टी करा\n • आपण आपला फोन नंबर बरोबर प्रविष्ट केला आहे याची खात्री करा.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">अधिक माहितीसाठी, कृपया या निराकरण टप्प्यांची अंमलबजावणी करा किंवा सपोर्टशी संपर्क साधा</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">अधिक माहितीसाठी, कृपया %1$s किंवा %2$s ला फॉलो करा</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">हे निराकरणाचे टप्पे आहेत</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">संपर्कात जोडा</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Signal वर आमंत्रित करा</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Molly वर आमंत्रित करा</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal संदेश</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal कॉल</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">संपर्कात जोडा</string>
-    <string name="SharedContactView_invite_to_signal">Signal वर आमंत्रित करा</string>
+    <string name="SharedContactView_invite_to_signal">Molly वर आमंत्रित करा</string>
     <string name="SharedContactView_message">Signal संदेश</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s हा %2$s शी संबंधित आहे</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal अद्यतन</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal ची नवीन आवृत्ती उपलब्ध आहे. अपडेट करण्यास टॅप करा.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal अपडेट होण्यात अयशस्वी झाला</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly अद्यतन</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly ची नवीन आवृत्ती उपलब्ध आहे. अपडेट करण्यास टॅप करा.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly अपडेट होण्यात अयशस्वी झाला</string>
     <string name="ApkUpdateNotifications_failed_general_body">आपण नंतर पुन्हा प्रयत्न करू.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal यशस्वीरित्या अद्ययावत झाले</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly यशस्वीरित्या अद्ययावत झाले</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">आपण %1$s आवृत्तीवर आपोआप अद्ययावत झाला आहात.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">आमचा Signal सुरक्षितता नंबर:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">असे दिसते की आपल्याकडे सामायिक करण्यासाठी कुठलेही अॅप नाहीत.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">तुलना करण्यासाठी क्लिपबोर्डवर कुठलाही सुरक्षितता नंबर आढळला नाही.</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">QR कोड स्कॅन करण्यासाठी Signal ला कॅमेरा परवानगीची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"कॅमेरा\" सक्षम करा.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">QR कोड स्कॅन करण्यासाठी Molly ला कॅमेरा परवानगीची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"कॅमेरा\" सक्षम करा.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">कॅमेरा परवानगी विना QR कोड स्कॅन करण्यास अक्षम</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">%1$s चा सुरक्षितता नंबर पहाण्यासाठी आपल्याला पहिले संदेश विनिमय करावा लागेल.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">उघडण्यासाठी स्पर्श करा.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal अनलॉक झाले आहे</string>
-    <string name="KeyCachingService_lock">Signal लॉक करा</string>
+    <string name="KeyCachingService_passphrase_cached">Molly अनलॉक झाले आहे</string>
+    <string name="KeyCachingService_lock">Molly लॉक करा</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">आपण</string>
     <string name="MediaPreviewActivity_unssuported_media_type">असमर्थित मिडिया प्रकार</string>
     <string name="MediaPreviewActivity_draft">मसुदा</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">बाह्य संचयनात जतन करण्यासाठी Signal ला संचयन परवानगीची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"संचयन\" सक्षम करा.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">बाह्य संचयनात जतन करण्यासाठी Molly ला संचयन परवानगीची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"संचयन\" सक्षम करा.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">परवानग्यांविना बाह्य संचयनात जतन करण्यात अक्षम</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">संदेश हटवायचा?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">हे कायमचे हा संदेश हटवेल.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">संदेश पोहोचवण्यात अयशस्वी.</string>
     <string name="MessageNotifier_error_delivering_message">संदेश पोहोचवण्यात त्रुटी.</string>
     <string name="MessageNotifier_message_delivery_paused">संदेश डिलिव्हरीला विराम दिला.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Signal वर संदेश पाठवणे सुरू ठेवण्यासाठी सत्यापित करा.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Molly वर संदेश पाठवणे सुरू ठेवण्यासाठी सत्यापित करा.</string>
     <string name="MessageNotifier_mark_all_as_read">सर्व वाचले म्हणून चिन्हांकित करा</string>
     <string name="MessageNotifier_mark_read">वाचले असे चिन्हांकित करा</string>
     <string name="MessageNotifier_turn_off_these_notifications">या सूचना बंद करा</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">आपल्या स्टिकरवर %1$s प्रतिक्रिया दिली.</string>
     <string name="MessageNotifier_this_message_was_deleted">हा संदेश हटवला गेला.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">संपर्क Signal मध्ये सामील झाला सूचना बंद करायच्या? आपण त्यांना पुन्हा Signal &gt; सेटिंग &gt; सूचना मधून सक्षम करू शकता.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">संपर्क Molly मध्ये सामील झाला सूचना बंद करायच्या? आपण त्यांना पुन्हा Molly &gt; सेटिंग &gt; सूचना मधून सक्षम करू शकता.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signal लॉक केलेले असताना जलद प्रतिसाद अनुपलब्ध!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Molly लॉक केलेले असताना जलद प्रतिसाद अनुपलब्ध!</string>
     <string name="QuickResponseService_problem_sending_message">संदेश पाठविण्यात त्रुटी!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">अवैध शॉर्टकट</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">नवीन संदेश</string>
     <string name="SingleRecipientNotificationBuilder_message_request">संदेश विनंती</string>
     <string name="SingleRecipientNotificationBuilder_you">आपण</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">हे डिव्हाइस यापुढे नोंदणीकृत राहणार नाही. असे होण्याचे कारण आपण आपला फोन नंबर Signal सह वेगळ्या डिव्हाइसवर नोंदणीकृत केला आहे.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">हे डिव्हाइस यापुढे नोंदणीकृत राहणार नाही. असे होण्याचे कारण आपण आपला फोन नंबर Molly सह वेगळ्या डिव्हाइसवर नोंदणीकृत केला आहे.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">डिव्हाईस चे पुन्हा नोंदणीकरण करा</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">कॉलला उत्तर देण्यासाठी, Signal ला तुमच्या मायक्रोफोनचा अॅक्सेस द्या.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">कॉलला उत्तर देण्यासाठी, Molly ला तुमच्या मायक्रोफोनचा अॅक्सेस द्या.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">व्हिडिओ कॉलचे उत्तर देण्यास, आपल्या मायक्रोफोन आणि कॅमेऱ्याला Signal अ‍ॅक्सेस द्या.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">कॉल करण्यासाठी किंवा प्राप्त करण्यासाठी Signal ला मायक्रोफोन आणि कॅमेरा परवानग्यांची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"मायक्रोफोन\" आणि \"कॅमेरा\" सक्षम करा.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">व्हिडिओ कॉलचे उत्तर देण्यास, आपल्या मायक्रोफोन आणि कॅमेऱ्याला Molly अ‍ॅक्सेस द्या.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">कॉल करण्यासाठी किंवा प्राप्त करण्यासाठी Molly ला मायक्रोफोन आणि कॅमेरा परवानग्यांची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"मायक्रोफोन\" आणि \"कॅमेरा\" सक्षम करा.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">लिंक केलेल्या डिव्हाईसवर उत्तर दिले.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">लिंक केलेल्या डिव्हाईसवर नकार दिला.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">लिंक केलेल्या डिव्हाईसवर व्यस्त.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">नवीन पासफ्रेझची पुनरावृत्ती करा</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Signal वर आमंत्रित करा</string>
+    <string name="contact_selection_activity__invite_to_signal">Molly वर आमंत्रित करा</string>
     <string name="contact_selection_activity__new_group">नवीन गट</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">संपर्क रिफ्रेश करा</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">कोणाची आठवण येत आहे? रिफ्रेश करून पहा</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Signal वर आपणाला माहीत असलेल्या लोकांना शोधा</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">आपल्या संपर्कास ॲक्सेस करण्याची अनुमती द्या</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">अधिक</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">संपर्क फोटो</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">संपर्क दाखवण्यासाठी Signal ला संपर्क परवानगीची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"संपर्क\" सक्षम करा.</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">संपर्क दाखवण्यासाठी Molly ला संपर्क परवानगीची आवश्यकता असते, पण ती कायमची नाकारली गेली आहे. कृपया अॅप सेटिंग मेनू मध्ये सुरू ठेवा, \"परवानग्या\" निवडा, आणि \"संपर्क\" सक्षम करा.</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">संपर्क पुनर्प्राप्त करण्यात त्रुटी, आपले नेटवर्क कनेक्शन तपासा</string>
     <string name="ContactSelectionListFragment_username_not_found">वापरकर्तानाव आढळले नाही</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" Signal वापरकर्ता नाही. कृपया वापरकर्तानाव तपासा आणि पुन्हा प्रयत्न करा."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">वापरकर्ता नावाने शोधा</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">संपर्कांना ॲक्सेसची अनुमती द्या</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Signal वर आपणाला माहीत असलेल्या लोकांना शोधण्यासाठी:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">अॅक्सेस अनुमती द्या</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">नाही धन्यवाद</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">आपले संपर्क ॲक्सेस करण्यासाठी अनुमती द्या. आपले संपर्क कूटबद्ध केलेले आहेत आणि ते Signal सेवेला दृश्यमान नाहीत.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">आपले संपर्क दाखविण्यासाठी Signal ला त्यांना अॅक्सेस करण्याची गरज आहे.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">आपले संपर्क दाखविण्यासाठी Molly ला त्यांना अॅक्सेस करण्याची गरज आहे.</string>
     <string name="contact_selection_list_fragment__show_contacts">संपर्क दाखवा</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">आपण या व्यक्तीला हटवले आहे, त्यांना पुन्हा संदेश पाठवण्याने त्यांना आपल्या सूचीमध्ये जोडले जाईल.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">पर्याय</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">अद्यतन</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">प्ले करा … विराम द्या</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">बबल्स हे एक Android वैशिष्ट्य आहे जे आपण Signal चॅट्ससाठी बंद करू शकता.</string>
+    <string name="BubbleOptOutTooltip__description">बबल्स हे एक Android वैशिष्ट्य आहे जे आपण Molly चॅट्ससाठी बंद करू शकता.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">आता नाही</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">गट विवरण</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Signal अद्यतनित करा</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Molly अद्यतनित करा</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Signal ची ही आवृत्ती कालबाह्य झाली आहे. Signal वापरणे पुढे सुरु ठेवण्यासाठी आता अपडेट करा.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Molly ची ही आवृत्ती कालबाह्य झाली आहे. Molly वापरणे पुढे सुरु ठेवण्यासाठी आता अपडेट करा.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">अद्यतन</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">हळू</string>
     <string name="preferences__help">मदत</string>
     <string name="preferences__advanced">प्रगत</string>
-    <string name="preferences__donate_to_signal">Signal ला देणगी द्या</string>
+    <string name="preferences__donate_to_signal">Molly ला देणगी द्या</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">गोपनीयता</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">\"%1$s\" मध्ये ॲप चिन्ह आणि नाव बदला</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">ॲप चिन्ह आणि नाव बदलण्यासाठी Signal बंद करण्याची गरज असेल. अधिसूचना डिफॉल्ट Signal चिन्ह आणि नाव यांचे नेहमी प्रदर्शन करेल.</string>
+    <string name="preferences__app_icon_dialog_description">ॲप चिन्ह आणि नाव बदलण्यासाठी Molly बंद करण्याची गरज असेल. अधिसूचना डिफॉल्ट Molly चिन्ह आणि नाव यांचे नेहमी प्रदर्शन करेल.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">आपल्या फोनच्या होम स्क्रिन आणि ॲप ड्रॉवर वर दृश्यमान असेल असे ॲप चिन्ह आणि नाव निवडा. अधिसूचना डिफॉल्ट Signal चिन्ह आणि नाव यांचे नेहमी प्रदर्शन करेल. अधिक जाणून घ्या</string>
+    <string name="preferences__app_icon_warning_learn_more">आपल्या फोनच्या होम स्क्रिन आणि ॲप ड्रॉवर वर दृश्यमान असेल असे ॲप चिन्ह आणि नाव निवडा. अधिसूचना डिफॉल्ट Molly चिन्ह आणि नाव यांचे नेहमी प्रदर्शन करेल. अधिक जाणून घ्या</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">ॲप चिन्हे आणि नावे होम स्क्रिन आणि ॲप ड्रॉवर वर दृश्यमान आहेत.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">अधिसूचना डिफॉल्ट Signal चिन्ह आणि नाव यांचे नेहमी प्रदर्शन करेल.</string>
+    <string name="preferences__app_icon_notification_warning">अधिसूचना डिफॉल्ट Molly चिन्ह आणि नाव यांचे नेहमी प्रदर्शन करेल.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">अधिक जाणून घ्या</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">हे सर्व चॅट्स कायमस्वरुपी सर्वात अलीकडील %1$s संदेशांमध्ये ट्रिम करेल.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">हे आपल्या डिव्हाईसवरून सर्व संदेश इतिहास आणि मिडिया कायमचे हटवेल.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">हे आपल्या डिव्हाइस आणि कोणत्याही लिंंक केलेल्या डिव्हाइसेस वरून सर्व संदेश इतिहास आणि मिडीया कायमचे हटवेल.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">आपण खात्रीने सर्व संदेश इतिहास हटवू इच्छिता?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">सर्व संदेश इतिहास कायमचा हटवला जाईल. ही क्रिया मागे घेतली जाऊ शकत नाही.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">सर्व संदेश इतिहास सर्व डिव्हाइसेसवरून कायमस्वरूपी हटवले जाईल. ही क्रिया पूर्ववत केली जाऊ शकत नाही.</string>
     <string name="preferences_storage__delete_all_now">सर्व आता हटवा</string>
     <string name="preferences_storage__forever">नेहमीसाठी</string>
     <string name="preferences_storage__one_year">1 वर्ष</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">सेंसॉरशिप सर्कंवेंशन</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">सेंसॉरशिप सर्कंवेंशन</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">जर सक्षम केले, तर Signal सेंसॉरशिप सर्कंमवेंट करण्याचा प्रयत्न करेल. आपण Signal सेंसॉर केलेल्या स्थानावर असल्याखेरीज हे वैशिष्ट्य सक्षम करू नये.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">जर सक्षम केले, तर Molly सेंसॉरशिप सर्कंमवेंट करण्याचा प्रयत्न करेल. आपण Molly सेंसॉर केलेल्या स्थानावर असल्याखेरीज हे वैशिष्ट्य सक्षम करू नये.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">आपल्या खात्याच्या फोन नंबरच्या आधारावर सेंसॉरशिप सर्कंवेंशन सक्रिय केले गेले आहे.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">पेमेंट्स सादर करत आहोत</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">नवीन गोपनीयता केंद्रित डिजिटल चलन, MobileCoin पाठवण्यासाठी आणि प्राप्त करण्यासाठी Signal वापरा. सुरू करण्यासाठी सक्रिय करा.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">नवीन गोपनीयता केंद्रित डिजिटल चलन, MobileCoin पाठवण्यासाठी आणि प्राप्त करण्यासाठी Molly वापरा. सुरू करण्यासाठी सक्रिय करा.</string>
     <string name="PaymentsHomeFragment__activate_payments">पेमेंट सक्रिय करा</string>
     <string name="PaymentsHomeFragment__activating_payments">पेमेंट सक्रिय करत आहे…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">पेमेंट खाते पुनर्स्थापित करा</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">आपल्या क्षेत्रात पेमेंट उपलब्ध नाही.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">पेमेंट सक्षम करण्यात अयशस्वी. नंतर पुन्हा प्रयत्न करा.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">पेमेंट निष्क्रिय करायचे?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">आपण पेमेंट निष्क्रिय केल्यास आपल्याला Signal मध्ये MobileCoin पाठवता किंवा प्राप्त करता येणार नाही.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">आपण पेमेंट निष्क्रिय केल्यास आपल्याला Molly मध्ये MobileCoin पाठवता किंवा प्राप्त करता येणार नाही.</string>
     <string name="PaymentsHomeFragment__deactivate">निष्क्रिय करा</string>
     <string name="PaymentsHomeFragment__continue">सुरू ठेवा</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">सध्या बॅलंस उपलब्ध नाही.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">तपशील</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">आपण MobileCoin पाठवण्यास आणि प्राप्त करण्यास Signal वापरू शकता. सर्व पेमेंट्स ही MobileCoins आणि MobileCoin वॉलेट यांच्या वापराच्या अटींना अधीन आहेत. आपणाला काही समस्यांचा सामना करावा लागू शकतो आणि आपण गमावू शकता अशी पेमेंट्स किंवा शिल्लकी पुर्नप्राप्त केल्या जाऊ शकणार नाहीत. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">आपण MobileCoin पाठवण्यास आणि प्राप्त करण्यास Molly वापरू शकता. सर्व पेमेंट्स ही MobileCoins आणि MobileCoin वॉलेट यांच्या वापराच्या अटींना अधीन आहेत. आपणाला काही समस्यांचा सामना करावा लागू शकतो आणि आपण गमावू शकता अशी पेमेंट्स किंवा शिल्लकी पुर्नप्राप्त केल्या जाऊ शकणार नाहीत. </string>
     <string name="PaymentsHomeFragment__activate">सक्रिय करा</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoin च्या अटी पहा</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Signal मध्ये पेमेंट यापुढे उपलब्ध नाही. तरीही आपण फंड एक्सचेंजवर स्थानांतरित करू शकता पण आपण यापुढे पेमेंट पाठवू किंवा प्राप्त करू शकत नाही किंवा फंड जोडू शकत नाही.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Molly मध्ये पेमेंट यापुढे उपलब्ध नाही. तरीही आपण फंड एक्सचेंजवर स्थानांतरित करू शकता पण आपण यापुढे पेमेंट पाठवू किंवा प्राप्त करू शकत नाही किंवा फंड जोडू शकत नाही.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">परवानग्यांची अनुमती द्या</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">आपण ओळखत असलेल्या लोकांना संदेश करण्यास मदत करण्यासाठी, Signal या परवानग्यांची विनंती करेल. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">आपण ओळखत असलेल्या लोकांना संदेश करण्यास मदत करण्यासाठी, Molly या परवानग्यांची विनंती करेल. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">अधिसूचना</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">पुढे</string>
     <string name="PaymentsTransferFragment__invalid_address">अवैध पत्ता</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">आपण स्थानांतरित करत असलेला वॉलेट पत्ता तपासा आणि पुन्हा प्रयत्न करा.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">आपण स्वतःच्या Signal वॉलेट पत्त्यावर स्थानांतरित करू शकत नाही. समर्थित ऐक्सचेंजवरील आपल्या खात्याचा वॉलेट पत्ता प्रविष्ट करा.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR कोड स्कॅन करण्यासाठी, Signal ला कॅमेराचा अॅक्सेस आवश्यक आहे.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QR कोड कॅप्चर करण्यासाठी Signal ला कॅमेरा परवानगीची आवश्यकता असते, सेटिंग मध्ये जा, \"परवानग्या\" निवडा, आणि \"कॅमेरा\" सक्षम करा.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR कोड स्कॅन करण्यासाठी, Signal ला कॅमेराचा अॅक्सेस आवश्यक आहे.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">आपण स्वतःच्या Molly वॉलेट पत्त्यावर स्थानांतरित करू शकत नाही. समर्थित ऐक्सचेंजवरील आपल्या खात्याचा वॉलेट पत्ता प्रविष्ट करा.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR कोड स्कॅन करण्यासाठी, Molly ला कॅमेराचा अॅक्सेस आवश्यक आहे.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QR कोड कॅप्चर करण्यासाठी Molly ला कॅमेरा परवानगीची आवश्यकता असते, सेटिंग मध्ये जा, \"परवानग्या\" निवडा, आणि \"कॅमेरा\" सक्षम करा.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR कोड स्कॅन करण्यासाठी, Molly ला कॅमेराचा अॅक्सेस आवश्यक आहे.</string>
     <string name="PaymentsTransferFragment__settings">सेटिंग</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">येणारा Signal व्हॉईस कॉल</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">येणारा Molly व्हॉईस कॉल</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">येणारा Signal व्हिडिओ कॉल</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">येणारा Molly व्हिडिओ कॉल</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">येणारा Signal गट कॉल</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">येणारा Molly गट कॉल</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">सुरू असलेला Signal व्हॉईस कॉल</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">सुरू असलेला Molly व्हॉईस कॉल</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">सुरू असलेला Signal व्हिडिओ कॉल</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">सुरू असलेला Molly व्हिडिओ कॉल</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">सुरू असलेला Signal गट कॉल</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">सुरू असलेला Molly गट कॉल</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">लोड होत आहे…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">सत्यापित करा</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">आपण आपला बॅकअप पासफ्रेझ यशस्वीरीत्या प्रविष्ट केला आहे</string>
     <string name="BackupDialog_passphrase_was_not_correct">पासफ्रेझ बरोबर नव्हता</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signal चा बॅकअप तयार करत आहे…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Molly चा बॅकअप तयार करत आहे…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Signal बॅकअप सत्यापित करत आहे…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Molly बॅकअप सत्यापित करत आहे…</string>
     <string name="LocalBackupJobApi29_backup_failed">बॅकअप अयशस्वी</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">आपली बॅकअप डिरेक्टरी हटवली किंवा हलवली गेली आहे.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">या व्हॉल्यूमवर स्टोअर करण्यासाठी आपली बॅकअप फाईल खूप मोठी आहे.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">(%1$02d:%2$02d) मला कॉल करा</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">(%1$02d:%2$02d) कोड पुन्हा पाठवा</string>
-    <string name="RegistrationActivity_contact_signal_support">Signal समर्थनाशी संपर्क साधा</string>
-    <string name="RegistrationActivity_code_support_subject">Signal नोंदणी - Android करिता सत्यापन कोड</string>
+    <string name="RegistrationActivity_contact_signal_support">Molly समर्थनाशी संपर्क साधा</string>
+    <string name="RegistrationActivity_code_support_subject">Molly नोंदणी - Android करिता सत्यापन कोड</string>
     <string name="RegistrationActivity_incorrect_code">चुकीचा कोड</string>
     <string name="BackupUtil_never">कधीही नाही</string>
     <string name="BackupUtil_unknown">अज्ञात</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">फोन नंबर</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">आपला फोन नंबर कोण पाहू शकते आणि त्याच्यासह Signal वर आपणाला कोण संपर्क करू शकते ते निवडा.</string>
+    <string name="preferences_app_protection__choose_who_can_see">आपला फोन नंबर कोण पाहू शकते आणि त्याच्यासह Molly वर आपणाला कोण संपर्क करू शकते ते निवडा.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">माझा नंबर कोण पाहू शकते</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">आपण खूप प्रयत्न केले आहेत. कृपया नंतर पुन्हा प्रयत्न करा.</string>
     <string name="RegistrationActivity_error_connecting_to_service">सेवेसोबत कनेक्ट करताना त्रुटी</string>
     <string name="preferences_chats__backups">बॅकअप</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal लॉक केले आहे</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly लॉक केले आहे</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">अनलॉक करण्यासाठी टॅप करा</string>
     <string name="Recipient_unknown">अज्ञात</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">आपल्याला आपल्या जुन्या डिव्हाइसचा अॅक्सेस आवश्यक आहे.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">बॅकअपवरून पुनर्स्थापित करा</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">स्थानिक बॅकअपवरून आपले संदेश पुनर्स्थापित करा. आपण आता पुनर्स्थापित न केल्यास, आपण नंतर पुनर्स्थापना करू शकणार नाही.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">स्थानिक बॅकअप पुर्नस्थापित करा</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signal बॅकअप पुर्नस्थापित करा</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">आपले मजकूर संदेश + आपले मागील 30 दिवसातील मिडीया पुर्नस्थापित करा</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">अधिक पर्याय</string>
 
+    <string name="TransferOrRestoreFragment__cancel">रद्द करा</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">स्थानांतरित न करता लॉग इन करा</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">आपले संदेश आणि मिडीया स्थानांतरित न करता सुरू ठेवा</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">आपल्या Android फोनवर Signal उघडा</string>
     <string name="NewDeviceTransferInstructions__continue">सुरू ठेवा</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">जुन्या Android डिव्हाइससोबत कनेक्ट करण्याचा प्रयत्न करत आहे…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">एक क्षण घेत आहे, लवकरच तयार असेल</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">जुन्या Android डिव्हाइसचा कनेक्ट करण्यासाठी प्रतीक्षा करत आहे…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">आपल्या जुन्या Android डिव्हाइसला शोधण्यासाठी आणि कनेक्ट करण्यासाठी Signal ला स्थान परवानगीची आवश्यकता आहे.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">आपल्या जुन्या Android डिव्हाइसला शोधण्यासाठी आणि कनेक्ट करण्यासाठी Signal ला स्थान सेवा सक्षम असल्याची आवश्यकता आहे.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal ला आपल्या जुन्या Android डिव्हाससोबत शोधण्यासाठी आणि कनेक्ट करण्यासाठी Wi-Fi आवश्यक आहे. Wi-Fi चालू असायला हवे पण Wi-Fi नेटवर्कसोबत कनेक्ट केलेले असणे गरजेचे नाही.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">क्षमस्व, हा डिव्हाइस Wi-Fi डायरेक्टचे समर्थन करत नसल्याचे दिसते. आपल्या जुन्या Android डिव्हाइससोबत शोधण्यासाठी आणि कनेक्ट करण्यासाठी Signal Wi-Fi डायरेक्ट वापरते. आपल्या जुन्या Android डिव्हाइसवरून आपण तरीही आपले खाते पुनर्स्थापित करण्यासाठी बॅकअप पुनर्स्थापित करू शकता.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">आपल्या जुन्या Android डिव्हाइसला शोधण्यासाठी आणि कनेक्ट करण्यासाठी Molly ला स्थान परवानगीची आवश्यकता आहे.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">आपल्या जुन्या Android डिव्हाइसला शोधण्यासाठी आणि कनेक्ट करण्यासाठी Molly ला स्थान सेवा सक्षम असल्याची आवश्यकता आहे.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly ला आपल्या जुन्या Android डिव्हाससोबत शोधण्यासाठी आणि कनेक्ट करण्यासाठी Wi-Fi आवश्यक आहे. Wi-Fi चालू असायला हवे पण Wi-Fi नेटवर्कसोबत कनेक्ट केलेले असणे गरजेचे नाही.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">क्षमस्व, हा डिव्हाइस Wi-Fi डायरेक्टचे समर्थन करत नसल्याचे दिसते. आपल्या जुन्या Android डिव्हाइससोबत शोधण्यासाठी आणि कनेक्ट करण्यासाठी Molly Wi-Fi डायरेक्ट वापरते. आपल्या जुन्या Android डिव्हाइसवरून आपण तरीही आपले खाते पुनर्स्थापित करण्यासाठी बॅकअप पुनर्स्थापित करू शकता.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">बॅकअप पुनर्स्थापित करा</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">आपल्या जुन्या Android डिव्हाइससोबत कनेक्ट करायचा प्रयत्न करताना एक अनेपक्षित त्रुटी आली.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">नवीन Android डिव्हाइससाठी शोधत आहे…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">आपल्या नवीन Android डिव्हाइसला शोधण्यासाठी आणि कनेक्ट करण्यासाठी Signal ला स्थान परवानगीची आवश्यकता आहे.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">आपल्या नवीन Android डिव्हाइसला शोधण्यासाठी आणि कनेक्ट करण्यासाठी Signal ला स्थान सेवा सक्षम असल्याची आवश्यकता आहे.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal ला आपल्या नवीन Android डिव्हाससोबत शोधण्यासाठी आणि कनेक्ट करण्यासाठी Wi-Fi आवश्यक आहे. Wi-Fi चालू असायला हवे पण Wi-Fi नेटवर्कसोबत कनेक्ट केलेले असणे गरजेचे नाही.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">क्षमस्व, हा डिव्हाइस Wi-Fi डायरेक्टचे समर्थन करत नसल्याचे दिसते. आपल्या नवीन Android डिव्हाइससोबत शोधण्यासाठी आणि कनेक्ट करण्यासाठी Signal Wi-Fi डायरेक्ट वापरते. आपल्या नवीन Android डिव्हाइसवर आपण तरीही आपले खाते पुनर्स्थापित करण्यासाठी बॅकअप तयार करू शकता.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">आपल्या नवीन Android डिव्हाइसला शोधण्यासाठी आणि कनेक्ट करण्यासाठी Molly ला स्थान परवानगीची आवश्यकता आहे.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">आपल्या नवीन Android डिव्हाइसला शोधण्यासाठी आणि कनेक्ट करण्यासाठी Molly ला स्थान सेवा सक्षम असल्याची आवश्यकता आहे.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly ला आपल्या नवीन Android डिव्हाससोबत शोधण्यासाठी आणि कनेक्ट करण्यासाठी Wi-Fi आवश्यक आहे. Wi-Fi चालू असायला हवे पण Wi-Fi नेटवर्कसोबत कनेक्ट केलेले असणे गरजेचे नाही.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">क्षमस्व, हा डिव्हाइस Wi-Fi डायरेक्टचे समर्थन करत नसल्याचे दिसते. आपल्या नवीन Android डिव्हाइससोबत शोधण्यासाठी आणि कनेक्ट करण्यासाठी Molly Wi-Fi डायरेक्ट वापरते. आपल्या नवीन Android डिव्हाइसवर आपण तरीही आपले खाते पुनर्स्थापित करण्यासाठी बॅकअप तयार करू शकता.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">बॅकअप तयार करा</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">आपल्या नवीन Android डिव्हाइससोबत कनेक्ट करायचा प्रयत्न करताना एक अनेपक्षित त्रुटी आली.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">डेटा स्थानांतरित करत आहे</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">दोन्ही डिव्हाइस ऐकमेकांजवळ ठेवा. डिव्हाइस बंद करू नका आणि Signal चालू ठेवा. स्थानांतरण एंड-टू-एंड एन्क्रिप्टेड आहेत.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">दोन्ही डिव्हाइस ऐकमेकांजवळ ठेवा. डिव्हाइस बंद करू नका आणि Molly चालू ठेवा. स्थानांतरण एंड-टू-एंड एन्क्रिप्टेड आहेत.</string>
     <string name="DeviceTransfer__d_messages_so_far">आतापर्यंत %1$d संदेश…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% संदेश आतापर्यंत…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">खाते स्थानांतरित करा</string>
     <string name="OldDeviceTransferInstructions__first_bullet">१.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">आपल्या नवीन Android डिव्हाइसवर Signal डाऊनलोड करा</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">आपल्या नवीन Android डिव्हाइसवर Molly डाऊनलोड करा</string>
     <string name="OldDeviceTransferInstructions__second_bullet">२.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"\"खाते स्थानांतरित करा किंवा पुनर्स्थापित करा\" वर टॅप करा"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">३.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">ही लिंक असलेले कोणीही गटाचे नाव आणि फोटो पाहू शकतात आणि सामील होण्याची विनंती करू शकतात. याला आपल्या विश्वासातल्या लोकांसह सामायिक करा.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">ही लिंक असलेला कुणीही या गटाचा नाव आणि फोटो आणि गटात सामील होऊ शकतो. याला आपल्या विश्वासातल्या लोकांसह सामायिक करा.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Signal द्वारा शेअर करा</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Molly द्वारा शेअर करा</string>
     <string name="GroupLinkBottomSheet_copy">कॉपी करा</string>
     <string name="GroupLinkBottomSheet_qr_code">QR कोड</string>
     <string name="GroupLinkBottomSheet_share">सामायिक करा</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">MobileCoin बद्दल</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin हे एक नवीन गोपनीयता केंद्रित डिजिटल चलन आहे.</string>
     <string name="payment_info_card_adding_funds">फंड जोडत आहे</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">तुम्ही तुमच्या वॉलेट पत्त्यावर MobileCoin पाठवून Signal मध्ये वापरासाठी निधी जोडू शकता.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">तुम्ही तुमच्या वॉलेट पत्त्यावर MobileCoin पाठवून Molly मध्ये वापरासाठी निधी जोडू शकता.</string>
     <string name="payment_info_card_cashing_out">फंड काढत आहे</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">MobileCoin चे समर्थन करत असलेल्या ऐक्सचेंजवर आपण कधीही MobileCoin फंड काढू शकता. फक्त त्या ऐक्सचेंजवर आपल्या खात्यावर स्थानांतरण करा.</string>
     <string name="payment_info_card_hide_this_card">हे कार्ड लपवायचे?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">वॉलेट निष्क्रिय करा</string>
     <string name="DeactivateWalletFragment__your_balance">आपला बॅलंस</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">पेमेंट्स निष्क्रिय करण्यापूर्वी आपण आपले फंड इतर वॉलेट पत्त्यावर ट्रान्सफर करण्याची शिफारस केलेली आहे. आपण आपले फंड ट्रान्सफर न करण्याचे निवडल्यास, आपण पेमेंट्स पुन्हा सक्रिय केल्यास ते आपल्या वॉलेट मध्ये Signal ला लिंक केलेले राहतील.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">पेमेंट्स निष्क्रिय करण्यापूर्वी आपण आपले फंड इतर वॉलेट पत्त्यावर ट्रान्सफर करण्याची शिफारस केलेली आहे. आपण आपले फंड ट्रान्सफर न करण्याचे निवडल्यास, आपण पेमेंट्स पुन्हा सक्रिय केल्यास ते आपल्या वॉलेट मध्ये Molly ला लिंक केलेले राहतील.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">उर्वरित बॅलंस स्थानांतरित करा</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">स्थानांतरित न करता निष्क्रिय करा</string>
     <string name="DeactivateWalletFragment__deactivate">निष्क्रिय करा</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">स्थानांतरित न करता निष्क्रिय करायचा?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">आपण पेमेंट्स पुन्हा सक्रिय करण्याचे निवडल्यास आपली शिल्लक आपल्या वॉलेट मध्ये Signal ला लिंक केलेली राहील.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">आपण पेमेंट्स पुन्हा सक्रिय करण्याचे निवडल्यास आपली शिल्लक आपल्या वॉलेट मध्ये Molly ला लिंक केलेली राहील.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">वॉलेट निष्क्रिय करण्यात त्रुटी.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">परवाने</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">अटी आणि गोपनीयता धोरण</string>
-    <string name="HelpFragment__copyright_signal_messenger">कॉपीराईट Signal संदेशक</string>
+    <string name="HelpFragment__copyright_signal_messenger">कॉपीराईट Molly संदेशक</string>
     <string name="HelpFragment__licenced_under_the_agplv3">GNU AGPLv3 खाली परवानाधारक</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">रंग निवडा</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">सामायिक करा</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">या गटात फक्त प्रशासक संदेश पाठवू शकतात.</string>
-    <string name="MultiselectForwardFragment__limit_reached">मर्यादा गाठली</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">आपण 5 पेक्षा अधिक चॅट निवडू शकत नाही</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">अधिक जाणून घ्या</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Signal अद्यतनित करा</string>
+    <string name="UpdateSignalExpiredDialog__title">Molly अद्यतनित करा</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Signal ची ही आवृत्ती कालबाह्य झाली आहे. Signal वापरणे पुढे सुरु ठेवण्यासाठी आता अपडेट करा.</string>
+    <string name="UpdateSignalExpiredDialog__message">Molly ची ही आवृत्ती कालबाह्य झाली आहे. Molly वापरणे पुढे सुरु ठेवण्यासाठी आता अपडेट करा.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">अद्यतन</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">डिव्हाइस नोंदणीकृत नाही</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">हे डिव्हाइस यापुढे नोंदणीकृत राहणार नाही. या डिव्हाइसवर Signal वापरणे पुढे सुरु ठेवण्यासाठी पुन्हा नोंदणी करा.</string>
+    <string name="ReregisterSignalDialog__message">हे डिव्हाइस यापुढे नोंदणीकृत राहणार नाही. या डिव्हाइसवर Molly वापरणे पुढे सुरु ठेवण्यासाठी पुन्हा नोंदणी करा.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">पुनर्नोंदणी</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">पिकर उघडण्यात अयशस्वी.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">अधिसूचना सक्षम करण्यास, Signal ला त्यांना प्रदर्शित करण्याच्या परवानगीची गरज आहे.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">अधिसूचना सक्षम करण्यास, Molly ला त्यांना प्रदर्शित करण्याच्या परवानगीची गरज आहे.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">चालू करा</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">अद्याप कोणतीही प्रत्युत्तरे नाहीत</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">आपण या स्टोरीज ला उत्तर देऊ शकणार नाही कारण आपण यापुढे या ग्रुपचे सदस्य नाही.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">स्टोरीला प्रतिक्रिया दिली</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">स्टोरीला प्रतिक्रिया दिली</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">स्टोरीला प्रतिक्रिया दिली</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">दृश्ये</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">आपली बँक निवडा</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">%1$s सह आपल्या देणगीची पुष्टी करा</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">आपली आवर्ती देणगी सेट करण्यासाठी, आपल्या बॅंकेकडे €0,01 शुल्काची पुष्टी करण्यासाठी सुरू ठेवा वर टॅप करा. हे आपोआप परत केले जाईल आणि आपली €5/महिना देणगी आपल्या अकाऊंटमधून डेबिट करण्याची अनुमती देते.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">आपली आवर्ती देणगी सेट करण्यासाठी, आपल्या बॅंकेकडे €0,01 शुल्काची पुष्टी करण्यासाठी सुरू ठेवा वर टॅप करा. हे आपोआप परत केले जाईल आणि आपली %1$s/महिना देणगी आपल्या अकाऊंटमधून डेबिट करण्याची अनुमती देते.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">सुरू ठेवा</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">बॅकअप डेटा डाऊनलोड करत आहे…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">मिडीया बॅकअप्स बंद आहेत</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">आम्ही आपल्या पेमेंट्स वर प्रक्रिया करू न शकल्याने आपला Signal मिडीया बॅकअप प्लॅन रद्द करण्यात आला आहे. आपणांकडे आपल्या बॅकअपमध्ये संग्रहित करण्यात आलेल्या कोणत्याही मिडीयाला डाउनलोड करण्यासाठी %1$d दिवस आहेत. %1$d दिवसांनंतर, आपल्या बॅकअप मधील मिडीया हटविला जाईल.</item>
+        <item quantity="other">आम्ही आपल्या पेमेंट्स वर प्रक्रिया करू न शकल्याने आपला Signal मिडीया बॅकअप प्लॅन रद्द करण्यात आला आहे. आपणांकडे आपल्या बॅकअपमध्ये संग्रहित करण्यात आलेल्या कोणत्याही मिडीयाला डाउनलोड करण्यासाठी %1$d दिवस आहेत. %1$d दिवसांनंतर, आपल्या बॅकअपमधील मिडीया हटवला जाईल.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">आपला सर्व मिडीयाचा बॅकअप घेणे सुरू ठेवण्यासाठी आपण कोणत्याही वेळी बॅकअपसाठी पुहा पैसे देणे सुरू करू शकता. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">आपला मिडीया आज हटवला जाईल</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">आम्ही आपल्या पेमेंट्सवर प्रक्रिया करू न शकल्याने आपला Signal मिडीया बॅकअप प्लॅन रद्द करण्यात आला आहे. आपल्या बॅकअप मधील आपला मिडीया हटवला जाण्यापूर्वी डाउनलोड करण्याची ही आपली शेवटची संधी आहे.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">डाउनलोड पूर्ण करू शकत नाही</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">आपल्या डिव्हाइसमध्ये पुरेशी मोकळी जागा नाही. आपल्या बॅकअप मध्ये संग्रहित मिडीया डाउनलोड करण्यासाठी जागेपैकी %1$s जागा मोकळी करा.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">आपण जर आपल्या बॅकअपमध्ये मिडीया \"वगळा\" निवडल्यास मिडीया %1$d दिवसामध्ये हटवला जाईल.</item>
+        <item quantity="other">आपण जर आपल्या बॅकअपमध्ये मिडीया \"वगळा\" निवडल्यास मिडीया %1$d दिवसांत हटवले जाईल.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">बॅकअप पेमेंट्स वर प्रक्रिया करू शकत नाही</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">आम्हाला आपले पुनरावृत्ती मासिक बॅकअप पेमेंट गोळा करण्यात समस्या येत आहे. आपली पेमेंट पद्धत अद्ययावत असल्याची खात्री करा. ती नसल्यास ती Google Pay मध्ये अद्यतनित करा. Signal काही दिवसामध्ये पेमेंटवर प्रक्रिया पुन्हा करण्याचा प्रयत्न करेल.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">बॅकअप पूर्ण करू शकत नाही</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">आपल्या डिव्हाइसने %1$d दिवसांसाठी बॅकअप पूर्ण केलेला नाही. आपले डिव्हाइस wi-fi शी कनेक्ट केले असल्याची खात्री करा आणि \"आत्ता बॅकअप घ्या.\" वर टॅप करा. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">अधिक जाणून घ्या</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">वगळा</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">आत्ता मिडीया डाउनलोड करा</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">नंतर डाउनलोड करा</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">मिडीया डाउनलोड करू नका</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">आपली मिडीया डाउनलोड करण्यसाठी %1$s जागा रिकामी करा.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">क्रेडिट किंवा डेबिट कार्ड</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">अज्ञात</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">पेमेंट्स इतिहास</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">आपला शेवटचा बॅकअप %1$s रोजी %2$s वाजता घेतला.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">निवडलेल्या वेळेपेक्षा जुने संदेश कायमस्वरूपी हटवले जातील.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">निवडलेल्या लांबीची मर्यादा ओलांडणारे संदेश कायमस्वरपी हटवले जातील.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">लिंंक केलेल्या डिव्हाइसेस वर मर्यादा लागू करा</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">सक्षम केल्यावर, चॅट मर्यादा आपल्या लिंंक केलेल्या डिव्हाइसेस मधील संदेश देखील हटवतील.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">हटवणे आता आपल्या सर्व डिव्हाइसेसवरून संकालित केले आहे</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">जेव्हा आपण संदेश किंवा चॅट्स हटवता, तेव्हा ते आपल्या फोन आणि लिंक केलेल्या डिव्हाइसेसवरून हटवले जातील.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">ठीक</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">पेमेंट्स इतिहास</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">मजकूर आणि सर्व मिडीया बॅकअप करा</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">पेमेंट तपशील</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">बॅकअप प्रकार</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">तारीख भरली</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">सामायिक करा</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal बॅकअप</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">पेमेंट्स इतिहास</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">बॅकअप तपशील</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">बॅकअप आकार</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">बॅकअप वारंवारता</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">मोबाइल वापरून बॅकअप करा</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">बॅकअप बंद करा आणि हटवा</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">बॅकअप हटवला आणि बंद केला.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">बॅकअप प्रकार बदलला आणि सदस्यत्व रद्द केले</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">सब्स्क्रिप्शन रद्द केले</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">डाउनलोड पूर्ण झाले</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">बॅकअप प्रकार</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">बॅकअप अक्षम केले</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/महिना</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">बॅकअप सक्षम करा</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">शेवटचा बॅकअप</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%2$s ला %1$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">कधीही नाही</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">आता बॅकअप करा</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">बॅकअप बंद करा आणि हटवा?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">आपणाला तो पुन्हा आकारला जाणा नाही. आपला बॅकअप हटवला जाईल आणि कोणताही नवीन बॅकअप तयार केला जाणार नाही.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">बंद करा आणि हटवा</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">बॅकअप हटवत आहे…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">बॅकअप हटवला</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"आता टॅप करून बॅक अप करा"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">दैनिक</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">साप्ताहिक</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">मासिक</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">मॅन्युअली बॅक अप</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">कृपया आपली डिव्हाइस पिन, पासवर्ड किंवा पॅटर्न प्रविष्ट करा.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">पुढे</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">बॅकअप प्रकार बदला</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">सदस्यत्व रद्द करा</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">रद्द करण्याची पुष्टी करा</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">आपणाकडून पुन्हा शुल्क आकारले जाणार नाही. आपल्या बिलिंग चक्राच्या समाप्तीच्या वेळी बॅकअप बंद केले जातील. त्या दिनांकानंतर आपण सध्या बॅकअप घेत असलेल्या मिडीयाला डाउनलोड करण्यासाठी आपणांकडे 30 दिवस असतील.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">पुष्टी करा आणि आत्ता डाउनलोड करा</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">पुष्टी करा आणि नंतर डाउनलोड करा</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">सदस्यत्व सुरू ठेवा</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index 18a069de52..dc8e5bc205 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal sedang mengemas kini…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly sedang mengemas kini…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Anda belum lagi menetapkan ungkapan laluan!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Menyahdayakan ungkapan laluan?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Ini akan membuka kunci Signal dan pemberitahuan mesej secara kekal.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Ini akan membuka kunci Molly dan pemberitahuan mesej secara kekal.</string>
     <string name="ApplicationPreferencesActivity_disable">Nyahdayakan</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Ralat ketika menyambung ke pelayan!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN adalah wajib untuk kunci daftar. Untuk menyahaktif PIN, sila nyahaktif terdahulu kunci daftar</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Fail</string>
     <string name="AttachmentKeyboard_contact">Kenalan</string>
     <string name="AttachmentKeyboard_location">Lokasi</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal perlukan kebenaran anda untuk menunjukkan gambar dan video anda</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly perlukan kebenaran anda untuk menunjukkan gambar dan video anda</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Benarkan Capaian</string>
     <string name="AttachmentKeyboard_payment">Pembayaran</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Tidak dapat mencari aplikasi untuk memilih media.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal memerlukan kebenaran Storan untuk melampirkan foto, video atau audio, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Storan\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal memerlukan kebenaran Kenalan untuk melampirkan maklumat hubungan, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Kenalan\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal memerlukan kebenaran Lokasi untuk melampirkan lokasi, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Lokasi\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly memerlukan kebenaran Storan untuk melampirkan foto, video atau audio, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Storan\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly memerlukan kebenaran Kenalan untuk melampirkan maklumat hubungan, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Kenalan\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly memerlukan kebenaran Lokasi untuk melampirkan lokasi, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Lokasi\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Benarkan akses kepada lokasi anda</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Untuk menghantar lokasi anda:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Benarkan akses Signal untuk menghantar lokasi anda.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Benarkan akses Molly untuk menghantar lokasi anda.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal perlukan akses lokasi untuk menghantar lokasi anda.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly perlukan akses lokasi untuk menghantar lokasi anda.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Benarkan akses kepada storan</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Untuk tunjuk foto dan video:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal perlukan akses storan untuk menunjukkan foto dan video anda.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly perlukan akses storan untuk menunjukkan foto dan video anda.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s belum mengaktifkan Pembayaran </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Tukar kamera</string>
     <string name="CameraXFragment_open_gallery_description">Buka geleri</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Benarkan akses</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Benarkan akses kepada kamera dan mikrofon anda</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Benarkan akses kepada kamera anda</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Benarkan akses kepada mikrofon anda</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Untuk menangkap foto, benarkan Signal untuk mengakses kamera.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Untuk menangkap foto dan video, benarkan Signal untuk mengakses kamera anda.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Untuk menangkap foto dan video, benarkan Signal untuk mengakses kamera dan mikrofon.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Untuk menangkap video dengan bunyi, benarkan Signal untuk mengakses mikrofon anda.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Untuk mengimbas kod QR, benarkan Signal untuk mengakses kamera.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal perlukan akses kamera untuk menangkap foto</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal perlu mengakses kamera untuk mengimbas kod QR</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal perlu mengakses mikrofon untuk menangkap video</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Untuk menangkap foto dalam Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Untuk menangkap foto dan video dalam Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Untuk menangkap video dengan bunyi:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Untuk mengimbas kod QR:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Kenalan terbaharu</string>
@@ -270,7 +271,7 @@
     <string name="CameraContacts_no_signal_contacts">Tiada kenalan Signal</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Anda hanya boleh menggunakan butang kamera untuk hantar foto kepada kenalan Signal </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Tidak dapat mencari siapa yang anda sedang cari?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Jemput kenalan untuk sertai Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Jemput kenalan untuk sertai Molly</string>
     <string name="CameraContacts__menu_search">Cari</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -284,12 +285,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Tidak, terima kasih</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Kemas Kini Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Kemas Kini Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Versi aplikasi ini tidak lagi akan disokong. Untuk menghantar dan menerima mesej semula, sila update ke versi terkini.</string>
     <string name="ClientDeprecatedActivity_update">Kemas Kini</string>
     <string name="ClientDeprecatedActivity_dont_update">Jangan Update</string>
     <string name="ClientDeprecatedActivity_warning">Amaran</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Versi aplikasi Signal anda telah tamat tempoh. Anda boleh melihat sejarah mesej anda tetapi tidak boleh menghantar dan menerima mesej sehinggalah anda mengemas kini.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Versi aplikasi Molly anda telah tamat tempoh. Anda boleh melihat sejarah mesej anda tetapi tidak boleh menghantar dan menerima mesej sehinggalah anda mengemas kini.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Pelayar web tidak dijumpai.</string>
@@ -326,8 +327,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Mesej %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Panggilan Suara Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Panggilan Video Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -419,7 +420,7 @@
     <string name="ConversationActivity_transport_signal">Mesej Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Menghantar mesej</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Mari beralih kepada Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Mari beralih kepada Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Sila pilih kenalan</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Lampiran melebihi had saiz untuk jenis mesej yang anda hantar.</string>
     <string name="ConversationActivity_unable_to_record_audio">Tidak dapat merakam audio!</string>
@@ -438,18 +439,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Untuk menghantar mesej audio:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Untuk menghantar mesej suara, benarkan Signal mengakses mikrofon anda.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Untuk menghantar mesej suara, benarkan Molly mengakses mikrofon anda.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal perlukan akses mikrofon untuk merakam mesej suara.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal memerlukan kebenaran Mikrofon untuk menghantar mesej audio, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Mikrofon\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly perlukan akses mikrofon untuk merakam mesej suara.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly memerlukan kebenaran Mikrofon untuk menghantar mesej audio, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Mikrofon\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal memerlukan kebenaran Mikrofon dan Kamera untuk memanggil %1$s, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Mikrofon\" dan \"Kamera\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Untuk menangkap foto dan video, benarkan Signal untuk mengakses kamera anda.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal memerlukan kebenaran Kamera untuk menangkap foto dan video, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal memerlukan kebenaran Kamera untuk menangkap foto dan video</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly memerlukan kebenaran Mikrofon dan Kamera untuk memanggil %1$s, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Mikrofon\" dan \"Kamera\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Untuk menangkap foto dan video, benarkan Molly untuk mengakses kamera anda.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly memerlukan kebenaran Kamera untuk menangkap foto dan video, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly memerlukan kebenaran Kamera untuk menangkap foto dan video</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Dayakan kebenaran mikrofon untuk rakam video dengan bunyi</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal memerlukan kebenaran Mikrofon untuk merakam video, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Mikrofon\" dan \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal memerlukan kebenaran mikrofon untuk merakam video.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly memerlukan kebenaran Mikrofon untuk merakam video, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Mikrofon\" dan \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly memerlukan kebenaran mikrofon untuk merakam video.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
     <string name="ConversationActivity_no">Tidak</string>
@@ -470,9 +471,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Untuk mulakan panggilan:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Untuk mulakan panggilan, benarkan Signal mengakses mikrofon anda.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Untuk mulakan panggilan, benarkan Molly mengakses mikrofon anda.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal perlukan akses mikrofon untuk mulakan panggilan.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly perlukan akses mikrofon untuk mulakan panggilan.</string>
 
 
     <string name="ConversationActivity_join">Sertai</string>
@@ -486,9 +487,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Pemesejan SMS tidak lagi disokong dalam Signal. Jemput %1$s ke Signal untuk meneruskan perbualan di sini.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Orang ini tidak lagi menggunakan Signal. Jemput ke Signal untuk meneruskan perbualan di sini.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Orang ini tidak lagi menggunakan Molly. Jemput ke Molly untuk meneruskan perbualan di sini.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Jemput ke Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Jemput ke Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Anda akan diingatkan semula tidak lama lagi.</string>
 
@@ -536,6 +537,8 @@
     <string name="ConversationFragment_delete_for_everyone">Padam untuk semua orang</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Padam pada peranti ini</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Padam</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Padam di mana-mana</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Mesej ini akan dipadamkan untuk semua orang dalam sembang jika mereka menggunakan Signal versi terkini. Mereka akan dapat melihat jika anda memadamkan mesej.</string>
@@ -567,13 +570,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Disekat</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Kemas Kini Signal</string>
+    <string name="ConversationFragment__update_build">Kemas Kini Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Daftar semula Signal</string>
+    <string name="ConversationFragment__reregister_signal">Daftar semula Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Nagivasi kembali.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Buka Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Buka Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Tidak lagi disahkan</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -636,6 +639,10 @@
     <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
         <item quantity="other">Ini akan memadam secara kekal semua %1$d sembang yang dipilih.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="other">Ini akan memadamkan semua %1$d sembang yang dipilih secara kekal daripada semua peranti anda.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Memadam</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="other">Padam sembang yang dipilih…</item>
@@ -719,9 +726,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Siapa yang boleh cari saya melalui nombor?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Sesiapa yang mempunyai nombor telefon anda akan dapat melihat anda di Signal dan boleh mula bersembang dengan anda.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Sesiapa yang mempunyai nombor telefon anda akan dapat melihat anda di Molly dan boleh mula bersembang dengan anda.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Tiada sesiapa boleh melihat anda di Signal melainkan anda menghantar mesej kepada mereka atau mempunyai sembang sedia ada dengan mereka.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Tiada sesiapa boleh melihat anda di Molly melainkan anda menghantar mesej kepada mereka atau mempunyai sembang sedia ada dengan mereka.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Memulihkan daripada sandaran?</string>
@@ -755,7 +762,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Uji frasa laluan sandaran anda dan sahkan bahawa ia sepadan</string>
     <string name="BackupsPreferenceFragment__turn_on">Hidupkan</string>
     <string name="BackupsPreferenceFragment__turn_off">Matikan</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Untuk memulihkan sandaran, pasang salinan Signal baharu. Buka aplikasi dan ketik \"Pulihkan sandaran\", kemudian cari fail sandaran. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Untuk memulihkan sandaran, pasang salinan Molly baharu. Buka aplikasi dan ketik \"Pulihkan sandaran\", kemudian cari fail sandaran. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Ketahui lebih lanjut</string>
     <string name="BackupsPreferenceFragment__in_progress">Dalam progres…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -763,7 +770,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d setakat ini…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% setakat ini…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal memerlukan kebenaran storan luaran untuk mencipta sandaran, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Storan\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly memerlukan kebenaran storan luaran untuk mencipta sandaran, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Storan\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Tetapkan masa sandaran</string>
 
@@ -830,7 +837,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Sesi sembang dimulakan semula</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal menggunakan penyulitan hujung ke hujung dan kadangkala perlu menyegarkan sesi sembang anda. Hal ini tidak mempengaruhi keselamatan sembang anda, tetapi anda mungkin terlepas mesej daripada kenalan ini, dan anda boleh minta mereka untuk menghantar semula mesej.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly menggunakan penyulitan hujung ke hujung dan kadangkala perlu menyegarkan sesi sembang anda. Hal ini tidak mempengaruhi keselamatan sembang anda, tetapi anda mungkin terlepas mesej daripada kenalan ini, dan anda boleh minta mereka untuk menghantar semula mesej.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Gunakan Signal pada Desktop atau iPad. Mesej anda akan disegerakkan ke peranti terpaut anda.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Pautkan peranti baharu</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Mesej dan maklumat sembang dilindungi oleh penyulitan hujung ke hujung pada semua peranti</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal pada Desktop atau iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Semua pemesejan pada peranti terpaut adalah peribadi</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Mesej Molly disegerakkan dengan Molly pada telefon mudah alih anda selepas ia dipautkan. Sejarah mesej anda sebelum ini tidak akan dipaparkan.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Pada peranti anda yang lain, lawati %1$s untuk memasang Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Peranti saya yang dipautkan</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Menyahpaut</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s tidak lagi dipautkan</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Memautkan peranti…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Peranti diluluskan</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Memuatkan…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Tiada peranti dipautkan</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Buka kunci untuk pautkan peranti</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Mengimbas kod QR yang dipaparkan pada peranti yang ingin dipautkan.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Imbas Kod QR</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Gunakan peranti ini untuk mengimbas kod QR yang dipaparkan pada peranti yang ingin anda pautkan</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Okey</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Peranti ini akan dapat melihat kumpulan dan kenalan anda, mengakses sembang anda, dan menghantar mesej atas nama anda.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Selesaikan pemautan pada peranti anda yang lain</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Selesai memautkan Molly pada peranti anda yang lain.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Gagal Memaut Peranti</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Kod QR ini tidak sah. Sila pastikan anda mengimbas kod QR yang dipaparkan pada peranti yang ingin anda pautkan.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Cuba Semula</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Nyahpaut \'%1$s</string>
@@ -852,10 +914,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimumkan untuk ketiadaan Perkhidmatan Play</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Peranti ini tidak menyokong Perkhidmatan Play. Ketik untuk menyahdayakan pengoptimuman bateri sistem yang menghalang Signal daripada mengambil mesej semasa tidak aktif.  </string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Peranti ini tidak menyokong Perkhidmatan Play. Ketik untuk menyahdayakan pengoptimuman bateri sistem yang menghalang Molly daripada mengambil mesej semasa tidak aktif.  </string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Versi Signal ini telah tamat tempoh. Kemas kini sekarang untuk menghantar dan menerima mesej.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Versi Molly ini telah tamat tempoh. Kemas kini sekarang untuk menghantar dan menerima mesej.</string>
     <string name="ExpiredBuildReminder_update_now">Update sekarang</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -865,8 +927,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Lihat</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Kegagalan komunikasi Signal tetap!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal tidak dapat mendaftar dengan Perkhidmatan Google Play. Mesej dan panggilan Signal telah dinyahdayakan, sila daftar semula dalam Tetapan &gt; Lanjutan.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Kegagalan komunikasi Molly tetap!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly tidak dapat mendaftar dengan Perkhidmatan Google Play. Mesej dan panggilan Molly telah dinyahdayakan, sila daftar semula dalam Tetapan &gt; Lanjutan.</string>
 
 
     <!-- GiphyActivity -->
@@ -992,20 +1054,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Log nyahpepijat membantu kami mendiagnosis dan membetulkan isu tersebut dan tidak mengandungi maklumat pengenalpastian.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal menghadapi masalah. Hantar log nyahpepijat?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly menghadapi masalah. Hantar log nyahpepijat?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Pemberitahuan mungkin ditangguhkan kerana pengoptimuman bateri</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Anda boleh nyahdayakan pengoptimuman bateri untuk Signal bagi memastikan pemberitahuan mesej tidak akan ditangguhkan.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Anda boleh nyahdayakan pengoptimuman bateri untuk Molly bagi memastikan pemberitahuan mesej tidak akan ditangguhkan.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Pemberitahuan mungkin ditangguhkan kerana pengoptimuman bateri</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Nyahdayakan pengoptimuman bateri untuk Molly bagi memastikan pemberitahuan mesej tidak akan ditangguhkan. Ketik \"Teruskan\" untuk melihat arahan khusus peranti.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Tidak, terima kasih</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Teruskan</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Teruskan</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Tolak</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Tidak, terima kasih</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Jemputan kumpulan belum selesai</string>
+    <string name="PendingMembersActivity_pending_group_invites">Permintaan &amp; jemputan</string>
     <string name="PendingMembersActivity_requests">Permintaan</string>
     <string name="PendingMembersActivity_invites">Jemputan</string>
     <string name="PendingMembersActivity_people_you_invited">Orang yang anda jemput</string>
@@ -1244,12 +1316,12 @@
     <string name="InviteActivity_cancel">Batal</string>
     <string name="InviteActivity_sending">Menghantar…</string>
     <string name="InviteActivity_invitations_sent">Jemputan dihantar!</string>
-    <string name="InviteActivity_invite_to_signal">Jemput ke Signal</string>
+    <string name="InviteActivity_invite_to_signal">Jemput ke Molly</string>
     <string name="InviteActivity_send_sms">Hantar SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="other">Hantar %1$d jemputan SMS?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Mari tukar ke Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Mari tukar ke Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Nampaknya anda tidak mempunyai sebarang aplikasi untuk dikongsi.</string>
 
     <!-- LearnMoreTextView -->
@@ -1263,7 +1335,7 @@
     <string name="LongMessageActivity_your_message">Mesej anda</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Sambungan latar belakang didayakan</string>
 
     <!-- MediaOverviewActivity -->
@@ -1327,10 +1399,10 @@
     <string name="MessageQuotesBottomSheet_replies">Balasan</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Mewujudkan panggilan Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">Mewujudkan panggilan Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Memulakan perkhidmatan panggilan Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Menghentikan perkhidmatan panggilan Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Memulakan perkhidmatan panggilan Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Menghentikan perkhidmatan panggilan Molly</string>
     <string name="NotificationBarManager__cancel_call">Batalkan panggilan</string>
 
     <!-- NotificationsMegaphone -->
@@ -1574,6 +1646,14 @@
     <string name="MessageRecord_you_activated_payments">Anda telah mengaktifkan Pembayaran</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s kini boleh menerima Pembayaran</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Butiran pembayaran tidak tersedia</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Ketik untuk lebih lanjut</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Butiran pembayaran tidak tersedia</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Butiran pembayaran ini tidak tersedia kerana mesej anda telah dipulihkan daripada sumber yang tidak mengandungi sejarah pembayaran ini. Ini tidak menjejaskan baki dompet anda atau status pembayaran yang lalu.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1628,9 +1708,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Anda tidak lagi boleh menghantar mesej SMS daripada Signal tidak lama lagi. Jemput %1$s ke Signal untuk meneruskan perbualan di sini.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Anda tidak lagi boleh menghantar mesej SMS dalam Signal. Jemput %1$s ke Signal untuk meneruskan perbualan di sini.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Anda tidak lagi boleh menghantar mesej SMS dalam Molly. Jemput %1$s ke Molly untuk meneruskan perbualan di sini.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Pembayaran: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Pembayaran</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Dilaporkan sebagai spam</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1704,7 +1786,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Memautkan satu peranti Signal?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Nampaknya anda cuba memautkan satu peranti Signal dengan menggunakan pengimbas pihak ke-3. Untuk perlindungan anda, sila imbas kod semula dalam Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal memerlukan kebenaran Kamera untuk mengimbas kod QR, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Kamera\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly memerlukan kebenaran Kamera untuk mengimbas kod QR, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Kamera\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Tidak dapat mengimbas kod QR tanpa kebenaran Kamera</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1716,11 +1798,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Masukkan frasa laluan</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">ikon Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">ikon Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Hantar frasa laluan</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Frasa laluan tidak sah!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Buka Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Kunci Skrin</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Buka Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Kunci Skrin</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Peta</string>
@@ -1786,7 +1868,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Sahkan untuk meneruskan pemesejan</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Untuk bantu mengelakkan spam di Signal, sila lengkapkan pengesahan.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Untuk bantu mengelakkan spam di Molly, sila lengkapkan pengesahan.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Selepas pengesahan, anda boleh meneruskan pemesejan. Sebarang mesej yang dijeda akan dihantar secara automatik.</string>
 
     <!-- Recipient -->
@@ -1794,7 +1876,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Cerita Saya</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Panggilan Signal</string>
+    <string name="Recipient_signal_call">Panggilan Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Sekat</string>
@@ -1808,7 +1890,8 @@
     <string name="RedPhone_ringing">Berdering…</string>
     <string name="RedPhone_busy">Sibuk</string>
     <string name="RedPhone_recipient_unavailable">Penerima tidak tersedia</string>
-    <string name="RedPhone_network_failed">Rangkaian gagal</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Rangkaian gagal Sila periksa sambungan rangkaian anda dan cuba lagi.</string>
     <string name="RedPhone_number_not_registered">Nombor tidak didaftarkan!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Nombor yang anda dail tidak menyokong panggilan selamat!</string>
     <string name="RedPhone_got_it">Faham</string>
@@ -1819,8 +1902,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Ketik sini untuk dayakan video anda</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Untuk memanggil %1$s, Signal memerlukan akses kepada kamera anda</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Untuk memanggil %1$s, Molly memerlukan akses kepada kamera anda</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Memanggil…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Menyambung Semula…</string>
@@ -1868,10 +1951,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Dialih keluar daripada panggilan</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Seseorang telah mengalih keluar anda daripada panggilan.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Benarkan akses kepada kamera dan mikrofon anda</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Benarkan akses kepada mikrofon anda</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Benarkan akses kepada kamera anda</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Untuk memulakan atau menyertai panggilan, benarkan akses Molly kepada kamera dan mikrofon anda.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Untuk memulakan atau menyertai panggilan, benarkan akses Molly kepada mikrofon anda.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Untuk mendayakan video anda, benarkan akses Molly kepada kamera anda.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly memerlukan kebenaran mikrofon untuk memulakan atau menyertai panggilan.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly perlukan akses kamera untuk mendayakan video anda</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Untuk memulakan atau menyertai panggilan:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Untuk mendayakan video anda:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Panggilan Signal</string>
-    <string name="WebRtcCallView__signal_video_call">Panggilan Video Signal</string>
+    <string name="WebRtcCallView__signal_call">Panggilan Molly</string>
+    <string name="WebRtcCallView__signal_video_call">Panggilan Video Molly</string>
     <string name="WebRtcCallView__start_call">Mulakan Panggilan</string>
     <string name="WebRtcCallView__join_call">Sertai Panggilan</string>
     <string name="WebRtcCallView__call_is_full">Panggilan penuh</string>
@@ -1959,18 +2062,35 @@
     <string name="CallOverflowPopupWindow__lower_hand">Turun Tangan</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Batal</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Anda mengangkat tangan</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Lihat</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s mengangkat tangan</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s + %2$d mengangkat tangan</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s mengangkat tangan</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
         <item quantity="other">%1$s + %2$d mengangkat tangan</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
 
@@ -2055,7 +2175,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Anda akan menerima panggilan untuk mengesahkan nombor ini.</string>
     <string name="RegistrationActivity_edit_number">Edit nombor</string>
     <string name="RegistrationActivity_missing_google_play_services">Kehilangan Perkhidmatan Google Play</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Peranti ini kehilangan Perkhidmatan Google Play. Anda masih boleh gunakan Signal, tetapi konfigurasi ini boleh menyebabkan kebolehpercayaan atau prestasi yang kurang.\n\nKalau anda bukan pengguna lanjutan, tidak menjalankan ROM Android selepas jualan, atau anda percaya melihat ini kerana ralat, sila hubungi support@signal.org untuk penyelesaian masalah.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Peranti ini kehilangan Perkhidmatan Google Play. Anda masih boleh gunakan Molly, tetapi konfigurasi ini boleh menyebabkan kebolehpercayaan atau prestasi yang kurang.\n\nKalau anda bukan pengguna lanjutan, tidak menjalankan ROM Android selepas jualan, atau anda percaya melihat ini kerana ralat, sila hubungi support@molly.im untuk penyelesaian masalah.</string>
     <string name="RegistrationActivity_i_understand">Saya faham</string>
     <string name="RegistrationActivity_play_services_error">Ralat Perkhidmatan Play</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Perkhidmatan Google Play sedang dikemas kini atau tidak tersedia sementara waktu. Sila cuba sekali lagi.</string>
@@ -2073,7 +2193,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Format nombor bukan standard</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Nombor yang anda telah masukkan (%1$s) adalah dalam format bukan standard.\n\nAdakah anda maksudkan %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Format Nombor Telefon</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Format Nombor Telefon</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Panggilan diminta</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2106,8 +2226,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Menghadapi masalah mendaftar?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Pastikan telefon anda mempunyai isyarat selular untuk menerima SMS atau panggilan\n • Sahkan yang anda boleh menerima panggilan telefon ke nombor\n • Semak sama ada anda telah memasukkan nombor telefon anda dengan betul.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Untuk mendapatkan maklumat lanjut, sila ikuti langkah penyelesaian masalah ini atau Hubungi Sokongan</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Untuk maklumat lanjut, sila ikuti %1$s atau %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">langkah penyelesaian masalah ini</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2145,13 +2265,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Tambah kepada Kenalan</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Jemput ke Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Jemput ke Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Mesej Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Panggilan Signal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Tambah kepada Kenalan</string>
-    <string name="SharedContactView_invite_to_signal">Jemput ke Signal</string>
+    <string name="SharedContactView_invite_to_signal">Jemput ke Molly</string>
     <string name="SharedContactView_message">Mesej Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2282,11 +2402,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s milik %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Kemas kini Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Versi baharu Signal tersedia. Ketik untuk mengemas kini.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal gagal dikemas kini</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Kemas kini Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Versi baharu Molly tersedia. Ketik untuk mengemas kini.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly gagal dikemas kini</string>
     <string name="ApkUpdateNotifications_failed_general_body">Kita akan cuba lagi nanti.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal berjaya dikemas kini</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly berjaya dikemas kini</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Anda telah dikemas kini secara automatik kepada versi %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2356,7 +2476,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Nombor keselamatan Signal kami:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Nampaknya anda tidak mempunyai sebarang aplikasi untuk dikongsi.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Tiada nombor keselamatan untuk membandingkan ditemui di papan klip</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal memerlukan kebenaran Kamera untuk mengimbas kod QR, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Kamera\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly memerlukan kebenaran Kamera untuk mengimbas kod QR, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Kamera\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Kod QR tidak dapat diimbas tanpa kebenaran Kamera</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Anda mesti saling bermesej terlebih dahulu untuk melihat nombor keselamatan %1$s.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2386,14 +2506,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Sentuh untuk buka</string>
-    <string name="KeyCachingService_passphrase_cached">Signal dibuka</string>
-    <string name="KeyCachingService_lock">Kunci Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly dibuka</string>
+    <string name="KeyCachingService_lock">Kunci Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Anda</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Jenis media yang tidak disokong</string>
     <string name="MediaPreviewActivity_draft">Draf</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal memerlukan kebenaran Storan untuk menyimpan ke storan luaran, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Storan\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly memerlukan kebenaran Storan untuk menyimpan ke storan luaran, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Storan\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Tidak dapat menyimpan ke storan luaran tanpa kebenaran</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Padam mesej?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Ini akan memadam mesej ini secara kekal.</string>
@@ -2435,7 +2555,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Gagal untuk menghantar mesej.</string>
     <string name="MessageNotifier_error_delivering_message">Ralat menghantarkan mesej.</string>
     <string name="MessageNotifier_message_delivery_paused">Penghantaran mesej telah dijeda.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Sahkan untuk meneruskan pemesejan di Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Sahkan untuk meneruskan pemesejan di Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Tandakan semua sebagai dibaca</string>
     <string name="MessageNotifier_mark_read">Tandakan dibaca</string>
     <string name="MessageNotifier_turn_off_these_notifications">Matikan pemberitahuan ini</string>
@@ -2457,7 +2577,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Memberi reaksi %1$s kepada pelekat anda.</string>
     <string name="MessageNotifier_this_message_was_deleted">Mesej ini telah dipadam.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Matikan pemberitahuan kenalan telah menyertai Signal? Anda boleh mendayakannya lagi dalam Signal &gt; Tetapan &gt; Pemberitahuan.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Matikan pemberitahuan kenalan telah menyertai Molly? Anda boleh mendayakannya lagi dalam Molly &gt; Tetapan &gt; Pemberitahuan.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2496,7 +2616,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Respons pantas tidak tersedia apabila Signal dikunci!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Respons pantas tidak tersedia apabila Molly dikunci!</string>
     <string name="QuickResponseService_problem_sending_message">Masalah menghantar mesej!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2516,7 +2636,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Pintasan tak sah</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Mesej baru</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Permintaan mesej</string>
     <string name="SingleRecipientNotificationBuilder_you">Anda</string>
@@ -2561,7 +2681,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Peranti tidak lagi didaftarkan. Ini berkemungkinan kerana anda mendaftarkan nombor telefon anda dengan Signal pada peranti lain.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Peranti tidak lagi didaftarkan. Ini berkemungkinan kerana anda mendaftarkan nombor telefon anda dengan Molly pada peranti lain.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Daftar Semula Peranti</string>
 
@@ -2574,10 +2694,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Untuk menjawab panggilan, berikan Signal akses kepada mikrofon anda.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Untuk menjawab panggilan, berikan Molly akses kepada mikrofon anda.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Untuk menjawab panggilan video, berikan Signal akses kepada mikrofon dan kamera anda.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal memerlukan kebenaran Mikrofon dan Kamera untuk memanggil atau menerima panggilan, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Mikrofon\" dan \"Kamera\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Untuk menjawab panggilan video, berikan Molly akses kepada mikrofon dan kamera anda.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly memerlukan kebenaran Mikrofon dan Kamera untuk memanggil atau menerima panggilan, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Mikrofon\" dan \"Kamera\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Dijawab pada peranti yang dipautkan.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Ditolak pada peranti yang dipautkan.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Sibuk pada peranti yang dipautkan.</string>
@@ -2622,16 +2742,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Ulangi frasa laluan baru</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Jemput ke Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Jemput ke Molly</string>
     <string name="contact_selection_activity__new_group">Kumpulan baru</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Segar semula kenalan</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Rindukan seseorang? Cuba segarkan semula</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Cari orang yang anda kenali di Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Benarkan akses kepada kenalan anda</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Lagi</string>
 
@@ -2648,7 +2768,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Foto Kenalan</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal memerlukan kebenaran Kenalan untuk memaparkan kenalan anda, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Kenalan\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly memerlukan kebenaran Kenalan untuk memaparkan kenalan anda, tetapi telah ditolak secara kekal. Sila terus ke menu tetapan aplikasi, pilih \"Kebenaran\", dan dayakan \"Kenalan\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Ralat mengambil kenalan, semak sambungan rangkaian anda</string>
     <string name="ContactSelectionListFragment_username_not_found">Nama pengguna tidak dijumpai</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" bukan pengguna Signal. Sila periksa nama pengguna dan cuba lagi."</string>
@@ -2665,16 +2785,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Cari dengan nama pengguna</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Benarkan akses kepada kenalan</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Untuk mencari orang yang anda kenali di Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Benarkan akses</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Tidak, terima kasih</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Benarkan akses kepada kenalan anda. Kenalan anda disulitkan dan tidak kelihatan kepada perkhidmatan Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal memerlukan akses kepada kenalan anda untuk memaparkannya.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly memerlukan akses kepada kenalan anda untuk memaparkannya.</string>
     <string name="contact_selection_list_fragment__show_contacts">Tunjukkan Kenalan</string>
 
     <!-- contact_selection_list_item -->
@@ -2745,6 +2867,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Anda telah mengalih keluar orang ini, menghantar mesej kepada mereka sekali lagi akan menambahkan mereka kembali ke senarai anda.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Pilihan</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Kemas Kini</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Main … Jeda</string>
@@ -2773,7 +2897,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Bubbles ialah ciri Android yang anda boleh matikan untuk sembang Signal.</string>
+    <string name="BubbleOptOutTooltip__description">Bubbles ialah ciri Android yang anda boleh matikan untuk sembang Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Bukan sekarang</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -2934,9 +3058,9 @@
     <string name="EditProfileFragment__group_description">Penerangan kumpulan</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Kemas Kini Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Kemas Kini Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Versi Signal ini telah tamat tempoh. Kemas kini sekarang untuk terus menggunakan Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Versi Molly ini telah tamat tempoh. Kemas kini sekarang untuk terus menggunakan Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Kemas Kini</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3152,7 +3276,7 @@
     <string name="preferences__slow">Lambat</string>
     <string name="preferences__help">Bantu</string>
     <string name="preferences__advanced">Lanjutan</string>
-    <string name="preferences__donate_to_signal">Derma kepada Signal</string>
+    <string name="preferences__donate_to_signal">Derma kepada Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Privasi</string>
     <!-- Preference label for stories -->
@@ -3189,13 +3313,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Tukar ikon dan nama aplikasi kepada \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal perlu ditutup untuk menukar ikon dan nama aplikasi. Pemberitahuan akan sentiasa memaparkan ikon dan nama Signal lalai.</string>
+    <string name="preferences__app_icon_dialog_description">Molly perlu ditutup untuk menukar ikon dan nama aplikasi. Pemberitahuan akan sentiasa memaparkan ikon dan nama Molly lalai.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Pilih ikon dan nama aplikasi, yang akan kelihatan pada skrin utama telefon anda dan laci aplikasi. Pemberitahuan akan sentiasa memaparkan ikon dan nama Signal lalai. Ketahui lebih lanjut</string>
+    <string name="preferences__app_icon_warning_learn_more">Pilih ikon dan nama aplikasi, yang akan kelihatan pada skrin utama telefon anda dan laci aplikasi. Pemberitahuan akan sentiasa memaparkan ikon dan nama Molly lalai. Ketahui lebih lanjut</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Ikon dan nama aplikasi boleh dilihat pada skrin utama dan laci aplikasi.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Pemberitahuan akan sentiasa memaparkan ikon dan nama Signal lalai.</string>
+    <string name="preferences__app_icon_notification_warning">Pemberitahuan akan sentiasa memaparkan ikon dan nama Molly lalai.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Ketahui lebih lanjut</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3241,8 +3365,12 @@
         <item quantity="other">Tindakan ini akan memotong secara kekal semua sembang sehingga %1$s mesej terkini.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Ini akan memadam semua sejarah mesej dan media daripada peranti anda secara kekal.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Ini akan memadamkan semua sejarah mesej dan media secara kekal daripada peranti ini dan mana-mana peranti yang dipautkan.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Adakah anda pasti mahu memadam semua sejarah mesej?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Semua sejarah mesej akan dialih keluar secara kekal. Tindakan ini tidak boleh diulang.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Semua sejarah mesej akan dialih keluar secara kekal daripada semua peranti. Tindakan ini tidak boleh dibatalkan.</string>
     <string name="preferences_storage__delete_all_now">Padam semua sekarang</string>
     <string name="preferences_storage__forever">Selama-lamanya</string>
     <string name="preferences_storage__one_year">1 tahun</string>
@@ -3278,7 +3406,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Penapisan pemintasan</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Penapisan pemintasan</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Jika didayakan, Signal akan cuba memintas penapisan. Jangan mendayakan ciri ini melainkan jika anda berada di lokasi di mana Signal ditapis.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Jika didayakan, Molly akan cuba memintas penapisan. Jangan mendayakan ciri ini melainkan jika anda berada di lokasi di mana Molly ditapis.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Pemintasan penapisan telah diaktifkan berdasarkan nombor telefon akaun anda.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3330,7 +3458,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Memperkenalkan Pembayaran</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Gunakan Signal untuk menghantar dan menerima MobileCoin, mata wang digital yang mementingkan privasi. Aktifkan untuk bermula.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Gunakan Molly untuk menghantar dan menerima MobileCoin, mata wang digital yang mementingkan privasi. Aktifkan untuk bermula.</string>
     <string name="PaymentsHomeFragment__activate_payments">Aktifkan Pembayaran</string>
     <string name="PaymentsHomeFragment__activating_payments">Mengaktifkan pembayaran…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Pulihkan akaun pembayaran</string>
@@ -3356,7 +3484,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Pembayaran tidak tersedia di wilayah anda.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Tidak dapat mendayakan pembayaran. Cuba sebentar lagi.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Nyahaktifkan Pembayaran?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Anda tidak akan dapat menghantar atau menerima MobileCoin dalam Signal jika anda menyahaktifkan pembayaran.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Anda tidak akan dapat menghantar atau menerima MobileCoin dalam Molly jika anda menyahaktifkan pembayaran.</string>
     <string name="PaymentsHomeFragment__deactivate">Nyahaktifkan</string>
     <string name="PaymentsHomeFragment__continue">Teruskan</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Baki tidak tersedia buat masa ini.</string>
@@ -3365,10 +3493,10 @@
     <string name="PaymentsHomeFragment__details">Butiran</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Anda boleh menggunakan Signal untuk menghantar dan menerima MobileCoin. Semua pembayaran adalah tertakluk kepada Syarat Penggunaan untuk MobileCoins dan MobileCoin Wallet. Anda mungkin menghadapi beberapa isu dan pembayaran atau baki yang mungkin hilang tidak dapat dipulihkan. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Anda boleh menggunakan Molly untuk menghantar dan menerima MobileCoin. Semua pembayaran adalah tertakluk kepada Syarat Penggunaan untuk MobileCoins dan MobileCoin Wallet. Anda mungkin menghadapi beberapa isu dan pembayaran atau baki yang mungkin hilang tidak dapat dipulihkan. </string>
     <string name="PaymentsHomeFragment__activate">Aktifkan</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Lihat terma MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Pembayaran dalam Signal tidak lagi tersedia. Anda masih boleh memindah dana ke pertukaran tetapi anda tidak lagi dapat menghantar dan menerima pembayaran atau menambah dana.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Pembayaran dalam Molly tidak lagi tersedia. Anda masih boleh memindah dana ke pertukaran tetapi anda tidak lagi dapat menghantar dan menerima pembayaran atau menambah dana.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3396,7 +3524,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Beri kebenaran</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Untuk membantu anda menghantar mesej kepada orang yang anda kenali, Signal akan meminta kebenaran ini. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Untuk membantu anda menghantar mesej kepada orang yang anda kenali, Molly akan meminta kebenaran ini. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Pemberitahuan</string>
     <!-- Notifications permission row description -->
@@ -3484,10 +3612,10 @@
     <string name="PaymentsTransferFragment__next">Seterusnya</string>
     <string name="PaymentsTransferFragment__invalid_address">Alamat tidak sah</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Periksa alamat dompet yang anda cuba pindah ke dan cuba lagi.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Anda tidak boleh memindahkan bayaran ke alamat dompet Signal anda sendiri. Masukkan alamat dompet daripada akaun anda di pertukaran yang disokong.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Untuk mengimbas kod QR, Signal memerlukan akses kepada kamera.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal memerlukan kebenaran Kamera untuk menangkap kod QR. Pergi ke tetapan, pilih \"Kebenaran\", dan dayakan \"Kamera\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Untuk mengimbas kod QR, Signal memerlukan akses kepada kamera.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Anda tidak boleh memindahkan bayaran ke alamat dompet Molly anda sendiri. Masukkan alamat dompet daripada akaun anda di pertukaran yang disokong.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Untuk mengimbas kod QR, Molly memerlukan akses kepada kamera.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly memerlukan kebenaran Kamera untuk menangkap kod QR. Pergi ke tetapan, pilih \"Kebenaran\", dan dayakan \"Kamera\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Untuk mengimbas kod QR, Molly memerlukan akses kepada kamera.</string>
     <string name="PaymentsTransferFragment__settings">Tetapan</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3826,17 +3954,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Panggilan suara Signal masuk</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Panggilan suara Molly masuk</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Panggilan video Signal Masuk</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Panggilan video Molly Masuk</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Panggilan kumpulan Signal masuk</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Panggilan kumpulan Molly masuk</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Panggilan suara Signal sedang berjalan</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Panggilan suara Molly sedang berjalan</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Panggilan video Signal sedang berjalan</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Panggilan video Molly sedang berjalan</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Panggilan kumpulan Signal sedang berjalan</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Panggilan kumpulan Molly sedang berjalan</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Memuatkan…</string>
@@ -3883,9 +4011,9 @@
     <string name="BackupDialog_verify">Sahkan</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Anda berjaya memasukkan frasa laluan sandaran anda</string>
     <string name="BackupDialog_passphrase_was_not_correct">Frasa laluan tidak betul</string>
-    <string name="LocalBackupJob_creating_signal_backup">Mencipta sandaran Signal…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Mencipta sandaran Molly…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Mengesahkan sandaran Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Mengesahkan sandaran Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">Sandaran gagal</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Direktori sandaran anda telah dipadamkan atau dipindahkan.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Fail sandaran anda terlalu besar untuk disimpan pada volum ini.</string>
@@ -3900,15 +4028,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Hubungi saya (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Hantar semula Kod (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Hubungi Sokongan Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Pendaftaran Signal - Kod Pengesahan untuk Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Hubungi Sokongan Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Pendaftaran Molly - Kod Pengesahan untuk Android</string>
     <string name="RegistrationActivity_incorrect_code">Kod salah</string>
     <string name="BackupUtil_never">Tidak pernah</string>
     <string name="BackupUtil_unknown">Tidak diketahui</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Nombor telefon</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Pilih siapa yang boleh melihat nombor telefon anda dan siapa yang boleh menghubungi nombor anda di Signal.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Pilih siapa yang boleh melihat nombor telefon anda dan siapa yang boleh menghubungi nombor anda di Molly.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Siapa boleh lihat nombor saya</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -3956,7 +4084,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Anda telah membuat terlalu banyak percubaan. Sila cuba lagi sebentar lagi.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Ralat menyambung ke perkhidmatan</string>
     <string name="preferences_chats__backups">Sandaran</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal dikunci</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly dikunci</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">KETIK UNTUK MEMBUKA</string>
     <string name="Recipient_unknown">Tidak diketahui</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -3987,9 +4115,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Anda memerlukan akses ke peranti lama anda.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Pulihkan dari sandaran</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Pulihkan mesej anda dari sandaran tempatan. Sekiranya anda tidak memulihkannya sekarang, anda tidak akan dapat memulihkannya kemudian.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Pulihkan sandaran setempat</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Pulihkan sandaran Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Pulihkan semua mesej teks + media anda dalam tempoh 30 hari terakhir ini</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Lebih pilihan</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Batal</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Log masuk tanpa memindahkan</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Teruskan tanpa memindahkan mesej dan media anda</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Buka Signal pada telefon Android lama anda</string>
     <string name="NewDeviceTransferInstructions__continue">Teruskan</string>
@@ -4004,19 +4139,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Bersedia untuk menyambung ke peranti Android lama…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Sebentar, akan tersedia sebentar lagi</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Menunggu peranti Android lama untuk disambungkan…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal memerlukan kebenaran lokasi untuk menemui dan menyambung ke peranti Android lama anda.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal memerlukan perkhidmatan lokasi didayakan untuk menemui dan menyambung dengan peranti Android lama anda.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal memerlukan Wi-Fi untuk menemui dan menyambung dengan peranti Android lama anda. Wi-Fi perlu dihidupkan tetapi tidak perlu disambungkan ke rangkaian Wi-Fi.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Maaf, nampaknya peranti ini tidak menyokong Wi-Fi Direct. Signal menggunakan Wi-Fi Direct untuk menemui dan menyambung dengan peranti Android lama anda. Anda masih boleh memulihkan sandaran untuk memulihkan akaun anda daripada peranti Android lama anda.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly memerlukan kebenaran lokasi untuk menemui dan menyambung ke peranti Android lama anda.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly memerlukan perkhidmatan lokasi didayakan untuk menemui dan menyambung dengan peranti Android lama anda.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly memerlukan Wi-Fi untuk menemui dan menyambung dengan peranti Android lama anda. Wi-Fi perlu dihidupkan tetapi tidak perlu disambungkan ke rangkaian Wi-Fi.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Maaf, nampaknya peranti ini tidak menyokong Wi-Fi Direct. Molly menggunakan Wi-Fi Direct untuk menemui dan menyambung dengan peranti Android lama anda. Anda masih boleh memulihkan sandaran untuk memulihkan akaun anda daripada peranti Android lama anda.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Pulihkan sandaran</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Ralat yang tidak dijangka berlaku semasa cuba menyambung ke peranti Android lama anda.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Mencari peranti Android baharu…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal memerlukan kebenaran lokasi untuk menemui dan menyambung ke peranti Android baharu anda.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal memerlukan perkhidmatan lokasi didayakan untuk menemui dan menyambung dengan peranti Android baharu anda.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal memerlukan Wi-Fi dihidupkan untuk menemui dan menyambung dengan peranti Android baharu anda. Wi-Fi perlu dihidupkan tetapi tidak perlu disambungkan ke rangkaian Wi-Fi.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Maaf, nampaknya peranti ini tidak menyokong Wi-Fi Direct. Signal menggunakan Wi-Fi Direct untuk menemui dan menyambung dengan peranti Android baharu anda. Anda masih boleh mencipta sandaran untuk memulihkan akaun pada peranti Android baharu anda.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly memerlukan kebenaran lokasi untuk menemui dan menyambung ke peranti Android baharu anda.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly memerlukan perkhidmatan lokasi didayakan untuk menemui dan menyambung dengan peranti Android baharu anda.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly memerlukan Wi-Fi dihidupkan untuk menemui dan menyambung dengan peranti Android baharu anda. Wi-Fi perlu dihidupkan tetapi tidak perlu disambungkan ke rangkaian Wi-Fi.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Maaf, nampaknya peranti ini tidak menyokong Wi-Fi Direct. Molly menggunakan Wi-Fi Direct untuk menemui dan menyambung dengan peranti Android baharu anda. Anda masih boleh mencipta sandaran untuk memulihkan akaun pada peranti Android baharu anda.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Cipta sandaran</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Ralat yang tidak dijangka berlaku semasa cuba menyambung ke peranti Android baharu anda.</string>
 
@@ -4057,7 +4192,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Memindahkan data</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Pastikan kedua-dua peranti dekat antara satu sama lain. Jangan matikan peranti dan pastikan Signal dibuka. Pemindahan disulitkan dari hujung ke hujung.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Pastikan kedua-dua peranti dekat antara satu sama lain. Jangan matikan peranti dan pastikan Molly dibuka. Pemindahan disulitkan dari hujung ke hujung.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d mesej setakat ini…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% mesej setakat ini…</string>
@@ -4071,7 +4206,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Pindahkan Akaun</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Muat turun Signal pada peranti Android baharu anda</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Muat turun Molly pada peranti Android baharu anda</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Ketik \"Pindahkan atau pulihkan akaun\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4145,7 +4280,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Sesiapa sahaja yang mempunyai pautan ini dapat melihat nama dan foto kumpulan dan meminta untuk menyertai kumpulan. Kongsikannya dengan orang yang anda percayai.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Sesiapa sahaja yang mempunyai pautan ini dapat melihat nama dan foto kumpulan dan menyertai kumpulan. Kongsikannya dengan orang yang anda percayai.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Kongsi melalui Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Kongsi melalui Molly</string>
     <string name="GroupLinkBottomSheet_copy">Salin</string>
     <string name="GroupLinkBottomSheet_qr_code">Kod QR</string>
     <string name="GroupLinkBottomSheet_share">Kongsi</string>
@@ -4324,7 +4459,7 @@
     <string name="payment_info_card_about_mobilecoin">Mengenai MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin merupakan mata wang digital yang mementingkan privasi.</string>
     <string name="payment_info_card_adding_funds">Menambah dana</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Anda boleh menambah dana untuk digunakan dalam Signal dengan menghantar MobileCoin ke alamat dompet anda.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Anda boleh menambah dana untuk digunakan dalam Molly dengan menghantar MobileCoin ke alamat dompet anda.</string>
     <string name="payment_info_card_cashing_out">Mengeluarkan wang</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Anda boleh mengeluarkan MobileCoin pada bila-bila sahaja di pertukaran yang menyokong MobileCoin. Hanya buat pemindahan ke akaun anda di pertukaran tersebut.</string>
     <string name="payment_info_card_hide_this_card">Sembunyikan kad ini?</string>
@@ -4345,12 +4480,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Nyahaktifkan Dompet</string>
     <string name="DeactivateWalletFragment__your_balance">Baki anda</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Anda disyorkan agar memindahkan dana anda ke alamat dompet lain sebelum menyahaktifkan pembayaran. Jika anda memilih untuk tidak memindahkan dana anda sekarang, ia akan kekal dalam dompet anda yang dipautkan ke Signal jika anda mengaktifkan semula pembayaran.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Anda disyorkan agar memindahkan dana anda ke alamat dompet lain sebelum menyahaktifkan pembayaran. Jika anda memilih untuk tidak memindahkan dana anda sekarang, ia akan kekal dalam dompet anda yang dipautkan ke Molly jika anda mengaktifkan semula pembayaran.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Pindah baki yang tinggal</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Nyahaktifkan tanpa pemindahan</string>
     <string name="DeactivateWalletFragment__deactivate">Nyahaktifkan</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Nyahaktifkan tanpa pemindahan?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Baki anda akan kekal dalam dompet anda yang dipautkan ke Signal jika anda memilih untuk mengaktifkan semula pembayaran.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Baki anda akan kekal dalam dompet anda yang dipautkan ke Molly jika anda memilih untuk mengaktifkan semula pembayaran.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Ralat semasa menyahaktifkan dompet.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4643,7 +4778,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Lesen</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Terma &amp; Dasar Privasi</string>
-    <string name="HelpFragment__copyright_signal_messenger">Hak Cipta Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Hak Cipta Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Berlesen di bawah GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4658,7 +4793,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">Automatik</string>
+    <string name="ChatColorSelectionFragment__auto">Auto</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Gunakan warna tersuai</string>
     <string name="ChatColorSelectionFragment__chat_color">Warna sembang</string>
     <string name="ChatColorSelectionFragment__edit">Edit</string>
@@ -4881,9 +5016,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Pilih warna</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Kongsi</string>
 
@@ -4913,7 +5045,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Hanya pentadbir yang boleh menghantar mesej ke kumpulan ini.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Had telah dicapai</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Anda tidak boleh pilih lebih daripada 5 sembang</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5088,9 +5221,9 @@
     <string name="MySupportPreference__learn_more">Ketahui lebih lanjut</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Kemas Kini Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Kemas Kini Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Versi Signal ini telah tamat tempoh. Kemas kini sekarang untuk terus menggunakan Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Versi Molly ini telah tamat tempoh. Kemas kini sekarang untuk terus menggunakan Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Kemas Kini</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5099,7 +5232,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Peranti tidak didaftarkan</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Peranti tidak lagi didaftarkan. Daftar semula untuk terus menggunakan Signal pada peranti ini.</string>
+    <string name="ReregisterSignalDialog__message">Peranti tidak lagi didaftarkan. Daftar semula untuk terus menggunakan Molly pada peranti ini.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Daftar semula</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5393,7 +5526,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Gagal untuk membuka pemilih.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Untuk mendayakan pemberitahuan, Signal memerlukan kebenaran untuk memaparkannya.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Untuk mendayakan pemberitahuan, Molly memerlukan kebenaran untuk memaparkannya.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Hidupkan</string>
 
@@ -5539,8 +5672,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Tiada balasan lagi</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Anda tidak boleh membalas cerita ini kerana anda bukan lagi ahli kumpulan ini.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Memberi reaksi kepada cerita</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Memberi reaksi kepada cerita</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Memberi reaksi kepada cerita</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Tontonan</string>
     <!-- Label for story replies tab -->
@@ -6140,8 +6275,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Pilih bank anda</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Sahkan Derma Anda dengan %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Untuk membuat derma berulang, ketik teruskan untuk mengesahkan caj €0,01 dengan bank anda. Ini akan dibayar balik secara automatik dan membolehkan derma €5/bulan anda didebitkan daripada akaun anda.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Untuk buat derma berulang, ketik teruskan untuk mengesahkan caj €0,01 dengan bank anda. Ini akan dibayar balik secara automatik dan membolehkan derma %1$s/bulan anda didebitkan daripada akaun anda.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Teruskan</string>
 
@@ -6710,6 +6845,50 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Memuat turun data sandaran…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Sandaran media dimatikan</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="other">Pelan sandaran media Signal anda telah dibatalkan kerana kami tidak dapat memproses pembayaran anda. Anda mempunyai %1$d hari untuk memuat turun sebarang media yang disimpan dalam sandaran anda. Selepas %1$d hari, media dalam sandaran anda akan dipadamkan.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Anda boleh mula membayar untuk sandaran semula pada bila-bila masa untuk terus membuat sandaran semua media anda. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Media anda akan dipadamkan hari ini</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Pelan sandaran media Signal anda telah dibatalkan kerana kami tidak dapat memproses pembayaran anda. Ini adalah peluang terakhir anda untuk memuat turun media dalam sandaran anda sebelum ia dipadamkan.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Tidak dapat menyelesaikan muat turun</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Peranti anda tidak mempunyai ruang yang mencukupi. Kosongkan sehingga %1$s ruang untuk muat turun media yang disimpan dalam sandaran anda.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="other">Jika anda pilih \"Langkau\", media dalam sandaran anda akan dipadamkan dalam masa %1$d hari.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Tidak dapat memproses pembayaran sandaran</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Kami menghadapi masalah mengutip bayaran sandaran bulanan berulang anda. Pastikan kaedah pembayaran anda adalah terkini. Jika tidak, kemas kini dalam Google Pay. Signal akan cuba memproses pembayaran semula dalam beberapa hari.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Tidak dapat melengkapkan sandaran</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Peranti anda belum melengkapkan sandaran selama %1$d hari. Pastikan peranti anda disambungkan ke wi-fi dan ketik \"Sandarkan sekarang.\" </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Ketahui lebih lanjut</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Langkau</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Muat turun media sekarang</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Muat turun kemudian</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Jangan muat turun media</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Kosongkan %1$s ruang untuk muat turun media anda.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Kad kredit atau debit</string>
@@ -6723,6 +6902,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Tidak diketahui</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Sejarah pembayaran</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Sandaran terakhir anda telah dibuat pada %1$s pada %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6733,6 +6918,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Mesej terdahulu di luar tempoh masa yang dipilih akan dipadamkan secara kekal.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Mesej melebihi panjang yang dipilih akan dipadamkan secara kekal.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Letakkan had pada peranti yang dipautkan</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Apabila didayakan, had sembang juga akan memadamkan mesej daripada peranti terpaut anda.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Pemadaman kini disegerakkan merentas semua peranti anda</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Apabila anda memadamkan mesej, media atau sembang, ia akan dipadamkan daripada telefon anda dan semua peranti yang dipautkan.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Sejarah pembayaran</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Teks dan semua sandaran media</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Butiran pembayaran</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Jenis sandaran</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Tarikh bayar</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Kongsi</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Sandaran Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Sejarah pembayaran</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Butiran sandaran</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Saiz sandaran</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Kekerapan sandaran</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Sandarkan menggunakan selular</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Matikan dan padamkan sandaran</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Sandaran dipadamkan dan dimatikan.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Jenis sandaran ditukar dan langganan dibatalkan</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Langganan dibatalkan</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Muat turun selesai</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Jenis sandaran</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Sandaran dilumpuhkan</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/bulan</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Mendayakan sandaran</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Sandaran terakhir</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s pada %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Tidak pernah</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Sandaran Sekarang</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Matikan dan padamkan sandaran?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Anda tidak akan dicaj lagi. Sandaran anda akan dipadamkan dan tiada sandaran baharu akan dibuat.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Matikan dan padam</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Memadamkan sandaran…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Sandaran dipadamkan</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Dengan mengetik Sandarkan sekarang"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Harian</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Mingguan</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Bulanan</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Buat sandaran secara manual</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Sila masukkan pin, kata laluan atau corak peranti anda.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Seterusnya</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Tukar jenis sandaran</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Batal Langganan</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Sahkan pembatalan</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Anda tidak akan dicaj lagi. Sandaran akan dimatikan pada penghujung kitaran pengebilan anda. Selepas tarikh itu, anda mempunyai 30 hari untuk memuat turun media yang sedang anda sandarkan.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Sahkan dan muat turun sekarang</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Sahkan dan muat turun kemudian</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Teruskan langganan</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index 856e209ffc..7d8f52aca0 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal ကို အပ်ဒိတ်လုပ်နေသည်…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly ကို အပ်ဒိတ်လုပ်နေသည်…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">စကားဝှက်မသတ်မှတ်ရသေးပါ</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">စကားဝှက်ပိတ်မလား?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">ယင်းသည် Signal နှင့် စာတိုအသိပေးချက်များကို အမြဲဖွင့်ထားပါလိမ့်မည်။</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">ယင်းသည် Molly နှင့် စာတိုအသိပေးချက်များကို အမြဲဖွင့်ထားပါလိမ့်မည်။</string>
     <string name="ApplicationPreferencesActivity_disable">ပိတ်ထားပါ</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">ဆာဗာနှင့် ဆက်သွယ်၍မရပါ။</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">မှတ်ပုံတင်မှု ပိတ်ထားရန်အတွက် ပင်နံပါတ်များလိုအပ်ပါသည်။ ပင်နံပါတ်များ ပိတ်ရန် ကျေးဇူးပြု၍ မှတ်ပုံတင်မှုပိတ်ထားခြင်းကို ဦးစွာပြန်ဖွင့်ပါ။</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">ဖိုင်</string>
     <string name="AttachmentKeyboard_contact">အဆက်အသွယ်</string>
     <string name="AttachmentKeyboard_location">တည်နေရာ</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal သည် သင်၏ဓာတ်ပုံနှင့် ဗီဒီယိုများကိုပြသရန် ခွင့်ပြုချက်လိုအပ်သည်</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly သည် သင်၏ဓာတ်ပုံနှင့် ဗီဒီယိုများကိုပြသရန် ခွင့်ပြုချက်လိုအပ်သည်</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">ဝင်ရောက် သုံးစွဲခွင့်ပြုရန်</string>
     <string name="AttachmentKeyboard_payment">ငွေပေးချေမှု</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">ရုပ်သံကိုဖွင့်ရန် သင့်တော်သည့် အက်ပ် မတွေ့ပါ။</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">ဓာတ်ပုံ၊ ဗီဒီယို သို့မဟုတ် အသံ ပို့ရန်အတွက် သိုလှောင်မှုခွင့်ပြုချက်ကို Signal မှ ရရန် လိုအပ်သည်။ သို့သော် အမြဲတမ်းအတွက် ခွင့်မပြုပါဟု ရွေးထားပြီး ဖြစ်နေသဖြင့် အက်ပ် စက်တင်မီနူးသို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ သိုလှောင်မှုကို ခွင့်ပြုပေးပါ။</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">အဆက်အသွယ်များ၏ အချက်အလက်များကို ပို့နိုင်ရန်အတွက် အဆက်အသွယ်များ ခွင့်ပြုချက်ကို Signal မှ ရရန်လိုအပ်သည်။ သို့သော် အမြဲတမ်းအတွက် ခွင့်မပြုပါဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အက်ပ် စက်တင်မီနူးသို့သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ အဆက်အသွယ်များကို ခွင့်ပြုပေးပါ။</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">မိမိ၏ တည်နေရာကို ပို့နိုင်ရန် တည်နေရာ ခွင့်ပြုချက်ကို Signal မှ ရရန်လိုအပ်သည်။ သို့သော် အမြဲတမ်းအတွက် ခွင့်မပြုပါဟု ရွေးထားပြီး ဖြစ်နေသဖြင့် အက်ပ် စက်တင်မီနူးသို့သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ တည်နေရာကို ခွင့်ပြုပေးပါ။</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">ဓာတ်ပုံ၊ ဗီဒီယို သို့မဟုတ် အသံ ပို့ရန်အတွက် သိုလှောင်မှုခွင့်ပြုချက်ကို Molly မှ ရရန် လိုအပ်သည်။ သို့သော် အမြဲတမ်းအတွက် ခွင့်မပြုပါဟု ရွေးထားပြီး ဖြစ်နေသဖြင့် အက်ပ် စက်တင်မီနူးသို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ သိုလှောင်မှုကို ခွင့်ပြုပေးပါ။</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">အဆက်အသွယ်များ၏ အချက်အလက်များကို ပို့နိုင်ရန်အတွက် အဆက်အသွယ်များ ခွင့်ပြုချက်ကို Molly မှ ရရန်လိုအပ်သည်။ သို့သော် အမြဲတမ်းအတွက် ခွင့်မပြုပါဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အက်ပ် စက်တင်မီနူးသို့သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ အဆက်အသွယ်များကို ခွင့်ပြုပေးပါ။</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">မိမိ၏ တည်နေရာကို ပို့နိုင်ရန် တည်နေရာ ခွင့်ပြုချက်ကို Molly မှ ရရန်လိုအပ်သည်။ သို့သော် အမြဲတမ်းအတွက် ခွင့်မပြုပါဟု ရွေးထားပြီး ဖြစ်နေသဖြင့် အက်ပ် စက်တင်မီနူးသို့သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ တည်နေရာကို ခွင့်ပြုပေးပါ။</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">သင့်တည်နေရာကို ဝင်ရောက်ခွင့်ပြုရန်</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">သင့်တည်နေရာကို ပေးပို့ရန်-</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">သင့်တည်နေရာကို ပေးပို့ရန် Signal ကို ဝင်ရောက်ခွင့်ပြုပါ။</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">သင့်တည်နေရာကို ပေးပို့ရန် Molly ကို ဝင်ရောက်ခွင့်ပြုပါ။</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">သင့်တည်နေရာကို ပေးပို့ရန် Signal သည် တည်နေရာဝင်ရောက်ခွင့် လိုအပ်ပါသည်။</string>
+    <string name="AttachmentManager_signal_needs_location_access">သင့်တည်နေရာကို ပေးပို့ရန် Molly သည် တည်နေရာဝင်ရောက်ခွင့် လိုအပ်ပါသည်။</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">သိုလှောင်ခန်းသို့ ဝင်ရောက်ခွင့်ပြုမည်</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">ဓာတ်ပုံနှင့် ဗီဒီယိုများကို ပြသရန်-</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">သင့်ဓာတ်ပုံနှင့် ဗီဒီယိုများကို ပြသရန် Signal သည် သိုလှောင်မှုသို့ ဝင်ရောက်ခွင့် လိုအပ်ပါသည်။</string>
+    <string name="AttachmentManager_signal_needs_storage_access">သင့်ဓာတ်ပုံနှင့် ဗီဒီယိုများကို ပြသရန် Molly သည် သိုလှောင်မှုသို့ ဝင်ရောက်ခွင့် လိုအပ်ပါသည်။</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s သည် ငွေပေးချေမှုများကို သက်ဝင်လုပ်ဆောင်ထားခြင်း မရှိသေးပါ </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">ကင်မရာပြောင်းရန်</string>
     <string name="CameraXFragment_open_gallery_description">ပုံပြခန်းကို ဖွင့်ပါ</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">ဝင်ရောက် သုံးစွဲခွင့်ပြုရန်</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">သင့်ကင်မရာနှင့် မိုက်ခရိုဖုန်း အသုံးပြုခွင့်ပေးပါ</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">သင့်ကင်မရာ အသုံးပြုခွင့်ပေးပါ</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">သင့်မိုက်ခရိုဖုန်း အသုံးပြုခွင့်ကိုပေးပါ</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">ဓာတ်ပုံရိုက်ကူးရန် Signal ကို ကင်မရာအသုံးပြုခွင့်ပေးပါ။</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">ဓါတ်ပုံနှင့် ဗီဒီယိုရိုက်နိုင်ရန် Signal မှ မိမိကင်မရာကို အသုံးပြုခွင့်ပေးပါ။</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">ဓာတ်ပုံနှင့် ဗီဒီယိုရိုက်ကူးရန် Signal ကို ကင်မရာနှင့် မိုက်ခရိုဖုန်း အသုံးပြုခွင့်ပေးပါ။</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">ဗီဒီယိုကို အသံဖြင့်ရိုက်ကူးရန် Signal ကို သင့်မိုက်ခရိုဖုန်း အသုံးပြုခွင့်ပေးပါ။</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">QR ကုဒ်ကို စကင်န်ဖတ်ရန် Signal ကို ကင်မရာအသုံးပြုခွင့်ပေးပါ။</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">ဓာတ်ပုံရိုက်ကူးရန် Signal သည် ကင်မရာအသုံးပြုခွင့် လိုအပ်ပါသည်</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal သည် QR ကုဒ်များကို စကင်န်ဖတ်ရန် ကင်မရာအသုံးပြုခွင့် လိုအပ်ပါသည်</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">ဗီဒီယိုရိုက်ကူးရန်အတွက် Signal သည် မိုက်ခရိုဖုန်းအသုံးပြုခွင့် လိုအပ်ပါသည်</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Signal တွင် ဓာတ်ပုံများ ရိုက်ကူးရန်-</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Signal တွင် ဓာတ်ပုံနှင့် ဗီဒီယိုများ ရိုက်ကူးရန်-</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">ဗီဒီယိုကိုအသံဖြင့် ရိုက်ကူးရန်-</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR ကုဒ်များကို စကင်န်ဖတ်ရန်-</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">နောက်ဆုံး အဆက်အသွယ်များ</string>
@@ -270,7 +271,7 @@
     <string name="CameraContacts_no_signal_contacts">Signal အဆက်အသွယ်များ မရှိပါ</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Signal အဆက်အသွယ်များထံသို့ ကင်မရာခလုတ်နှိပ်၍သာ ဓာတ်ပုံပို့နိုင်သည်။ </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">သင်ရှာတဲ့သူကို မတွေ့ဘူးလား။</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Signal အသုံးပြုရန် ဖိတ်ခေါ်ပါ</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Molly အသုံးပြုရန် ဖိတ်ခေါ်ပါ</string>
     <string name="CameraContacts__menu_search">ရှာရန်</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -284,12 +285,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">မလုပ်လိုပါ</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Signal ကို အပ်ဒိတ်လုပ်ပါ။</string>
+    <string name="ClientDeprecatedActivity_update_signal">Molly ကို အပ်ဒိတ်လုပ်ပါ။</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">ဤအက်ပ် ဗားရှင်းသည် သုံးရန်အဆင်မပြေတော့ပါ။ မက်ဆေ့ခ်ျများ ဆက်လက်ပေးပို့ခြင်းနှင့် လက်ခံရရှိခြင်းအတွက် နောက်ဆုံးဗားရှင်းသို့ အပ်ဒိတ်လုပ်ပါ။</string>
     <string name="ClientDeprecatedActivity_update">အပ်ဒိတ် လုပ်</string>
     <string name="ClientDeprecatedActivity_dont_update">အပ်ဒိတ် မလုပ်</string>
     <string name="ClientDeprecatedActivity_warning">သတိပေးချက်</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">သင်၏ Signal ဗားရှင်း သက်တမ်းကုန်သွားပြီ။ သင်၏ မက်ဆေ့ချ်မှတ်တမ်းကို သင်ကြည့်နိုင်သော်လည်း အပ်ဒိတ် မလုပ်မချင်း မက်ဆေ့ချ်များပို့ခြင်း သို့မဟုတ် လက်ခံခြင်း မလုပ်နိုင်ပါ။</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">သင်၏ Molly ဗားရှင်း သက်တမ်းကုန်သွားပြီ။ သင်၏ မက်ဆေ့ချ်မှတ်တမ်းကို သင်ကြည့်နိုင်သော်လည်း အပ်ဒိတ် မလုပ်မချင်း မက်ဆေ့ချ်များပို့ခြင်း သို့မဟုတ် လက်ခံခြင်း မလုပ်နိုင်ပါ။</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Web browser ကိုရှာမတွေ့ပါ</string>
@@ -326,8 +327,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">စာတို %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly အော်ဒီယိုကောလ်ခေါ်ဆိုမှု %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly ဗီဒီယိုကောလ်ခေါ်ဆိုမှု %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -355,10 +356,10 @@
     <string name="ConversationItem_error_partially_not_delivered">တစ်စိတ်တစ်ပိုင်းပို့ပြီး၊ အသေးစိတ်သိရှိရန် နှိပ်ပါ</string>
     <string name="ConversationItem_error_network_not_delivered">ပို့ဆောင်မှု မအောင်မြင်ပါ</string>
     <string name="ConversationItem_group_action_left">%1$s အဖွဲ့မှထွက်သွားသည်။</string>
-    <string name="ConversationItem_send_paused">áá±áá­á¯á·áá¾á¯áá­á¯ áááºááá·áºáá²á·áááº</string>
+    <string name="ConversationItem_send_paused">ပေးပို့မှု ခေတ္တရပ်နေသည်</string>
     <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">မလုံခြုံသောဖုန်းစာတိုပို့စနစ်ကိုပြန်သုံးမလား?</string>
     <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">မလုံခြုံသော ရုပ်သံပုံပါ စာပို့စနစ်ကို ပြန်သုံးမလား?</string>
-    <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">သင်ပေးပို့သော သူသည် Signal <b></b>မသုံးတော့သဖြင့် ဤနည်းလမ်းဖြင့် စာတိုကို ပေးပို့၍မရနိုင်ပါ။ \n\n ရိုးရိုးစာတိုစနစ်ဖြင့်ပေးပို့မလား?</string>
+    <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">သင်ပေးပို့သော သူသည် Signal <b/>မသုံးတော့သဖြင့် ဤနည်းလမ်းဖြင့် စာတိုကို ပေးပို့၍မရနိုင်ပါ။ \n\n ရိုးရိုးစာတိုစနစ်ဖြင့်ပေးပို့မလား?</string>
     <string name="ConversationItem_unable_to_open_media">ရုပ်သံ ကိုဖွင့်နိုင်သည့် app မရှိပါ။</string>
     <string name="ConversationItem_copied_text">ကူးပြီးပါပြီ %1$s</string>
     <string name="ConversationItem_from_s">%1$s မှ</string>
@@ -419,7 +420,7 @@
     <string name="ConversationActivity_transport_signal">Signal မက်ဆေ့ချ်</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">မက်ဆေ့ချ် ပို့ရန်</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Signal %1$s ကိုပြောင်းသုံးကြပါစို့</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Molly %1$s ကိုပြောင်းသုံးကြပါစို့</string>
     <string name="ConversationActivity_specify_recipient">ဆက်သွယ်လိုသည့်သူကို ရွေးချယ်ပါ</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">ပူးတွဲဖိုင်သည် သတ်မှတ်ဖိုင်အရွယ်အစားထက်ကြီးနေသည်။</string>
     <string name="ConversationActivity_unable_to_record_audio">အသံဖမ်း၍ မရနိုင်ပါ!</string>
@@ -438,18 +439,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">အသံမက်ဆေ့ဂျ်များ ပေးပို့ရန်-</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">အသံမက်ဆေ့ဂျ်များပို့ရန် Signal ကို သင့်မိုက်ခရိုဖုန်း အသုံးပြုခွင့်ပေးပါ။</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">အသံမက်ဆေ့ဂျ်များပို့ရန် Molly ကို သင့်မိုက်ခရိုဖုန်း အသုံးပြုခွင့်ပေးပါ။</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">အသံမက်ဆေ့ဂျ်ကို မှတ်တမ်းတင်ရန်အတွက် Signal သည် မိုက်ခရိုဖုန်းကို အသုံးပြုခွင့် လိုအပ်ပါသည်။</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">အသံဖိုင်များပို့နိုင်ရန် Signalမှ မိုက်ခရိုဖုန်းအား အသုံးပြုခွင့်ရရန် လိုအပ်သည်။ သို့သော် လုံးဝခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ မိုက်ခရိုဖုန်းကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">အသံမက်ဆေ့ဂျ်ကို မှတ်တမ်းတင်ရန်အတွက် Molly သည် မိုက်ခရိုဖုန်းကို အသုံးပြုခွင့် လိုအပ်ပါသည်။</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">အသံဖိုင်များပို့နိုင်ရန် Mollyမှ မိုက်ခရိုဖုန်းအား အသုံးပြုခွင့်ရရန် လိုအပ်သည်။ သို့သော် လုံးဝခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ မိုက်ခရိုဖုန်းကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$sဖုန်းခေါ်ဆိုမှုပြုနိုင်ရန် Signalမှ မိုက်ခရိုဖုန်း နှင့် ကင်မရာအား အသုံးပြုခွင့်ရရန်လိုအပ်သည်။ သို့သော် အမြဲတမ်းတွက် ခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ မိုက်ခရိုဖုန်း နှင့် ကင်မရာကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">ဓါတ်ပုံနှင့် ဗီဒီယိုရိုက်နိုင်ရန် Signal မှ မိမိကင်မရာကို အသုံးပြုခွင့်ပေးပါ။</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">ဓါတ်ပုံနှင့် ဗီဒီယိုရိုက်နိုင်ရန် Signal မှ မိမိကင်မရာကို အသုံးပြုခွင့်ပေးထားရန်လိုသည်။ သို့သော် လုံးဝခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ ကင်မရာကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">ဓါတ်ပုံနှင့် ဗီဒီယိုရိုက်နိုင်ရန် Signal မှ မိမိကင်မရာကို အသုံးပြုခွင့်ပေးထားရန်လိုသည်</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$sဖုန်းခေါ်ဆိုမှုပြုနိုင်ရန် Mollyမှ မိုက်ခရိုဖုန်း နှင့် ကင်မရာအား အသုံးပြုခွင့်ရရန်လိုအပ်သည်။ သို့သော် အမြဲတမ်းတွက် ခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ မိုက်ခရိုဖုန်း နှင့် ကင်မရာကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">ဓါတ်ပုံနှင့် ဗီဒီယိုရိုက်နိုင်ရန် Molly မှ မိမိကင်မရာကို အသုံးပြုခွင့်ပေးပါ။</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">ဓါတ်ပုံနှင့် ဗီဒီယိုရိုက်နိုင်ရန် Molly မှ မိမိကင်မရာကို အသုံးပြုခွင့်ပေးထားရန်လိုသည်။ သို့သော် လုံးဝခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ ကင်မရာကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">ဓါတ်ပုံနှင့် ဗီဒီယိုရိုက်နိုင်ရန် Molly မှ မိမိကင်မရာကို အသုံးပြုခွင့်ပေးထားရန်လိုသည်</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">အသံပါ ဗွီဒီယိုများကို ရိုက်ကူးရန် မိုက်ခရိုဖုန်းအသုံးပြုခွင့်ပေးပါ။</string>
     <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">ဗွီဒီယိုရိုက်ကူးရန် မိုက်ကရိုဖုန်းခွင့်ပြုချက်လိုအပ်ပါသည်။ သို့သော် ငြင်းဆိုခံရပါက အက်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ \"ခွင့်ပြုချက်များ\" ကို ရွေးချယ်ကာ \"မိုက်ခရိုဖုန်း\" နှင့် \"ကင်မရာ\" ကို အသုံးပြုနိုင်အောင် လုပ်ပါ။</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">ဗီဒီယိုရိုက်ကူးရန် Signal သည် မိုက်ကရိုဖုန်းအသုံးပြုခွင့် လိုအပ်သည်။</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">ဗီဒီယိုရိုက်ကူးရန် Molly သည် မိုက်ကရိုဖုန်းအသုံးပြုခွင့် လိုအပ်သည်။</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">မဟုတ်ပါ</string>
@@ -470,9 +471,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">ခေါ်ဆိုမှုစတင်ရန်-</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">ခေါ်ဆိုမှုစတင်ရန် Signal ကို သင့်မိုက်ခရိုဖုန်း အသုံးပြုခွင့်ပေးပါ။</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">ခေါ်ဆိုမှုစတင်ရန် Molly ကို သင့်မိုက်ခရိုဖုန်း အသုံးပြုခွင့်ပေးပါ။</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">ခေါ်ဆိုမှုတစ်ခုစတင်ရန် Signal သည် မိုက်ခရိုဖုန်းအသုံးပြုခွင့် လိုအပ်ပါသည်။</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">ခေါ်ဆိုမှုတစ်ခုစတင်ရန် Molly သည် မိုက်ခရိုဖုန်းအသုံးပြုခွင့် လိုအပ်ပါသည်။</string>
 
 
     <string name="ConversationActivity_join">ပူးပေါင်း</string>
@@ -486,9 +487,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">SMS မက်ဆေ့ချ်လုပ်ဆောင်ချက်ကို Signal တွင် မပံ့ပိုးပေးတော့ပါ။ ဤတွင် ဆက်လက်ဆွေးနွေးနိုင်ရန် %1$s အား Signal သို့ ဖိတ်ခေါ်ပါ။</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">ဤပုဂ္ဂိုလ်သည် Signal မသုံးတော့ပါ။ ဤနေရာတွင် ဆက်လက်ဆွေးနွေးနိုင်ရန် သူ့ကို Signal သို့ ဖိတ်ခေါ်ပါ။</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">ဤပုဂ္ဂိုလ်သည် Molly မသုံးတော့ပါ။ ဤနေရာတွင် ဆက်လက်ဆွေးနွေးနိုင်ရန် သူ့ကို Molly သို့ ဖိတ်ခေါ်ပါ။</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Signal သို့ ဖိတ်ခေါ်မည်</string>
+    <string name="ConversationActivity__invite_to_signal">Molly သို့ ဖိတ်ခေါ်မည်</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">မကြာမီ သင့်အား ထပ်မံသတိပေးပါမည်။</string>
 
@@ -536,6 +537,8 @@
     <string name="ConversationFragment_delete_for_everyone">လူတိုင်းအတွက် ဖျက်ပါ</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">ဤစက်တွင် ဖျက်ရန်</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">ဖျက်ရန်</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">နေရာတိုင်းတွင် ဖျက်ရန်</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">ချက်(တ်)ထဲတွင် နောက်ဆုံး Signal ဗားရှင်းကို သုံးနေသည့်သူတိုင်းအတွက် ဤမက်ဆေ့ချ်ကို ဖျက်ပါမည်။ ၎င်းတို့သည် မက်ဆေ့ချ်ကို သင်ဖျက်ခဲ့ကြောင်း တွေ့ရပါမည်။</string>
@@ -567,13 +570,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">ဘလော့ခ်ထားပြီး</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Signal ကို အပ်ဒိတ်လုပ်ပါ။</string>
+    <string name="ConversationFragment__update_build">Molly ကို အပ်ဒိတ်လုပ်ပါ။</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Signal ကို ပြန်လည်၍မှတ်ပုံတင်ရန်</string>
+    <string name="ConversationFragment__reregister_signal">Molly ကို ပြန်လည်၍မှတ်ပုံတင်ရန်</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">အနောက်သို့ ပြန်သွားပါ။</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signal ကို ဖွင့်ရန်</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Molly ကို ဖွင့်ရန်</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">အတည်ပြု၍ မရတော့ပါ</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -636,6 +639,10 @@
     <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
         <item quantity="other">ရွေးထားသည့် ချက်(တ်) %1$d ခုလုံးကို အပြီးတိုင်ဖျက်လိမ့်မည်။</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="other">၎င်းသည် ရွေးချယ်ထားသည့် စကားဝိုင်း %1$d ခုစလုံးကို သင်၏စက်များအားလုံးမှ အပြီးတိုင်ဖျက်သွားမည်။</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">ဖျက်နေသည်</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="other">ရွေးထားသော ချက်(တ်)များကို ဖျက်နေဆဲ…</item>
@@ -719,9 +726,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">ကျွန်ုပ်ကို မည်သူတို့က ဖုန်းနံပါတ်ဖြင့် ရှာနိုင်သနည်း။</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">သင့်ဖုန်းနံပါတ် ရှိသူတိုင်းသည် သင် Signal သုံးနေကြောင်း မြင်တွေ့နိုင်ပြီး သင်နှင့် ချက်(တ်)စတင်နိုင်ပါသည်။</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">သင့်ဖုန်းနံပါတ် ရှိသူတိုင်းသည် သင် Molly သုံးနေကြောင်း မြင်တွေ့နိုင်ပြီး သင်နှင့် ချက်(တ်)စတင်နိုင်ပါသည်။</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">သင် ၎င်းတို့ကို မက်ဆေ့ချ်မပို့ပါက သို့မဟုတ် ၎င်းတို့နှင့် ပြောလက်စ ချက်(တ်)တစ်ခု မရှိပါက သင် Signal သုံးနေကြောင်း မည်သူမျှ မြင်တွေ့ရမည်မဟုတ်ပါ။</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">သင် ၎င်းတို့ကို မက်ဆေ့ချ်မပို့ပါက သို့မဟုတ် ၎င်းတို့နှင့် ပြောလက်စ ချက်(တ်)တစ်ခု မရှိပါက သင် Molly သုံးနေကြောင်း မည်သူမျှ မြင်တွေ့ရမည်မဟုတ်ပါ။</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">အရံသိမ်းထားသည်များကို ပြန်ရယူမည်လား?</string>
@@ -755,7 +762,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">သင်၏ backup စကားဝှက်ကိုစစ်ဆေးပြီး ကိုက်ညီမှုရှိမရှိစစ်ဆေးပါ</string>
     <string name="BackupsPreferenceFragment__turn_on">ဖွင့်မည်</string>
     <string name="BackupsPreferenceFragment__turn_off">ပိတ်မည်</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"အရန်ကူးခြင်းတစ်ခုကို ပြန်ယူလိုလျှင် Signal မိတ္တူအသစ်ကိုထည့်သွင်းပါ။ အက်ပ်ကိုဖွင့်၍ \"အရန်ကူးထားခြင်းကိုပြန်ယူပါ\" ကို နှိပ်ပြီး အရန်ဖိုင်ကို ရှာဖွေရွေးပေးပါ။ %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"အရန်ကူးခြင်းတစ်ခုကို ပြန်ယူလိုလျှင် Molly မိတ္တူအသစ်ကိုထည့်သွင်းပါ။ အက်ပ်ကိုဖွင့်၍ \"အရန်ကူးထားခြင်းကိုပြန်ယူပါ\" ကို နှိပ်ပြီး အရန်ဖိုင်ကို ရှာဖွေရွေးပေးပါ။ %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">ထပ်မံလေ့လာရန်</string>
     <string name="BackupsPreferenceFragment__in_progress">ဆောင်ရွက်ဆဲ</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -763,7 +770,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d ထိလုပ်ဆောင်ပြီး…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% လုပ်ဆောင်ပြီး…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">သင်၏ အပလီကေးရှင်းပြင်ပ ဖုန်းထဲတွင် သိမ်းထားခွင့်အား Signal ကို ပေးရန်လိုအပ်ပါသည်။သို့သော် လုံးဝခွင့်မပြုပါဟု ရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ သိုလှောင်မှုခွင့်ပြုချက်ကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">သင်၏ အပလီကေးရှင်းပြင်ပ ဖုန်းထဲတွင် သိမ်းထားခွင့်အား Molly ကို ပေးရန်လိုအပ်ပါသည်။သို့သော် လုံးဝခွင့်မပြုပါဟု ရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ သိုလှောင်မှုခွင့်ပြုချက်ကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">ဘက်ခ်အပ်လုပ်ချိန် သတ်မှတ်ခြင်း</string>
 
@@ -830,7 +837,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">ချက်(တ်) ဆက်ရှင် ပြန်ဖွင့်ပြီး</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal သည် ဟိုဘက်သည်ဘက် ကုဒ်ပြောင်းဝှက်ခြင်းကို အသုံးပြုပြီး သင်၏ ချက်(တ်)ဆက်ရှင်ကို တစ်ခါတစ်ရံ ပြန်ဖွင့်ရန် လိုအပ်နိုင်သည်။ ၎င်းသည် သင့်ချက်(တ်)၏ လုံခြုံရေးကို မထိခိုက်စေပါ၊ သို့သော် သင်သည် ဤအဆက်အသွယ်ထံမှ မက်ဆေ့ခ်ျတစ်စောင်ကို လွတ်သွားနိုင်ပြီး ၎င်းတို့အား ပြန်လည်ပေးပို့ရန် တောင်းဆိုနိုင်သည်။</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly သည် ဟိုဘက်သည်ဘက် ကုဒ်ပြောင်းဝှက်ခြင်းကို အသုံးပြုပြီး သင်၏ ချက်(တ်)ဆက်ရှင်ကို တစ်ခါတစ်ရံ ပြန်ဖွင့်ရန် လိုအပ်နိုင်သည်။ ၎င်းသည် သင့်ချက်(တ်)၏ လုံခြုံရေးကို မထိခိုက်စေပါ၊ သို့သော် သင်သည် ဤအဆက်အသွယ်ထံမှ မက်ဆေ့ခ်ျတစ်စောင်ကို လွတ်သွားနိုင်ပြီး ၎င်းတို့အား ပြန်လည်ပေးပို့ရန် တောင်းဆိုနိုင်သည်။</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Desktop သို့မဟုတ် iPad တွင် Signal ကိုသုံးပါ။ သင့်မက်ဆေ့ချ်များသည် သင်ချိတ်ထားသော စက်များနှင့် ချိန်ကိုက်ထားပါမည်။</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">စက်အသစ်တစ်ခုကို ချိတ်ဆက်ရန်</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">စက်ပစ္စည်းအားလုံးရှိ %1$s မက်ဆေ့ချ်များနှင့် ချက်(တ်)အချက်အလက်ကို end-to-end ကုဒ်ပြောင်းဝှက်ခြင်းဖြင့် ကာကွယ်ထားသည်</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Desktop သို့မဟုတ် iPad အတွက် Signal</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">ချိတ်ထားသည့် စက်များတွင် မက်ဆေ့ချ်ဆက်သွယ်မှုအားလုံးမှာ သီးသန့်ဖြစ်ပါသည်</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">သင့်မိုဘိုင်းဖုန်းနှင့် ချိတ်ပြီးသောအခါ Molly မက်ဆေ့ချ်များကို ထိုဖုန်းရှိ Molly နှင့် တူအောင်ညှိလိုက်သည်။ သင်၏ ယခင်မက်ဆေ့ချ်ပို့ခဲ့သော မှတ်တမ်းမှာ ပေါ်နေမည် မဟုတ်ပါ။</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Molly ထည့်သွင်းရန် သင့်အခြားစက်တွင် %1$s သို့ သွားရောက်ပါ</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">လင့်ခ်ချိတ်ထားသည့် စက်များ</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">ချိတ်ဆက်မှုကို ဖြုတ်ပါ</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s ချိတ်ဆက်မှုကို ဖြုတ်လိုက်ပြီ</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">စက်ကို ချိတ်ဆက်နေသည်…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">စက်ကို အတည်ပြုလိုက်ပြီ</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">လုပ်ဆောင်နေသည်…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">ချိတ်ထားသည့် စက်များမရှိပါ</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">စက်တစ်ခုဖြင့် ချိတ်ဆက်ရန် လော့ခ်ဖွင့်ပါ</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">လင့်ခ်ချိတ်ရန် စက်ပေါ်ရှိ QR ကုဒ်ကို စကင်န်ဖတ်ပါ။</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">QR ကုဒ်ကို စကင်န်ဖတ်မည်</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">သင်ချိတ်ဆက်လိုသောစက်တွင် ပြသထားသည့် QR ကုဒ်ကို စကင်န်ဖတ်ရန် ဤစက်ကိုအသုံးပြုပါ</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">အိုကေ</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">၎င်းစက်သည် သင်၏ အဖွဲ့နှင့် အဆက်အသွယ်များ၊ ချက်(တ်) အသုံးပြုခွင့်နှင့် သင့်အမည်သုံး၍ မက်ဆေ့ချ်ပို့ခြင်းတို့ကို မြင်တွေ့လုပ်ဆောင်နိုင်ပါသည်။</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">သင့်အခြားစက််တွင် လင့်ခ်ချိတ်ခြင်းကို အပြီးသတ်ပါ</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">သင့်အခြားစက်တွင် Molly လင့်ခ်ချိတ်ခြင်းကို အပြီးသတ်ပါ။</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">စက်ချိတ်ဆက်မှု မအောင်မြင်ပါ</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">၎င်း QR ကုဒ်သည် မမှန်ကန်ပါ။ ကျေးဇူးပြု၍ သင် စကင်န်ဖတ်နေသော QR ကုဒ်သည် သင်ချိတ်ဆက်ချင်သည့် စက်ပေါ်တွင် ပြထားသော QR ကုဒ်ဖြင့် ကိုက်ညီတာ သေချာပါစေ။</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">ထပ်ကြိုးစားပါ</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">\'%1$s\' ကိုမချိတ်တော့ဘူးလား?</string>
@@ -852,10 +914,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">မပါရှိသေးသော Play Service များကို ရှာဖွေပါ</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">ဤဖုန်းသည် Play Services အသုံးပြု၍မရပါ။ Signal အသုံးမပြုသည့်အချိန်တွင် သတင်းစကားများပြန်လည် ထုတ်ယူရာတွင် အနှောက်အယှက်ပြုသည့်အတွက် ဘက်ထရီ အသုံးပြုမှုစောင့် ကြည့်သည့်စနစ်ကို ပိတ်ထားပေးပါ။</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">ဤဖုန်းသည် Play Services အသုံးပြု၍မရပါ။ Molly အသုံးမပြုသည့်အချိန်တွင် သတင်းစကားများပြန်လည် ထုတ်ယူရာတွင် အနှောက်အယှက်ပြုသည့်အတွက် ဘက်ထရီ အသုံးပြုမှုစောင့် ကြည့်သည့်စနစ်ကို ပိတ်ထားပေးပါ။</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">ယခု အသုံးပြုနေသော Signal ဗားရှင်း သက်တမ်းကုန်သွားပြီ။ မက်ဆေ့ခ်ျများပို့ရန်နှင့် လက်ခံရန် ယခု Update လုပ်ပါ။</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">ယခု အသုံးပြုနေသော Molly ဗားရှင်း သက်တမ်းကုန်သွားပြီ။ မက်ဆေ့ခ်ျများပို့ရန်နှင့် လက်ခံရန် ယခု Update လုပ်ပါ။</string>
     <string name="ExpiredBuildReminder_update_now">ယခု Update လုပ်ပါ။</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -865,8 +927,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">ကြည့်မည်။</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Signal ဆက်သွယ်မှု လုံးဝမလုပ်နိုင်ပါ။</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal ကို Google Play Services ဖြင့် မှတ်ပုံတင်၍မရနိုင်ပါ။ Signal စာတိုနှင့် ဖုန်းခေါ်ဆိုမှု ကိုပိတ်လိုက်သည်။ ပြင်ဆင်ခြင်း &gt; အဆင့်မြင့်တွင် ပြန်လည်မှတ်ပုံတင်ကြည့်ပါ။</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Molly ဆက်သွယ်မှု လုံးဝမလုပ်နိုင်ပါ။</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly ကို Google Play Services ဖြင့် မှတ်ပုံတင်၍မရနိုင်ပါ။ Molly စာတိုနှင့် ဖုန်းခေါ်ဆိုမှု ကိုပိတ်လိုက်သည်။ ပြင်ဆင်ခြင်း &gt; အဆင့်မြင့်တွင် ပြန်လည်မှတ်ပုံတင်ကြည့်ပါ။</string>
 
 
     <!-- GiphyActivity -->
@@ -992,20 +1054,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">ပြစ်ချက်မှတ်တမ်းများသည် ပြဿနာကို စစ်ဆေးရှာဖွေရန်နှင့် ဖြေရှင်းရန် ကျွန်ုပ်တို့ကို အကူအညီပေးပြီး မည်သူဖြစ်ကြောင်း ခွဲခြားနိုင်သည့် အချက်အလက်များ မပါရှိပါ။</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal တွင် ပြဿနာတစ်ခု ဖြစ်ပေါ်နေပါသည်။ ပြစ်ချက်မှတ်တမ်း ပေးပို့မည်လား။</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly တွင် ပြဿနာတစ်ခု ဖြစ်ပေါ်နေပါသည်။ ပြစ်ချက်မှတ်တမ်း ပေးပို့မည်လား။</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">ဘက်ထရီ အကောင်းဆုံးချိန်ညှိမှုများကြောင့် အသိပေးချက်များ နှောင့်နှေးနိုင်ပါသည်</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">မက်ဆေ့ချ် အသိပေးချက်များ မနှောင့်နှေးကြောင်း သေချာစေရန် Signal အတွက် ဘက်ထရီ အကောင်းဆုံးချိန်ညှိမှုများကို ပိတ်ထားနိုင်ပါသည်။</string>
+    <string name="PromptBatterySaverBottomSheet__message">မက်ဆေ့ချ် အသိပေးချက်များ မနှောင့်နှေးကြောင်း သေချာစေရန် Molly အတွက် ဘက်ထရီ အကောင်းဆုံးချိန်ညှိမှုများကို ပိတ်ထားနိုင်ပါသည်။</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">ဘက်ထရီ အကောင်းဆုံးချိန်ညှိမှုများကြောင့် အသိပေးချက်များ နှောင့်နှေးနိုင်ပါသည်</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">မက်ဆေ့ချ် အသိပေးချက်များ မနှောင့်နှေးကြောင်း သေချာစေရန် Molly အတွက် ဘက်ထရီ အကောင်းဆုံးချိန်ညှိမှုများကို ပိတ်ထားနိုင်ပါသည်။ စက်အလိုက် ညွှန်ကြားချက်များကို ကြည့်ရန် \"ဆက်လုပ်ရန်\" ကိုနှိပ်ပါ။</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">မလုပ်လိုပါ</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">ဆက်လုပ်ရန်</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">ဆက်လုပ်ရန်</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">ပယ်ရန်</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">မလုပ်လိုပါ</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">ဆိုင်းငံ့ထားအုပ်စု ဖိတ်ကြားချက်များ</string>
+    <string name="PendingMembersActivity_pending_group_invites">တောင်းဆိုချက်များနှင့် ဖိတ်ခေါ်မှုများ</string>
     <string name="PendingMembersActivity_requests">တောင်းဆိုမှုများ</string>
     <string name="PendingMembersActivity_invites">ဖိတ်ကြားချက်များ</string>
     <string name="PendingMembersActivity_people_you_invited">သင်ဖိတ်ကြားထားသောလူများ</string>
@@ -1244,12 +1316,12 @@
     <string name="InviteActivity_cancel">မလုပ်တော့ပါ</string>
     <string name="InviteActivity_sending">ပို့နေသည်…</string>
     <string name="InviteActivity_invitations_sent">ဖိတ်ကြားမှု ပြုလုပ်ပြီး!</string>
-    <string name="InviteActivity_invite_to_signal">Signal သုံးဖို့ဖိတ်ရန်</string>
+    <string name="InviteActivity_invite_to_signal">Molly သုံးဖို့ဖိတ်ရန်</string>
     <string name="InviteActivity_send_sms">SMS ပို့ရန် (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="other">%1$dစာ SMS ဖြင့် ဖိတ်ခေါ်မလား။</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Signal ကိုပြောင်းသုံးကြစို့ : %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Molly ကိုပြောင်းသုံးကြစို့ : %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">သင့်မှာမျှဝေစရာ app များရှိပုံမရပါ။</string>
 
     <!-- LearnMoreTextView -->
@@ -1263,7 +1335,7 @@
     <string name="LongMessageActivity_your_message">သင့် မက်ဆေ့ချ်</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">အင်တာနက်ဆက်သွယ်မှု နောက်ကွယ်တွင် ဖွင့်ထားသည်</string>
 
     <!-- MediaOverviewActivity -->
@@ -1327,10 +1399,10 @@
     <string name="MessageQuotesBottomSheet_replies">ပြန်စာများ</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal ဖုန်းခေါ်ဆိုမှုစတင်နေသည်</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly ဖုန်းခေါ်ဆိုမှုစတင်နေသည်</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signal ကောလ် ဝန်ဆောင်မှုကို စတင်နေပါသည်</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal ဖုန်းခေါ်ဆိုခြင်း ဝန်ဆောင်မှုကို ရပ်ဆိုင်းနေသည်</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Molly ကောလ် ဝန်ဆောင်မှုကို စတင်နေပါသည်</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly ဖုန်းခေါ်ဆိုခြင်း ဝန်ဆောင်မှုကို ရပ်ဆိုင်းနေသည်</string>
     <string name="NotificationBarManager__cancel_call">ဖုန်းခေါ်နေခြင်း ရပ်ဆိုင်းမည်</string>
 
     <!-- NotificationsMegaphone -->
@@ -1574,6 +1646,14 @@
     <string name="MessageRecord_you_activated_payments">ငွေပေးချေမှုများကို သက်ဝင်လုပ်ဆောင်ထားပါသည်</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">ယခုအခါ %1$s သည် ငွေပေးချေမှုများကို လက်ခံနိုင်ပါသည်</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">ငွေပေးချေမှု အသေးစိတ်အချက်အလက်များကို မရရှိနိုင်ပါ</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">ပိုမိုလေ့လာရန် နှိပ်ပါ</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">ငွေပေးချေမှု အသေးစိတ်အချက်အလက်များကို မရရှိနိုင်ပါ</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">သင့်မက်ဆေ့ချ်များကို ဤငွေပေးချေမှုမှတ်တမ်းမပါဝင်သည့် အရင်းအမြစ်မှ ပြန်လည်ရယူထားသောကြောင့် ဤငွေပေးချေမှု အသေးစိတ်အချက်အလက်များကို မရရှိနိုင်ပါ။ ၎င်းသည် သင့် Wallet လက်ကျန်ငွေ သို့မဟုတ် ယခင်ငွေပေးချေမှုအခြေအနေအပေါ် သက်ရောက်မှုမရှိပါ။</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1628,9 +1708,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">မကြာမီတွင် SMS မက်ဆေ့ချ်များကို Signal မှ ပေးပို့၍ ရနိုင်တော့မည် မဟုတ်ပါ။ ဤတွင် ဆက်လက်ဆွေးနွေးနိုင်ရန် %1$s အား Signal သို့ ဖိတ်ခေါ်ပါ။</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Signal တွင် SMS မက်ဆေ့ချ်များကို ပေးပို့နိုင်တော့မည် မဟုတ်ပါ။ ဤတွင် ဆက်လက်ဆွေးနွေးနိုင်ရန် %1$s အား Signal သို့ ဖိတ်ခေါ်ပါ။</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Molly တွင် SMS မက်ဆေ့ချ်များကို ပေးပို့နိုင်တော့မည် မဟုတ်ပါ။ ဤတွင် ဆက်လက်ဆွေးနွေးနိုင်ရန် %1$s အား Molly သို့ ဖိတ်ခေါ်ပါ။</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">ငွေပေးချေမှု- %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">ငွေပေးချေမှု</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">လိမ်လည်မှုအဖြစ် ရီပို့(တ်)လုပ်ပြီးပါပြီ</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1704,7 +1786,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Signal အသုံးပြုသော ဖုန်းအားချိတ်မည်။</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">သင်သည် Signal သုံးသောဖုန်းအား 3rd party scanner ဖြင့်ချိတ်ဆက်အတည်ပြုနေပုံရသည်။ လုံခြုံမှုရှိစေရန် ကုဒ်အား Signal အတွင်းတွင်ပါသော scanner ဖြင့်ပြန်ဖတ်ပါ။</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">QR Code အားစစ်ဆေးနိုင်ရန် မိမိ ကင်မရာကို Signalမှ အသုံးပြုခွင့်ရရန်လိုအပ်သည်။ သို့သော် အမြဲတမ်းတွက် ခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ ကင်မရာကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">QR Code အားစစ်ဆေးနိုင်ရန် မိမိ ကင်မရာကို Mollyမှ အသုံးပြုခွင့်ရရန်လိုအပ်သည်။ သို့သော် အမြဲတမ်းတွက် ခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ ကင်မရာကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">ကင်မရာကို ခွင့်ပြုချက် မပေးထားဘဲ QR ကုတ်ကို စကန်ဖတ်၍ မရပါ</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1716,11 +1798,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">စကားဝှက် ထည့်ပါ။</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal ပုံသင်္ကေတ</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly ပုံသင်္ကေတ</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">စကားဝှက် တင်သွင်းပါ</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">စကားဝှက် မှားနေသည်</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signal ကို ပြန်ဖွင့်ပါ</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - သော့ခတ် စကင်ရင်</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Molly ကို ပြန်ဖွင့်ပါ</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - သော့ခတ် စကင်ရင်</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">မြေပုံ</string>
@@ -1786,7 +1868,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">မက်ဆေ့ချ် ဆက်ပို့နိုင်ရန် အတည်ပြုပါ</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Signal တွင် စပမ်းများကို တားဆီးရာ၌ ကူညီရန် အတည်ပြုမှုကို ပြီးအောင်လုပ်ပေးပါ။</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Molly တွင် စပမ်းများကို တားဆီးရာ၌ ကူညီရန် အတည်ပြုမှုကို ပြီးအောင်လုပ်ပေးပါ။</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">အတည်ပြုပြီးနောက် သင်သည် မက်ဆေ့ချ် ဆက်ပို့နိုင်ပါမည်။ ဆိုင်းငံ့ထားသည့် မက်ဆေ့ချ်များကိုလည်း အော်တိုပို့သွားပါမည်။</string>
 
     <!-- Recipient -->
@@ -1794,7 +1876,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">ကျွန်ုပ်၏ စတိုရီ</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal ကောလ်</string>
+    <string name="Recipient_signal_call">Molly ကောလ်</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">ဘလော့ခ်ရန်</string>
@@ -1808,7 +1890,8 @@
     <string name="RedPhone_ringing">ဖုန်းသံမြည်နေသည်…</string>
     <string name="RedPhone_busy">မအားပါ</string>
     <string name="RedPhone_recipient_unavailable">ခေါ်ဆိုလိုသည့် တစ်ဖက်လူ မအားပါ</string>
-    <string name="RedPhone_network_failed">ကွန်ယက် ကျသွားသည်!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">ကွန်ရက် ကျသွားသည်။ သင့်ကွန်ရက် ချိတ်ဆက်မှုကိုစစ်ဆေးပြီး ထပ်ကြိုးစားပါ။</string>
     <string name="RedPhone_number_not_registered">ယခု ဖုန်းနံပါတ်မှာ မှတ်ပုံတင်ထားခြင်း မရှိပါ။</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">သင်ခေါ်ဆိုလိုက်သော ဖုန်းနံပါတ်မှာ signal ၏ လုံခြုံစွာဖုန်းခေါ်ဆိုခြင်း စနစ်အား မပံ့ပိုးနိုင်ပါ။</string>
     <string name="RedPhone_got_it">ရပြီ</string>
@@ -1819,8 +1902,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">ဤနေရာတွင်နှိပ်၍ သင့်ဗီဒီယိုကို ဖွင့်ပါ</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s သို့ ခေါ်ဆိုရန် Signal မှ သင့်ကင်မရာသုံးခွင့် လိုအပ်ပါသည်</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s သို့ ခေါ်ဆိုရန် Molly မှ သင့်ကင်မရာသုံးခွင့် လိုအပ်ပါသည်</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">ခေါ်ဆိုနေပါသည်…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">ပြန်လည်ချိတ်ဆက်နေသည် …</string>
@@ -1868,10 +1951,30 @@
     <string name="WebRtcCallActivity__removed_from_call">ကောလ်မှ ဖယ်ရှားခံရခြင်း</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">တစ်စုံတစ်ဦးက သင့်ကို ကောလ်မှ ဖယ်ရှားလိုက်ပါသည်။</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">သင့်ကင်မရာနှင့် မိုက်ခရိုဖုန်း အသုံးပြုခွင့်ပေးပါ</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">သင့်မိုက်ခရိုဖုန်း အသုံးပြုခွင့်ကိုပေးပါ</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">သင့်ကင်မရာ အသုံးပြုခွင့်ပေးပါ</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">ခေါ်ဆိုမှုစတင်ရန် သို့မဟုတ် ပါဝင်ရန် Molly ကို သင့် ကင်မရာနှင့် မိုက်ခရိုဖုန်း အသုံးပြုခွင့်ပေးပါ။</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">ခေါ်ဆိုမှုစတင်ရန် သို့မဟုတ် ပါဝင်ရန် Molly ကို သင့် မိုက်ခရိုဖုန်း အသုံးပြုခွင့်ပေးပါ။</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">ဗီဒီယိုရိုက်နိုင်ရန် Molly မှ မိမိကင်မရာကို အသုံးပြုခွင့်ပေးပါ။</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">ခေါ်ဆိုမှုတစ်ခုစတင်ရန် သို့မဟုတ် ပါဝင်ရန် Molly သည် မိုက်ခရိုဖုန်း အသုံးပြုခွင့် လိုအပ်သည်။</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">ဓာတ်ပုံရိုက်ကူးရန် Molly သည် ကင်မရာအသုံးပြုခွင့် လိုအပ်ပါသည်</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">ခေါ်ဆိုမှုတစ်ခု စတင်ရန် သို့မဟုတ် ပါဝင်ရန်-</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">သင့်ဗီဒီယိုကို ဖွင့်ရန်-</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal ခေါ်ဆိုမှု</string>
-    <string name="WebRtcCallView__signal_video_call">Signal ဗီဒီယိုကောလ်</string>
+    <string name="WebRtcCallView__signal_call">Molly ခေါ်ဆိုမှု</string>
+    <string name="WebRtcCallView__signal_video_call">Molly ဗီဒီယိုကောလ်</string>
     <string name="WebRtcCallView__start_call">စတင်ခေါ်ဆိုပါ</string>
     <string name="WebRtcCallView__join_call">ခေါ်ဆိုမှုထဲဝင်မယ်</string>
     <string name="WebRtcCallView__call_is_full">ခေါ်ဆိုမှုထဲ လူပြည့်နေပါပြီ</string>
@@ -1959,18 +2062,35 @@
     <string name="CallOverflowPopupWindow__lower_hand">လက်ပြန်ချမည်</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">မလုပ်တော့ပါ</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">သင် လက်မြှောက်ထားပါသည်</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">ကြည့်မယ်</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="other">%1$s + %2$d ဦး လက်မြှောက်ထားပါသည်</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s လက်ထောင်ထားပါသည်</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s နှင့် %2$d ဦး လက်ထောင်ထားပါသည်</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s လက်ထောင်ထားပါသည်</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s + %2$d ဦး လက်ထောင်ထားပါသည်</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="other">%1$s + %2$d ဦး</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="other">%1$s + %2$d ဦး</item>
     </plurals>
 
@@ -2055,7 +2175,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">၎င်းနံပတ်ကို အတည်ပြုရန်အတွက် အဝင်ဖုန်းတစ်ခု လက်ခံရရှိပါမည်</string>
     <string name="RegistrationActivity_edit_number">နံပါတ်ကို ပြင်မယ်</string>
     <string name="RegistrationActivity_missing_google_play_services">Google Play မရှိပါ</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">သင့်ဖုန်းတွင် Google Play Services လိုအပ်နေပါသည်။ သင် Signal ကို အသုံးပြုနိုင်ပါတယ် ဒီဖွဲ့စည်းပုံအကျိုးရလဒ်ကယုံကြည်ဖို့အတွက် ဒါမှမဟုတ် စွမ်းဆောင်ရည် ကောင်းဖို့အတွက်ဖြစ်နိုင်ပါတယ်။ \n\n သင်က ကျွမ်းကျင်အဆင့် မဟုတ်လျှင် Android Rom market ကို သွားရန် မလိုပါ။ သို့မဟုတ် အမှားတစ်ခုခုဟု ထင်ပါက ဖြေရှင်းပေးနိုင်ဖို့အတွက် support@signal.org သို့ ဆက်သွယ်ပေးပါ။</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">သင့်ဖုန်းတွင် Google Play Services လိုအပ်နေပါသည်။ သင် Molly ကို အသုံးပြုနိုင်ပါတယ် ဒီဖွဲ့စည်းပုံအကျိုးရလဒ်ကယုံကြည်ဖို့အတွက် ဒါမှမဟုတ် စွမ်းဆောင်ရည် ကောင်းဖို့အတွက်ဖြစ်နိုင်ပါတယ်။ \n\n သင်က ကျွမ်းကျင်အဆင့် မဟုတ်လျှင် Android Rom market ကို သွားရန် မလိုပါ။ သို့မဟုတ် အမှားတစ်ခုခုဟု ထင်ပါက ဖြေရှင်းပေးနိုင်ဖို့အတွက် support@molly.im သို့ ဆက်သွယ်ပေးပါ။</string>
     <string name="RegistrationActivity_i_understand">နားလည် လက်ခံပါသည်</string>
     <string name="RegistrationActivity_play_services_error">Google Play အသုံးပြု၍မရပါ</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Serivice ကို အဆင့်မြှင့်တင်နေခြင်း၊ သို့၊ အသုံးပြု၍ မရခြင်းဖြစ်နေပါသည်။ ပြန်လည် စမ်းသပ်ကြည့်ပါ။</string>
@@ -2073,7 +2193,7 @@
     <string name="RegistrationActivity_non_standard_number_format">စံပုံစံနှင့် မကိုက်ညီသည့် နံပါတ်</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">သင်ထည့်သွင်းထားသည့် နံပါတ် (%1$s) သည် စံပုံစံနှင့် မကိုက်ညီပုံပေါ်ပါသည်။\n\nသင်ဆိုလိုသည်မှာ %2$s ဟုတ်ပါသလား။</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - ဖုန်းနံပါတ် ပုံစံ</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - ဖုန်းနံပါတ် ပုံစံ</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">ကောလ် တောင်းဆိုပြီး</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2106,8 +2226,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">စာရင်းသွင်းမှုနှင့်စပ်လျဉ်း၍ အခက်အခဲရှိပါသလား။</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• သင့် SMS သို့မဟုတ် ခေါ်ဆိုမှုကို လက်ခံရန် သင့်ဖုန်းတွင် ဆယ်လူလာ လိုင်းရှိကြောင်း သေချာပါစေ\n • နံပါတ်သို့ ဖုန်းခေါ်ဆိုမှု လက်ခံနိုင်ကြောင်း အတည်ပြုပါ\n • သင့်ဖုန်းနံပါတ်ကို မှန်ကန်စွာ ရိုက်ထည့်ထားကြောင်း စစ်ဆေးပါ။</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">နောက်ထပ်အချက်အလက်အတွက် ဤပြဿနာဖြေရှင်းနည်း အဆင့်များအတိုင်း လုပ်ဆောင်ပါ သို့မဟုတ် ပံ့ပိုးမှုစင်တာသို့ ဆက်သွယ်ပါ</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">နောက်ထပ်အချက်အလက်များအတွက် %1$s သို့မဟုတ် %2$s အတိုင်းလုပ်ဆောင်ပါ</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">ဤပြဿနာဖြေရှင်းနည်း အဆင့်များ</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2145,13 +2265,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">အဆက်အသွယ်များထဲသို့ ထည့်မည်</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Signal သုံးဖို့ ဖိတ်ရန်</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Molly သုံးဖို့ ဖိတ်ရန်</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal မက်ဆေ့ချ်</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal ခေါ်ဆိုမှု</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">အဆက်အသွယ်များထဲသို့ ထည့်မည်</string>
-    <string name="SharedContactView_invite_to_signal">Signal သုံးဖို့ ဖိတ်ရန်</string>
+    <string name="SharedContactView_invite_to_signal">Molly သုံးဖို့ ဖိတ်ရန်</string>
     <string name="SharedContactView_message">Signal မက်ဆေ့ချ်</string>
 
     <!-- SignalBottomActionBar -->
@@ -2282,11 +2402,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s ကို %2$s က ပိုင်ဆိုင်ပါသည်</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal ဗားရှင်းအသစ်</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal ဗားရှင်းအသစ် ရနိုင်ပါပြီ။ အပ်ဒိတ်လုပ်ရန် နှိပ်ပါ။</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal ကို အပ်ဒိတ်လုပ်ခြင်း မအောင်မြင်ပါ</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly ဗားရှင်းအသစ်</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly ဗားရှင်းအသစ် ရနိုင်ပါပြီ။ အပ်ဒိတ်လုပ်ရန် နှိပ်ပါ။</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly ကို အပ်ဒိတ်လုပ်ခြင်း မအောင်မြင်ပါ</string>
     <string name="ApkUpdateNotifications_failed_general_body">နောက်မှ ထပ်ကြိုးစားပါမည်။</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal ကို အောင်မြင်စွာ အပ်ဒိတ်လုပ်လိုက်ပါပြီ</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly ကို အောင်မြင်စွာ အပ်ဒိတ်လုပ်လိုက်ပါပြီ</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">သင်သည် ဗားရှင်း %1$s သို့ အလိုအလျောက် အပ်ဒိတ်လုပ်လိုက်ပါပြီ။</string>
 
     <!-- UntrustedSendDialog -->
@@ -2356,7 +2476,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">တို့တွေရဲ့ Signal လုံခြုံရေးနံပါတ်:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">သင့်မှာမျှဝေစရာ app များရှိပုံမရပါ။</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">ကလစ်ဘုတ် တွင်တိုက်ကြည့်စရာ လုံခြုံရေးနံပါတ်များ မရှိပါ</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">QR Code အားစစ်ဆေးနိုင်ရန် မိမိ ကင်မရာကို Signalမှ အသုံးပြုခွင့်ရရန်လိုအပ်သည်။ သို့သော် အမြဲတမ်းတွက် ခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ ကင်မရာကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">QR Code အားစစ်ဆေးနိုင်ရန် မိမိ ကင်မရာကို Mollyမှ အသုံးပြုခွင့်ရရန်လိုအပ်သည်။ သို့သော် အမြဲတမ်းတွက် ခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ ကင်မရာကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">ကင်မရာကို ခွင့်ပြုချက် မပေးထားဘဲ QR ကုတ်ကို စကန်ဖတ်၍ မရပါ</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">%1$s ၏ လုံခြုံရေးနံပါတ်ကို ကြည်ရှုရန် သင်မှအရင် မက်ဆေ့ချ်များကို ပေးပို့လက်ခံ ရပါမည်။</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2386,14 +2506,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">ဖွင့်ရန် နှိပ်ပါ။</string>
-    <string name="KeyCachingService_passphrase_cached">Signal ကိုဖွင့်လိုက်ပါပြီ</string>
-    <string name="KeyCachingService_lock">Lock Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly ကိုဖွင့်လိုက်ပါပြီ</string>
+    <string name="KeyCachingService_lock">Lock Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">သင်</string>
     <string name="MediaPreviewActivity_unssuported_media_type">ပံ့ပိုးမှုမပြုနိုင်သော ရုပ်၊သံ၊ပုံ ဖိုင်များ</string>
     <string name="MediaPreviewActivity_draft">မူကြမ်း</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">သင်၏ ပြင်ပသိုလှောင်ရာနေရာတွင် သိမ်းရန် သိုလှောင်မှုခွင့်ပြုချက်အား Signal ကို ပေးရန်လိုအပ်ပါသည်။ သို့သော် လုံးဝခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ သိုလှောင်မှုခွင့်ပြုချက်ကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">သင်၏ ပြင်ပသိုလှောင်ရာနေရာတွင် သိမ်းရန် သိုလှောင်မှုခွင့်ပြုချက်အား Molly ကို ပေးရန်လိုအပ်ပါသည်။ သို့သော် လုံးဝခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ သိုလှောင်မှုခွင့်ပြုချက်ကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">ခွင့်ပြုချက်မပေးထားပါက အပြင်ဘက်တွင် သိမ်းဆည်း၍မရပါ</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">စာကို ဖျက်မည်လား။</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">ဤမက်ဆေ့ကို အပြီးတိုင်ဖျက်သွားမည်။</string>
@@ -2435,7 +2555,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">စာပို့လွှတ်ရန် မအောင်မြင်။</string>
     <string name="MessageNotifier_error_delivering_message">စာပို့လွှတ်ခြင်း မှားယွင်းနေ</string>
     <string name="MessageNotifier_message_delivery_paused">မက်ဆေ့ချ် ပေးပို့မှု ဆိုင်းငံ့ထားပါသည်။</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Signal တွင် မက်ဆေ့ချ် ဆက်ပို့နိုင်ရန် အတည်ပြုပါ။</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Molly တွင် မက်ဆေ့ချ် ဆက်ပို့နိုင်ရန် အတည်ပြုပါ။</string>
     <string name="MessageNotifier_mark_all_as_read">အားလုံး ဖတ်ပြီးသား</string>
     <string name="MessageNotifier_mark_read">ဖတ်ပြီးသား</string>
     <string name="MessageNotifier_turn_off_these_notifications">၎င်းသတိပေးချက်များကို ပိတ်ပါ</string>
@@ -2457,7 +2577,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">သင့်စတစ်ကာကို %1$s ဖြင့် တုံ့ပြန်ခဲ့ပါသည်။</string>
     <string name="MessageNotifier_this_message_was_deleted">ဤမက်ဆေ့အား ဖျက်ပြီးပါပြီ။</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">အဆက်အသွယ်မှ​ Signal သို့ ဝင်ရောက်သည်ဆိုသည့် အသိပေးချက်များကို ပိတ်မည်လား? Signal &gt; အပြင်အဆင်များ &gt; အသိပေးချက်များ ထဲဝင်၍ ၎င်းအသိပေးချက်များကို ဖွင့်လို့ရပါသည်။</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">အဆက်အသွယ်မှ​ Molly သို့ ဝင်ရောက်သည်ဆိုသည့် အသိပေးချက်များကို ပိတ်မည်လား? Molly &gt; အပြင်အဆင်များ &gt; အသိပေးချက်များ ထဲဝင်၍ ၎င်းအသိပေးချက်များကို ဖွင့်လို့ရပါသည်။</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2496,7 +2616,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signal လော့ခ်ကျသွားသည့်အခါ ချက်ချင်းမတုံ့ပြန်နိုင်ပါ!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Molly လော့ခ်ကျသွားသည့်အခါ ချက်ချင်းမတုံ့ပြန်နိုင်ပါ!</string>
     <string name="QuickResponseService_problem_sending_message">စာပို့ခြင်းအခက်အခဲ</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2516,7 +2636,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">မမှန်ကန်သောဖြတ်လမ်း</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">စာအသစ်</string>
     <string name="SingleRecipientNotificationBuilder_message_request">မက်ဆေ့ပို့ရန် တောင်းဆိုချက်</string>
     <string name="SingleRecipientNotificationBuilder_you">သင်</string>
@@ -2561,7 +2681,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">ဤစက်ကို မှတ်ပုံတင်ထားခြင်း မရှိတော့ပါ။ ၎င်းသည် သင့်ဖုန်းနံပါတ်ကို Signal ထံတွင် အခြားစက်တစ်လုံးဖြင့် မှတ်ပုံတင်ခဲ့ခြင်းကြောင့် ဖြစ်နိုင်သည်။</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">ဤစက်ကို မှတ်ပုံတင်ထားခြင်း မရှိတော့ပါ။ ၎င်းသည် သင့်ဖုန်းနံပါတ်ကို Molly ထံတွင် အခြားစက်တစ်လုံးဖြင့် မှတ်ပုံတင်ခဲ့ခြင်းကြောင့် ဖြစ်နိုင်သည်။</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">စက်ကို ပြန်လည်၍မှတ်ပုံတင်ရန်</string>
 
@@ -2574,10 +2694,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">ကောလ် ဖြေဆိုရန် Signal အား သင့်မိုက်ခရိုဖုန်းကို သုံးခွင့်ပေးပါ။</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">ကောလ် ဖြေဆိုရန် Molly အား သင့်မိုက်ခရိုဖုန်းကို သုံးခွင့်ပေးပါ။</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">ဗီဒီယိုကောလ် ဖြေဆိုရန် Signal အား သင့်မိုက်ခရိုဖုန်းနှင့် ကင်မရာကို သုံးခွင့်ပေးပါ။</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">ဖုန်းခေါ်ဆိုမှုပြုနိုင်ရန် Signalမှ မိုက်ခရိုဖုန်း နှင့် ကင်မရာအား အသုံးပြုခွင့် ရရန်လိုအပ်သည်။ သို့သော် လုံးဝခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ မိုက်ခရိုဖုန်း နှင့် ကင်မရာကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">ဗီဒီယိုကောလ် ဖြေဆိုရန် Molly အား သင့်မိုက်ခရိုဖုန်းနှင့် ကင်မရာကို သုံးခွင့်ပေးပါ။</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">ဖုန်းခေါ်ဆိုမှုပြုနိုင်ရန် Mollyမှ မိုက်ခရိုဖုန်း နှင့် ကင်မရာအား အသုံးပြုခွင့် ရရန်လိုအပ်သည်။ သို့သော် လုံးဝခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ မိုက်ခရိုဖုန်း နှင့် ကင်မရာကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">ချိတ်ဆက်ထားသော စက်ပေါ်တွင် ဖြေဆိုခဲ့ပါသည်။</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">ချိတ်ဆက်ထားသော စက်ပေါ်တွင် ငြင်းဆိုခဲ့ပါသည်။</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">ချိတ်ဆက်ထားသော စက်ပေါ်တွင် မအားပါ။</string>
@@ -2622,16 +2742,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">စကားဝှက်အသစ်ကိုထပ်ထည့်ပါ</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Signal သို့ ဖိတ်ခေါ်မည်</string>
+    <string name="contact_selection_activity__invite_to_signal">Molly သို့ ဖိတ်ခေါ်မည်</string>
     <string name="contact_selection_activity__new_group">အဖွဲ့သစ်</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">အဆက်အသွယ်များကို ပြန်လည်လုပ်ဆောင်ခြင်း</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">တစ်စုံတစ်ဦး ပျောက်နေပါသလား။ ပြန်လည်လုပ်ဆောင်ကြည့်ပါ</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Signal တွင် သင်သိသောသူများကို ရှာပါ</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">အဆက်အသွယ်များကို အသုံးပြုခွင့်ပေးပါ</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">နောက်ထပ်</string>
 
@@ -2648,7 +2768,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">လိပ်စာတွင်ထည့်ရန်ဓာတ်ပုံ</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">အဆက်အသွယ်များ၏ အချက်အလက်များကို ပို့နိုင်ရန် Signalမှ အဆက်အသွယ်များအား အသုံးပြုခွင့် ရရန်လိုအပ်သည်။ သို့သော် လုံးဝခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ အဆက်အသွယ်များကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">အဆက်အသွယ်များ၏ အချက်အလက်များကို ပို့နိုင်ရန် Mollyမှ အဆက်အသွယ်များအား အသုံးပြုခွင့် ရရန်လိုအပ်သည်။ သို့သော် လုံးဝခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ အဆက်အသွယ်များကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">သင့်မိတ်ဆွေများစာရင်းများကို ပြန်လည်ထုတ်ယူ၍မရရှိနိုင်ပါ။ သင့်၏ အင်တာနက်ကွန်ယက်ကို ပြန်လည်စစ်ဆေးပါ။</string>
     <string name="ContactSelectionListFragment_username_not_found">သုံးစွဲသူအမည်မတွေ့ပါ</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"%1$s သည် Signal သုံးသူမဟုတ်ပါ။ သုံးစွဲသူအမည်ကို အပြည့်အဝ မှန်ကန်စွာ ဖြည့်ထားရန် သေချာစေပါ။"</string>
@@ -2665,16 +2785,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">သုံးစွဲသူအမည်ဖြင့် ရှာရန်</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">အဆက်အသွယ်များကို အသုံးပြုခွင့်ပေးပါ</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Signal တွင် သင်သိသောသူများကို ရှာရန်-</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">ဝင်ရောက် သုံးစွဲခွင့်ပြုရန်</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">မလုပ်လိုပါ</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">သင့် အဆက်အသွယ်များကို အသုံးပြုခွင့်ပေးပါ။ သင့်အဆက်အသွယ်များကို ကုဒ်ပြောင်းဝှက်ထားပြီး Signal ဝန်ဆောင်မှုက မမြင်တွေ့ရပါ။</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">မိမိ၏ အဆက်အသွယ်များကို ပြသရန် Signal က အဆက်အသွယ်များကို ရယူရန်လိုသည်။</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">မိမိ၏ အဆက်အသွယ်များကို ပြသရန် Molly က အဆက်အသွယ်များကို ရယူရန်လိုသည်။</string>
     <string name="contact_selection_list_fragment__show_contacts">အဆက်အသွယ်များကို ပြသပါ။</string>
 
     <!-- contact_selection_list_item -->
@@ -2745,6 +2867,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">ဤလူကို ဖယ်ရှားထားပါသည်၊ ထိုသူတို့ထံ မက်ဆေ့ချ်ပို့ခြင်းဖြင့် ထိုသူတို့ကို သင့်စာရင်းတွင် ပြန်လည်ပေါင်းထည့်ပေးသွားပါမည်။</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">ရွေးချယ်စရာများ</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">အပ်ဒိတ်လုပ်မည်</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">ဖွင့်မယ် … ခေတ္တရပ်မယ်</string>
@@ -2773,7 +2897,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Bubble များသည် Android အင်္ဂါရပ်တစ်ခုဖြစ်ပြီး Signal ချက်(တ်)များအတွက် သင် ပိတ်နိုင်ပါသည်။</string>
+    <string name="BubbleOptOutTooltip__description">Bubble များသည် Android အင်္ဂါရပ်တစ်ခုဖြစ်ပြီး Molly ချက်(တ်)များအတွက် သင် ပိတ်နိုင်ပါသည်။</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">ယခု မလုပ်ဆောင်သေးပါ။</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -2934,9 +3058,9 @@
     <string name="EditProfileFragment__group_description">အဖွဲ့ ဖော်ပြချက်</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Signal ကို အပ်ဒိတ်လုပ်ပါ။</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Molly ကို အပ်ဒိတ်လုပ်ပါ။</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">ဤ Signal ဗားရှင်းသည် သက်တမ်းကုန်သွားပါပြီ။ Signal ကို ဆက်လက်သုံးစွဲရန် ယခု အပ်ဒိတ်လုပ်ပေးပါ။</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">ဤ Molly ဗားရှင်းသည် သက်တမ်းကုန်သွားပါပြီ။ Molly ကို ဆက်လက်သုံးစွဲရန် ယခု အပ်ဒိတ်လုပ်ပေးပါ။</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">အပ်ဒိတ်မယ်</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3152,7 +3276,7 @@
     <string name="preferences__slow">အနှေး</string>
     <string name="preferences__help">အကူအညီ</string>
     <string name="preferences__advanced">အဆင့်မြင့်</string>
-    <string name="preferences__donate_to_signal">Signal ကို လှူဒါန်းရန်</string>
+    <string name="preferences__donate_to_signal">Molly ကို လှူဒါန်းရန်</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">ကိုယ်ရေးအချက်အလက်များ လုံခြုံမှု</string>
     <!-- Preference label for stories -->
@@ -3189,13 +3313,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">အက်ပ်အိုင်ကွန်နှင့် အမည်ကို \"%1$s\" ဟု ပြောင်းခြင်း</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">အက်ပ်အိုင်ကွန်နှင့် အမည်ကို ပြောင်းရန်အတွက် Signal ကို ပိတ်ရန် လိုအပ်ပါသည်။ အသိပေးချက်များတွင် ပုံသေ Signal အိုင်ကွန်နှင့် အမည်ကိုသာ အမြဲတမ်းပြသပါမည်။</string>
+    <string name="preferences__app_icon_dialog_description">အက်ပ်အိုင်ကွန်နှင့် အမည်ကို ပြောင်းရန်အတွက် Molly ကို ပိတ်ရန် လိုအပ်ပါသည်။ အသိပေးချက်များတွင် ပုံသေ Molly အိုင်ကွန်နှင့် အမည်ကိုသာ အမြဲတမ်းပြသပါမည်။</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">သင့်ဖုန်း၏ ပင်မမျက်နှာပြင်နှင့် အက်ပ်အံဆွဲတွင် မြင်တွေ့နိုင်မည့် အက်ပ်အိုင်ကွန်နှင့် အမည်တစ်ခုကို ရွေးချယ်ပါ။ အသိပေးချက်များတွင် ပုံသေ Signal အိုင်ကွန်နှင့် အမည်ကိုသာ အမြဲတမ်းပြသပါမည်။ ပိုမို လေ့လာရန်</string>
+    <string name="preferences__app_icon_warning_learn_more">သင့်ဖုန်း၏ ပင်မမျက်နှာပြင်နှင့် အက်ပ်အံဆွဲတွင် မြင်တွေ့နိုင်မည့် အက်ပ်အိုင်ကွန်နှင့် အမည်တစ်ခုကို ရွေးချယ်ပါ။ အသိပေးချက်များတွင် ပုံသေ Molly အိုင်ကွန်နှင့် အမည်ကိုသာ အမြဲတမ်းပြသပါမည်။ ပိုမို လေ့လာရန်</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">အက်ပ်အိုင်ကွန်များနှင့် အမည်များကို ပင်မမျက်နှာပြင်နှင့် အက်ပ်အံဆွဲတွင် မြင်တွေ့နိုင်ပါသည်။</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">အသိပေးချက်များတွင် ပုံသေ Signal အိုင်ကွန်နှင့် အမည်ကိုသာ အမြဲတမ်းပြသပါမည်။</string>
+    <string name="preferences__app_icon_notification_warning">အသိပေးချက်များတွင် ပုံသေ Molly အိုင်ကွန်နှင့် အမည်ကိုသာ အမြဲတမ်းပြသပါမည်။</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">ပိုမို လေ့လာရန်</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3241,8 +3365,12 @@
         <item quantity="other">၎င်းသည် ချက်(တ်)များအားလုံးကို နောက်ဆုံးမက်ဆေ့ချ် %1$s စောင်ထိ အပြီးအပိုင် ဖြတ်လိုက်ပါမည်။</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">သင့်စက်ရှိ မက်ဆေ့ချ်မှတ်တမ်းနှင့် မီဒီယာများအားလုံးကို အပြီးဖျက်သွားပါမည်။</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">၎င်းလုပ်ဆောင်ချက်သည် ဤစက်နှင့် အခြားချိတ်ထားသည့် စက်များပေါ်ရှိ မက်ဆေ့ချ်မှတ်တမ်းနှင့် မီဒီယာများ အားလုံးကို အပြီးဖျက်လိုက်ပါမည်။</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">မက်ဆေ့ချ်မှတ်တမ်းများ အားလုံးကို ဖျက်လိုသည်မှာ သေချာပါသလား။</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">မက်ဆေ့ချ်မှတ်တမ်းများ အားလုံးကို အပြီးဖယ်ရှားလိုက်ပါမည်။ ဤလုပ်ဆောင်ချက်ကို ပြန်ရုပ်သိမ်း၍ မရပါ။</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">မက်ဆေ့ချ်မှတ်တမ်းအားလုံးကို စက်အားလုံးမှ အပြီးတိုင် ဖယ်ရှားလိုက်ပါမည်။ ဤလုပ်ဆောင်ချက်ကို ပြန်ရုပ်သိမ်း၍ မရနိုင်ပါ။</string>
     <string name="preferences_storage__delete_all_now">အားလုံးကို ယခု ဖျက်ရန်</string>
     <string name="preferences_storage__forever">အမြဲတမ်း</string>
     <string name="preferences_storage__one_year">1 နှစ်</string>
@@ -3278,7 +3406,7 @@
     <string name="preferences_communication__category_censorship_circumvention">ဆင်ဆာရှောင်တိမ်းမှု</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">ဆင်ဆာရှောင်တိမ်းမှု</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">ဒါကိုဖွင့်ထားပါက signal အနေဖြင့် ပိတ်ထားခြင်းများကို ကျော်သွားရန်ကြိုးစားပါလိမ့်မည်။ Signal အားပိတ်ထားသောနေရာတွင်အသုံးပြုနေခြင်းမဟုတ်ပါက ဒါကိုသုံးရန်မလိုပါ။</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">ဒါကိုဖွင့်ထားပါက signal အနေဖြင့် ပိတ်ထားခြင်းများကို ကျော်သွားရန်ကြိုးစားပါလိမ့်မည်။ Molly အားပိတ်ထားသောနေရာတွင်အသုံးပြုနေခြင်းမဟုတ်ပါက ဒါကိုသုံးရန်မလိုပါ။</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">သင့်ကိုယ်ပိုင်စာရင်း ၏ဖုန်းနံပါတ်အပေါ် မူတည်၍ ဆင်ဆာဖြတ်တောက်မှုရှောင်ကွင်းခြင်းကို ပြုလုပ်ပြီး ဖြစ်သည်။</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3330,7 +3458,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">ငွေပေးချေမှုများကို မိတ်ဆက်ခြင်း</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Signal သုံး၍ လုံခြုံရေးအလေးပေး ဒစ်ဂျစ်တယ်ငွေကြေးအသစ် MobileCoin ကို ပေးပို့လက်ခံလိုက်ပါ။ စတင်သုံးရန် ဖွင့်ပါ။</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Molly သုံး၍ လုံခြုံရေးအလေးပေး ဒစ်ဂျစ်တယ်ငွေကြေးအသစ် MobileCoin ကို ပေးပို့လက်ခံလိုက်ပါ။ စတင်သုံးရန် ဖွင့်ပါ။</string>
     <string name="PaymentsHomeFragment__activate_payments">ငွေပေးချေမှုများ ဖွင့်မယ်</string>
     <string name="PaymentsHomeFragment__activating_payments">ငွေပေးချေမှုများ ဖွင့်နေသည်…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">ငွေပေးချမှုလုပ်သည့် အကောင့် ပြန်ရယူမယ်</string>
@@ -3356,7 +3484,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">သင့်ဒေသတွင်း ငွေပေးချေမှုများ မရရှိနိုင်ပါ။</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">ငွေပေးချေမှုများ မလုပ်ဆောင်နိုင်ပါ။ နောက်မှ ပြန်စမ်းကြည့်ပေးပါ။</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">ငွေပေးချေမှုများကို ပိတ်မည်လား?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">သင်မှ ငွေပေးချေမှုများ ပိတ်ထားလျှင် Signal ထဲတွင် သင်မှ MobileCoin ပေးပို့လက်ခံရန် မရနိုင်ပါ။</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">သင်မှ ငွေပေးချေမှုများ ပိတ်ထားလျှင် Molly ထဲတွင် သင်မှ MobileCoin ပေးပို့လက်ခံရန် မရနိုင်ပါ။</string>
     <string name="PaymentsHomeFragment__deactivate">ပိတ်မယ်</string>
     <string name="PaymentsHomeFragment__continue">ဆက်လုပ်ရန်</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">လက်ကျန်ငွေ လက်ရှိမရနိုင်ပါ။</string>
@@ -3365,10 +3493,10 @@
     <string name="PaymentsHomeFragment__details">အသေးစိတ်အချက်အလက်များ</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">MobileCoin ပေးပို့ရန်နှင့် လက်ခံရန် Signal ကို သင် သုံးနိုင်ပါသည်။ ငွေပေးချေမှုများအားလုံးသည် MobileCoins နှင့် MobileCoin Wallet အတွက် အသုံးပြုမှုစည်းကမ်းချက်များကို လိုက်နာရပါမည်။ ပြဿနာအချို့ကို သင် ကြုံတွေ့ရနိုင်ပြီး သင် ဆုံးရှုံးသွားသော ငွေပေးချေမှုများ သို့မဟုတ် လက်ကျန်ငွေများကို ပြန်လည်ရယူ၍မရနိုင်ပါ။ </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">MobileCoin ပေးပို့ရန်နှင့် လက်ခံရန် Molly ကို သင် သုံးနိုင်ပါသည်။ ငွေပေးချေမှုများအားလုံးသည် MobileCoins နှင့် MobileCoin Wallet အတွက် အသုံးပြုမှုစည်းကမ်းချက်များကို လိုက်နာရပါမည်။ ပြဿနာအချို့ကို သင် ကြုံတွေ့ရနိုင်ပြီး သင် ဆုံးရှုံးသွားသော ငွေပေးချေမှုများ သို့မဟုတ် လက်ကျန်ငွေများကို ပြန်လည်ရယူ၍မရနိုင်ပါ။ </string>
     <string name="PaymentsHomeFragment__activate">ဖွင့်မယ်</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoin ၏သတ်မှတ်ချက်များ ကြည့်ရှုမယ်</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Signal ထဲတွင် ငွေပေးချေမှုများ မလုပ်ဆောင်နိုင်တော့ပါ။ ငွေလဲလှယ်မှုတစ်ခုသို့ ငွေများလွှဲနိုင်ပါသည်၊ သို့သော် သင်မှ ငွေပေးချေမှုများ ပေးပို့လက်ခံလို့မရတော့ပါ၊​ ငွေလည်း ထည့်ပေါင်းလို့မရတော့ပါ။</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Molly ထဲတွင် ငွေပေးချေမှုများ မလုပ်ဆောင်နိုင်တော့ပါ။ ငွေလဲလှယ်မှုတစ်ခုသို့ ငွေများလွှဲနိုင်ပါသည်၊ သို့သော် သင်မှ ငွေပေးချေမှုများ ပေးပို့လက်ခံလို့မရတော့ပါ၊​ ငွေလည်း ထည့်ပေါင်းလို့မရတော့ပါ။</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3396,7 +3524,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">ခွင့်ပြုချက်များ ပေးရန်</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">သင် သိရှိသောသူများထံသို့ မက်ဆေ့ချ်ပို့ရန်အတွက် ကူညီပေးရန် Signal သည် ထိုခွင့်ပြုချက်များကို တောင်းခံပါမည်။ </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">သင် သိရှိသောသူများထံသို့ မက်ဆေ့ချ်ပို့ရန်အတွက် ကူညီပေးရန် Molly သည် ထိုခွင့်ပြုချက်များကို တောင်းခံပါမည်။ </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">အသိပေးချက်များ</string>
     <!-- Notifications permission row description -->
@@ -3485,9 +3613,9 @@
     <string name="PaymentsTransferFragment__invalid_address">အကြုံးမဝင်သော လိပ်စာ</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">သင်လွှဲပြောင်းရန် ကြိုးစားနေသည့် ပိုက်ဆံအိတ် wallet လိပ်စာ ကိုစစ်ပြီး ပြန်စမ်းကြည့်ပေးပါ။</string>
     <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">သင့်ပိုက်ဆံအိတ် wallet လိပ်စာသို့ သင်ကိုယ်တိုင် လွှဲလို့မရပါ။ သင့်အကောင့်မှ ပိုက်ဆံအိတ် wallet လိပ်စာ ကို ပံ့ပိုးသော ငွေလဲလှယ်မှုတစ်နေရာတွင် ရိုက်ထည့်ပေးပါ။</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR ကုဒ်ကို စကင်ဖတ်ရန် Signal မှ သင့် ကင်မရာသုံးခွင့် လိုအပ်ပါသည်။</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QR ကုဒ်ဖတ်ရန် Signal မှ သင့်ကင်မရာသုံးခွင့် လိုအပ်ပါသည်။ အပြင်အဆင်များ သို့သွား၍ \"ခွင့်ပြုချက်များ\" ကိုရွေးပါ၊ ပြီးလျှင် \"ကင်မရာ\" ကို ဖွင့်ပါ။</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR ကုဒ်ကို စကင်ဖတ်ရန် Signal မှ သင့် ကင်မရာသုံးခွင့် လိုအပ်ပါသည်။</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR ကုဒ်ကို စကင်ဖတ်ရန် Molly မှ သင့် ကင်မရာသုံးခွင့် လိုအပ်ပါသည်။</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QR ကုဒ်ဖတ်ရန် Molly မှ သင့်ကင်မရာသုံးခွင့် လိုအပ်ပါသည်။ အပြင်အဆင်များ သို့သွား၍ \"ခွင့်ပြုချက်များ\" ကိုရွေးပါ၊ ပြီးလျှင် \"ကင်မရာ\" ကို ဖွင့်ပါ။</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR ကုဒ်ကို စကင်ဖတ်ရန် Molly မှ သင့် ကင်မရာသုံးခွင့် လိုအပ်ပါသည်။</string>
     <string name="PaymentsTransferFragment__settings">အပြင်အဆင်များ</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3826,17 +3954,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Signal အော်ဒီယိုကောလ် အဝင်</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Molly အော်ဒီယိုကောလ် အဝင်</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Signal ဗီဒီယိုကောလ် အဝင်</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Molly ဗီဒီယိုကောလ် အဝင်</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Signal အဖွဲ့ကောလ် အဝင်</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Molly အဖွဲ့ကောလ် အဝင်</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Signal အော်ဒီယိုကောလ် အထွက်</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Molly အော်ဒီယိုကောလ် အထွက်</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Signal ဗီဒီယိုကောလ် အထွက်</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Molly ဗီဒီယိုကောလ် အထွက်</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Signal အဖွဲ့ကောလ် အထွက်</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Molly အဖွဲ့ကောလ် အထွက်</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">လုပ်ဆောင်နေသည်…</string>
@@ -3883,9 +4011,9 @@
     <string name="BackupDialog_verify">စစ်ဆေးအတည်ပြုသည်</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">သင်၏အရန်ကူးထားသောစကားဝှက်ကို အောင်မြင်စွာထည့်ပြီးပါပြီ</string>
     <string name="BackupDialog_passphrase_was_not_correct">စကားဝှက်သည်မမှန်ပါ</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signal ဘက်ခ်အပ် ဖန်တီးနေဆဲ…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Molly ဘက်ခ်အပ် ဖန်တီးနေဆဲ…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Signal ဘက်ခ်အပ် အတည်ပြုနေဆဲ…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Molly ဘက်ခ်အပ် အတည်ပြုနေဆဲ…</string>
     <string name="LocalBackupJobApi29_backup_failed">အရန်သိမ်းဆည်းမှုများ မအောင်မြင်ပါ</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">သင်၏ ဘက်ခ်အပ်လမ်းကြောင်းအား ဖျက်ထားသည် သို့မဟုတ် ရွှေ့ထားသည်။</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">သင်၏ အရန်သိမ်းဆည်းထားသောဖိုင်ကို သိမ်းဆည်းရန် အလွန်ကြီးမားသည်</string>
@@ -3900,15 +4028,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">(%1$02d:%2$02d) အကြာတွင် ဖုန်းခေါ်ရန်</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">ကုဒ် ပြန်ပို့ရန် (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Signal အကူအညီ ရယူမည်</string>
-    <string name="RegistrationActivity_code_support_subject">Signal မှတ်ပုံတင်ခြင်း Android အတွက် အတည်ပြုကုဒ်</string>
+    <string name="RegistrationActivity_contact_signal_support">Molly အကူအညီ ရယူမည်</string>
+    <string name="RegistrationActivity_code_support_subject">Molly မှတ်ပုံတင်ခြင်း Android အတွက် အတည်ပြုကုဒ်</string>
     <string name="RegistrationActivity_incorrect_code">ကုဒ် မှားနေပါသည်</string>
     <string name="BackupUtil_never">ဘယ်တော့မှ</string>
     <string name="BackupUtil_unknown">မသိ</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">ဖုန်းနံပါတ်</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">သင့်ဖုန်းနံပါတ်ကို မြင်နိုင်သူများနှင့် Signal တွင် ထိုနံပါတ်ဖြင့် သင့်ထံသို့ ဆက်သွယ်နိုင်သူများကို ရွေးချယ်ပါ။</string>
+    <string name="preferences_app_protection__choose_who_can_see">သင့်ဖုန်းနံပါတ်ကို မြင်နိုင်သူများနှင့် Molly တွင် ထိုနံပါတ်ဖြင့် သင့်ထံသို့ ဆက်သွယ်နိုင်သူများကို ရွေးချယ်ပါ။</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">ကျွန်ုပ်၏ ဖုန်းနံပါတ်ကို မြင်နိုင်သူများ</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -3956,7 +4084,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">သင်သည် အကြိမ်များစွာ ကြိုးစားပြီးပါပြီ၊ နောင်အခါမှ ပြန်လည်ကြိုးစားပါ။</string>
     <string name="RegistrationActivity_error_connecting_to_service">ဝန်ဆောင်မှုနှင့် ဆက်သွယ်ရာတွင် အခက်အခဲဖြစ်နေသည်</string>
     <string name="preferences_chats__backups">အရန်သိမ်းဆည်းမှုများ</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal လော့ကျနေပါသည်</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly လော့ကျနေပါသည်</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">လော့ခ်ဖြည်ရန် စကင်ရင်ကို နှိပ်ပါ</string>
     <string name="Recipient_unknown">အမျိုးအမည်မသိ</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -3987,9 +4115,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">သင့် စက်အဟောင်းအား အသုံးပြုခွင့် လိုအပ်ပါသည်။</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">နောက်ခံအရန်မှ ပြန်လည်ရယူမယ်</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">လိုကယ် နောက်ခံအရန်မှ သင့်မက်ဆေ့ချ်များ ပြန်လည်ရယူပါ။ ယခု ပြန်လည်မရယူလျှင် နောက်မှပြန်လည်မရယူနိုင်ပါ။</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">စက်အတွင်း ဘက်ခ်အပ် ပြုလုပ်ခြင်း</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signal ဘက်ခ်အပ်ကို ပြန်လည် ရယူခြင်း</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">သင်၏ စာသားမက်ဆေ့ခ်များ အားလုံး+ သင်၏ နောက်ဆုံး မီဒီယာ 30 ရက်ကို ပြန်ရယူပါ</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">နောက်ထပ် ရွေးစရာများ</string>
 
+    <string name="TransferOrRestoreFragment__cancel">မလုပ်တော့ပါ</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">လွှဲပြောင်းခြင်းမရှိဘဲ ဝင်ရောက်ခြင်း</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">သင့်မက်ဆေ့ချ်များနှင့် မီဒီယာများကို မလွှဲပြောင်းဘဲ ဆက်လက်လုပ်ဆောင်ပါ</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">သင့် Android ဖုန်းအဟောင်းပေါ်တွင် Signal ဖွင့်ပါ</string>
     <string name="NewDeviceTransferInstructions__continue">ဆက်လက်ရန်</string>
@@ -4004,19 +4139,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Android စက်အဟောင်းနှင့် ချိတ်ဆက်ရန် ပြင်ဆင်နေပါသည်…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">အချိန်ခဏယူနေပါသည်၊ မကြာမီရရှိပါမည်</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Android စက်အဟောင်းဖြင့် ချိတ်ရန် စောင့်နေပါသည်…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">သင့် Android စက်အဟောင်းဖြင့် ချိတ်ရန် Signal မှ တည်နေရာရှာဖွေခွင့် လိုအပ်ပါသည်။</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">သင့် Android စက်အဟောင်းဖြင့် ချိတ်ရန် Signal မှ တည်နေရာဝန်ဆောင်မှုများ ဖွင့်ထားရန် လိုအပ်ပါသည်။</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">သင့် Android စက်အဟောင်းအား ရှာဖွေချိတ်ဆက်ရန် Signal မှ ဝိုင်ဖိုင်ဖွင့်ထားခြင်း လိုအပ်ပါသည်။ ဝိုင်ဖိုင်ဖွင့်ထားရန်သာ လိုအပ်ပြီး ဝိုင်ဖိုင်လိုင်းပေါ်တက်ခြင်း မလိုအပ်ပါ။</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">တောင်းပန်ပါသည်၊ ကြည့်ရတာ ဤစက်သည် ဝိုင်ဖိုင်တိုက်ရိုက် ဝန်ဆောင်မှုအား မပံ့ပိုးပါ။ သင့် Android စက်အဟောင်းအား ရှာဖွေချိတ်ဆက်ရန် Signal မှ ဝိုင်ဖိုင်တိုက်ရိုက် အသုံးပြုရပါသည်။ သင့် Android စက်အဟောင်းမှ အကောင့်အား ပြန်လည်ရယူရန် နောက်ခံအရန်အား ပြန်လည်တည်ထောင်နိုင်ပါသည်။</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">သင့် Android စက်အဟောင်းဖြင့် ချိတ်ရန် Molly မှ တည်နေရာရှာဖွေခွင့် လိုအပ်ပါသည်။</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">သင့် Android စက်အဟောင်းဖြင့် ချိတ်ရန် Molly မှ တည်နေရာဝန်ဆောင်မှုများ ဖွင့်ထားရန် လိုအပ်ပါသည်။</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">သင့် Android စက်အဟောင်းအား ရှာဖွေချိတ်ဆက်ရန် Molly မှ ဝိုင်ဖိုင်ဖွင့်ထားခြင်း လိုအပ်ပါသည်။ ဝိုင်ဖိုင်ဖွင့်ထားရန်သာ လိုအပ်ပြီး ဝိုင်ဖိုင်လိုင်းပေါ်တက်ခြင်း မလိုအပ်ပါ။</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">တောင်းပန်ပါသည်၊ ကြည့်ရတာ ဤစက်သည် ဝိုင်ဖိုင်တိုက်ရိုက် ဝန်ဆောင်မှုအား မပံ့ပိုးပါ။ သင့် Android စက်အဟောင်းအား ရှာဖွေချိတ်ဆက်ရန် Molly မှ ဝိုင်ဖိုင်တိုက်ရိုက် အသုံးပြုရပါသည်။ သင့် Android စက်အဟောင်းမှ အကောင့်အား ပြန်လည်ရယူရန် နောက်ခံအရန်အား ပြန်လည်တည်ထောင်နိုင်ပါသည်။</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">နောက်ခံအရန်အား ပြန်လည်တည်ထောင်မယ်</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">သင့် Android စက်အဟောင်းဖြင့် ချိတ်ရန်ကြိုးစားနေစဥ် မမျှော်လင့်ထားသော ချို့ယွင်းချက်တစ်ခု ဖြစ်ခဲ့ပါသည်။</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Android စက်အသစ်အား ရှာဖွေနေပါသည်…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">သင့် Android စက်အသစ်ဖြင့် ချိတ်ရန် Signal မှ တည်နေရာအသုံးပြုရန်ခွင့် လိုအပ်ပါသည်။</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">သင့် Android စက်အသစ်ဖြင့် ချိတ်ရန် Signal မှ တည်နေရာဝန်ဆောင်မှုများ ဖွင့်ထားရန် လိုအပ်ပါသည်။</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">သင့် Android စက်အသစ်အား ရှာဖွေချိတ်ဆက်ရန် Signal မှ ဝိုင်ဖိုင်ဖွင့်ထားခြင်း လိုအပ်ပါသည်။ ဝိုင်ဖိုင်ဖွင့်ထားရန်သာ လိုအပ်ပြီး ဝိုင်ဖိုင်လိုင်းပေါ်တက်ခြင်း မလိုအပ်ပါ။</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">တောင်းပန်ပါသည်၊ ကြည့်ရတာ ဤစက်သည် ဝိုင်ဖိုင်တိုက်ရိုက် ဝန်ဆောင်မှုအား မပံ့ပိုးပါ။ သင့် Android စက်အသစ်အား ရှာဖွေချိတ်ဆက်ရန် Signal မှ ဝိုင်ဖိုင်တိုက်ရိုက် အသုံးပြုရပါသည်။ သင့် Android စက်အသစ်မှ အကောင့်အား ပြန်လည်ရယူရန် နောက်ခံအရန်အား တည်ထောင်နိုင်ပါသည်။</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">သင့် Android စက်အသစ်ဖြင့် ချိတ်ရန် Molly မှ တည်နေရာအသုံးပြုရန်ခွင့် လိုအပ်ပါသည်။</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">သင့် Android စက်အသစ်ဖြင့် ချိတ်ရန် Molly မှ တည်နေရာဝန်ဆောင်မှုများ ဖွင့်ထားရန် လိုအပ်ပါသည်။</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">သင့် Android စက်အသစ်အား ရှာဖွေချိတ်ဆက်ရန် Molly မှ ဝိုင်ဖိုင်ဖွင့်ထားခြင်း လိုအပ်ပါသည်။ ဝိုင်ဖိုင်ဖွင့်ထားရန်သာ လိုအပ်ပြီး ဝိုင်ဖိုင်လိုင်းပေါ်တက်ခြင်း မလိုအပ်ပါ။</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">တောင်းပန်ပါသည်၊ ကြည့်ရတာ ဤစက်သည် ဝိုင်ဖိုင်တိုက်ရိုက် ဝန်ဆောင်မှုအား မပံ့ပိုးပါ။ သင့် Android စက်အသစ်အား ရှာဖွေချိတ်ဆက်ရန် Molly မှ ဝိုင်ဖိုင်တိုက်ရိုက် အသုံးပြုရပါသည်။ သင့် Android စက်အသစ်မှ အကောင့်အား ပြန်လည်ရယူရန် နောက်ခံအရန်အား တည်ထောင်နိုင်ပါသည်။</string>
     <string name="OldDeviceTransferSetup__create_a_backup">နောက်ခံအရန်အား တည်ထောင်မယ်</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">သင့် Android စက်အသစ်ဖြင့် ချိတ်ရန်ကြိုးစားနေစဥ် မမျှော်လင့်ထားသော ချို့ယွင်းချက်တစ်ခု ဖြစ်ခဲ့ပါသည်။</string>
 
@@ -4057,7 +4192,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">ဒေတာများ လွှဲပြောင်းနေပါသည်</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">စက် ၂ ခုလုံးအား နီးကပ်စွာ ထားရှိပေးပါ။ စက်များမပိတ်၍ Signal အားဖွင့်ထားပါ။ လွှဲပြောင်းမှုများကို အစအဆုံး ကုဒ်ဖြင့်ပြောင်းလဲထားပါသည်။</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">စက် ၂ ခုလုံးအား နီးကပ်စွာ ထားရှိပေးပါ။ စက်များမပိတ်၍ Molly အားဖွင့်ထားပါ။ လွှဲပြောင်းမှုများကို အစအဆုံး ကုဒ်ဖြင့်ပြောင်းလဲထားပါသည်။</string>
     <string name="DeviceTransfer__d_messages_so_far">မက်ဆေ့ %1$d ခု လုပ်ဆောင်ပြီး…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">မက်ဆေ့ချ် %1$s%% စောင် ပြီးစီးပြီး…</string>
@@ -4071,7 +4206,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">အကောင့်ကို လွှဲပြောင်းမယ်</string>
     <string name="OldDeviceTransferInstructions__first_bullet">၁။</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">သင့် Android စက်အသစ်ပေါ်သို့ Signal ဒေါင်းလုပ်ဆွဲပါ</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">သင့် Android စက်အသစ်ပေါ်သို့ Molly ဒေါင်းလုပ်ဆွဲပါ</string>
     <string name="OldDeviceTransferInstructions__second_bullet">၂။</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"\"အကောင့် လွှဲပြောင်းမယ် သို့ ပြန်လည်ရယူမယ်\" ကိုနှိပ်ပါ"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">၃။</string>
@@ -4145,7 +4280,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">၎င်းလင့်ခ်ဖြင့် မည်သူမဆို အဖွဲ့၏အမည်နှင့်ဓာတ်ပုံကိုကြည့်ပြီး အဖွဲ့ထဲဝင်ရန် တောင်းဆိုနိုင်သည်။ သင်ယုံကြည်ရသောလူများနှင့် မျှဝေပါ။</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">ဤလင့်ခ်ဖြင့် မည်သူမဆို အဖွဲ့၏ အမည်နှင့်ဓာတ်ပုံကိုကြည့်ပြီး အဖွဲ့ထဲဝင်ရောက်နိုင်သည်။ သင်ယုံကြည်ရသောလူများနှင့်မျှဝေပါ။</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Signal မှတဆင့်မျှဝေမည်</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Molly မှတဆင့်မျှဝေမည်</string>
     <string name="GroupLinkBottomSheet_copy">ကူးမည်</string>
     <string name="GroupLinkBottomSheet_qr_code">QR ကုဒ်</string>
     <string name="GroupLinkBottomSheet_share">ဝေမျှမည်</string>
@@ -4324,7 +4459,7 @@
     <string name="payment_info_card_about_mobilecoin">MobileCoin အကြောင်း</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin သည် လုံခြုံရေးအလေးပေး ဒစ်ဂျစ်တယ်ငွေကြေးအသစ် ဖြစ်ပါသည်။</string>
     <string name="payment_info_card_adding_funds">ငွေဖြည့်နေသည်</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">သင့် ပိုက်ဆံအိတ် wallet လိပ်စာသို့ MobileCoin ပို့၍ Signal တွင် သုံးရန် ငွေဖြည့်နိုင်ပါသည်။</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">သင့် ပိုက်ဆံအိတ် wallet လိပ်စာသို့ MobileCoin ပို့၍ Molly တွင် သုံးရန် ငွေဖြည့်နိုင်ပါသည်။</string>
     <string name="payment_info_card_cashing_out">ငွေထုတ်ယူခြင်း</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">မည်သည့်အချိတ်မဆို MobileCoin ပံ့ပိုးသော ငွေလဲလှယ်သည့်နေရာတွင် MobileCoin ငွေထုတ်ယူလို့ရပါသည်။ ၎င်းငွေလဲလှယ်သည့်နေရာတွင် သင့်အကောင့်သို့ လွှဲလိုက်ပါ။</string>
     <string name="payment_info_card_hide_this_card">၎င်းကဒ်ကို ပုန်းမည်လား?</string>
@@ -4345,12 +4480,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">ပိုက်ဆံအိတ် Wallet ကို ပိတ်မယ်</string>
     <string name="DeactivateWalletFragment__your_balance">သင့်လက်ကျန်ငွေ</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">ပိုက်ဆံအိတ် Wallet ကို မပိတ်မီ အခြား ပိုက်ဆံအိတ် Wallet သို့ သင့်ငွေများကို လွှဲထားရန် အကြံပြုပါသည်။ ယခု မလွှဲထားလျှင် သင်မှ ငွေပေးချေမှုများ ပြန်ဖွင်ခဲ့သည့်အချိန်တွင် ၎င်းငွေများသည် Signal နှင့်ချိတ်ထားသော ပိုက်ဆံအိတ် Wallet တွင်ကျန်ရှိနေပါမည်။</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">ပိုက်ဆံအိတ် Wallet ကို မပိတ်မီ အခြား ပိုက်ဆံအိတ် Wallet သို့ သင့်ငွေများကို လွှဲထားရန် အကြံပြုပါသည်။ ယခု မလွှဲထားလျှင် သင်မှ ငွေပေးချေမှုများ ပြန်ဖွင်ခဲ့သည့်အချိန်တွင် ၎င်းငွေများသည် Molly နှင့်ချိတ်ထားသော ပိုက်ဆံအိတ် Wallet တွင်ကျန်ရှိနေပါမည်။</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">ကျန်ရှိသောလက်ကျန်ငွေကို လွှဲပြောင်းမယ်</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">မလွှဲဘဲ ပိတ်ပါမယ်</string>
     <string name="DeactivateWalletFragment__deactivate">ပိတ်မယ်</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">မလွှဲဘဲ ပိတ်မည်လား?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">သင်မှ ငွေပေးချေမှုများကို ပြန်ဖွင့်ခဲ့လျှင် သင့် လက်ကျန်ငွေသည် Signal နှင့် ချိတ်ထားသော သင့်ပိုက်ဆံအိတ် wallet ထဲတွင် ကျန်ရှိနေပါမည်။</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">သင်မှ ငွေပေးချေမှုများကို ပြန်ဖွင့်ခဲ့လျှင် သင့် လက်ကျန်ငွေသည် Molly နှင့် ချိတ်ထားသော သင့်ပိုက်ဆံအိတ် wallet ထဲတွင် ကျန်ရှိနေပါမည်။</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">ပိုက်ဆံအိတ် wallet ပိတ်ခြင်းတွင် ပျက်ကွက်မှုဖြစ်</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4643,7 +4778,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">လိုင်စင်များ</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">လိုက်နာဆောင်ရွက်ရမည့် အချက်များ</string>
-    <string name="HelpFragment__copyright_signal_messenger">မူပိုင်ခွင့် Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">မူပိုင်ခွင့် Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">GNU AGPLv3 အတိုင်း ခွင့်ပြုထားသည်</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4658,7 +4793,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">အော်တို</string>
+    <string name="ChatColorSelectionFragment__auto">အောတို</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">စိတ်ကြိုက် အရောင်များ သုံးရန်</string>
     <string name="ChatColorSelectionFragment__chat_color">ချက်(တ်)အရောင်</string>
     <string name="ChatColorSelectionFragment__edit">ပြင်မယ်</string>
@@ -4881,9 +5016,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">အရောင် ရွေးရန်</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">ဝေမျှမယ်</string>
 
@@ -4913,7 +5045,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">အက်ဒ်မင်များသာလျှင် ဤအဖွဲ့သို့ မက်ဆေ့ချ်များ ပို့နိုင်ပါသည်။</string>
-    <string name="MultiselectForwardFragment__limit_reached">ကန့်သတ်ချက် ပြည့်သွားပါပြီ</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">ချက်(တ်) ၅ ခုထက် ပိုရွေး၍မရပါ</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5088,9 +5221,9 @@
     <string name="MySupportPreference__learn_more">ပိုမိုလေ့လာရန်</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Signal ကို အပ်ဒိတ်လုပ်ပါ။</string>
+    <string name="UpdateSignalExpiredDialog__title">Molly ကို အပ်ဒိတ်လုပ်ပါ။</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">ဤ Signal ဗားရှင်းသည် သက်တမ်းကုန်သွားပါပြီ။ Signal ကို ဆက်လက်သုံးစွဲရန် ယခု အပ်ဒိတ်လုပ်ပေးပါ။</string>
+    <string name="UpdateSignalExpiredDialog__message">ဤ Molly ဗားရှင်းသည် သက်တမ်းကုန်သွားပါပြီ။ Molly ကို ဆက်လက်သုံးစွဲရန် ယခု အပ်ဒိတ်လုပ်ပေးပါ။</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">အပ်ဒိတ်မယ်</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5099,7 +5232,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">စက်ကို မှတ်ပုံမတင်ထားပါ</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">ဤစက်ကို မှတ်ပုံတင်ထားခြင်း မရှိတော့ပါ။ ဤစက်တွင် Signal ဆက်သုံးရန် ပြန်လည်၍မှတ်ပုံတင်ပါ။</string>
+    <string name="ReregisterSignalDialog__message">ဤစက်ကို မှတ်ပုံတင်ထားခြင်း မရှိတော့ပါ။ ဤစက်တွင် Molly ဆက်သုံးရန် ပြန်လည်၍မှတ်ပုံတင်ပါ။</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">ပြန်လည်၍မှတ်ပုံတင်ခြင်းပြုလုပ်မည်</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5393,7 +5526,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">ရွေးချယ်ထားသည်ကို ဖွင့်ရန် မအောင်မြင်ပါ။</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">အသိပေးချက်များကို ဖွင့်ရန်အတွက် Signal သည် ၎င်းတို့ကို ပြသရန် ခွင့်ပြုချက် လိုအပ်ပါသည်။</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">အသိပေးချက်များကို ဖွင့်ရန်အတွက် Molly သည် ၎င်းတို့ကို ပြသရန် ခွင့်ပြုချက် လိုအပ်ပါသည်။</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">ဖွင့်မည်</string>
 
@@ -5539,8 +5672,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">ပြန်စာများ မရှိသေးပါ</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">သင်သည် ဤအဖွဲ့ဝင် မဟုတ်တော့သောကြောင့် ဤစတိုရီကို စာပြန်နိုင်တော့မည် မဟုတ်ပါ။</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">စတိုရီကို တုံ့ပြန်မှု ပေးခဲ့ပါသည်</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">စတိုရီကို တုံ့ပြန်မှု ပေးခဲ့ပါသည်</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">စတိုရီကို တုံ့ပြန်မှု ပေးခဲ့ပါသည်</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">ကြည့်ရှုမှုများ</string>
     <!-- Label for story replies tab -->
@@ -6140,8 +6275,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">သင့်ဘဏ်ကို ရွေးချယ်ပါ</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">%1$s ဖြင့် သင်၏ လှူဒါန်းမှုကို အတည်ပြုပါ</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">သင်၏ ထပ်တလဲလဲလှူဒါန်းမှုကို သတ်မှတ်ရန်အတွက် သင့်ဘဏ်တွင် €0,01 ကောက်ခံမှုကို အတည်ပြုရန် ဆက်လုပ်မည်ကို နှိပ်ပါ။ ၎င်းကို အလိုအလျောက် ပြန်အမ်းပေးမည်ဖြစ်ပြီး သင်၏ တစ်လလျှင် €5 လှူဒါန်းမှုကို သင့်အကောင့်မှ ထုတ်ယူခွင့်ပြုပါမည်။</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">သင်၏ ထပ်တလဲလဲလှူဒါန်းမှုကို သတ်မှတ်ရန်အတွက် သင့်ဘဏ်တွင် €0,01 ကောက်ခံမှုကို အတည်ပြုရန် ဆက်လုပ်မည်ကို နှိပ်ပါ။ ၎င်းသည် အလိုအလျောက် ပြန်အမ်းပေးမည်ဖြစ်ပြီး သင်၏ တစ်လလျှင် %1$s လှူဒါန်းမှုကို သင့်အကောင့်မှ ငွေထုတ်ခွင့်ပြုပါမည်။</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">ဆက်လုပ်ရန်</string>
 
@@ -6710,6 +6845,50 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">ဘက်ခ်အပ် ဒေတာများကို ဒေါင်းလုဒ်လုပ်နေသည်…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">မီဒီယာဘက်ခ်အပ်များကို ပိတ်ထားသည်</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="other">သင့်ငွေပေးချေမှုကို ကျွန်ုပ်တို့ မလုပ်ဆောင်နိုင်ခဲ့သောကြောင့် သင်၏ Signal မီဒီယာ ဘက်ခ်အပ်အစီအစဉ်ကို ပယ်ဖျက်လိုက်ပါသည်။ သင့်ဘက်ခ်အပ်တွင် သိမ်းဆည်းထားသည့် မည်သည့်မီဒီယာကိုမဆို ဒေါင်းလုဒ်လုပ်ရန် သင့်တွင် အချိန် %1$d ရက်ရှိသည်။ %1$d ရက်ကြာပြီးနောက် သင်၏ ဘက်ခ်အပ်လုပ်ထားသောမီဒီယာကို ဖျက်လိုက်ပါမည်။</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">သင်၏မီဒီယာအားလုံးကို ဆက်လက်ဘက်ခ်အပ်လုပ်ရန် ဘက်ခ်အပ်လုပ်ခြင်းများအတွက် အချိန်မရွေး ထပ်မံငွေပေးချေနိုင်ပါသည်။ </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">သင်၏မီဒီယာကို ယနေ့ ဖျက်လိုက်ပါမည်</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">သင့်ငွေပေးချေမှုကို ကျွန်ုပ်တို့ မလုပ်ဆောင်နိုင်ခဲ့သောကြောင့် သင်၏ Signal မီဒီယာ ဘက်ခ်အပ်အစီအစဉ်ကို ပယ်ဖျက်လိုက်ပါသည်။ မဖျက်မီ ဘက်ခ်အပ်လုပ်ထားသော မီဒီယာကို ဒေါင်းလုဒ်လုပ်ရန်အတွက် နောက်ဆုံးအခွင့်အရေးဖြစ်သည်။</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">ဒေါင်းလုဒ်ကို အပြီးမသတ်နိုင်ပါ</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">သင့်စက်တွင် နေရာလွတ် အလုံအလောက်မရှိပါ။ သင့် ဘက်ခ်အပ်တွင် သိမ်းထားသောမီဒီယာကို ဒေါင်းလုဒ်လုပ်ရန် %1$s အထိ နေရာလွတ် ထွက်လာအောင် ရှင်းထုတ်ပါ။</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="other">\"ကျော်မည်\" ကို ရွေးချယ်ပါက သင်ဘက်ခ်အပ်လုပ်ထားသော မီဒီယာကို %1$d ရက်အတွင်း ဖျက်ပစ်ပါမည်။</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">ဘက်ခ်အပ်အတွက် ငွေပေးချေမှုကို လုပ်ဆောင်၍မရပါ</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">သင်၏ ဘက်ခ်အပ်အတွက် လစဉ်ငွေပေးချေမှုကို ကောက်ခံရာတွင် ပြဿနာရှိနေပါသည်။ သင်၏ ငွေပေးချေမှုနည်းလမ်းသည် အပ်ဒိတ်ဖြစ်ကြောင်း သေချာပါစေ။ မဖြစ်ပါက Google Pay တွင် အပ်ဒိတ်လုပ်ပါ။ Signal က ရက်အနည်းငယ်အကြာတွင် ငွေပေးချေမှုကို ထပ်မံစီမံလုပ်ဆောင်ရန် ကြိုးစားပါမည်။</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">ဘက်ခ်အပ်လုပ်ခြင်းကို အပြီးသတ်၍မရပါ။</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">သင့်စက်သည် ဘက်ခ်အပ်လုပ်ခြင်း မပြီးမြောက်သည်မှာ %1$d ရက်ရှိပြီဖြစ်သည်။ သင့်စက်ပစ္စည်းကို wi-fi နှင့် ချိတ်ဆက်ထားကြောင်း သေချာစေပြီး \"ယခု ဘက်ခ်အပ်လုပ်မည်\" ကိုနှိပ်ပါ။ </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">ပိုမိုလေ့လာရန်</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">ကျော်မည်</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">မီဒီယာကို ယခုဒေါင်းလုဒ်လုပ်ပါ</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">နောက်မှ ဒေါင်းလုဒ်လုပ်ပါ</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">မီဒီယာကို ဒေါင်းလုဒ်မလုပ်ပါနှင့်</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">သင့်မီဒီယာကို ဒေါင်းလုဒ်လုပ်ရန် နေရာလွတ် %1$s ထွက်လာအောင် ရှင်းထုတ်ပါ။</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">ခရက်ဒစ် သို့မဟုတ် ဒက်ဘစ်ကတ်</string>
@@ -6723,16 +6902,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">မသိရှိ</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">ငွေပေးချေမှုမှတ်တမ်း</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">သင်၏နောက်ဆုံး ဘက်ခ်အပ်ကို %1$s တွင် %2$s အချိန်က ပြုလုပ်ခဲ့သည်။</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">ချက်(တ်)ကန့်သတ်ချက်များ</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">ချက်(တ်) ကန့်သတ်ချက်များ</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">မက်ဆေ့ချ်မှတ်တမ်းကို ဖျက်မည်</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">ရွေးထားသည့်အချိန်ထက် ပိုကြာသော မက်ဆေ့ချ်များကို အပြီးတိုင်ဖျက်လိုက်ပါမည်။</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">ရွေးထားသည့်အတိုင်းအတာထက် ပိုရှည်သော မက်ဆေ့ချ်များကို အပြီးတိုင် ဖျက်လိုက်ပါမည်။</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">လင့်ခ်ချိတ်ထားသော စက်များအား ကန့်သတ်ချက်များချမှတ်ရန်</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">ကန့်သတ်ချက်များ ချမှတ်ထားသည့်အခါ ချက်(တ်)ကန့်သတ်ချက်များသည် သင် ချိတ်ထားသောစက်များမှ မက်ဆေ့ချ်များကို ဖျက်ပစ်မည်ဖြစ်သည်။</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">ယခုအခါ သင့်စက်များအားလုံးတွင် ချိန်ကိုက်ပြီး ဖျက်နေပါပြီ</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">သင် မက်ဆေ့ချ်များ သို့မဟုတ် ချက်(တ်)များကို ဖျက်လိုက်သောအခါ ထိုမက်ဆေ့ချ်များသည် သင့်ဖုန်းနှင့် ချိတ်ထားသည့် စက်များအားလုံးမှ ပျက်သွားပါမည်။</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">အိုကေ</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">ငွေပေးချေမှုမှတ်တမ်း</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">စာတိုနှင့် မီဒီယာအားလုံးဘက်ခ်အပ်</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">ငွေပေးချေမှု အသေးစိတ်</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">ဘက်ခ်အပ် အမျိုးအစား</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">ပေးချေသည့် ရက်စွဲ</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">ဝေမျှမည်</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal ဘက်ခ်အပ်</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">ငွေပေးချေမှုမှတ်တမ်း</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">ဘက်ခ်အပ် အသေးစိတ်</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">ဘက်ခ်အပ် အရွယ်အစား</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">ဘက်ခ်အပ် အကြိမ်ရေ</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">ဆယ်လူလာသုံး၍ ဘက်ခ်အပ်လုပ်ပါ</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">ပိတ်ပြီး ဘက်ခ်အပ်ကို ဖျက်ပါ</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">ဘက်ခ်အပ်ကို ဖျက်ပြီး ပိတ်ထားလိုက်ပြီ။</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">ဘက်ခ်အပ်အမျိုးအစားပြောင်းပြီး ပုံမှန်လှူဒါန်းငွေကို ပယ်ဖျက်လိုက်ပါပြီ</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">ပုံမှန်လှူဒါန်းငွေကို ပယ်ဖျက်လိုက်ပါပြီ</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">ဒေါင်းလုဒ် ပြီးပါပြီ</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">ဘက်ခ်အပ် အမျိုးအစား</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">ဘက်ခ်အပ် ပိတ်ထားသည်</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s အတွက် တစ်လလျှင် · %2$s</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">ဘက်ခ်အပ် လုပ်ဆောင်မည်</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">နောက်ဆုံး ဘက်ခ်အပ်</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">ဘယ်တော့မှ</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">ဘက်ခ်အပ် အခုလုပ်မည်</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">ဘက်ခ်အပ်များကို ပိတ်ပြီး ဖျက်မလား။</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">ထပ်မံငွေကောက်ခံမည် မဟုတ်ပါ။ သင်၏ ဘက်ခ်အပ်ကို ဖျက်လိုက်မည်ဖြစ်ပြီး ဘက်ခ်အပ်အသစ်များကို ဖန်တီးမည်မဟုတ်ပါ။</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">ပိတ်ပြီး ဖျက်ရန်</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">ဘက်ခ်အပ်ကို ဖျက်နေသည်….</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">ဘက်ခ်အပ်ကို ဖျက်လိုက်ပါပြီ</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"ယခု ဘက်ခ်အပ်လုပ်မည်ကို တို့ထိခြင်းဖြင့်"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">နေ့စဉ်</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">အပတ်စဉ်</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">လစဉ်</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">လူကိုယ်တိုင် ဘက်ခ်အပ်</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">သင့်စက်၏ ပင်နံပါတ်၊ စကားဝှက် သို့မဟုတ် ပုံစံကို ထည့်ပါ။</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">ဆက်သွားမည်</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">ဘက်ခ်အပ် အမျိုးအစားပြောင်းမည်</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">ပုံမှန်လှူဒါန်းငွေကို ပယ်ဖျက်ရန်</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">ပယ်ဖျက်မှုကို အတည်ပြုမည်</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">ထပ်မံ ငွေကောက်ခံမည်မဟုတ်ပါ။ သင့်ငွေပေးချေမှု စက်ဝန်းအဆုံးတွင် ဘက်ခ်အပ်များကို ပိတ်သွားပါမည်။ ထိုရက်စွဲပြီးနောက် သင်လက်ရှိ ဘက်ခ်အပ်လုပ်နေသော မီဒီယာကို ဒေါင်းလုဒ်လုပ်ရန် ရက်ပေါင်း ၃၀ အချိန်ရပါမည်။</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">အတည်ပြုပြီး ယခုဒေါင်းလုဒ်လုပ်မည်</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">အတည်ပြုပြီး နောက်မှဒေါင်းလုဒ်လုပ်မည်</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">ပုံမှန်ငွေလှူဒါန်းမှုကို ဆက်လက်ပြုလုပ်မည်</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index a0854c55bb..3ebb047472 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal oppdateres…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly oppdateres…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Du har ikke angitt en passordfrase ennå!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Deaktiver passordfrase?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Dette vil låse opp Signal og meldingsvarsler permanent.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Dette vil låse opp Molly og meldingsvarsler permanent.</string>
     <string name="ApplicationPreferencesActivity_disable">Deaktiver</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Feil ved tilkobling til server!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN-koder er påkrevet for registreringslås. For å deaktivere PIN-koder, vær vennlig å deaktivere registreringslås.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Fil</string>
     <string name="AttachmentKeyboard_contact">Kontakt</string>
     <string name="AttachmentKeyboard_location">Posisjon</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal trenger tillatelse til å vise bildene og videoene dine</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly trenger tillatelse til å vise bildene og videoene dine</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Tillat Tilgang</string>
     <string name="AttachmentKeyboard_payment">Betaling</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Finner ikke en app for å velge medier.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal krever tillatelse fra systemet for å kunne legge til bilder, videoer eller lyd, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Lagring».</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal krever tillatelse fra systemet for å kunne legge til kontaktinformasjon, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Kontakter».</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal krever tillatelse fra systemet for å kunne legge til posisjonsdata, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Posisjon».</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly krever tillatelse fra systemet for å kunne legge til bilder, videoer eller lyd, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Lagring».</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly krever tillatelse fra systemet for å kunne legge til kontaktinformasjon, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Kontakter».</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly krever tillatelse fra systemet for å kunne legge til posisjonsdata, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Posisjon».</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Gi stedstilgang</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Slik sender du posisjonen din:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Gi Signal tilgang til posisjonen din.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Gi Molly tilgang til posisjonen din.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Du må gi Signal stedstilgang for å sende posisjonen din.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Du må gi Molly stedstilgang for å sende posisjonen din.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Gi tilgang til lagring</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Gjør dette for å se bilder og videoer:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal trenger tilgang til lagringsplassen på enheten for å vise bildene og videoene dine.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly trenger tilgang til lagringsplassen på enheten for å vise bildene og videoene dine.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s har ikke aktivert betalinger </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Bytt kamera</string>
     <string name="CameraXFragment_open_gallery_description">Åpne galleri</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Tillat Tilgang</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Gi tilgang til kameraet og mikrofonen</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Gi tilgang til kameraet</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Gi tilgang til mikrofonen</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Gi Signal tilgang til kameraet for å ta bilder.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Du må gi Signal «Kamera»-tillatelse på systemet for å kunne filme og ta bilder.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Gi Signal tilgang til kameraet og mikrofonen for å ta bilder og spille inn videoer.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Gi Signal tilgang til mikrofonen for å spille inn videoer med lyd.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Gi Signal tilgang til kameraet for å skanne QR-koder.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Du må gi Signal tilgang til kameraet for å ta bilder</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Du må gi Signal tilgang til kameraet for å skanne QR-koder</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Du må gi Signal tilgang til mikrofonen for å spille inn videoer</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Slik tar du bilder i Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Slik tar du bilder og spiller inn videoer i Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Slik spiller du inn videoer med lyd:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Slik skanner du QR-koder:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Nylige kontakter</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Ingen Signal-kontakter</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Du kan bare bruke kameraknappen til å sende bilder til Signal-kontakter. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Finner du ikke den du leter etter?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Inviter en kontakt for å bli med i Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Inviter en kontakt for å bli med i Molly</string>
     <string name="CameraContacts__menu_search">Søk</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Nei takk</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Oppdater Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Oppdater Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Denne versjonen av appen støttes ikke lenger. For å fortsette å sende og motta meldinger, oppdater til den nyeste versjonen.</string>
     <string name="ClientDeprecatedActivity_update">Oppdater</string>
     <string name="ClientDeprecatedActivity_dont_update">Ikke oppdater</string>
     <string name="ClientDeprecatedActivity_warning">Advarsel</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Versjonen din av Signal er utløpt. Du kan se meldingsloggen din, men du kan ikke sende eller motta meldinger før du oppdaterer.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Versjonen din av Molly er utløpt. Du kan se meldingsloggen din, men du kan ikke sende eller motta meldinger før du oppdaterer.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Ingen nettleser funnet.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Melding %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Lydsamtale i Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Videosamtale i Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal-melding</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Send melding</string>
-    <string name="ConversationActivity_lets_switch_to_signal">La oss bytte til Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">La oss bytte til Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Velg en kontakt</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Vedlegg overskrider maksimal størrelsesgrense for gjeldende meldingstype.</string>
     <string name="ConversationActivity_unable_to_record_audio">Kan ikke ta opp lyd!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Slik sender du talemeldinger:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">For å sende talemeldinger må du gi Signal tilgang til mikrofonen din.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">For å sende talemeldinger må du gi Molly tilgang til mikrofonen din.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Du må gi Signal tilgang til mikrofonen for å ta opp talemeldinger.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal krever tillatelse fra systemet for å kunne bruke mikrofonen, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Mikrofon».</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Du må gi Molly tilgang til mikrofonen for å ta opp talemeldinger.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly krever tillatelse fra systemet for å kunne bruke mikrofonen, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Mikrofon».</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal krever tillatelser fra systemet for å kunne ringe %1$s, men du har valgt å avslå minst én av disse permanent. Gå til «Apper»-menyen på systemet og slå på tillatelser for «Mikrofon» og «Kamera».</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Du må gi Signal «Kamera»-tillatelse på systemet for å kunne filme og ta bilder.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal krever tillatelse fra systemet for å kunne ta bilder eller filme, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Kamera».</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Du må gi Signal «Kamera»-tillatelse på systemet for å kunne filme og ta bilder.</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly krever tillatelser fra systemet for å kunne ringe %1$s, men du har valgt å avslå minst én av disse permanent. Gå til «Apper»-menyen på systemet og slå på tillatelser for «Mikrofon» og «Kamera».</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Du må gi Molly «Kamera»-tillatelse på systemet for å kunne filme og ta bilder.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly krever tillatelse fra systemet for å kunne ta bilder eller filme, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Kamera».</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Du må gi Molly «Kamera»-tillatelse på systemet for å kunne filme og ta bilder.</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Aktiver mikrofonens tillatelse til å ta opp videoer med lyd.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal trenger mikrofontillatelser for å spille inn videoer, men de har blitt nektet. Vennligst fortsett til appinnstillingene, velg \"Tillatelser\" og aktiver \"Mikrofon\" og \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal trenger mikrofontillatelser for å spille inn videoer.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly trenger mikrofontillatelser for å spille inn videoer, men de har blitt nektet. Vennligst fortsett til appinnstillingene, velg \"Tillatelser\" og aktiver \"Mikrofon\" og \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly trenger mikrofontillatelser for å spille inn videoer.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Nei</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Slik starter du en samtale:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Gi Signal tilgang til mikrofonen din for å starte en samtale.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Gi Molly tilgang til mikrofonen din for å starte en samtale.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Du må gi Signal tilgang til mikrofonen for å starte en samtale.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Du må gi Molly tilgang til mikrofonen for å starte en samtale.</string>
 
 
     <string name="ConversationActivity_join">Bli med</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">SMS-meldinger støttes ikke lenger i Signal. Inviter %1$s til Signal for å fortsette samtalen her.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Denne personen bruker ikke Signal lenger. Inviter hen til Signal for å fortsette samtalen her.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Denne personen bruker ikke Molly lenger. Inviter hen til Molly for å fortsette samtalen her.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Inviter til Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Inviter til Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Du vil få en påminnelse igjen snart.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Slett for alle</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Slett på denne enheten</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Slett</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Slett overalt</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Denne meldingen slettes for alle i samtalen dersom de er på en ny versjon av Signal. De vil kunne se at du har slettet en melding.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Blokkert</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Oppdater Signal</string>
+    <string name="ConversationFragment__update_build">Oppdater Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Registrer deg for Signal på nytt</string>
+    <string name="ConversationFragment__reregister_signal">Registrer deg for Molly på nytt</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Gå tilbake.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Åpne Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Åpne Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Ikke lenger bekreftet</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Den valgte samtalen slettes for godt.</item>
         <item quantity="other">De %1$d valgte samtalene slettes for godt.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Den valgte samtalen slettes permanent fra alle enhetene dine.</item>
+        <item quantity="other">De %1$d valgte samtalene slettes permanent fra alle enhetene dine.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Sletter</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Sletter samtalen …</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Hvem kan søke meg opp med telefonnummeret mitt?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Alle som søker opp telefonnummeret ditt, kan se at du bruker Signal og kan starte samtaler med deg.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Alle som søker opp telefonnummeret ditt, kan se at du bruker Molly og kan starte samtaler med deg.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ingen kan se at du er på Signal med mindre du sender dem en melding, eller hvis dere allerede har en samtale gående.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ingen kan se at du er på Molly med mindre du sender dem en melding, eller hvis dere allerede har en samtale gående.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Vil du gjenopprette fra sikkerhetskopi?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Test passordfrasen din og bekreft at den stemmer overens</string>
     <string name="BackupsPreferenceFragment__turn_on">Slå på</string>
     <string name="BackupsPreferenceFragment__turn_off">Skru av</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"For å gjenopprette fra en sikkerhetskopi, installer en ny kopi av Signal. Åpne appen og trykk \"Gjenopprett fra sikkerhetskopi\", og finn så frem til en sikkerhetskopifil. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"For å gjenopprette fra en sikkerhetskopi, installer en ny kopi av Molly. Åpne appen og trykk \"Gjenopprett fra sikkerhetskopi\", og finn så frem til en sikkerhetskopifil. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Lær mer</string>
     <string name="BackupsPreferenceFragment__in_progress">Under behandling…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d så langt…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% på vei …</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal krever tillatelse fra systemet for å kunne lagre sikkerhetskopier, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Lagring».</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly krever tillatelse fra systemet for å kunne lagre sikkerhetskopier, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Lagring».</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Velg tidspunkt for sikkerhetskopiering</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Samtaleøkt lastet inn på nytt</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal benytter seg av ende-til-ende-kryptering og det kan av og til være nødvendig å laste inn samtaleøkten din på nytt. Dette påvirker ikke din samtales sikkerhet, men du kan ha gått glipp av en melding fra din samtalepartner og må be dem om å sende den på nytt.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly benytter seg av ende-til-ende-kryptering og det kan av og til være nødvendig å laste inn samtaleøkten din på nytt. Dette påvirker ikke din samtales sikkerhet, men du kan ha gått glipp av en melding fra din samtalepartner og må be dem om å sende den på nytt.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Bruk Signal på datamaskin eller iPad. Meldingene dine synkroniseres med de tilkoblede enhetene dine.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Koble til ny enhet</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Meldinger og samtaleinnhold beskyttes av ende-til-ende-kryptering på alle enheter</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal på datamaskin eller iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Alle meldingene på de tilkoblede enhetene er private</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">De nye Molly-meldingene dine blir synkronisert med Molly på mobilen din etter tilkoblingen. Den gamle meldingsloggen din vises ikke.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Gå til %1$s på den andre enheten for å installere Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Mine tilkoblede enheter</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Koble fra</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s ble koblet fra</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Kobler til enheten …</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Enhet godkjent</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Laster inn …</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Ingen tilkoblede enheter</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Lås opp for å koble til en enhet</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Skann QR-koden som vises på enheten som skal kobles til.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Skann QR-kode</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Bruk denne enheten til å skanne QR-koden som vises på enheten du vil koble til</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Greit</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Denne enheten vil kunne se gruppene, kontaktene og samtalene dine og sende meldinger som deg.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Fullfør tilkoblingen på den andre enheten</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Gjør ferdig tilkoblingen av Molly på den andre enheten.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Tilkobling av enhet mislyktes</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Denne QR-koden er ikke gyldig. Du må skanne QR-koden som vises på enheten du vil koble til.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Prøv på nytt</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Vil du koble fra \'%1$s\'?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimaliser for manglende Play Tjenester</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Denne enheten støtter ikke Play-tjenester. Trykk én gang for å slå av batterioptimalisering som kan hindre Signal i å motta meldinger når det kjører i bakgrunnen.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Denne enheten støtter ikke Play-tjenester. Trykk én gang for å slå av batterioptimalisering som kan hindre Molly i å motta meldinger når det kjører i bakgrunnen.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Din versjon av Signal er utløpt. Vennligst oppdater for å sende ytterligere meldinger.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Din versjon av Molly er utløpt. Vennligst oppdater for å sende ytterligere meldinger.</string>
     <string name="ExpiredBuildReminder_update_now">Oppdater nå</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Vis</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanent Signal kommunikasjonssvikt!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal klarte ikke å registrere seg i Google Play-tjenesten. Signal-meldinger og -samtaler er derfor slått av. Prøv å registrere programmet på nytt under Innstillinger &gt; Avansert.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanent Molly kommunikasjonssvikt!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly klarte ikke å registrere seg i Google Play-tjenesten. Molly-meldinger og -samtaler er derfor slått av. Prøv å registrere programmet på nytt under Innstillinger &gt; Avansert.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Feilsøkingslogger gjør det lettere for oss å løse problemet. De inneholder ikke opplysninger som kan brukes til å identifisere deg.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal oppdaget et problem. Vil du sende inn en feilsøkingslogg?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly oppdaget et problem. Vil du sende inn en feilsøkingslogg?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Varslene kan være forsinket på grunn av batterioptimalisering</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Du kan slå av batterioptimalisering på Signal for å unngå at meldingsvarslene kommer sent.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Du kan slå av batterioptimalisering på Molly for å unngå at meldingsvarslene kommer sent.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Varslene kan være forsinket på grunn av batterioptimalisering</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Slå av batterioptimalisering på Molly for å unngå at varslene blir forsinket. Trykk på «Fortsett» for å se instruksjoner for enheten din.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Nei takk</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Fortsett</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Fortsett</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Avbryt</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Nei takk</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Ventende gruppeinvitasjoner</string>
+    <string name="PendingMembersActivity_pending_group_invites">Forespørsler og invitasjoner</string>
     <string name="PendingMembersActivity_requests">Forespørsler</string>
     <string name="PendingMembersActivity_invites">Invitasjoner</string>
     <string name="PendingMembersActivity_people_you_invited">Personer du har invitert</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Avbryt</string>
     <string name="InviteActivity_sending">Sender…</string>
     <string name="InviteActivity_invitations_sent">Invitasjoner sendt.</string>
-    <string name="InviteActivity_invite_to_signal">Inviter til Signal</string>
+    <string name="InviteActivity_invite_to_signal">Inviter til Molly</string>
     <string name="InviteActivity_send_sms">Send SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Vil du sende %1$d SMS-invitasjon?</item>
         <item quantity="other">Vil du sende %1$d SMS-invitasjoner?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">La oss bytte til Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">La oss bytte til Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Det ser ut som at du ikke har noen programmer å dele denne informasjonen med.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Din melding</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Bakgrunnstilkobling slått på</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Svar</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Setter opp Signal-anrop</string>
+    <string name="NotificationBarManager__establishing_signal_call">Setter opp Molly-anrop</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Starter anropstjenesten Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Stopper Signal-tjenesten</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Starter anropstjenesten Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Stopper Molly-tjenesten</string>
     <string name="NotificationBarManager__cancel_call">Avbryt samtale</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Du har aktivert betalinger</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s kan nå motta betalinger</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Betalingsinformasjonen er ikke tilgjengelig</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Trykk for mer</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Betalingsinformasjon mangler</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Informasjonen om denne betalingen er ikke tilgjengelig fordi meldingene ble gjenopprettet fra en kilde som manglet informasjon om betalingshistorikk. Dette påvirker verken saldoen din eller statusene for de siste betalingene du har foretatt.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Snart vil det ikke være mulig å sende SMS-meldinger fra Signal. Inviter %1$s til Signal for å fortsette samtalen her.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Det er ikke lenger mulig å sende SMS-meldinger i Signal. Inviter %1$s til Signal for å fortsette samtalen her.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Det er ikke lenger mulig å sende SMS-meldinger i Molly. Inviter %1$s til Molly for å fortsette samtalen her.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Betaling: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Betaling</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Rapportert som søppelpost</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Vil du koble til en Signal-enhet?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Det ser ut som at du prøver å koble en enhet til Signal ved hjelp av en tredjepartsskanner. For din egen sikkerhet må du skanne koden på nytt via Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal krever tillatelse fra systemet for å kunne skanne QR-koder, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Kamera».</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly krever tillatelse fra systemet for å kunne skanne QR-koder, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Kamera».</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Du kan ikke skanne en QR-kode når systemet ikke tillater Signal å bruke kameraet</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Skriv inn passord</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal-ikon</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly-ikon</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Send inn passord</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Ugyldig passord!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Lås opp Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Skjermlås</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Lås opp Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Skjermlås</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Kart</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Verifiser for å fortsette å sende meldinger</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">For å hindre søppelpost på Signal ber vi deg fullføre verifiseringen.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">For å hindre søppelpost på Molly ber vi deg fullføre verifiseringen.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Etter verifisering kan du fortsette med meldingene. Meldinger satt på pause vil automatisk bli sendt.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Min story</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal-samtale</string>
+    <string name="Recipient_signal_call">Molly-samtale</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Blokker</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Ringer…</string>
     <string name="RedPhone_busy">Opptatt</string>
     <string name="RedPhone_recipient_unavailable">Mottaker utilgjengelig</string>
-    <string name="RedPhone_network_failed">Nettverk mislyktes.</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Nettverk mislyktes. Sjekk internettilkoblingen og prøv igjen.</string>
     <string name="RedPhone_number_not_registered">Nummer ikke registrert.</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Nummeret du ringte støtter ikke krypterte samtaler.</string>
     <string name="RedPhone_got_it">Skjønner</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Trykk her for å skru på video</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">For å ringe %1$s, trenger Signal tilgang til kameraet</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">For å ringe %1$s, trenger Molly tilgang til kameraet</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Ringer…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Kobler til på nytt…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Fjernet fra samtalen</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Noen fjernet deg fra samtalen.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Gi tilgang til kameraet og mikrofonen</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Gi tilgang til mikrofonen</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Gi tilgang til kameraet</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Gi Molly tilgang til kameraet ditt og mikrofonen din for å starte eller bli med i en samtale.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Gi Molly tilgang til mikrofonen din for å starte eller bli med i en samtale.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Gi Molly tilgang til kameraet ditt for å slå på video.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Du må gi Molly tilgang til mikrofonen for å starte eller bli med i en samtale.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly trenger tilgang til kameraet for å slå på video</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Slik starter eller blir du med i en samtale:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Slik slår du på video:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal Anrop</string>
-    <string name="WebRtcCallView__signal_video_call">Signal-videosamtale</string>
+    <string name="WebRtcCallView__signal_call">Molly Anrop</string>
+    <string name="WebRtcCallView__signal_video_call">Molly-videosamtale</string>
     <string name="WebRtcCallView__start_call">Start samtale</string>
     <string name="WebRtcCallView__join_call">Bli med i samtale</string>
     <string name="WebRtcCallView__call_is_full">Samtalen er full</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Vil du ta ned hånden?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Ta ned hånden</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Ta ned</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Avbryt</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Du rakk opp hånden</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Vis</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s har rukket opp hånden</item>
-        <item quantity="other">%1$s + %2$d har rukket opp hånden</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s rakk opp hånden</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d rakk opp hånden</item>
+        <item quantity="other">%1$s +%2$d rakk opp hånden</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s rakk opp hånden</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d rakk opp hånden</item>
+        <item quantity="other">%1$s +%2$d rakk opp hånden</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s + %2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s + %2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Du vil motta et taleanrop for å bekrefte dette nummeret.</string>
     <string name="RegistrationActivity_edit_number">Rediger nummer</string>
     <string name="RegistrationActivity_missing_google_play_services">Mangler Google Play tjenester</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Denne enheten mangler Google Play-tjenester. Du kan fremdeles bruke Signal, men det kan oppføre seg ustabilit eller gi dårlig ytelse.\n\nHvis du ikke er en avansert bruker, ikke kjører en egeninstallert Android-fastvare, eller du mener at du har Google Play-tjenester installert, ber vi deg om å kontakte support@signal.org så vi kan hjelpe deg med feilsøking.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Denne enheten mangler Google Play-tjenester. Du kan fremdeles bruke Molly, men det kan oppføre seg ustabilit eller gi dårlig ytelse.\n\nHvis du ikke er en avansert bruker, ikke kjører en egeninstallert Android-fastvare, eller du mener at du har Google Play-tjenester installert, ber vi deg om å kontakte support@molly.im så vi kan hjelpe deg med feilsøking.</string>
     <string name="RegistrationActivity_i_understand">Jeg forstår</string>
     <string name="RegistrationActivity_play_services_error">Play Tjenester Feil</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play-tjenester er opptatt eller midlertidig utilgjengelig. Vent litt, og prøv på nytt.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Ikke-standard tallformat</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Tallet du skrev inn (%1$s), ser ut til å være skrevet i et ikke-standard tallformat.\n\nMente du %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android – format for telefonnummer</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android – format for telefonnummer</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Anrop forespurt</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Har du problemer med å registrere deg?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Pass på at telefonen din har dekning, slik at du kan motta koden på SMS eller via anrop\n • Sørg for at du kan motta anrop til telefonnummeret\n • Dobbeltsjekk at du har skrevet inn riktig telefonnummer.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">For å få mer informasjon kan du følge disse feilsøkingstrinnene eller kontakte brukerstøtten vår</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Følg %1$s eller %2$s for å finne ut mer</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">disse feilsøkingstrinnene</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Legg til kontakt</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Inviter til Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Inviter til Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal-melding</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal-samtale</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Legg til kontakt</string>
-    <string name="SharedContactView_invite_to_signal">Inviter til Signal</string>
+    <string name="SharedContactView_invite_to_signal">Inviter til Molly</string>
     <string name="SharedContactView_message">Signal-melding</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s tilhører %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal oppdatering</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">En ny versjon av Signal er tilgjengelig. Trykk for å oppdatere appen.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal kunne ikke oppdateres</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly oppdatering</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">En ny versjon av Molly er tilgjengelig. Trykk for å oppdatere appen.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly kunne ikke oppdateres</string>
     <string name="ApkUpdateNotifications_failed_general_body">Vi gir det et nytt forsøk senere.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal er oppdatert</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly er oppdatert</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Appen ble automatisk oppdatert til versjon %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Vår Signal sikkerhet nummer:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Det ser ut som at du ikke har noen programmer å dele denne informasjonen med.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Ingen sikkerhet nummer å sammenligne ble funnet i utklippstavlen</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal krever tillatelse fra systemet for å kunne skanne QR-koder, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Kamera».</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly krever tillatelse fra systemet for å kunne skanne QR-koder, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Kamera».</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Du kan ikke skanne en QR-kode når systemet ikke tillater Signal å bruke kameraet</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Du må utveksle meldinger for å se %1$s sitt sikkerhetsnummer.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Trykk for å åpne.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal er låst opp</string>
-    <string name="KeyCachingService_lock">Lås Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly er låst opp</string>
+    <string name="KeyCachingService_lock">Lås Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Deg</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Ustøttet medietype</string>
     <string name="MediaPreviewActivity_draft">Utkast</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal krever tillatelse fra systemet for å kunne skrive til ekstern lagringsenhet, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Lagring».</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly krever tillatelse fra systemet for å kunne skrive til ekstern lagringsenhet, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Lagring».</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Du kan ikke lagre på ekstern lagringsenhet uten å slå på tillatelse i systemet først</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Vil du slette denne meldingen?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Meldingen blir slettet for godt.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Klarte ikke å levere melding.</string>
     <string name="MessageNotifier_error_delivering_message">Feil under levering av melding.</string>
     <string name="MessageNotifier_message_delivery_paused">Levering av meldinger satt på pause.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifiser for å fortsette å sende meldinger på Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifiser for å fortsette å sende meldinger på Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Merk alle som lest</string>
     <string name="MessageNotifier_mark_read">Merk som lest</string>
     <string name="MessageNotifier_turn_off_these_notifications">Skru av disse varslene</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Reagerte med %1$s på klistremerket ditt.</string>
     <string name="MessageNotifier_this_message_was_deleted">Denne meldingen ble slettet.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Skru av varsling når kontakter tar i bruk Signal? Du kan skru de på igjen i Signal&gt; Innstillinger &gt; Varsler.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Skru av varsling når kontakter tar i bruk Molly? Du kan skru de på igjen i Molly&gt; Innstillinger &gt; Varsler.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Hurtigsvar er utilgjengelig når Signal er låst.</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Hurtigsvar er utilgjengelig når Molly er låst.</string>
     <string name="QuickResponseService_problem_sending_message">Det oppstod et problem under sending av melding.</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Ugyldig snarvei</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Ny melding</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Meldingsforespørsel</string>
     <string name="SingleRecipientNotificationBuilder_you">Deg</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Denne enheten er ikke lenger registrert. Dette skyldes sannsynligvis at du registrerte telefonnummeret ditt på Signal med en annen enhet.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Denne enheten er ikke lenger registrert. Dette skyldes sannsynligvis at du registrerte telefonnummeret ditt på Molly med en annen enhet.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Registrer enheten på nytt</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Gi Signal tilgang til mikrofonen for å svare på anropet.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Gi Molly tilgang til mikrofonen for å svare på anropet.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Gi Signal tilgang til mikrofonen og kameraet for å svare på videoanropet.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal krever tillatelser fra systemet for å kunne ringe eller motta samtaler, men du har valgt å avslå minst én av disse permanent. Gå til «Apper»-menyen på systemet og slå på tillatelser for «Mikrofon» og «Kamera».</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Gi Molly tilgang til mikrofonen og kameraet for å svare på videoanropet.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly krever tillatelser fra systemet for å kunne ringe eller motta samtaler, men du har valgt å avslå minst én av disse permanent. Gå til «Apper»-menyen på systemet og slå på tillatelser for «Mikrofon» og «Kamera».</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Besvart på en koblet enhet.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Avslått på en koblet enhet.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Opptatt på en koblet enhet.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Gjenta ny passord</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Inviter til Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Inviter til Molly</string>
     <string name="contact_selection_activity__new_group">Ny gruppe</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Oppdater kontakter</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Mangler det noen? Last inn kontaktene på nytt</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Finn bekjente på Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Gi tilgang til kontaktlisten din</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Mer</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Kontaktfoto</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal krever tillatelse fra systemet for å kunne vise kontakter, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Kontakter».</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly krever tillatelse fra systemet for å kunne vise kontakter, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Kontakter».</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Klarte ikke å hente kontakter. Kontroller nettforbindelse</string>
     <string name="ContactSelectionListFragment_username_not_found">Brukernavn ikke funnet</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"«%1$s» er ikke en Signal-bruker. Kontroller brukernavnet, og prøv igjen."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Søk på brukernavn</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Gi tilgang til kontaktlisten</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Slik finner du bekjente på Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Tillat Tilgang</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Nei takk</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Gi tilgang til kontaktlisten din. Kontaktlisten krypteres og er ikke synlig for Signal-tjenesten.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal må ha tilgang til kontaktene dine for å kunne vise dem.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly må ha tilgang til kontaktene dine for å kunne vise dem.</string>
     <string name="contact_selection_list_fragment__show_contacts">Vis Kontakter</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Du har fjernet denne personen. Hvis du sender en melding nå, legges personen til i listen din igjen.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Alternativer</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Oppdater</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Spill av … Pause</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Bobler er en Android-funksjon som du kan skru av i Signal-samtaler.</string>
+    <string name="BubbleOptOutTooltip__description">Bobler er en Android-funksjon som du kan skru av i Molly-samtaler.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Ikke nå</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Gruppebeskrivelse</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Oppdater Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Oppdater Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Denne versjonen av Signal er utløpt. Oppdater nå for å fortsette å bruke Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Denne versjonen av Molly er utløpt. Oppdater nå for å fortsette å bruke Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Oppdater</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Langsomt</string>
     <string name="preferences__help">Hjelp</string>
     <string name="preferences__advanced">Avansert</string>
-    <string name="preferences__donate_to_signal">Gi penger til Signal</string>
+    <string name="preferences__donate_to_signal">Gi penger til Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Personvern</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Bytt appikonet og -navnet til «%1$s»</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal må starte på nytt for at endringene skal tre i kraft. Varslene vil fremdeles vise standardikonet og navnet til Signal.</string>
+    <string name="preferences__app_icon_dialog_description">Molly må starte på nytt for at endringene skal tre i kraft. Varslene vil fremdeles vise standardikonet og navnet til Molly.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Velg et annet ikon og navn som skal vises på telefonens startskjerm og i oversikten over apper. Varslene vil fremdeles vise standardikonet og navnet til Signal. Les mer</string>
+    <string name="preferences__app_icon_warning_learn_more">Velg et annet ikon og navn som skal vises på telefonens startskjerm og i oversikten over apper. Varslene vil fremdeles vise standardikonet og navnet til Molly. Les mer</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Appikonene og -navnene vises på startskjermen og oversikten over apper.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Varslene vil fremdeles vise standardikonet og navnet til Signal.</string>
+    <string name="preferences__app_icon_notification_warning">Varslene vil fremdeles vise standardikonet og navnet til Molly.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Les mer</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Dette vil forkorte alle samtaler til de %1$s siste meldingene.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Dette vil permanent slette alle meldingslogger og mediefiler fra denne enheten.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Dette sletter alle meldingslogger og mediefiler fra alle tilkoblede enheter permanent.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Er du sikker på at du vil slette alle meldingslogger?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Alle meldingslogger slettes permanent. Denne handlingen kan ikke angres.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Alle meldingslogger slettes permanent fra alle enheter. Dette kan ikke angres.</string>
     <string name="preferences_storage__delete_all_now">Slett alt nå</string>
     <string name="preferences_storage__forever">For alltid</string>
     <string name="preferences_storage__one_year">1 år</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Omgåelse av sensur</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Omgå sensur</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Når slått på, vil Signal forsøke å unngå sensurforsøk. Ikke skru på denne funksjonen om du ikke er i et område hvor Signal blir forsøkt sensurert.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Når slått på, vil Molly forsøke å unngå sensurforsøk. Ikke skru på denne funksjonen om du ikke er i et område hvor Molly blir forsøkt sensurert.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Sensur-omgåelse har blitt aktivert basert på telefonnummeret som kontoen er registrert med.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Vi introduserer betalinger</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Bruk Signal til å sende og motta MobileCoins — en ny, digital valuta med personvern i fokus. Aktiver funksjonen for å komme i gang.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Bruk Molly til å sende og motta MobileCoins — en ny, digital valuta med personvern i fokus. Aktiver funksjonen for å komme i gang.</string>
     <string name="PaymentsHomeFragment__activate_payments">Aktiver betalinger</string>
     <string name="PaymentsHomeFragment__activating_payments">Aktiverer betalinger…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Gjenopprett betalingskonto</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Betalinger er ikke tilgjengelige i regionen din.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Kunne ikke aktivere betalinger. Prøv igjen senere.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Deaktivere betalinger?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Du vil ikke kunne sende eller motta MobileCoin i Signal hvis du deaktiverer betalinger.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Du vil ikke kunne sende eller motta MobileCoin i Molly hvis du deaktiverer betalinger.</string>
     <string name="PaymentsHomeFragment__deactivate">Deaktiver</string>
     <string name="PaymentsHomeFragment__continue">Fortsett</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Balanse er ikke tilgjengelig for øyeblikket.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Detaljer</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Nå kan du bruke Signal til å sende og motta MobileCoin. Alle betalingene skjer i samsvar med bruksvilkårene til MobileCoin og MobileCoin-lommeboken. Det kan oppstå enkelte problemer, og tapte saldoer og betalinger kan ikke gjenopprettes. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Nå kan du bruke Molly til å sende og motta MobileCoin. Alle betalingene skjer i samsvar med bruksvilkårene til MobileCoin og MobileCoin-lommeboken. Det kan oppstå enkelte problemer, og tapte saldoer og betalinger kan ikke gjenopprettes. </string>
     <string name="PaymentsHomeFragment__activate">Aktiver</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Åpne vilkårene for MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Betalinger i Signal er ikke lenger tilgjengelige. Du kan fortsatt overføre midler til en veksler, men du kan ikke lenger sende eller motta betalinger eller legge til midler.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Betalinger i Molly er ikke lenger tilgjengelige. Du kan fortsatt overføre midler til en veksler, men du kan ikke lenger sende eller motta betalinger eller legge til midler.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Gi nødvendige tillatelser</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Signal ber om følgende tilganger for å gi deg muligheten til å sende meldinger til kjente og kjære: </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Molly ber om følgende tilganger for å gi deg muligheten til å sende meldinger til kjente og kjære: </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Varsler</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Neste</string>
     <string name="PaymentsTransferFragment__invalid_address">Ugyldig adresse</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Sjekk at lommebokadressen du forsøker å overføre til, stemmer, og prøv igjen.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Du kan ikke overføre til din egen Signal-lommebokadresse. Angi lommebokadressen fra kontoen din og en gyldig valuta.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Signal trenger tilgang til kameraet for å skanne en QR-kode.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal trenger tillatelse til å bruke kameraet for å fange en QR-kode. Gå til Innstillinger, velg Tillatelser og slå på Kamera.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Signal trenger tilgang til kameraet for å skanne en QR-kode.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Du kan ikke overføre til din egen Molly-lommebokadresse. Angi lommebokadressen fra kontoen din og en gyldig valuta.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Molly trenger tilgang til kameraet for å skanne en QR-kode.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly trenger tillatelse til å bruke kameraet for å fange en QR-kode. Gå til Innstillinger, velg Tillatelser og slå på Kamera.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Molly trenger tilgang til kameraet for å skanne en QR-kode.</string>
     <string name="PaymentsTransferFragment__settings">Innstillinger</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Inkommende taleanrop i Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Inkommende taleanrop i Molly</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Inkommende videoanrop i Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Inkommende videoanrop i Molly</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Innkommende gruppeanrop på Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Innkommende gruppeanrop på Molly</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Pågående lydsamtale i Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Pågående lydsamtale i Molly</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Pågående videosamtale i Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Pågående videosamtale i Molly</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Pågående gruppesamtale i Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Pågående gruppesamtale i Molly</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Laster…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Bekreft</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Du har bekreftet passordfrasen for sikkerhetskopi</string>
     <string name="BackupDialog_passphrase_was_not_correct">Passordfrasen stemmer ikke overens</string>
-    <string name="LocalBackupJob_creating_signal_backup">Oppretter sikkerhetskopi av Signal …</string>
+    <string name="LocalBackupJob_creating_signal_backup">Oppretter sikkerhetskopi av Molly …</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Verifiserer sikkerhetskopi av Signal …</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Verifiserer sikkerhetskopi av Molly …</string>
     <string name="LocalBackupJobApi29_backup_failed">Sikkerhetskopi feilet</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Sikkerhetskopikatalogen er slettet eller flyttet.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Sikkerhetskopien din er for stor til å lagres på dette volumet.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Ring meg (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Send koden på nytt (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Kontakt Signal brukerstøtte</string>
-    <string name="RegistrationActivity_code_support_subject">Signal Registrering - Verifikasjonskode for Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Kontakt Molly brukerstøtte</string>
+    <string name="RegistrationActivity_code_support_subject">Molly Registrering - Verifikasjonskode for Android</string>
     <string name="RegistrationActivity_incorrect_code">Feil kode</string>
     <string name="BackupUtil_never">Aldri</string>
     <string name="BackupUtil_unknown">Ukjent</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Telefonnummer</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Velg hvem som kan se telefonnummeret ditt og bruke det til å komme i kontakt med deg på Signal.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Velg hvem som kan se telefonnummeret ditt og bruke det til å komme i kontakt med deg på Molly.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Hvem kan se telefonnummeret mitt?</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Du har gjort for mange forsøk. Prøv igjen senere.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Feil under tilkobling til tjeneste</string>
     <string name="preferences_chats__backups">Sikkerhetskopiering</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal er låst</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly er låst</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">TRYKK FOR Å LÅSE OPP</string>
     <string name="Recipient_unknown">Ukjent</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Du trenger tilgang til din gamle enhet.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Gjenopprett fra sikkerhetskopi</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Gjenopprett meldingene dine fra en lokal sikkerhetskopi. Du får ingen flere muligheter til å gjøre dette senere.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Gjenopprett en lokal sikkerhetskopi</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Gjenopprett Signal-sikkerhetskopien</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Gjenopprett alle meldingene og mediefilene fra de siste 30 dagene</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Flere muligheter</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Avbryt</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Logg inn uten å overføre</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Fortsett uten å overføre meldingene og mediefilene dine</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Åpne Signal på din gamle Android-telefon.</string>
     <string name="NewDeviceTransferInstructions__continue">Fortsett</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Forbereder tilkobling til gammel Android enhet…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Tar litt tid, skal være klart straks</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Venter på at gammel Android enhet skal koble til…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal trenger posisjonstillatelsen for å oppdage og koble seg til din gamle Android-enhet.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal trenger at posisjonstjenester er på for å oppdage og koble seg til din gamle Android-enhet.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal trenger at Wi-Fi er på for å oppdage og koble seg til din gamle Android-enhet. Wi-Fi må være på, men du trenger ikke være koblet til et Wi-Fi-nettverk.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Beklager, det ser ut til at denne enheten ikke støtter Wi-Fi Direct. Signal bruker WiFi Direct for å oppdage og koble seg til din gamle Android-enhet. Du kan fortsatt gjenopprette en sikkerhetskopi for å gjenopprette kontoen fra din gamle enhet.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly trenger posisjonstillatelsen for å oppdage og koble seg til din gamle Android-enhet.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly trenger at posisjonstjenester er på for å oppdage og koble seg til din gamle Android-enhet.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly trenger at Wi-Fi er på for å oppdage og koble seg til din gamle Android-enhet. Wi-Fi må være på, men du trenger ikke være koblet til et Wi-Fi-nettverk.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Beklager, det ser ut til at denne enheten ikke støtter Wi-Fi Direct. Molly bruker WiFi Direct for å oppdage og koble seg til din gamle Android-enhet. Du kan fortsatt gjenopprette en sikkerhetskopi for å gjenopprette kontoen fra din gamle enhet.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Gjenopprett en sikkerhetskopi</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">En uventet feil oppstod under forsøket på å koble til din gamle Android-enhet.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Søker etter ny Android enhet…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal trenger posisjonstillatelsen for å oppdage og koble seg til din nye Android-enhet.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal trenger at posisjonstjenester er på for å oppdage og koble seg til din gamle Android-enhet.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal trenger at Wi-Fi er på for å oppdage og koble seg til din nye Android-enhet. Wi-Fi må være på, men du trenger ikke være koblet til et Wi-Fi-nettverk.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Beklager, det ser ut til at denne enheten ikke støtter Wi-Fi Direct. Signal bruker WiFi Direct for å oppdage og koble seg til din nye Android-enhet. Du kan fortsatt gjenopprette en sikkerhetskopi for å gjenopprette kontoen på din nye enhet.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly trenger posisjonstillatelsen for å oppdage og koble seg til din nye Android-enhet.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly trenger at posisjonstjenester er på for å oppdage og koble seg til din gamle Android-enhet.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly trenger at Wi-Fi er på for å oppdage og koble seg til din nye Android-enhet. Wi-Fi må være på, men du trenger ikke være koblet til et Wi-Fi-nettverk.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Beklager, det ser ut til at denne enheten ikke støtter Wi-Fi Direct. Molly bruker WiFi Direct for å oppdage og koble seg til din nye Android-enhet. Du kan fortsatt gjenopprette en sikkerhetskopi for å gjenopprette kontoen på din nye enhet.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Lag en sikkerhetskopi</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">En uventet feil oppstod under forsøket på å koble til din nye Android-enhet.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Data overføres</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Hold enhetene i nærheten av hverandre. Ikke slå av noen av enhetene, og la Signal være åpen. Overføringer er kryptert fra ende til ende.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Hold enhetene i nærheten av hverandre. Ikke slå av noen av enhetene, og la Molly være åpen. Overføringer er kryptert fra ende til ende.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d meldinger så langt…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% av meldingene så langt …</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Overfør konto</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Last ned Signal på din nye Android enhet</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Last ned Molly på din nye Android enhet</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Trykk på \"Overfør eller gjenopprett konto\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Alle med denne lenken kan se gruppens navn og bilde, og be om å få bli med. Del den med folk du stoler på.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Alle med denne lenken kan se gruppens navn og bilde, og delta i gruppen. Del den med folk du stoler på.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Del via Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Del via Molly</string>
     <string name="GroupLinkBottomSheet_copy">Kopier</string>
     <string name="GroupLinkBottomSheet_qr_code">QR-kode</string>
     <string name="GroupLinkBottomSheet_share">Del</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">Om MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin er en ny, personvernorientert digital valuta.</string>
     <string name="payment_info_card_adding_funds">Legger til penger</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Du kan legge til penger til bruk i Signal ved å sende MobileCoin til lommebokadressen din.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Du kan legge til penger til bruk i Molly ved å sende MobileCoin til lommebokadressen din.</string>
     <string name="payment_info_card_cashing_out">Løse inn i kontanter</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Du kan bruke MobileCoin på en hvilken som helst plattform som støtter MobileCoin. Du trenger bare å overføre penger til kontoen din på plattformen for å bruke MobileCoin.</string>
     <string name="payment_info_card_hide_this_card">Vil du skjule dette kortet?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Deaktiver lommeboken</string>
     <string name="DeactivateWalletFragment__your_balance">Din balanse</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Vi anbefaler deg å overføre pengene til en annen lommebokadresse før du deaktiverer betalinger. Hvis du velger å ikke overføre pengene nå, forblir de i lommeboken som er knyttet til Signal, hvis du aktiverer betalinger på nytt.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Vi anbefaler deg å overføre pengene til en annen lommebokadresse før du deaktiverer betalinger. Hvis du velger å ikke overføre pengene nå, forblir de i lommeboken som er knyttet til Molly, hvis du aktiverer betalinger på nytt.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Overfør gjenværende saldo</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Deaktiver uten å overføre</string>
     <string name="DeactivateWalletFragment__deactivate">Deaktiver</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Vil du deaktivere uten å overføre?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Saldoen din forblir i lommeboken som er knyttet til Signal, hvis du velger å aktivere betalinger på nytt.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Saldoen din forblir i lommeboken som er knyttet til Molly, hvis du velger å aktivere betalinger på nytt.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Feil ved deaktivering av lommeboken.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Lisenser</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Vilkår og personvernerklæring</string>
-    <string name="HelpFragment__copyright_signal_messenger">Copyright Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Copyright Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Lisensiert under GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Velg en farge</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Del</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Kun administratorer kan sende meldinger til denne gruppen.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Grensen er nådd</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Du kan ikke velge mer enn 5 samtaler</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Les mer</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Oppdater Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Oppdater Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Denne versjonen av Signal er utløpt. Oppdater nå for å fortsette å bruke Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Denne versjonen av Molly er utløpt. Oppdater nå for å fortsette å bruke Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Oppdater</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Enheten er ikke lenger registrert</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Denne enheten er ikke lenger registrert. Registrer deg på nytt for å bruke Signal på denne enheten.</string>
+    <string name="ReregisterSignalDialog__message">Denne enheten er ikke lenger registrert. Registrer deg på nytt for å bruke Molly på denne enheten.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Registrer på nytt</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Kunne ikke åpne velgeren.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Du må gi Signal tillatelse til å vise varsler før du kan slå dem på.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Du må gi Molly tillatelse til å vise varsler før du kan slå dem på.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Slå på varsler</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Ingen svar ennå</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Du kan ikke svare på denne storyen fordi du ikke er medlem av denne gruppen lenger.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Reagerte på storyen</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Reagerte på storyen</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Reagerte på storyen</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Visninger</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Velg bank</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Bekreft pengegaven via %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">For å legge inn den gjentakende pengegaven kan du trykke på «Fortsett» for å bekrefte at 0,01 € trekkes fra bankkontoen din. Dette beløpet refunderes automatisk og sikrer at pengegaven på 5 € per måned kan trekkes fra kontoen din.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">For å legge inn den gjentakende pengegaven trykker du på «Fortsett» for å bekrefte at 0,01 EUR trekkes fra bankkontoen din. Dette beløpet refunderes automatisk og sikrer at pengegaven på %1$s per måned kan trekkes fra kontoen din.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Fortsett</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Laster ned sikkerhetskopi …</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Sikkerhetskopiering av mediefiler er slått av</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Abonnementet ditt på sikkerhetskopiering av mediefiler i Signal er kansellert fordi vi ikke kunne behandle betalingen din. Du har %1$d dag på å laste ned mediefilene som er sikkerhetskopiert i appen. Disse mediefilene slettes automatisk om %1$d dag.</item>
+        <item quantity="other">Abonnementet ditt på sikkerhetskopiering av mediefiler i Signal er kansellert fordi vi ikke kunne behandle betalingen din. Du har %1$d dager på å laste ned mediefilene som er sikkerhetskopiert i appen. Disse mediefilene slettes automatisk om %1$d dager.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Du kan reaktivere abonnementet når som helst ved å betale abonnementsprisen. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Mediefilene dine slettes i dag</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Abonnementet ditt på sikkerhetskopiering av mediefiler i Signal er kansellert fordi vi ikke kunne behandle betalingen din. Dette er din siste sjanse til å laste ned de sikkerhetskopierte mediefilene før de slettes.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Nedlastingen kunne ikke gjennomføres</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Enheten har ikke nok lagringsplass. Du trenger %1$s mer lagringsplass for å laste ned mediefilene fra sikkerhetskopien.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Hvis du velger å hoppe over mediefilene i sikkerhetskopien, slettes de om %1$d dag.</item>
+        <item quantity="other">Hvis du velger å hoppe over mediefilene i sikkerhetskopien, slettes de om %1$d dager.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Betalingen for sikkerhetskopiering kunne ikke behandles</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Vi har problemer med å behandle den månedlige betalingen for sikkerhetskopiering. Sjekk om betalingsmåten din er oppdatert. Endre den i Google Play dersom den ikke er det. Signal vil forsøke å behandle betalingen igjen om et par dager.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Sikkerhetskopiering kunne ikke fullføres</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Det er %1$d dager siden siste sikkerhetskopiering. Sørg for at enheten er koblet til internett, og trykk på «Sikkerhetskopier nå». </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Les mer</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Hopp over</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Last ned mediefilene nå</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Last ned senere</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Ikke last ned mediefilene</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Du trenger %1$s mer lagringsplass for å laste ned mediefilene.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Kredittkort eller debetkort</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Ukjent</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Betalingshistorikk</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Den siste sikkerhetskopieringen ble gjort kl. %2$s den %1$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Meldinger som er eldre enn dette, slettes for godt.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Når du når det valgte antallet meldinger, slettes gamle meldinger for godt.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Bruk grenser på tilkoblede enheter</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Når dette er slått på, slettes også meldinger fra de tilkoblede enhetene dine.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Sletting er nå synkronisert på alle enhetene dine</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Meldinger og samtaler som slettes her, slettes også fra mobilen din og alle andre tilkoblede enheter.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Betalingshistorikk</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Sikkerhetskopiering av alle mediefiler og tekst</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Betalingsinformasjon</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Sikkerhetskopieringstype</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Betalingsdato</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Del</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Sikkerhetskopiering av Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Betalingshistorikk</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Info om sikkerhetskopiering</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Størrelse på sikkerhetskopi</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Hyppighet for sikkerhetskopiering</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Sikkerhetskopiering via mobilnettverket</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Slå av og slett sikkerhetskopi</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Sikkerhetskopien ble slettet og slått av.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Sikkerhetskopieringstypen ble endret og abonnementet ble sagt opp</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Abonnementet er sagt opp</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Nedlasting fullført</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Sikkerhetskopieringstype</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Sikkerhetskopiering slått av</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s per måned</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Slå på sikkerhetskopiering</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Siste sikkerhetskopi</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s kl. %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Aldri</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Sikkerhetskopier nå</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Vil du slå av og slette sikkerhetskopiene?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Kortet ditt belastes ikke igjen. Sikkerhetskopiene dine slettes og ingen nye opprettes.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Slå av og slett</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Sletter sikkerhetskopi …</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Sikkerhetskopien ble slettet</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Når du trykker «Sikkerhetskopier nå»"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Daglig</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Ukentlig</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Månedlig</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Manuell sikkerhetskopiering</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Angi PIN-koden, passordet eller mønsteret for å låse opp enheten.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Neste</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Bytt sikkerhetskopieringstype</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Avslutt abonnementet</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Bekreft kanselleringen</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Du belastes ikke igjen. Sikkerhetskopieringen deaktiveres ved slutten av faktureringsperioden. Etter denne datoen har du 30 dager på deg til å laste ned mediefilene som for øyeblikket er sikkerhetskopiert.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Bekreft og last ned filene nå</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Bekreft og last ned senere</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Behold abonnementet</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 23588f488f..1090a93b71 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,19 +39,19 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal wordt nu bijgewerkt…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly wordt nu bijgewerkt…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Je hebt nog geen wachtwoord ingesteld.</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Wachtwoord uitschakelen?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Hierdoor zullen de Signal-app en berichtmeldingen niet langer vergrendeld worden</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Hierdoor zullen de Molly-app en berichtmeldingen niet langer vergrendeld worden</string>
     <string name="ApplicationPreferencesActivity_disable">Uitschakelen</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fout bij verbinden met de server.</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">Je pincode wordt gebruikt voor registratievergrendeling. Om je pincode uit te schakelen moet je eerst de registratievergrendeling uitzetten.</string>
     <string name="ApplicationPreferencesActivity_pin_created">Pincode aangemaakt.</string>
     <string name="ApplicationPreferencesActivity_pin_disabled">Pincode uitgeschakeld.</string>
     <string name="ApplicationPreferencesActivity_record_payments_recovery_phrase">Herstelzin voor betalingen vastleggen</string>
-    <string name="ApplicationPreferencesActivity_record_phrase">Zin vastleggen</string>
+    <string name="ApplicationPreferencesActivity_record_phrase">Herstelzin vastleggen</string>
     <string name="ApplicationPreferencesActivity_before_you_can_disable_your_pin">Voordat je je pincode kunt uitschakelen, moet je je herstelzin voor betalingen vastleggen zodat je je betalingsaccount kunt herstellen.</string>
 
     <!-- NumericKeyboardView -->
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Bestand</string>
     <string name="AttachmentKeyboard_contact">Contact</string>
     <string name="AttachmentKeyboard_location">Locatie</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal heeft toestemming nodig om je afbeeldingen en video\'s te kunnen weergeven</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly heeft toestemming nodig om je afbeeldingen en video\'s te kunnen weergeven</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Toegang geven</string>
     <string name="AttachmentKeyboard_payment">Betaling</string>
 
     <!-- AttachmentManager -->
-    <string name="AttachmentManager_cant_open_media_selection">Er is geen app gevonden waarmee je media zou kunnen selecteren.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal heeft toegang tot de externe opslagruimte nodig om afbeeldingen, video\'s of audio te kunnen verzenden, maar deze toestemming is pertinent geweigerd. Ga naar de instellingen, tik op ‘Machtigingen’ en schakel ‘Opslagruimte’ in.</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal heeft toegang tot de contacten nodig om contactinformatie in Signal weer te geven, maar deze toestemming is pertinent geweigerd. Ga naar de instellingen, tik op ‘Toestemmingen’ en schakel ‘Contacten’ in.</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal heeft toegang tot de locatie nodig om locaties te kunnen verzenden aan je gesprekspartners, maar deze toestemming is pertinent geweigerd. Ga naar de instellingen, tik op ‘Toestemmingen’ en schakel ‘Locatie’ in.</string>
+    <string name="AttachmentManager_cant_open_media_selection">Geen app gevonden waarmee je media kunt selecteren.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly heeft toegang tot de opslag nodig om afbeeldingen, video\'s of audio te kunnen verzenden, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Opslagruimte’ in.</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly heeft toegang tot de contacten nodig om contactinformatie te kunnen verzenden, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Contacten’ in.</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly heeft toegang tot de locatie nodig om locaties te kunnen verzenden, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Locatie’ in.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Toegang tot je locatie toestaan</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Om je locatie te delen:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Geef Signal toegang om je locatie te delen.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Geef Molly toegang om je locatie te delen.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal heeft toegang tot je locatie nodig om je locatie te delen.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly heeft toegang tot je locatie nodig om je locatie te delen.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Toegang tot opslag toestaan</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Om afbeeldingen en video\'s weer te geven:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal heeft toegang tot je opslag nodig om afbeeldingen en video\'s te kunnen weergeven.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly heeft toegang tot je opslag nodig om afbeeldingen en video\'s te kunnen weergeven.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s heeft Betalingen niet geactiveerd </string>
@@ -132,7 +133,7 @@
     <string name="BlockedUsersActivity__blocked_users_will">Geblokkeerde personen kunnen je niet bellen en geen berichten sturen.</string>
     <string name="BlockedUsersActivity__no_blocked_users">Je hebt geen personen geblokkeerd</string>
     <string name="BlockedUsersActivity__block_user">Persoon blokkeren?</string>
-    <string name="BlockedUserActivity__s_will_not_be_able_to">‘%1$s’ kan je niet bellen of je berichten sturen.</string>
+    <string name="BlockedUserActivity__s_will_not_be_able_to">‘%1$s’ kan je niet bellen en geen berichten sturen.</string>
     <string name="BlockedUsersActivity__block">Blokkeren</string>
 
     <!-- CreditCardFragment -->
@@ -182,10 +183,10 @@
     <string name="BlockUnblockDialog_group_members_wont_be_able_to_add_you">Groepsleden zullen je niet langer aan deze groep kunnen toevoegen.</string>
     <string name="BlockUnblockDialog_group_members_will_be_able_to_add_you">Groepsleden zullen je weer aan deze groep kunnen toevoegen.</string>
     <!-- Text that is shown when unblocking a Signal contact -->
-    <string name="BlockUnblockDialog_you_will_be_able_to_call_and_message_each_other">Jullie zullen weer berichten naar elkaar kunnen verzenden, kunnen bellen, en je profielnaam, -foto en -omschrijving zullen voor hem of haar weer worden bijgewerkt.</string>
+    <string name="BlockUnblockDialog_you_will_be_able_to_call_and_message_each_other">Jullie zullen weer berichten naar elkaar kunnen sturen, kunnen bellen, en je profielnaam, -foto en -omschrijving zullen voor hem of haar weer worden bijgewerkt.</string>
     <!-- Text that is shown when unblocking an SMS contact -->
-    <string name="BlockUnblockDialog_you_will_be_able_to_message_each_other">Jullie zullen weer berichten naar elkaar kunnen verzenden via Signal.</string>
-    <string name="BlockUnblockDialog_blocked_people_wont_be_able_to_call_you_or_send_you_messages">Geblokkeerde personen kunnen je niet bellen of je berichten sturen.</string>
+    <string name="BlockUnblockDialog_you_will_be_able_to_message_each_other">Jullie zullen weer berichten naar elkaar kunnen sturen.</string>
+    <string name="BlockUnblockDialog_blocked_people_wont_be_able_to_call_you_or_send_you_messages">Geblokkeerde personen kunnen je niet bellen en geen berichten sturen.</string>
     <string name="BlockUnblockDialog_blocked_people_wont_be_able_to_send_you_messages">Geblokkeerde personen kunnen je niet bellen en geen berichten sturen.</string>
     <!-- Message shown on block dialog when blocking the Signal release notes recipient -->
     <string name="BlockUnblockDialog_block_getting_signal_updates_and_news">Nieuws over Signal blokkeren.</string>
@@ -226,40 +227,40 @@
     <string name="CameraXFragment_change_camera_description">Camera wisselen</string>
     <string name="CameraXFragment_open_gallery_description">Galerij openen</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Toegang geven</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Toegang tot je camera en microfoon toestaan</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Toegang tot je camera toestaan</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Toegang tot je microfoon toestaan</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Geef Signal toegang tot de camera om foto\'s te maken.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Geef Signal toegang tot de camera om foto\'s en video\'s te maken.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Geef Signal toegang tot de camera en microfoon om foto\'s en video\'s te maken.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Geef Signal toegang tot de microfoon om video\'s met geluid te maken.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Geef Signal toegang tot de camera om een QR-code te scannen.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal heeft toegang tot de camera nodig om foto’s te maken</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal heeft toegang tot de camera nodig om QR-codes te scannen</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal heeft toegang tot de microfoon nodig om een video op te nemen</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Om foto\'s te nemen in Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Om foto\'s en video\'s te maken in Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Om video\'s met geluid op te nemen:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Om QR-codes te scannen:</string>
 
     <!-- CameraContacts -->
-    <string name="CameraContacts_recent_contacts">Recente contactpersonen</string>
+    <string name="CameraContacts_recent_contacts">Recente contacten</string>
     <string name="CameraContacts_signal_contacts">Signal-gebruikers</string>
     <string name="CameraContacts_signal_groups">Signal-groepen</string>
     <!-- A warning shown in a toast when  -->
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Geen Signal-gebruikers</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Je kunt de cameraknop alleen gebruiken om foto\'s te versturen naar Signal-gebruikers. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Kun je de persoon die je zoekt niet vinden?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Nodig een contactpersoon uit om ook Signal te gebruiken</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Nodig een contact uit om ook Molly te gebruiken</string>
     <string name="CameraContacts__menu_search">Zoeken</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Nee bedankt</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Signal bijwerken</string>
+    <string name="ClientDeprecatedActivity_update_signal">Molly bijwerken</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Deze versie van de app wordt niet langer ondersteund. Om berichten te kunnen blijven verzenden en ontvangen moet je Signal bijwerken naar de meest recente versie.</string>
     <string name="ClientDeprecatedActivity_update">Bijwerken</string>
     <string name="ClientDeprecatedActivity_dont_update">Niet bijwerken</string>
     <string name="ClientDeprecatedActivity_warning">Waarschuwing</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Jouw versie van Signal is verlopen. Je kunt je gespreksgeschiedenis nog weergeven maar je kunt geen nieuwe berichten verzenden of ontvangen totdat je Signal hebt bijgewerkt.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Jouw versie van Molly is verlopen. Je kunt je chatgeschiedenis nog bekijken maar je kunt geen nieuwe berichten verzenden of ontvangen totdat je Molly hebt bijgewerkt.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Geen webbrowser gevonden.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Bericht sturen naar %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly spraakoproep %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly video-oproep %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -345,15 +346,15 @@
     <string name="ContactShareEditActivity_type_mobile">Mobiel</string>
     <string name="ContactShareEditActivity_type_work">Werk</string>
     <string name="ContactShareEditActivity_type_missing">Anders</string>
-    <string name="ContactShareEditActivity_invalid_contact">De geselecteerde contactpersoon was ongeldig</string>
+    <string name="ContactShareEditActivity_invalid_contact">Het geselecteerde contact was ongeldig</string>
     <!-- Content descrption for name edit button on contact share edit activity -->
     <string name="ContactShareEditActivity__edit_name">Naam bewerken</string>
     <!-- Content description for user avatar in edit activity -->
     <string name="ContactShareEditActivity__avatar">Profielfoto</string>
 
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_sent_tap_for_details">Niet verzonden, tik hier voor details</string>
-    <string name="ConversationItem_error_partially_not_delivered">Deels verzonden, tik voor details</string>
+    <string name="ConversationItem_error_not_sent_tap_for_details">Niet verzonden, tik voor details</string>
+    <string name="ConversationItem_error_partially_not_delivered">Gedeeltelijk verzonden, tik voor details</string>
     <string name="ConversationItem_error_network_not_delivered">Verzenden is mislukt</string>
     <string name="ConversationItem_group_action_left">%1$s heeft de groep verlaten.</string>
     <string name="ConversationItem_send_paused">Verzenden is gepauzeerd</string>
@@ -395,7 +396,7 @@
     <!-- Accessibility text associated with image button to send an edited message. -->
     <string name="ConversationActivity_send_edit">Bewerkt bericht versturen</string>
     <string name="ConversationActivity_compose_message">Bericht opstellen</string>
-    <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Sorry, er trad een fout op bij het plaatsen van je bijlage.</string>
+    <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Sorry, er is een fout opgetreden bij het toevoegen van je bijlage.</string>
     <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Ontvanger is geen geldig sms- of e-mailadres!</string>
     <string name="ConversationActivity_message_is_empty_exclamation">Bericht is leeg!</string>
     <string name="ConversationActivity_group_members">Groepsleden</string>
@@ -411,7 +412,7 @@
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Ongeldige ontvanger!</string>
-    <string name="ConversationActivity_added_to_home_screen">Aan thuisscherm toegevoegd</string>
+    <string name="ConversationActivity_added_to_home_screen">Aan startscherm toegevoegd</string>
     <string name="ConversationActivity_calls_not_supported">Bellen wordt niet ondersteund</string>
     <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Dit apparaat lijkt belacties niet te ondersteunen.</string>
     <string name="ConversationActivity_transport_insecure_sms">Onbeveiligde sms</string>
@@ -422,8 +423,8 @@
     <string name="ConversationActivity_transport_signal">Signal-bericht</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Bericht verzenden</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Laten we Signal gebruiken om een gesprek te voeren %1$s</string>
-    <string name="ConversationActivity_specify_recipient">Kies een gesprekspartner</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Laten we Molly gebruiken om een gesprek te voeren %1$s</string>
+    <string name="ConversationActivity_specify_recipient">Kies een contact</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Bijlage overschrijdt de maximale grootte voor het type bericht dat je wilt verzenden.</string>
     <string name="ConversationActivity_unable_to_record_audio">Kan audio niet opnemen!</string>
     <string name="ConversationActivity_you_cant_send_messages_to_this_group">Omdat je niet langer lid bent van deze groep ontvang je geen nieuwe berichten en kun je geen berichten verzenden.</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Om spraakberichten te sturen:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Om spraakberichten te sturen, moet je Signal toegang geven tot je microfoon.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Om spraakberichten te sturen, moet je Molly toegang geven tot je microfoon.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal heeft toegang tot de microfoon nodig om een spraakbericht te kunnen opnemen.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal heeft toegang tot de microfoon nodig om spraakberichten te kunnen opnemen, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Microfoon’ in.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly heeft toegang tot de microfoon nodig om een spraakbericht te kunnen opnemen.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly heeft toegang tot de microfoon nodig om spraakberichten te kunnen opnemen, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Microfoon’ in.</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal heeft toegang tot de microfoon en de camera nodig om %1$s te kunnen bellen, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Microfoon’ en ‘Camera’ in.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Geef Signal toegang tot de camera om foto\'s en video\'s te maken.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal heeft toegang tot de camera nodig om foto’s en video’s te kunnen opnemen, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Camera’ in.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal heeft toegang tot de camera nodig om foto’s en video’s te kunnen opnemen</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly heeft toegang tot de microfoon en de camera nodig om %1$s te kunnen bellen, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Microfoon’ en ‘Camera’ in.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Geef Molly toegang tot de camera om foto\'s en video\'s te maken.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly heeft toegang tot de camera nodig om foto’s en video’s te kunnen maken, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Camera’ in.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly heeft toegang tot de camera nodig om foto’s en video’s te kunnen maken</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Signal heeft toegang tot de microfoon nodig om video te kunnen opnemen met geluid.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal heeft toegang tot de microfoon en camera nodig om video te kunnen opnemen, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Microfoon’ en ‘Camera’ in.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal heeft toegang tot de microfoon nodig om video te kunnen opnemen.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly heeft toegang tot de microfoon en de camera nodig om video te kunnen opnemen, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Microfoon’ en ‘Camera’ in.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly heeft toegang tot de microfoon nodig om video te kunnen opnemen.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Nee</string>
@@ -466,16 +467,16 @@
     <string name="ConversationActivity_delete_conversation">Chat verwijderen?</string>
     <string name="ConversationActivity_delete_and_leave_group">Groep verwijderen en verlaten?</string>
     <string name="ConversationActivity_this_conversation_will_be_deleted_from_all_of_your_devices">Deze chat zal op al je eigen apparaten worden verwijderd.</string>
-    <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Je zult deze groep verlaten en het gesprek zal op al je eigen apparaten worden verwijderd.</string>
+    <string name="ConversationActivity_you_will_leave_this_group_and_it_will_be_deleted_from_all_of_your_devices">Je zult deze groep verlaten en de chat zal op al je eigen apparaten worden verwijderd.</string>
     <string name="ConversationActivity_delete">Verwijderen</string>
     <string name="ConversationActivity_delete_and_leave">Verwijderen en verlaten</string>
 
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Om een oproep te starten:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Om een oproep te starten, moet je Signal toegang geven tot je microfoon.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Geef Molly toegang tot je microfoon om een oproep te starten</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal heeft toegang tot de microfoon nodig om een oproep te starten.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly heeft toegang tot de microfoon nodig om een oproep te starten.</string>
 
 
     <string name="ConversationActivity_join">Deelnemen</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Sms-berichten worden niet langer ondersteund in Signal. Nodig %1$s uit voor Signal om het gesprek hier te houden.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Deze persoon gebruikt Signal niet meer. Nodig deze persoon uit voor Signal om het gesprek hier te houden.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Deze persoon gebruikt Molly niet meer. Nodig deze persoon uit voor Molly om het gesprek hier te houden.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Uitnodigen voor Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Uitnodigen voor Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Je wordt er binnenkort weer aan herinnerd.</string>
 
@@ -545,11 +546,13 @@
     <string name="ConversationFragment_delete_for_everyone">Verwijderen voor iedereen</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Verwijderen van dit apparaat</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Verwijderen</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Verwijderen van alle apparaten</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Dit bericht wordt verwijderd voor iedereen in de chat als ze een recente versie van Signal gebruiken. Ze kunnen zien dat je een bericht hebt verwijderd.</string>
     <string name="ConversationFragment_quoted_message_not_found">Oorspronkelijk bericht niet gevonden</string>
-    <string name="ConversationFragment_quoted_message_no_longer_available">Het oorspronkelijke bericht is niet langer beschikbaar</string>
+    <string name="ConversationFragment_quoted_message_no_longer_available">Oorspronkelijk bericht niet langer beschikbaar.</string>
     <string name="ConversationFragment_failed_to_open_message">Openen van bericht is mislukt</string>
     <string name="ConversationFragment_you_can_swipe_to_the_right_reply">Je kunt elk bericht naar rechts vegen om snel een reactie te schijven</string>
     <string name="ConversationFragment_you_can_swipe_to_the_left_reply">Je kunt elk bericht naar links vegen om snel een reactie te schijven</string>
@@ -559,7 +562,7 @@
     <string name="ConversationFragment__d_group_members_have_the_same_name">%1$d groepsleden hebben dezelfde naam.</string>
     <string name="ConversationFragment__tap_to_review">Tik hier om ze te vergelijken</string>
     <!-- The body of a banner that can show up at the top of a chat, letting the user know that you have two contacts with the same name -->
-    <string name="ConversationFragment__review_banner_body">Deze persoon heeft dezelfde naam als een andere contactpersoon.</string>
+    <string name="ConversationFragment__review_banner_body">Deze persoon heeft dezelfde naam als een ander contact.</string>
     <string name="ConversationFragment_contact_us">Neem contact met ons op</string>
     <string name="ConversationFragment_verify">Verifiëren</string>
     <string name="ConversationFragment_not_now">Niet nu</string>
@@ -568,7 +571,7 @@
     <!-- Dialog title for block group link join requests -->
     <string name="ConversationFragment__block_request">Verzoek blokkeren?</string>
     <!-- Dialog message for block group link join requests -->
-    <string name="ConversationFragment__s_will_not_be_able_to_join_or_request_to_join_this_group_via_the_group_link">%1$s zal niet langer via de groepslink lid kunnen worden van deze groep en ook niet kunnen verzoeken om lid te worden van de groep. Deze persoon kan dan nog wel lid worden via een uitnodiging.</string>
+    <string name="ConversationFragment__s_will_not_be_able_to_join_or_request_to_join_this_group_via_the_group_link">%1$s zal niet langer via de groepslink lid kunnen worden of kunnen verzoeken om lid te worden van deze groep. Deze persoon kan nog wel handmatig aan de groep worden toegevoegd.</string>
     <!-- Dialog confirm block request button -->
     <string name="ConversationFragment__block_request_button">Verzoek blokkeren</string>
     <!-- Dialog cancel block request button -->
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Geblokkeerd</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Signal bijwerken</string>
+    <string name="ConversationFragment__update_build">Molly bijwerken</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Signal opnieuw registreren</string>
+    <string name="ConversationFragment__reregister_signal">Molly opnieuw registreren</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Ga terug.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signal openen</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Molly openen</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Niet langer geverifieerd</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Hiermee wordt de geselecteerde chat permanent verwijderd.</item>
         <item quantity="other">Hiermee worden de geselecteerde chats permanent verwijderd.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Hiermee wordt de geselecteerde chat permanent van al je apparaten verwijderd.</item>
+        <item quantity="other">Hiermee worden alle %1$d geselecteerde chats permanent van al je apparaten verwijderd.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Aan het verwijderen</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Geselecteerde chat verwijderen…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Wie kan mij via mijn nummer vinden?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Iedereen die je telefoonnummer heeft, kan zien dat je een Signal-gebruiker bent en kan een chat met je beginnen.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Iedereen die je telefoonnummer heeft, kan zien dat je een Molly-gebruiker bent en kan een chat met je beginnen.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Niemand kan zien dat je een Signal-gebruiker bent, tenzij je hen een bericht stuurt of een bestaande chat met iemand hebt.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Niemand kan zien dat je een Molly-gebruiker bent, tenzij je hen een bericht stuurt of een bestaande chat met iemand hebt.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Back-upgegevens terugzetten?</string>
@@ -764,7 +772,7 @@
     <string name="BackupsPreferenceFragment__chat_backups">Back-up van chats</string>
     <string name="BackupsPreferenceFragment__backups_are_encrypted_with_a_passphrase">Back-ups worden versleuteld met een wachtwoord en alleen op je eigen apparaat opgeslagen.</string>
     <string name="BackupsPreferenceFragment__create_backup">Nu back-up maken</string>
-    <string name="BackupsPreferenceFragment__last_backup">Meest recente back-up: %1$s</string>
+    <string name="BackupsPreferenceFragment__last_backup">Laatste back-up: %1$s</string>
     <string name="BackupsPreferenceFragment__backup_folder">Back-uplocatie</string>
     <!-- Title for a preference item allowing the user to selected the hour of the day when their chats are backed up. -->
     <string name="BackupsPreferenceFragment__backup_time">Back-uptijd</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Test je back-upwachtwoord om na te gaan of je het juiste wachtwoord hebt onthouden</string>
     <string name="BackupsPreferenceFragment__turn_on">Inschakelen</string>
     <string name="BackupsPreferenceFragment__turn_off">Uitschakelen</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Om je gegevens uit een back-up terug te zetten moet je Signal opnieuw installeren. Open vervolgens de app en tik op ‘Back-upgegevens terugzetten’. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Om je gegevens uit een back-up terug te zetten moet je Molly opnieuw installeren. Open vervolgens de app en tik op ‘Back-upgegevens terugzetten’. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Meer lezen</string>
     <string name="BackupsPreferenceFragment__in_progress">Wordt nu uitgevoerd…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">Tot nu toe %1$d…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% tot nu toe…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal heeft toegang tot de opslagruimte nodig om back-ups te kunnen maken, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Opslagruimte’ in.</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly heeft toegang tot de opslagruimte nodig om back-ups te kunnen maken, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Opslagruimte’ in.</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Stel back-uptijd in</string>
 
@@ -792,7 +800,7 @@
 
     <!-- AvatarSelectionBottomSheetDialogFragment -->
     <string name="AvatarSelectionBottomSheetDialogFragment__taking_a_photo_requires_the_camera_permission">Het maken van een foto vereist toestemming om de camera te gebruiken.</string>
-    <string name="AvatarSelectionBottomSheetDialogFragment__viewing_your_gallery_requires_the_storage_permission">Om je galerij weer te kunnen geven is toestemming om de opslag te gebruiken nodig.</string>
+    <string name="AvatarSelectionBottomSheetDialogFragment__viewing_your_gallery_requires_the_storage_permission">Om je galerij te kunnen weergeven is toestemming om de opslag te gebruiken nodig.</string>
 
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Nu</string>
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Chatsessie vernieuwd</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Het kan soms nodig zijn om je chatsessie te vernieuwen. Dit heeft geen invloed op de beveiliging van je chat, maar het is mogelijk dat je een bericht van je contactpersoon hebt gemist. Vraag je contactpersoon eventueel om de meest recente berichten opnieuw te verzenden.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Het kan soms nodig zijn om je chatsessie te vernieuwen. Dit heeft geen invloed op de beveiliging van je chat, maar het is mogelijk dat je een bericht van je contact hebt gemist. Vraag je contact eventueel om de meest recente berichten opnieuw te verzenden.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Gebruik Signal op een desktop of iPad. Je berichten worden gesynchroniseerd met je gekoppelde apparaten.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Een nieuw apparaat koppelen</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Berichten en chatgegevens worden beschermd door end-to-end-versleuteling op al je apparaten</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal op een desktop of iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Alle berichten op gekoppelde apparaten zijn privé</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Molly-berichten worden na het koppelen gesynchroniseerd met Molly op je mobiele telefoon. Je eerdere chatgeschiedenis wordt niet weergegeven.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Ga op je andere apparaat naar %1$s om Molly te installeren</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Mijn gekoppelde apparaten</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Ontkoppelen</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s is ontkoppeld</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Apparaat aan het koppelen…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Succesvol gekoppeld</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Aan het laden…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Geen gekoppelde apparaten</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Ontgrendel om een apparaat te koppelen</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Scan de QR-code die wordt weergegeven op het te koppelen apparaat.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">QR-code scannen</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Gebruik dit apparaat om de QR-code te scannen die wordt weergegeven op het apparaat dat je wilt koppelen</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Oké</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Dit apparaat zal je groepen en contacten kunnen inzien, toegang krijgen tot je chats en berichten in jouw naam kunnen versturen.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Voltooi het koppelen op je andere apparaat</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Voltooi het koppelen van Molly op je andere apparaat.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Koppelen van apparaat mislukt</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Deze QR-code is ongeldig. Zorg dat je de QR-code scant die wordt weergeven op het apparaat dat je wilt koppelen.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Opnieuw proberen</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">‘%1$s’ ontkoppelen?</string>
@@ -865,14 +928,14 @@
     <string name="DeviceListItem_today">Vandaag</string>
 
     <!-- DocumentView -->
-    <string name="DocumentView_unnamed_file">Onbenoemd bestand</string>
+    <string name="DocumentView_unnamed_file">Naamloos bestand</string>
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimaliseren voor ontbrekende Google Play Services</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Dit apparaat biedt geen ondersteuning voor Google Play Services. Tik hier om batterijoptimalisaties uit te schakelen, die Signal momenteel verhinderen om berichten te ontvangen op de achtergrond.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Dit apparaat biedt geen ondersteuning voor Google Play Services. Tik hier om batterij-optimalisaties uit te schakelen, die Molly momenteel verhinderen om berichten te ontvangen op de achtergrond.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Deze versie van Signal is verlopen. Werk Signal nu bij om berichten te kunnen verzenden en ontvangen.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Deze versie van Molly is verlopen. Werk Molly nu bij om berichten te kunnen verzenden en ontvangen.</string>
     <string name="ExpiredBuildReminder_update_now">Nu bijwerken</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Weergeven</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Pertinente Signal-communicatiefout!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal was niet in staat zich bij Google Play services op je telefoon te registreren. Signal-berichten en -oproepen zijn nu uitgeschakeld, probeer opnieuw te registreren via Instellingen &gt; Privacy &gt; Geavanceerd.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Pertinente Molly-communicatiefout!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly was niet in staat zich bij Google Play Services te registreren. Molly-berichten en -oproepen zijn nu uitgeschakeld, probeer opnieuw te registreren via Instellingen &gt; Privacy &gt; Geavanceerd.</string>
 
 
     <!-- GiphyActivity -->
@@ -937,7 +1000,7 @@
     <!-- GroupsV1MigrationLearnMoreBottomSheetDialogFragment -->
     <string name="GroupsV1MigrationLearnMore_what_are_new_groups">Wat zijn ‘nieuwe-stijl’ groepen?</string>
     <string name="GroupsV1MigrationLearnMore_new_groups_have_features_like_mentions">Nieuwe-stijl groepen hebben functionaliteiten waaronder @vermeldingen en groepsbeheer en in de toekomst zullen er meer functionaliteiten aan worden toegevoegd.</string>
-    <string name="GroupsV1MigrationLearnMore_all_message_history_and_media_has_been_kept">Alle gespreksgeschiedenis en media van voor het omzetten zijn behouden gebleven.</string>
+    <string name="GroupsV1MigrationLearnMore_all_message_history_and_media_has_been_kept">Alle chatgeschiedenis en media van voor het omzetten zijn behouden gebleven.</string>
     <string name="GroupsV1MigrationLearnMore_you_will_need_to_accept_an_invite_to_join_this_group_again">Om weer lid te worden van deze groep zul je een uitnodiging moeten accepteren. Je zult geen berichten van deze groep ontvangen zolang je dat nog niet hebt gedaan.</string>
     <plurals name="GroupsV1MigrationLearnMore_these_members_will_need_to_accept_an_invite">
         <item quantity="one">Dit groepslid zal opnieuw een uitnodiging om tot de groep toe te treden moeten accepteren en zal geen berichten krijgen zolang dit is geaccepteerd:</item>
@@ -952,7 +1015,7 @@
     <string name="GroupsV1MigrationInitiation_upgrade_to_new_group">Omzetten naar nieuwe-stijl groep</string>
     <string name="GroupsV1MigrationInitiation_upgrade_this_group">Deze groep omzetten naar een nieuwe groep</string>
     <string name="GroupsV1MigrationInitiation_new_groups_have_features_like_mentions">Nieuwe-stijl groepen hebben functionaliteiten waaronder @vermeldingen en groepsbeheer en in de toekomst zullen er meer functionaliteiten aan worden toegevoegd.</string>
-    <string name="GroupsV1MigrationInitiation_all_message_history_and_media_will_be_kept">Alle gespreksgeschiedenis en media van voor het omzetten zullen behouden blijven.</string>
+    <string name="GroupsV1MigrationInitiation_all_message_history_and_media_will_be_kept">Alle chatgeschiedenis en media van voor het omzetten zullen behouden blijven.</string>
     <string name="GroupsV1MigrationInitiation_encountered_a_network_error">Er is een netwerkfout opgetreden. Probeer het later opnieuw.</string>
     <string name="GroupsV1MigrationInitiation_failed_to_upgrade">Omzetten is mislukt.</string>
     <plurals name="GroupsV1MigrationInitiation_these_members_will_need_to_accept_an_invite">
@@ -993,8 +1056,8 @@
         <item quantity="other">Het toevoegen van groepsleden is mislukt. Probeer het later opnieuw.</item>
     </plurals>
     <plurals name="GroupsV1MigrationSuggestionsDialog_cannot_add_members">
-        <item quantity="one">Een groepslid kon niet toevoegen.</item>
-        <item quantity="other">Groepsleden konden niet worden toevoegen.</item>
+        <item quantity="one">Een groepslid kon niet worden toegevoegd.</item>
+        <item quantity="other">Groepsleden konden niet worden toegevoegd.</item>
     </plurals>
 
     <!-- LeaveGroupDialog -->
@@ -1023,27 +1086,37 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Foutopsporingslogs helpen ons het probleem te diagnosticeren en op te lossen, en bevatten geen identificerende informatie.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Er heeft zich een probleem voorgedaan bij Signal. Foutopsporingslog indienen?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Er heeft zich een probleem voorgedaan bij Molly. Foutopsporingslog indienen?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Meldingen zijn mogelijk vertraagd vanwege batterij-optimalisaties</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Je kunt batterij-optimalisaties uitschakelen zodat Signal ervoor kan zorgen dat berichtmeldingen niet worden vertraagd.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Je kunt batterij-optimalisaties uitschakelen zodat Molly ervoor kan zorgen dat berichtmeldingen niet worden vertraagd.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Meldingen zijn mogelijk vertraagd vanwege batterij-optimalisaties</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Schakel batterij-optimalisaties uit voor Molly zodat berichtmeldingen hierdoor niet worden vertraagd. Tik op ‘Doorgaan’ om apparaatspecifieke instructies te bekijken.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Nee bedankt</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Doorgaan</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Doorgaan</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Sluiten</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Nee bedankt</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Uitnodigingen in afwachting</string>
+    <string name="PendingMembersActivity_pending_group_invites">Verzoeken &amp; uitnodigingen</string>
     <string name="PendingMembersActivity_requests">Verzoeken</string>
     <string name="PendingMembersActivity_invites">Uitnodigingen</string>
-    <string name="PendingMembersActivity_people_you_invited">Personen die jij voor de groep hebt uitgenodigd</string>
-    <string name="PendingMembersActivity_you_have_no_pending_invites">Er zijn geen door jou verzonden uitnodigingen in afwachting van een reactie.</string>
-    <string name="PendingMembersActivity_invites_by_other_group_members">Personen die door andere leden voor de groep zijn uitgenodigd</string>
-    <string name="PendingMembersActivity_no_pending_invites_by_other_group_members">Er zijn geen door andere groepsleden verzonden uitnodigingen in afwachting van een reactie.</string>
-    <string name="PendingMembersActivity_missing_detail_explanation">Profielinformatie van personen die door andere groepsleden zijn uitgenodigd wordt niet weergegeven. Pas als een genodigde er voor kiest de uitnodiging te accepteren, dan zullen op dat moment diens profielnaam, -foto en -omschrijving zichtbaar worden voor de groep. Zolang deze personen de uitnodiging niet geaccepteerd hebben zullen ze nog geen groepsberichten ontvangen.</string>
+    <string name="PendingMembersActivity_people_you_invited">Door jou uitgenodigd</string>
+    <string name="PendingMembersActivity_you_have_no_pending_invites">Geen openstaande uitnodigingen.</string>
+    <string name="PendingMembersActivity_invites_by_other_group_members">Door andere leden uitgenodigd</string>
+    <string name="PendingMembersActivity_no_pending_invites_by_other_group_members">Geen openstaande uitnodigingen.</string>
+    <string name="PendingMembersActivity_missing_detail_explanation">Profielinformatie van personen die door andere groepsleden zijn uitgenodigd wordt pas weergegeven zodra ze de uitnodiging accepteren. Zolang deze personen de uitnodiging niet hebben geaccepteerd zullen ze nog geen groepsberichten ontvangen.</string>
 
     <string name="PendingMembersActivity_revoke_invite">Uitnodiging intrekken</string>
     <string name="PendingMembersActivity_revoke_invites">Uitnodigingen intrekken</string>
@@ -1058,7 +1131,7 @@
 
     <!-- RequestingMembersFragment -->
     <string name="RequestingMembersFragment_pending_member_requests">Lidmaatschapsverzoeken in afwachting</string>
-    <string name="RequestingMembersFragment_no_member_requests_to_show">Er zijn geen lidmaatschapsverzoeken om weer te geven.</string>
+    <string name="RequestingMembersFragment_no_member_requests_to_show">Geen openstaande lidmaatschapsverzoeken.</string>
     <string name="RequestingMembersFragment_explanation">Personen in deze lijst proberen via de groepslink lid te worden van deze groep.</string>
     <string name="RequestingMembersFragment_added_s">"‘%1$s’ toegevoegd"</string>
     <string name="RequestingMembersFragment_denied_s">"‘%1$s’ afgewezen"</string>
@@ -1067,7 +1140,7 @@
     <string name="AddMembersActivity__done">Klaar</string>
     <string name="AddMembersActivity__this_person_cant_be_added_to_legacy_groups">Deze persoon kan niet worden toegevoegd aan verouderde groepen.</string>
     <plurals name="AddMembersActivity__add_d_members_to_s">
-        <item quantity="one">%1$s toevoegen aan %2$s?</item>
+        <item quantity="one">%1$s lid toevoegen aan %2$s?</item>
         <item quantity="other">%3$d leden toevoegen aan %2$s?</item>
     </plurals>
     <string name="AddMembersActivity__add">Toevoegen</string>
@@ -1085,12 +1158,12 @@
     <string name="AddGroupDetailsFragment__group_creation_failed">Nieuwe groep aanmaken is mislukt</string>
     <string name="AddGroupDetailsFragment__try_again_later">Probeer het later opnieuw.</string>
     <string name="AddGroupDetailsFragment__remove">Verwijderen</string>
-    <string name="AddGroupDetailsFragment__sms_contact">Sms-contactpersoon</string>
+    <string name="AddGroupDetailsFragment__sms_contact">Sms-contact</string>
     <string name="AddGroupDetailsFragment__remove_s_from_this_group">%1$s uit deze groep verwijderen?</string>
     <!-- Info message shown in the middle of the screen, displayed when adding group details to an MMS Group -->
-    <string name="AddGroupDetailsFragment__youve_selected_a_contact_that_doesnt_support">Je hebt een contactpersoon geselecteerd die geen Signal-groepen heeft, dus dit zal een mms-groep zijn. Aangepaste mms-groepsnamen en -foto\'s zullen alleen voor jou zichtbaar zijn.</string>
+    <string name="AddGroupDetailsFragment__youve_selected_a_contact_that_doesnt_support">Je hebt een contact geselecteerd die geen Signal-groepen heeft, dus dit zal een mms-groep zijn. Aangepaste mms-groepsnamen en -foto\'s zullen alleen voor jou zichtbaar zijn.</string>
     <!-- Info message shown in the middle of the screen, displayed when adding group details to an MMS Group after SMS Phase 0 -->
-    <string name="AddGroupDetailsFragment__youve_selected_a_contact_that_doesnt_support_signal_groups_mms_removal">Je hebt een contactpersoon geselecteerd die geen Signal-groepen heeft, dus deze groep zal gebruikmaken van mms. Zelf ingestelde mms-groepsnamen en groepsafbeeldingen zullen alleen voor jou zichtbaar zijn. Ondersteuning voor mms-groepen wordt binnenkort verwijderd, zodat we ons kunnen richten op versleutelde berichten.</string>
+    <string name="AddGroupDetailsFragment__youve_selected_a_contact_that_doesnt_support_signal_groups_mms_removal">Je hebt een contact geselecteerd die geen Signal-groepen heeft, dus deze groep zal gebruikmaken van mms. Zelf ingestelde mms-groepsnamen en groepsafbeeldingen zullen alleen voor jou zichtbaar zijn. Ondersteuning voor mms-groepen wordt binnenkort verwijderd, zodat we ons kunnen richten op versleutelde berichten.</string>
 
     <!-- ManageGroupActivity -->
     <string name="ManageGroupActivity_who_can_add_new_members">Wie mogen nieuwe leden toevoegen?</string>
@@ -1101,7 +1174,7 @@
         <item quantity="other">%1$d personen toegevoegd.</item>
     </plurals>
 
-    <string name="ManageGroupActivity_you_dont_have_the_rights_to_do_this">Je hebt geen recht om dit te doen</string>
+    <string name="ManageGroupActivity_you_dont_have_the_rights_to_do_this">Je hebt geen rechten om dit te doen</string>
     <string name="ManageGroupActivity_not_capable">Iemand die je hebt toegevoegd ondersteunt vernieuwde groepen niet en moet Signal bijwerken.</string>
     <string name="ManageGroupActivity_not_announcement_capable">Ten minste een persoon die je hebt toegevoegd moet eerst Signal bijwerken voordat ze aan mededelingsgroepen kunnen worden toegevoegd.</string>
     <string name="ManageGroupActivity_failed_to_update_the_group">Bijwerken van de groep is mislukt</string>
@@ -1119,11 +1192,11 @@
     <string name="ManageGroupActivity_upgrade_this_group">moet je deze groep omzetten.</string>
     <string name="ManageGroupActivity_this_is_an_insecure_mms_group">Dit is een onbeveiligde mms-groep. Nodig je contacten uit voor Signal Messenger om beveiligde berichten uit te wisselen.</string>
     <string name="ManageGroupActivity_invite_now">Nu uitnodigen</string>
-    <string name="ManageGroupActivity_more"> meer</string>
+    <string name="ManageGroupActivity_more">meer</string>
     <string name="ManageGroupActivity_add_group_description">Voeg een groepsomschrijving toe…</string>
 
     <!-- GroupMentionSettingDialog -->
-    <string name="GroupMentionSettingDialog_notify_me_for_mentions">Meldingen bij naamsvermeldingen</string>
+    <string name="GroupMentionSettingDialog_notify_me_for_mentions">Meldingen bij vermeldingen</string>
     <string name="GroupMentionSettingDialog_receive_notifications_when_youre_mentioned_in_muted_chats">Wil je toch meldingen ontvangen als iemand je naam in een gedempt chat vermeldt?</string>
     <string name="GroupMentionSettingDialog_always_notify_me">Geef me altijd een melding</string>
     <string name="GroupMentionSettingDialog_dont_notify_me">Geen meldingen als gedempt</string>
@@ -1223,7 +1296,7 @@
     <!-- Title shown when there was an known issue getting group information from a group link -->
     <string name="GroupJoinBottomSheetDialogFragment_cant_join_group">Kan niet lid worden van de groep</string>
     <!-- Message shown when you try to get information for a group via link but an admin has removed you -->
-    <string name="GroupJoinBottomSheetDialogFragment_you_cant_join_this_group_via_the_group_link_because_an_admin_removed_you">Je kunt niet door middel van een groepslink lid worden van deze groep omdat je door een beheerder uit deze groep bent verwijderd.</string>
+    <string name="GroupJoinBottomSheetDialogFragment_you_cant_join_this_group_via_the_group_link_because_an_admin_removed_you">Je kunt niet via de groepslink lid worden van deze groep omdat je door een beheerder uit deze groep bent verwijderd.</string>
     <!-- Message shown when you try to get information for a group via link but the link is no longer valid -->
     <string name="GroupJoinBottomSheetDialogFragment_this_group_link_is_no_longer_valid">Deze groepslink is niet langer geldig.</string>
     <!-- Title shown when there was an unknown issue getting group information from a group link -->
@@ -1253,7 +1326,7 @@
 
     <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_unable_to_enable_group_link_please_try_again_later">Kan de groepslink niet inschakelen, probeer het later opnieuw.</string>
     <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_encountered_a_network_error">Er is een netwerkfout opgetreden.</string>
-    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_you_dont_have_the_right_to_enable_group_link">Je hebt geen toestemming om een groepslink in te schakelen. Vraag een beheerder om dit te doen.</string>
+    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_you_dont_have_the_right_to_enable_group_link">Je hebt geen toestemming om de groepslink in te schakelen. Vraag een beheerder om dit te doen.</string>
     <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_you_are_not_currently_a_member_of_the_group">Je bent momenteel geen lid van deze groep.</string>
 
     <!-- GV2 Request confirmation dialog -->
@@ -1277,19 +1350,19 @@
 
     <!-- InviteActivity -->
     <string name="InviteActivity_share">Delen via andere app</string>
-    <string name="InviteActivity_share_with_contacts">Contactpersonen kiezen (sms)</string>
+    <string name="InviteActivity_share_with_contacts">Delen met contacten</string>
     <string name="InviteActivity_share_via">Delen via …</string>
 
     <string name="InviteActivity_cancel">Annuleren</string>
     <string name="InviteActivity_sending">Bezig met verzenden…</string>
     <string name="InviteActivity_invitations_sent">Uitnodigingen verzonden!</string>
-    <string name="InviteActivity_invite_to_signal">Uitnodigen voor Signal</string>
+    <string name="InviteActivity_invite_to_signal">Uitnodigen voor Molly</string>
     <string name="InviteActivity_send_sms">Sms verzenden (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">%1$d sms-uitnodiging verzenden?</item>
         <item quantity="other">%1$d sms-uitnodigingen verzenden?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Laten we Signal gebruiken om een gesprek te voeren: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Laten we Molly gebruiken om een gesprek te voeren: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Het lijkt erop dat je geen apps hebt waarmee je een uitnodiging kan verzenden.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Jouw volledige bericht</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Berichten ontvangen in de achtergrond is actief</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,15 +1445,15 @@
     <string name="MessageQuotesBottomSheet_replies">Reacties</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal-oproep aan het opzetten</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly-oproep aan het opzetten</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signal-oproepen starten</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal-oproep-ondersteuning wordt gestopt</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Molly-oproepen starten</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly-oproep wordt gestopt</string>
     <string name="NotificationBarManager__cancel_call">Oproep annuleren</string>
 
     <!-- NotificationsMegaphone -->
     <string name="NotificationsMegaphone_turn_on_notifications">Meldingen inschakelen?</string>
-    <string name="NotificationsMegaphone_never_miss_a_message">Mis nooit een melding van je contactpersonen en groepen.</string>
+    <string name="NotificationsMegaphone_never_miss_a_message">Mis nooit een bericht van je contacten en groepen.</string>
     <string name="NotificationsMegaphone_turn_on">Inschakelen</string>
     <string name="NotificationsMegaphone_not_now">Niet nu</string>
 
@@ -1401,7 +1474,7 @@
 
     <!-- MessageRecord -->
     <string name="MessageRecord_unknown">Onbekend</string>
-    <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Dit bericht gebruikt verouderde versleuteling van een Signal-versie die niet langer wordt ondersteund. Vraag de afzender om bij te werken naar de meest recente versie en het bericht opnieuw te verzenden.</string>
+    <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Dit bericht gebruikt verouderde versleuteling van een Signal-versie die niet langer wordt ondersteund. Vraag de afzender om Signal bij te werken naar de meest recente versie en het bericht opnieuw te verzenden.</string>
     <string name="MessageRecord_left_group">Je hebt de groep verlaten.</string>
     <string name="MessageRecord_you_updated_group">Je hebt de groep aangepast.</string>
     <string name="MessageRecord_the_group_was_updated">De groep is aangepast.</string>
@@ -1431,7 +1504,7 @@
     <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s heeft de timer voor verdwijnende berichten op %2$s ingesteld.</string>
     <string name="MessageRecord_disappearing_message_time_set_to_s">De timer voor verdwijnende berichten is op %1$s ingesteld.</string>
     <string name="MessageRecord_this_group_was_updated_to_a_new_group">Deze groep is omgezet in een nieuwe-stijl groep.</string>
-    <string name="MessageRecord_you_couldnt_be_added_to_the_new_group_and_have_been_invited_to_join">Je kon niet toegevoegd worden aan de nieuwe groep en je hebt daarom een uitnodiging gekregen om opnieuw lid te worden.</string>
+    <string name="MessageRecord_you_couldnt_be_added_to_the_new_group_and_have_been_invited_to_join">Je kon niet worden toegevoegd aan de nieuwe groep en je hebt daarom een uitnodiging gekregen om opnieuw lid te worden.</string>
     <string name="MessageRecord_chat_session_refreshed">Chatsessie vernieuwd</string>
     <plurals name="MessageRecord_members_couldnt_be_added_to_the_new_group_and_have_been_invited">
         <item quantity="one">Een lid kan niet worden toegevoegd aan de nieuwe groep en is uitgenodigd om lid te worden.</item>
@@ -1460,7 +1533,7 @@
     <string name="MessageRecord_s_added_s">%1$s heeft %2$s toegevoegd aan de groep.</string>
     <string name="MessageRecord_s_added_you">%1$s heeft je toegevoegd aan de groep.</string>
     <string name="MessageRecord_you_joined_the_group">Je bent lid geworden van de groep.</string>
-    <string name="MessageRecord_s_joined_the_group">%1$s zijn toegevoegd aan de groep.</string>
+    <string name="MessageRecord_s_joined_the_group">%1$s is lid geworden van de groep.</string>
 
     <!-- GV2 member removals -->
     <string name="MessageRecord_you_removed_s">Je hebt %1$s verwijderd.</string>
@@ -1505,7 +1578,7 @@
         <item quantity="one">%1$s heeft een groepsuitnodiging ingetrokken.</item>
         <item quantity="other">%1$s heeft %2$d groepsuitnodigingen ingetrokken.</item>
     </plurals>
-    <string name="MessageRecord_someone_declined_an_invitation_to_the_group">Iemand heeft de groepsuitnodiging afgewezen.</string>
+    <string name="MessageRecord_someone_declined_an_invitation_to_the_group">Iemand heeft een groepsuitnodiging afgewezen.</string>
     <string name="MessageRecord_you_declined_the_invitation_to_the_group">Je hebt de groepsuitnodiging afgewezen.</string>
     <string name="MessageRecord_s_revoked_your_invitation_to_the_group">%1$s heeft je groepsuitnodiging ingetrokken.</string>
     <string name="MessageRecord_an_admin_revoked_your_invitation_to_the_group">Een beheerder heeft je groepsuitnodiging ingetrokken.</string>
@@ -1516,14 +1589,14 @@
 
     <!-- GV2 invitation acceptance -->
     <string name="MessageRecord_you_accepted_invite">Je hebt de groepsuitnodiging geaccepteerd.</string>
-    <string name="MessageRecord_s_accepted_invite">%1$s heeft de groepsuitnodiging geaccepteerd.</string>
+    <string name="MessageRecord_s_accepted_invite">%1$s heeft een groepsuitnodiging geaccepteerd.</string>
     <string name="MessageRecord_you_added_invited_member_s">Je hebt de uitgenodigde %1$s toegevoegd.</string>
-    <string name="MessageRecord_s_added_invited_member_s">%1$s heeft voorheen uitgenodigde %2$s toegevoegd.</string>
+    <string name="MessageRecord_s_added_invited_member_s">%1$s heeft de uitgenodigde %2$s toegevoegd.</string>
 
     <!-- GV2 title change -->
-    <string name="MessageRecord_you_changed_the_group_name_to_s">Je hebt de naam van de groep gewijzigd naar ‘%1$s’.</string>
-    <string name="MessageRecord_s_changed_the_group_name_to_s">%1$s heeft de naam van de groep naar ‘%2$s’ gewijzigd.</string>
-    <string name="MessageRecord_the_group_name_has_changed_to_s">De naam van de groep is naar ‘%1$s’ gewijzigd.</string>
+    <string name="MessageRecord_you_changed_the_group_name_to_s">Je hebt de groepsnaam gewijzigd naar ‘%1$s’.</string>
+    <string name="MessageRecord_s_changed_the_group_name_to_s">%1$s heeft de groepsnaam gewijzigd naar ‘%2$s’.</string>
+    <string name="MessageRecord_the_group_name_has_changed_to_s">De groepsnaam is gewijzigd naar ‘%1$s’.</string>
 
     <!-- GV2 description change -->
     <string name="MessageRecord_you_changed_the_group_description">Je hebt de groepsomschrijving aangepast.</string>
@@ -1541,17 +1614,17 @@
     <string name="MessageRecord_who_can_edit_group_info_has_been_changed_to_s">De instelling voor wie de groepsinformatie kan bewerken is op ‘%1$s’ ingesteld.</string>
 
     <!-- GV2 membership access level change -->
-    <string name="MessageRecord_you_changed_who_can_edit_group_membership_to_s">Je hebt de instelling voor wie de groepslidmaatschap kan bewerken op ‘%1$s’ ingesteld.</string>
-    <string name="MessageRecord_s_changed_who_can_edit_group_membership_to_s">%1$s heeft de instelling voor wie de groepslidmaatschap kan bewerken op ‘%2$s’ ingesteld.</string>
-    <string name="MessageRecord_who_can_edit_group_membership_has_been_changed_to_s">De instelling voor wie de groepslidmaatschap kan bewerken is op ‘%1$s’ ingesteld.</string>
+    <string name="MessageRecord_you_changed_who_can_edit_group_membership_to_s">Je hebt de instelling voor wie het groepslidmaatschap kan bewerken op ‘%1$s’ ingesteld.</string>
+    <string name="MessageRecord_s_changed_who_can_edit_group_membership_to_s">%1$s heeft de instelling voor wie het groepslidmaatschap kan bewerken op ‘%2$s’ ingesteld.</string>
+    <string name="MessageRecord_who_can_edit_group_membership_has_been_changed_to_s">De instelling voor wie het groepslidmaatschap kan bewerken is op ‘%1$s’ ingesteld.</string>
 
     <!-- GV2 announcement group change -->
-    <string name="MessageRecord_you_allow_all_members_to_send">Je hebt de groepsinstellingen aangepast om alle groepsleden de mogelijkheid te geven om berichten te verzenden en oproepen te beginnen.</string>
-    <string name="MessageRecord_you_allow_only_admins_to_send">Je hebt de groepsinstellingen aangepast om uitsluitend beheerders de mogelijkheid te geven om berichten te verzenden en oproepen te beginnen.</string>
-    <string name="MessageRecord_s_allow_all_members_to_send">%1$s heeft de groepsinstellingen aangepast om alle groepsleden de mogelijkheid te geven om berichten te verzenden en oproepen te beginnen.</string>
-    <string name="MessageRecord_s_allow_only_admins_to_send">%1$s heeft de groepsinstellingen aangepast om uitsluitend beheerders de mogelijkheid te geven om berichten te verzenden en oproepen te beginnen.</string>
-    <string name="MessageRecord_allow_all_members_to_send">De groepsinstellingen zijn aangepast om alle groepsleden de mogelijkheid te geven om berichten te verzenden en oproepen te beginnen.</string>
-    <string name="MessageRecord_allow_only_admins_to_send">De groepsinstellingen zijn aangepast om uitsluitend beheerders de mogelijkheid te geven om berichten te verzenden en oproepen te beginnen.</string>
+    <string name="MessageRecord_you_allow_all_members_to_send">Je hebt de groepsinstellingen aangepast zodat alle groepsleden berichten kunnen verzenden en oproepen kunnen beginnen.</string>
+    <string name="MessageRecord_you_allow_only_admins_to_send">Je hebt de groepsinstellingen aangepast zodat uitsluitend beheerders berichten kunnen verzenden en oproepen kunnen beginnen.</string>
+    <string name="MessageRecord_s_allow_all_members_to_send">%1$s heeft de groepsinstellingen aangepast zodat alle groepsleden berichten kunnen verzenden en oproepen kunnen beginnen.</string>
+    <string name="MessageRecord_s_allow_only_admins_to_send">%1$s heeft de groepsinstellingen aangepast zodat uitsluitend beheerders berichten kunnen verzenden en oproepen kunnen beginnen.</string>
+    <string name="MessageRecord_allow_all_members_to_send">De groepsinstellingen zijn aangepast zodat alle groepsleden berichten kunnen verzenden en oproepen kunnen beginnen.</string>
+    <string name="MessageRecord_allow_only_admins_to_send">De groepsinstellingen zijn aangepast zodat uitsluitend beheerders berichten kunnen verzenden en oproepen kunnen beginnen.</string>
 
     <!-- GV2 group link invite access level change -->
     <string name="MessageRecord_you_turned_on_the_group_link_with_admin_approval_off">Je hebt de groepslink zonder beheerdersgoedkeuring van nieuwe leden ingeschakeld.</string>
@@ -1605,18 +1678,18 @@
     <!-- End of GV2 specific update messages -->
 
     <string name="MessageRecord_your_safety_number_with_s_has_changed">Je veiligheidsnummer met %1$s is veranderd.</string>
-    <string name="MessageRecord_you_marked_your_safety_number_with_s_verified">Je hebt je veiligheidsnummer met %1$s gemarkeerd als ‘geverifieerd’</string>
-    <string name="MessageRecord_you_marked_your_safety_number_with_s_verified_from_another_device">Je hebt je veiligheidsnummer met %1$s vanaf een ander apparaat gemarkeerd als ‘geverifieerd’</string>
-    <string name="MessageRecord_you_marked_your_safety_number_with_s_unverified">Je hebt je veiligheidsnummer met %1$s gemarkeerd als ‘niet geverifieerd’</string>
-    <string name="MessageRecord_you_marked_your_safety_number_with_s_unverified_from_another_device">Je hebt je veiligheidsnummer met %1$s vanaf een ander apparaat gemarkeerd als ‘niet geverifieerd’</string>
+    <string name="MessageRecord_you_marked_your_safety_number_with_s_verified">Je hebt je veiligheidsnummer met %1$s gemarkeerd als geverifieerd</string>
+    <string name="MessageRecord_you_marked_your_safety_number_with_s_verified_from_another_device">Je hebt je veiligheidsnummer met %1$s vanaf een ander apparaat gemarkeerd als geverifieerd</string>
+    <string name="MessageRecord_you_marked_your_safety_number_with_s_unverified">Je hebt de verificatie van je veiligheidsnummer met %1$s ongedaan gemaakt</string>
+    <string name="MessageRecord_you_marked_your_safety_number_with_s_unverified_from_another_device">Je hebt de verificatie van je veiligheidsnummer met %1$s vanaf een ander apparaat ongedaan gemaakt</string>
     <string name="MessageRecord_a_message_from_s_couldnt_be_delivered">Een bericht van %1$s kan niet worden afgeleverd</string>
     <string name="MessageRecord_s_changed_their_phone_number">%1$s heeft diens telefoonnummer gewijzigd.</string>
     <!-- Update item message shown in the release channel when someone is already a sustainer so we ask them if they want to boost. -->
     <string name="MessageRecord_like_this_new_feature_help_support_signal_with_a_one_time_donation">Vind je deze nieuwe functie leuk? Steun Signal met een eenmalige donatie.</string>
     <!-- Update item message shown when we merge two threads together. First placeholder is a name, second placeholder is a phone number. -->
-    <string name="MessageRecord_your_message_history_with_s_and_their_number_s_has_been_merged">Je berichtengeschiedenis met %1$s en diens nummer %2$s zijn samengevoegd.</string>
+    <string name="MessageRecord_your_message_history_with_s_and_their_number_s_has_been_merged">Je chatgeschiedenis met %1$s en diens nummer %2$s zijn samengevoegd.</string>
     <!-- Update item message shown when we merge two threads together and we don\'t know the phone number of the other thread. The placeholder is a person\'s name. -->
-    <string name="MessageRecord_your_message_history_with_s_and_another_chat_has_been_merged">Je berichtengeschiedenis met %1$s en een andere chat met hem of haar zijn samengevoegd.</string>
+    <string name="MessageRecord_your_message_history_with_s_and_another_chat_has_been_merged">Je chatgeschiedenis met %1$s en een andere chat met hem of haar zijn samengevoegd.</string>
     <!-- Update item message shown when you find out a phone number belongs to a person you had a conversation with. First placeholder is a phone number, second placeholder is a name. -->
     <string name="MessageRecord_s_belongs_to_s">%1$s is van %2$s</string>
     <!-- Message to notify sender that activate payments request has been sent to the recipient -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Je hebt Betalingen geactiveerd</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s kan nu Betalingen accepteren</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Betalingsgegevens zijn niet beschikbaar</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Tik voor meer</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Betalingsgegevens niet beschikbaar</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">De details van deze betaling zijn niet beschikbaar, omdat je berichten zijn hersteld vanuit een bron die deze betalingsgeschiedenis niet bevatte. Dit heeft geen invloed op het saldo in je portemonnee of de status van eerdere betalingen.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Het is binnenkort niet meer mogelijk om sms-berichten te versturen via Signal. Nodig %1$s uit voor Signal om het gesprek hier te houden.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Je kunt geen sms-berichten meer versturen in Signal. Nodig %1$s uit voor Signal om het gesprek hier te houden.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Je kunt geen sms-berichten meer versturen in Molly. Nodig %1$s uit voor Molly om het gesprek hier te houden.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Betaling: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Betaling</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Gemeld als spam</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1729,15 +1812,15 @@
     </plurals>
     <!-- Describes the number of people invited to a group. Nested inside of the string MessageRequestProfileView_members_and_invited -->
     <plurals name="MessageRequestProfileView_invited">
-        <item quantity="one">+%1$d genodigde</item>
-        <item quantity="other">+%1$d genodigden</item>
+        <item quantity="one">+ %1$d genodigde</item>
+        <item quantity="other">+ %1$d genodigden</item>
     </plurals>
     <plurals name="MessageRequestProfileView_member_of_d_additional_groups">
         <item quantity="one">%1$d extra groep</item>
         <item quantity="other">%1$d extra groepen</item>
     </plurals>
     <!-- Button label to report spam for a conversation when in a message request state -->
-    <string name="MessageRequestBottomView_report">Rapporteren…</string>
+    <string name="MessageRequestBottomView_report">Rapporteren</string>
 
     <!-- PassphraseChangeActivity -->
     <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Wachtwoorden komen niet overeen!</string>
@@ -1758,12 +1841,12 @@
     <string name="DeviceProvisioningActivity_content_progress_no_device">Geen apparaat gevonden.</string>
     <string name="DeviceProvisioningActivity_content_progress_network_error">Netwerkfout.</string>
     <string name="DeviceProvisioningActivity_content_progress_key_error">Ongeldige QR-code.</string>
-    <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Sorry, je hebt te veel apparaten gekoppeld, probeer er eerst enkele te verwijderen</string>
+    <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Sorry, je hebt al te veel apparaten gekoppeld, probeer er eerst enkele te verwijderen</string>
     <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Sorry, dit is geen geldige QR-code om een apparaat te koppelen.</string>
     <string name="DeviceProvisioningActivity_link_a_signal_device">Een Signal-apparaat koppelen?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Het lijkt erop dat je een Signal-apparaat wilt koppelen met behulp van een externe scanner. Scan voor de veiligheid de code opnieuw vanuit Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal heeft toegang tot de camera nodig om een QR-code te scannen, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Camera’ in.</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly heeft toegang tot de camera nodig om een QR-code te scannen, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Camera’ in.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Kan geen QR-code scannen zonder toegang tot camera</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Voer wachtwoord in</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal-pictogram</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly-pictogram</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Wachtwoord instellen</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Ongeldig wachtwoord!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signal ontgrendelen</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal-Android - Vergrendelingsscherm</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Molly ontgrendelen</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly-Android - Vergrendelingsscherm</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Kaart</string>
@@ -1792,18 +1875,18 @@
     <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">De versie van Google Play Services die je in gebruik hebt werkt niet zoals het hoort. Installeer Google Play Services opnieuw en probeer het opnieuw.</string>
 
     <!-- PinRestoreEntryFragment -->
-    <string name="PinRestoreEntryFragment_incorrect_pin">Foutieve pincode</string>
+    <string name="PinRestoreEntryFragment_incorrect_pin">Onjuiste pincode</string>
     <string name="PinRestoreEntryFragment_skip_pin_entry">Pincode invoeren overslaan?</string>
     <string name="PinRestoreEntryFragment_need_help">Hulp nodig?</string>
-    <string name="PinRestoreEntryFragment_your_pin_is_a_d_digit_code">Je pincode is een code welke je zelf hebt aangemaakt en welke bestaat uit %1$d of meer cijfers of een combinatie van cijfers en letters. Als je je pincode niet kunt herinneren, dan kun je een nieuwe pincode aanmaken. Je kunt je opnieuw registreren en je account gebruiken maar je verliest wel een aantal opgeslagen instellingen, zoals je profielinformatie.</string>
-    <string name="PinRestoreEntryFragment_if_you_cant_remember_your_pin">Als je je pincode niet kan herinneren, dan kun je een nieuwe pincode aanmaken. Je kunt je opnieuw registreren en je account gebruiken maar je verliest wel een aantal opgeslagen instellingen, zoals je profielinformatie.</string>
+    <string name="PinRestoreEntryFragment_your_pin_is_a_d_digit_code">Je pincode is een code die je zelf hebt aangemaakt en die bestaat uit %1$d of meer cijfers of een combinatie van cijfers en letters. Als je je pincode niet kunt herinneren, dan kun je een nieuwe pincode aanmaken. Je kunt je opnieuw registreren en je account gebruiken maar je verliest wel een aantal opgeslagen instellingen, zoals je profielinformatie.</string>
+    <string name="PinRestoreEntryFragment_if_you_cant_remember_your_pin">Als je je pincode niet kunt herinneren, dan kun je een nieuwe pincode aanmaken. Je kunt je opnieuw registreren en je account gebruiken maar je verliest wel een aantal opgeslagen instellingen, zoals je profielinformatie.</string>
     <string name="PinRestoreEntryFragment_create_new_pin">Nieuwe pincode aanmaken</string>
     <string name="PinRestoreEntryFragment_contact_support">Neem contact op met ondersteuning</string>
     <string name="PinRestoreEntryFragment_cancel">Annuleren</string>
     <string name="PinRestoreEntryFragment_skip">Overslaan</string>
     <plurals name="PinRestoreEntryFragment_you_have_d_attempt_remaining">
-        <item quantity="one">Je hebt nog %1$d poging resterend. Wanneer je geen pogingen meer over hebt, dan kun je nog wel een nieuwe pincode aanmaken. Je kunt je opnieuw registreren en je account gebruiken maar je verliest wel een aantal opgeslagen instellingen, zoals je profielinformatie.</item>
-        <item quantity="other">Je hebt nog %1$d pogingen resterend. Wanneer je geen pogingen meer over hebt, dan kun je nog wel een nieuwe pincode aanmaken. Je kunt je opnieuw registreren en je account gebruiken maar je verliest wel een aantal opgeslagen instellingen, zoals je profielinformatie.</item>
+        <item quantity="one">Je hebt nog %1$d poging over. Wanneer je geen pogingen meer hebt, kun je een nieuwe pincode aanmaken. Je kunt je opnieuw registreren en je account gebruiken maar je verliest wel een aantal opgeslagen instellingen, zoals je profielinformatie.</item>
+        <item quantity="other">Je hebt nog %1$d pogingen over. Wanneer je geen pogingen meer hebt, kun je een nieuwe pincode aanmaken. Je kunt je opnieuw registreren en je account gebruiken maar je verliest wel een aantal opgeslagen instellingen, zoals je profielinformatie.</item>
     </plurals>
     <string name="PinRestoreEntryFragment_signal_registration_need_help_with_pin">Signal-registratie - Ik heb hulp nodig bij de Signal-pincode op een Android-apparaat</string>
 
@@ -1818,7 +1901,7 @@
     <!-- Email subject used when user contacts support about an issue with the reregister flow. -->
     <string name="ReRegisterWithPinFragment_support_email_subject">Signal-registratie - Hulp nodig bij het opnieuw registreren van de pincode voor Android</string>
     <!-- Dialog message shown in reregister flow when tapping a informational button to to learn about pins or contact support for help -->
-    <string name="ReRegisterWithPinFragment_need_help_local">Je pincode is een %1$d+ cijferige code die numeriek of alfanumeriek kan zijn.\n\nAls je je pincode niet meer weet, kun je een nieuwe aanmaken.</string>
+    <string name="ReRegisterWithPinFragment_need_help_local">Je pincode is een code die je zelf hebt aangemaakt en die bestaat uit %1$d of meer cijfers of een combinatie van cijfers en letters.\n\nAls je je pincode niet kunt herinneren, dan kun je een nieuwe pincode aanmaken.</string>
     <!-- Dialog message shown in reregister flow when user requests to skip this flow and return to the normal flow -->
     <string name="ReRegisterWithPinFragment_skip_local">Als je je pincode niet meer weet, kun je een nieuwe aanmaken.</string>
     <!-- Dialog message shown in reregister flow when user uses up all of their guesses for their pin and we are going to move on -->
@@ -1826,7 +1909,7 @@
 
     <!-- PinOptOutDialog -->
     <string name="PinOptOutDialog_warning">Waarschuwing</string>
-    <string name="PinOptOutDialog_if_you_disable_the_pin_you_will_lose_all_data">Als je de pincode uitzet, verlies je alle gegevens als je Signal opnieuw registreert, tenzij je handmatig een back-up maakt en herstelt. Je kunt Registratievergrendeling niet aanzetten terwijl de pincode uitstaat.</string>
+    <string name="PinOptOutDialog_if_you_disable_the_pin_you_will_lose_all_data">Als je de pincode uitschakelt zul je wanneer je Signal opnieuw registreert alle gegevens kwijtraken, tenzij je handmatig een back-up maakt en herstelt. Daarnaast kun je zolang de pincode is uitgeschakeld de registratievergrendeling niet inschakelen.</string>
     <string name="PinOptOutDialog_disable_pin">Pincode uitschakelen</string>
 
     <!-- RatingManager -->
@@ -1846,16 +1929,16 @@
     <string name="ReactionsRecipientAdapter_you">Jij</string>
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
-    <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Je moet verifiëren dat je geen robot bent om door te kunnen gaan met het verzenden van berichten</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Om Signal te helpen spam te voorkomen is het nodig dat je verifieert dat je geen robot bent.</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Je kunt doorgaan met het verzenden van berichten nadat je hebt geverifieerd dat je geen robot bent. Enig bericht waarvan verzenden is gepauzeerd zal dan automatisch verzonden worden.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Verifieer om door te kunnen gaan met het verzenden van berichten</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Om Molly te helpen spam te voorkomen is het nodig dat je verifieert dat je geen robot bent.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Na de verificatie kun je doorgaan met het verzenden en ontvangen van berichten. Enig bericht waarvan verzenden is gepauzeerd zal dan automatisch worden verzonden.</string>
 
     <!-- Recipient -->
     <string name="Recipient_you">Jij</string>
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Mijn verhaal</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal-oproep</string>
+    <string name="Recipient_signal_call">Molly-oproep</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Blokkeren</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Gaat over…</string>
     <string name="RedPhone_busy">Bezet</string>
     <string name="RedPhone_recipient_unavailable">Ontvanger niet beschikbaar</string>
-    <string name="RedPhone_network_failed">Netwerkfout!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Netwerkfout. Controleer je internetverbinding en probeer het opnieuw.</string>
     <string name="RedPhone_number_not_registered">Telefoonnummer niet geregistreerd!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Het ingetoetste nummer ondersteunt geen beveiligd bellen!</string>
     <string name="RedPhone_got_it">Begrepen</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Tik hier om je camera aan te zetten</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Signal heeft toegang tot je camera nodig om %1$s te bellen</string>
-    <string name="WebRtcCallActivity__signal_s">Signal-oproep %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Molly heeft toegang tot je camera nodig om %1$s te bellen</string>
+    <string name="WebRtcCallActivity__signal_s">Molly-oproep %1$s</string>
     <string name="WebRtcCallActivity__calling">Oproep aan het starten…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Opnieuw aan het verbinden…</string>
@@ -1912,8 +1996,8 @@
     </plurals>
     <!-- Message for dialog to deny all requests -->
     <plurals name="WebRtcCallActivity__d_people_will_not_be_added_to_the_call">
-        <item quantity="one">%1$d persoon wordt niet toegevoegd aan de oproep.</item>
-        <item quantity="other">%1$d personen worden niet toegevoegd aan de oproep.</item>
+        <item quantity="one">%1$d persoon wordt niet aan de oproep toegevoegd.</item>
+        <item quantity="other">%1$d personen worden niet aan de oproep toegevoegd.</item>
     </plurals>
     <!-- Positive action for call link deny all dialog -->
     <string name="WebRtcCallActivity__deny_all">Alle weigeren</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Verwijderd uit oproep</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Iemand heeft je uit de oproep verwijderd.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Toegang tot je camera en microfoon toestaan</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Toegang tot je microfoon toestaan</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Toegang tot je camera toestaan</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Geef Molly toegang tot je camera en microfoon om een oproep te starten of eraan deel te nemen.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Geef Molly toegang tot je microfoon om een oproep te starten of eraan deel te nemen.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Geef Molly toegang tot je camera om video in te schakelen.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly heeft toegang tot de microfoon nodig om een oproep te starten of eraan deel te nemen.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly heeft toegang tot de camera nodig om video in te schakelen</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Om een oproep te beginnen of eraan deel te nemen:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Om video in te schakelen:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal-oproep</string>
-    <string name="WebRtcCallView__signal_video_call">Signal video-oproep</string>
+    <string name="WebRtcCallView__signal_call">Molly-oproep</string>
+    <string name="WebRtcCallView__signal_video_call">Molly video-oproep</string>
     <string name="WebRtcCallView__start_call">Oproep beginnen</string>
     <string name="WebRtcCallView__join_call">Aan oproep deelnemen</string>
     <string name="WebRtcCallView__call_is_full">De oproep is vol</string>
@@ -1948,7 +2052,7 @@
     <string name="WebRtcCallView__joining">Verbinden met de groep aan het maken…</string>
     <string name="WebRtcCallView__disconnected">Verbinding verbroken</string>
     <!-- Utilized in the lobby before joining a call link -->
-    <string name="WebRtcCallView__signal_call_link">Signal oproeplink</string>
+    <string name="WebRtcCallView__signal_call_link">Signal-oproeplink</string>
     <!-- Warning displayed when entering a call via a link and you have Phone Number Privacy disabled-->
     <string name="WebRtcCallView__anyone_who_joins_pnp_disabled">Iedereen die via de link aan deze oproep deelneemt, ziet je naam, foto en telefoonnummer.</string>
     <!-- Warning displayed when entering a call via a link and you have Phone Number Privacy enabled-->
@@ -1987,12 +2091,12 @@
 
     <string name="WebRtcCallView__no_one_else_is_here">Er is niemand hier</string>
     <string name="WebRtcCallView__s_is_in_this_call">%1$s is in deze oproep aanwezig</string>
-    <string name="WebRtcCallView__s_are_in_this_call">%1$s zijn in deze oproep aanwezig</string>
+    <string name="WebRtcCallView__s_are_in_this_call">%1$s bent in deze oproep aanwezig</string>
     <string name="WebRtcCallView__s_and_s_are_in_this_call">%1$s en %2$s zijn in deze oproep aanwezig</string>
 
     <plurals name="WebRtcCallView__s_s_and_d_others_are_in_this_call">
-        <item quantity="one">%1$s, %2$s en %3$d ander zijn in deze groepsoproep aanwezig</item>
-        <item quantity="other">%1$s, %2$s en %3$d anderen zijn in deze groepsoproep aanwezig</item>
+        <item quantity="one">%1$s, %2$s en %3$d ander zijn in deze oproep aanwezig</item>
+        <item quantity="other">%1$s, %2$s en %3$d anderen zijn in deze oproep aanwezig</item>
     </plurals>
 
     <!-- Toggle content description for toggling camera direction  -->
@@ -2028,23 +2132,42 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Hand omlaag doen?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Hand omlaag doen</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Omlaag doen</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Annuleren</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Je hebt je hand opgestoken</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Weergeven</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s heeft een hand opgestoken</item>
-        <item quantity="other">%1$s en %2$d hebben hun hand opgestoken</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s steekt je hand op</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d ander steken een hand op</item>
+        <item quantity="other">%1$s + %2$d anderen steken een hand op</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
-        <item quantity="one">%1$s</item>
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s steekt een hand op</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d ander steken een hand op</item>
+        <item quantity="other">%1$s + %2$d anderen steken een hand op</item>
+    </plurals>
+
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s + %2$d</item>
+        <item quantity="other">%1$s + %2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
+        <item quantity="one">%1$s + %2$d</item>
         <item quantity="other">%1$s + %2$d</item>
     </plurals>
 
@@ -2097,7 +2220,7 @@
     <!-- CallParticipantView -->
     <string name="CallParticipantView__s_is_blocked">%1$s is geblokkeerd</string>
     <string name="CallParticipantView__more_info">Meer informatie</string>
-    <string name="CallParticipantView__you_wont_receive_their_audio_or_video">Je zult hen niet kunnen zien of horen en zij zullen jou niet kunnen zien of horen.</string>
+    <string name="CallParticipantView__you_wont_receive_their_audio_or_video">Je kunt hen niet zien of horen en zij kunnen jou niet zien of horen.</string>
     <string name="CallParticipantView__cant_receive_audio_video_from_s">Kan geen audio &amp; video van %1$s ontvangen</string>
     <string name="CallParticipantView__cant_receive_audio_and_video_from_s">Kan geen audio en video van %1$s ontvangen</string>
     <string name="CallParticipantView__this_may_be_Because_they_have_not_verified_your_safety_number_change">Dit kan zijn omdat diegene de wijziging van het veiligheidsnummer niet heeft geverifieerd, er een probleem is met hun apparaat, of als ze jou hebben geblokkeerd.</string>
@@ -2133,8 +2256,8 @@
     <string name="RegistrationActivity_a_verification_code_will_be_sent_to_this_number">Er wordt een verificatiecode naar dit nummer gestuurd. Providertarieven kunnen van toepassing zijn.</string>
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Je zult gebeld worden om dit telefoonnummer te verifiëren.</string>
     <string name="RegistrationActivity_edit_number">Telefoonnummer bewerken</string>
-    <string name="RegistrationActivity_missing_google_play_services">Google Play Services is niet aanwezig</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Dit apparaat bevat geen Google Play Services. Je kunt Signal nog steeds gebruiken, maar deze configuratie kan de betrouwbaarheid en prestaties verslechteren.\n\nAls je geen gevorderde gebruiker bent, geen aangepaste ROM gebruikt of denkt dat dit bericht onterecht wordt weergegeven, neem dan contact op met support@signal.org voor hulp met probleemoplossen.</string>
+    <string name="RegistrationActivity_missing_google_play_services">Google Play Services ontbreekt</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Dit apparaat heeft geen Google Play Services. Je kunt Molly nog steeds gebruiken, maar deze configuratie kan de betrouwbaarheid en prestaties verminderen.\n\nAls je geen gevorderde gebruiker bent, geen aangepaste ROM gebruikt of denkt dat dit bericht onterecht wordt weergegeven, neem dan contact op met support@molly.im voor hulp met probleemoplossen.</string>
     <string name="RegistrationActivity_i_understand">Ik begrijp het</string>
     <string name="RegistrationActivity_play_services_error">Google Play Services-fout</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services wordt momenteel bijgewerkt of is tijdelijk niet beschikbaar. Probeer het nog eens.</string>
@@ -2144,15 +2267,15 @@
     <string name="RegistrationActivity_rate_limited_to_service">Je hebt te veel pogingen ondernomen om Signal voor dit telefoonnummer te registreren. Probeer het later opnieuw.</string>
     <!--    During registration, if the user attempts (and fails) to register, we display this error message with a number of minutes timer they are allowed to try again.-->
     <string name="RegistrationActivity_rate_limited_to_try_again">Je hebt te vaak geprobeerd dit nummer te registreren. Probeer het opnieuw over %1$s.</string>
-    <string name="RegistrationActivity_unable_to_connect_to_service">Het lukt niet om te verbinden met Signals servers. Ga na dat je apparaat met het internet is verbonden en probeer het opnieuw.</string>
+    <string name="RegistrationActivity_unable_to_connect_to_service">Het lukt niet om te verbinden met Signals servers. Controleer je internetverbinding en probeer het opnieuw.</string>
     <!-- A description text for an alert dialog when the entered phone number is not eligible for a verification SMS. -->
     <string name="RegistrationActivity_we_couldnt_send_you_a_verification_code">We konden je geen verificatiecode sturen via sms. Probeer in plaats daarvan je code via een spraakoproep te ontvangen.</string>
     <!-- Generic error when the app is unable to request an SMS code for an unknown reason. -->
-    <string name="RegistrationActivity_unable_to_request_verification_code">Kan geen verificatiecode aanvragen. Ga na dat je apparaat met het internet is verbonden en probeer het opnieuw.</string>
+    <string name="RegistrationActivity_unable_to_request_verification_code">Kan geen verificatiecode aanvragen. Controleer je internetverbinding en probeer het opnieuw.</string>
     <string name="RegistrationActivity_non_standard_number_format">Afwijkend telefoonnummerformaat</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Het door jou ingevulde telefoonnummer (%1$s) heeft een afwijkend formaat.\n\nBedoelde je %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Telefoonnummerformaat</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Telefoonnummerformaat</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Belverzoek ingediend</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Problemen met registreren?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Zorg ervoor dat je telefoon een mobiel signaal heeft om je sms of oproep te ontvangen\n • Bevestig dat je een oproep naar nummer kunt ontvangen\n • Controleer of je je telefoonnummer correct hebt ingevoerd.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Volg voor meer informatie deze stappen voor probleemoplossing of neem contact op met ons supportteam</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Volg voor meer informatie %1$s of %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">deze stappen voor probleemoplossing</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,14 +2348,14 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Aan contactenlijst toevoegen</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Uitnodigen voor Signal</string>
-    <string name="SharedContactDetailsActivity_signal_message">Signal-gesprek openen</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Uitnodigen voor Molly</string>
+    <string name="SharedContactDetailsActivity_signal_message">Signal-chat openen</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal-oproep</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Aan contactenlijst toevoegen</string>
-    <string name="SharedContactView_invite_to_signal">Uitnodigen voor Signal</string>
-    <string name="SharedContactView_message">Signal-gesprek openen</string>
+    <string name="SharedContactView_invite_to_signal">Uitnodigen voor Molly</string>
+    <string name="SharedContactView_message">Signal-chat openen</string>
 
     <!-- SignalBottomActionBar -->
     <string name="SignalBottomActionBar_more">Meer opties</string>
@@ -2329,8 +2452,8 @@
     <string name="ThreadRecord_disappearing_message_time_updated_to_s">De timer voor verdwijnende berichten is op %1$s ingesteld</string>
     <string name="ThreadRecord_safety_number_changed">Veiligheids­nummer is veranderd</string>
     <string name="ThreadRecord_your_safety_number_with_s_has_changed">Je veiligheids­nummer met %1$s is veranderd.</string>
-    <string name="ThreadRecord_you_marked_verified">Door jou als geverifieerd gemarkeerd</string>
-    <string name="ThreadRecord_you_marked_unverified">Door jou als niet geverifieerd gemarkeerd</string>
+    <string name="ThreadRecord_you_marked_verified">Door jou gemarkeerd als geverifieerd</string>
+    <string name="ThreadRecord_you_marked_unverified">Door jou gemarkeerd als niet-geverifieerd</string>
     <string name="ThreadRecord_message_could_not_be_processed">Bericht kon niet worden verwerkt</string>
     <string name="ThreadRecord_delivery_issue">Afleverings­probleem</string>
     <string name="ThreadRecord_message_request">Gespreksverzoek</string>
@@ -2349,7 +2472,7 @@
     <!-- Displayed in the notification when the user has opened a received gift -->
     <string name="ThreadRecord__you_redeemed_a_badge">Je hebt een badge ingewisseld</string>
     <!-- Displayed in the conversation list when someone reacted to your story -->
-    <string name="ThreadRecord__reacted_s_to_your_story">Heeft met %1$s op je verhaal gereageerd</string>
+    <string name="ThreadRecord__reacted_s_to_your_story">Reageerde met %1$s op je verhaal</string>
     <!-- Displayed in the conversation list when you reacted to someone\'s story -->
     <string name="ThreadRecord__reacted_s_to_their_story">Reageerde met %1$s op een verhaal</string>
     <!-- Displayed in the conversation list when your most recent message is a payment to or from the person the conversation is with -->
@@ -2357,16 +2480,16 @@
     <!-- Displayed in the conversation list when your only message in a conversation is a scheduled send. -->
     <string name="ThreadRecord_scheduled_message">Gepland bericht</string>
     <!--  Displayed in the conversation list when your message history has been merged -->
-    <string name="ThreadRecord_message_history_has_been_merged">Je berichtengeschiedenis is samengevoegd</string>
+    <string name="ThreadRecord_message_history_has_been_merged">Je chatgeschiedenis is samengevoegd</string>
     <!--  Displayed in the conversation list when identities have been merged. The first placeholder is a phone number, and the second is a person\'s name -->
     <string name="ThreadRecord_s_belongs_to_s">%1$s is van %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Nieuwe versie van Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Een nieuwe versie van Signal is beschikbaar. Tik om bij te werken.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal kan niet worden bijgewerkt</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Nieuwe versie van Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Een nieuwe versie van Molly is beschikbaar. Tik om bij te werken.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly kan niet worden bijgewerkt</string>
     <string name="ApkUpdateNotifications_failed_general_body">We proberen het later opnieuw.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal succesvol bijgewerkt</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly succesvol bijgewerkt</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Je bent automatisch bijgewerkt naar versie %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2422,8 +2545,8 @@
     <string name="UsernameEditFragment_continue">Doorgaan</string>
 
     <plurals name="UserNotificationMigrationJob_d_contacts_are_on_signal">
-        <item quantity="one">%1$d van je contactpersonen is bereikbaar via Signal.</item>
-        <item quantity="other">%1$d van je contactpersonen zijn bereikbaar via Signal.</item>
+        <item quantity="one">%1$d van je contacten is bereikbaar via Signal.</item>
+        <item quantity="other">%1$d van je contacten zijn bereikbaar via Signal.</item>
     </plurals>
 
     <!-- UsernameShareBottomSheet -->
@@ -2432,14 +2555,14 @@
 
     <!-- VerifyIdentityActivity -->
     <string name="VerifyIdentityActivity_your_contact_is_running_a_newer_version_of_Signal">Je contact gebruikt een nieuwere versie van Signal met een incompatibel QR-codeformaat. Werk Signal bij om te vergelijken.</string>
-    <string name="VerifyIdentityActivity_the_scanned_qr_code_is_not_a_correctly_formatted_safety_number">De gescande QR-code is geen goed geformatteerd veiligheidsnummer-verificatiecode. Probeer de QR-code opnieuw te scannen.</string>
+    <string name="VerifyIdentityActivity_the_scanned_qr_code_is_not_a_correctly_formatted_safety_number">De gescande QR-code is geen goed geformatteerde veiligheidsnummer-verificatiecode. Probeer de QR-code opnieuw te scannen.</string>
     <string name="VerifyIdentityActivity_share_safety_number_via">Veiligheidsnummer delen via …</string>
     <string name="VerifyIdentityActivity_our_signal_safety_number">Ons Signal-veiligheidsnummer:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Het lijkt erop dat je geen apps hebt waarmee je je veiligheidsnummer kunt delen.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Geen veiligheidsnummer gevonden op het klembord</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal heeft toegang tot de camera nodig om een QR-code te scannen, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Camera’ in.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly heeft toegang tot de camera nodig om een QR-code te scannen, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Camera’ in.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Kan QR-codes niet scannen zonder toegang tot de camera</string>
-    <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Om het veiligheidsnummer van %1$s te kunnen weergeven moet je eerst berichten met hem of haar uitwisselen.</string>
+    <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Om het veiligheidsnummer van %1$s te kunnen weergeven moeten jullie eerst berichten uitwisselen.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_message">Er wordt een veiligheidsnummer gegenereerd met deze persoon nadat je berichten hebt uitgewisseld.</string>
     <!-- Confirmation option for dialog explaining to user they must exchange messages first to create a safety number  -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Tik om te openen.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal is ontgrendeld</string>
-    <string name="KeyCachingService_lock">Vergrendel Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly is ontgrendeld</string>
+    <string name="KeyCachingService_lock">Vergrendel Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Door jou verzonden</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Niet-ondersteund mediatype</string>
     <string name="MediaPreviewActivity_draft">Concept</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal heeft toegang tot de opslagruimte nodig om iets op te slaan, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘App-machtigingen’ en schakel ‘Opslagruimte’ in.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly heeft toegang tot de opslagruimte nodig om iets op te slaan, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Opslagruimte’ in.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Kan niet opslaan naar externe opslag zonder machtiging</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Bericht verwijderen?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Dit bericht zal permanent worden verwijderd.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Het bericht afleveren is mislukt.</string>
     <string name="MessageNotifier_error_delivering_message">Fout bij afleveren bericht.</string>
     <string name="MessageNotifier_message_delivery_paused">Berichten-aflevering is gepauzeerd.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifieer je telefoonnummer om door te kunnen gaan met het verzenden en ontvangen van berichten via Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifieer om door te kunnen gaan met het verzenden van berichten via Molly</string>
     <string name="MessageNotifier_mark_all_as_read">Alles markeren als gelezen</string>
     <string name="MessageNotifier_mark_read">Markeren als gelezen</string>
     <string name="MessageNotifier_turn_off_these_notifications">Dit nooit melden</string>
@@ -2527,20 +2650,20 @@
     <string name="MessageNotifier_reply">Reageren</string>
     <string name="MessageNotifier_signal_message">Signal-bericht</string>
     <string name="MessageNotifier_contact_message">%1$s %2$s</string>
-    <string name="MessageNotifier_unknown_contact_message">Contactpersoon</string>
+    <string name="MessageNotifier_unknown_contact_message">Contact</string>
     <string name="MessageNotifier_reacted_s_to_s">Reageerde met %1$s op ‘%2$s’.</string>
     <string name="MessageNotifier_reacted_s_to_your_video">Reageerde met %1$s op je video.</string>
     <string name="MessageNotifier_reacted_s_to_your_image">Reageerde met %1$s op je afbeelding.</string>
     <string name="MessageNotifier_reacted_s_to_your_gif">Reageerde met %1$s op je GIF.</string>
     <string name="MessageNotifier_reacted_s_to_your_file">Reageerde met %1$s op je bestand.</string>
-    <string name="MessageNotifier_reacted_s_to_your_audio">Reageerde met %1$s op je audio.</string>
+    <string name="MessageNotifier_reacted_s_to_your_audio">Reageerde met %1$s op je spraakbericht.</string>
     <string name="MessageNotifier_reacted_s_to_your_view_once_media">Reageerde met %1$s op je eenmaligeweergave-media.</string>
     <!-- Body of notification shown to user when someone they sent a payment to reacts to it. Placeholder is the emoji used in the reaction. -->
     <string name="MessageNotifier_reacted_s_to_your_payment">Reageerde met %1$s op je betaling.</string>
     <string name="MessageNotifier_reacted_s_to_your_sticker">Reageerde met %1$s op je sticker.</string>
     <string name="MessageNotifier_this_message_was_deleted">Dit bericht is verwijderd.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Zet meldingen uit over mensen die bereikbaar zijn via Signal. Je kunt ze opnieuw aanzetten in Signal &gt; Instellingen &gt; Meldingen.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Zet meldingen uit over mensen die bereikbaar zijn via Molly. Je kunt ze opnieuw aanzetten in Molly &gt; Instellingen &gt; Meldingen.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Snel reageren niet beschikbaar wanneer Signal is vergrendeld.</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Snel reageren niet beschikbaar wanneer Molly is vergrendeld.</string>
     <string name="QuickResponseService_problem_sending_message">Fout bij verzenden van bericht!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Ongeldige snelkoppeling</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Nieuw bericht</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Gespreksverzoek</string>
     <string name="SingleRecipientNotificationBuilder_you">Jij</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Dit apparaat is niet meer geregistreerd. Dit komt waarschijnlijk omdat je je telefoonnummer bij Signal op een ander apparaat hebt geregistreerd.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Dit apparaat is niet meer geregistreerd. Dit komt waarschijnlijk omdat je je telefoonnummer bij Molly op een ander apparaat hebt geregistreerd.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Registreer het apparaat opnieuw</string>
 
@@ -2658,13 +2781,13 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Je moet Signal toestaan om de microfoon te gebruiken voor je de oproep kunt beantwoorden.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Je moet Molly toestaan om de microfoon te gebruiken voor je de oproep kunt beantwoorden.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Geef Signal toegang tot je microfoon en camera om de video-oproep te beantwoorden.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal heeft toegang tot de microfoon en de camera nodig om oproepen te maken of te ontvangen, maar deze toegang is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Microfoon’ en ‘Camera’ in.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Geef Molly toegang tot je microfoon en camera om de video-oproep te beantwoorden.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly heeft toegang tot de microfoon en de camera nodig om oproepen te maken of te ontvangen, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Microfoon’ en ‘Camera’ in.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Beantwoord vanaf een gekoppeld apparaat.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Geweigerd vanaf een gekoppeld apparaat.</string>
-    <string name="WebRtcCallActivity__busy_on_a_linked_device">Bezet omdat je al een gesprek voerde via een van je gekoppelde apparaten.</string>
+    <string name="WebRtcCallActivity__busy_on_a_linked_device">Bezet op een gekoppeld apparaat.</string>
     <!-- Tooltip message shown first time user is in a video call after switch camera button moved -->
     <string name="WebRtcCallActivity__flip_camera_tooltip">Het icoontje om van camera te wisselen is hierheen verplaatst. Tik op je video om het uit te proberen</string>
 
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Herhaal nieuw wachtwoord</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Uitnodigen voor Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Uitnodigen voor Molly</string>
     <string name="contact_selection_activity__new_group">Nieuwe groep</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Contacten verversen</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Ontbreekt er iemand? Probeer te verversen</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Vind mensen die je kent op Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Toegang tot je contacten toestaan</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Meer opties</string>
 
@@ -2725,20 +2848,20 @@
     <string name="contact_filter_toolbar__show_dial_pad_description">Numeriek toetsenblok weergeven</string>
 
     <!-- contact_selection_group_activity -->
-    <string name="contact_selection_group_activity__no_contacts">Geen contactpersonen gevonden.</string>
-    <string name="contact_selection_group_activity__finding_contacts">Contactpersonen laden…</string>
+    <string name="contact_selection_group_activity__no_contacts">Geen contacten.</string>
+    <string name="contact_selection_group_activity__finding_contacts">Contacten laden…</string>
 
     <!-- single_contact_selection_activity -->
-    <string name="SingleContactSelectionActivity_contact_photo">Foto van contactpersoon</string>
+    <string name="SingleContactSelectionActivity_contact_photo">Foto van contact</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal heeft toegang tot je lijst met contacten nodig om je contacten weer te kunnen geven, maar toestemming om contacten in te zien is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Contacten’ in.</string>
-    <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Fout bij het ophalen van contactpersonen, ga na dat je netwerkverbinding werkt</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly heeft toegang tot de contacten nodig om je contacten te kunnen weergeven, maar deze is pertinent geweigerd. Ga naar de instellingen voor deze app, tik op ‘Machtigingen’ en schakel ‘Contacten’ in.</string>
+    <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Fout bij het ophalen van contacten. Controleer je internetverbinding en probeer het opnieuw.</string>
     <string name="ContactSelectionListFragment_username_not_found">Gebruikersnaam niet gevonden</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"‘%1$s’ is geen Signal-gebruiker. Controleer de gebruikersnaam en probeer het opnieuw."</string>
     <string name="ContactSelectionListFragment_you_do_not_need_to_add_yourself_to_the_group">Het is niet nodig om jezelf toe te voegen aan de groep</string>
     <string name="ContactSelectionListFragment_maximum_group_size_reached">De maximale groepsgrootte is bereikt</string>
-    <string name="ContactSelectionListFragment_signal_groups_can_have_a_maximum_of_d_members">Signal groepen kunnen uit maximaal %1$d leden bestaan.</string>
+    <string name="ContactSelectionListFragment_signal_groups_can_have_a_maximum_of_d_members">Signal-groepen kunnen uit maximaal %1$d leden bestaan.</string>
     <string name="ContactSelectionListFragment_recommended_member_limit_reached">Het aanbevolen ledenlimiet is bereikt</string>
     <string name="ContactSelectionListFragment_signal_groups_perform_best_with_d_members_or_fewer">Signal-groepen presteren het best met %1$d of minder leden. Het toevoegen van extra leden zal vertragingen veroorzaken in het verzenden en ontvangen van berichten.</string>
     <plurals name="ContactSelectionListFragment_d_members">
@@ -2750,17 +2873,19 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Zoeken op gebruikersnaam</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Toegang tot contacten toestaan</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Om mensen die je kent te vinden op Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Toegang geven</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Nee bedankt</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Sta toegang tot je contacten toe. Je contacten zijn versleuteld en niet zichtbaar voor de Signal-dienst.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal heeft toegang tot je contacten nodig om contactpersonen te kunnen weergeven.</string>
-    <string name="contact_selection_list_fragment__show_contacts">Contactpersonen weergeven</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly heeft toegang tot je contacten nodig om deze te kunnen weergeven.</string>
+    <string name="contact_selection_list_fragment__show_contacts">Contacten weergeven</string>
 
     <!-- contact_selection_list_item -->
     <plurals name="contact_selection_list_item__number_of_members">
@@ -2786,11 +2911,11 @@
     <string name="conversation_activity__quick_attachment_drawer_toggle_camera_description">Camera overzicht weergeven/verbergen</string>
     <string name="conversation_activity__quick_attachment_drawer_record_and_send_audio_description">Audio opnemen en verzenden</string>
     <string name="conversation_activity__quick_attachment_drawer_lock_record_description">Vergrendel opnemen van audio</string>
-    <string name="conversation_activity__message_could_not_be_sent">Het bericht kon niet worden verzonden. Ga na dat je apparaat met het internet is verbonden en probeer het opnieuw.</string>
+    <string name="conversation_activity__message_could_not_be_sent">Het bericht kon niet worden verzonden. Controleer je internetverbinding en probeer het opnieuw.</string>
 
     <!-- conversation_input_panel -->
     <string name="conversation_input_panel__slide_to_cancel">Veeg om te annuleren</string>
-    <string name="conversation_input_panel__cancel">Audio-opname annuleren</string>
+    <string name="conversation_input_panel__cancel">Annuleren</string>
 
     <!-- conversation_item -->
     <string name="conversation_item__mms_image_description">Mediabericht</string>
@@ -2803,7 +2928,7 @@
     <string name="conversation_item_sent__message_read">Bericht gelezen</string>
 
     <!-- conversation_item_received -->
-    <string name="conversation_item_received__contact_photo_description">Foto van contactpersoon</string>
+    <string name="conversation_item_received__contact_photo_description">Foto van contact</string>
 
     <!-- ConversationUpdateItem -->
     <string name="ConversationUpdateItem_loading">Aan het laden</string>
@@ -2815,7 +2940,7 @@
     <string name="ConversationUpdateItem_call_is_full">De oproep is vol</string>
     <string name="ConversationUpdateItem_invite_friends">Vrienden uitnodigen</string>
     <string name="ConversationUpdateItem_enable_call_notifications">Oproepmeldingen inschakelen</string>
-    <string name="ConversationUpdateItem_update_contact">Contactpersoon aanpassen</string>
+    <string name="ConversationUpdateItem_update_contact">Contact bijwerken</string>
     <!-- Update item button text to show to block a recipient from requesting to join via group link -->
     <string name="ConversationUpdateItem_block_request">Verzoek blokkeren</string>
     <string name="ConversationUpdateItem_no_groups_in_common_review_requests_carefully">Je hebt geen gemeenschappelijke groepen met deze persoon. Beoordeel dit gespreksverzoek zorgvuldig.</string>
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Je hebt deze persoon verwijderd. Als je hem of haar opnieuw een bericht stuurt, wordt diegene weer aan je lijst toegevoegd.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Opties</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Bijwerken</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Afspelen … Pauzeren</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Bubbels zijn een Android functionaliteit die je voor elke Signal-chat afzonderlijk kunt in- of uitschakelen.</string>
+    <string name="BubbleOptOutTooltip__description">Ballonnen zijn een Android functionaliteit die je voor elke Molly-chat afzonderlijk kunt in- of uitschakelen.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Niet nu</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -2873,7 +3000,7 @@
     <string name="safety_number_change_dialog__join_call">Aan oproep deelnemen</string>
     <string name="safety_number_change_dialog__continue_call">Oproep voortzetten</string>
     <string name="safety_number_change_dialog__leave_call">Oproep verlaten</string>
-    <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">De volgende personen hebben mogelijk de app opnieuw geïnstalleerd of hebben een ander apparaat in gebruik genomen. Verifieer jullie veiligheidsnummers om zeker te zijn dat je met de juiste personen communiceert.</string>
+    <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">De volgende personen hebben Signal mogelijk opnieuw geïnstalleerd of kunnen van toestel zijn veranderd. Verifieer jullie veiligheidsnummers om zeker te zijn dat je met de juiste personen communiceert.</string>
     <string name="safety_number_change_dialog__view">Weergeven</string>
     <!-- Subtitle shown for a single contact and that their safety number was previously verified and is now no longer verified. -->
     <string name="safety_number_change_dialog__previous_verified">Was voorheen geverifieerd</string>
@@ -2951,8 +3078,8 @@
     <string name="IdentityUtil_unverified_banner_many">Je veiligheidsnummers met %1$s, %2$s en %3$s zijn niet langer geverifieerd</string>
 
     <string name="IdentityUtil_unverified_dialog_one">Je veiligheidsnummer met %1$s is veranderd en is niet langer geverifieerd. Dit kan betekenen dat iemand je communicatie probeert te onderscheppen, of gewoon dat %1$s Signal opnieuw heeft geïnstalleerd.</string>
-    <string name="IdentityUtil_unverified_dialog_two">Je veiligheidsnummers met %1$s en %2$s zijn niet langer geverifieerd. Dit kan betekenen dat iemand je communicatie probeert te onderscheppen, of gewoon dat ze Signal opnieuw geïnstalleerd hebben.</string>
-    <string name="IdentityUtil_unverified_dialog_many">Je veiligheidsnummers met %1$s, %2$s en %3$s zijn niet langer geverifieerd. Dit kan betekenen dat iemand je communicatie probeert te onderscheppen, of gewoon dat ze Signal opnieuw geïnstalleerd hebben.</string>
+    <string name="IdentityUtil_unverified_dialog_two">Je veiligheidsnummers met %1$s en %2$s zijn niet langer geverifieerd. Dit kan betekenen dat iemand je communicatie probeert te onderscheppen, of gewoon dat ze Signal opnieuw hebben geïnstalleerd.</string>
+    <string name="IdentityUtil_unverified_dialog_many">Je veiligheidsnummers met %1$s, %2$s en %3$s zijn niet langer geverifieerd. Dit kan betekenen dat iemand je communicatie probeert te onderscheppen, of gewoon dat ze Signal opnieuw hebben geïnstalleerd.</string>
 
     <string name="IdentityUtil_untrusted_dialog_one">Je veiligheidsnummer met %1$s is zojuist veranderd.</string>
     <string name="IdentityUtil_untrusted_dialog_two">Je veiligheidsnummers met %1$s en %2$s zijn zojuist veranderd.</string>
@@ -2980,14 +3107,14 @@
     <string name="message_recipients_list_item__resend">Opnieuw verzenden</string>
 
     <!-- Displayed in a toast when user long presses an item in MyStories -->
-    <string name="MyStoriesFragment__copied_sent_timestamp_to_clipboard">Verzendtijd naar klembord gekopieerd.</string>
+    <string name="MyStoriesFragment__copied_sent_timestamp_to_clipboard">Tijdstempel naar klembord gekopieerd.</string>
     <!-- Displayed when there are no outgoing stories -->
     <string name="MyStoriesFragment__updates_to_your_story_will_show_up_here">Nieuwe delen van je verhaal zullen hier worden weergegeven.</string>
 
     <!-- GroupUtil -->
     <plurals name="GroupUtil_joined_the_group">
-        <item quantity="one">%1$s is toegevoegd aan de groep.</item>
-        <item quantity="other">%1$s zijn toegevoegd aan de groep.</item>
+        <item quantity="one">%1$s is lid geworden van de groep.</item>
+        <item quantity="other">%1$s zijn lid geworden van de groep.</item>
     </plurals>
     <string name="GroupUtil_group_name_is_now">De groepsnaam is vanaf nu ‘%1$s’.</string>
 
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Groepsomschrijving</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Signal bijwerken</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Molly bijwerken</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Deze versie van Signal is verlopen. Werk nu bij om Signal te blijven gebruiken.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Deze versie van Molly is verlopen. Werk nu bij om Molly te blijven gebruiken.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Bijwerken</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3094,7 +3221,7 @@
 
     <!-- AndroidManifest.xml -->
     <string name="AndroidManifest__create_passphrase">Wachtwoord aanmaken</string>
-    <string name="AndroidManifest__select_contacts">Contactpersonen selecteren</string>
+    <string name="AndroidManifest__select_contacts">Contacten selecteren</string>
     <string name="AndroidManifest__change_passphrase">Wachtwoord wijzigen</string>
     <string name="AndroidManifest__verify_safety_number">Veiligheidsnummer verifiëren</string>
     <string name="AndroidManifest__media_preview">Mediavoorbeeld</string>
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Langzaam</string>
     <string name="preferences__help">Hulp</string>
     <string name="preferences__advanced">Geavanceerd</string>
-    <string name="preferences__donate_to_signal">Aan Signal doneren</string>
+    <string name="preferences__donate_to_signal">Aan Molly doneren</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Privacy</string>
     <!-- Preference label for stories -->
@@ -3268,7 +3395,7 @@
     <string name="preferences__payment_lock">Betalingsvergrendeling</string>
     <string name="preferences__conversation_length_limit">Aantal berichten per chat</string>
     <string name="preferences__keep_messages">Bewaartermijn voor berichten</string>
-    <string name="preferences__clear_message_history">Alle gespreksgeschiedenis wissen</string>
+    <string name="preferences__clear_message_history">Alle chatgeschiedenis wissen</string>
     <string name="preferences__linked_devices">Gekoppelde apparaten</string>
     <string name="preferences__light_theme">Licht</string>
     <string name="preferences__dark_theme">Donker</string>
@@ -3284,20 +3411,20 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Wijzig het app-pictogram en de naam in %1$s</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal moet worden gesloten om het app-pictogram en de naam te wijzigen. Meldingen geven altijd het standaard Signal-pictogram en de standaard app-naam weer.</string>
+    <string name="preferences__app_icon_dialog_description">Molly moet worden gesloten om het app-pictogram en de naam te wijzigen. Meldingen geven altijd het standaard Molly-pictogram en de standaard app-naam weer.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Selecteer een app-pictogram en naam die zichtbaar zijn op het startscherm en het appoverzicht van je telefoon. Meldingen geven altijd het standaard Signal-pictogram en de standaard app-naam weer. Meer informatie</string>
+    <string name="preferences__app_icon_warning_learn_more">Selecteer een app-pictogram en naam die zichtbaar zijn op het startscherm en het appoverzicht van je telefoon. Meldingen geven altijd het standaard Molly-pictogram en de standaard app-naam weer. Meer informatie</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">App-pictogrammen en -namen zijn zichtbaar op het startscherm en appoverzicht.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Meldingen geven altijd het standaard Signal-pictogram en de standaard app-naam weer.</string>
+    <string name="preferences__app_icon_notification_warning">Meldingen geven altijd het standaard Molly-pictogram en de standaard app-naam weer.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Meer informatie</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
     <string name="preferences__graphic_illustrating_where_the_replacement_app_icon_will_be_visible">Afbeelding die illustreert waar het vervangende app-pictogram zichtbaar zal zijn.</string>
     <string name="preferences__disable_pin">Pincode uitschakelen</string>
     <string name="preferences__enable_pin">Pincode inschakelen</string>
-    <string name="preferences__if_you_disable_the_pin_you_will_lose_all_data">Als je de pincode uitschakelt zul je wanneer je Signal opnieuw registreert alle gegevens kwijtraken, tenzij je ze handmatig herstelt vanuit een back-up. Daarnaast kun je zolang de pincode is uitgeschakeld de registratievergrendeling niet inschakelen.</string>
+    <string name="preferences__if_you_disable_the_pin_you_will_lose_all_data">Als je de pincode uitschakelt zul je wanneer je Signal opnieuw registreert alle gegevens kwijtraken, tenzij je handmatig een back-up maakt en herstelt. Daarnaast kun je zolang de pincode is uitgeschakeld de registratievergrendeling niet inschakelen.</string>
     <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">Met een pincode wordt informatie versleuteld opgeslagen op Signals servers zodat alleen jij er toegang toe hebt. Je kunt hierdoor je profiel, instellingen en contacten herstellen wanneer je Signal opnieuw installeert. Je hebt de pincode niet nodig om de app te openen.</string>
     <string name="preferences__system_default">Systeemstandaard</string>
     <string name="preferences__language">Taal</string>
@@ -3320,7 +3447,7 @@
     <string name="preferences_chats__when_using_wifi">Bij wifi-verbinding</string>
     <string name="preferences_chats__when_roaming">Bij roaming</string>
     <string name="preferences_chats__media_auto_download">Media automatisch downloaden</string>
-    <string name="preferences_chats__message_history">Gespreksgeschiedenis</string>
+    <string name="preferences_chats__message_history">Chatgeschiedenis</string>
     <string name="preferences_storage__storage_usage">Opslaggebruik</string>
     <string name="preferences_storage__photos">Afbeeldingen</string>
     <string name="preferences_storage__videos">Video\'s</string>
@@ -3329,16 +3456,20 @@
     <string name="preferences_storage__review_storage">Alle bestanden weergeven</string>
     <string name="preferences_storage__delete_older_messages">Oude berichten verwijderen?</string>
     <!-- Dialog title shown when selecting delete message history from manage storage -->
-    <string name="preferences_storage__delete_message_history">Berichtengeschiedenis wissen?</string>
-    <string name="preferences_storage__this_will_permanently_delete_all_message_history_and_media">Dit zal alle gespreksgeschiedenis en media ouder dan %1$s permanent van dit apparaat wissen.</string>
+    <string name="preferences_storage__delete_message_history">Chatgeschiedenis wissen?</string>
+    <string name="preferences_storage__this_will_permanently_delete_all_message_history_and_media">Dit zal alle chatgeschiedenis en media ouder dan %1$s permanent van dit apparaat wissen.</string>
     <!-- The body of an alert dialog that is shown when confirming a trim operation. Trimming will delete all but the most recent messages in a chat. The placeholder represents how many messages are kept in each chat. All older messages are deleted. -->
     <plurals name="preferences_storage__this_will_permanently_trim_all_conversations_to_the_d_most_recent_messages">
         <item quantity="one">Hiermee worden alle chats permanent ingekort tot het meest recente bericht.</item>
         <item quantity="other">Hiermee worden alle chats permanent ingekort tot de %1$s meest recente berichten.</item>
     </plurals>
-    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Dit zal al je gespreksgeschiedenis en media van dit apparaat permanent verwijderen.</string>
-    <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Weet je zeker dat je alle gespreksgeschiedenis wilt verwijderen?</string>
-    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Alle gespreksgeschiedenis zal permanent worden verwijderd. Dit kan niet ongedaan worden gemaakt.</string>
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Dit zal al je chatgeschiedenis en media van dit apparaat permanent verwijderen.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Hiermee worden alle chatgeschiedenis en media permanent van dit apparaat en alle gekoppelde apparaten verwijderd.</string>
+    <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Weet je zeker dat je alle chatgeschiedenis wilt verwijderen?</string>
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Alle chatgeschiedenis zal permanent worden verwijderd. Dit kan niet ongedaan worden gemaakt.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Alle chatgeschiedenis wordt permanent verwijderd van alle apparaten. Dit kan niet ongedaan worden gemaakt.</string>
     <string name="preferences_storage__delete_all_now">Nu alles verwijderen</string>
     <string name="preferences_storage__forever">Voor altijd</string>
     <string name="preferences_storage__one_year">1 jaar</string>
@@ -3375,9 +3506,9 @@
     <string name="preferences_communication__category_censorship_circumvention">Censuuromzeiling</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Censuuromzeiling</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Indien ingeschakeld zal Signal proberen censuur te omzeilen. Schakel deze functie niet in tenzij je je op een locatie bevindt waar Signal wordt gecensureerd.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Indien ingeschakeld zal Molly proberen censuur te omzeilen. Schakel deze functie niet in tenzij je je op een locatie bevindt waar Molly wordt gecensureerd.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
-    <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Omdat je telefoonnummer bij een risicoregio hoort is censuuromzeiling automatisch ingeschakeld.</string>
+    <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Censuuromzeiling is automatisch ingeschakeld omdat je telefoonnummer bij een risicoregio hoort.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_you_have_manually_disabled">Je hebt censuuromzeiling handmatig uitgeschakeld.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you cannot use it because you\'re already connected to the Signal service -->
@@ -3386,7 +3517,7 @@
     <string name="preferences_communication__censorship_circumvention_can_only_be_activated_when_connected_to_the_internet">Censuuromzeiling kan alleen worden ingeschakeld als je apparaat met het internet is verbonden.</string>
     <string name="preferences_communication__category_sealed_sender">Verzegelde afzender</string>
     <string name="preferences_communication__sealed_sender_allow_from_anyone">Van iedereen toestaan</string>
-    <string name="preferences_communication__sealed_sender_allow_from_anyone_description">Sta toe dat je berichten met een verzegelde afzender ontvangt welke afkomstig zijn van personen naar wie je nog nooit een bericht hebt verzonden en ook nooit mee in hetzelfde groepsgesprek zat.</string>
+    <string name="preferences_communication__sealed_sender_allow_from_anyone_description">Sta toe dat je berichten met een verzegelde afzender ontvangt welke afkomstig zijn van personen naar wie je nog nooit een bericht hebt verzonden en ook nooit mee in dezelfde groepschat zat.</string>
     <string name="preferences_proxy">Proxy</string>
     <string name="preferences_use_proxy">Proxy gebruiken</string>
     <string name="preferences_off">Uit</string>
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Signal introduceert Betalingen</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Je kunt Signal ook gebruiken om een nieuwe privacygerichte valuta genaamd MobileCoin te versturen en ontvangen. Activeer om te beginnen.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Je kunt Molly ook gebruiken om een nieuwe privacygerichte valuta genaamd MobileCoin te versturen en ontvangen. Activeer om te beginnen.</string>
     <string name="PaymentsHomeFragment__activate_payments">Betalingen inschakelen</string>
     <string name="PaymentsHomeFragment__activating_payments">Betalingen aan het inschakelen…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Betalingsaccount herstellen</string>
@@ -3449,7 +3580,7 @@
     <string name="PaymentsHomeFragment__processing_payment">Betaling aan het verwerken</string>
     <string name="PaymentsHomeFragment__unknown_amount">---</string>
     <string name="PaymentsHomeFragment__currency_conversion_not_available">Omrekenen van valuta is niet beschikbaar</string>
-    <string name="PaymentsHomeFragment__cant_display_currency_conversion">Kan de omrekening van valuta niet weergeven. Ga na dat je apparaat met het internet is verbonden en probeer het opnieuw.</string>
+    <string name="PaymentsHomeFragment__cant_display_currency_conversion">Kan de omrekening van valuta niet weergeven. Controleer je internetverbinding en probeer het opnieuw.</string>
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Betalingen zijn niet beschikbaar in jouw regio.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Kan betalingen niet inschakelen. Probeer het later opnieuw.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Betalingen uitschakelen?</string>
@@ -3457,15 +3588,15 @@
     <string name="PaymentsHomeFragment__deactivate">Uitschakelen</string>
     <string name="PaymentsHomeFragment__continue">Doorgaan</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Je krediet is op dit moment niet beschikbaar.</string>
-    <string name="PaymentsHomeFragment__payments_deactivated">Betalingen uitgeschakeld.</string>
+    <string name="PaymentsHomeFragment__payments_deactivated">Betalingen zijn uitgeschakeld.</string>
     <string name="PaymentsHomeFragment__payment_failed">Betaling is mislukt</string>
     <string name="PaymentsHomeFragment__details">Details</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Je kunt Signal gebruiken om MobileCoin te verzenden en te ontvangen. Op alle betalingen zijn de gebruiksvoorwaarden voor MobileCoins en de MobileCoin Wallet van toepassing. Er kunnen zich problemen voordoen. Verloren betalingen en krediet kun je dan niet terugvorderen. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Je kunt Molly gebruiken om MobileCoin te verzenden en te ontvangen. Op alle betalingen zijn de gebruiksvoorwaarden voor MobileCoins en de MobileCoin Wallet van toepassing. Er kunnen zich problemen voordoen. Verloren betalingen en krediet kun je dan niet terugvorderen. </string>
     <string name="PaymentsHomeFragment__activate">Inschakelen</string>
-    <string name="PaymentsHomeFragment__view_mobile_coin_terms">De gebruiksvoorwaarden van MobileCoin weergeven</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Betalingen via Signal zijn niet langer mogelijk. Je kunt nog wel je krediet overschrijven naar een andere beurs maar je kunt niet langer betalingen verzenden of ontvangen of krediet toevoegen.</string>
+    <string name="PaymentsHomeFragment__view_mobile_coin_terms">Gebruiksvoorwaarden van MobileCoin weergeven</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Betalingen via Molly zijn niet langer mogelijk. Je kunt nog wel je krediet overschrijven naar een andere beurs maar je kunt niet langer betalingen verzenden of ontvangen of krediet toevoegen.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Geef toestemmingen</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Om je te helpen berichten te sturen naar mensen die je kent, vraagt Signal deze toestemmingen. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Om je te helpen berichten te sturen naar mensen die je kent, vraagt Molly deze toestemmingen. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Meldingen</string>
     <!-- Notifications permission row description -->
@@ -3543,8 +3674,8 @@
     <string name="PaymentsAddMoneyFragment__add_funds">Krediet toevoegen</string>
     <string name="PaymentsAddMoneyFragment__your_wallet_address">Het adres van je portemonnee</string>
     <string name="PaymentsAddMoneyFragment__copy">Kopiëren</string>
-    <string name="PaymentsAddMoneyFragment__copied_to_clipboard">Gekopieerd naar het klembord</string>
-    <string name="PaymentsAddMoneyFragment__to_add_funds">Maak een account bij een beurs die MobileCoin ondersteunt. Stuur vervolgens vanaf je beurs-account MobileCoin naar je Signal portemonnee-adres door de QR-code te scannen of door het adres te kopiëren om op Signal krediet toe te voegen.</string>
+    <string name="PaymentsAddMoneyFragment__copied_to_clipboard">Gekopieerd naar klembord</string>
+    <string name="PaymentsAddMoneyFragment__to_add_funds">Maak een account bij een beurs die MobileCoin ondersteunt. Stuur vervolgens vanaf je beursaccount MobileCoin naar je Signal portemonnee-adres door de QR-code te scannen of door het adres te kopiëren om op Signal krediet toe te voegen.</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsAddMoneyFragment__learn_more__information" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_transfer_from_exchange</string> -->
 
     <!-- PaymentsDetailsFragment -->
@@ -3581,15 +3712,15 @@
     <string name="PaymentsTransferFragment__next">Volgende</string>
     <string name="PaymentsTransferFragment__invalid_address">Adres ongeldig</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Ga na dat het portemonnee-adres waarnaar je probeert over te schrijven juist is en probeer het opnieuw.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Je kunt niet vanuit Signal overschrijven naar je eigen Signal portemonnee-adres. Vul het portemonnee-adres van je account bij de beurs in.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Signal heeft toegang tot de camera nodig om een QR-code te kunnen scannen.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal heeft toegang tot je camera nodig om QR-codes te scannen, maar deze toestemming is pertinent geweigerd. Ga naar het menu voor instellingen voor apps, tik op ‘App-machtigingen’ en schakel ‘Camera’ in.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Signal heeft toegang tot de camera nodig om een QR-code te kunnen scannen.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Je kunt niet overschrijven naar je eigen Molly portemonnee-adres. Vul het portemonnee-adres van je account bij de beurs in.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Molly heeft toegang tot de camera nodig om een QR-code te kunnen scannen.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly heeft toegang tot de camera nodig om QR-codes te scannen, maar deze is pertinent geweigerd. Ga naar het menu voor instellingen voor apps, tik op ‘Machtigingen’ en schakel ‘Camera’ in.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Molly heeft toegang tot de camera nodig om een QR-code te kunnen scannen.</string>
     <string name="PaymentsTransferFragment__settings">Instellingen</string>
 
     <!-- PaymentsTransferQrScanFragment -->
     <string name="PaymentsTransferQrScanFragment__scan_address_qr_code">Scan de QR-code van de ontvanger</string>
-    <string name="PaymentsTransferQrScanFragment__scan_the_address_qr_code_of_the_payee">Scan de QR-code van de persoon of organisatie naar wie je wilt overschrijven.</string>
+    <string name="PaymentsTransferQrScanFragment__scan_the_address_qr_code_of_the_payee">Scan de QR-code van de begunstigde naar wie je wilt overschrijven.</string>
 
     <!-- CreatePaymentFragment -->
     <string name="CreatePaymentFragment__request">Verzoek</string>
@@ -3625,7 +3756,7 @@
     <!-- Prefix to a name to indicate who a payment will be sent to -->
     <string name="ConfirmPayment__to">Naar</string>
     <string name="ConfirmPayment__total_amount">Totaalbedrag</string>
-    <string name="ConfirmPayment__balance_s">Saldo: %1$s</string>
+    <string name="ConfirmPayment__balance_s">Krediet: %1$s</string>
     <string name="ConfirmPayment__submitting_payment">Betaling aan het indienen…</string>
     <string name="ConfirmPayment__processing_payment">Betaling aan het verwerken…</string>
     <string name="ConfirmPayment__payment_complete">Betaling succesvol afgerond</string>
@@ -3635,7 +3766,7 @@
     <!-- Title of a dialog show when we were unable to present the user\'s screenlock before sending a payment -->
     <string name="ConfirmPaymentFragment__failed_to_show_payment_lock">Betalingsvergrendeling niet weergegeven</string>
     <!-- Body of a dialog show when we were unable to present the user\'s screenlock before sending a payment -->
-    <string name="ConfirmPaymentFragment__you_enabled_payment_lock_in_the_settings">Je hebt betalingsvergrendeling aangezet in je instellingen, maar het is niet zichtbaar.</string>
+    <string name="ConfirmPaymentFragment__you_enabled_payment_lock_in_the_settings">Je hebt betalingsvergrendeling aangezet in je instellingen, maar het kan niet worden weergegeven.</string>
     <!-- Button in a dialog that will take the user to the privacy settings -->
     <string name="ConfirmPaymentFragment__go_to_settings">Ga naar instellingen</string>
     <string name="ConfirmPaymentFragment__this_person_has_not_activated_payments">Deze persoon heeft betalingen niet ingeschakeld.</string>
@@ -3723,7 +3854,7 @@
     <string name="conversation_list__you_can_only_pin_up_to_d_chats">Je kunt niet meer dan %1$d chats vastzetten</string>
 
     <!-- conversation_list_item_view -->
-    <string name="conversation_list_item_view__contact_photo_image">Afbeelding van contactpersoon</string>
+    <string name="conversation_list_item_view__contact_photo_image">Afbeelding van contact</string>
     <string name="conversation_list_item_view__archived">Gearchiveerd</string>
 
 
@@ -3736,7 +3867,7 @@
     <!-- conversation_secure_verified -->
 
     <!-- conversation_muted -->
-    <string name="conversation_muted__unmute">Niet langer dempen</string>
+    <string name="conversation_muted__unmute">Dempen opheffen</string>
 
     <!-- conversation_unmuted -->
     <string name="conversation_unmuted__mute_notifications">Meldingen dempen</string>
@@ -3746,8 +3877,8 @@
     <string name="conversation__menu_leave_group">Groep verlaten</string>
     <string name="conversation__menu_view_all_media">Alle media</string>
     <string name="conversation__menu_conversation_settings">Chatinstellingen</string>
-    <string name="conversation__menu_add_shortcut">Aan thuisscherm toevoegen</string>
-    <string name="conversation__menu_create_bubble">Bubbel aanmaken</string>
+    <string name="conversation__menu_add_shortcut">Aan startscherm toevoegen</string>
+    <string name="conversation__menu_create_bubble">Ballon aanmaken</string>
     <!-- Overflow menu option that allows formatting of text -->
     <string name="conversation__menu_format_text">Tekstopmaak</string>
 
@@ -3777,7 +3908,7 @@
     <!-- Displayed as the title of the education bottom sheet -->
     <string name="DoubleTapEditEducationSheet__double_tap_edit_title">Dubbeltik om te bewerken</string>
     <!-- Text on the sheet explaining how double tapping on a message will let them edit it -->
-    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Tik snel twee keer op je berichten om ze te bewerken. Je kunt je berichten tot 24 uur nadat ze zijn verzonden bewerken.</string>
+    <string name="DoubleTapEditEducationSheet__quickly_tap_twice">Tik snel twee keer op je berichten om ze te bewerken. Je kunt je berichten bewerken tot 24 uur nadat ze zijn verzonden.</string>
     <!-- Button label to dismiss sheet -->
     <string name="DoubleTapEditEducationSheet__got_it">Begrepen</string>
 
@@ -3797,7 +3928,7 @@
     <string name="verify_display_fragment_context_menu__compare_with_clipboard">Vergelijken met klembord</string>
 
     <!-- reminder_header -->
-    <string name="reminder_header_service_outage_text">Signal heeft technische problemen. We werken er hard aan om zo snel als mogelijk de bereikbaarheid te herstellen.</string>
+    <string name="reminder_header_service_outage_text">Signal ondervindt momenteel technische problemen. We zijn hard aan het werk om de service zo snel mogelijk te herstellen.</string>
     <string name="reminder_header_progress">%1$d%%</string>
     <!-- Body text of a banner that will show at the top of the chat list when we temporarily cannot process the user\'s contacts -->
     <string name="reminder_cds_warning_body">Signal\'s private contact discovery kan tijdelijk de contacten van je telefoon niet verwerken.</string>
@@ -3862,7 +3993,7 @@
     <string name="KbsSplashFragment__learn_more">Meer lezen</string>
   <!-- Removed by excludeNonTranslatables <string name="KbsSplashFragment__learn_more_link" translatable="false">https://support.signal.org/hc/articles/360007059792</string> -->
     <string name="KbsSplashFragment__registration_lock_equals_pin">Registratievergrendeling = Pincode</string>
-    <string name="KbsSplashFragment__your_registration_lock_is_now_called_a_pin">Registratievergrendeling heet vanaf nu ‘pincode’, en je kunt er meer mee doen. Je moet de pincode welke je tot nog toe gebruikte bijwerken.</string>
+    <string name="KbsSplashFragment__your_registration_lock_is_now_called_a_pin">Registratievergrendeling heet vanaf nu ‘pincode’, en je kunt er meer mee doen. Je moet de pincode die je tot nog toe gebruikte bijwerken.</string>
     <string name="KbsSplashFragment__update_pin">Pincode bijwerken</string>
     <string name="KbsSplashFragment__create_your_pin">Pincode aanmaken</string>
     <string name="KbsSplashFragment__learn_more_about_pins">Meer lezen over pincodes</string>
@@ -3874,7 +4005,7 @@
     <string name="KbsReminderDialog__skip">Overslaan</string>
     <string name="KbsReminderDialog__submit">Bevestigen</string>
     <string name="KbsReminderDialog__forgot_pin">Pincode vergeten?</string>
-    <string name="KbsReminderDialog__incorrect_pin_try_again">Foutieve pincode, probeer het opnieuw.</string>
+    <string name="KbsReminderDialog__incorrect_pin_try_again">Onjuiste pincode, probeer het opnieuw.</string>
 
     <!-- AccountLockedFragment -->
     <string name="AccountLockedFragment__account_locked">Account vergrendeld</string>
@@ -3885,14 +4016,14 @@
 
     <!-- KbsLockFragment -->
     <string name="RegistrationLockFragment__enter_your_pin">Voer je pincode in</string>
-    <string name="RegistrationLockFragment__enter_the_pin_you_created">Voer de pincode in welke je eerder hebt aangemaakt voor je account. Dit is niet dezelfde code als de verificatiecode die je per sms of telefoonoproep hebt ontvangen.</string>
+    <string name="RegistrationLockFragment__enter_the_pin_you_created">Voer de pincode in die je eerder hebt aangemaakt voor je account. Dit is niet dezelfde code als de verificatiecode die je per sms of telefoonoproep hebt ontvangen.</string>
     <!-- Info text shown above a pin entry text box describing what pin they should be entering. -->
     <string name="RegistrationLockFragment__enter_the_pin_you_created_for_your_account">Voer de pincode in die je voor je account hebt gemaakt.</string>
     <!-- Button label to prompt the user to switch between an alphanumeric and numeric-only keyboards -->
     <string name="RegistrationLockFragment__switch_keyboard">Toetsenbord wisselen</string>
-    <string name="RegistrationLockFragment__incorrect_pin_try_again">Foutieve pincode, probeer het opnieuw.</string>
+    <string name="RegistrationLockFragment__incorrect_pin_try_again">Onjuiste pincode, probeer het opnieuw.</string>
     <string name="RegistrationLockFragment__forgot_pin">Pincode vergeten?</string>
-    <string name="RegistrationLockFragment__incorrect_pin">Foutieve pincode</string>
+    <string name="RegistrationLockFragment__incorrect_pin">Onjuiste pincode</string>
     <string name="RegistrationLockFragment__forgot_your_pin">Pincode vergeten?</string>
     <string name="RegistrationLockFragment__not_many_tries_left">Weinig pogingen resterend.</string>
     <string name="RegistrationLockFragment__signal_registration_need_help_with_pin_for_android_v2_pin">Signal-registratie - Hulp nodig met de pincode voor Signal-Android (pincode versie 2)</string>
@@ -3903,8 +4034,8 @@
     </plurals>
 
     <plurals name="RegistrationLockFragment__incorrect_pin_d_attempts_remaining">
-        <item quantity="one">Foutieve pincode. %1$d poging resterend.</item>
-        <item quantity="other">Foutieve pincode. %1$d pogingen resterend.</item>
+        <item quantity="one">Onjuiste pincode. %1$d poging resterend.</item>
+        <item quantity="other">Onjuiste pincode. %1$d pogingen resterend.</item>
     </plurals>
 
     <plurals name="RegistrationLockFragment__if_you_run_out_of_attempts_your_account_will_be_locked_for_d_days">
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Inkomende Signal-spraakoproep</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Inkomende Molly-spraakoproep</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Inkomende Signal-video-oproep</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Inkomende Molly-video-oproep</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Binnenkomende Signal-groepsoproep</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Binnenkomende Molly-groepsoproep</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Lopende Signal-spraakoproep</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Lopende Molly-spraakoproep</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Lopende Signal-video-oproep</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Lopende Molly-video-oproep</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Lopende Signal-groepsoproep</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Lopende Molly-groepsoproep</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Aan het laden…</string>
@@ -3950,10 +4081,10 @@
     <string name="Permissions_permission_required">Toestemming vereist</string>
     <string name="Permissions_continue">Doorgaan</string>
     <string name="Permissions_not_now">Niet nu</string>
-    <string name="SQLCipherMigrationHelper_migrating_signal_database">Signal-databank wordt gemigreerd</string>
+    <string name="SQLCipherMigrationHelper_migrating_signal_database">Signal-database wordt gemigreerd</string>
     <string name="enter_backup_passphrase_dialog__backup_passphrase">Back-upwachtwoord</string>
     <string name="backup_enable_dialog__backups_will_be_saved_to_external_storage_and_encrypted_with_the_passphrase_below_you_must_have_this_passphrase_in_order_to_restore_a_backup">Back-ups worden opgeslagen op het externe opslaggeheugen en versleuteld met het wachtwoord hieronder. Je hebt dit wachtwoord nodig om de back-up te herstellen.</string>
-    <string name="backup_enable_dialog__you_must_have_this_passphrase">Je hebt in de toekomst dit wachtwoord nodig om je gegevens vanuit een back-up te kunnen herstellen.</string>
+    <string name="backup_enable_dialog__you_must_have_this_passphrase">Je hebt dit wachtwoord nodig om je gegevens vanuit een back-up te kunnen herstellen.</string>
     <string name="backup_enable_dialog__folder">Opslaglocatie</string>
     <string name="backup_enable_dialog__i_have_written_down_this_passphrase">Ik heb dit wachtwoord opgeschreven. Zonder dit wachtwoord kan ik back-ups niet gebruiken om gegevens terug te zetten.</string>
     <string name="registration_activity__restore_backup">Back-upgegevens terugzetten</string>
@@ -3991,7 +4122,7 @@
     <string name="BackupDialog_passphrase_was_not_correct">Je hebt niet het juiste back-upwachtwoord ingevoerd.</string>
     <string name="LocalBackupJob_creating_signal_backup">Back-up aan het maken…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Back-up van Signal verifiëren…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Back-up van Molly verifiëren…</string>
     <string name="LocalBackupJobApi29_backup_failed">Het maken van een back-up is mislukt</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Je back-up directory is verwijderd of verplaatst.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Je back-upbestand is te groot om op dit volume op te slaan.</string>
@@ -4001,20 +4132,20 @@
     <!-- Error message shown if a very large attachment is encountered during the backup creation and causes the backup to fail -->
     <string name="LocalBackupJobApi29_your_backup_contains_a_very_large_file">Je back-up bevat een erg groot bestand dat niet opgeslagen kan worden. Verwijder het en probeer het opnieuw.</string>
     <string name="LocalBackupJobApi29_tap_to_manage_backups">Tik om back-ups te beheren</string>
-    <string name="RegistrationActivity_wrong_number">Verkeerd nummer?</string>
+    <string name="RegistrationActivity_wrong_number">Verkeerd telefoonnummer?</string>
     <!--    Countdown to when the user can request a new code via phone call during registration.-->
     <string name="RegistrationActivity_call_me_instead_available_in">Bel me (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Code opnieuw versturen (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Contact opnemen met Signal Support</string>
-    <string name="RegistrationActivity_code_support_subject">Signal-registratie - Verificatiecode voor Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Contact opnemen met Molly Support</string>
+    <string name="RegistrationActivity_code_support_subject">Molly-registratie - Verificatiecode voor Android</string>
     <string name="RegistrationActivity_incorrect_code">Onjuiste code</string>
     <string name="BackupUtil_never">Nooit</string>
     <string name="BackupUtil_unknown">Onbekend</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Telefoonnummer</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Kies wie je telefoonnummer kan zien en wie ermee contact met je kan opnemen op Signal.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Kies wie je telefoonnummer kan zien en wie ermee contact met je kan opnemen op Molly.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Wie kan mijn nummer zien</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4050,19 +4181,19 @@
     <string name="preferences_app_protection__confirm_pin">Bevestig je pincode</string>
     <string name="preferences_app_protection__confirm_your_signal_pin">Je Signal-pincode bevestigen</string>
     <string name="preferences_app_protection__make_sure_you_memorize_or_securely_store_your_pin">Zorg ervoor dat je je Signal-pincode onthoudt of op een goed beveiligde manier opslaat, want je kunt je pincode niet herstellen. Als je je pincode toch vergeet, dan verlies je mogelijk gegevens bij het opnieuw registreren van je Signal-account.</string>
-    <string name="preferences_app_protection__incorrect_pin_try_again">Foutieve pincode, probeer het opnieuw.</string>
+    <string name="preferences_app_protection__incorrect_pin_try_again">Onjuiste pincode, probeer het opnieuw.</string>
     <string name="preferences_app_protection__failed_to_enable_registration_lock">Het is niet gelukt om registratievergrendeling in te schakelen.</string>
     <string name="preferences_app_protection__failed_to_disable_registration_lock">Het is niet gelukt om registratievergrendeling uit te schakelen.</string>
     <string name="AppProtectionPreferenceFragment_none">Geen</string>
     <string name="preferences_app_protection__registration_lock">Registratievergrendeling</string>
-    <string name="RegistrationActivity_you_must_enter_your_registration_lock_PIN">Je moet je Signal-pincode invoeren omdat registratievergrendeling is ingeschakeld</string>
+    <string name="RegistrationActivity_you_must_enter_your_registration_lock_PIN">Je moet je pincode voor registratievergrendeling invoeren</string>
     <string name="RegistrationActivity_your_pin_has_at_least_d_digits_or_characters">Je pincode bestaat uit ten minste %1$d cijfers of karakters</string>
     <string name="RegistrationActivity_too_many_attempts">Te veel pogingen</string>
     <string name="RegistrationActivity_you_have_made_too_many_incorrect_registration_lock_pin_attempts_please_try_again_in_a_day">Je hebt te veel pogingen ondernomen om met een ongeldige pincode de registratievergrendeling uit te schakelen, probeer het morgen opnieuw.</string>
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Je hebt te veel pogingen ondernomen. Probeer het later opnieuw.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Fout bij het verbinden met Signals servers</string>
     <string name="preferences_chats__backups">Back-ups</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal is vergrendeld</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly is vergrendeld</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">TIK OM TE ONTGRENDELEN</string>
     <string name="Recipient_unknown">Onbekend</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Je kunt dit alleen doen als je je oude apparaat nog kunt gebruiken.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Gegevens vanuit een back-up terugzetten</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Herstel je berichten en media vanuit een lokale back-up. Herstellen vanuit een back-up kan alleen tijdens deze stap en kun je op een later moment niet alsnog doen.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Lokale back-upgegevens terugzetten</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signal back-upgegevens terugzetten</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Herstel al je tekstberichten + je media van de laatste 30 dagen</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Meer opties</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Annuleren</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Inloggen zonder overzetten</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Ga door zonder je berichten en media over te zetten</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Open Signal op je oude apparaat</string>
     <string name="NewDeviceTransferInstructions__continue">Doorgaan</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Aan het voorbereiden om verbinding te maken met je oude Android-apparaat…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Een moment, dit duurt niet lang</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Aan het wachten tot je oude Android-apparaat verbinding maakt…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Om je oude Android-apparaat te kunnen detecteren en om er verbinding mee te maken, heeft de Signal-app een machtiging nodig om je locatie te lezen.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Om je oude Android-apparaat te kunnen detecteren en om er verbinding mee te maken, heeft de Molly-app een machtiging nodig om je locatie te lezen.</string>
     <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Om je oude Android-apparaat te kunnen detecteren en om er verbinding mee te maken, is het nodig dat locatiebepaling op dit apparaat is ingeschakeld.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal heeft wifi op je apparaat nodig om verbinding te maken met je oude Android-apparaat. Wifi moet zijn ingeschakeld, maar je hoeft niet verbonden te zijn met een wifi-netwerk.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Sorry, het lijkt er op dat dit apparaat geen ondersteuning biedt voor Wi-Fi Direct. Signal heeft Wi-Fi Direct nodig om je oude Android-apparaat te detecteren en om er verbinding mee te maken. Je kunt nog wel je gegevens overzetten door op je oude Android-apparaat in Signal een back-up te maken en vervolgens die back-up te herstellen op je nieuwe Android-apparaat.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly heeft wifi op je apparaat nodig om verbinding te maken met je oude Android-apparaat. Wifi moet zijn ingeschakeld, maar je hoeft niet verbonden te zijn met een wifi-netwerk.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Sorry, het lijkt er op dat dit apparaat geen ondersteuning biedt voor Wi-Fi Direct. Molly heeft Wi-Fi Direct nodig om je oude Android-apparaat te detecteren en om er verbinding mee te maken. Je kunt nog wel je gegevens overzetten door op je oude Android-apparaat in Molly een back-up te maken en vervolgens die back-up te herstellen op je nieuwe Android-apparaat.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Back-upgegevens terugzetten</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Er is een onverwachte fout opgetreden bij het proberen verbinding te maken met je oude Android-apparaat.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Er wordt gezocht naar je nieuwe Android-apparaat…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Om je nieuwe Android-apparaat te kunnen detecteren en om er verbinding mee te maken, heeft de Signal-app een machtiging nodig om je locatie te lezen.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Om je nieuwe Android-apparaat te kunnen detecteren en om er verbinding mee te maken, heeft de Molly-app een machtiging nodig om je locatie te lezen.</string>
     <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Om je nieuwe Android-apparaat te kunnen detecteren en om er verbinding mee te maken, is het nodig dat locatiebepaling op dit apparaat is ingeschakeld.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal heeft wifi op je apparaat nodig om verbinding te maken met je nieuwe Android-apparaat. Wifi moet zijn ingeschakeld, maar je hoeft niet verbonden te zijn met een wifi-netwerk.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Sorry, het lijkt er op dat dit apparaat geen ondersteuning biedt voor Wi-Fi Direct. Signal heeft Wi-Fi Direct nodig om je nieuwe Android-apparaat te detecteren en om er verbinding mee te maken. Je kunt nog wel je gegevens overzetten door op je oude Android-apparaat in Signal een back-up te maken en vervolgens die back-up te herstellen op je nieuwe Android-apparaat.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly heeft wifi op je apparaat nodig om verbinding te maken met je nieuwe Android-apparaat. Wifi moet zijn ingeschakeld, maar je hoeft niet verbonden te zijn met een wifi-netwerk.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Sorry, het lijkt er op dat dit apparaat geen ondersteuning biedt voor Wi-Fi Direct. Molly heeft Wi-Fi Direct nodig om je nieuwe Android-apparaat te detecteren en om er verbinding mee te maken. Je kunt nog wel je gegevens overzetten door op je oude Android-apparaat in Molly een back-up te maken en vervolgens die back-up te herstellen op je nieuwe Android-apparaat.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Een back-up maken</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Er is een onverwachte fout opgetreden bij het proberen verbinding te maken met je nieuwe Android-apparaat.</string>
 
@@ -4148,7 +4286,7 @@
     <string name="DeviceTransferSetup__wifi">Wifi</string>
     <string name="DeviceTransferSetup__on_the_wifi_direct_screen_remove_all_remembered_groups_and_unlink_any_invited_or_connected_devices">Verwijder in het wifi-directscherm alle onthouden groepen en verbreek de verbinding met alle verbonden of uitgenodigde apparaten.</string>
     <string name="DeviceTransferSetup__wifi_direct_screen">Wifi-direct-scherm</string>
-    <string name="DeviceTransferSetup__try_turning_wifi_off_and_on_on_both_devices">Probeer eens of het helpt om wifi uit te schakelen en weer in te schakelen op beide apparaten.</string>
+    <string name="DeviceTransferSetup__try_turning_wifi_off_and_on_on_both_devices">Probeer of het helpt om wifi uit te schakelen en weer in te schakelen op beide apparaten.</string>
     <string name="DeviceTransferSetup__make_sure_both_devices_are_in_transfer_mode">Ga na dat beide apparaten in overzet-modus staan.</string>
     <string name="DeviceTransferSetup__go_to_support_page">Ga naar de ondersteuningspagina</string>
     <string name="DeviceTransferSetup__try_again">Opnieuw proberen</string>
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Gegevens aan het overzetten</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Houd de apparaten bij elkaar in de buurt. Schakel ze niet uit, en houd de Signal-app open. Het overzetten is goed beveiligd, want dit gebeurt altijd over een end-to-end-versleutelde verbinding.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Houd de apparaten bij elkaar in de buurt. Schakel ze niet uit, en houd de Molly-app open. Het overzetten is goed beveiligd, want dit gebeurt altijd over een end-to-end-versleutelde verbinding.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d berichten tot nu toe…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% van de berichten tot nu toe…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Account overzetten</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Download en open Signal op je nieuwe Android-apparaat</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Download en open Molly op je nieuwe Android-apparaat</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Tik op ‘Account overzetten of herstellen’"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4206,7 +4344,7 @@
 
     <!-- OldDeviceTransferLockedDialog -->
     <string name="OldDeviceTransferLockedDialog__complete_registration_on_your_new_device">Rond op je nieuwe Android-apparaat de stappen voor registratie af.</string>
-    <string name="OldDeviceTransferLockedDialog__your_signal_account_has_been_transferred_to_your_new_device">Je Signal-account is overgezet naar je nieuwe apparaat, maar om het overzetten te voltooien moet je eerst nog de registratie van je telefoonnummer op je nieuwe apparaat afronden.</string>
+    <string name="OldDeviceTransferLockedDialog__your_signal_account_has_been_transferred_to_your_new_device">Je Signal-account is overgezet naar je nieuwe apparaat, maar om het overzetten te voltooien moet je eerst nog de registratie van je telefoonnummer op je nieuwe apparaat afronden. Signal is niet langer actief op dit apparaat.</string>
     <string name="OldDeviceTransferLockedDialog__done">Klaar</string>
     <string name="OldDeviceTransferLockedDialog__cancel_and_activate_this_device">Annuleren en dit apparaat activeren</string>
 
@@ -4217,7 +4355,7 @@
     <string name="RecipientBottomSheet_unblock">Deblokkeren</string>
     <string name="RecipientBottomSheet_add_to_contacts">Aan contactenlijst toevoegen</string>
     <!-- Error message that displays when a user tries to tap to view system contact details but has no app that supports it -->
-    <string name="RecipientBottomSheet_unable_to_open_contacts">Kan geen app vinden om contactenlijst weer te geven.</string>
+    <string name="RecipientBottomSheet_unable_to_open_contacts">Geen app gevonden om de contactenlijst weer te geven.</string>
     <string name="RecipientBottomSheet_add_to_a_group">Aan een groep toevoegen</string>
     <string name="RecipientBottomSheet_add_to_another_group">Aan nog een andere groep toevoegen</string>
     <string name="RecipientBottomSheet_view_safety_number">Veiligheidsnummer weergeven</string>
@@ -4226,7 +4364,7 @@
     <string name="RecipientBottomSheet_remove_from_group">Uit de groep verwijderen</string>
 
     <string name="RecipientBottomSheet_remove_s_as_group_admin">De beheerdersbevoegdheden van %1$s intrekken?</string>
-    <string name="RecipientBottomSheet_s_will_be_able_to_edit_group">"‘%1$s’ zal de groepsinformatie en groepslidmaatschap kunnen bewerken."</string>
+    <string name="RecipientBottomSheet_s_will_be_able_to_edit_group">"‘%1$s’ zal de groepsinformatie en het groepslidmaatschap kunnen bewerken."</string>
 
     <string name="RecipientBottomSheet_remove_s_from_the_group">%1$s uit deze groep verwijderen?</string>
     <!-- Dialog message shown when removing someone from a group with group link being active to indicate they will not be able to rejoin -->
@@ -4241,7 +4379,7 @@
 
 
     <!-- GroupsLearnMoreBottomSheetDialogFragment -->
-    <string name="GroupsLearnMore_legacy_vs_new_groups">Verouderde groepen tegenover nieuwe-stijl groepen</string>
+    <string name="GroupsLearnMore_legacy_vs_new_groups">Verouderde groepen versus nieuwe-stijl groepen</string>
     <string name="GroupsLearnMore_what_are_legacy_groups">Wat zijn verouderde groepen?</string>
     <string name="GroupsLearnMore_paragraph_1">Verouderde groepen zijn groepen waarin je geen gebruik kunt maken van nieuwe functionaliteiten zoals beheerders en meer gedetailleerde meldingen.</string>
     <string name="GroupsLearnMore_can_i_upgrade_a_legacy_group">Kan ik een verouderde groep omzetten in een nieuwe groep?</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Iedereen met deze link kan de naam, afbeelding en het aantal groepsleden zien en kan een verzoek indienen om lid te mogen worden deze groep. Deel deze link alleen met personen die je vertrouwt.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Iedereen met deze link kan de naam, afbeelding en het aantal groepsleden zien en kan direct lid worden. Deel deze link alleen met personen die je vertrouwt.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Delen via Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Delen via Molly</string>
     <string name="GroupLinkBottomSheet_copy">Kopiëren</string>
     <string name="GroupLinkBottomSheet_qr_code">QR-code</string>
     <string name="GroupLinkBottomSheet_share">Delen via andere app</string>
@@ -4305,7 +4443,7 @@
     <string name="ReviewCard__request">Wil een gesprek met je beginnen</string>
     <string name="ReviewCard__your_contact">Persoon die in je contactenlijst staat</string>
     <string name="ReviewCard__remove_from_group">Uit de groep verwijderen</string>
-    <string name="ReviewCard__update_contact">Contactpersoon aanpassen</string>
+    <string name="ReviewCard__update_contact">Contact aanpassen</string>
     <string name="ReviewCard__block">Blokkeren</string>
     <string name="ReviewCard__delete">Verwijderen</string>
     <!-- Displayed when a recent name change has occurred. First placeholder is new short name, second is previous name, third is new name. -->
@@ -4367,7 +4505,7 @@
     <!-- Title of error dialog shown when a network error occurs during account deletion -->
     <string name="DeleteAccountFragment__account_not_deleted">Account is niet verwijderd</string>
     <!-- Message of error dialog shown when a network error occurs during account deletion -->
-    <string name="DeleteAccountFragment__there_was_a_problem">Er is een probleem met het verwijderen van je gegevens. Ga na dat je apparaat met het internet is verbonden en probeer het opnieuw.</string>
+    <string name="DeleteAccountFragment__there_was_a_problem">Er is een probleem met het verwijderen van je gegevens. Controleer je internetverbinding en probeer het opnieuw.</string>
 
     <!-- DeleteAccountCountryPickerFragment -->
     <string name="DeleteAccountCountryPickerFragment__search_countries">Land zoeken</string>
@@ -4399,11 +4537,11 @@
     <string name="ChatWallpaperFragment__reset_chat_color_question">Chatkleur verwijderen?</string>
     <string name="ChatWallpaperFragment__set_wallpaper">Chatachtergrond kiezen</string>
     <string name="ChatWallpaperFragment__dark_mode_dims_wallpaper">Achtergrond dimmen bij donkere modus</string>
-    <string name="ChatWallpaperFragment__contact_name">Naam van contactpersoon</string>
-    <string name="ChatWallpaperFragment__reset">Voor dit gesprek verwijderen</string>
+    <string name="ChatWallpaperFragment__contact_name">Naam van contact</string>
+    <string name="ChatWallpaperFragment__reset">Voor deze chat verwijderen</string>
     <string name="ChatWallpaperFragment__wallpaper_preview_description">Achtergrond-voorbeeld</string>
     <string name="ChatWallpaperFragment__would_you_like_to_override_all_chat_colors">Wil je alleen de standaardkleur verwijderen of wil je alle chatkleuren verwijderen?</string>
-    <string name="ChatWallpaperFragment__would_you_like_to_override_all_wallpapers">Wil je alleen de standaardachtergrond verwijderen of wil je alle achtergronden van alle gesprekken verwijderen?</string>
+    <string name="ChatWallpaperFragment__would_you_like_to_override_all_wallpapers">Wil je alleen de standaardachtergrond verwijderen of wil je alle achtergronden van alle chats verwijderen?</string>
     <string name="ChatWallpaperFragment__reset_default_colors">Standaardkleur verwijderen</string>
     <string name="ChatWallpaperFragment__reset_all_colors">Alle kleurinstellingen verwijderen</string>
     <string name="ChatWallpaperFragment__reset_default_wallpaper">Standaardachtergrond verwijderen</string>
@@ -4420,16 +4558,16 @@
     <string name="ChatWallpaperPreviewActivity__preview">Voorbeeld</string>
     <string name="ChatWallpaperPreviewActivity__set_wallpaper">Chatachtergrond kiezen</string>
     <string name="ChatWallpaperPreviewActivity__swipe_to_preview_more_wallpapers">Veeg om meer achtergronden weer te geven.</string>
-    <string name="ChatWallpaperPreviewActivity__set_wallpaper_for_all_chats">Achtergrond instellen voor alle chats</string>
-    <string name="ChatWallpaperPreviewActivity__set_wallpaper_for_s">Deze standaard achtergrond instellen voor %1$s.</string>
+    <string name="ChatWallpaperPreviewActivity__set_wallpaper_for_all_chats">Deze achtergrond instellen voor alle chats.</string>
+    <string name="ChatWallpaperPreviewActivity__set_wallpaper_for_s">Deze achtergrond instellen voor %1$s.</string>
     <string name="ChatWallpaperPreviewActivity__viewing_your_gallery_requires_the_storage_permission">Om je galerij te bekijken is toestemming nodig om de opslag te gebruiken.</string>
 
     <!-- WallpaperImageSelectionActivity -->
 
     <!-- WallpaperCropActivity -->
     <string name="WallpaperCropActivity__pinch_to_zoom_drag_to_adjust">Knijp met twee vingers om te vergroten of te draaien, sleep met één vinger om te verschuiven.</string>
-    <string name="WallpaperCropActivity__set_wallpaper_for_all_chats">Achtergrond instellen voor alle chats.</string>
-    <string name="WallpaperCropActivity__set_wallpaper_for_s">Achtergrond instellen voor %1$s.</string>
+    <string name="WallpaperCropActivity__set_wallpaper_for_all_chats">Deze achtergrond instellen voor alle chats.</string>
+    <string name="WallpaperCropActivity__set_wallpaper_for_s">Deze achtergrond instellen voor %1$s.</string>
     <string name="WallpaperCropActivity__error_setting_wallpaper">Het instellen van een achtergrond is mislukt.</string>
     <string name="WallpaperCropActivity__blur_photo">Afbeelding vervagen</string>
 
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">Over MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin is een nieuw privacygericht digitaal betaalmiddel.</string>
     <string name="payment_info_card_adding_funds">Krediet toevoegen</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Je kunt krediet aan Signal toevoegen door een hoeveelheid MobileCoin naar je portemonnee-adres te sturen.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Je kunt krediet aan Molly toevoegen door MobileCoin naar je portemonnee-adres te sturen.</string>
     <string name="payment_info_card_cashing_out">Uitbetalen</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Je kunt op elk moment je MobileCoin laten uitbetalen via een beurs die MobileCoin ondersteunt. Je hoeft slechts over te schrijven naar jouw account bij die beurs.</string>
     <string name="payment_info_card_hide_this_card">Deze informatie verbergen?</string>
@@ -4448,7 +4586,7 @@
     <!-- Button in save recovery phrase card -->
     <string name="payment_info_card_save_your_phrase">Sla je herstelzin op</string>
     <string name="payment_info_card_update_your_pin">Nieuwe pincode aanmaken</string>
-    <string name="payment_info_card_with_a_high_balance">Als je veel krediet hebt, is het misschien verstandig om je numerieke pincode te vervangen door een alfanumerieke pincode, omdat een alfanumerieke pincode meer bescherming biedt.</string>
+    <string name="payment_info_card_with_a_high_balance">Als je veel krediet hebt, is het misschien verstandig om je numerieke pincode te vervangen door een alfanumerieke pincode voor meer bescherming.</string>
     <string name="payment_info_card_update_pin">Pincode bijwerken</string>
 
   <!-- Removed by excludeNonTranslatables <string name="payment_info_card__learn_more__about_mobilecoin" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_which_ones</string> -->
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Portemonnee uitschakelen</string>
     <string name="DeactivateWalletFragment__your_balance">Jouw krediet</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Het is raadzaam om je krediet eerst naar een ander portemonnee-adres over te schrijven voordat je betalingen uitschakelt. Als je er niet voor kiest om eerst je krediet over te schrijven dan blijft je krediet bestaan op het portemonnee-adres dat je aan Signal hebt gekoppeld. Je kunt het dan weer gebruiken als je betalingen opnieuw inschakelt.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Het is raadzaam om je krediet eerst naar een ander portemonnee-adres over te schrijven voordat je betalingen uitschakelt. Als je er niet voor kiest om eerst je krediet over te schrijven dan blijft je krediet bestaan op het portemonnee-adres dat je aan Molly hebt gekoppeld. Je kunt het dan weer gebruiken als je betalingen opnieuw inschakelt.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Resterend krediet overschrijven</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Uitschakelen zonder overschrijven</string>
     <string name="DeactivateWalletFragment__deactivate">Uitschakelen</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Uitschakelen zonder overschrijven?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Je krediet blijft beschikbaar in de portemonnee die aan Signal is gekoppeld, zodra je betalingen weer inschakelt.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Je krediet blijft beschikbaar in de portemonnee die aan Molly is gekoppeld, zodra je betalingen weer inschakelt.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Fout bij het uitschakelen van je portemonnee</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4515,7 +4653,7 @@
     <string name="PaymentsRecoveryPhraseFragment__invalid_recovery_phrase">Herstelzin ongeldig</string>
     <string name="PaymentsRecoveryPhraseFragment__make_sure_youve_entered_your_phrase_correctly_and_try_again">Ga na dat je je zin juist hebt ingevuld en probeer het opnieuw.</string>
     <string name="PaymentsRecoveryPhraseFragment__copy_to_clipboard">Kopiëren naar klembord?</string>
-    <string name="PaymentsRecoveryPhraseFragment__if_you_choose_to_store">Als je er voor kiest om je herstelzin digitaal op te slaan, zorg er dan voor dat je het beveiligd / versleuteld opslaat op een plek waarvan je weet dat niemand anders er bij kan.</string>
+    <string name="PaymentsRecoveryPhraseFragment__if_you_choose_to_store">Als je ervoor kiest om je herstelzin digitaal op te slaan, zorg er dan voor dat je het beveiligd opslaat op een plek waarvan je weet dat niemand anders er bij kan.</string>
     <string name="PaymentsRecoveryPhraseFragment__copy">Kopiëren</string>
 
     <!-- PaymentsRecoveryPhraseConfirmFragment -->
@@ -4646,11 +4784,11 @@
 
     <!-- ChangeNumberConfirmFragment -->
     <string name="ChangeNumberConfirmFragment__change_number">Telefoonnummer wijzigen</string>
-    <string name="ChangeNumberConfirmFragment__you_are_about_to_change_your_phone_number_from_s_to_s">Je staat op het punt het telefoonnummer waarmee je geregistreerd staat te wijzigen van %1$s naar %2$s.\n\nGa na dat het telefoonnummer hieronder juist is voordat je verder gaat.</string>
+    <string name="ChangeNumberConfirmFragment__you_are_about_to_change_your_phone_number_from_s_to_s">Je staat op het punt het telefoonnummer waarmee je geregistreerd staat te wijzigen van %1$s naar %2$s.\n\nControleer of het telefoonnummer hieronder juist is voordat je verder gaat.</string>
     <string name="ChangeNumberConfirmFragment__edit_number">Onjuist telefoonnummer bewerken</string>
 
     <!-- ChangeNumberRegistrationLockFragment -->
-    <string name="ChangeNumberRegistrationLockFragment__signal_change_number_need_help_with_pin_for_android_v2_pin">Telefoonnummer voor Signal veranderen - Hulp nodig bij met de pincode (pincode-versie 2)</string>
+    <string name="ChangeNumberRegistrationLockFragment__signal_change_number_need_help_with_pin_for_android_v2_pin">Telefoonnummer wijzigen in Signal - Hulp nodig met de pincode voor Android (Pincode-versie 2)</string>
 
     <!-- ChangeNumberPinDiffersFragment -->
     <string name="ChangeNumberPinDiffersFragment__pins_do_not_match">De pincodes komen niet overeen</string>
@@ -4661,7 +4799,7 @@
 
     <!-- ChangeNumberLockActivity -->
     <!-- Info message shown to user if something crashed the app during the change number attempt and we were unable to confirm the change so we force them into this screen to check before letting them use the app -->
-    <string name="ChangeNumberLockActivity__it_looks_like_you_tried_to_change_your_number_but_we_were_unable_to_determine_if_it_was_successful_rechecking_now">Het lijkt er op dat je hebt geprobeerd om je telefoonnummer te wijzigen, maar Signal kan niet vaststellen of dat is geslaagd.\n\nSignal gaat nu opnieuw na of je telefoonnummer is gewijzigd…</string>
+    <string name="ChangeNumberLockActivity__it_looks_like_you_tried_to_change_your_number_but_we_were_unable_to_determine_if_it_was_successful_rechecking_now">Het lijkt er op dat je hebt geprobeerd om je telefoonnummer te wijzigen, maar Signal kan niet vaststellen of dat is geslaagd.\n\nSignal controleert nu opnieuw of je telefoonnummer is gewijzigd…</string>
     <!-- Dialog title shown if we were able to confirm your change number status (meaning we now know what the server thinks our number is) after a crash during the regular flow -->
     <string name="ChangeNumberLockActivity__change_status_confirmed">Telefoonnummer is succesvol gewijzigd</string>
     <!-- Dialog message shown if we were able to confirm your change number status (meaning we now know what the server thinks our number is) after a crash during the regular flow -->
@@ -4678,13 +4816,13 @@
 
     <!-- ChatsSettingsFragment -->
     <string name="ChatsSettingsFragment__keyboard">Toetsenbord</string>
-    <string name="ChatsSettingsFragment__enter_key_sends">Enter-toets verzendt</string>
+    <string name="ChatsSettingsFragment__enter_key_sends">Verzenden met Enter-toets</string>
 
     <!-- NotificationsSettingsFragment -->
     <string name="NotificationsSettingsFragment__messages">Berichten</string>
     <string name="NotificationsSettingsFragment__calls">Oproepen</string>
     <string name="NotificationsSettingsFragment__notify_when">Geef me een melding wanneer…</string>
-    <string name="NotificationsSettingsFragment__contact_joins_signal">Een contactpersoon die in mijn systeemcontactenlijst staat sinds kort via Signal bereikbaar is</string>
+    <string name="NotificationsSettingsFragment__contact_joins_signal">Een telefooncontact vanaf nu ook op Signal bereikbaar is</string>
     <!-- Notification preference header -->
     <string name="NotificationsSettingsFragment__notification_profiles">Meldingsprofielen</string>
     <!-- Notification preference option header -->
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licenties</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Gebruiksvoorwaarden &amp; privacybeleid</string>
-    <string name="HelpFragment__copyright_signal_messenger">Auteursrecht Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Auteursrecht Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Uitgegeven onder een GNU AGPLv3-licentie</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4873,7 +5011,7 @@
     <!-- Button label with hyphenation. Translation can use soft hyphen - Unicode U+00AD -->
     <string name="ConversationSettingsFragment__mute">Dempen</string>
     <!-- Button label with hyphenation. Translation can use soft hyphen - Unicode U+00AD -->
-    <string name="ConversationSettingsFragment__muted">Niet langer dempen</string>
+    <string name="ConversationSettingsFragment__muted">Dempen opheffen</string>
     <!-- Button label with hyphenation. Translation can use soft hyphen - Unicode U+00AD -->
     <string name="ConversationSettingsFragment__search">Zoeken</string>
     <string name="ConversationSettingsFragment__disappearing_messages">Verdwijnende berichten</string>
@@ -4889,10 +5027,10 @@
     <string name="ConversationSettingsFragment__see_all">Alles weergeven</string>
     <string name="ConversationSettingsFragment__add_members">Groepsleden toevoegen</string>
     <string name="ConversationSettingsFragment__permissions">Machtigingen</string>
-    <string name="ConversationSettingsFragment__requests_and_invites">Verzoeken &amp; uitnodiging</string>
+    <string name="ConversationSettingsFragment__requests_and_invites">Verzoeken &amp; uitnodigingen</string>
     <string name="ConversationSettingsFragment__group_link">Groepslink</string>
-    <string name="ConversationSettingsFragment__add_as_a_contact">Als contactpersoon toevoegen</string>
-    <string name="ConversationSettingsFragment__unmute">Niet langer dempen</string>
+    <string name="ConversationSettingsFragment__add_as_a_contact">Als contact toevoegen</string>
+    <string name="ConversationSettingsFragment__unmute">Dempen opheffen</string>
     <!-- The subtitle for a settings item that describes how long the user\'s chat is muted. If a chat is muted, you will not receive notifications unless @mentioned. The placeholder represents a time (e.g. 10pm, March 4, etc). -->
     <string name="ConversationSettingsFragment__conversation_muted_until_s">Chat gedempt tot %1$s</string>
     <string name="ConversationSettingsFragment__conversation_muted_forever">Chat voor altijd gedempt</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Kies een achtergrondkleur</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">Sms (onbeveiligd)</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Delen</string>
 
@@ -5030,18 +5165,19 @@
         <item quantity="other">Berichten verzenden is mislukt</item>
     </plurals>
     <plurals name="MultiselectForwardFragment__couldnt_forward_messages">
-        <item quantity="one">Kon een bericht niet doorsturen omdat die inmiddels niet langer beschikbaar is.</item>
-        <item quantity="other">Kon sommige berichten niet doorsturen omdat die inmiddels niet langer beschikbaar zijn.</item>
+        <item quantity="one">Kon een bericht niet doorsturen omdat die niet langer beschikbaar is.</item>
+        <item quantity="other">Kon sommige berichten niet doorsturen omdat die niet langer beschikbaar zijn.</item>
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Alleen beheerders kunnen in deze groep berichten sturen.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Limiet bereikt</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Je kunt niet meer dan 5 chats selecteren</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
     <string name="MediaReviewFragment__add_to_the_group_story">Toevoegen aan groepsverhaal %1$s</string>
     <!-- Positive dialog action when sending a story via an add to group story button -->
-    <string name="MediaReviewFragment__add_to_story">Een verhaal toevoegen</string>
+    <string name="MediaReviewFragment__add_to_story">Aan verhaal toevoegen</string>
     <string name="MediaReviewFragment__add_a_message">Berichttekst toevoegen</string>
     <string name="MediaReviewFragment__add_a_reply">Een reactie toevoegen</string>
     <string name="MediaReviewFragment__send_to">Versturen naar</string>
@@ -5105,7 +5241,7 @@
     <!-- The title of a dialog notifying that the user scanned a QR code that could be used to link a Signal device. -->
     <string name="MediaCaptureFragment_device_link_dialog_title">Apparaat koppelen?</string>
     <!-- The body of a dialog notifying that the user scanned a QR code that could be used to link a Signal device. -->
-    <string name="MediaCaptureFragment_device_link_dialog_body">Het lijkt erop dat je een Signal-apparaat probeert te koppelen. Tik op doorgaan en scan de code opnieuw om het apparaat te koppelen.</string>
+    <string name="MediaCaptureFragment_device_link_dialog_body">Het lijkt erop dat je een Signal-apparaat probeert te koppelen. Tik op Doorgaan en scan de code opnieuw om het apparaat te koppelen.</string>
     <!-- The label of a dialog asking the user if they would like to continue to the linked device settings screen. -->
     <string name="MediaCaptureFragment_device_link_dialog_continue">Doorgaan</string>
 
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Meer lezen</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Signal bijwerken</string>
+    <string name="UpdateSignalExpiredDialog__title">Molly bijwerken</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Deze versie van Signal is verlopen. Werk nu bij om Signal te blijven gebruiken.</string>
+    <string name="UpdateSignalExpiredDialog__message">Deze versie van Molly is verlopen. Werk nu bij om Molly te blijven gebruiken.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Bijwerken</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Toestel niet geregistreerd</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Dit apparaat is niet meer geregistreerd. Registreer je opnieuw om Signal op dit apparaat te blijven gebruiken.</string>
+    <string name="ReregisterSignalDialog__message">Dit apparaat is niet meer geregistreerd. Registreer je opnieuw om Molly op dit apparaat te blijven gebruiken.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Opnieuw registreren</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5263,7 +5399,7 @@
     <!-- Displayed in notification when user payment fails to process on Stripe -->
     <string name="DonationsErrors__error_processing_payment">Fout bij het verwerken van donatie</string>
     <!-- Displayed on manage donations screen as a dialog message when payment method failed -->
-    <string name="DonationsErrors__try_another_payment_method">Probeer het via een andere betalingsmethode of neem contact op met je bank om hen om meer informatie te vragen.</string>
+    <string name="DonationsErrors__try_another_payment_method">Probeer het via een andere betalingsmethode of neem contact op met je bank voor meer informatie.</string>
     <!-- Displayed on manage donations screen error dialogs as an action label -->
     <string name="DonationsErrors__learn_more">Meer lezen</string>
     <!-- Displayed on "My Support" screen when user subscription payment method failed. -->
@@ -5274,7 +5410,7 @@
     <!-- Displayed when badge credential couldn\'t be verified -->
     <string name="DonationsErrors__failed_to_validate_badge">Kon badge-echtheid niet nagaan</string>
     <!-- Displayed when badge credential couldn\'t be verified -->
-    <string name="DonationsErrors__could_not_validate">Kon de reactie-echtheid van de server niet nagaan. Neem contact op met ondersteuning.</string>
+    <string name="DonationsErrors__could_not_validate">Kon antwoord van de server niet valideren. Neem contact op met ondersteuning.</string>
     <!-- Displayed as title when some generic error happens during sending donation on behalf of another user -->
     <string name="DonationsErrors__donation_failed">Doneren is mislukt</string>
     <!-- Displayed as message when some generic error happens during sending donation on behalf of another user -->
@@ -5284,14 +5420,14 @@
     <string name="DonationsErrors__failed_to_cancel_subscription">Het stopzetten van je maandelijkse donatie is mislukt</string>
     <string name="DonationsErrors__subscription_cancellation_requires_an_internet_connection">Om je maandelijkse donatie stop te zetten moet je toegang hebben tot internet.</string>
     <string name="ViewBadgeBottomSheetDialogFragment__your_device_doesn_t_support_google_pay_so_you_can_t_subscribe_to_earn_a_badge_you_can_still_support_signal_by_making_a_donation_on_our_website">Je apparaat biedt geen ondersteuning voor Google Pay, daarom kun je via de app geen maandelijkse donatie maken en kun je geen badge verdienen. Je kunt nog wel doneren via Signals website.</string>
-    <string name="NetworkFailure__network_error_check_your_connection_and_try_again">Netwerkfout. Ga na dat je apparaat met het internet is verbonden en probeer het opnieuw.</string>
+    <string name="NetworkFailure__network_error_check_your_connection_and_try_again">Netwerkfout. Controleer je internetverbinding en probeer het opnieuw.</string>
     <string name="NetworkFailure__retry">Opnieuw proberen</string>
     <!-- Displayed as a dialog title when the selected recipient for a gift doesn\'t support gifting -->
     <string name="DonationsErrors__cannot_send_donation">Kan donatie niet versturen</string>
     <!-- Displayed as a dialog message when the selected recipient for a gift doesn\'t support gifting -->
     <string name="DonationsErrors__this_user_cant_receive_donations_until">Deze gebruiker kan geen donaties ontvangen totdat Signal is geüpgraded.</string>
     <!-- Displayed as a dialog message when the user\'s profile could not be fetched, likely due to lack of internet -->
-    <string name="DonationsErrors__your_donation_could_not_be_sent">Je donatie kon niet worden verstuurd vanwege een netwerkfout. Ga na dat je apparaat met het internet is verbonden en probeer het opnieuw.</string>
+    <string name="DonationsErrors__your_donation_could_not_be_sent">Je donatie kon niet worden verstuurd vanwege een netwerkfout. Controleer je internetverbinding en probeer het opnieuw.</string>
     <!-- Displayed as a dialog message when the user encounters an error during an iDEAL donation -->
     <string name="DonationsErrors__your_ideal_couldnt_be_processed">Je donatie met iDEAL kan niet worden verwerkt. Probeer het via een andere betalingsmethode of neem contact op met je bank voor meer informatie.</string>
 
@@ -5310,7 +5446,7 @@
 
 
     <!-- Stripe decline code generic_failure -->
-    <string name="DeclineCode__try_another_payment_method_or_contact_your_bank">Probeer het via een andere betalingsmethode of neem contact op met je bank om hen om meer informatie te vragen.</string>
+    <string name="DeclineCode__try_another_payment_method_or_contact_your_bank">Probeer het via een andere betalingsmethode of neem contact op met je bank voor meer informatie.</string>
     <!-- PayPal decline code for payment declined -->
     <string name="DeclineCode__try_another_payment_method_or_contact_your_bank_for_more_information_if_this_was_a_paypal">Probeer het via een andere betalingsmethode of neem contact op met je bank voor meer informatie. Als dit een PayPal-transactie was, neem dan contact op met PayPal.</string>
     <!-- Stripe decline code verify on Google Pay and try again -->
@@ -5322,21 +5458,21 @@
     <!-- Stripe decline code purchase not supported -->
     <string name="DeclineCode__your_card_does_not_support_this_type_of_purchase">Je betaalkaart ondersteunt dit type betaling niet. Probeer het via een andere betalingsmethode opnieuw.</string>
     <!-- Stripe decline code your card has expired -->
-    <string name="DeclineCode__your_card_has_expired">Je betaalkaart is verlopen. Werk eerst je betalingsinformatie bij in Google Pay en probeer het vervolgens opnieuw.</string>
+    <string name="DeclineCode__your_card_has_expired">Je betaalkaart is verlopen. Werk eerst je betalingsinformatie bij in Google Pay en probeer het daarna opnieuw.</string>
     <!-- Stripe decline code go to google pay action label -->
     <string name="DeclineCode__go_to_google_pay">Google Pay openen</string>
     <!-- Stripe decline code try credit card again action label -->
     <string name="DeclineCode__try">Opnieuw proberen</string>
     <!-- Stripe decline code incorrect card number -->
-    <string name="DeclineCode__your_card_number_is_incorrect">Je betaalkaartnummer is niet juist. Werk eerst je betalingsinformatie bij in Google Pay en probeer het vervolgens opnieuw.</string>
+    <string name="DeclineCode__your_card_number_is_incorrect">Je betaalkaartnummer is niet juist. Werk eerst je betalingsinformatie bij in Google Pay en probeer het daarna opnieuw.</string>
     <!-- Stripe decline code incorrect cvc -->
-    <string name="DeclineCode__your_cards_cvc_number_is_incorrect">Je betaalkaart-verificatiecode is niet juist. Werk eerst je betalingsinformatie bij in Google Pay en probeer het vervolgens opnieuw.</string>
+    <string name="DeclineCode__your_cards_cvc_number_is_incorrect">Het CVC-nummer van je betaalkaart is onjuist. Werk eerst je betalingsinformatie bij in Google Pay en probeer het daarna opnieuw.</string>
     <!-- Stripe decline code insufficient funds -->
     <string name="DeclineCode__your_card_does_not_have_sufficient_funds">Er staat onvoldoende krediet op je betaalkaart om te doneren. Probeer het via een andere betalingsmethode opnieuw.</string>
     <!-- Stripe decline code incorrect expiration month -->
-    <string name="DeclineCode__the_expiration_month">De maand waarop je betalingsmethode verloopt is onjuist. Werk eerst je betalingsinformatie bij in Google Pay en probeer het vervolgens opnieuw.</string>
+    <string name="DeclineCode__the_expiration_month">De maand waarop je betalingsmethode verloopt is onjuist. Werk eerst je betalingsinformatie bij in Google Pay en probeer het daarna opnieuw.</string>
     <!-- Stripe decline code incorrect expiration year -->
-    <string name="DeclineCode__the_expiration_year">Het jaar waarop je betalingsmethode verloopt is onjuist. Werk eerst je betalingsinformatie bij in Google Pay en probeer het vervolgens opnieuw.</string>
+    <string name="DeclineCode__the_expiration_year">Het jaar waarop je betalingsmethode verloopt is onjuist. Werk eerst je betalingsinformatie bij in Google Pay en probeer het daarna opnieuw.</string>
     <!-- Stripe decline code issuer not available -->
     <string name="DeclineCode__try_completing_the_payment_again">Probeer opnieuw de betaling te voltooien of neem contact op met je bank voor meer informatie.</string>
     <!-- Stripe decline code processing error -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Openen van beltoonkiezer is mislukt.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Om meldingen in te schakelen, heeft Signal toestemming nodig om deze weer te geven.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Om meldingen in te schakelen, heeft Molly toestemming nodig om deze weer te geven.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Inschakelen</string>
 
@@ -5643,7 +5779,7 @@
     <!-- Displayed when viewing a post from another user with no replies -->
     <string name="StoryViewerPageFragment__reply">Reageren</string>
     <!-- Displayed when viewing a post that has failed to send to some users -->
-    <string name="StoryViewerPageFragment__partially_sent">Gedeeltelijk verstuurd. Tik voor meer informatie</string>
+    <string name="StoryViewerPageFragment__partially_sent">Gedeeltelijk verzonden. Tik voor details</string>
     <!-- Displayed when viewing a post that has failed to send -->
     <string name="StoryViewerPageFragment__send_failed">Verzenden is mislukt. Tik om opnieuw te proberen</string>
     <!-- Label for the reply button in story viewer, which will launch the group story replies bottom sheet. -->
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Nog geen reacties</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Je kunt niet reageren op dit verhaal, omdat je geen lid van deze groep meer bent.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Reageerde op dit verhaal</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Reageerde op dit verhaal</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Reageerde op dit verhaal</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Gezien door</string>
     <!-- Label for story replies tab -->
@@ -5796,7 +5934,7 @@
     <!-- First time share to story dialog: Positive action to go ahead and add to story -->
     <!-- First time share to story dialog: Neutral action to edit who can view "My Story" -->
     <!-- Error message shown when a failure occurs during story send -->
-    <string name="StoryDialogs__story_could_not_be_sent">Je verhaal kan niet worden geüpload. Ga na dat je apparaat met het internet is verbonden en probeer het opnieuw.</string>
+    <string name="StoryDialogs__story_could_not_be_sent">Je verhaal kan niet worden geüpload. Controleer je internetverbinding en probeer het opnieuw.</string>
     <!-- Error message dialog button to resend a previously failed story send -->
     <string name="StoryDialogs__send">Versturen</string>
     <!-- Action button for turning off stories when stories are present on the device -->
@@ -5841,7 +5979,7 @@
     <!-- Choose groups bottom sheet title -->
     <string name="ChooseGroupStoryBottomSheet__choose_groups">Groepen kiezen</string>
     <!-- Displayed when copying group story reply text to clipboard -->
-    <string name="StoryGroupReplyFragment__copied_to_clipboard">Gekopieerd naar het klembord</string>
+    <string name="StoryGroupReplyFragment__copied_to_clipboard">Gekopieerd naar klembord</string>
     <!-- Displayed in story caption when content is longer than 5 lines -->
     <string name="StoryViewerPageFragment__see_more">Bekijk meer</string>
     <!-- Displayed in toast after sending a direct reply -->
@@ -5869,7 +6007,7 @@
     <!-- Label for a button in a notification at the bottom of the chat list to turn off censorship circumvention -->
 
     <!-- Conversation Item label for when you react to someone else\'s story -->
-    <string name="ConversationItem__you_reacted_to_s_story">Je hebt op het verhaal van %1$s gereageerd</string>
+    <string name="ConversationItem__you_reacted_to_s_story">Je reageerde op het verhaal van %1$s</string>
     <!-- Conversation Item label for reactions to your story -->
     <string name="ConversationItem__reacted_to_your_story">Reageerde op je verhaal</string>
     <!-- Conversation Item label for reactions to an unavailable story -->
@@ -6002,9 +6140,9 @@
     <!-- Label indicating that a user can tap to advance to the next post in a story -->
     <string name="StoryFirstTimeNavigationView__tap_to_advance">Tik om door te gaan</string>
     <!-- Label indicating swipe direction to skip current story -->
-    <string name="StoryFirstTimeNavigationView__swipe_up_to_skip">Swipe omhoog om over te slaan</string>
+    <string name="StoryFirstTimeNavigationView__swipe_up_to_skip">Veeg omhoog om over te slaan</string>
     <!-- Label indicating swipe direction to exit story viewer -->
-    <string name="StoryFirstTimeNavigationView__swipe_right_to_exit">Swipe naar rechts om terug te gaan</string>
+    <string name="StoryFirstTimeNavigationView__swipe_right_to_exit">Veeg naar rechts om terug te gaan</string>
     <!-- Button label to confirm understanding of story navigation -->
     <string name="StoryFirstTimeNagivationView__got_it">Begrepen</string>
     <!-- Content description for vertical context menu button in safety number sheet rows -->
@@ -6016,7 +6154,7 @@
     <!-- Title of safety number changes bottom sheet when showing individual records -->
     <string name="SafetyNumberBottomSheetFragment__safety_number_changes">Veranderingen in veiligheidsnummer</string>
     <!-- Message of safety number changes bottom sheet when showing individual records -->
-    <string name="SafetyNumberBottomSheetFragment__the_following_people">De volgende mensen kunnen Signal opnieuw geïnstalleerd hebben of van toestel veranderd zijn. Tik op een ontvanger om het nieuwe veiligheidsnummer te bevestigen. Dit is optioneel.</string>
+    <string name="SafetyNumberBottomSheetFragment__the_following_people">De volgende personen hebben Signal mogelijk opnieuw geïnstalleerd of kunnen van toestel zijn veranderd. Tik op een ontvanger om het nieuwe veiligheidsnummer te bevestigen. Dit is optioneel.</string>
     <!-- Title of safety number changes bottom sheet when not showing individual records -->
     <string name="SafetyNumberBottomSheetFragment__safety_number_checkup">Veiligheidsnummer checken</string>
     <!-- Title of safety number changes bottom sheet when not showing individual records and user has seen review screen -->
@@ -6025,8 +6163,8 @@
     <string name="SafetyNumberBottomSheetFragment__all_connections_have_been_reviewed">Alle contacten zijn beoordeeld, tik op versturen om verder te gaan.</string>
     <!-- Message of safety number changes bottom sheet when not showing individual records -->
     <plurals name="SafetyNumberBottomSheetFragment__you_have_d_connections_plural">
-        <item quantity="one">%1$d contact heeft mogelijk Signal opnieuw geïnstalleerd of is van toestel veranderd. Je kunt het veiligheidsnummer bekijken of doorgaan met verzenden.</item>
-        <item quantity="other">%1$d contacten hebben mogelijk Signal opnieuw geïnstalleerd of zijn van toestel veranderd. Je kunt hun veiligheidsnummer bekijken of doorgaan met verzenden.</item>
+        <item quantity="one">%1$d contact heeft Signal mogelijk opnieuw geïnstalleerd of kan van toestel zijn veranderd. Je kunt het veiligheidsnummer verifiëren of doorgaan met verzenden.</item>
+        <item quantity="other">%1$d contacten hebben Signal mogelijk opnieuw geïnstalleerd of kunnen van toestel zijn veranderd. Je kunt hun veiligheidsnummer verifiëren of doorgaan met verzenden.</item>
     </plurals>
     <!-- Menu action to launch safety number verification screen -->
     <string name="SafetyNumberBottomSheetFragment__verify_safety_number">Veiligheidsnummer verifiëren</string>
@@ -6044,11 +6182,11 @@
     <string name="SafetyNumberReviewConnectionsFragment__safety_number_changes">Veranderingen in veiligheidsnummer</string>
     <!-- Message of safety number review fragment -->
     <plurals name="SafetyNumberReviewConnectionsFragment__d_recipients_may_have">
-        <item quantity="one">%1$dontvanger kan Signal opnieuw geïnstalleerd hebben of van toestel veranderd zijn. Tik op een ontvanger om het nieuwe veiligheidsnummer te bevestigen. Dit is optioneel.</item>
-        <item quantity="other">%1$d ontvangers kunnen Signal opnieuw geïnstalleerd hebben of van toestel veranderd zijn. Tik op een ontvanger om het nieuwe veiligheidsnummer te bevestigen. Dit is optioneel.</item>
+        <item quantity="one">%1$d ontvanger heeft Signal mogelijk opnieuw geïnstalleerd of kan van toestel zijn veranderd. Tik op een ontvanger om het nieuwe veiligheidsnummer te bevestigen. Dit is optioneel.</item>
+        <item quantity="other">%1$d ontvangers hebben Signal mogelijk opnieuw geïnstalleerd of kunnen van toestel zijn veranderd. Tik op een ontvanger om het nieuwe veiligheidsnummer te bevestigen. Dit is optioneel.</item>
     </plurals>
     <!-- Section header for 1:1 contacts in review fragment -->
-    <string name="SafetyNumberBucketRowItem__contacts">Contactpersonen</string>
+    <string name="SafetyNumberBucketRowItem__contacts">Contacten</string>
     <!-- Context menu label for distribution list headers in review fragment -->
     <string name="SafetyNumberReviewConnectionsFragment__remove_all">Alle verwijderen</string>
     <!-- Context menu label for 1:1 contacts to remove from send -->
@@ -6108,7 +6246,7 @@
     <!-- Section header for who can view a group story -->
     <string name="GroupStorySettingsFragment__who_can_view_this_story">Wie kan dit verhaal bekijken</string>
     <!-- Explanation of who can view a group story -->
-    <string name="GroupStorySettingsFragment__members_of_the_group_s">"Leden van de groep ‘%1$s’ kunnen dit verhaal bekijken en erop antwoorden. Je kunt het lidmaatschap voor deze chat updaten in de groep."</string>
+    <string name="GroupStorySettingsFragment__members_of_the_group_s">"Leden van de groep ‘%1$s’ kunnen dit verhaal bekijken en erop antwoorden. Je kunt het lidmaatschap van deze groep wijzigen via de groepsinstellingen."</string>
     <!-- Preference label for removing this group story -->
     <string name="GroupStorySettingsFragment__remove_group_story">Groepsverhaal verwijderen</string>
 
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Kies je bank</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Bevestig je donatie via %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Om je maandelijkse donatie in te stellen, tik op doorgaan om dit met een afschrijving van € 0,01 bij je bank te bevestigen. Dit bedrag wordt automatisch teruggestort en maakt het mogelijk om je donatie van € 5/maand van je rekening af te schrijven.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Om je maandelijkse donatie in te stellen, tik op Doorgaan om dit met een afschrijving van € 0,01 bij je bank te bevestigen. Dit bedrag wordt automatisch teruggestort en maakt het mogelijk om je donatie van %1$s/maand van je rekening af te schrijven.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Doorgaan</string>
 
@@ -6485,8 +6623,8 @@
     <string name="CallLogFragment__deletion_failed">Verwijderen mislukt.</string>
     <!-- Displayed as message in error dialog when can\'t delete links -->
     <plurals name="CallLogFragment__cant_delete_call_link">
-        <item quantity="one">Link kan niet verwijderd worden. Controleer je verbinding en probeer het opnieuw.</item>
-        <item quantity="other">Niet alle oproeplinks konden verwijderd worden. Controleer je verbinding en probeer het opnieuw.</item>
+        <item quantity="one">Link kan niet verwijderd worden. Controleer je internetverbinding en probeer het opnieuw.</item>
+        <item quantity="other">Niet alle oproeplinks konden verwijderd worden. Controleer je internetverbinding en probeer het opnieuw.</item>
     </plurals>
     <!-- Snackbar text after clearing the call history -->
     <string name="CallLogFragment__cleared_call_history">Oproepgeschiedenis gewist</string>
@@ -6524,7 +6662,7 @@
     <!-- Shown during empty state -->
     <string name="CallLogFragment__no_calls">Geen oproepen.</string>
     <!-- Shown during empty state -->
-    <string name="CallLogFragment__get_started_by_calling_a_friend">Ga aan de slag door een contact te bellen.</string>
+    <string name="CallLogFragment__get_started_by_calling_a_friend">Begin door een contact te bellen.</string>
     <!-- Displayed as a message in a dialog when deleting multiple items -->
     <string name="CallLogFragment__call_links_youve_created">Oproeplinks die je hebt gemaakt, zullen niet langer werken voor personen die ze al hebben ontvangen.</string>
 
@@ -6657,7 +6795,7 @@
     <!-- Displayed in a text row, allowing the user to delete the call link -->
     <string name="CallLinkDetailsFragment__delete_call_link">Oproeplink verwijderen</string>
     <!-- Displayed whenever a name change, revocation, etc, fails. -->
-    <string name="CallLinkDetailsFragment__couldnt_save_changes">Kan wijzigingen niet opslaan. Check je netwerkverbinding en probeer het opnieuw.</string>
+    <string name="CallLinkDetailsFragment__couldnt_save_changes">Kan wijzigingen niet opslaan. Controleer je internetverbinding en probeer het opnieuw.</string>
     <!-- Displayed as title in dialog when user attempts to delete the link -->
     <string name="CallLinkDetailsFragment__delete_link">Link verwijderen?</string>
     <!-- Displayed as body in dialog when user attempts to delete the link -->
@@ -6732,8 +6870,8 @@
     <string name="PendingParticipantsView__would_like_to_join">Wil graag meedoen…</string>
     <!-- Displayed in a button on the popup card denoting that there are other pending requests to join a call link -->
     <plurals name="PendingParticipantsView__plus_d_requests">
-        <item quantity="one">+%1$d verzoek</item>
-        <item quantity="other">+%1$d verzoeken</item>
+        <item quantity="one">+ %1$d verzoek</item>
+        <item quantity="other">+ %1$d verzoeken</item>
     </plurals>
 
     <!-- PendingParticipantsBottomSheet -->
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Back-upgegevens aan het downloaden…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Mediaback-ups zijn uitgeschakeld</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Je mediaback-upabonnement in Signal is geannuleerd omdat we je betaling niet konden verwerken. Je hebt %1$d dag de tijd om alle media te downloaden die in je back-up zijn opgeslagen. Na %1$d dag worden de media in je back-up verwijderd.</item>
+        <item quantity="other">Je mediaback-upabonnement in Signal is geannuleerd omdat we je betaling niet konden verwerken. Je hebt %1$d dagen de tijd om alle media te downloaden die in je back-up zijn opgeslagen. Na %1$d dagen worden de media in je back-up verwijderd.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Je kunt op elk gewenst moment opnieuw betalen zodat back-ups van al je media worden gemaakt. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Je media worden vandaag verwijderd</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Je mediaback-upabonnement in Signal is geannuleerd omdat we je betaling niet konden verwerken. Dit is de laatste mogelijkheid om de media in je back-up te downloaden voordat deze worden verwijderd.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Kan download niet voltooien</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Je apparaat heeft niet genoeg vrije ruimte. Maak %1$s ruimte vrij om de media te downloaden die in je back-up zijn opgeslagen.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Als je ‘Overslaan’ kiest, worden de media in je back-up over %1$d dag verwijderd.</item>
+        <item quantity="other">Als je ‘Overslaan’ kiest, worden de media in je back-up over %1$d dagen verwijderd.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Kan betaling voor back-up niet verwerken</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Het lukt Signal niet om je maandelijkse betaling voor back-ups af te schrijven. Zorg ervoor dat je betalingsinformatie up-to-date is. Werk je betalingsinformatie bij in Google Pay als dat nodig is. Signal zal je betaling binnen een paar dagen opnieuw proberen te verwerken.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Back-up kon niet worden voltooid</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Je apparaat heeft in de afgelopen %1$d dagen geen back-up voltooid. Zorg ervoor dat je apparaat is verbonden met wifi en tik op ‘Nu back-up maken’. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Meer lezen</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Overslaan</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Nu media downloaden</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Later downloaden</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Media niet downloaden</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Maak %1$s ruimte vrij om je media te kunnen downloaden.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Creditcard of betaalkaart</string>
@@ -6874,16 +7058,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Onbekend</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Betalingsgeschiedenis</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">De laatste back-up is gemaakt op %1$s om %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
     <string name="ManageStorageSettingsFragment_chat_limit">Chatlimieten</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
-    <string name="ManageStorageSettingsFragment_delete_message_history">Berichtengeschiedenis wissen</string>
+    <string name="ManageStorageSettingsFragment_delete_message_history">Chatgeschiedenis wissen</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Berichten die ouder zijn dan de geselecteerde bewaartermijn worden permanent verwijderd.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Berichten die het geselecteerde maximale aantal berichten per chat overschrijden, worden permanent verwijderd.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Limieten toepassen op gekoppelde apparaten</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Verwijder met chatlimieten ook berichten op je gekoppelde apparaten</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Verwijderen wordt vanaf nu gesynchroniseerd op al je apparaten</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Wanneer je berichten of chats verwijdert, worden deze verwijderd van je telefoon en al je gekoppelde apparaten.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">Begrepen</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Betalingsgeschiedenis</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Back-up van tekst en alle media</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Betalingsdetails</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Back-uptype</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Datum van betaling</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Delen</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal back-ups</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Betalingsgeschiedenis</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Back-upgegevens</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Back-upgrootte</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Back-upfrequentie</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Back-up maken via mobiel netwerk</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Back-ups uitschakelen en verwijderen</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Back-up verwijderd en uitgeschakeld.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Back-uptype gewijzigd en abonnement geannuleerd</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Abonnement geannuleerd</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Download voltooid</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Back-uptype</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Back-ups uitgeschakeld</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/maand</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Back-ups inschakelen</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Laatste back-up</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s om %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Nooit</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Nu back-up maken</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Back-ups uitschakelen en verwijderen?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Er worden niet opnieuw kosten in rekening gebracht. Je back-up wordt verwijderd en er worden geen nieuwe back-ups gemaakt.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Uitschakelen en verwijderen</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Back-up aan het verwijderen…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Back-up verwijderd</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Door op ‘Nu back-up maken’ te tikken"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Dagelijks</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Wekelijks</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Maandelijks</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Handmatig back-ups maken</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Voer de pincode, het wachtwoord of het patroon van je apparaat in.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Volgende</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Back-uptype wijzigen</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Maandelijkse donatie stopzetten</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Annulering bevestigen</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Er worden geen kosten meer in rekening gebracht. Back-ups worden uitgeschakeld aan het einde van de facturatieronde. Na die datum heb je 30 dagen de tijd om de media te downloaden waarvan je momenteel een back-up maakt.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Nu bevestigen en downloaden</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Later bevestigen en downloaden</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Abonnement behouden</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index 899f0351a6..367d16c85a 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal ਅੱਪਡੇਟ ਹੋ ਰਿਹਾ ਹੈ…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly ਅੱਪਡੇਟ ਹੋ ਰਿਹਾ ਹੈ…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">ਤੁਸੀਂ ਅਜੇ ਆਪਣਾ ਵਾਕ ਨਹੀਂ ਸੈੱਟ ਕੀਤਾ ਹੈ!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">ਵਾਕ ਨੂੰ ਅਸਮਰੱਥ ਕਰਨਾ ਹੈ?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">ਇਹ ਹਮੇਸ਼ਾ ਲਈ Signal ਅਤੇ ਸੁਨੇਹਾ ਨੋਟੀਫਿਕੇਸ਼ਨ ਨੂੰ ਅਣ-ਲਾਕ ਕਰ ਦੇਵੇਗਾ।</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">ਇਹ ਹਮੇਸ਼ਾ ਲਈ Molly ਅਤੇ ਸੁਨੇਹਾ ਨੋਟੀਫਿਕੇਸ਼ਨ ਨੂੰ ਅਣ-ਲਾਕ ਕਰ ਦੇਵੇਗਾ।</string>
     <string name="ApplicationPreferencesActivity_disable">ਅਸਮਰੱਥ ਕਰੋ</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਵਿਚ ਗਲਤੀ!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">ਰਜਿਸਟਰੇਸ਼ਨ ਲਾਕ ਲਈ PIN ਜ਼ਰੂਰੀ ਹਨ। PIN ਅਸਮਰੱਥ ਕਰਨ ਲਈ ਪਹਿਲਾਂ ਰਜਿਸਟਰੇਸ਼ਨ ਲਾਕ ਨੂੰ ਅਸਮਰੱਥ ਕਰੋ।</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">ਫ਼ਾਈਲ</string>
     <string name="AttachmentKeyboard_contact">ਸੰਪਰਕ</string>
     <string name="AttachmentKeyboard_location">ਟਿਕਾਣਾ</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">ਤੁਹਾਡੀਆਂ ਫ਼ੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਦਿਖਾਉਣ ਲਈ Signal ਨੂੰ ਇਜਾਜ਼ਤ ਚਾਹੀਦੀ ਹੈ</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">ਤੁਹਾਡੀਆਂ ਫ਼ੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਦਿਖਾਉਣ ਲਈ Molly ਨੂੰ ਇਜਾਜ਼ਤ ਚਾਹੀਦੀ ਹੈ</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ</string>
     <string name="AttachmentKeyboard_payment">ਭੁਗਤਾਨ</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">ਮੀਡੀਆ ਨੂੰ ਚੁਣਨ ਲਈ ਕੋਈ ਐਪ ਨਹੀਂ ਲੱਭੀ।</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal ਨੂੰ ਫ਼ੋਟੋਆਂ, ਵੀਡੀਓ ਜਾਂ ਆਡੀਓ ਜੋੜਨ ਲਈ ਸਟੋਰੇਜ ਦੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਸਨੂੰ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ਮੇਨੂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ ਅਤੇ \"ਸਟੋਰੇਜ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal ਨੂੰ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਜੋੜਨ ਲਈ ਸੰਪਰਕਾਂ ਲਈ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਸਨੂੰ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ਮੇਨੂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ ਅਤੇ \"ਸੰਪਰਕ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal ਨੂੰ ਕੋਈ ਟਿਕਾਣਾ ਜੋੜਨ ਲਈ ਟਿਕਾਣੇ ਲਈ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਸਨੂੰ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ਮੇਨੂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ ਅਤੇ \"ਟਿਕਾਣਾ\" ਸਮਰੱਥ ਕਰੋ।</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly ਨੂੰ ਫ਼ੋਟੋਆਂ, ਵੀਡੀਓ ਜਾਂ ਆਡੀਓ ਜੋੜਨ ਲਈ ਸਟੋਰੇਜ ਦੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਸਨੂੰ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ਮੇਨੂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ ਅਤੇ \"ਸਟੋਰੇਜ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly ਨੂੰ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਜੋੜਨ ਲਈ ਸੰਪਰਕਾਂ ਲਈ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਸਨੂੰ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ਮੇਨੂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ ਅਤੇ \"ਸੰਪਰਕ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly ਨੂੰ ਕੋਈ ਟਿਕਾਣਾ ਜੋੜਨ ਲਈ ਟਿਕਾਣੇ ਲਈ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਸਨੂੰ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ਮੇਨੂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ ਅਤੇ \"ਟਿਕਾਣਾ\" ਸਮਰੱਥ ਕਰੋ।</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">ਆਪਣੇ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">ਆਪਣਾ ਟਿਕਾਣਾ ਭੇਜਣ ਲਈ:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">ਆਪਣਾ ਟਿਕਾਣਾ ਭੇਜਣ ਲਈ Signal ਨੂੰ ਉਸ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ।</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">ਆਪਣਾ ਟਿਕਾਣਾ ਭੇਜਣ ਲਈ Molly ਨੂੰ ਉਸ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ।</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਬਾਰੇ ਜਾਣਕਾਰੀੰ ਭੇਜਣ ਲਈ Signal ਨੂੰਤੁਹਾਡੇ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਚਾਹੀਦੀ ਹੈ।</string>
+    <string name="AttachmentManager_signal_needs_location_access">ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਬਾਰੇ ਜਾਣਕਾਰੀੰ ਭੇਜਣ ਲਈ Molly ਨੂੰਤੁਹਾਡੇ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਚਾਹੀਦੀ ਹੈ।</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">ਸਟੋਰੇਜ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">ਫ਼ੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਦਿਖਾਉਣ ਲਈ:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">ਤੁਹਾਡੀਆਂ ਫ਼ੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਦਿਖਾਉਣ ਲਈ Signal ਨੂੰ ਸਟੋਰੇਜ ਤੱਕ ਪਹੁੰਚ ਚਾਹੀਦੀ ਹੈ।</string>
+    <string name="AttachmentManager_signal_needs_storage_access">ਤੁਹਾਡੀਆਂ ਫ਼ੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਦਿਖਾਉਣ ਲਈ Molly ਨੂੰ ਸਟੋਰੇਜ ਤੱਕ ਪਹੁੰਚ ਚਾਹੀਦੀ ਹੈ।</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s ਨੇ ਭੁਗਤਾਨ ਫੀਚਰ ਨੂੰ ਐਕਟੀਵੇਟ ਨਹੀਂ ਕੀਤਾ ਹੈ </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">ਕੈਮਰਾ ਬਦਲੋ</string>
     <string name="CameraXFragment_open_gallery_description">ਗੈਲਰੀ ਖੋਲ੍ਹੋ</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">ਆਪਣੇ ਕੈਮਰੇ ਅਤੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">ਆਪਣੇ ਕੈਮਰੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">ਆਪਣੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">ਫ਼ੋਟੋਆਂ ਖਿੱਚਣ ਲਈ, Signal ਨੂੰ ਕੈਮਰੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ।</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">ਫ਼ੋਟੋਆਂ ਖਿੱਚਣ ਅਤੇ ਵੀਡੀਓ ਬਣਾਉਣ ਲਈ, Signal ਨੂੰ ਕੈਮਰੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ।</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">ਫ਼ੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਲੈਣ ਲਈ, Signal ਨੂੰ ਕੈਮਰੇ ਅਤੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ।</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">ਆਵਾਜ਼ ਦੇ ਨਾਲ ਵੀਡੀਓ ਬਣਾਉਣ ਲਈ, Signal ਨੂੰ ਆਪਣੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ।</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">QR ਕੋਡ ਸਕੈਨ ਕਰਨ ਲਈ, Signal ਨੂੰ ਕੈਮਰੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ।</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal ਨੂੰ ਫ਼ੋਟੋਆਂ ਖਿੱਚਣ ਲਈ ਕੈਮਰੇ ਤੱਕ ਪਹੁੰਚ ਚਾਹੀਦੀ ਹੈ।</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">QR ਕੋਡ ਸਕੈਨ ਕਰਨ ਲਈ Signal ਨੂੰ ਕੈਮਰੇ ਤੱਕ ਪਹੁੰਚ ਚਾਹੀਦੀ ਹੈ</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">ਵੀਡੀਓ ਬਣਾਉਣ ਲਈ Signal ਨੂੰ ਆਪਣੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਚਾਹੀਦੀ ਹੈ</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Signal ਵਿੱਚ ਫੋਟੋਆਂ ਖਿੱਚਣ ਲਈ:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Signal ਵਿੱਚ ਫ਼ੋਟੋਆਂ ਖਿੱਚਣ ਅਤੇ ਵੀਡੀਓ ਬਣਾਉਣ ਲਈ:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">ਆਵਾਜ਼ ਦੇ ਨਾਲ ਵੀਡੀਓ ਬਣਾਉਣ ਲਈ:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR ਕੋਡ ਸਕੈਨ ਕਰਨ ਲਈ:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">ਤਾਜ਼ਾ ਸੰਪਰਕ</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">ਕੋਈ Signal ਸੰਪਰਕ ਨਹੀਂ</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">ਤੁਸੀਂ ਸਿਰਫ਼ Signal ਸੰਪਰਕਾਂ ਨੂੰ ਫੋਟੋਆਂ ਭੇਜਣ ਲਈ ਕੈਮਰਾ ਬਟਨ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ। </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">ਨਹੀਂ ਲੱਭ ਰਿਹਾ ਕਿ ਤੁਸੀਂ ਕਿਸ ਦੀ ਭਾਲ ਕਰ ਰਹੇ ਹੋ?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">ਸੰਪਰਕ ਨੂੰ Signal ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਲਈ ਸੱਦਾ ਦਿਓ</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">ਸੰਪਰਕ ਨੂੰ Molly ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਲਈ ਸੱਦਾ ਦਿਓ</string>
     <string name="CameraContacts__menu_search">ਖੋਜੋ</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">ਨਹੀਂ ਧੰਨਵਾਦ</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Signal ਨੂੰ ਅੱਪਡੇਟ ਕਰੋ</string>
+    <string name="ClientDeprecatedActivity_update_signal">Molly ਨੂੰ ਅੱਪਡੇਟ ਕਰੋ</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">ਐਪ ਦਾ ਇਹ ਸੰਸਕਰਣ ਹੁਣ ਕੰਮ ਨਹੀਂ ਕਰਦਾ ਹੈ। ਸੁਨੇਹੇ ਭੇਜਣੇ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰਨੇ ਜਾਰੀ ਰੱਖਣ ਲਈ ਐਪ ਨੂੰ ਨਵੀਨਤਮ ਸੰਸਕਰਣ ਲਈ ਅੱਪਡੇਟ ਕਰੋ।</string>
     <string name="ClientDeprecatedActivity_update">ਅੱਪਡੇਟ ਕਰੋ</string>
     <string name="ClientDeprecatedActivity_dont_update">ਅੱਪਡੇਟ ਨਾ ਕਰੋ</string>
     <string name="ClientDeprecatedActivity_warning">ਚੇਤਾਵਨੀ</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">ਤੁਹਾਡੇ Signal ਦੇ ਵਰਜ਼ਨ ਦੀ ਮਿਆਦ ਪੁੱਗ ਗਈ ਹੈ। ਤੁਸੀਂ ਆਪਣੇ ਪੁਰਾਣੇ ਸੁਨੇਹੇ ਦੇਖ ਸਕਦੇ ਹੋ ਪਰ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਆਪਣਾ ਵਰਜ਼ਨ ਅੱਪਡੇਟ ਨਹੀਂ ਕਰਦੇ ਉਦੋਂ ਤੱਕ ਤੁਸੀਂ ਨਾ ਹੀ ਸੁਨੇਹੇ ਭੇਜ ਸਕੋਗੇ ਅਤੇ ਨਾ ਹੀ ਪ੍ਰਾਪਤ ਕਰ ਸਕੋਗੇ।</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">ਤੁਹਾਡੇ Molly ਦੇ ਵਰਜ਼ਨ ਦੀ ਮਿਆਦ ਪੁੱਗ ਗਈ ਹੈ। ਤੁਸੀਂ ਆਪਣੇ ਪੁਰਾਣੇ ਸੁਨੇਹੇ ਦੇਖ ਸਕਦੇ ਹੋ ਪਰ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਆਪਣਾ ਵਰਜ਼ਨ ਅੱਪਡੇਟ ਨਹੀਂ ਕਰਦੇ ਉਦੋਂ ਤੱਕ ਤੁਸੀਂ ਨਾ ਹੀ ਸੁਨੇਹੇ ਭੇਜ ਸਕੋਗੇ ਅਤੇ ਨਾ ਹੀ ਪ੍ਰਾਪਤ ਕਰ ਸਕੋਗੇ।</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">ਕੋਈ ਵੈੱਬ ਬਰਾਊਜ਼ਰ ਨਹੀਂ ਲੱਭਿਆ।</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">ਸੁਨੇਹਾ %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly ਵੌਇਸ ਕਾਲ %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly ਵੀਡੀਓ ਕਾਲ %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal ਸੁਨੇਹਾ</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">ਸੁਨੇਹਾ ਭੇਜੋ</string>
-    <string name="ConversationActivity_lets_switch_to_signal">ਆਓ Signal %1$s ਨੂੰ ਅਪਣਾਈਏ</string>
+    <string name="ConversationActivity_lets_switch_to_signal">ਆਓ Molly %1$s ਨੂੰ ਅਪਣਾਈਏ</string>
     <string name="ConversationActivity_specify_recipient">ਕਿਰਪਾ ਕਰਕੇ ਕੋਈ ਸੰਪਰਕ ਚੁਣੋ</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">ਅਟੈਚਮੈਂਟ ਦਾ ਅਕਾਰ ਤੁਹਾਡੇ ਦੁਆਰਾ ਭੇਜੇ ਜਾ ਰਹੇ ਸੁਨੇਹੇ ਦੀ ਕਿਸਮ ਲਈ ਅਕਾਰ ਦੀ ਸੀਮਾ ਤੋਂ ਵੱਧ ਗਿਆ ਹੈ।</string>
     <string name="ConversationActivity_unable_to_record_audio">ਆਡੀਓ ਰਿਕਾਰਡ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">ਆਡੀਓ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">ਵੌਇਸ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ, Signal ਨੂੰ ਆਪਣੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ।</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">ਵੌਇਸ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ, Molly ਨੂੰ ਆਪਣੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ।</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">ਵੌਇਸ ਸੁਨੇਹੇ ਨੂੰ ਰਿਕਾਰਡ ਕਰਨ ਲਈ Signal ਨੂੰ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਚਾਹੀਦੀ ਹੈ।</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">ਆਡੀਓ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ Signal ਨੂੰ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਸਨੂੰ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ| ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ, ਅਤੇ \"ਮਾਈਕ੍ਰੋਫ਼ੋਨ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">ਵੌਇਸ ਸੁਨੇਹੇ ਨੂੰ ਰਿਕਾਰਡ ਕਰਨ ਲਈ Molly ਨੂੰ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਚਾਹੀਦੀ ਹੈ।</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">ਆਡੀਓ ਸੁਨੇਹੇ ਭੇਜਣ ਲਈ Molly ਨੂੰ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਸਨੂੰ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ| ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ, ਅਤੇ \"ਮਾਈਕ੍ਰੋਫ਼ੋਨ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s ਨੂੰ ਕਾਲ ਕਰਨ ਲਈ Signal ਨੂੰ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਅਤੇ ਕੈਮਰਾ ਇਜਾਜ਼ਤਾਂ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਹਨਾਂ ਲਈ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ | ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ, ਅਤੇ \"ਮਾਈਕ੍ਰੋਫ਼ੋਨ\" ਅਤੇ \"ਕੈਮਰਾ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">ਵੀਡੀਓ ਅਤੇ ਫ਼ੋਟੋਆਂ ਖਿੱਚਣ ਲਈ Signal ਨੂੰ ਕੈਮਰੇ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ।</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">ਵੀਡੀਓ ਅਤੇ ਫੋਟੋਆਂ ਖਿੱਚਣ ਲਈ Signal ਨੂੰ ਕੈਮਰੇ ਦੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਸ ਨੂੰ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ, ਅਤੇ \"ਕੈਮਰਾ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal ਨੂੰ ਫ਼ੋਟੋਆਂ ਜਾਂ ਵੀਡੀਓ ਲੈਣ ਲਈ ਕੈਮਰਾ ਇਜਾਜ਼ਤਾਂ ਦੀ ਲੋੜ ਹੈ</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s ਨੂੰ ਕਾਲ ਕਰਨ ਲਈ Molly ਨੂੰ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਅਤੇ ਕੈਮਰਾ ਇਜਾਜ਼ਤਾਂ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਹਨਾਂ ਲਈ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ | ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ, ਅਤੇ \"ਮਾਈਕ੍ਰੋਫ਼ੋਨ\" ਅਤੇ \"ਕੈਮਰਾ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">ਵੀਡੀਓ ਅਤੇ ਫ਼ੋਟੋਆਂ ਖਿੱਚਣ ਲਈ Molly ਨੂੰ ਕੈਮਰੇ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ।</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">ਵੀਡੀਓ ਅਤੇ ਫੋਟੋਆਂ ਖਿੱਚਣ ਲਈ Molly ਨੂੰ ਕੈਮਰੇ ਦੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਸ ਨੂੰ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ, ਅਤੇ \"ਕੈਮਰਾ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly ਨੂੰ ਫ਼ੋਟੋਆਂ ਜਾਂ ਵੀਡੀਓ ਲੈਣ ਲਈ ਕੈਮਰਾ ਇਜਾਜ਼ਤਾਂ ਦੀ ਲੋੜ ਹੈ</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">ਆਵਾਜ਼ ਦੇ ਨਾਲ ਵੀਡੀਓ ਬਣਾਉਣ ਲਈ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਇਜਾਜ਼ਤ ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">ਵੀਡੀਓ ਨੂੰ ਰਿਕਾਰਡ ਕਰਨ ਲਈ Signal ਨੂੰ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਇਜਾਜ਼ਤਾਂ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਹਨਾਂ ਲਈ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ, ਅਤੇ \"ਮਾਈਕ੍ਰੋਫ਼ੋਨ\" ਅਤੇ \"ਕੈਮਰਾ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">ਵੀਡੀਓ ਰਿਕਾਰਡ ਕਰਨ ਲਈ Signal ਨੂੰ ਮਾਈਕ੍ਰੋਫੋਨ ਇਜਾਜ਼ਤਾਂ ਚਾਹੀਦੀਆਂ ਹਨ।</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">ਵੀਡੀਓ ਨੂੰ ਰਿਕਾਰਡ ਕਰਨ ਲਈ Molly ਨੂੰ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਇਜਾਜ਼ਤਾਂ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਹਨਾਂ ਲਈ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ, ਅਤੇ \"ਮਾਈਕ੍ਰੋਫ਼ੋਨ\" ਅਤੇ \"ਕੈਮਰਾ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">ਵੀਡੀਓ ਰਿਕਾਰਡ ਕਰਨ ਲਈ Molly ਨੂੰ ਮਾਈਕ੍ਰੋਫੋਨ ਇਜਾਜ਼ਤਾਂ ਚਾਹੀਦੀਆਂ ਹਨ।</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">ਨਹੀਂ</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">ਕਾਲ ਸ਼ੁਰੂ ਕਰਨ ਲਈ:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">ਕਾਲ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, Signal ਨੂੰ ਆਪਣੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ।</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">ਕਾਲ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, Molly ਨੂੰ ਆਪਣੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ।</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">ਕਾਲ ਕਰਨ ਲਈ, Signal ਨੂੰ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਚਾਹੀਦੀ ਹੈ।</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">ਕਾਲ ਕਰਨ ਲਈ, Molly ਨੂੰ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਚਾਹੀਦੀ ਹੈ।</string>
 
 
     <string name="ConversationActivity_join">ਸ਼ਾਮਲ ਹੋਵੋ</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">ਹੁਣ Signal ਰਾਹੀਂ SMS ਸੁਨੇਹੇ ਭੇਜਣਾ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ। ਗੱਲਬਾਤ ਨੂੰ ਇੱਥੇ ਜਾਰੀ ਰੱਖਣ ਲਈ %1$s ਨੂੰ Signal \'ਤੇ ਆਉਣ ਦਾ ਸੱਦਾ ਦਿਓ।</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">ਇਹ ਵਿਅਕਤੀ ਹੁਣ Signal ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਰਿਹਾ ਹੈ। ਗੱਲਬਾਤ ਨੂੰ ਇੱਥੇ ਜਾਰੀ ਰੱਖਣ ਲਈ ਉਹਨਾਂ ਨੂੰ Signal \'ਤੇ ਆਉਣ ਦਾ ਸੱਦਾ ਦਿਓ।</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">ਇਹ ਵਿਅਕਤੀ ਹੁਣ Molly ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਰਿਹਾ ਹੈ। ਗੱਲਬਾਤ ਨੂੰ ਇੱਥੇ ਜਾਰੀ ਰੱਖਣ ਲਈ ਉਹਨਾਂ ਨੂੰ Molly \'ਤੇ ਆਉਣ ਦਾ ਸੱਦਾ ਦਿਓ।</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Signal ਲਈ ਸੱਦਾ ਦਿਓ</string>
+    <string name="ConversationActivity__invite_to_signal">Molly ਲਈ ਸੱਦਾ ਦਿਓ</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">ਤੁਹਾਨੂੰ ਜਲਦੀ ਹੀ ਦੁਬਾਰਾ ਯਾਦ ਕਰਵਾਇਆ ਜਾਵੇਗਾ।</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">ਹਰੇਕ ਲਈ ਮਿਟਾਓ</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">ਇਸ ਡਿਵਾਈਸ ਤੋਂ ਮਿਟਾਓ</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">ਮਿਟਾਓ</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">ਹਰ ਡਿਵਾਈਸ ਤੋਂ ਮਿਟਾਓ</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">ਇਹ ਸੁਨੇਹਾ ਚੈਟ ਵਿੱਚ ਸ਼ਾਮਲ ਸਾਰੇ ਵਿਅਕਤੀਆਂ ਲਈ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ ਜੇ ਉਹ Signal ਦੇ ਨਵੇਂ ਵਰਜ਼ਨ ਦੀ ਵਰਤੋਂ ਕਰ ਰਹੇ ਹਨ। ਉਹ ਇਹ ਦੇਖ ਸਕਣਗੇ ਕਿ ਤੁਸੀਂ ਸੁਨੇਹਾ ਮਿਟਾ ਦਿੱਤਾ ਹੈ।</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">ਪਾਬੰਦੀ ਲਗਾਈ ਗਈ</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Signal ਨੂੰ ਅੱਪਡੇਟ ਕਰੋ</string>
+    <string name="ConversationFragment__update_build">Molly ਨੂੰ ਅੱਪਡੇਟ ਕਰੋ</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Signal ਨੂੰ ਮੁੜ-ਰਜਿਸਟਰ ਕਰੋ</string>
+    <string name="ConversationFragment__reregister_signal">Molly ਨੂੰ ਮੁੜ-ਰਜਿਸਟਰ ਕਰੋ</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">ਪਿੱਛੇ ਜਾਓ।</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signal ਖੋਲ੍ਹੋ</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Molly ਖੋਲ੍ਹੋ</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">ਹੁਣ ਤਸਦੀਕਸ਼ੁਦਾ ਨਹੀਂ ਹੈ</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">ਅਜਿਹਾ ਕਰਨ \'ਤੇ ਚੁਣੀ ਹੋਈ ਚੈਟ ਨੂੰ ਸਥਾਈ ਤੌਰ \'ਤੇ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।</item>
         <item quantity="other">ਅਜਿਹਾ ਕਰਨ \'ਤੇ ਚੁਣੀਆਂ ਹੋਈਆਂ ਚੈਟਾਂ ਨੂੰ ਸਥਾਈ ਤੌਰ \'ਤੇ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">ਅਜਿਹਾ ਕਰਨ \'ਤੇ ਚੁਣੀ ਹੋਈ ਚੈਟ ਨੂੰ ਤੁਹਾਡੇ ਸਾਰੇ ਡਿਵਾਈਸਾਂ ਵਿੱਚੋਂ ਸਥਾਈ ਤੌਰ \'ਤੇ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।</item>
+        <item quantity="other">ਅਜਿਹਾ ਕਰਨ \'ਤੇ ਚੁਣੀਆਂ ਹੋਈਆਂ %1$d ਚੈਟਾਂ ਨੂੰ ਤੁਹਾਡੇ ਸਾਰੇ ਡਿਵਾਈਸਾਂ ਵਿੱਚੋਂ ਸਥਾਈ ਤੌਰ \'ਤੇ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">ਮਿਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">ਚੁਣੀ ਹੋਈ ਚੈਟ ਨੂੰ ਮਿਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">ਮੈਨੂੰ ਮੇਰੇ ਨੰਬਰ ਨਾਲ ਕੌਣ ਲੱਭ ਸਕਦਾ ਹੈ?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">ਜਿਸ ਵਿਅਕਤੀ ਕੋਲ ਤੁਹਾਡਾ ਫ਼ੋਨ ਨੰਬਰ ਹੈ, ਉਹ ਤੁਹਾਨੂੰ Signal ਉੱਤੇ ਦੇਖ ਸਕਦਾ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਨਾਲ ਚੈਟ ਸ਼ੁਰੂ ਕਰ ਸਕਦਾ ਹੈ।</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">ਜਿਸ ਵਿਅਕਤੀ ਕੋਲ ਤੁਹਾਡਾ ਫ਼ੋਨ ਨੰਬਰ ਹੈ, ਉਹ ਤੁਹਾਨੂੰ Molly ਉੱਤੇ ਦੇਖ ਸਕਦਾ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਨਾਲ ਚੈਟ ਸ਼ੁਰੂ ਕਰ ਸਕਦਾ ਹੈ।</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">ਕੋਈ ਵੀ ਇਹ ਨਹੀਂ ਦੇਖ ਸਕੇਗਾ ਕਿ ਤੁਸੀਂ Signal \'ਤੇ ਹੋ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਉਹਨਾਂ ਨੂੰ ਸੁਨੇਹਾ ਨਹੀਂ ਭੇਜਦੇ ਜਾਂ ਉਹਨਾਂ ਨਾਲ ਤੁਹਾਡੀ ਕੋਈ ਪੁਰਾਣੀ ਚੈਟ ਮੌਜੂਦਾ ਨਹੀਂ ਹੁੰਦੀ।</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">ਕੋਈ ਵੀ ਇਹ ਨਹੀਂ ਦੇਖ ਸਕੇਗਾ ਕਿ ਤੁਸੀਂ Molly \'ਤੇ ਹੋ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਉਹਨਾਂ ਨੂੰ ਸੁਨੇਹਾ ਨਹੀਂ ਭੇਜਦੇ ਜਾਂ ਉਹਨਾਂ ਨਾਲ ਤੁਹਾਡੀ ਕੋਈ ਪੁਰਾਣੀ ਚੈਟ ਮੌਜੂਦਾ ਨਹੀਂ ਹੁੰਦੀ।</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">ਬੈਕਅਪ ਤੋਂ ਬਹਾਲ ਕਰਨਾ ਹੈ?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">ਆਪਣੇ ਬੈਕਅੱਪ ਦੇ ਪਾਸਫ਼੍ਰੇਜ਼ ਨੂੰ ਜਾਂਚੋ ਅਤੇ ਤਸਦੀਕ ਕਰੋ ਕਿ ਇਹ ਮੇਲ ਖਾਂਦਾ ਹੈ</string>
     <string name="BackupsPreferenceFragment__turn_on">ਚਾਲੂ ਕਰੋ</string>
     <string name="BackupsPreferenceFragment__turn_off">ਬੰਦ ਕਰੋ</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"ਬੈਕਅੱਪ ਬਹਾਲ ਕਰਨ ਲਈ, Signal ਦੀ ਨਵੀਂ ਕਾਪੀ ਸਥਾਪਤ ਕਰੋ, ਐਪ ਨੂੰ ਖੋਲ੍ਹੋ ਅਤੇ \"ਬੈਕਅੱਪ ਬਹਾਲ ਕਰੋ\" ਨੂੰ ਟੈਪ ਕਰੋ, ਫਿਰ ਬੈਕਅੱਪ ਫ਼ਾਈਲ ਦਾ ਟਿਕਾਣਾ ਲੱਭੋ। %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"ਬੈਕਅੱਪ ਬਹਾਲ ਕਰਨ ਲਈ, Molly ਦੀ ਨਵੀਂ ਕਾਪੀ ਸਥਾਪਤ ਕਰੋ, ਐਪ ਨੂੰ ਖੋਲ੍ਹੋ ਅਤੇ \"ਬੈਕਅੱਪ ਬਹਾਲ ਕਰੋ\" ਨੂੰ ਟੈਪ ਕਰੋ, ਫਿਰ ਬੈਕਅੱਪ ਫ਼ਾਈਲ ਦਾ ਟਿਕਾਣਾ ਲੱਭੋ। %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">ਹੋਰ ਜਾਣੋ</string>
     <string name="BackupsPreferenceFragment__in_progress">ਜਾਰੀ ਹੈ…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d ਹੁਣ ਤੱਕ…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">ਹੁਣ ਤੱਕ %1$s %%…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">ਬੈਕਅੱਪ ਬਣਾਉਣ ਲਈ Signal ਨੂੰ ਬਾਹਰੀ ਸਟੋਰੇਜ ਦੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ, ਪਰ ਇਸਨੂੰ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ ਅਤੇ \"ਸਟੋਰੇਜ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">ਬੈਕਅੱਪ ਬਣਾਉਣ ਲਈ Molly ਨੂੰ ਬਾਹਰੀ ਸਟੋਰੇਜ ਦੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ, ਪਰ ਇਸਨੂੰ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ ਅਤੇ \"ਸਟੋਰੇਜ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">ਬੈਕਅੱਪ ਲੈਣ ਦਾ ਸਮਾਂ ਸੈੱਟ ਕਰੋ</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">ਚੈਟ ਸੈਸ਼ਨ ਤਾਜ਼ਾ ਕੀਤਾ ਗਿਆ</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal ਸਿਰੇ-ਤੋਂ-ਸਿਰੇ ਤੱਕ ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਰਤਦਾ ਹੈ ਅਤੇ ਇਸ ਨੂੰ ਕਈ ਵਾਰ ਤੁਹਾਡੇ ਚੈਟ ਸ਼ੈਸ਼ਨ ਨੂੰ ਤਾਜ਼ਾ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ। ਇਹ ਤੁਹਾਡੀ ਚੈਟ ਦੀ ਸੁਰੱਖਿਆ ਨੂੰ ਪ੍ਰਭਾਵਿਤ ਨਹੀਂ ਕਰਦਾ ਹੈ, ਪਰ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਤੁਸੀਂ ਇਸ ਸੰਪਰਕ ਤੋਂ ਆਪਣਾ ਕੋਈ ਸੁਨੇਹਾ ਖੁੰਝਾਇਆ ਹੋਵੇ, ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨੂੰ ਇਹ ਮੁੜ ਭੇਜਣ ਲਈ ਕਹਿ ਸਕਦੇ ਹੋ।</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly ਸਿਰੇ-ਤੋਂ-ਸਿਰੇ ਤੱਕ ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਰਤਦਾ ਹੈ ਅਤੇ ਇਸ ਨੂੰ ਕਈ ਵਾਰ ਤੁਹਾਡੇ ਚੈਟ ਸ਼ੈਸ਼ਨ ਨੂੰ ਤਾਜ਼ਾ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ। ਇਹ ਤੁਹਾਡੀ ਚੈਟ ਦੀ ਸੁਰੱਖਿਆ ਨੂੰ ਪ੍ਰਭਾਵਿਤ ਨਹੀਂ ਕਰਦਾ ਹੈ, ਪਰ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਤੁਸੀਂ ਇਸ ਸੰਪਰਕ ਤੋਂ ਆਪਣਾ ਕੋਈ ਸੁਨੇਹਾ ਖੁੰਝਾਇਆ ਹੋਵੇ, ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨੂੰ ਇਹ ਮੁੜ ਭੇਜਣ ਲਈ ਕਹਿ ਸਕਦੇ ਹੋ।</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">ਡੈਸਕਟੌਪ ਜਾਂ iPad \'ਤੇ Signal ਦੀ ਵਰਤੋਂ ਕਰੋ। ਤੁਹਾਡੇ ਸੁਨੇਹੇ ਤੁਹਾਡੇ ਲਿੰਕ ਕੀਤੇ ਡਿਵਾਈਸਾਂ ਨਾਲ ਸਿੰਕ ਹੋ ਜਾਣਗੇ।</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">ਨਵਾਂ ਡਿਵਾਈਸ ਲਿੰਕ ਕਰੋ</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s ਸੁਨੇਹੇ ਅਤੇ ਚੈਟ ਦੀ ਜਾਣਕਾਰੀ ਸਾਰੇ ਡਿਵਾਈਸਾਂ ਉੱਤੇ ਸਿਰੇ-ਤੋਂ-ਸਿਰੇ ਤੱਕ ਇਨਕ੍ਰਿਪਸ਼ਨ ਨਾਲ ਸੁਰੱਖਿਅਤ ਹੁੰਦੀ ਹੈ</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">ਡੈਸਕਟੌਪ ਜਾਂ iPad ਲਈ Signal</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">ਲਿੰਕ ਕੀਤੇ ਡਿਵਾਈਸਾਂ \'ਤੇ ਸਾਰੇ ਸੁਨੇਹੇ ਪ੍ਰਾਈਵੇਟ ਹੁੰਦੇ ਹਨ</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Molly ਸੁਨੇਹੇ ਤੁਹਾਡੇ ਮੋਬਾਈਲ ਫ਼ੋਨ ਦੇ ਲਿੰਕ ਹੋਣ ਤੋਂ ਬਾਅਦ Molly ਨਾਲ ਸਿੰਕ ਕੀਤੇ ਜਾਂਦੇ ਹਨ। ਤੁਹਾਡੇ ਪੁਰਾਣੇ ਸੁਨੇਹੇ ਦਿਖਾਈ ਨਹੀਂ ਦੇਣਗੇ।</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">ਆਪਣੇ ਦੂਜੇ ਡਿਵਾਈਸ \'ਤੇ, Molly ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ %1$s \'ਤੇ ਜਾਓ</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">ਮੇਰੇ ਲਿੰਕ ਕੀਤੇ ਡਿਵਾਈਸ</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">ਅਨਲਿੰਕ ਕਰੋ</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s ਨੂੰ ਅਨਲਿੰਕ ਕੀਤਾ ਗਿਆ</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">ਡਿਵਾਈਸ ਨੂੰ ਲਿੰਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">ਡਿਵਾਈਸ ਨੂੰ ਮਨਜ਼ੂਰ ਕੀਤਾ ਗਿਆ</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">ਕੋਈ ਲਿੰਕ ਕੀਤੇ ਡਿਵਾਈਸ ਮੌਜੂਦ ਨਹੀਂ ਹਨ</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">ਡਿਵਾਈਸ ਨਾਲ ਲਿੰਕ ਕਰਨ ਲਈ ਅਨਲੌਕ ਕਰੋ</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">ਲਿੰਕ ਕਰਨ ਲਈ ਡਿਵਾਈਸ \'ਤੇ ਦਿਖਾਇਆ ਗਿਆ QR ਕੋਡ ਸਕੈਨ ਕਰੋ।</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">QR ਕੋਡ ਸਕੈਨ ਕਰੋ</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">ਜਿਸ ਡਿਵਾਈਸ ਨੂੰ ਤੁਸੀਂ ਲਿੰਕ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਉਸ \'ਤੇ ਦਿਖਾਇਆ ਗਿਆ QR ਕੋਡ ਸਕੈਨ ਕਰਨ ਲਈ ਇਸ ਡਿਵਾਈਸ ਦੀ ਵਰਤੋਂ ਕਰੋ</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">ਠੀਕ ਹੈ</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">ਇਹ ਡਿਵਾਈਸ ਤੁਹਾਡੇ ਗਰੁੱਪਾਂ ਅਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਦੇਖ ਸਕੇਗਾ, ਤੁਹਾਡੀਆਂ ਚੈਟਾਂ ਤੱਕ ਪਹੁੰਚ ਕਰ ਸਕੇਗਾ ਅਤੇ ਤੁਹਾਡੇ ਨਾਮ \'ਤੇ ਸੁਨੇਹੇ ਭੇਜ ਸਕੇਗਾ।</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">ਆਪਣੇ ਦੂਜੇ ਡਿਵਾਈਸ \'ਤੇ ਲਿੰਕ ਕਰਨ ਦੀ ਪ੍ਰਕਿਰਿਆ ਪੂਰੀ ਕਰੋ</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">ਆਪਣੇ ਦੂਜੇ ਡਿਵਾਈਸ \'ਤੇ Molly ਨੂੰ ਲਿੰਕ ਕਰਨ ਦੀ ਪ੍ਰਕਿਰਿਆ ਪੂਰੀ ਕਰੋ।</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">ਡਿਵਾਈਸ ਨੂੰ ਲਿੰਕ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">ਇਹ QR ਕੋਡ ਵੈਧ ਨਹੀਂ ਹੈ. ਕਿਰਪਾ ਕਰਕੇ ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਤੁਸੀਂ ਉਸ ਡਿਵਾਈਸ \'ਤੇ ਦਿਖਾਏ QR ਕੋਡ ਨੂੰ ਸਕੈਨ ਕਰ ਰਹੇ ਹੋ ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਲਿੰਕ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">\'%1$s\' ਨਾਲ ਲਿੰਕ ਤੋੜਨਾ ਹੈ?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">ਗਾਇਬ ਪਲੇਅ ਸੇਵਾਵਾਂ ਲਈ ਅਨੁਕੂਲ ਬਣਾਓ</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">ਇਹ ਡਿਵਾਈਸ ਪਲੇਅ ਸੇਵਾਵਾਂ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ। ਸਿਸਟਮ ਬੈਟਰੀ ਅਨੁਕੂਲਤਾ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਉਣ ਲਈ ਟੈਪ ਕਰੋ ਤਾਂ ਜੋ Signal ਨੂੰ ਅਕਿਰਿਆਸ਼ੀਲ ਹੋਣ ਵੇਲੇ ਸੁਨੇਹਿਆਂ ਨੂੰ ਮੁੜ ਪ੍ਰਾਪਤ ਕਰਨ ਤੋਂ ਰੋਕਿਆ ਜਾ ਸਕੇ।</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">ਇਹ ਡਿਵਾਈਸ ਪਲੇਅ ਸੇਵਾਵਾਂ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ। ਸਿਸਟਮ ਬੈਟਰੀ ਅਨੁਕੂਲਤਾ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਉਣ ਲਈ ਟੈਪ ਕਰੋ ਤਾਂ ਜੋ Molly ਨੂੰ ਅਕਿਰਿਆਸ਼ੀਲ ਹੋਣ ਵੇਲੇ ਸੁਨੇਹਿਆਂ ਨੂੰ ਮੁੜ ਪ੍ਰਾਪਤ ਕਰਨ ਤੋਂ ਰੋਕਿਆ ਜਾ ਸਕੇ।</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Signal ਦੇ ਸੰਸਕਰਣ ਦੀ ਮਿਆਦ ਮੁੱਕ ਗਈ ਹੈ। ਸੁਨੇਹੇ ਭੇਜਣ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਕਿਰਪਾ ਕਰਕੇ ਹੁਣੇ ਅੱਪਡੇਟ ਕਰੋ।</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Molly ਦੇ ਸੰਸਕਰਣ ਦੀ ਮਿਆਦ ਮੁੱਕ ਗਈ ਹੈ। ਸੁਨੇਹੇ ਭੇਜਣ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਕਿਰਪਾ ਕਰਕੇ ਹੁਣੇ ਅੱਪਡੇਟ ਕਰੋ।</string>
     <string name="ExpiredBuildReminder_update_now">ਹੁਣੇ ਅੱਪਡੇਟ ਕਰੋ</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">ਵੇਖੋ</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">ਸਥਾਈ Signal ਸੰਚਾਰ ਅਸਫ਼ਲ!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal Google Play ਸੇਵਾਵਾਂ ਨਾਲ ਰਜਿਸਟਰ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ ਸੀ। Signal ਸੁਨੇਹੇ ਅਤੇ ਕਾਲਾਂ ਅਸਮਰੱਥ ਕੀਤੇ ਗਏ ਹਨ, ਕਿਰਪਾ ਕਰਕੇ ਸੈਟਿੰਗਾਂ &gt; ਤਕਨੀਕੀ ਵਿੱਚੋਂ ਮੁੜ-ਰਜਿਸਟਰ ਕਰੋ।</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">ਸਥਾਈ Molly ਸੰਚਾਰ ਅਸਫ਼ਲ!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly Google Play ਸੇਵਾਵਾਂ ਨਾਲ ਰਜਿਸਟਰ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ ਸੀ। Molly ਸੁਨੇਹੇ ਅਤੇ ਕਾਲਾਂ ਅਸਮਰੱਥ ਕੀਤੇ ਗਏ ਹਨ, ਕਿਰਪਾ ਕਰਕੇ ਸੈਟਿੰਗਾਂ &gt; ਤਕਨੀਕੀ ਵਿੱਚੋਂ ਮੁੜ-ਰਜਿਸਟਰ ਕਰੋ।</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">ਡੀਬੱਗ ਲੌਗ ਸਮੱਸਿਆ ਦਾ ਨਿਦਾਨ ਕਰਨ ਅਤੇ ਉਸਨੂੰ ਹੱਲ ਕਰਨ ਵਿੱਚ ਸਾਡੀ ਮਦਦ ਕਰਦੇ ਹਨ ਅਤੇ ਇਸ ਵਿੱਚ ਤੁਹਾਡੀ ਪਛਾਣ ਕਰਨ ਵਾਲੀ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਨਹੀਂ ਹੁੰਦੀ ਹੈ।</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal ਵਿੱਚ ਕੋਈ ਸਮੱਸਿਆ ਆਈ ਹੈ। ਕੀ ਤੁਸੀਂ ਡੀਬੱਗ ਲੌਗ ਦਰਜ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly ਵਿੱਚ ਕੋਈ ਸਮੱਸਿਆ ਆਈ ਹੈ। ਕੀ ਤੁਸੀਂ ਡੀਬੱਗ ਲੌਗ ਦਰਜ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">ਬੈਟਰੀ ਅਨੁਕੂਲਤਾ ਦੇ ਕਾਰਨ ਸੂਚਨਾਵਾਂ ਆਉਣ ਵਿੱਚ ਦੇਰੀ ਹੋ ਸਕਦੀ ਹੈ</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">ਸੁਨੇਹੇ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਆਉਣ ਵਿੱਚ ਦੇਰੀ ਨਾ ਹੋਵੇ ਇਹ ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ ਤੁਸੀਂ Signal ਲਈ ਬੈਟਰੀ ਅਨੁਕੂਲਤਾ ਨੂੰ ਅਸਮਰੱਥ ਕਰ ਸਕਦੇ ਹੋ।</string>
+    <string name="PromptBatterySaverBottomSheet__message">ਸੁਨੇਹੇ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਆਉਣ ਵਿੱਚ ਦੇਰੀ ਨਾ ਹੋਵੇ ਇਹ ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ ਤੁਸੀਂ Molly ਲਈ ਬੈਟਰੀ ਅਨੁਕੂਲਤਾ ਨੂੰ ਅਸਮਰੱਥ ਕਰ ਸਕਦੇ ਹੋ।</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">ਬੈਟਰੀ ਅਨੁਕੂਲਤਾ ਦੇ ਕਾਰਨ ਸੂਚਨਾਵਾਂ ਆਉਣ ਵਿੱਚ ਦੇਰੀ ਹੋ ਸਕਦੀ ਹੈ</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">ਸੁਨੇਹੇ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਆਉਣ ਵਿੱਚ ਦੇਰੀ ਨਾ ਹੋਵੇ ਇਹ ਯਕੀਨੀ ਬਣਾਉਣ ਲਈ Molly ਲਈ ਬੈਟਰੀ ਅਨੁਕੂਲਤਾ ਨੂੰ ਅਸਮਰੱਥ ਕਰੋ। ਡਿਵਾਈਸ-ਵਿਸ਼ੇਸ਼ ਨਿਰਦੇਸ਼ਾਂ ਨੂੰ ਦੇਖਣ ਲਈ \"ਜਾਰੀ ਰੱਖੋ\" \'ਤੇ ਟੈਪ ਕਰੋ।</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">ਨਹੀਂ ਧੰਨਵਾਦ</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">ਜਾਰੀ ਰੱਖੋ</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">ਜਾਰੀ ਰੱਖੋ</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">ਖਾਰਜ ਕਰੋ</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">ਨਹੀਂ ਧੰਨਵਾਦ</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">ਗਰੁੱਪ ਦੇ ਬਕਾਇਆ ਪਏ ਸੱਦੇ</string>
+    <string name="PendingMembersActivity_pending_group_invites">ਬੇਨਤੀਆਂ &amp; ਸੱਦੇ</string>
     <string name="PendingMembersActivity_requests">ਬੇਨਤੀਆਂ</string>
     <string name="PendingMembersActivity_invites">ਸੱਦੇ</string>
     <string name="PendingMembersActivity_people_you_invited">ਤੁਹਾਡੇ ਵੱਲੋਂ ਸੱਦੇ ਗਏ ਲੋਕ</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">ਰੱਦ ਕਰੋ</string>
     <string name="InviteActivity_sending">ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ…</string>
     <string name="InviteActivity_invitations_sent">ਸੱਦੇ ਭੇਜੇ ਗਏ!</string>
-    <string name="InviteActivity_invite_to_signal">Signal ਲਈ ਸੱਦਾ ਦਿਓ</string>
+    <string name="InviteActivity_invite_to_signal">Molly ਲਈ ਸੱਦਾ ਦਿਓ</string>
     <string name="InviteActivity_send_sms">SMS (%1$d) ਭੇਜੋ</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">ਕੀ %1$d ਨੂੰ SMS ਸੱਦਾ ਭੇਜਣਾ ਹੈ?</item>
         <item quantity="other">ਕੀ %1$d ਨੂੰ SMS ਸੱਦੇ ਭੇਜਣੇ ਹਨ?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">ਆਓ Signal ਨੂੰ ਅਪਣਾਈਏ: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">ਆਓ Molly ਨੂੰ ਅਪਣਾਈਏ: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">ਇੰਜ ਜਾਪਦਾ ਹੈ ਕਿ ਤੁਹਾਡੇ ਕੋਲ ਸਾਂਝੀਆਂ ਕਰਨ ਲਈ ਕੋਈ ਐਪਸ ਨਹੀਂ ਹਨ|</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">ਤੁਹਾਡਾ ਸੁਨੇਹਾ</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">ਪਿਛੋਕੜ ਕਨੈਕਸ਼ਨ ਸਮਰੱਥ ਕੀਤਾ</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">ਜਵਾਬ</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal ਕਾਲ ਸਥਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly ਕਾਲ ਸਥਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signal ਕਾਲ ਸੇਵਾ ਸ਼ੁਰੂ ਹੋ ਰਹੀ ਹੈ</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal ਕਾਲ ਸੇਵਾ ਬੰਦ ਹੋ ਰਹੀ ਹੈ</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Molly ਕਾਲ ਸੇਵਾ ਸ਼ੁਰੂ ਹੋ ਰਹੀ ਹੈ</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly ਕਾਲ ਸੇਵਾ ਬੰਦ ਹੋ ਰਹੀ ਹੈ</string>
     <string name="NotificationBarManager__cancel_call">ਕਾਲ ਰੱਦ ਕਰੋ</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">ਤੁਸੀਂ ਭੁਗਤਾਨ ਫੀਚਰ ਨੂੰ ਐਕਟੀਵੇਟ ਕਰ ਲਿਆ ਹੈ</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s ਹੁਣ ਭੁਗਤਾਨ ਸਵੀਕਾਰ ਕਰ ਸਕਦੇ ਹਨ</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">ਭੁਗਤਾਨ ਵੇਰਵੇ ਉਪਲਬਧ ਨਹੀਂ ਹਨ</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">ਹੋਰ ਲਈ ਟੈਪ ਕਰੋ</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">ਭੁਗਤਾਨ ਦੇ ਵੇਰਵੇ ਉਪਲਬਧ ਨਹੀਂ ਹਨ</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">ਇਸ ਭੁਗਤਾਨ ਦਾ ਇਹ ਵੇਰਵਾ ਉਪਲਬਧ ਨਹੀਂ ਹੈ ਕਿਉਂਕਿ ਤੁਹਾਡੇ ਸੁਨੇਹੇ ਇੱਕ ਅਜਿਹੇ ਸਰੋਤ ਤੋਂ ਰੀਸਟੋਰ ਕੀਤੇ ਗਏ ਸਨ ਜਿਸ ਵਿੱਚ ਇਸ ਭੁਗਤਾਨ ਦੀ ਪੁਰਾਣੀ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਨਹੀਂ ਸੀ। ਇਸ ਨਾਲ ਤੁਹਾਡੇ ਵਾਲੇਟ ਦਾ ਬੈਲੈਂਸ ਜਾਂ ਪਿਛਲੇ ਭੁਗਤਾਨਾਂ ਦੀ ਸਥਿਤੀ ਪ੍ਰਭਾਵਿਤ ਨਹੀਂ ਹੁੰਦੀ ਹੈ।</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">ਤੁਸੀਂ ਹੁਣ ਜਲਦੀ ਹੀ Signal ਰਾਹੀਂ SMS ਸੁਨੇਹੇ ਭੇਜ ਨਹੀਂ ਸਕੋਗੇ। ਗੱਲਬਾਤ ਨੂੰ ਇੱਥੇ ਜਾਰੀ ਰੱਖਣ ਲਈ %1$s ਨੂੰ Signal \'ਤੇ ਆਉਣ ਦਾ ਸੱਦਾ ਦਿਓ।</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">ਤੁਸੀਂ ਹੁਣ Signal ਰਾਹੀਂ SMS ਸੁਨੇਹੇ ਭੇਜ ਨਹੀਂ ਸਕਦੇ। ਗੱਲਬਾਤ ਨੂੰ ਇੱਥੇ ਜਾਰੀ ਰੱਖਣ ਲਈ %1$s ਨੂੰ Signal \'ਤੇ ਆਉਣ ਦਾ ਸੱਦਾ ਦਿਓ।</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">ਤੁਸੀਂ ਹੁਣ Molly ਰਾਹੀਂ SMS ਸੁਨੇਹੇ ਭੇਜ ਨਹੀਂ ਸਕਦੇ। ਗੱਲਬਾਤ ਨੂੰ ਇੱਥੇ ਜਾਰੀ ਰੱਖਣ ਲਈ %1$s ਨੂੰ Molly \'ਤੇ ਆਉਣ ਦਾ ਸੱਦਾ ਦਿਓ।</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">ਭੁਗਤਾਨ: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">ਭੁਗਤਾਨ</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">ਸਪੈਮ ਵਜੋਂ ਰਿਪੋਰਟ ਕੀਤੀ ਗਈ</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Signal ਡਿਵਾਈਸ ਨੂੰ ਲਿੰਕ ਕਰਨਾ ਹੈ?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">ਇੰਜ ਜਾਪਦਾ ਹੈ ਕਿ ਤੁਸੀਂ ਕਿਸੇ 3rd ਧਿਰ ਦੇ ਸਕੈਨਰ ਦਾ ਉਪਯੋਗ ਕਰਕੇ Signal ਡਿਵਾਈਸ ਨੂੰ ਲਿੰਕ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਰਹੇ ਹੋ। ਤੁਹਾਡੀ ਸੁਰੱਖਿਆ ਲਈ, ਕਿਰਪਾ ਕਰਕੇ Signal ਦੇ ਅੰਦਰੋਂ ਕੋਡ ਨੂੰ ਸਕੈਨ ਕਰੋ।</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">QR ਕੋਡ ਸਕੈਨ ਕਰਨ ਲਈ Signal ਨੂੰ ਕੈਮਰੇ ਦੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਸ ਨੂੰ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ, ਅਤੇ \"ਕੈਮਰਾ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">QR ਕੋਡ ਸਕੈਨ ਕਰਨ ਲਈ Molly ਨੂੰ ਕੈਮਰੇ ਦੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਸ ਨੂੰ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ, ਅਤੇ \"ਕੈਮਰਾ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">ਕੈਮਰਾ ਦੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ QR ਕੋਡ ਨੂੰ ਸਕੈਨ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">ਪਾਸਫ਼੍ਰੇਜ਼ ਦਰਜ ਕਰੋ</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal ਆਈਕਨ</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly ਆਈਕਨ</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">ਪਾਸਫ਼੍ਰੇਜ਼ ਦਰਜ ਕਰੋ</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">ਅਵੈਧ ਪਾਸਫ਼੍ਰੇਜ਼!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signal ਨੂੰ ਅਨਲੌਕ ਕਰੋ</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - ਲਾਕ ਸਕਰੀਨ</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Molly ਨੂੰ ਅਨਲੌਕ ਕਰੋ</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - ਲਾਕ ਸਕਰੀਨ</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">ਨਕਸ਼ਾ</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">ਮੈਸੇਜਿੰਗ ਨੂੰ ਜਾਰੀ ਰੱਖਣ ਲਈ ਤਸਦੀਕ ਕਰੋ</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Signal ’ਤੇ ਸਪੈਮ ਨੂੰ ਰੋਕਣ ਵਿੱਚ ਮਦਦ ਕਰਨ ਲਈ, ਕਿਰਪਾ ਕਰਕੇ ਪ੍ਰਮਾਣੀਕਰਣ ਪੂਰਾ ਕਰੋ।</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Molly ’ਤੇ ਸਪੈਮ ਨੂੰ ਰੋਕਣ ਵਿੱਚ ਮਦਦ ਕਰਨ ਲਈ, ਕਿਰਪਾ ਕਰਕੇ ਪ੍ਰਮਾਣੀਕਰਣ ਪੂਰਾ ਕਰੋ।</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">ਤਸਦੀਕ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਤੁਸੀਂ ਮੈਸੇਜਿੰਗ ਜਾਰੀ ਰੱਖ ਸਕਦੇ ਹੋ। ਕੋਈ ਵੀ ਰੁਕੇ ਹੋਏ ਸੁਨੇਹੇ ਆਪਣੇ-ਆਪ ਹੀ ਭੇਜ ਦਿੱਤੇ ਜਾਣਗੇ।</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">ਮੇਰੀ ਸਟੋਰੀ</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal ਕਾਲ</string>
+    <string name="Recipient_signal_call">Molly ਕਾਲ</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">ਪਾਬੰਦੀ ਲਗਾਓ</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">ਰਿੰਗ ਜਾ ਰਹੀ ਹੈ…</string>
     <string name="RedPhone_busy">ਵਿਅਸਤ</string>
     <string name="RedPhone_recipient_unavailable">ਪ੍ਰਾਪਤਕਰਤਾ ਉਪਲਬਧ ਨਹੀਂ</string>
-    <string name="RedPhone_network_failed">ਨੈੱਟਵਰਕ ਅਸਫ਼ਲ!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">ਨੈੱਟਵਰਕ ਅਸਫਲ! ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਦੀ ਜਾਂਚ ਕਰੋ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।</string>
     <string name="RedPhone_number_not_registered">ਨੰਬਰ ਰਜਿਸਟਰ ਨਹੀਂ!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">ਜੋ ਨੰਬਰ ਤੁਸੀਂ ਡਾਇਲ ਕੀਤਾ ਸੀ ਉਹ ਸੁਰੱਖਿਅਤ ਆਵਾਜ਼ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦਾ!</string>
     <string name="RedPhone_got_it">ਸਮਝ ਗਏ</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">ਆਪਣੀ ਵੀਡੀਓ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਇੱਥੇ ਟੈਪ ਕਰੋ</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s ਕਾਲ ਕਰਨ ਲਈ, Signal ਨੂੰ ਤੁਹਾਡੇ ਕੈਮਰੇ ਲਈ ਪਹੁੰਚ ਚਾਹੀਦੀ ਹੈ</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s ਕਾਲ ਕਰਨ ਲਈ, Molly ਨੂੰ ਤੁਹਾਡੇ ਕੈਮਰੇ ਲਈ ਪਹੁੰਚ ਚਾਹੀਦੀ ਹੈ</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">ਮੁੜ ਕਨੈਕਟ ਹੋ ਰਿਹਾ ਹੈ…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">ਕਾਲ ਵਿੱਚੋਂ ਹਟਾਇਆ ਗਿਆ</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">ਕਿਸੇ ਨੇ ਤੁਹਾਨੂੰ ਕਾਲ ਵਿੱਚੋਂ ਹਟਾ ਦਿੱਤਾ ਹੈ।</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">ਆਪਣੇ ਕੈਮਰੇ ਅਤੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">ਆਪਣੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">ਆਪਣੇ ਕੈਮਰੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">ਕਾਲ ਸ਼ੁਰੂ ਕਰਨ ਜਾਂ ਉਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਲਈ, Molly ਨੂੰ ਆਪਣੇ ਕੈਮਰੇ ਅਤੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ।</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">ਕਾਲ ਸ਼ੁਰੂ ਕਰਨ ਜਾਂ ਉਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਲਈ, Molly ਨੂੰ ਆਪਣੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ।</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">ਆਪਣੀ ਵੀਡੀਓ ਨੂੰ ਸਮਰੱਥ ਕਰਨ ਲਈ, Molly ਨੂੰ ਆਪਣੇ ਕੈਮਰੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ।</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">ਕਾਲ ਸ਼ੁਰੂ ਕਰਨ ਜਾਂ ਉਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਲਈ Molly ਨੂੰ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਸੰਬੰਧੀ ਇਜਾਜ਼ਤਾਂ ਚਾਹੀਦੀਆਂ ਹਨ।</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly ਨੂੰ ਤੁਹਾਡੀ ਵੀਡੀਓ ਨੂੰ ਸਮਰੱਥ ਕਰਨ ਲਈ ਕੈਮਰਾ ਤੱਕ ਪਹੁੰਚ ਚਾਹੀਦੀ ਹੈ</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">ਕਾਲ ਸ਼ੁਰੂ ਕਰਨ ਜਾਂ ਕਾਲ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਲਈ:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">ਆਪਣੀ ਵੀਡੀਓ ਨੂੰ ਸਮਰੱਥ ਕਰਨ ਲਈ:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal ਕਾਲ</string>
-    <string name="WebRtcCallView__signal_video_call">Signal ਵੀਡੀਓ ਕਾਲ</string>
+    <string name="WebRtcCallView__signal_call">Molly ਕਾਲ</string>
+    <string name="WebRtcCallView__signal_video_call">Molly ਵੀਡੀਓ ਕਾਲ</string>
     <string name="WebRtcCallView__start_call">ਕਾਲ ਸ਼ੁਰੂ ਕਰੋ</string>
     <string name="WebRtcCallView__join_call">ਕਾਲ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਵੋ</string>
     <string name="WebRtcCallView__call_is_full">ਕਾਲ ਭਰੀ ਹੋਈ ਹੈ</string>
@@ -2028,23 +2132,42 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">ਕੀ ਹੱਥ ਨੀਚੇ ਕਰਨਾ ਹੈ?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">ਹੱਥ ਨੀਚੇ ਕਰੋ</string>
+    <string name="CallOverflowPopupWindow__lower_hand">ਨੀਚੇ ਕਰੋ</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">ਰੱਦ ਕਰੋ</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">ਤੁਸੀਂ ਆਪਣਾ ਹੱਥ ਉੱਪਰ ਕੀਤਾ ਹੈ</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">ਵੇਖੋ</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s ਨੇ ਹੱਥ ਉੱਪਰ ਕੀਤਾ ਹੈ</item>
-        <item quantity="other">%1$s + %2$d ਨੇ ਹੱਥ ਉੱਪਰ ਕੀਤਾ ਹੈ</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s ਨੇ ਹੱਥ ਉੱਪਰ ਕੀਤਾ ਹੈ</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d ਨੇ ਹੱਥ ਉੱਪਰ ਕੀਤਾ ਹੈ</item>
+        <item quantity="other">%1$s +%2$d ਨੇ ਹੱਥ ਉੱਪਰ ਕੀਤਾ ਹੈ</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s ਨੇ ਹੱਥ ਉੱਪਰ ਕੀਤਾ ਹੈ</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d ਨੇ ਹੱਥ ਉੱਪਰ ਕੀਤਾ ਹੈ</item>
+        <item quantity="other">%1$s +%2$d ਨੇ ਹੱਥ ਉੱਪਰ ਕੀਤਾ ਹੈ</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
-        <item quantity="one">%1$s</item>
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s +%2$d</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
+        <item quantity="one">%1$s +%2$d</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
 
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">ਤੁਹਾਨੂੰ ਇਸ ਨੰਬਰ ਨੂੰ ਤਸਦੀਕ ਕਰਨ ਲਈ ਇੱਕ ਕਾਲ ਆਵੇਗੀ।</string>
     <string name="RegistrationActivity_edit_number">ਨੰਬਰ ਨੂੰ ਸੋਧੋ</string>
     <string name="RegistrationActivity_missing_google_play_services">Google Play ਸੇਵਾਵਾਂ ਗਾਇਬ</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">ਇਸ ਡਿਵਾਈਸ ’ਤੇ Google Play ਸੇਵਾਵਾਂ ਗਾਇਬ ਹੈ ਤੁਸੀਂ ਅਜੇ ਵੀ Signal ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ, ਪਰ ਇਸ ਸੰਰਚਨਾ ਦੇ ਨਤੀਜੇ ਵਜੋਂ ਘਟੀ ਹੋਈ ਭਰੋਸੇਯੋਗਤਾ ਜਾਂ ਕਾਰਗੁਜ਼ਾਰੀ ਹੋ ਸਕਦੀ ਹੈ।\n\nਜੇਕਰ ਤੁਸੀਂ ਇੱਕ ਉੱਨਤ ਵਰਤੋਂਕਾਰ ਨਹੀਂ ਹੋ, ਅਤੇ ਮੁਰੰਮਤ ਕੀਤਾ ਹੋਇਆ Android ROM ਨਹੀਂ ਚਲਾ ਰਹੇ ਹੋ, ਜਾਂ ਇਹ ਮੰਨਦੇ ਹੋ ਕਿ ਤੁਸੀਂ ਇਸ ਨੂੰ ਗਲਤੀ ਨਾਲ ਵੇਖ ਰਹੇ ਹੋ, ਤਾਂ ਸਮੱਸਿਆ ਦੇ ਹੱਲ ਲਈ support@signal.org ਨਾਲ ਸੰਪਰਕ ਕਰੋ।</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">ਇਸ ਡਿਵਾਈਸ ’ਤੇ Google Play ਸੇਵਾਵਾਂ ਗਾਇਬ ਹੈ ਤੁਸੀਂ ਅਜੇ ਵੀ Molly ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ, ਪਰ ਇਸ ਸੰਰਚਨਾ ਦੇ ਨਤੀਜੇ ਵਜੋਂ ਘਟੀ ਹੋਈ ਭਰੋਸੇਯੋਗਤਾ ਜਾਂ ਕਾਰਗੁਜ਼ਾਰੀ ਹੋ ਸਕਦੀ ਹੈ।\n\nਜੇਕਰ ਤੁਸੀਂ ਇੱਕ ਉੱਨਤ ਵਰਤੋਂਕਾਰ ਨਹੀਂ ਹੋ, ਅਤੇ ਮੁਰੰਮਤ ਕੀਤਾ ਹੋਇਆ Android ROM ਨਹੀਂ ਚਲਾ ਰਹੇ ਹੋ, ਜਾਂ ਇਹ ਮੰਨਦੇ ਹੋ ਕਿ ਤੁਸੀਂ ਇਸ ਨੂੰ ਗਲਤੀ ਨਾਲ ਵੇਖ ਰਹੇ ਹੋ, ਤਾਂ ਸਮੱਸਿਆ ਦੇ ਹੱਲ ਲਈ support@molly.im ਨਾਲ ਸੰਪਰਕ ਕਰੋ।</string>
     <string name="RegistrationActivity_i_understand">ਮੈਂ ਸਮਝਦਾ/ਸਮਝਦੀ ਹਾਂ</string>
     <string name="RegistrationActivity_play_services_error">Play ਸੇਵਾਵਾਂ ਚ ਤਰੁੱਟੀ</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play ਸੇਵਾਵਾਂ ਅਪਡੇਟ ਹੋ ਰਹੀਆਂ ਹਨ ਜਾਂ ਅਸਥਾਈ ਤੌਰ ’ਤੇ ਉਪਲਬਧ ਨਹੀਂ ਹਨ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ ਕਰੋ।</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">ਗ਼ੈਰ-ਮਿਆਰੀ ਅੰਕ ਰੂਪ</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤਾ ਨੰਬਰ (%1$s) ਗੈਰ-ਮਿਆਰੀ ਜਾਪਦਾ ਹੈ।\n\nਕੀ ਤੁਹਾਡਾ ਮਤਲਬ %2$s ਹੈ?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - ਫ਼ੋਨ ਨੰਬਰ ਫਾਰਮਿਟ</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - ਫ਼ੋਨ ਨੰਬਰ ਫਾਰਮਿਟ</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">ਕਾਲ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਗਈ</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">ਰਜਿਸਟਰ ਕਰਨ ਵਿੱਚ ਸਮੱਸਿਆ ਪੇਸ਼ ਆ ਰਹੀ ਹੈ?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• SMS ਜਾਂ ਕਾਲ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਤੁਹਾਡੇ ਫ਼ੋਨ ਵਿੱਚ ਸੈਲੂਲਰ ਸਿਗਨਲ ਆ ਰਿਹਾ ਹੋਵੇ\n • ਪੁਸ਼ਟੀ ਕਰੋ ਕਿ ਤੁਸੀਂ ਨੰਬਰ \'ਤੇ ਫ਼ੋਨ ਕਾਲ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦੇ ਹੋ\n • ਜਾਂਚ ਕਰੋ ਕਿ ਤੁਸੀਂ ਆਪਣਾ ਫ਼ੋਨ ਨੰਬਰ ਸਹੀ ਢੰਗ ਨਾਲ ਦਰਜ ਕੀਤਾ ਹੈ।</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਕਿਰਪਾ ਕਰਕੇ ਸਮੱਸਿਆ ਦਾ ਨਿਪਟਾਰਾ ਕਰਨ ਵਾਲੇ ਇਹਨਾਂ ਕਦਮਾਂ ਦੀ ਪਾਲਣਾ ਕਰੋ ਜਾਂ ਸਹਾਇਤਾ ਟੀਮ ਨਾਲ ਸੰਪਰਕ ਕਰੋ</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਕਿਰਪਾ ਕਰਕੇ %1$s ਜਾਂ %2$s ਨੂੰ ਫਾਲੋ ਕਰੋ</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">ਸਮੱਸਿਆ ਦਾ ਨਿਪਟਾਰਾ ਕਰਨ ਵਾਲੇ ਇਹਨਾਂ ਕਦਮਾਂ</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">ਸੰਪਰਕਾਂ ਚ ਜੋੜੋ</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Signal ਲਈ ਸੱਦਾ ਦਿਓ</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Molly ਲਈ ਸੱਦਾ ਦਿਓ</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal ਸੁਨੇਹਾ</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal ਕਾਲ</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">ਸੰਪਰਕਾਂ ਚ ਜੋੜੋ</string>
-    <string name="SharedContactView_invite_to_signal">Signal ਲਈ ਸੱਦਾ ਦਿਓ</string>
+    <string name="SharedContactView_invite_to_signal">Molly ਲਈ ਸੱਦਾ ਦਿਓ</string>
     <string name="SharedContactView_message">Signal ਸੁਨੇਹਾ</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s ਨੰਬਰ %2$s ਦਾ ਹੈ</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal ਅੱਪਡੇਟ</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal ਦਾ ਨਵਾਂ ਵਰਜ਼ਨ ਉਪਲਬਧ ਹੈ। ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal ਨੂੰ ਅੱਪਡੇਟ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly ਅੱਪਡੇਟ</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly ਦਾ ਨਵਾਂ ਵਰਜ਼ਨ ਉਪਲਬਧ ਹੈ। ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly ਨੂੰ ਅੱਪਡੇਟ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ</string>
     <string name="ApkUpdateNotifications_failed_general_body">ਅਸੀਂ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰਾਂਗੇ।</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal ਨੂੰ ਸਫਲਤਾਪੂਰਵਕ ਅੱਪਡੇਟ ਕੀਤਾ ਗਿਆ</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly ਨੂੰ ਸਫਲਤਾਪੂਰਵਕ ਅੱਪਡੇਟ ਕੀਤਾ ਗਿਆ</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">ਤੁਹਾਨੂੰ ਆਪਣੇ-ਆਪ ਵਰਜ਼ਨ %1$s ਉੱਤੇ ਅੱਪਡੇਟ ਕਰ ਦਿੱਤਾ ਗਿਆ ਸੀ।</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">ਸਾਡਾ Signal ਸੁਰੱਖਿਆ ਨੰਬਰ:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">ਇੰਜ ਜਾਪਦਾ ਹੈ ਕਿ ਤੁਹਾਡੇ ਕੋਲ ਸਾਂਝੀਆਂ ਕਰਨ ਲਈ ਕੋਈ ਐਪਸ ਨਹੀਂ ਹਨ|</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਤੁਲਨਾ ਕਰਨ ਲਈ ਕੋਈ ਸੁਰੱਖਿਆ ਨੰਬਰ ਨਹੀਂ ਮਿਲਿਆ</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">QR ਕੋਡ ਸਕੈਨ ਕਰਨ ਲਈ Signal ਨੂੰ ਕੈਮਰੇ ਦੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਸ ਨੂੰ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ, ਅਤੇ \"ਕੈਮਰਾ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">QR ਕੋਡ ਸਕੈਨ ਕਰਨ ਲਈ Molly ਨੂੰ ਕੈਮਰੇ ਦੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਸ ਨੂੰ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ, ਅਤੇ \"ਕੈਮਰਾ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">ਕੈਮਰਾ ਦੀ ਇਜਾਜ਼ਤ ਤੋਂ ਬਿਨਾਂ QR ਕੋਡ ਨੂੰ ਸਕੈਨ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">%1$sਦਾ ਸੁਰੱਖਿਆ ਨੰਬਰ ਦੇਖਣ ਲਈ ਤੁਹਾਨੂੰ ਪਹਿਲਾਂ ਸੁਨੇਹਿਆਂ ਦਾ ਆਦਾਨ-ਪ੍ਰਦਾਨ ਕਰਨਾ ਪਵੇਗਾ।</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">ਖੋਲ੍ਹਣ ਲਈ ਛੂਹੋ।</string>
-    <string name="KeyCachingService_passphrase_cached">Signal ਅਣ-ਲਾਕ ਹੈ</string>
-    <string name="KeyCachingService_lock">Signal ਲਾਕ ਕਰੋ</string>
+    <string name="KeyCachingService_passphrase_cached">Molly ਅਣ-ਲਾਕ ਹੈ</string>
+    <string name="KeyCachingService_lock">Molly ਲਾਕ ਕਰੋ</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">ਤੁਸੀਂ</string>
     <string name="MediaPreviewActivity_unssuported_media_type">ਗੈਰ-ਸਹਾਇਕ ਮੀਡੀਆ ਕਿਸਮ</string>
     <string name="MediaPreviewActivity_draft">ਡਰਾਫਟ</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">ਬਾਹਰੀ ਸਟੋਰੇਜ ’ਤੇ ਸੰਭਾਲਣ ਲਈ Signal ਨੂੰ ਸਟੋਰੇਜ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ, ਪਰ ਇਸਨੂੰ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ, ਅਤੇ \"ਸਟੋਰੇਜ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">ਬਾਹਰੀ ਸਟੋਰੇਜ ’ਤੇ ਸੰਭਾਲਣ ਲਈ Molly ਨੂੰ ਸਟੋਰੇਜ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ, ਪਰ ਇਸਨੂੰ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ, ਅਤੇ \"ਸਟੋਰੇਜ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">ਇਜਾਜ਼ਤਾਂ ਦੇ ਬਿਨਾਂ ਬਾਹਰੀ ਸਟੋਰੇਜ ਵਿੱਚ ਦਰਜ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">ਕੀ ਸੁਨੇਹਾ ਹਟਾਉਣਾ ਹੈ?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">ਅਜਿਹਾ ਕਰਨ \'ਤੇ ਇਸ ਸੁਨੇਹੇ ਨੂੰ ਸਥਾਈ ਤੌਰ \'ਤੇ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">ਸੁਨੇਹਾ ਪਹੁੰਚਾਉਣ ਵਿੱਚ ਅਸਫ਼ਲ।</string>
     <string name="MessageNotifier_error_delivering_message">ਸੁਨੇਹਾ ਪਹੁੰਚਾਉਣ ਵਿੱਚ ਤਰੁੱਟੀ।</string>
     <string name="MessageNotifier_message_delivery_paused">ਸੁਨੇਹਾ ਡਿਲਿਵਰੀ ਰੋਕ ਦਿੱਤੀ ਗਈ।</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Signal ਉੱਤੇ ਮੈਸੇਜਿੰਗ ਜਾਰੀ ਰੱਖਣ ਲਈ ਤਸਦੀਕ ਕਰੋ।</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Molly ਉੱਤੇ ਮੈਸੇਜਿੰਗ ਜਾਰੀ ਰੱਖਣ ਲਈ ਤਸਦੀਕ ਕਰੋ।</string>
     <string name="MessageNotifier_mark_all_as_read">ਸਭ ਨੂੰ ਪੜ੍ਹੇ ਵਜੋਂ ਚਿੰਨ੍ਹ ਲਾਓ</string>
     <string name="MessageNotifier_mark_read">ਪੜ੍ਹੇ ਵਜੋਂ ਚਿੰਨ੍ਹ ਲਾਓ</string>
     <string name="MessageNotifier_turn_off_these_notifications">ਇਹ ਸੂਚਨਾਵਾਂ ਬੰਦ ਕਰੋ</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">ਤੁਹਾਡੇ ਸਟਿੱਕਰ ਉੱਤੇ %1$s ਰਿਐਕਸ਼ਨ ਦਿੱਤਾ।</string>
     <string name="MessageNotifier_this_message_was_deleted">ਇਹ ਸੁਨੇਹਾ ਮਿਟਾ ਦਿੱਤਾ ਗਿਆ ਸੀ।</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">ਸੰਪਰਕ ਦੁਆਰਾ Signal ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਬਾਰੇ ਸੂਚਨਾਵਾਂ ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ? ਤੁਸੀਂ ਉਹਨਾਂ ਨੂੰ Signal &gt; ਸੈਟਿੰਗਾਂ &gt; ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਜਾ ਕੇ ਵਿੱਚ ਦੁਬਾਰਾ ਸਮਰੱਥ ਕਰ ਸਕਦੇ ਹੋ।</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">ਸੰਪਰਕ ਦੁਆਰਾ Molly ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਬਾਰੇ ਸੂਚਨਾਵਾਂ ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ? ਤੁਸੀਂ ਉਹਨਾਂ ਨੂੰ Molly &gt; ਸੈਟਿੰਗਾਂ &gt; ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਜਾ ਕੇ ਵਿੱਚ ਦੁਬਾਰਾ ਸਮਰੱਥ ਕਰ ਸਕਦੇ ਹੋ।</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signal ਲੌਕ ਹੋਣ ਕਰਕੇ ਫ਼ੌਰੀ ਜਵਾਬ ਉਪਲਬਧ ਨਹੀਂ!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Molly ਲੌਕ ਹੋਣ ਕਰਕੇ ਫ਼ੌਰੀ ਜਵਾਬ ਉਪਲਬਧ ਨਹੀਂ!</string>
     <string name="QuickResponseService_problem_sending_message">ਸੁਨੇਹਾ ਭੇਜਣ ਵਿੱਚ ਸਮੱਸਿਆ!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">ਗਲਤ ਸ਼ਾਰਟਕੱਟ</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">ਨਵਾਂ ਸੁਨੇਹਾ</string>
     <string name="SingleRecipientNotificationBuilder_message_request">ਸੁਨੇਹਾ ਬੇਨਤੀ</string>
     <string name="SingleRecipientNotificationBuilder_you">ਤੁਸੀਂ</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">ਇਹ ਡਿਵਾਈਸ ਹੁਣ ਰਜਿਸਟਰ ਨਹੀਂ ਹੈ। ਅਜਿਹਾ ਸ਼ਾਇਦ ਇਸ ਕਰਕੇ ਹੈ ਕਿਉਂਕਿ ਤੁਸੀਂ ਕਿਸੇ ਹੋਰ ਡਿਵਾਈਸ ’ਤੇ Signal ਨਾਲ ਆਪਣਾ ਫ਼ੋਨ ਨੰਬਰ ਰਜਿਸਟਰ ਕੀਤਾ ਸੀ।</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">ਇਹ ਡਿਵਾਈਸ ਹੁਣ ਰਜਿਸਟਰ ਨਹੀਂ ਹੈ। ਅਜਿਹਾ ਸ਼ਾਇਦ ਇਸ ਕਰਕੇ ਹੈ ਕਿਉਂਕਿ ਤੁਸੀਂ ਕਿਸੇ ਹੋਰ ਡਿਵਾਈਸ ’ਤੇ Molly ਨਾਲ ਆਪਣਾ ਫ਼ੋਨ ਨੰਬਰ ਰਜਿਸਟਰ ਕੀਤਾ ਸੀ।</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">ਡਿਵਾਈਸ ਮੁੜ-ਰਜਿਸਟਰ ਕਰੋ</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">ਕਾਲ ਦਾ ਜਵਾਬ ਦੇਣ ਲਈ Signal ਨੂੰ ਆਪਣੇ ਮਾਈਕਰੋਫ਼ੋਨ ਲਈ ਪਹੁੰਚ ਦਿਓ।</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">ਕਾਲ ਦਾ ਜਵਾਬ ਦੇਣ ਲਈ Molly ਨੂੰ ਆਪਣੇ ਮਾਈਕਰੋਫ਼ੋਨ ਲਈ ਪਹੁੰਚ ਦਿਓ।</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">ਵੀਡੀਓ ਕਾਲ ਦਾ ਜਵਾਬ ਦੇਣ ਲਈ, Signal ਨੂੰ ਆਪਣੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਅਤੇ ਕੈਮਰੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ।</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal ਨੂੰ ਕਾਲ ਕਰਨ ਲਈ ਮਾਈਕ੍ਰੋਫੋਨ ਅਤੇ ਕੈਮਰਾ ਇਜਾਜ਼ਤਾਂ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਹਨਾਂ ਲਈ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ| ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ, ਅਤੇ \"ਮਾਈਕ੍ਰੋਫ਼ੋਨ\" ਅਤੇ \"ਕੈਮਰਾ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">ਵੀਡੀਓ ਕਾਲ ਦਾ ਜਵਾਬ ਦੇਣ ਲਈ, Molly ਨੂੰ ਆਪਣੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਅਤੇ ਕੈਮਰੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ।</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly ਨੂੰ ਕਾਲ ਕਰਨ ਲਈ ਮਾਈਕ੍ਰੋਫੋਨ ਅਤੇ ਕੈਮਰਾ ਇਜਾਜ਼ਤਾਂ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਹਨਾਂ ਲਈ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ| ਕਿਰਪਾ ਕਰਕੇ ਐਪ ਸੈਟਿੰਗਾਂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ, ਅਤੇ \"ਮਾਈਕ੍ਰੋਫ਼ੋਨ\" ਅਤੇ \"ਕੈਮਰਾ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">ਲਿੰਕ ਕੀਤੀ ਡਿਵਾਈਸ ’ਤੇ ਜਵਾਬ ਦਿੱਤਾ।</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">ਲਿੰਕ ਕੀਤੀ ਡਿਵਾਈਸ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ।</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">ਲਿੰਕ ਕੀਤੀ ਡਿਵਾਈਸ ’ਤੇ ਵਿਅਸਤ।</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">ਨਵਾਂ ਪਾਸਫ਼੍ਰੇਜ਼ ਦੁਹਰਾਓ</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Signal ਲਈ ਸੱਦਾ ਦਿਓ</string>
+    <string name="contact_selection_activity__invite_to_signal">Molly ਲਈ ਸੱਦਾ ਦਿਓ</string>
     <string name="contact_selection_activity__new_group">ਨਵਾਂ ਸਮੂਹ</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">ਸੰਪਰਕਾਂ ਨੂੰ ਤਾਜ਼ਾ ਕਰੋ</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਦਿਖ ਰਿਹਾ? ਤਾਜ਼ਾ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Signal ਉੱਤੇ ਉਹਨਾਂ ਲੋਕਾਂ ਨੂੰ ਲੱਭੋ ਜਿਹਨਾਂ ਨੂੰ ਤੁਸੀਂ ਜਾਣਦੇ ਹੋ</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">ਆਪਣੇ ਸੰਪਰਕਾਂ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">ਹੋਰ</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">ਸੰਪਰਕ ਫੋਟੋ</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal ਨੂੰ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਦਿਖਾਉਣ ਲਈ ਸੰਪਰਕਾਂ ਦੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਸ ਲਈ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਐਪ ਸੈਟਿੰਗਾਂ ਮੇਨੂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ, ਅਤੇ \"ਸੰਪਰਕ\" ਸਮਰੱਥ ਕਰੋ।</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly ਨੂੰ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਦਿਖਾਉਣ ਲਈ ਸੰਪਰਕਾਂ ਦੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਇਸ ਲਈ ਸਥਾਈ ਤੌਰ ’ਤੇ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ। ਐਪ ਸੈਟਿੰਗਾਂ ਮੇਨੂ ’ਤੇ ਜਾਰੀ ਰੱਖੋ, \"ਇਜਾਜ਼ਤਾਂ\" ਚੁਣੋ, ਅਤੇ \"ਸੰਪਰਕ\" ਸਮਰੱਥ ਕਰੋ।</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">ਸੰਪਰਕਾਂ ਨੂੰ ਮੁੜ ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਤਰੁੱਟੀ, ਆਪਣੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਦੀ ਜਾਂਚ ਕਰੋ</string>
     <string name="ContactSelectionListFragment_username_not_found">ਵਰਤੋਂਕਾਰ ਨਾਂ ਨਹੀਂ ਲੱਭਿਆ</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"%1$s Signal ਦੇ ਵਰਤੋਂਕਾਰ ਨਹੀਂ ਹਨ। ਕਿਰਪਾ ਕਰਕੇ ਵਰਤੋਂਕਾਰ ਨਾਂ ਦੀ ਜਾਂਚ ਕਰੋ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">ਵਰਤੋਂਕਾਰ-ਨਾਂ ਨਾਲ ਲੱਭੋ</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">ਸੰਪਰਕਾਂ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Signal ਉੱਤੇ ਆਪਣੇ ਜਾਣਕਾਰ ਲੋਕਾਂ ਨੂੰ ਲੱਭਣ ਲਈ:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">ਨਹੀਂ ਧੰਨਵਾਦ</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">ਆਪਣੇ ਸੰਪਰਕਾਂ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ। ਤੁਹਾਡੇ ਸੰਪਰਕ ਇਨਕ੍ਰਿਪਟਡ ਹਨ ਅਤੇ Signal ਨੂੰ ਦਿਖਾਈ ਨਹੀਂ ਦਿੰਦੇ ਹਨ।</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal ਨੂੰ ਉਹਨਾਂ ਨੂੰ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰਨ ਲਈ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਤੱਕ ਪਹੁੰਚ ਦੀ ਲੋੜ ਹੈ</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly ਨੂੰ ਉਹਨਾਂ ਨੂੰ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰਨ ਲਈ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਤੱਕ ਪਹੁੰਚ ਦੀ ਲੋੜ ਹੈ</string>
     <string name="contact_selection_list_fragment__show_contacts">ਸੰਪਰਕ ਦਿਖਾਓ</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">ਤੁਸੀਂ ਇਸ ਵਿਅਕਤੀ ਨੂੰ ਹਟਾ ਦਿੱਤਾ ਹੈ, ਉਹਨਾਂ ਨੂੰ ਦੁਬਾਰਾ ਸੁਨੇਹਾ ਭੇਜਣ \'ਤੇ ਉਹਨਾਂ ਨੂੰ ਤੁਹਾਡੀ ਸੂਚੀ ਵਿੱਚ ਦੁਬਾਰਾ ਸ਼ਾਮਲ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">ਵਿਕਲਪ</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">ਅੱਪਡੇਟ ਕਰੋ</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">ਚਲਾਓ … ਰੋਕੋ</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">ਬੁਲਬੁਲੇ Android ਦਾ ਫ਼ੀਚਰ ਹਨ, ਜਿਨਾਂ ਨੂੰ ਤੁਸੀਂ Signal ਚੈਟ ਵਿੱਚ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।</string>
+    <string name="BubbleOptOutTooltip__description">ਬੁਲਬੁਲੇ Android ਦਾ ਫ਼ੀਚਰ ਹਨ, ਜਿਨਾਂ ਨੂੰ ਤੁਸੀਂ Molly ਚੈਟ ਵਿੱਚ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">ਹੁਣੇ ਨਹੀਂ</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">ਗਰੁੱਪ ਬਾਰੇ ਜਾਣਕਾਰੀ</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Signal ਨੂੰ ਅੱਪਡੇਟ ਕਰੋ</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Molly ਨੂੰ ਅੱਪਡੇਟ ਕਰੋ</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Signal ਦੇ ਇਸ ਵਰਜ਼ਨ ਦੀ ਮਿਆਦ ਪੁੱਗ ਗਈ ਹੈ। Signal ਦੀ ਵਰਤੋਂ ਜਾਰੀ ਰੱਖਣ ਲਈ ਇਸਨੂੰ ਹੁਣੇ ਅੱਪਡੇਟ ਕਰੋ।</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Molly ਦੇ ਇਸ ਵਰਜ਼ਨ ਦੀ ਮਿਆਦ ਪੁੱਗ ਗਈ ਹੈ। Molly ਦੀ ਵਰਤੋਂ ਜਾਰੀ ਰੱਖਣ ਲਈ ਇਸਨੂੰ ਹੁਣੇ ਅੱਪਡੇਟ ਕਰੋ।</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">ਅੱਪਡੇਟ ਕਰੋ</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">ਹੌਲੀ</string>
     <string name="preferences__help">ਮਦਦ</string>
     <string name="preferences__advanced">ਤਕਨੀਕੀ</string>
-    <string name="preferences__donate_to_signal">Signal ਨੂੰ ਦਾਨ ਦਿਓ</string>
+    <string name="preferences__donate_to_signal">Molly ਨੂੰ ਦਾਨ ਦਿਓ</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">ਪਰਦੇਦਾਰੀ</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">ਐਪ ਆਈਕਨ ਅਤੇ ਨਾਮ ਨੂੰ \"%1$s\" \'ਤੇ ਬਦਲੋ</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">ਐਪ ਆਈਕਨ ਅਤੇ ਨਾਮ ਨੂੰ ਬਦਲਣ ਲਈ Signal ਨੂੰ ਬੰਦ ਕਰਨ ਦੀ ਲੋੜ ਪਵੇਗੀ। ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਹਮੇਸ਼ਾਂ ਡਿਫੌਲਟ Signal ਆਈਕਨ ਅਤੇ ਨਾਮ ਦਿਖਾਈ ਦੇਵੇਗਾ।</string>
+    <string name="preferences__app_icon_dialog_description">ਐਪ ਆਈਕਨ ਅਤੇ ਨਾਮ ਨੂੰ ਬਦਲਣ ਲਈ Molly ਨੂੰ ਬੰਦ ਕਰਨ ਦੀ ਲੋੜ ਪਵੇਗੀ। ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਹਮੇਸ਼ਾਂ ਡਿਫੌਲਟ Molly ਆਈਕਨ ਅਤੇ ਨਾਮ ਦਿਖਾਈ ਦੇਵੇਗਾ।</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">ਕੋਈ ਐਪ ਆਈਕਨ ਅਤੇ ਨਾਮ ਚੁਣੋ, ਜੋ ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੀ ਹੋਮ ਸਕ੍ਰੀਨ ਅਤੇ ਐਪ ਡ੍ਰਾਅਰ ਵਿੱਚ ਦਿਖਾਈ ਦੇਵੇਗਾ। ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਹਮੇਸ਼ਾਂ ਡਿਫੌਲਟ Signal ਆਈਕਨ ਅਤੇ ਨਾਮ ਦਿਖਾਈ ਦੇਵੇਗਾ। ਹੋਰ ਜਾਣੋ</string>
+    <string name="preferences__app_icon_warning_learn_more">ਕੋਈ ਐਪ ਆਈਕਨ ਅਤੇ ਨਾਮ ਚੁਣੋ, ਜੋ ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੀ ਹੋਮ ਸਕ੍ਰੀਨ ਅਤੇ ਐਪ ਡ੍ਰਾਅਰ ਵਿੱਚ ਦਿਖਾਈ ਦੇਵੇਗਾ। ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਹਮੇਸ਼ਾਂ ਡਿਫੌਲਟ Molly ਆਈਕਨ ਅਤੇ ਨਾਮ ਦਿਖਾਈ ਦੇਵੇਗਾ। ਹੋਰ ਜਾਣੋ</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">ਐਪ ਆਈਕਨ ਅਤੇ ਨਾਮ ਹੋਮ ਸਕ੍ਰੀਨ ਅਤੇ ਐਪ ਡ੍ਰਾਅਰ ਵਿੱਚ ਦਿਖਾਈ ਦਿੰਦੇ ਹਨ।</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਹਮੇਸ਼ਾਂ ਡਿਫੌਲਟ Signal ਆਈਕਨ ਅਤੇ ਨਾਮ ਦਿਖਾਈ ਦੇਵੇਗਾ।</string>
+    <string name="preferences__app_icon_notification_warning">ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਹਮੇਸ਼ਾਂ ਡਿਫੌਲਟ Molly ਆਈਕਨ ਅਤੇ ਨਾਮ ਦਿਖਾਈ ਦੇਵੇਗਾ।</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">ਹੋਰ ਜਾਣੋ</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">ਅਜਿਹਾ ਕਰਨ ਨਾਲ ਸਾਰੀਆਂ ਚੈਟਾਂ ਨੂੰ ਸਭ ਤੋਂ ਤਾਜ਼ਾ %1$s ਸੁਨੇਹਿਆਂ ਤੱਕ ਸਥਾਈ ਤੌਰ ’ਤੇ ਟ੍ਰਿਮ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">ਅਜਿਹਾ ਕਰਨ \'ਤੇ ਤੁਹਾਡੇ ਡਿਵਾਈਸ ਵਿੱਚੋਂ ਸਾਰੇ ਪੁਰਾਣੇ ਸੁਨੇਹੇ ਅਤੇ ਮੀਡੀਆ ਸਥਾਈ ਤੌਰ \'ਤੇ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">ਅਜਿਹਾ ਕਰਨ \'ਤੇ ਇਸ ਡਿਵਾਈਸ ਅਤੇ ਕਿਸੇ ਵੀ ਲਿੰਕ ਕੀਤੇ ਡਿਵਾਈਸ ਵਿੱਚੋਂ ਸਾਰੇ ਪੁਰਾਣੇ ਸੁਨੇਹਿਆਂ ਅਤੇ ਮੀਡੀਆ ਨੂੰ ਸਥਾਈ ਤੌਰ \'ਤੇ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">ਕੀ ਤੁਸੀਂ ਪੱਕਾ ਸਾਰੇ ਪੁਰਾਣੇ ਸੁਨੇਹਿਆਂ ਨੂੰ ਮਿਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">ਸਾਰੇ ਪੁਰਾਣੇ ਸੁਨੇਹਿਆਂ ਨੂੰ ਸਥਾਈ ਤੌਰ \'ਤੇ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਤੁਸੀਂ ਅਣ-ਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕੋਗੇ।</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">ਸਾਰੇ ਪੁਰਾਣੇ ਸੁਨੇਹਿਆਂ ਨੂੰ ਸਾਰੇ ਡਿਵਾਈਸਾਂ ਵਿੱਚੋਂ ਸਥਾਈ ਤੌਰ \'ਤੇ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਤੁਸੀਂ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।</string>
     <string name="preferences_storage__delete_all_now">ਹੁਣੇ ਸਭ ਮਿਟਾਓ</string>
     <string name="preferences_storage__forever">ਹਮੇਸ਼ਾਂ</string>
     <string name="preferences_storage__one_year">1 ਸਾਲ</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">ਸੈਂਸਰਸ਼ਿਪ ਦਾ ਹੱਲ</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">ਸੈਂਸਰਸ਼ਿਪ ਦਾ ਹੱਲ</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">ਸਮਰੱਥ ਕੀਤੇ ਹੋਣ \'ਤੇ, Signal ਸੈਂਸਸ਼ਿਪ ਨੂੰ ਝਾਂਸਾ ਦੇਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੇਗੀ. ਇਸ ਫੀਚਰ ਨੂੰ ਸਮਰੱਥ ਨਾ ਕਰੋ ਜਦੋਂ ਤੱਕ ਕਿ ਤੁਸੀਂ ਕਿਸੇ ਅਜਿਹੇ ਟਿਕਾਣੇ \'ਤੇ ਨਾ ਹੋਵੋ ਜਿੱਥੇ Signal ਸੈਂਸਰਡ ਹੋਵੇ.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">ਸਮਰੱਥ ਕੀਤੇ ਹੋਣ \'ਤੇ, Molly ਸੈਂਸਸ਼ਿਪ ਨੂੰ ਝਾਂਸਾ ਦੇਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੇਗੀ. ਇਸ ਫੀਚਰ ਨੂੰ ਸਮਰੱਥ ਨਾ ਕਰੋ ਜਦੋਂ ਤੱਕ ਕਿ ਤੁਸੀਂ ਕਿਸੇ ਅਜਿਹੇ ਟਿਕਾਣੇ \'ਤੇ ਨਾ ਹੋਵੋ ਜਿੱਥੇ Molly ਸੈਂਸਰਡ ਹੋਵੇ.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">ਤੁਹਾਡੇ ਮੌਜੂਦਾ ਫੋਨ ਨੰਬਰ ਦੇ ਅਧਾਰ \'ਤੇ ਸੈਂਸਰਸ਼ਿਪ ਤਰਤੀਬ ਨੂੰ ਐਕਟੀਵੇਟ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">ਪੇਸ਼ ਕਰਦੇ ਹਾਂ: ਭੁਗਤਾਨ</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">ਇੱਕ ਨਵੀਂ ਪਰਦੇਦਾਰੀ ਉੱਤੇ ਅਧਾਰਿਤ ਡਿਜੀਟਲ ਕਰੰਸੀ, MobileCoin ਭੇਜਣ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ Signal ਦੀ ਵਰਤੋਂ ਕਰੋ। ਸ਼ੁਰੂਆਤ ਕਰਨ ਲਈ ਭੁਗਤਾਨ ਫੀਚਰ ਐਕਟੀਵੇਟ ਕਰੋ।</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">ਇੱਕ ਨਵੀਂ ਪਰਦੇਦਾਰੀ ਉੱਤੇ ਅਧਾਰਿਤ ਡਿਜੀਟਲ ਕਰੰਸੀ, MobileCoin ਭੇਜਣ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ Molly ਦੀ ਵਰਤੋਂ ਕਰੋ। ਸ਼ੁਰੂਆਤ ਕਰਨ ਲਈ ਭੁਗਤਾਨ ਫੀਚਰ ਐਕਟੀਵੇਟ ਕਰੋ।</string>
     <string name="PaymentsHomeFragment__activate_payments">ਭੁਗਤਾਨ ਨੂੰ ਸਰਗਰਮ ਕਰੋ</string>
     <string name="PaymentsHomeFragment__activating_payments">ਭੁਗਤਾਨ ਨੂੰ ਸਰਗਰਮ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">ਭੁਗਤਾਨ ਖਾਤਾ ਬਹਾਲ ਕਰੋ</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">ਭੁਗਤਾਨ ਤੁਹਾਡੇ ਖੇਤਰ ਵਿੱਚ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">ਭੁਗਤਾਨ ਨੂੰ ਸਮਰੱਥ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">ਭੁਗਤਾਨ ਨੂੰ ਅਕਿਰਿਆਸ਼ੀਲ ਕਰਨਾ ਹੈ?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">ਜੇ ਤੁਸੀਂ ਭੁਗਤਾਨਾਂ ਨੂੰ ਅਕਿਰਿਆਸ਼ੀਲ ਕਰਦੇ ਹੋ ਤਾਂ ਤੁਸੀਂ Signal ਵਿੱਚ Mobilecoin ਭੇਜ ਜਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕੋਗੇ।</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">ਜੇ ਤੁਸੀਂ ਭੁਗਤਾਨਾਂ ਨੂੰ ਅਕਿਰਿਆਸ਼ੀਲ ਕਰਦੇ ਹੋ ਤਾਂ ਤੁਸੀਂ Molly ਵਿੱਚ Mobilecoin ਭੇਜ ਜਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕੋਗੇ।</string>
     <string name="PaymentsHomeFragment__deactivate">ਅਕਿਰਿਆਸ਼ੀਲ ਕਰੋ</string>
     <string name="PaymentsHomeFragment__continue">ਜਾਰੀ ਰੱਖੋ</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">ਫਿਲਹਾਲ ਬਕਾਇਆ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">ਵੇਰਵਾ</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">ਤੁਸੀਂ MobileCoin ਭੇਜਣ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ Signal ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ। ਸਾਰੇ ਭੁਗਤਾਨ MobileCoins ਅਤੇ MobileCoin ਵਾਲੇਟ ਦੀ ਵਰਤੋਂ ਦੇ ਨਿਯਮਾਂ ਦੇ ਅਧੀਨ ਹਨ। ਤੁਹਾਨੂੰ ਕੁਝ ਸਮੱਸਿਆਵਾਂ ਦਾ ਸਾਹਮਣਾ ਕਰਨਾ ਪੈ ਸਕਦਾ ਹੈ ਅਤੇ ਜਿਹੜੇ ਭੁਗਤਾਨ ਜਾਂ ਬੈਲੈਂਸ ਤੁਸੀਂ ਗੁਆ ਦਿੰਦੇ ਹੋ, ਸ਼ਾਇਦ ਤੁਸੀਂ ਉਸਨੂੰ ਮੁੜ ਪ੍ਰਾਪਤ ਨਾ ਕਰ ਸਕੋ। </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">ਤੁਸੀਂ MobileCoin ਭੇਜਣ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ Molly ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ। ਸਾਰੇ ਭੁਗਤਾਨ MobileCoins ਅਤੇ MobileCoin ਵਾਲੇਟ ਦੀ ਵਰਤੋਂ ਦੇ ਨਿਯਮਾਂ ਦੇ ਅਧੀਨ ਹਨ। ਤੁਹਾਨੂੰ ਕੁਝ ਸਮੱਸਿਆਵਾਂ ਦਾ ਸਾਹਮਣਾ ਕਰਨਾ ਪੈ ਸਕਦਾ ਹੈ ਅਤੇ ਜਿਹੜੇ ਭੁਗਤਾਨ ਜਾਂ ਬੈਲੈਂਸ ਤੁਸੀਂ ਗੁਆ ਦਿੰਦੇ ਹੋ, ਸ਼ਾਇਦ ਤੁਸੀਂ ਉਸਨੂੰ ਮੁੜ ਪ੍ਰਾਪਤ ਨਾ ਕਰ ਸਕੋ। </string>
     <string name="PaymentsHomeFragment__activate">ਕਿਰਿਆਸ਼ੀਲ ਕਰੋ</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoin ਨਿਯਮ ਦੇਖੋ</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Signal ਵਿੱਚ ਭੁਗਤਾਨ ਹੁਣ ਉਪਲਬਧ ਨਹੀਂ ਰਹੇ। ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਕਿਸੇ ਐਕਸਚੇਂਜ ਵਿੱਚ ਫੰਡ ਟ੍ਰਾਂਸਫ਼ਰ ਕਰ ਸਕਦੇ ਹੋ ਪਰ ਤੁਸੀਂ ਹੁਣ ਭੁਗਤਾਨ ਭੇਜ ਅਤੇ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੇ ਜਾਂ ਫੰਡ ਸ਼ਾਮਲ ਨਹੀਂ ਕਰ ਸਕਦੇ।</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Molly ਵਿੱਚ ਭੁਗਤਾਨ ਹੁਣ ਉਪਲਬਧ ਨਹੀਂ ਰਹੇ। ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਕਿਸੇ ਐਕਸਚੇਂਜ ਵਿੱਚ ਫੰਡ ਟ੍ਰਾਂਸਫ਼ਰ ਕਰ ਸਕਦੇ ਹੋ ਪਰ ਤੁਸੀਂ ਹੁਣ ਭੁਗਤਾਨ ਭੇਜ ਅਤੇ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੇ ਜਾਂ ਫੰਡ ਸ਼ਾਮਲ ਨਹੀਂ ਕਰ ਸਕਦੇ।</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">ਇਜਾਜ਼ਤਾਂ ਦੀ ਮਨਜ਼ੂਰੀ ਦਿਓ</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">ਤੁਹਾਡੀ ਜਾਣ-ਪਛਾਣ ਦੇ ਲੋਕਾਂ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜਣ ਵਿੱਚ ਤੁਹਾਡੀ ਮਦਦ ਕਰਨ ਲਈ, Signal ਤੁਹਾਡੇ ਕੋਲੋਂ ਇਹ ਇਜਾਜ਼ਤਾਂ ਮੰਗੇਗਾ। </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">ਤੁਹਾਡੀ ਜਾਣ-ਪਛਾਣ ਦੇ ਲੋਕਾਂ ਨੂੰ ਸੁਨੇਹਾ ਭੇਜਣ ਵਿੱਚ ਤੁਹਾਡੀ ਮਦਦ ਕਰਨ ਲਈ, Molly ਤੁਹਾਡੇ ਕੋਲੋਂ ਇਹ ਇਜਾਜ਼ਤਾਂ ਮੰਗੇਗਾ। </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">ਸੂਚਨਾਵਾਂ</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">ਅਗਲਾ</string>
     <string name="PaymentsTransferFragment__invalid_address">ਸਿਰਨਾਵਾਂ ਗੈਰਵਾਜਬ ਹੈ</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">ਉਸ ਵਾਲੇਟ ਪਤੇ ਦੀ ਜਾਂਚ ਕਰੋ ਜਿਸ ਵਿੱਚ ਤੁਸੀਂ ਟ੍ਰਾਂਸਫ਼ਰ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਰਹੇ ਹੋ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">ਤੁਸੀਂ ਆਪਣੇ ਖੁਦ ਦੇ Signal ਵਾਲੇਟ ਪਤੇ ’ਤੇ ਟ੍ਰਾਂਸਫ਼ਰ ਨਹੀਂ ਕਰ ਸਕਦੇ। ਕਿਸੇ ਸਮਰਥਨ ਕਰਦੀ ਐਕਸਚੇਂਜ ਵਿਖੇ ਆਪਣੇ ਖਾਤੇ ਤੋਂ ਵਾਲੇਟ ਪਤਾ ਦਾਖਲ ਕਰੋ।</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR ਕੋਡ ਸਕੈਨ ਕਰਨ ਲਈ Signal ਨੂੰ ਕੈਮਰੇ ਨੂੰ ਐਕਸੈਸ ਕਰਨ ਲਈ ਇਜਾਜ਼ਤ ਚਾਹੀਦੀ ਹੈ।</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QR ਕੋਡ ਨੂੰ ਖਿੱਚਣ ਲਈ Signal ਨੂੰ ਕੈਮਰੇ ਦੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। ਸੈਟਿੰਗਾਂ ’ਤੇ ਜਾਓ, \"ਇਜਾਜ਼ਤਾਂ\" ਦੀ ਚੋਣ ਕਰੋ, ਅਤੇ \"ਕੈਮਰਾ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR ਕੋਡ ਸਕੈਨ ਕਰਨ ਲਈ Signal ਨੂੰ ਕੈਮਰੇ ਨੂੰ ਐਕਸੈਸ ਕਰਨ ਲਈ ਇਜਾਜ਼ਤ ਚਾਹੀਦੀ ਹੈ।</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">ਤੁਸੀਂ ਆਪਣੇ ਖੁਦ ਦੇ Molly ਵਾਲੇਟ ਪਤੇ ’ਤੇ ਟ੍ਰਾਂਸਫ਼ਰ ਨਹੀਂ ਕਰ ਸਕਦੇ। ਕਿਸੇ ਸਮਰਥਨ ਕਰਦੀ ਐਕਸਚੇਂਜ ਵਿਖੇ ਆਪਣੇ ਖਾਤੇ ਤੋਂ ਵਾਲੇਟ ਪਤਾ ਦਾਖਲ ਕਰੋ।</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR ਕੋਡ ਸਕੈਨ ਕਰਨ ਲਈ Molly ਨੂੰ ਕੈਮਰੇ ਨੂੰ ਐਕਸੈਸ ਕਰਨ ਲਈ ਇਜਾਜ਼ਤ ਚਾਹੀਦੀ ਹੈ।</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QR ਕੋਡ ਨੂੰ ਖਿੱਚਣ ਲਈ Molly ਨੂੰ ਕੈਮਰੇ ਦੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। ਸੈਟਿੰਗਾਂ ’ਤੇ ਜਾਓ, \"ਇਜਾਜ਼ਤਾਂ\" ਦੀ ਚੋਣ ਕਰੋ, ਅਤੇ \"ਕੈਮਰਾ\" ਨੂੰ ਸਮਰੱਥ ਕਰੋ।</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR ਕੋਡ ਸਕੈਨ ਕਰਨ ਲਈ Molly ਨੂੰ ਕੈਮਰੇ ਨੂੰ ਐਕਸੈਸ ਕਰਨ ਲਈ ਇਜਾਜ਼ਤ ਚਾਹੀਦੀ ਹੈ।</string>
     <string name="PaymentsTransferFragment__settings">ਸੈਟਿੰਗਾਂ</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Signal ਵੌਇਸ ਕਾਲ ਆ ਰਹੀ ਹੈ</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Molly ਵੌਇਸ ਕਾਲ ਆ ਰਹੀ ਹੈ</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Signal ਵੀਡੀਓ ਕਾਲ ਆ ਰਹੀ ਹੈ</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Molly ਵੀਡੀਓ ਕਾਲ ਆ ਰਹੀ ਹੈ</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">ਆ ਰਹੀ Signal ਗਰੁੱਪ ਕਾਲ</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">ਆ ਰਹੀ Molly ਗਰੁੱਪ ਕਾਲ</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Signal ਵੌਇਸ ਕਾਲ ਚੱਲ ਰਹੀ ਹੈ</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Molly ਵੌਇਸ ਕਾਲ ਚੱਲ ਰਹੀ ਹੈ</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Signal ਵੀਡੀਓ ਕਾਲ ਚੱਲ ਰਹੀ ਹੈ</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Molly ਵੀਡੀਓ ਕਾਲ ਚੱਲ ਰਹੀ ਹੈ</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Signal ਗਰੁੱਪ ਕਾਲ ਚੱਲ ਰਹੀ ਹੈ</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Molly ਗਰੁੱਪ ਕਾਲ ਚੱਲ ਰਹੀ ਹੈ</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ …</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">ਤਸਦੀਕ ਕਰੋ</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">ਤੁਸੀਂ ਆਪਣਾ ਬੈਕਅੱਪ ਪਾਸਫ਼੍ਰੇਜ਼ ਕਾਮਯਾਬੀ ਨਾਲ ਭਰਿਆ ਹੈ</string>
     <string name="BackupDialog_passphrase_was_not_correct">ਪਾਸਫ਼੍ਰੇਜ਼ ਸਹੀ ਨਹੀਂ ਹੈ</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signal ਬੈਕਅੱਪ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Molly ਬੈਕਅੱਪ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Signal ਦੇ ਬੈਕਅੱਪ ਦੀ ਤਸਦੀਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Molly ਦੇ ਬੈਕਅੱਪ ਦੀ ਤਸਦੀਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…</string>
     <string name="LocalBackupJobApi29_backup_failed">ਬੈਕਅੱਪ ਅਸਫ਼ਲ ਹੈ</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">ਤੁਹਾਡੀ ਬੈਕਅੱਪ ਡਾਇਰੈਕਟਰੀ ਨੂੰ ਮਿਟਾਇਆ ਜਾਂ ਮੂਵ ਕੀਤਾ ਗਿਆ ਹੈ।</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">ਤੁਹਾਡੀ ਬੈਕਅੱਪ ਫਾਇਲ ਇਸ ਵਾਲੀਅਮ ਉੱਤੇ ਸੰਭਾਲਣ ਲਈ ਬਹੁਤ ਵੱਡੀ ਹੈ।</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">ਮੈਨੂੰ ਕਾਲ ਕਰੋ (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">ਕੋਡ ਦੁਬਾਰਾ ਭੇਜੋ (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">ਸੰਪਰਕ Signal ਸਹਾਇਤਾ</string>
-    <string name="RegistrationActivity_code_support_subject">Signal ਰਜਿਸਟ੍ਰੇਸ਼ਨ - ਐਂਡਰਾਇਡ ਲਈ ਪੁਸ਼ਟੀਕਰਣ ਕੋਡ</string>
+    <string name="RegistrationActivity_contact_signal_support">ਸੰਪਰਕ Molly ਸਹਾਇਤਾ</string>
+    <string name="RegistrationActivity_code_support_subject">Molly ਰਜਿਸਟ੍ਰੇਸ਼ਨ - ਐਂਡਰਾਇਡ ਲਈ ਪੁਸ਼ਟੀਕਰਣ ਕੋਡ</string>
     <string name="RegistrationActivity_incorrect_code">ਗਲਤ ਕੋਡ</string>
     <string name="BackupUtil_never">ਕਦੇ ਨਹੀਂ</string>
     <string name="BackupUtil_unknown">ਅਣਜਾਣ</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">ਫ਼ੋਨ ਨੰਬਰ</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">ਚੁਣੋ ਕਿ ਤੁਹਾਡਾ ਫ਼ੋਨ ਨੰਬਰ ਕੌਣ ਦੇਖ ਸਕਦਾ ਹੈ ਅਤੇ ਕੌਣ ਤੁਹਾਡੇ ਨਾਲ Signal \'ਤੇ ਸੰਪਰਕ ਕਰ ਸਕਦਾ ਹੈ।</string>
+    <string name="preferences_app_protection__choose_who_can_see">ਚੁਣੋ ਕਿ ਤੁਹਾਡਾ ਫ਼ੋਨ ਨੰਬਰ ਕੌਣ ਦੇਖ ਸਕਦਾ ਹੈ ਅਤੇ ਕੌਣ ਤੁਹਾਡੇ ਨਾਲ Molly \'ਤੇ ਸੰਪਰਕ ਕਰ ਸਕਦਾ ਹੈ।</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">ਮੇਰਾ ਨੰਬਰ ਕੌਣ ਦੇਖ ਸਕਦਾ ਹੈ</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">ਤੁਸੀਂ ਬਹੁਤ ਸਾਰੀਆਂ ਕੋਸ਼ਿਸ਼ਾਂ ਕਰ ਲਈਆਂ ਹਨ। ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।</string>
     <string name="RegistrationActivity_error_connecting_to_service">ਸੇਵਾ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਤਰੁੱਟੀ</string>
     <string name="preferences_chats__backups">ਬੈਕਅੱਪ</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal ਲਾਕ ਹੈ</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly ਲਾਕ ਹੈ</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">ਅਨਲੌਕ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ</string>
     <string name="Recipient_unknown">ਅਣਜਾਣ</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">ਤੁਹਾਨੂੰ ਆਪਣੀ ਪੁਰਾਣੀ ਡਿਵਾਈਸ ਤੱਕ ਪਹੁੰਚ ਦੀ ਲੋੜ ਹੈ।</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">ਬੈਕਅੱਪ ਤੋਂ ਬਹਾਲ ਕਰੋ</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">ਸਥਾਨਕ ਬੈਕਅੱਪ ਤੋਂ ਆਪਣੇ ਸੁਨੇਹਿਆਂ ਨੂੰ ਬਹਾਲ ਕਰੋ | ਜੇਕਰ ਤੁਸੀਂ ਹੁਣੇ ਬਹਾਲ ਨਹੀਂ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਸੀਂ ਬਾਅਦ ਵਿੱਚ ਬਹਾਲ ਨਹੀਂ ਕਰ ਸਕੋਗੇ।</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">ਸਥਾਨਕ ਬੈਕਅੱਪ ਰੀਸਟੋਰ ਕਰੋ</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signal ਬੈਕਅੱਪ ਨੂੰ ਰੀਸਟੋਰ ਕਰੋ</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">ਆਪਣੇ ਸਾਰੇ ਟੈਕਸਟ ਸੁਨੇਹੇ + ਆਪਣਾ ਪਿਛਲੇ 30 ਦਿਨਾਂ ਦਾ ਮੀਡੀਆ ਰੀਸਟੋਰ ਕਰੋ</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">ਹੋਰ ਵਿਕਲਪ</string>
 
+    <string name="TransferOrRestoreFragment__cancel">ਰੱਦ ਕਰੋ</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">ਟ੍ਰਾਂਸਫਰ ਕੀਤੇ ਬਿਨਾਂ ਲੌਗ ਇਨ ਕਰੋ</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">ਆਪਣੇ ਸੁਨੇਹੇ ਅਤੇ ਮੀਡੀਆ ਟ੍ਰਾਂਸਫਰ ਕੀਤੇ ਬਿਨਾਂ ਜਾਰੀ ਰੱਖੋ</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">ਆਪਣੇ ਪੁਰਾਣੇ Android ਫ਼ੋਨ ਉੱਤੇ Signal ਖੋਲ੍ਹੋ</string>
     <string name="NewDeviceTransferInstructions__continue">ਜਾਰੀ ਰੱਖੋ</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">ਪੁਰਾਣੀ Android ਡਿਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਦੀ ਤਿਆਰੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">ਬਸ ਕੁਝ ਪਲਾਂ ਦੀ ਦੇਰ, ਛੇਤੀ ਹੀ ਤਿਆਰ ਹੋਵੇਗਾ</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">ਪੁਰਾਣੀ Android ਡਿਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਦੀ ਉਡੀਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">ਤੁਹਾਡੀ ਪੁਰਾਣੀ Android ਡਿਵਾਈਸ ਨੂੰ ਲੱਭਣ ਅਤੇ ਕਨੈਕਟ ਕਰਨ ਲਈ Signal ਨੂੰ ਟਿਕਾਣੇ ਦੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ।</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">ਤੁਹਾਡੀ ਪੁਰਾਣੀ Android ਡਿਵਾਈਸ ਨੂੰ ਲੱਭਣ ਅਤੇ ਕਨੈਕਟ ਕਰਨ ਲਈ Signal ਨੂੰ ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ ਸਮਰੱਥ ਕੀਤੇ ਹੋਣ ਦੀ ਲੋੜ ਹੈ।</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">ਤੁਹਾਡੀ ਪੁਰਾਣੀ Android ਡਿਵਾਈਸ ਨੂੰ ਲੱਭਣ ਅਤੇ ਕਨੈਕਟ ਕਰਨ ਲਈ Signal ਨੂੰ Wi-Fi ਚਾਲੂ ਕੀਤੇ ਹੋਣ ਦੀ ਲੋੜ ਹੈ। Wi-Fi ਦਾ ਚਾਲੂ ਹੋਣਾ ਜ਼ਰੂਰੀ ਹੈ ਪਰ ਇਸਦਾ ਕਿਸੇ Wi-Fi ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਹੋਣਾ ਜ਼ਰੂਰੀ ਨਹੀਂ।</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">ਅਫ਼ਸੋਸ, ਜਾਪਦਾ ਹੈ ਕਿ ਇਹ ਡਿਵਾਈਸ Wi-Fi ਡਾਇਰੈਕਟ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ। Signal ਸਿਗਨਲ ਤੁਹਾਡੀ ਪੁਰਾਣੀ Android ਡਿਵਾਈਸ ਨੂੰ ਲੱਭਣ ਅਤੇ ਕਨੈਕਟ ਕਰਨ ਲਈ Wi-Fi ਡਾਇਰੈਕਟ ਦੀ ਵਰਤੋਂ ਕਰਦਾ ਹੈ। ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਆਪਣੀ ਪੁਰਾਣੀ Android ਡਿਵਾਈਸ ਤੋਂ ਆਪਣੇ ਖਾਤੇ ਨੂੰ ਬਹਾਲ ਕਰਨ ਲਈ ਬੈਕਅੱਪ ਨੂੰ ਬਹਾਲ ਕਰ ਸਕਦੇ ਹੋ।</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">ਤੁਹਾਡੀ ਪੁਰਾਣੀ Android ਡਿਵਾਈਸ ਨੂੰ ਲੱਭਣ ਅਤੇ ਕਨੈਕਟ ਕਰਨ ਲਈ Molly ਨੂੰ ਟਿਕਾਣੇ ਦੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ।</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">ਤੁਹਾਡੀ ਪੁਰਾਣੀ Android ਡਿਵਾਈਸ ਨੂੰ ਲੱਭਣ ਅਤੇ ਕਨੈਕਟ ਕਰਨ ਲਈ Molly ਨੂੰ ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ ਸਮਰੱਥ ਕੀਤੇ ਹੋਣ ਦੀ ਲੋੜ ਹੈ।</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">ਤੁਹਾਡੀ ਪੁਰਾਣੀ Android ਡਿਵਾਈਸ ਨੂੰ ਲੱਭਣ ਅਤੇ ਕਨੈਕਟ ਕਰਨ ਲਈ Molly ਨੂੰ Wi-Fi ਚਾਲੂ ਕੀਤੇ ਹੋਣ ਦੀ ਲੋੜ ਹੈ। Wi-Fi ਦਾ ਚਾਲੂ ਹੋਣਾ ਜ਼ਰੂਰੀ ਹੈ ਪਰ ਇਸਦਾ ਕਿਸੇ Wi-Fi ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਹੋਣਾ ਜ਼ਰੂਰੀ ਨਹੀਂ।</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">ਅਫ਼ਸੋਸ, ਜਾਪਦਾ ਹੈ ਕਿ ਇਹ ਡਿਵਾਈਸ Wi-Fi ਡਾਇਰੈਕਟ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ। Molly ਸਿਗਨਲ ਤੁਹਾਡੀ ਪੁਰਾਣੀ Android ਡਿਵਾਈਸ ਨੂੰ ਲੱਭਣ ਅਤੇ ਕਨੈਕਟ ਕਰਨ ਲਈ Wi-Fi ਡਾਇਰੈਕਟ ਦੀ ਵਰਤੋਂ ਕਰਦਾ ਹੈ। ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਆਪਣੀ ਪੁਰਾਣੀ Android ਡਿਵਾਈਸ ਤੋਂ ਆਪਣੇ ਖਾਤੇ ਨੂੰ ਬਹਾਲ ਕਰਨ ਲਈ ਬੈਕਅੱਪ ਨੂੰ ਬਹਾਲ ਕਰ ਸਕਦੇ ਹੋ।</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">ਬੈਕਅੱਪ ਬਹਾਲ ਕਰੋ</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">ਤੁਹਾਡੀ ਪੁਰਾਣੀ Android ਡਿਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਦੇ ਸਮੇਂ ਕੋਈ ਅਚਨਚੇਤ ਤਰੁੱਟੀ ਆਈ।</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">ਨਵੀਂ Android ਡਿਵਾਈਸ ਨੂੰ ਲੱਭਿਆ ਜਾ ਰਿਹਾ ਹੈ…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">ਤੁਹਾਡੀ ਨਵੀਂ Android ਡਿਵਾਈਸ ਨੂੰ ਲੱਭਣ ਅਤੇ ਕਨੈਕਟ ਕਰਨ ਲਈ Signal ਨੂੰ ਟਿਕਾਣੇ ਦੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ।</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">ਤੁਹਾਡੀ ਨਵੀਂ Android ਡਿਵਾਈਸ ਨੂੰ ਲੱਭਣ ਅਤੇ ਕਨੈਕਟ ਕਰਨ ਲਈ Signal ਨੂੰ ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ ਸਮਰੱਥ ਕੀਤੇ ਹੋਣ ਦੀ ਲੋੜ ਹੈ।</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">ਤੁਹਾਡੀ ਨਵੀਂ Android ਡਿਵਾਈਸ ਨੂੰ ਲੱਭਣ ਅਤੇ ਕਨੈਕਟ ਕਰਨ ਲਈ Signal ਨੂੰ Wi-Fi ਚਾਲੂ ਕੀਤੇ ਹੋਣ ਦੀ ਲੋੜ ਹੈ। Wi-Fi ਦਾ ਚਾਲੂ ਹੋਣਾ ਜ਼ਰੂਰੀ ਹੈ ਪਰ ਇਸਦਾ ਕਿਸੇ Wi-Fi ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਹੋਣਾ ਜ਼ਰੂਰੀ ਨਹੀਂ।</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">ਅਫ਼ਸੋਸ, ਜਾਪਦਾ ਹੈ ਕਿ ਇਹ ਡਿਵਾਈਸ Wi-Fi ਡਾਇਰੈਕਟ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ। Signal ਸਿਗਨਲ ਤੁਹਾਡੀ ਨਵੀਂ Android ਡਿਵਾਈਸ ਨੂੰ ਲੱਭਣ ਅਤੇ ਕਨੈਕਟ ਕਰਨ ਲਈ Wi-Fi ਡਾਇਰੈਕਟ ਦੀ ਵਰਤੋਂ ਕਰਦਾ ਹੈ। ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਆਪਣੀ ਨਵੀਂ Android ਡਿਵਾਈਸ ਤੋਂ ਆਪਣੇ ਖਾਤੇ ਨੂੰ ਬਹਾਲ ਕਰਨ ਲਈ ਬੈਕਅੱਪ ਤਿਆਰ ਕਰ ਸਕਦੇ ਹੋ।</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">ਤੁਹਾਡੀ ਨਵੀਂ Android ਡਿਵਾਈਸ ਨੂੰ ਲੱਭਣ ਅਤੇ ਕਨੈਕਟ ਕਰਨ ਲਈ Molly ਨੂੰ ਟਿਕਾਣੇ ਦੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ।</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">ਤੁਹਾਡੀ ਨਵੀਂ Android ਡਿਵਾਈਸ ਨੂੰ ਲੱਭਣ ਅਤੇ ਕਨੈਕਟ ਕਰਨ ਲਈ Molly ਨੂੰ ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ ਸਮਰੱਥ ਕੀਤੇ ਹੋਣ ਦੀ ਲੋੜ ਹੈ।</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">ਤੁਹਾਡੀ ਨਵੀਂ Android ਡਿਵਾਈਸ ਨੂੰ ਲੱਭਣ ਅਤੇ ਕਨੈਕਟ ਕਰਨ ਲਈ Molly ਨੂੰ Wi-Fi ਚਾਲੂ ਕੀਤੇ ਹੋਣ ਦੀ ਲੋੜ ਹੈ। Wi-Fi ਦਾ ਚਾਲੂ ਹੋਣਾ ਜ਼ਰੂਰੀ ਹੈ ਪਰ ਇਸਦਾ ਕਿਸੇ Wi-Fi ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਹੋਣਾ ਜ਼ਰੂਰੀ ਨਹੀਂ।</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">ਅਫ਼ਸੋਸ, ਜਾਪਦਾ ਹੈ ਕਿ ਇਹ ਡਿਵਾਈਸ Wi-Fi ਡਾਇਰੈਕਟ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ। Molly ਸਿਗਨਲ ਤੁਹਾਡੀ ਨਵੀਂ Android ਡਿਵਾਈਸ ਨੂੰ ਲੱਭਣ ਅਤੇ ਕਨੈਕਟ ਕਰਨ ਲਈ Wi-Fi ਡਾਇਰੈਕਟ ਦੀ ਵਰਤੋਂ ਕਰਦਾ ਹੈ। ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਆਪਣੀ ਨਵੀਂ Android ਡਿਵਾਈਸ ਤੋਂ ਆਪਣੇ ਖਾਤੇ ਨੂੰ ਬਹਾਲ ਕਰਨ ਲਈ ਬੈਕਅੱਪ ਤਿਆਰ ਕਰ ਸਕਦੇ ਹੋ।</string>
     <string name="OldDeviceTransferSetup__create_a_backup">ਬੈਕਅੱਪ ਬਣਾਓ</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">ਤੁਹਾਡੀ ਨਵੀਂ Android ਡਿਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਦੇ ਸਮੇਂ ਕੋਈ ਅਚਨਚੇਤ ਤਰੁੱਟੀ ਆਈ।</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">ਡਾਟਾ ਟਰਾਂਸਫਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">ਦੋਵੇਂ ਡਿਵਾਈਸਾਂ ਨੂੰ ਇੱਕ ਦੂਜੇ ਦੇ ਨੇੜੇ ਰੱਖੋ। ਡਿਵਾਈਸਾਂ ਨੂੰ ਬੰਦ ਨਾ ਕਰੋ ਅਤੇ Signal ਨੂੰ ਖੋਲ੍ਹ ਕੇ ਰੱਖੋ। ਟ੍ਰਾਂਸਫਰ ਸਿਰੇ-ਤੋਂ-ਸਿਰੇ ਤੱਕ ਇਨਕ੍ਰਿਪਟਡ ਹੁੰਦੀ ਹੈ।</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">ਦੋਵੇਂ ਡਿਵਾਈਸਾਂ ਨੂੰ ਇੱਕ ਦੂਜੇ ਦੇ ਨੇੜੇ ਰੱਖੋ। ਡਿਵਾਈਸਾਂ ਨੂੰ ਬੰਦ ਨਾ ਕਰੋ ਅਤੇ Molly ਨੂੰ ਖੋਲ੍ਹ ਕੇ ਰੱਖੋ। ਟ੍ਰਾਂਸਫਰ ਸਿਰੇ-ਤੋਂ-ਸਿਰੇ ਤੱਕ ਇਨਕ੍ਰਿਪਟਡ ਹੁੰਦੀ ਹੈ।</string>
     <string name="DeviceTransfer__d_messages_so_far">…ਹੁਣ ਤੱਕ %1$d ਸੁਨੇਹੇ</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">ਹੁਣ ਤੱਕ %1$s %% ਸੁਨੇਹੇ…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">ਖਾਤਾ ਟ੍ਰਾਂਸਫਰ ਕਰੋ</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">ਆਪਣੇ ਨਵੇਂ Android ਡਿਵਾਈਸ ਉੱਤੇ Signal ਡਾਊਨਲੋਡ ਕਰੋ</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">ਆਪਣੇ ਨਵੇਂ Android ਡਿਵਾਈਸ ਉੱਤੇ Molly ਡਾਊਨਲੋਡ ਕਰੋ</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"\"ਖਾਤਾ ਟ੍ਰਾਂਸਫ਼ਰ ਜਾਂ ਰੀਸਟੋਰ ਕਰੋ\" ’ਤੇ ਟੈਪ ਕਰੋ"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">ਇਸ ਲਿੰਕ ਨਾਲ ਕੋਈ ਵੀ ਵਿਅਕਤੀ ਗਰੁੱਪ ਦਾ ਨਾਂ ਅਤੇ ਫ਼ੋਟੋ ਦੇਖ ਸਕਦਾ ਹੈ ਅਤੇ ਸ਼ਾਮਲ ਹੋਣ ਦੀ ਬੇਨਤੀ ਕਰ ਸਕਦਾ ਹੈ। ਇਸਨੂੰ ਉਨ੍ਹਾਂ ਲੋਕਾਂ ਨਾਲ ਸਾਂਝਾ ਕਰੋ ਜਿਨ੍ਹਾਂ \'ਤੇ ਤੁਸੀਂ ਵਿਸ਼ਵਾਸ ਕਰਦੇ ਹੋ।</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">ਇਸ ਲਿੰਕ ਨਾਲ ਕੋਈ ਵੀ ਵਿਅਕਤੀ ਗਰੁੱਪ ਦਾ ਨਾਂ ਅਤੇ ਫ਼ੋਟੋ ਦੇਖ ਸਕਦਾ ਹੈ ਅਤੇ ਗਰੁੱਪ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋ ਸਕਦਾ ਹੈ। ਇਸਨੂੰ ਉਨ੍ਹਾਂ ਲੋਕਾਂ ਨਾਲ ਸਾਂਝਾ ਕਰੋ ਜਿਨ੍ਹਾਂ \'ਤੇ ਤੁਸੀਂ ਵਿਸ਼ਵਾਸ ਕਰਦੇ ਹੋ।</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Signal ਰਾਹੀਂ ਸਾਂਝਾ ਕਰੋ</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Molly ਰਾਹੀਂ ਸਾਂਝਾ ਕਰੋ</string>
     <string name="GroupLinkBottomSheet_copy">ਕਾਪੀ ਕਰੋ</string>
     <string name="GroupLinkBottomSheet_qr_code">QR ਕੋਡ</string>
     <string name="GroupLinkBottomSheet_share">ਸਾਂਝਾ ਕਰੋ</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">MobileCoin ਬਾਰੇ</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin ਇੱਕ ਨਵੀਂ ਪਰਦੇਦਾਰੀ ਉੱਤੇ ਅਧਾਰਿਤ ਡਿਜੀਟਲ ਕਰੰਸੀ ਹੈ।</string>
     <string name="payment_info_card_adding_funds">ਫੰਡ ਸ਼ਾਮਲ ਕਰਨਾ</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">ਤੁਸੀਂ MobileCoin ਨੂੰ ਆਪਣੇ ਵਾਲੇਟ ਪਤੇ ’ਤੇ ਭੇਜ ਕੇ Signal ਵਿੱਚ ਵਰਤੋਂ ਲਈ ਫੰਡ ਪਾ ਸਕਦੇ ਹੋ।</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">ਤੁਸੀਂ MobileCoin ਨੂੰ ਆਪਣੇ ਵਾਲੇਟ ਪਤੇ ’ਤੇ ਭੇਜ ਕੇ Molly ਵਿੱਚ ਵਰਤੋਂ ਲਈ ਫੰਡ ਪਾ ਸਕਦੇ ਹੋ।</string>
     <string name="payment_info_card_cashing_out">ਨਿਵੇਸ਼ ਵੇਚਣਾ</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">ਤੁਸੀਂ MobileCoin ਦਾ ਸਮਰਥਨ ਕਰਨ ਵਾਲੇ ਐਕਸਚੇਂਜ \'ਤੇ ਕਿਸੇ ਵੀ ਸਮੇਂ MobileCoin ਨੂੰ ਨਕਦ ਲੈ ਸਕਦੇ ਹੋ। ਉਸ ਐਕਸਚੇਂਜ \'ਤੇ ਸਿਰਫ਼ ਆਪਣੇ ਖਾਤੇ ਵਿੱਚ ਟ੍ਰਾਂਸਫਰ ਕਰੋ।</string>
     <string name="payment_info_card_hide_this_card">ਇਹ ਕਾਰਡ ਲੁਕਾਉਣਾ ਹੈ?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">ਵਾਲਟ ਡਿ-ਐਕਟੀਵੇਟ ਕਰੋ</string>
     <string name="DeactivateWalletFragment__your_balance">ਤੁਹਾਡਾ ਬੈਲਨਸ</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">ਤੁਹਾਨੂੰ ਇਹ ਸਲਾਹ ਦਿੱਤੀ ਜਾਂਦੀ ਹੈ ਕਿ ਭੁਗਤਾਨ ਫੀਚਰ ਅਕਿਰਿਆਸ਼ੀਲ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਤੁਸੀਂ ਆਪਣੇ ਫੰਡ ਕਿਸੇ ਹੋਰ ਵਾਲੇਟ ਉੱਤੇ ਟ੍ਰਾਂਸਫਰ ਕਰ ਲਓ। ਜੇ ਤੁਸੀਂ ਹੁਣੇ ਆਪਣੇ ਫੰਡ ਟ੍ਰਾਂਸਫਰ ਨਹੀਂ ਕਰਦੇ ਹੋ, ਤਾਂ ਜਦੋਂ ਤੁਸੀਂ ਭੁਗਤਾਨ ਫੀਚਰ ਨੂੰ ਮੁੜ ਕਿਰਿਆਸ਼ੀਲ ਕਰੋਗੇ ਤਾਂ ਉਹ ਫੰਡ ਤੁਹਾਡੇ Signal ਨਾਲ ਲਿੰਕ ਕੀਤੇ ਹੋਏ ਵਾਲੇਟ ਵਿੱਚ ਹੀ ਰਹਿਣਗੇ।</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">ਤੁਹਾਨੂੰ ਇਹ ਸਲਾਹ ਦਿੱਤੀ ਜਾਂਦੀ ਹੈ ਕਿ ਭੁਗਤਾਨ ਫੀਚਰ ਅਕਿਰਿਆਸ਼ੀਲ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਤੁਸੀਂ ਆਪਣੇ ਫੰਡ ਕਿਸੇ ਹੋਰ ਵਾਲੇਟ ਉੱਤੇ ਟ੍ਰਾਂਸਫਰ ਕਰ ਲਓ। ਜੇ ਤੁਸੀਂ ਹੁਣੇ ਆਪਣੇ ਫੰਡ ਟ੍ਰਾਂਸਫਰ ਨਹੀਂ ਕਰਦੇ ਹੋ, ਤਾਂ ਜਦੋਂ ਤੁਸੀਂ ਭੁਗਤਾਨ ਫੀਚਰ ਨੂੰ ਮੁੜ ਕਿਰਿਆਸ਼ੀਲ ਕਰੋਗੇ ਤਾਂ ਉਹ ਫੰਡ ਤੁਹਾਡੇ Molly ਨਾਲ ਲਿੰਕ ਕੀਤੇ ਹੋਏ ਵਾਲੇਟ ਵਿੱਚ ਹੀ ਰਹਿਣਗੇ।</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">ਬਾਕੀ ਬਕਾਇਆ ਟ੍ਰਾਂਸਫ਼ਰ ਕਰੋ</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">ਟ੍ਰਾਂਸਫ਼ਰ ਕੀਤੇ ਬਿਨਾਂ ਅਕਿਰਿਆਸ਼ੀਲ ਕਰੋ</string>
     <string name="DeactivateWalletFragment__deactivate">ਅਕਿਰਿਆਸ਼ੀਲ ਕਰੋ</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">ਟ੍ਰਾਂਸਫਰ ਕੀਤੇ ਬਿਨਾ ਅਕਿਰਿਆਸ਼ੀਲ ਕਰਨਾ ਹੈ?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">ਜੇ ਤੁਸੀਂ ਭੁਗਤਾਨ ਫੀਚਰ ਨੂੰ ਮੁੜ-ਕਿਰਿਆਸ਼ੀਲ ਕਰਦੇ ਹੋ ਤਾਂ ਤੁਹਾਡਾ ਬੈਲੈਂਸ Signal ਨਾਲ ਲਿੰਕ ਕੀਤੇ ਵਾਲੇਟ ਵਿੱਚ ਹੀ ਰਹੇਗਾ।</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">ਜੇ ਤੁਸੀਂ ਭੁਗਤਾਨ ਫੀਚਰ ਨੂੰ ਮੁੜ-ਕਿਰਿਆਸ਼ੀਲ ਕਰਦੇ ਹੋ ਤਾਂ ਤੁਹਾਡਾ ਬੈਲੈਂਸ Molly ਨਾਲ ਲਿੰਕ ਕੀਤੇ ਵਾਲੇਟ ਵਿੱਚ ਹੀ ਰਹੇਗਾ।</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">ਵਾਲੇਟ ਅਕਿਰਿਆਸ਼ੀਲ ਕਰਨ ਵਿੱਚ ਤਰੁੱਟੀ।</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">ਲਾਇਸੰਸ</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">ਸ਼ਰਤਾਂ &amp; ਪਰਦੇਦਾਰੀ ਨੀਤੀ</string>
-    <string name="HelpFragment__copyright_signal_messenger">ਕਾਪੀਰਾਈਟ Signal ਮੈਸੰਜਰ</string>
+    <string name="HelpFragment__copyright_signal_messenger">ਕਾਪੀਰਾਈਟ Molly ਮੈਸੰਜਰ</string>
     <string name="HelpFragment__licenced_under_the_agplv3">GNU AGPLv3 ਅਧੀਨ ਲਾਇਸੰਸ ਦਿੱਤਾ ਗਿਆ</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">ਕੋਈ ਰੰਗ ਚੁਣੋ</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">ਸਾਂਝਾ ਕਰੋ</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">ਸਿਰਫ਼ ਐਡਮਿਨ ਹੀ ਇਸ ਗਰੁੱਪ ਵਿੱਚ ਸੁਨੇਹੇ ਭੇਜ ਸਕਦੇ ਹਨ।</string>
-    <string name="MultiselectForwardFragment__limit_reached">ਹੱਦ ਪੁੱਜੀ</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">ਤੁਸੀਂ 5 ਤੋਂ ਵੱਧ ਚੈਟਾਂ ਨੂੰ ਨਹੀਂ ਚੁਣ ਸਕਦੇ ਹੋ</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">ਹੋਰ ਜਾਣੋ</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Signal ਨੂੰ ਅੱਪਡੇਟ ਕਰੋ</string>
+    <string name="UpdateSignalExpiredDialog__title">Molly ਨੂੰ ਅੱਪਡੇਟ ਕਰੋ</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Signal ਦੇ ਇਸ ਵਰਜ਼ਨ ਦੀ ਮਿਆਦ ਪੁੱਗ ਗਈ ਹੈ। Signal ਦੀ ਵਰਤੋਂ ਜਾਰੀ ਰੱਖਣ ਲਈ ਇਸਨੂੰ ਹੁਣੇ ਅੱਪਡੇਟ ਕਰੋ।</string>
+    <string name="UpdateSignalExpiredDialog__message">Molly ਦੇ ਇਸ ਵਰਜ਼ਨ ਦੀ ਮਿਆਦ ਪੁੱਗ ਗਈ ਹੈ। Molly ਦੀ ਵਰਤੋਂ ਜਾਰੀ ਰੱਖਣ ਲਈ ਇਸਨੂੰ ਹੁਣੇ ਅੱਪਡੇਟ ਕਰੋ।</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">ਅੱਪਡੇਟ ਕਰੋ</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">ਡਿਵਾਈਸ ਰਜਿਸਟਰ ਨਹੀਂ ਹੈ</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">ਇਹ ਡਿਵਾਈਸ ਹੁਣ ਰਜਿਸਟਰ ਨਹੀਂ ਹੈ। ਇਸ ਡਿਵਾਈਸ \'ਤੇ Signal ਦੀ ਵਰਤੋਂ ਜਾਰੀ ਰੱਖਣ ਲਈ ਮੁੜ-ਰਜਿਸਟਰ ਕਰੋ।</string>
+    <string name="ReregisterSignalDialog__message">ਇਹ ਡਿਵਾਈਸ ਹੁਣ ਰਜਿਸਟਰ ਨਹੀਂ ਹੈ। ਇਸ ਡਿਵਾਈਸ \'ਤੇ Molly ਦੀ ਵਰਤੋਂ ਜਾਰੀ ਰੱਖਣ ਲਈ ਮੁੜ-ਰਜਿਸਟਰ ਕਰੋ।</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">ਮੁੜ-ਰਜਿਸਟਰ ਕਰੋ</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">ਚੋਣਕਾਰ ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ ਹੈ।</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">ਸੂਚਨਾਵਾਂ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, Signal ਨੂੰ ਉਹਨਾਂ ਨੂੰ ਦਿਖਾਉਣ ਦੀ ਇਜਾਜ਼ਤ ਚਾਹੀਦੀ ਹੈ।</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">ਸੂਚਨਾਵਾਂ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, Molly ਨੂੰ ਉਹਨਾਂ ਨੂੰ ਦਿਖਾਉਣ ਦੀ ਇਜਾਜ਼ਤ ਚਾਹੀਦੀ ਹੈ।</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">ਚਾਲੂ ਕਰੋ</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">ਅਜੇ ਤੱਕ ਕਿਸੇ ਨੇ ਜਵਾਬ ਨਹੀਂ ਦਿੱਤਾ</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">ਤੁਸੀਂ ਇਸ ਸਟੋਰੀ ਦਾ ਜਵਾਬ ਨਹੀਂ ਦੇ ਸਕਦੇ ਕਿਉਂਕਿ ਹੁਣ ਤੁਸੀਂ ਇਸ ਗਰੁੱਪ ਦੇ ਮੈਂਬਰ ਨਹੀਂ ਹੋ।</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">ਸਟੋਰੀ ਉੱਤੇ ਰਿਐਕਸ਼ਨ ਦਿੱਤਾ</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">ਸਟੋਰੀ ਉੱਤੇ ਰਿਐਕਸ਼ਨ ਦਿੱਤਾ</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">ਸਟੋਰੀ ਉੱਤੇ ਰਿਐਕਸ਼ਨ ਦਿੱਤਾ</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">ਵਿਊ</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">ਆਪਣਾ ਬੈਂਕ ਚੁਣੋ</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">%1$s ਨਾਲ ਆਪਣੇ ਦਾਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">ਆਪਣੇ ਵਾਰ-ਵਾਰ ਦਿੱਤੇ ਜਾਣ ਵਾਲੇ ਦਾਨ ਨੂੰ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ, ਆਪਣੇ ਬੈਂਕ ਤੋਂ €0,01 ਦਾ ਖਰਚਾ ਲੈਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਜਾਰੀ ਰੱਖੋ \'ਤੇ ਟੈਪ ਕਰੋ। ਇਹ ਰਕਮ ਆਪਣੇ-ਆਪ ਰਿਫੰਡ ਕਰ ਦਿੱਤੀ ਜਾਵੇਗੀ ਅਤੇ ਇਸ ਨਾਲ ਤੁਹਾਡੇ ਖਾਤੇ ਵਿੱਚੋਂ €5/ਮਹੀਨੇ ਦਾ ਦਾਨ ਡੈਬਿਟ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿੱਤੀ ਜਾਂਦੀ ਹੈ।</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">ਆਪਣੇ ਵਾਰ-ਵਾਰ ਦਿੱਤੇ ਜਾਣ ਵਾਲੇ ਦਾਨ ਨੂੰ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ, ਆਪਣੇ ਬੈਂਕ ਤੋਂ €0,01 ਦਾ ਖਰਚਾ ਲੈਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਜਾਰੀ ਰੱਖੋ \'ਤੇ ਟੈਪ ਕਰੋ। ਇਹ ਰਕਮ ਆਪਣੇ-ਆਪ ਰਿਫੰਡ ਕਰ ਦਿੱਤੀ ਜਾਵੇਗੀ ਅਤੇ ਇਸ ਨਾਲ ਤੁਹਾਡੇ ਖਾਤੇ ਵਿੱਚੋਂ %1$s/ਮਹੀਨੇ ਦਾ ਦਾਨ ਡੈਬਿਟ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿੱਤੀ ਜਾਂਦੀ ਹੈ।</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">ਜਾਰੀ ਰੱਖੋ</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">ਬੈਕਅੱਪ ਡਾਟਾ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">ਮੀਡੀਆ ਬੈਕਅੱਪ ਬੰਦ ਹੈ</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">ਤੁਹਾਡਾ Signal ਮੀਡੀਆ ਬੈਕਅੱਪ ਪਲਾਨ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ ਕਿਉਂਕਿ ਅਸੀਂ ਤੁਹਾਡੇ ਭੁਗਤਾਨ ਉੱਤੇ ਕਾਰਵਾਈ ਨਹੀਂ ਕਰ ਸਕੇ। ਤੁਹਾਡੇ ਬੈਕਅੱਪ ਵਿੱਚ ਸਟੋਰ ਕੀਤਾ ਮੀਡੀਆ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ ਤੁਹਾਡੇ ਕੋਲ %1$d ਦਿਨ ਹੈ। %1$d ਦਿਨ ਬਾਅਦ, ਤੁਹਾਡੇ ਬੈਕਅੱਪ ਵਿੱਚ ਮੌਜੂਦ ਮੀਡੀਆ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।</item>
+        <item quantity="other">ਤੁਹਾਡਾ Signal ਮੀਡੀਆ ਬੈਕਅੱਪ ਪਲਾਨ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ ਕਿਉਂਕਿ ਅਸੀਂ ਤੁਹਾਡੇ ਭੁਗਤਾਨ ਉੱਤੇ ਕਾਰਵਾਈ ਨਹੀਂ ਕਰ ਸਕੇ। ਤੁਹਾਡੇ ਬੈਕਅੱਪ ਵਿੱਚ ਸਟੋਰ ਕੀਤਾ ਮੀਡੀਆ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ ਤੁਹਾਡੇ ਕੋਲ %1$d ਦਿਨ ਹਨ। %1$d ਦਿਨਾਂ ਬਾਅਦ, ਤੁਹਾਡੇ ਬੈਕਅੱਪ ਵਿੱਚ ਮੌਜੂਦ ਮੀਡੀਆ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">ਤੁਸੀਂ ਕਿਸੇ ਵੀ ਸਮੇਂ ਦੁਬਾਰਾ ਬੈਕਅੱਪ ਲਈ ਭੁਗਤਾਨ ਕਰਕੇ ਆਪਣੇ ਸਾਰੇ ਮੀਡੀਆ ਦਾ ਬੈਕਅੱਪ ਲੈਣਾ ਜਾਰੀ ਰੱਖ ਸਕਦੇ ਹੋ। </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">ਤੁਹਾਡਾ ਮੀਡੀਆ ਅੱਜ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">ਤੁਹਾਡਾ Signal ਮੀਡੀਆ ਬੈਕਅੱਪ ਪਲਾਨ ਰੱਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ ਕਿਉਂਕਿ ਅਸੀਂ ਤੁਹਾਡੇ ਭੁਗਤਾਨ ਉੱਤੇ ਕਾਰਵਾਈ ਨਹੀਂ ਕਰ ਸਕੇ। ਤੁਹਾਡੇ ਬੈਕਅੱਪ ਵਿੱਚ ਮੌਜੂਦ ਮੀਡੀਆ ਮਿਟਾਉਣ ਤੋਂ ਪਹਿਲਾਂ ਇਸਨੂੰ ਡਾਊਨਲੋਡ ਕਰਨ ਦਾ ਇਹ ਤੁਹਾਡਾ ਕੋਲ ਆਖਰੀ ਮੌਕਾ ਹੈ।</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">ਡਾਊਨਲੋਡ ਨੂੰ ਪੂਰਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">ਤੁਹਾਡੀ ਡਿਵਾਈਸ ਵਿੱਚ ਲੋੜੀਂਦੀ ਖਾਲੀ ਥਾਂ ਨਹੀਂ ਹੈ। ਆਪਣੇ ਬੈਕਅੱਪ ਵਿੱਚ ਸਟੋਰ ਕੀਤਾ ਮੀਡੀਆ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ %1$s ਤੱਕ ਥਾਂ ਖਾਲੀ ਕਰੋ।</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">ਜੇਕਰ ਤੁਸੀਂ \"ਛੱਡੋ\" ਬਟਨ ਚੁਣਦੇ ਹੋ ਤਾਂ ਤੁਹਾਡੇ ਬੈਕਅੱਪ ਵਿੱਚ ਮੌਜੂਦ ਮੀਡੀਆ %1$d ਦਿਨ ਬਾਅਦ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।</item>
+        <item quantity="other">ਜੇਕਰ ਤੁਸੀਂ \"ਛੱਡੋ\" ਬਟਨ ਚੁਣਦੇ ਹੋ ਤਾਂ ਤੁਹਾਡੇ ਬੈਕਅੱਪ ਵਿੱਚ ਮੌਜੂਦ ਮੀਡੀਆ %1$d ਦਿਨਾਂ ਬਾਅਦ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">ਬੈਕਅੱਪ ਦੇ ਭੁਗਤਾਨ ਉੱਤੇ ਕਾਰਵਾਈ ਨਹੀਂ ਕਰ ਸਕੇ</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">ਸਾਨੂੰ ਤੁਹਾਡੇ ਵੱਲੋਂ ਹਰ ਮਹੀਨੇ ਦਿੱਤਾ ਜਾਣ ਵਾਲਾ ਬੈਕਅੱਪ ਦਾ ਭੁਗਤਾਨ ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਮੁਸ਼ਕਲ ਆ ਰਹੀ ਹੈ। ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਤੁਹਾਡੀ ਭੁਗਤਾਨ ਵਿਧੀ ਅੱਪਡੇਟ ਕੀਤੀ ਗਈ ਹੈ। ਜੇਕਰ ਅਜਿਹਾ ਨਹੀਂ ਹੈ, ਤਾਂ ਇਸਨੂੰ Google Pay ਵਿੱਚ ਜਾ ਕੇ ਅੱਪਡੇਟ ਕਰੋ। Signal ਕੁਝ ਦਿਨਾਂ ਬਾਅਦ ਦੁਬਾਰਾ ਭੁਗਤਾਨ ਉੱਤੇ ਕਾਰਵਾਈ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੇਗਾ।</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">ਬੈਕਅੱਪ ਪੂਰਾ ਨਹੀਂ ਕਰ ਸਕੇ</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">ਤੁਹਾਡੇ ਡਿਵਾਈਸ ਦਾ %1$d ਦਿਨਾਂ ਤੋਂ ਬੈਕਅੱਪ ਨਹੀਂ ਲਿਆ ਗਿਆ ਹੈ। ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਤੁਹਾਡਾ ਡਿਵਾਈਸ Wi-Fi ਨਾਲ ਕਨੈਕਟ ਹੈ ਅਤੇ \"ਹੁਣੇ ਬੈਕਅੱਪ ਲਓ\" \'ਤੇ ਟੈਪ ਕਰੋ। </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">ਹੋਰ ਜਾਣੋ</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">ਛੱਡੋ</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">ਮੀਡੀਆ ਹੁਣੇ ਡਾਊਨਲੋਡ ਕਰੋ</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">ਬਾਅਦ ਵਿੱਚ ਡਾਊਨਲੋਡ ਕਰੋ</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">ਮੀਡੀਆ ਡਾਊਨਲੋਡ ਨਾ ਕਰੋ</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">ਆਪਣਾ ਮੀਡੀਆ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ %1$s ਥਾਂ ਖਾਲੀ ਕਰੋ।</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">ਕ੍ਰੈਡਿਟ ਜਾਂ ਡੈਬਿਟ ਕਾਰਡ</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">ਅਣਜਾਣ</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">ਭੁਗਤਾਨ ਦਾ ਇਤਿਹਾਸ</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">ਤੁਹਾਡਾ ਆਖਰੀ ਬੈਕਅੱਪ %1$s ਨੂੰ %2$s ਲਿਆ ਗਿਆ ਸੀ।</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">ਚੁਣੇ ਗਏ ਸਮੇਂ ਤੋਂ ਪੁਰਾਣੇ ਸੁਨੇਹੇ ਸਥਾਈ ਤੌਰ \'ਤੇ ਮਿਟਾ ਦਿੱਤੇ ਜਾਣਗੇ।</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">ਚੁਣੀ ਗਈ ਲੰਬਾਈ ਤੋਂ ਲੰਮੇ ਸੁਨੇਹੇ ਸਥਾਈ ਤੌਰ \'ਤੇ ਮਿਟਾ ਦਿੱਤੇ ਜਾਣਗੇ।</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">ਲਿੰਕ ਕੀਤੇ ਡਿਵਾਈਸਾਂ \'ਤੇ ਸੀਮਾਵਾਂ ਲਾਗੂ ਕਰੋ</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">ਜਦੋਂ ਸਮਰੱਥ ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਤਾਂ ਚੈਟ ਸੀਮਾਵਾਂ ਤੁਹਾਡੇ ਲਿੰਕ ਕੀਤੇ ਡਿਵਾਈਸਾਂ ਵਿੱਚੋਂ ਵੀ ਸੁਨੇਹਿਆਂ ਨੂੰ ਮਿਟਾ ਦੇਣਗੀਆਂ।</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">ਮਿਟਾਉਣਾ ਦੀ ਪ੍ਰਕਿਰਿਆ ਹੁਣ ਤੁਹਾਡੇ ਸਾਰੇ ਡਿਵਾਈਸਾਂ \'ਤੇ ਸਿੰਕ ਹੋ ਜਾਵੇਗੀ</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">ਜਦੋਂ ਤੁਸੀਂ ਸੁਨੇਹਿਆਂ ਜਾਂ ਚੈਟਾਂ ਨੂੰ ਮਿਟਾਉਂਦੇ ਹੋ, ਤਾਂ ਉਹਨਾਂ ਨੂੰ ਤੁਹਾਡੇ ਫ਼ੋਨ ਅਤੇ ਲਿੰਕ ਕੀਤੇ ਡਿਵਾਈਸਾਂ ਤੋਂ ਵੀ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">ਠੀਕ ਹੈ</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">ਭੁਗਤਾਨ ਦਾ ਇਤਿਹਾਸ</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">ਟੈਕਸਟ ਅਤੇ ਸਾਰੇ ਮੀਡੀਏ ਦਾ ਬੈਕਅੱਪ</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">ਭੁਗਤਾਨ ਦੇ ਵੇਰਵੇ</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">ਬੈਕਅੱਪ ਦੀ ਕਿਸਮ</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">ਭੁਗਤਾਨ ਕਰਨ ਦੀ ਮਿਤੀ</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">ਸਾਂਝਾ ਕਰੋ</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal ਬੈਕਅੱਪ</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">ਭੁਗਤਾਨ ਦਾ ਇਤਿਹਾਸ</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">ਬੈਕਅੱਪ ਦੇ ਵੇਰਵੇ</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">ਬੈਕਅਪ ਦਾ ਆਕਾਰ</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">ਬੈਕਅੱਪ ਦੀ ਬਾਰੰਬਾਰਤਾ</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">ਸੈਲੂਲਰ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਬੈਕਅੱਪ ਲਓ</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">ਬੈਕਅੱਪ ਬੰਦ ਕਰੋ ਅਤੇ ਮਿਟਾਓ</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">ਬੈਕਅੱਪ ਮਿਟਾਇਆ ਗਿਆ ਅਤੇ ਬੰਦ ਕੀਤਾ ਗਿਆ।</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">ਬੈਕਅੱਪ ਦੀ ਕਿਸਮ ਬਦਲੀ ਗਈ ਅਤੇ ਸਬਸਕ੍ਰਿਪਸ਼ਨ ਰੱਦ ਕੀਤੀ ਗਈ</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">ਸਬਸਕ੍ਰਿਪਸ਼ਨ ਰੱਦ ਕੀਤੀ ਗਈ</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">ਡਾਊਨਲੋਡ ਪੂਰਾ ਹੋਇਆ</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">ਬੈਕਅੱਪ ਦੀ ਕਿਸਮ</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">ਬੈਕਅੱਪ ਨੂੰ ਅਸਮਰੱਥ ਕੀਤਾ ਗਿਆ</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/ਮਹੀਨਾ</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">ਬੈਕਅੱਪ ਨੂੰ ਸਮਰੱਥ ਕਰੋ</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">ਆਖਰੀ ਬੈਕਅੱਪ</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">ਕਦੇ ਨਹੀਂ</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">ਹੁਣ ਬੈਕਅੱਪ ਲਓ</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">ਕੀ ਬੈਕਅੱਪ ਬੰਦ ਕਰਕੇ ਮਿਟਾਉਣਾ ਹੈ?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">ਤੁਹਾਡੇ ਤੋਂ ਦੁਬਾਰਾ ਕੋਈ ਖਰਚਾ ਨਹੀਂ ਲਿਆ ਜਾਵੇਗਾ। ਤੁਹਾਡਾ ਬੈਕਅੱਪ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ ਅਤੇ ਕੋਈ ਨਵਾਂ ਬੈਕਅੱਪ ਨਹੀਂ ਬਣਾਇਆ ਜਾਵੇਗਾ।</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">ਬੰਦ ਕਰੋ ਅਤੇ ਮਿਟਾਓ</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">ਬੈਕਅੱਪ ਮਿਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">ਬੈਕਅੱਪ ਮਿਟਾਇਆ ਗਿਆ</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"ਹੁਣੇ ਬੈਕਅੱਪ ਕਰੋ \'ਤੇ ਟੈਪ ਕਰਕੇ"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">ਰੋਜ਼ਾਨਾ</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">ਹਫਤਾਵਾਰੀ</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">ਮਹੀਨੇਵਾਰ</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">ਖੁਦ ਬੈਕਅੱਪ ਲਓ</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਡਿਵਾਈਸ PIN, ਪਾਸਵਰਡ ਜਾਂ ਪੈਟਰਨ ਦਾਖਲ ਕਰੋ।</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">ਅੱਗੇ</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">ਬੈਕਅੱਪ ਦੀ ਕਿਸਮ ਬਦਲੋ</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">ਸਬਸਕ੍ਰਿਪਸ਼ਨ ਰੱਦ ਕਰੋ</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">ਰੱਦ ਕਰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">ਤੁਹਾਡੇ ਕੋਲੋਂ ਦੁਬਾਰਾ ਕੋਈ ਖਰਚਾ ਨਹੀਂ ਲਿਆ ਜਾਵੇਗਾ। ਤੁਹਾਡੇ ਬਿਲਿੰਗ ਚੱਕਰ ਦੇ ਅੰਤ ਵਿੱਚ ਬੈਕਅੱਪ ਲੈਣਾ ਬੰਦ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਉਸ ਮਿਤੀ ਤੋਂ ਬਾਅਦ ਤੁਹਾਡੇ ਕੋਲ ਆਪਣੇ ਬੈਕਅੱਪ ਵਿੱਚ ਮੌਜੂਦ ਮੀਡੀਆ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ 30 ਦਿਨ ਹੋਣਗੇ।</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">ਪੁਸ਼ਟੀ ਕਰੋ ਅਤੇ ਹੁਣੇ ਡਾਊਨਲੋਡ ਕਰੋ</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">ਪੁਸ਼ਟੀ ਕਰੋ ਅਤੇ ਬਾਅਦ ਵਿੱਚ ਡਾਊਨਲੋਡ ਕਰੋ</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">ਸਬਸਕ੍ਰਿਪਸ਼ਨ ਜਾਰੀ ਰੱਖੋ</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 87ca4ae0b2..166c775142 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Aktualizacja Signal…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Aktualizacja Molly…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Nie masz jeszcze ustawionego hasła!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Wyłączyć hasło?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">To spowoduje odblokowanie na stałe aplikacji Signal i powiadomień wiadomości.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">To spowoduje odblokowanie na stałe aplikacji Molly i powiadomień wiadomości.</string>
     <string name="ApplicationPreferencesActivity_disable">Wyłącz</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Błąd połączenia z serwerem!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">Blokada rejestracji wymaga kodów PIN. Aby wyłączyć PIN, wyłącz najpierw blokadę rejestracji.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Plik</string>
     <string name="AttachmentKeyboard_contact">Kontakt</string>
     <string name="AttachmentKeyboard_location">Lokalizacja</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal potrzebuje pozwolenia, aby pokazać Twoje zdjęcia i filmy</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly potrzebuje pozwolenia, aby pokazać Twoje zdjęcia i filmy</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Zezwól</string>
     <string name="AttachmentKeyboard_payment">Płatność</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Nie można znaleźć aplikacji, aby otworzyć te multimedia.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal wymaga pozwolenia na przechowywanie w celu dołączania zdjęć, filmów lub dźwięków, ale zostało one na stałe odrzucone. Przejdź do menu ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Przechowywanie\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal wymaga pozwolenia na dostęp do kontaktów w celu dołączenia informacji o kontaktach, ale zostało one na stałe odrzucone. Przejdź do menu ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Kontakty\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal wymaga pozwolenia na dostęp do lokalizacji w celu załączenia lokalizacji w wiadomościach, ale zostało one na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Lokalizacja\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly wymaga pozwolenia na przechowywanie w celu dołączania zdjęć, filmów lub dźwięków, ale zostało one na stałe odrzucone. Przejdź do menu ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Przechowywanie\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly wymaga pozwolenia na dostęp do kontaktów w celu dołączenia informacji o kontaktach, ale zostało one na stałe odrzucone. Przejdź do menu ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Kontakty\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly wymaga pozwolenia na dostęp do lokalizacji w celu załączenia lokalizacji w wiadomościach, ale zostało one na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Lokalizacja\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Zezwól na dostęp do lokalizacji</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Aby wysłać swoją lokalizację:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Zezwól Signal na wysyłanie informacji o lokalizacji.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Zezwól Molly na wysyłanie informacji o lokalizacji.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Aby udostępnić Twoją lokalizację, Signal potrzebuje dostępu do lokalizacji.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Aby udostępnić Twoją lokalizację, Molly potrzebuje dostępu do lokalizacji.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Zezwól na dostęp do pamięci</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Aby wyświetlić zdjęcia i filmy:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal potrzebuje dostępu do pamięci, aby pokazać Twoje zdjęcia i filmy.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly potrzebuje dostępu do pamięci, aby pokazać Twoje zdjęcia i filmy.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s nie aktywował(a) płatności </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Zmień aparat</string>
     <string name="CameraXFragment_open_gallery_description">Otwórz galerię</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Zezwól</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Zezwól na dostęp do aparatu i mikrofonu</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Zezwól na dostęp do aparatu</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Zezwól na dostęp do mikrofonu</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Aby móc robić zdjęcia, zezwól Signal na dostęp do aparatu.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Aby móc robić zdjęcia i nagrywać wideo, zezwól Signal na dostęp do aparatu.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Aby móc robić zdjęcia i nagrywać wideo, zezwól Signal na dostęp do aparatu i mikrofonu.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Aby móc nagrywać wideo z dźwiękiem, zezwól Signal na dostęp do mikrofonu.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Aby zeskanować kod QR, zezwól Signal na dostęp do aparatu.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Do robienia zdjęć Signal wymaga dostępu do aparatu</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Do skanowania kodów QR Signal wymaga dostępu do aparatu</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Do nagrywania wideo Signal wymaga dostępu do mikrofonu</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Aby robić zdjęcia w Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Aby móc robić zdjęcia i nagrywać wideo w aplikacji Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Aby nagrywać wideo z dźwiękiem:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Aby skanować kody QR:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Ostatnie kontakty</string>
@@ -273,7 +274,7 @@
     <string name="CameraContacts_no_signal_contacts">Brak kontaktów Signal</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Aby wysłać zdjęcia kontaktom Signal, możesz użyć tylko przycisku aparatu. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Nie możesz znaleźć kontaktu?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Zaproś kontakt do korzystania z Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Zaproś kontakt do korzystania z Molly</string>
     <string name="CameraContacts__menu_search">Szukaj</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -287,12 +288,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Nie, dzięki</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Zaktualizuj Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Zaktualizuj Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Ta wersja aplikacji nie jest już wspierana. Zaktualizuj do najnowszej wersji, aby nadal móc wysyłać i odbierać wiadomości.</string>
     <string name="ClientDeprecatedActivity_update">Uaktualnij</string>
     <string name="ClientDeprecatedActivity_dont_update">Nie aktualizuj</string>
     <string name="ClientDeprecatedActivity_warning">Uwaga</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Twoja wersja Signal wygasła. Możesz przeglądać swoją historię wiadomości, ale nie będziesz móc wysyłać ani odbierać wiadomości, dopóki jej nie zaktualizujesz.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Twoja wersja Molly wygasła. Możesz przeglądać swoją historię wiadomości, ale nie będziesz móc wysyłać ani odbierać wiadomości, dopóki jej nie zaktualizujesz.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Nie znaleziono przeglądarki internetowej.</string>
@@ -329,8 +330,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Wiadomość %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Połączenie głosowe Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Połączenie wideo Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -428,7 +429,7 @@
     <string name="ConversationActivity_transport_signal">Wiadomość Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Wyślij wiadomość</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Zacznij używać Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Zacznij używać Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Proszę wybierz kontakt</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Rozmiar tego załącznika przekracza limit wiadomości.</string>
     <string name="ConversationActivity_unable_to_record_audio">Nie udało się nagrać dźwięku!</string>
@@ -447,18 +448,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Aby wysłać wiadomości audio:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Aby wysyłać wiadomości głosowe, zezwól Signal na dostęp do mikrofonu.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Aby wysyłać wiadomości głosowe, zezwól Molly na dostęp do mikrofonu.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Aby nagrać wiadomość głosową, Signal potrzebuje dostępu do mikrofonu.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal wymaga pozwolenia na dostęp do mikrofonu w celu umożliwienia wysyłania wiadomości głosowych, ale zostało one na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Mikrofon\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Aby nagrać wiadomość głosową, Molly potrzebuje dostępu do mikrofonu.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly wymaga pozwolenia na dostęp do mikrofonu w celu umożliwienia wysyłania wiadomości głosowych, ale zostało one na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Mikrofon\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal wymaga pozwolenia na dostęp do mikrofonu i aparatu, aby zadzwonić do %1$s, ale zostały one na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Aparat\" oraz \"Mikrofon\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Aby móc robić zdjęcia i nagrywać wideo, zezwól Signal na dostęp do aparatu.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal wymaga pozwolenia na dostęp do aparatu w celu umożliwienia robienia zdjęć i nagrywania filmów, ale zostało one na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Aparat\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal wymaga pozwolenia na dostęp do aparatu w celu umożliwienia robienia zdjęć i nagrywania filmów</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly wymaga pozwolenia na dostęp do mikrofonu i aparatu, aby zadzwonić do %1$s, ale zostały one na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Aparat\" oraz \"Mikrofon\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Aby móc robić zdjęcia i nagrywać wideo, zezwól Molly na dostęp do aparatu.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly wymaga pozwolenia na dostęp do aparatu w celu umożliwienia robienia zdjęć i nagrywania filmów, ale zostało one na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Aparat\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly wymaga pozwolenia na dostęp do aparatu w celu umożliwienia robienia zdjęć i nagrywania filmów</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Włącz uprawnienia mikrofonu, aby nagrać wideo z dźwiękiem.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Aby nagrać wideo, Signal wymaga pozwolenia na dostęp do mikrofonu, ale zostało ono odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Mikrofon\" oraz \"Aparat\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Aby nagrać wideo, Signal potrzebuje dostępu do mikrofonu.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Aby nagrać wideo, Molly wymaga pozwolenia na dostęp do mikrofonu, ale zostało ono odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Mikrofon\" oraz \"Aparat\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Aby nagrać wideo, Molly potrzebuje dostępu do mikrofonu.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Nie</string>
@@ -479,9 +480,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Aby rozpocząć połączenie:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Aby rozpocząć połączenie, zezwól Signal na dostęp do mikrofonu.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Aby rozpocząć połączenie, zezwól Molly na dostęp do mikrofonu.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Aby rozpocząć połączenie, Signal potrzebuje dostępu do mikrofonu.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Aby rozpocząć połączenie, Molly potrzebuje dostępu do mikrofonu.</string>
 
 
     <string name="ConversationActivity_join">Dołącz</string>
@@ -495,9 +496,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Wiadomości SMS nie są już obsługiwane w Signal. Zaproś %1$s do Signal i kontynuujcie rozmowę tutaj.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Ta osoba nie używa już Signal. Zaproś ją do Signal i kontynuujcie rozmowę tutaj.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Ta osoba nie używa już Molly. Zaproś ją do Molly i kontynuujcie rozmowę tutaj.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Zaproś do Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Zaproś do Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Wkrótce otrzymasz kolejne przypomnienie.</string>
 
@@ -563,6 +564,8 @@
     <string name="ConversationFragment_delete_for_everyone">Usuń wszędzie</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Usuń z tego urządzenia</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Usuń</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Usuń wszędzie</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Ta wiadomość zostanie usunięta u wszystkich uczestników tego czatu, jeśli używają najnowszej wersji Signal. Będą oni mogli zobaczyć, że wiadomość została usunięta.</string>
@@ -594,13 +597,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Zablokowano</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Zaktualizuj Signal</string>
+    <string name="ConversationFragment__update_build">Zaktualizuj Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Zarejestruj ponownie w Signal</string>
+    <string name="ConversationFragment__reregister_signal">Zarejestruj ponownie w Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Wróć.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Otwórz Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Otwórz Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Już niezweryfikowany(-a)</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -669,6 +672,13 @@
         <item quantity="many">Wszystkie %1$d wybranych czatów zostanie trwale usuniętych.</item>
         <item quantity="other">Wszystkie %1$d wybranych czatów zostanie trwale usuniętych.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Wybrany czat zostanie trwale usunięty ze wszystkich Twoich urządzeń.</item>
+        <item quantity="few">Wszystkie wybrane czaty (%1$d) zostaną trwale usunięte ze wszystkich Twoich urządzeń.</item>
+        <item quantity="many">Wszystkie wybrane czaty (%1$d) zostaną trwale usunięte ze wszystkich Twoich urządzeń.</item>
+        <item quantity="other">Wszystkie wybrane czaty (%1$d) zostaną trwale usunięte ze wszystkich Twoich urządzeń.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Usuwanie…</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Usuwanie wybranego czatu…</item>
@@ -770,9 +780,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Kto może mnie znaleźć po numerze telefonu?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Każdy, kto ma Twój numer telefonu, zobaczy Cię w Signal i może rozpocząć z Tobą czat.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Każdy, kto ma Twój numer telefonu, zobaczy Cię w Molly i może rozpocząć z Tobą czat.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Nikt nie będzie mógł zobaczyć, że korzystasz z Signal, chyba że wyślesz tej osobie wiadomość lub macie już rozpoczętą rozmowę na czacie.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Nikt nie będzie mógł zobaczyć, że korzystasz z Molly, chyba że wyślesz tej osobie wiadomość lub macie już rozpoczętą rozmowę na czacie.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Przywrócić kopię zapasową?</string>
@@ -806,7 +816,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Sprawdź swoje hasło kopii zapasowej i upewnij się, że jest prawidłowe</string>
     <string name="BackupsPreferenceFragment__turn_on">Włącz</string>
     <string name="BackupsPreferenceFragment__turn_off">Wyłącz</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Aby przywrócić kopię zapasową, zainstaluj nową kopię Signal. Otwórz aplikację i stuknij \"Przywróć kopię zapasową\", a następnie wybierz folder z plikiem kopii. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Aby przywrócić kopię zapasową, zainstaluj nową kopię Molly. Otwórz aplikację i stuknij \"Przywróć kopię zapasową\", a następnie wybierz folder z plikiem kopii. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Dowiedz się więcej</string>
     <string name="BackupsPreferenceFragment__in_progress">W trakcie…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -814,7 +824,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d wiadomości…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% wiadomości…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal wymaga dostępu do pamięci zewnętrznej urządzenia, aby móc tworzyć kopie zapasowe, ale uprawnienia zostały na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Pamięć\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly wymaga dostępu do pamięci zewnętrznej urządzenia, aby móc tworzyć kopie zapasowe, ale uprawnienia zostały na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Pamięć\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Ustaw godzinę kopii zapasowej</string>
 
@@ -881,7 +891,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Sesja czatu odświeżona</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal używa szyfrowania metodą end-to-end i czasem może potrzebować odświeżenia sesji czatu. To nie wpłynie na bezpieczeństwo Twojego czatu, ale możesz przegapić wiadomość od tego kontaktu. Możesz go wtedy poprosić o ponowne przesłanie tej wiadomości.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly używa szyfrowania metodą end-to-end i czasem może potrzebować odświeżenia sesji czatu. To nie wpłynie na bezpieczeństwo Twojego czatu, ale możesz przegapić wiadomość od tego kontaktu. Możesz go wtedy poprosić o ponowne przesłanie tej wiadomości.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Użyj Signal na komputerze stacjonarnym lub iPadzie. Twoje wiadomości zostaną zsynchronizowane z powiązanymi urządzeniami.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Powiąż nowe urządzenie</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Wiadomości i informacje o czacie są zabezpieczone szyfrowaniem end-to-end na wszystkich urządzeniach</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal na komputery stacjonarne i iPady</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Wszystkie wiadomości na powiązanych urządzeniach są prywatne</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Po powiązaniu wiadomości Molly będą synchronizowane z aplikacją Molly na Twoim telefonie komórkowym. Historia poprzednich wiadomości nie będzie wyświetlana.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Wejdź na %1$s na innym urządzeniu i zainstaluj Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Moje powiązane urządzenia</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Usuń</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">Urządzenie %1$s jest odłączone</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Trwa łączenie urządzenia…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Urządzenie zatwierdzone</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Wczytywanie…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Brak powiązanych urządzeń</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Odblokuj, aby połączyć urządzenie</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Zeskanuj kod QR wyświetlony na urządzeniu, które chcesz powiązać.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Skanuj kod QR</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Zeskanuj tym urządzeniem kod QR wyświetlony na urządzeniu, które chcesz powiązać</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">OK</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">To urządzenie będzie mieć dostęp do Twoich grup, kontaktów i czatów oraz będzie mogło wysyłać wiadomości w Twoim imieniu.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Aby korzystać z tego samego konta Signal na obu urządzeniach</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Dokończ na drugim urządzeniu</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Łączenie urządzenia nie powiodło się</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Ten kod QR jest nieprawidłowy. Upewnij się, że skanujesz kod QR wyświetlany na urządzeniu, które chcesz połączyć.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Ponów</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Odłączyć \"%1$s\"?</string>
@@ -906,7 +971,7 @@
     <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Urządzenie nie wspiera Usług Play. Dotknij, aby wyłączyć systemową optymalizację baterii uniemożliwiającą odbieranie wiadomości w czasie braku aktywności.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Ta wersja Signal wygasła. Zaktualizuj teraz, aby móc wysyłać i odbierać wiadomości.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Ta wersja Molly wygasła. Zaktualizuj teraz, aby móc wysyłać i odbierać wiadomości.</string>
     <string name="ExpiredBuildReminder_update_now">Aktualizuj teraz</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -919,8 +984,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Zobacz</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanentny błąd komunikacji Signal!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal nie był w stanie zarejestrować się w Usługach Google Play. Wiadomości i połączenia Signal zostały wyłączone. Spróbuj zarejestrować się ponownie w Ustawienia &gt; Zaawansowane.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanentny błąd komunikacji Molly!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly nie był w stanie zarejestrować się w Usługach Google Play. Wiadomości i połączenia Molly zostały wyłączone. Spróbuj zarejestrować się ponownie w Ustawienia &gt; Zaawansowane.</string>
 
 
     <!-- GiphyActivity -->
@@ -1085,20 +1150,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Raporty debugowania pomagają nam odkryć przyczynę i naprawić błąd. Nie zawierają żadnych informacji identyfikujących użytkownika.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal napotkał problem. Wysłać raport debugowania?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly napotkał problem. Wysłać raport debugowania?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Powiadomienia mogą być opóźnione z powodu optymalizacji baterii</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Możesz wyłączyć optymalizację baterii dla aplikacji Signal, aby powiadomienia przychodziły bez opóźnień.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Możesz wyłączyć optymalizację baterii dla aplikacji Molly, aby powiadomienia przychodziły bez opóźnień.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Powiadomienia mogą być opóźnione z powodu optymalizacji baterii</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Wyłącz optymalizację baterii dla aplikacji Molly, aby powiadomienia przychodziły bez opóźnień. Wybierz „Kontynuuj“, aby zobaczyć instrukcje dla swojego urządzenia.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Nie dzięki</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Kontynuuj</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Kontynuuj</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Odrzuć</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Nie dzięki</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Oczekujące zaproszenia do grupy</string>
+    <string name="PendingMembersActivity_pending_group_invites">Prośby o przyjęcie i zaproszenia</string>
     <string name="PendingMembersActivity_requests">Prośby</string>
     <string name="PendingMembersActivity_invites">Zaproszenia</string>
     <string name="PendingMembersActivity_people_you_invited">Ludzie, których zaprosiłeś(aś)</string>
@@ -1361,7 +1436,7 @@
     <string name="InviteActivity_cancel">Anuluj</string>
     <string name="InviteActivity_sending">Wysyłanie…</string>
     <string name="InviteActivity_invitations_sent">Zaproszenie zostało wysłane!</string>
-    <string name="InviteActivity_invite_to_signal">Zaproś do używania Signal</string>
+    <string name="InviteActivity_invite_to_signal">Zaproś do używania Molly</string>
     <string name="InviteActivity_send_sms">Wyślij SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Wysłać %1$d zaproszenie SMS?</item>
@@ -1369,7 +1444,7 @@
         <item quantity="many">Wysłać %1$d zaproszeń SMS?</item>
         <item quantity="other">Wysłać %1$d zaproszeń SMS?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Zacznij używać Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Zacznij używać Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Wygląda na to, że nie masz żadnych aplikacji z którymi możesz się podzielić.</string>
 
     <!-- LearnMoreTextView -->
@@ -1383,7 +1458,7 @@
     <string name="LongMessageActivity_your_message">Twoja wiadomość</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Połączenie w tle jest włączone</string>
 
     <!-- MediaOverviewActivity -->
@@ -1462,10 +1537,10 @@
     <string name="MessageQuotesBottomSheet_replies">Odpowiedzi</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Nawiązywanie połączenia Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">Nawiązywanie połączenia Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Uruchamianie usługi połączeń Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Zatrzymywanie usługi połączeń Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Uruchamianie usługi połączeń Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Zatrzymywanie usługi połączeń Molly</string>
     <string name="NotificationBarManager__cancel_call">Anuluj</string>
 
     <!-- NotificationsMegaphone -->
@@ -1733,6 +1808,14 @@
     <string name="MessageRecord_you_activated_payments">Aktywowano płatności</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">Od teraz %1$s przyjmuje płatności</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Dane dotyczące płatności są niedostępne</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Stuknij, aby zobaczyć więcej</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Dane dotyczące płatności niedostępne</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Dane tej płatności są niedostępne, ponieważ wiadomości zostały przywrócone ze źródła, które nie zawiera tej historii płatności. Nie ma to wpływu na saldo portfela ani status wcześniejszych płatności.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1793,9 +1876,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Wkrótce stracisz możliwość wysyłania wiadomości SMS z Signal. Zaproś %1$s do Signal i kontynuujcie rozmowę tutaj.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Aplikacja Signal nie obsługuje już wysyłania wiadomości SMS. Zaproś %1$s do Signal i kontynuujcie rozmowę tutaj.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Aplikacja Molly nie obsługuje już wysyłania wiadomości SMS. Zaproś %1$s do Molly i kontynuujcie rozmowę tutaj.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Płatność: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Płatność</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Zgłoszono jako spam</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1881,7 +1966,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Dodać nowe urządzenie Signal?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Wygląda na to, że próbujesz dodać urządzenie Signal używając skanera nieznanego dostawy. Dla Twojego bezpieczeństwa prosimy, abyś zeskanował(a) kod używając Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal wymaga pozwolenia na dostęp do aparatu w celu zeskanowania kodu QR, ale zostało one na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Aparat\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly wymaga pozwolenia na dostęp do aparatu w celu zeskanowania kodu QR, ale zostało one na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Aparat\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Nie można zeskanować kodu QR bez zezwolenia na dostęp do aparatu</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1896,11 +1981,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Podaj hasło</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Ikona Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Ikona Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Wprowadź hasło</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Nieprawidłowe hasło!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Odblokuj Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Blokada ekranu</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Odblokuj Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Blokada ekranu</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Mapa</string>
@@ -1969,7 +2054,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Zweryfikuj, aby kontynuować wysyłanie wiadomości</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Dokończ weryfikację, aby pomóc zapobiegać wysyłaniu spamu w Signal.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Dokończ weryfikację, aby pomóc zapobiegać wysyłaniu spamu w Molly.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Po zweryfikowaniu będziesz móc kontynuować wysyłanie wiadomości. Wszystkie, wstrzymane wiadomości zostaną automatycznie wysłane.</string>
 
     <!-- Recipient -->
@@ -1977,7 +2062,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Moja relacja</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Połączenie Signal</string>
+    <string name="Recipient_signal_call">Połączenie Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Zablokuj</string>
@@ -1991,7 +2076,8 @@
     <string name="RedPhone_ringing">Dzwonienie…</string>
     <string name="RedPhone_busy">Zajęty</string>
     <string name="RedPhone_recipient_unavailable">Odbiorca niedostępny</string>
-    <string name="RedPhone_network_failed">Nieudane połączenie sieci</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Nieudane połączenie sieci Sprawdź swoje połączenie sieciowe i spróbuj ponownie.</string>
     <string name="RedPhone_number_not_registered">Numer nie jest zarejestrowany!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Wybrany numer nie wspiera bezpiecznych połączeń głosowych!</string>
     <string name="RedPhone_got_it">Rozumiem</string>
@@ -2002,8 +2088,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Dotknij tutaj, aby włączyć wideo</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Aby zadzwonić do %1$s, Signal potrzebuje dostępu do aparatu</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Aby zadzwonić do %1$s, Molly potrzebuje dostępu do aparatu</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Łączenie…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Ponowne łączenie…</string>
@@ -2069,10 +2155,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Usunięto z połączenia</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Ktoś usunął Cię z połączenia.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Zezwól na dostęp do aparatu i mikrofonu</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Zezwól na dostęp do mikrofonu</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Zezwól na dostęp do aparatu</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Aby rozpocząć połączenie lub do niego dołączyć, zezwól Molly na dostęp do aparatu i mikrofonu.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Aby rozpocząć połączenie lub do niego dołączyć, zezwól Molly na dostęp do mikrofonu.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Aby włączyć kamerę, zezwól Molly na dostęp do aparatu.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Aby rozpocząć połączenie lub do niego dołączyć, Molly potrzebuje dostępu do mikrofonu.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Do włączenia kamery Molly wymaga dostępu do aparatu</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Aby rozpocząć połączenie lub do niego dołączyć:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Aby włączyć kamerę:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Połączenie audio Signal</string>
-    <string name="WebRtcCallView__signal_video_call">Połączenie wideo Signal</string>
+    <string name="WebRtcCallView__signal_call">Połączenie audio Molly</string>
+    <string name="WebRtcCallView__signal_video_call">Połączenie wideo Molly</string>
     <string name="WebRtcCallView__start_call">Rozpocznij połączenie</string>
     <string name="WebRtcCallView__join_call">Dołącz do rozmowy</string>
     <string name="WebRtcCallView__call_is_full">Połączenie jest pełne</string>
@@ -2172,24 +2278,47 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Opuścić rękę?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Opuść rękę</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Opuść</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Anuluj</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Podnosisz rękę</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Zobacz</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s podnosi rękę</item>
-        <item quantity="few">%1$s + %2$d podnoszą rękę</item>
-        <item quantity="many">%1$s + %2$d podnoszą rękę</item>
-        <item quantity="other">%1$s + %2$d podnoszą rękę</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s podnosisz rękę</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d podnosicie rękę</item>
+        <item quantity="few">%1$s + %2$d inne osoby podnosicie rękę</item>
+        <item quantity="many">%1$s + %2$d innych osób podnosicie rękę</item>
+        <item quantity="other">%1$s + %2$d innej osoby podnosicie rękę</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s podnosi rękę</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d podnoszą rękę</item>
+        <item quantity="few">%1$s + %2$d inne osoby podnoszą rękę</item>
+        <item quantity="many">%1$s + %2$d innych osób podnoszą rękę</item>
+        <item quantity="other">%1$s + %2$d innej osoby podnoszą rękę</item>
+    </plurals>
+
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="few">%1$s +%2$d</item>
+        <item quantity="many">%1$s +%2$d</item>
+        <item quantity="other">%1$s +%2$d</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="few">%1$s +%2$d</item>
         <item quantity="many">%1$s +%2$d</item>
@@ -2292,7 +2421,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Otrzymasz telefon, aby zweryfikować ten numer.</string>
     <string name="RegistrationActivity_edit_number">Edytuj numer</string>
     <string name="RegistrationActivity_missing_google_play_services">Brak Usług Google Play</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Brak Usług Google Play na tym urządzeniu. Nadal możesz używać Signal, lecz ta konfiguracja może powodować mniejszą niezawodność i wydajność\n\nJeśli nie jesteś zaawansowanym użytkownikiem, nie korzystasz ze zmodyfikowanego systemu Android lub sądzisz, że to błąd, wyślij e-mail na adres support@signal.org, aby otrzymać pomoc.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Brak Usług Google Play na tym urządzeniu. Nadal możesz używać Molly, lecz ta konfiguracja może powodować mniejszą niezawodność i wydajność\n\nJeśli nie jesteś zaawansowanym użytkownikiem, nie korzystasz ze zmodyfikowanego systemu Android lub sądzisz, że to błąd, wyślij e-mail na adres support@molly.im, aby otrzymać pomoc.</string>
     <string name="RegistrationActivity_i_understand">Rozumiem</string>
     <string name="RegistrationActivity_play_services_error">Błąd Usług Play</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Trwa aktualizacja Usług Google Play lub są one niedostępne. Spróbuj ponownie.</string>
@@ -2310,7 +2439,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Niestandardowy format numeru</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Podany przez Ciebie numer (%1$s) wydaje się mieć niestandardowy format.\n\nCzy chodziło Ci o %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Format numeru telefonu</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Format numeru telefonu</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Poproszono o połączenie</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2346,8 +2475,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Masz problem z rejestracją?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Upewnij się, że Twój telefon ma połączenie z siecią komórkową potrzebną do odbioru wiadomości SMS lub połączenia\n • Potwierdź, że możesz odebrać połączenie telefoniczne na ten numer\n • Sprawdź, czy wprowadzono poprawny numer telefonu.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Wciąż potrzebujesz pomocy? Wykonaj podane kroki naprawcze lub skontaktuj się z naszym działem technicznym</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Aby uzyskać więcej informacji, wykonaj %1$s lub %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">podane kroki naprawcze</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2385,13 +2514,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Dodaj do kontaktów</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Zaproś do używania Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Zaproś do używania Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Wiadomość Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Połączenie Signal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Dodaj do kontaktów</string>
-    <string name="SharedContactView_invite_to_signal">Zaproś do używania Signal</string>
+    <string name="SharedContactView_invite_to_signal">Zaproś do używania Molly</string>
     <string name="SharedContactView_message">Wiadomość Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2522,11 +2651,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s należy do: %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Aktualizacja Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Dostępna jest nowa wersja Signal. Wybierz, aby zaktualizować.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Aktualizacja Signal nie powiodła się</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Aktualizacja Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Dostępna jest nowa wersja Molly. Wybierz, aby zaktualizować.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Aktualizacja Molly nie powiodła się</string>
     <string name="ApkUpdateNotifications_failed_general_body">Spróbujemy ponownie później.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal został pomyślnie zaktualizowany</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly został pomyślnie zaktualizowany</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Aplikacja została automatycznie zaktualizowana do wersji %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2599,7 +2728,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Nasz numer bezpieczeństwa Signal:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Wygląda na to, że nie masz żadnych aplikacji z którymi możesz się podzielić.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Brak numerów bezpieczeństwa do porównania w schowku.</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal wymaga pozwolenia na dostęp do aparatu w celu zeskanowania kodu QR, ale zostało one na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Aparat\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly wymaga pozwolenia na dostęp do aparatu w celu zeskanowania kodu QR, ale zostało one na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Aparat\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Nie można zeskanować kodu QR bez zezwolenia na dostęp do aparatu</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Aby zobaczyć numer bezpieczeństwa dla %1$s, musisz najpierw wymienić wiadomości z tym kontaktem.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2629,14 +2758,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Dotknij, aby otworzyć.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal jest niezablokowany</string>
-    <string name="KeyCachingService_lock">Zablokuj Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly jest niezablokowany</string>
+    <string name="KeyCachingService_lock">Zablokuj Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Ty</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Nieobsługiwany typ multimediów</string>
     <string name="MediaPreviewActivity_draft">Szkic</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal wymaga pozwolenia na dostęp do danych telefonu w celu zapisu do pamięci zewnętrznej, ale zostało one na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Przechowywanie\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly wymaga pozwolenia na dostęp do danych telefonu w celu zapisu do pamięci zewnętrznej, ale zostało one na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Przechowywanie\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Nie można zapisać do pamięci zewnętrznej bez odpowiedniego pozwolenia</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Usunąć wiadomość?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Spowoduje to trwałe usunięcie tej wiadomości.</string>
@@ -2684,7 +2813,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Dostarczenie wiadomości nie powiodło się.</string>
     <string name="MessageNotifier_error_delivering_message">Błąd przy wysyłaniu wiadomości.</string>
     <string name="MessageNotifier_message_delivery_paused">Dostarczanie wiadomości wstrzymane.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Zweryfikuj, aby kontynuować wysyłanie wiadomości w Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Zweryfikuj, aby kontynuować wysyłanie wiadomości w Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Oznacz wszystkie jako przeczytane</string>
     <string name="MessageNotifier_mark_read">Przeczytane</string>
     <string name="MessageNotifier_turn_off_these_notifications">Wyłącz te powiadomienia</string>
@@ -2706,7 +2835,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Zareagował(a) tak %1$s na Twoją naklejkę.</string>
     <string name="MessageNotifier_this_message_was_deleted">Ta wiadomość została usunięta.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Wyłączyć powiadomienia \"Kontakt dołączył do Signal\"? Możesz włączyć je ponownie w Signal &gt; Ustawienia &gt; Powiadomienia.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Wyłączyć powiadomienia \"Kontakt dołączył do Molly\"? Możesz włączyć je ponownie w Molly &gt; Ustawienia &gt; Powiadomienia.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2745,7 +2874,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Szybka odpowiedź jest niedostępna kiedy Signal jest zablokowany!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Szybka odpowiedź jest niedostępna kiedy Molly jest zablokowany!</string>
     <string name="QuickResponseService_problem_sending_message">Wystąpił błąd przy wysyłaniu wiadomości!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2765,7 +2894,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Nieprawidłowy skrót</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Nowa wiadomość</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Prośba o kontakt</string>
     <string name="SingleRecipientNotificationBuilder_you">Ty</string>
@@ -2813,7 +2942,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">To urządzenie nie jest już zarejestrowane. Powodem może być zarejestrowanie Twojego numeru telefonu w aplikacji Signal na innym urządzeniu.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">To urządzenie nie jest już zarejestrowane. Powodem może być zarejestrowanie Twojego numeru telefonu w aplikacji Molly na innym urządzeniu.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Zarejestruj urządzenie ponownie</string>
 
@@ -2826,10 +2955,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Aby odebrać połączenie, zezwól Signal na dostęp do mikrofonu.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Aby odebrać połączenie, zezwól Molly na dostęp do mikrofonu.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Aby odebrać połączenie wideo, zezwól Signal na dostęp do mikrofonu i kamery.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal wymaga pozwolenia na dostęp do mikrofonu i aparatu w celu odbierania oraz wykonywania połączeń, ale zostało one na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Mikrofon\" oraz \"Aparat\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Aby odebrać połączenie wideo, zezwól Molly na dostęp do mikrofonu i kamery.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly wymaga pozwolenia na dostęp do mikrofonu i aparatu w celu odbierania oraz wykonywania połączeń, ale zostało one na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Mikrofon\" oraz \"Aparat\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Odebrane na połączonym urządzeniu.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Odrzucone na połączonym urządzeniu.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Zajęte na połączonym urządzeniu.</string>
@@ -2874,16 +3003,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Powtórz hasło</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Zaproś do Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Zaproś do Molly</string>
     <string name="contact_selection_activity__new_group">Nowa grupa</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Odśwież kontakty</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Brakuje kogoś? Spróbuj odświeżyć</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Znajdź znajomych w Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Zezwól na dostęp do kontaktów</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Więcej</string>
 
@@ -2900,7 +3029,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Obrazek kontaktu</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal wymaga pozwolenia na dostęp do kontaktów w celu wyświetlania Twoich kontaktów, ale zostało one na stałe odrzucone. Przejdź do menu ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Kontakty\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly wymaga pozwolenia na dostęp do kontaktów w celu wyświetlania Twoich kontaktów, ale zostało one na stałe odrzucone. Przejdź do menu ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Kontakty\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Wystąpił błąd podczas pobierania kontaktów, sprawdzić swoje połączenie internetowe</string>
     <string name="ContactSelectionListFragment_username_not_found">Nie znaleziono nazwy użytkownika</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" nie jest użytkownikiem Signal. Sprawdź nazwę użytkownika i spróbuj ponownie."</string>
@@ -2920,16 +3049,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Znajdź po nazwie użytkownika</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Zezwól na dostęp do kontaktów</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Aby znaleźć znajomych w Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Zezwól</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Nie dzięki</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Zezwól na dostęp do kontaktów. Twoje kontakty są szyfrowane i niewidoczne dla usługi Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal wymaga dostępu do Twoich kontaktów w celu wyświetlenia ich.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly wymaga dostępu do Twoich kontaktów w celu wyświetlenia ich.</string>
     <string name="contact_selection_list_fragment__show_contacts">Pokaż kontakty</string>
 
     <!-- contact_selection_list_item -->
@@ -3006,6 +3137,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Ten użytkownik został wcześniej usunięty. Ponowne wysłanie do niego wiadomości spowoduje dodanie tej osoby do listy kontaktów.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Opcje</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Uaktualnij</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Odtwarzanie … Pauza</string>
@@ -3034,7 +3167,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Dymki to funkcja systemu Android, którą możesz wyłączyć dla czatów Signal.</string>
+    <string name="BubbleOptOutTooltip__description">Dymki to funkcja systemu Android, którą możesz wyłączyć dla czatów Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Nie teraz</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3216,9 +3349,9 @@
     <string name="EditProfileFragment__group_description">Opis grupy</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Zaktualizuj Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Zaktualizuj Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Ta wersja Signal wygasła. Zaktualizuj teraz, aby dalej korzystać z aplikacji Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Ta wersja Molly wygasła. Zaktualizuj teraz, aby dalej korzystać z aplikacji Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Uaktualnij</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3437,7 +3570,7 @@
     <string name="preferences__slow">Wolno</string>
     <string name="preferences__help">Pomoc</string>
     <string name="preferences__advanced">Zaawansowane</string>
-    <string name="preferences__donate_to_signal">Wpłać darowiznę na rzecz Signal</string>
+    <string name="preferences__donate_to_signal">Wpłać darowiznę na rzecz Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Prywatność</string>
     <!-- Preference label for stories -->
@@ -3474,13 +3607,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Zmień ikonę i nazwę aplikacji na „%1$s”</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">W celu zmiany ikony i nazwy należy zamknąć Signal. Powiadomienia zawsze będą wyświetlały domyślną ikonę i nazwę Signal.</string>
+    <string name="preferences__app_icon_dialog_description">W celu zmiany ikony i nazwy należy zamknąć Molly. Powiadomienia zawsze będą wyświetlały domyślną ikonę i nazwę Molly.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Wybierz ikonę i nazwę aplikacji, która będzie wyświetlana na ekranie głównym i w szufladzie aplikacji Twojego telefonu. Powiadomienia zawsze będą wyświetlały domyślną ikonę i nazwę Signal. Dowiedz się więcej</string>
+    <string name="preferences__app_icon_warning_learn_more">Wybierz ikonę i nazwę aplikacji, która będzie wyświetlana na ekranie głównym i w szufladzie aplikacji Twojego telefonu. Powiadomienia zawsze będą wyświetlały domyślną ikonę i nazwę Molly. Dowiedz się więcej</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Ikona i nazwa aplikacji jest widoczna na ekranie głównym i w szufladzie aplikacji.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Powiadomienia zawsze będą wyświetlały domyślną ikonę i nazwę Signal.</string>
+    <string name="preferences__app_icon_notification_warning">Powiadomienia zawsze będą wyświetlały domyślną ikonę i nazwę Molly.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Dowiedz się więcej</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3529,8 +3662,12 @@
         <item quantity="other">Wszystkie czaty zostaną trwale przycięte do %1$s najnowszej wiadomości.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">To spowoduje trwałe usunięcie z Twojego urządzenia całej historii wiadomości i multimediów.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Cała historia wiadomości i multimediów zostanie trwale usunięta z tego urządzenia i wszystkich połączonych urządzeń.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Czy na pewno chcesz usunąć całą historię wiadomości?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Cała historia wiadomości zostanie trwale usunięta. Tego działania nie da się cofnąć.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Cała historia wiadomości zostanie trwale usunięta ze wszystkich urządzeń. Tego działania nie można cofnąć.</string>
     <string name="preferences_storage__delete_all_now">Usuń wszystko teraz</string>
     <string name="preferences_storage__forever">Zawsze</string>
     <string name="preferences_storage__one_year">1 rok</string>
@@ -3569,7 +3706,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Omijanie cenzury</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Omijanie cenzury</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Włączenie uruchamia mechanizmy omijania cenzury. Nie włączaj, jeśli kraj w którym się znajdujesz nie blokuje Signal.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Włączenie uruchamia mechanizmy omijania cenzury. Nie włączaj, jeśli kraj w którym się znajdujesz nie blokuje Molly.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Omijanie cenzury włączone dla Twojego numeru telefonu i konta Signal.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3621,7 +3758,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Przedstawiamy płatności</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Korzystaj z Signal, aby wysyłać i otrzymywać MobileCoin, nową, skupioną na prywatności, cyfrową walutę. Aktywuj płatności, aby rozpocząć.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Korzystaj z Molly, aby wysyłać i otrzymywać MobileCoin, nową, skupioną na prywatności, cyfrową walutę. Aktywuj płatności, aby rozpocząć.</string>
     <string name="PaymentsHomeFragment__activate_payments">Aktywuj płatności</string>
     <string name="PaymentsHomeFragment__activating_payments">Aktywowanie płatności…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Przywróć konto płatności</string>
@@ -3647,7 +3784,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Płatności nie są dostępne w Twoim regionie.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Nie udało się włączyć płatności. Spróbuj później.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Dezaktywować płatności?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Nie będziesz móc odbierać lub wysyłać waluty MobileCoin w Signal, jeśli wyłączysz płatności.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Nie będziesz móc odbierać lub wysyłać waluty MobileCoin w Molly, jeśli wyłączysz płatności.</string>
     <string name="PaymentsHomeFragment__deactivate">Dezaktywuj</string>
     <string name="PaymentsHomeFragment__continue">Kontynuuj</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Środki nie są w tej chwili dostępne.</string>
@@ -3656,10 +3793,10 @@
     <string name="PaymentsHomeFragment__details">Szczegóły</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Możesz używać aplikacji Signal do wysyłania i otrzymywania przelewów w walucie MobileCoin. Wszystkie płatności podlegają warunkom użytkowania waluty MobileCoin i portfela MobileCoin Wallet. Możesz napotkać pewne problemy i nieodwracalnie stracić płatności i środki na koncie. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Możesz używać aplikacji Molly do wysyłania i otrzymywania przelewów w walucie MobileCoin. Wszystkie płatności podlegają warunkom użytkowania waluty MobileCoin i portfela MobileCoin Wallet. Możesz napotkać pewne problemy i nieodwracalnie stracić płatności i środki na koncie. </string>
     <string name="PaymentsHomeFragment__activate">Aktywuj</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Zobacz warunki użytkowania MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Płatności w Signal nie są już dostępne. Wciąż możesz przenieść środki do kantora, ale nie możesz otrzymywać i wysyłać płatności, ani dodawać środków.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Płatności w Molly nie są już dostępne. Wciąż możesz przenieść środki do kantora, ale nie możesz otrzymywać i wysyłać płatności, ani dodawać środków.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3687,7 +3824,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Włącz uprawnienia</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Aby ułatwić Ci wysyłanie wiadomości do osób, które znasz, Signal poprosi o poniższe uprawnienia. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Aby ułatwić Ci wysyłanie wiadomości do osób, które znasz, Molly poprosi o poniższe uprawnienia. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Powiadomienia</string>
     <!-- Notifications permission row description -->
@@ -3775,10 +3912,10 @@
     <string name="PaymentsTransferFragment__next">Dalej</string>
     <string name="PaymentsTransferFragment__invalid_address">Nieprawidłowy adres</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Sprawdź adres portfela, do którego próbujesz przenieść środki i spróbuj ponownie.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Nie możesz przenieść środków do własnego portfela Signal. Podaj adres portfela, z Twojego konta w obsługiwanym kantorze.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Aby zeskanować kod QR, Signal potrzebuje dostępu do aparatu</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Aby sfotografować kod QR, Signal wymaga pozwolenia na dostęp do Aparatue. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Aparat\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Aby zeskanować kod QR, Signal potrzebuje dostępu do aparatu</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Nie możesz przenieść środków do własnego portfela Molly. Podaj adres portfela, z Twojego konta w obsługiwanym kantorze.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Aby zeskanować kod QR, Molly potrzebuje dostępu do aparatu</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Aby sfotografować kod QR, Molly wymaga pozwolenia na dostęp do Aparatue. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Aparat\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Aby zeskanować kod QR, Molly potrzebuje dostępu do aparatu</string>
     <string name="PaymentsTransferFragment__settings">Ustawienia</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -4144,17 +4281,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Przychodzące poł. głosowe Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Przychodzące poł. głosowe Molly</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Przychodzące poł. wideo Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Przychodzące poł. wideo Molly</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Przychodzące połączenie grupowe Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Przychodzące połączenie grupowe Molly</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">W trakcie poł. głosowego Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">W trakcie poł. głosowego Molly</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">W trakcie poł. wideo Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">W trakcie poł. wideo Molly</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">W trakcie poł. grupowego Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">W trakcie poł. grupowego Molly</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Wczytywanie…</string>
@@ -4201,9 +4338,9 @@
     <string name="BackupDialog_verify">Zweryfikuj</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Podałeś(aś) poprawne hasło kopii zapasowej</string>
     <string name="BackupDialog_passphrase_was_not_correct">Hasło jest nieprawidłowe</string>
-    <string name="LocalBackupJob_creating_signal_backup">Tworzenie kopii zapasowej Signal…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Tworzenie kopii zapasowej Molly…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Sprawdzanie kopii zapasowej Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Sprawdzanie kopii zapasowej Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">Zapisywanie kopii zapasowej nie powiodło się</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Twój folder kopii zapasowej został usunięty lub przeniesiony.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Twój plik kopii zapasowej jest zbyt duży, aby przechować go na tym wolumenie.</string>
@@ -4218,15 +4355,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Zadzwoń do mnie (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Wyślij kod ponownie (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Skontaktuj się ze wsparciem technicznym Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Rejestracja Signal - Kod weryfikacyjny dla systemu Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Skontaktuj się ze wsparciem technicznym Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Rejestracja Molly - Kod weryfikacyjny dla systemu Android</string>
     <string name="RegistrationActivity_incorrect_code">Niepoprawny kod</string>
     <string name="BackupUtil_never">Nigdy</string>
     <string name="BackupUtil_unknown">Nieznane</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Numer telefonu</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Zdecyduj, kto może zobaczyć Twój numer telefonu i kto może go użyć do skontaktowania się z Tobą w Signal.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Zdecyduj, kto może zobaczyć Twój numer telefonu i kto może go użyć do skontaktowania się z Tobą w Molly.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Kto może zobaczyć mój numer</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4274,7 +4411,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Zbyt dużo nieudanych prób. Spróbuj ponownie później.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Błąd podczas łączenia się z usługą</string>
     <string name="preferences_chats__backups">Kopie zapasowe</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal jest zablokowany</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly jest zablokowany</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">DOTKNIJ, ABY ODBLOKOWAĆ</string>
     <string name="Recipient_unknown">Nieznany</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4305,9 +4442,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Musisz mieć dostęp do swojego, starego urządzenia.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Przywróć z kopii zapasowej</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Przywróć swoje wiadomości z lokalnej kopii zapasowej. Jeśli nie zrobisz tego teraz, nie będzie można przywrócić ich później.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Przywróć lokalną kopię zapasową</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Przywróć kopię zapasową Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Przywróć wszystkie wiadomości tekstowe i multimedia z ostatnich 30 dni</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Więcej opcji</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Anuluj</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Zaloguj się bez przenoszenia</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Kontynuuj bez przenoszenia wiadomości i multimediów</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Otwórz Signal na swoim starym telefonie telefonie z systemem Android</string>
     <string name="NewDeviceTransferInstructions__continue">Kontynuuj</string>
@@ -4322,19 +4466,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Przygotowywanie do połączenia ze starym urządzeniem z systemem Android…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">To chwilę potrwa, wkrótce wszystko powinno być gotowe</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Czekanie na połączenie ze starym urządzeniem z systemem Android…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal potrzebuje pozwolenia na dostęp do lokalizacji, aby znaleźć i połączyć się ze starym urządzeniem z systemem Android.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal potrzebuje włączonych usług lokalizacji, aby znaleźć i połączyć się ze starym urządzeniem z systemem Android.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal potrzebuje Wi-Fi, aby znaleźć i połączyć się ze starym urządzeniem z systemem Android. Wi-Fi musi być włączone, ale nie musi być połączone z siecią Wi-Fi.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Przykro nam. Wygląda na to, że to urządzenie nie obsługuje Wi-Fi Direct. Signal używa Wi-Fi Direct do znalezienia i połączenia się z Twoim, starym urządzeniem z systemem Android. Wciąż możesz przywrócić kopię zapasową, aby przywrócić swoje konto ze starego urządzenia z Androidem.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly potrzebuje pozwolenia na dostęp do lokalizacji, aby znaleźć i połączyć się ze starym urządzeniem z systemem Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly potrzebuje włączonych usług lokalizacji, aby znaleźć i połączyć się ze starym urządzeniem z systemem Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly potrzebuje Wi-Fi, aby znaleźć i połączyć się ze starym urządzeniem z systemem Android. Wi-Fi musi być włączone, ale nie musi być połączone z siecią Wi-Fi.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Przykro nam. Wygląda na to, że to urządzenie nie obsługuje Wi-Fi Direct. Molly używa Wi-Fi Direct do znalezienia i połączenia się z Twoim, starym urządzeniem z systemem Android. Wciąż możesz przywrócić kopię zapasową, aby przywrócić swoje konto ze starego urządzenia z Androidem.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Przywróć kopię zapasową</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Podczas próby połączenia z Twoim, starym urządzeniem z systemem Android, wystąpił nieoczekiwany błąd.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Wyszukiwanie nowego urządzenia z systemem Android…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal potrzebuje pozwolenia na dostęp do lokalizacji, aby znaleźć i połączyć się z nowym urządzeniem z systemem Android.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal potrzebuje włączonych usług lokalizacji, aby znaleźć i połączyć się z nowym urządzeniem z systemem Android.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal potrzebuje Wi-Fi, aby znaleźć i połączyć się z nowym urządzeniem z systemem Android. Wi-Fi musi być włączone, ale nie musi być połączone z siecią Wi-Fi.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Przykro nam. Wygląda na to, że to urządzenie nie obsługuje Wi-Fi Direct. Signal używa Wi-Fi Direct do znalezienia i połączenia się z Twoim, nowym urządzeniem z systemem Android. Wciąż możesz utworzyć kopię zapasową, aby przywrócić swoje konto na nowym urządzeniu z Androidem.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly potrzebuje pozwolenia na dostęp do lokalizacji, aby znaleźć i połączyć się z nowym urządzeniem z systemem Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly potrzebuje włączonych usług lokalizacji, aby znaleźć i połączyć się z nowym urządzeniem z systemem Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly potrzebuje Wi-Fi, aby znaleźć i połączyć się z nowym urządzeniem z systemem Android. Wi-Fi musi być włączone, ale nie musi być połączone z siecią Wi-Fi.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Przykro nam. Wygląda na to, że to urządzenie nie obsługuje Wi-Fi Direct. Molly używa Wi-Fi Direct do znalezienia i połączenia się z Twoim, nowym urządzeniem z systemem Android. Wciąż możesz utworzyć kopię zapasową, aby przywrócić swoje konto na nowym urządzeniu z Androidem.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Utwórz kopię zapasową</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Podczas próby połączenia z Twoim, nowym urządzeniem z systemem Android, wystąpił nieoczekiwany błąd.</string>
 
@@ -4375,7 +4519,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Przenoszenie danych</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Urządzenia muszą znajdować się blisko siebie. Nie wyłączaj żadnego z urządzeń i nie zamykaj Signal. Przenoszenie jest szyfrowane metodą end-to-end.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Urządzenia muszą znajdować się blisko siebie. Nie wyłączaj żadnego z urządzeń i nie zamykaj Molly. Przenoszenie jest szyfrowane metodą end-to-end.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d wiadomości…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% wiadomości…</string>
@@ -4389,7 +4533,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Przenieś konto</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Pobierz Signal na swoje nowe urządzenie z systemem Android</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Pobierz Molly na swoje nowe urządzenie z systemem Android</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Stuknij \"Przenieś lub przywróć konto\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4463,7 +4607,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Każdy, kto ma dostęp do tego linku, może zobaczyć nazwę i zdjęcie grupy, i poprosić o przyjęcie. Udostępniaj go zaufanym osobom.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Każdy, kto ma dostęp do tego linku, może zobaczyć nazwę i zdjęcie grupy, i do niej dołączyć. Udostępniaj go zaufanym osobom.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Udostępnij przez Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Udostępnij przez Molly</string>
     <string name="GroupLinkBottomSheet_copy">Kopiuj</string>
     <string name="GroupLinkBottomSheet_qr_code">Kod QR</string>
     <string name="GroupLinkBottomSheet_share">Udostępnij</string>
@@ -4663,7 +4807,7 @@
     <string name="payment_info_card_about_mobilecoin">O MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin to nowa, skupiona na prywatności, cyfrowa waluta.</string>
     <string name="payment_info_card_adding_funds">Dodawanie środków</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Możesz dodać środki do użycia w Signal, wysyłając walutę MobileCoin na adres swojego portfela.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Możesz dodać środki do użycia w Molly, wysyłając walutę MobileCoin na adres swojego portfela.</string>
     <string name="payment_info_card_cashing_out">Wypłacanie</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Możesz w każdej chwili spieniężyć MobileCoin w kantorze, który obsługuje walutę MobileCoin. Po prostu przenieś środki na swoje konto w tym kantorze.</string>
     <string name="payment_info_card_hide_this_card">Ukryć tę kartę?</string>
@@ -4684,12 +4828,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Dezaktywuj portfel</string>
     <string name="DeactivateWalletFragment__your_balance">Twoje środki</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Przed dezaktywacją płatności zalecamy przeniesienie środków do innego portfela. Jeśli postanowisz nie przenosić teraz swoich środków, pozostaną one w Twoim portfelu powiązanym z Signal, jeśli reaktywujesz płatności.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Przed dezaktywacją płatności zalecamy przeniesienie środków do innego portfela. Jeśli postanowisz nie przenosić teraz swoich środków, pozostaną one w Twoim portfelu powiązanym z Molly, jeśli reaktywujesz płatności.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Przenieś pozostałe środki</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Dezaktywuj bez przenoszenia</string>
     <string name="DeactivateWalletFragment__deactivate">Dezaktywuj</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Dezaktywować bez przenoszenia?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Twoje środki pozostaną w portfelu połączonym z Signal, jeśli postanowisz reaktywować płatności.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Twoje środki pozostaną w portfelu połączonym z Molly, jeśli postanowisz reaktywować płatności.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Błąd przy dezaktywacji portfela.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4988,7 +5132,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licencje</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Regulamin i Polityka prywatności</string>
-    <string name="HelpFragment__copyright_signal_messenger">Copyright Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Copyright Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Oprogramowanie udostępniane na licencji GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -5003,7 +5147,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">Automatyczny</string>
+    <string name="ChatColorSelectionFragment__auto">Autom.</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Użyj własnych kolorów</string>
     <string name="ChatColorSelectionFragment__chat_color">Kolor czatu</string>
     <string name="ChatColorSelectionFragment__edit">Edytuj</string>
@@ -5235,9 +5379,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Wybierz kolor</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Udostępnij</string>
 
@@ -5279,7 +5420,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Tylko administratorzy mogą wysyłać wiadomości w tej grupie.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Osiągnięto limit</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Nie możesz wybrać więcej niż pięciu czatów</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5460,9 +5602,9 @@
     <string name="MySupportPreference__learn_more">Dowiedz się więcej</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Zaktualizuj Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Zaktualizuj Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Ta wersja Signal wygasła. Zaktualizuj teraz, aby dalej korzystać z aplikacji Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Ta wersja Molly wygasła. Zaktualizuj teraz, aby dalej korzystać z aplikacji Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Uaktualnij</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5471,7 +5613,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Urządzenie jest niezarejestrowane</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">To urządzenie nie jest już zarejestrowane. Zarejestruj ponownie, aby dalej korzystać z aplikacji Signal na tym urządzeniu.</string>
+    <string name="ReregisterSignalDialog__message">To urządzenie nie jest już zarejestrowane. Zarejestruj ponownie, aby dalej korzystać z aplikacji Molly na tym urządzeniu.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Zarejestruj ponownie</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5765,7 +5907,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Nie udało się otworzyć selektora dzwonków.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">W celu włączenia powiadomień Signal potrzebuje uprawnienia na ich wyświetlanie.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">W celu włączenia powiadomień Molly potrzebuje uprawnienia na ich wyświetlanie.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Włącz</string>
 
@@ -5920,8 +6062,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Brak odpowiedzi</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Nie możesz wysyłać wiadomości w odpowiedzi na tę relację, ponieważ nie jesteś już członkiem tej grupy.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Zareagowano na relację</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Zareagowałeś/-aś na relację</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Zareagował/a na relację</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Odsłony</string>
     <!-- Label for story replies tab -->
@@ -6572,8 +6716,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Wybierz swój bank</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Potwierdź darowiznę za pośrednictwem %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Aby skonfigurować darowiznę cykliczną, kliknij Dalej i potwierdź w banku obciążenie konta w wysokości 0,01 euro. Kwota zostanie automatycznie zwrócona i pozwoli na pobieranie z Twojego konta darowizny w wysokości 5 euro miesięcznie.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Aby skonfigurować darowiznę cykliczną, kliknij Dalej i potwierdź w banku obciążenie konta w wysokości 0,01 euro. Kwota zostanie automatycznie zwrócona i pozwoli na pobieranie z Twojego konta darowizny w wysokości %1$s miesięcznie.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Kontynuuj</string>
 
@@ -7163,6 +7307,56 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Pobieranie danych kopii zapasowej…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Tworzenie kopii zapasowych multimediów jest wyłączone</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Usługa tworzenia kopii zapasowych multimediów w Signal została wyłączona, ponieważ nie mogliśmy przetworzyć Twojej płatności. Masz %1$d dzień na pobranie wszystkich multimediów zapisanych w kopii zapasowej. Po upływie %1$d dnia multimedia z kopii zapasowej zostaną usunięte.</item>
+        <item quantity="few">Usługa tworzenia kopii zapasowych multimediów w Signal została wyłączona, ponieważ nie mogliśmy przetworzyć Twojej płatności. Masz %1$d dni na pobranie wszystkich multimediów zapisanych w kopii zapasowej. Po upływie %1$d dni multimedia z kopii zapasowej zostaną usunięte.</item>
+        <item quantity="many">Usługa tworzenia kopii zapasowych multimediów w Signal została wyłączona, ponieważ nie mogliśmy przetworzyć Twojej płatności. Masz %1$d dni na pobranie wszystkich multimediów zapisanych w kopii zapasowej. Po upływie %1$d dni multimedia z kopii zapasowej zostaną usunięte.</item>
+        <item quantity="other">Usługa tworzenia kopii zapasowych multimediów w Signal została wyłączona, ponieważ nie mogliśmy przetworzyć Twojej płatności. Masz %1$d dnia na pobranie wszystkich multimediów zapisanych w kopii zapasowej. Po upływie %1$d dnia multimedia z kopii zapasowej zostaną usunięte.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">W dowolnym momencie możesz wznowić uiszczanie opłaty za dalsze tworzenie kopii zapasowych wszystkich multimediów. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Twoje multimedia zostaną dziś usunięte</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Usługa tworzenia kopii zapasowych multimediów w Signal została wyłączona, ponieważ nie mogliśmy przetworzyć Twojej płatności. To ostatnia szansa na pobranie multimediów z kopii zapasowej, zanim zostaną usunięte.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Nie można ukończyć pobierania</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Na Twoim urządzeniu nie ma wystarczającej ilości wolnego miejsca. Aby pobrać multimedia zapisane w kopii zapasowej, zwolnij %1$s.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Jeśli wybierzesz opcję „Pomiń”, multimedia z kopii zapasowej zostaną usunięte w ciągu %1$d dnia.</item>
+        <item quantity="few">Jeśli wybierzesz opcję „Pomiń”, multimedia z kopii zapasowej zostaną usunięte w ciągu %1$d dni.</item>
+        <item quantity="many">Jeśli wybierzesz opcję „Pomiń”, multimedia z kopii zapasowej zostaną usunięte w ciągu %1$d dni.</item>
+        <item quantity="other">Jeśli wybierzesz opcję „Pomiń”, multimedia z kopii zapasowej zostaną usunięte w ciągu %1$d dnia.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Nie można przetworzyć płatności za tworzenie kopii zapasowych</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Mamy problem z pobraniem cyklicznej comiesięcznej opłaty za tworzenie kopii zapasowych. Upewnij się, że dane dotyczące Twojej wybranej metody płatności są aktualne. Jeśli nie są, uaktualnij je w Google Pay. Za kilka dni podejmiemy kolejną próbę przetworzenia płatności.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Nie udało się ukończyć tworzenia kopii zapasowej</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Kopia zapasowa urządzenia nie została utworzona od %1$d dni. Upewnij się, że urządzenie jest podłączone do Wi-Fi, i naciśnij opcję „Utwórz kopię zapasową teraz”. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Dowiedz się więcej</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Pomiń</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Pobierz multimedia teraz</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Pobierz później</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Nie pobieraj multimediów</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Aby pobrać multimedia, zwolnij %1$s miejsca.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Karta kredytowa lub debetowa</string>
@@ -7176,16 +7370,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Nieznany</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Historia płatności</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Ostatnia kopia zapasowa została utworzona w dniu %1$s o godz. %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">Limit wiadomości</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">Limity wiadomości</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">Usuń historię wiadomości</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Wiadomości starsze niż wybrany limit zostaną trwale usunięte.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Wszystkie wiadomości wykraczające poza wybrany limit zostaną trwale usunięte.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Zastosuj limity do powiązanych urządzeń</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Po włączeniu limity czatu będą również usuwać wiadomości z powiązanych urządzeń.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Usuwanie jest teraz synchronizowane na wszystkich Twoich urządzeniach</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Gdy usuniesz wiadomości lub czaty, zostaną one usunięte z telefonu i powiązanych urządzeń.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Historia płatności</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Kopia zapasowa wiadomości tekstowych i wszystkich multimediów</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Szczegóły płatności</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Typ kopii zapasowej</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Data zapłaty</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Udostępnij</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Kopie zapasowe Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Historia płatności</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Szczegóły kopii zapasowej</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Rozmiar kopii zapasowej</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Częstotliwość tworzenia kopii zapasowych</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Tworzenie kopii zapasowej przy użyciu sieci komórkowej</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Usuń kopie zapasowe i wyłącz tworzenie kolejnych</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Kopia zapasowa usunięta i wyłączona.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Zmieniono typ kopii zapasowej i anulowano subskrypcję</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Subskrypcja anulowana</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Pobieranie ukończone</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Typ kopii zapasowej</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Kopie zapasowe wyłączone</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/miesiąc</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Włącz kopie zapasowe</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Ostatnia kopia zapasowa</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s o %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Nigdy</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Archiwizuj teraz</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Wyłączyć i usunąć kopie zapasowe?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Opłata nie zostanie pobrana ponownie. Kopia zapasowa zostanie usunięta i nie zostaną utworzone żadne kolejne.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Wyłącz i usuń</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Trwa usuwanie kopii zapasowej…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Usunięto kopię zapasową</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Stuknij opcję Archiwizuj teraz"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Codziennie</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Co tydzień</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Co miesiąc</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Ręczne tworzenie kopii zapasowej</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Wprowadź kod PIN urządzenia, hasło lub wzór.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Dalej</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Zmień typ kopii zapasowej</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Anuluj subskrypcję</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Potwierdź anulowanie</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Opłata nie zostanie pobrana ponownie. Tworzenie kopii zapasowych zostanie wyłączone pod koniec cyklu rozliczeniowego. Po tej dacie będziesz mieć 30 dni na pobranie multimediów, których kopia zapasowa jest obecnie tworzona.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Potwierdź i pobierz teraz</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Potwierdź i pobierz później</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Zachowaj usługę</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 5d4c9ead66..3311292a22 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,20 +39,20 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">O Signal está atualizando…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">O Molly está atualizando…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Você ainda não definiu uma frase-chave!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Desabilitar frase-chave?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Isto irá destravar permanentemente as notificações do Signal e de mensagens.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Isto irá destravar permanentemente as notificações do Molly e de mensagens.</string>
     <string name="ApplicationPreferencesActivity_disable">Desabilitar</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Erro ao conectar-se com o servidor!</string>
-    <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">Um PIN é necessário para o desbloqueio de registro. Para desabilitar o PIN, primeiro desabilite o desbloqueio de registro.</string>
+    <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">Os PINs são necessários para o bloqueio de registro. Para desativar os PINs, desative primeiro o bloqueio de registro.</string>
     <string name="ApplicationPreferencesActivity_pin_created">PIN criado.</string>
     <string name="ApplicationPreferencesActivity_pin_disabled">PIN desativado.</string>
-    <string name="ApplicationPreferencesActivity_record_payments_recovery_phrase">Gravar a senha de recuperação de pagamentos</string>
-    <string name="ApplicationPreferencesActivity_record_phrase">Gravar senha</string>
-    <string name="ApplicationPreferencesActivity_before_you_can_disable_your_pin">Antes de desabilitar seu PIN, você precisa gravar a sua senha de recuperação de pagamentos para garantir que possa recuperar a sua conta de pagamentos.</string>
+    <string name="ApplicationPreferencesActivity_record_payments_recovery_phrase">Gravar a frase de recuperação de pagamentos</string>
+    <string name="ApplicationPreferencesActivity_record_phrase">Gravar frase</string>
+    <string name="ApplicationPreferencesActivity_before_you_can_disable_your_pin">Antes de desativar seu PIN, certifique-se de salvar sua frase de recuperação de pagamentos para garantir que você possa recuperar sua conta.</string>
 
     <!-- NumericKeyboardView -->
   <!-- Removed by excludeNonTranslatables <string name="NumericKeyboardView__1" translatable="false">1</string> -->
@@ -71,7 +72,7 @@
     <string name="DraftDatabase_Draft_image_snippet">(imagem)</string>
     <string name="DraftDatabase_Draft_audio_snippet">(áudio)</string>
     <string name="DraftDatabase_Draft_video_snippet">(vídeo)</string>
-    <string name="DraftDatabase_Draft_location_snippet">(local)</string>
+    <string name="DraftDatabase_Draft_location_snippet">(localização)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(resposta)</string>
     <string name="DraftDatabase_Draft_voice_note">(Mensagem de voz)</string>
 
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Arquivo</string>
     <string name="AttachmentKeyboard_contact">Contato</string>
     <string name="AttachmentKeyboard_location">Localização</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">O Signal precisa de permissão para mostrar suas fotos e vídeos</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">O Molly precisa de permissão para mostrar suas fotos e vídeos</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Permitir acesso</string>
     <string name="AttachmentKeyboard_payment">Pagamento</string>
 
     <!-- AttachmentManager -->
-    <string name="AttachmentManager_cant_open_media_selection">Não foi possível encontrar um aplicativo para selecionar arquivos.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">O Signal precisa da permissão Armazenamento para anexar fotos, vídeos ou áudio, mas ela foi permanentemente negada. Vá até o menu de configurações de aplicativos, selecione \"Permissões\" e habilite \"Armazenamento\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">O Signal precisa da permissão Contatos para anexar informações de contato, mas ela foi permanentemente negada. Vá até o menu de configurações de aplicativos, selecione \"Permissões\" e habilite \"Contatos\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">O Signal precisa da permissão Localização para anexar uma localização, mas ela foi permanentemente negada. Vá até o menu de configurações de aplicativos, selecione \"Permissões\" e habilite \"Localização\".</string>
+    <string name="AttachmentManager_cant_open_media_selection">Não foi possível encontrar um aplicativo para selecionar arquivos de mídia.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">O Molly necessita de permissão de Armazenamento para anexar fotos, vídeos ou áudios, mas essa permissão foi negada de forma permanente. Vá para as configurações do aplicativo, selecione \"Permissões\" e ative \"Armazenamento\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">O Molly precisa de permissão de Contatos para anexar informações de contato, mas essa permissão foi negada de forma permanente. Vá para as configurações do aplicativo, selecione \"Permissões\" e ative \"Contatos\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">O Molly precisa de permissão de Localização para anexar uma localização, mas essa permissão foi negada de forma permanente. Vá para as configurações do aplicativo, selecione \"Permissões\" e ative \"Localização\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Permitir acesso à sua localização</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Para enviar sua localização:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Permita que o Signal acesse sua localização para enviá-la.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Permita que o Molly acesse sua localização para enviá-la.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">O Signal precisa de acesso à sua localização para poder compartilhar onde você está</string>
+    <string name="AttachmentManager_signal_needs_location_access">O Molly precisa de acesso à sua localização para poder compartilhar onde você está</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Permitir acesso ao armazenamento</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Para mostrar fotos e vídeos:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">O Signal precisa de acesso ao armazenamento para mostrar suas fotos e vídeos.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">O Molly precisa de acesso ao armazenamento para mostrar suas fotos e vídeos.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s não ativou Pagamentos </string>
@@ -182,7 +183,7 @@
     <string name="BlockUnblockDialog_group_members_wont_be_able_to_add_you">Os membros do grupo não poderão adicionar você novamente.</string>
     <string name="BlockUnblockDialog_group_members_will_be_able_to_add_you">Os membros poderão adicionar você a este grupo novamente</string>
     <!-- Text that is shown when unblocking a Signal contact -->
-    <string name="BlockUnblockDialog_you_will_be_able_to_call_and_message_each_other">Vocês poderão trocar mensagens e fazer chamadas entre si, e o seu nome e foto serão compartilhados com essa pessoa..</string>
+    <string name="BlockUnblockDialog_you_will_be_able_to_call_and_message_each_other">Vocês poderão trocar mensagens e fazer chamadas entre si, e o seu nome e foto serão compartilhados com este contato.</string>
     <!-- Text that is shown when unblocking an SMS contact -->
     <string name="BlockUnblockDialog_you_will_be_able_to_message_each_other">Vocês poderão trocar mensagens entre si.</string>
     <string name="BlockUnblockDialog_blocked_people_wont_be_able_to_call_you_or_send_you_messages">As pessoas bloqueadas não poderão mais fazer chamadas ou enviar mensagens para você.</string>
@@ -221,42 +222,42 @@
     <string name="CameraFragment__video_recording_is_not_supported_on_your_device">A gravação de vídeo não é compatível com seu dispositivo</string>
 
     <!-- CameraXFragment -->
-    <string name="CameraXFragment_tap_for_photo_hold_for_video">Clique para foto, segure para vídeo</string>
+    <string name="CameraXFragment_tap_for_photo_hold_for_video">Toque para foto, segure para vídeo</string>
     <string name="CameraXFragment_capture_description">Capturar</string>
     <string name="CameraXFragment_change_camera_description">Mudar de câmera</string>
     <string name="CameraXFragment_open_gallery_description">Abrir galeria</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Permitir acesso</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Permita o acesso à sua câmera e microfone</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Permita o acesso à sua câmera</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Permitir acesso ao microfone</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Para tirar fotos, permita que o Signal acesse a câmera.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Para tirar fotos e gravar vídeos, permita que o Signal acesse a câmera.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Para tirar fotos e gravar vídeos, permita que o Signal acesse a câmera e o microfone.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Para gravar vídeos com som, permita que o Signal acesse o microfone.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Para escanear um QR code, permita que o Signal acesse a câmera.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">O Signal precisa acessar a câmera para tirar fotos</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">O Signal precisa acessar a câmera para escanear QR codes</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">O Signal precisa acessar o microfone para gravar um vídeo</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Para tirar fotos no Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Para tirar fotos e gravar vídeos no Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Para gravar vídeos com som:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Para escanear QR codes:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Contatos recentes</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Nenhum contato do Signal</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Você só pode usar o botão da câmera para enviar fotos para contatos do Signal. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Não achou quem você estava procurando?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Convidar um contato para entrar no Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Convidar um contato para entrar no Molly</string>
     <string name="CameraContacts__menu_search">Buscar</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -282,15 +283,15 @@
     <!-- Action to prompt the user to disable circumvention since it is no longer needed -->
     <string name="CensorshipCircumventionMegaphone_turn_off">Desativar</string>
     <!-- Action to prompt the user to dismiss the alert at the bottom of the chat list -->
-    <string name="CensorshipCircumventionMegaphone_no_thanks">Não, agradeço</string>
+    <string name="CensorshipCircumventionMegaphone_no_thanks">Não</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Atualizar o Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Atualizar o Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Esta versão do aplicativo já não é mais suportada. Para continuar enviando e recebendo mensagens, atualize para a versão mais recente.</string>
     <string name="ClientDeprecatedActivity_update">Atualizar</string>
     <string name="ClientDeprecatedActivity_dont_update">Não atualizar</string>
     <string name="ClientDeprecatedActivity_warning">Cuidado</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Sua versão do Signal não é mais compatível. Você pode ver seu histórico de mensagens, mas não poderá enviar ou receber mensagens até baixar a nova atualização.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Sua versão do Molly não é mais compatível. Você pode ver seu histórico de mensagens, mas não poderá enviar ou receber mensagens até baixar a nova atualização.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Nenhum navegador encontrado.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Mensagem %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Chamada de voz do Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Chamada de vídeo do Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -416,14 +417,14 @@
     <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Este dispositivo parece não possuir suporte para chamadas.</string>
     <string name="ConversationActivity_transport_insecure_sms">SMS inseguro</string>
     <!-- A title for the option to send an SMS with a placeholder to put the name of their SIM card -->
-    <string name="ConversationActivity_transport_insecure_sms_with_sim">SMS inseguro (%1$s)</string>
-    <string name="ConversationActivity_transport_insecure_mms">MMS inseguro</string>
+    <string name="ConversationActivity_transport_insecure_sms_with_sim">SMS não confiável (%1$s)</string>
+    <string name="ConversationActivity_transport_insecure_mms">MMS não confiável</string>
     <!-- A title for the option to send an SMS with a placeholder to put the name of their SIM card -->
     <string name="ConversationActivity_transport_signal">Mensagem no Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Enviar mensagem</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Vamos mudar para o Signal %1$s</string>
-    <string name="ConversationActivity_specify_recipient">Favor escolher um contato</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Vamos mudar para o Molly %1$s</string>
+    <string name="ConversationActivity_specify_recipient">Por favor, escolha um contato</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">O anexo excede os limites de tamanho para o tipo de mensagem sendo enviada.</string>
     <string name="ConversationActivity_unable_to_record_audio">Não foi possível gravar o áudio!</string>
     <string name="ConversationActivity_you_cant_send_messages_to_this_group">Você não pode enviar mensagens para este grupo, porque não é mais um membro.</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Para enviar áudios:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Para enviar áudios, permita que o Signal acesse seu microfone.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Para enviar áudios, permita que o Molly acesse seu microfone.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">O Signal precisa de acesso ao microfone para gravar um áudio.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">O Signal precisa da permissão Microfone para enviar mensagens de áudio, mas ela foi permanentemente negada. Favor ir no menu de configurações de aplicativos, selecionar \"Permissões\", e habilitar \"Microfone\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">O Molly precisa de acesso ao microfone para gravar um áudio.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">O Molly precisa de permissão para acessar o microfone para enviar mensagens de áudio, mas essa permissão foi negada. Por favor, acesse o menu de configurações do aplicativo, selecione \"Permissões\" e ative \"Microfone\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">O Signal precisa das permissões Microfone e Câmera para chamar %1$s, mas elas foram permanentemente negadas. Favor ir no menu de configurações de aplicativos, selecionar \"Permissões\", e habilitar \"Microfone\" e \"Câmera\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Para tirar fotos e fazer vídeos, permita ao Signal acessar a câmera.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">O Signal precisa da permissão Câmera para tirar fotos e fazer vídeos, mas ela foi permanentemente negada. Favor ir no menu de configurações de aplicativos, selecionar \"Permissões\", e habilitar \"Câmera\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">O Signal precisa da permissão Câmera para tirar fotos ou fazer vídeos</string>
-    <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Habilite a permissão de microfone para capturar vídeos com som.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">O Signal precisa das permissões de microfone para gravar vídeos, mas elas foram negadas. Favor ir no menu de configurações de aplicativos, selecionar \"Permissões\", e habilitar \"Microfone\" e \"Câmera\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">O Signal precisa das permissões de microfone para gravar vídeos.</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">O Molly precisa de permissão para acessar o microfone e a câmera para fazer chamadas para %1$s, mas elas foram negadas. Por favor, acesse o menu de configurações do aplicativo, selecione \"Permissões\" e ative \"Microfone\" e \"Câmera\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Para tirar fotos e fazer vídeos, permita ao Molly acessar a câmera.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">O Molly precisa de permissão para acessar a câmera para tirar fotos e fazer vídeos, mas essa permissão foi negada. Por favor, acesse o menu de configurações do aplicativo, selecione \"Permissões\" e ative \"Câmera\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">O Molly precisa de permissão para acessar a câmera para tirar fotos ou fazer vídeos.</string>
+    <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Ative a permissão do microfone para capturar vídeos com som.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">O Molly precisa de permissão para acessar o microfone e a câmera para gravar vídeos, mas essas permissões foram negadas. Por favor, acesse o menu de configurações do aplicativo, selecione \"Permissões\" e ative \"Microfone\" e \"Câmera\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">O Molly precisa de permissão para acessar o microfone para gravar vídeos.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Não</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Para fazer uma chamada:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Para iniciar uma chamada, permita que o Signal acesse seu microfone.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Para iniciar uma chamada, permita que o Molly acesse seu microfone.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">O Signal precisa de acesso ao microfone para iniciar uma chamada.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">O Molly precisa de acesso ao microfone para iniciar uma chamada.</string>
 
 
     <string name="ConversationActivity_join">Entrar</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">O envio de mensagens SMS não é mais suportado no Signal. Convide %1$s para o Signal para salvar a conversa aqui.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Essa pessoa não está mais usando o Signal. Convide essa pessoa para o Signal para salvar a conversa aqui.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Essa pessoa não está mais usando o Molly. Convide essa pessoa para o Molly para salvar a conversa aqui.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Convidar para o Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Convidar para o Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Você receberá outro lembrete em breve.</string>
 
@@ -519,8 +520,8 @@
     </plurals>
     <string name="ConversationFragment_save_to_sd_card">Salvar no armazenamento?</string>
     <plurals name="ConversationFragment_saving_n_media_to_storage_warning">
-        <item quantity="one">Salvar este arquivo de mídia no armazenamento permitirá que qualquer outro app do seu dispositivo tenha acesso a ele.\n\nQuer continuar?</item>
-        <item quantity="other">Salvar estes %1$d arquivos de mídia no armazenamento permitirá que qualquer outro app do seu dispositivo tenha acesso a eles.\n\nQuer continuar?</item>
+        <item quantity="one">Salvar este arquivo de mídia no armazenamento permitirá que qualquer outro app do seu dispositivo tenha acesso a ele.\n\nDeseja continuar?</item>
+        <item quantity="other">Salvar estes %1$d arquivos de mídia no armazenamento permitirá que qualquer outro app do seu dispositivo tenha acesso a eles.\n\nDeseja continuar?</item>
     </plurals>
     <plurals name="ConversationFragment_error_while_saving_attachments_to_sd_card">
         <item quantity="one">Erro ao salvar anexo no armazenamento!</item>
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Apagar para todos</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Apagar neste dispositivo</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Excluir</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Apagar em todos os lugares</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Esta mensagem será apagada para todos os participantes desse chat, se estiverem usando a versão mais recente do Signal. Eles poderão ver que você apagou uma mensagem.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Bloqueado</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Atualizar o Signal</string>
+    <string name="ConversationFragment__update_build">Atualizar o Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Fazer novo cadastro no Signal</string>
+    <string name="ConversationFragment__reregister_signal">Fazer novo cadastro no Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Voltar para a tela anterior.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Abrir o Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Abrir o Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Deixou de ser verificado</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Esta ação excluirá permanentemente o chat selecionado.</item>
         <item quantity="other">Esta ação excluirá permanentemente todos os %1$d chats selecionados.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Esta ação excluirá permanentemente a conversa selecionada de todos os seus dispositivos.</item>
+        <item quantity="other">Esta ação excluirá permanentemente as %1$d conversas selecionadas de todos os seus dispositivos.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Excluindo</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Excluir chat selecionado…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Quem pode me encontrar pelo número?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Qualquer pessoa que tenha seu número de telefone verá que você está no Signal e poderá iniciar chats com você.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Qualquer pessoa que tenha seu número de telefone verá que você está no Molly e poderá iniciar chats com você.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ninguém poderá ver que você está no Signal, a não ser que você envie uma mensagem ou participe de um chat com alguém.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ninguém poderá ver que você está no Molly, a não ser que você envie uma mensagem ou participe de um chat com alguém.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Restaurar do backup?</string>
@@ -762,17 +770,17 @@
 
     <!-- BackupsPreferenceFragment -->
     <string name="BackupsPreferenceFragment__chat_backups">Backup de chats</string>
-    <string name="BackupsPreferenceFragment__backups_are_encrypted_with_a_passphrase">Os backups são criptografados com uma senha e armazenados no seu dispositivo.</string>
+    <string name="BackupsPreferenceFragment__backups_are_encrypted_with_a_passphrase">Os backups são criptografados com uma frase-chave e armazenados no seu dispositivo.</string>
     <string name="BackupsPreferenceFragment__create_backup">Criar backup</string>
     <string name="BackupsPreferenceFragment__last_backup">Último backup: %1$s</string>
     <string name="BackupsPreferenceFragment__backup_folder">Pasta do backup</string>
     <!-- Title for a preference item allowing the user to selected the hour of the day when their chats are backed up. -->
     <string name="BackupsPreferenceFragment__backup_time">Horário do backup</string>
-    <string name="BackupsPreferenceFragment__verify_backup_passphrase">Verificar senha de backup</string>
-    <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Teste sua senha de backup e verifique se elas correspondem.</string>
+    <string name="BackupsPreferenceFragment__verify_backup_passphrase">Verificar frase-chave de backup</string>
+    <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Teste sua frase-chave de backup e verifique se ela corresponde</string>
     <string name="BackupsPreferenceFragment__turn_on">Ativar</string>
     <string name="BackupsPreferenceFragment__turn_off">Desativar</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Para restaurar um backup, faça uma nova instalação do Signal. Abra o aplicativo e toque no \"Restaurar o backup\", depois localize um arquivo de backup. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Para restaurar um backup, faça uma nova instalação do Molly. Abra o aplicativo e toque no \"Restaurar o backup\", depois localize um arquivo de backup. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Saiba mais</string>
     <string name="BackupsPreferenceFragment__in_progress">Em andamento…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d até agora…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% até agora…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">O Signal precisa da permissão ao armazenamento externo para fazer backup, mas ela foi permanentemente negada. Por favor, vá ao menu de configurações de aplicativos, selecione \"Permissões\", e habilite \"Armazenamento\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">O Molly precisa da permissão ao armazenamento externo para fazer backup, mas ela foi permanentemente negada. Por favor, vá ao menu de configurações de aplicativos, selecione \"Permissões\", e habilite \"Armazenamento\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Definir horário do backup</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">A sessão do chat foi reiniciada</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Às vezes, o Signal usa criptografia de ponta a ponta e pode precisar reiniciar a sessão do seu chat. Isso não afeta a segurança do chat, mas você pode perder uma mensagem desse contato e terá que pedir para ela ser enviada novamente.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Às vezes, o Molly usa criptografia de ponta a ponta e pode precisar reiniciar a sessão do seu chat. Isso não afeta a segurança do chat, mas você pode perder uma mensagem desse contato e terá que pedir para ela ser enviada novamente.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Use o Signal no desktop ou iPad. Suas mensagens serão sincronizadas com seus dispositivos vinculados.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Vincular um novo dispositivo</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s As mensagens e informações do chat são protegidas por criptografia de ponta a ponta em todos os dispositivos</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal no desktop ou iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Todas as mensagens nos dispositivos vinculados são privadas</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">As mensagens do Molly são sincronizadas com o Molly no seu celular após o vínculo. Seu histórico de mensagens anterior não será exibido.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">No seu outro dispositivo, acesse %1$s para instalar o Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Meus dispositivos vinculados</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Desvincular</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s desvinculado</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Vinculando dispositivo…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Dispositivo aprovado</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Carregando…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Nenhum dispositivo vinculado</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Desbloqueie para vincular um dispositivo</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Escaneie o código QR mostrado no dispositivo para vincular.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Escanear o código QR</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Use este dispositivo para escanear o QR code exibido no dispositivo que você quer vincular</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Ok</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Este dispositivo poderá ver seus grupos e contatos, acessar suas conversas e enviar mensagens em seu nome.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Termine de vincular em outro dispositivo</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Conclua o vínculo do Molly em seu outro dispositivo.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Falha ao vincular aparelho</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Este código QR não é válido. Certifique-se de escanear o código QR exibido pelo aparelho que você deseja vincular.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Tente novamente</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Desvincular \'%1$s\'?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Otimizar para ausência do Play Services</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Este dispositivo não tem suporte para o Play Services. Clique para desabilitar as otimizações de bateria do sistema que impedem o Signal de receber mensagens enquanto está inativo.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Este dispositivo não tem suporte para o Play Services. Clique para desabilitar as otimizações de bateria do sistema que impedem o Molly de receber mensagens enquanto está inativo.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Esta versão do Signal não é mais suportada. Atualize agora para poder enviar e receber as mensagens.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Esta versão do Molly não é mais suportada. Atualize agora para poder enviar e receber as mensagens.</string>
     <string name="ExpiredBuildReminder_update_now">Atualize agora</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Exibir</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Falha permanente de comunicação do Signal!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">O Signal não conseguiu cadastrar-se no Google Play Services. Mensagens e chamadas do Signal foram desabilitadas; tente recadastrar em Configurações &gt; Avançado.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Falha permanente de comunicação do Molly!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">O Molly não conseguiu se registrar nos Serviços do Google Play. As mensagens e chamadas do Molly foram desativadas. Por favor, tente se registrar novamente em Configurações &gt; Avançado.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Os registros de depuração nos ajudam a diagnosticar e corrigir o problema e não contêm informações de identificação.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">O Signal encontrou um problema. Enviar registro de depuração?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">O Molly encontrou um problema. Enviar registro de depuração?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">As notificações podem atrasar devido a otimizações de bateria</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Você pode desativar as otimizações de bateria do Signal para garantir que as notificações de mensagens não cheguem atrasadas.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Você pode desativar as otimizações de bateria do Molly para garantir que as notificações de mensagens não cheguem atrasadas.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">As notificações podem atrasar devido a otimizações de bateria</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Desative as otimizações de bateria do Molly para garantir que as notificações de mensagens não atrasem. Toque em \"Continuar\" para ver as instruções específicas para o seu dispositivo.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Não</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Continuar</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Continuar</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Ignorar</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Não</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Convites de grupo pendentes</string>
+    <string name="PendingMembersActivity_pending_group_invites">Pedidos e convites</string>
     <string name="PendingMembersActivity_requests">Pedidos</string>
     <string name="PendingMembersActivity_invites">Convites</string>
     <string name="PendingMembersActivity_people_you_invited">Pessoas que você convidou</string>
@@ -1246,14 +1319,14 @@
 
     <!-- GroupInviteLinkEnableAndShareBottomSheetDialogFragment -->
     <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_invite_friends">Convidar amigos(as)</string>
-    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_share_a_link_with_friends_to_let_them_quickly_join_this_group">Compartilhe um link com seus(suas) amigos(as) para que eles(elas) entrem rápido no grupo.</string>
+    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_share_a_link_with_friends_to_let_them_quickly_join_this_group">Compartilhe um link com seus amigos e amigas para que eles entrem rapidamente no grupo.</string>
 
     <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_enable_and_share_link">Ativar e compartilhar link</string>
     <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_share_link">Compartilhar link</string>
 
-    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_unable_to_enable_group_link_please_try_again_later">Não foi possível ativar o grupo. Por favor, tente novamente mais tarde</string>
+    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_unable_to_enable_group_link_please_try_again_later">Não foi possível ativar o link do grupo. Por favor, tente novamente mais tarde.</string>
     <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_encountered_a_network_error">Ocorreu um erro de rede.</string>
-    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_you_dont_have_the_right_to_enable_group_link">Você não dispõe de privilégios para ativar o link de um grupo. Por favor, peça ajuda ao(à) admin.</string>
+    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_you_dont_have_the_right_to_enable_group_link">Você não tem permissão para ativar o link do grupo. Por favor, peça ajuda ao(à) administrador(a).</string>
     <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_you_are_not_currently_a_member_of_the_group">Atualmente você não é membro do grupo.</string>
 
     <!-- GV2 Request confirmation dialog -->
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Cancelar</string>
     <string name="InviteActivity_sending">Enviando…</string>
     <string name="InviteActivity_invitations_sent">Convites enviados!</string>
-    <string name="InviteActivity_invite_to_signal">Convidar para o Signal</string>
+    <string name="InviteActivity_invite_to_signal">Convidar para o Molly</string>
     <string name="InviteActivity_send_sms">Enviar SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Enviar %1$d convite por SMS?</item>
         <item quantity="other">Enviar %1$d convites por SMS?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Vamos mudar para o Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Vamos mudar para o Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Parece que você não tem aplicativos para onde compartilhar.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Sua mensagem</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Conexão em segundo plano habilitada</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Respostas</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Estabelecendo chamada Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">Estabelecendo chamada Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Iniciando serviço de ligações do Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Encerrando chamada Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Iniciando serviço de ligações do Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Encerrando chamada Molly</string>
     <string name="NotificationBarManager__cancel_call">Cancelar chamada</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Seus Pagamentos foram ativados</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s já pode aceitar Pagamentos</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Os detalhes de pagamento não estão disponíveis</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Toque para ver mais</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Os detalhes de pagamento não estão disponíveis</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Os detalhes deste pagamento não estão disponíveis porque suas mensagens foram restauradas de uma fonte que não incluía esse histórico. Isso não afeta o saldo de sua carteira ou o status de pagamentos anteriores.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Em breve, você não poderá mais enviar mensagens SMS do Signal. Convide %1$s para o Signal para salvar a conversa aqui.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Você não pode mais enviar mensagens SMS no Signal. Convide %1$s para o Signal para salvar a conversa aqui.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Você não pode mais enviar mensagens SMS no Molly. Convide %1$s para o Molly para salvar a conversa aqui.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Pagamento: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Pagamento</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Denunciado como spam</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Vincular um dispositivo Signal?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Parece que você está tentando vincular um dispositivo Signal usando um leitor externo. Para sua proteção, favor escanear novamente usando o leitor do Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">O Signal precisa da permissão Câmera para escanear um código QR, mas ela foi permanentemente negada. Favor ir no menu de configurações de aplicativos, selecionar \"Permissões\", e habilitar \"Câmera\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">O Molly precisa da permissão Câmera para escanear um código QR, mas ela foi permanentemente negada. Favor ir no menu de configurações de aplicativos, selecionar \"Permissões\", e habilitar \"Câmera\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Não é possível escanear um código QR sem a permissão Câmera</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Inserir frase-chave</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Ícone do Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Ícone do Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Enviar frase-chave</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Frase-chave inválida!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Destrancar Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Tela de bloqueio</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Destrancar Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Tela de bloqueio</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Mapa</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Verifique para continuar a enviar mensagens</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Para ajudar a evitar spam no Signal, conclua a verificação, por favor.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Para ajudar a evitar spam no Molly, conclua a verificação, por favor.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Depois de verificar, você pode continuar a enviar mensagens. Quaisquer mensagens pendentes serão enviadas automaticamente.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Meu Story</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Chamada do Signal</string>
+    <string name="Recipient_signal_call">Chamada do Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Bloquear</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Chamando…</string>
     <string name="RedPhone_busy">Ocupado</string>
     <string name="RedPhone_recipient_unavailable">Destinatário não disponível</string>
-    <string name="RedPhone_network_failed">Rede falhou!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Falha na rede! Por favor, verifique a conexão de rede e tente novamente.</string>
     <string name="RedPhone_number_not_registered">Número não registrado!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">O número que você ligou não possui suporte para ligação criptografada!</string>
     <string name="RedPhone_got_it">Entendi</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Toque para ligar seu vídeo</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Para ligar para %1$s, Signal precisa ter acesso à sua câmera</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Para ligar para %1$s, Molly precisa ter acesso à sua câmera</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Chamando…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Reconectando…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Removido da chamada</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Alguém removeu você da chamada.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Permita o acesso à sua câmera e microfone</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Permitir acesso ao microfone</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Permita o acesso à sua câmera</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Para iniciar ou entrar em uma chamada, permita que o Molly acesse sua câmera e microfone.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Para iniciar ou entrar em uma chamada, permita que o Molly acesse seu microfone.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Para ativar o vídeo, permita que o Molly acesse a câmera.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">O Molly precisa das permissões de microfone para iniciar ou entrar em uma chamada.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">O Molly precisa acessar a câmera para ativar seu vídeo</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Para iniciar ou entrar em uma chamada:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Para ativar seu vídeo:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Chamada Signal</string>
-    <string name="WebRtcCallView__signal_video_call">Chamada de vídeo do Signal</string>
+    <string name="WebRtcCallView__signal_call">Chamada Molly</string>
+    <string name="WebRtcCallView__signal_video_call">Chamada de vídeo do Molly</string>
     <string name="WebRtcCallView__start_call">Começar a chamada</string>
     <string name="WebRtcCallView__join_call">Participar da chamada</string>
     <string name="WebRtcCallView__call_is_full">A chamada está lotada</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Quer abaixar a mão?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Abaixar a mão</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Abaixar</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Cancelar</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Você levantou a mão</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Exibir</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s levantou a mão</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s levantou a mão</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d levantaram a mão</item>
+        <item quantity="other">%1$s + %2$d levantaram a mão</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s levantou a mão</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d levantaram a mão</item>
         <item quantity="other">%1$s + %2$d levantaram a mão</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Você receberá uma chamada para verificar esse número.</string>
     <string name="RegistrationActivity_edit_number">Editar número</string>
     <string name="RegistrationActivity_missing_google_play_services">Google Play Services está faltando</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Este aparelho não tem Google Play Services. Você ainda pode usar o Signal, mas talvez não consiga a mesma estabilidade e desempenho.\n\nSe você não é um(a) usuário(a) avançado(a), não está usando uma ROM Android customizada, ou acredita que isto é um erro, fale conosco no endereço support@signal.org para que possamos ajudar a resolver o problema.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Este aparelho não tem Google Play Services. Você ainda pode usar o Molly, mas talvez não consiga a mesma estabilidade e desempenho.\n\nSe você não é um(a) usuário(a) avançado(a), não está usando uma ROM Android customizada, ou acredita que isto é um erro, fale conosco no endereço support@molly.im para que possamos ajudar a resolver o problema.</string>
     <string name="RegistrationActivity_i_understand">Entendi</string>
     <string name="RegistrationActivity_play_services_error">Erro no Play Services</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services está sendo atualizado ou temporariamente indisponível. Por favor, tente novamente.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Formato de número de telefone não reconhecido</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">O número que você inseriu (%1$s) não parece estar no formato padrão de números de telefone.\n\nSerá que você quis dizer %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Formato de números de telefone</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Formato de números de telefone</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Ligação solicitada</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Está enfrentando problemas para se cadastrar?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Confira se seu telefone tem sinal para receber um SMS ou chamada • Confirme que pode receber uma ligação para este número\n • Confira se inseriu o número de telefone corretamente.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Para mais informações, siga os passos de resolução de problemas abaixo ou entre em contato com a equipe de suporte</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Para saber mais, siga %1$s ou %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">passos de resolução de problemas</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Adicionar a Contatos</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Convidar para o Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Convidar para o Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Mensagem no Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Chamada do Signal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Adicionar a Contatos</string>
-    <string name="SharedContactView_invite_to_signal">Convidar para o Signal</string>
+    <string name="SharedContactView_invite_to_signal">Convidar para o Molly</string>
     <string name="SharedContactView_message">Mensagem no Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s pertence a %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Atualização do Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Uma nova versão do Signal está disponível. Toque para atualizar.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Falha ao atualizar o Signal</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Atualização do Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Uma nova versão do Molly está disponível. Toque para atualizar.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Falha ao atualizar o Molly</string>
     <string name="ApkUpdateNotifications_failed_general_body">Tentaremos novamente mais tarde.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal atualizado</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly atualizado</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Seu app foi atualizado automaticamente para a versão %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Nosso número de segurança Signal:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Parece que você não tem aplicativos para onde compartilhar.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Nenhum número de segurança a ser comparado foi encontrado na área de transferência</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">O Signal precisa da permissão Câmera para escanear um código QR, mas ela foi permanentemente negada. Favor ir no menu de configurações de aplicativos, selecionar \"Permissões\", e habilitar \"Câmera\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">O Molly precisa da permissão Câmera para escanear um código QR, mas ela foi permanentemente negada. Favor ir no menu de configurações de aplicativos, selecionar \"Permissões\", e habilitar \"Câmera\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Não é possível escanear código QR sem a permissão Câmera</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Primeiro é necessário trocar algumas mensagens para ver o número de segurança de %1$s.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Toque para abrir.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal está destrancado</string>
-    <string name="KeyCachingService_lock">Trancar Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly está destrancado</string>
+    <string name="KeyCachingService_lock">Trancar Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Você</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Tipo de mídia não suportado</string>
     <string name="MediaPreviewActivity_draft">Rascunho</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">O Signal precisa da permissão Armazenamento para gravar dados no armazenamento externo, mas ela foi permanentemente negada. Favor ir no menu de configurações de aplicativos, selecionar \"Permissões\", e habilitar \"Armazenamento\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">O Molly precisa da permissão Armazenamento para gravar dados no armazenamento externo, mas ela foi permanentemente negada. Favor ir no menu de configurações de aplicativos, selecionar \"Permissões\", e habilitar \"Armazenamento\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Não é possível gravar dados no armazenamento externo sem as permissões</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Apagar mensagem?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Esta mensagem será apagada permanentemente.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Falha ao enviar mensagem.</string>
     <string name="MessageNotifier_error_delivering_message">Erro ao enviar mensagem.</string>
     <string name="MessageNotifier_message_delivery_paused">Entrega de mensagens em pausa.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifique para continuar a enviar mensagens no Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifique para continuar a enviar mensagens no Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Marcar todas como lidas</string>
     <string name="MessageNotifier_mark_read">Marcar como lida</string>
     <string name="MessageNotifier_turn_off_these_notifications">Desative estas notificações</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Reagiu com %1$s à sua figurinha.</string>
     <string name="MessageNotifier_this_message_was_deleted">Esta mensagem foi apagada.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Desabilitar notificações de contatos que entram no Signal? Você pode habilitá-las novamente em Signal &gt; Configurações &gt; Notificações.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Desabilitar notificações de contatos que entram no Molly? Você pode habilitá-las novamente em Molly &gt; Configurações &gt; Notificações.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Resposta rápida não disponível quando o Signal está trancado!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Resposta rápida não disponível quando o Molly está trancado!</string>
     <string name="QuickResponseService_problem_sending_message">Problema ao enviar mensagem!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Atalho inválido</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Nova mensagem</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Solicitação de conversa</string>
     <string name="SingleRecipientNotificationBuilder_you">Você</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">O dispositivo não está mais registrado. Isso ocorreu porque você registrou seu número de telefone com o Signal em outro dispositivo.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">O dispositivo não está mais registrado. Isso ocorreu porque você registrou seu número de telefone com o Molly em outro dispositivo.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Registrar novamente o dispositivo</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Para atender a chamada, conceda ao Signal acesso ao seu microfone.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Para atender a chamada, conceda ao Molly acesso ao seu microfone.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Para atender a videochamada, permita que o Signal acesse seu microfone e câmera.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">O Signal precisa das permissões Microfone e Câmera para fazer ou receber chamadas, mas elas foram permanentemente negadas. Favor ir no menu de configurações de aplicativos, selecionar \"Permissões\", e habilitar \"Microfone\" e \"Câmera\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Para atender a videochamada, permita que o Molly acesse seu microfone e câmera.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">O Molly precisa das permissões Microfone e Câmera para fazer ou receber chamadas, mas elas foram permanentemente negadas. Favor ir no menu de configurações de aplicativos, selecionar \"Permissões\", e habilitar \"Microfone\" e \"Câmera\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Atendido em um dispositivo vinculado.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Recusado em um dispositivo vinculado.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Ocupado em um dispositivo vinculado.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Repita a nova frase-chave</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Convidar para o Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Convidar para o Molly</string>
     <string name="contact_selection_activity__new_group">Novo grupo</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Atualizar contatos</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Está faltando alguém? Tente atualizar</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Encontre pessoas que você conhece no Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Permita o acesso aos seus contatos</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Mais</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Foto do contato</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">O Signal precisa da permissão Contatos para exibir seus contatos, mas ela foi permanentemente negada. Favor ir no menu de configurações de aplicativos, selecionar \"Permissões\", e habilitar \"Contatos\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">O Molly precisa da permissão Contatos para exibir seus contatos, mas ela foi permanentemente negada. Favor ir no menu de configurações de aplicativos, selecionar \"Permissões\", e habilitar \"Contatos\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Erro ao buscar os contatos, verifique sua conexão à rede</string>
     <string name="ContactSelectionListFragment_username_not_found">Usuário não encontrado</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" não é um usuário do Signal. Verifique o nome de usuário e tente novamente."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Encontrar pelo nome de usuário</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Permita o acesso aos contatos</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Para encontrar pessoas que você conhece no Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Permitir acesso</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Não</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Permitir acesso aos seus contatos. Seus contatos são criptografados e não são visíveis para o serviço do Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">O Signal precisa de acesso aos seus contatos para poder exibi-los.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">O Molly precisa de acesso aos seus contatos para poder exibi-los.</string>
     <string name="contact_selection_list_fragment__show_contacts">Mostrar contatos</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Você removeu esta pessoa. Se você enviar uma mensagem, ela voltará à sua lista.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Opções</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Atualizar</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Tocar … Pausar</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Bolhas são um recurso do Android que você pode desativar para chats no Signal.</string>
+    <string name="BubbleOptOutTooltip__description">Bolhas são um recurso do Android que você pode desativar para chats no Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Agora não</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Descrição do grupo</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Atualizar o Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Atualizar o Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Esta versão do Signal expirou. Atualize agora para continuar a usar o Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Esta versão do Molly expirou. Atualize agora para continuar a usar o Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Atualizar</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Lento</string>
     <string name="preferences__help">Ajuda</string>
     <string name="preferences__advanced">Avançadas</string>
-    <string name="preferences__donate_to_signal">Doar para o Signal</string>
+    <string name="preferences__donate_to_signal">Doar para o Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Privacidade</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Mudar ícone e nome do app para \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Para mudar o ícone e nome do app, você precisará fechar o Signal. As notificações sempre exibirão o ícone e o nome padrão do Signal.</string>
+    <string name="preferences__app_icon_dialog_description">Para mudar o ícone e nome do app, você precisará fechar o Molly. As notificações sempre exibirão o ícone e o nome padrão do Molly.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Selecione um ícone e nome para o app, que ficarão visíveis na tela inicial do seu telefone e na gaveta de apps. As notificações sempre exibirão o ícone e o nome padrão do Signal. Saiba mais</string>
+    <string name="preferences__app_icon_warning_learn_more">Selecione um ícone e nome para o app, que ficarão visíveis na tela inicial do seu telefone e na gaveta de apps. As notificações sempre exibirão o ícone e o nome padrão do Molly. Saiba mais</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Os ícones e nomes de apps ficam visíveis na tela inicial e na gaveta de apps.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">As notificações sempre exibirão o ícone e o nome padrão do Signal.</string>
+    <string name="preferences__app_icon_notification_warning">As notificações sempre exibirão o ícone e o nome padrão do Molly.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Saiba mais</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Esta ação vai recortar todos os chats nas %1$s mensagens mais recentes.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Todo o histórico de mensagens e mídias do seu dispositivo serão apagados permanentemente.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Isso excluirá permanentemente todo o histórico de mensagens e mídias deste dispositivo e de todos os dispositivos vinculados.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Tem certeza que quer apagar todo o histórico de mensagens?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Todo o histórico de mensagens será excluído permanentemente. Esta ação não pode ser desfeita.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Todo o histórico de mensagens será removido permanentemente de todos os dispositivos. Essa ação não pode ser desfeita.</string>
     <string name="preferences_storage__delete_all_now">Apagar tudo agora</string>
     <string name="preferences_storage__forever">Para sempre</string>
     <string name="preferences_storage__one_year">1 ano</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Driblagem de censura</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Driblagem de censura</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Se ativado, Signal tentará contornar a censura. Não habilite esta função ao menos que você esteja em um lugar onde Signal é censurado.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Se ativado, Molly tentará contornar a censura. Não habilite esta função ao menos que você esteja em um lugar onde Molly é censurado.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">A driblagem de censura foi ativada tendo como base o número de telefone da sua conta.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Apresentamos Pagamentos</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Use o Signal para enviar e receber MobileCoin, uma nova moeda digital com foco na privacidade. Ative para começar.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Use o Molly para enviar e receber MobileCoin, uma nova moeda digital com foco na privacidade. Ative para começar.</string>
     <string name="PaymentsHomeFragment__activate_payments">Ativar o módulo de Pagamentos</string>
     <string name="PaymentsHomeFragment__activating_payments">Ativando o módulo de pagamentos…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Restaurar a conta de pagamentos</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Pagamentos não estão disponíveis na sua região.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Não foi possível habilitar pagamentos. Tente mais tarde.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Desativar o módulo de Pagamentos?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Você não poderá enviar ou receber MobileCoin no Signal, se desativar o módulo de pagamentos.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Você não poderá enviar ou receber MobileCoin no Molly, se desativar o módulo de pagamentos.</string>
     <string name="PaymentsHomeFragment__deactivate">Desativar</string>
     <string name="PaymentsHomeFragment__continue">Continuar</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">O saldo não está disponível no momento.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Detalhes</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Você pode usar o Signal para enviar e receber MobileCoins. Todos os pagamentos estão sujeitos aos Termos de Uso para MobileCoins e MobileCoin Wallet. Você poderá encontrar alguns problemas. Se perder pagamentos ou saldos, talvez não seja possível recuperá-los. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Você pode usar o Molly para enviar e receber MobileCoins. Todos os pagamentos estão sujeitos aos Termos de Uso para MobileCoins e MobileCoin Wallet. Você poderá encontrar alguns problemas. Se perder pagamentos ou saldos, talvez não seja possível recuperá-los. </string>
     <string name="PaymentsHomeFragment__activate">Ativar</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Ver os termos da MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">O módulo de Pagamentos não está mais disponível no Signal. Você ainda pode transferir fundos para uma intermediação de troca, mas não pode mais enviar e receber pagamentos ou adicionar fundos.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">O módulo de Pagamentos não está mais disponível no Molly. Você ainda pode transferir fundos para uma intermediação de troca, mas não pode mais enviar e receber pagamentos ou adicionar fundos.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Autorizar</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Para ajudar a enviar mensagens para pessoas que você conhece, o Signal solicitará essas permissões. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Para ajudar a enviar mensagens para pessoas que você conhece, o Molly solicitará essas permissões. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Notificações</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Próximo</string>
     <string name="PaymentsTransferFragment__invalid_address">Endereço inválido</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Verifique o endereço da carteira para o qual você está tentando transferir e tente novamente.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Você não pode transferir para o endereço da sua própria carteira Signal. Digite o endereço de uma carteira sua que esteja em uma intermediação de troca válida.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Para escanear um código QR, o Signal precisa de acesso à sua câmera.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal precisa da permissão da Câmera para escanear um código QR. Vá para as configurações, selecione \"Permissões\", e habilite \"Câmera\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Para escanear um código QR, o Signal precisa de acesso à sua câmera.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Você não pode transferir para o endereço da sua própria carteira Molly. Digite o endereço de uma carteira sua que esteja em uma intermediação de troca válida.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Para escanear um código QR, o Molly precisa de acesso à sua câmera.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly precisa da permissão da Câmera para escanear um código QR. Vá para as configurações, selecione \"Permissões\", e habilite \"Câmera\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Para escanear um código QR, o Molly precisa de acesso à sua câmera.</string>
     <string name="PaymentsTransferFragment__settings">Configurações</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Recebendo chamada de voz do Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Recebendo chamada de voz do Molly</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Recebendo chamada de vídeo do Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Recebendo chamada de vídeo do Molly</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
     <string name="CallNotificationBuilder__incoming_signal_group_call">Recebendo chamada de vídeo em grupo</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Chamada de voz do Signal em andamento</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Chamada de voz do Molly em andamento</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Chamada de vídeo do Signal em andamento</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Chamada de vídeo do Molly em andamento</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Chamada de grupo do Signal em andamento</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Chamada de grupo do Molly em andamento</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Carregando…</string>
@@ -3953,7 +4084,7 @@
     <string name="SQLCipherMigrationHelper_migrating_signal_database">Migrando a base de dados do Signal</string>
     <string name="enter_backup_passphrase_dialog__backup_passphrase">Frase-chave de backup</string>
     <string name="backup_enable_dialog__backups_will_be_saved_to_external_storage_and_encrypted_with_the_passphrase_below_you_must_have_this_passphrase_in_order_to_restore_a_backup">Os backups serão salvos no armazenamento externo e criptografados com a frase-chave abaixo. Você precisa desta frase-chave para restaurar um backup.</string>
-    <string name="backup_enable_dialog__you_must_have_this_passphrase">Você deve ter esta senha para restaurar um backup.</string>
+    <string name="backup_enable_dialog__you_must_have_this_passphrase">Você deve ter esta frase-chave para restaurar um backup.</string>
     <string name="backup_enable_dialog__folder">Pasta</string>
     <string name="backup_enable_dialog__i_have_written_down_this_passphrase">Eu anotei esta frase-chave. Sem ela eu não conseguirei restaurar um backup.</string>
     <string name="registration_activity__restore_backup">Restaurar backup</string>
@@ -3985,13 +4116,13 @@
     <string name="BackupDialog_choose_folder">Escolher pasta</string>
     <string name="BackupDialog_copied_to_clipboard">Copiado para a área de transferência</string>
     <string name="BackupDialog_no_file_picker_available">Nenhum seletor de arquivos disponível.</string>
-    <string name="BackupDialog_enter_backup_passphrase_to_verify">Digite sua senha de backup para verificação</string>
+    <string name="BackupDialog_enter_backup_passphrase_to_verify">Digite sua frase-chave de backup para verificação</string>
     <string name="BackupDialog_verify">Verificar</string>
-    <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Você digitou com sucesso sua senha de backup</string>
+    <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Você digitou com sucesso sua frase-chave de backup</string>
     <string name="BackupDialog_passphrase_was_not_correct">A senha está incorreta</string>
-    <string name="LocalBackupJob_creating_signal_backup">Criando backup do Signal…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Criando backup do Molly…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Verificando backup do Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Verificando backup do Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">Backup falhou</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Sua pasta de backup foi apagada ou movida.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Seu arquivo de backup é muito grande para ser armazenado neste local.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Ligue pra mim (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Reenviar código (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Entre em contato com o Suporte do Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Registro Signal - Código de verificação para Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Entre em contato com o Suporte do Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Registro Molly - Código de verificação para Android</string>
     <string name="RegistrationActivity_incorrect_code">Código incorreto</string>
     <string name="BackupUtil_never">Nunca</string>
     <string name="BackupUtil_unknown">Desconhecida</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Número de telefone</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Defina quem pode encontrar seu número de telefone e quem pode entrar em contato com você pelo Signal usando seu número.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Defina quem pode encontrar seu número de telefone e quem pode entrar em contato com você pelo Molly usando seu número.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Quem pode ver meu número?</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Você excedeu o número de tentativas permitido. Por favor, tente novamente mais tarde.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Erro na conexão ao serviço</string>
     <string name="preferences_chats__backups">Backups</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal está trancado</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly está trancado</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">TOQUE PARA DESTRANCAR</string>
     <string name="Recipient_unknown">Desconhecido</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Você precisa ter acesso ao seu aparelho antigo.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Restaurar de backup</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Restaure as suas mensagens de um backup local. Se você não restaurar agora, não será possível restaurar mais tarde.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Restaurar backup local</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Restaurar backup do Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Restaure todas as suas mensagens de texto e os últimos 30 dias de mídia.</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Mais opções</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Cancelar</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Faça login sem transferir</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Continue sem transferir suas mensagens e arquivos de mídia</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Abra o Signal no seu aparelho Android antigo</string>
     <string name="NewDeviceTransferInstructions__continue">Continuar</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Preparando a conexão com o aparelho Android antigo…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Está demorando um pouco, mas deve estar pronto em breve</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Aguardando o aparelho Android antigo se conectar…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">O Signal precisa de permissão de localização para encontrar e se conectar ao seu aparelho Android antigo.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">O Signal precisa que os serviços de localização estejam ativados para encontrar e se conectar ao seu aparelho Android antigo.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">O Signal precisa de Wi-Fi para encontrar e se conectar ao seu aparelho Android antigo. O Wi-Fi precisa estar ativado, mas o aparelho não precisa estar conectado a uma rede Wi-Fi.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Parece que este aparelho não é compatível com Wi-Fi Direct. O Signal usa o Wi-Fi Direct para encontrar e se conectar ao seu aparelho Android antigo. Você ainda pode restaurar um backup para transferir a sua conta do seu aparelho Android antigo.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">O Molly precisa de permissão de localização para encontrar e se conectar ao seu aparelho Android antigo.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">O Molly precisa que os serviços de localização estejam ativados para encontrar e se conectar ao seu aparelho Android antigo.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">O Molly precisa de Wi-Fi para encontrar e se conectar ao seu aparelho Android antigo. O Wi-Fi precisa estar ativado, mas o aparelho não precisa estar conectado a uma rede Wi-Fi.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Desculpe, parece que este dispositivo não suporta Wi-Fi Direct. O Molly usa Wi-Fi Direct para descobrir e conectar-se ao seu dispositivo Android antigo. Você ainda pode restaurar um backup para recuperar sua conta do seu dispositivo Android antigo</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Restaurar um backup</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Ocorreu um erro inesperado ao tentar se conectar ao seu aparelho Android antigo.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Procurando o novo aparelho Android…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">O Signal precisa de permissão de localização para encontrar e se conectar ao seu novo aparelho Android.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">O Signal precisa de serviços de localização ativados para encontrar e se conectar ao seu novo aparelho Android.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">O Signal precisa de Wi-Fi para encontrar e se conectar ao seu novo aparelho Android. O Wi-Fi precisa estar ativado, mas o aparelho não precisa estar conectado a uma rede Wi-Fi.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Parece que este aparelho não é compatível com Wi-Fi Direct. O Signal usa o Wi-Fi Direct para encontrar e se conectar ao seu aparelho Android antigo. Você ainda pode criar um backup para transferir a sua conta para o seu novo aparelho Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">O Molly precisa de permissão de localização para encontrar e se conectar ao seu novo aparelho Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">O Molly precisa de serviços de localização ativados para encontrar e se conectar ao seu novo aparelho Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">O Molly precisa de Wi-Fi para encontrar e se conectar ao seu novo aparelho Android. O Wi-Fi precisa estar ativado, mas o aparelho não precisa estar conectado a uma rede Wi-Fi.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Desculpe, parece que este dispositivo não suporta Wi-Fi Direct. O Molly usa Wi-Fi Direct para descobrir e conectar-se ao seu novo dispositivo Android. Você ainda pode criar um backup para restaurar sua conta no seu novo dispositivo Android.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Criar um backup</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Ocorreu um erro inesperado ao tentar se conectar ao seu novo aparelho Android.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Transferindo dados</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Mantenha os dois aparelhos próximos um do outro. Não desligue os aparelhos e mantenha o Signal aberto. Transferências são criptografadas de ponta a ponta.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Mantenha os dois aparelhos próximos um do outro. Não desligue os aparelhos e mantenha o Molly aberto. Transferências são criptografadas de ponta a ponta.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d mensagens até agora…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% das mensagens até agora…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Transferir conta</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Faça o download do Signal no seu novo dispositivo Android</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Faça o download do Molly no seu novo dispositivo Android</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Toque em \"Transferir ou restaurar a conta\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Qualquer pessoa com este link pode ver o nome e a foto do grupo e pedir para participar. Compartilhe o link com pessoas que você confia.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Qualquer pessoa com este link pode ver o nome, a foto do grupo e entrar nele. Compartilhe o link com pessoas que você confia.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Compartilhar via Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Compartilhar via Molly</string>
     <string name="GroupLinkBottomSheet_copy">Copiar</string>
     <string name="GroupLinkBottomSheet_qr_code">Código QR</string>
     <string name="GroupLinkBottomSheet_share">Compartilhar</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">Sobre a MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin é uma nova moeda digital focada em privacidade.</string>
     <string name="payment_info_card_adding_funds">Adicionando fundos</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Você pode enviar MobileCoin para o endereço da sua carteira, de modo a usá-lo no Signal.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Você pode enviar MobileCoin para o endereço da sua carteira, de modo a usá-lo no Molly.</string>
     <string name="payment_info_card_cashing_out">Sacar</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Você pode sacar MobileCoin a qualquer momento em uma intermediação de troca que aceite MobileCoin. Basta fazer uma transferência para a sua conta nessa intermediação de troca.</string>
     <string name="payment_info_card_hide_this_card">Esconder este cartão?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Desativar carteira</string>
     <string name="DeactivateWalletFragment__your_balance">Seu saldo</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">É recomendável que você transfira o seu saldo para outro endereço de carteira antes de desativar o módulo de pagamentos. Se você optar por não transferir o seu saldo agora, ele permanecerá em sua carteira vinculada à conta do Signal, mas estará suspenso para utilização até que você decida reativar o módulo de pagamentos.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">É recomendável que você transfira o seu saldo para outro endereço de carteira antes de desativar o módulo de pagamentos. Se você optar por não transferir o seu saldo agora, ele permanecerá em sua carteira vinculada à conta do Molly, mas estará suspenso para utilização até que você decida reativar o módulo de pagamentos.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Transferir saldo remanescente</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Desativar sem transferir</string>
     <string name="DeactivateWalletFragment__deactivate">Desativar</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Desativar sem transferir?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Seu saldo permanecerá na carteira vinculada à sua conta do Signal, mas estará suspenso para utilização até que você decida reativar o módulo de pagamentos.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Seu saldo permanecerá na carteira vinculada à sua conta do Molly, mas estará suspenso para utilização até que você decida reativar o módulo de pagamentos.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Erro ao desativar a carteira.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licenças</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Termos e Política de Privacidade</string>
-    <string name="HelpFragment__copyright_signal_messenger">Direitos autorais Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Direitos autorais Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Licenciado nos termos da GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Escolher uma cor</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Compartilhar</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Somente administradores podem enviar mensagens para esse grupo.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Limite alcançado</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Você não pode selecionar mais de 5 conversas.</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Saiba mais</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Atualizar o Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Atualizar o Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Esta versão do Signal expirou. Atualize agora para continuar a usar o Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Esta versão do Molly expirou. Atualize agora para continuar a usar o Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Atualizar</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Dispositivo não registrado</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">O dispositivo não está mais registrado. Cadastre-se novamente para continuar usando o Signal neste dispositivo.</string>
+    <string name="ReregisterSignalDialog__message">O dispositivo não está mais registrado. Cadastre-se novamente para continuar usando o Molly neste dispositivo.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Registrar novamente</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Falha ao abrir o selecionador de toques.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Para ativar notificações, o Signal precisa de permissão para exibi-las.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Para ativar notificações, o Molly precisa de permissão para exibi-las.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Ativar</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Ainda não há respostas</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Você não pode responder a este story porque não faz mais parte do grupo.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Reagiu ao story</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Reagiu ao story</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Reagiu ao story</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Visualizações</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Escolha seu banco</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Como confirmar sua doação com %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Para configurar sua doação recorrente, toque em continuar para confirmar uma cobrança de € 0,01 com seu banco. Este valor será automaticamente reembolsado e permitirá que sua doação de € 5/mês seja debitada de sua conta.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Toque em continuar para confirmar uma cobrança de € 0,01 com seu banco e configurar sua doação mensal. Esse valor será reembolsado automaticamente e permitirá que sua doação de %1$s/mês seja debitada de sua conta.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Continuar</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Baixando dados de backup…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Os backups de arquivos de mídia estão desativados</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Seu plano de backup de mídia do Signal foi cancelado porque o pagamento não pôde ser processado. Você tem %1$d dia para baixar os arquivos de mídia armazenados no backup. Após %1$d dia, os arquivos de mídia no backup serão excluídos.</item>
+        <item quantity="other">Seu plano de backup de mídia do Signal foi cancelado porque o pagamento não pôde ser processado. Você tem %1$d dias para baixar os arquivos de mídia armazenados no backup. Após %1$d dias, os arquivos de mídia no backup serão excluídos.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Você pode voltar a pagar pelos backups a qualquer momento para continuar salvando todos os seus arquivos de mídia. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Seus arquivos de mídia serão excluídos hoje</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Seu plano de backup de mídia do Signal foi cancelado porque o pagamento não pôde ser processado. Essa é sua última chance de baixar os arquivos de mídia do backup antes que eles sejam excluídos.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Não é possível concluir o download</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Seu dispositivo não tem espaço livre suficiente. Libere %1$s de espaço para baixar a mídia armazenada no seu backup.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Se você selecionar \"Pular\", os arquivos de mídia do seu backup serão excluídos em %1$d dia.</item>
+        <item quantity="other">Se você selecionar \"Pular\", os arquivos de mídia do seu backup serão excluídos em %1$d dias.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Não foi possível processar o pagamento do backup</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Estamos com dificuldades para processar seu pagamento mensal recorrente do backup. Confira se o método de pagamento está atualizado. Se não estiver, atualize no Google Pay. O Signal tentará processar o pagamento novamente em alguns dias.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Não foi possível concluir o backup</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Seu dispositivo não conclui um backup há %1$d dias. Confira se o dispositivo está conectado à rede Wi-Fi e toque em \"Fazer backup agora\". </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Saiba mais</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Pular</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Baixar mídia agora</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Baixar mais tarde</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Não quero baixar os arquivos de mídia</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Libere %1$s de espaço para baixar seu arquivo de mídia.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Cartão de crédito ou débito</string>
@@ -6874,16 +7058,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Desconhecido</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Histórico de pagamentos</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Seu último backup foi feito em %1$s à(s) %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">Limites dos chats</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">Limites de histórico de mensagens</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">Excluir histórico de mensagens</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Mensagens mais antigas do que o intervalo de tempo selecionado serão excluídas permanentemente.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">As mensagens que excedam o tamanho selecionado serão excluídas permanentemente.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Aplicar limites aos dispositivos vinculados</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Quando ativado, os limites de chat também excluirão mensagens dos seus dispositivos vinculados.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Agora, quando você excluir algo, isso será apagado de todos os seus dispositivos.</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Quando você deletar mensagens ou conversas, elas serão excluídas do seu telefone e dos dispositivos vinculados.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Histórico de pagamentos</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Backup de mensagens de texto e arquivos de mídia</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Detalhes de pagamento</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Tipo de backup</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Data de pagamento</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Compartilhar</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Backups do Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Histórico de pagamentos</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Detalhes do backup</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Tamanho do backup</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Frequência de backup</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Fazer backup usando dados móveis</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Desativar e excluir backups?</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Backup excluído e desativado.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Tipo de backup alterado e assinatura cancelada</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Assinatura cancelada</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Download concluído</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Tipo de backup</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Backups desativados</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/mês</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Habilitar backups</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Último backup</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s à(s) %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Nunca</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Criar cópia de segurança</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Desativar e excluir backups?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Você não será cobrado novamenteSeu backup será apagado e nenhum novo backup será criado.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Desativar e apagar</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Excluindo backup…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Backup excluído</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Ao tocar em \"Fazer backup agora\""</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Diariamente</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Semanalmente</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Mensal</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Fazer backup manual</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Digite o PIN, a senha ou o padrão de desbloqueio do seu dispositivo.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Próximo</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Alterar o tipo de backup</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Cancelar doação</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Confirmar cancelamento</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Não haverá mais cobranças. Os backups serão desativados no final de seu ciclo de faturamento. Após essa data, você terá 30 dias para baixar os arquivos de mídia que estão sendo atualmente salvos no backup.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Confirmar e baixar agora</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Confirmar e baixar mais tarde</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Manter assinatura</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 71e47a9f20..381c4a5fd7 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">O Signal está a atualizar…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">O Molly está a atualizar…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Ainda não definiu uma frase-chave!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Desativar frase-chave?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Isto irá desbloquear permanentemente o Signal e as notificações de mensagens.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Isto irá desbloquear permanentemente o Molly e as notificações de mensagens.</string>
     <string name="ApplicationPreferencesActivity_disable">Desativar</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Erro a establecer a ligação com o servidor!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">Os PINs são necessários para o bloqueio do registo. Para desativar os PINs, primeiro desative o bloqueio do registo.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Ficheiro</string>
     <string name="AttachmentKeyboard_contact">Contacto</string>
     <string name="AttachmentKeyboard_location">Localização</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">O Signal necessita de permissão para exibir as suas fotos e vídeos</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">O Molly necessita de permissão para exibir as suas fotos e vídeos</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Permitir o acesso</string>
     <string name="AttachmentKeyboard_payment">Pagamento</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Não foi possível encontrar uma aplicação para selecionar a multimédia.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">O Signal requer permissão de acesso ao armazenamento de forma a poder anexar fotografias, vídeo e áudio, mas esta foi negada permanentemente. Por favor, aceda ao menu de definições das aplicações do seu telemóvel, selecione a aplicação Signal, e em \"Permissões\" ative \"Armazenamento\" ou \"Memória\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">O Signal requer permissão de acesso aos contactos para anexar os dados do contacto, mas esta foi negada permanentemente. Por favor, aceda às definições das aplicações no menu do telemóvel, selecione a aplicação Signal e em \"Permissões\" ative \"Contactos\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">O Signal requer permissão de acesso à localização para poder anexar uma localização, mas esta foi negada permanentemente. Por favor aceda às definições das aplicações no menu do telemóvel, selecione a aplicação Signal e nas \"Permissões\" ative a \"Localização\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">O Molly requer permissão de acesso ao armazenamento de forma a poder anexar fotografias, vídeo e áudio, mas esta foi negada permanentemente. Por favor, aceda ao menu de definições das aplicações do seu telemóvel, selecione a aplicação Molly, e em \"Permissões\" ative \"Armazenamento\" ou \"Memória\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">O Molly requer permissão de acesso aos contactos para anexar os dados do contacto, mas esta foi negada permanentemente. Por favor, aceda às definições das aplicações no menu do telemóvel, selecione a aplicação Molly e em \"Permissões\" ative \"Contactos\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">O Molly requer permissão de acesso à localização para poder anexar uma localização, mas esta foi negada permanentemente. Por favor aceda às definições das aplicações no menu do telemóvel, selecione a aplicação Molly e nas \"Permissões\" ative a \"Localização\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Permitir acesso à sua localização</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Para enviar a sua localização:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Permita ao Signal aceder à sua localização.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Permita ao Molly aceder à sua localização.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">O Signal necessita de acesso à localização para enviar a sua localização.</string>
+    <string name="AttachmentManager_signal_needs_location_access">O Molly necessita de acesso à localização para enviar a sua localização.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Permitir acesso ao armazenamento</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Para mostrar fotos e vídeos:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">O Signal necessita de acesso ao armazenamento para exibir as suas fotos e vídeos.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">O Molly necessita de acesso ao armazenamento para exibir as suas fotos e vídeos.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s não ativou os Pagamentos. </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Alterar câmara</string>
     <string name="CameraXFragment_open_gallery_description">Abrir galeria</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Permitir o acesso</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Permita o acesso à sua câmara e microfone</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Permita o acesso à câmara</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Permitir acesso ao seu microfone</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Para tirar fotos, permita o acesso do Signal à câmara.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Para tirar fotografias e filmar vídeos, dê permissões ao Signal para acesso à câmara.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Para tirar fotografias e filmar vídeos, permita o acesso do Signal à câmara e microfone.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Para gravar vídeos com som, permita o acesso do Signal ao seu microfone.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Para ler um código QR, permita o acesso do Signal à câmara.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">O Signal necessita de acesso à câmara para tirar fotos</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">O Signal necessita de acesso à câmara para ler códigos QR</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">O Signal necessita de acesso ao microfone para gravar vídeos</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Para tirar fotos no Signal</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Para tirar fotos e gravar vídeos no Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Para gravar vídeos com som:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Para ler códigos QR:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Contactos recentes</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Sem contactos Signal</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Apenas pode utilizar o botão da câmara para enviar fotografias para contactos Signal. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Não consegue encontrar quem procura?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Convide um contacto para se juntar ao Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Convide um contacto para se juntar ao Molly</string>
     <string name="CameraContacts__menu_search">Procurar</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Não, obrigado</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Atualizar o Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Atualizar o Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Esta versão da aplicação deixou de ser suportada. Para continuar a enviar e a receber mensagens, atualize para a última versão</string>
     <string name="ClientDeprecatedActivity_update">Atualizar</string>
     <string name="ClientDeprecatedActivity_dont_update">Não atualizar</string>
     <string name="ClientDeprecatedActivity_warning">Aviso</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">A sua versão do Signal expirou. Pode ver o seu histórico de mensagens mas não será capaz de enviar ou receber mensagens até que atualize.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">A sua versão do Molly expirou. Pode ver o seu histórico de mensagens mas não será capaz de enviar ou receber mensagens até que atualize.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Não foi encontrado nenhum navegador de Internet.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Mensagem %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Chamada de voz do Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Videochamada do Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Mensagem do Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Enviar mensagem</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Vamos mudar para o Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Vamos mudar para o Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Por favor escolha um contacto</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">O anexo tem um tamanho superior ao limite do tipo de mensagem que está a enviar.</string>
     <string name="ConversationActivity_unable_to_record_audio">Não é possível gravar áudio!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Para enviar mensagens de áudio:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Para enviar mensagens de voz, permita ao Signal aceder ao seu microfone.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Para enviar mensagens de voz, permita ao Molly aceder ao seu microfone.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">O Signal necessita de acesso ao microfone para gravar uma mensagem de voz.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">O Signal requer permissão de acesso ao microfone para enviar mensagens áudio, mas esta foi negada permanentemente. Por favor, aceda às definições das aplicações do telemóvel, selecione a aplicação Signal e nas \"Permissões\" ative \"Microfone\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">O Molly necessita de acesso ao microfone para gravar uma mensagem de voz.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">O Molly requer permissão de acesso ao microfone para enviar mensagens áudio, mas esta foi negada permanentemente. Por favor, aceda às definições das aplicações do telemóvel, selecione a aplicação Molly e nas \"Permissões\" ative \"Microfone\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">O Signal requer permissão de acesso ao microfone e câmara, para poder ligar a %1$s, mas esta foi negada permanentemente. Por favor, aceda às definições das aplicações do telemóvel, selecione a aplicação Signal e nas \"Permissões\" ative o \"Microfone\" e a \"Câmara\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Para tirar fotografias e filmar vídeos, dê permissões ao Signal para acesso à câmara.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">O Signal requer permissão de acesso à câmara para tirar fotografias ou vídeos, mas esta foi negada permanentemente. Por favor, aceda às definições das aplicações do telemóvel, seleccione a aplicação Signal e nas \"Permissões\" ative a \"Câmara\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">O Signal requer permissão de acesso à Câmara para tirar fotografias ou fazer vídeos</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">O Molly requer permissão de acesso ao microfone e câmara, para poder ligar a %1$s, mas esta foi negada permanentemente. Por favor, aceda às definições das aplicações do telemóvel, selecione a aplicação Molly e nas \"Permissões\" ative o \"Microfone\" e a \"Câmara\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Para tirar fotografias e filmar vídeos, dê permissões ao Molly para acesso à câmara.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">O Molly requer permissão de acesso à câmara para tirar fotografias ou vídeos, mas esta foi negada permanentemente. Por favor, aceda às definições das aplicações do telemóvel, seleccione a aplicação Molly e nas \"Permissões\" ative a \"Câmara\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">O Molly requer permissão de acesso à Câmara para tirar fotografias ou fazer vídeos</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Ative a permissão do microfone para poder capturar vídeos com som.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">O Sinal necessita de permissões de microfone para poder gravar vídeos. mas elas foram negadas. Por favor, avance até às definições das aplicações,. selecione o Signal e nas \"Permissões\", ative o \"Microfone\" e a \"Câmara\"</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">O Signal necessita de permissões de microfone para poder gravar vídeos.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">O Sinal necessita de permissões de microfone para poder gravar vídeos. mas elas foram negadas. Por favor, avance até às definições das aplicações,. selecione o Molly e nas \"Permissões\", ative o \"Microfone\" e a \"Câmara\"</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">O Molly necessita de permissões de microfone para poder gravar vídeos.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
     <string name="ConversationActivity_no">Não</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Para iniciar uma chamada:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Para iniciar uma chamada, permita ao Signal aceder ao seu microfone.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Para iniciar uma chamada, permita ao Molly aceder ao seu microfone.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">O Signal necessita de acesso ao microfone para iniciar uma chamada.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">O Molly necessita de acesso ao microfone para iniciar uma chamada.</string>
 
 
     <string name="ConversationActivity_join">Entrar</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">As mensagens SMS já não são suportadas pelo Signal. Convide %1$s para o Signal para manter a conversa aqui.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Esta pessoa já não usa o Signal. Convide-a para o Signal para manter a conversa aqui.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Esta pessoa já não usa o Molly. Convide-a para o Molly para manter a conversa aqui.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Convidar para o Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Convidar para o Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Receberá um lembrete em breve.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Eliminar para todos</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Eliminar neste dispositivo</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Eliminar</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Eliminar em todo o lado</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Esta mensagem será eliminada para todas as pessoas no chat caso elas tenham uma versão recente do Signal. Elas poderão ver que eliminou a mensagem.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Bloqueado</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Atualizar o Signal</string>
+    <string name="ConversationFragment__update_build">Atualizar o Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Voltar a inscrever no Signal</string>
+    <string name="ConversationFragment__reregister_signal">Voltar a inscrever no Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Navegue de volta.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Abrir Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Abrir Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Já não está verificado</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Isto irá eliminar permanentemente o chat selecionado.</item>
         <item quantity="other">Isto irá eliminar permanentemente todos os %1$d chats selecionados.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Isto irá eliminar permanentemente o chat selecionado de todos os seus dispositivos.</item>
+        <item quantity="other">Isto irá eliminar permanentemente todos os %1$d chats selecionados de todos os seus dispositivos.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">A eliminar</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">A eliminar chat selecionado…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Quem é que me pode encontrar através do número?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Qualquer pessoa que tenha o seu número de telemóvel irá ver que está no Signal e poderá iniciar chats consigo.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Qualquer pessoa que tenha o seu número de telemóvel irá ver que está no Molly e poderá iniciar chats consigo.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ninguém conseguirá ver que está no Signal, exceto as pessoas a quem envie mensagem ou com quem já tenha aberto um chat.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ninguém conseguirá ver que está no Molly, exceto as pessoas a quem envie mensagem ou com quem já tenha aberto um chat.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Restaurar a partir da cópia de segurança?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Teste a sua frase-chave e confirme se coincide</string>
     <string name="BackupsPreferenceFragment__turn_on">Ativar</string>
     <string name="BackupsPreferenceFragment__turn_off">Desativar</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Para poder restaurar uma cópia de segurança, instale uma nova cópia do Signal. Abra a aplicação e toque em \"Restaurar cópia de segurança\", aqui localize o ficheiro com a cópia de segurança. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Para poder restaurar uma cópia de segurança, instale uma nova cópia do Molly. Abra a aplicação e toque em \"Restaurar cópia de segurança\", aqui localize o ficheiro com a cópia de segurança. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Saber mais</string>
     <string name="BackupsPreferenceFragment__in_progress">Em progresso…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d até ao momento…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% até agora…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">O Signal requer permissão de acesso ao armazenamento externo para criar cópias de segurança, mas esta foi negada permanentemente. Por favor, aceda às definições das aplicações do seu telemóvel, selecione a aplicação Signal e nas \"Permissões\" ative \"Armazenamento\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">O Molly requer permissão de acesso ao armazenamento externo para criar cópias de segurança, mas esta foi negada permanentemente. Por favor, aceda às definições das aplicações do seu telemóvel, selecione a aplicação Molly e nas \"Permissões\" ative \"Armazenamento\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Definir hora da cópia de segurança</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">A sessão de chat foi atualizada</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">O Signal utiliza encriptação de ponta a ponta e às vezes pode necessitar de atualizar a sua sessão de chat. Isso não afeta a segurança do seu chat, mas poderá ter perdido uma mensagem desse contacto e pode pedir que ele a reenvie.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">O Molly utiliza encriptação de ponta a ponta e às vezes pode necessitar de atualizar a sua sessão de chat. Isso não afeta a segurança do seu chat, mas poderá ter perdido uma mensagem desse contacto e pode pedir que ele a reenvie.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Use o Signal no desktop ou iPad. As suas mensagens irão sincronizar-se com os seus dispositivos conectados.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Associe um novo dispositivo</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s As informações das mensagens e chats estão protegidas por encriptação de ponta a ponta em todos os dispositivos</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal no Desktop ou iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Todas as mensagens em dispositivos conectados são privadas</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">As mensagens do Molly são sincronizadas com o Molly no seu telemóvel depois de este ser associado. O seu histórico de mensagens anteriores não será apresentado.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">No seu outro dispositivo, visite %1$s para instalar o Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Os meus dispositivos conectados</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Desassociar</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s desassociado</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">A associar dispositivo…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Dispositivo aprovado</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">A carregar…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Não há dispositivos conectados</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Desbloqueie para vincular um dispositivo</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Leia o código QR apresentado no dispositivo que deseja conectar.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Ler código QR</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Utilize este dispositivo para ler o código QR apresentado no dispositivo que pretende conectar</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Ok</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Este dispositivo conseguirá ver os seu grupos e contactos, aceder aos seus chats e enviar mensagens em seu nome.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Terminou a associação ao seu outro dispositivo</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Terminou de associar o Molly ao seu outro dispositivo.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Falha na associação do dispositivo</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">O código QR é inválido, verifique que está a ler o código QR apresentado no dispositivo que deseja associar.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Tentar novamente</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Desassociar \'%1$s\'?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Otimizar para os \"Play Services\" em falta.</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Este dispositivo não suporta os Play Services. Toque para desativar o sistema de otimização de bateria que impede o Signal de recolher mensagens enquanto inativo.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Este dispositivo não suporta os Play Services. Toque para desativar o sistema de otimização de bateria que impede o Molly de recolher mensagens enquanto inativo.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Esta versão do Signal expirou. Faça agora a atualização par aenviar e receber mensagens.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Esta versão do Molly expirou. Faça agora a atualização par aenviar e receber mensagens.</string>
     <string name="ExpiredBuildReminder_update_now">Atualizar agora</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Ver</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Falha permanente de comunicação do Signal!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">O Signal não se conseguiu registar com os Serviços Google Play. As mensagens e chamadas do Signal estão desativadas, por favor tente registar-se novamente em Definições &gt; Avançado.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Falha permanente de comunicação do Molly!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">O Molly não se conseguiu registar com os Serviços Google Play. As mensagens e chamadas do Molly estão desativadas, por favor tente registar-se novamente em Definições &gt; Avançado.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Os registos de depuração ajudam-nos a diagnosticar e corrigir o problema e não contêm informações pessoais.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">O Signal encontrou um problema. Enviar registo de depuração?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">O Molly encontrou um problema. Enviar registo de depuração?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">As notificações podem chegar atrasadas devido a otimizações da bateria</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Pode desativar as otimizações de bateria para o Signal para garantir que as notificações de mensagens não chegam atrasadas.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Pode desativar as otimizações de bateria para o Molly para garantir que as notificações de mensagens não chegam atrasadas.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">As notificações podem chegar atrasadas devido a otimizações da bateria</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Desative as otimizações de bateria para o Molly para garantir que as notificações de mensagens não chegam atrasadas. Toque em \"Continuar\" para ver as instruções específicas do dispositivo.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Não, obrigado</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Continuar</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Continuar</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Ignorar</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Não, obrigado</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Convites de grupo pendentes</string>
+    <string name="PendingMembersActivity_pending_group_invites">Pedidos e convites</string>
     <string name="PendingMembersActivity_requests">Pedidos</string>
     <string name="PendingMembersActivity_invites">Convites</string>
     <string name="PendingMembersActivity_people_you_invited">Pessoas que convidou</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Cancelar</string>
     <string name="InviteActivity_sending">A enviar…</string>
     <string name="InviteActivity_invitations_sent">Convites enviados!</string>
-    <string name="InviteActivity_invite_to_signal">Convidar para o Signal</string>
+    <string name="InviteActivity_invite_to_signal">Convidar para o Molly</string>
     <string name="InviteActivity_send_sms">Enviar SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Enviar %1$d convite por SMS?</item>
         <item quantity="other">Enviar %1$d convites por SMS?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Vamos mudar para o Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Vamos mudar para o Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Parece que não tem aplicações para partilhar.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">A sua mensagem</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Ligação em segundo-plano ativada</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Respostas</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">A estabelecer chamada do Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">A estabelecer chamada do Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">A iniciar serviço de chamada do Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">A parar o serviço de chamadas do Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">A iniciar serviço de chamada do Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">A parar o serviço de chamadas do Molly</string>
     <string name="NotificationBarManager__cancel_call">Cancelar chamada</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Ativou os Pagamentos</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s pode agora aceitar Pagamentos</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Detalhes de pagamento indisponíveis</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Tocar para mais</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Detalhes de pagamento indisponíveis</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Os detalhes deste pagamento não estão disponíveis porque as suas mensagens foram restauradas a partir de uma fonte que não continha este histórico de pagamentos. Isto não afeta o saldo da sua carteira ou o estado dos pagamentos anteriores.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Em breve já não poderá enviar mensagens SMS pelo Signal. Convide %1$s para o Signal para manter a conversa aqui.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Já não pode enviar mensagens SMS no Signal. Convide %1$s para o Signal para manter a conversa aqui.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Já não pode enviar mensagens SMS no Molly. Convide %1$s para o Molly para manter a conversa aqui.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Pagamento: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Pagamento</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Denunciado como spam</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Associar a um dispositivo Signal?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Parece estar a tentar associar um dispositivo Signal através de um digitalizador externo. Para sua segurança, digitalize o código através do Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">O Signal requer permissão de acesso à câmara para ler códigos QR, mas esta foi negada permanentemente. Por favor, aceda às definições das aplicações do seu telemóvel, selecione o Signal e nas \"Permissões\" ative a \"Câmara\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">O Molly requer permissão de acesso à câmara para ler códigos QR, mas esta foi negada permanentemente. Por favor, aceda às definições das aplicações do seu telemóvel, selecione o Molly e nas \"Permissões\" ative a \"Câmara\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Não é possível ler um código QR sem ter a permissão de acesso à câmara.</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Insira a frase-chave</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Ícone do Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Ícone do Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Submeter frase-chave</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Frase-chave inválida!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Desbloquear o Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Ecrã de bloqueio</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Desbloquear o Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Ecrã de bloqueio</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Mapa</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Verifique para continuar a conversar</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Para ajudar a prevenir o spam no Signal, termine a verificação.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Para ajudar a prevenir o spam no Molly, termine a verificação.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Depois de verificar, pode continuar a conversar. Todas as mensagens em pausa serão enviadas.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">A Minha História</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Chamada do Signal</string>
+    <string name="Recipient_signal_call">Chamada do Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Bloquear</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">A tocar…</string>
     <string name="RedPhone_busy">Ocupado</string>
     <string name="RedPhone_recipient_unavailable">Destinatário indisponível</string>
-    <string name="RedPhone_network_failed">Falha de rede!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Falha de rede! Verifique a sua ligação à internet e tente novamente.</string>
     <string name="RedPhone_number_not_registered">Número não registado!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">O número que marcou não suporta chamadas de voz seguras!</string>
     <string name="RedPhone_got_it">Entendido</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Toque aqui para ativar a sua câmara</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Para telefonar a %1$s, o Signal necessita de aceder à sua câmara</string>
-    <string name="WebRtcCallActivity__signal_s">Chamada Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Para telefonar a %1$s, o Molly necessita de aceder à sua câmara</string>
+    <string name="WebRtcCallActivity__signal_s">Chamada Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">A chamar…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">A ligar novamente…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Removido da chamada</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Alguém removeu-o da chamada.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Permita o acesso à sua câmara e microfone</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Permitir acesso ao seu microfone</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Permita o acesso à câmara</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Para iniciar ou participar numa chamada, permita o acesso do Molly à sua câmara e microfone.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Para iniciar ou participar numa chamada, permita o acesso do Molly ao seu microfone.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Para ativar o seu vídeo, permita o acesso do Molly à sua câmara.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">O Molly necessita de permissões de microfone para iniciar ou participar numa chamada.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">O Molly necessita de acesso à câmara para ativar o seu vídeo</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Para iniciar ou participar numa chamada:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Para ativar o seu vídeo:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Chamada do Signal</string>
-    <string name="WebRtcCallView__signal_video_call">Videochamada do Signal</string>
+    <string name="WebRtcCallView__signal_call">Chamada do Molly</string>
+    <string name="WebRtcCallView__signal_video_call">Videochamada do Molly</string>
     <string name="WebRtcCallView__start_call">Iniciar chamada</string>
     <string name="WebRtcCallView__join_call">Entrar na chamada</string>
     <string name="WebRtcCallView__call_is_full">A chamada encontra-se cheia</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Baixar a mão?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Baixar mão</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Baixar</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Cancelar</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Levantou a mão</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Ver</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s levantou a mão</item>
-        <item quantity="other">%1$s + %2$d levantaram a mão</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s levantou a mão</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d levantaram a mão</item>
+        <item quantity="other">%1$s +%2$d levantaram a mão</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s levantou a mão</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d levantaram a mão</item>
+        <item quantity="other">%1$s +%2$d levantaram a mão</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Irá receber uma chamada para verificar este número</string>
     <string name="RegistrationActivity_edit_number">Editar número</string>
     <string name="RegistrationActivity_missing_google_play_services">Google Play Services em falta</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Este dispositivo tem o Google Play Services em falta. Vai conseguir usar o Signal na mesma, mas esta configuração poderá resultar em fiabilidade ou performance reduzidas.\n\nSe não é um utilizador avançado, não está a correr uma ROM Android personalizada ou acha que isto é um erro, por favor contacte support@signal.org para obter ajuda.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Este dispositivo tem o Google Play Services em falta. Vai conseguir usar o Molly na mesma, mas esta configuração poderá resultar em fiabilidade ou performance reduzidas.\n\nSe não é um utilizador avançado, não está a correr uma ROM Android personalizada ou acha que isto é um erro, por favor contacte support@molly.im para obter ajuda.</string>
     <string name="RegistrationActivity_i_understand">Eu compreendo</string>
     <string name="RegistrationActivity_play_services_error">Erro do Play Services</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">O Google Play Services está a ser atualizado ou está temporariamente indisponível. Por favor, tente novamente.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Formato de número não padronizado</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">O número que introduziu (%1$s) não parece estar num formato padronizado.\n\nSerá que queria dizer %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Formato de números de telefone</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Formato de números de telefone</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Chamada pedida</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Está com problemas a registar-se?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Certifique-se de que o seu telefone tem sinal de rede móvel para receber o seu SMS ou chamada\n • Confirme que pode receber uma chamada telefónica para o número\n • Verifique se introduziu o seu número de telefone corretamente.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Para mais informações, siga estas etapas de resolução de problemas ou contacte o Suporte.</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Para mais informações, siga %1$s ou %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">estas etapas de resolução de problemas</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Adicionar aos contactos</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Convidar para o Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Convidar para o Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Mensagem do Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Chamada do Signal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Adicionar aos contactos</string>
-    <string name="SharedContactView_invite_to_signal">Convidar para o Signal</string>
+    <string name="SharedContactView_invite_to_signal">Convidar para o Molly</string>
     <string name="SharedContactView_message">Mensagem do Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s pertence a %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Atualização do Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Está disponível uma nova versão do Signal. Toque para atualizar.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Falha ao atualizar o Signal</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Atualização do Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Está disponível uma nova versão do Molly. Toque para atualizar.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Falha ao atualizar o Molly</string>
     <string name="ApkUpdateNotifications_failed_general_body">Tentaremos mais tarde.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal atualizado com sucesso</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly atualizado com sucesso</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Foi atualizado automaticamente para a versão %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">O nosso número de segurança do Signal:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Parece que não tem aplicações para as quais partilhar.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Não foi encontrado na área de transferência nenhum número de segurança com o qual comparar</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">O Signal requer permissão de acesso à câmara para ler códigos QR, mas esta foi negada permanentemente. Por favor, aceda às definições das aplicações do seu telemóvel, seleccione a aplicação Signal e nas \"Permissões\" ative a \"Câmara\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">O Molly requer permissão de acesso à câmara para ler códigos QR, mas esta foi negada permanentemente. Por favor, aceda às definições das aplicações do seu telemóvel, seleccione a aplicação Molly e nas \"Permissões\" ative a \"Câmara\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Não é possível ler um código QR sem permissão de acesso à câmara.</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Primeiro deverá trocar mensagens de forma a poder ver o número de segurança de %1$s.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Toque para abrir.</string>
-    <string name="KeyCachingService_passphrase_cached">O Signal está desbloqueado</string>
-    <string name="KeyCachingService_lock">Bloquear o Signal</string>
+    <string name="KeyCachingService_passphrase_cached">O Molly está desbloqueado</string>
+    <string name="KeyCachingService_lock">Bloquear o Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Você</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Tipo de multimédia não suportado</string>
     <string name="MediaPreviewActivity_draft">Rascunho</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">O Signal requer permissão de acesso ao armazenamento para escrever no suporte de armazenamento externo, mas esta foi negada permanentemente. Por favor, aceda às definições das aplicações do telemóvel, seleccione o Signal e, em \"Permissões\" active \"Armazenamento\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">O Molly requer permissão de acesso ao armazenamento para escrever no suporte de armazenamento externo, mas esta foi negada permanentemente. Por favor, aceda às definições das aplicações do telemóvel, seleccione o Molly e, em \"Permissões\" active \"Armazenamento\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Não é possível guardar para o armazenamento externo sem permissões</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Eliminar mensagem?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Isto irá eliminar permanentemente esta mensagem.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Falha na entrega da mensagem.</string>
     <string name="MessageNotifier_error_delivering_message">Erro ao entregar a mensagem.</string>
     <string name="MessageNotifier_message_delivery_paused">Entrega de mensagens em pausa.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifique para continuar a conversar no Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifique para continuar a conversar no Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Marcar tudo como lido</string>
     <string name="MessageNotifier_mark_read">Marcar como lida</string>
     <string name="MessageNotifier_turn_off_these_notifications">Desativar estas notificações</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Reagiu %1$s ao seu autocolante.</string>
     <string name="MessageNotifier_this_message_was_deleted">Esta mensagem foi eliminada.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Deseja desativar as notificações quando um novo contacto se junta ao Signal? Pode ativar novamente em Signal &gt; Definições &gt; Notificações.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Deseja desativar as notificações quando um novo contacto se junta ao Molly? Pode ativar novamente em Molly &gt; Definições &gt; Notificações.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">A resposta rápida encontra-se indisponível enquanto o Signal estiver bloqueado!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">A resposta rápida encontra-se indisponível enquanto o Molly estiver bloqueado!</string>
     <string name="QuickResponseService_problem_sending_message">Problema no envio da mensagem!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Atalho inválido</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Nova mensagem</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Pedido de mensagem</string>
     <string name="SingleRecipientNotificationBuilder_you">Você</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Este dispositivo já não está registado. Isto possivelmente deve-se a ter registado o seu número de telemóvel com o Signal noutro dispositivo.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Este dispositivo já não está registado. Isto possivelmente deve-se a ter registado o seu número de telemóvel com o Molly noutro dispositivo.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Voltar a registar dispositivo</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Para poder atender a chamada, conceda ao Signal o acesso ao seu microfone.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Para poder atender a chamada, conceda ao Molly o acesso ao seu microfone.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Para poder atender a videochamada, conceda ao Signal o acesso ao seu microfone e câmara.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">O Signal requer permissões de acesso ao microfone e à câmara, para efectuar e receber chamadas, mas estas foram negadas permanentemente. Por favor, aceda às definições das aplicações do seu telemóvel, selecione a aplicação Signal e, em \"Permissões\" ative o \"Microfone\" e a \"Câmara\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Para poder atender a videochamada, conceda ao Molly o acesso ao seu microfone e câmara.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">O Molly requer permissões de acesso ao microfone e à câmara, para efectuar e receber chamadas, mas estas foram negadas permanentemente. Por favor, aceda às definições das aplicações do seu telemóvel, selecione a aplicação Molly e, em \"Permissões\" ative o \"Microfone\" e a \"Câmara\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Atendida num dispositivo associado.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Recusada num dispositivo associado.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Ocupado num dispositivo associado.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Repita a frase-chave nova</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Convite para o Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Convite para o Molly</string>
     <string name="contact_selection_activity__new_group">Novo grupo</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Atualizar contactos</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Falta alguém? Tente atualizar</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Encontre pessoas que conhece no Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Permita o acesso aos seus contactos</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Mais</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Fotografia de contacto</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">O Signal requer permissão de acesso aos contactos para visualizar os seus contactos, mas esta foi negada permanentemente. Por favor, aceda às definições das aplicações do telemóvel, seleccione a aplicação Signal e nas \"Permissões\" ative os \"Contactos\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">O Molly requer permissão de acesso aos contactos para visualizar os seus contactos, mas esta foi negada permanentemente. Por favor, aceda às definições das aplicações do telemóvel, seleccione a aplicação Molly e nas \"Permissões\" ative os \"Contactos\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Problema a obter os contactos, verifique a sua ligação à rede</string>
     <string name="ContactSelectionListFragment_username_not_found">Nome de utilizador não encontrado</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" não é um utilizador do Signal. Por favor, verifique o nome de utilizador e tente novamente."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Procurar por nome de utilizador</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Permita o acesso aos contactos</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Para encontrar pessoas que conhece no Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Permitir o acesso</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Não, obrigado</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Permita o acesso aos seus contactos. Os seus contactos estão encriptados e não são visíveis ao serviço Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">O Signal precisa de ter acesso aos contactos para os poder mostrar.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">O Molly precisa de ter acesso aos contactos para os poder mostrar.</string>
     <string name="contact_selection_list_fragment__show_contacts">Mostrar contactos</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Removeu esta pessoa. Volte a enviar-lhe mensagem para a adicionar de volta à sua lista.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Opções</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Atualizar</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Play … Pausa</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Os balões são uma funcionalidade Android que pode desativar nos chats do Signal.</string>
+    <string name="BubbleOptOutTooltip__description">Os balões são uma funcionalidade Android que pode desativar nos chats do Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Agora não</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Descrição do grupo</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Atualizar o Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Atualizar o Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Esta versão do Signal expirou. Atualize agora para continuar a usar o Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Esta versão do Molly expirou. Atualize agora para continuar a usar o Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Atualizar</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Lento</string>
     <string name="preferences__help">Ajuda</string>
     <string name="preferences__advanced">Avançado</string>
-    <string name="preferences__donate_to_signal">Doar ao Signal</string>
+    <string name="preferences__donate_to_signal">Doar ao Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Privacidade</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Alterar o ícone e nome da app para \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">O Signal tem de encerrar para alterar o ícone nome da app. As notificações vão sempre mostrar o ícone e nome padrões do Signal.</string>
+    <string name="preferences__app_icon_dialog_description">O Molly tem de encerrar para alterar o ícone nome da app. As notificações vão sempre mostrar o ícone e nome padrões do Molly.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Selecione um ícone e nome da app, que ficará visível no ecrã inicial e na secção de apps do seu telemóvel. As notificações vão sempre mostrar o ícone e nome padrões do Signal. Saber mais</string>
+    <string name="preferences__app_icon_warning_learn_more">Selecione um ícone e nome da app, que ficará visível no ecrã inicial e na secção de apps do seu telemóvel. As notificações vão sempre mostrar o ícone e nome padrões do Molly. Saber mais</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Os ícones e nomes da app estão visíveis no ecrã principal e na secção de apps.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">As notificações vão sempre mostrar o ícone e nome padrões do Signal.</string>
+    <string name="preferences__app_icon_notification_warning">As notificações vão sempre mostrar o ícone e nome padrões do Molly.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Saber mais</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Isto irá reduzir todos os chats para as %1$s mensagens mais recentes.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Isto irá eliminar permanentemente do seu dispositivo todo o histórico de mensagens e multimédia.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Isto irá eliminar permanentemente todo o histórico de mensagens e ficheiros deste dispositivo e de quaisquer dispositivos conetados.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Tem a certeza que deseja eliminar todo o histórico de mensagens?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Todo o histórico de mensagens será eliminado permanentemente. Esta ação não poderá ser revertida.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Todo o histórico de mensagens será eliminado permanentemente de todos os dispositivos. Esta ação não pode ser revertida.</string>
     <string name="preferences_storage__delete_all_now">Eliminar tudo agora</string>
     <string name="preferences_storage__forever">Para sempre</string>
     <string name="preferences_storage__one_year">1 ano</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Circunscrição de censura</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Circunscrição de censura</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Se ativo, o Signal irá tentar circunscrever a censura. Apenas ative esta opção em locais onde o Signal é censurado.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Se ativo, o Molly irá tentar circunscrever a censura. Apenas ative esta opção em locais onde o Molly é censurado.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">A circunscrição de censura foi ativada baseada no número de telefone da sua conta.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Apresentamos os pagamentos</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Utilize o Signal para enviar e receber MobileCoin, uma nova moeda digital focada na privacidade. Ative para começar a utilizar.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Utilize o Molly para enviar e receber MobileCoin, uma nova moeda digital focada na privacidade. Ative para começar a utilizar.</string>
     <string name="PaymentsHomeFragment__activate_payments">Ativar os pagamentos</string>
     <string name="PaymentsHomeFragment__activating_payments">A ativar pagamentos…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Restaurar a conta de pagamentos</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Os pagamentos não se encontram disponíveis para a sua região.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Não foi possível ativar os pagamentos. Tente novamente mais tarde.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Desativar os pagamentos?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Você não poderá enviar ou receber MobileCoin no Signal se desativar os pagamentos.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Você não poderá enviar ou receber MobileCoin no Molly se desativar os pagamentos.</string>
     <string name="PaymentsHomeFragment__deactivate">Desativar</string>
     <string name="PaymentsHomeFragment__continue">Continuar</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">O saldo não se encontra atualmente disponível</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Detalhes</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Pode usar o Signal para enviar e receber MobileCoin. Todos os pagamentos estão sujeitos aos Termos de Utilização das MobileCoins e a MobileCoin Wallet. Pode encontrar problemas e os pagamentos ou saldos que perca não são recuperáveis. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Pode usar o Molly para enviar e receber MobileCoin. Todos os pagamentos estão sujeitos aos Termos de Utilização das MobileCoins e a MobileCoin Wallet. Pode encontrar problemas e os pagamentos ou saldos que perca não são recuperáveis. </string>
     <string name="PaymentsHomeFragment__activate">Ativar</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Ver termos da MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Os pagamentos no Signal já não estão disponíveis. Você ainda pode transferir fundos para uma troca, mas deixou de poder enviar e receber pagamentos ou adicionar fundos.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Os pagamentos no Molly já não estão disponíveis. Você ainda pode transferir fundos para uma troca, mas deixou de poder enviar e receber pagamentos ou adicionar fundos.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Conceder permissões</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Para o ajudar a enviar mensagens às pessoas que conhece, o Signal vai pedir estas permissões. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Para o ajudar a enviar mensagens às pessoas que conhece, o Molly vai pedir estas permissões. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Notificações</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Seguinte</string>
     <string name="PaymentsTransferFragment__invalid_address">Endereço inválido</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Confirme o endereço da carteira para a qual está a tentar transferir e tente novamente.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Não pode transferir para o seu próprio endereço da carteira Signal. Introduza o endereço de carteira da sua conta numa transação suportada.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Para digitalizar um código QR, o Signal necessita de aceder à câmara.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">O Signal necessita de permissão de Câmara para capturar um código QR. Vá até às definições, selecione \"Permissões\" e, ative \"Câmara\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Para digitalizar um código QR, o Signal necessita de aceder à câmara.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Não pode transferir para o seu próprio endereço da carteira Molly. Introduza o endereço de carteira da sua conta numa transação suportada.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Para digitalizar um código QR, o Molly necessita de aceder à câmara.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">O Molly necessita de permissão de Câmara para capturar um código QR. Vá até às definições, selecione \"Permissões\" e, ative \"Câmara\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Para digitalizar um código QR, o Molly necessita de aceder à câmara.</string>
     <string name="PaymentsTransferFragment__settings">Definições</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">A receber chamada de voz do Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">A receber chamada de voz do Molly</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">A receber chamada de vídeo do Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">A receber chamada de vídeo do Molly</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">A receber chamada de grupo do Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">A receber chamada de grupo do Molly</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Chamada de voz do Signal em curso</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Chamada de voz do Molly em curso</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Chamada de vídeo do Signal em curso</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Chamada de vídeo do Molly em curso</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Chamada de grupo do Signal em curso</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Chamada de grupo do Molly em curso</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">A carregar…</string>
@@ -3991,7 +4122,7 @@
     <string name="BackupDialog_passphrase_was_not_correct">Frase-chave incorreta</string>
     <string name="LocalBackupJob_creating_signal_backup">A criar cópia de segurança…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">A verificar cópia de segurança do Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">A verificar cópia de segurança do Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">Falha ao fazer cópia de segurança</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">A sua diretoria da cópia de segurança foi eliminada ou movida.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">O seu ficheiro de cópia de segurança é demasiado grande para ser guardada neste volume.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Liguem-me (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Reenviar código (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Contactar o Suporte do Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Registo Signal - Código de verificação para Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Contactar o Suporte do Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Registo Molly - Código de verificação para Android</string>
     <string name="RegistrationActivity_incorrect_code">Código Incorrecto</string>
     <string name="BackupUtil_never">Nunca</string>
     <string name="BackupUtil_unknown">Desconhecido</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Número de telefone</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Escolha quem pode ver o seu número de telemóvel e quem o pode usar para o contactar no Signal.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Escolha quem pode ver o seu número de telemóvel e quem o pode usar para o contactar no Molly.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Quem pode ver o seu número</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Demasiadas tentativas. Por favor, tente novamente mais tarde.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Erro a estabelecer ligação com o serviço</string>
     <string name="preferences_chats__backups">Cópias de segurança</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">O Signal está bloqueado</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">O Molly está bloqueado</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">TOQUE PARA DESBLOQUEAR</string>
     <string name="Recipient_unknown">Desconhecido</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Você necessita de ter acesso ao seu dispositivo antigo.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Restaurar a partir da cópia de segurança</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Restore as suas mensagens a partir de uma cópia de segurança local. Se não as restaurar agora, não as poderá restaurar mais tarde.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Restaurar cópia de segurança local</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Restaurar a cópia de segurança do Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Restaure todas as suas mensagens de texto + os seus últimos 30 dias de ficheiros</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Mais opções</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Cancelar</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Iniciar sessão sem transferir</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Continuar sem transferir as suas mensagens ou ficheiros</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Abra o Signal no seu telemóvel Android antigo</string>
     <string name="NewDeviceTransferInstructions__continue">Continuar</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">A preparar para ligar para um dispositivo Android antigo…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Aguarde um momento, deverá estar pronto muito em breve</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">A aguardar pelo dispositivo Android antigo para ligar…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">O Signal necessita da permissão de localização para poder encontrar e depois ligar-se ao seu dispositivo Android antigo.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">O Signal necessita que os serviços de localização se encontrem ativos para poder encontrar e depois ligar-se ao seu dispositivo Android antigo.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">O Signal necessita de Wi-Fi para poder descobrir e ligar-se ao seu dispositivo Android antigo. O Wi-Fi precisa estar ligado, mas não precisa estar ligado a uma rede Wi-Fi.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Parece que este dispositivo não é compatível com Wi-Fi Direct. O Signal usa o Wi-Fi Direct para descobrir e ligar-se ao seu dispositivo Android antigo. Você ainda pode restaurar uma cópia de segurança para restaurar a sua conta do seu dispositivo Android antigo.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">O Molly necessita da permissão de localização para poder encontrar e depois ligar-se ao seu dispositivo Android antigo.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">O Molly necessita que os serviços de localização se encontrem ativos para poder encontrar e depois ligar-se ao seu dispositivo Android antigo.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">O Molly necessita de Wi-Fi para poder descobrir e ligar-se ao seu dispositivo Android antigo. O Wi-Fi precisa estar ligado, mas não precisa estar ligado a uma rede Wi-Fi.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Parece que este dispositivo não é compatível com Wi-Fi Direct. O Molly usa o Wi-Fi Direct para descobrir e ligar-se ao seu dispositivo Android antigo. Você ainda pode restaurar uma cópia de segurança para restaurar a sua conta do seu dispositivo Android antigo.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Restaurar uma cópia de segurança</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Ocorreu um erro inesperado ao tentar ligar ao seu dispositivo Android antigo.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">A pesquisar por um dispositivo Android novo…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">O Signal necessita da permissão de localização para poder encontrar e depois ligar-se ao seu dispositivo Android novo.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">O Signal necessita que os serviços de localização se encontrem ativos para poder encontrar e depois ligar-se ao seu dispositivo Android novo.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">O Signal necessita de Wi-Fi para poder descobrir e ligar-se ao seu dispositivo Android novo. O Wi-Fi precisa estar ligado, mas não precisa estar ligado a uma rede Wi-Fi.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Parece que este dispositivo não é compatível com Wi-Fi Direct. O Signal usa o Wi-Fi Direct para descobrir e ligar-se ao seu dispositivo Android novo. Você ainda pode criar uma cópia de segurança para restaurar a sua conta no seu dispositivo Android novo.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">O Molly necessita da permissão de localização para poder encontrar e depois ligar-se ao seu dispositivo Android novo.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">O Molly necessita que os serviços de localização se encontrem ativos para poder encontrar e depois ligar-se ao seu dispositivo Android novo.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">O Molly necessita de Wi-Fi para poder descobrir e ligar-se ao seu dispositivo Android novo. O Wi-Fi precisa estar ligado, mas não precisa estar ligado a uma rede Wi-Fi.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Parece que este dispositivo não é compatível com Wi-Fi Direct. O Molly usa o Wi-Fi Direct para descobrir e ligar-se ao seu dispositivo Android novo. Você ainda pode criar uma cópia de segurança para restaurar a sua conta no seu dispositivo Android novo.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Criar uma cópia de segurança</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Ocorreu um erro inesperado ao tentar ligar ao seu dispositivo Android novo.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">A transferir dados</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Mantenha ambos o dispositivos próximos um do outro. Não desligue os dispositivos e mantenha o Signal aberto. As transferÊncia são encriptadas ponta-a-ponta.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Mantenha ambos o dispositivos próximos um do outro. Não desligue os dispositivos e mantenha o Molly aberto. As transferÊncia são encriptadas ponta-a-ponta.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d mensagens até ao momento…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% das mensagens até ao momento…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Transferir conta</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Faça o download do Signal no seu dispositivo Android novo</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Faça o download do Molly no seu dispositivo Android novo</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Toque em \'Transferir ou restaurar conta\'"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Qualquer pessoa com este link pode ver o nome e a fotografia do grupo e solicitar adesão. Partilhe-o com pessoas em quem você confia.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Qualquer pessoa com este link pode ver o nome e a fotografia do grupo e solicitar adesão. Partilhe-o com pessoas em quem você confia.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Partilhar através do Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Partilhar através do Molly</string>
     <string name="GroupLinkBottomSheet_copy">Copiar</string>
     <string name="GroupLinkBottomSheet_qr_code">Código QR</string>
     <string name="GroupLinkBottomSheet_share">Partilhar</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">Acerca da MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">A MobileCoin é uma nova moeda digital focada na privacidade.</string>
     <string name="payment_info_card_adding_funds">Adicionando fundos</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Você pode adicionar fundos para utilizar no Signal ao adicionar a MobileCoin ao seu endereço de carteira.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Você pode adicionar fundos para utilizar no Molly ao adicionar a MobileCoin ao seu endereço de carteira.</string>
     <string name="payment_info_card_cashing_out">Tirar dinheiro</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Você pode tirar o dinheiro da MobileCoin a qualquer momento numa transferência que suporte a MobileCoin. Apenas necessita de fazer uma transferência para a sua conta nessa troca.</string>
     <string name="payment_info_card_hide_this_card">Ocultar este cartão?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Desativar carteira</string>
     <string name="DeactivateWalletFragment__your_balance">O seu saldo</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">É recomendado que transfira os seus fundos para outro endereço de carteira antes de desativar os pagamentos. Se escolher não transferir os seus fundos agora, eles irão permanecer na sua carteira ligada ao Signal caso reative os pagamentos.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">É recomendado que transfira os seus fundos para outro endereço de carteira antes de desativar os pagamentos. Se escolher não transferir os seus fundos agora, eles irão permanecer na sua carteira ligada ao Molly caso reative os pagamentos.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Transferir o saldo restante</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Desativar sem transferir</string>
     <string name="DeactivateWalletFragment__deactivate">Desativar</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Desativar sem transferir?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">O seu saldo irá ficar na sua carteira ligada ao Signal caso escolha reativar os pagamentos.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">O seu saldo irá ficar na sua carteira ligada ao Molly caso escolha reativar os pagamentos.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Erro ao desativar a carteira.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licenças</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Termos e Política de privacidade</string>
-    <string name="HelpFragment__copyright_signal_messenger">Copyright Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Copyright Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Licenciado sob GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Selecione uma cor</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Partilhar</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Apenas os administradores podem enviar mensagens para este grupo.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Atingido o limite</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Não pode selecionar mais do que 5 chats</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Saber mais</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Atualizar o Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Atualizar o Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Esta versão do Signal expirou. Atualize agora para continuar a usar o Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Esta versão do Molly expirou. Atualize agora para continuar a usar o Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Atualizar</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">O dispositivo não está registado</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Este dispositivo já não está registado. Volte a registar para continuar a usar o Signal neste dispositivo.</string>
+    <string name="ReregisterSignalDialog__message">Este dispositivo já não está registado. Volte a registar para continuar a usar o Molly neste dispositivo.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Voltar a registar</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Falha ao abrir o seletor.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Para ativar as notificações, o Signal precisa de permissão para as exibir.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Para ativar as notificações, o Molly precisa de permissão para as exibir.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Ativar</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Ainda não existem respostas</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Não pode responder a esta história porque já não é membro deste grupo.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Reagiu à história</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Reagiu à história</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Reagiu à história</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Visualizações</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Escolha o seu banco</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Confirme o seu donativo com %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Para configurar o seu donativo recorrente, toque em continuar para confirmar um débito de 0,01 € junto do seu banco. Este montante será automaticamente reembolsado e permitirá que o seu donativo de 5 €/mês seja debitado da sua conta.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Para configurar o seu donativo recorrente, toque em continuar para confirmar um débito de 0,01 € junto do seu banco. Este montante será automaticamente reembolsado e permitirá que o seu donativo de %1$s/mês seja debitado da sua conta.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Continuar</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">A descarregar dados da cópia de segurança…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">As cópias de segurança de ficheiros estão desativadas</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">O seu plano de cópia de segurança de ficheiros do Signal foi cancelado porque não foi possível processar o seu pagamento. Tem %1$d dia para transferir qualquer ficheiro multimédia armazenado na sua cópia de segurança. Após %1$d dia, os ficheiros na sua cópia de segurança serão eliminados.</item>
+        <item quantity="other">O seu plano de cópia de segurança de ficheiros do Signal foi cancelado porque não foi possível processar o seu pagamento. Tem %1$d dias para transferir qualquer ficheiro multimédia armazenado na sua cópia de segurança. Após %1$d dias, os ficheiros na sua cópia de segurança serão eliminados.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Pode voltar a pagar a qualquer altura para continuar a fazer cópias de segurança dos seus ficheiros. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Os seus ficheiros multimédia serão eliminados hoje</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">O seu plano de cópia de segurança de ficheiros do Signal foi cancelado porque não foi possível processar o seu pagamento. Esta é a sua última oportunidade de transferir os ficheiros multimédia da sua cópia de segurança antes de serem eliminados.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Não é possível concluir a transferência</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">O seu dispositivo não tem espaço livre suficiente. Liberte até %1$s de espaço para transferir os ficheiros guardados na sua cópia de segurança.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Se escolher \"Ignorar\", os ficheiros na sua cópia de segurança serão eliminados dentro de %1$d dia.</item>
+        <item quantity="other">Se escolher \"Ignorar\", os ficheiros na sua cópia de segurança serão eliminados dentro de %1$d dias.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Não é possível processar o pagamento da cópia de segurança</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Estamos com problemas para receber o seu pagamento mensal das cópias de segurança. Verifique se a forma de pagamento se encontra atualizada. Se não estiver, atualize-a no Google Play. O Signal tentará processar o pagamento novamente daqui a uns dias.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Não foi possível concluir a cópia de segurança</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">O seu dispositivo não efetua uma cópia de segurança há %1$d dias. Certifique-se de que o seu dispositivo está ligado a uma rede wi-fi e toque em \"Fazer uma cópia de segurança.\" </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Saber mais</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Saltar</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Transferir ficheiros multimédia</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Transferir mais tarde</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Não transferir ficheiros multimédia</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Liberte %1$s de espaço para transferir o ficheiro.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Cartão de crédito ou débito</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Desconhecido</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Histórico de pagamentos</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">A sua última cópia de segurança foi feita a %1$s às %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Mensagens mais antigas que o tempo selecionado serão permanentemente eliminadas.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">As mensagens que excedam o comprimento selecionado serão permanentemente eliminadas.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Aplicar limites a dispositivos conetados</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Quando ativado, os limites de chat também eliminarão mensagens dos seus dispositivos conetados.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">A eliminação está agora sincronizada entre todos os seus dispositivos</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Ao eliminar mensagens ou chats, eles também serão eliminados do seu telemóvel e todos os dispositivos conectados.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Histórico de pagamentos</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Cópia de segurança de texto e todos os ficheiros</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Detalhes do pagamento</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Tipo de cópia de segurança</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Data de pagamento</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Partilhar</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Cópias de segurança do Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Histórico de pagamentos</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Detalhes da cópia de segurança</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Tamanho da cópia de segurança</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Frequência da cópia de segurança</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Fazer cópia de segurança utilizando ligação móvel</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Desative e elimine a cópia de segurança</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Cópia de segurança eliminada e desativada.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Tipo de cópia de segurança alterado e subscrição cancelada</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Subscrição cancelada</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Download completo</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Tipo de cópia de segurança</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Cópias de segurança desativadas</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/mês</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Ativar cópias de segurança</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Última cópia de segurança</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s às %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Nunca</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Efetuar cópia de segurança agora</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Desativar e eliminar cópias de segurança?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Não voltará a ser cobrado. A sua cópia de segurança será eliminada e não serão criadas novas cópias de segurança.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Desativar e eliminar</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">A eliminar cópia de segurança…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Cópia de segurança eliminada</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Ao clicar em Efetuar cópia de segurança agora"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Diariamente</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Semanalmente</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Mensalmente</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Cópia de segurança manual</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Insira o pin, palavra-passe ou padrão do seu dispositivo.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Seguinte</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Alterar tipo de cópia de segurança</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Cancelar assinatura</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Confirmar cancelamento</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Não voltará a ser cobrado. As cópias de segurança serão desativadas no final do seu período de faturação. Após essa data terá 30 dias para transferir os ficheiros que tem atualmente em cópia de segurança.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Confirmar e transferir agora</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Confirmar e transferir mais tarde</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Manter subscrição</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 846c69e2cb..2d99512221 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal se actualizează…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly se actualizează…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Încă nu ai setat o parolă!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Dezactivez parola?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Această acțiune va debloca permanent Signal și notificările pentru mesaje.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Această acțiune va debloca permanent Molly și notificările pentru mesaje.</string>
     <string name="ApplicationPreferencesActivity_disable">Dezactivează</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Eroare de conectare la server!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">Codurile PIN sunt necesare pentru blocarea înregistrării. Pentru a dezactiva codurile PIN, te rugăm să dezactivezi mai întâi blocarea înregistrării.</string>
@@ -80,25 +81,25 @@
     <string name="AttachmentKeyboard_file">Fișier</string>
     <string name="AttachmentKeyboard_contact">Contact</string>
     <string name="AttachmentKeyboard_location">Locație</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal are nevoie de permisiune ca să afișeze pozele și videoclipurile tale</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly are nevoie de permisiune ca să afișeze pozele și videoclipurile tale</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Permite accesul</string>
     <string name="AttachmentKeyboard_payment">Plată</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Nu pot găsi o aplicație pentru selecție media.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal are nevoie de permisiunea pentru spațiul de stocare pentru a putea atașa poze, videoclipuri sau audio, dar i-a fost refuzat accesul permanent. Te rugăm continuă în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \"Spațiu de stocare\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal are nevoie de permisiunea pentru Contacte pentru a putea atașa informații despre contacte, dar i-a fost refuzat accesul permanent. Te rugăm continuă în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \"Contacte\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal are nevoie de permisiunea pentru Locație pentru a putea atașa o locație dar i-a fost refuzat accesul permanent. Te rugăm continuă în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \'Locație\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly are nevoie de permisiunea pentru spațiul de stocare pentru a putea atașa poze, videoclipuri sau audio, dar i-a fost refuzat accesul permanent. Te rugăm continuă în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \"Spațiu de stocare\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly are nevoie de permisiunea pentru Contacte pentru a putea atașa informații despre contacte, dar i-a fost refuzat accesul permanent. Te rugăm continuă în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \"Contacte\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly are nevoie de permisiunea pentru Locație pentru a putea atașa o locație dar i-a fost refuzat accesul permanent. Te rugăm continuă în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \'Locație\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Permite accesul la locația ta</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Pentru a trimite locația ta:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Permite accesul Signal pentru a-ți trimite locația.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Permite accesul Molly pentru a-ți trimite locația.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal are nevoie de acces la locația ta pentru a trimite locația curentă.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly are nevoie de acces la locația ta pentru a trimite locația curentă.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Permite accesul la stocare</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Schimbă camera</string>
     <string name="CameraXFragment_open_gallery_description">Deschide galerie</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Permite accesul</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Permite accesul la microfon și camera foto</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Permite accesul la camera foto</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Permite acces la microfonul tău</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Ca să realizezi fotografii, permite accesul Signal la camera foto.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Pentru a captura poze sau filme, permite aplicației Signal să acceseze camera.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Ca să realizezi poze sau filme, permite aplicației Signal să acceseze camera și microfonul.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Ca să realizezi videoclipuri cu sunet, permite accesul la microfonul Signal.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Ca să scanezi un cod QR, permite accesul Signal la cameră.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal are nevoie de acces la cameră pentru a captura fotografii</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal are nevoie de acces la cameră pentru a scana codurile QR</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal are nevoie de acces la microfon pentru a captura video</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Ca să realizezi fotografii în Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Ca să realizezi fotografii și clipuri video în Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Ca să realizezi videoclipuri cu sunet:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Ca să scanezi coduri QR:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Contacte recente</string>
@@ -272,7 +273,7 @@
     <string name="CameraContacts_no_signal_contacts">Niciun contact Signal</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Poți utiliza butonul de cameră pentru a trimite fotografii doar contactelor Signal. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Nu poți găsi pe cine cauți?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Invită un contact să se alăture pe Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Invită un contact să se alăture pe Molly</string>
     <string name="CameraContacts__menu_search">Caută</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -286,12 +287,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Nu, mulțumesc</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Actualizează Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Actualizează Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Această versiune a aplicației nu mai este suportată. Pentru a continua să trimiți și să primești mesaje, actualizează la cea mai recentă versiune.</string>
     <string name="ClientDeprecatedActivity_update">Actualizează</string>
     <string name="ClientDeprecatedActivity_dont_update">Nu Actualiza</string>
     <string name="ClientDeprecatedActivity_warning">Avertizare</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Versiunea ta de Signal a expirat. Poți vedea istoricul mesajelor tale, dar nu vei mai putea trimite sau primi mesaje până nu actualizezi.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Versiunea ta de Molly a expirat. Poți vedea istoricul mesajelor tale, dar nu vei mai putea trimite sau primi mesaje până nu actualizezi.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Nu s-a găsit nici un web browser.</string>
@@ -328,8 +329,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Mesaj %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Apel vocal Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Apel video Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -425,7 +426,7 @@
     <string name="ConversationActivity_transport_signal">Mesaj Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Trimite mesaj</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Hai să folosim Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Hai să folosim Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Te rugăm alege un contact</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Atașamentul depășește limita de mărime pentru tipul de mesaj pe care-l trimiți.</string>
     <string name="ConversationActivity_unable_to_record_audio">Nu se poate înregistra audio!</string>
@@ -444,18 +445,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Pentru a trimite mesaje audio:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Pentru a trimite mesaje audio, permite-i aplicației Signal accesul la microfonul tău.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Pentru a trimite mesaje audio, permite-i aplicației Molly accesul la microfonul tău.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal are nevoie de permisiunea pentru microfon pentru a înregistra un mesaj vocal.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal are nevoie de permisiunea pentru Microfon pentru a putea trimite mesaje audio dar i-a fost refuzat accesul permanent. Te rugăm să continui în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \"Microfon\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly are nevoie de permisiunea pentru microfon pentru a înregistra un mesaj vocal.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly are nevoie de permisiunea pentru Microfon pentru a putea trimite mesaje audio dar i-a fost refuzat accesul permanent. Te rugăm să continui în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \"Microfon\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal are nevoie de permisiunile pentru Microfon și Cameră pentru a putea apela pe %1$s, dar i-a fost refuzat accesul permanent. Te rugăm continuă în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \"Microfon\" și \"Camera\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Pentru a captura poze sau filme, permite aplicației Signal să acceseze camera.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal are nevoie de permisiunea pentru Cameră pentru a captura poze sau filme dar i-a fost refuzat accesul permanent. Te rugăm continuă în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \"Camera\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal are nevoie de permisiunea pentru Cameră pentru a captura poze sau filme</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly are nevoie de permisiunile pentru Microfon și Cameră pentru a putea apela pe %1$s, dar i-a fost refuzat accesul permanent. Te rugăm continuă în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \"Microfon\" și \"Camera\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Pentru a captura poze sau filme, permite aplicației Molly să acceseze camera.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly are nevoie de permisiunea pentru Cameră pentru a captura poze sau filme dar i-a fost refuzat accesul permanent. Te rugăm continuă în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \"Camera\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly are nevoie de permisiunea pentru Cameră pentru a captura poze sau filme</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Activează permisiunea pentru microfon pentru a captura videoclipuri cu sunet.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal are nevoie de permisiunea pentru microfon pentru a putea înregistra videoclipuri, dar aceasta a fost refuzată. Te rugăm continuă la setările aplicației, selectează \"Permisiuni\" și activează \"Microfon\" și \"Cameră\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal are nevoie de permisiunea pentru microfon pentru a înregistra videoclipuri.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly are nevoie de permisiunea pentru microfon pentru a putea înregistra videoclipuri, dar aceasta a fost refuzată. Te rugăm continuă la setările aplicației, selectează \"Permisiuni\" și activează \"Microfon\" și \"Cameră\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly are nevoie de permisiunea pentru microfon pentru a înregistra videoclipuri.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Nu</string>
@@ -476,9 +477,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Pentru a începe un apel:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Pentru a începe un apel, permite accesul Signal la microfon.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Pentru a începe un apel, permite accesul Molly la microfon.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal are nevoie de acces la microfon pentru a începe un apel.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly are nevoie de acces la microfon pentru a începe un apel.</string>
 
 
     <string name="ConversationActivity_join">Alătură-te</string>
@@ -492,9 +493,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Mesajele SMS nu mai sunt acceptate pe Signal. Invită pe %1$s pe Signal ca să continui conversația aici.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Această persoană nu mai folosește Signal. Invit-o pe Signal ca să continui conversația aici.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Această persoană nu mai folosește Molly. Invit-o pe Molly ca să continui conversația aici.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Invită la Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Invită la Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Vei primi un mesaj de reamintire curând din nou.</string>
 
@@ -554,6 +555,8 @@
     <string name="ConversationFragment_delete_for_everyone">Șterge pentru toată lumea</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Șterge pe acest dispozitiv</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Șterge</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Șterge de peste tot</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Acest mesaj va fi șters pentru toți participanții la conversație dacă aceștia folosesc o versiune recentă Signal. Participanții vor putea vedea că ai șters mesajul.</string>
@@ -585,13 +588,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Blocat</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Actualizează Signal</string>
+    <string name="ConversationFragment__update_build">Actualizează Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Înregistrează din nou Signal</string>
+    <string name="ConversationFragment__reregister_signal">Înregistrează din nou Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Navighează înapoi.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Deschide Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Deschide Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Nu mai este verificat</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -658,6 +661,12 @@
         <item quantity="few">Această acțiune va șterge permanent toate cele %1$d conversații selectate.</item>
         <item quantity="other">Această acțiune va șterge permanent toate cele %1$d de conversații selectate.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Acest lucru va elimina definitiv conversația selectată de pe toate dispozitivele tale.</item>
+        <item quantity="few">Acest lucru va elimina definitiv toate cele %1$d conversații selectate de pe toate dispozitivele tale.</item>
+        <item quantity="other">Acest lucru va elimina definitiv toate cele %1$d de conversații selectate de pe toate dispozitivele tale.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Se șterge</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Se șterge conversația selectată…</item>
@@ -753,9 +762,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Cine îmi poate găsi numărul?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Oricine are numărul tău de telefon va vedea că ești pe Signal și poate începe conversații cu tine.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Oricine are numărul tău de telefon va vedea că ești pe Molly și poate începe conversații cu tine.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Nimeni nu va putea să vadă că eșți pe Signal decât dacă îi trimiți un mesaj sau dacă ai o conversație existentă cu acesta.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Nimeni nu va putea să vadă că eșți pe Molly decât dacă îi trimiți un mesaj sau dacă ai o conversație existentă cu acesta.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Restaurez din backup?</string>
@@ -789,7 +798,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Testează parola de backup și asigură-te că se potrivește</string>
     <string name="BackupsPreferenceFragment__turn_on">Activează</string>
     <string name="BackupsPreferenceFragment__turn_off">Dezactivează</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Pentru a restabili un backup, instalează o copie nouă Signal. Deschide aplicația și atinge \"Restabilire backup\", apoi selectează un fișier de backup. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Pentru a restabili un backup, instalează o copie nouă Molly. Deschide aplicația și atinge \"Restabilire backup\", apoi selectează un fișier de backup. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Află mai multe</string>
     <string name="BackupsPreferenceFragment__in_progress">În curs de desfășurare…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -797,7 +806,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d până acum…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% până acum…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal necesită permisiunea de acces la stocarea externă pentru a putea crea backup-uri, dar i-a fost refuzat permanent. Te rugăm continuă la setări aplicație, selectează \"Permisiuni\" și activează \"Stocare\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly necesită permisiunea de acces la stocarea externă pentru a putea crea backup-uri, dar i-a fost refuzat permanent. Te rugăm continuă la setări aplicație, selectează \"Permisiuni\" și activează \"Stocare\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Setează timpul de rezervă</string>
 
@@ -864,7 +873,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Sesiunea conversației a fost resetată</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal folosește criptare integrală și câteodată va avea nevoie să reîmprospăteze sesiunile de conversație. Acest lucru nu va afecta securitatea conversațiilor dar s-ar putea să fi ratat un mesaj de la acest contact și ai putea să-l rogi să-l retrimită.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly folosește criptare integrală și câteodată va avea nevoie să reîmprospăteze sesiunile de conversație. Acest lucru nu va afecta securitatea conversațiilor dar s-ar putea să fi ratat un mesaj de la acest contact și ai putea să-l rogi să-l retrimită.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Folosește Signal pe desktop sau pe iPad. Mesajele tale se vor sincroniza cu dispozitivele asociate.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Asociază un dispozitiv nou</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Informațiile privind conversațiile și mesajele sunt protejate prin criptare end-to-end pe toate dispozitivele</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal pe desktop sau iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Toate mesajele de pe dispozitivele conectate sunt private</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Mesajele Molly sunt sincronizate cu Molly de pe telefonul mobil după ce acesta este asociat. Istoricul mesajelor anterioare nu va apărea.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Pe celălalt dispozitiv, vizitează %1$s pentru a instala Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Dispozitivele mele asociate</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Disociază</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s fără asociere</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Se asociază dispozitivul…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Dispozitiv aprobat</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Se încarcă…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Nu există dispozitive asociate</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Deblochează pentru a conecta un dispozitiv</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Scanează codul QR afișat pe dispozitiv pentru a face asocierea.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Scanează codul QR</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Folosește acest dispozitiv pentru a scana codul QR afișat pe dispozitivul pe care dorești să îl conectezi</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Okay</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Acest dispozitiv va putea vedea grupurile și contactele tale, accesa conversațiile și să trimită mesaje în numele tău.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Finalizează asocierea pe celălalt dispozitiv</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Finalizează asocierea Molly pe celălalt dispozitiv.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Asocierea Dispozitivului a Eșuat</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Acest cod QR nu este valid. Te rugăm să te asiguri că scanezi codul QR afișat pe dispozitivul pe care vrei să-l conectezi.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Încearcă din nou</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Disociez \'%1$s\'?</string>
@@ -886,10 +950,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimizează pentru lipsa serviciilor Play</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Acest dispozitiv nu suportă serviciile Play. Apasă pentru a dezactiva optimizarea de sistem a bateriei care împiedică Signal să preia mesaje cât timp este inactiv.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Acest dispozitiv nu suportă serviciile Play. Apasă pentru a dezactiva optimizarea de sistem a bateriei care împiedică Molly să preia mesaje cât timp este inactiv.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Această versiune a Signal a expirat. Actualizează acum pentru a trimite și primi mesaje.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Această versiune a Molly a expirat. Actualizează acum pentru a trimite și primi mesaje.</string>
     <string name="ExpiredBuildReminder_update_now">Actualizează acum</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -901,8 +965,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Vizualizare</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Eroare permanentă de comunicare cu Signal!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal nu s-a putut înregistra la Google Play Services. Mesajele și apelurile Signal au fost dezactivate, te rugăm încearcă să te înregistrezi din nou din meniul Setări &gt; Avansat.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Eroare permanentă de comunicare cu Molly!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly nu s-a putut înregistra la Google Play Services. Mesajele și apelurile Molly au fost dezactivate, te rugăm încearcă să te înregistrezi din nou din meniul Setări &gt; Avansat.</string>
 
 
     <!-- GiphyActivity -->
@@ -1054,20 +1118,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Jurnalele de depanare ne ajută să diagnosticăm și să remediam problema și nu conțin informații de identificare.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal a întâmpinat o problemă. Trimiți jurnalul de depanare?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly a întâmpinat o problemă. Trimiți jurnalul de depanare?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Este posibil ca notificările să întârzie din cauza optimizării bateriei</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Poți să dezactivezi optimizarea bateriei pentru Signal ca să te asiguri că notificările mesajelor să nu fie întârziate.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Poți să dezactivezi optimizarea bateriei pentru Molly ca să te asiguri că notificările mesajelor să nu fie întârziate.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Este posibil ca notificările să întârzie din cauza optimizării bateriei</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Poți să dezactivezi optimizarea bateriei pentru Molly ca să te asiguri că notificările mesajelor să nu fie întârziate. Atinge \"Continuare\" pentru a vedea instrucțiunile specifice dispozitivului.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Nu, mulțumesc</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Continuă</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Continuă</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Revocare</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Nu, mulțumesc</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Invitații la grup în așteptare</string>
+    <string name="PendingMembersActivity_pending_group_invites">Cereri și invitații</string>
     <string name="PendingMembersActivity_requests">Solicitări</string>
     <string name="PendingMembersActivity_invites">Invitații</string>
     <string name="PendingMembersActivity_people_you_invited">Persoane pe care le-ai invitat</string>
@@ -1322,14 +1396,14 @@
     <string name="InviteActivity_cancel">Anulează</string>
     <string name="InviteActivity_sending">Se trimite…</string>
     <string name="InviteActivity_invitations_sent">Invitațiile au fost trimise!</string>
-    <string name="InviteActivity_invite_to_signal">Invită la Signal</string>
+    <string name="InviteActivity_invite_to_signal">Invită la Molly</string>
     <string name="InviteActivity_send_sms">Trimite SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Trimit %1$d invitație prin SMS?</item>
         <item quantity="few">Trimit %1$d invitații prin SMS?</item>
         <item quantity="other">Trimit %1$d de invitații prin SMS?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Hai să folosim Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Hai să folosim Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Se pare că nu ai aplicații cu care să poți distribui.</string>
 
     <!-- LearnMoreTextView -->
@@ -1343,7 +1417,7 @@
     <string name="LongMessageActivity_your_message">Mesajul tău</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Conexiune în fundal activată</string>
 
     <!-- MediaOverviewActivity -->
@@ -1417,10 +1491,10 @@
     <string name="MessageQuotesBottomSheet_replies">Răspunsuri</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Se realizează un apel Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">Se realizează un apel Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Se inițializează serviciul de apel Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Se oprește serviciul de apel Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Se inițializează serviciul de apel Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Se oprește serviciul de apel Molly</string>
     <string name="NotificationBarManager__cancel_call">Anulează apelul</string>
 
     <!-- NotificationsMegaphone -->
@@ -1680,6 +1754,14 @@
     <string name="MessageRecord_you_activated_payments">Ai activat Plăți</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s poate să accepte acum Plăți</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Detaliile de plată nu sunt disponibile</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Apasă pentru detalii</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Detaliile de plată nu sunt disponibile</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Detaliile acestei plăți nu sunt disponibile deoarece mesajele tale au fost restaurate dintr-o sursă care nu conținea acest istoric de plăți. Acest lucru nu afectează soldul portofelului tău sau situația plăților anterioare.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1738,9 +1820,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Nu vei mai putea să trimiți mesaje SMS de pe Signal curând. Invită pe %1$s pe Signal ca să continui conversația aici.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Nu mai poți să trimiți mesaje SMS în Signal. Invită pe %1$s pe Signal ca să continui conversația aici.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Nu mai poți să trimiți mesaje SMS în Molly. Invită pe %1$s pe Molly ca să continui conversația aici.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Plată: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Plată</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Raportat ca spam</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1822,7 +1906,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Asociez un dispozitiv Signal?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Se pare că încerci să asociezi un dispozitiv Signal folosind un scaner terț. Pentru protecția ta, te rugăm să scanezi din nou codul din interiorul aplicației Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal are nevoie de permisiunea pentru Cameră pentru a scana un cod QR dar i-a fost refuzat accesul permanent. Te rugăm continuă în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \"Cameră\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly are nevoie de permisiunea pentru Cameră pentru a scana un cod QR dar i-a fost refuzat accesul permanent. Te rugăm continuă în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \"Cameră\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Codul QR nu poate fi scanat fără permisiunea pentru Cameră</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1836,11 +1920,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Introdu parola</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Pictogramă Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Pictogramă Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Trimite parola</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Parolă incorectă!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Deblochează Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Ecran de Blocare</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Deblochează Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Ecran de Blocare</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Hartă</string>
@@ -1908,7 +1992,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Verifică pentru a continua conversația</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Pentru a ajuta la prevenirea spam-ului pe Signal, te rugăm să completezi verificarea.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Pentru a ajuta la prevenirea spam-ului pe Molly, te rugăm să completezi verificarea.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">După verificare, poți continua să trimiți mesaje. Toate mesajele aflate în pauză vor fi trimise automat.</string>
 
     <!-- Recipient -->
@@ -1916,7 +2000,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Povestea Mea</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Apel Signal</string>
+    <string name="Recipient_signal_call">Apel Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Blochează</string>
@@ -1930,7 +2014,8 @@
     <string name="RedPhone_ringing">Sună…</string>
     <string name="RedPhone_busy">Ocupat</string>
     <string name="RedPhone_recipient_unavailable">Destinatar indisponibil</string>
-    <string name="RedPhone_network_failed">Eroare de rețea!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Eroare de rețea! Te rugăm să verifici conexiunea și să încerci din nou.</string>
     <string name="RedPhone_number_not_registered">Numărul nu este înregistrat!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Numărul format nu suportă apeluri securizate!</string>
     <string name="RedPhone_got_it">Am înțeles</string>
@@ -1941,8 +2026,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Atinge aici pentru a porni camera ta</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Pentru a apela pe %1$s, Signal are nevoie de acces la camera ta</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Pentru a apela pe %1$s, Molly are nevoie de acces la camera ta</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Apel în curs…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Se reconectează…</string>
@@ -2002,10 +2087,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Eliminat din apel</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Cineva te-a exclus din apel.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Permite accesul la microfon și camera foto</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Permite acces la microfonul tău</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Permite accesul la camera foto</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Pentru a începe un apel sau pentru a te alătura unui apel, permite accesul semnalului la camera foto și la microfon.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Pentru a începe sau a te alătura unui apel, permite accesul semnalului la microfon.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Pentru a activa înregistrarea video, permite accesul Molly la camera ta de filmat.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly are nevoie de permisiuni pentru microfon pentru a începe sau a se alătura unui apel.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly are nevoie de acces la cameră pentru a-ți activa videoclipul</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Pentru a începe un apel sau pentru a te alătura unui apel:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Ca să-ți activezi videoclipul:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Apel Signal</string>
-    <string name="WebRtcCallView__signal_video_call">Apel Video Signal</string>
+    <string name="WebRtcCallView__signal_call">Apel Molly</string>
+    <string name="WebRtcCallView__signal_video_call">Apel Video Molly</string>
     <string name="WebRtcCallView__start_call">Începe Apelul</string>
     <string name="WebRtcCallView__join_call">Alătură-te apelului</string>
     <string name="WebRtcCallView__call_is_full">Numărul maxim de participanți a fost atins</string>
@@ -2100,23 +2205,44 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Lași mâna jos?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Coboară mâna</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Coboară</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Anulează</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Ți-ai ridicat mâna</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Vizualizare</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s a ridicat mâna</item>
-        <item quantity="few">%1$s + %2$d au ridicat mâna</item>
-        <item quantity="other">%1$s + %2$d au ridicat mâna</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s ai ridicat mâna</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s și încă %2$d ați ridicat mâna</item>
+        <item quantity="few">%1$s și încă %2$d ați ridicat mâna</item>
+        <item quantity="other">%1$s + încă %2$d ați ridicat mâna</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s a ridicat mâna</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + încă %2$d au ridicat mâna</item>
+        <item quantity="few">%1$s + încă %2$d au ridicat mâna</item>
+        <item quantity="other">%1$s + încă %2$d au ridicat mâna</item>
+    </plurals>
+
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="few">%1$s +%2$d</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="few">%1$s +%2$d</item>
         <item quantity="other">%1$s +%2$d</item>
@@ -2213,7 +2339,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Vei primi un apel pentru a verifica acest număr.</string>
     <string name="RegistrationActivity_edit_number">Editează număr</string>
     <string name="RegistrationActivity_missing_google_play_services">Serviciile Google Play lipsesc</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Acestui dispozitiv îi lipsesc serviciile Google Play. Poți utiliza în continuare Signal, însă această configurație poate duce la fiabilitate și performanță redusă.\n\nDacă nu ești un utilizator avansat, nu rulezi un ROM Android aftermarket, sau crezi că vezi asta în urma unei erori, te rugăm contactează support@signal.org pentru ajutor la depanare.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Acestui dispozitiv îi lipsesc serviciile Google Play. Poți utiliza în continuare Molly, însă această configurație poate duce la fiabilitate și performanță redusă.\n\nDacă nu ești un utilizator avansat, nu rulezi un ROM Android aftermarket, sau crezi că vezi asta în urma unei erori, te rugăm contactează support@molly.im pentru ajutor la depanare.</string>
     <string name="RegistrationActivity_i_understand">Am înțeles</string>
     <string name="RegistrationActivity_play_services_error">Eroare Servicii Play</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Serviciile Google Play se actualizează sau sunt temporar indisponibile. Te rugăm încearcă din nou.</string>
@@ -2231,7 +2357,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Număr cu format non-standard</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Numărul pe care l-ai introdus (%1$s) pare a fi în format non-standard.\n\nAi vrut să scrii %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Formatul Numărului de Telefon</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Formatul Numărului de Telefon</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Apel solicitat</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2266,8 +2392,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Ai probleme la înregistrare?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Asigură-te că telefonul tău are semnal celular ca să primești SMS-ul sau apelul\n • Confirmă că poți primi un apel telefonic pe numărul tău\n • Verifică că ai introdus corect numărul de telefon.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Pentru mai multe informații, urmează acești pași de depanare sau contactează Asistența</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Pentru mai multe informații, urmărește %1$s sau %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">acești pași de depanare</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2305,13 +2431,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Adaugă la contacte</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Invită la Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Invită la Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Mesaj Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Apel Signal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Adaugă la Contacte</string>
-    <string name="SharedContactView_invite_to_signal">Invită la Signal</string>
+    <string name="SharedContactView_invite_to_signal">Invită la Molly</string>
     <string name="SharedContactView_message">Mesaj Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2431,7 +2557,7 @@
     <!-- Displayed in the conversation list when someone reacted to your story -->
     <string name="ThreadRecord__reacted_s_to_your_story">A reacționat cu %1$s la povestea ta</string>
     <!-- Displayed in the conversation list when you reacted to someone\'s story -->
-    <string name="ThreadRecord__reacted_s_to_their_story">A reacționat cu %1$s la povestea lor</string>
+    <string name="ThreadRecord__reacted_s_to_their_story">Ai reacționat cu %1$s la povestea sa</string>
     <!-- Displayed in the conversation list when your most recent message is a payment to or from the person the conversation is with -->
     <string name="ThreadRecord_payment">Plată</string>
     <!-- Displayed in the conversation list when your only message in a conversation is a scheduled send. -->
@@ -2442,11 +2568,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s aparține persoanei %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Actualizare Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">O nouă versiune de Signal este disponibilă. Apasă pentru actualizare.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal nu a putut fi actualizat</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Actualizare Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">O nouă versiune de Molly este disponibilă. Apasă pentru actualizare.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly nu a putut fi actualizat</string>
     <string name="ApkUpdateNotifications_failed_general_body">Vom încerca din nou mai târziu.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal a fost actualizat cu succes</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly a fost actualizat cu succes</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Ai primit o actualizare automată la versiunea %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2518,7 +2644,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Numărul nostru de siguranță:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Se pare că nu ai aplicații cu care să poți distribui.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Nu s-a găsit nici un număr de siguranță în clipboard pentru a fi comparat.</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal are nevoie de permisiunea pentru Cameră pentru a scana un cod QR dar i-a fost refuzat accesul permanent. Te rugăm mergi în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \"Camera\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly are nevoie de permisiunea pentru Cameră pentru a scana un cod QR dar i-a fost refuzat accesul permanent. Te rugăm mergi în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \"Camera\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Codul QR nu poate fi scanat fără permisiunea pentru Cameră</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Mai întâi trebuie să faci schimb de mesaje pentru a vizualiza numărul de siguranță al lui %1$s</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2548,14 +2674,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Atinge pentru a deschide.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal este deblocat</string>
-    <string name="KeyCachingService_lock">Blochează Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly este deblocat</string>
+    <string name="KeyCachingService_lock">Blochează Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Tu</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Tip media nesuportat</string>
     <string name="MediaPreviewActivity_draft">Ciornă</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal are nevoie de permisiunea pentru spațiul de stocare extern pentru a salva pe spațiul de stocare extern, dar i-a fost refuzat accesul permanent. Te rugăm mergi în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \"Spațiu de stocare\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly are nevoie de permisiunea pentru spațiul de stocare extern pentru a salva pe spațiul de stocare extern, dar i-a fost refuzat accesul permanent. Te rugăm mergi în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \"Spațiu de stocare\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Nu se poate salva pe spațiu de stocare extern fără permisiune</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Șterg mesajul?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Această acțiune va șterge permanent mesajul.</string>
@@ -2601,7 +2727,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Mesajul nu a putut fi trimis.</string>
     <string name="MessageNotifier_error_delivering_message">A apărut o eroare la trimiterea mesajului.</string>
     <string name="MessageNotifier_message_delivery_paused">Livrarea mesajelor a fost întreruptă.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifică pentru a continua conversația pe Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifică pentru a continua conversația pe Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Marchează tot ca citit</string>
     <string name="MessageNotifier_mark_read">Marchează ca citit</string>
     <string name="MessageNotifier_turn_off_these_notifications">Dezactivează aceste notificări</string>
@@ -2623,7 +2749,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">A reacționat cu %1$s la autocolantul tău.</string>
     <string name="MessageNotifier_this_message_was_deleted">Acest mesaj a fost șters.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Dezactivează notificările pentru contact alăturat la Signal? Le poți activa din nou în Signal &gt; Setări &gt; Notificări.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Dezactivează notificările pentru contact alăturat la Molly? Le poți activa din nou în Molly &gt; Setări &gt; Notificări.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2662,7 +2788,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Răspunsul rapid nu este disponibil cât timp Signal este blocat!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Răspunsul rapid nu este disponibil cât timp Molly este blocat!</string>
     <string name="QuickResponseService_problem_sending_message">Problemă la trimiterea mesajului!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2682,7 +2808,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Scurtătură invalidă</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Mesaj nou</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Solicitare mesaj</string>
     <string name="SingleRecipientNotificationBuilder_you">Tu</string>
@@ -2729,7 +2855,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Acest dispozitiv nu mai este înregistrat. Acest fapt este posibil pentru că ai înregistrat numărul tău de telefon la Signal de pe un dispozitiv diferit.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Acest dispozitiv nu mai este înregistrat. Acest fapt este posibil pentru că ai înregistrat numărul tău de telefon la Molly de pe un dispozitiv diferit.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Înregistrează din Nou Dispozitivul</string>
 
@@ -2742,10 +2868,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Pentru a răspunde, permite lui Signal accesul la microfon.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Pentru a răspunde, permite lui Molly accesul la microfon.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Ca să răspunzi la apelul video, dă Acces pentru Signal la microfon și cameră.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal are nevoie de permisiunile pentru Microfon și Cameră pentru a putea primi apeluri dar i-a fost refuzat accesul permanent. Te rugăm mergi în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \"Microfon\" și \"Cameră\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Ca să răspunzi la apelul video, dă Acces pentru Molly la microfon și cameră.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly are nevoie de permisiunile pentru Microfon și Cameră pentru a putea primi apeluri dar i-a fost refuzat accesul permanent. Te rugăm mergi în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \"Microfon\" și \"Cameră\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Răspuns de pe un dispozitiv asociat.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Respins de pe un dispozitiv asociat.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Ocupat de pe un dispozitiv asociat.</string>
@@ -2790,16 +2916,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Repetă parola nouă</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Invită la Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Invită la Molly</string>
     <string name="contact_selection_activity__new_group">Grup nou</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Reîncarcă contactele</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Îți lipsește cineva? Încearcă să reîncarci</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Găsește persoane pe care le cunoști pe Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Permite accesul la contactele tale</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Mai multe</string>
 
@@ -2816,7 +2942,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Poză contact</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal are nevoie de permisiunea pentru Contacte pentru a putea afișa contactele tale dar i-a fost refuzat accesul permanent. Te rugăm mergi în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \"Contacte\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly are nevoie de permisiunea pentru Contacte pentru a putea afișa contactele tale dar i-a fost refuzat accesul permanent. Te rugăm mergi în meniul de setări al aplicației, selectează \"Permisiuni\" și activează \"Contacte\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Eroare la obținerea contactelor, verifică-ți conexiunea la rețea.</string>
     <string name="ContactSelectionListFragment_username_not_found">Numele de utilizator nu a fost găsit</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" nu este un utilizator Signal. Verifică numele de utilizator și încearcă din nou."</string>
@@ -2835,16 +2961,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Caută după nume de utilizator</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Permite accesul la contacte</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Ca să găsești persoane pe care le cunoști pe Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Permite accesul</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Nu, mulțumesc</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Permite accesul la contacte. Contactele tale sunt criptate și nu sunt vizibile pentru serviciul Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal are nevoie de acces la contactele tale pentru a le afișa.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly are nevoie de acces la contactele tale pentru a le afișa.</string>
     <string name="contact_selection_list_fragment__show_contacts">Afișează contactele</string>
 
     <!-- contact_selection_list_item -->
@@ -2919,6 +3047,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Ai eliminat această persoană, să îi dai mesaj din nou va reveni din nou în lista ta.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Opțiuni</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Actualizează</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Redare … Pauză</string>
@@ -2947,7 +3077,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Bulele sunt o caracteristică Android pe care o poți opri pentru conversațiile Signal.</string>
+    <string name="BubbleOptOutTooltip__description">Bulele sunt o caracteristică Android pe care o poți opri pentru conversațiile Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Nu acum</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3122,9 +3252,9 @@
     <string name="EditProfileFragment__group_description">Descriere grup</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Actualizează Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Actualizează Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Această versiune a Signal a expirat. Actualizează acum ca să continui să folosești Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Această versiune a Molly a expirat. Actualizează acum ca să continui să folosești Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Actualizează</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3342,7 +3472,7 @@
     <string name="preferences__slow">Încet</string>
     <string name="preferences__help">Ajutor</string>
     <string name="preferences__advanced">Avansat</string>
-    <string name="preferences__donate_to_signal">Donează pentru Signal</string>
+    <string name="preferences__donate_to_signal">Donează pentru Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Confidențialitate</string>
     <!-- Preference label for stories -->
@@ -3379,13 +3509,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Schimbă pictograma aplicației și numele la „%1$s“</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal va trebui să se închidă pentru a schimba pictograma și numele aplicației. Notificările vor afișa întotdeauna pictograma și numele Signal.</string>
+    <string name="preferences__app_icon_dialog_description">Molly va trebui să se închidă pentru a schimba pictograma și numele aplicației. Notificările vor afișa întotdeauna pictograma și numele Molly.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Selectează pictograma și numele aplicației, care va fi vizibilă pe ecranul principal al telefonului și în categoria aplicații. Notificările vor afișa întotdeauna pictograma și numele standard Signal. Află mai multe</string>
+    <string name="preferences__app_icon_warning_learn_more">Selectează pictograma și numele aplicației, care va fi vizibilă pe ecranul principal al telefonului și în categoria aplicații. Notificările vor afișa întotdeauna pictograma și numele standard Molly. Află mai multe</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Numele și pictogramele aplicațiilor sunt vizibile pe ecranul principal și în categoria aplicații.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Notificările vor afișa întotdeauna pictograma și numele standard Signal.</string>
+    <string name="preferences__app_icon_notification_warning">Notificările vor afișa întotdeauna pictograma și numele standard Molly.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Află mai multe</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3433,8 +3563,12 @@
         <item quantity="other">Această acțiune va șterge definitiv toate conversațiile până la cele mai recente %1$s de mesaje.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Această acțiune va șterge definitiv tot istoricul mesajelor și fișierele media de pe dispozitiv.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Aceasta va elimina definitiv tot istoricul mesajelor și tot conținutul media de pe acest dispozitiv și de pe toate dispozitivele asociate.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Sigur dorești să ștergi tot istoricul mesajelor?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Tot istoricul mesajelor va fi eliminat definitiv. Această acțiune nu poate fi anulată.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Tot istoricul mesajelor va fi eliminat definitiv de pe toate dispozitivele. Această acțiune este ireversibilă.</string>
     <string name="preferences_storage__delete_all_now">Șterge tot acum</string>
     <string name="preferences_storage__forever">Pentru totdeauna</string>
     <string name="preferences_storage__one_year">1 an</string>
@@ -3472,7 +3606,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Ocolire cenzură</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Ocolire cenzură</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Dacă este activată, Signal va încerca să ocolească cenzura. Nu activa această funcționalitate doar dacă ești într-o locație unde Signal este cenzurat.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Dacă este activată, Molly va încerca să ocolească cenzura. Nu activa această funcționalitate doar dacă ești într-o locație unde Molly este cenzurat.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Ocolirea cenzurii a fost activată pe baza numărului tău de telefon.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3524,7 +3658,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Îți prezentăm plăți</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Folosește Signal și trimite și primește MobileCoin, o nouă monedă digitală axată pe confidențialitate. Activează pentru a începe.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Folosește Molly și trimite și primește MobileCoin, o nouă monedă digitală axată pe confidențialitate. Activează pentru a începe.</string>
     <string name="PaymentsHomeFragment__activate_payments">Activare Plăți</string>
     <string name="PaymentsHomeFragment__activating_payments">Se activează plățile…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Restaurează contul de plăți</string>
@@ -3550,7 +3684,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Plățile nu sunt disponibile in regiunea ta.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Nu s-au putut activa plățile. Încearcă din nou mai târziu.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Dezactivează Plățile?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Nu vei putea trimite sau primi MobileCoin în Signal, dacă dezactivezi plățile.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Nu vei putea trimite sau primi MobileCoin în Molly, dacă dezactivezi plățile.</string>
     <string name="PaymentsHomeFragment__deactivate">Dezactivare</string>
     <string name="PaymentsHomeFragment__continue">Continuă</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Soldul nu este disponibil momentan.</string>
@@ -3559,10 +3693,10 @@
     <string name="PaymentsHomeFragment__details">Detalii</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Poți folosi Signal pentru a trimite și a primi MobileCoin. Toate plățile sunt supuse Termenilor de utilizare pentru MobileCoins și MobileCoin Wallet. Este posibil să întâmpini probleme, iar soldul sau plățile pierdute nu pot fi recuperate. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Poți folosi Molly pentru a trimite și a primi MobileCoin. Toate plățile sunt supuse Termenilor de utilizare pentru MobileCoins și MobileCoin Wallet. Este posibil să întâmpini probleme, iar soldul sau plățile pierdute nu pot fi recuperate. </string>
     <string name="PaymentsHomeFragment__activate">Activare</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Vezi termenii MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Plățile în Signal nu mai sunt disponibile. Poți transfera în continuare fonduri către un exchange, dar nu mai poți trimite sau primi plăți ori adăuga fonduri.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Plățile în Molly nu mai sunt disponibile. Poți transfera în continuare fonduri către un exchange, dar nu mai poți trimite sau primi plăți ori adăuga fonduri.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3590,7 +3724,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Activare permisiuni</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Pentru a te ajuta să trimiți mesaje persoanelor pe care le cunoști, Signal va solicita aceste permisiuni. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Pentru a te ajuta să trimiți mesaje persoanelor pe care le cunoști, Molly va solicita aceste permisiuni. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Notificări</string>
     <!-- Notifications permission row description -->
@@ -3678,10 +3812,10 @@
     <string name="PaymentsTransferFragment__next">Următorul</string>
     <string name="PaymentsTransferFragment__invalid_address">Adresă invalidă</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Verifică adresa portofelului către care dorești să transferi și încearcă din nou.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Nu poți transfera către adresa propriului portofel Signal. Introdu adresa portofelului tău din contul unui exchange acceptat.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Pentru a scana un cod QR, Signal are nevoie de acces la cameră.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal are nevoie de permisiunea pentru Cameră pentru a scana un cod QR. Mergi la setări, selectează \"Permisiuni\" și activează \"Cameră\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Pentru a scana un cod QR, Signal are nevoie de acces la cameră.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Nu poți transfera către adresa propriului portofel Molly. Introdu adresa portofelului tău din contul unui exchange acceptat.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Pentru a scana un cod QR, Molly are nevoie de acces la cameră.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly are nevoie de permisiunea pentru Cameră pentru a scana un cod QR. Mergi la setări, selectează \"Permisiuni\" și activează \"Cameră\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Pentru a scana un cod QR, Molly are nevoie de acces la cameră.</string>
     <string name="PaymentsTransferFragment__settings">Setări</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -4038,17 +4172,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Primire apel vocal Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Primire apel vocal Molly</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Primire apel video Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Primire apel video Molly</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Primire apel Signal de grup</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Primire apel Molly de grup</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Apel vocal Signal în desfășurare</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Apel vocal Molly în desfășurare</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Apel video Signal în desfășurare</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Apel video Molly în desfășurare</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Apel Signal de grup în desfășurare</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Apel Molly de grup în desfășurare</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Se încarcă…</string>
@@ -4097,7 +4231,7 @@
     <string name="BackupDialog_passphrase_was_not_correct">Parola nu a fost corectă</string>
     <string name="LocalBackupJob_creating_signal_backup">Se creează backup-ul…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Se verifică backup-ul Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Se verifică backup-ul Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">Backup-ul a eșuat</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Directorul tău de backup a fost șters sau mutat.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Fișierul de backup este prea mare pentru a fi stocat pe acest volum.</string>
@@ -4112,15 +4246,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Sună-mă (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Retrimite codul (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Contactează Asistența Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Înregistrare Signal - Cod de Verificare pentru Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Contactează Asistența Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Înregistrare Molly - Cod de Verificare pentru Android</string>
     <string name="RegistrationActivity_incorrect_code">Cod incorect</string>
     <string name="BackupUtil_never">Niciodată</string>
     <string name="BackupUtil_unknown">Necunoscut</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Număr de telefon</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Alege cine îți poate vedea numărul de telefon și cine te poate contacta pe Signal cu el.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Alege cine îți poate vedea numărul de telefon și cine te poate contacta pe Molly cu el.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Cine îmi poate vedea numărul</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4168,7 +4302,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Ai făcut prea multe încercări. Te rugăm să încerci din nou mai târziu.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Eroare de conectare la serviciu</string>
     <string name="preferences_chats__backups">Backup-uri</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal este blocat</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly este blocat</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">ATINGE PENTRU DEBLOCARE</string>
     <string name="Recipient_unknown">Necunoscut</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4199,9 +4333,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Ai nevoie de acces la vechiul dispozitiv.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Restaurare din backup</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Restaurează mesajele dintr-un backup local. Dacă nu restaurezi acum, nu vei putea restaura mai târziu.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Restaurează backup-ul local</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Restaurare backup Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Restaurează toate mesajele text + ultimele 30 de zile de fișiere media</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Mai multe opțiuni</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Anulează</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Conectează-te fără transfer</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Continuă fără a transfera mesajele și fișierele tale media</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Deschide Signal pe vechiul telefon Android</string>
     <string name="NewDeviceTransferInstructions__continue">Continuare</string>
@@ -4216,19 +4357,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Se pregătește conectarea la un dispozitiv Android vechi…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Durează un moment, ar trebui să fie gata în curând</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Se așteaptă conectarea vechiul dispozitiv Android…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal are nevoie de permisiunea de localizare pentru a descoperi și a se conecta la vechiul dispozitiv Android.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal are nevoie de servicii de localizare activate pentru a descoperi și a se conecta cu vechiul dispozitiv Android.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal are nevoie de Wi-Fi activat pentru a descoperi și a se conecta cu vechiul dispozitiv Android. Wi-Fi trebuie să fie activat dar nu neapărat conectat la o rețea fără fir.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Ne cerem scuze, se pare că acest dispozitiv nu acceptă Wi-Fi Direct. Signal folosește Wi-Fi Direct pentru a descoperi și a se conecta cu vechiul dispozitiv Android. Încă mai poți recupera contul din vechiul dispozitiv Android, restaurând un backup.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly are nevoie de permisiunea de localizare pentru a descoperi și a se conecta la vechiul dispozitiv Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly are nevoie de servicii de localizare activate pentru a descoperi și a se conecta cu vechiul dispozitiv Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly are nevoie de Wi-Fi activat pentru a descoperi și a se conecta cu vechiul dispozitiv Android. Wi-Fi trebuie să fie activat dar nu neapărat conectat la o rețea fără fir.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Ne cerem scuze, se pare că acest dispozitiv nu acceptă Wi-Fi Direct. Molly folosește Wi-Fi Direct pentru a descoperi și a se conecta cu vechiul dispozitiv Android. Încă mai poți recupera contul din vechiul dispozitiv Android, restaurând un backup.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Restaurare backup</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">A apărut o eroare neașteptată în timpul încercării de a se conecta la vechiul dispozitiv Android.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Se caută un dispozitiv nou Android …</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal are nevoie de permisiunea de localizare pentru a descoperi și a se conecta la noul dispozitiv Android.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal are nevoie de servicii de localizare activate pentru a descoperi și a se conecta cu noul dispozitiv Android.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal are nevoie de Wi-Fi activat pentru a descoperi și a se conecta cu noul dispozitiv Android. Wi-Fi trebuie să fie activat dar nu neapărat conectat la o rețea fără fir.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Ne cerem scuze, se pare că acest dispozitiv nu accepta Wi-Fi Direct. Signal folosește Wi-Fi Direct pentru a descoperi și a se conecta cu noul dispozitiv Android. Încă mai poți crea un backup pentru a-ți restaura contul pe noul dispozitiv Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly are nevoie de permisiunea de localizare pentru a descoperi și a se conecta la noul dispozitiv Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly are nevoie de servicii de localizare activate pentru a descoperi și a se conecta cu noul dispozitiv Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly are nevoie de Wi-Fi activat pentru a descoperi și a se conecta cu noul dispozitiv Android. Wi-Fi trebuie să fie activat dar nu neapărat conectat la o rețea fără fir.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Ne cerem scuze, se pare că acest dispozitiv nu accepta Wi-Fi Direct. Molly folosește Wi-Fi Direct pentru a descoperi și a se conecta cu noul dispozitiv Android. Încă mai poți crea un backup pentru a-ți restaura contul pe noul dispozitiv Android.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Creează un backup</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">O eroare neașteptată a apărut în timpul încercării de conectare la noul dispozitiv Android.</string>
 
@@ -4269,7 +4410,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Se transmit datele</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Ține ambele dispozitive unul lângă celălalt. Nu opri dispozitivele și menține Signal deschis. Transferul este criptat integral.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Ține ambele dispozitive unul lângă celălalt. Nu opri dispozitivele și menține Molly deschis. Transferul este criptat integral.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d mesaje până acum…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% din mesaje până acum…</string>
@@ -4283,7 +4424,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Transfer cont</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Descarcă Signal pe noul dispozitiv Android</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Descarcă Molly pe noul dispozitiv Android</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Atinge \"Transfer sau restaurare cont\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4357,7 +4498,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Oricine cu acest link poate vedea numele și fotografia grupului și poate solicita să se alăture acestuia. Distribuie linkul persoanelor de încredere.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Oricine cu acest link poate vedea numele și fotografia grupului și se poate alătura acestuia. Distribuie linkul persoanelor de încredere.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Trimite prin Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Trimite prin Molly</string>
     <string name="GroupLinkBottomSheet_copy">Copiază</string>
     <string name="GroupLinkBottomSheet_qr_code">Cod QR</string>
     <string name="GroupLinkBottomSheet_share">Distribuie</string>
@@ -4550,7 +4691,7 @@
     <string name="payment_info_card_about_mobilecoin">Despre MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin este o nouă monedă digitală axată pe confidențialitate.</string>
     <string name="payment_info_card_adding_funds">Adăugarea fondurilor</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Poți adăuga fonduri pentru a le folosi în Signal transferând MobileCoin către adresa portofelului tău.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Poți adăuga fonduri pentru a le folosi în Molly transferând MobileCoin către adresa portofelului tău.</string>
     <string name="payment_info_card_cashing_out">Schimbul în numerar</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Poți schimba oricând MobileCoin în numerar la un exchange care acceptă MobileCoin. Nu trebuie decât să faci un transfer către contul tău de la acel exchange.</string>
     <string name="payment_info_card_hide_this_card">Ascunzi această fișă?</string>
@@ -4571,12 +4712,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Dezactivare Portofel</string>
     <string name="DeactivateWalletFragment__your_balance">Soldul tău</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Este recomandat să îți transferi fondurile către o altă adresă de portofel înainte de a dezactiva plățile. Dacă alegi să nu îți transferi fondurile acum, acestea vor rămâne în portofelul tău asociat cu Signal dacă reactivezi plățile.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Este recomandat să îți transferi fondurile către o altă adresă de portofel înainte de a dezactiva plățile. Dacă alegi să nu îți transferi fondurile acum, acestea vor rămâne în portofelul tău asociat cu Molly dacă reactivezi plățile.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Transferă soldul rămas</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Dezactivează fără transfer</string>
     <string name="DeactivateWalletFragment__deactivate">Dezactivare</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Dezactivezi fără transfer?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Soldul tău va rămâne în portofelul asociat cu Signal, dacă alegi sa reactivezi plățile.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Soldul tău va rămâne în portofelul asociat cu Molly, dacă alegi sa reactivezi plățile.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Eroare la dezactivarea portofelului.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4873,7 +5014,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licențe</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Termeni &amp; Politica de confidențialitate</string>
-    <string name="HelpFragment__copyright_signal_messenger">Drepturi de autor Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Drepturi de autor Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Licențiat în cadrul GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -5117,9 +5258,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Selectează o culoare</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Distribuie</string>
 
@@ -5157,7 +5295,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Numai administratorii pot trimite mesaje acestui grup.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Ai atins limita</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Nu poți selecta mai mult de 5 conversații</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5336,9 +5475,9 @@
     <string name="MySupportPreference__learn_more">Află mai multe</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Actualizează Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Actualizează Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Această versiune a Signal a expirat. Actualizează acum ca să continui să folosești Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Această versiune a Molly a expirat. Actualizează acum ca să continui să folosești Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Actualizează</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5347,7 +5486,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Dispozitivul nu este înregistrat</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Acest dispozitiv nu mai este înregistrat. Înregistrează din nou ca să continui să folosești Signal pe acest dispozitiv.</string>
+    <string name="ReregisterSignalDialog__message">Acest dispozitiv nu mai este înregistrat. Înregistrează din nou ca să continui să folosești Molly pe acest dispozitiv.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Înregistrează din nou</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5641,7 +5780,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Nu s-a putut deschide selectorul.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Pentru a activa notificările, Signal are nevoie de permisiunea ta pentru a le afișa.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Pentru a activa notificările, Molly are nevoie de permisiunea ta pentru a le afișa.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Activare</string>
 
@@ -5793,8 +5932,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Niciun răspuns încă</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Nu poți răspunde la această poveste pentru că nu mai ești membru al acestui grup.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Ai reacționat la poveste</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Ai reacționat la poveste</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">A reacționat la poveste</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Vizualizări</string>
     <!-- Label for story replies tab -->
@@ -6428,8 +6569,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Alege-ți banca</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Confirmă-ți donația cu %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Pentru a configura donația recurentă, atinge Continuă, pentru a confirma o taxă de 0,01 € la banca ta. Aceasta va fi rambursată automat și va permite ca donația ta de 5€/lună să fie debitată din contul tău.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Pentru a configura donația recurentă, atinge Continuă, pentru a confirma o taxă de 0,01 € la banca ta. Aceasta va fi rambursată automat și va permite ca donația ta de %1$s/lună să fie debitată din contul tău.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Continuă</string>
 
@@ -6641,7 +6782,7 @@
     <!-- Dialog body to clear all call events -->
     <string name="CallLogFragment__this_will_permanently_delete_all_call_history">Aceasta va șterge definitiv tot istoricul apelurilor</string>
     <!-- Action bar menu item to delete all call events -->
-    <string name="CallLogFragment__clear_call_history">Ștergeți istoricul apelurilor</string>
+    <string name="CallLogFragment__clear_call_history">Șterge istoricul apelurilor</string>
     <!-- Action bar menu item to only display missed calls -->
     <string name="CallLogFragment__filter_missed_calls">Filtrează apeluri ratate</string>
     <!-- Action bar menu item to clear missed call filter -->
@@ -7012,6 +7153,54 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Se descarcă datele din copia de rezervă…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Backup-urile media sunt dezactivate</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Planul tău de backup media Signal a fost anulat, deoarece nu am putut procesa plata. Ai la dispoziție %1$d zi pentru a descărca orice fișier media stocat în copia ta de rezervă. După %1$d zi, conținutul media din copia ta de rezervă va fi șters.</item>
+        <item quantity="few">Planul tău de backup media Signal a fost anulat, deoarece nu am putut procesa plata. Ai la dispoziție %1$d zile pentru a descărca orice fișier media stocat în copia ta de rezervă. După %1$d zile, conținutul media din copia ta de rezervă va fi șters.</item>
+        <item quantity="other">Planul tău de backup media Signal a fost anulat, deoarece nu am putut procesa plata. Ai la dispoziție %1$d de zile pentru a descărca orice fișier media stocat în copia ta de rezervă. După %1$d de zile, conținutul media din copia ta de rezervă va fi șters.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Poți începe să plătești din nou pentru backup în orice moment, pentru a continua să îți salvezi toate fișierele media. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Fișierele tale media vor fi șterse astăzi</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Planul tău de backup Signal media a fost anulat deoarece nu am putut procesa plata. Este ultima ta șansă de a descărca fișierele media din copia de rezervă înainte să fie șterse.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Nu se poate finaliza descărcarea</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Dispozitivul tău nu are suficient spațiu liber. Eliberează până la %1$s de spațiu pentru a descărca fișierele stocate în backup.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Dacă alegi \"Sari peste\", fișierele din backup vor fi eliminate în %1$d zi.</item>
+        <item quantity="few">Dacă alegi \"Sari peste\", fișierele din backup vor fi eliminate în %1$d zile.</item>
+        <item quantity="other">Dacă alegi \"Sari peste\", fișierele din backup vor fi eliminate în %1$d de zile.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Nu se poate procesa plata backup-ului</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Avem probleme la colectarea plății tale lunare recurente pentru backup. Asigură-te că metoda ta de plată este actualizată. Dacă nu este, actualizeaz-o în Google Pay. Signal va încerca să proceseze din nou plata în câteva zile.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Nu s-a putut finaliza backup-ul</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Dispozitivul tău nu a finalizat o copie de rezervă de %1$d zile. Asigură-te că dispozitivul tău este conectat la Wi-Fi și atinge \"Backup acum.\" </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Află mai multe</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Omite</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Descarcă media acum</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Descarcă mai târziu</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Nu descărca fișierele media</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Eliberează %1$s spațiu pentru a-ți descărca fișierele media.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Card de credit sau debit</string>
@@ -7025,6 +7214,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Necunoscut</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Istoricul plăților</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Ultima copie de rezervă a fost făcută pe %1$s la %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -7035,6 +7230,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Mesajele mai vechi decât perioada selectată vor fi șterse permanent.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Mesajele care depășesc lungimea selectată vor fi șterse definitiv.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Aplică limite dispozitivelor conectate</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Atunci când sunt activate, limitele de chat vor elimina și mesajele de pe dispozitivele asociate.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Eliminarea este acum sincronizată pe toate dispozitivele tale</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Atunci când elimini mesaje sau conversații, acestea vor fi șterse de pe telefon și de pe toate dispozitivele asociate.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Istoricul plăților</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Text și tot backup-ul media</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Detalii de plată</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Tipul de backup</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Data plății</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Distribuie</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Backup-uri Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Istoricul plăților</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Detaliile backup-ului</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Dimensiunea backup-ului</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Frecvența backup-ului</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Efectuează backup folosind date mobile</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Dezactivează și elimină backup-ul</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Backup eliminat și dezactivat.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Tipul de backup schimbat și abonamentul anulat</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Abonament anulat</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Descărcare completă</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Tipul de backup</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Backup-uri dezactivate</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s - %2$s/lună</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Activează backup-urile</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Ultimul backup</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s la %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Niciodată</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Faceți un backup acum</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Dezactivezi și elimini backup-urile?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Nu vei fi taxat/ă din nou. Backup-ul tău va fi eliminat și nu vor fi create backup-uri noi.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Dezactivează și șterge</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Se elimină backup-ul…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Backup eliminat</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Atingând Fă backup acum"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Zilnic</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Săptămânal</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Lunar</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Efectuează backup manual</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Introdu codul PIN, parola sau șablonul pentru dispozitivul tău.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Următorul</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Schimbă tipul de backup</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Anulare Abonament</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Confirmă anularea</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Nu vei mai fi taxat/ă din nou. Backup-urile vor fi dezactivate la sfârșitul ciclului de facturare. După această dată, vei avea la dispoziție 30 de zile pentru a descărca fișierele media pe care le salvezi în prezent.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Confirmă și descarcă acum</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Confirmă și descarcă mai târziu</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Păstrează abonamentul</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 40a7f6334e..41c9d22cd7 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal обновляется…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly обновляется…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Вы еще не задали парольную фразу!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Отключить парольную фразу?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">После этого приложение Signal и его уведомления всегда будут видны без ввода пароля.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">После этого приложение Molly и его уведомления всегда будут видны без ввода пароля.</string>
     <string name="ApplicationPreferencesActivity_disable">Отключить</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Ошибка подключения к серверу!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN-коды необходимы для блокировки регистрации. Чтобы отключить PIN-коды, пожалуйста, сначала отключите блокировку регистрации.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Файл</string>
     <string name="AttachmentKeyboard_contact">Контакт</string>
     <string name="AttachmentKeyboard_location">Место</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal требуется разрешение, чтобы показывать ваши недавние фото и видео</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly требуется разрешение, чтобы показывать ваши недавние фото и видео</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Разрешить доступ</string>
     <string name="AttachmentKeyboard_payment">Платёж</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Не найдено приложение для выбора медиафайлов.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal требуется разрешение на доступ к хранилищу для прикрепления фото, видео или аудио, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Хранилище».</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal требуется разрешение на доступ к контактам для прикрепления контактной информации, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Контакты».</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal требуется разрешение на доступ к местоположению для прикрепления местоположения, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Местоположение».</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly требуется разрешение на доступ к хранилищу для прикрепления фото, видео или аудио, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Хранилище».</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly требуется разрешение на доступ к контактам для прикрепления контактной информации, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Контакты».</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly требуется разрешение на доступ к местоположению для прикрепления местоположения, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Местоположение».</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Разрешить доступ к вашему местоположению</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Чтобы отправить ваше местоположение:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Разрешите Signal доступ для отправки вашего местоположения.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Разрешите Molly доступ для отправки вашего местоположения.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal нужен доступ к вашему местоположению, чтобы отправлять данные о нём.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly нужен доступ к вашему местоположению, чтобы отправлять данные о нём.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Разрешить доступ к хранилищу</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Чтобы показать фото и видео:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal требуется доступ к хранилищу, чтобы показывать ваши недавние фото и видео.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly требуется доступ к хранилищу, чтобы показывать ваши недавние фото и видео.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">Пользователь %1$s не активировал платежи </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Сменить камеру</string>
     <string name="CameraXFragment_open_gallery_description">Открыть галерею</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Разрешить доступ</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Разрешите доступ к камере и микрофону</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Разрешите доступ к камере</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Разрешить доступ к микрофону</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Чтобы снимать фото, Signal требуется доступ к камере.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Для создания фото и видео разрешите Signal доступ к камере.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Чтобы снимать фото и видео, Signal требуется доступ к микрофону.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Чтобы снимать видео со звуком, Signal требуется доступ к микрофону.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Чтобы сканировать QR-коды, Signal требуется доступ к камере.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal требуется доступ к камере, чтобы снимать фото</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal требуется доступ к камере для сканирования QR-кодов</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Чтобы снимать видео, Signal требуется доступ к микрофону</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Чтобы сделать фото в Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Для создания фото и видео в Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Для создания видео со звуком:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Для сканирования QR-кодов:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Недавние контакты</string>
@@ -273,7 +274,7 @@
     <string name="CameraContacts_no_signal_contacts">Нет контактов Signal</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Кнопкой камеры можно отправлять фотографии только тем контактам, которые являются пользователями Signal. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Не можете найти нужного человека?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Пригласите контакт в Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Пригласите контакт в Molly</string>
     <string name="CameraContacts__menu_search">Поиск</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -287,12 +288,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Нет, спасибо</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Обновите Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Обновите Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Эта версия приложения больше не поддерживается. Чтобы и далее отправлять и получать сообщения, обновитесь до последней версии.</string>
     <string name="ClientDeprecatedActivity_update">Обновить</string>
     <string name="ClientDeprecatedActivity_dont_update">Не обновлять</string>
     <string name="ClientDeprecatedActivity_warning">Предупреждение</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Ваша версия Signal устарела. Вы можете просматривать свою историю сообщений, но не сможете отправлять или получать сообщения, пока не обновите версию Signal.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Ваша версия Molly устарела. Вы можете просматривать свою историю сообщений, но не сможете отправлять или получать сообщения, пока не обновите версию Molly.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Браузер не найден.</string>
@@ -329,8 +330,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Сообщение %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Аудиозвонок Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Видеозвонок Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -428,7 +429,7 @@
     <string name="ConversationActivity_transport_signal">Сообщение Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Отправить сообщение</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Давайте перейдем на Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Давайте перейдем на Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Пожалуйста, выберите контакт</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Вложение превышает предельный размер для того типа сообщения, которое вы отправляете.</string>
     <string name="ConversationActivity_unable_to_record_audio">Не удалось записать аудио!</string>
@@ -447,18 +448,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Чтобы отправить аудиосообщение:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Для отправки голосовых сообщений разрешите Signal доступ к микрофону.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Для отправки голосовых сообщений разрешите Molly доступ к микрофону.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal требуется разрешение на доступ к микрофону, чтобы записывать голосовое сообщение.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal требуется разрешение на доступ к микрофону для отправки аудиосообщений, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Микрофон».</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly требуется разрешение на доступ к микрофону, чтобы записывать голосовое сообщение.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly требуется разрешение на доступ к микрофону для отправки аудиосообщений, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Микрофон».</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal требуются разрешения на доступ к микрофону и камере, чтобы позвонить %1$s, но они были вами отклонены. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Микрофон» и «Камера».</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Для создания фото и видео разрешите Signal доступ к камере.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal требуется разрешение на доступ к камере, чтобы снимать фото или видео, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Камера».</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal требуется разрешение на доступ к камере, чтобы снимать фото или видео</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly требуются разрешения на доступ к микрофону и камере, чтобы позвонить %1$s, но они были вами отклонены. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Микрофон» и «Камера».</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Для создания фото и видео разрешите Molly доступ к камере.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly требуется разрешение на доступ к камере, чтобы снимать фото или видео, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Камера».</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly требуется разрешение на доступ к камере, чтобы снимать фото или видео</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Предоставьте разрешение на доступ к микрофону, чтобы снимать видео со звуком.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal требуется разрешение на доступ к микрофону, чтобы снимать видео, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Микрофон» и «Камера».</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal требуется разрешение на доступ к микрофону, чтобы записывать видео.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly требуется разрешение на доступ к микрофону, чтобы снимать видео, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Микрофон» и «Камера».</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly требуется разрешение на доступ к микрофону, чтобы записывать видео.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Нет</string>
@@ -479,9 +480,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Чтобы начать звонок</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Для начала звонка разрешите Signal доступ к микрофону.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Для начала звонка разрешите Molly доступ к микрофону.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Для начала звонка Signal требуется доступ к микрофону.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Для начала звонка Molly требуется доступ к микрофону.</string>
 
 
     <string name="ConversationActivity_join">Войти</string>
@@ -495,9 +496,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Обмен SMS-сообщениями больше не поддерживается в Signal. Пригласите %1$s в Signal, чтобы продолжить разговор здесь.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Этот человек больше не пользуется Signal. Пригласите его в Signal, чтобы продолжить разговор здесь.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Этот человек больше не пользуется Molly. Пригласите его в Molly, чтобы продолжить разговор здесь.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Пригласить в Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Пригласить в Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Скоро вы снова получите напоминание об этом.</string>
 
@@ -563,6 +564,8 @@
     <string name="ConversationFragment_delete_for_everyone">Удалить для всех</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Удалить на этом устройстве</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Удалить</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Удалить везде</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Это сообщение будет удалено для всех в этом чате, если у них установлена недавняя версия Signal. Они смогут увидеть, что вы удалили сообщение.</string>
@@ -594,13 +597,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Пользователь заблокирован</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Обновить Signal</string>
+    <string name="ConversationFragment__update_build">Обновить Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Повторно зарегистрироваться в Signal</string>
+    <string name="ConversationFragment__reregister_signal">Повторно зарегистрироваться в Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Перейти назад.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Открыть Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Открыть Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Более не подтверждённые</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -669,6 +672,13 @@
         <item quantity="many">Это навсегда удалит все %1$d выбранных чатов.</item>
         <item quantity="other">Это навсегда удалит все %1$d выбранного чата.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Это навсегда удалит выбранный чат со всех ваших устройств.</item>
+        <item quantity="few">Это навсегда удалит все %1$d выбранных чата со всех ваших устройств.</item>
+        <item quantity="many">Это навсегда удалит все %1$d выбранных чатов со всех ваших устройств.</item>
+        <item quantity="other">Это навсегда удалит все %1$d выбранных чата со всех ваших устройств.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Удаление</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Удаляем выбранный чат…</item>
@@ -770,9 +780,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Кто может найти меня по номеру?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Любой, у кого есть ваш номер телефона, будет видеть, что вы в Signal, и сможет начать с вами чат.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Любой, у кого есть ваш номер телефона, будет видеть, что вы в Molly, и сможет начать с вами чат.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Никто не сможет увидеть, что вы в Signal, если только вы не отправите этому человеку сообщение или не продолжите с ним чат.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Никто не сможет увидеть, что вы в Molly, если только вы не отправите этому человеку сообщение или не продолжите с ним чат.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Восстановить из резервной копии?</string>
@@ -806,7 +816,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Испытайте парольную фразу своей резервной копии и убедитесь, что она работает</string>
     <string name="BackupsPreferenceFragment__turn_on">Включить</string>
     <string name="BackupsPreferenceFragment__turn_off">Отключить</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Чтобы восстановить из резервной копии, установите новую копию Signal. Откройте приложение и нажмите «Восстановить резервную копию», затем выберите файл резервной копии. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Чтобы восстановить из резервной копии, установите новую копию Molly. Откройте приложение и нажмите «Восстановить резервную копию», затем выберите файл резервной копии. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Узнать больше</string>
     <string name="BackupsPreferenceFragment__in_progress">В процессе…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -814,7 +824,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">Уже %1$d…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">Уже %1$s%%…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal требуется разрешение на доступ к хранилищу для создания резервных копий, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Хранилище».</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly требуется разрешение на доступ к хранилищу для создания резервных копий, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Хранилище».</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Задать время резервного копирования</string>
 
@@ -881,7 +891,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Сессия чата обновлена</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal использует сквозное шифрование, и ему иногда бывает нужно обновить сессию вашего чата. Это не затрагивает безопасность чата, но вы могли пропустить сообщение от этого собеседника. Вы можете попросить его отправить сообщение заново.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly использует сквозное шифрование, и ему иногда бывает нужно обновить сессию вашего чата. Это не затрагивает безопасность чата, но вы могли пропустить сообщение от этого собеседника. Вы можете попросить его отправить сообщение заново.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Используйте Signal на компьютере или iPad. Ваши сообщения будут синхронизированы с вашими связанными устройствами.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Привязать новое устройство</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Сообщения и информация о чате защищены сквозным шифрованием на всех устройствах</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal на компьютере или iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Все сообщения на связанных устройствах являются приватными</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Сообщения Molly синхронизируются с Molly на вашем мобильном телефоне, после того как он будет привязан. История ваших предыдущих сообщений не появится.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">На другом устройстве зайдите на %1$s, чтобы установить Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Мои связанные устройства</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Отвязать</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">Устройство %1$s отвязано</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Привязка устройства…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Устройство подтверждено</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Загружаем…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Нет связанных устройств</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Разблокируйте, чтобы привязать устройство</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Просканируйте QR-код, отображаемый на устройстве, чтобы привязать его.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Сканировать QR-код</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Используйте данное устройство для сканирования QR-кода с устройства, которое хотите привязать</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Хорошо</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Это устройство сможет видеть ваши группы и контакты, получит доступ к вашим чатам и сможет отправлять сообщения от вашего имени.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Завершите привязку на другом устройстве</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Завершите привязку Molly на другом устройстве.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Не удалось привязать устройство</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Этот QR-код недействителен. Пожалуйста, убедитесь, что вы сканируете QR-код, показанный на устройстве, которое вы хотите привязать.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Повторить попытку</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Отвязать «%1$s»?</string>
@@ -903,10 +968,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Оптимизация при отсутствии Служб Google Play</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Это устройство не поддерживает Службы Google Play. Нажмите для отключения оптимизации энергопотребления, которая не позволяет Signal получать сообщения, когда он неактивен.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Это устройство не поддерживает Службы Google Play. Нажмите для отключения оптимизации энергопотребления, которая не позволяет Molly получать сообщения, когда он неактивен.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Эта версия Signal устарела. Обновитесь сейчас, чтобы отправлять и получать сообщения.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Эта версия Molly устарела. Обновитесь сейчас, чтобы отправлять и получать сообщения.</string>
     <string name="ExpiredBuildReminder_update_now">Обновиться</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -920,7 +985,7 @@
 
     <!-- GcmRefreshJob -->
     <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Неустранимая ошибка соединения!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal не смог зарегистрироваться в Службах Google Play. Сообщения и звонки через Signal отключены, пожалуйста, попробуйте зарегистрироваться снова через Наcтройки &gt; Расширенные.</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly не смог зарегистрироваться в Службах Google Play. Сообщения и звонки через Molly отключены, пожалуйста, попробуйте зарегистрироваться снова через Наcтройки &gt; Расширенные.</string>
 
 
     <!-- GiphyActivity -->
@@ -1085,20 +1150,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Журналы отладки помогают нам диагностировать и устранять проблему и не содержат идентифицирующей информации.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Возникла проблема в Signal. Отправить журналы отладки?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Возникла проблема в Molly. Отправить журналы отладки?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Уведомления могут приходить с задержкой в связи с оптимизацией работы батареи</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Чтобы уведомления о сообщениях не задерживались, вы можете отключить оптимизацию батареи для Signal.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Чтобы уведомления о сообщениях не задерживались, вы можете отключить оптимизацию батареи для Molly.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Уведомления могут приходить с задержкой в связи с оптимизацией работы батареи</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Чтобы уведомления о сообщениях не задерживались, отключите оптимизацию батареи для Molly. Нажмите «Продолжить», чтобы посмотреть инструкции для конкретного устройства.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Нет, спасибо</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Продолжить</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Продолжить</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Закрыть</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Нет, спасибо</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Приглашения в группу</string>
+    <string name="PendingMembersActivity_pending_group_invites">Запросы и приглашения</string>
     <string name="PendingMembersActivity_requests">Запросы</string>
     <string name="PendingMembersActivity_invites">Приглашения</string>
     <string name="PendingMembersActivity_people_you_invited">Люди, которых пригласили вы</string>
@@ -1361,7 +1436,7 @@
     <string name="InviteActivity_cancel">Отмена</string>
     <string name="InviteActivity_sending">Отправляется…</string>
     <string name="InviteActivity_invitations_sent">Приглашения отправлены!</string>
-    <string name="InviteActivity_invite_to_signal">Пригласить в Signal</string>
+    <string name="InviteActivity_invite_to_signal">Пригласить в Molly</string>
     <string name="InviteActivity_send_sms">Отправить SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Отправить %1$d SMS-приглашение?</item>
@@ -1369,7 +1444,7 @@
         <item quantity="many">Отправить %1$d SMS-приглашений?</item>
         <item quantity="other">Отправить %1$d SMS-приглашений?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Давайте перейдем на Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Давайте перейдем на Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Похоже, что у вас нет приложений, через которые можно поделиться.</string>
 
     <!-- LearnMoreTextView -->
@@ -1383,7 +1458,7 @@
     <string name="LongMessageActivity_your_message">Ваше сообщение</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Фоновое соединение активно</string>
 
     <!-- MediaOverviewActivity -->
@@ -1462,10 +1537,10 @@
     <string name="MessageQuotesBottomSheet_replies">Ответы</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Начинается звонок через Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">Начинается звонок через Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Сервис звонков Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Останавливаем сервис звонков Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Сервис звонков Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Останавливаем сервис звонков Molly</string>
     <string name="NotificationBarManager__cancel_call">Отменить</string>
 
     <!-- NotificationsMegaphone -->
@@ -1733,6 +1808,14 @@
     <string name="MessageRecord_you_activated_payments">Вы активировали платежи</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s теперь может принимать платежи</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Подробности платежа недоступны</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Показать полностью</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Подробности платежа недоступны</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Сведения об данном платеже недоступны, так как ваши сообщения были восстановлены из источника, который не содержал эту историю платежей. Это не влияет на баланс вашего кошелька или статус прошлых платежей.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1793,9 +1876,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Скоро вы больше не сможете отправлять SMS-сообщения из Signal. Пригласите %1$s в Signal, чтобы продолжить разговор здесь.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Вы больше не можете отправлять SMS-сообщения в Signal. Пригласите %1$s в Signal, чтобы продолжить разговор здесь.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Вы больше не можете отправлять SMS-сообщения в Molly. Пригласите %1$s в Molly, чтобы продолжить разговор здесь.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Платёж: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Платёж</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Было сообщено о спаме</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1881,7 +1966,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Привязать устройство Signal?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Похоже, вы пытаетесь привязать устройство Signal, используя сторонний сканер. Для вашей защиты, пожалуйста, просканируйте код через Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal требуется разрешение на доступ к камере для сканирования QR-кода, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Камера».</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly требуется разрешение на доступ к камере для сканирования QR-кода, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Камера».</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Не удалось отсканировать QR-код из-за отсутствия доступа к камере</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1896,11 +1981,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Введите парольную фразу</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Значок Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Значок Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Подтвердить парольную фразу</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Неверная парольная фраза!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Разблокировать Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Экран блокировки</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Разблокировать Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Экран блокировки</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Карта</string>
@@ -1969,7 +2054,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Пройдите проверку, чтобы продолжить общение</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Чтобы помочь предотвратить спам в Signal, пожалуйста, пройдите проверку.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Чтобы помочь предотвратить спам в Molly, пожалуйста, пройдите проверку.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">После проверки вы сможете продолжить общаться. Все приостановленные сообщения будут отправлены автоматически.</string>
 
     <!-- Recipient -->
@@ -1977,7 +2062,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Моя история</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Звонок Signal</string>
+    <string name="Recipient_signal_call">Звонок Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Заблокировать</string>
@@ -1991,7 +2076,8 @@
     <string name="RedPhone_ringing">Звоним…</string>
     <string name="RedPhone_busy">Занято</string>
     <string name="RedPhone_recipient_unavailable">Собеседник недоступен</string>
-    <string name="RedPhone_network_failed">Ошибка сети!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Ошибка сети! Пожалуйста, проверьте ваше подключение к интернету и попробуйте ещё раз.</string>
     <string name="RedPhone_number_not_registered">Номер не зарегистрирован!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Вызываемый номер не поддерживает защищённые звонки!</string>
     <string name="RedPhone_got_it">Понятно</string>
@@ -2002,8 +2088,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Нажмите здесь, чтобы включить своё видео</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Чтобы позвонить %1$s, Signal необходим доступ к вашей камере</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Чтобы позвонить %1$s, Molly необходим доступ к вашей камере</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Подключаемся…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Переподключаемся…</string>
@@ -2069,10 +2155,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Удалён(-на) из звонка</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Кто-то удалил вас из звонка.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Разрешите доступ к камере и микрофону</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Разрешить доступ к микрофону</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Разрешите доступ к камере</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Чтобы начать звонок или присоединиться к нему, разрешите Molly доступ к камере и микрофону.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Чтобы начать звонок или присоединиться к нему, разрешите Molly доступ к микрофону.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Для включения видео разрешите Molly доступ к камере.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly требуется разрешение на доступ к микрофону, чтобы начать или присоединиться к звонку.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly требуется доступ к камере, чтобы включить видео</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Чтобы начать или присоединиться к звонку:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Чтобы включить видео:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Звонок Signal</string>
-    <string name="WebRtcCallView__signal_video_call">Видеозвонок Signal</string>
+    <string name="WebRtcCallView__signal_call">Звонок Molly</string>
+    <string name="WebRtcCallView__signal_video_call">Видеозвонок Molly</string>
     <string name="WebRtcCallView__start_call">Начать звонок</string>
     <string name="WebRtcCallView__join_call">Присоединиться к звонку</string>
     <string name="WebRtcCallView__call_is_full">Звонок заполнен</string>
@@ -2172,24 +2278,47 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Опустить руку?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Опустить руку</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Опустить</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Отменить</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Вы подняли руку</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Просмотреть</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s поднял(-а) руку</item>
-        <item quantity="few">%1$s и %2$d подняли руку</item>
-        <item quantity="many">%1$s и %2$d подняли руку</item>
-        <item quantity="other">%1$s и %2$d подняли руку</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s подняли руку</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s и ещё %2$d подняли руку</item>
+        <item quantity="few">%1$s и ещё %2$d подняли руку</item>
+        <item quantity="many">%1$s и ещё %2$d подняли руку</item>
+        <item quantity="other">%1$s и ещё %2$d подняли руку</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s поднял(-а) руку</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s и ещё %2$d подняли руку</item>
+        <item quantity="few">%1$s и ещё %2$d подняли руку</item>
+        <item quantity="many">%1$s и ещё %2$d подняли руку</item>
+        <item quantity="other">%1$s и ещё %2$d подняли руку</item>
+    </plurals>
+
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="few">%1$s +%2$d</item>
+        <item quantity="many">%1$s +%2$d</item>
+        <item quantity="other">%1$s +%2$d</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="few">%1$s +%2$d</item>
         <item quantity="many">%1$s +%2$d</item>
@@ -2292,7 +2421,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Вы получите звонок, чтобы подтвердить этот номер.</string>
     <string name="RegistrationActivity_edit_number">Изменить номер</string>
     <string name="RegistrationActivity_missing_google_play_services">Отсутствуют Службы Google Play</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">На устройстве отсутствуют Службы Google Play. Вы можете продолжить использование Signal, но надёжность или производительность могут снизиться.\n\nЕсли вы не продвинутый пользователь, не используете стороннюю прошивку Android или считаете, что видите это сообщение по ошибке, обратитесь в службу поддержки по адресу support@signal.org для помощи с устранением неполадок.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">На устройстве отсутствуют Службы Google Play. Вы можете продолжить использование Molly, но надёжность или производительность могут снизиться.\n\nЕсли вы не продвинутый пользователь, не используете стороннюю прошивку Android или считаете, что видите это сообщение по ошибке, обратитесь в службу поддержки по адресу support@molly.im для помощи с устранением неполадок.</string>
     <string name="RegistrationActivity_i_understand">Я понимаю</string>
     <string name="RegistrationActivity_play_services_error">Ошибка Служб Google Play</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Службы Google Play обновляются или временно недоступны. Пожалуйста, попробуйте еще раз.</string>
@@ -2310,7 +2439,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Нестандартный номер телефона</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Номер, который вы ввели (%1$s), похоже, не в стандартном формате.\n\nВы имели в виду %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Формат номера телефона</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Формат номера телефона</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Звонок запрошен</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2346,8 +2475,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Возникли проблемы с регистрацией?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Убедитесь, что на вашем телефоне есть сигнал сотовой связи для приема SMS или звонка\n • Подтвердите, что можете принять телефонный звонок на номер\n • Проверьте правильность введённого номера телефона.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Для получения дополнительной информации выполните следующие шаги для устранения неполадок или свяжитесь с поддержкой</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Для дополнительной информации посетите %1$s или %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">следующие шаги для устранения неполадок</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2385,13 +2514,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Добавить в контакты</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Пригласить в Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Пригласить в Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Сообщение Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Звонок Signal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Добавить в контакты</string>
-    <string name="SharedContactView_invite_to_signal">Пригласить в Signal</string>
+    <string name="SharedContactView_invite_to_signal">Пригласить в Molly</string>
     <string name="SharedContactView_message">Сообщение Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2522,11 +2651,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s принадлежит %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Обновление Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Доступна новая версия Signal. Нажмите, чтобы обновить.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Не удалось обновить Signal</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Обновление Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Доступна новая версия Molly. Нажмите, чтобы обновить.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Не удалось обновить Molly</string>
     <string name="ApkUpdateNotifications_failed_general_body">Мы попробуем ещё раз позже.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal успешно обновлён</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly успешно обновлён</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Вы были автоматически обновлены до версии %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2599,7 +2728,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Наш код безопасности Signal:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Похоже, что у вас нет приложений, через которые можно поделиться.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">В буфере обмена код безопасности не найден</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal требуется разрешение на доступ к камере для сканирования QR-кода, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Камера».</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly требуется разрешение на доступ к камере для сканирования QR-кода, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Камера».</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Не удалось просканировать QR-код из-за отсутствия разрешения на доступ к камере</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Чтобы просмотреть код безопасности %1$s, вам нужно сначала обменяться сообщениями.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2629,14 +2758,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Нажмите, чтобы открыть.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal разблокирован</string>
-    <string name="KeyCachingService_lock">Блокировать Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly разблокирован</string>
+    <string name="KeyCachingService_lock">Блокировать Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Вы</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Тип медиафайла не поддерживается</string>
     <string name="MediaPreviewActivity_draft">Черновик</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal требуется разрешение на доступ к хранилищу для сохранения во внешнее хранилище, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Хранилище».</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly требуется разрешение на доступ к хранилищу для сохранения во внешнее хранилище, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Хранилище».</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Не удалось сохранить во внешнем хранилище без разрешений</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Удалить сообщение?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Это сообщение будет навсегда удалено.</string>
@@ -2684,7 +2813,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Не удалось доставить сообщение.</string>
     <string name="MessageNotifier_error_delivering_message">Ошибка при доставке сообщения.</string>
     <string name="MessageNotifier_message_delivery_paused">Доставка сообщений приостановлена.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Пройдите проверку, чтобы продолжить общение в Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Пройдите проверку, чтобы продолжить общение в Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Всё прочитано</string>
     <string name="MessageNotifier_mark_read">Прочитано</string>
     <string name="MessageNotifier_turn_off_these_notifications">Отключить эти уведомления</string>
@@ -2706,7 +2835,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Отреагировал(-а) %1$s на ваш стикер.</string>
     <string name="MessageNotifier_this_message_was_deleted">Это сообщение было удалено.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Отключить уведомления «Контакт присоединился к Signal»? Вы можете заново включить их в Signal &gt; Настройки &gt; Уведомления.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Отключить уведомления «Контакт присоединился к Molly»? Вы можете заново включить их в Molly &gt; Настройки &gt; Уведомления.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2745,7 +2874,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Быстрые ответы недоступны, когда Signal заблокирован!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Быстрые ответы недоступны, когда Molly заблокирован!</string>
     <string name="QuickResponseService_problem_sending_message">Проблема при отправке сообщения!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2765,7 +2894,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Недопустимый ярлык</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Новое сообщение</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Запрос на общение</string>
     <string name="SingleRecipientNotificationBuilder_you">Вы</string>
@@ -2813,7 +2942,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Это устройство больше не зарегистрировано. Это может быть вызвано тем, что вы зарегистрировали свой номер телефона в Signal на другом устройстве.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Это устройство больше не зарегистрировано. Это может быть вызвано тем, что вы зарегистрировали свой номер телефона в Molly на другом устройстве.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Перерегистрируйте устройство</string>
 
@@ -2826,10 +2955,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Для ответа на звонок предоставьте Signal доступ к микрофону.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Для ответа на звонок предоставьте Molly доступ к микрофону.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Для ответа на видеозвонок предоставьте Signal доступ к микрофону и камере.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal требуются разрешения на доступ к микрофону и камере для совершения или принятия звонков, но они были вами отклонены. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Микрофон» и «Камера».</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Для ответа на видеозвонок предоставьте Molly доступ к микрофону и камере.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly требуются разрешения на доступ к микрофону и камере для совершения или принятия звонков, но они были вами отклонены. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Микрофон» и «Камера».</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Принят на привязанном устройстве.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Отклонён на привязанном устройстве.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Занято на привязанном устройстве.</string>
@@ -2874,16 +3003,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Повторите новую парольную фразу</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Пригласить в Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Пригласить в Molly</string>
     <string name="contact_selection_activity__new_group">Новая группа</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Обновить контакты</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Не можете кого-то найти? Попробуйте обновить</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Найдите знакомых в Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Разрешите доступ к вашим контактам</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Больше</string>
 
@@ -2900,7 +3029,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Фото контакта</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal требуется разрешение на доступ к контактам для показа ваших контактов, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Контакты».</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly требуется разрешение на доступ к контактам для показа ваших контактов, но оно было вами отклонено. Нажмите «Продолжить», чтобы перейти в настройки приложения, откройте «Разрешения» и включите «Контакты».</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Ошибка при получении контактов, проверьте подключение к сети</string>
     <string name="ContactSelectionListFragment_username_not_found">Имя пользователя не найдено</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"«%1$s» — не пользователь Signal. Пожалуйста, проверьте имя пользователя и попробуйте ещё раз."</string>
@@ -2920,16 +3049,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Поиск по имени пользователя</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Разрешить доступ к контактам</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Чтобы найти знакомых в Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Разрешить доступ</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Нет, спасибо</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Разрешите доступ к вашим контактам. Ваши контакты зашифрованы и не видны Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal необходим доступ к вашим контактам, чтобы отобразить их.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly необходим доступ к вашим контактам, чтобы отобразить их.</string>
     <string name="contact_selection_list_fragment__show_contacts">Показать контакты</string>
 
     <!-- contact_selection_list_item -->
@@ -3006,6 +3137,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Вы удалили этого человека, повторное сообщение снова добавит его в ваш список.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Варианты:</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Обновить</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Воспроизведение … Пауза</string>
@@ -3034,7 +3167,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Всплывающие чаты — это функция Android, которую вы можете отключить для чатов Signal.</string>
+    <string name="BubbleOptOutTooltip__description">Всплывающие чаты — это функция Android, которую вы можете отключить для чатов Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Не сейчас</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3216,9 +3349,9 @@
     <string name="EditProfileFragment__group_description">Описание группы</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Обновить Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Обновить Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Эта версия Signal устарела. Обновитесь сейчас, чтобы и дальше использовать Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Эта версия Molly устарела. Обновитесь сейчас, чтобы и дальше использовать Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Обновить</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3437,7 +3570,7 @@
     <string name="preferences__slow">Медленное</string>
     <string name="preferences__help">Помощь</string>
     <string name="preferences__advanced">Расширенные</string>
-    <string name="preferences__donate_to_signal">Поддержать Signal</string>
+    <string name="preferences__donate_to_signal">Поддержать Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Конфиденциальность</string>
     <!-- Preference label for stories -->
@@ -3474,13 +3607,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Изменить значок и название приложения на «%1$s»</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal нужно будет закрыть, чтобы изменить значок и название приложения. В уведомлениях всегда будут отображаться значок и название Signal по умолчанию.</string>
+    <string name="preferences__app_icon_dialog_description">Molly нужно будет закрыть, чтобы изменить значок и название приложения. В уведомлениях всегда будут отображаться значок и название Molly по умолчанию.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Выберите значок и название приложения, которые будут отображаться на главном экране телефона и панели приложений. В уведомлениях всегда будут отображаться значок и название Signal по умолчанию. Узнать больше</string>
+    <string name="preferences__app_icon_warning_learn_more">Выберите значок и название приложения, которые будут отображаться на главном экране телефона и панели приложений. В уведомлениях всегда будут отображаться значок и название Molly по умолчанию. Узнать больше</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Значки и названия приложений отображаются на главном экране и панели приложений.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">В уведомлениях всегда будут отображаться значок и название Signal по умолчанию.</string>
+    <string name="preferences__app_icon_notification_warning">В уведомлениях всегда будут отображаться значок и название Molly по умолчанию.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Узнать больше</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3529,8 +3662,12 @@
         <item quantity="other">Все чаты будут безвозвратно обрезаны до %1$s самого нового сообщения.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Все сообщения и медиафайлы будут безвозвратно удалены с вашего устройства.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Все сообщения и медиафайлы будут безвозвратно удалены с этого устройства и всех связанных устройств.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Вы действительно хотите удалить всю историю сообщений?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Вся история сообщений будет безвозвратно удалена. Это действие невозможно отменить.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Вся история сообщений будет безвозвратно удалена со всех устройств. Это действие не может быть отменено.</string>
     <string name="preferences_storage__delete_all_now">Удалить всё сейчас</string>
     <string name="preferences_storage__forever">Бессрочно</string>
     <string name="preferences_storage__one_year">1 год</string>
@@ -3569,7 +3706,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Обход цензуры</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Обход цензуры</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Если включить эту опцию, Signal будет пытаться обойти цензуру (блокировку провайдером). Не включайте её, если там, где вы находитесь, Signal не блокируется.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Если включить эту опцию, Molly будет пытаться обойти цензуру (блокировку провайдером). Не включайте её, если там, где вы находитесь, Molly не блокируется.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Обход цензуры был автоматически активирован на основе номера телефона вашей учётной записи.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3621,7 +3758,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Новая функция: платежи</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Используйте Signal, чтобы отправлять и получать MobileCoin — новую цифр. валюту c акцентом на конфиденциальность. Активируйте, чтобы начать.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Используйте Molly, чтобы отправлять и получать MobileCoin — новую цифр. валюту c акцентом на конфиденциальность. Активируйте, чтобы начать.</string>
     <string name="PaymentsHomeFragment__activate_payments">Активировать платежи</string>
     <string name="PaymentsHomeFragment__activating_payments">Активируем платежи…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Восстановить платёжную учётную запись</string>
@@ -3647,7 +3784,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Платежи недоступны в вашем регионе.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Не удалось включить платежи. Попробуйте ещё раз позже.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Деактивировать платежи?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Вы не сможете отправлять или получать MobileCoin в Signal, если деактивируете платежи.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Вы не сможете отправлять или получать MobileCoin в Molly, если деактивируете платежи.</string>
     <string name="PaymentsHomeFragment__deactivate">Деактивировать</string>
     <string name="PaymentsHomeFragment__continue">Продолжить</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Баланс в данный момент недоступен.</string>
@@ -3656,10 +3793,10 @@
     <string name="PaymentsHomeFragment__details">Подробнее</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Вы можете использовать Signal, чтобы отправлять и получать MobileCoin. Все платежи регламентируются Условиями использования MobileCoins и MobileCoin Wallet. Вы можете столкнуться с некоторыми проблемами, и платежи или средства, которые вы можете потерять, невозможно будет восстановить. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Вы можете использовать Molly, чтобы отправлять и получать MobileCoin. Все платежи регламентируются Условиями использования MobileCoins и MobileCoin Wallet. Вы можете столкнуться с некоторыми проблемами, и платежи или средства, которые вы можете потерять, невозможно будет восстановить. </string>
     <string name="PaymentsHomeFragment__activate">Активировать</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Просмотреть Условия MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Платежи в Signal больше не доступны. Вы можете перевести средства на биржу, но больше не можете отправлять или получать платежи или пополнять баланс.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Платежи в Molly больше не доступны. Вы можете перевести средства на биржу, но больше не можете отправлять или получать платежи или пополнять баланс.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3687,7 +3824,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Включите разрешения</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Чтобы вы могли отправлять сообщения тем, кого знаете, Signal будет запрашивать эти разрешения. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Чтобы вы могли отправлять сообщения тем, кого знаете, Molly будет запрашивать эти разрешения. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Уведомления</string>
     <!-- Notifications permission row description -->
@@ -3775,10 +3912,10 @@
     <string name="PaymentsTransferFragment__next">Далее</string>
     <string name="PaymentsTransferFragment__invalid_address">Неправильный адрес</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Проверьте адрес кошелька, на который вы пытаетесь перевести средства, и попробуйте ещё раз.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Вы не можете перевести на свой собственный адрес кошелька Signal. Введите адрес кошелька из своей учётной записи на поддерживаемой бирже.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Чтобы сканировать QR-код, Signal необходим доступ к камере.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal требуется разрешение на доступ к камере для сканирования QR-кода. Перейдите в настройки, выберите «Разрешения» и включите «Камера».ё</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Чтобы сканировать QR-код, Signal необходим доступ к камере.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Вы не можете перевести на свой собственный адрес кошелька Molly. Введите адрес кошелька из своей учётной записи на поддерживаемой бирже.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Чтобы сканировать QR-код, Molly необходим доступ к камере.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly требуется разрешение на доступ к камере для сканирования QR-кода. Перейдите в настройки, выберите «Разрешения» и включите «Камера».ё</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Чтобы сканировать QR-код, Molly необходим доступ к камере.</string>
     <string name="PaymentsTransferFragment__settings">Настройки</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -4144,17 +4281,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Входящий аудиозвонок Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Входящий аудиозвонок Molly</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Входящий видеозвонок Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Входящий видеозвонок Molly</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Входящий групповой звонок Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Входящий групповой звонок Molly</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Текущий аудиозвонок Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Текущий аудиозвонок Molly</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Текущий видеозвонок Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Текущий видеозвонок Molly</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Текущий групповой звонок Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Текущий групповой звонок Molly</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Загружаем…</string>
@@ -4201,9 +4338,9 @@
     <string name="BackupDialog_verify">Подтверждение</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Вы успешно ввели парольную фразу своей резервной копии</string>
     <string name="BackupDialog_passphrase_was_not_correct">Парольная фраза была неправильной</string>
-    <string name="LocalBackupJob_creating_signal_backup">Создаём резервную копию Signal…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Создаём резервную копию Molly…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Проверяем резервную копию Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Проверяем резервную копию Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">Резервное копирование не удалось</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Ваша папка для резервных копий была удалена или перемещена.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Ваш файл резервной копии слишком большой для хранения на этом носителе.</string>
@@ -4218,15 +4355,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Позвоните мне (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Отправить код ещё раз (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Связаться с поддержкой Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Регистрация в Signal - код подтверждения для Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Связаться с поддержкой Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Регистрация в Molly - код подтверждения для Android</string>
     <string name="RegistrationActivity_incorrect_code">Неверный код</string>
     <string name="BackupUtil_never">Никогда</string>
     <string name="BackupUtil_unknown">Неизвестно</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Номер телефона</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Выберите, кто может видеть ваш номер телефона и связываться с вами в Signal с его помощью.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Выберите, кто может видеть ваш номер телефона и связываться с вами в Molly с его помощью.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Кто может видеть мой номер</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4274,7 +4411,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Вы сделали слишком много попыток. Пожалуйста, попробуйте ещё раз позже.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Ошибка подключения к сервису</string>
     <string name="preferences_chats__backups">Резервные копии</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal заблокирован</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly заблокирован</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">РАЗБЛОКИРОВАТЬ</string>
     <string name="Recipient_unknown">Неизвестный</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4305,9 +4442,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">У вас должен быть доступ к своему старому устройству.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Восстановить из резервной копии</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Восстановите сообщения из локальной резервной копии. Если вы не сделаете этого сейчас, вы не сможете восстановить их позже.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Восстановить локальную резервную копию</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Восстановить резервную копию Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Восстановить все ваши текстовые сообщения + медиафайлы за последние 30 дней</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Больше опций</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Отменить</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Авторизоваться без переноса</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Продолжить без переноса ваших сообщений и медиафайлов</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Откройте Signal на своём старом Android-устройстве</string>
     <string name="NewDeviceTransferInstructions__continue">Продолжить</string>
@@ -4322,19 +4466,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Готовимся к подключению к вашему старому Android-устройству…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Ещё немного, скоро закончим</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Ожидаем подключение старого Android-устройства…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal требуется разрешение на доступ к местоположению, чтобы обнаружить ваше старое Android-устройство и подключиться к нему.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Службы геолокации должны быть включены, чтобы Signal смог обнаружить ваше старое Android-устройство и соединиться с ним.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Wi-Fi должен быть включён, чтобы Signal смог обнаружить ваше старое Android-устройство и соединиться с ним. При этом подключаться к какой-либо сети Wi-Fi не обязательно.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Извините, но похоже, что это устройство не поддерживает Wi-Fi Direct. Signal использует Wi-Fi Direct, чтобы обнаружить ваше старое Android-устройство и соединиться с ним. Однако вы можете восстановить свою учётную запись из резервной копии.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly требуется разрешение на доступ к местоположению, чтобы обнаружить ваше старое Android-устройство и подключиться к нему.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Службы геолокации должны быть включены, чтобы Molly смог обнаружить ваше старое Android-устройство и соединиться с ним.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Wi-Fi должен быть включён, чтобы Molly смог обнаружить ваше старое Android-устройство и соединиться с ним. При этом подключаться к какой-либо сети Wi-Fi не обязательно.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Извините, но похоже, что это устройство не поддерживает Wi-Fi Direct. Molly использует Wi-Fi Direct, чтобы обнаружить ваше старое Android-устройство и соединиться с ним. Однако вы можете восстановить свою учётную запись из резервной копии.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Восстановить из резервной копии</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">При попытке подключения к вашему старому Android-устройству произошла неожиданная ошибка.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Поиск нового Android-устройства…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal требуется разрешение на доступ к местоположению, чтобы обнаружить ваше новое Android-устройство и подключиться к нему.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Службы геолокации должны быть включены, чтобы Signal смог обнаружить ваше новое Android-устройство и соединиться с ним.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Wi-Fi должен быть включён, чтобы Signal смог обнаружить ваше новое Android-устройство и соединиться с ним. При этом подключаться к какой-либо сети Wi-Fi не обязательно.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Извините, похоже, что это устройство не поддерживает Wi-Fi Direct. Signal использует Wi-Fi Direct, чтобы обнаружить ваше старое Android-устройство и соединиться с ним. Вы всё равно можете создать резервную копию, чтобы восстановить свою учётную запись на своём новом Android-устройстве.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly требуется разрешение на доступ к местоположению, чтобы обнаружить ваше новое Android-устройство и подключиться к нему.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Службы геолокации должны быть включены, чтобы Molly смог обнаружить ваше новое Android-устройство и соединиться с ним.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Wi-Fi должен быть включён, чтобы Molly смог обнаружить ваше новое Android-устройство и соединиться с ним. При этом подключаться к какой-либо сети Wi-Fi не обязательно.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Извините, похоже, что это устройство не поддерживает Wi-Fi Direct. Molly использует Wi-Fi Direct, чтобы обнаружить ваше старое Android-устройство и соединиться с ним. Вы всё равно можете создать резервную копию, чтобы восстановить свою учётную запись на своём новом Android-устройстве.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Создать резервную копию</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">При попытке подключения к вашему новому Android-устройству произошла неожиданная ошибка.</string>
 
@@ -4375,7 +4519,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Перенос данных</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Держите оба устройства рядом друг с другом. Не выключайте устройства и оставьте Signal открытым. Переносы защищены сквозным шифрованием.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Держите оба устройства рядом друг с другом. Не выключайте устройства и оставьте Molly открытым. Переносы защищены сквозным шифрованием.</string>
     <string name="DeviceTransfer__d_messages_so_far">Уже %1$d сообщений…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">Уже %1$s%% сообщений…</string>
@@ -4389,7 +4533,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Перенос учётной записи</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Скачайте Signal на своём новом Android-устройстве</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Скачайте Molly на своём новом Android-устройстве</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Нажмите на «Перенести или восстановить учётную запись»"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4463,7 +4607,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Любой, у кого есть эта ссылка, может просмотреть имя и фото этой группы и отправить запрос на присоединение. Делитесь ей с людьми, которым вы доверяете.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Любой, у кого есть эта ссылка, может просмотреть имя и фото этой группы и присоединиться к ней. Делитесь ей с людьми, которым вы доверяете.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Поделиться через Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Поделиться через Molly</string>
     <string name="GroupLinkBottomSheet_copy">Копировать</string>
     <string name="GroupLinkBottomSheet_qr_code">QR-код</string>
     <string name="GroupLinkBottomSheet_share">Поделиться</string>
@@ -4663,7 +4807,7 @@
     <string name="payment_info_card_about_mobilecoin">О MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin — это новая цифровая валюта c акцентом на конфиденциальность.</string>
     <string name="payment_info_card_adding_funds">Пополнение</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Вы можете пополнить баланс средств, доступных для использования в Signal, отправив MobileCoin на адрес своего кошелька.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Вы можете пополнить баланс средств, доступных для использования в Molly, отправив MobileCoin на адрес своего кошелька.</string>
     <string name="payment_info_card_cashing_out">Вывод средств</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Вы можете вывести MobileCoin в любое время на любую биржу, которая поддерживает MobileCoin. Просто переведите средства на свою учётную запись на этой бирже.</string>
     <string name="payment_info_card_hide_this_card">Скрыть эту карточку?</string>
@@ -4684,12 +4828,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Деактивировать кошелёк</string>
     <string name="DeactivateWalletFragment__your_balance">Ваш баланс</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Рекомендуется перевести ваши средства на адрес другого кошелька перед тем, как деактивировать платежи. Если вы не переведёте средства сейчас, они останутся в вашем кошельке, привязанном к Signal, и вы сможете их использовать, если позже снова активируете платежи.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Рекомендуется перевести ваши средства на адрес другого кошелька перед тем, как деактивировать платежи. Если вы не переведёте средства сейчас, они останутся в вашем кошельке, привязанном к Molly, и вы сможете их использовать, если позже снова активируете платежи.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Перевести оставшиеся средства</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Деактивировать без перевода</string>
     <string name="DeactivateWalletFragment__deactivate">Деактивировать</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Деактивировать без перевода?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Ваши средства останутся в вашем кошельке, привязанном к Signal, и вы сможете их использовать, если позже снова активируете платежи.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Ваши средства останутся в вашем кошельке, привязанном к Molly, и вы сможете их использовать, если позже снова активируете платежи.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Ошибка деактивации кошелька.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4988,7 +5132,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Лицензии</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Условия и Политика конфиденциальности</string>
-    <string name="HelpFragment__copyright_signal_messenger">Авторские права Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Авторские права Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Лицензировано под GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -5235,9 +5379,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Выберите цвет</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Поделиться</string>
 
@@ -5279,7 +5420,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Только администраторы могут отправлять сообщения в этой группе.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Достигнут предел</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Вы не можете выбрать больше 5 чатов</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5460,9 +5602,9 @@
     <string name="MySupportPreference__learn_more">Узнать больше</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Обновить Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Обновить Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Эта версия Signal устарела. Обновитесь сейчас, чтобы и дальше использовать Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Эта версия Molly устарела. Обновитесь сейчас, чтобы и дальше использовать Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Обновить</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5471,7 +5613,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Устройство не зарегистрировано</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Это устройство больше не зарегистрировано. Зарегистрируйтесь повторно, чтобы и дальше использовать Signal на этом устройстве.</string>
+    <string name="ReregisterSignalDialog__message">Это устройство больше не зарегистрировано. Зарегистрируйтесь повторно, чтобы и дальше использовать Molly на этом устройстве.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Повторно зарегистрироваться</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5765,7 +5907,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Не удалось открыть приложение для выбора мелодии.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Чтобы включить уведомления, Signal должен получить разрешение на их отображение.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Чтобы включить уведомления, Molly должен получить разрешение на их отображение.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Включить</string>
 
@@ -5920,8 +6062,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Ещё нет ответов</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Вы не можете отвечать на эту историю, потому что уже не являетесь участником группы.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Отреагировал(-а) на историю</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Отреагировали на историю</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Отреагировал(-а) на историю</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Просмотры</string>
     <!-- Label for story replies tab -->
@@ -6572,8 +6716,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Выберите свой банк</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Подтвердить пожертвование через %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Для настройки регулярного пожертвования нажмите «Продолжить», чтобы подтвердить списание средств в размере 0,01 евро в вашем банке. Эта сумма будет автоматически возвращена, и это позволит списывать с вашего счёта пожертвование в размере 5 евро в месяц.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Для настройки регулярного пожертвования нажмите «Продолжить», чтобы подтвердить списание средств в размере 0,01 евро в вашем банке. Эта сумма будет автоматически возвращена, и это позволит списывать с вашего счёта пожертвование в размере %1$s в месяц.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Продолжить</string>
 
@@ -7163,6 +7307,56 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Скачиваем резервную копию…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Резервное копирование медиафайлов отключено</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Ваш план резервного копирования медиафайлов Signal был отменён, так как мы не смогли обработать ваш платёж. У вас есть %1$d день, чтобы загрузить все медиафайлы, хранящиеся в резервной копии. По истечении %1$d дня медиафайлы из резервной копии будут удалены.</item>
+        <item quantity="few">Ваш план резервного копирования медиафайлов Signal был отменён, так как мы не смогли обработать ваш платёж. У вас есть %1$d дня, чтобы загрузить все медиафайлы, хранящиеся в резервной копии. По истечении %1$d дней медиафайлы из резервной копии будут удалены.</item>
+        <item quantity="many">Ваш план резервного копирования медиафайлов Signal был отменён, так как мы не смогли обработать ваш платёж. У вас есть %1$d дней, чтобы загрузить все медиафайлы, хранящиеся в резервной копии. По истечении %1$d дней медиафайлы из резервной копии будут удалены.</item>
+        <item quantity="other">Ваш план резервного копирования медиафайлов Signal был отменён, так как мы не смогли обработать ваш платёж. У вас есть %1$d дня, чтобы загрузить все медиафайлы, хранящиеся в резервной копии. По истечении %1$d дня медиафайлы из резервной копии будут удалены.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Вы можете снова начать оплату за резервное копирование в любое время, чтобы продолжить создавать резервные копии всех своих медиафайлов. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Ваши медиафайлы будут удалены сегодня</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Ваш план резервного копирования медиафайлов Signal был отменён, так как мы не смогли обработать ваш платёж. Это ваш последний шанс загрузить медиафайлы из резервной копии, прежде чем они будут удалены.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Не удаётся завершить загрузку</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">На вашем устройстве недостаточно места на диске. Освободите до %1$s места для загрузки медиафайлов, хранящихся в резервной копии.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Если вы выберете «Пропустить», медиафайлы из резервной копии будут удалены через %1$d день.</item>
+        <item quantity="few">Если вы выберете «Пропустить», медиафайлы из резервной копии будут удалены через %1$d дня.</item>
+        <item quantity="many">Если вы выберете «Пропустить», медиафайлы из резервной копии будут удалены через %1$d дней.</item>
+        <item quantity="other">Если вы выберете «Пропустить», медиафайлы из резервной копии будут удалены через %1$d дня.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Не удалось обработать платеж за резервное копирование</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Нам не удалось получить ваш регулярный ежемесячный платёж за резервное копирование Signal. Убедитесь, что ваш способ оплаты актуален. Если это не так, обновите его в Google Pay. Signal попробует обработать платёж ещё раз через несколько дней.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Не удалось выполнить резервное копирование</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Ваше устройство не выполняло резервное копирование в течение %1$d дн. Убедитесь, что оно подключено к Wi-Fi, и нажмите «Создать резервную копию сейчас». </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Узнать больше</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Пропустить</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Загрузить медиафайлы сейчас</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Загрузить позже</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Не загружать медиафайлы</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Освободите %1$s места для загрузки медиафайлов.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Кредитная или дебетовая карта</string>
@@ -7176,16 +7370,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Неизвестно</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">История платежей</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Последняя резервная копия была создана %1$s в %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">Макс. число сообщений в чате</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">Лимит длины чата</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">Удалить историю сообщений</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Сообщения, написанные до выбранного периода времени, будут удалены без возможности восстановления.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Сообщения, превышающие выбранные ограничения, будут удалены без возможности восстановления.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Применить ограничения к связанным устройствам</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Если эта функция включена, в соответствии с ограничениями чата также будут удаляться сообщения на связанных устройствах.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Удаление теперь происходит синхронно на всех ваших устройствах</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">При удалении сообщений или чатов они будут удаляться с вашего телефона и со связанных устройств.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">ОК</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">История платежей</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Резервное копирование сообщений и всех медиафайлов</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Подробности платежа</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Тип резервного копирования</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Дата оплаты</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Поделиться</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Резервное копирование Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">История платежей</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Сведения о резервном копировании</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Размер резервной копии</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Частота резервного копирования</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Резервное копирование с помощью сотовых данных</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Отключить и удалить резервную копию</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Резервное копирование удалено и отключено.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Изменен тип резервного копирования и отменена подписка</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Подписка отменена</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Скачивание завершено</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Тип резервного копирования</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Резервное копирование отключено</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/месяц</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Включить резервные копии</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Последняя резервная копия</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s в %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Никогда</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Создать резервную копию</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Отключить и удалить резервные копии?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Средства не будут списаны ещё раз. Резервная копия будет удалена, а новые резервные копии создаваться не будут.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Отключить и удалить</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Удаление резервной копии…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Резервная копия удалена</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"При нажатии «Создать резервную копию»"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Ежедневно</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Еженедельно</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Ежемесячно</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Резервное копирование вручную</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Пожалуйста, введите Пин-код, пароль или графический ключ вашего устройства.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Далее</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Изменить тип резервного копирования</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Отменить подписку</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Подтвердить отмену</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Средства не будут списаны ещё раз. Резервное копирование будет отключено по завершении платёжного цикла. После этой даты у вас будет 30 дней, чтобы загрузить медиафайлы, резервные копии которых вы в настоящее время создаёте.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Подтвердить и загрузить сейчас</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Подтвердить и загрузить позже</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Оставить подписку</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 3092e8fa19..4b93d94698 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal sa aktualizuje…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly sa aktualizuje…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Ešte ste si nenastavili heslo!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Vypnúť heslo?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Toto natrvalo odomkne Signal a upozornenia na správy.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Toto natrvalo odomkne Molly a upozornenia na správy.</string>
     <string name="ApplicationPreferencesActivity_disable">Vypnúť</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Chyba pripojenia na server!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN kódy sú vyžadované pre funkciu registračného zámku. Ak chcete vypnúť PIN kódy, najprv, prosím, vypnite funkciu registračného zámku.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Súbor</string>
     <string name="AttachmentKeyboard_contact">Kontakt</string>
     <string name="AttachmentKeyboard_location">Poloha</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Na zobrazenie vašich fotiek a videí potrebuje Signal povolenie</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Na zobrazenie vašich fotiek a videí potrebuje Molly povolenie</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Povoliť prístup</string>
     <string name="AttachmentKeyboard_payment">Platba</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Nenašla sa aplikácia pre výber médií.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal potrebuje prístup k úložisku aby k správam mohol pridať obrázkové, video a zvukové prílohy, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Úložisko\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal potrebuje prístup ku kontaktom aby k správam mohol pripojiť informácie o kontakte, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Kontakty\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal potrebuje prístup k polohe aby k správam mohol pripojiť informácie o polohe, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Poloha\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly potrebuje prístup k úložisku aby k správam mohol pridať obrázkové, video a zvukové prílohy, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Úložisko\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly potrebuje prístup ku kontaktom aby k správam mohol pripojiť informácie o kontakte, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Kontakty\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly potrebuje prístup k polohe aby k správam mohol pripojiť informácie o polohe, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Poloha\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Povoľte prístup k vašej polohe</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Ak chcete odoslať svoju polohu:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Povoľte Signalu prístup na odoslanie vašej polohy.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Povoľte Mollyu prístup na odoslanie vašej polohy.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal potrebuje prístup, aby mohol odoslať vašu aktuálnu polohu.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly potrebuje prístup, aby mohol odoslať vašu aktuálnu polohu.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Povoliť prístup k úložisku</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Ak chcete zobraziť fotky a videá:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Na zobrazenie vašich fotiek a videí potrebuje Signal prístup k úložisku.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Na zobrazenie vašich fotiek a videí potrebuje Molly prístup k úložisku.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">Používateľ %1$s neaktivoval platby </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Zmeniť fotoaparát</string>
     <string name="CameraXFragment_open_gallery_description">Otvoriť galériu</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Povoliť prístup</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Povoľte prístup k fotoaparátu a mikrofónu</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Povoľte prístup k fotoaparátu</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Povoľte prístup k mikrofónu</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Ak chcete vytvárať fotografie, povoľte Signalu prístup k fotoaparátu.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Pre fotenie a nahrávanie videa potrebuje Signal prístup k fotoaparátu.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Ak chcete vytvárať fotografie a nahrávať videá, povoľte Signalu prístup k fotoaparátu a mikrofónu.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Ak chcete nahrávať videá so zvukom, povoľte Signalu prístup k mikrofónu.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Ak chcete naskenovať QR kód, povoľte Signalu prístup k fotoaparátu.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal potrebuje na snímanie fotografií prístup k fotoaparátu</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal potrebuje na skenovanie QR kódov prístup k fotoaparátu</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signál potrebuje na nahratie videa prístup k mikrofónu</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Ak chcete vytvárať fotografie v aplikácii Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Ak chcete vytvárať fotografie a nahrávať videá v aplikácii Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Ak chcete nahrávať videá so zvukom:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Ak chcete skenovať QR kódy:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Nedávne kontakty</string>
@@ -273,7 +274,7 @@
     <string name="CameraContacts_no_signal_contacts">Žiadne kontakty Signal</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Na odoslanie fotiek kontaktom Signal môžete použiť tlačidlo fotoaparátu. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Nenašli ste hľadaný kontakt?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Pozvite kontakt, aby použival Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Pozvite kontakt, aby použival Molly</string>
     <string name="CameraContacts__menu_search">Hľadať</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -287,12 +288,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Nie, ďakujem</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Aktualizovať Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Aktualizovať Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Táto verzia aplikácie už nie je podporovaná. Aby ste mohli ďalej posielať a prijímať správy, aktualizujte na najnovšiu verziu.</string>
     <string name="ClientDeprecatedActivity_update">Aktualizovať</string>
     <string name="ClientDeprecatedActivity_dont_update">Neaktualizovať</string>
     <string name="ClientDeprecatedActivity_warning">Varovanie</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Vaša verzia Signalu je zastaraná. Môžete si pozrieť históriu svojich správ, ale nebudete môcť správy ďalej odosielať a prijímať, až kým si aplikáciu neaktualizujete na novšiu verziu.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Vaša verzia Mollyu je zastaraná. Môžete si pozrieť históriu svojich správ, ale nebudete môcť správy ďalej odosielať a prijímať, až kým si aplikáciu neaktualizujete na novšiu verziu.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Nenašiel sa žiadny webový prehliadač.</string>
@@ -329,8 +330,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Správa %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly hlasový hovor %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly videohovor %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -428,7 +429,7 @@
     <string name="ConversationActivity_transport_signal">Signal správa</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Poslať správu</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Prejdime na Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Prejdime na Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Prosím vyberte kontakt</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Príloha presahuje limit veľkosti pre tento typ správy.</string>
     <string name="ConversationActivity_unable_to_record_audio">Nemôžem zaznamenať zvuk!</string>
@@ -447,18 +448,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Ak chcete odoslať hlasové správy:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Ak chcete odoslať hlasové správy, povoľte Signalu prístup k mikrofónu.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Ak chcete odoslať hlasové správy, povoľte Mollyu prístup k mikrofónu.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal potrebuje na nahratie hlasovej správy prístup k mikrofónu.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal potrebuje prístup k mikrofónu aby mohol posielať zvukové správy, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Mikrofón\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly potrebuje na nahratie hlasovej správy prístup k mikrofónu.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly potrebuje prístup k mikrofónu aby mohol posielať zvukové správy, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Mikrofón\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal potrebuje prístup k mikrofónu a fotoaparátu aby mohol zavolať %1$s, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Mikrofón\" a \"Fotoaparát\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Pre fotenie a nahrávanie videa potrebuje Signal prístup k fotoaparátu.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal potrebuje prístup k fotoaparátu aby mohol vytvárať fotografie a video, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Fotoaparát\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal potrebuje prístup k Fotoaparátu, aby mohol vytvárať fotografie a videá</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly potrebuje prístup k mikrofónu a fotoaparátu aby mohol zavolať %1$s, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Mikrofón\" a \"Fotoaparát\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Pre fotenie a nahrávanie videa potrebuje Molly prístup k fotoaparátu.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly potrebuje prístup k fotoaparátu aby mohol vytvárať fotografie a video, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Fotoaparát\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly potrebuje prístup k Fotoaparátu, aby mohol vytvárať fotografie a videá</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Pre snímanie videí so zvukom povoľte prístup k mikrofónu.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal potrebuje pre nahrávanie videí prístup k mikrofónu, no ten bol zamietnutý. Pokračujte, prosím, do nastavení aplikácie, vyberte „Povolenia“ a povoľte „Mikrofón“ a „Fotoaparát“.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal potrebuje pre nahrávanie videí prístup k mikrofónu.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly potrebuje pre nahrávanie videí prístup k mikrofónu, no ten bol zamietnutý. Pokračujte, prosím, do nastavení aplikácie, vyberte „Povolenia“ a povoľte „Mikrofón“ a „Fotoaparát“.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly potrebuje pre nahrávanie videí prístup k mikrofónu.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Nie</string>
@@ -479,9 +480,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Ak chcete začať hovor:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Ak chcete začať hovor, povoľte Signalu prístup k mikrofónu.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Ak chcete začať hovor, povoľte Mollyu prístup k mikrofónu.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal potrebuje na začatie hovoru prístup k mikrofónu.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly potrebuje na začatie hovoru prístup k mikrofónu.</string>
 
 
     <string name="ConversationActivity_join">Pridať sa</string>
@@ -495,9 +496,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Signal už nepodporuje odosielanie SMS správ. Ak chcete konverzáciu zachovať tu, pozvite používateľa %1$s, aby sa pripojil k Signalu.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Táto osoba už nepoužíva Signal. Ak chcete pokračovať v konverzácii, pozvite používateľa, aby sa pripojil k Signalu.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Táto osoba už nepoužíva Molly. Ak chcete pokračovať v konverzácii, pozvite používateľa, aby sa pripojil k Mollyu.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Pozvať do Signalu</string>
+    <string name="ConversationActivity__invite_to_signal">Pozvať do Mollyu</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Čoskoro vám to opäť pripomenieme.</string>
 
@@ -563,6 +564,8 @@
     <string name="ConversationFragment_delete_for_everyone">Vymazať pre všetkých</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Vymazať na tomto zariadení</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Vymazať</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Vymazať na všetkých zariadeniach</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Táto správa sa vymaže pre každého v čete, kto používa aktuálnu verziu aplikácie Signal. Členovia budú vidieť, že ste vymazali správu.</string>
@@ -594,13 +597,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Blokované</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Aktualizovať Signal</string>
+    <string name="ConversationFragment__update_build">Aktualizovať Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Znova zaregistrujte Signal</string>
+    <string name="ConversationFragment__reregister_signal">Znova zaregistrujte Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Prejsť späť.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Otvoriť Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Otvoriť Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Kontakty už nie sú overené</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -669,6 +672,13 @@
         <item quantity="many">Týmto natrvalo vymažete %1$d vybraného četu.</item>
         <item quantity="other">Týmto natrvalo vymažete %1$d vybraných četov.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Týmto natrvalo vymažete vybraný čet zo všetkých vašich zariadení.</item>
+        <item quantity="few">Týmto natrvalo vymažete %1$d vybrané čety zo všetkých vašich zariadení.</item>
+        <item quantity="many">Týmto natrvalo vymažete %1$d vybraného četu zo všetkých vašich zariadení.</item>
+        <item quantity="other">Týmto natrvalo vymažete %1$d vybraných četov zo všetkých vašich zariadení.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Mazanie</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Odstraňuje sa vybraný čet…</item>
@@ -770,9 +780,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Kto ma môže vyhľadať pomocou telefónneho čísla?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Každý, kto má vaše telefónne číslo, vás v aplikácii Signal uvidí a môže s vami začať četovať.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Každý, kto má vaše telefónne číslo, vás v aplikácii Molly uvidí a môže s vami začať četovať.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Nikto vás v aplikácii Signal neuvidí, pokiaľ mu nenapíšete správu alebo s ním nebudete četovať.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Nikto vás v aplikácii Molly neuvidí, pokiaľ mu nenapíšete správu alebo s ním nebudete četovať.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Obnoviť zo zálohy?</string>
@@ -806,7 +816,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Otestujte svoje heslo pre zálohy a overte, či sa zhoduje</string>
     <string name="BackupsPreferenceFragment__turn_on">Zapnúť</string>
     <string name="BackupsPreferenceFragment__turn_off">Vypnúť</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Pre obnovenie zálohy nainštalujte novú kópiu Signalu. Otvorte aplikáciu a ťuknite na \"Obnoviť zálohu\", potom nájdite cestu k súboru so zálohou. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Pre obnovenie zálohy nainštalujte novú kópiu Mollyu. Otvorte aplikáciu a ťuknite na \"Obnoviť zálohu\", potom nájdite cestu k súboru so zálohou. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Dozvedieť sa viac</string>
     <string name="BackupsPreferenceFragment__in_progress">Prebieha…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -814,7 +824,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">Zatiaľ %1$d…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">Zatiaľ %1$s%% …</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal potrebuje prístup k úložisku aby mohol vytvárať zálohy, ale prístup bol natrvalo zakázaný. Prosím, v nastaveniach aplikácií zvoľte \"Oprávnenia\" a povoľte \"Úložisko\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly potrebuje prístup k úložisku aby mohol vytvárať zálohy, ale prístup bol natrvalo zakázaný. Prosím, v nastaveniach aplikácií zvoľte \"Oprávnenia\" a povoľte \"Úložisko\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Nastavte čas zálohovania</string>
 
@@ -881,7 +891,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Relácia četu bola obnovená</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal používa end-to-end šifrovanie a občas môže potrebovať obnoviť reláciu vášho četu. Nemá to vplyv na bezpečnosť vášho četu, ale mohla by vám uniknúť správa od tohto kontaktu a môžete používateľa požiadať, aby vám ju poslal znovu.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly používa end-to-end šifrovanie a občas môže potrebovať obnoviť reláciu vášho četu. Nemá to vplyv na bezpečnosť vášho četu, ale mohla by vám uniknúť správa od tohto kontaktu a môžete používateľa požiadať, aby vám ju poslal znovu.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Používajte Signal na počítači alebo iPade. Vaše správy sa synchronizujú s vašimi prepojenými zariadeniami.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Prepojiť nové zariadenie</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Správy a informácie o četoch sú na všetkých zariadeniach chránené end-to-end šifrovaním</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal na počítači alebo iPade</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Všetky správy na prepojených zariadeniach sú súkromné</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Molly správy sú synchronizované s aplikáciou Molly vo vašom mobilnom telefóne po jeho prepojení. Predchádzajúca história vašich správ sa nezobrazí.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Na druhom zariadení navštívte stránku %1$s a nainštalujte si Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Moje prepojené zariadenia</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Odpojiť</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">Zariadenie %1$s bolo odpojené</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Prepája sa zariadenie…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Zariadenie schválené</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Načítava sa…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Žiadne prepojené zariadenia</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Odomknite na prepojenie zariadenia</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Naskenujte QR kód zobrazený na zariadení pre pripojenie.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Oskenujte QR kód</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Pomocou tohto zariadenia naskenujte QR kód zobrazený na zariadení, ktoré chcete prepojiť</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">OK</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Toto zariadenie bude vidieť vaše skupiny a kontakty, bude mať prístup k vašim četom a bude môcť odosielať správy vo vašom mene.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Dokončite prepojenie na druhom zariadení</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Dokončite prepojenie Mollyu na vašom druhom zariadení.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Prepojenie zariadenia zlyhalo</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Tento QR kód je neplatný. Prosím, uistite sa, že skenujete QR kód zobrazený na zariadení, ktoré chcete prepojiť.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Skúsiť znovu</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Odpojiť \"%1$s\"?</string>
@@ -903,10 +968,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimalizovať pre chýbajúce služby Google Play</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Toto zariadenie nepodporuje služby Google Play. Ťuknite pre vypnutie systémovej optimalizácie batérie, ktorá zabraňuje Signalu prijímať správy v neaktívnom stave.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Toto zariadenie nepodporuje služby Google Play. Ťuknite pre vypnutie systémovej optimalizácie batérie, ktorá zabraňuje Mollyu prijímať správy v neaktívnom stave.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Táto verzia Signalu vypršala. Pre odosielanie a príjem ďalších správ ju aktualizujte.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Táto verzia Mollyu vypršala. Pre odosielanie a príjem ďalších správ ju aktualizujte.</string>
     <string name="ExpiredBuildReminder_update_now">Aktualizovať teraz</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -919,8 +984,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Zobraziť</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Trvalá chyba komunikácie Signal!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal sa nebol schopný registrovať k službám Google Play. Signal správy a hovory boli vypnuté, prosím zaregistrujte sa opätovne cez Nastavenia &gt; Rozšírené.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Trvalá chyba komunikácie Molly!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly sa nebol schopný registrovať k službám Google Play. Molly správy a hovory boli vypnuté, prosím zaregistrujte sa opätovne cez Nastavenia &gt; Rozšírené.</string>
 
 
     <!-- GiphyActivity -->
@@ -1085,20 +1150,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Denníky ladenia nám pomáhajú určiť a odstrániť problém a neobsahujú identifikačné údaje.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal narazil na problém. Odoslať denník ladenia?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly narazil na problém. Odoslať denník ladenia?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Upozornenia môžu byť oneskorené z dôvodu optimalizácie batérie</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Ak nechcete dostávať oneskorené upozornenia na správy, môžete vypnúť optimalizáciu batérie pre Signal.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Ak nechcete dostávať oneskorené upozornenia na správy, môžete vypnúť optimalizáciu batérie pre Molly.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Upozornenia môžu byť oneskorené z dôvodu optimalizácie batérie</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Ak nechcete dostávať oneskorené upozornenia na správy, vypnite optimalizáciu batérie pre Molly. Ťuknutím na Pokračovať zobrazíte pokyny pre konkrétne zariadenie.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Nie, ďakujem</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Pokračovať</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Pokračovať</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Zrušiť</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Nie, ďakujem</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Nevybavené pozvánky do skupín</string>
+    <string name="PendingMembersActivity_pending_group_invites">Žiadosti a pozvánky</string>
     <string name="PendingMembersActivity_requests">Žiadosti</string>
     <string name="PendingMembersActivity_invites">Pozvánky</string>
     <string name="PendingMembersActivity_people_you_invited">Ľudia, ktorých ste pozvali vy</string>
@@ -1361,7 +1436,7 @@
     <string name="InviteActivity_cancel">Zrušiť</string>
     <string name="InviteActivity_sending">Odosiela sa…</string>
     <string name="InviteActivity_invitations_sent">Pozvánky odoslané!</string>
-    <string name="InviteActivity_invite_to_signal">Pozvať do Signalu</string>
+    <string name="InviteActivity_invite_to_signal">Pozvať do Mollyu</string>
     <string name="InviteActivity_send_sms">Odoslať SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Odoslať %1$d SMS pozvánku?</item>
@@ -1369,7 +1444,7 @@
         <item quantity="many">Odoslať %1$d SMS pozvánok?</item>
         <item quantity="other">Odoslať %1$d SMS pozvánok?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Prejdime na Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Prejdime na Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Vyzerá to, že nemáte žiadne aplikácie kam by ste mohli zdieľať.</string>
 
     <!-- LearnMoreTextView -->
@@ -1383,7 +1458,7 @@
     <string name="LongMessageActivity_your_message">Vaša správa</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Pripojenie na pozadí zapnuté</string>
 
     <!-- MediaOverviewActivity -->
@@ -1462,10 +1537,10 @@
     <string name="MessageQuotesBottomSheet_replies">Odpovede</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Príprava na Signal hovor</string>
+    <string name="NotificationBarManager__establishing_signal_call">Príprava na Molly hovor</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Spúšťa sa služba Signal hovor</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Zastavenie služby Signal hovoru</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Spúšťa sa služba Molly hovor</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Zastavenie služby Molly hovoru</string>
     <string name="NotificationBarManager__cancel_call">Zrušiť hovor</string>
 
     <!-- NotificationsMegaphone -->
@@ -1733,6 +1808,14 @@
     <string name="MessageRecord_you_activated_payments">Aktivovali ste platby</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s odteraz môže prijímať platby</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Údaje o platbe nie sú k dispozícii</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Ťuknutím zobrazíte viac</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Údaje o platbe nie sú k dispozícii</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Podrobnosti o tejto platbe nie sú k dispozícii, pretože vaše správy boli obnovené zo zdroja, ktorý neobsahoval túto históriu platieb. Nemá to vplyv na zostatok vo vašej peňaženke ani na stav minulých platieb.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1793,9 +1876,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Čoskoro už nebudete môcť odosielať SMS správy prostredníctvom Signalu. Ak chcete konverzáciu zachovať tu, pozvite používateľa %1$s, aby sa pripojil k Signalu.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Už nemôžete odosielať SMS správy prostredníctvom Signalu. Ak chcete konverzáciu zachovať tu, pozvite používateľa %1$s, aby sa pripojil k Signalu.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Už nemôžete odosielať SMS správy prostredníctvom Mollyu. Ak chcete konverzáciu zachovať tu, pozvite používateľa %1$s, aby sa pripojil k Mollyu.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Platba: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Platba</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Nahlásené ako spam</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1881,7 +1966,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Pridať zariadenie so Signalom?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Vyzerá to, že sa snažíte pripojiť zariadenie Signal cez skener tretej strany. Pre vašu bezpečnosť, prosím naskenujte kód znovu priamo zo Signalu.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal potrebuje prístup k fotoaparátu aby mohol naskenovať QR kód, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Fotoaparát\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly potrebuje prístup k fotoaparátu aby mohol naskenovať QR kód, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Fotoaparát\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Nedá sa naskenovať QR kód bez povolenia prístupu k fotoaparátu</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1896,11 +1981,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Zadajte heslo</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal ikona</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly ikona</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Odoslať heslo</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Nesprávne heslo!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Odomknúť Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Zámok obrazovky</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Odomknúť Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Zámok obrazovky</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Mapa</string>
@@ -1969,7 +2054,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Pre pokračovanie v zasielaní správ overte</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Ak chcete zabrániť spamu v Signal, dokončite overenie.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Ak chcete zabrániť spamu v Molly, dokončite overenie.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Po overení, môžete pokračovať v zasielaní správ. Pozastavené správy sa automaticky odošlú.</string>
 
     <!-- Recipient -->
@@ -1977,7 +2062,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Môj príbeh</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal hovor</string>
+    <string name="Recipient_signal_call">Molly hovor</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Blokovať</string>
@@ -1991,7 +2076,8 @@
     <string name="RedPhone_ringing">Vyzváňanie…</string>
     <string name="RedPhone_busy">Obsadené</string>
     <string name="RedPhone_recipient_unavailable">Kontakt nie je dostupný</string>
-    <string name="RedPhone_network_failed">Chyba siete!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Chyba siete! Skontrolujte pripojenie k sieti a skúste to znova.</string>
     <string name="RedPhone_number_not_registered">Neregistrované číslo!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Číslo ktoré ste vytočili nepodporuje zabezpečené hovory!</string>
     <string name="RedPhone_got_it">Rozumiem</string>
@@ -2002,8 +2088,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Ťuknite sem pre spustenie videa</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Pre volanie %1$s potrebuje Signal prístup k vašej kamere</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Pre volanie %1$s potrebuje Molly prístup k vašej kamere</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Uskutočňovanie hovoru…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Pripájanie…</string>
@@ -2069,10 +2155,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Odstránenie z hovoru</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Niekto vás odstránil z hovoru.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Povoľte prístup k fotoaparátu a mikrofónu</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Povoľte prístup k mikrofónu</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Povoľte prístup k fotoaparátu</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Ak chcete začať hovor alebo sa k nemu pripojiť, povoľte Mollyu prístup k vášmu fotoaparátu a mikrofónu.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Ak chcete začať hovor alebo sa k nemu pripojiť, povoľte Mollyu prístup k vášmu mikrofónu.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Pre zapnutie videa povoľte Mollyu prístup k fotoaparátu.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly potrebuje na začatie hovoru alebo na pripojenie sa k nemu prístup k mikrofónu.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly potrebuje na zapnutie vášho videa prístup k fotoaparátu</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Ak chcete začať hovor alebo sa k nemu pripojiť:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Ak chcete zapnúť video:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal hovor</string>
-    <string name="WebRtcCallView__signal_video_call">Videohovor Signal</string>
+    <string name="WebRtcCallView__signal_call">Molly hovor</string>
+    <string name="WebRtcCallView__signal_video_call">Videohovor Molly</string>
     <string name="WebRtcCallView__start_call">Začať hovor</string>
     <string name="WebRtcCallView__join_call">Pripojiť sa k hovoru</string>
     <string name="WebRtcCallView__call_is_full">Hovor je plne obsadený</string>
@@ -2172,24 +2278,47 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Znížiť ruku?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Znížiť ruku</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Znížiť</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Zrušiť</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Zdvihli ste ruku</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Zobraziť</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">Používateľ %1$s zdvihol ruku</item>
-        <item quantity="few">%1$s + %2$d zdvihli ruku</item>
-        <item quantity="many">%1$s + %2$d zdvihlo ruku</item>
-        <item quantity="other">%1$s + %2$d zdvihlo ruku</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s ste zdvihli ruku</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s a %2$d ste zdvihli ruku</item>
+        <item quantity="few">%1$s a %2$d ste zdvihli ruku</item>
+        <item quantity="many">%1$s a %2$d zdvihlo ruku</item>
+        <item quantity="other">%1$s a %2$d zdvihlo ruku</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">Používateľ %1$s zdvihol ruku</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s a %2$d zdvihli ruku</item>
+        <item quantity="few">%1$s a %2$d zdvihli ruku</item>
+        <item quantity="many">%1$s a %2$d zdvihlo ruku</item>
+        <item quantity="other">%1$s a %2$d zdvihlo ruku</item>
+    </plurals>
+
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="few">%1$s +%2$d</item>
+        <item quantity="many">%1$s +%2$d</item>
+        <item quantity="other">%1$s +%2$d</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="few">%1$s +%2$d</item>
         <item quantity="many">%1$s +%2$d</item>
@@ -2292,7 +2421,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Obdržíte hovor na overenie tohto čísla.</string>
     <string name="RegistrationActivity_edit_number">Úprav číslo</string>
     <string name="RegistrationActivity_missing_google_play_services">Chýba služba Google Play</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">V tomto zariadení chýba služba Google Play. Signal môžete používať aj tak, ale táto konfigurácia môže mať za následok nespoľahlivosť a nižší výkon.\n\nAk nie ste pokročilý užívateľ, nepoužívate neoficiálny ROM telefónu alebo si myslíte, že sa vám toto hlásenie nemalo zobrazovať, kontaktujte nás na support@signal.org pre vyriešenie problému.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">V tomto zariadení chýba služba Google Play. Molly môžete používať aj tak, ale táto konfigurácia môže mať za následok nespoľahlivosť a nižší výkon.\n\nAk nie ste pokročilý užívateľ, nepoužívate neoficiálny ROM telefónu alebo si myslíte, že sa vám toto hlásenie nemalo zobrazovať, kontaktujte nás na support@molly.im pre vyriešenie problému.</string>
     <string name="RegistrationActivity_i_understand">Rozumiem</string>
     <string name="RegistrationActivity_play_services_error">Chyba služby Google Play</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Služba Google Play sa aktualizuje, alebo je dočasne nedostupná. Prosím, skúste to znova.</string>
@@ -2310,7 +2439,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Neštandardný formát čísla</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Zdá sa, že zadané číslo (%1$s) má neštandardný formát.\n\n Mali ste na mysli %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Formát telefónneho čísla</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Formát telefónneho čísla</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Hovor požadovaný</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2346,8 +2475,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Máte problém s registráciou?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Uistite sa, že váš telefón má stabilný signál a môže prijímať SMS alebo hovory\n • Potvrďte, že môžete prijať hovor na číslo\n • Skontrolujte, či ste správne zadali svoje telefónne číslo.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Ak chcete získať ďalšie informácie, postupujte podľa týchto krokov na riešenie problémov alebo kontaktujte podporu</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Pre ďalšie informácie nasledujte %1$s alebo %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">týchto krokov na riešenie problémov</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2385,13 +2514,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Pridať medzi kontakty</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Pozvať do Signalu</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Pozvať do Mollyu</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal správa</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal hovor</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Pridať medzi kontakty</string>
-    <string name="SharedContactView_invite_to_signal">Pozvať do Signalu</string>
+    <string name="SharedContactView_invite_to_signal">Pozvať do Mollyu</string>
     <string name="SharedContactView_message">Signal správa</string>
 
     <!-- SignalBottomActionBar -->
@@ -2522,11 +2651,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s patrí používateľovi %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Aktualizácia Signalu</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">K dispozícii je nová verzia Signalu. Ťuknutím aktualizujte.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal sa nepodarilo aktualizovať</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Aktualizácia Mollyu</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">K dispozícii je nová verzia Mollyu. Ťuknutím aktualizujte.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly sa nepodarilo aktualizovať</string>
     <string name="ApkUpdateNotifications_failed_general_body">Skúsime to znova neskôr.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal bol úspešne aktualizovaný</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly bol úspešne aktualizovaný</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Aplikácia bola automaticky aktualizovaná na verziu %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2599,7 +2728,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Naše Signal bezpečnostné číslo:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Vyzerá to, že nemáte žiadne aplikácie kam by sa dalo zdieľať.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">V schránke sa nenašlo žiadne bezpečnostné číslo pre porovnanie</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal potrebuje prístup k fotoaparátu aby mohol naskenovať QR kód, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Fotoaparát\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly potrebuje prístup k fotoaparátu aby mohol naskenovať QR kód, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Fotoaparát\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Nedá sa naskenovať QR kód bez povolenia prístupu k fotoaparátu</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Než uvidíte bezpečnostné číslo používateľa %1$s, musíte si najprv poslať správu.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2629,14 +2758,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Dotykom otvor.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal je odomknutý</string>
-    <string name="KeyCachingService_lock">Zamknúť Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly je odomknutý</string>
+    <string name="KeyCachingService_lock">Zamknúť Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Vy</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Nepodporovaný typ súboru</string>
     <string name="MediaPreviewActivity_draft">Koncept</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal potrebuje prístup k úložisku aby mohol ukladať dáta na externé úložisko, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Úložisko\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly potrebuje prístup k úložisku aby mohol ukladať dáta na externé úložisko, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Úložisko\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Bez povolenia sa nedá zapisovať na externé úložisko</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Vymazať správu?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Týmto natrvalo odstránite túto správu.</string>
@@ -2684,7 +2813,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Správu sa nepodarilo doručiť.</string>
     <string name="MessageNotifier_error_delivering_message">Chyba doručovania správy.</string>
     <string name="MessageNotifier_message_delivery_paused">Doručenie správy bolo pozastavené.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Pre pokračovanie v zasielaní správ overte v Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Pre pokračovanie v zasielaní správ overte v Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Označiť všetko ako prečítané</string>
     <string name="MessageNotifier_mark_read">Označiť ako prečítané</string>
     <string name="MessageNotifier_turn_off_these_notifications">Vypnúť tieto upozornenia</string>
@@ -2706,7 +2835,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Reagoval/a %1$s na vašu nálepku.</string>
     <string name="MessageNotifier_this_message_was_deleted">Táto správa bola vymazaná.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Vypnúť upozornenia na to, že kontakt začal používať Signal? Môžete ich znova zapnúť v Signal &gt; Nastavenia &gt; Upozornenia.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Vypnúť upozornenia na to, že kontakt začal používať Molly? Môžete ich znova zapnúť v Molly &gt; Nastavenia &gt; Upozornenia.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2745,7 +2874,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Rýchla odpoveď nie je dostupná, keď je Signal zamknutý!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Rýchla odpoveď nie je dostupná, keď je Molly zamknutý!</string>
     <string name="QuickResponseService_problem_sending_message">Problém pri odosielaní správy!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2765,7 +2894,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Neplatná skratka</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Nová správa</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Žiadosť o správu</string>
     <string name="SingleRecipientNotificationBuilder_you">Vy</string>
@@ -2813,7 +2942,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Toto zariadenie už nie je registrované. Dôvodom je pravdepodobne to, že ste svoje telefónne číslo zaregistrovali v Signali na inom zariadení.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Toto zariadenie už nie je registrované. Dôvodom je pravdepodobne to, že ste svoje telefónne číslo zaregistrovali v Mollyi na inom zariadení.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Znova zaregistrujte zariadenie</string>
 
@@ -2826,10 +2955,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Ak chcete prijať hovor, poskytnite Signal prístup k mikrofónu.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Ak chcete prijať hovor, poskytnite Molly prístup k mikrofónu.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Ak chcete prijať videohovor, poskytnite Signalu prístup k mikrofónu a kamere.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal potrebuje prístup k mikrofónu a fotoaparátu aby mohol volať alebo prijímať hovory, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Mikrofón\" a \"Fotoaparát\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Ak chcete prijať videohovor, poskytnite Mollyu prístup k mikrofónu a kamere.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly potrebuje prístup k mikrofónu a fotoaparátu aby mohol volať alebo prijímať hovory, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Mikrofón\" a \"Fotoaparát\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Prijaté na pripojenom zariadení.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Odmietnuté na pripojenom zariadení.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Zaneprázdnené na pripojenom zariadení.</string>
@@ -2874,16 +3003,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Zopakujte nové heslo</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Pozvať do Signalu</string>
+    <string name="contact_selection_activity__invite_to_signal">Pozvať do Mollyu</string>
     <string name="contact_selection_activity__new_group">Nová skupina</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Obnoviť kontakty</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Niekto tu chýba? Skúste obnoviť</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Nájdite v aplikácii Signal ľudí, ktorých poznáte</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Povoľte prístup ku kontaktom</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Viac</string>
 
@@ -2900,7 +3029,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Fotka kontaktu</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal potrebuje prístup ku kontaktom aby mohol zobraziť Vaše kontakty, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Kontakty\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly potrebuje prístup ku kontaktom aby mohol zobraziť Vaše kontakty, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Kontakty\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Nepodarilo sa načítať kontakty. Skontrolujte svoje sieťové pripojenie</string>
     <string name="ContactSelectionListFragment_username_not_found">Používateľské meno sa nenašlo</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"„%1$s“ nie je používateľ Signalu. Skontrolujte používateľské meno a skúste to znova."</string>
@@ -2920,16 +3049,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Nájsť podľa používateľského mena</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Povoľte prístup ku kontaktom</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Ak chcete nájsť ľudí, ktorých v aplikácii Signal poznáte:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Povoliť prístup</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Nie, ďakujem</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Povoľte prístup ku kontaktom. Vaše kontakty sú šifrované a pre službu Signal nie sú viditeľné.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal potrebuje prístup k Vašim kontaktom, aby ich mohol zobraziť.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly potrebuje prístup k Vašim kontaktom, aby ich mohol zobraziť.</string>
     <string name="contact_selection_list_fragment__show_contacts">Ukázať Kontakty</string>
 
     <!-- contact_selection_list_item -->
@@ -3006,6 +3137,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Túto osobu ste predtým odstránili, odoslaním správy bude pridaná späť do vášho zoznamu.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Možnosti</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Aktualizovať</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Prehrať … Pozastaviť</string>
@@ -3034,7 +3167,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Bubliny sú funkciou systému Android, ktorú môžete vypnúť pre Signal čety.</string>
+    <string name="BubbleOptOutTooltip__description">Bubliny sú funkciou systému Android, ktorú môžete vypnúť pre Molly čety.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Teraz nie</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3216,9 +3349,9 @@
     <string name="EditProfileFragment__group_description">Popis skupiny</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Aktualizovať Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Aktualizovať Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Táto verzia Signalu vypršala. Aktualizujte ju, aby ste mohli Signal používať naďalej.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Táto verzia Mollyu vypršala. Aktualizujte ju, aby ste mohli Molly používať naďalej.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Aktualizovať</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3437,7 +3570,7 @@
     <string name="preferences__slow">Pomaly</string>
     <string name="preferences__help">Pomocník</string>
     <string name="preferences__advanced">Rozšírené</string>
-    <string name="preferences__donate_to_signal">Prispieť na Signal</string>
+    <string name="preferences__donate_to_signal">Prispieť na Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Súkromie</string>
     <!-- Preference label for stories -->
@@ -3474,13 +3607,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Zmeniť ikonu a názov aplikácie na „%1$s“</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Ak chcete zmeniť ikonu a názov aplikácie, je potrebné zatvoriť Signal. Upozornenia budú vždy zobrazovať predvolenú ikonu a názov Signalu.</string>
+    <string name="preferences__app_icon_dialog_description">Ak chcete zmeniť ikonu a názov aplikácie, je potrebné zatvoriť Molly. Upozornenia budú vždy zobrazovať predvolenú ikonu a názov Mollyu.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Vyberte ikonu a názov aplikácie, ktoré sa budú zobrazovať na domovskej obrazovke telefónu a v zozname aplikácií. Upozornenia budú vždy zobrazovať predvolenú ikonu a názov Signalu. Zistiť viac</string>
+    <string name="preferences__app_icon_warning_learn_more">Vyberte ikonu a názov aplikácie, ktoré sa budú zobrazovať na domovskej obrazovke telefónu a v zozname aplikácií. Upozornenia budú vždy zobrazovať predvolenú ikonu a názov Mollyu. Zistiť viac</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Ikony a názvy aplikácie budú zobrazené na domovskej obrazovke a v zozname aplikácií.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Upozornenia budú vždy zobrazovať predvolenú ikonu a názov Signalu.</string>
+    <string name="preferences__app_icon_notification_warning">Upozornenia budú vždy zobrazovať predvolenú ikonu a názov Mollyu.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Zistiť viac</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3529,8 +3662,12 @@
         <item quantity="other">Týmto sa natrvalo skrátia všetky čety na %1$s posledných správ.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Týmto sa natrvalo vymaže celá história správ a médiá z vášho zariadenia.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Týmto sa natrvalo vymaže celá história správ a médiá z tohto aj všetkých prepojených zariadení.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Naozaj chcete vymazať celú históriu správ?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Celá história správ bude natrvalo vymazaná. Tento krok sa nedá vrátiť späť.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Celá história správ bude natrvalo odstránená zo všetkých zariadení. Túto akciu nie je možné vrátiť späť.</string>
     <string name="preferences_storage__delete_all_now">Zmazať všetky teraz</string>
     <string name="preferences_storage__forever">Navždy</string>
     <string name="preferences_storage__one_year">1 rok</string>
@@ -3569,7 +3706,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Obchádzanie cenzúry</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Obchádzanie cenzúry</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Keď je povolené, Signal sa pokúsi obísť cenzúru. Nepovoľujte v umiestneniach, kde Signal nie je cenzurovaný.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Keď je povolené, Molly sa pokúsi obísť cenzúru. Nepovoľujte v umiestneniach, kde Molly nie je cenzurovaný.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Obchádzanie cenzúry bolo zapnuté na základe telefónneho čísla vášho účtu.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3621,7 +3758,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Predstavujeme platby</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Pomocou Signalu môžete odosielať a prijímať MobileCoin, novú digitálnu menu zameranú na súkromie. Ak chcete začať, spustite aktiváciu.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Pomocou Mollyu môžete odosielať a prijímať MobileCoin, novú digitálnu menu zameranú na súkromie. Ak chcete začať, spustite aktiváciu.</string>
     <string name="PaymentsHomeFragment__activate_payments">Aktivovať platby</string>
     <string name="PaymentsHomeFragment__activating_payments">Aktivujú sa platby…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Obnovte platobný účet</string>
@@ -3647,7 +3784,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Platby nie sú k dispozícii vo vašej oblasti.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Nepodarilo sa povoliť platby. Skúste to znova neskôr.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Deaktivovať platby?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Ak deaktivujete platby, nebudete môcť odosielať ani prijímať MobileCoin v Signal.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Ak deaktivujete platby, nebudete môcť odosielať ani prijímať MobileCoin v Molly.</string>
     <string name="PaymentsHomeFragment__deactivate">Deaktivovať</string>
     <string name="PaymentsHomeFragment__continue">Pokračovať</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Zostatok nie je momentálne k dispozícii.</string>
@@ -3656,10 +3793,10 @@
     <string name="PaymentsHomeFragment__details">Podrobnosti</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Signal môžete používať na posielanie a prijímanie MobileCoinu. Všetky platby podliehajú podmienkam používania MobileCoinov a peňaženky MobileCoin. Môžu sa vyskytnúť určité problémy a platby alebo zostatky, ktoré sa prípadne stratia, nie je možné obnoviť. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Molly môžete používať na posielanie a prijímanie MobileCoinu. Všetky platby podliehajú podmienkam používania MobileCoinov a peňaženky MobileCoin. Môžu sa vyskytnúť určité problémy a platby alebo zostatky, ktoré sa prípadne stratia, nie je možné obnoviť. </string>
     <string name="PaymentsHomeFragment__activate">Aktivovať</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Zobraziť podmienky MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Platby v službe Signal už nie sú k dispozícii. Stále môžete prevádzať prostriedky na burzu, ale už nemôžete posielať a prijímať platby ani pridávať prostriedky.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Platby v službe Molly už nie sú k dispozícii. Stále môžete prevádzať prostriedky na burzu, ale už nemôžete posielať a prijímať platby ani pridávať prostriedky.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3687,7 +3824,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Nastaviť povolenia</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Signal si vyžiada tieto povolenia, aby vám pomohol posielať správy ľuďom, ktorých poznáte. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Molly si vyžiada tieto povolenia, aby vám pomohol posielať správy ľuďom, ktorých poznáte. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Upozornenia</string>
     <!-- Notifications permission row description -->
@@ -3775,10 +3912,10 @@
     <string name="PaymentsTransferFragment__next">Ďalší</string>
     <string name="PaymentsTransferFragment__invalid_address">Neplatná adresa</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Skontrolujte adresu peňaženky, do ktorej sa snažíte previesť peniaze, a skúste to znovu.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Nemôžete vykonať prevod na adresu vašej Signal peňaženky. Zadajte adresu peňaženky z vášho účtu v podporovanej burze.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Na naskenovanie QR kódu potrebuje Signal prístup k fotoaparátu.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Pre načítanie QR kódu potrebuje Signal prístup k Fotoaparátu. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Fotoaparát\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Na naskenovanie QR kódu potrebuje Signal prístup k fotoaparátu.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Nemôžete vykonať prevod na adresu vašej Molly peňaženky. Zadajte adresu peňaženky z vášho účtu v podporovanej burze.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Na naskenovanie QR kódu potrebuje Molly prístup k fotoaparátu.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Pre načítanie QR kódu potrebuje Molly prístup k Fotoaparátu. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Fotoaparát\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Na naskenovanie QR kódu potrebuje Molly prístup k fotoaparátu.</string>
     <string name="PaymentsTransferFragment__settings">Nastavenia</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -4144,17 +4281,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Prichádzajúci Signal hlasový hovor</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Prichádzajúci Molly hlasový hovor</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Prichádzajúci Signal videohovor</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Prichádzajúci Molly videohovor</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Prichádzajúci Signal skupinový hovor</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Prichádzajúci Molly skupinový hovor</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Prebieha Signal hlasový hovor</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Prebieha Molly hlasový hovor</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Prebieha Signal videohovor</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Prebieha Molly videohovor</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Prebieha Signal skupinový hovor</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Prebieha Molly skupinový hovor</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Načítava sa…</string>
@@ -4201,9 +4338,9 @@
     <string name="BackupDialog_verify">Overiť</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Úspešne ste zadali svoje heslo pre zálohy</string>
     <string name="BackupDialog_passphrase_was_not_correct">Heslo nebolo správne</string>
-    <string name="LocalBackupJob_creating_signal_backup">Vytvára sa záloha Signal…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Vytvára sa záloha Molly…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Prebieha overovanie Signal zálohy…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Prebieha overovanie Molly zálohy…</string>
     <string name="LocalBackupJobApi29_backup_failed">Zálohovanie zlyhalo</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Váš priečinok na zálohy bol vymazaný alebo premiestnený.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Súbor s vašou zálohou je príliš veľký na uloženie v tejto jednotke.</string>
@@ -4218,15 +4355,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Zavolajte mi (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Znova odoslať kód (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Kontaktovať podporu Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Registrácia v Signali – Overovací kód pre Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Kontaktovať podporu Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Registrácia v Mollyi – Overovací kód pre Android</string>
     <string name="RegistrationActivity_incorrect_code">Nesprávny kód</string>
     <string name="BackupUtil_never">Nikdy</string>
     <string name="BackupUtil_unknown">Neznáma</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Telefónne číslo</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Vyberte si, kto môže vidieť vaše telefónne číslo a kto vás môže pomocou neho kontaktovať v službe Signal.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Vyberte si, kto môže vidieť vaše telefónne číslo a kto vás môže pomocou neho kontaktovať v službe Molly.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Kto môže vidieť moje telefónne číslo</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4274,7 +4411,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Urobili ste príliš veľa pokusov. Prosím, skúste to znovu neskôr.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Chyba pri pripájaní k službe</string>
     <string name="preferences_chats__backups">Zálohy</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal je zamknutý</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly je zamknutý</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">ŤUKNUTÍM ODOMKNITE</string>
     <string name="Recipient_unknown">Neznáme</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4305,9 +4442,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Potrebujete prístup k svojmu starému zariadeniu.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Obnoviť zo zálohy</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Obnovte vaše správy z lokálnej zálohy. Keď nevykonáte obnovu teraz, neskôr nebude možná.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Obnoviť lokálnu zálohu</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Obnoviť zálohu Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Obnovte všetky svoje textové správy a médiá za posledných 30 dní</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Viac možností</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Zrušiť</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Prihlásiť sa bez prenosu</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Pokračovať bez prenosu správ a médií</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Otvorte Signal na svojom starom Android zariadení.</string>
     <string name="NewDeviceTransferInstructions__continue">Pokračovať</string>
@@ -4322,19 +4466,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Pripravuje sa pripojenie do starého Android zariadenia…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Chvíľku strpenia, onedlho by malo byť hotovo</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Čaká sa na pripojenie starého Android zariadenia…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal potrebuje prístup k polohe, aby mohol objaviť a pripojiť sa k vášmu starému Android zariadeniu.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Aby Signal mohol objaviť a pripojiť sa k vášmu starému Android zariadeniu, musia byť zapnuté služby polohy.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal potrebuje Wi-Fi, aby mohol objaviť a pripojiť sa k vášmu starému Android zariadeniu. Wi-Fi musí byť zapnuté, ale nemusí byť pripojené k žiadnej Wi-Fi sieti.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Je nám ľúto, ale vyzerá to, že toto zariadenie nepodporuje Wi-Fi Direct. Signal používa Wi-Fi Direct na objavenie a pripojenie sa ku vášmu starému Android zariadeniu. Môžete ale urobiť obnovu zo zálohy a tým obnoviť vaše konto zo svojho starého Android zariadenia.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly potrebuje prístup k polohe, aby mohol objaviť a pripojiť sa k vášmu starému Android zariadeniu.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Aby Molly mohol objaviť a pripojiť sa k vášmu starému Android zariadeniu, musia byť zapnuté služby polohy.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly potrebuje Wi-Fi, aby mohol objaviť a pripojiť sa k vášmu starému Android zariadeniu. Wi-Fi musí byť zapnuté, ale nemusí byť pripojené k žiadnej Wi-Fi sieti.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Je nám ľúto, ale vyzerá to, že toto zariadenie nepodporuje Wi-Fi Direct. Molly používa Wi-Fi Direct na objavenie a pripojenie sa ku vášmu starému Android zariadeniu. Môžete ale urobiť obnovu zo zálohy a tým obnoviť vaše konto zo svojho starého Android zariadenia.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Obnoviť zálohu</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Počas pripájania sa k vášmu starému Android zariadeniu sa stala neočakávaná chyba.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Hľadá sa nové Android zariadenie…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal potrebuje prístup k polohe, aby mohol objaviť a pripojiť sa k vášmu novému Android zariadeniu.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Aby Signal mohol objaviť a pripojiť sa k vášmu novému Android zariadeniu, musia byť zapnuté služby polohy.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal potrebuje Wi-Fi, aby mohol objaviť a pripojiť sa k vášmu novému Android zariadeniu. Wi-Fi musí byť zapnuté, ale nemusí byť pripojené k žiadnej Wi-Fi sieti.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Je nám ľúto, ale vyzerá to, že toto zariadenie nepodporuje Wi-Fi Direct. Signal používa Wi-Fi Direct na objavenie a pripojenie sa ku vášmu novému Android zariadeniu. Môžete ale urobiť obnovu zo zálohy a tým obnoviť vaše konto do svojho nového Android zariadenia.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly potrebuje prístup k polohe, aby mohol objaviť a pripojiť sa k vášmu novému Android zariadeniu.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Aby Molly mohol objaviť a pripojiť sa k vášmu novému Android zariadeniu, musia byť zapnuté služby polohy.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly potrebuje Wi-Fi, aby mohol objaviť a pripojiť sa k vášmu novému Android zariadeniu. Wi-Fi musí byť zapnuté, ale nemusí byť pripojené k žiadnej Wi-Fi sieti.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Je nám ľúto, ale vyzerá to, že toto zariadenie nepodporuje Wi-Fi Direct. Molly používa Wi-Fi Direct na objavenie a pripojenie sa ku vášmu novému Android zariadeniu. Môžete ale urobiť obnovu zo zálohy a tým obnoviť vaše konto do svojho nového Android zariadenia.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Vytvoriť zálohu</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Počas pripájania sa k vášmu novému Android zariadeniu sa stala neočakávaná chyba.</string>
 
@@ -4375,7 +4519,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Prenášajú sa dáta</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Ponechajte obe zariadenia blízko seba. Nevypínajte zariadenia a nechajte Signal otvorený. Prenosy sú zabezpečené prostredníctvom koncového šifrovania.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Ponechajte obe zariadenia blízko seba. Nevypínajte zariadenia a nechajte Molly otvorený. Prenosy sú zabezpečené prostredníctvom koncového šifrovania.</string>
     <string name="DeviceTransfer__d_messages_so_far">Zatiaľ %1$d správ…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">Zatiaľ %1$s%% správ…</string>
@@ -4389,7 +4533,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Preniesť účet</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Stiahnite Signal na svojom novom Android zariadení</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Stiahnite Molly na svojom novom Android zariadení</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Ťuknite na \"Preniesť alebo obnoviť účet\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4463,7 +4607,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Každý, kto má tento odkaz, môže vidieť názov a fotku tejto skupiny a požiadať o členstvo. Zdieľajte ho s ľuďmi, ktorým dôverujete.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Každý, kto má tento odkaz, môže vidieť názov a fotku tejto skupiny a stať sa jej členom. Zdieľajte ho s ľuďmi, ktorým dôverujete.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Zdieľať cez Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Zdieľať cez Molly</string>
     <string name="GroupLinkBottomSheet_copy">Kopírovať</string>
     <string name="GroupLinkBottomSheet_qr_code">QR kód</string>
     <string name="GroupLinkBottomSheet_share">Zdieľať</string>
@@ -4663,7 +4807,7 @@
     <string name="payment_info_card_about_mobilecoin">Čo je MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin je nová digitálna mena zameraná na súkromie.</string>
     <string name="payment_info_card_adding_funds">Pridávanie finančných prostriedkov</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Prostriedky na použitie v službe Signal môžete pridať poslaním MobileCoinov na adresu vašej peňaženky.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Prostriedky na použitie v službe Molly môžete pridať poslaním MobileCoinov na adresu vašej peňaženky.</string>
     <string name="payment_info_card_cashing_out">Vyberanie hotovosti</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">MobileCoin si kedykoľvek môžete zmeniť na hotovosť v zmenárni, ktorá podporuje MobileCoin. Jednoducho vykonajte prevod na váš účet v danej zmenárni.</string>
     <string name="payment_info_card_hide_this_card">Skryť túto kartu?</string>
@@ -4684,12 +4828,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Deaktivovať peňaženku</string>
     <string name="DeactivateWalletFragment__your_balance">Váš zostatok</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Odporúčame vám, aby ste pred deaktiváciou platieb previedli svoje prostriedky na adresu inej peňaženky. Ak sa rozhodnete, že svoje prostriedky neprevediete teraz, zostanú v peňaženke prepojenej so službou Signal, ak platby opätovne aktivujete.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Odporúčame vám, aby ste pred deaktiváciou platieb previedli svoje prostriedky na adresu inej peňaženky. Ak sa rozhodnete, že svoje prostriedky neprevediete teraz, zostanú v peňaženke prepojenej so službou Molly, ak platby opätovne aktivujete.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Previesť zostávajúcu čiastku</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Deaktivovať bez prevodu</string>
     <string name="DeactivateWalletFragment__deactivate">Deaktivovať</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Deaktivovať bez prevodu?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">V prípade, že sa rozhodnete opätovne aktivovať platby, váš zostatok zostane vo vašej peňaženke prepojenej so službou Signal.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">V prípade, že sa rozhodnete opätovne aktivovať platby, váš zostatok zostane vo vašej peňaženke prepojenej so službou Molly.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Chyba pri deaktivácii peňaženky.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4988,7 +5132,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licencie</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Podmienky a Zásady ochrany osobných údajov</string>
-    <string name="HelpFragment__copyright_signal_messenger">Copyright Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Copyright Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Pod licenciou GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -5003,7 +5147,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">Automatická</string>
+    <string name="ChatColorSelectionFragment__auto">Auto</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Použite vlastné farby</string>
     <string name="ChatColorSelectionFragment__chat_color">Farba četu</string>
     <string name="ChatColorSelectionFragment__edit">Upraviť</string>
@@ -5235,9 +5379,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Vyberte farbu</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Zdieľať</string>
 
@@ -5279,7 +5420,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Do tejto skupiny môžu posielať správy len administrátori.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Limit dosiahnutý</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Nemôžete vybrať viac ako 5 četov</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5460,9 +5602,9 @@
     <string name="MySupportPreference__learn_more">Zistiť viac</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Aktualizovať Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Aktualizovať Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Táto verzia Signalu vypršala. Aktualizujte ju, aby ste mohli Signal používať naďalej.</string>
+    <string name="UpdateSignalExpiredDialog__message">Táto verzia Mollyu vypršala. Aktualizujte ju, aby ste mohli Molly používať naďalej.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Aktualizovať</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5471,7 +5613,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Zariadenie nie je registrované</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Toto zariadenie už nie je registrované. Ak chcete naďalej používať Signal na tomto zariadení, znova ho zaregistrujte.</string>
+    <string name="ReregisterSignalDialog__message">Toto zariadenie už nie je registrované. Ak chcete naďalej používať Molly na tomto zariadení, znova ho zaregistrujte.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Znovu zaregistrovať</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5765,7 +5907,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Výber sa nepodarilo otvoriť.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Ak chcete povoliť upozornenia, Signal potrebuje povolenie na ich zobrazenie.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Ak chcete povoliť upozornenia, Molly potrebuje povolenie na ich zobrazenie.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Zapnúť</string>
 
@@ -5920,8 +6062,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Zatiaľ žiadne odpovede</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Na tento príbeh nemôžete odpovedať, pretože už nie ste členom tejto skupiny.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Reagoval/a na príbeh</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Reagovali ste na príbeh</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Reagoval/a na príbeh</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Pozretia</string>
     <!-- Label for story replies tab -->
@@ -6572,8 +6716,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Vyberte banku</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Potvrďte svoj príspevok prostredníctvom %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Ak chcete nastaviť pravidelné prispievanie, ťuknutím na Pokračovať potvrďte platbu vo výške 0,01 € vo svojej banke. Táto suma bude automaticky vrátená a umožní, aby bol váš príspevok vo výške 5 €/mesiac odpísaný z vášho účtu.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Ak chcete nastaviť pravidelné prispievanie, ťuknutím na Pokračovať potvrďte platbu vo výške 0,01 € vo svojej banke. Táto suma bude automaticky vrátená a umožní, aby bol váš príspevok vo výške %1$s/mesiac odpísaný z vášho účtu.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Pokračovať</string>
 
@@ -7163,6 +7307,56 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Sťahujú sa zálohované údaje…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Zálohovanie médií je vypnuté</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Váš plán zálohovania médií Signal bol zrušený, pretože sa nám nepodarilo spracovať vašu platbu. Na stiahnutie akýchkoľvek médií uložených vo vašej zálohe máte %1$d deň. Po %1$d dni budú médiá vo vašej zálohe vymazané.</item>
+        <item quantity="few">Váš plán zálohovania médií Signal bol zrušený, pretože sa nám nepodarilo spracovať vašu platbu. Na stiahnutie akýchkoľvek médií uložených vo vašej zálohe máte %1$d dni. Po %1$d dňoch budú médiá vo vašej zálohe vymazané.</item>
+        <item quantity="many">Váš plán zálohovania médií Signal bol zrušený, pretože sa nám nepodarilo spracovať vašu platbu. Na stiahnutie akýchkoľvek médií uložených vo vašej zálohe máte %1$d dňa. Po %1$d dni budú médiá vo vašej zálohe vymazané.</item>
+        <item quantity="other">Váš plán zálohovania médií Signal bol zrušený, pretože sa nám nepodarilo spracovať vašu platbu. Na stiahnutie akýchkoľvek médií uložených vo vašej zálohe máte %1$d dní. Po %1$d dňoch budú médiá vo vašej zálohe vymazané.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Kedykoľvek môžete začať opäť platiť za zálohy. Budete tak môcť pokračovať v zálohovaní všetkých svojich médií. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Vaše médiá budú dnes vymazané</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Váš plán zálohovania médií Signal bol zrušený, pretože sa nám nepodarilo spracovať vašu platbu. Máte poslednú šancu stiahnuť si médiá zo zálohy pred jej vymazaním.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Sťahovanie nie je možné dokončiť</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Vo vašom zariadení nemáte dostatok voľného miesta. Ak chcete stiahnuť médiá uložené vo vašej zálohe, uvoľnite %1$s.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Ak vyberiete možnosť Preskočiť, médiá vo vašej zálohe sa vymažú o %1$d deň.</item>
+        <item quantity="few">Ak vyberiete možnosť Preskočiť, médiá vo vašej zálohe sa vymažú o %1$d dni.</item>
+        <item quantity="many">Ak vyberiete možnosť Preskočiť, médiá vo vašej zálohe sa vymažú o %1$d dňa.</item>
+        <item quantity="other">Ak vyberiete možnosť Preskočiť, médiá vo vašej zálohe sa vymažú o %1$d dní.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Platbu za zálohu nie je možné spracovať</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Nedarí sa nám spracovať vašu opakovanú mesačnú platbu za zálohovanie. Uistite sa, že je váš spôsob platby aktuálny. Ak nie, aktualizujte ho v službe Google Pay. Signal sa pokúsi spracovať platbu znova o niekoľko dní.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Zálohovanie sa nepodarilo dokončiť</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Vaše zariadenie nebolo zálohované posledných %1$d dní. Uistite sa, že vaše zariadenie je pripojené k sieti Wi-Fi a ťuknite na „Zálohovať teraz“. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Zistiť viac</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Preskočiť</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Stiahnuť médiá teraz</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Stiahnuť neskôr</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Nestiahnuť médiá</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Uvoľnite %1$s miesta na stiahnutie médií.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Kreditná alebo debetná karta</string>
@@ -7176,16 +7370,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Neznáme</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">História platieb</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Vaša posledná záloha bola vytvorená %1$s o %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">Obmedzenia četu</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">Obmedzenie počtu správ v čete</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">Vymazať históriu správ</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Správy staršie ako zvolený čas budú natrvalo vymazané.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Správy presahujúce zvolenú dĺžku budú natrvalo vymazané.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Použiť obmedzenie aj na prepojených zariadeniach</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Keď je táto možnosť povolená, obmedzenie dĺžky četu vymaže správy aj z vašich prepojených zariadení.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Vymazávanie je teraz synchronizované na všetkých vašich zariadeniach</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Keď vymažete správy alebo čety, odstránia sa z vášho telefónu a prepojených zariadení.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">História platieb</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Zálohovanie správ a všetkých médií</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Platobné údaje</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Typ zálohy</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Dátum zaplatenia</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Zdieľať</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Zálohy Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">História platieb</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Podrobnosti o zálohe</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Veľkosť zálohy</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Frekvencia zálohovania</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Zálohovať pomocou mobilnej siete</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Vypnúť a vymazať zálohu</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Záloha bola vymazaná a zálohovanie vypnuté.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Typ zálohy sa zmenil a predplatné bolo zrušené</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Predplatné bolo zrušené</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Sťahovanie dokončené</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Typ zálohy</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Zálohy sú vypnuté</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/mesačne</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Povoliť zálohovanie</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Posledná záloha</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s o %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Nikdy</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Zálohovať teraz</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Vypnúť a vymazať zálohy?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Nebudú vám účtované žiadne ďalšie poplatky. Vaša záloha bude vymazaná a nebudú sa vytvárať žiadne nové zálohy.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Vypnúť a odstrániť</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Vymazáva sa záloha…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Záloha bola vymazaná</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Ťuknutím na položku Zálohovať teraz"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Denne</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Týždenne</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Mesačne</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Manuálne zálohovanie</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Zadajte PIN kód, heslo alebo vzor svojho zariadenia.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Ďalej</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Zmeniť typ zálohy</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Zrušiť predplatné</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Potvrdiť zrušenie</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Nebudú vám účtované žiadne ďalšie poplatky. Zálohovanie bude vypnuté na konci vášho fakturačného cyklu. Po tomto dátume budete mať 30 dní na stiahnutie médií, ktoré práve zálohujete.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Potvrdiť a stiahnuť teraz</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Potvrdiť a stiahnuť neskôr</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Ponechať predplatné</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index ca0a7f0e9c..7bb408cdd4 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Aplikacija Signal se posodablja …</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Aplikacija Molly se posodablja …</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Niste še nastavili gesla!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Izključim geslo?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">S tem boste odklenili aplikacijo Signal in obvestila o sporočilih.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">S tem boste odklenili aplikacijo Molly in obvestila o sporočilih.</string>
     <string name="ApplicationPreferencesActivity_disable">Onemogoči</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Napaka pri povezavi s strežnikom!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN je potreben za zaklep registracije. Če ga želite odstraniti, morate najprej izklopiti zaklep registracije.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Datoteka</string>
     <string name="AttachmentKeyboard_contact">Stik</string>
     <string name="AttachmentKeyboard_location">Lokacija</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal potrebuje dovoljenje za prikaz vaših fotografij in videoposnetkov</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly potrebuje dovoljenje za prikaz vaših fotografij in videoposnetkov</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Dovoli dostop</string>
     <string name="AttachmentKeyboard_payment">Plačilo</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Ne najdem aplikacije za izbor datotek.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Dostop do shrambe je bil trajno onemogočen. Aplikacija Signal potrebuje dovoljenje za dostop do sistemskega pomnilnika za pripenjanje fotografij, videa in zvoka k sporočilom. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Shramba\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Dostop do stikov je bil trajno onemogočen. Aplikacija Signal potrebuje dovoljenje za dostop do stikov, kadar želite sporočilom pripeti podatke oseb iz svojega imenika. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Stiki\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Dostop do lokacije je bil trajno onemogočen. Aplikacija Signal potrebuje dovoljenje za dostop do lokacije, kadar želite k sporočilom dodati podatek o svoji trenutni lokaciji. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Lokacija\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Dostop do shrambe je bil trajno onemogočen. Aplikacija Molly potrebuje dovoljenje za dostop do sistemskega pomnilnika za pripenjanje fotografij, videa in zvoka k sporočilom. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Shramba\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Dostop do stikov je bil trajno onemogočen. Aplikacija Molly potrebuje dovoljenje za dostop do stikov, kadar želite sporočilom pripeti podatke oseb iz svojega imenika. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Stiki\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Dostop do lokacije je bil trajno onemogočen. Aplikacija Molly potrebuje dovoljenje za dostop do lokacije, kadar želite k sporočilom dodati podatek o svoji trenutni lokaciji. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Lokacija\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Dovolite dostop do svoje lokacije</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Za pošiljanje lokacije:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Omogočite Signalu dostop do pošiljanja lokacije.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Omogočite Mollyu dostop do pošiljanja lokacije.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal potrebuje dostop do lokacije, da lahko pošlje vašo lokacijo.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly potrebuje dostop do lokacije, da lahko pošlje vašo lokacijo.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Dovoli dostop do pomnilnika</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Za prikaz fotografij in videoposnetkov:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal potrebuje dostop do pomnilnika za prikaz fotografij in videoposnetkov.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly potrebuje dostop do pomnilnika za prikaz fotografij in videoposnetkov.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s ni aktiviral/-a plačil </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Zamenjaj kamero</string>
     <string name="CameraXFragment_open_gallery_description">Odpri galerijo</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Dovoli dostop</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Dovoli dostop do kamere in mikrofona</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Dovoli dostop do kamere</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Dovoli dostop do mikrofona</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Za zajemanje fotografij dovolite Signalu dostop do kamere naprave.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Za zajemanje fotografij in videov dovolite aplikaciji Signal dostop do kamere naprave.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Za zajemanje fotografij in videov dovolite Signalu dostop do kamere in mikrofona naprave.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Za zajemanje videov z zvokom dovolite Signalu dostop do mikrofona naprave.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Za skeniranje QR kode dovolite Signalu dostop do kamere.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal potrebuje dostop do kamere za zajemanje fotografij</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal potrebuje dostop do kamere za optično branje QR kod</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal potrebuje dostop do mikrofona za zajemanje videoposnetkov</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Za zajemanje fotografij v Signalu:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Za zajemanje fotografij in videov v Signalu:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Za zajemanje videov z zvokom:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Za skeniranje QR kod:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Nedavni stiki</string>
@@ -273,7 +274,7 @@
     <string name="CameraContacts_no_signal_contacts">Ni uporabnikov_ic Signala</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Za pošiljanje fotografij uporabnikom_cam storitve Signal morate uporabiti gumb za kamero. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Ne najdete uporabnika_ce, ki ga_jo iščete?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Povabite prijatelja_ico k uporabi aplikacije Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Povabite prijatelja_ico k uporabi aplikacije Molly</string>
     <string name="CameraContacts__menu_search">Iskanje</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -287,12 +288,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Ne, hvala!</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Posodobite aplikacijo Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Posodobite aplikacijo Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Ta različica aplikacije Signal ni več podprta. Za nadaljnje pošiljanje in prejemanje sporočil jo morate nadgraditi.</string>
     <string name="ClientDeprecatedActivity_update">Posodobitev</string>
     <string name="ClientDeprecatedActivity_dont_update">Ne nadgradi</string>
     <string name="ClientDeprecatedActivity_warning">Opozorilo</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Različica aplikacije Signal na vaši napravi je potekla. Še vedno lahko pregledujete zgodovino svojih sporočil, ne morete pa jih pošiljati ali prejemati dokler je ne posodobite.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Različica aplikacije Molly na vaši napravi je potekla. Še vedno lahko pregledujete zgodovino svojih sporočil, ne morete pa jih pošiljati ali prejemati dokler je ne posodobite.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Spletnega brskalnika ni bilo mogoče najti.</string>
@@ -329,8 +330,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Sporočilo %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Zvočni klic Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Video klic Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -428,7 +429,7 @@
     <string name="ConversationActivity_transport_signal">Sporočilo Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Pošlji sporočilo</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Začni uporabljati aplikacijo Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Začni uporabljati aplikacijo Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Prosimo, izberite uporabnika_co</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Velikost priponke presega omejitev velikosti za ta tip sporočil.</string>
     <string name="ConversationActivity_unable_to_record_audio">Snemanje zvoka ni mogoče!</string>
@@ -447,18 +448,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Za pošiljanje zvočnih sporočil:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Za pošiljanje glasovnih sporočil dovolite Signalu dostop do mikrofona.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Za pošiljanje glasovnih sporočil dovolite Mollyu dostop do mikrofona.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal potrebuje dostop do mikrofona, da lahko posname glasovno sporočilo.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Dostop do mikrofona je bil trajno onemogočen. Aplikacija Signal potrebuje dovoljenje za dostop do mikrofona naprave za pošiljanje zvokovnih sporočil. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Mikrofon\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly potrebuje dostop do mikrofona, da lahko posname glasovno sporočilo.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Dostop do mikrofona je bil trajno onemogočen. Aplikacija Molly potrebuje dovoljenje za dostop do mikrofona naprave za pošiljanje zvokovnih sporočil. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Mikrofon\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Dostop do mikrofona in kamere je bil trajno onemogočen. Za klic uporabnika_ce %1$spotrebuje Aplikacija Signal dovoljenje za dostop do mikrofona in kamere naprave. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenji pod postavkama \"Mikrofon\" in \"Kamera\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Za zajemanje videa in fotografij dovolite aplikaciji Signal dostop do kamere naprave.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Dostop do kamere je bil trajno onemogočen. Aplikacija Signal potrebuje dovoljenje za dostop do kamere za zajemanje videa in fotografij. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Za zajemanje videa in fotografij potrebuje aplikacija Signal dostop do kamere.</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Dostop do mikrofona in kamere je bil trajno onemogočen. Za klic uporabnika_ce %1$spotrebuje Aplikacija Molly dovoljenje za dostop do mikrofona in kamere naprave. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenji pod postavkama \"Mikrofon\" in \"Kamera\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Za zajemanje videa in fotografij dovolite aplikaciji Molly dostop do kamere naprave.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Dostop do kamere je bil trajno onemogočen. Aplikacija Molly potrebuje dovoljenje za dostop do kamere za zajemanje videa in fotografij. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Za zajemanje videa in fotografij potrebuje aplikacija Molly dostop do kamere.</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Omogoči dostop do mikrofona za zajemanje zvoka in videa.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Dostop do mikrofona je bil onemogočen. Za snemanje videa potrebuje aplikacija Signal dovoljenje za dostop do mikrofona. Prosimo, nadaljujte v nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Mikrofon\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Za snemanje videa potrebuje Signal dostop do mikrofona.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Dostop do mikrofona je bil onemogočen. Za snemanje videa potrebuje aplikacija Molly dovoljenje za dostop do mikrofona. Prosimo, nadaljujte v nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Mikrofon\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Za snemanje videa potrebuje Molly dostop do mikrofona.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Ne</string>
@@ -479,9 +480,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Za začetek klica:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Če želite začeti klic, omogočite Signalu dostop do mikrofona.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Če želite začeti klic, omogočite Mollyu dostop do mikrofona.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal potrebuje dostop do mikrofona za začetek klica.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly potrebuje dostop do mikrofona za začetek klica.</string>
 
 
     <string name="ConversationActivity_join">Pridruži se</string>
@@ -495,9 +496,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">SMS sporočila niso več podprta v Signalu. Povabite stik %1$s v Signal, da ohranite pogovor tukaj.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Ta oseba Signala ne uporablja več. Povabite jo/ga v Signal, da ohranite pogovor tukaj.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Ta oseba Mollya ne uporablja več. Povabite jo/ga v Molly, da ohranite pogovor tukaj.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Povabi na Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Povabi na Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Kmalu vas znova opozorimo.</string>
 
@@ -563,6 +564,8 @@
     <string name="ConversationFragment_delete_for_everyone">Izbriši za vse</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Izbriši v tej napravi</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Izbriši</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Izbriši povsod</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">To sporočilo bo izbrisano za vse v tem klepetu, če uporabljajo novejšo različico Signala. Sodelujoči bodo lahko videli, da je bilo sporočilo izbrisano.</string>
@@ -594,13 +597,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Blokirano</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Posodobite aplikacijo Signal</string>
+    <string name="ConversationFragment__update_build">Posodobite aplikacijo Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Ponovno se prijavite v Signal</string>
+    <string name="ConversationFragment__reregister_signal">Ponovno se prijavite v Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Nazaj.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Odpri Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Odpri Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Ni več potrjeno</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -669,6 +672,13 @@
         <item quantity="few">S tem boste trajno izbrisali vse %1$d izbrane klepete.</item>
         <item quantity="other">S tem boste trajno izbrisali vseh %1$d izbranih klepetov.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">S tem boste izbrani klepet trajno izbrisali iz vseh naprav.</item>
+        <item quantity="two">S tem boste %1$d izbrana klepeta trajno izbrisali iz vseh naprav.</item>
+        <item quantity="few">S tem boste vse %1$d izbrane klepete trajno izbrisali iz vseh naprav.</item>
+        <item quantity="other">S tem boste vseh %1$d izbranih klepetov trajno izbrisali iz vseh naprav.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Brisanje</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Brisanje izbranega klepeta …</item>
@@ -770,9 +780,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Kdo me lahko najde preko telefonske številke?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Vsak, ki ima vašo telefonsko številko, bo videl, da ste na Signalu, in bo lahko začel klepetati z vami.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Vsak, ki ima vašo telefonsko številko, bo videl, da ste na Mollyu, in bo lahko začel klepetati z vami.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Nihče ne bo mogel videti, da ste na Signalu, razen če mu/ji ne pošljete sporočila ali že klepetate z njim/njo.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Nihče ne bo mogel videti, da ste na Mollyu, razen če mu/ji ne pošljete sporočila ali že klepetate z njim/njo.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Obnovim iz varnostne kopije?</string>
@@ -806,7 +816,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Preizkusite geslo svoje varnostne kopije, da vidite, če se ujema</string>
     <string name="BackupsPreferenceFragment__turn_on">Vklopi</string>
     <string name="BackupsPreferenceFragment__turn_off">Izklopi</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Za obnovo iz varnostne kopije morate najprej namestiti novo kopijo aplikacije Signal. Nato odprite aplikacijo in tapnite \"Obnovi iz varnostne kopije\", ter poiščite svojo varnostno kopijo. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Za obnovo iz varnostne kopije morate najprej namestiti novo kopijo aplikacije Molly. Nato odprite aplikacijo in tapnite \"Obnovi iz varnostne kopije\", ter poiščite svojo varnostno kopijo. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Izvedite več</string>
     <string name="BackupsPreferenceFragment__in_progress">V teku …</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -814,7 +824,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d do zdaj …</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% do zdaj …</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Dovoljenja za dostop do zunanjega pomnilnika, ki ga aplikacija Signal potrebuje za varnostno kopiranje, je bilo trajno odvzeto. Prosimo, pojdite v sistemski meni z nastavitvami za aplikacije, izberite \"Dovoljenja\" in označite polje \"Zunanja shramba\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Dovoljenja za dostop do zunanjega pomnilnika, ki ga aplikacija Molly potrebuje za varnostno kopiranje, je bilo trajno odvzeto. Prosimo, pojdite v sistemski meni z nastavitvami za aplikacije, izberite \"Dovoljenja\" in označite polje \"Zunanja shramba\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Nastavite čas varnostnega kopiranja</string>
 
@@ -881,7 +891,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Seja klepeta je bila osvežena</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal uporablja šifriranje od-konca-do-konca, zato je včasih potrebna osvežitev seje klepeta. To ne bo vplivalo na varnost, lahko pa se bo izgubilo kakšno sporočilo s tem stikom in ga_jo boste morali prositi, da ga pošlje znova.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly uporablja šifriranje od-konca-do-konca, zato je včasih potrebna osvežitev seje klepeta. To ne bo vplivalo na varnost, lahko pa se bo izgubilo kakšno sporočilo s tem stikom in ga_jo boste morali prositi, da ga pošlje znova.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Uporabite Signal na namiznem računalniku ali iPadu. Sporočila se bodo sinhronizirala s povezanimi napravami.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Poveži z novo napravo</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Sporočila in informacije o klepetu so v vseh napravah zaščitene s šifriranjem od konca do konca</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal na namizju ali iPadu</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Vsa sporočila v povezanih napravah so zasebna</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Sporočila Molly se sinhronizirajo s Mollyom v mobilnem telefonu, potem ko je ta povezan. Zgodovina prejšnjih sporočil se ne bo prikazala.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">V svoji drugi napravi obiščite %1$s in namestite Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Moje povezane naprave</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Odklopi povezavo</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">Naprava %1$s je nepovezana</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Povezujem napravo …</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Naprava je potrjena</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Nalaganje …</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Ni povezanih naprav</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Odkleni za povezovanje naprave</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Za povezavo skenirajte QR kodo v napravi.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Skeniraj kodo QR</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">S to napravo optično preberite kodo QR, ki je prikazana v napravi, ki jo želite povezati</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Okej</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Ta naprava bo lahko videla skupine in stike, dostopala do pogovorov in pošiljala sporočila v vašem imenu.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Dokončajte povezovanje v drugi napravi</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Dokončajte povezovanje Mollya v drugi napravi.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Povezovanje naprav ni bilo uspešno</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Koda QR ni veljavna. Prosimo prepričajte se, da skenirate kodo QR na napravi, ki jo želite povezati.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Ponovno</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Odstranim \'%1$s\'?</string>
@@ -903,10 +968,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimiziraj za manjkajočo aplikacijo Play Services</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Naprava ne podpira storitev Play Services. Tapnite za izklop optimizacije baterije, ki aplikaciji Signal preprečuje povezavo v času neaktivnosti naprave.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Naprava ne podpira storitev Play Services. Tapnite za izklop optimizacije baterije, ki aplikaciji Molly preprečuje povezavo v času neaktivnosti naprave.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Ta različica aplikacije Signal je potekla. Posodobite jo, da boste lahko spet pošiljali in prejemali sporočila.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Ta različica aplikacije Molly je potekla. Posodobite jo, da boste lahko spet pošiljali in prejemali sporočila.</string>
     <string name="ExpiredBuildReminder_update_now">Posodobi zdaj</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -919,7 +984,7 @@
     <string name="PendingGroupJoinRequestsReminder_view">Ogled</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Trajna okvara pri komunikaciji aplikacije Signal!</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Trajna okvara pri komunikaciji aplikacije Molly!</string>
     <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Registracija z Google Play Services ni bila uspešna. Podatkovna komunikacija je izklopljena, prosimo, poskusite s ponovno registracijo v meniju Nastavive &gt; Napredno.</string>
 
 
@@ -1085,20 +1150,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Sistemske zabeležbe nam pomagajo diagnosticirati in odpraviti težavo ter ne vsebujejo identifikacijskih podatkov.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal je naletel na težavo. Želite poslati sistemsko zabeležbo?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly je naletel na težavo. Želite poslati sistemsko zabeležbo?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Obvestila so lahko zakasnjena zaradi optimizacije baterije</string>
     <!-- Message explaining that battery saver may delay notifications -->
     <string name="PromptBatterySaverBottomSheet__message">Optimizacije baterije lahko onemogočite, da obvestila o sporočilih ne bodo zakasnjena.</string>
 
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Obvestila so lahko zakasnjena zaradi optimizacije baterije</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Onemogočite optimizacijo baterije za Molly in tako zagotovite, da obvestila o sporočilih ne bodo zamujala. Tapnite \"Nadaljuj\", da si ogledate navodila za posamezno napravo.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Ne, hvala</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Nadaljuj</string>
+
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Nadaljuj</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Prekini</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Ne, hvala!</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Čakajoča vabila v skupino</string>
+    <string name="PendingMembersActivity_pending_group_invites">Prošnje in vabila</string>
     <string name="PendingMembersActivity_requests">Prošnje</string>
     <string name="PendingMembersActivity_invites">Vabila</string>
     <string name="PendingMembersActivity_people_you_invited">Ljudje, ki ste jih povabili</string>
@@ -1369,7 +1444,7 @@
         <item quantity="few">Pošljem %1$d vabila SMS?</item>
         <item quantity="other">Pošljem %1$d vabil SMS?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Preklopi na Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Preklopi na Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Kaže, da nimate nameščene nobene primerne aplikacije.</string>
 
     <!-- LearnMoreTextView -->
@@ -1383,7 +1458,7 @@
     <string name="LongMessageActivity_your_message">Vaše sporočilo</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Povezava v ozadju je omogočena</string>
 
     <!-- MediaOverviewActivity -->
@@ -1462,10 +1537,10 @@
     <string name="MessageQuotesBottomSheet_replies">Odgovori</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Vzpostavljam klic Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">Vzpostavljam klic Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Začetek klicanja Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Ustavljanje klicanja Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Začetek klicanja Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Ustavljanje klicanja Molly</string>
     <string name="NotificationBarManager__cancel_call">Prekini klic</string>
 
     <!-- NotificationsMegaphone -->
@@ -1733,6 +1808,14 @@
     <string name="MessageRecord_you_activated_payments">Aktivirali ste Plačila</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s lahko zdaj sprejema plačila</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Podatki o plačilu niso na voljo</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Tapnite za več</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Podatki o plačilu niso na voljo</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Podrobnosti o tem plačilu niso na voljo, ker so bila vaša sporočila obnovljena iz vira, ki ni vseboval te zgodovine plačil. To ne vpliva na stanje v denarnici ali stanje preteklih plačil.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1793,9 +1876,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Kmalu ne boste več mogli pošiljati sporočil SMS iz Signala. Povabite stik %1$s v Signal, da ohranite pogovor tukaj.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">V Signalu ne morete več pošiljati SMS sporočil. Povabite stik %1$s v Signal, da ohranite pogovor tukaj.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">V Mollyu ne morete več pošiljati SMS sporočil. Povabite stik %1$s v Molly, da ohranite pogovor tukaj.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Plačilo: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Plačilo</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Prijavljeno kot neželeno</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1881,7 +1966,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Povežem z napravo Signal?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Izgleda, da želite za povezavo z napravo Signal uporabiti zunanji optični čitalnik. Prosimo, da to storite znotraj aplikacije Signal, saj je tako najvarneje.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Dostop do kamere je bil trajno onemogočen. Aplikacija Signal potrebuje dovoljenje za dostop do kamere, da bi lahko skenirali kode QR. Prosimo, pojdite v Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Kamera\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Dostop do kamere je bil trajno onemogočen. Aplikacija Molly potrebuje dovoljenje za dostop do kamere, da bi lahko skenirali kode QR. Prosimo, pojdite v Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Kamera\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Brez dovoljenja za dostop do kamere ne morem skenirati kode QR.</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1896,11 +1981,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Vnesite geslo</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Ikona Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Ikona Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Vnesite geslo</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Napačno geslo!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Odkleni Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Zaklenjen zaslon</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Odkleni Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Zaklenjen zaslon</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Zemljevid</string>
@@ -1977,7 +2062,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Moja zgodba</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Klic Signal</string>
+    <string name="Recipient_signal_call">Klic Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Blokiraj</string>
@@ -1991,7 +2076,8 @@
     <string name="RedPhone_ringing">Zvoni…</string>
     <string name="RedPhone_busy">Zasedeno</string>
     <string name="RedPhone_recipient_unavailable">Klicani_a ni dosegljiv_a</string>
-    <string name="RedPhone_network_failed">Napaka omrežja!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Napaka omrežja! Preverite svojo omrežno povezavo in poskusite znova.</string>
     <string name="RedPhone_number_not_registered">Številka ni registrirana!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Številka, ki ste jo klicali, ne podpira varnih klicev!</string>
     <string name="RedPhone_got_it">Razumem</string>
@@ -2002,8 +2088,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Tapnite tukaj za vklop videa</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Za klic uporabnika_ce %1$s, Signal potrebuje dostop do kamere</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Za klic uporabnika_ce %1$s, Molly potrebuje dostop do kamere</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Klicanje …</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Ponovno povezovanje …</string>
@@ -2069,10 +2155,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Odstranjen_a iz klica</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Nekdo vas je odstranil iz klica.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Dovoli dostop do kamere in mikrofona</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Dovoli dostop do mikrofona</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Dovoli dostop do kamere</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Če želite začeti klic ali se mu pridružiti, omogočite Mollyu dostop do kamere in mikrofona.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Če želite začeti klic ali se mu pridružiti, omogočite Mollyu dostop do mikrofona.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Če želite omogočiti video, omogočite Mollyu dostop do kamere.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly potrebuje dovoljenja za mikrofon, da lahko začne klic ali se mu pridruži.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly potrebuje dostop do kamere, da omogoči video</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Za začetek klica ali pridružitev:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Omogočanje videa:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal klic</string>
-    <string name="WebRtcCallView__signal_video_call">Video klic Signal</string>
+    <string name="WebRtcCallView__signal_call">Molly klic</string>
+    <string name="WebRtcCallView__signal_video_call">Video klic Molly</string>
     <string name="WebRtcCallView__start_call">Začni klic</string>
     <string name="WebRtcCallView__join_call">Pridruži se klicu</string>
     <string name="WebRtcCallView__call_is_full">Klic je polno zaseden</string>
@@ -2172,24 +2278,47 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Želite spustiti roko?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Spusti roko</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Nižje</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Prekliči</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Dvignili ste roko</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Ogled</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s je dvignil_a roko</item>
-        <item quantity="two">%1$s + %2$d sta dvignila roko</item>
-        <item quantity="few">%1$s + %2$d so dvignili roko</item>
-        <item quantity="other">%1$s + %2$d jih je dvignilo roko</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s je dvignil_a roko</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d sta dvignila_i roko</item>
+        <item quantity="two">%1$s + %2$d osebi ste dvignili roko</item>
+        <item quantity="few">%1$s + %2$d osebe ste dvignili roko</item>
+        <item quantity="other">%1$s + %2$d oseb ste dvignili roko</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s je dvignil_a roko</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d sta dvignila_i roko</item>
+        <item quantity="two">%1$s + %2$d osebi so dvignili roko</item>
+        <item quantity="few">%1$s + %2$d osebe so dvignili roko</item>
+        <item quantity="other">%1$s + %2$d oseb je dvignilo roko</item>
+    </plurals>
+
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="two">%1$s + %2$d</item>
+        <item quantity="few">%1$s + %2$d</item>
+        <item quantity="other">%1$s + %2$d</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="two">%1$s + %2$d</item>
         <item quantity="few">%1$s + %2$d</item>
@@ -2292,7 +2421,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Prejeli boste klic za potrditev te številke.</string>
     <string name="RegistrationActivity_edit_number">Uredi številko</string>
     <string name="RegistrationActivity_missing_google_play_services">Manjkajoča aplikacija Google Play Services</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Naprava nima nameščene aplikacije Google Play Services. To pomeni, da še vedno lahko uporabljate Signal, vendar bo zanesljivost delovanja aplikacije okrnjena.\n\nče niste napredni_na uporabnik_ca, če ne uporabljate alternativnega ROM-a Android, ali če mislite, da je prišlo do napake, nam to sporočite na support@signal.org, da vam lahko pomagamo pri odpravljanju težav.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Naprava nima nameščene aplikacije Google Play Services. To pomeni, da še vedno lahko uporabljate Molly, vendar bo zanesljivost delovanja aplikacije okrnjena.\n\nče niste napredni_na uporabnik_ca, če ne uporabljate alternativnega ROM-a Android, ali če mislite, da je prišlo do napake, nam to sporočite na support@molly.im, da vam lahko pomagamo pri odpravljanju težav.</string>
     <string name="RegistrationActivity_i_understand">Razumem</string>
     <string name="RegistrationActivity_play_services_error">Napaka Play Services</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Aplikacija Google Play Services se posodablja ali pa je začasno nedosegljiva. Poskusite znova.</string>
@@ -2310,7 +2439,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Nestandardni format številk</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Številka, ki ste jo vpisali (%1$s) je v nestandardnem formatu.\n\nSte morda mislili %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Format telefonskih številk</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Format telefonskih številk</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Zahtevek za klic</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2346,8 +2475,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Imate težave z registracijo?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Prepričajte se, da ima vaš telefon mobilni signal za sprejem SMS-a ali klica\n • Potrdite, da lahko sprejmete telefonski klic na številko\n • Preverite, ali ste pravilno vnesli svojo telefonsko številko.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Za več informacij sledite tem korakom za odpravljanje težav ali se obrnite na Podporo</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Za več informacij sledite %1$s ali %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">tem korakom za odpravljanje težav</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2385,7 +2514,7 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Dodaj med stike</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Povabi na Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Povabi na Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Sporočilo Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Klic Signal</string>
 
@@ -2522,11 +2651,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s pripada %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Nadgradnja aplikacije Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Na voljo je nova različica Signala. Tapnite za posodobitev.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Posodobitev Signala ni uspela</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Nadgradnja aplikacije Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Na voljo je nova različica Mollya. Tapnite za posodobitev.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Posodobitev Mollya ni uspela</string>
     <string name="ApkUpdateNotifications_failed_general_body">Znova bomo poskusili pozneje.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal je bil uspešno posodobljen</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly je bil uspešno posodobljen</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Samodejna posodobitev na različico %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2599,7 +2728,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Skupno varnostno število:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Kaže, da nimate nameščene nobene primerne aplikacije.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Iz odložišča ni bilo mogoče pridobiti nobenega varnostnega števila za primerjavo</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Dostop do kamere je bil trajno onemogočen. Aplikacija Signal potrebuje dovoljenje za dostop do kamere, da bi lahko skenirali kode QR. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Kamera\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Dostop do kamere je bil trajno onemogočen. Aplikacija Molly potrebuje dovoljenje za dostop do kamere, da bi lahko skenirali kode QR. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Kamera\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Brez dovoljenja za dostop do kamere ne morem skenirati kode QR.</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Za ogled varnostnih števil člana_ice %1$s morate z njim_njo najprej izmenjati sporočili.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2629,14 +2758,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Tapnite za vstop.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal je odklenjen</string>
-    <string name="KeyCachingService_lock">Zakleni Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly je odklenjen</string>
+    <string name="KeyCachingService_lock">Zakleni Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Vi</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Nepodprt medij</string>
     <string name="MediaPreviewActivity_draft">Osnutek</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Dostop do shrambe je bil trajno onemogočen. Aplikacija Signal potrebuje dovoljenje za dostop do sistemske shrambe za shranjevanje na zunanji pomnilnik naprave. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Shramba\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Dostop do shrambe je bil trajno onemogočen. Aplikacija Molly potrebuje dovoljenje za dostop do sistemske shrambe za shranjevanje na zunanji pomnilnik naprave. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Shramba\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Brez dovoljenja za dostop do shrambe ne morem shranjevati na zunanji pomnilnik naprave.</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Izbrišem sporočilo?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Sporočilo bo nepovratno izbrisano.</string>
@@ -2684,7 +2813,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Neuspešna dostava sporočila.</string>
     <string name="MessageNotifier_error_delivering_message">Napaka pri dostavi sporočila.</string>
     <string name="MessageNotifier_message_delivery_paused">Dostava sporočil je ustavljena.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Za nadaljevanje sporočanja na Signalu se verificirajte.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Za nadaljevanje sporočanja na Mollyu se verificirajte.</string>
     <string name="MessageNotifier_mark_all_as_read">Označi vse kot prebrano</string>
     <string name="MessageNotifier_mark_read">Označi kot prebrano</string>
     <string name="MessageNotifier_turn_off_these_notifications">Izklopi ta obvestila</string>
@@ -2706,7 +2835,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Odziv na vašo nalepko: %1$s</string>
     <string name="MessageNotifier_this_message_was_deleted">Sporočilo je bilo izbrisano</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Želite izklopiti obvestila o novih članih Signalove skupine? Kasneje jih lahko spet vklopite v Signal &gt; Nastavitve &gt; Obvestila.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Želite izklopiti obvestila o novih članih Mollyove skupine? Kasneje jih lahko spet vklopite v Molly &gt; Nastavitve &gt; Obvestila.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2745,7 +2874,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Hitri odziv ni mogoč, kadar je aplikacija Signal zaklenjena!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Hitri odziv ni mogoč, kadar je aplikacija Molly zaklenjena!</string>
     <string name="QuickResponseService_problem_sending_message">Težava pri pošiljanju sporočila</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2765,7 +2894,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Neveljavna bližnjica</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Novo sporočilo</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Prošnja za pogovor</string>
     <string name="SingleRecipientNotificationBuilder_you">Vi</string>
@@ -2813,7 +2942,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Ta naprava ni več registrirana. To je verjetno zato, ker ste registrirali svojo telefonsko številko pri Signalu na drugi napravi.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Ta naprava ni več registrirana. To je verjetno zato, ker ste registrirali svojo telefonsko številko pri Mollyu na drugi napravi.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Ponovno registrirajte napravo</string>
 
@@ -2826,10 +2955,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Za prevzem klica omogočite aplikaciji Signal dostop do mikrofona naprave.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Za prevzem klica omogočite aplikaciji Molly dostop do mikrofona naprave.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Če želite sprejeti video klic, omogočite Signalu dostop do svojega mikrofona in kamere.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Dostop do mikrofona in kamere je bil trajno onemogočen. Aplikacija Signal potrebuje dovoljenje za dostop do mikrofona in kamere za klicanje. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenji pod postavkama \"Mikrofon\" in \"Kamera\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Če želite sprejeti video klic, omogočite Mollyu dostop do svojega mikrofona in kamere.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Dostop do mikrofona in kamere je bil trajno onemogočen. Aplikacija Molly potrebuje dovoljenje za dostop do mikrofona in kamere za klicanje. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenji pod postavkama \"Mikrofon\" in \"Kamera\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Odgovorjeno na povezani napravi.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Zavrnjeno na povezani napravi.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Zasedeno na povezani napravi.</string>
@@ -2874,16 +3003,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Ponovno vnesite novo geslo</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Povabi na Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Povabi na Molly</string>
     <string name="contact_selection_activity__new_group">Nova skupina</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Osveži stike</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Pogrešate koga? Poskusite osvežiti</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Poiščite ljudi, ki jih poznate, v Signalu</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Dovolite dostop do svojih stikov</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Več</string>
 
@@ -2900,7 +3029,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Fotografija stika</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Dostop do stikov je bil trajno onemogočen. Aplikacija Signal potrebuje dovoljenje za dostop do stikov, da lahko prikazuje imena stikov iz vašega imenika. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Stiki\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Dostop do stikov je bil trajno onemogočen. Aplikacija Molly potrebuje dovoljenje za dostop do stikov, da lahko prikazuje imena stikov iz vašega imenika. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Stiki\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Napaka pri preverjanju uporabnikov_ic. Preverite dostop do omrežja.</string>
     <string name="ContactSelectionListFragment_username_not_found">Uporabniško ime ni bilo najdeno</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" ni uporabnik_ca storitve Signal. Preverite uporabniško ime in poskusite znova."</string>
@@ -2920,16 +3049,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Iskanje po uporabniškem imenu</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Omogoči dostop do stikov</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Za iskanje ljudi, ki jih poznate, v Signalu:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Dovoli dostop</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Ne, hvala!</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Dovolite dostop do svojih stikov. Vaši stiki so šifrirani in niso vidni storitvi Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Za prikaz imen iz vašega imenika potrebuje aplikacija Signal dostop do stikov.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Za prikaz imen iz vašega imenika potrebuje aplikacija Molly dostop do stikov.</string>
     <string name="contact_selection_list_fragment__show_contacts">Prikaži stike</string>
 
     <!-- contact_selection_list_item -->
@@ -3006,6 +3137,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">To osebo ste odstranili, če ji znova pošljete sporočilo, jo boste dodali nazaj na svoj seznam.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Možnosti</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Posodobitev</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Predvajanje … pavza</string>
@@ -3034,7 +3167,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Bubbles je funkcija androidnih telefonov, ki jo lahko izklopite za Signal.</string>
+    <string name="BubbleOptOutTooltip__description">Bubbles je funkcija androidnih telefonov, ki jo lahko izklopite za Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Ne zdaj</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3216,9 +3349,9 @@
     <string name="EditProfileFragment__group_description">Opis skupine</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Posodobite aplikacijo Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Posodobite aplikacijo Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Ta različica aplikacije Signal je potekla. Posodobite zdaj, če želite še naprej uporabljati Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Ta različica aplikacije Molly je potekla. Posodobite zdaj, če želite še naprej uporabljati Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Posodobitev</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3437,7 +3570,7 @@
     <string name="preferences__slow">Počasi</string>
     <string name="preferences__help">Pomoč</string>
     <string name="preferences__advanced">Napredno</string>
-    <string name="preferences__donate_to_signal">Podprite Signal</string>
+    <string name="preferences__donate_to_signal">Podprite Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Zasebnost</string>
     <!-- Preference label for stories -->
@@ -3474,13 +3607,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Spremenite ikono in ime aplikacije v »%1$s«</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Za spremembo ikone in imena aplikacije bo treba Signal zapreti. Obvestila bodo vedno prikazala privzeto ikono in ime Signala.</string>
+    <string name="preferences__app_icon_dialog_description">Za spremembo ikone in imena aplikacije bo treba Molly zapreti. Obvestila bodo vedno prikazala privzeto ikono in ime Mollya.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Izberite ikono in ime aplikacije, ki bosta vidna na začetnem zaslonu in v predalu za aplikacije vašega telefona. Obvestila bodo vedno prikazala privzeto ikono in ime Signala. Preberite več</string>
+    <string name="preferences__app_icon_warning_learn_more">Izberite ikono in ime aplikacije, ki bosta vidna na začetnem zaslonu in v predalu za aplikacije vašega telefona. Obvestila bodo vedno prikazala privzeto ikono in ime Mollya. Preberite več</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Ikone in imena aplikacij so vidne na začetnem zaslonu in v predalu aplikacij.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Obvestila bodo vedno prikazala privzeto ikono in ime Signala.</string>
+    <string name="preferences__app_icon_notification_warning">Obvestila bodo vedno prikazala privzeto ikono in ime Mollya.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Preberite več</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3529,8 +3662,12 @@
         <item quantity="other">S tem boste vse klepete trajno obrezali na %1$s najnovejših sporočil.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">S tem boste nepovratno izbrisali celotno zgodovino pogovorov in medijskih datotek z vaše naprave.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">S tem boste trajno izbrisali vso zgodovino sporočil in medije iz te naprave in vseh povezanih naprav.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Ali ste prepričani, da želite izbrisati celotno zgodovino pogovorov?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Celotna zgodovina vaših pogovorov bo za vedno izbrisana. Ta korak je nepovraten.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Vsa zgodovina sporočil bo trajno odstranjena iz vseh naprav. Ta korak je nepovraten.</string>
     <string name="preferences_storage__delete_all_now">Izbriši vse zdaj</string>
     <string name="preferences_storage__forever">Za vedno</string>
     <string name="preferences_storage__one_year">1 leto</string>
@@ -3569,7 +3706,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Zaščita pred cenzuro</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Zaščita pred cenzuro</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Ob vklopu bo aplikacija Signal skušala zaobiti cenzuro. Ne vklapljajte, če niste na lokaciji, kjer je aplikacija Signal blokirana.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Ob vklopu bo aplikacija Molly skušala zaobiti cenzuro. Ne vklapljajte, če niste na lokaciji, kjer je aplikacija Molly blokirana.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Zaščita pred cenzuro je bila vklopljena v povezavi s telefonsko številko vašega računa.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3621,7 +3758,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Predstavljamo plačila</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Uporabljajte Signal za pošiljanje in prejemanje nove digitalne valute MobileCoin, ki daje poudarek zasebnosti. Aktivirajte in začnite.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Uporabljajte Molly za pošiljanje in prejemanje nove digitalne valute MobileCoin, ki daje poudarek zasebnosti. Aktivirajte in začnite.</string>
     <string name="PaymentsHomeFragment__activate_payments">Vklopi Plačila</string>
     <string name="PaymentsHomeFragment__activating_payments">Vklapljanje Plačil …</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Obnovitev računa za plačila</string>
@@ -3647,7 +3784,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Plačila v vaši regiji niso na voljo.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Plačil ni bilo mogoče vključiti. Poskusite znova kasneje.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Ali res želite deaktivirati plačila?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Če boste deaktivirali plačila, ne boste več mogli pošiljati ali prejemati MobileCoinov preko Signala.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Če boste deaktivirali plačila, ne boste več mogli pošiljati ali prejemati MobileCoinov preko Mollya.</string>
     <string name="PaymentsHomeFragment__deactivate">Deaktiviraj</string>
     <string name="PaymentsHomeFragment__continue">Nadaljuj</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Stanje trenutno ni na voljo.</string>
@@ -3656,10 +3793,10 @@
     <string name="PaymentsHomeFragment__details">Podrobnosti</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Signal lahko uporabljate za pošiljanje in prejemanje MobileCoinov. Vsa plačila so izvedena v skladu s Pogoji uporabe za MobileCoin in MobileCoin Wallet. Morda boste naleteli na nekatere težave, plačil ali stanja, ki jih boste morda izgubili, pa ne bo mogoče povrniti. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Molly lahko uporabljate za pošiljanje in prejemanje MobileCoinov. Vsa plačila so izvedena v skladu s Pogoji uporabe za MobileCoin in MobileCoin Wallet. Morda boste naleteli na nekatere težave, plačil ali stanja, ki jih boste morda izgubili, pa ne bo mogoče povrniti. </string>
     <string name="PaymentsHomeFragment__activate">Aktiviraj</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Pogoji MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Plačila v Signalu niso več na voljo. Še vedno lahko prenesete sredstva v menjalnico, ne morete pa več pošiljati in prejemati plačil ali dodajati sredstev.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Plačila v Mollyu niso več na voljo. Še vedno lahko prenesete sredstva v menjalnico, ne morete pa več pošiljati in prejemati plačil ali dodajati sredstev.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3687,7 +3824,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Odobri dovoljenja</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Za pomoč pri pošiljanju sporočil ljudem, ki jih poznate, bo Signal zahteval ta dovoljenja. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Za pomoč pri pošiljanju sporočil ljudem, ki jih poznate, bo Molly zahteval ta dovoljenja. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Obvestila</string>
     <!-- Notifications permission row description -->
@@ -3775,10 +3912,10 @@
     <string name="PaymentsTransferFragment__next">Naprej</string>
     <string name="PaymentsTransferFragment__invalid_address">Neveljaven naslov</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Preverite naslov denarnice, v katero želite nakazati sredstva, in poskusite znova.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Ne morete nakazovati sredstev na naslov svoje lastne denarnice Signal. Vnesite naslov denarnice svojega računa v podprti menjalnici.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Za skeniranje kode QR potrebuje Signal dostop do kamere.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal potrebuje dovoljenje za zajem kode QR. Prosimo, pojdite v meni Nastavitve, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Kamera\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Za skeniranje kode QR potrebuje Signal dostop do kamere.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Ne morete nakazovati sredstev na naslov svoje lastne denarnice Molly. Vnesite naslov denarnice svojega računa v podprti menjalnici.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Za skeniranje kode QR potrebuje Molly dostop do kamere.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly potrebuje dovoljenje za zajem kode QR. Prosimo, pojdite v meni Nastavitve, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Kamera\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Za skeniranje kode QR potrebuje Molly dostop do kamere.</string>
     <string name="PaymentsTransferFragment__settings">Nastavitve</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -4148,7 +4285,7 @@
     <!-- Displayed in a notification when a Signal video call is ringing -->
     <string name="CallNotificationBuilder__incoming_signal_video_call">Dohodni video klic</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Dohodni skupinski klic Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Dohodni skupinski klic Molly</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
     <string name="CallNotificationBuilder__ongoing_signal_voice_call">Klic v teku</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
@@ -4201,9 +4338,9 @@
     <string name="BackupDialog_verify">Potrdi</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Uspešno ste vnesli geslo svoje varnostne kopije</string>
     <string name="BackupDialog_passphrase_was_not_correct">Geslo ni bilo pravilno</string>
-    <string name="LocalBackupJob_creating_signal_backup">Ustvarjanje varnostne kopije Signal …</string>
+    <string name="LocalBackupJob_creating_signal_backup">Ustvarjanje varnostne kopije Molly …</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Preverjanje Signalove varnostne kopije …</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Preverjanje Mollyove varnostne kopije …</string>
     <string name="LocalBackupJobApi29_backup_failed">Izdelava varnostne kopije ni uspela</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Mapa za varnostne kopije je bila izbrisana ali premaknjena.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Vaša varnostna kopija je prevelika za to shrambo.</string>
@@ -4218,15 +4355,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Pokliči me (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Ponovno pošlji kodo (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Kontaktiraj center za podporo Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Registracija za storitev Signal - verifikacijska koda za Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Kontaktiraj center za podporo Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Registracija za storitev Molly - verifikacijska koda za Android</string>
     <string name="RegistrationActivity_incorrect_code">Napačna koda</string>
     <string name="BackupUtil_never">Nikoli</string>
     <string name="BackupUtil_unknown">Neznano</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Telefonska številka</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Izberite, kdo lahko vidi vašo telefonsko številko in kdo vas lahko z njo kontaktira v Signalu.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Izberite, kdo lahko vidi vašo telefonsko številko in kdo vas lahko z njo kontaktira v Mollyu.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Kdo lahko vidi mojo številko</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4274,7 +4411,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Preveč neuspešnih poskusov. Prosimo poskusite znova kasneje.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Napaka pri povezavi do storitve</string>
     <string name="preferences_chats__backups">Varnostne kopije</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal je zaklenjen</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly je zaklenjen</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">TAPNITE ZA ODKLEPANJE</string>
     <string name="Recipient_unknown">Neznano</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4305,9 +4442,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Potrebujete dostop do vaše stare naprave.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Obnovi iz varnostne kopije</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Obnovite svoja sporočila iz lokalne varnostne kopije. Če tega ne storite zdaj, kasneje ne bo več mogoče.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Obnovitev lokalne varnostne kopije</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Obnovitev varnostne kopije Signala</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Obnovite vsa svoja besedilna sporočila in medije zadnjih 30 dni</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Več možnosti</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Prekliči</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Prijava brez prenosa</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Nadaljujte brez prenosa sporočil in medijev</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Odprite Signal na vaši stari androidni napravi</string>
     <string name="NewDeviceTransferInstructions__continue">Nadaljuj</string>
@@ -4322,19 +4466,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Priprava za povezavo s staro androidno napravo …</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Samo trenutek …</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Čakanje na povezavo s staro andoidno napravo …</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Za zaznavo in povezavo z vašo staro androidno napravo potrebuje Signal dovoljenje za dostop do lokacije.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Za zaznavo in povezavo z vašo staro androidno napravo potrebuje Molly dovoljenje za dostop do lokacije.</string>
     <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Za zaznavo in povezavo z vašo staro androidno napravo morajo biti na vaši napravi vklopljene lokacijske storitve.</string>
     <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Za zaznavo in povezavo z vašo staro androidno napravo, mora biti vklopljen Wi-Fi, a ni nujno, da je naprava povezana na Wi-Fi omrežje.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Vaša naprava žal ne omogoča funkcije Wi-Fi Direct. Signal uporablja Wi-Fi Direct za zaznavo in povezavo s staro androidno napravo. Še vedno pa lahko obnovite svoj račun Signal z uvozom podatkov iz varnostne kopije s stare naprave.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Vaša naprava žal ne omogoča funkcije Wi-Fi Direct. Molly uporablja Wi-Fi Direct za zaznavo in povezavo s staro androidno napravo. Še vedno pa lahko obnovite svoj račun Molly z uvozom podatkov iz varnostne kopije s stare naprave.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Obnovi iz varnostne kopije</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Pri poskusu povezave z vašo staro androidno napravo je prišlo do nepričakovane napake.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Iskanje vaše nove androidne naprave …</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Za zaznavo in povezavo z vašo novo androidno napravo potrebuje Signal dovoljenje za dostop do lokacije.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Za zaznavo in povezavo z vašo novo androidno napravo potrebuje Molly dovoljenje za dostop do lokacije.</string>
     <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Za zaznavo in povezavo z vašo novo androidno napravo morate imeti vklopljene lokacijske storitve.</string>
     <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Za zaznavo in povezavo z vašo novo androidno napravo morate imeti vklopjen Wi-Fi, a ni nujno, da je naprava povezana na Wi-Fi omrežje.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Vaša naprava žal ne omogoča funkcije Wi-Fi Direct. Signal uporablja Wi-Fi Direct za zaznavo in povezavo z vašo novo androidno napravo. Še vedno pa lahko ustvarite lokalno varnostno kopijo in jo prenesete na novo napravo.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Vaša naprava žal ne omogoča funkcije Wi-Fi Direct. Molly uporablja Wi-Fi Direct za zaznavo in povezavo z vašo novo androidno napravo. Še vedno pa lahko ustvarite lokalno varnostno kopijo in jo prenesete na novo napravo.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Ustvari varnostno kopijo</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Pri poskusu povezave z vašo novo androidno napravo je prišlo do nepričakovane napake.</string>
 
@@ -4375,7 +4519,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Poteka prenos podatkov</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Napravi naj bosta v neposredni bližini. Ne izklapljajte naprav in pustite Signal odprt. Prenos je med obema napravama je šifriran od-konca-do-konca.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Napravi naj bosta v neposredni bližini. Ne izklapljajte naprav in pustite Molly odprt. Prenos je med obema napravama je šifriran od-konca-do-konca.</string>
     <string name="DeviceTransfer__d_messages_so_far">Prenešenih %1$d sporočil …</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% sporočil do zdaj …</string>
@@ -4389,7 +4533,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Prenesi račun</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">namestite Signal na novi androidni napravi</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">namestite Molly na novi androidni napravi</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"tapnite na \"Prenos ali obnovitev računa\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4463,7 +4607,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Kdorkoli s to povezavo lahko vidi ime in profilno sliko skupine ter zaprosi za pridružitev. Delite povezavo z ljudmi, ki jim zaupate.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Kdorkoli s to povezavo lahko vidi ime in profilno sliko skupine ter se ji pridruži. Delite povezavo z ljudmi, ki jim zaupate.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Deli preko Signala</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Deli preko Mollya</string>
     <string name="GroupLinkBottomSheet_copy">Kopiraj</string>
     <string name="GroupLinkBottomSheet_qr_code">Koda QR</string>
     <string name="GroupLinkBottomSheet_share">Deli</string>
@@ -4663,7 +4807,7 @@
     <string name="payment_info_card_about_mobilecoin">Več o MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin je nova digitalna valuta s poudarkom na zasebnosti.</string>
     <string name="payment_info_card_adding_funds">Dodaj sredstva</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Sredstva za uporabo v Signalu lahko dodate z nakazilom MobileCoinov na naslov vaše denarnice.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Sredstva za uporabo v Mollyu lahko dodate z nakazilom MobileCoinov na naslov vaše denarnice.</string>
     <string name="payment_info_card_cashing_out">Izplačilo</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Vaše MobileCoine si lahko kadarkoli izplačate v menjalnici, ki podpira MobileCoin, tako da naredite prenos sredstev na vaš račun v menjalnici.</string>
     <string name="payment_info_card_hide_this_card">Želite skriti to kartico?</string>
@@ -4684,12 +4828,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Deaktiviraj denarnico</string>
     <string name="DeactivateWalletFragment__your_balance">Vaše stanje</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Pred deaktivacijo plačil je priporočeno, da prenesete svoja sredstva v drugo denarnico. Če jih ne boste prenesli zdaj, bodo ostala v vaši denarnici, ki je povezana s Signalom, za primer, da boste kdaj ponovno aktivirali plačila.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Pred deaktivacijo plačil je priporočeno, da prenesete svoja sredstva v drugo denarnico. Če jih ne boste prenesli zdaj, bodo ostala v vaši denarnici, ki je povezana s Mollyom, za primer, da boste kdaj ponovno aktivirali plačila.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Prenesi preostala sredstva</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Deaktiviraj brez prenosa</string>
     <string name="DeactivateWalletFragment__deactivate">Deaktiviraj</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Ali res želite deaktivacijo brez prenosa sredstev?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Vaše stanje bo ostalo zabeleženo v vaši denarnici, povezani s Signalom, če bi se odločili ponovno aktivirati plačila.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Vaše stanje bo ostalo zabeleženo v vaši denarnici, povezani s Mollyom, če bi se odločili ponovno aktivirati plačila.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Napaka pri deaktivaciji denarnice.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4988,7 +5132,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licence</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Pogoji &amp; politika zasebnosti</string>
-    <string name="HelpFragment__copyright_signal_messenger">Vse pravice Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Vse pravice Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Pod licenco GNU GPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -5003,7 +5147,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">Avtomatično</string>
+    <string name="ChatColorSelectionFragment__auto">Izbor</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Uporabi barve po meri</string>
     <string name="ChatColorSelectionFragment__chat_color">Barva klepeta</string>
     <string name="ChatColorSelectionFragment__edit">Uredi</string>
@@ -5235,9 +5379,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Izberi barvo</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Deli</string>
 
@@ -5279,7 +5420,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Tej skupini lahko sporočila pošiljajo zgolj skrbniki.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Dosežen je bil limit</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Ne morete izbrati več kot 5 klepetov</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5460,9 +5602,9 @@
     <string name="MySupportPreference__learn_more">Preberite več</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Posodobite aplikacijo Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Posodobite aplikacijo Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Ta različica aplikacije Signal je potekla. Posodobite zdaj, če želite še naprej uporabljati Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Ta različica aplikacije Molly je potekla. Posodobite zdaj, če želite še naprej uporabljati Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Posodobitev</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5471,7 +5613,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Naprava ni registrirana</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Ta naprava ni več registrirana. Ponovno se registrirajte, če želite še naprej uporabljati Signal v tej napravi.</string>
+    <string name="ReregisterSignalDialog__message">Ta naprava ni več registrirana. Ponovno se registrirajte, če želite še naprej uporabljati Molly v tej napravi.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Ponovna prijava</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5765,7 +5907,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Odpiranje izbirnika ni uspelo.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Če želite omogočiti obvestila, potrebuje Signal dovoljenje za njihov prikaz.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Če želite omogočiti obvestila, potrebuje Molly dovoljenje za njihov prikaz.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Vklopi</string>
 
@@ -5920,8 +6062,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Brez odgovorov</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Na to zgodbo ne morete odgovoriti, ker niste več član_ica te skupine.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Odzivi na zgodbo</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">ste se odzvali na zgodbo</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">se je odzval/-a na zgodbo</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Ogledi</string>
     <!-- Label for story replies tab -->
@@ -6572,8 +6716,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Izberite svojo banko</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Potrdite svojo donacijo s plačilno metodo %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Za nastavitev ponavljajoče se donacije tapnite Nadaljuj, da potrdite zaračunavanje 0,01 EUR v svoji banki. To se bo samodejno povrnilo in omogočilo, da se vaša donacija 5 €/mesec odšteje z vašega računa.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Za nastavitev ponavljajoče se donacije tapnite Nadaljuj, da potrdite zaračunavanje 0,01 EUR v svoji banki. To se bo samodejno povrnilo in omogočilo, da se vaša donacija %1$s/mesec odšteje z vašega računa.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Nadaljuj</string>
 
@@ -7163,6 +7307,56 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Prenos varnostne kopije …</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Varnostne kopije medijev so izklopljene</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Vaš načrt varnostnega kopiranja medijev Signal je bil preklican, ker nismo mogli obdelati vašega plačila. Na voljo imate %1$d dan za prenos vseh medijev, shranjenih v vaši varnostni kopiji. Po %1$d dnevu bodo mediji v vaši varnostni kopiji izbrisani.</item>
+        <item quantity="two">Vaš načrt varnostnega kopiranja medijev Signal je bil preklican, ker nismo mogli obdelati vašega plačila. Na voljo imate %1$d dni za prenos vseh medijev, shranjenih v vaši varnostni kopiji. Po %1$d dneh bodo mediji v vaši varnostni kopiji izbrisani.</item>
+        <item quantity="few">Vaš načrt varnostnega kopiranja medijev Signal je bil preklican, ker nismo mogli obdelati vašega plačila. Na voljo imate %1$d dni za prenos vseh medijev, shranjenih v vaši varnostni kopiji. Po %1$d dneh bodo mediji v vaši varnostni kopiji izbrisani.</item>
+        <item quantity="other">Vaš načrt varnostnega kopiranja medijev Signal je bil preklican, ker nismo mogli obdelati vašega plačila. Na voljo imate %1$d dni za prenos vseh medijev, shranjenih v vaši varnostni kopiji. Po %1$d dneh bodo mediji v vaši varnostni kopiji izbrisani.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Kadarkoli lahko ponovno začnete plačevati za varnostne kopije in tako nadaljujete z varnostnim kopiranjem vseh svojih medijev. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Vaši mediji bodo danes izbrisani</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Vaš načrt varnostnega kopiranja medijev Signal je bil preklican, ker nismo mogli obdelati vašega plačila. To je zadnja priložnost, da prenesete medije iz varnostne kopije, preden bodo izbrisani.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Prenosa ni mogoče dokončati</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Vaša naprava nima dovolj prostora. Sprostite do %1$s prostora za prenos medijev, shranjenih v varnostni kopiji.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Če izberete \"Preskoči\", bodo mediji v varnostni kopiji izbrisani v %1$d dnevu.</item>
+        <item quantity="two">Če izberete \"Preskoči\", bodo mediji v varnostni kopiji izbrisani v %1$d dneh.</item>
+        <item quantity="few">Če izberete \"Preskoči\", bodo mediji v varnostni kopiji izbrisani v %1$d dneh.</item>
+        <item quantity="other">Če izberete \"Preskoči\", bodo mediji v varnostni kopiji izbrisani v %1$d dneh.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Plačila varnostnih kopij nismo mogli obdelati</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Imamo težave z zbiranjem vašega ponavljajočega se mesečnega plačila za varnostno kopiranje. Prepričajte se, da je vaš način plačila posodobljen. Če ni, ga posodobite v Google Pay. Signal bo v nekaj dneh ponovno poskusil obdelati plačilo.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Varnostne kopije ni bilo mogoče dokončati</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Vaša naprava ni izdelala varnostne kopije že %1$d dni. Prepričajte se, da je vaša naprava povezana s povezavo Wi-Fi, in tapnite \"Izdelaj varnostno kopijo\". </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Preberite več</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Preskoči</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Prenos medijev</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Prenesi pozneje</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Ne prenesi medijev</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Sprostite %1$s prostora za prenos medijev.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Kreditna ali debetna kartica</string>
@@ -7176,6 +7370,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Neznano</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Zgodovina plačil</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Vaša zadnja varnostna kopija je bila izdelana dne %1$s ob %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -7186,6 +7386,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Sporočila, starejša od izbranega časa, bodo trajno izbrisana.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Sporočila, ki presegajo izbrano dolžino, bodo trajno izbrisana.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Uporaba omejitev za povezane naprave</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Če je omejitev klepeta omogočena, se izbrišejo tudi sporočila iz povezanih naprav.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Brisanje je zdaj sinhronizirano v vseh napravah</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Ko izbrišete sporočila ali klepete, se izbrišejo iz telefona in vseh povezanih naprav.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Zgodovina plačil</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Varnostno kopiranje sporočil in vseh medijev</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Podatki o plačilu</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Vrsta varnostne kopije</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Datum plačila</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Deli</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Varnostne kopije Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Zgodovina plačil</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Podrobnosti o varnostni kopji</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Velikost varnostne kopije</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Pogostost varnostnega kopiranja</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Varnostno kopiranje z uporabo mobilnega omrežja</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Izklopi in izbriši varnostno kopiranje</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Varnostno kopiranje je izbrisano in izklopljeno.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Spremenjena vrsta varnostne kopije in preklicana naročnina</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Naročnina je prekinjena</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Prenos dokončan</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Vrsta varnostne kopije</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Varnostno kopiranje izklopljeno</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/mesec</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Dovoli varnostno kopiranje</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Zadnja varnostna kopija</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s ob %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Nikoli</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Izdelaj varnostno kopijo</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Želite varnostno kopiranje izklopiti in izbrisati?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Ne bomo vam več zaračunali. Vaša varnostna kopija bo izbrisana in nove varnostne kopije ne bodo ustvarjene.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Izklopi in izbriši</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Brisanje varnostne kopije …</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Varnostna kopija je izbrisana</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Tako, da tapnete Izdelaj varnostno kopijo"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Dnevno</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Tedensko</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Mesečno</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Ročno varnostno kopiranje</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Vnesite pin, geslo ali vzorec naprave.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Naprej</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Sprememba vrste varnostne kopije</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Prekini naročnino</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Potrditev preklica</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Ne bomo vam več zaračunali. Varnostne kopije se izklopijo ob koncu vašega obračunskega cikla. Po tem datumu boste lahko v 30 dneh prenesli medije, ki jih trenutno varnostno kopirate.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Potrdite in prenesite zdaj</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Potrdite in prenesite pozneje</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Ohrani naročnino</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index a25bf9f1d2..cbe807b853 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal-i po përditësohet…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly-i po përditësohet…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Nuk keni caktuar ende një frazëkalimi!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Të çaktivizohet frazëkalimi?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Kjo do të zhbllokojë përgjithmonë njoftimet e Signal dhe mesazheve.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Kjo do të zhbllokojë përgjithmonë njoftimet e Molly dhe mesazheve.</string>
     <string name="ApplicationPreferencesActivity_disable">Çaktivizoje</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Ka ndodhur një gabim në lidhjen me serverin!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN-et kërkohen për mbylljen e regjistrimit. Për të çaktivizuar PIN-et, së pari çaktivizoni mbylljen e regjistrimit.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Kartelë</string>
     <string name="AttachmentKeyboard_contact">Kontakt</string>
     <string name="AttachmentKeyboard_location">Vendndodhje</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal ka nevojë për leje për të shfaqur fotot dhe videot</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly ka nevojë për leje për të shfaqur fotot dhe videot</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Lejoje Përdorimin</string>
     <string name="AttachmentKeyboard_payment">Pagesë</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Nuk gjendet një aplikacion për të përzgjedhur median.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal kërkon lejen e Storage për të bashkëngjitur foto, video ose audio, por i është refuzuar përgjithmonë. Ju lutemi, vazhdoni te menuja e parametrave të aplikacionit, zgjidhni \"Lejet\" dhe aktivizoni \"Storage\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal kërkon lejen e Kontakteve për të bashkangjitur informacionin e kontaktit, por i është refuzuar përgjithmonë. Ju lutemi, vazhdoni te menuja e parametrave të aplikacionit, zgjidhni \"Lejet\" dhe aktivizoni \"Kontaktet\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal kërkon lejen e Vendndodhjes për të bashkangjitur një vendndodhje, por i është refuzuar përgjithmonë. Ju lutemi, vazhdoni te menuja e parametrave të aplikacionit, zgjidhni \"Lejet\" dhe aktivizoni \"Vendndodhja\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly kërkon lejen e Storage për të bashkëngjitur foto, video ose audio, por i është refuzuar përgjithmonë. Ju lutemi, vazhdoni te menuja e parametrave të aplikacionit, zgjidhni \"Lejet\" dhe aktivizoni \"Storage\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly kërkon lejen e Kontakteve për të bashkangjitur informacionin e kontaktit, por i është refuzuar përgjithmonë. Ju lutemi, vazhdoni te menuja e parametrave të aplikacionit, zgjidhni \"Lejet\" dhe aktivizoni \"Kontaktet\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly kërkon lejen e Vendndodhjes për të bashkangjitur një vendndodhje, por i është refuzuar përgjithmonë. Ju lutemi, vazhdoni te menuja e parametrave të aplikacionit, zgjidhni \"Lejet\" dhe aktivizoni \"Vendndodhja\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Lejo aksesin në vendndodhje</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Për të dërguar vendndodhjen:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Lejo aksesin e Signal për të dërguar vendndodhjen.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Lejo aksesin e Molly për të dërguar vendndodhjen.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal-it i duhet të ketë akses tek vendndodhja në mënyrë që ta dërgojë atë.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly-it i duhet të ketë akses tek vendndodhja në mënyrë që ta dërgojë atë.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Lejo aksesin në hapësirën ruajtëse</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Për të shfaqur foto dhe video:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal ka nevojë për akses në hapësirën ruajtëse për të shfaqur fotot dhe videot.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly ka nevojë për akses në hapësirën ruajtëse për të shfaqur fotot dhe videot.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s nuk ka aktivizuar Pagesat </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Ndërroni kameran</string>
     <string name="CameraXFragment_open_gallery_description">Hap albumet</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Lejoje Përdorimin</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Lejo aksesin në kamera dhe mikrofon</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Lejo përdorimin e kamerës</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Lejo aksesin në mikrofon</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Për të bërë fotografi, lejoj aksesin nga Signal që të përdorë kamerën.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Për të bërë foto dhe video, lejo qasjen e Signal-it në kamerë.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Për të bërë foto dhe video, lejo përdorimin e kamerës dhe mikrofonit nga Signal.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Për të regjistruar video me zë, lejo përdorimin e mikrofonit nga Signal.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Për të skanuar kod QR, lejo përdorimin e kamerës nga Signal.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal duhet të aksesojë kamerën që të bëjë fotografi</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal duhet të aksesojë kamerën që të skanojë kode QR</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal duhet të aksesojë mikrofonin që të regjistrojë video</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Për të bërë foto në Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Për të bërë foto dhe video në Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Për të regjistruar video me zë:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Për të skanuar kodet QR:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Kontakte më të fundit</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Nuk ka kontakte të Signal</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Ju mund të përdorni vetëm butonin e kamerës për të dërguar foto te kontaktet e Signal-it. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Nuk mund ta gjeni dot atë që po kërkoni?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Ftoni një kontakt që t\'i bashkohet Signal-it</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Ftoni një kontakt që t\'i bashkohet Molly-it</string>
     <string name="CameraContacts__menu_search">Kërko</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Jo, faleminderit</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Përditësoni Signal-in</string>
+    <string name="ClientDeprecatedActivity_update_signal">Përditësoni Molly-in</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Ky version i aplikacionit nuk funksionon më. Për të vazhduar dërgimin dhe marrjen e mesazheve, përditësojeni atë në versionin më të fundit.</string>
     <string name="ClientDeprecatedActivity_update">Përditësoje</string>
     <string name="ClientDeprecatedActivity_dont_update">Mos e përditëso</string>
     <string name="ClientDeprecatedActivity_warning">Paralajmërim</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Versioni yt i Signal ka skaduar. Mund të shikosh historikun e mesazheve, por nuk do të mund të dërgosh ose marrësh mesazhe, derisa ta përditësosh.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Versioni yt i Molly ka skaduar. Mund të shikosh historikun e mesazheve, por nuk do të mund të dërgosh ose marrësh mesazhe, derisa ta përditësosh.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Nuk u gjet asnjë shfletues ueb.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">%1$s mesazhi</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Thirrje zanore në Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Thirrje me video në Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Mesazh Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Dërgoni mesazh</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Le të kalojmë tek Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Le të kalojmë tek Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Ju lutemi, zgjidhni një kontakt</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Bashkëngjitja tejkalon kufijtë e madhësisë për llojin e mesazhit që po dërgoni.</string>
     <string name="ConversationActivity_unable_to_record_audio">Nuk mund të regjistrohet audio!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Për të dërguar mesazhe me audio:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Për të dërguar mesazhe zanore, lejo aksesin e Signal në mikrofon.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Për të dërguar mesazhe zanore, lejo aksesin e Molly në mikrofon.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal duhet të aksesojë mikrofonin që të regjistrojë mesazhe zanore.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal kërkon lejen e aktivizimit të Mikrofonit për të dërguar mesazhe audio, por është i mbyllur përgjithmonë. Ju lutemi, vazhdoni te parametrat e aplikacionit, zgjidhni \"Lejet\" dhe aktivizoni \"Mikrofoni\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly duhet të aksesojë mikrofonin që të regjistrojë mesazhe zanore.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly kërkon lejen e aktivizimit të Mikrofonit për të dërguar mesazhe audio, por është i mbyllur përgjithmonë. Ju lutemi, vazhdoni te parametrat e aplikacionit, zgjidhni \"Lejet\" dhe aktivizoni \"Mikrofoni\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal ka nevojë për lejet e aktivizimit të mikrofonit dhe të kamerës për të telefonuar%1$s, por janë mbyllur përgjithmonë. Ju lutemi, vazhdoni te parametrat e aplikacionit, zgjidhni \"Lejet\" dhe aktivizoni \"Mikrofoni\" dhe \"Kamera\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Për të bërë foto dhe video, lejo qasjen e Signal-it në kamerë.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal ka nevojë për lejen e aktivizimit të kamerës për të bërë foto ose video, por është i mbyllur përgjithmonë. Ju lutemi, vazhdoni te parametrat e aplikacionit, zgjidhni \"Lejet\" dhe aktivizoni \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal ka nevojë për lejet e aktivizimit të kamerës për të bërë foto ose video</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly ka nevojë për lejet e aktivizimit të mikrofonit dhe të kamerës për të telefonuar%1$s, por janë mbyllur përgjithmonë. Ju lutemi, vazhdoni te parametrat e aplikacionit, zgjidhni \"Lejet\" dhe aktivizoni \"Mikrofoni\" dhe \"Kamera\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Për të bërë foto dhe video, lejo qasjen e Molly-it në kamerë.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly ka nevojë për lejen e aktivizimit të kamerës për të bërë foto ose video, por është i mbyllur përgjithmonë. Ju lutemi, vazhdoni te parametrat e aplikacionit, zgjidhni \"Lejet\" dhe aktivizoni \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly ka nevojë për lejet e aktivizimit të kamerës për të bërë foto ose video</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Aktivizo lejen e mikrofonit për të bërë video me zë.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal ka nevojë për lejet e aktivizimit të mikrofonit për të regjistruar video, por ato janë refuzuar. Ju lutemi, vazhdoni te parametrat e aplikacionit, zgjidhni \"Lejet\" dhe aktivizoni \"Mikrofoni\" dhe \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal ka nevojë për lejet e aktivizimit të mikrofonit për të regjistruar video.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly ka nevojë për lejet e aktivizimit të mikrofonit për të regjistruar video, por ato janë refuzuar. Ju lutemi, vazhdoni te parametrat e aplikacionit, zgjidhni \"Lejet\" dhe aktivizoni \"Mikrofoni\" dhe \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly ka nevojë për lejet e aktivizimit të mikrofonit për të regjistruar video.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Jo</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Për të nisur telefonatën:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Për të bërë një telefonatë, lejo aksesin e Signal në mikrofon.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Për të bërë një telefonatë, lejo aksesin e Molly në mikrofon.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal duhet të aksesojë mikrofonin që të nisë një telefonatë.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly duhet të aksesojë mikrofonin që të nisë një telefonatë.</string>
 
 
     <string name="ConversationActivity_join">Bashkohu</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Mesazhet SMS nuk mbështeten më nga Signal. Fto %1$s te Signal për ta vazhduar bisedën këtu.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Ky person nuk përdor më Signal. Ftoji në Signal për ta vazhduar bisedën këtu.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Ky person nuk përdor më Molly. Ftoji në Molly për ta vazhduar bisedën këtu.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Ftoje në Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Ftoje në Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Së shpejti do të kujtoheni përsëri.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Fshije për të gjithë</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Fshije në këtë pajisje</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Fshiji</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Fshije kudo</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Ky mesazh do të fshihet për të gjithë në bisedë, nëse janë të gjithë në të njëjtin version të fundit të Signal. Ata do të mund të shohin që ke fshirë një mesazh.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Bllokuar</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Përditësoni Signal-in</string>
+    <string name="ConversationFragment__update_build">Përditësoni Molly-in</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Regjistro sërish Signal</string>
+    <string name="ConversationFragment__reregister_signal">Regjistro sërish Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Lundro prapa.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Hap Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Hap Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Nuk verifikohet më</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Kjo do të fshijë përgjithmonë bisedën e përzgjedhur.</item>
         <item quantity="other">Kjo do të fshijë përgjithmonë të gjitha %1$d bisedat e përzgjedhura.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Kjo do të fshijë përgjithmonë bisedën e zgjedhur nga të gjitha pajisjet.</item>
+        <item quantity="other">Kjo do të fshijë përgjithmonë të gjitha %1$d bisedat e zgjedhura nga të gjitha pajisjet.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Po fshihet</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Duke fshirë bisedën e zgjedhur…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Kush mund të më gjejë nëpërmjet numrit?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Kushdo që e ka numrin tënd të telefonit do të shohë se ti ke Signal dhe mund të të shkruajë.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Kushdo që e ka numrin tënd të telefonit do të shohë se ti ke Molly dhe mund të të shkruajë.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Askush nuk do të shohë se je në Signal nëse nuk dërgon mesazhe ose nëse nuk ke biseda ekzistuese.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Askush nuk do të shohë se je në Molly nëse nuk dërgon mesazhe ose nëse nuk ke biseda ekzistuese.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Të rikthehet prej kopjeruajtjeje?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Testoni frazëkalimin tuaj për kopjeruajtjen dhe verifikoni që përputhet</string>
     <string name="BackupsPreferenceFragment__turn_on">Aktivizoje</string>
     <string name="BackupsPreferenceFragment__turn_off">Çaktivizoje</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Që të riktheni një kopjeruajtje, instaloni një kopje të re të Signal-it. Hapni aplikacionin dhe prekni “Riktheni kopjeruajtje”, mandej lokalizoni një kartelë kopjeruajtjeje. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Që të riktheni një kopjeruajtje, instaloni një kopje të re të Molly-it. Hapni aplikacionin dhe prekni “Riktheni kopjeruajtje”, mandej lokalizoni një kartelë kopjeruajtjeje. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Mësoni më shumë</string>
     <string name="BackupsPreferenceFragment__in_progress">Në proçes…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d deri më tani…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% deri më tani…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Që të mund të krijohen kopjeruajtje, Signal kërkon leje mbi depozitë të jashtme, por kjo i është mohuar. Ju lutemi, kaloni te parametrat e aplikacionit, përzgjidhni \"Leje\" dhe aktivizoni \"Depozitim\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Që të mund të krijohen kopjeruajtje, Molly kërkon leje mbi depozitë të jashtme, por kjo i është mohuar. Ju lutemi, kaloni te parametrat e aplikacionit, përzgjidhni \"Leje\" dhe aktivizoni \"Depozitim\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Vendos kohën e kopjeruajtjes</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Sesioni i bisedës u rifreskua</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal përdor kodimin nga skaji në skaj dhe ndonjëherë mund t\'i duhet të rifreskojë seancën tënde të bisedës. Kjo nuk ndikon në sigurinë e bisedës, por mund të kesh humbur një mesazh nga ky kontakt dhe mund t\'i kërkosh që ta ridërgojë.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly përdor kodimin nga skaji në skaj dhe ndonjëherë mund t\'i duhet të rifreskojë seancën tënde të bisedës. Kjo nuk ndikon në sigurinë e bisedës, por mund të kesh humbur një mesazh nga ky kontakt dhe mund t\'i kërkosh që ta ridërgojë.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Përdor Signal në Desktop ose iPad. Mesazhet do të sinkronizohen me pajisjet e lidhura.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Lidh një pajisje të re</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Mesazhet dhe informacionet e bisedës mbrohen nga kodimi skaji më skaj në të gjitha pajisjet</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal në Desktop ose iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Të gjitha mesazhet në pajisjet e lidhura janë private</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Mesazhet e Molly sinkronizohen me Molly në telefonin tënd pasi të jetë lidhur. Historiku i mëparshëm i mesazheve nuk do të shfaqet.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Në pajisjen tënde tjetër, vizito %1$s për të instaluar Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Pajisjet e mia të lidhura</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Shkëpute</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s u shkëput</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Pajisja po lidhet…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Pajisja u miratua</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Po ngarkohet…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Nuk ka pajisje të lidhura</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Zhblloko për të lidhur një pajisje</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Skano kodin QR të shfaqur te pajisja që do të lidhësh.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Skanoni kodin QR</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Përdor këtë pajisje për të skanuar kodin QR të shfaqur në pajisjen që dëshiron të lidhësh</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">OK</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Kjo pajisje do të jetë në gjendje të shohë grupet dhe kontaktet tuaj, të hyjë në fjalosjet tuaja, dhe të dërgojë mesazhe në emrin tuaj.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Përfundo lidhjen në pajisjen tjetër</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Përfundo lidhjen e Molly në pajisjen tjetër.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Lidhja e Pajisjes Dështoi</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Ky kod QR s’është i vlefshëm. Ju lutemi, sigurohuni se po skanoni kodin QR që shfaqet te pajisja të cilën doni të lidhni.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Riprovo</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Të shkëputet \'%1$s\'?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimizoje për Shërbime Play që mungojnë</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Kjo pajisje nuk i mbulon shërbimet e Play. Klikoni për të çaktivizuar optimizimet e baterisë së sistemit që pengojnë Signal-in të marrë mesazhe kur është joaktiv.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Kjo pajisje nuk i mbulon shërbimet e Play. Klikoni për të çaktivizuar optimizimet e baterisë së sistemit që pengojnë Molly-in të marrë mesazhe kur është joaktiv.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Ky version i Signal-it ka skaduar. Që të dërgoni dhe merrni mesazhe, përditësojeni që tani.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Ky version i Molly-it ka skaduar. Që të dërgoni dhe merrni mesazhe, përditësojeni që tani.</string>
     <string name="ExpiredBuildReminder_update_now">Përditësoje tani</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Shihni</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Dështim i përhershëm komunikimi nga Signal!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal s’arriti të bëjë regjistrimin me Google Play Services. Mesashet dhe thirrjet Signal janë çaktivizuar, ju lutemi, provoni riregjistrimin që nga Parametrat &gt; Të mëtejshme.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Dështim i përhershëm komunikimi nga Molly!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly s’arriti të bëjë regjistrimin me Google Play Services. Mesashet dhe thirrjet Molly janë çaktivizuar, ju lutemi, provoni riregjistrimin që nga Parametrat &gt; Të mëtejshme.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Regjistrat e korrigjimit të gabimeve na ndihmojnë të diagnostikojmë dhe rregullojmë problemin dhe nuk përmbajnë informacion identifikues.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal hasi në një problem. Të paraqitet regjistri i korrigjimit?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly hasi në një problem. Të paraqitet regjistri i korrigjimit?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Njoftimet mund të vonohen për shkak të optimizimeve të baterisë</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Mund të çaktivizoni optimizimet e baterisë për Signal për t\'u siguruar që njoftimet e mesazheve nuk do të vonohen.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Mund të çaktivizoni optimizimet e baterisë për Molly për t\'u siguruar që njoftimet e mesazheve nuk do të vonohen.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Njoftimet mund të vonohen për shkak të optimizimeve të baterisë</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Mund të çaktivizosh optimizimet e baterisë për Molly për t\'u siguruar që njoftimet e mesazheve nuk do të vonohen. Kliko \"Vazhdo\" për të parë udhëzimet specifike të pajisjes.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Jo, faleminderit</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Vazhdo</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Vazhdo</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Kaloje</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Jo, faleminderit</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Ftesa për në grupe pezull</string>
+    <string name="PendingMembersActivity_pending_group_invites">Kërkesa &amp; ftesa</string>
     <string name="PendingMembersActivity_requests">Kërkesat</string>
     <string name="PendingMembersActivity_invites">Ftesat</string>
     <string name="PendingMembersActivity_people_you_invited">Persona që ju keni ftuar</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Anuloje</string>
     <string name="InviteActivity_sending">Po dërgohet…</string>
     <string name="InviteActivity_invitations_sent">Ftesat u dërguan!</string>
-    <string name="InviteActivity_invite_to_signal">Ftojeni në Signal</string>
+    <string name="InviteActivity_invite_to_signal">Ftojeni në Molly</string>
     <string name="InviteActivity_send_sms">Dërgo SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Të dërgohet %1$d ftesë SMS?</item>
         <item quantity="other">Të dërgohen %1$d ftesa SMS?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Le të kalojmë në Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Le të kalojmë në Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Duket sikur s\\’keni aplikacione me të cilat të ndani.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Mesazhi juaj</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">U aktivizua lidhja në prapaskenë</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Përgjigje</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Po bëhet thirrje Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">Po bëhet thirrje Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Po fillon shërbimi i thirrjes telefonike i Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Po ndalet shërbimi Signal i thirrjeve</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Po fillon shërbimi i thirrjes telefonike i Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Po ndalet shërbimi Molly i thirrjeve</string>
     <string name="NotificationBarManager__cancel_call">Anuloje thirrjen</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Aktivizove Pagesat</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s tani mund të pranojë pagesat</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Detajet e pagesës nuk janë të disponueshme</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Për Më Tepër, Prekeni</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Detajet e pagesës nuk disponohen</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Detajet e pagese nuk disponohen pasi mesazhet u rikthyen nga një burim, i cili nuk e përmbante këtë histori pagese. Kjo nuk ndikon në bilancin e portofolit ose në statusin e pagesave të mëparshme.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Së shpejti nuk do të mund të dërgosh më mesazhe SMS nga Signal. Fto %1$s te Signal për ta vazhduar bisedën këtu.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Nuk mund të dërgosh më mesazhe SMS në Signal. Fto %1$s te Signal për ta mbajtur bisedën këtu.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Nuk mund të dërgosh më mesazhe SMS në Molly. Fto %1$s te Molly për ta mbajtur bisedën këtu.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Pagesë: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Pagesa</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Raportuar si mesazh i padëshiruar</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Të lidhet një pajisje Signal?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Duket sikur po provoni të lidhni një pajisje Signal duke përdorur skaner të një pale të tretë. Si masë mbrojtëse, ju lutemi, riskanojeni kodin që nga brenda Signal-it.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Që të mund të skanojë një kod QR, Signal lyp leje përdorimi të Kamerës, por kjo i është mohuar. Ju lutemi, kaloni te parametrat e aplikacionit, përzgjidhni \"Leje\", dhe aktivizoni \"Kamerën\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Që të mund të skanojë një kod QR, Molly lyp leje përdorimi të Kamerës, por kjo i është mohuar. Ju lutemi, kaloni te parametrat e aplikacionit, përzgjidhni \"Leje\", dhe aktivizoni \"Kamerën\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">S\\’arrihet të skanohet kod QR pa leje mbi Kamerën</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Jepni frazëkalimin</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Ikona e Signal-it</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Ikona e Molly-it</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Parashtroje frazëkalimin</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Frazëkalim i pavlefshëm!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Shkyçe Signal-in</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Kyçje Ekrani</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Shkyçe Molly-in</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Kyçje Ekrani</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Hartë</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Verifikojeni, që të vazhdoni shkëmbim mesazhesh</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Që të ndihmoni të pengohen në Signal mesazhe të padëshiruar, ju lutemi, plotësoni verifikimin.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Që të ndihmoni të pengohen në Molly mesazhe të padëshiruar, ju lutemi, plotësoni verifikimin.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Pas verifikimit, mund të vazhdoni të shkëmbeni mesazhe. Çfarëdo mesazhesh të ndalur do të dërgohen automatikisht.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Postimi im i përkohshëm</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Thirrje përmes Signal</string>
+    <string name="Recipient_signal_call">Thirrje përmes Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Blloko</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Po i bihet ziles…</string>
     <string name="RedPhone_busy">I zënë</string>
     <string name="RedPhone_recipient_unavailable">Marrësi s\'është në gjendje</string>
-    <string name="RedPhone_network_failed">Dështoi rrjeti!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Dështoi rrjeti! Të lutem, kontrollo lidhjen me rrjetin dhe riprovo.</string>
     <string name="RedPhone_number_not_registered">Numër i paregjistruar!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Numri që thirrët nuk mbulon thirrje me zë të sigurta!</string>
     <string name="RedPhone_got_it">E kuptova</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Prekeni këtu që të ktheni te videoja juaj</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Për të thirrur %1$s, Signal-i lyp leje përdorimi të kamerës tuaj</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Për të thirrur %1$s, Molly-i lyp leje përdorimi të kamerës tuaj</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Po thirret…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Po rilidhet…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">U hoq nga telefonata</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Dikush të ka hequr nga telefonata.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Lejo aksesin në kamera dhe mikrofon</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Lejo aksesin në mikrofon</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Lejo përdorimin e kamerës</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Për të bërë ose për t\'iu bashkuar një telefonate, jepi akses Molly në kamera dhe mikrofon.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Për të bërë ose për t\'iu bashkuar një telefonate, jepi akses Molly në mikrofon.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Për të aktivizuar videon, jepi akses Molly te kamera.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly ka nevojë për leje përdorimi të mikrofonit për të nisur ose për t\'iu bashkuar një telefonate.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly duhet të ketë akses te kamera për të aktivizuar videon</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Për të filluar ose për t\'iu bashkuar një telefonate:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Për të aktivizuar videon:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Thirrje Signal</string>
-    <string name="WebRtcCallView__signal_video_call">Thirrje Signal Me Video</string>
+    <string name="WebRtcCallView__signal_call">Thirrje Molly</string>
+    <string name="WebRtcCallView__signal_video_call">Thirrje Molly Me Video</string>
     <string name="WebRtcCallView__start_call">Nise Thirrjen</string>
     <string name="WebRtcCallView__join_call">Hyni në Thirrje</string>
     <string name="WebRtcCallView__call_is_full">Thirrja është plot</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Ul dorën?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Ul dorën</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Ul</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Anulo</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Ke ngritur dorën</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Shihni</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s ka ngritur dorën</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s ngriti dorën</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d ngritët dorën</item>
+        <item quantity="other">%1$s + %2$d kanë ngritur dorën</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s ngriti dorën</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d ngritët dorën</item>
         <item quantity="other">%1$s + %2$d kanë ngritur dorën</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Do t\\’ju vijë një thirrje për të verifikuar këtë numër.</string>
     <string name="RegistrationActivity_edit_number">Modifiko numrin</string>
     <string name="RegistrationActivity_missing_google_play_services">Mungojnë Shërbimet Google Play</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Në këtë pajisje mungojnë Shërbimet Google Play. Mundeni prapëseprapë ta përdorni Signal-in, por ky formësim mund të sjellë qëndrueshmëri ose funksionim të reduktuar.\n\nNëse s\\’jeni përdorues i përparuar, s\\’po përdorni një ROM Android të modifikuar, ose besoni se po e shihni gabimisht këtë, ju lutemi, lidhuni me support@signal.org për ndihmë në diagnostikikim.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Në këtë pajisje mungojnë Shërbimet Google Play. Mundeni prapëseprapë ta përdorni Molly-in, por ky formësim mund të sjellë qëndrueshmëri ose funksionim të reduktuar.\n\nNëse s\\’jeni përdorues i përparuar, s\\’po përdorni një ROM Android të modifikuar, ose besoni se po e shihni gabimisht këtë, ju lutemi, lidhuni me support@molly.im për ndihmë në diagnostikikim.</string>
     <string name="RegistrationActivity_i_understand">E kuptoj</string>
     <string name="RegistrationActivity_play_services_error">Gabim nga Shërbime Play</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Shërbimet Google Play po përditësohen ose janë përkohësisht jashtë funksionimi. Ju lutemi, riprovoni.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Format jostandard numrash</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Numri që dhatë (%1$s) duket të jetë në një format jo standard.\n\nKishit ndërmend %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Formati i numrit të telefonit</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Formati i numrit të telefonit</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">U kërkua thirrje</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Ke probleme me regjistrimin?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Sigurohu që telefoni yt të ketë sinjal celular për të marrë SMS ose thirrje • Konfirmo se mund të marrësh telefonata në numër\n • Kontrollo nëse ke vendosur saktë numrin tënd të telefonit.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Për më shumë informacion, ndiqni këto hapa për zgjidhjen e problemeve ose kontaktoni me asistencën</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Për më shumë informacion, ndiq %1$s ose %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">me këto hapa për zgjidhjen e problemeve</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Shtoje te Kontaktet</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Ftoje në Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Ftoje në Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Mesazhe Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Thirrje përmes Signal-i</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Shtoje te Kontakte</string>
-    <string name="SharedContactView_invite_to_signal">Ftoje në Signal</string>
+    <string name="SharedContactView_invite_to_signal">Ftoje në Molly</string>
     <string name="SharedContactView_message">Mesazhe Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s i përket %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Përditësim i Signal-it</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Një version i ri i Signal është i disponueshëm. Kliko për ta përditësuar.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal nuk u përditësua</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Përditësim i Molly-it</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Një version i ri i Molly është i disponueshëm. Kliko për ta përditësuar.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly nuk u përditësua</string>
     <string name="ApkUpdateNotifications_failed_general_body">Do të provojmë përsëri më vonë.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal u përditësua me sukses</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly u përditësua me sukses</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Je përditësuar automatikisht në versionin %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Numri ynë i sigurisë për Signal:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Duket se s\\’keni ndonjë aplikacion me të cilin të ndahet.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Në të papastër s\\’u gjet numër sigurie për krahasim</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Që të mund të skanojë një kod QR, Signal kërkon leje përdorimi të Kamerës, por kjo i është mohuar. Ju lutemi, kaloni te parametrat e aplikacionit, përzgjidhni \"Leje\", dhe aktivizoni \"Kamera\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Që të mund të skanojë një kod QR, Molly kërkon leje përdorimi të Kamerës, por kjo i është mohuar. Ju lutemi, kaloni te parametrat e aplikacionit, përzgjidhni \"Leje\", dhe aktivizoni \"Kamera\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">S\\’arrihet të skanohet kodi QR pa lejim të kamerës</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">You must first exchange messages Që të mund të shihni numrin e sigurisë për %1$s, së pari duhet të shkëmbeni mesazhe.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Prekeni për ta hapur.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal-i u shkyç</string>
-    <string name="KeyCachingService_lock">Kyçe Signal-in</string>
+    <string name="KeyCachingService_passphrase_cached">Molly-i u shkyç</string>
+    <string name="KeyCachingService_lock">Kyçe Molly-in</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Ju</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Lloj media i pambuluar</string>
     <string name="MediaPreviewActivity_draft">Skicë</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Për të ruajtur gjëra në depozitë të jashtme, Signal kërkon leje Depozitimi, por kjo i është mohuar. Ju lutemi, kaloni te parametrat e aplikacionit, përzgjidhni \"Leje\", dhe aktivizoni \"Depozitim\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Për të ruajtur gjëra në depozitë të jashtme, Molly kërkon leje Depozitimi, por kjo i është mohuar. Ju lutemi, kaloni te parametrat e aplikacionit, përzgjidhni \"Leje\", dhe aktivizoni \"Depozitim\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">S\\’bëhet dot ruajtje në depozitë të jashtme pa leje</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Të fshihet mesazhi?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Kjo do ta fshijë përgjithmonë këtë mesazh.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">S\\’u arrit të dërgohej mesazhi.</string>
     <string name="MessageNotifier_error_delivering_message">Gabim në dërgimin e mesazhit.</string>
     <string name="MessageNotifier_message_delivery_paused">U ndal dërgimi i mesazheve.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Që të vazhdoni të shkëmbeni mesazhe në Signal, verifikojeni.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Që të vazhdoni të shkëmbeni mesazhe në Molly, verifikojeni.</string>
     <string name="MessageNotifier_mark_all_as_read">Vëru shenjë të gjithëve si të lexuar</string>
     <string name="MessageNotifier_mark_read">Vëri shenjë si të lexuar</string>
     <string name="MessageNotifier_turn_off_these_notifications">Çaktivizoji këto njoftime</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Reagoi me %1$s ndaj ngjitësit tënd.</string>
     <string name="MessageNotifier_this_message_was_deleted">Ky mesazh u fshi.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Të çaktivizohen njoftime Signal për kontakte të sapoardhur? Mund t’i aktivizoni sërish që nga Signal &gt; Parametrat &gt; Njoftime.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Të çaktivizohen njoftime Molly për kontakte të sapoardhur? Mund t’i aktivizoni sërish që nga Molly &gt; Parametrat &gt; Njoftime.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">S\\’bëhet dot përgjigje e shpejtë, kur Signal-i është i kyçur!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">S\\’bëhet dot përgjigje e shpejtë, kur Molly-i është i kyçur!</string>
     <string name="QuickResponseService_problem_sending_message">Problem në dërgim mesazhi!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Shkurtore e pavlefshme</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Mesazh i ri</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Kërkesë mesazhi</string>
     <string name="SingleRecipientNotificationBuilder_you">Ju</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Kjo pajisje nuk është më e regjistruar. Ka të ngjarë sepse e ke regjistruar numrin tënd të telefonit në Signal në një pajisje tjetër.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Kjo pajisje nuk është më e regjistruar. Ka të ngjarë sepse e ke regjistruar numrin tënd të telefonit në Molly në një pajisje tjetër.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Regjistro sërish pajisjen</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Që t’i përgjigjeni thirrjes, jepini Signal-it leje të përdorë mikrofonin tuaj.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Që t’i përgjigjeni thirrjes, jepini Molly-it leje të përdorë mikrofonin tuaj.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Që t\'i përgjigjesh thirrjes me video, jepi leje Signal të përdorë mikrofonin dhe kamerën.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Që të bëjë ose pranojë thirrje, Signal kërkon leje mbi Mikrofonin dhe Kamerën, por këto i janë mohuar. Ju lutemi, kaloni te parametrat e aplikacionit, përzgjidhni \"Leje\", dhe aktivizoni \"Mikrofonin\" dhe \"Kamerën\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Që t\'i përgjigjesh thirrjes me video, jepi leje Molly të përdorë mikrofonin dhe kamerën.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Që të bëjë ose pranojë thirrje, Molly kërkon leje mbi Mikrofonin dhe Kamerën, por këto i janë mohuar. Ju lutemi, kaloni te parametrat e aplikacionit, përzgjidhni \"Leje\", dhe aktivizoni \"Mikrofonin\" dhe \"Kamerën\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">U përgjigj në një pajisje të lidhur.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Hedhur tej në një pajisje të lidhur.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">I zënë në një pajisje të lidhur.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Përsëritni frazëkalimin e ri</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Ftojeni në Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Ftojeni në Molly</string>
     <string name="contact_selection_activity__new_group">Grup i ri</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Rifresko kontaktet</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">A të mungon njeri? Provo të rifreskosh</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Gjej njerëzit që njeh në Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Lejo aksesin te kontaktet</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Më shumë</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Foto Kontakti</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Që të mund të shfaqë kontaktet tuaja, Signal kërkon leje mbi Kontaktet, por këto i janë mohuar. Ju lutemi, kaloni te menuja e parametrave të aplikacionit, përzgjidhni \"Leje\", dhe aktivizoni \"Kontakte\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Që të mund të shfaqë kontaktet tuaja, Molly kërkon leje mbi Kontaktet, por këto i janë mohuar. Ju lutemi, kaloni te menuja e parametrave të aplikacionit, përzgjidhni \"Leje\", dhe aktivizoni \"Kontakte\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Gabim në marrje kontaktesh, kontrolloni lidhjen tuaj në rrjet</string>
     <string name="ContactSelectionListFragment_username_not_found">Emri i përdoruesit nuk u gjet</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" nuk është përdorues i Signal Ju lutemi, kontrollo emrin e përdoruesit dhe riprovo."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Gjeni sipas emrit të përdoruesit</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Lejo aksesin te kontaktet</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Për të gjetur njerëzit që njeh në Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Lejoje Përdorimin</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Jo, faleminderit</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Lejo aksesin te kontaktet. Kontaktet janë të koduara dhe nuk janë të dukshme për shërbimin e Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Që të mund t\\’i shfaqë, Signal-i lyp leje përdorimi të kontakteve.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Që të mund t\\’i shfaqë, Molly-i lyp leje përdorimi të kontakteve.</string>
     <string name="contact_selection_list_fragment__show_contacts">Shfaq Kontaktet</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">E ke hequr këtë person dhe duke i dërguar mesazhe sërish do ta rishtosh atë në listën tënde.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Opsione</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Përditësoje</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Luaje … Pauzë</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Flluskat janë një veçori e Android që mund ta çaktivizosh për bisedat në Signal.</string>
+    <string name="BubbleOptOutTooltip__description">Flluskat janë një veçori e Android që mund ta çaktivizosh për bisedat në Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Jo tani</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Përshkrim grupi</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Përditësoni Signal-in</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Përditësoni Molly-in</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Ky version i Signal ka skaduar. Përditëso tani për të vazhduar përdorimin e Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Ky version i Molly ka skaduar. Përditëso tani për të vazhduar përdorimin e Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Përditësoje</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">I ngadaltë</string>
     <string name="preferences__help">Ndihmë</string>
     <string name="preferences__advanced">Të mëtejshme</string>
-    <string name="preferences__donate_to_signal">Dhuro për Signal</string>
+    <string name="preferences__donate_to_signal">Dhuro për Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Privatësi</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Ndrysho ikonën dhe emrin e aplikacionit në \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal do të duhet të mbyllet për të ndryshuar ikonën dhe emrin e aplikacionit. Njoftimet do të shfaqin gjithmonë ikonën dhe emrin e paracaktuar të Signal.</string>
+    <string name="preferences__app_icon_dialog_description">Molly do të duhet të mbyllet për të ndryshuar ikonën dhe emrin e aplikacionit. Njoftimet do të shfaqin gjithmonë ikonën dhe emrin e paracaktuar të Molly.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Zgjidh një ikonë dhe një emër aplikacioni, i cili do të jetë i dukshëm në ekranin bazë të telefonit tënd dhe në skedarin e aplikacionit. Njoftimet do të shfaqin gjithmonë ikonën dhe emrin e paracaktuar të Signal. Mëso më shumë</string>
+    <string name="preferences__app_icon_warning_learn_more">Zgjidh një ikonë dhe një emër aplikacioni, i cili do të jetë i dukshëm në ekranin bazë të telefonit tënd dhe në skedarin e aplikacionit. Njoftimet do të shfaqin gjithmonë ikonën dhe emrin e paracaktuar të Molly. Mëso më shumë</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Ikonat dhe emrat e aplikacioneve janë të dukshme në ekranin bazë dhe në skedarin e aplikacioneve.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Njoftimet do të shfaqin gjithmonë ikonën dhe emrin e paracaktuar të Signal.</string>
+    <string name="preferences__app_icon_notification_warning">Njoftimet do të shfaqin gjithmonë ikonën dhe emrin e paracaktuar të Molly.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Mëso më shumë</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Kjo do t\'i shkurtojë përgjithmonë të gjitha bisedat te %1$s mesazhet më të fundit.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Kjo do të fshijë përgjithmonë të gjithë historikun e mesazheve dhe mediat nga pajisja jote.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Kjo do të fshijë përgjithmonë të gjithë historikun e mesazheve dhe median e kësaj pajisjeje dhe çdo pajisjeje tjetër të lidhur.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Je i sigurt se dëshiron të fshish krejt historikun e mesazheve?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">I gjithë historiku i mesazheve do të hiqet përgjithmonë. Ky veprim nuk mund të zhbëhet.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">I gjithë historiku i mesazheve do të fshihet përgjithmonë nga të gjitha pajisjet. Ky veprim nuk mund të zhbëhet.</string>
     <string name="preferences_storage__delete_all_now">Fshije krejt tani</string>
     <string name="preferences_storage__forever">Përgjithmonë</string>
     <string name="preferences_storage__one_year">1 vit</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Anashkalim censurimi</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Anashkalim censurimi</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Në u aktivizoftë, Signal-i do të përpiqet të anashkalojë censurime. Mos e aktivizoni këtë veçori, po qe se nuk gjendeni diku ku Signal-i censurohet.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Në u aktivizoftë, Molly-i do të përpiqet të anashkalojë censurime. Mos e aktivizoni këtë veçori, po qe se nuk gjendeni diku ku Molly-i censurohet.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Anashkalimi i censurimit është aktivizuar për numrin e telefonit të llogarisë tuaj.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Ju prezantojmë pagesat</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Përdor Signal për të dërguar dhe për të marrë MobileCoin, një monedhë e re digjitale e fokusuar te privatësia. Që t’ia fillosh, aktivizoje.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Përdor Molly për të dërguar dhe për të marrë MobileCoin, një monedhë e re digjitale e fokusuar te privatësia. Që t’ia fillosh, aktivizoje.</string>
     <string name="PaymentsHomeFragment__activate_payments">Pagesa</string>
     <string name="PaymentsHomeFragment__activating_payments">Po aktivizohen pagesa…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Riktheni llogari pagesash</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Pagesat s\\’janë të përdorshme në rajonin tuaj.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">S\\’u aktivizuan dot pagesat. Riprovoni më vonë.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Të çaktivizohen Pagesa?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">S\\’do të jeni në gjendje të dërgoni ose merrni Mobilecoin në Signal, nëse çaktivizoni pagesat.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">S\\’do të jeni në gjendje të dërgoni ose merrni Mobilecoin në Molly, nëse çaktivizoni pagesat.</string>
     <string name="PaymentsHomeFragment__deactivate">Çaktivizoje</string>
     <string name="PaymentsHomeFragment__continue">Vazhdo</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Depozitë aktualisht jo e përdorshme.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Hollësi</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Mund të përdorësh Signal për të dërguar dhe për të marrë MobileCoin. Të gjitha pagesat i nënshtrohen kushteve të përdorimit për MobileCoins dhe Portofolin MobileCoin. Mund të hasni disa probleme dhe pagesat ose bilancet që mund të humbni nuk mund të rikuperohen. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Mund të përdorësh Molly për të dërguar dhe për të marrë MobileCoin. Të gjitha pagesat i nënshtrohen kushteve të përdorimit për MobileCoins dhe Portofolin MobileCoin. Mund të hasni disa probleme dhe pagesat ose bilancet që mund të humbni nuk mund të rikuperohen. </string>
     <string name="PaymentsHomeFragment__activate">Aktivizoje</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Shihni kushte MobileCoin-i</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Pagesat në Signal s\\’janë më të përdorshme. Mundeni ende të shpërngulni fonde në një platformë, por s\\’mund të dërgoni apo merrni më pagesa, apo të shtoni fonde.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Pagesat në Molly s\\’janë më të përdorshme. Mundeni ende të shpërngulni fonde në një platformë, por s\\’mund të dërgoni apo merrni më pagesa, apo të shtoni fonde.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Lejo lejet</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Për të të ndihmuar t\'u dërgosh mesazh njerëzve që njeh, Signal do t\'i kërkojë këto leje. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Për të të ndihmuar t\'u dërgosh mesazh njerëzve që njeh, Molly do t\'i kërkojë këto leje. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Njoftime</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Tjetër</string>
     <string name="PaymentsTransferFragment__invalid_address">Adresë e pavlefshme</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Kontrolloni adresën e portofolit që po përpiqeni të shpërngulni dhe riprovoni.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">S\\’mund të shpërngulni te adresa e portofolit tuaj Signal. Jepni adresën e portofolit prej llogarisë tuaj në një platformë që mbulohet.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Që të skanohet një kod QR, Signal-i ka nevojë të përdorë kamerën.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal i duhet leje përdorimi Kamere për të marrë një kod QR. Kaloni te parametrat, përzgjidhni “Leje”, dhe aktivizoni “Kamera”.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Që të skanohet një kod QR, Signal-i ka nevojë të përdorë kamerën.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">S\\’mund të shpërngulni te adresa e portofolit tuaj Molly. Jepni adresën e portofolit prej llogarisë tuaj në një platformë që mbulohet.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Që të skanohet një kod QR, Molly-i ka nevojë të përdorë kamerën.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly i duhet leje përdorimi Kamere për të marrë një kod QR. Kaloni te parametrat, përzgjidhni “Leje”, dhe aktivizoni “Kamera”.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Që të skanohet një kod QR, Molly-i ka nevojë të përdorë kamerën.</string>
     <string name="PaymentsTransferFragment__settings">Parametrat</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Thirrje zanore hyrëse në Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Thirrje zanore hyrëse në Molly</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Thirrje video hyrëse në Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Thirrje video hyrëse në Molly</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Thirrje ardhëse për grup Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Thirrje ardhëse për grup Molly</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Thirrje zanore në Signal në vijim</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Thirrje zanore në Molly në vijim</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Thirrje video në Signal në vijim</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Thirrje video në Molly në vijim</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Thirrje në grup në Signal në vijim</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Thirrje në grup në Molly në vijim</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Po ngarkohet…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Verifikoje</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">E dhatë me sukses frazëkalimin tuaj të kopjeruajtjes</string>
     <string name="BackupDialog_passphrase_was_not_correct">Frazëkalimi s\\’qe i saktë</string>
-    <string name="LocalBackupJob_creating_signal_backup">Po krijohet kopjeruajtje Signal-i…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Po krijohet kopjeruajtje Molly-i…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Duke verifikuar rezervat e Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Duke verifikuar rezervat e Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">Kopjeruajtja dështoi</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Drejtoria juaj e kopjeruajtjeve është fshirë ose lëvizur.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Kartela e kopjeruajtjes tuaj është shumë e madhe për t\\’u depozituar në këtë vëllim.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Më telefono (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Ridërgo kodin (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Lidhuni Me Asistencën e Signal-it</string>
-    <string name="RegistrationActivity_code_support_subject">Regjistrim Signal-i - Kod Verifikimi për Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Lidhuni Me Asistencën e Molly-it</string>
+    <string name="RegistrationActivity_code_support_subject">Regjistrim Molly-i - Kod Verifikimi për Android</string>
     <string name="RegistrationActivity_incorrect_code">Kod i gabuar</string>
     <string name="BackupUtil_never">Kurrë</string>
     <string name="BackupUtil_unknown">E panjohur</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Numër telefoni</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Zgjidh se kush mund ta shohë numrin tënd të telefonit dhe kush mund të të kontaktojë nëpërmjet tij në Signal.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Zgjidh se kush mund ta shohë numrin tënd të telefonit dhe kush mund të të kontaktojë nëpërmjet tij në Molly.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Kush mund të shohë numrin tim</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Keni bërë shumë përpjekje. Ju lutemi, riprovoni më vonë.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Gabim në lidhjen me shërbimin</string>
     <string name="preferences_chats__backups">Kopjeruajtje</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal-i është i kyçur</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly-i është i kyçur</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">PREKENI QË TË SHKYÇET</string>
     <string name="Recipient_unknown">I panjohur</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Ju duhet hyrje te pajisja juaj e vjetër.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Riktheni prej kopjeruajtje</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Riktheni mesazhet tuaja që prej një kopjeruajtjeje vendore. Nëse s\\’i riktheni tani, s\\’do të jeni në gjendje t\\’i riktheni më vonë.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Rikthe kopjeruajtjen lokale</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Rikthe kopjeruajtjen Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Rikthe të gjitha mesazhet e tua me tekst + 30 ditët e fundit të medias</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Opsione të tjera</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Anulo</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Identifikohu pa transferim</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Vazhdo pa transferuar mesazhet dhe mediat</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Hapni Signal-in në telefonin tuaj të vjetër Android</string>
     <string name="NewDeviceTransferInstructions__continue">Vazhdo</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Po gatitet të lidhet me një pajisje Android të vjetër…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Po ha një çast, duhet të jetë gati së shpejti</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Po pritet që të lidhet pajisje e vjetër Android…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal-i lyp leje vendndodhjesh që të pikasë dhe lidhet me pajisjen tuaj të vjetër Android.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal-i lyp aktivizim shërbimesh vendndodhjesh që të pikasë dhe lidhet me pajisjen tuaj të vjetër Android.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal-i lyp Wi-Fi të hapur që të pikasë dhe lidhet me pajisjen tuaj të vjetër Android. Wi-Fi duhet të jetë i hapur, por jo edhe të jetë i lidhur në një rrjet Wi-Fi.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Na ndjeni, duket se kjo pajisje s\\’mbulon Wi-Fi Direct. Signal-i e përdor Wi-Fi Direct që të pikasë dhe lidhet me pajisjen tuaj të vjetër Android. Mundeni ende të riktheni një kopjeruajtje, që të riktheni llogarinë tuaj nga pajisja juaj e vjetër Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly-i lyp leje vendndodhjesh që të pikasë dhe lidhet me pajisjen tuaj të vjetër Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly-i lyp aktivizim shërbimesh vendndodhjesh që të pikasë dhe lidhet me pajisjen tuaj të vjetër Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly-i lyp Wi-Fi të hapur që të pikasë dhe lidhet me pajisjen tuaj të vjetër Android. Wi-Fi duhet të jetë i hapur, por jo edhe të jetë i lidhur në një rrjet Wi-Fi.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Na ndjeni, duket se kjo pajisje s\\’mbulon Wi-Fi Direct. Molly-i e përdor Wi-Fi Direct që të pikasë dhe lidhet me pajisjen tuaj të vjetër Android. Mundeni ende të riktheni një kopjeruajtje, që të riktheni llogarinë tuaj nga pajisja juaj e vjetër Android.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Riktheni një kopjeruajtje</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Ndodhi një gabim i papritur teksa provohej të lidhej me pajisjen tuaj të vjetër Android.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Po kërkohet për pajisje të re Android…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal-i lyp leje vendndodhjesh që të pikasë dhe lidhet me pajisjen tuaj të re Android.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal-i lyp aktivizim shërbimesh vendndodhjesh, për të pikasur dhe për t\\’u lidhur me pajisjen tuaj të re Android.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal-i lyp Wi-Fi të hapur që të pikasë dhe lidhet me pajisjen tuaj të re Android. Wi-Fi duhet të jetë i hapur, por jo edhe të jetë i lidhur në një rrjet Wi-Fi.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Na ndjeni, duket se kjo pajisje s\\’mbulon Wi-Fi Direct. Signal-i e përdor Wi-Fi Direct që të pikasë dhe lidhet me pajisjen tuaj të re Android. Mundeni ende të krijoni një kopjeruajtje, që të riktheni llogarinë tuaj nga pajisja juaj e re Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly-i lyp leje vendndodhjesh që të pikasë dhe lidhet me pajisjen tuaj të re Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly-i lyp aktivizim shërbimesh vendndodhjesh, për të pikasur dhe për t\\’u lidhur me pajisjen tuaj të re Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly-i lyp Wi-Fi të hapur që të pikasë dhe lidhet me pajisjen tuaj të re Android. Wi-Fi duhet të jetë i hapur, por jo edhe të jetë i lidhur në një rrjet Wi-Fi.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Na ndjeni, duket se kjo pajisje s\\’mbulon Wi-Fi Direct. Molly-i e përdor Wi-Fi Direct që të pikasë dhe lidhet me pajisjen tuaj të re Android. Mundeni ende të krijoni një kopjeruajtje, që të riktheni llogarinë tuaj nga pajisja juaj e re Android.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Krijoni kopjeruajtje</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Ndodhi një gabim i papritur teksa provohej të lidhej me pajisjen tuaj të re Android.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Shpërngulje të dhënash</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Mbajini të dyja pajisjet afër njëra-tjetrës. Mos fikni pajisjet dhe mbajeni hapur Signal-in. Shpërnguljet janë të fshehtëzuara skaj-më-skaj.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Mbajini të dyja pajisjet afër njëra-tjetrës. Mos fikni pajisjet dhe mbajeni hapur Molly-in. Shpërnguljet janë të fshehtëzuara skaj-më-skaj.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d mesazhe deri këtu…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% mesazhe deri këtu…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Shpërngul Llogari</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Shkarkojeni Signal-in në pajisjen tuaj të re Android</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Shkarkojeni Molly-in në pajisjen tuaj të re Android</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Prekni mbi “Shpërngulni ose riktheni llogari”"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Cilido me këtë lidhje mund të shohë emrin dhe foton e këtij grupi dhe mund të kërkojë të bëhet pjesë e tij. Jepuani njerëzve të cilëve u besoni.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Cilido me këtë lidhje mund të shohë emrin dhe foton e këtij grupi dhe mund të bëhet pjesë e tij. Jepuani njerëzve të cilëve u besoni.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Ndajeni përmes Signal-i</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Ndajeni përmes Molly-i</string>
     <string name="GroupLinkBottomSheet_copy">Kopjoje</string>
     <string name="GroupLinkBottomSheet_qr_code">Kod QR</string>
     <string name="GroupLinkBottomSheet_share">Ndajeni Me të Tjerë</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">Rreth MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin është një monedhë e re digjitale e fokusuar te privatësia.</string>
     <string name="payment_info_card_adding_funds">Shtim fondesh</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Mund të shtoni fonde për përdorim në Signal duke dërguar MobileCoin në adresën e portofolit tuaj.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Mund të shtoni fonde për përdorim në Molly duke dërguar MobileCoin në adresën e portofolit tuaj.</string>
     <string name="payment_info_card_cashing_out">Thyerje çeqesh</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Mund të thyeni MobileCoin në çfarëdo kohe në një platformë që mbulon MobileCoin. Thjesht bëni një shpërngulje te llogaria juaj në atë platformë.</string>
     <string name="payment_info_card_hide_this_card">Të fshihet kjo kartë?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Çaktivizoni Portofolin</string>
     <string name="DeactivateWalletFragment__your_balance">Depozita juaj</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Rekomandohet që të transferosh fondet e tua në një portofol tjetër, para se të çaktivizosh pagesat. Nëse zgjedh të mos transferosh fondet e tua tani, do të mbeten në portofolin tënd të lidhur me Signal, nëse riaktivizon pagesat.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Rekomandohet që të transferosh fondet e tua në një portofol tjetër, para se të çaktivizosh pagesat. Nëse zgjedh të mos transferosh fondet e tua tani, do të mbeten në portofolin tënd të lidhur me Molly, nëse riaktivizon pagesat.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Shpërngulni depozitën e mbetur</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Çaktivizoje pa e shpërngulur</string>
     <string name="DeactivateWalletFragment__deactivate">Çaktivizoje</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Të çaktivizohet pa e shpërngulur?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Depozita jote do të mbetet në portofolin tënd të lidhur me Signal, nëse zgjedh të riaktivizosh pagesat.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Depozita jote do të mbetet në portofolin tënd të lidhur me Molly, nëse zgjedh të riaktivizosh pagesat.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Gabim gjatë çaktivizimit të portofolit.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licencat</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Kushte &amp; Rregulla Privatësie</string>
-    <string name="HelpFragment__copyright_signal_messenger">Të drejta kopjimi Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Të drejta kopjimi Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Licencuar sipas GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Përzgjidhni një ngjyrë</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Ndajeni Me të Tjerë</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Në këtë grup mund të dërgojnë mesazhe vetëm administratorët.</string>
-    <string name="MultiselectForwardFragment__limit_reached">U mbërrit në kufi</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Nuk mund të përzgjedhësh më tepër se 5 biseda</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Mëso më shumë</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Përditësoni Signal-in</string>
+    <string name="UpdateSignalExpiredDialog__title">Përditësoni Molly-in</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Ky version i Signal ka skaduar. Përditëso tani për të vazhduar përdorimin e Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Ky version i Molly ka skaduar. Përditëso tani për të vazhduar përdorimin e Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Përditësoje</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Pajisja nuk është regjistruar</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Kjo pajisje nuk është më e regjistruar. Regjistrohu sërish për të vazhduar përdorimin e Signal në këtë pajisje.</string>
+    <string name="ReregisterSignalDialog__message">Kjo pajisje nuk është më e regjistruar. Regjistrohu sërish për të vazhduar përdorimin e Molly në këtë pajisje.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Riregjistroje</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">S\\’u arrit të hapet zgjedhësi.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Për të aktivizuar njoftimet, Signal ka nevojë për leje për t\'i shfaqur ato.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Për të aktivizuar njoftimet, Molly ka nevojë për leje për t\'i shfaqur ato.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Aktivizo</string>
 
@@ -5637,7 +5773,7 @@
     <!-- Used to join views and replies when both exist on a story item -->
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
-    <string name="StoryViewerPageFragment__you">Ju</string>
+    <string name="StoryViewerPageFragment__you">Ti</string>
     <!-- Displayed when viewing a story sent to a group, placeholders are person who sent the story and the group name -->
     <string name="StoryViewerPageFragment__s_to_s">%1$s për %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Ende pa përgjigje</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Nuk mund t\'i përgjigjesh këtij postimi të përkohshëm, sepse nuk je më anëtar i këtij grupi.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Reagoi ndaj postimit të përkohshëm</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Reagoi ndaj postimit të përkohshëm</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Reagoi ndaj postimit të përkohshëm</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Parje</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Zgjidh bankën</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Konfirmo dhurimin tënd me %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Për të konfiguruar dhurimin tënd të përsëritur, kliko për të konfirmuar një tarifë prej 0,01 € me bankën tënde. Kjo do të rimbursohet automatikisht dhe lejon që dhurimi yt prej 5 €/muaj të debitohet nga llogaria jote.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Për të konfiguruar dhurimin e përsëritur, kliko \"vazhdo\" për të konfirmuar tarifimin prej 0,01 € nga banka jote. Kjo do të rimbursohet automatikisht dhe lejon që dhurimi yt prej %1$s/muaj të debitohet nga llogaria jote.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Vazhdo</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Po shkarkohen të dhënat rezervë…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Kopjeruajtjet e medias janë joaktive</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Plani yt kopjeruajtës i medias në Signal është anuluar sepse nuk mund ta përpunonim pagesën. Ke %1$d ditë për të shkarkuar çdo media të ruajtur në kopjeruajtje. Pas %1$d dite, media në kopjeruajtjen tënde do të fshihet.</item>
+        <item quantity="other">Plani yt kopjeruajtës i medias në Signal është anuluar sepse nuk mund ta përpunonim pagesën. Ke %1$d ditë për të shkarkuar çdo media të ruajtur në kopjeruajtje. Pas %1$d ditësh, media në kopjeruajtjen tënde do të fshihet.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Mund të fillosh të paguash përsëri për kopjeruajtjet në çdo kohë për të vazhduar të kopjeruash të gjitha mediat. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Media do të fshihet sot</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Plani yt kopjeruajtës i medias në Signal është anuluar sepse nuk mund ta përpunonim pagesën. Kjo është mundësia jote e fundit për ta shkarkuar median në kopjeruajtje përpara se të fshihet.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Shkarkimi nuk mund të kryhet</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Pajisja nuk ka hapësirë të mjaftueshme të lirë. Liro deri në %1$s hapësirë për të shkarkuar median e ruajtur në kopjeruajtje.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Nëse zgjedh \"Kapërce\", media e ruajtur në kopjeruajtje do të fshihet pas %1$d dite.</item>
+        <item quantity="other">Nëse zgjedh \"Kapërce\", media e ruajtur në kopjeruajtje do të fshihet pas %1$d ditësh.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Pagesa e kopjeruajtjeve nuk mund të përpunohet</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Po hasim probleme me mbledhjen e pagesës tënde mujore të kopjeruajtjes. Sigurohu që mënyra e pagesës të jetë e përditësuar. Nëse nuk është, përditësoje në Google Pay. Signal do të përpiqet ta përpunojë përsëri pagesën pas disa ditësh.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Kopjeruajtja nuk përfundoi</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Kopjeruajtja nuk është kryer në pajisje për %1$d ditë. Sigurohu që pajisja të jetë e lidhur me Wi-Fi dhe kliko \"Kopjeruaj tani\". </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Mëso më shumë</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Anashkaloje</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Shkarko media tani</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Shkarko më vonë</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Mos shkarko median</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Liro %1$s hapësirë për të shkarkuar media.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Kartë krediti ose debiti</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">I panjohur</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Historia e pagesave</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Kopjeruajtja jote e fundit është bërë më %1$s në %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Mesazhet më të vjetra se koha e zgjedhur do të fshihen përgjithmonë.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Mesazhet që tejkalojnë gjatësinë e zgjedhur do të fshihen përgjithmonë.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Vendos kufizime për pajisjet e lidhura</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Kur aktivizohen, kufijtë e bisedës do të fshijnë edhe mesazhet e pajisjeve të lidhura.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Fshirja u sinkronizua tashmë në të gjitha pajisjet</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Kur fshin mesazhe ose biseda, ato do të fshihen nga telefoni yt dhe nga të gjitha pajisjet e lidhura.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Historia e pagesave</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Kopjeruajtje për tekst dhe për të gjitha mediat</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Detajet e pagesës</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Lloji i kopjeruajtjeve</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Datë pagese</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Ndajeni Me të Tjerë</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Kopjeruajtjet e Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Historia e pagesave</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Të dhënat e kopjeruajtjes</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Madhësia kopjeruajtjes</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Frekuenca e kopjeruajtjes</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Kopjeruaj duke perdorur internetin celular</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Të çaktivizohen dhe fshihen kopjeruajtjet</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Kopjeruajtja u fshi dhe u çaktivizua.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Lloji i kopjeruajtjes u ndryshua dhe abonimi u anulua</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Pajtimi u anulua</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Shkarkimi përfundoi</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Lloji i kopjeruajtjeve</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Kopjeruajtjet u çaktivizuan</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/muaj</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Aktivizoji kopjeruajtjet</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Kopjeruajtja e fundit</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s më %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Kurrë</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Kopjeruaje Tani</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Të çaktivizohen dhe fshihen kopjeruajtjet?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Nuk do të tarifohesh më. Kopjeruajtjet e tua do të fshihen dhe nuk do të krijohen kopjeruajtje të reja.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Çaktivizo dhe fshij</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Kopjeruajtja po fshihet…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Kopjeruajtja u fshi</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Duke klikuar \"Kopjeruaj tani\""</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Ditore</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Javore</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Mujore</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Kopjeruajtje manuale</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Të lutem, vendos pinin, fjalëkalimin ose vizimin e pajisjes.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Tjetër</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Ndrysho llojin e kopjeruajtjes</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Anuloje abonimin</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Konfirmo anulimin</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Nuk do të tarifohesh më. Kopjeruajtjet do të çaktivizohen në fund të ciklit të faturimit. Pas asaj date do të kesh 30 ditë për të shkarkuar median që po kopjeruan aktualisht.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Konfirmo dhe shkarko tani</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Konfirmo dhe shkarko më vonë</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Mbaj abonimin</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index f93e9ef4d4..3a5a16e063 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal се ажурира…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly се ажурира…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Још увек нисте подесили приступну фразу!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Желите ли да искључите приступну фразу?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Овим ћете трајно откључати Signal и обавештења о порукама.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Овим ћете трајно откључати Molly и обавештења о порукама.</string>
     <string name="ApplicationPreferencesActivity_disable">Искључи</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Грешка приликом повезивања на сервер!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN је неопходан за закључавање регистрације. Да бисте искључили PIN, прво морате да искључите закључавање регистрације.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Фајл</string>
     <string name="AttachmentKeyboard_contact">Контакт</string>
     <string name="AttachmentKeyboard_location">Локација</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal-у је потребна дозвола за приказивање ваших слика и видео записа</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly-у је потребна дозвола за приказивање ваших слика и видео записа</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Дозволи приступ</string>
     <string name="AttachmentKeyboard_payment">Плаћање</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Није пронађена апликација за одабир медија.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal-у је потребна дозвола за приступ вашем меморијском простору да би могао да приложи слике, видео или аудио, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опцију „Меморијски простор“.</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal-у је потребна дозвола за приступ вашим контактима да би могао да приложи информације о контакту, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опцију „Контакти“.</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal-у је потребна дозвола за приступ вашој локацији да би могао да приложи локацију, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опцију „Локација“.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly-у је потребна дозвола за приступ вашем меморијском простору да би могао да приложи слике, видео или аудио, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опцију „Меморијски простор“.</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly-у је потребна дозвола за приступ вашим контактима да би могао да приложи информације о контакту, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опцију „Контакти“.</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly-у је потребна дозвола за приступ вашој локацији да би могао да приложи локацију, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опцију „Локација“.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Дозволите приступ локацији</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Да бисте послали своју локацију:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Дозволите Signal-у приступ да бисте послали своју локацију.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Дозволите Molly-у приступ да бисте послали своју локацију.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal-у је потребан приступ локацији да бисте могли да пошаљете своју локацију.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly-у је потребан приступ локацији да бисте могли да пошаљете своју локацију.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Дозволите приступ меморијском простору</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Да би могле да вам се прикажу слике и видео записи:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal-у је потребан приступ меморијском простору да би могао да прикаже ваше слике и видео записе.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly-у је потребан приступ меморијском простору да би могао да прикаже ваше слике и видео записе.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s није активирао/ла плаћања </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Промени камеру</string>
     <string name="CameraXFragment_open_gallery_description">Отвори галерију</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Дозволи приступ</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Дозволите приступ камери и микрофону</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Дозволите приступ камери</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Дозволите приступ микрофону</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Да бисте могли да снимате фотографије, дозволите Signal-у приступ камери.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Да бисте могли да снимате фотографије и видео, дозволите Signal-у приступ камери.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Да бисте могли да снимате фотографије и видео, дозволите Signal-у приступ камери и микрофону.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Да бисте могли да снимате видео са звуком, дозволите Signal-у приступ микрофону.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Да бисте могли да скенирате QR код, дозволите Signal-у приступ камери.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal-у је потребан приступ камери да би снимао фотографије</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal-у је потребан приступ камери да би скенирао QR кодове</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal-у је потребан приступ микрофону да би снимао видео</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Да бисте могли да снимате фотографије на Signal-у:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Да бисте могли да снимате фотографије и видео на Signal-у:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Да бисте могли да снимате видео са звуком:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Да бисте могли да скенирате QR кодове:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Недавни контакти</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Нема контаката на Signal-у</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Можете користити дугме за камеру да шаљете слике само контактима на Signal-у. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Не можете да пронађете кога тражите?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Позовите контакт да се придружи Signal-у</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Позовите контакт да се придружи Molly-у</string>
     <string name="CameraContacts__menu_search">Претрага</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Не, хвала</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Ажурирајте Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Ажурирајте Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Ова верзија апликације више није подржана. Да бисте и даље могли да шаљете и примате поруке, ажурирајте апликацију на најновију верзију.</string>
     <string name="ClientDeprecatedActivity_update">Ажурирај</string>
     <string name="ClientDeprecatedActivity_dont_update">Немој да ажурираш</string>
     <string name="ClientDeprecatedActivity_warning">Упозорење</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Ваша верзија Signal-а је истекла. Можете да видите историју порука али нећете моћи да шаљете и примате поруке док не ажурирате апликацију.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Ваша верзија Molly-а је истекла. Можете да видите историју порука али нећете моћи да шаљете и примате поруке док не ажурирате апликацију.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Није пронађен веб прегледач.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Порука: %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Гласовни позив преко Molly-а %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Видео позив преко Molly-а %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -419,10 +420,10 @@
     <string name="ConversationActivity_transport_insecure_sms_with_sim">Небезбедан SMS (%1$s)</string>
     <string name="ConversationActivity_transport_insecure_mms">Небезбедан MMS</string>
     <!-- A title for the option to send an SMS with a placeholder to put the name of their SIM card -->
-    <string name="ConversationActivity_transport_signal">Порука преко Signal-а</string>
+    <string name="ConversationActivity_transport_signal">Signal порука</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Пошаљите поруку</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Хајде да пређемо на Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Хајде да пређемо на Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Изаберите контакт</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Прилог прекорачује ограничење величине за тип поруке коју шаљете.</string>
     <string name="ConversationActivity_unable_to_record_audio">Снимање звука није успело!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Да бисте послали аудио поруке:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Да бисте слали гласовне поруке, дозволите Signal-у приступ микрофону.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Да бисте слали гласовне поруке, дозволите Molly-у приступ микрофону.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal-у је потребан приступ микрофону да бисте могли да снимите гласовну поруку.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal-у је потребна дозвола за приступ микрофону да би могао да шаље аудио поруке, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опцију „Микрофон“.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly-у је потребан приступ микрофону да бисте могли да снимите гласовну поруку.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly-у је потребна дозвола за приступ микрофону да би могао да шаље аудио поруке, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опцију „Микрофон“.</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal-у је потребна дозвола за приступ микрофону и камери да би могао да успостави позив са корисником %1$s, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опције „Микрофон“ и „Камера“.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Да бисте могли да снимате фотографије и видео, дозволите Signal-у приступ камери.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal-у је потребна дозвола за приступ камери да би могао да снима фотографије и видео, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опцију „Камера“.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal-у је потребна дозвола за приступ камери да би снимао фотографије и видео</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly-у је потребна дозвола за приступ микрофону и камери да би могао да успостави позив са корисником %1$s, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опције „Микрофон“ и „Камера“.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Да бисте могли да снимате фотографије и видео, дозволите Molly-у приступ камери.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly-у је потребна дозвола за приступ камери да би могао да снима фотографије и видео, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опцију „Камера“.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly-у је потребна дозвола за приступ камери да би снимао фотографије и видео</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Дозволите приступ микрофону да бисте снимили видео са звуком.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal-у је потребна дозвола за приступ микрофону да би могао да снима видео, али му је она одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опције „Микрофон“ и „Камера“.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal-у је потребна дозвола за приступ микрофону да би снимао видео.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly-у је потребна дозвола за приступ микрофону да би могао да снима видео, али му је она одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опције „Микрофон“ и „Камера“.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly-у је потребна дозвола за приступ микрофону да би снимао видео.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Не</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Да започнете позив:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Да бисте започели позив, потребно је да дозволите Signal-у приступ микрофону.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Да бисте започели позив, потребно је да дозволите Molly-у приступ микрофону.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal-у је потребан приступ микрофону да бисте могли да започнете позив.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly-у је потребан приступ микрофону да бисте могли да започнете позив.</string>
 
 
     <string name="ConversationActivity_join">Придружите се</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Размена SMS порука више није подржана у Signal-у. %1$s може да се придружи Signal-у да бисте наставили разговор овде.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Ова особа више не користи Signal. Позовите је на Signal да бисте наставили разговор овде.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Ова особа више не користи Molly. Позовите је на Molly да бисте наставили разговор овде.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Позивница за Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Позивница за Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Ускоро ћемо вас поново подсетити.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Избриши свима</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Избриши са овог уређаја</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Избриши</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Избриши са свих уређаја</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Ова порука ће бити избрисана свима у ћаскању ако користе најновију верзију Signal-а. Моћи ће да виде да сте избрисали поруку.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Корисник је блокиран</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Ажурирај Signal</string>
+    <string name="ConversationFragment__update_build">Ажурирај Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Поново региструјте Signal</string>
+    <string name="ConversationFragment__reregister_signal">Поново региструјте Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Иди назад.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Отвори Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Отвори Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Више нису верификовани</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Овим ћете трајно избрисати сва изабрана ћаскања (%1$d).</item>
         <item quantity="other">Овим ћете трајно избрисати сва изабрана ћаскања (%1$d).</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Овим ће изабрано ћаскање бити трајно избрисано са свих ваших уређаја.</item>
+        <item quantity="other">Овим ће сва изабрана ћаскања (%1$d) бити трајно избрисана са свих ваших уређаја.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Брисање</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Бришемо изабрано ћаскање…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Ко може да ме пронађе по броју телефона?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Свако ко има ваш број телефона видеће да сте на Signal-у и моћи ће да започне ћаскање са вама.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Свако ко има ваш број телефона видеће да сте на Molly-у и моћи ће да започне ћаскање са вама.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ниједан корисник неће моћи да види да сте на Signal-у док му не пошаљете поруку или ако већ немате постојеће ћаскање са њим.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ниједан корисник неће моћи да види да сте на Molly-у док му не пошаљете поруку или ако већ немате постојеће ћаскање са њим.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Желите ли да вратите садржај из резервне копије?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Испробајте приступну фразу за резервне копије и проверите да ли се подудара</string>
     <string name="BackupsPreferenceFragment__turn_on">Укључи</string>
     <string name="BackupsPreferenceFragment__turn_off">Искључи</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Да бисте вратили садржај из резервне копије, инсталирајте нову копију Signal-а. Отворите апликацију и додирните „Врати резервну копију“, а затим пронађите фајл резервне копије. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Да бисте вратили садржај из резервне копије, инсталирајте нову копију Molly-а. Отворите апликацију и додирните „Врати резервну копију“, а затим пронађите фајл резервне копије. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Сазнајте више</string>
     <string name="BackupsPreferenceFragment__in_progress">У току…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d%% за сада…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% за сада…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal-у је потребна дозвола за приступ спољном меморијском простору да би креирао резервне копије, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опцију „Меморијски простор“.</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly-у је потребна дозвола за приступ спољном меморијском простору да би креирао резервне копије, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опцију „Меморијски простор“.</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Подесите време креирања резервне копије</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Сесија ћаскања је освежена</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Услуга Signal користи потпуно шифровање и можда ће понекад морати да освежи Вашу сесију ћаскања. Ово не утиче на безбедност вашег ћаскања, али можда сте пропустили поруку овог контакта и можете да затражите да је поново пошаље.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Услуга Molly користи потпуно шифровање и можда ће понекад морати да освежи Вашу сесију ћаскања. Ово не утиче на безбедност вашег ћаскања, али можда сте пропустили поруку овог контакта и можете да затражите да је поново пошаље.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Користите Signal на десктоп рачунару или iPad-у. Ваше поруке ће се синхронизовати с повезаним уређајима.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Повежи нови уређај</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Поруке и информације о ћаскањима заштићене су шифровањем с краја на крај на свим уређајима</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal на десктоп-рачунару или iPad-у</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Све поруке на повезаним уређајима су приватне</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Поруке на Molly-у се синхронизују са Molly-ом на вашем мобилном телефону након што га повежете. Историја ваших претходних порука се неће појављивати.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">На другом уређају можете посетити %1$s за инсталирање Molly-а</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Моји повезани уређаји</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Прекини везу</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">Прекинуто повезивање са %1$s</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Повезивање уређаја…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Уређај је одобрен</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Учитава се…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Нема повезаних уређаја</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Откључајте да бисте повезали уређај</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">За повезивање скенирајте QR код приказан на уређају.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Скенирајте QR кôд</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Овим уређајем скенирајте QR код приказан на уређају који желите да повежете</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">У реду</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Овај уређај ће имати приступ вашим контактима, групама и ћаскањима и моћи ће да шаље поруке у ваше име.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Завршите повезивање на другом уређају</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Завршите повезивање Molly-а на другом уређају.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Повезивање уређаја није успело</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Овај QR код није важећи. Проверите да ли скенирате QR код приказан на уређају који желите да повежете.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Пробај поново</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Желите ли да прекинете везу са уређајем „%1$s“?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Оптимизујте за недостајуће Play сервисе</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Овај уређај не подржава Play сервисе. Додирните да искључите системску оптимизацију батерије која спречава пријем порука док је Signal неактиван.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Овај уређај не подржава Play сервисе. Додирните да искључите системску оптимизацију батерије која спречава пријем порука док је Molly неактиван.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Ова верзија Signal-а је истекла. Ажурирајте апликацију сада да бисте слали и примали поруке.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Ова верзија Molly-а је истекла. Ажурирајте апликацију сада да бисте слали и примали поруке.</string>
     <string name="ExpiredBuildReminder_update_now">Ажурирајте сада</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Прикажи</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Догодила се трајна грешка у комуникацији Signal-а!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal није успео да се региструје на Google Play сервисе. Слање порука и обављање позива преко Signal-а су деактивирани. Пробајте поново да се региструјете преко Подешавања &gt; Напредно.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Догодила се трајна грешка у комуникацији Molly-а!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly није успео да се региструје на Google Play сервисе. Слање порука и обављање позива преко Molly-а су деактивирани. Пробајте поново да се региструјете преко Подешавања &gt; Напредно.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Извештаји о грешкама нам помажу да откријемо и решимо проблем и они не садрже информације на основу којих можете бити идентификовани.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal је наишао на проблем. Желите ли да пошаљете извештај о грешкама?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly је наишао на проблем. Желите ли да пошаљете извештај о грешкама?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Обавештења могу каснити због оптимизације батерије</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Можете да искључите оптимизацију батерије код апликације Signal да бисте били сигурни да обавештења о порукама неће каснити.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Можете да искључите оптимизацију батерије код апликације Molly да бисте били сигурни да обавештења о порукама неће каснити.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Обавештења могу каснити због оптимизације батерије</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Искључите оптимизацију батерије код апликације Molly да бисте били сигурни да обавештења о порукама неће каснити. Додирните „Настави“ да бисте видели конкретна упутства за уређај.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Не, хвала</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Настави</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Настави</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Одбаци</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Не, хвала</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Позивнице за групу на чекању</string>
+    <string name="PendingMembersActivity_pending_group_invites">Захтеви и позивнице</string>
     <string name="PendingMembersActivity_requests">Захтеви</string>
     <string name="PendingMembersActivity_invites">Позивнице</string>
     <string name="PendingMembersActivity_people_you_invited">Људи које сте позвали</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Откажи</string>
     <string name="InviteActivity_sending">Слање…</string>
     <string name="InviteActivity_invitations_sent">Позивнице су послате!</string>
-    <string name="InviteActivity_invite_to_signal">Пошаљите позивницу за Signal</string>
+    <string name="InviteActivity_invite_to_signal">Пошаљите позивницу за Molly</string>
     <string name="InviteActivity_send_sms">Пошаљи SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Желите ли да пошаљете %1$d позивницу SMS-ом?</item>
         <item quantity="other">Желите ли да пошаљете позивнице (%1$d) SMS-ом?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Хајде да пређемо на Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Хајде да пређемо на Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Изгледа да немате ниједну апликацију на коју бисте могли да поделите.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Ваша порука</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Позадинска веза је активирана</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Одговори</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Успоставља се позив преко Signal-а</string>
+    <string name="NotificationBarManager__establishing_signal_call">Успоставља се позив преко Molly-а</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Покретање Signal-овог сервиса за позиве</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Заустављање Signal-овог сервиса за позиве</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Покретање Molly-овог сервиса за позиве</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Заустављање Molly-овог сервиса за позиве</string>
     <string name="NotificationBarManager__cancel_call">Откажи позив</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Активирали сте плаћања</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s сада може да прихвата плаћања</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Подаци о плаћању нису доступни</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Додирните да видите више</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Подаци о плаћању нису доступни</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Детаљи ове уплате нису доступни јер су ваше поруке враћене из извора који није садржао ову историју плаћања. То не утиче на ваше стање у новчанику нити на статус претходних плаћања.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Ускоро више нећете моћи да шаљете SMS поруке преко Signal-а. %1$s може да се придружи Signal-у да бисте наставили разговор овде.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Више не можете да шаљете SMS поруке преко Signal-а. %1$s може да се придружи Signal-у да бисте наставили разговор овде.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Више не можете да шаљете SMS поруке преко Molly-а. %1$s може да се придружи Molly-у да бисте наставили разговор овде.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Плаћање: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Плаћање</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Пријављено је као спам</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Желите ли да повежете уређај на ком је инсталиран Signal?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Изгледа да покушавате да повежете уређај на ком је инсталиран Signal помоћу спољног скенера. Ради ваше безбедности, скенирајте код поново у самом Signal-у.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal-у је потребна дозвола за приступ камери да би скенирао QR код, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опцију „Камера“.</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly-у је потребна дозвола за приступ камери да би скенирао QR код, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опцију „Камера“.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Није могуће скенирати QR код без дозволе за приступ камери</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Унесите приступну фразу</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Икона Signal-a</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Икона Molly-a</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Пошаљи приступну фразу</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Приступна фраза је неважећа!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Откључај Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android – закључани екран</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Откључај Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android – закључани екран</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Мапа</string>
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Моја прича</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Позив преко Signal-а</string>
+    <string name="Recipient_signal_call">Позив преко Molly-а</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Блокирај</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Позивамо…</string>
     <string name="RedPhone_busy">Заузето</string>
     <string name="RedPhone_recipient_unavailable">Прималац није доступан</string>
-    <string name="RedPhone_network_failed">Повезивање на мрежу није успело!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Повезивање на мрежу није успело! Проверите да ли сте повезани на интернет и пробајте поново.</string>
     <string name="RedPhone_number_not_registered">Број није пријављен!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Број који сте окренули не подржава безбедне позиве!</string>
     <string name="RedPhone_got_it">Разумем</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Додирните овде да укључите камеру</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Да бисте позвали контакт %1$s, Signal-у је потребан приступ вашој камери</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Да бисте позвали контакт %1$s, Molly-у је потребан приступ вашој камери</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Позивам…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Поново успостављамо везу…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Уклоњени сте из позива</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Неко вас је уклонио из позива.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Дозволите приступ камери и микрофону</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Дозволите приступ микрофону</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Дозволите приступ камери</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Да бисте започели позив или му се прикључили, потребно је да дозволите Molly-у приступ камери и микрофону.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Да бисте започели позив или му се прикључили, потребно је да дозволите Molly-у приступ микрофону.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Да бисте активирали видео, дозволите Molly-у приступ камери.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly-у је потребна дозвола за приступ микрофону да бисте започели позив или му се пркључили.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly-у је потребан приступ камери да бисте могли да активирате видео</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Да бисте започели позив или му се прикључили:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Да бисте активирали видео:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Позив преко Signal-а</string>
-    <string name="WebRtcCallView__signal_video_call">Видео позив преко Signal-а</string>
+    <string name="WebRtcCallView__signal_call">Позив преко Molly-а</string>
+    <string name="WebRtcCallView__signal_video_call">Видео позив преко Molly-а</string>
     <string name="WebRtcCallView__start_call">Започни позив</string>
     <string name="WebRtcCallView__join_call">Укључите се у позив</string>
     <string name="WebRtcCallView__call_is_full">Позив је пун</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Желите ли да спустите руку?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Спусти руку</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Спусти</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Откажи</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Подигли сте руку</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Више</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s је подигао/ла руку</item>
-        <item quantity="other">%1$s + %2$d су подигли руку</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s си подигао/ла руку</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d сте подигли руку</item>
+        <item quantity="other">%1$s + још %2$d сте подигли руку</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s је подигао/ла руку</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d су подигли руку</item>
+        <item quantity="other">%1$s + још %2$d су подигли руку</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Примићете позив за верфикацију овог броја.</string>
     <string name="RegistrationActivity_edit_number">Измени број</string>
     <string name="RegistrationActivity_missing_google_play_services">Недостају Google Play сервиси</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Овом уређају недостају Google Play сервиси. И даље можете да користите Signal, али таква конфигурација може довести до умањене поузданости или перформансе.\n\nАко нисте напредан корисник, не користите прилагођени Android ROM или верујете да грешком видите ову поруку, обратите се подршци на support@signal.org за помоћ.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Овом уређају недостају Google Play сервиси. И даље можете да користите Molly, али таква конфигурација може довести до умањене поузданости или перформансе.\n\nАко нисте напредан корисник, не користите прилагођени Android ROM или верујете да грешком видите ову поруку, обратите се подршци на support@molly.im за помоћ.</string>
     <string name="RegistrationActivity_i_understand">Разумем</string>
     <string name="RegistrationActivity_play_services_error">Грешка у Play сервисима</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play сервиси се ажурирају или су привремено недоступни. Пробајте поново касније.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Нестандардни формат броја</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Број који сте унели (%1$s) није у стандардном формату.\n\nДа ли сте мислили да унесете: %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android – формат броја телефона</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android – формат броја телефона</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Затражен је позив</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Имате проблема са регистрацијом?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Проверите да ли ваш телефон има мобилни сигнал за примање SMS-а или позива\n • Проверите да ли можете да примате телефонске позиве на овај број\n • Проверите да ли сте исправно унели свој број телефона.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Ако вам је потребно више информација, пратите ове кораке за решавање проблема или се обратите подршци</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Ако вам је потребно више информација, пратите %1$s или %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">ове кораке за решавање проблема</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,14 +2348,14 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Додај у контакте</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Пошаљите позивницу за Signal</string>
-    <string name="SharedContactDetailsActivity_signal_message">Порука преко Signal-а</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Пошаљите позивницу за Molly</string>
+    <string name="SharedContactDetailsActivity_signal_message">Signal порука</string>
     <string name="SharedContactDetailsActivity_signal_call">Позив преко Signal-а</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Додај у контакте</string>
-    <string name="SharedContactView_invite_to_signal">Пошаљите позивницу за Signal</string>
-    <string name="SharedContactView_message">Порука преко Signal-а</string>
+    <string name="SharedContactView_invite_to_signal">Пошаљите позивницу за Molly</string>
+    <string name="SharedContactView_message">Signal порука</string>
 
     <!-- SignalBottomActionBar -->
     <string name="SignalBottomActionBar_more">Више</string>
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%2$s је власник броја %1$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Надоградња Signal-a</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Доступна је нова верзија Signal-а. Додирните да ажурирате.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Ажурирање Signal-а није успело</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Надоградња Molly-a</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Доступна је нова верзија Molly-а. Додирните да ажурирате.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Ажурирање Molly-а није успело</string>
     <string name="ApkUpdateNotifications_failed_general_body">Пробаћемо поново касније.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal је ажуриран</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly је ажуриран</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Апликација је аутоматски ажурирана на верзију %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Наш Signal сигурносни број:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Изгледа да немате ниједну апликацију на коју бисте могли да поделите.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Нема копираног сигурносног броја за упоређивање</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal-у је потребна дозвола за приступ камери да би скенирао QR код, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опцију „Камера“.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly-у је потребна дозвола за приступ камери да би скенирао QR код, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опцију „Камера“.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Није могуће скенирати QR код без дозволе за приступ камери</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Прво морате да размените поруке да бисте видели сигурносни број корисника %1$s.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Додирните да отворите.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal је откључан</string>
-    <string name="KeyCachingService_lock">Закључај Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly је откључан</string>
+    <string name="KeyCachingService_lock">Закључај Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Ви</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Неподржан тип медија</string>
     <string name="MediaPreviewActivity_draft">Нацрт</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal-у је потребна дозвола за приступ меморијском простору да би могао да чува фајлове у спољном меморијском простору, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опцију „Меморијски простор“.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly-у је потребна дозвола за приступ меморијском простору да би могао да чува фајлове у спољном меморијском простору, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опцију „Меморијски простор“.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Није могуће чувати у спољној меморији без дозвола</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Желите ли да избришете поруку?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Овим ћете трајно избрисати ову поруку.</string>
@@ -2518,14 +2641,14 @@
     <string name="MessageNotifier_failed_to_deliver_message">Испорука поруке није успела.</string>
     <string name="MessageNotifier_error_delivering_message">Грешка приликом испоруке поруке.</string>
     <string name="MessageNotifier_message_delivery_paused">Испорука поруке је паузирана.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Верификујте да наставите са дописивањем на Signal-у.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Верификујте да наставите са дописивањем на Molly-у.</string>
     <string name="MessageNotifier_mark_all_as_read">Означи све као прочитано</string>
     <string name="MessageNotifier_mark_read">Означи прочитаним</string>
     <string name="MessageNotifier_turn_off_these_notifications">Искључи ова обавештења</string>
     <string name="MessageNotifier_view_once_photo">Једнократна слика</string>
     <string name="MessageNotifier_view_once_video">Једнократни видео</string>
     <string name="MessageNotifier_reply">Одговори</string>
-    <string name="MessageNotifier_signal_message">Порука преко Signal-а</string>
+    <string name="MessageNotifier_signal_message">Signal порука</string>
     <string name="MessageNotifier_contact_message">%1$s %2$s</string>
     <string name="MessageNotifier_unknown_contact_message">Контакт</string>
     <string name="MessageNotifier_reacted_s_to_s">Реаговао/ла је %1$s на: „%2$s“.</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Реаговао/ла је %1$s на вашу налепницу.</string>
     <string name="MessageNotifier_this_message_was_deleted">Ова порука је избрисана.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Желите ли да искључите обавештења када се контакт придружи Signal-у? Можете их поново укључити у Signal &gt; Подешавања &gt; Обавештења.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Желите ли да искључите обавештења када се контакт придружи Molly-у? Можете их поново укључити у Molly &gt; Подешавања &gt; Обавештења.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Брзи одговор није доступан када је Signal закључан!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Брзи одговор није доступан када је Molly закључан!</string>
     <string name="QuickResponseService_problem_sending_message">Десио се проблем са слањем поруке!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Неважећа пречица</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Нова порука</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Захтев за дописивање</string>
     <string name="SingleRecipientNotificationBuilder_you">Ви</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Овај уређај више није регистрован. Могуће је да је ваш број телефона регистрован на Signal-у на другом уређају.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Овај уређај више није регистрован. Могуће је да је ваш број телефона регистрован на Molly-у на другом уређају.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Поново региструјте уређај</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Да бисте се јавили на позив, потребно је да дате Signal-у приступ микрофону.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Да бисте се јавили на позив, потребно је да дате Molly-у приступ микрофону.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Да бисте могли да се јавите на видео позив, морате да дате Signal-у приступ микрофону и камери.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal-у је потребна дозвола за приступ микрофону и камери да би започео или примао позиве, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опције „Микрофон“ и „Камера“.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Да бисте могли да се јавите на видео позив, морате да дате Molly-у приступ микрофону и камери.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly-у је потребна дозвола за приступ микрофону и камери да би започео или примао позиве, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опције „Микрофон“ и „Камера“.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Одговорено је на повезаном уређају.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Одбијено је на повезаном уређају.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Заузето је на другом уређају.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Поновите нову приступну фразу</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Пошаљите позивницу за Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Пошаљите позивницу за Molly</string>
     <string name="contact_selection_activity__new_group">Нова група</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Освежите контакте</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Неко вам недостаје? Пробајте да освежите</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Пронађите људе које знате на Signal-у</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Дозволите приступ контактима</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Још</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Слика контакта</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal-у је потребна дозвола за приступ вашим контактима да би их приказао, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опцију „Контакти“.</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly-у је потребна дозвола за приступ вашим контактима да би их приказао, али му је она трајно одбијена. Идите у мени за подешавања апликације, изаберите „Дозволе“ и укључите опцију „Контакти“.</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Догодила се грешка приликом преузимања контаката, проверите да ли сте повезани на интернет</string>
     <string name="ContactSelectionListFragment_username_not_found">Корисник није пронађен</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"%1$s није корисник Signal-а. Проверите корисничко име и пробајте поново."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Пронађите корисничким именом</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Дозволите приступ контактима</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Да бисте могли да пронађете људе које знате на Signal-у:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Дозволи приступ</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Не, хвала</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Дозволите приступ контактима. Ваши контакти су шифровани и нису видљиви услузи Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal-у је потребан приступ вашим контактима да би их приказао.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly-у је потребан приступ вашим контактима да би их приказао.</string>
     <string name="contact_selection_list_fragment__show_contacts">Прикажи контакте</string>
 
     <!-- contact_selection_list_item -->
@@ -2774,7 +2899,7 @@
     </plurals>
 
     <!-- conversation_activity -->
-    <string name="conversation_activity__type_message_push">Порука преко Signal-а</string>
+    <string name="conversation_activity__type_message_push">Signal порука</string>
     <string name="conversation_activity__type_message_sms_insecure">Небезбедан SMS</string>
     <string name="conversation_activity__type_message_mms_insecure">Небезбедан MMS</string>
     <!-- Option in send button context menu to schedule the message instead of sending it directly -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Уклонили сте ову особу. Ако јој поново пошаљете поруку, вратићете је на листу.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Опције</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Ажурирај</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Пусти … Паузирај</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Балонћићи су способности Android-а што можете да угасите за Signal.</string>
+    <string name="BubbleOptOutTooltip__description">Балонћићи су способности Android-а што можете да угасите за Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Не сада</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Опис групе</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Ажурирајте Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Ажурирајте Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Ова верзија Signal-а је истекла. Ажурирајте апликацију сада да наставите да користите Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Ова верзија Molly-а је истекла. Ажурирајте апликацију сада да наставите да користите Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Ажурирај</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Споро</string>
     <string name="preferences__help">Помоћ</string>
     <string name="preferences__advanced">Напредно</string>
-    <string name="preferences__donate_to_signal">Донирајте Signal-у</string>
+    <string name="preferences__donate_to_signal">Донирајте Molly-у</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Приватност</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Промени икону и назив апликације у „%1$s“</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal ће морати да се затвори да бисте променили икону и назив апликације. У обавештењима ће се увек приказивати изворна икона и назив Signal-а.</string>
+    <string name="preferences__app_icon_dialog_description">Molly ће морати да се затвори да бисте променили икону и назив апликације. У обавештењима ће се увек приказивати изворна икона и назив Molly-а.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Изаберите икону и назив апликације који ће бити видљиви на почетном екрану и у панелу апликација вашег телефона. У обавештењима ће се увек приказивати изворна икона и назив Signal-а. Сазнајте више</string>
+    <string name="preferences__app_icon_warning_learn_more">Изаберите икону и назив апликације који ће бити видљиви на почетном екрану и у панелу апликација вашег телефона. У обавештењима ће се увек приказивати изворна икона и назив Molly-а. Сазнајте више</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Иконе и називи апликација су видљиви на почетном екрану и у панелу апликација.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">У обавештењима ће се увек приказивати изворна икона и назив Signal-а.</string>
+    <string name="preferences__app_icon_notification_warning">У обавештењима ће се увек приказивати изворна икона и назив Molly-а.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Сазнајте више</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Овим ће се трајно скратити број најскоријих порука у свим ћаскањима на %1$s.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Овим ћете са уређаја трајно избрисати целокупну историју порука и медије.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Овим ће вам трајно бити избрисана целокупна историја порука и медији са овог уређаја и свих повезаних уређаја.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Желите ли сигурно да избришете целокупну историју порука?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Целокупна историја порука биће трајно уклоњена. Та радња се не може опозвати.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Целокупна историја порука биће трајно уклоњена са свих уређаја. Ова радња се не може опозвати.</string>
     <string name="preferences_storage__delete_all_now">Избриши све сада</string>
     <string name="preferences_storage__forever">Заувек</string>
     <string name="preferences_storage__one_year">1 година</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Заобилазак цензуре</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Заобилазак цензуре</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Ако је ова опција укључена, Signal ће покушати да заобиђе цензуру. Немојте да укључујете ову функционалност ако се не налазите негде где је Signal цензурисан.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Ако је ова опција укључена, Molly ће покушати да заобиђе цензуру. Немојте да укључујете ову функционалност ако се не налазите негде где је Molly цензурисан.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Заобилазак цензуре је активиран на основу броја телефона повезаног са вашим налогом.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Представљамо плаћања</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Користите Signal за слање и примање MobileCoin-а, нове дигиталне валуте фокусиране на приватност. Активирајте да започнете.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Користите Molly за слање и примање MobileCoin-а, нове дигиталне валуте фокусиране на приватност. Активирајте да започнете.</string>
     <string name="PaymentsHomeFragment__activate_payments">Активирај плаћања</string>
     <string name="PaymentsHomeFragment__activating_payments">Активирање плаћања…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Повраћај налога за плаћања</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Плаћања нису доступна у вашем региону.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Омогућавање плаћања није успело. Пробајте поново касније.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Желите ли да деактивирате плаћања?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Нећете моћи да шаљете или примате MobileCoin у Signal-у ако деактивирате плаћања.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Нећете моћи да шаљете или примате MobileCoin у Molly-у ако деактивирате плаћања.</string>
     <string name="PaymentsHomeFragment__deactivate">Деактивирај</string>
     <string name="PaymentsHomeFragment__continue">Настави</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Стање тренутно није доступно.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Опширније</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Можете да користите Signal да бисте слали и примали MobileCoin. Сва плаћања подлежу условима коришћења за MobileCoin и MobileCoin Wallet. Може се десити да наиђете на неке проблеме због којих се плаћања или износи које можда изгубите не могу повратити. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Можете да користите Molly да бисте слали и примали MobileCoin. Сва плаћања подлежу условима коришћења за MobileCoin и MobileCoin Wallet. Може се десити да наиђете на неке проблеме због којих се плаћања или износи које можда изгубите не могу повратити. </string>
     <string name="PaymentsHomeFragment__activate">Активирај</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Погледајте услове за MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Плаћања на Signal-у више није доступна. И даље можете да пренесете средства на берзу, али више не можете да шаљете и примате уплате или да уплаћујете средства.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Плаћања на Molly-у више није доступна. И даље можете да пренесете средства на берзу, али више не можете да шаљете и примате уплате или да уплаћујете средства.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Дозволе</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Да бисте могли да шаљете поруке људима које знате, Signal ће затражити ове дозволе. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Да бисте могли да шаљете поруке људима које знате, Molly ће затражити ове дозволе. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Обавештења</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Следеће</string>
     <string name="PaymentsTransferFragment__invalid_address">Неважећа адреса</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Проверите адресу новчаника на коју покушавате да пренесете и пробајте поново.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Не можете пренети на своју адресу новчаника на Signal-у. Унесите адресу новчаника са свог налога на подржаној берзи.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Да бисте скенирали QR кoд, Signal-у је потребан приступ камери.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal-у је потребна дозвола за приступ камери да би могао да сними QR код. Идите на подешавања, изаберите „Дозволе“ и и укључите опцију „Камера“.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Да бисте скенирали QR кoд, Signal-у је потребан приступ камери.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Не можете пренети на своју адресу новчаника на Molly-у. Унесите адресу новчаника са свог налога на подржаној берзи.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Да бисте скенирали QR кoд, Molly-у је потребан приступ камери.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly-у је потребна дозвола за приступ камери да би могао да сними QR код. Идите на подешавања, изаберите „Дозволе“ и и укључите опцију „Камера“.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Да бисте скенирали QR кoд, Molly-у је потребан приступ камери.</string>
     <string name="PaymentsTransferFragment__settings">Подешавања</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Долазни гласовни позив преко Signal-а</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Долазни гласовни позив преко Molly-а</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Долазни видео позив преко Signal-а</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Долазни видео позив преко Molly-а</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Долазни групни позив преко Signal-а</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Долазни групни позив преко Molly-а</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Гласовни позив преко Signal-а је у току</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Гласовни позив преко Molly-а је у току</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Видео позив преко Signal-а је у току</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Видео позив преко Molly-а је у току</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Групни позив преко Signal-а је у току</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Групни позив преко Molly-а је у току</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Учитавање…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Верификуј</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Унели сте приступну фразу за резервне копије</string>
     <string name="BackupDialog_passphrase_was_not_correct">Приступна фраза није тачна</string>
-    <string name="LocalBackupJob_creating_signal_backup">Креирање резервне копије Signal-а…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Креирање резервне копије Molly-а…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Верификовање резервне копије Signal-a…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Верификовање резервне копије Molly-a…</string>
     <string name="LocalBackupJobApi29_backup_failed">Креирање резервне копије није успело</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Ваш фолдер за резервне копије је избрисан или премештен.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Фајл резервне копије је превелики да би се чувао на овој јединици.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Позови ме (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Поново пошаљи шифру (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Обратите се подршци за Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Rегистрација Signal-a – шифра за верификацију за Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Обратите се подршци за Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Rегистрација Molly-a – шифра за верификацију за Android</string>
     <string name="RegistrationActivity_incorrect_code">Нетачан код</string>
     <string name="BackupUtil_never">Никад</string>
     <string name="BackupUtil_unknown">Непознато</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Број телефона</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Одаберите ко може да види ваш број телефона и ко може да вам се обрати у Signal-у преко њега.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Одаберите ко може да види ваш број телефона и ко може да вам се обрати у Molly-у преко њега.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Ко може да види мој број</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Имали сте превише покушаја. Пробајте поново касније.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Грешка приликом повезивања са услугом</string>
     <string name="preferences_chats__backups">Резервне копије</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal је закључан</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly је закључан</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">ДОДИРНИТЕ ДА ОТКЉУЧАТЕ</string>
     <string name="Recipient_unknown">Непознато</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Потребан вам је приступ старом уређају.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Враћање садржаја из резервне копије</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Вратите своје поруке из локалне резервне копије. Ако их не вратите сада, нећете моћи да их вратите касније.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Врати локалну резервну копију</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Врати резервну копију Signal-а</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Вратите све текстуалне поруке и медије од последњих 30 дана</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Више опција</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Откажи</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Пријави се без преноса података</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Наставите без преноса порука и медија</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Отворите Signal на старом Android телефону</string>
     <string name="NewDeviceTransferInstructions__continue">Настави</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Припрема за повезивање са старим Android уређајем…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Потребно је мало времена, требало би да буде спремно ускоро</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Чекање да се стари Android уређај повеже…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal-у је потребна дозвола за приступ локацији да би могао да открије ваш стари Android уређај и повеже се са њим.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal-у је потребно да локација буде укључена да би могао да открије ваш стари Android уређај и повеже се са њим.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal-у је потребан Wi-Fi да би могао да открије ваш стари Android уређај и повеже се са њим. Wi-Fi мора бити укључен, али не мора бити повезан са Wi-Fi мрежом.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Изгледа да овај уређај не подржава Wi-Fi Direct. Signal користи Wi-Fi Direct да би могао да открије ваш стари Android уређај и повеже се са њим. И даље можете да вратите резервну копију да бисте вратили свој налог са старог Android уређаја.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly-у је потребна дозвола за приступ локацији да би могао да открије ваш стари Android уређај и повеже се са њим.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly-у је потребно да локација буде укључена да би могао да открије ваш стари Android уређај и повеже се са њим.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly-у је потребан Wi-Fi да би могао да открије ваш стари Android уређај и повеже се са њим. Wi-Fi мора бити укључен, али не мора бити повезан са Wi-Fi мрежом.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Изгледа да овај уређај не подржава Wi-Fi Direct. Molly користи Wi-Fi Direct да би могао да открије ваш стари Android уређај и повеже се са њим. И даље можете да вратите резервну копију да бисте вратили свој налог са старог Android уређаја.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Вратите резервну копију</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Дошло је до неочекиване грешке приликом повезивања са вашим старим Android уређајем.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Тражење новог Android уређаја…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal-у је потребна дозвола за приступ локацији да би могао да открије ваш нови Android уређај и повеже се са њим.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal-у је потребно да локација буде укључена да би могао да открије ваш нови Android уређај и повеже се са њим.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal-у је потребан Wi-Fi да би могао да открије ваш нови Android уређај и повеже се са њим. Wi-Fi мора бити укључен, али не мора бити повезан са Wi-Fi мрежом.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Изгледа да овај уређај не подржава Wi-Fi Direct. Signal користи Wi-Fi Direct да би могао да открије ваш нови Android уређај и повеже се са њим. И даље можете да вратите резервну копију да бисте вратили свој налог на нови Android уређај.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly-у је потребна дозвола за приступ локацији да би могао да открије ваш нови Android уређај и повеже се са њим.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly-у је потребно да локација буде укључена да би могао да открије ваш нови Android уређај и повеже се са њим.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly-у је потребан Wi-Fi да би могао да открије ваш нови Android уређај и повеже се са њим. Wi-Fi мора бити укључен, али не мора бити повезан са Wi-Fi мрежом.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Изгледа да овај уређај не подржава Wi-Fi Direct. Molly користи Wi-Fi Direct да би могао да открије ваш нови Android уређај и повеже се са њим. И даље можете да вратите резервну копију да бисте вратили свој налог на нови Android уређај.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Креирајте резервну копију</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Дошло је до неочекиване грешке приликом повезивања са вашим новим Android уређајем.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Преношење података</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Приближите уређаје, не искључујте их и не затварајте Signal. Преноси су потпуно шифровани.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Приближите уређаје, не искључујте их и не затварајте Molly. Преноси су потпуно шифровани.</string>
     <string name="DeviceTransfer__d_messages_so_far">Број порука до сада: %1$d…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% порука до сада…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Пренесите налог</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Преузмите Signal на свој нови Android уређај</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Преузмите Molly на свој нови Android уређај</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Додирните „Пренесите или вратите налог“"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Свако ко види овај линк може да види назив и слику ове групе, као и да затражи да се придружи групи. Поделите линк са људима у које имате поверења.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Свако ко види овај линк може да види назив и слику ове групе, као и да се придружи групи. Поделите линк са људима у које имате поверења.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Поделите преко Signal-а</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Поделите преко Molly-а</string>
     <string name="GroupLinkBottomSheet_copy">Копирај</string>
     <string name="GroupLinkBottomSheet_qr_code">QR код</string>
     <string name="GroupLinkBottomSheet_share">Поделите</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">О MobileCoin-у</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin је нова дигитална валута фокусирана на приватност.</string>
     <string name="payment_info_card_adding_funds">Додавање средстава</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Можете да додате средства за коришћење у Signal-у тако што ћете послати MobileCoin на своју адресу новчаника.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Можете да додате средства за коришћење у Molly-у тако што ћете послати MobileCoin на своју адресу новчаника.</string>
     <string name="payment_info_card_cashing_out">Уновчавање</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Можете да уновчите MobileCoin у било којем тренутку на берзи која подржава MobileCoin. Само пренесите на свој рачун на тој берзи.</string>
     <string name="payment_info_card_hide_this_card">Желите ли да сакријете ову картицу?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Деактивирај новчаник</string>
     <string name="DeactivateWalletFragment__your_balance">Ваш износ</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Препоручујемо вам да пренесете средства на другу адресу новчаника пре деактивирања плаћања. Ако не пренесете средства сада, остаће у вашем новчанику повезаном за Signal ако поново активирате плаћања.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Препоручујемо вам да пренесете средства на другу адресу новчаника пре деактивирања плаћања. Ако не пренесете средства сада, остаће у вашем новчанику повезаном за Molly ако поново активирате плаћања.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Пренесите преостали износ</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Деактивирај без преноса</string>
     <string name="DeactivateWalletFragment__deactivate">Деактивирај</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Желите ли да деактивирате без преноса?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Ваша средства ће остати у вашем новчанику повезаном за Signal ако поново активирате плаћања.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Ваша средства ће остати у вашем новчанику повезаном за Molly ако поново активирате плаћања.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Грешка приликом деактивирања новчаника.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Лиценце</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Услови коришћења и Правила за заштиту приватности</string>
-    <string name="HelpFragment__copyright_signal_messenger">Ауторска права Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Ауторска права Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Лиценцирано под бројем GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4773,7 +4911,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">Аутоматски</string>
+    <string name="ChatColorSelectionFragment__auto">Аутом.</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Користите прилагођене боје</string>
     <string name="ChatColorSelectionFragment__chat_color">Боја ћаскања</string>
     <string name="ChatColorSelectionFragment__edit">Измени</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Одаберите боју</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Поделите</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Само администратори могу слати поруке у овој групи.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Достигнут је лимит</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Не може се означити више од 5 ћаскања</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Сазнајте више</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Ажурирај Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Ажурирај Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Ова верзија Signal-а је истекла. Ажурирајте апликацију сада да наставите да користите Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Ова верзија Molly-а је истекла. Ажурирајте апликацију сада да наставите да користите Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Сачувај</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Уређај није регистрован</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Овај уређај више није регистрован. Поново се региструјте да бисте наставили да користите Signal на овом уређају.</string>
+    <string name="ReregisterSignalDialog__message">Овај уређај више није регистрован. Поново се региструјте да бисте наставили да користите Molly на овом уређају.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Поново региструј</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Отварање бирача није успело.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Да бисте активирали обавештења, морате дати дозволу Signal-у да их приказује.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Да бисте активирали обавештења, морате дати дозволу Molly-у да их приказује.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Укључи</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Још увек нема одговора</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Не можете да одговорите на ову причу јер више нисте члан ове групе.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Реаговао/ла је на причу</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Реаговали сте на причу</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Реаговао/ла је на причу</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Прегледи</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Изаберите банку</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Потврдите своју донацију са банком %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Да бисте подесили периодичну донацију, додирните „Настави“ да потврдите наплату од 0,01 € у банци. Тај износ ће вам аутоматски бити враћен и тиме ће се омогућити да се ваша донација од 5 € месечно наплати са вашег рачуна.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Да бисте подесили периодичну донацију, додирните „Настави“ да потврдите наплату од 0,01 € у банци. Тај износ ће вам аутоматски бити враћен и тиме ће се омогућити да се ваша донација од %1$s месечно наплати са вашег рачуна.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Настави</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Преузимање података резервне копије…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Прављење резервних копија медија је искључено</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Ваш резервни пакет за медије у Signal-у је отказан јер нисмо могли да обрадимо вашу уплату. Имате %1$d дан да преузмете све медије сачуване у вашој резервној копији. Након %1$d дана, медији у вашој резервној копији ће бити избрисани.</item>
+        <item quantity="other">Ваш резервни пакет за медије у Signal-у је отказан јер нисмо могли да обрадимо вашу уплату. Имате %1$d дан(а) да преузмете све медије сачуване у вашој резервној копији. Након %1$d дана, медији у вашој резервној копији ће бити избрисани.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Можете поново да почнете да плаћате резервне копије у било ком тренутку да бисте наставили са прављењем резервних копија свих својих медија. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Ваши медији ће бити избрисани данас</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Ваш резервни пакет за медије у Signal-у је отказан јер нисмо могли да обрадимо вашу уплату. Ово вам је последња прилика да преузмете медије у вашој резервној копији пре него што буду избрисани.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Није могуће завршити преузимање</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">На уређају нема довољно слободног простора. За преузимање медија сачуваног унутар резервне копије ослободите до %1$s простора.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Ако изаберете „Прескочи“, медији у вашој резервној копији ће бити избрисани за %1$d дан.</item>
+        <item quantity="other">Ако изаберете „Прескочи“, медији у вашој резервној копији ће бити избрисани за %1$d дан(а).</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Нисмо успели да обрадимо уплату за резервну копију</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Нисмо успели да преузмемо вашу месечну уплату за резервне копије. Проверите да ли је ваш начин плаћања ажуран. Ако није, ажурирајте га у Google Pay-у. Signal ће поново покушати да обради уплату за неколико дана.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Прављење резервне копије није успело</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Резервна копија није направљена на вашем уређају %1$d дан(а). Проверите да ли вам је уређај повезан на Wi-Fi, а затим додирните „Направи резервну копију”. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Сазнајте више</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Прескочи</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Преузми медије</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Преузми касније</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Не преузимај медије</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">За преузимање медија ослободите %1$s простора.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Кредитна или дебитна картица</string>
@@ -6874,16 +7058,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Непознато</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Историја плаћања</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Последња резервна копија направљена је %1$s у %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">Ограничење у ћаскању</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">Ограничења броја ћаскања</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">Избриши историју порука</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Поруке старије од изабраног периода биће трајно избрисане.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Поруке које премашују изабрану дужину биће трајно избрисане.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Примени ограничења на повезане уређаје</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Када је ова опција активирана, опција за ограничење ћаскања ће такође избрисати поруке са ваших повезаних уређаја.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Брисање је сада синхронизовано на свим вашим уређајима</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Када избришете поруке или ћаскања, они ће бити избрисани са вашег телефона и свих повезаних уређаја.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">У реду</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Историја плаћања</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Резервна копија текста и осталих медија</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Подаци о плаћању</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Врста резервне копије</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Датум плаћања</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Поделите</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Резервне поруке Signal-а</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Историја плаћања</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Детаљи о резервној копији</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Величина резервне копије</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Учесталост резервних копија</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Резервне копије преко мобилне мреже</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Искључи и избриши резервне копије</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Резервна копија је избрисана и искључена.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Врста резервне копије је промењена, а претплата је отказана</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Претплата је отказана</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Преузимање је завршено</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Врста резервне копије</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Резервне копије су онемогућене</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/месечно</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Укључи резервне копије</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Последња резервна копија</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s у %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Никад</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Направи резервну копију</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Желите да искључите и избришете резервне копије?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Наплата се неће обновити. Ваша резервна копија ће бити избрисана, а нове резервне копије се неће креирати.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Искључи и избриши</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Брисање резервне копије…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Резервна копија је избрисана</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Кликом на „Направи резервну копију сада”"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Сваког дана</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Сваке недеље</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Месечно</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Ручно прави резервне копије</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Унесите PIN, лозинку или шаблон за уређај.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Следеће</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Промени тип резервне копије</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Откажи претплату</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Потврди отказивање</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Неће вам бити поново наплаћено. Резервне копије ће бити искључене на крају обрачунског циклуса. Након тог датума имаћете 30 дана да преузмете медије за које тренутно правите резервне копије.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Потврди и преузми</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Потврди и преузми касније</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Задржи претплату</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 26c2127232..8f731e762c 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal uppdateras…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly uppdateras…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Du har inte angivit ett lösenord än!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Inaktivera lösenord?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Detta låser upp Signal och meddelandeaviseringar permanent.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Detta låser upp Molly och meddelandeaviseringar permanent.</string>
     <string name="ApplicationPreferencesActivity_disable">Inaktivera</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fel vid anslutning till server!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN-koder krävs för registreringslås. För att inaktivera PIN-koder, inaktivera först registreringslåset.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Fil</string>
     <string name="AttachmentKeyboard_contact">Kontakt</string>
     <string name="AttachmentKeyboard_location">Plats</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal behöver behörighet för att visa dina foton och videor</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly behöver behörighet för att visa dina foton och videor</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Tillåt åtkomst</string>
     <string name="AttachmentKeyboard_payment">Betalning</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Kan inte hitta app för att välja media.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal behöver behörigheten Lagring för att bifoga bilder, video och ljud men den har avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Lagring\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal behöver behörigheten Kontakter för att bifoga kontaktinformation men den har avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Kontakter\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal behöver behörigheten Plats för att bifoga platser men den har avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Plats\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly behöver behörigheten Lagring för att bifoga bilder, video och ljud men den har avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Lagring\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly behöver behörigheten Kontakter för att bifoga kontaktinformation men den har avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Kontakter\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly behöver behörigheten Plats för att bifoga platser men den har avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Plats\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Tillåt åtkomst till din plats</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Så här skickar du din plats:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Ge Signal tillåtelse att skicka din plats.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Ge Molly tillåtelse att skicka din plats.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal behöver platsåtkomst för att skicka din plats.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly behöver platsåtkomst för att skicka din plats.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Tillåt åtkomst till lagring</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">För att visa foton och videor:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal behöver åtkomst till lagring för att visa dina foton och videor.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly behöver åtkomst till lagring för att visa dina foton och videor.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s har inte aktiverat betalningar </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Byt kamera</string>
     <string name="CameraXFragment_open_gallery_description">Öppna galleri</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Tillåt åtkomst</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Tillåt åtkomst till din kamera och mikrofon</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Tillåt åtkomst till din kamera</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Tillåt åtkomst till din mikrofon</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Ge Signal åtkomst till kameran för att ta bilder.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">För att fånga fotografier och video, tillåt Signal att tillgå kameran.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">För att kunna ta bilder och spela in video måste Signal ha åtkomst till kameran och mikrofonen.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Ge Signal åtkomst till mikrofonen för att spela in videor med ljud.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Ge Signal åtkomst till kameran för att skanna en QR-kod.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal behöver åtkomst till kameran för att ta bilder</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal behöver åtkomst till kameran för att skanna QR-koder</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal behöver åtkomst till mikrofonen för att spela in video</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">För att ta bilder i Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">För att ta bilder och spela in videor i Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">För att spela in videor med ljud:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">För att skanna QR-koder:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Senaste kontakter</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Inga Signal-kontakter</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Du kan bara använda kameraknappen för att skicka foton till Signal-kontakter. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Kan du inte hitta den du letar efter?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Bjud in en kontakt för att gå med i Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Bjud in en kontakt för att gå med i Molly</string>
     <string name="CameraContacts__menu_search">Sök</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Nej tack</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Uppdatera Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Uppdatera Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Denna version av appen stöds inte längre. För att fortsätta skicka och ta emot meddelanden, uppdatera till den senaste versionen.</string>
     <string name="ClientDeprecatedActivity_update">Uppdatera</string>
     <string name="ClientDeprecatedActivity_dont_update">Uppdatera inte</string>
     <string name="ClientDeprecatedActivity_warning">Varning</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Din version av Signal har upphört att gälla. Du kan visa din meddelandehistorik men du kan inte skicka eller ta emot meddelanden förrän du uppdaterar.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Din version av Molly har upphört att gälla. Du kan visa din meddelandehistorik men du kan inte skicka eller ta emot meddelanden förrän du uppdaterar.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Ingen webbläsare hittades.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Meddelande %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly-röstsamtal %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly-videosamtal %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal-meddelande</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Skicka meddelande</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Låt oss använda Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Låt oss använda Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Välj en kontakt</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Bilagan överskrider storleksgränserna för den typ av meddelande du skickar.</string>
     <string name="ConversationActivity_unable_to_record_audio">Det går inte att spela in ljud!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Så här skickar du ljudmeddelanden:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">För att skicka röstmeddelanden behöver du ge Signal åtkomst till din mikrofon.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">För att skicka röstmeddelanden behöver du ge Molly åtkomst till din mikrofon.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal behöver åtkomst till mikrofonen för att spela in ett röstmeddelande.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal behöver behörigheten Mikrofon för att skicka ljudmeddelanden men den avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Mikrofon\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly behöver åtkomst till mikrofonen för att spela in ett röstmeddelande.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly behöver behörigheten Mikrofon för att skicka ljudmeddelanden men den avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Mikrofon\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal behöver behörigheterna Mikrofon och Kamera för att ringa%1$s men de har avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Mikrofon\" och Kamera\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">För att fånga fotografier och video, tillåt Signal att tillgå kameran.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal behöver behörigheten Kamera för att ta bilder och filma men den har avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal behöver behörigheten Kamera för att ta bilder och filma</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly behöver behörigheterna Mikrofon och Kamera för att ringa%1$s men de har avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Mikrofon\" och Kamera\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">För att fånga fotografier och video, tillåt Molly att tillgå kameran.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly behöver behörigheten Kamera för att ta bilder och filma men den har avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly behöver behörigheten Kamera för att ta bilder och filma</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Aktivera behörigheten Mikrofon för att spela in videor med ljud.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal behöver mikrofonbehörigheter för att spela in videor men de har avfärdats. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Mikrofon\" och \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal behöver behörigheten Mikrofon för att filma.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly behöver mikrofonbehörigheter för att spela in videor men de har avfärdats. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Mikrofon\" och \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly behöver behörigheten Mikrofon för att filma.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Nej</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Så här startar du ett samtal:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">För att starta ett samtal behöver du ge Signal åtkomst till mikrofonen.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">För att starta ett samtal behöver du ge Molly åtkomst till mikrofonen.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal behöver åtkomst till mikrofonen för att starta ett samtal.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly behöver åtkomst till mikrofonen för att starta ett samtal.</string>
 
 
     <string name="ConversationActivity_join">Gå med</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Sms-meddelanden stöds inte längre i Signal. Bjud in %1$s till Signal för att hålla konversationen här.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Den här personen använder inte längre Signal. Bjud in dem till Signal för att hålla konversationen här.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Den här personen använder inte längre Molly. Bjud in dem till Molly för att hålla konversationen här.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Bjud in till Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Bjud in till Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Du kommer snart att bli påmind igen.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Ta bort för alla</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Ta bort från den här enheten</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Ta bort</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Ta bort överallt</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Detta meddelande tas bort för alla i chatten om de använder en ny version av Signal. De kommer att kunna se att du har tagit bort ett meddelande.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Blockerade</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Uppdatera Signal</string>
+    <string name="ConversationFragment__update_build">Uppdatera Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Registrera om Signal</string>
+    <string name="ConversationFragment__reregister_signal">Registrera om Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Navigera tillbaka.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Öppna Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Öppna Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Inte längre verifierad</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Detta kommer att ta bort den valda chatten permanent.</item>
         <item quantity="other">Detta kommer att ta bort alla %1$d valda chattar permanent.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Detta tar permanent bort den valda chatten från alla dina enheter.</item>
+        <item quantity="other">Detta tar permanent bort de %1$d valda chattarna från alla dina enheter.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Tar bort</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Tar bort vald chatt …</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Vem kan hitta mig med nummer?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Alla som har ditt telefonnummer ser att du är på Signal och kan börja chatta med dig.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Alla som har ditt telefonnummer ser att du är på Molly och kan börja chatta med dig.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ingen kommer att kunna se att du är på Signal om du inte skickar ett meddelande eller har en befintlig chatt med dem.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ingen kommer att kunna se att du är på Molly om du inte skickar ett meddelande eller har en befintlig chatt med dem.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Återställ från säkerhetskopia?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Testa ditt lösenord för säkerhetskopian och kontrollera att den matchar</string>
     <string name="BackupsPreferenceFragment__turn_on">Aktivera</string>
     <string name="BackupsPreferenceFragment__turn_off">Inaktivera</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"För att återställa en säkerhetskopia, installera en ny kopia av Signal. Öppna appen och tryck på \"Återställ säkerhetskopia\" och leta reda på en säkerhetskopia. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"För att återställa en säkerhetskopia, installera en ny kopia av Molly. Öppna appen och tryck på \"Återställ säkerhetskopia\" och leta reda på en säkerhetskopia. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Läs mer</string>
     <string name="BackupsPreferenceFragment__in_progress">Pågående…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d hittills…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% hittills…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal behöver behörigheten Lagring för att skapa säkerhetskopior men den har avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Lagring\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly behöver behörigheten Lagring för att skapa säkerhetskopior men den har avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Lagring\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Ställ in säkerhetskopieringstid</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Chattsessionen uppdaterad</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal använder ände-till-ände-kryptering och det kan behöva uppdateras din chattsession ibland. Detta påverkar inte din chatts säkerhet, men du kan ha missat ett meddelande från den här kontakten och du kan behöva be dem skicka det igen.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly använder ände-till-ände-kryptering och det kan behöva uppdateras din chattsession ibland. Detta påverkar inte din chatts säkerhet, men du kan ha missat ett meddelande från den här kontakten och du kan behöva be dem skicka det igen.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Använd Signal på Desktop eller iPad. Dina meddelanden synkroniseras till dina länkade enheter.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Länka en ny enhet</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Meddelanden och chattinformation skyddas av totalsträckskryptering på alla enheter</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal på Desktop eller iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Alla meddelanden på länkade enheter är privata</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Molly-meddelanden synkroniseras med Molly på din mobiltelefon efter att den har länkats. Din tidigare meddelandehistorik kommer inte att visas.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Besök %1$s på din andra enhet för att installera Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Mina länkade enheter</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Sluta länka</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s avlänkad</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Länkar enhet …</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Enhet tillåten</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Hämtar in …</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Inga länkade enheter</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Lås upp för att länka en enhet</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Skanna QR-koden som visas på enheten för att länka.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Skanna QR-kod</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Använd den här enheten för att skanna QR-koden som visas på den enhet som du vill länka</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Okej</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Denna enhet kommer att kunna se dina grupper och kontakter, få tillgång till dina chattar och skicka meddelanden i ditt namn.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Slutför länkningen på din andra enhet</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Slutför länkningen av Molly på din andra enhet.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Det gick inte att länka enhet</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Denna QR-kod är inte giltig. Se till att du skannar QR-koden som visas på enheten som du vill länka.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Försök igen</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Sluta länka till \"%1$s\"?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimera för avsaknad av Play-tjänster</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Enheten stöder inte Play-tjänster. Tryck för att inaktivera systembatterioptimeringar som hindrar Signal från att hämta meddelanden vid inaktivitet.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Enheten stöder inte Play-tjänster. Tryck för att inaktivera systembatterioptimeringar som hindrar Molly från att hämta meddelanden vid inaktivitet.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Denna version av Signal har upphört att gälla. Uppdatera nu för att skicka och ta emot meddelanden.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Denna version av Molly har upphört att gälla. Uppdatera nu för att skicka och ta emot meddelanden.</string>
     <string name="ExpiredBuildReminder_update_now">Uppdatera nu</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Visa</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanent kommunikationsfel med Signal!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal kunde inte registrera sig på Google Play-tjänster. Signal-meddelanden och -samtal har inaktiverats, försök att återregistrera i Inställningar &gt; Avancerat.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanent kommunikationsfel med Molly!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly kunde inte registrera sig på Google Play-tjänster. Molly-meddelanden och -samtal har inaktiverats, försök att återregistrera i Inställningar &gt; Avancerat.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Felsökningsloggar hjälper oss att diagnostisera och åtgärda problemet och innehåller inte identifierande information.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal stötte på ett problem. Skicka felsökningslogg?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly stötte på ett problem. Skicka felsökningslogg?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Aviseringar kan försenas på grund av batterioptimeringar</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Du kan inaktivera batterioptimeringar för Signal för att säkerställa att meddelandeaviseringar inte försenas.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Du kan inaktivera batterioptimeringar för Molly för att säkerställa att meddelandeaviseringar inte försenas.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Aviseringar kan försenas på grund av batterioptimeringar</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Inaktivera batterioptimeringar för Molly för att säkerställa att meddelandeaviseringar inte försenas. Tryck på Fortsätt för att se enhetsspecifika instruktioner.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Nej tack</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Fortsätt</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Fortsätt</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Avfärda</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Nej tack</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Väntande gruppinbjudningar</string>
+    <string name="PendingMembersActivity_pending_group_invites">Förfrågningar &amp; inbjudningar</string>
     <string name="PendingMembersActivity_requests">Förfrågningar</string>
     <string name="PendingMembersActivity_invites">Inbjudningar</string>
     <string name="PendingMembersActivity_people_you_invited">Personer du bjudit in</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Avbryt</string>
     <string name="InviteActivity_sending">Skickar…</string>
     <string name="InviteActivity_invitations_sent">Inbjudningar skickade!</string>
-    <string name="InviteActivity_invite_to_signal">Bjud in till Signal</string>
+    <string name="InviteActivity_invite_to_signal">Bjud in till Molly</string>
     <string name="InviteActivity_send_sms">Skicka SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Skicka %1$d SMS-inbjudan?</item>
         <item quantity="other">Skicka %1$d SMS-inbjudningar?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Låt oss använda Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Låt oss använda Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Verkar som att du inte har några appar att dela till.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Ditt meddelande</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Bakgrundsanslutning etablerad</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Svar</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Upprättar Signal-samtal</string>
+    <string name="NotificationBarManager__establishing_signal_call">Upprättar Molly-samtal</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Startar Signal-samtalstjänsten</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Avbryter Signal-samtalstjänsten</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Startar Molly-samtalstjänsten</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Avbryter Molly-samtalstjänsten</string>
     <string name="NotificationBarManager__cancel_call">Avbryt samtal</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Du har aktiverat betalningar</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s kan nu ta emot betalningar</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Betalningsinformation är inte tillgänglig</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Tryck för mer</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Betalningsinformation är inte tillgänglig</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Denna betalningsinformation är inte tillgänglig eftersom dina meddelanden har återställts från en källa som inte innehöll denna betalningshistorik. Detta påverkar inte ditt plånbokssaldo eller statusen för tidigare betalningar.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Snart kommer du inte längre att kunna skicka sms från Signal. Bjud in %1$s till Signal för att hålla konversationen här.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Du kan inte längre skicka sms i Signal. Bjud in %1$s till Signal för att hålla konversationen här.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Du kan inte längre skicka sms i Molly. Bjud in %1$s till Molly för att hålla konversationen här.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Betalning: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Betalning</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Rapporterad som skräppost</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Länka en Signal-enhet?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Det verkar som att du försöker länka en Signal-enhet med hjälp av en tredjepartsskanner. För din säkerhet, skanna koden igen inifrån Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal behöver behörigheten Kamera för att skanna QR-koder men det har avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Kamera\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly behöver behörigheten Kamera för att skanna QR-koder men det har avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Kamera\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Det går inte att skanna en QR-kod utan behörigheten Kamera</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Ange lösenord</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal-ikon</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly-ikon</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Skicka lösenord</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Fel lösenord!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Lås upp Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Låsskärm</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Lås upp Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Låsskärm</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Karta</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Verifiera för att fortsätta skicka meddelanden</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">För att förhindra skräppost på Signal, slutför verifieringen.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">För att förhindra skräppost på Molly, slutför verifieringen.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Efter verifiering kan du fortsätta skicka meddelanden. Alla pausade meddelanden skickas automatiskt.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Min Story</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal-samtal</string>
+    <string name="Recipient_signal_call">Molly-samtal</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Blockera</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Ringer…</string>
     <string name="RedPhone_busy">Upptaget</string>
     <string name="RedPhone_recipient_unavailable">Mottagaren är otillgänglig</string>
-    <string name="RedPhone_network_failed">Nätverket misslyckades</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Nätverket misslyckades. Kontrollera din nätverksanslutning och försök igen.</string>
     <string name="RedPhone_number_not_registered">Numret är inte registrerat!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Numret du ringde har inte stöd för säkra röstsamtal!</string>
     <string name="RedPhone_got_it">Uppfattat</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Tryck här för att aktivera din video</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">För att ringa %1$s behöver Signal åtkomst till din kamera</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">För att ringa %1$s behöver Molly åtkomst till din kamera</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Ringer…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Återansluter…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Borttagen från samtalet</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Någon har tagit bort dig från samtalet.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Tillåt åtkomst till din kamera och mikrofon</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Tillåt åtkomst till din mikrofon</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Tillåt åtkomst till din kamera</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">För att starta eller gå med i ett samtal måste du ge Molly åtkomst till kameran och mikrofonen.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">För att starta ett samtal behöver du ge Molly åtkomst till mikrofonen.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">För att aktivera din video måste du ge Molly åtkomst till din kamera.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly behöver mikrofonbehörigheter för att starta eller gå med i ett samtal.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly behöver kameraåtkomst för att aktivera din video</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Så här startar du eller går med i ett samtal:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Så här aktiverar du din video:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal-samtal</string>
-    <string name="WebRtcCallView__signal_video_call">Signal-videosamtal</string>
+    <string name="WebRtcCallView__signal_call">Molly-samtal</string>
+    <string name="WebRtcCallView__signal_video_call">Molly-videosamtal</string>
     <string name="WebRtcCallView__start_call">Starta samtal</string>
     <string name="WebRtcCallView__join_call">Gå med i samtalet</string>
     <string name="WebRtcCallView__call_is_full">Samtalet är fullt</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Ta ner handen?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Ta ner handen</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Ta ner</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Avbryt</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Du räckte upp handen</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Visa</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s räcker upp handen</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s räcker upp handen</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d räcker upp handen</item>
+        <item quantity="other">%1$s + %2$d räcker upp handen</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s räcker upp handen</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d räcker upp handen</item>
         <item quantity="other">%1$s + %2$d räcker upp handen</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Du får ett samtal för att verifiera detta nummer.</string>
     <string name="RegistrationActivity_edit_number">Ändra nummer</string>
     <string name="RegistrationActivity_missing_google_play_services">Saknar Google Play-tjänster</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Denna enhet saknar Google Play-tjänster. Du kan fortfarande använda Signal men denna konfiguration kan leda till minskad tillförlitlighet eller prestanda.\n\nOm du inte är en avancerad användare, inte använder en egenhändigt modifierad Android ROM eller tror att du ser detta på grund av ett fel, kontakta support@signal.org för hjälp med felsökning.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Denna enhet saknar Google Play-tjänster. Du kan fortfarande använda Molly men denna konfiguration kan leda till minskad tillförlitlighet eller prestanda.\n\nOm du inte är en avancerad användare, inte använder en egenhändigt modifierad Android ROM eller tror att du ser detta på grund av ett fel, kontakta support@molly.im för hjälp med felsökning.</string>
     <string name="RegistrationActivity_i_understand">Jag förstår</string>
     <string name="RegistrationActivity_play_services_error">Fel på Google Play-tjänster</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play-tjänster uppdateras eller är tillfälligt otillgängliga. Försök igen.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Icke-standardiserat sifferformat</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Siffran du angav (%1$s) verkar vara ett icke-standardformat.\n\nMenade du %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Telefonnummerformat</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Telefonnummerformat</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Samtal begärt</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Har problem med att registrera?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Se till att din telefon har en mobilsignal för att ta emot ditt sms eller samtal\n • Bekräfta att du kan ta emot ett telefonsamtal till numret\n • Kontrollera att du har angett ditt telefonnummer korrekt.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">För mer information, följ dessa felsökningssteg eller kontakta supporten</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Följ %1$s eller %2$s för mer information</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">dessa felsökningssteg</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Lägg till i kontakter</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Bjud in till Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Bjud in till Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal-meddelande</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal-samtal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Lägg till i kontakter</string>
-    <string name="SharedContactView_invite_to_signal">Bjud in till Signal</string>
+    <string name="SharedContactView_invite_to_signal">Bjud in till Molly</string>
     <string name="SharedContactView_message">Signal-meddelande</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s tillhör %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal-uppdatering</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">En ny version av Signal är tillgänglig. Tryck för att uppdatera.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Det gick inte att uppdatera Signal</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly-uppdatering</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">En ny version av Molly är tillgänglig. Tryck för att uppdatera.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Det gick inte att uppdatera Molly</string>
     <string name="ApkUpdateNotifications_failed_general_body">Vi försöker igen senare.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal har uppdaterats</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly har uppdaterats</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Du uppdaterades automatiskt till version %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Vårt säkerhetsnummer för Signal:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Verkar som att du inte har några appar att dela till.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Inga säkerhetsnummer att jämföra med hittades i urklipp</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal behöver behörigheten Kamera för att skanna QR-koder men den har avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Kamera\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly behöver behörigheten Kamera för att skanna QR-koder men den har avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Kamera\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Det går inte att skanna en QR-kod utan behörigheten Kamera</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Du måste först utbyta meddelanden för att kunna se %1$ss säkerhetsnummer.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Tryck för att öppna.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal är olåst</string>
-    <string name="KeyCachingService_lock">Lås Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly är olåst</string>
+    <string name="KeyCachingService_lock">Lås Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Du</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Mediatypen stöds inte</string>
     <string name="MediaPreviewActivity_draft">Utkast</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal behöver behörigheten Lagring för att spara i extern lagring men det har avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Lagring\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly behöver behörigheten Lagring för att spara i extern lagring men det har avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Lagring\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Kan inte spara i extern lagring utan behörighet</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Ta bort meddelande?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Detta tar bort detta meddelande permanent.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Det gick inte att leverera meddelandet.</string>
     <string name="MessageNotifier_error_delivering_message">Fel vid leverans av meddelande.</string>
     <string name="MessageNotifier_message_delivery_paused">Meddelandeleverans har pausats.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifiera för att fortsätta skicka meddelanden på Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Verifiera för att fortsätta skicka meddelanden på Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Markera alla som lästa</string>
     <string name="MessageNotifier_mark_read">Läst</string>
     <string name="MessageNotifier_turn_off_these_notifications">Inaktivera dessa aviseringar</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Reagerade %1$s på ditt klistermärke.</string>
     <string name="MessageNotifier_this_message_was_deleted">Detta meddelande togs bort.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Inaktivera Signal-aviseringar när kontakter ansluter sig? Du kan aktivera dem igen i Signal &gt; Inställningar &gt; Aviseringar.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Inaktivera Molly-aviseringar när kontakter ansluter sig? Du kan aktivera dem igen i Molly &gt; Inställningar &gt; Aviseringar.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Snabbsvar är otillgängligt när Signal är låst!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Snabbsvar är otillgängligt när Molly är låst!</string>
     <string name="QuickResponseService_problem_sending_message">Problem med att skicka meddelandet!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Ogiltig genväg</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Nytt meddelande</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Meddelandeförfrågan</string>
     <string name="SingleRecipientNotificationBuilder_you">Du</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Den här enheten är inte längre registrerad. Detta beror troligen på att du registrerade ditt telefonnummer med Signal på en annan enhet.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Den här enheten är inte längre registrerad. Detta beror troligen på att du registrerade ditt telefonnummer med Molly på en annan enhet.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Registrera om enheten</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">För att svara på samtalet, ge Signal åtkomst till din mikrofon.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">För att svara på samtalet, ge Molly åtkomst till din mikrofon.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Ge Signal åtkomst till din mikrofon och kamera för att svara på videosamtalet.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal behöver behörigheterna Mikrofon och Kamera för att ringa och ta emot samtal, men de har avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Mikrofon\" och \"Kamera\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Ge Molly åtkomst till din mikrofon och kamera för att svara på videosamtalet.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly behöver behörigheterna Mikrofon och Kamera för att ringa och ta emot samtal, men de har avfärdats permanent. Fortsätt till inställningar för appar, välj \"Behörigheter\" och aktivera \"Mikrofon\" och \"Kamera\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Besvarades på en länkad enhet.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Avböjde på en länkad enhet.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Upptagen på en länkad enhet.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Upprepa nytt lösenord</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Bjud in till Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Bjud in till Molly</string>
     <string name="contact_selection_activity__new_group">Ny grupp</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Uppdatera kontakter</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Saknar du någon? Prova att uppdatera</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Hitta personer som du känner på Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Tillåt åtkomst till dina kontakter</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Mer</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Kontaktfoto</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal behöver behörigheten Kontakter för att bifoga kontaktinformation men det har avfärdats permanent. Fortsätt till menyn för appinställningar, välj \"Behörigheter\" och aktivera \"Kontakter\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly behöver behörigheten Kontakter för att bifoga kontaktinformation men det har avfärdats permanent. Fortsätt till menyn för appinställningar, välj \"Behörigheter\" och aktivera \"Kontakter\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Ett fel inträffade med att hämta kontakter, kontrollera din nätverksanslutning</string>
     <string name="ContactSelectionListFragment_username_not_found">Användarnamn hittades inte</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" är inte en Signal-användare. Kontrollera användarnamnet och försök igen."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Hitta via användarnamn</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Tillåt åtkomst till kontakter</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">För att hitta personer du känner på Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Tillåt åtkomst</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Nej tack</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Tillåt åtkomst till dina kontakter. Dina kontakter är krypterade och är inte synliga för Signal-tjänsten.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal behöver åtkomst till dina kontakter för att visa dem.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly behöver åtkomst till dina kontakter för att visa dem.</string>
     <string name="contact_selection_list_fragment__show_contacts">Visa kontakter</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Du har tagit bort den här personen. Om du skickar meddelanden till hen igen så kommer personen att läggas tillbaka till din lista.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Alternativ</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Uppdatera</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Spela … Pausa</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Bubblor är en Android-funktion som du kan stänga av för Signal-chattar.</string>
+    <string name="BubbleOptOutTooltip__description">Bubblor är en Android-funktion som du kan stänga av för Molly-chattar.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Inte nu</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Gruppbeskrivning</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Uppdatera Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Uppdatera Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Denna version av Signal har upphört att gälla. Uppdatera nu för att fortsätta använda Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Denna version av Molly har upphört att gälla. Uppdatera nu för att fortsätta använda Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Uppdatera</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Långsam</string>
     <string name="preferences__help">Hjälp</string>
     <string name="preferences__advanced">Avancerat</string>
-    <string name="preferences__donate_to_signal">Donera till Signal</string>
+    <string name="preferences__donate_to_signal">Donera till Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Integritet</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Ändra appikon och namn till \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal måste stängas för att ändra appikonen och namn. Aviseringar visar alltid standardikonen för Signal och namn.</string>
+    <string name="preferences__app_icon_dialog_description">Molly måste stängas för att ändra appikonen och namn. Aviseringar visar alltid standardikonen för Molly och namn.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Välj en appikon och ett namn som kommer att synas på telefonens startskärm och app-låda. Aviseringar visar alltid standardikonen för Signal och namn. Läs mer</string>
+    <string name="preferences__app_icon_warning_learn_more">Välj en appikon och ett namn som kommer att synas på telefonens startskärm och app-låda. Aviseringar visar alltid standardikonen för Molly och namn. Läs mer</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Appikoner och namn syns på startskärmen och app-lådan.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Aviseringar visar alltid standardikonen för Signal och namn.</string>
+    <string name="preferences__app_icon_notification_warning">Aviseringar visar alltid standardikonen för Molly och namn.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Läs mer</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Detta kommer att permanent korta ner alla chattar till de %1$s senaste meddelandena.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Detta tar bort all meddelandehistorik och media permanent från din enhet.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Detta tar permanent bort all meddelandehistorik och media från den här enheten och alla länkade enheter.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Är du säker på att du vill ta bort all meddelandehistorik?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">All meddelandehistorik tas bort permanent. Denna åtgärd kan inte ångras.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">All meddelandehistorik kommer att tas bort permanent från alla enheter. Denna åtgärd kan inte ångras.</string>
     <string name="preferences_storage__delete_all_now">Ta bort allt nu</string>
     <string name="preferences_storage__forever">För alltid</string>
     <string name="preferences_storage__one_year">1 år</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Censur kringgående</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Censur kringgående</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Om påslaget så kommer Signal försöka kringgå censur. Slå bara på denna funktion om du är på en plats där Signal censureras.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Om påslaget så kommer Molly försöka kringgå censur. Slå bara på denna funktion om du är på en plats där Molly censureras.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Kringgå censur har aktiverats baserat på ditt kontos telefonnummer</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Vi introducerar betalningar</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Använd Signal för att skicka och ta emot MobileCoin, en ny digital valuta med integritetsfokus. Aktivera integreringen för att komma igång.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Använd Molly för att skicka och ta emot MobileCoin, en ny digital valuta med integritetsfokus. Aktivera integreringen för att komma igång.</string>
     <string name="PaymentsHomeFragment__activate_payments">Aktivera betalningar</string>
     <string name="PaymentsHomeFragment__activating_payments">Aktiverar betalningar…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Återställ betalningskontot</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Betalningar är inte tillgängliga i din region.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Det gick inte att aktivera betalningar. Försök igen senare.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Inaktivera betalningar?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Du kommer inte att kunna skicka eller ta emot MobileCoin i Signal om du inaktiverar betalningar.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Du kommer inte att kunna skicka eller ta emot MobileCoin i Molly om du inaktiverar betalningar.</string>
     <string name="PaymentsHomeFragment__deactivate">Inaktivera</string>
     <string name="PaymentsHomeFragment__continue">Fortsätt</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Saldo är för närvarande inte tillgängligt.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Detaljer</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Du kan använda Signal för att skicka och ta emot MobileCoin. Alla betalningar omfattas av användarvillkoren för MobileCoins och MobileCoin Wallet. Du kan stöta på vissa problem och betalningar eller saldon du kan förlora kan inte återställas. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Du kan använda Molly för att skicka och ta emot MobileCoin. Alla betalningar omfattas av användarvillkoren för MobileCoins och MobileCoin Wallet. Du kan stöta på vissa problem och betalningar eller saldon du kan förlora kan inte återställas. </string>
     <string name="PaymentsHomeFragment__activate">Aktivera</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Visa MobileCoin-villkor</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Betalningar i Signal är inte längre tillgängliga. Du kan fortfarande överföra pengar till en börs men du kan inte längre skicka och ta emot betalningar eller lägga till pengar.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Betalningar i Molly är inte längre tillgängliga. Du kan fortfarande överföra pengar till en börs men du kan inte längre skicka och ta emot betalningar eller lägga till pengar.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Tillåt behörigheter</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">För att hjälpa dig att skicka meddelanden till personer du känner kommer Signal att begära dessa behörigheter. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">För att hjälpa dig att skicka meddelanden till personer du känner kommer Molly att begära dessa behörigheter. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Aviseringar</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Nästa</string>
     <string name="PaymentsTransferFragment__invalid_address">Ogiltig adress</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Kontrollera plånboksadressen du försöker överföra till och försök igen.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Du kan inte överföra till din egen Signal-plånboksadress. Ange plånboksadressen från ditt konto vid en växling som stöds.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">För att skanna en QR-kod behöver Signal åtkomst till kameran.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal behöver behörigheten Kamera för att skanna en QR-kod. Gå till inställningar, välj \"Behörigheter\" och aktivera \"Kamera\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">För att skanna en QR-kod behöver Signal åtkomst till kameran.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Du kan inte överföra till din egen Molly-plånboksadress. Ange plånboksadressen från ditt konto vid en växling som stöds.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">För att skanna en QR-kod behöver Molly åtkomst till kameran.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly behöver behörigheten Kamera för att skanna en QR-kod. Gå till inställningar, välj \"Behörigheter\" och aktivera \"Kamera\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">För att skanna en QR-kod behöver Molly åtkomst till kameran.</string>
     <string name="PaymentsTransferFragment__settings">Inställningar</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Inkommande Signal-röstsamtal</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Inkommande Molly-röstsamtal</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Inkommande Signal-videosamtal</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Inkommande Molly-videosamtal</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Inkommande Signal-gruppsamtal</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Inkommande Molly-gruppsamtal</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Pågående Signal-röstsamtal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Pågående Molly-röstsamtal</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Pågående Signal-videosamtal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Pågående Molly-videosamtal</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Pågående Signal-gruppsamtal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Pågående Molly-gruppsamtal</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Hämtar in…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Verifiera</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Du har angett ditt lösenord för säkerhetskopian</string>
     <string name="BackupDialog_passphrase_was_not_correct">Lösenordet var inte korrekt</string>
-    <string name="LocalBackupJob_creating_signal_backup">Skapar Signal-säkerhetskopia…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Skapar Molly-säkerhetskopia…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Verifierar Signal-säkerhetskopia …</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Verifierar Molly-säkerhetskopia …</string>
     <string name="LocalBackupJobApi29_backup_failed">Säkerhetskopieringen misslyckades</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Din mapp för säkerhetskopior har tagits bort eller flyttats.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Din säkerhetskopieringsfil är för stor för att lagras på denna volym.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Ring mig (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Skicka kod igen (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Kontakta Signal-support</string>
-    <string name="RegistrationActivity_code_support_subject">Signal-registrering - Verifieringskod för Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Kontakta Molly-support</string>
+    <string name="RegistrationActivity_code_support_subject">Molly-registrering - Verifieringskod för Android</string>
     <string name="RegistrationActivity_incorrect_code">Felaktig kod</string>
     <string name="BackupUtil_never">Aldrig</string>
     <string name="BackupUtil_unknown">Okänd</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Telefonnummer</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Välj vem som kan se ditt telefonnummer och vem som kan använda det för att kontakta dig på Signal.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Välj vem som kan se ditt telefonnummer och vem som kan använda det för att kontakta dig på Molly.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Vem kan se mitt nummer</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Du har gjort för många försök. Försök igen senare.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Fel vid anslutning till tjänst</string>
     <string name="preferences_chats__backups">Säkerhetskopior</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal är låst</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly är låst</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">TRYCK FÖR ATT LÅSA UPP</string>
     <string name="Recipient_unknown">Okänt</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Du behöver åtkomst till din gamla enhet.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Återställ från säkerhetskopia</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Återställ dina meddelanden från en lokal säkerhetskopia. Om du inte återställer nu kan du inte återställa senare.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Återställ lokal säkerhetskopia</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Återställ säkerhetskopiering av Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Återställ alla dina textmeddelanden + dina media från senaste 30 dagarna</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Fler alternativ</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Avbryt</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Logga in utan att överföra</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Fortsätt utan att överföra dina meddelanden och media</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Öppna Signal på din gamla Android-telefon</string>
     <string name="NewDeviceTransferInstructions__continue">Fortsätt</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Förbereder för anslutning till gammal Android-enhet…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Det tar ett stund, borde vara klart snart</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Väntar på att en gammal Android-enhet ska ansluta…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal behöver platsbehörighet för att upptäcka och ansluta till din gamla Android-enhet.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal behöver platstjänster aktiverade för att upptäcka och ansluta till din gamla Android-enhet.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Wi-Fi behöver vara aktiverat för att Signal ska upptäcka och ansluta till din gamla Android-enhet. Wi-Fi måste vara på men det behöver inte vara anslutet till ett Wi-Fi-nätverk.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Tyvärr verkar den här enheten inte stöda Wi-Fi Direct. Signal använder Wi-Fi Direct för att upptäcka och ansluta till din gamla Android-enhet. Du kan fortfarande återställa en säkerhetskopia för att återställa ditt konto från din gamla Android-enhet.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly behöver platsbehörighet för att upptäcka och ansluta till din gamla Android-enhet.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly behöver platstjänster aktiverade för att upptäcka och ansluta till din gamla Android-enhet.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Wi-Fi behöver vara aktiverat för att Molly ska upptäcka och ansluta till din gamla Android-enhet. Wi-Fi måste vara på men det behöver inte vara anslutet till ett Wi-Fi-nätverk.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Tyvärr verkar den här enheten inte stöda Wi-Fi Direct. Molly använder Wi-Fi Direct för att upptäcka och ansluta till din gamla Android-enhet. Du kan fortfarande återställa en säkerhetskopia för att återställa ditt konto från din gamla Android-enhet.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Återställ en säkerhetskopia</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Ett oväntat fel uppstod när du försökte ansluta till din gamla Android-enhet.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Söker efter en ny Android-enhet…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal behöver platsbehörighet för att upptäcka och ansluta till din nya Android-enhet.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal behöver platstjänster aktiverade för att upptäcka och ansluta till din nya Android-enhet.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Wi-Fi behöver vara aktiverat för att Signal ska upptäcka och ansluta till din nya Android-enhet. Wi-Fi måste vara aktiverat men det behöver inte vara anslutet till ett Wi-Fi-nätverk.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Tyvärr verkar den här enheten inte stöda Wi-Fi Direct. Signal använder Wi-Fi Direct för att upptäcka och ansluta till din nya Android-enhet. Du kan fortfarande skapa en säkerhetskopia för att återställa ditt konto på din nya Android-enhet.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly behöver platsbehörighet för att upptäcka och ansluta till din nya Android-enhet.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly behöver platstjänster aktiverade för att upptäcka och ansluta till din nya Android-enhet.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Wi-Fi behöver vara aktiverat för att Molly ska upptäcka och ansluta till din nya Android-enhet. Wi-Fi måste vara aktiverat men det behöver inte vara anslutet till ett Wi-Fi-nätverk.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Tyvärr verkar den här enheten inte stöda Wi-Fi Direct. Molly använder Wi-Fi Direct för att upptäcka och ansluta till din nya Android-enhet. Du kan fortfarande skapa en säkerhetskopia för att återställa ditt konto på din nya Android-enhet.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Skapa en säkerhetskopia</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Ett oväntat fel uppstod när du försökte ansluta till din nya Android-enhet.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Överför data</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Håll båda enheterna nära varandra. Stäng inte av enheterna och håll Signal öppen. Överföringarna är ände-till-ände-krypterade.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Håll båda enheterna nära varandra. Stäng inte av enheterna och håll Molly öppen. Överföringarna är ände-till-ände-krypterade.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d meddelanden hittills…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% av meddelanden hittills…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Överför konto</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Hämta Signal på din nya Android-enhet</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Hämta Molly på din nya Android-enhet</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Tryck på \"Överför eller återställ konto\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Alla med denna länk kan se gruppens namn och foto och begära att gå med. Dela det med personer du litar på.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Alla som har denna länk kan se gruppens namn och foto och gå med i gruppen. Dela det med personer du litar på.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Dela via Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Dela via Molly</string>
     <string name="GroupLinkBottomSheet_copy">Kopiera</string>
     <string name="GroupLinkBottomSheet_qr_code">QR Kod</string>
     <string name="GroupLinkBottomSheet_share">Dela</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">Om MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin är en ny integritetsfokuserad digital valuta.</string>
     <string name="payment_info_card_adding_funds">Lägga till pengar</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Du kan lägga till pengar för användning i Signal genom att skicka MobileCoin till din plånboksadress.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Du kan lägga till pengar för användning i Molly genom att skicka MobileCoin till din plånboksadress.</string>
     <string name="payment_info_card_cashing_out">Utbetalning</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Du kan betala ut MobileCoin när som helst på ett börs som stöder MobileCoin. Gör bara en överföring till ditt konto vid växlingen.</string>
     <string name="payment_info_card_hide_this_card">Dölj detta kort?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Inaktivera plånbok</string>
     <string name="DeactivateWalletFragment__your_balance">Ditt saldo</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Det rekommenderas att du överför dina pengar till en annan plånboksadress innan du inaktiverar betalningar. Om du väljer att inte överföra dina pengar nu förblir de kvar i din plånbok kopplad till Signal om du återaktiverar betalningar.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Det rekommenderas att du överför dina pengar till en annan plånboksadress innan du inaktiverar betalningar. Om du väljer att inte överföra dina pengar nu förblir de kvar i din plånbok kopplad till Molly om du återaktiverar betalningar.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Överför återstående saldo</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Inaktivera utan att överföra</string>
     <string name="DeactivateWalletFragment__deactivate">Inaktivera</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Inaktivera utan att överföra?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Ditt saldo finns kvar i din plånbok kopplad till Signal om du väljer att återaktivera betalningar.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Ditt saldo finns kvar i din plånbok kopplad till Molly om du väljer att återaktivera betalningar.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Fel vid inaktivering av plånbok.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licenser</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Villkor &amp; integritetspolicy</string>
-    <string name="HelpFragment__copyright_signal_messenger">Copyright Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Copyright Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Licensierad under GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4773,7 +4911,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">Automatiskt</string>
+    <string name="ChatColorSelectionFragment__auto">Auto</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Använd anpassade färger</string>
     <string name="ChatColorSelectionFragment__chat_color">Chattfärg</string>
     <string name="ChatColorSelectionFragment__edit">Ändra</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Välj en färg</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Dela</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Endast administratörer kan skicka meddelanden till denna grupp.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Gränsen nådd</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Du kan inte välja mer än 5 chattar</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Läs mer</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Uppdatera Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Uppdatera Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Denna version av Signal har upphört att gälla. Uppdatera nu för att fortsätta använda Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Denna version av Molly har upphört att gälla. Uppdatera nu för att fortsätta använda Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Uppdatera</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Enheten är inte registrerad</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Den här enheten är inte längre registrerad. Registrera om för att fortsätta använda Signal på den här enheten.</string>
+    <string name="ReregisterSignalDialog__message">Den här enheten är inte längre registrerad. Registrera om för att fortsätta använda Molly på den här enheten.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Registrera igen</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Det gick inte att öppna väljaren.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">För att aktivera aviseringar behöver Signal behörighet för att visa dem.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">För att aktivera aviseringar behöver Molly behörighet för att visa dem.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Aktivera</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Inga svar ännu</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Du kan inte svara på den här berättelsen eftersom du inte längre är medlem i den här gruppen.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Reagerade på storyn</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Reagerade på storyn</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Reagerade på storyn</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Visningar</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Välj din bank</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Bekräfta din donation med %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">För att ställa in din återkommande donation, tryck på fortsätt för att bekräfta en debitering på 0,01 € med din bank. Detta återbetalas automatiskt och gör att din donation på 5 €/månad kan debiteras från ditt konto.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">För att ställa in din återkommande donation, tryck på fortsätt för att bekräfta en debitering på 0,01 € med din bank. Detta återbetalas automatiskt och gör att din donation på %1$s/månad kan debiteras från ditt konto.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Fortsätt</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Laddar ner säkerhetskopieringsdata …</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Säkerhetskopiering av media är avstängd</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Din säkerhetskopieringsplan för media på Signal har annullerats eftersom vi inte kunde behandla din betalning. Du har %1$d dag på dig att ladda ner all media som finns lagrade i din säkerhetskopia. Efter %1$d dag kommer media i din säkerhetskopia att tas bort.</item>
+        <item quantity="other">Din säkerhetskopieringsplan för media på Signal har annullerats eftersom vi inte kunde behandla din betalning. Du har %1$d dagar på dig att ladda ner all media som finns lagrade i din säkerhetskopia. Efter %1$d dagar kommer media i din säkerhetskopia att tas bort.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Du kan när som helst börja betala för säkerhetskopiering igen för att fortsätta säkerhetskopiera alla dina medier. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Dina media kommer att tas bort idag</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Din säkerhetskopieringsplan för media på Signal har annullerats eftersom vi inte kunde behandla din betalning. Detta är din sista chans att ladda ner media i din säkerhetskopia innan den tas bort.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Det går inte att slutföra nedladdningen</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Din enhet har inte tillräckligt med ledigt utrymme. Frigör upp till %1$s utrymme för att ladda ner media som finns lagrade i din säkerhetskopia.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Om du väljer Hoppa över kommer media i säkerhetskopian att tas bort om %1$d dag.</item>
+        <item quantity="other">Om du väljer Hoppa över kommer media i säkerhetskopian att tas bort om %1$d dagar.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Det går inte att behandla betalningen av säkerhetskopiering</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Vi har problem med att ta emot din återkommande månatliga betalning för säkerhetskopiering. Kontrollera att din betalningsmetod är uppdaterad. Om den inte är det, uppdatera den i Google Pay. Signal kommer att försöka bearbeta betalningen igen inom några dagar.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Det gick inte slutföra säkerhetskopieringen</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Din enhet har inte genomfört en säkerhetskopiering på %1$d dagar. Kontrollera att din enhet är ansluten till wifi och tryck på Säkerhetskopiera nu. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Läs mer</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Hoppa över</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Ladda ner media nu</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Ladda ner senare</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Ladda inte ner media</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Frigör %1$s utrymme för att ladda ner dina media.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Betalkort</string>
@@ -6874,16 +7058,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Okänt</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Betalningshistorik</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Din senaste säkerhetskopia gjordes den %1$s kl %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">Högsta antal meddelanden i en chatt</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">Gränser för chattlängd</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">Radera meddelandehistorik</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Meddelanden som är äldre än den valda tiden raderas permanent.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Meddelanden som överskrider den valda gränsen raderas permanent.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Tillämpa gränser för länkade enheter</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">När det är aktiverat kommer gränser för chattlängd också att radera meddelanden från dina länkade enheter.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Radering synkroniseras nu mellan alla dina enheter</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">När du raderar meddelanden eller chattar kommer de att tas bort från din telefon och länkade enheter.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Betalningshistorik</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Säkerhetskopia av text och all media</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Betalningsuppgifter</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Typ av säkerhetskopia</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Betalningsdatum</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Dela</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Säkerhetskopiering av Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Betalningshistorik</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Information om säkerhetskopiering</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Storlek på säkerhetskopia</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Frekvens för säkerhetskopiering</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Säkerhetskopiera med mobilnät</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Stänga av och ta bort säkerhetskopia</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Säkerhetskopia borttagen och avstängd</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Typ av säkerhetskopia har ändrats och abonnemanget har sagts upp</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Abonnemang uppsagt</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Nerladdning slutförd</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Typ av säkerhetskopia</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Säkerhetskopior inaktiverade</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/månad</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Aktivera säkerhetskopior</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Senaste säkerhetskopia</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Aldrig</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Säkerhetskopiera nu</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Stäng av och ta bort säkerhetskopior?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Du kommer inte att debiteras igen. Din säkerhetskopia kommer att tas bort och inga nya säkerhetskopior kommer att skapas.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Stäng av och radera</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Tar bort säkerhetskopia …</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Säkerhetskopia borttagen</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Genom att trycka på Säkerhetskopiera nu"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Dagligen</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Veckovis</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Månatligen</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Manuell säkerhetskopiering</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Ange din enhets pinkod, lösenord eller mönster.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Nästa</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Ändra typ av säkerhetskopiering</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Avbryt abonnemang</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Bekräfta annullering</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Du kommer inte att debiteras igen. Säkerhetskopiering stängs av i slutet av din faktureringscykel. Efter detta datum har du 30 dagar på dig att ladda ner de media som du för närvarande har säkerhetskopierat.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Bekräfta och ladda ner nu</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Bekräfta och ladda ner senare</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Behåll abonnemang</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw/strings.xml b/app/src/main/res/values-sw/strings.xml
index b3d10a95a9..799355b118 100644
--- a/app/src/main/res/values-sw/strings.xml
+++ b/app/src/main/res/values-sw/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal inasasishwa…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly inasasishwa…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Bado haujaweka sisitizo.</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Lemaza ufafanuzi</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Hii itafungua kabisa Signal na arifu za ujumbe</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Hii itafungua kabisa Molly na arifu za ujumbe</string>
     <string name="ApplicationPreferencesActivity_disable">Lemaza</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Hitilafu kuunganisha kwa mtambo.</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">Nambari za Siri zinahitajika kwenye kufuli ya usajili. Ili kulemaza Nambari za Siri, tafadhali kwanza lemaza kufuli ya usajili.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Faili</string>
     <string name="AttachmentKeyboard_contact">Mwasiliani</string>
     <string name="AttachmentKeyboard_location">Eneo</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal inahitaji ruhusa ili kuonyesha picha zako na video.</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly inahitaji ruhusa ili kuonyesha picha zako na video.</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Ruhusu Ufikiaji</string>
     <string name="AttachmentKeyboard_payment">Malipo</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Haiwezi kupata programu ya kuchagua media</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal inahitaji idhini ya Hifadhi ili kuunganisha picha, video, au sauti, lakini imekataliwa kabisa. Tafadhali endelea kwenye orodha ya mipangilio ya programu, chagua \"Ruhusa\", na uwezesha \"Hifadhi\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal inahitaji idhini ya Mawasiliano ili kuunganisha maelezo ya mawasiliano, lakini imekataliwa kabisa. Tafadhali endelea kwenye orodha ya mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Mawasiliano\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal inahitaji ruhusa ya Eneo ili kuunganisha mahali, lakini imekataliwa kabisa. Tafadhali endelea kwenye orodha ya mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Eneo\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly inahitaji idhini ya Hifadhi ili kuunganisha picha, video, au sauti, lakini imekataliwa kabisa. Tafadhali endelea kwenye orodha ya mipangilio ya programu, chagua \"Ruhusa\", na uwezesha \"Hifadhi\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly inahitaji idhini ya Mawasiliano ili kuunganisha maelezo ya mawasiliano, lakini imekataliwa kabisa. Tafadhali endelea kwenye orodha ya mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Mawasiliano\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly inahitaji ruhusa ya Eneo ili kuunganisha mahali, lakini imekataliwa kabisa. Tafadhali endelea kwenye orodha ya mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Eneo\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Ruhusu ufikiaji wa eneo ulipo</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Ili kutuma eneo ulipo:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Ruhusu Signal kufikia eneo ulipo.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Ruhusu Molly kufikia eneo ulipo.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal inahitaji ufikiaji wa eneo ili kutuma eneo ulipo.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly inahitaji ufikiaji wa eneo ili kutuma eneo ulipo.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Ruhusu ufikiaji kwenye hifadhi</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Kuonyesha picha na video:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal inahitaji ruhusa kuonyesha picha na video zako.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly inahitaji ruhusa kuonyesha picha na video zako.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s hajaamilisha Malipo </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Geuza kamera</string>
     <string name="CameraXFragment_open_gallery_description">Fungua kitunzio</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Ruhusu Ufikiaji</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Ruhusu ufikiaji kwenye kamera na maikrofoni yako</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Ruhusu ufikiaji wa kamera yako</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Ruhusu Signal kufikia maikrofoni yako</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Ili kupiga picha, iruhusu Signal ifikie kamera.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Ili kupiga picha na video, ruhusu ufikiaji wa Signal kwa kamera.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Ili kupiga picha na kurekodi video, iruhusu Signal ifikie kamera na maikrofoni.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Ili kupiga kurekodi video, iruhusu Signal ifikie maikrofoni.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Ili kuskani QR code, iruhusu Signal ifikie kamera.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal inahitaji kufikia kamera ili kupiga picha</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal inahitaji kufikia kamera ili kuskani QR codes</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal inahitaji kufikia maikrofoni ili kurekodi video</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Ili kupiga picha kwenye Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Ili kupiga picha na kurekodi video kwenye Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Ili kurekodi video na sauti:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Ili kuskani QR codes:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Mawasiliano ya hivi karibuni</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Hakuna mawasiliano ya Signal</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Unaweza kutumia kitufe cha kamera kutuma picha kwa mawasiliano ya Signal. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Huwezi kumpata unayemtafuta?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Alika mwasiliani wako ajiunge na Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Alika mwasiliani wako ajiunge na Molly</string>
     <string name="CameraContacts__menu_search">Tafuta</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Hapana nashukuru</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Sasisha Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Sasisha Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Toleo hili la programu halitumiki tena. Ili kuendelea kutuma na kupokea ujumbe, sasisha utumie toleo jipya.</string>
     <string name="ClientDeprecatedActivity_update">Sasisha</string>
     <string name="ClientDeprecatedActivity_dont_update">Usisasishe</string>
     <string name="ClientDeprecatedActivity_warning">Onyo</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Toleo lako la Signal limekwisha muda wake. Unaweza kuangalia historia ya jumbe zako lakini hutaweza kutuma au kupokea ujumbe hadi usasishe.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Toleo lako la Molly limekwisha muda wake. Unaweza kuangalia historia ya jumbe zako lakini hutaweza kutuma au kupokea ujumbe hadi usasishe.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Hakuna kivinjari kilichopatikana.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Ujumbe %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Simu ya sauti ya Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Simu ya video ya Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Ujumbe wa Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Tuma ujumbe</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Wacha tubadili kwa Signal 1%1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Wacha tubadili kwa Molly 1%1$s</string>
     <string name="ConversationActivity_specify_recipient">Tafadhali chagua mawasiliano</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Kiambatisho kimezidi ukubwa wa aina ya ujumbe unaotuma</string>
     <string name="ConversationActivity_unable_to_record_audio">Haiwezi kurekodi sauti!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Ili kutuma ujumbe wa sauti:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Ili kutuma ujumbe wa sauti, iruhusu Signal kufikia maikrofoni yako.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Ili kutuma ujumbe wa sauti, iruhusu Molly kufikia maikrofoni yako.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal inahitaji ufikiaji wa maikrofoni ili kurekodi ujumbe wa sauti.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal inahitaji idhini ya Kipaza sauti ili kutuma ujumbe wa sauti, lakini imekataliwa kabisa. Tafadhali endelea kwenye mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Kipaza sauti\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly inahitaji ufikiaji wa maikrofoni ili kurekodi ujumbe wa sauti.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly inahitaji idhini ya Kipaza sauti ili kutuma ujumbe wa sauti, lakini imekataliwa kabisa. Tafadhali endelea kwenye mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Kipaza sauti\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal inahitaji ruhusa ya Kipaza sauti na Kamera ili kupiga%1$s , lakini zimekataliwa kabisa. Tafadhali endelea kwenye mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Kipaza sauti\" na \"Kamera\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Ili kupiga picha na video, ruhusu ufikiaji wa Signal kwa kamera.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal inahitaji kibali cha Kamera kuchukua picha au video, lakini imekataliwa kabisa. Tafadhali endelea kwenye mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal inahitaji ruhusa ya kamera kuchukua picha na video</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly inahitaji ruhusa ya Kipaza sauti na Kamera ili kupiga%1$s , lakini zimekataliwa kabisa. Tafadhali endelea kwenye mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Kipaza sauti\" na \"Kamera\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Ili kupiga picha na video, ruhusu ufikiaji wa Molly kwa kamera.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly inahitaji kibali cha Kamera kuchukua picha au video, lakini imekataliwa kabisa. Tafadhali endelea kwenye mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly inahitaji ruhusa ya kamera kuchukua picha na video</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Wezesha ruhusa ya kipaza sauti kiweze kunasa video za sauti.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal inahitaji ruhusa za kipaza sauti kurekodi video, lakini imekataliwa. Tafadhali enda kwenye mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Kipaza Sauti\" na \"Kamera\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal inahitaji ruhusa za kipaza sauti ili kurekodi video.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly inahitaji ruhusa za kipaza sauti kurekodi video, lakini imekataliwa. Tafadhali enda kwenye mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Kipaza Sauti\" na \"Kamera\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly inahitaji ruhusa za kipaza sauti ili kurekodi video.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Hapana</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Ili kupiga simu:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Ili kupiga simu, iruhusu Signal kufikia maikrofoni yako.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Ili kupiga simu, iruhusu Molly kufikia maikrofoni yako.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal inahitaji ufikiaji wa maikrofoni ili kupiga simu.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly inahitaji ufikiaji wa maikrofoni ili kupiga simu.</string>
 
 
     <string name="ConversationActivity_join">Jiunge</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Huwezi tena kutuma jumbe za SMS kwenye Signal. Mkaribishe %1$s Signal ili kuendeleza mazungumzo hapa.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Mtu huyu hatumii tena Signal. Waalike kwenye Signal ili kuendeleza mazungumzo hapa.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Mtu huyu hatumii tena Molly. Waalike kwenye Molly ili kuendeleza mazungumzo hapa.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Mwalike kwenye Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Mwalike kwenye Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Utakumbushwa tena hivi karibuni.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Futa kwa kila mtu</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Futa kwenye kifaa hiki</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Futa</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Futa kila mahali</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Ujumbe huu utafutwa kwa watu wote kwenye gumzo ikiwa wanatumia toleo jipya la Signal. Wataweza kuona kuwa umefuta ujumbe.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Zuiliwa</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Sasisha Signal</string>
+    <string name="ConversationFragment__update_build">Sasisha Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Sajili tena Signal</string>
+    <string name="ConversationFragment__reregister_signal">Sajili tena Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Rudi nyuma.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Fungua Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Fungua Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Haijathibitishwa tena</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Hii itafuta daima gumzo lililochaguliwa.</item>
         <item quantity="other">Hii itafuta daima magumzo yote %1$d yaliyochaguliwa.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Hii itafuta kabisa gumzo lililochaguliwa kutoka kwenye vifaa vyako vyote.</item>
+        <item quantity="other">Hii itafuta kabisa magumzo yote %1$d yaliyochaguliwa kutoka kwenye vifaa vyako vyote.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Inafutwa</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Inafuta gumzo lililochaguliwa…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Nani anaweza kunipata kupitia kwa nambari?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Mtu yeyote mwenye nambari yako ya simu ataona kuwa upo Signal na anaweza kuanza gumzo na wewe.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Mtu yeyote mwenye nambari yako ya simu ataona kuwa upo Molly na anaweza kuanza gumzo na wewe.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Hakuna atakayeweza kuona kuwa upo Signal isipokuwa utakapowatumia ujumbe au tayari una gumzo nao.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Hakuna atakayeweza kuona kuwa upo Molly isipokuwa utakapowatumia ujumbe au tayari una gumzo nao.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Rejesha kutoka nakalahifadhi?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Jaribu kifungu maneno chako cha nakilihifadhi na uhakikishe kinalingana</string>
     <string name="BackupsPreferenceFragment__turn_on">Washa</string>
     <string name="BackupsPreferenceFragment__turn_off">Zima</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Ili kurejesha nakala hifadhi, sakinisha nakala mpya ya Signal. Fungua programu na uguse \"Rejesha nakala rudufu\", kisha utafute faili ya nakala hifadhi. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Ili kurejesha nakala hifadhi, sakinisha nakala mpya ya Molly. Fungua programu na uguse \"Rejesha nakala rudufu\", kisha utafute faili ya nakala hifadhi. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Jifunze zaidi</string>
     <string name="BackupsPreferenceFragment__in_progress">Inaendelea…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d hadi sasa…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% hadi sasa …</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal inahitaji idhini ya hifadhi ya nje ili kuunda nakalahifadhi, lakini imekataliwa kabisa. Tafadhali enda kwenye mipangilio ya programu, chagua \"Ruhusa\" na uwezeshe \"Hifadhi\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly inahitaji idhini ya hifadhi ya nje ili kuunda nakalahifadhi, lakini imekataliwa kabisa. Tafadhali enda kwenye mipangilio ya programu, chagua \"Ruhusa\" na uwezeshe \"Hifadhi\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Weka muda wa ziada</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Kipindi cha gumzo kimeonyeshwa upya</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal hutumia usimbaji wa mwisho hadi mwisho na inaweza kuhitaji kuonyesha upya gumzo zako wakati mwingine. Kitendo hiki hakiathiri usalama wa gumzo yako lakini huenda umekosa ujumbe kutoka kwa mwasiliani huyu na unaweza kumwomba autume tena.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly hutumia usimbaji wa mwisho hadi mwisho na inaweza kuhitaji kuonyesha upya gumzo zako wakati mwingine. Kitendo hiki hakiathiri usalama wa gumzo yako lakini huenda umekosa ujumbe kutoka kwa mwasiliani huyu na unaweza kumwomba autume tena.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Tumia Signal kwenye Desktop au iPad. Jumbe zako zitasawazishwa kwenye vifaa vyako vilivyounganishwa.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Unganisha kifaa kipya</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Taarifa za ujumbe na gumzo zinalindwa na usimbaji fiche kwenye vifaa vyote</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal kwenye Desktop au iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Utumaji ujumbe wa vifaa vilivyounganishwa ni wa faragha</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Jumbe za Molly zimesawazishwa na Molly kwenye simu mahiri yako baada ya kuunganishwa. Historia ya zamani ya jumbe zako haitaonekana.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Kwenye kifaa chako kingine, tembelea %1$s ili kusakinisha Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Vifaa vyangu vilivyounganishwa</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Ondoa unganisho</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s hakijaunganishwa</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Kifaa kinaunganishwa…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Kifaa kimeidhinishwa</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Inapakia</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Hakuna vifaa vilivyounganishwa</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Fungua ili kuunganisha kifaa</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Skani msimbo wa QR ulioonyeshwa kwenye kifaa ili kuunganisha.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Skani code ya QR</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Tumia kifaa hiki kuskani Code ya QR ulionyeshwa kwenye kifaa unachotaka kukiunganisha</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Sawa</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Kifaa hiki kitaweza kuona vikundi na anwani zako, kufikia gumzo zako, na kutuma ujumbe kwa jina lako.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Kamilisha kuunganisha kwenye kifaa chako kingine</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Kamilisha kuunganisha Molly kwenye kifaa chako kingine.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Uunganishaji Kifaa Umefeli</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Msimbo huu wa QR sio halali. Tafadhali hakikisha unaskani msimbo wa QR ulioonyeshwa kwenye kifaa unachotaka kuunganisha.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Jaribu Upya</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Tenganisha \' %1$s\'?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Panga kwa Huduma za Play sizizopo.</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Kifaa hiki hakiwezeshi Huduma za Play. Gonga ili kulemaza na kuboresha mfumo wa betri unaozuia Signal kupokea ujumbe wakati haupo kwenye matumizi.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Kifaa hiki hakiwezeshi Huduma za Play. Gonga ili kulemaza na kuboresha mfumo wa betri unaozuia Molly kupokea ujumbe wakati haupo kwenye matumizi.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Muda wa toleo hili la Signal umekwisha. Sasisha sasa ili utume na kupokea ujumbe.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Muda wa toleo hili la Molly umekwisha. Sasisha sasa ili utume na kupokea ujumbe.</string>
     <string name="ExpiredBuildReminder_update_now">Sasisha sasa</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Tazama</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Muda wote mawasiliano ya Signal yanafeli!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal haikuweza kujisajili na Huduma za Google Play. Ujumbe wa Signal na simu zimezimwa, tafadhali jaribu kujiandikisha katika Mipangilio &gt; Zaidi.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Muda wote mawasiliano ya Molly yanafeli!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly haikuweza kujisajili na Huduma za Google Play. Ujumbe wa Molly na simu zimezimwa, tafadhali jaribu kujiandikisha katika Mipangilio &gt; Zaidi.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Kumbukumbu za utatuzi zinatusaidia kutambua na kurekebisha tatizo, na hazina maelezo ya utambulisho.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal imekumbana na tatizo. Je, uwasilishe kumbukumbu za utatuzi?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly imekumbana na tatizo. Je, uwasilishe kumbukumbu za utatuzi?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Arifa zinaweza kuchelewesha kutokana na uboreshaji wa betri</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Unaweza kuzima kipengele cha uboreshaji wa betri kwa Signal ili kuhakikisha kuwa arifa za ujumbe hazichelewi.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Unaweza kuzima kipengele cha uboreshaji wa betri kwa Molly ili kuhakikisha kuwa arifa za ujumbe hazichelewi.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Arifa zinaweza kuchelewesha kutokana na uboreshaji wa betri</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Unaweza kuzima kipengele cha uboreshaji wa betri kwa Molly ili kuhakikisha kuwa arifa za ujumbe hazichelewi. Bonyeza \"Endelea\" ili kuona maagizo maalum ya kifaa.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Hapana nashukuru</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Endelea</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Endelea</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Tupilia mbali</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Hapana nashukuru</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Mialiko ya kikundi inasubiri</string>
+    <string name="PendingMembersActivity_pending_group_invites">Maombi na mialiko</string>
     <string name="PendingMembersActivity_requests">Maombi</string>
     <string name="PendingMembersActivity_invites">Mialiko</string>
     <string name="PendingMembersActivity_people_you_invited">Watu ulioalika</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Ghairi</string>
     <string name="InviteActivity_sending">Inatuma…</string>
     <string name="InviteActivity_invitations_sent">Mialiko imetumwa!</string>
-    <string name="InviteActivity_invite_to_signal">Alika kwa Signal</string>
+    <string name="InviteActivity_invite_to_signal">Alika kwa Molly</string>
     <string name="InviteActivity_send_sms">Tuma Arafa (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Tuma miwito za SMS 1%1$d?</item>
         <item quantity="other">Tuma %1$d mialiko ya SMS?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Wacha tubadili kwa Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Wacha tubadili kwa Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Inaonekana huna programu zozote za kushiriki</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Ujumbe wako</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">kuunganisha kwa usuli kumewezeshwa</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Majibu</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Inaanzisha simu ya Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">Inaanzisha simu ya Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Kuanzisha huduma ya kupiga simu na Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Kusimamisha huduma ya mazungumzo ya simu ya Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Kuanzisha huduma ya kupiga simu na Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Kusimamisha huduma ya mazungumzo ya simu ya Molly</string>
     <string name="NotificationBarManager__cancel_call">Ghairi simu</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Umeamilisha Malipo</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s sasa anaweza kupokea Malipo</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Taarifa za malipo hazipo</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Gusa uone Zaidi</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Taarifa za malipo hazipo</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Taarifa ya malipo haya hazipo kwa sababu ujumbe wako ulirejeshwa kutoka kwenye chanzo kisicho na historia ya malipo. Hii haiathiri salio la pochi yako au hali ya malipo yaliyopita.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Hutoweza tena kutuma jumbe za SMS kupitia Signal. Mkaribishe %1$s Signal ili kuendeleza mazungumzo hapa.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Huwezi tena kutuma jumbe za SMS kupitia Signal. Mkaribishe %1$s Signal ili kuendeleza mazungumzo hapa.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Huwezi tena kutuma jumbe za SMS kupitia Molly. Mkaribishe %1$s Molly ili kuendeleza mazungumzo hapa.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Malipo: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Malipo</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Imeripotiwa kuwa spam</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Unganisha kifaa cha Signal</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Inaonekana unajaribu kuunganisha kifaa cha Signal kwa kutumia skana ya mhusika wa 3. Kwa usalama wako, tafadhali skani msimbo tena kutoka ndani ya Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal inahitaji ruhusa ya Kamera ili kuskani msimbo wa QR, lakini imekataliwa kabisa. Tafadhali endelea kwenye mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Kamera\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly inahitaji ruhusa ya Kamera ili kuskani msimbo wa QR, lakini imekataliwa kabisa. Tafadhali endelea kwenye mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Kamera\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Imeshindwa kuskani msimbo wa QR bila ruhusa ya Kamera</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Ingiza nenosiri</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal ikoni</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly ikoni</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Wasilisha nenosiri</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Nenosiri sio sahihi</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Fungua Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Kufunga Skrini</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Fungua Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Kufunga Skrini</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Ramani</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Thibitisha ili uendelee kutuma ujumbe</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Ili kusaidia kuzuia maudhui taka kwenye Signal, tafadhali kamilisha uthibitishaji.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Ili kusaidia kuzuia maudhui taka kwenye Molly, tafadhali kamilisha uthibitishaji.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Baada ya kuthibitisha, unaweza kuendelea kutuma ujumbe. Ujumbe wowote uliositishwa utatumwa kiotomatiki.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Stori Yangu</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Simu ya Signal</string>
+    <string name="Recipient_signal_call">Simu ya Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Zuia</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Inapiga…</string>
     <string name="RedPhone_busy">Bize</string>
     <string name="RedPhone_recipient_unavailable">Mpokeaji hapatikani</string>
-    <string name="RedPhone_network_failed">Mtandao umefeli</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Mtandao umefeli Tafadhali angalia muunganisho wa mtandao wako kisha ujaribu tena.</string>
     <string name="RedPhone_number_not_registered">Nambari haijasajiliwa</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Nambari uliyopiga haiwezi sauti salama!</string>
     <string name="RedPhone_got_it">Nimeelewa</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Gusa hapa ili kuwasha video yako</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Ili kumpigia simu %1$s, Signal inahitaji idhini ya kufikia kamera yako</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Ili kumpigia simu %1$s, Molly inahitaji idhini ya kufikia kamera yako</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Unapiga simu…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Inaunganisha tena…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Ameondolewa kwenye simu</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Mtu amekuondoa kwenye simu.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Ruhusu ufikiaji kwenye kamera na maikrofoni yako</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Ruhusu Signal kufikia maikrofoni yako</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Ruhusu ufikiaji wa kamera yako</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Ili kuanza kupiga au kujiunga kwenye simu, iruhusu Molly kufikia kamera na maikrofoni yako.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Ili kuanza kupiga au kujiunga kwenye simu, iruhusu Molly kufikia maikrofoni yako.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Ili kuonyesha video yako, iruhusu Molly kufikia kamera yako.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly inahitaji ruhusa za maikrofoni ili kuanza kupiga au kujiunga kwenye simu.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly inahitaji kufikia kamera ili kuonyesha video</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Ili kuanza kupiga au kujiunga kwenye simu:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Ili kuonyesha video yako:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Simu ya Signal</string>
-    <string name="WebRtcCallView__signal_video_call">Simu ya Video ya Signal</string>
+    <string name="WebRtcCallView__signal_call">Simu ya Molly</string>
+    <string name="WebRtcCallView__signal_video_call">Simu ya Video ya Molly</string>
     <string name="WebRtcCallView__start_call">Anza Kupiga Simu</string>
     <string name="WebRtcCallView__join_call">Jiunge na Mazungumzo ya Simu</string>
     <string name="WebRtcCallView__call_is_full">Mazungumzo ya simu yamejaa</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Je ushushe mkono wako?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Shusha Mkono</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Shusha</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Ghairi</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Umeinua mkono</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Tazama</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s ameinua mkono</item>
-        <item quantity="other">%1$s + %2$d wameinua mkono</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s ameinua mkono</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d mmeinua mikono</item>
+        <item quantity="other">%1$s + %2$d mmeinua mikono</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s ameinua mkono</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d wameinua mikono</item>
+        <item quantity="other">%1$s + %2$d wameinua mikono</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Utapokea simu ya kuthibitisha nambari hii.</string>
     <string name="RegistrationActivity_edit_number">Hariri nambari</string>
     <string name="RegistrationActivity_missing_google_play_services">Huduma za Google Play zinakosekana</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Kifaa hiki kimekosa huduma za Google Play. Bado unaweza kutumia Signal, lakini usanidi huu unaweza kusababisha upungufu wa kutegemewa au utendaji. \\ n\n \\ Kama wewe si mtumiaji wa juu, hautumii Android ROM, au unaamini kwamba unaona hili kimakosa, tafadhali wasiliana na support@signal.org kwa usaidizi wa matatizo.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Kifaa hiki kimekosa huduma za Google Play. Bado unaweza kutumia Molly, lakini usanidi huu unaweza kusababisha upungufu wa kutegemewa au utendaji. \\ n\n \\ Kama wewe si mtumiaji wa juu, hautumii Android ROM, au unaamini kwamba unaona hili kimakosa, tafadhali wasiliana na support@molly.im kwa usaidizi wa matatizo.</string>
     <string name="RegistrationActivity_i_understand">Nimeelewa</string>
     <string name="RegistrationActivity_play_services_error">Hitilafu katika huduma za Play</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Huduma za Google Play zinasasisha au hazipatikani kwa muda. Tafadhali jaribu tena.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Mfumo wa nambari usio wa kiwango</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Nambari uliyoingiza (%1$s) inaonekana kuwa isiyo ya mfumo wa nambari usio wa kiwango.\n\nUlimaanisha %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Mfumo wa Nambari ya Simu</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Mfumo wa Nambari ya Simu</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Ombi la kupiga simu</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Unasumbuka kujisajili?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Hakikisha nambari yako inapata mtandao wa simu ili kupokea SMS au kupigiwa simu\n • Hakikisha kama unaweza kupokea simu kwenye nambari\n • Angalia kama umeingiza vyema nambari za simu.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Kwa habari zaidi, tafadhali fuata maelekezo haya ya kutatua tatizo au Wasiliana na Msaada</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Kwa taarifa zaidi, tafadhali fuata %1$s au %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">hatua hizi za urekebishaji</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Ongeza mawasiliano</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Mwalike kwenye Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Mwalike kwenye Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Ujumbe wa Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Simu ya Signal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Ongeza kwa wawasiliani</string>
-    <string name="SharedContactView_invite_to_signal">Mwalike kwenye Signal</string>
+    <string name="SharedContactView_invite_to_signal">Mwalike kwenye Molly</string>
     <string name="SharedContactView_message">Ujumbe wa Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s inamilikiwa na %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Sasisho ya Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Toleo jipya la Signal linapatikana. Gusa ili kusasisha.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal imeshindwa kusasisha</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Sasisho ya Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Toleo jipya la Molly linapatikana. Gusa ili kusasisha.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly imeshindwa kusasisha</string>
     <string name="ApkUpdateNotifications_failed_general_body">Tutajaribu tena baadae.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal imesasishwa kwa mafanikio</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly imesasishwa kwa mafanikio</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Umesasishwa kiotomatiki kwenda toleo la %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Nambari yetu ya usalama ya Signal</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Inaonekana huna programu yoyote ya kushiriki</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Hamna nambari ya usalama ya kulinganisha iliyopatikana kwenye bodi ya kupogoa</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal inahitaji ruhusa ya Kamera ili kuskani msimbo wa QR, lakini imekataliwa kabisa. Tafadhali endelea kwenye mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Kamera\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly inahitaji ruhusa ya Kamera ili kuskani msimbo wa QR, lakini imekataliwa kabisa. Tafadhali endelea kwenye mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Kamera\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Imeshindwa kuskani msimbo wa QR bila ruhusa ya kamera</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Sharti kwanza mtumiane ujumbe ili uone nambari ya usalama ya %1$s.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Gusa kufungua</string>
-    <string name="KeyCachingService_passphrase_cached">Signal imefunguliwa</string>
-    <string name="KeyCachingService_lock">Funga Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly imefunguliwa</string>
+    <string name="KeyCachingService_lock">Funga Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Wewe</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Aina ya media isiyowezeshwa</string>
     <string name="MediaPreviewActivity_draft">Rasimu</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal inahitaji ruhusa ya Hifadhi ili kuhifadhi kwenye hifadhi ya nje, lakini imekataliwa kabisa. Tafadhali endelea kwenye mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Uhifadhi\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly inahitaji ruhusa ya Hifadhi ili kuhifadhi kwenye hifadhi ya nje, lakini imekataliwa kabisa. Tafadhali endelea kwenye mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Uhifadhi\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Haiwezekani kuhifadhi kwenye hifadhi ya nje bila ruhusa</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Futa ujumbe?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Hii itafuta ujumbe kabisa.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Imefeli kuwasilisha ujumbe</string>
     <string name="MessageNotifier_error_delivering_message">Hitilafu kuwasilisha ujumbe</string>
     <string name="MessageNotifier_message_delivery_paused">Uwasilishaji wa ujumbe umesitishwa.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Thibitisha ili uendelee kutuma ujumbe kwenye Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Thibitisha ili uendelee kutuma ujumbe kwenye Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Nakili yote kama imesomwa</string>
     <string name="MessageNotifier_mark_read">Nakili imesomwa</string>
     <string name="MessageNotifier_turn_off_these_notifications">Zima arifa hizi</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Ametoa hisia%1$s kwa kibandiko chako.</string>
     <string name="MessageNotifier_this_message_was_deleted">Ujumbe huu umefutwa.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Ungependa kuzima waasiliani waliojiunga kupitia arifa za Signal? Unaweza kuwawezesha tena katika Signal &gt; Mipangilio &gt; Arifa.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Ungependa kuzima waasiliani waliojiunga kupitia arifa za Molly? Unaweza kuwawezesha tena katika Molly &gt; Mipangilio &gt; Arifa.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Jibu la haraka halipatikani wakati Signal imefungwa!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Jibu la haraka halipatikani wakati Molly imefungwa!</string>
     <string name="QuickResponseService_problem_sending_message">Tatizo kutuma ujumbe</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Mkato batili</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Ujumbe mpya</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Ombi la ujumbe</string>
     <string name="SingleRecipientNotificationBuilder_you">Wewe</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Kifaa hiki hakijasajiliwa tena. Huenda hii ni kwa sababu ulisajili nambari yako ya simu kwa Signal kwenye kifaa cha tofauti.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Kifaa hiki hakijasajiliwa tena. Huenda hii ni kwa sababu ulisajili nambari yako ya simu kwa Molly kwenye kifaa cha tofauti.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Sajili tena kifaa</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Kupokea simu, iwezeshe Signal kutumia maikrofoni yako.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Kupokea simu, iwezeshe Molly kutumia maikrofoni yako.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Ili kupokea simu ya video, ipe Signal ruhusa ya kufikia maikrofoni na kamera yako.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal inahitaji ruhusa ya kipaza sauti na Kamera ili kufanya au kupokea simu, lakini zimekataliwa kabisa. Tafadhali endelea kwenye mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Kipaza sauti\" na \"Kamera\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Ili kupokea simu ya video, ipe Molly ruhusa ya kufikia maikrofoni na kamera yako.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly inahitaji ruhusa ya kipaza sauti na Kamera ili kufanya au kupokea simu, lakini zimekataliwa kabisa. Tafadhali endelea kwenye mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Kipaza sauti\" na \"Kamera\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Umejibu kwenye kifaa kilichounganishwa.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Umekataa kwenye kifaa kilichounganishwa.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Una shughuli kwenye kifaa kilichounganishwa.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Rudia nenosiri mpya</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Mwalike kwenye Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Mwalike kwenye Molly</string>
     <string name="contact_selection_activity__new_group">Kikundi kipya</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Huisha upya wawasiliani</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Umemkosa mtu? Jaribu kuhuisha upya</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Tafuta watu unaowafahamu kwenye Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Ruhusu ufikiaji wa wawasiliani wako</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Zaidi</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Picha ya mwasiliani</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal inahitaji idhini ya Wawasiliani ili kuonyesha wawasiliani wako, lakini imekataliwa kabisa. Tafadhali endelea kwenye orodha ya mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Wawasiliani\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly inahitaji idhini ya Wawasiliani ili kuonyesha wawasiliani wako, lakini imekataliwa kabisa. Tafadhali endelea kwenye orodha ya mipangilio ya programu, chagua \"Ruhusa\", na uwezeshe \"Wawasiliani\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Hitilafu kupata wawasiliani, angalia uunganisho wako wa mtandao</string>
     <string name="ContactSelectionListFragment_username_not_found">Jina la mtumiaji halijapatikana</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" sio mtumiaji wa Signal. Tafadhali angalia jina la mtumiaji na ujaribu tena."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Tafuta kwa jina la mtumiaji</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Ruhusu ufikiaji wa wawasiliani</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Ili kupata watu unaowajua kwenye Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Ruhusu Ufikiaji</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Hapana nashukuru</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Ruhusu ufikiaji kwa wawasiliani wako. Wawasiliani wako wamesimbwa fiche na hawaonekani kwenye huduma ya Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal inahitaji upatikanaji wa wawasiliani yako ili kuonyesha.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly inahitaji upatikanaji wa wawasiliani yako ili kuonyesha.</string>
     <string name="contact_selection_list_fragment__show_contacts">onyesha mawasiliano</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Umemuondoa mtu huyu, kuwatumia tena jumbe kutawarudisha kwenye orodha yako.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Chaguzi</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Sasisha</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Cheza … Pumzisha</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Bubbles ni kipengele cha Android ambacho unaweza kukizima kwa Gumzo za Signal.</string>
+    <string name="BubbleOptOutTooltip__description">Bubbles ni kipengele cha Android ambacho unaweza kukizima kwa Gumzo za Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Sio sasa</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Maelezo ya kikundi</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Sasisha Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Sasisha Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Toleo hili la Signal limekwisha muda wake. Sasisha sasa ili kuendelea kutumia Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Toleo hili la Molly limekwisha muda wake. Sasisha sasa ili kuendelea kutumia Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Sasisha</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Polepole</string>
     <string name="preferences__help">Msaada</string>
     <string name="preferences__advanced">ya juu</string>
-    <string name="preferences__donate_to_signal">Changia Signal</string>
+    <string name="preferences__donate_to_signal">Changia Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Faragha</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Badili ikoni na jina la programu kuwa \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal itahitaji kuzimwa ili kubadili ikoni na jina la programu. Arifa mara zote zitaonyesha ikoni na jina la Signal kama chaguomsingi.</string>
+    <string name="preferences__app_icon_dialog_description">Molly itahitaji kuzimwa ili kubadili ikoni na jina la programu. Arifa mara zote zitaonyesha ikoni na jina la Molly kama chaguomsingi.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Chagua ikoni na jina la programu, ambavyo vitaonekana kwenye skrini ya kwanza na mfuko wa programu. Arifa mara zote zitaonyesha ikoni na jina la Signal kama chaguomsingi. Jifunze zaidi</string>
+    <string name="preferences__app_icon_warning_learn_more">Chagua ikoni na jina la programu, ambavyo vitaonekana kwenye skrini ya kwanza na mfuko wa programu. Arifa mara zote zitaonyesha ikoni na jina la Molly kama chaguomsingi. Jifunze zaidi</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Ikoni na majina ya programu yanaonekana kwenye skrini ya kwanza na mfuko wa programu.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Arifa mara zote zitaonyesha ikoni na jina la Signal kama chaguomsingi.</string>
+    <string name="preferences__app_icon_notification_warning">Arifa mara zote zitaonyesha ikoni na jina la Molly kama chaguomsingi.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Jifunze zaidi</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Hii itapunguza kabisa magumzo yote na kubakisha jumbe %1$s za hivi karibuni.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Hii itafuta daima historia yote ya jumbe na media kwenye kifaa chako.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Hii itafuta kabisa historia ya jumbe na video kutoka kwenye kifaa hiki na vifaa vyovyote vilivyounganishwa.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Una uhakika ungetaka kufuta historia yote ya jumbe?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Historia yote ya jumbe itaondolewa kabisa. Kitendo hiki hakiwezi kutenguliwa.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Historia ya jumbe zote itaondolewa kwenye vifaa vyote. Kitendo hiki hakitenguliwi.</string>
     <string name="preferences_storage__delete_all_now">Futa zote sasa</string>
     <string name="preferences_storage__forever">Daima</string>
     <string name="preferences_storage__one_year">Mwaka 1</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Kukwepa udhibiti</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Kukwepa udhibiti</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Ikiwezeshwa, Signal itajaribu kukwepa udhibiti. Usiruhusu kipengele hiki ila ukiwa katika eneo ambalo Signal imedhibiitiwa.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Ikiwezeshwa, Molly itajaribu kukwepa udhibiti. Usiruhusu kipengele hiki ila ukiwa katika eneo ambalo Molly imedhibiitiwa.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Kukwepa udhibiti kumeamlishwa kulingana na nambari ya simu ya akaunti yako.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Kuanzisha malipo</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Tumia Signal kutuma na kupokea MobileCoin, sarafu mpya ya kidijitali inayozingatia faragha. Wezesha ili uanze.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Tumia Molly kutuma na kupokea MobileCoin, sarafu mpya ya kidijitali inayozingatia faragha. Wezesha ili uanze.</string>
     <string name="PaymentsHomeFragment__activate_payments">Wezesha Malipo</string>
     <string name="PaymentsHomeFragment__activating_payments">Unawezesha malipo…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Rejesha akaunti ya malipo</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Malipo hayapatikani katika eneo lako.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Hukuwezesha malipo. Jaribu tena baadaye.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Ungependa Kuzima Malipo?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Hutaweza kutuma au kupokea MobileCoin katika Signal ukizima malipo.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Hutaweza kutuma au kupokea MobileCoin katika Molly ukizima malipo.</string>
     <string name="PaymentsHomeFragment__deactivate">Zima</string>
     <string name="PaymentsHomeFragment__continue">Endelea</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Salio halipatikani kwa sasa.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Maelezo</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Unaweza kutumia Signal kutuma na kupokea MobileCoin. Malipo yote yako chini ya Masharti ya Matumizi kwa MobileCoins na MobileCoin Wallet. Unaweza kukumbana na hitilafu na malipo au salio ambazo huenda ukapoteza zisirejeshwe. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Unaweza kutumia Molly kutuma na kupokea MobileCoin. Malipo yote yako chini ya Masharti ya Matumizi kwa MobileCoins na MobileCoin Wallet. Unaweza kukumbana na hitilafu na malipo au salio ambazo huenda ukapoteza zisirejeshwe. </string>
     <string name="PaymentsHomeFragment__activate">Wezesha</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Angalia masharti ya MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Malipo katika Signal hayapatikani tena. Bado unaweza kuhamishia fedha kwenye ubadilishanaji lakini huwezi kutuma na kupokea malipo au kuongeza pesa.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Malipo katika Molly hayapatikani tena. Bado unaweza kuhamishia fedha kwenye ubadilishanaji lakini huwezi kutuma na kupokea malipo au kuongeza pesa.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Kubalisha ruhusa</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Ili kukusaidia kutuma ujumbe kwa watu unaowajua, Signal itakuomba ruhusa hizi. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Ili kukusaidia kutuma ujumbe kwa watu unaowajua, Molly itakuomba ruhusa hizi. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Arifa</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Ifuatayo</string>
     <string name="PaymentsTransferFragment__invalid_address">Anwani si sahihi</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Angalia anwani ya mkoba unayojaribu kuhamishia pesa kisha ujaribu tena.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Huwezi kuhamishia kwenye anwani yako mwenyewe ya mkoba wa Signal. Weka anwani ya mkoba kutoka kwenye akaunti yako kwenye ubadilishanaji unaotumika.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Ili kuchanganua msimbo wa QR, Signal inahitaji idhini ya kufikia kamera.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal inahitaji ruhusa ya Kamera ili kunasa msimbo wa QR. Nenda kwenye mipangilio, chagua \"Ruhusa\", na uwezeshe \"Kamera\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Ili kuchanganua msimbo wa QR, Signal inahitaji idhini ya kufikia kamera.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Huwezi kuhamishia kwenye anwani yako mwenyewe ya mkoba wa Molly. Weka anwani ya mkoba kutoka kwenye akaunti yako kwenye ubadilishanaji unaotumika.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Ili kuchanganua msimbo wa QR, Molly inahitaji idhini ya kufikia kamera.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly inahitaji ruhusa ya Kamera ili kunasa msimbo wa QR. Nenda kwenye mipangilio, chagua \"Ruhusa\", na uwezeshe \"Kamera\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Ili kuchanganua msimbo wa QR, Molly inahitaji idhini ya kufikia kamera.</string>
     <string name="PaymentsTransferFragment__settings">Mipangilio</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Simu ya Kawaida ya Signal Inayopiga Sasa</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Simu ya Kawaida ya Molly Inayopiga Sasa</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Simu ya Video ya Signal Inayopiga Sasa</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Simu ya Video ya Molly Inayopiga Sasa</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Simu ya kikundi ya Signal inaingia</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Simu ya kikundi ya Molly inaingia</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Simu ya Kawaida ya Signal Inayoendelea</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Simu ya Kawaida ya Molly Inayoendelea</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Simu ya Video ya Signal Inayoendelea</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Simu ya Video ya Molly Inayoendelea</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Simu ya Kikundi ya Signal Inayoendelea</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Simu ya Kikundi ya Molly Inayoendelea</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Inafunguka</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Hakikisha</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Umefaulu kuweka kifungu maneno chako cha nakilihifadhi</string>
     <string name="BackupDialog_passphrase_was_not_correct">Kifungu maneno hakikuwa sahihi</string>
-    <string name="LocalBackupJob_creating_signal_backup">Kutengeneza nakala rudufu ya Signal…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Kutengeneza nakala rudufu ya Molly…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Kuthibitisha nakala rudufu ya Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Kuthibitisha nakala rudufu ya Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">Nakala hifadhi haijawekwa</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Nakala hifadhi yako imefutwa au imehamishwa.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Faili yako ya kakala hifadhi ni kubwa mno kwamba haiwezi kuhifadhi kiasi hiki.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Nipigie (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Tuma tena kodi (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Wasiliana na Msaada wa Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Usajili wa Signal: Msimbo wa Hakiki wa Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Wasiliana na Msaada wa Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Usajili wa Molly: Msimbo wa Hakiki wa Android</string>
     <string name="RegistrationActivity_incorrect_code">Kodi isiyo sahihi</string>
     <string name="BackupUtil_never">Kamwe</string>
     <string name="BackupUtil_unknown">Isiyojulikana</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Nambari ya simu</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Chagua nani anayeweza kuona nambari yako ya simu na kuwasiliana nawe kwenye Signal kwa kuitumia.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Chagua nani anayeweza kuona nambari yako ya simu na kuwasiliana nawe kwenye Molly kwa kuitumia.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Anayeweza kuona nambari yangu</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Umefanya majaribio mengi sana. Tafadhali jaribu tena baadaye.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Hitilafu kujiunga kwa huduma</string>
     <string name="preferences_chats__backups">Nakala zilizohifadhiwa</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal Imefungwa</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly Imefungwa</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">Gusa kufungua</string>
     <string name="Recipient_unknown">Isiyojulikana</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Unahitaji kufikia kifaa chako cha awali.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Rejesha kutoka nakala hifadhi</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Rejesha jumbe zako kutoka kwenye nakala hifadhi ya ndani ya kifaa chako. Usiporejesha sasa, hutaweza kurejesha baadaye.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Rejesha chelezo ya ndani</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Rejesha chelezo ya Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Rejesha jumbe zako zote za maandishi pamoja na video za siku 30 zilizopita</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Chaguzi zaidi</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Ghairi</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Ingia bila kuhamisha</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Endelea bila kuhamisha jumbe na video zako</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Fungua Signal kwenye simu yako ya awali ya Android</string>
     <string name="NewDeviceTransferInstructions__continue">Endelea</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Inasubiri kuunganisha kwenye kifaa cha awali cha Android…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Subiri kidogo, itakuwa tayari hivi punde</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Inasubiri kifaa cha awali cha Android kiunganishwe…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal inahitaji idhini ya kufikia maelezo ya eneo ili igundue na kuunganisha na kifaa chako cha awali cha Android.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal inahitaji idhini ya kufikia huduma za eneo ili igundue na kuunganisha na kifaa chako cha awali cha Android.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal inahitaji Wi-Fi ili kugundua na kuunganisha kifaa chako cha awali cha Android. Unatakiwa kuwasha Wi-Fi lakini si lazima uunganishe kwenye mtandao wa Wi-Fi.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Samahani, inaonekana kifaa hiki hakitumii huduma ya Wi-Fi Direct. Signal hutumia Wi-Fi Direct kugundua na kuunganisha kifaa chako cha awali cha Android. Bado unaweza kurejesha nakala hifadhi kurejesha akaunti yako kutoka kwenye kifaa chako cha awali cha Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly inahitaji idhini ya kufikia maelezo ya eneo ili igundue na kuunganisha na kifaa chako cha awali cha Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly inahitaji idhini ya kufikia huduma za eneo ili igundue na kuunganisha na kifaa chako cha awali cha Android.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly inahitaji Wi-Fi ili kugundua na kuunganisha kifaa chako cha awali cha Android. Unatakiwa kuwasha Wi-Fi lakini si lazima uunganishe kwenye mtandao wa Wi-Fi.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Samahani, inaonekana kifaa hiki hakitumii huduma ya Wi-Fi Direct. Molly hutumia Wi-Fi Direct kugundua na kuunganisha kifaa chako cha awali cha Android. Bado unaweza kurejesha nakala hifadhi kurejesha akaunti yako kutoka kwenye kifaa chako cha awali cha Android.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Rejesha nakala hifadhi</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Hitilafu isiyotarajiwa imetokea wakati wa kujaribu kuunganisha kwenye kifaa chako cha awali cha Android.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Inatafuta kifaa kipya cha Android…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal inahitaji idhini ya kufikia maelezo ya eneo ili igundue na kuunganisha na kifaa chako kipya cha Android.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal inahitaji idhini ya kufikia huduma za eneo ili igundue na kuunganisha na kifaa chako kipya cha Android.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal inahitaji Wi-Fi ili kugundua na kuunganisha kifaa chako kipya cha Android. Unatakiwa kuwasha Wi-Fi lakini si lazima uunganishe kwenye mtandao wa Wi-Fi.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Samahani, inaonekana kifaa hiki hakitumii huduma ya Wi-Fi Direct. Signal hutumia Wi-Fi Direct kugundua na kuunganisha kifaa chako kipya cha Android. Bado unaweza kuunda nakala hifadhi kurejesha akaunti yako kutoka kwenye kifaa chako cha awali cha Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly inahitaji idhini ya kufikia maelezo ya eneo ili igundue na kuunganisha na kifaa chako kipya cha Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly inahitaji idhini ya kufikia huduma za eneo ili igundue na kuunganisha na kifaa chako kipya cha Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly inahitaji Wi-Fi ili kugundua na kuunganisha kifaa chako kipya cha Android. Unatakiwa kuwasha Wi-Fi lakini si lazima uunganishe kwenye mtandao wa Wi-Fi.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Samahani, inaonekana kifaa hiki hakitumii huduma ya Wi-Fi Direct. Molly hutumia Wi-Fi Direct kugundua na kuunganisha kifaa chako kipya cha Android. Bado unaweza kuunda nakala hifadhi kurejesha akaunti yako kutoka kwenye kifaa chako cha awali cha Android.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Unda nakala hifadhi</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Hitilafu isiyotarajiwa imetokea wakati wa kujaribu kuunganisha kwenye kifaa chako kipya cha Android.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Inahamisha data</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Weka vifaa vyote viwili karibu. Usizime vifaa hivi na hakikisha Signal imefunguliwa. Mchakato wa kuhamisha umesimbwa kwa njia ya mwisho kwa mwisho.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Weka vifaa vyote viwili karibu. Usizime vifaa hivi na hakikisha Molly imefunguliwa. Mchakato wa kuhamisha umesimbwa kwa njia ya mwisho kwa mwisho.</string>
     <string name="DeviceTransfer__d_messages_so_far">Jumbe %1$d hadi sasa…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% ya jumbe mpaka sasa…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Hamisha Akaunti</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Pakua Signal kwenye kifaa chako kipya cha Android</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Pakua Molly kwenye kifaa chako kipya cha Android</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Gonga \"Hamisha au rejesha akaunti\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Yeyote aliye na kiungo hiki anaweza kutazama jina na picha za kikundi hiki na kuomba kujiunga. Shiriki na watu unaowaamini.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Yeyote aliye na kiungo hiki anaweza kutazama jina na picha ya kikundi na kujiunga na kikundi. Shiriki na watu unaowaamini.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Shiriki kupitia Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Shiriki kupitia Molly</string>
     <string name="GroupLinkBottomSheet_copy">Nakili</string>
     <string name="GroupLinkBottomSheet_qr_code">Msimbo wa QR</string>
     <string name="GroupLinkBottomSheet_share">Shiriki</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">Kuhusu MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin ni sarafu mpya ya kidijitali inayozingatia faragha.</string>
     <string name="payment_info_card_adding_funds">Kuongeza fedha</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Unaweza kuongeza pesa za matumizi katika Signal kwa kutuma MobileCoin kwenye anwani yako ya mkoba.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Unaweza kuongeza pesa za matumizi katika Molly kwa kutuma MobileCoin kwenye anwani yako ya mkoba.</string>
     <string name="payment_info_card_cashing_out">Kutoa pesa</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Unaweza kutoa MobileCoin wakati wowote kwenye ubadilishaji unaotumia MobileCoin. Hamishia tu kwenye akaunti yako katika ubadilishaji huo.</string>
     <string name="payment_info_card_hide_this_card">Ungependa kuficha kadi hii?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Zima Mkoba</string>
     <string name="DeactivateWalletFragment__your_balance">Salio lako</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Inashauriwa uhamishie fedha zako kwa anwani nyingine ya mkoba kabla ya kuzima malipo. Ukichagua kutohamisha pesa zako sasa, zitabakia kwenye mkoba wako uliounganishwa na Signal ikiwa utawezesha malipo tena.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Inashauriwa uhamishie fedha zako kwa anwani nyingine ya mkoba kabla ya kuzima malipo. Ukichagua kutohamisha pesa zako sasa, zitabakia kwenye mkoba wako uliounganishwa na Molly ikiwa utawezesha malipo tena.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Hamisha salio lililobakia</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Zima bila kuhamisha</string>
     <string name="DeactivateWalletFragment__deactivate">Zima</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Ungependa kuzima bila kuhamisha?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Salio lako litabakia kwenye mkoba wako uliounganishwa na Signal ukichagua kuwezesha malipo tena.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Salio lako litabakia kwenye mkoba wako uliounganishwa na Molly ukichagua kuwezesha malipo tena.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Hitilafu imetokea wakati wa kuzima mkoba.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Leseni</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Vigezo &amp;amp: Sera ya Faragha</string>
-    <string name="HelpFragment__copyright_signal_messenger">Signal Messenger yenye Hakimiliki</string>
+    <string name="HelpFragment__copyright_signal_messenger">Molly Messenger yenye Hakimiliki</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Imepewa leseni chini ya GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4773,7 +4911,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">Kiotomatiki</string>
+    <string name="ChatColorSelectionFragment__auto">Auto</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Tumia rangi maalum</string>
     <string name="ChatColorSelectionFragment__chat_color">Rangi ya gumzo</string>
     <string name="ChatColorSelectionFragment__edit">Hariri</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Chagua rangi</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">Ujumbe wa maneno</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Shiriki</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Wasimamizi tu ndio wanaoweza kutuma ujumbe kwenye kikundi hiki.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Kiwango kimefikiwa</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Huwezi kuchagua zaidi ya gumzo 5</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Jifunze zaidi</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Sasisha Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Sasisha Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Toleo hili la Signal limekwisha muda wake. Sasisha sasa ili kuendelea kutumia Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Toleo hili la Molly limekwisha muda wake. Sasisha sasa ili kuendelea kutumia Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Sasisha</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Kifaa hakijasajiliwa</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Kifaa hiki hakijasajiliwa tena. Sajili upya ili uendelee kutumia Signal kwenye kifaa hiki.</string>
+    <string name="ReregisterSignalDialog__message">Kifaa hiki hakijasajiliwa tena. Sajili upya ili uendelee kutumia Molly kwenye kifaa hiki.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Sajili tena</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Haiwezekani kufungua picker.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Ili kuruhusu arifa, Signal inahitaji ruhusa ili kuzionyesha.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Ili kuruhusu arifa, Molly inahitaji ruhusa ili kuzionyesha.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Washa</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Hakuna majibu bado</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Huwezi kujibu stori hii kwa sababu wewe si mwanachama tena wa kikundi hiki.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Ametoa hisia kwa hadithi yako</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Ame-react kwa stori yako</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Ame-react kwa stori yako</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Mitazamo</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Chagua benki yako</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Hakiki mchango wako kwa %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Ili kuweka mipangilio ya michango inayojirudia gusa endelea ili kuthibitisha tozo la €0,01 kwenye benki unayotumia. Hii itafidiwa kiotomatiki na inawezesha mchango wako wa €5 kila mwezi kukatwa kutoka kwa akaunti yako.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Ili kuweka mipangilio ya michango inayojirudia gusa endelea ili kuthibitisha tozo la €0,01 kwenye benki unayotumia. Hii itafidiwa kiotomatiki na inawezesha mchango wako wa %1$s/kila mwezi kukatwa kutoka kwa akaunti yako.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Endelea</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Inapakua data chelezo…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Uhifadhi nakala wa video na picha umezuiwa</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Mpango wako wa uhifadhi nakala za video na picha za Signal umeghairishwa kwa sababu tumeshindwa kuchakata malipo yako. Una siku %1$d za kupakua video na picha zozote zilizohifadhiwa kwenye nakala yako. Baada ya siku %1$d, video na picha kwenye nakala yako zitafutwa.</item>
+        <item quantity="other">Mpango wako wa uhifadhi nakala za video na picha za Signal umeghairishwa kwa sababu tumeshindwa kuchakata malipo yako. Una siku %1$d za kupakua video na picha zozote zilizohifadhiwa kwenye nakala yako. Baada ya siku %1$d, video na picha kwenye nakala yako zitafutwa.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Unaweza kuanza kulipia nakala muda wowote ule ili kuendelea kuhifadhi nakala ya video na picha zako. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Video na picha zako zitafutwa leo</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Mpango wako wa uhifadhi nakala za video na picha za Signal umeghairishwa kwa sababu tumeshindwa kuchakata malipo yako. Hii ni nafasi yako ya mwisho kupakua video na picha kwenye nakala yako kabla haijafutwa.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Imeshindwa kukamilisha upakuaji</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Kifaa chako hakina nafasi huru ya kutosha. Achilia %1$s ya nafasi ili upakue video na picha zako zilizo kwenye nakala.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Ukichagua \"Ruka\" picha na video kwenye nakala yako itafutwa ndani ya siku %1$d.</item>
+        <item quantity="other">Ukichagua \"Ruka\" picha na video kwenye nakala yako itafutwa ndani ya siku %1$d.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Haiwezi kuchakata malipo ya nakala</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Tunapata tabu kukusanya malipo yako ya nakala ya kila mwezi yanayojirudia. Hakikisha njia yako ya malipo imesasishwa. Kama sivyo, sasisha kwenye Google Pay. Signal itajaribu kukamilisha malipo tena baada ya siku chache.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Imeshindwa kumaliza nakala</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Kifaa chako hakijakamilisha kuhifadhi nakala kwa siku %1$d. Hakikisha kifaa chako kimeunganishwa kwenye wi-fi kisha bonyeza \"Hifadhi nakala sasa.\" </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Jifunze zaidi</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Ruka</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Pakua video na picha sasa</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Pakua baadae</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Usipakue video na picha</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Achilia %1$s ya nafasi ili uweze kupakua video na picha zako.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Kadi ya mkopo au fedha taslimu</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Isiyojulikana</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Historia ya malipo</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Chelezo yako ya mwisho ilifanywa tarehe %1$s saa %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Jumbe za zamani kuliko muda uliochaguliwa zitafutwa kabisa.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Jumbe zinazozidi urefu uliochaguliwa zitafutwa kabisa.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Weka ukomo wa vifaa vilivyounganishwa</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Itakapowashwa, ukomo wa gumzo pia utafuta jumbe kutoka kwenye vifaa vyako vilivyounganishwa.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Kufuta sasa kumeunganishwa kwenye vifaa vyao vyote</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Unapofuta jumbe au gumzo, yatafutwa kabisa kutoka kwenye simu yako na vifaa vyako vilivyounganishwa.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">Sawa</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Historia ya malipo</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Nakala za maandishi na picha na video zote</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Taarifa za malipo</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Aina ya nakala</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Tarehe Ilipolipwa</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Shiriki</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Chelezo za Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Historia ya malipo</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Taarifa za nakala</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Ukubwa wa nakala</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Masafa ya nakala</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Weka nakala kwa kutumia mtandao</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Zima na ufute nakala</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Chelezo imefutwa na kuzimwa.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Aina ya chelezo imebadilika na usajili umeghairishwa</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Usajili umeghairishwa</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Upakuaji umekamilika</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Aina ya chelezo</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Chelezo zimezimwa</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/kwa mwezi</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Wezesha nakalahifadhi</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Nakala ya mwisho</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s kwa %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Kamwe</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Hifadhi nakala rudufu Sasa</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Zima au ufute nakala?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Hautatozwa tena. Nakala yako itafutwa na hakutakuwa na nakala mpya zitakazotengenezwa.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Zima na futa</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Inafuta nakala…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Nakala imefutwa</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Kwa kugusa Chelezo sasa"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Kila siku</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Kila wiki</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Kila mwezi</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Fanya chelezo mwenyewe</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Tafadhali ingiza nenosiri, pini au alama ya kifaa chako.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Inayofuata</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Badili aina ya nakala</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Ghairi Usajili</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Thibitisha ughairi</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Hautatozwa tena. Uhifadhi nakala utazimwa mwisho wa mzunguko wako wa malipo. Baada ya tarehe hiyo utakuwa na siku 30 za kupakua video na picha ambazo unahifadhi nakala yake sasa.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Thibitisha na upakue sasa</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Thibitisha na upakue baadae</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Endelea na usajili</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index ec6e71e840..e96a014415 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal புதுப்பிக்கிறது …</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly புதுப்பிக்கிறது …</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">நீங்கள் இன்னும் ஒரு கடவுச்சொல்லை அமைக்கவில்லை!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">கடவுச்சொல்லை முடக்கு?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">இது நிரந்தரமாக Signal செய்தி அறிவிப்புகளைத் திறக்கும்.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">இது நிரந்தரமாக Molly செய்தி அறிவிப்புகளைத் திறக்கும்.</string>
     <string name="ApplicationPreferencesActivity_disable">முடக்கு</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">சர்வருடன் இணைவதில் பிழை!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">பதிவு பூட்டுக்கு PIN தேவை. PIN-ஐ முடக்க, முதலில் பதிவு பூட்டை முடக்கவும்.</string>
@@ -87,9 +88,9 @@
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">மீடியாவை தேர்வுசெய்யும் ஒரு பயன்பாட்டை கண்டுபிடிக்க முடியவில்லை.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">புகைப்படங்கள், காணொளிகள் அல்லது ஆடியோவை இணைக்கவும் Signal க்கு சேமிப்பக அனுமதி தேவைப்படுகிறது, ஆனால் அது நிரந்தரமாக மறுக்கப்பட்டது. பயன்பாடு அமைப்புகள் மெனுவில் தொடரவும், \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து \"சேமிப்பகத்தை\" இயக்கவும்.</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">தொடர்பு தகவலை இணைக்கவும் Signal க்கு தொடர்புகளின் அனுமதி தேவைப்படுகிறது, ஆனால் அது நிரந்தரமாக மறுக்கப்பட்டது. பயன்பாடு அமைப்புகள் மெனுவில் தொடரவும், \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து, \"தொடர்புகளை\" இயக்கவும்.</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">இருப்பிடத்தை இணைக்கவும், Signal க்கு இருப்பிட அனுமதி தேவைப்படுகிறது, ஆனால் அது நிரந்தரமாக மறுக்கப்பட்டது. பயன்பாடு அமைப்புகள் மெனுவில் தொடரவும், \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து, \"இருப்பிடம்\" ஐ இயக்கவும்.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">புகைப்படங்கள், காணொளிகள் அல்லது ஆடியோவை இணைக்கவும் Molly க்கு சேமிப்பக அனுமதி தேவைப்படுகிறது, ஆனால் அது நிரந்தரமாக மறுக்கப்பட்டது. பயன்பாடு அமைப்புகள் மெனுவில் தொடரவும், \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து \"சேமிப்பகத்தை\" இயக்கவும்.</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">தொடர்பு தகவலை இணைக்கவும் Molly க்கு தொடர்புகளின் அனுமதி தேவைப்படுகிறது, ஆனால் அது நிரந்தரமாக மறுக்கப்பட்டது. பயன்பாடு அமைப்புகள் மெனுவில் தொடரவும், \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து, \"தொடர்புகளை\" இயக்கவும்.</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">இருப்பிடத்தை இணைக்கவும், Molly க்கு இருப்பிட அனுமதி தேவைப்படுகிறது, ஆனால் அது நிரந்தரமாக மறுக்கப்பட்டது. பயன்பாடு அமைப்புகள் மெனுவில் தொடரவும், \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து, \"இருப்பிடம்\" ஐ இயக்கவும்.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">உங்கள் இருப்பிடத்திற்கான அணுகலை அனுமதிக்கவும்</string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">கேமராவை மாற்றவும்</string>
     <string name="CameraXFragment_open_gallery_description">கேலரியை திற</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">அணுகலை அனுமதிக்கவும்</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">உங்கள் கேமரா மற்றும் மைக்ரோஃபோனை அணுக அனுமதிக்கவும்</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">உங்கள் கேமராவை அணுக அனுமதிக்கவும்</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">உங்கள் மைக்ரோஃபோனை அணுக அனுமதிக்கவும்</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">புகைப்படங்களை படமெடுக்க, கேமராவிற்கான சிக்னல் அணுகலை அனுமதிக்கவும்.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">புகைப்படங்கள் மற்றும் காணொளி பிடிக்க, Signal-ஐ கேமராவை அணுக அனுமதிக்கவும்.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">புகைப்படங்கள் மற்றும் வீடியோ படமெடுக்க, கேமரா மற்றும் மைக்ரோஃபோனை அணுக சிக்னலை அனுமதிக்கவும்.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">ஒலியுடன் வீடியோக்களை படமெடுக்க, மைக்ரோஃபோனை அணுக சிக்னலை அனுமதிக்கவும்.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">QR குறியீட்டை ஸ்கேன் செய்ய, கேமராவை அணுக சிக்னலை அனுமதிக்கவும்.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">படங்களை படமெடுக்க சிக்னலுக்கு கேமரா அணுகல் தேவை</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">QR குறியீடுகளை ஸ்கேன் செய்ய சிக்னலுக்கு கேமரா அணுகல் தேவை</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">வீடியோவை படமெடுக்க, சிக்னலுக்கு மைக்ரோஃபோன் அணுகல் தேவை</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">சிக்னலில் புகைப்படங்களை படமெடுக்க:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">சிக்னலில் புகைப்படங்கள் மற்றும் வீடியோக்களை படமெடுக்க:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">ஒலியுடன் வீடியோக்களை எடுக்க:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR குறியீடுகளை ஸ்கேன் செய்ய:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">சமீபத்திய தொடர்புகள்</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Signal தொடர்புகள் இல்லை</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Signal தொடர்புகளுக்கு புகைப்படங்களை அனுப்ப கேமரா பொத்தானை மட்டுமே நீங்கள் பயன்படுத்த முடியும். </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">நீங்கள் யாரைத் தேடுகிறீர்கள் என்று கண்டுபிடிக்க முடியவில்லையா?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Signal லில் சேர ஒரு தொடர்பை அழைக்கவும்</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Molly லில் சேர ஒரு தொடர்பை அழைக்கவும்</string>
     <string name="CameraContacts__menu_search">தேடல்</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,7 +286,7 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">தேவையில்லை,நன்றி</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Signal லைப் புதுப்பிக்கவும்</string>
+    <string name="ClientDeprecatedActivity_update_signal">Molly லைப் புதுப்பிக்கவும்</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">பயன்பாட்டின் இந்த பதிப்பு இனி ஆதரிக்கப்படாது. செய்திகளை அனுப்புவதையும் பெறுவதையும் தொடர, சமீபத்திய பதிப்பிற்கு புதுப்பிக்கவும்.</string>
     <string name="ClientDeprecatedActivity_update">புதுப்பிக்கப்பட்டது</string>
     <string name="ClientDeprecatedActivity_dont_update">புதுப்பிக்க வேண்டாம்</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">செய்தி %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">சிக்னல் குரல் அழைப்பு %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">சிக்னல் வீடியோ அழைப்பு %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal செய்தி</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">அனுப்பு செய்தி</string>
-    <string name="ConversationActivity_lets_switch_to_signal">%1$s நாம் Signalக்கு மாறுவோம்</string>
+    <string name="ConversationActivity_lets_switch_to_signal">%1$s நாம் Mollyக்கு மாறுவோம்</string>
     <string name="ConversationActivity_specify_recipient">தயவு செய்து ஒரு தொடர்பை தேர்ந்தெடு</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">நீங்கள் அனுப்பும் இணைப்பு செய்தி அளவு வரம்பை மீறுகிறது .</string>
     <string name="ConversationActivity_unable_to_record_audio">ஒலி பதிவுச் செய்ய இயலவில்லை!</string>
@@ -444,15 +445,15 @@
     <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">வாய்ஸ் மெசேஜ்களை அனுப்ப, உங்கள் மைக்ரோஃபோனை அணுக சிக்னலை அனுமதிக்கவும்.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
     <string name="ConversationActivity_signal_needs_microphone_access_voice_message">வாய்ஸ் மெசேஜைப் பதிவு செய்ய சிக்னலுக்கு மைக்ரோஃபோன் அணுகல் தேவை.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">ஆடியோ செய்திகளை அனுப்ப Signal க்கு மைக்ரோஃபோன் அனுமதி தேவைப்படுகிறது, ஆனால் அது நிரந்தரமாக மறுக்கப்பட்டது. பயன்பாடு அமைப்புகளைத் தொடரவும், \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து, \"மைக்ரோஃபோனை\" இயக்கவும்.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">ஆடியோ செய்திகளை அனுப்ப Molly க்கு மைக்ரோஃபோன் அனுமதி தேவைப்படுகிறது, ஆனால் அது நிரந்தரமாக மறுக்கப்பட்டது. பயன்பாடு அமைப்புகளைத் தொடரவும், \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து, \"மைக்ரோஃபோனை\" இயக்கவும்.</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal லை அழைக்க மைக்ரோஃபோன் மற்றும் கேமரா அனுமதிகள் தேவை%1$s, ஆனால் அவை நிரந்தரமாக மறுக்கப்பட்டுள்ளன. பயன்பாடு அமைப்புகளைத் தொடரவும், \"அனுமதி\" என்பதைத் தேர்ந்தெடுத்து, \"மைக்ரோஃபோன்\" மற்றும் \"கேமரா\" ஐ இயக்கவும்.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">புகைப்படங்கள் மற்றும் காணொளி பிடிக்க, Signal-ஐ கேமராவை அணுக அனுமதிக்கவும்.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">புகைப்படங்கள் அல்லது வீடியோ எடுக்க Signal-க்கு கேமரா அனுமதி தேவை, ஆனால் அது நிரந்தரமாக மறுக்கப்பட்டது. செயலியின் அமைப்புகளுக்கு சென்று, \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து \"கேமரா\"-ஐ இயலச் செய்யவும்.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">புகைப்படங்கள் அல்லது காணொளி எடுக்க Signal-க்கு கேமரா அனுமதி தேவை</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly லை அழைக்க மைக்ரோஃபோன் மற்றும் கேமரா அனுமதிகள் தேவை%1$s, ஆனால் அவை நிரந்தரமாக மறுக்கப்பட்டுள்ளன. பயன்பாடு அமைப்புகளைத் தொடரவும், \"அனுமதி\" என்பதைத் தேர்ந்தெடுத்து, \"மைக்ரோஃபோன்\" மற்றும் \"கேமரா\" ஐ இயக்கவும்.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">புகைப்படங்கள் மற்றும் காணொளி பிடிக்க, Molly-ஐ கேமராவை அணுக அனுமதிக்கவும்.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">புகைப்படங்கள் அல்லது வீடியோ எடுக்க Molly-க்கு கேமரா அனுமதி தேவை, ஆனால் அது நிரந்தரமாக மறுக்கப்பட்டது. செயலியின் அமைப்புகளுக்கு சென்று, \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து \"கேமரா\"-ஐ இயலச் செய்யவும்.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">புகைப்படங்கள் அல்லது காணொளி எடுக்க Molly-க்கு கேமரா அனுமதி தேவை</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">ஒலியுடன் காணொளிகளைப் பிடிக்க மைக்ரோஃபோன் அனுமதியை இயலச் செய்யவும்.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">காணொளிகளைப் பதிவு செய்ய Signal மைக்ரோஃபோன் அனுமதி தேவை, ஆனால் அது மறுக்கப்பட்டது. செயலியின் அமைப்புகளுக்கு சென்று, \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து \"மைக்ரோஃபோன்\" மற்றும் \"கேமரா\" என்பவற்றை இயலச் செய்யவும்.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">காணொளிகளைப் பதிவு செய்ய Signal-க்கு மைக்ரோஃபோன் அனுமதி தேவை.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">காணொளிகளைப் பதிவு செய்ய Molly மைக்ரோஃபோன் அனுமதி தேவை, ஆனால் அது மறுக்கப்பட்டது. செயலியின் அமைப்புகளுக்கு சென்று, \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து \"மைக்ரோஃபோன்\" மற்றும் \"கேமரா\" என்பவற்றை இயலச் செய்யவும்.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">காணொளிகளைப் பதிவு செய்ய Molly-க்கு மைக்ரோஃபோன் அனுமதி தேவை.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">இல்லை</string>
@@ -491,7 +492,7 @@
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
     <string name="ConversationActivity__this_person_is_no_longer_using_signal">இந்த நபர் சிக்னலைப் பயன்படுத்துவதில்லை. உரையாடலை இங்கே மேற்கொள்ள அவர்களை சிக்னலுக்கு அழைக்கவும்.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Signalக்கு அழை</string>
+    <string name="ConversationActivity__invite_to_signal">Mollyக்கு அழை</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">நீங்கள் விரைவில் மீண்டும் நினைவூட்டப்படுவீர்கள்.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">அனைவருக்கும் நீக்கு</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">இந்த டிவைஸில் நீக்கு</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">நீக்கு</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">எல்லா இடங்களிலும் நீக்கு</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">சாட்டில் உள்ள அனைவரும் Signal இன் சமீபத்திய பதிப்பில் இருந்தால், இந்த மெசேஜ் நீக்கப்படும். நீங்கள் ஒரு மெசேஜை நீக்கியுள்ளீர்கள் என்பதை அவர்களால் பார்க்க முடியும்.</string>
@@ -576,9 +579,9 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">தடைசெய்யப்பட்டார்</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Signal லைப் புதுப்பிக்கவும்</string>
+    <string name="ConversationFragment__update_build">Molly லைப் புதுப்பிக்கவும்</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Signalஐ மீண்டும் பதிவு செய்க</string>
+    <string name="ConversationFragment__reregister_signal">Mollyஐ மீண்டும் பதிவு செய்க</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">முந்தைய திரைக்குச் செல்லவும்.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
@@ -647,6 +650,11 @@
         <item quantity="one">இது தேர்ந்தெடுத்த சாட்டை நிரந்தரமாக நீக்கிவிடும்.</item>
         <item quantity="other">இது தேர்ந்தெடுத்த அனைத்து %1$d சாட்களை நிரந்தரமாக நீக்கிவிடும்.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">இது உங்கள் அனைத்து சாதனங்களிலிருந்தும் தேர்ந்தெடுக்கப்பட்ட சாட்டை நிரந்தரமாக அழிக்கும்.</item>
+        <item quantity="other">இது உங்கள் அனைத்து சாதனங்களிலிருந்தும் %1$dதேர்ந்தெடுக்கப்பட்ட சாட்ஸை நிரந்தரமாக அழிக்கும்.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">நீக்கப்படுகிறது</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">தேர்ந்தெடுத்த சாட்டை அழிக்கிறது…</item>
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$dஇதுவரை…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">இதுவரை %1$s%%…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">காப்புப்பிரதிகளை உருவாக்க Signal கு வெளிப்புற சேமிப்பக அனுமதி தேவைப்படுகிறது, ஆனால் அது நிரந்தரமாக மறுக்கப்பட்டது. பயன்பாடு அமைப்புகளைத் தொடரவும், \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து \"சேமிப்பகத்தை\" இயக்கவும்.</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">காப்புப்பிரதிகளை உருவாக்க Molly கு வெளிப்புற சேமிப்பக அனுமதி தேவைப்படுகிறது, ஆனால் அது நிரந்தரமாக மறுக்கப்பட்டது. பயன்பாடு அமைப்புகளைத் தொடரவும், \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து \"சேமிப்பகத்தை\" இயக்கவும்.</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">பேக்கப் நேரத்தை அமைக்கவும்</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">சாட் அமர்வு புதுப்பிக்கப்பட்டது</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal எண்ட்-டு-எண்ட் குறியாக்கத்தைப் பயன்படுத்துகிறது, மேலும் இது சில நேரங்களில் உங்கள் சாட் அமர்வை புதுப்பிக்க வேண்டியிருக்கும். இது உங்கள் சாட்டின் பாதுகாப்பைப் பாதிக்காது, ஆனால் இந்த தொடர்பிலிருந்து நீங்கள் ஒரு மெசேஜைத் தவறவிட்டிருக்கலாம், மேலும் அதை மீண்டும் அனுப்புமாறு அவர்களிடம் கேட்கலாம்.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly எண்ட்-டு-எண்ட் குறியாக்கத்தைப் பயன்படுத்துகிறது, மேலும் இது சில நேரங்களில் உங்கள் சாட் அமர்வை புதுப்பிக்க வேண்டியிருக்கும். இது உங்கள் சாட்டின் பாதுகாப்பைப் பாதிக்காது, ஆனால் இந்த தொடர்பிலிருந்து நீங்கள் ஒரு மெசேஜைத் தவறவிட்டிருக்கலாம், மேலும் அதை மீண்டும் அனுப்புமாறு அவர்களிடம் கேட்கலாம்.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">டெஸ்க்டாப் அல்லது iPad-இல் சிக்னலை பயன்படுத்தவும். உங்களின் இணைக்கப்பட்ட சாதனங்களில் மெசேஜ்கள் ஒத்திசைக்கப்படும்.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">புதிய சாதனத்தை இணை</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">அனைத்து சாதானங்களிலும் எண்டு-டு-எண்டு குறியாக்கம் மூலம் %1$sமெசேஜ்கள் மற்றும் சாட் தகவல்கள் பாதுகாக்கப்பட்டன</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">டெஸ்க்டாப் அல்லது iPad-இல் சிக்னல்</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">இணைக்கப்பட்ட சாதனங்களில் உள்ள அனைத்து மெசேஜ்களும் தனிப்பட்டவை</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">இணைக்கப்பட்ட பிறகு, சிக்னல் மெசேஜ்கள் உங்கள் மொபைல் ஃபோனில் சிக்னலுடன் ஒத்திசைக்கப்படும். உங்களின் பழைய மெசேஜ் பற்றிய வரலாறு தோன்றாது.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">உங்கள் சாதனத்தில், சிக்னலை பதிவிறக்கிட %1$s-ஐப் பார்வையிடவும்</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">எனது இணைக்கப்பட்ட சாதனங்கள்</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">இணைப்புநீக்கு</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s இணைப்பு நீக்கப்பட்டது</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">சாதனத்தை இணைக்கிறது…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">சாதனம் அங்கீகரிக்கப்பட்டது</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">ஏற்றுதல் …</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">இணைக்கப்பட்ட சாதனங்கள் இல்லை</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">இணைக்கப்பட்ட சாதனத்தைத் தடைநீக்குதல்</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">இணைக்க, சாதனத்தில் காட்டப்படும் QR குறியீட்டை ஸ்கேன் செய்யவும்.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">QR குறியீட்டை ஸ்கேன் செய்யுங்கள்</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">நீங்கள் இணைக்க விரும்பும் சாதனத்தில் காட்டப்படும் QR குறியீட்டை ஸ்கேன் செய்ய இந்தச் சாதனத்தைப் பயன்படுத்தவும்</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">சரி</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">இது சாதனம் உங்கள் பார்க்க முடியும் குழுக்கள் மற்றும் தொடர்புகள், உங்கள் உரையாடல்களை அணுகலாம் மற்றும் அனுப்பு உங்கள் பெயரில் செய்திகள்.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">உங்கள் மற்ற சாதனத்தில் இணைத்தலை முடிக்கவும்</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">உங்கள் மற்ற சாதனத்தில் சிக்னலை இணைப்பதை முடிக்கவும்.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">சாதனத்தை இணைப்பதில் தோல்வி</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">இந்த QR குறியீடு செல்லுபடியாகாது. நீங்கள் இணைக்க விரும்பும் சாதனத்தில் காட்டப்படும் QR குறியீட்டை ஸ்கேன் செய்கிறீர்கள் என்பதை உறுதிப்படுத்தவும்.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">மீண்டும் முயற்சி செய்</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">\'%1$s\' துண்டி?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">காணாமல் போன விளையாட்டு சேவைகளை மேம்படுத்தவும்</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">இந்த சாதனம் Play சேவைகளை ஆதரிக்காது. செயலற்ற நிலையில் செய்திகளை மீட்டெடுப்பதில் இருந்து Signal லைத் தடுக்கும் கணினி பேட்டரி மேம்படுத்தல்களை முடக்க தட்டவும்.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">இந்த சாதனம் Play சேவைகளை ஆதரிக்காது. செயலற்ற நிலையில் செய்திகளை மீட்டெடுப்பதில் இருந்து Molly லைத் தடுக்கும் கணினி பேட்டரி மேம்படுத்தல்களை முடக்க தட்டவும்.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Signal லின் இந்த பதிப்பு காலாவதியானது. செய்திகளை அனுப்ப மற்றும் பெற பயன்பாட்டைப் புதுப்பிக்கவும்.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Molly லின் இந்த பதிப்பு காலாவதியானது. செய்திகளை அனுப்ப மற்றும் பெற பயன்பாட்டைப் புதுப்பிக்கவும்.</string>
     <string name="ExpiredBuildReminder_update_now">இப்பொழுது மேம்படுத்து</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,7 +946,7 @@
     <string name="PendingGroupJoinRequestsReminder_view">காண்க</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">நிரந்தர Signal தொடர்பு தோல்வி!</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">நிரந்தர Molly தொடர்பு தோல்வி!</string>
     <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Google Play சேவை உடன் TextSecure-ஐ பதிவு செய்ய இயலவில்லை. இணையதளம் வழியாக தொடர்புடையாடல் முடக்கப்பட்டுள்ளது, TextSecure அமைப்புகள் மெனுவில் மறுபதிவுச்செய்ய முயற்சிக்கவும்</string>
 
 
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">பிழைத்திருத்தப் பதிவுகள் சிக்கலைக் கண்டறிந்து சரிசெய்ய உதவுகின்றன, மேலும் அடையாளம் காணும் தகவலைக் கொண்டிருக்கவில்லை.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal இல் சிக்கல் ஏற்பட்டது. பிழைத்திருத்தப் பதிவு சமர்ப்பிப்பா?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly இல் சிக்கல் ஏற்பட்டது. பிழைத்திருத்தப் பதிவு சமர்ப்பிப்பா?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">பேட்டரி மேம்படுத்தல்கள் காரணமாக அறிவிப்புகள் தாமதமாகலாம்</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">மெசேஜ் அறிவிப்புகள் தாமதமாகாமல் இருக்க, Signalக்கான பேட்டரி மேம்படுத்தல்களை நீங்கள் முடக்கலாம்.</string>
+    <string name="PromptBatterySaverBottomSheet__message">மெசேஜ் அறிவிப்புகள் தாமதமாகாமல் இருக்க, Mollyக்கான பேட்டரி மேம்படுத்தல்களை நீங்கள் முடக்கலாம்.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">பேட்டரி மேம்படுத்தல்கள் காரணமாக அறிவிப்புகள் தாமதமாகலாம்</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">மெசேஜ் அறிவிப்புகள் தாமதமாகாமல் இருக்க, சிக்னலுக்கான பேட்டரி மேம்படுத்தல்களை நீங்கள் முடக்கலாம். சாதனம் சார்ந்த வழிமுறைகளைப் பார்க்க, \"தொடர்\" என்பதைத் தட்டவும்.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">தேவையில்லை,நன்றி</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">தொடர்க</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">தொடர்க</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">நிராகரி</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">தேவையில்லை,நன்றி</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">நிலுவையில் உள்ள குழு அழைப்புகள்</string>
+    <string name="PendingMembersActivity_pending_group_invites">கோரிக்கைகள் &amp; அழைக்கிறது</string>
     <string name="PendingMembersActivity_requests">கோரிக்கைகளை</string>
     <string name="PendingMembersActivity_invites">அழைப்புகள்</string>
     <string name="PendingMembersActivity_people_you_invited">மக்கள் நீங்கள் அழைக்கப்பட்டார்</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">ரத்து செய் </string>
     <string name="InviteActivity_sending">அனுப்புகிறது …</string>
     <string name="InviteActivity_invitations_sent">அழைப்புகள் அனுப்பட்டது!</string>
-    <string name="InviteActivity_invite_to_signal">Signalக்கு அழை</string>
+    <string name="InviteActivity_invite_to_signal">Mollyக்கு அழை</string>
     <string name="InviteActivity_send_sms">குறுஞ்செய்தியை அனுப்பு (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">%1$d எஸ்எம்எஸ் அழைப்பை அனுப்பவா?</item>
         <item quantity="other">%1$d SMS அழைப்புகளை அனுப்பவா?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">%1$s: நாம் Signalக்கு மாறுவோம்</string>
+    <string name="InviteActivity_lets_switch_to_signal">%1$s: நாம் Mollyக்கு மாறுவோம்</string>
     <string name="InviteActivity_no_app_to_share_to">உங்களிடம் பகிர எந்த பயன்பாடுகளும் இல்லை என்று தெரிகிறது.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">உங்கள் தகவல்</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">பின்னணி இணைப்பு இயக்கப்பட்டது</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">பதிலகள்</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal அழைப்பு நிறுவுப்படுகிறது</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly அழைப்பு நிறுவுப்படுகிறது</string>
     <!-- Temporary notification shown when starting the calling service -->
     <string name="NotificationBarManager__starting_signal_call_service">சிக்னல் அழைப்பு சேவை தொடங்குகிறது</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal அழைப்பு சேவையை நிறுத்துதல்</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly அழைப்பு சேவையை நிறுத்துதல்</string>
     <string name="NotificationBarManager__cancel_call">அழைப்பு ரத்து</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">நீங்கள் கட்டணங்களைச் செயல்படுத்தினீர்கள்</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s இப்போது கட்டணங்களை ஏற்க முடியும்</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">கட்டண விவரங்கள் கிடைக்கவில்லை</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">மேலும் தட்டவும்</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">கட்டண விவரங்கள் கிடைக்கவில்லை</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">இந்தக் கட்டண வரலாற்றைக் கொண்டிருக்காத ஆதாரத்திலிருந்து உங்கள் மெசேஜ்கள் மீட்டமைக்கப்பட்டதால், இந்தக் கட்டணத்தின் விவரங்கள் கிடைக்கவில்லை. இது உங்கள் வாலெட் பேலன்ஸ் அல்லது கட்டணங்களின் வரலாற்று நிலையை பாதிக்காது.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1686,6 +1767,8 @@
     <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">நீங்கள் இனி சிக்னலில் எஸ்.எம்.எஸ் செய்திகளை அனுப்ப முடியாது. உரையாடலை இங்கே தொடர %1$s ஐ சிக்னலுக்கு அழைக்கவும்.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">பேமெண்ட்: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">கட்டணம்</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">ஸ்பேம் எனப் புகாரளிக்கப்பட்டது</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Signal சாதனத்தை இணைக்கவா?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">3 வது தரப்பு ஸ்கேனரைப் பயன்படுத்தி Signal சாதனத்தை இணைக்க முயற்சிக்கிறீர்கள் என்று தெரிகிறது. உங்கள் பாதுகாப்பிற்காக, Signal இருந்து குறியீட்டை மீண்டும் ஸ்கேன் செய்யுங்கள்.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">QR குறியீட்டை ஸ்கேன் செய்ய Signal கேமரா அனுமதி தேவை, ஆனால் அது நிரந்தரமாக மறுக்கப்பட்டது. பயன்பாடு அமைப்புகளைத் தொடரவும், \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து \"கேமரா\" ஐ இயக்கவும்.</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">QR குறியீட்டை ஸ்கேன் செய்ய Molly கேமரா அனுமதி தேவை, ஆனால் அது நிரந்தரமாக மறுக்கப்பட்டது. பயன்பாடு அமைப்புகளைத் தொடரவும், \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து \"கேமரா\" ஐ இயக்கவும்.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">கேமரா அனுமதியின்றி QR குறியீட்டை ஸ்கேன் செய்ய முடியவில்லை</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">கடவுச்சொல்லை உள்ளிடவும்.</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal ஐகான்</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly ஐகான்</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">கடவுச்சொல்லை சமர்ப்பிக்க</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">தவறான கடவுச்சொல்!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signal லைத் திற</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal ஆண்ட்ராய்டு - திரைப் பூட்டு</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Molly லைத் திற</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly ஆண்ட்ராய்டு - திரைப் பூட்டு</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">வரைபடம்</string>
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">எனது ஸ்டோரி</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal அழைப்பு</string>
+    <string name="Recipient_signal_call">Molly அழைப்பு</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">தடைசெய்</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">மணி அடிக்கிறது …</string>
     <string name="RedPhone_busy">மும்முரமாக</string>
     <string name="RedPhone_recipient_unavailable">பெறுநர் கிடைக்கவில்லை</string>
-    <string name="RedPhone_network_failed">பிணையம் தோல்வியுற்றது!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">பிணையம் தோல்வியுற்றது! உங்கள் நெட்வொர்க் இணைப்பைச் சரிபார்த்து, மீண்டும் முயலவும்.</string>
     <string name="RedPhone_number_not_registered">எண் பதிவிலில்லை.</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">நீங்கள் டயல் செய்த எண் பாதுகாப்பான குரலை ஆதரிக்காது!</string>
     <string name="RedPhone_got_it">அறிந்துகொண்டேன்</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">உங்கள் வீடியோவை இயக்க இங்கே தட்டவும்</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s ஐ அழைக்க, சிக்னலுக்கு உங்கள் கேமரா அனுமதி தேவை Signal Camera permission</string>
-    <string name="WebRtcCallActivity__signal_s">சிக்னல் Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s ஐ அழைக்க, சிக்னலுக்கு உங்கள் கேமரா அனுமதி தேவை Molly Camera permission</string>
+    <string name="WebRtcCallActivity__signal_s">சிக்னல் Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">அழைக்கிறது…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">மீண்டும் இணைக்கிறது …</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">அழைப்பிலிருந்து அகற்றப்பட்டது</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">யாரோ உங்களை அழைப்பிலிருந்து அகற்றியுள்ளார்.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">உங்கள் கேமரா மற்றும் மைக்ரோஃபோனை அணுக அனுமதிக்கவும்</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">உங்கள் மைக்ரோஃபோனை அணுக அனுமதிக்கவும்</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">உங்கள் கேமராவை அணுக அனுமதிக்கவும்</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">ஒரு அழைப்பைத் தொடங்க அல்லது அழைப்பில் இணைய, உங்கள் கேமரா மற்றும் மைக்ரோஃபோனுக்கான அணுகலை சிக்னலுக்கு வழங்கவும்.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">ஒரு அழைப்பைத் தொடங்க அல்லது அழைப்பில் இணைய, உங்கள் மைக்ரோஃபோனுக்கான அணுகலை சிக்னலுக்கு வழங்கவும்.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">உங்கள் வீடியோவைச் செயல்படுத்த, உங்கள் கேமரா அணுகலை சிக்னலுக்கு வழங்கவும்.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">ஒரு அழைப்பைத் தொடங்க அல்லது அழைப்பில் இணைய சிக்னலுக்கு மைக்ரோஃபோன் அனுமதிகள் தேவை.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">உங்கள் வீடியோவைச் செயல்படுத்துவதற்கு, சிக்னலுக்கு கேமரா அணுகல் தேவை</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">ஒரு அழைப்பைத் தொடங்க அல்லது அழைப்பில் இணைய:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">உங்கள் வீடியோவைச் செயல்படுத்த:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal அழைப்பு</string>
-    <string name="WebRtcCallView__signal_video_call">Signal காணொளி அழைப்பு</string>
+    <string name="WebRtcCallView__signal_call">Molly அழைப்பு</string>
+    <string name="WebRtcCallView__signal_video_call">Molly காணொளி அழைப்பு</string>
     <string name="WebRtcCallView__start_call">அழைப்பைத் தொடங்கு</string>
     <string name="WebRtcCallView__join_call">அழைப்பில் சேர்</string>
     <string name="WebRtcCallView__call_is_full">அழைப்பு நிரம்பியுள்ளது</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">உங்கள் கையைத் தாழ்த்துகிறீர்களா?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">கையைத் தாழ்த்தவும்</string>
+    <string name="CallOverflowPopupWindow__lower_hand">தாழ்த்தவும்</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">ரத்துசெய்</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">நீங்கள் கையை உயர்த்தியுள்ளீர்கள்</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">காண்க</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s கையை உயர்த்தியுள்ளார்</item>
-        <item quantity="other">%1$s + %2$d கையை உயர்த்தியுள்ளனர்</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s கையை உயர்த்தியுள்ளார்</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d கையை உயர்த்தியுள்ளார்</item>
+        <item quantity="other">%1$s +%2$d கையை உயர்த்தியுள்ளனர்</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s கையை உயர்த்தியுள்ளார்</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d கையை உயர்த்தியுள்ளார்</item>
+        <item quantity="other">%1$s +%2$d கையை உயர்த்தியுள்ளனர்</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">இந்த எண்ணை சரிபார்க்க உங்களுக்கு அழைப்பு வரும்.</string>
     <string name="RegistrationActivity_edit_number">எண்ணை தொகுக்க</string>
     <string name="RegistrationActivity_missing_google_play_services">Google Play சேவைகளைக் காணவில்லை</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">இந்த சாதனத்தில் Google Play சேவைகள் இல்லை . இருந்தும் நீங்கள் Signal ஐ பயன்படுத்தலாம் , ஆனால் இந்த உள்ளமைவு நம்பகத்தன்மை அல்லது செயல்திறனைக் குறைக்கலாம். \n\n நீங்கள் ஒரு மேம்பட்ட பயனராக இல்லாவிட்டால், சந்தைக்குப்பிறகான அண்ட்ராய்டு ROM ஐ இயக்கவில்லை அல்லது இதை பிழையாகப் பார்க்கிறீர்கள் என்று நம்பினால், தயவுசெய்து ஆதரவைத் தொடர்பு கொள்ளவும் @ சிக்கல் support@signal.org.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">இந்த சாதனத்தில் Google Play சேவைகள் இல்லை . இருந்தும் நீங்கள் Molly ஐ பயன்படுத்தலாம் , ஆனால் இந்த உள்ளமைவு நம்பகத்தன்மை அல்லது செயல்திறனைக் குறைக்கலாம். \n\n நீங்கள் ஒரு மேம்பட்ட பயனராக இல்லாவிட்டால், சந்தைக்குப்பிறகான அண்ட்ராய்டு ROM ஐ இயக்கவில்லை அல்லது இதை பிழையாகப் பார்க்கிறீர்கள் என்று நம்பினால், தயவுசெய்து ஆதரவைத் தொடர்பு கொள்ளவும் @ சிக்கல் support@molly.im.</string>
     <string name="RegistrationActivity_i_understand">எனக்கு புரிகிறது</string>
     <string name="RegistrationActivity_play_services_error">சேவைகளில் பிழை</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play சேவைகள் புதுப்பித்தல் அல்லது தற்காலிகமாக கிடைக்கவில்லை. தயவு செய்து மீண்டும் முயற்சிக்கவும்.</string>
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">பதிவு செய்வதில் சிக்கல் உள்ளதா?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• உங்கள் SMS அல்லது அழைப்பு பெற உங்கள் ஃபோனில் செல்லுலார் சிக்னல் உள்ளதா என்பதை உறுதிப்படுத்தவும் \n • எண்\n க்கு ஃபோன் அழைப்பைப் பெற முடியுமா என்பதை உறுதிப்படுத்தவும் • உங்கள் தொலைபேசி எண்ணை சரியாக உள்ளிட்டுள்ளீர்களா எனச் சரிபார்க்கவும்.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">மேலும் தகவலுக்கு, இந்த சரிசெய்தல் படிகளைப் பின்பற்றவும் அல்லது ஆதரவைத் தொடர்பு கொள்ளவும்</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">மேலும் தகவலுக்கு, %1$s அல்லது %2$s-ஐப் பின்தொடரவும்</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">இந்த சரிசெய்தல் படிகள்</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">தொடர்பு பட்டியலில் சேர்க்க</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Signalக்கு அழை</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Mollyக்கு அழை</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal செய்தி</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal அழைப்பு</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">தொடர்பு பட்டியலில் சேர்க்க</string>
-    <string name="SharedContactView_invite_to_signal">Signalக்கு அழை</string>
+    <string name="SharedContactView_invite_to_signal">Mollyக்கு அழை</string>
     <string name="SharedContactView_message">Signal செய்தி</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s %2$s க்கு சொந்தமானது</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal புதுப்பிப்பு</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal இன் புதிய பதிப்பு கிடைக்கப்பெறுகிறது. புதுப்பிக்க அழுத்தவும்.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signalஐப் புதுப்பிக்க முடியவில்லை</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly புதுப்பிப்பு</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly இன் புதிய பதிப்பு கிடைக்கப்பெறுகிறது. புதுப்பிக்க அழுத்தவும்.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Mollyஐப் புதுப்பிக்க முடியவில்லை</string>
     <string name="ApkUpdateNotifications_failed_general_body">பின்னர் மீண்டும் முயல்வோம்.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal வெற்றிகரமாக புதுப்பிக்கப்பட்டது</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly வெற்றிகரமாக புதுப்பிக்கப்பட்டது</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">நீங்கள் தானாகவே பதிப்பு %1$sக்குப் புதுப்பிக்கப்பட்டீர்கள்.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">திறக்க தொடு.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal திறக்கப்பட்டது</string>
-    <string name="KeyCachingService_lock">Signal ஐ பூட்டு</string>
+    <string name="KeyCachingService_passphrase_cached">Molly திறக்கப்பட்டது</string>
+    <string name="KeyCachingService_lock">Molly ஐ பூட்டு</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">நீங்கள்</string>
     <string name="MediaPreviewActivity_unssuported_media_type">ஆதரிக்கப்படாத மீடியா வகை</string>
     <string name="MediaPreviewActivity_draft">வரைவு</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">வெளிப்புற சேமிப்பகத்தில் சேமிக்க Signal சேமிப்பக அனுமதி தேவை, ஆனால் அது நிரந்தரமாக மறுக்கப்பட்டது. பயன்பாடு அமைப்புகளைத் தொடரவும், \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து, \"சேமிப்பகத்தை\" இயக்கவும்.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">வெளிப்புற சேமிப்பகத்தில் சேமிக்க Molly சேமிப்பக அனுமதி தேவை, ஆனால் அது நிரந்தரமாக மறுக்கப்பட்டது. பயன்பாடு அமைப்புகளைத் தொடரவும், \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து, \"சேமிப்பகத்தை\" இயக்கவும்.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">அனுமதியின்றி வெளிப்புற சேமிப்பகத்தில் சேமிக்க முடியவில்லை</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">செய்தியை நீக்க வேண்டுமா?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">இது இந்த செய்தியை நிரந்தரமாக நீக்கும்.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">செய்தி விநியோகிப்பது தோல்வியடைந்தது.</string>
     <string name="MessageNotifier_error_delivering_message">செய்தி விநியோகிப்பதில் பிழை.</string>
     <string name="MessageNotifier_message_delivery_paused">செய்தி டெலிவரி இடைநிறுத்தப்பட்டது.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">செய்தியைத் தொடர சரிபார்க்கவும் Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">செய்தியைத் தொடர சரிபார்க்கவும் Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">அனைத்தையும் படித்ததாக குறியீடு</string>
     <string name="MessageNotifier_mark_read">படித்தாக குறியிடு</string>
     <string name="MessageNotifier_turn_off_these_notifications">இந்த அறிவிப்புகளை முடக்கு</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">உங்கள் ஸ்டிக்கருக்கு %1$s என்று எதிர்வினையாற்றினார்.</string>
     <string name="MessageNotifier_this_message_was_deleted">இந்த மெசேஜ் நீக்கப்பட்டது.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">இணைந்த சிக்னல் Signal அறிவிப்புகளை முடக்குவதா? அமைப்புகள் மற்றும் அறிவிப்புகளுக்குச் சென்று அவற்றை Signal settings சிக்னலில் மீண்டும் இயக்கலாம்.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">இணைந்த சிக்னல் Molly அறிவிப்புகளை முடக்குவதா? அமைப்புகள் மற்றும் அறிவிப்புகளுக்குச் சென்று அவற்றை Molly settings சிக்னலில் மீண்டும் இயக்கலாம்.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signal பூட்டப்பட்டிருக்கும் போது விரைவான பதில் கிடைக்காது!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Molly பூட்டப்பட்டிருக்கும் போது விரைவான பதில் கிடைக்காது!</string>
     <string name="QuickResponseService_problem_sending_message">செய்தி அனுப்புவதில் பிரச்சணை!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">தவறான குறுக்குவழி</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">புதிய செய்தி</string>
     <string name="SingleRecipientNotificationBuilder_message_request">செய்தி கோரிக்கை</string>
     <string name="SingleRecipientNotificationBuilder_you">நீங்கள்</string>
@@ -2660,8 +2783,8 @@
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">அழைப்பிற்கு பதிலளிக்க, உங்கள் மைக்ரோஃபோன் அணுகலை சிக்னலுக்கு வழங்கவும்.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">வீடியோ அழைப்பிற்கு பதிலளிக்க, உங்கள் மைக்ரோஃபோன் மற்றும் கேமரா அணுகலை Signalக்கு வழங்கவும்.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">அழைப்புகளைச் செய்ய அல்லது பெற Signal கு மைக்ரோஃபோன் மற்றும் கேமரா அனுமதிகள் தேவை, ஆனால் அவை நிரந்தரமாக மறுக்கப்பட்டுள்ளன. பயன்பாடு அமைப்புகளைத் தொடரவும், \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து, \"மைக்ரோஃபோன்\" மற்றும் \"கேமரா\" ஐ இயக்கவும்.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">வீடியோ அழைப்பிற்கு பதிலளிக்க, உங்கள் மைக்ரோஃபோன் மற்றும் கேமரா அணுகலை Mollyக்கு வழங்கவும்.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">அழைப்புகளைச் செய்ய அல்லது பெற Molly கு மைக்ரோஃபோன் மற்றும் கேமரா அனுமதிகள் தேவை, ஆனால் அவை நிரந்தரமாக மறுக்கப்பட்டுள்ளன. பயன்பாடு அமைப்புகளைத் தொடரவும், \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து, \"மைக்ரோஃபோன்\" மற்றும் \"கேமரா\" ஐ இயக்கவும்.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">இணைக்கப்பட்ட சாதனத்தில் பதிலளிக்கப்பட்டது.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">இணைக்கப்பட்ட சாதனத்தில் மறுக்கப்பட்டது.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">இணைக்கப்பட்ட சாதனத்தில் பயனர் அழைப்பில் இருக்கிறார்.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">புதிய கடவுச்சொல்</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Signalக்கு அழை</string>
+    <string name="contact_selection_activity__invite_to_signal">Mollyக்கு அழை</string>
     <string name="contact_selection_activity__new_group">புதிய குழு</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">தொடர்பு பட்டியலை புதுப்பி</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">யாரையாவது காணவில்லையா? புதுப்பித்து முயல்க</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">சிக்னலில் உங்களுக்குத் தெரிந்தவர்களைக் கண்டறியவும்</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">உங்கள் தொடர்புகளுக்கான அணுகலை அனுமதிக்கவும்</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">மேலும்</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">தொடர்பின் புகைப்படம்</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">உங்கள் தொடர்புகளைக் காண்பிக்க Signal கு தொடர்புகளின் அனுமதி தேவைப்படுகிறது, ஆனால் அது நிரந்தரமாக மறுக்கப்பட்டது. பயன்பாடு அமைப்புகள் மெனுவில் தொடரவும், \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து, \"தொடர்புகளை\" இயக்கவும்.</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">உங்கள் தொடர்புகளைக் காண்பிக்க Molly கு தொடர்புகளின் அனுமதி தேவைப்படுகிறது, ஆனால் அது நிரந்தரமாக மறுக்கப்பட்டது. பயன்பாடு அமைப்புகள் மெனுவில் தொடரவும், \"அனுமதிகள்\" என்பதைத் தேர்ந்தெடுத்து, \"தொடர்புகளை\" இயக்கவும்.</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">தொடர்புகளை மீட்டெடுப்பதில் பிழை, உங்கள் பிணைய இணைப்பைச் சரிபார்க்கவும்</string>
     <string name="ContactSelectionListFragment_username_not_found">பயனர் பெயர் கிடைக்கவில்லை</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"%1$s சிக்னல் பயனர் அல்ல. தயவுசெய்து பயனர் பெயரைச் சரிபார்த்து மீண்டும் முயற்சிக்கவும்."</string>
@@ -2750,13 +2873,15 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">பயனர் பெயர் மூலம் கண்டறியவும்</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">தொடர்புகளுக்கான அணுகலை அனுமதிக்கவும்</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">சிக்னலில் உங்களுக்குத் தெரிந்தவர்களைக் கண்டறிய:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">அணுகலை அனுமதிக்கவும்</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">தேவையில்லை,நன்றி</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">உங்கள் தொடர்புகளுக்கான அணுகலை அனுமதிக்கவும். உங்கள் தொடர்புகள் குறியாக்கம் செய்யப்பட்டுள்ளது, மேலும் சிக்னல் சேவைக்குக் காண்பிக்கப்படாது.</string>
 
     <!-- contact_selection_list_fragment -->
     <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">உங்கள் தொடர்புகளைக் காண்பிக்க சிக்னலுக்கு அணுகல் தேவை.</string>
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">நீங்கள் இவரை அகற்றிவிட்டீர்கள், அவருக்கு மீண்டும் செய்தி அனுப்பினால், அவர் உங்கள் பட்டியலில் மீண்டும் சேர்க்கப்படுவார்.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">விருப்பங்கள்</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">புதுப்பிக்கப்பட்டது</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">விளையாடு … இடைநிறுத்து</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">பபிள்ஸ் என்பது Android அம்சமாகும், இதை நீங்கள் Signal சாட்களுக்கு முடக்கப் பயன்படுத்தலாம்.</string>
+    <string name="BubbleOptOutTooltip__description">பபிள்ஸ் என்பது Android அம்சமாகும், இதை நீங்கள் Molly சாட்களுக்கு முடக்கப் பயன்படுத்தலாம்.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">இப்போது இல்லை</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">குழு விளக்கம்</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Signal லைப் புதுப்பிக்கவும்</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Molly லைப் புதுப்பிக்கவும்</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Signal இன் இந்தப் பதிப்பு காலாவதியானது. தொடர்ந்து Signalஐப் பயன்படுத்த, இப்போதே புதுப்பிக்கவும்.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Molly இன் இந்தப் பதிப்பு காலாவதியானது. தொடர்ந்து Mollyஐப் பயன்படுத்த, இப்போதே புதுப்பிக்கவும்.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">புதுப்பிக்கப்பட்டது</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">மெதுவாக</string>
     <string name="preferences__help">உதவி</string>
     <string name="preferences__advanced">மேம்பட்ட</string>
-    <string name="preferences__donate_to_signal">Signalக்கு நன்கொடை அளிக்கவும்</string>
+    <string name="preferences__donate_to_signal">Mollyக்கு நன்கொடை அளிக்கவும்</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">தனியுரிமை</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">செயலி ஐகானையும் பெயரையும் \"%1$s\" என மாற்றவும்</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">செயலியின் ஐகானையும் பெயரையும் மாற்ற Signal மூடப்பட வேண்டும். அறிவிப்புகள் எப்போதும் இயல்புநிலை Signal ஐகானையும் பெயரையும் காண்பிக்கும்.</string>
+    <string name="preferences__app_icon_dialog_description">செயலியின் ஐகானையும் பெயரையும் மாற்ற Molly மூடப்பட வேண்டும். அறிவிப்புகள் எப்போதும் இயல்புநிலை Molly ஐகானையும் பெயரையும் காண்பிக்கும்.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">செயலி ஐகானையும் பெயரையும் தேர்ந்தெடுக்கவும், இது உங்கள் மொபைலின் முகப்புத் திரை மற்றும் ஆப் டிராயரில் தெரியும். அறிவிப்புகள் எப்போதும் இயல்புநிலை Signal ஐகானையும் பெயரையும் காண்பிக்கும். மேலும் அறிக</string>
+    <string name="preferences__app_icon_warning_learn_more">செயலி ஐகானையும் பெயரையும் தேர்ந்தெடுக்கவும், இது உங்கள் மொபைலின் முகப்புத் திரை மற்றும் ஆப் டிராயரில் தெரியும். அறிவிப்புகள் எப்போதும் இயல்புநிலை Molly ஐகானையும் பெயரையும் காண்பிக்கும். மேலும் அறிக</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">செயலி ஐகான்கள் மற்றும் பெயர்கள் முகப்புத் திரை மற்றும் செயலி டிராயரில் தெரிகிறது.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">அறிவிப்புகள் எப்போதும் இயல்புநிலை Signal ஐகானையும் பெயரையும் காண்பிக்கும்.</string>
+    <string name="preferences__app_icon_notification_warning">அறிவிப்புகள் எப்போதும் இயல்புநிலை Molly ஐகானையும் பெயரையும் காண்பிக்கும்.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">மேலும் அறிக</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">இது அனைத்து சாட்களையும் %1$s மிக சமீபத்திய மெசேஜ்களுக்கு நிரந்தரமாக குறைக்கும்.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">இது உங்கள் டிவைஸில் இருந்து அனைத்து மெசேஜ் வரலாறு மற்றும் மீடியாவை நிரந்தரமாக நீக்கும்.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">இந்தச் சாதனத்திலிருந்தும் இணைக்கப்பட்ட அனைத்து சாதனத்திலிருந்தும் எல்லா மெசேஜ் வரலாற்றையும் மீடியாவையும் இது நிரந்தரமாக அழிக்கும்.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">அனைத்து மெசேஜ் வரலாற்றையும் நீக்க விரும்புகிறீர்களா?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">அனைத்து மெசேஜ் வரலாறும் நிரந்தரமாக அகற்றப்படும். இந்த செயலைச் செயல்தவிர்க்க முடியாது.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">எல்லா மெசேஜ் வரலாறும் அனைத்து சாதனங்களிலிருந்தும் நிரந்தரமாக அகற்றப்படும். இந்தச் செயலைச் செயல்தவிர்க்க முடியாது.</string>
     <string name="preferences_storage__delete_all_now">அனைத்தையும் இப்போது நீக்கு</string>
     <string name="preferences_storage__forever">என்றென்றும்</string>
     <string name="preferences_storage__one_year">1 வருடம்</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">தணிக்கையை மீறி செயலாற்றுதல்</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">தணிக்கையை மீறி செயலாற்றுதல்</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">இயக்கப்பட்டால், தணிக்கை தவிர்க்க Signal முயற்சிக்கும். நீங்கள் Signal தணிக்கை செய்யப்பட்ட இடத்தில் இல்லாவிட்டால் இந்த அம்சத்தை இயக்க வேண்டாம்.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">இயக்கப்பட்டால், தணிக்கை தவிர்க்க Molly முயற்சிக்கும். நீங்கள் Molly தணிக்கை செய்யப்பட்ட இடத்தில் இல்லாவிட்டால் இந்த அம்சத்தை இயக்க வேண்டாம்.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">உங்கள் கணக்கு தொலைபேசி எண்ணின் அடிப்படையில் தணிக்கை சுற்றளவு செயல்படுத்தப்பட்டுள்ளது.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">பேமெண்ட்கள் வசதியை அறிமுகப்படுத்துகிறோம்</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Signal ஐ பயன்படுத்தி MobileCoin அனுப்பலாம் மற்றும் பெறலாம். இது ஒரு புதிய தனியுரிமை சார்ந்த டிஜிட்டல் நாணயம். தொடங்குவதற்கு செயல்படுத்தவும்.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Molly ஐ பயன்படுத்தி MobileCoin அனுப்பலாம் மற்றும் பெறலாம். இது ஒரு புதிய தனியுரிமை சார்ந்த டிஜிட்டல் நாணயம். தொடங்குவதற்கு செயல்படுத்தவும்.</string>
     <string name="PaymentsHomeFragment__activate_payments">கொடுப்பனவுகளைச் செயல்படுத்தவும்</string>
     <string name="PaymentsHomeFragment__activating_payments">கொடுப்பனவுகளை செயல்படுத்துகிறது…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">பணம் செலுத்தல் கணக்கை மீட்டமை</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">விவரங்கள்</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">MobileCoinஐ அனுப்பவும் பெறவும் நீங்கள் Signalஐப் பயன்படுத்தலாம். அனைத்து பேமெண்ட்களும் MobileCoins மற்றும் MobileCoin Wallet செயலியின் விதிமுறைகளுக்கு உட்பட்டது. நீங்கள் சில சிக்கல்களைச் சந்திக்க நேரிடலாம் மற்றும் நீங்கள் இழக்கக்கூடிய கட்டணங்களை அல்லது நிலுவைகளை மீட்டெடுக்க முடியாது. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">MobileCoinஐ அனுப்பவும் பெறவும் நீங்கள் Mollyஐப் பயன்படுத்தலாம். அனைத்து பேமெண்ட்களும் MobileCoins மற்றும் MobileCoin Wallet செயலியின் விதிமுறைகளுக்கு உட்பட்டது. நீங்கள் சில சிக்கல்களைச் சந்திக்க நேரிடலாம் மற்றும் நீங்கள் இழக்கக்கூடிய கட்டணங்களை அல்லது நிலுவைகளை மீட்டெடுக்க முடியாது. </string>
     <string name="PaymentsHomeFragment__activate">செயல்படுத்த</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoin விதிமுறைகளைக் காண்க</string>
-    <string name="PaymentsHomeFragment__payments_not_available">கொடுப்பனவுகள் Signal இருக்கிறது இல்லைநீண்ட நேரம் கிடைக்கும். நீங்கள் இன்னும் முடியும்பரிமாற்றம் நிதி ஒரு பரிமாற்றம் ஆனால் உன்னால் முடியும் இல்லை நீண்டது அனுப்பு மற்றும் பணம் பெறுதல் அல்லது கூட்டு நிதி.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">கொடுப்பனவுகள் Molly இருக்கிறது இல்லைநீண்ட நேரம் கிடைக்கும். நீங்கள் இன்னும் முடியும்பரிமாற்றம் நிதி ஒரு பரிமாற்றம் ஆனால் உன்னால் முடியும் இல்லை நீண்டது அனுப்பு மற்றும் பணம் பெறுதல் அல்லது கூட்டு நிதி.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">பெர்மீஷன்களை அனுமதித்தல்</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">உங்களுக்குத் தெரிந்தவர்களுக்கு மெசேஜ் அனுப்ப உதவ, Signal இந்த அனுமதிகளைக் கோரும். </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">உங்களுக்குத் தெரிந்தவர்களுக்கு மெசேஜ் அனுப்ப உதவ, Molly இந்த அனுமதிகளைக் கோரும். </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">அறிவிப்புகள்</string>
     <!-- Notifications permission row description -->
@@ -3581,9 +3712,9 @@
     <string name="PaymentsTransferFragment__next">அடுத்தது</string>
     <string name="PaymentsTransferFragment__invalid_address">தவறானது முகவரி</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">சரிபார்க்கவும் பணப்பை முகவரி நீங்கள் முயற்சிக்கிறீர்கள் பரிமாற்றம் மீண்டும் முயற்சிக்கவும்.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">உங்களால் முடியாது பரிமாற்றம் உங்கள் சொந்த Signal பணப்பை முகவரி. உள்ளிடவும் தி பணப்பை முகவரி உன்னிடத்திலிருந்து கணக்கு ஆதரிக்கப்படும் இடத்தில் பரிமாற்றம்.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">க்கு ஊடுகதிர் a க்யு ஆர் குறியீடு, Signal அணுகல் தேவை புகைப்பட கருவி.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal தேவை புகைப்பட கருவி அனுமதி க்கு பிடிப்பு a க்யு ஆர் குறியீடு. செல்லுங்கள்அமைப்புகள், தேர்ந்தெடுக்கவும் \"அனுமதிகள்\", மற்றும் இயக்கு\"புகைப்பட கருவி\".</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">உங்களால் முடியாது பரிமாற்றம் உங்கள் சொந்த Molly பணப்பை முகவரி. உள்ளிடவும் தி பணப்பை முகவரி உன்னிடத்திலிருந்து கணக்கு ஆதரிக்கப்படும் இடத்தில் பரிமாற்றம்.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">க்கு ஊடுகதிர் a க்யு ஆர் குறியீடு, Molly அணுகல் தேவை புகைப்பட கருவி.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly தேவை புகைப்பட கருவி அனுமதி க்கு பிடிப்பு a க்யு ஆர் குறியீடு. செல்லுங்கள்அமைப்புகள், தேர்ந்தெடுக்கவும் \"அனுமதிகள்\", மற்றும் இயக்கு\"புகைப்பட கருவி\".</string>
     <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">க்கு ஊடுகதிர் a க்யு ஆர் குறியீடு, சிக்னல் அணுகல் தேவை புகைப்பட கருவி.</string>
     <string name="PaymentsTransferFragment__settings">அமைப்புகள்</string>
 
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">உள்வரும் Signal குரல் அழைப்பு</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">உள்வரும் Molly குரல் அழைப்பு</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">உள்வரும் Signal வீடியோ அழைப்பு</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">உள்வரும் Molly வீடியோ அழைப்பு</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">உள்வரும் Signal குழு அழைப்பு</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">உள்வரும் Molly குழு அழைப்பு</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">தற்போதைய Signal குரல் அழைப்பு</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">தற்போதைய Molly குரல் அழைப்பு</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">தற்போதைய Signal வீடியோ அழைப்பு</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">தற்போதைய Molly வீடியோ அழைப்பு</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">தற்போதைய Signal குழு அழைப்பு</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">தற்போதைய Molly குழு அழைப்பு</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">ஏற்றுதல் …</string>
@@ -4006,8 +4137,8 @@
     <string name="RegistrationActivity_call_me_instead_available_in">என்னை அழைக்கவும் (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">குறியீட்டை மீண்டும் அனுப்புக (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Signal ஆதரவைத் தொடர்பு கொள்ளுங்கள்</string>
-    <string name="RegistrationActivity_code_support_subject">Signal பதிவு - அண்ட்ராய்டு க்கான சரிபார்ப்புக் குறியீடு</string>
+    <string name="RegistrationActivity_contact_signal_support">Molly ஆதரவைத் தொடர்பு கொள்ளுங்கள்</string>
+    <string name="RegistrationActivity_code_support_subject">Molly பதிவு - அண்ட்ராய்டு க்கான சரிபார்ப்புக் குறியீடு</string>
     <string name="RegistrationActivity_incorrect_code">தவறான குறியீடு</string>
     <string name="BackupUtil_never">ஒருபோதுமில்லை</string>
     <string name="BackupUtil_unknown">முன் தெரிந்திராத</string>
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">நீங்கள் பல முயற்சிகள் செய்துள்ளீர்கள். சிறிது நேரம் கழித்து மீண்டும் முயற்சிக்கவும்.</string>
     <string name="RegistrationActivity_error_connecting_to_service">சேவைக்கு இணைப்பதில் பிழை</string>
     <string name="preferences_chats__backups">காப்புப் பிரதிகள்</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal பூட்டப்பட்டுள்ளது</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly பூட்டப்பட்டுள்ளது</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">திறக்க தட்டவும்</string>
     <string name="Recipient_unknown">தெரியாத</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">உங்கள் பழைய சாதனத்தை அணுக வேண்டும்.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">மீட்டமை இருந்து காப்புப்பிரதி</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">மீட்டமை உங்கள் செய்திகளை உள்ளூர் காப்புப்பிரதி. நீங்கள் இல்லையென்றால்மீட்டமை இப்போது, ​​உங்களால் முடியாது மீட்டமை பின்னர்.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">உள் காப்புப்பிரதியை மீட்டமை</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">சிக்னல் காப்புப்பிரதியை மீட்டமை</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">உங்களின் அனைத்து உரை மெசேஜ்கள் + உங்களின் கடைசி 30 நாட்களின் மீடியாவை மீட்டமை</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">அதிக விருப்பத்தேர்வுகள்</string>
 
+    <string name="TransferOrRestoreFragment__cancel">ரத்துசெய்</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">இடமாற்றம் செய்யாமல் உள்நுழைக</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">உங்களின் மெசேஜ்கள் மற்றும் மீடியாவை இடமாற்றம் செய்யாமல் தொடர்க</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">உங்கள் பழைய Android தொலைபேசியில் Signal த் திறக்கவும்</string>
     <string name="NewDeviceTransferInstructions__continue">தொடர்ந்து செல் </string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">பழைய Android சாதனத்துடன் இணைக்கத் தயாராகிறது…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">ஒரு கணம் எடுத்து, விரைவில் தயாராக இருக்க வேண்டும்</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">பழைய Android சாதனம் இணைக்க காத்திருக்கிறது…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal இடம் தேவை அனுமதி உங்கள் பழைய Android சாதனத்தைக் கண்டுபிடித்து இணைக்க.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal உங்கள் பழைய Android சாதனத்தைக் கண்டுபிடித்து இணைக்க இருப்பிட சேவைகள் தேவை.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal உங்கள் பழைய Android சாதனத்தைக் கண்டுபிடித்து இணைக்க Wi-Fi தேவை. வைஃபை இயக்கத்தில் இருக்க வேண்டும், ஆனால் அதை வைஃபை நெட்வொர்க்குடன் இணைக்க வேண்டியதில்லை.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">மன்னிக்கவும், இந்த சாதனம் இல்லை என்று தோன்றுகிறது ஆதரவு வைஃபை நேரடி. Signal வைஃபை பயன்படுத்துகிறது நேரடிஉங்கள் பழைய Android சாதனத்தைக் கண்டுபிடித்து இணைக்க. நீங்கள் இன்னும் முடியும்மீட்டமை a காப்புப்பிரதி க்கு மீட்டமை உங்கள் கணக்கு உங்கள் பழைய Android சாதனத்திலிருந்து.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly இடம் தேவை அனுமதி உங்கள் பழைய Android சாதனத்தைக் கண்டுபிடித்து இணைக்க.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly உங்கள் பழைய Android சாதனத்தைக் கண்டுபிடித்து இணைக்க இருப்பிட சேவைகள் தேவை.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly உங்கள் பழைய Android சாதனத்தைக் கண்டுபிடித்து இணைக்க Wi-Fi தேவை. வைஃபை இயக்கத்தில் இருக்க வேண்டும், ஆனால் அதை வைஃபை நெட்வொர்க்குடன் இணைக்க வேண்டியதில்லை.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">மன்னிக்கவும், இந்த சாதனம் இல்லை என்று தோன்றுகிறது ஆதரவு வைஃபை நேரடி. Molly வைஃபை பயன்படுத்துகிறது நேரடிஉங்கள் பழைய Android சாதனத்தைக் கண்டுபிடித்து இணைக்க. நீங்கள் இன்னும் முடியும்மீட்டமை a காப்புப்பிரதி க்கு மீட்டமை உங்கள் கணக்கு உங்கள் பழைய Android சாதனத்திலிருந்து.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">மீட்டமை a காப்புப்பிரதி</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">உங்கள் பழைய Android சாதனத்துடன் இணைக்க முயற்சிக்கும்போது எதிர்பாராத பிழை ஏற்பட்டது.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">புதிய Android சாதனத்தைத் தேடுகிறது…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal இடம் தேவை அனுமதி உங்கள் புதிய Android சாதனத்தைக் கண்டுபிடித்து இணைக்க.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal உங்கள் புதிய Android சாதனத்தைக் கண்டுபிடித்து இணைக்க Wi-Fi தேவை. வைஃபை இயக்கத்தில் இருக்க வேண்டும், ஆனால் அதை வைஃபை நெட்வொர்க்குடன் இணைக்க வேண்டியதில்லை.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">மன்னிக்கவும், இந்த சாதனம் இல்லை என்று தோன்றுகிறது ஆதரவு வைஃபை நேரடி. Signal வைஃபை பயன்படுத்துகிறது நேரடிஉங்கள் புதிய Android சாதனத்தைக் கண்டுபிடித்து இணைக்க. நீங்கள் இன்னும் முடியும்உருவாக்கு a காப்புப்பிரதி க்கு மீட்டமை உங்கள் கணக்கு உங்கள் புதிய Android சாதனத்தில்.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly இடம் தேவை அனுமதி உங்கள் புதிய Android சாதனத்தைக் கண்டுபிடித்து இணைக்க.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly உங்கள் புதிய Android சாதனத்தைக் கண்டுபிடித்து இணைக்க Wi-Fi தேவை. வைஃபை இயக்கத்தில் இருக்க வேண்டும், ஆனால் அதை வைஃபை நெட்வொர்க்குடன் இணைக்க வேண்டியதில்லை.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">மன்னிக்கவும், இந்த சாதனம் இல்லை என்று தோன்றுகிறது ஆதரவு வைஃபை நேரடி. Molly வைஃபை பயன்படுத்துகிறது நேரடிஉங்கள் புதிய Android சாதனத்தைக் கண்டுபிடித்து இணைக்க. நீங்கள் இன்னும் முடியும்உருவாக்கு a காப்புப்பிரதி க்கு மீட்டமை உங்கள் கணக்கு உங்கள் புதிய Android சாதனத்தில்.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">உருவாக்கு a காப்புப்பிரதி</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">உங்கள் புதிய Android சாதனத்துடன் இணைக்க முயற்சிக்கும்போது எதிர்பாராத பிழை ஏற்பட்டது.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">இடமாற்றம் தகவல்கள்</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">இரண்டு சாதனங்களையும் ஒவ்வொன்றின் அருகே வைத்திருங்கள் மற்றவை. சாதனங்களை அணைத்து வைக்க வேண்டாம் Signal திறந்த. இடமாற்றங்கள் முடிவிலிருந்து-முடிவுவரை மறையாக்கப்பட்ட.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">இரண்டு சாதனங்களையும் ஒவ்வொன்றின் அருகே வைத்திருங்கள் மற்றவை. சாதனங்களை அணைத்து வைக்க வேண்டாம் Molly திறந்த. இடமாற்றங்கள் முடிவிலிருந்து-முடிவுவரை மறையாக்கப்பட்ட.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d இதுவரை செய்திகள்…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">இதுவரை வந்த செய்திகளில் %1$s%%…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">இடமாற்றம் கணக்கு</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">பதிவிறக்க Signal உங்கள் புதிய Android சாதனத்தில்</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">பதிவிறக்க Molly உங்கள் புதிய Android சாதனத்தில்</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"தட்டவும் on \"இடமாற்றம் அல்லது மீட்டமை கணக்கு\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">இதைக் கொண்ட எவரும் இணைப்பு பார்க்க முடியும் குழுபெயர் மற்றும் புகைப்படம் மற்றும் கோரிக்கை சேர. பகிர் அது மக்கள் நீங்கள் நம்புகிறீர்கள்.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">இதைக் கொண்ட எவரும் இணைப்பு பார்க்க முடியும் குழுபெயர் மற்றும் புகைப்படம் மற்றும் சேர தி குழு. பகிர் அது மக்கள் நீங்கள் நம்புகிறீர்கள்.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">சிக்னல் Signal வழியாக பகிரவும்</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">சிக்னல் Molly வழியாக பகிரவும்</string>
     <string name="GroupLinkBottomSheet_copy">நகல்</string>
     <string name="GroupLinkBottomSheet_qr_code">QR குறியீடு</string>
     <string name="GroupLinkBottomSheet_share">பகிர்</string>
@@ -4463,7 +4601,7 @@
     <string name="DeactivateWalletFragment__deactivate_without_transferring">செயலிழக்க இல்லாமல் இடமாற்றம்</string>
     <string name="DeactivateWalletFragment__deactivate">செயலிழக்க</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">செயலிழக்க இல்லாமல் இடமாற்றம்?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">கட்டணங்களை மீண்டும் செயல்படுத்த நீங்கள் தேர்வுசெய்தால், Signal உடன் இணைக்கப்பட்ட உங்கள் வாலட்டில் உங்கள் இருப்பு இருக்கும்.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">கட்டணங்களை மீண்டும் செயல்படுத்த நீங்கள் தேர்வுசெய்தால், Molly உடன் இணைக்கப்பட்ட உங்கள் வாலட்டில் உங்கள் இருப்பு இருக்கும்.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">செயலிழக்க பிழை பணப்பை.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">உரிமங்கள்</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">விதிமுறைகள் &amp; ஆம்ப்; தனியுரிமைக் கொள்கை</string>
-    <string name="HelpFragment__copyright_signal_messenger">பதிப்புரிமை Signal தூதர்</string>
+    <string name="HelpFragment__copyright_signal_messenger">பதிப்புரிமை Molly தூதர்</string>
     <string name="HelpFragment__licenced_under_the_agplv3">GNU AGPLv3 இன் கீழ் உரிமம் பெற்றது</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">ஒரு நிறத்தை தேர்ந்தெடுங்கள்</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">பகிர்</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">இந்த குழுவிற்கு நிர்வாகிகள் மட்டுமே செய்திகளை அனுப்ப முடியும்.</string>
-    <string name="MultiselectForwardFragment__limit_reached">வரம்பை எட்டியது</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">நீங்கள் 5 சாட்ஸூக்கு மேல் தேர்வு செய்ய முடியாது</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">மேலும் அறிக</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Signal லைப் புதுப்பிக்கவும்</string>
+    <string name="UpdateSignalExpiredDialog__title">Molly லைப் புதுப்பிக்கவும்</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Signal இன் இந்தப் பதிப்பு காலாவதியானது. தொடர்ந்து Signalஐப் பயன்படுத்த, இப்போதே புதுப்பிக்கவும்.</string>
+    <string name="UpdateSignalExpiredDialog__message">Molly இன் இந்தப் பதிப்பு காலாவதியானது. தொடர்ந்து Mollyஐப் பயன்படுத்த, இப்போதே புதுப்பிக்கவும்.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">புதுப்பிக்கப்பட்டது</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">டிவைஸ் பதிவு செய்யப்படவில்லை</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">இந்த டிவைஸ் இனி பதிவுசெய்யப்பட்டிருக்காது. இந்த டிவைஸில் Signalஐத் தொடர்ந்து பயன்படுத்த, மீண்டும் பதிவு செய்யவும்.</string>
+    <string name="ReregisterSignalDialog__message">இந்த டிவைஸ் இனி பதிவுசெய்யப்பட்டிருக்காது. இந்த டிவைஸில் Mollyஐத் தொடர்ந்து பயன்படுத்த, மீண்டும் பதிவு செய்யவும்.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">மறு பதிவு</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">பிக்கரைத் திறக்க முடியவில்லை.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">அறிவிப்புகளை இயக்க, Signalக்கு அவற்றைக் காண்பிக்க அனுமதி தேவை.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">அறிவிப்புகளை இயக்க, Mollyக்கு அவற்றைக் காண்பிக்க அனுமதி தேவை.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">இயக்கு</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">இதுவரை பதில்கள் ஏதுமில்லை</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">இந்த குழுவில் உறுப்பினராக இல்லாததால் உங்களால் இந்த ஸ்டோரிக்கு பதிலளிக்க முடியாது.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">ஸ்டோரிக்கு எதிர்வினையாற்றப்பட்டது</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">ஸ்டோரிக்கு எதிர்வினையாற்றியுள்ளீர்கள்</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">ஸ்டோரிக்கு எதிர்வினையாற்றியுள்ளார்</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">பார்வைகள்</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">உங்கள் வங்கியைத் தேர்ந்தெடுக்கவும்</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">உங்கள் நன்கொடையை %1$s உடன் உறுதிப்படுத்தவும்</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">உங்கள் தொடர் நன்கொடையை அமைக்க, உங்கள் வங்கியில் €0,01 கட்டணத்தை உறுதிசெய்ய அழுத்தவும். இது தானாகத் திருப்பியளிக்கப்படும் மற்றும் உங்கள் €5/மாத நன்கொடையை உங்கள் கணக்கிலிருந்து டெபிட் செய்ய அனுமதிக்கும்.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">உங்கள் தொடர் நன்கொடையை அமைக்க, உங்கள் வங்கியில் €0,01 கட்டணத்தை உறுதிசெய்ய அழுத்தவும். இது தானாகத் திருப்பி அளிக்கப்படும் மற்றும் உங்கள் %1$s/மாத நன்கொடையை உங்கள் கணக்கிலிருந்து டெபிட் செய்ய அனுமதிக்கும்.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">தொடர்க</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">காப்புப்பிரதி தரவைப் பதிவிறக்குகிறது…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">மீடியா பேக்கப்கள் முடக்கப்பட்டுள்ளன</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">உங்கள் சிக்னல் மீடியா பேக்கப் திட்டம் ரத்துசெய்யப்பட்டது, ஏனெனில் உங்கள் கட்டணத்தை எங்களால் செயலாக்க முடியவில்லை. உங்கள் பேக்கப்பில் சேமிக்கப்பட்டுள்ள எந்த மீடியாவையும் பதிவிறக்கம் செய்ய உங்களிடம் %1$d நாள் உள்ளது. %1$d நாளுக்குப் பிறகு, உங்கள் பேக்கப்பில் உள்ள மீடியா அழிக்கப்படும்.</item>
+        <item quantity="other">உங்கள் சிக்னல் மீடியா பேக்கப் திட்டம் ரத்துசெய்யப்பட்டது, ஏனெனில் உங்கள் கட்டணத்தை எங்களால் செயலாக்க முடியவில்லை. உங்கள் பேக்கப்பில் சேமிக்கப்பட்டுள்ள எந்த மீடியாவையும் பதிவிறக்கம் செய்ய உங்களிடம் %1$d நாட்கள் உள்ளது. %1$d நாட்களுக்குப் பிறகு, உங்கள் பேக்கப்பில் உள்ள மீடியா அழிக்கப்படும்.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">உங்கள் எல்லா மீடியாவையும் தொடர்ந்து பேக்கப் எடுப்பதற்கு எந்த நேரத்திலும் பேக்கப்பிற்கு மீண்டும் பணம் செலுத்தத் தொடங்கலாம். </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">உங்கள் மீடியா இன்று அழிக்கப்படும்</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">உங்கள் சிக்னலின் மீடியா பேக்கப் திட்டம் ரத்துசெய்யப்பட்டது, ஏனெனில் உங்கள் கட்டணத்தைச் எங்களால் செயலாக்க முடியவில்லை. உங்கள் பேக்கப்பில் உள்ள மீடியா அழிக்கப்படும் முன் அதைப் பதிவிறக்குவதற்கான கடைசி வாய்ப்பு இதுவாகும்.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">பதிவிறக்கத்தை நிறைவு செய்ய முடியவில்லை</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">உங்கள் சாதனத்தில் போதுமான இடம் இல்லை. உங்கள் காப்புப்பிரதியில் சேமிக்கப்பட்டுள்ள ஊடகத்தைப் பதிவிறக்க, %1$s இடம் வரை காலியாக்கவும்.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">\"தவிர்\" என்பதைத் தேர்வுசெய்தால், உங்கள் பேக்கப்பில் உள்ள ஊடகம் %1$d நாளில் அழிக்கப்படும்.</item>
+        <item quantity="other">\"தவிர்\" என்பதைத் தேர்வுசெய்தால், உங்கள் பேக்கப்பில் உள்ள ஊடகம் %1$d நாட்களில் அழிக்கப்படும்.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">பேக்கப் கட்டணத்தைச் செயலாக்க முடியவில்லை</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">உங்களின் மாதாந்திர தொடர் பேக்கப் கட்டணத்தைச் சேகரிப்பதில் நாங்கள் சிக்கலை எதிர்கொள்கிறோம். உங்கள் கட்டண முறை புதுப்பித்த நிலையில் இருப்பதை உறுதிசெய்யவும். இல்லையெனில், கூகுள் பேவில் புதுப்பிக்கவும். சிக்னல் சில நாட்களில் கட்டணத்தைச் செயலாக்க முயற்சிக்கும்.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">பேக்கப்பை நிறைவு செய்ய முடியவில்லை</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">%1$d நாட்களுக்கான பேக்கப்பை உங்கள் சாதனம் நிறைவு செய்யவில்லை. உங்கள் சாதனம் வை-ஃபை உடன் இணைக்கப்பட்டிருப்பதை உறுதி செய்து \"இப்போதே பேக்கப் எடு\" என்பதை அழுத்தவும். </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">மேலும் அறிக</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">தவிர்</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">இப்போதே மீடியாவைப் பதிவிறக்கு</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">பின்னர் பதிவிறக்கு</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">மீடியாவைப் பதிவிறக்க வேண்டாம்</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">உங்கள் ஊடகத்தைப் பதிவிறக்க %1$s இடத்தைக் காலியாக்கவும்.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">கிரெடிட் அல்லது டெபிட் கார்டு</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">முன் தெரிந்திராத</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">கட்டண வரலாறு</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">உங்களின் கடைசி காப்புப் பிரதி %1$sஅன்று %2$s மணிக்கு செய்யப்பட்டது.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">தேர்ந்தெடுக்கப்பட்ட நேரத்தை விடப் பழைய மெசேஜ்கள் நிரந்தரமாக நீக்கப்படும்.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">தேர்ந்தெடுக்கப்பட்ட அளவுக்கு அதிகமான மெசேஜ்கள் நிரந்தரமாக நீக்கப்படும்.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">இணைக்கப்பட்ட சாதனங்களுக்கு வரம்புகளைப் பயன்படுத்துக</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">செயல்படுத்தப்பட்டால், சாட் வரம்புகள் உங்கள் இணைக்கப்பட்ட சாதனங்களிலிருந்து மெசேஜ்களையும் அழிக்கும்.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">இப்போது உங்களின் அனைத்து சாதனங்களிலும் அழித்தல் அம்சம் ஒத்திசைக்கப்பட்டுள்ளது</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">நீங்கள் மெசேஜ்கள் அல்லது சாட்ஸை அழிக்கும்போது, அவை உங்கள் தொலைபேசி மற்றும் இணைக்கப்பட்ட சாதனங்களிலிருந்து அழிக்கப்படும்.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">சரி</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">கட்டண வரலாறு</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">உரை மற்றும் அனைத்து ஊடகக் காப்புப்பிரதி</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">பேமெண்ட் விவரங்கள்</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">காப்புப்பிரதி வகை</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">செலுத்திய தேதி</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">பகிர்</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">சிக்னல் காப்புப்பிரதிகள்</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">கட்டண வரலாறு</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">காப்புப்பிரதி விவரங்கள்</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">காப்புப்பிரதி அளவு</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">காப்புப்பிரதி கால இடைவெளி</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">செல்லுலாரைப் பயன்படுத்தி காப்புப்பிரதி எடுத்தல்</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">அணைத்துவிட்டு, காப்புப்பிரதியை அழித்தல்</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">காப்புப்பிரதி அழிக்கப்பட்டு, அணைக்கப்பட்டது.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">காப்புப்பிரதி வகை மற்றும் சந்தா ரத்து செய்யப்பட்டன</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">சந்தா ரத்துசெய்யப்பட்டது</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">பதிவிறக்கம் முடிக்கப்பட்டது</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">காப்புப்பிரதி வகை</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">காப்புப்பிரதிகள் முடிக்கப்பட்டுள்ளன</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/மாதம்</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">காப்புப்பிரதிகளை இயக்கு</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">கடைசி காப்புப்பிரதி</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s %2$s மணிக்கு</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">ஒருபோதுமில்லை</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">இப்பொழது பாதுகாப்பிற்காக சேமித்து வை காப்புப்பதிவு பயனர் தரவு</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">அணைத்துவிட்டு, காப்புப்பிரதிகளை அழிக்கவா?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">உங்களிடம் மீண்டும் கட்டணம் வசூலிக்கப்படாது. உங்கள் காப்புப்பிரதி அழிக்கப்படும் மற்றும் புதிய காப்புப்பிரதிகள் உருவாக்கப்படாது.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">ஆஃப் செய்துவிட்டு நீக்கவும்</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">காப்புப்பிரதியை அழிக்கிறது…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">காப்புப்பிரதி அழிக்கப்பட்டது</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"தட்டுவதன் மூலம் இப்போதே காப்புப் பிரதி எடுத்தல்"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">தினமும்</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">வாராந்திரமாக</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">மாதாந்திரமாக</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">கைமுறையாகக் காப்புப்பிரதி எடுத்தல்</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">உங்கள் சாதனத்தின் பின், கடவுச்சொல் அல்லது வடிவத்தை உள்ளிடவும்.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">அடுத்து</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">பேக்கப் வகையை மாற்று</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">சந்தாவை ரத்துசெய்யவும்</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">ரத்துசெய்வதை உறுதிசெய்</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">உங்களிடம் மீண்டும் கட்டணம் விதிக்கப்படாது. உங்கள் பில்லிங் சுழற்சியின் முடிவில் பேக்கப்கள் முடக்கப்படும். அந்தத் தேதிக்குப் பிறகு நீங்கள் தற்போது பேக்கப் எடுக்கும் மீடியாவைப் பதிவிறக்க 30 நாட்கள் அவகாசம் கிடைக்கும்.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">இப்போதே உறுதிசெய்து பதிவிறக்கு</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">பின்னர் உறுதிசெய்து பதிவிறக்கு</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">சந்தாவைத் தொடர்க</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index efe61a0797..943939a853 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal నవీకరిస్తోంది …</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly నవీకరిస్తోంది …</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">మీరింకా సంకేతపదమును సెట్ చేయలేదు!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">సంకేతపదమును ఆపివేయాలా?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">ఇది శాశ్వతంగా Signal మరియు సందేశ ప్రకటనలను అన్లాక్ చేస్తుంది</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">ఇది శాశ్వతంగా Molly మరియు సందేశ ప్రకటనలను అన్లాక్ చేస్తుంది</string>
     <string name="ApplicationPreferencesActivity_disable">అచేతనించు</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">సర్వర్ కి కలిపినపుడు లోపం!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">రిజిస్ట్రేషన్ లాక్ కోసం పిన్లు అవసరం. పిన్‌లను నిలిపివేయడానికి, దయచేసి మొదట రిజిస్ట్రేషన్ లాక్‌ని నిలిపివేయండి.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">పత్రం</string>
     <string name="AttachmentKeyboard_contact">పరిచయం</string>
     <string name="AttachmentKeyboard_location">స్థానం</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">మీ ఫోటోలు, వీడియోలను చూపడానికి Signal కు అనుమతి అవసరం</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">మీ ఫోటోలు, వీడియోలను చూపడానికి Molly కు అనుమతి అవసరం</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">ప్రాప్యతను అనుమతించు</string>
     <string name="AttachmentKeyboard_payment">చెల్లింపులు</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">మీడియా ఎంచుకోవడానికి అనువర్తనం దొరకదు.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">చిత్రాలు , వీడియోలు లేదా ఆడియోను అటాచ్ చేయడానికి Signal కు నిల్వ అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తనం సెట్టింగ్ల మెనుకు కొనసాగండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"నిల్వ\" ను ప్రారంభించండి.</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">సంప్రదింపు సమాచారాన్ని అటాచ్ చేయడానికి Signal కాంటాక్ట్స్ అనుమతి అవసరం, కానీ అది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తన సెట్టింగ్ల మెనుకి కొనసాగండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"పరిచయాలు\" ప్రారంభించండి.</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">ఒక స్థానాన్ని అటాచ్ చేయడానికి Signalకి నగర అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తనం సెట్టింగ్ల మెనుకి కొనసాగండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"స్థానం\" ని ప్రారంభించండి.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">చిత్రాలు , వీడియోలు లేదా ఆడియోను అటాచ్ చేయడానికి Molly కు నిల్వ అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తనం సెట్టింగ్ల మెనుకు కొనసాగండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"నిల్వ\" ను ప్రారంభించండి.</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">సంప్రదింపు సమాచారాన్ని అటాచ్ చేయడానికి Molly కాంటాక్ట్స్ అనుమతి అవసరం, కానీ అది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తన సెట్టింగ్ల మెనుకి కొనసాగండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"పరిచయాలు\" ప్రారంభించండి.</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">ఒక స్థానాన్ని అటాచ్ చేయడానికి Mollyకి నగర అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తనం సెట్టింగ్ల మెనుకి కొనసాగండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"స్థానం\" ని ప్రారంభించండి.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">మీ ప్రదేశంకు యాక్సెస్‌ను అనుమతించండి</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">మీ ప్రదేశాన్ని పంపడానికి:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">మీ ప్రదేశం పంపడానికి Signal యాక్సెస్‌ను అనుమతించండి.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">మీ ప్రదేశం పంపడానికి Molly యాక్సెస్‌ను అనుమతించండి.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">మీ ప్రదేశం పంపడానికి Signal కు ప్రదేశం యాక్సెస్ అవసరం.</string>
+    <string name="AttachmentManager_signal_needs_location_access">మీ ప్రదేశం పంపడానికి Molly కు ప్రదేశం యాక్సెస్ అవసరం.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">నిల్వకు యాక్సెస్‌ను అనుమతించండి</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">ఫోటోలు, వీడియోలను చూపడానికి:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">మీ ఫోటోలు, వీడియోలను చూపడానికి Signal కు నిల్వ యాక్సెస్ అవసరం.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">మీ ఫోటోలు, వీడియోలను చూపడానికి Molly కు నిల్వ యాక్సెస్ అవసరం.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s చెల్లింపులను యాక్టివేట్ చేయలేదు </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">కెమెరాను మార్చండి</string>
     <string name="CameraXFragment_open_gallery_description">చిత్రశాల ను తెరువు</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">ప్రాప్యతను అనుమతించు</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">మీ కెమెరా మరియు మైక్రోఫోన్‌కు యాక్సెస్‌ను అనుమతించండి</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">మీ కెమెరాకు యాక్సెస్‌ను అనుమతించండి</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">మీ మైక్రోఫోన్‌కు యాక్సెస్‌ను అనుమతించండి</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">ఫోటోలను క్యాప్చర్ చేయడానికి, కెమెరాకు Signal యాక్సెస్‌ను అనుమతించండి.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">చిత్రాలు మరియు వీడియోలను సంగ్రహించడానికి, కెమెరాకి Signal ప్రాప్తిని అనుమతించండి.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">ఫోటోలు మరియు వీడియోలను క్యాప్చర్ చేయడానికి, కెమెరా మరియు మైక్రోఫోన్‌కు Signal యాక్సెస్‌ను అనుమతించండి.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">ధ్వనితో వీడియోలను క్యాప్చర్ చేయడానికి, మీ మైక్రోఫోన్‌కు Signal యాక్సెస్‌ను అనుమతించండి.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">QR కోడ్‌ను స్కాన్ చేయడానికి, కెమెరాకు Signal యాక్సెస్‌ను అనుమతించండి.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">ఫోటోలను క్యాప్చర్ చేయడానికి Signal కు కెమెరా యాక్సెస్ అవసరం</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">QR కోడ్‌లను స్కాన్ చేయడానికి Signal కు కెమెరా యాక్సెస్ అవసరం</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">వీడియోను క్యాప్చర్ చేయడానికి Signal కు మైక్రోఫోన్ యాక్సెస్ అవసరం</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Signal లో ఫోటోలను క్యాప్చర్ చేయడానికి:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Signal లో ఫోటోలు మరియు వీడియోలను క్యాప్చర్ చేయడానికి:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">ధ్వనితో వీడియోలను క్యాప్చర్ చేయడానికి:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR కోడ్‌లను స్కాన్ చేయడానికి:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">ఇటీవలి పరిచయాలు</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Signal పరిచయాలు లేవు</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Signal పరిచయాలకు చిత్రాలను పంపడానికి మీరు కెమెరా బటన్‌ను మాత్రమే ఉపయోగించవచ్చు. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">మీరు వెతుకుతున్న వారిని కనుగొనలేదా?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Signal లో చేరడానికి పరిచయాన్ని ఆహ్వానించండి</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Molly లో చేరడానికి పరిచయాన్ని ఆహ్వానించండి</string>
     <string name="CameraContacts__menu_search">వెతకండి</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">వద్దు ధన్యవాదాలు</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Signal ను నవీకరించండి</string>
+    <string name="ClientDeprecatedActivity_update_signal">Molly ను నవీకరించండి</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">మీరు వాడుతున్న యాప్ పనిచేయదు. మెస్సేఅగ్రెస్ ఇంకా కాల్స్ చేయడానికి యాప్ ని అప్డేట్ చేయండి.</string>
     <string name="ClientDeprecatedActivity_update">నవీకరణ</string>
     <string name="ClientDeprecatedActivity_dont_update">నవీకరణ ఆపివేయుము</string>
     <string name="ClientDeprecatedActivity_warning">హెచ్చరిక</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">మీ Signal వెర్షన్ గడువు ముగిసింది. మీరు మీ సందేశ చరిత్రను చూడవచ్చు, కానీ మీరు అప్‌డేట్ చేసే వరకు మీరు సందేశాలను పంపలేరు లేదా అందుకోలేరు.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">మీ Molly వెర్షన్ గడువు ముగిసింది. మీరు మీ సందేశ చరిత్రను చూడవచ్చు, కానీ మీరు అప్‌డేట్ చేసే వరకు మీరు సందేశాలను పంపలేరు లేదా అందుకోలేరు.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">వెబ్ బ్రౌజర్ కనుగొనబడలేదు.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">%1$sకి సందేశం పంపు</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly స్వర కాల్ %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly వీడియో కాల్ %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal మెసేజ్</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">సందేశం పంపాల</string>
-    <string name="ConversationActivity_lets_switch_to_signal">మనం Signal %1$sకు మారుదాం</string>
+    <string name="ConversationActivity_lets_switch_to_signal">మనం Molly %1$sకు మారుదాం</string>
     <string name="ConversationActivity_specify_recipient">దయచేసి ఒక పరిచయం ఎంచుకోండి</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">జోడింపు మీరు పంపే సందేశం రకం పరిమాణ పరిమితి మించిపోయింది.</string>
     <string name="ConversationActivity_unable_to_record_audio">ఆడియో రికార్డ్ చేయడం సాధ్యపడలేదు!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">ఆడియో సందేశాలను పంపడానికి:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">స్వర సందేశాలను పంపడానికి, మీ మైక్రోఫోన్‌కు Signal యాక్సెస్‌ను అనుమతించండి.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">స్వర సందేశాలను పంపడానికి, మీ మైక్రోఫోన్‌కు Molly యాక్సెస్‌ను అనుమతించండి.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">స్వర సందేశాన్ని రికార్డ్ చేయడానికి Signal కు మైక్రోఫోన్ యాక్సెస్ అవసరం.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">ఆడియో సందేశాలను పంపడానికి Signalకు మైక్రోఫోన్ అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తనం సెట్టింగ్లకు కొనసాగించండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"మైక్రోఫోన్\" ని ప్రారంభించండి.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">స్వర సందేశాన్ని రికార్డ్ చేయడానికి Molly కు మైక్రోఫోన్ యాక్సెస్ అవసరం.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">ఆడియో సందేశాలను పంపడానికి Mollyకు మైక్రోఫోన్ అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తనం సెట్టింగ్లకు కొనసాగించండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"మైక్రోఫోన్\" ని ప్రారంభించండి.</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal కాల్ చేయడానికి మైక్రోఫోన్ మరియు కెమెరా అనుమతులు అవసరం %1$s,కానీ అవి శాశ్వతంగా తిరస్కరించబడ్డాయి. దయచేసి అనువర్తనం సెట్టింగ్లకు కొనసాగించండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"మైక్రోఫోన్\" మరియు \"కెమెరా\" ని ప్రారంభించండి.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">చిత్రాలు మరియు వీడియోలను సంగ్రహించడానికి, కెమెరాకి Signal ప్రాప్తిని అనుమతించండి.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">చిత్రాలను లేదా వీడియోను తీసుకోవడానికి Signal కు కెమెరా అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తనం సెట్టింగ్లకు కొనసాగించండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"కెమెరా\" ని ప్రారంభించండి.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">చిత్రాలను లేదా వీడియోను తీసుకోవడానికి కెమెరా అనుమతులను Signal కి అవసరం</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly కాల్ చేయడానికి మైక్రోఫోన్ మరియు కెమెరా అనుమతులు అవసరం %1$s,కానీ అవి శాశ్వతంగా తిరస్కరించబడ్డాయి. దయచేసి అనువర్తనం సెట్టింగ్లకు కొనసాగించండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"మైక్రోఫోన్\" మరియు \"కెమెరా\" ని ప్రారంభించండి.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">చిత్రాలు మరియు వీడియోలను సంగ్రహించడానికి, కెమెరాకి Molly ప్రాప్తిని అనుమతించండి.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">చిత్రాలను లేదా వీడియోను తీసుకోవడానికి Molly కు కెమెరా అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తనం సెట్టింగ్లకు కొనసాగించండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"కెమెరా\" ని ప్రారంభించండి.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">చిత్రాలను లేదా వీడియోను తీసుకోవడానికి కెమెరా అనుమతులను Molly కి అవసరం</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">ధ్వనితో వీడియోలను సంగ్రహించడానికి మైక్రోఫోన్ అనుమతిని ప్రారంభించండి.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">వీడియోలను రికార్డ్ చేయడానికి Signal కు మైక్రోఫోన్ అనుమతులు అవసరం, కానీ అవి తిరస్కరించబడ్డాయి. దయచేసి అనువర్తన సెట్టింగ్‌లకు కొనసాగండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"మైక్రోఫోన్\" మరియు \"కెమెరా\" ని ప్రారంభించండి.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">వీడియోలను రికార్డ్ చేయడానికి Signal కు మైక్రోఫోన్ అనుమతులు అవసరం.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">వీడియోలను రికార్డ్ చేయడానికి Molly కు మైక్రోఫోన్ అనుమతులు అవసరం, కానీ అవి తిరస్కరించబడ్డాయి. దయచేసి అనువర్తన సెట్టింగ్‌లకు కొనసాగండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"మైక్రోఫోన్\" మరియు \"కెమెరా\" ని ప్రారంభించండి.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">వీడియోలను రికార్డ్ చేయడానికి Molly కు మైక్రోఫోన్ అనుమతులు అవసరం.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">కాదు</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">కాల్‌ను ప్రారంభించడానికి:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">కాల్‌ను ప్రారంభించడానికి, మీ మైక్రోఫోన్‌కు Signal యాక్సెస్‌ను అనుమతించండి.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">కాల్‌ను ప్రారంభించడానికి, మీ మైక్రోఫోన్‌కు Molly యాక్సెస్‌ను అనుమతించండి.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">కాల్‌ను ప్రారంభించడానికి Signal కు మైక్రోఫోన్ యాక్సెస్ అవసరం.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">కాల్‌ను ప్రారంభించడానికి Molly కు మైక్రోఫోన్ యాక్సెస్ అవసరం.</string>
 
 
     <string name="ConversationActivity_join">చేరండి</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Signal లో SMS సందేశాలు పంపేందుకు ఇక ఏమాత్రం మద్దతు ఇవ్వబడదు. ఇక్కడ సంభాషణను ఉంచడానికి %1$s ను Signal కు ఆహ్వానించండి.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">ఈ వ్యక్తి Signal ను ఏమాత్రం ఉపయోగించడం లేదు. ఇక్కడ సంభాషణను ఉంచడానికి వారిని Signal కు ఆహ్వానించండి.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">ఈ వ్యక్తి Molly ను ఏమాత్రం ఉపయోగించడం లేదు. ఇక్కడ సంభాషణను ఉంచడానికి వారిని Molly కు ఆహ్వానించండి.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Signal కు ఆహ్వానించండి</string>
+    <string name="ConversationActivity__invite_to_signal">Molly కు ఆహ్వానించండి</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">త్వరలో మీకు మళ్లీ గుర్తు చేయబడుతుంది.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">ప్రతిఒక్కరికీ తొలగించండి</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">ఈ పరికరంపై తొలగించండి</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">తొలగించండి</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">ప్రతిచోటా తొలగించండి</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">ఒకవేళ వారు Signal యొక్క ఇటీవలి వెర్షన్‌లో ఉంటే చాట్‌లోని ప్రతి ఒక్కరికీ ఈ సందేశం తొలగించబడుతుంది. మీరు సందేశాన్ని తొలగించినట్లుగా వారు చూడగలుగుతారు.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">బ్లాక్ చేయబడింది</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Signal ను నవీకరించండి</string>
+    <string name="ConversationFragment__update_build">Molly ను నవీకరించండి</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Signal ను మళ్లీ నమోదు చేసుకోవడం</string>
+    <string name="ConversationFragment__reregister_signal">Molly ను మళ్లీ నమోదు చేసుకోవడం</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">వెనక్కు నావిగేట్ చేయండి.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signal ను తెరవండి</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Molly ను తెరవండి</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">ఇకపై ధృవీకరించబడదు</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">ఇది ఎంపిక చేసిన చాట్‌ను శాశ్వతంగా తొలగిస్తుంది.</item>
         <item quantity="other">ఇది ఎంపిక చేసిన అన్ని %1$d చాట్‌లను శాశ్వతంగా తొలగిస్తుంది.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">ఇది ఎంపిక చేసిన చాట్‌ను మీ పరికరాలన్నింటి నుండి శాశ్వతంగా తొలగిస్తుంది.</item>
+        <item quantity="other">ఇది ఎంపిక చేసిన అన్ని %1$d చాట్‌లను మీ పరికరాలన్నింటి నుండి శాశ్వతంగా తొలగిస్తుంది.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">తొలగిపోతున్నాయ్</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">ఎంపిక చేసిన చాట్‌ను తొలగిస్తోంది…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">నంబర్ ద్వారా నన్ను ఎవరు కనుగొనగలరు?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">మీ ఫోన్ నంబర్‌ను కలిగి ఉన్న ఎవరైనా మీరు Signal లో ఉన్నట్లు చూస్తారు మరియు మీతో చాట్‌లను ప్రారంభించగలరు.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">మీ ఫోన్ నంబర్‌ను కలిగి ఉన్న ఎవరైనా మీరు Molly లో ఉన్నట్లు చూస్తారు మరియు మీతో చాట్‌లను ప్రారంభించగలరు.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">మీరు వారికి సందేశం పంపితే లేదా వారితో ఇప్పటికే చాట్ చేస్తే తప్ప మీరు Signal లో ఉన్నారని ఎవరూ చూడలేరు.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">మీరు వారికి సందేశం పంపితే లేదా వారితో ఇప్పటికే చాట్ చేస్తే తప్ప మీరు Molly లో ఉన్నారని ఎవరూ చూడలేరు.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">ప్రత్యామ్నాయ నుండి పునరుద్ధరించాలా?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">మీ ప్రత్యామ్నాయము పాస్‌ఫ్రేజ్‌ని పరీక్షించండి మరియు అది సరిపోతుందో లేదో ధృవీకరించండి</string>
     <string name="BackupsPreferenceFragment__turn_on">ఆరంభించండి</string>
     <string name="BackupsPreferenceFragment__turn_off">తీసివేయు</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"ప్రత్యామ్నాయము‌ను పునరుద్ధరించడానికి, Signal యొక్క క్రొత్త కాపీని ఇన్‌స్టాల్ చేయండి. అనువర్తనాన్ని తెరిచి, \"ప్రత్యామ్నాయము పునరుద్ధరించు\" నొక్కండి, ఆపై బ్యాకప్ ఫైల్‌ను కనుగొనండి. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"ప్రత్యామ్నాయము‌ను పునరుద్ధరించడానికి, Molly యొక్క క్రొత్త కాపీని ఇన్‌స్టాల్ చేయండి. అనువర్తనాన్ని తెరిచి, \"ప్రత్యామ్నాయము పునరుద్ధరించు\" నొక్కండి, ఆపై బ్యాకప్ ఫైల్‌ను కనుగొనండి. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">ఇంకా నేర్చుకో</string>
     <string name="BackupsPreferenceFragment__in_progress">పురోగతిలో ఉన్నది…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">ఇప్పటి వరకు %1$d…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% ఇప్పటి వరకు…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">ప్రత్యామ్నాయను సృష్టించడానికి Signal బాహ్య నిల్వ అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తనం సెట్టింగ్లకు కొనసాగించండి, \"అనుమతులు\" ఎంచుకుని, \"నిల్వ\" ను ప్రారంభించండి.</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">ప్రత్యామ్నాయను సృష్టించడానికి Molly బాహ్య నిల్వ అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తనం సెట్టింగ్లకు కొనసాగించండి, \"అనుమతులు\" ఎంచుకుని, \"నిల్వ\" ను ప్రారంభించండి.</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">బ్యాకప్ సమయాన్ని సెట్ చేయండి</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">చాట్ సెషన్ రిఫ్రెష్ చేయబడింది</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal ఎండ్-టు-ఎండ్ ఎన్‌క్రిప్షన్‌ను ఉపయోగిస్తుంది మరియు ఇది కొన్నిసార్లు మీ చాట్ సెషన్‌ను రిఫ్రెష్ చేయాల్సి ఉంటుంది. ఇది మీ చాట్ భద్రతను ప్రభావితం చేయదు, కానీ మీరు ఈ పరిచయం నుండి సందేశాన్ని తప్పిపోయి ఉండవచ్చు మరియు దానిని తిరిగి పంపమని మీరు వారిని అడగవచ్చు.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly ఎండ్-టు-ఎండ్ ఎన్‌క్రిప్షన్‌ను ఉపయోగిస్తుంది మరియు ఇది కొన్నిసార్లు మీ చాట్ సెషన్‌ను రిఫ్రెష్ చేయాల్సి ఉంటుంది. ఇది మీ చాట్ భద్రతను ప్రభావితం చేయదు, కానీ మీరు ఈ పరిచయం నుండి సందేశాన్ని తప్పిపోయి ఉండవచ్చు మరియు దానిని తిరిగి పంపమని మీరు వారిని అడగవచ్చు.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">డెస్క్‌టాప్ లేదా iPad లో Signal ఉపయోగించండి. మీ సందేశాలు మీ లింక్ చేయబడిన పరికరాలకు సమకాలీకరించబడతాయి.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">కొత్త పరికరాన్ని లింక్ చేయండి</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s సందేశాలు మరియు చాట్ సమాచారం అన్ని పరికరాలలో ఎండ్-టు-ఎండ్ గుప్తీకరణ ద్వారా రక్షించబడుతుంది</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">డెస్క్‌టాప్ లేదా iPad లో Signal</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">లింక్ చేసిన పరికరాలలో పంపే సందేశాలు అన్ని ప్రైవేట్‌గా ఉంటాయి</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">మీ మొబైల్ ఫోన్ లింక్ అయిన తర్వాత Molly సందేశాలు Molly తో సింక్రనైజ్ చేయబడతాయి. మీ మునుపటి సందేశాల చరిత్ర కనిపించదు.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">మీ ఇతర పరికరంలో, Molly ను ఇన్‌స్టాల్ చేయడానికి %1$s సందర్శించండి</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">నా లింక్ చేసిన పరికరాలు</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">లింక్ తొలగించు</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s అన్‌లింక్ అయ్యింది</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">పరికరం లింక్ అవుతోంది…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">పరికరం ఆమోదించబడింది</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">లోడ్…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">లింక్ చేసిన పరికరాలు ఏవీ లేవు</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">పరికరాన్ని లింక్ చేయడానికి అన్‌లాక్ చేయండి</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">లింక్ చేయడానికి పరికరంపై ప్రదర్శించబడిన QR కోడ్‌ను స్కాన్ చేయండి.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">QR కోడ్‌ను స్కాన్ చేయండి</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">మీరు లింక్ చేయదలిచిన పరికరంపై ప్రదర్శించబడిన QR కోడ్‌ను స్కాన్ చేయడానికి ఈ పరికరాన్ని ఉపయోగించండి</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">సరే</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">ఈ పరికరం మీ సమూహాలను మరియు పరిచయాలను చూడగలదు, మీ మాటామంతీను ప్రవేశ సౌలభ్యం చేయగలదు మరియు మీ పేరు మీద సందేశాలను పంపగలదు.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">మీ ఇతర పరికరంలో లింక్ చేయడం పూర్తిచేయండి</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">మీ ఇతర పరికరంలో Molly ను లింక్ చేయడం పూర్తిచేయండి.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">పరికరాన్ని లింక్ చేయడం విఫలమైంది</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">ఈ QR కోడ్ చెల్లదు. దయచేసి మీరు లింక్ చేయదలిచిన పరికరంలో ప్రదర్శించబడే QR కోడ్‌ను స్కాన్ చేస్తున్నారని నిర్ధారించుకోండి.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">మళ్ళీ ప్రయత్నించు</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">తొలగించరాదనుకుంటే \'%1$s\'?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">తప్పిపోయిన ప్లే సర్వీసులు కోసం ఆప్టిమైజ్</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">ఈ వస్తువు ఆట సేవలను సహకరించదు. క్రియారహితంగా ఉన్నప్పుడు సందేశాలను పొందటం నుండి Signal నిరోధించే వ్యవస్థ బ్యాటరీ అనుకూలతలు డిసేబుల్ నొక్కండి.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">ఈ వస్తువు ఆట సేవలను సహకరించదు. క్రియారహితంగా ఉన్నప్పుడు సందేశాలను పొందటం నుండి Molly నిరోధించే వ్యవస్థ బ్యాటరీ అనుకూలతలు డిసేబుల్ నొక్కండి.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Signal యొక్క ఈ వెర్షన్ గడువు ముగిసింది. సందేశాలను పంపడానికి మరియు స్వీకరించడానికి ఇప్పుడే నవీకరించండి.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Molly యొక్క ఈ వెర్షన్ గడువు ముగిసింది. సందేశాలను పంపడానికి మరియు స్వీకరించడానికి ఇప్పుడే నవీకరించండి.</string>
     <string name="ExpiredBuildReminder_update_now">నవీకరణ చేయండి ఇప్పుడు</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">వీక్షణ</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Signal లో శాశ్వత సమాచార వైఫల్యం!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">గూగ్లె ప్లే సదుపాయలతొ Signal నమోదు కాలెదు. Signal సందెశాలు మరియు కాల్స్ నిలిపివేయబడ్డాయి. దయచేసి ఆధునిక అమరికలు లో మళ్ళి నమోదు చెసుకొనగలరు.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Molly లో శాశ్వత సమాచార వైఫల్యం!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">గూగ్లె ప్లే సదుపాయలతొ Molly నమోదు కాలెదు. Molly సందెశాలు మరియు కాల్స్ నిలిపివేయబడ్డాయి. దయచేసి ఆధునిక అమరికలు లో మళ్ళి నమోదు చెసుకొనగలరు.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">సమస్యను గుర్తించడానికి మరియు పరిష్కరించడానికి డీబగ్ లాగ్‌లు మాకు సహాయపడతాయి, మరియు గుర్తించే సమాచారం కలిగి ఉండవు.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal సమస్యను ఎదుర్కొంది. డీబగ్ లాగ్‌ను సమర్పించేదా?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly సమస్యను ఎదుర్కొంది. డీబగ్ లాగ్‌ను సమర్పించేదా?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">బ్యాటరీ ఆప్టిమైజేషన్‌ల కారణంగా నోటిఫికేషన్‌లు ఆలస్యం కావచ్చు</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">సందేశం నోటిఫికేషన్‌లు ఆలస్యం కాకుండా నిర్ధారించడానికి మీరు Signal కోసం బ్యాటరీ ఆప్టిమైజేషన్‌లను నిలిపివేయవచ్చు.</string>
+    <string name="PromptBatterySaverBottomSheet__message">సందేశం నోటిఫికేషన్‌లు ఆలస్యం కాకుండా నిర్ధారించడానికి మీరు Molly కోసం బ్యాటరీ ఆప్టిమైజేషన్‌లను నిలిపివేయవచ్చు.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">బ్యాటరీ ఆప్టిమైజేషన్‌ల కారణంగా నోటిఫికేషన్‌లు ఆలస్యం కావచ్చు</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">సందేశం నోటిఫికేషన్‌లు ఆలస్యం కాకుండా ఉండటానికి Molly కోసం బ్యాటరీ ఆప్టిమైజేషన్‌లను నిలిపివేయండి. పరికర-నిర్దిష్ట సూచనలను చూడటానికి \"కొనసాగించండి\" ని తట్టండి.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">వద్దు ధన్యవాదాలు</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">కొనసాగండి</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">కొనసాగండి</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">రద్దుచేసే</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">వద్దు ధన్యవాదాలు</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">ఆమోదించవలసిన సమూహ ఆహ్వానములు</string>
+    <string name="PendingMembersActivity_pending_group_invites">అభ్యర్థనలు &amp; ఆహ్వానాలు</string>
     <string name="PendingMembersActivity_requests">అభ్యర్థనలు</string>
     <string name="PendingMembersActivity_invites">ఆహ్వానాలు</string>
     <string name="PendingMembersActivity_people_you_invited">మీరు ఆహ్వానించినవారు</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">రద్దు</string>
     <string name="InviteActivity_sending">పంపుతోంది …</string>
     <string name="InviteActivity_invitations_sent">ఆహ్వనం పంపబడింది!</string>
-    <string name="InviteActivity_invite_to_signal">Signal కు ఆహ్వానించండి</string>
+    <string name="InviteActivity_invite_to_signal">Molly కు ఆహ్వానించండి</string>
     <string name="InviteActivity_send_sms">SMS పంపండి (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">1%1$d SMS ఆహ్వానాలను పంపాలా?</item>
         <item quantity="other">%1$d SMS ఆహ్వానాలను పంపాలా?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">మనం Signal కు మారుదాం: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">మనం Molly కు మారుదాం: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">మీరు పంచుకొనడానికి మీ దగ్గర వేరే యాప్స్ లేనట్టు కనబడుతుంది.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">మీ సందేశం</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">నేపధ్యం కనెక్షన్ ప్రారంభించ</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">రిప్లైలు</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">స్థాపించబడుతున్న Signal కాల్</string>
+    <string name="NotificationBarManager__establishing_signal_call">స్థాపించబడుతున్న Molly కాల్</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signal కాల్ సర్వీస్‌ని ప్రారంభిస్తోంది</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal కాల్ సర్వీస్‌ని ఆపివేస్తోంది</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Molly కాల్ సర్వీస్‌ని ప్రారంభిస్తోంది</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly కాల్ సర్వీస్‌ని ఆపివేస్తోంది</string>
     <string name="NotificationBarManager__cancel_call">కాల్ రద్దుచేయండి</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">మీరు చెల్లింపులను యాక్టివేట్ చేశారు</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s ఇప్పుడు చెల్లింపులను అంగీకరించవచ్చు.</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">చెల్లింపు వివరాలు అందుబాటులో లేవు</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">మరిన్ని కోసం తాకండి</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">చెల్లింపు వివరాలు అందుబాటులో లేవు</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">ఈ చెల్లింపు చరిత్ర లేని సోర్స్ నుండి మీ సందేశాలు పునరుద్ధరించబడినందున ఈ చెల్లింపు వివరాలు అందుబాటులో లేవు. ఇది మీ వాలెట్ బ్యాలెన్స్‌ను లేదా గత చెల్లింపుల స్థితిని ప్రభావితం చేయదు.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">త్వరలో Signal నుంచి SMS సందేశాలను మీరు ఇక ఏమాత్రం పంపలేరు. ఇక్కడ సంభాషణను ఉంచడానికి %1$s ను Signal కు ఆహ్వానించండి.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Signal లో SMS సందేశాలను మీరు ఇక ఏమాత్రం పంపలేరు. ఇక్కడ సంభాషణను ఉంచడానికి %1$s ను Signal కు ఆహ్వానించండి.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Molly లో SMS సందేశాలను మీరు ఇక ఏమాత్రం పంపలేరు. ఇక్కడ సంభాషణను ఉంచడానికి %1$s ను Molly కు ఆహ్వానించండి.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">చెల్లింపు: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">చెల్లింపు</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">స్పామ్‌గా నివేదించబడింది</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">ఒక Signal పరికరం లింక్ చేయాలా?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">మీరు ఒక 3 వ పార్టీ స్కానర్ను ఉపయోగించి ఒక Signal పరికరం లింక్ ప్రయత్నిస్తున్నట్లుగా కనిపిస్తోంది. మీ రక్షణ కోసం, Signal లోపల నుండి మళ్ళీ కోడ్ స్కాన్ చెయ్యండి.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">ఒక QR కోడ్ను స్కాన్ చేయడానికి Signalకు కెమెరా అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తనం సెట్టింగ్లకు కొనసాగించండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"కెమెరా\" ని ప్రారంభించండి.</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">ఒక QR కోడ్ను స్కాన్ చేయడానికి Mollyకు కెమెరా అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తనం సెట్టింగ్లకు కొనసాగించండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"కెమెరా\" ని ప్రారంభించండి.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">కెమెరా అనుమతి లేకుండా QR కోడ్ను స్కాన్ చేయడం సాధ్యపడలేదు</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">సంకేతపదమును ప్రవేశపెట్టుము</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal చిహ్నం</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly చిహ్నం</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">సంకేతపదమును సమర్పించండి</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">చెల్లని సంకేతపదము!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">అన్లాక్ Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - లాక్ స్క్రీన్</string>
+    <string name="PassphrasePromptActivity_unlock_signal">అన్లాక్ Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - లాక్ స్క్రీన్</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">పటం</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">సందేశాన్ని కొనసాగించడానికి ధృవీకరించండి</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Signal పై స్పామ్‌ను నిరోధించడంలో సహాయపడటానికి, దయచేసి ధృవీకరణను పూర్తి చేయండి.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Molly పై స్పామ్‌ను నిరోధించడంలో సహాయపడటానికి, దయచేసి ధృవీకరణను పూర్తి చేయండి.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">ధృవీకరించిన తర్వాత, మీరు సందేశాన్ని కొనసాగించవచ్చు. పాజ్ చేయబడిన ఏదైనా సందేశాలు స్వయంచాలకంగా పంపబడతాయి.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">నా స్టోరీ</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal కాల్</string>
+    <string name="Recipient_signal_call">Molly కాల్</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">బ్లాక్ చేయండి</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">మోగుతున్నది…</string>
     <string name="RedPhone_busy">పనిలో ఉన్నారు</string>
     <string name="RedPhone_recipient_unavailable">గ్రహీత అందుబాటులోలేరు</string>
-    <string name="RedPhone_network_failed">నెట్వర్క్ విఫలమైంది</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">నెట్వర్క్ విఫలమైంది దయచేసి నెట్‌వర్క్ కనెక్షన్ తనిఖీ చేసి, మళ్ళీ ప్రయత్నించండి.</string>
     <string name="RedPhone_number_not_registered">నమోదు చేయని సంఖ్య!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">మీరు డయల్ సంఖ్య సురక్షిత గాత్రం మద్దతు లేదు!</string>
     <string name="RedPhone_got_it">అర్థమైంది</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">మీ వీడియోను ప్రారంభించడానికి ఇక్కడ నొక్కండి</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s కి కాల్ చేయడానికి, Signal కు మీ కెమెరాకు ప్రాప్యత అవసరం</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s కి కాల్ చేయడానికి, Molly కు మీ కెమెరాకు ప్రాప్యత అవసరం</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">కాలింగ్…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">తిరిగి కనెక్ట్ చేస్తోంది…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">కాల్ నుండి తొలగించబడ్డారు</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">కాల్ నుండి మిమ్మల్ని ఎవరో తొలగించారు.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">మీ కెమెరా మరియు మైక్రోఫోన్‌కు యాక్సెస్‌ను అనుమతించండి</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">మీ మైక్రోఫోన్‌కు యాక్సెస్‌ను అనుమతించండి</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">మీ కెమెరాకు యాక్సెస్‌ను అనుమతించండి</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">కాల్‌ను ప్రారంభించడానికి లేదా చేరడానికి మీ కెమెరాకు మరియు మైక్రోఫోన్‌కు Molly యాక్సెస్‌ను అనుమతించండి.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">కాల్‌ను ప్రారంభించడానికి లేదా చేరడానికి మీ మైక్రోఫోన్‌కు Molly యాక్సెస్‌ను అనుమతించండి.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">మీ వీడియోను ఎనేబుల్ చేయడానికి, మీ కెమెరాకు Molly యాక్సెస్‌ను అనుమతించండి.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">కాల్‌ను ప్రారంభించడానికి లేదా చేరడానికి Molly కు మైక్రోఫోన్ అనుమతులు అవసరం.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">మీ వీడియోను ఎనేబుల్ చేయడానికి Molly కు కెమెరా యాక్సెస్ అవసరం</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">కాల్‌ను ప్రారంభించడానికి లేదా దానిలో చేరడానికి:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">మీ వీడియోను ఎనేబుల్ చేయడానికి:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal కాల్</string>
-    <string name="WebRtcCallView__signal_video_call">Signal వీడియో కాల్</string>
+    <string name="WebRtcCallView__signal_call">Molly కాల్</string>
+    <string name="WebRtcCallView__signal_video_call">Molly వీడియో కాల్</string>
     <string name="WebRtcCallView__start_call">కాల్ ప్రారంభించు</string>
     <string name="WebRtcCallView__join_call">కాల్‌లో చేరండి</string>
     <string name="WebRtcCallView__call_is_full">కాల్ నిండింది</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">మీ చేతిని దించేదా?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">చేయి దించండి</string>
+    <string name="CallOverflowPopupWindow__lower_hand">కిందకి దించండి</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">రద్దు చేయండి</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">మీరు మీ చేతిని ఎత్తారు</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">వీక్షణ</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s చేయి ఎత్తారు</item>
-        <item quantity="other">%1$s + %2$d చేయి ఎత్తారు</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s చేయి పైకెత్తారు</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d చేయి పైకెత్తారు</item>
+        <item quantity="other">%1$s +%2$d చేయి పైకెత్తారు</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s చేయి పైకెత్తారు</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d చేయి పైకెత్తారు</item>
+        <item quantity="other">%1$s +%2$d చేయి పైకెత్తారు</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">ఈ సంఖ్యను ధృవీకరించడానికి మీకు కాల్ వస్తుంది.</string>
     <string name="RegistrationActivity_edit_number">సంఖ్య మార్చు</string>
     <string name="RegistrationActivity_missing_google_play_services">గూగుల్ ఫ్లే సేవలు అందుబాటులో లేవు.</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">ఈ పరికరంలో Google Play సేవలు లేవు. మీరు ఇప్పటికీ Signal ఉపయోగించవచ్చు, కానీ ఈ కాన్ఫిగరేషన్ తగ్గిన విశ్వసనీయత లేదా పనితీరును కలిగించవచ్చు. \\ N \\ n మీరు అధునాతన వినియోగదారు కానట్లయితే, ఒక యాడ్మార్కెట్ Android ROM ను అమలు చేయకపోయినా లేదా మీరు దీనిని తప్పుగా చూస్తున్నారని విశ్వసిస్తారు, దయచేసి support@signal.org</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">ఈ పరికరంలో Google Play సేవలు లేవు. మీరు ఇప్పటికీ Molly ఉపయోగించవచ్చు, కానీ ఈ కాన్ఫిగరేషన్ తగ్గిన విశ్వసనీయత లేదా పనితీరును కలిగించవచ్చు. \\ N \\ n మీరు అధునాతన వినియోగదారు కానట్లయితే, ఒక యాడ్మార్కెట్ Android ROM ను అమలు చేయకపోయినా లేదా మీరు దీనిని తప్పుగా చూస్తున్నారని విశ్వసిస్తారు, దయచేసి support@molly.im</string>
     <string name="RegistrationActivity_i_understand">నాకు అర్దం అయ్యినది</string>
     <string name="RegistrationActivity_play_services_error">ప్లే సేవల దోషం.</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">గూగల్ ేవలను నవీకరించుటకు లేదా తాత్కాలికంగా అందుబాటులో చేస్తున్నారు. మళ్ళి ప్రయత్నించండి.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">నాన్-స్టాండర్డ్ నెంబర్ ఫార్మెట్</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">మీరు నమోదు చేసిన నెంబరు (%1$s) నాన్-స్టాండర్డ్ ఫార్మెట్‌లో కనిపిస్తోంది.\n\n%2$s అని మీ అర్ధమా?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - ఫోన్ నెంబర్ ఫార్మెట్</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - ఫోన్ నెంబర్ ఫార్మెట్</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">కాల్ అభ్యర్ధించబడింది</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">నమోదు చేసుకోవడంలో సమస్య ఉన్నదా?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• మీ SMS లేదా కాల్‌ను అందుకోవడానికి మీ ఫోన్‌కు సెల్యూలర్ సిగ్నల్ ఉన్నట్లుగా ధృవీకరించుకోండి\n • నంబర్‌కు ఫోన్ కాల్‌ను మీరు అందుకోగలరని నిర్ధారించండి\n • మీ ఫోన్ నెంబర్‌ను మీరు సరిగ్గా ఎంటర్ చేసినట్లుగా తనిఖీ చేయండి.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">మరింత సమాచారం కొరకు, దయచేసి ఈ దిగువ సమస్య పరిష్కార దశలను అనుసరించండి లేదా మద్దతును సంప్రదించండి</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">మరింత సమాచారం కోసం, %1$s లేదా %2$s ను అనుసరించండి</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">ఈ సమస్య పరిష్కార దశలు</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">పరిచయాలకు జోడించు</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Signal కు ఆహ్వానించండి</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Molly కు ఆహ్వానించండి</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal సందేశం</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal కాల్</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">పరిచయాలకు జోడించు</string>
-    <string name="SharedContactView_invite_to_signal">Signal కు ఆహ్వానించండి</string>
+    <string name="SharedContactView_invite_to_signal">Molly కు ఆహ్వానించండి</string>
     <string name="SharedContactView_message">Signal సందేశం</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s %2$s కు చెందినది</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal నవీకరణ</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal యొక్క కొత్త వెర్షన్ అందుబాటులో ఉంది. అప్‌డేట్ చేయడానికి తట్టండి.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">అప్‌డేట్ చేసేందుకు Signal విఫలమైంది</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly నవీకరణ</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly యొక్క కొత్త వెర్షన్ అందుబాటులో ఉంది. అప్‌డేట్ చేయడానికి తట్టండి.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">అప్‌డేట్ చేసేందుకు Molly విఫలమైంది</string>
     <string name="ApkUpdateNotifications_failed_general_body">మేము తర్వాత మళ్ళీ ప్రయత్నిస్తాము.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal విజయవంతంగా అప్‌డేట్ చేయబడింది</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly విజయవంతంగా అప్‌డేట్ చేయబడింది</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">మీరు ఆటోమేటిక్‌గా %1$s వెర్షన్‌కు అప్‌డేట్ చేయబడ్డారు.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">మన Signal భద్రత సంఖ్య:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">మీరు పంచుకొనడానికి మీ దగ్గర వేరే యాప్స్ లేనట్టు కనబడుతుంది.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">ఏ భద్రతకు సంఖ్య పోల్చడానికి క్లిప్బోర్డ్కు లొ కనుగొనబడింది</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">ఒక QR కోడ్ను స్కాన్ చేయడానికి Signalకు కెమెరా అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తనం సెట్టింగ్లకు కొనసాగించండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"కెమెరా\" ని ప్రారంభించండి.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">ఒక QR కోడ్ను స్కాన్ చేయడానికి Mollyకు కెమెరా అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తనం సెట్టింగ్లకు కొనసాగించండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"కెమెరా\" ని ప్రారంభించండి.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">కెమెరా అనుమతి లేకుండా QR కోడ్ను స్కాన్ చేయడం సాధ్యపడలేదు</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">%1$s యొక్క భద్రతా నంబర్‌ను చూడటానికి మీరు మొదట సందేశాలను మార్పిడి చేసుకోవాలి.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">తెరవడానికి తాకు</string>
-    <string name="KeyCachingService_passphrase_cached">Signal తాళం తీయబడినది</string>
-    <string name="KeyCachingService_lock">లాక్ Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly తాళం తీయబడినది</string>
+    <string name="KeyCachingService_lock">లాక్ Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">మీరు</string>
     <string name="MediaPreviewActivity_unssuported_media_type">మద్ధతు లేనటువంటి ప్రసార మాధ్యమం</string>
     <string name="MediaPreviewActivity_draft">చిత్తు పత్రం</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">బాహ్య నిల్వకు భద్రపరచడానికి Signal కు నిల్వ అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తనం సెట్టింగ్లకు కొనసాగించండి, \"అనుమతులు\" ఎంచుకోండి, ఆపై \"నిల్వ\" ను ప్రారంభించండి.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">బాహ్య నిల్వకు భద్రపరచడానికి Molly కు నిల్వ అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తనం సెట్టింగ్లకు కొనసాగించండి, \"అనుమతులు\" ఎంచుకోండి, ఆపై \"నిల్వ\" ను ప్రారంభించండి.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">అనుమతులు లేకుండా బాహ్య నిల్వకి భద్రపరచడం సాధ్యపడలేదు</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">సందేశాన్ని తొలగించేదా?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">ఈ సందేశాన్ని ఇది శాశ్వతంగా తొలగిస్తుంది.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">సందేషాన్ని చెర్చడం విఫలమైనది.</string>
     <string name="MessageNotifier_error_delivering_message">సందేశం పంపడంలో లోపం</string>
     <string name="MessageNotifier_message_delivery_paused">సందేశం డెలివరీ చేయడం ఆపివేయబడింది.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Signal పై సందేశాలను పంపడాన్ని కొనసాగించేందుకు ధృవీకరించండి.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Molly పై సందేశాలను పంపడాన్ని కొనసాగించేందుకు ధృవీకరించండి.</string>
     <string name="MessageNotifier_mark_all_as_read">అన్నీ చదివినట్టు గుర్తుపెట్టు</string>
     <string name="MessageNotifier_mark_read">చదివినట్టు గుర్తుపెట్టు</string>
     <string name="MessageNotifier_turn_off_these_notifications">ఈ నోటిఫికేషన్‌లను ఆపివేయండి</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">మీ స్టిక్కర్‌కు %1$s ప్రతిస్పందించారు.</string>
     <string name="MessageNotifier_this_message_was_deleted">ఈ సందేశం తొలగించబడింది.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">చేరిన Signal నోటిఫికేషన్‌లను ఆపివేయాలా? మీరు వాటిని Signal &gt; సెట్టింగులు &gt; నోటిఫికేషన్‌లు.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">చేరిన Molly నోటిఫికేషన్‌లను ఆపివేయాలా? మీరు వాటిని Molly &gt; సెట్టింగులు &gt; నోటిఫికేషన్‌లు.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signal బంధించినపుడు తక్షణ స్పందన అందుబాటులొ లేదు!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Molly బంధించినపుడు తక్షణ స్పందన అందుబాటులొ లేదు!</string>
     <string name="QuickResponseService_problem_sending_message">సందేశాన్ని పంపడంలొ సమస్య!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">చెల్లని సత్వరమార్గం</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">కొత్త సందేశం</string>
     <string name="SingleRecipientNotificationBuilder_message_request">సందేశ అభ్యర్థన</string>
     <string name="SingleRecipientNotificationBuilder_you">మీరు</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">ఈ పరికరం ఇకపై నమోదు చేయబడలేదు. మీరు వేరే పరికరంలో Signal తో మీ ఫోన్ నంబర్‌ను నమోదు చేయడమే దీనికి కారణం కావచ్చు.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">ఈ పరికరం ఇకపై నమోదు చేయబడలేదు. మీరు వేరే పరికరంలో Molly తో మీ ఫోన్ నంబర్‌ను నమోదు చేయడమే దీనికి కారణం కావచ్చు.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">పరికరాన్ని తిరిగి నమోదు చేయడం</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">కాల్‌కు సమాధానం ఇవ్వడానికి, Signal కు మీ మైక్రోఫోన్‌ యాక్సెస్‌ని ఇవ్వండి.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">కాల్‌కు సమాధానం ఇవ్వడానికి, Molly కు మీ మైక్రోఫోన్‌ యాక్సెస్‌ని ఇవ్వండి.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">వీడియో కాల్‌కు సమాధానం ఇవ్వడానికి, Signal కు మీ మైక్రోఫోన్ మరియు కెమెరాకు యాక్సెస్‌ను ఇవ్వండి.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">కాల్స్ చేయడానికి మరియు కాల్స్ స్వీకరించడానికి Signalకి మైక్రోఫోన్ మరియు కెమెరా అనుమతులు అవసరం, కానీ అవి శాశ్వతంగా తిరస్కరించబడ్డాయి. దయచేసి అనువర్తనం సెట్టింగ్లకు కొనసాగించండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"మైక్రోఫోన్\" మరియు \"కెమెరా\" ని ప్రారంభించండి.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">వీడియో కాల్‌కు సమాధానం ఇవ్వడానికి, Molly కు మీ మైక్రోఫోన్ మరియు కెమెరాకు యాక్సెస్‌ను ఇవ్వండి.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">కాల్స్ చేయడానికి మరియు కాల్స్ స్వీకరించడానికి Mollyకి మైక్రోఫోన్ మరియు కెమెరా అనుమతులు అవసరం, కానీ అవి శాశ్వతంగా తిరస్కరించబడ్డాయి. దయచేసి అనువర్తనం సెట్టింగ్లకు కొనసాగించండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"మైక్రోఫోన్\" మరియు \"కెమెరా\" ని ప్రారంభించండి.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">లింక్ చేయబడిన పరికరంలో సమాధానం ఇవ్వబడింది.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">లింక్ చేయబడిన పరికరంలో తిరస్కరించబడింది.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">లింక్ చేయబడిన పరికరంలో బిజీ.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">కొత్త సంకేతపదమును తిరిగి చెప్పు</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Signal కు ఆహ్వానించండి</string>
+    <string name="contact_selection_activity__invite_to_signal">Molly కు ఆహ్వానించండి</string>
     <string name="contact_selection_activity__new_group">కొత్త సమూహం</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">కాంటాక్ట్‌లను రిఫ్రెష్ చేయండి</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">ఏవరిదైనా కాంటాక్ట్ కనిపించడం లేదా? రిఫ్రెష్ చేసి చూడండి</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Signal లో మీకు తెలిసిన వ్యక్తులను కనుగొనండి</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">మీ కాంటాక్ట్‌లకు యాక్సెస్‌ను అనుమతించండి</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">మరిన్ని</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">పరిచయస్థుల ఫొటో</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">మీ పరిచయాలను ప్రదర్శించడానికి Signal కాంటాక్ట్స్ అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తన సెట్టింగ్ల మెనుకి కొనసాగండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"పరిచయాలు\" ప్రారంభించండి.</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">మీ పరిచయాలను ప్రదర్శించడానికి Molly కాంటాక్ట్స్ అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తన సెట్టింగ్ల మెనుకి కొనసాగండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"పరిచయాలు\" ప్రారంభించండి.</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">పరిచయాలను తిరిగి పొందడంలో లోపం, మీ నెట్వర్క్ కనెక్షన్ను తనిఖీ చేయండి</string>
     <string name="ContactSelectionListFragment_username_not_found">వినియోగదారు పేరు కనుగొనబడలేదు</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" Signal యూజర్ కాదు. దయచేసి వినియోగదారు పేరును తనిఖీ చేసి, మళ్లీ ప్రయత్నించండి."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">యూజర్‌నేమ్ ద్వారా కనుగొనండి</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">కాంటాక్ట్‌లకు యాక్సెస్‌ను అనుమతించండి</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Signal లో మీకు తెలిసిన వ్యక్తులను కనుగొనడానికి:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">ప్రాప్యతను అనుమతించు</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">వద్దు ధన్యవాదాలు</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">మీ కాంటాక్ట్‌లకు యాక్సెస్‌ను అనుమతించండి. మీ కాంటాక్ట్‌లు గుప్తీకరించబడ్డాయి మరియు Signal సేవకు కనిపించవు.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">మీ పరిచయాలను Signal ప్రదర్శించడానికి పరిచయాలకు ప్రాప్యత అవసరం</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">మీ పరిచయాలను Molly ప్రదర్శించడానికి పరిచయాలకు ప్రాప్యత అవసరం</string>
     <string name="contact_selection_list_fragment__show_contacts">పరిచయాలను చూపించు</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">మీరు ఈ వ్యక్తిని తొలగించారు, వారికి మళ్ళీ సందేశం పంపడం వల్ల వారిని మీ జాబితాకు తిరిగి జోడిస్తుంది.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">ఎంపికలు</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">నవీకరణ</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">నడుపు … నిలుపు</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">బబుల్స్ ఒక ఆండ్రాయిడ్ ఫీచర్, Signal చాట్‌ల కొరకు మీరు ఆఫ్ చేయవచ్చు.</string>
+    <string name="BubbleOptOutTooltip__description">బబుల్స్ ఒక ఆండ్రాయిడ్ ఫీచర్, Molly చాట్‌ల కొరకు మీరు ఆఫ్ చేయవచ్చు.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">ఇప్పుడు కాదు</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">గ్రూపు వివరణ</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Signal ను నవీకరించండి</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Molly ను నవీకరించండి</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Signal యొక్క ఈ వెర్షన్ గడువు తీరింది. Signal ఉపయోగించడం కొనసాగించడానికి ఇప్పుడు అప్‌డేట్ చేయండి.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Molly యొక్క ఈ వెర్షన్ గడువు తీరింది. Molly ఉపయోగించడం కొనసాగించడానికి ఇప్పుడు అప్‌డేట్ చేయండి.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">నవీకరణ</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">మెల్లిగా</string>
     <string name="preferences__help">సహాయం</string>
     <string name="preferences__advanced">ఆధునిక</string>
-    <string name="preferences__donate_to_signal">Signal కు విరాళం ఇవ్వండి</string>
+    <string name="preferences__donate_to_signal">Molly కు విరాళం ఇవ్వండి</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">గోప్యత</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">యాప్ ఐకాన్ మరియు పేరును \"%1$s\"కు మార్చండి</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">యాప్ ఐకాన్ మరియు పేరును మార్చడానికి Signal ను మూసివేయాల్సి ఉంటుంది. నోటిఫికేషన్లు ఎల్లప్పుడూ డిఫాల్ట్ Signal ఐకాన్ మరియు పేరును ప్రదర్శిస్తాయి.</string>
+    <string name="preferences__app_icon_dialog_description">యాప్ ఐకాన్ మరియు పేరును మార్చడానికి Molly ను మూసివేయాల్సి ఉంటుంది. నోటిఫికేషన్లు ఎల్లప్పుడూ డిఫాల్ట్ Molly ఐకాన్ మరియు పేరును ప్రదర్శిస్తాయి.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">యాప్ ఐకాన్ మరియు పేరును ఎంచుకోండి, ఇది మీ ఫోన్ యొక్క హోమ్ స్క్రీన్ మరియు యాప్ డ్రాయర్‌పై కనిపిస్తుంది. నోటిఫికేషన్లు ఎల్లప్పుడూ డిఫాల్ట్ Signal ఐకాన్ మరియు పేరును ప్రదర్శిస్తాయి. మరింత తెలుసుకోండి</string>
+    <string name="preferences__app_icon_warning_learn_more">యాప్ ఐకాన్ మరియు పేరును ఎంచుకోండి, ఇది మీ ఫోన్ యొక్క హోమ్ స్క్రీన్ మరియు యాప్ డ్రాయర్‌పై కనిపిస్తుంది. నోటిఫికేషన్లు ఎల్లప్పుడూ డిఫాల్ట్ Molly ఐకాన్ మరియు పేరును ప్రదర్శిస్తాయి. మరింత తెలుసుకోండి</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">యాప్ ఐకాన్స్ మరియు పేర్లు హోమ్ స్క్రీన్ మరియు యాప్ డ్రాయర్‌పై కనిపిస్తాయి.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">నోటిఫికేషన్లు ఎల్లప్పుడూ డిఫాల్ట్ Signal ఐకాన్ మరియు పేరును ప్రదర్శిస్తాయి.</string>
+    <string name="preferences__app_icon_notification_warning">నోటిఫికేషన్లు ఎల్లప్పుడూ డిఫాల్ట్ Molly ఐకాన్ మరియు పేరును ప్రదర్శిస్తాయి.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">మరింత తెలుసుకోండి</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">ఇది %1$s అత్యంత ఇటీవలి సందేశాలకు అన్ని చాట్‌లను శాశ్వతంగా ట్రిమ్ చేస్తుంది.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">ఇది మీ పరికరం నుండి సందేశ చరిత్ర మరియు మీడియాను అంతటిని శాశ్వతంగా తొలగిస్తుంది.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">ఇది మీ పరికరం మరియు ఏ లింక్ చేసిన పరికరాల నుండి అయినా మొత్తం సందేశ చరిత్ర మరియు మీడియాను శాశ్వతంగా తొలగిస్తుంది.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">మీరు ఖచ్చితంగా సందేశ చరిత్ర అంతటిని తొలగించాలని అనుకుంటున్నారా?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">సందేశ చరిత్ర అంతా శాశ్వతంగా తొలగించబడుతుంది. ఈ చర్య రద్దు చేయబడదు.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">అన్ని పరికరాల నుండి మొత్తం సందేశ చరిత్ర శాశ్వతంగా తొలగించబడుతుంది. ఈ చర్య రద్దు చేయబడదు.</string>
     <string name="preferences_storage__delete_all_now">ఇప్పుడు అన్నీ తొలిగించండి</string>
     <string name="preferences_storage__forever">ఎప్పటికీ</string>
     <string name="preferences_storage__one_year">1 సంవత్సరం</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">సెన్సార్‌షిప్ మోసం</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">సెన్సార్‌షిప్ మోసం</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">ప్రారంభించబడితే, Signal ప్రదర్శన నిషేధం తప్పించుకోవడానికి ప్రయత్నిస్తుంది. మీరు Signal నిషేధించ చేయబడిన ప్రదేశంలో ఉంటే తప్ప ఈ లక్షణాన్ని ప్రారంభించవద్దు.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">ప్రారంభించబడితే, Molly ప్రదర్శన నిషేధం తప్పించుకోవడానికి ప్రయత్నిస్తుంది. మీరు Molly నిషేధించ చేయబడిన ప్రదేశంలో ఉంటే తప్ప ఈ లక్షణాన్ని ప్రారంభించవద్దు.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">మీ ఖాతా ఫోన్ నంబర్ ఆధారంగా ప్రదర్శన వంచన నిషేధం సక్రియం చేయబడింది.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">చెల్లింపులను పరిచయం చేస్తోంది</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">గోప్యత‌పై దృష్టి గల డిజిటల్ కరెన్సీ MobileCoinను పంపడానికి మరియు అందుకోవడానికి Signalను ఉపయోగించండి. ప్రారంభించడానికి యాక్టివేట్ చేయండి.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">గోప్యత‌పై దృష్టి గల డిజిటల్ కరెన్సీ MobileCoinను పంపడానికి మరియు అందుకోవడానికి Mollyను ఉపయోగించండి. ప్రారంభించడానికి యాక్టివేట్ చేయండి.</string>
     <string name="PaymentsHomeFragment__activate_payments">చెల్లింపులను సక్రియం చేయండి</string>
     <string name="PaymentsHomeFragment__activating_payments">పేమెంట్‌లను యాక్టివేట్ చేస్తోంది…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">పేమెంట్‌ల ఖాతాను పునరుద్ధరించు</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">మీ ప్రాంతంలో పేమెంట్‌లు లభ్యం కావడం లేదు.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">పేమెంట్‌లను ప్రారంభించలేకపోయింది. తరువాత మళ్లీ ప్రయత్నించండి.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">చెల్లింపులను నిష్క్రియం చేయండి?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">మీరు పేమెంట్‌లను డీయాక్టివేట్ చేసినట్లయితే, మీరు Signal లో మొబైల్‌కాయిన్‌ పంపడం లేదా అందుకోవడం చేయలేరు.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">మీరు పేమెంట్‌లను డీయాక్టివేట్ చేసినట్లయితే, మీరు Molly లో మొబైల్‌కాయిన్‌ పంపడం లేదా అందుకోవడం చేయలేరు.</string>
     <string name="PaymentsHomeFragment__deactivate">నిష్క్రియం చేయండి</string>
     <string name="PaymentsHomeFragment__continue">కొనసాగించు</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">బ్యాలెన్స్ ప్రస్తుతం లభ్యం కావడం లేదు.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">వివరాలు</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">MobileCoin ను పంపడానికి మరియు అందుకోవడానికి మీరు Signal ను ఉపయోగించవచ్చు. MobileCoins మరియు MobileCoin వాలెట్ కోసం అన్ని చెల్లింపులు వినియోగ నిబంధనలకు లోబడి ఉంటాయి. మీరు కొన్ని సమస్యలను ఎదుర్కోవచ్చు మరియు మీరు కోల్పోయే చెల్లింపులు లేదా బ్యాలెన్స్‌లను తిరిగి పొందలేరు. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">MobileCoin ను పంపడానికి మరియు అందుకోవడానికి మీరు Molly ను ఉపయోగించవచ్చు. MobileCoins మరియు MobileCoin వాలెట్ కోసం అన్ని చెల్లింపులు వినియోగ నిబంధనలకు లోబడి ఉంటాయి. మీరు కొన్ని సమస్యలను ఎదుర్కోవచ్చు మరియు మీరు కోల్పోయే చెల్లింపులు లేదా బ్యాలెన్స్‌లను తిరిగి పొందలేరు. </string>
     <string name="PaymentsHomeFragment__activate">సక్రియం చేయండి</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoin నిబంధనలను చూడండి.</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Signal లో చెల్లింపులు ఇకపై అందుబాటులో లేవు. మీరు ఇప్పటికీ నిధులను ఎక్స్ఛేంజికి బదిలీ చేయవచ్చు, కానీ మీరు ఇకపై చెల్లింపులను పంపలేరు మరియు స్వీకరించలేరు లేదా నిధులను జోడించలేరు.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Molly లో చెల్లింపులు ఇకపై అందుబాటులో లేవు. మీరు ఇప్పటికీ నిధులను ఎక్స్ఛేంజికి బదిలీ చేయవచ్చు, కానీ మీరు ఇకపై చెల్లింపులను పంపలేరు మరియు స్వీకరించలేరు లేదా నిధులను జోడించలేరు.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">అనుమతులను అనుమతించండి</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">మీకు తెలిసిన వ్యక్తులకు సందేశం పంపడంలో మీకు సహాయపడటానికి, Signal ఈ అనుమతులను అభ్యర్థిస్తుంది. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">మీకు తెలిసిన వ్యక్తులకు సందేశం పంపడంలో మీకు సహాయపడటానికి, Molly ఈ అనుమతులను అభ్యర్థిస్తుంది. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">నోటిఫికేషన్‌లు</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">తరువాత</string>
     <string name="PaymentsTransferFragment__invalid_address">చెల్లని చిరునామా</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">మీరు బదిలీ చేయడానికి ప్రయత్నిస్తున్న వ్యాలెట్ చిరునామాని తనిఖీ చేసి, మళ్లీ ప్రయత్నించండి.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">మీ స్వంత Signal వ్యాలెట్ చిరునామాని మీరు బదిలీ చేయలేరు. మద్దతు ఇచ్చే ఎక్స్ఛేంజ్ వద్ద మీ ఖాతా నుంచి వ్యాలెట్ చిరునామాని నమోదు చేయండి.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR కోడ్ స్కాన్ చేయడానికి, Signal కు కెమెరా యాక్సెస్ అవసరం.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QR కోడ్ క్యాప్చర్ చేయడానికి Signal కొరకు కెమెరా పర్మిషన్ కావాలి. సెట్టింగ్‌లకు వెళ్లండి, ‘‘పర్మిషన్‌లు’’ ఎంచుకోండి, ‘‘కెమెరా’’ని ప్రారంభించండి.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR కోడ్ స్కాన్ చేయడానికి, Signal కు కెమెరా యాక్సెస్ అవసరం.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">మీ స్వంత Molly వ్యాలెట్ చిరునామాని మీరు బదిలీ చేయలేరు. మద్దతు ఇచ్చే ఎక్స్ఛేంజ్ వద్ద మీ ఖాతా నుంచి వ్యాలెట్ చిరునామాని నమోదు చేయండి.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR కోడ్ స్కాన్ చేయడానికి, Molly కు కెమెరా యాక్సెస్ అవసరం.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">QR కోడ్ క్యాప్చర్ చేయడానికి Molly కొరకు కెమెరా పర్మిషన్ కావాలి. సెట్టింగ్‌లకు వెళ్లండి, ‘‘పర్మిషన్‌లు’’ ఎంచుకోండి, ‘‘కెమెరా’’ని ప్రారంభించండి.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR కోడ్ స్కాన్ చేయడానికి, Molly కు కెమెరా యాక్సెస్ అవసరం.</string>
     <string name="PaymentsTransferFragment__settings">అమరికలు</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">ఇన్‌కమింగ్ Signal వాయిస్ కాల్</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">ఇన్‌కమింగ్ Molly వాయిస్ కాల్</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">ఇన్‌కమింగ్ Signal వీడియో కాల్</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">ఇన్‌కమింగ్ Molly వీడియో కాల్</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">ఇన్‌కమింగ్ Signal గ్రూప్ కాల్</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">ఇన్‌కమింగ్ Molly గ్రూప్ కాల్</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">కొనసాగుతున్న Signal వాయిస్ కాల్</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">కొనసాగుతున్న Molly వాయిస్ కాల్</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">కొనసాగుతున్న Signal వీడియో కాల్</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">కొనసాగుతున్న Molly వీడియో కాల్</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">కొనసాగుతున్న Signal గ్రూప్ కాల్</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">కొనసాగుతున్న Molly గ్రూప్ కాల్</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">లోడ్…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">నిర్ధారించబడిన</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">మీరు మీ ప్రత్యామ్నాయములు పాస్‌ఫ్రేజ్‌ని విజయవంతంగా నమోదు చేశారు</string>
     <string name="BackupDialog_passphrase_was_not_correct">పాస్‌ఫ్రేజ్ సరైనది కాదు</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signal బ్యాకప్‌ని సృష్టిస్తోంది…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Molly బ్యాకప్‌ని సృష్టిస్తోంది…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Signal బ్యాకప్‌ని వెరిఫై చేస్తోంది…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Molly బ్యాకప్‌ని వెరిఫై చేస్తోంది…</string>
     <string name="LocalBackupJobApi29_backup_failed">ప్రత్యామ్నాయ విఫలమైంది</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">మీ బ్యాకప్ డైరెక్టరీ తొలగించబడినది లేదా తరలించబడినది</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">మీ ప్రత్యామ్నాయములు ఫైల్ ఈ వాల్యూమ్‌లో నిల్వ చేయడానికి చాలా పెద్దది.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">నాకు కాల్ చేయండి (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">కోడ్ మళ్ళీ పంపండి (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Signal మద్దతును సంప్రదించండి</string>
-    <string name="RegistrationActivity_code_support_subject">Signal రిజిస్ట్రేషన్ - Android కోసం ధృవీకరణ కోడ్</string>
+    <string name="RegistrationActivity_contact_signal_support">Molly మద్దతును సంప్రదించండి</string>
+    <string name="RegistrationActivity_code_support_subject">Molly రిజిస్ట్రేషన్ - Android కోసం ధృవీకరణ కోడ్</string>
     <string name="RegistrationActivity_incorrect_code">తప్పు కోడ్</string>
     <string name="BackupUtil_never">ఎప్పుడూ</string>
     <string name="BackupUtil_unknown">తెలియని</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">ఫోన్ నంబర్</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">మీ ఫోన్ నంబర్‌ను ఎవరు చూడగలరు మరియు దానితో Signal లో మిమ్మల్ని ఎవరు సంప్రదించగలరో ఎంచుకోండి.</string>
+    <string name="preferences_app_protection__choose_who_can_see">మీ ఫోన్ నంబర్‌ను ఎవరు చూడగలరు మరియు దానితో Molly లో మిమ్మల్ని ఎవరు సంప్రదించగలరో ఎంచుకోండి.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">నా నంబర్‌ను ఎవరు చూడగలరు</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">మీరు చాలా ప్రయత్నాలు చేసారు. దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి.</string>
     <string name="RegistrationActivity_error_connecting_to_service">సేవకు కనెక్ట్ చేయడంలో లోపం</string>
     <string name="preferences_chats__backups">ప్రత్యామ్నాయములు</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal లాక్ చేయబడింది</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly లాక్ చేయబడింది</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">అన్లాక్ చేయడానికి ట్యాప్ చేయండి</string>
     <string name="Recipient_unknown">తెలియని</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">మీకు మీ పాత పరికరానికి యాక్సెస్ అవసరం.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">బ్యాకప్ నుంచి పునరుద్ధరించండి</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">స్థానిక బ్యాకప్ నుంచి మీ సందేశాలను పునరుద్ధరించండి. మీరు ఇప్పుడు పునరుద్ధరించలేకపోతే, మీరు తరువాత పునరుద్ధరించలేరు.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">లోకల్ బ్యాకప్‌ను పునరుద్ధరించండి</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signal బ్యాకప్‌ను పునరుద్ధరించండి</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">మీ టెక్స్ట్ సందేశాలు అన్నీ + మీ గత 30 రోజుల మీడియాను పునరుద్ధరించండ</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">మరిన్ని ఎంపికలు</string>
 
+    <string name="TransferOrRestoreFragment__cancel">రద్దు చేయండి</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">బదిలీ చేయకుండానే లాగిన్ చేయండి</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">మీ సందేశాలు అలాగే మీడియాను బదిలీ చేయకుండానే కొనసాగించండి</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">మీ పాత Android పరికరంపై Signal ను తెరవండి</string>
     <string name="NewDeviceTransferInstructions__continue">కొనసాగించు</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">పాత Android పరికరాన్ని కనెక్ట్ చేయడానికి సిద్ధం చేయడం…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">ఒక్క క్షణం పడుతుంది, త్వరగా సిద్ధం కావాలి</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">పాత Android పరికరం కనెక్ట్ కావడం కొరకు వేచి ఉంది…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">మీ పాత Android పరికరాన్ని కనుగొని, దానితో అనుసంధానం కావడానికి Signal కు లొకేషన్ పర్మిషన్ కావాలి.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">మీ పాత Android పరికరాన్ని కనుగొని, దానితో అనుసంధానం కావడానికి లొకేషన్‌ సర్వీస్‌లు ప్రారంభించడం Signal కొరకు అవసరం.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">మీ పాత Android పరికరాన్ని కనుగొని, దానితో అనుసంధానం కావడానికి Signal కు Wi-Fi అవసరం. Wi-Fiని ఆన్ చేసి ఉంచాలి కానీ, Wi-Fi నెట్‌వర్క్‌కు కనెక్ట్ కావాల్సిన అవసరం లేదు.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">క్షమించండి, ఈ పరికరం Wi-Fi Directకు మద్దతు ఇవ్వదు. మీ పాత Android పరికరాన్ని కనుగొనడానికి, కనెక్ట్ చేయడానికి Wi-Fi Directని Signal ఉపయోగిస్తుంది. మీరు ఇప్పటికీ మీ పాత Android పరికరం నుండి మీ ఖాతాను పునరుద్ధరించడానికి బ్యాకప్ స్టోరేజీని పునరుద్ధరించవచ్చు.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">మీ పాత Android పరికరాన్ని కనుగొని, దానితో అనుసంధానం కావడానికి Molly కు లొకేషన్ పర్మిషన్ కావాలి.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">మీ పాత Android పరికరాన్ని కనుగొని, దానితో అనుసంధానం కావడానికి లొకేషన్‌ సర్వీస్‌లు ప్రారంభించడం Molly కొరకు అవసరం.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">మీ పాత Android పరికరాన్ని కనుగొని, దానితో అనుసంధానం కావడానికి Molly కు Wi-Fi అవసరం. Wi-Fiని ఆన్ చేసి ఉంచాలి కానీ, Wi-Fi నెట్‌వర్క్‌కు కనెక్ట్ కావాల్సిన అవసరం లేదు.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">క్షమించండి, ఈ పరికరం Wi-Fi Directకు మద్దతు ఇవ్వదు. మీ పాత Android పరికరాన్ని కనుగొనడానికి, కనెక్ట్ చేయడానికి Wi-Fi Directని Molly ఉపయోగిస్తుంది. మీరు ఇప్పటికీ మీ పాత Android పరికరం నుండి మీ ఖాతాను పునరుద్ధరించడానికి బ్యాకప్ స్టోరేజీని పునరుద్ధరించవచ్చు.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">బ్యాకప్‌ని పునరుద్ధరించండి</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">మీ పాత Android పరికరానికి కనెక్ట్ చేయడానికి ప్రయత్నించేటప్పుడు ఊహించని దోషం ఏర్పడింది.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">కొత్త Android పరికరం కొరకు వెతుకుతోంది…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">మీ కొత్త Android పరికరాన్ని కనుగొని, దానితో అనుసంధానం కావడానికి Signal కు లొకేషన్ పర్మిషన్ కావాలి.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">మీ కొత్త Android పరికరాన్ని కనుగొని, దానితో అనుసంధానం కావడానికి లొకేషన్‌ సర్వీస్‌లు ప్రారంభించడం Signal కొరకు అవసరం.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">మీ కొత్త Android పరికరాన్ని కనుగొని, దానితో అనుసంధానం కావడానికి Signal కు Wi-Fi అవసరం. Wi-Fiని ఆన్ చేసి ఉంచాలి కానీ, Wi-Fi నెట్‌వర్క్‌కు కనెక్ట్ కావాల్సిన అవసరం లేదు.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">క్షమించండి, ఈ పరికరం Wi-Fi Directకు మద్దతు ఇవ్వదు. మీ కొత్త Android పరికరాన్ని కనుగొనడానికి, కనెక్ట్ చేయడానికి Wi-Fi Directని Signal ఉపయోగిస్తుంది. మీరు ఇప్పటికీ మీ పాత Android పరికరం నుండి మీ ఖాతాను పునరుద్ధరించడానికి బ్యాకప్ స్టోరేజీని పునరుద్ధరించవచ్చు.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">మీ కొత్త Android పరికరాన్ని కనుగొని, దానితో అనుసంధానం కావడానికి Molly కు లొకేషన్ పర్మిషన్ కావాలి.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">మీ కొత్త Android పరికరాన్ని కనుగొని, దానితో అనుసంధానం కావడానికి లొకేషన్‌ సర్వీస్‌లు ప్రారంభించడం Molly కొరకు అవసరం.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">మీ కొత్త Android పరికరాన్ని కనుగొని, దానితో అనుసంధానం కావడానికి Molly కు Wi-Fi అవసరం. Wi-Fiని ఆన్ చేసి ఉంచాలి కానీ, Wi-Fi నెట్‌వర్క్‌కు కనెక్ట్ కావాల్సిన అవసరం లేదు.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">క్షమించండి, ఈ పరికరం Wi-Fi Directకు మద్దతు ఇవ్వదు. మీ కొత్త Android పరికరాన్ని కనుగొనడానికి, కనెక్ట్ చేయడానికి Wi-Fi Directని Molly ఉపయోగిస్తుంది. మీరు ఇప్పటికీ మీ పాత Android పరికరం నుండి మీ ఖాతాను పునరుద్ధరించడానికి బ్యాకప్ స్టోరేజీని పునరుద్ధరించవచ్చు.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">ఒక బ్యాకప్‌ని సృష్టించండి</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">మీ కొత్త Android పరికరానికి కనెక్ట్ చేయడానికి ప్రయత్నించేటప్పుడు ఊహించని దోషం ఏర్పడింది.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">డేటాని బదిలీ చేస్తోంది</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">రెండు పరికరాలను ఒకదానితో మరొకటి దగ్గరగా ఉంచండి. పరికరాలను ఆఫ్ చేయవద్దు మరియు Signal ని ఆన్ చేసి ఉంచండి. బదిలీలు ఎండ్ టూ ఎండ్ ఎన్‌క్రిప్ట్ చేయబడతాయి.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">రెండు పరికరాలను ఒకదానితో మరొకటి దగ్గరగా ఉంచండి. పరికరాలను ఆఫ్ చేయవద్దు మరియు Molly ని ఆన్ చేసి ఉంచండి. బదిలీలు ఎండ్ టూ ఎండ్ ఎన్‌క్రిప్ట్ చేయబడతాయి.</string>
     <string name="DeviceTransfer__d_messages_so_far">ఇప్పటి వరకు %1$d సందేశాలు…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">ఇప్పటి వరకు %1$s%% యొక్క సందేశాలు…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">ఖాతా బదిలీ</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">మీ కొత్త Android పరికరంపై Signal డౌన్‌లోడ్ చేయండి</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">మీ కొత్త Android పరికరంపై Molly డౌన్‌లోడ్ చేయండి</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"‘‘బదిలీ చేయండి లేదా ఖాతాను పునరుద్ధరించండి’’ మీద తట్టండి"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">ఈ లింక్ ఉన్న ఎవరైనా సమూహం పేరు మరియు ఫోటోను చూడవచ్చు మరియు చేరమని అభ్యర్థించవచ్చు. మీరు విశ్వసించే వ్యక్తులతో ఈ లింక్ ను పంచుకోండి.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">ఈ లింక్ ఉన్న ఎవరైనా గుంపు పేరు మరియు ఫోటోను చూడవచ్చు మరియు గుంపులో చేరవచ్చు. మీరు విశ్వసించే వ్యక్తులతో ఈ లింక్ ను పంచుకోండి.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Signal ద్వారా భాగస్వామ్యం చేయండి</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Molly ద్వారా భాగస్వామ్యం చేయండి</string>
     <string name="GroupLinkBottomSheet_copy">నకలు</string>
     <string name="GroupLinkBottomSheet_qr_code">QR కోడ్</string>
     <string name="GroupLinkBottomSheet_share">పంచుకోండి</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">MobileCoin గురించి</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin కొత్త గోప్యతా దృష్టి గల డిజిటల్ కరెన్సీ.</string>
     <string name="payment_info_card_adding_funds">ఫండ్స్‌ని జోడించడం</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">మీ వాలెట్ చిరునామాకు MobileCoin పంపడం ద్వారా మీరు Signalలో ఉపయోగం కోసం నిధులను జోడించవచ్చు.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">మీ వాలెట్ చిరునామాకు MobileCoin పంపడం ద్వారా మీరు Mollyలో ఉపయోగం కోసం నిధులను జోడించవచ్చు.</string>
     <string name="payment_info_card_cashing_out">క్యాష్ అవుట్</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">మీరు MobileCoinకు మద్దతిచ్చే మారకంలో ఎప్పుడైనా MobileCoinను క్యాష్ అవుట్ చేయవచ్చు. ఆ మారకంలో మీ ఖాతాకు బదిలీ చేయండి.</string>
     <string name="payment_info_card_hide_this_card">ఈ కార్డును దాచిపెట్టాలా?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">వ్యాలెట్‌ని డీయాక్టివేట్ చేయండి</string>
     <string name="DeactivateWalletFragment__your_balance">మీ బ్యాలెన్స్</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">చెల్లింపులను డీయాక్టివేట్ చేయడానికి ముందు మీ నిధులను మరో వ్యాలెట్ చిరునామాకు మీరు బదిలీ చేయాలని మీకు సిఫారసు చేయబడుతోంది. ఒకవేళ మీరు మీ నిధులను ఇప్పుడు బదిలీ చేయరాదని ఎంచుకుంటే, ఒకవేళ మీరు చెల్లింపులను రీయాక్టివేట్ చేస్తే, Signal కు లింక్ చేయబడ్డ మీ వ్యాలెట్‌లో అవి ఉంటాయి.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">చెల్లింపులను డీయాక్టివేట్ చేయడానికి ముందు మీ నిధులను మరో వ్యాలెట్ చిరునామాకు మీరు బదిలీ చేయాలని మీకు సిఫారసు చేయబడుతోంది. ఒకవేళ మీరు మీ నిధులను ఇప్పుడు బదిలీ చేయరాదని ఎంచుకుంటే, ఒకవేళ మీరు చెల్లింపులను రీయాక్టివేట్ చేస్తే, Molly కు లింక్ చేయబడ్డ మీ వ్యాలెట్‌లో అవి ఉంటాయి.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">మిగిలిన మొత్తాన్ని బదిలీ చేయడం</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">బదిలీ చేయకుండానే డీయాక్టివేట్ చేయడం</string>
     <string name="DeactivateWalletFragment__deactivate">నిష్క్రియం చేయండి</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">బదిలీ చేయకుండానే డీయాక్టివేట్ చేయాలా?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">ఒకవేళ మీరు చెల్లింపులను రీయాక్టివేట్ చేయడానికి ఎంచుకుంటే మీ నిలవ Signal తో లింక్ చేయబడ్డ మీ వాలెట్‌లో ఉంటుంది.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">ఒకవేళ మీరు చెల్లింపులను రీయాక్టివేట్ చేయడానికి ఎంచుకుంటే మీ నిలవ Molly తో లింక్ చేయబడ్డ మీ వాలెట్‌లో ఉంటుంది.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">వ్యాలెట్‌ని డీయాక్టివేట్ చేయడంలో దోషం.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">లైసెన్స్‌లు</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">నిబంధనలు &amp; గోప్యతా విధానం</string>
-    <string name="HelpFragment__copyright_signal_messenger">కాపీరైట్ Signal మెసెంజర్</string>
+    <string name="HelpFragment__copyright_signal_messenger">కాపీరైట్ Molly మెసెంజర్</string>
     <string name="HelpFragment__licenced_under_the_agplv3">GNU AGPLv3 కింద లైసెన్స్ పొందింది</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">ఒక రంగును ఎంచుకోండి</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">ఎస్సెమ్మెస్</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">పంచుకోండి</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">అడ్మిన్‌లు మాత్రమే ఈ గ్రూప్‌కు సందేశాలు పంపగలరు.</string>
-    <string name="MultiselectForwardFragment__limit_reached">పరిమితి చేరుకుంది</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">మీరు 5 కంటే ఎక్కువ చాట్‌లు ఎంచుకోలేరు</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">మరింత తెలుసుకోండి</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Signal ను నవీకరించండి</string>
+    <string name="UpdateSignalExpiredDialog__title">Molly ను నవీకరించండి</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Signal యొక్క ఈ వెర్షన్ గడువు తీరింది. Signal ఉపయోగించడం కొనసాగించడానికి ఇప్పుడు అప్‌డేట్ చేయండి.</string>
+    <string name="UpdateSignalExpiredDialog__message">Molly యొక్క ఈ వెర్షన్ గడువు తీరింది. Molly ఉపయోగించడం కొనసాగించడానికి ఇప్పుడు అప్‌డేట్ చేయండి.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">నవీకరణ</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">పరికరం నమోదు చేయబడలేదు</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">ఈ పరికరం ఇకపై నమోదు చేయబడలేదు. ఈ పరికరంపై Signal ఉపయోగించడం కొనసాగించేందుకు మళ్ళీ నమోదు చేసుకోండి.</string>
+    <string name="ReregisterSignalDialog__message">ఈ పరికరం ఇకపై నమోదు చేయబడలేదు. ఈ పరికరంపై Molly ఉపయోగించడం కొనసాగించేందుకు మళ్ళీ నమోదు చేసుకోండి.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">మల్లి నమోదుచేయుత </string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">పికర్ ఓపెన్ చేయడం విఫలమైంది</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">నోటిఫికేషన్‌లను ప్రారంభించడానికి, వాటిని ప్రదర్శించడానికి Signal కు అనుమతి అవసరం.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">నోటిఫికేషన్‌లను ప్రారంభించడానికి, వాటిని ప్రదర్శించడానికి Molly కు అనుమతి అవసరం.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">ఆన్ చేయండి</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">ఇంకా ఎలాంటి రిప్లైలు లేవు</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">ఈ గ్రూప్‌లో మీరు ఇక ఏమాత్రం సభ్యులు కానందు వల్ల, ఈ కథకు మీరు బదులివ్వలేరు.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">కథకు ప్రతిస్పందించారు</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">కథకు ప్రతిస్పందించారు</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">కథకు ప్రతిస్పందించారు</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">వీక్షణలు</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">మీ బ్యాంక్‌ను ఎంచుకోండి</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">%1$s తో మీ విరాళాన్ని నిర్ధారించండి</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">మీ పునరావృత విరాళాన్ని సెటప్ చేయడానికి, మీ బ్యాంక్‌తో €0,01 ఛార్జీని నిర్ధారించేందుకు కొనసాగించండిని తట్టండి. ఇది ఆటోమేటిక్‌గా రీఫండ్ చేయబడుతుంది మరియు మీ ఖాతా నుండి మీ నెలకు €5 విరాళాన్ని డెబిట్ చేయడానికి అనుమతిస్తుంది.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">మీ పునరావృత విరాళాన్ని సెటప్ చేయడానికి, మీ బ్యాంక్‌తో €0,01 ఛార్జీని నిర్ధారించేందుకు కొనసాగించండిని తట్టండి. ఇది ఆటోమేటిక్‌గా రీఫండ్ చేయబడుతుంది మరియు మీ ఖాతా నుండి నెలకు %1$s మీ విరాళాన్ని డెబిట్ చేయడానికి అనుమతిస్తుంది.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">కొనసాగండి</string>
 
@@ -6861,6 +6999,47 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">బ్యాకప్ డేటాను డౌన్‌లోడ్ చేస్తోంది…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">మీడియా బ్యాకప్‌లు ఆఫ్‌లో ఉన్నాయి</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">మేము మీ చెల్లింపును ప్రాసెస్ చేయలేకపోయాము కాబట్టి మీ Signal మీడియా బ్యాకప్ ప్లాన్ రద్దు అయ్యింది. మీ బ్యాకప్‌లో నిల్వ చేయబడిన ఏదైనా మీడియాను డౌన్‌లోడ్ చేసుకోవడానికి మీకు %1$d రోజు ఉంది. %1$d రోజు తర్వాత, మీ బ్యాకప్‌లో ఉన్న మీడియా తొలగించబడుతుంది.</item>
+        <item quantity="other">మేము మీ చెల్లింపును ప్రాసెస్ చేయలేకపోయాము కాబట్టి మీ Signal మీడియా బ్యాకప్ ప్లాన్ రద్దు అయ్యింది. మీ బ్యాకప్‌లో నిల్వ చేయబడిన ఏదైనా మీడియాను డౌన్‌లోడ్ చేసుకోవడానికి మీకు %1$d రోజులు ఉన్నాయి. %1$d రోజుల తర్వాత, మీ బ్యాకప్‌లో ఉన్న మీడియా తొలగించబడుతుంది.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">మీ మీడియాను అంతా బ్యాకప్ చేయడం కొనసాగించడానికి మీరు ఏ సమయంలోనైనా బ్యాకప్‌ల కోసం మళ్ళీ చెల్లించడం ప్రారంభించవచ్చు. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">మీ మీడియా ఈరోజు తొలగించబడుతుంది</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">మేము మీ చెల్లింపును ప్రాసెస్ చేయలేనందున మీ Signal మీడియా బ్యాకప్ ప్లాన్ రద్దు చేయబడింది. మీ బ్యాకప్‌లోని మీడియా తొలగిపోక ముందే డౌన్‌లోడ్ చేసుకోవడానికి ఇది మీకు చివరి అవకాశం.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">డౌన్‌లోడ్‌ను పూర్తి చేయలేకపోయాము</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">మీ పరికరంలో తగినంత ఖాళీ స్థలం లేదు. మీ బ్యాకప్‌లో నిల్వ చేయబడిన మీడియాను డౌన్‌లోడ్ చేయడానికి మొత్తం స్థలంలో %1$s వరకు స్థలాన్ని ఖాళీ చేయండి.</string>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">బ్యాకప్ చెల్లింపును ప్రాసెస్ చేయడం సాధ్యపడదు</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">మీ పునరావృత నెలవారీ బ్యాకప్ చెల్లింపును సేకరించడంలో మాకు ఇబ్బంది ఉంది. మీ చెల్లింపు విధానం అప్ టూ డేట్ ఉందో లేదో నిర్ధారించుకోండి. ఒకవేళ అది లేకపోతే, దానిని Google Pay లో అప్‌డేట్ చేయండి. Signal కొన్ని రోజుల్లో మళ్లీ చెల్లింపును ప్రాసెస్ చేయడానికి ప్రయత్నిస్తుంది.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">బ్యాకప్‌ను పూర్తి చేయలేకపోయాము</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">%1$d రోజులుగా మీ పరికరం బ్యాకప్‌ను పూర్తి చేయలేదు. మీ పరికరం Wi-fi కు కనెక్ట్ చేయబడిందని నిర్ధారించుకొని, \"ఇప్పుడే బ్యాకప్ చేయండి\" ని తట్టండి. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">మరింత తెలుసుకోండి</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">దాటవేయి</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">ఇప్పుడే మీడియాను డౌన్‌లోడ్ చేయండి</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">తర్వాత డౌన్‌లోడ్ చేసుకోండి</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">మీడియాను డౌన్‌లోడ్ చేయవద్దు</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">మీ మీడియాను డౌన్‌లోడ్ చేయడానికి మొత్తం స్థలంలో %1$s స్థలాన్ని ఖాళీ చేయండి.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">క్రెడిట్ లేదా డెబిట్ కార్డు</string>
@@ -6874,6 +7053,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">తెలియని</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">చెల్లింపుల చరిత్ర</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">మీ చివరి బ్యాకప్ %1$s న %2$s కు చేయబడింది.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7069,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">ఎంచుకున్న సమయాని కంటే మునుపటి సందేశాలు శాశ్వతంగా తొలగించబడతాయి.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">ఎంచుకున్న నిడివిని మించే సందేశాలు శాశ్వతంగా తొలగించబడతాయి.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">లింక్ చేసిన పరికరాలకు పరిమితులను వర్తింపజేయండి</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">ఎనేబుల్ చేసినప్పుడు, చాట్ పరిమితులు మీ లింక్ చేసిన పరికరాల నుండి సందేశాలను కూడా తొలగిస్తాయి.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">తొలగించడం ఇప్పుడు మీ అన్ని పరికరాలలో సింక్ చేయబడింది</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">మీరు సందేశాలు లేదా చాట్‌లు తొలగించినప్పుడు, అవి మీ ఫోన్ అలాగే లింక్ చేసిన పరికరాల నుంచి కూడా తొలగించబడతాయి.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">సరే</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">చెల్లింపుల చరిత్ర</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">టెక్స్ట్ మరియు మొత్తం మీడియా బ్యాకప్</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">చెల్లింపు వివరాలు</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">బ్యాకప్ రకం</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">చెల్లించిన తేదీ</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">పంచుకోండి</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal బ్యాకప్‌లు</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">చెల్లింపుల చరిత్ర</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">బ్యాకప్ వివరాలు</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">బ్యాకప్ పరిమాణం</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">బ్యాకప్ తరచుదనం</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">సెల్యులార్ ఉపయోగించి బ్యాకప్ చేయండి</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">బ్యాకప్‌ను ఆఫ్ చేసి మరియు తొలగించండి</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">బ్యాకప్ తొలగించబడింది అలాగే ఆఫ్ చేయబడింది.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">బ్యాకప్ రకం మారింది, సబ్స్క్రిప్షన్ రద్దు అయ్యింది</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">సబ్స్క్రిప్షన్ రద్దు చేయబడింది</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">డౌన్‌లోడ్ పూర్తయింది</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">బ్యాకప్ రకం</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">బ్యాకప్‌లు నిలిపివేయబడ్డాయి</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/నెలకు</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">ప్రత్యామ్నాయ ప్రారంభించు</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">చివరి బ్యాకప్</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%2$s %1$s గం.లకు</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">ఎప్పుడూ</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">భద్రపరచు</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">బ్యాకప్‌లను ఆఫ్ చేసి మరియు తొలగించేదా?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">మీకు మళ్ళీ ఛార్జ్ చేయబడదు. మీ బ్యాకప్ తొలగించబడుతుంది మరియు ఎటువంటి కొత్త బ్యాకప్‌లు సృష్టించబడవు.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">ఆఫ్ చేయండి మరియు తొలగించండి</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">బ్యాకప్ తొలగించబడుతోంది…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">బ్యాకప్ తొలగించబడింది</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"ఇప్పుడు బ్యాకప్ చేయండిని తట్టడం ద్వారా"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">ప్రతి రోజు</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">ప్రతి వారం</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">నెలవారీ</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">మాన్యువల్‌గా బ్యాకప్ చేయండి</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">దయచేసి మీ పరికరం PIN, పాస్‌వర్డ్ లేదా ప్యాటర్న్ ఎంటర్ చేయండి.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">తరువాత</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">బ్యాకప్ రకం మార్చండి</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">సబ్‌స్క్రిప్షన్‌ను రద్దు చేయండి</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">రద్దును నిర్ధారించండి</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">మీకు మళ్లీ ఛార్జీ విధించబడదు. మీ బిల్లింగ్ సైకిల్ ముగింపు సమయంలో బ్యాకప్‌లు ఆఫ్ చేయబడతాయి. ఆ తేదీ తర్వాత మీరు ప్రస్తుతం బ్యాకప్ చేస్తున్న మీడియాను డౌన్‌లోడ్ చేసుకోవడానికి మీకు 30 రోజుల సమయం ఉంటుంది.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">నిర్ధారించి, ఇప్పుడే డౌన్‌లోడ్ చేయండి</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">నిర్ధారించి, తర్వాత డౌన్‌లోడ్ చేయండి</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">సబ్స్క్రిప్షన్ ఉంచండి</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index be49865b6b..515bf65c92 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal กำลังปรับรุ่น…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly กำลังปรับรุ่น…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">คุณยังไม่ได้ตั้งวลีรหัสผ่าน</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">ปิดใช้งานวลีรหัสผ่านหรือไม่?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Signal และการแจ้งเตือนข้อความจะถูกปลดล็อกอย่างถาวร</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Molly และการแจ้งเตือนข้อความจะถูกปลดล็อกอย่างถาวร</string>
     <string name="ApplicationPreferencesActivity_disable">ปิดใช้งาน</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">เกิดข้อผิดพลาดในการเชื่อมต่อกับเซิร์ฟเวอร์</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">รหัส PIN นั้นจำเป็นสำหรับการล็อกการลงทะเบียน เพื่อจะเลิกใช้ PIN ให้เลิกล็อกการลงทะเบียนก่อน</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">แฟ้ม</string>
     <string name="AttachmentKeyboard_contact">ผู้ติดต่อ</string>
     <string name="AttachmentKeyboard_location">ตำแหน่งที่ตั้ง</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal จำเป็นต้องได้รับสิทธิ์เข้าถึงเพื่อแสดงรูปและวิดีโอของคุณ</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly จำเป็นต้องได้รับสิทธิ์เข้าถึงเพื่อแสดงรูปและวิดีโอของคุณ</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">อนุญาตให้เข้าถึง</string>
     <string name="AttachmentKeyboard_payment">การจ่ายเงิน</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">ไม่พบแอปสำหรับเลือกสื่อ</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">เพื่อที่จะแนบรูปภาพ วิดีโอ หรือเสียง Signal ต้องได้รับอนุญาตให้เข้าถึงที่เก็บข้อมูล แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ที่เก็บข้อมูล\"</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">เพื่อที่จะแนบข้อมูลผู้ติดต่อ Signal ต้องได้รับอนุญาตให้เข้าถึงผู้ติดต่อ แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ผู้ติดต่อ\"</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">เพื่อที่จะแนบข้อมูลตำแหน่งที่ตั้ง Signal ต้องได้รับอนุญาตให้เข้าถึงตำแหน่งที่ตั้ง แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ตำแหน่งที่ตั้ง\"</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">เพื่อที่จะแนบรูปภาพ วิดีโอ หรือเสียง Molly ต้องได้รับอนุญาตให้เข้าถึงที่เก็บข้อมูล แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ที่เก็บข้อมูล\"</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">เพื่อที่จะแนบข้อมูลผู้ติดต่อ Molly ต้องได้รับอนุญาตให้เข้าถึงผู้ติดต่อ แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ผู้ติดต่อ\"</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">เพื่อที่จะแนบข้อมูลตำแหน่งที่ตั้ง Molly ต้องได้รับอนุญาตให้เข้าถึงตำแหน่งที่ตั้ง แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ตำแหน่งที่ตั้ง\"</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">อนุญาตให้เข้าถึงตำแหน่งที่ตั้งของคุณ</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">ในการส่งตำแหน่งที่ตั้งของคุณ:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">อนุญาตให้ Signal ส่งข้อมูลตำแหน่งของคุณ</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">อนุญาตให้ Molly ส่งข้อมูลตำแหน่งของคุณ</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal จำเป็นต้องได้รับสิทธิ์การเข้าถึงตำแหน่งที่ตั้งเพื่อส่งพิกัดของคุณ</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly จำเป็นต้องได้รับสิทธิ์การเข้าถึงตำแหน่งที่ตั้งเพื่อส่งพิกัดของคุณ</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">อนุญาตให้เข้าถึงพื้นที่จัดเก็บ</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">ในการแสดงรูปและวิดีโอ:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal จำเป็นต้องได้รับสิทธิ์เข้าถึงพื้นที่จัดเก็บเพื่อแสดงรูปและวิดีโอของคุณ</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly จำเป็นต้องได้รับสิทธิ์เข้าถึงพื้นที่จัดเก็บเพื่อแสดงรูปและวิดีโอของคุณ</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s ยังไม่ได้เปิดใช้การชำระเงิน </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">เปลี่ยนกล้อง</string>
     <string name="CameraXFragment_open_gallery_description">เปิดอัลบั้มภาพ</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">อนุญาตให้เข้าถึง</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">อนุญาตให้เข้าถึงกล้องและไมโครโฟนของคุณ</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">อนุญาตให้เข้าถึงกล้องของคุณ</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">อนุญาตให้เข้าถึงไมโครโฟนของคุณ</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">อนุญาตให้ Signal เข้าถึงกล้องเพื่อถ่ายภาพ</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">อนุญาต Signal ให้ใช้กล้องเพื่อถ่ายรูปและวิดีโอ</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">อนุญาตให้ Signal เข้าถึงกล้องและไมโครโฟนเพื่อถ่ายภาพและบันทึกวิดีโอ</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">อนุญาตให้ Signal เข้าถึงไมโครโฟนของคุณเพื่อบันทึกวิดีโอพร้อมเสียง</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">อนุญาตให้ Signal เข้าถึงกล้องเพื่อสแกนคิวอาร์โค้ด</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal จำเป็นต้องได้รับสิทธิ์เข้าถึงกล้องเพื่อถ่ายภาพ</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal จำเป็นต้องได้รับสิทธิ์เข้าถึงกล้องเพื่อสแกนคิวอาร์โค้ด</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal จำเป็นต้องได้รับสิทธิ์เข้าถึงไมโครโฟนเพื่อบันทึกวิดีโอ</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">เพื่อถ่ายภาพบน Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">เพื่อถ่ายภาพและบันทึกวิดีโอบน Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">เพื่อบันทึกวิดีโอพร้อมเสียง:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">เพื่อสแกนคิวอาร์โค้ด:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">ผู้ที่ติดต่อล่าสุด</string>
@@ -270,7 +271,7 @@
     <string name="CameraContacts_no_signal_contacts">ไม่มีรายชื่อใน Signal</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">คุณสามารถใช้ปุ่มกล้องสำหรับส่งรูปให้รายชื่อผู้ติดต่อใน Signal เท่านั้น </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">ไม่พบรายชื่อที่คุณมองหาหรือ?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">ส่งคำเชิญให้รายชื่อผู้ติดต่อมาใช้ Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">ส่งคำเชิญให้รายชื่อผู้ติดต่อมาใช้ Molly</string>
     <string name="CameraContacts__menu_search">ค้นหา</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -284,12 +285,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">ไม่ ขอบคุณ</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">ปรับรุ่น Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">ปรับรุ่น Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">แอปรุ่นนี้ไม่ได้รับการสนับสนุนอีกต่อไปแล้ว หากต้องการรับและส่งข้อความต่อ ให้ปรับรุ่นเป็นรุ่นล่าสุด</string>
     <string name="ClientDeprecatedActivity_update">ปรับรุ่น</string>
     <string name="ClientDeprecatedActivity_dont_update">ไม่ปรับรุ่น</string>
     <string name="ClientDeprecatedActivity_warning">คำเตือน</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Signal เวอร์ชันที่คุณใช้อยู่หมดอายุแล้ว คุณสามารถดูประวัติการส่งข้อความได้ แต่จะไม่สามารถส่งหรือรับข้อความได้อีกจนกว่าจะอัปเดต</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Molly เวอร์ชันที่คุณใช้อยู่หมดอายุแล้ว คุณสามารถดูประวัติการส่งข้อความได้ แต่จะไม่สามารถส่งหรือรับข้อความได้อีกจนกว่าจะอัปเดต</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">ไม่เจอเว็บเบราว์เซอร์</string>
@@ -326,8 +327,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">ข้อความ %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">การโทรด้วยเสียงบน Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">การวิดีโอคอลบน Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -419,7 +420,7 @@
     <string name="ConversationActivity_transport_signal">ข้อความ Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">ส่งข้อความ</string>
-    <string name="ConversationActivity_lets_switch_to_signal">เปลี่ยนมาใช้ Signal กันเถอะ %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">เปลี่ยนมาใช้ Molly กันเถอะ %1$s</string>
     <string name="ConversationActivity_specify_recipient">โปรดเลือกผู้ติดต่อ</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">แฟ้มแนบมีขนาดใหญ่เกินกำหนดสำหรับชนิดของข้อความที่คุณกำลังจะส่ง</string>
     <string name="ConversationActivity_unable_to_record_audio">ไม่สามารถอัดเสียงได้!</string>
@@ -438,18 +439,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">ในการส่งข้อความเสียง:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">อนุญาตให้ Signal เข้าถึงไมโครโฟนของคุณเพื่อส่งข้อความเสียง</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">อนุญาตให้ Molly เข้าถึงไมโครโฟนของคุณเพื่อส่งข้อความเสียง</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal จำเป็นต้องได้รับสิทธิ์เข้าถึงไมโครโฟนเพื่อบันทึกข้อความเสียง</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">เพื่อจะส่งข้อความเสียง Signal ต้องได้รับอนุญาตให้เข้าถึงไมโครโฟน แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ไมโครโฟน\"</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly จำเป็นต้องได้รับสิทธิ์เข้าถึงไมโครโฟนเพื่อบันทึกข้อความเสียง</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">เพื่อจะส่งข้อความเสียง Molly ต้องได้รับอนุญาตให้เข้าถึงไมโครโฟน แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ไมโครโฟน\"</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">เพื่อที่จะโทรหา %1$s Signal ต้องได้รับอนุญาตให้เข้าถึงไมโครโฟนและกล้อง แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ไมโครโฟน\" และ \"กล้อง\"</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">อนุญาต Signal ให้ใช้กล้องเพื่อถ่ายรูปและวิดีโอ</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">เพื่อที่จะถ่ายรูปหรือวิดีโอ Signal ต้องได้รับอนุญาตให้เข้าถึงกล้อง แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"กล้อง\"</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal ต้องได้รับอนุญาตให้เข้าถึงกล้องเพื่อถ่ายรูปและวิดีโอ</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">เพื่อที่จะโทรหา %1$s Molly ต้องได้รับอนุญาตให้เข้าถึงไมโครโฟนและกล้อง แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ไมโครโฟน\" และ \"กล้อง\"</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">อนุญาต Molly ให้ใช้กล้องเพื่อถ่ายรูปและวิดีโอ</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">เพื่อที่จะถ่ายรูปหรือวิดีโอ Molly ต้องได้รับอนุญาตให้เข้าถึงกล้อง แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"กล้อง\"</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly ต้องได้รับอนุญาตให้เข้าถึงกล้องเพื่อถ่ายรูปและวิดีโอ</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">อนุญาตให้เปิดใช้งานไมโครโฟนเพื่อถ่ายภาพวิดีโอพร้อมเสียง</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">เพื่อจะอัดภาพวิดีโอ Signal ต้องได้รับอนุญาตให้เข้าถึงไมโครโฟน แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ไมโครโฟน\" และ \"กล้อง\"</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal ต้องได้รับอนุญาตให้เข้าถึงไมโครโฟนเพื่ออัดภาพวิดีโอ</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">เพื่อจะอัดภาพวิดีโอ Molly ต้องได้รับอนุญาตให้เข้าถึงไมโครโฟน แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ไมโครโฟน\" และ \"กล้อง\"</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly ต้องได้รับอนุญาตให้เข้าถึงไมโครโฟนเพื่ออัดภาพวิดีโอ</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">ไม่</string>
@@ -470,9 +471,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">ในการเริ่มต้นการโทร:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">อนุญาตให้ Signal เข้าถึงไมโครโฟนของคุณเพื่อเริ่มต้นการโทร</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">อนุญาตให้ Molly เข้าถึงไมโครโฟนของคุณเพื่อเริ่มต้นการโทร</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal จำเป็นต้องได้รับสิทธิ์เข้าถึงไมโครโฟนเพื่อเริ่มต้นการโทร</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly จำเป็นต้องได้รับสิทธิ์เข้าถึงไมโครโฟนเพื่อเริ่มต้นการโทร</string>
 
 
     <string name="ConversationActivity_join">เข้าร่วม</string>
@@ -486,9 +487,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Signal ไม่รองรับการส่งข้อความ SMS อีกต่อไป ชวน %1$s มาใช้ Signal เพื่อการติดต่อสื่อสารที่ไม่ขาดตอน</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">ผู้ติดต่อคนนี้ไม่ได้ใช้ Signal แล้ว ชวนเพื่อนมาใช้ Signal เพื่อการติดต่อสื่อสารที่ไม่ขาดตอน</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">ผู้ติดต่อคนนี้ไม่ได้ใช้ Molly แล้ว ชวนเพื่อนมาใช้ Molly เพื่อการติดต่อสื่อสารที่ไม่ขาดตอน</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">เชิญมาใช้ Signal</string>
+    <string name="ConversationActivity__invite_to_signal">เชิญมาใช้ Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">เราจะแจ้งให้คุณทราบอีกครั้งเร็วๆ นี้</string>
 
@@ -536,6 +537,8 @@
     <string name="ConversationFragment_delete_for_everyone">ลบสำหรับทุกคน</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">ลบออกจากอุปกรณ์นี้</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">ลบ</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">ลบออกจากอุปกรณ์ทุกเครื่อง</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">ระบบจะลบข้อความนี้สำหรับทุกคนในแชทที่ใช้ Signal รุ่นล่าสุด และผู้ใช้จะเห็นว่าคุณลบข้อความ</string>
@@ -567,13 +570,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">ถูกบล็อก</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">ปรับรุ่น Signal</string>
+    <string name="ConversationFragment__update_build">ปรับรุ่น Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">ลงทะเบียน Signal อีกครั้ง</string>
+    <string name="ConversationFragment__reregister_signal">ลงทะเบียน Molly อีกครั้ง</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">กลับไป</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">เปิด Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">เปิด Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">ไม่ได้อยู่ในสถานะยืนยันแล้ว</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -636,6 +639,10 @@
     <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
         <item quantity="other">การดำเนินการนี้จะลบแชทที่เลือกไว้ทั้งหมด %1$d รายการอย่างถาวร</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="other">การดำเนินการนี้จะลบแชทที่เลือกไว้ทั้งหมด %1$d รายการออกจากอุปกรณ์ทุกเครื่องของคุณอย่างถาวร</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">กำลังลบ</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="other">กำลังลบแชทที่เลือก…</item>
@@ -719,9 +726,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">ใครบ้างที่สามารถค้นหาฉันด้วยหมายเลขโทรศัพท์ได้</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">ผู้ใช้ที่มีหมายเลขโทรศัพท์ของคุณจะเห็นว่าคุณใช้งาน Signal และจะสามารถเริ่มแชทกับคุณได้</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">ผู้ใช้ที่มีหมายเลขโทรศัพท์ของคุณจะเห็นว่าคุณใช้งาน Molly และจะสามารถเริ่มแชทกับคุณได้</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">จะไม่มีใครเห็นว่าคุณใช้งาน Signal เว้นแต่ว่าคุณจะส่งข้อความหาหรือเคยแชทกับผู้ใช้คนนั้น</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">จะไม่มีใครเห็นว่าคุณใช้งาน Molly เว้นแต่ว่าคุณจะส่งข้อความหาหรือเคยแชทกับผู้ใช้คนนั้น</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">กู้คืนจากข้อมูลสำรองหรือไม่?</string>
@@ -755,7 +762,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">ทดสอบวลีรหัสผ่านสำหรับข้อมูลสำรองของคุณและตรวจยืนยันว่ามันตรงกัน</string>
     <string name="BackupsPreferenceFragment__turn_on">เปิด</string>
     <string name="BackupsPreferenceFragment__turn_off">ปิด</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"เพื่อกู้คืนข้อมูลสำรอง คุณต้องติดตั้ง Signal ใหม่ เปิดแอป แตะ \"กู้คืนข้อมูลสำรอง\" และระบุแฟ้มสำรองข้อมูล %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"เพื่อกู้คืนข้อมูลสำรอง คุณต้องติดตั้ง Molly ใหม่ เปิดแอป แตะ \"กู้คืนข้อมูลสำรอง\" และระบุแฟ้มสำรองข้อมูล %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">เรียนรู้เพิ่มเติม</string>
     <string name="BackupsPreferenceFragment__in_progress">อยู่ระหว่างดำเนินการ…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -763,7 +770,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d แล้ว…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% ในตอนนี้…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">เพื่อที่จะสำรองข้อมูล Signal ต้องได้รับอนุญาตให้เข้าถึงที่เก็บข้อมูลภายนอก แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ที่เก็บข้อมูล\"</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">เพื่อที่จะสำรองข้อมูล Molly ต้องได้รับอนุญาตให้เข้าถึงที่เก็บข้อมูลภายนอก แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ที่เก็บข้อมูล\"</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">ตั้งเวลาสำรองข้อมูล</string>
 
@@ -830,7 +837,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">รีเฟรชแชทเซสชันใหม่แล้ว</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal ใช้การเข้ารหัสตั้งแต่ต้นทางถึงปลายทางและอาจต้องเริ่มต้นแชทเซสชันใหม่ให้คุณในบางครั้ง กระบวนการนี้ไม่มีผลต่อความปลอดภัยของแชทคุณ แต่อาจทำให้คุณไม่ได้รับข้อความบางข้อความจากผู้ติดต่อคนนี้ โดยคุณสามารถขอให้ผู้ติดต่อส่งข้อความอีกครั้ง</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly ใช้การเข้ารหัสตั้งแต่ต้นทางถึงปลายทางและอาจต้องเริ่มต้นแชทเซสชันใหม่ให้คุณในบางครั้ง กระบวนการนี้ไม่มีผลต่อความปลอดภัยของแชทคุณ แต่อาจทำให้คุณไม่ได้รับข้อความบางข้อความจากผู้ติดต่อคนนี้ โดยคุณสามารถขอให้ผู้ติดต่อส่งข้อความอีกครั้ง</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">ใช้ Signal บนเดสก์ท็อปหรือ iPad ข้อความของคุณจะซิงค์กับอุปกรณ์ที่เชื่อมโยงอยู่</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">เชื่อมโยงอุปกรณ์เครื่องใหม่</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s ปกป้องข้อความและข้อมูลการแชทด้วยการเข้ารหัสตั้งแต่ต้นทางถึงปลายทางบนอุปกรณ์ทุกเครื่อง</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal บนเดสก์ท็อปหรือ iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">ทุกการส่งและรับข้อความบนอุปกรณ์ที่เชื่อมโยงอยู่นั้นเป็นส่วนตัว</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">ข้อความ Molly จะเริ่มซิงค์กับแอป Molly บนมือถือคุณหลังการเชื่อมโยงอุปกรณ์เสร็จสิ้น ประวัติการส่งข้อความก่อนหน้านั้นจะไม่ปรากฏบนเดสก์ท็อป</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">ไปที่ %1$s เพื่อติดตั้ง Molly บนอุปกรณ์อีกเครื่องของคุณ</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">อุปกรณ์ที่เชื่อมโยงอยู่ของฉัน</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">เลิกเชื่อมโยง</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">ยกเลิกการเชื่อมโยง %1$s แล้ว</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">กำลังเชื่อมโยงอุปกรณ์…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">อนุมัติอุปกรณ์แล้ว</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">กำลังโหลด…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">ไม่มีอุปกรณ์ที่เชื่อมโยงอยู่</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">ปลดล็อกเพื่อเชื่อมโยงอุปกรณ์</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">สแกนคิวอาร์โค้ดที่แสดงอยู่บนอุปกรณ์เพื่อเชื่อมโยง</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">สแกนคิวอาร์โค้ด</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">ใช้อุปกรณ์เครื่องนี้สแกนคิวอาร์โค้ดซึ่งแสดงอยู่บนอุปกรณ์ที่คุณต้องการเชื่อมโยง</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">ตกลง</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">อุปกรณ์เครื่องนี้จะสามารถเห็นกลุ่ม รายชื่อผู้ติดต่อ เข้าถึงแชทของคุณ และส่งข้อความด้วยชื่อของคุณ</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">ดำเนินการเชื่อมโยงให้เสร็จสิ้นบนอุปกรณ์อีกเครื่อง</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">โปรดดำเนินการเชื่อมโยง Molly ให้เสร็จสิ้นบนอุปกรณ์อีกเครื่อง</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">การเชื่อมโยงอุปกรณ์ไม่สำเร็จ</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">รหัสคิวอาร์โค้ดนี้ใช้ไม่ได้ กรุณาตรวจสอบให้แน่ใจว่าคุณได้สแกนรหัสที่แสดงบนอุปกรณ์ที่คุณต้องการเชื่อมโยง</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">ลองใหม่</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">เลิกเชื่อมโยง \'%1$s\' หรือไม่?</string>
@@ -852,10 +914,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">ปรับปรุงการทำงานให้รับกับการไม่มี Play Services</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">อุปกรณ์นี้ไม่รองรับ Play Services แตะเพื่อปิดใช้งานการปรับประสิทธิภาพแบตเตอรีซึ่งจะทำให้ Signal ไม่สามารถรับข้อความได้ในขณะที่ไม่ได้เปิดแอปบนหน้าจอ</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">อุปกรณ์นี้ไม่รองรับ Play Services แตะเพื่อปิดใช้งานการปรับประสิทธิภาพแบตเตอรีซึ่งจะทำให้ Molly ไม่สามารถรับข้อความได้ในขณะที่ไม่ได้เปิดแอปบนหน้าจอ</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Signal รุ่นนี้หมดอายุแล้ว ปรับรุ่นเดี๋ยวนี้เพื่อรับและส่งข้อความ</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Molly รุ่นนี้หมดอายุแล้ว ปรับรุ่นเดี๋ยวนี้เพื่อรับและส่งข้อความ</string>
     <string name="ExpiredBuildReminder_update_now">ปรับรุ่นเดี๋ยวนี้</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -865,8 +927,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">ดู</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">การสื่อสารของ Signal ล้มเหลวอย่างถาวร!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal ไม่สามารถลงทะเบียนกับ Google Play Services การใช้งานข้อความและการโทร Signal ได้ถูกปิดใช้งาน กรุณาลองลงทะเบียนอีกครั้งใน การตั้งค่า &gt; ขั้นสูง</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">การสื่อสารของ Molly ล้มเหลวอย่างถาวร!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly ไม่สามารถลงทะเบียนกับ Google Play Services การใช้งานข้อความและการโทร Molly ได้ถูกปิดใช้งาน กรุณาลองลงทะเบียนอีกครั้งใน การตั้งค่า &gt; ขั้นสูง</string>
 
 
     <!-- GiphyActivity -->
@@ -992,20 +1054,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">บันทึกดีบักจะช่วยให้เราสามารถตรวจสอบและแก้ไขปัญหาได้ โดยที่ในบันทึกจะไม่มีข้อมูลที่ใช้ระบุตัวตน</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">พบปัญหาในการใช้งาน Signal คุณต้องการส่งบันทึกดีบักหรือไม่</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">พบปัญหาในการใช้งาน Molly คุณต้องการส่งบันทึกดีบักหรือไม่</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">การแจ้งเตือนอาจล่าช้าเนื่องจากการเพิ่มประสิทธิภาพแบตเตอรี่</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">คุณสามารถปิดใช้งานการเพิ่มประสิทธิภาพแบตเตอรี่สำหรับแอป Signal เพื่อป้องกันไม่ให้การแจ้งเตือนข้อความความล่าช้าได้</string>
+    <string name="PromptBatterySaverBottomSheet__message">คุณสามารถปิดใช้งานการเพิ่มประสิทธิภาพแบตเตอรี่สำหรับแอป Molly เพื่อป้องกันไม่ให้การแจ้งเตือนข้อความความล่าช้าได้</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">การแจ้งเตือนอาจล่าช้าเนื่องจากการเพิ่มประสิทธิภาพแบตเตอรี่</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">ปิดใช้งานการเพิ่มประสิทธิภาพแบตเตอรี่สำหรับแอป Molly เพื่อป้องกันไม่ให้การแจ้งเตือนข้อความล่าช้า แตะ \"ดำเนินการต่อ\" เพื่อดูคำแนะนำสำหรับอุปกรณ์แต่ละประเภท</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">ไม่ ขอบคุณ</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">ดำเนินการต่อ</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">ดำเนินการต่อ</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">ปิด</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">ไม่ ขอบคุณ</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">คำเชิญเข้ากลุ่มที่รอตอบกลับ</string>
+    <string name="PendingMembersActivity_pending_group_invites">คำขอและคำเชิญ</string>
     <string name="PendingMembersActivity_requests">คำขอ</string>
     <string name="PendingMembersActivity_invites">คำเชิญ</string>
     <string name="PendingMembersActivity_people_you_invited">ผู้คนที่คุณได้เชิญ</string>
@@ -1244,12 +1316,12 @@
     <string name="InviteActivity_cancel">ยกเลิก</string>
     <string name="InviteActivity_sending">กำลังส่ง…</string>
     <string name="InviteActivity_invitations_sent">ส่งคำเชิญแล้ว!</string>
-    <string name="InviteActivity_invite_to_signal">เชิญมาใช้ Signal</string>
+    <string name="InviteActivity_invite_to_signal">เชิญมาใช้ Molly</string>
     <string name="InviteActivity_send_sms">ส่ง SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="other">ส่งคำเชิญทาง %1$dSMS หรือไม่?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">เปลี่ยนมาใช้ Signal กัน: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">เปลี่ยนมาใช้ Molly กัน: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">ดูเหมือนว่าคุณไม่มีแอปอะไรที่จะแบ่งปันได้</string>
 
     <!-- LearnMoreTextView -->
@@ -1263,7 +1335,7 @@
     <string name="LongMessageActivity_your_message">ข้อความของคุณ</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">เปิดใช้งานให้การเชื่อมต่อทำงานเบื้องหลัง</string>
 
     <!-- MediaOverviewActivity -->
@@ -1327,10 +1399,10 @@
     <string name="MessageQuotesBottomSheet_replies">ตอบกลับ</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">กำลังต่อสาย Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">กำลังต่อสาย Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">เริ่มบริการโทร Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">หยุดบริการโทร Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">เริ่มบริการโทร Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">หยุดบริการโทร Molly</string>
     <string name="NotificationBarManager__cancel_call">ยกเลิกการโทร</string>
 
     <!-- NotificationsMegaphone -->
@@ -1574,6 +1646,14 @@
     <string name="MessageRecord_you_activated_payments">คุณเปิดใช้การชำระเงินเรียบร้อยแล้ว</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s สามารถรับการชำระเงินได้แล้ว</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">ไม่สามารถแสดงรายละเอียดการชำระเงิน</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">แตะเพื่อดูเพิ่ม</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">ไม่สามารถแสดงรายละเอียดการชำระเงิน</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">ไม่สามารถแสดงรายละเอียดในการชำระเงินนี้ เนื่องจากข้อความของคุณได้รับการกู้คืนมาจากต้นทางที่ไม่มีประวัติการชำระเงินนี้ อย่างไรก็ตาม นี่จะไม่ส่งผลต่อยอดคงเหลือในกระเป๋าเงินของคุณหรือสถานะของการชำระเงินที่ผ่านมา</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1628,9 +1708,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">อีกไม่นาน คุณจะไม่สามารถส่งข้อความ SMS ด้วย Signal ได้อีกต่อไป ชวน %1$s มาใช้ Signal เพื่อการติดต่อสื่อสารที่ไม่ขาดตอน</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">คุณไม่สามารถส่งข้อความ SMS ด้วย Signal ได้อีกต่อไป ชวน %1$s มาใช้ Signal เพื่อการติดต่อสื่อสารที่ไม่ขาดตอน</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">คุณไม่สามารถส่งข้อความ SMS ด้วย Molly ได้อีกต่อไป ชวน %1$s มาใช้ Molly เพื่อการติดต่อสื่อสารที่ไม่ขาดตอน</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">การชำระเงิน: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">การชำระเงิน</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">รายงานว่าเป็นสแปมแล้ว</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1704,7 +1786,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">เชื่อมโยงกับอุปกรณ์ Signal หรือไม่?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">ดูเหมือนคุณพยายามเชื่อมโยงอุปกรณ์ Signal โดยใช้แอปสแกนภายนอก กรุณาสแกนรหัสอีกครั้งจากภายในแอป Signal ทั้งนี้เพื่อการคุ้มครองตัวคุณเอง</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">เพื่อที่จะสแกนรหัส QR ได้ Signal ต้องได้รับอนุญาตให้เข้าถึงกล้อง แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป และเลือก \"การอนุญาต\" และเปิดใช้งาน \"กล้อง\"</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">เพื่อที่จะสแกนรหัส QR ได้ Molly ต้องได้รับอนุญาตให้เข้าถึงกล้อง แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป และเลือก \"การอนุญาต\" และเปิดใช้งาน \"กล้อง\"</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">ไม่สามารถสแกนรหัส QR ได้หากไม่ได้รับอนุญาตให้เข้าถึงกล้อง</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1716,11 +1798,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">ใส่วลีรหัสผ่าน</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">ไอคอน Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">ไอคอน Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">ส่งวลีรหัสผ่าน</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">วลีรหัสผ่านไม่ถูกต้อง!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">ปลดล็อก Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - หน้าล็อก</string>
+    <string name="PassphrasePromptActivity_unlock_signal">ปลดล็อก Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - หน้าล็อก</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">แผนที่</string>
@@ -1786,7 +1868,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">ตรวจยืนยันเพื่อรับส่งข้อความต่อ</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">เพื่อช่วยป้องกันสแปมบน Signal โปรดตรวจยืนยันให้สำเร็จ</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">เพื่อช่วยป้องกันสแปมบน Molly โปรดตรวจยืนยันให้สำเร็จ</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">หลังตรวจยืนยัน คุณจะรับส่งข้อความได้ต่อ ข้อความใดๆ ที่หยุดอยู่ชั่วคราว จะถูกส่งโดยอัตโนมัติ</string>
 
     <!-- Recipient -->
@@ -1794,7 +1876,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">สตอรี่ของฉัน</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">สาย Signal</string>
+    <string name="Recipient_signal_call">สาย Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">บล็อก</string>
@@ -1808,7 +1890,8 @@
     <string name="RedPhone_ringing">กำลังเรียกสาย…</string>
     <string name="RedPhone_busy">ไม่ว่าง</string>
     <string name="RedPhone_recipient_unavailable">ผู้รับไม่พร้อมใช้งาน</string>
-    <string name="RedPhone_network_failed">เครือข่ายล้มเหลว!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">เครือข่ายล้มเหลว! โปรดตรวจสอบการเชื่อมต่อเครือข่ายและลองอีกครั้ง</string>
     <string name="RedPhone_number_not_registered">หมายเลขยังไม่ได้ลงทะเบียน!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">หมายเลขที่คุณโทรออกไม่รองรับการโทรแบบปลอดภัย</string>
     <string name="RedPhone_got_it">เข้าใจแล้ว</string>
@@ -1819,8 +1902,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">แตะเพื่อเปิดวิดีโอของคุณ</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">เพื่อจะโทรหา %1$s Signal จำเป็นต้องเข้าถึงกล้องของคุณ</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">เพื่อจะโทรหา %1$s Molly จำเป็นต้องเข้าถึงกล้องของคุณ</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">กำลังโทร…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">กำลังเชื่อมต่อใหม่…</string>
@@ -1868,10 +1951,30 @@
     <string name="WebRtcCallActivity__removed_from_call">ถูกลบออกจากการโทร</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">มีผู้ใช้ลบคุณออกจากการโทรนี้</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">อนุญาตให้เข้าถึงกล้องและไมโครโฟนของคุณ</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">อนุญาตให้เข้าถึงไมโครโฟนของคุณ</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">อนุญาตให้เข้าถึงกล้องของคุณ</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">อนุญาตให้ Molly เข้าถึงกล้องและไมโครโฟนของคุณเพื่อเริ่มต้นหรือเข้าร่วมการโทร</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">อนุญาตให้ Molly เข้าถึงไมโครโฟนของคุณเพื่อเริ่มต้นหรือเข้าร่วมการโทร</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">อนุญาตให้ Molly เข้าถึงกล้องของคุณเพื่อเปิดใช้งานวิดีโอ</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly จำเป็นต้องได้รับสิทธิ์เข้าถึงไมโครโฟนเพื่อเริ่มต้นหรือเข้าร่วมการโทร</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly จำเป็นต้องได้รับสิทธิ์เข้าถึงกล้องเพื่อเปิดใช้งานวิดีโอ</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">วิธีการเริ่มต้นหรือเข้าร่วมการโทร:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">วิธีการเปิดใช้งานวิดีโอ:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">โทร Signal</string>
-    <string name="WebRtcCallView__signal_video_call">โทรวิดีโอ Signal</string>
+    <string name="WebRtcCallView__signal_call">โทร Molly</string>
+    <string name="WebRtcCallView__signal_video_call">โทรวิดีโอ Molly</string>
     <string name="WebRtcCallView__start_call">เริ่มโทร</string>
     <string name="WebRtcCallView__join_call">เข้าร่วมการโทร</string>
     <string name="WebRtcCallView__call_is_full">ห้องเต็ม</string>
@@ -1959,18 +2062,35 @@
     <string name="CallOverflowPopupWindow__lower_hand">เอามือลง</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">ยกเลิก</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">คุณยกมือ</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">ดู</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="other">%1$s + %2$d ยกมือ</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s ยกมือ</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s +%2$d ยกมือ</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s ยกมือ</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s +%2$d ยกมือ</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
 
@@ -2055,7 +2175,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">คุณจะได้รับสายโทรเข้าเพื่อยืนยันหมายเลขนี้</string>
     <string name="RegistrationActivity_edit_number">แก้ไขหมายเลข</string>
     <string name="RegistrationActivity_missing_google_play_services">ไม่พบ Google Play Services</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">อุปกรณ์นี้ไม่มี Google Play Services คุณยังสามารถใช้งาน Signal ได้ แต่ในการติดตั้งแบบนี้อาจมีเสถียรภาพหรือประสิทธิภาพที่ลดลง\n\nหากคุณไม่ได้เป็นผู้ใช้งานขั้นสูง หรือไม่ได้ใช้รอมแอนดรอยด์จากผู้ผลิตอื่น หรือเชื่อว่าคุณได้เห็นข้อความนี้เนื่องจากความผิดพลาด โปรดติดต่อ support@signal.org สำหรับความช่วยเหลือในการแก้ปัญหา</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">อุปกรณ์นี้ไม่มี Google Play Services คุณยังสามารถใช้งาน Molly ได้ แต่ในการติดตั้งแบบนี้อาจมีเสถียรภาพหรือประสิทธิภาพที่ลดลง\n\nหากคุณไม่ได้เป็นผู้ใช้งานขั้นสูง หรือไม่ได้ใช้รอมแอนดรอยด์จากผู้ผลิตอื่น หรือเชื่อว่าคุณได้เห็นข้อความนี้เนื่องจากความผิดพลาด โปรดติดต่อ support@molly.im สำหรับความช่วยเหลือในการแก้ปัญหา</string>
     <string name="RegistrationActivity_i_understand">ฉันเข้าใจ</string>
     <string name="RegistrationActivity_play_services_error">ข้อผิดพลาดเกี่ยวกับ Play Services</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services กำลังปรับรุ่นหรือใช้ไม่ได้ชั่วคราว โปรดลองอีกครั้ง</string>
@@ -2073,7 +2193,7 @@
     <string name="RegistrationActivity_non_standard_number_format">ฟอร์แมทหมายเลขที่ไม่มีมาตรฐาน</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">ตัวเลขที่คุณป้อน (%1$s) เป็นฟอร์แมทที่ไม่ได้มาตรฐาน\n\n คุณต้องการใส่ %2$sหรือเปล่า</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - ฟอร์แมทหมายเลขโทรศัพท์</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - ฟอร์แมทหมายเลขโทรศัพท์</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">ส่งคำขอการโทรแล้ว</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2106,8 +2226,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">หากประสบปัญหาในการลงทะเบียน</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• ตรวจสอบว่าโทรศัพท์ของคุณมีสัญญาณมือถือที่จะรับข้อความ SMS หรือสายโทรเข้าได้\n • ตรวจสอบว่าหมายเลขโทรศัพท์ของคุณสามารถรับสายโทรเข้าได้\n • ตรวจสอบว่าคุณใส่หมายเลขโทรศัพท์ถูกต้อง</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">สำหรับข้อมูลเพิ่มเติม โปรดทำตามขั้นตอนการแก้ไขปัญหาที่นี่หรือติดต่อฝ่ายสนับสนุน</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">สำหรับข้อมูลเพิ่มเติม โปรดทำตาม%1$s หรือ%2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">ขั้นตอนการแก้ไขปัญหาที่นี่</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2145,13 +2265,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">เพิ่มลงในรายชื่อผู้ติดต่อ</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">เชิญมาใช้ Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">เชิญมาใช้ Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">ข้อความ Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">สาย Signal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">เพิ่มลงในรายชื่อผู้ติดต่อ</string>
-    <string name="SharedContactView_invite_to_signal">เชิญมาใช้ Signal</string>
+    <string name="SharedContactView_invite_to_signal">เชิญมาใช้ Molly</string>
     <string name="SharedContactView_message">ข้อความ Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2282,11 +2402,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s เป็นหมายเลขโทรศัพท์ของ %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">ปรับรุ่น Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal เวอร์ชันใหม่พร้อมให้บริการแล้ว แตะเพื่ออัปเดต</string>
-    <string name="ApkUpdateNotifications_failed_general_title">อัปเดต Signal ไม่สำเร็จ</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">ปรับรุ่น Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly เวอร์ชันใหม่พร้อมให้บริการแล้ว แตะเพื่ออัปเดต</string>
+    <string name="ApkUpdateNotifications_failed_general_title">อัปเดต Molly ไม่สำเร็จ</string>
     <string name="ApkUpdateNotifications_failed_general_body">เราจะลองใหม่อีกครั้งในภายหลัง</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">อัปเดต Signal เรียบร้อยแล้ว</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">อัปเดต Molly เรียบร้อยแล้ว</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">ได้รับการอัปเดตอัตโนมัติเป็นเวอร์ชัน %1$s เรียบร้อยแล้ว</string>
 
     <!-- UntrustedSendDialog -->
@@ -2356,7 +2476,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">หมายเลขความปลอดภัยของ Signal ของเรา:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">ดูเหมือนคุณไม่มีแอปอะไรที่จะแบ่งปันได้</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">ไม่พบหมายเลขความปลอดภัยที่จะเปรียบเทียบในคลิปบอร์ด</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">เพื่อที่จะสแกนรหัส QR ได้ Signal ต้องได้รับอนุญาตให้เข้าถึงกล้อง แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป และเลือก \"การอนุญาต\" และเปิดใช้งาน \"กล้อง\"</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">เพื่อที่จะสแกนรหัส QR ได้ Molly ต้องได้รับอนุญาตให้เข้าถึงกล้อง แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป และเลือก \"การอนุญาต\" และเปิดใช้งาน \"กล้อง\"</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">สแกนรหัส QR ไม่ได้ หากไม่ได้รับอนุญาตให้เข้าถึงกล้อง</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">คุณจะต้องแลกเปลี่ยนข้อความกันก่อนเพื่อที่จะดูหมายเลขความปลอดภัยของ %1$s</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2386,14 +2506,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">แตะเพื่อเปิด</string>
-    <string name="KeyCachingService_passphrase_cached">Signal ถูกปลดล็อก</string>
-    <string name="KeyCachingService_lock">ล็อก Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly ถูกปลดล็อก</string>
+    <string name="KeyCachingService_lock">ล็อก Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">คุณ</string>
     <string name="MediaPreviewActivity_unssuported_media_type">ชนิดสื่อที่ไม่รองรับ</string>
     <string name="MediaPreviewActivity_draft">ร่าง</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">เพื่อที่จะบันทึกข้อมูลลงที่เก็บข้อมูลภายนอก Signal ต้องได้รับอนุญาตให้เข้าถึงที่เก็บข้อมูล แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ที่เก็บข้อมูล\"</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">เพื่อที่จะบันทึกข้อมูลลงที่เก็บข้อมูลภายนอก Molly ต้องได้รับอนุญาตให้เข้าถึงที่เก็บข้อมูล แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ที่เก็บข้อมูล\"</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">ไม่สามารถบันทึกลงที่เก็บข้อมูลภายนอกได้ หากไม่ได้รับอนุญาต</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">ลบข้อความหรือไม่</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">การดำเนินการนี้จะลบข้อความนี้โดยถาวร</string>
@@ -2435,7 +2555,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">ส่งข้อความล้มเหลว</string>
     <string name="MessageNotifier_error_delivering_message">เกิดข้อผิดพลาดระหว่างส่งข้อความ</string>
     <string name="MessageNotifier_message_delivery_paused">การส่งข้อความถูกหยุดชั่วคราว</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">ตรวจยืนยันเพื่อรับส่งข้อความต่อใน Signal</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">ตรวจยืนยันเพื่อรับส่งข้อความต่อใน Molly</string>
     <string name="MessageNotifier_mark_all_as_read">ทำเครื่องหมายทั้งหมดว่าอ่านแล้ว</string>
     <string name="MessageNotifier_mark_read">ทำเครื่องหมายว่าอ่านแล้ว</string>
     <string name="MessageNotifier_turn_off_these_notifications">ปิดการแจ้งเตือนเหล่านี้</string>
@@ -2457,7 +2577,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">แสดงความรู้สึก %1$s ต่อสติกเกอร์ของคุณ</string>
     <string name="MessageNotifier_this_message_was_deleted">ข้อความนี้ถูกลบแล้ว</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">ปิดการแจ้งเตือนเมื่อผู้ติดต่อได้เข้าร่วม Signal? คุณสามารถเปิดมันได้อีกครั้งในSignal &gt; Settings &gt; Notifications.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">ปิดการแจ้งเตือนเมื่อผู้ติดต่อได้เข้าร่วม Molly? คุณสามารถเปิดมันได้อีกครั้งในMolly &gt; Settings &gt; Notifications.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2496,7 +2616,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">การตอบด่วนใช้ไม่ได้ถ้า Signal ถูกล็อคอยู่</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">การตอบด่วนใช้ไม่ได้ถ้า Molly ถูกล็อคอยู่</string>
     <string name="QuickResponseService_problem_sending_message">เกิดปัญหาในการส่งข้อความ!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2516,7 +2636,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">ปุ่มลัดใช้ไม่ได้</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">ข้อความใหม่</string>
     <string name="SingleRecipientNotificationBuilder_message_request">คำขอส่งข้อความ</string>
     <string name="SingleRecipientNotificationBuilder_you">คุณ</string>
@@ -2561,7 +2681,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">อุปกรณ์เครื่องนี้ไม่ได้ลงทะเบียนอีกต่อไป นี่น่าจะเป็นเพราะคุณลงทะเบียนหมายเลขโทรศัพท์นี้กับ Signal ไว้บนอุปกรณ์เครื่องอื่น</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">อุปกรณ์เครื่องนี้ไม่ได้ลงทะเบียนอีกต่อไป นี่น่าจะเป็นเพราะคุณลงทะเบียนหมายเลขโทรศัพท์นี้กับ Molly ไว้บนอุปกรณ์เครื่องอื่น</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">ลงทะเบียนอุปกรณ์อีกครั้ง</string>
 
@@ -2574,10 +2694,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">หากต้องการรับสาย ต้องให้สิทธิ์ Signal เข้าถึงไมโครโฟนของคุณ</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">หากต้องการรับสาย ต้องให้สิทธิ์ Molly เข้าถึงไมโครโฟนของคุณ</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">อนุญาตให้ Signal เข้าถึงไมโครโฟนและกล้องของคุณเพื่อรับสายวิดีโอคอล</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">เพื่อที่จะโทรออกและรับสาย Signal ต้องได้รับอนุญาตให้เข้าถึงไมโครโฟนและกล้อง แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ไมโครโฟน\" และ \"กล้อง\"</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">อนุญาตให้ Molly เข้าถึงไมโครโฟนและกล้องของคุณเพื่อรับสายวิดีโอคอล</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">เพื่อที่จะโทรออกและรับสาย Molly ต้องได้รับอนุญาตให้เข้าถึงไมโครโฟนและกล้อง แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ไมโครโฟน\" และ \"กล้อง\"</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">มีการรับสายบนอุปกรณ์ที่เชื่อมโยงอยู่</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">ถูกปฏิเสธสายบนอุปกรณ์ที่เชื่อมโยงอยู่</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">ติดสายบนอุปกรณ์ที่เชื่อมโยงอยู่</string>
@@ -2622,16 +2742,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">ใส่วลีรหัสผ่านใหม่อีกครั้ง</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">เชิญมาใช้ Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">เชิญมาใช้ Molly</string>
     <string name="contact_selection_activity__new_group">กลุ่มใหม่</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">รีเฟรชรายชื่อผู้ติดต่อ</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">หากไม่เห็นผู้ติดต่อ ให้ลองกดรีเฟรชรายชื่อ</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">ค้นหาคนที่คุณรู้จักบน Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">อนุญาตให้เข้าถึงรายชื่อผู้ติดต่อของคุณ</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">เพิ่มเติม</string>
 
@@ -2648,7 +2768,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">ภาพของผู้ติดต่อ</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">เพื่อที่จะแสดงผู้ติดต่อของคุณ Signal ต้องได้รับอนุญาตให้เข้าถึงผู้ติดต่อ แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ผู้ติดต่อ\"</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">เพื่อที่จะแสดงผู้ติดต่อของคุณ Molly ต้องได้รับอนุญาตให้เข้าถึงผู้ติดต่อ แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"ผู้ติดต่อ\"</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">เกิดข้อผิดพลาดระหว่างดึงผู้ติดต่อ ตรวจสอบการเชื่อมต่อเครือข่ายของคุณ</string>
     <string name="ContactSelectionListFragment_username_not_found">ไม่พบชื่อผู้ใช้</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"%1$s ไม่ใช่ผู้ใช้ Signal โปรดตรวจสอบชื่อผู้ใช้และลองอีกครั้ง"</string>
@@ -2665,16 +2785,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">ค้นหาด้วยชื่อผู้ใช้</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">อนุญาตให้เข้าถึงรายชื่อผู้ติดต่อ</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">เพื่อค้นหาคนที่คุณรู้จักบน Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">อนุญาตให้เข้าถึง</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">ไม่ ขอบคุณ</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">อนุญาตให้เข้าถึงรายชื่อผู้ติดต่อของคุณ โดยรายชื่อผู้ติดต่อของคุณจะได้รับการเข้ารหัสและไม่ถูกเปิดเผยต่อบริการของ Signal</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal ต้องการเข้าถึงผู้ติดต่อของคุณ เพื่อจะแสดงข้อมูลเหล่านั้นได้</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly ต้องการเข้าถึงผู้ติดต่อของคุณ เพื่อจะแสดงข้อมูลเหล่านั้นได้</string>
     <string name="contact_selection_list_fragment__show_contacts">แสดงผู้ติดต่อ</string>
 
     <!-- contact_selection_list_item -->
@@ -2745,6 +2867,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">คุณลบผู้ใช้คนนี้แล้ว การส่งข้อความหาผู้ใช้อีกครั้งจะเป็นการเพิ่มคนคนนั้นกลับเข้ามาในรายชื่อผู้ติดต่อของคุณ</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">ตัวเลือก</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">อัปเดต</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">เล่น … หยุดชั่วคราว</string>
@@ -2773,7 +2897,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">การแจ้งเตือนข้อความแบบ Bubble เป็นฟีเจอร์ของ Android ที่คุณปิดได้สำหรับการแชทของ Signal</string>
+    <string name="BubbleOptOutTooltip__description">การแจ้งเตือนข้อความแบบ Bubble เป็นฟีเจอร์ของ Android ที่คุณปิดได้สำหรับการแชทของ Molly</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">ไม่ใช่ตอนนี้</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -2934,9 +3058,9 @@
     <string name="EditProfileFragment__group_description">คำอธิบายกลุ่ม</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">ปรับรุ่น Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">ปรับรุ่น Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Signal เวอร์ชันนี้หมดอายุแล้ว อัปเดต Signal ตอนนี้เพื่อใช้งานต่อ</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Molly เวอร์ชันนี้หมดอายุแล้ว อัปเดต Molly ตอนนี้เพื่อใช้งานต่อ</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">ปรับรุ่น</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3152,7 +3276,7 @@
     <string name="preferences__slow">ช้า</string>
     <string name="preferences__help">ช่วยเหลือ</string>
     <string name="preferences__advanced">ขั้นสูง</string>
-    <string name="preferences__donate_to_signal">บริจาคให้ Signal</string>
+    <string name="preferences__donate_to_signal">บริจาคให้ Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">ความเป็นส่วนตัว</string>
     <!-- Preference label for stories -->
@@ -3189,13 +3313,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">เปลี่ยนไอคอนและชื่อของแอปเป็น \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal ต้องปิดแอปก่อน จึงจะเปลี่ยนไอคอนและชื่อของแอปได้ โดยระบบจะแสดงชื่อและไอคอนเริ่มต้นของแอป Signal ในการแจ้งเตือนเสมอ</string>
+    <string name="preferences__app_icon_dialog_description">Molly ต้องปิดแอปก่อน จึงจะเปลี่ยนไอคอนและชื่อของแอปได้ โดยระบบจะแสดงชื่อและไอคอนเริ่มต้นของแอป Molly ในการแจ้งเตือนเสมอ</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">เลือกไอคอนและชื่อของแอป ซึ่งจะแสดงในหน้าจอหลักและลิ้นชักแอปของโทรศัพท์คุณ โดยระบบจะแสดงชื่อและไอคอนเริ่มต้นของแอป Signal ในการแจ้งเตือนเสมอ เรียนรู้เพิ่มเติม</string>
+    <string name="preferences__app_icon_warning_learn_more">เลือกไอคอนและชื่อของแอป ซึ่งจะแสดงในหน้าจอหลักและลิ้นชักแอปของโทรศัพท์คุณ โดยระบบจะแสดงชื่อและไอคอนเริ่มต้นของแอป Molly ในการแจ้งเตือนเสมอ เรียนรู้เพิ่มเติม</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">ไอคอนและชื่อของแอปจะแสดงในหน้าจอหลักและลิ้นชักแอป</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">โดยระบบจะแสดงชื่อและไอคอนเริ่มต้นของแอป Signal ในการแจ้งเตือนเสมอ</string>
+    <string name="preferences__app_icon_notification_warning">โดยระบบจะแสดงชื่อและไอคอนเริ่มต้นของแอป Molly ในการแจ้งเตือนเสมอ</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">เรียนรู้เพิ่มเติม</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3241,8 +3365,12 @@
         <item quantity="other">นี่จะเป็นการตัดการแสดงแชททั้งหมดโดยถาวร ให้เหลือเพียง %1$s ข้อความล่าสุด</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">การดำเนินการนี้จะทำให้ประวัติการส่งข้อความและสื่อในอุปกรณ์ของคุณถูกลบอย่างถาวร</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">การดำเนินการนี้จะทำให้ประวัติการส่งข้อความและสื่อทั้งหมดในอุปกรณ์เครื่องนี้รวมถึงอุปกรณ์ที่เชื่อมโยงอยู่ทุกเครื่องถูกลบอย่างถาวร</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">คุณแน่ใจหรือไม่ว่าต้องการลบประวัติการส่งข้อความทั้งหมด</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">ประวัติการส่งข้อความทั้งหมดจะถูกลบอย่างถาวร การดำเนินการนี้ไม่สามารถยกเลิกได้</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">ประวัติการส่งข้อความทั้งหมดจะถูกลบออกจากอุปกรณ์ทุกเครื่องอย่างถาวร การกระทำนี้ไม่สามารถยกเลิกได้</string>
     <string name="preferences_storage__delete_all_now">ลบทั้งหมดเดี๋ยวนี้</string>
     <string name="preferences_storage__forever">ตลอดไป</string>
     <string name="preferences_storage__one_year">1 ปี</string>
@@ -3278,7 +3406,7 @@
     <string name="preferences_communication__category_censorship_circumvention">การหลบเลี่ยงการปิดกั้น</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">การหลบเลี่ยงการปิดกั้น</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">หากเปิดใช้ Signal จะพยายามหลบเลี่ยงการปิดกั้นข้อมูล อย่าเปิดใช้ความสามารถนี้ เว้นแต่ว่าคุณอยู่ในที่ที่ Signal ถูกปิดกั้น</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">หากเปิดใช้ Molly จะพยายามหลบเลี่ยงการปิดกั้นข้อมูล อย่าเปิดใช้ความสามารถนี้ เว้นแต่ว่าคุณอยู่ในที่ที่ Molly ถูกปิดกั้น</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">การหลบเลี่ยงการปิดกั้นถูกเปิดใช้ เนื่องจากหมายเลขโทรศัพท์ของบัญชีของคุณ</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3330,7 +3458,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">ขอแนะนำการชำระเงิน</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">ใช้ Signal เพื่อส่งและรับ MobileCoin ซึ่งเป็นสกุลเงินดิจิทัลใหม่ที่เน้นความเป็นส่วนตัว เปิดใช้งานเพื่อเริ่มต้น</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">ใช้ Molly เพื่อส่งและรับ MobileCoin ซึ่งเป็นสกุลเงินดิจิทัลใหม่ที่เน้นความเป็นส่วนตัว เปิดใช้งานเพื่อเริ่มต้น</string>
     <string name="PaymentsHomeFragment__activate_payments">ใช้การชำระเงิน</string>
     <string name="PaymentsHomeFragment__activating_payments">กำลังเปิดใช้การชำระเงิน…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">เรียกคืนบัญชีชำระเงิน</string>
@@ -3356,7 +3484,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">การชำระเงินไม่มีให้ใช้ในภูมิภาคของคุณ</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">ไม่สามารถเปิดใช้งานการชำระเงินได้ ลองอีกครั้งภายหลัง</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">หยุดใช้การจ่ายเงินหรือไม่?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">คุณจะไม่สามารถส่งหรือรับ Mobilecoin ใน Signal ได้ ถ้าคุณปิดใช้งานการชำระเงิน</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">คุณจะไม่สามารถส่งหรือรับ Mobilecoin ใน Molly ได้ ถ้าคุณปิดใช้งานการชำระเงิน</string>
     <string name="PaymentsHomeFragment__deactivate">หยุดใช้</string>
     <string name="PaymentsHomeFragment__continue">ทำต่อ</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">ไม่มียอดคงเหลือในขณะนี้</string>
@@ -3365,10 +3493,10 @@
     <string name="PaymentsHomeFragment__details">รายละเอียด</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">คุณสามารถใช้ Signal เพื่อส่งและรับ MobileCoin การชำระเงินทั้งหมดอยู่ภายใต้เงื่อนไขการใช้งานสำหรับ MobileCoin และ MobileCoin Wallet คุณอาจพบปัญหาบางประการ และการชำระเงินหรือยอดคงเหลืออาจสูญหายไปโดยกู้คืนมาไม่ได้ </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">คุณสามารถใช้ Molly เพื่อส่งและรับ MobileCoin การชำระเงินทั้งหมดอยู่ภายใต้เงื่อนไขการใช้งานสำหรับ MobileCoin และ MobileCoin Wallet คุณอาจพบปัญหาบางประการ และการชำระเงินหรือยอดคงเหลืออาจสูญหายไปโดยกู้คืนมาไม่ได้ </string>
     <string name="PaymentsHomeFragment__activate">เปิดใช้</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">ดูเงื่อนไข MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">ไม่สามารถชำระเงินใน Signal ได้อีกต่อไป คุณยังสามารถโอนเงินไปยังตลาดหลักทรัพย์ได้ แต่คุณจะไม่สามารถส่งและรับการชำระเงินหรือเพิ่มเงินได้อีก</string>
+    <string name="PaymentsHomeFragment__payments_not_available">ไม่สามารถชำระเงินใน Molly ได้อีกต่อไป คุณยังสามารถโอนเงินไปยังตลาดหลักทรัพย์ได้ แต่คุณจะไม่สามารถส่งและรับการชำระเงินหรือเพิ่มเงินได้อีก</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3396,7 +3524,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">การอนุญาตสิทธิ์</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">เพื่อให้คุณสามารถส่งข้อความหาผู้ติดต่อที่รู้จัก Signal จะขอสิทธิ์การเข้าถึงต่อไปนี้ </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">เพื่อให้คุณสามารถส่งข้อความหาผู้ติดต่อที่รู้จัก Molly จะขอสิทธิ์การเข้าถึงต่อไปนี้ </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">การแจ้งเตือน</string>
     <!-- Notifications permission row description -->
@@ -3484,10 +3612,10 @@
     <string name="PaymentsTransferFragment__next">ถัดไป</string>
     <string name="PaymentsTransferFragment__invalid_address">ที่อยู่ไม่ถูกต้อง</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">ตรวจสอบที่อยู่กระเป๋าเงินที่คุณพยายามจะโอนเงินไปและลองอีกครั้ง</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">คุณไม่สามารถโอนไปยังที่อยู่กระเป๋าเงิน Signal ของคุณเองได้ ป้อนที่อยู่กระเป๋าเงินจากบัญชีของคุณที่ตลาดหลักทรัพย์ที่รองรับ</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">เพื่อสแกนรหัส QR Signal จำเป็นต้องเข้าถึงกล้องของคุณ</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal ต้องได้รับอนุญาตให้เข้าถึงกล้องเพื่อจับภาพรหัส QR ไปที่การตั้งค่า เลือก \"การอนุญาต\" และเปิดใช้งาน \"กล้อง\"</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">เพื่อสแกนรหัส QR Signal จำเป็นต้องเข้าถึงกล้องของคุณ</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">คุณไม่สามารถโอนไปยังที่อยู่กระเป๋าเงิน Molly ของคุณเองได้ ป้อนที่อยู่กระเป๋าเงินจากบัญชีของคุณที่ตลาดหลักทรัพย์ที่รองรับ</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">เพื่อสแกนรหัส QR Molly จำเป็นต้องเข้าถึงกล้องของคุณ</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly ต้องได้รับอนุญาตให้เข้าถึงกล้องเพื่อจับภาพรหัส QR ไปที่การตั้งค่า เลือก \"การอนุญาต\" และเปิดใช้งาน \"กล้อง\"</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">เพื่อสแกนรหัส QR Molly จำเป็นต้องเข้าถึงกล้องของคุณ</string>
     <string name="PaymentsTransferFragment__settings">การตั้งค่า</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3826,17 +3954,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">สายโทรเสียง Signal ขาเข้า</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">สายโทรเสียง Molly ขาเข้า</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">วิดีโอคอล Signal ขาเข้า</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">วิดีโอคอล Molly ขาเข้า</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">โทรกลุ่ม Signal ที่กำลังเรียกเข้า</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">โทรกลุ่ม Molly ที่กำลังเรียกเข้า</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">สายโทรเสียง Signal ที่ใช้งานอยู่</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">สายโทรเสียง Molly ที่ใช้งานอยู่</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">วิดีโอคอล Signal ที่ใช้งานอยู่</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">วิดีโอคอล Molly ที่ใช้งานอยู่</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">สายโทรกลุ่ม Signal ที่ใช้งานอยู่</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">สายโทรกลุ่ม Molly ที่ใช้งานอยู่</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">กำลังโหลด…</string>
@@ -3883,9 +4011,9 @@
     <string name="BackupDialog_verify">ตรวจยืนยัน</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">คุณได้ป้อนวลีรหัสผ่านสำหรับข้อมูลสำรองของคุณเสร็จแล้ว</string>
     <string name="BackupDialog_passphrase_was_not_correct">วลีรหัสผ่านไม่ถูกต้อง</string>
-    <string name="LocalBackupJob_creating_signal_backup">กำลังสร้างข้อมูลสำรอง Signal…</string>
+    <string name="LocalBackupJob_creating_signal_backup">กำลังสร้างข้อมูลสำรอง Molly…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">กำลังตรวจยืนยันข้อมูลสำรอง Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">กำลังตรวจยืนยันข้อมูลสำรอง Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">สำรองข้อมูลไม่สำเร็จ</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">ไดเรกทอรีสำหรับข้อมูลสำรองของคุณถูกลบหรือย้าย</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">แฟ้มสำรองของคุณใหญ่เกินที่จะจัดเก็บไว้ในนี้ได้</string>
@@ -3900,15 +4028,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">โทรหาฉัน (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">ส่งรหัสอีกครั้งใน (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">ติดต่อทีมซัพพอร์ตของ Signal</string>
-    <string name="RegistrationActivity_code_support_subject">การลงทะเบียน Signal - รหัสตรวจยืนยันสำหรับ Android</string>
+    <string name="RegistrationActivity_contact_signal_support">ติดต่อทีมซัพพอร์ตของ Molly</string>
+    <string name="RegistrationActivity_code_support_subject">การลงทะเบียน Molly - รหัสตรวจยืนยันสำหรับ Android</string>
     <string name="RegistrationActivity_incorrect_code">รหัสไม่ถูกต้อง</string>
     <string name="BackupUtil_never">ไม่เลย</string>
     <string name="BackupUtil_unknown">ไม่ทราบ</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">หมายเลขโทรศัพท์</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">เลือกว่าจะให้ใครเห็นหมายเลขโทรศัพท์ของคุณและใช้หมายเลขโทรศัพท์นั้นติดต่อคุณบน Signal ได้</string>
+    <string name="preferences_app_protection__choose_who_can_see">เลือกว่าจะให้ใครเห็นหมายเลขโทรศัพท์ของคุณและใช้หมายเลขโทรศัพท์นั้นติดต่อคุณบน Molly ได้</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">คนที่สามารถเห็นหมายเลขโทรศัพท์ของฉัน</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -3956,7 +4084,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">คุณได้พยายามหลายครั้งเกินไป โปรดลองใหม่ในภายหลัง</string>
     <string name="RegistrationActivity_error_connecting_to_service">เกิดข้อผิดพลาดในการเชื่อมต่อกับบริการ</string>
     <string name="preferences_chats__backups">ข้อมูลสำรอง</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal ได้ถูกล็อก</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly ได้ถูกล็อก</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">แตะเพื่อปลดล็อก</string>
     <string name="Recipient_unknown">ไม่ทราบ</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -3987,9 +4115,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">คุณจะต้องสามารถเข้าถึงอุปกรณ์เครื่องเก่าของคุณได้</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">กู้คืนจากข้อมูลสำรอง</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">กู้คืนข้อความของคุณจากข้อมูลสำรองในเครื่อง หากคุณไม่กู้คืนตอนนี้ คุณจะไม่สามารถกู้คืนได้อีกในภายหลัง</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">กู้คืนข้อมูลสำรองจากอุปกรณ์</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">กู้คืนข้อมูลสำรองจาก Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">กู้คืนข้อความทั้งหมดของคุณ + ไฟล์สื่อจาก 30 วันที่ผ่านมา</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">ตัวเลือกเพิ่มเติม</string>
 
+    <string name="TransferOrRestoreFragment__cancel">ยกเลิก</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">เข้าสู่ระบบโดยไม่ถ่ายโอนข้อมูล</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">ดำเนินการต่อโดยไม่ถ่ายโอนข้อความและไฟล์สื่อของคุณ</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">เปิด Signal บนโทรศัพท์ Android เครื่องเก่าของคุณ</string>
     <string name="NewDeviceTransferInstructions__continue">ทำต่อ</string>
@@ -4004,19 +4139,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">กำลังเตรียมเชื่อมต่อไปยังอุปกรณ์ Android เครื่องเก่า</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">จะพร้อมในไม่ช้า กรุณารอสักครู่</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">กำลังรอการเชื่อมต่อจากอุปกรณ์ Android เครื่องเก่า</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal จำเป็นต้องได้รับอนุญาตในการเข้าถึงตำแหน่งของคุณเพื่อค้นหาและเชื่อมต่ออุปรกณ์ Android เครื่องเก่าของคุณ</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal จำเป็นต้องเปิดใช้งานบริการการเข้าถึงตำแหน่งของคุณเพื่อค้นหาและเชื่อมต่ออุปรกณ์ Android เครื่องเก่าของคุณ</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal จำเป็นต้องเปิด Wi-Fi- เพื่อค้นหาและเชื่อมต่อกับอุปกรณ์ Android เครื่องเก่าของคุณ ซึ่ง Wi-Fi จำเป้นต้องเปิดไว้แต่ไม่จำเป็นต้องเชื่อมต่อกับเครือข่าย Wi-Fi</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">ขออภัย อุปกรณ์ของคุณไม่รองรับ Wi-Fi Direct โดย Signal จะใช้ Wi-Fi Direct เพื่อค้นหาและเชื่อมต่อกับอุปกรณ์ Android เครื่องเก่าของคุณ คุณจะยังสามารถกู้คืนข้อมูลสำรองเพื่อกู้คืนบัญชีผู้ใช้ของคุณจากอุปกรณ์ Android เครื่องเก่าของคุณ</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly จำเป็นต้องได้รับอนุญาตในการเข้าถึงตำแหน่งของคุณเพื่อค้นหาและเชื่อมต่ออุปรกณ์ Android เครื่องเก่าของคุณ</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly จำเป็นต้องเปิดใช้งานบริการการเข้าถึงตำแหน่งของคุณเพื่อค้นหาและเชื่อมต่ออุปรกณ์ Android เครื่องเก่าของคุณ</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly จำเป็นต้องเปิด Wi-Fi- เพื่อค้นหาและเชื่อมต่อกับอุปกรณ์ Android เครื่องเก่าของคุณ ซึ่ง Wi-Fi จำเป้นต้องเปิดไว้แต่ไม่จำเป็นต้องเชื่อมต่อกับเครือข่าย Wi-Fi</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">ขออภัย อุปกรณ์ของคุณไม่รองรับ Wi-Fi Direct โดย Molly จะใช้ Wi-Fi Direct เพื่อค้นหาและเชื่อมต่อกับอุปกรณ์ Android เครื่องเก่าของคุณ คุณจะยังสามารถกู้คืนข้อมูลสำรองเพื่อกู้คืนบัญชีผู้ใช้ของคุณจากอุปกรณ์ Android เครื่องเก่าของคุณ</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">กู้คืนข้อมูลสำรอง</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">เกิดความผิดพลาดที่ไม่คาดคิดขึ้นขณะที่พยายามจะเชื่อมต่อกับอุปกรณ์ Android เครื่องเก่าของคุณ</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">กำลังค้นหาอุปกรณ์ Android เครื่องใหม่…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal จำเป็นต้องได้รับอนุญาตในการเข้าถึงตำแหน่งของคุณเพื่อค้นหาและเชื่อมต่ออุปรกณ์ Android เครื่องใหม่ของคุณ</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal จำเป็นต้องเปิดใช้งานบริการการเข้าถึงตำแหน่งของคุณเพื่อค้นหาและเชื่อมต่ออุปรกณ์ Android เครื่องใหม่ของคุณ</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal จำเป็นต้องเปิด Wi-Fi- เพื่อค้นหาและเชื่อมต่อกับอุปกรณ์ Android เครื่องใหม่ของคุณ ซึ่ง Wi-Fi จำเป้นต้องเปิดไว้แต่ไม่จำเป็นต้องเชื่อมต่อกับเครือข่าย Wi-Fi</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">ขออภัย อุปกรณ์ของคุณไม่รองรับ Wi-Fi Direct โดย Signal จะใช้ Wi-Fi Direct เพื่อค้นหาและเชื่อมต่อกับอุปกรณ์ Android เครื่องใหม่ของคุณ คุณจะยังสามารถกู้คืนข้อมูลสำรองเพื่อกู้คืนบัญชีผู้ใช้ของคุณจากอุปกรณ์ Android เครื่องใหม่ของคุณ</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly จำเป็นต้องได้รับอนุญาตในการเข้าถึงตำแหน่งของคุณเพื่อค้นหาและเชื่อมต่ออุปรกณ์ Android เครื่องใหม่ของคุณ</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly จำเป็นต้องเปิดใช้งานบริการการเข้าถึงตำแหน่งของคุณเพื่อค้นหาและเชื่อมต่ออุปรกณ์ Android เครื่องใหม่ของคุณ</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly จำเป็นต้องเปิด Wi-Fi- เพื่อค้นหาและเชื่อมต่อกับอุปกรณ์ Android เครื่องใหม่ของคุณ ซึ่ง Wi-Fi จำเป้นต้องเปิดไว้แต่ไม่จำเป็นต้องเชื่อมต่อกับเครือข่าย Wi-Fi</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">ขออภัย อุปกรณ์ของคุณไม่รองรับ Wi-Fi Direct โดย Molly จะใช้ Wi-Fi Direct เพื่อค้นหาและเชื่อมต่อกับอุปกรณ์ Android เครื่องใหม่ของคุณ คุณจะยังสามารถกู้คืนข้อมูลสำรองเพื่อกู้คืนบัญชีผู้ใช้ของคุณจากอุปกรณ์ Android เครื่องใหม่ของคุณ</string>
     <string name="OldDeviceTransferSetup__create_a_backup">สร้างข้อมูลสำรอง</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">เกิดความผิดพลาดที่ไม่คาดคิดขึ้นขณะที่พยายามจะเชื่อมต่อกับอุปกรณ์ Android เครื่องใหม่ของคุณ</string>
 
@@ -4057,7 +4192,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">กำลังถ่ายโอนข้อมูล</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">ทำให้แน่ใจว่าอุปกรณ์ทั้งคู่อยู่ใกล้กัน อย่าปิดเครื่องใด และให้เปิด Signal อยู่ตลอดเวลา การถ่ายโอนนั้นจะถูกเข้ารหัสลับตั้งแต่ต้นทางถึงปลายทาง</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">ทำให้แน่ใจว่าอุปกรณ์ทั้งคู่อยู่ใกล้กัน อย่าปิดเครื่องใด และให้เปิด Molly อยู่ตลอดเวลา การถ่ายโอนนั้นจะถูกเข้ารหัสลับตั้งแต่ต้นทางถึงปลายทาง</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d ข้อความจนถึงตอนนี้…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% ของข้อความในตอนนี้…</string>
@@ -4071,7 +4206,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">ถ่ายโอนบัญชี</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">ดาวน์โหลด Signal บนอุปกรณ์ Android เครื่องใหม่ของคุณ</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">ดาวน์โหลด Molly บนอุปกรณ์ Android เครื่องใหม่ของคุณ</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"แตะบน \"ถ่ายโอนหรือกู้คืนบัญชี\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4145,7 +4280,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">ทุกคนที่มีลิงก์นี้สามารถมองเห็นชื่อกลุ่ม รูปกลุ่ม และสามารถขอเข้าร่วมกลุ่มได้ แบ่งปันลิงก์นี้ให้กับผู้คนที่คุณไว้ใจ</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">ทุกคนที่มีลิงก์นี้สามารถมองเห็นชื่อกลุ่ม รูปกลุ่ม และสามารถขอเข้าร่วมกลุ่มได้ แบ่งปันลิงก์นี้ให้กับผู้คนที่คุณไว้ใจ</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">แบ่งปันผ่าน Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">แบ่งปันผ่าน Molly</string>
     <string name="GroupLinkBottomSheet_copy">คัดลอก</string>
     <string name="GroupLinkBottomSheet_qr_code">รหัส QR</string>
     <string name="GroupLinkBottomSheet_share">แบ่งปัน</string>
@@ -4324,7 +4459,7 @@
     <string name="payment_info_card_about_mobilecoin">เกี่ยวกับ MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin เป็นเงินดิจิทัลสกุลใหม่ที่เน้นเรื่องความเป็นส่วนตัว</string>
     <string name="payment_info_card_adding_funds">การเติมเงิน</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">คุณสามารถเพิ่มเงินสำหรับใช้ใน Signal ได้โดยการส่ง MobileCoin ไปยังที่อยู่กระเป๋าเงินของคุณ</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">คุณสามารถเพิ่มเงินสำหรับใช้ใน Molly ได้โดยการส่ง MobileCoin ไปยังที่อยู่กระเป๋าเงินของคุณ</string>
     <string name="payment_info_card_cashing_out">การถอนออกเป็นเงินสด</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">คุณสามารถถอน MobileCoin เป็นเงินสดได้ตลอดเวลาในตลาดหลักทรัพย์ที่รองรับ MobileCoin เพียงแค่โอนเงินไปยังบัญชีในตลาดหลักทรัพย์นั้น</string>
     <string name="payment_info_card_hide_this_card">ซ่อนบัตรนี้หรือไม่?</string>
@@ -4345,12 +4480,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">หยุดใช้กระเป๋าเงิน</string>
     <string name="DeactivateWalletFragment__your_balance">ยอดของคุณ</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">ขอแนะนำให้คุณโอนเงินของคุณไปยังที่อยู่กระเป๋าเงินอื่นก่อนปิดใช้งานการชำระเงิน หากคุณเลือกที่จะไม่โอนเงินตอนนี้ เงินจะคงอยู่ในกระเป๋าเงินที่เชื่อมโยงกับ Signal หากคุณกลับมาเปิดใช้งานการชำระเงินอีกครั้ง</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">ขอแนะนำให้คุณโอนเงินของคุณไปยังที่อยู่กระเป๋าเงินอื่นก่อนปิดใช้งานการชำระเงิน หากคุณเลือกที่จะไม่โอนเงินตอนนี้ เงินจะคงอยู่ในกระเป๋าเงินที่เชื่อมโยงกับ Molly หากคุณกลับมาเปิดใช้งานการชำระเงินอีกครั้ง</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">โอนยอดคงเหลือที่เหลือ</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">หยุดใช้งานโดยไม่ถ่ายโอน</string>
     <string name="DeactivateWalletFragment__deactivate">หยุดใช้</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">หยุดใช้งานโดยไม่ถ่ายโอนหรือไม่?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">ยอดคงเหลือจะคงอยู่ในกระเป๋าเงินของคุณที่เชื่อมโยงกับ Signal หากคุณเลือกกลับมาเปิดใช้งานการชำระเงินอีกครั้ง</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">ยอดคงเหลือจะคงอยู่ในกระเป๋าเงินของคุณที่เชื่อมโยงกับ Molly หากคุณเลือกกลับมาเปิดใช้งานการชำระเงินอีกครั้ง</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">เกิดข้อผิดพาดในการปิดใช้งานกระเป๋าเงิน</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4643,7 +4778,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">ใบอนุญาต</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">เงื่อนไขและนโยบายความเป็นส่วนตัว</string>
-    <string name="HelpFragment__copyright_signal_messenger">ลิขสิทธิ์ Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">ลิขสิทธิ์ Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">เผยแพร่ภายใต้สัญญาอนุญาต GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4658,7 +4793,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">อัตโนมัติ</string>
+    <string name="ChatColorSelectionFragment__auto">ออโต้</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">ใช้สีที่กำหนดเอง</string>
     <string name="ChatColorSelectionFragment__chat_color">สีแชท</string>
     <string name="ChatColorSelectionFragment__edit">แก้ไข</string>
@@ -4881,9 +5016,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">เลือกสี</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">แบ่งปัน</string>
 
@@ -4913,7 +5045,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">เฉพาะผู้ดูแลเท่านั้นที่ส่งข้อความไปยังกลุ่มนี้ได้</string>
-    <string name="MultiselectForwardFragment__limit_reached">ถึงขีดจำกัดแล้ว</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">ไม่สามารถเลือกเกิน 5 แชท</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5088,9 +5221,9 @@
     <string name="MySupportPreference__learn_more">เรียนรู้เพิ่มเติม</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">ปรับรุ่น Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">ปรับรุ่น Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Signal เวอร์ชันนี้หมดอายุแล้ว อัปเดต Signal ตอนนี้เพื่อใช้งานต่อ</string>
+    <string name="UpdateSignalExpiredDialog__message">Molly เวอร์ชันนี้หมดอายุแล้ว อัปเดต Molly ตอนนี้เพื่อใช้งานต่อ</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">ปรับรุ่น</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5099,7 +5232,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">อุปกรณ์ไม่ได้ลงทะเบียน</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">อุปกรณ์เครื่องนี้ไม่ได้ลงทะเบียนอีกต่อไป โปรดลงทะเบียนอีกครั้งเพื่อใช้งาน Signal บนอุปกรณ์เครื่องนี้</string>
+    <string name="ReregisterSignalDialog__message">อุปกรณ์เครื่องนี้ไม่ได้ลงทะเบียนอีกต่อไป โปรดลงทะเบียนอีกครั้งเพื่อใช้งาน Molly บนอุปกรณ์เครื่องนี้</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">ลงทะเบียนอีกรอบ</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5393,7 +5526,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">การเปิดตัวเลือกล้มเหลว</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">เปิดใช้งานโดยอนุญาตให้ Signal ได้รับสิทธิ์การเข้าถึงเพื่อแสดงการแจ้งเตือน</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">เปิดใช้งานโดยอนุญาตให้ Molly ได้รับสิทธิ์การเข้าถึงเพื่อแสดงการแจ้งเตือน</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">เปิดใช้งาน</string>
 
@@ -5539,8 +5672,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">ยังไม่มีการตอบกลับ</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">คุณไม่สามารถตอบกลับสตอรี่นี้ได้ เนื่องจากคุณไม่ได้เป็นสมาชิกในกลุ่มนี้แล้ว</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">แสดงความรู้สึกต่อสตอรี่</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">แสดงความรู้สึกต่อสตอรี่</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">แสดงความรู้สึกต่อสตอรี่</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">รับชม</string>
     <!-- Label for story replies tab -->
@@ -6140,8 +6275,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">เลือกธนาคาร</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">ยืนยันการบริจาคผ่าน %1$s ของคุณ</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">แตะดำเนินการต่อเพื่อตั้งการบริจาครายเดือนของคุณ โดยคุณจะถูกเรียกเก็บเงิน €0,01 จากทางธนาคาร ซึ่งยอดดังกล่าวจะถูกโอนกลับคืนเข้าบัญชีโดยอัตโนมัติ และการบริจาคจำนวน €5/เดือนจะถูกหักจากบัญชีของคุณ</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">แตะดำเนินการต่อเพื่อตั้งการบริจาครายเดือนของคุณ โดยคุณจะถูกเรียกเก็บเงิน €0,01 จากทางธนาคาร ซึ่งยอดดังกล่าวจะถูกโอนกลับคืนเข้าบัญชีโดยอัตโนมัติ และการบริจาคจำนวน %1$s/เดือนจะถูกหักจากบัญชีของคุณ</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">ดำเนินการต่อ</string>
 
@@ -6710,6 +6845,50 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">กำลังดาวน์โหลดข้อมูลสำรอง…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">การสำรองข้อมูลสื่อปิดใช้งานอยู่</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="other">แพ็กเกจสำรองข้อมูลสื่อของคุณถูกยกเลิกเนื่องจาก Signal ประมวลผลการชำระเงินของคุณไม่ได้ คุณมีเวลา %1$d วันในการดาวน์โหลดไฟล์สื่อที่เก็บอยู่ในข้อมูลสำรอง โดยหลังจาก %1$d วันนั้น ไฟล์สื่อที่คุณสำรองข้อมูลไว้จะถูกลบ</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">หากต้องการสำรองข้อมูลสื่อต่อ คุณสามารถเริ่มชำระเงินเพื่อสำรองข้อมูลอีกครั้งได้ทุกเมื่อ </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">สื่อของคุณจะถูกลบวันนี้</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">แพ็กเกจสำรองข้อมูลสื่อของคุณถูกยกเลิกเนื่องจาก Signal ประมวลผลการชำระเงินของคุณไม่ได้ นี่เป็นโอกาสสุดท้ายที่คุณจะสามารถดาวน์โหลดไฟล์สื่อที่เก็บอยู่ในข้อมูลสำรองก่อนที่ข้อมูลจะถูกลบ</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">การดาวน์โหลดไม่เสร็จสมบูรณ์</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">อุปกรณ์ของคุณมีพื้นที่จัดเก็บไม่เพียงพอ เพิ่มพื้นที่จัดเก็บ %1$s เพื่อดาวน์โหลดไฟล์สื่อในข้อมูลสำรองของคุณ</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="other">หากคุณเลือก \"ข้าม\" ไฟล์สื่อในข้อมูลสำรองของคุณจะถูกลบใน %1$d วัน</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">ไม่สามารถดำเนินการชำระเงินค่าสำรองข้อมูลได้</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">เราประสบปัญหาในการเรียกเก็บเงินค่าสำรองข้อมูลรายเดือนของคุณ โปรดตรวจสอบให้แน่ใจว่าคุณอัปเดตวิธีการชำระเงินแล้ว โดยสามารถไปที่ Google Pay ในกรณีที่ยังไม่ได้อัปเดต และ Signal จะลองประมวลผลการชำระเงินอีกครั้งในอีก 2-3 วัน</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">การสำรองข้อมูลไม่เสร็จสมบูรณ์</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">อุปกรณ์ของคุณไม่ได้ดำเนินการสำรองข้อมูลเป็นเวลา %1$d วัน โปรดตรวจสอบว่าอุปกรณ์เชื่อมต่อกับ Wi-Fi แล้วแตะ \"สำรองข้อมูลเดี๋ยวนี้\" </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">เรียนรู้เพิ่มเติม</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">ข้าม</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">ดาวน์โหลดสื่อเดี๋ยวนี้</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">ดาวน์โหลดภายหลัง</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">ไม่ต้องดาวน์โหลดสื่อ</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">เพิ่มพื้นที่จัดเก็บ %1$s เพื่อดาวน์โหลดไฟล์สื่อของคุณ</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">บัตรเครดิตหรือบัตรเดบิต</string>
@@ -6723,6 +6902,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">ไม่ทราบ</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">ประวัติการชำระเงิน</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">คุณสำรองข้อมูลครั้งล่าสุดเมื่อวันที่ %1$s เวลา %2$s</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6733,6 +6918,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">ข้อความที่เก่ากว่าช่วงเวลาที่เลือกจะถูกลบอย่างถาวร</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">ข้อความที่เกินจากจำนวนที่เลือกจะถูกลบอย่างถาวร</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">ใช้การตั้งค่าการจำกัดข้อความในแชทกับอุปกรณ์ที่เชื่อมโยงอยู่</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">หากเปิดใช้งาน ระบบจะลบข้อความออกจากอุปกรณ์ที่เชื่อมโยงอยู่ตามการตั้งค่าการจำกัดข้อความในแชทสูงสุด</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">การลบซิงค์เข้ากับอุปกรณ์ทุกเครื่องของคุณแล้ว</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">เมื่อคุณลบข้อความหรือแชท ข้อมูลนั้นจะถูกลบออกจากโทรศัพท์และอุปกรณ์ที่เชื่อมโยงอยู่</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">ตกลง</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">ประวัติการชำระเงิน</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">สำรองข้อความและสื่อทั้งหมด</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">รายละเอียดการชำระเงิน</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">ประเภทของการสำรองข้อมูล</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">วันที่ชำระ</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">แชร์</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">การสำรองข้อมูลของ Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">ประวัติการชำระเงิน</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">รายละเอียดการสำรองข้อมูล</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">ขนาดของข้อมูลสำรอง</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">ความถี่ในการสำรองข้อมูล</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">สำรองข้อมูลขณะใช้อินเทอร์เน็ตมือถือ</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">ปิดใช้งานและลบข้อมูลสำรอง</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">ลบข้อมูลสำรองและปิดใช้งานแล้ว</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">เปลี่ยนประเภทของการสำรองข้อมูลและยกเลิกการสมัครแล้ว</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">ยกเลิกการสมัครแล้ว</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">ดาวน์โหลดเสร็จสิ้น</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">ประเภทของการสำรองข้อมูล</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">การสำรองข้อมูลถูกปิดใช้งาน</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/เดือน</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">เปิดใช้การสำรองข้อมูล</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">การสำรองข้อมูลครั้งล่าสุด</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s เวลา %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">ไม่เลย</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">สำรองข้อมูลเดี๋ยวนี้</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">ปิดใช้งานและลบข้อมูลสำรองใช่หรือไม่</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">คุณจะไม่ถูกเรียกเก็บเงินอีก ข้อมูลสำรองของคุณจะถูกลบและระบบจะไม่สำรองข้อมูลใหม่ขึ้นอีก</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">ปิดใช้งานและลบ</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">กำลังลบข้อมูลสำรอง…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">ลบข้อมูลสำรองแล้ว</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"โดยแตะ \"สำรองข้อมูลเดี๋ยวนี้\""</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">ทุกวัน</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">ทุกสัปดาห์</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">ทุกเดือน</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">สำรองข้อมูลด้วยตัวเอง</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">โปรดใส่ PIN, รหัสผ่าน หรือรูปแบบการวาดเส้นของอุปกรณ์คุณ</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">ดำเนินการต่อ</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">เปลี่ยนประเภทของการสำรองข้อมูล</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">ยกเลิกการเป็นสมาชิก</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">ยืนยันการยกเลิก</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">คุณจะไม่ถูกเรียกเก็บเงินอีก การสำรองข้อมูลจะถูกปิดใช้งานเมื่อสิ้นสุดรอบการเรียกเก็บเงิน หลังจากวันที่กำหนดดังกล่าว คุณจะมีเวลา 30 วันในการดาวน์โหลดไฟล์สื่อที่สำรองข้อมูลเอาไว้</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">ยืนยันและดาวน์โหลดเดี๋ยวนี้</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">ยืนยันและดาวน์โหลดภายหลัง</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">สมัครใช้บริการต่อไป</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
index 213824a20c..5cefaa7aa7 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Nag-u-update ang Signal…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Nag-u-update ang Molly…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Hindi ka pa nagset ng passphrase!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">I-disable ang passphrase?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Permanente nitong i-u-unlock ang Signal at ang message notifications.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Permanente nitong i-u-unlock ang Molly at ang message notifications.</string>
     <string name="ApplicationPreferencesActivity_disable">I-disable</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Nagka-error sa pagkonekta sa server!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">Required ang PIN para sa registration lock. Para mag-disable ng PIN, paki disable muna ang registration lock.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">File</string>
     <string name="AttachmentKeyboard_contact">Kontakin</string>
     <string name="AttachmentKeyboard_location">Lokasyon</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Kailangan ng Signal ng pahintulot para maipakita ang photos at videos mo</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Kailangan ng Molly ng pahintulot para maipakita ang photos at videos mo</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Allow Access</string>
     <string name="AttachmentKeyboard_payment">Payment</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Walang mahanap na app para makapili ng media.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Kailangan ng Signal ng access sa Storage para makapag-attach ng photos, videos, o audio, ngunit permanente itong ipinagbabawal. Pumunta sa app settings menu, piliin ang \"Permissions\", at i-enable ang \"Storage\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Kailangan ng Signal ng access sa Contacts upang makapag-attach ng contact information, ngunit permanente itong ipinagbabawal. Pumunta sa app settings menu, piliin ang \"Permissions\", at i-enable ang \"Contacts\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Kailangan ng Signal ng access sa Lokasyon upang makapag-attach ng lokasyon, ngunit permanente itong ipinagbabawal. Pumunta sa app settings menu, piliin ang \"Permissions\", at i-enable ang \"Location\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Kailangan ng Molly ng access sa Storage para makapag-attach ng photos, videos, o audio, ngunit permanente itong ipinagbabawal. Pumunta sa app settings menu, piliin ang \"Permissions\", at i-enable ang \"Storage\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Kailangan ng Molly ng access sa Contacts upang makapag-attach ng contact information, ngunit permanente itong ipinagbabawal. Pumunta sa app settings menu, piliin ang \"Permissions\", at i-enable ang \"Contacts\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Kailangan ng Molly ng access sa Lokasyon upang makapag-attach ng lokasyon, ngunit permanente itong ipinagbabawal. Pumunta sa app settings menu, piliin ang \"Permissions\", at i-enable ang \"Location\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Payagang ma-access ang lokasyon mo</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Para i-send ang lokasyon mo:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Payagan ang Signal na i-send ang lokasyon mo.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Payagan ang Molly na i-send ang lokasyon mo.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Kailangan ng Signal ng location access para ma-send ang iyong lokasyon.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Kailangan ng Molly ng location access para ma-send ang iyong lokasyon.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Bigyan ng access sa storage</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Para ipakita ang photos at videos:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Kailangan ng Signal ng access sa storage para maipakita ang photos at videos mo.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Kailangan ng Molly ng access sa storage para maipakita ang photos at videos mo.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">Hindi pa na-activate ni %1$s ang Payments </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Magpalit ng Camera</string>
     <string name="CameraXFragment_open_gallery_description">Buksan ang gallery</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Allow Access</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Magbigay ng access sa camera at microphone mo</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Magbigay ng access sa camera mo</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Payagang ma-access ang microphone mo</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Para kumuha ng photos, bigyan ng access sa camera ang Signal.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Upang makakuha ng larawan at video, payagan ang Signal na gamitin ang camera.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Para kumuha ng photos at video, bigyan ng access sa camera at microphone ang Signal.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Para kumuha ng videos na may sound, bigyan ng access sa microphone ang Signal.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Para mag-scan ng QR code, bigyan ng access sa camera ang Signal.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Kailangan ng Signal ng access sa camera para kumuha ang photos</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Kailangan ng Signal ng access sa camera para mag-scan ng QR codes</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Kailangan ng Signal ng access sa microphone para kumuha ng video</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Para kumuha ng photos sa Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Para kumuha ng photos at videos sa Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Para kumuha ng videos na may tunog:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Para mag-scan ng QR codes:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Mga bagong kontak</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Walang kontak sa Signal</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Maaari mo lang gamitin ang camera button para magpadala ng mga larawan sa mga kontak sa Signal. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Hindi makita ang taong hinahanap mo?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Anyayahan ang isang kontak na sumali sa Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Anyayahan ang isang kontak na sumali sa Molly</string>
     <string name="CameraContacts__menu_search">Maghanap</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Ayaw ko, salamat na lang</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">I-update ang Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">I-update ang Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Hindi na suportado ang version ng app na ito. Para magpatuloy sa pag-send at pag-receive ng messages, mag-update sa latest version.</string>
     <string name="ClientDeprecatedActivity_update">I-update</string>
     <string name="ClientDeprecatedActivity_dont_update">Huwag I-update</string>
     <string name="ClientDeprecatedActivity_warning">Babala</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Expired na ang iyong version ng Signal. Pwede mong makita ang iyong message history pero hindi ka na maaaring makapag-send o maka-receive ng messages hangga\'t hindi mo ito ina-update.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Expired na ang iyong version ng Molly. Pwede mong makita ang iyong message history pero hindi ka na maaaring makapag-send o maka-receive ng messages hangga\'t hindi mo ito ina-update.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Walang mahanap na web browser.</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Mensahe %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly Voice Call %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly Video Call %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal message</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Mag-send ng message</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Lumipat tayo sa Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Lumipat tayo sa Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Pumili ng kontak</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Ang kalakip ay lampas sa limitasyon ng laki para sa uri ng mensahe na ipinapadala mo.</string>
     <string name="ConversationActivity_unable_to_record_audio">Hindi makapag-record ng audio!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Para makapag-send ng audio messages:.</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Para makapag-send ng voice messages, bigyan ang Signal ng access sa microphone mo.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Para makapag-send ng voice messages, bigyan ang Molly ng access sa microphone mo.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Kailangan ng Signal ng access sa microphone para makapag-record ng voice message.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Kailangan ng Signal ang pahintulot sa Mikropono upang makapagpadala ng mensaheng audio, ngunit permanente itong ipinagbabawal. Pumunta sa app settings, piliin ang \"Mga Pahintulot\", at i-enable ang \"Mikropono\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Kailangan ng Molly ng access sa microphone para makapag-record ng voice message.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Kailangan ng Molly ang pahintulot sa Mikropono upang makapagpadala ng mensaheng audio, ngunit permanente itong ipinagbabawal. Pumunta sa app settings, piliin ang \"Mga Pahintulot\", at i-enable ang \"Mikropono\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Kailangan ng Signal ang pahintulot sa Mikropono at Camera upang matawagan si %1$s, ngunit ito ay permaneteng ipinagbabawal. Pumunta sa app settings, piliin ang \"Pahintulot\", at i-enable ang \"Mikropono\" at \"Camera\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Upang makakuha ng larawan at video, payagan ang Signal na gamitin ang camera.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Kailangan ng Signal ang pahintulot sa Camera upang makakuha ng mga larawan at video, ngunit ito ay permaneteng ipinagbabawal. Pumunta sa app settings, piliin ang \"Pahintulot\", at i-enable ang \"Camera\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Kailangan ng Signal ang pahintulot sa Camera upang makakuha ng mga larawan o video</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Kailangan ng Molly ang pahintulot sa Mikropono at Camera upang matawagan si %1$s, ngunit ito ay permaneteng ipinagbabawal. Pumunta sa app settings, piliin ang \"Pahintulot\", at i-enable ang \"Mikropono\" at \"Camera\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Upang makakuha ng larawan at video, payagan ang Molly na gamitin ang camera.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Kailangan ng Molly ang pahintulot sa Camera upang makakuha ng mga larawan at video, ngunit ito ay permaneteng ipinagbabawal. Pumunta sa app settings, piliin ang \"Pahintulot\", at i-enable ang \"Camera\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Kailangan ng Molly ang pahintulot sa Camera upang makakuha ng mga larawan o video</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">I-enable ang pahintulot sa mikropono upang makakuha ng mga video na may tunog.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Kailangan ng Signal ang pahintulot sa Mikropono para makapag-record ng mga video, ngunit tinanggihan ang mga ito. Pumunta sa app settings, piliin ang \"Pahintulot\", at i-enable ang \"Mikropono\" at \"Camera\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Kailangan ng Signal ng mga pahintulot sa mikropono upang makapag-record ng mga video.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Kailangan ng Molly ang pahintulot sa Mikropono para makapag-record ng mga video, ngunit tinanggihan ang mga ito. Pumunta sa app settings, piliin ang \"Pahintulot\", at i-enable ang \"Mikropono\" at \"Camera\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Kailangan ng Molly ng mga pahintulot sa mikropono upang makapag-record ng mga video.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Hindi</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Para magsimula ng call:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Para magsimula ng call, bigyan ang Signal ng access sa microphone mo.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Para magsimula ng call, bigyan ang Molly ng access sa microphone mo.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Kailangan ng Signal ng microphone access para magsimula ng call.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Kailangan ng Molly ng microphone access para magsimula ng call.</string>
 
 
     <string name="ConversationActivity_join">Mag-join</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Hindi na suportado sa Signal ang SMS messaging. I-invite si %1$s sa Signal para mapanatili ang convo niyo dito.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Hindi na gumagamit ng Signal ang taong ito. I-invite siya sa Signal para mapanatili ang convo niyo rito.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Hindi na gumagamit ng Molly ang taong ito. I-invite siya sa Molly para mapanatili ang convo niyo rito.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Imbitahan sa Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Imbitahan sa Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">I-re-remind ka ulit sa susunod tungkol dito.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Burahin sa lahat</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Burahin sa device na ito</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Burahin</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Burahin sa lahat ng devices</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Mabubura ang message na ito sa lahat ng nasa chat kung sila\'y nasa recent version ng Signal. Makikita nilang nag-delete ka ng message.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Naka-block</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">I-update ang Signal</string>
+    <string name="ConversationFragment__update_build">I-update ang Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Mag-register ulit sa Signal</string>
+    <string name="ConversationFragment__reregister_signal">Mag-register ulit sa Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Bumalik.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Buksan ang Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Buksan ang Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Hindi na verified</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Permanente nitong buburahin ang selected chat.</item>
         <item quantity="other">Permanente nitong buburahin ang %1$d selected chats.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Permanente nitong buburahin ang napiling chat mula sa lahat ng devices mo.</item>
+        <item quantity="other">Permanente nitong buburahin ang napiling %1$d chats mula sa lahat ng devices mo.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Binubura</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Binubura ang piniling chat…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Sinong makakahanap sa \'kin gamit ang number ko?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Makikita ka sa Signal at pwede kang i-chat ng sinumang mayroong phone number mo.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Makikita ka sa Molly at pwede kang i-chat ng sinumang mayroong phone number mo.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Walang makakakita na nasa Signal ka maliban sa mga taong minessage o naka-chat mo.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Walang makakakita na nasa Molly ka maliban sa mga taong minessage o naka-chat mo.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">I-restore mula sa backup?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Subukan ang iyong passphrase ng backup at iberipika na magkatulad ito</string>
     <string name="BackupsPreferenceFragment__turn_on">Buksan</string>
     <string name="BackupsPreferenceFragment__turn_off">Patayin</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Para mag-restore ng backup, mag-install ng bagong copy ng Signal. I-open ang app at i-tap ang \"Restore backup\", pagkatapos ay hanapin ang backup file. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Para mag-restore ng backup, mag-install ng bagong copy ng Molly. I-open ang app at i-tap ang \"Restore backup\", pagkatapos ay hanapin ang backup file. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Matuto pa</string>
     <string name="BackupsPreferenceFragment__in_progress">In progress…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d so far…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% so far…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Kailangan ng Signal ng pahintulot sa paggamit ng panlabas na storage upang makalikha ng mga backup, ngunit ito ay permanenteng ipinagbabawal. Pumunta sa app settings, piliin ang \"Pahintulot\", at i-enable ang \"Storage\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Kailangan ng Molly ng pahintulot sa paggamit ng panlabas na storage upang makalikha ng mga backup, ngunit ito ay permanenteng ipinagbabawal. Pumunta sa app settings, piliin ang \"Pahintulot\", at i-enable ang \"Storage\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Mag-set ng oras ng pag-backup</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Chat session refreshed</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Ang Signal ay gumagamit ng end-to-end encryption at maaaring kailanganin mong i-refresh ang iyong chat session paminsan-minsan. Hindi ito nakakaapekto sa security ng iyong chat, pero maaaring may hindi ka ma-receive na message mula sa contact na ito, kaya sabihan siyang i-resend ito.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Ang Molly ay gumagamit ng end-to-end encryption at maaaring kailanganin mong i-refresh ang iyong chat session paminsan-minsan. Hindi ito nakakaapekto sa security ng iyong chat, pero maaaring may hindi ka ma-receive na message mula sa contact na ito, kaya sabihan siyang i-resend ito.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Gamitin ang Signal sa Desktop o iPad. Masi-sync ang messages mo sa iyong linked devices.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Mag-link ng bagong device</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Protektado ng end-to-end encryption ang messages at chat info sa lahat ng devices</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal sa desktop o iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Pribado ang lahat ng chat sa linked devices</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Masi-sync ang Molly messages sa linked device mo at sa Molly app sa mobile phone mo pagkatapos nilang ma-link. Hindi lalabas ang previous message history mo.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Sa iba mong device, pumunta sa %1$s para i-install ang Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Ang linked devices ko</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">I-unlink</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">In-unlink ang %1$s</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Nili-link ang device…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Aprubado ang device</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Naglo-load…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Walang linked devices</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">I-unlock para mag-link ng device</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Para i-link ang device, i-scan ang QR code na makikita rito.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">I-scan ang QR Code</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Gamitin ang device na ito para i-scan ang QR code na makikita sa device na gusto mong i-link</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Okay</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Makikita ng device na ito ang groups at contacts mo, magkakaroon din ito ng access sa chats mo, at makakapag-send ng messages sa ilalim ng pangalan mo.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Tapusin ang pag-link sa iba mong device</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Tapusin ang pag-link ng Molly sa iba mong device.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Failed ang pag-link ng device</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Hindi valid ang QR code na ito. Siguraduhing ini-scan mo ang QR code na makikita sa device na gusto mong i-link.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Subukang muli</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">I-unlik ang \'%1$s\'?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">I-optimize para sa nawawalang Play Services</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Ang device na ito ay walang suporta para sa Play Services. Pindutin upang i-disable ang mga pang-sistemang optimisasyon ng baterya na pumipigil sa Signal na kuhanin ang mga mensahe habang hindi ito aktibo.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Ang device na ito ay walang suporta para sa Play Services. Pindutin upang i-disable ang mga pang-sistemang optimisasyon ng baterya na pumipigil sa Molly na kuhanin ang mga mensahe habang hindi ito aktibo.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Itong version ng Signal ay expired na. Mag-update ngayon para makapag-send at makapag-receive ng messages</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Itong version ng Molly ay expired na. Mag-update ngayon para makapag-send at makapag-receive ng messages</string>
     <string name="ExpiredBuildReminder_update_now">I-update na</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Tingnan</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanenteng kabiguan ng Signal sa komunikasyon!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Hindi nagawang magparehistro ng Signal sa Google Play Services. Ang mga mensahe at tawag sa Signal ay na-disable, subukang muling magparehistro sa Settings &gt; Advanced.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanenteng kabiguan ng Molly sa komunikasyon!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Hindi nagawang magparehistro ng Molly sa Google Play Services. Ang mga mensahe at tawag sa Molly ay na-disable, subukang muling magparehistro sa Settings &gt; Advanced.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Ang debug logs ay makatutulong sa amin para ma-diagnose at maayos ang issue, at wala itong laman na identifying information.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Nagkaroon ng problema ang Signal. Gusto mo bang mag-submit ng debug log?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Nagkaroon ng problema ang Molly. Gusto mo bang mag-submit ng debug log?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Maaaring delayed ang notifications dahil sa battery optimizations</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Pwede mong i-disable ang battery optimizations sa Signal para masiguradong hindi delayed ang message notifications.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Pwede mong i-disable ang battery optimizations sa Molly para masiguradong hindi delayed ang message notifications.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Maaaring delayed ang notifications dahil sa battery optimizations</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">I-disable ang battery optimizations sa Molly para masiguradong hindi delayed ang message notifications. I-tap ang \"Continue\" para makita ang device-specific instructions.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Ayaw ko, salamat na lang</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Magpatuloy</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Magpatuloy</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">I-dismiss</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Ayaw ko, salamat na lang</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Pending group invites</string>
+    <string name="PendingMembersActivity_pending_group_invites">Requests at invites</string>
     <string name="PendingMembersActivity_requests">Requests</string>
     <string name="PendingMembersActivity_invites">Invites</string>
     <string name="PendingMembersActivity_people_you_invited">Mga taong iyong inimbitahan</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">Kanselahin</string>
     <string name="InviteActivity_sending">Ipinapadala…</string>
     <string name="InviteActivity_invitations_sent">Naipadala na ang mga imbitasyon!</string>
-    <string name="InviteActivity_invite_to_signal">Imbitahan sa Signal</string>
+    <string name="InviteActivity_invite_to_signal">Imbitahan sa Molly</string>
     <string name="InviteActivity_send_sms">Mag-send ng SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Mapadala ng %1$d SMS na imbitasyon?</item>
         <item quantity="other">Mapadala ng %1$d SMS na imbitasyon?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Lumipat tayo sa Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Lumipat tayo sa Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Mukhang wala kang anumang app na maaaring bahaginan.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">Mensahe mo</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Naka-enable ang koneksyon sa background</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Replies</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Nagsisimula ng tawag sa Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">Nagsisimula ng tawag sa Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Starting Signal call service</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Stopping Signal call service</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Starting Molly call service</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Stopping Molly call service</string>
     <string name="NotificationBarManager__cancel_call">Kanselahin ang tawag</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Na-activate mo na ang Payments</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">Makakatanggap na si %1$s ng Payments</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Hindi available ang payment details</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">I-tap for more</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Hindi available ang payment details</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Hindi available ang mga detalye ng payment na ito dahil ni-restore ang messages mo mula sa isang source na hindi naglalaman ang payment history na ito. Hindi nito maaapektuhan ang wallet balance mo o ang status ng mga naunang payments.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Malapit ka nang hindi makapag-send ng SMS messages mula sa Signal. I-invite si %1$s sa Signal para mapanatili ang convo niyo dito.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Hindi ka na pwedeng mag-send ng SMS messages sa Signal. I-invite si %1$s sa Signal para mapanatili ang convo niyo dito.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Hindi ka na pwedeng mag-send ng SMS messages sa Molly. I-invite si %1$s sa Molly para mapanatili ang convo niyo dito.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Payment: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Payment</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Iniulat bilang spam</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Mag-link ng Signal na device?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Mukhang sinusubukan mong mag-link ng Signal na device gamit ang isang 3rd party na scanner. Para sa iyong proteksyon, paki-scan muli ang code mula sa loob ng Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Kailangan ng Signal ang pahintulot sa Camera upang makapag-scan ng QR code, ngunit ito ay permanenteng ipinagbabawal. Pumunta sa app settings, piliin ang \"Mga Pahintulot\", at i-enable ang \"Camera\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Kailangan ng Molly ang pahintulot sa Camera upang makapag-scan ng QR code, ngunit ito ay permanenteng ipinagbabawal. Pumunta sa app settings, piliin ang \"Mga Pahintulot\", at i-enable ang \"Camera\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Hindi makapag-scan ng QR code nang walang pahintulot sa Camera.</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Ilagay ang passphrase</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Icon ng Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Icon ng Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Isumite ang passphrase</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Hindi valid ang passphrase!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">I-unlock ang Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Andoid - Lock Screen</string>
+    <string name="PassphrasePromptActivity_unlock_signal">I-unlock ang Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Andoid - Lock Screen</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Mapa</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">I-verify to continue messaging</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Para makaiwas sa spam dito sa Signal, kumpletuhin ang verification.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Para makaiwas sa spam dito sa Molly, kumpletuhin ang verification.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Pagkatapos mag-verify, pwede ka nang magpatuloy sa messaging. Ang paused messages ay automatic na mase-send.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Story Ko</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal call</string>
+    <string name="Recipient_signal_call">Molly call</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">I-block</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Nagri-ring…</string>
     <string name="RedPhone_busy">Busy</string>
     <string name="RedPhone_recipient_unavailable">Ang tatanggap ay hindi available</string>
-    <string name="RedPhone_network_failed">Nabigo ang network!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Nabigo ang network! Paki-check ng iyong network connection at subukan ulit.</string>
     <string name="RedPhone_number_not_registered">Hindi rehistrado ang numero!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Hindi suportado ng numerong nai-dial mo ang secure na voice!</string>
     <string name="RedPhone_got_it">OK</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">I-tap dito upang buksan ang iyong video</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Para matawagan si %1$s, kailangan ng Signal ng access sa iyong camera</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Para matawagan si %1$s, kailangan ng Molly ng access sa iyong camera</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Calling…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Kumukonektang muli…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Tinanggal sa tawag</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Natanggal ka mula sa tawag.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Magbigay ng access sa camera at microphone mo</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Payagang ma-access ang microphone mo</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Magbigay ng access sa camera mo</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Para makapagsimula ng o sumali sa call, bigyan ang Molly ng access sa camera at microphone mo.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Para makapagsimula ng o sumali sa call, bigyan ang Molly ng access sa camera mo.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Para i-enable ang video, bigyan ang Molly ng access sa camera mo.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Kailangan ng Molly ng microphone access para magsimula ng o sumali sa call.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Kailangan ng Molly ng access sa camera para ma-enable ang video mo</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Para magsimula ng o sumali sa call:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Para i-enable ang video mo:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Tawag sa Signal</string>
-    <string name="WebRtcCallView__signal_video_call">Signal Video Call</string>
+    <string name="WebRtcCallView__signal_call">Tawag sa Molly</string>
+    <string name="WebRtcCallView__signal_video_call">Molly Video Call</string>
     <string name="WebRtcCallView__start_call">Simulan ang Call</string>
     <string name="WebRtcCallView__join_call">Mag-join sa Call</string>
     <string name="WebRtcCallView__call_is_full">Puno na ang call</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Gusto mo bang ibaba ang iyong kamay?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Ibaba ang Kamay</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Ibaba</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">I-cancel</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Itinaas mo ang iyong kamay</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Tingnan</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">Si %1$s ay nagtaas ng kamay</item>
-        <item quantity="other">Sila %1$s + %2$d ay nagtaas ng kamay</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">Nagtaas %1$s ng kamay</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d ay nagtaas ng kamay</item>
+        <item quantity="other">%1$s +%2$d ay nagtaas ng kamay</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">Nagtaas ng kamay si %1$s</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">Sila %1$s +%2$d ay nagtaas ng kamay</item>
+        <item quantity="other">Sila %1$s + %2$d pa ay nagtaas ng kamay</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Makakatanggap ka ng tawag upang beripikahin ang numerong ito.</string>
     <string name="RegistrationActivity_edit_number">I-edit ang numero</string>
     <string name="RegistrationActivity_missing_google_play_services">Nawawala ang Google Play Services</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Nawawala sa device na ito ang Google Play Services. Maaari mo pa ring gamitin ang Signal, ngunit ang configuration na ito ay maaaring magresulta sa kabawasan sa pagiging maaasahan o paggana.\n\nKung ikaw ay advanced na user, hindi gumagamit ng aftermarket na Android ROM, o kaya\'y naniniwala kang hindi mo dapat ito nakikita, makipag-ugnayan sa support@signal.org para makatulong kami sa pag-troubleshoot.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Nawawala sa device na ito ang Google Play Services. Maaari mo pa ring gamitin ang Molly, ngunit ang configuration na ito ay maaaring magresulta sa kabawasan sa pagiging maaasahan o paggana.\n\nKung ikaw ay advanced na user, hindi gumagamit ng aftermarket na Android ROM, o kaya\'y naniniwala kang hindi mo dapat ito nakikita, makipag-ugnayan sa support@molly.im para makatulong kami sa pag-troubleshoot.</string>
     <string name="RegistrationActivity_i_understand">Nauunawaan ko</string>
     <string name="RegistrationActivity_play_services_error">Nagka-error sa Play Services</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Ang Google Play Services ay nag-u-update o kaya\'y pansamantalang hindi available. Pakisubukang muli.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Non-standard number format</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Ang number na nilagay mo (%1$s) ay mukhang isang non-standard format.\n\nDid you mean %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Phone Number Format</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Phone Number Format</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Call requested</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Nagkakaproblema ka ba sa pag-register?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Siguraduhing may signal ang iyong phone para maka-receive ka ng verification code sa SMS o tawag\n • Kumpirmahing nakaka-receive ka ng tawag sa number mo\n • I-check kung tama ang phone number na inilagay mo.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Para sa iba pang impormasyon, sundin ang sumusunod na troubleshooting steps o Kontakin ang Support</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Para sa karagdagang impormasyon, sundin ang %1$s o %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">ang sumusunod na troubleshooting steps</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Idagdag sa Mga Kontak</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Imbitahan sa Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Imbitahan sa Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Mensahe sa Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Tawag sa Signal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Idagdag sa Mga Kontak</string>
-    <string name="SharedContactView_invite_to_signal">Imbitahan sa Signal</string>
+    <string name="SharedContactView_invite_to_signal">Imbitahan sa Molly</string>
     <string name="SharedContactView_message">Mensahe sa Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">Kay %2$s ang %1$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Update sa Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Available na ang bagong version ng Signal. I-tap para mag-update.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Failed ang pag-update ng Signal</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Update sa Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Available na ang bagong version ng Molly. I-tap para mag-update.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Failed ang pag-update ng Molly</string>
     <string name="ApkUpdateNotifications_failed_general_body">Susubukan ulit namin ito mamaya.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Successful na na-update ang Signal</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Successful na na-update ang Molly</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Automatic na na-update ang iyong device sa version %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Aming numerong pangkaligtasan sa Signal:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Mukhang wala kang anumang app na maaaring bahaginan.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Walang tumutugmang numerong pangkaligtasan na nahanap sa clipboard</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Kailangan ng Signal ang pahintulot sa Camera upang makapag-scan ng QR code, ngunit ito ay permanenteng ipinagbabawal. Pumunta sa app settings, piliin ang \"Mga Pahintulot\", at i-enable ang \"Camera\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Kailangan ng Molly ang pahintulot sa Camera upang makapag-scan ng QR code, ngunit ito ay permanenteng ipinagbabawal. Pumunta sa app settings, piliin ang \"Mga Pahintulot\", at i-enable ang \"Camera\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Hindi makapag-scan ng QR code nang walang pahintulot sa Camera.</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Kailangan mo munang mag-exchange ng messages para makita ang safety number ni %1$s.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Pindutin upang buksan</string>
-    <string name="KeyCachingService_passphrase_cached">Naka-unlock ang Signal</string>
-    <string name="KeyCachingService_lock">I-lock ang Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Naka-unlock ang Molly</string>
+    <string name="KeyCachingService_lock">I-lock ang Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Ikaw</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Hindi suportadong uri ng media</string>
     <string name="MediaPreviewActivity_draft">Draft</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Kailangan ng Signal ng pahintulot sa Storage upang makapag-save sa panlabas na storage, ngunit ito ay permanenteng ipinagbabawal. Pumunta sa app settings, piliin ang \"Mga Pahintulot\", at i-enable ang \"Storage\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Kailangan ng Molly ng pahintulot sa Storage upang makapag-save sa panlabas na storage, ngunit ito ay permanenteng ipinagbabawal. Pumunta sa app settings, piliin ang \"Mga Pahintulot\", at i-enable ang \"Storage\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Hindi makapag-save sa panlabas na storage nang walang pahintulot</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Burahin ang message?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Permanente nitong buburahin ang message na ito.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Nabigong ihatid ang mensahe.</string>
     <string name="MessageNotifier_error_delivering_message">Nagka-error sa paghahatid ng mensahe.</string>
     <string name="MessageNotifier_message_delivery_paused">Message delivery paused.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">I-verify to continue messaging on Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">I-verify to continue messaging on Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Markahan ang lahat na nabasa na</string>
     <string name="MessageNotifier_mark_read">Markahang nabasa na</string>
     <string name="MessageNotifier_turn_off_these_notifications">I-turn off ang notifications</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Nag-react ng %1$s sa iyong sticker.</string>
     <string name="MessageNotifier_this_message_was_deleted">Nabura na ang message na ito.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Gusto mo bang i-turn off ang contact joined Signal notifications? Pwede mong i-enable ito ulit sa Signal &gt; Settings &gt; Notifications.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Gusto mo bang i-turn off ang contact joined Molly notifications? Pwede mong i-enable ito ulit sa Molly &gt; Settings &gt; Notifications.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Ang mabilisang tugon ay hindi gagana kapag naka-lock ang Signal!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Ang mabilisang tugon ay hindi gagana kapag naka-lock ang Molly!</string>
     <string name="QuickResponseService_problem_sending_message">May problema sa pagpapadala ng mensahe!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Hindi valid na shortcut</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Bagong mensahe</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Message request</string>
     <string name="SingleRecipientNotificationBuilder_you">Ikaw</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Hindi na registered ang device na ito. Maaaring ito ay dahil na-register mo ang iyong phone number sa Signal sa ibang device.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Hindi na registered ang device na ito. Maaaring ito ay dahil na-register mo ang iyong phone number sa Molly sa ibang device.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Mag-register ulit ng device</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">To answer the call, bigyan ng access ang Signal sa iyong microphone.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">To answer the call, bigyan ng access ang Molly sa iyong microphone.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Para sagutin ang video call, bigyan ng access ang Signal sa microphone at camera mo.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Kailangan ng Signal ang pahintulot sa Mikropono at Camera upang tumawag at sumagot ng tawag, ngunit ito ay permanenteng ipinagbabawal. Pumunta sa app settings, piliin ang \"Mga Pahintulot\", at i-enable ang \"Mikropono\" at \"Camera\".</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Para sagutin ang video call, bigyan ng access ang Molly sa microphone at camera mo.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Kailangan ng Molly ang pahintulot sa Mikropono at Camera upang tumawag at sumagot ng tawag, ngunit ito ay permanenteng ipinagbabawal. Pumunta sa app settings, piliin ang \"Mga Pahintulot\", at i-enable ang \"Mikropono\" at \"Camera\".</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Answered on a linked device.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Declined on a linked device.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Busy on a linked device.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Ulitin ang bagong passphrase</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Imbitahan sa Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Imbitahan sa Molly</string>
     <string name="contact_selection_activity__new_group">Bagong grupo</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">I-refresh ang contacts</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">May nawawala ka bang contact? Subukang mag-refresh</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Hanapin sa Signal ang mga kakilala mo</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Magbigay ng access sa contacts mo</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">More</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Larawan ng Kontak</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Kailangan ng Signal ng pahintulot sa Mga Kontak upang maipakita ang iyong mga kontak, ngunit permanente itong ipinagbabawal. Pumunta sa app settings menu, piliin ang \"Mga Pahintulot\", at i-enable ang \"Mga Kontak\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Kailangan ng Molly ng pahintulot sa Mga Kontak upang maipakita ang iyong mga kontak, ngunit permanente itong ipinagbabawal. Pumunta sa app settings menu, piliin ang \"Mga Pahintulot\", at i-enable ang \"Mga Kontak\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Nagka-error sa pakuha ng mga kontak, suriin ang koneksyon ng iyong network.</string>
     <string name="ContactSelectionListFragment_username_not_found">Hindi nahanap ang username</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"Hindi gumagamit ng Signal si \"%1$s\" . Pakisuri ang username at subukang muli."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Hanapin gamit ang username</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Magbigay ng access sa contacts</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Para mahanap ka sa Signal ng mga kakilala mo:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Allow Access</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Ayaw ko, salamat na lang</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Magbigay ng access sa contacts mo. Encrypted ang contacts mo at hindi ito makikita ng Signal service.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Kailangan ng Signal ng access sa iyong mga kontak upang maipakita ang mga ito.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Kailangan ng Molly ng access sa iyong mga kontak upang maipakita ang mga ito.</string>
     <string name="contact_selection_list_fragment__show_contacts">Ipakita ang mga kontak</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Tinanggal mo na ang taong ito, mababalik s\'ya sa list mo kapag nag-message ka ulit sa kanya.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Mga pagpipilian</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">I-update</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">I-play … I-pause</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Ang bubbles ay isang Android feature na pwede mong i-off sa Signal chats.</string>
+    <string name="BubbleOptOutTooltip__description">Ang bubbles ay isang Android feature na pwede mong i-off sa Molly chats.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Hindi ngayon</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Group description</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">I-update ang Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">I-update ang Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Expired na itong version ng Signal. Mag-update na para patuloy na magamit ang Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Expired na itong version ng Molly. Mag-update na para patuloy na magamit ang Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">I-update</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Mabagal</string>
     <string name="preferences__help">Tulong</string>
     <string name="preferences__advanced">Advanced</string>
-    <string name="preferences__donate_to_signal">Mag-donate sa Signal</string>
+    <string name="preferences__donate_to_signal">Mag-donate sa Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Pagkapribado</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Baguhin ang app icon at gawin ang pangalang \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Kailangang isara ang Signal para mapalitan ang app icon at pangalan. Palaging ipapakita ng notifications ang default na icon at pangalan ng Signal.</string>
+    <string name="preferences__app_icon_dialog_description">Kailangang isara ang Molly para mapalitan ang app icon at pangalan. Palaging ipapakita ng notifications ang default na icon at pangalan ng Molly.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Pumili ng app icon at pangalan na makikita sa home screen at app drawer ng phone mo. Palaging ipapakita ng notifications ang default na icon at pangalan ng Signal. Matuto pa</string>
+    <string name="preferences__app_icon_warning_learn_more">Pumili ng app icon at pangalan na makikita sa home screen at app drawer ng phone mo. Palaging ipapakita ng notifications ang default na icon at pangalan ng Molly. Matuto pa</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Ang app icons at names ay makikita sa home screen at app drawer.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Palaging ipapakita ng notifications ang default na icon at pangalan ng Signal.</string>
+    <string name="preferences__app_icon_notification_warning">Palaging ipapakita ng notifications ang default na icon at pangalan ng Molly.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Matuto pa</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Permanente nitong iti-trim ang lahat ng chats at ang %1$s most recent messages lang ang matitira.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Permanente nitong buburahin ang lahat ng message history at media mula sa device mo.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Permanenteng buburahin nito ang lahat ng message history at media mula sa device na ito at anumang linked devices.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Sigurado ka bang gusto mong burahin ang buong message history?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Ang buong message history ay permanenteng tatanggalin. Hindi na pwedeng bawiin ang action na ito.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Ang buong message history ay permanenteng tatanggalin. Hindi na pwedeng bawiin ang action na ito.</string>
     <string name="preferences_storage__delete_all_now">Burahin na lahat</string>
     <string name="preferences_storage__forever">Forever</string>
     <string name="preferences_storage__one_year">1 year</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Censorship circumvention</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Censorship circumvention</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Kung gumagana, susubukin ng Signal na ikutan ang censorship. Huwag paganahin ang feature na ito maliban na lang kung ika\'y nasa lugar na naka-censor ang Signal.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Kung gumagana, susubukin ng Molly na ikutan ang censorship. Huwag paganahin ang feature na ito maliban na lang kung ika\'y nasa lugar na naka-censor ang Molly.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Ang censorship circumvention ay activated base sa phone number ng account mo.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Ipinakikilala ang payments</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Gamitin ang Signal para mag-send at mag-receive ng MobileCoin, isang privacy-focused digital currency. I-activate para magsimula.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Gamitin ang Molly para mag-send at mag-receive ng MobileCoin, isang privacy-focused digital currency. I-activate para magsimula.</string>
     <string name="PaymentsHomeFragment__activate_payments">I-activate ang Payments</string>
     <string name="PaymentsHomeFragment__activating_payments">Activating payments…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">I-restore ang payments account</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Ang Payments ay hindi available sa iyong region.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Hindi ma-enable ang payments. Subukan ulit mamaya.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Gusto mo bang i-deactivate ang Payments?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Hindi ka pwedeng maka-send o maka-receive ng MobileCoin sa Signal kung ide-deactivate mo ang payments.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Hindi ka pwedeng maka-send o maka-receive ng MobileCoin sa Molly kung ide-deactivate mo ang payments.</string>
     <string name="PaymentsHomeFragment__deactivate">I-deactivate</string>
     <string name="PaymentsHomeFragment__continue">Magpatuloy</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Ang Balance ay hindi available sa ngayon.</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Mga Detalye</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Pwede mong gamitin ang Signal para mag-send at mag-receive ng MobileCoin. Ang lahat ng payments ay napapailalim sa Terms of Use para sa MobileCoins at sa MobileCoin Wallet. Maaari kang maka-encounter ng ilang issues at ang payments o balances na nawala sa\'yo ay maaaring hindi na ma-recover. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Pwede mong gamitin ang Molly para mag-send at mag-receive ng MobileCoin. Ang lahat ng payments ay napapailalim sa Terms of Use para sa MobileCoins at sa MobileCoin Wallet. Maaari kang maka-encounter ng ilang issues at ang payments o balances na nawala sa\'yo ay maaaring hindi na ma-recover. </string>
     <string name="PaymentsHomeFragment__activate">I-activate</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">View MobileCoin terms</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Ang Payments sa Signal ay hindi na available. Pwede ka pa ring mag-transfer ng funds sa isang exchange pero hindi ka na pwedeng mag-send o mag-receive ng payments. Hindi ka na rin pwedeng mag-add ng funds.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Ang Payments sa Molly ay hindi na available. Pwede ka pa ring mag-transfer ng funds sa isang exchange pero hindi ka na pwedeng mag-send o mag-receive ng payments. Hindi ka na rin pwedeng mag-add ng funds.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Magbigay ng pahintulot</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Para matulungan kang i-message ang mga taong kilala mo, hihingi ng pahinuntulot ang Signal. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Para matulungan kang i-message ang mga taong kilala mo, hihingi ng pahinuntulot ang Molly. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Notifications</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">Susunod</string>
     <string name="PaymentsTransferFragment__invalid_address">Invalid address</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">I-check ang wallet address kung saan mo sinusubukang mag-transfer and try again.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Hindi ka pwedeng mag-transfer sa sarili mong Signal wallet address. I-enter sa isang supported exchange ang wallet address mula sa account mo.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Para mag-scan ng isang QR code, kailangan ng Signal ng access sa iyong camera.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Kailangan ng Signal ang Camera permission para ma-capture ang QR code. Pumunta sa settings, i-select ang \"Permissions\", at i-enable ang \"Camera\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Para mag-scan ng isang QR code, kailangan ng Signal ng access sa iyong camera.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Hindi ka pwedeng mag-transfer sa sarili mong Molly wallet address. I-enter sa isang supported exchange ang wallet address mula sa account mo.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Para mag-scan ng isang QR code, kailangan ng Molly ng access sa iyong camera.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Kailangan ng Molly ang Camera permission para ma-capture ang QR code. Pumunta sa settings, i-select ang \"Permissions\", at i-enable ang \"Camera\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Para mag-scan ng isang QR code, kailangan ng Molly ng access sa iyong camera.</string>
     <string name="PaymentsTransferFragment__settings">Settings</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Incoming Signal voice call</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Incoming Molly voice call</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Incoming Signal video call</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Incoming Molly video call</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Incoming Signal group call</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Incoming Molly group call</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Ongoing Signal voice call</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Ongoing Molly voice call</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Ongoing Signal video call</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Ongoing Molly video call</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Ongoing Signal group call</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Ongoing Molly group call</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Naglo-load…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Iberipika</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Matagumpay mong nailagay ang passphrase ng backup</string>
     <string name="BackupDialog_passphrase_was_not_correct">Ang passphrase ay hindi tama</string>
-    <string name="LocalBackupJob_creating_signal_backup">Creating Signal backup…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Creating Molly backup…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Vine-verify ang Signal backup…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Vine-verify ang Molly backup…</string>
     <string name="LocalBackupJobApi29_backup_failed">Backup failed</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Binura o nilipat ang iyong backup directory.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Ang iyong backup file ay masyadong malaki to store on this volume.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Tawagan ako (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">I-resend ang Code (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Makipag-ugnayan sa Suporta ng Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Pagpaparehistro sa Signal - Verification Code para sa Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Makipag-ugnayan sa Suporta ng Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Pagpaparehistro sa Molly - Verification Code para sa Android</string>
     <string name="RegistrationActivity_incorrect_code">Maling kodigo</string>
     <string name="BackupUtil_never">Hindi kailanman</string>
     <string name="BackupUtil_unknown">Hindi alam</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Phone number</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Piliin kung sinong pwedeng makakita ng phone number mo at kung sinong pwedeng kumontak sa \'yo sa Signal gamit ito.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Piliin kung sinong pwedeng makakita ng phone number mo at kung sinong pwedeng kumontak sa \'yo sa Molly gamit ito.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Sinong makakakita ng number ko</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Nakagawa ka ng napakaraming pagtatangka. Pakiusap na subukang muli kinalaunan.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Nagka-error sa pagkonekta sa serbisyo</string>
     <string name="preferences_chats__backups">Mga backup</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Naka-lock ang Signal</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Naka-lock ang Molly</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">PINDUTIN PARA I-UNLOCK</string>
     <string name="Recipient_unknown">Hindi alam</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Kailangan mo ng access sa\'yong old device.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Mag-restore mula sa backup</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">I-restore ang messages mo mula sa isang local backup. Kung hindi ka magre-restore ngayon, hindi ka na pwedeng mag-restore mamaya.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">I-restore ang local backup</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">I-restore ang Signal backup</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">I-restore ang lahat ng text messages mo + media mo noong nakaraang 30 araw</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Karagdagang options</string>
 
+    <string name="TransferOrRestoreFragment__cancel">I-cancel</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Mag-log in nang hindi nililipat</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Magpatuloy nang hindi nililipat ang messages at media mo</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Buksan ang Signal sa old Android phone mo.</string>
     <string name="NewDeviceTransferInstructions__continue">Magpatuloy</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Preparing to connect to old Andoid device…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Taking a moment, should be ready soon</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Waiting for old Android device to connect…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Kailangan ng Signal ang location permission para ma-discover at maka-connect sa old Android device mo.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Kailangan ng Signal ang enabled location services para ma-discover at maka-connect sa old Android device mo.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Kailangan ng Signal ang naka-turn on na Wi-Fi access para ma-discover at maka-connect sa old Android device mo. Dapat naka-turn on ang WiFi pero hindi naman kailangan na connected ito sa isang Wi-Fi network.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Sorry, hindi supported ng iyong device ang Wi-Fi Direct. Gumagamit ang Signal ng Wi-Fi Direct para ma-discover at maka-connect sa old Android device mo. Pwede kang mag-restore ng backup para ma-restore ang iyong account mula sa old Android device mo.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Kailangan ng Molly ang location permission para ma-discover at maka-connect sa old Android device mo.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Kailangan ng Molly ang enabled location services para ma-discover at maka-connect sa old Android device mo.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Kailangan ng Molly ang naka-turn on na Wi-Fi access para ma-discover at maka-connect sa old Android device mo. Dapat naka-turn on ang WiFi pero hindi naman kailangan na connected ito sa isang Wi-Fi network.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Sorry, hindi supported ng iyong device ang Wi-Fi Direct. Gumagamit ang Molly ng Wi-Fi Direct para ma-discover at maka-connect sa old Android device mo. Pwede kang mag-restore ng backup para ma-restore ang iyong account mula sa old Android device mo.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Mag-restore ng backup</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">An unexpected error occurred while attempting to connect to your old Android device.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Searching for new Android device…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Kailangan ng Signal ang location permission para ma-discover at maka-connect sa new Android device mo.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Kailangan ng Signal ang enabled location services para ma-discover at maka-connect sa new Android device mo.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Kailangan ng Signal ang naka-turn on na Wi-Fi access para ma-discover at maka-connect sa new Android device mo. Dapat naka-turn on ang WiFi pero hindi naman kailangan na connected ito sa isang Wi-Fi network.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Sorry, hindi supported ng iyong device ang Wi-Fi Direct. Gumagamit ang Signal ng Wi-Fi Direct para ma-discover at maka-connect sa new Android device mo. Pwede kang mag-restore ng backup para ma-restore ang iyong account mula sa new Android device mo.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Kailangan ng Molly ang location permission para ma-discover at maka-connect sa new Android device mo.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Kailangan ng Molly ang enabled location services para ma-discover at maka-connect sa new Android device mo.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Kailangan ng Molly ang naka-turn on na Wi-Fi access para ma-discover at maka-connect sa new Android device mo. Dapat naka-turn on ang WiFi pero hindi naman kailangan na connected ito sa isang Wi-Fi network.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Sorry, hindi supported ng iyong device ang Wi-Fi Direct. Gumagamit ang Molly ng Wi-Fi Direct para ma-discover at maka-connect sa new Android device mo. Pwede kang mag-restore ng backup para ma-restore ang iyong account mula sa new Android device mo.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Mag-create ng backup</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">An unexpected error occurred while attempting to connect to your new Android device.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Transferring data</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Panatilihing malapit ang devices sa isa\'t isa. \'Wag i-turn off ang devices and keep Signal open. Ang transfers ay end-to-end encrypted.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Panatilihing malapit ang devices sa isa\'t isa. \'Wag i-turn off ang devices and keep Molly open. Ang transfers ay end-to-end encrypted.</string>
     <string name="DeviceTransfer__d_messages_so_far">%1$d messages so far…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% of messages so far…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Ilipat ang Account</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">I-download ang Signal sa new Android device mo</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">I-download ang Molly sa new Android device mo</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"I-tap ang \"Transfer or restore account\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Anyone with this link can view the group\'s name, photo, and request to join. I-share ito sa mga taong pinagkakatiwalaan mo.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Anyone with this link can view the group\'s name, photo, and request to join. I-share ito sa mga taong pinagkakatiwalaan mo.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Share via Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Share via Molly</string>
     <string name="GroupLinkBottomSheet_copy">Kopyahin</string>
     <string name="GroupLinkBottomSheet_qr_code">QR Code</string>
     <string name="GroupLinkBottomSheet_share">Ibahagi</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">About MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">Ang MobileCoin ay isang bagong privacy-focused digital currency.</string>
     <string name="payment_info_card_adding_funds">Adding funds</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Pwede kang mag-add ng funds na magagamit mo sa Signal sa pamamagitan ng pag-send ng MobileCoin sa wallet address mo.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Pwede kang mag-add ng funds na magagamit mo sa Molly sa pamamagitan ng pag-send ng MobileCoin sa wallet address mo.</string>
     <string name="payment_info_card_cashing_out">Cashing out</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Pwede kang mag-cash out ng MobileCoin anytime on an exchange that supports MobileCoin. Just make a transfer at that exchange sa account mo.</string>
     <string name="payment_info_card_hide_this_card">Gusto mo bang i-hide ang card na ito?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">I-deactivate ang Wallet</string>
     <string name="DeactivateWalletFragment__your_balance">Your balance</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Inirerekomenda naming i-transfer mo muna ang iyong funds sa iba pang wallet address bago mo i-deactivate ang payments. Kapag pinili mong hindi i-transfer ang iyong funds ngayon, mananatili ito sa iyong wallet na naka-link sa Signal kapag ni-reactivate mo ang payments.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Inirerekomenda naming i-transfer mo muna ang iyong funds sa iba pang wallet address bago mo i-deactivate ang payments. Kapag pinili mong hindi i-transfer ang iyong funds ngayon, mananatili ito sa iyong wallet na naka-link sa Molly kapag ni-reactivate mo ang payments.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">I-transfer ang remaining balance</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Deactivate without transferring</string>
     <string name="DeactivateWalletFragment__deactivate">I-deactivate</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Gusto mo bang mag-deactivate without transferring?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Mananatili ang balance mo sa iyong wallet na naka-link sa Signal kapag nag-reactivate ka ng payments.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Mananatili ang balance mo sa iyong wallet na naka-link sa Molly kapag nag-reactivate ka ng payments.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Error deactivating wallet.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Licenses</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Mga Tuntunin at Patakaran sa Privacy</string>
-    <string name="HelpFragment__copyright_signal_messenger">Copyright Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Copyright Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Licensed under the GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Select a color</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Ibahagi</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Admin lang ang pwedeng magpadala ng mensahe sa group na ito.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Limit reached</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Hindi ka maaaring pumili ng higit pa sa 5 chats</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Matuto pa</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">I-update ang Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">I-update ang Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Expired na itong version ng Signal. Mag-update na para patuloy na magamit ang Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Expired na itong version ng Molly. Mag-update na para patuloy na magamit ang Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">I-update</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Hindi registered ang device</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Hindi na registered ang device na ito. Mag-register ulit para patuloy na magamit ang Signal sa device na ito.</string>
+    <string name="ReregisterSignalDialog__message">Hindi na registered ang device na ito. Mag-register ulit para patuloy na magamit ang Molly sa device na ito.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Mag-register ulit</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Failed to open picker.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Para i-enable ang notifications, kailangan ng Signal ang iyong pahintulot para i-display ito.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Para i-enable ang notifications, kailangan ng Molly ang iyong pahintulot para i-display ito.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">I-on</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Wala pang replies</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Hindi ka pwedeng mag-reply sa story na ito dahil hindi ka na member ng group.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Nag-react sa story</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Nag-react sa story</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Nag-react sa story</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Views</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Piliin ang iyong bangko</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Kumpirmahin ang donasyon mo gamit ang %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Para i-setup ang iyong recurring na donasyon, i-tap ang continue para kumpirmahin ang €0,01 charge sa bangkong ginamit mo. Ito ay automatic na mare-refund at ang iyong €5/month na donasyon ay ibabawas sa account mo.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Para i-setup ang iyong recurring na donasyon, i-tap ang continue para kumpirmahin ang €0.01 na charge sa bangkong ginamit mo. Automatic itong mare-refund at ang iyong %1$s/buwan na donasyon ay ibabawas sa account mo.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Magpatuloy</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Dina-download ang backup data…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Naka-off ang media backups</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Kinansela ang Signal media backup plan mo dahil hindi namin maproseso ang iyong payment. Mayroon kang %1$d araw para i-download ang anumang media na nasa backup mo. Pagkatapos ng %1$d araw, mabubura ang media na nasa backup mo.</item>
+        <item quantity="other">Kinansela ang Signal media backup plan mo dahil hindi namin maproseso ang iyong payment. Mayroon kang %1$d araw para i-download ang anumang media na nasa backup mo. Pagkatapos ng %1$d araw, mabubura ang media na nasa backup mo.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Maaari kang magbayad ulit para sa backups anumang oras para magpatuloy sa pag-back up ng lahat ng media mo. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Mabubura ang media mo ngayong araw</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Kinansela ang Signal media backup plan mo dahil hindi namin maproseso ang iyong payment. Ito na ang huling pagkakataon mong i-download ang media sa iyong backup bago mabura ang mga ito.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Hindi makumpleto ang pag-download</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Walang sapat na free space ang iyong device. Mag-free up ng hanggang sa %1$s na space para ma-download ang media na nasa backup mo.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Kapag pinili mo ang \"Skip\", mabubura ang media sa backup mo pagkatapos ng %1$d araw.</item>
+        <item quantity="other">Kapag pinili mo ang \"Skip\", mabubura ang media sa backup mo pagkatapos ng %1$d na araw.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Hindi maproseso ang backup payment</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Nagkaroon kami ng problema sa pagkolekta ng monthly backup payment mo. Siguraduhing updated ang iyong payment method. Kung hindi, i-update ito sa Google Pay. Susubukan muli ng Signal na iproseso ang payment sa loob ng ilang araw.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Hindi makumpleto ang backup</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Walang nakumpletong backup ang device mo noong nakaraang %1$d araw. Siguraduhing connected sa wi-fi ang device mo at i-tap ang \"Back up now.\" </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Matuto pa</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Laktawan</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">I-download na ang media</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">I-download mamaya</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">\'Wag i-download ang media</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Mag-free up ng %1$s na space para ma-download ang iyong media.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Credit o debit card</string>
@@ -6874,16 +7058,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Hindi tukoy</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Payment history</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Huli kang nag-backup noong %1$s nang %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">Limit ng chat</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">Chat limits</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">Burahin ang message history</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Ang messages na mas luma sa napiling haba ng panahon ay permanenteng mabubura.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Ang messages na mas luma sa napiling haba ng panahon ay permanenteng mabubura.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">I-apply ang limits sa linked devices</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Kapag naka-enable ito, buburahin din ng chat limits ang messages mula sa iyong linked devices.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Naka-sync na sa lahat ng devices mo ang pagbura ng messages</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Kapag nagbura ka ng messages o chats, mabubura ang mga ito mula sa phone mo at sa linked devices mo.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Payment history</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Backup ng text at lahat ng media</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Payment details</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Uri ng backup</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Date paid</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Ibahagi</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal Backups</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Payment history</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Backup details</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Size ng backup</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Dalas ng backup</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Mag-back up gamit ang mobile data</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">I-off at burahin ang backup</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Binura ang backup at in-off.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Pinalitan ang uri ng backup at kinansela ang subscription</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Cancelled ang subscription</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Tapos na ang pag-download</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Uri ng backup</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Naka-disable ang backups</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/buwan</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">I-enable ang mga backup?</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Huling backup</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s nang %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Hindi kailanman</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Mag-back up na ngayon</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Gusto mo bang i-off at burahin ang backups?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Hindi ka na ulit macha-charge. Mabubura ang backup mo at walang gagawing bagong backups.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">I-off at burahin</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Binubura ang backup…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Binura na ang backup</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Sa pamamagitan ng pag-tap sa Back up now"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Araw-araw</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Lingguhan</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Buwanan</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Manual na pag backup</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Ilagay ang iyong device pin, password o pattern.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Susunod</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Palitan ang uri ng backup</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">I-cancel ang Subscription</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">I-confirm ang cancellation</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Hindi ka na ulit sisingilin. Ititigil ang backups sa katapusan ng iyong billing cycle. Pagkatapos ng araw na iyon, magkakaroon ka ng 30 araw para i-download ang media na kasalukuyang bina-back up mo.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">I-confirm at i-download ngayon</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">I-confirm at i-download mamaya</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Panatilihin ang subscription</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index ee04f0b88a..2b4e7beb7e 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal güncelleniyor…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly güncelleniyor…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Henüz bir parola belirlemediniz!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Parolayı devre dışı bırak?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Bu işlem Signal ve ileti bildirimlerinin kilidini kalıcı olarak açacaktır.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Bu işlem Molly ve ileti bildirimlerinin kilidini kalıcı olarak açacaktır.</string>
     <string name="ApplicationPreferencesActivity_disable">Devre dışı bırak</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Sunucuya bağlanırken hata!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">Kayıt kilidi için PIN gereklidir. PIN\'i devre dışı bırakmak için, lütfen ilk önce kayıt kilidini devre dışı bırakın.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Dosya</string>
     <string name="AttachmentKeyboard_contact">Kişi</string>
     <string name="AttachmentKeyboard_location">Konum</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal\'in fotoğraflarını ve videolarını göstermek için izne ihtiyacı var</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly\'in fotoğraflarını ve videolarını göstermek için izne ihtiyacı var</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Erişimine İzin Ver</string>
     <string name="AttachmentKeyboard_payment">Ödeme</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">İçerik seçebilecek uygulama bulunamıyor.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal, fotoğraflar, videolar, veya ses ekleyebilmek için Depolama iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Depolama\"yı etkinleştirin.</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal, iletişim bilgilerini eklemek için Kişiler iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Kişiler\"i etkinleştirin.</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal, konum bilgisi eklemek için Konum iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Konum\"u etkinleştirin.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly, fotoğraflar, videolar, veya ses ekleyebilmek için Depolama iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Depolama\"yı etkinleştirin.</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly, iletişim bilgilerini eklemek için Kişiler iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Kişiler\"i etkinleştirin.</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly, konum bilgisi eklemek için Konum iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Konum\"u etkinleştirin.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Konumuna erişime izin ver</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Konumunu göndermek için:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Konumunu göndermek için Signal erişimine izin ver.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Konumunu göndermek için Molly erişimine izin ver.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal\'in konumunu göndermek için konum erişimine ihtiyacı var.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly\'in konumunu göndermek için konum erişimine ihtiyacı var.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Depolamaya erişim izni ver</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Fotoğrafları ve videoları göstermek için:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal\'in fotoğraflarını ve videolarını göstermek için depolama erişimine ihtiyacı var.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly\'in fotoğraflarını ve videolarını göstermek için depolama erişimine ihtiyacı var.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s, Ödemeleri etkinleştirmedi </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Kamerayı değiştir</string>
     <string name="CameraXFragment_open_gallery_description">Galeriyi aç</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Erişimine İzin Ver</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Kamerana ve mikrofonuna erişim izni ver</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Kamerana erişime izin ver</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Mikrofonuna erişim izni ver</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Fotoğraf çekmek için Signal\'in kameraya erişimine izin ver.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Fotoğraf veya video çekmek için, Signal\'in kameraya erişmesine izin verin.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Fotoğraf ve video çekmek için Signal\'in kameraya ve mikrofona erişimine izin ver.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Sesli video çekmek için Signal\'in mikrofonuna erişimine izin ver.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Kare kod taramak için Signal\'in kameraya erişimine izin ver.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal\'in fotoğraf çekmek için kamera erişimine ihtiyacı var</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal\'in kare kodları taramak için kamera erişimine ihtiyacı var</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal\'in video çekmek için mikrofon erişimine ihtiyacı var</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Signal\'de fotoğraf çekmek için:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Signal\'de fotoğraf ve video çekmek için:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Sesli video çekmek için:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Kare kodları taramak için:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Son kişiler</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">Hiç Signal kişiniz yok</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Kamera tuşunu yalnızca Signal kişilerine fotoğraf göndermek için kullanabilirsiniz. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Aradığınız kişiyi bulamadınız mı?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Signal\'e katılması için bir kişiyi davet edin</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Molly\'e katılması için bir kişiyi davet edin</string>
     <string name="CameraContacts__menu_search">Ara</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,7 +286,7 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Hayır teşekkürler</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Signal\'i Güncelle</string>
+    <string name="ClientDeprecatedActivity_update_signal">Molly\'i Güncelle</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Uygulamanın bu sürümü artık desteklenmiyor. İleti göndermeye ve almaya devam etmek için en son sürüme güncelleyin.</string>
     <string name="ClientDeprecatedActivity_update">Güncelle</string>
     <string name="ClientDeprecatedActivity_dont_update">Güncelleme</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">İleti %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly Görüntülü Arama %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly Görüntülü Arama %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal iletisi</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">İleti gönder</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Signal uygulamasından konuşalım %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Molly uygulamasından konuşalım %1$s</string>
     <string name="ConversationActivity_specify_recipient">Lütfen bir kişi seçin</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Eklenti gönderdiğiniz ileti türü için olan boyut limitini aşıyor.</string>
     <string name="ConversationActivity_unable_to_record_audio">Ses kaydedilemedi!</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Sesli mesaj göndermek için:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Sesli mesaj göndermek için Signal\'in mikrofonuna erişimine izin ver.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Sesli mesaj göndermek için Molly\'in mikrofonuna erişimine izin ver.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal\'in sesli mesaj kaydı yapmak için mikrofon erişimine ihtiyacı var.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal, sesli iletiler göndermek için Mikrofon iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Mikrofon\"u etkinleştirin.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly\'in sesli mesaj kaydı yapmak için mikrofon erişimine ihtiyacı var.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly, sesli iletiler göndermek için Mikrofon iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Mikrofon\"u etkinleştirin.</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal, %1$s ile arama yapmanız için Mikrofon ve Kamera iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, \"Mikrofon\" ve \"Kamera\"yı etkinleştirin.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Fotoğraf veya video çekmek için, Signal\'in kameraya erişmesine izin verin.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal, fotoğraf veya video çekmek için Kamera iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Kamera\"yı etkinleştirin.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal fotoğraf veya video çekebilmek için kamera erişimine ihtiyaç duyar</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly, %1$s ile arama yapmanız için Mikrofon ve Kamera iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, \"Mikrofon\" ve \"Kamera\"yı etkinleştirin.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Fotoğraf veya video çekmek için, Molly\'in kameraya erişmesine izin verin.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly, fotoğraf veya video çekmek için Kamera iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Kamera\"yı etkinleştirin.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly fotoğraf veya video çekebilmek için kamera erişimine ihtiyaç duyar</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Sesli videolar kaydedebilmek için mikrofon erişim iznini etkinleştirin.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal videolar kaydedebilmek için mikrofon erişimine ihtiyaç duyar, ama bu erişim reddedilmiş. Lütfen uygulama ayarlarına girip, \"İzinler\"i seçin, sonrasında \"Mikrofon\" ve \"Kamera\"yı etkinleştirin.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal video kaydedebilmek için mikrofon erişimine izin duyar.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly videolar kaydedebilmek için mikrofon erişimine ihtiyaç duyar, ama bu erişim reddedilmiş. Lütfen uygulama ayarlarına girip, \"İzinler\"i seçin, sonrasında \"Mikrofon\" ve \"Kamera\"yı etkinleştirin.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly video kaydedebilmek için mikrofon erişimine izin duyar.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Hayır</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Bir arama başlatmak için:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Bir arama başlatmak için Signal\'in mikrofonuna erişimine izin ver.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Bir arama başlatmak için Molly\'in mikrofonuna erişimine izin ver.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal\'in arama başlatmak için mikrofon erişimine ihtiyacı var.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly\'in arama başlatmak için mikrofon erişimine ihtiyacı var.</string>
 
 
     <string name="ConversationActivity_join">Katıl</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">SMS ile mesajlaşma artık Signal\'da desteklenmemektedir. Sohbete burada devam etmek için %1$s adlı kişiyi Signal\'a davet et.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Bu kişi artık Signal kullanmıyor. Konuşmayı burada sürdürmek için onları Signal\'e davet et.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Bu kişi artık Molly kullanmıyor. Konuşmayı burada sürdürmek için onları Molly\'e davet et.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Signal\'e davet et</string>
+    <string name="ConversationActivity__invite_to_signal">Molly\'e davet et</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Bunu en kısa zamanda tekrar hatırlatacağız.</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">Herkesten sil</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Bu cihazdan sil</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Sil</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Her yerden sil</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Bu mesaj sohbette güncel bir Signal sürümü kullanan herkesten silinecek. Üyeler bir mesaj sildiğini görebilir.</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Engellendi</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Signal\'i Güncelle</string>
+    <string name="ConversationFragment__update_build">Molly\'i Güncelle</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Signal\'ı yeniden kaydet</string>
+    <string name="ConversationFragment__reregister_signal">Molly\'ı yeniden kaydet</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Geri dön.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signal\'ı aç</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Molly\'ı aç</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Artık doğrulanmış değil</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">Bu işlem seçilen sohbeti kalıcı olarak silecektir.</item>
         <item quantity="other">Bu işlem seçilen %1$d sohbetini kalıcı olarak silecektir.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Bu işlem seçilen sohbeti tüm cihazlarından kalıcı olarak silecektir.</item>
+        <item quantity="other">Bu işlem, seçilen %1$d sohbetin tamamını tüm cihazlarından kalıcı olarak silecektir.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Siliniyor</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Seçilen sohbet siliniyor…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Beni numaramdan kim bulabilir?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Telefon numaranı bilen herkes Signal\'de olduğunu görecek ve seninle sohbet başlatabilecektir.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Telefon numaranı bilen herkes Molly\'de olduğunu görecek ve seninle sohbet başlatabilecektir.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ona mesaj göndermediğin veya mevcut bir sohbetin olmadığı sürece kimse Signal\'de olduğunu göremez.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ona mesaj göndermediğin veya mevcut bir sohbetin olmadığı sürece kimse Molly\'de olduğunu göremez.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Yedekten geri yüklensin mi?</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Yedek parolanızı deneyin ve eşleştiğinden emin olun</string>
     <string name="BackupsPreferenceFragment__turn_on">Aç</string>
     <string name="BackupsPreferenceFragment__turn_off">Kapat</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Bir yedeği geri yüklemek için, yeni bir Signal kopyası kurun ve \"Yedeği geri yükle\" dokunun ve yedek dosyasını seçin. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Bir yedeği geri yüklemek için, yeni bir Molly kopyası kurun ve \"Yedeği geri yükle\" dokunun ve yedek dosyasını seçin. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Dahasını öğrenin</string>
     <string name="BackupsPreferenceFragment__in_progress">Devam ediyor…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">Şu ana kadar %1$d…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">Şu ana kadar %1$s%% …</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal, yedek oluşturabilmek için Depolama iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Depolama\"yı etkinleştirin.</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly, yedek oluşturabilmek için Depolama iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Depolama\"yı etkinleştirin.</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Yedekleme süresini ayarla</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Sohbet oturumu yenilendi</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal uçtan uca şifreleme kullanır ve bazen sohbet oturumunu yenilemesi gerekebilir. Bu, sohbetinin güvenliğini etkilemez ancak bu kişiden gelen mesajları kaçırmış olabilirsin; bu durumda yeniden göndermelerini isteyebilirsin.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly uçtan uca şifreleme kullanır ve bazen sohbet oturumunu yenilemesi gerekebilir. Bu, sohbetinin güvenliğini etkilemez ancak bu kişiden gelen mesajları kaçırmış olabilirsin; bu durumda yeniden göndermelerini isteyebilirsin.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Signal\'i masaüstünde veya iPad\'de kullan. Mesajların bağlı cihazlarınla senkronize edilir.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Yeni bir cihaz bağla</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Mesajlar ve sohbet bilgileri tüm cihazlarda uçtan uca şifreleme ile korunmaktadır</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Desktop veya iPad\'de Signal</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Bağlı cihazlardaki tüm mesajlaşmalar özeldir</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Molly mesajları, bağlandıktan sonra cep telefonundaki Molly uygulamasıyla senkronize edilir. Eski mesaj geçmişin görünmeyecektir.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Diğer cihazında Molly\'i yüklemek için %1$s adresini ziyaret et</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Bağlı cihazlarım</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Bağlantısını kaldır</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s cihazının bağlantısı kesildi</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Cihaz bağlanıyor…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Cihaz onaylandı</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Yükleniyor…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Bağlı cihaz yok</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Bir cihaz bağlamak için kilidi açma</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Bağlamak için cihazda gösterilen karekodu tara.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Karekodu Tara</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Bağlamak istediğin cihazda görüntülenen kare kodu taramak için bu cihazı kullan</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Tamam</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Bu cihaz gruplarını ve kişilerini görebilir, sohbetlerine erişebilir ve adına mesaj gönderebilir.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Diğer cihazında bağlantıyı tamamla</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Diğer cihazındaki Molly bağlantısını tamamla.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Cihaz Bağlanması Başarısız Oldu</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Bu kare kod geçerli değil. Lütfen bağlamak istediğiniz cihazda görüntülenen kare kodu taradığınızdan emin olun.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Tekrar dene</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">\'%1$s\' bağlantısını kaldır?</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Eksik Google Play Hizmetleri için optimize et</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Bu cihaz Play Hizmetlerini desteklemiyor. Signal etkin değilken ileti almasını engelleyebilecek pil iyileştirmelerini devre dışı bırakmak için dokunun.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Bu cihaz Play Hizmetlerini desteklemiyor. Molly etkin değilken ileti almasını engelleyebilecek pil iyileştirmelerini devre dışı bırakmak için dokunun.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Signal\'in bu sürümü kullanım dışı kaldı. İleti gönderip alabilmek için şimdi güncelleyin.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Molly\'in bu sürümü kullanım dışı kaldı. İleti gönderip alabilmek için şimdi güncelleyin.</string>
     <string name="ExpiredBuildReminder_update_now">Şimdi güncelle</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Görüntüle</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Kalıcı Signal haberleşme hatası!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal Google Play Hizmetleri\'ne kaydolamadı. Signal iletileri ve aramaları devre dışı bırakıldı, lütfen Ayarlar &gt; Gelişmiş kısmından tekrar kaydolmayı deneyin.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Kalıcı Molly haberleşme hatası!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly Google Play Hizmetleri\'ne kaydolamadı. Molly iletileri ve aramaları devre dışı bırakıldı, lütfen Ayarlar &gt; Gelişmiş kısmından tekrar kaydolmayı deneyin.</string>
 
 
     <!-- GiphyActivity -->
@@ -1023,20 +1086,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Hata ayıklama günlükleri, sorunu teşhis etmemize ve düzeltmemize yardımcı olur ve tanımlayıcı bilgiler içermezler.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal bir sorunla karşılaştı. Hata ayıklama günlüğü gönderilsin mi?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly bir sorunla karşılaştı. Hata ayıklama günlüğü gönderilsin mi?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Pil optimizasyonları nedeniyle bildirimler gecikebilir</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Mesaj bildirimlerinin gecikmemesini sağlamak amacıyla Signal için pil optimizasyonunu devre dışı bırakabilirsin.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Mesaj bildirimlerinin gecikmemesini sağlamak amacıyla Molly için pil optimizasyonunu devre dışı bırakabilirsin.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Pil optimizasyonları nedeniyle bildirimler gecikebilir</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Mesaj bildirimlerinin gecikmemesini sağlamak amacıyla Molly için pil optimizasyonlarını devre dışı bırak. Cihaza özel talimatları görmek için \"Devam\" ögesine dokun.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Hayır teşekkürler</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Devam et</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Devam et</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Kapat</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Hayır teşekkürler</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Beklemedeki grup davetleri</string>
+    <string name="PendingMembersActivity_pending_group_invites">İstekler ve davetler</string>
     <string name="PendingMembersActivity_requests">İstekler</string>
     <string name="PendingMembersActivity_invites">Davetler</string>
     <string name="PendingMembersActivity_people_you_invited">Davet ettiğiniz kişiler</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">İptal</string>
     <string name="InviteActivity_sending">Gönderiliyor…</string>
     <string name="InviteActivity_invitations_sent">Davetler gönderildi!</string>
-    <string name="InviteActivity_invite_to_signal">Signal\'e davet et</string>
+    <string name="InviteActivity_invite_to_signal">Molly\'e davet et</string>
     <string name="InviteActivity_send_sms">SMS gönder (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">%1$d SMS daveti gönderilsin mi?</item>
         <item quantity="other">%1$d SMS daveti gönderilsin mi?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Hadi Signal\'e geçelim: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Hadi Molly\'e geçelim: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Paylaşmak için herhangi bir uygulamanız yok gibi görünüyor.</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">İletiniz</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Arkaplan bağlantısı etkinleştirildi</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">Yanıtlar</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal araması kuruluyor</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly araması kuruluyor</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signal arama servisi başlatılıyor</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal\'in arama hizmeti durduruluyor</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Molly arama servisi başlatılıyor</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly\'in arama hizmeti durduruluyor</string>
     <string name="NotificationBarManager__cancel_call">Aramayı iptal et</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">Ödemeleri etkinleştirdin</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s artık Ödemeleri kabul edebilir</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Ödeme bilgileri yok</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Dahası için dokun</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Ödeme bilgileri yok</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Bu ödemeye dair bilgiler mevcut değil çünkü mesajların bu ödeme geçmişini içermeyen bir kaynaktan geri yüklenmiş. Bu durum cüzdan bakiyeni veya geçmiş ödemelerinin durumunu etkilemez.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Yakında Signal\'dan SMS mesajları gönderemeyeceksin. Sohbete burada devam etmek için %1$s adlı kişiyi Signal\'a davet et.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Artık Signal\'da SMS mesajları gönderemezsin. Sohbete burada devam etmek için %1$s adlı kişiyi Signal\'e davet edin.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Artık Molly\'da SMS mesajları gönderemezsin. Sohbete burada devam etmek için %1$s adlı kişiyi Molly\'e davet edin.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Ödeme: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Ödeme</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Spam olarak bildirildi</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Bir Signal cihazı bağlansın mı?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Üçüncül bir tarafın tarayıcısı ile taramaya çalışıyorsunuz gibi gözüküyor. Güvenliğiniz için, lütfen kodu Signal\'in içerisinden tekrar tarayın.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal, bir karekod taramak için Kamera iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Kamera\"yı etkinleştirin.</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly, bir karekod taramak için Kamera iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Kamera\"yı etkinleştirin.</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Kamera izni olmadan karekod taranamıyor.</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Parola girin</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal simgesi</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly simgesi</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Parola gir</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Geçersiz parola!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signal\'in Kilidini Aç</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Kilit Ekranı</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Molly\'in Kilidini Aç</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Kilit Ekranı</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Harita</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">İleti gönderimine devam etmek için doğrulayın</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Signal\'de istenmeyen iletileri önlemek için, lütfen doğrulamayı tamamlayın.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Molly\'de istenmeyen iletileri önlemek için, lütfen doğrulamayı tamamlayın.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Doğrulamadan sonra, ileti göndermeye devam edebilirsiniz. Tüm duraklatılmış iletiler otomatik olarak gönderilecektir.</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Hikayem</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal araması</string>
+    <string name="Recipient_signal_call">Molly araması</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Engelle</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">Çalıyor…</string>
     <string name="RedPhone_busy">Meşgul</string>
     <string name="RedPhone_recipient_unavailable">Kişi müsait değil</string>
-    <string name="RedPhone_network_failed">Ağ hatası!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Ağ hatası! Lütfen ağ bağlantını kontrol edip tekrar dene.</string>
     <string name="RedPhone_number_not_registered">Numara kayıtlı değil!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Aradığınız numara güvenli ses sistemini desteklemiyor!</string>
     <string name="RedPhone_got_it">Anladım</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Görüntünüzü açmak için buraya dokunun</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s ile arama yapmanız için, Signal\'in kameranıza erişime ihtiyacı var</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s ile arama yapmanız için, Molly\'in kameranıza erişime ihtiyacı var</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Aranıyor…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Yeniden bağlanıyor…</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Aramadan çıkarıldı</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Birisi seni aramadan çıkardı.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Kamerana ve mikrofonuna erişim izni ver</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Mikrofonuna erişim izni ver</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Kamerana erişime izin ver</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Bir arama başlatmak veya aramaya katılmak için Molly\'in kamerana ve mikrofonuna erişimine izin ver.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Bir arama başlatmak veya aramaya katılmak için Molly\'in mikrofonuna erişimine izin ver.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Videonu etkinleştirmek için Molly\'in kamerana erişmesine izin ver.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly\'in bir arama başlatmak veya aramaya katılmak için mikrofon izinlerine ihtiyacı var.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly\'in videonu etkinleştirmek için kamera erişimine ihtiyacı var</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Bir arama başlatmak veya aramaya katılmak için:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Videonu etkinleştirmek için:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal Araması</string>
-    <string name="WebRtcCallView__signal_video_call">Görüntülü Signal Araması</string>
+    <string name="WebRtcCallView__signal_call">Molly Araması</string>
+    <string name="WebRtcCallView__signal_video_call">Görüntülü Molly Araması</string>
     <string name="WebRtcCallView__start_call">Arama Başlat</string>
     <string name="WebRtcCallView__join_call">Çağrıya Katıl</string>
     <string name="WebRtcCallView__call_is_full">Arama dolu</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Elin insin mi?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">El İndir</string>
+    <string name="CallOverflowPopupWindow__lower_hand">İndir</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">İptal</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Elini kaldırdın</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Görüntüle</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s elini kaldırdı</item>
-        <item quantity="other">%1$s ve %2$d el kaldırdı</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s el kaldırdın</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s ve%2$d kişi el kaldırdınız</item>
+        <item quantity="other">%1$s ve%2$d kişi el kaldırdınız</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s el kaldırdı</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s ve%2$d kişi el kaldırdı</item>
+        <item quantity="other">%1$s ve%2$d kişi el kaldırdı</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Bu numarayı doğrulamak için bir arama alacaksınız.</string>
     <string name="RegistrationActivity_edit_number">Numarayı düzenle</string>
     <string name="RegistrationActivity_missing_google_play_services">Google Play Hizmetleri eksik</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Bu cihazda Google Play Hizmetleri bulunmamakta. Signal\'i kullanmaya devam edebilirsiniz ancak bu yapılandırma şekli azaltılmış güvenirlik veya performans gibi sonuçları doğurabilir. \n\nEğer ileri düzey kullanıcı değilseniz, alternatif Android ROM kullanmıyorsanız, veya bunu bir hata olarak görüyorsanız, lütfen sorun giderme konusunda yardım almak için support@signal.org adresinden iletişime geçiniz</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Bu cihazda Google Play Hizmetleri bulunmamakta. Molly\'i kullanmaya devam edebilirsiniz ancak bu yapılandırma şekli azaltılmış güvenirlik veya performans gibi sonuçları doğurabilir. \n\nEğer ileri düzey kullanıcı değilseniz, alternatif Android ROM kullanmıyorsanız, veya bunu bir hata olarak görüyorsanız, lütfen sorun giderme konusunda yardım almak için support@molly.im adresinden iletişime geçiniz</string>
     <string name="RegistrationActivity_i_understand">Anladım</string>
     <string name="RegistrationActivity_play_services_error">Play Hizmetleri Hatası</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Hizmetleri güncelleniyor veya geçiçi olarak kullanılamaz durumda. Lütfen tekrar deneyiniz.</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Standart olmayan numara formatı</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Girdiğin numara (%1$s) standart olmayan bir formatta gibi görünüyor.\n\n%2$s mi demek istedin?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Telefon Numarası Formatı</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Telefon Numarası Formatı</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Arama istendi</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Kaydolurken sorun mu yaşıyorsun?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Telefonunun SMS\'ini almak veya aramak için hücresel bir sinyali olduğundan emin ol \n • Numaraya bir telefon çağrısı alabileceğini onayla \n • Telefon numaranı doğru girdiğinden emin ol.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Daha fazla bilgi için lütfen bu sorun giderme adımlarını izle veya Destekle İletişime Geç</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Daha fazla bilgi için lütfen %1$s veya %2$s ögesini takip edin</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">bu sorun giderme adımları</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Kişilere Ekle</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Signal\'e davet et</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Molly\'e davet et</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal İletisi</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal Araması</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Kişilere Ekle</string>
-    <string name="SharedContactView_invite_to_signal">Signal\'e davet et</string>
+    <string name="SharedContactView_invite_to_signal">Molly\'e davet et</string>
     <string name="SharedContactView_message">Signal İletisi</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s numarası %2$s adlı kişiye aittir</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal güncellemesi</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal\'in yeni bir sürümü mevcut. Güncellemek için dokun.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal güncellenemedi</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly güncellemesi</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly\'in yeni bir sürümü mevcut. Güncellemek için dokun.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly güncellenemedi</string>
     <string name="ApkUpdateNotifications_failed_general_body">Daha sonra tekrar deneyeceğiz.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal başarıyla güncellendi</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly başarıyla güncellendi</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Otomatik olarak %1$s sürümüne güncelleme yapıldı.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Signal güvenlik numaramız:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Paylaşmak için herhangi bir uygulamanız yok gibi görünüyor.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Panoda karşılaştırılacak bir güvenlik numarası bulunamadı</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal, bir karekod taramak için Kamera iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Kamera\"yı etkinleştirin.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly, bir karekod taramak için Kamera iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Kamera\"yı etkinleştirin.</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Kamera izni olmadan karekod taranamıyor.</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">%1$s\'in güvenli numarasını görmek için önce ona ileti gönderip almanız gerekiyor.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Açmak için dokunun.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal kilidi açık</string>
-    <string name="KeyCachingService_lock">Signal\'i Kilitle</string>
+    <string name="KeyCachingService_passphrase_cached">Molly kilidi açık</string>
+    <string name="KeyCachingService_lock">Molly\'i Kilitle</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Siz</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Desteklenmeyen içerik türü</string>
     <string name="MediaPreviewActivity_draft">Taslak</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal, harici depolamaya kaydedebilmek için Depolama iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Depolama\"yı etkinleştirin.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly, harici depolamaya kaydedebilmek için Depolama iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Depolama\"yı etkinleştirin.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">İzinler olmadan harici depolamaya kaydedilemiyor</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">İletiyi sil?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Bu eylem bu iletiyi kalıcı olarak silecektir.</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">İleti teslim edilemedi.</string>
     <string name="MessageNotifier_error_delivering_message">İleti tesliminde hata.</string>
     <string name="MessageNotifier_message_delivery_paused">İleti gönderimi duraklatıldı</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Signal\'de ileti göndermeye devam etmek için doğrulamayı tamamlayın</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Molly\'de ileti göndermeye devam etmek için doğrulamayı tamamlayın</string>
     <string name="MessageNotifier_mark_all_as_read">Tümünü okundu işaretle</string>
     <string name="MessageNotifier_mark_read">Okundu işaretle</string>
     <string name="MessageNotifier_turn_off_these_notifications">Bu bildirimleri kapat</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Çıkartmana %1$s tepkisi verdi.</string>
     <string name="MessageNotifier_this_message_was_deleted">Bu ileti silindi.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Kişi katıldı Signal bildirimlerini kapatmak mı istiyorsunuz? Signal &gt; Ayarlar &gt; Bildirimler kısmında tekrar açabilirsiniz.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Kişi katıldı Molly bildirimlerini kapatmak mı istiyorsunuz? Molly &gt; Ayarlar &gt; Bildirimler kısmında tekrar açabilirsiniz.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signal kilitliyken hızlı cevap kullanılamaz!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Molly kilitliyken hızlı cevap kullanılamaz!</string>
     <string name="QuickResponseService_problem_sending_message">İleti gönderilirken hata!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Geçersiz kısayol</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Yeni ileti</string>
     <string name="SingleRecipientNotificationBuilder_message_request">İleti isteği</string>
     <string name="SingleRecipientNotificationBuilder_you">Siz</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Bu cihaz artık kayıtlı değil. Bunun nedeni büyük olasılıkla telefon numaranın farklı bir cihazda Signal\'e kaydedilmiş olmasıdır.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Bu cihaz artık kayıtlı değil. Bunun nedeni büyük olasılıkla telefon numaranın farklı bir cihazda Molly\'e kaydedilmiş olmasıdır.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Cihazı Tekrar Kaydet</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Aramayı yanıtlamak için Signal\'e mikrofon erişim izni verin.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Aramayı yanıtlamak için Molly\'e mikrofon erişim izni verin.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Görüntülü aramayı yanıtlamak için Signal\'in mikrofonuna ve kamerana erişimine izin ver.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal, arama yapmak ve almak için Mikrofon ve Kamera iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, \"Mikrofon\" ve \"Kamera\"yı etkinleştirin.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Görüntülü aramayı yanıtlamak için Molly\'in mikrofonuna ve kamerana erişimine izin ver.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly, arama yapmak ve almak için Mikrofon ve Kamera iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, \"Mikrofon\" ve \"Kamera\"yı etkinleştirin.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Bağlı cihazdan yanıtlandı.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Bağlı cihazdan reddedildi.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Bağlı cihazda meşgul.</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Yeni parolayı tekrarlayın</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Signal\'e davet et</string>
+    <string name="contact_selection_activity__invite_to_signal">Molly\'e davet et</string>
     <string name="contact_selection_activity__new_group">Yeni grup</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Kişileri yenile</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Birisi mi eksik? Yenilemeyi dene</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Signal\'de tanıdığın kişileri bul</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Kişilerine erişime izin ver</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Daha fazla</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Kişi Fotoğrafı</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal, kişileriniz gösterebilmek için Kişiler iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Kişiler\"i etkinleştirin.</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly, kişileriniz gösterebilmek için Kişiler iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Kişiler\"i etkinleştirin.</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Kişiler alınırken hata oluştu, ağ bağlantınızı kontrol edin</string>
     <string name="ContactSelectionListFragment_username_not_found">Kullanıcı adı bulunamadı</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" bir Signal kullanıcısı değil. Lütfen kullanıcı adını kontrol edin ve tekrar deneyin."</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Kullanıcı adına göre bul</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Kişilere erişime izin ver</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Signal\'de tanıdığın kişileri bulmak için:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Erişimine İzin Ver</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Hayır teşekkürler</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Kişilerine erişime izin ver. Kişilerin şifrelendi ve Signal hizmetinde görünmüyor.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal\'in kişilerinizi gösterebilmek için erişime ihtiyacı var.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly\'in kişilerinizi gösterebilmek için erişime ihtiyacı var.</string>
     <string name="contact_selection_list_fragment__show_contacts">Kişileri Görüntüle</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Bu kişiyi kaldırdın, ona tekrar mesaj göndermek kişiyi listene geri ekler.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Seçenekler</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Güncelle</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Oynat … Durdur</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Baloncuklar, Signal sohbetleri için kapatabileceğin bir Android özelliğidir.</string>
+    <string name="BubbleOptOutTooltip__description">Baloncuklar, Molly sohbetleri için kapatabileceğin bir Android özelliğidir.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Şimdi değil</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">Grup tanımı</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Signal\'i Güncelle</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Molly\'i Güncelle</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Signal\'in bu sürümü kullanım dışı kaldı. Signal\'i kullanmaya devam etmek için şimdi güncelle.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Molly\'in bu sürümü kullanım dışı kaldı. Molly\'i kullanmaya devam etmek için şimdi güncelle.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Güncelle</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">Yavaş</string>
     <string name="preferences__help">Yardım</string>
     <string name="preferences__advanced">Gelişmiş</string>
-    <string name="preferences__donate_to_signal">Signal\'e Bağış Yap</string>
+    <string name="preferences__donate_to_signal">Molly\'e Bağış Yap</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Gizlilik</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Uygulama simgesini ve adını \"%1$s\" olarak değiştir</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal\'in uygulama simgesini ve adını değiştirmek için kapatılması gerekir. Bildirimler her zaman varsayılan Signal simgesini ve adını görüntüler.</string>
+    <string name="preferences__app_icon_dialog_description">Molly\'in uygulama simgesini ve adını değiştirmek için kapatılması gerekir. Bildirimler her zaman varsayılan Molly simgesini ve adını görüntüler.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Telefonunun ana ekranında ve uygulama çekmecesinde görünecek bir uygulama simgesi ve adı seç. Bildirimler her zaman varsayılan Signal simgesini ve adını görüntüler. Daha fazlasını öğren</string>
+    <string name="preferences__app_icon_warning_learn_more">Telefonunun ana ekranında ve uygulama çekmecesinde görünecek bir uygulama simgesi ve adı seç. Bildirimler her zaman varsayılan Molly simgesini ve adını görüntüler. Daha fazlasını öğren</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Uygulama simgeleri ve adları ana ekranda ve uygulama çekmecesinde görünür.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Bildirimler her zaman varsayılan Signal simgesini ve adını görüntüler.</string>
+    <string name="preferences__app_icon_notification_warning">Bildirimler her zaman varsayılan Molly simgesini ve adını görüntüler.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Daha fazlasını öğren</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">Bu işlem tüm sohbetleri en yeni %1$s mesaja kadar kırpacaktır.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Bu işlem tüm ileti geçmişini ve ortamı cihazından kalıcı olarak silecektir.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Bu işlem tüm mesaj geçmişini ve medyayı bu cihazdan ve bağlı cihazlardan kalıcı olarak silecektir.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Tüm ileti geçmişini silmek istediğinden emin misin?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Tüm ileti geçmişi kalıcı olarak kaldırılacaktır. Bu işlem geri alınamaz.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Tüm mesaj geçmişi cihazların hepsinden kalıcı olarak kaldırılacaktır. Bu eylem geri alınamaz.</string>
     <string name="preferences_storage__delete_all_now">Tümünü hemen sil</string>
     <string name="preferences_storage__forever">Daima</string>
     <string name="preferences_storage__one_year">1 yıl</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Sansür atlatma</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Sansür atlatma</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Etkinleştirildiğinde, Signal sansürü atlatmaya çalışacaktır. Signal\'in sansürlendiği bir konumda olmadığınız sürece bu özelliği etkinleştirmeyin.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Etkinleştirildiğinde, Molly sansürü atlatmaya çalışacaktır. Molly\'in sansürlendiği bir konumda olmadığınız sürece bu özelliği etkinleştirmeyin.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Sansür atlatma hesabınızın telefon numarasına bağlı olarak etkinleştirildi.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Ödemeler tanıtımı</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Yeni gizlilik odaklı dijital para birimi MobileCoin\'i alıp göndermek için Signal\'i kullan. Başlamak için etkinleştir.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Yeni gizlilik odaklı dijital para birimi MobileCoin\'i alıp göndermek için Molly\'i kullan. Başlamak için etkinleştir.</string>
     <string name="PaymentsHomeFragment__activate_payments">Ödemeleri Etkinleştir</string>
     <string name="PaymentsHomeFragment__activating_payments">Ödemeler etkinleştiriliyor…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Ödemeler hesabını geri getir</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">Detaylar</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">MobileCoin göndermek ve almak için Signal\'i kullanabilirsin. Tüm ödemeler MobileCoin ve MobileCoin Wallet Kullanım Koşullarına tabidir. Bazı sorunlarla karşılaşabilir ve kaybettiğin ödeme veya bakiyeyi geri alamayabilirsin. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">MobileCoin göndermek ve almak için Molly\'i kullanabilirsin. Tüm ödemeler MobileCoin ve MobileCoin Wallet Kullanım Koşullarına tabidir. Bazı sorunlarla karşılaşabilir ve kaybettiğin ödeme veya bakiyeyi geri alamayabilirsin. </string>
     <string name="PaymentsHomeFragment__activate">Etkinleştir</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoin şartlarını görüntüle</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Signal\'de Ödemeler artık mevcut değil. Yine de kambiyoya para aktarabilirsiniz ancak ödeme alıp gönderemez veya para ekleyemezsiniz.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Molly\'de Ödemeler artık mevcut değil. Yine de kambiyoya para aktarabilirsiniz ancak ödeme alıp gönderemez veya para ekleyemezsiniz.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">İzinleri etkinleştir</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Signal, tanıdığın kişilere mesaj gönderebilmen için bu izinleri talep edecek. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Molly, tanıdığın kişilere mesaj gönderebilmen için bu izinleri talep edecek. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Bildirimler</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">İleri</string>
     <string name="PaymentsTransferFragment__invalid_address">Geçersiz adres</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Aktarmaya çalıştığınız cüzdan adresini denetleyin ve tekrar deneyin.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Kendi Signal cüzdan adresinize aktarma yapamazsınız. Desteklenen bir kambiyodaki hesabınızdaki cüzdan adresini girin.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Karekod taramak için Signal\'in kameranıza erişime ihtiyacı var.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Karekod okumak için Signal Kamera izninie ihtiyaç duyuyor. Ayarlara gidin, \"İzinler\"i seçin ve \"Kamera\"yı etkinleştirin.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Karekod taramak için Signal\'in kameranıza erişime ihtiyacı var.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Kendi Molly cüzdan adresinize aktarma yapamazsınız. Desteklenen bir kambiyodaki hesabınızdaki cüzdan adresini girin.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Karekod taramak için Molly\'in kameranıza erişime ihtiyacı var.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Karekod okumak için Molly Kamera izninie ihtiyaç duyuyor. Ayarlara gidin, \"İzinler\"i seçin ve \"Kamera\"yı etkinleştirin.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Karekod taramak için Molly\'in kameranıza erişime ihtiyacı var.</string>
     <string name="PaymentsTransferFragment__settings">Ayarlar</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Gelen Signal sesli araması</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Gelen Molly sesli araması</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Gelen Signal görüntülü araması</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Gelen Molly görüntülü araması</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Gelen Signal grup araması</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Gelen Molly grup araması</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Devam eden Signal sesli araması</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Devam eden Molly sesli araması</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Devam eden Signal görüntülü araması</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Devam eden Molly görüntülü araması</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Devam eden Signal grup araması</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Devam eden Molly grup araması</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Yükleniyor…</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">Doğrula</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Yedek parolanızı doğru girdiniz</string>
     <string name="BackupDialog_passphrase_was_not_correct">Parolanız doğru değil</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signal yedeği yaratılıyor…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Molly yedeği yaratılıyor…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Signal yedeklemesi doğrulanıyor…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Molly yedeklemesi doğrulanıyor…</string>
     <string name="LocalBackupJobApi29_backup_failed">Yedekleme başarısız oldu</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Yedekleme dizini silindi veya taşındı.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Yedek dosyası bu sürücüde saklanmak için çok büyük.</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Beni ara (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Kodu Yeniden Gönder (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Signal Destek Ekibiyle İletişime Geç</string>
-    <string name="RegistrationActivity_code_support_subject">Signal Kaydı - Android için Doğrulama Kodu</string>
+    <string name="RegistrationActivity_contact_signal_support">Molly Destek Ekibiyle İletişime Geç</string>
+    <string name="RegistrationActivity_code_support_subject">Molly Kaydı - Android için Doğrulama Kodu</string>
     <string name="RegistrationActivity_incorrect_code">Geçersiz kod</string>
     <string name="BackupUtil_never">Asla</string>
     <string name="BackupUtil_unknown">Bilinmiyor</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Telefon numarası</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Telefon numaranı kimlerin görebileceğini ve seninle kimlerin Signal üzerinden iletişim kurabileceğini seç.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Telefon numaranı kimlerin görebileceğini ve seninle kimlerin Molly üzerinden iletişim kurabileceğini seç.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Numaramı kimler görebilir?</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Çok fazla deneme yaptınız. Lütfen daha sonra tekrar deneyiniz.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Hizmete bağlanırken hata</string>
     <string name="preferences_chats__backups">Yedekler</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal kilitli</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly kilitli</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">AÇMAK İÇİN DOKUNUN</string>
     <string name="Recipient_unknown">Bilinmeyen</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Eski cihazınıza erişiminiz olmalıdır.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Yedekten geri yükle</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">İletilerinizi yerel bir yedekten geri yükleyin. Eğer şimdi yüklemezseniz, daha sonra yükleyemezsiniz.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Yerel yedeklemeni geri yükle</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signal yedeklemeni geri yükle</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Tüm metin mesajlarını ve son 30 günlük medyanı geri yükle</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Daha fazla seçenek</string>
 
+    <string name="TransferOrRestoreFragment__cancel">İptal</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Aktarmadan oturum aç</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Mesajlarını ve medyanı aktarmadan devam et</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Eski Android cihazınızda Signal\'i açın</string>
     <string name="NewDeviceTransferInstructions__continue">Devam Et</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Eski Android cihaza bağlanmaya hazırlanılıyor…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Biraz bekleyin, yakında hazır olacak</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Eski Android cihazın bağlanması bekleniyor…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal eski Android cihazınızı keşfetmek ve bağlamak için konum erişimine ihtiyaç duyar.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal eski Android cihazınızı keşfetmek ve bağlamak için konum hizmetlerinin etkinleştirilmesine ihtiyaç duyar</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal eski Android cihazınızı keşfetmek ve bağlamak için kablosuzun etkinleştirilmesine ihtiyaç duyar. Kablosuzun açık olması gereklidir fakat herhangi bir kablosuz ağa bağlı olması gerekli değildir.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Üzgünüz, görünüşe göre bu cihaz Wi-Fi Direct desteklemiyor. Signal eski Android cihazınızı keşfetmek ve bağlamak için Wi-Fi Direct kullanır. Eski Android cihazınızdaki hesabınızı geri yüklemek için yedek kullanabilirsiniz.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly eski Android cihazınızı keşfetmek ve bağlamak için konum erişimine ihtiyaç duyar.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly eski Android cihazınızı keşfetmek ve bağlamak için konum hizmetlerinin etkinleştirilmesine ihtiyaç duyar</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly eski Android cihazınızı keşfetmek ve bağlamak için kablosuzun etkinleştirilmesine ihtiyaç duyar. Kablosuzun açık olması gereklidir fakat herhangi bir kablosuz ağa bağlı olması gerekli değildir.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Üzgünüz, görünüşe göre bu cihaz Wi-Fi Direct desteklemiyor. Molly eski Android cihazınızı keşfetmek ve bağlamak için Wi-Fi Direct kullanır. Eski Android cihazınızdaki hesabınızı geri yüklemek için yedek kullanabilirsiniz.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Yedeği geri yükle</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Eski Android cihazınıza bağlanmaya çalışılırken beklenmedik bir hata oluştu.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Yeni Android cihaz aranıyor…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal yeni Android cihazınızı keşfetmek ve bağlamak için konum erişimine ihtiyaç duyar</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal yeni Android cihazınızı keşfetmek ve bağlamak için konum hizmetlerinin etkinleştirilmesine ihtiyaç duyar</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal yeni Android cihazınızı keşfetmek ve bağlamak için Wi-Fi\'a ihtiyaç duyar. Kablosuzun açık olması gereklidir fakat herhangi bir kablosuz ağa bağlı olması gerekli değildir.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Üzgünüz, görünüşe göre bu cihaz Wi-Fi Direct desteklemiyor. Signal yeni Android cihazınızı keşfetmek ve bağlamak için Wi-Fi Direct kullanır. Yeni Android cihazınıza hesabınızı geri yüklemek için yedek kullanabilirsiniz.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly yeni Android cihazınızı keşfetmek ve bağlamak için konum erişimine ihtiyaç duyar</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly yeni Android cihazınızı keşfetmek ve bağlamak için konum hizmetlerinin etkinleştirilmesine ihtiyaç duyar</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly yeni Android cihazınızı keşfetmek ve bağlamak için Wi-Fi\'a ihtiyaç duyar. Kablosuzun açık olması gereklidir fakat herhangi bir kablosuz ağa bağlı olması gerekli değildir.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Üzgünüz, görünüşe göre bu cihaz Wi-Fi Direct desteklemiyor. Molly yeni Android cihazınızı keşfetmek ve bağlamak için Wi-Fi Direct kullanır. Yeni Android cihazınıza hesabınızı geri yüklemek için yedek kullanabilirsiniz.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Yedek oluştur</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Yeni Android cihazınıza bağlanmaya çalışılırken beklenmedik bir hata oluştu.</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Veri aktarılıyor</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Her iki aygıtı birbirine yakın tutun. Aygıtları kapatmayın ve Signal\'i açık tutun. Aktarımlar uçtan uça şifrelidir.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Her iki aygıtı birbirine yakın tutun. Aygıtları kapatmayın ve Molly\'i açık tutun. Aktarımlar uçtan uça şifrelidir.</string>
     <string name="DeviceTransfer__d_messages_so_far">Şimdiye kadar %1$d ileti…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">Şu ana kadar %1$s%% ileti…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Hesabı Aktar</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Signal\'i yeni Android aygıtınıza indirin</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Molly\'i yeni Android aygıtınıza indirin</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"\"Hesabı aktar veya geri yükle\"ye dokunun"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Bu bağlantıya sahip herkes grubun ismini ve fotoğrafını görebilir, katılma isteğinde bulunabilir. Güvendiğiniz kişilerle paylaşın.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Bu bağlantıya sahip herkes grubun ismini ve fotoğrafını görebilir, katılabilir. Güvendiğiniz kişilerle paylaşın.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Signal ile Paylaş</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Molly ile Paylaş</string>
     <string name="GroupLinkBottomSheet_copy">Kopyala</string>
     <string name="GroupLinkBottomSheet_qr_code">Karekod</string>
     <string name="GroupLinkBottomSheet_share">Paylaş</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">MobileCoin Hakkında</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin, gizlilik odaklı yeni bir dijital para birimidir.</string>
     <string name="payment_info_card_adding_funds">Para ekleme</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Cüzdan adresinize MobileCoin göndererek Signal\'de kullanmak için para ekleyebilirsiniz.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Cüzdan adresinize MobileCoin göndererek Molly\'de kullanmak için para ekleyebilirsiniz.</string>
     <string name="payment_info_card_cashing_out">Nakit çıkışı</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">İstediğiniz zaman MobileCoin destekleyen herhangi bir kambiyoda nakde çevirebilirsiniz. Sadece bu kambiyodaki hesabınıza aktarım yapmanız gerektiğini unutmayın.</string>
     <string name="payment_info_card_hide_this_card">Bu kartı sakla?</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Cüzdanı Devre Dışı Bırak</string>
     <string name="DeactivateWalletFragment__your_balance">Bakiyeniz</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Ödemeleri devre dışı bırakmadan önce mevcut bakiyeni başka bir cüzdana aktarmanı öneriyoruz. Eğer paranı şimdi aktarmamayı seçersen ödemeleri tekrar etkinleştirmeyi seçersen Signal\'e bağlı cüzdanında kalacaktır.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Ödemeleri devre dışı bırakmadan önce mevcut bakiyeni başka bir cüzdana aktarmanı öneriyoruz. Eğer paranı şimdi aktarmamayı seçersen ödemeleri tekrar etkinleştirmeyi seçersen Molly\'e bağlı cüzdanında kalacaktır.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Kalan bakiyeyi aktar</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Aktarmadan devre dışı bırak</string>
     <string name="DeactivateWalletFragment__deactivate">Devre dışı bırak</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Aktarmadan devre dışı bırakılsın mı?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Ödemeleri tekrar etkinleştirmeyi seçersen bakiyen Signal\'e bağlı cüzdanında kalacaktır.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Ödemeleri tekrar etkinleştirmeyi seçersen bakiyen Molly\'e bağlı cüzdanında kalacaktır.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Cüzdanı devre dışı bırakırken bir hata oldu.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Lisanslar</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Koşullar ve Gizlilik İlkesi</string>
-    <string name="HelpFragment__copyright_signal_messenger">Telif hakkı Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Telif hakkı Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">GNU AGPLv3\'e göre lisanslanmıştır</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4773,7 +4911,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">Otomatik</string>
+    <string name="ChatColorSelectionFragment__auto">Oto</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Özel renkleri kullan</string>
     <string name="ChatColorSelectionFragment__chat_color">Sohbet rengi</string>
     <string name="ChatColorSelectionFragment__edit">Düzenle</string>
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Renk seçin</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Paylaş</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Bu gruba yalnızca yöneticiler ileti gönderebilir.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Sınıra ulaşıldı</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">5\'ten fazla sohbet seçemezsin</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">Daha fazlasını öğren</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Signal\'i Güncelle</string>
+    <string name="UpdateSignalExpiredDialog__title">Molly\'i Güncelle</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Signal\'in bu sürümü kullanım dışı kaldı. Signal\'i kullanmaya devam etmek için şimdi güncelle.</string>
+    <string name="UpdateSignalExpiredDialog__message">Molly\'in bu sürümü kullanım dışı kaldı. Molly\'i kullanmaya devam etmek için şimdi güncelle.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Güncelle</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Cihaz kayıtlı değil</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Bu cihaz artık kayıtlı değil. Signal\'i bu cihazda kullanmaya devam etmek için yeniden kaydol.</string>
+    <string name="ReregisterSignalDialog__message">Bu cihaz artık kayıtlı değil. Molly\'i bu cihazda kullanmaya devam etmek için yeniden kaydol.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Tekrar kaydet</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Seçicinin açılmasında hata oldu.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Signal\'ın bildirimleri açması için görüntüleme izni gerekiyor.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Molly\'ın bildirimleri açması için görüntüleme izni gerekiyor.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Aç</string>
 
@@ -5637,7 +5773,7 @@
     <!-- Used to join views and replies when both exist on a story item -->
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
-    <string name="StoryViewerPageFragment__you">Siz</string>
+    <string name="StoryViewerPageFragment__you">Sen</string>
     <!-- Displayed when viewing a story sent to a group, placeholders are person who sent the story and the group name -->
     <string name="StoryViewerPageFragment__s_to_s">%1$s --&gt; %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Henüz yanıt yok</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Artık bu grubun bir üyesi olmadığın için bu hikayeye yanıt veremezsin.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Hikayeye tepki verildi</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Kısa hikayeye tepki verdin</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Kısa hikayeye tepki verdi</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Görülmeler</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Bankanı seç</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Bağışını %1$s ile Onayla</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Yinelenen bağışını ayarlamak için bankanın keseceği 0,01 €\'luk ücreti onaylamak üzere devam düğmesine dokun. Bu tutar otomatik olarak iade edilecek ve 5 €/ay bağışının hesabından çekilmesini sağlayacaktır.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Yinelenen bağışını ayarlamak için bankanın keseceği 0,01 €\'luk ücreti onaylamak üzere devam düğmesine dokun. Bu tutar otomatik olarak iade edilecek ve %1$s/ay bağışının hesabından çekilmesini sağlayacaktır.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Devam et</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Yedekleme verileri indiriliyor…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Medya yedeklemeleri kapalı</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Signal medya yedekleme planın ödemeni işleme koyamadığımız için iptal edildi. Yedeklemende depolanan medyaları indirmek için %1$d günün var. %1$d gün sonra yedeklemendeki medyalar silinecektir.</item>
+        <item quantity="other">Signal medya yedekleme planın ödemeni işleme koyamadığımız için iptal edildi. Yedeklemende depolanan medyaları indirmek için %1$d günün var. %1$d gün sonra yedeklemendeki medyalar silinecektir.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Medyanın tamamını yedeklemeye devam etmek için istediğin zaman yedeklemeler için yeniden ödeme yapmaya başlayabilirsin. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Medyan bugün silinecek</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Signal medya yedekleme planın iptal edildi çünkü ödemeni işleme alamadık. Bu, silinmeden önce yedeklemendeki medyayı indirmek için son şansın.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">İndirme tamamlanamıyor</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Cihazında yeterli boş alan yok. Yedeklemende depolanan medyayı indirmek için %1$s kadar alan boşalt.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">\"Atla\" öğesini seçersen yedeklemendeki medya %1$d gün içinde silinecektir.</item>
+        <item quantity="other">\"Atla\" öğesini seçersen yedeklemendeki medya %1$d gün içinde silinecektir.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Yedekleme ödemesi işlenemiyor</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Yinelenen aylık yedekleme ödemeni tahsil etmekte sorun yaşıyoruz. Ödeme yönteminin güncel olduğundan emin ol. Değilse, Google Pay\'de ödeme yöntemini güncelle. Signal birkaç gün içinde ödemeyi tekrar işlemeye çalışacaktır.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Yedekleme tamamlanamadı</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Cihazın %1$d gün boyunca bir yedeklemeyi tamamlamadı. Cihazının wi-fi\'ye bağlı olduğundan emin ol ve \"Şimdi yedekle\" ögesine dokun. </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Daha fazlasını öğren</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Atla</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Medyayı şimdi indir</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Daha sonra indir</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Medyayı indirme</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Medyanı indirmek için %1$s alan boşalt.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Kredi veya banka kartı</string>
@@ -6874,16 +7058,129 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Bilinmeyen</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Ödeme geçmişi</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Son yedeklemen %1$s tarihinde %2$s saatinde yapılmıştır.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
-    <string name="ManageStorageSettingsFragment_chat_limit">Sohbet limitleri</string>
+    <string name="ManageStorageSettingsFragment_chat_limit">Konuşma uzunluğu limitleri</string>
     <!-- Settings row title text that can be clicked to delete all messages and associated data from the device -->
     <string name="ManageStorageSettingsFragment_delete_message_history">Mesaj geçmişini sil</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (time is a range like 30 days or 1 year etc) -->
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Seçilen zamandan daha eski mesajlar kalıcı olarak silinecektir.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Seçilen uzunluğu aşan mesajlar kalıcı olarak silinecektir.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Bağlı cihazlara limitler uygula</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Etkinleştirildiğinde, sohbet limitleri bağlı cihazlarındaki mesajları da siler.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Silme işlemi şu anda tüm cihazlarında senkronize ediliyor</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Mesajları veya sohbetleri sildiğinde, bunlar telefonundan ve bağlı cihazlardan silinecektir.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">TAMAM</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Ödeme geçmişi</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Metin ve tüm medya yedeklemesi</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Ödeme detayları</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Yedekleme türü</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Ödeme tarihi</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Paylaş</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal Yedeklemeleri</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Ödeme geçmişi</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Yedekleme detayları</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Yedekleme boyutu</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Yedekleme sıklığı</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Hücresel bağlantı kullanarak yedekleme</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Yedeklemeyi kapat ve sil</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Yedekleme silindi ve kapatıldı.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Yedekleme türü değiştirildi ve abonelik iptal edildi</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Abonelik iptal edildi</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">İndirme tamamlandı</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Yedekleme türü</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Yedeklemeler devre dışı</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/ay</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Yedekleri etkinleştir</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Son yedekleme</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%2$s, %1$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Asla</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Şimdi Yedekle</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Yedeklemeler kapatılıp silinsin mi?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Tekrar ücretlendirilmeyeceksin. Yedeklemen silinecek ve yeni yedekleme oluşturulmayacaktır.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Kapat ve sil</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Yedekleme siliniyor…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Yedekleme silindi</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Şimdi yedekle seçeneğine dokunarak"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Günlük</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Haftalık</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Aylık</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Manüel yedekleme</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Lütfen cihaz pinini, parolanı veya desenini gir.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">İleri</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Yedekleme türünü değiştir</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Aboneliği iptal et</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">İptali onayla</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Tekrar ücretlendirilmeyeceksin. Yedeklemeler faturalandırma döneminin sonunda kapatılacaktır. Bu tarihten sonra, şu anda yedeklemekte olduğun medyayı indirmek için 30 günün olacaktır.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Onayla ve şimdi indir</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Onayla ve sonra indir</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Aboneliğe devam et</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml
index 7196b099ee..239d39b1de 100644
--- a/app/src/main/res/values-ug/strings.xml
+++ b/app/src/main/res/values-ug/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal يېڭىلىنىۋاتىدۇ…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly يېڭىلىنىۋاتىدۇ…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">سىز تېخى ئىم ئىبارىسى بېكىتمىدىڭىز!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">ئىم ئىبارىسى چەكلەمدۇ؟</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">بۇ Signal ۋە ئۇچۇر ئۇقتۇرۇش قۇلۇپىنى مەڭگۈ ئوچۇق قويىدۇ.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">بۇ Molly ۋە ئۇچۇر ئۇقتۇرۇش قۇلۇپىنى مەڭگۈ ئوچۇق قويىدۇ.</string>
     <string name="ApplicationPreferencesActivity_disable">چەكلە</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">مۇلازىمېتىرغا باغلىنىش خاتالىقى!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">تىزىملىتىش قۇلۇپى ئۈچۈن PIN تەلەپ قىلىنىدۇ. PIN نى چەكلەش ئۈچۈن، ئالدى بىلەن تىزىملاش قۇلۇپىنى چەكلەڭ.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">ھۆججەت</string>
     <string name="AttachmentKeyboard_contact">ئالاقەداش</string>
     <string name="AttachmentKeyboard_location">ئورنى</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">رەسىم ۋە ۋىدېيولىرىڭىزنى كۆرسىتىش ئۈچۈن Signal ئىجازىتىڭىزگە ئېھتىياجلىق</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">رەسىم ۋە ۋىدېيولىرىڭىزنى كۆرسىتىش ئۈچۈن Molly ئىجازىتىڭىزگە ئېھتىياجلىق</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">ئىشلىتىشكە رۇخسەت</string>
     <string name="AttachmentKeyboard_payment">چىقىم</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">ۋاسىتە تاللىغۇدەك بىر ئەپ تاپالمىدى.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal رەسىم ، سىن ياكى ئۈن ھۆججەتلىرىنى قوشۇش ئۈچۈن ساقلىغۇچ ھوقۇقى تەلەپ قىلىدۇ، ئەمما ئۇ مەڭگۈلۈك رەت قىلىندى. ئەپ تەڭشىكى تىزىملىكىدىن، «ھوقۇقلار» نى تاللاپ ۋە «ساقلىغۇچ» نى قوزغىتىڭ.</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">ئالاقىلىشىش ئۇچۇرلىرىنى چاپلاش ئۈچۈن Signal ئالاقەداشلار ھوقۇقى تەلەپ قىلىدۇ، ئەمما ئۇ مەڭگۈلۈك رەت قىلىندى. ئەپ تەڭشىكى تىزىملىكىدىن «ھوقۇقلار» نى تاللاپ، «ئالاقەداشلار» نى قوزغىتىڭ.</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal ئورۇن بەلگىلەش ئۈچۈن ئورۇن ھوقۇقى تەلەپ قىلىدۇ، ئەمما ئۇ مەڭگۈلۈك رەت قىلىندى. ئەپ تەڭشىكى تىزىملىكىگە بېرىڭ، «ھوقۇقلار» نى تاللاڭ ۋە «ئورۇن» نى قوزغىتىڭ.</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly رەسىم ، سىن ياكى ئۈن ھۆججەتلىرىنى قوشۇش ئۈچۈن ساقلىغۇچ ھوقۇقى تەلەپ قىلىدۇ، ئەمما ئۇ مەڭگۈلۈك رەت قىلىندى. ئەپ تەڭشىكى تىزىملىكىدىن، «ھوقۇقلار» نى تاللاپ ۋە «ساقلىغۇچ» نى قوزغىتىڭ.</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">ئالاقىلىشىش ئۇچۇرلىرىنى چاپلاش ئۈچۈن Molly ئالاقەداشلار ھوقۇقى تەلەپ قىلىدۇ، ئەمما ئۇ مەڭگۈلۈك رەت قىلىندى. ئەپ تەڭشىكى تىزىملىكىدىن «ھوقۇقلار» نى تاللاپ، «ئالاقەداشلار» نى قوزغىتىڭ.</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly ئورۇن بەلگىلەش ئۈچۈن ئورۇن ھوقۇقى تەلەپ قىلىدۇ، ئەمما ئۇ مەڭگۈلۈك رەت قىلىندى. ئەپ تەڭشىكى تىزىملىكىگە بېرىڭ، «ھوقۇقلار» نى تاللاڭ ۋە «ئورۇن» نى قوزغىتىڭ.</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">ئورنىڭىزغا ئىجازەت بېرىش</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">ئورنىڭىزنى يوللاش ئۈچۈن:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">ئورنىڭىزنى يوللاش ئۈچۈن Signal غا رۇخسەت قىلىڭ.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">ئورنىڭىزنى يوللاش ئۈچۈن Molly غا رۇخسەت قىلىڭ.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">ئورنىڭىزنى يوللاش ئۈچۈن Signal ئ‍ورۇن ئىجازىتىنى لازىم قىلىدۇ.</string>
+    <string name="AttachmentManager_signal_needs_location_access">ئورنىڭىزنى يوللاش ئۈچۈن Molly ئ‍ورۇن ئىجازىتىنى لازىم قىلىدۇ.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">ساقلاش بوشلۇقىغا ئىجازەت قىلىش</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">رەسىم ۋە ۋىدېيولارنى كۆرسىتىش ئۈچۈن:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">رەسىم ۋە ۋىدېيولىرىڭىزنى كۆرسىتىش ئۈچۈن Signal ساقلاش بوشلۇقى ئىجازىتىنى تەلەپ قىلىدۇ.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">رەسىم ۋە ۋىدېيولىرىڭىزنى كۆرسىتىش ئۈچۈن Molly ساقلاش بوشلۇقى ئىجازىتىنى تەلەپ قىلىدۇ.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s پۇل تۆلەش ئىقتىدارىنى تېخى ئاكتىپلىمىغان </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">كامېرا ئالماشتۇر</string>
     <string name="CameraXFragment_open_gallery_description">سۈرەتداننى ئاچ</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">ئىشلىتىشكە رۇخسەت</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">كامېرا ۋە مىكروفونىڭىزغا ئىجازەت قىلىش</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">كامېرا ھوقۇقىغا ئىجازەت قىلىش</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">مىكروفوننى ئىشلىتىشكە رۇخسەت قىلىڭ</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">رەسىم تارتىش ئۈچۈن ، Signal نىڭ كامېرانى زىيارەت قىلىشىغا رۇخسەت قىلىڭ.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">رەسىم ۋە سىنغا ئېلىش ئۈچۈن ، Signal نىڭ كامېرانى زىيارەت قىلىشىغا يول قويۇڭ.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">رەسىم ۋە سىنغا ئېلىش ئۈچۈن، Signal نىڭ كامېرا ۋە مىكروفوننى زىيارەت قىلىشىغا رۇخسەت قىلىڭ.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">ئاۋازلىق سىنغا ئېلىش ئۈچۈن، Signal نىڭ مىكروفوننى زىيارەت قىلىشىغا رۇخسەت قىلىڭ.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">QR كودىنى سايىلەش ئۈچۈن، Signal نىڭ كامېرانى زىيارەت قىلىشىغا رۇخسەت قىلىڭ.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">رەسىم تارتىش ئۈچۈن Signal كامېرا ئىجازىتىنى تەلەپ قىلىدۇ</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">QR كودىنى سايىلەش ئۈچۈن Signal كامېرا ئىجازىتىنى تەلەپ قىلىدۇ</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">سىنغا ئېلىش ئۈچۈن Signal مىكروفون ئىجازىتىنى تەلەپ قىلىدۇ</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Signal دا رەسىمگە تارتىش:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Signal دا رەسىم تارتىش ۋە سىنغا ئېلىش:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">ئاۋازلىق سىنغا ئېلىش:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR كودىنى سايىلەش:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">يېقىنقى ئالاقەداشلار</string>
@@ -270,7 +271,7 @@
     <string name="CameraContacts_no_signal_contacts">Signal ئالاقەداش يوق</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">سىز پەقەت كامېرا كۇنۇپكىسىنى ئىشلىتىش ئارقىلىق Signal دىكى ئالاقەداشلىرىڭىزغا رەسىم ئەۋەتەلەيسىز. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">ئىزدەۋاتقان كىشىڭىزنى تاپالمايۋاتامسىز؟</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">بىر ئالاقەداشنى Signal غا تەكلىپ قىلىش</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">بىر ئالاقەداشنى Molly غا تەكلىپ قىلىش</string>
     <string name="CameraContacts__menu_search">ئىزدە</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -284,12 +285,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">ياق، رەھمەت</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Signal نى يېڭىلا</string>
+    <string name="ClientDeprecatedActivity_update_signal">Molly نى يېڭىلا</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">بۇ ئەپنىڭ مەزكۇر نەشرىنى ئەمدى قوللىمايدۇ. ئۇچۇر ئەۋەتىش ۋە تاپشۇرۇۋېلىشنى داۋاملاشتۇرۇش ئۈچۈن، ئەڭ يېڭى نەشرىگە يېڭىلاڭ.</string>
     <string name="ClientDeprecatedActivity_update">يېڭىلا</string>
     <string name="ClientDeprecatedActivity_dont_update">يېڭىلىما</string>
     <string name="ClientDeprecatedActivity_warning">ئاگاھلاندۇرۇش</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Signal نەشرىڭىزنىڭ ۋاقتى توشتى. سىز ئۇچۇر تارىخىڭىزنى كۆرەلەيسىز، ئەمما يېڭىلىمىغۇچە ئۇچۇر ئەۋەتەلەيسىز ۋە تاپشۇرۇپ ئالالمايسىز.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Molly نەشرىڭىزنىڭ ۋاقتى توشتى. سىز ئۇچۇر تارىخىڭىزنى كۆرەلەيسىز، ئەمما يېڭىلىمىغۇچە ئۇچۇر ئەۋەتەلەيسىز ۋە تاپشۇرۇپ ئالالمايسىز.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">توركۆرگۈ تېپىلمىدى.</string>
@@ -326,8 +327,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">%1$s گە ئۇچۇر قىلىش</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly ئاۋازلىق چاقىرىق %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly سىنلىق چاقىرىق %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -419,7 +420,7 @@
     <string name="ConversationActivity_transport_signal">Signal ئۇچۇرى</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">ئۇچۇر ئەۋەت</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Signal دا پاراڭلىشايلى%1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Molly دا پاراڭلىشايلى%1$s</string>
     <string name="ConversationActivity_specify_recipient">بىر ئالاقىلەشكۈچى تاللاڭ</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">قوشۇمچە ھۆججەت سىز ئەۋەتىۋاتقان ئۇچۇر تىپىنىڭ سىغىم چېكىدىن ئېشىپ كەتتى.</string>
     <string name="ConversationActivity_unable_to_record_audio">ئاۋازنى ئۈنگە ئالالمايدۇ!</string>
@@ -438,18 +439,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">ئاۋازلىق ئۇچۇر يوللاش ئۈچۈن:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">ئاۋازلىق ئۇچۇر يوللاش ئۈچۈن، Signal نىڭ مىكروفونىڭىزنى زىيارەت قىلىشىغا رۇخسەت قىلىڭ.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">ئاۋازلىق ئۇچۇر يوللاش ئۈچۈن، Molly نىڭ مىكروفونىڭىزنى زىيارەت قىلىشىغا رۇخسەت قىلىڭ.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">ئاۋازلىق ئۇچۇر خاتىرىلەش ئۈچۈن Signal مىكروفون ئىجازىتىنى لازىم قىلىدۇ.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">ئۈنلىك ئۇچۇر يوللاش ئۈچۈن Signal مىكروفون ھوقۇقى تەلەپ قىلىدۇ، ئەمما ئۇ مەڭگۈلۈك رەت قىلىندى. ئەپ تەڭشىكى تىزىملىكىدىن «ھوقۇقلار» نى تاللاپ ۋە «مىكروفون» نى قوزغىتىڭ.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">ئاۋازلىق ئۇچۇر خاتىرىلەش ئۈچۈن Molly مىكروفون ئىجازىتىنى لازىم قىلىدۇ.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">ئۈنلىك ئۇچۇر يوللاش ئۈچۈن Molly مىكروفون ھوقۇقى تەلەپ قىلىدۇ، ئەمما ئۇ مەڭگۈلۈك رەت قىلىندى. ئەپ تەڭشىكى تىزىملىكىدىن «ھوقۇقلار» نى تاللاپ ۋە «مىكروفون» نى قوزغىتىڭ.</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s گە چاقىرىق قىلىش ئۈچۈن Signal مىكروفون ۋە كامېرا ھوقۇقىنى ئىشلىتىشى كېرەك، لېكىن ئۇ ھوقۇقلار مەڭگۈلۈك چەكلەنگەن. ئەپ تەڭشىكىگە كىرىپ، «ھوقۇقلار» نى تاللاپ، «مىكروفون» ۋە «كامېرا» نى قوزغىتىڭ.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">رەسىم ۋە سىنغا ئېلىش ئۈچۈن ، Signal نىڭ كامېرانى زىيارەت قىلىشىغا يول قويۇڭ.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">رەسىم تارتىش ياكى سىنغا ئېلىش ئۈچۈن Signal كامېرا ھوقۇقىغا موھتاج ، ئەمما ئۇ مەڭگۈلۈك رەت قىلىندى. ئەپ تەڭشەكلىرىدىن، «ھوقۇقلار» نى تاللاپ ۋە «كامېرا» نى قوزغىتىڭ.</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">رەسىم تارتىش ياكى سىنغا ئېلىش ئۈچۈن Signal كامېرا ھوقۇقىغا موھتاج</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s گە چاقىرىق قىلىش ئۈچۈن Molly مىكروفون ۋە كامېرا ھوقۇقىنى ئىشلىتىشى كېرەك، لېكىن ئۇ ھوقۇقلار مەڭگۈلۈك چەكلەنگەن. ئەپ تەڭشىكىگە كىرىپ، «ھوقۇقلار» نى تاللاپ، «مىكروفون» ۋە «كامېرا» نى قوزغىتىڭ.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">رەسىم ۋە سىنغا ئېلىش ئۈچۈن ، Molly نىڭ كامېرانى زىيارەت قىلىشىغا يول قويۇڭ.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">رەسىم تارتىش ياكى سىنغا ئېلىش ئۈچۈن Molly كامېرا ھوقۇقىغا موھتاج ، ئەمما ئۇ مەڭگۈلۈك رەت قىلىندى. ئەپ تەڭشەكلىرىدىن، «ھوقۇقلار» نى تاللاپ ۋە «كامېرا» نى قوزغىتىڭ.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">رەسىم تارتىش ياكى سىنغا ئېلىش ئۈچۈن Molly كامېرا ھوقۇقىغا موھتاج</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">ئاۋازلىق سىنغا ئېلىش ئۈچۈن مىكروفون ھوقۇقىنى قوزغىتىڭ.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">سىنغا ئېلىش ئۈچۈن Signal مىكروفون ھوقۇقىغا موھتاج ، ئەمما ئۇلار رەت قىلىندى. ئەپ تەڭشەكلىرىدىن «ھوقۇقلار» نى تاللاپ ۋە «مىكروفون» ۋە «كامېرا» نى قوزغىتىڭ.</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">سىنغا ئېلىش ئۈچۈن Signal غا مىكروفون ئىجازىتى لازىم.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">سىنغا ئېلىش ئۈچۈن Molly مىكروفون ھوقۇقىغا موھتاج ، ئەمما ئۇلار رەت قىلىندى. ئەپ تەڭشەكلىرىدىن «ھوقۇقلار» نى تاللاپ ۋە «مىكروفون» ۋە «كامېرا» نى قوزغىتىڭ.</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">سىنغا ئېلىش ئۈچۈن Molly غا مىكروفون ئىجازىتى لازىم.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">ياق</string>
@@ -470,9 +471,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">چاقىرىق باشلاش ئ‍ۈچۈن:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">چاقىرىق باشلاش ئۈچۈن Signal نىڭ مىكروفوننى ئىشلىتىشىگە ئىجازەت قىلىڭ.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">چاقىرىق باشلاش ئۈچۈن Molly نىڭ مىكروفوننى ئىشلىتىشىگە ئىجازەت قىلىڭ.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">چاقىرىق باشلاش ئۈچۈن Signal مىكروفوننى ئىشلىتىدۇ.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">چاقىرىق باشلاش ئۈچۈن Molly مىكروفوننى ئىشلىتىدۇ.</string>
 
 
     <string name="ConversationActivity_join">قوشۇل</string>
@@ -486,9 +487,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Signal ئەمدى SMS ئۇچۇرلىشىش ئىقتىدارىنى قوللىمايدۇ. «%1$s» نى Signal غا تەكلىپ قىلىپ داۋاملىق پاراڭلاشسىڭىز بولىدۇ.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">بۇ كىشى Signal نى ئەمدى ئىشلەتمەيدۇ. ئۇلارنى Signal غا تەكلىپ قىلىپ پاراڭنى داۋاملاشتۇرۇڭ.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">بۇ كىشى Molly نى ئەمدى ئىشلەتمەيدۇ. ئۇلارنى Molly غا تەكلىپ قىلىپ پاراڭنى داۋاملاشتۇرۇڭ.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Signal ئىشلىتىش تەكلىپى</string>
+    <string name="ConversationActivity__invite_to_signal">Molly ئىشلىتىش تەكلىپى</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">سىزنى پات يېقىندا قايتا ئەسكەرتىمىز.</string>
 
@@ -536,6 +537,8 @@
     <string name="ConversationFragment_delete_for_everyone">ھەممەيلەن ئۈچۈن ئۆچەر</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">بۇ ئۈسكۈنىدىن ئۆچۈرۈش</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">ئۆچۈرۈش</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">ھەممىسىدىن ئ‍ۆچۈرۈش</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">ئەگەر پاراڭدىكى كىشىلەر Signal نىڭ يېقىنقى نەشرىنى ئىشلىتىۋاتقان بولسا، بۇ ئۇچۇر پاراڭدىكى ھەممەيلەن ئۈچۈن ئۆچۈرۈلىدۇ. ئۇلار سىزنىڭ بىر ئۇچۇرنى ئۆچۈرگەنلىكىڭىزنى كۆرەلەيدۇ.</string>
@@ -567,13 +570,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">چەكلەندى</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Signal نى يېڭىلا</string>
+    <string name="ConversationFragment__update_build">Molly نى يېڭىلا</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Signal غا قايتا تىزىملىتىش</string>
+    <string name="ConversationFragment__reregister_signal">Molly غا قايتا تىزىملىتىش</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">كەينىگە قايتىش.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signal نى ئېچىڭ</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Molly نى ئېچىڭ</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">دەلىللەنمىگەن</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -636,6 +639,10 @@
     <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
         <item quantity="other">بۇ مەشغۇلاتتا تاللىغان %1$d پاراڭنىڭ ھەممىسى مەڭگۈلۈك ئۆچۈرۈلىدۇ.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="other">بۇ مەشغۇلات بارلىق ئۈسكۈنىڭىزدىكى تاللانغان %1$d پاراڭنىڭ ھەممىسىنى مەڭگۈلۈك ئۆچۈرىدۇ.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">ئۆچۈرۈلۈۋاتىدۇ</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="other">تاللىغان پاراڭلارنى ئۆچۈرۈش…</item>
@@ -719,9 +726,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">كىملەر مېنى تېلېفون نومۇرۇم بىلەن تاپسا بولىدۇ؟</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">تېلېفون نومۇرىڭىز بار ھەرقانداق كىشى سىزنىڭ Signal دا ئىكەنلىكىڭىزنى كۆرەلەيدۇ ۋە سىز بىلەن پاراڭ باشلىيالايدۇ.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">تېلېفون نومۇرىڭىز بار ھەرقانداق كىشى سىزنىڭ Molly دا ئىكەنلىكىڭىزنى كۆرەلەيدۇ ۋە سىز بىلەن پاراڭ باشلىيالايدۇ.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">ئەگەر باشقىلارغا ئۇچۇر يوللىسىمىڭىز ياكى باشقىلار بىلەن بۇرۇندىنلا مەۋجۇت پارىڭىڭىز بولمىسا، باشقىلار سىزنىڭ Signal دا ئىكەنلىكىڭىزنى كۆرەلمەيدۇ.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">ئەگەر باشقىلارغا ئۇچۇر يوللىسىمىڭىز ياكى باشقىلار بىلەن بۇرۇندىنلا مەۋجۇت پارىڭىڭىز بولمىسا، باشقىلار سىزنىڭ Molly دا ئىكەنلىكىڭىزنى كۆرەلمەيدۇ.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">زاپاستىن ئەسلىگە كەلتۈرەمسىز؟</string>
@@ -755,7 +762,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">زاپاسلاش ئىم ئىبارىڭىزنى سىناپ بېقىڭ ھەمدە ئۇنىڭ ماس كەلگەن-كەلمىگەنلىكىنى دەلىللەڭ</string>
     <string name="BackupsPreferenceFragment__turn_on">ئېچىش</string>
     <string name="BackupsPreferenceFragment__turn_off">تاقا</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"زاپاسلانمىنى ئەسلىگە كەلتۈرۈش ئۈچۈن، Signal نى قايتا قاچىلاڭ. ئاندىن ئەپنى ئېچىپ «زاپاسلانمىنى ئەسلىگە كەلتۈرۈش» نى چېكىڭ، ئاندىن زاپاسلانما ھۆججىتىنى كۆرسىتىپ بېرىڭ. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"زاپاسلانمىنى ئەسلىگە كەلتۈرۈش ئۈچۈن، Molly نى قايتا قاچىلاڭ. ئاندىن ئەپنى ئېچىپ «زاپاسلانمىنى ئەسلىگە كەلتۈرۈش» نى چېكىڭ، ئاندىن زاپاسلانما ھۆججىتىنى كۆرسىتىپ بېرىڭ. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">كۆپرەك ئۆگىنىش</string>
     <string name="BackupsPreferenceFragment__in_progress">داۋام قىلىۋاتىدۇ…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -763,7 +770,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d ھازىرغىچە..</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s تاماملاندى…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">زاپاسلاشنى قۇرۇش ئۈچۈن Signal سىرتقى ساقلىغۇچ ھوقۇقىنى تەلەپ قىلىدۇ، ئەمما ئۇ مەڭگۈلۈك رەت قىلىندى. ئەپ تەڭشەكلىرىگە بېرىڭ، «ھوقۇقلار» نى تاللاڭ ۋە «ساقلىغۇچ» نى قوزغىتىڭ.</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">زاپاسلاشنى قۇرۇش ئۈچۈن Molly سىرتقى ساقلىغۇچ ھوقۇقىنى تەلەپ قىلىدۇ، ئەمما ئۇ مەڭگۈلۈك رەت قىلىندى. ئەپ تەڭشەكلىرىگە بېرىڭ، «ھوقۇقلار» نى تاللاڭ ۋە «ساقلىغۇچ» نى قوزغىتىڭ.</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">زاپاسلاش ۋاقتىنى تەڭشەش</string>
 
@@ -830,7 +837,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">پاراڭ يېڭىلاندى</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal ئۇچتىن-ئۇچقا مەخىپىيلەشتۈرۈش تېخنىكىسىنى قوللانغان بولۇپ، پاراڭلىرىڭىزنى بەزىدە يېڭىلاپ تۇرۇشى مۇمكىن. بۇ پاراڭنىڭ بىخەتەرلىكىگە تەسىر كۆرسەتمەيدۇ، لېكىن بۇ ئالاقىداشتىن كەلگەن بەزى ئۇچۇرلارنى كۆرمەي قېلىشىڭىز مۇمكىن، سىز ئالاقىداشتىن ئۇنى قايتا يوللاشنى سورىسىڭىز بولىدۇ.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly ئۇچتىن-ئۇچقا مەخىپىيلەشتۈرۈش تېخنىكىسىنى قوللانغان بولۇپ، پاراڭلىرىڭىزنى بەزىدە يېڭىلاپ تۇرۇشى مۇمكىن. بۇ پاراڭنىڭ بىخەتەرلىكىگە تەسىر كۆرسەتمەيدۇ، لېكىن بۇ ئالاقىداشتىن كەلگەن بەزى ئۇچۇرلارنى كۆرمەي قېلىشىڭىز مۇمكىن، سىز ئالاقىداشتىن ئۇنى قايتا يوللاشنى سورىسىڭىز بولىدۇ.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Signal نى ئۈستەليۈزى ياكى iPad دە ئىشلىتىڭ. ئۇچۇرلىرىڭىز ئۇلانغان ئۈسكۈنىلىرىڭىزگە ماسقەدەملىنىدۇ.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">يېڭى ئۈسكۈنە باغلاش</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s ئۇچۇر ۋە پاراڭ ئۇچۇرى بارلىق ئۈسكۈنىلەردە ئۇچتىن ئۇچقىچە مەخپىيلەشتۈرۈلگەن</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal ئۈستەل يۈزىدە ياكى iPad دە</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">بارلىق باغلانغان ئۈسكۈنىلەردە ئۇچۇرلىشىش مەخپىيەتلىككە كاپالەتلىك قىلىنغان ئاساسدا ئېلىپ بېرىلىدۇ</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Molly ئۇچۇرلىرى تېلېفونىڭىز باغلانغاندىن كېيىن تېلېفونىڭىزدىكى Molly بىلەن ماسقەدەملىنىدۇ. بۇرۇنقى ئۇچۇر تارىخىڭىز كۆرۈنمەيدۇ.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">باشقا ئۈسكۈنىلىرىڭىزدە Molly نى ئورنىتىش ئۈچۈن %1$s نى زىيارەت قىلىڭ</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">باغلانغان ئۈسكۈنىلىرىم</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">ئاجرىتىڭ</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s ئۇلانمىغان</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">ئۈسكۈنىنى باغلاۋاتىدۇ…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">ئۈسكۈنە تەستىقلاندى</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">قاچىلىنىۋاتىدۇ…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">باغلانغان ئۈسكۈنە يوق</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">ئۈسكۈنىنى ئۇلاش ئۈچۈن ئېچىڭ</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">باغلىنىش ئۈچۈن ئۈسكىنىدە كۆرۈنگەن QR كودىنى سايىلەڭ.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">QR كودى تارا</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">بۇ ئۈسكۈنىنى ئىشلىتىپ باغلىماقچى بولغان ئۈسكۈنىدىكى QR كودىنى سايىلەڭ</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">جەزملە</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">بۇ ئۈسكۈنە گۇرۇپپا ۋە ئالاقىداشلىرىڭىزنى كۆرەلەيدۇ، سۆھبەتلىرىڭىزنى زىيارەت قىلالايدۇ ۋە سىزنىڭ ئىسمىڭىزدا ئۇچۇر ئەۋەتەلەيدۇ.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">باشقا ئۈسكۈنىلەردە ئۇلاشنى تاماملاش</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">باشقا ئۈسكۈنىلەردىكى Molly نى ئۇلاشنى تاماملاش</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">ئۈسكۈنە باغلاش مەغلۇب بولدى</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">بۇ QR كودى ئىناۋەتلىك ئەمەس. باغلىماقچى بولغان ئۈسكۈنىدە كۆرسىتىلگەن QR كودىنى سايىلىگەنلىكىڭىزنى جەزملەشتۈرۈڭ.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">قايتا سىنا</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">«%1$s» نى ئاجرىتامسىز؟</string>
@@ -852,10 +914,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">يۈتكەن Google Play مۇلازىمەتلىرىگە ئەلالاشتۇرۇش</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">بۇ ئۈسكۈنە Google Play مۇلازىمەتلىرىنى قوللىمايدۇ. Signalنىڭ ھەرىكەتسىز ھالەتتىمۇ ئۇچۇر ئېلىشىنى توسۇپ قويىدىغان «سىستېما باتارېيەسىنى ئەلالاشتۇرۇش»نى چەكلەڭ.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">بۇ ئۈسكۈنە Google Play مۇلازىمەتلىرىنى قوللىمايدۇ. Mollyنىڭ ھەرىكەتسىز ھالەتتىمۇ ئۇچۇر ئېلىشىنى توسۇپ قويىدىغان «سىستېما باتارېيەسىنى ئەلالاشتۇرۇش»نى چەكلەڭ.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">بۇ Signal نەشرىنىڭ ۋاقتى توشتى. ئۇچۇر يوللىيالىشىڭىز ۋە قوبۇل قىلالىشىڭىز ئۈچۈن ھازىرلا يېڭىلاڭ.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">بۇ Molly نەشرىنىڭ ۋاقتى توشتى. ئۇچۇر يوللىيالىشىڭىز ۋە قوبۇل قىلالىشىڭىز ئۈچۈن ھازىرلا يېڭىلاڭ.</string>
     <string name="ExpiredBuildReminder_update_now">ھازىر يېڭىلاڭ</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -865,8 +927,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">كۆرسەت</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">مەڭگۈلۈك Signal ئالاقىسى مەغلۇپ بولدى!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal Google Play مۇلازىمەتلىرىگە تىزىملىتالمىدى. Signal ئۇچۇرلىرى ۋە تېلېفونلىرى چەكلىنىپ قالدى، تەڭشەكلەر &gt; ئىلغار دېگەن يەرگە بېرىپ قايتا تىزىملىتىپ سىناپ بېقىڭ.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">مەڭگۈلۈك Molly ئالاقىسى مەغلۇپ بولدى!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly Google Play مۇلازىمەتلىرىگە تىزىملىتالمىدى. Molly ئۇچۇرلىرى ۋە تېلېفونلىرى چەكلىنىپ قالدى، تەڭشەكلەر &gt; ئىلغار دېگەن يەرگە بېرىپ قايتا تىزىملىتىپ سىناپ بېقىڭ.</string>
 
 
     <!-- GiphyActivity -->
@@ -999,13 +1061,23 @@
     <!-- Message explaining that battery saver may delay notifications -->
     <string name="PromptBatterySaverBottomSheet__message">سىگنالنىڭ باتارىيە ئەلالاشتۇرۇشىنى چەكلەپ، ئۇچۇر ئۇقتۇرۇشىنىڭ كېچىكتۈرۈلمەسلىكىگە كاپالەتلىك قىلالايسىز.</string>
 
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">باتارىيە ئەلالاشتۇرۇلۇش تۈپەيلىدىن، ئۇقتۇرۇشلا كېچىكتۈرۈلىشى مۇمكىن</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">سىگنال ئۈچۈن باتارىيە ئەلالاشتۇرۇشنى چەكلەپ، ئۇچۇر ئۇقتۇرۇشىنىڭ كېچىكتۈرۈلمەسلىكىگە كاپالەتلىك قىلىڭ. ئۈسكۈنىگە مۇناسىۋەتلىك كۆرسەتمىلەرنى كۆرۈش ئۈچۈن «داۋاملاشتۇرۇش» نى چېكىڭ.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">ياق، رەھمەت</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">داۋاملاشتۇرۇش</string>
+
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">داۋاملاشتۇرۇش</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">ئېتىش</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">ياق، رەھمەت</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">كۈتۈۋاتقان گۇرۇپپا تەكلىپلىرى</string>
+    <string name="PendingMembersActivity_pending_group_invites">ئىلتىماس ۋە تەكلىپلەر</string>
     <string name="PendingMembersActivity_requests">تەلەپلەر</string>
     <string name="PendingMembersActivity_invites">تەكلىپلەر</string>
     <string name="PendingMembersActivity_people_you_invited">سىز تەكلىپ قىلغان كىشىلەر</string>
@@ -1244,12 +1316,12 @@
     <string name="InviteActivity_cancel">ۋاز كەچ</string>
     <string name="InviteActivity_sending">ئەۋەتىلىۋاتىدۇ…</string>
     <string name="InviteActivity_invitations_sent">تەكلىپ يوللاندى!</string>
-    <string name="InviteActivity_invite_to_signal">Signal ئىشلىتىش تەكلىپى</string>
+    <string name="InviteActivity_invite_to_signal">Molly ئىشلىتىش تەكلىپى</string>
     <string name="InviteActivity_send_sms">SMS (%1$d) يوللاش</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="other">%1$d SMS تەكلىپى يوللامسىز؟</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Signal دا پاراڭلىشايلى:%1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Molly دا پاراڭلىشايلى:%1$s</string>
     <string name="InviteActivity_no_app_to_share_to">قارىغاندا ھەمبەھىرلەيدىغان ئەپ يوقتەك تۇرىدۇ.</string>
 
     <!-- LearnMoreTextView -->
@@ -1263,7 +1335,7 @@
     <string name="LongMessageActivity_your_message">ئۇچۇرىڭىز</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal </string>
+    <string name="MessageRetrievalService_signal">Molly </string>
     <string name="MessageRetrievalService_background_connection_enabled">ئارقا سۇپا باغلىنىشى قوزغىتىلدى</string>
 
     <!-- MediaOverviewActivity -->
@@ -1327,10 +1399,10 @@
     <string name="MessageQuotesBottomSheet_replies">جاۋاب</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal چاقىرىشى قۇرۇلۇۋاتىدۇ</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly چاقىرىشى قۇرۇلۇۋاتىدۇ</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signal چاقىرىش مۇلازىمىتىنى قوزغىتىۋاتىدۇ</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal چاقىرىش مۇلازىمىتىنى توختىتىۋاتىدۇ</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Molly چاقىرىش مۇلازىمىتىنى قوزغىتىۋاتىدۇ</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly چاقىرىش مۇلازىمىتىنى توختىتىۋاتىدۇ</string>
     <string name="NotificationBarManager__cancel_call">چاقىرىشتىن ۋاز كەچ</string>
 
     <!-- NotificationsMegaphone -->
@@ -1574,6 +1646,14 @@
     <string name="MessageRecord_you_activated_payments">پۇل تۆلەش ئىقتىدارىنى ئاكتىپلىدىڭىز</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s ئەمدى پۇل قوبۇل قىلالايدۇ</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">پۇل تۆلەش تەپسىلاتى ھازىرچە يوق</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">تېخىمۇ كۆپ</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">پۇل تۆلەش تەپسىلاتى يوق</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">سىزنىڭ ئۇچۇرىڭىز بۇ پۇل تۆلەش تارىخىنى ئۆز ئىچىگە ئالمىغان مەنبەدىن ئەسلىگە كەلتۈرۈلگەچكە، بۇ پۇل توغرىسىدىكى تەپسىلاتلار ھازىرچە يوق. بۇ سىزنىڭ ھەميان قالدۇق سوممىڭىزغا ياكى بۇرۇنقى پۇل تۆلەش ھالتىڭىزگە تەسىر كۆرسەتمەيدۇ.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1628,9 +1708,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">پات ئارىدىن باشلاپ Signal دا SMS ئۇچۇرى يوللىغىلى بولمايدۇ. «%1$s» نى Signal غا تەكلىپ قىلىپ پاراڭنى داۋاملاشتۇرۇڭ.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Signal دا ئەمدى SMS ئۇچۇرى يوللىيالمايسىز. «%1$s» نى Signal غا تەكلىپ قىلىپ پاراڭنى داۋاملاشتۇرۇڭ.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Molly دا ئەمدى SMS ئۇچۇرى يوللىيالمايسىز. «%1$s» نى Molly غا تەكلىپ قىلىپ پاراڭنى داۋاملاشتۇرۇڭ.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">چىقىم: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">چىقىم</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">ئالدامچى ئۇچۇر دەپ مەلۇم قىلىندى</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1704,7 +1786,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">بىر Signal ئۈسكۈنىسى ئۇلامسىز؟</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">قارىماققا 3-تەرەپ سايىلىغۇچى ئارقىلىق Signal ئۈسكۈنىسىنى ئۇلىماقچى بولۇۋاتىسىز. سىزنىڭ بىخەتەرلىكىڭىز ئۈچۈن، كودنى Signal ئىچىدىن قايتا سايىلەڭ.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">QR كودىنى سايىلەش ئۈچۈن Signal كامېرا ھوقۇقىغا موھتاج ، ئەمما ئۇ مەڭگۈلۈك رەت قىلىندى. ئەپ تەڭشەكلىرىدىن، «ھوقۇقلار» نى تاللاپ ۋە «كامېرا» نى قوزغىتىڭ. </string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">QR كودىنى سايىلەش ئۈچۈن Molly كامېرا ھوقۇقىغا موھتاج ، ئەمما ئۇ مەڭگۈلۈك رەت قىلىندى. ئەپ تەڭشەكلىرىدىن، «ھوقۇقلار» نى تاللاپ ۋە «كامېرا» نى قوزغىتىڭ. </string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">كامېرا ھوقۇقى بولمىغاچقا QR كودىنى سايىلىغىلى بولمىدى</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1716,11 +1798,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">ئىم ئىبارىسى كىرگۈزۈڭ</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal سىنبەلگىسى</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly سىنبەلگىسى</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">ئىم ئىبارىسىنى تاپشۇرۇڭ</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">ئىناۋەتسىز ئىم ئىبارىسى!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signal نى ئاجرىتىڭ</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - قۇلۇپ ئېكرانى</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Molly نى ئاجرىتىڭ</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - قۇلۇپ ئېكرانى</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">خەرىتە</string>
@@ -1786,7 +1868,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">ئۇچۇرلىشىشنى داۋاملاشتۇرۇش ئۈچۈن دەلىللەش زۆرۈر</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Signal دا ئەخلەت خەتنىڭ ئالدىنى ئېلىش ئۈچۈن، دەلىللەشنى تاماملاڭ.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Molly دا ئەخلەت خەتنىڭ ئالدىنى ئېلىش ئۈچۈن، دەلىللەشنى تاماملاڭ.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">دەلىللىگەندىن كېيىن، ئۇچۇر يوللاشنى داۋاملاشتۇرالايسىز. ۋاقىتلىق توختىتىلغان ھەر قانداق ئۇچۇر ئۆزلۈكىدىن يوللىنىدۇ.</string>
 
     <!-- Recipient -->
@@ -1794,7 +1876,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">ھېكايەم</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal چاقىرىقى</string>
+    <string name="Recipient_signal_call">Molly چاقىرىقى</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">چەكلەش</string>
@@ -1808,7 +1890,8 @@
     <string name="RedPhone_ringing">جىرىڭلاۋاتىدۇ…</string>
     <string name="RedPhone_busy">ئالدىراش</string>
     <string name="RedPhone_recipient_unavailable">چاقىرىلغۇچى جاۋاب بەرمىدى</string>
-    <string name="RedPhone_network_failed">تور مەغلۇپ بولدى!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">تور مەغلۇپ بولدى! تور ئۇلىنىشىنى تەكشۈرۈپ قايتا سىناڭ.</string>
     <string name="RedPhone_number_not_registered">نومۇر تىزىملىتىلمىغان!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">سىز بۇرىغان نومۇر شىفىرلىق ئاۋازنى قوللىمايدۇ!</string>
     <string name="RedPhone_got_it">بىلدىم</string>
@@ -1819,8 +1902,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">بۇ جاي چېكىلسە سىن ئېچىلىدۇ</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$sنى چاقىرىش ئۈچۈن Signal كامېرانى ئىشلىتەلىشى كېرەك</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$sنى چاقىرىش ئۈچۈن Molly كامېرانى ئىشلىتەلىشى كېرەك</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">چاقىرىۋاتىدۇ…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">قايتا ئۇلىنىۋاتىدۇ…</string>
@@ -1868,10 +1951,30 @@
     <string name="WebRtcCallActivity__removed_from_call">چاقىرىقتىن چىقىرىۋېتىلدى.</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">بىرەيلەن سىزنى چاقىرىقتىن چىقىرىۋەتتى.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">كامېرا ۋە مىكروفونىڭىزغا ئىجازەت قىلىش</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">مىكروفوننى ئىشلىتىشكە رۇخسەت قىلىڭ</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">كامېرا ھوقۇقىغا ئىجازەت قىلىش</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Molly چاقىرىق باشلاش ياكى چاقىرىققا قوشۇلۇش ئۈچۈن كامېرا ۋە مىكروفون ئىجازىتىنى تەلەپ قىلىدۇ.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">چاقىرىق باشلاش ياكى قوشۇلۇش ئۈچۈن Molly نىڭ مىكروفوننى زىيارەت قىلىشىغا رۇخسەت قىلىڭ.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">ۋىدېيونى قوزغىتىش ئۈچۈن Molly نىڭ كامېرانى ئىجازەت قىلىشىغا رۇخسەت قىلىشىڭىز كېرەك.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly چاقىرىق باشلاش ياكى چاقىرىققا قوشۇلۇش ئۈچۈن مىكروفون ئىجازىتىنى تەلەپ قىلىدۇ.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">ۋىدېيونى قوزغىتىش ئۈچۈن Molly كامېرا ئىجازىتىنى لازىم قىلىدۇ</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">چاقىرىق باشلاش ياكى قوشۇلۇش ئۈچۈن:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">ۋىدېيونى قوزغىتىش ئۈچۈن:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">‫Signal چاقىرىقى</string>
-    <string name="WebRtcCallView__signal_video_call">‏Signal سىنلىق چاقىرىقى</string>
+    <string name="WebRtcCallView__signal_call">‫Molly چاقىرىقى</string>
+    <string name="WebRtcCallView__signal_video_call">‏Molly سىنلىق چاقىرىقى</string>
     <string name="WebRtcCallView__start_call">چاقىرىق باشلا</string>
     <string name="WebRtcCallView__join_call">چاقىرىققا قېتىل</string>
     <string name="WebRtcCallView__call_is_full">چاقىرىق توشتى</string>
@@ -1956,21 +2059,38 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">قولىڭىزنى چۈشۈرەمسىز؟</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">قول چۈشۈرۈش</string>
+    <string name="CallOverflowPopupWindow__lower_hand">چۈشۈرۈش</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">بىكار قىلىش</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">قولىڭىزنى كۆتۈردىڭىز</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">كۆرسەت</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s قول كۆتۈردى</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s + %2$d قول كۆتۈردى</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s قول كۆتۈردى</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
         <item quantity="other">%1$s + %2$d قول كۆتۈردى</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
 
@@ -2055,7 +2175,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">بۇ نومۇرنى دەلىللەش ئۈچۈن بىر تېلېفون تاپشۇرۇۋالىسىز.</string>
     <string name="RegistrationActivity_edit_number">نومۇرنى تەھرىرلەش</string>
     <string name="RegistrationActivity_missing_google_play_services">Google Play مۇلازىمەتلىرى كەم</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">بۇ ئۈسكۈنىدە Google Play مۇلازىمىتى كەم ئىكەن. شۇنداقتىمۇ سىز يەنىلا Signal نى ئىشلىتەلەيسىز، ئەمما بۇ سەپلىمە تۆۋەنلىتىلگەن ئىشەنچ ياكى ئىقتىدارنى كەلتۈرۈپ چىقىرىشى مۇمكىن.\n\nئەگەر سىز تەجرىبىلىك ئىشلەتكۈچى بولمىسىڭىز، ياكى بازارغا سېلىنغان Android ROM نى ئىشلەتمىگەن بولسىڭىز ياكى بۇنى خاتالىق دەپ كۆرۈۋاتقانلىقىڭىزغا ئىشەنسىڭىز، كاشىلا تېپىشىمىزغا ياردەم قىلىش ئۈچۈن support@signal.org بىلەن ئالاقىلىشىڭ.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">بۇ ئۈسكۈنىدە Google Play مۇلازىمىتى كەم ئىكەن. شۇنداقتىمۇ سىز يەنىلا Molly نى ئىشلىتەلەيسىز، ئەمما بۇ سەپلىمە تۆۋەنلىتىلگەن ئىشەنچ ياكى ئىقتىدارنى كەلتۈرۈپ چىقىرىشى مۇمكىن.\n\nئەگەر سىز تەجرىبىلىك ئىشلەتكۈچى بولمىسىڭىز، ياكى بازارغا سېلىنغان Android ROM نى ئىشلەتمىگەن بولسىڭىز ياكى بۇنى خاتالىق دەپ كۆرۈۋاتقانلىقىڭىزغا ئىشەنسىڭىز، كاشىلا تېپىشىمىزغا ياردەم قىلىش ئۈچۈن support@molly.im بىلەن ئالاقىلىشىڭ.</string>
     <string name="RegistrationActivity_i_understand">چۈشەندىم</string>
     <string name="RegistrationActivity_play_services_error">Play مۇلازىمەتلىرى خاتالىقى</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play مۇلازىمەتلىرى يېڭىلىنىۋاتىدۇ ياكى ئۇلارنى ۋاقىتلىق ئىشلەتكىلى بولمايدۇ. سەل تۇرۇپ قايتا سىناڭ.</string>
@@ -2073,7 +2193,7 @@
     <string name="RegistrationActivity_non_standard_number_format">ئۆلچەملىك بولمىغان نومۇر فورماتى</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">سىز كىرگۈزگەن سان (%1$s) ئۆلچەملىك بولمىغان فورماتتىكى ساندەك قىلىدۇ.\n\n%2$s دېمەكچىمۇ؟</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - تېلېفون نومۇرى فورماتى</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - تېلېفون نومۇرى فورماتى</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">چاقىرىق تەلەپ قىلىندى</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2106,8 +2226,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">تىزىملىتىشتا قىيىنچىلىققا يولۇقتىڭىزمۇ؟</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• SMS ياكى تېلېفون قوبۇل قىلىش ئۈچۈن تېلېفونىڭىزدا كۆچمە تور سىگنالى بار بولۇشىغا كاپالەتلىك قىلىڭ\n • تېلېفون نومۇرىڭىزنىڭ تېلېفون قوبۇل قىلالايدىغانلىقىنى جەزملەشتۈرۈڭ\n • تېلېفون نومۇرىڭىزنى توغرا كىرگۈزگەنلىكىڭىزنى جەزملەشتۈرۈڭ.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">تېخىمۇ كۆپ ئۇچۇرلارغا ئېرىشىش ئۈچۈن تۆۋەندىكى كاشىلا ھەل قىلىش باسقۇچلىرىنى ئىجرا قىلىڭ ياكى ياردەم خادىمى بىلەن ئالاقىلىشىڭ</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">تېخىمۇ كۆپ ئۇچۇرلار ئۈچۈن %1$s ياكى %2$s گە ئەگىشىڭ</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">تۆۋەندىكى كاشىلا ھەل قىلىش باسقۇچلىرى</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2145,13 +2265,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">ئالاقەداشلارغا قوش</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Signal ئىشلىتىش تەكلىپى</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Molly ئىشلىتىش تەكلىپى</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal ئۇچۇرى</string>
     <string name="SharedContactDetailsActivity_signal_call">‫Signal چاقىرىقى</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">ئالاقەداشلارغا قوش</string>
-    <string name="SharedContactView_invite_to_signal">Signal ئىشلىتىش تەكلىپى</string>
+    <string name="SharedContactView_invite_to_signal">Molly ئىشلىتىش تەكلىپى</string>
     <string name="SharedContactView_message">Signal ئۇچۇرى</string>
 
     <!-- SignalBottomActionBar -->
@@ -2282,11 +2402,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s %2$s گە تەۋە</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal يېڭىلاش</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal نىڭ يېڭى نۇسخىسى بار. چېكىپ يېڭىلاڭ.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal نى يېڭىلىغىلى بولمىدى</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly يېڭىلاش</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly نىڭ يېڭى نۇسخىسى بار. چېكىپ يېڭىلاڭ.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly نى يېڭىلىغىلى بولمىدى</string>
     <string name="ApkUpdateNotifications_failed_general_body">كېيىنرەك قايتا سىناپ باقىمىز.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal ئوڭۇشلۇق يېڭىلاندى</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly ئوڭۇشلۇق يېڭىلاندى</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">سىز ئاپتوماتىك ھالدا %1$s نەشرىگە يېڭىلاندىڭىز.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2356,7 +2476,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Signal بىخەتەرلىك نومۇرىمىز:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">قارىغاندا ھەمبەھىرلەيدىغان ئەپ يوقتەك تۇرىدۇ.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">چاپلاش تاختىسىدا سېلىشتۇرغۇدەك بىر بىخەتەرلىك نومۇرى تېپىلمىدى</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">QR كودىنى سايىلەش ئۈچۈن Signal كامېرا ھوقۇقىغا موھتاج ، ئەمما ئۇ مەڭگۈلۈك رەت قىلىندى. ئەپ تەڭشەكلىرىدىن، «ھوقۇقلار» نى تاللاپ ۋە «كامېرا» نى قوزغىتىڭ. </string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">QR كودىنى سايىلەش ئۈچۈن Molly كامېرا ھوقۇقىغا موھتاج ، ئەمما ئۇ مەڭگۈلۈك رەت قىلىندى. ئەپ تەڭشەكلىرىدىن، «ھوقۇقلار» نى تاللاپ ۋە «كامېرا» نى قوزغىتىڭ. </string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">كامېرا ھوقۇقى بولمىسا QR كودىنى سايىلىغىلى بولمايدۇ</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view"> %1$sنىڭ بىخەتەرلىك نومۇرىنى كۆرۈش ئۈچۈن. ئاۋۋال ئۇنىڭ بىلەن ئۇچۇر ئالماشتۇرىشىڭىز كېرەك.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2386,14 +2506,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">نوقۇپ ئېچىڭ.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal ئېچىلىپ كەتتى.</string>
-    <string name="KeyCachingService_lock">Signal نى قۇلۇپلاش</string>
+    <string name="KeyCachingService_passphrase_cached">Molly ئېچىلىپ كەتتى.</string>
+    <string name="KeyCachingService_lock">Molly نى قۇلۇپلاش</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">سىز</string>
     <string name="MediaPreviewActivity_unssuported_media_type">قوللىمايدىغان تاراتقۇ تىپى</string>
     <string name="MediaPreviewActivity_draft">ئارگىنال</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">ھۆججەتنى سىرتقا ساقلىغۇچقا ساقلاش ئۈچۈن Signal ساقلاش ھوقۇقىغا ئېھتىياجلىق، ئەمما ئۇ مەڭگۈلۈك چەكلەنگەن، ئەپ تەڭشىكىدىن، «ھوقۇقلار» نى تاللاپ، «ساقلاش» نى قوزغىتىڭ.</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">ھۆججەتنى سىرتقا ساقلىغۇچقا ساقلاش ئۈچۈن Molly ساقلاش ھوقۇقىغا ئېھتىياجلىق، ئەمما ئۇ مەڭگۈلۈك چەكلەنگەن، ئەپ تەڭشىكىدىن، «ھوقۇقلار» نى تاللاپ، «ساقلاش» نى قوزغىتىڭ.</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">ئىجازەتسىز سىرتقى ساقلىغۇچقا ساقلىيالمايدۇ</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">ئۇچۇرنى ئۆچۈرەمسىز؟</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">بۇ ئۇچۇر مەڭگۈلۈك ئۆچۈرۈلىدۇ.</string>
@@ -2435,7 +2555,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">ئۇچۇرنى يەتكۈزەلمىدى.</string>
     <string name="MessageNotifier_error_delivering_message">ئۇچۇر يەتكۈزۈشتە خاتالىق كۆرۈلدى.</string>
     <string name="MessageNotifier_message_delivery_paused">ئۇچۇر يەتكۈزۈش ۋاقىتلىق توختىدى.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Signal دا ئۇچۇر يوللاشنى داۋاملاشتۇرۇش ئۈچۈن دەلىللەش زۆرۈر.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Molly دا ئۇچۇر يوللاشنى داۋاملاشتۇرۇش ئۈچۈن دەلىللەش زۆرۈر.</string>
     <string name="MessageNotifier_mark_all_as_read">ھەممىسى ئوقۇلدى</string>
     <string name="MessageNotifier_mark_read">ئوقۇلدى</string>
     <string name="MessageNotifier_turn_off_these_notifications">بۇ ئۇقتۇرۇشلارنى تاقا</string>
@@ -2457,7 +2577,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">چاپلىقىڭىزغا قايتۇرغان ئىنكاس %1$s.</string>
     <string name="MessageNotifier_this_message_was_deleted">بۇ ئۇچۇر ئۆچۈرۈلگەن</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">ئالاقەداشلار Signal غا قوشۇلغانلىق ئۇقتۇرۇشىنى تاقامسىز؟ سىز Signal &gt; تەڭشەكلەر&gt;ئۇقتۇرۇشتىن قايتا قوزغىتالايسىز.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">ئالاقەداشلار Molly غا قوشۇلغانلىق ئۇقتۇرۇشىنى تاقامسىز؟ سىز Molly &gt; تەڭشەكلەر&gt;ئۇقتۇرۇشتىن قايتا قوزغىتالايسىز.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2496,7 +2616,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signal قۇلۇپلانغاندا تېز ئىنكاسنى ئىشلەتكىلى بولمايدۇ!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Molly قۇلۇپلانغاندا تېز ئىنكاسنى ئىشلەتكىلى بولمايدۇ!</string>
     <string name="QuickResponseService_problem_sending_message">ئۇچۇر يوللاشتا مەسىلە كۆرۈلدى!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2516,7 +2636,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">ئىناۋەتسىز قىسقا يول</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal </string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly </string>
     <string name="SingleRecipientNotificationBuilder_new_message">يېڭى ئۇچۇر</string>
     <string name="SingleRecipientNotificationBuilder_message_request">ئۇچۇر ئىلتىماسى</string>
     <string name="SingleRecipientNotificationBuilder_you">سىز</string>
@@ -2561,7 +2681,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">بۇ ئۈسكۈنە تىزىملاشتىن چىقىپ كەتكەن. بۇنىڭ سەۋەبى سىز تېلېفون نومۇرىڭىز بىلەن Signal نى باشقا بىر ئۈسكۈنىدە تىزىملاتقان بولۇشىڭىز مۇمكىن.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">بۇ ئۈسكۈنە تىزىملاشتىن چىقىپ كەتكەن. بۇنىڭ سەۋەبى سىز تېلېفون نومۇرىڭىز بىلەن Molly نى باشقا بىر ئۈسكۈنىدە تىزىملاتقان بولۇشىڭىز مۇمكىن.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">قايتا تىزىملىتىلغان ئۈسكۈنە</string>
 
@@ -2574,10 +2694,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">چاقىرىققا جاۋاب بېرىش ئۈچۈن، Signal مىكروفون ھوقۇقىنى تەلەپ قىلىدۇ.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">چاقىرىققا جاۋاب بېرىش ئۈچۈن، Molly مىكروفون ھوقۇقىنى تەلەپ قىلىدۇ.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">ۋىدېيولۇق چاقىرىققا جاۋاب قايتۇرۇش ئۈچۈن Signal غا مىكروفون ۋە كامېرا ئىجازىتىنى بېرىڭ.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">سۆزلىشىشتە Signal مىكروفون ۋە كامېرا ئىجازىتىگە ئېھتىياجلىق، ئەمما ئۇلار رەت قىلىندى. ئەپ تەڭشىكىدىن، «ھوقۇقلار» نى تاللاپ ۋە «مىكروفون» ۋە «كامېرا» نى قوزغىتىڭ.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">ۋىدېيولۇق چاقىرىققا جاۋاب قايتۇرۇش ئۈچۈن Molly غا مىكروفون ۋە كامېرا ئىجازىتىنى بېرىڭ.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">سۆزلىشىشتە Molly مىكروفون ۋە كامېرا ئىجازىتىگە ئېھتىياجلىق، ئەمما ئۇلار رەت قىلىندى. ئەپ تەڭشىكىدىن، «ھوقۇقلار» نى تاللاپ ۋە «مىكروفون» ۋە «كامېرا» نى قوزغىتىڭ.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">باغلانغان بىر ئۈسكۈنىدە جاۋاب قايتۇردى.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">باغلانغان بىر ئۈسكۈنىدە رەت قىلدى.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">باغلانغان بىر ئۈسكۈنىدە ئالدىراش.</string>
@@ -2622,16 +2742,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">يېڭى ئىم ئىبارىسى قايتا</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Signal ئىشلىتىش تەكلىپى</string>
+    <string name="contact_selection_activity__invite_to_signal">Molly ئىشلىتىش تەكلىپى</string>
     <string name="contact_selection_activity__new_group">يېڭى گۇرۇپپا</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">ئالاقىداشلارنى يېڭىلاش</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">بىرەرسى تېپىلمىدىمۇ؟ يېڭىلاپ سىناپ بېقىڭ</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Signal دا تونۇيدىغان كىشىلەرنى تېپىش</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">ئالاقىداش ھوقۇقىغا ئىجازەت قىلىڭ</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">تېخىمۇ كۆپ</string>
 
@@ -2648,7 +2768,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">ئالاقەداش سۈرەت</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal ئالاقەداشلىرىڭىزنى كۆرسىتىش ئۈچۈن ئالاقەداش ھوقۇقى تەلەپ قىلىدۇ، ئەمما ئۇ مەڭگۈلۈك رەت قىلىندى. ئەپ تەڭشىكى تىزىملىكىگە بېرىڭ، «ھوقۇقلار» نى تاللاڭ ۋە «ئالاقەداشلار» نى قوزغىتىڭ.</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly ئالاقەداشلىرىڭىزنى كۆرسىتىش ئۈچۈن ئالاقەداش ھوقۇقى تەلەپ قىلىدۇ، ئەمما ئۇ مەڭگۈلۈك رەت قىلىندى. ئەپ تەڭشىكى تىزىملىكىگە بېرىڭ، «ھوقۇقلار» نى تاللاڭ ۋە «ئالاقەداشلار» نى قوزغىتىڭ.</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">ئالاقەداش ئېرىشىشتە خاتالىق كۆرۈلدى، تور باغلىنىشىڭىزنى تەكشۈرۈڭ</string>
     <string name="ContactSelectionListFragment_username_not_found">ئىشلەتكۈچى ئىسمى تېپىلمىدى</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"%1$s بولسا Signal ئىشلەتكۈچى ئەمەس. ئىشلەتكۈچى نامىنى تەكشۈرۈپ قايتا سىناڭ."</string>
@@ -2665,16 +2785,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">ئىشلەتكۈچى نامى بويىچە ئىزدەش</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">ئالاقىداش ھوقۇقىغا ئىجازەت قىلىش</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Signal دا تونۇيدىغان كىشىلەرنى تېپىش:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">ئىشلىتىشكە رۇخسەت</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">ياق، رەھمەت</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">ئالاقىداش ھوقۇقىغا ئىجازەت قىلىڭ. ئالاقىداشلىرىڭىز مەخپىيلەشتۈرۈلگەن بولۇپ، Signal مۇلازىمىتىگە كۆرۈنمەيدۇ.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal ئۇلارنى كۆرسىتىش ئۈچۈن ئالاقەداشلىرىڭىزنى زىيارەت قىلىشى كېرەك.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly ئۇلارنى كۆرسىتىش ئۈچۈن ئالاقەداشلىرىڭىزنى زىيارەت قىلىشى كېرەك.</string>
     <string name="contact_selection_list_fragment__show_contacts">ئالاقەداشنى كۆرسەت</string>
 
     <!-- contact_selection_list_item -->
@@ -2745,6 +2867,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">سىز بۇ كىشىنى ئۆچۈرۈۋەتكەن، ئۇلارغا ئۇچۇر يوللىسىڭىز ئۇلار ئالاقىداشلار تىزىملىكىڭىزگە قايتا قوشۇلىدۇ.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">تاللاش</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">يېڭىلا</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">قوي… تورمۇزلا</string>
@@ -2773,7 +2897,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Bubbles بولسا Android نىڭ بىر خىل ئىقتىدارى بولۇپ، Signal پاراڭلىرى ئۈچۈن ئۇنى ئېتىۋېتەلەيسىز.</string>
+    <string name="BubbleOptOutTooltip__description">Bubbles بولسا Android نىڭ بىر خىل ئىقتىدارى بولۇپ، Molly پاراڭلىرى ئۈچۈن ئۇنى ئېتىۋېتەلەيسىز.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">ھازىر ئەمەس</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -2934,9 +3058,9 @@
     <string name="EditProfileFragment__group_description">گۇرۇپپا تونۇشتۇرۇشى</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Signal نى يېڭىلا</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Molly نى يېڭىلا</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Signal نىڭ بۇ نەشرىنىڭ ۋاقتى ئ‍ۆتكەن. Signal نى داۋاملىق ئىشلىتىش ئۈچۈن دەرھال يېڭىلاڭ.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Molly نىڭ بۇ نەشرىنىڭ ۋاقتى ئ‍ۆتكەن. Molly نى داۋاملىق ئىشلىتىش ئۈچۈن دەرھال يېڭىلاڭ.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">يېڭىلا</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3152,7 +3276,7 @@
     <string name="preferences__slow">ئاستا</string>
     <string name="preferences__help">ياردەم</string>
     <string name="preferences__advanced">ئالىي</string>
-    <string name="preferences__donate_to_signal">‫Signal غا ئىئانە قىلىڭ</string>
+    <string name="preferences__donate_to_signal">‫Molly غا ئىئانە قىلىڭ</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">مەخپىيەتلىك</string>
     <!-- Preference label for stories -->
@@ -3189,13 +3313,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">ئەپ سىنبەلگىسى ۋە نامىنى «%1$s» غا ئۆزگەرتىش</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">ئەپ سىنبەلگىسى ۋە نامىنى ئۆزگەرتىش ئۈچۈن Signal نى ئېتىش كېرەك. ئۇقتۇرۇشلار ھەمىشە سۈكۈتتىكى Signal سىنبەلگىسى ۋە نامىنى كۆرسىتىدۇ.</string>
+    <string name="preferences__app_icon_dialog_description">ئەپ سىنبەلگىسى ۋە نامىنى ئۆزگەرتىش ئۈچۈن Molly نى ئېتىش كېرەك. ئۇقتۇرۇشلار ھەمىشە سۈكۈتتىكى Molly سىنبەلگىسى ۋە نامىنى كۆرسىتىدۇ.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">تېلېفونىڭىزنىڭ باش بەت ئېكرانىدا ۋە ئەپ تارتمىسىدا كۆرۈنىدىغان ئەپ سىنبەلگىسى ۋە ئەپ نامى تاللاڭ. ئۇقتۇرۇشلار ھەمىشە سۈكۈتتىكى Signal سىنبەلگىسى ۋە نامىنى كۆرسىتىدۇ. تەپسىلاتى</string>
+    <string name="preferences__app_icon_warning_learn_more">تېلېفونىڭىزنىڭ باش بەت ئېكرانىدا ۋە ئەپ تارتمىسىدا كۆرۈنىدىغان ئەپ سىنبەلگىسى ۋە ئەپ نامى تاللاڭ. ئۇقتۇرۇشلار ھەمىشە سۈكۈتتىكى Molly سىنبەلگىسى ۋە نامىنى كۆرسىتىدۇ. تەپسىلاتى</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">ئەپ سىنبەلگىسى ۋە ئەپ نامى باش بەت ئېكرانى ۋە ئەپ تارتمىسىدا كۆرۈنىدۇ.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">ئۇقتۇرۇشلار ھەمىشە سۈكۈتتىكى Signal سىنبەلگىسى ۋە نامىنى كۆرسىتىدۇ.</string>
+    <string name="preferences__app_icon_notification_warning">ئۇقتۇرۇشلار ھەمىشە سۈكۈتتىكى Molly سىنبەلگىسى ۋە نامىنى كۆرسىتىدۇ.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">تەپسىلاتى</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3241,8 +3365,12 @@
         <item quantity="other">بۇ مەشغۇلات بارلىق پاراڭلارنى %1$s ئەڭ يېقىنقى ئۇچۇرلارغا يىغىنچاقلايدۇ.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">بۇ ئۈسكۈنىڭىزدىكى بارلىق ئۇچۇر تارىخى ۋە ۋاسىتەلەرنى مەڭگۈلۈك ئۆچۈرۈۋېتىدۇ.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">بۇ مەشغۇلات بۇ ئۈسكۈنە ۋە باشقا ھەرقانداق ئۇلانغان ئۈسكۈنىلەردىكى بارلىق ئۇچۇر خاتىرىسى ۋە مېدىيانى مەڭگۈلۈك ئۆچۈرىدۇ.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">راستلا بارلىق ئۇچۇر تارىخنى ئۆچۈرىۋېتەمسىز؟</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">بارلىق ئۇچۇر تارىخى مەڭگۈلۈك ئۆچۈرىۋېتىلىدۇ. بۇ ھەرىكەتتىن كەينىگە يېنىۋالالمايسىز.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">بارلىق ئۈسكۈنىلەردىكى بارلىق ئۇچۇر خاتىرىسى مەڭگۈلۈك ئۆچۈرۈلىدۇ. بۇ مەشغۇلاتنى ئەمەلدىن قالدۇرغىلى بولمايدۇ.</string>
     <string name="preferences_storage__delete_all_now">ھازىرلا ھەممىنى ئۆچۈر</string>
     <string name="preferences_storage__forever">مەڭگۈ</string>
     <string name="preferences_storage__one_year">1 يىل</string>
@@ -3278,7 +3406,7 @@
     <string name="preferences_communication__category_censorship_circumvention">تەكشۈرۈشتىن دالدىلىنىش</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">تەكشۈرۈشتىن دالدىلىنىش</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">ئەگەر قوزغىتىلسا، Signal تەكشۈرۈشتىن دالدىلىنىشنى سىنايدۇ. Signal سىز تۇرۇۋاتقان جايدا تەكشۈرۈلمىسە بۇ ئىقتىدارنى قوزغاتماڭ.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">ئەگەر قوزغىتىلسا، Molly تەكشۈرۈشتىن دالدىلىنىشنى سىنايدۇ. Molly سىز تۇرۇۋاتقان جايدا تەكشۈرۈلمىسە بۇ ئىقتىدارنى قوزغاتماڭ.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">تەكشۈرۈشتىن دالدىلىنىش ھېساباتىڭىزدىكى تېلېفون نومۇرىغا ئاساسەن ئاكتىپلىنىدۇ.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3330,7 +3458,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">تۆلەمنى تونۇشتۇرۇش</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">سىز Signal دا MobileCoin يوللاپ ۋە قوبۇللىيالايسىز، ئۇ شەخسىيەت گەۋدىلەندۈرۈلگەن يېڭى رەقەملىك پۇل. باشلاش ئۈچۈن ئاكتىپلاڭ.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">سىز Molly دا MobileCoin يوللاپ ۋە قوبۇللىيالايسىز، ئۇ شەخسىيەت گەۋدىلەندۈرۈلگەن يېڭى رەقەملىك پۇل. باشلاش ئۈچۈن ئاكتىپلاڭ.</string>
     <string name="PaymentsHomeFragment__activate_payments">چىقىم قىلىشنى ئاكتىپلا</string>
     <string name="PaymentsHomeFragment__activating_payments">چىقىم قىلىشنى ئاكتىپلاۋاتىدۇ…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">چىقىم ھېساباتىنى ئەسلىگە قايتۇر</string>
@@ -3356,7 +3484,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">چىقىم ئىقتىدارىنى سىز تۇرۇشلۇق جايدا ئىشلەتكىلى بولمايدۇ.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">چىقىمنى قوزغىتالمىدى. سەل تۇرۇپ قايتا سىناڭ.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">چىقىملارنى چەكلەمدۇ؟</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">ئەگەر چىقىم قىلىشنى چەكلىسىڭىز Signal دا MobileCoin ئەۋەتىپ ياكى قوبۇللىيالمايسىز.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">ئەگەر چىقىم قىلىشنى چەكلىسىڭىز Molly دا MobileCoin ئەۋەتىپ ياكى قوبۇللىيالمايسىز.</string>
     <string name="PaymentsHomeFragment__deactivate">چەكلە</string>
     <string name="PaymentsHomeFragment__continue">داۋاملاشتۇر</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">نۆۋەتتە قالدۇقنى ئىشلەتكىلى بولمايدۇ.</string>
@@ -3365,10 +3493,10 @@
     <string name="PaymentsHomeFragment__details">تەپسىلاتى</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">‫Signal نى ئىشلىتىپ MobileCoin ئەۋەتەلەيسىز ۋە تاپشۇرىۋالالايسىز. بارلىق تۆلەم ۋە چىقىملار MobileCoin ۋە MobileCoin ھەميانىنىڭ ئىشلىتىش شەرتلىرىگە بويسۇنىدۇ. بەزى مەسىلىلەرگە دۇچ كېلىشىڭز، يوقىتىش ئىھتىمالىڭىز بولغان تۆلەملەر ۋە قالدۇقلارنى ئەسلىگە كەلتۈرەلمەسلىكىڭىز مۇمكىن. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">‫Molly نى ئىشلىتىپ MobileCoin ئەۋەتەلەيسىز ۋە تاپشۇرىۋالالايسىز. بارلىق تۆلەم ۋە چىقىملار MobileCoin ۋە MobileCoin ھەميانىنىڭ ئىشلىتىش شەرتلىرىگە بويسۇنىدۇ. بەزى مەسىلىلەرگە دۇچ كېلىشىڭز، يوقىتىش ئىھتىمالىڭىز بولغان تۆلەملەر ۋە قالدۇقلارنى ئەسلىگە كەلتۈرەلمەسلىكىڭىز مۇمكىن. </string>
     <string name="PaymentsHomeFragment__activate">ئاكتىپلا</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">MobileCoin ماددىلىرىنى كۆرسەت</string>
-    <string name="PaymentsHomeFragment__payments_not_available">‫Signal دا چىقىم ئەمدى ئىشلىمەيدۇ. سىز مەبلەغلىرىڭىزنى ئالماشتۇرۇش ئورنىغا داۋاملىق يۆتكىيەلەيسىز. ئەمما ئەمدى چىقىمنى يوللاپ ۋە تاپشۇرىۋالالمايسىز ياكى مەبلەغ قوشالمايسىز.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">‫Molly دا چىقىم ئەمدى ئىشلىمەيدۇ. سىز مەبلەغلىرىڭىزنى ئالماشتۇرۇش ئورنىغا داۋاملىق يۆتكىيەلەيسىز. ئەمما ئەمدى چىقىمنى يوللاپ ۋە تاپشۇرىۋالالمايسىز ياكى مەبلەغ قوشالمايسىز.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3484,10 +3612,10 @@
     <string name="PaymentsTransferFragment__next">كېيىنكى</string>
     <string name="PaymentsTransferFragment__invalid_address">ئىناۋەتسىز ئادرېس</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">سىز يۆتكىمەكچى بولغان ھەميان ئادرېسىنى تەكشۈرۈڭ ۋە قايتا سىناڭ.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">ئۆزىڭىزنىڭ Signal ھەميان ئادرېسىغا يۆتكىيەلمەيسىز. قوللايدىغان ئالماشتۇرغۇچىدىكى ھېساباتىڭىزدىن ھەميان ئادرېسىنى كىرگۈزۈڭ.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR كودىنى سايىلەش ئۈچۈن Signal كامېرانى زىيارەت قىلالىشى كېرەك.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">‫QR كودىنى تۇتۇش ئۈچۈن Signal كامېرا ھوقۇقىغا موھتاج ، تەڭشەكلەرگە بېرىڭ، «ھوقۇقلار» نى تاللاپ ۋە «كامېرا» نى قوزغىتىڭ.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR كودىنى سايىلەش ئۈچۈن Signal كامېرانى زىيارەت قىلالىشى كېرەك.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">ئۆزىڭىزنىڭ Molly ھەميان ئادرېسىغا يۆتكىيەلمەيسىز. قوللايدىغان ئالماشتۇرغۇچىدىكى ھېساباتىڭىزدىن ھەميان ئادرېسىنى كىرگۈزۈڭ.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR كودىنى سايىلەش ئۈچۈن Molly كامېرانى زىيارەت قىلالىشى كېرەك.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">‫QR كودىنى تۇتۇش ئۈچۈن Molly كامېرا ھوقۇقىغا موھتاج ، تەڭشەكلەرگە بېرىڭ، «ھوقۇقلار» نى تاللاپ ۋە «كامېرا» نى قوزغىتىڭ.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR كودىنى سايىلەش ئۈچۈن Molly كامېرانى زىيارەت قىلالىشى كېرەك.</string>
     <string name="PaymentsTransferFragment__settings">تەڭشەكلەر</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3826,17 +3954,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">كەلگەن Signal ئاۋازلىق چاقىرىق</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">كەلگەن Molly ئاۋازلىق چاقىرىق</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">كەلگەن Signal ۋىدېيولۇق چاقىرىق</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">كەلگەن Molly ۋىدېيولۇق چاقىرىق</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">كەلگەن Signal گۇرۇپ چاقىرىقى</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">كەلگەن Molly گۇرۇپ چاقىرىقى</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">داۋاملىشىۋاتقان Signal ئاۋازلىق چاقىرىق</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">داۋاملىشىۋاتقان Molly ئاۋازلىق چاقىرىق</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">داۋاملىشىۋاتقان Signal ۋىدېيولۇق چاقىرىق</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">داۋاملىشىۋاتقان Molly ۋىدېيولۇق چاقىرىق</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">داۋاملىشىۋاتقان Signal گۇرۇپپا چاقىرىقى</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">داۋاملىشىۋاتقان Molly گۇرۇپپا چاقىرىقى</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">قاچىلىنىۋاتىدۇ…</string>
@@ -3883,9 +4011,9 @@
     <string name="BackupDialog_verify">دەلىللەش</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">زاپاسلاش ئىم ئىبارىسىنى توغرا كىرگۈزدىڭىز</string>
     <string name="BackupDialog_passphrase_was_not_correct">ئىم ئىبارىسى توغرا ئەمەس</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signal زاپاسلىنىۋاتىدۇ…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Molly زاپاسلىنىۋاتىدۇ…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">زاپاسلانغان Signal نى دەلىللەۋاتىدۇ…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">زاپاسلانغان Molly نى دەلىللەۋاتىدۇ…</string>
     <string name="LocalBackupJobApi29_backup_failed">زاپاسلاش مەغلۇپ بولدى</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">زاپاسلاش مۇندەرىجىڭىز ئۆچۈرۈلگەن ياكى يۆتكىۋېتىلگەن.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">زاپاس ھۆججىتىڭىز بەك چوڭ بولغاچقا بۇ جىلدقا سىغمىدى.</string>
@@ -3900,15 +4028,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">بۇ ۋاقىتتا ماڭا تېلېفون قىلىنسۇن (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">كودنى قايتا يوللاش (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Signal قوللىغۇچىلىرى  بىلەن ئالاقىلىشىڭ</string>
-    <string name="RegistrationActivity_code_support_subject">Signal تىزىملىتىش - Android ئۈچۈن دەلىللەش كودى</string>
+    <string name="RegistrationActivity_contact_signal_support">Molly قوللىغۇچىلىرى  بىلەن ئالاقىلىشىڭ</string>
+    <string name="RegistrationActivity_code_support_subject">Molly تىزىملىتىش - Android ئۈچۈن دەلىللەش كودى</string>
     <string name="RegistrationActivity_incorrect_code">خاتا كود</string>
     <string name="BackupUtil_never">ھەرگىز</string>
     <string name="BackupUtil_unknown">نامەلۇم</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">تېلېفون نومۇرىڭىز</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">تېلېفون نومۇرىڭىزنى كۆرسە بولىدىغان كىشىلەرنى ۋە تېلېفون نومۇرىڭىز ئارقىلىق سىز بىلەن Signal دا ئالاقىلاشسا بولىدىغان كىشىلەرنى تاللاڭ.</string>
+    <string name="preferences_app_protection__choose_who_can_see">تېلېفون نومۇرىڭىزنى كۆرسە بولىدىغان كىشىلەرنى ۋە تېلېفون نومۇرىڭىز ئارقىلىق سىز بىلەن Molly دا ئالاقىلاشسا بولىدىغان كىشىلەرنى تاللاڭ.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">تېلېفون نومۇرۇمنى كۆرسە بولىدىغانلار</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -3956,7 +4084,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">بەك كۆپ ئۇرۇندىڭىز، بىردەم ساقلاپ قايتا سىناڭ.</string>
     <string name="RegistrationActivity_error_connecting_to_service">مۇلازىمەتكە باغلىنىشتا خاتالىق</string>
     <string name="preferences_chats__backups">زاپاسلار</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal قۇلۇپلاندى</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly قۇلۇپلاندى</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">چېكىلسە قۇلۇپ ئاچىدۇ</string>
     <string name="Recipient_unknown">نامەلۇم</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -3987,9 +4115,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">كونا ئۈسكۈنىڭىزنى زىيارەت قىلالىشىڭىز كېرەك.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">زاپاستىن ئەسلىگە كەلتۈرىدۇ</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">ئۇچۇرلىرىڭىزنى يەرلىك زاپاستىن ئەسلىگە كەلتۈرىدۇ. ئەگەر ھازىر ئەسلىگە كەلتۈرمىسىڭىز، كېيىن ئەسلىگە كەلتۈرەلمەيسىز.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">يەرلىك زاپاسلاشنى ئەسلىگە كەلتۈرۈش</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signal نى زاپاستىن ئەسلىگە كەلتۈرۈش</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">بارلىق ئۇچۇرلىرىڭىز ۋە ئالدىنقى 30 كۈندىكى مېدىيالىرىڭىزنى ئەسلىگە كەلتۈرەلەيسىز</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">تېخىمۇ كۆپ تاللاش</string>
 
+    <string name="TransferOrRestoreFragment__cancel">بىكار قىلىش</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">يۆتكىمەي تۇرۇپلا تىزىملاپ كىرىش</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">ئۇچۇر ۋە مېدىيالارنى يۆتكىمەي تۇرۇپلا داۋاملاشتۇرۇش</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">كونا Android تېلېفونىڭىزدا Signal نى ئېچىڭ</string>
     <string name="NewDeviceTransferInstructions__continue">داۋاملاشتۇر</string>
@@ -4004,19 +4139,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">كونا Android ئۈسكۈنىگە باغلاشقا تەييارلىنىۋاتىدۇ…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">سەل كۈتۈڭ، تېزلا تەييار بولىدۇ</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">كونا Android ئۈسكۈنىنىڭ باغلىنىشىنى كۈتۈۋاتىدۇ…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal كونا Android ئۈسكۈنىنى بايقاپ ۋە باغلىنىشى ئۈچۈن ئورۇن ھوقۇقىغا ئېھتىياجلىق.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal كونا Android ئۈسكۈنىڭىزنى بايقاپ ۋە باغلىنىشى ئۈچۈن ئورۇن مۇلازىمىتى قوزغىتىلغان بولۇشى كېرەك.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal كونا Android ئۈسكۈنىڭىزنى بايقاپ ۋە باغلىنىشى ئۈچۈن Wi-Fi قوزغىتىلغان بولۇشى كېرەك. Wi-Fi قوزغىتىلغان بولۇشى ئەمما Wi-Fi تورغا باغلانمىغان بولسىمۇ بولىدۇ.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">كەچۈرۈڭ، بۇ ئۈسكۈنە Wi-Fi Direct نى قوللىمايدىغاندەك قىلىدۇ. Signal كونا Android ئۈسكۈنىڭىزنى Wi-Fi Direct ئارقىلىق بايقاپ ۋە باغلىنىدۇ. سىز Android ئۈسكۈنىڭىزدىن ھېساباتنى ئەسلىگە قايتۈرۈش ئارقىلىق زاپاستىن ئەسلىگە قايتۇرالايسىز.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly كونا Android ئۈسكۈنىنى بايقاپ ۋە باغلىنىشى ئۈچۈن ئورۇن ھوقۇقىغا ئېھتىياجلىق.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly كونا Android ئۈسكۈنىڭىزنى بايقاپ ۋە باغلىنىشى ئۈچۈن ئورۇن مۇلازىمىتى قوزغىتىلغان بولۇشى كېرەك.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly كونا Android ئۈسكۈنىڭىزنى بايقاپ ۋە باغلىنىشى ئۈچۈن Wi-Fi قوزغىتىلغان بولۇشى كېرەك. Wi-Fi قوزغىتىلغان بولۇشى ئەمما Wi-Fi تورغا باغلانمىغان بولسىمۇ بولىدۇ.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">كەچۈرۈڭ، بۇ ئۈسكۈنە Wi-Fi Direct نى قوللىمايدىغاندەك قىلىدۇ. Molly كونا Android ئۈسكۈنىڭىزنى Wi-Fi Direct ئارقىلىق بايقاپ ۋە باغلىنىدۇ. سىز Android ئۈسكۈنىڭىزدىن ھېساباتنى ئەسلىگە قايتۈرۈش ئارقىلىق زاپاستىن ئەسلىگە قايتۇرالايسىز.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">زاپاستىن ئەسلىگە قايتۇر</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">كونا Android ئۈسكۈنىڭىزگە باغلىنىشنى سىناۋاتقاندا كۈتۈلمىگەن خاتالىققا يولۇقتى.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">يېڭى Android ئۈسكۈنە ئىزدەۋاتىدۇ…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal يېڭى Android ئۈسكۈنىڭىزنى بايقاپ ۋە باغلىنىشى ئۈچۈن ئورۇن ھوقۇقىغا ئېھتىياجلىق.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal يېڭى Android ئۈسكۈنىڭىزنى بايقاپ ۋە باغلىنىشى ئۈچۈن ئورۇن مۇلازىمىتى قوزغىتىلغان بولۇشى كېرەك.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal يېڭى Android ئۈسكۈنىڭىزنى بايقاپ ۋە باغلىنىشى ئۈچۈن Wi-Fi قوزغىتىلغان بولۇشى كېرەك. Wi-Fi قوزغىتىلغان بولۇشى ئەمما Wi-Fi تورغا باغلانمىغان بولسىمۇ بولىدۇ.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">كەچۈرۈڭ، بۇ ئۈسكۈنە Wi-Fi Direct نى قوللىمايدىغاندەك قىلىدۇ. Signal يېڭى Android ئۈسكۈنىڭىزنى Wi-Fi Direct ئارقىلىق بايقاپ ۋە باغلىنىدۇ. سىز Android ئۈسكۈنىڭىزدە زاپاس قۇرۇپ، ھېساباتنى ئەسلىگە قايتۈرۈش ئارقىلىق زاپاسنى يېڭى ئۈسكۈنىڭىزگە ئەسلىگە قايتۇرالايسىز.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly يېڭى Android ئۈسكۈنىڭىزنى بايقاپ ۋە باغلىنىشى ئۈچۈن ئورۇن ھوقۇقىغا ئېھتىياجلىق.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly يېڭى Android ئۈسكۈنىڭىزنى بايقاپ ۋە باغلىنىشى ئۈچۈن ئورۇن مۇلازىمىتى قوزغىتىلغان بولۇشى كېرەك.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly يېڭى Android ئۈسكۈنىڭىزنى بايقاپ ۋە باغلىنىشى ئۈچۈن Wi-Fi قوزغىتىلغان بولۇشى كېرەك. Wi-Fi قوزغىتىلغان بولۇشى ئەمما Wi-Fi تورغا باغلانمىغان بولسىمۇ بولىدۇ.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">كەچۈرۈڭ، بۇ ئۈسكۈنە Wi-Fi Direct نى قوللىمايدىغاندەك قىلىدۇ. Molly يېڭى Android ئۈسكۈنىڭىزنى Wi-Fi Direct ئارقىلىق بايقاپ ۋە باغلىنىدۇ. سىز Android ئۈسكۈنىڭىزدە زاپاس قۇرۇپ، ھېساباتنى ئەسلىگە قايتۈرۈش ئارقىلىق زاپاسنى يېڭى ئۈسكۈنىڭىزگە ئەسلىگە قايتۇرالايسىز.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">زاپاس قۇر</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">يېڭى Android ئۈسكۈنىڭىزگە باغلىنىشنى سىناۋاتقاندا كۈتۈلمىگەن خاتالىققا يولۇقتى.</string>
 
@@ -4057,7 +4192,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">مەلۇمات يۆتكىلىۋاتىدۇ</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">ئىككى ئۈسكىنىنى يېقىن تۇتۇڭ. ئۈسكۈنىلەر ئېتىلىپ قالمىسۇن، Signal ئوچۇق ھالەتتە تۇرسۇن. يۆتكەش ئۇچتىن-ئۇچقا شىفرىلىنىدۇ.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">ئىككى ئۈسكىنىنى يېقىن تۇتۇڭ. ئۈسكۈنىلەر ئېتىلىپ قالمىسۇن، Molly ئوچۇق ھالەتتە تۇرسۇن. يۆتكەش ئۇچتىن-ئۇچقا شىفرىلىنىدۇ.</string>
     <string name="DeviceTransfer__d_messages_so_far">ھازىرچە %1$d ئۇچۇر…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">ھازىرچە %1$s%% ئۇچۇر يۆتكەلدى…</string>
@@ -4071,7 +4206,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">ھېساباتنى يۆتكە</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">يېڭى Android ئۈسكىنىڭىزدە Signal نى چۈشۈرۈڭ</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">يېڭى Android ئۈسكىنىڭىزدە Molly نى چۈشۈرۈڭ</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"«ھېسابات يۆتكەش» ياكى «ھېسابات ئەسلىگە كەلتۈرۈش» نى چېكىڭ"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4145,7 +4280,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">بۇ ئۇلانما بىلەن ھەرقانداق كىشى گۇرۇپپىنىڭ ئىسمى ۋە رەسىمىنى كۆرەلەيدۇ. ھەمدە گۇرۇپپىغا قېتىلىشنى ئىلتىماس قىلالايدۇ. ئۇنى ئىشەنچلىك كىشىلەرگە ھەمبەھىرلەڭ.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">بۇ ئۇلانما بىلەن ھەرقانداق كىشى گۇرۇپپىنىڭ ئىسمى ۋە رەسىمىنى كۆرەلەيدۇ. ھەمدە گۇرۇپپىغا قېتىلالايدۇ. ئۇنى ئىشەنچلىك كىشىلەرگە ھەمبەھىرلەڭ.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Signal ئارقىلىق ھەمبەھىرلە</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Molly ئارقىلىق ھەمبەھىرلە</string>
     <string name="GroupLinkBottomSheet_copy">كۆچۈر</string>
     <string name="GroupLinkBottomSheet_qr_code">QR كودى</string>
     <string name="GroupLinkBottomSheet_share">ھەمبەھىرلە</string>
@@ -4324,7 +4459,7 @@
     <string name="payment_info_card_about_mobilecoin">MobileCoin ھەققىدە</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">‫MobileCoin شەخسىيەت گەۋدىلەندۈرۈلگەن يېڭى رەقەملىك پۇل.</string>
     <string name="payment_info_card_adding_funds"> قوشۇلغان مەبلەغ</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">ھەميان ئادرېسىڭىزغا MobileCoin ئەۋەتىش ئارقىلىق Signal دا ئىشلىتىشكە مەبلەغ قوشالايسىز.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">ھەميان ئادرېسىڭىزغا MobileCoin ئەۋەتىش ئارقىلىق Molly دا ئىشلىتىشكە مەبلەغ قوشالايسىز.</string>
     <string name="payment_info_card_cashing_out">نەق پۇلغا ئايلاندۇر</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">MobileCoin نى قوللايدىغان ئالماشتۇرغۇچىدا خالىغان ۋاقىتتا MobileCoin نى نەقلەشتۈرەلەيسىز. پەقەت بۇ ئالماشتۇرغۇچىدىكى ھېساباتىڭىزغا يۆتكىسىڭىزلا بولىدۇ.</string>
     <string name="payment_info_card_hide_this_card">بۇ كارت كۆرۈنمىسۇنمۇ؟</string>
@@ -4345,12 +4480,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">ھەمياننى ئاكتىپسىزلا</string>
     <string name="DeactivateWalletFragment__your_balance">قالدۇقىڭىز</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">چىقىمنى ئاكتىپسىزلاشتىن بۇرۇن مەبلىغىڭىزنى باشقا ھەميان ئادرېسىغا يۆتكەش تەۋسىيە قىلىنىدۇ. ئەگەر ھازىر مەبلىغىڭىزنى يۆتكىمەسلىكنى تاللىسىڭىز، چىقىمنى قايتا ئاكتىپلىسىڭىز ئۇلار Signal غا باغلانغان ھەميانىڭىزدا قالىدۇ.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">چىقىمنى ئاكتىپسىزلاشتىن بۇرۇن مەبلىغىڭىزنى باشقا ھەميان ئادرېسىغا يۆتكەش تەۋسىيە قىلىنىدۇ. ئەگەر ھازىر مەبلىغىڭىزنى يۆتكىمەسلىكنى تاللىسىڭىز، چىقىمنى قايتا ئاكتىپلىسىڭىز ئۇلار Molly غا باغلانغان ھەميانىڭىزدا قالىدۇ.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">قالغان قالدۇقنى يۆتكە</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">يۆتكىمەي تۇرۇپ ئاكتىپسىزلا</string>
     <string name="DeactivateWalletFragment__deactivate">چەكلە</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">يۆتكىمەي تۇرۇپ ئاكتىپسىزلىسۇنمۇ؟</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">ئەگەر چىقىمنى قايتا ئاكتىپلاشنى تاللىسىڭىز، قالدۇق سوممىڭىز Signal غا باغلانغان ھەميانىڭىزدا قالىدۇ.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">ئەگەر چىقىمنى قايتا ئاكتىپلاشنى تاللىسىڭىز، قالدۇق سوممىڭىز Molly غا باغلانغان ھەميانىڭىزدا قالىدۇ.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">ئاكتىپسىزلاشتا خاتالىق كۆرۈلدى.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4643,7 +4778,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">ئىجازەتنامە</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">شەرتلەر &amp;  مەخپىيەتلىك تۈزۈمى</string>
-    <string name="HelpFragment__copyright_signal_messenger">‫Signal Messenger نەشر ھوقۇقىغا ئىگە</string>
+    <string name="HelpFragment__copyright_signal_messenger">‫Molly Messenger نەشر ھوقۇقىغا ئىگە</string>
     <string name="HelpFragment__licenced_under_the_agplv3">GNU AGPLv3 غا ئ‍اساسەن ئىجازەت قىلىنغان</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4658,7 +4793,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">ئاپتوماتىك</string>
+    <string name="ChatColorSelectionFragment__auto">Auto</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">ئىختىيارىچە رەڭ ئىشلەت</string>
     <string name="ChatColorSelectionFragment__chat_color">پاراڭ رەڭگى</string>
     <string name="ChatColorSelectionFragment__edit">تەھرىر</string>
@@ -4881,9 +5016,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">بىر رەڭ تاللا</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">قىسقا ئۇچۇر</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">ھەمبەھىرلە</string>
 
@@ -4913,7 +5045,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">گۇرۇپپىغا پەقەت باشقۇرغۇچىلارلا ئۇچۇر يوللىيالايدۇ.</string>
-    <string name="MultiselectForwardFragment__limit_reached">چەككە يەتتى</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">كۆپ بولغاندا 5 پاراڭ تاللىيالايسىز</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5088,9 +5221,9 @@
     <string name="MySupportPreference__learn_more">تەپسىلاتى</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Signal نى يېڭىلا</string>
+    <string name="UpdateSignalExpiredDialog__title">Molly نى يېڭىلا</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Signal نىڭ بۇ نەشرىنىڭ ۋاقتى ئ‍ۆتكەن. Signal نى داۋاملىق ئىشلىتىش ئۈچۈن دەرھال يېڭىلاڭ.</string>
+    <string name="UpdateSignalExpiredDialog__message">Molly نىڭ بۇ نەشرىنىڭ ۋاقتى ئ‍ۆتكەن. Molly نى داۋاملىق ئىشلىتىش ئۈچۈن دەرھال يېڭىلاڭ.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">يېڭىلا</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5099,7 +5232,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">ئۈسكۈنە تىزىملىتىلمىغان</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">بۇ ئۈسكۈنە تىزىملاشتىن قالغان بولۇپ، Signal نى بۇ ئۈسكۈنىدە داۋاملىق ئىشلىتىش ئۈچۈن ئۈسكۈنىنى قايتا تىزىملاڭ.</string>
+    <string name="ReregisterSignalDialog__message">بۇ ئۈسكۈنە تىزىملاشتىن قالغان بولۇپ، Molly نى بۇ ئۈسكۈنىدە داۋاملىق ئىشلىتىش ئۈچۈن ئۈسكۈنىنى قايتا تىزىملاڭ.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">قايتا تىزىملاش</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5539,8 +5672,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">تېخىچە جاۋاب يوق</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">سىز ئەمدى بۇ گۇرۇپپىنىڭ ئەزاسى بولمىغاچقا بۇ ھېكايىگە ئىنكاس قايتۇرالمايسىز.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">ھېكايىگە ئىنكاس قايتۇردى</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">ھېكايىگە ئىنكاس قايتۇردى</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">ھېكايىگە ئىنكاس قايتۇردى</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">كۆرۈلۈش سانى</string>
     <!-- Label for story replies tab -->
@@ -6140,8 +6275,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">بانكىڭىزنى تاللاڭ</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">%1$s بىلەن قىلغان ئىئانىڭىزنى جەزملەشتۈرۈڭ</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">تەكرار ئىئانە قىلىشنى تەڭشەشتىن بۇرۇن، چېكىپ بانكا بىلەن €0,01 ھەقنى جەزملەشتۈرۈڭ. بۇ سومما ئاپتوماتىك قايتۇرۇلىدۇ ۋە ئايلىق €5 ئىئانىڭىزنى بانكا ھېساباتىڭىزدىن تۇتىدۇ.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">تەكرار ئىئانە قىلىشنى تەڭشەشتىن بۇرۇن، چېكىپ بانكا بىلەن €0,01 ھەقنى جەزملەشتۈرۈڭ. بۇ سومما ئاپتوماتىك قايتۇرۇلىدۇ ۋە ئايلىق %1$s ئىئانىڭىزنى بانكا ھېساباتىڭىزدىن تۇتىدۇ.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">داۋاملاشتۇرۇش</string>
 
@@ -6710,6 +6845,50 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">زاپاس سانلىق مەلۇماتنى چۈشۈرۈۋاتىدۇ…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">مېدىيا زاپاسلاش توختىتىلدى</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="other">سىزنىڭ سىگنال مېدىيا زاپاسلاش پىلانىڭىز ئەمەلدىن قالدۇرۇلدى ، چۈنكى بىز پۇل تۆلەش باسقۇچىنى تاماملىيالمىدۇق. زاپاسلىغىڭىزدا ساقلانغان ھەرقانداق مېدىيانى چۈشۈرۈش ئۈچۈن %1$d كۈن بار. %1$d كۈندىن كېيىن ، زاپاسلانغان مېدىيا ئۆچۈرۈلىدۇ.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">سىز ھارقانداق ۋاقىتتا بارلىق مېدىيالىرىڭىزنى داۋاملىق زاپاسلاش ئۈچۈن پۇل تۆلەشكە باشلىسىڭىز بولىدۇ. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">مېدىيارىڭىز بۈگۈن ئۆچۈرۈلىدۇ</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">سىزنىڭ سىگنال مېدىيا زاپاسلاش پىلانىڭىز ئەمەلدىن قالدۇرۇلدى ، چۈنكى بىز تۆلىگەن ھەققىڭىزنى بىرتەرەپ قىلالمىدۇق. بۇ سىزنىڭ مېدىيا ئۆچۈرۈلۈشتىن بۇرۇن زاپاسلاشتىكى ئەڭ ئاخىرقى پۇرسىتىڭىز.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">چۈشۈرۈشنى تاماملىيالمىدى</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">ئۈسكۈنىڭىزدە يېتەرلىك بوشلۇق يوق. زاپاسلىغىنىڭىزدا ساقلانغان مېدىيانى چۈشۈرۈش ئۈچۈن %1$s بوشلۇق ھازىرلاڭ.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="other">زاپاسلاشتىكى مېدىيانى «ئاتلاش» نى تاللىسىڭىز %1$d كۈندە ئۆچۈرۈلىدۇ.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">زاپاسلاش ھەققىنى بىر تەرەپ قىلالمىدى</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">بىزسىزنىڭ ئايلىق زاپاسلاش پۇلىڭىزنى يىغىشتا قىيىنچىلىققا يولۇقۇۋاتىمىز. پۇل تۆلەش ئۇسۇلىڭىزنىڭ ئەڭ يېڭى ئىكەنلىكىنى جەزملەشتۈرۈڭ. ئەگەر ئۇنداق بولمىسا ، ئۇنى Google Pay دا يېڭىلاڭ. سىگنال بىر نەچچە كۈندىن كېيىن تۆلەنگەن ھەقنى قايتا بىر تەرەپ قىلىشقا تىرىشىدۇ.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">زاپاسلاشنى تاماملىيالمىدى</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">ئۈسكۈنىڭىز %1$d كۈن زاپاسلاشنى تاماملىمىدى. ئۈسكۈنىڭىزنىڭ wi-fi غا ئۇلانغانلىقىنى جەزملەشتۈرۈڭ ۋە «ھازىر زاپاسلاش.» نى چېكىڭ </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">تەپسىلاتى</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">ئاتلا</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">مېدىيانى ھازىر چۈشۈرۈڭ</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">كېيىن چۈشۈرۈڭ</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">مېدىيانى چۈشۈرمەڭ</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">مېدىيارىڭىزنى چۈشۈرۈش ئۈچۈن %1$s بوشلۇق ھازىرلاڭ.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">ئىناۋەتلىك كارتا ياكى بانكا كارتىسى</string>
@@ -6723,6 +6902,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">نامەلۇم</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">پۇل تۆلەش تارىخى</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">ئاخىرقى قېتىملىق زاپاسلاش %1$s %2$s دە ئېلىپ بېرىلغان.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6733,6 +6918,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">تاللانغان ۋاقىتتىن بۇرۇنقى ئۇچۇرلار مەڭگۈلۈك ئۆچۈرۈلىدۇ.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">تاللانغان ئۇزۇنلۇقتىن ئېشىپ كەتكەن ئۇچۇرلار مەڭگۈلۈك ئۆچۈرۈلىدۇ.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">چەكلىمىنى ئۇلانغان ئۈسكۈنىلەرگە قوللىنىش</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">قوزغىتىلغاندا، پاراڭ چەكلىمىسى ئۇلانغان ئۈسكۈنىلەردىكى ئۇچۇرلارنىمۇ ئۆچۈرىدۇ.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">ئۆچۈرۈش ھازىر بارلىق ئۈسكۈنىلىرىڭىزدە ماسقەدەملىنىدۇ</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">ئۇچۇر ياكى پاراڭلارنى ئ‍ۆچۈرسىڭىز، ئۇلار تېلېفونىڭىزدىن ۋە  ئۇلانغان ئۈسكۈنىلەردىن ئ‍ۆچۈرۈلىدۇ.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">بولىدۇ</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">پۇل تۆلەش تارىخى</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">تېكىست ۋە بارلىق مېدىيانى زاپاسلاش</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">پۇل تۆلەش تەپسىلاتلىرى</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">زاپاسلاش تىپى</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">پۇل تۆلەنگەن ۋاقىت</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">ھەمبەھىرلە</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal زاپاسلانمىسى</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">پۇل تۆلەش تارىخى</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">زاپاسلاش تەپسىلاتى</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">زاپاسلانما چوڭلۇقى</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">زاپاسلاش چاستوتىسى</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">كۆچمە ئېقىم ئىشلىتىپ زاپاسلاش</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">ئېتىپ زاپاسلانمىنى ئۆچۈرۈش</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">زاپاسلانما ئ‍ۆچۈرۈلدى ۋە ئېتىلدى.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">زاپاسلاش تىپى ئۆزگەرگەن، مۇشتەرىلىك بىكار قىلىندى</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">مۇشتەرىلىك بىكار قىلىندى</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">چۈشۈرۈلدى</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">زاپاسلاش تىپى</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">زاپاسلاش چەكلەنگەن</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s·%2$s/ئايلىق</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">زاپاسلارنى قوزغات</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">ئالدىنقى قېتىملىق زاپاسلاش</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">‫%1$s %2$s دە</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">ھەرگىز</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">ھازىر زاپاسلا</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">ئېتىپ زاپاسلانمىنى ئۆچۈرەمسىز؟</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">سىزدىن قايتا ھەق تۇتۇلمايدۇ. زاپاسلانمىڭىز ئۆچۈرۈلىدۇ ۋە يېڭى زاپاسلانما قۇرۇلىدۇ.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">ئېتىش ۋە ئۆچۈرۈش</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">زاپاسلانمىنى ئۆچۈرۈۋاتىدۇ…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">زاپاسلانما ئۆچۈرۈلدى</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"دەرھال چېكىپ زاپاسلاش"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">كۈنلۈك</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">ھەپتىلىك</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">ئايلىق</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">قولدا زاپاسلاش</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">ئۈسكۈنىڭىزگە PIN نومۇر، مەخپىي نۇمۇر ياكى نەقىشنى كىرگۈزۈڭ.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">كېيىنكى</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">زاپاسلاش تىپىنى ئۆزگەرتىڭ</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">مۇشتەرىلىكنى بىكار قىلىش</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">بىكار قىلىشنى جەزملەشتۈرۈڭ</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">سىزدىن قايتا ھەق ئېلىنمايدۇ. ھەق تۆلەش مۇددىتىڭىزنىڭ ئاخىرىدا زاپاسلاش ئېتىلىدۇ. شۇ كۈندىن كىيىن سىزنىڭ ھازىر زاپاسلىغان مېدىيانى چۈشۈرەلەيدىغان 30 كۈن مۆھلىتىڭىز بار.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">ھازىر جەزملەشتۈرۈڭ ۋە چۈشۈرۈڭ</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">كېيىن جەزملەشتۈرۈڭ ۋە چۈشۈرۈڭ</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">مۇشتەرى بولۇشنى داۋام قىلىش</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 220a04b8f4..2b27a974a4 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal оновлюється…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly оновлюється…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Ви ще не встановили фразу-пароль!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Вимкнути фразу-пароль?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Це назавжди розблокує Signal та сповіщення повідомлень.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Це назавжди розблокує Molly та сповіщення повідомлень.</string>
     <string name="ApplicationPreferencesActivity_disable">Вимкнути</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Помилка підключення до сервера!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN-коди необхідні для блокування реєстрації. Для вимкнення PIN-кодів спершу необхідно вимкнути блокування реєстрації.</string>
@@ -51,7 +52,7 @@
     <string name="ApplicationPreferencesActivity_pin_disabled">PIN вимкнений.</string>
     <string name="ApplicationPreferencesActivity_record_payments_recovery_phrase">Записати кодову фразу для платежів</string>
     <string name="ApplicationPreferencesActivity_record_phrase">Записати кодову фразу</string>
-    <string name="ApplicationPreferencesActivity_before_you_can_disable_your_pin">Перед вимкненням PIN-коду ви маєте створити кодову фразу, щоб упевнитись, що ви зможете відновити ваш платіжний обліковий запис.</string>
+    <string name="ApplicationPreferencesActivity_before_you_can_disable_your_pin">Перед вимкненням PIN-коду ви маєте створити кодову фразу, щоб упевнитись, що ви зможете відновити свій платіжний профіль.</string>
 
     <!-- NumericKeyboardView -->
   <!-- Removed by excludeNonTranslatables <string name="NumericKeyboardView__1" translatable="false">1</string> -->
@@ -71,7 +72,7 @@
     <string name="DraftDatabase_Draft_image_snippet">(зображення)</string>
     <string name="DraftDatabase_Draft_audio_snippet">(звук)</string>
     <string name="DraftDatabase_Draft_video_snippet">(відео)</string>
-    <string name="DraftDatabase_Draft_location_snippet">(розташування)</string>
+    <string name="DraftDatabase_Draft_location_snippet">(місцеположення)</string>
     <string name="DraftDatabase_Draft_quote_snippet">(відповісти)</string>
     <string name="DraftDatabase_Draft_voice_note">(Голосове повідомлення)</string>
 
@@ -79,32 +80,32 @@
     <string name="AttachmentKeyboard_gallery">Галерея</string>
     <string name="AttachmentKeyboard_file">Файл</string>
     <string name="AttachmentKeyboard_contact">Контакт</string>
-    <string name="AttachmentKeyboard_location">Розташування</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal потребує дозволу, щоб показувати ваші фото і відео</string>
+    <string name="AttachmentKeyboard_location">Локація</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly потребує дозволу, щоб показувати ваші фото і відео</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Надати доступ</string>
     <string name="AttachmentKeyboard_payment">Платіж</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Неможливо знайти програму для обрання медіа.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal потребує дозволу \"Зберігання\" для прикріплення фото, відео та аудіо, але наразі доступу немає. Будь ласка, перейдіть до налаштувань додатку, оберіть \"Дозволи\", та увімкніть \"Зберігання\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal потребує дозволу \"Контакти\", щоб прикріпити контакт, але наразі доступу немає. Будь ласка, перейдіть до налаштувань додатку, оберіть \"Дозволи\", та увімкніть \"Контакти\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal потребує дозволу \"Геодані\", щоб прикріпити дані про розташування, але наразі доступу немає. Будь ласка, перейдіть до налаштувань додатку, оберіть \"Дозволи\", та увімкніть \"Геодані\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly потребує дозволу \"Зберігання\" для прикріплення фото, відео та аудіо, але наразі доступу немає. Будь ласка, перейдіть до налаштувань додатку, оберіть \"Дозволи\", та увімкніть \"Зберігання\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly потребує дозволу \"Контакти\", щоб прикріпити контакт, але наразі доступу немає. Будь ласка, перейдіть до налаштувань додатку, оберіть \"Дозволи\", та увімкніть \"Контакти\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly потребує доступу до місцеположення, щоб його прикріпити, але його не надано. Перейдіть у налаштування застосунку, відкрийте «Дозволи», та виберіть «Геодані».</string>
 
     <!-- Dialog title asking users for location permission -->
-    <string name="AttachmentManager_signal_allow_access_location">Надайте доступ до розташування</string>
+    <string name="AttachmentManager_signal_allow_access_location">Надайте доступ до геоданих</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
-    <string name="AttachmentManager_signal_to_send_location">Щоб поділитися своїм розташуванням:</string>
+    <string name="AttachmentManager_signal_to_send_location">Щоб поділитися своїм місцеположенням:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Щоб поділитися розташуванням, надайте Signal доступ.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Щоб поділитися місцеположенням, надайте Molly доступ до геоданих.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal потребує доступу до розташування, щоб ним поділитися.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly потребує доступу до геоданих, щоб поділитися місцеположенням.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Надайте доступ до сховища</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Для показу фото і відео:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal потребує доступу до сховища, щоб показувати ваші фото і відео.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly потребує доступу до сховища, щоб показувати ваші фото і відео.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s не активував/-ла платежі </string>
@@ -128,16 +129,16 @@
 
     <!-- BlockedUsersActivity -->
     <string name="BlockedUsersActivity__blocked_users">Заблоковані користувачі</string>
-    <string name="BlockedUsersActivity__add_blocked_user">Додати заблокованого користувача</string>
+    <string name="BlockedUsersActivity__add_blocked_user">Заблокувати користувача</string>
     <string name="BlockedUsersActivity__blocked_users_will">Заблоковані користувачі не зможуть вам дзвонити й надсилати повідомлення.</string>
-    <string name="BlockedUsersActivity__no_blocked_users">Немає заблокованих користувачів</string>
+    <string name="BlockedUsersActivity__no_blocked_users">Ви нікого не заблокували</string>
     <string name="BlockedUsersActivity__block_user">Заблокувати користувача?</string>
     <string name="BlockedUserActivity__s_will_not_be_able_to">%1$s більше не зможе вам дзвонити й надсилати повідомлення.</string>
     <string name="BlockedUsersActivity__block">Заблокувати</string>
 
     <!-- CreditCardFragment -->
     <!-- Title of fragment -->
-    <string name="CreditCardFragment__credit_or_debit_card">Кредитна або дебетова картка</string>
+    <string name="CreditCardFragment__credit_or_debit_card">Кредитна / Дебетова картка</string>
     <!-- Explanation of how to fill in the form and a note about pii, displayed above the credit card text fields -->
     <string name="CreditCardFragment__enter_your_card_details">Введіть дані банківської картки. Signal не збирає і не зберігає вашу особисту інформацію.</string>
     <!-- Displayed as a hint in the card number text field -->
@@ -169,7 +170,7 @@
 
     <!-- OneTimeDonationPreference -->
     <!-- Preference title with placeholder for amount. -->
-    <string name="OneTimeDonationPreference__one_time_s">%1$s одноразово</string>
+    <string name="OneTimeDonationPreference__one_time_s">%1$s разово</string>
     <!-- Preference subtitle when donation is pending -->
     <string name="OneTimeDonationPreference__donation_pending">Ваш донат ще не надійшов</string>
     <!-- Preference subtitle when donation is processing -->
@@ -201,11 +202,11 @@
     <!-- Dialog button to report as spam only -->
     <string name="BlockUnblockDialog_report_spam">Повідомити про спам</string>
     <!-- Dialog message when reporting spam of an individual (1:1 conversation) -->
-    <string name="BlockUnblockDialog_report_spam_description">Signal отримає сповіщення, що ця людина, імовірно, надсилає спам. Signal не може бачити вміст чатів.</string>
+    <string name="BlockUnblockDialog_report_spam_description">Signal буде повідомлено, що ця людина може надсилати спам. Signal ніколи не бачить вмісту чатів.</string>
     <!-- Dialog message when reporting spam of a group and we can determine the group member that invited you, placeholder is a name -->
-    <string name="BlockUnblockDialog_report_spam_group_named_adder">Signal отримає сповіщення, що людина, яка запросила вас у чат (%1$s), імовірно, надсилає спам. Signal не може бачити вміст чатів.</string>
+    <string name="BlockUnblockDialog_report_spam_group_named_adder">Signal буде повідомлено, що людина, яка запросила вас у цю групу (%1$s), може надсилати спам. Signal ніколи не бачить вмісту чатів.</string>
     <!-- Dialog message when reporting spam of a group and we cannot determine the group member that invited you -->
-    <string name="BlockUnblockDialog_report_spam_group_unknown_adder">Signal отримає сповіщення, що людина, яка запросила вас у чат, імовірно, надсилає спам. Signal не може бачити вміст чатів.</string>
+    <string name="BlockUnblockDialog_report_spam_group_unknown_adder">Signal буде повідомлено, що людина, яка запросила вас у цю групу, може надсилати спам. Signal ніколи не бачить вмісту чатів.</string>
 
     <!-- BucketedThreadMedia -->
     <string name="BucketedThreadMedia_Today">Сьогодні</string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Змінити камеру</string>
     <string name="CameraXFragment_open_gallery_description">Відкрити галерею</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Надати доступ</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Надайте доступ до камери й мікрофона</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Надайте доступ до камери</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Надайте доступ до мікрофона</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Щоб знімати фото, надайте Signal доступ до камери.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Щоб знімати фото і відео, надайте Signal доступ до камери.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Щоб знімати фото і відео, надайте Signal доступ до камери й мікрофона.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Щоб знімати відео зі звуком, надайте Signal доступ до мікрофона.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Щоб сканувати QR-коди, надайте Signal доступ до камери.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal потребує доступу до камери, щоб знімати фото</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal потребує доступу до камери, щоб сканувати QR-коди</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal потребує доступу до мікрофона, щоб знімати відео</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Щоб знімати фото через Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Щоб знімати фото і відео через Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Щоб знімати відео зі звуком:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Щоб сканувати QR-коди:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Нещодавні контакти</string>
@@ -270,10 +271,10 @@
         <item quantity="other">Ви можете поділитися максимум із %1$d чату.</item>
     </plurals>
     <string name="CameraContacts_select_signal_recipients">Оберіть одержувача Signal</string>
-    <string name="CameraContacts_no_signal_contacts">Немає контактів Signal</string>
+    <string name="CameraContacts_no_signal_contacts">Контактів Signal немає</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Ви можете використовувати кнопку Камера лише для відправлення фото контактам Signal. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Не можете знайти, кого шукали?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Запросити контакт приєднатися до Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Запросити контакт приєднатися до Molly</string>
     <string name="CameraContacts__menu_search">Пошук</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -287,12 +288,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Не хочу</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Оновити Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Оновити Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Ця версія застосунку більше не підтримується. Щоб продовжити надсилати та отримувати повідомлення, оновіться до останньої версії.</string>
     <string name="ClientDeprecatedActivity_update">Оновити</string>
     <string name="ClientDeprecatedActivity_dont_update">Не оновлювати</string>
     <string name="ClientDeprecatedActivity_warning">Попередження</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Ваша версія Signal застаріла. Ви можете переглядати історію повідомлень, але не зможете відправляти чи отримувати повідомлення допоки не оновите застосунок.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Ваша версія Molly застаріла. Ви можете переглядати історію повідомлень, але не зможете відправляти чи отримувати повідомлення допоки не оновите застосунок.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Браузера не знайдено.</string>
@@ -328,9 +329,9 @@
     <string name="ContactsCursorLoader__messages">Повідомлення</string>
 
     <!-- ContactsDatabase -->
-    <string name="ContactsDatabase_message_s">Повідомлення %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_message_s">Написати користувачу %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Аудіовиклик у Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Відеовиклик у Molly %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -345,7 +346,7 @@
     <string name="ContactShareEditActivity__send_contact">Надіслати контакт</string>
     <string name="ContactShareEditActivity_type_home">Домашній</string>
     <string name="ContactShareEditActivity_type_mobile">Мобільний</string>
-    <string name="ContactShareEditActivity_type_work">Працюю</string>
+    <string name="ContactShareEditActivity_type_work">Робота</string>
     <string name="ContactShareEditActivity_type_missing">Інший</string>
     <string name="ContactShareEditActivity_invalid_contact">Обраний контакт недійсний</string>
     <!-- Content descrption for name edit button on contact share edit activity -->
@@ -357,7 +358,7 @@
     <string name="ConversationItem_error_not_sent_tap_for_details">Не відправлено, торкніться для деталей</string>
     <string name="ConversationItem_error_partially_not_delivered">Частково відправлено, торкніться для деталей</string>
     <string name="ConversationItem_error_network_not_delivered">Не вдалося відправити</string>
-    <string name="ConversationItem_group_action_left">%1$s покидає групу.</string>
+    <string name="ConversationItem_group_action_left">Користувач %1$s покинув групу.</string>
     <string name="ConversationItem_send_paused">Відправлення призупинене</string>
     <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Скористатися незашифрованим SMS як запасним варіантом?</string>
     <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Скористатися незашифрованим MMS як запасним варіантом?</string>
@@ -365,11 +366,11 @@
     <string name="ConversationItem_unable_to_open_media">Неможливо знайти застосунок для відкриття цього медіа.</string>
     <string name="ConversationItem_copied_text">Скопійовано %1$s</string>
     <string name="ConversationItem_from_s">від %1$s</string>
-    <string name="ConversationItem_to_s">до %1$s</string>
+    <string name="ConversationItem_to_s">у %1$s</string>
     <string name="ConversationItem_read_more">  Читати ще</string>
     <string name="ConversationItem_download_more">  Завантажити ще</string>
     <string name="ConversationItem_pending">  Очікування</string>
-    <string name="ConversationItem_this_message_was_deleted">Це повідомлення було видалено.</string>
+    <string name="ConversationItem_this_message_was_deleted">Це повідомлення видалено.</string>
     <string name="ConversationItem_you_deleted_this_message">Ви видалили це повідомлення.</string>
     <!-- Dialog error message shown when user can\'t download a message from someone else due to a permanent failure (e.g., unable to decrypt), placeholder is other\'s name -->
     <string name="ConversationItem_cant_download_message_s_will_need_to_send_it_again">Не вдалося завантажити повідомлення. %1$s має надіслати його ще раз.</string>
@@ -384,7 +385,7 @@
     <!-- Dialog error message shown when user can\'t download a their own video message via a linked device due to a permanent failure (e.g., unable to decrypt) -->
     <string name="ConversationItem_cant_download_video_you_will_need_to_send_it_again">Не вдалося завантажити відео. Потрібно буде надіслати його ще раз.</string>
     <!-- Display as the timestamp footer in a message bubble in a conversation when a message has been edited. The timestamp represents a message that has been edited within the last minute. -->
-    <string name="ConversationItem_edited_now_timestamp_footer">Змінено зараз</string>
+    <string name="ConversationItem_edited_now_timestamp_footer">Щойно змінено</string>
     <!-- Display as the timestamp footer in a message bubble in a conversation when a message has been edited. This is displayed when the edit has occurred between 1-59 minutes ago. -->
     <string name="ConversationItem_edited_relative_timestamp_footer">Змінено %1$s</string>
     <!-- Display as the timestamp footer in a message bubble in a conversation when a message has been edited. This is displayed when the edit occurred at least 1 hour ago. -->
@@ -428,7 +429,7 @@
     <string name="ConversationActivity_transport_signal">Повідомлення Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Надіслати повідомлення</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Пора переходити в Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Пора переходити в Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Будь ласка, виберіть контакт</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Вкладення перевищує обмеження за розміром для типу повідомлення, яке ви надсилаєте.</string>
     <string name="ConversationActivity_unable_to_record_audio">Неможливо записати аудіо!</string>
@@ -447,18 +448,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Щоб надсилати голосові повідомлення:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Щоб надсилати голосові повідомлення, надайте Signal доступ до мікрофона.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Щоб надсилати голосові повідомлення, надайте Molly доступ до мікрофона.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal потребує доступу до мікрофона для запису голосового повідомлення.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal потребує дозволу «Мікрофон», щоб відправляти аудіоповідомлення, але наразі доступу немає. Будь ласка, перейдіть до налаштувань застосунку, оберіть «Дозволи» та увімкніть «Мікрофон».</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly потребує доступу до мікрофона для запису голосового повідомлення.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly потребує дозволу «Мікрофон», щоб відправляти аудіоповідомлення, але наразі доступу немає. Будь ласка, перейдіть до налаштувань застосунку, оберіть «Дозволи» та увімкніть «Мікрофон».</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Для виклику користувача %1$s Signal потребує доступу до мікрофона й камери, але його не надано. Перейдіть у налаштування застосунку, відкрийте «Дозволи» та виберіть мікрофон і камеру.</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Щоб знімати фото і відео, надайте Signal доступ до камери.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal потребує дозволу \"Камера\", щоб фотографувати або знімати відео, але наразі доступу немає. Будь ласка, перейдіть до налаштувань додатку, оберіть \"Дозволи\", та увімкніть \"Камера\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal потребує дозволу «Камера», щоб фотографувати або фільмувати.</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Для виклику користувача %1$s Molly потребує доступу до мікрофона й камери, але його не надано. Перейдіть у налаштування застосунку, відкрийте «Дозволи» та виберіть мікрофон і камеру.</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Щоб знімати фото і відео, надайте Molly доступ до камери.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly потребує доступу до камери, щоб знімати фото або відео, але його не надано. Перейдіть у налаштування застосунку, відкрийте «Дозволи» та виберіть камеру.</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly потребує доступу до камери, щоб знімати фото або відео</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Надайте доступ до мікрофона, щоб записувати відео зі звуком.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal потрібен дозвіл на доступ до мікрофона, щоб знімати відео, але воно було вами відхилено. Будь ласка, натисніть «Продовжити», щоб перейти в налаштування програми, відкрийте \"Дозволи\" і включіть \"Мікрофон\" та \"Камера\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal потребує доступу до мікрофона для запису відео.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly потрібен дозвіл на доступ до мікрофона, щоб знімати відео, але воно було вами відхилено. Будь ласка, натисніть «Продовжити», щоб перейти в налаштування програми, відкрийте \"Дозволи\" і включіть \"Мікрофон\" та \"Камера\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly потребує доступу до мікрофона, щоб записувати відео.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">Ні</string>
@@ -479,9 +480,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Щоб почати виклик:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Щоб почати виклик, надайте Signal доступ до мікрофона.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Щоб почати виклик, надайте Molly доступ до мікрофона.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal потребує доступу до мікрофона, щоб почати виклик.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly потребує доступу до мікрофона, щоб почати виклик.</string>
 
 
     <string name="ConversationActivity_join">Приєднатись</string>
@@ -495,9 +496,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Signal більше не підтримує SMS-повідомлення. Запросіть користувача %1$s в Signal, щоб продовжити розмову тут.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Ця людина більше не використовує Signal. Запросіть її в Signal, щоб спілкуватися тут і надалі.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Ця людина більше не використовує Molly. Запросіть її в Molly, щоб спілкуватися тут і надалі.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Запросити до Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Запросити до Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Незабаром ви отримаєте нове нагадування.</string>
 
@@ -554,7 +555,7 @@
         <item quantity="other">Зберігаємо %1$d вкладення до сховища…</item>
     </plurals>
     <string name="ConversationFragment_pending">Очікування…</string>
-    <string name="ConversationFragment_push">Дані (Signal)</string>
+    <string name="ConversationFragment_push">інтернет (Signal)</string>
     <string name="ConversationFragment_mms">MMS</string>
     <string name="ConversationFragment_sms">SMS</string>
     <string name="ConversationFragment_deleting">Видалення</string>
@@ -563,9 +564,11 @@
     <string name="ConversationFragment_delete_for_everyone">Видалити для всіх</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Видалити з цього пристрою</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Видалити</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Видалити всюди</string>
-    <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Це повідомлення буде видалено для всіх у цьому чаті, якщо вони використовують найновішу версію Signal. Ці користувачі зможуть побачити, що ви видалили повідомлення.</string>
+    <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Це повідомлення буде видалено для всіх у цьому чаті, якщо вони використовують найновішу версію Signal. Учасники чату побачать, що ви видалили повідомлення.</string>
     <string name="ConversationFragment_quoted_message_not_found">Оригінальне повідомлення не знайдено</string>
     <string name="ConversationFragment_quoted_message_no_longer_available">Оригінальне повідомлення більше не доступно</string>
     <string name="ConversationFragment_failed_to_open_message">Не вдалося відкрити повідомлення</string>
@@ -578,11 +581,11 @@
     <string name="ConversationFragment__tap_to_review">Натисніть для перегляду</string>
     <!-- The body of a banner that can show up at the top of a chat, letting the user know that you have two contacts with the same name -->
     <string name="ConversationFragment__review_banner_body">Ця людина має таке ж ім\'я, як і ваш інший контакт</string>
-    <string name="ConversationFragment_contact_us">Зв\'язатися з нами</string>
-    <string name="ConversationFragment_verify">Підтвердження</string>
+    <string name="ConversationFragment_contact_us">Зв\'яжіться з нами</string>
+    <string name="ConversationFragment_verify">Перевірити</string>
     <string name="ConversationFragment_not_now">Не зараз</string>
-    <string name="ConversationFragment_your_safety_number_with_s_changed">Ваш код безпеки із %1$s змінився</string>
-    <string name="ConversationFragment_your_safety_number_with_s_changed_likey_because_they_reinstalled_signal">Ваш код безпеки з %1$s змінився, ймовірно тому що цей користувач перевстановив Signal або змінив пристрій. Торкніться «Підтвердити» щоб підтвердити новий код безпеки. Це необов\'язково.</string>
+    <string name="ConversationFragment_your_safety_number_with_s_changed">Змінився код безпеки користувача %1$s</string>
+    <string name="ConversationFragment_your_safety_number_with_s_changed_likey_because_they_reinstalled_signal">Ваш код безпеки з користувачем %1$s змінився. Імовірно, користувач перевстановив Signal або змінив пристрій. Торкніться «Перевірити», щоб перевірити новий код безпеки. Це необов\'язково.</string>
     <!-- Dialog title for block group link join requests -->
     <string name="ConversationFragment__block_request">Заблокувати запит?</string>
     <!-- Dialog message for block group link join requests -->
@@ -594,15 +597,15 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Заблоковано</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Оновити Signal</string>
+    <string name="ConversationFragment__update_build">Оновити Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Перереєструватись у Signal</string>
+    <string name="ConversationFragment__reregister_signal">Перереєструватись у Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Повернутися.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Відкрити Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Відкрити Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
-    <string name="ConversationFragment__no_longer_verified">Без підтвердження</string>
+    <string name="ConversationFragment__no_longer_verified">Уже не позначено як перевірений</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
     <string name="ConversationFragment_safety_tips">Поради щодо безпеки</string>
     <!-- Menu option to report spam in a conversation -->
@@ -669,6 +672,13 @@
         <item quantity="many">Усі %1$d вибраних чатів буде видалено назавжди.</item>
         <item quantity="other">Усі %1$d вибраного чату буде видалено назавжди.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">Вибраний чат буде остаточно видалено з усіх ваших пристроїв.</item>
+        <item quantity="few">%1$d вибрані чати буде остаточно видалено з усіх ваших пристроїв.</item>
+        <item quantity="many">%1$d вибраних чатів буде остаточно видалено з усіх ваших пристроїв.</item>
+        <item quantity="other">%1$d вибраного чату буде остаточно видалено з усіх ваших пристроїв.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Видалення</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Видаляємо вибраний чат…</item>
@@ -734,7 +744,7 @@
     <string name="ConversationListItemAction_archived_conversations_d">Архівні чати (%1$d)</string>
 
     <!-- ConversationTitleView -->
-    <string name="ConversationTitleView_verified">Підтверджено</string>
+    <string name="ConversationTitleView_verified">Перевірено</string>
     <string name="ConversationTitleView_you">Ви</string>
 
     <!-- ConversationTypingView -->
@@ -758,11 +768,11 @@
     <string name="CreateProfileActivity_problem_setting_profile">Не вдалося встановити профіль</string>
     <string name="CreateProfileActivity_set_up_your_profile">Налаштувати ваш профайл</string>
     <string name="CreateProfileActivity_signal_profiles_are_end_to_end_encrypted">Ваш профіль і зміни в ньому бачитимуть ваші співрозмовники, контакти та групи.</string>
-    <string name="CreateProfileActivity_set_avatar_description">Встановити фото профілю</string>
+    <string name="CreateProfileActivity_set_avatar_description">Установити зображення профілю</string>
 
     <!-- ProfileCreateFragment -->
     <!-- Displayed at the top of the screen and explains how profiles can be viewed. -->
-    <string name="ProfileCreateFragment__profiles_are_visible_to_contacts_and_people_you_message">Профілі можуть бачити ваші співрозмовники, контакти і групи.</string>
+    <string name="ProfileCreateFragment__profiles_are_visible_to_contacts_and_people_you_message">Профіль бачать ваші співрозмовники, контакти й групи.</string>
     <!-- Title of clickable row to select phone number privacy settings -->
     <string name="ProfileCreateFragment__who_can_find_me">Хто може знайти мене за номером?</string>
 
@@ -770,12 +780,12 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Хто може знайти мене за номером?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Будь-яка людина, що має ваш номер телефону, бачитиме вас у Signal і зможе розпочати з вами розмову.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Будь-яка людина, що має ваш номер телефону, бачитиме вас у Molly і зможе розпочати з вами розмову.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Ніхто не бачитиме, що ви використовуєте Signal, окрім людей, з якими ви вже маєте існуючий чат або яким напишете повідомлення.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Крім людей, яким ви напишете самі й з якими ви вже маєте спільний чат, ніхто не побачить, що ви зареєстровані в Molly.</string>
 
     <!-- ChooseBackupFragment -->
-    <string name="ChooseBackupFragment__restore_from_backup">Відновити резервну копію?</string>
+    <string name="ChooseBackupFragment__restore_from_backup">Відновити з резервної копії?</string>
     <string name="ChooseBackupFragment__restore_your_messages_and_media">Відновити ваші повідомлення та медіа-файли із локальної резервної копії. Якщо Ви не бажаєте цього робити зараз, це можна зробити потім.</string>
     <string name="ChooseBackupFragment__icon_content_description">Значок відновлення з резервної копії</string>
     <string name="ChooseBackupFragment__choose_backup">Обрати резервну копію</string>
@@ -784,7 +794,7 @@
 
     <!-- RestoreBackupFragment -->
     <string name="RestoreBackupFragment__restore_complete">Відновлення завершено</string>
-    <string name="RestoreBackupFragment__to_continue_using_backups_please_choose_a_folder">Щоб продовжити резервне копіювання, будь ласка, виберіть папку. Нові резервні копії будуть зберігатися в ній.</string>
+    <string name="RestoreBackupFragment__to_continue_using_backups_please_choose_a_folder">Щоб продовжити користуватися функцією резервного копіювання, оберіть папку. У ній будуть зберігатися нові резервні копії.</string>
     <string name="RestoreBackupFragment__choose_folder">Обрати папку</string>
     <string name="RestoreBackupFragment__not_now">Не зараз</string>
     <!-- Couldn\'t find the selected backup -->
@@ -795,8 +805,8 @@
     <string name="RestoreBackupFragment__backup_has_a_bad_extension">Резервна копія має хибне розширення.</string>
 
     <!-- BackupsPreferenceFragment -->
-    <string name="BackupsPreferenceFragment__chat_backups">Резервні копії чату</string>
-    <string name="BackupsPreferenceFragment__backups_are_encrypted_with_a_passphrase">Резервні копії шифруються парольною фразою і зберігаються на вашому пристрої.</string>
+    <string name="BackupsPreferenceFragment__chat_backups">Резервне копіювання чатів</string>
+    <string name="BackupsPreferenceFragment__backups_are_encrypted_with_a_passphrase">Резервні копії шифруються за допомогою пароля і зберігаються на вашому пристрої.</string>
     <string name="BackupsPreferenceFragment__create_backup">Створити резервну копію</string>
     <string name="BackupsPreferenceFragment__last_backup">Остання резервна копія: %1$s</string>
     <string name="BackupsPreferenceFragment__backup_folder">Папка для резервних копій</string>
@@ -806,7 +816,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Випробуйте парольну фразу своєї резервної копії і переконайтеся, що вона збігається</string>
     <string name="BackupsPreferenceFragment__turn_on">Увімкнути</string>
     <string name="BackupsPreferenceFragment__turn_off">Вимкнути</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Щоб відновити з резервної копії, встановіть нову копію Signal. Відкрийте програму та натисніть \"Відновити резервну копію\", потім виберіть файл резервної копії. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Щоб відновити інформацію з резервної копії, встановіть застосунок Molly ще раз. Відкрийте його й натисніть «Відновити з резервної копії», потім виберіть збережений файл резервної копії. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Дізнатися більше</string>
     <string name="BackupsPreferenceFragment__in_progress">В процесі…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -814,9 +824,9 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d на цей час…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% на цей час…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal потребує дозволу \"Зберігання\", щоб створювати резервні копії, але наразі доступу немає. Будь ласка, перейдіть до налаштувань додатку, оберіть \"Дозволи\", та увімкніть \"Зберігання\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly потребує дозволу \"Зберігання\", щоб створювати резервні копії, але наразі доступу немає. Будь ласка, перейдіть до налаштувань додатку, оберіть \"Дозволи\", та увімкніть \"Зберігання\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
-    <string name="BackupsPreferenceFragment__set_backup_time">Встановити час резервного копіювання</string>
+    <string name="BackupsPreferenceFragment__set_backup_time">Установити час резервного копіювання</string>
 
 
     <!-- CustomDefaultPreference -->
@@ -864,7 +874,7 @@
     <!-- Disclaimer in message scheduling dialog. %1$s replaced with a GMT offset (e.g. GMT-05:00), and %2$s is replaced with the time zone name (e.g. Eastern Standard Time) -->
     <string name="ScheduleMessageTimePickerBottomSheet__timezone_disclaimer">Встановлений час: %2$s (%1$s)</string>
     <!-- Warning dialog message text shown when select time for scheduled send is in the past resulting in an immediate send if scheduled. -->
-    <string name="ScheduleMessageTimePickerBottomSheet__select_time_in_past_dialog_warning">Вибраний час у минулому. Повідомлення буде надіслано зараз.</string>
+    <string name="ScheduleMessageTimePickerBottomSheet__select_time_in_past_dialog_warning">Ви обрали час, що вже минув. Повідомлення буде надіслано зараз.</string>
     <!-- Positive button text for warning dialog shown when scheduled send is in the past -->
     <string name="ScheduleMessageTimePickerBottomSheet__select_time_in_past_dialog_positive_button">Надіслати зараз</string>
 
@@ -881,11 +891,66 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Сесію чату оновлено</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal використовує наскрізне шифровання, що подекуди призводить до оновлення сесій чатів. Це не впливає на безпеку чату, хоча надіслане контактом повідомлення може не дійти і вам потрібно буде попросити надіслати його знов.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly використовує наскрізне шифровання, що подекуди призводить до оновлення сесій чатів. Це не впливає на безпеку чату, хоча надіслане контактом повідомлення може не дійти і вам потрібно буде попросити надіслати його знов.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Користуйтеся застосунком Signal на комп\'ютері чи iPad. Ваші повідомлення буде синхронізовано на зв\'язаних пристроях.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Зв\'язати новий пристрій</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Повідомлення й інформацію про чати захищено наскрізним шифруванням на всіх пристроях</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal на комп\'ютері чи iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Обмін повідомленнями на зв\'язаних пристроях завжди конфіденційний</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Повідомлення в Molly буде синхронізовано із застосунком Molly на вашому мобільному телефоні після зв\'язування. Попередню історію повідомлень не буде перенесено на новий зв\'язаний пристрій.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Щоб установити Molly на іншому пристрої, зайдіть з нього на сторінку %1$s</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Мої зв\'язані пристрої</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Відв\'язати</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">«%1$s» відв\'язано</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Зв\'язування пристрою…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Пристрій схвалено</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Завантаження…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Зв\'язаних пристроїв немає</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Розблокуйте, щоб зв\'язати пристрій</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Зіскануйте QR-код на пристрої, щоб зв\'язати його.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Скануйте QR-код</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Зіскануйте QR-код на пристрої, який ви хочете зв\'язати зі своїм акаунтом</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Зрозуміло</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">На цьому пристрої буде видно ваші групи й контакти, з нього з\'явиться доступ до чатів, і він зможе надсилати повідомлення від вашого імені.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Завершіть на іншому пристрої</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Завершіть зв\'язування з акаунтом Molly на іншому пристрої.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Не вдалося зв’язати пристрій</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Це не QR-код для зв\'язування. Переконайтеся, що ви скануєте QR-код на пристрої, який хочете зв’язати.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Сканувати знову</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Від\'єднати \'%1$s\'?</string>
-    <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Після від\'єднання цього пристрою він більше не зможе відправляти та одержувати повідомлення.</string>
+    <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Якщо відв\'язати цей пристрій, він більше не зможе надсилати та отримувати повідомлення.</string>
     <string name="DeviceListActivity_network_connection_failed">Проблема з\'єднання</string>
     <string name="DeviceListActivity_try_again">Спробуйте ще</string>
     <string name="DeviceListActivity_unlinking_device">Від\'єднання пристрою…</string>
@@ -903,24 +968,24 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Оптимізувати для випадку відсутності служб Google Play</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Цей пристрій не підтримує служби Google Play. Торкніться, щоб вимкнути режим ощадливого споживання енергії Signal і отримувати повідомлення коли Signal працює у фоні.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Цей пристрій не підтримує служби Google Play. Торкніться, щоб вимкнути режим ощадливого споживання енергії Molly і отримувати повідомлення коли Molly працює у фоні.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Ваша версія Signal застаріла. Оновіть зараз, щоб відправляти та отримувати повідомлення.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Ваша версія Molly застаріла. Оновіть зараз, щоб відправляти та отримувати повідомлення.</string>
     <string name="ExpiredBuildReminder_update_now">Оновити зараз</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
     <plurals name="PendingGroupJoinRequestsReminder_d_pending_member_requests">
-        <item quantity="one">%1$d запит учасникав, що очікує розгляд.</item>
-        <item quantity="few">%1$d запитів учасників, що очікують розгляду.</item>
-        <item quantity="many">%1$d запитів учасників, що очікують розгляду.</item>
-        <item quantity="other">%1$d запитів учасників, що очікують розгляду.</item>
+        <item quantity="one">Не розглянуто %1$d запит на приєднання.</item>
+        <item quantity="few">Не розглянуто %1$d запити на приєднання.</item>
+        <item quantity="many">Не розглянуто %1$d запитів на приєднання.</item>
+        <item quantity="other">Не розглянуто %1$d запиту на приєднання.</item>
     </plurals>
     <string name="PendingGroupJoinRequestsReminder_view">Детальніше</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Постійний збій зв\'язку Signal!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal не зміг зареєструватись у сервісах Google Play. Виклики та повідомлення Signal наразі вимкнено, спробуйте перереєструватися у Налаштуваннях &gt; Додатково.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Постійний збій зв\'язку Molly!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly не зміг зареєструватись у сервісах Google Play. Виклики та повідомлення Molly наразі вимкнено, спробуйте перереєструватися у Налаштуваннях &gt; Додатково.</string>
 
 
     <!-- GiphyActivity -->
@@ -930,7 +995,7 @@
 
     <!-- AddToGroupActivity -->
     <string name="AddToGroupActivity_add_member">Додати учасника?</string>
-    <string name="AddToGroupActivity_add_s_to_s">Додати \"%1$s\" до \"%2$s\"?</string>
+    <string name="AddToGroupActivity_add_s_to_s">Додати користувача %1$s до «%2$s»?</string>
     <string name="AddToGroupActivity_s_added_to_s">\"%1$s\" доданий до \"%2$s\".</string>
     <string name="AddToGroupActivity_add_to_group">Додати до групи</string>
     <string name="AddToGroupActivity_add_to_groups">Додати до груп</string>
@@ -1045,16 +1110,16 @@
         <item quantity="other">Додати учасника</item>
     </plurals>
     <plurals name="GroupsV1MigrationSuggestionsDialog_failed_to_add_members_try_again_later">
-        <item quantity="one">Не вдалось додати учасника. Спробуйте пізніше.</item>
-        <item quantity="few">Не вдалось додати учасників. Спробуйте пізніше.</item>
-        <item quantity="many">Не вдалось додати учасників. Спробуйте пізніше.</item>
-        <item quantity="other">Не вдалось додати учасників. Спробуйте пізніше.</item>
+        <item quantity="one">Не вдалося додати учасника. Спробуйте пізніше.</item>
+        <item quantity="few">Не вдалося додати учасників. Спробуйте пізніше.</item>
+        <item quantity="many">Не вдалося додати учасників. Спробуйте пізніше.</item>
+        <item quantity="other">Не вдалося додати учасників. Спробуйте пізніше.</item>
     </plurals>
     <plurals name="GroupsV1MigrationSuggestionsDialog_cannot_add_members">
-        <item quantity="one">Не вдалось додати учасника.</item>
-        <item quantity="few">Не вдалось додати учасників.</item>
-        <item quantity="many">Не вдалось додати учасників.</item>
-        <item quantity="other">Не вдалось додати учасників.</item>
+        <item quantity="one">Не вдалося додати учасника.</item>
+        <item quantity="few">Не вдалося додати учасників.</item>
+        <item quantity="many">Не вдалося додати учасників.</item>
+        <item quantity="other">Не вдалося додати учасників.</item>
     </plurals>
 
     <!-- LeaveGroupDialog -->
@@ -1067,10 +1132,10 @@
 
     <!-- LinkPreviewView -->
     <string name="LinkPreviewView_no_link_preview_available">Попередній вигляд вебсторінки недоступний</string>
-    <string name="LinkPreviewView_this_group_link_is_not_active">Посилання групи неактивне</string>
+    <string name="LinkPreviewView_this_group_link_is_not_active">Посилання на групу неактивне</string>
     <string name="LinkPreviewView_domain_date">%1$s · %2$s</string>
     <!-- Description for Call Link url previews -->
-    <string name="LinkPreviewView__use_this_link_to_join_a_signal_call">Приєднайтеся до виклику в Signal за цим посиланням</string>
+    <string name="LinkPreviewView__use_this_link_to_join_a_signal_call">Ось посилання, за яким можна приєднатися до виклику в Signal</string>
 
     <!-- LinkPreviewRepository -->
     <plurals name="LinkPreviewRepository_d_members">
@@ -1085,27 +1150,37 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Журнали налагодження допомагають нам діагностувати і виправляти проблеми. Вони не містять особистої інформації.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">У Signal виникла проблема. Надіслати журнал налагодження?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">У Molly виникла проблема. Надіслати журнал налагодження?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Сповіщення можуть надходити з затримкою через оптимізацію акумулятора</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Ви можете вимкнути оптимізацію акумулятора для Signal, щоб упевнитися, що сповіщення про повідомлення надходитимуть без затримки.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Ви можете вимкнути оптимізацію акумулятора для Molly, щоб упевнитися, що сповіщення про повідомлення надходитимуть без затримки.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Сповіщення можуть надходити із затримкою через оптимізацію акумулятора</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Вимкніть оптимізацію акумулятора для Molly, щоб сповіщення про повідомлення не затримувалися. Натисніть «Продовжити», щоб переглянути інструкції для конкретних пристроїв.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Не хочу</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Продовжити</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Продовжити</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Закрити</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Не хочу</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Очікуванні запрошення в групу</string>
+    <string name="PendingMembersActivity_pending_group_invites">Запити і запрошення</string>
     <string name="PendingMembersActivity_requests">Запити</string>
     <string name="PendingMembersActivity_invites">Запрошення</string>
     <string name="PendingMembersActivity_people_you_invited">Люди, яких ви запросили</string>
-    <string name="PendingMembersActivity_you_have_no_pending_invites">У вас немає запрошень, які очікують рішення.</string>
-    <string name="PendingMembersActivity_invites_by_other_group_members">Запрошення від інших учасників групи</string>
-    <string name="PendingMembersActivity_no_pending_invites_by_other_group_members">Немає запрошень, які очікують рішення, відправлених іншими учасниками.</string>
-    <string name="PendingMembersActivity_missing_detail_explanation">Деталі людей не показуються, запрошених іншими учасниками групи. Якщо запрошені вирішать приєднатися, їх інформація з того часу стане доступна групі. Вони не зможуть бачити ніяких повідомлень в групі до того, як приєднаються.</string>
+    <string name="PendingMembersActivity_you_have_no_pending_invites">Неприйнятих запрошень немає.</string>
+    <string name="PendingMembersActivity_invites_by_other_group_members">Люди, яких запросили інші учасники групи</string>
+    <string name="PendingMembersActivity_no_pending_invites_by_other_group_members">Неприйнятих запрошень немає.</string>
+    <string name="PendingMembersActivity_missing_detail_explanation">Інформація про людей, яких запросили інші учасники групи, не показується. Інформація запрошеного стане доступна для учасників групи в разі прийняття запрошення. Запрошені побачать повідомлення в групі тільки після приєднання.</string>
 
     <string name="PendingMembersActivity_revoke_invite">Відкликати запрошення</string>
     <string name="PendingMembersActivity_revoke_invites">Відкликати запрошення</string>
@@ -1123,9 +1198,9 @@
     </plurals>
 
     <!-- RequestingMembersFragment -->
-    <string name="RequestingMembersFragment_pending_member_requests">Запити на участь, які очікують рішення</string>
-    <string name="RequestingMembersFragment_no_member_requests_to_show">Немає запитів на участь.</string>
-    <string name="RequestingMembersFragment_explanation">Люди в цьому списку намагаються приєднатися до цієї групи за посиланням на групу.</string>
+    <string name="RequestingMembersFragment_pending_member_requests">Запити на приєднання, які ще не розглянуто</string>
+    <string name="RequestingMembersFragment_no_member_requests_to_show">Запитів немає.</string>
+    <string name="RequestingMembersFragment_explanation">Це список людей, які хочуть приєднатися до цієї групи за посиланням.</string>
     <string name="RequestingMembersFragment_added_s">"Додано \"%1$s\""</string>
     <string name="RequestingMembersFragment_denied_s">"Відхилено \"%1$s\""</string>
 
@@ -1133,10 +1208,10 @@
     <string name="AddMembersActivity__done">Готово</string>
     <string name="AddMembersActivity__this_person_cant_be_added_to_legacy_groups">Ця людина не може бути додана до застарілих груп.</string>
     <plurals name="AddMembersActivity__add_d_members_to_s">
-        <item quantity="one">Додати %1$s до «%2$s»?</item>
-        <item quantity="few">Додати %3$d учасників до «%2$s»?</item>
-        <item quantity="many">Додати %3$d учасників до «%2$s»?</item>
-        <item quantity="other">Додати %3$d учасника до «%2$s»?</item>
+        <item quantity="one">Додати %1$s до %2$s?</item>
+        <item quantity="few">Додати %3$d учасників до %2$s?</item>
+        <item quantity="many">Додати %3$d учасників до %2$s?</item>
+        <item quantity="other">Додати %3$d учасника до %2$s?</item>
     </plurals>
     <string name="AddMembersActivity__add">Додати</string>
     <string name="AddMembersActivity__add_members">Додати учасників</string>
@@ -1148,7 +1223,7 @@
     <string name="AddGroupDetailsFragment__members">Учасники</string>
     <string name="AddGroupDetailsFragment__you_can_add_or_invite_friends_after_creating_this_group">Після створення групи ви зможете додати чи запросити до неї друзів.</string>
     <string name="AddGroupDetailsFragment__group_name_required">Ім\'я групи (обов\'язково)</string>
-    <string name="AddGroupDetailsFragment__group_name_optional">Назва групи (за бажанням)</string>
+    <string name="AddGroupDetailsFragment__group_name_optional">Назва групи (необов\'язково)</string>
     <string name="AddGroupDetailsFragment__this_field_is_required">Це обов\'язкове поле.</string>
     <string name="AddGroupDetailsFragment__group_creation_failed">Не вдалось створити групу.</string>
     <string name="AddGroupDetailsFragment__try_again_later">Спробуйте знову пізніше.</string>
@@ -1161,7 +1236,7 @@
     <string name="AddGroupDetailsFragment__youve_selected_a_contact_that_doesnt_support_signal_groups_mms_removal">Ви вибрали контакт, який не підтримує групи Signal. Це буде MMS-група. Настроювані імена і фото MMS-груп зможете бачити тільки ви. Незабаром ми припинимо підтримувати MMS-групи, щоб сфокусуватися на зашифрованих повідомленнях.</string>
 
     <!-- ManageGroupActivity -->
-    <string name="ManageGroupActivity_who_can_add_new_members">Хто може додати нових учасників?</string>
+    <string name="ManageGroupActivity_who_can_add_new_members">Хто може додавати учасників?</string>
     <string name="ManageGroupActivity_who_can_edit_this_groups_info">Хто може редагувати інформацію цієї групи?</string>
 
     <plurals name="ManageGroupActivity_added">
@@ -1203,14 +1278,14 @@
     <string name="ManageProfileFragment__your_username">Ім\'я користувача, QR-код і посилання не відображаються у вашому профілі. Діліться іменем користувача тільки з людьми, яким довіряєте.</string>
     <!-- Explanation text about usernames etc displayed underneath buttons to view and edit username etc, shown when you have no username -->
     <string name="ManageProfileFragment__username_footer_no_username">Тепер люди можуть писати вам, знаючи ваше ім\'я користувача. Його можна створити в разі потреби не повідомляти свого номера телефону. </string>
-    <string name="ManageProfileFragment_profile_name">Ім’я профілю</string>
+    <string name="ManageProfileFragment_profile_name">Назва профілю</string>
     <string name="ManageProfileFragment_username">Ім\'я користувача</string>
     <string name="ManageProfileFragment_about">Про себе</string>
-    <string name="ManageProfileFragment_failed_to_set_avatar">Не вдалось встановити фото профілю</string>
+    <string name="ManageProfileFragment_failed_to_set_avatar">Не вдалося встановити зображення профілю</string>
     <string name="ManageProfileFragment_badges">Значки</string>
     <!-- Text for a button that will take the user to the screen to manage their username link and QR code -->
     <string name="ManageProfileFragment_link_setting_text">QR-код чи посилання</string>
-    <string name="ManageProfileFragment__edit_photo">Редагувати фото</string>
+    <string name="ManageProfileFragment__edit_photo">Змінити фото</string>
     <!-- Title of a tooltip educating the user about a button on the screen that will take them to the username share screen -->
     <string name="ManageProfileFragment__link_tooltip_title">Поділіться своїм іменем користувача</string>
     <!-- Body of a tooltip educating the user about a button on the screen that will take them to the username share screen -->
@@ -1268,11 +1343,11 @@
     <string name="CustomNotificationsDialogFragment__unknown">Невідомо</string>
 
     <!-- ShareableGroupLinkDialogFragment -->
-    <string name="ShareableGroupLinkDialogFragment__group_link">Посилання групи</string>
+    <string name="ShareableGroupLinkDialogFragment__group_link">Посилання на групу</string>
     <string name="ShareableGroupLinkDialogFragment__share">Поділитися</string>
     <string name="ShareableGroupLinkDialogFragment__reset_link">Скинути посилання</string>
-    <string name="ShareableGroupLinkDialogFragment__approve_new_members">Схвалити нові запити</string>
-    <string name="ShareableGroupLinkDialogFragment__require_an_admin_to_approve_new_members_joining_via_the_group_link">Потрібно, щоб адміністратор затвердив нових членів, які приєднуються за посиланням групи.</string>
+    <string name="ShareableGroupLinkDialogFragment__approve_new_members">Затверджувати нових учасників</string>
+    <string name="ShareableGroupLinkDialogFragment__require_an_admin_to_approve_new_members_joining_via_the_group_link">Нових учасників, які приєднуються до групи за посиланням, повинен затверджувати адміністратор.</string>
     <string name="ShareableGroupLinkDialogFragment__are_you_sure_you_want_to_reset_the_group_link">Ви впевнені, що бажаєте скинути посилання на групу? Люди більше не зможуть приєднуватись до групи за цим посиланням.</string>
 
     <!-- GroupLinkShareQrDialogFragment -->
@@ -1295,13 +1370,13 @@
     <string name="GroupJoinBottomSheetDialogFragment_request_to_join">Запит на приєднання</string>
     <string name="GroupJoinBottomSheetDialogFragment_unable_to_join_group_please_try_again_later">Не вдалось приєднатись до групи. Будь ласка, спробуйте пізніше</string>
     <string name="GroupJoinBottomSheetDialogFragment_encountered_a_network_error">Виникла помилка мережі.</string>
-    <string name="GroupJoinBottomSheetDialogFragment_this_group_link_is_not_active">Посилання групи неактивне</string>
+    <string name="GroupJoinBottomSheetDialogFragment_this_group_link_is_not_active">Посилання на групу неактивне</string>
     <!-- Title shown when there was an known issue getting group information from a group link -->
     <string name="GroupJoinBottomSheetDialogFragment_cant_join_group">Неможливо приєднатись до групи</string>
     <!-- Message shown when you try to get information for a group via link but an admin has removed you -->
     <string name="GroupJoinBottomSheetDialogFragment_you_cant_join_this_group_via_the_group_link_because_an_admin_removed_you">Ви не можете приєднатись до групи за посиланням, оскільки адміністратор групи вилучив вас.</string>
     <!-- Message shown when you try to get information for a group via link but the link is no longer valid -->
-    <string name="GroupJoinBottomSheetDialogFragment_this_group_link_is_no_longer_valid">Це посилання групи більше недійсне.</string>
+    <string name="GroupJoinBottomSheetDialogFragment_this_group_link_is_no_longer_valid">Це посилання на групу вже не дійсне.</string>
     <!-- Title shown when there was an unknown issue getting group information from a group link -->
     <string name="GroupJoinBottomSheetDialogFragment_link_error">Помилка посилання</string>
     <!-- Message shown when you try to get information for a group via link but an unknown issue occurred -->
@@ -1320,22 +1395,22 @@
     <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_update_signal_to_use_group_links">Оновіть Signal для використання посилань груп</string>
     <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_update_message">Версія Signal, яку ви використовуєте, не підтримує це посилання на групу. Оновіть до новішої версії, щоб приєднатися до цієї групи за посиланням.</string>
     <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_update_signal">Оновити Signal</string>
-    <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_group_link_is_not_valid">Посилання групи недійсне</string>
+    <string name="GroupJoinUpdateRequiredBottomSheetDialogFragment_group_link_is_not_valid">Посилання на групу недійсне</string>
 
     <!-- GroupInviteLinkEnableAndShareBottomSheetDialogFragment -->
     <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_invite_friends">Запросити друзів</string>
     <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_share_a_link_with_friends_to_let_them_quickly_join_this_group">Поділіться посиланням з друзями, щоб вони змогли швидко приєднатися до цієї групи.</string>
 
-    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_enable_and_share_link">Включити і поділитися посиланням</string>
+    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_enable_and_share_link">Увімкнути та поділитися</string>
     <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_share_link">Поділитися посиланням</string>
 
     <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_unable_to_enable_group_link_please_try_again_later">Не вдалося включити посилання на групу. Будь ласка, спробуйте ще раз пізніше</string>
     <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_encountered_a_network_error">Виникла помилка мережі.</string>
     <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_you_dont_have_the_right_to_enable_group_link">У вас немає права включати посилання на групу. Будь ласка, попросіть адміністратора групи.</string>
-    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_you_are_not_currently_a_member_of_the_group">В даний момент ви не є учасником групи.</string>
+    <string name="GroupInviteLinkEnableAndShareBottomSheetDialogFragment_you_are_not_currently_a_member_of_the_group">Ви ще не учасник цієї групи.</string>
 
     <!-- GV2 Request confirmation dialog -->
-    <string name="RequestConfirmationDialog_add_s_to_the_group">Додати «%1$s» до групи?</string>
+    <string name="RequestConfirmationDialog_add_s_to_the_group">Додати користувача %1$s до групи?</string>
     <string name="RequestConfirmationDialog_deny_request_from_s">Відхилити запит від «%1$s»?</string>
     <!-- Confirm dialog message shown when deny a group link join request and group link is enabled. -->
     <string name="RequestConfirmationDialog_deny_request_from_s_they_will_not_be_able_to_request">Відхилити запит від «%1$s»? Користувач більше не зможе надіслати запит на приєднання за посиланням групи.</string>
@@ -1345,8 +1420,8 @@
     <!-- ImageEditorHud -->
     <string name="ImageEditorHud_blur_faces">Розмити обличчя</string>
     <string name="ImageEditorHud_new_blur_faces_or_draw_anywhere_to_blur">Нове: Розмити обличчя або розмити будь-що</string>
-    <string name="ImageEditorHud_draw_anywhere_to_blur">Малюй, щоб розмити</string>
-    <string name="ImageEditorHud_draw_to_blur_additional_faces_or_areas">Малюй, щоб розмити обличчя або зони</string>
+    <string name="ImageEditorHud_draw_anywhere_to_blur">Замалюйте зону, щоб її розмити</string>
+    <string name="ImageEditorHud_draw_to_blur_additional_faces_or_areas">Замалюйте інші обличчя або зони, щоб їх розмити</string>
 
     <!-- InputPanel -->
     <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Записати: торкніться й утримуйте. Надіслати: відпустіть</string>
@@ -1356,12 +1431,12 @@
     <!-- InviteActivity -->
     <string name="InviteActivity_share">Поділитися</string>
     <string name="InviteActivity_share_with_contacts">Поділитись з контактами</string>
-    <string name="InviteActivity_share_via">Поділитись через…</string>
+    <string name="InviteActivity_share_via">Надіслати в…</string>
 
     <string name="InviteActivity_cancel">Закрити</string>
     <string name="InviteActivity_sending">Надсилання…</string>
     <string name="InviteActivity_invitations_sent">Запрошення надіслано!</string>
-    <string name="InviteActivity_invite_to_signal">Запросити до Signal</string>
+    <string name="InviteActivity_invite_to_signal">Запросити до Molly</string>
     <string name="InviteActivity_send_sms">Відправити SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">Надіслати %1$d SMS запрошення?</item>
@@ -1369,7 +1444,7 @@
         <item quantity="many">Надіслати %1$d SMS запрошень?</item>
         <item quantity="other">Надіслати %1$d SMS запрошень?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Пора переходити в Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Пора переходити в Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Схоже, що у вас немає програм, щоб поділитися.</string>
 
     <!-- LearnMoreTextView -->
@@ -1378,16 +1453,16 @@
     <string name="SpanUtil__read_more">Дізнатися більше</string>
 
     <!-- LongMessageActivity -->
-    <string name="LongMessageActivity_unable_to_find_message">Неможливо знайти повідомлення</string>
-    <string name="LongMessageActivity_message_from_s">Повідомлення від %1$s</string>
+    <string name="LongMessageActivity_unable_to_find_message">Не вдалося знайти повідомлення</string>
+    <string name="LongMessageActivity_message_from_s">Повідомлення від користувача %1$s</string>
     <string name="LongMessageActivity_your_message">Ваше повідомлення</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Фонове підключення активоване</string>
 
     <!-- MediaOverviewActivity -->
-    <string name="MediaOverviewActivity_Media">Медіафайли</string>
+    <string name="MediaOverviewActivity_Media">Медіа</string>
     <string name="MediaOverviewActivity_Files">Файли</string>
     <string name="MediaOverviewActivity_Audio">Аудіо</string>
     <string name="MediaOverviewActivity_All">Усі</string>
@@ -1442,15 +1517,15 @@
   <!-- Removed by excludeNonTranslatables <string name="MediaOverviewActivity_detail_line_2_part" translatable="false">%1$s · %2$s</string> -->
   <!-- Removed by excludeNonTranslatables <string name="MediaOverviewActivity_detail_line_3_part" translatable="false">%1$s · %2$s · %3$s</string> -->
 
-    <string name="MediaOverviewActivity_sent_by_s">Надіслано %1$s</string>
-    <string name="MediaOverviewActivity_sent_by_you">Надіслано вами</string>
-    <string name="MediaOverviewActivity_sent_by_s_to_s">Надіслано %1$s до %2$s</string>
-    <string name="MediaOverviewActivity_sent_by_you_to_s">Надіслано вами до %1$s</string>
+    <string name="MediaOverviewActivity_sent_by_s">Надіслав користувач %1$s</string>
+    <string name="MediaOverviewActivity_sent_by_you">Надіслали ви</string>
+    <string name="MediaOverviewActivity_sent_by_s_to_s">Надіслано користувачем %1$s у «%2$s»</string>
+    <string name="MediaOverviewActivity_sent_by_you_to_s">Надіслали ви в «%1$s»</string>
 
     <!-- Megaphones -->
     <string name="Megaphones_remind_me_later">Нагадати пізніше</string>
-    <string name="Megaphones_verify_your_signal_pin">Підтвердьте свій PIN-код Signal</string>
-    <string name="Megaphones_well_occasionally_ask_you_to_verify_your_pin">Іноді ми будемо просити вас підтвердити PIN-код, щоб ви його не забували.</string>
+    <string name="Megaphones_verify_your_signal_pin">Підтвердьте PIN-код Signal</string>
+    <string name="Megaphones_well_occasionally_ask_you_to_verify_your_pin">Ми періодично проситимемо вас підтверджувати PIN-код, щоб ви його не забували.</string>
     <string name="Megaphones_verify_pin">Підтвердити PIN-код</string>
     <string name="Megaphones_get_started">Для початку</string>
     <string name="Megaphones_new_group">Нова група</string>
@@ -1462,15 +1537,15 @@
     <string name="MessageQuotesBottomSheet_replies">Відповіді</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Підготовка до виклику в Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">Підготовка до виклику в Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Починаємо виклик у Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Зупиняємо виклик у Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Починаємо виклик у Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Зупиняємо виклик у Molly</string>
     <string name="NotificationBarManager__cancel_call">Скасувати виклик</string>
 
     <!-- NotificationsMegaphone -->
     <string name="NotificationsMegaphone_turn_on_notifications">Увімкнути сповіщення?</string>
-    <string name="NotificationsMegaphone_never_miss_a_message">Ніколи не пропускайте повідомлення від ваших контактів та груп.</string>
+    <string name="NotificationsMegaphone_never_miss_a_message">Ніколи не пропускайте повідомлення від своїх контактів і груп.</string>
     <string name="NotificationsMegaphone_turn_on">Увімкнути</string>
     <string name="NotificationsMegaphone_not_now">Не зараз</string>
 
@@ -1514,14 +1589,14 @@
     <!-- Call update formatter string to place the update message next to a time stamp. e.g., \'Incoming voice call · 11:11am\' -->
     <string name="MessageRecord_call_message_with_date">%1$s · %2$s</string>
     <string name="MessageRecord_s_updated_group">%1$s оновив групу.</string>
-    <string name="MessageRecord_s_joined_signal">%1$s приєднався до Signal!</string>
+    <string name="MessageRecord_s_joined_signal">%1$s тепер користується Signal!</string>
     <string name="MessageRecord_you_disabled_disappearing_messages">Ви вимкнули тимчасові повідомлення.</string>
     <string name="MessageRecord_s_disabled_disappearing_messages">Користувач %1$s вимкнув тимчасові повідомлення.</string>
     <string name="MessageRecord_you_set_disappearing_message_time_to_s">Ви встановили таймер тимчасових повідомлень: %1$s.</string>
     <string name="MessageRecord_s_set_disappearing_message_time_to_s">Користувач %1$s встановив таймер тимчасових повідомлень: %2$s.</string>
     <string name="MessageRecord_disappearing_message_time_set_to_s">Установлено таймер: %1$s.</string>
     <string name="MessageRecord_this_group_was_updated_to_a_new_group">Цю групу оновлено до Нової групи.</string>
-    <string name="MessageRecord_you_couldnt_be_added_to_the_new_group_and_have_been_invited_to_join">Вас не вдалось додати до Нової групи, а тому було запрошено приєднатись.</string>
+    <string name="MessageRecord_you_couldnt_be_added_to_the_new_group_and_have_been_invited_to_join">Вас не вдалося додати до нової групи, тому вас запрошено приєднатися до неї.</string>
     <string name="MessageRecord_chat_session_refreshed">Сесію чату оновлено</string>
     <plurals name="MessageRecord_members_couldnt_be_added_to_the_new_group_and_have_been_invited">
         <item quantity="one">Не вдалося додати учасника до нової групи. Йому було надіслано запрошення.</item>
@@ -1538,8 +1613,8 @@
     </plurals>
 
     <!-- Profile change updates -->
-    <string name="MessageRecord_changed_their_profile_name_to">%1$s змінює своє ім\'я профілю на %2$s.</string>
-    <string name="MessageRecord_changed_their_profile_name_from_to">%1$s змінює своє ім\'я профілю з %2$s на %3$s.</string>
+    <string name="MessageRecord_changed_their_profile_name_to">Користувач %1$s змінив ім\'я профілю на %2$s.</string>
+    <string name="MessageRecord_changed_their_profile_name_from_to">Користувач %1$s змінив ім\'я профілю з %2$s на %3$s.</string>
     <string name="MessageRecord_changed_their_profile">%1$s змінив (-а) свій профіль.</string>
     <!-- Conversation update event message shown when you\'ve started a conversation by phone number or username and then learn their profile name. placeholder is username or phone number -->
     <string name="MessageRecord_started_this_chat">Ви почали цей чат з %1$s.</string>
@@ -1547,12 +1622,12 @@
     <!-- GV2 specific -->
     <string name="MessageRecord_you_created_the_group">Ви створили групу.</string>
     <string name="MessageRecord_group_updated">Групу оновлено.</string>
-    <string name="MessageRecord_invite_friends_to_this_group">Запрошуйте друзів до цієї групи використовуючи посилання групи</string>
+    <string name="MessageRecord_invite_friends_to_this_group">Запросіть друзів до цієї групи, надіславши їм посилання</string>
 
     <!-- GV2 member additions -->
     <string name="MessageRecord_you_added_s">Ви додали %1$s.</string>
     <string name="MessageRecord_s_added_s">%1$s додав %2$s.</string>
-    <string name="MessageRecord_s_added_you">%1$s додав (-ла) вас до групи.</string>
+    <string name="MessageRecord_s_added_you">Користувач %1$s додав вас до групи.</string>
     <string name="MessageRecord_you_joined_the_group">Ви приєдналися до групи.</string>
     <string name="MessageRecord_s_joined_the_group">%1$s приєдналися до групи.</string>
 
@@ -1561,7 +1636,7 @@
     <string name="MessageRecord_s_removed_s">%1$s вилучив %2$s.</string>
     <string name="MessageRecord_s_removed_you_from_the_group">%1$s вилучив вас з групи.</string>
     <string name="MessageRecord_you_left_the_group">Ви покинули групу.</string>
-    <string name="MessageRecord_s_left_the_group">%1$s покинув групу.</string>
+    <string name="MessageRecord_s_left_the_group">Користувач %1$s покинув групу.</string>
     <string name="MessageRecord_you_are_no_longer_in_the_group">Ви більше не у групі.</string>
     <string name="MessageRecord_s_is_no_longer_in_the_group">%1$s більше не у групі.</string>
 
@@ -1579,7 +1654,7 @@
 
     <!-- GV2 invitations -->
     <string name="MessageRecord_you_invited_s_to_the_group">Ви запросили %1$s в групу.</string>
-    <string name="MessageRecord_s_invited_you_to_the_group">%1$s запросив (-ла) вас до групи.</string>
+    <string name="MessageRecord_s_invited_you_to_the_group">Користувач %1$s запросив вас до групи.</string>
     <plurals name="MessageRecord_s_invited_members">
         <item quantity="one">%1$s запрошує до групи 1 людину.</item>
         <item quantity="few">%1$s запрошує до групи %2$d людей.</item>
@@ -1620,24 +1695,24 @@
 
     <!-- GV2 invitation acceptance -->
     <string name="MessageRecord_you_accepted_invite">Ви прийняли запрошення в групу.</string>
-    <string name="MessageRecord_s_accepted_invite">%1$s прийняв (-ла) запрошення в групу.</string>
+    <string name="MessageRecord_s_accepted_invite">Користувач %1$s прийняв запрошення в групу.</string>
     <string name="MessageRecord_you_added_invited_member_s">Ви додали запрошеного учасника %1$s.</string>
     <string name="MessageRecord_s_added_invited_member_s">%1$s додано запрошеного учасника %2$s.</string>
 
     <!-- GV2 title change -->
     <string name="MessageRecord_you_changed_the_group_name_to_s">Ви змінили ім\'я групи на \"%1$s\".</string>
     <string name="MessageRecord_s_changed_the_group_name_to_s">%1$s змінив (-ла) ім\'я групи на \"%2$s\".</string>
-    <string name="MessageRecord_the_group_name_has_changed_to_s">Ім\'я групи змінено на \"%1$s\".</string>
+    <string name="MessageRecord_the_group_name_has_changed_to_s">Назву групи змінено на «%1$s».</string>
 
     <!-- GV2 description change -->
     <string name="MessageRecord_you_changed_the_group_description">Ви змінили опис групи.</string>
-    <string name="MessageRecord_s_changed_the_group_description">%1$s змінено опис групи.</string>
+    <string name="MessageRecord_s_changed_the_group_description">Користувач %1$s змінив опис групи.</string>
     <string name="MessageRecord_the_group_description_has_changed">Ви змінили опис групи.</string>
 
     <!-- GV2 avatar change -->
-    <string name="MessageRecord_you_changed_the_group_avatar">Ви змінили аватар групи.</string>
-    <string name="MessageRecord_s_changed_the_group_avatar">%1$s змінено аватар групи.</string>
-    <string name="MessageRecord_the_group_group_avatar_has_been_changed">Аватар групи було змінено.</string>
+    <string name="MessageRecord_you_changed_the_group_avatar">Ви змінили зображення групи.</string>
+    <string name="MessageRecord_s_changed_the_group_avatar">Користувач %1$s змінив зображення групи.</string>
+    <string name="MessageRecord_the_group_group_avatar_has_been_changed">Змінилося зображення групи.</string>
 
     <!-- GV2 attribute access level change -->
     <string name="MessageRecord_you_changed_who_can_edit_group_info_to_s">Ви вибрали, хто може редагувати інформацію групи, на \"%1$s\".</string>
@@ -1650,33 +1725,33 @@
     <string name="MessageRecord_who_can_edit_group_membership_has_been_changed_to_s">Той хто може редагувати інформацію групи, змінив (-ла) на \"%1$s\".</string>
 
     <!-- GV2 announcement group change -->
-    <string name="MessageRecord_you_allow_all_members_to_send">Ви змінили налаштування групи, щоб усі користувачі мали змогу відправляти повідомлення.</string>
-    <string name="MessageRecord_you_allow_only_admins_to_send">Ви змінили налаштування групи, щоб лише адміністратори мали змогу відправляти повідомлення.</string>
-    <string name="MessageRecord_s_allow_all_members_to_send">%1$s змінено налаштування групи, щоб усі користувачі мали змогу відправляти повідомлення.</string>
-    <string name="MessageRecord_s_allow_only_admins_to_send">%1$s змінили налаштування групи, щоб лише адміністратори мали змогу відправляти повідомлення.</string>
-    <string name="MessageRecord_allow_all_members_to_send">Налаштування групи змінені, щоб усі користувачі мали змогу відправляти повідомлення.</string>
-    <string name="MessageRecord_allow_only_admins_to_send">Налаштування групи змінені, щоб лише адміністратори мали змогу відправляти повідомлення.</string>
+    <string name="MessageRecord_you_allow_all_members_to_send">Ви змінили налаштування групи, і тепер усі учасники мають змогу надсилати повідомлення.</string>
+    <string name="MessageRecord_you_allow_only_admins_to_send">Ви змінили налаштування групи, і тепер лише адміністратори мають змогу надсилати повідомлення.</string>
+    <string name="MessageRecord_s_allow_all_members_to_send">Користувач %1$s змінив налаштування групи, і тепер усі учасники мають змогу надсилати повідомлення.</string>
+    <string name="MessageRecord_s_allow_only_admins_to_send">Користувач %1$s змінив налаштування групи, і тепер лише адміністратори мають змогу надсилати повідомлення.</string>
+    <string name="MessageRecord_allow_all_members_to_send">Налаштування групи змінено, і тепер усі учасники мають змогу надсилати повідомлення.</string>
+    <string name="MessageRecord_allow_only_admins_to_send">Налаштування групи змінено, і тепер лише адміністратори мають змогу надсилати повідомлення.</string>
 
     <!-- GV2 group link invite access level change -->
-    <string name="MessageRecord_you_turned_on_the_group_link_with_admin_approval_off">Ви увімкнули посилання групи з вимкненим схваленням адміністратором.</string>
-    <string name="MessageRecord_you_turned_on_the_group_link_with_admin_approval_on">Ви увімкнули посилання групи з увімкненим схваленням адміністратором.</string>
-    <string name="MessageRecord_you_turned_off_the_group_link">Ви вимкнули посилання на групу.</string>
-    <string name="MessageRecord_s_turned_on_the_group_link_with_admin_approval_off">%1$s увімкнув посилання групи з вимкненим схваленням адміністратором.</string>
-    <string name="MessageRecord_s_turned_on_the_group_link_with_admin_approval_on">%1$s увімкнули посилання групи з увімкненим схваленням адміністратором.</string>
-    <string name="MessageRecord_s_turned_off_the_group_link">%1$s вимкнув посилання групи.</string>
-    <string name="MessageRecord_the_group_link_has_been_turned_on_with_admin_approval_off">Посилання групи було увімкнено з вимкненим схваленням адміністратором.</string>
-    <string name="MessageRecord_the_group_link_has_been_turned_on_with_admin_approval_on">Посилання групи було увімкнена з увімкненим схваленням адміністратором.</string>
-    <string name="MessageRecord_the_group_link_has_been_turned_off">Посилання групи було вимкнуто.</string>
-    <string name="MessageRecord_you_turned_off_admin_approval_for_the_group_link">Ви вимкнули схвалення адміністратором для посилання групи.</string>
-    <string name="MessageRecord_s_turned_off_admin_approval_for_the_group_link">%1$s вимкнув схвалення адміністратором для посилання групи.</string>
+    <string name="MessageRecord_you_turned_on_the_group_link_with_admin_approval_off">Ви активували посилання на групу без адміністраторського затвердження.</string>
+    <string name="MessageRecord_you_turned_on_the_group_link_with_admin_approval_on">Ви активували посилання на групу з адміністраторським затвердженням.</string>
+    <string name="MessageRecord_you_turned_off_the_group_link">Ви деактивували посилання на групу.</string>
+    <string name="MessageRecord_s_turned_on_the_group_link_with_admin_approval_off">Користувач %1$s активував посилання на групу без адміністраторського затвердження.</string>
+    <string name="MessageRecord_s_turned_on_the_group_link_with_admin_approval_on">Користувач %1$s активував посилання на групу з адміністраторським затвердженням.</string>
+    <string name="MessageRecord_s_turned_off_the_group_link">Користувач %1$s деактивував посилання на групу.</string>
+    <string name="MessageRecord_the_group_link_has_been_turned_on_with_admin_approval_off">Активовано посилання на групу без адміністраторського затвердження.</string>
+    <string name="MessageRecord_the_group_link_has_been_turned_on_with_admin_approval_on">Активовано посилання на групу з адміністраторським затвердженням.</string>
+    <string name="MessageRecord_the_group_link_has_been_turned_off">Посилання на групу деактивовано.</string>
+    <string name="MessageRecord_you_turned_off_admin_approval_for_the_group_link">Ви вимкнули адміністраторське затвердження для посилання на групу.</string>
+    <string name="MessageRecord_s_turned_off_admin_approval_for_the_group_link">Користувач %1$s вимкнув адміністраторське затвердження для посилання на групу.</string>
     <string name="MessageRecord_the_admin_approval_for_the_group_link_has_been_turned_off">Схвалення адміністратора для посилання на групу було відключено.</string>
-    <string name="MessageRecord_you_turned_on_admin_approval_for_the_group_link">Ви увімкнули схвалення адміністратором для цього посилання групи.</string>
-    <string name="MessageRecord_s_turned_on_admin_approval_for_the_group_link">%1$s вимкнув схвалення адміністратором для посилання групи.</string>
+    <string name="MessageRecord_you_turned_on_admin_approval_for_the_group_link">Ви ввімкнули адміністраторське затвердження для посилання на групу.</string>
+    <string name="MessageRecord_s_turned_on_admin_approval_for_the_group_link">Користувач %1$s увімкнув адміністраторське затвердження для посилання на цю групу.</string>
     <string name="MessageRecord_the_admin_approval_for_the_group_link_has_been_turned_on">Схвалення адміністратора для посилання на групу було відключено.</string>
 
     <!-- GV2 group link reset -->
     <string name="MessageRecord_you_reset_the_group_link">Ви скинули посилання на групу.</string>
-    <string name="MessageRecord_s_reset_the_group_link">%1$s скинув (-ла) посилання групи.</string>
+    <string name="MessageRecord_s_reset_the_group_link">Користувач %1$s оновив посилання на групу.</string>
     <string name="MessageRecord_the_group_link_has_been_reset">Посилання на групу була скинуто.</string>
 
     <!-- GV2 group link joins -->
@@ -1685,7 +1760,7 @@
 
     <!-- GV2 group link requests -->
     <string name="MessageRecord_you_sent_a_request_to_join_the_group">Ви надіслали запит на приєднання до групи.</string>
-    <string name="MessageRecord_s_requested_to_join_via_the_group_link">%1$s запит на приєднання за допомогою посилання.</string>
+    <string name="MessageRecord_s_requested_to_join_via_the_group_link">%1$s хоче приєднатися до групи за допомогою посилання.</string>
     <!-- Update message shown when someone requests to join via group link and cancels the request back to back -->
     <plurals name="MessageRecord_s_requested_and_cancelled_their_request_to_join_via_the_group_link">
         <item quantity="one">%1$s надсилає і скасовує свій запит на приєднання за посиланням групи.</item>
@@ -1710,15 +1785,15 @@
 
     <!-- End of GV2 specific update messages -->
 
-    <string name="MessageRecord_your_safety_number_with_s_has_changed">Код безпеки для чату з %1$s змінився.</string>
-    <string name="MessageRecord_you_marked_your_safety_number_with_s_verified">Ви позначили, що код безпеки для чату з користувачем %1$s перевірено</string>
-    <string name="MessageRecord_you_marked_your_safety_number_with_s_verified_from_another_device">Ви позначили з іншого пристрою, що код безпеки для чату з користувачем %1$s перевірено</string>
-    <string name="MessageRecord_you_marked_your_safety_number_with_s_unverified">Ви позначили, що код безпеки для чату з користувачем %1$s не перевірено</string>
-    <string name="MessageRecord_you_marked_your_safety_number_with_s_unverified_from_another_device">Ви позначили з іншого пристрою, що код безпеки для чату з користувачем %1$s не перевірено</string>
-    <string name="MessageRecord_a_message_from_s_couldnt_be_delivered">Повідомлення від %1$s неможливо доставити</string>
+    <string name="MessageRecord_your_safety_number_with_s_has_changed">Змінився код безпеки для чатів з користувачем %1$s.</string>
+    <string name="MessageRecord_you_marked_your_safety_number_with_s_verified">Ви позначили, що код безпеки для чатів з користувачем %1$s перевірено</string>
+    <string name="MessageRecord_you_marked_your_safety_number_with_s_verified_from_another_device">Ви позначили з іншого пристрою, що код безпеки для чатів з користувачем %1$s перевірено</string>
+    <string name="MessageRecord_you_marked_your_safety_number_with_s_unverified">Ви позначили, що код безпеки для чатів з користувачем %1$s не перевірено</string>
+    <string name="MessageRecord_you_marked_your_safety_number_with_s_unverified_from_another_device">Ви позначили з іншого пристрою, що код безпеки для чатів з користувачем %1$s не перевірено</string>
+    <string name="MessageRecord_a_message_from_s_couldnt_be_delivered">Не вдалося доставити повідомлення від користувача %1$s</string>
     <string name="MessageRecord_s_changed_their_phone_number">%1$s змінює номер телефону.</string>
     <!-- Update item message shown in the release channel when someone is already a sustainer so we ask them if they want to boost. -->
-    <string name="MessageRecord_like_this_new_feature_help_support_signal_with_a_one_time_donation">Подобається нова функція? Підтримайте Signal за допомогою разового доната.</string>
+    <string name="MessageRecord_like_this_new_feature_help_support_signal_with_a_one_time_donation">Подобається нова функція? Підтримайте Signal, зробивши разовий донат.</string>
     <!-- Update item message shown when we merge two threads together. First placeholder is a name, second placeholder is a phone number. -->
     <string name="MessageRecord_your_message_history_with_s_and_their_number_s_has_been_merged">Об’єднано вашу історію повідомлень із користувачем %1$s і номером %2$s.</string>
     <!-- Update item message shown when we merge two threads together and we don\'t know the phone number of the other thread. The placeholder is a person\'s name. -->
@@ -1733,6 +1808,14 @@
     <string name="MessageRecord_you_activated_payments">Ви активували платежі</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s тепер може приймати платежі</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Деталі платежу недоступні</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Докладніше (торкніться)</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Деталі платежу недоступні</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Деталі платежу недоступні, оскільки повідомлення було відновлено з джерела, що не містило історії платежів. Це не впливає на баланс вашого гаманця чи статус попередніх платежів.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1793,9 +1876,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Незабаром ви не зможете надсилати SMS-повідомлення з Signal. Запросіть користувача %1$s в Signal, щоб продовжити розмову тут.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Ви більше не можете надсилати SMS-повідомлення в Signal. Запросіть користувача %1$s в Signal, щоб продовжити розмову тут.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Ви більше не можете надсилати SMS-повідомлення в Molly. Запросіть користувача %1$s в Molly, щоб продовжити розмову тут.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Платіж: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Платіж</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Повідомлено про спам</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1809,7 +1894,7 @@
     <string name="MessageRequestBottomView_unblock">Розблокувати</string>
     <!-- Text explaining a message request from someone you\'ve removed before -->
     <string name="MessageRequestBottomView_do_you_want_to_let_s_message_you_you_removed_them_before">Дозволити користувачу %1$s надсилати вам повідомлення та ділитись ім\'ям і фото з цим користувачем? Раніше ви вилучили цей контакт.</string>
-    <string name="MessageRequestBottomView_do_you_want_to_let_s_message_you_they_wont_know_youve_seen_their_messages_until_you_accept">Дозволити %1$s писати вам та ділитись з ним своїм ім\'ям та фото? Користувач не знатиме, що ви бачили його повідомлення, допоки ви не схвалите запит.</string>
+    <string name="MessageRequestBottomView_do_you_want_to_let_s_message_you_they_wont_know_youve_seen_their_messages_until_you_accept">Ви хочете, щоб користувач %1$s писав вам повідомлення й бачив ваше ім\'я та фото? Користувач не знатиме, що ви побачили його повідомлення, поки ви не приймете запит.</string>
     <!-- Shown in message request flow. Describes what will happen if you unblock a Signal user -->
     <string name="MessageRequestBottomView_do_you_want_to_let_s_message_you_wont_receive_any_messages_until_you_unblock_them">Дозволити користувачу %1$s надсилати вам повідомлення та ділитись ім\'ям і фото з цим користувачем? Ви не отримаєте повідомлень, поки не розблокуєте цього користувача.</string>
     <!-- Shown in message request flow. Describes what will happen if you unblock an SMS user -->
@@ -1825,9 +1910,9 @@
     <string name="MessageRequestBottomView_unblock_this_group_and_share_your_name_and_photo_with_its_members">Розблокувати цю групу та ділитися своїм ім’ям і фото з її учасниками? Ви не отримаєте повідомлень, поки не розблокуєте групу.</string>
   <!-- Removed by excludeNonTranslatables <string name="MessageRequestBottomView_legacy_learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <string name="MessageRequestProfileView_view">Детальніше</string>
-    <string name="MessageRequestProfileView_member_of_one_group">Є учасником «%1$s»</string>
-    <string name="MessageRequestProfileView_member_of_two_groups">Є учасником «%1$s» і «%2$s»</string>
-    <string name="MessageRequestProfileView_member_of_many_groups">Є учасником «%1$s», «%2$s» і «%3$s»</string>
+    <string name="MessageRequestProfileView_member_of_one_group">Учасник «%1$s»</string>
+    <string name="MessageRequestProfileView_member_of_two_groups">Учасник «%1$s» і «%2$s»</string>
+    <string name="MessageRequestProfileView_member_of_many_groups">Учасник «%1$s», «%2$s» і «%3$s»</string>
     <plurals name="MessageRequestProfileView_members">
         <item quantity="one">%1$d учасник</item>
         <item quantity="few">%1$d учасники</item>
@@ -1877,12 +1962,12 @@
     <string name="DeviceProvisioningActivity_content_progress_network_error">Помилка мережі.</string>
     <string name="DeviceProvisioningActivity_content_progress_key_error">Хибний QR-код.</string>
     <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Вибачте, Ви вже з\'язали забагато пристроїв, спробуйте видалити декілька</string>
-    <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Вибачте, це хибний QR код для з\'язування пристрою.</string>
+    <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Це не QR-код для зв\'язування пристрою.</string>
     <string name="DeviceProvisioningActivity_link_a_signal_device">З\'язати пристрій Signal?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Здається, ви намагаєтеся з\'язати пристрій Signal, використовуючи сканер від 3-ї особи. Для вашого захисту, відскануйте код знову, використовуючи Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal потребує дозволу \"Камера\", щоб сканувати QR коди, але наразі доступу немає. Будь ласка, перейдіть до налаштувань додатку, оберіть \"Дозволи\", та увімкніть \"Камера\".</string>
-    <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Для сканування QR коду необхідний доступ до Камери</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Для сканування QR-кодів Molly потребує доступу до камери, але його не надано. Перейдіть у налаштування застосунку, відкрийте «Дозволи» та виберіть камеру.</string>
+    <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Для сканування QR-коду необхідний доступ до камери</string>
 
     <!-- OutdatedBuildReminder -->
     <string name="OutdatedBuildReminder_update_now">Оновитись зараз</string>
@@ -1896,11 +1981,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Введіть фразу-пароль</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Значок Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Значок Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Ввести фразу-пароль</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Хибна фраза-пароль!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Розблокувати Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Екран блокування</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Розблокувати Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Екран блокування</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Карта</string>
@@ -1948,8 +2033,8 @@
 
     <!-- PinOptOutDialog -->
     <string name="PinOptOutDialog_warning">Попередження</string>
-    <string name="PinOptOutDialog_if_you_disable_the_pin_you_will_lose_all_data">Якщо ви вимкнете PIN-код, заздалегідь не створивши резервну копію вручну, то при перевстановленні Signal усі дані буде втрачено. При відключеному PIN-коді неможливо включити блокування реєстрації.</string>
-    <string name="PinOptOutDialog_disable_pin">Вимкнути PIN</string>
+    <string name="PinOptOutDialog_if_you_disable_the_pin_you_will_lose_all_data">Якщо ви вимкнете PIN-код, то в разі повторної реєстрації в Signal усі ваші дані буде втрачено. Щоб цього уникнути, необхідно заздалегідь вручну створити їхню резервну копію. З вимкненим PIN-кодом неможливо ввімкнути блокування реєстрації.</string>
+    <string name="PinOptOutDialog_disable_pin">Вимкнути PIN-код</string>
 
     <!-- RatingManager -->
     <string name="RatingManager_rate_this_app">Дайте відгук на Signal</string>
@@ -1969,7 +2054,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Підтвердити для продовження спілкування</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Для запобігання поширення спаму у Signal, будь ласка, здійсніть підтвердження особи.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Для запобігання поширення спаму у Molly, будь ласка, здійсніть підтвердження особи.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Після підтвердження ви зможете продовжити спілкування. Усі призупинені повідомлення відправляться автоматично.</string>
 
     <!-- Recipient -->
@@ -1977,7 +2062,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Моя історія</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Виклик у Signal</string>
+    <string name="Recipient_signal_call">Виклик у Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Заблокувати</string>
@@ -1991,9 +2076,10 @@
     <string name="RedPhone_ringing">Дзвонимо…</string>
     <string name="RedPhone_busy">Зайнято</string>
     <string name="RedPhone_recipient_unavailable">Одержувач недоступний</string>
-    <string name="RedPhone_network_failed">Помилка мережі!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Помилка мережі! Перевірте з\'єднання з мережею і спробуйте знову.</string>
     <string name="RedPhone_number_not_registered">Номер не зареєстровано!</string>
-    <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Набраний номер не підтримує безпечні дзвінки!</string>
+    <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Набраний номер не підтримує безпечні аудіовиклики!</string>
     <string name="RedPhone_got_it">Зрозуміло</string>
 
     <!-- Valentine\'s Day Megaphone -->
@@ -2002,15 +2088,15 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Щоб увімкнути відео натисніть тут</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Для виклику користувача %1$s Signal потребує доступу до камери</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Для виклику користувача %1$s Molly потребує доступу до камери</string>
+    <string name="WebRtcCallActivity__signal_s">Виклик у Molly: %1$s</string>
     <string name="WebRtcCallActivity__calling">Здійснюємо виклик…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Повторне з’єднання…</string>
     <!-- Title for dialog warning about lacking bluetooth permissions during a call -->
     <string name="WebRtcCallActivity__bluetooth_permission_denied">Доступ до Bluetooth не отримано</string>
     <!-- Message for dialog warning about lacking bluetooth permissions during a call and references the permission needed by name -->
-    <string name="WebRtcCallActivity__please_enable_the_nearby_devices_permission_to_use_bluetooth_during_a_call">Увімкніть дозвіл «Пристроїв поблизу», щоб використовувати Bluetooth під час дзвінка.</string>
+    <string name="WebRtcCallActivity__please_enable_the_nearby_devices_permission_to_use_bluetooth_during_a_call">Увімкніть функцію «Шукати пристрої поблизу», щоб використовувати Bluetooth під час виклику.</string>
     <!-- Positive action for bluetooth warning dialog to open settings -->
     <string name="WebRtcCallActivity__open_settings">Відкрити налаштування</string>
     <!-- Negative action for bluetooth warning dialog to dismiss dialog -->
@@ -2069,10 +2155,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Видалено з учасників виклику</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Хтось видалив вас з учасників виклику.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Надайте доступ до камери й мікрофона</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Надайте доступ до мікрофона</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Надайте доступ до камери</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Щоб почати виклик / приєднатися до виклику, надайте Molly доступ до камери й мікрофона.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Щоб почати виклик / приєднатися до виклику, надайте Molly доступ до мікрофона.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Щоб увімкнути відео, надайте Molly доступ до камери.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly потребує доступу до мікрофона, щоб ви могли почати виклик / приєднатися до виклику.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly потребує доступу до камери, щоб увімкнути відео</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Щоб почати виклик / приєднатися до виклику:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Щоб увімкнути відео:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Виклик у Signal</string>
-    <string name="WebRtcCallView__signal_video_call">Відеовиклик у Signal</string>
+    <string name="WebRtcCallView__signal_call">Виклик у Molly</string>
+    <string name="WebRtcCallView__signal_video_call">Відеовиклик у Molly</string>
     <string name="WebRtcCallView__start_call">Почати виклик</string>
     <string name="WebRtcCallView__join_call">Приєднатися</string>
     <string name="WebRtcCallView__call_is_full">Немає місць</string>
@@ -2090,8 +2196,8 @@
     <!-- Displayed on the call screen as the status when waiting to be let into a call link by an admin -->
     <string name="WebRtcCallView__waiting_to_be_let_in">Очікування на дозвіл…</string>
 
-    <string name="WebRtcCallView__signal_will_ring_s">Signal викликатиме %1$s</string>
-    <string name="WebRtcCallView__signal_will_ring_s_and_s">Signal викликатиме %1$s та %2$s</string>
+    <string name="WebRtcCallView__signal_will_ring_s">Буде здійснено виклик користувача %1$s у Signal</string>
+    <string name="WebRtcCallView__signal_will_ring_s_and_s">Буде здійснено виклик користувачів %1$s і %2$s у Signal</string>
     <plurals name="WebRtcCallView__signal_will_ring_s_s_and_d_others">
         <item quantity="one">Signal зателефонує %1$s, %2$s та %3$d іншому</item>
         <item quantity="few">Signal зателефонує %1$s, %2$s, та %3$d іншим</item>
@@ -2108,13 +2214,13 @@
         <item quantity="other">%1$s, %2$s та %3$d інших будуть оповіщені</item>
     </plurals>
 
-    <string name="WebRtcCallView__ringing_s">Телефонуємо %1$s</string>
-    <string name="WebRtcCallView__ringing_s_and_s">Телефонуємо %1$s та %2$s</string>
+    <string name="WebRtcCallView__ringing_s">Дзвонимо користувачу %1$s</string>
+    <string name="WebRtcCallView__ringing_s_and_s">Дзвонимо користувачам %1$s і %2$s</string>
     <plurals name="WebRtcCallView__ringing_s_s_and_d_others">
-        <item quantity="one">Телефонуємо %1$s, %2$s та %3$d іншому</item>
-        <item quantity="few">Телефонуємо %1$s, %2$s та %3$d іншим</item>
-        <item quantity="many">Телефонуємо %1$s, %2$s, та %3$d іншим</item>
-        <item quantity="other">Телефонуємо %1$s, %2$s, та %3$d іншим</item>
+        <item quantity="one">Дзвонимо користувачам %1$s, %2$s і ще %3$d</item>
+        <item quantity="few">Дзвонимо користувачам %1$s, %2$s і ще %3$d</item>
+        <item quantity="many">Дзвонимо користувачам %1$s, %2$s і ще %3$d</item>
+        <item quantity="other">Дзвонимо користувачам %1$s, %2$s і ще %3$d</item>
     </plurals>
 
     <string name="WebRtcCallView__s_is_calling_you">Вам дзвонить %1$s</string>
@@ -2128,7 +2234,7 @@
     </plurals>
 
     <string name="WebRtcCallView__no_one_else_is_here">Тут більше нікого немає</string>
-    <string name="WebRtcCallView__s_is_in_this_call">%1$s бере участь у цьому дзвінку</string>
+    <string name="WebRtcCallView__s_is_in_this_call">%1$s бере участь у цьому виклику</string>
     <string name="WebRtcCallView__s_are_in_this_call">%1$s беруть участь у цьому виклику</string>
     <string name="WebRtcCallView__s_and_s_are_in_this_call">%1$s і %2$s беруть участь у цьому виклику</string>
 
@@ -2172,28 +2278,51 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Опустити руку?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Опустити руку</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Опустити</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Скасувати</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Ви підняли руку</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Детальніше</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s піднімає руку</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s підняли руку</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d підняли руки</item>
+        <item quantity="few">%1$s + %2$d підняли руки</item>
+        <item quantity="many">%1$s + %2$d підняли руки</item>
+        <item quantity="other">%1$s + %2$d підняли руки</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">Користувач %1$s підняв руку</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s + %2$d підняли руки</item>
         <item quantity="few">%1$s + %2$d підняли руки</item>
         <item quantity="many">%1$s + %2$d підняли руки</item>
         <item quantity="other">%1$s + %2$d підняли руки</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
-        <item quantity="one">%1$s</item>
-        <item quantity="few">%1$s +%2$d</item>
-        <item quantity="many">%1$s +%2$d</item>
-        <item quantity="other">%1$s +%2$d</item>
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s + %2$d</item>
+        <item quantity="few">%1$s + %2$d</item>
+        <item quantity="many">%1$s + %2$d</item>
+        <item quantity="other">%1$s + %2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
+        <item quantity="one">%1$s + %2$d</item>
+        <item quantity="few">%1$s + %2$d</item>
+        <item quantity="many">%1$s + %2$d</item>
+        <item quantity="other">%1$s + %2$d</item>
     </plurals>
 
     <!-- An accessibility label for screen readers on a view that can be expanded -->
@@ -2203,7 +2332,7 @@
     <!-- Displayed in a sheet row and allows user to open signal connection explanation on tap -->
     <string name="AboutSheet__signal_connection">Контакт Signal</string>
     <!-- Displayed in a sheet row describing that the user has marked this contact as \'verified\' from within the app -->
-    <string name="AboutSheet__verified">Підтверджено</string>
+    <string name="AboutSheet__verified">Перевірено</string>
     <!-- Displayed in bottom sheet describing that the user has no direct messages with this person. The placeholder is a person\'s name. -->
     <string name="AboutSheet__no_direct_message">Особистого чату з %1$s немає</string>
     <!-- Explains that the given user (placeholder is short name) is in the users system contact -->
@@ -2258,7 +2387,7 @@
     <string name="CallParticipantView__you_wont_receive_their_audio_or_video">Ви не отримаєте аудіо або відео від цього користувача, а користувач не отримає ваші.</string>
     <string name="CallParticipantView__cant_receive_audio_video_from_s">Не вдається отримати аудіо та підсилювач; відео з %1$s</string>
     <string name="CallParticipantView__cant_receive_audio_and_video_from_s">Неможливо отримати аудіо та відео від %1$s</string>
-    <string name="CallParticipantView__this_may_be_Because_they_have_not_verified_your_safety_number_change">Це могло статися через те, що користувач не підтвердив вашу зміну коду безпеки, зіткнувся з проблемою з пристроєм або заблокував вас.</string>
+    <string name="CallParticipantView__this_may_be_Because_they_have_not_verified_your_safety_number_change">Це могло статися через те, що користувач не позначив ваш змінений код безпеки як перевірений, має проблему з пристроєм або заблокував вас.</string>
 
     <!-- CallToastPopupWindow -->
     <string name="CallToastPopupWindow__swipe_to_view_screen_share">Потягніть вгору, щоб побачити поширення екрану</string>
@@ -2275,10 +2404,10 @@
     <string name="RecaptchaProofActivity_complete_verification">Завершити підтвердження особи</string>
 
     <!-- RegistrationActivity -->
-    <string name="RegistrationActivity_select_your_country">Оберіть вашу країну</string>
+    <string name="RegistrationActivity_select_your_country">Оберіть країну</string>
     <string name="RegistrationActivity_you_must_specify_your_country_code">Ви повинні вказати код вашої країни
     </string>
-    <string name="RegistrationActivity_please_enter_a_valid_phone_number_to_register">Щоб зареєструватися, уведіть дійсний номер телефону.</string>
+    <string name="RegistrationActivity_please_enter_a_valid_phone_number_to_register">Щоб зареєструватися, введіть дійсний номер телефону.</string>
     <string name="RegistrationActivity_invalid_number">Хибний номер</string>
     <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Номер, що ви ввели (%1$s) хибний.
     </string>
@@ -2296,7 +2425,7 @@
     <string name="RegistrationActivity_i_understand">Я розумію</string>
     <string name="RegistrationActivity_play_services_error">Помилка служби Google Play</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services оновлюються або тимчасово недоступні. Будь-ласка, спробуйте знов.</string>
-    <string name="RegistrationActivity_terms_and_privacy">Умови та Політика конфіденційності</string>
+    <string name="RegistrationActivity_terms_and_privacy">Умови надання послуг і Політика конфіденційності</string>
     <string name="RegistrationActivity_signal_needs_access_to_your_contacts_and_media_in_order_to_connect_with_friends">Signal потребує дозволів на перегляд контактів та медіа, щоб допомогти вам зв’язуватися з друзями та надсилати повідомлення. Ваші контакти завантажуються за допомогою функції виявлення приватних контактів Signal, що означає, що вони зашифровані наскрізним методом і є невидимі для служби Signal.</string>
     <string name="RegistrationActivity_signal_needs_access_to_your_contacts_in_order_to_connect_with_friends">Signal потребує дозволу для перегляду контактів, щоб допомогти вам зв’язатися з друзями. Ваші контакти завантажуються за допомогою функції виявлення приватних контактів Signal, що означає, що вони наскрізне зашифровані і ніколи не відображаються службою Signal.</string>
     <string name="RegistrationActivity_rate_limited_to_service">Ви зробили надто багато спроб зареєструвати цей номер. Будь ласка, спробуйте ще раз пізніше.</string>
@@ -2310,7 +2439,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Нестандартний формат номеру</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Введене число (%1$s) виглядає нестандартним.\n\nВи мали на увазі %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android — Формат телефонних номерів</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android — Формат телефонних номерів</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Запит на виклик надіслано</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2341,22 +2470,22 @@
     <string name="RegistrationActivity_country_code_description">Код Країни</string>
     <string name="RegistrationActivity_call">Виклик</string>
     <string name="RegistrationActivity_verification_code">Код підтвердження</string>
-    <string name="RegistrationActivity_resend_code">Надіслати код знову</string>
+    <string name="RegistrationActivity_resend_code">Надішліть код ще раз</string>
     <!--    A title for a bottom sheet dialog offering to help a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_title">Виникли проблеми з реєстрацією?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Перевірте сигнал стільникової мережі на вашому телефоні для отримання SMS чи виклику\n • Переконайтеся, що ви можете отримувати телефонні виклики на цей номер\n • Перевірте правильність введеного номера телефону.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Щоб отримати додаткову інформацію, виконайте ці кроки з вирішення проблем або зверніться до служби підтримки</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Для додаткової інформації перегляньте %1$s. %2$s можна за цим посиланням</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
-    <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">ці кроки з вирішення проблем</string>
+    <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">ці кроки з усунення негараздів</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_contact_support_substring">Звернутися в службу підтримки</string>
 
     <!-- RegistrationLockV2Dialog -->
-    <string name="RegistrationLockV2Dialog_turn_on_registration_lock">Включити блокування реєстрації?</string>
+    <string name="RegistrationLockV2Dialog_turn_on_registration_lock">Увімкнути блокування реєстрації?</string>
     <string name="RegistrationLockV2Dialog_turn_off_registration_lock">Вимкнути блокування реєстрації?</string>
-    <string name="RegistrationLockV2Dialog_if_you_forget_your_signal_pin_when_registering_again">Якщо ви забудете свій PIN-код після повторної реєстрації в Signal, то втратите доступ до свого акаунту на 7 днів.</string>
+    <string name="RegistrationLockV2Dialog_if_you_forget_your_signal_pin_when_registering_again">Якщо під час повторної реєстрації в Signal ви забудете PIN-код, то втратите доступ до свого акаунту на 7 днів.</string>
     <string name="RegistrationLockV2Dialog_turn_on">Увімкнути</string>
     <string name="RegistrationLockV2Dialog_turn_off">Вимкнути</string>
 
@@ -2385,13 +2514,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Додати до контактів</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Запросити до Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Запросити до Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Повідомлення Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Виклик у Signal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Додати до контактів</string>
-    <string name="SharedContactView_invite_to_signal">Запросити до Signal</string>
+    <string name="SharedContactView_invite_to_signal">Запросити до Molly</string>
     <string name="SharedContactView_message">Повідомлення Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2422,7 +2551,7 @@
     <!-- StickerManagementAdapter -->
     <string name="StickerManagementAdapter_installed_stickers">Встановлені стікери</string>
     <string name="StickerManagementAdapter_stickers_you_received">Отримані cтікери</string>
-    <string name="StickerManagementAdapter_signal_artist_series">Стікери від Художників Signal</string>
+    <string name="StickerManagementAdapter_signal_artist_series">Серія «Художники Signal»</string>
     <string name="StickerManagementAdapter_no_stickers_installed">Немає встановлених стікерів</string>
     <string name="StickerManagementAdapter_stickers_from_incoming_messages_will_appear_here">Тут будуть стікери зі вхідних повідомлень</string>
     <string name="StickerManagementAdapter_untitled">Без назви</string>
@@ -2431,7 +2560,7 @@
     <!-- StickerPackPreviewActivity -->
     <string name="StickerPackPreviewActivity_untitled">Без назви</string>
     <string name="StickerPackPreviewActivity_unknown">Невідомо</string>
-    <string name="StickerPackPreviewActivity_install">Встановити</string>
+    <string name="StickerPackPreviewActivity_install">Установити</string>
     <!-- Label for a button that, if pressed, will uninstall the sticker pack that is currently being previewed. -->
     <string name="StickerPackPreviewActivity_remove">Видалити</string>
     <string name="StickerPackPreviewActivity_stickers">Стікери</string>
@@ -2474,7 +2603,7 @@
     <string name="ThreadRecord_view_once_photo">Фото вже переглянуто</string>
     <string name="ThreadRecord_view_once_video">Відео вже переглянуто</string>
     <string name="ThreadRecord_view_once_media">Медіа вже переглянуто</string>
-    <string name="ThreadRecord_this_message_was_deleted">Це повідомлення було видалено.</string>
+    <string name="ThreadRecord_this_message_was_deleted">Це повідомлення видалено.</string>
     <string name="ThreadRecord_you_deleted_this_message">Ви видалили це повідомлення.</string>
     <!-- Displayed in the notification when the user sends a request to activate payments -->
     <string name="ThreadRecord_you_sent_request">Ви надіслали запит на активацію платежів</string>
@@ -2484,18 +2613,18 @@
     <string name="ThreadRecord_you_activated_payments">Ви активували платежі</string>
     <!-- Displayed in the notification when the recipient can accept payments -->
     <string name="ThreadRecord_can_accept_payments">%1$s тепер може приймати платежі</string>
-    <string name="ThreadRecord_s_is_on_signal">%1$s приєднався до Signal!</string>
+    <string name="ThreadRecord_s_is_on_signal">%1$s тепер користується Signal!</string>
     <string name="ThreadRecord_disappearing_messages_disabled">Тимчасові повідомлення вимкнено</string>
     <string name="ThreadRecord_disappearing_message_time_updated_to_s">Таймер встановлено на %1$s</string>
     <string name="ThreadRecord_safety_number_changed">Змінився код безпеки</string>
-    <string name="ThreadRecord_your_safety_number_with_s_has_changed">Код безпеки для чату з %1$s змінився.</string>
-    <string name="ThreadRecord_you_marked_verified">Ви перевірили</string>
-    <string name="ThreadRecord_you_marked_unverified">Номер безпеки є НЕперевіреним</string>
+    <string name="ThreadRecord_your_safety_number_with_s_has_changed">Змінився код безпеки для чатів з користувачем %1$s.</string>
+    <string name="ThreadRecord_you_marked_verified">Ви позначили як перевірений</string>
+    <string name="ThreadRecord_you_marked_unverified">Ви позначили як неперевірений</string>
     <string name="ThreadRecord_message_could_not_be_processed">Не вдалось опрацювати повідомлення</string>
     <string name="ThreadRecord_delivery_issue">Проблема з доставленням</string>
     <string name="ThreadRecord_message_request">Запит спілкування</string>
     <!-- Thread preview for a recipient that has been hidden -->
-    <string name="ThreadRecord_hidden_recipient">Ви приховали цей контакт. Щоби знову додати контакт до списку, надішліть йому повідомлення.</string>
+    <string name="ThreadRecord_hidden_recipient">Ви приховали цей контакт. Щоб повернути контакт у свій список, надішліть йому повідомлення.</string>
     <string name="ThreadRecord_photo">Світлини</string>
     <string name="ThreadRecord_gif">GIF</string>
     <string name="ThreadRecord_voice_message">Голосове повідомлення</string>
@@ -2522,11 +2651,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%2$s володіє номером %1$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Оновлення Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Доступна нова версія Signal. Торкніться, щоб оновити.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Не вдалося оновити Signal</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Оновлення Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Доступна нова версія Molly. Торкніться, щоб оновити.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Не вдалося оновити Molly</string>
     <string name="ApkUpdateNotifications_failed_general_body">Ми спробуємо знову пізніше.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal успішно оновлено</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly успішно оновлено</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Ваш застосунок автоматично оновлено до версії %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2599,9 +2728,9 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Наш код безпеки в Signal:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Схоже, що у вас немає програм, щоб поділитися.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">У буфері обміну не знайдено коду безпеки для порівняння</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal потребує доступу \"Камера\", щоб сканувати QR коди, але наразі доступу немає. Будь ласка, перейдіть до налаштувань додатку, оберіть \"Дозволи\", та увімкніть \"Камера\".</string>
-    <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Для сканування QR коду необхідний доступ до Камери</string>
-    <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Щоб побачити код безпеки %1$s, вам потрібно спочатку обмінятися повідомленнями.</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Для сканування QR-кодів Molly потребує доступу до камери, але його не надано. Перейдіть у налаштування застосунку, відкрийте «Дозволи» та виберіть камеру.</string>
+    <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Для сканування QR-коду необхідний доступ до камери</string>
+    <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Щоб побачити код безпеки користувача %1$s, вам потрібно спочатку обмінятися повідомленнями.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_message">Код безпеки буде згенеровано після обміну повідомленнями із цим користувачем.</string>
     <!-- Confirmation option for dialog explaining to user they must exchange messages first to create a safety number  -->
@@ -2629,17 +2758,17 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Торкніться, щоб відкрити.</string>
-    <string name="KeyCachingService_passphrase_cached">Signal розблоковано</string>
-    <string name="KeyCachingService_lock">Заблокувати Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly розблоковано</string>
+    <string name="KeyCachingService_lock">Заблокувати Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Ви</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Непідтримуваний тип медіа</string>
     <string name="MediaPreviewActivity_draft">Чернетка</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal потребує дозволу \"Зберігання\", щоб зберігати файли, але наразі доступу немає. Будь ласка, перейдіть до налаштувань додатку, оберіть \"Дозволи\", та увімкніть \"Зберігання\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly потребує дозволу \"Зберігання\", щоб зберігати файли, але наразі доступу немає. Будь ласка, перейдіть до налаштувань додатку, оберіть \"Дозволи\", та увімкніть \"Зберігання\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Без доступу до файлової системи зберегти файли неможливо</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Видалити повідомлення?</string>
-    <string name="MediaPreviewActivity_media_delete_confirmation_message">Це назавжди видалить це повідомлення.</string>
+    <string name="MediaPreviewActivity_media_delete_confirmation_message">Це повідомлення буде остаточно виалено.</string>
     <string name="MediaPreviewActivity_s_to_s">%1$s до %2$s</string>
     <!-- All media preview title when viewing media send by you to another recipient (allows changing of \'You\' based on context) -->
     <string name="MediaPreviewActivity_you_to_s">Ви надіслали %1$s</string>
@@ -2648,7 +2777,7 @@
     <string name="MediaPreviewActivity_media_no_longer_available">Мультимедійний більше не доступний.</string>
     <!-- Notifying the user that the device has encountered a technical issue and is unable to render a video. -->
     <string name="MediaPreviewActivity_unable_to_play_media">Не вдається відтворити медіа.</string>
-    <string name="MediaPreviewActivity_error_finding_message">Не вдалося знайти повідомлення.</string>
+    <string name="MediaPreviewActivity_error_finding_message">Під час пошуку повідомлення сталася помилка.</string>
     <string name="MediaPreviewActivity_cant_find_an_app_able_to_share_this_media">Неможливо знайти програму для того щоб поділитись цим медіафайлом.</string>
     <string name="MediaPreviewActivity_dismiss_due_to_error">Закрити</string>
     <string name="MediaPreviewFragment_edit_media_error">Помилка медіа</string>
@@ -2676,17 +2805,17 @@
     </plurals>
     <string name="MessageNotifier_most_recent_from_s">Останнє від: %1$s</string>
     <string name="MessageNotifier_locked_message">Заблоковане повідомлення</string>
-    <string name="MessageNotifier_message_delivery_failed">Збій доставки повідомлення.</string>
+    <string name="MessageNotifier_message_delivery_failed">Не вдалося доставити повідомлення.</string>
     <!-- Shown in a notification when a story the user tries to send fails to be sent -->
     <string name="MessageNotifier_story_delivery_failed">Не вдалося надіслати історію</string>
     <!-- Shown as notification title for when a notification about a story sent to a group story %1$s replaced with the group name -->
     <string name="MessageNotifier_group_story_title">Ви надіслали %1$s</string>
-    <string name="MessageNotifier_failed_to_deliver_message">Не вдалось доставити повідомлення.</string>
-    <string name="MessageNotifier_error_delivering_message">Помилка доставки повідомлення.</string>
-    <string name="MessageNotifier_message_delivery_paused">Доставку повідомлення призупинено.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Підтвердьте, щоб продовжувати обмін повідомленнями на Signal.</string>
+    <string name="MessageNotifier_failed_to_deliver_message">Не вдалося доставити повідомлення.</string>
+    <string name="MessageNotifier_error_delivering_message">Під час доставлення повідомлення сталася помилка.</string>
+    <string name="MessageNotifier_message_delivery_paused">Доставлення повідомлення зупинено.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Підтвердьте, щоб продовжувати обмін повідомленнями на Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Позначити все як прочитане</string>
-    <string name="MessageNotifier_mark_read">Позначити як прочитане</string>
+    <string name="MessageNotifier_mark_read">Прочитано</string>
     <string name="MessageNotifier_turn_off_these_notifications">Вимкніть ці сповіщення</string>
     <string name="MessageNotifier_view_once_photo">Фото вже переглянуто</string>
     <string name="MessageNotifier_view_once_video">Відео вже переглянуто</string>
@@ -2704,9 +2833,9 @@
     <!-- Body of notification shown to user when someone they sent a payment to reacts to it. Placeholder is the emoji used in the reaction. -->
     <string name="MessageNotifier_reacted_s_to_your_payment">Реакція на ваш платіж: %1$s.</string>
     <string name="MessageNotifier_reacted_s_to_your_sticker">Реакція на ваш стікер: %1$s.</string>
-    <string name="MessageNotifier_this_message_was_deleted">Це повідомлення було видалено.</string>
+    <string name="MessageNotifier_this_message_was_deleted">Це повідомлення видалено.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Вимкнути сповіщення \"Контакт приєднався до Signal\"? Ви можете заново включити їх в Signal &gt; Налаштування &gt; Сповіщення.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Вимкнути сповіщення про приєднання контактів до Molly? Їх можна знов увімкнути в налаштуваннях («Сповіщення»).</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2724,7 +2853,7 @@
     <string name="NotificationChannel_channel_messages">Повідомлення</string>
     <string name="NotificationChannel_calls">Виклики</string>
     <string name="NotificationChannel_failures">Відмови</string>
-    <string name="NotificationChannel_backups">Резервні копії</string>
+    <string name="NotificationChannel_backups">Резервне копіювання</string>
     <string name="NotificationChannel_locked_status">Статус блокування</string>
     <string name="NotificationChannel_app_updates">Оновлення додатку</string>
     <string name="NotificationChannel_other">Інший</string>
@@ -2745,7 +2874,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Швидка відповідь неможлива, коли Signal заблоковано!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Швидка відповідь неможлива, коли Molly заблоковано!</string>
     <string name="QuickResponseService_problem_sending_message">Проблема під час надсилання повідомлення!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2765,7 +2894,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Неприпустимий ярлик</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Нове повідомлення</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Запит на листування</string>
     <string name="SingleRecipientNotificationBuilder_you">Ви</string>
@@ -2774,7 +2903,7 @@
 
     <!-- NewWaysToConnectDialogFragment -->
     <!-- Fragment title, displayed at the top of the content -->
-    <string name="NewWaysToConnectDialogFragment__new_ways_to_connect">Нові способи додавання контактів</string>
+    <string name="NewWaysToConnectDialogFragment__new_ways_to_connect">Контактуйте по-новому</string>
     <!-- Row item title for phone number privacy explainer -->
     <string name="NewWaysToConnectDialogFragment__phone_number_privacy">Конфіденційність номера телефону</string>
     <!-- Row item description for phone number privacy explainer -->
@@ -2813,7 +2942,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Цей пристрій більше не зареєстровано. Ймовірно, ви зареєстрували свій номер телефону в Signal на іншому пристрої.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Цей пристрій більше не зареєстровано. Ймовірно, ви зареєстрували свій номер телефону в Molly на іншому пристрої.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Перереєструйте пристрій</string>
 
@@ -2826,15 +2955,15 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Для відповіді на виклик надайте Signal доступ до мікрофона.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Для відповіді на виклик надайте Molly доступ до мікрофона.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Щоб прийняти відеовиклик, надайте Signal доступ до мікрофона і камери.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Для здійснення та приймання викликів Signal потребує доступу до мікрофона й камери, але його не надано. Перейдіть у налаштування застосунку, відкрийте «Дозволи» та виберіть мікрофон і камеру.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Щоб прийняти відеовиклик, надайте Molly доступ до мікрофона і камери.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Для здійснення та приймання викликів Molly потребує доступу до мікрофона й камери, але його не надано. Перейдіть у налаштування застосунку, відкрийте «Дозволи» та виберіть мікрофон і камеру.</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Розмову прийнято на прив\'язаному пристрої.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Відхилений на прив\'язаному пристрої.</string>
-    <string name="WebRtcCallActivity__busy_on_a_linked_device">Зайнято на прив\'язаному пристрої.</string>
+    <string name="WebRtcCallActivity__busy_on_a_linked_device">Зайнято на зв\'язаному пристрої.</string>
     <!-- Tooltip message shown first time user is in a video call after switch camera button moved -->
-    <string name="WebRtcCallActivity__flip_camera_tooltip">Тепер кнопка перемикання камери знаходиться тут. Торкніться свого відео, щоб спробувати</string>
+    <string name="WebRtcCallActivity__flip_camera_tooltip">Тепер камера перемикається тут. Торкніться свого відео, щоб спробувати</string>
 
     <string name="GroupCallSafetyNumberChangeNotification__someone_has_joined_this_call_with_a_safety_number_that_has_changed">Хтось щойно приєднався до виклику зі зміненим кодом безпеки.</string>
 
@@ -2874,16 +3003,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Повторіть нову фразу-пароль</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Запросити до Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Запросити до Molly</string>
     <string name="contact_selection_activity__new_group">Нова група</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Оновити контакти</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Когось не вистачає? Спробуйте оновити</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Знаходьте знайомих у Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Надайте доступ до контактів</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Більше</string>
 
@@ -2893,17 +3022,17 @@
     <string name="contact_filter_toolbar__show_dial_pad_description">Показати клавіатуру набору номеру</string>
 
     <!-- contact_selection_group_activity -->
-    <string name="contact_selection_group_activity__no_contacts">Контактів не знайдено.</string>
+    <string name="contact_selection_group_activity__no_contacts">Контактів немає.</string>
     <string name="contact_selection_group_activity__finding_contacts">Завантаження контактів…</string>
 
     <!-- single_contact_selection_activity -->
     <string name="SingleContactSelectionActivity_contact_photo">Фото контакту</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal потребує дозволів \"Контакти\", щоб показати контакти, але наразі доступу немає. Будь ласка, перейдіть до налаштувань додатку, оберіть \"Дозволи\", та увімкніть \"Контакти\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly потребує дозволів \"Контакти\", щоб показати контакти, але наразі доступу немає. Будь ласка, перейдіть до налаштувань додатку, оберіть \"Дозволи\", та увімкніть \"Контакти\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Не вдалося отримати список контактів, перевірте з\'єднання</string>
     <string name="ContactSelectionListFragment_username_not_found">Ім\'я користувача не знайдено</string>
-    <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"«%1$s» — не є користувачем Signal. Будь ласка, перевірте ім\'я користувача і спробуйте ще раз."</string>
+    <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"%1$s — не користувач Signal. Перевірте правильність імені користувача й повторіть пошук."</string>
     <string name="ContactSelectionListFragment_you_do_not_need_to_add_yourself_to_the_group">Вам не потрібно додавати себе в групу</string>
     <string name="ContactSelectionListFragment_maximum_group_size_reached">Досягнуто максимального розміру групи</string>
     <string name="ContactSelectionListFragment_signal_groups_can_have_a_maximum_of_d_members">У групах Signal можуть перебувати максимум %1$d учасників.</string>
@@ -2920,16 +3049,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Пошук за ім\'ям користувача</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Надайте доступ до контактів</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Щоб знаходити знайомих у Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Надати доступ</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Не хочу</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Надайте доступ до контактів. Ваші контакти зашифровано й приховано від служби Signal.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal потребує дозволів \"Контакти\", щоб показати контакти.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly потребує дозволів \"Контакти\", щоб показати контакти.</string>
     <string name="contact_selection_list_fragment__show_contacts">Показати контакти</string>
 
     <!-- contact_selection_list_item -->
@@ -2960,21 +3091,21 @@
     <string name="conversation_activity__quick_attachment_drawer_toggle_camera_description">Увімк/вимк скриньку вкладень камери</string>
     <string name="conversation_activity__quick_attachment_drawer_record_and_send_audio_description">Записати та надіслати аудіо вкладення</string>
     <string name="conversation_activity__quick_attachment_drawer_lock_record_description">Заблокувати запис аудіо вкладення</string>
-    <string name="conversation_activity__message_could_not_be_sent">Не вдалось відправити повідомлення. Перевірте ваше підключення до інтернету і спробуйте ще раз.</string>
+    <string name="conversation_activity__message_could_not_be_sent">Не вдалося відправити повідомлення. Перевірте з\'єднання з інтернетом і надішліть повідомлення ще раз.</string>
 
     <!-- conversation_input_panel -->
     <string name="conversation_input_panel__slide_to_cancel">Проведіть для скасування</string>
     <string name="conversation_input_panel__cancel">Закрити</string>
 
     <!-- conversation_item -->
-    <string name="conversation_item__mms_image_description">Медіа повідомлення</string>
+    <string name="conversation_item__mms_image_description">Медіафайл</string>
     <string name="conversation_item__secure_message_description">Захищене повідомлення</string>
 
     <!-- conversation_item_sent -->
     <string name="conversation_item_sent__send_failed_indicator_description">Не вдалося відправити</string>
     <string name="conversation_item_sent__pending_approval_description">Очікує підтвердження</string>
     <string name="conversation_item_sent__delivered_description">Доставлено</string>
-    <string name="conversation_item_sent__message_read">Повідомлення прочитане</string>
+    <string name="conversation_item_sent__message_read">Повідомлення прочитано</string>
 
     <!-- conversation_item_received -->
     <string name="conversation_item_received__contact_photo_description">Фото контакту</string>
@@ -2985,15 +3116,15 @@
     <string name="ConversationUpdateItem_join_call">Приєднатися до виклику</string>
     <!-- Action button label for starting a new call in the current conversation -->
     <string name="ConversationUpdateItem_call_back">Передзвонити</string>
-    <string name="ConversationUpdateItem_return_to_call">Повернутись до виклику</string>
+    <string name="ConversationUpdateItem_return_to_call">Повернутися до виклику</string>
     <string name="ConversationUpdateItem_call_is_full">Немає місць</string>
     <string name="ConversationUpdateItem_invite_friends">Запросити друзів</string>
     <string name="ConversationUpdateItem_enable_call_notifications">Увімкнути сповіщення про виклики</string>
     <string name="ConversationUpdateItem_update_contact">Оновити контакт</string>
     <!-- Update item button text to show to block a recipient from requesting to join via group link -->
     <string name="ConversationUpdateItem_block_request">Заблокувати запит</string>
-    <string name="ConversationUpdateItem_no_groups_in_common_review_requests_carefully">Спільних груп немає. Переглядайте запити уважно.</string>
-    <string name="ConversationUpdateItem_no_contacts_in_this_group_review_requests_carefully">У цій групі немає контактів. Переглядайте запити уважно.</string>
+    <string name="ConversationUpdateItem_no_groups_in_common_review_requests_carefully">Спільних груп немає. Уважно перевіряйте, від кого надходять запити.</string>
+    <string name="ConversationUpdateItem_no_contacts_in_this_group_review_requests_carefully">У цій групі немає контактів. Уважно перевіряйте, від кого надходять запити.</string>
     <string name="ConversationUpdateItem_view">Детальніше</string>
     <string name="ConversationUpdateItem_the_disappearing_message_time_will_be_set_to_s_when_you_message_them">Таймер цього тимчасового повідомлення буде встановлено на %1$s, коли ви його відправите.</string>
     <!-- Update item button text to show to boost a feature -->
@@ -3006,6 +3137,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Ви вилучили цей контакт. Якщо надіслати повідомлення, контакт буде знову додано до списку.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Доступні дії</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Оновити</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Відтворення … Пауза</string>
@@ -3025,16 +3158,16 @@
     <!-- Label indicating that a quote is for a reply to a story you created -->
     <string name="QuoteView_your_story">Ви · Історія</string>
     <!-- Label indicating that the story being replied to no longer exists -->
-    <string name="QuoteView_no_longer_available">Більше недоступна</string>
+    <string name="QuoteView_no_longer_available">Уже недоступна</string>
     <!-- Label for quoted gift -->
-    <string name="QuoteView__donation_for_a_friend">Донат для друга</string>
+    <string name="QuoteView__donation_for_a_friend">Донат за друга</string>
 
     <!-- conversation_fragment -->
     <string name="conversation_fragment__scroll_to_the_bottom_content_description">Прокрутить до самого низу</string>
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Бульбашки — особливість Android, що можна вимкнути для чатів Signal.</string>
+    <string name="BubbleOptOutTooltip__description">Бульбашки — особливість Android, що можна вимкнути для чатів Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Не зараз</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3045,25 +3178,25 @@
     <string name="safety_number_change_dialog__accept">Прийняти</string>
     <string name="safety_number_change_dialog__call_anyway">Усе одно подзвонити</string>
     <string name="safety_number_change_dialog__join_call">Приєднатися до виклику</string>
-    <string name="safety_number_change_dialog__continue_call">Продовжити дзвінок</string>
-    <string name="safety_number_change_dialog__leave_call">Покинути дзвінок</string>
+    <string name="safety_number_change_dialog__continue_call">Продовжити виклик</string>
+    <string name="safety_number_change_dialog__leave_call">Покинути виклик</string>
     <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Можливо, ці люди перевстановили застосунок або замінили пристрої. Перевірте коди безпеки для чатів з ними, щоб упевнитись у конфіденційності спілкування.</string>
     <string name="safety_number_change_dialog__view">Детальніше</string>
     <!-- Subtitle shown for a single contact and that their safety number was previously verified and is now no longer verified. -->
-    <string name="safety_number_change_dialog__previous_verified">Попереднє підтверджено</string>
+    <string name="safety_number_change_dialog__previous_verified">Раніше було позначено як перевірений</string>
 
     <!-- EnableCallNotificationSettingsDialog__call_notifications_checklist -->
-    <string name="EnableCallNotificationSettingsDialog__call_notifications_enabled">Повідомлення про дзвінки включені.</string>
-    <string name="EnableCallNotificationSettingsDialog__enable_call_notifications">Увімкнути сповіщення про дзвінки</string>
+    <string name="EnableCallNotificationSettingsDialog__call_notifications_enabled">Сповіщення про виклики ввімкнено.</string>
+    <string name="EnableCallNotificationSettingsDialog__enable_call_notifications">Увімкнути сповіщення про виклики</string>
     <string name="EnableCallNotificationSettingsDialog__enable_background_activity">Увімкніть фонову активність</string>
     <string name="EnableCallNotificationSettingsDialog__everything_looks_good_now">Тепер все добре!</string>
-    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_here_and_turn_on_show_notifications">Щоб отримувати повідомлення про дзвінки, натисніть тут і включіть \"Включити повідомлення\".</string>
-    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_here_and_turn_on_notifications">Щоб отримувати сповіщення про дзвінки, натисніть тут і включіть сповіщення та переконайтеся, що Звук і спливаюче вікно увімкнено.</string>
-    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_here_and_enable_background_activity_in_battery_settings">Щоб отримувати повідомлення про дзвінки, натисніть тут і включіть фонову активність в настройках батареї. </string>
+    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_here_and_turn_on_show_notifications">Щоб отримувати сповіщення про виклики, натисніть тут і ввімкніть «Показувати сповіщення».</string>
+    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_here_and_turn_on_notifications">Щоб отримувати сповіщення про виклики, натисніть тут і ввімкніть сповіщення, а також перевірте, чи ввімкнено звук і спливні сповіщення.</string>
+    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_here_and_enable_background_activity_in_battery_settings">Щоб отримувати сповіщення про виклики, натисніть тут і дозвольте фонову активність в налаштуваннях акумулятора. </string>
     <string name="EnableCallNotificationSettingsDialog__settings">Налаштування</string>
-    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_settings_and_turn_on_show_notifications">Щоб отримувати повідомлення про дзвінки, натисніть Налаштування і включіть \"Показувати сповіщення\".</string>
-    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_settings_and_turn_on_notifications">Щоб отримувати сповіщення про дзвінки, натисніть Налаштування і включіть сповіщення та переконайтеся, що Звук і спливаюче вікно увімкнено.</string>
-    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_settings_and_enable_background_activity_in_battery_settings">Щоб отримувати повідомлення про дзвінки, натисніть Налаштування і включіть фонову активність в \"настройках Батареї\".</string>
+    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_settings_and_turn_on_show_notifications">Щоб отримувати сповіщення про виклики, перейдіть у налаштування та ввімкніть «Показувати сповіщення».</string>
+    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_settings_and_turn_on_notifications">Щоб отримувати сповіщення про виклики, перейдіть у налаштування і ввімкніть сповіщення, а також перевірте, чи ввімкнено звук і спливні сповіщення.</string>
+    <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_settings_and_enable_background_activity_in_battery_settings">Щоб отримувати сповіщення про виклики, перейдіть у налаштування й дозвольте фонову активність в налаштуваннях акумулятора.</string>
 
     <!-- country_selection_fragment -->
     <string name="country_selection_fragment__loading_countries">Завантаження країн…</string>
@@ -3071,7 +3204,7 @@
     <string name="country_selection_fragment__no_matching_countries">Немає відповідних країн</string>
 
     <!-- device_add_fragment -->
-    <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Проскануйте QR код на пристрої, щоб зв\'язати його</string>
+    <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Зіскануйте QR-код на пристрої, щоб зв\'язати його</string>
 
     <!-- device_link_fragment -->
     <string name="device_link_fragment__link_device">Зв\'язати пристрій</string>
@@ -3130,15 +3263,15 @@
     <string name="expiration_combined">%1$s %2$s</string>
 
     <!-- unverified safety numbers -->
-    <string name="IdentityUtil_unverified_banner_one">Ваш код безпеки для чату з %1$s змінився, і ви ще його не перевірили</string>
+    <string name="IdentityUtil_unverified_banner_one">Ваш код безпеки для чатів з користувачем %1$s змінився, і ви ще його не перевірили</string>
     <string name="IdentityUtil_unverified_banner_two">Ваші коди безпеки для чатів з %1$s і з %2$s знов позначено як неперевірені</string>
     <string name="IdentityUtil_unverified_banner_many">Ваші коди безпеки для чатів з %1$s, %2$s і з %3$s знов позначено як неперевірені</string>
 
-    <string name="IdentityUtil_unverified_dialog_one">Ваш код безпеки для чату з %1$s змінився. Це може означати або те, що хтось намагається перехопити ваші розмови, або те, що на пристрої %1$s просто було перевстановлено Signal.</string>
+    <string name="IdentityUtil_unverified_dialog_one">Ваш код безпеки для чатів з користувачем %1$s змінився. Це могло статись або через те, що хтось намагається перехопити ваші розмови, або через те, що на пристрої користувача %1$s просто було перевстановлено Signal.</string>
     <string name="IdentityUtil_unverified_dialog_two">Ваші коди безпеки для чатів з %1$s і з %2$s змінився. Це може означати або те, що хтось намагається перехопити ваші розмови, або те, що вони просто перевстановили Signal.</string>
     <string name="IdentityUtil_unverified_dialog_many">Ваші коди безпеки для чатів з %1$s, %2$s і з %3$s змінилися. Це може означати або те, що хтось намагається перехопити ваші розмови, або те, що вони просто перевстановили Signal.</string>
 
-    <string name="IdentityUtil_untrusted_dialog_one">Ваш код безпеки для чату з %1$s щойно змінився.</string>
+    <string name="IdentityUtil_untrusted_dialog_one">Щойно змінився ваш код безпеки для чатів з користувачем %1$s.</string>
     <string name="IdentityUtil_untrusted_dialog_two">Ваші коди безпеки для чатів з %1$s і з %2$s щойно змінилися.</string>
     <string name="IdentityUtil_untrusted_dialog_many">Ваші коди безпеки для чатів з %1$s, %2$s і з %3$s щойно змінилися.</string>
 
@@ -3159,7 +3292,7 @@
     <string name="load_more_header__loading">Завантаження</string>
 
     <!-- media_overview_activity -->
-    <string name="media_overview_activity__no_media">Файлів немає</string>
+    <string name="media_overview_activity__no_media">Медіафайлів немає</string>
 
     <!-- message_recipients_list_item -->
     <string name="message_recipients_list_item__view">Переглянути</string>
@@ -3193,7 +3326,7 @@
 
     <!-- profile_create_activity -->
     <string name="CreateProfileActivity_first_name_required">Ім\'я (обов\'язково)</string>
-    <string name="CreateProfileActivity_last_name_optional">Прізвище (за бажанням)</string>
+    <string name="CreateProfileActivity_last_name_optional">Прізвище (необов\'язково)</string>
     <string name="CreateProfileActivity_next">Далі</string>
     <string name="CreateProfileActivity_custom_mms_group_names_and_photos_will_only_be_visible_to_you">Імена та фото MMS-груп будуть видні тільки вам.</string>
     <string name="CreateProfileActivity_group_descriptions_will_be_visible_to_members_of_this_group_and_people_who_have_been_invited">Опис групи побачать учасники цієї групи та запрошені особи.</string>
@@ -3216,9 +3349,9 @@
     <string name="EditProfileFragment__group_description">Опис групи</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Оновити Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Оновити Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Ця версія Signal застаріла. Оновіть застосунок, щоб і надалі ним користуватися.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Ця версія Molly застаріла. Оновіть застосунок, щоб і надалі ним користуватися.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Оновити</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3231,7 +3364,7 @@
     <!-- EditProfileNameFragment -->
     <string name="EditProfileNameFragment_your_name">Ваше ім\'я</string>
     <string name="EditProfileNameFragment_first_name">Ім\'я</string>
-    <string name="EditProfileNameFragment_last_name_optional">Прізвище (за бажанням)</string>
+    <string name="EditProfileNameFragment_last_name_optional">Прізвище (необов\'язково)</string>
     <string name="EditProfileNameFragment_save">Зберегти</string>
     <string name="EditProfileNameFragment_failed_to_save_due_to_network_issues_try_again_later">Не вдалось зберегти через мережеву помилку. Спробуйте пізніше.</string>
 
@@ -3260,25 +3393,25 @@
     <!-- message_details_header -->
     <string name="message_details_header__issues_need_your_attention">Є деякі проблеми, що потребують вашої уваги.</string>
     <string name="message_details_header_sent">Надіслано</string>
-    <string name="message_details_header_received">Одержано</string>
+    <string name="message_details_header_received">Отримано</string>
     <string name="message_details_header_disappears">Зникне через</string>
     <string name="message_details_header_via">Через</string>
 
     <!-- message_details_recipient_header -->
     <string name="message_details_recipient_header__pending_send">Очікування</string>
-    <string name="message_details_recipient_header__sent_to">Надіслано</string>
-    <string name="message_details_recipient_header__sent_from">Надіслано з</string>
-    <string name="message_details_recipient_header__delivered_to">Доставлено</string>
-    <string name="message_details_recipient_header__read_by">Прочитано</string>
+    <string name="message_details_recipient_header__sent_to">Кому надіслано:</string>
+    <string name="message_details_recipient_header__sent_from">Відправник</string>
+    <string name="message_details_recipient_header__delivered_to">Кому доставлено:</string>
+    <string name="message_details_recipient_header__read_by">Хто прочитав:</string>
     <string name="message_details_recipient_header__not_sent">Не надіслано</string>
     <string name="message_details_recipient_header__viewed">Переглянули</string>
-    <string name="message_details_recipient_header__skipped">Пропущено</string>
+    <string name="message_details_recipient_header__skipped">Кому не доставлено:</string>
 
     <!-- message_Details_recipient -->
     <string name="message_details_recipient__failed_to_send">Не вдалося надіслати</string>
     <string name="message_details_recipient__new_safety_number">Новий код безпеки</string>
     <!-- Button text shown in message details when the message has an edit history and this will let them view the history -->
-    <string name="MessageDetails__view_edit_history">Переглянути історію редагування</string>
+    <string name="MessageDetails__view_edit_history">Переглянути правки</string>
 
     <!-- AndroidManifest.xml -->
     <string name="AndroidManifest__create_passphrase">Створити фразу-пароль</string>
@@ -3286,7 +3419,7 @@
     <string name="AndroidManifest__change_passphrase">Змінити фразу-пароль</string>
     <string name="AndroidManifest__verify_safety_number">Перевірка коду безпеки</string>
     <string name="AndroidManifest__media_preview">Попередній перегляд медіа</string>
-    <string name="AndroidManifest__message_details">Деталі повідомлення</string>
+    <string name="AndroidManifest__message_details">Про повідомлення</string>
     <string name="AndroidManifest__linked_devices">Зв\'язані пристрої</string>
     <string name="AndroidManifest__invite_friends">Запросити друзів</string>
     <string name="AndroidManifest_archived_conversations">Архівні чати</string>
@@ -3294,7 +3427,7 @@
     <!-- HelpFragment -->
     <string name="HelpFragment__have_you_read_our_faq_yet">Відповіді на поширені запитання.</string>
     <string name="HelpFragment__next">Далі</string>
-    <string name="HelpFragment__contact_us">Зв\'язатися з нами</string>
+    <string name="HelpFragment__contact_us">Зв\'яжіться з нами</string>
     <string name="HelpFragment__tell_us_whats_going_on">Поясніть, що сталося</string>
     <string name="HelpFragment__include_debug_log">Долучити журнал налагодження.</string>
     <string name="HelpFragment__whats_this">Що це?</string>
@@ -3344,7 +3477,7 @@
     <string name="ReactWithAnyEmojiBottomSheetDialogFragment__objects">Предмети</string>
     <string name="ReactWithAnyEmojiBottomSheetDialogFragment__symbols">Символи</string>
     <string name="ReactWithAnyEmojiBottomSheetDialogFragment__flags">Прапори</string>
-    <string name="ReactWithAnyEmojiBottomSheetDialogFragment__emoticons">Смайлики</string>
+    <string name="ReactWithAnyEmojiBottomSheetDialogFragment__emoticons">Емограми</string>
     <string name="ReactWithAnyEmojiBottomSheetDialogFragment__no_results_found">Нічого не знайдено</string>
 
     <!-- arrays.xml -->
@@ -3363,7 +3496,7 @@
 
     <string name="arrays__name_and_message">Ім\'я та повідомлення</string>
     <string name="arrays__name_only">Тільки ім\'я</string>
-    <string name="arrays__no_name_or_message">Немає імені чи повідомлення</string>
+    <string name="arrays__no_name_or_message">Без імені й повідомлення</string>
 
     <string name="arrays__images">Зображення</string>
     <string name="arrays__audio">Аудіо</string>
@@ -3394,9 +3527,9 @@
     <string name="preferences__pref_use_address_book_photos">Використовуйте фотографії з адресної книги</string>
     <string name="preferences__display_contact_photos_from_your_address_book_if_available">Показувати фотографії контактів з вашої адресної книги, якщо вони доступні</string>
     <!-- Preference menu item title for a toggle switch for preserving the archived state of muted chats. -->
-    <string name="preferences__pref_keep_muted_chats_archived">Залишати стишені чати заархівованими</string>
+    <string name="preferences__pref_keep_muted_chats_archived">Залишати чати з вимкненими сповіщеннями в архіві</string>
     <!-- Preference menu item description for a toggle switch for preserving the archived state of muted chats. -->
-    <string name="preferences__muted_chats_that_are_archived_will_remain_archived">Стишені заархівовані чати залишатимуться заархівованими після отримання нового повідомлення.</string>
+    <string name="preferences__muted_chats_that_are_archived_will_remain_archived">Заархівовані чати з вимкненими сповіщеннями залишаються в архіві, якщо надходять нові повідомлення.</string>
     <string name="preferences__generate_link_previews">Генерувати попередній вигляд вебсторінок</string>
     <string name="preferences__retrieve_link_previews_from_websites_for_messages">Показувати попередній вигляд вебсторінок за посиланнями, які ви надсилаєте в повідомленнях.</string>
     <string name="preferences__change_passphrase">Змінити фразу-пароль</string>
@@ -3416,11 +3549,11 @@
     <string name="preferences__sound">Звук</string>
     <string name="preferences__silent">Беззвучно</string>
     <string name="preferences__default">Системна</string>
-    <string name="preferences__repeat_alerts">Повторити сигнал</string>
+    <string name="preferences__repeat_alerts">Повторювати звуковий сигнал</string>
     <string name="preferences__never">Ніколи</string>
     <string name="preferences__one_time">Один раз</string>
-    <string name="preferences__two_times">Два рази</string>
-    <string name="preferences__three_times">Три рази</string>
+    <string name="preferences__two_times">Двічі</string>
+    <string name="preferences__three_times">Тричі</string>
     <string name="preferences__five_times">П\'ять разів</string>
     <string name="preferences__ten_times">Десять разів</string>
     <string name="preferences__vibrate">Вібрувати</string>
@@ -3431,13 +3564,13 @@
     <string name="preferences__cyan">Бірюзовий</string>
     <string name="preferences__magenta">Фіолетовий</string>
     <string name="preferences__white">Білий</string>
-    <string name="preferences__none">Жодного</string>
+    <string name="preferences__none">Без обмежень</string>
     <string name="preferences__fast">Швидко</string>
     <string name="preferences__normal">Звичайний</string>
     <string name="preferences__slow">Повільно</string>
     <string name="preferences__help">Допомога</string>
     <string name="preferences__advanced">Розширені</string>
-    <string name="preferences__donate_to_signal">Підтримати Signal</string>
+    <string name="preferences__donate_to_signal">Підтримати Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Конфіденційність</string>
     <!-- Preference label for stories -->
@@ -3456,7 +3589,7 @@
     <string name="preferences__payments">Платежі</string>
     <!-- Privacy settings payments section description -->
     <string name="preferences__payment_lock">Захист платежів</string>
-    <string name="preferences__conversation_length_limit">Обмеження кількості повідомлень у чаті</string>
+    <string name="preferences__conversation_length_limit">Кількість повідомлень у чаті</string>
     <string name="preferences__keep_messages">Зберігати повідомлення</string>
     <string name="preferences__clear_message_history">Очистити історію повідомлень</string>
     <string name="preferences__linked_devices">Зв\'язані пристрої</string>
@@ -3474,25 +3607,25 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Змінити значок і назву застосунку на «%1$s»</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Щоб змінити значок і назву застосунку, потрібно закрити Signal. У сповіщеннях завжди відображатимуться значок і назва Signal за замовчуванням.</string>
+    <string name="preferences__app_icon_dialog_description">Щоб змінити значок і назву застосунку, потрібно закрити Molly. У сповіщеннях завжди відображатимуться значок і назва Molly за замовчуванням.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Виберіть значок і назву застосунку, які відображатимуться на головному екрані телефону та в панелі програм. У сповіщеннях завжди відображатимуться значок і назва Signal за замовчуванням. Докладніше</string>
+    <string name="preferences__app_icon_warning_learn_more">Виберіть значок і назву застосунку, які відображатимуться на головному екрані телефону та в панелі програм. У сповіщеннях завжди відображатимуться значок і назва Molly за замовчуванням. Докладніше</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Значки і назви застосунків відображаються на головному екрані та в панелі програм.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">У сповіщеннях завжди відображатимуться значок і назва Signal за замовчуванням.</string>
+    <string name="preferences__app_icon_notification_warning">У сповіщеннях завжди відображатимуться значок і назва Molly за замовчуванням.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Докладніше</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
     <string name="preferences__graphic_illustrating_where_the_replacement_app_icon_will_be_visible">Зображення, яке показує, де буде видно змінений значок застосунку.</string>
-    <string name="preferences__disable_pin">Вимкнути PIN</string>
+    <string name="preferences__disable_pin">Вимкнути PIN-код</string>
     <string name="preferences__enable_pin">Ввімкнути PIN</string>
-    <string name="preferences__if_you_disable_the_pin_you_will_lose_all_data">Якщо ви вимкнете PIN-код, то при перевстановленні Signal втратите всі дані, якщо ви заздалегідь  вручну  не створите резервну копію. При відключенному PIN-коді неможна буде включити блокування реєстрації.</string>
+    <string name="preferences__if_you_disable_the_pin_you_will_lose_all_data">Якщо ви вимкнете PIN-код, то в разі повторної реєстрації в Signal усі ваші дані буде втрачено. Щоб цього уникнути, необхідно заздалегідь вручну створити їхню резервну копію. З вимкненим PIN-кодом неможливо ввімкнути блокування реєстрації.</string>
     <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">PIN-коди зберігають інформацію в Signal зашифрованою, тому тільки ви можете отримати до неї доступ. Ваш профіль, налаштування та контакти буде відновлено, коли ви встановите застосунок знов. PIN-код не потрібен, щоб відкрити застосунок.</string>
     <string name="preferences__system_default">За замовчуванням</string>
     <string name="preferences__language">Мова</string>
     <string name="preferences__signal_messages_and_calls">Повідомлення та виклики Signal</string>
-    <string name="preferences__advanced_pin_settings">Розширені налаштування PIN-коду</string>
+    <string name="preferences__advanced_pin_settings">Керування PIN-кодом</string>
     <string name="preferences__free_private_messages_and_calls">Безкоштовні приватні повідомлення та виклики для користувачів Signal</string>
     <string name="preferences__submit_debug_log">Надіслати журнал налагодження</string>
     <string name="preferences__delete_account">Видалити акаунт</string>
@@ -3520,23 +3653,27 @@
     <string name="preferences_storage__delete_older_messages">Видаляти старіші повідомлення?</string>
     <!-- Dialog title shown when selecting delete message history from manage storage -->
     <string name="preferences_storage__delete_message_history">Видалити історію повідомлень?</string>
-    <string name="preferences_storage__this_will_permanently_delete_all_message_history_and_media">Усі повідомлення і медіа, які старіші ніж %1$s, будуть безповоротно видалені з вашого пристрою.</string>
+    <string name="preferences_storage__this_will_permanently_delete_all_message_history_and_media">Усі повідомлення й медіафайли, старіші за %1$s, буде остаточно видалено з вашого пристрою.</string>
     <!-- The body of an alert dialog that is shown when confirming a trim operation. Trimming will delete all but the most recent messages in a chat. The placeholder represents how many messages are kept in each chat. All older messages are deleted. -->
     <plurals name="preferences_storage__this_will_permanently_trim_all_conversations_to_the_d_most_recent_messages">
-        <item quantity="one">Ця дія скоротить усі чати до %1$s останнього повідомлення без можливості відновлення.</item>
-        <item quantity="few">Ця дія скоротить усі чати до %1$s останніх повідомлень без можливості відновлення.</item>
-        <item quantity="many">Ця дія скоротить усі чати до %1$s останніх повідомлень без можливості відновлення.</item>
-        <item quantity="other">Ця дія скоротить усі чати до %1$s останнього повідомлення без можливості відновлення.</item>
-    </plurals>
-    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Усі повідомлення та медіа будуть безповоротно видалені з вашого пристрою.</string>
+        <item quantity="one">Усі чати буде скорочено до %1$s найновішого повідомлення без можливості відновлення.</item>
+        <item quantity="few">Усі чати буде скорочено до %1$s найновіших повідомлень без можливості відновлення.</item>
+        <item quantity="many">Усі чати буде скорочено до %1$s найновіших повідомлень без можливості відновлення.</item>
+        <item quantity="other">Усі чати буде скорочено до %1$s найновішого повідомлення без можливості відновлення.</item>
+    </plurals>
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Усі повідомлення й медіафайли буде остаточно видалено з вашого пристрою.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Усю історію повідомлень і всі медіафайли буде остаточно видалено з цього пристрою і з усіх зв\'язаних пристроїв.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Ви дійсно хочете видалити всю історію повідомлень?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Усю історію повідомлень буде безповоротно видалено. Цю дію неможливо скасувати.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Усю історію повідомлень буде остаточно видалено з усіх пристроїв. Ви не зможете її відновити.</string>
     <string name="preferences_storage__delete_all_now">Видалити усе негайно</string>
     <string name="preferences_storage__forever">Назавжди</string>
     <string name="preferences_storage__one_year">1 рік</string>
     <string name="preferences_storage__six_months">6 місяців</string>
     <string name="preferences_storage__thirty_days">30 днів</string>
-    <string name="preferences_storage__none">Жодного</string>
+    <string name="preferences_storage__none">Без обмежень</string>
     <plurals name="preferences_storage__s_messages_plural">
         <item quantity="one">%1$s повідомлення</item>
         <item quantity="few">%1$s повідомлення</item>
@@ -3547,17 +3684,17 @@
     <string name="preferences_storage__custom">Користувацький</string>
     <string name="preferences_advanced__use_system_emoji">Використовувати системні емоджі</string>
     <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Ретранслювати всі виклики через сервер Signal, щоби ваш контакт не міг розкрити вашу IP-адресу. Увімкнення цієї функції знизить якість виклику.</string>
-    <string name="preferences_advanced__always_relay_calls">Завжди ретранслювати дзвінки</string>
+    <string name="preferences_advanced__always_relay_calls">Завжди ретранслювати виклики</string>
     <!-- Privacy settings payments section title -->
     <string name="preferences_app_protection__payments">Платежі</string>
     <string name="preferences_chats__chats">Чати</string>
     <string name="preferences_app_updates__title">Оновлення додатку</string>
     <string name="preferences_data_and_storage__manage_storage">Керування сховищем</string>
-    <string name="preferences_data_and_storage__use_less_data_for_calls">Економити трафік для дзвінків</string>
+    <string name="preferences_data_and_storage__use_less_data_for_calls">Економити трафік під час викликів</string>
     <string name="preferences_data_and_storage__never">Ніколи</string>
-    <string name="preferences_data_and_storage__wifi_and_mobile_data">Wi-Fi і мобільні дані</string>
-    <string name="preferences_data_and_storage__mobile_data_only">Тільки мобільні дані</string>
-    <string name="preference_data_and_storage__using_less_data_may_improve_calls_on_bad_networks">Використання обмеженої кількості даних може покращити якість дзвінків у мережах з поганим зв\'язком</string>
+    <string name="preferences_data_and_storage__wifi_and_mobile_data">Wi-Fi та мобільний інтернет</string>
+    <string name="preferences_data_and_storage__mobile_data_only">Лише мобільний інтернет</string>
+    <string name="preference_data_and_storage__using_less_data_may_improve_calls_on_bad_networks">Економія трафіку може підвищити якість викликів у разі слабкого зв\'язку</string>
     <string name="preferences_notifications__in_chat_sounds">Звуки чату</string>
     <string name="preferences_notifications__show">Показувати</string>
     <string name="preferences_notifications__ringtone">Мелодія дзвінка</string>
@@ -3569,18 +3706,18 @@
     <string name="preferences_communication__category_censorship_circumvention">Обхід цензури</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Обхід цензури</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Якщо увімкнено, Signal намагатиметься обійти цензуру. Не вмикайте цю функцію, якщо ви не в місці, де Signal заблоковано.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Якщо ввімкнути, то Molly намагатиметься обійти цензуру. Вмикайте цю функцію, тільки якщо ви в місці, де Molly заблоковано.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
-    <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Обхід цензури було активовано враховуючи номер телефону цього акаунта.</string>
+    <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Обхід цензури активовано на підставі номера телефону, на який зареєстровано цей акаунт.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
-    <string name="preferences_communication__censorship_circumvention_you_have_manually_disabled">Ви вручну відключили обхід цензури.</string>
+    <string name="preferences_communication__censorship_circumvention_you_have_manually_disabled">Ви вручну вимкнули обхід цензури.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you cannot use it because you\'re already connected to the Signal service -->
-    <string name="preferences_communication__censorship_circumvention_is_not_necessary_you_are_already_connected">Обхід цензури не потрібен. З\'єднання з Signal вже встановлено.</string>
+    <string name="preferences_communication__censorship_circumvention_is_not_necessary_you_are_already_connected">В обході цензури немає потреби. З\'єднання з Signal уже встановлено.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you cannot use it because you\'re not connected to the internet -->
-    <string name="preferences_communication__censorship_circumvention_can_only_be_activated_when_connected_to_the_internet">Обхід цензури може бути активований лише при підключенні до інтернету.</string>
-    <string name="preferences_communication__category_sealed_sender">Прихований відправник</string>
+    <string name="preferences_communication__censorship_circumvention_can_only_be_activated_when_connected_to_the_internet">Обхід цензури можна активувати лише за наявності з\'єднання з інтернетом.</string>
+    <string name="preferences_communication__category_sealed_sender">Захищений відправник</string>
     <string name="preferences_communication__sealed_sender_allow_from_anyone">Дозволити від будь-кого</string>
-    <string name="preferences_communication__sealed_sender_allow_from_anyone_description">Отримувати повідомлення від прихованих відправників, які не з вашого списку контактів, або з якими ви не поділились профілем.</string>
+    <string name="preferences_communication__sealed_sender_allow_from_anyone_description">Отримувати повідомлення від захищених відправників, які не з вашого списку контактів, або з якими ви не поділилися профілем.</string>
     <string name="preferences_proxy">Проксі</string>
     <string name="preferences_use_proxy">Використати проксі</string>
     <string name="preferences_off">Вимк.</string>
@@ -3617,17 +3754,17 @@
     <string name="PaymentsActivityFragment__all_activity">Вся активність</string>
     <string name="PaymentsAllActivityFragment__all">Усі</string>
     <string name="PaymentsAllActivityFragment__sent">Надіслано</string>
-    <string name="PaymentsAllActivityFragment__received">Одержано</string>
+    <string name="PaymentsAllActivityFragment__received">Отримано</string>
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Представляємо платежі</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Використовуйте Signal для переказу та отримання MobileCoin, нової цифрової валюти, націленої на безпеку. Увімкніть, щоб почати.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Використовуйте Molly для переказу та отримання MobileCoin, нової цифрової валюти, націленої на безпеку. Увімкніть, щоб почати.</string>
     <string name="PaymentsHomeFragment__activate_payments">Увімкнути платежі</string>
     <string name="PaymentsHomeFragment__activating_payments">Вмикаємо платежі…</string>
-    <string name="PaymentsHomeFragment__restore_payments_account">Відновити платіжний обліковий запис</string>
+    <string name="PaymentsHomeFragment__restore_payments_account">Відновити платіжний профіль</string>
     <string name="PaymentsHomeFragment__no_recent_activity_yet">Жодної активності останнім часом</string>
     <string name="PaymentsHomeFragment__recent_activity">Недавня активність</string>
-    <string name="PaymentsHomeFragment__see_all">Усі</string>
+    <string name="PaymentsHomeFragment__see_all">Показати решту</string>
     <string name="PaymentsHomeFragment__add_funds">Додати кошти</string>
     <string name="PaymentsHomeFragment__send">Відправити</string>
     <string name="PaymentsHomeFragment__sent_s">Відправлено %1$s</string>
@@ -3647,7 +3784,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Платежі недоступні у вашому регіоні.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Не вдалося увімкнути платежі. Спробуйте пізніше.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Вимкнути платежі?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Ви не зможете відправляти або отримувати MobileCoin в Signal, якщо вимкнете платежі.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Ви не зможете відправляти або отримувати MobileCoin в Molly, якщо вимкнете платежі.</string>
     <string name="PaymentsHomeFragment__deactivate">Вимкнути</string>
     <string name="PaymentsHomeFragment__continue">Продовжити</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Баланс в даний момент недоступний.</string>
@@ -3656,10 +3793,10 @@
     <string name="PaymentsHomeFragment__details">Деталі</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Ви можете використовувати Signal, щоб надсилати й отримувати валюту MobileCoin. Усі платежі здійснюються відповідно до Умов використання MobileCoin і гаманця MobileCoin. Можуть виникнути певні проблеми, як-от втрата платежів чи коштів, які неможливо відновити. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Ви можете використовувати Molly, щоб надсилати й отримувати валюту MobileCoin. Усі платежі здійснюються відповідно до Умов використання MobileCoin і гаманця MobileCoin. Можуть виникнути певні проблеми, як-от втрата платежів чи коштів, які неможливо відновити. </string>
     <string name="PaymentsHomeFragment__activate">Активувати</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Дивитись умови використання MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Платежі у Signal більше недоступні. Ви все ще можете переказати кошти на обмін, але більше не зможете надсилати та отримувати платежі, поповнювати рахунок.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Платежі у Molly більше недоступні. Ви все ще можете переказати кошти на обмін, але більше не зможете надсилати та отримувати платежі, поповнювати рахунок.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3687,7 +3824,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Надайте дозвіл</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Щоб допомогти вам надсилати повідомлення знайомим людям, Signal потребуватиме такі дозволи. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Щоб допомогти вам надсилати повідомлення знайомим людям, Molly потребуватиме такі дозволи. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Сповіщення</string>
     <!-- Notifications permission row description -->
@@ -3749,13 +3886,13 @@
     <string name="PaymentsDetailsFragment__payment_complete">Платіж завершено</string>
     <string name="PaymentsDetailsFragment__payment_failed">Платіж не вдався</string>
     <string name="PaymentsDetailsFragment__network_fee">Комісія мережі</string>
-    <string name="PaymentsDetailsFragment__sent_by">Надіслано</string>
+    <string name="PaymentsDetailsFragment__sent_by">Відправник</string>
     <string name="PaymentsDetailsFragment__sent_to_s">Надіслано до %1$s</string>
     <string name="PaymentsDetailsFragment__you_on_s_at_s">Ви %1$s в %2$s</string>
     <string name="PaymentsDetailsFragment__s_on_s_at_s">%1$s%2$s в %3$s</string>
     <!-- Prefix to a name to indicate who a payment was sent to -->
     <string name="PaymentsDetailsFragment__to">Кому</string>
-    <string name="PaymentsDetailsFragment__from">Від</string>
+    <string name="PaymentsDetailsFragment__from">Від кого</string>
     <string name="PaymentsDetailsFragment__information">Деталі транзакції, зокрема сума платежу і час транзакції, є частиною особового рахунку MobileCoin.</string>
     <string name="PaymentsDetailsFragment__coin_cleanup_fee">Плата за очищення монет</string>
     <string name="PaymentsDetailsFragment__coin_cleanup_information">«Плата за очищення монет» стягується коли ваші монети неможливо сполучити для завершення транзакції. Очищення дозволить надсилати платежі далі.</string>
@@ -3775,10 +3912,10 @@
     <string name="PaymentsTransferFragment__next">Далі</string>
     <string name="PaymentsTransferFragment__invalid_address">Неправильна адреса</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Перевірте адресу гаманця, на який ви намагаєтеся переказати кошти, і спробуйте ще раз.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Ви не можете переказати на власну адресу гаманця Signal. Введіть адресу гаманця зі свого облікового запису на підтримуваній біржі.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Щоб сканувати QR-код, Signal необхідний доступ до камери.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal потрібен дозвіл на доступ до камери для сканування QR-коду. Перейдіть в налаштування, виберіть «Дозволи» і включіть «Камера»</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Щоб сканувати QR-код, Signal необхідний доступ до камери.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Ви не можете переказати на власну адресу гаманця Molly. Введіть адресу гаманця зі свого облікового запису на підтримуваній біржі.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Щоб сканувати QR-код, Molly необхідний доступ до камери.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Для сканування QR-кодів Molly потребує доступу до камери. Перейдіть у налаштування, відкрийте «Дозволи» та виберіть камеру.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Щоб сканувати QR-код, Molly необхідний доступ до камери.</string>
     <string name="PaymentsTransferFragment__settings">Налаштування</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3844,7 +3981,7 @@
     <string name="CurrencyAmountFormatter_s_at_s">%1$s в %2$s</string>
 
     <!-- SetCurrencyFragment -->
-    <string name="SetCurrencyFragment__set_currency">Встановити валюту</string>
+    <string name="SetCurrencyFragment__set_currency">Установити валюту</string>
     <string name="SetCurrencyFragment__all_currencies">Усі валюти</string>
 
     <!-- **************************************** -->
@@ -3853,7 +3990,7 @@
 
     <!-- contact_selection_list -->
     <!-- Displayed in a row on the new call screen when searching by phone number. -->
-    <string name="contact_selection_list__new_call">Новий дзвінок…</string>
+    <string name="contact_selection_list__new_call">Новий виклик…</string>
     <string name="contact_selection_list__unknown_contact">Нове повідомлення для…</string>
     <string name="contact_selection_list__unknown_contact_block">Заблокувати користувача</string>
     <string name="contact_selection_list__unknown_contact_add_to_group">Додати до групи</string>
@@ -3862,8 +3999,8 @@
     <string name="conversation_callable_insecure__menu_call">Виклик</string>
 
     <!-- conversation_callable_secure -->
-    <string name="conversation_callable_secure__menu_call">Виклик через Signal</string>
-    <string name="conversation_callable_secure__menu_video">Відеодзвінок Signal</string>
+    <string name="conversation_callable_secure__menu_call">Виклик у Signal</string>
+    <string name="conversation_callable_secure__menu_video">Відеовиклик у Signal</string>
 
     <!-- conversation_context -->
 
@@ -3926,7 +4063,7 @@
     <!-- conversation_list_fragment -->
     <string name="conversation_list_fragment__fab_content_description">Новий чат</string>
     <string name="conversation_list_fragment__open_camera_description">Відкрити Камеру</string>
-    <string name="conversation_list_fragment__no_chats_yet_get_started_by_messaging_a_friend">Ще немає чатів.\n Створіть перший, почавши листування з другом.</string>
+    <string name="conversation_list_fragment__no_chats_yet_get_started_by_messaging_a_friend">Чатів поки що немає.\n Напишіть щось друзям.</string>
 
 
     <!-- conversation_secure_verified -->
@@ -3942,7 +4079,7 @@
     <string name="conversation__menu_leave_group">Вийти з групи</string>
     <string name="conversation__menu_view_all_media">Усі медіафайли</string>
     <string name="conversation__menu_conversation_settings">Налаштування чату</string>
-    <string name="conversation__menu_add_shortcut">Додати до домашнього екрану</string>
+    <string name="conversation__menu_add_shortcut">Додати на домашній екран</string>
     <string name="conversation__menu_create_bubble">Створити бульбашку</string>
     <!-- Overflow menu option that allows formatting of text -->
     <string name="conversation__menu_format_text">Форматувати текст</string>
@@ -4023,28 +4160,28 @@
     <!-- BaseKbsPinFragment -->
     <string name="BaseKbsPinFragment__next">Далі</string>
     <!-- Button label to prompt them to create a password ("PIN") using numbers and letters rather than only numbers. -->
-    <string name="BaseKbsPinFragment__create_alphanumeric_pin">Створити Буквенно-Цифровий PIN-код</string>
+    <string name="BaseKbsPinFragment__create_alphanumeric_pin">Створити буквено-цифровий PIN-код</string>
     <!-- Button label to prompt them to return to creating a numbers-only password ("PIN") -->
     <string name="BaseKbsPinFragment__create_numeric_pin">Створити цифровий PIN-код</string>
   <!-- Removed by excludeNonTranslatables <string name="BaseKbsPinFragment__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007059792</string> -->
 
     <!-- CreateKbsPinFragment -->
     <plurals name="CreateKbsPinFragment__pin_must_be_at_least_characters">
-        <item quantity="one">PIN-код повинен бути не коротшим %1$d символа</item>
-        <item quantity="few">PIN-код повинен бути не коротшим %1$d символа</item>
-        <item quantity="many">PIN-код повинен бути не коротшим %1$d символів</item>
-        <item quantity="other">PIN-код повинен бути не коротшим %1$d символів</item>
+        <item quantity="one">Мінімальна довжина PIN-коду — %1$d символ</item>
+        <item quantity="few">Мінімальна довжина PIN-коду — %1$d символи</item>
+        <item quantity="many">Мінімальна довжина PIN-коду — %1$d символів</item>
+        <item quantity="other">Мінімальна довжина PIN-коду — %1$d символа</item>
     </plurals>
     <plurals name="CreateKbsPinFragment__pin_must_be_at_least_digits">
-        <item quantity="one">PIN-код повинен бути не коротшим %1$d цифри</item>
-        <item quantity="few">PIN-код повинен бути не коротшим %1$d цифри</item>
-        <item quantity="many">PIN-код повинен бути не коротшим %1$d цифр</item>
-        <item quantity="other">PIN-код повинен бути не коротшим %1$d цифр</item>
+        <item quantity="one">Мінімальна довжина PIN-коду — %1$d цифра</item>
+        <item quantity="few">Мінімальна довжина PIN-коду — %1$d цифри</item>
+        <item quantity="many">Мінімальна довжина PIN-коду — %1$d цифр</item>
+        <item quantity="other">Мінімальна довжина PIN-коду — %1$d цифри</item>
     </plurals>
     <string name="CreateKbsPinFragment__create_a_new_pin">Створити новий PIN-код</string>
     <string name="CreateKbsPinFragment__you_can_choose_a_new_pin_as_long_as_this_device_is_registered">Ви можете змінити свій PIN-код, поки цей пристрій зареєстровано.</string>
     <string name="CreateKbsPinFragment__create_your_pin">Створити PIN-код</string>
-    <string name="CreateKbsPinFragment__pins_can_help_you_restore_your_account">PIN-код використовується для відновлення акаунту й забезпечення шифрування інформації в Signal. </string>
+    <string name="CreateKbsPinFragment__pins_can_help_you_restore_your_account">PIN-код потрібен для відновлення акаунту й шифрування інформації, яку ви зберігаєте в Signal. </string>
     <string name="CreateKbsPinFragment__choose_a_stronger_pin">Виберіть більш надійний PIN-код</string>
 
     <!-- ConfirmKbsPinFragment -->
@@ -4064,18 +4201,18 @@
     <string name="KbsSplashFragment__learn_more">Дізнатися більше</string>
   <!-- Removed by excludeNonTranslatables <string name="KbsSplashFragment__learn_more_link" translatable="false">https://support.signal.org/hc/articles/360007059792</string> -->
     <string name="KbsSplashFragment__registration_lock_equals_pin">Блокування реєстрації = PIN-код</string>
-    <string name="KbsSplashFragment__your_registration_lock_is_now_called_a_pin">Блокування реєстрації - тепер називається PIN-код і може більше. Оновіть його прямо зараз.</string>
+    <string name="KbsSplashFragment__your_registration_lock_is_now_called_a_pin">Блокування реєстрації тепер називається PIN-кодом, і цей код здатний на більше. Оновіть його одразу.</string>
     <string name="KbsSplashFragment__update_pin">Оновити PIN-код</string>
     <string name="KbsSplashFragment__create_your_pin">Створити PIN-код</string>
     <string name="KbsSplashFragment__learn_more_about_pins">Дізнатися більше про PIN-коди</string>
-    <string name="KbsSplashFragment__disable_pin">Вимкнути PIN</string>
+    <string name="KbsSplashFragment__disable_pin">Вимкнути PIN-код</string>
 
     <!-- KBS Reminder Dialog -->
     <string name="KbsReminderDialog__enter_your_signal_pin">Введіть свій PIN-код Signal</string>
-    <string name="KbsReminderDialog__to_help_you_memorize_your_pin">Щоб допомогти вам запам\'ятати свій PIN-код, ми будемо просити вас вводити його періодично. Згодом це буде відбуватися рідше.</string>
+    <string name="KbsReminderDialog__to_help_you_memorize_your_pin">Щоб ви запам\'ятали свій PIN-код, ми періодично проситимемо вас його вводити. Згодом це ставатиметься рідше.</string>
     <string name="KbsReminderDialog__skip">Пропустити</string>
     <string name="KbsReminderDialog__submit">Надіслати</string>
-    <string name="KbsReminderDialog__forgot_pin">Забули PIN?</string>
+    <string name="KbsReminderDialog__forgot_pin">Забули PIN-код?</string>
     <string name="KbsReminderDialog__incorrect_pin_try_again">Неправильний PIN-код. Будь ласка спробуйте ще раз.</string>
 
     <!-- AccountLockedFragment -->
@@ -4093,7 +4230,7 @@
     <!-- Button label to prompt the user to switch between an alphanumeric and numeric-only keyboards -->
     <string name="RegistrationLockFragment__switch_keyboard">Перемкнути клавіатуру</string>
     <string name="RegistrationLockFragment__incorrect_pin_try_again">Неправильний PIN-код. Будь ласка спробуйте ще раз.</string>
-    <string name="RegistrationLockFragment__forgot_pin">Забули PIN?</string>
+    <string name="RegistrationLockFragment__forgot_pin">Забули PIN-код?</string>
     <string name="RegistrationLockFragment__incorrect_pin">Неправильний PIN-код</string>
     <string name="RegistrationLockFragment__forgot_your_pin">Забули свій PIN-код?</string>
     <string name="RegistrationLockFragment__not_many_tries_left">Спроб майже не лишилося!</string>
@@ -4144,17 +4281,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Вхідний аудіовиклик у Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Вхідний аудіовиклик у Molly</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Вхідний відеовиклик Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Вхідний відеовиклик у Molly</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Вхідний груповий виклик Signal</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Вхідний груповий виклик Molly</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Триває аудіовиклик у Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Триває аудіовиклик у Molly</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Триває відеовиклик Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Триває відеовиклик у Molly</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Триває груповий виклик Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Триває груповий виклик Molly</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Завантаження…</string>
@@ -4165,16 +4302,16 @@
     <string name="SQLCipherMigrationHelper_migrating_signal_database">Міграція бази даних Signal</string>
     <string name="enter_backup_passphrase_dialog__backup_passphrase">Фраза-пароль резервної копії</string>
     <string name="backup_enable_dialog__backups_will_be_saved_to_external_storage_and_encrypted_with_the_passphrase_below_you_must_have_this_passphrase_in_order_to_restore_a_backup">Резервна копія буду збережена у зовнішньому сховищі та зашифрована за допомогою наведеної нижче фрази-паролю. Ви повинні використати її для відновлення резервної копії.</string>
-    <string name="backup_enable_dialog__you_must_have_this_passphrase">Вам знадобиться ця фраза пароль, щоб відновити резервну копію.</string>
+    <string name="backup_enable_dialog__you_must_have_this_passphrase">Вам знадобиться цей пароль, щоб відновити дані з резервної копії.</string>
     <string name="backup_enable_dialog__folder">Папка</string>
-    <string name="backup_enable_dialog__i_have_written_down_this_passphrase">Я записав цю фразу-пароль. Без неї я не зможу відновити резервну копію.</string>
-    <string name="registration_activity__restore_backup">Відновити резервну копію</string>
+    <string name="backup_enable_dialog__i_have_written_down_this_passphrase">У мене збережено цей пароль. Без нього відновлення з резервної копії неможливе.</string>
+    <string name="registration_activity__restore_backup">Відновити з резервної копії</string>
     <string name="registration_activity__transfer_or_restore_account">Перенести або відновити акаунт</string>
     <string name="registration_activity__transfer_account">Перенести акаунт</string>
     <string name="registration_activity__skip">Пропустити</string>
-    <string name="preferences_chats__chat_backups">Резервні копії чату</string>
+    <string name="preferences_chats__chat_backups">Резервне копіювання чатів</string>
     <string name="preferences_chats__transfer_account">Перенести акаунт</string>
-    <string name="preferences_chats__transfer_account_to_a_new_android_device">Перенесіть акаунт на новий пристрій Android</string>
+    <string name="preferences_chats__transfer_account_to_a_new_android_device">Перенесіть акаунт на новий пристрій з ОС Android</string>
     <string name="RegistrationActivity_enter_backup_passphrase">Введіть фразу-пароль</string>
     <string name="RegistrationActivity_restore">Відновити</string>
     <string name="RegistrationActivity_backup_failure_downgrade">Імпорт резервних копій з нових версій Signal неможливий</string>
@@ -4183,17 +4320,17 @@
     <string name="RegistrationActivity_incorrect_backup_passphrase">Хибна фраза-пароль!</string>
     <string name="RegistrationActivity_checking">Перевірка…</string>
     <string name="RegistrationActivity_d_messages_so_far">Залишилось %1$d повідомлень…</string>
-    <string name="RegistrationActivity_restore_from_backup">Відновити резервну копію?</string>
+    <string name="RegistrationActivity_restore_from_backup">Відновити з резервної копії?</string>
     <string name="RegistrationActivity_restore_your_messages_and_media_from_a_local_backup">Відновити ваші повідомлення та медіа-файли із локальної резервної копії. Якщо Ви не бажаєте цього робити зараз, це можна зробити потім.</string>
     <string name="RegistrationActivity_backup_size_s">Розмір резервної копії: %1$s</string>
     <string name="RegistrationActivity_backup_timestamp_s">Мітка часу резервної копії: %1$s</string>
-    <string name="BackupDialog_enable_local_backups">Увімкнути локальні резервні копії?</string>
-    <string name="BackupDialog_enable_backups">Увімкнути резервні копії</string>
+    <string name="BackupDialog_enable_local_backups">Увімкнути локальне резервне копіювання?</string>
+    <string name="BackupDialog_enable_backups">Увімкнути</string>
     <string name="BackupDialog_please_acknowledge_your_understanding_by_marking_the_confirmation_check_box">Підтвердьте, що вам усе зрозуміло, поставивши галочку.</string>
     <string name="BackupDialog_delete_backups">Видалити резервні копії?</string>
-    <string name="BackupDialog_disable_and_delete_all_local_backups">Вимкнути та видалити усі локальні резервні копії?</string>
+    <string name="BackupDialog_disable_and_delete_all_local_backups">Вимкнути та видалити всі локальні резервні копії?</string>
     <string name="BackupDialog_delete_backups_statement">Видалити резервні копії</string>
-    <string name="BackupDialog_to_enable_backups_choose_a_folder">Щоб включити резервне копіювання, будь ласка, виберіть папку. Нові резервні копії будуть зберігатися в ній.</string>
+    <string name="BackupDialog_to_enable_backups_choose_a_folder">Щоб увімкнути резервне копіювання, оберіть папку. У ній будуть зберігатися нові резервні копії.</string>
     <string name="BackupDialog_choose_folder">Обрати папку</string>
     <string name="BackupDialog_copied_to_clipboard">Скопійовано до буфера обміну</string>
     <string name="BackupDialog_no_file_picker_available">Відсутня програма для вибору файлів.</string>
@@ -4201,9 +4338,9 @@
     <string name="BackupDialog_verify">Підтвердження</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Ви успішно ввели фразу-пароль своєї резервної копії</string>
     <string name="BackupDialog_passphrase_was_not_correct">Фраза-пароль була неправильна</string>
-    <string name="LocalBackupJob_creating_signal_backup">Створення резервної копії Signal…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Створення резервної копії Molly…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Перевіряємо резервну копію Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Перевіряємо резервну копію Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">Створення резервної копії не вдалось</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Ваша папка для резервних копій була видалена або переміщена.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Ваш файл резервної копії занадто великий для зберігання на цьому носії.</string>
@@ -4213,20 +4350,20 @@
     <!-- Error message shown if a very large attachment is encountered during the backup creation and causes the backup to fail -->
     <string name="LocalBackupJobApi29_your_backup_contains_a_very_large_file">Резервна копія містить великий файл, який неможливо зберегти. Будь ласка, видаліть його і створіть нову резервну копію.</string>
     <string name="LocalBackupJobApi29_tap_to_manage_backups">Натисніть, щоб керувати резервним копіюванням.</string>
-    <string name="RegistrationActivity_wrong_number">Невірний номер?</string>
+    <string name="RegistrationActivity_wrong_number">Неправильний номер?</string>
     <!--    Countdown to when the user can request a new code via phone call during registration.-->
     <string name="RegistrationActivity_call_me_instead_available_in">Подзвоніть мені (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
-    <string name="RegistrationActivity_resend_sms_available_in">Надіслати код повторно (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Зверніться в службу підтримки Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Реєстрація в Signal - код підтвердження для Android</string>
+    <string name="RegistrationActivity_resend_sms_available_in">Надішліть код ще раз (%1$02d:%2$02d)</string>
+    <string name="RegistrationActivity_contact_signal_support">Зверніться в службу підтримки Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Реєстрація в Molly - код підтвердження для Android</string>
     <string name="RegistrationActivity_incorrect_code">Невірний код</string>
     <string name="BackupUtil_never">Ніколи</string>
     <string name="BackupUtil_unknown">Невідомо</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Номер телефону</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Виберіть, хто може бачити ваш номер телефону і хто може зв\'язатися з вами в Signal через номер.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Виберіть, хто може бачити ваш номер телефону і хто може зв\'язатися з вами в Molly через номер.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Хто може бачити мій номер</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4240,7 +4377,7 @@
     <!-- Subtext below radio buttons when who can find me by number is set to everyone -->
     <string name="PhoneNumberPrivacySettingsFragment_discovery_on_description">Будь-яка людина, що має ваш номер телефону, бачитиме вас у Signal і зможе розпочати з вами розмову.</string>
     <!-- Subtext below radio buttons when who can find me by number is set to nobody -->
-    <string name="PhoneNumberPrivacySettingsFragment_discovery_off_description">Ніхто не бачитиме, що ви використовуєте Signal, окрім людей, з якими ви вже маєте існуючий чат або яким напишете повідомлення.</string>
+    <string name="PhoneNumberPrivacySettingsFragment_discovery_off_description">Крім людей, яким ви напишете самі й з якими ви вже маєте спільний чат, ніхто не побачить, що ви зареєстровані в Signal.</string>
     <!-- Snackbar text when pressing invalid radio item -->
     <string name="PhoneNumberPrivacySettingsFragment__to_change_this_setting">"Щоб змінити це налаштування, виберіть «Ніхто» для параметра «Хто може бачити мій номер»."</string>
     <!-- Dialog title shown when selecting "Nobody" in phone number privacy settings for who can find me by number -->
@@ -4254,27 +4391,27 @@
     <string name="preferences_app_protection__screen_lock">Блокування екрану</string>
     <string name="preferences_app_protection__lock_signal_access_with_android_screen_lock_or_fingerprint">Заблокувати доступ до Signal через екран блокування чи відбиток пальця в Android</string>
     <string name="preferences_app_protection__screen_lock_inactivity_timeout">Затримка блокування екрану при бездіяльності</string>
-    <string name="preferences_app_protection__signal_pin">PIN Signal</string>
+    <string name="preferences_app_protection__signal_pin">PIN-код Signal</string>
     <string name="preferences_app_protection__create_a_pin">Створіть PIN-код</string>
     <string name="preferences_app_protection__change_your_pin">Змінити PIN-код</string>
-    <string name="preferences_app_protection__pin_reminders">Нагадування PIN-коду</string>
+    <string name="preferences_app_protection__pin_reminders">Нагадувати PIN-код</string>
     <string name="preferences_app_protection__turn_off">Вимкнути</string>
     <string name="preferences_app_protection__confirm_pin">Підтвердити PIN</string>
-    <string name="preferences_app_protection__confirm_your_signal_pin">Підтвердьте свій PIN-код Signal</string>
-    <string name="preferences_app_protection__make_sure_you_memorize_or_securely_store_your_pin">PIN-код необхідно запам’ятати або надійно зберегти, оскільки його неможливо відновити. Якщо ви забудете свій PIN-код, то можете втратити дані при повторній реєстрації свого акаунту Signal.</string>
+    <string name="preferences_app_protection__confirm_your_signal_pin">Підтвердьте PIN-код Signal</string>
+    <string name="preferences_app_protection__make_sure_you_memorize_or_securely_store_your_pin">PIN-код необхідно запам’ятати або надійно зберегти, оскільки його неможливо відновити. Якщо ви забудете свій PIN-код, то можете втратити дані при повторній реєстрації акаунту в Signal.</string>
     <string name="preferences_app_protection__incorrect_pin_try_again">Неправильний PIN-код. Будь ласка спробуйте ще раз.</string>
-    <string name="preferences_app_protection__failed_to_enable_registration_lock">Не вдалось включити блокування реєстрації.</string>
+    <string name="preferences_app_protection__failed_to_enable_registration_lock">Не вдалося ввімкнути блокування реєстрації.</string>
     <string name="preferences_app_protection__failed_to_disable_registration_lock">Не вдалося вимкнути блокування реєстрації.</string>
     <string name="AppProtectionPreferenceFragment_none">Немає</string>
-    <string name="preferences_app_protection__registration_lock">Блокування доступу</string>
-    <string name="RegistrationActivity_you_must_enter_your_registration_lock_PIN">Ви повинні ввести Ваш ПІН блокування доступу</string>
+    <string name="preferences_app_protection__registration_lock">Блокувати реєстрацію</string>
+    <string name="RegistrationActivity_you_must_enter_your_registration_lock_PIN">Необхідно ввести PIN-код для блокування реєстрації</string>
     <string name="RegistrationActivity_your_pin_has_at_least_d_digits_or_characters">Ваш PIN-код містить не менше %1$d цифр або символів</string>
     <string name="RegistrationActivity_too_many_attempts">Забагато спроб</string>
-    <string name="RegistrationActivity_you_have_made_too_many_incorrect_registration_lock_pin_attempts_please_try_again_in_a_day">Ви зробили забагато невдалих спроб введення ПІН блокування доступу. Будь ласка, спробуйте ще через день.</string>
+    <string name="RegistrationActivity_you_have_made_too_many_incorrect_registration_lock_pin_attempts_please_try_again_in_a_day">Ви зробили забагато невдалих спроб введення PIN-коду для блокування реєстрації. Ви знову зможете ввести код через день.</string>
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Ви зробили надто багато спроб. Будь ласка, спробуйте ще раз пізніше</string>
     <string name="RegistrationActivity_error_connecting_to_service">Помилка підключення до сервісу</string>
-    <string name="preferences_chats__backups">Резервні копії</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal заблоковано</string>
+    <string name="preferences_chats__backups">Резервне копіювання</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly заблоковано</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">НАТИСНІТЬ ДЛЯ РОЗБЛОКУВАННЯ</string>
     <string name="Recipient_unknown">Невідомо</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4300,14 +4437,21 @@
     <!-- TransferOrRestoreFragment -->
     <string name="TransferOrRestoreFragment__transfer_or_restore_account">Перенести або відновити акаунт</string>
     <string name="TransferOrRestoreFragment__if_you_have_previously_registered_a_signal_account">Якщо ви вже зареєстрували акаунт Signal, то можете перенести або відновити свій акаунт і повідомлення</string>
-    <string name="TransferOrRestoreFragment__transfer_from_android_device">Перенести з пристрою Android</string>
+    <string name="TransferOrRestoreFragment__transfer_from_android_device">Перенести з пристрою з ОС Android</string>
     <string name="TransferOrRestoreFragment__transfer_your_account_and_messages_from_your_old_android_device">Перенести акаунт і повідомлення зі старого пристрою Android. Необхідний доступ до старого пристрою.</string>
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">У вас повинен бути доступ до свого старого пристрою.</string>
-    <string name="TransferOrRestoreFragment__restore_from_backup">Відновити резервну копію</string>
+    <string name="TransferOrRestoreFragment__restore_from_backup">Відновити з резервної копії</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Відновити ваші повідомлення із локальної резервної копії. Якщо ви не бажаєте зробити це зараз, ви не зможете відновити їх пізніше.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Відновити з локальної резервної копії</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Відновити з резервної копії Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Відновити всі текстові повідомлення + медіафайли за минулі 30 днів</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Інші дії</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Закрити</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Увійти без перенесення даних</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Продовжити без перенесення повідомлень і медіафайлів</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Відкрийте Signal на своєму старому Android-телефоні</string>
     <string name="NewDeviceTransferInstructions__continue">Продовжити</string>
@@ -4322,26 +4466,26 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Готуємося до підключення до вашого старого Android-пристрою…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Ще трохи, скоро закінчимо</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Очікуємо підключення старого Android-пристрою…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal потрібен дозвіл на доступ до місця вашого розташування, щоб виявити ваш старий Android-пристрій і підключитися до нього.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Служби геолокації повинні бути включені, щоб Signal зміг виявити ваш старий Android-пристрій і з\'єднатися з ним.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Wi-Fi повинен бути включений, щоб Signal зміг виявити ваш старий Android-пристрій і з\'єднатися з ним. При цьому підключатися до будь-якої мережі Wi-Fi не обов\'язково.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Вибачте, але схоже, що цей пристрій не підтримує Wi-Fi Direct. Signal використовує Wi-Fi Direct, щоб виявити ваш старий пристрій Android і з\'єднатися з ним. Однак ви можете відновити свій акаунт з резервної копії.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly потребує доступу до місцеположення, щоб виявити ваш старий пристрій з ОС Android і з\'єднатися з ним.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Необхідно ввімкнути геодані, щоб Molly зміг виявити ваш старий пристрій з ОС Android і з\'єднатися з ним.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Wi-Fi повинен бути включений, щоб Molly зміг виявити ваш старий Android-пристрій і з\'єднатися з ним. При цьому підключатися до будь-якої мережі Wi-Fi не обов\'язково.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Вибачте, але схоже, що цей пристрій не підтримує Wi-Fi Direct. Molly використовує Wi-Fi Direct, щоб виявити ваш старий пристрій Android і з\'єднатися з ним. Однак ви можете відновити свій акаунт з резервної копії.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Відновити резервну копію</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">При спробі підключення до вашого старого Android-пристрою сталась несподівана помилка.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Пошук нового Android пристрою…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal потрібен дозвіл на доступ до місця вашого розташування, щоб з\'єднатись з вашим старим Android пристроєм і підключитися до нього.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Служби геолокації повинні бути включені, щоб Signal зміг з\'єднатися з вашим новим Android пристроєм.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Wi-Fi повинен бути включений, щоб Signal зміг виявити ваш новий Android-пристрій і з\'єднатися з ним. При цьому підключатися до будь-якої мережі Wi-Fi не обов\'язково.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Вибачте, але схоже, що цей пристрій не підтримує Wi-Fi Direct. Signal використовує Wi-Fi Direct, щоб виявити ваш новий пристрій Android і з\'єднатися з ним. Ви все одно можете створити резервну копію, щоб відновити свій акаунт на новому пристрої Android.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly потребує доступу до місцеположення, щоб виявити ваш новий пристрій з ОС Android і з\'єднатися з ним.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Необхідно ввімкнути геодані, щоб Molly зміг виявити ваш новий пристрій з ОС Android і з\'єднатися з ним.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Wi-Fi повинен бути включений, щоб Molly зміг виявити ваш новий Android-пристрій і з\'єднатися з ним. При цьому підключатися до будь-якої мережі Wi-Fi не обов\'язково.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Вибачте, але схоже, що цей пристрій не підтримує Wi-Fi Direct. Molly використовує Wi-Fi Direct, щоб виявити ваш новий пристрій Android і з\'єднатися з ним. Ви все одно можете створити резервну копію, щоб відновити свій акаунт на новому пристрої Android.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Створити резервну копію</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">При спробі підключення до вашого нового Android-пристрою сталась несподівана помилка.</string>
 
     <!-- DeviceTransferSetupFragment -->
     <string name="DeviceTransferSetup__unable_to_open_wifi_settings">Не вдалося відкрити настройки Wi-Fi. Будь-ласка, включіть Wi-Fi вручну.</string>
-    <string name="DeviceTransferSetup__grant_location_permission">Надайте дозвіл на доступ до місця розташування</string>
-    <string name="DeviceTransferSetup__turn_on_location_services">Увімкніть служби геолокації</string>
+    <string name="DeviceTransferSetup__grant_location_permission">Надати доступ до місцеположення</string>
+    <string name="DeviceTransferSetup__turn_on_location_services">Увімкнути геодані</string>
     <string name="DeviceTransferSetup__turn_on_wifi">Увімкнути Wi-Fi</string>
     <string name="DeviceTransferSetup__error_connecting">Приєднання З\'єднання</string>
     <string name="DeviceTransferSetup__retry">Повторити</string>
@@ -4355,8 +4499,8 @@
     <string name="DeviceTransferSetup__unable_to_discover_old_device">Неможливо знайти старий пристрій</string>
     <string name="DeviceTransferSetup__unable_to_discover_new_device">Неможливо знайти новий пристрій</string>
     <string name="DeviceTransferSetup__make_sure_the_following_permissions_are_enabled">Переконайтеся, що наступні дозволи та сервіси включені:</string>
-    <string name="DeviceTransferSetup__location_permission">Дозвіл на доступ до місця розташування</string>
-    <string name="DeviceTransferSetup__location_services">Служби геолокації</string>
+    <string name="DeviceTransferSetup__location_permission">Доступ до місцеположення</string>
+    <string name="DeviceTransferSetup__location_services">Геодані</string>
     <string name="DeviceTransferSetup__wifi">Wi-Fi</string>
     <string name="DeviceTransferSetup__on_the_wifi_direct_screen_remove_all_remembered_groups_and_unlink_any_invited_or_connected_devices">На екрані Wi-Fi Direct, видаліть всі групи які запам\'ятались і від\'єднайте будь-які запрошені або з\'єднані пристрої.</string>
     <string name="DeviceTransferSetup__wifi_direct_screen">Екран Wi-Fi Direct</string>
@@ -4375,7 +4519,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Передача даних</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Тримайте обидва пристрої поруч один з одним. Не вимикайте ні один з пристроїв і залишайте Signal відкритим. Перекази захищені наскрізним шифруванням.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Тримайте обидва пристрої поруч один з одним. Не вимикайте ні один з пристроїв і залишайте Molly відкритим. Перекази захищені наскрізним шифруванням.</string>
     <string name="DeviceTransfer__d_messages_so_far">Залишилось %1$d повідомлень…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% повідомлень на цей час…</string>
@@ -4389,11 +4533,11 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Перенесення акаунту</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Завантажте Signal на своєму новому Android-пристрої</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Завантажте Molly на новому пристрої з ОС Android</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Натисніть «Перенести або відновити акаунт»"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
-    <string name="OldDeviceTransferInstructions__select_transfer_from_android_device_when_prompted_and_then_continue">"Виберіть «Перенести з Android-пристрою», коли буде запропоновано, а потім «Продовжити». Тримайте обидва пристрої поруч один з одним."</string>
+    <string name="OldDeviceTransferInstructions__select_transfer_from_android_device_when_prompted_and_then_continue">"Виберіть «Перенести з пристрою з ОС Android», коли буде запропоновано, а потім натисніть «Продовжити». Пристрої повинні бути поряд один з одним."</string>
     <string name="OldDeviceTransferInstructions__continue">Продовжити</string>
 
     <!-- OldDeviceTransferComplete -->
@@ -4414,7 +4558,7 @@
     <string name="DeviceToDeviceTransferService_status_discovery">Пошук іншого Android-пристрою…</string>
     <string name="DeviceToDeviceTransferService_status_network_connected">Підключення до вашого іншого Android-пристрою…</string>
     <string name="DeviceToDeviceTransferService_status_verification_required">Необхідна перевірка</string>
-    <string name="DeviceToDeviceTransferService_status_service_connected">Триває перенесення акаунту…</string>
+    <string name="DeviceToDeviceTransferService_status_service_connected">Переносимо акаунт…</string>
 
     <!-- OldDeviceTransferLockedDialog -->
     <string name="OldDeviceTransferLockedDialog__complete_registration_on_your_new_device">Завершіть реєстрацію на своєму новому пристрої</string>
@@ -4461,9 +4605,9 @@
     <string name="GroupsLearnMore_paragraph_3">В майбутньому Signal надасть можливість оновлювати Успадковані групи.</string>
 
     <!-- GroupLinkBottomSheetDialogFragment -->
-    <string name="GroupLinkBottomSheet_share_hint_requiring_approval">З цим посиланням будь-хто може переглядати назву і фото та подавати запит на приєднання. Діліться ним з людьми, яким ви довіряєте.</string>
+    <string name="GroupLinkBottomSheet_share_hint_requiring_approval">За цим посиланням усі можуть побачити назву й фото профілю групи та подати запит на приєднання. Діліться ним тільки з тими, кому довіряєте.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Будь-хто у кого є це посилання, може переглянути ім\'я та фото цієї групи та приєднатися до неї. Діліться ним з людьми, яким ви довіряєте.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Поділитись через Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Надіслати в Molly</string>
     <string name="GroupLinkBottomSheet_copy">Копіювати</string>
     <string name="GroupLinkBottomSheet_qr_code">QR-код</string>
     <string name="GroupLinkBottomSheet_share">Поділитися</string>
@@ -4529,7 +4673,7 @@
     <string name="ReviewCard__block">Заблокувати</string>
     <string name="ReviewCard__delete">Видалити</string>
     <!-- Displayed when a recent name change has occurred. First placeholder is new short name, second is previous name, third is new name. -->
-    <string name="ReviewCard__s_recently_changed">%1$s змінює своє ім\'я профілю з %2$s на %3$s</string>
+    <string name="ReviewCard__s_recently_changed">Користувач %1$s недавно змінив ім\'я профілю з %2$s на %3$s</string>
     <!-- Displayed when a review user is in your system contacts. Placeholder is short name. -->
     <string name="ReviewCard__s_is_in_your_system_contacts">%1$s є в контактах вашого телефона</string>
 
@@ -4566,16 +4710,16 @@
 
     <!-- DeleteAccountFragment -->
     <string name="DeleteAccountFragment__deleting_your_account_will">Видалення акаунту:</string>
-    <string name="DeleteAccountFragment__enter_your_phone_number">Введіть ваш номер телефону</string>
+    <string name="DeleteAccountFragment__enter_your_phone_number">Введіть свій номер телефону</string>
     <string name="DeleteAccountFragment__delete_account">Видалити акаунт</string>
-    <string name="DeleteAccountFragment__delete_your_account_info_and_profile_photo">Видалить дані вашого акаунту і фото профілю</string>
-    <string name="DeleteAccountFragment__delete_all_your_messages">Видалить усі ваші повідомлення</string>
-    <string name="DeleteAccountFragment__delete_s_in_your_payments_account">Видаліть %1$s зі свого платіжного рахунку</string>
+    <string name="DeleteAccountFragment__delete_your_account_info_and_profile_photo">Видалення ваших облікових даних і фото профілю</string>
+    <string name="DeleteAccountFragment__delete_all_your_messages">Видалення всіх ваших повідомлень</string>
+    <string name="DeleteAccountFragment__delete_s_in_your_payments_account">Видаліть %1$s з вашого платіжного профілю</string>
     <string name="DeleteAccountFragment__no_country_code">Код країни не вказано</string>
     <string name="DeleteAccountFragment__no_number">Номер не вказано</string>
     <string name="DeleteAccountFragment__the_phone_number">Наданий номер телефону не належить до вашого акаунту.</string>
     <string name="DeleteAccountFragment__are_you_sure">Ви точно хочете видалити свій акаунт?</string>
-    <string name="DeleteAccountFragment__this_will_delete_your_signal_account">Ця дія видалить ваш акаунт Signal і відновить початковий стан застосунку. Після завершення застосунок закриється.</string>
+    <string name="DeleteAccountFragment__this_will_delete_your_signal_account">Ваш акаунт Signal буде видалено, а налаштування застосунку скинуто. Після завершення цього процесу застосунок закриється.</string>
     <string name="DeleteAccountFragment__failed_to_delete_local_data">Не вдалося видалити локальні дані. Ви можете видалити їх вручну в системних налаштуваннях програми.</string>
     <string name="DeleteAccountFragment__launch_app_settings">Відкрийте Налаштування програми</string>
     <!-- Title of progress dialog shown when a user deletes their account and the process is leaving all groups -->
@@ -4623,11 +4767,11 @@
     <string name="ChatWallpaperFragment__reset_chat_colors">Скинути кольори чату</string>
     <string name="ChatWallpaperFragment__reset_chat_color">Скинути колір чату</string>
     <string name="ChatWallpaperFragment__reset_chat_color_question">Скинути колір чату?</string>
-    <string name="ChatWallpaperFragment__set_wallpaper">Встановити шпалери</string>
+    <string name="ChatWallpaperFragment__set_wallpaper">Обрати шпалери</string>
     <string name="ChatWallpaperFragment__dark_mode_dims_wallpaper">Темний режим затемнює шпалери</string>
     <string name="ChatWallpaperFragment__contact_name">Ім\'я контакту</string>
     <string name="ChatWallpaperFragment__reset">Скинути</string>
-    <string name="ChatWallpaperFragment__wallpaper_preview_description">Попередній перегляд шпалер</string>
+    <string name="ChatWallpaperFragment__wallpaper_preview_description">Попередній вигляд шпалер</string>
     <string name="ChatWallpaperFragment__would_you_like_to_override_all_chat_colors">Бажаєте замінити колір усіх чатів?</string>
     <string name="ChatWallpaperFragment__would_you_like_to_override_all_wallpapers">Бажаєте замінити усі шпалери?</string>
     <string name="ChatWallpaperFragment__reset_default_colors">Скинути кольори за замовчуванням</string>
@@ -4643,19 +4787,19 @@
     <string name="ChatWallpaperSelectionFragment__presets">Шаблони</string>
 
     <!-- ChatWallpaperPreviewActivity -->
-    <string name="ChatWallpaperPreviewActivity__preview">Попередній перегляд</string>
-    <string name="ChatWallpaperPreviewActivity__set_wallpaper">Встановити шпалери</string>
+    <string name="ChatWallpaperPreviewActivity__preview">Попередній вигляд</string>
+    <string name="ChatWallpaperPreviewActivity__set_wallpaper">Установити шпалери</string>
     <string name="ChatWallpaperPreviewActivity__swipe_to_preview_more_wallpapers">Гортайте, щоб побачити більше шпалер</string>
-    <string name="ChatWallpaperPreviewActivity__set_wallpaper_for_all_chats">Встановити шпалери для усіх чатів</string>
-    <string name="ChatWallpaperPreviewActivity__set_wallpaper_for_s">Задати шпалери для %1$s</string>
+    <string name="ChatWallpaperPreviewActivity__set_wallpaper_for_all_chats">Це будуть шпалери для всіх чатів.</string>
+    <string name="ChatWallpaperPreviewActivity__set_wallpaper_for_s">Це будуть шпалери для чату «%1$s»</string>
     <string name="ChatWallpaperPreviewActivity__viewing_your_gallery_requires_the_storage_permission">Для перегляду галереї потрібен дозвіл на доступ до сховища.</string>
 
     <!-- WallpaperImageSelectionActivity -->
 
     <!-- WallpaperCropActivity -->
     <string name="WallpaperCropActivity__pinch_to_zoom_drag_to_adjust">Розведіть чи зведіть два пальці для зміни масштабу, потягніть для зміни положення.</string>
-    <string name="WallpaperCropActivity__set_wallpaper_for_all_chats">Встановити шпалери для усіх чатів.</string>
-    <string name="WallpaperCropActivity__set_wallpaper_for_s">Задати шпалери для %1$s.</string>
+    <string name="WallpaperCropActivity__set_wallpaper_for_all_chats">Це будуть шпалери для всіх чатів.</string>
+    <string name="WallpaperCropActivity__set_wallpaper_for_s">Це будуть шпалери для чату «%1$s».</string>
     <string name="WallpaperCropActivity__error_setting_wallpaper">Помилка встановлення шпалери.</string>
     <string name="WallpaperCropActivity__blur_photo">Розмити фото</string>
 
@@ -4663,18 +4807,18 @@
     <string name="payment_info_card_about_mobilecoin">Про MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin — нова цифрова валюта, націлена на конфіденційність.</string>
     <string name="payment_info_card_adding_funds">Додавання коштів</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Ви можете додавати кошти для використання у Signal надсилаючи MobileCoin на адресу вашого гаманця.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Ви можете додавати кошти для використання у Molly надсилаючи MobileCoin на адресу вашого гаманця.</string>
     <string name="payment_info_card_cashing_out">Виведення коштів</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Ви можете вивести MobileCoin у будь-який час на біржах, які підтримують MobileCoin. Лише здійсніть переказ коштів на свій рахунок на такій біржі.</string>
     <string name="payment_info_card_hide_this_card">Сховати цю картку?</string>
     <string name="payment_info_card_hide">Сховати</string>
     <!-- Title of save recovery phrase card -->
     <string name="payment_info_card_save_recovery_phrase">Зберегти кодову фразу</string>
-    <string name="payment_info_card_your_recovery_phrase_gives_you">Кодова фраза надає ще один спосіб відновлення вашого платіжного облікового запису.</string>
+    <string name="payment_info_card_your_recovery_phrase_gives_you">Кодова фраза надає ще один спосіб відновлення вашого платіжного профілю.</string>
     <!-- Button in save recovery phrase card -->
     <string name="payment_info_card_save_your_phrase">Збережіть свою фразу</string>
     <string name="payment_info_card_update_your_pin">Оновити PIN-код</string>
-    <string name="payment_info_card_with_a_high_balance">Якщо ви маєте високий баланс, пропонуємо створити літерно-цифровий PIN-код для більшої безпеки вашого акаунту.</string>
+    <string name="payment_info_card_with_a_high_balance">Якщо ви маєте високий баланс, пропонуємо створити буквено-цифровий PIN-код для більшої безпеки вашого акаунту.</string>
     <string name="payment_info_card_update_pin">Оновити PIN-код</string>
 
   <!-- Removed by excludeNonTranslatables <string name="payment_info_card__learn_more__about_mobilecoin" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_which_ones</string> -->
@@ -4684,12 +4828,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Вимкнути гаманець</string>
     <string name="DeactivateWalletFragment__your_balance">Ваш баланс</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Перед вимкненням платежів рекомендуємо вивести кошти в інший гаманець. Якщо ви цього не зробите, то в разі повторної активації платежів кошти залишаться у вашому гаманці, зв\'язаному із Signal.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Перед вимкненням платежів рекомендуємо вивести кошти в інший гаманець. Якщо ви цього не зробите, то в разі повторної активації платежів кошти залишаться у вашому гаманці, зв\'язаному із Molly.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Перевести кошти, що залишились на балансі</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Вимкнути без переводу коштів</string>
     <string name="DeactivateWalletFragment__deactivate">Вимкнути</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Вимкнути без переводу коштів?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Баланс залишиться в гаманці, прив\'язаному до Signal, якщо ви вирішите знов увімкнути платежі.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Баланс залишиться в гаманці, прив\'язаному до Molly, якщо ви вирішите знов увімкнути платежі.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Помилка при вимкненні гаманця.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4709,9 +4853,9 @@
     <string name="PaymentsRecoveryStartFragment__got_balance">Ви маєте баланс! Час зберегти кодову фразу — ключ із 24 слів, за допомогою якого можна відновити свій баланс.</string>
     <!-- Description in save recovery phrase screen which shows up when user navigates from info card -->
     <string name="PaymentsRecoveryStartFragment__time_to_save">Час зберегти кодову фразу — ключ із 24 слів, за допомогою якого можна відновити баланс.</string>
-    <string name="PaymentsRecoveryStartFragment__your_recovery_phrase_is_a">Ваша кодова фраза — це унікальна фраза з %1$d слів. Вона використовується для відновлення балансу.</string>
+    <string name="PaymentsRecoveryStartFragment__your_recovery_phrase_is_a">Ваша кодова фраза — це унікальна фраза з %1$d слів. Вона необхідна для відновлення балансу.</string>
     <string name="PaymentsRecoveryStartFragment__start">Почати</string>
-    <string name="PaymentsRecoveryStartFragment__enter_manually">Ввести власноруч</string>
+    <string name="PaymentsRecoveryStartFragment__enter_manually">Ввести вручну</string>
     <string name="PaymentsRecoveryStartFragment__paste_from_clipboard">Вставити з буферу обміну</string>
     <!-- Alert dialog title which asks before going back if user wants to save recovery phrase -->
     <string name="PaymentsRecoveryStartFragment__continue_without_saving">Продовжити без збереження?</string>
@@ -4739,7 +4883,7 @@
     <string name="PaymentsRecoveryPhraseFragment__write_down_the_following_d_words">Запишіть наступні %1$d слова одне за одним. Зберігайте записане у надійному місці.</string>
     <string name="PaymentsRecoveryPhraseFragment__make_sure_youve_entered">Переконайтесь, що ви правильно ввели фразу.</string>
     <string name="PaymentsRecoveryPhraseFragment__do_not_screenshot_or_send_by_email">Не робіть знімків екрану та не відправляйте електронною поштою.</string>
-    <string name="PaymentsRecoveryPhraseFragment__payments_account_restored">Обліковий запис платежів відновлено.</string>
+    <string name="PaymentsRecoveryPhraseFragment__payments_account_restored">Платіжний профіль відновлено.</string>
     <string name="PaymentsRecoveryPhraseFragment__invalid_recovery_phrase">Неправильна кодова фраза</string>
     <string name="PaymentsRecoveryPhraseFragment__make_sure_youve_entered_your_phrase_correctly_and_try_again">Переконайтесь, що ви ввели правильно фразу і повторіть спробу.</string>
     <string name="PaymentsRecoveryPhraseFragment__copy_to_clipboard">Копіювати до буферу обміну?</string>
@@ -4768,7 +4912,7 @@
     <!-- CanNotSendPaymentDialog -->
     <string name="CanNotSendPaymentDialog__cant_send_payment">Неможливо відправити платіж</string>
     <string name="CanNotSendPaymentDialog__to_send_a_payment_to_this_user">Для відправки платежу цьому користувачу, йому потрібно схвалити ваш запит на листування. Надішліть йому повідомлення для створення цього запиту.</string>
-    <string name="CanNotSendPaymentDialog__send_a_message">Відправити повідомлення</string>
+    <string name="CanNotSendPaymentDialog__send_a_message">Надіслати повідомлення</string>
 
     <!-- GroupsInCommonMessageRequest -->
     <string name="GroupsInCommonMessageRequest__you_have_no_groups_in_common_with_this_person">У вас немає спільних груп з цією особою. Уважно розглядайте запити перед тим, як їх прийняти, щоб уникнути небажаних повідомлень.</string>
@@ -4776,7 +4920,7 @@
     <string name="GroupsInCommonMessageRequest__about_message_requests">Про запити на листування</string>
     <string name="GroupsInCommonMessageRequest__okay">Добре</string>
   <!-- Removed by excludeNonTranslatables <string name="GroupsInCommonMessageRequest__support_article" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
-    <string name="ChatColorSelectionFragment__heres_a_preview_of_the_chat_color">Ось таким буде колір чату.</string>
+    <string name="ChatColorSelectionFragment__heres_a_preview_of_the_chat_color">Таким буде колір чату.</string>
     <string name="ChatColorSelectionFragment__the_color_is_visible_to_only_you">Цей колір бачите лише ви.</string>
 
     <!-- GroupDescriptionDialog -->
@@ -4800,15 +4944,15 @@
 
     <!-- AccountSettingsFragment -->
     <string name="AccountSettingsFragment__account">Акаунт</string>
-    <string name="AccountSettingsFragment__youll_be_asked_less_frequently">З часом питання буде з\'являтися все рідше</string>
-    <string name="AccountSettingsFragment__require_your_signal_pin">Щоб повторно зареєструвати свій номер телефону в Signal, необхідний PIN-код Signal</string>
+    <string name="AccountSettingsFragment__youll_be_asked_less_frequently">З часом нагадування з\'являтимуться рідше</string>
+    <string name="AccountSettingsFragment__require_your_signal_pin">Вимагати введення PIN-коду для повторної реєстрації номера телефону в Signal</string>
     <string name="AccountSettingsFragment__change_phone_number">Змінити номер телефону</string>
     <!-- Account setting that allows user to request and export their signal account data -->
-    <string name="AccountSettingsFragment__request_account_data">Дані вашого акаунту</string>
+    <string name="AccountSettingsFragment__request_account_data">Облікові дані</string>
 
     <!-- ExportAccountDataFragment -->
     <!-- Part of requesting account data flow, this is the section title for requesting that account data -->
-    <string name="ExportAccountDataFragment__your_account_data">Дані вашого акаунту</string>
+    <string name="ExportAccountDataFragment__your_account_data">Облікові дані</string>
     <!-- Explanation of account data the user can request. %1$s is replaced with Learn more with a link -->
     <string name="ExportAccountDataFragment__export_explanation">Експортуйте звіт даних свого акаунту Signal. Звіт не містить повідомлень і медіафайлів. %1$s</string>
     <!-- Learn more link to more information about requesting account data -->
@@ -4848,7 +4992,7 @@
     <string name="ExportAccountDataFragment__report_not_stored_disclaimer">Звіт генерується лише під час експортування. Signal не зберігає звіт на вашому пристрої.</string>
 
     <!-- ChangeNumberFragment -->
-    <string name="ChangeNumberFragment__use_this_to_change_your_current_phone_number_to_a_new_phone_number">Скористайтесь цим, аби змінити свій поточний номер телефону на новий. Ви не можете скасувати цю зміну.\n\nПерш ніж продовжити, переконайтеся, що ваш новий номер може отримувати SMS або дзвінки.</string>
+    <string name="ChangeNumberFragment__use_this_to_change_your_current_phone_number_to_a_new_phone_number">Тут можна змінити поточний номер телефону на новий. Така зміна буде незворотна.\n\nПеревірте, чи можете ви отримувати SMS або дзвінки на новий номер, і продовжуйте.</string>
     <string name="ChangeNumberFragment__continue">Продовжити</string>
     <!-- Message shown on dialog after your number has been changed successfully. -->
     <string name="ChangeNumber__your_phone_number_has_changed_to_s">Ваш номер телефону змінено на %1$s</string>
@@ -4957,10 +5101,10 @@
     <!-- AdvancedPrivacySettingsFragment -->
   <!-- Removed by excludeNonTranslatables <string name="AdvancedPrivacySettingsFragment__sealed_sender_link" translatable="false">https://signal.org/blog/sealed-sender</string> -->
     <string name="AdvancedPrivacySettingsFragment__show_status_icon">Показати значок статусу</string>
-    <string name="AdvancedPrivacySettingsFragment__show_an_icon">Показувати піктограму в деталях повідомлення, доставлених за допомогою прихованого відправника.</string>
+    <string name="AdvancedPrivacySettingsFragment__show_an_icon">Показувати піктограму в деталях повідомлення, доставлених за допомогою захищеного відправника.</string>
 
     <!-- ExpireTimerSettingsFragment -->
-    <string name="ExpireTimerSettingsFragment__when_enabled_new_messages_sent_and_received_in_new_chats_started_by_you_will_disappear_after_they_have_been_seen">Якщо ввімкнути цю функцію, нові повідомлення, надіслані та отримані в нових чатах, що ви почали, зникатимуть після перегляду.</string>
+    <string name="ExpireTimerSettingsFragment__when_enabled_new_messages_sent_and_received_in_new_chats_started_by_you_will_disappear_after_they_have_been_seen">Якщо ввімкнути цю функцію, нові повідомлення, надіслані та отримані в нових чатах, що ви починаєте, зникатимуть після перегляду.</string>
     <string name="ExpireTimerSettingsFragment__when_enabled_new_messages_sent_and_received_in_this_chat_will_disappear_after_they_have_been_seen">Якщо ввімкнути цю функцію, нові повідомлення, надіслані та отримані в цьому чаті, зникатимуть після перегляду.</string>
     <string name="ExpireTimerSettingsFragment__off">Вимк.</string>
     <string name="ExpireTimerSettingsFragment__4_weeks">4 тижні</string>
@@ -4982,13 +5126,13 @@
 
     <!-- HelpSettingsFragment -->
     <string name="HelpSettingsFragment__support_center">Центр підтримки</string>
-    <string name="HelpSettingsFragment__contact_us">Зв\'язатися з нами</string>
+    <string name="HelpSettingsFragment__contact_us">Зв\'яжіться з нами</string>
     <string name="HelpSettingsFragment__version">Версія</string>
     <string name="HelpSettingsFragment__debug_log">Журнал налагодження</string>
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Ліцензії</string>
-    <string name="HelpSettingsFragment__terms_amp_privacy_policy">Умови та Політика конфіденційності</string>
-    <string name="HelpFragment__copyright_signal_messenger">Права захищено Signal Messenger</string>
+    <string name="HelpSettingsFragment__terms_amp_privacy_policy">Умови надання послуг і Політика конфіденційності</string>
+    <string name="HelpFragment__copyright_signal_messenger">Авторські права належать Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Ліцензія: GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -5037,11 +5181,11 @@
     <!-- ChatColorGradientTool -->
 
     <!-- Title text for prompt to donate. Shown in a popup at the bottom of the chat list. -->
-    <string name="Donate2022Q2Megaphone_donate_to_signal">Задонатити Signal</string>
+    <string name="Donate2022Q2Megaphone_donate_to_signal">Підтримати Signal</string>
     <!-- Body text for prompt to donate. Shown in a popup at the bottom of the chat list. -->
     <string name="Donate2022Q2Megaphone_signal_is_powered_by_people_like_you">Signal працює завдяки таким людям, як ви. Зробіть місячний донат і отримайте значок.</string>
     <!-- Button label that brings a user to the donate screen. Shown in a popup at the bottom of the chat list. -->
-    <string name="Donate2022Q2Megaphone_donate">Задонатити</string>
+    <string name="Donate2022Q2Megaphone_donate">Підтримати</string>
     <!-- Button label that dismissed a prompt to donate. Shown in a popup at the bottom of the chat list. -->
     <string name="Donate2022Q2Megaphone_not_now">Не зараз</string>
 
@@ -5060,11 +5204,11 @@
     <string name="AddAProfilePhotoMegaphone__add_photo">Додати фото</string>
 
     <!-- BecomeASustainerMegaphone -->
-    <string name="BecomeASustainerMegaphone__become_a_sustainer">Стати підтримувачем</string>
+    <string name="BecomeASustainerMegaphone__become_a_sustainer">Підтримати</string>
     <!-- Displayed in the Become a Sustainer megaphone -->
     <string name="BecomeASustainerMegaphone__signal_is_powered_by">Signal працює завдяки таким людям, як ви. Зробіть донат і отримайте значок.</string>
     <string name="BecomeASustainerMegaphone__not_now">Не зараз</string>
-    <string name="BecomeASustainerMegaphone__donate">Задонатити</string>
+    <string name="BecomeASustainerMegaphone__donate">Підтримати</string>
 
     <!-- KeyboardPagerFragment -->
     <string name="KeyboardPagerFragment_emoji">Емоджі</string>
@@ -5083,7 +5227,7 @@
     <string name="StickerSearchDialogFragment_search_stickers">Пошук стікерів</string>
     <string name="StickerSearchDialogFragment_no_results_found">Нічого не знайдено</string>
     <string name="EmojiSearchFragment__no_results_found">Нічого не знайдено</string>
-    <string name="NotificationsSettingsFragment__unknown_ringtone">Невідомий дзвінок</string>
+    <string name="NotificationsSettingsFragment__unknown_ringtone">Невідома мелодія дзвінка</string>
 
     <!-- ConversationSettingsFragment -->
     <!-- Dialog title displayed when non-admin tries to add a story to an audience group -->
@@ -5092,12 +5236,12 @@
     <string name="ConversationSettingsFragment__only_admins_of_this_group_can_add_to_its_story">Тільки адміністратори можуть додавати історії в цій групі</string>
     <!-- Error toasted when no activity can handle the add contact intent -->
     <string name="ConversationSettingsFragment__contacts_app_not_found">Програму з контактами не знайдено</string>
-    <string name="ConversationSettingsFragment__start_video_call">Почати відео дзвінок</string>
-    <string name="ConversationSettingsFragment__start_audio_call">Почати голосовий дзвінок</string>
+    <string name="ConversationSettingsFragment__start_video_call">Почати відеовиклик</string>
+    <string name="ConversationSettingsFragment__start_audio_call">Почати аудіовиклик</string>
     <!-- Button label with hyphenation. Translation can use soft hyphen - Unicode U+00AD -->
     <string name="ConversationSettingsFragment__story">Історія</string>
     <!-- Button label with hyphenation. Translation can use soft hyphen - Unicode U+00AD -->
-    <string name="ConversationSettingsFragment__message">Повідомлення</string>
+    <string name="ConversationSettingsFragment__message">Чат</string>
     <!-- Button label with hyphenation. Translation can use soft hyphen - Unicode U+00AD -->
     <string name="ConversationSettingsFragment__video">Відео</string>
     <!-- Button label with hyphenation. Translation can use soft hyphen - Unicode U+00AD -->
@@ -5120,11 +5264,11 @@
     <string name="ConversationSettingsFragment__unblock">Розблокувати</string>
     <string name="ConversationSettingsFragment__unblock_group">Розблокувати групу</string>
     <string name="ConversationSettingsFragment__add_to_a_group">Додати до групи</string>
-    <string name="ConversationSettingsFragment__see_all">Показати всі</string>
+    <string name="ConversationSettingsFragment__see_all">Показати решту</string>
     <string name="ConversationSettingsFragment__add_members">Додати учасників</string>
     <string name="ConversationSettingsFragment__permissions">Дозволи</string>
     <string name="ConversationSettingsFragment__requests_and_invites">Запити і запрошення</string>
-    <string name="ConversationSettingsFragment__group_link">Посилання групи</string>
+    <string name="ConversationSettingsFragment__group_link">Посилання на групу</string>
     <string name="ConversationSettingsFragment__add_as_a_contact">Додати як контакт</string>
     <string name="ConversationSettingsFragment__unmute">Сповіщати</string>
     <!-- The subtitle for a settings item that describes how long the user\'s chat is muted. If a chat is muted, you will not receive notifications unless @mentioned. The placeholder represents a time (e.g. 10pm, March 4, etc). -->
@@ -5132,7 +5276,7 @@
     <string name="ConversationSettingsFragment__conversation_muted_forever">Сповіщення чату вимкнені назавжди</string>
     <string name="ConversationSettingsFragment__copied_phone_number_to_clipboard">Номер телефону скопійовано в буфер обміну.</string>
     <string name="ConversationSettingsFragment__phone_number">Номер телефону</string>
-    <string name="ConversationSettingsFragment__get_badges">Отримайте значки для свого профілю, підтримуючи Signal. Торкніться значка, щоб дізнатися більше.</string>
+    <string name="ConversationSettingsFragment__get_badges">Отримуйте значки для профілю за підтримку Signal. Торкніться значка, щоб дізнатися більше.</string>
 
     <!-- PermissionsSettingsFragment -->
     <string name="PermissionsSettingsFragment__add_members">Додати учасників</string>
@@ -5140,7 +5284,7 @@
     <string name="PermissionsSettingsFragment__send_messages">Відправити повідомлення</string>
     <string name="PermissionsSettingsFragment__all_members">Усі учасники</string>
     <string name="PermissionsSettingsFragment__only_admins">Тільки адміністратори</string>
-    <string name="PermissionsSettingsFragment__who_can_add_new_members">Хто може додати нових учасників?</string>
+    <string name="PermissionsSettingsFragment__who_can_add_new_members">Хто може додавати нових учасників?</string>
     <string name="PermissionsSettingsFragment__who_can_edit_this_groups_info">Хто може редагувати інформацію цієї групи?</string>
     <string name="PermissionsSettingsFragment__who_can_send_messages">Хто може надсилати повідомлення?</string>
 
@@ -5169,9 +5313,9 @@
     <!-- Context menu item message -->
     <string name="NewConversationActivity__message">Повідомлення</string>
     <!-- Context menu item audio call -->
-    <string name="NewConversationActivity__audio_call">Голосовий дзвінок</string>
+    <string name="NewConversationActivity__audio_call">Аудіовиклик</string>
     <!-- Context menu item video call -->
-    <string name="NewConversationActivity__video_call">Відеодзвінок</string>
+    <string name="NewConversationActivity__video_call">Відеовиклик</string>
     <!-- Context menu item remove -->
     <string name="NewConversationActivity__remove">Вилучити</string>
     <!-- Context menu item block -->
@@ -5215,11 +5359,11 @@
 
 
     <!-- AvatarPickerFragment -->
-    <string name="AvatarPickerFragment__avatar_preview">Попередній перегляд фото профілю</string>
+    <string name="AvatarPickerFragment__avatar_preview">Попередній вигляд зображення профілю</string>
     <string name="AvatarPickerFragment__camera">Камера</string>
     <string name="AvatarPickerFragment__take_a_picture">Зробити фото</string>
     <string name="AvatarPickerFragment__choose_a_photo">Вибрати фото</string>
-    <string name="AvatarPickerFragment__photo">Світлина</string>
+    <string name="AvatarPickerFragment__photo">Фото</string>
     <!-- Button label during avatar selection/creation that when tapped lets you generate an avatar from typed in text. -->
     <string name="AvatarPickerFragment__text">Опис</string>
     <string name="AvatarPickerFragment__save">Зберегти</string>
@@ -5227,7 +5371,7 @@
     <string name="AvatarPickerRepository__failed_to_save_avatar">Помилка збереження фото профілю</string>
 
     <!-- TextAvatarCreationFragment -->
-    <string name="TextAvatarCreationFragment__preview">Попередній перегляд</string>
+    <string name="TextAvatarCreationFragment__preview">Попередній вигляд</string>
     <string name="TextAvatarCreationFragment__done">Готово</string>
     <string name="TextAvatarCreationFragment__text">Опис</string>
     <string name="TextAvatarCreationFragment__color">Колір</string>
@@ -5235,9 +5379,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Вибрати колір</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Поділитися</string>
 
@@ -5279,11 +5420,12 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Надсилати повідомлення цій групі можуть тільки адміністратори.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Ліміт досягнуто</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Можна вибрати максимум 5 чатів</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
-    <string name="MediaReviewFragment__add_to_the_group_story">Додати до групової історії «%1$s»</string>
+    <string name="MediaReviewFragment__add_to_the_group_story">Додати до групової історії %1$s</string>
     <!-- Positive dialog action when sending a story via an add to group story button -->
     <string name="MediaReviewFragment__add_to_story">Додати до історії</string>
     <string name="MediaReviewFragment__add_a_message">Додати повідомлення</string>
@@ -5341,7 +5483,7 @@
 
     <string name="MediaReviewImagePageFragment__discard">Відхилити</string>
     <string name="MediaReviewImagePageFragment__discard_changes">Відхилити зміни?</string>
-    <string name="MediaReviewImagePageFragment__youll_lose_any_changes">Ви втратите усі зміни, що зробили з цим фото.</string>
+    <string name="MediaReviewImagePageFragment__youll_lose_any_changes">Усі зміни цього фото зникнуть.</string>
 
     <!-- The title of a dialog notifying that a user was found matching a scanned QR code. The placeholder is a username. Usernames are always latin characters. -->
     <string name="MediaCaptureFragment_username_dialog_title">Знайдено %1$s</string>
@@ -5370,13 +5512,13 @@
     <string name="SelectFeaturedBadgeFragment__failed_to_update_profile">Не вдалось оновити профіль</string>
 
     <!-- Displayed on primary button in the bottom sheet as a call-to-action to launch into the donation flow -->
-    <string name="ViewBadgeBottomSheetDialogFragment__donate_now">Задонатити</string>
+    <string name="ViewBadgeBottomSheetDialogFragment__donate_now">Підтримати</string>
     <!-- Title of a page in the bottom sheet. Placeholder is a user\'s short-name -->
     <string name="ViewBadgeBottomSheetDialogFragment__s_supports_signal">%1$s підтримує Signal</string>
     <!-- Description of a page in the bottom sheet of a monthly badge. Placeholder is a user\'s short-name -->
-    <string name="ViewBadgeBottomSheetDialogFragment__s_supports_signal_with_a_monthly">%1$s підтримує Signal місячним донатом. Signal є некомерційною організацією, яка не має рекламодавців та інвесторів. Ми працюємо лише завдяки вам.</string>
+    <string name="ViewBadgeBottomSheetDialogFragment__s_supports_signal_with_a_monthly">%1$s підтримує Signal, здійснюючи щомісячний донат. Signal — неприбуткова організація, що не має ні доходів від реклами, ні інвесторів. Її підтримують лише такі люди, як ви.</string>
     <!-- Description of a page in the bottom sheet of a one-time badge. Placeholder is a user\'s short-name -->
-    <string name="ViewBadgeBottomSheetDialogFragment__s_supports_signal_with_a_donation">%1$s підтримує Signal донатом. Signal є некомерційною організацією, яка не має рекламодавців та інвесторів. Ми працюємо лише завдяки вам.</string>
+    <string name="ViewBadgeBottomSheetDialogFragment__s_supports_signal_with_a_donation">%1$s підтримує Signal, здійснюючи щомісячний донат. Signal — неприбуткова організація, що не має ні доходів від реклами, ні інвесторів. Її підтримують лише такі люди, як ви.</string>
 
     <string name="ImageView__badge">Значок</string>
 
@@ -5398,29 +5540,29 @@
     <string name="Subscription__expires_s">Термін дії минає %1$s</string>
 
     <!-- Title of learn more sheet -->
-    <string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_different">Signal вирізняється.</string>
+    <string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_different">Signal інакший.</string>
     <!-- First small text blurb on learn more sheet -->
     <string name="SubscribeLearnMoreBottomSheetDialogFragment__private_messaging">Конфіденційні повідомлення. Без реклами, відстежування й нагляду.</string>
     <!-- Second small text blurb on learn more sheet -->
-    <string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_supported_by">Signal працює за рахунок пожертв, тобто для нас ваша конфіденційність є головною. Ми створюємо Signal для вас, а не для ваших даних чи власного прибутку.</string>
+    <string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_supported_by">Signal існує за рахунок пожертв. Це означає, що ми робимо все заради захисту вашої особистої інформації. Signal створено для вас, а не для збору ваших даних чи нашого прибутку.</string>
     <!-- Third small text blurb on learn more sheet -->
-    <string name="SubscribeLearnMoreBottomSheetDialogFragment__if_you_can">Якщо ви маєте можливість, будь ласка, підтримайте нас донатом, щоб Signal залишався цікавим, надійним і доступним для всіх.</string>
+    <string name="SubscribeLearnMoreBottomSheetDialogFragment__if_you_can">Будь ласка, підтримайте Signal донатом, якщо можете, щоб він лишався цікавим, надійним і доступним для всіх.</string>
 
     <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__thanks_for_your_support">Дякуємо за вашу підтримку!</string>
     <!-- Subtext underneath the dialog title on the thanks sheet -->
     <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_donor_badge">Ви отримали значок спонсора від Signal! Відобразіть його в профілі, щоб розповісти про свою підтримку.</string>
     <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__you_can_also">Ви також можете</string>
-    <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__become_a_montly_sustainer">стати підтримувачем щомісячно.</string>
+    <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__become_a_montly_sustainer">підтримувати щомісячно.</string>
     <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__display_on_profile">Показувати в профілі</string>
     <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__make_featured_badge">Обрати значок</string>
     <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__continue">Продовжити</string>
     <string name="ThanksForYourSupportBottomSheetFragment__when_you_have_more">Коли ви маєте більше одного значка, ви можете обирати, який саме відображати у своєму профілі.</string>
 
-    <string name="BecomeASustainerFragment__get_badges">Отримайте значки для свого профілю, підтримуючи Signal.</string>
-    <string name="BecomeASustainerFragment__signal_is_a_non_profit">Signal — неприбутковий, без рекламодавців чи інвесторів, що підтримується лише такими людьми, як ви.</string>
+    <string name="BecomeASustainerFragment__get_badges">Отримуйте значки для профілю за підтримку Signal.</string>
+    <string name="BecomeASustainerFragment__signal_is_a_non_profit">Signal — неприбуткова організація, що не має ні доходів від реклами, ні інвесторів. Її підтримують лише такі люди, як ви.</string>
 
     <!-- Button label for creating a donation -->
-    <string name="ManageDonationsFragment__donate_to_signal">Задонатити Signal</string>
+    <string name="ManageDonationsFragment__donate_to_signal">Підтримати Signal</string>
     <!-- Heading for more area of manage subscriptions page -->
     <string name="ManageDonationsFragment__more">Більше</string>
     <!-- Heading for receipts area of manage subscriptions page -->
@@ -5428,9 +5570,9 @@
     <string name="ManageDonationsFragment__my_support">Моя підтримка</string>
     <string name="ManageDonationsFragment__manage_subscription">Керувати передплатою</string>
     <!-- Label for Donation Receipts button -->
-    <string name="ManageDonationsFragment__donation_receipts">Квитанція внеску</string>
+    <string name="ManageDonationsFragment__donation_receipts">Підтвердження ваших донатів</string>
     <string name="ManageDonationsFragment__badges">Значки</string>
-    <string name="ManageDonationsFragment__subscription_faq">Поширені запитання про передплату</string>
+    <string name="ManageDonationsFragment__subscription_faq">Поширені запитання про підписку</string>
     <!-- Preference heading for other ways to donate -->
     <string name="ManageDonationsFragment__other_ways_to_give">Інші способи підтримки</string>
     <!-- Preference label to launch badge gifting -->
@@ -5460,9 +5602,9 @@
     <string name="MySupportPreference__learn_more">Подробиці</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Оновити Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Оновити Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Ця версія Signal застаріла. Оновіть версію, щоб і надалі користуватися застосунком.</string>
+    <string name="UpdateSignalExpiredDialog__message">Ця версія Molly застаріла. Оновіть версію, щоб і надалі користуватися застосунком.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Оновити</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5471,7 +5613,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Пристрій не зареєстровано</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Цей пристрій більше не зареєстровано. Перереєструйтеся, щоб і надалі використовувати Signal на цьому пристрої.</string>
+    <string name="ReregisterSignalDialog__message">Цей пристрій більше не зареєстровано. Перереєструйтеся, щоб і надалі використовувати Molly на цьому пристрої.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Перереєструватись</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5619,9 +5761,9 @@
     <string name="StripeFailureCode__verify_your_bank_details_are_correct">Переконайтеся, що банківські реквізити правильні, і повторіть спробу. Якщо проблема не вирішиться, зв\'яжіться зі своїм банком.</string>
 
     <!-- Title of create notification profile screen -->
-    <string name="EditNotificationProfileFragment__name_your_profile">Ім\'я профілю</string>
+    <string name="EditNotificationProfileFragment__name_your_profile">Назвіть цей профіль</string>
     <!-- Hint text for create/edit notification profile name -->
-    <string name="EditNotificationProfileFragment__profile_name">Ім’я профілю</string>
+    <string name="EditNotificationProfileFragment__profile_name">Назва профілю</string>
     <!-- Name has a max length, this shows how many characters are used out of the max -->
     <string name="EditNotificationProfileFragment__count">%1$d/%2$d</string>
     <!-- Call to action button to continue to the next step -->
@@ -5635,26 +5777,26 @@
     <!-- Error message shown when attempting to create or edit a profile name to an existing profile name -->
     <string name="EditNotificationProfileFragment__a_profile_with_this_name_already_exists">Профіль з таким ім\'ям вже існує</string>
     <!-- Preset selectable name for a profile name, shown as list in edit/create screen -->
-    <string name="EditNotificationProfileFragment__work">Працюю</string>
+    <string name="EditNotificationProfileFragment__work">Робота</string>
     <!-- Preset selectable name for a profile name, shown as list in edit/create screen -->
     <string name="EditNotificationProfileFragment__sleep">Сон</string>
     <!-- Preset selectable name for a profile name, shown as list in edit/create screen -->
-    <string name="EditNotificationProfileFragment__driving">Кермування авто</string>
+    <string name="EditNotificationProfileFragment__driving">За кермом</string>
     <!-- Preset selectable name for a profile name, shown as list in edit/create screen -->
     <string name="EditNotificationProfileFragment__downtime">Відпочинок</string>
     <!-- Preset selectable name for a profile name, shown as list in edit/create screen -->
-    <string name="EditNotificationProfileFragment__focus">Концентрація</string>
+    <string name="EditNotificationProfileFragment__focus">Зосередженість</string>
     <!-- Error message shown when attempting to next/save without a profile name -->
     <string name="EditNotificationProfileFragment__profile_must_have_a_name">Має мати ім\'я</string>
 
     <!-- Title for add recipients to notification profile screen in create flow -->
-    <string name="AddAllowedMembers__allowed_notifications">Дозволені сповіщення</string>
+    <string name="AddAllowedMembers__allowed_notifications">Від кого надходять сповіщення</string>
     <!-- Description of what the user should be doing with this screen -->
     <string name="AddAllowedMembers__add_people_and_groups_you_want_notifications_and_calls_from_when_this_profile_is_on">Додайте людей та групи, від яких бажаєте отримувати сповіщення, коли цей профіль увімкнено</string>
     <!-- Button text that launches the contact picker to select from -->
-    <string name="AddAllowedMembers__add_people_or_groups">Додати людей чи групи</string>
+    <string name="AddAllowedMembers__add_people_or_groups">Додати людей або групи</string>
     <!-- Title for exceptions section of add people to notification profile screen in create flow -->
-    <string name="AddAllowedMembers__exceptions">Виключення</string>
+    <string name="AddAllowedMembers__exceptions">Винятки</string>
     <!-- List preference to toggle that allows calls through the notification profile during create flow -->
     <string name="AddAllowedMembers__allow_all_calls">Дозволити всі виклики</string>
     <!-- List preference to toggle that allows mentions through the notification profile during create flow -->
@@ -5664,7 +5806,7 @@
     <string name="SelectRecipientsFragment__add">Додати</string>
 
     <!-- Notification profiles home fragment, shown when no profiles have been created yet -->
-    <string name="NotificationProfilesFragment__create_a_profile_to_receive_notifications_and_calls_only_from_the_people_and_groups_you_want_to_hear_from">Створіть профіль сповіщень для отримання сповіщень та викликів лише від людей та груп, від яких бажаєте їх отримувати.</string>
+    <string name="NotificationProfilesFragment__create_a_profile_to_receive_notifications_and_calls_only_from_the_people_and_groups_you_want_to_hear_from">Створіть профіль і отримуйте сповіщення й виклики лише від обраних людей і груп.</string>
     <!-- Header shown above list of all notification profiles -->
     <string name="NotificationProfilesFragment__profiles">Профілі</string>
     <!-- Button that starts the create new notification profile flow -->
@@ -5693,15 +5835,15 @@
     <!-- Description of hours for schedule (start to end) times -->
     <string name="NotificationProfileDetails__s_to_s">%1$s до %2$s</string>
     <!-- Section header for exceptions to the notification profile -->
-    <string name="NotificationProfileDetails__exceptions">Виключення</string>
+    <string name="NotificationProfileDetails__exceptions">Винятки</string>
     <!-- Profile exception to allow all calls through the profile restrictions -->
-    <string name="NotificationProfileDetails__allow_all_calls">Дозволити усі виклики</string>
+    <string name="NotificationProfileDetails__allow_all_calls">Дозволити всі виклики</string>
     <!-- Profile exception to allow all @mentions through the profile restrictions -->
-    <string name="NotificationProfileDetails__notify_for_all_mentions">Сповіщати про усі згадування</string>
+    <string name="NotificationProfileDetails__notify_for_all_mentions">Сповіщати про всі згадки</string>
     <!-- Section header for showing schedule information -->
     <string name="NotificationProfileDetails__schedule">Розклад</string>
     <!-- If member list is long, will truncate the list and show an option to then see all when tapped -->
-    <string name="NotificationProfileDetails__see_all">Дивитись усі</string>
+    <string name="NotificationProfileDetails__see_all">Показати решту</string>
 
     <!-- Title for add schedule to profile in create flow -->
     <string name="EditNotificationProfileSchedule__add_a_schedule">Додати розклад</string>
@@ -5765,12 +5907,12 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Не вдалося відкрити вибір.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Щоб увімкнути сповіщення, Signal потребує дозволу на їхні відображення.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Щоб увімкнути сповіщення, Molly потребує дозволу на їхні відображення.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Увімкнути</string>
 
     <!-- Description shown for the Signal Release Notes channel -->
-    <string name="ReleaseNotes__signal_release_notes_and_news">Що нового &amp; Новини Signal</string>
+    <string name="ReleaseNotes__signal_release_notes_and_news">Оновлення та новини Signal</string>
 
     <!-- Donation receipts activity title -->
     <string name="DonationReceiptListFragment__all_activity">Вся активність</string>
@@ -5779,29 +5921,29 @@
     <!-- Donation receipts recurring tab label -->
     <string name="DonationReceiptListFragment__recurring">Поточні</string>
     <!-- Donation receipts one-time tab label -->
-    <string name="DonationReceiptListFragment__one_time">Одноразово</string>
+    <string name="DonationReceiptListFragment__one_time">Разові донати</string>
     <!-- Donation receipts gift tab -->
-    <string name="DonationReceiptListFragment__for_a_friend">Для друга</string>
+    <string name="DonationReceiptListFragment__for_a_friend">За друга</string>
     <!-- Donation receipts gift tab label -->
-    <string name="DonationReceiptListFragment__donation_for_a_friend">Донат для друга</string>
+    <string name="DonationReceiptListFragment__donation_for_a_friend">Донат за друга</string>
     <!-- Donation receipts donation type heading -->
     <string name="DonationReceiptDetailsFragment__donation_type">Тип внеску</string>
     <!-- Donation receipts date paid heading -->
     <string name="DonationReceiptDetailsFragment__date_paid">Дата оплати</string>
     <!-- Donation receipts share PNG -->
-    <string name="DonationReceiptDetailsFragment__share_receipt">Поділитись квитанцією</string>
+    <string name="DonationReceiptDetailsFragment__share_receipt">Поділитися</string>
     <!-- Donation receipts list end note -->
-    <string name="DonationReceiptListFragment__if_you_have">Якщо ви перевстановлювали Signal, квитанції попередніх донатів не будуть доступні.</string>
+    <string name="DonationReceiptListFragment__if_you_have">Якщо ви перевстановлювали Signal, підтвердження попередніх донатів будуть недоступні.</string>
     <!-- Donation receipts document title -->
-    <string name="DonationReceiptDetailsFragment__donation_receipt">Квитанція про донат</string>
+    <string name="DonationReceiptDetailsFragment__donation_receipt">Підтвердження донату</string>
     <!-- Donation receipts amount title -->
     <string name="DonationReceiptDetailsFragment__amount">Сума</string>
     <!-- Donation receipts thanks -->
-    <string name="DonationReceiptDetailsFragment__thank_you_for_supporting">Дякуємо за підтримку Signal. Ваш внесок допомагає підтримувати місію розробки технології конфіденційності з відкритим кодом, яка захищає вільне висловлювання та забезпечує безпечне спілкування для мільйонів людей у всьому світі. Якщо ви є резидентом Сполучених Штатів, збережіть цю квитанцію для податкового обліку. Signal Technology Foundation – відповідно до розділу 501c3 Податкового кодексу це звільнена від податків некомерційна організація в Сполучених Штатах. Наш федеральний податковий номер: 82–4506840.</string>
+    <string name="DonationReceiptDetailsFragment__thank_you_for_supporting">Дякуємо за підтримку Signal. Ваш внесок допомагає реалізувати нашу місію: розробляти технологію конфіденційного обміну повідомленнями з відкритим кодом, яка захищає свободу слова й робить можливим безпечне спілкування для мільйонів людей у всьому світі. Якщо ви резидент Сполучених Штатів Америки, збережіть це підтвердження для звітування в податкові органи. Signal Technology Foundation — звільнена від оподаткування неприбуткова організація, створена відповідно до розділу 501c3 податкового кодексу США. Наш федеральний податковий номер: 82–4506840.</string>
     <!-- Donation receipt type -->
     <string name="DonationReceiptDetailsFragment__s_dash_s">%1$s - %2$s</string>
     <!-- Donation reciepts screen empty state title -->
-    <string name="DonationReceiptListFragment__no_receipts">Квитанцій немає</string>
+    <string name="DonationReceiptListFragment__no_receipts">Підтверджень немає</string>
 
     <!-- region "Stories Tab" -->
 
@@ -5880,9 +6022,9 @@
     <!-- Displayed at bottom of story viewer when current item has replies -->
     <plurals name="StoryViewerFragment__d_replies">
         <item quantity="one">%1$d відповідь</item>
-        <item quantity="few">%1$d відповідей</item>
+        <item quantity="few">%1$d відповіді</item>
         <item quantity="many">%1$d відповідей</item>
-        <item quantity="other">%1$d відповідей</item>
+        <item quantity="other">%1$d відповіді</item>
     </plurals>
     <!-- Label on group stories to add a story -->
     <string name="StoryViewerPageFragment__add">Додати</string>
@@ -5917,11 +6059,13 @@
     <!-- Story View context menu action to remove them from a story -->
     <string name="StoryViewItem__remove_viewer">Вилучити глядача</string>
     <!-- Displayed when a story has no replies yet -->
-    <string name="StoryGroupReplyFragment__no_replies_yet">Ще немає відповідей</string>
+    <string name="StoryGroupReplyFragment__no_replies_yet">Відповідей ще немає</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Ви не можете відповісти на цю історію, тому що ви вже не учасник цієї групи.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Реагує на історію</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Ваша реакція на історію</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Реакція на історію</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Перегляди</string>
     <!-- Label for story replies tab -->
@@ -5977,9 +6121,9 @@
     <!-- My story privacy fine print about what the privacy settings are for -->
     <string name="MyStorySettingsFragment__choose_who_can_view_your_story">Виберіть, хто зможе переглядати вашу історію. Зміни не вплинуть на вже надіслані історії.</string>
     <!-- Section header for options related to replies and reactions -->
-    <string name="MyStorySettingsFragment__replies_amp_reactions">Відповіді і реакції</string>
+    <string name="MyStorySettingsFragment__replies_amp_reactions">Відповіді й реакції</string>
     <!-- Switchable option for allowing replies and reactions on your stories -->
-    <string name="MyStorySettingsFragment__allow_replies_amp_reactions">Дозволити відповіді і реакції</string>
+    <string name="MyStorySettingsFragment__allow_replies_amp_reactions">Дозволити відповіді й реакції</string>
     <!-- Summary for switchable option allowing replies and reactions on your story -->
     <string name="MyStorySettingsFragment__let_people_who_can_view_your_story_react_and_reply">Дозвольте глядачам ваших історій реагувати й відповідати на них</string>
     <!-- Signal connections bolded text in the Signal Connections sheet -->
@@ -5993,7 +6137,7 @@
     <!-- Signal connections sheet bullet point 3 -->
     <string name="SignalConnectionsBottomSheet__having_them_in_your_system_contacts">вони є в контактах вашого телефона.</string>
     <!-- Note at the bottom of the Signal connections sheet -->
-    <string name="SignalConnectionsBottomSheet__your_connections_can_see_your_name">"Ваші контакти бачать ваше ім\'я та фото, а також усе, що ви викладаєте в «Моїй історії», якщо ви її не приховали."</string>
+    <string name="SignalConnectionsBottomSheet__your_connections_can_see_your_name">"Контакти Signal бачать ваше ім\'я та фото, а також усе, що ви викладаєте в «Моїй історії», якщо ви її не приховали."</string>
     <!-- Clickable option to add a viewer to a custom story -->
     <string name="PrivateStorySettingsFragment__add_viewer">Додати глядача</string>
     <!-- Clickable option to delete a custom story -->
@@ -6131,7 +6275,7 @@
     <!-- Label for a button in a notification at the bottom of the chat list to turn off censorship circumvention -->
 
     <!-- Conversation Item label for when you react to someone else\'s story -->
-    <string name="ConversationItem__you_reacted_to_s_story">Ви відреагували на історію користувача %1$s</string>
+    <string name="ConversationItem__you_reacted_to_s_story">Ваша реакція на історію користувача %1$s</string>
     <!-- Conversation Item label for reactions to your story -->
     <string name="ConversationItem__reacted_to_your_story">Реакція на вашу історію</string>
     <!-- Conversation Item label for reactions to an unavailable story -->
@@ -6153,10 +6297,10 @@
     <string name="GiftFlowStartFragment__donate_for_a_friend">Донат за друга</string>
     <!-- Description text on start fragment for gifting a badge -->
     <plurals name="GiftFlowStartFragment__support_signal_by">
-        <item quantity="one">Підтримайте Signal, зробивши донат за друзів чи родичів, які користуються застосунком. Вони отримують спеціальний значок профілю на %1$d день</item>
-        <item quantity="few">Підтримайте Signal, зробивши донат за друзів чи родичів, які користуються застосунком. Вони отримують спеціальний значок профілю на %1$d дні</item>
-        <item quantity="many">Підтримайте Signal, зробивши донат за друзів чи родичів, які користуються застосунком. Вони отримують спеціальний значок профілю на %1$d днів</item>
-        <item quantity="other">Підтримайте Signal, зробивши донат за друзів чи родичів, які користуються застосунком. Вони отримують спеціальний значок профілю на %1$d дня</item>
+        <item quantity="one">Підтримайте Signal, зробивши донат за друзів чи рідних, які теж ним користуються. Вони отримають особливий значок профілю на %1$d день</item>
+        <item quantity="few">Підтримайте Signal, зробивши донат за друзів чи рідних, які теж ним користуються. Вони отримають особливий значок профілю на %1$d дні</item>
+        <item quantity="many">Підтримайте Signal, зробивши донат за друзів чи рідних, які теж ним користуються. Вони отримають особливий значок профілю на %1$d днів</item>
+        <item quantity="other">Підтримайте Signal, зробивши донат за друзів чи рідних, які теж ним користуються. Вони отримають особливий значок профілю на %1$d дня</item>
     </plurals>
     <!-- Action button label for start fragment for gifting a badge -->
     <string name="GiftFlowStartFragment__next">Далі</string>
@@ -6167,7 +6311,7 @@
     <!-- Heading text specifying who the gift will be sent to -->
     <string name="GiftFlowConfirmationFragment__send_to">Надіслати</string>
     <!-- Text explaining that gift will be sent to the chosen recipient -->
-    <string name="GiftFlowConfirmationFragment__the_recipient_will_be_notified">Одержувач отримає сповіщення про донат у приватному повідомленні. Введіть текст свого повідомлення нижче.</string>
+    <string name="GiftFlowConfirmationFragment__the_recipient_will_be_notified">Одержувач отримає сповіщення про донат у приватному чаті. Ви також можете додати власне повідомлення.</string>
     <!-- Text explaining that this gift is a one time donation -->
     <string name="GiftFlowConfirmationFragment__one_time_donation">Разовий донат</string>
     <!-- Hint for add message input -->
@@ -6294,7 +6438,7 @@
     <!-- Sub-line when a user is verified. -->
     <string name="SafetyNumberRecipientRowItem__s_dot_verified">%1$s · Перевірено</string>
     <!-- Sub-line when a user is verified. -->
-    <string name="SafetyNumberRecipientRowItem__verified">Верифіковано</string>
+    <string name="SafetyNumberRecipientRowItem__verified">Перевірено</string>
     <!-- Title of safety number changes bottom sheet when showing individual records -->
     <string name="SafetyNumberBottomSheetFragment__safety_number_changes">Зміна коду безпеки</string>
     <!-- Message of safety number changes bottom sheet when showing individual records -->
@@ -6354,7 +6498,7 @@
     <!-- Story info header sent heading -->
     <string name="StoryInfoHeader__sent">Надіслано</string>
     <!-- Story info header received heading -->
-    <string name="StoryInfoHeader__received">Одержано</string>
+    <string name="StoryInfoHeader__received">Отримано</string>
     <!-- Story info header file size heading -->
     <string name="StoryInfoHeader__file_size">Розмір файлу</string>
     <!-- Story info "Sent to" header -->
@@ -6394,7 +6538,7 @@
     <!-- Section header for who can view a group story -->
     <string name="GroupStorySettingsFragment__who_can_view_this_story">Хто може дивитися цю історію</string>
     <!-- Explanation of who can view a group story -->
-    <string name="GroupStorySettingsFragment__members_of_the_group_s">"Учасники групи «%1$s» можуть переглядати цю історію та відповідати на неї. Додати / видалити учасників цього чату можна в групі."</string>
+    <string name="GroupStorySettingsFragment__members_of_the_group_s">"Учасники групи %1$s можуть переглядати цю історію та відповідати на неї. Додати / видалити учасників цього чату можна в групі."</string>
     <!-- Preference label for removing this group story -->
     <string name="GroupStorySettingsFragment__remove_group_story">Вилучити групову історію</string>
 
@@ -6433,7 +6577,7 @@
     <!-- Continue button label -->
     <string name="DonateToSignalFragment__continue">Продовжити</string>
     <!-- Description below title -->
-    <string name="DonateToSignalFragment__private_messaging">Конфіденційний обмін повідомленнями можливий — завдяки вашим коштам. Без реклами, відстежування й поступок. Підтримайте Signal донатом.</string>
+    <string name="DonateToSignalFragment__private_messaging">Конфіденційний обмін повідомленнями можливий — завдяки вашим коштам. Без реклами, відстежування й поступок. Підтримайте Signal донатом.</string>
     <!-- Dialog title when a user tries to donate while they already have a pending donation. -->
     <string name="DonateToSignalFragment__you_have_a_donation_pending">Ваш попередній донат ще не надійшов</string>
     <!-- Dialog body when a user tries to donate while they already have a pending monthly donation. -->
@@ -6454,11 +6598,11 @@
     <!-- Donation pill toggle monthly text -->
     <string name="DonationPillToggle__monthly">Щомісяця</string>
     <!-- Donation pill toggle one-time text -->
-    <string name="DonationPillToggle__one_time">Одноразово</string>
+    <string name="DonationPillToggle__one_time">Разово</string>
 
     <!-- GatewaySelectorBottomSheet -->
     <!-- Sheet title when subscribing -->
-    <string name="GatewaySelectorBottomSheet__donate_s_month_to_signal">Задонатити Signal %1$s/місяць</string>
+    <string name="GatewaySelectorBottomSheet__donate_s_month_to_signal">Донатити Signal %1$s/місяць</string>
     <!-- Sheet summary when subscribing -->
     <string name="GatewaySelectorBottomSheet__get_a_s_badge">Отримати значок %1$s</string>
     <!-- Sheet title when giving a one-time donation -->
@@ -6473,7 +6617,7 @@
     <!-- Button label for paying with a bank transfer -->
     <string name="GatewaySelectorBottomSheet__bank_transfer">Банківський переказ</string>
     <!-- Button label for paying with a credit card -->
-    <string name="GatewaySelectorBottomSheet__credit_or_debit_card">Кредитна або дебетова картка</string>
+    <string name="GatewaySelectorBottomSheet__credit_or_debit_card">Кредитна / Дебетова картка</string>
     <!-- Sheet summary when giving donating for a friend -->
     <string name="GatewaySelectorBottomSheet__donate_for_a_friend">Донат за друга</string>
     <!-- Button label for paying with iDEAL -->
@@ -6539,7 +6683,7 @@
     <!-- Text label for button to show user how to find their IBAN -->
     <string name="BankTransferDetailsFragment__find_account_info">Пошук даних рахунку</string>
     <!-- Donate button label for monthly subscription -->
-    <string name="BankTransferDetailsFragment__donate_s_month">Задонатити %1$s/місяць</string>
+    <string name="BankTransferDetailsFragment__donate_s_month">Донатити %1$s/місяць</string>
     <!-- Donate button label for one-time -->
     <string name="BankTransferDetailsFragment__donate_s">Задонатити %1$s</string>
     <!-- Error label for IBAN field when number is too short -->
@@ -6572,8 +6716,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Виберіть свій банк</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Підтвердьте ваш донат через %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Щоб налаштувати регулярний благодійний платіж, виберіть «Продовжити» і підтвердьте списання 0,01€ у вашому банку. Ця сума буде автоматично повернута. Вона потрібна, щоб активувати списання 5€/місяць з вашого рахунку.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Щоб оформити регулярний благодійний платіж, виберіть «Продовжити» й підтвердьте списання 0,01€ у своєму банку. Цю суму буде автоматично повернуто. Ця операція потрібна, щоб активувати списання %1$s/місяць з вашого рахунку.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Продовжити</string>
 
@@ -6641,13 +6785,13 @@
     <!-- A button label in a bottom sheet that will navigate the user to their contacts settings. -->
     <string name="CdsPermanentErrorBottomSheet_contacts_button">Відкрити контакти</string>
     <!-- A toast that will be shown if we are unable to open the user\'s default contacts app. -->
-    <string name="CdsPermanentErrorBottomSheet_no_contacts_toast">Програму для контактів не знайдено</string>
+    <string name="CdsPermanentErrorBottomSheet_no_contacts_toast">Застосунок для контактів не знайдено</string>
 
     <!-- PaymentMessageView -->
     <!-- In-chat conversation message shown when you sent a payment to another person, placeholder is the other person name -->
-    <string name="PaymentMessageView_you_sent_s">Надіслано користувачу %1$s</string>
+    <string name="PaymentMessageView_you_sent_s">Ви надіслали користувачу %1$s</string>
     <!-- In-chat conversation message shown when another person sent a payment to you, placeholder is the other person name -->
-    <string name="PaymentMessageView_s_sent_you">Надіслано користувачем %1$s</string>
+    <string name="PaymentMessageView_s_sent_you">Користувач %1$s надіслав вам</string>
 
     <!-- YourInformationIsPrivateBottomSheet -->
     <string name="YourInformationIsPrivateBottomSheet__your_information_is_private">Ваша інформація є конфіденційною</string>
@@ -6692,7 +6836,7 @@
     <string name="SetUpYourUsername__learn_more">Подробиці</string>
 
     <!-- Displayed as a title on a megaphone which prompts user to set up a username -->
-    <string name="PnpLaunchMegaphone_title">Нові способи додавання контактів</string>
+    <string name="PnpLaunchMegaphone_title">Контактуйте по-новому</string>
     <!-- Displayed as a description on a megaphone which prompts user to set up a username -->
     <string name="PnpLaunchMegaphone_body">Запроваджуємо конфіденційність номера телефону, посилання й можливість створити ім\'я користувача.</string>
     <!-- Displayed as an action on a megaphone which prompts user to set up a username. Clicking it will dismiss the megaphone. -->
@@ -6750,7 +6894,7 @@
     <!-- Status text on call links -->
     <string name="CallLogAdapter__call_link">Посилання на виклик</string>
     <!-- Accessibility description for the video call button -->
-    <string name="CallLogAdapter__start_a_video_call">Почати відеодзвінок</string>
+    <string name="CallLogAdapter__start_a_video_call">Почати відеовиклик</string>
     <!-- Accessibility description for the voice call button -->
     <string name="CallLogAdapter__start_a_voice_call">Почати аудіовиклик</string>
 
@@ -6758,7 +6902,7 @@
     <!-- Displayed as a context menu item to start a video call -->
     <string name="CallContextMenu__video_call">Відеовиклик</string>
     <!-- Displayed as a context menu item to start an audio call -->
-    <string name="CallContextMenu__audio_call">Голосовий дзвінок</string>
+    <string name="CallContextMenu__audio_call">Аудіовиклик</string>
     <!-- Displayed as a context menu item to go to chat -->
     <string name="CallContextMenu__go_to_chat">До чату</string>
     <!-- Displayed as a context menu item to see call info -->
@@ -6785,7 +6929,7 @@
     <!-- Dialog title to clear all call events -->
     <string name="CallLogFragment__clear_call_history_question">Очистити історію викликів?</string>
     <!-- Dialog body to clear all call events -->
-    <string name="CallLogFragment__this_will_permanently_delete_all_call_history">Ця дія назавжди видалить усю історію викликів</string>
+    <string name="CallLogFragment__this_will_permanently_delete_all_call_history">Історію всіх викликів буде видалено остаточно</string>
     <!-- Action bar menu item to delete all call events -->
     <string name="CallLogFragment__clear_call_history">Очистити історію викликів</string>
     <!-- Action bar menu item to only display missed calls -->
@@ -6812,29 +6956,29 @@
     </plurals>
     <!-- Snackbar label after deleting call logs -->
     <plurals name="CallLogFragment__d_calls_deleted">
-        <item quantity="one">Видалено %1$d дзвінок</item>
-        <item quantity="few">Видалено %1$d Дзвінки</item>
-        <item quantity="many">Видалено %1$d дзвінків</item>
-        <item quantity="other">Видалено %1$d дзвінка</item>
+        <item quantity="one">Видалено %1$d виклик</item>
+        <item quantity="few">Видалено %1$d виклики</item>
+        <item quantity="many">Видалено %1$d викликів</item>
+        <item quantity="other">Видалено %1$d виклику</item>
     </plurals>
     <!-- Shown during empty state -->
-    <string name="CallLogFragment__no_calls">Дзвінків немає.</string>
+    <string name="CallLogFragment__no_calls">Викликів не було.</string>
     <!-- Shown during empty state -->
-    <string name="CallLogFragment__get_started_by_calling_a_friend">Почніть із дзвінка другу.</string>
+    <string name="CallLogFragment__get_started_by_calling_a_friend">Подзвоніть комусь із друзів.</string>
     <!-- Displayed as a message in a dialog when deleting multiple items -->
     <string name="CallLogFragment__call_links_youve_created">Створені посилання на виклики більше не працюватимуть для тих, хто їх має.</string>
 
     <!-- New call activity -->
     <!-- Activity title in title bar -->
-    <string name="NewCallActivity__new_call">Новий дзвінок</string>
+    <string name="NewCallActivity__new_call">Новий виклик</string>
 
     <!-- Call state update popups -->
     <!-- Displayed when the user enables group call ringing -->
-    <string name="CallStateUpdatePopupWindow__ringing_on">Дзвінок увімкнено</string>
+    <string name="CallStateUpdatePopupWindow__ringing_on">Здійснення викликів увімкнено</string>
     <!-- Displayed when the user disables group call ringing -->
-    <string name="CallStateUpdatePopupWindow__ringing_off">Дзвінок вимкнено</string>
+    <string name="CallStateUpdatePopupWindow__ringing_off">Здійснення викликів вимкнено</string>
     <!-- Displayed when the user cannot enable group call ringing -->
-    <string name="CallStateUpdatePopupWindow__group_is_too_large">Група завелика для дзвінків її учасникам</string>
+    <string name="CallStateUpdatePopupWindow__group_is_too_large">Група завелика для здійснення викликів її учасникам</string>
     <!-- Displayed when the user turns on their mic -->
     <string name="CallStateUpdatePopupWindow__mic_on">Мікрофон увімкнено</string>
     <!-- Displayed when the user turns off their mic -->
@@ -6851,23 +6995,23 @@
 
     <!-- CallPreference -->
     <!-- Generic group call in call info -->
-    <string name="CallPreference__group_call">Груповий дзвінок</string>
+    <string name="CallPreference__group_call">Груповий виклик</string>
     <!-- Missed group call in call info -->
-    <string name="CallPreference__missed_group_call">Пропущений груповий дзвінок</string>
+    <string name="CallPreference__missed_group_call">Пропущений груповий виклик</string>
     <!-- Missed group call while notification profile on in call info -->
     <string name="CallPreference__missed_group_call_notification_profile">Пропущено груповий виклик під час увімкненого профілю сповіщень</string>
     <!-- Incoming group call in call info -->
-    <string name="CallPreference__incoming_group_call">Вхідний груповий дзвінок</string>
+    <string name="CallPreference__incoming_group_call">Вхідний груповий виклик</string>
     <!-- Outgoing group call in call info -->
-    <string name="CallPreference__outgoing_group_call">Вихідний груповий дзвінок</string>
+    <string name="CallPreference__outgoing_group_call">Вихідний груповий виклик</string>
 
     <!-- CreateCallLink -->
     <!-- Call link creation item title on calls tab -->
-    <string name="CreateCallLink__create_a_call_link">Створити посилання на дзвінок</string>
+    <string name="CreateCallLink__create_a_call_link">Створити посилання на виклик</string>
     <!-- Call link creation item description on calls tab -->
-    <string name="CreateCallLink__share_a_link_for">Поділитися посиланням на дзвінок у Signal</string>
+    <string name="CreateCallLink__share_a_link_for">Поділіться посиланням на виклик у Signal</string>
     <!-- Text inserted when sharing a call link within Signal. Placeholder is a call link url. -->
-    <string name="CreateCallLink__use_this_link_to_join_a_signal_call">Приєднайтеся до виклику Signal за допомогою цього посилання: %1$s</string>
+    <string name="CreateCallLink__use_this_link_to_join_a_signal_call">Ось посилання, за яким можна приєднатися до виклику в Signal: %1$s</string>
 
     <!-- CallLinkInfoSheet -->
     <!-- Sheet title -->
@@ -6881,13 +7025,13 @@
 
     <!-- CreateCallLinkBottomSheetDialogFragment -->
     <!-- Fragment title -->
-    <string name="CreateCallLinkBottomSheetDialogFragment__create_call_link">Створення посилання на дзвінок</string>
+    <string name="CreateCallLinkBottomSheetDialogFragment__create_call_link">Створення посилання на виклик</string>
     <!-- Displayed as a default name for the signal call -->
-    <string name="CreateCallLinkBottomSheetDialogFragment__signal_call">дзвінок через Signal</string>
+    <string name="CreateCallLinkBottomSheetDialogFragment__signal_call">Виклик у Signal</string>
     <!-- Displayed on a small button to allow user to instantly join call -->
     <string name="CreateCallLinkBottomSheetDialogFragment__join">Приєднатись</string>
     <!-- Option to open a full screen dialog to add a call name -->
-    <string name="CreateCallLinkBottomSheetDialogFragment__add_call_name">Додати назву дзвінка</string>
+    <string name="CreateCallLinkBottomSheetDialogFragment__add_call_name">Додати назву виклику</string>
     <!-- Option to open a full screen dialog to edit a call name -->
     <string name="CreateCallLinkBottomSheetDialogFragment__edit_call_name">Змінити назву виклику</string>
     <!-- Toggle to require approval for all members before joining -->
@@ -6913,11 +7057,11 @@
 
     <!-- EditCallLinkNameDialogFragment -->
     <!-- App bar title for editing a call name -->
-    <string name="EditCallLinkNameDialogFragment__edit_call_name">Змінити назву дзвінка</string>
+    <string name="EditCallLinkNameDialogFragment__edit_call_name">Змінити назву виклику</string>
     <!-- Text on button to confirm edit -->
     <string name="EditCallLinkNameDialogFragment__save">Зберегти</string>
     <!-- Placeholder text on input field when editing call name -->
-    <string name="EditCallLinkNameDialogFragment__call_name">Назва дзвінка</string>
+    <string name="EditCallLinkNameDialogFragment__call_name">Назва виклику</string>
 
     <!-- ChooseNavigationBarStyleFragment -->
     <!-- Dialog title, displayed below the header image -->
@@ -6928,7 +7072,7 @@
     <string name="ChooseNavigationBarStyleFragment__compact">Компактний</string>
 
     <!-- Title shown at top of bottom sheet dialog for displaying a message\'s edit history -->
-    <string name="EditMessageHistoryDialog_title">Історія редагування</string>
+    <string name="EditMessageHistoryDialog_title">Правки</string>
     <!-- Title of dialog shown alerting user that edit message is in beta only -->
     <string name="SendingEditMessageBetaOnlyDialog_title">Змінити повідомлення</string>
     <!-- Body of dialog shown alerting user that edit message is in beta only and only sent to beta users. -->
@@ -6945,7 +7089,7 @@
     <!-- Displayed in a text row, allowing the user to click and edit a call name -->
     <string name="CallLinkDetailsFragment__edit_call_name">Змінити назву виклику</string>
     <!-- Displayed in a text row, allowing the user to click and add a call name -->
-    <string name="CallLinkDetailsFragment__add_call_name">Додати назву дзвінка</string>
+    <string name="CallLinkDetailsFragment__add_call_name">Додати назву виклику</string>
     <!-- Displayed in a toggle row, allowing the user to click to enable or disable member approval -->
     <string name="CallLinkDetailsFragment__approve_all_members">Схвалити запити всіх учасників</string>
     <!-- Displayed in a text row, allowing the user to share the call link -->
@@ -7017,7 +7161,7 @@
     <string name="UsernameLinkSettings_try_scanning_another_image_containing_a_signal_qr_code">Якщо можете, зіскануйте QR-код Signal з іншого зображення.</string>
 
     <!-- Explanatory text at the top of a bottom sheet describing how username links work -->
-    <string name="UsernameLinkShareBottomSheet_title">Із цим посиланням будь-хто може переглянути ваше ім\'я користувача та розпочати з вами чат. Діліться ним тільки з людьми, яким довіряєте.</string>
+    <string name="UsernameLinkShareBottomSheet_title">За цим посиланням усі можуть побачити ваше ім\'я користувача й почати з вами чат. Діліться ним тільки з тими, кому довіряєте.</string>
     <!-- A button label for a button that, when pressed, will copy your username link to the clipboard -->
     <string name="UsernameLinkShareBottomSheet_copy_link">Копіювати посилання</string>
     <!-- A button label for a button that, when pressed, will open a share sheet for sharing your username link -->
@@ -7105,7 +7249,7 @@
     <!-- Dialog body for an invalid phone number. Placeholder is the entered phone number. -->
     <string name="FindByActivity__s_is_not_a_valid_phone_number">%1$s — недійсний номер телефону. Спробуйте ще раз, використовуючи дійсний номер телефону</string>
     <!-- Dialog body for not found username -->
-    <string name="FindByActivity__s_is_not_a_signal_user">«%1$s» — не є користувачем Signal. Будь ласка, перевірте ім\'я користувача і спробуйте ще раз.</string>
+    <string name="FindByActivity__s_is_not_a_signal_user">%1$s — не користувач Signal. Перевірте правильність імені користувача й повторіть пошук.</string>
     <!-- Dialog body for not found phone number -->
     <string name="FindByActivity__s_is_not_a_signal_user_would">%1$s не користується Signal. Ви хочете запросити абонента з цим номером?</string>
     <!-- Dialog action to invite the phone number to Signal -->
@@ -7163,9 +7307,59 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Завантаження резервної копії…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Резервне копіювання медіафайлів вимкнено</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Резервне копіювання медіафайлів у Signal було скасовано, тому що ми не змогли опрацювати ваш платіж. Ви маєте %1$d день, щоб завантажити медіафайли зі своєї резервної копії. Через %1$d день їх буде видалено.</item>
+        <item quantity="few">Резервне копіювання медіафайлів у Signal було скасовано, тому що ми не змогли опрацювати ваш платіж. Ви маєте %1$d дні, щоб завантажити медіафайли зі своєї резервної копії. Через %1$d дні їх буде видалено.</item>
+        <item quantity="many">Резервне копіювання медіафайлів у Signal було скасовано, тому що ми не змогли опрацювати ваш платіж. Ви маєте %1$d днів, щоб завантажити медіафайли зі своєї резервної копії. Через %1$d днів їх буде видалено.</item>
+        <item quantity="other">Резервне копіювання медіафайлів у Signal було скасовано, тому що ми не змогли опрацювати ваш платіж. Ви маєте %1$d дня, щоб завантажити медіафайли зі своєї резервної копії. Через %1$d дня їх буде видалено.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Ви можете поновити оплату в будь-який момент, щоб знову здійснювати резервне копіювання медіафайлів. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Сьогодні буде видалено ваші медіафайли</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Резервне копіювання медіафайлів у Signal було скасовано, тому що ми не змогли опрацювати ваш платіж. Ви маєте останню можливість завантажити медіафайли з резервної копії, поки їх не видалено.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Неможливо завершити завантаження</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">На пристрої недостатньо місця. Звільніть %1$s, щоб завантажити медіафайли з резервної копії.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">Якщо вибрати «Пропустити», медіафайли з резервної копії буде видалено через %1$d день.</item>
+        <item quantity="few">Якщо вибрати «Пропустити», медіафайли з резервної копії буде видалено через %1$d дні.</item>
+        <item quantity="many">Якщо вибрати «Пропустити», медіафайли з резервної копії буде видалено через %1$d днів.</item>
+        <item quantity="other">Якщо вибрати «Пропустити», медіафайли з резервної копії буде видалено через %1$d дня.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Неможливо опрацювати платіж за резервне копіювання</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Нам не вдалось опрацювати щомісячний платіж за резервне копіювання. Перевірте дійсність вашого платіжного засобу. За потреби оновіть платіжну інформацію в Google Pay. Через кілька днів Signal спробує стягнути платіж ще раз.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Резервне копіювання не завершено</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Ваш пристрій не створював резервної копії вже %1$d дн. Перевірте, чи підключено пристрій до Wi-Fi, і натисніть «Створити копію зараз». </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Дізнатися більше</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Пропустити</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Завантажити медіафайли</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Пізніше</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Не завантажувати медіафайлів</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Звільніть %1$s, щоб завантажити свої медіафайли.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
-    <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Кредитна або дебетова картка</string>
+    <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Кредитна / Дебетова картка</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__iDEAL">iDEAL</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
@@ -7176,6 +7370,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Невідомо</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Історія платежів</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Дата і час створення останньої резервної копії: %1$s, %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -7186,6 +7386,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Повідомлення, старіші за обраний період, остаточно видаляються.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Коли кількість повідомлень перевищує обране обмеження, надлишок остаточно видаляється.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Поширювати на зв\'язані пристрої</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Якщо ввімкнути, то на зв\'язаних пристроях теж видалятимуться повідомлення, що перевищують обмеження.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Тепер видалення синхронізується на всіх ваших пристроях</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Коли ви видаляєте повідомлення чи чати, вони зникають на вашому телефоні та зв\'язаних пристроях.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">Зрозуміло</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Історія платежів</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Текстові повідомлення та всі медіафайли</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Платіжні дані</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Тип резервного копіювання</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Дата оплати</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Поділитися</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Резервне копіювання Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Історія платежів</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Докладніше про резервну копію</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Розмір резервної копії</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Періодичність створення</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Резервне копіювання через мобільний інтернет</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Вимкнути й видалити резервну копію</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Резервну копію видалено, копіювання вимкнено.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Тип резервного копіювання змінено, а підписку скасовано</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Підписку скасовано</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Завантаження завершено</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Тип резервного копіювання</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Резервне копіювання вимкнено</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/місяць</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Увімкнути резервне копіювання</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Найновіша резервна копія</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s, %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Відсутня</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Створити копію зараз</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Вимкнути й видалити резервну копію?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Плату не буде стягнуто повторно. Ми видалимо вашу резервну копію і не створюватимемо нову.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Вимкнути й видалити</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Видалення резервної копії…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Резервну копію видалено</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Треба натиснути «Створити копію зараз»"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Щодня</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Щотижня</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Щомісяця</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Створювати вручну</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Уведіть PIN-код пристрою, пароль або графічний ключ.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Далі</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Змінити тип резервного копіювання</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Скасувати передплату</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Підтвердити скасування резервного копіювання</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Плату не буде стягнуто повторно. Резервне копіювання буде вимкнено, коли спливе розрахунковий період. Після цього ви матимете 30 днів, щоб завантажити медіафайли з поточної резервної копії.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Підтвердити й завантажити зараз</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Підтвердити й завантажити пізніше</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Продовжити передплату</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index db9cbaad0e..654a44a3d7 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal کی تجدید ہورہی ہے۔۔۔</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly کی تجدید ہورہی ہے۔۔۔</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">آپ نے ابھی تک اپنا پاس فریز منتخب نہيں کیا!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">پاس فریز معطل کرنا ہے؟</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">یہ آپ کے Signal اور پیغامات کی اطلاعات کو ہمیشہ کیلئے اَن لاک کردے گا۔</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">یہ آپ کے Molly اور پیغامات کی اطلاعات کو ہمیشہ کیلئے اَن لاک کردے گا۔</string>
     <string name="ApplicationPreferencesActivity_disable">معطل کریں</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">سرور سے رابطے میں غلطی!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">اندراج کے لاک کیلئے PINs کی ضرورت ہے۔ PIN کو غیر فعال کرنے کیلئے ، براہ کرم پہلے رجسٹریشن لاک کو غیر فعال کریں۔</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">فائل</string>
     <string name="AttachmentKeyboard_contact">رابطہ</string>
     <string name="AttachmentKeyboard_location">مقام</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal کو آپ کی تصاویر اور ویڈیوز دکھانے کے لیے اجازت کی ضرورت ہوتی ہے</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly کو آپ کی تصاویر اور ویڈیوز دکھانے کے لیے اجازت کی ضرورت ہوتی ہے</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">رسائی کی اجازت دیں</string>
     <string name="AttachmentKeyboard_payment">ادائیگی</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">میڈیا کے انتخاب کیلئے کوئی ایپ نہیں مل سکتی۔</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal کو آڈیو، ویڈیو، تصاویر وغیرہ منسلک کرنے کیلئے سٹوریج اجازت کی ضرورت ہوتی ہے، لیکن اس کی مستقل طور پر نفی کر دی گئی ہے ۔ برائے مہربانی ایپ ترتیبات کی فہرست میں جائیں، \"منظوری\" منتخب کریں، اور \"اسٹوریج\" فعال کریں۔</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">رابطوں کی معلومات لینے کیلئے Signal کو رابطوں کی منظوری کی ضرورت ہوتی ہے، لیکن اس کی ہمیشہ کیلئے نفی کردی گئی ہے۔ براہ کرم ایپ ترتیبات کی فہرست میں جاکر \"منظوری\" کا انتخاب کریں،اور \"رابطے\" فعال کریں۔</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal کو مقام سے منسلک کرنے کیلئے مقام کی منظوری کی ضرورت ہے،لیکن اس کی مستقل طور پر نفی کردی گئی ہے۔ براہ کرم ایپ ترتیبات کی فہرست میں جائیں\"منظوری\" منتخب کریں، اور \"مقام\" فعال کریں۔</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly کو آڈیو، ویڈیو، تصاویر وغیرہ منسلک کرنے کیلئے سٹوریج اجازت کی ضرورت ہوتی ہے، لیکن اس کی مستقل طور پر نفی کر دی گئی ہے ۔ برائے مہربانی ایپ ترتیبات کی فہرست میں جائیں، \"منظوری\" منتخب کریں، اور \"اسٹوریج\" فعال کریں۔</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">رابطوں کی معلومات لینے کیلئے Molly کو رابطوں کی منظوری کی ضرورت ہوتی ہے، لیکن اس کی ہمیشہ کیلئے نفی کردی گئی ہے۔ براہ کرم ایپ ترتیبات کی فہرست میں جاکر \"منظوری\" کا انتخاب کریں،اور \"رابطے\" فعال کریں۔</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly کو مقام سے منسلک کرنے کیلئے مقام کی منظوری کی ضرورت ہے،لیکن اس کی مستقل طور پر نفی کردی گئی ہے۔ براہ کرم ایپ ترتیبات کی فہرست میں جائیں\"منظوری\" منتخب کریں، اور \"مقام\" فعال کریں۔</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">اپنے مقام تک رسائی کی اجازت دیں</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">اپنا مقام بھیجنے کے لیے:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">اپنا مقام بھیجنے کے لیے Signal کو رسائی کی اجازت دیں۔</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">اپنا مقام بھیجنے کے لیے Molly کو رسائی کی اجازت دیں۔</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal کو آپ کا مقام بھیجنے کے لیے مقام تک رسائی کی ضرورت ہوتی ہے۔</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly کو آپ کا مقام بھیجنے کے لیے مقام تک رسائی کی ضرورت ہوتی ہے۔</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">اسٹوریج تک رسائی کی اجازت دیں</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">تصاویر اور ویڈیوز دکھانے کے لیے:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal کو آپ کی تصاویر اور ویڈیوز دکھانے کے لیے اسٹوریج تک رسائی کی ضرورت ہوتی ہے۔</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly کو آپ کی تصاویر اور ویڈیوز دکھانے کے لیے اسٹوریج تک رسائی کی ضرورت ہوتی ہے۔</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s نے پیمنٹس فعال نہیں کیں </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">کیمرہ تبدیل کریں</string>
     <string name="CameraXFragment_open_gallery_description">گیلری کھولیں</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">رسائی کی اجازت دیں</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">اپنے کیمرے اور مائیکروفون تک رسائی کی اجازت دیں</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">اپنے کیمرے تک رسائی کی اجازت دیں</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">اپنے مائیکروفون تک رسائی کی اجازت دیں</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">تصاویر بنانے کے لیے، Signal کو کیمرے تک رسائی کی اجازت دیں۔</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">تصویریں اور ویڈیو بنانے کے لیے ، Signal کو کیمرہ تک رسائی کی ضرورت ہے</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">تصاویر اور ویڈیو بنانے کے لیے، Signal کو کیمرے اور مائیکرو فون تک رسائی کی اجازت دیں۔</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">آواز کے ساتھ ویڈیوز بنانے کے لیے، Signal کو اپنے مائیکرو فون تک رسائی کی اجازت دیں۔</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">QR کوڈ اسکین کرنے کے لیے، Signal کو کیمرے تک رسائی کی اجازت دیں۔</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal کو تصویر بنانے کے لیے کیمرے تک رسائی درکار ہے</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal کو QR کوڈز اسکین کرنے کے لیے کیمرے تک رسائی درکار ہے</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal کو ویڈیو بنانے کے لیے مائیکروفون تک رسائی درکار ہے</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Signal میں تصاویر بنانے کے لیے:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Signal میں تصاویر اور ویڈیوز بنانے کے لیے:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">آواز کے ساتھ ویڈیوز بنانے کے لیے:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">QR کوڈز اسکین کرنے کے لیے:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">موجودہ رابطے</string>
@@ -271,7 +272,7 @@
     <string name="CameraContacts_no_signal_contacts">کوئی Signal رابطے نہیں ہیں</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Signal رابطوں کو تصاویر بھیجنے کیلئے آپ صرف کیمرہ بٹن استعمال کرسکتے ہیں۔ </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">یہ پتہ نہیں چلا سکتے کہ آپ کسے تلاش کر رہے ہیں؟</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">کسی رابطے کو Signal میں شامل ہونے کے لیے دعوت دیں۔</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">کسی رابطے کو Molly میں شامل ہونے کے لیے دعوت دیں۔</string>
     <string name="CameraContacts__menu_search">تلا ‎ش کر یں</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -285,12 +286,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">نہیں شکریہ</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Signal اپ ڈیٹ کریں</string>
+    <string name="ClientDeprecatedActivity_update_signal">Molly اپ ڈیٹ کریں</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">ایپ کا یہ ورژن اب تعاون یافتہ نہیں ہے۔ پیغامات بھیجنا اور وصول کرنا جاری رکھنے کیلئے ، تازہ ترین ورژن میں تازہ کاری کریں۔</string>
     <string name="ClientDeprecatedActivity_update">اَپ ڈیٹ</string>
     <string name="ClientDeprecatedActivity_dont_update">اپ ڈیٹ مت کریں</string>
     <string name="ClientDeprecatedActivity_warning">انتباہ</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">آپ کے Signal ورژن کی میعاد ختم ہو چکی ہے۔ آپ اپنے میسج کی ہسٹری دیکھ سکتے ہیں لیکن جب تک آپ اپ ڈیٹ نہیں کرتے تب تک آپ میسجز بھیج یا وصول نہیں کر پائیں گے۔</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">آپ کے Molly ورژن کی میعاد ختم ہو چکی ہے۔ آپ اپنے میسج کی ہسٹری دیکھ سکتے ہیں لیکن جب تک آپ اپ ڈیٹ نہیں کرتے تب تک آپ میسجز بھیج یا وصول نہیں کر پائیں گے۔</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">کوئی ویب براؤزر نہیں ملا۔</string>
@@ -327,8 +328,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">پیغام %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly وائس کال %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly ویڈیو کال %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -422,7 +423,7 @@
     <string name="ConversationActivity_transport_signal">Signal پیغام</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">پیغام بھیجیں</string>
-    <string name="ConversationActivity_lets_switch_to_signal">چلیں Signal کو چلاتے ہیں%1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">چلیں Molly کو چلاتے ہیں%1$s</string>
     <string name="ConversationActivity_specify_recipient">براۓ مہربانی رابطہ منتخب کریں</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">جو پیغام آپ بھیج رہے ہیں منسلک ہونے کیلئے اس کا حجم حد سے زیادہ ہے۔</string>
     <string name="ConversationActivity_unable_to_record_audio">آڈیو ریکارڈ کرنے کے قابل نہیں ہے! ؐ</string>
@@ -441,18 +442,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">آڈیو پیغامات بھیجنے کے لیے:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">صوتی میسجز بھیجنے کے لیے، اپنے مائیکروفون تک Signal کو رسائی کی اجازت دیں۔</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">صوتی میسجز بھیجنے کے لیے، اپنے مائیکروفون تک Molly کو رسائی کی اجازت دیں۔</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal کو صوتی میسج ریکارڈ کرنے کے لیے مائیکروفون تک رسائی درکار ہوتی ہے۔</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal کو آڈیو پیغامات بھیجنے کے لیے مائکروفون کی اجازت کی ضرورت ہے، لیکن اس کی مستقل طور پر نفی کردی گئی ہے ۔ برائے مہربانی ایپ کی ترتیبات میں جائیں، \"منظوری\"، منتخب کریں، اور \"مائکروفون\" فعال کریں۔</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly کو صوتی میسج ریکارڈ کرنے کے لیے مائیکروفون تک رسائی درکار ہوتی ہے۔</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly کو آڈیو پیغامات بھیجنے کے لیے مائکروفون کی اجازت کی ضرورت ہے، لیکن اس کی مستقل طور پر نفی کردی گئی ہے ۔ برائے مہربانی ایپ کی ترتیبات میں جائیں، \"منظوری\"، منتخب کریں، اور \"مائکروفون\" فعال کریں۔</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s کال کیلئے Signal کو مائکروفون اور کیمرہ کی منظوری کی ضرورت ہوتی ہے، لیکن ان کی مستقل طور پر نفی کر دی گئی ہے ۔ برائے مہربانی ایپ کی ترتیبات میں جائیں، \"منظوری\" منتخب کریں، اور \"مائکروفون\" اور \"کیمرہ\"کو فعال کریں۔</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">تصویریں اور ویڈیو بنانے کے لیے ، Signal کو کیمرہ تک رسائی کی ضرورت ہے</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal کو ویڈیو اور تصویریں بنانے کے لیے کیمرہ کی اجازت کی ضرورت ہے، لیکن یہ مستقل طور پر تسلیم نہیں ہوں گے۔ برائے مہربانی ایپ کی ترتیبات میں جائیں، \"منظوری\" منتخب کریں۔ اور \"کیمرہ\" فعال کریں۔</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal کو ویڈیو اور تصویریں بنانے کیلئے کیمرہ کی اجازت کی ضرورت ہوتی ہے۔</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">%1$s کال کیلئے Molly کو مائکروفون اور کیمرہ کی منظوری کی ضرورت ہوتی ہے، لیکن ان کی مستقل طور پر نفی کر دی گئی ہے ۔ برائے مہربانی ایپ کی ترتیبات میں جائیں، \"منظوری\" منتخب کریں، اور \"مائکروفون\" اور \"کیمرہ\"کو فعال کریں۔</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">تصویریں اور ویڈیو بنانے کے لیے ، Molly کو کیمرہ تک رسائی کی ضرورت ہے</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly کو ویڈیو اور تصویریں بنانے کے لیے کیمرہ کی اجازت کی ضرورت ہے، لیکن یہ مستقل طور پر تسلیم نہیں ہوں گے۔ برائے مہربانی ایپ کی ترتیبات میں جائیں، \"منظوری\" منتخب کریں۔ اور \"کیمرہ\" فعال کریں۔</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly کو ویڈیو اور تصویریں بنانے کیلئے کیمرہ کی اجازت کی ضرورت ہوتی ہے۔</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">آواز کے ساتھ ویڈیو بنانے کے لیے مائکروفون کی اجازت کو فعال کریں۔</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal کو ویڈیو ریکارڈ کرنے کے لیے مائکروفون کی اجازت کی ضرورت ہے، لیکن وہ تسلیم نہیں ہوں گے۔ برائے مہربانی ایپ کی ترتیبات میں جائیں، \"اجازت نامہ\" منتخب کریں، \"مائکروفون\" اور \"کیمرہ\" کو فعال کریں۔</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal کو ویڈیو ریکارڈ کرنے کے لیے مائکروفون کی اجازت کی ضرورت ہے۔</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly کو ویڈیو ریکارڈ کرنے کے لیے مائکروفون کی اجازت کی ضرورت ہے، لیکن وہ تسلیم نہیں ہوں گے۔ برائے مہربانی ایپ کی ترتیبات میں جائیں، \"اجازت نامہ\" منتخب کریں، \"مائکروفون\" اور \"کیمرہ\" کو فعال کریں۔</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly کو ویڈیو ریکارڈ کرنے کے لیے مائکروفون کی اجازت کی ضرورت ہے۔</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
     <string name="ConversationActivity_no">نہیں</string>
@@ -473,9 +474,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">کال شروع کرنے کے لیے:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">کال شروع کرنے کے لیے، اپنے مائیکروفون تک Signal کو رسائی کی اجازت دیں۔</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">کال شروع کرنے کے لیے، اپنے مائیکروفون تک Molly کو رسائی کی اجازت دیں۔</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal کو کال شروع کرنے کے لیے مائیکروفون تک رسائی درکار ہوتی ہے۔</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly کو کال شروع کرنے کے لیے مائیکروفون تک رسائی درکار ہوتی ہے۔</string>
 
 
     <string name="ConversationActivity_join">شامل ہوں</string>
@@ -489,9 +490,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">SMS میسیجنگ Signal میں مزید سپورٹ نہیں کیا جاتا۔ گفتگو کو یہاں رکھنے کے لیے %1$s کو Signal پر مدعو کریں۔</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">یہ شخص Signal مزید استعمال نہیں کر رہا ہے۔ گفتگو کو یہاں جاری رکھنے کے لیے انہیں Signal پر مدعو کریں۔</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">یہ شخص Molly مزید استعمال نہیں کر رہا ہے۔ گفتگو کو یہاں جاری رکھنے کے لیے انہیں Molly پر مدعو کریں۔</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Signal میں مدعو کریں</string>
+    <string name="ConversationActivity__invite_to_signal">Molly میں مدعو کریں</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">آپ کو جلد ہی دوبارہ یاد دہانی کروائی جائے گی۔</string>
 
@@ -545,6 +546,8 @@
     <string name="ConversationFragment_delete_for_everyone">سب کے لئے حذف کریں</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">اس ڈیوائس سے ڈیلیٹ کریں</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">حذف کریں</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">ہر جگہ سے ڈیلیٹ کریں</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">اگر ان کے پاس Signal کا تازہ ترین ورژن موجود ہے تو یہ میسج چیٹ میں سب کے لیے حذف ہو جائے گا۔ وہ یہ دیکھ سکیں گے کہ آپ نے کوئی میسج حذف کر دیا ہے۔</string>
@@ -576,13 +579,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">بلاک کر دیا گیا</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Signal اپ ڈیٹ کریں</string>
+    <string name="ConversationFragment__update_build">Molly اپ ڈیٹ کریں</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Signal کو دوبارہ رجسٹر کریں</string>
+    <string name="ConversationFragment__reregister_signal">Molly کو دوبارہ رجسٹر کریں</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">دوبارہ نیویگیٹ کریں۔</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Signal کھولیں</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Molly کھولیں</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">مزید تصدیق شدہ نہیں ہے</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -647,6 +650,11 @@
         <item quantity="one">اس سے منتخب کردہ چیٹ مستقل طور پر حذف ہو جائے گی۔</item>
         <item quantity="other">اس سے منتخب کردہ تمام %1$d چیٹس مستقل طور پر حذف ہو جائیں گی۔</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">ایسا کرنا آپ کی تمام ڈیوائسز سے منتخب کردہ چیٹ کو مستقل طور پر حذف کر دے گا۔</item>
+        <item quantity="other">یہ آپ کی تمام ڈیوائسز سے %1$d منتخب کردہ تمام چیٹس کو مستقل طور پر حذف کر دے گا۔</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">حذف ہو رہا ہے</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">منتخب کردہ چیٹ حذف کر رہے ہیں…</item>
@@ -736,9 +744,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">کون مجھے نمبر کے ذریعے تلاش کر سکتا ہے؟</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">کوئی بھی ایسا شخص جس کے پاس آپ کا فون نمبر ہے وہ دیکھے گا کہ آپ Signal پر ہیں اور آپ کے ساتھ چیٹ شروع کر سکے گا۔</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">کوئی بھی ایسا شخص جس کے پاس آپ کا فون نمبر ہے وہ دیکھے گا کہ آپ Molly پر ہیں اور آپ کے ساتھ چیٹ شروع کر سکے گا۔</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">کوئی بھی اس وقت تک دیکھ نہیں پائے گا کہ آپ Signal پر ہیں جب تک آپ انہیں میسج نہیں کرتے یا ان کے ساتھ آپ کی کوئی پہلے سے موجود چیٹ ہو۔</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">کوئی بھی اس وقت تک دیکھ نہیں پائے گا کہ آپ Molly پر ہیں جب تک آپ انہیں میسج نہیں کرتے یا ان کے ساتھ آپ کی کوئی پہلے سے موجود چیٹ ہو۔</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">بیک اپ سے بحال کریں؟</string>
@@ -772,7 +780,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">اپنے بیک اپ پاسفریج کی جانچ کریں اور تصدیق کریں کہ یہ مماثل ہے</string>
     <string name="BackupsPreferenceFragment__turn_on">آن کر دو</string>
     <string name="BackupsPreferenceFragment__turn_off">بند کریں</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"بیک اپ بحال کرنے کے لئے ، Signal کی ایک نئی کاپی انسٹال کریں۔ ایپ کھولیں اور \"بحال بیک اپ\" پر ٹیپ کریں ، پھر بیک اپ فائل کو تلاش کریں۔%1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"بیک اپ بحال کرنے کے لئے ، Molly کی ایک نئی کاپی انسٹال کریں۔ ایپ کھولیں اور \"بحال بیک اپ\" پر ٹیپ کریں ، پھر بیک اپ فائل کو تلاش کریں۔%1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">مزید پڑھیں</string>
     <string name="BackupsPreferenceFragment__in_progress">کام جاری ہے…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -780,7 +788,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d اب تک…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% اب تک…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">بیک اپ بنانے کیلئے Signal کو بیرونی اسٹوریج کی اجازت درکار ہوتی ہے ، لیکن مستقل طور پر اس کی تردید کردی گئی ہے۔ براہ کرم ایپ کی ترتیبات جاری رکھیں ، \"اجازت\" منتخب کریں اور \"اسٹوریج\" کو فعال کریں۔</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">بیک اپ بنانے کیلئے Molly کو بیرونی اسٹوریج کی اجازت درکار ہوتی ہے ، لیکن مستقل طور پر اس کی تردید کردی گئی ہے۔ براہ کرم ایپ کی ترتیبات جاری رکھیں ، \"اجازت\" منتخب کریں اور \"اسٹوریج\" کو فعال کریں۔</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">بیک اپ ٹائم سیٹ کریں</string>
 
@@ -847,7 +855,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">چیٹ سیشن ریفریش ہو گیا</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal اینڈ ٹو اینڈ انکرپشن استعمال کرتا ہے اور اسے بعض اوقات آپ کے چیٹ سیشن کو ری فریش کرنے کی ضرورت پڑ سکتی ہے۔ اس سے آپ کے چیٹ کی سکیورٹی متاثر نہیں ہو گی ، لیکن ہو سکتا ہے کہ آپ نے اس رابطے کی طرف سے کوئی میسج مس کر دیا ہو، اور آپ ان سے اسے دوبارہ بھیجنے کے لیے کہہ سکتے ہیں۔</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly اینڈ ٹو اینڈ انکرپشن استعمال کرتا ہے اور اسے بعض اوقات آپ کے چیٹ سیشن کو ری فریش کرنے کی ضرورت پڑ سکتی ہے۔ اس سے آپ کے چیٹ کی سکیورٹی متاثر نہیں ہو گی ، لیکن ہو سکتا ہے کہ آپ نے اس رابطے کی طرف سے کوئی میسج مس کر دیا ہو، اور آپ ان سے اسے دوبارہ بھیجنے کے لیے کہہ سکتے ہیں۔</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">ڈیسک ٹاپ یا iPad پر Signal استعمال کریں۔ آپ کے میسجز آپ کی لنک کردہ ڈیوائسز کے ساتھ سنک ہوں گے۔</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">ایک نئی ڈیوائس لنک کریں</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">تمام ڈیوائسز پر %1$s کے میسجز اور چیٹ کی معلومات کلی طور پر انکرپشن کے ذریعے محفوظ کی جاتی ہیں</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">ڈیسک ٹاپ یا iPad پر Signal</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">لنک کردہ ڈیوائسز پر تمام میسجنگ نجی ہے</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Molly کے لنک ہونے کے بعد آپ کے موبائل فون پر Molly میسجز اس کے ساتھ ہم وقت ساز ہوتے ہیں۔ آپ کی پچھلی میسج ہسٹری ظاہر نہیں ہو گی۔</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">اپنی دوسری ڈیوائس پر، Molly کو انسٹال کرنے کے لیے %1$s پر جائیں</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">میری لنک کردہ ڈیوائسز</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">غیر منسلک</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s غیر منسلک کر دی گئی</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">ڈیوائس منسلک ہو رہی ہے…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">ڈیوائس کی منظوری دے دی گئی</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">لوڈ ہو رہا ہے۔۔۔</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">کوئی لنک کردہ ڈیوائسز نہیں</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">ڈیوائس لنک کرنے کے لیے ان لاک کریں</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">ڈیوائس سے لنک کرنے کے لیے ڈسپلے کردہ QR کوڈ کو اسکین کریں۔</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">QR کوڈ سکین کریں</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">اس ڈیوائس کو استعمال کرتے ہوئے جس ڈیوائس کو آپ منسلک کرنا چاہتے ہیں اس پر ڈسپلے کردہ QR کوڈ کو اسکین کریں</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">ٹھیک ہے</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">یہ ڈیوائس آپ کے گروپس اور رابطوں کو دیکھنے، آپ کی چیٹس تک رسائی حاصل کرنے اور آپ کے نام سے پیغامات بھیجنے کے قابل ہو گی۔</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">اپنی دوسری ڈیوائس پر لنکنگ کو مکمل کریں</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">اپنی دوسری ڈیوائس پر Molly کی لنکنگ کو مکمل کریں۔</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">مشین لنک کرنے میں ناکامی</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">یہ QR کوڈ درست نہیں ہے۔براہ کرم آپ جس لنک کو ڈیوائس پر ڈسپلیڈ کرنا چاہتے ہیں اور یقینی بنائیں کہ آپ QR کوڈ سکین کر رہے ہیں۔</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">دوبارہ کوشش کریں</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">غیر منسلک\'%1$s؟</string>
@@ -869,10 +932,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">غائب پلے سروسز بہتر بنائیں</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">یہ ڈیوائس پلے سروسز کا تعاون نہیں کرتی ہے۔ سسٹم کی بیٹری کی اصلاح کو غیر فعال کرنے کیلئے ٹیپ کریں جو Signal کو غیر فعال ہونے پر پیغامات کی بازیافت سے روکتی ہیں۔</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">یہ ڈیوائس پلے سروسز کا تعاون نہیں کرتی ہے۔ سسٹم کی بیٹری کی اصلاح کو غیر فعال کرنے کیلئے ٹیپ کریں جو Molly کو غیر فعال ہونے پر پیغامات کی بازیافت سے روکتی ہیں۔</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Signal کا یہ ورژن ختم ہوگیا ہے۔ پیغامات بھیجنے اور موصول کرنے کے لئے ابھی اپ ڈیٹ کریں۔</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Molly کا یہ ورژن ختم ہوگیا ہے۔ پیغامات بھیجنے اور موصول کرنے کے لئے ابھی اپ ڈیٹ کریں۔</string>
     <string name="ExpiredBuildReminder_update_now">تازہ ترین کریں.</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -883,8 +946,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">دیکھیں</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Signal مواصلات مستقل ہونے میں ناکامی!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal گوگل پلے سروسز کے ساتھ رجسٹر ہونے کے قابل نہیں تھا۔Signal پیغامات اور کالیں غیر فعال ہو چکے ہیں،براہ کرم ترتیبات میں دوبارہ رجسٹر کرنے کی کوشش کریں اور ایڈوانس میں جائیں۔</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Molly مواصلات مستقل ہونے میں ناکامی!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly گوگل پلے سروسز کے ساتھ رجسٹر ہونے کے قابل نہیں تھا۔Molly پیغامات اور کالیں غیر فعال ہو چکے ہیں،براہ کرم ترتیبات میں دوبارہ رجسٹر کرنے کی کوشش کریں اور ایڈوانس میں جائیں۔</string>
 
 
     <!-- GiphyActivity -->
@@ -1028,15 +1091,25 @@
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">بیٹری کی اصلاحات کی وجہ سے اطلاعات میں تاخیر ممکن ہے</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">آپ میسج کی اطلاعات میں تاخیر سے بچاؤ کو یقینی بنانے کے لیے بیٹری کی اصلاحات کو Signal کے لیے غیر فعال کر سکتے ہیں۔</string>
+    <string name="PromptBatterySaverBottomSheet__message">آپ میسج کی اطلاعات میں تاخیر سے بچاؤ کو یقینی بنانے کے لیے بیٹری کی اصلاحات کو Molly کے لیے غیر فعال کر سکتے ہیں۔</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">بیٹری کی اصلاحات کی وجہ سے اطلاعات میں تاخیر ممکن ہے</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">میسج کی اطلاعات میں تاخیر نہ ہونے کے لیے Molly کے لیے بیٹری کی بہتریوں کو غیر فعال کرنا یقینی بنائیں۔ ڈیوائس سے متعلق خاص ہدایات دیکھنے کے لیے \"جاری رکھیں\" پر ٹیپ کریں۔</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">نہیں شکریہ</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">جاری رکھیں</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">جاری رکھیں</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">منسوخ کریں</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">نہیں شکریہ</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">زیر التواء گروپ دعوت نامے</string>
+    <string name="PendingMembersActivity_pending_group_invites">درخواستیں &amp; دعوتیں</string>
     <string name="PendingMembersActivity_requests">درخواستیں</string>
     <string name="PendingMembersActivity_invites">دعوت نامے</string>
     <string name="PendingMembersActivity_people_you_invited">جن لوگوں کو آپ نے مدعو کیا</string>
@@ -1283,13 +1356,13 @@
     <string name="InviteActivity_cancel">منسوخ کریں</string>
     <string name="InviteActivity_sending">بھیج رہا ہے۔۔۔</string>
     <string name="InviteActivity_invitations_sent">دعوت نامے بھیجے گئے ہیں!</string>
-    <string name="InviteActivity_invite_to_signal">Signal میں مدعو کریں</string>
+    <string name="InviteActivity_invite_to_signal">Molly میں مدعو کریں</string>
     <string name="InviteActivity_send_sms">SMS بھیجیں (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="one">%1$d ایس ایم ایس دعوت نامہ بھیجے؟</item>
         <item quantity="other">%1$d ایس ایم ایس دعوت نامے بھیجے؟</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Signal میں سو ئچ کریں:%1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Molly میں سو ئچ کریں:%1$s</string>
     <string name="InviteActivity_no_app_to_share_to">ایسا لگتا ہے جیسے آپ کے پاس اشتراک کرنے کیلئے کوئی ایپ نہیں ہے۔</string>
 
     <!-- LearnMoreTextView -->
@@ -1303,7 +1376,7 @@
     <string name="LongMessageActivity_your_message">آپ کا پیغام</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">پس منظر رابطہ فعال ہو چکا ہے</string>
 
     <!-- MediaOverviewActivity -->
@@ -1372,10 +1445,10 @@
     <string name="MessageQuotesBottomSheet_replies">جوابات</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal کال قائم ہو رہی ہے</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly کال قائم ہو رہی ہے</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Signal کال سروس شروع کر رہے ہیں</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal کال سروس روکنا</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Molly کال سروس شروع کر رہے ہیں</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly کال سروس روکنا</string>
     <string name="NotificationBarManager__cancel_call">کال منسوخ کریں</string>
 
     <!-- NotificationsMegaphone -->
@@ -1627,6 +1700,14 @@
     <string name="MessageRecord_you_activated_payments">آپ نے پیمنٹس فعال کر دی ہیں</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s اب پیمنٹس قبول کر سکتا ہے</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">پیمنٹس کی تفصیلات دستیاب نہیں ہیں</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">مزید کے لیے ٹیپ کریں</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">پیمنٹ کی تفصیلات دستیاب نہیں</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">اس پیمنٹ کی یہ تفصیلات دستیاب نہیں ہیں کیونکہ آپ کے میسجز ایک ایسے ذریعہ سے بحال کیے گئے تھے جس میں پیمنٹ کی یہ ہسٹری شامل نہیں تھی۔ ایسا کرنا آپ کے والٹ کے بیلنس یا ماضی کی پیمنٹس کی حیثیت کو متاثر نہیں کرتا۔</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1683,9 +1764,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">آپ جلد ہی Signal سے SMS میسجز بھیجنے سے قاصر ہوں گے۔ گفتگو کو یہاں رکھنے کے لیے %1$s کو Signal پر مدعو کریں۔</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">آپ Signal میں مزید SMS میسجز نہیں بھیج سکتے۔ گفتگو کو یہاں رکھنے کے لیے %1$s کو Signal پر مدعو کریں۔</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">آپ Molly میں مزید SMS میسجز نہیں بھیج سکتے۔ گفتگو کو یہاں رکھنے کے لیے %1$s کو Molly پر مدعو کریں۔</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">پیمنٹ: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">پیمنٹ</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">اسپام کے طور پر رپورٹ کیا گیا</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1763,7 +1846,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Signal ڈیوائس منسلک کریں؟</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">ایسا لگتا ہے کہ آپ 3rd پارٹی اسکینر کا استعمال کرتے ہوئے Signal ڈیوائس سے منسلک کرنے کی کوشش کر رہے ہیں۔ آپ کے تحفظ کے لئے ، براہ کرم Signal میں سے دوبارہ کوڈ اسکین کریں۔</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal کو QR کوڈ سکین کرنے کیلئے کیمرہ کی اجازت کی ضرورت ہے، لیکن اس کو مستقل طور پر رد کر دیا گیا۔ براہ کرم ایپ کی ترتیبات میں جا کر\"اجازت نامہ\"کا انتخاب کریں اور \"کیمرہ\" کو فعال کریں۔</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly کو QR کوڈ سکین کرنے کیلئے کیمرہ کی اجازت کی ضرورت ہے، لیکن اس کو مستقل طور پر رد کر دیا گیا۔ براہ کرم ایپ کی ترتیبات میں جا کر\"اجازت نامہ\"کا انتخاب کریں اور \"کیمرہ\" کو فعال کریں۔</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">کیمرہ کی اجازت کے بغیر QR کوڈ سکین کرنا ممکن نہیں</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1776,11 +1859,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">پاسفریز داخل کریں</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal آئکن</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly آئکن</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">پاسفریز جمع کریں</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">غلط پاسفریز!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Signal ان لاک کریں</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - لاک اسکرین</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Molly ان لاک کریں</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - لاک اسکرین</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">نقشہ</string>
@@ -1847,7 +1930,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">پیغام رسانی جاری رکھنے کے لئے تصدیق کریں</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Signal پر اسپام کو روکنے میں مدد کے لئے ، براہ کرم تصدیق کریں۔</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Molly پر اسپام کو روکنے میں مدد کے لئے ، براہ کرم تصدیق کریں۔</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">تصدیق کرنے کے بعد ، آپ پیغام رسانی جاری رکھ سکتے ہیں۔ کوئی موقوف پیغامات خودبخود بھیجے جائیں گے۔</string>
 
     <!-- Recipient -->
@@ -1855,7 +1938,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">میری سٹوری</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal کال</string>
+    <string name="Recipient_signal_call">Molly کال</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">بلاک کریں</string>
@@ -1869,7 +1952,8 @@
     <string name="RedPhone_ringing">گھنٹی بج رہی ہے۔۔۔۔۔۔</string>
     <string name="RedPhone_busy">مصروف ہونا</string>
     <string name="RedPhone_recipient_unavailable">وصول کنندہ دستیاب نہیں</string>
-    <string name="RedPhone_network_failed">نیٹ ورک ناکام ہوگیا!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">نیٹ ورک ناکام ہوگیا! براہ کرم نیٹ ورک کنکشن چیک کریں اور دوبارہ کوشش کریں۔</string>
     <string name="RedPhone_number_not_registered">نمبر رجسٹر نہیں ہے!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">جو نمبر آپ نے ڈائل کیا ہے محفوظ آواز سپورٹ نہیں کر رہا!</string>
     <string name="RedPhone_got_it">سمجھ گیا</string>
@@ -1880,8 +1964,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">آپ کی ویڈیو کو ٹرن کرنے کیلئے یہاں کلک کریں</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s کو فون کرنے کے لئے ، Signal کو آپ کے کیمرے تک رسائی کی ضرورت ہے</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">%1$s کو فون کرنے کے لئے ، Molly کو آپ کے کیمرے تک رسائی کی ضرورت ہے</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">کالنگ…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">دوبارہ رابطہ ہو رہا ہے۔۔۔</string>
@@ -1935,10 +2019,30 @@
     <string name="WebRtcCallActivity__removed_from_call">کال سے ہٹا دیا گیا</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">کوئی شخص آپ کو کال سے ہٹا چکا ہے۔</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">اپنے کیمرے اور مائیکروفون تک رسائی کی اجازت دیں</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">اپنے مائیکروفون تک رسائی کی اجازت دیں</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">اپنے کیمرے تک رسائی کی اجازت دیں</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">کال شروع کرنے یا اس میں شامل ہونے کے لیے، Molly کو اپنے کیمرے اور مائیکرو فون تک رسائی کی اجازت دیں۔</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">کال شروع کرنے یا اس میں شامل ہونے کے لیے، Molly کو اپنے مائیکرو فون تک رسائی کی اجازت دیں۔</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">اپنی ویڈیو کواہل بنانے کے لیے، سگنل کو اپنے کیمرے تک رسائی کی اجازت دیں۔</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">سگنل کو کال شروع کرنے یا اس میں شامل ہونے کے لیے مائیکرو فون کی اجازت درکار ہے۔</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">آپ کی ویڈیو اہل بنانے کے لیے سگنل کو کیمرے تک رسائی کی ضرورت ہے</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">کال شروع کرنے یا اس میں شامل ہونے کے لیے:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">اپنی ویڈیو کو اہل کے لیے:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal کال</string>
-    <string name="WebRtcCallView__signal_video_call">Signal ویڈیو کال</string>
+    <string name="WebRtcCallView__signal_call">Molly کال</string>
+    <string name="WebRtcCallView__signal_video_call">Molly ویڈیو کال</string>
     <string name="WebRtcCallView__start_call">کال شروع کریں</string>
     <string name="WebRtcCallView__join_call">کال میں شامل ہوں</string>
     <string name="WebRtcCallView__call_is_full">کال پوری ہے</string>
@@ -2028,22 +2132,41 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">اپنا ہاتھ نیچے کریں؟</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">ہاتھ نیچے کریں</string>
+    <string name="CallOverflowPopupWindow__lower_hand">نیچے کریں</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">منسوخ کریں</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">آپ نے اپنا ہاتھ اٹھایا</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">دیکھیں</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s نے ہاتھ اٹھایا</item>
-        <item quantity="other">%1$s + %2$d نے ہاتھ اٹھایا</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s نے ہاتھ بلند کیا</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d نے ہاتھ بلند کیا</item>
+        <item quantity="other">%1$s + %2$d نے ہاتھ بلند کیا</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s نے ہاتھ بلند کیا</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d نے ہاتھ بلند کیا</item>
+        <item quantity="other">%1$s + %2$d نے ہاتھ بلند کیا</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="one">%1$s</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
@@ -2134,7 +2257,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">اس نمبر کی تصدیق کے لیئے آپ کو کال موصول ہوگی۔</string>
     <string name="RegistrationActivity_edit_number">نمبر ترتیب کرے</string>
     <string name="RegistrationActivity_missing_google_play_services">غائب گوگل پلے سروسز</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">یہ ڈیوائس Google Play خدمات کو حاصل کرنے سے قاصر ہے۔ اب بھی آپ Signal استعمال کر سکتے ہیں لیکن اس کنفگریشن سے کارکردگی میں فرق آسکتا ہے۔ n/n/اگر آپ ماہر صارف نہیں ہیں، اور کوئی aftermarket سے لیا ہوا Android ROM نہیں چلا رہے، یا اگر آپ اس کو غلطی کے طور پر دیکھ رہے ہیں تو براہِ کرم ٹربل شوٹنگ مدد حاصل کرنے کیلئے support@signal.org پر رابطہ کریں۔</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">یہ ڈیوائس Google Play خدمات کو حاصل کرنے سے قاصر ہے۔ اب بھی آپ Molly استعمال کر سکتے ہیں لیکن اس کنفگریشن سے کارکردگی میں فرق آسکتا ہے۔ n/n/اگر آپ ماہر صارف نہیں ہیں، اور کوئی aftermarket سے لیا ہوا Android ROM نہیں چلا رہے، یا اگر آپ اس کو غلطی کے طور پر دیکھ رہے ہیں تو براہِ کرم ٹربل شوٹنگ مدد حاصل کرنے کیلئے support@molly.im پر رابطہ کریں۔</string>
     <string name="RegistrationActivity_i_understand">میں سمجھ گیا</string>
     <string name="RegistrationActivity_play_services_error">گوگل پلے سروسز خرابی</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">گوگل پلے سروسز تجدید ہو رہی ہیں یا عارضی طور پر دستیاب نہیں۔ براہ کرم دوبارہ کوشش کریں۔</string>
@@ -2152,7 +2275,7 @@
     <string name="RegistrationActivity_non_standard_number_format">غیر معیاری ہندسوں کی ترتیب</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">آپ کا درج کردہ نمبر (%1$s) غیر معیاری فارمیٹ لگ رہا ہے۔\n\nکیا آپ کا مطلب %2$s ہے؟</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - فون نمبر کا فارمیٹ</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - فون نمبر کا فارمیٹ</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">کال کی درخواست کی گئی</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2186,8 +2309,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">رجسٹر کرنے میں دشواری کا سامنا ہے؟</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• یقینی بنائیں کہ SMS یا کال موصول کرنے کے لیے آپ کے فون میں سیلولر سگنل موجود ہیں\n • تصدیق کریں کہ آپ نمبر پر فون کال موصول کر سکتے ہیں\n •چیک کریں کہ آپ نے اپنا فون نمبر درست طریقے سے درج کیا ہے۔</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">مزید معلومات کے لیے، ٹربل شوٹنگ کے ان اقدامات پر عمل کریں یا سپورٹ سے رابطہ کریں</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">براہ کرم، مزید معلومات کے لیے، %1$s یا %2$s کی پیروی کریں</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">ٹربل شوٹنگ کے یہ اقدامات</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2225,13 +2348,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">رابطوں میں شامل کریں</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Signal میں مدعو کریں</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Molly میں مدعو کریں</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal پیغام</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal کال</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">رابطوں میں شامل کریں</string>
-    <string name="SharedContactView_invite_to_signal">Signal میں مدعو کریں</string>
+    <string name="SharedContactView_invite_to_signal">Molly میں مدعو کریں</string>
     <string name="SharedContactView_message">Signal پیغام</string>
 
     <!-- SignalBottomActionBar -->
@@ -2362,11 +2485,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s کا تعلق %2$s سے ہے</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal اپ ڈیٹ</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal کا نیا ورژن دستیاب ہے۔ اپ ڈیٹ کرنے کے لیے ٹیپ کریں۔</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal اپ ڈیٹ ہونے میں ناکامی</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly اپ ڈیٹ</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly کا نیا ورژن دستیاب ہے۔ اپ ڈیٹ کرنے کے لیے ٹیپ کریں۔</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly اپ ڈیٹ ہونے میں ناکامی</string>
     <string name="ApkUpdateNotifications_failed_general_body">ہم کچھ دیر بعد دوبارہ کوشش کریں گے۔</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal کامیابی کے ساتھ اپ ڈیٹ کر دیا گیا</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly کامیابی کے ساتھ اپ ڈیٹ کر دیا گیا</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">آپ خودکار طور پر %1$s ورژن پر اپ ڈیٹ ہو گئے تھے۔</string>
 
     <!-- UntrustedSendDialog -->
@@ -2437,7 +2560,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">ہمارا Signal حفاظتی نمبر:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">ایسا لگتا ہے جیسے آپ کے پاس اشتراک کرنے کیلئے کوئی ایپ نہیں ہے۔</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">کلپ بورڈ میں موازنہ کرنے کیلئے کوئی حفاظتی نمبر نہیں ملا</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal کو QR کوڈ سکین کرنے کیلئے کیمرہ کی اجازت کی ضرورت ہے، لیکن اس کو مستقل طور پر رد کر دیا گیا۔ براہ کرم ایپ کی ترتیبات میں جا کر\"اجازت نامہ\"کا انتخاب کریں اور \"کیمرہ\" کو فعال کریں۔</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly کو QR کوڈ سکین کرنے کیلئے کیمرہ کی اجازت کی ضرورت ہے، لیکن اس کو مستقل طور پر رد کر دیا گیا۔ براہ کرم ایپ کی ترتیبات میں جا کر\"اجازت نامہ\"کا انتخاب کریں اور \"کیمرہ\" کو فعال کریں۔</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">کیمرہ کی اجازت کے بغیر QR کوڈ سکین کرنا ممکن نہیں</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">%1$s کے حفاظتی نمبر کو دیکھنے کے لیئے آپ کو پہلے پیغامات کا تبادلہ کرنا ہوگا۔</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2467,14 +2590,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">کھولنے کیلئے ٹچ کریں۔</string>
-    <string name="KeyCachingService_passphrase_cached">Signal کھلا ہے</string>
-    <string name="KeyCachingService_lock">Signal لاک کریں</string>
+    <string name="KeyCachingService_passphrase_cached">Molly کھلا ہے</string>
+    <string name="KeyCachingService_lock">Molly لاک کریں</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">تم</string>
     <string name="MediaPreviewActivity_unssuported_media_type">غیر معاون قسم کا میڈیا</string>
     <string name="MediaPreviewActivity_draft">مسودہ تیار ہے</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal کو بیرونی ذخیرہ کو محفوظ کرنے کیلئے اسٹورج کی اجازت کی ضرورت ہے، لیکن اس کو مستقل طور پر رد کر دیا گیا ہے۔ براہ کرم ایپ کی ترتیبات میں جا کر \"اجازت نامہ\" کا انتخاب کریں، اور\"اسٹورج \" کو فعال کریں۔</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly کو بیرونی ذخیرہ کو محفوظ کرنے کیلئے اسٹورج کی اجازت کی ضرورت ہے، لیکن اس کو مستقل طور پر رد کر دیا گیا ہے۔ براہ کرم ایپ کی ترتیبات میں جا کر \"اجازت نامہ\" کا انتخاب کریں، اور\"اسٹورج \" کو فعال کریں۔</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">اجازت کے بغیر بیرونی ذخیرہ کو محفوظ کرنے کے قابل نہیں</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">پیغام حذف کریں؟</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">یہ مستقل طور پر یہ پیغام حذف کر دے گا۔</string>
@@ -2518,7 +2641,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">پیغام بھیجنے میں ناکامی۔</string>
     <string name="MessageNotifier_error_delivering_message">پیغام کی فراہمی میں خرابی ہو رہی ہے۔</string>
     <string name="MessageNotifier_message_delivery_paused">پیغام کی فراہمی رک گئی۔</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Signal پر پیغام رسانی جاری رکھنے کے لئے توثیق کریں۔</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Molly پر پیغام رسانی جاری رکھنے کے لئے توثیق کریں۔</string>
     <string name="MessageNotifier_mark_all_as_read">تمام پڑھنے کے طور پر نشان لگائیں</string>
     <string name="MessageNotifier_mark_read">پڑھے ہوئے پر نشان لگائیں</string>
     <string name="MessageNotifier_turn_off_these_notifications">ان اطلاعات کو آف کریں</string>
@@ -2540,7 +2663,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">آپ کے اسٹیکر پر %1$s ری ایکٹ کیا۔</string>
     <string name="MessageNotifier_this_message_was_deleted">یہ پیغام حذف کردیا گیا تھا۔</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">رابطے میں شامل Signal اطلاعات بند کردیں؟ آپ انہیں Signal &amp; gt میں دوبارہ فعال کرسکتے ہیں۔ ترتیبات &amp; gt؛ اطلاعات۔</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">رابطے میں شامل Molly اطلاعات بند کردیں؟ آپ انہیں Molly &amp; gt میں دوبارہ فعال کرسکتے ہیں۔ ترتیبات &amp; gt؛ اطلاعات۔</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2579,7 +2702,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">جب Signal لاک ہو فوری جواب دستیاب نہیں!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">جب Molly لاک ہو فوری جواب دستیاب نہیں!</string>
     <string name="QuickResponseService_problem_sending_message">پیغام بھیجنے میں مسئلہ ہو رہا ہے!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2599,7 +2722,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">غلط شارٹ کٹ</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">نيا پیغام</string>
     <string name="SingleRecipientNotificationBuilder_message_request">پیغام کی درخواست</string>
     <string name="SingleRecipientNotificationBuilder_you">آپ</string>
@@ -2645,7 +2768,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">یہ ڈیوائس اب مزید رجسٹر شدہ نہیں ہے۔ ایسا ہو سکتا ہے کیونکہ آپ نے ایک مختلف ڈیوائس پر اپنا فون نمبر Signal میں رجسٹر کیا تھا۔</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">یہ ڈیوائس اب مزید رجسٹر شدہ نہیں ہے۔ ایسا ہو سکتا ہے کیونکہ آپ نے ایک مختلف ڈیوائس پر اپنا فون نمبر Molly میں رجسٹر کیا تھا۔</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">ڈیوائس کو دوبارہ رجسٹر کریں</string>
 
@@ -2658,10 +2781,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">کال کا جواب دینے کے لیے، Signal کو اپنے مائیکروفون تک رسائی دیں۔</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">کال کا جواب دینے کے لیے، Molly کو اپنے مائیکروفون تک رسائی دیں۔</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">ویڈیو کال کا جواب دینے کے لیے، Signal کو اپنے مائیکرو فون اور کیمرے تک رسائی فراہم کریں۔</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal کو کالیں وصول کرنے یا بنانے کیلئے مائکروفون اور کیمرہ کی اجازت کی ضرورت ہے، لیکن وہ مستقل طور پر انکاری ہیں۔ براہ کرم ایپ کی ترتیبات میں جائیں، \"اجازت نامہ\"منتخب کریں اور \"مائکروفون \"اور \"کیمرہ\" فعال کریں۔</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">ویڈیو کال کا جواب دینے کے لیے، Molly کو اپنے مائیکرو فون اور کیمرے تک رسائی فراہم کریں۔</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly کو کالیں وصول کرنے یا بنانے کیلئے مائکروفون اور کیمرہ کی اجازت کی ضرورت ہے، لیکن وہ مستقل طور پر انکاری ہیں۔ براہ کرم ایپ کی ترتیبات میں جائیں، \"اجازت نامہ\"منتخب کریں اور \"مائکروفون \"اور \"کیمرہ\" فعال کریں۔</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">منسلک آلہ پر جواب دیا گیا۔</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">منسلک آلہ سے انکار کردیا۔</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">منسلک ڈیوائس پر مصروف۔</string>
@@ -2706,16 +2829,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">نیا پاسفریز دہرائیں</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Signal میں مدعو کریں</string>
+    <string name="contact_selection_activity__invite_to_signal">Molly میں مدعو کریں</string>
     <string name="contact_selection_activity__new_group">نیا گروپ</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">رابطوں کو ری فریش کریں</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">کوئی مل نہیں رہا؟ ری فریش کرتے رہیں</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Signal پر اپنے جاننے والے لوگوں کو تلاش کریں</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">اپنے روابط تک رسائی کی اجازت دیں</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">مزید</string>
 
@@ -2732,7 +2855,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">رابطہ تصویر</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">رابطے ظاہر کرنے کیلئے Signal کو رابطوں کی اجازت کی ضرورت ہے،لیکن یہ مستقل طور پر انکاری ہے۔ برائے مہربانی ایپ کی ترتیبات میں جائیں، \"اجازت نامہ\"منتخب کریں، اور \"رابطے\" فعال کریں۔</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">رابطے ظاہر کرنے کیلئے Molly کو رابطوں کی اجازت کی ضرورت ہے،لیکن یہ مستقل طور پر انکاری ہے۔ برائے مہربانی ایپ کی ترتیبات میں جائیں، \"اجازت نامہ\"منتخب کریں، اور \"رابطے\" فعال کریں۔</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">رابطے دوبارہ حاصل کرنے میں خرابی،اپنا نیٹ ورک کنکشن چیک کریں</string>
     <string name="ContactSelectionListFragment_username_not_found">یوزر نیم نہیں ملا</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\" Signal یوزر نہیں ہے۔ براہ کرم یوزر نیم چیک کریں اور دوبارہ کوشش کریں۔"</string>
@@ -2750,16 +2873,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">یوزر نیم سے تلاش کریں</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">روابط تک رسائی کی اجازت دیں</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Signal پر اپنے جاننے والے لوگوں کو تلاش کرنے کے لیے:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">رسائی کی اجازت دیں</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">نہیں شکریہ</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">اپنے روابط تک رسائی کی اجازت دیں۔ آپ کے رابطے انکرپٹ کردہ ہیں اور Signal سروس کو نظر نہیں آتے۔</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal کو ظاہر کرنے کے لئے آپ کے رابطوں تک رسائی کی ضرورت ہے۔</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly کو ظاہر کرنے کے لئے آپ کے رابطوں تک رسائی کی ضرورت ہے۔</string>
     <string name="contact_selection_list_fragment__show_contacts">رابطے دکھائیں</string>
 
     <!-- contact_selection_list_item -->
@@ -2832,6 +2957,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">آپ نے اس فرد کو ہٹا دیا ہے، انہیں دوبارہ میسج کرنے سے وہ دوبارہ آپ کی فہرست میں شامل ہو جائیں گے۔</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">آپشنز</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">اَپ ڈیٹ</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">چلائیں ۔۔۔ روکیں</string>
@@ -2860,7 +2987,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">ببلز Android کا ایک فیچر ہے جسے آپ Signal کی چیٹس کے لیے آف کر سکتے ہیں۔</string>
+    <string name="BubbleOptOutTooltip__description">ببلز Android کا ایک فیچر ہے جسے آپ Molly کی چیٹس کے لیے آف کر سکتے ہیں۔</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">ابھی نہیں</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -3028,9 +3155,9 @@
     <string name="EditProfileFragment__group_description">گروپ کی تفصیل</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Signal اپ ڈیٹ کریں</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Molly اپ ڈیٹ کریں</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Signal کا یہ ورژن زائد المیعاد ہو گیا ہے۔ Signal کا استعمال جاری رکھنے کے لیے ابھی اپ ڈیٹ کریں۔</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Molly کا یہ ورژن زائد المیعاد ہو گیا ہے۔ Molly کا استعمال جاری رکھنے کے لیے ابھی اپ ڈیٹ کریں۔</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">اَپ ڈیٹ</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3247,7 +3374,7 @@
     <string name="preferences__slow">آہستہ</string>
     <string name="preferences__help">مدد کریں</string>
     <string name="preferences__advanced">اعلی\' درجے کی</string>
-    <string name="preferences__donate_to_signal">Signal کے لیے عطیہ کریں</string>
+    <string name="preferences__donate_to_signal">Molly کے لیے عطیہ کریں</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">رازداری</string>
     <!-- Preference label for stories -->
@@ -3284,13 +3411,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">ایپ آئیکن اور نام کو \"%1$s\" سے تبدیل کریں</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">ایپ آئیکن اور نام کو تبدیل کرنے کے لیے Signal کو بند کرنے کی ضرورت ہو گی۔ اطلاعات ہمیشہ Signal کے ڈیفالٹ آئیکن اور نام کو ظاہر کریں گی۔</string>
+    <string name="preferences__app_icon_dialog_description">ایپ آئیکن اور نام کو تبدیل کرنے کے لیے Molly کو بند کرنے کی ضرورت ہو گی۔ اطلاعات ہمیشہ Molly کے ڈیفالٹ آئیکن اور نام کو ظاہر کریں گی۔</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">وہ ایپ آئیکن اور نام منتخب کریں، جو آپ کے فون کی ہوم اسکرین اور ایپ ڈرار پر نظر آئیں گے۔ اطلاعات ہمیشہ Signal کے ڈیفالٹ آئیکن اور نام کو ظاہر کریں گی۔ مزید جانیں</string>
+    <string name="preferences__app_icon_warning_learn_more">وہ ایپ آئیکن اور نام منتخب کریں، جو آپ کے فون کی ہوم اسکرین اور ایپ ڈرار پر نظر آئیں گے۔ اطلاعات ہمیشہ Molly کے ڈیفالٹ آئیکن اور نام کو ظاہر کریں گی۔ مزید جانیں</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">ایپ آئیکنز اور نام ہوم اسکرین اور ایپ ڈرار پر نظر آتے ہیں۔</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">اطلاعات ہمیشہ Signal کے ڈیفالٹ آئیکن اور نام کو ظاہر کریں گی۔</string>
+    <string name="preferences__app_icon_notification_warning">اطلاعات ہمیشہ Molly کے ڈیفالٹ آئیکن اور نام کو ظاہر کریں گی۔</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">مزید جانیں</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3337,8 +3464,12 @@
         <item quantity="other">اس سے تمام چیٹس مستقل طور پر %1$s حالیہ ترین میسجز تک کم ہو جائیں گی۔</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">یہ آپ کی ڈیوائس سے میسج کی تمام ہسٹری اور میڈیا کو مستقل طور پر ڈیلیٹ کردے گا۔</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">یہ اس ڈیوائس اور کسی بھی لنک کردہ ڈیوائسز سے میسج کی تمام تر ہسٹری اور میڈیا کو مستقل طور پر حذف کر دے گا۔</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">کیا آپ واقعی میسج کی ساری ہسٹری کو ڈیلیٹ کرنا چاہتے ہیں؟</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">میسج کی ساری ہسٹری کو مستقل طور پر ختم کر دیا جائے گا۔ اس کارروائی کو کالعدم نہیں کیا جا سکتا۔</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">میسج کی تمام ہسٹری تمام ڈیوائسز سے مستقل طور پر ہٹا دی جائے گی۔ یہ ایکشن کالعدم نہیں کیا جا سکتا۔</string>
     <string name="preferences_storage__delete_all_now">اب سب کو حذف کریں</string>
     <string name="preferences_storage__forever">ہمیشہ کے لئے</string>
     <string name="preferences_storage__one_year">1 سال</string>
@@ -3375,7 +3506,7 @@
     <string name="preferences_communication__category_censorship_circumvention">سنسرشپ کی حکمت عملی</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">سنسرشپ کی حکمت عملی</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">اگر فعال کریں،Signal بائی پاس سنسرشپ کی کوشش کے گا۔ اس خصوصیت کو تب تک فعال نہ کریں جب تک آپ ایک لوکیشن میں ہیں جہاں Signal سنسر ہے۔</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">اگر فعال کریں،Molly بائی پاس سنسرشپ کی کوشش کے گا۔ اس خصوصیت کو تب تک فعال نہ کریں جب تک آپ ایک لوکیشن میں ہیں جہاں Molly سنسر ہے۔</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">بائی پاس سنسرشپ آپ کے اکاؤنٹ فون نمبر کی بنا پر چالو کر دیا گیا ہے۔</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3427,7 +3558,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">پیش خدمت ہے پیمنٹس</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">MobileCoin بھیجنے اور وصول کرنے کے لیے Signal کا استعمال کریں، جو کہ پرائیویسی پر مرتکز نئی ڈیجیٹل کرنسی ہے۔ شروع کرنے کے لیے فعال کریں۔</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">MobileCoin بھیجنے اور وصول کرنے کے لیے Molly کا استعمال کریں، جو کہ پرائیویسی پر مرتکز نئی ڈیجیٹل کرنسی ہے۔ شروع کرنے کے لیے فعال کریں۔</string>
     <string name="PaymentsHomeFragment__activate_payments">ادائیگی چالو کریں</string>
     <string name="PaymentsHomeFragment__activating_payments">فعال ادائیگی…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">ادائیگیوں کا اکاؤنٹ بحال کریں</string>
@@ -3453,7 +3584,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">آپ کے علاقے میں ادائیگی دستیاب نہیں ہے۔</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">ادائیگیوں کو اہل نہیں کرسکے۔ بعد میں دوبارہ کوشش کریں۔</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">ادائیگیوں کو غیر فعال کریں؟</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">اگر آپ ادائیگی غیر فعال کردیتے ہیں تو آپ Signal میں موبائل کوائن بھیجنے یا وصول کرنے کے اہل نہیں ہوں گے۔</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">اگر آپ ادائیگی غیر فعال کردیتے ہیں تو آپ Molly میں موبائل کوائن بھیجنے یا وصول کرنے کے اہل نہیں ہوں گے۔</string>
     <string name="PaymentsHomeFragment__deactivate">غیر فعال کریں</string>
     <string name="PaymentsHomeFragment__continue">جاری رکھیں</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">بیلنس فی الحال دستیاب نہیں ہے۔</string>
@@ -3462,10 +3593,10 @@
     <string name="PaymentsHomeFragment__details">تفصیلات</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">آپ MobileCoin بھیجنے اور وصول کرنے کے لیے Signal استعمال کر سکتے ہیں۔ تمام پیمنٹس MobileCoins اور MobileCoin والیٹ کی استعمال کی شرائط سے مشروط ہیں۔ آپ کو کچھ مسائل کا سامنا ہو سکتا ہے اور آپ جن پیمنٹس یا بیلنسز سے محروم ہو سکتے ہیں انہیں بحال نہیں کیا جا سکتا۔ </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">آپ MobileCoin بھیجنے اور وصول کرنے کے لیے Molly استعمال کر سکتے ہیں۔ تمام پیمنٹس MobileCoins اور MobileCoin والیٹ کی استعمال کی شرائط سے مشروط ہیں۔ آپ کو کچھ مسائل کا سامنا ہو سکتا ہے اور آپ جن پیمنٹس یا بیلنسز سے محروم ہو سکتے ہیں انہیں بحال نہیں کیا جا سکتا۔ </string>
     <string name="PaymentsHomeFragment__activate">فعال</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">موبائل کوائن کی شرائط دیکھیں</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Signal میں ادائیگی اب دستیاب نہیں ہے۔ آپ اب بھی ایکسچینج میں فنڈز کی منتقلی کرسکتے ہیں لیکن آپ اب ادائیگی بھیجنے اور وصول کرنے یا فنڈز شامل نہیں کرسکتے ہیں۔</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Molly میں ادائیگی اب دستیاب نہیں ہے۔ آپ اب بھی ایکسچینج میں فنڈز کی منتقلی کرسکتے ہیں لیکن آپ اب ادائیگی بھیجنے اور وصول کرنے یا فنڈز شامل نہیں کرسکتے ہیں۔</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3493,7 +3624,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">اجازتیں منظور کریں</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">آپ کے جاننے والے لوگوں کو میسج کرنے میں آپ کی مدد کے لیے، Signal ان اجازتوں کی درخواست کرے گا۔ </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">آپ کے جاننے والے لوگوں کو میسج کرنے میں آپ کی مدد کے لیے، Molly ان اجازتوں کی درخواست کرے گا۔ </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">اطلاعات</string>
     <!-- Notifications permission row description -->
@@ -3581,10 +3712,10 @@
     <string name="PaymentsTransferFragment__next">اگلا</string>
     <string name="PaymentsTransferFragment__invalid_address">غلط پتہ</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">وہ پرس پتہ چیک کریں جس کی منتقلی کرنے کی آپ کوشش کر رہے ہیں اور دوبارہ کوشش کریں</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">آپ اپنے Signal Wallet ایڈریس پر منتقل نہیں کرسکتے ہیں۔ معاون تبادلے میں اپنے اکاؤنٹ سے Wallet کا پتہ درج کریں۔</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR کوڈ اسکین کرنے کے لئے ، Signal کو کیمرہ تک رسائی کی ضرورت ہے۔</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal کو QR کوڈ پر قبضہ کرنے کے لئے کیمرے کی اجازت کی ضرورت ہے۔ ترتیبات پر جائیں ، \"اجازت\" کو منتخب کریں ، اور \"کیمرہ\" کو فعال کریں۔</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR کوڈ اسکین کرنے کے لئے ، Signal کو کیمرہ تک رسائی کی ضرورت ہے۔</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">آپ اپنے Molly Wallet ایڈریس پر منتقل نہیں کرسکتے ہیں۔ معاون تبادلے میں اپنے اکاؤنٹ سے Wallet کا پتہ درج کریں۔</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">QR کوڈ اسکین کرنے کے لئے ، Molly کو کیمرہ تک رسائی کی ضرورت ہے۔</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly کو QR کوڈ پر قبضہ کرنے کے لئے کیمرے کی اجازت کی ضرورت ہے۔ ترتیبات پر جائیں ، \"اجازت\" کو منتخب کریں ، اور \"کیمرہ\" کو فعال کریں۔</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">QR کوڈ اسکین کرنے کے لئے ، Molly کو کیمرہ تک رسائی کی ضرورت ہے۔</string>
     <string name="PaymentsTransferFragment__settings">ترتیبات</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3932,17 +4063,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Signal کی آنے والی وائس کال</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Molly کی آنے والی وائس کال</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Signal کی آنے والی ویڈیو کال</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Molly کی آنے والی ویڈیو کال</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">آنے والی Signal گروپ کال</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">آنے والی Molly گروپ کال</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Signal کی جاری وائس کال</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Molly کی جاری وائس کال</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Signal کی جاری ویڈیو کال</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Molly کی جاری ویڈیو کال</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Signal کی جاری گروپ کال</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Molly کی جاری گروپ کال</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">لوڈ ہو رہا ہے۔۔۔</string>
@@ -3989,9 +4120,9 @@
     <string name="BackupDialog_verify">تصدیق کریں</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">آپ نے کامیابی کے ساتھ اپنا بیک اپ پاس فریز درج کیا</string>
     <string name="BackupDialog_passphrase_was_not_correct">پاسفریز صحیح نہیں تھا</string>
-    <string name="LocalBackupJob_creating_signal_backup">Signal بیک اپ تخلیق کیا جا رہا ہے…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Molly بیک اپ تخلیق کیا جا رہا ہے…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Signal بیک اپ کی تصدیق کر رہے ہیں…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Molly بیک اپ کی تصدیق کر رہے ہیں…</string>
     <string name="LocalBackupJobApi29_backup_failed">بیک اپ ناکام ہوگیا</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">آپ کی بیک اپ ڈائرکٹری کو حذف یا منتقل کردیا گیا ہے۔</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">اس حجم پر آپ کی بیک اپ فائل ذخیرہ کرنے کیلئے بہت بڑی ہے۔</string>
@@ -4006,15 +4137,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">مجھے کال کریں (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">کوڈ دوبارہ بھیجیں (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Signal رابطہ سپورٹ کریں</string>
-    <string name="RegistrationActivity_code_support_subject">Signal رجسٹریشن- Android کے لیے تصدیقی کوڈ درج کریں</string>
+    <string name="RegistrationActivity_contact_signal_support">Molly رابطہ سپورٹ کریں</string>
+    <string name="RegistrationActivity_code_support_subject">Molly رجسٹریشن- Android کے لیے تصدیقی کوڈ درج کریں</string>
     <string name="RegistrationActivity_incorrect_code">غلط کوڈ</string>
     <string name="BackupUtil_never">کبھی نہیں</string>
     <string name="BackupUtil_unknown">نامعلوم</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">فون نمبر</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">منتخب کریں کہ کون آپ کا فون نمبر دیکھ سکتا ہے اور کون اس کے ذریعے Signal پر آپ سے رابطہ کر سکتا ہے۔</string>
+    <string name="preferences_app_protection__choose_who_can_see">منتخب کریں کہ کون آپ کا فون نمبر دیکھ سکتا ہے اور کون اس کے ذریعے Molly پر آپ سے رابطہ کر سکتا ہے۔</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">میرا نمبر کون دیکھ سکتا ہے</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -4062,7 +4193,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">آپ نے بہت زیادہ کوششیں کی ہیں۔ براہ کرم کچھ دیر بعد کوشش کریں.</string>
     <string name="RegistrationActivity_error_connecting_to_service">سروس سے رابطے میں غلطی ہو رہی ہے</string>
     <string name="preferences_chats__backups">بیک اپس</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal لاک ہے</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly لاک ہے</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">لاک کھولنے کے لیے ٹیپ کریں</string>
     <string name="Recipient_unknown">نامعلوم</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -4093,9 +4224,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">آپ کو اپنے پرانے آلے تک رسائی کی ضرورت ہے۔</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">بیک اپ سے بحال کریں</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">اپنے پیغامات کو مقامی بیک اپ سے بحال کریں۔ اگر آپ ابھی بحال نہیں کرتے ہیں تو ، آپ بعد میں بحال نہیں کرسکیں گے۔</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">لوکل بیک اپ کو ری اسٹور کریں</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Signal بیک اپ کو بحال کریں</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">اپنے تمام ٹیکسٹ میسجز + اپنے گزشتہ 30 دنوں کا میڈیا ری اسٹور کریں</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">مزید آپشنز</string>
 
+    <string name="TransferOrRestoreFragment__cancel">منسوخ کریں</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">منتقل کرنے کے بغیر لاگ ان کریں</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">اپنے میسجز اور میڈیا کو منتقل کیے بغیر جاری رکھیں</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">اپنے پرانے Android فون پر Signal کھولیں</string>
     <string name="NewDeviceTransferInstructions__continue">جاری رکھیں</string>
@@ -4110,19 +4248,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">پرانے Android آلہ سے مربوط ہونے کی تیاری…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">ایک لمحے کے بعد ، جلد ہی تیار ہونا چاہئے</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">پرانے Android آلہ سے رابطہ قائم ہونے کا انتظار ہے…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal کو آپ کے پرانے Android آلہ کو دریافت کرنے اور ان سے مربوط ہونے کے لئے مقام کی اجازت درکار ہے۔</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal کو آپ کے پرانے Android آلہ کو دریافت کرنے اور ان سے مربوط ہونے کے لئے مقام کی خدمات کو فعال کرنے کی ضرورت ہے۔</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal کو آپ کے پرانے Android آلہ کو دریافت کرنے اور ان سے مربوط ہونے کیلئے Wi-Fi کی ضرورت ہے۔ Wi-Fi کو چلانے کی ضرورت ہے لیکن اسے Wi-Fi نیٹ ورک سے متصل ہونا ضروری نہیں ہے۔</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">معذرت ، ایسا لگتا ہے کہ یہ آلہ Wi-Fi Direct کی حمایت نہیں کرتا ہے۔ Signal آپ کے پرانے Android آلہ کو دریافت کرنے اور ان سے مربوط ہونے کیلئے Wi-Fi Direct کا استعمال کرتا ہے۔ آپ اب بھی اپنے پرانے Android آلہ سے اپنے اکاؤنٹ کو بحال کرنے کے لئے بیک اپ بحال کرسکتے ہیں۔</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly کو آپ کے پرانے Android آلہ کو دریافت کرنے اور ان سے مربوط ہونے کے لئے مقام کی اجازت درکار ہے۔</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly کو آپ کے پرانے Android آلہ کو دریافت کرنے اور ان سے مربوط ہونے کے لئے مقام کی خدمات کو فعال کرنے کی ضرورت ہے۔</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly کو آپ کے پرانے Android آلہ کو دریافت کرنے اور ان سے مربوط ہونے کیلئے Wi-Fi کی ضرورت ہے۔ Wi-Fi کو چلانے کی ضرورت ہے لیکن اسے Wi-Fi نیٹ ورک سے متصل ہونا ضروری نہیں ہے۔</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">معذرت ، ایسا لگتا ہے کہ یہ آلہ Wi-Fi Direct کی حمایت نہیں کرتا ہے۔ Molly آپ کے پرانے Android آلہ کو دریافت کرنے اور ان سے مربوط ہونے کیلئے Wi-Fi Direct کا استعمال کرتا ہے۔ آپ اب بھی اپنے پرانے Android آلہ سے اپنے اکاؤنٹ کو بحال کرنے کے لئے بیک اپ بحال کرسکتے ہیں۔</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">بیک اپ بحال کریں</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">آپ کے پرانے Android آلہ سے رابطہ قائم کرنے کی کوشش کے دوران ایک غیر متوقع خرابی پیش آگئی۔</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">نئے Android آلہ کی تلاش ہو رہی ہے…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">آپ کے نئے Android آلہ کو دریافت کرنے اور ان سے رابطہ کرنے کیلئے Signal کو مقام کی اجازت درکار ہے۔</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">آپ کے نئے Android آلہ کو دریافت کرنے اور ان سے مربوط ہونے کے لئے Signal کو مقام کی خدمات کی ضرورت ہوتی ہے۔</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal کو آپ کے نئے Android آلہ کو دریافت کرنے اور ان سے مربوط ہونے کے لئے Wi-Fi کی ضرورت ہے۔ Wi-Fi کو چلانے کی ضرورت ہے لیکن اسے Wi-Fi نیٹ ورک سے متصل ہونا ضروری نہیں ہے۔</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">معذرت ، ایسا لگتا ہے کہ یہ آلہ Wi-Fi Direct کی حمایت نہیں کرتا ہے۔ Signal آپ کے نئے Android آلہ کو دریافت کرنے اور ان سے مربوط ہونے کیلئے Wi-Fi Direct کا استعمال کرتا ہے۔ آپ اب بھی اپنے نئے Android آلہ پر اپنے اکاؤنٹ کو بحال کرنے کے لئے بیک اپ تشکیل دے سکتے ہیں۔</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">آپ کے نئے Android آلہ کو دریافت کرنے اور ان سے رابطہ کرنے کیلئے Molly کو مقام کی اجازت درکار ہے۔</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">آپ کے نئے Android آلہ کو دریافت کرنے اور ان سے مربوط ہونے کے لئے Molly کو مقام کی خدمات کی ضرورت ہوتی ہے۔</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly کو آپ کے نئے Android آلہ کو دریافت کرنے اور ان سے مربوط ہونے کے لئے Wi-Fi کی ضرورت ہے۔ Wi-Fi کو چلانے کی ضرورت ہے لیکن اسے Wi-Fi نیٹ ورک سے متصل ہونا ضروری نہیں ہے۔</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">معذرت ، ایسا لگتا ہے کہ یہ آلہ Wi-Fi Direct کی حمایت نہیں کرتا ہے۔ Molly آپ کے نئے Android آلہ کو دریافت کرنے اور ان سے مربوط ہونے کیلئے Wi-Fi Direct کا استعمال کرتا ہے۔ آپ اب بھی اپنے نئے Android آلہ پر اپنے اکاؤنٹ کو بحال کرنے کے لئے بیک اپ تشکیل دے سکتے ہیں۔</string>
     <string name="OldDeviceTransferSetup__create_a_backup">بیک اپ بنائیں</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">آپ کے نئے Android آلہ سے رابطہ قائم کرنے کی کوشش کے دوران ایک غیر متوقع نقص پیش آگیا۔</string>
 
@@ -4163,7 +4301,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">ڈیٹا کی منتقلی</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">دونوں آلات ایک دوسرے کے قریب رکھیں۔ آلات بند نہ کریں اور Signal کو کھلا رکھیں۔ منتقلی اختتام سے آخر تک انکرپٹ ہوتی ہیں۔</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">دونوں آلات ایک دوسرے کے قریب رکھیں۔ آلات بند نہ کریں اور Molly کو کھلا رکھیں۔ منتقلی اختتام سے آخر تک انکرپٹ ہوتی ہیں۔</string>
     <string name="DeviceTransfer__d_messages_so_far">اب تک %1$d پیغامات…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">اب تک کُل %1$s%% پیغامات…</string>
@@ -4177,7 +4315,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">اکاؤنٹ کی منتقلی</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">اپنے نئے Android آلہ پر Signal ڈاؤن لوڈ کریں</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">اپنے نئے Android آلہ پر Molly ڈاؤن لوڈ کریں</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"\"اکاؤنٹ کی منتقلی یا بحالی\" پر ٹیپ کریں"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4251,7 +4389,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">اس لنک کے ساتھ کوئی بھی گروپ کا نام اور تصویر دیکھ سکتا ہے اور اس میں شامل ہونے کی درخواست کرسکتا ہے۔ اس پر اپنے اعتماد والے لوگوں کے ساتھ اشتراک کریں۔</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">اس لنک کے ساتھ کوئی بھی گروپ کا نام اور تصویر دیکھ سکتا ہے اور گروپ میں شامل ہوسکتا ہے۔ اس پر اپنے اعتماد والے لوگوں کے ساتھ اشتراک کریں۔</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Signal کے ذریعے شیئر کریں</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Molly کے ذریعے شیئر کریں</string>
     <string name="GroupLinkBottomSheet_copy">کاپی کریں</string>
     <string name="GroupLinkBottomSheet_qr_code">QR کوڈ</string>
     <string name="GroupLinkBottomSheet_share">اشتراک کریں</string>
@@ -4437,7 +4575,7 @@
     <string name="payment_info_card_about_mobilecoin">موبائل کوائن کے بارے میں</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin پرائیویسی پر مرتکز نئی ڈیجیٹل کرنسی ہے۔</string>
     <string name="payment_info_card_adding_funds">فنڈز کا اضافہ</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">آپ اپنے Wallet کے پتے پر موبائل کوائن بھیج کر Signal میں استعمال کے لئے فنڈز شامل کرسکتے ہیں۔</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">آپ اپنے Wallet کے پتے پر موبائل کوائن بھیج کر Molly میں استعمال کے لئے فنڈز شامل کرسکتے ہیں۔</string>
     <string name="payment_info_card_cashing_out">کیش آؤٹ</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">آپ کبھی بھی ایسے تبادلے پر موبائل کوائن کیش کر سکتے ہیں جو موبائل کوائن کو سپورٹ کرتا ہے۔ اس تبادلے میں صرف اپنے اکاؤنٹ میں ٹرانسفر کریں۔</string>
     <string name="payment_info_card_hide_this_card">یہ کارڈ چھپائیں؟</string>
@@ -4458,12 +4596,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Wallet کو غیر فعال کریں</string>
     <string name="DeactivateWalletFragment__your_balance">آپ کا بیلنس</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">یہ تجویز پیش کی جاتی ہے کہ پیمنٹس کو غیر فعال کرنے سے قبل آپ اپنے فنڈز کو کسی دوسرے والیٹ ایڈریس پر ٹرانسفر کریں۔ اگر آپ فی الحال اپنے فنڈز کو ٹرانسفر کرنے کا انتخاب نہیں کرنا چاہتے، تو آپ کی جانب سے پیمنٹس کو دوبارہ فعال کرنے کی صورت میں یہ Signal سے لنک کردہ آپ کے والیٹ میں موجود رہیں گے۔</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">یہ تجویز پیش کی جاتی ہے کہ پیمنٹس کو غیر فعال کرنے سے قبل آپ اپنے فنڈز کو کسی دوسرے والیٹ ایڈریس پر ٹرانسفر کریں۔ اگر آپ فی الحال اپنے فنڈز کو ٹرانسفر کرنے کا انتخاب نہیں کرنا چاہتے، تو آپ کی جانب سے پیمنٹس کو دوبارہ فعال کرنے کی صورت میں یہ Molly سے لنک کردہ آپ کے والیٹ میں موجود رہیں گے۔</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">باقی بیلنس منتقل کریں</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">منتقلی کے بغیر غیر فعال کریں</string>
     <string name="DeactivateWalletFragment__deactivate">غیر فعال کریں</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">منتقلی کے بغیر غیر فعال کریں؟</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">اگر آپ پیمنٹس کو دوبارہ فعال کرنے کا انتخاب کرتے ہیں تو آپ کا بیلنس Signal سے لنک کردہ آپ کے والیٹ میں موجود رہے گا۔</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">اگر آپ پیمنٹس کو دوبارہ فعال کرنے کا انتخاب کرتے ہیں تو آپ کا بیلنس Molly سے لنک کردہ آپ کے والیٹ میں موجود رہے گا۔</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Wallet کو غیر فعال کرنے میں خرابی۔</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4758,7 +4896,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">لائسنسز</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">شرائط &amp;amp:رازداری کی پالیسی</string>
-    <string name="HelpFragment__copyright_signal_messenger">کاپی رائٹ Signal میسنجر</string>
+    <string name="HelpFragment__copyright_signal_messenger">کاپی رائٹ Molly میسنجر</string>
     <string name="HelpFragment__licenced_under_the_agplv3">GNU AGPLv3 کے تحت لائسنس یافتہ</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4999,9 +5137,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">ایک رنگ منتخب کریں</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">ایس ایم ایس</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">اشتراک کریں</string>
 
@@ -5035,7 +5170,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">صرف منتظمین ہی اس گروپ کو پیغامات بھیج سکتے ہیں۔</string>
-    <string name="MultiselectForwardFragment__limit_reached">حد آ پہنچی ہے</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">آپ 5 چیٹس سے زیادہ کا انتخاب نہیں کر سکتے</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5212,9 +5348,9 @@
     <string name="MySupportPreference__learn_more">مزید جانیں</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Signal اپ ڈیٹ کریں</string>
+    <string name="UpdateSignalExpiredDialog__title">Molly اپ ڈیٹ کریں</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Signal کا یہ ورژن زائد المیعاد ہو گیا ہے۔ Signal کا استعمال جاری رکھنے کے لیے ابھی اپ ڈیٹ کریں۔</string>
+    <string name="UpdateSignalExpiredDialog__message">Molly کا یہ ورژن زائد المیعاد ہو گیا ہے۔ Molly کا استعمال جاری رکھنے کے لیے ابھی اپ ڈیٹ کریں۔</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">اَپ ڈیٹ</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5223,7 +5359,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">ڈیوائس رجسٹر شدہ نہیں ہے</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">یہ ڈیوائس اب مزید رجسٹر شدہ نہیں ہے۔ اس ڈیوائس پر Signal کا استعمال جاری رکھنے کے لیے دوبارہ رجسٹر کریں۔</string>
+    <string name="ReregisterSignalDialog__message">یہ ڈیوائس اب مزید رجسٹر شدہ نہیں ہے۔ اس ڈیوائس پر Molly کا استعمال جاری رکھنے کے لیے دوبارہ رجسٹر کریں۔</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">دوبارہ رجسٹر کریں</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5517,7 +5653,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">پکر کھولنے میں ناکامی ہوئی۔</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">اطلاعات کو فعال بنانے کے لیے، Signal کو انہیں ڈسپلے کرنے کی اجازت درکار ہے۔</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">اطلاعات کو فعال بنانے کے لیے، Molly کو انہیں ڈسپلے کرنے کی اجازت درکار ہے۔</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">آن کریں</string>
 
@@ -5666,8 +5802,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">ابھی تک کوئی جوابات نہیں</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">آپ اس سٹوری کا جواب نہیں دے سکتے کیونکہ آپ اس گروپ کے ممبر نہیں رہے۔</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">سٹوری پر ری ایکٹ کیا</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">سٹوری پر ری ایکٹ کیا</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">سٹوری پر ری ایکٹ کیا</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">ویوز</string>
     <!-- Label for story replies tab -->
@@ -6284,8 +6422,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">اپنا بینک منتخب کریں</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">%1$s کے ساتھ اپنے عطیہ کی تصدیق کریں</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">اپنے مکرر عطیے کو سیٹ اپ کرنے کے لیے اپنے بینک سے €0,01 چارج کی تصدیق کرنے کے لیے جاری رکھیں پر ٹیپ کریں۔ یہ خودکار طور پر ریفنڈ ہو جائے گا اور ایسا کرنا آپ کے €5/ماہانہ عطیے کو آپ کے اکاؤنٹ سے ڈیبٹ کرنے کی اجازت دیتا ہے۔</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">اپنے مکرر عطیے کو ترتیب دینے کے لیے جاری رکھیں پر ٹیپ کریں تاکہ بینک کی جانب سے 0,01€ چارج کی تصدیق کی جا سکے۔ یہ آپ کے%1$s/ماہانہ ڈونیشن کو آپ کے اکاؤنٹ سے ڈیبٹ کرنے کی اجازت دیتا ہے اور خود کار طور پر ری فنڈ ہو جائے گا۔</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">جاری رکھیں</string>
 
@@ -6861,6 +6999,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">بیک اپ ڈیٹا ڈاؤن لوڈ ہو رہا ہے…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">میڈیا بیک اپس آف ہیں</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">آپ کے Signal کے میڈیا کا بیک اپ پلان منسوخ کر دیا گیا ہے کیونکہ ہم آپ کی پیمنٹ پر کارروائی نہیں کر سکے تھے۔ آپ کے پاس اپنے بیک اپ میں محفوظ کردہ کسی بھی میڈیا کو ڈاؤن لوڈ کرنے کے لیے %1$d دن کا وقت ہے۔ %1$d دن کے بعد، آپ کے بیک اپ میں موجود میڈیا کو حذف کر دیا جائے گا۔</item>
+        <item quantity="other">آپ کے Signal کے میڈیا کا بیک اپ پلان منسوخ کر دیا گیا ہے کیونکہ ہم آپ کی پیمنٹ پر کارروائی نہیں کر سکے تھے۔ آپ کے پاس اپنے بیک اپ میں محفوظ کردہ کسی بھی میڈیا کو ڈاؤن لوڈ کرنے کے لیے %1$d دنوں کا وقت ہے۔ %1$d دنوں کے بعد، آپ کے بیک اپ میں موجود میڈیا کو حذف کر دیا جائے گا۔</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">آپ اپنے تمام میڈیا کی بیکنگ اپ جاری رکھنے کے لیے کسی بھی وقت بیک اپس کے لیے دوبارہ پیمنٹ کرنے کا آغاز کر سکتے ہیں۔ </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">آپ کا میڈیا آج حذف کر دیا جائے گا</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">آپ کے Signal کے میڈیا کا بیک اپ پلان منسوخ کر دیا گیا ہے کیونکہ ہم آپ کی پیمنٹ پر کارروائی نہیں کر سکے۔ آپ کے پاس اپنے بیک اپ میں موجود میڈیا کو ڈاؤن لوڈ کرنے کا یہ آخری موقع ہے اس سے پہلے کہ اسے حذف کر دیا جائے۔</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">ڈاؤن لوڈ مکمل نہیں کیا جا سکتا</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">آپ کی ڈیوائس میں جگہ ناکافی ہے۔ اپنے بیک اپ میں ذحیرہ شدہ میڈیا کو ڈاؤن لوڈ کرنے کے لیے %1$s تک کی جگہ خالی کریں۔</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">اگر آپ \"اسکپ\" کا انتخاب کرتے ہیں تو آپ کے بیک اپ میڈیا کو %1$d دن میں حذف کر دیا جائے گا۔</item>
+        <item quantity="other">اگر آپ \"اسکپ\" کا انتخاب کرتے ہیں تو آپ کے بیک اپ میڈیا کو %1$d دنوں میں حذف کر دیا جائے گا۔</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">بیک اپ پیمنٹ پرعمل کاری نہیں کر سکتے</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">ہمیں آپ کی متواتر ماہانہ بیک اپ پیمنٹ وصول کرنے میں مشکل کا سامنا ہو رہا ہے۔ یقینی بنائیں کہ آپ کی پیمنٹ کا طریقہ جدید ترین ہے۔ اگر ایسا نہیں ہے، تو اسے Google Pay پر اپ ڈیٹ کریں۔ Signal چند دنوں میں دوبارہ پیمنٹ پر عمل کاری کرنے کی کوشش کرے گا۔</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">بیک اپ مکمل نہیں کر سکے</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">آپ کی ڈیوائس نے %1$d دنوں سے بیک اپ مکمل نہیں کیا ہے۔ یقینی بنائیں کہ آپ کی ڈیوائس وائی فائی سے مربوط ہے اور \"ابھی بیک اپ کریں\" پر ٹیپ کریں۔ </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">مزید جانیں</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">چھوڑ دو</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">ابھی میڈیا ڈاؤن لوڈ کریں</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">بعد میں ڈاؤن لوڈ کریں</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">میڈیا ڈاؤن لوڈ نہ کریں</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">اپنا میڈیا ڈاؤن لوڈ کرنے کے لیے %1$s کی جگہ خالی کریں۔</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">کریڈٹ یا ڈیبٹ کارڈ</string>
@@ -6874,6 +7058,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">نامعلوم</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">پیمنٹ ہسٹری</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">آپ کا آخری بیک اپ %2$s بجے %1$s کو کیا گیا۔</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6884,6 +7074,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">منتخب کردہ وقت سے پرانے میسجز کو مستقل طور پر حذف کر دیا جائے گا۔</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">منتخب کردہ لمبائی سے تجاوز کرنے والے میسجز کو مستقل طور پر حذف کر دیا جائے گا۔</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">لنک کردہ ڈیوائسز پر حدود کا اطلاق کریں</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">اہل ہونے پر، چیٹ کی حدود آپ کی لنک کردہ ڈیوائسز سے میسجز کو بھی حذف کر دیں گی۔</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">حذف کرنے کو اب آپ کی تمام ڈیوائسز پر مطابقت پذیرکر دیا گیا ہے</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">جب آپ میسجز یا چیٹس حذف کرتے ہیں، تو وہ آپ کے فون اور لنک کردہ ڈیوائسز سے حذف کر دی جائیں گی۔</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">ٹھیک ہے</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">پیمنٹ ہسٹری</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">ٹیکسٹ اور تمام میڈیا بیک اپ</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">پیمنٹ کی تفصیلات</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">بیک اپ کی قسم</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">ادا کیے جانے کی تاریخ</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">اشتراک کریں</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal بیک اپس</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">پیمنٹ ہسٹری</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">بیک اپ کی تفصیلات</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">بیک اپ کا سائز</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">بیک اپ کی فریکوئنسی</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">سیلولر کا استعمال کرتے ہوئے بیک اپ کریں</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">بند کریں اور بیک اپ حذف کریں</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">بیک اپ حذف اور بند کر دیا گیا۔</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">بیک اپ کی قسم تبدیل کر دی گئی اور سبسکرپشن منسوخ کر دی گئی</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">سبسکرپشن منسوخ کر دی گئی</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">ڈاؤن لوڈ مکمل ہو گئی</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">بیک اپ کی قسم</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">بیک اپس غیر فعال کر دیے گئے</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s ·%2$s/ماہانہ</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">بیک اپ فعال کریں</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">آخری بیک اپ</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%2$s پر %1$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">کبھی نہیں</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">اب بیک اپ کریں</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">بند کریں اور بیک اپس حذف کریں؟</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">آپ سے دوبارہ ادائیگی نہیں لی جائے گی۔ آپ کا بیک اپ حذف کر دیا جائے گا اور کوئی نئے بیک اپس تخلیق نہیں کیے جائیں گے۔</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">آف اور ڈیلیٹ کریں</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">بیک اپ حذف کیا جا رہا ہے…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">بیک اپ حذف کر دیا گیا</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"ابھی بیک اپ پر ٹیپ کرنے کے ذریعے"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">روزانہ</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">ہفتہ وار</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">ماہانہ</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">دستی طور پر بیک اپ کریں</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">براہ کرم اپنی ڈیوائس کی پِن، پاس ورڈ یا پیٹرن درج کریں۔</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">اگلا</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">بیک اپ کی قسم کو تبدیل کریں</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">سبسکرپشن منسوخ کریں</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">منسوخی کی تصدیق کریں</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">آپ کو دوبارہ چارج نہیں کیا جائے گا۔ آپ کے بلنگ سائیکل کے اختتام پر بیک اپس کو آف کر دیا جائے گا۔ اس تاریخ کے بعد آپ کے پاس اپنے حالیہ طور پر بیک اپ کردہ میڈیا کو ڈاؤن لوڈ کرنے کے لیے 30 دن ہوں گے۔</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">تصدیق کریں اور ابھی ڈاؤن لوڈ کریں</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">تصدیق کریں اور بعد میں ڈاؤن لوڈ کریں</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">سبسکرپشن رکھیں</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 80cf0ee5d3..7c3a26ba63 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal đang cập nhật…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly đang cập nhật…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Bạn chưa thiết lập mật khẩu!</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Tắt mật khẩu?</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Thao tác này sẽ vĩnh viễn mở khóa Signal và thông báo tin nhắn.</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Thao tác này sẽ vĩnh viễn mở khóa Molly và thông báo tin nhắn.</string>
     <string name="ApplicationPreferencesActivity_disable">Tắt</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">Lỗi kết nối đến máy chủ!</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN là bắt buộc khi sử dụng Khóa đăng kí. Để tắt PIN, vui lòng tắt Khóa đăng kí trước.</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">Tệp</string>
     <string name="AttachmentKeyboard_contact">Liên hệ</string>
     <string name="AttachmentKeyboard_location">Vị trí</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal cần quyền để hiển thị ảnh và video của bạn</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly cần quyền để hiển thị ảnh và video của bạn</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">Cho phép Truy cập</string>
     <string name="AttachmentKeyboard_payment">Thanh toán</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">Không tìm thấy ứng dụng để chọn tệp đa phương tiện.</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal cần quyền truy cập Bộ nhớ để đính kèm ảnh, video hoặc âm thanh, nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Bộ nhớ\".</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal cần quyền truy cập Danh bạ để đính kèm thông tin liên lạc nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Danh bạ\".</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal cần quyền truy cập Vị trí để đính kèm vị trí, nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Vị trí\".</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly cần quyền truy cập Bộ nhớ để đính kèm ảnh, video hoặc âm thanh, nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Bộ nhớ\".</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly cần quyền truy cập Danh bạ để đính kèm thông tin liên lạc nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Danh bạ\".</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly cần quyền truy cập Vị trí để đính kèm vị trí, nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Vị trí\".</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">Cho phép truy cập địa điểm của bạn</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">Để gửi địa điểm của bạn:</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">Cho phép Signal truy cập để gửi địa điểm của bạn.</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">Cho phép Molly truy cập để gửi địa điểm của bạn.</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal cần quyền truy cập thông tin địa điểm để gửi địa điểm của bạn.</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly cần quyền truy cập thông tin địa điểm để gửi địa điểm của bạn.</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">Cho phép truy cập bộ nhớ</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">Để hiển thị ảnh và video:</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal cần quyền truy cập bộ nhớ để hiển thị ảnh và video của bạn.</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly cần quyền truy cập bộ nhớ để hiển thị ảnh và video của bạn.</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s chưa bật tính năng Thanh toán </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">Chuyển camera</string>
     <string name="CameraXFragment_open_gallery_description">Mở bộ sưu tập</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">Cho phép Truy cập</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">Cho phép truy cập camera và microphone của bạn</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">Cho phép truy cập camera của bạn</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">Cho phép truy cập microphone của bạn</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">Để chụp ảnh, hãy cho phép Signal truy cập camera của bạn.</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">Để chụp ảnh, hãy cho phép Signal truy cập máy ảnh.</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">Để chụp ảnh và quay video, hãy cho phép Signal truy cập camera của bạn.</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">Để quay video có âm thanh, hãy cho phép Signal truy cập microphone của bạn.</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">Để quét mã QR, hãy cho phép Signal truy cập camera của bạn.</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal cần quyền truy cập camera của bạn để chụp ảnh</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal cần quyền truy cập camera của bạn để quét mã QR</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal cần quyền truy cập microphone của bạn để quay video</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">Để chụp ảnh trong Signal:</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">Để chụp ảnh và quay video trong Signal:</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">Để quay video có âm thanh:</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">Để quét mã QR:</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">Liên hệ gần đây</string>
@@ -270,7 +271,7 @@
     <string name="CameraContacts_no_signal_contacts">Không có liên hệ Signal</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">Bạn chỉ có thể dùng nút chụp ảnh để gửi ảnh cho các liên hệ Signal. </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">Không tìm thấy người bạn cần tìm?</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">Mời một liên hệ dùng Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">Mời một liên hệ dùng Molly</string>
     <string name="CameraContacts__menu_search">Tìm kiếm</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -284,12 +285,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">Không, cảm ơn</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">Cập nhật Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">Cập nhật Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">Phiên bản ứng dụng này không còn được hỗ trợ. Để tiếp tục gửi và nhận tin nhắn, vui lòng cập nhật lên phiên bản mới nhất.</string>
     <string name="ClientDeprecatedActivity_update">Cập nhật</string>
     <string name="ClientDeprecatedActivity_dont_update">Không cập nhật</string>
     <string name="ClientDeprecatedActivity_warning">Cảnh báo</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Phiên bản Signal của bạn đã hết hạn. Bạn có thể xem lịch sử tin nhắn nhưng không thể gửi hay nhận tin nhắn cho tới khi bạn cập nhật.</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">Phiên bản Molly của bạn đã hết hạn. Bạn có thể xem lịch sử tin nhắn nhưng không thể gửi hay nhận tin nhắn cho tới khi bạn cập nhật.</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">Không tìm thấy trình duyệt.</string>
@@ -326,8 +327,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Tin nhắn %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Cuộc gọi thoại Molly %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Cuộc gọi video %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -419,7 +420,7 @@
     <string name="ConversationActivity_transport_signal">Tin nhắn Signal</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">Gửi tin nhắn</string>
-    <string name="ConversationActivity_lets_switch_to_signal">Hãy chuyển sang dùng Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">Hãy chuyển sang dùng Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">Vui lòng chọn một liên lạc</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Tệp đính kèm vượt quá giới hạn kích cỡ cho loại tin nhắn mà bạn đang gửi.</string>
     <string name="ConversationActivity_unable_to_record_audio">Không thể ghi âm!</string>
@@ -438,18 +439,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">Để gửi tin nhắn âm thanh:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Để gửi tin nhắn âm thanh, hãy cho phép Signal truy cập microphone.</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">Để gửi tin nhắn âm thanh, hãy cho phép Molly truy cập microphone.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal cần quyền truy cập microphone để ghi âm tin nhắn âm thanh.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal cần quyền truy cập Micro để gửi tin nhắn âm thanh, nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Micro\".</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly cần quyền truy cập microphone để ghi âm tin nhắn âm thanh.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly cần quyền truy cập Micro để gửi tin nhắn âm thanh, nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Micro\".</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal cần quyền truy cập Micro và Máy ảnh để gọi %1$s, nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Micro\" và \"Máy ảnh\"</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Để chụp ảnh, hãy cho phép Signal truy cập máy ảnh.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal cần quyền truy cập Máy ảnh để chụp ảnh và quay video, nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Máy ảnh\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal cần quyền truy cập Máy ảnh để chụp ảnh và quay video</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly cần quyền truy cập Micro và Máy ảnh để gọi %1$s, nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Micro\" và \"Máy ảnh\"</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Để chụp ảnh, hãy cho phép Molly truy cập máy ảnh.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly cần quyền truy cập Máy ảnh để chụp ảnh và quay video, nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Máy ảnh\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly cần quyền truy cập Máy ảnh để chụp ảnh và quay video</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">Cho phép quyền truy cập micro để ghi âm thanh khi quay video.</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal cần quyền truy cập micro để quay video nhưng đã bị từ chối. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Micro\" và \"Máy ảnh\".</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal cần quyền truy cập micro để quay video.</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly cần quyền truy cập micro để quay video nhưng đã bị từ chối. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Micro\" và \"Máy ảnh\".</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly cần quyền truy cập micro để quay video.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
     <string name="ConversationActivity_no">Không</string>
@@ -470,9 +471,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">Để bắt đầu cuộc gọi:</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Để bắt đầu cuộc gọi, hãy cho phép Signal truy cập microphone.</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">Để bắt đầu cuộc gọi, hãy cho phép Molly truy cập microphone.</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal cần quyền truy cập microphone để bắt đầu cuộc gọi.</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly cần quyền truy cập microphone để bắt đầu cuộc gọi.</string>
 
 
     <string name="ConversationActivity_join">Tham gia</string>
@@ -486,9 +487,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Việc nhắn tin SMS không còn được hỗ trợ trên Signal. Mời %1$s sử dụng Signal để tiếp tục cuộc trò chuyện ở đây.</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Người này không còn sử dụng Signal. Mời người đó sử dụng Signal để tiếp tục cuộc trò chuyện ở đây.</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">Người này không còn sử dụng Molly. Mời người đó sử dụng Molly để tiếp tục cuộc trò chuyện ở đây.</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">Mời dùng Signal</string>
+    <string name="ConversationActivity__invite_to_signal">Mời dùng Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">Bạn sẽ được nhắc lại sớm.</string>
 
@@ -536,6 +537,8 @@
     <string name="ConversationFragment_delete_for_everyone">Xóa cho mọi người</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Xóa trên thiết bị này</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Xóa</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Xóa trên tất cả</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">Tin nhắn này sẽ được xóa cho tất cả mọi người trong cuộc trò chuyện nếu họ sử dụng phiên bản mới của Signal. Họ sẽ có thể thấy rằng bạn đã xoá tin nhắn.</string>
@@ -567,13 +570,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">Đã chặn</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">Cập nhật Signal</string>
+    <string name="ConversationFragment__update_build">Cập nhật Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">Đăng ký lại Signal</string>
+    <string name="ConversationFragment__reregister_signal">Đăng ký lại Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">Quay lại.</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">Mở Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">Mở Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">Không còn được xác minh</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -636,6 +639,10 @@
     <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
         <item quantity="other">Thao tác này sẽ xóa vĩnh viễn %1$d cuộc trò chuyện đã chọn.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="other">Thao tác này sẽ xóa vĩnh viễn %1$d cuộc trò chuyện đã chọn trên tất cả thiết bị của bạn.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Đang xóa</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="other">Xóa cuộc trò chuyện đã chọn…</item>
@@ -719,9 +726,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Ai có thể tìm tôi bằng số điện thoại?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Bất kỳ ai có số điện thoại của bạn sẽ thấy bạn trên Signal và có thể bắt đầu trò chuyện với bạn.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Bất kỳ ai có số điện thoại của bạn sẽ thấy bạn trên Molly và có thể bắt đầu trò chuyện với bạn.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Sẽ không có ai nhìn thấy số điện thoại của bạn trên Signal, trừ khi bạn nhắn tin với người đó hoặc đã có một cuộc trò chuyện với người đó.</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Sẽ không có ai nhìn thấy số điện thoại của bạn trên Molly, trừ khi bạn nhắn tin với người đó hoặc đã có một cuộc trò chuyện với người đó.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Khôi phục từ bản sao lưu?</string>
@@ -755,7 +762,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Kiểm tra mật khẩu sao lưu của bạn xem có khớp không</string>
     <string name="BackupsPreferenceFragment__turn_on">Bật</string>
     <string name="BackupsPreferenceFragment__turn_off">Tắt</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Để khôi phục bản sao lưu, hãy cài đặt phiên bản mới nhất của Signal. Sau đó, mở ứng dụng và nhấn vào \"Khôi phục bản sao lưu\" rồi chọn vị trí bản sao lưu. %1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"Để khôi phục bản sao lưu, hãy cài đặt phiên bản mới nhất của Molly. Sau đó, mở ứng dụng và nhấn vào \"Khôi phục bản sao lưu\" rồi chọn vị trí bản sao lưu. %1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">Tìm hiểu thêm</string>
     <string name="BackupsPreferenceFragment__in_progress">Đang thực hiện…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -763,7 +770,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">Đã được %1$d…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">%1$s%% đến giờ…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal cần quyền truy cập bộ nhớ để tạo bản sao lưu, nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Bộ nhớ\".</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly cần quyền truy cập bộ nhớ để tạo bản sao lưu, nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Bộ nhớ\".</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">Đặt thời gian sao lưu</string>
 
@@ -830,7 +837,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Đã làm mới phiên trò chuyện</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal sử dụng công nghệ mã hóa đầu cuối vì vậy ứng dụng đôi lúc có thể làm mới lại phiên trò chuyện của bạn. Điều này không ảnh hưởng tới độ bảo mật của cuộc trò chuyện nhưng bạn có thể bỏ lỡ tin nhắn từ người này, và bạn có thể nhờ họ gửi lại tin nhắn đó.</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly sử dụng công nghệ mã hóa đầu cuối vì vậy ứng dụng đôi lúc có thể làm mới lại phiên trò chuyện của bạn. Điều này không ảnh hưởng tới độ bảo mật của cuộc trò chuyện nhưng bạn có thể bỏ lỡ tin nhắn từ người này, và bạn có thể nhờ họ gửi lại tin nhắn đó.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Sử dụng Signal trên máy tính hoặc iPad. Tin nhắn của bạn sẽ đồng bộ với các thiết bị đã liên kết.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Liên kết một thiết bị mới</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Thông tin tin nhắn và cuộc trò chuyện được bảo vệ bằng hình thức mã hóa đầu cuối trên tất cả thiết bị</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal trên máy tính hoặc iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">Tất cả nội dung tin nhắn được bảo mật trên các thiết bị đã liên kết</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">Tin nhắn Molly được đồng bộ với Molly trên điện thoại của bạn sau khi được liên kết. Lịch sử tin nhắn trước đây của bạn sẽ không xuất hiện.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">Trên thiết bị khác của bạn, truy cập %1$s để cài đặt Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">Thiết bị đã liên kết của tôi</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Ngừng kết nối</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s đã hủy liên kết</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Đang liên kết thiết bị…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Thiết bị đã được chấp nhận</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Đang tải…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">Không có thiết bị liên kết</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Mở khóa để liên kết thiết bị</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Quét mã QR hiển thị trên thiết bị để liên kết.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Quét Mã QR</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Sử dụng thiết bị này để quét mã QR được hiển thị trên thiết bị bạn muốn liên kết</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">OK</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">Thiết bị này sẽ có thể thấy được nhóm và liên hệ của bạn, truy cập các cuộc trò chuyện của bạn, và gửi tin nhắn dưới tên bạn.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Hoàn tất liên kết trên thiết bị khác của bạn</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">Hoàn tất liên kết với Molly trên thiết bị khác của bạn.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Không thể Liên kết Thiết bị</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">Mã QR này không hợp lệ. Hãy đảm bảo bạn đang quét đúng mã QR trên thiết bị bạn đang muốn liên kết.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Thử lại</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Gỡ liên kết \'%1$s\'?</string>
@@ -852,10 +914,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Tối ưu hóa khi không có dịch vụ Google Play</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Thiết bị này không hỗ trợ dịch vụ Google Play. Nhấn để tắt tính năng tối ưu hóa pin khiến Signal không thể nhận tin nhắn duới nền.</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Thiết bị này không hỗ trợ dịch vụ Google Play. Nhấn để tắt tính năng tối ưu hóa pin khiến Molly không thể nhận tin nhắn duới nền.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Phiên bản này của Signal đã hết hạn. Cập nhật ngay để gửi và nhận tin nhắn.</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Phiên bản này của Molly đã hết hạn. Cập nhật ngay để gửi và nhận tin nhắn.</string>
     <string name="ExpiredBuildReminder_update_now">Cập nhật ngay</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -865,8 +927,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">Xem</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Lỗi thường trực khi giao tiếp qua Signal!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal không thể kết nối với Dịch vụ Google Play. Cuộc gọi và tin nhắn Signal không khả dụng, hãy thử đăng ký lại từ Cài đặt &gt; Nâng cao.</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Lỗi thường trực khi giao tiếp qua Molly!</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly không thể kết nối với Dịch vụ Google Play. Cuộc gọi và tin nhắn Molly không khả dụng, hãy thử đăng ký lại từ Cài đặt &gt; Nâng cao.</string>
 
 
     <!-- GiphyActivity -->
@@ -992,20 +1054,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">Nhật ký gỡ lỗi giúp chúng tôi xác định và khắc phục vấn đề, và không chứa thông tin nhận dạng.</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal đã gặp một vấn đề. Gửi nhật ký gỡ lỗi?</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly đã gặp một vấn đề. Gửi nhật ký gỡ lỗi?</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">Các thông báo giờ đây có thể bị hoãn vì thiết lập tối ưu hóa pin</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">Bạn có thể bỏ các thiết lập tối ưu hóa pin cho Signal để đảm bảo các thông báo tin nhắn không bị hoãn.</string>
+    <string name="PromptBatterySaverBottomSheet__message">Bạn có thể bỏ các thiết lập tối ưu hóa pin cho Molly để đảm bảo các thông báo tin nhắn không bị hoãn.</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Các thông báo giờ đây có thể bị hoãn vì thiết lập tối ưu hóa pin</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Bỏ các thiết lập tối ưu hóa pin cho Molly để đảm bảo các thông báo tin nhắn không bị hoãn. Nhấn “Tiếp tục” để xem hướng dẫn cho từng loại thiết bị.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">Không, cảm ơn</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Tiếp tục</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Tiếp tục</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Bỏ qua</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">Không, cảm ơn</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Lời mời vào nhóm đang chờ</string>
+    <string name="PendingMembersActivity_pending_group_invites">Yêu cầu &amp; lời mời</string>
     <string name="PendingMembersActivity_requests">Yêu cầu</string>
     <string name="PendingMembersActivity_invites">Lời mời</string>
     <string name="PendingMembersActivity_people_you_invited">Những người mà bạn đã mời</string>
@@ -1244,12 +1316,12 @@
     <string name="InviteActivity_cancel">Hủy bỏ</string>
     <string name="InviteActivity_sending">Đang gửi…</string>
     <string name="InviteActivity_invitations_sent">Đã gửi lời mời!</string>
-    <string name="InviteActivity_invite_to_signal">Mời dùng Signal</string>
+    <string name="InviteActivity_invite_to_signal">Mời dùng Molly</string>
     <string name="InviteActivity_send_sms">Gửi SMS (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="other">GỬI %1$d LỜI MỜI QUA SMS?</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">Hãy chuyển sang dùng Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">Hãy chuyển sang dùng Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">Có vẻ như bạn không có bất kỳ ứng dụng nào để chia sẻ.</string>
 
     <!-- LearnMoreTextView -->
@@ -1263,7 +1335,7 @@
     <string name="LongMessageActivity_your_message">Tin nhắn của bạn</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">Kết nối duới nền đã chạy</string>
 
     <!-- MediaOverviewActivity -->
@@ -1327,10 +1399,10 @@
     <string name="MessageQuotesBottomSheet_replies">Câu trả lời</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Đang thiết lập cuộc gọi Signal</string>
+    <string name="NotificationBarManager__establishing_signal_call">Đang thiết lập cuộc gọi Molly</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">Đang khởi động dịch vụ gọi thoại Signal</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Dừng dịch vụ gọi thoại Signal</string>
+    <string name="NotificationBarManager__starting_signal_call_service">Đang khởi động dịch vụ gọi thoại Molly</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Dừng dịch vụ gọi thoại Molly</string>
     <string name="NotificationBarManager__cancel_call">Huỷ cuộc gọi</string>
 
     <!-- NotificationsMegaphone -->
@@ -1574,6 +1646,14 @@
     <string name="MessageRecord_you_activated_payments">Bạn đã bật tính năng Thanh toán</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s giờ đã có thể nhận Thanh toán</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Hiện chưa có thông tin chi tiết về khoản thanh toán</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Nhấn để xem thêm</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Hiện chưa có thông tin chi tiết về khoản thanh toán</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">Hiện chưa có thông tin chi tiết về khoản thanh toán này vì tin nhắn của bạn được khôi phục từ một nguồn không chứa lịch sử thanh toán. Điều này không ảnh hưởng đến số dư trong ví hay trạng thái của những giao dịch thanh toán trước đây.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1628,9 +1708,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">Sắp tới bạn sẽ không thể gửi tin nhắn SMS từ Signal được nữa. Mời %1$s sử dụng Signal để tiếp tục cuộc trò chuyện ở đây.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Bạn không thể gửi tin nhắn SMS từ Signal được nữa. Mời %1$s sử dụng Signal để tiếp tục cuộc trò chuyện ở đây.</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">Bạn không thể gửi tin nhắn SMS từ Molly được nữa. Mời %1$s sử dụng Molly để tiếp tục cuộc trò chuyện ở đây.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Thanh toán: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Thanh toán</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Đã báo cáo là spam</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1704,7 +1786,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">Liên kết một thiết bị dùng Signal?</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Có vẻ như bạn đang cố liên kết một thiết bị dùng Signal bằng phần mềm quét bên thứ 3. Để bảo vệ mình, hãy quét lại đoạn mã sử dụng Signal.</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal cần quyền truy cập Máy ảnh để quét mã QR, nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Máy ảnh\".</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly cần quyền truy cập Máy ảnh để quét mã QR, nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Máy ảnh\".</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Không thể quét mã QR khi không có quyền truy cập Máy ảnh</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1716,11 +1798,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Điền mật khẩu</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Biểu tượng Signal</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Biểu tượng Molly</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">Gửi mật khẩu</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Mật khẩu không đúng!</string>
-    <string name="PassphrasePromptActivity_unlock_signal">Mở khóa Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - Màn hình Khoá</string>
+    <string name="PassphrasePromptActivity_unlock_signal">Mở khóa Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - Màn hình Khoá</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">Bản đồ</string>
@@ -1786,7 +1868,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">Hãy xác minh để tiếp tục nhắn tin.</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Để giúp hạn chế spam trên Signal, vui lòng thực hiện xác minh.</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">Để giúp hạn chế spam trên Molly, vui lòng thực hiện xác minh.</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">Sau khi xác minh, bạn có thể tiếp tục nhắn tin. Những tin nhắn đang tạm dừng sẽ được tự động gửi.</string>
 
     <!-- Recipient -->
@@ -1794,7 +1876,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">Story của tôi</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Cuộc gọi Signal</string>
+    <string name="Recipient_signal_call">Cuộc gọi Molly</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">Chặn</string>
@@ -1808,7 +1890,8 @@
     <string name="RedPhone_ringing">Đang đổ chuông…</string>
     <string name="RedPhone_busy">Bận</string>
     <string name="RedPhone_recipient_unavailable">Người nhận hiện không thể kết nối</string>
-    <string name="RedPhone_network_failed">Lỗi mạng!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Lỗi mạng! Vui lòng kiểm tra kết nối mạng của bạn và thử lại.</string>
     <string name="RedPhone_number_not_registered">Số điện thoại chưa đăng ký!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Số điện thoại vừa rồi không hỗ trợ cuộc gọi bảo mật!</string>
     <string name="RedPhone_got_it">Đã hiểu</string>
@@ -1819,8 +1902,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">Nhấn để bật camera</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Để gọi %1$s, Signal cần quyền truy cập máy ảnh của bạn</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Để gọi %1$s, Molly cần quyền truy cập máy ảnh của bạn</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">Đang gọi…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">Đang kết nối lại…</string>
@@ -1868,10 +1951,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Đã bị gỡ khỏi cuộc gọi</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Có người đã gỡ bạn khỏi cuộc gọi.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Cho phép truy cập camera và microphone của bạn</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Cho phép truy cập microphone của bạn</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Cho phép truy cập camera của bạn</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">Để bắt đầu hoặc tham gia cuộc gọi, hãy cho phép Molly truy cập camera và microphone.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">Để bắt đầu hoặc tham gia cuộc gọi, hãy cho phép Molly truy cập microphone của bạn.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">Để bật video, hãy cho phép Molly truy cập camera của bạn.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly cần các quyền đối với microphone để bắt đầu hoặc tham gia một cuộc gọi.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly cần quyền truy cập camera để bật video của bạn</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">Để bắt đầu hoặc tham gia cuộc gọi:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">Để bật video của bạn:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Cuộc gọi Signal</string>
-    <string name="WebRtcCallView__signal_video_call">Cuộc gọi hình ảnh qua Signal</string>
+    <string name="WebRtcCallView__signal_call">Cuộc gọi Molly</string>
+    <string name="WebRtcCallView__signal_video_call">Cuộc gọi hình ảnh qua Molly</string>
     <string name="WebRtcCallView__start_call">Bắt đầu Cuộc gọi</string>
     <string name="WebRtcCallView__join_call">Tham gia Cuộc gọi</string>
     <string name="WebRtcCallView__call_is_full">Cuộc gọi đã đầy</string>
@@ -1959,18 +2062,35 @@
     <string name="CallOverflowPopupWindow__lower_hand">Hạ Tay</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Hủy</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">Bạn đã giơ tay</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">Xem</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="other">%1$s + %2$d đã giơ tay</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s giơ tay</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s +%2$d giơ tay</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s giơ tay</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s +%2$d giơ tay</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
 
@@ -2055,7 +2175,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">Bạn sẽ nhận được một cuộc gọi để xác nhận số điện thoại này.</string>
     <string name="RegistrationActivity_edit_number">Sửa số</string>
     <string name="RegistrationActivity_missing_google_play_services">Thiếu Dịch vụ Google Play</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Thiết bị này thiếu Dịch vụ Google Play. Bạn vẫn có thể dùng Signal, nhưng thiết đặt này có thể giảm độ tin cậy và hiệu năng ứng dụng.\n\nNếu bạn không phải người dùng nâng cao, hoặc không dùng ROM Android tự chế, hoặc cho rằng đây là lỗi không đáng có, hãy liên lạc support@signal.org để nhờ hỗ trợ.</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">Thiết bị này thiếu Dịch vụ Google Play. Bạn vẫn có thể dùng Molly, nhưng thiết đặt này có thể giảm độ tin cậy và hiệu năng ứng dụng.\n\nNếu bạn không phải người dùng nâng cao, hoặc không dùng ROM Android tự chế, hoặc cho rằng đây là lỗi không đáng có, hãy liên lạc support@molly.im để nhờ hỗ trợ.</string>
     <string name="RegistrationActivity_i_understand">Tôi đã hiểu</string>
     <string name="RegistrationActivity_play_services_error">Lỗi Dịch vụ Google Play</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Dịch vụ Google Play đang cập nhật hoặc tạm thời không khả dụng. Hãy thử lại sau.</string>
@@ -2073,7 +2193,7 @@
     <string name="RegistrationActivity_non_standard_number_format">Định dạng số không chuẩn</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">Số mà bạn nhập vào (%1$s) không đúng. /n/n có phải ý bạn là %2$s?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - Định dạng số điện thoại</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - Định dạng số điện thoại</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">Cuộc gọi được yêu cầu</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2106,8 +2226,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Bạn gặp vấn đề khi đăng ký?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Đảm bảo rằng điện thoại của bạn có tín hiệu dữ liệu di động để nhận tin nhắn SMS hoặc cuộc gọi\n • Đảm bảo rằng bạn có thể nhận cuộc gọi đến số\n • Kiểm tra xem bạn đã nhập đúng số điện thoại của mình.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Để biết thêm thông tin, vui lòng làm theo các bước giải quyết vấn đề sau hoặc Liên hệ Hỗ trợ</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">Để biết thêm thông tin, vui lòng làm theo %1$s hoặc %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">các bước giải quyết vấn đề sau</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2145,13 +2265,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">Thêm vào danh bạ</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">Mời dùng Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">Mời dùng Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Tin nhắn Signal</string>
     <string name="SharedContactDetailsActivity_signal_call">Cuộc gọi Signal</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">Thêm vào danh bạ</string>
-    <string name="SharedContactView_invite_to_signal">Mời dùng Signal</string>
+    <string name="SharedContactView_invite_to_signal">Mời dùng Molly</string>
     <string name="SharedContactView_message">Tin nhắn Signal</string>
 
     <!-- SignalBottomActionBar -->
@@ -2282,11 +2402,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s thuộc về %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Cập nhật Signal</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Đã có phiên bản mới của Signal. Nhấn để cập nhật.</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Cập nhật Signal không thành công</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Cập nhật Molly</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Đã có phiên bản mới của Molly. Nhấn để cập nhật.</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Cập nhật Molly không thành công</string>
     <string name="ApkUpdateNotifications_failed_general_body">Chúng tôi sẽ thử lại sau.</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Cập nhật Signal thành công</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Cập nhật Molly thành công</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">Bạn đã được tự động cập nhật lên phiên bản %1$s.</string>
 
     <!-- UntrustedSendDialog -->
@@ -2356,7 +2476,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">Mã số an toàn Signal của chúng ta:</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">Có vẻ như bạn không có bất kỳ ứng dụng nào để chia sẻ.</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Không tìm thấy mã số an toàn trong clipboard</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal cần quyền truy cập Máy ảnh để quét mã QR, nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Máy ảnh\".</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly cần quyền truy cập Máy ảnh để quét mã QR, nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Máy ảnh\".</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Không thể quét mã QR khi không có quyền truy cập Máy ảnh</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">Bạn phải trao đổi tin nhắn trước để xem được mã số an toàn của %1$s.</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2386,14 +2506,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">Chạm để mở.</string>
-    <string name="KeyCachingService_passphrase_cached">Đã mở khóa Signal </string>
-    <string name="KeyCachingService_lock">Khoá Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Đã mở khóa Molly </string>
+    <string name="KeyCachingService_lock">Khoá Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">Bạn</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Không hỗ trợ định dạng đa phương tiện này</string>
     <string name="MediaPreviewActivity_draft">Nháp</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal cần quyền truy cập Bộ nhớ để lưu tệp vào bộ nhớ, nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Bộ nhớ\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly cần quyền truy cập Bộ nhớ để lưu tệp vào bộ nhớ, nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Bộ nhớ\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Không thể lưu tệp vào bộ nhớ khi không có quyền</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Xóa tin nhắn?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">Thao tác này sẽ xóa vĩnh viễn tin nhắn này.</string>
@@ -2435,7 +2555,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">Không thể gửi tin nhắn.</string>
     <string name="MessageNotifier_error_delivering_message">Có lỗi khi gửi tin nhắn.</string>
     <string name="MessageNotifier_message_delivery_paused">Đang tạm dừng nhắn tin.</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Hãy xác minh để tiếp tục nhắn tin trên Signal.</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">Hãy xác minh để tiếp tục nhắn tin trên Molly.</string>
     <string name="MessageNotifier_mark_all_as_read">Đánh dấu đã đọc tất cả</string>
     <string name="MessageNotifier_mark_read">Đánh dấu đã đọc</string>
     <string name="MessageNotifier_turn_off_these_notifications">Tắt các thông báo này</string>
@@ -2457,7 +2577,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Đã bày tỏ cảm xúc %1$s với nhãn dán của bạn.</string>
     <string name="MessageNotifier_this_message_was_deleted">Tin nhắn này đã bị xóa.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Tắt thông báo khi liên hệ bắt đầu sử dụng Signal? Bạn có thể bật lại ở Signal &gt; Cài đặt &gt; Thông báo.</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Tắt thông báo khi liên hệ bắt đầu sử dụng Molly? Bạn có thể bật lại ở Molly &gt; Cài đặt &gt; Thông báo.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2496,7 +2616,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Trả lời nhanh không khả dụng khi Signal bị khoá!</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Trả lời nhanh không khả dụng khi Molly bị khoá!</string>
     <string name="QuickResponseService_problem_sending_message">Có vấn đề khi gửi tin nhắn!</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2516,7 +2636,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">Shortcut không hợp lệ</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">Tin nhắn mới</string>
     <string name="SingleRecipientNotificationBuilder_message_request">Yêu cầu nhắn tin</string>
     <string name="SingleRecipientNotificationBuilder_you">Bạn</string>
@@ -2561,7 +2681,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Thiết bị này không còn được đăng ký. Nguyên nhân có thể là do bạn đăng ký số điện thoại của bạn với Signal trên một thiết bị khác.</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">Thiết bị này không còn được đăng ký. Nguyên nhân có thể là do bạn đăng ký số điện thoại của bạn với Molly trên một thiết bị khác.</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">Đăng ký lại Thiết bị</string>
 
@@ -2574,10 +2694,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Để trả lời cuộc gọi, hãy cho phép Signal truy cập microphone.</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">Để trả lời cuộc gọi, hãy cho phép Molly truy cập microphone.</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Để trả lời cuộc gọi video, cho phép Signal truy cập microphone và camera.</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal cần quyền truy cập Micro và Máy ảnh để nhận cuộc gọi và gọi, nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Micro\" và \"Máy ảnh\"</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">Để trả lời cuộc gọi video, cho phép Molly truy cập microphone và camera.</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly cần quyền truy cập Micro và Máy ảnh để nhận cuộc gọi và gọi, nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Micro\" và \"Máy ảnh\"</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">Đã trả lời trên một thiết bị liên kết.</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">Đã từ chối trên một thiết bị liên kết.</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">Đã để máy bận trên một thiết bị liên kết.</string>
@@ -2622,16 +2742,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">Lặp lại mật khẩu mới</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">Mời dùng Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">Mời dùng Molly</string>
     <string name="contact_selection_activity__new_group">Tạo nhóm mới</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">Làm mới danh bạ</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">Thiếu ai đó? Hãy thử làm mới</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">Tìm người bạn biết trên Signal</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">Cho phép truy cập danh bạ của bạn</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">Thêm</string>
 
@@ -2648,7 +2768,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">Ảnh liên hệ</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal cần quyền truy cập Danh bạ để hiển thị thông tin liên lạc nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Danh bạ\".</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly cần quyền truy cập Danh bạ để hiển thị thông tin liên lạc nhưng đã bị từ chối vĩnh viễn. Vui lòng mở cài đặt ứng dụng, chọn \"Quyền\" và bật \"Danh bạ\".</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Lỗi nhận liên hệ, vui lòng kiểm tra kết nối mạng</string>
     <string name="ContactSelectionListFragment_username_not_found">Không tìm thấy tên người dùng</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"%1$s không phải người dùng Signal. Hãy kiểm tra tên người dùng và thử lại."</string>
@@ -2665,16 +2785,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">Tìm theo tên người dùng</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">Cho phép truy cập danh bạ</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">Để tìm người bạn biết trên Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">Cho phép Truy cập</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">Không, cảm ơn</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Cho phép truy cập danh bạ của bạn. Danh bạ của bạn được mã hóa và Signal không thể truy cập được.</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal cần quyền truy cập danh bạ để hiển thị chúng.</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly cần quyền truy cập danh bạ để hiển thị chúng.</string>
     <string name="contact_selection_list_fragment__show_contacts">Hiển thị danh bạ</string>
 
     <!-- contact_selection_list_item -->
@@ -2745,6 +2867,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">Bạn đã xóa người này, nếu nhắn tin lại thì người này sẽ được thêm lại vào danh sách của bạn.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Tùy chọn</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Cập nhật</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Phát … Tạm dừng</string>
@@ -2773,7 +2897,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">Bong bóng là một tính năng của Android mà bạn có thể tắt cho các cuộc trò chuyện Signal.</string>
+    <string name="BubbleOptOutTooltip__description">Bong bóng là một tính năng của Android mà bạn có thể tắt cho các cuộc trò chuyện Molly.</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">Để sau</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -2934,9 +3058,9 @@
     <string name="EditProfileFragment__group_description">Miêu tả nhóm</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">Cập nhật Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">Cập nhật Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">Phiên bản này của Signal đã hết hạn. Cập nhật ngay để tiếp tục sử dụng Signal.</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">Phiên bản này của Molly đã hết hạn. Cập nhật ngay để tiếp tục sử dụng Molly.</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">Cập nhật</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3152,7 +3276,7 @@
     <string name="preferences__slow">Chậm</string>
     <string name="preferences__help">Hỗ trợ</string>
     <string name="preferences__advanced">Nâng cao</string>
-    <string name="preferences__donate_to_signal">Ủng hộ Signal</string>
+    <string name="preferences__donate_to_signal">Ủng hộ Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">Riêng tư</string>
     <!-- Preference label for stories -->
@@ -3189,13 +3313,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">Thay đổi tên và biểu tượng ứng dụng thành \"%1$s\"</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Cần phải đóng Signal để thay đổi tên và biểu tượng ứng dụng. Thông báo sẽ luôn hiển thị tên và biểu tượng Signal mặc định.</string>
+    <string name="preferences__app_icon_dialog_description">Cần phải đóng Molly để thay đổi tên và biểu tượng ứng dụng. Thông báo sẽ luôn hiển thị tên và biểu tượng Molly mặc định.</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">Chọn một biểu tượng và tên ứng dụng, chúng sẽ được hiển thị trên màn hình chính và ngăn ứng dụng của điện thoại. Thông báo sẽ luôn hiển thị tên và biểu tượng Signal mặc định. Tìm hiểu thêm</string>
+    <string name="preferences__app_icon_warning_learn_more">Chọn một biểu tượng và tên ứng dụng, chúng sẽ được hiển thị trên màn hình chính và ngăn ứng dụng của điện thoại. Thông báo sẽ luôn hiển thị tên và biểu tượng Molly mặc định. Tìm hiểu thêm</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">Các biểu tượng và tên ứng dụng được hiển thị trên màn hình chính và ngăn ứng dụng.</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">Thông báo sẽ luôn hiển thị tên và biểu tượng Signal mặc định.</string>
+    <string name="preferences__app_icon_notification_warning">Thông báo sẽ luôn hiển thị tên và biểu tượng Molly mặc định.</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">Tìm hiểu thêm</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3241,8 +3365,12 @@
         <item quantity="other">Thao tác này sẽ xóa vĩnh viễn lịch sử cuộc trò chuyện đến %1$s tin nhắn gần đây nhất.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">Thao tác này sẽ xóa vĩnh viễn tất cả lịch sử tin nhắn và đa phương tiện khỏi máy bạn.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">Thao tác này sẽ xóa vĩnh viễn tất cả lịch sử tin nhắn và tệp đa phương tiện trên thiết bị này và bất kỳ thiết bị đã liên kết nào.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Bạn có muốn xóa tất cả lịch sử tin nhắn?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">Tất cả lịch sử tin nhắn sẽ được xóa vĩnh viễn. Thao tác này không thể được hoàn tác.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">Tất cả lịch sử tin nhắn sẽ được xóa vĩnh viễn trên tất cả thiết bị. Hành động này không thể hoàn tác.</string>
     <string name="preferences_storage__delete_all_now">Xóa tất cả</string>
     <string name="preferences_storage__forever">Vĩnh viễn</string>
     <string name="preferences_storage__one_year">1 năm</string>
@@ -3278,7 +3406,7 @@
     <string name="preferences_communication__category_censorship_circumvention">Tránh kiểm duyệt</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">Tránh kiểm duyệt</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Nếu được bật, Signal sẽ thử tránh kiểm duyệt. Không bật tính năng này trừ khi bạn đang ở một nơi đang chặn Signal.</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">Nếu được bật, Molly sẽ thử tránh kiểm duyệt. Không bật tính năng này trừ khi bạn đang ở một nơi đang chặn Molly.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">Tránh kiểm duyệt đã được bật dựa trên số điện thoại trong tài khoản của bạn.</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3330,7 +3458,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">Giới thiệu tính năng thanh toán</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Sử dụng Signal để nhận và gửi MobileCoin, một loại tiền điện tử mới tập trung vào sự riêng tư. Kích hoạt để bắt đầu.</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">Sử dụng Molly để nhận và gửi MobileCoin, một loại tiền điện tử mới tập trung vào sự riêng tư. Kích hoạt để bắt đầu.</string>
     <string name="PaymentsHomeFragment__activate_payments">Kích hoạt Thanh toán</string>
     <string name="PaymentsHomeFragment__activating_payments">Đang kích hoạt thanh toán…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">Khôi phục tài khoản thanh toán</string>
@@ -3356,7 +3484,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">Thanh toán không có sẵn trong khu vực của bạn.</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">Không thể bật thanh toán. Thử lại sau.</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">Huỷ kích hoạt Thanh toán?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Bạn sẽ không thể gửi hoặc nhận MobileCoin trong Signal nếu bạn huỷ kích hoạt thanh toán.</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">Bạn sẽ không thể gửi hoặc nhận MobileCoin trong Molly nếu bạn huỷ kích hoạt thanh toán.</string>
     <string name="PaymentsHomeFragment__deactivate">Huỷ kích hoạt</string>
     <string name="PaymentsHomeFragment__continue">Tiếp tục</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">Số dư hiện không có.</string>
@@ -3365,10 +3493,10 @@
     <string name="PaymentsHomeFragment__details">Chi tiết</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Bạn có thể dùng Signal để gửi và nhận MobileCoin. Tất cả các khoản thanh toán đều nằm trong phạm vi điều chỉnh của Điều khoản Sử dụng cho MobileCoin và Ví MobileCoin. Bạn có thể gặp một số vấn đề và các thanh toán hoặc số dư bạn có thể mất sẽ không thể được khôi phục. </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">Bạn có thể dùng Molly để gửi và nhận MobileCoin. Tất cả các khoản thanh toán đều nằm trong phạm vi điều chỉnh của Điều khoản Sử dụng cho MobileCoin và Ví MobileCoin. Bạn có thể gặp một số vấn đề và các thanh toán hoặc số dư bạn có thể mất sẽ không thể được khôi phục. </string>
     <string name="PaymentsHomeFragment__activate">Kích hoạt</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">Xem điều khoản MobileCoin</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Thanh toán trong Signal không còn nữa. Bạn vẫn có thể chuyển quỹ vào một sàn trao đổi nhưng bạn không thể gửi và nhận thanh toán hoặc thêm quỹ.</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Thanh toán trong Molly không còn nữa. Bạn vẫn có thể chuyển quỹ vào một sàn trao đổi nhưng bạn không thể gửi và nhận thanh toán hoặc thêm quỹ.</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3396,7 +3524,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">Đồng ý Cho phép</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Để giúp bạn nhắn tin cho người bạn biết, Signal sẽ yêu cầu có các quyền này. </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Để giúp bạn nhắn tin cho người bạn biết, Molly sẽ yêu cầu có các quyền này. </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">Thông báo</string>
     <!-- Notifications permission row description -->
@@ -3484,10 +3612,10 @@
     <string name="PaymentsTransferFragment__next">Tiếp</string>
     <string name="PaymentsTransferFragment__invalid_address">Địa chỉ không hợp lệ</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">Kiểm tra địa chỉ ví bạn đang thử chuyển đến và thử lại.</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Bạn không thể chuyển đến địa chỉ ví Signal của chính mình. Nhập địa chỉ ví từ tài khoản của bạn ở một sàn trao đổi có hỗ trợ.</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Để quét một mã QR, Signal cần truy cập vào camera.</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal cần sự cho phép Camera để nhận mã QR. Đi đến cài đặt, chọn \"Cho phép\", và bật \"Camera\".</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Để quét một mã QR, Signal cần truy cập vào camera.</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">Bạn không thể chuyển đến địa chỉ ví Molly của chính mình. Nhập địa chỉ ví từ tài khoản của bạn ở một sàn trao đổi có hỗ trợ.</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Để quét một mã QR, Molly cần truy cập vào camera.</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly cần sự cho phép Camera để nhận mã QR. Đi đến cài đặt, chọn \"Cho phép\", và bật \"Camera\".</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Để quét một mã QR, Molly cần truy cập vào camera.</string>
     <string name="PaymentsTransferFragment__settings">Cài đặt</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3826,17 +3954,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Cuộc gọi thoại Signal đến</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Cuộc gọi thoại Molly đến</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Cuộc gọi video Signal đến</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Cuộc gọi video Molly đến</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Đang có cuộc gọi nhóm Signal đến</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Đang có cuộc gọi nhóm Molly đến</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Đang gọi thoại Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Đang gọi thoại Molly</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Đang gọi video Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Đang gọi video Molly</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Đang gọi nhóm Signal</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Đang gọi nhóm Molly</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">Đang tải…</string>
@@ -3883,9 +4011,9 @@
     <string name="BackupDialog_verify">Kiểm chứng</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">Bạn đã điền mật khẩu sao lưu thành công</string>
     <string name="BackupDialog_passphrase_was_not_correct">Mật khẩu không chính xác</string>
-    <string name="LocalBackupJob_creating_signal_backup">Đang tạo bản sao lưu Signal…</string>
+    <string name="LocalBackupJob_creating_signal_backup">Đang tạo bản sao lưu Molly…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">Đang xác minh bản lưu dự phòng của Signal…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">Đang xác minh bản lưu dự phòng của Molly…</string>
     <string name="LocalBackupJobApi29_backup_failed">Sao lưu thất bại.</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">Thư mục sao lưu của bạn đã bị Xóa hoặc dời đi.</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">Tập tin sao lưu của bạn quá lớn để có thể được lưu trữ trên ổ này.</string>
@@ -3900,15 +4028,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">Gọi tôi (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">Gửi lại Mã (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">Liên lạc Bộ phận hỗ trợ Signal</string>
-    <string name="RegistrationActivity_code_support_subject">Đăng ký Signal - Mã Xác minh cho Android</string>
+    <string name="RegistrationActivity_contact_signal_support">Liên lạc Bộ phận hỗ trợ Molly</string>
+    <string name="RegistrationActivity_code_support_subject">Đăng ký Molly - Mã Xác minh cho Android</string>
     <string name="RegistrationActivity_incorrect_code">Mã không đúng</string>
     <string name="BackupUtil_never">Không bao giờ</string>
     <string name="BackupUtil_unknown">Không rõ</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">Số điện thoại</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">Chọn người có thể thấy số điện thoại của bạn và người có thể liên hệ với bạn trên Signal với số đó.</string>
+    <string name="preferences_app_protection__choose_who_can_see">Chọn người có thể thấy số điện thoại của bạn và người có thể liên hệ với bạn trên Molly với số đó.</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">Ai Có Thể Thấy Số Điện Thoại Của Tôi</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -3956,7 +4084,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">Bạn đã thử quá nhiều lần. Vui lòng thử lại sau.</string>
     <string name="RegistrationActivity_error_connecting_to_service">Lỗi kết nối tới dịch vụ</string>
     <string name="preferences_chats__backups">Sao lưu</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal đã khoá</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly đã khoá</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">NHẤN ĐỂ MỞ KHOÁ</string>
     <string name="Recipient_unknown">Vô danh</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -3987,9 +4115,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">Bạn cần truy cập thiết bị cũ của mình.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Khôi phục từ bản sao lưu</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Khôi phục tin nhắn của bạn từ bản sao lưu cục bộ. Nếu bạn không khôi phục bây giờ, bạn sẽ không khôi phục được sau này.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Khôi phục bản sao lưu cục bộ</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Khôi phục bản sao lưu của Signal</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Khôi phục tất cả tin nhắn + tệp đa phương tiện trong 30 ngày qua của bạn</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">Tùy chọn khác</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Hủy</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Đăng nhập và không chuyển dữ liệu</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Tiếp tục và không chuyển tin nhắn cùng tệp đa phương tiện</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Mở Signal trên thiết bị Android cũ của bạn</string>
     <string name="NewDeviceTransferInstructions__continue">Tiếp tục</string>
@@ -4004,19 +4139,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">Đang chuẩn bị kết nối với thiết bị Android cũ…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">Chỉ mất một lúc, sẽ hoàn thành sớm thôi</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">Đang chờ kết nối với thiết bị Android cũ…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal cần quyền truy cập vị trí để kết nối và ngắt kết nối với thiết bị Android cũ của bạn.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal cần dịch vụ Vị trí được bật để kết nối và ngắt kết nối với thiết bị Android cũ của bạn.</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal cần Wi-Fi được bật để phát hiện và kết nối với thiết bị Android cũ của bạn. Wi-Fi cần được bật nhưng không bắt buộc phải kết nối với một mạng Wi-Fi nào đó.</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Xin lỗi, có vẻ như thiết bị này không hỗ trợ Wi-Fi Direct. Signal sử dụng Wi-Fi Direct để phát hiện và kết nối với thiết bị Android cũ của bạn. Bạn vẫn có thể khôi phục sao lưu hoặc khôi phục tài khoản trên thiết bị Android cũ của bạn.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly cần quyền truy cập vị trí để kết nối và ngắt kết nối với thiết bị Android cũ của bạn.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly cần dịch vụ Vị trí được bật để kết nối và ngắt kết nối với thiết bị Android cũ của bạn.</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly cần Wi-Fi được bật để phát hiện và kết nối với thiết bị Android cũ của bạn. Wi-Fi cần được bật nhưng không bắt buộc phải kết nối với một mạng Wi-Fi nào đó.</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Xin lỗi, có vẻ như thiết bị này không hỗ trợ Wi-Fi Direct. Molly sử dụng Wi-Fi Direct để phát hiện và kết nối với thiết bị Android cũ của bạn. Bạn vẫn có thể khôi phục sao lưu hoặc khôi phục tài khoản trên thiết bị Android cũ của bạn.</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">Khôi phục bản sao lưu</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Lỗi không xác định khi đang cố gắng kết nối với thiết bị Android cũ của bạn.</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">Đang tìm thiết bị Android mới…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal cần quyền truy cập vị trí để kết nối và ngắt kết nối với thiết bị Android mới của bạn.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal cần dịch vụ Vị trí được bật để kết nối và ngắt kết nối với thiết bị Android mới của bạn.</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal cần Wi-Fi được bật để phát hiện và kết nối với thiết bị Android mới của bạn. Wi-Fi cần được bật nhưng không bắt buộc phải kết nối với một mạng Wi-Fi nào đó.</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Xin lỗi, có vẻ như thiết bị này không hỗ trợ Wi-Fi Direct. Signal sử dụng Wi-Fi Direct để phát hiện và kết nối với thiết bị Android mới của bạn. Bạn vẫn có thể tạo bản sao lưu để khôi phục tài khoản trên thiết bị Android mới của bạn.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly cần quyền truy cập vị trí để kết nối và ngắt kết nối với thiết bị Android mới của bạn.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly cần dịch vụ Vị trí được bật để kết nối và ngắt kết nối với thiết bị Android mới của bạn.</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly cần Wi-Fi được bật để phát hiện và kết nối với thiết bị Android mới của bạn. Wi-Fi cần được bật nhưng không bắt buộc phải kết nối với một mạng Wi-Fi nào đó.</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">Xin lỗi, có vẻ như thiết bị này không hỗ trợ Wi-Fi Direct. Molly sử dụng Wi-Fi Direct để phát hiện và kết nối với thiết bị Android mới của bạn. Bạn vẫn có thể tạo bản sao lưu để khôi phục tài khoản trên thiết bị Android mới của bạn.</string>
     <string name="OldDeviceTransferSetup__create_a_backup">Tạo bản sao lưu</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">Lỗi không xác định khi đang cố gắng kết nối với thiết bị Android mới của bạn.</string>
 
@@ -4057,7 +4192,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">Đang chuyển dữ liệu</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">Giữ cả hai thiết bị gần nhau. Không tắt các thiết bị và để mở Signal. Việc chuyển được bảo mật hai chiều.</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">Giữ cả hai thiết bị gần nhau. Không tắt các thiết bị và để mở Molly. Việc chuyển được bảo mật hai chiều.</string>
     <string name="DeviceTransfer__d_messages_so_far">Đã được %1$d tin nhắn…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% trong tổng số tin nhắn cho đến nay…</string>
@@ -4071,7 +4206,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">Chuyển Tài khoản</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Tải Signal trên thiết bị Android mới của bạn</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">Tải Molly trên thiết bị Android mới của bạn</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"Nhấn vào \"Chuyển hoặc khôi phục tài khoản\""</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4145,7 +4280,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">Bất cứ ai với đường dẫn này có thể xem tên và ảnh nhóm và gửi yêu cầu tham gia. Chỉ chia sẻ với những người mà bạn tin tưởng.</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">Bất cứ ai với đường dẫn này có thể xem tên và ảnh nhóm và tham gia nhóm. Chỉ chia sẻ với những người mà bạn tin tưởng.</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">Chia sẻ qua Signal</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">Chia sẻ qua Molly</string>
     <string name="GroupLinkBottomSheet_copy">Sao chép</string>
     <string name="GroupLinkBottomSheet_qr_code">Mã QR</string>
     <string name="GroupLinkBottomSheet_share">Chia sẻ</string>
@@ -4324,7 +4459,7 @@
     <string name="payment_info_card_about_mobilecoin">Về MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin là một tiền tệ điện tử mới tập trung vào sự riêng tư.</string>
     <string name="payment_info_card_adding_funds">Thêm quỹ</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">Bạn có thể thêm quỹ để sử dụng trong Signal bằng cách gửi MobileCoin vào địa chỉ ví của mình.</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">Bạn có thể thêm quỹ để sử dụng trong Molly bằng cách gửi MobileCoin vào địa chỉ ví của mình.</string>
     <string name="payment_info_card_cashing_out">Rút tiền</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">Bạn có thể rút tiền mặt MobileCoin bất kì lúc nào trên một sàn trao đổi có hỗ trợ MobileCoin. Chỉ cần thực hiện một chuyển khoản vào tài khoản của bạn ở sàn trao đổi đó.</string>
     <string name="payment_info_card_hide_this_card">Ẩn thẻ này?</string>
@@ -4345,12 +4480,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">Ngưng kích hoạt ví</string>
     <string name="DeactivateWalletFragment__your_balance">Số dư của bạn</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">Bạn được khuyến khích chuyển khoản quỹ của mình sang một địa chỉ ví khác trước khi ngưng kích hoạt thanh toán. Nếu bạn chọn không chuyển khoản quỹ của mình bây giờ, chúng sẽ nằm trong ví của bạn mà đã được liên kết với Signal khi bạn kích hoạt lại thanh toán.</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">Bạn được khuyến khích chuyển khoản quỹ của mình sang một địa chỉ ví khác trước khi ngưng kích hoạt thanh toán. Nếu bạn chọn không chuyển khoản quỹ của mình bây giờ, chúng sẽ nằm trong ví của bạn mà đã được liên kết với Molly khi bạn kích hoạt lại thanh toán.</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">Chuyển khoản số dư còn lại</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">Ngưng kích hoạt mà không chuyển khoản</string>
     <string name="DeactivateWalletFragment__deactivate">Ngưng kích hoạt</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">Ngưng kích hoạt mà không chuyển khoản?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">Số dư của bạn sẽ giữ nguyên trong ví mà đã được liên kết với Signal nếu như bạn chọn để kích hoạt lại thanh toán.</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">Số dư của bạn sẽ giữ nguyên trong ví mà đã được liên kết với Molly nếu như bạn chọn để kích hoạt lại thanh toán.</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">Gặp lỗi khi ngưng kích hoạt ví.</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4643,7 +4778,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">Các loại giấy phép</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">Điều khoản &amp; Quyền riêng tư</string>
-    <string name="HelpFragment__copyright_signal_messenger">Bản quyền Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">Bản quyền Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">Được cấp phép GNU AGPLv3</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4658,7 +4793,7 @@
 
     <!-- ChatColorSelectionFragment -->
     <!-- Text shown on a circle button to indicate the app will automatically select a color for conversation bubbles for this chat. -->
-    <string name="ChatColorSelectionFragment__auto">Tự động</string>
+    <string name="ChatColorSelectionFragment__auto">Auto</string>
     <string name="ChatColorSelectionFragment__use_custom_colors">Sử dụng màu tuỳ chỉnh</string>
     <string name="ChatColorSelectionFragment__chat_color">Màu cuộc trò chuyện</string>
     <string name="ChatColorSelectionFragment__edit">Sửa</string>
@@ -4881,9 +5016,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Chọn màu</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Chia sẻ</string>
 
@@ -4913,7 +5045,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Chỉ có quản trị viên mới có thể gửi tin nhắn vào nhóm này.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Giới hạn</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">Bạn không thể chọn nhiều hơn 5 cuộc trò chuyện</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5088,9 +5221,9 @@
     <string name="MySupportPreference__learn_more">Tìm hiểu thêm</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">Cập nhật Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">Cập nhật Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">Phiên bản này của Signal đã hết hạn. Cập nhật ngay để tiếp tục sử dụng Signal.</string>
+    <string name="UpdateSignalExpiredDialog__message">Phiên bản này của Molly đã hết hạn. Cập nhật ngay để tiếp tục sử dụng Molly.</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">Cập nhật</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5099,7 +5232,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">Thiết bị không được đăng ký</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">Thiết bị này không còn được đăng ký. Đăng ký lại để tiếp tục sử dụng Signal trên thiết bị này.</string>
+    <string name="ReregisterSignalDialog__message">Thiết bị này không còn được đăng ký. Đăng ký lại để tiếp tục sử dụng Molly trên thiết bị này.</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">Đăng ký lại</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5393,7 +5526,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">Không mở được bộ chọn.</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Để bật thông báo, Signal cần có quyền để hiển thị thông báo.</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Để bật thông báo, Molly cần có quyền để hiển thị thông báo.</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">Bật</string>
 
@@ -5539,8 +5672,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">Chưa có phản hồi</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">Bạn không thể trả lời story này vì bạn không còn là thành viên của nhóm này.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Đã bày tỏ cảm xúc với story</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Đã bày tỏ cảm xúc với story</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Đã bày tỏ cảm xúc với story</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Lượt xem</string>
     <!-- Label for story replies tab -->
@@ -6140,8 +6275,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Chọn ngân hàng</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Xác Nhận Khoản Ủng Hộ với %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">Để thiết lập khoản ủng hộ định kỳ, nhấn tiếp tục để xác nhận trả một khoản €0,01 qua ngân hàng. Khoản này sẽ được tự động hoàn lại và cho phép khoản ủng hộ €5/tháng được trừ từ tài khoản của bạn.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">Để thiết lập khoản ủng hộ định kỳ, nhấn tiếp tục để xác nhận trả một khoản €0,01 qua ngân hàng. Khoản này sẽ được tự động hoàn lại và cho phép khoản ủng hộ %1$s/tháng được trừ từ tài khoản của bạn.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Tiếp tục</string>
 
@@ -6710,6 +6845,50 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Đang tải dữ liệu sao lưu…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Sao lưu tập tin đa phương tiện đã được tắt</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="other">Gói đăng ký sao lưu tập tin đa phương tiện Signal của bạn đã bị hủy vì chúng tôi không thể xử lý khoản thanh toán của bạn. Bạn có %1$d ngày để tải xuống bất kỳ tập tin đa phương tiện nào có trong bản sao lưu của mình. Sau %1$d ngày, tập tin đa phương tiện trong bản sao lưu của bạn sẽ bị xóa.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">Bạn có thể thanh toán cho gói sao lưu bất kỳ lúc nào để tiếp tục sao lưu tất cả tập tin đa phương tiện của mình. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Tập tin đa phương tiện của bạn sẽ được xóa vào hôm nay</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Gói đăng ký sao lưu tập tin đa phương tiện Signal của bạn đã bị hủy vì chúng tôi không thể xử lý khoản thanh toán của bạn. Đây là cơ hội cuối cùng để bạn tải tập tin đa phương tiện trong bản sao lưu của mình trước khi những nội dung này bị xóa.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Không thể hoàn tất tải xuống</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Thiết bị của bạn không có đủ dung lượng trống. Giải phóng đến %1$s dung lượng để tải xuống tập tin đa phương tiện được lưu trữ trong bản sao lưu của bạn.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="other">Nếu chọn \"Bỏ qua\", tập tin đa phương tiện trong bản sao lưu của bạn sẽ được xóa trong %1$d ngày.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Không thể xử lý khoản thanh toán</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">Chúng tôi gặp vấn đề khi xử lý khoản thanh toán hằng tháng cho gói đăng ký sao lưu của bạn. Hãy đảm bảo rằng phương thức thanh toán của bạn đã được cập nhật thông tin mới nhất. Nếu chưa, hãy cập nhật trên Google Pay. Signal sẽ thử xử lý lại khoản thanh toán trong vài ngày nữa.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Không thể hoàn tất sao lưu</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Thiết bị của bạn chưa có bản sao lưu hoàn chỉnh trong %1$d ngày. Đảm bảo thiết bị của bạn đã kết nối wi-fi và nhấn \"Sao lưu ngay\". </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Tìm hiểu thêm</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Bỏ qua</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Tải tập tin đa phương tiện ngay</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Tải xuống sau</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Không tải tập tin đa phương tiện</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Giải phóng đến %1$s dung lượng để tải xuống tập tin đa phương tiện của bạn.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Thẻ tín dụng hoặc ghi nợ</string>
@@ -6723,6 +6902,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Không rõ</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Lịch sử thanh toán</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Bản sao lưu gần nhất của bạn là vào lúc %2$s ngày %1$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6733,6 +6918,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Tin nhắn cũ hơn thời gian đã chọn sẽ được xóa vĩnh viễn.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Tin nhắn vượt quá độ dài đã chọn sẽ được xóa vĩnh viễn.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Áp dụng giới hạn cho các thiết bị đã liên kết</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">Khi được bật, giới hạn của cuộc trò chuyện cũng sẽ xóa tin nhắn trên các thiết bị đã liên kết của bạn.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Việc xóa nay được đồng bộ trên tất cả thiết bị của bạn</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">Khi bạn xóa tin nhắn hoặc cuộc trò chuyện, chúng sẽ được xóa trên điện thoại của bạn và tất cả thiết bị đã liên kết.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Lịch sử thanh toán</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Bản sao lưu tin nhắn và tất cả tập tin đa phương tiện</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Chi tiết Thanh toán</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Loại bản sao lưu</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Ngày chi trả</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Chia sẻ</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Bản sao lưu Signal</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Lịch sử thanh toán</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Thông tin bản sao lưu</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Kích thước bản sao lưu</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Tần suất sao lưu</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Sao lưu bằng dữ liệu di động</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Tắt và xóa bản sao lưu</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Bản sao lưu đã được xóa và tắt.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Loại bản sao lưu đã thay đổi và gói đăng ký đã được hủy</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Quyên góp đã bị hủy bỏ</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Tải xuống hoàn tất</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Loại bản sao lưu</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Đã tắt sao lưu</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/tháng</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Bật sao lưu</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Bản sao lưu gần nhất</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s vào lúc %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Không bao giờ</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Sao lưu Ngay</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Tắt và xóa bản sao lưu?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">Bạn sẽ không còn bị trừ tiền. Bản sao lưu của bạn sẽ được xóa và các bản sao lưu mới sẽ không được tạo nữa.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Tắt và xóa</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Đang xóa bản sao lưu…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Đã xóa bản sao lưu</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"Khi nhấn Sao lưu ngay"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Hằng ngày</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Hằng tuần</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Hằng tháng</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Sao lưu thủ công</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Vui lòng nhập mã PIN, mật khẩu hoặc mã khóa dạng vẽ hình của thiết bị.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Tiếp</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Đổi loại bản sao lưu</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Hủy Gói Ủng hộ</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Xác nhận hủy</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">Bạn sẽ không còn bị trừ tiền. Việc sao lưu sẽ được ngừng lại vào cuối kỳ thanh toán. Sau mốc thời gian đó, bạn sẽ có 30 ngày để tải xuống những tập tin đa phương tiện bạn hiện đang sao lưu.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Xác nhận và tải xuống ngay</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Xác nhận và tải xuống sau</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Giữ gói đăng ký</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-yue/strings.xml b/app/src/main/res/values-yue/strings.xml
index 3bba168727..d8f724a53d 100644
--- a/app/src/main/res/values-yue/strings.xml
+++ b/app/src/main/res/values-yue/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal 做緊更新…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly 做緊更新…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">您仲未設定一個密碼喎！</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">係咪要停用密碼？</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">之後 Signal 同埋所有訊息通知就唔會再上鎖。</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">之後 Molly 同埋所有訊息通知就唔會再上鎖。</string>
     <string name="ApplicationPreferencesActivity_disable">停用</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">伺服器連唔到線！</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">註冊鎖需要用到 PIN 碼。停用 PIN 碼嘅話，就要先停用註冊鎖。</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">檔案</string>
     <string name="AttachmentKeyboard_contact">聯絡人</string>
     <string name="AttachmentKeyboard_location">位置</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal 要有權限先可以顯示你嘅相片同影片</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly 要有權限先可以顯示你嘅相片同影片</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">允許存取</string>
     <string name="AttachmentKeyboard_payment">付款</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">搵唔到俾您揀多媒體嘅 app。</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal 要攞「儲存裝置」權限，先可以加入相片、影片或者聲音做附件，但權限已被永久拒絕。請到呢個 app 嘅設定功能表，揀選「權限」，然後啟用「儲存裝置」。</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal 要攞「聯絡人」權限，先可以加入聯絡人資訊做附件，但權限已被永久拒絕。請到呢個 app 嘅設定功能表，揀選「權限」，然後啟用「聯絡人」。</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal 要攞「位置」權限，先可以加入位置，但權限已被永久拒絕。請到呢個 app 嘅設定功能表，揀選「權限」，然後啟用「位置」。</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly 要攞「儲存裝置」權限，先可以加入相片、影片或者聲音做附件，但權限已被永久拒絕。請到呢個 app 嘅設定功能表，揀選「權限」，然後啟用「儲存裝置」。</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly 要攞「聯絡人」權限，先可以加入聯絡人資訊做附件，但權限已被永久拒絕。請到呢個 app 嘅設定功能表，揀選「權限」，然後啟用「聯絡人」。</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly 要攞「位置」權限，先可以加入位置，但權限已被永久拒絕。請到呢個 app 嘅設定功能表，揀選「權限」，然後啟用「位置」。</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">允許存取你嘅位置</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">要傳送你嘅位置：</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">如果想傳送位置，請允許 Signal 存取你嘅位置。</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">如果想傳送位置，請允許 Molly 存取你嘅位置。</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal 需要位置存取權，先可以傳送你嘅位置。</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly 需要位置存取權，先可以傳送你嘅位置。</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">允許存取儲存空間</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">顯示相片同影片：</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal 要有儲存空間嘅存取權先可以顯示你啲相同影片。</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly 要有儲存空間嘅存取權先可以顯示你啲相同影片。</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s 未啟動付款 </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">轉相機</string>
     <string name="CameraXFragment_open_gallery_description">打開圖片庫</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">允許存取</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">允許存取你嘅相機同咪</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">允許存取你嘅相機</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">允許存取咪高風</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">要影相嘅話，請允許 Signal 存取你嘅相機。</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">要影相或者拍片嘅話，請允許 Signal 存取您部機嘅相機。</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">要影相同拍片嘅話，請允許 Signal 存取你嘅相機同咪。</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">要拍有聲片嘅話，請允許 Signal 存取你個咪。</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">要掃二維碼嘅話，Signal 需要存取你嘅相機。</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal 需要相機嘅存取權先可以影相</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal 需要相機嘅存取權先可以掃描二維碼</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal 需要咪嘅存取權先可以拍片</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">要喺 Signal 影相：</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">要喺 Signal 影相同拍片：</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">要拍有聲片：</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">要掃描二維碼：</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">最近嘅聯絡人</string>
@@ -270,7 +271,7 @@
     <string name="CameraContacts_no_signal_contacts">無 Signal 聯絡人</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">個影相掣淨係可以用嚟影相畀 Signal 聯絡人睇。 </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">搵唔到邊個個人名？</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">誠邀聯絡人轉用 Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">誠邀聯絡人轉用 Molly</string>
     <string name="CameraContacts__menu_search">搜尋</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -284,12 +285,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">唔使喇，唔該晒</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">更新 Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">更新 Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">呢個版本嘅 app 已經唔支援喇。麻煩您升級到最新版本吖，咁先可以繼續收發訊息。</string>
     <string name="ClientDeprecatedActivity_update">更新</string>
     <string name="ClientDeprecatedActivity_dont_update">唔更新</string>
     <string name="ClientDeprecatedActivity_warning">警告</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">呢個版本嘅 Signal 已經 out 咗喇。您可以睇返先前嘅訊息記錄，但係要升咗級先至可以收發訊息。</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">呢個版本嘅 Molly 已經 out 咗喇。您可以睇返先前嘅訊息記錄，但係要升咗級先至可以收發訊息。</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">搵唔到網頁瀏覽器。</string>
@@ -326,8 +327,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">寫個訊息畀 %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly 語音通話 %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly 視像通話 %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -419,7 +420,7 @@
     <string name="ConversationActivity_transport_signal">Signal 訊息</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">傳送訊息</string>
-    <string name="ConversationActivity_lets_switch_to_signal">不如我哋齊齊轉會 Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">不如我哋齊齊轉會 Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">請揀一位聯絡人吖</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">附件太大，擠唔落您而家寫緊嘅呢類訊息度。</string>
     <string name="ConversationActivity_unable_to_record_audio">錄唔到音噃！</string>
@@ -438,18 +439,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">要傳送語音訊息：</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">如果想傳送語音訊息，請允許 Signal 存取你個咪。</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">如果想傳送語音訊息，請允許 Molly 存取你個咪。</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal 需要咪高風存取權，先可以錄語音訊息。</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal 要攞「麥克風」權限，先可以傳送語音訊息，但權限已被永久拒絕。請到呢個 app 嘅應用程式設定，揀選「權限」，然後啟用「麥克風」。</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly 需要咪高風存取權，先可以錄語音訊息。</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly 要攞「麥克風」權限，先可以傳送語音訊息，但權限已被永久拒絕。請到呢個 app 嘅應用程式設定，揀選「權限」，然後啟用「麥克風」。</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal 要攞「麥克風」同「相機」權限，先可以同 %1$s 通話，但權限已被永久拒絕。請到呢個 app 嘅應用程式設定，揀選「權限」，然後啟用「麥克風」同「相機」。</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">要影相或者拍片嘅話，請允許 Signal 存取您部機嘅相機。</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal 要攞「相機」權限，先可以影相或拍片，但權限已被永久拒絕。請到呢個 app 嘅應用程式設定，揀選「權限」，然後啟用「相機」。</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal 要攞「相機」權限去影相或拍片</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly 要攞「麥克風」同「相機」權限，先可以同 %1$s 通話，但權限已被永久拒絕。請到呢個 app 嘅應用程式設定，揀選「權限」，然後啟用「麥克風」同「相機」。</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">要影相或者拍片嘅話，請允許 Molly 存取您部機嘅相機。</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly 要攞「相機」權限，先可以影相或拍片，但權限已被永久拒絕。請到呢個 app 嘅應用程式設定，揀選「權限」，然後啟用「相機」。</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly 要攞「相機」權限去影相或拍片</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">啟用「麥克風」權限，挺拍片時可以收埋音。</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal 要攞「麥克風」權限，先可以拍片，但權限已被永久拒絕。請到呢個 app 嘅應用程式設定，揀選「權限」，然後啟用「麥克風」同「相機」。</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal 要攞「麥克風」權限去拍片</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly 要攞「麥克風」權限，先可以拍片，但權限已被永久拒絕。請到呢個 app 嘅應用程式設定，揀選「權限」，然後啟用「麥克風」同「相機」。</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly 要攞「麥克風」權限去拍片</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">唔係</string>
@@ -470,9 +471,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">要開始通話：</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">如果想開始通話，請允許 Signal 存取你個咪。</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">如果想開始通話，請允許 Molly 存取你個咪。</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal 需要咪高風存取權，先可以開始通話。</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly 需要咪高風存取權，先可以開始通話。</string>
 
 
     <string name="ConversationActivity_join">摻埋我</string>
@@ -486,9 +487,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Signal 唔會再支援短訊功能。邀請 %1$s 加入 Signal 繼續你哋嘅對話。</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">呢個人冇再用 Signal 喇。邀請佢加入 Signal 繼續對話啦。</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">呢個人冇再用 Molly 喇。邀請佢加入 Molly 繼續對話啦。</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">拉隊嚟 Signal</string>
+    <string name="ConversationActivity__invite_to_signal">拉隊嚟 Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">我哋稍後會再提醒你。</string>
 
@@ -536,6 +537,8 @@
     <string name="ConversationFragment_delete_for_everyone">喺所有人部機度刪除</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">喺呢部裝置度刪除</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">刪除</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">喺所有裝置上面刪除</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">呢個訊息會喺聊天入面所有用緊 Signal 最新版本嘅人部機度刪除。佢哋會見到你刪除咗一個訊息。</string>
@@ -567,13 +570,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">封鎖咗</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">更新 Signal</string>
+    <string name="ConversationFragment__update_build">更新 Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">重新註冊 Signal</string>
+    <string name="ConversationFragment__reregister_signal">重新註冊 Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">返去上一頁。</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">開啟 Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">開啟 Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">唔再經驗證</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -636,6 +639,10 @@
     <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
         <item quantity="other">咁做嘅話，全部 %1$d 個揀選咗嘅聊天就會永久刪除。</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="other">咁做嘅話，全部 %1$d 個揀選咗嘅聊天就會喺你所有裝置度永久刪除。</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">刪除緊</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="other">刪除緊揀選咗嘅聊天…</item>
@@ -719,9 +726,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">邊個可以用電話號碼搵到我？</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">任何有你電話冧把嘅人都會睇到你用緊 Signal，同埋可以開始聊天。</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">任何有你電話冧把嘅人都會睇到你用緊 Molly，同埋可以開始聊天。</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">除非你向對方傳送訊息或者雙方已經有聊天紀錄，如果唔係冇人會睇到你用緊 Signal。</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">除非你向對方傳送訊息或者雙方已經有聊天紀錄，如果唔係冇人會睇到你用緊 Molly。</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">係咪要攞返備份嚟還原？</string>
@@ -755,7 +762,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">測試下您備份嘅密碼，睇下啱唔啱</string>
     <string name="BackupsPreferenceFragment__turn_on">開啟</string>
     <string name="BackupsPreferenceFragment__turn_off">關閉</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"要還原一個備份嘅話，首先請重新裝過 Signal。開返個 app 出嚟，撳一下「還原備份」，然後揀返嗰一個備份檔。%1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"要還原一個備份嘅話，首先請重新裝過 Molly。開返個 app 出嚟，撳一下「還原備份」，然後揀返嗰一個備份檔。%1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">講多啲畀我聽</string>
     <string name="BackupsPreferenceFragment__in_progress">幫緊您幫緊您…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -763,7 +770,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">暫時去到 %1$d…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">暫時去到 %1$s%%…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal 要攞外部儲存裝置權限，先可以建立備份，但權限已被永久拒絕。請到呢個 app 嘅應用程式設定，揀選「權限」，然後啟用「儲存裝置」。</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly 要攞外部儲存裝置權限，先可以建立備份，但權限已被永久拒絕。請到呢個 app 嘅應用程式設定，揀選「權限」，然後啟用「儲存裝置」。</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">設定備份時間</string>
 
@@ -830,7 +837,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">傾偈階段已經重新整理</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal 採用端對端加密，間唔中都需要重新整理下您嘅傾偈階段嘅。咁唔會影響您傾偈嘅安全性，只不過就話，您可能錯失咗呢位聯絡人畀您嘅一個訊息，您可以請佢再傳送一次畀您。</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly 採用端對端加密，間唔中都需要重新整理下您嘅傾偈階段嘅。咁唔會影響您傾偈嘅安全性，只不過就話，您可能錯失咗呢位聯絡人畀您嘅一個訊息，您可以請佢再傳送一次畀您。</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">喺桌面電腦或者 iPad 度用 Signal。訊息會同步至連結咗嘅裝置。</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">連結新裝置</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s 所有裝置上嘅訊息同聊天資料都有端對端加密保護</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">桌面電腦或者 iPad 上嘅 Signal</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">所有連結裝置上面嘅訊息都係私密嘅</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">連結之後，Molly 訊息會同手機上嘅 Molly 同步。之前嘅訊息記錄唔會出現。</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">喺另一部機度，去 %1$s 安裝 Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">我連結咗嘅裝置</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">解除連結</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s解除咗連結</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">連結緊裝置…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">裝置已核准</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">載入緊…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">冇連結咗嘅裝置</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">解鎖嚟連結裝置</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">掃一掃嗰部機顯示嘅二維碼嚟連結。</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">掃描二維碼</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">用呢部機去掃描你想連結裝置上面顯示嘅二維碼</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">確定</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">呢部裝置會睇到你嘅群組、聯絡人同埋聊天內容，仲可以用你嘅名義傳送訊息。</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">喺另一部機度攪掂埋連結</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">喺另一部機度攪掂埋 Molly 連結。</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">裝置連結失敗</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">二維碼無效。請確定你掃描緊嘅，係你想連結嗰部機上面顯示嘅二維碼。</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">再試一次</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">係咪要解除連結「%1$s」？</string>
@@ -852,10 +914,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">針對無 Play 服務嘅優化</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">呢部機唔支援 Play 服務。撳一下以停用系統嘅電量優化，以免 Signal 喺部機閒置嘅時候冇得去攞訊息。</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">呢部機唔支援 Play 服務。撳一下以停用系統嘅電量優化，以免 Molly 喺部機閒置嘅時候冇得去攞訊息。</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">呢個版本嘅 Signal 已經過期喇。即刻更新以傳送同接收訊息。</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">呢個版本嘅 Molly 已經過期喇。即刻更新以傳送同接收訊息。</string>
     <string name="ExpiredBuildReminder_update_now">即刻更新</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -865,8 +927,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">睇下</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Signal 通訊有非暫時嘅失敗！</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal 註冊唔到 Google Play 服務。Signal 訊息同通話已經停用，請到 [設定] &gt; [進階] 試下重新註冊。</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Molly 通訊有非暫時嘅失敗！</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly 註冊唔到 Google Play 服務。Molly 訊息同通話已經停用，請到 [設定] &gt; [進階] 試下重新註冊。</string>
 
 
     <!-- GiphyActivity -->
@@ -992,20 +1054,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">除錯紀錄可以幫我哋診斷同修正問題，當中唔會包含任何識別資料。</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal 遇到問題。提交除錯紀錄？</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly 遇到問題。提交除錯紀錄？</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">由於電池最佳化，通知可能會延遲</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">你可以停用 Signal 嘅電池最佳化設定，確保訊息通知唔會延遲。</string>
+    <string name="PromptBatterySaverBottomSheet__message">你可以停用 Molly 嘅電池最佳化設定，確保訊息通知唔會延遲。</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">由於電池最佳化，通知可能會延遲</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">停用 Molly 嘅電池最佳化設定，確保訊息通知唔會延遲。㩒一吓「繼續」睇睇特定裝置嘅說明。</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">唔使喇，唔該</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">繼續</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">繼續</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">關閉</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">唔使喇，唔該</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">仲等緊嘅入谷邀請</string>
+    <string name="PendingMembersActivity_pending_group_invites">請求與邀請</string>
     <string name="PendingMembersActivity_requests">請求</string>
     <string name="PendingMembersActivity_invites">邀請</string>
     <string name="PendingMembersActivity_people_you_invited">您邀請咗嘅人</string>
@@ -1244,12 +1316,12 @@
     <string name="InviteActivity_cancel">取消</string>
     <string name="InviteActivity_sending">送緊出去…</string>
     <string name="InviteActivity_invitations_sent">邀請已發送！</string>
-    <string name="InviteActivity_invite_to_signal">拉隊嚟 Signal</string>
+    <string name="InviteActivity_invite_to_signal">拉隊嚟 Molly</string>
     <string name="InviteActivity_send_sms">發送短訊 (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="other">係咪要傳送 %1$d 個邀請短訊？</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">不如我哋齊齊轉會 Signal: %1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">不如我哋齊齊轉會 Molly: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">似乎您無 app 用嚟去分享噃。</string>
 
     <!-- LearnMoreTextView -->
@@ -1263,7 +1335,7 @@
     <string name="LongMessageActivity_your_message">您嘅訊息</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">背景連線已啟用</string>
 
     <!-- MediaOverviewActivity -->
@@ -1327,10 +1399,10 @@
     <string name="MessageQuotesBottomSheet_replies">回覆</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">籌備緊 Signal 通話</string>
+    <string name="NotificationBarManager__establishing_signal_call">籌備緊 Molly 通話</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">開始 Signal 通話服務</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">停止緊 Signal 通話服務</string>
+    <string name="NotificationBarManager__starting_signal_call_service">開始 Molly 通話服務</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">停止緊 Molly 通話服務</string>
     <string name="NotificationBarManager__cancel_call">取消通話</string>
 
     <!-- NotificationsMegaphone -->
@@ -1574,6 +1646,14 @@
     <string name="MessageRecord_you_activated_payments">你已經啟動咗付款</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s 而家可以接受付款</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">冇得俾你睇付款詳情</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">㩒一下睇多啲</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">冇得俾你睇付款詳情</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">俾唔到付款嘅詳情你睇，因為還原訊息嘅來源冇包含呢個付款紀錄。咁係唔會影響你銀包餘額或者過往付款嘅狀態嘅。</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1628,9 +1708,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">你就快唔可以再喺 Signal 傳送短訊喇。邀請 %1$s 加入 Signal 繼續你哋嘅對話。</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">你冇得再喺 Signal 傳送短訊喇。邀請 %1$s 加入 Signal 繼續你哋嘅對話。</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">你冇得再喺 Molly 傳送短訊喇。邀請 %1$s 加入 Molly 繼續你哋嘅對話。</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">付款：%1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">付款</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">已舉報垃圾訊息</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1704,7 +1786,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">係咪要連結一部 Signal 嘅機？</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">您似乎用緊第三方嘅掃描程式去連結一部裝有 Signal 嘅機。為咗令您得到保障，請喺 Signal 度再掃一次嗰個碼啦。</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal 要攞「相機」權限，先可以掃到二維碼，但權限已被永久拒絕。請到呢個 app 嘅應用程式設定，揀選「權限」，然後啟用「相機」。</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly 要攞「相機」權限，先可以掃到二維碼，但權限已被永久拒絕。請到呢個 app 嘅應用程式設定，揀選「權限」，然後啟用「相機」。</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">冇「相機」權限冇得掃二維碼</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1716,11 +1798,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">輸入密碼</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal 嘜頭</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly 嘜頭</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">提交密碼</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">密碼無效！</string>
-    <string name="PassphrasePromptActivity_unlock_signal">解鎖 Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - 鎖定畫面</string>
+    <string name="PassphrasePromptActivity_unlock_signal">解鎖 Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - 鎖定畫面</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">地圖</string>
@@ -1786,7 +1868,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">驗證完先再繼續發訊息</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">為協助 Signal 打擊垃圾訊息，請先完成驗證。</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">為協助 Molly 打擊垃圾訊息，請先完成驗證。</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">驗證完之後，您就可以繼續發訊息。先前閘住嘅訊息會自動發送返出去。</string>
 
     <!-- Recipient -->
@@ -1794,7 +1876,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">我嘅是日花生</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal 通話</string>
+    <string name="Recipient_signal_call">Molly 通話</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">封鎖</string>
@@ -1808,7 +1890,8 @@
     <string name="RedPhone_ringing">喺對面唥緊鐘…</string>
     <string name="RedPhone_busy">佔線</string>
     <string name="RedPhone_recipient_unavailable">對方未能接聽</string>
-    <string name="RedPhone_network_failed">網絡唔得掂！</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">網絡唔得掂！請檢查你嘅網絡連線，然後再試多次啦。</string>
     <string name="RedPhone_number_not_registered">個冧把未有註冊！</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">您所打嘅冧把唔支援安全語音！</string>
     <string name="RedPhone_got_it">明白</string>
@@ -1819,8 +1902,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">撳一下呢度去開啟您嘅視像</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">要同 %1$s 通話嘅話，Signal 需要存取您部機嘅相機</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">要同 %1$s 通話嘅話，Molly 需要存取您部機嘅相機</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">打緊出去…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">重新連緊線…</string>
@@ -1868,10 +1951,30 @@
     <string name="WebRtcCallActivity__removed_from_call">喺通話度移除</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">有人已經喺通話度移除咗你。</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">允許存取你嘅相機同咪</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">允許存取你個咪</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">允許存取你嘅相機</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">要開始或者加入通話嘅話，請允許 Molly 存取你嘅相機同咪。</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">要開始或者加入通話嘅話，請允許 Molly 存取你個咪。</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">要用視像通話嘅話，請允許 Molly 存取您嘅相機。</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly 需要你個咪嘅存取權先可以開始或者加入通話。</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly 需要相機嘅存取權先可以用你嘅視像通話</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">要開始或者加入通話：</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">要用視像通話：</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal 通話</string>
-    <string name="WebRtcCallView__signal_video_call">Signal 視像通話</string>
+    <string name="WebRtcCallView__signal_call">Molly 通話</string>
+    <string name="WebRtcCallView__signal_video_call">Molly 視像通話</string>
     <string name="WebRtcCallView__start_call">開始通話</string>
     <string name="WebRtcCallView__join_call">加入通話</string>
     <string name="WebRtcCallView__call_is_full">通話已滿座</string>
@@ -1956,21 +2059,38 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">係咪想放低手？</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">放低手</string>
+    <string name="CallOverflowPopupWindow__lower_hand">放低</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">取消</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">你舉咗手</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">睇下</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="other">%1$s + %2$d 舉咗手</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s 舉咗手</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s +%2$d 舉咗手</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s 舉咗手</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s +%2$d 舉咗手</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="other">%1$s + %2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="other">%1$s + %2$d</item>
     </plurals>
 
@@ -2055,7 +2175,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">有個電話會打畀您，去驗證呢個冧把。</string>
     <string name="RegistrationActivity_edit_number">改過個冧把</string>
     <string name="RegistrationActivity_missing_google_play_services">冇安到 Google Play 服務</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">呢部機欠奉 Google Play 服務。您仍然可以用 Signal，但係咁嘅狀況底下可能有損效能，亦無咁可靠。\n\n若然您唔係專業玩家，又唔係用緊售後自灌嘅 Android ROM，抑或覺得當中有啲嘢搞錯咗，請聯絡 support@signal.org 協助您排難解紛。</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">呢部機欠奉 Google Play 服務。您仍然可以用 Molly，但係咁嘅狀況底下可能有損效能，亦無咁可靠。\n\n若然您唔係專業玩家，又唔係用緊售後自灌嘅 Android ROM，抑或覺得當中有啲嘢搞錯咗，請聯絡 support@molly.im 協助您排難解紛。</string>
     <string name="RegistrationActivity_i_understand">我明白</string>
     <string name="RegistrationActivity_play_services_error">Play 服務錯誤</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play 服務一係更新緊，一係暫時用唔到。請您再試下啦。</string>
@@ -2073,7 +2193,7 @@
     <string name="RegistrationActivity_non_standard_number_format">非標準冧把格式</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">您打嗰個冧把 (%1$s) 似乎唔係標準格式。\n\n您係咪話 %2$s？</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - 電話冧把格式</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - 電話冧把格式</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">請求咗打畀您</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2106,8 +2226,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">註冊時出現問題﹖</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• 確認你嘅手機有流動網絡訊號嚟接收 SMS 或來電⏎ • 確認你嘅電話冧把可以接收來電⏎ • 檢查你輸入嘅電話冧把係咪正確。</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">如果需要更多資訊，請你跟住呢啲疑難排解步驟去做，又或者聯絡支援</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">詳情請睇返 %1$s 或聯絡 %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">呢啲疑難排解步驟</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2145,13 +2265,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">加入去聯絡人</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">拉隊嚟 Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">拉隊嚟 Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal 訊息</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal 通話</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">加入去聯絡人</string>
-    <string name="SharedContactView_invite_to_signal">拉隊嚟 Signal</string>
+    <string name="SharedContactView_invite_to_signal">拉隊嚟 Molly</string>
     <string name="SharedContactView_message">Signal 訊息</string>
 
     <!-- SignalBottomActionBar -->
@@ -2282,11 +2402,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s 係 %2$s 嘅手機號碼</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal 更新</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">Signal 出咗新版本喇。 㩒一下就可以更新。</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal 更新失敗</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly 更新</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">Molly 出咗新版本喇。 㩒一下就可以更新。</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly 更新失敗</string>
     <string name="ApkUpdateNotifications_failed_general_body">我哋遲啲再試過啦。</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal 已經成功更新</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly 已經成功更新</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">已經自動更新到 %1$s 版本。</string>
 
     <!-- UntrustedSendDialog -->
@@ -2356,7 +2476,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">我哋嘅 Signal 安全碼：</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">似乎您無 app 用嚟去分享噃。</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">喺剪貼簿入面搵唔到安全碼去做比較</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal 要攞「相機」權限，先可以掃到二維碼，但權限已被永久拒絕。請到呢個 app 嘅應用程式設定，揀選「權限」，然後啟用「相機」。</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly 要攞「相機」權限，先可以掃到二維碼，但權限已被永久拒絕。請到呢個 app 嘅應用程式設定，揀選「權限」，然後啟用「相機」。</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">冇「相機」權限冇得掃二維碼</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">您要先交流過訊息，先可以睇到 %1$s 嘅安全碼。</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2386,14 +2506,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">撳一下開啟。</string>
-    <string name="KeyCachingService_passphrase_cached">Signal 已經解鎖</string>
-    <string name="KeyCachingService_lock">鎖定 Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly 已經解鎖</string>
+    <string name="KeyCachingService_lock">鎖定 Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">您</string>
     <string name="MediaPreviewActivity_unssuported_media_type">唔支援呢類多媒體</string>
     <string name="MediaPreviewActivity_draft">草稿</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal 要攞「儲存裝置」權限，先可以儲存到外置儲存裝置，但權限已被永久拒絕。請到呢個 app 嘅應用程式設定，揀選「權限」，然後啟用「儲存裝置」。</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly 要攞「儲存裝置」權限，先可以儲存到外置儲存裝置，但權限已被永久拒絕。請到呢個 app 嘅應用程式設定，揀選「權限」，然後啟用「儲存裝置」。</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">冇權限冇得儲存到外置儲存裝置</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">係咪要刪除訊息？</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">咁做嘅話，呢個訊息就會永久刪除㗎喇。</string>
@@ -2435,7 +2555,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">送遞唔到訊息。</string>
     <string name="MessageNotifier_error_delivering_message">送遞訊息嘅時候發生錯誤。</string>
     <string name="MessageNotifier_message_delivery_paused">訊息送遞已暫止。</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">驗證完先再繼續喺 Signal 發訊息。</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">驗證完先再繼續喺 Molly 發訊息。</string>
     <string name="MessageNotifier_mark_all_as_read">全部剔低話睇咗</string>
     <string name="MessageNotifier_mark_read">剔低話睇咗</string>
     <string name="MessageNotifier_turn_off_these_notifications">閂咗呢啲通知</string>
@@ -2457,7 +2577,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">對你嘅貼圖傳送咗 %1$s 心情回應。</string>
     <string name="MessageNotifier_this_message_was_deleted">呢個訊息已被刪除。</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">係咪要閂咗聯絡人加入 Signal 嘅通知？您可以喺 Signal &gt; 設定 &gt; 通知 度再啟用返。</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">係咪要閂咗聯絡人加入 Molly 嘅通知？您可以喺 Molly &gt; 設定 &gt; 通知 度再啟用返。</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2496,7 +2616,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signal 上鎖嘅時候冇得做快速回應！</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Molly 上鎖嘅時候冇得做快速回應！</string>
     <string name="QuickResponseService_problem_sending_message">訊息傳送有問題！</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2516,7 +2636,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">捷徑無效</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">新訊息</string>
     <string name="SingleRecipientNotificationBuilder_message_request">訊息請求</string>
     <string name="SingleRecipientNotificationBuilder_you">您</string>
@@ -2561,7 +2681,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">呢部裝置嘅註冊已經失效。原因好可能係你喺另一部裝置度用咗同一個電話號碼註冊 Signal。</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">呢部裝置嘅註冊已經失效。原因好可能係你喺另一部裝置度用咗同一個電話號碼註冊 Molly。</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">重新用呢部裝置註冊</string>
 
@@ -2574,10 +2694,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">如果要接聽通話，請允許 Signal 存取您部機個咪。</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">如果要接聽通話，請允許 Molly 存取您部機個咪。</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">如果要接聽視像通話，請允許 Signal 存取你個咪同相機。</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal 要攞「麥克風」同「相機」權限，先可以撥打同接聽通話，但權限已被永久拒絕。請到呢個 app 嘅應用程式設定，揀選「權限」，然後啟用「麥克風」同「相機」。</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">如果要接聽視像通話，請允許 Molly 存取你個咪同相機。</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly 要攞「麥克風」同「相機」權限，先可以撥打同接聽通話，但權限已被永久拒絕。請到呢個 app 嘅應用程式設定，揀選「權限」，然後啟用「麥克風」同「相機」。</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">已用連結咗嘅機接聽。</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">已用連結咗嘅機拒接。</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">用連結咗嘅機佔線中。</string>
@@ -2622,16 +2742,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">打多次個新密碼</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">拉隊嚟 Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">拉隊嚟 Molly</string>
     <string name="contact_selection_activity__new_group">開個新谷</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">重新整理聯絡人</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">揾唔到某個人？試下重新整理</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">喺 Signal 搵你識嘅人</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">允許存取你嘅通訊錄</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">更多</string>
 
@@ -2648,7 +2768,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">聯絡人相片</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal 要攞「聯絡人」權限，先可以羅列您啲聯絡人出嚟，但權限已被永久拒絕。請到呢個 app 嘅設定功能表，揀選「權限」，然後啟用「聯絡人」。</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly 要攞「聯絡人」權限，先可以羅列您啲聯絡人出嚟，但權限已被永久拒絕。請到呢個 app 嘅設定功能表，揀選「權限」，然後啟用「聯絡人」。</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">提取聯絡人嘅時候發生錯誤，請檢查您嘅網絡連線</string>
     <string name="ContactSelectionListFragment_username_not_found">搵唔到用戶名稱</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"「%1$s」唔係 Signal 用戶。請檢查用戶名稱，然後再試過啦。"</string>
@@ -2665,16 +2785,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">用用戶名稱嚟搵</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">允許存取通訊錄</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">要喺 Signal 搵你識嘅人：</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">允許存取</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">唔使喇，唔該晒</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">請允許存取你嘅通訊錄。你嘅通訊錄資料已經加密，Signal 唔會睇到。</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal 要存取您嘅聯絡人，先可以顯示畀您睇。</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly 要存取您嘅聯絡人，先可以顯示畀您睇。</string>
     <string name="contact_selection_list_fragment__show_contacts">顯示聯絡人</string>
 
     <!-- contact_selection_list_item -->
@@ -2745,6 +2867,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">你已經移除咗呢個人。如果宜家傳送訊息俾佢嘅話，佢就會重新加返入你嘅聯絡人清單。</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">選項</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">更新</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">播放 … 暫停</string>
@@ -2773,7 +2897,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">氣泡係一項 Android 功能，Signal 傾偈用唔用氣泡就由得您揀。</string>
+    <string name="BubbleOptOutTooltip__description">氣泡係一項 Android 功能，Molly 傾偈用唔用氣泡就由得您揀。</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">遲啲先啦</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -2934,9 +3058,9 @@
     <string name="EditProfileFragment__group_description">個谷嘅描述</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">更新 Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">更新 Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">呢個 Signal 版本已經過咗期。即刻更新嚟繼續用 Signal 啦。</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">呢個 Molly 版本已經過咗期。即刻更新嚟繼續用 Molly 啦。</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">更新</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3152,7 +3276,7 @@
     <string name="preferences__slow">慢</string>
     <string name="preferences__help">說明</string>
     <string name="preferences__advanced">進階</string>
-    <string name="preferences__donate_to_signal">課金 Signal</string>
+    <string name="preferences__donate_to_signal">課金 Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">私隱</string>
     <!-- Preference label for stories -->
@@ -3189,13 +3313,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">將 app 圖示同個名轉做「%1$s」</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">要閂咗 Signal 先可以更改個 app 嘅圖示同名。通知都係會用返預設嘅 Signal 圖示同埋個名嚟顯示。</string>
+    <string name="preferences__app_icon_dialog_description">要閂咗 Molly 先可以更改個 app 嘅圖示同名。通知都係會用返預設嘅 Molly 圖示同埋個名嚟顯示。</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">揀個 app 圖示同名，佢哋會顯示喺手機嘅主螢幕同埋應用抽屜嗰度。通知都係會用返預設嘅 Signal 圖示同埋個名嚟顯示。了解 詳情</string>
+    <string name="preferences__app_icon_warning_learn_more">揀個 app 圖示同名，佢哋會顯示喺手機嘅主螢幕同埋應用抽屜嗰度。通知都係會用返預設嘅 Molly 圖示同埋個名嚟顯示。了解 詳情</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">App 圖示同個名可以喺手機嘅主螢幕同埋應用抽屜裡面見到。</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">通知都係會用返預設嘅 Signal 圖示同埋個名嚟顯示。</string>
+    <string name="preferences__app_icon_notification_warning">通知都係會用返預設嘅 Molly 圖示同埋個名嚟顯示。</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">了解 詳情</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3241,8 +3365,12 @@
         <item quantity="other">咁做嘅話，所有聊天將會永久刪減至剩返最近期嗰 %1$s 個訊息。</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">咁做嘅話，所有訊息紀錄同埋媒體就會喺你部機度永久刪除㗎喇。</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">咁做嘅話，所有訊息紀錄同埋媒體就會喺呢部機同埋任何連結咗嘅裝置度永久刪除㗎喇。</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">真係要刪除所有訊息紀錄？</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">所有訊息紀錄就會永久刪除㗎喇。呢個動作冇得復原㗎。</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">所有訊息紀錄就會喺所有裝置上面永久刪除㗎喇。剷走咗就冇得返轉頭㗎喇。</string>
     <string name="preferences_storage__delete_all_now">立即全部刪除</string>
     <string name="preferences_storage__forever">永久</string>
     <string name="preferences_storage__one_year">1 年</string>
@@ -3278,7 +3406,7 @@
     <string name="preferences_communication__category_censorship_circumvention">封網迴避</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">封網迴避</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">啟用嘅時候，Signal 會嘗試迴避封網。除非您身處會審查 Signal 嘅地方，否則唔使啟用呢個功能。</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">啟用嘅時候，Molly 會嘗試迴避封網。除非您身處會審查 Molly 嘅地方，否則唔使啟用呢個功能。</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">鑑於您帳戶嘅電話冧把，已啟用封網迴避。</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3330,7 +3458,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">隆重推出：付款功能</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">用 Signal 去傳送同接收 MobileCoin：佢係一種新嘅兼著重私隱嘅電子貨幣。啟用開始使用。</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">用 Molly 去傳送同接收 MobileCoin：佢係一種新嘅兼著重私隱嘅電子貨幣。啟用開始使用。</string>
     <string name="PaymentsHomeFragment__activate_payments">啟用付款</string>
     <string name="PaymentsHomeFragment__activating_payments">啟用緊付款…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">恢復付款帳戶</string>
@@ -3356,7 +3484,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">付款未有喺您嘅地區提供。</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">啟用唔到付款。陣間再試下啦。</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">係咪要停用付款？</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">停用付款嘅話，您將唔能夠喺 Signal 度收發 MobileCoin 㗎喇。</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">停用付款嘅話，您將唔能夠喺 Molly 度收發 MobileCoin 㗎喇。</string>
     <string name="PaymentsHomeFragment__deactivate">停用</string>
     <string name="PaymentsHomeFragment__continue">繼續</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">餘額目前未能提供。</string>
@@ -3365,10 +3493,10 @@
     <string name="PaymentsHomeFragment__details">詳情</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">你可以用 Signal 傳送同接收 MobileCoin。所有付款均受 MobileCoins 同 MobileCoin Wallet 嘅使用條款約束。你可能會遇到問題，當中損失嘅付款或者結餘將會冇辦法攞返。 </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">你可以用 Molly 傳送同接收 MobileCoin。所有付款均受 MobileCoins 同 MobileCoin Wallet 嘅使用條款約束。你可能會遇到問題，當中損失嘅付款或者結餘將會冇辦法攞返。 </string>
     <string name="PaymentsHomeFragment__activate">啟用</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">檢視 MobileCoin 條款</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Signal 付款已經曲終人散。您仍然可以將款項轉移去交易平台，但唔再能夠傳送或接收付款，又或增加款項。</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Molly 付款已經曲終人散。您仍然可以將款項轉移去交易平台，但唔再能夠傳送或接收付款，又或增加款項。</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3396,7 +3524,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">允許權限</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Signal 會要求取得以下權限，協助你同識得嘅人傳送訊息。 </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">Molly 會要求取得以下權限，協助你同識得嘅人傳送訊息。 </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">通知</string>
     <!-- Notifications permission row description -->
@@ -3484,10 +3612,10 @@
     <string name="PaymentsTransferFragment__next">下一步</string>
     <string name="PaymentsTransferFragment__invalid_address">位址唔啱</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">請檢查您嘗試轉移去嗰度嘅銀包位址，然後再試下啦。</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">您冇得轉移返去自己嘅 Signal 銀包位址度㗎。請輸入喺支援嘅交易平台上面您所屬帳戶嘅銀包位址。</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">要掃二維碼嘅話，Signal 需要存取您部機嘅相機。</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal 要攞「相機」權限，先可以影到二維碼。請到設定，揀選「權限」，然後啟用「相機」。</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">要掃二維碼嘅話，Signal 需要存取您部機嘅相機。</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">您冇得轉移返去自己嘅 Molly 銀包位址度㗎。請輸入喺支援嘅交易平台上面您所屬帳戶嘅銀包位址。</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">要掃二維碼嘅話，Molly 需要存取您部機嘅相機。</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly 要攞「相機」權限，先可以影到二維碼。請到設定，揀選「權限」，然後啟用「相機」。</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">要掃二維碼嘅話，Molly 需要存取您部機嘅相機。</string>
     <string name="PaymentsTransferFragment__settings">設定</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3826,17 +3954,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">打入嚟嘅 Signal 語音通話</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">打入嚟嘅 Molly 語音通話</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">打入嚟嘅 Signal 視像通話</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">打入嚟嘅 Molly 視像通話</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">打入嚟嘅 Signal 成谷通話</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">打入嚟嘅 Molly 成谷通話</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">傾緊 Signal 語音通話</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">傾緊 Molly 語音通話</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">傾緊 Signal 視像通話</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">傾緊 Molly 視像通話</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">傾緊 Signal 群組通話</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">傾緊 Molly 群組通話</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">載入緊…</string>
@@ -3883,9 +4011,9 @@
     <string name="BackupDialog_verify">驗證</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">您輸入嘅備份密碼正確無誤</string>
     <string name="BackupDialog_passphrase_was_not_correct">密碼有誤</string>
-    <string name="LocalBackupJob_creating_signal_backup">建立緊 Signal 備份…</string>
+    <string name="LocalBackupJob_creating_signal_backup">建立緊 Molly 備份…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">驗證緊 Signal 備份…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">驗證緊 Molly 備份…</string>
     <string name="LocalBackupJobApi29_backup_failed">備份唔到</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">你嘅備份目錄已經刪除或者轉移。</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">您個備份檔案大得滯，裝唔落呢一度喎。</string>
@@ -3900,15 +4028,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">打俾我 (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">重新傳送驗證碼 (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">聯絡 Signal 支援</string>
-    <string name="RegistrationActivity_code_support_subject">Signal 註冊 - Android 版驗證碼</string>
+    <string name="RegistrationActivity_contact_signal_support">聯絡 Molly 支援</string>
+    <string name="RegistrationActivity_code_support_subject">Molly 註冊 - Android 版驗證碼</string>
     <string name="RegistrationActivity_incorrect_code">個碼唔啱</string>
     <string name="BackupUtil_never">唔使喇</string>
     <string name="BackupUtil_unknown">未知</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">電話冧把</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">選擇邊個可以睇到你嘅電話冧把，同埋喺 Signal 度用手機號碼聯絡你。</string>
+    <string name="preferences_app_protection__choose_who_can_see">選擇邊個可以睇到你嘅電話冧把，同埋喺 Molly 度用手機號碼聯絡你。</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">邊個可以睇到我嘅手機號碼</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -3956,7 +4084,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">您試過太多次喇。請您晏啲再試下啦。</string>
     <string name="RegistrationActivity_error_connecting_to_service">服務連唔到線</string>
     <string name="preferences_chats__backups">備份</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal 已經上鎖</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly 已經上鎖</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">撳一下去解鎖</string>
     <string name="Recipient_unknown">未知</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -3987,9 +4115,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">您部舊機要喺您手先得。</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">用備份還原</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">攞返本機備份嚟還原您嘅訊息。如果您而家唔做嘅話，遲啲就冇得再還原㗎喇。</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">還原本機備份</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">還原 Signal 備份</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">還原全部文字訊息 + 最近 30 日嘅媒體內容</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">其他選項</string>
 
+    <string name="TransferOrRestoreFragment__cancel">取消</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">唔轉移，淨係登入</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">唔轉移訊息同媒體就繼續</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">喺您部舊嘅 Android 手機開啟 Signal</string>
     <string name="NewDeviceTransferInstructions__continue">繼續</string>
@@ -4004,19 +4139,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">準備緊同部舊嘅 Android 機連線…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">請等等，部機繽紛樂緊</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">等緊部舊嘅 Android 機連線…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal 要攞「位置」權限，先可以探索同連接您部舊嘅 Android 機。</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal 要啟用定位服務，先可以探索同連接您部舊嘅 Android 機。</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal 要開啟 Wi-Fi，先可以探索同連接您部舊嘅 Android 機。Wi-Fi 著咗就得，唔需要連接到 Wi-Fi 網絡。</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">抱歉，呢部機似乎唔支援 Wi-Fi Direct。Signal 會用到 Wi-Fi Direct 嚟探索同連接您部舊嘅 Android 機。您仍然可以攞返一個喺您部舊嘅 Android 機度整嘅備份嚟還原您嘅帳戶。</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly 要攞「位置」權限，先可以探索同連接您部舊嘅 Android 機。</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly 要啟用定位服務，先可以探索同連接您部舊嘅 Android 機。</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly 要開啟 Wi-Fi，先可以探索同連接您部舊嘅 Android 機。Wi-Fi 著咗就得，唔需要連接到 Wi-Fi 網絡。</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">抱歉，呢部機似乎唔支援 Wi-Fi Direct。Molly 會用到 Wi-Fi Direct 嚟探索同連接您部舊嘅 Android 機。您仍然可以攞返一個喺您部舊嘅 Android 機度整嘅備份嚟還原您嘅帳戶。</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">攞返備份嚟還原</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">嘗試同您部舊嘅 Android 機連線嘅時候，發生未預期嘅錯誤。</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">搵緊部新嘅 Android 機…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal 要攞「位置」權限，先可以探索同連接您部新嘅 Android 機。</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal 要啟用定位服務，先可以探索同連接您部新嘅 Android 機。</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal 要開啟 Wi-Fi，先可以探索同連接您部新嘅 Android 機。Wi-Fi 著咗就得，唔需要連接到 Wi-Fi 網絡。</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">抱歉，呢部機似乎唔支援 Wi-Fi Direct。Signal 會用到 Wi-Fi Direct 嚟探索同連接您部新嘅 Android 機。您仍然可以建立一個備份，用嚟喺您部新嘅 Android 機度還原返您個帳戶。</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly 要攞「位置」權限，先可以探索同連接您部新嘅 Android 機。</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly 要啟用定位服務，先可以探索同連接您部新嘅 Android 機。</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly 要開啟 Wi-Fi，先可以探索同連接您部新嘅 Android 機。Wi-Fi 著咗就得，唔需要連接到 Wi-Fi 網絡。</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">抱歉，呢部機似乎唔支援 Wi-Fi Direct。Molly 會用到 Wi-Fi Direct 嚟探索同連接您部新嘅 Android 機。您仍然可以建立一個備份，用嚟喺您部新嘅 Android 機度還原返您個帳戶。</string>
     <string name="OldDeviceTransferSetup__create_a_backup">建立一個備份</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">嘗試同您部新嘅 Android 機連線嘅時候，發生未預期嘅錯誤。</string>
 
@@ -4057,7 +4192,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">轉移緊資料</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">將兩部機保持靠近。唔好熄機，並且開住 Signal。轉移係經端對端加密。</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">將兩部機保持靠近。唔好熄機，並且開住 Molly。轉移係經端對端加密。</string>
     <string name="DeviceTransfer__d_messages_so_far">目前為止 %1$d 個訊息…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">啲訊息暫時整咗 %1$s%%…</string>
@@ -4071,7 +4206,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">轉移帳戶</string>
     <string name="OldDeviceTransferInstructions__first_bullet">一、</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">喺您部新嘅 Android 機度下載 Signal</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">喺您部新嘅 Android 機度下載 Molly</string>
     <string name="OldDeviceTransferInstructions__second_bullet">二、</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"撳一下「轉移或還原帳戶」"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">三、</string>
@@ -4145,7 +4280,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">條拎任何人揸住都可以睇到個谷嘅名同相，亦可以請求加入。分享條拎嘅時候請謹慎，以免所託非人。</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">條拎任何人揸住都可以睇到個谷嘅名同相，亦可以加入埋個谷。分享條拎嘅時候請謹慎，以免所託非人。</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">透過 Signal 分享</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">透過 Molly 分享</string>
     <string name="GroupLinkBottomSheet_copy">複製</string>
     <string name="GroupLinkBottomSheet_qr_code">二維碼</string>
     <string name="GroupLinkBottomSheet_share">分享</string>
@@ -4324,7 +4459,7 @@
     <string name="payment_info_card_about_mobilecoin">關於 MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin 係一種新嘅兼著重私隱嘅數碼貨幣。</string>
     <string name="payment_info_card_adding_funds">增加款項</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">您可以傳送 MobileCoin 去您嘅銀包位址，以增加款項喺 Signal 度用。</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">您可以傳送 MobileCoin 去您嘅銀包位址，以增加款項喺 Molly 度用。</string>
     <string name="payment_info_card_cashing_out">提取款項</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">您隨時可以喺支援 MobileCoin 嘅交易平台上面提取 MobileCoin。只要完成一筆轉移去您喺交易平台上嘅帳戶就得。</string>
     <string name="payment_info_card_hide_this_card">收起呢張咭？</string>
@@ -4345,12 +4480,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">停用銀包</string>
     <string name="DeactivateWalletFragment__your_balance">您嘅結餘</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">我哋建議你喺停用付款功能之前，先將你嘅資金轉移到另一個錢包位址。如果你而家唔轉移資金，當你重新啟用付款功能嗰陣，你嘅資金到時仍然會留喺連結咗 Signal 嘅錢包入面。</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">我哋建議你喺停用付款功能之前，先將你嘅資金轉移到另一個錢包位址。如果你而家唔轉移資金，當你重新啟用付款功能嗰陣，你嘅資金到時仍然會留喺連結咗 Molly 嘅錢包入面。</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">轉移剩返嘅結餘</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">唔轉移就停用</string>
     <string name="DeactivateWalletFragment__deactivate">停用</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">係咪要唔轉移就停用？</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">如果你重新啟用付款功能，你嘅餘額到時仍然會留喺連結咗 Signal 嘅錢包入面。</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">如果你重新啟用付款功能，你嘅餘額到時仍然會留喺連結咗 Molly 嘅錢包入面。</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">停用銀包嘅時候發生錯誤。</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4643,7 +4778,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">授權</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">使用條款同私隱政策</string>
-    <string name="HelpFragment__copyright_signal_messenger">Signal Messenger 版權所有</string>
+    <string name="HelpFragment__copyright_signal_messenger">Molly Messenger 版權所有</string>
     <string name="HelpFragment__licenced_under_the_agplv3">根據 GNU AGPLv3 嘅協議授權</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4881,9 +5016,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">揀隻顏色</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">短訊</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">分享</string>
 
@@ -4913,7 +5045,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">只有管理員可以向呢個群組傳送訊息。</string>
-    <string name="MultiselectForwardFragment__limit_reached">頂晒櫳喇</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">你唔可以揀多過 5 個聊天</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5088,9 +5221,9 @@
     <string name="MySupportPreference__learn_more">了解詳情</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">更新 Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">更新 Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">呢個 Signal 版本已經過咗期。即刻更新嚟繼續用 Signal 啦。</string>
+    <string name="UpdateSignalExpiredDialog__message">呢個 Molly 版本已經過咗期。即刻更新嚟繼續用 Molly 啦。</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">更新</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5099,7 +5232,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">部機未註冊</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">呢部機嘅註冊已經失效。重新註冊嚟喺呢部機度繼續用 Signal 啦。</string>
+    <string name="ReregisterSignalDialog__message">呢部機嘅註冊已經失效。重新註冊嚟喺呢部機度繼續用 Molly 啦。</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">重新註冊</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5393,7 +5526,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">開唔到揀選工具。</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">Signal 需要取得相關權限，先可以顯示同啟用通知功能。</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">Molly 需要取得相關權限，先可以顯示同啟用通知功能。</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">開啟</string>
 
@@ -5510,7 +5643,7 @@
     <!-- Used to join views and replies when both exist on a story item -->
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
-    <string name="StoryViewerPageFragment__you">您</string>
+    <string name="StoryViewerPageFragment__you">你</string>
     <!-- Displayed when viewing a story sent to a group, placeholders are person who sent the story and the group name -->
     <string name="StoryViewerPageFragment__s_to_s">%1$s 放送 %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
@@ -5539,8 +5672,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">未有人回覆</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">由於你唔再係呢個群組嘅成員，所以冇得回覆呢個限時動態。</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">對限時動態傳送咗心情回應</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">對限時動態傳送咗心情回應</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">對限時動態傳送咗心情回應</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">遊覽</string>
     <!-- Label for story replies tab -->
@@ -6008,11 +6143,11 @@
     <!-- Dialog title when a user tries to donate while they already have a pending donation. -->
     <string name="DonateToSignalFragment__you_have_a_donation_pending">你仲有捐款尚待處理</string>
     <!-- Dialog body when a user tries to donate while they already have a pending monthly donation. -->
-    <string name="DonateToSignalFragment__bank_transfers_usually_take_1_business_day_to_process_monthly">銀行轉賬需要 1 至 14 個工作天先處理完成。請你等呢次付款完成咗，先至更新你嘅定期贊助。</string>
+    <string name="DonateToSignalFragment__bank_transfers_usually_take_1_business_day_to_process_monthly">銀行轉賬需要 1 至 14 個工作天先處理完成。請你等呢次付款完成咗，先至更新你嘅課金計劃。</string>
     <!-- Dialog body when a user tries to donate while they already have a pending one time donation. -->
     <string name="DonateToSignalFragment__bank_transfers_usually_take_1_business_day_to_process_onetime">銀行轉賬需要 1 至 14 個工作天先處理完成。請等待呢次付款處理完成，先至開始另一次捐款。</string>
     <!-- Dialog body when a user tries to donate while they already have a pending monthly donation. -->
-    <string name="DonateToSignalFragment__your_payment_is_still_being_processed_monthly">仲處理緊你嘅捐款。 視乎你嘅上網速度，過程可能需時幾分鐘。請你等呢次付款完成咗，先至更新你嘅定期贊助。</string>
+    <string name="DonateToSignalFragment__your_payment_is_still_being_processed_monthly">仲處理緊你嘅捐款。 視乎你嘅上網速度，過程可能需時幾分鐘。請你等呢次付款完成咗，先至更新你嘅課金計劃。</string>
     <!-- Dialog body when a user tries to donate while they already have a pending one time donation. -->
     <string name="DonateToSignalFragment__your_payment_is_still_being_processed_onetime">仲處理緊你嘅捐款。 視乎你嘅上網速度，過程可能需時幾分鐘。請你等呢次付款完成咗，先至開始另一次捐款。</string>
     <!-- Dialog body when a user opens the manage donations main screen and they have a pending iDEAL donation -->
@@ -6140,8 +6275,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">選擇你嘅銀行</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">同 %1$s 確認你嘅捐款</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">要設定你嘅定期捐款，請你㩒一下「繼續」同銀行確認 €0.01 嘅費用。呢筆錢會自動退還，並且允許系統由你嘅帳戶扣除每月 €5 嘅捐款。</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">要設定你嘅定期捐款，請你㩒一下「繼續」同銀行確認 €0.01 嘅費用。呢筆錢會自動退還，並且允許系統由你嘅帳戶扣除每月 %1$s 嘅捐款。</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">繼續</string>
 
@@ -6710,6 +6845,50 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">下載緊備份資料…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">媒體備份閂咗</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="other">由於我哋處理唔到你嘅付款，所以 Signal 媒體備份計劃取消咗。你有 %1$d 日時間下載備份入面儲存嘅任何媒體。%1$d 日之後，你備份入面嘅媒體就會刪除。</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">你可以隨時再開始支付備份費用，咁就可以繼續備份所有媒體。 </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">你嘅媒體今日將會刪除</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">由於我哋處理唔到你嘅付款，所以 Signal 媒體備份計劃取消咗。呢次係備份刪除之前下載媒體嘅最後機會。</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">完成唔到下載</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">你部機可能唔夠位。請你搵多 %1$s 空間嚟下載儲存咗喺備份嘅媒體。</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="other">如果你選擇「跳過」，備份入面嘅媒體會喺 %1$d 日之後刪除。</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">處理唔到備份付款</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">我哋收取你嘅每月定期備份付款時遇到問題。請確定你嘅付款方式仍然有效。如果已經失效，就去 Google Pay 更新返啦。Signal 會喺幾日後再嘗試處理付款。</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">完成唔到備份</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">你嘅裝置已經有 %1$d 日冇完成備份。請確保裝置已經連咗 Wi-Fi，然後㩒「即刻備份」。 </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">了解詳情</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">跳過</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">即刻下載媒體</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">遲啲先下載</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">唔下載媒體</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">請你搵多 %1$s 空間嚟下載媒體。</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">信用卡或扣帳卡</string>
@@ -6723,6 +6902,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">未知</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">付款紀錄</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">上次備份時間係 %1$s 嘅 %2$s。</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6733,6 +6918,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">早過已選時間嘅訊息將會永久刪除。</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">超出已選長度嘅訊息將會永久刪除。</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">將上限應用至連結咗嘅裝置</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">啟用之後，聊天訊息量上限都會應用喺連結咗嘅裝置度，並且刪除訊息。</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">你所有裝置會同步進行刪除</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">當你刪除訊息或者聊天時，系統會同時喺你部手機同埋連結咗嘅裝置度刪除相關內容。</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">確定</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">付款紀錄</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">文字同埋全部媒體備份</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">付款詳情</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">備份類型</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">已付日期</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">分享</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal 備份</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">付款紀錄</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">備份詳情</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">備份大小</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">備份頻率</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">用流動數據備份</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">閂咗佢同埋刪除備份</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">已經刪除咗同閂咗備份。</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">備份類型已經改咗，仲取消埋課金計劃</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">取消咗課金計劃</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">下載完成</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">備份類型</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">停用咗備份</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s /月</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">啟用備份</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">上一次備份</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">從未</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">即刻備份</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">係咪想閂咗同埋刪除備份呀？</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">你唔需要再俾過錢。你嘅備份將會刪除，而系統都唔會再建立新嘅備份。</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">關閉，然後刪除</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">刪除緊備份…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">刪除咗備份</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"㩒吓「即刻備份」"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">每日</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">每星期</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">每月</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">手動備份</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">請輸入你嘅裝置 PIN 碼、密碼或者圖案。</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">下一步</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">換過個備份類型</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">取消課金計劃</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">確認取消</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">你唔需要再俾過錢㗎喇。備份功能將會喺賬單週期完嗰陣停用。喺嗰日之後，你將會有 30 日時間下載而家備份緊嘅媒體。</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">確認同即刻下載</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">確認但遲啲先下載</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">保留訂閱計劃</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index a5d40be6d9..212a5385ef 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal 正在更新…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly 正在更新…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">您尚未设置密码！</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">禁用密码？</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">这将永久解锁 Signal 和消息通知。</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">这将永久解锁 Molly 和消息通知。</string>
     <string name="ApplicationPreferencesActivity_disable">禁用</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">连接服务出错！</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN 对于注册锁定是必需的。如需禁用 PIN，请先禁用注册锁定。</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">文件</string>
     <string name="AttachmentKeyboard_contact">联系人</string>
     <string name="AttachmentKeyboard_location">位置</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal 需要相应权限来显示图片和视频</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly 需要相应权限来显示图片和视频</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">允许访问</string>
     <string name="AttachmentKeyboard_payment">付款</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">未找到选择媒体的应用。</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal 需“存储”权限，来发送图片、视频和音频，但该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“存储”。</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal 需“通讯录”权限，来发送通讯录信息，但是该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“通讯录”。</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal 需“位置”权限，来发送位置信息，但是该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“位置”。</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly 需“存储”权限，来发送图片、视频和音频，但该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“存储”。</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly 需“通讯录”权限，来发送通讯录信息，但是该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“通讯录”。</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly 需“位置”权限，来发送位置信息，但是该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“位置”。</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">允许访问您的位置</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">如要发送您的位置：</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">允许 Signal 访问以发送您的位置。</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">允许 Molly 访问以发送您的位置。</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal 需要位置访问权限来分享您的位置。</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly 需要位置访问权限来分享您的位置。</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">允许访问存储空间</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">如要显示照片和视频：</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal 需要访问存储空间才能显示您的照片和视频。</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly 需要访问存储空间才能显示您的照片和视频。</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s还未激活付款 </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">切换相机</string>
     <string name="CameraXFragment_open_gallery_description">打开相册</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">允许访问</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">允许访问您的相机和麦克风</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">允许访问您的相机</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">允许访问您的麦克风</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">如要拍照，请允许 Signal 访问相机。</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">要拍照或录像，请允许 Signal 访问相机。</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">如要拍照或录像，请允许 Signal 访问相机和麦克风。</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">如要拍摄有声视频，请允许 Signal 访问麦克风。</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">如要扫描二维码，请允许 Signal 访问相机。</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal 需要相机访问权限才能拍摄照片</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal 需要相机访问权限才能扫描二维码</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal 需要麦克风访问权限才能拍摄视频</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">如要在 Signal 中拍照：</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">如要在 Signal 中拍照和录像：</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">如要拍摄有声视频：</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">如要扫描二维码：</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">最近联系人</string>
@@ -270,7 +271,7 @@
     <string name="CameraContacts_no_signal_contacts">没有 Signal 联系人</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">仅可通过相机按钮来发送照片给 Signal 联系人。 </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">未找到联系人？</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">邀请联系人加入 Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">邀请联系人加入 Molly</string>
     <string name="CameraContacts__menu_search">搜索</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -284,12 +285,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">不，谢谢。</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">升级 Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">升级 Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">此版本 Signal 已过期，升级到最新版本后才能收发消息。</string>
     <string name="ClientDeprecatedActivity_update">更新</string>
     <string name="ClientDeprecatedActivity_dont_update">不要更新</string>
     <string name="ClientDeprecatedActivity_warning">警告</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">您的 Signal 版本已过期，目前您只能查看消息记录，并且在升级 Signal 后才能收发消息。</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">您的 Molly 版本已过期，目前您只能查看消息记录，并且在升级 Molly 后才能收发消息。</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">未找到网页浏览器。</string>
@@ -326,8 +327,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">消息 %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly 语音通话 %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly 视频通话 %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -419,7 +420,7 @@
     <string name="ConversationActivity_transport_signal">发送 Signal 消息</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">发送消息</string>
-    <string name="ConversationActivity_lets_switch_to_signal">用 Signal 来聊天吧 %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">用 Molly 来聊天吧 %1$s</string>
     <string name="ConversationActivity_specify_recipient">请选择联系人</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">附件超过当前消息类型的大小限制。</string>
     <string name="ConversationActivity_unable_to_record_audio">无法录音！</string>
@@ -438,18 +439,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">如要发送音频消息：</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">如要发送语音消息，请允许 Signal 访问您的麦克风。</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">如要发送语音消息，请允许 Molly 访问您的麦克风。</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal 需要麦克风访问权限以录制语音消息。</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal 需“麦克风”权限，来发送音频，但该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“麦克风”。</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly 需要麦克风访问权限以录制语音消息。</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly 需“麦克风”权限，来发送音频，但该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“麦克风”。</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal 需“麦克风”和“相机”权限，来呼叫 %1$s，但这些权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“麦克风”和“相机”。</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">要拍照或录像，请允许 Signal 访问相机。</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal 需“相机”权限，来拍摄图片或视频，但该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“相机”。</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal 需要相机权限以拍摄照片或视频</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly 需“麦克风”和“相机”权限，来呼叫 %1$s，但这些权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“麦克风”和“相机”。</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">要拍照或录像，请允许 Molly 访问相机。</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly 需“相机”权限，来拍摄图片或视频，但该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“相机”。</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly 需要相机权限以拍摄照片或视频</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">开启麦克风权限以录制有声视频。</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal 需“麦克风”权限，来录制视频，但该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“麦克风”。</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal 需要麦克风权限以录制视频。</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly 需“麦克风”权限，来录制视频，但该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“麦克风”。</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly 需要麦克风权限以录制视频。</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">否</string>
@@ -470,9 +471,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">如要发起通话：</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">如要发起通话，请允许 Signal 访问您的麦克风。</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">如要发起通话，请允许 Molly 访问您的麦克风。</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal 需要麦克风访问权限以发起通话。</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly 需要麦克风访问权限以发起通话。</string>
 
 
     <string name="ConversationActivity_join">加入</string>
@@ -486,9 +487,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Signal 不再支持短信消息服务。您可以邀请%1$s加入 Signal，在这里进行对话。</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">此人已不再使用 Signal。您可以邀请对方加入 Signal，在平台内进行对话。</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">此人已不再使用 Molly。您可以邀请对方加入 Molly，在平台内进行对话。</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">邀请使用 Signal</string>
+    <string name="ConversationActivity__invite_to_signal">邀请使用 Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">我们将会很快再次提醒您。</string>
 
@@ -536,6 +537,8 @@
     <string name="ConversationFragment_delete_for_everyone">对每个人删除</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">仅从此设备中删除</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">删除</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">从所有设备中删除</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">此操作将对此聊天中使用较新版本 Signal 的所有成员永久删除此消息，他们将看到您删除了一条消息。</string>
@@ -567,13 +570,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">已屏蔽</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">升级 Signal</string>
+    <string name="ConversationFragment__update_build">升级 Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">重新注册 Signal</string>
+    <string name="ConversationFragment__reregister_signal">重新注册 Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">向后导航。</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">打开 Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">打开 Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">验证已失效</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -636,6 +639,10 @@
     <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
         <item quantity="other">这将永久删除全部 %1$d 个已选聊天。</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="other">这将会从您的所有设备上永久删除全部 %1$d 个已选聊天。</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">正在删除</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="other">正在删除选定的聊天…</item>
@@ -719,9 +726,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">谁可以通过电话号码找到我？</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">知道您的手机号码的任何人均可以在 Signal 上看到您的上线状态，并可以开始跟您聊天。</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">知道您的手机号码的任何人均可以在 Molly 上看到您的上线状态，并可以开始跟您聊天。</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">没人能在 Signal 上看到您的上线状态，除非您给对方发送消息，或与对方有一个现有的聊天窗口。</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">没人能在 Molly 上看到您的上线状态，除非您给对方发送消息，或与对方有一个现有的聊天窗口。</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">是否从备份进行还原？</string>
@@ -755,7 +762,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">测试备份密码并验证是否匹配</string>
     <string name="BackupsPreferenceFragment__turn_on">开启</string>
     <string name="BackupsPreferenceFragment__turn_off">关闭</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"如需还原备份，请重新安装 Signal，然后打开该应用并点击“还原备份”，接着打开备份文件。%1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"如需还原备份，请重新安装 Molly，然后打开该应用并点击“还原备份”，接着打开备份文件。%1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">了解更多</string>
     <string name="BackupsPreferenceFragment__in_progress">正在进行…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -763,7 +770,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d 到目前为止…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">目前已完成 %1$s%%…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal 需外部存储权限，来创建备份，但该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“存储”。</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly 需外部存储权限，来创建备份，但该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“存储”。</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">设置备份时间</string>
 
@@ -830,7 +837,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">聊天会话已刷新</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal 使用端对端加密，有时可能需刷新聊天会话。虽然这并不影响聊天的安全性，但可能错过该联系人的消息。您可请求他们重新发送。</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly 使用端对端加密，有时可能需刷新聊天会话。虽然这并不影响聊天的安全性，但可能错过该联系人的消息。您可请求他们重新发送。</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">在电脑或 iPad 上使用 Signal。您的消息会同步到您的已链接设备上。</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">链接新设备</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s 消息和聊天信息在所有设备上均受端对端加密保护</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">在电脑或 iPad 上使用 Signal</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">链接设备上的所有消息均受私密保护</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">链接后，Molly 消息会同步到您手机的 Molly 上。链接以前的消息记录将不会显示。</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">在其他设备上，请访问 %1$s 以安装 Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">我的已链接设备</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">解绑</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s 未链接</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">正在链接设备…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">设备成功链接</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">正在加载…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">无链接设备</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">解锁以链接设备</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">扫描设备上显示的二维码进行链接。</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">扫描二维码</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">使用此设备扫描要链接的设备上显示的二维码</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">好的</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">此设备将能查看您的群组和联系人、读取您的对话及以您的名义发送消息。</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">在其他设备上完成链接</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">在另一台设备上完成链接 Molly。</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">绑定设备失败</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">此二维码无效，请确认您想要连接的设备所显示的是此二维码。</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">重试</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">取消关联“%1$s”？</string>
@@ -852,10 +914,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">缺失 Google Play 服务时优化</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">该设备不支持 Google Play 服务。点击禁用系统电池优化，防止 Signal 非活动时无法获取新消息。</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">该设备不支持 Google Play 服务。点击禁用系统电池优化，防止 Molly 非活动时无法获取新消息。</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">此 Signal 版本已过期，请升级到最新版本以继续收发消息。</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">此 Molly 版本已过期，请升级到最新版本以继续收发消息。</string>
     <string name="ExpiredBuildReminder_update_now">现在升级</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -865,8 +927,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">查看</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Signal 持续连接失效！</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal 无法注册 Google Play 服务。Signal 消息和呼叫已禁用。请尝试在设置 &gt; 高级中重新注册。</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Molly 持续连接失效！</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly 无法注册 Google Play 服务。Molly 消息和呼叫已禁用。请尝试在设置 &gt; 高级中重新注册。</string>
 
 
     <!-- GiphyActivity -->
@@ -992,20 +1054,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">调试日志能帮助我们诊断和解决问题，并且不包含任何识别身份的信息。</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal 遇到了一个问题。要提交调试日志吗？</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly 遇到了一个问题。要提交调试日志吗？</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">通知可能会因为电池优化而延迟</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">您可以禁用 Signal 的电池有优化功能，确保消息通知不会出现延迟。</string>
+    <string name="PromptBatterySaverBottomSheet__message">您可以禁用 Molly 的电池有优化功能，确保消息通知不会出现延迟。</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">通知可能会因为电池优化而延迟</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">禁用 Molly 的电池优化功能以确保消息通知不会出现延迟。点击“继续”可查看不同设备的操作说明。</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">不，谢谢。</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">继续</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">继续</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">不予考虑</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">不，谢谢。</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">待处理的入群邀请</string>
+    <string name="PendingMembersActivity_pending_group_invites">请求与邀请</string>
     <string name="PendingMembersActivity_requests">入群申请</string>
     <string name="PendingMembersActivity_invites">邀请</string>
     <string name="PendingMembersActivity_people_you_invited">你邀请的人</string>
@@ -1244,12 +1316,12 @@
     <string name="InviteActivity_cancel">取消</string>
     <string name="InviteActivity_sending">正在发送…</string>
     <string name="InviteActivity_invitations_sent">邀请已发送！</string>
-    <string name="InviteActivity_invite_to_signal">邀请使用 Signal</string>
+    <string name="InviteActivity_invite_to_signal">邀请使用 Molly</string>
     <string name="InviteActivity_send_sms">发送短信（%1$d）</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="other">发送 %1$d 个短信邀请？</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">用 Signal 来聊天吧：%1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">用 Molly 来聊天吧：%1$s</string>
     <string name="InviteActivity_no_app_to_share_to">看起来设备上没有可用于分享的应用。</string>
 
     <!-- LearnMoreTextView -->
@@ -1263,7 +1335,7 @@
     <string name="LongMessageActivity_your_message">您的消息</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">后台连接已启用</string>
 
     <!-- MediaOverviewActivity -->
@@ -1327,10 +1399,10 @@
     <string name="MessageQuotesBottomSheet_replies">回复</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">正在建立 Signal 呼叫</string>
+    <string name="NotificationBarManager__establishing_signal_call">正在建立 Molly 呼叫</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">开始 Signal 通话服务</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">正在停止 Signal 通话服务</string>
+    <string name="NotificationBarManager__starting_signal_call_service">开始 Molly 通话服务</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">正在停止 Molly 通话服务</string>
     <string name="NotificationBarManager__cancel_call">取消呼叫</string>
 
     <!-- NotificationsMegaphone -->
@@ -1574,6 +1646,14 @@
     <string name="MessageRecord_you_activated_payments">您已激活付款</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s现在可以接受付款啦</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">无法获取付款详情</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">点击查看更多</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">无法获取付款详情</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">由于您的消息是从一个不包含此付款记录的来源恢复的，因此付款详情无法获取。这不会影响您的钱包余额或过往付款情况。</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1628,9 +1708,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">您很快将无法从 Signal 发送短信消息。您可以邀请%1$s加入 Signal，在这里进行对话。</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">您无法再从 Signal 发送短信消息。您可以邀请%1$s加入 Signal，在这里进行对话。</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">您无法再从 Molly 发送短信消息。您可以邀请%1$s加入 Molly，在这里进行对话。</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">付款：%1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">付款</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">已举报为垃圾消息</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1704,7 +1786,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">关联 Signal 设备？</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">您好像在使用第三方扫描应用来关联 Signal 设备。出于安全考量，请使用 Signal 再次扫描二维码。</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal 需“相机”权限，来扫描二维码，但该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“相机”。</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly 需“相机”权限，来扫描二维码，但该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“相机”。</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">没有“相机”权限，无法扫描二维码</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1716,11 +1798,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">输入密码</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal 图标</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly 图标</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">提交密码</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">无效密码！</string>
-    <string name="PassphrasePromptActivity_unlock_signal">解锁 Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - 锁定屏幕</string>
+    <string name="PassphrasePromptActivity_unlock_signal">解锁 Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - 锁定屏幕</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">地图</string>
@@ -1786,7 +1868,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">验证以继续发送消息</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">为了防止 Signal 垃圾消息，请完成验证。</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">为了防止 Molly 垃圾消息，请完成验证。</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">验证之后，可继续发送消息。任何暂停消息将自动发送。</string>
 
     <!-- Recipient -->
@@ -1794,7 +1876,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">我的动态</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal 通话</string>
+    <string name="Recipient_signal_call">Molly 通话</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">屏蔽</string>
@@ -1808,7 +1890,8 @@
     <string name="RedPhone_ringing">响铃中…</string>
     <string name="RedPhone_busy">占线</string>
     <string name="RedPhone_recipient_unavailable">接收人无法应答</string>
-    <string name="RedPhone_network_failed">网络失败！</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">网络失败！ 请检查互联网连接并重试。</string>
     <string name="RedPhone_number_not_registered">号码未注册！</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">您输入的号码不支持加密语音！</string>
     <string name="RedPhone_got_it">知道了</string>
@@ -1819,8 +1902,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">点击这里以启用视频</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Signal 需要访问您的麦克风来呼叫 %1$s</string>
-    <string name="WebRtcCallActivity__signal_s">Signal 呼叫 %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Molly 需要访问您的麦克风来呼叫 %1$s</string>
+    <string name="WebRtcCallActivity__signal_s">Molly 呼叫 %1$s</string>
     <string name="WebRtcCallActivity__calling">呼叫中…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">重连中…</string>
@@ -1868,10 +1951,30 @@
     <string name="WebRtcCallActivity__removed_from_call">被移除出通话</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">有人已将您移除出通话。</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">允许访问您的相机和麦克风</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">允许访问您的麦克风</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">允许访问您的相机</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">如要发起或加入通话，请允许 Molly 访问您的相机和麦克风。</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">如要发起或加入通话，请允许 Molly 访问您的麦克风。</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">如要开启视频，请允许 Molly 访问您的相机。</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly 需要麦克风权限才能发起或加入通话。</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly 需要相机权限才能开启视频</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">如要发起或加入通话：</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">如要开启视频：</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal 通话</string>
-    <string name="WebRtcCallView__signal_video_call">Signal 视频通话</string>
+    <string name="WebRtcCallView__signal_call">Molly 通话</string>
+    <string name="WebRtcCallView__signal_video_call">Molly 视频通话</string>
     <string name="WebRtcCallView__start_call">发起通话</string>
     <string name="WebRtcCallView__join_call">加入通话</string>
     <string name="WebRtcCallView__call_is_full">通话人数已满</string>
@@ -1959,18 +2062,35 @@
     <string name="CallOverflowPopupWindow__lower_hand">放下</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">取消</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">您举手了</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">查看</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="other">%1$s + %2$d 举手了</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s举手了</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s和其他 %2$d 人举手了</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s举手了</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s和其他 %2$d 人举手了</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="other">%1$s + %2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="other">%1$s + %2$d</item>
     </plurals>
 
@@ -2055,7 +2175,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">您将收到来电以验证该数字。</string>
     <string name="RegistrationActivity_edit_number">编辑号码</string>
     <string name="RegistrationActivity_missing_google_play_services">Google Play 服务缺失</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">设备缺少 Google Play 服务框架，可使用 Signal，但功能与稳定性将受到影响。\n\n如果您不是高级用户，或者运行的为原厂安卓系统，或者认为该提示有误，请联系 support@signal.org 获取帮助。</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">设备缺少 Google Play 服务框架，可使用 Molly，但功能与稳定性将受到影响。\n\n如果您不是高级用户，或者运行的为原厂安卓系统，或者认为该提示有误，请联系 support@molly.im 获取帮助。</string>
     <string name="RegistrationActivity_i_understand">我明白。</string>
     <string name="RegistrationActivity_play_services_error">Google Play 服务错误</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play 服务正在更新或者暂时不可用，请稍后再试。</string>
@@ -2073,7 +2193,7 @@
     <string name="RegistrationActivity_non_standard_number_format">非标准号码格式</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">您输入的号码（%1$s）似乎是非标准格式。\n\n您要输入的是 %2$s 吗？</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - 手机号码格式</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - 手机号码格式</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">已请求通话</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2106,8 +2226,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">在注册时遇到问题？</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• 确保您的手机有手机信号，能够接收短信或来电\n • 确认您可以接听拨到该号码的来电\n • 检查您输入的手机号码是否正确无误。</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">如需更多信息，请按照这里列出的故障排查步骤进行操作，或联系支持人员</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">如需了解更多信息，请按照%1$s进行操作或%2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">这里列出的故障排查步骤</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2145,13 +2265,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">添加到联系人</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">邀请使用 Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">邀请使用 Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal 消息</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal 呼叫</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">添加到联系人</string>
-    <string name="SharedContactView_invite_to_signal">邀请使用 Signal</string>
+    <string name="SharedContactView_invite_to_signal">邀请使用 Molly</string>
     <string name="SharedContactView_message">Signal 消息</string>
 
     <!-- SignalBottomActionBar -->
@@ -2282,11 +2402,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s 属于%2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal 更新</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">我们推出了 Signal 的新版本。点击更新。</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal 更新失败</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly 更新</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">我们推出了 Molly 的新版本。点击更新。</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly 更新失败</string>
     <string name="ApkUpdateNotifications_failed_general_body">我们稍后会再试一次。</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal 已成功更新</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly 已成功更新</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">您已自动更新到 %1$s 版本。</string>
 
     <!-- UntrustedSendDialog -->
@@ -2356,7 +2476,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">我们的 Signal 安全码：</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">看起来设备上没有可用于分享的应用。</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">剪切板没有可比较的安全码</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal 需“相机”权限，来扫描二维码，但该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“相机”。</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly 需“相机”权限，来扫描二维码，但该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“相机”。</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">没有“相机”权限，无法扫描二维码</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">为了查看 %1$s 的安全码，必须首先交换消息。</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2386,14 +2506,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">点击开启。</string>
-    <string name="KeyCachingService_passphrase_cached">Signal 已解锁</string>
-    <string name="KeyCachingService_lock">锁定 Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly 已解锁</string>
+    <string name="KeyCachingService_lock">锁定 Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">您</string>
     <string name="MediaPreviewActivity_unssuported_media_type">不支持的媒体类型</string>
     <string name="MediaPreviewActivity_draft">草稿</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal 需“存储”权限，来保存文件至外部存储，但该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“存储”。</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly 需“存储”权限，来保存文件至外部存储，但该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“存储”。</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">没有权限，无法保存至外部存储</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">删除消息？</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">这将永久删除该消息。</string>
@@ -2435,7 +2555,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">消息发送失败。</string>
     <string name="MessageNotifier_error_delivering_message">发送消息出错。</string>
     <string name="MessageNotifier_message_delivery_paused">消息发送已暂停。</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">验证以继续在 Signal 上发送消息。</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">验证以继续在 Molly 上发送消息。</string>
     <string name="MessageNotifier_mark_all_as_read">全部已读</string>
     <string name="MessageNotifier_mark_read">已读</string>
     <string name="MessageNotifier_turn_off_these_notifications">关闭这些通知</string>
@@ -2457,7 +2577,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">用 %1$s 回应了您的贴纸。</string>
     <string name="MessageNotifier_this_message_was_deleted">消息已删除。</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">关闭联系人加入 Signal 的通知吗？您可以在 Signal &gt; 设置 &gt; 通知 中再次启用。</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">关闭联系人加入 Molly 的通知吗？您可以在 Molly &gt; 设置 &gt; 通知 中再次启用。</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2496,7 +2616,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signal 锁定时不可使用快速回复。</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Molly 锁定时不可使用快速回复。</string>
     <string name="QuickResponseService_problem_sending_message">发送消息时出现问题！</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2516,7 +2636,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">无效的快捷方式</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">新消息</string>
     <string name="SingleRecipientNotificationBuilder_message_request">消息请求</string>
     <string name="SingleRecipientNotificationBuilder_you">您</string>
@@ -2561,7 +2681,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">此设备已注销。这可能是因为您使用您的手机号码在其他设备上注册了 Signal。</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">此设备已注销。这可能是因为您使用您的手机号码在其他设备上注册了 Molly。</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">重新注册设备</string>
 
@@ -2574,10 +2694,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">如要接通，请允许 Signal 使用您的麦克风。</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">如要接通，请允许 Molly 使用您的麦克风。</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">如要接通视频通话，请允许 Signal 使用您的麦克风和相机。</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal 需“麦克风”和“相机”权限，来进行通话，但该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“麦克风”和“相机”。</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">如要接通视频通话，请允许 Molly 使用您的麦克风和相机。</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly 需“麦克风”和“相机”权限，来进行通话，但该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“麦克风”和“相机”。</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">已在在其它设备上接听。</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">已在其它设备上拒接。</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">在其它设备上忙碌未接。</string>
@@ -2622,16 +2742,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">重复新密码</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">邀请使用 Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">邀请使用 Molly</string>
     <string name="contact_selection_activity__new_group">新建群组</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">刷新联系人</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">找不到某个好友？请刷新试试</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">在 Signal 上查找认识的人</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">允许访问您的联系人</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">更多</string>
 
@@ -2648,7 +2768,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">联系人图片</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal 需“联系人”权限，来显示联系人，但该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“联系人”。</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly 需“联系人”权限，来显示联系人，但该权限已永久禁用。请访问应用设置菜单，选择“权限”并启用“联系人”。</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">获取联系人出错，请检查您的网络连接</string>
     <string name="ContactSelectionListFragment_username_not_found">未找到该用户名</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"“%1$s”不是 Signal 用户，请检查用户名并重试。"</string>
@@ -2665,16 +2785,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">按用户名查找</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">允许访问联系人</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">如要在 Signal 上查找认识的人：</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">允许访问</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">不，谢谢。</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">允许访问您的联系人。您的联系人将会被加密，Signal 服务将无法看到您的联系人。</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">为了显示联系人，Signal 需要其访问权限。</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">为了显示联系人，Molly 需要其访问权限。</string>
     <string name="contact_selection_list_fragment__show_contacts">显示联系人</string>
 
     <!-- contact_selection_list_item -->
@@ -2745,6 +2867,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">你已移除该用户，与对方发送消息会将其重新添加到您的列表中。</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">选项</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">更新</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">播放 … 暂停</string>
@@ -2773,7 +2897,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">气泡是 Android 版的功能，您可以为 Signal 聊天关闭该功能。</string>
+    <string name="BubbleOptOutTooltip__description">气泡是 Android 版的功能，您可以为 Molly 聊天关闭该功能。</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">稍后再说</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -2934,9 +3058,9 @@
     <string name="EditProfileFragment__group_description">群组描述</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">升级 Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">升级 Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">此 Signal 版本已过期，请立即更新以继续使用 Signal。</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">此 Molly 版本已过期，请立即更新以继续使用 Molly。</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">更新</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3152,7 +3276,7 @@
     <string name="preferences__slow">缓慢</string>
     <string name="preferences__help">帮助</string>
     <string name="preferences__advanced">高级</string>
-    <string name="preferences__donate_to_signal">捐款给 Signal</string>
+    <string name="preferences__donate_to_signal">捐款给 Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">隐私</string>
     <!-- Preference label for stories -->
@@ -3189,13 +3313,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">更改应用图标并将其命名为“%1$s”</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal 需要关闭以更改应用图标和名称。通知将始终显示默认的 Signal 图标和名称。</string>
+    <string name="preferences__app_icon_dialog_description">Molly 需要关闭以更改应用图标和名称。通知将始终显示默认的 Molly 图标和名称。</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">请选择一个应用图标和名称，这将显示在您手机的主屏幕和应用程序抽屉中。通知将始终显示默认的 Signal 图标和名称。了解详情</string>
+    <string name="preferences__app_icon_warning_learn_more">请选择一个应用图标和名称，这将显示在您手机的主屏幕和应用程序抽屉中。通知将始终显示默认的 Molly 图标和名称。了解详情</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">应用图标和名称将显示在主屏幕和应用程序抽屉中。</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">通知将始终显示默认的 Signal 图标和名称。</string>
+    <string name="preferences__app_icon_notification_warning">通知将始终显示默认的 Molly 图标和名称。</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">了解详情</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3241,8 +3365,12 @@
         <item quantity="other">这将永久删减所有聊天，使之仅保留最近 %1$s 条消息。</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">这将从您的设备中永久删除所有消息记录和媒体文件。</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">这将会从此设备和任何已链接设备上永久删除所有消息历史记录和媒体。</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">您确定要删除所有消息记录吗？</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">所有消息记录将会被永久删除。此操作无法撤销。</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">所有设备上的所有消息历史记录将会被永久删除。此操作无法撤销。</string>
     <string name="preferences_storage__delete_all_now">马上删除所有</string>
     <string name="preferences_storage__forever">永久</string>
     <string name="preferences_storage__one_year">1 年</string>
@@ -3278,7 +3406,7 @@
     <string name="preferences_communication__category_censorship_circumvention">审查规避</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">审查规避</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">若启用，Signal 会尝试规避审查。除非 Signal 在您所在地受到审查，否则不要打开该功能。</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">若启用，Molly 会尝试规避审查。除非 Molly 在您所在地受到审查，否则不要打开该功能。</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">已根据您的手机号码启动审查规避。</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3330,7 +3458,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">付款功能上线</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">使用 Signal 收发 MobileCoin，这是一种注重隐私的新款数字货币。启用以开始体验。</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">使用 Molly 收发 MobileCoin，这是一种注重隐私的新款数字货币。启用以开始体验。</string>
     <string name="PaymentsHomeFragment__activate_payments">激活付款</string>
     <string name="PaymentsHomeFragment__activating_payments">正在激活付款…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">还原付款帐户</string>
@@ -3356,7 +3484,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">您所在地区付款不可用。</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">无法启用付款，请稍后重试。</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">是否停用付款？</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">停用付款之后，将无法在 Signal 中收发 MobileCoin。</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">停用付款之后，将无法在 Molly 中收发 MobileCoin。</string>
     <string name="PaymentsHomeFragment__deactivate">停用</string>
     <string name="PaymentsHomeFragment__continue">继续</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">余额当前不可用。</string>
@@ -3365,10 +3493,10 @@
     <string name="PaymentsHomeFragment__details">更多</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">您可以使用 Signal 收发 MobileCoin 啦。全部付款均遵守 MobileCoins 以及 MobileCoin Wallet 的使用条款。您可能会遇到一些故障，这可能会导致付款或余额丢失且无法恢复。 </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">您可以使用 Molly 收发 MobileCoin 啦。全部付款均遵守 MobileCoins 以及 MobileCoin Wallet 的使用条款。您可能会遇到一些故障，这可能会导致付款或余额丢失且无法恢复。 </string>
     <string name="PaymentsHomeFragment__activate">激活</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">查看 MobileCoin 条款</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Signal 的付款不再可用，不过您仍可将资金转移至交易平台，但是不再能够收发付款或添加资金。</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Molly 的付款不再可用，不过您仍可将资金转移至交易平台，但是不再能够收发付款或添加资金。</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3396,7 +3524,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">授予权限</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">为了帮助您给认识的人发送消息，Signal 需要下列权限。 </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">为了帮助您给认识的人发送消息，Molly 需要下列权限。 </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">通知</string>
     <!-- Notifications permission row description -->
@@ -3484,10 +3612,10 @@
     <string name="PaymentsTransferFragment__next">下一步</string>
     <string name="PaymentsTransferFragment__invalid_address">无效地址</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">请检查转帐至的钱包地址，然后重试。</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">无法向您的 Signal 钱包地址转帐。请输入支持的交易平台帐户的钱包地址。</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">为了扫描二维码，Signal 需摄像头访问权限。</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal 需“相机”权限，来扫描二维码。请访问设置菜单，选择“权限”并启用“相机”。</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">为了扫描二维码，Signal 需摄像头访问权限。</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">无法向您的 Molly 钱包地址转帐。请输入支持的交易平台帐户的钱包地址。</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">为了扫描二维码，Molly 需摄像头访问权限。</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly 需“相机”权限，来扫描二维码。请访问设置菜单，选择“权限”并启用“相机”。</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">为了扫描二维码，Molly 需摄像头访问权限。</string>
     <string name="PaymentsTransferFragment__settings">设置</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3826,17 +3954,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Signal 语音来电</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Molly 语音来电</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Signal 视频来电</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Molly 视频来电</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Signal 群组通话来电</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Molly 群组通话来电</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">正在进行 Signal 语音通话</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">正在进行 Molly 语音通话</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">正在进行 Signal 视频通话</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">正在进行 Molly 视频通话</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">正在进行 Signal 群组通话</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">正在进行 Molly 群组通话</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">正在加载…</string>
@@ -3883,9 +4011,9 @@
     <string name="BackupDialog_verify">验证</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">已成功输入备份密码</string>
     <string name="BackupDialog_passphrase_was_not_correct">密码错误</string>
-    <string name="LocalBackupJob_creating_signal_backup">创建 Signal 备份…</string>
+    <string name="LocalBackupJob_creating_signal_backup">创建 Molly 备份…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">正在验证 Signal 的备份……</string>
+    <string name="LocalBackupJob_verifying_signal_backup">正在验证 Molly 的备份……</string>
     <string name="LocalBackupJobApi29_backup_failed">备份失败</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">备份目录已删除或移动。</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">您的备份文件太大，无法保存到此位置。</string>
@@ -3900,15 +4028,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">给我打电话：（%1$02d:%2$02d）</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">重发验证码（%1$02d:%2$02d）</string>
-    <string name="RegistrationActivity_contact_signal_support">联系 Signal 支持</string>
-    <string name="RegistrationActivity_code_support_subject">Signal 注册 - 安卓验证码</string>
+    <string name="RegistrationActivity_contact_signal_support">联系 Molly 支持</string>
+    <string name="RegistrationActivity_code_support_subject">Molly 注册 - 安卓验证码</string>
     <string name="RegistrationActivity_incorrect_code">验证码不正确</string>
     <string name="BackupUtil_never">永不</string>
     <string name="BackupUtil_unknown">未知</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">手机号码</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">选择谁可以在 Signal 上看到您的手机号码，以及谁可以通过您的手机号码与您联系。</string>
+    <string name="preferences_app_protection__choose_who_can_see">选择谁可以在 Molly 上看到您的手机号码，以及谁可以通过您的手机号码与您联系。</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">谁可以看到我的电话号码</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -3956,7 +4084,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">您的尝试次数过多，请稍候再试。</string>
     <string name="RegistrationActivity_error_connecting_to_service">连接服务出错</string>
     <string name="preferences_chats__backups">备份</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal 已锁定</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly 已锁定</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">点击解锁</string>
     <string name="Recipient_unknown">未知</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -3987,9 +4115,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">您需要可访问旧设备。</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">从备份还原</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">从本地备份还原消息。如果现在不进行还原，以后将无法还原。</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">还原本地备份</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">还原 Signal 备份</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">还原您的所有文本消息和最近 30 天的媒体</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">更多选项</string>
 
+    <string name="TransferOrRestoreFragment__cancel">取消</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">登录但不转移</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">继续但不转移您的消息和媒体</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">在旧的 Android 手机上打开 Signal</string>
     <string name="NewDeviceTransferInstructions__continue">继续</string>
@@ -4004,19 +4139,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">正在准备连接至旧的 Android 设备…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">请稍等，将很快准备就绪</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">正在等待旧的 Android 设备连接…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal 需位置权限，以发现并连接旧的 Android 设备。</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal 需已启用的位置服务，以发现并连接旧的 Android 设备。</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal 需开启的 Wi-Fi，以发现并连接旧的 Android 设备。Wi-Fi 需开启但不必连接 Wi-Fi 网络。</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">抱歉，该设备好像不支持 Wi-Fi Direct。Signal 通过 Wi-Fi Direct 来发现并连接旧的 Android 设备。仍可通过从旧的 Android 设备还原帐户来还原备份。</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly 需位置权限，以发现并连接旧的 Android 设备。</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly 需已启用的位置服务，以发现并连接旧的 Android 设备。</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly 需开启的 Wi-Fi，以发现并连接旧的 Android 设备。Wi-Fi 需开启但不必连接 Wi-Fi 网络。</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">抱歉，该设备好像不支持 Wi-Fi Direct。Molly 通过 Wi-Fi Direct 来发现并连接旧的 Android 设备。仍可通过从旧的 Android 设备还原帐户来还原备份。</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">还原备份</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">尝试连接旧的 Android 设备时，发生意外错误。</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">正在搜索新的 Android 设备…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal 需位置权限，以发现并连接新的 Android 设备。</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal 需已启用的位置服务，以发现并连接新的 Android 设备。</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal 需开启的 Wi-Fi，以发现并连接新的 Android 设备。Wi-Fi 需开启但不必连接 Wi-Fi 网络。</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">抱歉，该设备好像不支持 Wi-Fi Direct。Signal 通过 Wi-Fi Direct 来发现并连接新的 Android 设备。仍可通过从新的 Android 设备还原帐户来还原备份。</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly 需位置权限，以发现并连接新的 Android 设备。</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly 需已启用的位置服务，以发现并连接新的 Android 设备。</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly 需开启的 Wi-Fi，以发现并连接新的 Android 设备。Wi-Fi 需开启但不必连接 Wi-Fi 网络。</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">抱歉，该设备好像不支持 Wi-Fi Direct。Molly 通过 Wi-Fi Direct 来发现并连接新的 Android 设备。仍可通过从新的 Android 设备还原帐户来还原备份。</string>
     <string name="OldDeviceTransferSetup__create_a_backup">创建备份</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">尝试连接新的 Android 设备时，发生意外错误。</string>
 
@@ -4057,7 +4192,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">正在转移数据</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">请确保两个设备互相贴近。不要关闭设备，并保持 Signal 运行。转移是端对端加密的。</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">请确保两个设备互相贴近。不要关闭设备，并保持 Molly 运行。转移是端对端加密的。</string>
     <string name="DeviceTransfer__d_messages_so_far">目前 %1$d 消息…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">目前已传输 %1$s%%…</string>
@@ -4071,7 +4206,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">转移帐户</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">在新的 Android 设备上下载 Signal</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">在新的 Android 设备上下载 Molly</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"点击“转移或还原帐户”"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4145,7 +4280,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">任何人都能凭此链接查看群组名称和头像，并提交入群申请。请仅分享给您信任的人。</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">任何人都能凭此链接查看群组名称和头像，并加入群组。请仅分享给您信任的人。</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">通过 Signal 分享</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">通过 Molly 分享</string>
     <string name="GroupLinkBottomSheet_copy">复制</string>
     <string name="GroupLinkBottomSheet_qr_code">QR 代码</string>
     <string name="GroupLinkBottomSheet_share">分享</string>
@@ -4324,7 +4459,7 @@
     <string name="payment_info_card_about_mobilecoin">关于 MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin 是一种注重隐私的新款数字货币。</string>
     <string name="payment_info_card_adding_funds">正在添加资金</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">通过将 MobileCoin 发送至钱包地址，即可在 Signal 中添加并使用资金。</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">通过将 MobileCoin 发送至钱包地址，即可在 Molly 中添加并使用资金。</string>
     <string name="payment_info_card_cashing_out">兑现</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">在支持 MobileCoin 的交易平台上，可随时兑现 MobileCoin。只需在该交易平台上，将资金转移至您的帐户。</string>
     <string name="payment_info_card_hide_this_card">是否隐藏该卡片？</string>
@@ -4345,12 +4480,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">停用钱包</string>
     <string name="DeactivateWalletFragment__your_balance">您的余额</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">我们建议您在停用付款之前将资金转移至其他钱包地址。如果您当前选择不转移，在重新激活付款时，您的资金将保留在 Signal 关联的钱包内。</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">我们建议您在停用付款之前将资金转移至其他钱包地址。如果您当前选择不转移，在重新激活付款时，您的资金将保留在 Molly 关联的钱包内。</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">转移剩余余额</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">停用而不转移</string>
     <string name="DeactivateWalletFragment__deactivate">停用</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">是否停用而不转移？</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">当重新激活付款时，您的余额将保留在 Signal 关联的钱包内。</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">当重新激活付款时，您的余额将保留在 Molly 关联的钱包内。</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">停用钱包出错。</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4643,7 +4778,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">许可证</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">条款和隐私政策</string>
-    <string name="HelpFragment__copyright_signal_messenger">版权所有 Signal Messenger</string>
+    <string name="HelpFragment__copyright_signal_messenger">版权所有 Molly Messenger</string>
     <string name="HelpFragment__licenced_under_the_agplv3">根据 GNU AGPLv3 授权许可</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4881,9 +5016,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">选择一种颜色</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">短信</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">分享</string>
 
@@ -4913,7 +5045,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">只有管理员可发送消息至该群组。</string>
-    <string name="MultiselectForwardFragment__limit_reached">已达上限</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">您最多可选 5 个聊天</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5088,9 +5221,9 @@
     <string name="MySupportPreference__learn_more">了解详情</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">升级 Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">升级 Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">此 Signal 版本已过期，请立即更新以继续使用 Signal。</string>
+    <string name="UpdateSignalExpiredDialog__message">此 Molly 版本已过期，请立即更新以继续使用 Molly。</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">更新</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5099,7 +5232,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">设备未注册</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">此设备已注销。请重新注册以继续在此设备上使用 Signal。</string>
+    <string name="ReregisterSignalDialog__message">此设备已注销。请重新注册以继续在此设备上使用 Molly。</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">重新注册</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5393,7 +5526,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">无法打开选择器。</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">如要启用通知，Signal 需要获得显示通知的权限。</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">如要启用通知，Molly 需要获得显示通知的权限。</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">开启</string>
 
@@ -5539,8 +5672,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">未有回复</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">您已不是此群组的成员，因此不能回复此动态。</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">回应了此动态</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">回应了此动态</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">回应了此动态</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">浏览</string>
     <!-- Label for story replies tab -->
@@ -6140,8 +6275,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">选择您的银行</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">与 %1$s 确认您的捐款</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">如要设置您的定期捐款，请点击“继续”以便与您的银行确认扣除一笔 0.01 欧元的费用。这笔费用将会自动退还，并允许从您的账户中每月扣除 5 欧元用于捐款。</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">如要设置您的定期捐款，请点击“继续”以便与您的银行确认扣除一笔 0.01 欧元的费用。这笔费用将会自动退还，并允许每月从您的账户中扣除 %1$s 用于捐款。</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">继续</string>
 
@@ -6710,6 +6845,50 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">正在下载备份数据…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">媒体备份已关闭</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="other">由于我们无法处理您的付款，您的 Signal 媒体备份计划已取消。您可以在 %1$d 天内下载存储在备份中的任何媒体。%1$d 天后，备份中的媒体将会被删除。</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">您可以随时重新开始支付备份费用，以继续备份您的所有媒体。 </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">您的媒体将于今日删除</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">由于我们无法处理您的付款，您的 Signal 媒体备份计划已取消。这是您在备份被删除之前下载备份媒体的最后机会。</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">无法完成下载</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">您的设备没有足够的可用空间。请至少释放 %1$s 的空间，以下载存储在备份中的媒体。</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="other">如果您选择“跳过”，备份中的媒体将会在 %1$d 天后删除。</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">无法处理备份付款</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">我们在收取您的每月备份费用时遇到了问题。请确保您的付款方式依然可用。如不可用，请在 Google Pay 中更新付款方式。Signal 将会在几天后重新尝试收款。</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">无法完成备份</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">您的设备已有 %1$d 天未完成备份。请确保您的设备已连接到 Wi-Fi，然后点击“立即备份”。 </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">了解详情</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">跳过</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">立即下载媒体</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">稍后下载</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">不下载媒体</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">至少释放 %1$s 的空间以下载媒体。</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">信用卡或借记卡</string>
@@ -6723,6 +6902,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">未知</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">付款历史</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">您上一次备份的时间是 %1$s %2$s。</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6733,6 +6918,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">早于选定时间的消息将会被永久删除。</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">超过选定长度的消息将会被永久删除。</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">对已链接设备应用限制</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">启用后，已链接设备上的消息也会被聊天限制功能删除。</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">删除操作现可在所有设备上同步进行</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">当您删除消息或聊天时，它们在手机和已链接设备上将会被同步删除。</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">好</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">付款历史</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">文本和所有媒体备份</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">付款详情</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">备份类型</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">付款日期</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">分享</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal 备份</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">付款历史</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">备份详情</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">备份大小</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">备份频率</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">使用蜂窝网络备份</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">关闭并删除备份</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">备份已删除并关闭。</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">备份类型已更改并已取消备份套餐</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">备份套餐已取消</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">下载完成</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">备份类型</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">已停用备份</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/月</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">启用备份</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">上次备份</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s 于 %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">永不</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">现在备份</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">要关闭并删除备份？</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">您将不会再被收取费用。您的备份将被删除，并且不会创建新的备份。</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">关闭和删除</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">正在删除备份…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">备份已删除</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"手动点击“立即备份”"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">每日</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">每周</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">每月</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">手动备份</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">请输入您的设备 Pin 码、密码或解锁图案。</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">下一步</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">更改备份类型</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">取消定期捐款</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">确认取消</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">您将不会再被收取费用。账单周期结束后，备份功能将会关闭。在该日期之后，您将有 30 天的时间下载当前备份的媒体。</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">确认并立即下载</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">确认并稍后下载</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">继续订购</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index e470f3caf5..4e5c8c34ad 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal 正在更新…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly 正在更新…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">您尚未設定一個密碼！</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">要停用密碼嗎？</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">這將永久解鎖 Signal 及訊息通知。</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">這將永久解鎖 Molly 及訊息通知。</string>
     <string name="ApplicationPreferencesActivity_disable">停用</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">連線到伺服器時發生錯誤！</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">註冊鎖定須要 PIN 碼。若要停用 PIN 碼，請先停用註冊鎖定。</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">檔案</string>
     <string name="AttachmentKeyboard_contact">聯絡人</string>
     <string name="AttachmentKeyboard_location">位置</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal 需要獲取權限以顯示你的相片和影片</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly 需要獲取權限以顯示你的相片和影片</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">允許存取</string>
     <string name="AttachmentKeyboard_payment">付款</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">找不到應用程式以選取媒體。</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal 需要儲存裝置權限才可附加照片、影片或音訊，但已被永久拒絕。請前往應用程式設定功能表，選擇 「權限」，然後啟用 「儲存裝置」。</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal 需要聯絡人權限才可附加聯絡人資訊，但已被永久拒絕。請前往應用程式設定功能表，選擇「權限」，然後啟用 「聯絡人」。</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal 需要位置權限才可附加位置，但已被永久拒絕。請前往應用程式設定功能表，選擇「權限」，然後啟用 「位置」。</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly 需要儲存裝置權限才可附加照片、影片或音訊，但已被永久拒絕。請前往應用程式設定功能表，選擇 「權限」，然後啟用 「儲存裝置」。</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly 需要聯絡人權限才可附加聯絡人資訊，但已被永久拒絕。請前往應用程式設定功能表，選擇「權限」，然後啟用 「聯絡人」。</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly 需要位置權限才可附加位置，但已被永久拒絕。請前往應用程式設定功能表，選擇「權限」，然後啟用 「位置」。</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">允許存取你的位置</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">要傳送你的位置：</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">允許 Signal 存取權以發送你的位置。</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">允許 Molly 存取權以發送你的位置。</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal 需要位置存取權以傳送你的位置。</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly 需要位置存取權以傳送你的位置。</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">允許存取儲存空間</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">顯示相片和影片：</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal 需要獲取儲存空間的存取權以顯示你的相片和影片。</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly 需要獲取儲存空間的存取權以顯示你的相片和影片。</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s 尚未啟動付款 </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">切換鏡頭</string>
     <string name="CameraXFragment_open_gallery_description">開啟圖片庫</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">允許存取</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">允許存取你的相機及麥克風</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">允許存取你的相機</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">允許連接你的麥克風</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">要拍攝相片，請允許 Signal 存取相機。</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">要拍照或錄影，請允許Signal存取相機。</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">要拍照及錄影，請允許 Signal 存取相機及麥克風。</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">要錄製有聲影片，請允許 Signal 存取你的麥克風。</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">要掃描二維碼，請允許 Signal 存取相機。</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal 需要相機存取權限以拍攝相片</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal 需要相機存取權限以掃描二維碼</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal 需要麥克風存取權限以錄製影片</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">要在 Signal 拍攝相片：</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">要在 Signal 拍照及錄影：</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">要錄製有聲影片：</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">要掃描二維碼：</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">最近的聯絡人</string>
@@ -270,7 +271,7 @@
     <string name="CameraContacts_no_signal_contacts">無 Signal 聯絡人</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">您僅可使用相機按鈕傳送照片給 Signal 聯絡人。 </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">找不到想要找的人嗎？</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">邀請聯絡人加入 Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">邀請聯絡人加入 Molly</string>
     <string name="CameraContacts__menu_search">搜尋</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -284,12 +285,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">不必了</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">更新 Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">更新 Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">此版本的應用程式已不再被支援。若要繼續傳送和接收訊息，請更新至最新版本。</string>
     <string name="ClientDeprecatedActivity_update">更新</string>
     <string name="ClientDeprecatedActivity_dont_update">不要更新</string>
     <string name="ClientDeprecatedActivity_warning">警告</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">你的 Signal 版本已過期。你可以瀏覽訊息紀錄，但無法傳送或接收訊息，直到你更新版本為止。</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">你的 Molly 版本已過期。你可以瀏覽訊息紀錄，但無法傳送或接收訊息，直到你更新版本為止。</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">找不到網頁瀏覽器</string>
@@ -326,8 +327,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">傳送訊息給 %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly 語音通話 %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly 視訊通話 %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -419,7 +420,7 @@
     <string name="ConversationActivity_transport_signal">Signal 訊息</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">傳送訊息</string>
-    <string name="ConversationActivity_lets_switch_to_signal">我們不如改用 Signal 吧 %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">我們不如改用 Molly 吧 %1$s</string>
     <string name="ConversationActivity_specify_recipient">請選擇一個聯絡人</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">附件超出您正在傳送的訊息類型的大小上限。</string>
     <string name="ConversationActivity_unable_to_record_audio">無法錄製音訊！</string>
@@ -438,18 +439,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">要傳送語音訊息：</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">如要傳送語音訊息，請允許 Signal 存取你的麥克風。</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">如要傳送語音訊息，請允許 Molly 存取你的麥克風。</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal 需要麥克風存取權限以錄製語音訊息。</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal需要存取咪高峰來傳送語音訊息，但您已經永久拒絕。請前往應用程式設定功能表，按「權限」，然後開啟「咪高峰」。</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly 需要麥克風存取權限以錄製語音訊息。</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly需要存取咪高峰來傳送語音訊息，但您已經永久拒絕。請前往應用程式設定功能表，按「權限」，然後開啟「咪高峰」。</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal需要存取咪高峰及相機來呼叫%1$s，但您已經永久拒絕。請前往應用程式設定功能表，按「權限」，然後開啟「咪高峰」和「相機」。</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">要拍照或錄影，請允許Signal存取相機。</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal需要存取相機來拍照或錄影，但您已經永久拒絕。請前往應用程式設定功能表，按「權限」，然後開啟「相機」。</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal 需要「相機」權限以拍攝照片或影片</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly需要存取咪高峰及相機來呼叫%1$s，但您已經永久拒絕。請前往應用程式設定功能表，按「權限」，然後開啟「咪高峰」和「相機」。</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">要拍照或錄影，請允許Molly存取相機。</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly需要存取相機來拍照或錄影，但您已經永久拒絕。請前往應用程式設定功能表，按「權限」，然後開啟「相機」。</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly 需要「相機」權限以拍攝照片或影片</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">請啟用咪高峰權限以擷取現場收音的影片。</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal 需要「咪高峰」權限以錄製影片，但已被拒絕。請前往應用程式設定，選擇「權限」，然後啟用「咪高峰」和「相機」。</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal 需要咪高峰權限以錄製影片。</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly 需要「咪高峰」權限以錄製影片，但已被拒絕。請前往應用程式設定，選擇「權限」，然後啟用「咪高峰」和「相機」。</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly 需要咪高峰權限以錄製影片。</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">否</string>
@@ -470,9 +471,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">要開始通話：</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">若要開始通話，請允許 Signal 存取你的麥克風。</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">若要開始通話，請允許 Molly 存取你的麥克風。</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal 需要麥克風存取權限才能發起通話。</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly 需要麥克風存取權限才能發起通話。</string>
 
 
     <string name="ConversationActivity_join">加入</string>
@@ -486,9 +487,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Signal 不再支援短訊功能。邀請 %1$s 加入 Signal 以繼續對話。</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">此人不再使用 Signal。邀請他們加入 Signal 以繼續對話。</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">此人不再使用 Molly。邀請他們加入 Molly 以繼續對話。</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">邀請加入 Signal</string>
+    <string name="ConversationActivity__invite_to_signal">邀請加入 Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">我們稍後會再次提醒你。</string>
 
@@ -536,6 +537,8 @@
     <string name="ConversationFragment_delete_for_everyone">為所有人刪除</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">由此裝置中刪除</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">刪除</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">由所有裝置中刪除</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">如聊天中的成員均使用最新版本的 Signal，此訊息將在所有人的裝置上刪除，他們將會看見你刪除了一則訊息。</string>
@@ -567,13 +570,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">已封鎖</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">更新 Signal</string>
+    <string name="ConversationFragment__update_build">更新 Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">重新註冊 Signal</string>
+    <string name="ConversationFragment__reregister_signal">重新註冊 Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">導向返回。</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">開啟 Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">開啟 Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">已無驗證</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -636,6 +639,10 @@
     <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
         <item quantity="other">這將永久刪除共 %1$d 個選取的聊天。</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="other">這將從你所有裝置中永久刪除共 %1$d 則已選的聊天。</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">正在刪除</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="other">刪除已選取的聊天…</item>
@@ -719,9 +726,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">誰可以透過電話號碼找到我？</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">任何擁有你電話號碼的人都會看到你在使用 Signal，並可以開始與你聊天。</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">任何擁有你電話號碼的人都會看到你在使用 Molly，並可以開始與你聊天。</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">除非你向對方傳送訊息或與對方已有聊天紀錄，否則沒有人能看到你使用 Signal。</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">除非你向對方傳送訊息或與對方已有聊天紀錄，否則沒有人能看到你使用 Molly。</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">要從備份還原嗎？</string>
@@ -755,7 +762,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">測試您的備份密碼並驗證是否相符</string>
     <string name="BackupsPreferenceFragment__turn_on">開啟</string>
     <string name="BackupsPreferenceFragment__turn_off">關閉</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"如要還原備份，在全新安裝 Signal 後，請開啟應用程式並輕觸「還原備份」，然後找出備份檔案位置。%1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"如要還原備份，在全新安裝 Molly 後，請開啟應用程式並輕觸「還原備份」，然後找出備份檔案位置。%1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">了解更多</string>
     <string name="BackupsPreferenceFragment__in_progress">進行中…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -763,7 +770,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">目前進度 %1$d…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">目前進度 %1$s%%…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal 需要外部儲存空間權限才可建立備份，但已被永久拒絕。請前往應用程式設定，選擇「權限」，然後啟用「儲存裝置」。</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Molly 需要外部儲存空間權限才可建立備份，但已被永久拒絕。請前往應用程式設定，選擇「權限」，然後啟用「儲存裝置」。</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">設定備份時間</string>
 
@@ -830,7 +837,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">聊天工作階段已重新整理</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal 使用端對端加密，偶爾或需重新整理您的聊天工作階段。這並不會影響您的聊天安全性，但您或許會錯過來自此聯絡人的一兩則訊息，您可請對方重新傳送。</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly 使用端對端加密，偶爾或需重新整理您的聊天工作階段。這並不會影響您的聊天安全性，但您或許會錯過來自此聯絡人的一兩則訊息，您可請對方重新傳送。</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">在桌面電腦或 iPad 上使用 Signal。你的訊息將同步到已連結裝置。</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">連結新的裝置</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s所有裝置上的訊息和聊天資訊均受端對端加密的保護</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">在桌面電腦或 iPad 上的 Signal</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">所有在已連結裝置上的訊息均為私密</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">連結後，Molly 訊息會與手機上的 Molly 同步。之前的訊息紀錄將不會出現。</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">在你的其他裝置上，前往 %1$s 以安裝 Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">我的已連結裝置</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">解除連結</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s已解除連結</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">正在連結裝置…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">裝置已核准</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">正在載入…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">沒有已連結裝置</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">解鎖以連結裝置</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">掃描顯示在裝置上的二維碼以進行連結。</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">掃描二維碼</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">使用此裝置來掃描你想連結的裝置上所顯示的二維碼</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">確定</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">此裝置可查看你的群組和聯絡人、存取你的聊天，以及以你的名義傳送訊息。</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">在另一部裝置上完成連結</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">在你的另一部裝置上完成 Molly 連結。</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">裝置連結失敗</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">此二維碼無效。請確認您所掃描的二維碼顯示於您想連結的裝置上。</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">重試</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">要取消連結「%1$s」嗎？</string>
@@ -852,10 +914,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">針對缺少 Play 服務的優化</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">此裝置不支援 Play 服務。輕觸以停用系統電量優化，以免干擾 Signal 閒置時擷取訊息。</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">此裝置不支援 Play 服務。輕觸以停用系統電量優化，以免干擾 Molly 閒置時擷取訊息。</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">此版本的 Signal 已過期。立即更新以傳送和接收訊息。</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">此版本的 Molly 已過期。立即更新以傳送和接收訊息。</string>
     <string name="ExpiredBuildReminder_update_now">立即更新</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -865,8 +927,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">檢視</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">永久性 Signal 通訊失敗！</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal 無法與 Google Play 服務註冊。Signal 訊息和通話已被停用，請到「設定」&gt;「進階」嘗試重新註冊。</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">永久性 Molly 通訊失敗！</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly 無法與 Google Play 服務註冊。Molly 訊息和通話已被停用，請到「設定」&gt;「進階」嘗試重新註冊。</string>
 
 
     <!-- GiphyActivity -->
@@ -992,20 +1054,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">除錯日誌可協助我們診斷並修正問題，而且不包含識別資料。</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal 遇到了問題。要提交除錯日誌嗎？</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly 遇到了問題。要提交除錯日誌嗎？</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">由於電池效能最佳化，通知可能會延遲</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">你可以停用 Signal 的電池效能最佳化設定，以確保訊息通知不會延遲。</string>
+    <string name="PromptBatterySaverBottomSheet__message">你可以停用 Molly 的電池效能最佳化設定，以確保訊息通知不會延遲。</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">由於電池效能最佳化，通知可能會延遲</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">停用 Molly 的電池效能最佳化設定，以確保訊息通知不會延遲。點按「繼續」查看特定裝置說明。</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">不必了</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">繼續</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">繼續</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">解除</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">不必了</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">尚待處理的群組邀請</string>
+    <string name="PendingMembersActivity_pending_group_invites">請求與邀請</string>
     <string name="PendingMembersActivity_requests">請求</string>
     <string name="PendingMembersActivity_invites">邀請</string>
     <string name="PendingMembersActivity_people_you_invited">您邀請的人</string>
@@ -1244,12 +1316,12 @@
     <string name="InviteActivity_cancel">取消</string>
     <string name="InviteActivity_sending">正在傳送…</string>
     <string name="InviteActivity_invitations_sent">邀請已傳送！</string>
-    <string name="InviteActivity_invite_to_signal">邀請加入 Signal</string>
+    <string name="InviteActivity_invite_to_signal">邀請加入 Molly</string>
     <string name="InviteActivity_send_sms">傳送短訊 (%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="other">要傳送 %1$d 個短訊邀請嗎？</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">一齊轉用 Signal 咯：%1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">一齊轉用 Molly 咯：%1$s</string>
     <string name="InviteActivity_no_app_to_share_to">您似乎未有任何應用程式可作分享。</string>
 
     <!-- LearnMoreTextView -->
@@ -1263,7 +1335,7 @@
     <string name="LongMessageActivity_your_message">您的訊息</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">背景連線已啟用</string>
 
     <!-- MediaOverviewActivity -->
@@ -1327,10 +1399,10 @@
     <string name="MessageQuotesBottomSheet_replies">回覆</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">正在建立 Signal 通話</string>
+    <string name="NotificationBarManager__establishing_signal_call">正在建立 Molly 通話</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">正在開始 Signal 通話服務</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">正在停止 Signal 通話服務</string>
+    <string name="NotificationBarManager__starting_signal_call_service">正在開始 Molly 通話服務</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">正在停止 Molly 通話服務</string>
     <string name="NotificationBarManager__cancel_call">取消通話</string>
 
     <!-- NotificationsMegaphone -->
@@ -1574,6 +1646,14 @@
     <string name="MessageRecord_you_activated_payments">你啟動了付款</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s 現在可以接受付款</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">未能提供付款詳情</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">點按以獲取更多</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">未能提供付款詳情</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">未能提供此付款的詳細資訊，因為你的訊息是從不含此付款紀錄的來源所還原的。這不會影響你的錢包餘額或過去付款的狀態。</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1628,9 +1708,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">你很快將無法再於 Signal 傳送短訊。邀請 %1$s 加入 Signal 以繼續對話。</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">你無法再於 Signal 傳送短訊。邀請 %1$s 加入 Signal 以繼續對話。</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">你無法再於 Molly 傳送短訊。邀請 %1$s 加入 Molly 以繼續對話。</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">付款：%1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">付款</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">已舉報垃圾訊息</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1704,7 +1786,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">要連結 Signal 裝置嗎？</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">您似乎正嘗試使用第三方掃描程式連結 Signal 裝置。為保護您的安全，請在 Signal 中再次掃描二維碼。</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal 需要相機權限才可掃描二維碼，但已被永久拒絕。請前往應用程式設定，選擇「權限」，然後啟用「相機」。</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly 需要相機權限才可掃描二維碼，但已被永久拒絕。請前往應用程式設定，選擇「權限」，然後啟用「相機」。</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">缺少「相機」權限下無法掃描二維碼</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1716,11 +1798,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">輸入密碼</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal 圖示</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly 圖示</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">提交密碼</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">密碼無效！</string>
-    <string name="PassphrasePromptActivity_unlock_signal">解除鎖定 Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - 鎖定畫面</string>
+    <string name="PassphrasePromptActivity_unlock_signal">解除鎖定 Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android - 鎖定畫面</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">地圖</string>
@@ -1786,7 +1868,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">驗證以繼續傳訊</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">為協助防範 Signal 垃圾訊息，請先完成驗證。</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">為協助防範 Molly 垃圾訊息，請先完成驗證。</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">完成驗證後，您將可繼續傳訊。暫止的訊息將會自動傳送。</string>
 
     <!-- Recipient -->
@@ -1794,7 +1876,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">我的限時動態</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal 通話</string>
+    <string name="Recipient_signal_call">Molly 通話</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">封鎖</string>
@@ -1808,7 +1890,8 @@
     <string name="RedPhone_ringing">正在響鈴……</string>
     <string name="RedPhone_busy">忙碌</string>
     <string name="RedPhone_recipient_unavailable">對方事忙</string>
-    <string name="RedPhone_network_failed">網絡失敗！</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">網絡失敗！ 請檢查你的網路連線，然後再試一次。</string>
     <string name="RedPhone_number_not_registered">號碼尚未註冊！</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">您所撥打的號碼不支援安全語音！</string>
     <string name="RedPhone_got_it">我知道了</string>
@@ -1819,8 +1902,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">輕觸此處以開啟您的視像</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Signal 需要存取您的相機，以便與 %1$s 通話。</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">Molly 需要存取您的相機，以便與 %1$s 通話。</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">正在撥號…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">正在重新連線…</string>
@@ -1868,10 +1951,30 @@
     <string name="WebRtcCallActivity__removed_from_call">已從通話中移除</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">有人將你從通話中移除。</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">允許存取你的相機及麥克風</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">允許連接你的麥克風</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">允許存取你的相機</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">要開始或加入通話，請允許 Molly 存取你的相機和麥克風。</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">要開始或加入通話，請允許 Molly 存取你的麥克風。</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">要啟用視訊，請允許 Molly 存取你的相機。</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly 需要麥克風權限以開始或加入通話。</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly 需要相機存取權限以啟用視訊</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">要開始或加入通話：</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">要啟用你的視訊：</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal 通話</string>
-    <string name="WebRtcCallView__signal_video_call">Signal 視像通話</string>
+    <string name="WebRtcCallView__signal_call">Molly 通話</string>
+    <string name="WebRtcCallView__signal_video_call">Molly 視像通話</string>
     <string name="WebRtcCallView__start_call">開始通話</string>
     <string name="WebRtcCallView__join_call">加入通話</string>
     <string name="WebRtcCallView__call_is_full">通話已滿座</string>
@@ -1956,21 +2059,38 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">要放下手？</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">放下手</string>
+    <string name="CallOverflowPopupWindow__lower_hand">放下</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">取消</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">你舉了手</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">檢視</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="other">%1$s + %2$d 舉了手</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s 舉了手</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s +%2$d 舉了手</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s 舉了手</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s +%2$d 舉了手</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="other">%1$s + %2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="other">%1$s + %2$d</item>
     </plurals>
 
@@ -2055,7 +2175,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">你將會收到一個來電，以驗證此電話號碼。</string>
     <string name="RegistrationActivity_edit_number">修正電話號碼</string>
     <string name="RegistrationActivity_missing_google_play_services">缺少 Google Play 服務</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">此裝置未有安裝Google Play 服務。你仍可使用 Signal，但其可靠程度及運作表現可能會因這配置而減弱。\n\n 若你不是進階用戶，亦非營運 Android ROM 售後市場，或你認為這是錯誤訊息， 請聯絡 support@signal.org 協助解決疑難。</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">此裝置未有安裝Google Play 服務。你仍可使用 Molly，但其可靠程度及運作表現可能會因這配置而減弱。\n\n 若你不是進階用戶，亦非營運 Android ROM 售後市場，或你認為這是錯誤訊息， 請聯絡 support@molly.im 協助解決疑難。</string>
     <string name="RegistrationActivity_i_understand">我明白</string>
     <string name="RegistrationActivity_play_services_error">Play 服務錯誤</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play 服務正在更新，或暫時未能運作。請再試一次。</string>
@@ -2073,7 +2193,7 @@
     <string name="RegistrationActivity_non_standard_number_format">非標準號碼格式</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">您所輸入的號碼 (%1$s) 似乎並非標準格式。\n\n您是指 %2$s 嗎？</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - 電話號碼格式</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - 電話號碼格式</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">已請求撥號</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2106,8 +2226,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">註冊時遇到困難？</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• 確保你的手機有行動網路訊號以接收你的 SMS 短訊或電話\n • 確認你可以接到該號碼的電話\n • 檢查你輸入的電話號碼是否正確。</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">如需詳細資訊，請依照這些疑難排解步驟進行，或聯絡支援團隊</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">要了解更多資訊，請參考 %1$s 或聯絡 %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">這些疑難排解步驟</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2145,13 +2265,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">新增至通訊錄</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">邀請加入 Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">邀請加入 Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal 訊息</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal 通話</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">新增至通訊錄</string>
-    <string name="SharedContactView_invite_to_signal">邀請加入 Signal</string>
+    <string name="SharedContactView_invite_to_signal">邀請加入 Molly</string>
     <string name="SharedContactView_message">Signal 訊息</string>
 
     <!-- SignalBottomActionBar -->
@@ -2282,11 +2402,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s 是 %2$s 的手機號碼</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal 更新</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">新版本的 Signal 現已提供。 輕觸以更新。</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal 無法更新</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly 更新</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">新版本的 Molly 現已提供。 輕觸以更新。</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly 無法更新</string>
     <string name="ApkUpdateNotifications_failed_general_body">我們將稍後再試。</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal 已成功更新</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly 已成功更新</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">已自動更新到版本 %1$s。</string>
 
     <!-- UntrustedSendDialog -->
@@ -2356,7 +2476,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">我們的 Signal 安全碼：</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">您似乎未有任何應用程式可作分享。</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">在剪貼簿中找不到安全碼以作比對</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal 需要相機權限才可掃描二維碼，但已被永久拒絕。請前往應用程式設定，選擇「權限」，然後啟用「相機」。</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly 需要相機權限才可掃描二維碼，但已被永久拒絕。請前往應用程式設定，選擇「權限」，然後啟用「相機」。</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">缺少「相機」權限下無法掃描二維碼</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">您必須先交換訊息，以便檢視 %1$s 的安全碼。</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2386,14 +2506,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">輕按一下以開啟。</string>
-    <string name="KeyCachingService_passphrase_cached">Signal 已解除鎖定</string>
-    <string name="KeyCachingService_lock">鎖定 Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly 已解除鎖定</string>
+    <string name="KeyCachingService_lock">鎖定 Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">您</string>
     <string name="MediaPreviewActivity_unssuported_media_type">未支援的媒體類型</string>
     <string name="MediaPreviewActivity_draft">草稿</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal 需要儲存裝置權限才可儲存到外部儲存空間，但已被永久拒絕。請前往應用程式設定，選擇「權限」，然後啟用「儲存裝置」。</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly 需要儲存裝置權限才可儲存到外部儲存空間，但已被永久拒絕。請前往應用程式設定，選擇「權限」，然後啟用「儲存裝置」。</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">缺少權限下無法儲存到外部儲存空間</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">要刪除訊息嗎？</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">這將會永久刪除此訊息。</string>
@@ -2435,7 +2555,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">送遞訊息失敗。</string>
     <string name="MessageNotifier_error_delivering_message">送遞訊息時發生錯誤。</string>
     <string name="MessageNotifier_message_delivery_paused">訊息送遞已暫止。</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">驗證以繼續在 Signal 傳訊。</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">驗證以繼續在 Molly 傳訊。</string>
     <string name="MessageNotifier_mark_all_as_read">全部標記為已讀</string>
     <string name="MessageNotifier_mark_read">標記為已讀</string>
     <string name="MessageNotifier_turn_off_these_notifications">關閉這些通知</string>
@@ -2457,7 +2577,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">對你的貼圖表達了 %1$s 心情。</string>
     <string name="MessageNotifier_this_message_was_deleted">此訊息已被刪除。</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">要關閉聯絡人加入 Signal 的通知嗎？您可在 Signal &gt;「設定」&gt;「通知」中再次啟用。</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">要關閉聯絡人加入 Molly 的通知嗎？您可在 Molly &gt;「設定」&gt;「通知」中再次啟用。</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2496,7 +2616,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signal 在鎖定時無法使用快速回應！</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Molly 在鎖定時無法使用快速回應！</string>
     <string name="QuickResponseService_problem_sending_message">傳送訊息時發生問題！</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2516,7 +2636,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">捷徑無效</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">新訊息</string>
     <string name="SingleRecipientNotificationBuilder_message_request">訊息請求</string>
     <string name="SingleRecipientNotificationBuilder_you">您</string>
@@ -2561,7 +2681,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">此裝置已不再註冊。通常是因為你已在另一部裝置上使用你的電話號碼註冊 Signal。</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">此裝置已不再註冊。通常是因為你已在另一部裝置上使用你的電話號碼註冊 Molly。</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">重新註冊裝置</string>
 
@@ -2574,10 +2694,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">若要接聽通話，請授予 Signal 存取您的咪高峰。</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">若要接聽通話，請授予 Molly 存取您的咪高峰。</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">若要接聽視訊通話，請允許 Signal 存取你的麥克風和相機。</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal 需要咪高峰和相機權限才可致電或接聽通話，但已被永久拒絕。請前往應用程式設定，選擇「權限」，然後啟用「咪高峰」和「相機」。</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">若要接聽視訊通話，請允許 Molly 存取你的麥克風和相機。</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly 需要咪高峰和相機權限才可致電或接聽通話，但已被永久拒絕。請前往應用程式設定，選擇「權限」，然後啟用「咪高峰」和「相機」。</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">已在連結的裝置上接聽。</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">已在連結的裝置上拒接。</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">在連結的裝置上繁忙中。</string>
@@ -2622,16 +2742,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">重複輸入新的密碼</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">邀請加入 Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">邀請加入 Molly</string>
     <string name="contact_selection_activity__new_group">建立新群組</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">重新整理聯絡人</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">找不到某人？嘗試重新整理</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">在 Signal 上尋找你認識的人</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">允許存取你的通訊錄</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">更多</string>
 
@@ -2648,7 +2768,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">聯絡人照片</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal 需要聯絡人權限才可顯示您的聯絡人，但已被永久拒絕。請前往應用程式設定功能表，選擇「權限」，然後啟用「聯絡人」。</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly 需要聯絡人權限才可顯示您的聯絡人，但已被永久拒絕。請前往應用程式設定功能表，選擇「權限」，然後啟用「聯絡人」。</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">提取聯絡人時發生錯誤，請檢查您的網絡連線</string>
     <string name="ContactSelectionListFragment_username_not_found">找不到用戶名稱</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"「%1$s」並非 Signal 使用者。請檢查用戶名稱，然後再試一次。"</string>
@@ -2665,16 +2785,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">以用戶名稱搜尋</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">允許存取通訊錄</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">要在 Signal 上尋找你認識的人：</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">允許存取</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">不必了</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">允許存取你的通訊錄。你的通訊錄已加密，Signal 服務無法看到。</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal 需要存取您的聯絡人以便為您顯示。</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly 需要存取您的聯絡人以便為您顯示。</string>
     <string name="contact_selection_list_fragment__show_contacts">顯示聯絡人</string>
 
     <!-- contact_selection_list_item -->
@@ -2745,6 +2867,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">你已移除此人，再次傳送訊息給他們會將對方加回你的清單。</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">選項</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">更新</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">播放 … 暫停</string>
@@ -2773,7 +2897,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">氣泡是一項 Android 功能，您可為 Signal 聊天將其關閉。</string>
+    <string name="BubbleOptOutTooltip__description">氣泡是一項 Android 功能，您可為 Molly 聊天將其關閉。</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">現在不要</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -2934,9 +3058,9 @@
     <string name="EditProfileFragment__group_description">群組描述</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">更新 Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">更新 Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">此版本的 Signal 已過期。請立即更新以繼續使用 Signal。</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">此版本的 Molly 已過期。請立即更新以繼續使用 Molly。</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">更新</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3152,7 +3276,7 @@
     <string name="preferences__slow">慢</string>
     <string name="preferences__help">說明</string>
     <string name="preferences__advanced">進階</string>
-    <string name="preferences__donate_to_signal">捐款給 Signal</string>
+    <string name="preferences__donate_to_signal">捐款給 Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">私隱</string>
     <!-- Preference label for stories -->
@@ -3189,13 +3313,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">將應用程式圖示和名稱更改為「%1$s」</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal 需要關閉才能更改應用程式圖示和名稱。通知依然會以預設的 Signal 圖示和名稱來顯示。</string>
+    <string name="preferences__app_icon_dialog_description">Molly 需要關閉才能更改應用程式圖示和名稱。通知依然會以預設的 Molly 圖示和名稱來顯示。</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">選擇應用程式圖示和名稱，這將顯示在手機的主螢幕和應用抽屜中。通知依然會以預設的 Signal 圖示和名稱來顯示。了解 更多</string>
+    <string name="preferences__app_icon_warning_learn_more">選擇應用程式圖示和名稱，這將顯示在手機的主螢幕和應用抽屜中。通知依然會以預設的 Molly 圖示和名稱來顯示。了解 更多</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">應用程式圖示和名稱可在手機的主螢幕和應用抽屜中見到。</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">通知依然會以預設的 Signal 圖示和名稱來顯示。</string>
+    <string name="preferences__app_icon_notification_warning">通知依然會以預設的 Molly 圖示和名稱來顯示。</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">了解 更多</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3241,8 +3365,12 @@
         <item quantity="other">這將會永久刪減所有聊天至最近 %1$s 則訊息。</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">這操作將會從你的裝置永久刪除所有訊息紀錄和多媒體。</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">這將永久刪除此裝置和任何已連結裝置上的所有訊息紀錄和多媒體。</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">你確定要刪除所有訊息紀錄嗎？</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">所有訊息紀錄將會被永久移除。此動作將無法復原。</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">所有訊息紀錄將會從所有裝置中永久移除。此動作無法復原。</string>
     <string name="preferences_storage__delete_all_now">立即全部刪除</string>
     <string name="preferences_storage__forever">永久</string>
     <string name="preferences_storage__one_year">1 年</string>
@@ -3278,7 +3406,7 @@
     <string name="preferences_communication__category_censorship_circumvention">審查規避</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">審查規避</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">一旦啟用，Signal 會嘗試規避審查。除非您所在地方會審查 Signal，否則不要使用此功能。</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">一旦啟用，Molly 會嘗試規避審查。除非您所在地方會審查 Molly，否則不要使用此功能。</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">根據您的電話號碼，我們已啟用審查規避功能。</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3330,7 +3458,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">付款功能登場</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">使用 Signal 傳送和接收 MobileCoin：一種注重私隱的全新電子貨幣。立即啟動便可以開始使用。</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">使用 Molly 傳送和接收 MobileCoin：一種注重私隱的全新電子貨幣。立即啟動便可以開始使用。</string>
     <string name="PaymentsHomeFragment__activate_payments">啟用付款</string>
     <string name="PaymentsHomeFragment__activating_payments">正在啟用付款…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">還原付款帳戶</string>
@@ -3356,7 +3484,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">付款不適用於您的地區。</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">無法啟用付款。請稍後再試。</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">要停用付款嗎？</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">若您停用付款，您將無法在 Signal 中發送或接收 MobileCoin。</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">若您停用付款，您將無法在 Molly 中發送或接收 MobileCoin。</string>
     <string name="PaymentsHomeFragment__deactivate">停用</string>
     <string name="PaymentsHomeFragment__continue">繼續</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">餘額目前未能提供。</string>
@@ -3365,10 +3493,10 @@
     <string name="PaymentsHomeFragment__details">詳細資料</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">你可使用 Signal 收發 MobileCoin。所有付款均受 MobileCoin 和 MobileCoin Wallet 的使用條款約束。你或許會遇到一些問題，以及你可能遺失付款或餘額而無法還原。 </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">你可使用 Molly 收發 MobileCoin。所有付款均受 MobileCoin 和 MobileCoin Wallet 的使用條款約束。你或許會遇到一些問題，以及你可能遺失付款或餘額而無法還原。 </string>
     <string name="PaymentsHomeFragment__activate">啟用</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">檢視 MobileCoin 條款</string>
-    <string name="PaymentsHomeFragment__payments_not_available">付款已不再在 Signal 上可用。您仍可轉移款項至交易平台，惟您不再能發送和接收付款或增加款項。</string>
+    <string name="PaymentsHomeFragment__payments_not_available">付款已不再在 Molly 上可用。您仍可轉移款項至交易平台，惟您不再能發送和接收付款或增加款項。</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3396,7 +3524,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">允許存取權限</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">為協助你向認識的人發送訊息，Signal 將請求此等權限。 </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">為協助你向認識的人發送訊息，Molly 將請求此等權限。 </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">通知</string>
     <!-- Notifications permission row description -->
@@ -3484,10 +3612,10 @@
     <string name="PaymentsTransferFragment__next">下一步</string>
     <string name="PaymentsTransferFragment__invalid_address">位址無效</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">請檢查您嘗試轉移至該處的錢包位址，然後再試一次。</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">您不能轉移至您自己的 Signal 錢包位址。請輸入您在支援的交易平台上所屬帳戶的錢包位址。</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Signal 需要存取相機，以便掃描二維碼。</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal 需要相機權限才可擷取二維碼。請前往設定，選擇「權限」，然後啟用「相機」。</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Signal 需要存取相機，以便掃描二維碼。</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">您不能轉移至您自己的 Molly 錢包位址。請輸入您在支援的交易平台上所屬帳戶的錢包位址。</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">Molly 需要存取相機，以便掃描二維碼。</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly 需要相機權限才可擷取二維碼。請前往設定，選擇「權限」，然後啟用「相機」。</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">Molly 需要存取相機，以便掃描二維碼。</string>
     <string name="PaymentsTransferFragment__settings">設定</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3826,17 +3954,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Signal 語音通話來電</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Molly 語音通話來電</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Signal 視訊通話來電</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Molly 視訊通話來電</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Signal 群組來電</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Molly 群組來電</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Signal 語音通話進行中</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Molly 語音通話進行中</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Signal 視訊通話進行中</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Molly 視訊通話進行中</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Signal 群組通話進行中</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Molly 群組通話進行中</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">正在載入…</string>
@@ -3883,9 +4011,9 @@
     <string name="BackupDialog_verify">驗證</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">您已成功輸入您的備份密碼</string>
     <string name="BackupDialog_passphrase_was_not_correct">密碼不正確</string>
-    <string name="LocalBackupJob_creating_signal_backup">正在建立 Signal 備份…</string>
+    <string name="LocalBackupJob_creating_signal_backup">正在建立 Molly 備份…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">正在驗證 Signal 備份…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">正在驗證 Molly 備份…</string>
     <string name="LocalBackupJobApi29_backup_failed">備份失敗</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">您的備份目錄已被刪除或移動。</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">您的備份檔太大，無法在此磁碟機中儲存。</string>
@@ -3900,15 +4028,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">打電話給我 (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">重新傳送驗證碼 (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">聯絡 Signal 支援</string>
-    <string name="RegistrationActivity_code_support_subject">Signal 註冊 — Android 用的驗證碼</string>
+    <string name="RegistrationActivity_contact_signal_support">聯絡 Molly 支援</string>
+    <string name="RegistrationActivity_code_support_subject">Molly 註冊 — Android 用的驗證碼</string>
     <string name="RegistrationActivity_incorrect_code">錯誤編號</string>
     <string name="BackupUtil_never">永不</string>
     <string name="BackupUtil_unknown">未知</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">電話號碼</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">選擇誰可以看到你的電話號碼，以及誰可以透過電話號碼在 Signal 與你聯絡。</string>
+    <string name="preferences_app_protection__choose_who_can_see">選擇誰可以看到你的電話號碼，以及誰可以透過電話號碼在 Molly 與你聯絡。</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">誰可以看到我的號碼</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -3956,7 +4084,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">你已嘗試多次。請稍後再試。</string>
     <string name="RegistrationActivity_error_connecting_to_service">服務連線錯誤</string>
     <string name="preferences_chats__backups">備份</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal 已鎖定</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly 已鎖定</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">輕觸以解除鎖定</string>
     <string name="Recipient_unknown">未知</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -3987,9 +4115,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">您需要用到您的舊裝置。</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">從備份還原</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">從本機備份還原您的訊息。若您現在不進行還原，之後將不能還原。</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">還原本機備份</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">還原 Signal 備份</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">還原你的所有文字訊息 + 最近 30 天的媒體內容</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">更多選項</string>
 
+    <string name="TransferOrRestoreFragment__cancel">取消</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">登入而不作轉移</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">不轉移訊息及媒體並繼續</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">在您舊的 Android 電話上開啟 Signal</string>
     <string name="NewDeviceTransferInstructions__continue">繼續</string>
@@ -4004,19 +4139,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">正在準備連接舊的 Android 裝置…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">請等一下，應該快好了</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">正在等候舊的 Android 裝置連接…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal 需要「位置」權限以探索並連接您舊的 Android 裝置。</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal 需要啟用定位服務以探索並連接您舊的 Android 裝置。</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal 需要開啟 Wi-Fi 以探索並連接您舊的 Android 裝置。需要開啟 Wi-Fi，惟不需要連接到 Wi-Fi 網絡。</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">抱歉，此裝置似乎不支援 Wi-Fi Direct。Signal 使用 Wi-Fi Direct 以探索並連接您舊的 Android 裝置。您仍可還原備份，以便從您舊的 Android 裝置還原您的帳戶。</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly 需要「位置」權限以探索並連接您舊的 Android 裝置。</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly 需要啟用定位服務以探索並連接您舊的 Android 裝置。</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly 需要開啟 Wi-Fi 以探索並連接您舊的 Android 裝置。需要開啟 Wi-Fi，惟不需要連接到 Wi-Fi 網絡。</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">抱歉，此裝置似乎不支援 Wi-Fi Direct。Molly 使用 Wi-Fi Direct 以探索並連接您舊的 Android 裝置。您仍可還原備份，以便從您舊的 Android 裝置還原您的帳戶。</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">還原備份</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">嘗試連接您舊的 Android 裝置時發生未預期的錯誤。</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">正在搜尋新的 Android 裝置…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal 需要「位置」權限以探索並連接您新的 Android 裝置。</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal 需要啟用定位服務以探索並連接您新的 Android 裝置。</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal 需要開啟 Wi-Fi 以探索並連接您新的 Android 裝置。需要開啟 Wi-Fi，惟不需要連接到 Wi-Fi 網絡。</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">抱歉，此裝置似乎不支援 Wi-Fi Direct。Signal 使用 Wi-Fi Direct 以探索並連接您新的 Android 裝置。您仍可建立備份，以便在您新的 Android 裝置上還原您的帳戶。</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly 需要「位置」權限以探索並連接您新的 Android 裝置。</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly 需要啟用定位服務以探索並連接您新的 Android 裝置。</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly 需要開啟 Wi-Fi 以探索並連接您新的 Android 裝置。需要開啟 Wi-Fi，惟不需要連接到 Wi-Fi 網絡。</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">抱歉，此裝置似乎不支援 Wi-Fi Direct。Molly 使用 Wi-Fi Direct 以探索並連接您新的 Android 裝置。您仍可建立備份，以便在您新的 Android 裝置上還原您的帳戶。</string>
     <string name="OldDeviceTransferSetup__create_a_backup">建立備份</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">嘗試連接您新的 Android 裝置時發生未預期的錯誤。</string>
 
@@ -4057,7 +4192,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">正在轉移資料</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">讓兩台裝置保持接近。不要關閉裝置並保持 Signal 開啟。轉移已經端對端加密。</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">讓兩台裝置保持接近。不要關閉裝置並保持 Molly 開啟。轉移已經端對端加密。</string>
     <string name="DeviceTransfer__d_messages_so_far">目前為止 %1$d 則訊息…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">訊息目前進度 %1$s%%…</string>
@@ -4071,7 +4206,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">轉移帳戶</string>
     <string name="OldDeviceTransferInstructions__first_bullet">一、</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">在您新的 Android 裝置上下載 Signal</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">在您新的 Android 裝置上下載 Molly</string>
     <string name="OldDeviceTransferInstructions__second_bullet">二、</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"輕觸「轉移或還原帳戶」"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">三、</string>
@@ -4145,7 +4280,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">任何人憑此連結將可檢視群組的名稱和照片並請求加入。請與您信任的人分享此連結。</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">任何人憑此連結將可檢視群組的名稱和照片並加入群組。請與您信任的人分享此連結。</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">透過 Signal 分享</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">透過 Molly 分享</string>
     <string name="GroupLinkBottomSheet_copy">複製</string>
     <string name="GroupLinkBottomSheet_qr_code">二維碼</string>
     <string name="GroupLinkBottomSheet_share">分享</string>
@@ -4324,7 +4459,7 @@
     <string name="payment_info_card_about_mobilecoin">關於 MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin 是一種注重隱私的全新數位貨幣。</string>
     <string name="payment_info_card_adding_funds">增加款項</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">您可傳送 MobileCoin 到您的錢包位址，以增加款項在 Signal 中使用。</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">您可傳送 MobileCoin 到您的錢包位址，以增加款項在 Molly 中使用。</string>
     <string name="payment_info_card_cashing_out">提取款項</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">您可隨時在支援 MobileCoin 的交易平台上提取 MobileCoin，只需進行一筆轉移至您在該交易平台上的帳戶即可。</string>
     <string name="payment_info_card_hide_this_card">要隱藏此卡片嗎？</string>
@@ -4345,12 +4480,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">停用錢包</string>
     <string name="DeactivateWalletFragment__your_balance">您的餘額</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">我們建議你在停用付款之前，將你的資金轉移到另一個錢包位址。若你現在選擇不作轉移，當你重新啟用付款時，你的款項將會保留在已連結至 Signal 的錢包中。</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">我們建議你在停用付款之前，將你的資金轉移到另一個錢包位址。若你現在選擇不作轉移，當你重新啟用付款時，你的款項將會保留在已連結至 Molly 的錢包中。</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">轉移尚餘款項</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">停用而不轉移</string>
     <string name="DeactivateWalletFragment__deactivate">停用</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">要停用而不作轉移嗎？</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">若你選擇重新啟用付款，你的餘額將會保留在已連結至 Signal 的錢包中。</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">若你選擇重新啟用付款，你的餘額將會保留在已連結至 Molly 的錢包中。</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">停用錢包時發生錯誤。</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4643,7 +4778,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">許可證</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">使用條款與私隱政策</string>
-    <string name="HelpFragment__copyright_signal_messenger">Signal Messenger 版權所有</string>
+    <string name="HelpFragment__copyright_signal_messenger">Molly Messenger 版權所有</string>
     <string name="HelpFragment__licenced_under_the_agplv3">依據 GNU AGPLv3 的條款授權</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4881,9 +5016,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">選取一種色彩</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">短訊</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">分享</string>
 
@@ -4913,7 +5045,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">只有管理員可以向此群組傳送訊息。</string>
-    <string name="MultiselectForwardFragment__limit_reached">已達上限</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">你不得選取超過 5 個聊天</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5088,9 +5221,9 @@
     <string name="MySupportPreference__learn_more">了解更多</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">更新 Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">更新 Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">此版本的 Signal 已過期。請立即更新以繼續使用 Signal。</string>
+    <string name="UpdateSignalExpiredDialog__message">此版本的 Molly 已過期。請立即更新以繼續使用 Molly。</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">更新</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5099,7 +5232,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">裝置未註冊</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">此裝置已不再註冊。重新註冊以在此裝置繼續使用 Signal。</string>
+    <string name="ReregisterSignalDialog__message">此裝置已不再註冊。重新註冊以在此裝置繼續使用 Molly。</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">重新註冊</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5393,7 +5526,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">無法開啟挑選器。</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">要啟用通知，Signal 需要顯示通知的權限。</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">要啟用通知，Molly 需要顯示通知的權限。</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">開啟</string>
 
@@ -5510,7 +5643,7 @@
     <!-- Used to join views and replies when both exist on a story item -->
     <string name="StoryViewerFragment__s_s">%1$s %2$s</string>
     <!-- Displayed when viewing a post you sent -->
-    <string name="StoryViewerPageFragment__you">您</string>
+    <string name="StoryViewerPageFragment__you">你</string>
     <!-- Displayed when viewing a story sent to a group, placeholders are person who sent the story and the group name -->
     <string name="StoryViewerPageFragment__s_to_s">%1$s 至 %2$s</string>
     <!-- Displayed when viewing a post from another user with no replies -->
@@ -5539,8 +5672,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">未有回覆</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">由於你不再是這群組的成員，因此你無法回覆此限時動態。</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">對限時動態表達了心情</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">對限時動態表達了心情</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">對限時動態表達了心情</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">觀看</string>
     <!-- Label for story replies tab -->
@@ -6140,8 +6275,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">選擇你的銀行</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">與 %1$s 確認你的捐款</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">要設定你的定期捐款，請點選「繼續」以向銀行確認 €0.01 的費用。這筆款項將自動退還，並允許從你的帳戶中扣除每月 €5 的捐款。</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">要設定你的定期捐款，請點選「繼續」以向銀行確認 €0.01 的費用。這筆款項將自動退還，並允許從你的帳戶中扣除每月 %1$s 的捐款。</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">繼續</string>
 
@@ -6710,6 +6845,50 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">正在下載備份資料…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">媒體備份已關閉</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="other">由於我們無法處理你的付款，你的 Signal 媒體備份計畫已被取消。你有 %1$d 天時間下載備份中儲存的任何媒體。%1$d 天後，你備份中的媒體將會被刪除。</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">你可以隨時重新開始支付備份費用，以繼續備份所有媒體。 </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">你的媒體將會在今天刪除</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">由於我們無法處理你的付款，你的 Signal 媒體備份計畫已被取消。若要下載備份內的媒體，這是刪除備份之前的最後機會。</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">無法完成下載</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">你的裝置沒有足夠的可用空間。釋放多達 %1$s 的空間來下載儲存在備份中的多媒體。</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="other">如果你選擇「跳過」，備份內的媒體將在 %1$d 天後刪除。</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">未能處理備份付款</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">我們在收取你每月定期備份付款時遇到問題。請確定你的付款方式仍然有效。若已失效，請到 Google Pay 更新過時的資訊。Signal 將於數天內再次嘗試處理付款。</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">無法完成備份</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">你的裝置已有 %1$d 天沒有完成備份。確保你的裝置已連線至 Wi-Fi，然後點按「立即備份」。 </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">了解更多</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">略過</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">立即下載媒體</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">稍後下載</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">不下載媒體</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">釋放 %1$s 的空間來下載你的多媒體。</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">信用卡或簽帳金融卡</string>
@@ -6723,6 +6902,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">未知</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">付款紀錄</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">你上次備份是在 %1$s 的 %2$s 進行的。</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6733,6 +6918,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">訊息早於所選時間將被永久刪除。</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">訊息超過所選數量將被永久刪除。</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">為已連結裝置設定上限</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">啟用後，聊天訊息量上限也會應用在已連結裝置並刪除訊息。</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">現已在你所有裝置上同步刪除</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">當你刪除訊息或聊天時，它們將從你的手機和已連結裝置中刪除。</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">確定</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">付款紀錄</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">文字和所有多媒體備份</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">付款詳情</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">備份類型</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">付款日期</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">分享</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal 備份</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">付款紀錄</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">備份詳細資料</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">備份大小</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">備份頻率</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">使用行動數據備份</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">關閉並刪除備份</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">已刪除並關閉備份。</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">備份類型已變更且定期贊助已取消</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">訂閱已取消</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">下載完成</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">備份類型</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">備份已停用</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s /月</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">啟用備份</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">上次備份</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">永不</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">立即備份</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">要關閉並刪除備份嗎？</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">你將不會再被收取費用。你的備份將被刪除，並且不會建立新的備份。</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">關閉並刪除</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">正在刪除備份…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">備份已刪除</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"透過點按「立即備份」"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">每日</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">每週</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">每月</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">手動備份</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">請輸入你的裝置 PIN 碼、密碼或圖案。</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">下一步</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">更改備份類型</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">取消定期贊助</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">確定取消</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">我們將不會再向你收取費用。備份將在計費週期結束時關閉。在此日期之後，你將有 30 天的時間下載目前正在備份的媒體。</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">立即確認並下載</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">稍後確認並下載</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">保留定期贊助</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 3db6f2528d..e17b9102c2 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- smartling.instruction_comments_enabled = on -->
-<resources>
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  --><!-- smartling.instruction_comments_enabled = on --><resources>
   <!-- Removed by excludeNonTranslatables <string name="app_name" translatable="false">Signal</string> -->
 
   <!-- Removed by excludeNonTranslatables <string name="install_url" translatable="false">https://signal.org/install</string> -->
@@ -38,12 +39,12 @@
   <!-- Removed by excludeNonTranslatables <string name="AlbumThumbnailView_plus" translatable="false">\+%d</string> -->
 
     <!-- ApplicationMigrationActivity -->
-    <string name="ApplicationMigrationActivity__signal_is_updating">Signal 正在更新中…</string>
+    <string name="ApplicationMigrationActivity__signal_is_updating">Molly 正在更新中…</string>
 
     <!-- ApplicationPreferencesActivity -->
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">你還沒有建立密碼！</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">停用密碼嗎？</string>
-    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">這將會永久性地解鎖 Signal 與訊息通知。</string>
+    <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">這將會永久性地解鎖 Molly 與訊息通知。</string>
     <string name="ApplicationPreferencesActivity_disable">停用</string>
     <string name="ApplicationPreferencesActivity_error_connecting_to_server">與伺服器的連線發生錯誤！</string>
     <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN 碼是註冊鎖定所必需的。如要停用 PIN 碼，請先關閉註冊鎖定功能。</string>
@@ -80,31 +81,31 @@
     <string name="AttachmentKeyboard_file">檔案</string>
     <string name="AttachmentKeyboard_contact">聯絡人</string>
     <string name="AttachmentKeyboard_location">位置</string>
-    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal 需要獲取權限以顯示你的相片和影片</string>
+    <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Molly 需要獲取權限以顯示你的相片和影片</string>
     <!-- Text for a button prompting users to allow Signal access to their gallery storage -->
     <string name="AttachmentKeyboard_allow_access">允許存取</string>
     <string name="AttachmentKeyboard_payment">付款</string>
 
     <!-- AttachmentManager -->
     <string name="AttachmentManager_cant_open_media_selection">找不到合適的應用程式來選擇媒體檔案。</string>
-    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal 需要儲存的權限，以存取照片、影片或聲音檔。但是現在被設定為永久拒絕存取。請到應用程式設定中，選擇「權限」及開啟「儲存」。</string>
-    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal 需要聯絡人的權限以存取聯絡人資訊，但是現在被設定為永久拒絕存取。請到應用程式設定中，選取「權限」，並啟用「聯絡人」的權限。</string>
-    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal 需要位置的權限以存取位置資訊，但是現在被設定為永久拒絕存取。請到應用程式設定中，選取「權限」，並啟用「位置」的權限。</string>
+    <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Molly 需要儲存的權限，以存取照片、影片或聲音檔。但是現在被設定為永久拒絕存取。請到應用程式設定中，選擇「權限」及開啟「儲存」。</string>
+    <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Molly 需要聯絡人的權限以存取聯絡人資訊，但是現在被設定為永久拒絕存取。請到應用程式設定中，選取「權限」，並啟用「聯絡人」的權限。</string>
+    <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Molly 需要位置的權限以存取位置資訊，但是現在被設定為永久拒絕存取。請到應用程式設定中，選取「權限」，並啟用「位置」的權限。</string>
 
     <!-- Dialog title asking users for location permission -->
     <string name="AttachmentManager_signal_allow_access_location">允許存取你的位置</string>
     <!-- Dialog description that will explain the steps needed to give location permission -->
     <string name="AttachmentManager_signal_to_send_location">要傳送你的位置：</string>
     <!-- Alert dialog description asking for location permission -->
-    <string name="AttachmentManager_signal_allow_signal_access_location">允許 Signal 存取權以發送你的位置。</string>
+    <string name="AttachmentManager_signal_allow_signal_access_location">允許 Molly 存取權以發送你的位置。</string>
     <!-- Toast text explaining Signal\'s need for location access -->
-    <string name="AttachmentManager_signal_needs_location_access">Signal 需要位置存取權以傳送你的位置。</string>
+    <string name="AttachmentManager_signal_needs_location_access">Molly 需要位置存取權以傳送你的位置。</string>
     <!-- Dialog title asking users for gallery storage permission -->
     <string name="AttachmentManager_signal_allow_storage">允許存取儲存空間</string>
     <!-- Dialog description that will explain the steps needed to give gallery storage permission -->
     <string name="AttachmentManager_signal_to_show_photos">顯示相片和影片：</string>
     <!-- Toast text explaining Signal\'s need for storage access -->
-    <string name="AttachmentManager_signal_needs_storage_access">Signal 需要獲取儲存空間的存取權以顯示你的相片和影片。</string>
+    <string name="AttachmentManager_signal_needs_storage_access">Molly 需要獲取儲存空間的存取權以顯示你的相片和影片。</string>
 
     <!-- Alert dialog title to show the recipient has not activated payments -->
     <string name="AttachmentManager__not_activated_payments">%1$s 尚未啟動付款 </string>
@@ -226,37 +227,37 @@
     <string name="CameraXFragment_change_camera_description">切換相機</string>
     <string name="CameraXFragment_open_gallery_description">開啟相簿</string>
     <!-- Button text asking for access to camera permissions -->
-    <string name="CameraXFragment_allow_access">Allow access</string>
+    <string name="CameraXFragment_allow_access">允許存取</string>
     <!-- Dialog title asking users for camera and microphone permission -->
-    <string name="CameraXFragment_allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <string name="CameraXFragment_allow_access_camera_microphone">允許存取你的相機及麥克風</string>
     <!-- Dialog title asking users for camera permission -->
-    <string name="CameraXFragment_allow_access_camera">Allow access to your camera</string>
+    <string name="CameraXFragment_allow_access_camera">允許存取你的相機</string>
     <!-- Dialog title asking users for microphone permission -->
-    <string name="CameraXFragment_allow_access_microphone">Allow access to your microphone</string>
+    <string name="CameraXFragment_allow_access_microphone">允許連接你的麥克風</string>
     <!-- Text explaining why Signal needs camera access in order to take photos -->
-    <string name="CameraXFragment_to_capture_photos_allow_camera">To capture photos, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_allow_camera">要拍攝相片，請允許 Signal 存取相機。</string>
     <!-- Text explaining why Signal needs camera access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">To capture photos and video, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera">請授予 Signal 使用相機的權限，才能拍攝照片和影片</string>
     <!-- Text explaining why Signal needs camera and microphone access in order to take photos and videos -->
-    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">To capture photos and video, allow Signal access to the camera and microphone.</string>
+    <string name="CameraXFragment_to_capture_photos_and_video_allow_camera_microphone">要拍照及錄影，請允許 Signal 存取相機及麥克風。</string>
     <!-- Text explaining why Signal needs microphone access to take videos -->
-    <string name="CameraXFragment_to_capture_videos_with_sound">To capture videos with sound, allow Signal access to your microphone.</string>
+    <string name="CameraXFragment_to_capture_videos_with_sound">要錄製有聲影片，請允許 Signal 存取你的麥克風。</string>
     <!-- Text explaining why Signal needs camera access to scan QR codes -->
-    <string name="CameraXFragment_to_scan_qr_code_allow_camera">To scan a QR code, allow Signal access to the camera.</string>
+    <string name="CameraXFragment_to_scan_qr_code_allow_camera">要掃描二維碼，請允許 Signal 存取相機。</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when capturing photos -->
-    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal needs camera access to capture photos</string>
+    <string name="CameraXFragment_signal_needs_camera_access_capture_photos">Signal 需要相機存取權限以拍攝相片</string>
     <!-- Toast dialog explaining why Signal needs camera permissions when scanning QR codes -->
-    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal needs camera access to scan QR codes</string>
+    <string name="CameraXFragment_signal_needs_camera_access_scan_qr_code">Signal 需要相機存取權限以掃描二維碼</string>
     <!-- Toast dialog explaining why Signal needs microphone permissions -->
-    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal needs microphone access to capture video</string>
+    <string name="CameraXFragment_signal_needs_microphone_access_video">Signal 需要麥克風存取權限以錄製影片</string>
     <!-- Dialog description that explains the steps needed to give camera permission -->
-    <string name="CameraXFragment_to_capture_photos">To capture photos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos">要在 Signal 拍攝相片：</string>
     <!-- Dialog description that explains the steps needed to give camera and microphone permission -->
-    <string name="CameraXFragment_to_capture_photos_videos">To capture photos and videos in Signal:</string>
+    <string name="CameraXFragment_to_capture_photos_videos">要在 Signal 拍照及錄影：</string>
     <!-- Dialog description that explains the steps needed to give microphone permission -->
-    <string name="CameraXFragment_to_capture_videos">To capture videos with sound:</string>
+    <string name="CameraXFragment_to_capture_videos">要錄製有聲影片：</string>
     <!-- Dialog description that explains the steps needed to give Signal camera permissions -->
-    <string name="CameraXFragment_to_scan_qr_codes">To scan QR codes:</string>
+    <string name="CameraXFragment_to_scan_qr_codes">要掃描二維碼：</string>
 
     <!-- CameraContacts -->
     <string name="CameraContacts_recent_contacts">最近的聯絡人</string>
@@ -270,7 +271,7 @@
     <string name="CameraContacts_no_signal_contacts">沒有 Signal 聯絡人</string>
     <string name="CameraContacts_you_can_only_use_the_camera_button">你只能使用相機按鈕將照片傳送到 Signal 聯絡人。 </string>
     <string name="CameraContacts_cant_find_who_youre_looking_for">找不到你要找的人？</string>
-    <string name="CameraContacts_invite_a_contact_to_join_signal">邀請一個聯絡人來使用 Signal</string>
+    <string name="CameraContacts_invite_a_contact_to_join_signal">邀請一個聯絡人來使用 Molly</string>
     <string name="CameraContacts__menu_search">搜尋</string>
 
     <!-- Censorship Circumvention Megaphone -->
@@ -284,12 +285,12 @@
     <string name="CensorshipCircumventionMegaphone_no_thanks">不用了，謝謝</string>
 
     <!-- ClientDeprecatedActivity -->
-    <string name="ClientDeprecatedActivity_update_signal">更新 Signal</string>
+    <string name="ClientDeprecatedActivity_update_signal">更新 Molly</string>
     <string name="ClientDeprecatedActivity_this_version_of_the_app_is_no_longer_supported">不再支援此版本的應用程式。 要繼續傳送和接收訊息，請更新到最新版本。</string>
     <string name="ClientDeprecatedActivity_update">更新</string>
     <string name="ClientDeprecatedActivity_dont_update">不更新</string>
     <string name="ClientDeprecatedActivity_warning">警告</string>
-    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">你的Signal版本已過期。你可以查看訊息歷史記錄，但是只有在更新後才能傳送或接收訊息。</string>
+    <string name="ClientDeprecatedActivity_your_version_of_signal_has_expired_you_can_view_your_message_history">你的Molly版本已過期。你可以查看訊息歷史記錄，但是只有在更新後才能傳送或接收訊息。</string>
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">找不到網路瀏覽器。</string>
@@ -326,8 +327,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">傳送訊息給 %1$s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %1$s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %1$s</string>
+    <string name="ContactsDatabase_signal_call_s">Molly 語音通話 %1$s</string>
+    <string name="ContactsDatabase_signal_video_call_s">Molly 視訊通話 %1$s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -419,7 +420,7 @@
     <string name="ConversationActivity_transport_signal">Signal 訊息</string>
     <!-- The content description for button to send a message in a conversation -->
     <string name="ConversationActivity_send_message_content_description">傳送訊息</string>
-    <string name="ConversationActivity_lets_switch_to_signal">我們要不要切換到 Signal %1$s</string>
+    <string name="ConversationActivity_lets_switch_to_signal">我們要不要切換到 Molly %1$s</string>
     <string name="ConversationActivity_specify_recipient">請選擇聯絡人</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">當前訊息的附檔類型已經超越大小限制。</string>
     <string name="ConversationActivity_unable_to_record_audio">無法錄製音訊！</string>
@@ -438,18 +439,18 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">要傳送語音訊息：</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">如要傳送語音訊息，請允許 Signal 存取你的麥克風。</string>
+    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">如要傳送語音訊息，請允許 Molly 存取你的麥克風。</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Signal 需要麥克風存取權限以錄製語音訊息。</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal 需要麥克風的權限來傳送語音訊息，但是現在系統設定為總是拒絕 Signal。請到 Signal 的應用程式設定中，點選「權限」，並啟用「麥克風」的權限。</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly 需要麥克風存取權限以錄製語音訊息。</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly 需要麥克風的權限來傳送語音訊息，但是現在系統設定為總是拒絕 Molly。請到 Molly 的應用程式設定中，點選「權限」，並啟用「麥克風」的權限。</string>
 
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Signal 需要麥克風和相機的權限來打電話給 %1$s，但是現在系統設定為總是拒絕 Signal。請到 Signal 的應用程式設定中，點選「權限」，並啟用麥克風和相機的權限。</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">請授予 Signal 使用相機的權限，才能拍攝照片和影片</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal 需要相機的權限來拍攝照片或是影片 ，但是現在系統設定為總是拒絕 Signal。請到 Signal 的應用程式設定中，點選「權限」，並啟用相機的權限。</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal 需要使用相機的權限來拍攝照片和影片</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Molly 需要麥克風和相機的權限來打電話給 %1$s，但是現在系統設定為總是拒絕 Molly。請到 Molly 的應用程式設定中，點選「權限」，並啟用麥克風和相機的權限。</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">請授予 Molly 使用相機的權限，才能拍攝照片和影片</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Molly 需要相機的權限來拍攝照片或是影片 ，但是現在系統設定為總是拒絕 Molly。請到 Molly 的應用程式設定中，點選「權限」，並啟用相機的權限。</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Molly 需要使用相機的權限來拍攝照片和影片</string>
     <string name="ConversationActivity_enable_the_microphone_permission_to_capture_videos_with_sound">開啟麥克風權限以擷取帶有音效的影片。</string>
-    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Signal需要麥克風權限才能錄製影片，但已被拒絕。 請繼續進行應用程式設定，選擇“權限”，然後啟用“麥克風”和“相機”。</string>
-    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Signal 需要麥克風權限以錄製影片。</string>
+    <string name="ConversationActivity_signal_needs_the_recording_permissions_to_capture_video">Molly需要麥克風權限才能錄製影片，但已被拒絕。 請繼續進行應用程式設定，選擇“權限”，然後啟用“麥克風”和“相機”。</string>
+    <string name="ConversationActivity_signal_needs_recording_permissions_to_capture_video">Molly 需要麥克風權限以錄製影片。</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_no">否</string>
@@ -470,9 +471,9 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions for a voice call -->
     <string name="ConversationActivity__to_start_call">要開始通話：</string>
     <!-- Alert dialog description asking for microphone permission in order to start a voice call -->
-    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">若要開始通話，請允許 Signal 存取你的麥克風。</string>
+    <string name="ConversationActivity__to_call_signal_needs_access_to_your_microphone">若要開始通話，請允許 Molly 存取你的麥克風。</string>
     <!-- Toast text explaining Signal\'s need for microphone access for a voice call -->
-    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Signal 需要麥克風存取權限才能發起通話。</string>
+    <string name="ConversationActivity_signal_needs_microphone_access_voice_call">Molly 需要麥克風存取權限才能發起通話。</string>
 
 
     <string name="ConversationActivity_join">加入</string>
@@ -486,9 +487,9 @@
     <!-- Message shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
     <string name="ConversationActivity__sms_messaging_is_no_longer_supported_in_signal_invite_s_to_to_signal_to_keep_the_conversation_here">Signal 不再支援短訊功能。邀請 %1$s 加入 Signal 以繼續對話。</string>
     <!-- Message shown when opening a conversation with an unregistered user who used to be on Signal -->
-    <string name="ConversationActivity__this_person_is_no_longer_using_signal">此人不再使用 Signal。邀請他們加入 Signal 以繼續對話。</string>
+    <string name="ConversationActivity__this_person_is_no_longer_using_signal">此人不再使用 Molly。邀請他們加入 Molly 以繼續對話。</string>
     <!-- Action button shown when opening an SMS conversation with SMS disabled and there are no exported messages -->
-    <string name="ConversationActivity__invite_to_signal">邀請至 Signal</string>
+    <string name="ConversationActivity__invite_to_signal">邀請至 Molly</string>
     <!-- Snackbar message shown after dismissing the full screen sms export megaphone indicating we\'ll do it again soon -->
     <string name="ConversationActivity__you_will_be_reminded_again_soon">我們稍後會再次提醒你。</string>
 
@@ -536,6 +537,8 @@
     <string name="ConversationFragment_delete_for_everyone">為大家刪除</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">刪除此裝置</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">刪除</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">從所有裝置中刪除</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">如果聊天中的每個人都使用最新版本的Signal，則該訊息將被刪除。 他們將能夠看到你刪除了一則訊息。</string>
@@ -567,13 +570,13 @@
     <!-- Message shown after successfully blocking join requests for a user -->
     <string name="ConversationFragment__blocked">已封鎖</string>
     <!-- Action shown to allow a user to update their application because it has expired -->
-    <string name="ConversationFragment__update_build">更新 Signal</string>
+    <string name="ConversationFragment__update_build">更新 Molly</string>
     <!-- Action shown to allow a user to re-register as they are no longer registered -->
-    <string name="ConversationFragment__reregister_signal">重新註冊 Signal</string>
+    <string name="ConversationFragment__reregister_signal">重新註冊 Molly</string>
     <!-- Label for a button displayed in the conversation toolbar to return to the previous screen. -->
     <string name="ConversationFragment__content_description_back_button">導向返回。</string>
     <!-- Label for a button displayed in the conversation toolbar to open the main screen of the app. -->
-    <string name="ConversationFragment__content_description_launch_signal_button">開啟 Signal</string>
+    <string name="ConversationFragment__content_description_launch_signal_button">開啟 Molly</string>
     <!-- Dialog title shown when more than one contact in a group conversation is no longer verified -->
     <string name="ConversationFragment__no_longer_verified">已無驗證</string>
     <!-- Button shown in conversation header when in a message request state and no groups in common to show new message safety tips -->
@@ -636,6 +639,10 @@
     <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
         <item quantity="other">這將永久刪除共 %1$d 個選取的聊天。</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="other">這將從你所有裝置中永久刪除共 %1$d 則已選的聊天。</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">正在刪除</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="other">刪除已選取的聊天…</item>
@@ -719,9 +726,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">誰能用手機號碼找到我？</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">任何擁有你電話號碼的人都會看到你在使用 Signal，並可以開始與你聊天。</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">任何擁有你電話號碼的人都會看到你在使用 Molly，並可以開始與你聊天。</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">除非你向對方傳送訊息或與對方已有聊天記錄，否則沒有人能看到你使用 Signal。</string>
+    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">除非你向對方傳送訊息或與對方已有聊天記錄，否則沒有人能看到你使用 Molly。</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">從備份來還原？</string>
@@ -755,7 +762,7 @@
     <string name="BackupsPreferenceFragment__test_your_backup_passphrase">測試你的備份碼，並驗證其是否相符</string>
     <string name="BackupsPreferenceFragment__turn_on">開啟</string>
     <string name="BackupsPreferenceFragment__turn_off">關閉</string>
-    <string name="BackupsPreferenceFragment__to_restore_a_backup">"要回復備份，請安裝新的Signal。 打開應用程式，然後點擊“還原備份”，然後找到一個備份檔案。%1$s"</string>
+    <string name="BackupsPreferenceFragment__to_restore_a_backup">"要回復備份，請安裝新的Molly。 打開應用程式，然後點擊“還原備份”，然後找到一個備份檔案。%1$s"</string>
     <string name="BackupsPreferenceFragment__learn_more">了解更多</string>
     <string name="BackupsPreferenceFragment__in_progress">正在進行中…</string>
     <!-- Status text shown in backup preferences when verifying a backup -->
@@ -763,7 +770,7 @@
     <string name="BackupsPreferenceFragment__d_so_far">%1$d到目前為止…</string>
     <!-- Show percentage of completion of backup -->
     <string name="BackupsPreferenceFragment__s_so_far">目前進度%1$s%%…</string>
-    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">為了要建立備份，Signal 需要外部空間的權限，但是已被永久拒絕。請到應用程式設定，選擇「權限」及開啟「儲存」。</string>
+    <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">為了要建立備份，Molly 需要外部空間的權限，但是已被永久拒絕。請到應用程式設定，選擇「權限」及開啟「儲存」。</string>
     <!-- Title of dialog shown when picking the time to perform a chat backup -->
     <string name="BackupsPreferenceFragment__set_backup_time">設定備份時間</string>
 
@@ -830,7 +837,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">聊天會話已刷新</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal使用點對點加密，有時可能需要刷新你的聊天對話。 這不會影響你聊天的安全性，但是你可能錯過了此聯絡人的訊息，可以要求他們重新傳送。</string>
+    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly使用點對點加密，有時可能需要刷新你的聊天對話。 這不會影響你聊天的安全性，但是你可能錯過了此聯絡人的訊息，可以要求他們重新傳送。</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">在桌面電腦或 iPad 上使用 Signal。你的訊息將同步到已連結裝置。</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">連結新的裝置</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s所有裝置上的訊息和聊天資訊均受端對端加密的保護</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">在桌面電腦或 iPad 上的 Signal</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">所有在已連結裝置上的訊息均為私密</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string name="LinkDeviceFragment__signal_messages_are_synchronized">連結後，Molly 的訊息會與手機上的 Molly 同步。您過往的訊息歷史紀錄將不會顯示。</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string name="LinkDeviceFragment__on_other_device_visit_signal">在你的其他裝置上，前往 %1$s 以安裝 Molly</string>
+  <!-- Removed by excludeNonTranslatables <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string> -->
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">我的已連結裝置</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">解除連結</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%1$s已解除連結</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">正在連結裝置…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">裝置已核准</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">載入中…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">沒有已連結裝置</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">解鎖以連結裝置</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">掃描顯示在裝置上的二維碼以進行連結。</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">掃描 QR code</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">使用此裝置來掃描你想連結的裝置上所顯示的二維碼</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">好的</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">該裝置將能夠查看你的群組和聯絡人，連接你的聊天以及以你的名字傳送訊息。</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">在另一部裝置上完成連結</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string name="AddLinkDeviceFragment__finish_linking_signal">在你的另一部裝置上完成 Molly 連結。</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">裝置連結失敗</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">這個 QR 碼無效。請確定您正在掃描要連接的裝置上顯示的QR碼。</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">重試</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">取消連結 \'%1$s\'？</string>
@@ -852,10 +914,10 @@
 
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">為缺少的 Play 服務優化</string>
-    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">這個裝置不支援 Play 服務。輕觸關閉，因為系統電池效能最佳化會防止 Signal 在閒置時取得訊息。</string>
+    <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">這個裝置不支援 Play 服務。輕觸關閉，因為系統電池效能最佳化會防止 Molly 在閒置時取得訊息。</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">此版本的 Signal 已過期。立即更新以傳送和接收訊息。</string>
+    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">此版本的 Molly 已過期。立即更新以傳送和接收訊息。</string>
     <string name="ExpiredBuildReminder_update_now">立即更新</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -865,8 +927,8 @@
     <string name="PendingGroupJoinRequestsReminder_view">檢視</string>
 
     <!-- GcmRefreshJob -->
-    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Signal 持續發生傳輸異常！</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal 無法順利與 Google Play Services 註冊，Signal 訊息與通話已經停用，請嘗試在設定 &gt; 進階中重新註冊。</string>
+    <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Molly 持續發生傳輸異常！</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Molly 無法順利與 Google Play Services 註冊，Molly 訊息與通話已經停用，請嘗試在設定 &gt; 進階中重新註冊。</string>
 
 
     <!-- GiphyActivity -->
@@ -992,20 +1054,30 @@
     <!-- Message for dialog asking user to submit logs for debugging a crash -->
     <string name="PromptLogsSlowNotificationsDialog__message">除錯日誌可協助我們診斷並修正問題，而且不包含識別資料。</string>
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
-    <string name="PromptLogsSlowNotificationsDialog__title_crash">Signal 遇到了問題。要提交除錯日誌嗎？</string>
+    <string name="PromptLogsSlowNotificationsDialog__title_crash">Molly 遇到了問題。要提交除錯日誌嗎？</string>
 
     <!-- Title for dialog asking user to submit logs for debugging slow notification issues -->
     <string name="PromptBatterySaverBottomSheet__title">由於電池效能最佳化，通知可能會延遲</string>
     <!-- Message explaining that battery saver may delay notifications -->
-    <string name="PromptBatterySaverBottomSheet__message">你可以停用 Signal 的電池效能最佳化設定，以確保訊息通知不會延遲。</string>
+    <string name="PromptBatterySaverBottomSheet__message">你可以停用 Molly 的電池效能最佳化設定，以確保訊息通知不會延遲。</string>
+
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">由於電池效能最佳化，通知可能會延遲</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">停用 Molly 的電池效能最佳化設定，以確保訊息通知不會延遲。點按「繼續」查看特定裝置說明。</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">不必了</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">繼續</string>
 
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">繼續</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">忽略</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">不必了</string>
+  <!-- Removed by excludeNonTranslatables <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string> -->
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">待處理的群組邀請</string>
+    <string name="PendingMembersActivity_pending_group_invites">要求 &amp; 邀請</string>
     <string name="PendingMembersActivity_requests">要求</string>
     <string name="PendingMembersActivity_invites">邀請</string>
     <string name="PendingMembersActivity_people_you_invited">你所邀請的成員們</string>
@@ -1244,12 +1316,12 @@
     <string name="InviteActivity_cancel">取消</string>
     <string name="InviteActivity_sending">傳送中…</string>
     <string name="InviteActivity_invitations_sent">邀請已傳送！</string>
-    <string name="InviteActivity_invite_to_signal">邀請加入 Signal</string>
+    <string name="InviteActivity_invite_to_signal">邀請加入 Molly</string>
     <string name="InviteActivity_send_sms">傳送 SMS(%1$d)</string>
     <plurals name="InviteActivity_send_sms_invites">
         <item quantity="other">傳送 %1$d 則簡訊邀請？</item>
     </plurals>
-    <string name="InviteActivity_lets_switch_to_signal">讓我們切換到 Signal：%1$s</string>
+    <string name="InviteActivity_lets_switch_to_signal">讓我們切換到 Molly：%1$s</string>
     <string name="InviteActivity_no_app_to_share_to">看起來您沒有任何可以分享的應用。</string>
 
     <!-- LearnMoreTextView -->
@@ -1263,7 +1335,7 @@
     <string name="LongMessageActivity_your_message">你的訊息</string>
 
     <!-- MessageRetrievalService -->
-    <string name="MessageRetrievalService_signal">Signal</string>
+    <string name="MessageRetrievalService_signal">Molly</string>
     <string name="MessageRetrievalService_background_connection_enabled">背景連線已經啟用</string>
 
     <!-- MediaOverviewActivity -->
@@ -1327,10 +1399,10 @@
     <string name="MessageQuotesBottomSheet_replies">回覆</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Signal 通話連線中</string>
+    <string name="NotificationBarManager__establishing_signal_call">Molly 通話連線中</string>
     <!-- Temporary notification shown when starting the calling service -->
-    <string name="NotificationBarManager__starting_signal_call_service">展開 Signal 通話服務</string>
-    <string name="NotificationBarManager__stopping_signal_call_service">Signal 來電服務停止中</string>
+    <string name="NotificationBarManager__starting_signal_call_service">展開 Molly 通話服務</string>
+    <string name="NotificationBarManager__stopping_signal_call_service">Molly 來電服務停止中</string>
     <string name="NotificationBarManager__cancel_call">取消通話</string>
 
     <!-- NotificationsMegaphone -->
@@ -1574,6 +1646,14 @@
     <string name="MessageRecord_you_activated_payments">你啟動了付款</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%1$s 現在可以接受付款</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">未能提供付款詳情</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">點擊已獲得更多資訊</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">未能提供付款詳情</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">未能提供此付款的詳細資訊，因為你的訊息是從不含此付款紀錄的來源所還原的。這不會影響你的錢包餘額或過去付款的狀態。</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1628,9 +1708,11 @@
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">你很快將無法再於 Signal 傳送短訊。邀請 %1$s 加入 Signal 以繼續對話。</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">你無法再於 Signal 傳送短訊。邀請 %1$s 加入 Signal 以繼續對話。</string>
+    <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">你無法再於 Molly 傳送短訊。邀請 %1$s 加入 Molly 以繼續對話。</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">付款：%1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">付款</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">已舉報垃圾訊息</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1704,7 +1786,7 @@
     <string name="DeviceProvisioningActivity_link_a_signal_device">連結 Signal 裝置？</string>
     <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">看起來您正在嘗試使用第 3 方掃描器連結 Signal 裝置。為了安全著想，請使用 Signal 重新掃描代碼一次。</string>
 
-    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal 需要相機的權限以掃描 QR 碼，但是現在被設定為永久拒絕使用。請到應用程式設定中，選取「權限」，並啟用「相機」的權限。</string>
+    <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Molly 需要相機的權限以掃描 QR 碼，但是現在被設定為永久拒絕使用。請到應用程式設定中，選取「權限」，並啟用「相機」的權限。</string>
     <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">因為沒有相機的使用權限，所以無法掃描 QR 碼。</string>
 
     <!-- OutdatedBuildReminder -->
@@ -1716,11 +1798,11 @@
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">輸入自訂密碼</string>
-    <string name="PassphrasePromptActivity_watermark_content_description">Signal 圖示</string>
+    <string name="PassphrasePromptActivity_watermark_content_description">Molly 圖示</string>
     <string name="PassphrasePromptActivity_ok_button_content_description">送出密碼</string>
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">無效的密碼！</string>
-    <string name="PassphrasePromptActivity_unlock_signal">解鎖 Signal</string>
-    <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android-螢幕鎖定</string>
+    <string name="PassphrasePromptActivity_unlock_signal">解鎖 Molly</string>
+    <string name="PassphrasePromptActivity_signal_android_lock_screen">Molly Android-螢幕鎖定</string>
 
     <!-- PlacePickerActivity -->
     <string name="PlacePickerActivity_title">地圖</string>
@@ -1786,7 +1868,7 @@
 
     <!-- RecaptchaRequiredBottomSheetFragment -->
     <string name="RecaptchaRequiredBottomSheetFragment_verify_to_continue_messaging">驗證以繼續傳送訊息</string>
-    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">為了協助防止Signal上的垃圾訊息，請完成驗證。</string>
+    <string name="RecaptchaRequiredBottomSheetFragment_to_help_prevent_spam_on_signal">為了協助防止Molly上的垃圾訊息，請完成驗證。</string>
     <string name="RecaptchaRequiredBottomSheetFragment_after_verifying_you_can_continue_messaging">驗證後，你可以繼續進行訊息傳送。 任何暫停的訊息將自動傳送。</string>
 
     <!-- Recipient -->
@@ -1794,7 +1876,7 @@
     <!-- Name of recipient representing user\'s \'My Story\' -->
     <string name="Recipient_my_story">我的限時動態</string>
     <!-- Name of recipient for a call link without a name -->
-    <string name="Recipient_signal_call">Signal 通話</string>
+    <string name="Recipient_signal_call">Molly 通話</string>
 
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block">封鎖</string>
@@ -1808,7 +1890,8 @@
     <string name="RedPhone_ringing">響鈴中…</string>
     <string name="RedPhone_busy">忙碌</string>
     <string name="RedPhone_recipient_unavailable">無此接收人</string>
-    <string name="RedPhone_network_failed">網路失敗！</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">網路失敗！ 請檢查你的網路連線，然後再試一次。</string>
     <string name="RedPhone_number_not_registered">號碼尚未註冊</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">您撥通的號碼不支援加密語音！</string>
     <string name="RedPhone_got_it">收到</string>
@@ -1819,8 +1902,8 @@
 
     <!-- WebRtcCallActivity -->
     <string name="WebRtcCallActivity__tap_here_to_turn_on_your_video">輕觸此處以開啟你的視訊</string>
-    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">如要撥電話給 %1$s，Signal 需要存取你的相機</string>
-    <string name="WebRtcCallActivity__signal_s">Signal %1$s</string>
+    <string name="WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera">如要撥電話給 %1$s，Molly 需要存取你的相機</string>
+    <string name="WebRtcCallActivity__signal_s">Molly %1$s</string>
     <string name="WebRtcCallActivity__calling">撥號中…</string>
     <!-- Call status shown when an active call was disconnected (e.g., network hiccup) and is trying to reconnect -->
     <string name="WebRtcCallActivity__reconnecting">重新連接中…</string>
@@ -1868,10 +1951,30 @@
     <string name="WebRtcCallActivity__removed_from_call">已從通話中移除</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">有人將你從通話中移除。</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">允許存取你的相機及麥克風</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">允許連接你的麥克風</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">允許存取你的相機</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_camera_microphone">要開始或加入通話，請允許 Molly 存取你的相機和麥克風。</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__to_start_call_microphone">要開始或加入通話，請允許 Molly 存取你的麥克風。</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string name="WebRtcCallActivity__to_enable_video_allow_camera">要啟用視訊，請允許 Molly 存取你的相機。</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly 需要麥克風權限以開始或加入通話。</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly 需要相機存取權限以啟用視訊</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">要開始或加入通話：</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">要啟用你的視訊：</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal 語音通話</string>
-    <string name="WebRtcCallView__signal_video_call">Signal 視訊電話</string>
+    <string name="WebRtcCallView__signal_call">Molly 語音通話</string>
+    <string name="WebRtcCallView__signal_video_call">Molly 視訊電話</string>
     <string name="WebRtcCallView__start_call">開始通話</string>
     <string name="WebRtcCallView__join_call">加入通話</string>
     <string name="WebRtcCallView__call_is_full">通話人數已滿</string>
@@ -1956,21 +2059,38 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">要放下手？</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">放下手</string>
+    <string name="CallOverflowPopupWindow__lower_hand">放下</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">取消</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">你舉了手</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">檢視</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="other">%1$s + %2$d 舉了手</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s 舉了手</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s +%2$d 舉了手</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s 舉了手</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="other">%1$s +%2$d 舉了手</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="other">%1$s + %2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
         <item quantity="other">%1$s + %2$d</item>
     </plurals>
 
@@ -2055,7 +2175,7 @@
     <string name="RegistrationActivity_you_will_receive_a_call_to_verify_this_number">你會接到電話驗證此號碼。</string>
     <string name="RegistrationActivity_edit_number">輸入號碼</string>
     <string name="RegistrationActivity_missing_google_play_services">找不到 Google Play 服務</string>
-    <string name="RegistrationActivity_this_device_is_missing_google_play_services">此裝置缺少 Google Play 服務。你仍然可以使用 Signal，但是此設定可能會降低可靠性或效能。\n\n如果你不是個進階使用者，不是正在執行原廠的 Android ROM，或是你認為你看到的可能是一個錯誤，請聯絡 support@signal.org 來協助你排除故障。</string>
+    <string name="RegistrationActivity_this_device_is_missing_google_play_services">此裝置缺少 Google Play 服務。你仍然可以使用 Molly，但是此設定可能會降低可靠性或效能。\n\n如果你不是個進階使用者，不是正在執行原廠的 Android ROM，或是你認為你看到的可能是一個錯誤，請聯絡 support@molly.im 來協助你排除故障。</string>
     <string name="RegistrationActivity_i_understand">我了解</string>
     <string name="RegistrationActivity_play_services_error">Play 服務錯誤</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play 服務正在更新或暫時無法使用。請再重試。</string>
@@ -2073,7 +2193,7 @@
     <string name="RegistrationActivity_non_standard_number_format">非標準數字格式</string>
     <!-- Dialog message shown to confirm when entering phone number (first placeholder) is normalized and formatted differently by the app (second placeholder). -->
     <string name="RegistrationActivity_the_number_you_entered_appears_to_be_a_non_standard">你輸入的數字 (%1$s) 似乎是非標準格式。\n\n你的意思是 %2$s嗎 ?</string>
-    <string name="RegistrationActivity_signal_android_phone_number_format">Signal Android - 電話號碼格式</string>
+    <string name="RegistrationActivity_signal_android_phone_number_format">Molly Android - 電話號碼格式</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via voice call.-->
     <string name="RegistrationActivity_call_requested">請求通話</string>
     <!--    Small "toast" notification to the user confirming that they have requested a new code via SMS.-->
@@ -2106,8 +2226,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">註冊時遇到困難？</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• 確保你的手機有行動網路訊號以接收你的 SMS 短訊或電話\n • 確認你可以接到該號碼的電話\n • 檢查你輸入的電話號碼是否正確。</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">如需詳細資訊，請依照這些疑難排解步驟進行，或聯絡支援團隊</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">要了解更多資訊，請參考 %1$s 或聯絡 %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">這些疑難排解步驟</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2145,13 +2265,13 @@
 
     <!-- SharedContactDetailsActivity -->
     <string name="SharedContactDetailsActivity_add_to_contacts">新增至連絡人</string>
-    <string name="SharedContactDetailsActivity_invite_to_signal">邀請至 Signal</string>
+    <string name="SharedContactDetailsActivity_invite_to_signal">邀請至 Molly</string>
     <string name="SharedContactDetailsActivity_signal_message">Signal 訊息</string>
     <string name="SharedContactDetailsActivity_signal_call">Signal 通話</string>
 
     <!-- SharedContactView -->
     <string name="SharedContactView_add_to_contacts">新增至連絡人</string>
-    <string name="SharedContactView_invite_to_signal">邀請至 Signal</string>
+    <string name="SharedContactView_invite_to_signal">邀請至 Molly</string>
     <string name="SharedContactView_message">Signal 訊息</string>
 
     <!-- SignalBottomActionBar -->
@@ -2282,11 +2402,11 @@
     <string name="ThreadRecord_s_belongs_to_s">%1$s 是屬於 %2$s</string>
 
     <!-- ApkUpdateNotifications -->
-    <string name="ApkUpdateNotifications_prompt_install_title">Signal 更新</string>
-    <string name="ApkUpdateNotifications_prompt_install_body">新版本的 Signal 現已提供。 輕觸以更新。</string>
-    <string name="ApkUpdateNotifications_failed_general_title">Signal 無法更新</string>
+    <string name="ApkUpdateNotifications_prompt_install_title">Molly 更新</string>
+    <string name="ApkUpdateNotifications_prompt_install_body">新版本的 Molly 現已提供。 輕觸以更新。</string>
+    <string name="ApkUpdateNotifications_failed_general_title">Molly 無法更新</string>
     <string name="ApkUpdateNotifications_failed_general_body">我們將稍後再試。</string>
-    <string name="ApkUpdateNotifications_auto_update_success_title">Signal 已成功更新</string>
+    <string name="ApkUpdateNotifications_auto_update_success_title">Molly 已成功更新</string>
     <string name="ApkUpdateNotifications_auto_update_success_body">已自動更新到版本 %1$s。</string>
 
     <!-- UntrustedSendDialog -->
@@ -2356,7 +2476,7 @@
     <string name="VerifyIdentityActivity_our_signal_safety_number">我方 Signal 安全碼：</string>
     <string name="VerifyIdentityActivity_no_app_to_share_to">看起來您沒有任何可以分享的應用。</string>
     <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">沒有在剪貼簿中發現安全碼，因此無法進行比較</string>
-    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal 需要相機的權限以掃描 QR 碼，但是現在被設定為永久拒絕使用。請到應用程式設定中，選取「權限」，並啟用「相機」的權限。</string>
+    <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Molly 需要相機的權限以掃描 QR 碼，但是現在被設定為永久拒絕使用。請到應用程式設定中，選取「權限」，並啟用「相機」的權限。</string>
     <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">因為沒有「相機」的權限，無法掃描 QR 碼</string>
     <string name="VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view">你必須先交換訊息才能查看 %1$s 的安全碼。</string>
     <!-- Dialog message explaining to user they must exchange messages first to create a safety number -->
@@ -2386,14 +2506,14 @@
 
     <!-- KeyCachingService -->
     <string name="KeyCachingService_signal_passphrase_cached">按一下開啟。</string>
-    <string name="KeyCachingService_passphrase_cached">Signal 已經解鎖</string>
-    <string name="KeyCachingService_lock">鎖定 Signal</string>
+    <string name="KeyCachingService_passphrase_cached">Molly 已經解鎖</string>
+    <string name="KeyCachingService_lock">鎖定 Molly</string>
 
     <!-- MediaPreviewActivity -->
     <string name="MediaPreviewActivity_you">你</string>
     <string name="MediaPreviewActivity_unssuported_media_type">不支援的媒體類型</string>
     <string name="MediaPreviewActivity_draft">草稿</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal 需要儲存的權限以儲存外接儲存空間，但是現在被設定為永久拒絕存取。請到應用程式設定中，選取「權限」，並啟用「儲存空間」的權限。</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Molly 需要儲存的權限以儲存外接儲存空間，但是現在被設定為永久拒絕存取。請到應用程式設定中，選取「權限」，並啟用「儲存空間」的權限。</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">因為沒有儲存的權限，無法儲存到外部儲存空間</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">刪除訊息？</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">這將永久刪除此訊息。</string>
@@ -2435,7 +2555,7 @@
     <string name="MessageNotifier_failed_to_deliver_message">無法送達訊息。</string>
     <string name="MessageNotifier_error_delivering_message">送達訊息時發生錯誤。</string>
     <string name="MessageNotifier_message_delivery_paused">訊息傳送已暫停。</string>
-    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">驗證以繼續在Signal上進行訊息傳送。</string>
+    <string name="MessageNotifier_verify_to_continue_messaging_on_signal">驗證以繼續在Molly上進行訊息傳送。</string>
     <string name="MessageNotifier_mark_all_as_read">全部標示為已讀</string>
     <string name="MessageNotifier_mark_read">標示已讀</string>
     <string name="MessageNotifier_turn_off_these_notifications">關閉這些通知</string>
@@ -2457,7 +2577,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">對你的貼圖作出了 %1$s 反應。</string>
     <string name="MessageNotifier_this_message_was_deleted">此訊息已被刪除。</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">關閉聯絡人上線 Signal 的通知嗎？你可以在 Signal &gt; 設定 &gt; 通知中再次啟用。</string>
+    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">關閉聯絡人上線 Molly 的通知嗎？你可以在 Molly &gt; 設定 &gt; 通知中再次啟用。</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2496,7 +2616,7 @@
     <!-- ProfileEditNameFragment -->
 
     <!-- QuickResponseService -->
-    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">當 Signal 鎖定時無法使用快速回覆！</string>
+    <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">當 Molly 鎖定時無法使用快速回覆！</string>
     <string name="QuickResponseService_problem_sending_message">傳送訊息出現問題！</string>
 
     <!-- A small toast notification to let the user know their image/video/audio was downloaded and saved to their device, accessible in other apps. -->
@@ -2516,7 +2636,7 @@
     <string name="ShortcutLauncherActivity_invalid_shortcut">無效的捷徑</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Molly</string>
     <string name="SingleRecipientNotificationBuilder_new_message">新訊息</string>
     <string name="SingleRecipientNotificationBuilder_message_request">訊息要求</string>
     <string name="SingleRecipientNotificationBuilder_you">你</string>
@@ -2561,7 +2681,7 @@
 
     <!-- UnauthorizedReminder -->
     <!-- Message shown in a reminder banner when the user\'s device is no longer registered -->
-    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">此裝置已不再註冊。通常是因為你已在另一部裝置上使用你的電話號碼註冊 Signal。</string>
+    <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">此裝置已不再註冊。通常是因為你已在另一部裝置上使用你的電話號碼註冊 Molly。</string>
     <!-- Action in reminder banner that will take user to re-register -->
     <string name="UnauthorizedReminder_reregister_action">重新註冊裝置</string>
 
@@ -2574,10 +2694,10 @@
     <!-- Banner button to update now -->
 
     <!-- WebRtcCallActivity -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">若要接聽通話，請允許 Signal 存取你的麥克風。</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">若要接聽通話，請允許 Molly 存取你的麥克風。</string>
     <!-- Message shown in permission dialog when attempting to answer a video call without camera or microphone permissions already granted. -->
-    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">若要接聽視訊通話，請允許 Signal 存取你的麥克風和相機。</string>
-    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Signal 需要\"麥克風\"及\"相機\"的權限以接聽來電，但是現在被設定為永久拒絕使用。請到應用程式設定中，選取\"權限\"，並啟用\"麥克風\"及\"相機\"的權限。</string>
+    <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone_and_camera">若要接聽視訊通話，請允許 Molly 存取你的麥克風和相機。</string>
+    <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">Molly 需要\"麥克風\"及\"相機\"的權限以接聽來電，但是現在被設定為永久拒絕使用。請到應用程式設定中，選取\"權限\"，並啟用\"麥克風\"及\"相機\"的權限。</string>
     <string name="WebRtcCallActivity__answered_on_a_linked_device">在已連結的裝置回答。</string>
     <string name="WebRtcCallActivity__declined_on_a_linked_device">拒絕在已連結的裝置。</string>
     <string name="WebRtcCallActivity__busy_on_a_linked_device">已連結的裝置忙線。</string>
@@ -2622,16 +2742,16 @@
     <string name="change_passphrase_activity__repeat_new_passphrase">重複新密碼</string>
 
     <!-- contact_selection_activity -->
-    <string name="contact_selection_activity__invite_to_signal">邀請至 Signal</string>
+    <string name="contact_selection_activity__invite_to_signal">邀請至 Molly</string>
     <string name="contact_selection_activity__new_group">新增群組</string>
     <!-- Row item title for refreshing contacts -->
     <string name="contact_selection_activity__refresh_contacts">重新整理聯絡人</string>
     <!-- Row item description for refreshing contacts -->
     <string name="contact_selection_activity__missing_someone">找不到某人？嘗試重新整理</string>
     <!-- Row item title for finding people on Signal via your contacts -->
-    <string name="contact_selection_activity__find_people_you_know">Find people you know on Signal</string>
+    <string name="contact_selection_activity__find_people_you_know">在 Signal 上尋找你認識的人</string>
     <!-- Row item description asking users for access to their contacts to find people they know -->
-    <string name="contact_selection_activity__allow_access_to_contacts">Allow access to your contacts</string>
+    <string name="contact_selection_activity__allow_access_to_contacts">允許存取你的通訊錄</string>
     <!-- Row header title for more section -->
     <string name="contact_selection_activity__more">更多</string>
 
@@ -2648,7 +2768,7 @@
     <string name="SingleContactSelectionActivity_contact_photo">聯絡人相片</string>
 
     <!-- ContactSelectionListFragment-->
-    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal 需要聯絡人的權限以顯示聯絡人資訊，但是現在被設定為永久拒絕存取。請到應用程式設定中，選取「權限」，並啟用「聯絡人」的權限。</string>
+    <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Molly 需要聯絡人的權限以顯示聯絡人資訊，但是現在被設定為永久拒絕存取。請到應用程式設定中，選取「權限」，並啟用「聯絡人」的權限。</string>
     <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">取回聯絡人名單錯誤，請檢查網路連線</string>
     <string name="ContactSelectionListFragment_username_not_found">找不到使用者名稱</string>
     <string name="ContactSelectionListFragment_s_is_not_a_signal_user">"\"%1$s\"不是 Signal 使用者。請檢查使用者名稱並再試一次。"</string>
@@ -2665,16 +2785,18 @@
     <!-- Text on row item to find user by username -->
     <string name="ContactSelectionListFragment__find_by_username">以使用者名稱搜尋</string>
     <!-- Dialog title asking users for contact permission -->
-    <string name="ContactSelectionListFragment_allow_access_contacts">Allow access to contacts</string>
+    <string name="ContactSelectionListFragment_allow_access_contacts">允許存取通訊錄</string>
     <!-- Dialog description that will explain the steps needed to give contact permissions -->
-    <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
+    <string name="ContactSelectionListFragment_to_find_people">要在 Signal 上尋找你認識的人：</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
-    <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <string name="ContactSelectionListFragment__allow_access">允許存取</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">不必了</string>
     <!-- Text asking for user\'s contact permission -->
-    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
+    <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">允許存取你的通訊錄。你的通訊錄已加密，Signal 服務無法看到。</string>
 
     <!-- contact_selection_list_fragment -->
-    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal 需要存取你的\"聯絡人\"以顯示聯絡人資訊。</string>
+    <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Molly 需要存取你的\"聯絡人\"以顯示聯絡人資訊。</string>
     <string name="contact_selection_list_fragment__show_contacts">顯示聯絡人</string>
 
     <!-- contact_selection_list_item -->
@@ -2745,6 +2867,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">你已移除此人，再次傳送訊息給他們會將對方加回你的清單。</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">選項</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">更新</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">播放 … 暫停</string>
@@ -2773,7 +2897,7 @@
 
     <!-- BubbleOptOutTooltip -->
     <!-- Message to inform the user of what Android chat bubbles are -->
-    <string name="BubbleOptOutTooltip__description">泡泡是一項 Android 功能，你可以為 Signal 聊天關閉該功能。</string>
+    <string name="BubbleOptOutTooltip__description">泡泡是一項 Android 功能，你可以為 Molly 聊天關閉該功能。</string>
     <!-- Button to dismiss the tooltip for opting out of using Android bubbles -->
     <string name="BubbleOptOutTooltip__not_now">稍後</string>
     <!-- Button to move to the system settings to control the use of Android bubbles -->
@@ -2934,9 +3058,9 @@
     <string name="EditProfileFragment__group_description">群組描述</string>
   <!-- Removed by excludeNonTranslatables <string name="EditProfileFragment__support_link" translatable="false">https://support.signal.org/hc/articles/360007459591</string> -->
     <!-- The title of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_title">更新 Signal</string>
+    <string name="EditProfileFragment_deprecated_dialog_title">更新 Molly</string>
     <!-- The body of a dialog prompting user to update to the latest version of Signal. -->
-    <string name="EditProfileFragment_deprecated_dialog_body">此版本的 Signal 已過期。請立即更新以繼續使用 Signal。</string>
+    <string name="EditProfileFragment_deprecated_dialog_body">此版本的 Molly 已過期。請立即更新以繼續使用 Molly。</string>
     <!-- The button on a dialog prompting user to update to the latest version of Signal. When clicked, the user will be taken to the store to update their app. -->
     <string name="EditProfileFragment_deprecated_dialog_update_button">更新</string>
     <!-- The title of a dialog informing the user that they cannot use this app feature when they are unregistered. -->
@@ -3152,7 +3276,7 @@
     <string name="preferences__slow">緩慢</string>
     <string name="preferences__help">幫助</string>
     <string name="preferences__advanced">進階</string>
-    <string name="preferences__donate_to_signal">贊助 Signal</string>
+    <string name="preferences__donate_to_signal">贊助 Molly</string>
     <!-- Preference label for making one-time donations to Signal -->
     <string name="preferences__privacy">隱私權</string>
     <!-- Preference label for stories -->
@@ -3189,13 +3313,13 @@
     <!-- Title for the confirmation dialog of changing the app icon. -->
     <string name="preferences__app_icon_dialog_title">將應用程式圖示和名稱更改為「%1$s」</string>
     <!-- Description for the confirmation dialog of changing the app icon. -->
-    <string name="preferences__app_icon_dialog_description">Signal 需要關閉才能更改應用程式圖示和名稱。通知依然會以預設的 Signal 圖示和名稱來顯示。</string>
+    <string name="preferences__app_icon_dialog_description">Molly 需要關閉才能更改應用程式圖示和名稱。通知依然會以預設的 Molly 圖示和名稱來顯示。</string>
     <!-- Visible warning label for the limitations of changing the app icon with learn more call to action. -->
-    <string name="preferences__app_icon_warning_learn_more">選擇應用程式圖示和名稱，這將顯示在手機的主螢幕和應用抽屜中。通知依然會以預設的 Signal 圖示和名稱來顯示。了解 更多</string>
+    <string name="preferences__app_icon_warning_learn_more">選擇應用程式圖示和名稱，這將顯示在手機的主螢幕和應用抽屜中。通知依然會以預設的 Molly 圖示和名稱來顯示。了解 更多</string>
     <!-- Visible warning label for the limitations of changing the app icon. -->
     <string name="preferences__app_icon_warning">應用程式圖示和名稱可在手機的主螢幕和應用抽屜中見到。</string>
     <!-- Visible warning label explaining that changing the app icon and name does not affect notifications. -->
-    <string name="preferences__app_icon_notification_warning">通知依然會以預設的 Signal 圖示和名稱來顯示。</string>
+    <string name="preferences__app_icon_notification_warning">通知依然會以預設的 Molly 圖示和名稱來顯示。</string>
     <!--Call to action to get more information about the limitations of the change app icon functionality. -->
     <string name="preferences__app_icon_learn_more">了解 更多</string>
     <!--Text description of a graphic illustrating the limitations of the app icon change. -->
@@ -3241,8 +3365,12 @@
         <item quantity="other">這將會永久刪減所有聊天至最近 %1$s 則訊息。</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">這將從你的裝置中永久刪除所有訊息歷史記錄和媒體檔案。</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">這將永久刪除此裝置和任何已連結裝置上的所有訊息紀錄和多媒體。</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">你確定要刪除所有訊息歷史記錄嗎?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">所有訊息歷史記錄將被永久刪除。 此操作無法取消。</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">所有訊息紀錄將會從所有裝置中永久移除。此動作無法復原。</string>
     <string name="preferences_storage__delete_all_now">立即刪除全部</string>
     <string name="preferences_storage__forever">永久</string>
     <string name="preferences_storage__one_year">1年</string>
@@ -3278,7 +3406,7 @@
     <string name="preferences_communication__category_censorship_circumvention">審查規避</string>
     <!-- Title of the \'censorship circumvention\' toggle switch -->
     <string name="preferences_communication__censorship_circumvention">審查規避</string>
-    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">若啟用，Signal 將嘗試繞過網路審查，除非您所在的區域會封鎖 Signal，否則不要使用這項功能</string>
+    <string name="preferences_communication__censorship_circumvention_if_enabled_signal_will_attempt_to_circumvent_censorship">若啟用，Molly 將嘗試繞過網路審查，除非您所在的區域會封鎖 Molly，否則不要使用這項功能</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that we automatically enabled it because we believe you\'re in a censored country -->
     <string name="preferences_communication__censorship_circumvention_has_been_activated_based_on_your_accounts_phone_number">根據您的電話號碼，我們已自動啟用網路審查規避</string>
     <!-- Summary text for \'censorship circumvention\' toggle. Indicates that you disabled it even though we believe you\'re in a censored country -->
@@ -3330,7 +3458,7 @@
 
     <!-- Displayed on a welcome screen for payments -->
     <string name="PaymentsHomeFragment_introducing_payments">付款功能登場</string>
-    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">使用 Signal 以傳送和接收 MobileCoin：一種新的著重私隱的數碼貨幣。啟用以開始使用。</string>
+    <string name="PaymentsHomeFragment__use_signal_to_send_and_receive">使用 Molly 以傳送和接收 MobileCoin：一種新的著重私隱的數碼貨幣。啟用以開始使用。</string>
     <string name="PaymentsHomeFragment__activate_payments">啟用付款功能</string>
     <string name="PaymentsHomeFragment__activating_payments">正在啟動付款功能…</string>
     <string name="PaymentsHomeFragment__restore_payments_account">回復付款帳戶</string>
@@ -3356,7 +3484,7 @@
     <string name="PaymentsHomeFragment__payments_is_not_available_in_your_region">你所在的地區無法付款。</string>
     <string name="PaymentsHomeFragment__could_not_enable_payments">無法啟用付款功能。請稍後再試。</string>
     <string name="PaymentsHomeFragment__deactivate_payments_question">要停用付款功能?</string>
-    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">如果你停用付款功能，則將無法在Signal中傳送或接收MobileCoin。</string>
+    <string name="PaymentsHomeFragment__you_will_not_be_able_to_send">如果你停用付款功能，則將無法在Molly中傳送或接收MobileCoin。</string>
     <string name="PaymentsHomeFragment__deactivate">停用</string>
     <string name="PaymentsHomeFragment__continue">繼續</string>
     <string name="PaymentsHomeFragment__balance_is_not_currently_available">餘額目前不可用。</string>
@@ -3365,10 +3493,10 @@
     <string name="PaymentsHomeFragment__details">細節</string>
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__learn_more__activate_payments" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_activate</string> -->
     <!-- Displayed as a description in a dialog when the user tries to activate payments -->
-    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">你可使用 Signal 收發 MobileCoin。所有付款均受 MobileCoin 和 MobileCoin Wallet 的使用條款約束。你或許會遇到一些問題，以及你可能遺失付款或餘額而無法還原。 </string>
+    <string name="PaymentsHomeFragment__you_can_use_signal_to_send_and">你可使用 Molly 收發 MobileCoin。所有付款均受 MobileCoin 和 MobileCoin Wallet 的使用條款約束。你或許會遇到一些問題，以及你可能遺失付款或餘額而無法還原。 </string>
     <string name="PaymentsHomeFragment__activate">啟動</string>
     <string name="PaymentsHomeFragment__view_mobile_coin_terms">檢視 MobileCoin 條款</string>
-    <string name="PaymentsHomeFragment__payments_not_available">Signal中的付款不再可用。 你仍然可以將資金轉帳到交易所，但不能再傳送和接收付款或增加資金。</string>
+    <string name="PaymentsHomeFragment__payments_not_available">Molly中的付款不再可用。 你仍然可以將資金轉帳到交易所，但不能再傳送和接收付款或增加資金。</string>
 
   <!-- Removed by excludeNonTranslatables <string name="PaymentsHomeFragment__mobile_coin_terms_url" translatable="false">https://www.mobilecoin.com/terms-of-use.html</string> -->
     <!-- Alert dialog title which shows up after a payment to turn on payment lock -->
@@ -3396,7 +3524,7 @@
     <!-- Displayed as a title at the top of the screen -->
     <string name="GrantPermissionsFragment__allow_permissions">允許權限</string>
     <!-- Displayed as a subtitle at the top of the screen -->
-    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">為協助你向認識的人發送訊息，Signal 將請求此等權限。 </string>
+    <string name="GrantPermissionsFragment__to_help_you_message_people_you_know">為協助你向認識的人發送訊息，Molly 將請求此等權限。 </string>
     <!-- Notifications permission row title -->
     <string name="GrantPermissionsFragment__notifications">通知</string>
     <!-- Notifications permission row description -->
@@ -3484,10 +3612,10 @@
     <string name="PaymentsTransferFragment__next">下一步</string>
     <string name="PaymentsTransferFragment__invalid_address">無效位址</string>
     <string name="PaymentsTransferFragment__check_the_wallet_address">檢查你要轉帳到的錢包位址，然後重試。</string>
-    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">你無法轉帳到自己的Signal錢包位址。 在支援的交易所中從你的帳戶輸入錢包位址。</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">要掃描QR碼，Signal須要開啟相機權限。</string>
-    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Signal需要攝像機權限才能擷取QR碼。 到設定，選擇“權限”，然後啟用“相機”。</string>
-    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">要掃描QR碼，Signal須要開啟相機權限。</string>
+    <string name="PaymentsTransferFragment__you_cant_transfer_to_your_own_signal_wallet_address">你無法轉帳到自己的Molly錢包位址。 在支援的交易所中從你的帳戶輸入錢包位址。</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs">要掃描QR碼，Molly須要開啟相機權限。</string>
+    <string name="PaymentsTransferFragment__signal_needs_the_camera_permission_to_capture_qr_code_go_to_settings">Molly需要攝像機權限才能擷取QR碼。 到設定，選擇“權限”，然後啟用“相機”。</string>
+    <string name="PaymentsTransferFragment__to_scan_a_qr_code_signal_needs_access_to_the_camera">要掃描QR碼，Molly須要開啟相機權限。</string>
     <string name="PaymentsTransferFragment__settings">設定</string>
 
     <!-- PaymentsTransferQrScanFragment -->
@@ -3826,17 +3954,17 @@
 
     <!-- CallNotificationBuilder -->
     <!-- Displayed in a notification when a Signal voice call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_voice_call">Signal 語音通話來電</string>
+    <string name="CallNotificationBuilder__incoming_signal_voice_call">Molly 語音通話來電</string>
     <!-- Displayed in a notification when a Signal video call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_video_call">Signal 視訊通話來電</string>
+    <string name="CallNotificationBuilder__incoming_signal_video_call">Molly 視訊通話來電</string>
     <!-- Displayed in a notification when a Signal group call is ringing -->
-    <string name="CallNotificationBuilder__incoming_signal_group_call">Signal 群組來電</string>
+    <string name="CallNotificationBuilder__incoming_signal_group_call">Molly 群組來電</string>
     <!-- Displayed in a notification when a Signal voice call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Signal 語音通話進行中</string>
+    <string name="CallNotificationBuilder__ongoing_signal_voice_call">Molly 語音通話進行中</string>
     <!-- Displayed in a notification when a Signal video call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_video_call">Signal 視訊通話進行中</string>
+    <string name="CallNotificationBuilder__ongoing_signal_video_call">Molly 視訊通話進行中</string>
     <!-- Displayed in a notification when a Signal group call is in progress -->
-    <string name="CallNotificationBuilder__ongoing_signal_group_call">Signal 群組通話進行中</string>
+    <string name="CallNotificationBuilder__ongoing_signal_group_call">Molly 群組通話進行中</string>
 
     <!-- transport_selection_list_item -->
     <string name="ConversationListFragment_loading">讀取中…</string>
@@ -3883,9 +4011,9 @@
     <string name="BackupDialog_verify">驗證</string>
     <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">你已成功的輸入你的備份碼</string>
     <string name="BackupDialog_passphrase_was_not_correct">備份碼錯誤</string>
-    <string name="LocalBackupJob_creating_signal_backup">建立 Signal 備份…</string>
+    <string name="LocalBackupJob_creating_signal_backup">建立 Molly 備份…</string>
     <!-- Title for progress notification shown in a system notification while verifying a recent backup. -->
-    <string name="LocalBackupJob_verifying_signal_backup">正在驗證 Signal 備份內容…</string>
+    <string name="LocalBackupJob_verifying_signal_backup">正在驗證 Molly 備份內容…</string>
     <string name="LocalBackupJobApi29_backup_failed">備份失敗</string>
     <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">你的備份目錄已被刪除或移動。</string>
     <string name="LocalBackupJobApi29_your_backup_file_is_too_large">你的備份檔案太大，無法儲存在該空間上。</string>
@@ -3900,15 +4028,15 @@
     <string name="RegistrationActivity_call_me_instead_available_in">致電給我 (%1$02d:%2$02d)</string>
     <!--    Countdown to when the user can request a new SMS code during registration.-->
     <string name="RegistrationActivity_resend_sms_available_in">重新傳送驗證碼 (%1$02d:%2$02d)</string>
-    <string name="RegistrationActivity_contact_signal_support">聯絡 Signal 支援</string>
-    <string name="RegistrationActivity_code_support_subject">Signal 註冊 - Android驗證碼</string>
+    <string name="RegistrationActivity_contact_signal_support">聯絡 Molly 支援</string>
+    <string name="RegistrationActivity_code_support_subject">Molly 註冊 - Android驗證碼</string>
     <string name="RegistrationActivity_incorrect_code">錯誤編號</string>
     <string name="BackupUtil_never">永不</string>
     <string name="BackupUtil_unknown">未知</string>
     <!-- Phone number heading displayed as a screen title -->
     <string name="preferences_app_protection__phone_number">電話號碼</string>
     <!-- Subtext below option to launch into phone number privacy settings screen -->
-    <string name="preferences_app_protection__choose_who_can_see">選擇誰可以看到你的電話號碼，以及誰可以透過它在 Signal 上與你聯絡。</string>
+    <string name="preferences_app_protection__choose_who_can_see">選擇誰可以看到你的電話號碼，以及誰可以透過它在 Molly 上與你聯絡。</string>
     <!-- Section title above two radio buttons for enabling and disabling phone number display -->
     <string name="PhoneNumberPrivacySettingsFragment_who_can_see_my_number_heading">誰可以看到我的號碼</string>
     <!-- Subtext below radio buttons when who can see my number is set to everybody -->
@@ -3956,7 +4084,7 @@
     <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">您進行了太多次嘗試。 請稍後再試。</string>
     <string name="RegistrationActivity_error_connecting_to_service">連線到服務錯誤</string>
     <string name="preferences_chats__backups">備份</string>
-    <string name="prompt_passphrase_activity__signal_is_locked">Signal 已被鎖定</string>
+    <string name="prompt_passphrase_activity__signal_is_locked">Molly 已被鎖定</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">輕觸以解鎖</string>
     <string name="Recipient_unknown">未知</string>
     <!-- Name to use for a user across the UI when they are unregistered and have no other name available -->
@@ -3987,9 +4115,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">你需要連結舊裝置。</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">從備份還原</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">從本地備份還原你的訊息。 如果你現在不還原，則以後將無法還原。</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">還原本機備份</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">還原 Signal 備份</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">還原你的所有文字訊息 + 最近 30 天的媒體內容</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">更多選項</string>
 
+    <string name="TransferOrRestoreFragment__cancel">取消</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">登入而不作轉移</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">不轉移訊息及媒體並繼續</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">在舊的Android手機上開啟Signal</string>
     <string name="NewDeviceTransferInstructions__continue">繼續</string>
@@ -4004,19 +4139,19 @@
     <string name="NewDeviceTransferSetup__preparing_to_connect_to_old_android_device">正在準備連結到舊的Android裝置…</string>
     <string name="NewDeviceTransferSetup__take_a_moment_should_be_ready_soon">稍等片刻，應快準備好了</string>
     <string name="NewDeviceTransferSetup__waiting_for_old_device_to_connect">正在等待舊的Android裝置連接…</string>
-    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Signal需要位置權限才能發現並連接到舊的Android裝置。</string>
-    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Signal需要啟用位置服務才能發現你的舊Android裝置並與之連接。</string>
-    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Signal需要啟用Wi-Fi才能發現你的舊Android裝置並與之連接。 Wi-Fi需要開啟，但不必連接到Wi-Fi網路。</string>
-    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">抱歉，該裝置似乎不支援Wi-Fi Direct。 Signal使用Wi-Fi Direct來發現你的舊Android裝置並與之連接。你仍然可以還原備份，以從舊的Android裝置還原帳號。</string>
+    <string name="NewDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_old_device">Molly需要位置權限才能發現並連接到舊的Android裝置。</string>
+    <string name="NewDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_old_device">Molly需要啟用位置服務才能發現你的舊Android裝置並與之連接。</string>
+    <string name="NewDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_old_device">Molly需要啟用Wi-Fi才能發現你的舊Android裝置並與之連接。 Wi-Fi需要開啟，但不必連接到Wi-Fi網路。</string>
+    <string name="NewDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">抱歉，該裝置似乎不支援Wi-Fi Direct。 Molly使用Wi-Fi Direct來發現你的舊Android裝置並與之連接。你仍然可以還原備份，以從舊的Android裝置還原帳號。</string>
     <string name="NewDeviceTransferSetup__restore_a_backup">還原備份</string>
     <string name="NewDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">嘗試連接到舊的Android裝置時發生未預期的錯誤。</string>
 
     <!-- OldDeviceTransferSetupFragment -->
     <string name="OldDeviceTransferSetup__searching_for_new_android_device">正在搜尋新的Android裝置…</string>
-    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Signal需要位置權限才能發現並連接到新的Android裝置。</string>
-    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Signal須要開啟定位服務才能發現新的Android裝置並與之連接。</string>
-    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Signal需要開啟Wi-Fi才能發現新的Android裝置並與之連接。 Wi-Fi需要開啟，但不必連接到Wi-Fi網路。</string>
-    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">抱歉，該裝置似乎不支援Wi-Fi Direct。 Signal使用Wi-Fi Direct搜尋並連接新的Android裝置。你仍然可以建立備份以在新的Android裝置上還原帳號。</string>
+    <string name="OldDeviceTransferSetup__signal_needs_the_location_permission_to_discover_and_connect_with_your_new_device">Molly需要位置權限才能發現並連接到新的Android裝置。</string>
+    <string name="OldDeviceTransferSetup__signal_needs_location_services_enabled_to_discover_and_connect_with_your_new_device">Molly須要開啟定位服務才能發現新的Android裝置並與之連接。</string>
+    <string name="OldDeviceTransferSetup__signal_needs_wifi_on_to_discover_and_connect_with_your_new_device">Molly需要開啟Wi-Fi才能發現新的Android裝置並與之連接。 Wi-Fi需要開啟，但不必連接到Wi-Fi網路。</string>
+    <string name="OldDeviceTransferSetup__sorry_it_appears_your_device_does_not_support_wifi_direct">抱歉，該裝置似乎不支援Wi-Fi Direct。 Molly使用Wi-Fi Direct搜尋並連接新的Android裝置。你仍然可以建立備份以在新的Android裝置上還原帳號。</string>
     <string name="OldDeviceTransferSetup__create_a_backup">建立備份</string>
     <string name="OldDeviceTransferSetup__an_unexpected_error_occurred_while_attempting_to_connect_to_your_old_device">嘗試連接到新的Android裝置時發生未預期的錯誤。</string>
 
@@ -4057,7 +4192,7 @@
 
     <!-- DeviceTransferFragment -->
     <string name="DeviceTransfer__transferring_data">移轉資料</string>
-    <string name="DeviceTransfer__keep_both_devices_near_each_other">使兩個裝置彼此靠近。 請勿關閉裝置並保持Signal開啟。 傳輸是點對點加密的。</string>
+    <string name="DeviceTransfer__keep_both_devices_near_each_other">使兩個裝置彼此靠近。 請勿關閉裝置並保持Molly開啟。 傳輸是點對點加密的。</string>
     <string name="DeviceTransfer__d_messages_so_far">到目前為止 %1$d 則訊息…</string>
     <!-- Filled in with total percentage of messages transferred -->
     <string name="DeviceTransfer__s_of_messages_so_far">訊息目前進度 %1$s%%…</string>
@@ -4071,7 +4206,7 @@
     <!-- OldDeviceTransferInstructionsFragment -->
     <string name="OldDeviceTransferInstructions__transfer_account">轉移帳號</string>
     <string name="OldDeviceTransferInstructions__first_bullet">1.</string>
-    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">在新的Android裝置上下載Signal</string>
+    <string name="OldDeviceTransferInstructions__download_signal_on_your_new_android_device">在新的Android裝置上下載Molly</string>
     <string name="OldDeviceTransferInstructions__second_bullet">2.</string>
     <string name="OldDeviceTransferInstructions__tap_on_transfer_or_restore_account">"點擊“轉移或還原帳號”"</string>
     <string name="OldDeviceTransferInstructions__third_bullet">3.</string>
@@ -4145,7 +4280,7 @@
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_hint_requiring_approval">知道此連結的任何人都可以查看群組的名稱和圖片，並請求加入。 與你信任的人分享。</string>
     <string name="GroupLinkBottomSheet_share_hint_not_requiring_approval">知道此連結的任何人都可以查看該群組的名稱和圖片，然後加入該群組。 與你信任的人分享。</string>
-    <string name="GroupLinkBottomSheet_share_via_signal">透過 Signal 分享</string>
+    <string name="GroupLinkBottomSheet_share_via_signal">透過 Molly 分享</string>
     <string name="GroupLinkBottomSheet_copy">複製</string>
     <string name="GroupLinkBottomSheet_qr_code">QR 碼</string>
     <string name="GroupLinkBottomSheet_share">分享</string>
@@ -4324,7 +4459,7 @@
     <string name="payment_info_card_about_mobilecoin">有關MobileCoin</string>
     <string name="payment_info_card_mobilecoin_is_a_new_privacy_focused_digital_currency">MobileCoin是一種新的注重隱私的數位貨幣。</string>
     <string name="payment_info_card_adding_funds">加值資金</string>
-    <string name="payment_info_card_you_can_add_funds_for_use_in">你可以通過將MobileCoin傳送到你的錢包位址來增加在Signal中使用的資金。</string>
+    <string name="payment_info_card_you_can_add_funds_for_use_in">你可以通過將MobileCoin傳送到你的錢包位址來增加在Molly中使用的資金。</string>
     <string name="payment_info_card_cashing_out">兌現</string>
     <string name="payment_info_card_you_can_cash_out_mobilecoin">你可以隨時在支援MobileCoin的交易所兌現MobileCoin。 只需在該交易所轉帳到你的帳戶即可。</string>
     <string name="payment_info_card_hide_this_card">隱藏這張卡？</string>
@@ -4345,12 +4480,12 @@
     <!-- DeactivateWalletFragment -->
     <string name="DeactivateWalletFragment__deactivate_wallet">停用電子錢包</string>
     <string name="DeactivateWalletFragment__your_balance">你的餘額</string>
-    <string name="DeactivateWalletFragment__its_recommended_that_you">建議你在停用付款之前將資金轉移到另一個錢包位址。 如果你選擇現在不轉移資金，那麼如果你重新啟用付款功能，這些資金將保留在與Signal關聯的錢包中。</string>
+    <string name="DeactivateWalletFragment__its_recommended_that_you">建議你在停用付款之前將資金轉移到另一個錢包位址。 如果你選擇現在不轉移資金，那麼如果你重新啟用付款功能，這些資金將保留在與Molly關聯的錢包中。</string>
     <string name="DeactivateWalletFragment__transfer_remaining_balance">轉帳餘額</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring">停用而不轉移</string>
     <string name="DeactivateWalletFragment__deactivate">停用</string>
     <string name="DeactivateWalletFragment__deactivate_without_transferring_question">停用而不轉移嗎?</string>
-    <string name="DeactivateWalletFragment__your_balance_will_remain">如果你選擇重新啟動付款功能，妳的餘額將保留在與Signal關聯的錢包中。</string>
+    <string name="DeactivateWalletFragment__your_balance_will_remain">如果你選擇重新啟動付款功能，妳的餘額將保留在與Molly關聯的錢包中。</string>
     <string name="DeactivateWalletFragment__error_deactivating_wallet">停用錢包時錯誤。</string>
   <!-- Removed by excludeNonTranslatables <string name="DeactivateWalletFragment__learn_more__we_recommend_transferring_your_funds" translatable="false">https://support.signal.org/hc/articles/360057625692#payments_deactivate</string> -->
 
@@ -4643,7 +4778,7 @@
     <!--    Header for the screen that displays the licenses of the open-source software dependencies of the Signal app-->
     <string name="HelpSettingsFragment__licenses">許可證</string>
     <string name="HelpSettingsFragment__terms_amp_privacy_policy">服務條款與隱私權政策</string>
-    <string name="HelpFragment__copyright_signal_messenger">Signal Messenger 版權所有</string>
+    <string name="HelpFragment__copyright_signal_messenger">Molly Messenger 版權所有</string>
     <string name="HelpFragment__licenced_under_the_agplv3">依據 GNU AGPLv3 的條款授權</string>
 
     <!-- DataAndStorageSettingsFragment -->
@@ -4881,9 +5016,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">選擇一種顏色</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">簡訊</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">分享</string>
 
@@ -4913,7 +5045,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">只有管理員可以向此群組傳送訊息。</string>
-    <string name="MultiselectForwardFragment__limit_reached">已達上限</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">你不得選取超過 5 個聊天</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5088,9 +5221,9 @@
     <string name="MySupportPreference__learn_more">了解更多</string>
 
     <!-- Title of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__title">更新 Signal</string>
+    <string name="UpdateSignalExpiredDialog__title">更新 Molly</string>
     <!-- Message of dialog telling user they need to update signal as it expired -->
-    <string name="UpdateSignalExpiredDialog__message">此版本的 Signal 已過期。請立即更新以繼續使用 Signal。</string>
+    <string name="UpdateSignalExpiredDialog__message">此版本的 Molly 已過期。請立即更新以繼續使用 Molly。</string>
     <!-- Button text of expiration dialog, will take user to update the app -->
     <string name="UpdateSignalExpiredDialog__update_action">更新</string>
     <!-- Button text of expiration dialog to cancel the dialog.  -->
@@ -5099,7 +5232,7 @@
     <!-- Title of dialog telling user they need to re-register signal -->
     <string name="ReregisterSignalDialog__title">裝置未註冊</string>
     <!-- Message of dialog telling user they need to re-register signal as it is no longer registered -->
-    <string name="ReregisterSignalDialog__message">此裝置已不再註冊。重新註冊以在此裝置繼續使用 Signal。</string>
+    <string name="ReregisterSignalDialog__message">此裝置已不再註冊。重新註冊以在此裝置繼續使用 Molly。</string>
     <!-- Button text of re-registration dialog to re-register the device.  -->
     <string name="ReregisterSignalDialog__reregister_action">重新註冊</string>
     <!-- Button text of re-registration dialog to cancel the dialog.  -->
@@ -5393,7 +5526,7 @@
     <!-- Displayed in a toast when we fail to open the ringtone picker -->
     <string name="NotificationSettingsFragment__failed_to_open_picker">無法開啟選擇器。</string>
     <!-- Banner title when notification permission is disabled -->
-    <string name="NotificationSettingsFragment__to_enable_notifications">要啟用通知，Signal 需要顯示通知的權限。</string>
+    <string name="NotificationSettingsFragment__to_enable_notifications">要啟用通知，Molly 需要顯示通知的權限。</string>
     <!-- Banner action when notification permission is disabled -->
     <string name="NotificationSettingsFragment__turn_on">開啟</string>
 
@@ -5539,8 +5672,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">未有回覆</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">由於你不再是這群組的成員，因此你無法回覆此限時動態。</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">以對此限時動態做出回應</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">以對此限時動態做出回應</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">以對此限時動態做出回應</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">檢視</string>
     <!-- Label for story replies tab -->
@@ -6140,8 +6275,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">選擇你的銀行</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">與 %1$s 確認你的捐款</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">要設定你的定期捐款，請點選「繼續」以向銀行確認 €0.01 的費用。這筆款項將自動退還，並允許從你的帳戶中扣除每月 €5 的捐款。</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">要設定你的定期捐款，請點選「繼續」以向銀行確認 €0.01 的費用。這筆款項將自動退還，並允許從你的帳戶中扣除每月 %1$s 的捐款。</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">繼續</string>
 
@@ -6710,6 +6845,50 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">正在下載備份資料…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">媒體備份已關閉</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="other">由於我們無法處理你的付款，你的 Signal 媒體備份計畫已被取消。你有 %1$d 天時間下載備份中儲存的任何媒體。%1$d 天後，你備份中的媒體將會被刪除。</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">你可以隨時重新開始支付備份費用，以繼續備份所有媒體。 </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">你的媒體將會在今天刪除</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">由於我們無法處理你的付款，你的 Signal 媒體備份計畫已被取消。若要下載備份內的媒體，這是刪除備份之前的最後機會。</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">無法完成下載</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">你的裝置沒有足夠的可用空間。釋放多達 %1$s 的空間來下載儲存在備份中的多媒體。</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="other">如果你選擇「跳過」，備份內的媒體將在 %1$d 天後刪除。</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">未能處理備份付款</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">我們在收取你每月定期備份付款時遇到問題。請確定你的付款方式仍然有效。若已失效，請到 Google Pay 更新過時的資訊。Signal 將於數天內再次嘗試處理付款。</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">無法完成備份</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">你的裝置已有 %1$d 天沒有完成備份。確保你的裝置已連線至 Wi-Fi，然後點按「立即備份」。 </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">了解更多</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">略過</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">立即下載媒體</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">稍後下載</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">不下載媒體</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">釋放 %1$s 的空間來下載你的多媒體。</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">信用卡或簽帳金融卡</string>
@@ -6723,6 +6902,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">未知</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">付款紀錄</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">你上次備份是在 %1$s 的 %2$s 進行的。</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6733,6 +6918,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">訊息早於所選時間將被永久刪除。</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">訊息超過所選數量將被永久刪除。</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">為已連結裝置設定上限</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">啟用後，聊天訊息量上限也會應用在已連結裝置並刪除訊息。</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">現已在你所有裝置上同步刪除</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">當你刪除訊息或聊天時，它們將從你的手機和已連結裝置中刪除。</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">確定</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">付款紀錄</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">文字和所有多媒體備份</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">付款詳情</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">備份類型</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">付款日期</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">分享</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal 備份</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">付款紀錄</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">備份詳細資料</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">備份大小</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">備份頻率</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">使用行動數據備份</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">關閉並刪除備份</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">已刪除並關閉備份。</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">備份類型已變更且定期贊助已取消</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">定期贊助已取消</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">下載完成</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">備份類型</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">備份已停用</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s /月</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">啟用備份</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">上次備份</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s 在 %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">永不</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">馬上備份</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">要關閉並刪除備份嗎？</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">你將不會再被收取費用。你的備份將被刪除，並且不會建立新的備份。</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">關閉並刪除</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">正在刪除備份…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">備份已刪除</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">"透過點按「立即備份」"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">每日</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">每週</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">每個月</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">手動備份</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">請輸入你的裝置 PIN 碼、密碼或圖案。</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">下一步</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">更改備份類型</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">取消定期贊助</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">確定取消</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">我們將不會再向你收取費用。備份將在計費週期結束時關閉。在此日期之後，你將有 30 天的時間下載目前正在備份的媒體。</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">立即確認並下載</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">稍後確認並下載</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">保留定期贊助</string>
     <!-- EOF -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 1c1bb2c3e9..aa60e16d66 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -149,7 +149,6 @@
         <attr name="measureLastLine" format="boolean" />
         <attr name="scaleEmojis" format="boolean" />
         <attr name="emoji_maxLength" format="integer" />
-        <attr name="emoji_forceCustom" format="boolean" />
         <attr name="emoji_renderMentions" format="boolean" />
         <attr name="emoji_forceJumbo" format="boolean" />
         <attr name="emoji_renderSpoilers" format="boolean" />
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f271bc017f..2583b96fdc 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,7 +8,7 @@
     <dimen name="signal_m3_toolbar_height">64dp</dimen>
 
     <dimen name="min_keyboard_size">60dp</dimen>
-    <dimen name="default_custom_keyboard_size">220dp</dimen>
+    <dimen name="default_custom_keyboard_size">240dp</dimen>
     <dimen name="min_custom_keyboard_size">110dp</dimen>
     <dimen name="min_custom_keyboard_top_margin_portrait">170dp</dimen>
     <dimen name="min_custom_keyboard_top_margin_landscape_bubble">56dp</dimen>
@@ -239,4 +239,6 @@
     <dimen name="image_editor_hud_tool_invisible_circle_diameter">40dp</dimen>
     <dimen name="image_editor_hud_tool_invisible_circle_padding">6dp</dimen>
 
+    <dimen name="contact_permission_button_min_width">140dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6350d459e5..fcea3b9b74 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2024 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  -->
+
 <!-- smartling.instruction_comments_enabled = on -->
 <resources>
     <!-- <string name="app_name" translatable="false">Signal</string> -->
@@ -325,8 +330,8 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Message %s</string>
-    <string name="ContactsDatabase_signal_call_s">Signal Voice Call %s</string>
-    <string name="ContactsDatabase_signal_video_call_s">Signal Video Call %s</string>
+    <string mollyify="true" name="ContactsDatabase_signal_call_s">Molly Voice Call %s</string>
+    <string mollyify="true" name="ContactsDatabase_signal_video_call_s">Molly Video Call %s</string>
 
     <!-- ContactNameEditActivity -->
     <!-- Toolbar title for contact name edit activity -->
@@ -439,7 +444,7 @@
     <!-- Dialog description that will explain the steps needed to give microphone permissions -->
     <string name="ConversationActivity_signal_to_send_audio_messages">To send audio messages:</string>
     <!-- Alert dialog description asking for microphone permission in order to send voice messages -->
-    <string name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">To send voice messages, allow Signal access to your microphone.</string>
+    <string mollyify="true" name="ConversationActivity_to_send_voice_messages_allow_signal_access_to_your_microphone">To send voice messages, allow Molly access to your microphone.</string>
     <!-- Toast text explaining Signal\'s need for microphone access -->
     <string mollyify="true" name="ConversationActivity_signal_needs_microphone_access_voice_message">Molly needs microphone access to record a voice message.</string>
     <string mollyify="true" name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Molly requires the Microphone permission in order to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
@@ -543,6 +548,8 @@
     <string name="ConversationFragment_delete_for_everyone">Delete for everyone</string>
     <!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
     <string name="ConversationFragment_delete_on_this_device">Delete on this device</string>
+    <!-- Dialog button for deleting one or more note-to-self messages that will be sync\'d to other devices -->
+    <string name="ConversationFragment_delete">Delete</string>
     <!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
     <string name="ConversationFragment_delete_everywhere">Delete everywhere</string>
     <string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">This message will be deleted for everyone in the chat if they’re on a recent version of Signal. They will be able to see that you deleted a message.</string>
@@ -645,6 +652,11 @@
         <item quantity="one">This will permanently delete the selected chat.</item>
         <item quantity="other">This will permanently delete all %1$d selected chats.</item>
     </plurals>
+    <!-- Dialog message shown when deleting one to many conversations from the chat list and the user has a linked device -->
+    <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations_linked_device">
+        <item quantity="one">This will permanently delete the selected chat from all your devices.</item>
+        <item quantity="other">This will permanently delete all %1$d selected chats from all your devices.</item>
+    </plurals>
     <string name="ConversationListFragment_deleting">Deleting</string>
     <plurals name="ConversationListFragment_deleting_selected_conversations">
         <item quantity="one">Deleting selected chat…</item>
@@ -734,9 +746,9 @@
     <!-- Toolbar title for this screen -->
     <string name="WhoCanSeeMyPhoneNumberFragment__who_can_find_me_by_number">Who can find me by number?</string>
     <!-- Description for radio item stating anyone can see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Anyone who has your phone number will see you\'re on Signal and can start chats with you.</string>
+    <string mollyify="true" name="WhoCanSeeMyPhoneNumberFragment__anyone_who_has_your">Anyone who has your phone number will see you\'re on Molly and can start chats with you.</string>
     <!-- Description for radio item stating no one will be able to see your phone number -->
-    <string name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Nobody will be able to see you\'re on Signal unless you message them or have an existing chat with them.</string>
+    <string mollyify="true" name="WhoCanSeeMyPhoneNumberFragment__nobody_will_be_able">Nobody will be able to see you\'re on Molly unless you message them or have an existing chat with them.</string>
 
     <!-- ChooseBackupFragment -->
     <string name="ChooseBackupFragment__restore_from_backup">Restore from backup?</string>
@@ -845,7 +857,62 @@
 
     <!-- DecryptionFailedDialog -->
     <string name="DecryptionFailedDialog_chat_session_refreshed">Chat session refreshed</string>
-    <string name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Signal uses end-to-end encryption and it may need to refresh your chat session sometimes. This doesn\'t affect your chat\'s security, but you may have missed a message from this contact, and you can ask them to resend it.</string>
+    <string mollyify="true" name="DecryptionFailedDialog_signal_uses_end_to_end_encryption">Molly uses end-to-end encryption and it may need to refresh your chat session sometimes. This doesn\'t affect your chat\'s security, but you may have missed a message from this contact, and you can ask them to resend it.</string>
+
+    <!-- LinkDeviceFragment -->
+    <!-- Description for how Signal will work with a linked device (eg desktop, iPad) -->
+    <string name="LinkDeviceFragment__use_signal_on_desktop_ipad">Use Signal on desktop or iPad. Your messages will sync to your linked devices.</string>
+    <!-- Button prompting users to link a new device to their account -->
+    <string name="LinkDeviceFragment__link_a_new_device">Link a new device</string>
+    <!-- Text explaining that on linked devices, messages will be encrypted where %s will be replaced with an image-->
+    <string name="LinkDeviceFragment__messages_and_chat_info_are_protected">%1$s Messages and chat info are protected by end-to-end encryption on all devices</string>
+    <!-- Bottom sheet title explaining how Signal works on a linked device -->
+    <string name="LinkDeviceFragment__signal_on_desktop_ipad">Signal on desktop or iPad</string>
+    <!-- Bottom sheet description explaining that messages on linked devices are private -->
+    <string name="LinkDeviceFragment__all_messaging_is_private">All messaging on linked devices is private</string>
+    <!-- Bottom sheet description explaining that future messages on linked devices will be in sync with your phone but previous messages will not appear -->
+    <string mollyify="true" name="LinkDeviceFragment__signal_messages_are_synchronized">Molly messages are synchronized with Molly on your mobile phone after it is linked. Your previous message history will not appear.</string>
+    <!-- Bottom sheet description explaining that for non-desktop/iPad devices, they should go to %s to download Signal where %s is Signal\'s website -->
+    <string mollyify="true" name="LinkDeviceFragment__on_other_device_visit_signal">On your other device, visit %s to install Molly</string>
+    <string name="LinkDeviceFragment__signal_download_url" translatable="false">signal.org/download</string>
+    <!-- Header title listing out current linked devices -->
+    <string name="LinkDeviceFragment__my_linked_devices">My linked devices</string>
+    <!-- Dialog confirmation to unlink a device -->
+    <string name="LinkDeviceFragment__unlink">Unlink</string>
+    <!-- Toast message indicating a device has been unlinked where %s is the name of the device -->
+    <string name="LinkDeviceFragment__s_unlinked">%s unlinked</string>
+    <!-- Progress dialog message indicating that a device is currently being linked with an account -->
+    <string name="LinkDeviceFragment__linking_device">Linking device…</string>
+    <!-- Toast message shown after a device has been linked -->
+    <string name="LinkDeviceFragment__device_approved">Device approved</string>
+    <!-- Progress dialog message indicating that the list of linked devices is currently loading -->
+    <string name="LinkDeviceFragment__loading">Loading…</string>
+    <!-- Text message shown when the user has no linked devices -->
+    <string name="LinkDeviceFragment__no_linked_devices">No linked devices</string>
+    <!-- Title on biometrics prompt explaining what biometrics are being used for -->
+    <string name="LinkDeviceFragment__unlock_to_link">Unlock to link a device</string>
+
+    <!-- AddLinkDeviceFragment -->
+    <!-- Description text shown on the QR code scanner when linking a device -->
+    <string name="AddLinkDeviceFragment__scan_the_qr_code">Scan the QR code displayed on the device to link.</string>
+    <!-- Bottom sheet title telling users to scan a qr code -->
+    <string name="AddLinkDeviceFragment__scan_qr_code">Scan QR code</string>
+    <!-- Bottom sheet description telling users how to scan a qr code -->
+    <string name="AddLinkDeviceFragment__use_this_device_to_scan_qr_code">Use this device to scan the QR code displayed on the device you want to link</string>
+    <!-- Confirmation button to dismiss bottom sheet dialog -->
+    <string name="AddLinkDeviceFragment__okay">Okay</string>
+    <!-- Dialog text describing the consequences of linking a device -->
+    <string name="AddLinkDeviceFragment__this_device_will_see_your_groups_contacts">This device will be able to see your groups and contacts, access your chats, and send messages in your name.</string>
+    <!-- Bottom sheet title telling users to complete the linking process on the other device  -->
+    <string name="AddLinkDeviceFragment__finish_linking_on_other_device">Finish linking on your other device</string>
+    <!-- Bottom sheet description telling users to complete the linking process -->
+    <string mollyify="true" name="AddLinkDeviceFragment__finish_linking_signal">Finish linking Molly on your other device.</string>
+    <!-- Title of dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__linking_device_failed">Linking device failed</string>
+    <!-- Text shown in a dialog when the QR code being scanned is invalid -->
+    <string name="AddLinkDeviceFragment__this_qr_code_not_valid">This QR code is not valid. Please make sure you are scanning the QR code that is displayed on the device you want to link.</string>
+    <!-- Button in dialog to retry linking a device with a qr code -->
+    <string name="AddLinkDeviceFragment__retry">Retry</string>
 
     <!-- DeviceListActivity -->
     <string name="DeviceListActivity_unlink_s">Unlink \'%s\'?</string>
@@ -870,7 +937,7 @@
     <string mollyify="true" name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">This device does not support Play Services. Tap to disable system battery optimizations that prevent Molly from retrieving messages while inactive.</string>
 
     <!-- ExpiredBuildReminder -->
-    <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">This version of Signal has expired. Update now to send and receive messages.</string>
+    <string mollyify="true" name="ExpiredBuildReminder_this_version_of_signal_has_expired">This version of Molly has expired. Update now to send and receive messages.</string>
     <string name="ExpiredBuildReminder_update_now">Update now</string>
 
     <!-- PendingGroupJoinRequestsReminder -->
@@ -1028,13 +1095,23 @@
     <!-- Message explaining that battery saver may delay notifications -->
     <string mollyify="true" name="PromptBatterySaverBottomSheet__message">You can disable battery optimizations for Molly to ensure that message notifications will not be delayed.</string>
 
+    <!-- Title in bottom sheet that states that notifications for this device could be delayed -->
+    <string name="DeviceSpecificNotificationBottomSheet__notifications_may_be_delayed">Notifications may be delayed due to battery optimizations</string>
+    <!-- Message in bottom sheet prompting users to fix potential issues by disabling battery optimizations -->
+    <string mollyify="true" name="DeviceSpecificNotificationBottomSheet__disable_battery_optimizations">Disable battery optimizations for Molly to ensure that message notifications will not be delayed. Tap “Continue” to see device-specific instructions.</string>
+    <!-- Button to dismiss notification help prompt -->
+    <string name="DeviceSpecificNotificationBottomSheet__no_thanks">No thanks</string>
+    <!-- Button to continue and go to Signal support website -->
+    <string name="DeviceSpecificNotificationBottomSheet__continue">Continue</string>
+
     <!-- Button to continue to try and disable battery saver -->
     <string name="PromptBatterySaverBottomSheet__continue">Continue</string>
     <!-- Button to dismiss battery saver dialog prompt-->
-    <string name="PromptBatterySaverBottomSheet__dismiss">Dismiss</string>
+    <string name="PromptBatterySaverBottomSheet__no_thanks">No thanks</string>
+    <string name="PromptBatterySaverBottomSheet__learn_more_url" translatable="false">https://support.signal.org/hc/articles/360007318711#android_notifications_troubleshooting</string>
 
     <!-- PendingMembersActivity -->
-    <string name="PendingMembersActivity_pending_group_invites">Pending group invites</string>
+    <string name="PendingMembersActivity_pending_group_invites">Requests &amp; invites</string>
     <string name="PendingMembersActivity_requests">Requests</string>
     <string name="PendingMembersActivity_invites">Invites</string>
     <string name="PendingMembersActivity_people_you_invited">People you invited</string>
@@ -1370,7 +1447,7 @@
     <string name="MessageQuotesBottomSheet_replies">Replies</string>
 
     <!-- NotificationBarManager -->
-    <string name="NotificationBarManager__establishing_signal_call">Establishing Signal call</string>
+    <string mollyify="true" name="NotificationBarManager__establishing_signal_call">Establishing Molly call</string>
     <!-- Temporary notification shown when starting the calling service -->
     <string mollyify="true" name="NotificationBarManager__starting_signal_call_service">Starting Molly call service</string>
     <string mollyify="true" name="NotificationBarManager__stopping_signal_call_service">Stopping Molly call service</string>
@@ -1625,6 +1702,14 @@
     <string name="MessageRecord_you_activated_payments">You activated Payments</string>
     <!-- Message to inform sender that recipient can now accept payments -->
     <string name="MessageRecord_can_accept_payments">%s can now accept Payments</string>
+    <!-- Message shown to inform user that a payment is missing details due to restore -->
+    <string name="MessageRecord_payments_restore_tombstone">Payment details are not available</string>
+    <!-- Message shown to inform user to tap the payment to learn more about why the details arent available -->
+    <string name="MessageRecord_payments_restore_tombstone_tap_more">Tap for more</string>
+    <!-- Title for dialog explaining why a specific mobile coin payment does not have any transaction details -->
+    <string name="PaymentTombstoneLearnMoreDialog_title">Payment details not available</string>
+    <!-- Message for dialog explaining why a specific mobile coin payment does not have any transaction details because it was restored from a backup-->
+    <string name="PaymentTombstoneLearnMoreDialog_message">This details of this payment are not available because your messages were restored from a source that did not contain this payment history. This does not affect your wallet balance or the status of past payments.</string>
 
     <!-- Group Calling update messages -->
     <!-- Chat log text for an ongoing group call that has one participant with a placeholder for the short display name of the user that joined and a placeholder for formatted time -->
@@ -1684,6 +1769,8 @@
     <string mollyify="true" name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">You can no longer send SMS messages in Molly. Invite %1$s to Molly to keep the conversation here.</string>
     <!-- Body for quote when message being quoted is an in-app payment message -->
     <string name="MessageRecord__payment_s">Payment: %1$s</string>
+    <!-- Body for quote when message being quoted is an in-app payment message tombstone without an amount -->
+    <string name="MessageRecord__payment_tombstone">Payment</string>
     <!-- Update message shown in chat after reporting it as spam -->
     <string name="MessageRecord_reported_as_spam">Reported as spam</string>
     <!-- Update message shown in chat after accept a message request -->
@@ -1868,7 +1955,8 @@
     <string name="RedPhone_ringing">Ringing…</string>
     <string name="RedPhone_busy">Busy</string>
     <string name="RedPhone_recipient_unavailable">Recipient unavailable</string>
-    <string name="RedPhone_network_failed">Network failed!</string>
+    <!-- Error message shown during a call when a fatal network error occurs. -->
+    <string name="RedPhone_network_failed">Network failed! Please check network connection and try again.</string>
     <string name="RedPhone_number_not_registered">Number not registered!</string>
     <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">The number you dialed does not support secure voice!</string>
     <string name="RedPhone_got_it">Got it</string>
@@ -1934,10 +2022,30 @@
     <string name="WebRtcCallActivity__removed_from_call">Removed from call</string>
     <!-- Message of dialog displayed when a user is removed from a call link -->
     <string name="WebRtcCallActivity__someone_has_removed_you_from_the_call">Someone has removed you from the call.</string>
+    <!-- Dialog title asking users for camera and microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_camera_microphone">Allow access to your camera and microphone</string>
+    <!-- Dialog title asking users for microphone permission -->
+    <string name="WebRtcCallActivity__allow_access_microphone">Allow access to your microphone</string>
+    <!-- Dialog title asking users for camera permission -->
+    <string name="WebRtcCallActivity__allow_access_camera">Allow access to your camera</string>
+    <!-- Dialog description explaining why camera and microphone permissions are needed to start or join a call -->
+    <string mollyify="true" name="WebRtcCallActivity__to_start_call_camera_microphone">To start or join a call, allow Molly access to your camera and microphone.</string>
+    <!-- Dialog description explaining why microphone permissions are needed to start or join a call -->
+    <string mollyify="true" name="WebRtcCallActivity__to_start_call_microphone">To start or join a call, allow Molly access to your microphone.</string>
+    <!-- Dialog description explaining why camera permissions are needed to enable a user\'s video in a call -->
+    <string mollyify="true" name="WebRtcCallActivity__to_enable_video_allow_camera">To enable your video, allow Molly access to your camera.</string>
+    <!-- Toast describing why microphone permissions are needed to start or join a call -->
+    <string mollyify="true" name="WebRtcCallActivity__signal_needs_microphone_start_call">Molly needs microphone permissions to start or join a call.</string>
+    <!-- Toast describing why camera permissions are needed to enable a video in a call -->
+    <string mollyify="true" name="WebRtcCallActivity__signal_needs_camera_access_enable_video">Molly needs camera access to enable your video</string>
+    <!-- Dialog description that will explain the steps needed to give microphone permissions -->
+    <string name="WebRtcCallActivity__to_start_call">To start or join a call:</string>
+    <!-- Dialog description that will explain the steps needed to give camera permissions -->
+    <string name="WebRtcCallActivity__to_enable_video">To enable your video:</string>
 
     <!-- WebRtcCallView -->
-    <string name="WebRtcCallView__signal_call">Signal Call</string>
-    <string name="WebRtcCallView__signal_video_call">Signal Video Call</string>
+    <string mollyify="true" name="WebRtcCallView__signal_call">Molly Call</string>
+    <string mollyify="true" name="WebRtcCallView__signal_video_call">Molly Video Call</string>
     <string name="WebRtcCallView__start_call">Start Call</string>
     <string name="WebRtcCallView__join_call">Join Call</string>
     <string name="WebRtcCallView__call_is_full">Call is full</string>
@@ -2027,23 +2135,42 @@
     <!-- A dialog prompt to confirm you want to lower your hand -->
     <string name="CallOverflowPopupWindow__lower_your_hand">Lower your hand?</string>
     <!-- A dialog button to confirm you would like to lower your hand -->
-    <string name="CallOverflowPopupWindow__lower_hand">Lower hand</string>
+    <string name="CallOverflowPopupWindow__lower_hand">Lower</string>
     <!-- A negative button for a dialog confirming the user wants to lower their hand (withdraw a raised hand) -->
     <string name="CallOverflowPopupWindow__cancel">Cancel</string>
-    <!-- A notification to the user that they successfully raised their hand -->
-    <string name="CallOverflowPopupWindow__you_raised_your_hand">You raised your hand</string>
     <!-- A button to take you to a list of participants with raised hands -->
     <string name="CallOverflowPopupWindow__view">View</string>
 
-    <!-- A notification to the user that one or more participants in the call successfully raised their hand. In the singular case, it is a name. In the plural case, it is a name or "You" -->
-    <plurals name="CallOverflowPopupWindow__raised_a_hand">
-        <item quantity="one">%1$s has raised a hand</item>
-        <item quantity="other">%1$s + %2$d have raised a hand</item>
+
+    <!-- A notification to the user that they successfully raised their hand. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_single">%1$s raised a hand</string>
+    <!-- A notification to the user that they and at least one more participants in the call successfully raised their hand. The placeholder is a number quantifying how many other hands are also raised, besides the user. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_second_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d raised a hand</item>
+        <item quantity="other">%1$s +%2$d raised a hand</item>
+    </plurals>
+
+    <!-- A notification to the user that one participant in the call successfully raised their hand. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_single">%1$s raised a hand</string>
+    <!-- A notification to the user that two or more participants in the call successfully raised their hand. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__expanded_third_person_raised_a_hand_multiple">
+        <item quantity="one">%1$s +%2$d raised a hand</item>
+        <item quantity="other">%1$s +%2$d raised a hand</item>
     </plurals>
 
-    <!-- A badge to show how many hands are raised. The first string may be a name or "You" -->
-    <plurals name="CallRaiseHandSnackbar_raised_hands">
-        <item quantity="one">%1$s</item>
+    <!-- A badge to show the user has their hand raised. The placeholder string is CallParticipant__you, or CallParticipant__you_on_another_device -->
+    <string name="CallRaiseHandSnackbar__collapsed_second_person_raised_hand_single">%1$s</string>
+    <!-- A badge to show the user and at least one other participant in the call have their hand raised. The placeholder is a number quantifying how many other hands are also raised, besides the user.  -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_second_person_raised_hands_multiple">
+        <item quantity="one">%1$s +%2$d</item>
+        <item quantity="other">%1$s +%2$d</item>
+    </plurals>
+
+    <!-- A badge to show how many hands are raised. The placeholder string is a name. -->
+    <string name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_singular">%1$s</string>
+    <!-- A badge to show how many hands are raised. The first placeholder is a name. The second placeholder is a number quantifying how many other hands are also raised, in addition to the name. -->
+    <plurals name="CallRaiseHandSnackbar__collapsed_third_person_raised_hands_multiple">
+        <item quantity="one">%1$s +%2$d</item>
         <item quantity="other">%1$s +%2$d</item>
     </plurals>
 
@@ -2187,8 +2314,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Having trouble registering?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Make sure your phone has a cellular signal to receive your SMS or call\n • Confirm you can receive a phone call to the number\n • Check that you have entered your phone number correctly.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">For more information, please follow these troubleshooting steps or Contact Support</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">For more information, please follow %1$s or %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">these troubleshooting steps</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->
@@ -2541,7 +2668,7 @@
     <string name="MessageNotifier_reacted_s_to_your_sticker">Reacted %1$s to your sticker.</string>
     <string name="MessageNotifier_this_message_was_deleted">This message was deleted.</string>
 
-    <string name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Turn off contact joined Signal notifications? You can enable them again in Signal > Settings > Notifications.</string>
+    <string mollyify="true" name="TurnOffContactJoinedNotificationsActivity__turn_off_contact_joined_signal">Turn off contact joined Molly notifications? You can enable them again in Molly > Settings > Notifications.</string>
 
     <!-- TurnOnNotificationsBottomSheet -->
     <!-- Title for sheet explaining how to turn on app notifications -->
@@ -2756,6 +2883,8 @@
     <string name="ContactSelectionListFragment_to_find_people">To find people you know on Signal:</string>
     <!-- Text on button prompting users to give Signal contact permissions -->
     <string name="ContactSelectionListFragment__allow_access">Allow access</string>
+    <!-- Text on button to dismiss Signal\'s request for contact permissions -->
+    <string name="ContactSelectionListFragment__no_thanks">No thanks</string>
     <!-- Text asking for user\'s contact permission -->
     <string name="ContactSelectionListFragment__allow_access_to_your_contacts_encrypted">Allow access to your contacts. Your contacts are encrypted and not visible to the Signal service.</string>
 
@@ -2833,6 +2962,8 @@
     <string name="ConversationUpdateItem_hidden_contact_message_to_add_back">You have removed this person, messaging them again will add them back to your list.</string>
     <!-- Update item button text shown for the accepted message request update message -->
     <string name="ConversationUpdateItem_options">Options</string>
+    <!-- Update item button text shown for a profile name change. -->
+    <string name="ConversationUpdateItem_update">Update</string>
 
     <!-- audio_view -->
     <string name="audio_view__play_pause_accessibility_description">Play … Pause</string>
@@ -3336,8 +3467,12 @@
         <item quantity="other">This will permanently trim all chats to the %1$s most recent messages.</item>
     </plurals>
     <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device">This will permanently delete all message history and media from your device.</string>
+    <!-- Dialog message warning about delete chat message history will delete everything everywhere including linked devices -->
+    <string name="preferences_storage__this_will_delete_all_message_history_and_media_from_your_device_linked_device">This will permanently delete all message history and media from this device and any linked devices.</string>
     <string name="preferences_storage__are_you_sure_you_want_to_delete_all_message_history">Are you sure you want to delete all message history?</string>
     <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone">All message history will be permanently removed. This action cannot be undone.</string>
+    <!-- Secondary warning dialog message about deleting all chat message history from everything everywhere including linked devices -->
+    <string name="preferences_storage__all_message_history_will_be_permanently_removed_this_action_cannot_be_undone_linked_device">All message history will be permanently removed from all devices. This action cannot be undone.</string>
     <string name="preferences_storage__delete_all_now">Delete all now</string>
     <string name="preferences_storage__forever">Forever</string>
     <string name="preferences_storage__one_year">1 year</string>
@@ -4092,9 +4227,16 @@
     <string name="TransferOrRestoreFragment__you_need_access_to_your_old_device">You need access to your old device.</string>
     <string name="TransferOrRestoreFragment__restore_from_backup">Restore from backup</string>
     <string name="TransferOrRestoreFragment__restore_your_messages_from_a_local_backup">Restore your messages from a local backup. If you don’t restore now, you won\'t be able to restore later.</string>
+    <string name="TransferOrRestoreFragment__restore_from_local_backup">Restore local backup</string>
+    <string name="TransferOrRestoreFragment__restore_from_signal_backup">Restore Signal backup</string>
+    <string name="TransferOrRestoreFragment__restore_your_messages_from_a_signal_backup">Restore all your text messages + your last 30 days of media</string>
     <!-- Button label for more options -->
     <string name="TransferOrRestoreFragment__more_options">More options</string>
 
+    <string name="TransferOrRestoreFragment__cancel">Cancel</string>
+    <string name="TransferOrRestoreFragment__skip_transfer">Log in without transferring</string>
+    <string name="TransferOrRestoreFragment__skip_transfer_description">Continue without transferring your messages and media</string>
+
     <!-- NewDeviceTransferInstructionsFragment -->
     <string name="NewDeviceTransferInstructions__open_signal_on_your_old_android_phone">Open Signal on your old Android phone</string>
     <string name="NewDeviceTransferInstructions__continue">Continue</string>
@@ -4278,7 +4420,7 @@
     <string name="ReviewCardDialogFragment__review_request">Review request</string>
     <!-- Message of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
     <plurals name="ReviewCardDialogFragment__d_group_members_have_the_same_name">
-        <item quantity="one">%1$d group member have the same name, review the member below and choose to take action.</item>
+        <item quantity="one">%1$d group member has the same name, review the member below and choose to take action.</item>
         <item quantity="other">%1$d group members have the same name, review the members below and choose to take action.</item>
     </plurals>
     <!-- Message of a screen where the user will be prompted to review a message request matching the name of someone they already know -->
@@ -4998,9 +5140,6 @@
     <!-- VectorAvatarCreationFragment -->
     <string name="VectorAvatarCreationFragment__select_a_color">Select a color</string>
 
-    <!-- ContactSelectionListItem -->
-    <string name="ContactSelectionListItem__sms">SMS</string>
-
     <!-- Displayed in the toolbar when externally sharing text to multiple recipients -->
     <string name="ShareInterstitialActivity__share">Share</string>
 
@@ -5034,7 +5173,8 @@
     </plurals>
     <!-- Error message shown when attempting to select a group to forward/share but it\'s announcement only and you are not an admin -->
     <string name="MultiselectForwardFragment__only_admins_can_send_messages_to_this_group">Only admins can send messages to this group.</string>
-    <string name="MultiselectForwardFragment__limit_reached">Limit reached</string>
+    <!-- Error message shown when users try to choose more than 5 chats to send a message to -->
+    <string name="MultiselectForwardFragment__you_cant_select_more_chats">You can\'t select more than 5 chats</string>
 
     <!-- Media V2 -->
     <!-- Dialog message when sending a story via an add to group story button -->
@@ -5665,8 +5805,10 @@
     <string name="StoryGroupReplyFragment__no_replies_yet">No replies yet</string>
     <!-- Displayed when no longer a group member -->
     <string name="StoryGroupReplyFragment__you_cant_reply">You can\'t reply to this story because you\'re no longer a member of this group.</string>
-    <!-- Displayed for each user that reacted to a story when viewing replies -->
-    <string name="StoryGroupReactionReplyItem__reacted_to_the_story">Reacted to the story</string>
+    <!-- Displayed for when you reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__you_reacted_to_the_story">Reacted to the story</string>
+    <!-- Displayed for other users that reacted to a story when viewing replies -->
+    <string name="StoryGroupReactionReplyItem__someone_reacted_to_the_story">Reacted to the story</string>
     <!-- Label for story views tab -->
     <string name="StoryViewsAndRepliesDialogFragment__views">Views</string>
     <!-- Label for story replies tab -->
@@ -6283,8 +6425,8 @@
     <string name="IdealTransferDetailsFragment__choose_your_bank">Choose your bank</string>
     <!-- Dialog title shown when using iDEAL payment for setting up a monthly donation -->
     <string name="IdealTransferDetailsFragment__confirm_your_donation_with_s">Confirm your donation with %1$s</string>
-    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation -->
-    <string name="IdealTransferDetailsFragment__monthly_ideal_warning">To setup your recurring donation tap continue to confirm a €0,01 charge with your bank. This will be automatically refunded and allows your €5/month donation to debited from your account.</string>
+    <!-- Dialog warning shown when using iDEAL payment for setting up a monthly donation. Placeholder is donation amount.Z -->
+    <string name="IdealTransferDetailsFragment__to_setup_your_recurring_donation">To setup your recurring donation tap continue to confirm a €0,01 charge with your bank. This will be automatically refunded and allows your %1$s/month donation to debited from your account.</string>
     <!-- Dialog button shown when using iDEAL payment for setting up a monthly donation to continue with the donation -->
     <string name="IdealTransferDetailsFragment__continue">Continue</string>
 
@@ -6860,6 +7002,52 @@
     <!-- Notification title shown while downloading backup restore data -->
     <string name="BackupProgressService_title_downloading">Downloading backup data…</string>
 
+    <!-- BackupAlertBottomSheet -->
+    <!-- Sheet title when media backups have been disabled -->
+    <string name="BackupAlertBottomSheet__media_backups_are_off">Media backups are off</string>
+    <!-- Sheet body part 1 when media backups have been disabled. Placeholder is the number of days until deletion. -->
+    <plurals name="BackupAlertBottomSheet__your_signal_media_backup_plan">
+        <item quantity="one">Your Signal media backup plan has been canceled because we couldn\'t process your payment. You have %1$d day to download any media stored in your backup. After %1$d day, the media in your backup will be deleted.</item>
+        <item quantity="other">Your Signal media backup plan has been canceled because we couldn\'t process your payment. You have %1$d days to download any media stored in your backup. After %1$d days, the media in your backup will be deleted.</item>
+    </plurals>
+    <!-- Sheet body part 2 when media backups have been disabled. -->
+    <string name="BackupAlertBottomSheet__you_can_begin_paying_for_backups_again">You can begin paying for backups again at any time to continue backing up all your media. </string>
+    <!-- Sheet title when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_media_will_be_deleted_today">Your media will be deleted today</string>
+    <!-- Sheet body part 1 when user\'s media will be deleted today -->
+    <string name="BackupAlertBottomSheet__your_signal_media_backup_plan_has_been">Your Signal media backup plan has been canceled because we couldn\'t process your payment. This is your last chance to download the media in your backup before it is deleted.</string>
+    <!-- Sheet title when user does not have enough space to download their backup -->
+    <string name="BackupAlertBottomSheet__cant_complete_download">Can\'t complete download</string>
+    <!-- Sheet body part 1 when user does not have enough space to download their backup. Placeholder is the amount of space needed. -->
+    <string name="BackupAlertBottomSheet__your_device_does_not_have_enough_free_space">Your device does not have enough free space. Free up to %1$s of space to download the media stored in your backup.</string>
+    <!-- Sheet body part 2 when user does not have enough space to download their backup. Placeholder is the number of days until deletion -->
+    <plurals name="BackupAlertBottomSheet__if_you_choose_skip">
+        <item quantity="one">If you choose \"Skip\" the media in your backup will be deleted in %1$d day.</item>
+        <item quantity="other">If you choose \"Skip\" the media in your backup will be deleted in %1$d days.</item>
+    </plurals>
+    <!-- Sheet title when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__cant_process_backup_payment">Can\'t process backup payment</string>
+    <!-- Sheet body when user payment failed to process -->
+    <string name="BackupAlertBottomSheet__were_having_trouble_collecting__google_pay">We\'re having trouble collecting your recurring monthly backup payment. Make sure your payment method is up to date. If it isn\'t, update it in Google Pay. Signal will try to process the payment again in a few days.</string>
+    <!-- Sheet title for generic backup error -->
+    <string name="BackupAlertBottomSheet__couldnt_complete_backup">Couldn\'t complete backup</string>
+    <!-- Sheet body for generic backup error. Placeholder is days since last backup. -->
+    <string name="BackupAlertBottomSheet__your_device_hasnt">Your device hasn\'t completed a backup for %1$d days. Make sure your device is connected to wi-fi and tap \"Back up now.\" </string>
+    <!-- Clickable text to learn more about the content of this bottom sheet -->
+    <string name="BackupAlertBottomSheet__learn_more">Learn more</string>
+    <!-- Secondary action button text when user does not have enough free space to download their backup. -->
+    <string name="BackupAlertBottomSheet__skip">Skip</string>
+    <!-- Primary action button text prompting user to download their media -->
+    <string name="BackupAlertBottomSheet__download_media_now">Download media now</string>
+    <!-- Secondary action button text to dismiss sheet, noting the user can download later -->
+    <string name="BackupAlertBottomSheet__download_later">Download later</string>
+    <!-- Secondary action button text to dismiss sheet, skipping media download -->
+    <string name="BackupAlertBottomSheet__dont_download_media">Don\'t download media</string>
+
+    <!-- BackupStatus -->
+    <!-- Status title when user does not have enough free space to download their media. Placeholder is required disk space. -->
+    <string name="BackupStatus__free_up_s_of_space_to_download_your_media">Free up %1$s of space to download your media.</string>
+
     <!-- BackupsTypeSettingsFragment -->
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__credit_or_debit_card">Credit or debit card</string>
@@ -6873,6 +7061,12 @@
     <string name="BackupsTypeSettingsFragment__paypal">PayPal</string>
     <!-- Displayed as the user\'s payment method as a label in a preference row -->
     <string name="BackupsTypeSettingsFragment__unknown">Unknown</string>
+    <!-- Row title for entering payment history -->
+    <string name="BackupsTypeSettingsFragment__payment_history">Payment history</string>
+
+    <!-- RemoteRestoreActivity -->
+    <!-- Displayed at restore time to tell the user when their last backup was made. %$1s is replaced with the date (e.g. March 5, 2024) and %$2s is replaced with the time (e.g. 9:00am) -->
+    <string name="RemoteRestoreActivity__backup_created_at">Your last backup was made on %1$s at %2$s.</string>
 
     <!-- ManageStorageSettingsFragment -->
     <!-- Settings section title header show above manage settings options for automatic chat history management (deleting) -->
@@ -6883,6 +7077,113 @@
     <string name="ManageStorageSettingsFragment_keep_messages_duration_warning">Messages older than the selected time will be permanently deleted.</string>
     <!-- Warning message at the bottom of a settings screen indicating how messages will be deleted based on user\'s selection (limit is a number like 500 or 5,000) -->
     <string name="ManageStorageSettingsFragment_chat_length_limit_warning">Messages exceeding the selected length will be permanently deleted.</string>
-
+    <!-- Setting title for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_title">Apply limits to linked devices</string>
+    <!-- Setting description for syncing automated chat limit trimming (deleting messages automatically by length or date) to linked devices -->
+    <string name="ManageStorageSettingsFragment_apply_limits_description">When enabled, chat limits will also delete messages from your linked devices.</string>
+
+    <!-- Educational bottom sheet dialog title shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_title">Deleting is now synced across all of your devices</string>
+    <!-- Educational bottom sheet dialog message shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_message">When you delete messages or chats, they will be deleted from your phone and linked devices.</string>
+    <!-- Educational bottom sheet confirm/dismiss button text shown to notify about delete syncs causing deletes to happen across all devices -->
+    <string name="DeleteSyncEducation_acknowledge_button">OK</string>
+
+    <!-- RemoteBackupsPaymentHistoryFragment -->
+    <!-- Title of the screen for payment history -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_history">Payment history</string>
+    <!-- Description for backup rows -->
+    <string name="RemoteBackupsPaymentHistoryFragment__text_and_all_media_backup">Text and all media backup</string>
+    <!-- Title of the screen for payment details -->
+    <string name="RemoteBackupsPaymentHistoryFragment__payment_details">Payment details</string>
+    <!-- Title of row specifying the type of backup -->
+    <string name="RemoteBackupsPaymentHistoryFragment__backup_type">Backup type</string>
+    <!-- Title of row specifying the date the backup was paid on -->
+    <string name="RemoteBackupsPaymentHistoryFragment__date_paid">Date paid</string>
+    <!-- Button label to share the receipt -->
+    <string name="RemoteBackupsPaymentHistoryFragment__share">Share</string>
+
+    <!-- RemoteBackupsSettingsFragment -->
+    <!-- Displayed on the title bar -->
+    <string name="RemoteBackupsSettingsFragment__signal_backups">Signal Backups</string>
+    <!-- Row label to launch payment history screen -->
+    <string name="RemoteBackupsSettingsFragment__payment_history">Payment history</string>
+    <!-- Section header for backup information -->
+    <string name="RemoteBackupsSettingsFragment__backup_details">Backup details</string>
+    <!-- Row label for backup size -->
+    <string name="RemoteBackupsSettingsFragment__backup_size">Backup size</string>
+    <!-- Row label for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__backup_frequency">Backup frequency</string>
+    <!-- Toggle row label for allowing backups to occur while on cellular connection -->
+    <string name="RemoteBackupsSettingsFragment__back_up_using_cellular">Back up using cellular</string>
+    <!-- Row label for cancelling and deleting backup -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backup">Turn off and delete backup</string>
+    <!-- Snackbar text displayed when backup has been deleted and turned off -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted_and_turned_off">Backup deleted and turned off.</string>
+    <!-- Snackbar text displayed when backup type is downgraded -->
+    <string name="RemoteBackupsSettingsFragment__backup_type_changed_and_subcription_deleted">Backup type changed and subscription cancelled</string>
+    <!-- Snackbar text displayed when backup subscription is cancelled -->
+    <string name="RemoteBackupsSettingsFragment__subscription_cancelled">Subscription cancelled</string>
+    <!-- Snackbar text displayed when backup is successfully downloaded -->
+    <string name="RemoteBackupsSettingsFragment__download_complete">Download complete</string>
+    <!-- Title text in row detailing selected backup type -->
+    <string name="RemoteBackupsSettingsFragment__backup_type">Backup type</string>
+    <!-- Subtitle text in row detailing selected backup type displayed when backups are disabled -->
+    <string name="RemoteBackupsSettingsFragment__backups_disabled">Backups disabled</string>
+    <!-- Format string for backup and cost. First placeholder is backup title, second is cost per month. -->
+    <string name="RemoteBackupsSettingsFragment__s_dot_s_per_month">%1$s · %2$s/month</string>
+    <!-- Button label to enable backups -->
+    <string name="RemoteBackupsSettingsFragment__enable_backups">Enable backups</string>
+    <!-- Progress indicator subtext displayed when a backup is in progress -->
+    <string name="RemoteBackupsSettingsFragment__d_slash_d">%1$d/%2$d</string>
+    <!-- Title text in row detailing last backup -->
+    <string name="RemoteBackupsSettingsFragment__last_backup">Last backup</string>
+    <!-- Subtext describing when a backup took place. First placeholder is the day, second is time. -->
+    <string name="RemoteBackupsSettingsFragment__s_at_s">%1$s at %2$s</string>
+    <!-- Subtext describing when a backup has never taken place. -->
+    <string name="RemoteBackupsSettingsFragment__never">Never</string>
+    <!-- Button label to perform a backup immediately -->
+    <string name="RemoteBackupsSettingsFragment__back_up_now">Back up now</string>
+    <!-- Dialog title when confirming whether to turn off and deleting backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete_backups">Turn off and delete backups?</string>
+    <!-- Dialog message when confirming whether to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__you_will_not_be_charged_again">You will not be charged again. Your backup will be deleted and no new backups will be created.</string>
+    <!-- Confirmation action on dialog to turn off and delete backups -->
+    <string name="RemoteBackupsSettingsFragment__turn_off_and_delete">Turn off and delete</string>
+    <!-- Text on dialog while user backup is being deleted -->
+    <string name="RemoteBackupsSettingsFragment__deleting_backup">Deleting backup…</string>
+    <!-- Text on dialog when user backup is deleted -->
+    <string name="RemoteBackupsSettingsFragment__backup_deleted">Backup deleted</string>
+    <!-- Subtitle for frequency option MANUAL for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__by_tapping_back_up_now">By tapping "Back up now"</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__daily">Daily</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__weekly">Weekly</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__monthly">Monthly</string>
+    <!-- Title for frequency option DAILY for backup frequency -->
+    <string name="RemoteBackupsSettingsFragment__manually_back_up">Manually back up</string>
+    <!-- The body of an alert dialog shown when we detect the user may be confused by the lock screen -->
+    <string name="PassphrasePromptActivity_help_prompt_body">Please enter your device pin, password or pattern.</string>
+
+    <!-- Primary action button label when selecting a backup tier without a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__next">Next</string>
+    <!-- Primary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__change_backup_type">Change backup type</string>
+    <!-- Secondary action button label when selecting a backup tier with a current selection -->
+    <string name="MessageBackupsTypeSelectionScreen__cancel_subscription">Cancel subscription</string>
+
+    <!-- ConfirmBackupCancellationDialog -->
+    <!-- Dialog title -->
+    <string name="ConfirmBackupCancellationDialog__confirm_cancellation">Confirm cancellation</string>
+    <!-- Dialog body -->
+    <string name="ConfirmBackupCancellationDialog__you_wont_be_charged_again">You won\'t be charged again. Backups will be turned off at the end of your billing cycle. After that date you will have 30 days to download the media you\'re currently backing up.</string>
+    <!-- Action button label to cancel subscription and download now -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_now">Confirm and download now</string>
+    <!-- Action button label to cancel subscription and download later -->
+    <string name="ConfirmBackupCancellationDialog__confirm_and_download_later">Confirm and download later</string>
+    <!-- Action button label to keep current subscription -->
+    <string name="ConfirmBackupCancellationDialog__keep_subscription">Keep subscription</string>
     <!-- EOF -->
 </resources>
diff --git a/app/src/main/res/values/strings2.xml b/app/src/main/res/values/strings2.xml
index 9439914188..30f2970bba 100644
--- a/app/src/main/res/values/strings2.xml
+++ b/app/src/main/res/values/strings2.xml
@@ -75,6 +75,7 @@
     <string name="enter_device_link_dialog__if_your_phone_cant_scan_the_qr_code_you_can_manually_enter_the_link_encoded_in_the_qr_code">If your device can’t scan the QR code, you can manually enter the link encoded in the QR code.</string>
     <string name="enter_device_link_dialog__url" translatable="false">sgnl://linkdevice?uuid=UUID&amp;pub_key=PUBKEY</string>
     <string name="HelpSettingsFragment_disable_and_delete_debug_log">Delete and disable debug log?</string>
+    <string name="HelpSettingsFragment_for_updates_please_check_your_app_store">For updates, please check your app store. This version does not include an in-app updater.</string>
     <string name="RegistrationActivity_molly_needs_access_to_your_contacts_and_media_in_order_to_connect_with_friends">Molly needs the contacts and media permissions to help you find your friends and send messages. Your contacts are uploaded using Signal\'s private contact discovery, which means they are end-to-end encrypted and never visible to the Signal service.</string>
     <string name="RegistrationActivity_molly_needs_access_to_your_contacts_in_order_to_connect_with_friends">Molly needs the contacts permission to help you find your friends. Your contacts are uploaded using Signal\'s private contact discovery, which means they are end-to-end encrypted and never visible to the Signal service.</string>
     <string name="DozeReminder_optimize_for_timely_notifications">Optimize for timely notifications</string>
@@ -115,4 +116,5 @@
     <string name="NotificationsSettingsFragment__receive_notifications_for_messages_or_missed_calls_when_the_app_is_locked">Receive notifications for messages or missed calls when the app is locked.</string>
     <string name="NotificationsSettingsFragment__push_notifications_unavailable">Push notifications unavailable</string>
     <string name="NotificationsSettingsFragment__sorry_this_feature_requires_push_notifications_delivered_via_fcm_or_unifiedpush">Sorry, this feature requires push notifications delivered via FCM or UnifiedPush, which are currently unavailable.</string>
+    <string name="AppUpdatesSettingsFragment__last_checked_s">Last checked: %s</string>
 </resources>
diff --git a/app/src/spinner/java/org/thoughtcrime/securesms/SpinnerApplicationContext.kt b/app/src/spinner/java/org/thoughtcrime/securesms/SpinnerApplicationContext.kt
index e538f07c77..08fa4b1907 100644
--- a/app/src/spinner/java/org/thoughtcrime/securesms/SpinnerApplicationContext.kt
+++ b/app/src/spinner/java/org/thoughtcrime/securesms/SpinnerApplicationContext.kt
@@ -29,7 +29,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.logging.PersistentLogger
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.AppSignatureUtil
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import java.util.Locale
 
 class SpinnerApplicationContext : ApplicationContext() {
@@ -50,10 +50,10 @@ class SpinnerApplicationContext : ApplicationContext() {
         "Device" to { "${Build.MODEL} (Android ${Build.VERSION.RELEASE}, API ${Build.VERSION.SDK_INT})" },
         "Package" to { "$packageName (${AppSignatureUtil.getAppSignature(this)})" },
         "App Version" to { "${BuildConfig.VERSION_NAME} (${BuildConfig.SIGNAL_CANONICAL_VERSION_CODE}, ${BuildConfig.GIT_HASH})" },
-        "Profile Name" to { (if (SignalStore.account().isRegistered) Recipient.self().profileName.toString() else "none") },
-        "E164" to { SignalStore.account().e164 ?: "none" },
-        "ACI" to { SignalStore.account().aci?.toString() ?: "none" },
-        "PNI" to { SignalStore.account().pni?.toString() ?: "none" },
+        "Profile Name" to { (if (SignalStore.account.isRegistered) Recipient.self().profileName.toString() else "none") },
+        "E164" to { SignalStore.account.e164 ?: "none" },
+        "ACI" to { SignalStore.account.aci?.toString() ?: "none" },
+        "PNI" to { SignalStore.account.pni?.toString() ?: "none" },
         Spinner.KEY_ENVIRONMENT to { BuildConfig.FLAVOR_environment.uppercase(Locale.US) }
       ),
       linkedMapOf(
@@ -86,7 +86,7 @@ class SpinnerApplicationContext : ApplicationContext() {
       )
     )
 
-    Log.initialize({ FeatureFlags.internalUser() }, AndroidLogger, PersistentLogger(this), SpinnerLogger())
+    Log.initialize({ RemoteConfig.internalUser }, AndroidLogger, PersistentLogger(this), SpinnerLogger())
 
     DatabaseMonitor.initialize(object : QueryMonitor {
       override fun onSql(sql: String, args: Array<Any>?) {
diff --git a/app/src/spinner/java/org/thoughtcrime/securesms/StorageServicePlugin.kt b/app/src/spinner/java/org/thoughtcrime/securesms/StorageServicePlugin.kt
index 4b059fd62b..05632b7774 100644
--- a/app/src/spinner/java/org/thoughtcrime/securesms/StorageServicePlugin.kt
+++ b/app/src/spinner/java/org/thoughtcrime/securesms/StorageServicePlugin.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms
 
 import org.signal.spinner.Plugin
 import org.signal.spinner.PluginResult
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 
 class StorageServicePlugin : Plugin {
@@ -13,8 +13,8 @@ class StorageServicePlugin : Plugin {
     val columns = listOf("Type", "Data")
     val rows = mutableListOf<List<String>>()
 
-    val manager = ApplicationDependencies.getSignalServiceAccountManager()
-    val storageServiceKey = SignalStore.storageService().orCreateStorageKey
+    val manager = AppDependencies.signalServiceAccountManager
+    val storageServiceKey = SignalStore.storageService.orCreateStorageKey
     val storageManifestVersion = manager.storageManifestVersion
     val manifest = manager.getStorageManifestIfDifferentVersion(storageServiceKey, storageManifestVersion - 1).get()
     val signalStorageRecords = manager.readStorageRecords(storageServiceKey, manifest.storageIds)
diff --git a/app/src/spinner/java/org/thoughtcrime/securesms/database/GV2UpdateTransformer.kt b/app/src/spinner/java/org/thoughtcrime/securesms/database/GV2UpdateTransformer.kt
index 7547a341b1..c24a10834b 100644
--- a/app/src/spinner/java/org/thoughtcrime/securesms/database/GV2UpdateTransformer.kt
+++ b/app/src/spinner/java/org/thoughtcrime/securesms/database/GV2UpdateTransformer.kt
@@ -9,7 +9,7 @@ import org.signal.spinner.DefaultColumnTransformer
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.UpdateDescription
 import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 
 object GV2UpdateTransformer : ColumnTransformer {
   override fun matches(tableName: String?, columnName: String): Boolean {
@@ -28,7 +28,7 @@ object GV2UpdateTransformer : ColumnTransformer {
     return if (MessageTypes.isGroupV2(type) && MessageTypes.isGroupUpdate(type) && body != null) {
       val decoded = Base64.decode(body)
       val decryptedGroupV2Context = DecryptedGroupV2Context.ADAPTER.decode(decoded)
-      val gv2ChangeDescription: UpdateDescription = MessageRecord.getGv2ChangeDescription(ApplicationDependencies.getApplication(), body, null)
+      val gv2ChangeDescription: UpdateDescription = MessageRecord.getGv2ChangeDescription(AppDependencies.application, body, null)
 
       "${gv2ChangeDescription.spannable}<br><br>${decryptedGroupV2Context.change}"
     } else {
diff --git a/app/src/test/java/org/thoughtcrime/securesms/SignalStoreRule.kt b/app/src/test/java/org/thoughtcrime/securesms/SignalStoreRule.kt
index 7828e35a0c..2ab3531656 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/SignalStoreRule.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/SignalStoreRule.kt
@@ -4,7 +4,7 @@ import androidx.test.core.app.ApplicationProvider
 import org.junit.rules.TestRule
 import org.junit.runner.Description
 import org.junit.runners.model.Statement
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.dependencies.MockApplicationDependencyProvider
 import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet
 import org.thoughtcrime.securesms.keyvalue.KeyValueStore
@@ -27,12 +27,12 @@ class SignalStoreRule @JvmOverloads constructor(private val defaultValues: KeyVa
     return object : Statement() {
       @Throws(Throwable::class)
       override fun evaluate() {
-        if (!ApplicationDependencies.isInitialized()) {
-          ApplicationDependencies.init(ApplicationProvider.getApplicationContext(), MockApplicationDependencyProvider())
+        if (!AppDependencies.isInitialized) {
+          AppDependencies.init(ApplicationProvider.getApplicationContext(), MockApplicationDependencyProvider())
         }
 
         dataSet = KeyValueDataSet()
-        SignalStore.inject(KeyValueStore(MockKeyValuePersistentStorage.withDataSet(dataSet)))
+        SignalStore.testInject(KeyValueStore(MockKeyValuePersistentStorage.withDataSet(dataSet)))
         defaultValues.invoke(dataSet)
 
         base.evaluate()
diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/emoji/EmojiUtilTest_isEmoji.java b/app/src/test/java/org/thoughtcrime/securesms/components/emoji/EmojiUtilTest_isEmoji.java
deleted file mode 100644
index 8727eb458f..0000000000
--- a/app/src/test/java/org/thoughtcrime/securesms/components/emoji/EmojiUtilTest_isEmoji.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import android.app.Application;
-
-import androidx.test.core.app.ApplicationProvider;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockedConstruction;
-import org.mockito.MockedStatic;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
-import org.robolectric.ParameterizedRobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.emoji.EmojiSource;
-import org.thoughtcrime.securesms.keyvalue.InternalValues;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-@RunWith(ParameterizedRobolectricTestRunner.class)
-@Config(manifest = Config.NONE, application = Application.class)
-public class EmojiUtilTest_isEmoji {
-
-  @Rule
-  public MockitoRule rule = MockitoJUnit.rule();
-
-  private final String  input;
-  private final boolean output;
-
-  @ParameterizedRobolectricTestRunner.Parameters
-  public static Collection<Object[]> data() {
-    return Arrays.asList(new Object[][]{
-        {null, false},
-        {"", false},
-        {"cat", false},
-        {"ᑢᗩᖶ", false},
-        {"♍︎♋︎⧫︎", false},
-        {"ᑢ", false},
-        {"¯\\_(ツ)_/¯", false},
-        {"\uD83D\uDE0D", true}, // Smiling face with heart-shaped eyes
-        {"\uD83D\uDD77", true}, // Spider
-        {"\uD83E\uDD37", true}, // Person shrugging
-        {"\uD83E\uDD37\uD83C\uDFFF\u200D♂️", true}, // Man shrugging dark skin tone
-        {"\uD83D\uDC68\u200D\uD83D\uDC69\u200D\uD83D\uDC67\u200D\uD83D\uDC66", true}, // Family: Man, Woman, Girl, Boy
-        {"\uD83D\uDC68\uD83C\uDFFB\u200D\uD83D\uDC69\uD83C\uDFFB\u200D\uD83D\uDC67\uD83C\uDFFB\u200D\uD83D\uDC66\uD83C\uDFFB", true}, // Family - Man: Light Skin Tone, Woman: Light Skin Tone, Girl: Light Skin Tone, Boy: Light Skin Tone (NOTE: Not widely supported, good stretch test)
-        {"\uD83D\uDE0Dhi", false}, // Smiling face with heart-shaped eyes, text afterwards
-        {"\uD83D\uDE0D ", false}, // Smiling face with heart-shaped eyes, space afterwards
-        {"\uD83D\uDE0D\uD83D\uDE0D", false}, // Smiling face with heart-shaped eyes, twice
-    });
-  }
-
-  @Mock
-  private MockedStatic<ApplicationDependencies> applicationDependenciesMockedStatic;
-
-  @Mock
-  private MockedStatic<AttachmentSecretProvider> attachmentSecretProviderMockedStatic;
-
-  @Mock
-  private MockedStatic<SignalStore> signalStoreMockedStatic;
-
-  @Mock
-  private MockedConstruction<SignalStore> signalStoreMockedConstruction;
-
-  public EmojiUtilTest_isEmoji(String input, boolean output) {
-    this.input  = input;
-    this.output = output;
-  }
-
-  @Test
-  public void isEmoji() throws Exception {
-    Application application = ApplicationProvider.getApplicationContext();
-
-    when(ApplicationDependencies.getApplication()).thenReturn(application);
-    when(AttachmentSecretProvider.getInstance(any())).thenThrow(RuntimeException.class);
-    when(SignalStore.internalValues()).thenReturn(mock(InternalValues.class));
-    EmojiSource.refresh();
-
-    assertEquals(output, EmojiUtil.isEmoji(input));
-  }
-}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/emoji/EmojiUtilTest_isEmoji.kt b/app/src/test/java/org/thoughtcrime/securesms/components/emoji/EmojiUtilTest_isEmoji.kt
new file mode 100644
index 0000000000..f13bac171f
--- /dev/null
+++ b/app/src/test/java/org/thoughtcrime/securesms/components/emoji/EmojiUtilTest_isEmoji.kt
@@ -0,0 +1,76 @@
+package org.thoughtcrime.securesms.components.emoji
+
+import android.app.Application
+import androidx.test.core.app.ApplicationProvider
+import org.junit.Assert
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers
+import org.mockito.Mock
+import org.mockito.MockedStatic
+import org.mockito.Mockito
+import org.mockito.junit.MockitoJUnit
+import org.mockito.junit.MockitoRule
+import org.robolectric.ParameterizedRobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.emoji.EmojiSource.Companion.refresh
+import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet
+import org.thoughtcrime.securesms.keyvalue.KeyValueStore
+import org.thoughtcrime.securesms.keyvalue.MockKeyValuePersistentStorage
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+
+@RunWith(ParameterizedRobolectricTestRunner::class)
+@Config(manifest = Config.NONE, application = Application::class)
+class EmojiUtilTest_isEmoji(private val input: String?, private val output: Boolean) {
+  @Rule
+  @JvmField
+  val rule: MockitoRule = MockitoJUnit.rule()
+
+  @Mock
+  private val applicationDependenciesMockedStatic: MockedStatic<AppDependencies>? = null
+
+  @Mock
+  private val attachmentSecretProviderMockedStatic: MockedStatic<AttachmentSecretProvider>? = null
+
+  @Throws(Exception::class)
+  @Test
+  fun isEmoji() {
+    val application = ApplicationProvider.getApplicationContext<Application>()
+
+    Mockito.`when`(AppDependencies.application).thenReturn(application)
+    Mockito.`when`(AttachmentSecretProvider.getInstance(ArgumentMatchers.any())).thenThrow(RuntimeException::class.java)
+    SignalStore.testInject(KeyValueStore(MockKeyValuePersistentStorage.withDataSet(KeyValueDataSet())))
+    refresh()
+
+    Assert.assertEquals(output, EmojiUtil.isEmoji(input))
+  }
+
+  companion object {
+
+    @JvmStatic
+    @ParameterizedRobolectricTestRunner.Parameters
+    fun data(): Collection<Array<Any?>> {
+      return listOf(
+        arrayOf(null, false),
+        arrayOf("", false),
+        arrayOf("cat", false),
+        arrayOf("ᑢᗩᖶ", false),
+        arrayOf("♍︎♋︎⧫︎", false),
+        arrayOf("ᑢ", false),
+        arrayOf("¯\\_(ツ)_/¯", false),
+        arrayOf("\uD83D\uDE0D", true), // Smiling face with heart-shaped eyes
+        arrayOf("\uD83D\uDD77", true), // Spider
+        arrayOf("\uD83E\uDD37", true), // Person shrugging
+        arrayOf("\uD83E\uDD37\uD83C\uDFFF\u200D♂️", true), // Man shrugging dark skin tone
+        arrayOf("\uD83D\uDC68\u200D\uD83D\uDC69\u200D\uD83D\uDC67\u200D\uD83D\uDC66", true), // Family: Man, Woman, Girl, Boy
+        arrayOf("\uD83D\uDC68\uD83C\uDFFB\u200D\uD83D\uDC69\uD83C\uDFFB\u200D\uD83D\uDC67\uD83C\uDFFB\u200D\uD83D\uDC66\uD83C\uDFFB", true), // Family - Man: Light Skin Tone, Woman: Light Skin Tone, Girl: Light Skin Tone, Boy: Light Skin Tone (NOTE: Not widely supported, good stretch test)
+        arrayOf("\uD83D\uDE0Dhi", false), // Smiling face with heart-shaped eyes, text afterwards
+        arrayOf("\uD83D\uDE0D ", false), // Smiling face with heart-shaped eyes, space afterwards
+        arrayOf("\uD83D\uDE0D\uD83D\uDE0D", false) // Smiling face with heart-shaped eyes, twice
+      )
+    }
+  }
+}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataTest.kt b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataTest.kt
index c7b9184a1d..98469ed27e 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataTest.kt
@@ -17,7 +17,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.dependencies.MockApplicationDependencyProvider
 import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.util.JsonUtils
@@ -66,8 +66,8 @@ class ExportAccountDataTest {
 
   @Before
   fun setup() {
-    if (!ApplicationDependencies.isInitialized()) {
-      ApplicationDependencies.init(ApplicationProvider.getApplicationContext(), MockApplicationDependencyProvider())
+    if (!AppDependencies.isInitialized) {
+      AppDependencies.init(ApplicationProvider.getApplicationContext(), MockApplicationDependencyProvider())
     }
   }
 
diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/SubscriptionsConfigurationExtensionsKtTest.kt b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/SubscriptionsConfigurationExtensionsKtTest.kt
new file mode 100644
index 0000000000..fb22595b2f
--- /dev/null
+++ b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/SubscriptionsConfigurationExtensionsKtTest.kt
@@ -0,0 +1,231 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription
+
+import android.app.Application
+import androidx.test.core.app.ApplicationProvider
+import io.mockk.every
+import io.mockk.mockkStatic
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
+import org.junit.Ignore
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration
+import org.whispersystems.signalservice.internal.util.JsonUtil
+import java.util.Currency
+
+@Ignore("Payments are disabled")
+@RunWith(RobolectricTestRunner::class)
+@Config(application = Application::class)
+class SubscriptionsConfigurationExtensionsKtTest {
+
+  private val testData: String = javaClass.classLoader!!.getResourceAsStream("donations_configuration_test_data.json").bufferedReader().readText()
+  private val testSubject = JsonUtil.fromJson(testData, SubscriptionsConfiguration::class.java)
+
+  @Test
+  fun `Given all methods are available, when I getSubscriptionAmounts, then I expect all currencies`() {
+    val subscriptionPrices = testSubject.getSubscriptionAmounts(SubscriptionsConfiguration.SUBSCRIPTION_LEVELS.first(), AllPaymentMethodsAvailability)
+
+    assertEquals(3, subscriptionPrices.size)
+    assertTrue(subscriptionPrices.map { it.currency.currencyCode }.containsAll(setOf("JPY", "BIF", "USD")))
+  }
+
+  @Test
+  fun `Given only PayPal available, when I getSubscriptionAmounts, then I expect BIF and JPY`() {
+    val subscriptionPrices = testSubject.getSubscriptionAmounts(SubscriptionsConfiguration.SUBSCRIPTION_LEVELS.first(), PayPalOnly)
+
+    assertEquals(2, subscriptionPrices.size)
+    assertTrue(subscriptionPrices.map { it.currency.currencyCode }.containsAll(setOf("JPY", "BIF")))
+  }
+
+  @Test
+  fun `Given only Card available, when I getSubscriptionAmounts, then I expect BIF and USD`() {
+    val subscriptionPrices = testSubject.getSubscriptionAmounts(SubscriptionsConfiguration.SUBSCRIPTION_LEVELS.first(), CardOnly)
+
+    assertEquals(2, subscriptionPrices.size)
+    assertTrue(subscriptionPrices.map { it.currency.currencyCode }.containsAll(setOf("USD", "BIF")))
+  }
+
+  @Test
+  fun `When I getGiftBadges, then I expect exactly 1 badge with the id GIFT`() {
+    mockkStatic(AppDependencies::class) {
+      every { AppDependencies.application } returns ApplicationProvider.getApplicationContext()
+
+      val giftBadges = testSubject.getGiftBadges()
+
+      assertEquals(1, giftBadges.size)
+      assertTrue(giftBadges.first().isGift())
+    }
+  }
+
+  @Test
+  fun `When I getBoostBadges, then I expect exactly 1 badge with the id BOOST`() {
+    mockkStatic(AppDependencies::class) {
+      every { AppDependencies.application } returns ApplicationProvider.getApplicationContext()
+
+      val boostBadges = testSubject.getBoostBadges()
+
+      assertEquals(1, boostBadges.size)
+      assertTrue(boostBadges.first().isBoost())
+    }
+  }
+
+  @Test
+  fun `When I getSubscriptionLevels, then I expect the exact 3 defined subscription levels`() {
+    val subscriptionLevels = testSubject.getSubscriptionLevels()
+
+    assertEquals(3, subscriptionLevels.size)
+    assertEquals(SubscriptionsConfiguration.SUBSCRIPTION_LEVELS, subscriptionLevels.keys)
+    subscriptionLevels.keys.fold(0) { acc, i ->
+      assertTrue(acc < i)
+      i
+    }
+  }
+
+  @Test
+  fun `Given all methods are available, when I getGiftAmounts, then I expect BIF and JPY and USD`() {
+    val giftAmounts = testSubject.getGiftBadgeAmounts(AllPaymentMethodsAvailability)
+
+    assertEquals(3, giftAmounts.size)
+    assertNotNull(giftAmounts[Currency.getInstance("BIF")])
+    assertNotNull(giftAmounts[Currency.getInstance("JPY")])
+    assertNotNull(giftAmounts[Currency.getInstance("USD")])
+  }
+
+  @Test
+  fun `Given only PayPal available, when I getGiftAmounts, then I expect BIF and JPY`() {
+    val giftAmounts = testSubject.getGiftBadgeAmounts(PayPalOnly)
+
+    assertEquals(2, giftAmounts.size)
+    assertTrue(giftAmounts.map { it.key.currencyCode }.containsAll(setOf("JPY", "BIF")))
+  }
+
+  @Test
+  fun `Given only Card available, when I getGiftAmounts, then I expect BIF and USD`() {
+    val giftAmounts = testSubject.getGiftBadgeAmounts(CardOnly)
+
+    assertEquals(2, giftAmounts.size)
+    assertTrue(giftAmounts.map { it.key.currencyCode }.containsAll(setOf("USD", "BIF")))
+  }
+
+  @Test
+  fun `Given all methods are available, when I getBoostAmounts, then I expect BIF and JPY and USD`() {
+    val boostAmounts = testSubject.getBoostAmounts(AllPaymentMethodsAvailability)
+
+    assertEquals(3, boostAmounts.size)
+    assertNotNull(boostAmounts[Currency.getInstance("BIF")])
+    assertNotNull(boostAmounts[Currency.getInstance("JPY")])
+    assertNotNull(boostAmounts[Currency.getInstance("USD")])
+  }
+
+  @Test
+  fun `Given only PayPal available, when I getBoostAmounts, then I expect BIF and JPY`() {
+    val boostAmounts = testSubject.getBoostAmounts(PayPalOnly)
+
+    assertEquals(2, boostAmounts.size)
+    assertTrue(boostAmounts.map { it.key.currencyCode }.containsAll(setOf("JPY", "BIF")))
+  }
+
+  @Test
+  fun `Given only Card available, when I getBoostAmounts, then I expect BIF and USD`() {
+    val boostAmounts = testSubject.getBoostAmounts(CardOnly)
+
+    assertEquals(2, boostAmounts.size)
+    assertTrue(boostAmounts.map { it.key.currencyCode }.containsAll(setOf("USD", "BIF")))
+  }
+
+  @Test
+  fun `Given all methods are available, when I getMinimumDonationAmounts, then I expect BIF and JPY and USD`() {
+    val minimumDonationAmounts = testSubject.getMinimumDonationAmounts(AllPaymentMethodsAvailability)
+
+    assertEquals(3, minimumDonationAmounts.size)
+    assertNotNull(minimumDonationAmounts[Currency.getInstance("BIF")])
+    assertNotNull(minimumDonationAmounts[Currency.getInstance("JPY")])
+    assertNotNull(minimumDonationAmounts[Currency.getInstance("USD")])
+  }
+
+  @Test
+  fun `Given only PayPal available, when I getMinimumDonationAmounts, then I expect BIF and JPY`() {
+    val minimumDonationAmounts = testSubject.getMinimumDonationAmounts(PayPalOnly)
+
+    assertEquals(2, minimumDonationAmounts.size)
+    assertTrue(minimumDonationAmounts.map { it.key.currencyCode }.containsAll(setOf("JPY", "BIF")))
+  }
+
+  @Test
+  fun `Given only Card available, when I getMinimumDonationAmounts, then I expect BIF and USD`() {
+    val minimumDonationAmounts = testSubject.getMinimumDonationAmounts(CardOnly)
+
+    assertEquals(2, minimumDonationAmounts.size)
+    assertTrue(minimumDonationAmounts.map { it.key.currencyCode }.containsAll(setOf("USD", "BIF")))
+  }
+
+  @Test
+  fun `Given GIFT_LEVEL, When I getBadge, then I expect the gift badge`() {
+    mockkStatic(AppDependencies::class) {
+      every { AppDependencies.application } returns ApplicationProvider.getApplicationContext()
+      val badge = testSubject.getBadge(SubscriptionsConfiguration.GIFT_LEVEL)
+
+      assertTrue(badge.isGift())
+    }
+  }
+
+  @Test
+  fun `Given BOOST_LEVEL, When I getBadge, then I expect the boost badge`() {
+    mockkStatic(AppDependencies::class) {
+      every { AppDependencies.application } returns ApplicationProvider.getApplicationContext()
+      val badge = testSubject.getBadge(SubscriptionsConfiguration.BOOST_LEVEL)
+
+      assertTrue(badge.isBoost())
+    }
+  }
+
+  @Test
+  fun `Given a sub level, When I getBadge, then I expect a sub badge`() {
+    mockkStatic(AppDependencies::class) {
+      every { AppDependencies.application } returns ApplicationProvider.getApplicationContext()
+      val badge = testSubject.getBadge(SubscriptionsConfiguration.SUBSCRIPTION_LEVELS.first())
+
+      assertTrue(badge.isSubscription())
+    }
+  }
+
+  @Test
+  fun `Given I want to pay in USD, when I getAvailablePaymentMethods, then I expect CARD`() {
+    val availablePaymentMethods = testSubject.getAvailablePaymentMethods("UsD")
+
+    assertEquals(1, availablePaymentMethods.size)
+    assertTrue("CARD" in availablePaymentMethods)
+  }
+
+  @Test
+  fun `Given I want to pay in BIF, when I getAvailablePaymentMethods, then I expect CARD and PAYPAL`() {
+    val availablePaymentMethods = testSubject.getAvailablePaymentMethods("bIF")
+
+    println(testSubject.currencies)
+    assertEquals(2, availablePaymentMethods.size)
+    assertTrue("CARD" in availablePaymentMethods)
+    assertTrue("PAYPAL" in availablePaymentMethods)
+  }
+
+  private object AllPaymentMethodsAvailability : PaymentMethodAvailability {
+    override fun isPayPalAvailable(): Boolean = true
+    override fun isGooglePayOrCreditCardAvailable(): Boolean = true
+    override fun isSEPADebitAvailable(): Boolean = false
+  }
+
+  private object PayPalOnly : PaymentMethodAvailability {
+    override fun isPayPalAvailable(): Boolean = true
+    override fun isGooglePayOrCreditCardAvailable(): Boolean = false
+    override fun isSEPADebitAvailable(): Boolean = false
+  }
+
+  private object CardOnly : PaymentMethodAvailability {
+    override fun isPayPalAvailable(): Boolean = false
+    override fun isGooglePayOrCreditCardAvailable(): Boolean = true
+    override fun isSEPADebitAvailable(): Boolean = false
+  }
+}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostTest__MoneyFilter.kt b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostTest__MoneyFilter.kt
new file mode 100644
index 0000000000..1c1cef3e63
--- /dev/null
+++ b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostTest__MoneyFilter.kt
@@ -0,0 +1,234 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.boost
+
+import android.app.Application
+import android.text.SpannableStringBuilder
+import junit.framework.Assert.assertEquals
+import junit.framework.Assert.assertNotNull
+import junit.framework.Assert.assertNull
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import java.util.Currency
+import java.util.Locale
+
+@Suppress("ClassName")
+@RunWith(RobolectricTestRunner::class)
+@Config(manifest = Config.NONE, application = Application::class)
+class BoostTest__MoneyFilter {
+
+  private val usd = Currency.getInstance("USD")
+  private val yen = Currency.getInstance("JPY")
+  private val inr = Currency.getInstance("INR")
+
+  @Before
+  fun setUp() {
+    Locale.setDefault(Locale.US)
+  }
+
+  @Test
+  fun `Given USD, when I enter 5, then I expect $ 5`() {
+    val testSubject = Boost.MoneyFilter(usd)
+    val editable = SpannableStringBuilder("5")
+
+    testSubject.afterTextChanged(editable)
+
+    assertEquals("$5", editable.toString())
+  }
+
+  @Test
+  fun `Given USD, when I enter 5dot00, then I expect successful filter`() {
+    val testSubject = Boost.MoneyFilter(usd)
+    val editable = SpannableStringBuilder("5.00")
+    val dest = SpannableStringBuilder()
+
+    testSubject.afterTextChanged(editable)
+    val filterResult = testSubject.filter(editable, 0, editable.length, dest, 0, 0)
+
+    assertNull(filterResult)
+  }
+
+  @Test
+  fun `Given USD, when I enter 5dot00, then I expect 5 from text change`() {
+    var result = ""
+    val testSubject = Boost.MoneyFilter(usd) {
+      result = it
+    }
+
+    val editable = SpannableStringBuilder("5.00")
+    testSubject.afterTextChanged(editable)
+
+    assertEquals("5.00", result)
+  }
+
+  @Test
+  fun `Given USD, when I enter 00005dot00, then I expect 5 from text change`() {
+    val testSubject = Boost.MoneyFilter(usd)
+    val editable = SpannableStringBuilder("00005.00")
+
+    testSubject.afterTextChanged(editable)
+
+    assertEquals("$5.00", editable.toString())
+  }
+
+  @Test
+  fun `Given USD, when I enter 5dot000, then I expect successful filter`() {
+    val testSubject = Boost.MoneyFilter(yen)
+    val editable = SpannableStringBuilder("5.000")
+    val dest = SpannableStringBuilder()
+
+    testSubject.afterTextChanged(editable)
+    val filterResult = testSubject.filter(editable, 0, editable.length, dest, 0, 0)
+
+    assertNull(filterResult)
+  }
+
+  @Test
+  fun `Given USD, when I enter 5dot, then I expect successful filter`() {
+    val testSubject = Boost.MoneyFilter(usd)
+    val editable = SpannableStringBuilder("5.")
+    val dest = SpannableStringBuilder()
+
+    testSubject.afterTextChanged(editable)
+    val filterResult = testSubject.filter(editable, 0, editable.length, dest, 0, 0)
+
+    assertNull(filterResult)
+  }
+
+  @Test
+  fun `Given JPY, when I enter 5, then I expect yen 5`() {
+    val testSubject = Boost.MoneyFilter(yen)
+    val editable = SpannableStringBuilder("5")
+
+    testSubject.afterTextChanged(editable)
+
+    assertEquals("¥5", editable.toString())
+  }
+
+  @Test
+  fun `Given JPY, when I enter 5, then I expect 5 from text change`() {
+    var result = ""
+    val testSubject = Boost.MoneyFilter(yen) {
+      result = it
+    }
+
+    val editable = SpannableStringBuilder("5")
+
+    testSubject.afterTextChanged(editable)
+
+    assertEquals("5", result)
+  }
+
+  @Test
+  fun `Given JPY, when I enter 5, then I expect successful filter`() {
+    val testSubject = Boost.MoneyFilter(yen)
+    val editable = SpannableStringBuilder("5")
+    val dest = SpannableStringBuilder()
+
+    testSubject.afterTextChanged(editable)
+    val filterResult = testSubject.filter(editable, 0, editable.length, dest, 0, 0)
+
+    assertNull(filterResult)
+  }
+
+  @Test
+  fun `Given JPY, when I enter 5dot, then I expect unsuccessful filter`() {
+    val testSubject = Boost.MoneyFilter(yen)
+    val editable = SpannableStringBuilder("¥5.")
+    val dest = SpannableStringBuilder()
+
+    testSubject.afterTextChanged(editable)
+    val filterResult = testSubject.filter(editable, 0, editable.length, dest, 0, 0)
+
+    assertNotNull(filterResult)
+  }
+
+  @Test
+  fun `Given MR and INR, when I enter 5dot55, then I expect localized`() {
+    Locale.setDefault(Locale.forLanguageTag("mr"))
+
+    val testSubject = Boost.MoneyFilter(inr)
+    val editable = SpannableStringBuilder("5.55")
+
+    testSubject.afterTextChanged(editable)
+
+    assertEquals("₹५.५५", editable.toString())
+  }
+
+  @Test
+  fun `Given MR and INR, when I enter dot, then I expect it to be retained in output`() {
+    Locale.setDefault(Locale.forLanguageTag("mr"))
+
+    val testSubject = Boost.MoneyFilter(inr)
+    val editable = SpannableStringBuilder("₹५.")
+
+    testSubject.afterTextChanged(editable)
+
+    assertEquals("₹५.", editable.toString())
+  }
+
+  @Test
+  fun `Given RTL indicator, when I enter five, then I expect successful match`() {
+    val testSubject = Boost.MoneyFilter(yen)
+    val editable = SpannableStringBuilder("\u200F5")
+    val dest = SpannableStringBuilder()
+
+    testSubject.afterTextChanged(editable)
+    val filterResult = testSubject.filter(editable, 0, editable.length, dest, 0, 0)
+
+    assertNull(filterResult)
+  }
+
+  @Test
+  fun `Given USD, when I enter 1dot05, then I expect 1dot05`() {
+    var result = ""
+    val testSubject = Boost.MoneyFilter(usd) {
+      result = it
+    }
+
+    val editable = SpannableStringBuilder("$1.05")
+    testSubject.afterTextChanged(editable)
+
+    assertEquals("1.05", result)
+  }
+
+  @Test
+  fun `Given USD, when I enter 0dot05, then I expect 0dot05`() {
+    var result = ""
+    val testSubject = Boost.MoneyFilter(usd) {
+      result = it
+    }
+
+    val editable = SpannableStringBuilder("$0.05")
+    testSubject.afterTextChanged(editable)
+
+    assertEquals("0.05", result)
+  }
+
+  @Test
+  fun `Given USD, when I enter dot1, then I expect 0dot1`() {
+    var result = ""
+    val testSubject = Boost.MoneyFilter(usd) {
+      result = it
+    }
+
+    val editable = SpannableStringBuilder("$.1")
+    testSubject.afterTextChanged(editable)
+
+    assertEquals("0.1", result)
+  }
+
+  @Test
+  fun `Given USD, when I enter dot0, then I expect 0dot0`() {
+    var result = ""
+    val testSubject = Boost.MoneyFilter(usd) {
+      result = it
+    }
+
+    val editable = SpannableStringBuilder(".0")
+    testSubject.afterTextChanged(editable)
+
+    assertEquals("0.0", result)
+  }
+}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyViewModel__CurrencyComparatorTest.kt b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyViewModel__CurrencyComparatorTest.kt
new file mode 100644
index 0000000000..0b0de640c4
--- /dev/null
+++ b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/currency/SetCurrencyViewModel__CurrencyComparatorTest.kt
@@ -0,0 +1,79 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.currency
+
+import junit.framework.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import java.util.Currency
+
+@Suppress("ClassName")
+@RunWith(JUnit4::class)
+class SetCurrencyViewModel__CurrencyComparatorTest {
+
+  private val currencyComparator = SetCurrencyViewModel.CurrencyComparator(listOf("AUD", "EUR", "CAD"))
+
+  @Test
+  fun givenAListOfCurrencies_whenISort_thenIExpectTheProperOrder() {
+    // GIVEN
+    val currencies = listOf("EUR", "AUD", "JPY", "USD", "CAD", "BWP", "BIF").map { Currency.getInstance(it) }
+    val expected = listOf("USD", "AUD", "CAD", "EUR", "BWP", "BIF", "JPY").map { Currency.getInstance(it) }
+
+    // WHEN
+    val sorted: List<Currency> = currencies.sortedWith(currencyComparator)
+
+    // THEN
+    assertEquals(expected, sorted)
+  }
+
+  @Test
+  fun givenUSDAndADefaultCurrency_whenISort_thenIExpectUSDFirst() {
+    // GIVEN
+    val currencies = listOf("EUR", "USD").map { Currency.getInstance(it) }
+    val expected = listOf("USD", "EUR").map { Currency.getInstance(it) }
+
+    // WHEN
+    val sorted: List<Currency> = currencies.sortedWith(currencyComparator)
+
+    // THEN
+    assertEquals(expected, sorted)
+  }
+
+  @Test
+  fun givenADefaultCurrencyAndANonDefaultCurrency_whenISort_thenIExpectUSDFirst() {
+    // GIVEN
+    val currencies = listOf("JPY", "EUR").map { Currency.getInstance(it) }
+    val expected = listOf("EUR", "JPY").map { Currency.getInstance(it) }
+
+    // WHEN
+    val sorted: List<Currency> = currencies.sortedWith(currencyComparator)
+
+    // THEN
+    assertEquals(expected, sorted)
+  }
+
+  @Test
+  fun givenTwoDefaultCurrencies_whenISort_thenIExpectOrderedByDisplayName() {
+    // GIVEN
+    val currencies = listOf("EUR", "AUD").map { Currency.getInstance(it) }
+    val expected = listOf("AUD", "EUR").map { Currency.getInstance(it) }
+
+    // WHEN
+    val sorted = currencies.sortedWith(currencyComparator)
+
+    // THEN
+    assertEquals(expected, sorted)
+  }
+
+  @Test
+  fun givenTwoNonDefaultCurrencies_whenISort_thenIExpectOrderedByDisplayName() {
+    // GIVEN
+    val currencies = listOf("XPF", "BIF").map { Currency.getInstance(it) }
+    val expected = listOf("BIF", "XPF").map { Currency.getInstance(it) }
+
+    // WHEN
+    val sorted = currencies.sortedWith(currencyComparator)
+
+    // THEN
+    assertEquals(expected, sorted)
+  }
+}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardCodeValidatorTest.kt b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardCodeValidatorTest.kt
new file mode 100644
index 0000000000..b9a1376e1f
--- /dev/null
+++ b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardCodeValidatorTest.kt
@@ -0,0 +1,65 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import android.app.Application
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.ParameterizedRobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(ParameterizedRobolectricTestRunner::class)
+@Config(application = Application::class)
+class CreditCardCodeValidatorTest(
+  private val code: String,
+  private val cardType: CreditCardType,
+  private val isFocused: Boolean,
+  private val validity: CreditCardCodeValidator.Validity
+) {
+
+  @Test
+  fun getValidity() {
+    assertEquals(validity, CreditCardCodeValidator.getValidity(code, cardType, isFocused))
+  }
+
+  companion object {
+    @JvmStatic
+    @ParameterizedRobolectricTestRunner.Parameters(name = "{index}: getValidity(..) = {0}, {1}, {2}, {3}")
+    fun data(): Iterable<Array<Any>> = arrayListOf(
+      // Unfocused
+      arrayOf("", CreditCardType.UNIONPAY, false, CreditCardCodeValidator.Validity.POTENTIALLY_VALID),
+      arrayOf("1", CreditCardType.UNIONPAY, false, CreditCardCodeValidator.Validity.TOO_SHORT),
+      arrayOf("12", CreditCardType.UNIONPAY, false, CreditCardCodeValidator.Validity.TOO_SHORT),
+      arrayOf("123", CreditCardType.UNIONPAY, false, CreditCardCodeValidator.Validity.FULLY_VALID),
+      arrayOf("1234", CreditCardType.UNIONPAY, false, CreditCardCodeValidator.Validity.TOO_LONG),
+      arrayOf("", CreditCardType.OTHER, false, CreditCardCodeValidator.Validity.POTENTIALLY_VALID),
+      arrayOf("1", CreditCardType.OTHER, false, CreditCardCodeValidator.Validity.TOO_SHORT),
+      arrayOf("12", CreditCardType.OTHER, false, CreditCardCodeValidator.Validity.TOO_SHORT),
+      arrayOf("123", CreditCardType.OTHER, false, CreditCardCodeValidator.Validity.FULLY_VALID),
+      arrayOf("1234", CreditCardType.OTHER, false, CreditCardCodeValidator.Validity.TOO_LONG),
+      arrayOf("", CreditCardType.AMERICAN_EXPRESS, false, CreditCardCodeValidator.Validity.POTENTIALLY_VALID),
+      arrayOf("1", CreditCardType.AMERICAN_EXPRESS, false, CreditCardCodeValidator.Validity.TOO_SHORT),
+      arrayOf("12", CreditCardType.AMERICAN_EXPRESS, false, CreditCardCodeValidator.Validity.TOO_SHORT),
+      arrayOf("123", CreditCardType.AMERICAN_EXPRESS, false, CreditCardCodeValidator.Validity.TOO_SHORT),
+      arrayOf("1234", CreditCardType.AMERICAN_EXPRESS, false, CreditCardCodeValidator.Validity.FULLY_VALID),
+      arrayOf("12345", CreditCardType.AMERICAN_EXPRESS, false, CreditCardCodeValidator.Validity.TOO_LONG),
+
+      // Focused
+      arrayOf("", CreditCardType.UNIONPAY, true, CreditCardCodeValidator.Validity.POTENTIALLY_VALID),
+      arrayOf("1", CreditCardType.UNIONPAY, true, CreditCardCodeValidator.Validity.POTENTIALLY_VALID),
+      arrayOf("12", CreditCardType.UNIONPAY, true, CreditCardCodeValidator.Validity.POTENTIALLY_VALID),
+      arrayOf("123", CreditCardType.UNIONPAY, true, CreditCardCodeValidator.Validity.FULLY_VALID),
+      arrayOf("1234", CreditCardType.UNIONPAY, true, CreditCardCodeValidator.Validity.TOO_LONG),
+      arrayOf("", CreditCardType.OTHER, true, CreditCardCodeValidator.Validity.POTENTIALLY_VALID),
+      arrayOf("1", CreditCardType.OTHER, true, CreditCardCodeValidator.Validity.POTENTIALLY_VALID),
+      arrayOf("12", CreditCardType.OTHER, true, CreditCardCodeValidator.Validity.POTENTIALLY_VALID),
+      arrayOf("123", CreditCardType.OTHER, true, CreditCardCodeValidator.Validity.FULLY_VALID),
+      arrayOf("1234", CreditCardType.OTHER, true, CreditCardCodeValidator.Validity.TOO_LONG),
+      arrayOf("", CreditCardType.AMERICAN_EXPRESS, true, CreditCardCodeValidator.Validity.POTENTIALLY_VALID),
+      arrayOf("1", CreditCardType.AMERICAN_EXPRESS, true, CreditCardCodeValidator.Validity.POTENTIALLY_VALID),
+      arrayOf("12", CreditCardType.AMERICAN_EXPRESS, true, CreditCardCodeValidator.Validity.POTENTIALLY_VALID),
+      arrayOf("123", CreditCardType.AMERICAN_EXPRESS, true, CreditCardCodeValidator.Validity.POTENTIALLY_VALID),
+      arrayOf("1234", CreditCardType.AMERICAN_EXPRESS, true, CreditCardCodeValidator.Validity.FULLY_VALID),
+      arrayOf("12345", CreditCardType.AMERICAN_EXPRESS, true, CreditCardCodeValidator.Validity.TOO_LONG)
+    )
+  }
+}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardExpirationTextWatcherBackspaceTest.kt b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardExpirationTextWatcherBackspaceTest.kt
new file mode 100644
index 0000000000..277c120f89
--- /dev/null
+++ b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardExpirationTextWatcherBackspaceTest.kt
@@ -0,0 +1,39 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import android.app.Application
+import android.text.Editable
+import android.text.SpannableStringBuilder
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.ParameterizedRobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(ParameterizedRobolectricTestRunner::class)
+@Config(application = Application::class)
+class CreditCardExpirationTextWatcherBackspaceTest(
+  private val beforeBackspace: String,
+  private val textWatcherOutput: String
+) {
+
+  private val testSubject = CreditCardExpirationTextWatcher()
+
+  @Test
+  fun getTextWatcherOutput() {
+    val editable: Editable = SpannableStringBuilder(beforeBackspace.dropLast(1))
+    testSubject.onTextChanged(null, 0, 0, 0)
+    testSubject.afterTextChanged(editable)
+    assertEquals(textWatcherOutput, editable.toString())
+  }
+
+  companion object {
+    @JvmStatic
+    @ParameterizedRobolectricTestRunner.Parameters(name = "{index}: getTextWatcherOutput(..) = {0}, {1}")
+    fun data(): Iterable<Array<Any>> = arrayListOf(
+      arrayOf("12/23", "12/2"),
+      arrayOf("12/2", "12/"),
+      arrayOf("12/", "1"),
+      arrayOf("1", "")
+    )
+  }
+}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardExpirationTextWatcherTest.kt b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardExpirationTextWatcherTest.kt
new file mode 100644
index 0000000000..1a8bc37f82
--- /dev/null
+++ b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardExpirationTextWatcherTest.kt
@@ -0,0 +1,42 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import android.app.Application
+import android.text.Editable
+import android.text.SpannableStringBuilder
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.ParameterizedRobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(ParameterizedRobolectricTestRunner::class)
+@Config(application = Application::class)
+class CreditCardExpirationTextWatcherTest(
+  private val userInput: String,
+  private val textWatcherOutput: String
+) {
+
+  private val testSubject = CreditCardExpirationTextWatcher()
+
+  @Test
+  fun getTextWatcherOutput() {
+    val editable: Editable = SpannableStringBuilder(userInput)
+    testSubject.afterTextChanged(editable)
+    assertEquals(textWatcherOutput, editable.toString())
+  }
+
+  companion object {
+    @JvmStatic
+    @ParameterizedRobolectricTestRunner.Parameters(name = "{index}: getTextWatcherOutput(..) = {0}, {1}")
+    fun data(): Iterable<Array<Any>> = arrayListOf(
+      arrayOf("0", "0"),
+      arrayOf("1", "1"),
+      arrayOf("12", "12/"),
+      arrayOf("02", "02/"),
+      arrayOf("2", "02/"),
+      arrayOf("12/", "12/"),
+      arrayOf("12/1", "12/1"),
+      arrayOf("15", "15")
+    )
+  }
+}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardExpirationValidatorTest.kt b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardExpirationValidatorTest.kt
new file mode 100644
index 0000000000..e88c05110b
--- /dev/null
+++ b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardExpirationValidatorTest.kt
@@ -0,0 +1,105 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import android.app.Application
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.ParameterizedRobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(ParameterizedRobolectricTestRunner::class)
+@Config(application = Application::class)
+class CreditCardExpirationValidatorTest(
+  private val creditCardExpiration: CreditCardExpiration,
+  private val currentYear: Int,
+  private val isFocused: Boolean,
+  private val validity: CreditCardExpirationValidator.Validity
+) {
+
+  @Test
+  fun getValidity() {
+    assertEquals(validity, CreditCardExpirationValidator.getValidity(creditCardExpiration, 3, currentYear, isFocused))
+  }
+
+  companion object {
+    @JvmStatic
+    @ParameterizedRobolectricTestRunner.Parameters(name = "{index}: getValidity(..) = {0}, {1}, {2}, {3}, {4}")
+    fun data(): Iterable<Array<Any>> = arrayListOf(
+      // Unfocused
+      arrayOf(CreditCardExpiration("", ""), 2020, false, CreditCardExpirationValidator.Validity.POTENTIALLY_VALID),
+      arrayOf(CreditCardExpiration("0", ""), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MONTH),
+      arrayOf(CreditCardExpiration("1", ""), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MISSING_YEAR),
+      arrayOf(CreditCardExpiration("9", ""), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MISSING_YEAR),
+      arrayOf(CreditCardExpiration("01", ""), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MISSING_YEAR),
+      arrayOf(CreditCardExpiration("09", ""), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MISSING_YEAR),
+      arrayOf(CreditCardExpiration("12", ""), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MISSING_YEAR),
+      arrayOf(CreditCardExpiration("", "0"), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MONTH),
+      arrayOf(CreditCardExpiration("", "1"), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MONTH),
+      arrayOf(CreditCardExpiration("", "9"), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MONTH),
+      arrayOf(CreditCardExpiration("", "00"), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MONTH),
+      arrayOf(CreditCardExpiration("", "01"), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MONTH),
+      arrayOf(CreditCardExpiration("", "99"), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MONTH),
+      arrayOf(CreditCardExpiration("3", "20"), 2020, false, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("03", "20"), 2020, false, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("4", "20"), 2020, false, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("12", "20"), 2020, false, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("3", "21"), 2020, false, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("3", "40"), 2020, false, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("2", "20"), 2020, false, CreditCardExpirationValidator.Validity.INVALID_EXPIRED),
+      arrayOf(CreditCardExpiration("3", "41"), 2020, false, CreditCardExpirationValidator.Validity.INVALID_EXPIRED),
+      arrayOf(CreditCardExpiration("3", "41"), 2021, false, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("01", "99"), 2098, false, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("03", "00"), 2099, false, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("04", "00"), 2099, false, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("03", "19"), 2099, false, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("12", "19"), 2099, false, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("00", "20"), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MONTH),
+      arrayOf(CreditCardExpiration("X", ""), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MONTH),
+      arrayOf(CreditCardExpiration("1X", ""), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MONTH),
+      arrayOf(CreditCardExpiration("123", ""), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MONTH),
+      arrayOf(CreditCardExpiration("", "X"), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MONTH),
+      arrayOf(CreditCardExpiration("", "2X"), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MONTH),
+      arrayOf(CreditCardExpiration("", "202"), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MONTH),
+      arrayOf(CreditCardExpiration("", "2020"), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MONTH),
+      arrayOf(CreditCardExpiration("X", "X"), 2020, false, CreditCardExpirationValidator.Validity.INVALID_MONTH),
+
+      // Focused
+      arrayOf(CreditCardExpiration("", ""), 2020, true, CreditCardExpirationValidator.Validity.POTENTIALLY_VALID),
+      arrayOf(CreditCardExpiration("0", ""), 2020, true, CreditCardExpirationValidator.Validity.POTENTIALLY_VALID),
+      arrayOf(CreditCardExpiration("1", ""), 2020, true, CreditCardExpirationValidator.Validity.POTENTIALLY_VALID),
+      arrayOf(CreditCardExpiration("9", ""), 2020, true, CreditCardExpirationValidator.Validity.POTENTIALLY_VALID),
+      arrayOf(CreditCardExpiration("01", ""), 2020, true, CreditCardExpirationValidator.Validity.POTENTIALLY_VALID),
+      arrayOf(CreditCardExpiration("09", ""), 2020, true, CreditCardExpirationValidator.Validity.POTENTIALLY_VALID),
+      arrayOf(CreditCardExpiration("12", ""), 2020, true, CreditCardExpirationValidator.Validity.POTENTIALLY_VALID),
+      arrayOf(CreditCardExpiration("", "0"), 2020, true, CreditCardExpirationValidator.Validity.POTENTIALLY_VALID),
+      arrayOf(CreditCardExpiration("", "1"), 2020, true, CreditCardExpirationValidator.Validity.POTENTIALLY_VALID),
+      arrayOf(CreditCardExpiration("", "9"), 2020, true, CreditCardExpirationValidator.Validity.POTENTIALLY_VALID),
+      arrayOf(CreditCardExpiration("", "00"), 2020, true, CreditCardExpirationValidator.Validity.POTENTIALLY_VALID),
+      arrayOf(CreditCardExpiration("", "01"), 2020, true, CreditCardExpirationValidator.Validity.POTENTIALLY_VALID),
+      arrayOf(CreditCardExpiration("", "99"), 2020, true, CreditCardExpirationValidator.Validity.POTENTIALLY_VALID),
+      arrayOf(CreditCardExpiration("3", "20"), 2020, true, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("03", "20"), 2020, true, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("4", "20"), 2020, true, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("12", "20"), 2020, true, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("3", "21"), 2020, true, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("3", "40"), 2020, true, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("2", "20"), 2020, true, CreditCardExpirationValidator.Validity.INVALID_EXPIRED),
+      arrayOf(CreditCardExpiration("3", "41"), 2020, true, CreditCardExpirationValidator.Validity.INVALID_EXPIRED),
+      arrayOf(CreditCardExpiration("3", "41"), 2021, true, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("01", "99"), 2098, true, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("03", "00"), 2099, true, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("04", "00"), 2099, true, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("03", "19"), 2099, true, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("12", "19"), 2099, true, CreditCardExpirationValidator.Validity.FULLY_VALID),
+      arrayOf(CreditCardExpiration("00", "20"), 2020, true, CreditCardExpirationValidator.Validity.INVALID_MONTH),
+      arrayOf(CreditCardExpiration("X", ""), 2020, true, CreditCardExpirationValidator.Validity.INVALID_MONTH),
+      arrayOf(CreditCardExpiration("1X", ""), 2020, true, CreditCardExpirationValidator.Validity.INVALID_MONTH),
+      arrayOf(CreditCardExpiration("123", ""), 2020, true, CreditCardExpirationValidator.Validity.INVALID_MONTH),
+      arrayOf(CreditCardExpiration("", "X"), 2020, true, CreditCardExpirationValidator.Validity.INVALID_YEAR),
+      arrayOf(CreditCardExpiration("", "2X"), 2020, true, CreditCardExpirationValidator.Validity.INVALID_YEAR),
+      arrayOf(CreditCardExpiration("", "202"), 2020, true, CreditCardExpirationValidator.Validity.INVALID_YEAR),
+      arrayOf(CreditCardExpiration("", "2020"), 2020, true, CreditCardExpirationValidator.Validity.INVALID_YEAR),
+      arrayOf(CreditCardExpiration("X", "X"), 2020, true, CreditCardExpirationValidator.Validity.INVALID_MONTH)
+    )
+  }
+}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardNumberValidatorTest.kt b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardNumberValidatorTest.kt
new file mode 100644
index 0000000000..1884387035
--- /dev/null
+++ b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardNumberValidatorTest.kt
@@ -0,0 +1,43 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import android.app.Application
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.ParameterizedRobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(ParameterizedRobolectricTestRunner::class)
+@Config(application = Application::class)
+class CreditCardNumberValidatorTest(
+  private val creditCardNumber: String,
+  private val creditCardNumberFieldFocused: Boolean,
+  private val validity: CreditCardNumberValidator.Validity
+) {
+
+  @Test
+  fun getValidity() {
+    assertEquals(validity, CreditCardNumberValidator.getValidity(creditCardNumber, creditCardNumberFieldFocused))
+  }
+
+  companion object {
+    @JvmStatic
+    @ParameterizedRobolectricTestRunner.Parameters(name = "{index}: getValidity(..) = {0}, {1}, {2}")
+    fun data(): Iterable<Array<Any>> = arrayListOf(
+      arrayOf("", false, CreditCardNumberValidator.Validity.POTENTIALLY_VALID),
+      arrayOf("4", false, CreditCardNumberValidator.Validity.POTENTIALLY_VALID),
+      arrayOf("42", false, CreditCardNumberValidator.Validity.POTENTIALLY_VALID),
+      arrayOf("42424242424", false, CreditCardNumberValidator.Validity.POTENTIALLY_VALID),
+      arrayOf("424242424242", false, CreditCardNumberValidator.Validity.FULLY_VALID),
+      arrayOf("424242424242424242", false, CreditCardNumberValidator.Validity.FULLY_VALID),
+      arrayOf("4242424242424", false, CreditCardNumberValidator.Validity.INVALID),
+      arrayOf("4242424242424", true, CreditCardNumberValidator.Validity.POTENTIALLY_VALID),
+      arrayOf("6200000000000004", false, CreditCardNumberValidator.Validity.FULLY_VALID),
+      arrayOf("6200000000000005", false, CreditCardNumberValidator.Validity.FULLY_VALID),
+      arrayOf("42424242424242424242", false, CreditCardNumberValidator.Validity.INVALID),
+      arrayOf("X", false, CreditCardNumberValidator.Validity.INVALID),
+      arrayOf("42X", false, CreditCardNumberValidator.Validity.INVALID),
+      arrayOf("424242424242X", false, CreditCardNumberValidator.Validity.INVALID)
+    )
+  }
+}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTextWatcherBackspaceTest.kt b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTextWatcherBackspaceTest.kt
new file mode 100644
index 0000000000..9beadd9d04
--- /dev/null
+++ b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTextWatcherBackspaceTest.kt
@@ -0,0 +1,37 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import android.app.Application
+import android.text.Editable
+import android.text.SpannableStringBuilder
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.ParameterizedRobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(ParameterizedRobolectricTestRunner::class)
+@Config(application = Application::class)
+class CreditCardTextWatcherBackspaceTest(
+  private val beforeBackspace: String,
+  private val textWatcherOutput: String
+) {
+
+  private val testSubject = CreditCardTextWatcher()
+
+  @Test
+  fun getTextWatcherOutput() {
+    val editable: Editable = SpannableStringBuilder(beforeBackspace.dropLast(1))
+    testSubject.onTextChanged(null, 0, 0, 0)
+    testSubject.afterTextChanged(editable)
+    assertEquals(textWatcherOutput, editable.toString())
+  }
+
+  companion object {
+    @JvmStatic
+    @ParameterizedRobolectricTestRunner.Parameters(name = "{index}: getTextWatcherOutput(..) = {0}, {1}")
+    fun data(): Iterable<Array<Any>> = arrayListOf(
+      arrayOf("1234 ", "123"),
+      arrayOf("1234 5", "1234 ")
+    )
+  }
+}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTextWatcherTest.kt b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTextWatcherTest.kt
new file mode 100644
index 0000000000..dea462186a
--- /dev/null
+++ b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTextWatcherTest.kt
@@ -0,0 +1,59 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import android.app.Application
+import android.text.Editable
+import android.text.SpannableStringBuilder
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.ParameterizedRobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(ParameterizedRobolectricTestRunner::class)
+@Config(application = Application::class)
+class CreditCardTextWatcherTest(
+  private val userInput: String,
+  private val textWatcherOutput: String
+) {
+
+  private val testSubject = CreditCardTextWatcher()
+
+  @Test
+  fun getTextWatcherOutput() {
+    val editable: Editable = SpannableStringBuilder(userInput)
+    testSubject.afterTextChanged(editable)
+    assertEquals(textWatcherOutput, editable.toString())
+  }
+
+  companion object {
+    @JvmStatic
+    @ParameterizedRobolectricTestRunner.Parameters(name = "{index}: getTextWatcherOutput(..) = {0}, {1}")
+    fun data(): Iterable<Array<Any>> = arrayListOf(
+      // AMEX
+      arrayOf("340", "340"),
+      arrayOf("3400", "3400 "),
+      arrayOf("34000", "3400 0"),
+      arrayOf("3400000000", "3400 000000 "),
+      arrayOf("34000000000", "3400 000000 0"),
+      arrayOf("340000000000000", "3400 000000 00000"),
+      // UNIONPAY
+      arrayOf("620", "620"),
+      arrayOf("6200", "6200 "),
+      arrayOf("62000", "6200 0"),
+      arrayOf("6200000000", "6200 0000 00"),
+      arrayOf("6200000000000", "6200 0000 00000"),
+      arrayOf("620000000000000", "6200 0000 0000 000"),
+      arrayOf("6200000000000000", "6200 0000 0000 0000"),
+      arrayOf("62000000000000000", "62000 00000 00000 00"),
+      // OTHER
+      arrayOf("550", "550"),
+      arrayOf("5500", "5500 "),
+      arrayOf("55000", "5500 0"),
+      arrayOf("5500000000", "5500 0000 00"),
+      arrayOf("55000000000", "5500 0000 000"),
+      arrayOf("550000000000000", "5500 0000 0000 000"),
+      arrayOf("5500000000000000", "5500 0000 0000 0000"),
+      arrayOf("55000000000000000", "55000 00000 00000 00")
+    )
+  }
+}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTypeTest.kt b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTypeTest.kt
new file mode 100644
index 0000000000..8567a5d37d
--- /dev/null
+++ b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardTypeTest.kt
@@ -0,0 +1,44 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+
+@RunWith(Parameterized::class)
+class CreditCardTypeTest(
+  private val creditCardNumber: String,
+  private val creditCardType: CreditCardType
+) {
+
+  @Test
+  fun fromCardNumber() {
+    assertEquals(creditCardType, CreditCardType.fromCardNumber(cardNumber = creditCardNumber))
+  }
+
+  companion object {
+    @JvmStatic
+    @Parameterized.Parameters(name = "{index}: fromCardNumber(..) = {0}, {1}")
+    fun data(): Iterable<Array<Any>> = arrayListOf(
+      arrayOf("34", CreditCardType.AMERICAN_EXPRESS),
+      arrayOf("37", CreditCardType.AMERICAN_EXPRESS),
+      arrayOf("343452000000306", CreditCardType.AMERICAN_EXPRESS),
+      arrayOf("371449635398431", CreditCardType.AMERICAN_EXPRESS),
+      arrayOf("378282246310005", CreditCardType.AMERICAN_EXPRESS),
+      arrayOf("62", CreditCardType.UNIONPAY),
+      arrayOf("81", CreditCardType.UNIONPAY),
+      arrayOf("6200000000000004", CreditCardType.UNIONPAY),
+      arrayOf("", CreditCardType.OTHER),
+      arrayOf("X", CreditCardType.OTHER),
+      arrayOf("4", CreditCardType.OTHER),
+      arrayOf("4111111111111111", CreditCardType.OTHER),
+      arrayOf("4242424242424242", CreditCardType.OTHER),
+      arrayOf("5555555555554444", CreditCardType.OTHER),
+      arrayOf("5555555555554444", CreditCardType.OTHER),
+      arrayOf("2223003122003222", CreditCardType.OTHER),
+      arrayOf("6011111111111117", CreditCardType.OTHER),
+      arrayOf("3056930009020004", CreditCardType.OTHER),
+      arrayOf("3566002020360505", CreditCardType.OTHER)
+    )
+  }
+}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalConfirmationResultTest.kt b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalConfirmationResultTest.kt
new file mode 100644
index 0000000000..f309c7347b
--- /dev/null
+++ b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/paypal/PayPalConfirmationResultTest.kt
@@ -0,0 +1,40 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.paypal
+
+import android.app.Application
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.thoughtcrime.securesms.components.settings.app.subscription.PayPalRepository
+
+@RunWith(RobolectricTestRunner::class)
+@Config(application = Application::class)
+class PayPalConfirmationResultTest {
+
+  companion object {
+    private val PAYER_ID = "asdf"
+    private val PAYMENT_TOKEN = "dfgh"
+
+    private val TEST_URL = "${PayPalRepository.ONE_TIME_RETURN_URL}?PayerID=$PAYER_ID&token=$PAYMENT_TOKEN"
+    private val TEST_MISSING_PARAM_URL = "${PayPalRepository.ONE_TIME_RETURN_URL}?token=$PAYMENT_TOKEN"
+  }
+
+  @Test
+  fun givenATestUrl_whenIFromUri_thenIExpectCorrectResult() {
+    val result = PayPalConfirmationResult.fromUrl(TEST_URL)
+
+    assertEquals(
+      PayPalConfirmationResult(PAYER_ID, null, PAYMENT_TOKEN),
+      result
+    )
+  }
+
+  @Test
+  fun givenATestUrlWithMissingField_whenIFromUri_thenIExpectNull() {
+    val result = PayPalConfirmationResult.fromUrl(TEST_MISSING_PARAM_URL)
+
+    assertNull(result)
+  }
+}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/IBANValidatorTest.kt b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/IBANValidatorTest.kt
new file mode 100644
index 0000000000..bf927277f0
--- /dev/null
+++ b/app/src/test/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/transfer/details/IBANValidatorTest.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.details
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class IBANValidatorTest {
+  companion object {
+    private const val VALID_IBAN = "GB82WEST12345698765432"
+    private const val INVALID_IBAN = "GB82WEST12335698765432"
+    private const val INVALID_COUNTRY = "US82WEST12335698765432"
+  }
+
+  @Test
+  fun `Given a blank IBAN, when I validate, then I expect POTENTIALLY_VALID`() {
+    val actual = IBANValidator.validate("", false)
+
+    assertEquals(IBANValidator.Validity.POTENTIALLY_VALID, actual)
+  }
+
+  @Test
+  fun `Given a valid IBAN, when I validate, then I expect COMPLETELY_VALID`() {
+    val actual = IBANValidator.validate(VALID_IBAN, false)
+
+    assertEquals(IBANValidator.Validity.COMPLETELY_VALID, actual)
+  }
+
+  @Test
+  fun `Given an invalid IBAN, when I validate, then I expect INVALID_MOD_97`() {
+    val actual = IBANValidator.validate(INVALID_IBAN, false)
+
+    assertEquals(IBANValidator.Validity.INVALID_MOD_97, actual)
+  }
+
+  @Test
+  fun `Given an invalid country, when I validate, then I expect INVALID_COUNTRY`() {
+    val actual = IBANValidator.validate(INVALID_COUNTRY, false)
+
+    assertEquals(IBANValidator.Validity.INVALID_COUNTRY, actual)
+  }
+
+  @Test
+  fun `Given too short and not focused, when I validate, then I expect TOO_SHORT`() {
+    val actual = IBANValidator.validate(VALID_IBAN.dropLast(5), false)
+
+    assertEquals(IBANValidator.Validity.TOO_SHORT, actual)
+  }
+
+  @Test
+  fun `Given too short and focused, when I validate, then I expect POTENTIALLY_VALID`() {
+    val actual = IBANValidator.validate(VALID_IBAN.dropLast(5), true)
+
+    assertEquals(IBANValidator.Validity.POTENTIALLY_VALID, actual)
+  }
+
+  @Test
+  fun `Given too long, when I validate, then I expect TOO_LONG`() {
+    val actual = IBANValidator.validate(VALID_IBAN + "A", false)
+
+    assertEquals(IBANValidator.Validity.TOO_LONG, actual)
+  }
+}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/conversationlist/UnarchivedConversationListDataSourceTest.java b/app/src/test/java/org/thoughtcrime/securesms/conversationlist/UnarchivedConversationListDataSourceTest.java
index 6f37b52d13..6530c5ffd1 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/conversationlist/UnarchivedConversationListDataSourceTest.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/conversationlist/UnarchivedConversationListDataSourceTest.java
@@ -18,7 +18,7 @@
 import org.thoughtcrime.securesms.database.DatabaseObserver;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.ThreadTable;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -38,7 +38,7 @@ public class UnarchivedConversationListDataSourceTest {
   public MockitoRule rule = MockitoJUnit.rule();
 
   @Mock
-  private MockedStatic<ApplicationDependencies> applicationDependenciesMockedStatic;
+  private MockedStatic<AppDependencies> applicationDependenciesMockedStatic;
 
   @Mock
   private MockedStatic<SignalDatabase> signalDatabaseMockedStatic;
@@ -52,7 +52,7 @@ public void setUp() {
     threadTable = mock(ThreadTable.class);
 
     when(SignalDatabase.threads()).thenReturn(threadTable);
-    when(ApplicationDependencies.getDatabaseObserver()).thenReturn(mock(DatabaseObserver.class));
+    when(AppDependencies.getDatabaseObserver()).thenReturn(mock(DatabaseObserver.class));
 
     testSubject = new ConversationListDataSource.UnarchivedConversationListDataSource(ConversationFilter.OFF, false);
   }
diff --git a/app/src/test/java/org/thoughtcrime/securesms/database/GroupTestUtil.kt b/app/src/test/java/org/thoughtcrime/securesms/database/GroupTestUtil.kt
index 56aa4bca63..e69d878c80 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/database/GroupTestUtil.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/database/GroupTestUtil.kt
@@ -16,7 +16,7 @@ import org.signal.storageservice.protos.groups.local.EnabledState
 import org.thoughtcrime.securesms.database.model.GroupRecord
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupHistoryEntry
+import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupChangeLog
 import org.whispersystems.signalservice.api.groupsv2.GroupHistoryPage
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations
 import org.whispersystems.signalservice.api.push.DistributionId
@@ -67,7 +67,7 @@ class ChangeSet {
   }
 
   fun toApiResponse(): GroupHistoryPage {
-    return GroupHistoryPage(changeSet.map { DecryptedGroupHistoryEntry(Optional.ofNullable(it.groupSnapshot), Optional.ofNullable(it.groupChange)) }, GroupHistoryPage.PagingData.NONE)
+    return GroupHistoryPage(changeSet.map { DecryptedGroupChangeLog(it.groupSnapshot, it.groupChange) }, null, GroupHistoryPage.PagingData.NONE)
   }
 }
 
@@ -106,6 +106,9 @@ class GroupStateTestData(private val masterKey: GroupMasterKey, private val grou
   var groupChange: GroupChange? = null
   var includeFirst: Boolean = false
   var requestedRevision: Int = 0
+  var expectTableCreate: Boolean = false
+  var expectTableUpdate: Boolean = false
+  var joinedAtRevision: Int? = null
 
   fun localState(
     active: Boolean = true,
@@ -190,7 +193,8 @@ fun groupRecord(
       decryptedGroup.revision,
       decryptedGroup.encode(),
       distributionId,
-      System.currentTimeMillis()
+      System.currentTimeMillis(),
+      0
     )
   )
 }
diff --git a/app/src/test/java/org/thoughtcrime/securesms/database/NotificationProfileDatabaseTest.kt b/app/src/test/java/org/thoughtcrime/securesms/database/NotificationProfileDatabaseTest.kt
index 95fba1d0a3..94a5c0e05e 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/database/NotificationProfileDatabaseTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/database/NotificationProfileDatabaseTest.kt
@@ -15,7 +15,7 @@ import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 import org.thoughtcrime.securesms.conversation.colors.AvatarColor
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.dependencies.MockApplicationDependencyProvider
 import org.thoughtcrime.securesms.notifications.profiles.NotificationProfile
 import org.thoughtcrime.securesms.recipients.RecipientId
@@ -32,12 +32,18 @@ class NotificationProfileDatabaseTest {
   @Before
   fun setup() {
     val sqlCipher = TestDatabaseUtil.inMemoryDatabase {
-      NotificationProfileDatabase.CREATE_TABLE.forEach { println(it); this.execSQL(it) }
-      NotificationProfileDatabase.CREATE_INDEXES.forEach { println(it); this.execSQL(it) }
+      NotificationProfileDatabase.CREATE_TABLE.forEach {
+        println(it)
+        this.execSQL(it)
+      }
+      NotificationProfileDatabase.CREATE_INDEXES.forEach {
+        println(it)
+        this.execSQL(it)
+      }
     }
 
-    if (!ApplicationDependencies.isInitialized()) {
-      ApplicationDependencies.init(ApplicationProvider.getApplicationContext(), MockApplicationDependencyProvider())
+    if (!AppDependencies.isInitialized) {
+      AppDependencies.init(ApplicationProvider.getApplicationContext(), MockApplicationDependencyProvider())
     }
 
     db = sqlCipher.writableDatabase
diff --git a/app/src/test/java/org/thoughtcrime/securesms/database/RecipientDatabaseTestUtils.kt b/app/src/test/java/org/thoughtcrime/securesms/database/RecipientDatabaseTestUtils.kt
index d8500ae85f..749ef4a50a 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/database/RecipientDatabaseTestUtils.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/database/RecipientDatabaseTestUtils.kt
@@ -58,7 +58,7 @@ object RecipientDatabaseTestUtils {
     profileSharing: Boolean = false,
     lastProfileFetch: Long = 0L,
     notificationChannel: String? = null,
-    unidentifiedAccessMode: RecipientTable.UnidentifiedAccessMode = RecipientTable.UnidentifiedAccessMode.UNKNOWN,
+    sealedSenderAccessMode: RecipientTable.SealedSenderAccessMode = RecipientTable.SealedSenderAccessMode.UNKNOWN,
     capabilities: Long = 0L,
     storageId: ByteArray? = null,
     mentionSetting: RecipientTable.MentionSetting = RecipientTable.MentionSetting.ALWAYS_NOTIFY,
@@ -121,10 +121,10 @@ object RecipientDatabaseTestUtils {
       profileSharing = profileSharing,
       lastProfileFetch = lastProfileFetch,
       notificationChannel = notificationChannel,
-      unidentifiedAccessMode = unidentifiedAccessMode,
+      sealedSenderAccessMode = sealedSenderAccessMode,
       capabilities = RecipientRecord.Capabilities(
         rawBits = capabilities,
-        paymentActivation = Recipient.Capability.deserialize(Bitmask.read(capabilities, RecipientTable.Capabilities.PAYMENT_ACTIVATION, RecipientTable.Capabilities.BIT_LENGTH).toInt())
+        deleteSync = Recipient.Capability.deserialize(Bitmask.read(capabilities, RecipientTable.Capabilities.DELETE_SYNC, RecipientTable.Capabilities.BIT_LENGTH).toInt())
       ),
       storageId = storageId,
       mentionSetting = mentionSetting,
diff --git a/app/src/test/java/org/thoughtcrime/securesms/dependencies/MockApplicationDependencyProvider.java b/app/src/test/java/org/thoughtcrime/securesms/dependencies/MockApplicationDependencyProvider.java
index 936249f922..882074387f 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/dependencies/MockApplicationDependencyProvider.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/dependencies/MockApplicationDependencyProvider.java
@@ -3,6 +3,7 @@
 import androidx.annotation.NonNull;
 
 import org.signal.core.util.concurrent.DeadlockDetector;
+import org.signal.libsignal.net.Network;
 import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations;
 import org.signal.libsignal.zkgroup.receipts.ClientZkReceiptOperations;
 import org.thoughtcrime.securesms.components.TypingStatusRepository;
@@ -42,14 +43,13 @@
 import org.whispersystems.signalservice.api.services.DonationsService;
 import org.whispersystems.signalservice.api.services.ProfileService;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
-import org.whispersystems.signalservice.internal.websocket.LibSignalNetwork;
 
 import java.util.function.Supplier;
 
 import static org.mockito.Mockito.mock;
 
 @SuppressWarnings("ConstantConditions")
-public class MockApplicationDependencyProvider implements ApplicationDependencies.Provider {
+public class MockApplicationDependencyProvider implements AppDependencies.Provider {
   @Override
   public @NonNull GroupsV2Operations provideGroupsV2Operations(@NonNull SignalServiceConfiguration signalServiceConfiguration) {
     return null;
@@ -87,7 +87,7 @@ public class MockApplicationDependencyProvider implements ApplicationDependencie
 
   @Override
   public @NonNull JobManager provideJobManager() {
-    return mock(JobManager.class);
+    return null;
   }
 
   @Override
@@ -181,7 +181,7 @@ public class MockApplicationDependencyProvider implements ApplicationDependencie
   }
 
   @Override
-  public @NonNull SignalWebSocket provideSignalWebSocket(@NonNull Supplier<SignalServiceConfiguration> signalServiceConfigurationSupplier, @NonNull Supplier<LibSignalNetwork> libSignalNetworkSupplier) {
+  public @NonNull SignalWebSocket provideSignalWebSocket(@NonNull Supplier<SignalServiceConfiguration> signalServiceConfigurationSupplier, @NonNull Supplier<Network> libSignalNetworkSupplier) {
     return null;
   }
 
@@ -206,7 +206,7 @@ public class MockApplicationDependencyProvider implements ApplicationDependencie
   }
 
   @Override
-  public @NonNull DonationsService provideSignalDonationsService(@NonNull SignalServiceConfiguration signalServiceConfiguration, @NonNull GroupsV2Operations groupsV2Operations) {
+  public @NonNull DonationsService provideDonationsService(@NonNull SignalServiceConfiguration signalServiceConfiguration, @NonNull GroupsV2Operations groupsV2Operations) {
     return null;
   }
 
@@ -235,7 +235,7 @@ public class MockApplicationDependencyProvider implements ApplicationDependencie
   }
 
   @Override
-  public @NonNull LibSignalNetwork provideLibsignalNetwork(@NonNull SignalServiceConfiguration config) {
+  public @NonNull Network provideLibsignalNetwork(@NonNull SignalServiceConfiguration config) {
     return null;
   }
 }
diff --git a/app/src/test/java/org/thoughtcrime/securesms/groups/GroupManagerV2Test_edit.kt b/app/src/test/java/org/thoughtcrime/securesms/groups/GroupManagerV2Test_edit.kt
index 28ccd6f85e..54efd17911 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/groups/GroupManagerV2Test_edit.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/groups/GroupManagerV2Test_edit.kt
@@ -20,9 +20,11 @@ import org.robolectric.annotation.Config
 import org.signal.core.util.Hex
 import org.signal.core.util.ThreadUtil
 import org.signal.core.util.logging.Log
+import org.signal.libsignal.protocol.logging.SignalProtocolLogger
 import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey
 import org.signal.libsignal.zkgroup.groups.GroupSecretParams
+import org.signal.storageservice.protos.groups.GroupChangeResponse
 import org.signal.storageservice.protos.groups.Member
 import org.signal.storageservice.protos.groups.local.DecryptedGroup
 import org.signal.storageservice.protos.groups.local.DecryptedMember
@@ -80,6 +82,7 @@ class GroupManagerV2Test_edit {
     ThreadUtil.enforceAssertions = false
     Log.initialize(SystemOutLogger())
     SignalProtocolLoggerProvider.setProvider(CustomSignalProtocolLogger())
+    SignalProtocolLoggerProvider.initializeLogging(SignalProtocolLogger.INFO)
 
     val clientZkOperations = ClientZkOperations(server.getServerPublicParams())
 
@@ -109,9 +112,9 @@ class GroupManagerV2Test_edit {
 
     every { groupTable.getGroup(groupId) } returns data.groupRecord
     every { groupTable.requireGroup(groupId) } returns data.groupRecord.get()
-    every { groupTable.update(any<GroupId.V2>(), any()) } returns Unit
+    every { groupTable.update(any<GroupId.V2>(), any(), any()) } returns Unit
     every { sendGroupUpdateHelper.sendGroupUpdate(masterKey, any(), any(), any()) } returns GroupManagerV2.RecipientAndThread(Recipient.UNKNOWN, 1)
-    every { groupsV2API.patchGroup(any(), any(), any()) } returns data.groupChange!!
+    every { groupsV2API.patchGroup(any(), any(), any()) } returns GroupChangeResponse(groupChange = data.groupChange!!)
   }
 
   private fun editGroup(perform: GroupManagerV2.GroupEditor.() -> Unit) {
@@ -120,7 +123,7 @@ class GroupManagerV2Test_edit {
 
   private fun then(then: (DecryptedGroup) -> Unit) {
     val decryptedGroupArg = slot<DecryptedGroup>()
-    verify { groupTable.update(groupId, capture(decryptedGroupArg)) }
+    verify { groupTable.update(groupId, capture(decryptedGroupArg), any()) }
     then(decryptedGroupArg.captured)
   }
 
diff --git a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/processing/GlobalGroupStateTest.java b/app/src/test/java/org/thoughtcrime/securesms/groups/v2/processing/GlobalGroupStateTest.java
deleted file mode 100644
index a9565ec8c0..0000000000
--- a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/processing/GlobalGroupStateTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.thoughtcrime.securesms.groups.v2.processing;
-
-import org.junit.Test;
-import org.signal.storageservice.protos.groups.local.DecryptedGroup;
-import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
-
-import static org.junit.Assert.assertEquals;
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
-
-public final class GlobalGroupStateTest {
-
-  @Test(expected = AssertionError.class)
-  public void cannot_ask_latestVersionNumber_of_empty_state() {
-    GlobalGroupState emptyState = new GlobalGroupState(null, emptyList());
-
-    emptyState.getLatestRevisionNumber();
-  }
-
-  @Test
-  public void latestRevisionNumber_of_state_and_empty_list() {
-    GlobalGroupState emptyState = new GlobalGroupState(state(10), emptyList());
-
-    assertEquals(10, emptyState.getLatestRevisionNumber());
-  }
-
-  @Test
-  public void latestRevisionNumber_of_state_and_list() {
-    GlobalGroupState emptyState = new GlobalGroupState(state(2), asList(logEntry(3), logEntry(4)));
-
-    assertEquals(4, emptyState.getLatestRevisionNumber());
-  }
-
-  private static ServerGroupLogEntry logEntry(int revision) {
-    return new ServerGroupLogEntry(state(revision), change(revision));
-  }
-
-  private static DecryptedGroup state(int revision) {
-    return new DecryptedGroup.Builder().revision(revision).build();
-  }
-
-  private static DecryptedGroupChange change(int revision) {
-    return new DecryptedGroupChange.Builder().revision(revision).build();
-  }
-}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStateMapperTest.java b/app/src/test/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStateMapperTest.java
deleted file mode 100644
index 35d81b1cb9..0000000000
--- a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStateMapperTest.java
+++ /dev/null
@@ -1,513 +0,0 @@
-package org.thoughtcrime.securesms.groups.v2.processing;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.signal.core.util.logging.Log;
-import org.signal.storageservice.protos.groups.local.DecryptedGroup;
-import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
-import org.signal.storageservice.protos.groups.local.DecryptedMember;
-import org.signal.storageservice.protos.groups.local.DecryptedString;
-import org.thoughtcrime.securesms.testutil.LogRecorder;
-import org.whispersystems.signalservice.api.push.ServiceId.ACI;
-import org.whispersystems.signalservice.api.util.UuidUtil;
-
-import java.util.Collections;
-import java.util.UUID;
-
-import kotlin.collections.CollectionsKt;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.thoughtcrime.securesms.groups.v2.processing.GroupStateMapper.LATEST;
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-
-public final class GroupStateMapperTest {
-
-  private static final UUID KNOWN_EDITOR = UUID.randomUUID();
-
-  @Before
-  public void setup() {
-    Log.initialize(new LogRecorder());
-  }
-
-  @Test
-  public void unknown_group_with_no_states_to_update() {
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(null, emptyList()), 10);
-
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(emptyList()));
-    assertTrue(advanceGroupStateResult.getNewGlobalGroupState().getServerHistory().isEmpty());
-    assertNull(advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void known_group_with_no_states_to_update() {
-    DecryptedGroup currentState = state(0);
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(currentState, emptyList()), 10);
-
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(emptyList()));
-    assertTrue(advanceGroupStateResult.getNewGlobalGroupState().getServerHistory().isEmpty());
-    assertSame(currentState, advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void unknown_group_single_state_to_update() {
-    ServerGroupLogEntry log0 = serverLogEntry(0);
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(null, singletonList(log0)), 10);
-
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(singletonList(asLocal(log0))));
-    assertTrue(advanceGroupStateResult.getNewGlobalGroupState().getServerHistory().isEmpty());
-    assertEquals(log0.getGroup(), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void known_group_single_state_to_update() {
-    DecryptedGroup      currentState = state(0);
-    ServerGroupLogEntry log1         = serverLogEntry(1);
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(currentState, singletonList(log1)), 1);
-
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(singletonList(asLocal(log1))));
-    assertTrue(advanceGroupStateResult.getNewGlobalGroupState().getServerHistory().isEmpty());
-    assertEquals(log1.getGroup(), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void known_group_two_states_to_update() {
-    DecryptedGroup      currentState = state(0);
-    ServerGroupLogEntry log1         = serverLogEntry(1);
-    ServerGroupLogEntry log2         = serverLogEntry(2);
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(currentState, asList(log1, log2)), 2);
-
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(asLocal(log1), asLocal(log2))));
-    assertTrue(advanceGroupStateResult.getNewGlobalGroupState().getServerHistory().isEmpty());
-    assertEquals(log2.getGroup(), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void known_group_two_states_to_update_already_on_one() {
-    DecryptedGroup      currentState = state(1);
-    ServerGroupLogEntry log1         = serverLogEntry(1);
-    ServerGroupLogEntry log2         = serverLogEntry(2);
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(currentState, asList(log1, log2)), 2);
-
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(singletonList(asLocal(log2))));
-    assertTrue(advanceGroupStateResult.getNewGlobalGroupState().getServerHistory().isEmpty());
-    assertEquals(log2.getGroup(), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void known_group_three_states_to_update_stop_at_2() {
-    DecryptedGroup      currentState = state(0);
-    ServerGroupLogEntry log1         = serverLogEntry(1);
-    ServerGroupLogEntry log2         = serverLogEntry(2);
-    ServerGroupLogEntry log3         = serverLogEntry(3);
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(currentState, asList(log1, log2, log3)), 2);
-
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(asLocal(log1), asLocal(log2))));
-    assertNewState(new GlobalGroupState(log2.getGroup(), singletonList(log3)), advanceGroupStateResult.getNewGlobalGroupState());
-    assertEquals(log2.getGroup(), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void known_group_three_states_to_update_update_latest() {
-    DecryptedGroup      currentState = state(0);
-    ServerGroupLogEntry log1         = serverLogEntry(1);
-    ServerGroupLogEntry log2         = serverLogEntry(2);
-    ServerGroupLogEntry log3         = serverLogEntry(3);
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(currentState, asList(log1, log2, log3)), LATEST);
-
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(asLocal(log1), asLocal(log2), asLocal(log3))));
-    assertNewState(new GlobalGroupState(log3.getGroup(), emptyList()), advanceGroupStateResult.getNewGlobalGroupState());
-    assertEquals(log3.getGroup(), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void apply_maximum_group_revisions() {
-    DecryptedGroup      currentState = state(Integer.MAX_VALUE - 2);
-    ServerGroupLogEntry log1         = serverLogEntry(Integer.MAX_VALUE - 1);
-    ServerGroupLogEntry log2         = serverLogEntry(Integer.MAX_VALUE);
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(currentState, asList(log1, log2)), LATEST);
-
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(asLocal(log1), asLocal(log2))));
-    assertNewState(new GlobalGroupState(log2.getGroup(), emptyList()), advanceGroupStateResult.getNewGlobalGroupState());
-    assertEquals(log2.getGroup(), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void unknown_group_single_state_to_update_with_missing_change() {
-    ServerGroupLogEntry log0 = serverLogEntryWholeStateOnly(0);
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(null, singletonList(log0)), 10);
-
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(singletonList(asLocal(log0))));
-    assertTrue(advanceGroupStateResult.getNewGlobalGroupState().getServerHistory().isEmpty());
-    assertEquals(log0.getGroup(), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void known_group_single_state_to_update_with_missing_change() {
-    DecryptedGroup      currentState = state(0);
-    ServerGroupLogEntry log1         = serverLogEntryWholeStateOnly(1);
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(currentState, singletonList(log1)), 1);
-
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(singletonList(localLogEntryNoEditor(1))));
-    assertTrue(advanceGroupStateResult.getNewGlobalGroupState().getServerHistory().isEmpty());
-    assertEquals(log1.getGroup(), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void known_group_three_states_to_update_update_latest_handle_missing_change() {
-    DecryptedGroup      currentState = state(0);
-    ServerGroupLogEntry log1         = serverLogEntry(1);
-    ServerGroupLogEntry log2         = serverLogEntryWholeStateOnly(2);
-    ServerGroupLogEntry log3         = serverLogEntry(3);
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(currentState, asList(log1, log2, log3)), LATEST);
-
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(asLocal(log1), localLogEntryNoEditor(2), asLocal(log3))));
-    assertNewState(new GlobalGroupState(log3.getGroup(), emptyList()), advanceGroupStateResult.getNewGlobalGroupState());
-    assertEquals(log3.getGroup(), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void known_group_three_states_to_update_update_latest_handle_gap_with_no_changes() {
-    DecryptedGroup      currentState = state(0);
-    ServerGroupLogEntry log1         = serverLogEntry(1);
-    ServerGroupLogEntry log3         = serverLogEntry(3);
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(currentState, asList(log1, log3)), LATEST);
-
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(asLocal(log1), asLocal(log3))));
-    assertNewState(new GlobalGroupState(log3.getGroup(), emptyList()), advanceGroupStateResult.getNewGlobalGroupState());
-    assertEquals(log3.getGroup(), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void known_group_three_states_to_update_update_latest_handle_gap_with_changes() {
-    DecryptedGroup      currentState = state(0);
-    ServerGroupLogEntry log1         = serverLogEntry(1);
-    DecryptedGroup state3a = new DecryptedGroup.Builder()
-        .revision(3)
-        .title("Group Revision " + 3)
-        .build();
-    DecryptedGroup state3 = new DecryptedGroup.Builder()
-        .revision(3)
-        .title("Group Revision " + 3)
-        .avatar("Lost Avatar Update")
-        .build();
-    ServerGroupLogEntry log3 = new ServerGroupLogEntry(state3, change(3));
-    DecryptedGroup state4 = new DecryptedGroup.Builder()
-        .revision(4)
-        .title("Group Revision " + 4)
-        .avatar("Lost Avatar Update")
-        .build();
-    ServerGroupLogEntry log4 = new ServerGroupLogEntry(state4, change(4));
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(currentState, asList(log1, log3, log4)), LATEST);
-
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(asLocal(log1),
-                                                                           new LocalGroupLogEntry(state3a, log3.getChange()),
-                                                                           new LocalGroupLogEntry(state3, new DecryptedGroupChange.Builder()
-                                                                               .revision(3)
-                                                                               .newAvatar(new DecryptedString.Builder().value_("Lost Avatar Update").build())
-                                                                               .build()),
-                                                                           asLocal(log4))));
-
-    assertNewState(new GlobalGroupState(log4.getGroup(), emptyList()), advanceGroupStateResult.getNewGlobalGroupState());
-    assertEquals(log4.getGroup(), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void updates_with_all_changes_missing() {
-    DecryptedGroup      currentState = state(5);
-    ServerGroupLogEntry log6         = serverLogEntryWholeStateOnly(6);
-    ServerGroupLogEntry log7         = serverLogEntryWholeStateOnly(7);
-    ServerGroupLogEntry log8         = serverLogEntryWholeStateOnly(8);
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(currentState, asList(log6, log7, log8)), LATEST);
-
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(localLogEntryNoEditor(6), localLogEntryNoEditor(7), localLogEntryNoEditor(8))));
-    assertNewState(new GlobalGroupState(log8.getGroup(), emptyList()), advanceGroupStateResult.getNewGlobalGroupState());
-    assertEquals(log8.getGroup(), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void updates_with_all_group_states_missing() {
-    DecryptedGroup      currentState = state(6);
-    ServerGroupLogEntry log7         = logEntryMissingState(7);
-    ServerGroupLogEntry log8         = logEntryMissingState(8);
-    ServerGroupLogEntry log9         = logEntryMissingState(9);
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(currentState, asList(log7, log8, log9)), LATEST);
-
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(asLocal(serverLogEntry(7)), asLocal(serverLogEntry(8)), asLocal(serverLogEntry(9)))));
-    assertNewState(new GlobalGroupState(state(9), emptyList()), advanceGroupStateResult.getNewGlobalGroupState());
-    assertEquals(state(9), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void updates_with_a_server_mismatch_inserts_additional_update() {
-    DecryptedGroup      currentState = state(6);
-    ServerGroupLogEntry log7         = serverLogEntry(7);
-    DecryptedMember newMember = new DecryptedMember.Builder()
-        .aciBytes(ACI.from(UUID.randomUUID()).toByteString())
-        .build();
-    DecryptedGroup state7b = new DecryptedGroup.Builder()
-        .revision(8)
-        .title("Group Revision " + 8)
-        .build();
-    DecryptedGroup state8 = new DecryptedGroup.Builder()
-        .revision(8)
-        .title("Group Revision " + 8)
-        .members(Collections.singletonList(newMember))
-        .build();
-    ServerGroupLogEntry log8 = new ServerGroupLogEntry(state8,
-                                                       change(8));
-    ServerGroupLogEntry log9 = new ServerGroupLogEntry(new DecryptedGroup.Builder()
-                                                           .revision(9)
-                                                           .members(Collections.singletonList(newMember))
-                                                           .title("Group Revision " + 9)
-                                                           .build(),
-                                                       change(9));
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(currentState, asList(log7, log8, log9)), LATEST);
-
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(asLocal(log7),
-                                                                           new LocalGroupLogEntry(state7b, log8.getChange()),
-                                                                           new LocalGroupLogEntry(state8, new DecryptedGroupChange.Builder()
-                                                                               .revision(8)
-                                                                               .newMembers(Collections.singletonList(newMember))
-                                                                               .build()),
-                                                                           asLocal(log9))));
-    assertNewState(new GlobalGroupState(log9.getGroup(), emptyList()), advanceGroupStateResult.getNewGlobalGroupState());
-    assertEquals(log9.getGroup(), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void local_up_to_date_no_repair_necessary() {
-    DecryptedGroup      currentState = state(6);
-    ServerGroupLogEntry log6         = serverLogEntryWholeStateOnly(6);
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(currentState, singletonList(log6)), LATEST);
-
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(emptyList()));
-    assertNewState(new GlobalGroupState(state(6), emptyList()), advanceGroupStateResult.getNewGlobalGroupState());
-    assertEquals(state(6), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void no_repair_change_is_posted_if_the_local_state_is_a_placeholder() {
-    DecryptedGroup currentState = new DecryptedGroup.Builder()
-        .revision(GroupStateMapper.PLACEHOLDER_REVISION)
-        .title("Incorrect group title, Revision " + 6)
-        .build();
-    ServerGroupLogEntry log6 = serverLogEntry(6);
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(currentState, singletonList(log6)), LATEST);
-
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(singletonList(asLocal(log6))));
-    assertTrue(advanceGroupStateResult.getNewGlobalGroupState().getServerHistory().isEmpty());
-    assertEquals(log6.getGroup(), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void clears_changes_duplicated_in_the_placeholder() {
-    ACI newMemberAci = ACI.from(UUID.randomUUID());
-    DecryptedMember newMember = new DecryptedMember.Builder()
-        .aciBytes(newMemberAci.toByteString())
-        .build();
-    DecryptedMember existingMember = new DecryptedMember.Builder()
-        .aciBytes(ACI.from(UUID.randomUUID()).toByteString())
-        .build();
-    DecryptedGroup currentState = new DecryptedGroup.Builder()
-        .revision(GroupStateMapper.PLACEHOLDER_REVISION)
-        .title("Group Revision " + 8)
-        .members(Collections.singletonList(newMember))
-        .build();
-    ServerGroupLogEntry log8 = new ServerGroupLogEntry(new DecryptedGroup.Builder()
-                                                           .revision(8)
-                                                           .members(CollectionsKt.plus(Collections.singletonList(existingMember), newMember))
-                                                           .title("Group Revision " + 8)
-                                                           .build(),
-                                                       new DecryptedGroupChange.Builder()
-                                                           .revision(8)
-                                                           .editorServiceIdBytes(newMemberAci.toByteString())
-                                                           .newMembers(Collections.singletonList(newMember))
-                                                           .build());
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(currentState, singletonList(log8)), LATEST);
-
-    assertNotNull(log8.getGroup());
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(emptyList()));
-    assertNewState(new GlobalGroupState(log8.getGroup(), emptyList()), advanceGroupStateResult.getNewGlobalGroupState());
-    assertEquals(log8.getGroup(), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void clears_changes_duplicated_in_a_non_placeholder() {
-    ACI editorAci    = ACI.from(UUID.randomUUID());
-    ACI newMemberAci = ACI.from(UUID.randomUUID());
-    DecryptedMember newMember = new DecryptedMember.Builder()
-        .aciBytes(newMemberAci.toByteString())
-        .build();
-    DecryptedMember existingMember = new DecryptedMember.Builder()
-        .aciBytes(ACI.from(UUID.randomUUID()).toByteString())
-        .build();
-    DecryptedGroup currentState = new DecryptedGroup.Builder()
-        .revision(8)
-        .title("Group Revision " + 8)
-        .members(Collections.singletonList(existingMember))
-        .build();
-    ServerGroupLogEntry log8 = new ServerGroupLogEntry(new DecryptedGroup.Builder()
-                                                           .revision(8)
-                                                           .members(CollectionsKt.plus(Collections.singletonList(existingMember), newMember))
-                                                           .title("Group Revision " + 8)
-                                                           .build(),
-                                                       new DecryptedGroupChange.Builder()
-                                                           .revision(8)
-                                                           .editorServiceIdBytes(editorAci.toByteString())
-                                                           .newMembers(CollectionsKt.plus(Collections.singletonList(existingMember), newMember))
-                                                           .build());
-
-    DecryptedGroupChange expectedChange = new DecryptedGroupChange.Builder()
-        .revision(8)
-        .editorServiceIdBytes(editorAci.toByteString())
-        .newMembers(Collections.singletonList(newMember))
-        .build();
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(currentState, singletonList(log8)), LATEST);
-
-    assertNotNull(log8.getGroup());
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(singletonList(new LocalGroupLogEntry(log8.getGroup(), expectedChange))));
-    assertNewState(new GlobalGroupState(log8.getGroup(), emptyList()), advanceGroupStateResult.getNewGlobalGroupState());
-    assertEquals(log8.getGroup(), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void notices_changes_in_avatar_and_title_but_not_members_in_placeholder() {
-    ACI newMemberAci = ACI.from(UUID.randomUUID());
-    DecryptedMember newMember = new DecryptedMember.Builder()
-        .aciBytes(newMemberAci.toByteString())
-        .build();
-    DecryptedMember existingMember = new DecryptedMember.Builder()
-        .aciBytes(ACI.from(UUID.randomUUID()).toByteString())
-        .build();
-    DecryptedGroup currentState = new DecryptedGroup.Builder()
-        .revision(GroupStateMapper.PLACEHOLDER_REVISION)
-        .title("Incorrect group title")
-        .avatar("Incorrect group avatar")
-        .members(Collections.singletonList(newMember))
-        .build();
-    ServerGroupLogEntry log8 = new ServerGroupLogEntry(new DecryptedGroup.Builder()
-                                                           .revision(8)
-                                                           .members(CollectionsKt.plus(Collections.singletonList(existingMember), newMember))
-                                                           .title("Group Revision " + 8)
-                                                           .avatar("Group Avatar " + 8)
-                                                           .build(),
-                                                       new DecryptedGroupChange.Builder()
-                                                           .revision(8)
-                                                           .editorServiceIdBytes(newMemberAci.toByteString())
-                                                           .newMembers(Collections.singletonList(newMember))
-                                                           .build());
-
-    DecryptedGroupChange expectedChange = new DecryptedGroupChange.Builder()
-        .revision(8)
-        .newTitle(new DecryptedString.Builder().value_("Group Revision " + 8).build())
-        .newAvatar(new DecryptedString.Builder().value_("Group Avatar " + 8).build())
-        .build();
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(currentState, singletonList(log8)), LATEST);
-
-    assertNotNull(log8.getGroup());
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(singletonList(new LocalGroupLogEntry(log8.getGroup(), expectedChange))));
-    assertNewState(new GlobalGroupState(log8.getGroup(), emptyList()), advanceGroupStateResult.getNewGlobalGroupState());
-    assertEquals(log8.getGroup(), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  @Test
-  public void no_actual_change() {
-    DecryptedGroup      currentState = state(0);
-    ServerGroupLogEntry log1         = serverLogEntry(1);
-    ServerGroupLogEntry log2 = new ServerGroupLogEntry(log1.getGroup().newBuilder()
-                                                           .revision(2)
-                                                           .build(),
-                                                       new DecryptedGroupChange.Builder()
-                                                           .revision(2)
-                                                           .editorServiceIdBytes(UuidUtil.toByteString(KNOWN_EDITOR))
-                                                           .newTitle(new DecryptedString.Builder().value_(log1.getGroup().title).build())
-                                                           .build());
-
-    AdvanceGroupStateResult advanceGroupStateResult = GroupStateMapper.partiallyAdvanceGroupState(new GlobalGroupState(currentState, asList(log1, log2)), 2);
-
-    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(asLocal(log1),
-                                                                           new LocalGroupLogEntry(log2.getGroup(), new DecryptedGroupChange.Builder()
-                                                                               .revision(2)
-                                                                               .editorServiceIdBytes(UuidUtil.toByteString(KNOWN_EDITOR))
-                                                                               .build()))));
-    assertTrue(advanceGroupStateResult.getNewGlobalGroupState().getServerHistory().isEmpty());
-    assertEquals(log2.getGroup(), advanceGroupStateResult.getNewGlobalGroupState().getLocalState());
-  }
-
-  private static void assertNewState(GlobalGroupState expected, GlobalGroupState actual) {
-    assertEquals(expected.getLocalState(), actual.getLocalState());
-    assertThat(actual.getServerHistory(), is(expected.getServerHistory()));
-  }
-
-  private static ServerGroupLogEntry serverLogEntry(int revision) {
-    return new ServerGroupLogEntry(state(revision), change(revision));
-  }
-
-  private static LocalGroupLogEntry localLogEntryNoEditor(int revision) {
-    return new LocalGroupLogEntry(state(revision), changeNoEditor(revision));
-  }
-
-  private static ServerGroupLogEntry serverLogEntryWholeStateOnly(int revision) {
-    return new ServerGroupLogEntry(state(revision), null);
-  }
-
-  private static ServerGroupLogEntry logEntryMissingState(int revision) {
-    return new ServerGroupLogEntry(null, change(revision));
-  }
-
-  private static DecryptedGroup state(int revision) {
-    return new DecryptedGroup.Builder()
-        .revision(revision)
-        .title("Group Revision " + revision)
-        .build();
-  }
-
-  private static DecryptedGroupChange change(int revision) {
-    return new DecryptedGroupChange.Builder()
-        .revision(revision)
-        .editorServiceIdBytes(UuidUtil.toByteString(KNOWN_EDITOR))
-        .newTitle(new DecryptedString.Builder().value_("Group Revision " + revision).build())
-        .build();
-  }
-
-  private static DecryptedGroupChange changeNoEditor(int revision) {
-    return new DecryptedGroupChange.Builder()
-        .revision(revision)
-        .newTitle(new DecryptedString.Builder().value_("Group Revision " + revision).build())
-        .build();
-  }
-
-  private static LocalGroupLogEntry asLocal(ServerGroupLogEntry logEntry) {
-    assertNotNull(logEntry.getGroup());
-    return new LocalGroupLogEntry(logEntry.getGroup(), logEntry.getChange());
-  }
-}
\ No newline at end of file
diff --git a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStatePatcherTest.java b/app/src/test/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStatePatcherTest.java
new file mode 100644
index 0000000000..3053d99f92
--- /dev/null
+++ b/app/src/test/java/org/thoughtcrime/securesms/groups/v2/processing/GroupStatePatcherTest.java
@@ -0,0 +1,515 @@
+package org.thoughtcrime.securesms.groups.v2.processing;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.signal.core.util.logging.Log;
+import org.signal.storageservice.protos.groups.local.DecryptedGroup;
+import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
+import org.signal.storageservice.protos.groups.local.DecryptedMember;
+import org.signal.storageservice.protos.groups.local.DecryptedString;
+import org.thoughtcrime.securesms.testutil.LogRecorder;
+import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupChangeLog;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.util.UuidUtil;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
+import kotlin.collections.CollectionsKt;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.thoughtcrime.securesms.groups.v2.processing.GroupStatePatcher.LATEST;
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+
+public final class GroupStatePatcherTest {
+
+  private static final UUID KNOWN_EDITOR = UUID.randomUUID();
+
+  @Before
+  public void setup() {
+    Log.initialize(new LogRecorder());
+  }
+
+  @Test
+  public void unknown_group_with_no_states_to_update() {
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(null, emptyList(), null), 10);
+
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(emptyList()));
+    assertTrue(advanceGroupStateResult.getRemainingRemoteGroupChanges().isEmpty());
+    assertNull(advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void known_group_with_no_states_to_update() {
+    DecryptedGroup currentState = state(0);
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(currentState, emptyList(), null), 10);
+
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(emptyList()));
+    assertTrue(advanceGroupStateResult.getRemainingRemoteGroupChanges().isEmpty());
+    assertSame(currentState, advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void unknown_group_single_state_to_update() {
+    DecryptedGroupChangeLog log0 = serverLogEntry(0);
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(null, singletonList(log0), null), 10);
+
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(singletonList(asLocal(log0))));
+    assertTrue(advanceGroupStateResult.getRemainingRemoteGroupChanges().isEmpty());
+    assertEquals(log0.getGroup(), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void known_group_single_state_to_update() {
+    DecryptedGroup          currentState = state(0);
+    DecryptedGroupChangeLog log1         = serverLogEntry(1);
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(currentState, singletonList(log1), null), 1);
+
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(singletonList(asLocal(log1))));
+    assertTrue(advanceGroupStateResult.getRemainingRemoteGroupChanges().isEmpty());
+    assertEquals(log1.getGroup(), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void known_group_two_states_to_update() {
+    DecryptedGroup          currentState = state(0);
+    DecryptedGroupChangeLog log1         = serverLogEntry(1);
+    DecryptedGroupChangeLog log2         = serverLogEntry(2);
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(currentState, asList(log1, log2), null), 2);
+
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(asLocal(log1), asLocal(log2))));
+    assertTrue(advanceGroupStateResult.getRemainingRemoteGroupChanges().isEmpty());
+    assertEquals(log2.getGroup(), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void known_group_two_states_to_update_already_on_one() {
+    DecryptedGroup          currentState = state(1);
+    DecryptedGroupChangeLog log1         = serverLogEntry(1);
+    DecryptedGroupChangeLog log2         = serverLogEntry(2);
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(currentState, asList(log1, log2), null), 2);
+
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(singletonList(asLocal(log2))));
+    assertTrue(advanceGroupStateResult.getRemainingRemoteGroupChanges().isEmpty());
+    assertEquals(log2.getGroup(), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void known_group_three_states_to_update_stop_at_2() {
+    DecryptedGroup          currentState = state(0);
+    DecryptedGroupChangeLog log1         = serverLogEntry(1);
+    DecryptedGroupChangeLog log2         = serverLogEntry(2);
+    DecryptedGroupChangeLog log3         = serverLogEntry(3);
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(currentState, asList(log1, log2, log3), null), 2);
+
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(asLocal(log1), asLocal(log2))));
+    assertNewState(log2.getGroup(), singletonList(log3), advanceGroupStateResult.getUpdatedGroupState(), advanceGroupStateResult.getRemainingRemoteGroupChanges());
+    assertEquals(log2.getGroup(), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void known_group_three_states_to_update_update_latest() {
+    DecryptedGroup          currentState = state(0);
+    DecryptedGroupChangeLog log1         = serverLogEntry(1);
+    DecryptedGroupChangeLog log2         = serverLogEntry(2);
+    DecryptedGroupChangeLog log3         = serverLogEntry(3);
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(currentState, asList(log1, log2, log3), null), LATEST);
+
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(asLocal(log1), asLocal(log2), asLocal(log3))));
+    assertNewState(log3.getGroup(), emptyList(), advanceGroupStateResult.getUpdatedGroupState(), advanceGroupStateResult.getRemainingRemoteGroupChanges());
+    assertEquals(log3.getGroup(), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void apply_maximum_group_revisions() {
+    DecryptedGroup          currentState = state(Integer.MAX_VALUE - 2);
+    DecryptedGroupChangeLog log1         = serverLogEntry(Integer.MAX_VALUE - 1);
+    DecryptedGroupChangeLog log2         = serverLogEntry(Integer.MAX_VALUE);
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(currentState, asList(log1, log2), null), LATEST);
+
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(asLocal(log1), asLocal(log2))));
+    assertNewState(log2.getGroup(), emptyList(), advanceGroupStateResult.getUpdatedGroupState(), advanceGroupStateResult.getRemainingRemoteGroupChanges());
+    assertEquals(log2.getGroup(), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void unknown_group_single_state_to_update_with_missing_change() {
+    DecryptedGroupChangeLog log0 = serverLogEntryWholeStateOnly(0);
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(null, singletonList(log0), null), 10);
+
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(singletonList(asLocal(log0))));
+    assertTrue(advanceGroupStateResult.getRemainingRemoteGroupChanges().isEmpty());
+    assertEquals(log0.getGroup(), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void known_group_single_state_to_update_with_missing_change() {
+    DecryptedGroup          currentState = state(0);
+    DecryptedGroupChangeLog log1         = serverLogEntryWholeStateOnly(1);
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(currentState, singletonList(log1), null), 1);
+
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(singletonList(localLogEntryNoEditor(1))));
+    assertTrue(advanceGroupStateResult.getRemainingRemoteGroupChanges().isEmpty());
+    assertEquals(log1.getGroup(), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void known_group_three_states_to_update_update_latest_handle_missing_change() {
+    DecryptedGroup          currentState = state(0);
+    DecryptedGroupChangeLog log1         = serverLogEntry(1);
+    DecryptedGroupChangeLog log2         = serverLogEntryWholeStateOnly(2);
+    DecryptedGroupChangeLog log3         = serverLogEntry(3);
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(currentState, asList(log1, log2, log3), null), LATEST);
+
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(asLocal(log1), localLogEntryNoEditor(2), asLocal(log3))));
+    assertNewState(log3.getGroup(), emptyList(), advanceGroupStateResult.getUpdatedGroupState(), advanceGroupStateResult.getRemainingRemoteGroupChanges());
+    assertEquals(log3.getGroup(), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void known_group_three_states_to_update_update_latest_handle_gap_with_no_changes() {
+    DecryptedGroup          currentState = state(0);
+    DecryptedGroupChangeLog log1         = serverLogEntry(1);
+    DecryptedGroupChangeLog log3         = serverLogEntry(3);
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(currentState, asList(log1, log3), null), LATEST);
+
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(asLocal(log1), asLocal(log3))));
+    assertNewState(log3.getGroup(), emptyList(), advanceGroupStateResult.getUpdatedGroupState(), advanceGroupStateResult.getRemainingRemoteGroupChanges());
+    assertEquals(log3.getGroup(), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void known_group_three_states_to_update_update_latest_handle_gap_with_changes() {
+    DecryptedGroup          currentState = state(0);
+    DecryptedGroupChangeLog log1         = serverLogEntry(1);
+    DecryptedGroup state3a = new DecryptedGroup.Builder()
+        .revision(3)
+        .title("Group Revision " + 3)
+        .build();
+    DecryptedGroup state3 = new DecryptedGroup.Builder()
+        .revision(3)
+        .title("Group Revision " + 3)
+        .avatar("Lost Avatar Update")
+        .build();
+    DecryptedGroupChangeLog log3 = new DecryptedGroupChangeLog(state3, change(3));
+    DecryptedGroup state4 = new DecryptedGroup.Builder()
+        .revision(4)
+        .title("Group Revision " + 4)
+        .avatar("Lost Avatar Update")
+        .build();
+    DecryptedGroupChangeLog log4 = new DecryptedGroupChangeLog(state4, change(4));
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(currentState, asList(log1, log3, log4), null), LATEST);
+
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(asLocal(log1),
+                                                                           new AppliedGroupChangeLog(state3a, log3.getChange()),
+                                                                           new AppliedGroupChangeLog(state3, new DecryptedGroupChange.Builder()
+                                                                               .revision(3)
+                                                                               .newAvatar(new DecryptedString.Builder().value_("Lost Avatar Update").build())
+                                                                               .build()),
+                                                                           asLocal(log4))));
+
+    assertNewState(log4.getGroup(), emptyList(), advanceGroupStateResult.getUpdatedGroupState(), advanceGroupStateResult.getRemainingRemoteGroupChanges());
+    assertEquals(log4.getGroup(), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void updates_with_all_changes_missing() {
+    DecryptedGroup          currentState = state(5);
+    DecryptedGroupChangeLog log6         = serverLogEntryWholeStateOnly(6);
+    DecryptedGroupChangeLog log7         = serverLogEntryWholeStateOnly(7);
+    DecryptedGroupChangeLog log8         = serverLogEntryWholeStateOnly(8);
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(currentState, asList(log6, log7, log8), null), LATEST);
+
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(localLogEntryNoEditor(6), localLogEntryNoEditor(7), localLogEntryNoEditor(8))));
+    assertNewState(log8.getGroup(), emptyList(), advanceGroupStateResult.getUpdatedGroupState(), advanceGroupStateResult.getRemainingRemoteGroupChanges());
+    assertEquals(log8.getGroup(), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void updates_with_all_group_states_missing() {
+    DecryptedGroup          currentState = state(6);
+    DecryptedGroupChangeLog log7         = logEntryMissingState(7);
+    DecryptedGroupChangeLog log8         = logEntryMissingState(8);
+    DecryptedGroupChangeLog log9         = logEntryMissingState(9);
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(currentState, asList(log7, log8, log9), null), LATEST);
+
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(asLocal(serverLogEntry(7)), asLocal(serverLogEntry(8)), asLocal(serverLogEntry(9)))));
+    assertNewState(state(9), emptyList(), advanceGroupStateResult.getUpdatedGroupState(), advanceGroupStateResult.getRemainingRemoteGroupChanges());
+    assertEquals(state(9), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void updates_with_a_server_mismatch_inserts_additional_update() {
+    DecryptedGroup          currentState = state(6);
+    DecryptedGroupChangeLog log7         = serverLogEntry(7);
+    DecryptedMember newMember = new DecryptedMember.Builder()
+        .aciBytes(ACI.from(UUID.randomUUID()).toByteString())
+        .build();
+    DecryptedGroup state7b = new DecryptedGroup.Builder()
+        .revision(8)
+        .title("Group Revision " + 8)
+        .build();
+    DecryptedGroup state8 = new DecryptedGroup.Builder()
+        .revision(8)
+        .title("Group Revision " + 8)
+        .members(Collections.singletonList(newMember))
+        .build();
+    DecryptedGroupChangeLog log8 = new DecryptedGroupChangeLog(state8,
+                                                               change(8));
+    DecryptedGroupChangeLog log9 = new DecryptedGroupChangeLog(new DecryptedGroup.Builder()
+                                                                   .revision(9)
+                                                                   .members(Collections.singletonList(newMember))
+                                                                   .title("Group Revision " + 9)
+                                                                   .build(),
+                                                               change(9));
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(currentState, asList(log7, log8, log9), null), LATEST);
+
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(asLocal(log7),
+                                                                           new AppliedGroupChangeLog(state7b, log8.getChange()),
+                                                                           new AppliedGroupChangeLog(state8, new DecryptedGroupChange.Builder()
+                                                                               .revision(8)
+                                                                               .newMembers(Collections.singletonList(newMember))
+                                                                               .build()),
+                                                                           asLocal(log9))));
+    assertNewState(log9.getGroup(), emptyList(), advanceGroupStateResult.getUpdatedGroupState(), advanceGroupStateResult.getRemainingRemoteGroupChanges());
+    assertEquals(log9.getGroup(), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void local_up_to_date_no_repair_necessary() {
+    DecryptedGroup          currentState = state(6);
+    DecryptedGroupChangeLog log6         = serverLogEntryWholeStateOnly(6);
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(currentState, singletonList(log6), null), LATEST);
+
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(emptyList()));
+    assertNewState(state(6), emptyList(), advanceGroupStateResult.getUpdatedGroupState(), advanceGroupStateResult.getRemainingRemoteGroupChanges());
+    assertEquals(state(6), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void no_repair_change_is_posted_if_the_local_state_is_a_placeholder() {
+    DecryptedGroup currentState = new DecryptedGroup.Builder()
+        .revision(GroupStatePatcher.PLACEHOLDER_REVISION)
+        .title("Incorrect group title, Revision " + 6)
+        .build();
+    DecryptedGroupChangeLog log6 = serverLogEntry(6);
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(currentState, singletonList(log6), null), LATEST);
+
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(singletonList(asLocal(log6))));
+    assertTrue(advanceGroupStateResult.getRemainingRemoteGroupChanges().isEmpty());
+    assertEquals(log6.getGroup(), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void clears_changes_duplicated_in_the_placeholder() {
+    ACI newMemberAci = ACI.from(UUID.randomUUID());
+    DecryptedMember newMember = new DecryptedMember.Builder()
+        .aciBytes(newMemberAci.toByteString())
+        .build();
+    DecryptedMember existingMember = new DecryptedMember.Builder()
+        .aciBytes(ACI.from(UUID.randomUUID()).toByteString())
+        .build();
+    DecryptedGroup currentState = new DecryptedGroup.Builder()
+        .revision(GroupStatePatcher.PLACEHOLDER_REVISION)
+        .title("Group Revision " + 8)
+        .members(Collections.singletonList(newMember))
+        .build();
+    DecryptedGroupChangeLog log8 = new DecryptedGroupChangeLog(new DecryptedGroup.Builder()
+                                                                   .revision(8)
+                                                                   .members(CollectionsKt.plus(Collections.singletonList(existingMember), newMember))
+                                                                   .title("Group Revision " + 8)
+                                                                   .build(),
+                                                               new DecryptedGroupChange.Builder()
+                                                                   .revision(8)
+                                                                   .editorServiceIdBytes(newMemberAci.toByteString())
+                                                                   .newMembers(Collections.singletonList(newMember))
+                                                                   .build());
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(currentState, singletonList(log8), null), LATEST);
+
+    assertNotNull(log8.getGroup());
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(emptyList()));
+    assertNewState(log8.getGroup(), emptyList(), advanceGroupStateResult.getUpdatedGroupState(), advanceGroupStateResult.getRemainingRemoteGroupChanges());
+    assertEquals(log8.getGroup(), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void clears_changes_duplicated_in_a_non_placeholder() {
+    ACI editorAci    = ACI.from(UUID.randomUUID());
+    ACI newMemberAci = ACI.from(UUID.randomUUID());
+    DecryptedMember newMember = new DecryptedMember.Builder()
+        .aciBytes(newMemberAci.toByteString())
+        .build();
+    DecryptedMember existingMember = new DecryptedMember.Builder()
+        .aciBytes(ACI.from(UUID.randomUUID()).toByteString())
+        .build();
+    DecryptedGroup currentState = new DecryptedGroup.Builder()
+        .revision(8)
+        .title("Group Revision " + 8)
+        .members(Collections.singletonList(existingMember))
+        .build();
+    DecryptedGroupChangeLog log8 = new DecryptedGroupChangeLog(new DecryptedGroup.Builder()
+                                                                   .revision(8)
+                                                                   .members(CollectionsKt.plus(Collections.singletonList(existingMember), newMember))
+                                                                   .title("Group Revision " + 8)
+                                                                   .build(),
+                                                               new DecryptedGroupChange.Builder()
+                                                                   .revision(8)
+                                                                   .editorServiceIdBytes(editorAci.toByteString())
+                                                                   .newMembers(CollectionsKt.plus(Collections.singletonList(existingMember), newMember))
+                                                                   .build());
+
+    DecryptedGroupChange expectedChange = new DecryptedGroupChange.Builder()
+        .revision(8)
+        .editorServiceIdBytes(editorAci.toByteString())
+        .newMembers(Collections.singletonList(newMember))
+        .build();
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(currentState, singletonList(log8), null), LATEST);
+
+    assertNotNull(log8.getGroup());
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(singletonList(new AppliedGroupChangeLog(log8.getGroup(), expectedChange))));
+    assertNewState(log8.getGroup(), emptyList(), advanceGroupStateResult.getUpdatedGroupState(), advanceGroupStateResult.getRemainingRemoteGroupChanges());
+    assertEquals(log8.getGroup(), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void notices_changes_in_avatar_and_title_but_not_members_in_placeholder() {
+    ACI newMemberAci = ACI.from(UUID.randomUUID());
+    DecryptedMember newMember = new DecryptedMember.Builder()
+        .aciBytes(newMemberAci.toByteString())
+        .build();
+    DecryptedMember existingMember = new DecryptedMember.Builder()
+        .aciBytes(ACI.from(UUID.randomUUID()).toByteString())
+        .build();
+    DecryptedGroup currentState = new DecryptedGroup.Builder()
+        .revision(GroupStatePatcher.PLACEHOLDER_REVISION)
+        .title("Incorrect group title")
+        .avatar("Incorrect group avatar")
+        .members(Collections.singletonList(newMember))
+        .build();
+    DecryptedGroupChangeLog log8 = new DecryptedGroupChangeLog(new DecryptedGroup.Builder()
+                                                                   .revision(8)
+                                                                   .members(CollectionsKt.plus(Collections.singletonList(existingMember), newMember))
+                                                                   .title("Group Revision " + 8)
+                                                                   .avatar("Group Avatar " + 8)
+                                                                   .build(),
+                                                               new DecryptedGroupChange.Builder()
+                                                                   .revision(8)
+                                                                   .editorServiceIdBytes(newMemberAci.toByteString())
+                                                                   .newMembers(Collections.singletonList(newMember))
+                                                                   .build());
+
+    DecryptedGroupChange expectedChange = new DecryptedGroupChange.Builder()
+        .revision(8)
+        .newTitle(new DecryptedString.Builder().value_("Group Revision " + 8).build())
+        .newAvatar(new DecryptedString.Builder().value_("Group Avatar " + 8).build())
+        .build();
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(currentState, singletonList(log8), null), LATEST);
+
+    assertNotNull(log8.getGroup());
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(singletonList(new AppliedGroupChangeLog(log8.getGroup(), expectedChange))));
+    assertNewState(log8.getGroup(), emptyList(), advanceGroupStateResult.getUpdatedGroupState(), advanceGroupStateResult.getRemainingRemoteGroupChanges());
+    assertEquals(log8.getGroup(), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  @Test
+  public void no_actual_change() {
+    DecryptedGroup          currentState = state(0);
+    DecryptedGroupChangeLog log1         = serverLogEntry(1);
+    DecryptedGroupChangeLog log2 = new DecryptedGroupChangeLog(log1.getGroup().newBuilder()
+                                                                   .revision(2)
+                                                                   .build(),
+                                                               new DecryptedGroupChange.Builder()
+                                                                   .revision(2)
+                                                                   .editorServiceIdBytes(UuidUtil.toByteString(KNOWN_EDITOR))
+                                                                   .newTitle(new DecryptedString.Builder().value_(log1.getGroup().title).build())
+                                                                   .build());
+
+    AdvanceGroupStateResult advanceGroupStateResult = GroupStatePatcher.applyGroupStateDiff(new GroupStateDiff(currentState, asList(log1, log2), null), 2);
+
+    assertThat(advanceGroupStateResult.getProcessedLogEntries(), is(asList(asLocal(log1),
+                                                                           new AppliedGroupChangeLog(log2.getGroup(), new DecryptedGroupChange.Builder()
+                                                                               .revision(2)
+                                                                               .editorServiceIdBytes(UuidUtil.toByteString(KNOWN_EDITOR))
+                                                                               .build()))));
+    assertTrue(advanceGroupStateResult.getRemainingRemoteGroupChanges().isEmpty());
+    assertEquals(log2.getGroup(), advanceGroupStateResult.getUpdatedGroupState());
+  }
+
+  private static void assertNewState(DecryptedGroup expectedUpdatedGroupState, List<DecryptedGroupChangeLog> expectedRemainingLogs, DecryptedGroup updatedGroupState, List<DecryptedGroupChangeLog> remainingLogs) {
+    assertEquals(expectedUpdatedGroupState, updatedGroupState);
+    assertThat(remainingLogs, is(expectedRemainingLogs));
+  }
+
+  private static DecryptedGroupChangeLog serverLogEntry(int revision) {
+    return new DecryptedGroupChangeLog(state(revision), change(revision));
+  }
+
+  private static AppliedGroupChangeLog localLogEntryNoEditor(int revision) {
+    return new AppliedGroupChangeLog(state(revision), changeNoEditor(revision));
+  }
+
+  private static DecryptedGroupChangeLog serverLogEntryWholeStateOnly(int revision) {
+    return new DecryptedGroupChangeLog(state(revision), null);
+  }
+
+  private static DecryptedGroupChangeLog logEntryMissingState(int revision) {
+    return new DecryptedGroupChangeLog(null, change(revision));
+  }
+
+  private static DecryptedGroup state(int revision) {
+    return new DecryptedGroup.Builder()
+        .revision(revision)
+        .title("Group Revision " + revision)
+        .build();
+  }
+
+  private static DecryptedGroupChange change(int revision) {
+    return new DecryptedGroupChange.Builder()
+        .revision(revision)
+        .editorServiceIdBytes(UuidUtil.toByteString(KNOWN_EDITOR))
+        .newTitle(new DecryptedString.Builder().value_("Group Revision " + revision).build())
+        .build();
+  }
+
+  private static DecryptedGroupChange changeNoEditor(int revision) {
+    return new DecryptedGroupChange.Builder()
+        .revision(revision)
+        .newTitle(new DecryptedString.Builder().value_("Group Revision " + revision).build())
+        .build();
+  }
+
+  private static AppliedGroupChangeLog asLocal(DecryptedGroupChangeLog logEntry) {
+    assertNotNull(logEntry.getGroup());
+    return new AppliedGroupChangeLog(logEntry.getGroup(), logEntry.getChange());
+  }
+}
\ No newline at end of file
diff --git a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessorTest.kt b/app/src/test/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessorTest.kt
index 686a26f6e4..74c378837f 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessorTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessorTest.kt
@@ -1,9 +1,15 @@
 package org.thoughtcrime.securesms.groups.v2.processing
 
+import android.annotation.SuppressLint
 import android.app.Application
 import io.mockk.every
+import io.mockk.justRun
 import io.mockk.mockk
+import io.mockk.mockkObject
 import io.mockk.mockkStatic
+import io.mockk.spyk
+import io.mockk.unmockkObject
+import io.mockk.unmockkStatic
 import io.mockk.verify
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.hasItem
@@ -18,40 +24,62 @@ import org.robolectric.annotation.Config
 import org.signal.core.util.Hex.fromStringCondensed
 import org.signal.core.util.logging.Log
 import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider
+import org.signal.libsignal.zkgroup.VerificationFailedException
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey
+import org.signal.libsignal.zkgroup.groups.GroupSecretParams
 import org.signal.storageservice.protos.groups.local.DecryptedGroup
 import org.signal.storageservice.protos.groups.local.DecryptedGroupChange
 import org.signal.storageservice.protos.groups.local.DecryptedMember
+import org.signal.storageservice.protos.groups.local.DecryptedString
 import org.signal.storageservice.protos.groups.local.DecryptedTimer
 import org.thoughtcrime.securesms.SignalStoreRule
 import org.thoughtcrime.securesms.database.GroupStateTestData
 import org.thoughtcrime.securesms.database.GroupTable
 import org.thoughtcrime.securesms.database.RecipientTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.GroupRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context
 import org.thoughtcrime.securesms.database.model.databaseprotos.member
+import org.thoughtcrime.securesms.database.model.databaseprotos.pendingMember
 import org.thoughtcrime.securesms.database.model.databaseprotos.requestingMember
 import org.thoughtcrime.securesms.database.setNewDescription
 import org.thoughtcrime.securesms.database.setNewTitle
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupId
+import org.thoughtcrime.securesms.groups.GroupNotAMemberException
 import org.thoughtcrime.securesms.groups.GroupsV2Authorization
+import org.thoughtcrime.securesms.groups.v2.ProfileKeySet
+import org.thoughtcrime.securesms.groups.v2.processing.GroupsV2StateProcessor.ProfileAndMessageHelper
 import org.thoughtcrime.securesms.jobmanager.JobManager
+import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob
 import org.thoughtcrime.securesms.jobs.RequestGroupV2InfoJob
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger
 import org.thoughtcrime.securesms.testutil.SystemOutLogger
+import org.whispersystems.signalservice.api.NetworkResult
+import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupResponse
+import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api
-import org.whispersystems.signalservice.api.groupsv2.PartialDecryptedGroup
+import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations
+import org.whispersystems.signalservice.api.groupsv2.NotAbleToApplyGroupV2ChangeException
+import org.whispersystems.signalservice.api.groupsv2.ReceivedGroupSendEndorsements
 import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import org.whispersystems.signalservice.api.push.ServiceIds
+import org.whispersystems.signalservice.internal.push.exceptions.NotInGroupException
+import java.io.IOException
+import java.util.Optional
 import java.util.UUID
 
+@Suppress("UsePropertyAccessSyntax")
+@SuppressLint("CheckResult")
 @RunWith(RobolectricTestRunner::class)
 @Config(manifest = Config.NONE, application = Application::class)
 class GroupsV2StateProcessorTest {
 
   companion object {
     private val masterKey = GroupMasterKey(fromStringCondensed("0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"))
+    private val secretParams = GroupSecretParams.deriveFromMasterKey(masterKey)
+    private val groupId = GroupId.v2(masterKey)
     private val selfAci: ACI = ACI.from(UUID.randomUUID())
     private val serviceIds: ServiceIds = ServiceIds(selfAci, PNI.from(UUID.randomUUID()))
     private val otherAci: ACI = ACI.from(UUID.randomUUID())
@@ -63,10 +91,11 @@ class GroupsV2StateProcessorTest {
   private lateinit var recipientTable: RecipientTable
   private lateinit var groupsV2API: GroupsV2Api
   private lateinit var groupsV2Authorization: GroupsV2Authorization
-  private lateinit var profileAndMessageHelper: GroupsV2StateProcessor.ProfileAndMessageHelper
+  private lateinit var groupsV2Operations: GroupsV2Operations
+  private lateinit var profileAndMessageHelper: ProfileAndMessageHelper
   private lateinit var jobManager: JobManager
 
-  private lateinit var processor: GroupsV2StateProcessor.StateProcessorForGroup
+  private lateinit var processor: GroupsV2StateProcessor
 
   @get:Rule
   val signalStore: SignalStoreRule = SignalStoreRule()
@@ -76,22 +105,38 @@ class GroupsV2StateProcessorTest {
     Log.initialize(SystemOutLogger())
     SignalProtocolLoggerProvider.setProvider(CustomSignalProtocolLogger())
 
-    groupTable = mockk(relaxed = true)
+    groupTable = mockk()
     recipientTable = mockk()
     groupsV2API = mockk()
-    groupsV2Authorization = mockk(relaxed = true)
-    profileAndMessageHelper = mockk(relaxed = true)
-    jobManager = mockk(relaxed = true)
+    groupsV2Operations = mockk()
+    groupsV2Authorization = mockk()
+    profileAndMessageHelper = spyk(ProfileAndMessageHelper(serviceIds.aci, masterKey, groupId))
+    jobManager = mockk()
 
-    mockkStatic(ApplicationDependencies::class)
-    every { ApplicationDependencies.getJobManager() } returns jobManager
+    mockkStatic(AppDependencies::class)
+    every { AppDependencies.jobManager } returns jobManager
+    every { AppDependencies.signalServiceAccountManager.getGroupsV2Api() } returns groupsV2API
+    every { AppDependencies.groupsV2Authorization } returns groupsV2Authorization
+    every { AppDependencies.groupsV2Operations } returns groupsV2Operations
 
-    processor = GroupsV2StateProcessor.StateProcessorForGroup(serviceIds, groupTable, groupsV2API, groupsV2Authorization, masterKey, profileAndMessageHelper)
+    mockkObject(SignalDatabase)
+    every { SignalDatabase.groups } returns groupTable
+    every { SignalDatabase.recipients } returns recipientTable
+
+    mockkObject(ProfileAndMessageHelper)
+    every { ProfileAndMessageHelper.create(any(), any(), any()) } returns profileAndMessageHelper
+
+    every { groupsV2Operations.forGroup(secretParams) } answers { callOriginal() }
+
+    processor = GroupsV2StateProcessor.forGroup(serviceIds, masterKey, secretParams)
   }
 
   @After
   fun tearDown() {
-//    reset(ApplicationDependencies.getJobManager())
+    unmockkStatic(AppDependencies::class)
+    unmockkObject(SignalDatabase)
+    unmockkObject(ProfileAndMessageHelper)
+    unmockkStatic(DecryptedGroupUtil::class)
   }
 
   private fun given(init: GroupStateTestData.() -> Unit) {
@@ -99,20 +144,36 @@ class GroupsV2StateProcessorTest {
 
     every { groupTable.getGroup(any<GroupId.V2>()) } returns data.groupRecord
     every { groupTable.isUnknownGroup(any<GroupId>()) } returns !data.groupRecord.isPresent
+    every { groupTable.isUnknownGroup(any<Optional<GroupRecord>>()) } returns !data.groupRecord.isPresent
+    every { groupTable.isActive(groupId) } returns data.groupRecord.map { it.isActive }.orElse(false)
 
-    data.serverState?.let { serverState ->
-      val testPartial = object : PartialDecryptedGroup(null, serverState, null, null) {
-        override fun getFullyDecryptedGroup(): DecryptedGroup {
-          return serverState
-        }
-      }
+    every { groupsV2Authorization.getAuthorizationForToday(serviceIds, secretParams) } returns null
+
+    if (data.expectTableUpdate) {
+      justRun { groupTable.update(any<GroupMasterKey>(), any<DecryptedGroup>(), any<ReceivedGroupSendEndorsements>()) }
+    }
+
+    if (data.expectTableCreate) {
+      every { groupTable.create(any<GroupMasterKey>(), any<DecryptedGroup>(), any<ReceivedGroupSendEndorsements>()) } returns groupId
+    }
 
-      every { groupsV2API.getPartialDecryptedGroup(any(), any()) } returns testPartial
-      every { groupsV2API.getGroup(any(), any()) } returns serverState
+    if (data.expectTableUpdate || data.expectTableCreate) {
+      justRun { profileAndMessageHelper.storeMessage(any(), any(), any()) }
+      justRun { profileAndMessageHelper.persistLearnedProfileKeys(any<ProfileKeySet>()) }
+    }
+
+    data.serverState?.let { serverState ->
+      every { groupsV2API.getGroup(any(), any()) } returns DecryptedGroupResponse(serverState, null)
     }
 
     data.changeSet?.let { changeSet ->
-      every { groupsV2API.getGroupHistoryPage(any(), data.requestedRevision, any(), data.includeFirst) } returns changeSet.toApiResponse()
+      every { groupsV2API.getGroupHistoryPage(any(), data.requestedRevision, any(), data.includeFirst, 0) } returns changeSet.toApiResponse()
+    }
+
+    every { groupsV2API.getGroupAsResult(any(), any()) } answers { callOriginal() }
+
+    data.joinedAtRevision?.let { joinedAt ->
+      every { groupsV2API.getGroupJoinedAt(any()) } returns NetworkResult.Success(joinedAt)
     }
   }
 
@@ -129,14 +190,35 @@ class GroupsV2StateProcessorTest {
         revision = 5,
         members = selfAndOthers
       )
-      serverState(
+      changeSet {
+      }
+      apiCallParameters(requestedRevision = 5, includeFirst = false)
+      joinedAtRevision = 0
+    }
+
+    val result = processor.updateLocalGroupToRevision(
+      targetRevision = GroupsV2StateProcessor.LATEST,
+      timestamp = 0
+    )
+
+    assertThat("local and server match revisions", result.updateStatus, `is`(GroupUpdateResult.UpdateStatus.GROUP_CONSISTENT_OR_AHEAD))
+  }
+
+  @Test
+  fun `when local revision matches requested revision, then return consistent or ahead`() {
+    given {
+      localState(
         revision = 5,
-        extendGroup = localState
+        members = selfAndOthers
       )
     }
 
-    val result = processor.updateLocalGroupToRevision(GroupsV2StateProcessor.LATEST, 0, null)
-    assertThat("local and server match revisions", result.groupState, `is`(GroupsV2StateProcessor.GroupState.GROUP_CONSISTENT_OR_AHEAD))
+    val result = processor.updateLocalGroupToRevision(
+      targetRevision = 5,
+      timestamp = 0
+    )
+
+    assertThat("local and server match revisions", result.updateStatus, `is`(GroupUpdateResult.UpdateStatus.GROUP_CONSISTENT_OR_AHEAD))
   }
 
   @Test
@@ -147,11 +229,6 @@ class GroupsV2StateProcessorTest {
         title = "Fdsa",
         members = selfAndOthers
       )
-      serverState(
-        revision = 6,
-        extendGroup = localState,
-        title = "Asdf"
-      )
       changeSet {
         changeLog(6) {
           change {
@@ -160,11 +237,19 @@ class GroupsV2StateProcessorTest {
         }
       }
       apiCallParameters(requestedRevision = 5, includeFirst = false)
+      joinedAtRevision = 0
+      expectTableUpdate = true
     }
 
-    val result = processor.updateLocalGroupToRevision(GroupsV2StateProcessor.LATEST, 0, null)
-    assertThat("local should update to server", result.groupState, `is`(GroupsV2StateProcessor.GroupState.GROUP_UPDATED))
+    val result = processor.updateLocalGroupToRevision(
+      targetRevision = GroupsV2StateProcessor.LATEST,
+      timestamp = 0
+    )
+
+    assertThat("local should update to server", result.updateStatus, `is`(GroupUpdateResult.UpdateStatus.GROUP_UPDATED))
     assertThat("title changed to match server", result.latestServer!!.title, `is`("Asdf"))
+
+    verify { groupTable.update(masterKey, result.latestServer!!, null) }
   }
 
   @Test
@@ -175,10 +260,6 @@ class GroupsV2StateProcessorTest {
         title = "Fdsa",
         members = selfAndOthers
       )
-      serverState(
-        revision = 7,
-        title = "Asdf!"
-      )
       changeSet {
         changeLog(6) {
           fullSnapshot(extendGroup = localState, title = "Asdf")
@@ -192,13 +273,21 @@ class GroupsV2StateProcessorTest {
           }
         }
       }
-      apiCallParameters(requestedRevision = 5, includeFirst = true)
+      apiCallParameters(requestedRevision = 5, includeFirst = false)
+      joinedAtRevision = 0
+      expectTableUpdate = true
     }
 
-    val result = processor.updateLocalGroupToRevision(GroupsV2StateProcessor.LATEST, 0, null)
-    assertThat("local should update to server", result.groupState, `is`(GroupsV2StateProcessor.GroupState.GROUP_UPDATED))
+    val result = processor.updateLocalGroupToRevision(
+      targetRevision = GroupsV2StateProcessor.LATEST,
+      timestamp = 0
+    )
+
+    assertThat("local should update to server", result.updateStatus, `is`(GroupUpdateResult.UpdateStatus.GROUP_UPDATED))
     assertThat("revision matches server", result.latestServer!!.revision, `is`(7))
     assertThat("title changed on server to final result", result.latestServer!!.title, `is`("Asdf!"))
+
+    verify { groupTable.update(masterKey, result.latestServer!!, null) }
   }
 
   @Test
@@ -227,13 +316,22 @@ class GroupsV2StateProcessorTest {
           }
         }
       }
+      apiCallParameters(requestedRevision = 100, includeFirst = false)
+      joinedAtRevision = 0
+      expectTableUpdate = true
     }
 
-    val result = processor.updateLocalGroupToRevision(GroupsV2StateProcessor.LATEST, 0, null)
-    assertThat("local should update to server", result.groupState, `is`(GroupsV2StateProcessor.GroupState.GROUP_UPDATED))
+    val result = processor.updateLocalGroupToRevision(
+      targetRevision = GroupsV2StateProcessor.LATEST,
+      timestamp = 0
+    )
+
+    assertThat("local should update to server", result.updateStatus, `is`(GroupUpdateResult.UpdateStatus.GROUP_UPDATED))
     assertThat("revision matches server", result.latestServer!!.revision, `is`(111))
     assertThat("title changed on server to final result", result.latestServer!!.title, `is`("And beyond"))
     assertThat("Description updated in change after full snapshot", result.latestServer!!.description, `is`("Description"))
+
+    verify { groupTable.update(masterKey, result.latestServer!!, null) }
   }
 
   @Test
@@ -241,54 +339,203 @@ class GroupsV2StateProcessorTest {
     given {
       localState(
         revision = 5,
-        disappearingMessageTimer = DecryptedTimer.Builder().duration(1000).build()
+        disappearingMessageTimer = DecryptedTimer(1000)
       )
+      expectTableUpdate = true
     }
 
-    val signedChange = DecryptedGroupChange.Builder().apply {
-      revision = 6
-      newTimer(DecryptedTimer.Builder().duration(5000).build())
-    }
+    val signedChange = DecryptedGroupChange(
+      revision = 6,
+      newTimer = DecryptedTimer(duration = 5000)
+    )
+
+    val result = processor.updateLocalGroupToRevision(
+      targetRevision = 6,
+      timestamp = 0,
+      signedGroupChange = signedChange,
+      serverGuid = UUID.randomUUID().toString()
+    )
 
-    val result = processor.updateLocalGroupToRevision(6, 0, signedChange.build())
     assertThat("revision matches peer change", result.latestServer!!.revision, `is`(6))
     assertThat("timer changed by peer change", result.latestServer!!.disappearingMessagesTimer!!.duration, `is`(5000))
+
+    verify { groupTable.update(masterKey, result.latestServer!!, null) }
   }
 
   @Test
-  fun `when freshly added to a group, with no group changes after being added, then update from server at the revision we were added`() {
+  fun applyP2PPromotePendingPni() {
     given {
+      localState(
+        revision = 5,
+        members = others,
+        pendingMembers = listOf(pendingMember(serviceIds.pni))
+      )
+      expectTableUpdate = true
+    }
+
+    val signedChange = DecryptedGroupChange(
+      revision = 6,
+      promotePendingPniAciMembers = listOf(member(selfAci).copy(pniBytes = serviceIds.pni.toByteString()))
+    )
+
+    justRun { jobManager.add(any()) }
+
+    val result = processor.updateLocalGroupToRevision(
+      targetRevision = 6,
+      timestamp = 0,
+      signedGroupChange = signedChange,
+      serverGuid = UUID.randomUUID().toString()
+    )
+
+    assertThat("revision matches peer change", result.latestServer!!.revision, `is`(6))
+    assertThat("member promoted by peer change", result.latestServer!!.members.map { it.aciBytes }, hasItem(selfAci.toByteString()))
+
+    verify { jobManager.add(ofType(DirectoryRefreshJob::class)) }
+    verify { groupTable.update(masterKey, result.latestServer!!, null) }
+  }
+
+  @Test
+  fun updateFromServerIfUnableToApplyP2PChange() {
+    given {
+      localState(
+        revision = 1,
+        members = selfAndOthers
+      )
       serverState(
         revision = 2,
         title = "Breaking Signal for Science",
-        description = "We break stuff, because we must.",
-        members = listOf(member(otherAci), member(selfAci, joinedAt = 2))
+        members = selfAndOthers
       )
       changeSet {
         changeLog(2) {
           fullSnapshot(serverState)
         }
       }
+      apiCallParameters(1, false)
+      joinedAtRevision = 0
+      expectTableUpdate = true
+    }
+
+    mockkStatic(DecryptedGroupUtil::class)
+    every { DecryptedGroupUtil.apply(any(), any()) } throws NotAbleToApplyGroupV2ChangeException()
+
+    val signedChange = DecryptedGroupChange(
+      revision = 2,
+      newTitle = DecryptedString("Breaking Signal for Science")
+    )
+
+    val result = processor.updateLocalGroupToRevision(
+      targetRevision = 2,
+      timestamp = 0,
+      signedGroupChange = signedChange,
+      serverGuid = UUID.randomUUID().toString()
+    )
+
+    assertThat("local should update to server", result.updateStatus, `is`(GroupUpdateResult.UpdateStatus.GROUP_UPDATED))
+    assertThat("revision matches server", result.latestServer!!.revision, `is`(2))
+
+    verify { groupsV2API.getGroupHistoryPage(secretParams, 1, any(), false, 0) }
+
+    unmockkStatic(DecryptedGroupUtil::class)
+  }
+
+  @Test(expected = GroupNotAMemberException::class)
+  fun skipP2PChangeForGroupNotIn() {
+    given {
+      localState(
+        revision = 1,
+        members = others,
+        active = false
+      )
+    }
+
+    every { groupsV2API.getGroupJoinedAt(any()) } returns NetworkResult.StatusCodeError(NotInGroupException())
+    every { groupsV2API.getGroupAsResult(any(), any()) } returns NetworkResult.StatusCodeError(NotInGroupException())
+
+    val signedChange = DecryptedGroupChange(
+      revision = 2,
+      newTitle = DecryptedString("Breaking Signal for Science"),
+      newDescription = DecryptedString("We break stuff, because we must.")
+    )
+
+    processor.updateLocalGroupToRevision(
+      targetRevision = 2,
+      timestamp = 0,
+      signedGroupChange = signedChange,
+      serverGuid = UUID.randomUUID().toString()
+    )
+  }
+
+  @Test
+  fun applyP2PChangeForGroupWeThinkAreIn() {
+    given {
+      localState(
+        revision = 1,
+        members = others,
+        active = false
+      )
+      expectTableUpdate = true
+    }
+
+    every { groupsV2API.getGroupJoinedAt(any()) } returns NetworkResult.StatusCodeError(NotInGroupException())
+    every { groupsV2API.getGroupAsResult(any(), any()) } returns NetworkResult.StatusCodeError(NotInGroupException())
+
+    val signedChange = DecryptedGroupChange(
+      revision = 3,
+      newMembers = listOf(member(selfAci))
+    )
+
+    val result = processor.updateLocalGroupToRevision(
+      targetRevision = GroupsV2StateProcessor.LATEST,
+      timestamp = 0,
+      signedGroupChange = signedChange,
+      serverGuid = UUID.randomUUID().toString()
+    )
+
+    assertThat("local should update to server", result.updateStatus, `is`(GroupUpdateResult.UpdateStatus.GROUP_UPDATED))
+    assertThat("revision matches server", result.latestServer!!.revision, `is`(3))
+
+    verify { groupTable.update(masterKey, result.latestServer!!, null) }
+  }
+
+  @Test
+  fun `when freshly added to a group, with no group changes after being added, then update from server at the revision we were added`() {
+    given {
+      changeSet {
+        changeLog(2) {
+          fullSnapshot(
+            title = "Breaking Signal for Science",
+            description = "We break stuff, because we must.",
+            members = listOf(member(otherAci), member(selfAci, joinedAt = 2))
+          )
+        }
+      }
       apiCallParameters(2, true)
+      joinedAtRevision = 2
+      expectTableCreate = true
     }
 
-    val result = processor.updateLocalGroupToRevision(2, 0, DecryptedGroupChange())
-    assertThat("local should update to server", result.groupState, `is`(GroupsV2StateProcessor.GroupState.GROUP_UPDATED))
+    val result = processor.updateLocalGroupToRevision(
+      targetRevision = 2,
+      timestamp = 0
+    )
+
+    assertThat("local should update to server", result.updateStatus, `is`(GroupUpdateResult.UpdateStatus.GROUP_UPDATED))
     assertThat("revision matches server", result.latestServer!!.revision, `is`(2))
+
+    verify { groupTable.create(masterKey, result.latestServer!!, null) }
   }
 
   @Test
   fun `when freshly added to a group, with additional group changes after being added, then only update from server at the revision we were added, and then schedule pulling additional changes later`() {
     given {
-      serverState(
-        revision = 3,
-        title = "Breaking Signal for Science",
-        description = "We break stuff, because we must.",
-        members = listOf(member(otherAci), member(selfAci, joinedAt = 2))
-      )
       changeSet {
         changeLog(2) {
-          fullSnapshot(serverState, title = "Baking Signal for Science")
+          fullSnapshot(
+            title = "Baking Signal for Science",
+            description = "We break stuff, because we must.",
+            members = listOf(member(otherAci), member(selfAci, joinedAt = 2))
+          )
         }
         changeLog(3) {
           change {
@@ -297,16 +544,24 @@ class GroupsV2StateProcessorTest {
         }
       }
       apiCallParameters(2, true)
+      joinedAtRevision = 2
+      expectTableCreate = true
     }
 
     every { groupTable.isUnknownGroup(any<GroupId>()) } returns true
+    justRun { jobManager.add(any()) }
 
-    val result = processor.updateLocalGroupToRevision(2, 0, DecryptedGroupChange())
+    val result = processor.updateLocalGroupToRevision(
+      targetRevision = 2,
+      timestamp = 0
+    )
 
-    assertThat("local should update to revision added", result.groupState, `is`(GroupsV2StateProcessor.GroupState.GROUP_UPDATED))
+    assertThat("local should update to revision added", result.updateStatus, `is`(GroupUpdateResult.UpdateStatus.GROUP_UPDATED))
     assertThat("revision matches peer revision added", result.latestServer!!.revision, `is`(2))
     assertThat("title matches that as it was in revision added", result.latestServer!!.title, `is`("Baking Signal for Science"))
+
     verify { jobManager.add(ofType(RequestGroupV2InfoJob::class)) }
+    verify { groupTable.create(masterKey, result.latestServer!!, null) }
   }
 
   @Test
@@ -321,12 +576,18 @@ class GroupsV2StateProcessorTest {
         description = "Indeed.",
         members = selfAndOthers
       )
+      expectTableUpdate = true
     }
 
-    val result = processor.updateLocalGroupToRevision(GroupsV2StateProcessor.LATEST, 0, null)
+    val result = processor.updateLocalGroupToRevision(
+      targetRevision = GroupsV2StateProcessor.LATEST,
+      timestamp = 0
+    )
 
-    assertThat("local should update to server", result.groupState, `is`(GroupsV2StateProcessor.GroupState.GROUP_UPDATED))
+    assertThat("local should update to server", result.updateStatus, `is`(GroupUpdateResult.UpdateStatus.GROUP_UPDATED))
     assertThat("revision matches latest server", result.latestServer!!.revision, `is`(10))
+
+    verify { groupTable.update(masterKey, result.latestServer!!, null) }
   }
 
   @Test
@@ -337,26 +598,32 @@ class GroupsV2StateProcessorTest {
         title = "Beam me up",
         requestingMembers = listOf(requestingMember(selfAci))
       )
-      serverState(
-        revision = 3,
-        title = "Beam me up",
-        members = listOf(member(otherAci), member(selfAci, joinedAt = 3))
-      )
+
       changeSet {
         changeLog(3) {
-          fullSnapshot(serverState)
+          fullSnapshot(
+            title = "Beam me up",
+            members = listOf(member(otherAci), member(selfAci, joinedAt = 3))
+          )
           change {
             newMembers += member(selfAci, joinedAt = 3)
           }
         }
       }
       apiCallParameters(requestedRevision = 3, includeFirst = true)
+      joinedAtRevision = 3
+      expectTableUpdate = true
     }
 
-    val result = processor.updateLocalGroupToRevision(3, 0, null)
+    val result = processor.updateLocalGroupToRevision(
+      targetRevision = 3,
+      timestamp = 0
+    )
 
-    assertThat("local should update to server", result.groupState, `is`(GroupsV2StateProcessor.GroupState.GROUP_UPDATED))
+    assertThat("local should update to server", result.updateStatus, `is`(GroupUpdateResult.UpdateStatus.GROUP_UPDATED))
     assertThat("revision matches server", result.latestServer!!.revision, `is`(3))
+
+    verify { groupTable.update(masterKey, result.latestServer!!, null) }
   }
 
   @Test
@@ -367,14 +634,12 @@ class GroupsV2StateProcessorTest {
         title = "Beam me up",
         requestingMembers = listOf(requestingMember(selfAci))
       )
-      serverState(
-        revision = 5,
-        title = "Beam me up!",
-        members = listOf(member(otherAci), member(selfAci, joinedAt = 3))
-      )
       changeSet {
         changeLog(3) {
-          fullSnapshot(extendGroup = serverState, title = "Beam me up")
+          fullSnapshot(
+            title = "Beam me up",
+            members = listOf(member(otherAci), member(selfAci, joinedAt = 3))
+          )
           change {
             newMembers += member(selfAci, joinedAt = 3)
           }
@@ -391,47 +656,35 @@ class GroupsV2StateProcessorTest {
         }
       }
       apiCallParameters(requestedRevision = 3, includeFirst = true)
+      joinedAtRevision = 3
+      expectTableUpdate = true
     }
 
-    val result = processor.updateLocalGroupToRevision(3, 0, null)
+    justRun { jobManager.add(any()) }
 
-    assertThat("local should update to server", result.groupState, `is`(GroupsV2StateProcessor.GroupState.GROUP_UPDATED))
+    val result = processor.updateLocalGroupToRevision(
+      targetRevision = 3,
+      timestamp = 0
+    )
+
+    assertThat("local should update to server", result.updateStatus, `is`(GroupUpdateResult.UpdateStatus.GROUP_UPDATED))
     assertThat("revision matches revision approved at", result.latestServer!!.revision, `is`(3))
     assertThat("title matches revision approved at", result.latestServer!!.title, `is`("Beam me up"))
+
     verify { jobManager.add(ofType(RequestGroupV2InfoJob::class)) }
+    verify { groupTable.update(masterKey, result.latestServer!!, null) }
   }
 
   @Test
-  fun `when failing to update fully to desired revision, then try again forcing inclusion of full group state, and then successfully update from server to latest revision`() {
+  fun `when local state for same revision does not match server, then successfully update from server to latest revision`() {
     val randomMembers = listOf(member(UUID.randomUUID()), member(UUID.randomUUID()))
+
     given {
       localState(
         revision = 100,
         title = "Title",
         members = others
       )
-      serverState(
-        extendGroup = localState,
-        revision = 101,
-        members = listOf(others[0], randomMembers[0], member(selfAci, joinedAt = 100))
-      )
-      changeSet {
-        changeLog(100) {
-          change {
-            newMembers += member(selfAci, joinedAt = 100)
-          }
-        }
-        changeLog(101) {
-          change {
-            deleteMembers += randomMembers[1].aciBytes
-            modifiedProfileKeys += randomMembers[0]
-          }
-        }
-      }
-      apiCallParameters(100, false)
-    }
-
-    val secondApiCallChangeSet = GroupStateTestData(masterKey).apply {
       changeSet {
         changeLog(100) {
           fullSnapshot(
@@ -449,13 +702,20 @@ class GroupsV2StateProcessorTest {
           }
         }
       }
+      apiCallParameters(100, true)
+      joinedAtRevision = 100
+      expectTableUpdate = true
     }
-    every { groupsV2API.getGroupHistoryPage(any(), 100, any(), true) } returns secondApiCallChangeSet.changeSet!!.toApiResponse()
 
-    val result = processor.updateLocalGroupToRevision(GroupsV2StateProcessor.LATEST, 0, null)
+    val result = processor.updateLocalGroupToRevision(
+      targetRevision = GroupsV2StateProcessor.LATEST,
+      timestamp = 0
+    )
 
-    assertThat("local should update to server", result.groupState, `is`(GroupsV2StateProcessor.GroupState.GROUP_UPDATED))
+    assertThat("local should update to server", result.updateStatus, `is`(GroupUpdateResult.UpdateStatus.GROUP_UPDATED))
     assertThat("revision matches latest revision on server", result.latestServer!!.revision, `is`(101))
+
+    verify { groupTable.update(masterKey, result.latestServer!!, null) }
   }
 
   /**
@@ -466,23 +726,12 @@ class GroupsV2StateProcessorTest {
   fun missedMemberAddResolvesWithMultipleRevisionUpdate() {
     val secondOther = member(ACI.from(UUID.randomUUID()))
 
-    profileAndMessageHelper.masterKey = masterKey
-
-    val updateMessageContextArgs = mutableListOf<DecryptedGroupV2Context>()
-    every { profileAndMessageHelper.insertUpdateMessages(any(), any(), any(), any()) } answers { callOriginal() }
-    every { profileAndMessageHelper.storeMessage(capture(updateMessageContextArgs), any(), any()) } returns Unit
-
     given {
       localState(
         revision = 8,
         title = "Whatever",
         members = selfAndOthers
       )
-      serverState(
-        revision = 10,
-        title = "Changed",
-        members = selfAndOthers + secondOther
-      )
       changeSet {
         changeLog(9) {
           change {
@@ -499,14 +748,25 @@ class GroupsV2StateProcessorTest {
           }
         }
       }
-      apiCallParameters(requestedRevision = 8, includeFirst = true)
+      apiCallParameters(requestedRevision = 8, includeFirst = false)
+      joinedAtRevision = 0
+      expectTableUpdate = true
     }
 
-    val result = processor.updateLocalGroupToRevision(GroupsV2StateProcessor.LATEST, 0, null)
-    assertThat("local should update to server", result.groupState, `is`(GroupsV2StateProcessor.GroupState.GROUP_UPDATED))
+    val updateMessageContextArgs = mutableListOf<DecryptedGroupV2Context>()
+    every { profileAndMessageHelper.storeMessage(capture(updateMessageContextArgs), any(), any()) } returns Unit
+
+    val result = processor.updateLocalGroupToRevision(
+      targetRevision = GroupsV2StateProcessor.LATEST,
+      timestamp = 0
+    )
+
+    assertThat("local should update to server", result.updateStatus, `is`(GroupUpdateResult.UpdateStatus.GROUP_UPDATED))
     assertThat("members contains second other", result.latestServer!!.members, hasItem(secondOther))
 
     assertThat("group update messages contains new member add", updateMessageContextArgs.map { it.change!!.newMembers }, hasItem(hasItem(secondOther)))
+
+    verify { groupTable.update(masterKey, result.latestServer!!, null) }
   }
 
   /**
@@ -517,12 +777,6 @@ class GroupsV2StateProcessorTest {
   fun missedMemberAddResolvesWithForcedUpdate() {
     val secondOther = member(ACI.from(UUID.randomUUID()))
 
-    profileAndMessageHelper.masterKey = masterKey
-
-    val updateMessageContextArgs = mutableListOf<DecryptedGroupV2Context>()
-    every { profileAndMessageHelper.insertUpdateMessages(any(), any(), any(), any()) } answers { callOriginal() }
-    every { profileAndMessageHelper.storeMessage(capture(updateMessageContextArgs), any(), any()) } returns Unit
-
     given {
       localState(
         revision = 10,
@@ -534,14 +788,21 @@ class GroupsV2StateProcessorTest {
         title = "Changed",
         members = selfAndOthers + secondOther
       )
+      expectTableUpdate = true
     }
 
+    val updateMessageContextArgs = mutableListOf<DecryptedGroupV2Context>()
+    every { profileAndMessageHelper.insertUpdateMessages(any(), any(), any(), any()) } answers { callOriginal() }
+    every { profileAndMessageHelper.storeMessage(capture(updateMessageContextArgs), any(), any()) } returns Unit
+
     val result = processor.forceSanityUpdateFromServer(0)
-    assertThat("local should update to server", result.groupState, `is`(GroupsV2StateProcessor.GroupState.GROUP_UPDATED))
+    assertThat("local should update to server", result.updateStatus, `is`(GroupUpdateResult.UpdateStatus.GROUP_UPDATED))
     assertThat("members contains second other", result.latestServer!!.members, hasItem(secondOther))
     assertThat("title should be updated", result.latestServer!!.title, `is`("Changed"))
     assertThat("group update messages contains new member add", updateMessageContextArgs.map { it.change!!.newMembers }, hasItem(hasItem(secondOther)))
     assertThat("group update messages contains title change", updateMessageContextArgs.mapNotNull { it.change!!.newTitle }.any { it.value_ == "Changed" })
+
+    verify { groupTable.update(masterKey, result.latestServer!!, null) }
   }
 
   /**
@@ -563,6 +824,66 @@ class GroupsV2StateProcessorTest {
     }
 
     val result = processor.forceSanityUpdateFromServer(0)
-    assertThat("local should be unchanged", result.groupState, `is`(GroupsV2StateProcessor.GroupState.GROUP_CONSISTENT_OR_AHEAD))
+    assertThat("local should be unchanged", result.updateStatus, `is`(GroupUpdateResult.UpdateStatus.GROUP_CONSISTENT_OR_AHEAD))
+  }
+
+  /** No local group state fails gracefully during force update */
+  @Test
+  fun missingLocalGroupStateForForcedUpdate() {
+    given { }
+
+    val result = processor.forceSanityUpdateFromServer(0)
+    assertThat("local should be unchanged", result.updateStatus, `is`(GroupUpdateResult.UpdateStatus.GROUP_CONSISTENT_OR_AHEAD))
+  }
+
+  @Test(expected = GroupNotAMemberException::class)
+  fun serverNotInGroupFailsForForcedUpdate() {
+    given {
+      localState(
+        revision = 5,
+        members = selfAndOthers
+      )
+    }
+
+    every { groupsV2API.getGroup(any(), any()) } throws NotInGroupException()
+
+    processor.forceSanityUpdateFromServer(0)
+  }
+
+  @Test(expected = IOException::class)
+  fun serverVerificationFailedFailsForForcedUpdate() {
+    given {
+      localState(
+        revision = 5,
+        members = selfAndOthers
+      )
+    }
+
+    every { groupsV2API.getGroup(any(), any()) } throws VerificationFailedException()
+
+    processor.forceSanityUpdateFromServer(0)
+  }
+
+  @Test
+  fun restoreFromPlaceholderForcedUpdate() {
+    given {
+      localState(
+        revision = GroupsV2StateProcessor.RESTORE_PLACEHOLDER_REVISION
+      )
+      serverState(
+        revision = 10,
+        members = selfAndOthers,
+        title = "Asdf!"
+      )
+      expectTableUpdate = true
+    }
+
+    val result = processor.forceSanityUpdateFromServer(0)
+
+    assertThat("local should update to server", result.updateStatus, `is`(GroupUpdateResult.UpdateStatus.GROUP_UPDATED))
+    assertThat("revision matches server", result.latestServer!!.revision, `is`(10))
+    assertThat("title changed on server to final result", result.latestServer!!.title, `is`("Asdf!"))
+
+    verify { groupTable.update(masterKey, result.latestServer!!, null) }
   }
 }
diff --git a/app/src/test/java/org/thoughtcrime/securesms/keyvalue/PaymentsValuesTest.kt b/app/src/test/java/org/thoughtcrime/securesms/keyvalue/PaymentsValuesTest.kt
index 308e27d588..9dd89a0cf8 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/keyvalue/PaymentsValuesTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/keyvalue/PaymentsValuesTest.kt
@@ -2,39 +2,30 @@ package org.thoughtcrime.securesms.keyvalue
 
 import android.app.Application
 import androidx.test.core.app.ApplicationProvider
+import io.mockk.every
+import io.mockk.mockkObject
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Ignore
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
-import org.mockito.MockedStatic
-import org.mockito.Mockito.`when`
-import org.mockito.junit.MockitoJUnit
-import org.mockito.junit.MockitoRule
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.dependencies.MockApplicationDependencyProvider
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 
 @RunWith(RobolectricTestRunner::class)
 @Config(manifest = Config.NONE, application = Application::class)
 class PaymentsValuesTest {
 
-  @Rule
-  @JvmField
-  val mockitoRule: MockitoRule = MockitoJUnit.rule()
-
-  @Mock
-  private lateinit var featureFlags: MockedStatic<FeatureFlags>
-
   @Before
   fun setup() {
-    if (!ApplicationDependencies.isInitialized()) {
-      ApplicationDependencies.init(ApplicationProvider.getApplicationContext(), MockApplicationDependencyProvider())
+    if (!AppDependencies.isInitialized) {
+      AppDependencies.init(ApplicationProvider.getApplicationContext(), MockApplicationDependencyProvider())
     }
+
+    mockkObject(RemoteConfig)
   }
 
   @Test
@@ -45,7 +36,7 @@ class PaymentsValuesTest {
       }
     )
 
-    assertEquals(PaymentsAvailability.NOT_IN_REGION, SignalStore.paymentsValues().paymentsAvailability)
+    assertEquals(PaymentsAvailability.NOT_IN_REGION, SignalStore.payments.paymentsAvailability)
   }
 
   @Test
@@ -59,10 +50,10 @@ class PaymentsValuesTest {
       }
     )
 
-    `when`(FeatureFlags.payments()).thenReturn(false)
-    `when`(FeatureFlags.paymentsCountryBlocklist()).thenReturn("")
+    every { RemoteConfig.payments } returns false
+    every { RemoteConfig.paymentsCountryBlocklist } returns ""
 
-    assertEquals(PaymentsAvailability.DISABLED_REMOTELY, SignalStore.paymentsValues().paymentsAvailability)
+    assertEquals(PaymentsAvailability.DISABLED_REMOTELY, SignalStore.payments.paymentsAvailability)
   }
 
   @Test
@@ -76,10 +67,10 @@ class PaymentsValuesTest {
       }
     )
 
-    `when`(FeatureFlags.payments()).thenReturn(false)
-    `when`(FeatureFlags.paymentsCountryBlocklist()).thenReturn("")
+    every { RemoteConfig.payments } returns false
+    every { RemoteConfig.paymentsCountryBlocklist } returns ""
 
-    assertEquals(PaymentsAvailability.WITHDRAW_ONLY, SignalStore.paymentsValues().paymentsAvailability)
+    assertEquals(PaymentsAvailability.WITHDRAW_ONLY, SignalStore.payments.paymentsAvailability)
   }
 
   @Test
@@ -93,10 +84,10 @@ class PaymentsValuesTest {
       }
     )
 
-    `when`(FeatureFlags.payments()).thenReturn(true)
-    `when`(FeatureFlags.paymentsCountryBlocklist()).thenReturn("")
+    every { RemoteConfig.payments } returns true
+    every { RemoteConfig.paymentsCountryBlocklist } returns ""
 
-    assertEquals(PaymentsAvailability.REGISTRATION_AVAILABLE, SignalStore.paymentsValues().paymentsAvailability)
+    assertEquals(PaymentsAvailability.REGISTRATION_AVAILABLE, SignalStore.payments.paymentsAvailability)
   }
 
   @Test
@@ -110,10 +101,10 @@ class PaymentsValuesTest {
       }
     )
 
-    `when`(FeatureFlags.payments()).thenReturn(true)
-    `when`(FeatureFlags.paymentsCountryBlocklist()).thenReturn("")
+    every { RemoteConfig.payments } returns true
+    every { RemoteConfig.paymentsCountryBlocklist } returns ""
 
-    assertEquals(PaymentsAvailability.WITHDRAW_AND_SEND, SignalStore.paymentsValues().paymentsAvailability)
+    assertEquals(PaymentsAvailability.WITHDRAW_AND_SEND, SignalStore.payments.paymentsAvailability)
   }
 
   @Test
@@ -126,10 +117,10 @@ class PaymentsValuesTest {
       }
     )
 
-    `when`(FeatureFlags.payments()).thenReturn(true)
-    `when`(FeatureFlags.paymentsCountryBlocklist()).thenReturn("1")
+    every { RemoteConfig.payments } returns true
+    every { RemoteConfig.paymentsCountryBlocklist } returns "1"
 
-    assertEquals(PaymentsAvailability.NOT_IN_REGION, SignalStore.paymentsValues().paymentsAvailability)
+    assertEquals(PaymentsAvailability.NOT_IN_REGION, SignalStore.payments.paymentsAvailability)
   }
 
   @Test
@@ -143,10 +134,10 @@ class PaymentsValuesTest {
       }
     )
 
-    `when`(FeatureFlags.payments()).thenReturn(true)
-    `when`(FeatureFlags.paymentsCountryBlocklist()).thenReturn("1")
+    every { RemoteConfig.payments } returns true
+    every { RemoteConfig.paymentsCountryBlocklist } returns "1"
 
-    assertEquals(PaymentsAvailability.WITHDRAW_ONLY, SignalStore.paymentsValues().paymentsAvailability)
+    assertEquals(PaymentsAvailability.WITHDRAW_ONLY, SignalStore.payments.paymentsAvailability)
   }
 
   /**
@@ -160,6 +151,6 @@ class PaymentsValuesTest {
         }
       )
     )
-    SignalStore.inject(store)
+    SignalStore.testInject(store)
   }
 }
diff --git a/app/src/test/java/org/thoughtcrime/securesms/mediasend/MediaRepositoryTest.kt b/app/src/test/java/org/thoughtcrime/securesms/mediasend/MediaRepositoryTest.kt
index f6d7dd3a7f..7ed7f548f5 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/mediasend/MediaRepositoryTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/mediasend/MediaRepositoryTest.kt
@@ -116,7 +116,8 @@ class MediaRepositoryTest {
     videoGif: Boolean = false,
     bucketId: Optional<String> = Optional.empty(),
     caption: Optional<String> = Optional.empty(),
-    transformProperties: Optional<TransformProperties> = Optional.empty()
+    transformProperties: Optional<TransformProperties> = Optional.empty(),
+    fileName: Optional<String> = Optional.empty()
   ): Media {
     return Media(
       uri,
@@ -130,7 +131,8 @@ class MediaRepositoryTest {
       videoGif,
       bucketId,
       caption,
-      transformProperties
+      transformProperties,
+      fileName
     )
   }
 }
diff --git a/app/src/test/java/org/thoughtcrime/securesms/notifications/DeviceSpecificNotificationConfigTest.kt b/app/src/test/java/org/thoughtcrime/securesms/notifications/DeviceSpecificNotificationConfigTest.kt
new file mode 100644
index 0000000000..a2f1bf1f2d
--- /dev/null
+++ b/app/src/test/java/org/thoughtcrime/securesms/notifications/DeviceSpecificNotificationConfigTest.kt
@@ -0,0 +1,100 @@
+package org.thoughtcrime.securesms.notifications
+
+import android.app.Application
+import android.os.Build
+import io.mockk.every
+import io.mockk.mockkObject
+import io.mockk.unmockkObject
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.robolectric.util.ReflectionHelpers
+import org.thoughtcrime.securesms.assertIs
+import org.thoughtcrime.securesms.util.RemoteConfig
+
+@RunWith(RobolectricTestRunner::class)
+@Config(manifest = Config.NONE, application = Application::class)
+class DeviceSpecificNotificationConfigTest {
+
+  @Before
+  fun setup() {
+    mockkObject(RemoteConfig)
+  }
+
+  @After
+  fun tearDown() {
+    unmockkObject(RemoteConfig)
+  }
+
+  @Test
+  fun `empty config`() {
+    every { RemoteConfig.deviceSpecificNotificationConfig } returns ""
+    DeviceSpecificNotificationConfig.computeConfig() assertIs DeviceSpecificNotificationConfig.Config()
+  }
+
+  @Test
+  fun `invalid config`() {
+    every { RemoteConfig.deviceSpecificNotificationConfig } returns "bad"
+    DeviceSpecificNotificationConfig.computeConfig() assertIs DeviceSpecificNotificationConfig.Config()
+  }
+
+  @Test
+  fun `simple device match`() {
+    ReflectionHelpers.setStaticField(Build::class.java, "MODEL", "test")
+    every { RemoteConfig.deviceSpecificNotificationConfig } returns """[ { "model": "test", "link": "test.com", "showConditionCode": "always", "localePercent": "*:500000", "version": 3 } ]"""
+    DeviceSpecificNotificationConfig.computeConfig() assertIs DeviceSpecificNotificationConfig.Config(model = "test", link = "test.com", showConditionCode = "always", localePercent = "*:500000", version = 3)
+  }
+
+  @Test
+  fun `complex device match`() {
+    ReflectionHelpers.setStaticField(Build::class.java, "MODEL", "test-1")
+    every { RemoteConfig.deviceSpecificNotificationConfig } returns
+      """
+      [
+        { "model": "test", "showConditionCode": "always", "localePercent": "*:10000", "version": 1 },
+        { "model": "test-1", "showConditionCode": "has-battery-optimization-on", "localePercent": "*:20000", "version": 2 },
+        { "model": "test-11", "showConditionCode": "has-slow-notifications", "localePercent": "*:30000", "version": 3 },
+        { "model": "test-11*", "showConditionCode": "never", "localePercent": "*:40000", "version": 4 }
+      ]
+      """.trimMargin()
+    DeviceSpecificNotificationConfig.computeConfig() assertIs DeviceSpecificNotificationConfig.Config(model = "test-1", showConditionCode = "has-battery-optimization-on", localePercent = "*:20000", version = 2)
+  }
+
+  @Test
+  fun `simple wildcard device match`() {
+    ReflectionHelpers.setStaticField(Build::class.java, "MODEL", "test1")
+    every { RemoteConfig.deviceSpecificNotificationConfig } returns """[ { "model": "test*", "link": "test.com", "showConditionCode": "never", "localePercent": "*:500000", "version": 1 } ]"""
+    DeviceSpecificNotificationConfig.currentConfig assertIs DeviceSpecificNotificationConfig.Config(model = "test*", link = "test.com", showConditionCode = "never", localePercent = "*:500000", version = 1)
+  }
+
+  @Test
+  fun `complex wildcard device match`() {
+    ReflectionHelpers.setStaticField(Build::class.java, "MODEL", "test-1")
+    every { RemoteConfig.deviceSpecificNotificationConfig } returns
+      """
+      [
+        { "model": "*", "showConditionCode": "always", "localePercent": "*:10000", "version": 1 },
+        { "model": "test1", "showConditionCode": "has-slow-notifications", "localePercent": "*:20000", "version": 2 },
+        { "model": "test-", "showConditionCode": "never", "localePercent": "*:30000", "version": 3 }
+      ]
+      """.trimMargin()
+    DeviceSpecificNotificationConfig.computeConfig() assertIs DeviceSpecificNotificationConfig.Config(model = "*", showConditionCode = "always", localePercent = "*:10000", version = 1)
+  }
+
+  @Test
+  fun `no device match`() {
+    ReflectionHelpers.setStaticField(Build::class.java, "MODEL", "bad")
+    every { RemoteConfig.deviceSpecificNotificationConfig } returns """[ { "model": "test", "link": "test.com", "showConditionCode": "always", "localePercent": "*:500000", "version": 1 } ]"""
+    DeviceSpecificNotificationConfig.computeConfig() assertIs DeviceSpecificNotificationConfig.Config()
+  }
+
+  @Test
+  fun `default fields is zero percent`() {
+    ReflectionHelpers.setStaticField(Build::class.java, "MODEL", "test")
+    every { RemoteConfig.deviceSpecificNotificationConfig } returns """[ { "model": "test" } ]"""
+    DeviceSpecificNotificationConfig.computeConfig() assertIs DeviceSpecificNotificationConfig.Config(model = "test", localePercent = "*", version = 0)
+  }
+}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/notifications/MarkReadReceiverTest.java b/app/src/test/java/org/thoughtcrime/securesms/notifications/MarkReadReceiverTest.java
index 2e9ce8ad29..74bd2bbd4b 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/notifications/MarkReadReceiverTest.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/notifications/MarkReadReceiverTest.java
@@ -18,7 +18,7 @@
 import org.thoughtcrime.securesms.database.MessageTable;
 import org.thoughtcrime.securesms.database.model.MessageId;
 import org.thoughtcrime.securesms.database.model.StoryType;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JsonJobData;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
@@ -45,7 +45,7 @@ public class MarkReadReceiverTest {
   public MockitoRule rule = MockitoJUnit.rule();
 
   @Mock
-  private MockedStatic<ApplicationDependencies> applicationDependenciesMockedStatic;
+  private MockedStatic<AppDependencies> applicationDependenciesMockedStatic;
 
   @Mock
   private MockedStatic<Recipient> recipientMockedStatic;
@@ -57,7 +57,7 @@ public class MarkReadReceiverTest {
 
   @Before
   public void setUp() {
-    applicationDependenciesMockedStatic.when(ApplicationDependencies::getJobManager).thenReturn(mockJobManager);
+    applicationDependenciesMockedStatic.when(AppDependencies::getJobManager).thenReturn(mockJobManager);
     doAnswer((Answer<Void>) invocation -> {
       jobs.add((Job) invocation.getArguments()[0]);
       return null;
diff --git a/app/src/test/java/org/thoughtcrime/securesms/payments/GeographicalRestrictionsTest.java b/app/src/test/java/org/thoughtcrime/securesms/payments/GeographicalRestrictionsTest.java
index b467bf902f..a346e8b985 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/payments/GeographicalRestrictionsTest.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/payments/GeographicalRestrictionsTest.java
@@ -6,7 +6,7 @@
 import org.mockito.MockedStatic;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -18,22 +18,22 @@ public final class GeographicalRestrictionsTest {
   public MockitoRule rule = MockitoJUnit.rule();
 
   @Mock
-  private MockedStatic<FeatureFlags> featureFlagsMockedStatic;
+  private MockedStatic<RemoteConfig> remoteConfigMockedStatic;
 
   @Test
   public void e164Allowed_general() {
-    when(FeatureFlags.paymentsCountryBlocklist()).thenReturn("");
+    when(RemoteConfig.paymentsCountryBlocklist()).thenReturn("");
     assertTrue(GeographicalRestrictions.e164Allowed("+15551234567"));
 
-    when(FeatureFlags.paymentsCountryBlocklist()).thenReturn("1");
+    when(RemoteConfig.paymentsCountryBlocklist()).thenReturn("1");
     assertFalse(GeographicalRestrictions.e164Allowed("+15551234567"));
 
-    when(FeatureFlags.paymentsCountryBlocklist()).thenReturn("1,44");
+    when(RemoteConfig.paymentsCountryBlocklist()).thenReturn("1,44");
     assertFalse(GeographicalRestrictions.e164Allowed("+15551234567"));
     assertFalse(GeographicalRestrictions.e164Allowed("+445551234567"));
     assertTrue(GeographicalRestrictions.e164Allowed("+525551234567"));
 
-    when(FeatureFlags.paymentsCountryBlocklist()).thenReturn("1 234,44");
+    when(RemoteConfig.paymentsCountryBlocklist()).thenReturn("1 234,44");
     assertFalse(GeographicalRestrictions.e164Allowed("+12341234567"));
     assertTrue(GeographicalRestrictions.e164Allowed("+15551234567"));
     assertTrue(GeographicalRestrictions.e164Allowed("+525551234567"));
diff --git a/app/src/test/java/org/thoughtcrime/securesms/recipients/BaseRecipientTest.kt b/app/src/test/java/org/thoughtcrime/securesms/recipients/BaseRecipientTest.kt
index e4a54deab5..c502fdd075 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/recipients/BaseRecipientTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/recipients/BaseRecipientTest.kt
@@ -15,7 +15,7 @@ import org.mockito.junit.MockitoRule
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 
 @RunWith(RobolectricTestRunner::class)
@@ -27,7 +27,7 @@ abstract class BaseRecipientTest {
   val mockitoRule: MockitoRule = MockitoJUnit.rule()
 
   @Mock
-  private lateinit var applicationDependenciesStaticMock: MockedStatic<ApplicationDependencies>
+  private lateinit var applicationDependenciesStaticMock: MockedStatic<AppDependencies>
 
   @Mock
   private lateinit var attachmentSecretProviderStaticMock: MockedStatic<AttachmentSecretProvider>
@@ -42,7 +42,7 @@ abstract class BaseRecipientTest {
   fun superSetUp() {
     val application = ApplicationProvider.getApplicationContext<Application>()
 
-    `when`(ApplicationDependencies.getApplication()).thenReturn(application)
+    `when`(AppDependencies.application).thenReturn(application)
     `when`(AttachmentSecretProvider.getInstance(ArgumentMatchers.any())).thenThrow(RuntimeException::class.java)
   }
 }
diff --git a/app/src/test/java/org/thoughtcrime/securesms/recipients/Recipient_getChatColorsTest.kt b/app/src/test/java/org/thoughtcrime/securesms/recipients/Recipient_getChatColorsTest.kt
index b62c7a0bb7..898a46fdaf 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/recipients/Recipient_getChatColorsTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/recipients/Recipient_getChatColorsTest.kt
@@ -1,11 +1,11 @@
 package org.thoughtcrime.securesms.recipients
 
 import android.graphics.Color
+import io.mockk.every
+import io.mockk.mockk
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import org.mockito.Mockito.mock
-import org.mockito.Mockito.`when`
 import org.thoughtcrime.securesms.conversation.colors.ChatColors
 import org.thoughtcrime.securesms.conversation.colors.ChatColorsPalette
 import org.thoughtcrime.securesms.database.RecipientDatabaseTestUtils.createRecipient
@@ -26,14 +26,17 @@ class Recipient_getChatColorsTest : BaseRecipientTest() {
 
   @Before
   fun setUp() {
-    wallpaperValues = mock(WallpaperValues::class.java)
-    chatColorsValues = mock(ChatColorsValues::class.java)
+    wallpaperValues = mockk<WallpaperValues>()
+    chatColorsValues = mockk<ChatColorsValues>()
 
     val globalWallpaper = createWallpaper(globalWallpaperChatColor)
-    `when`(wallpaperValues.wallpaper).thenReturn(globalWallpaper)
-    `when`(chatColorsValues.chatColors).thenReturn(globalChatColor)
-    `when`(SignalStore.wallpaper()).thenReturn(wallpaperValues)
-    `when`(SignalStore.chatColorsValues()).thenReturn(chatColorsValues)
+    every { wallpaperValues.wallpaper } answers { globalWallpaper }
+    every { chatColorsValues.chatColors } answers { globalChatColor }
+
+    val mockStore = mockk<SignalStore>()
+    SignalStore.testInject(mockStore)
+    every { SignalStore.wallpaper } returns wallpaperValues
+    every { SignalStore.chatColors } returns chatColorsValues
   }
 
   @Test
@@ -93,7 +96,7 @@ class Recipient_getChatColorsTest : BaseRecipientTest() {
   @Test
   fun `Given recipient has auto chat color set and no wallpaper set and no global wallpaper set, when I getChatColors, then I expect the default chat color`() {
     // GIVEN
-    `when`(wallpaperValues.wallpaper).thenReturn(null)
+    every { wallpaperValues.wallpaper } answers { null }
     val auto = ChatColors.forColor(ChatColors.Id.Auto, Color.BLACK)
     val recipient = createRecipient(chatColors = auto)
 
@@ -108,7 +111,7 @@ class Recipient_getChatColorsTest : BaseRecipientTest() {
   fun `Given recipient has no chat color set and there is a custom global chat color, when I getChatColors, then I expect the global chat color`() {
     // GIVEN
     val expected = globalChatColor.withId(ChatColors.Id.Custom(12))
-    `when`(chatColorsValues.chatColors).thenReturn(expected)
+    every { chatColorsValues.chatColors } answers { expected }
     val recipient = createRecipient()
 
     // WHEN
@@ -133,7 +136,7 @@ class Recipient_getChatColorsTest : BaseRecipientTest() {
   @Test
   fun `Given recipient has no chat color set and there is an auto global chat color and the recipient has a wallpaper, when I getChatColors, then I expect the wallpaper chat color`() {
     // GIVEN
-    `when`(chatColorsValues.chatColors).thenReturn(globalChatColor.withId(ChatColors.Id.Auto))
+    every { chatColorsValues.chatColors } answers { globalChatColor.withId(ChatColors.Id.Auto) }
     val color = ChatColors.forColor(ChatColors.Id.BuiltIn, Color.CYAN)
     val recipient = createRecipient(wallpaper = createWallpaper(color))
 
@@ -147,7 +150,7 @@ class Recipient_getChatColorsTest : BaseRecipientTest() {
   @Test
   fun `Given recipient has no chat color set and there is no global chat color and the recipient has a wallpaper, when I getChatColors, then I expect the wallpaper chat color`() {
     // GIVEN
-    `when`(chatColorsValues.chatColors).thenReturn(null)
+    every { chatColorsValues.chatColors } answers { null }
     val color = ChatColors.forColor(ChatColors.Id.BuiltIn, Color.CYAN)
     val recipient = createRecipient(wallpaper = createWallpaper(color))
 
@@ -161,7 +164,7 @@ class Recipient_getChatColorsTest : BaseRecipientTest() {
   @Test
   fun `Given recipient has no chat color set and there is an auto global chat color and the recipient has no wallpaper and global wallpaper set, when I getChatColors, then I expect the global wallpaper chat color`() {
     // GIVEN
-    `when`(chatColorsValues.chatColors).thenReturn(globalChatColor.withId(ChatColors.Id.Auto))
+    every { chatColorsValues.chatColors } answers { globalChatColor.withId(ChatColors.Id.Auto) }
     val recipient = createRecipient()
 
     // WHEN
@@ -174,7 +177,7 @@ class Recipient_getChatColorsTest : BaseRecipientTest() {
   @Test
   fun `Given recipient has no chat color set and there is no global chat color and the recipient has no wallpaper and global wallpaper set, when I getChatColors, then I expect the global wallpaper chat color`() {
     // GIVEN
-    `when`(chatColorsValues.chatColors).thenReturn(null)
+    every { chatColorsValues.chatColors } answers { null }
     val recipient = createRecipient()
 
     // WHEN
@@ -187,8 +190,8 @@ class Recipient_getChatColorsTest : BaseRecipientTest() {
   @Test
   fun `Given no recipient colors and auto global colors and no wallpaper set, when I getChatColors, then I expect default blue`() {
     // GIVEN
-    `when`(wallpaperValues.wallpaper).thenReturn(null)
-    `when`(chatColorsValues.chatColors).thenReturn(globalChatColor.withId(ChatColors.Id.Auto))
+    every { wallpaperValues.wallpaper } answers { null }
+    every { chatColorsValues.chatColors } answers { globalChatColor.withId(ChatColors.Id.Auto) }
     val recipient = createRecipient()
 
     // WHEN
@@ -201,8 +204,8 @@ class Recipient_getChatColorsTest : BaseRecipientTest() {
   @Test
   fun `Given no colors or wallpaper set, when I getChatColors, then I expect default blue`() {
     // GIVEN
-    `when`(wallpaperValues.wallpaper).thenReturn(null)
-    `when`(chatColorsValues.chatColors).thenReturn(null)
+    every { wallpaperValues.wallpaper } answers { null }
+    every { chatColorsValues.chatColors } answers { null }
     val recipient = createRecipient()
 
     // WHEN
@@ -213,8 +216,10 @@ class Recipient_getChatColorsTest : BaseRecipientTest() {
   }
 
   private fun createWallpaper(
-    chatColors: ChatColors?
-  ): ChatWallpaper = mock(ChatWallpaper::class.java).apply {
-    `when`(autoChatColors).thenReturn(chatColors)
+    chatColors: ChatColors
+  ): ChatWallpaper {
+    return mockk<ChatWallpaper>().apply {
+      every { autoChatColors } answers { chatColors }
+    }
   }
 }
diff --git a/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinHashKbsDataTest.java b/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinHashKbsDataTest.java
index 353c14ec55..5457bdfceb 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinHashKbsDataTest.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinHashKbsDataTest.java
@@ -3,7 +3,7 @@
 import org.junit.Test;
 import org.signal.core.util.StreamUtil;
 import org.signal.libsignal.svr2.PinHash;
-import org.thoughtcrime.securesms.registration.v2.testdata.KbsTestVector;
+import org.thoughtcrime.securesms.registration.testdata.KbsTestVector;
 import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException;
 import org.whispersystems.signalservice.api.kbs.KbsData;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
diff --git a/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinHashUtil_normalize_Test.java b/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinHashUtil_normalize_Test.java
index e05605a08f..08ab6ecf42 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinHashUtil_normalize_Test.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinHashUtil_normalize_Test.java
@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 import org.signal.core.util.StreamUtil;
-import org.thoughtcrime.securesms.registration.v2.testdata.PinSanitationVector;
+import org.thoughtcrime.securesms.registration.testdata.PinSanitationVector;
 import org.whispersystems.signalservice.api.kbs.PinHashUtil;
 import org.whispersystems.signalservice.internal.util.Hex;
 import org.whispersystems.signalservice.internal.util.JsonUtil;
diff --git a/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinValidityChecker_validity_Test.java b/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinValidityChecker_validity_Test.java
index 380876fabf..611b8f6628 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinValidityChecker_validity_Test.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/registration/v2/PinValidityChecker_validity_Test.java
@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 import org.signal.core.util.StreamUtil;
-import org.thoughtcrime.securesms.registration.v2.testdata.PinValidityVector;
+import org.thoughtcrime.securesms.registration.testdata.PinValidityVector;
 import org.whispersystems.signalservice.api.kbs.PinValidityChecker;
 import org.whispersystems.signalservice.internal.util.JsonUtil;
 
diff --git a/app/src/test/java/org/thoughtcrime/securesms/registration/v2/testdata/KbsTestVector.java b/app/src/test/java/org/thoughtcrime/securesms/registration/v2/testdata/KbsTestVector.java
index 2aa3640cb3..4e5826fcca 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/registration/v2/testdata/KbsTestVector.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/registration/v2/testdata/KbsTestVector.java
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.registration.v2.testdata;
+package org.thoughtcrime.securesms.registration.testdata;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
diff --git a/app/src/test/java/org/thoughtcrime/securesms/registration/v2/testdata/PinSanitationVector.java b/app/src/test/java/org/thoughtcrime/securesms/registration/v2/testdata/PinSanitationVector.java
index 5c2485d267..3efb84c7b1 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/registration/v2/testdata/PinSanitationVector.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/registration/v2/testdata/PinSanitationVector.java
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.registration.v2.testdata;
+package org.thoughtcrime.securesms.registration.testdata;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
diff --git a/app/src/test/java/org/thoughtcrime/securesms/registration/v2/testdata/PinValidityVector.java b/app/src/test/java/org/thoughtcrime/securesms/registration/v2/testdata/PinValidityVector.java
index 099e055b72..7688e9ed31 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/registration/v2/testdata/PinValidityVector.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/registration/v2/testdata/PinValidityVector.java
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.registration.v2.testdata;
+package org.thoughtcrime.securesms.registration.testdata;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/app/src/test/java/org/thoughtcrime/securesms/registration/viewmodel/LocalCodeRequestRateLimiterTest.java b/app/src/test/java/org/thoughtcrime/securesms/registration/viewmodel/LocalCodeRequestRateLimiterTest.java
deleted file mode 100644
index b15028f385..0000000000
--- a/app/src/test/java/org/thoughtcrime/securesms/registration/viewmodel/LocalCodeRequestRateLimiterTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.thoughtcrime.securesms.registration.viewmodel;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.thoughtcrime.securesms.registration.VerifyAccountRepository.Mode;
-
-public final class LocalCodeRequestRateLimiterTest {
-
-  @Test
-  public void initially_can_request() {
-    LocalCodeRequestRateLimiter limiter = new LocalCodeRequestRateLimiter(60_000);
-
-    assertTrue(limiter.canRequest(Mode.SMS_WITHOUT_LISTENER, "+155512345678", 1000));
-  }
-
-  @Test
-  public void cant_request_within_same_time_period() {
-    LocalCodeRequestRateLimiter limiter = new LocalCodeRequestRateLimiter(60_000);
-
-    assertTrue(limiter.canRequest(Mode.SMS_WITHOUT_LISTENER, "+155512345678", 1000));
-
-    limiter.onSuccessfulRequest(Mode.SMS_WITHOUT_LISTENER, "+155512345678", 1000);
-
-    assertFalse(limiter.canRequest(Mode.SMS_WITHOUT_LISTENER, "+155512345678", 1000 + 59_000));
-  }
-
-  @Test
-  public void can_request_within_same_time_period_if_different_number() {
-    LocalCodeRequestRateLimiter limiter = new LocalCodeRequestRateLimiter(60_000);
-
-    assertTrue(limiter.canRequest(Mode.SMS_WITHOUT_LISTENER, "+155512345678", 1000));
-
-    limiter.onSuccessfulRequest(Mode.SMS_WITHOUT_LISTENER, "+155512345678", 1000);
-
-    assertTrue(limiter.canRequest(Mode.SMS_WITHOUT_LISTENER, "+15559874566", 1000 + 59_000));
-  }
-
-  @Test
-  public void can_request_within_same_time_period_if_different_mode() {
-    LocalCodeRequestRateLimiter limiter = new LocalCodeRequestRateLimiter(60_000);
-
-    assertTrue(limiter.canRequest(Mode.SMS_WITH_LISTENER, "+155512345678", 1000));
-
-    limiter.onSuccessfulRequest(Mode.SMS_WITH_LISTENER, "+155512345678", 1000);
-
-    assertTrue(limiter.canRequest(Mode.SMS_WITHOUT_LISTENER, "+155512345678", 1000 + 59_000));
-  }
-
-  @Test
-  public void can_request_after_time_period() {
-    LocalCodeRequestRateLimiter limiter = new LocalCodeRequestRateLimiter(60_000);
-
-    assertTrue(limiter.canRequest(Mode.SMS_WITH_LISTENER, "+155512345678", 1000));
-
-    limiter.onSuccessfulRequest(Mode.SMS_WITH_LISTENER, "+155512345678", 1000);
-
-    assertTrue(limiter.canRequest(Mode.SMS_WITH_LISTENER, "+155512345678", 1000 + 60_001));
-  }
-
-  @Test
-  public void can_request_within_same_time_period_if_an_unsuccessful_request_is_seen() {
-    LocalCodeRequestRateLimiter limiter = new LocalCodeRequestRateLimiter(60_000);
-
-    assertTrue(limiter.canRequest(Mode.SMS_WITH_LISTENER, "+155512345678", 1000));
-
-    limiter.onSuccessfulRequest(Mode.SMS_WITH_LISTENER, "+155512345678", 1000);
-
-    limiter.onUnsuccessfulRequest();
-
-    assertTrue(limiter.canRequest(Mode.SMS_WITH_LISTENER, "+155512345678", 1000 + 59_000));
-  }
-}
\ No newline at end of file
diff --git a/app/src/test/java/org/thoughtcrime/securesms/service/BackListenerTest.kt b/app/src/test/java/org/thoughtcrime/securesms/service/BackListenerTest.kt
new file mode 100644
index 0000000000..2f2400a3a7
--- /dev/null
+++ b/app/src/test/java/org/thoughtcrime/securesms/service/BackListenerTest.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.service
+
+import org.junit.Assert
+import org.junit.Test
+import org.thoughtcrime.securesms.BaseUnitTest
+import org.thoughtcrime.securesms.testutil.MockRandom
+import java.time.Duration
+import java.time.LocalDateTime
+import java.util.concurrent.TimeUnit
+import kotlin.time.Duration.Companion.days
+import kotlin.time.Duration.Companion.minutes
+
+class BackListenerTest : BaseUnitTest() {
+
+  @Test
+  fun testBackupJitterExactlyWithinJitterWindow() {
+    val jitterWindowSeconds = Math.toIntExact(TimeUnit.MINUTES.toSeconds(10))
+    val now = LocalDateTime.of(2024, 6, 7, 2, 55)
+    val next = MessageBackupListener.getNextDailyBackupTimeFromNowWithJitter(now, 3, 0, jitterWindowSeconds)
+    Assert.assertEquals(8, next.dayOfMonth)
+  }
+
+  @Test
+  fun testBackupJitterWithinJitterWindow() {
+    val jitterWindowSeconds = Math.toIntExact(TimeUnit.MINUTES.toSeconds(10))
+    val now = LocalDateTime.of(2024, 6, 7, 2, 58)
+    val next = MessageBackupListener.getNextDailyBackupTimeFromNowWithJitter(now, 3, 0, jitterWindowSeconds)
+    Assert.assertEquals(8, next.dayOfMonth)
+  }
+
+  @Test
+  fun testBackupJitterJustOutsideOfWindow() {
+    val jitterWindowSeconds = Math.toIntExact(TimeUnit.MINUTES.toSeconds(10))
+    val now = LocalDateTime.of(2024, 6, 7, 2, 54, 59)
+    val next = MessageBackupListener.getNextDailyBackupTimeFromNowWithJitter(now, 3, 0, jitterWindowSeconds)
+    Assert.assertEquals(7, next.dayOfMonth)
+  }
+
+  @Test
+  fun testBackupJitter() {
+    val jitterWindowSeconds = Math.toIntExact(TimeUnit.MINUTES.toSeconds(10))
+    val now = LocalDateTime.of(2024, 6, 7, 3, 15, 0)
+    val next = MessageBackupListener.getNextDailyBackupTimeFromNowWithJitter(now, 3, 0, jitterWindowSeconds)
+    Assert.assertEquals(8, next.dayOfMonth)
+  }
+
+  @Test
+  fun testBackupJitterWhenScheduledForMidnightButJitterMakesItRunJustBefore() {
+    val mockRandom = MockRandom(listOf(1.minutes.inWholeSeconds.toInt()))
+    val jitterWindowSeconds = 10.minutes.inWholeSeconds.toInt()
+    val now: LocalDateTime = LocalDateTime.of(2024, 6, 27, 23, 57, 0)
+    val next: LocalDateTime = MessageBackupListener.getNextDailyBackupTimeFromNowWithJitter(now, 0, 0, jitterWindowSeconds, mockRandom)
+
+    Assert.assertTrue(Duration.between(now, next).toSeconds() > (1.days.inWholeSeconds - jitterWindowSeconds))
+  }
+}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/sms/UploadDependencyGraphTest.kt b/app/src/test/java/org/thoughtcrime/securesms/sms/UploadDependencyGraphTest.kt
index a7b6f3df29..0bf8f48a82 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/sms/UploadDependencyGraphTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/sms/UploadDependencyGraphTest.kt
@@ -261,7 +261,9 @@ class UploadDependencyGraphTest {
       archiveMediaId = null,
       archiveMediaName = null,
       archiveCdn = 0,
-      archiveThumbnailCdn = 0
+      archiveThumbnailCdn = 0,
+      thumbnailRestoreState = AttachmentTable.ThumbnailRestoreState.NONE,
+      uuid = null
     )
   }
 
diff --git a/app/src/test/java/org/thoughtcrime/securesms/storage/ContactRecordProcessorTest.kt b/app/src/test/java/org/thoughtcrime/securesms/storage/ContactRecordProcessorTest.kt
index a2a9cb4cdb..84c98c3c7e 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/storage/ContactRecordProcessorTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/storage/ContactRecordProcessorTest.kt
@@ -1,5 +1,7 @@
 package org.thoughtcrime.securesms.storage
 
+import android.app.Application
+import androidx.test.core.app.ApplicationProvider
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
@@ -7,6 +9,7 @@ import org.junit.Before
 import org.junit.BeforeClass
 import org.junit.Rule
 import org.junit.Test
+import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.MockedStatic
 import org.mockito.Mockito
@@ -15,12 +18,19 @@ import org.mockito.internal.configuration.plugins.Plugins
 import org.mockito.internal.junit.JUnitRule
 import org.mockito.junit.MockitoRule
 import org.mockito.quality.Strictness
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.database.RecipientTable
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.dependencies.MockApplicationDependencyProvider
 import org.thoughtcrime.securesms.keyvalue.AccountValues
+import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet
+import org.thoughtcrime.securesms.keyvalue.KeyValueStore
+import org.thoughtcrime.securesms.keyvalue.MockKeyValuePersistentStorage
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.testutil.EmptyLogger
-import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import org.whispersystems.signalservice.api.storage.SignalContactRecord
@@ -28,6 +38,8 @@ import org.whispersystems.signalservice.api.storage.StorageId
 import org.whispersystems.signalservice.internal.storage.protos.ContactRecord
 import java.util.UUID
 
+@RunWith(RobolectricTestRunner::class)
+@Config(application = Application::class)
 class ContactRecordProcessorTest {
 
   @Rule
@@ -38,16 +50,16 @@ class ContactRecordProcessorTest {
   lateinit var recipientTable: RecipientTable
 
   @Mock
-  lateinit var featureFlags: MockedStatic<FeatureFlags>
-
-  @Mock
-  lateinit var signalStore: MockedStatic<SignalStore>
+  lateinit var remoteConfig: MockedStatic<RemoteConfig>
 
   @Before
   fun setup() {
     val mockAccountValues = mock(AccountValues::class.java)
     Mockito.lenient().`when`(mockAccountValues.isPrimaryDevice).thenReturn(true)
-    signalStore.`when`<AccountValues> { SignalStore.account() }.thenReturn(mockAccountValues)
+    if (!AppDependencies.isInitialized) {
+      AppDependencies.init(ApplicationProvider.getApplicationContext(), MockApplicationDependencyProvider())
+    }
+    SignalStore.testInject(KeyValueStore(MockKeyValuePersistentStorage.withDataSet(KeyValueDataSet())))
   }
 
   @Test
diff --git a/app/src/test/java/org/thoughtcrime/securesms/storage/StorageSyncHelperTest.java b/app/src/test/java/org/thoughtcrime/securesms/storage/StorageSyncHelperTest.java
index d2aa7a6af5..c6c28199bf 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/storage/StorageSyncHelperTest.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/storage/StorageSyncHelperTest.java
@@ -12,7 +12,7 @@
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper.IdDifferenceResult;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
 import org.whispersystems.signalservice.api.storage.SignalContactRecord;
@@ -60,7 +60,7 @@ public final class StorageSyncHelperTest {
   private MockedStatic<Recipient> recipientMockedStatic;
 
   @Mock
-  private MockedStatic<FeatureFlags> featureFlagsMockedStatic;
+  private MockedStatic<RemoteConfig> remoteConfigMockedStatic;
 
   @Before
   public void setup() {
diff --git a/app/src/test/java/org/thoughtcrime/securesms/stories/StoriesTest.kt b/app/src/test/java/org/thoughtcrime/securesms/stories/StoriesTest.kt
index b5599ab43d..9b0e70746b 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/stories/StoriesTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/stories/StoriesTest.kt
@@ -19,7 +19,7 @@ import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.database.FakeMessageRecords
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.JobManager
 import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob
 
@@ -36,7 +36,7 @@ class StoriesTest {
   private lateinit var mockJobManager: JobManager
 
   @Mock
-  private lateinit var mockApplicationDependenciesStatic: MockedStatic<ApplicationDependencies>
+  private lateinit var mockApplicationDependenciesStatic: MockedStatic<AppDependencies>
 
   @Mock
   private lateinit var mockSignalDatabaseStatic: MockedStatic<SignalDatabase>
@@ -53,7 +53,7 @@ class StoriesTest {
 
     SignalDatabase.setSignalDatabaseInstanceForTesting(mockSignalDatabase)
     whenever(SignalDatabase.attachments).thenReturn(mockAttachmentTable)
-    whenever(ApplicationDependencies.getJobManager()).thenReturn(mockJobManager)
+    whenever(AppDependencies.jobManager).thenReturn(mockJobManager)
     whenever(mockAttachmentTable.getAttachmentsForMessage(any())).thenReturn(emptyList())
   }
 
diff --git a/app/src/test/java/org/thoughtcrime/securesms/testutil/MockRandom.kt b/app/src/test/java/org/thoughtcrime/securesms/testutil/MockRandom.kt
new file mode 100644
index 0000000000..798fea3d40
--- /dev/null
+++ b/app/src/test/java/org/thoughtcrime/securesms/testutil/MockRandom.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.testutil
+
+import java.util.LinkedList
+import java.util.Random
+
+class MockRandom(initialInts: List<Int>) : Random() {
+
+  val nextInts = LinkedList(initialInts)
+
+  override fun nextInt(): Int {
+    return nextInts.remove()
+  }
+}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/FeatureFlags_ConsistencyTest.java b/app/src/test/java/org/thoughtcrime/securesms/util/FeatureFlags_ConsistencyTest.java
deleted file mode 100644
index 50caa9e347..0000000000
--- a/app/src/test/java/org/thoughtcrime/securesms/util/FeatureFlags_ConsistencyTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.thoughtcrime.securesms.util;
-
-import com.annimon.stream.Collectors;
-import com.annimon.stream.Stream;
-
-import org.junit.Test;
-import org.signal.core.util.SetUtil;
-
-import java.util.Set;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public final class FeatureFlags_ConsistencyTest {
-
-  /**
-   * Ensures developer makes decision on whether a flag should or should not be remote capable.
-   */
-  @Test
-  public void no_flags_are_in_both_lists() {
-    Set<String> intersection = SetUtil.intersection(FeatureFlags.REMOTE_CAPABLE,
-                                                    FeatureFlags.NOT_REMOTE_CAPABLE);
-
-    assertTrue(intersection.isEmpty());
-  }
-
-  /**
-   * Ensures developer makes decision on whether a flag should or should not be remote capable.
-   */
-  @Test
-  public void all_flags_are_in_one_list_or_another() {
-    Set<String> flagsByReflection = Stream.of(FeatureFlags.class.getDeclaredFields())
-                                          .filter(f -> f.getType() == String.class)
-                                          .filter(f -> !f.getName().equals("TAG"))
-                                          .map(f -> {
-                                            try {
-                                              f.setAccessible(true);
-                                              return (String) f.get(null);
-                                            } catch (IllegalAccessException e) {
-                                              throw new AssertionError(e);
-                                            }
-                                          })
-                                          .collect(Collectors.toSet());
-
-    Set<String> flagsInBothSets = SetUtil.union(FeatureFlags.REMOTE_CAPABLE,
-                                                FeatureFlags.NOT_REMOTE_CAPABLE);
-
-    assertEquals(flagsInBothSets, flagsByReflection);
-  }
-
-  /**
-   * Ensures we don't leave old feature flag values in the hot swap list.
-   */
-  @Test
-  public void all_hot_swap_values_are_defined_capable_or_not() {
-    Set<String> flagsInBothSets = SetUtil.union(FeatureFlags.REMOTE_CAPABLE,
-                                                FeatureFlags.NOT_REMOTE_CAPABLE);
-
-    assertTrue(flagsInBothSets.containsAll(FeatureFlags.HOT_SWAPPABLE));
-  }
-
-  /**
-   * Ensures we don't leave old feature flag values in the sticky list.
-   */
-  @Test
-  public void all_sticky_values_are_defined_capable_or_not() {
-    Set<String> flagsInBothSets = SetUtil.union(FeatureFlags.REMOTE_CAPABLE,
-                                                FeatureFlags.NOT_REMOTE_CAPABLE);
-
-    assertTrue(flagsInBothSets.containsAll(FeatureFlags.STICKY));
-  }
-
-  /**
-   * Ensures we don't release with forced values which is intended for local development only.
-   */
-  @Test
-  public void no_values_are_forced() {
-    assertTrue(FeatureFlags.FORCED_VALUES.isEmpty());
-  }
-}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/LocaleFeatureFlagsTest_getCountryValue.java b/app/src/test/java/org/thoughtcrime/securesms/util/LocaleRemoteConfigTest_getCountryValue.java
similarity index 92%
rename from app/src/test/java/org/thoughtcrime/securesms/util/LocaleFeatureFlagsTest_getCountryValue.java
rename to app/src/test/java/org/thoughtcrime/securesms/util/LocaleRemoteConfigTest_getCountryValue.java
index e8de1a767d..e82a3f2eb6 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/util/LocaleFeatureFlagsTest_getCountryValue.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/util/LocaleRemoteConfigTest_getCountryValue.java
@@ -17,7 +17,7 @@
 import static org.junit.Assert.assertEquals;
 
 @RunWith(Parameterized.class)
-public class LocaleFeatureFlagsTest_getCountryValue {
+public class LocaleRemoteConfigTest_getCountryValue {
 
   private final String               phoneNumber;
   private final Map<String, Integer> countryCounts;
@@ -66,7 +66,7 @@ public static void setup() {
     Log.initialize(new EmptyLogger());
   }
 
-  public LocaleFeatureFlagsTest_getCountryValue(@NonNull String phoneNumber,
+  public LocaleRemoteConfigTest_getCountryValue(@NonNull String phoneNumber,
                                                 @NonNull Map<String, Integer> countryCounts,
                                                 long output)
   {
@@ -77,7 +77,7 @@ public LocaleFeatureFlagsTest_getCountryValue(@NonNull String phoneNumber,
 
   @Test
   public void determineCountEnabled() {
-    assertEquals(output, LocaleFeatureFlags.getCountryValue(countryCounts, phoneNumber, 0));
+    assertEquals(output, LocaleRemoteConfig.getCountryValue(countryCounts, phoneNumber, 0));
   }
 
 }
diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/LocaleFeatureFlagsTest_parseCountryValues.java b/app/src/test/java/org/thoughtcrime/securesms/util/LocaleRemoteConfigTest_parseCountryValues.java
similarity index 88%
rename from app/src/test/java/org/thoughtcrime/securesms/util/LocaleFeatureFlagsTest_parseCountryValues.java
rename to app/src/test/java/org/thoughtcrime/securesms/util/LocaleRemoteConfigTest_parseCountryValues.java
index e942475a4e..0f6156c467 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/util/LocaleFeatureFlagsTest_parseCountryValues.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/util/LocaleRemoteConfigTest_parseCountryValues.java
@@ -12,7 +12,7 @@
 import static org.junit.Assert.assertEquals;
 
 @RunWith(Parameterized.class)
-public class LocaleFeatureFlagsTest_parseCountryValues {
+public class LocaleRemoteConfigTest_parseCountryValues {
 
   private final String               input;
   private final Map<String, Integer> output;
@@ -46,14 +46,14 @@ public static Collection<Object[]> data() {
     });
   }
 
-  public LocaleFeatureFlagsTest_parseCountryValues(String input, Map<String, Integer> output) {
+  public LocaleRemoteConfigTest_parseCountryValues(String input, Map<String, Integer> output) {
     this.input  = input;
     this.output = output;
   }
 
   @Test
   public void parseCountryCounts() {
-    assertEquals(output, LocaleFeatureFlags.parseCountryValues(input, 0));
+    assertEquals(output, LocaleRemoteConfig.parseCountryValues(input, 0));
   }
 
 }
diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/LocaleFeatureFlags_isEnabled.kt b/app/src/test/java/org/thoughtcrime/securesms/util/LocaleRemoteConfig_isEnabled.kt
similarity index 91%
rename from app/src/test/java/org/thoughtcrime/securesms/util/LocaleFeatureFlags_isEnabled.kt
rename to app/src/test/java/org/thoughtcrime/securesms/util/LocaleRemoteConfig_isEnabled.kt
index d84aaffb97..08cd8593eb 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/util/LocaleFeatureFlags_isEnabled.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/util/LocaleRemoteConfig_isEnabled.kt
@@ -11,12 +11,12 @@ import org.junit.runners.Parameterized
 import org.thoughtcrime.securesms.assertIs
 
 @RunWith(Parameterized::class)
-class LocaleFeatureFlags_isEnabled(private val serializedList: String, private val e164: List<String>, private val output: Boolean) {
+class LocaleRemoteConfig_isEnabled(private val serializedList: String, private val e164: List<String>, private val output: Boolean) {
 
   @Test
   fun isLegal() {
     e164.forEach {
-      LocaleFeatureFlags.isEnabledE164Start(serializedList, it) assertIs output
+      LocaleRemoteConfig.isEnabledE164Start(serializedList, it) assertIs output
     }
   }
 
diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/FeatureFlagsTest.java b/app/src/test/java/org/thoughtcrime/securesms/util/RemoteConfigTest.java
similarity index 81%
rename from app/src/test/java/org/thoughtcrime/securesms/util/FeatureFlagsTest.java
rename to app/src/test/java/org/thoughtcrime/securesms/util/RemoteConfigTest.java
index 9d4114beb9..c166817abf 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/util/FeatureFlagsTest.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/util/RemoteConfigTest.java
@@ -2,8 +2,8 @@
 
 import org.junit.Test;
 import org.thoughtcrime.securesms.BaseUnitTest;
-import org.thoughtcrime.securesms.util.FeatureFlags.Change;
-import org.thoughtcrime.securesms.util.FeatureFlags.UpdateResult;
+import org.thoughtcrime.securesms.util.RemoteConfig.ConfigChange;
+import org.thoughtcrime.securesms.util.RemoteConfig.UpdateResult;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -16,14 +16,14 @@
 import static org.junit.Assert.assertFalse;
 import static org.thoughtcrime.securesms.testutil.TestHelpers.mapOf;
 
-public class FeatureFlagsTest extends BaseUnitTest {
+public class RemoteConfigTest extends BaseUnitTest {
 
   private static final String A = "A";
   private static final String B = "B";
 
   @Test
   public void updateInternal_newValue_ignoreNotInRemoteCapable() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(A, true,
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(A, true,
                                                             B, true),
                                                       mapOf(),
                                                       mapOf(),
@@ -38,7 +38,7 @@ public void updateInternal_newValue_ignoreNotInRemoteCapable() {
 
   @Test
   public void updateInternal_newValue() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(A, true),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(A, true),
                                                       mapOf(),
                                                       mapOf(),
                                                       setOf(A),
@@ -52,7 +52,7 @@ public void updateInternal_newValue() {
 
   @Test
   public void updateInternal_newValue_hotSwap() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(A, true),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(A, true),
                                                       mapOf(),
                                                       mapOf(),
                                                       setOf(A),
@@ -61,12 +61,12 @@ public void updateInternal_newValue_hotSwap() {
 
     assertEquals(mapOf(A, true), result.getMemory());
     assertEquals(mapOf(A, true), result.getDisk());
-    assertEquals(Change.ENABLED, result.getMemoryChanges().get(A));
+    assertEquals(new ConfigChange(null, true), result.getMemoryChanges().get(A));
   }
 
   @Test
   public void updateInternal_newValue_hotSwap_integer() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(A, 1),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(A, 1),
                                                       mapOf(),
                                                       mapOf(),
                                                       setOf(A),
@@ -75,12 +75,12 @@ public void updateInternal_newValue_hotSwap_integer() {
 
     assertEquals(mapOf(A, 1), result.getMemory());
     assertEquals(mapOf(A, 1), result.getDisk());
-    assertEquals(Change.CHANGED, result.getMemoryChanges().get(A));
+    assertEquals(new ConfigChange(null, 1), result.getMemoryChanges().get(A));
   }
 
   @Test
   public void updateInternal_newValue_sticky() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(A, true),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(A, true),
                                                       mapOf(),
                                                       mapOf(),
                                                       setOf(A),
@@ -94,7 +94,7 @@ public void updateInternal_newValue_sticky() {
 
   @Test
   public void updateInternal_newValue_hotSwap_sticky() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(A, true),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(A, true),
                                                       mapOf(),
                                                       mapOf(),
                                                       setOf(A),
@@ -103,12 +103,12 @@ public void updateInternal_newValue_hotSwap_sticky() {
 
     assertEquals(mapOf(A, true), result.getMemory());
     assertEquals(mapOf(A, true), result.getDisk());
-    assertEquals(Change.ENABLED, result.getMemoryChanges().get(A));
+    assertEquals(new ConfigChange(null, true), result.getMemoryChanges().get(A));
   }
 
   @Test
   public void updateInternal_replaceValue() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(A, true),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(A, true),
                                                       mapOf(A, false),
                                                       mapOf(A, false),
                                                       setOf(A),
@@ -122,7 +122,7 @@ public void updateInternal_replaceValue() {
 
   @Test
   public void updateInternal_replaceValue_integer() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(A, 2),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(A, 2),
                                                       mapOf(A, 1),
                                                       mapOf(A, 1),
                                                       setOf(A),
@@ -136,7 +136,7 @@ public void updateInternal_replaceValue_integer() {
 
   @Test
   public void updateInternal_replaceValue_hotSwap() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(A, true),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(A, true),
                                                       mapOf(A, false),
                                                       mapOf(A, false),
                                                       setOf(A),
@@ -145,12 +145,12 @@ public void updateInternal_replaceValue_hotSwap() {
 
     assertEquals(mapOf(A, true), result.getMemory());
     assertEquals(mapOf(A, true), result.getDisk());
-    assertEquals(Change.ENABLED, result.getMemoryChanges().get(A));
+    assertEquals(new ConfigChange(false, true), result.getMemoryChanges().get(A));
   }
 
   @Test
   public void updateInternal_replaceValue_hotSwa_integer() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(A, 2),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(A, 2),
                                                       mapOf(A, 1),
                                                       mapOf(A, 1),
                                                       setOf(A),
@@ -159,12 +159,12 @@ public void updateInternal_replaceValue_hotSwa_integer() {
 
     assertEquals(mapOf(A, 2), result.getMemory());
     assertEquals(mapOf(A, 2), result.getDisk());
-    assertEquals(Change.CHANGED, result.getMemoryChanges().get(A));
+    assertEquals(new ConfigChange(1, 2), result.getMemoryChanges().get(A));
   }
 
   @Test
   public void updateInternal_replaceValue_hotSwap_stickyChange() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(A, true),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(A, true),
                                                       mapOf(A, false),
                                                       mapOf(A, false),
                                                       setOf(A),
@@ -173,12 +173,12 @@ public void updateInternal_replaceValue_hotSwap_stickyChange() {
 
     assertEquals(mapOf(A, true), result.getMemory());
     assertEquals(mapOf(A, true), result.getDisk());
-    assertEquals(Change.ENABLED, result.getMemoryChanges().get(A));
+    assertEquals(new ConfigChange(false, true), result.getMemoryChanges().get(A));
   }
 
   @Test
   public void updateInternal_replaceValue_hotSwap_stickyIgnore_memoryAndDisk() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(A, false),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(A, false),
                                                       mapOf(A, true),
                                                       mapOf(A, true),
                                                       setOf(A),
@@ -192,7 +192,7 @@ public void updateInternal_replaceValue_hotSwap_stickyIgnore_memoryAndDisk() {
 
   @Test
   public void updateInternal_removeValue() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(),
                                                       mapOf(A, true),
                                                       mapOf(A, true),
                                                       setOf(A),
@@ -206,7 +206,7 @@ public void updateInternal_removeValue() {
 
   @Test
   public void updateInternal_removeValue_notRemoteCapable() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(A, true),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(A, true),
                                                       mapOf(A, true),
                                                       mapOf(A, true),
                                                       setOf(),
@@ -220,7 +220,7 @@ public void updateInternal_removeValue_notRemoteCapable() {
 
   @Test
   public void updateInternal_removeValue_hotSwap() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(),
                                                       mapOf(A, true),
                                                       mapOf(A, true),
                                                       setOf(A),
@@ -229,12 +229,12 @@ public void updateInternal_removeValue_hotSwap() {
 
     assertEquals(mapOf(), result.getMemory());
     assertEquals(mapOf(), result.getDisk());
-    assertEquals(Change.REMOVED, result.getMemoryChanges().get(A));
+    assertEquals(new ConfigChange(true, null), result.getMemoryChanges().get(A));
   }
 
   @Test
   public void updateInternal_removeValue_hotSwap_notRemoteCapable() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(A, true),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(A, true),
                                                       mapOf(A, true),
                                                       mapOf(A, true),
                                                       setOf(),
@@ -243,12 +243,12 @@ public void updateInternal_removeValue_hotSwap_notRemoteCapable() {
 
     assertEquals(mapOf(), result.getMemory());
     assertEquals(mapOf(), result.getDisk());
-    assertEquals(Change.REMOVED, result.getMemoryChanges().get(A));
+    assertEquals(new ConfigChange(true, null), result.getMemoryChanges().get(A));
   }
 
   @Test
   public void updateInternal_removeValue_stickyAlreadyEnabled() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(),
                                                       mapOf(A, true),
                                                       mapOf(A, true),
                                                       setOf(A),
@@ -262,7 +262,7 @@ public void updateInternal_removeValue_stickyAlreadyEnabled() {
 
   @Test
   public void updateInternal_removeValue_stickyNotEnabled() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(),
                                                       mapOf(A, false),
                                                       mapOf(A, false),
                                                       setOf(A),
@@ -276,7 +276,7 @@ public void updateInternal_removeValue_stickyNotEnabled() {
 
   @Test
   public void updateInternal_removeValue_stickyNotEnabled_notRemoteCapable() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(A, true),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(A, true),
                                                       mapOf(A, false),
                                                       mapOf(A, false),
                                                       setOf(),
@@ -290,7 +290,7 @@ public void updateInternal_removeValue_stickyNotEnabled_notRemoteCapable() {
 
   @Test
   public void updateInternal_removeValue_hotSwap_stickyAlreadyEnabled() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(),
                                                       mapOf(A, true),
                                                       mapOf(A, true),
                                                       setOf(A),
@@ -304,7 +304,7 @@ public void updateInternal_removeValue_hotSwap_stickyAlreadyEnabled() {
 
   @Test
   public void updateInternal_removeValue_hotSwap_stickyAlreadyEnabled_notRemoteCapable() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(A, true),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(A, true),
                                                       mapOf(A, true),
                                                       mapOf(A, true),
                                                       setOf(),
@@ -318,7 +318,7 @@ public void updateInternal_removeValue_hotSwap_stickyAlreadyEnabled_notRemoteCap
 
   @Test
   public void updateInternal_removeValue_hotSwap_stickyNotEnabled() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(),
                                                       mapOf(A, false),
                                                       mapOf(A, false),
                                                       setOf(A),
@@ -327,12 +327,12 @@ public void updateInternal_removeValue_hotSwap_stickyNotEnabled() {
 
     assertEquals(mapOf(), result.getMemory());
     assertEquals(mapOf(), result.getDisk());
-    assertEquals(Change.REMOVED, result.getMemoryChanges().get(A));
+    assertEquals(new ConfigChange(false, null), result.getMemoryChanges().get(A));
   }
 
   @Test
   public void updateInternal_removeValue_typeMismatch_hotSwap() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(A, "5"),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(A, "5"),
                                                       mapOf(A, true),
                                                       mapOf(A, true),
                                                       setOf(A),
@@ -341,14 +341,14 @@ public void updateInternal_removeValue_typeMismatch_hotSwap() {
 
     assertEquals(mapOf(), result.getMemory());
     assertEquals(mapOf(), result.getDisk());
-    assertEquals(Change.REMOVED, result.getMemoryChanges().get(A));
+    assertEquals(new ConfigChange(true, null), result.getMemoryChanges().get(A));
   }
 
   @Test
   public void updateInternal_twoNewValues() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(A, true,
-        B, false),
-        mapOf(),
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(A, true,
+                                                            B, false),
+                                                      mapOf(),
                                                       mapOf(),
                                                       setOf(A, B),
                                                       setOf(),
@@ -361,7 +361,7 @@ public void updateInternal_twoNewValues() {
 
   @Test
   public void updateInternal_replaceOneOfTwoValues() {
-    UpdateResult result = FeatureFlags.updateInternal(mapOf(A, true,
+    UpdateResult result = RemoteConfig.updateInternal(mapOf(A, true,
                                                             B, false),
                                                       mapOf(A, true,
                                                             B, true),
@@ -378,7 +378,7 @@ public void updateInternal_replaceOneOfTwoValues() {
 
   @Test
   public void computeChanges_generic() {
-    Map<String, Object> oldMap = new HashMap<String, Object>() {{
+    Map<String, Object> oldMap = new HashMap<>() {{
       put("a", true);
       put("b", false);
       put("c", true);
@@ -389,7 +389,7 @@ public void computeChanges_generic() {
       put("j", "gwen");
     }};
 
-    Map<String, Object> newMap = new HashMap<String, Object>() {{
+    Map<String, Object> newMap = new HashMap<>() {{
       put("a", true);
       put("b", true);
       put("c", false);
@@ -400,17 +400,17 @@ public void computeChanges_generic() {
       put("j", "stacy");
     }};
 
-    Map<String, Change> changes = FeatureFlags.computeChanges(oldMap, newMap);
+    Map<String, ConfigChange> changes = RemoteConfig.computeChanges(oldMap, newMap);
 
     assertFalse(changes.containsKey("a"));
-    assertEquals(Change.ENABLED, changes.get("b"));
-    assertEquals(Change.DISABLED, changes.get("c"));
-    assertEquals(Change.REMOVED, changes.get("d"));
-    assertEquals(Change.ENABLED, changes.get("e"));
-    assertEquals(Change.DISABLED, changes.get("f"));
-    assertEquals(Change.CHANGED, changes.get("h"));
+    assertEquals(new ConfigChange(false, true), changes.get("b"));
+    assertEquals(new ConfigChange(true, false), changes.get("c"));
+    assertEquals(new ConfigChange(false, null), changes.get("d"));
+    assertEquals(new ConfigChange(null, true), changes.get("e"));
+    assertEquals(new ConfigChange(null, false), changes.get("f"));
+    assertEquals(new ConfigChange(5, 7), changes.get("h"));
     assertFalse(changes.containsKey("i"));
-    assertEquals(Change.CHANGED, changes.get("j"));
+    assertEquals(new ConfigChange("gwen", "stacy"), changes.get("j"));
   }
 
   private static <V> Set<V> setOf(V... values) {
diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/RemoteConfig_StaticValuesTest.kt b/app/src/test/java/org/thoughtcrime/securesms/util/RemoteConfig_StaticValuesTest.kt
new file mode 100644
index 0000000000..1334ae5c08
--- /dev/null
+++ b/app/src/test/java/org/thoughtcrime/securesms/util/RemoteConfig_StaticValuesTest.kt
@@ -0,0 +1,81 @@
+package org.thoughtcrime.securesms.util
+
+import org.junit.Test
+import kotlin.reflect.KProperty1
+import kotlin.reflect.KVisibility
+import kotlin.reflect.full.memberProperties
+
+/**
+ * Ensures we don't release with forced values which is intended for local development only.
+ */
+class RemoteConfig_StaticValuesTest {
+
+  /**
+   * This test cycles the REMOTE_VALUES through a bunch of different inputs, then looks at all of the public getters and checks to see if they return different
+   * values when the inputs change. If they don't, then it's likely that the getter is returning a static value, which was likely introduced during testing
+   * and not something we actually want to commit.
+   */
+  @Test
+  fun `Ensure there's no static values`() {
+    // A list of inputs we'll cycle the remote config values to in order to see if it changes the outputs of the getters
+    val remoteTestInputs = listOf(
+      true,
+      false,
+      "true",
+      "false",
+      "cat",
+      "dog",
+      "1",
+      "100",
+      "12345678910111213141516",
+      "*"
+    )
+
+    val configKeys = RemoteConfig.configsByKey.keys
+
+    val ignoreList = setOf(
+      "REMOTE_VALUES",
+      "configsByKey",
+      "debugMemoryValues",
+      "debugDiskValues",
+      "debugPendingDiskValues",
+      "internalUser",
+      "CRASH_PROMPT_CONFIG",
+      "PROMPT_BATTERY_SAVER",
+      "PROMPT_FOR_NOTIFICATION_LOGS",
+      "DEVICE_SPECIFIC_NOTIFICATION_CONFIG"
+    )
+
+    val publicVals: List<KProperty1<*, *>> = RemoteConfig::class.memberProperties
+      .filter { it.visibility == KVisibility.PUBLIC }
+      .filterNot { ignoreList.contains(it.name) }
+
+    val publicValOutputs: MutableMap<String, MutableSet<Any?>> = mutableMapOf()
+
+    for (input in remoteTestInputs) {
+      for (key in configKeys) {
+        RemoteConfig.REMOTE_VALUES[key] = input
+      }
+
+      for (publicVal in publicVals) {
+        val output: Any? = publicVal.getter.call(RemoteConfig)
+        val existingOutputs: MutableSet<Any?> = publicValOutputs.getOrDefault(publicVal.name, mutableSetOf())
+        existingOutputs.add(output)
+        publicValOutputs[publicVal.name] = existingOutputs
+      }
+    }
+
+    for (entry in publicValOutputs) {
+      val getter = entry.key
+      val outputs = entry.value
+
+      if (outputs.size == 0) {
+        throw AssertionError("Getter $getter has no outputs! Something is wrong.")
+      }
+
+      if (outputs.size == 1) {
+        throw AssertionError("Getter '$getter' had the same output every time (value = ${outputs.first()})! Did you accidentally set it to a constant? Or, if you think this is a mistake, add a value to the inputs of this test that would case the value to change.")
+      }
+    }
+  }
+}
diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/SignalMeUtilText_parseE164FromLink.java b/app/src/test/java/org/thoughtcrime/securesms/util/SignalMeUtilText_parseE164FromLink.java
index e9027b1f75..2177e8f290 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/util/SignalMeUtilText_parseE164FromLink.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/util/SignalMeUtilText_parseE164FromLink.java
@@ -8,7 +8,7 @@
 import org.robolectric.ParameterizedRobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import org.thoughtcrime.securesms.SignalStoreRule;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.AccountValues;
 
 import java.util.Arrays;
@@ -55,6 +55,6 @@ public SignalMeUtilText_parseE164FromLink(String input, String output) {
 
   @Test
   public void parse() {
-    assertEquals(output, SignalMeUtil.parseE164FromLink(ApplicationDependencies.getApplication(), input));
+    assertEquals(output, SignalMeUtil.parseE164FromLink(AppDependencies.getApplication(), input));
   }
 }
diff --git a/app/src/testShared/org/thoughtcrime/securesms/database/FakeMessageRecords.kt b/app/src/testShared/org/thoughtcrime/securesms/database/FakeMessageRecords.kt
index 91305387bd..bb6b48b6bb 100644
--- a/app/src/testShared/org/thoughtcrime/securesms/database/FakeMessageRecords.kt
+++ b/app/src/testShared/org/thoughtcrime/securesms/database/FakeMessageRecords.kt
@@ -63,7 +63,8 @@ object FakeMessageRecords {
     archiveThumbnailCdn: Int = 0,
     archiveMediaName: String? = null,
     archiveMediaId: String? = null,
-    archiveThumbnailId: String? = null
+    archiveThumbnailId: String? = null,
+    thumbnailRestoreState: AttachmentTable.ThumbnailRestoreState = AttachmentTable.ThumbnailRestoreState.NONE
   ): DatabaseAttachment {
     return DatabaseAttachment(
       attachmentId,
@@ -99,7 +100,9 @@ object FakeMessageRecords {
       archiveCdn,
       archiveThumbnailCdn,
       archiveMediaId,
-      archiveMediaName
+      archiveMediaName,
+      thumbnailRestoreState,
+      null
     )
   }
 
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index 47e0fad7c1..6580b782dc 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.gradle.kotlin.dsl.extra
 
 buildscript {
-    val kotlinVersion by extra("1.8.10")
+    val kotlinVersion by extra("1.9.20")
 
     repositories {
         google()
diff --git a/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts b/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts
index bc43d5f72e..72153b735e 100644
--- a/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts
+++ b/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts
@@ -50,7 +50,7 @@ android {
   }
 
   composeOptions {
-    kotlinCompilerExtensionVersion = "1.4.4"
+    kotlinCompilerExtensionVersion = "1.5.4"
   }
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 49ae8d834f..e34c765206 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,14 +1,12 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 buildscript {
-  rootProject.extra["kotlin_version"] = "1.8.10"
+  rootProject.extra["kotlin_version"] = "1.9.20"
   repositories {
     google()
     mavenCentral()
   }
 
   dependencies {
-    classpath("com.android.tools.build:gradle:8.0.2")
+    classpath("com.android.tools.build:gradle:8.4.1")
     classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3")
     classpath("com.google.protobuf:protobuf-gradle-plugin:0.9.0")
     classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.extra["kotlin_version"] as String}")
@@ -22,7 +20,7 @@ buildscript {
     }
     classpath("androidx.benchmark:benchmark-gradle-plugin:1.1.0-beta04")
     classpath(files("$rootDir/wire-handler/wire-handler-1.0.0.jar"))
-    classpath("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:1.8.10-1.0.9")
+    classpath("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:1.9.20-1.0.14")
   }
 }
 
@@ -55,7 +53,7 @@ subprojects {
   }
 
   val expensiveTaskClasses = listOf(
-    KotlinCompile::class,
+    org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class,
     com.android.build.gradle.internal.lint.AndroidLintAnalysisTask::class,
     com.android.build.gradle.internal.tasks.R8Task::class,
   )
diff --git a/contacts/app/src/main/java/org/signal/contactstest/MainActivity.kt b/contacts/app/src/main/java/org/signal/contactstest/MainActivity.kt
index 396599e7e7..11c074fa1d 100644
--- a/contacts/app/src/main/java/org/signal/contactstest/MainActivity.kt
+++ b/contacts/app/src/main/java/org/signal/contactstest/MainActivity.kt
@@ -123,7 +123,9 @@ class MainActivity : AppCompatActivity() {
       e164Formatter = { PhoneNumberUtils.formatNumberToE164(it, "US") },
       messageMimetype = "vnd.android.cursor.item/vnd.org.signal.contacts.test.message",
       callMimetype = "vnd.android.cursor.item/vnd.org.signal.contacts.test.call",
-      syncTag = "__TEST"
+      syncTag = "__TEST",
+      videoCallMimetype = "",
+      videoCallPrompt = { "" }
     )
   }
 }
diff --git a/contacts/app/src/main/res/values/ic_launcher_background.xml b/contacts/app/src/main/res/values/ic_launcher_background.xml
index 56f69b0a49..f6f5a106af 100644
--- a/contacts/app/src/main/res/values/ic_launcher_background.xml
+++ b/contacts/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#3A76F0</color>
+    <color name="ic_launcher_background">@color/core_ultramarine_icon</color>
 </resources>
\ No newline at end of file
diff --git a/core-ui/build.gradle.kts b/core-ui/build.gradle.kts
index dca5bd8291..aecc17e3f6 100644
--- a/core-ui/build.gradle.kts
+++ b/core-ui/build.gradle.kts
@@ -10,7 +10,7 @@ android {
   }
 
   composeOptions {
-    kotlinCompilerExtensionVersion = "1.4.4"
+    kotlinCompilerExtensionVersion = "1.5.4"
   }
 }
 
diff --git a/core-ui/src/main/java/org/signal/core/ui/Dialogs.kt b/core-ui/src/main/java/org/signal/core/ui/Dialogs.kt
index f3332c888b..b0050b5b39 100644
--- a/core-ui/src/main/java/org/signal/core/ui/Dialogs.kt
+++ b/core-ui/src/main/java/org/signal/core/ui/Dialogs.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -128,6 +129,33 @@ object Dialogs {
     )
   }
 
+  /**
+   * Customizable progress spinner that shows [message] below the spinner to let users know
+   * an action is completing
+   */
+  @Composable
+  fun IndeterminateProgressDialog(message: String) {
+    androidx.compose.material3.AlertDialog(
+      onDismissRequest = {},
+      confirmButton = {},
+      dismissButton = {},
+      text = {
+        Column(
+          verticalArrangement = Arrangement.Center,
+          horizontalAlignment = Alignment.CenterHorizontally,
+          modifier = Modifier.fillMaxWidth().fillMaxHeight()
+        ) {
+          Spacer(modifier = Modifier.size(24.dp))
+          CircularProgressIndicator()
+          Spacer(modifier = Modifier.size(20.dp))
+          Text(message)
+        }
+      },
+      modifier = Modifier
+        .size(200.dp)
+    )
+  }
+
   @OptIn(ExperimentalLayoutApi::class)
   @Composable
   fun PermissionRationaleDialog(
@@ -237,3 +265,9 @@ private fun MessageDialogPreview() {
 private fun IndeterminateProgressDialogPreview() {
   Dialogs.IndeterminateProgressDialog()
 }
+
+@Preview
+@Composable
+private fun IndeterminateProgressDialogMessagePreview() {
+  Dialogs.IndeterminateProgressDialog("Completing...")
+}
diff --git a/core-ui/src/main/java/org/signal/core/ui/Rows.kt b/core-ui/src/main/java/org/signal/core/ui/Rows.kt
index aea17b788f..942d409b95 100644
--- a/core-ui/src/main/java/org/signal/core/ui/Rows.kt
+++ b/core-ui/src/main/java/org/signal/core/ui/Rows.kt
@@ -100,6 +100,7 @@ object Rows {
     Row(
       modifier = modifier
         .fillMaxWidth()
+        .clickable(enabled = enabled) { onCheckChanged(!checked) }
         .padding(defaultPadding()),
       verticalAlignment = CenterVertically
     ) {
diff --git a/core-ui/src/main/java/org/signal/core/ui/copied/androidx/compose/material3/Menu.kt b/core-ui/src/main/java/org/signal/core/ui/copied/androidx/compose/material3/Menu.kt
index 025571fda1..7b9dc93deb 100644
--- a/core-ui/src/main/java/org/signal/core/ui/copied/androidx/compose/material3/Menu.kt
+++ b/core-ui/src/main/java/org/signal/core/ui/copied/androidx/compose/material3/Menu.kt
@@ -52,14 +52,14 @@ internal fun DropdownMenuContent(
       if (false isTransitioningTo true) {
         // Dismissed to expanded
         tween(
-          durationMillis = InTransitionDuration,
+          durationMillis = IN_TRANSITION_DURATION,
           easing = LinearOutSlowInEasing
         )
       } else {
         // Expanded to dismissed.
         tween(
           durationMillis = 1,
-          delayMillis = OutTransitionDuration - 1
+          delayMillis = OUT_TRANSITION_DURATION - 1
         )
       }
     }
@@ -80,7 +80,7 @@ internal fun DropdownMenuContent(
         tween(durationMillis = 30)
       } else {
         // Expanded to dismissed.
-        tween(durationMillis = OutTransitionDuration)
+        tween(durationMillis = OUT_TRANSITION_DURATION)
       }
     }
   ) {
@@ -211,5 +211,5 @@ internal data class DropdownMenuPositionProvider(
 internal val MenuVerticalMargin = 48.dp
 
 // Menu open/close animation.
-internal const val InTransitionDuration = 120
-internal const val OutTransitionDuration = 75
+internal const val IN_TRANSITION_DURATION = 120
+internal const val OUT_TRANSITION_DURATION = 75
diff --git a/core-util-jvm/build.gradle.kts b/core-util-jvm/build.gradle.kts
index 06f505124b..27a4841806 100644
--- a/core-util-jvm/build.gradle.kts
+++ b/core-util-jvm/build.gradle.kts
@@ -16,6 +16,8 @@ java {
 }
 
 dependencies {
+  implementation(libs.kotlin.reflect)
+
   testImplementation(testLibs.junit.junit)
   testImplementation(testLibs.assertj.core)
 }
diff --git a/core-util-jvm/src/main/java/org/signal/core/util/Base64.kt b/core-util-jvm/src/main/java/org/signal/core/util/Base64.kt
index 7e81ad0082..aeb4bf9a30 100644
--- a/core-util-jvm/src/main/java/org/signal/core/util/Base64.kt
+++ b/core-util-jvm/src/main/java/org/signal/core/util/Base64.kt
@@ -71,6 +71,23 @@ object Base64 {
     }
   }
 
+  /**
+   * The same as [decode], except that instead of requiring you to handle an exception, this will return null
+   * if the input is null or cannot be decoded.
+   */
+  @JvmStatic
+  fun decodeOrNull(value: String?): ByteArray? {
+    if (value == null) {
+      return null
+    }
+
+    return try {
+      decode(value)
+    } catch (e: IOException) {
+      null
+    }
+  }
+
   /**
    * The same as [decode], except that instead of requiring you to handle an exception, this will just crash on invalid base64 strings.
    * Should only be used if the value is definitely a valid base64 string.
diff --git a/core-util-jvm/src/main/java/org/signal/core/util/ResettableLazy.kt b/core-util-jvm/src/main/java/org/signal/core/util/ResettableLazy.kt
new file mode 100644
index 0000000000..041a5fb965
--- /dev/null
+++ b/core-util-jvm/src/main/java/org/signal/core/util/ResettableLazy.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.signal.core.util
+
+import kotlin.reflect.KProperty
+
+/**
+ * Identical to Kotlin's built-in [lazy] delegate, but with a `reset` method that allows the value to be reset to it's default state (and therefore recomputed
+ * upon next access).
+ */
+fun <T> resettableLazy(initializer: () -> T): ResettableLazy<T> {
+  return ResettableLazy(initializer)
+}
+
+/**
+ * @see resettableLazy
+ */
+class ResettableLazy<T>(
+  val initializer: () -> T
+) {
+  // We need to distinguish between a lazy value of null and a lazy value that has not been initialized yet
+  @Volatile
+  private var value: Any? = UNINITIALIZED
+
+  operator fun getValue(thisRef: Any?, property: KProperty<*>): T {
+    if (value === UNINITIALIZED) {
+      synchronized(this) {
+        if (value === UNINITIALIZED) {
+          value = initializer()
+        }
+      }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    return value as T
+  }
+
+  fun reset() {
+    value = UNINITIALIZED
+  }
+
+  fun isInitialized(): Boolean {
+    return value !== UNINITIALIZED
+  }
+
+  override fun toString(): String {
+    return if (isInitialized()) {
+      value.toString()
+    } else {
+      "Lazy value not initialized yet."
+    }
+  }
+
+  companion object {
+    private val UNINITIALIZED = Any()
+  }
+}
diff --git a/core-util/src/main/java/org/signal/core/util/StringExtensions.kt b/core-util-jvm/src/main/java/org/signal/core/util/StringExtensions.kt
similarity index 94%
rename from core-util/src/main/java/org/signal/core/util/StringExtensions.kt
rename to core-util-jvm/src/main/java/org/signal/core/util/StringExtensions.kt
index aa9bf019ab..80aa438af6 100644
--- a/core-util/src/main/java/org/signal/core/util/StringExtensions.kt
+++ b/core-util-jvm/src/main/java/org/signal/core/util/StringExtensions.kt
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 package org.signal.core.util
 
 import kotlin.contracts.ExperimentalContracts
diff --git a/core-util-jvm/src/main/java/org/signal/core/util/test/TestUtils.kt b/core-util-jvm/src/main/java/org/signal/core/util/test/TestUtils.kt
new file mode 100644
index 0000000000..1a3242452a
--- /dev/null
+++ b/core-util-jvm/src/main/java/org/signal/core/util/test/TestUtils.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.signal.core.util.test
+
+import kotlin.reflect.full.memberProperties
+import kotlin.reflect.jvm.isAccessible
+
+/**
+ * Returns a string containing the differences between the expected and actual objects.
+ * Useful for diffing complex data classes in your tests.
+ */
+inline fun <reified T : Any> getObjectDiff(expected: T, actual: T): String {
+  val builder = StringBuilder()
+
+  val properties = T::class.memberProperties
+
+  for (prop in properties) {
+    prop.isAccessible = true
+    val expectedValue = prop.get(expected)
+    val actualValue = prop.get(actual)
+    if (expectedValue != actualValue) {
+      builder.append("[${prop.name}] Expected: $expectedValue, Actual: $actualValue\n")
+    }
+  }
+
+  return builder.toString()
+}
diff --git a/core-util-jvm/src/test/java/org/signal/core/util/ResettableLazyTests.kt b/core-util-jvm/src/test/java/org/signal/core/util/ResettableLazyTests.kt
new file mode 100644
index 0000000000..b719209c23
--- /dev/null
+++ b/core-util-jvm/src/test/java/org/signal/core/util/ResettableLazyTests.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.signal.core.util
+
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertFalse
+import junit.framework.TestCase.assertTrue
+import org.junit.Test
+import java.util.concurrent.CountDownLatch
+
+class ResettableLazyTests {
+
+  @Test
+  fun `value only computed once`() {
+    var counter = 0
+    val lazy: Int by resettableLazy {
+      counter++
+    }
+
+    assertEquals(0, lazy)
+    assertEquals(0, lazy)
+    assertEquals(0, lazy)
+  }
+
+  @Test
+  fun `value recomputed after a reset`() {
+    var counter = 0
+    val _lazy = resettableLazy {
+      counter++
+    }
+    val lazy by _lazy
+
+    assertEquals(0, lazy)
+    _lazy.reset()
+
+    assertEquals(1, lazy)
+    _lazy.reset()
+
+    assertEquals(2, lazy)
+  }
+
+  @Test
+  fun `isInitialized - general`() {
+    val _lazy = resettableLazy { 1 }
+    val lazy: Int by _lazy
+
+    assertFalse(_lazy.isInitialized())
+
+    val x = lazy + 1
+    assertEquals(2, x)
+    assertTrue(_lazy.isInitialized())
+
+    _lazy.reset()
+    assertFalse(_lazy.isInitialized())
+  }
+
+  /**
+   * I've verified that without the synchronization inside of resettableLazy, this test usually fails.
+   */
+  @Test
+  fun `ensure synchronization works`() {
+    val numRounds = 100
+    val numThreads = 5
+
+    for (i in 1..numRounds) {
+      var counter = 0
+      val lazy: Int by resettableLazy {
+        counter++
+      }
+
+      val latch = CountDownLatch(numThreads)
+
+      for (j in 1..numThreads) {
+        Thread {
+          val x = lazy + 1
+          latch.countDown()
+        }.start()
+      }
+
+      latch.await()
+
+      assertEquals(1, counter)
+    }
+  }
+}
diff --git a/core-util/src/main/java/org/signal/core/util/BundleExtensions.kt b/core-util/src/main/java/org/signal/core/util/BundleExtensions.kt
index 656ebc391a..484b2f1e14 100644
--- a/core-util/src/main/java/org/signal/core/util/BundleExtensions.kt
+++ b/core-util/src/main/java/org/signal/core/util/BundleExtensions.kt
@@ -3,6 +3,16 @@ package org.signal.core.util
 import android.os.Build
 import android.os.Bundle
 import android.os.Parcelable
+import java.io.Serializable
+
+fun <T : Serializable> Bundle.getSerializableCompat(key: String, clazz: Class<T>): T? {
+  return if (Build.VERSION.SDK_INT >= 33) {
+    this.getSerializable(key, clazz)
+  } else {
+    @Suppress("DEPRECATION", "UNCHECKED_CAST")
+    this.getSerializable(key) as T?
+  }
+}
 
 fun <T : Parcelable> Bundle.getParcelableCompat(key: String, clazz: Class<T>): T? {
   return if (Build.VERSION.SDK_INT >= 33) {
diff --git a/core-util/src/main/java/org/signal/core/util/CursorExtensions.kt b/core-util/src/main/java/org/signal/core/util/CursorExtensions.kt
index dd8d710567..8ce810a62c 100644
--- a/core-util/src/main/java/org/signal/core/util/CursorExtensions.kt
+++ b/core-util/src/main/java/org/signal/core/util/CursorExtensions.kt
@@ -79,16 +79,20 @@ fun <T> Cursor.requireObject(column: String, serializer: IntSerializer<T>): T {
 
 @JvmOverloads
 fun Cursor.readToSingleLong(defaultValue: Long = 0): Long {
+  return readToSingleLongOrNull() ?: defaultValue
+}
+
+fun Cursor.readToSingleLongOrNull(): Long? {
   return use {
     if (it.moveToFirst()) {
-      it.getLong(0)
+      it.getLongOrNull(0)
     } else {
-      defaultValue
+      null
     }
   }
 }
 
-fun <T> Cursor.readToSingleObject(serializer: Serializer<T, Cursor>): T? {
+fun <T> Cursor.readToSingleObject(serializer: BaseSerializer<T, Cursor, *>): T? {
   return use {
     if (it.moveToFirst()) {
       serializer.deserialize(it)
diff --git a/core-util/src/main/java/org/signal/core/util/SQLiteDatabaseExtensions.kt b/core-util/src/main/java/org/signal/core/util/SQLiteDatabaseExtensions.kt
index 6edb4cef4d..0e866ef77e 100644
--- a/core-util/src/main/java/org/signal/core/util/SQLiteDatabaseExtensions.kt
+++ b/core-util/src/main/java/org/signal/core/util/SQLiteDatabaseExtensions.kt
@@ -89,6 +89,33 @@ fun SupportSQLiteDatabase.areForeignKeyConstraintsEnabled(): Boolean {
   }
 }
 
+/**
+ * Does a full WAL checkpoint (TRUNCATE mode, where the log is for sure flushed and the log is zero'd out).
+ * Will try up to [maxAttempts] times. Can technically fail if the database is too active and the checkpoint
+ * can't complete in a reasonable amount of time.
+ *
+ * See: https://www.sqlite.org/pragma.html#pragma_wal_checkpoint
+ */
+fun SupportSQLiteDatabase.fullWalCheckpoint(maxAttempts: Int = 3): Boolean {
+  var attempts = 0
+
+  while (attempts < maxAttempts) {
+    if (this.walCheckpoint()) {
+      return true
+    }
+
+    attempts++
+  }
+
+  return false
+}
+
+private fun SupportSQLiteDatabase.walCheckpoint(): Boolean {
+  return this.query("PRAGMA wal_checkpoint(TRUNCATE)").use { cursor ->
+    cursor.moveToFirst() && cursor.getInt(0) == 0
+  }
+}
+
 fun SupportSQLiteDatabase.getIndexes(): List<Index> {
   return this.query("SELECT name, tbl_name FROM sqlite_master WHERE type='index' ORDER BY name ASC").readToList { cursor ->
     val indexName = cursor.requireNonNullString("name")
@@ -146,7 +173,7 @@ fun SupportSQLiteDatabase.delete(tableName: String): DeleteBuilderPart1 {
  * Deletes all data in the table.
  */
 fun SupportSQLiteDatabase.deleteAll(tableName: String): Int {
-  return this.delete(tableName, null, emptyArray<String>())
+  return this.delete(tableName, null, arrayOfNulls<String>(0))
 }
 
 fun SupportSQLiteDatabase.insertInto(tableName: String): InsertBuilderPart1 {
diff --git a/core-util/src/main/java/org/signal/core/util/Serializer.kt b/core-util/src/main/java/org/signal/core/util/Serializer.kt
index 5bbddb2f15..6526c14189 100644
--- a/core-util/src/main/java/org/signal/core/util/Serializer.kt
+++ b/core-util/src/main/java/org/signal/core/util/Serializer.kt
@@ -1,13 +1,26 @@
 package org.signal.core.util
 
+import android.content.ContentValues
+import android.database.Cursor
+
 /**
- * Generic serialization interface for use with database and store operations.
+ * Generalized serializer for finer control
  */
-interface Serializer<T, R> {
-  fun serialize(data: T): R
-  fun deserialize(data: R): T
+interface BaseSerializer<Data, Input, Output> {
+  fun serialize(data: Data): Output
+  fun deserialize(input: Input): Data
 }
 
+/**
+ * Generic serialization interface for use with database and store operations.
+ */
+interface Serializer<T, R> : BaseSerializer<T, R, R>
+
+/**
+ * Serializer specifically for working with SQLite
+ */
+interface DatabaseSerializer<Data> : BaseSerializer<Data, Cursor, ContentValues>
+
 interface StringSerializer<T> : Serializer<T, String>
 
 interface IntSerializer<T> : Serializer<T, Int>
diff --git a/dependencies.gradle.kts b/dependencies.gradle.kts
index 9d2dd21f4d..2431429716 100644
--- a/dependencies.gradle.kts
+++ b/dependencies.gradle.kts
@@ -6,18 +6,18 @@ dependencyResolutionManagement {
     create("libs") {
       version("androidx-appcompat", "1.6.1")
       version("androidx-activity", "1.8.2")
-      version("androidx-camera", "1.3.2")
+      version("androidx-camera", "1.3.4")
       version("androidx-fragment", "1.6.2")
       version("androidx-lifecycle", "2.7.0")
-      version("androidx-media3", "1.2.1")
+      version("androidx-media3", "1.3.1")
       version("androidx-navigation", "2.7.6")
       version("androidx-window", "1.2.0")
       version("exoplayer", "2.19.0")
       version("glide", "4.15.1")
-      version("kotlin", "1.8.10")
-      version("libsignal-client", "0.46.0")
+      version("kotlin", "1.9.20")
+      version("libsignal-client", "0.51.1")
       version("mp4parser", "1.9.39")
-      version("android-gradle-plugin", "8.0.2")
+      version("android-gradle-plugin", "8.4.0")
       version("accompanist", "0.28.0")
       version("nanohttpd", "2.3.1")
 
@@ -26,7 +26,7 @@ dependencyResolutionManagement {
       library("android-application", "com.android.application", "com.android.application.gradle.plugin").versionRef("android-gradle-plugin")
 
       // Compose
-      library("androidx-compose-bom", "androidx.compose:compose-bom:2023.09.01")
+      library("androidx-compose-bom", "androidx.compose:compose-bom:2023.10.01")
       library("androidx-compose-material3", "androidx.compose.material3", "material3").withoutVersion()
       library("androidx-compose-ui-tooling-preview", "androidx.compose.ui", "ui-tooling-preview").withoutVersion()
       library("androidx-compose-ui-tooling-core", "androidx.compose.ui", "ui-tooling").withoutVersion()
@@ -38,11 +38,13 @@ dependencyResolutionManagement {
       library("accompanist-permissions", "com.google.accompanist", "accompanist-permissions").versionRef("accompanist")
 
       // Desugaring
-      library("android-tools-desugar", "com.android.tools:desugar_jdk_libs:1.1.5")
+      library("android-tools-desugar", "com.android.tools:desugar_jdk_libs:1.1.6")
 
       // Kotlin
       library("kotlin-stdlib-jdk8", "org.jetbrains.kotlin", "kotlin-stdlib-jdk8").versionRef("kotlin")
+      library("kotlin-reflect", "org.jetbrains.kotlin", "kotlin-reflect").versionRef("kotlin")
       library("kotlin-gradle-plugin", "org.jetbrains.kotlin", "kotlin-gradle-plugin").versionRef("kotlin")
+      library("kotlinx-coroutines-play-services", "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.8.1")
 
       // Android X
       library("androidx-activity-ktx", "androidx.activity", "activity-ktx").versionRef("androidx-activity")
@@ -92,6 +94,7 @@ dependencyResolutionManagement {
       library("androidx-profileinstaller", "androidx.profileinstaller:profileinstaller:1.2.2")
       library("androidx-asynclayoutinflater", "androidx.asynclayoutinflater:asynclayoutinflater:1.1.0-alpha01")
       library("androidx-asynclayoutinflater-appcompat", "androidx.asynclayoutinflater:asynclayoutinflater-appcompat:1.1.0-alpha01")
+      library("androidx-emoji2", "androidx.emoji2:emoji2:1.4.0")
       library("androidx-webkit", "androidx.webkit:webkit:1.4.0")
 
       // Material
@@ -102,6 +105,7 @@ dependencyResolutionManagement {
       library("google-libphonenumber", "com.googlecode.libphonenumber:libphonenumber:8.13.23")
       library("google-play-services-maps", "com.google.android.gms:play-services-maps:18.2.0")
       library("google-play-services-auth", "com.google.android.gms:play-services-auth:21.0.0")
+      library("google-play-services-wallet", "com.google.android.gms:play-services-wallet:19.2.1")
       library("google-zxing-android-integration", "com.google.zxing:android-integration:3.3.0")
       library("google-zxing-core", "com.google.zxing:core:3.4.1")
       library("google-ez-vcard", "com.googlecode.ez-vcard:ez-vcard:0.9.11")
@@ -118,7 +122,7 @@ dependencyResolutionManagement {
       library("libsignal-client", "org.signal", "libsignal-client").versionRef("libsignal-client")
       library("libsignal-android", "org.signal", "libsignal-android").versionRef("libsignal-client")
       library("signal-aesgcmprovider", "org.signal:aesgcmprovider:0.0.3")
-      library("molly-ringrtc", "im.molly:ringrtc-android:2.42.0-1")
+      library("molly-ringrtc", "im.molly:ringrtc-android:2.44.0-1")
       library("signal-android-database-sqlcipher", "org.signal:sqlcipher-android:4.5.4-S2")
 
       // MOLLY
@@ -129,10 +133,11 @@ dependencyResolutionManagement {
 
       // Third Party
       library("greenrobot-eventbus", "org.greenrobot:eventbus:3.0.0")
-      library("jackson-core", "com.fasterxml.jackson.core:jackson-databind:2.15.4")
-      library("square-okhttp3", "com.squareup.okhttp3:okhttp:3.12.13")
-      library("square-okhttp3-dnsoverhttps", "com.squareup.okhttp3:okhttp-dnsoverhttps:3.12.13")
-      library("square-okio", "com.squareup.okio:okio:3.0.0")
+      library("jackson-core", "com.fasterxml.jackson.core:jackson-databind:2.17.2")
+      library("jackson-module-kotlin", "com.fasterxml.jackson.module:jackson-module-kotlin:2.17.2")
+      library("square-okhttp3", "com.squareup.okhttp3:okhttp:4.12.0")
+      library("square-okhttp3-dnsoverhttps", "com.squareup.okhttp3:okhttp-dnsoverhttps:4.12.0")
+      library("square-okio", "com.squareup.okio:okio:3.6.0")
       library("square-leakcanary", "com.squareup.leakcanary:leakcanary-android:2.7")
       library("rxjava3-rxjava", "io.reactivex.rxjava3:rxjava:3.0.13")
       library("rxjava3-rxandroid", "io.reactivex.rxjava3:rxandroid:3.0.0")
@@ -151,6 +156,7 @@ dependencyResolutionManagement {
       library("android-tooltips", "com.tomergoldst.android:tooltips:1.0.6")
       library("stream", "com.annimon:stream:1.1.8")
       library("lottie", "com.airbnb.android:lottie:5.2.0")
+      library("lottie-compose", "com.airbnb.android:lottie-compose:6.4.0")
       library("dnsjava", "dnsjava:dnsjava:2.1.9")
       library("nanohttpd-webserver", "org.nanohttpd", "nanohttpd-webserver").versionRef("nanohttpd")
       library("nanohttpd-websocket", "org.nanohttpd", "nanohttpd-websocket").versionRef("nanohttpd")
@@ -200,7 +206,7 @@ dependencyResolutionManagement {
       library("bouncycastle-bcpkix-jdk15on", "org.bouncycastle:bcpkix-jdk15on:1.70")
       library("hamcrest-hamcrest", "org.hamcrest:hamcrest:2.2")
       library("assertj-core", "org.assertj:assertj-core:3.11.1")
-      library("square-okhttp-mockserver", "com.squareup.okhttp3:mockwebserver:3.12.13")
+      library("square-okhttp-mockserver", "com.squareup.okhttp3:mockwebserver:4.12.0")
       library("mockk", "io.mockk:mockk:1.13.2")
       library("mockk-android", "io.mockk:mockk-android:1.13.2")
 
diff --git a/donations/app/build.gradle.kts b/donations/app/build.gradle.kts
new file mode 100644
index 0000000000..ed7db9252e
--- /dev/null
+++ b/donations/app/build.gradle.kts
@@ -0,0 +1,16 @@
+plugins {
+  id("signal-sample-app")
+}
+
+android {
+  namespace = "org.signal.donations.app"
+
+  defaultConfig {
+    applicationId = "org.signal.donations.app"
+  }
+}
+
+dependencies {
+  implementation(project(":donations"))
+  implementation(project(":core-util"))
+}
diff --git a/donations/app/src/main/AndroidManifest.xml b/donations/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..0b70efb6b4
--- /dev/null
+++ b/donations/app/src/main/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <application
+      android:allowBackup="true"
+      android:icon="@mipmap/ic_launcher"
+      android:label="@string/app_name"
+      android:roundIcon="@mipmap/ic_launcher_round"
+      android:supportsRtl="true"
+      android:theme="@style/Theme.DeviceTransferTest">
+    <activity android:name=".MainActivity"
+        android:exported="true">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+
+    <meta-data
+        android:name="com.google.android.gms.wallet.api.enabled"
+        android:value="true" />
+  </application>
+
+</manifest>
diff --git a/donations/app/src/main/java/org/signal/donations/app/MainActivity.java b/donations/app/src/main/java/org/signal/donations/app/MainActivity.java
new file mode 100644
index 0000000000..747ab5a2da
--- /dev/null
+++ b/donations/app/src/main/java/org/signal/donations/app/MainActivity.java
@@ -0,0 +1,93 @@
+package org.signal.donations.app;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.google.android.gms.wallet.PaymentData;
+import com.google.android.gms.wallet.WalletConstants;
+
+import org.signal.core.util.logging.Log;
+import org.signal.core.util.money.FiatMoney;
+import org.signal.donations.GooglePayApi;
+
+import java.math.BigDecimal;
+import java.util.Currency;
+import java.util.Locale;
+
+import io.reactivex.rxjava3.disposables.Disposable;
+
+public class MainActivity extends AppCompatActivity implements GooglePayApi.PaymentRequestCallback {
+
+  private static final String TAG = Log.tag(MainActivity.class);
+
+  private View donateButton;
+
+  private GooglePayApi payApi;
+  private Disposable   isReadyToPayDisposable;
+
+  @Override
+  protected void onCreate(@Nullable Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.activity_main);
+
+    donateButton = findViewById(R.id.donate_with_googlepay);
+    donateButton.setVisibility(View.GONE);
+    donateButton.setOnClickListener(v -> requestPayment());
+
+    payApi = new GooglePayApi(this, TestUtil.INSTANCE, new GooglePayApi.Configuration(WalletConstants.ENVIRONMENT_TEST));
+
+    isReadyToPayDisposable = payApi.queryIsReadyToPay().subscribe(this::presentGooglePayButton, this::presentException);
+  }
+
+  @Override
+  protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+    super.onActivityResult(requestCode, resultCode, data);
+    payApi.onActivityResult(requestCode, resultCode, data, 1, this);
+  }
+
+  @Override
+  protected void onDestroy() {
+    isReadyToPayDisposable.dispose();
+    super.onDestroy();
+  }
+
+  private void presentGooglePayButton() {
+    Log.d(TAG, "Pay is available, displaying button");
+    donateButton.setVisibility(View.VISIBLE);
+  }
+
+  private void presentException(@NonNull Throwable throwable) {
+    Log.w(TAG, "Could not display pay button", throwable);
+    Toast.makeText(this, "Could not display pay button", Toast.LENGTH_LONG).show();
+  }
+
+  private void requestPayment() {
+    donateButton.setClickable(false);
+
+    payApi.requestPayment(new FiatMoney(BigDecimal.valueOf(4.00), Currency.getInstance(Locale.getDefault())), "Test Purchase", 1);
+  }
+
+  @Override
+  public void onSuccess(PaymentData paymentData) {
+    Toast.makeText(this, "SUCCESS", Toast.LENGTH_SHORT).show();
+    donateButton.setClickable(true);
+  }
+
+  @Override
+  public void onError(@NonNull GooglePayApi.GooglePayException googlePayException) {
+    Toast.makeText(this, "ERROR", Toast.LENGTH_SHORT).show();
+    donateButton.setClickable(true);
+  }
+
+  @Override
+  public void onCancelled() {
+    Toast.makeText(this, "CANCELLED", Toast.LENGTH_SHORT).show();
+    donateButton.setClickable(true);
+  }
+}
diff --git a/donations/app/src/main/java/org/signal/donations/app/TestUtil.kt b/donations/app/src/main/java/org/signal/donations/app/TestUtil.kt
new file mode 100644
index 0000000000..a4c4862d25
--- /dev/null
+++ b/donations/app/src/main/java/org/signal/donations/app/TestUtil.kt
@@ -0,0 +1,21 @@
+package org.signal.donations.app
+
+import org.signal.donations.GooglePayApi
+
+object TestUtil : GooglePayApi.Gateway {
+  override fun getTokenizationSpecificationParameters(): Map<String, String> {
+    return mapOf(
+      "gateway" to "example",
+      "gatewayMerchantId" to "exampleMerchantId"
+    )
+  }
+
+  override val allowedCardNetworks: List<String> = listOf(
+    "AMEX",
+    "DISCOVER",
+    "INTERAC",
+    "JCB",
+    "MASTERCARD",
+    "VISA"
+  )
+}
diff --git a/donations/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/donations/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000000..18c0565852
--- /dev/null
+++ b/donations/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,31 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:endX="85.84757"
+          android:endY="92.4963"
+          android:startX="42.9492"
+          android:startY="49.59793"
+          android:type="linear">
+        <item
+            android:color="#44000000"
+            android:offset="0.0" />
+        <item
+            android:color="#00000000"
+            android:offset="1.0" />
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:fillColor="#FFFFFF"
+      android:fillType="nonZero"
+      android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+      android:strokeWidth="1"
+      android:strokeColor="#00000000" />
+</vector>
\ No newline at end of file
diff --git a/donations/app/src/main/res/drawable/ic_launcher_background.xml b/donations/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000000..c71b77f4d2
--- /dev/null
+++ b/donations/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:fillColor="#3DDC84"
+      android:pathData="M0,0h108v108h-108z" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M9,0L9,108"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M19,0L19,108"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M29,0L29,108"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M39,0L39,108"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M49,0L49,108"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M59,0L59,108"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M69,0L69,108"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M79,0L79,108"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M89,0L89,108"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M99,0L99,108"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M0,9L108,9"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M0,19L108,19"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M0,29L108,29"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M0,39L108,39"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M0,49L108,49"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M0,59L108,59"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M0,69L108,69"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M0,79L108,79"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M0,89L108,89"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M0,99L108,99"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M19,29L89,29"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M19,39L89,39"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M19,49L89,49"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M19,59L89,59"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M19,69L89,69"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M19,79L89,79"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M29,19L29,89"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M39,19L39,89"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M49,19L49,89"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M59,19L59,89"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M69,19L69,89"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M79,19L79,89"
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/donations/app/src/main/res/drawable/ic_refresh_20.xml b/donations/app/src/main/res/drawable/ic_refresh_20.xml
new file mode 100644
index 0000000000..915e0bbbca
--- /dev/null
+++ b/donations/app/src/main/res/drawable/ic_refresh_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M14.7,5.3A6.7,6.7 0,1 0,10 16.7a6.7,6.7 0,0 0,6.4 -5H14.7A5,5 0,1 1,10 5a4.9,4.9 0,0 1,3.5 1.5L10.8,9.2h5.9V3.3Z"/>
+</vector>
diff --git a/donations/app/src/main/res/layout/activity_main.xml b/donations/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000000..b07556fbe9
--- /dev/null
+++ b/donations/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <include
+        android:id="@+id/donate_with_googlepay"
+        layout="@layout/donate_with_googlepay_button" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/donations/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/donations/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000000..9244248264
--- /dev/null
+++ b/donations/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon
+    xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@drawable/ic_launcher_background" />
+  <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/donations/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/donations/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000000..9244248264
--- /dev/null
+++ b/donations/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon
+    xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@drawable/ic_launcher_background" />
+  <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/donations/app/src/main/res/mipmap-hdpi/ic_launcher.png b/donations/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000..a571e60098
Binary files /dev/null and b/donations/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/donations/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/donations/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000000..61da551c55
Binary files /dev/null and b/donations/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/donations/app/src/main/res/mipmap-mdpi/ic_launcher.png b/donations/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000..c41dd28531
Binary files /dev/null and b/donations/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/donations/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/donations/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000000..db5080a752
Binary files /dev/null and b/donations/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/donations/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/donations/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000..6dba46dab1
Binary files /dev/null and b/donations/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/donations/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/donations/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000..da31a871c8
Binary files /dev/null and b/donations/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/donations/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/donations/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000..15ac681720
Binary files /dev/null and b/donations/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/donations/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/donations/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000..b216f2d313
Binary files /dev/null and b/donations/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/donations/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/donations/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000..f25a419744
Binary files /dev/null and b/donations/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/donations/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/donations/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000..e96783ccce
Binary files /dev/null and b/donations/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/donations/app/src/main/res/values-night/themes.xml b/donations/app/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000000..469981c422
--- /dev/null
+++ b/donations/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,16 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!-- Base application theme. -->
+  <style name="Theme.DeviceTransferTest" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <!-- Primary brand color. -->
+    <item name="colorPrimary">@color/purple_200</item>
+    <item name="colorPrimaryVariant">@color/purple_700</item>
+    <item name="colorOnPrimary">@color/black</item>
+    <!-- Secondary brand color. -->
+    <item name="colorSecondary">@color/teal_200</item>
+    <item name="colorSecondaryVariant">@color/teal_200</item>
+    <item name="colorOnSecondary">@color/black</item>
+    <!-- Status bar color. -->
+    <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+    <!-- Customize your theme here. -->
+  </style>
+</resources>
\ No newline at end of file
diff --git a/donations/app/src/main/res/values/colors.xml b/donations/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..09837df62f
--- /dev/null
+++ b/donations/app/src/main/res/values/colors.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="purple_200">#FFBB86FC</color>
+  <color name="purple_500">#FF6200EE</color>
+  <color name="purple_700">#FF3700B3</color>
+  <color name="teal_200">#FF03DAC5</color>
+  <color name="teal_700">#FF018786</color>
+  <color name="black">#FF000000</color>
+  <color name="white">#FFFFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/donations/app/src/main/res/values/strings.xml b/donations/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..704183733d
--- /dev/null
+++ b/donations/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+  <string name="app_name">DonationsTest</string>
+</resources>
\ No newline at end of file
diff --git a/donations/app/src/main/res/values/themes.xml b/donations/app/src/main/res/values/themes.xml
new file mode 100644
index 0000000000..00c51022b9
--- /dev/null
+++ b/donations/app/src/main/res/values/themes.xml
@@ -0,0 +1,16 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!-- Base application theme. -->
+  <style name="Theme.DeviceTransferTest" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <!-- Primary brand color. -->
+    <item name="colorPrimary">@color/purple_500</item>
+    <item name="colorPrimaryVariant">@color/purple_700</item>
+    <item name="colorOnPrimary">@color/white</item>
+    <!-- Secondary brand color. -->
+    <item name="colorSecondary">@color/teal_200</item>
+    <item name="colorSecondaryVariant">@color/teal_700</item>
+    <item name="colorOnSecondary">@color/black</item>
+    <!-- Status bar color. -->
+    <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+    <!-- Customize your theme here. -->
+  </style>
+</resources>
\ No newline at end of file
diff --git a/donations/lib/build.gradle.kts b/donations/lib/build.gradle.kts
new file mode 100644
index 0000000000..d3be392c4f
--- /dev/null
+++ b/donations/lib/build.gradle.kts
@@ -0,0 +1,37 @@
+plugins {
+  id("signal-library")
+  id("kotlin-parcelize")
+}
+
+android {
+  namespace = "org.signal.donations"
+
+  flavorDimensions += "license"
+
+  productFlavors {
+    create("gms") {
+      dimension = "license"
+      isDefault = true
+    }
+
+    create("foss") {
+      dimension = "license"
+    }
+  }
+}
+
+dependencies {
+  implementation(project(":core-util"))
+
+  implementation(libs.kotlin.reflect)
+  implementation(libs.jackson.module.kotlin)
+  implementation(libs.jackson.core)
+
+  testImplementation(testLibs.robolectric.robolectric) {
+    exclude(group = "com.google.protobuf", module = "protobuf-java")
+  }
+
+  "gmsApi"(libs.google.play.services.wallet)
+  "fossApi"(project(":libfakegms"))
+  api(libs.square.okhttp3)
+}
diff --git a/donations/lib/src/foss/res/layout/donate_with_googlepay_button.xml b/donations/lib/src/foss/res/layout/donate_with_googlepay_button.xml
new file mode 100644
index 0000000000..bce65f74ad
--- /dev/null
+++ b/donations/lib/src/foss/res/layout/donate_with_googlepay_button.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+</LinearLayout>
diff --git a/donations/lib/src/gms/res/drawable-ar-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-ar-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..1bf89bd308
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-ar-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="296dp" android:height="38dp" android:viewportWidth="296" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M5.88538 30.14c-.504 0-1.01734-.0467-1.54-.14-.504-.0747-.85867-.1307-1.064-.168l.364-2.744c1.568.2053 3.03333.2053 4.396 0 1.38133-.224 2.51062-.784 3.38802-1.68-.728-1.176-1.81069-2.604-3.24802-4.284-1.43734-1.68-3.15467-3.4253-5.152-5.236l1.792-1.904c2.14666 2.0347 3.84533 3.7707 5.096 5.208 1.25062 1.4373 2.23062 2.6693 2.94002 3.696.2613-.8213.4013-1.764.42-2.828l-.392-10.192h2.8l.56 14.196c.0373.896.1306 1.5867.28 2.072.1493.4667.4573.7933.924.98.4666.168 1.1946.252 2.184.252.4666 0 .812.1307 1.036.392.224.2613.336.5693.336.924 0 .392-.1494.7373-.448 1.036-.2987.28-.7.42-1.204.42-1.3627 0-2.4454-.1213-3.248-.364-.8027-.2613-1.4-.6533-1.792-1.176-.3734-.5413-.616-1.232-.728-2.072-.6347 1.064-1.4 1.8573-2.296 2.38-.8774.504-1.80135.84-2.77202 1.008-.952.1493-1.82934.224-2.632.224zm13.76932 0l.28-2.772c.8587 0 1.54-.0653 2.044-.196.504-.1493.896-.42 1.176-.812.2987-.4107.5413-.9987.728-1.764.2053-.7653.42-1.7827.644-3.052l2.632.476c-.112.4853-.2333 1.0453-.364 1.68-.112.6347-.168 1.1853-.168 1.652 0 .4107.0653.7653.196 1.064.1493.2987.504.532 1.064.7.56.168 1.4933.252 2.8.252.4853 0 .8307.1307 1.036.392.2053.2613.308.5693.308.924 0 .392-.1493.7373-.448 1.036-.2987.28-.6907.42-1.176.42-1.6613 0-2.8747-.1587-3.64-.476-.7467-.3173-1.2507-.8213-1.512-1.512-.616.84-1.372 1.3813-2.268 1.624-.896.2427-2.0067.364-3.332.364zm7.924-11.368c-.4293 0-.8027-.1493-1.12-.448-.2987-.3173-.448-.6813-.448-1.092 0-.4107.1493-.7747.448-1.092.3173-.3173.6907-.476 1.12-.476.4107 0 .7653.1587 1.064.476.3173.3173.476.6813.476 1.092 0 .4107-.1587.7747-.476 1.092-.2987.2987-.6533.448-1.064.448zm-4.144 0c-.4293 0-.7933-.1493-1.092-.448-.2987-.3173-.448-.6813-.448-1.092 0-.4293.1493-.7933.448-1.092.2987-.3173.6627-.476 1.092-.476.4107 0 .7653.1587 1.064.476.3173.2987.476.6627.476 1.092 0 .4107-.1587.7747-.476 1.092-.2987.2987-.6533.448-1.064.448zm7.2661 11.368l.28-2.772c1.3067 0 2.2307-.14 2.772-.42.5413-.28.812-.9147.812-1.904 0-.4853-.0747-1.064-.224-1.736-.1493-.672-.3453-1.372-.588-2.1-.224-.7467-.4667-1.4747-.728-2.184l2.744-.896c.2427.616.4667 1.316.672 2.1.224.784.4107 1.5773.56 2.38.1493.784.224 1.4933.224 2.128 0 1.3813-.2613 2.464-.784 3.248-.504.784-1.2413 1.344-2.212 1.68-.9707.3173-2.1467.476-3.528.476zm3.136 5.572c-.4293 0-.8027-.1493-1.12-.448-.2987-.2987-.448-.6627-.448-1.092 0-.4107.1493-.7747.448-1.092.3173-.3173.6907-.476 1.12-.476.4107 0 .7653.1587 1.064.476.3173.3173.476.6813.476 1.092 0 .4293-.1587.7933-.476 1.092-.2987.2987-.6533.448-1.064.448zm7.8604-24.26c-.728 0-1.2133-.2427-1.456-.728-.2426-.4853-.364-1.01733-.364-1.596 0-.20533.0094-.42.028-.644.0374-.24267.084-.51333.14-.812l1.484-.392c-.112.63467-.168 1.16667-.168 1.596 0 .63467.2147.952.644.952.2614 0 .476-.14.644-.42.168-.28.2707-.84.308-1.68v-.84l1.4-.504v1.708c0 .24267.0467.45733.14.644.0934.168.2987.252.616.252.3174 0 .5227-.09333.616-.28.112-.18667.168-.42933.168-.728 0-.31733-.0373-.63467-.112-.952-.0746-.336-.1773-.66267-.308-.98l1.344-.392c.1867.37333.336.784.448 1.232.1307.448.196.85867.196 1.232 0 .616-.1773 1.176-.532 1.68-.336.4853-.8773.728-1.624.728-.5786 0-1.0546-.168-1.428-.504-.168.4293-.448.7747-.84 1.036-.3733.2613-.8213.392-1.344.392zm-2.2427 25.044l-1.008-2.52c2.5013-.8587 4.284-1.9227 5.348-3.192 1.0826-1.2693 1.624-2.5853 1.624-3.948 0-.8773-.196-1.7827-.588-2.716-.392-.9333-.8307-1.8387-1.316-2.716l2.52-1.26c.5226.9707.952 1.9227 1.288 2.856.3546.9333.6253 1.68.812 2.24.2613.84.6066 1.4093 1.036 1.708.4293.28 1.0546.42 1.876.42.4853 0 .8306.1307 1.036.392.224.2613.336.5693.336.924 0 .392-.1587.7373-.476 1.036-.2987.28-.6907.42-1.176.42-.728 0-1.344-.112-1.848-.336-.4854-.224-.8774-.5227-1.176-.896-.2054 1.008-.6067 1.9227-1.204 2.744-.5787.84-1.2694 1.5773-2.072 2.212-.8027.6533-1.6427 1.1947-2.52 1.624-.8587.448-1.6894.784-2.492 1.008zm11.615-6.356l.28-2.772c1.0827 0 1.9227-.0093 2.52-.028.5974-.0187 1.036-.0373 1.316-.056s.4854-.0373.616-.056c-.28-.1867-.6253-.4667-1.036-.84-.4106-.392-.7746-.896-1.092-1.512-.2986-.616-.448-1.344-.448-2.184 0-1.064.2614-2.0067.784-2.828.5227-.8213 1.2414-1.4653 2.156-1.932.9147-.4667 1.9507-.7 3.108-.7.4667 0 .952.0373 1.456.112s.9894.1867 1.456.336l-.532 2.632c-.784-.2053-1.5493-.308-2.296-.308-.9893 0-1.792.2613-2.408.784-.616.504-.924 1.1853-.924 2.044 0 .56.1307 1.0547.392 1.484.28.4293.6254.8027 1.036 1.12.4294.2987.868.532 1.316.7.448.1493.84.224 1.176.224.392-.112.7374-.2147 1.036-.308.2987-.0933.6534-.224 1.064-.392.4107-.168.9894-.4107 1.736-.728l.924 2.52c-1.344.5787-2.6973 1.0733-4.06 1.484-1.344.392-2.7906.6907-4.34.896-1.5493.2053-3.2946.308-5.236.308zm33.593.448c-3.528 0-6.132-.476-7.812-1.428-1.68-.9707-2.52-2.4453-2.52-4.424 0-.7467.084-1.5307.252-2.352.1867-.8213.3827-1.5773.588-2.268l2.492.588c-.112.4667-.2333 1.008-.364 1.624-.1307.5973-.196 1.1293-.196 1.596 0 .896.2427 1.6333.728 2.212.504.5787 1.3533 1.008 2.548 1.288 1.2133.2613 2.884.392 5.012.392 4.144 0 7.1773-.2333 9.1-.7 1.9413-.4667 2.912-1.2973 2.912-2.492 0-.6907-.1307-1.5027-.392-2.436-.2427-.952-.56-1.9413-.952-2.968l2.604-.84c.3547.9147.6813 1.9227.98 3.024.3173 1.0827.4765 2.0627.4765 2.94 0 1.12-.2525 2.0813-.7565 2.884-.504.784-1.344 1.428-2.52 1.932-1.1573.4853-2.7347.84-4.732 1.064-1.9973.2427-4.48.364-7.448.364zm2.548 5.684c-.4293 0-.8027-.1493-1.12-.448-.2987-.2987-.448-.6627-.448-1.092 0-.4107.1493-.7747.448-1.092.3173-.3173.6907-.476 1.12-.476.4107 0 .7653.1587 1.064.476.3173.3173.476.6813.476 1.092 0 .4293-.1587.7933-.476 1.092-.2987.2987-.6533.448-1.064.448zm22.9785-6.132c-1.586 0-2.8-.168-3.64-.504-.821-.3547-1.4-.8867-1.736-1.596-.317-.728-.494-1.6613-.532-2.8l-.56-15.372h2.772l.588 14.196c.038.896.122 1.5867.252 2.072.15.4667.458.7933.924.98.467.168 1.204.252 2.212.252.467 0 .812.1307 1.036.392.224.2613.336.5693.336.924 0 .392-.158.7373-.476 1.036-.298.28-.69.42-1.176.42zm.295 0l.28-2.772c.598 0 1.083-.0467 1.456-.14.392-.0933.71-.308.952-.644.262-.3547.495-.9053.7-1.652.224-.7653.476-1.8013.756-3.108l2.548.616c-.093.4667-.214 1.0173-.364 1.652-.13.6347-.196 1.2133-.196 1.736 0 .4667.168.84.504 1.12.355.28.999.42 1.932.42.523 0 .962-.0467 1.316-.14.355-.0933.654-.3173.896-.672.243-.3733.458-.9427.644-1.708.187-.784.383-1.8573.588-3.22l2.604.448c-.074.3547-.149.7747-.224 1.26-.074.4853-.14.9613-.196 1.428-.056.4667-.084.8493-.084 1.148 0 .2613.056.504.168.728.131.224.374.4013.728.532.374.1307.924.196 1.652.196.915 0 1.578-.1867 1.988-.56.411-.392.616-.98.616-1.764 0-.6533-.018-1.3627-.056-2.128-.037-.784-.13-1.764-.28-2.94l2.492-.168c.112 1.5307.243 2.7907.392 3.78.168.9893.383 1.764.644 2.324.28.5413.654.924 1.12 1.148.486.2053 1.12.308 1.904.308.486 0 .831.1307 1.036.392.224.2613.336.5693.336.924 0 .392-.149.7373-.448 1.036-.298.28-.7.42-1.204.42-1.026 0-1.922-.2147-2.688-.644-.765-.448-1.334-1.092-1.708-1.932-.392 1.0267-.97 1.7173-1.736 2.072-.765.336-1.652.504-2.66.504-.952 0-1.736-.14-2.352-.42-.616-.28-1.054-.728-1.316-1.344-.466.7467-1.036 1.232-1.708 1.456-.672.2053-1.596.308-2.772.308-.429 0-.868-.0467-1.316-.14-.448-.0933-.868-.2707-1.26-.532-.392-.28-.709-.6907-.952-1.232-.522.8213-1.176 1.344-1.96 1.568-.765.224-1.689.336-2.772.336zm25.511 0l.28-2.772c.859 0 1.54-.0653 2.044-.196.504-.1493.896-.42 1.176-.812.299-.4107.542-.9987.728-1.764.206-.7653.42-1.7827.644-3.052l2.632.476c-.112.4853-.233 1.0453-.364 1.68-.112.6347-.168 1.1853-.168 1.652 0 .4107.066.7653.196 1.064.15.2987.504.532 1.064.7.56.168 1.494.252 2.8.252.486 0 .831.1307 1.036.392.206.2613.308.5693.308.924 0 .392-.149.7373-.448 1.036-.298.28-.69.42-1.176.42-1.661 0-2.874-.1587-3.64-.476-.746-.3173-1.25-.8213-1.512-1.512-.616.84-1.372 1.3813-2.268 1.624-.896.2427-2.006.364-3.332.364zm7.924-11.368c-.429 0-.802-.1493-1.12-.448-.298-.3173-.448-.6813-.448-1.092 0-.4107.15-.7747.448-1.092.318-.3173.691-.476 1.12-.476.411 0 .766.1587 1.064.476.318.3173.476.6813.476 1.092 0 .4107-.158.7747-.476 1.092-.298.2987-.653.448-1.064.448zm-4.144 0c-.429 0-.793-.1493-1.092-.448-.298-.3173-.448-.6813-.448-1.092 0-.4293.15-.7933.448-1.092.299-.3173.663-.476 1.092-.476.411 0 .766.1587 1.064.476.318.2987.476.6627.476 1.092 0 .4107-.158.7747-.476 1.092-.298.2987-.653.448-1.064.448zm7.266 11.368l.252-2.772c1.96 0 3.855-.2613 5.684-.784 1.83-.5413 3.491-1.3253 4.984-2.352-.746-.5973-1.652-1.0733-2.716-1.428-1.045-.3733-2.193-.56-3.444-.56-.858 0-1.745.1027-2.66.308l-.476-2.632c.523-.1493 1.046-.2613 1.568-.336.523-.0747 1.027-.112 1.512-.112 1.232 0 2.324.1773 3.276.532.952.336 1.811.728 2.576 1.176.766.4293 1.494.8213 2.184 1.176.691.336 1.391.504 2.1.504h.728l.252 2.52c-.97.0187-1.857.196-2.66.532-.784.3173-1.577.7093-2.38 1.176-.784.4667-1.67.9333-2.66 1.4-.97.4667-2.109.8587-3.416 1.176-1.306.3173-2.874.476-4.704.476zm4.732-13.496c-.448 0-.83-.1493-1.148-.448-.298-.2987-.448-.672-.448-1.12 0-.4293.15-.8027.448-1.12.318-.3173.7-.476 1.148-.476.43 0 .794.1587 1.092.476.318.3173.476.6907.476 1.12 0 .448-.158.8213-.476 1.12-.298.2987-.662.448-1.092.448zm13.365 12.124l1.204-2.408c.466.28 1.026.5227 1.68.728.672.1867 1.409.28 2.212.28 1.269 0 2.184-.1867 2.744-.56.56-.392.84-.924.84-1.596 0-.3547-.084-.8027-.252-1.344-.168-.56-.514-1.3067-1.036-2.24-.523-.9333-1.307-2.1373-2.352-3.612l2.324-1.54c1.437 2.016 2.482 3.7893 3.136 5.32.672 1.512 1.008 2.7533 1.008 3.724 0 .8213-.206 1.5867-.616 2.296-.411.7093-1.083 1.2787-2.016 1.708-.915.4293-2.128.644-3.64.644-.971 0-1.923-.1213-2.856-.364-.934-.2427-1.727-.588-2.38-1.036zm21.391 1.372c-1.587 0-2.8-.168-3.64-.504-.821-.3547-1.4-.8867-1.736-1.596-.317-.728-.495-1.6613-.532-2.8l-.56-15.372h2.772l.588 14.196c.037.896.121 1.5867.252 2.072.149.4667.457.7933.924.98.467.168 1.204.252 2.212.252.467 0 .812.1307 1.036.392.224.2613.336.5693.336.924 0 .392-.159.7373-.476 1.036-.299.28-.691.42-1.176.42zm.295 0l.28-2.772c.486 0 .896-.112 1.232-.336.355-.224.691-.5973 1.008-1.12.336-.5227.719-1.2227 1.148-2.1.542-1.1573 1.092-2.044 1.652-2.66.56-.6347 1.12-1.064 1.68-1.288.56-.2427 1.12-.364 1.68-.364.915 0 1.736.2893 2.464.868.747.5787 1.335 1.316 1.764 2.212.448.8773.672 1.7733.672 2.688 0 1.0827-.205 1.9787-.616 2.688-.392.6907-.914 1.204-1.568 1.54-.653.336-1.344.504-2.072.504-.597 0-1.325-.0933-2.184-.28-.858-.2053-1.866-.672-3.024-1.4-.597.784-1.213 1.288-1.848 1.512-.634.2053-1.39.308-2.268.308zm5.544-4.368c-.056.112-.102.2147-.14.308.747.4293 1.419.728 2.016.896.616.168 1.139.252 1.568.252.728 0 1.251-.1493 1.568-.448.318-.3173.476-.7373.476-1.26 0-.4853-.121-.98-.364-1.484-.224-.504-.532-.924-.924-1.26-.373-.336-.774-.504-1.204-.504-.541 0-1.026.252-1.456.756-.429.504-.942 1.4187-1.54 2.744z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M252.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM267.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM295.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M240.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M227.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M219.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M227.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C234.123 6.03271 231.082 4.7 227.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-ar/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-ar/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..079fd572c7
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-ar/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="296dp" android:height="38dp" android:viewportWidth="296" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M5.88538 30.14c-.504 0-1.01734-.0467-1.54-.14-.504-.0747-.85867-.1307-1.064-.168l.364-2.744c1.568.2053 3.03333.2053 4.396 0 1.38133-.224 2.51062-.784 3.38802-1.68-.728-1.176-1.81069-2.604-3.24802-4.284-1.43734-1.68-3.15467-3.4253-5.152-5.236l1.792-1.904c2.14666 2.0347 3.84533 3.7707 5.096 5.208 1.25062 1.4373 2.23062 2.6693 2.94002 3.696.2613-.8213.4013-1.764.42-2.828l-.392-10.192h2.8l.56 14.196c.0373.896.1306 1.5867.28 2.072.1493.4667.4573.7933.924.98.4666.168 1.1946.252 2.184.252.4666 0 .812.1307 1.036.392.224.2613.336.5693.336.924 0 .392-.1494.7373-.448 1.036-.2987.28-.7.42-1.204.42-1.3627 0-2.4454-.1213-3.248-.364-.8027-.2613-1.4-.6533-1.792-1.176-.3734-.5413-.616-1.232-.728-2.072-.6347 1.064-1.4 1.8573-2.296 2.38-.8774.504-1.80135.84-2.77202 1.008-.952.1493-1.82934.224-2.632.224zm13.76932 0l.28-2.772c.8587 0 1.54-.0653 2.044-.196.504-.1493.896-.42 1.176-.812.2987-.4107.5413-.9987.728-1.764.2053-.7653.42-1.7827.644-3.052l2.632.476c-.112.4853-.2333 1.0453-.364 1.68-.112.6347-.168 1.1853-.168 1.652 0 .4107.0653.7653.196 1.064.1493.2987.504.532 1.064.7.56.168 1.4933.252 2.8.252.4853 0 .8307.1307 1.036.392.2053.2613.308.5693.308.924 0 .392-.1493.7373-.448 1.036-.2987.28-.6907.42-1.176.42-1.6613 0-2.8747-.1587-3.64-.476-.7467-.3173-1.2507-.8213-1.512-1.512-.616.84-1.372 1.3813-2.268 1.624-.896.2427-2.0067.364-3.332.364zm7.924-11.368c-.4293 0-.8027-.1493-1.12-.448-.2987-.3173-.448-.6813-.448-1.092 0-.4107.1493-.7747.448-1.092.3173-.3173.6907-.476 1.12-.476.4107 0 .7653.1587 1.064.476.3173.3173.476.6813.476 1.092 0 .4107-.1587.7747-.476 1.092-.2987.2987-.6533.448-1.064.448zm-4.144 0c-.4293 0-.7933-.1493-1.092-.448-.2987-.3173-.448-.6813-.448-1.092 0-.4293.1493-.7933.448-1.092.2987-.3173.6627-.476 1.092-.476.4107 0 .7653.1587 1.064.476.3173.2987.476.6627.476 1.092 0 .4107-.1587.7747-.476 1.092-.2987.2987-.6533.448-1.064.448zm7.2661 11.368l.28-2.772c1.3067 0 2.2307-.14 2.772-.42.5413-.28.812-.9147.812-1.904 0-.4853-.0747-1.064-.224-1.736-.1493-.672-.3453-1.372-.588-2.1-.224-.7467-.4667-1.4747-.728-2.184l2.744-.896c.2427.616.4667 1.316.672 2.1.224.784.4107 1.5773.56 2.38.1493.784.224 1.4933.224 2.128 0 1.3813-.2613 2.464-.784 3.248-.504.784-1.2413 1.344-2.212 1.68-.9707.3173-2.1467.476-3.528.476zm3.136 5.572c-.4293 0-.8027-.1493-1.12-.448-.2987-.2987-.448-.6627-.448-1.092 0-.4107.1493-.7747.448-1.092.3173-.3173.6907-.476 1.12-.476.4107 0 .7653.1587 1.064.476.3173.3173.476.6813.476 1.092 0 .4293-.1587.7933-.476 1.092-.2987.2987-.6533.448-1.064.448zm7.8604-24.26c-.728 0-1.2133-.2427-1.456-.728-.2426-.4853-.364-1.01733-.364-1.596 0-.20533.0094-.42.028-.644.0374-.24267.084-.51333.14-.812l1.484-.392c-.112.63467-.168 1.16667-.168 1.596 0 .63467.2147.952.644.952.2614 0 .476-.14.644-.42.168-.28.2707-.84.308-1.68v-.84l1.4-.504v1.708c0 .24267.0467.45733.14.644.0934.168.2987.252.616.252.3174 0 .5227-.09333.616-.28.112-.18667.168-.42933.168-.728 0-.31733-.0373-.63467-.112-.952-.0746-.336-.1773-.66267-.308-.98l1.344-.392c.1867.37333.336.784.448 1.232.1307.448.196.85867.196 1.232 0 .616-.1773 1.176-.532 1.68-.336.4853-.8773.728-1.624.728-.5786 0-1.0546-.168-1.428-.504-.168.4293-.448.7747-.84 1.036-.3733.2613-.8213.392-1.344.392zm-2.2427 25.044l-1.008-2.52c2.5013-.8587 4.284-1.9227 5.348-3.192 1.0826-1.2693 1.624-2.5853 1.624-3.948 0-.8773-.196-1.7827-.588-2.716-.392-.9333-.8307-1.8387-1.316-2.716l2.52-1.26c.5226.9707.952 1.9227 1.288 2.856.3546.9333.6253 1.68.812 2.24.2613.84.6066 1.4093 1.036 1.708.4293.28 1.0546.42 1.876.42.4853 0 .8306.1307 1.036.392.224.2613.336.5693.336.924 0 .392-.1587.7373-.476 1.036-.2987.28-.6907.42-1.176.42-.728 0-1.344-.112-1.848-.336-.4854-.224-.8774-.5227-1.176-.896-.2054 1.008-.6067 1.9227-1.204 2.744-.5787.84-1.2694 1.5773-2.072 2.212-.8027.6533-1.6427 1.1947-2.52 1.624-.8587.448-1.6894.784-2.492 1.008zm11.615-6.356l.28-2.772c1.0827 0 1.9227-.0093 2.52-.028.5974-.0187 1.036-.0373 1.316-.056s.4854-.0373.616-.056c-.28-.1867-.6253-.4667-1.036-.84-.4106-.392-.7746-.896-1.092-1.512-.2986-.616-.448-1.344-.448-2.184 0-1.064.2614-2.0067.784-2.828.5227-.8213 1.2414-1.4653 2.156-1.932.9147-.4667 1.9507-.7 3.108-.7.4667 0 .952.0373 1.456.112s.9894.1867 1.456.336l-.532 2.632c-.784-.2053-1.5493-.308-2.296-.308-.9893 0-1.792.2613-2.408.784-.616.504-.924 1.1853-.924 2.044 0 .56.1307 1.0547.392 1.484.28.4293.6254.8027 1.036 1.12.4294.2987.868.532 1.316.7.448.1493.84.224 1.176.224.392-.112.7374-.2147 1.036-.308.2987-.0933.6534-.224 1.064-.392.4107-.168.9894-.4107 1.736-.728l.924 2.52c-1.344.5787-2.6973 1.0733-4.06 1.484-1.344.392-2.7906.6907-4.34.896-1.5493.2053-3.2946.308-5.236.308zm33.593.448c-3.528 0-6.132-.476-7.812-1.428-1.68-.9707-2.52-2.4453-2.52-4.424 0-.7467.084-1.5307.252-2.352.1867-.8213.3827-1.5773.588-2.268l2.492.588c-.112.4667-.2333 1.008-.364 1.624-.1307.5973-.196 1.1293-.196 1.596 0 .896.2427 1.6333.728 2.212.504.5787 1.3533 1.008 2.548 1.288 1.2133.2613 2.884.392 5.012.392 4.144 0 7.1773-.2333 9.1-.7 1.9413-.4667 2.912-1.2973 2.912-2.492 0-.6907-.1307-1.5027-.392-2.436-.2427-.952-.56-1.9413-.952-2.968l2.604-.84c.3547.9147.6813 1.9227.98 3.024.3173 1.0827.4765 2.0627.4765 2.94 0 1.12-.2525 2.0813-.7565 2.884-.504.784-1.344 1.428-2.52 1.932-1.1573.4853-2.7347.84-4.732 1.064-1.9973.2427-4.48.364-7.448.364zm2.548 5.684c-.4293 0-.8027-.1493-1.12-.448-.2987-.2987-.448-.6627-.448-1.092 0-.4107.1493-.7747.448-1.092.3173-.3173.6907-.476 1.12-.476.4107 0 .7653.1587 1.064.476.3173.3173.476.6813.476 1.092 0 .4293-.1587.7933-.476 1.092-.2987.2987-.6533.448-1.064.448zm22.9785-6.132c-1.586 0-2.8-.168-3.64-.504-.821-.3547-1.4-.8867-1.736-1.596-.317-.728-.494-1.6613-.532-2.8l-.56-15.372h2.772l.588 14.196c.038.896.122 1.5867.252 2.072.15.4667.458.7933.924.98.467.168 1.204.252 2.212.252.467 0 .812.1307 1.036.392.224.2613.336.5693.336.924 0 .392-.158.7373-.476 1.036-.298.28-.69.42-1.176.42zm.295 0l.28-2.772c.598 0 1.083-.0467 1.456-.14.392-.0933.71-.308.952-.644.262-.3547.495-.9053.7-1.652.224-.7653.476-1.8013.756-3.108l2.548.616c-.093.4667-.214 1.0173-.364 1.652-.13.6347-.196 1.2133-.196 1.736 0 .4667.168.84.504 1.12.355.28.999.42 1.932.42.523 0 .962-.0467 1.316-.14.355-.0933.654-.3173.896-.672.243-.3733.458-.9427.644-1.708.187-.784.383-1.8573.588-3.22l2.604.448c-.074.3547-.149.7747-.224 1.26-.074.4853-.14.9613-.196 1.428-.056.4667-.084.8493-.084 1.148 0 .2613.056.504.168.728.131.224.374.4013.728.532.374.1307.924.196 1.652.196.915 0 1.578-.1867 1.988-.56.411-.392.616-.98.616-1.764 0-.6533-.018-1.3627-.056-2.128-.037-.784-.13-1.764-.28-2.94l2.492-.168c.112 1.5307.243 2.7907.392 3.78.168.9893.383 1.764.644 2.324.28.5413.654.924 1.12 1.148.486.2053 1.12.308 1.904.308.486 0 .831.1307 1.036.392.224.2613.336.5693.336.924 0 .392-.149.7373-.448 1.036-.298.28-.7.42-1.204.42-1.026 0-1.922-.2147-2.688-.644-.765-.448-1.334-1.092-1.708-1.932-.392 1.0267-.97 1.7173-1.736 2.072-.765.336-1.652.504-2.66.504-.952 0-1.736-.14-2.352-.42-.616-.28-1.054-.728-1.316-1.344-.466.7467-1.036 1.232-1.708 1.456-.672.2053-1.596.308-2.772.308-.429 0-.868-.0467-1.316-.14-.448-.0933-.868-.2707-1.26-.532-.392-.28-.709-.6907-.952-1.232-.522.8213-1.176 1.344-1.96 1.568-.765.224-1.689.336-2.772.336zm25.511 0l.28-2.772c.859 0 1.54-.0653 2.044-.196.504-.1493.896-.42 1.176-.812.299-.4107.542-.9987.728-1.764.206-.7653.42-1.7827.644-3.052l2.632.476c-.112.4853-.233 1.0453-.364 1.68-.112.6347-.168 1.1853-.168 1.652 0 .4107.066.7653.196 1.064.15.2987.504.532 1.064.7.56.168 1.494.252 2.8.252.486 0 .831.1307 1.036.392.206.2613.308.5693.308.924 0 .392-.149.7373-.448 1.036-.298.28-.69.42-1.176.42-1.661 0-2.874-.1587-3.64-.476-.746-.3173-1.25-.8213-1.512-1.512-.616.84-1.372 1.3813-2.268 1.624-.896.2427-2.006.364-3.332.364zm7.924-11.368c-.429 0-.802-.1493-1.12-.448-.298-.3173-.448-.6813-.448-1.092 0-.4107.15-.7747.448-1.092.318-.3173.691-.476 1.12-.476.411 0 .766.1587 1.064.476.318.3173.476.6813.476 1.092 0 .4107-.158.7747-.476 1.092-.298.2987-.653.448-1.064.448zm-4.144 0c-.429 0-.793-.1493-1.092-.448-.298-.3173-.448-.6813-.448-1.092 0-.4293.15-.7933.448-1.092.299-.3173.663-.476 1.092-.476.411 0 .766.1587 1.064.476.318.2987.476.6627.476 1.092 0 .4107-.158.7747-.476 1.092-.298.2987-.653.448-1.064.448zm7.266 11.368l.252-2.772c1.96 0 3.855-.2613 5.684-.784 1.83-.5413 3.491-1.3253 4.984-2.352-.746-.5973-1.652-1.0733-2.716-1.428-1.045-.3733-2.193-.56-3.444-.56-.858 0-1.745.1027-2.66.308l-.476-2.632c.523-.1493 1.046-.2613 1.568-.336.523-.0747 1.027-.112 1.512-.112 1.232 0 2.324.1773 3.276.532.952.336 1.811.728 2.576 1.176.766.4293 1.494.8213 2.184 1.176.691.336 1.391.504 2.1.504h.728l.252 2.52c-.97.0187-1.857.196-2.66.532-.784.3173-1.577.7093-2.38 1.176-.784.4667-1.67.9333-2.66 1.4-.97.4667-2.109.8587-3.416 1.176-1.306.3173-2.874.476-4.704.476zm4.732-13.496c-.448 0-.83-.1493-1.148-.448-.298-.2987-.448-.672-.448-1.12 0-.4293.15-.8027.448-1.12.318-.3173.7-.476 1.148-.476.43 0 .794.1587 1.092.476.318.3173.476.6907.476 1.12 0 .448-.158.8213-.476 1.12-.298.2987-.662.448-1.092.448zm13.365 12.124l1.204-2.408c.466.28 1.026.5227 1.68.728.672.1867 1.409.28 2.212.28 1.269 0 2.184-.1867 2.744-.56.56-.392.84-.924.84-1.596 0-.3547-.084-.8027-.252-1.344-.168-.56-.514-1.3067-1.036-2.24-.523-.9333-1.307-2.1373-2.352-3.612l2.324-1.54c1.437 2.016 2.482 3.7893 3.136 5.32.672 1.512 1.008 2.7533 1.008 3.724 0 .8213-.206 1.5867-.616 2.296-.411.7093-1.083 1.2787-2.016 1.708-.915.4293-2.128.644-3.64.644-.971 0-1.923-.1213-2.856-.364-.934-.2427-1.727-.588-2.38-1.036zm21.391 1.372c-1.587 0-2.8-.168-3.64-.504-.821-.3547-1.4-.8867-1.736-1.596-.317-.728-.495-1.6613-.532-2.8l-.56-15.372h2.772l.588 14.196c.037.896.121 1.5867.252 2.072.149.4667.457.7933.924.98.467.168 1.204.252 2.212.252.467 0 .812.1307 1.036.392.224.2613.336.5693.336.924 0 .392-.159.7373-.476 1.036-.299.28-.691.42-1.176.42zm.295 0l.28-2.772c.486 0 .896-.112 1.232-.336.355-.224.691-.5973 1.008-1.12.336-.5227.719-1.2227 1.148-2.1.542-1.1573 1.092-2.044 1.652-2.66.56-.6347 1.12-1.064 1.68-1.288.56-.2427 1.12-.364 1.68-.364.915 0 1.736.2893 2.464.868.747.5787 1.335 1.316 1.764 2.212.448.8773.672 1.7733.672 2.688 0 1.0827-.205 1.9787-.616 2.688-.392.6907-.914 1.204-1.568 1.54-.653.336-1.344.504-2.072.504-.597 0-1.325-.0933-2.184-.28-.858-.2053-1.866-.672-3.024-1.4-.597.784-1.213 1.288-1.848 1.512-.634.2053-1.39.308-2.268.308zm5.544-4.368c-.056.112-.102.2147-.14.308.747.4293 1.419.728 2.016.896.616.168 1.139.252 1.568.252.728 0 1.251-.1493 1.568-.448.318-.3173.476-.7373.476-1.26 0-.4853-.121-.98-.364-1.484-.224-.504-.532-.924-.924-1.26-.373-.336-.774-.504-1.204-.504-.541 0-1.026.252-1.456.756-.429.504-.942 1.4187-1.54 2.744z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M252.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM267.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM295.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M240.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M227.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M219.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M227.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-bg-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-bg-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..5934236f22
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-bg-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="296dp" android:height="38dp" android:viewportWidth="296" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M1.65865 34.256v-7.168h1.764c.42933-.7093.77467-1.624 1.036-2.744.28-1.1387.476-2.3893.588-3.752.13067-1.3627.196-2.7347.196-4.116V9.952H18.0947v17.136h2.352v7.168h-2.996V30H4.65465v4.256h-2.996zm5.124-7.168h8.23205V12.864H8.23865v4.06c0 2.0347-.13067 3.9107-.392 5.628-.24267 1.7173-.59733 3.1733-1.064 4.368v.168zm21.21995 3.36c-1.0267 0-1.9413-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm10.5451 8.064V15.72h2.828v1.932h.168c.3734-.616.952-1.1667 1.736-1.652.8027-.4853 1.7547-.728 2.856-.728 1.3067 0 2.4734.3267 3.5.98 1.0267.6533 1.8387 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.5973 1.1387-1.4093 2.0347-2.436 2.688-1.0266.6347-2.1933.952-3.5.952-1.1013 0-2.0533-.2333-2.856-.7-.784-.4853-1.3626-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.7467 0 1.4467-.196 2.1-.588.6534-.392 1.1854-.9427 1.596-1.652.4107-.728.616-1.5867.616-2.576 0-.9893-.2053-1.8387-.616-2.548-.4106-.728-.9426-1.288-1.596-1.68-.6533-.392-1.3533-.588-2.1-.588-.7466 0-1.4466.196-2.1.588-.6533.392-1.1853.952-1.596 1.68-.4106.7093-.616 1.5587-.616 2.548 0 .9893.2054 1.848.616 2.576.4107.7093.9427 1.26 1.596 1.652.6534.392 1.3534.588 2.1.588zM55.4369 30v-.168l3.808-4.956-.056-.168c-.896-.3547-1.624-.9053-2.184-1.652-.56-.7467-.84-1.6053-.84-2.576 0-.9147.224-1.7267.672-2.436.448-.7093 1.0546-1.2693 1.82-1.68.784-.4293 1.6613-.644 2.632-.644h6.132V30h-3.024v-4.844h-1.988L58.8249 30h-3.388zm6.076-7.252h2.884V18.24h-2.884c-.6534 0-1.2134.2147-1.68.644-.448.4293-.672.9613-.672 1.596 0 .6533.224 1.1947.672 1.624.4666.4293 1.0266.644 1.68.644zM71.2624 30V15.72h7.084c.84 0 1.5867.168 2.24.504.672.3173 1.1947.756 1.568 1.316.392.56.588 1.1853.588 1.876 0 .7467-.168 1.3907-.504 1.932-.3173.5413-.7373.9427-1.26 1.204v.168c.7094.28 1.2694.7 1.68 1.26.4294.56.644 1.204.644 1.932 0 .84-.224 1.568-.672 2.184-.4293.616-.9893 1.092-1.68 1.428-.6906.3173-1.428.476-2.212.476h-7.476zm3.024-11.816v3.36h3.696c.504 0 .924-.1587 1.26-.476.336-.3173.504-.7187.504-1.204 0-.504-.168-.9053-.504-1.204-.336-.3173-.756-.476-1.26-.476h-3.696zm0 9.296h4.144c.5414 0 .9894-.168 1.344-.504.3734-.3547.56-.8027.56-1.344 0-.5227-.1866-.9613-.56-1.316-.3546-.3547-.8026-.532-1.344-.532h-4.144v3.696zm16.6037 2.968c-1.0267 0-1.9413-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM101.995 30V15.72h3.024v5.74h6.776v-5.74h3.024V30h-3.024v-5.908h-6.776V30h-3.024zm23.039.448c-1.4 0-2.651-.3267-3.752-.98s-1.969-1.5493-2.604-2.688c-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.725.3173 3.752.952 1.045.6347 1.839 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.859.7093 1.829 1.064 2.912 1.064.971 0 1.773-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zM149.955 30v-5.152c-.392.28-.887.504-1.484.672-.598.1493-1.251.224-1.96.224-1.643 0-2.959-.476-3.948-1.428-.971-.952-1.456-2.24-1.456-3.864V15.72h3.024v4.424c0 .896.252 1.6053.756 2.128.522.504 1.25.756 2.184.756.578 0 1.12-.084 1.624-.252.522-.1867.942-.4293 1.26-.728V15.72h2.996V30h-2.996zm6.833 6.048V15.72h2.828v1.932h.168c.374-.616.952-1.1667 1.736-1.652.803-.4853 1.755-.728 2.856-.728 1.307 0 2.474.3267 3.5.98 1.027.6533 1.839 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.597 1.1387-1.409 2.0347-2.436 2.688-1.026.6347-2.193.952-3.5.952-1.101 0-2.053-.2333-2.856-.7-.784-.4853-1.362-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.747 0 1.447-.196 2.1-.588.654-.392 1.186-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.41-.728-.942-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.746 0-1.446.196-2.1.588-.653.392-1.185.952-1.596 1.68-.41.7093-.616 1.5587-.616 2.548 0 .9893.206 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.654.392 1.354.588 2.1.588zm16.857 2.772c-1.4 0-2.651-.3267-3.752-.98s-1.969-1.5493-2.604-2.688c-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.725.3173 3.752.952 1.045.6347 1.839 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.859.7093 1.829 1.064 2.912 1.064.971 0 1.773-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zm14.57 12.6c-.784 0-1.568-.0933-2.352-.28-.784-.1867-1.521-.504-2.212-.952-.672-.4667-1.232-1.1107-1.68-1.932l2.408-1.4c.523.728 1.12 1.232 1.792 1.512.691.2613 1.372.392 2.044.392.971 0 1.708-.1867 2.212-.56.504-.3733.756-.8587.756-1.456 0-.5227-.233-.9427-.7-1.26-.448-.336-1.082-.504-1.904-.504h-2.324v-2.38h2.324c.71 0 1.251-.168 1.624-.504.392-.336.588-.7653.588-1.288 0-.616-.261-1.1013-.784-1.456-.522-.3733-1.185-.56-1.988-.56-.709 0-1.39.1493-2.044.448-.653.28-1.148.6627-1.484 1.148l-2.24-1.484c.654-.8213 1.475-1.4653 2.464-1.932 1.008-.4853 2.119-.728 3.332-.728 1.046 0 1.988.1773 2.828.532.859.3547 1.531.8493 2.016 1.484.504.616.756 1.3347.756 2.156 0 .7093-.177 1.344-.532 1.904-.354.5413-.821.952-1.4 1.232v.168c.728.2987 1.316.7467 1.764 1.344.448.5973.672 1.2787.672 2.044 0 .84-.242 1.5867-.728 2.24-.485.6347-1.176 1.1387-2.072 1.512-.896.3733-1.941.56-3.136.56z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M252.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM267.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM295.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M240.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M227.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M219.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M227.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C234.123 6.03271 231.082 4.7 227.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-bg/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-bg/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..c23c990df9
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-bg/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="296dp" android:height="38dp" android:viewportWidth="296" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M1.65865 34.256v-7.168h1.764c.42933-.7093.77467-1.624 1.036-2.744.28-1.1387.476-2.3893.588-3.752.13067-1.3627.196-2.7347.196-4.116V9.952H18.0947v17.136h2.352v7.168h-2.996V30H4.65465v4.256h-2.996zm5.124-7.168h8.23205V12.864H8.23865v4.06c0 2.0347-.13067 3.9107-.392 5.628-.24267 1.7173-.59733 3.1733-1.064 4.368v.168zm21.21995 3.36c-1.0267 0-1.9413-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm10.5451 8.064V15.72h2.828v1.932h.168c.3734-.616.952-1.1667 1.736-1.652.8027-.4853 1.7547-.728 2.856-.728 1.3067 0 2.4734.3267 3.5.98 1.0267.6533 1.8387 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.5973 1.1387-1.4093 2.0347-2.436 2.688-1.0266.6347-2.1933.952-3.5.952-1.1013 0-2.0533-.2333-2.856-.7-.784-.4853-1.3626-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.7467 0 1.4467-.196 2.1-.588.6534-.392 1.1854-.9427 1.596-1.652.4107-.728.616-1.5867.616-2.576 0-.9893-.2053-1.8387-.616-2.548-.4106-.728-.9426-1.288-1.596-1.68-.6533-.392-1.3533-.588-2.1-.588-.7466 0-1.4466.196-2.1.588-.6533.392-1.1853.952-1.596 1.68-.4106.7093-.616 1.5587-.616 2.548 0 .9893.2054 1.848.616 2.576.4107.7093.9427 1.26 1.596 1.652.6534.392 1.3534.588 2.1.588zM55.4369 30v-.168l3.808-4.956-.056-.168c-.896-.3547-1.624-.9053-2.184-1.652-.56-.7467-.84-1.6053-.84-2.576 0-.9147.224-1.7267.672-2.436.448-.7093 1.0546-1.2693 1.82-1.68.784-.4293 1.6613-.644 2.632-.644h6.132V30h-3.024v-4.844h-1.988L58.8249 30h-3.388zm6.076-7.252h2.884V18.24h-2.884c-.6534 0-1.2134.2147-1.68.644-.448.4293-.672.9613-.672 1.596 0 .6533.224 1.1947.672 1.624.4666.4293 1.0266.644 1.68.644zM71.2624 30V15.72h7.084c.84 0 1.5867.168 2.24.504.672.3173 1.1947.756 1.568 1.316.392.56.588 1.1853.588 1.876 0 .7467-.168 1.3907-.504 1.932-.3173.5413-.7373.9427-1.26 1.204v.168c.7094.28 1.2694.7 1.68 1.26.4294.56.644 1.204.644 1.932 0 .84-.224 1.568-.672 2.184-.4293.616-.9893 1.092-1.68 1.428-.6906.3173-1.428.476-2.212.476h-7.476zm3.024-11.816v3.36h3.696c.504 0 .924-.1587 1.26-.476.336-.3173.504-.7187.504-1.204 0-.504-.168-.9053-.504-1.204-.336-.3173-.756-.476-1.26-.476h-3.696zm0 9.296h4.144c.5414 0 .9894-.168 1.344-.504.3734-.3547.56-.8027.56-1.344 0-.5227-.1866-.9613-.56-1.316-.3546-.3547-.8026-.532-1.344-.532h-4.144v3.696zm16.6037 2.968c-1.0267 0-1.9413-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM101.995 30V15.72h3.024v5.74h6.776v-5.74h3.024V30h-3.024v-5.908h-6.776V30h-3.024zm23.039.448c-1.4 0-2.651-.3267-3.752-.98s-1.969-1.5493-2.604-2.688c-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.725.3173 3.752.952 1.045.6347 1.839 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.859.7093 1.829 1.064 2.912 1.064.971 0 1.773-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zM149.955 30v-5.152c-.392.28-.887.504-1.484.672-.598.1493-1.251.224-1.96.224-1.643 0-2.959-.476-3.948-1.428-.971-.952-1.456-2.24-1.456-3.864V15.72h3.024v4.424c0 .896.252 1.6053.756 2.128.522.504 1.25.756 2.184.756.578 0 1.12-.084 1.624-.252.522-.1867.942-.4293 1.26-.728V15.72h2.996V30h-2.996zm6.833 6.048V15.72h2.828v1.932h.168c.374-.616.952-1.1667 1.736-1.652.803-.4853 1.755-.728 2.856-.728 1.307 0 2.474.3267 3.5.98 1.027.6533 1.839 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.597 1.1387-1.409 2.0347-2.436 2.688-1.026.6347-2.193.952-3.5.952-1.101 0-2.053-.2333-2.856-.7-.784-.4853-1.362-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.747 0 1.447-.196 2.1-.588.654-.392 1.186-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.41-.728-.942-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.746 0-1.446.196-2.1.588-.653.392-1.185.952-1.596 1.68-.41.7093-.616 1.5587-.616 2.548 0 .9893.206 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.654.392 1.354.588 2.1.588zm16.857 2.772c-1.4 0-2.651-.3267-3.752-.98s-1.969-1.5493-2.604-2.688c-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.725.3173 3.752.952 1.045.6347 1.839 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.859.7093 1.829 1.064 2.912 1.064.971 0 1.773-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zm14.57 12.6c-.784 0-1.568-.0933-2.352-.28-.784-.1867-1.521-.504-2.212-.952-.672-.4667-1.232-1.1107-1.68-1.932l2.408-1.4c.523.728 1.12 1.232 1.792 1.512.691.2613 1.372.392 2.044.392.971 0 1.708-.1867 2.212-.56.504-.3733.756-.8587.756-1.456 0-.5227-.233-.9427-.7-1.26-.448-.336-1.082-.504-1.904-.504h-2.324v-2.38h2.324c.71 0 1.251-.168 1.624-.504.392-.336.588-.7653.588-1.288 0-.616-.261-1.1013-.784-1.456-.522-.3733-1.185-.56-1.988-.56-.709 0-1.39.1493-2.044.448-.653.28-1.148.6627-1.484 1.148l-2.24-1.484c.654-.8213 1.475-1.4653 2.464-1.932 1.008-.4853 2.119-.728 3.332-.728 1.046 0 1.988.1773 2.828.532.859.3547 1.531.8493 2.016 1.484.504.616.756 1.3347.756 2.156 0 .7093-.177 1.344-.532 1.904-.354.5413-.821.952-1.4 1.232v.168c.728.2987 1.316.7467 1.764 1.344.448.5973.672 1.2787.672 2.044 0 .84-.242 1.5867-.728 2.24-.485.6347-1.176 1.1387-2.072 1.512-.896.3733-1.941.56-3.136.56z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M252.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM267.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM295.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M240.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M227.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M219.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M227.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-ca-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-ca-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..1613d9062f
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-ca-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="228dp" android:height="38dp" android:viewportWidth="228" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M2.31643 30V9.952h6.412c2.10937 0 3.91997.4293 5.43197 1.288 1.5307.84 2.7067 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8213 1.4933-1.9973 2.6693-3.528 3.528-1.512.84-3.3226 1.26-5.43197 1.26h-6.412zm3.08-2.912h3.248c2.27737 0 4.04137-.6347 5.29197-1.904 1.2694-1.2693 1.904-3.0053 1.904-5.208s-.6346-3.9387-1.904-5.208c-1.2506-1.2693-3.0146-1.904-5.29197-1.904h-3.248v14.224zm23.17817 3.36c-1.4746 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6346-1.1387-.952-2.4267-.952-3.864 0-1.4187.3174-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4174-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9974 1.5867 2.632 2.744.6347 1.1387.952 2.4173.952 3.836 0 1.4373-.3173 2.7253-.952 3.864-.6346 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2134-.9427 1.624-1.652.4294-.728.644-1.596.644-2.604s-.2146-1.8667-.644-2.576c-.4106-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2226.924-1.652 1.652-.4106.7093-.616 1.568-.616 2.576s.2054 1.876.616 2.604c.4294.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM38.8343 30V15.72h2.856v1.96h.168c.4107-.6907 1.0173-1.26 1.82-1.708.8213-.4667 1.7173-.7 2.688-.7 1.7547 0 3.0707.5227 3.948 1.568.8773 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2893-1.9973-.868-2.52-.5787-.5413-1.3347-.812-2.268-.812-.728 0-1.3627.2053-1.904.616-.5413.392-.9707.9147-1.288 1.568-.2987.6533-.448 1.3533-.448 2.1V30h-3.024zm20.8855.448c-1.0267 0-1.9414-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6906.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6534.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0266-.504 2.1466-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3734.5787-.9334 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4746-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3546-.616.532-1.2787.532-1.988-.4294-.2427-.9334-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1094.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm21.8883 2.464c-1.0267 0-1.9413-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM93.2452 30V15.72h2.856v1.96h.168c.4107-.6907 1.008-1.26 1.792-1.708.784-.4667 1.652-.7 2.6038-.7 1.064 0 1.97.252 2.716.756.747.504 1.279 1.1387 1.596 1.904.467-.7467 1.102-1.372 1.904-1.876.803-.5227 1.783-.784 2.94-.784 1.68 0 2.931.5133 3.752 1.54.822 1.008 1.232 2.352 1.232 4.032V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.485-.5413-1.166-.812-2.044-.812-.69 0-1.297.196-1.82.588-.522.3733-.933.8867-1.232 1.54-.28.6533-.42 1.3813-.42 2.184V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.504-.5413-1.213-.812-2.1278-.812-.672 0-1.26.196-1.764.588-.504.392-.9053.9147-1.204 1.568-.28.6533-.42 1.3813-.42 2.184V30h-3.024zm32.8808.448c-1.101 0-2.053-.2333-2.856-.7-.784-.4853-1.363-1.036-1.736-1.652h-.168V30h-2.856V9.952h3.024v5.712l-.168 1.988h.168c.373-.616.952-1.1667 1.736-1.652.803-.4853 1.755-.728 2.856-.728 1.307 0 2.473.3267 3.5.98 1.027.6533 1.839 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.597 1.1387-1.409 2.0347-2.436 2.688-1.027.6347-2.193.952-3.5.952zm-.448-2.772c.747 0 1.447-.196 2.1-.588.653-.392 1.185-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.411-.728-.943-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.747 0-1.447.196-2.1.588-.653.392-1.185.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.653.392 1.353.588 2.1.588z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M184.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM199.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM227.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M172.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M159.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M151.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M159.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C166.123 6.03271 163.082 4.7 159.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-ca/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-ca/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..b2a8fd40d8
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-ca/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="228dp" android:height="38dp" android:viewportWidth="228" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M2.31643 30V9.952h6.412c2.10937 0 3.91997.4293 5.43197 1.288 1.5307.84 2.7067 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8213 1.4933-1.9973 2.6693-3.528 3.528-1.512.84-3.3226 1.26-5.43197 1.26h-6.412zm3.08-2.912h3.248c2.27737 0 4.04137-.6347 5.29197-1.904 1.2694-1.2693 1.904-3.0053 1.904-5.208s-.6346-3.9387-1.904-5.208c-1.2506-1.2693-3.0146-1.904-5.29197-1.904h-3.248v14.224zm23.17817 3.36c-1.4746 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6346-1.1387-.952-2.4267-.952-3.864 0-1.4187.3174-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4174-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9974 1.5867 2.632 2.744.6347 1.1387.952 2.4173.952 3.836 0 1.4373-.3173 2.7253-.952 3.864-.6346 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2134-.9427 1.624-1.652.4294-.728.644-1.596.644-2.604s-.2146-1.8667-.644-2.576c-.4106-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2226.924-1.652 1.652-.4106.7093-.616 1.568-.616 2.576s.2054 1.876.616 2.604c.4294.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM38.8343 30V15.72h2.856v1.96h.168c.4107-.6907 1.0173-1.26 1.82-1.708.8213-.4667 1.7173-.7 2.688-.7 1.7547 0 3.0707.5227 3.948 1.568.8773 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2893-1.9973-.868-2.52-.5787-.5413-1.3347-.812-2.268-.812-.728 0-1.3627.2053-1.904.616-.5413.392-.9707.9147-1.288 1.568-.2987.6533-.448 1.3533-.448 2.1V30h-3.024zm20.8855.448c-1.0267 0-1.9414-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6906.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6534.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0266-.504 2.1466-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3734.5787-.9334 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4746-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3546-.616.532-1.2787.532-1.988-.4294-.2427-.9334-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1094.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm21.8883 2.464c-1.0267 0-1.9413-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM93.2452 30V15.72h2.856v1.96h.168c.4107-.6907 1.008-1.26 1.792-1.708.784-.4667 1.652-.7 2.6038-.7 1.064 0 1.97.252 2.716.756.747.504 1.279 1.1387 1.596 1.904.467-.7467 1.102-1.372 1.904-1.876.803-.5227 1.783-.784 2.94-.784 1.68 0 2.931.5133 3.752 1.54.822 1.008 1.232 2.352 1.232 4.032V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.485-.5413-1.166-.812-2.044-.812-.69 0-1.297.196-1.82.588-.522.3733-.933.8867-1.232 1.54-.28.6533-.42 1.3813-.42 2.184V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.504-.5413-1.213-.812-2.1278-.812-.672 0-1.26.196-1.764.588-.504.392-.9053.9147-1.204 1.568-.28.6533-.42 1.3813-.42 2.184V30h-3.024zm32.8808.448c-1.101 0-2.053-.2333-2.856-.7-.784-.4853-1.363-1.036-1.736-1.652h-.168V30h-2.856V9.952h3.024v5.712l-.168 1.988h.168c.373-.616.952-1.1667 1.736-1.652.803-.4853 1.755-.728 2.856-.728 1.307 0 2.473.3267 3.5.98 1.027.6533 1.839 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.597 1.1387-1.409 2.0347-2.436 2.688-1.027.6347-2.193.952-3.5.952zm-.448-2.772c.747 0 1.447-.196 2.1-.588.653-.392 1.185-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.411-.728-.943-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.747 0-1.447.196-2.1.588-.653.392-1.185.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.653.392 1.353.588 2.1.588z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M184.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM199.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM227.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M172.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M159.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M151.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M159.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-cs-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-cs-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..11b599656f
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-cs-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="308dp" android:height="38dp" android:viewportWidth="308" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M4.06332 30V9.952h6.41198c2.1094 0 3.92.4293 5.432 1.288 1.5307.84 2.7067 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8213 1.4933-1.9973 2.6693-3.528 3.528-1.512.84-3.3226 1.26-5.432 1.26H4.06332zm3.08-2.912h3.24798c2.2774 0 4.0414-.6347 5.292-1.904 1.2694-1.2693 1.904-3.0053 1.904-5.208s-.6346-3.9387-1.904-5.208c-1.2506-1.2693-3.0146-1.904-5.292-1.904H7.14332v14.224zm21.34838 3.36c-1.0267 0-1.9414-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6906.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6534.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0266-.504 2.1466-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3734.5787-.9334 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4746-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3546-.616.532-1.2787.532-1.988-.4294-.2427-.9334-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1094.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM39.5968 30V15.72h2.856v2.1h.168c.3174-.728.8587-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7187.028.98.084.28.056.532.1213.756.196v3.136c-.3546-.1493-.7186-.2707-1.092-.364-.3546-.0933-.728-.14-1.12-.14-.7093 0-1.344.196-1.904.588-.5413.3733-.9706.8867-1.288 1.54-.3173.6347-.476 1.3347-.476 2.1V30h-3.024zm17.4106.448c-1.4746 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6346-1.1387-.952-2.4267-.952-3.864 0-1.4187.3174-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4174-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9974 1.5867 2.632 2.744.6347 1.1387.952 2.4173.952 3.836 0 1.4373-.3173 2.7253-.952 3.864-.6346 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2134-.9427 1.624-1.652.4294-.728.644-1.596.644-2.604s-.2146-1.8667-.644-2.576c-.4106-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2226.924-1.652 1.652-.4106.7093-.616 1.568-.616 2.576s.2054 1.876.616 2.604c.4294.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM71.4704 30l-5.908-14.28h3.36l4.004 10.388h.14l4.088-10.388h3.304L74.4944 30h-3.024zm15.4517.448c-1.0266 0-1.9413-.196-2.744-.588-.8026-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2614-1.8667.784-2.576.5414-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8854-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2134.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4186.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7466.448-1.6426.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5974-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5786-.168-1.1946-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5226.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm11.8118-2.128v-7.504h-2.492V15.72h2.492v-4.032h3.0241v4.032h3.5v2.632h-3.5v6.86c0 .7093.14 1.2507.42 1.624.299.3733.793.56 1.484.56.355 0 .653-.0467.896-.14.261-.0933.523-.224.784-.392v2.94c-.317.1307-.653.2333-1.008.308-.355.0747-.775.112-1.26.112-1.325 0-2.38-.3827-3.164-1.148-.7841-.784-1.1761-1.8573-1.1761-3.22zm16.5331 10.192V15.72h2.828v1.932h.168c.373-.616.952-1.1667 1.736-1.652.802-.4853 1.754-.728 2.856-.728 1.306 0 2.473.3267 3.5.98 1.026.6533 1.838 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.598 1.1387-1.41 2.0347-2.436 2.688-1.027.6347-2.194.952-3.5.952-1.102 0-2.054-.2333-2.856-.7-.784-.4853-1.363-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.746 0 1.446-.196 2.1-.588.653-.392 1.185-.9427 1.596-1.652.41-.728.616-1.5867.616-2.576 0-.9893-.206-1.8387-.616-2.548-.411-.728-.943-1.288-1.596-1.68-.654-.392-1.354-.588-2.1-.588-.747 0-1.447.196-2.1.588-.654.392-1.186.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.41.7093.942 1.26 1.596 1.652.653.392 1.353.588 2.1.588zm17.107 2.772c-1.475 0-2.772-.336-3.892-1.008-1.12-.672-1.998-1.5773-2.632-2.716-.635-1.1387-.952-2.4267-.952-3.864 0-1.4187.317-2.6973.952-3.836.634-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.417-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.997 1.5867 2.632 2.744.634 1.1387.952 2.4173.952 3.836 0 1.4373-.318 2.7253-.952 3.864-.635 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.213-.9427 1.624-1.652.429-.728.644-1.596.644-2.604s-.215-1.8667-.644-2.576c-.411-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.522.196-2.212.588-.672.3733-1.223.924-1.652 1.652-.411.7093-.616 1.568-.616 2.576s.205 1.876.616 2.604c.429.7093.98 1.26 1.652 1.652.69.3733 1.428.56 2.212.56zM150.305 30V15.72h2.856v1.96h.168c.411-.6907 1.008-1.26 1.792-1.708.784-.4667 1.652-.7 2.604-.7 1.064 0 1.97.252 2.716.756.747.504 1.279 1.1387 1.596 1.904.467-.7467 1.102-1.372 1.904-1.876.803-.5227 1.783-.784 2.94-.784 1.68 0 2.931.5133 3.752 1.54.822 1.008 1.232 2.352 1.232 4.032V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.485-.5413-1.166-.812-2.044-.812-.69 0-1.297.196-1.82.588-.522.3733-.933.8867-1.232 1.54-.28.6533-.42 1.3813-.42 2.184V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.504-.5413-1.213-.812-2.128-.812-.672 0-1.26.196-1.764.588-.504.392-.905.9147-1.204 1.568-.28.6533-.42 1.3813-.42 2.184V30h-3.024zm31.985.448c-1.474 0-2.772-.336-3.892-1.008-1.12-.672-1.997-1.5773-2.632-2.716-.634-1.1387-.952-2.4267-.952-3.864 0-1.4187.318-2.6973.952-3.836.635-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.418-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.998 1.5867 2.632 2.744.635 1.1387.952 2.4173.952 3.836 0 1.4373-.317 2.7253-.952 3.864-.634 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.214-.9427 1.624-1.652.43-.728.644-1.596.644-2.604s-.214-1.8667-.644-2.576c-.41-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.521.196-2.212.588-.672.3733-1.222.924-1.652 1.652-.41.7093-.616 1.568-.616 2.576s.206 1.876.616 2.604c.43.7093.98 1.26 1.652 1.652.691.3733 1.428.56 2.212.56zm17.141 2.772c-1.437 0-2.706-.3267-3.808-.98-1.101-.6533-1.969-1.5493-2.604-2.688-.634-1.1573-.952-2.464-.952-3.92s.318-2.7533.952-3.892c.635-1.1573 1.503-2.0627 2.604-2.716 1.102-.6533 2.371-.98 3.808-.98 1.587 0 2.922.3547 4.004 1.064 1.102.7093 1.886 1.6707 2.352 2.884l-2.744 1.12c-.653-1.5307-1.876-2.296-3.668-2.296-.784 0-1.502.2053-2.156.616-.653.392-1.176.952-1.568 1.68-.392.7093-.588 1.5493-.588 2.52 0 .9707.196 1.82.588 2.548.392.728.915 1.288 1.568 1.68.654.392 1.372.588 2.156.588.915 0 1.69-.2053 2.324-.616.635-.4293 1.13-1.008 1.484-1.736l2.688 1.176c-.504 1.1387-1.306 2.0813-2.408 2.828-1.101.7467-2.445 1.12-4.032 1.12zm9.557-.448V15.72h3.024V30h-3.024zm.28-17.024l1.316-3.584H214l-2.24 3.584h-2.492z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M264.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM279.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM307.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M252.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M239.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M231.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M239.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C246.123 6.03271 243.082 4.7 239.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-cs/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-cs/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..7c55839e8e
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-cs/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="308dp" android:height="38dp" android:viewportWidth="308" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M4.06332 30V9.952h6.41198c2.1094 0 3.92.4293 5.432 1.288 1.5307.84 2.7067 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8213 1.4933-1.9973 2.6693-3.528 3.528-1.512.84-3.3226 1.26-5.432 1.26H4.06332zm3.08-2.912h3.24798c2.2774 0 4.0414-.6347 5.292-1.904 1.2694-1.2693 1.904-3.0053 1.904-5.208s-.6346-3.9387-1.904-5.208c-1.2506-1.2693-3.0146-1.904-5.292-1.904H7.14332v14.224zm21.34838 3.36c-1.0267 0-1.9414-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6906.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6534.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0266-.504 2.1466-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3734.5787-.9334 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4746-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3546-.616.532-1.2787.532-1.988-.4294-.2427-.9334-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1094.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM39.5968 30V15.72h2.856v2.1h.168c.3174-.728.8587-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7187.028.98.084.28.056.532.1213.756.196v3.136c-.3546-.1493-.7186-.2707-1.092-.364-.3546-.0933-.728-.14-1.12-.14-.7093 0-1.344.196-1.904.588-.5413.3733-.9706.8867-1.288 1.54-.3173.6347-.476 1.3347-.476 2.1V30h-3.024zm17.4106.448c-1.4746 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6346-1.1387-.952-2.4267-.952-3.864 0-1.4187.3174-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4174-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9974 1.5867 2.632 2.744.6347 1.1387.952 2.4173.952 3.836 0 1.4373-.3173 2.7253-.952 3.864-.6346 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2134-.9427 1.624-1.652.4294-.728.644-1.596.644-2.604s-.2146-1.8667-.644-2.576c-.4106-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2226.924-1.652 1.652-.4106.7093-.616 1.568-.616 2.576s.2054 1.876.616 2.604c.4294.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM71.4704 30l-5.908-14.28h3.36l4.004 10.388h.14l4.088-10.388h3.304L74.4944 30h-3.024zm15.4517.448c-1.0266 0-1.9413-.196-2.744-.588-.8026-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2614-1.8667.784-2.576.5414-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8854-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2134.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4186.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7466.448-1.6426.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5974-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5786-.168-1.1946-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5226.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm11.8118-2.128v-7.504h-2.492V15.72h2.492v-4.032h3.0241v4.032h3.5v2.632h-3.5v6.86c0 .7093.14 1.2507.42 1.624.299.3733.793.56 1.484.56.355 0 .653-.0467.896-.14.261-.0933.523-.224.784-.392v2.94c-.317.1307-.653.2333-1.008.308-.355.0747-.775.112-1.26.112-1.325 0-2.38-.3827-3.164-1.148-.7841-.784-1.1761-1.8573-1.1761-3.22zm16.5331 10.192V15.72h2.828v1.932h.168c.373-.616.952-1.1667 1.736-1.652.802-.4853 1.754-.728 2.856-.728 1.306 0 2.473.3267 3.5.98 1.026.6533 1.838 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.598 1.1387-1.41 2.0347-2.436 2.688-1.027.6347-2.194.952-3.5.952-1.102 0-2.054-.2333-2.856-.7-.784-.4853-1.363-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.746 0 1.446-.196 2.1-.588.653-.392 1.185-.9427 1.596-1.652.41-.728.616-1.5867.616-2.576 0-.9893-.206-1.8387-.616-2.548-.411-.728-.943-1.288-1.596-1.68-.654-.392-1.354-.588-2.1-.588-.747 0-1.447.196-2.1.588-.654.392-1.186.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.41.7093.942 1.26 1.596 1.652.653.392 1.353.588 2.1.588zm17.107 2.772c-1.475 0-2.772-.336-3.892-1.008-1.12-.672-1.998-1.5773-2.632-2.716-.635-1.1387-.952-2.4267-.952-3.864 0-1.4187.317-2.6973.952-3.836.634-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.417-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.997 1.5867 2.632 2.744.634 1.1387.952 2.4173.952 3.836 0 1.4373-.318 2.7253-.952 3.864-.635 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.213-.9427 1.624-1.652.429-.728.644-1.596.644-2.604s-.215-1.8667-.644-2.576c-.411-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.522.196-2.212.588-.672.3733-1.223.924-1.652 1.652-.411.7093-.616 1.568-.616 2.576s.205 1.876.616 2.604c.429.7093.98 1.26 1.652 1.652.69.3733 1.428.56 2.212.56zM150.305 30V15.72h2.856v1.96h.168c.411-.6907 1.008-1.26 1.792-1.708.784-.4667 1.652-.7 2.604-.7 1.064 0 1.97.252 2.716.756.747.504 1.279 1.1387 1.596 1.904.467-.7467 1.102-1.372 1.904-1.876.803-.5227 1.783-.784 2.94-.784 1.68 0 2.931.5133 3.752 1.54.822 1.008 1.232 2.352 1.232 4.032V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.485-.5413-1.166-.812-2.044-.812-.69 0-1.297.196-1.82.588-.522.3733-.933.8867-1.232 1.54-.28.6533-.42 1.3813-.42 2.184V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.504-.5413-1.213-.812-2.128-.812-.672 0-1.26.196-1.764.588-.504.392-.905.9147-1.204 1.568-.28.6533-.42 1.3813-.42 2.184V30h-3.024zm31.985.448c-1.474 0-2.772-.336-3.892-1.008-1.12-.672-1.997-1.5773-2.632-2.716-.634-1.1387-.952-2.4267-.952-3.864 0-1.4187.318-2.6973.952-3.836.635-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.418-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.998 1.5867 2.632 2.744.635 1.1387.952 2.4173.952 3.836 0 1.4373-.317 2.7253-.952 3.864-.634 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.214-.9427 1.624-1.652.43-.728.644-1.596.644-2.604s-.214-1.8667-.644-2.576c-.41-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.521.196-2.212.588-.672.3733-1.222.924-1.652 1.652-.41.7093-.616 1.568-.616 2.576s.206 1.876.616 2.604c.43.7093.98 1.26 1.652 1.652.691.3733 1.428.56 2.212.56zm17.141 2.772c-1.437 0-2.706-.3267-3.808-.98-1.101-.6533-1.969-1.5493-2.604-2.688-.634-1.1573-.952-2.464-.952-3.92s.318-2.7533.952-3.892c.635-1.1573 1.503-2.0627 2.604-2.716 1.102-.6533 2.371-.98 3.808-.98 1.587 0 2.922.3547 4.004 1.064 1.102.7093 1.886 1.6707 2.352 2.884l-2.744 1.12c-.653-1.5307-1.876-2.296-3.668-2.296-.784 0-1.502.2053-2.156.616-.653.392-1.176.952-1.568 1.68-.392.7093-.588 1.5493-.588 2.52 0 .9707.196 1.82.588 2.548.392.728.915 1.288 1.568 1.68.654.392 1.372.588 2.156.588.915 0 1.69-.2053 2.324-.616.635-.4293 1.13-1.008 1.484-1.736l2.688 1.176c-.504 1.1387-1.306 2.0813-2.408 2.828-1.101.7467-2.445 1.12-4.032 1.12zm9.557-.448V15.72h3.024V30h-3.024zm.28-17.024l1.316-3.584H214l-2.24 3.584h-2.492z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M264.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM279.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM307.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M252.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M239.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M231.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M239.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-da-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-da-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..47c80caa8f
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-da-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="242dp" android:height="38dp" android:viewportWidth="242" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M2.8641 30V9.952h6.412c2.1093 0 3.92.4293 5.432 1.288 1.5307.84 2.7067 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8213 1.4933-1.9973 2.6693-3.528 3.528-1.512.84-3.3227 1.26-5.432 1.26h-6.412zm3.08-2.912h3.248c2.2773 0 4.0413-.6347 5.292-1.904 1.2693-1.2693 1.904-3.0053 1.904-5.208s-.6347-3.9387-1.904-5.208c-1.2507-1.2693-3.0147-1.904-5.292-1.904h-3.248v14.224zm23.1782 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6347 1.1387.952 2.4173.952 3.836 0 1.4373-.3173 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM39.382 30V15.72h2.856v1.96h.168c.4106-.6907 1.0173-1.26 1.82-1.708.8213-.4667 1.7173-.7 2.688-.7 1.7546 0 3.0706.5227 3.948 1.568.8773 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2894-1.9973-.868-2.52-.5787-.5413-1.3347-.812-2.268-.812-.728 0-1.3627.2053-1.904.616-.5414.392-.9707.9147-1.288 1.568-.2987.6533-.448 1.3533-.448 2.1V30h-3.024zm23.0662.448c-1.4 0-2.6507-.3267-3.752-.98-1.1014-.6533-1.9694-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2986-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0826-.7093 2.324-1.064 3.724-1.064 1.4746 0 2.7253.3173 3.752.952 1.0453.6347 1.8386 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0094.392-.028.56 0 .168-.0094.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8586.7093 1.8293 1.064 2.912 1.064.9706 0 1.7733-.2147 2.408-.644.6346-.448 1.1386-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3894 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7094.616-1.1854 1.4373-1.428 2.464h7.924c-.0374-.4853-.196-.9893-.476-1.512-.28-.5227-.7094-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zm-1.26-4.872l1.316-3.584h3.416l-2.24 3.584h-2.492zM72.3296 30V15.72h2.856v2.1h.168c.3174-.728.8587-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7187.028.98.084.28.056.532.1213.756.196v3.136c-.3546-.1493-.7186-.2707-1.092-.364-.3546-.0933-.728-.14-1.12-.14-.7093 0-1.344.196-1.904.588-.5413.3733-.9706.8867-1.288 1.54-.3173.6347-.476 1.3347-.476 2.1V30h-3.024zm18.3735 0V15.72h2.856v1.96h.168c.4106-.6907 1.008-1.26 1.792-1.708.784-.4667 1.652-.7 2.604-.7 1.064 0 1.9689.252 2.7159.756.747.504 1.279 1.1387 1.596 1.904.467-.7467 1.101-1.372 1.904-1.876.803-.5227 1.783-.784 2.94-.784 1.68 0 2.931.5133 3.752 1.54.821 1.008 1.232 2.352 1.232 4.032V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.485-.5413-1.167-.812-2.044-.812-.691 0-1.297.196-1.82.588-.523.3733-.933.8867-1.232 1.54-.28.6533-.42 1.3813-.42 2.184V30h-2.9959v-8.652c0-1.1387-.252-1.9693-.756-2.492-.504-.5413-1.2134-.812-2.128-.812-.672 0-1.26.196-1.764.588-.504.392-.9054.9147-1.204 1.568-.28.6533-.42 1.3813-.42 2.184V30h-3.024zm31.7889.448c-1.4 0-2.651-.3267-3.752-.98s-1.969-1.5493-2.604-2.688c-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.725.3173 3.752.952 1.045.6347 1.839 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392H118.18c.149 1.4187.644 2.4827 1.484 3.192.859.7093 1.829 1.064 2.912 1.064.971 0 1.773-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zm16.262 12.6c-1.288 0-2.455-.3173-3.5-.952-1.027-.6533-1.848-1.5493-2.464-2.688-.597-1.1573-.896-2.4733-.896-3.948s.299-2.7813.896-3.92c.616-1.1387 1.437-2.0347 2.464-2.688 1.045-.6533 2.212-.98 3.5-.98 1.101 0 2.044.2427 2.828.728.803.4853 1.391 1.036 1.764 1.652h.168l-.168-1.988V9.952h2.996V30h-2.828v-1.904h-.168c-.373.616-.961 1.1667-1.764 1.652-.784.4667-1.727.7-2.828.7zm.448-2.772c.747 0 1.447-.196 2.1-.588.672-.392 1.204-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.392-.728-.924-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.747 0-1.447.196-2.1.588-.653.392-1.185.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.653.392 1.353.588 2.1.588z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M198.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM213.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM241.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M186.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M173.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M165.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M173.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C180.123 6.03271 177.082 4.7 173.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-da/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-da/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..622d3198de
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-da/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="242dp" android:height="38dp" android:viewportWidth="242" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M2.8641 30V9.952h6.412c2.1093 0 3.92.4293 5.432 1.288 1.5307.84 2.7067 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8213 1.4933-1.9973 2.6693-3.528 3.528-1.512.84-3.3227 1.26-5.432 1.26h-6.412zm3.08-2.912h3.248c2.2773 0 4.0413-.6347 5.292-1.904 1.2693-1.2693 1.904-3.0053 1.904-5.208s-.6347-3.9387-1.904-5.208c-1.2507-1.2693-3.0147-1.904-5.292-1.904h-3.248v14.224zm23.1782 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6347 1.1387.952 2.4173.952 3.836 0 1.4373-.3173 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM39.382 30V15.72h2.856v1.96h.168c.4106-.6907 1.0173-1.26 1.82-1.708.8213-.4667 1.7173-.7 2.688-.7 1.7546 0 3.0706.5227 3.948 1.568.8773 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2894-1.9973-.868-2.52-.5787-.5413-1.3347-.812-2.268-.812-.728 0-1.3627.2053-1.904.616-.5414.392-.9707.9147-1.288 1.568-.2987.6533-.448 1.3533-.448 2.1V30h-3.024zm23.0662.448c-1.4 0-2.6507-.3267-3.752-.98-1.1014-.6533-1.9694-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2986-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0826-.7093 2.324-1.064 3.724-1.064 1.4746 0 2.7253.3173 3.752.952 1.0453.6347 1.8386 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0094.392-.028.56 0 .168-.0094.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8586.7093 1.8293 1.064 2.912 1.064.9706 0 1.7733-.2147 2.408-.644.6346-.448 1.1386-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3894 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7094.616-1.1854 1.4373-1.428 2.464h7.924c-.0374-.4853-.196-.9893-.476-1.512-.28-.5227-.7094-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zm-1.26-4.872l1.316-3.584h3.416l-2.24 3.584h-2.492zM72.3296 30V15.72h2.856v2.1h.168c.3174-.728.8587-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7187.028.98.084.28.056.532.1213.756.196v3.136c-.3546-.1493-.7186-.2707-1.092-.364-.3546-.0933-.728-.14-1.12-.14-.7093 0-1.344.196-1.904.588-.5413.3733-.9706.8867-1.288 1.54-.3173.6347-.476 1.3347-.476 2.1V30h-3.024zm18.3735 0V15.72h2.856v1.96h.168c.4106-.6907 1.008-1.26 1.792-1.708.784-.4667 1.652-.7 2.604-.7 1.064 0 1.9689.252 2.7159.756.747.504 1.279 1.1387 1.596 1.904.467-.7467 1.101-1.372 1.904-1.876.803-.5227 1.783-.784 2.94-.784 1.68 0 2.931.5133 3.752 1.54.821 1.008 1.232 2.352 1.232 4.032V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.485-.5413-1.167-.812-2.044-.812-.691 0-1.297.196-1.82.588-.523.3733-.933.8867-1.232 1.54-.28.6533-.42 1.3813-.42 2.184V30h-2.9959v-8.652c0-1.1387-.252-1.9693-.756-2.492-.504-.5413-1.2134-.812-2.128-.812-.672 0-1.26.196-1.764.588-.504.392-.9054.9147-1.204 1.568-.28.6533-.42 1.3813-.42 2.184V30h-3.024zm31.7889.448c-1.4 0-2.651-.3267-3.752-.98s-1.969-1.5493-2.604-2.688c-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.725.3173 3.752.952 1.045.6347 1.839 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392H118.18c.149 1.4187.644 2.4827 1.484 3.192.859.7093 1.829 1.064 2.912 1.064.971 0 1.773-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zm16.262 12.6c-1.288 0-2.455-.3173-3.5-.952-1.027-.6533-1.848-1.5493-2.464-2.688-.597-1.1573-.896-2.4733-.896-3.948s.299-2.7813.896-3.92c.616-1.1387 1.437-2.0347 2.464-2.688 1.045-.6533 2.212-.98 3.5-.98 1.101 0 2.044.2427 2.828.728.803.4853 1.391 1.036 1.764 1.652h.168l-.168-1.988V9.952h2.996V30h-2.828v-1.904h-.168c-.373.616-.961 1.1667-1.764 1.652-.784.4667-1.727.7-2.828.7zm.448-2.772c.747 0 1.447-.196 2.1-.588.672-.392 1.204-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.392-.728-.924-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.747 0-1.447.196-2.1.588-.653.392-1.185.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.653.392 1.353.588 2.1.588z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M198.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM213.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM241.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M186.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M173.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M165.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M173.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-de-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-de-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..b6e8d31ce6
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-de-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,15 @@
+<vector android:width="266dp" android:height="38dp" android:viewportWidth="266" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.14847 30V9.952h4.144l5.85203 15.26h.168l5.88-15.26h4.144V30h-3.024V18.66l.168-3.556h-.168L14.4605 30h-2.436L6.17247 15.104h-.168l.168 3.556V30h-3.024zM29.3992 13.62c-.56 0-1.0453-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.4107-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.4107.392.616.868.616 1.428 0 .56-.2053 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM27.8872 30V15.72h3.024V30h-3.024zm8.4513-4.144v-7.504h-2.492V15.72h2.492v-4.032h3.024v4.032h3.5v2.632h-3.5v6.86c0 .7093.14 1.2507.42 1.624.2987.3733.7933.56 1.484.56.3547 0 .6533-.0467.896-.14.2613-.0933.5227-.224.784-.392v2.94c-.3173.1307-.6533.2333-1.008.308-.3547.0747-.7747.112-1.26.112-1.3253 0-2.38-.3827-3.164-1.148-.784-.784-1.176-1.8573-1.176-3.22z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M94.5289 9.44664v8.16616h5.036c1.2001 0 2.1921-.4032 2.9761-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.9761-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.0084V6.57217h7.9788c2.0277 0 3.7487.67569 5.1667 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.1667 1.9916h-4.9704v.0018zM109.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM137.463 13.9543l-10.04 23.0611h-3.105l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M82.3729 18.4452c0-.9463-.0803-1.8591-.2317-2.7326H69.4536v5.1759h7.2669c-.3121 1.6872-1.2557 3.1227-2.687 4.084v3.3616h4.3369c2.5394-2.3406 4.0025-5.7993 4.0025-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M69.4536 31.5782c3.6307 0 6.6876-1.1909 8.9168-3.2441l-4.3369-3.3616c-1.2071.8119-2.7618 1.286-4.5799 1.286-3.5092 0-6.4877-2.363-7.5527-5.5473h-4.4678v3.4624c2.2143 4.3901 6.7642 7.4046 12.0205 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M61.9009 20.7111c-.2728-.8119-.4222-1.678-.4222-2.5721 0-.894.1494-1.7601.4222-2.572v-3.4625h-4.4677C56.5176 13.9188 56 15.9683 56 18.139c0 2.1708.5176 4.2205 1.4332 6.0346l4.4677-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M69.4536 10.0196c1.9826 0 3.7596.6813 5.161 2.0159v.0019l3.8399-3.83578C76.1226 6.03271 73.0824 4.7 69.4536 4.7c-5.2563 0-9.8062 3.01446-12.0205 7.4046l4.4678 3.4624c1.065-3.1843 4.0435-5.5474 7.5527-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+  <path android:pathData="M155.972 30.448c-1.717 0-3.089-.3733-4.116-1.12-1.027-.7653-1.736-1.6707-2.128-2.716l2.716-1.176c.336.7653.821 1.3533 1.456 1.764.635.392 1.353.588 2.156.588.747 0 1.391-.1307 1.932-.392.541-.28.812-.728.812-1.344 0-.5973-.271-1.036-.812-1.316s-1.213-.5227-2.016-.728l-1.708-.392c-.691-.168-1.335-.4293-1.932-.784s-1.083-.812-1.456-1.372c-.373-.5787-.56-1.2507-.56-2.016 0-.84.252-1.568.756-2.184.504-.6347 1.167-1.12 1.988-1.456.84-.3547 1.745-.532 2.716-.532 1.325 0 2.483.2613 3.472.784 1.008.504 1.745 1.2693 2.212 2.296l-2.604 1.176c-.336-.6347-.775-1.0733-1.316-1.316-.523-.2613-1.101-.392-1.736-.392-.709 0-1.307.1493-1.792.448-.467.2987-.7.672-.7 1.12 0 .4853.205.868.616 1.148.429.28.952.504 1.568.672l2.072.504c1.419.3547 2.483.896 3.192 1.624.709.7093 1.064 1.5773 1.064 2.604 0 .9147-.261 1.7173-.784 2.408-.523.672-1.232 1.1947-2.128 1.568-.877.3547-1.857.532-2.94.532zm8.627 5.6V15.72h2.828v1.932h.168c.373-.616.952-1.1667 1.736-1.652.802-.4853 1.754-.728 2.856-.728 1.306 0 2.473.3267 3.5.98 1.026.6533 1.838 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.598 1.1387-1.41 2.0347-2.436 2.688-1.027.6347-2.194.952-3.5.952-1.102 0-2.054-.2333-2.856-.7-.784-.4853-1.363-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.746 0 1.446-.196 2.1-.588.653-.392 1.185-.9427 1.596-1.652.41-.728.616-1.5867.616-2.576 0-.9893-.206-1.8387-.616-2.548-.411-.728-.943-1.288-1.596-1.68-.654-.392-1.354-.588-2.1-.588-.747 0-1.447.196-2.1.588-.654.392-1.186.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.41.7093.942 1.26 1.596 1.652.653.392 1.353.588 2.1.588zm16.911 2.772c-1.4 0-2.651-.3267-3.752-.98-1.102-.6533-1.97-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.298-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.082-.7093 2.324-1.064 3.724-1.064 1.474 0 2.725.3173 3.752.952 1.045.6347 1.838 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.01.392-.028.56 0 .168-.01.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.858.7093 1.829 1.064 2.912 1.064.97 0 1.773-.2147 2.408-.644.634-.448 1.138-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.39 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.71.616-1.186 1.4373-1.428 2.464h7.924c-.038-.4853-.196-.9893-.476-1.512-.28-.5227-.71-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zM198.531 30V15.72h2.856v1.96h.168c.411-.6907 1.018-1.26 1.82-1.708.822-.4667 1.718-.7 2.688-.7 1.755 0 3.071.5227 3.948 1.568.878 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.289-1.9973-.868-2.52-.578-.5413-1.334-.812-2.268-.812-.728 0-1.362.2053-1.904.616-.541.392-.97.9147-1.288 1.568-.298.6533-.448 1.3533-.448 2.1V30h-3.024zm22.646.448c-1.288 0-2.454-.3173-3.5-.952-1.026-.6533-1.848-1.5493-2.464-2.688-.597-1.1573-.896-2.4733-.896-3.948s.299-2.7813.896-3.92c.616-1.1387 1.438-2.0347 2.464-2.688 1.046-.6533 2.212-.98 3.5-.98 1.102 0 2.044.2427 2.828.728.803.4853 1.391 1.036 1.764 1.652h.168l-.168-1.988V9.952h2.996V30h-2.828v-1.904h-.168c-.373.616-.961 1.1667-1.764 1.652-.784.4667-1.726.7-2.828.7zm.448-2.772c.747 0 1.447-.196 2.1-.588.672-.392 1.204-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.392-.728-.924-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.746 0-1.446.196-2.1.588-.653.392-1.185.952-1.596 1.68-.41.7093-.616 1.5587-.616 2.548 0 .9893.206 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.654.392 1.354.588 2.1.588zm17.39 2.772c-1.4 0-2.651-.3267-3.752-.98-1.102-.6533-1.97-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.298-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.082-.7093 2.324-1.064 3.724-1.064 1.474 0 2.725.3173 3.752.952 1.045.6347 1.838 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.01.392-.028.56 0 .168-.01.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.858.7093 1.829 1.064 2.912 1.064.97 0 1.773-.2147 2.408-.644.634-.448 1.138-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.39 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.71.616-1.186 1.4373-1.428 2.464h7.924c-.038-.4853-.196-.9893-.476-1.512-.28-.5227-.71-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zM248.896 30V15.72h2.856v1.96h.168c.411-.6907 1.017-1.26 1.82-1.708.821-.4667 1.717-.7 2.688-.7 1.755 0 3.071.5227 3.948 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.289-1.9973-.868-2.52-.579-.5413-1.335-.812-2.268-.812-.728 0-1.363.2053-1.904.616-.541.392-.971.9147-1.288 1.568-.299.6533-.448 1.3533-.448 2.1V30h-3.024z" android:fillColor="#3c4043"/>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-de/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-de/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..c3d4c5347b
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-de/donate_with_googlepay_button_content.xml
@@ -0,0 +1,15 @@
+<vector android:width="266dp" android:height="38dp" android:viewportWidth="266" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.14847 30V9.952h4.144l5.85203 15.26h.168l5.88-15.26h4.144V30h-3.024V18.66l.168-3.556h-.168L14.4605 30h-2.436L6.17247 15.104h-.168l.168 3.556V30h-3.024zM29.3992 13.62c-.56 0-1.0453-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.4107-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.4107.392.616.868.616 1.428 0 .56-.2053 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM27.8872 30V15.72h3.024V30h-3.024zm8.4513-4.144v-7.504h-2.492V15.72h2.492v-4.032h3.024v4.032h3.5v2.632h-3.5v6.86c0 .7093.14 1.2507.42 1.624.2987.3733.7933.56 1.484.56.3547 0 .6533-.0467.896-.14.2613-.0933.5227-.224.784-.392v2.94c-.3173.1307-.6533.2333-1.008.308-.3547.0747-.7747.112-1.26.112-1.3253 0-2.38-.3827-3.164-1.148-.784-.784-1.176-1.8573-1.176-3.22z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M94.5289 9.34665v8.16615h5.036c1.2001 0 2.1921-.4032 2.9761-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.9761-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.0084V6.47218h7.9788c2.0277 0 3.7487.67569 5.1667 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.1667 1.9916h-4.9704v.0018zM109.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM137.463 13.8543l-10.04 23.0611h-3.105l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M82.3729 18.3452c0-.9463-.0803-1.8591-.2317-2.7326H69.4536v5.1759h7.2669c-.3121 1.6872-1.2557 3.1227-2.687 4.084v3.3616h4.3369c2.5394-2.3406 4.0025-5.7993 4.0025-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M69.4536 31.4782c3.6307 0 6.6876-1.1909 8.9168-3.2441l-4.3369-3.3616c-1.2071.8119-2.7618 1.286-4.5799 1.286-3.5092 0-6.4877-2.363-7.5527-5.5473h-4.4678v3.4624c2.2143 4.3901 6.7642 7.4046 12.0205 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M61.9009 20.6111c-.2728-.8119-.4222-1.678-.4222-2.572 0-.8941.1494-1.7602.4222-2.5721v-3.4625h-4.4677C56.5176 13.8188 56 15.8683 56 18.0391c0 2.1707.5176 4.2204 1.4332 6.0345l4.4677-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M69.4536 9.91964c1.9826 0 3.7596.68126 5.161 2.01586v.0019l3.8399-3.83577c-2.3319-2.16891-5.3721-3.50162-9.0009-3.50162-5.2563 0-9.8062 3.01446-12.0205 7.40459l4.4678 3.4624c1.065-3.1843 4.0435-5.54736 7.5527-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+  <path android:pathData="M155.972 30.448c-1.717 0-3.089-.3733-4.116-1.12-1.027-.7653-1.736-1.6707-2.128-2.716l2.716-1.176c.336.7653.821 1.3533 1.456 1.764.635.392 1.353.588 2.156.588.747 0 1.391-.1307 1.932-.392.541-.28.812-.728.812-1.344 0-.5973-.271-1.036-.812-1.316s-1.213-.5227-2.016-.728l-1.708-.392c-.691-.168-1.335-.4293-1.932-.784s-1.083-.812-1.456-1.372c-.373-.5787-.56-1.2507-.56-2.016 0-.84.252-1.568.756-2.184.504-.6347 1.167-1.12 1.988-1.456.84-.3547 1.745-.532 2.716-.532 1.325 0 2.483.2613 3.472.784 1.008.504 1.745 1.2693 2.212 2.296l-2.604 1.176c-.336-.6347-.775-1.0733-1.316-1.316-.523-.2613-1.101-.392-1.736-.392-.709 0-1.307.1493-1.792.448-.467.2987-.7.672-.7 1.12 0 .4853.205.868.616 1.148.429.28.952.504 1.568.672l2.072.504c1.419.3547 2.483.896 3.192 1.624.709.7093 1.064 1.5773 1.064 2.604 0 .9147-.261 1.7173-.784 2.408-.523.672-1.232 1.1947-2.128 1.568-.877.3547-1.857.532-2.94.532zm8.627 5.6V15.72h2.828v1.932h.168c.373-.616.952-1.1667 1.736-1.652.802-.4853 1.754-.728 2.856-.728 1.306 0 2.473.3267 3.5.98 1.026.6533 1.838 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.598 1.1387-1.41 2.0347-2.436 2.688-1.027.6347-2.194.952-3.5.952-1.102 0-2.054-.2333-2.856-.7-.784-.4853-1.363-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.746 0 1.446-.196 2.1-.588.653-.392 1.185-.9427 1.596-1.652.41-.728.616-1.5867.616-2.576 0-.9893-.206-1.8387-.616-2.548-.411-.728-.943-1.288-1.596-1.68-.654-.392-1.354-.588-2.1-.588-.747 0-1.447.196-2.1.588-.654.392-1.186.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.41.7093.942 1.26 1.596 1.652.653.392 1.353.588 2.1.588zm16.911 2.772c-1.4 0-2.651-.3267-3.752-.98-1.102-.6533-1.97-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.298-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.082-.7093 2.324-1.064 3.724-1.064 1.474 0 2.725.3173 3.752.952 1.045.6347 1.838 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.01.392-.028.56 0 .168-.01.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.858.7093 1.829 1.064 2.912 1.064.97 0 1.773-.2147 2.408-.644.634-.448 1.138-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.39 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.71.616-1.186 1.4373-1.428 2.464h7.924c-.038-.4853-.196-.9893-.476-1.512-.28-.5227-.71-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zM198.531 30V15.72h2.856v1.96h.168c.411-.6907 1.018-1.26 1.82-1.708.822-.4667 1.718-.7 2.688-.7 1.755 0 3.071.5227 3.948 1.568.878 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.289-1.9973-.868-2.52-.578-.5413-1.334-.812-2.268-.812-.728 0-1.362.2053-1.904.616-.541.392-.97.9147-1.288 1.568-.298.6533-.448 1.3533-.448 2.1V30h-3.024zm22.646.448c-1.288 0-2.454-.3173-3.5-.952-1.026-.6533-1.848-1.5493-2.464-2.688-.597-1.1573-.896-2.4733-.896-3.948s.299-2.7813.896-3.92c.616-1.1387 1.438-2.0347 2.464-2.688 1.046-.6533 2.212-.98 3.5-.98 1.102 0 2.044.2427 2.828.728.803.4853 1.391 1.036 1.764 1.652h.168l-.168-1.988V9.952h2.996V30h-2.828v-1.904h-.168c-.373.616-.961 1.1667-1.764 1.652-.784.4667-1.726.7-2.828.7zm.448-2.772c.747 0 1.447-.196 2.1-.588.672-.392 1.204-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.392-.728-.924-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.746 0-1.446.196-2.1.588-.653.392-1.185.952-1.596 1.68-.41.7093-.616 1.5587-.616 2.548 0 .9893.206 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.654.392 1.354.588 2.1.588zm17.39 2.772c-1.4 0-2.651-.3267-3.752-.98-1.102-.6533-1.97-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.298-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.082-.7093 2.324-1.064 3.724-1.064 1.474 0 2.725.3173 3.752.952 1.045.6347 1.838 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.01.392-.028.56 0 .168-.01.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.858.7093 1.829 1.064 2.912 1.064.97 0 1.773-.2147 2.408-.644.634-.448 1.138-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.39 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.71.616-1.186 1.4373-1.428 2.464h7.924c-.038-.4853-.196-.9893-.476-1.512-.28-.5227-.71-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zM248.896 30V15.72h2.856v1.96h.168c.411-.6907 1.017-1.26 1.82-1.708.821-.4667 1.717-.7 2.688-.7 1.755 0 3.071.5227 3.948 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.289-1.9973-.868-2.52-.579-.5413-1.335-.812-2.268-.812-.728 0-1.363.2053-1.904.616-.541.392-.971.9147-1.288 1.568-.299.6533-.448 1.3533-.448 2.1V30h-3.024z" android:fillColor="#ffffff"/>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-el-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-el-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..10ccfd96a0
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-el-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="230dp" android:height="38dp" android:viewportWidth="230" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M2.18078 30v-1.904l6.86-18.144h3.47202l6.888 18.172V30H2.18078zm3.696-2.856h9.82802l-4.844-13.58h-.168l-4.81602 13.58zm21.76392 3.304c-1.008 0-1.9413-.2333-2.8-.7-.8586-.4853-1.5586-1.2413-2.1-2.268-.5226-1.0267-.784-2.352-.784-3.976 0-.9893.1027-1.9693.308-2.94.224-.9893.5414-1.904.952-2.744.4107-.8587.8867-1.5587 1.428-2.1h3.192c-.896 1.0453-1.596 2.2493-2.1 3.612-.504 1.3627-.756 2.7533-.756 4.172 0 1.3813.252 2.436.756 3.164.5227.7093 1.2227 1.064 2.1 1.064.784 0 1.4654-.28 2.044-.84.5974-.56.896-1.4467.896-2.66V19.36h3.024v4.872c0 1.2133.2894 2.1.868 2.66.5974.56 1.288.84 2.072.84.8214 0 1.5027-.3547 2.044-1.064.56-.728.84-1.7827.84-3.164 0-1.4187-.2613-2.8093-.784-4.172-.504-1.3627-1.2133-2.5667-2.128-3.612h3.22c.5414.5413 1.0174 1.2413 1.428 2.1.4107.84.7187 1.7547.924 2.744.224.9707.336 1.9507.336 2.94 0 1.5307-.2706 2.8187-.812 3.864-.5226 1.0267-1.2226 1.8013-2.1 2.324-.8586.504-1.792.756-2.8.756-.9333 0-1.82-.2427-2.66-.728-.8213-.4853-1.4653-1.26-1.932-2.324-.448 1.064-1.1013 1.8387-1.96 2.324-.8586.4853-1.764.728-2.716.728zm18.2222 5.6V23.084c0-1.5867.308-2.9587.924-4.116.6347-1.176 1.4934-2.0813 2.576-2.716 1.1014-.6533 2.3427-.98 3.724-.98 1.568 0 2.884.3547 3.948 1.064 1.0827.6907 1.904 1.624 2.464 2.8.56 1.1573.84 2.408.84 3.752 0 1.4747-.308 2.7813-.924 3.92-.5973 1.1387-1.4093 2.0347-2.436 2.688-1.0266.6347-2.1653.952-3.416.952-1.12 0-2.0813-.2333-2.884-.7-.784-.4667-1.3813-1.0173-1.792-1.652h-.168l.168 1.96v5.992h-3.024zm7.14-8.372c.7654 0 1.4747-.196 2.128-.588.6534-.4107 1.1854-.9707 1.596-1.68.4107-.7093.616-1.54.616-2.492 0-1.0267-.2146-1.904-.644-2.632-.4106-.728-.9426-1.2787-1.596-1.652-.6533-.392-1.3533-.588-2.1-.588-.6906 0-1.3626.1867-2.016.56-.6533.3733-1.1946.924-1.624 1.652-.4293.728-.644 1.6333-.644 2.716 0 .896.196 1.708.588 2.436.392.7093.9147 1.2693 1.568 1.68.6534.392 1.3627.588 2.128.588zm16.1006 2.772c-2.016 0-3.5467-.392-4.592-1.176-1.0454-.784-1.568-1.7547-1.568-2.912 0-.952.252-1.7173.756-2.296.5226-.5973 1.2506-.98 2.184-1.148v-.112c-.9147-.224-1.596-.6347-2.044-1.232-.4294-.5973-.644-1.2693-.644-2.016 0-1.344.5413-2.3893 1.624-3.136 1.1013-.7653 2.6786-1.148 4.732-1.148 1.3626 0 2.5573.1773 3.584.532 1.0266.3547 1.848.9147 2.464 1.68l-1.848 1.932c-.448-.4667-1.0267-.84-1.736-1.12-.6907-.28-1.5587-.42-2.604-.42-1.2507 0-2.1187.196-2.604.588-.4667.392-.7.8493-.7 1.372 0 .5787.2613 1.008.784 1.288.5226.2613 1.2413.392 2.156.392h2.856v2.632h-3.024c-1.064 0-1.82.1587-2.268.476-.448.3173-.672.756-.672 1.316s.2613 1.008.784 1.344c.5413.336 1.344.504 2.408.504 1.064 0 2.016-.1773 2.856-.532.84-.3547 1.4933-.7933 1.96-1.316l1.764 1.82c-.4667.6533-1.2414 1.2693-2.324 1.848-1.0827.56-2.5107.84-4.284.84zm15.2369 0c-1.2134 0-2.3334-.3173-3.36-.952-1.0267-.6533-1.848-1.54-2.464-2.66-.616-1.1387-.924-2.4547-.924-3.948 0-1.512.308-2.8373.924-3.976.6346-1.1573 1.4653-2.0533 2.492-2.688 1.0453-.6347 2.184-.952 3.416-.952 1.0453 0 1.9693.2333 2.772.7.8213.448 1.4373 1.008 1.848 1.68h.168V15.72h2.828v9.52c0 .7093.1213 1.2507.364 1.624.2426.3547.6626.532 1.26.532.2426 0 .4666-.028.672-.084.2053-.0747.4106-.168.616-.28v2.94c-.56.168-1.148.252-1.764.252-1.064 0-1.8947-.2147-2.492-.644-.5974-.4293-1.008-1.064-1.232-1.904h-.168c-1.0827 1.848-2.7347 2.772-4.956 2.772zm.56-2.772c.7466 0 1.4466-.196 2.1-.588.672-.392 1.204-.9427 1.596-1.652.4106-.728.616-1.5867.616-2.576 0-.9893-.2054-1.8387-.616-2.548-.392-.728-.924-1.288-1.596-1.68-.6534-.392-1.3534-.588-2.1-.588-.7467 0-1.4467.196-2.1.588-.6534.392-1.1854.952-1.596 1.68-.4107.7093-.616 1.5587-.616 2.548 0 .9893.2053 1.848.616 2.576.4106.7093.9426 1.26 1.596 1.652.6533.392 1.3533.588 2.1.588zm-1.68-14.7l1.036-4.368h3.584l-2.072 4.368h-2.548zm21.3186 23.072V15.72h3.024v8.54c0 1.2133.271 2.0907.812 2.632.56.5227 1.232.784 2.016.784.803 0 1.494-.2147 2.072-.644.598-.4293 1.055-.98 1.372-1.652.336-.6907.504-1.4093.504-2.156V15.72h2.996v9.576c0 .7093.122 1.2413.364 1.596.262.336.682.504 1.26.504.243 0 .467-.028.672-.084.206-.0747.411-.168.616-.28v2.94c-.261.0747-.532.1307-.812.168-.261.056-.569.084-.924.084-1.138 0-1.997-.224-2.576-.672-.578-.4667-.98-1.092-1.204-1.876h-.168c-.392.7467-.924 1.4-1.596 1.96-.672.5413-1.53.812-2.576.812-.578 0-1.129-.1213-1.652-.364-.522-.2427-.914-.56-1.176-.952h-.168l.168 1.596v5.32h-3.024zm24.28-5.6c-2.016 0-3.547-.392-4.592-1.176-1.045-.784-1.568-1.7547-1.568-2.912 0-.952.252-1.7173.756-2.296.523-.5973 1.251-.98 2.184-1.148v-.112c-.915-.224-1.596-.6347-2.044-1.232-.429-.5973-.644-1.2693-.644-2.016 0-1.344.541-2.3893 1.624-3.136 1.101-.7653 2.679-1.148 4.732-1.148 1.363 0 2.557.1773 3.584.532 1.027.3547 1.848.9147 2.464 1.68l-1.848 1.932c-.448-.4667-1.027-.84-1.736-1.12-.691-.28-1.559-.42-2.604-.42-1.251 0-2.119.196-2.604.588-.467.392-.7.8493-.7 1.372 0 .5787.261 1.008.784 1.288.523.2613 1.241.392 2.156.392h2.856v2.632h-3.024c-1.064 0-1.82.1587-2.268.476-.448.3173-.672.756-.672 1.316s.261 1.008.784 1.344c.541.336 1.344.504 2.408.504 1.064 0 2.016-.1773 2.856-.532.84-.3547 1.493-.7933 1.96-1.316l1.764 1.82c-.467.6533-1.241 1.2693-2.324 1.848-1.083.56-2.511.84-4.284.84z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M186.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM201.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM229.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M174.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M161.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M153.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M161.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C168.123 6.03271 165.082 4.7 161.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-el/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-el/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..cd7adc3857
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-el/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="230dp" android:height="38dp" android:viewportWidth="230" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M2.18078 30v-1.904l6.86-18.144h3.47202l6.888 18.172V30H2.18078zm3.696-2.856h9.82802l-4.844-13.58h-.168l-4.81602 13.58zm21.76392 3.304c-1.008 0-1.9413-.2333-2.8-.7-.8586-.4853-1.5586-1.2413-2.1-2.268-.5226-1.0267-.784-2.352-.784-3.976 0-.9893.1027-1.9693.308-2.94.224-.9893.5414-1.904.952-2.744.4107-.8587.8867-1.5587 1.428-2.1h3.192c-.896 1.0453-1.596 2.2493-2.1 3.612-.504 1.3627-.756 2.7533-.756 4.172 0 1.3813.252 2.436.756 3.164.5227.7093 1.2227 1.064 2.1 1.064.784 0 1.4654-.28 2.044-.84.5974-.56.896-1.4467.896-2.66V19.36h3.024v4.872c0 1.2133.2894 2.1.868 2.66.5974.56 1.288.84 2.072.84.8214 0 1.5027-.3547 2.044-1.064.56-.728.84-1.7827.84-3.164 0-1.4187-.2613-2.8093-.784-4.172-.504-1.3627-1.2133-2.5667-2.128-3.612h3.22c.5414.5413 1.0174 1.2413 1.428 2.1.4107.84.7187 1.7547.924 2.744.224.9707.336 1.9507.336 2.94 0 1.5307-.2706 2.8187-.812 3.864-.5226 1.0267-1.2226 1.8013-2.1 2.324-.8586.504-1.792.756-2.8.756-.9333 0-1.82-.2427-2.66-.728-.8213-.4853-1.4653-1.26-1.932-2.324-.448 1.064-1.1013 1.8387-1.96 2.324-.8586.4853-1.764.728-2.716.728zm18.2222 5.6V23.084c0-1.5867.308-2.9587.924-4.116.6347-1.176 1.4934-2.0813 2.576-2.716 1.1014-.6533 2.3427-.98 3.724-.98 1.568 0 2.884.3547 3.948 1.064 1.0827.6907 1.904 1.624 2.464 2.8.56 1.1573.84 2.408.84 3.752 0 1.4747-.308 2.7813-.924 3.92-.5973 1.1387-1.4093 2.0347-2.436 2.688-1.0266.6347-2.1653.952-3.416.952-1.12 0-2.0813-.2333-2.884-.7-.784-.4667-1.3813-1.0173-1.792-1.652h-.168l.168 1.96v5.992h-3.024zm7.14-8.372c.7654 0 1.4747-.196 2.128-.588.6534-.4107 1.1854-.9707 1.596-1.68.4107-.7093.616-1.54.616-2.492 0-1.0267-.2146-1.904-.644-2.632-.4106-.728-.9426-1.2787-1.596-1.652-.6533-.392-1.3533-.588-2.1-.588-.6906 0-1.3626.1867-2.016.56-.6533.3733-1.1946.924-1.624 1.652-.4293.728-.644 1.6333-.644 2.716 0 .896.196 1.708.588 2.436.392.7093.9147 1.2693 1.568 1.68.6534.392 1.3627.588 2.128.588zm16.1006 2.772c-2.016 0-3.5467-.392-4.592-1.176-1.0454-.784-1.568-1.7547-1.568-2.912 0-.952.252-1.7173.756-2.296.5226-.5973 1.2506-.98 2.184-1.148v-.112c-.9147-.224-1.596-.6347-2.044-1.232-.4294-.5973-.644-1.2693-.644-2.016 0-1.344.5413-2.3893 1.624-3.136 1.1013-.7653 2.6786-1.148 4.732-1.148 1.3626 0 2.5573.1773 3.584.532 1.0266.3547 1.848.9147 2.464 1.68l-1.848 1.932c-.448-.4667-1.0267-.84-1.736-1.12-.6907-.28-1.5587-.42-2.604-.42-1.2507 0-2.1187.196-2.604.588-.4667.392-.7.8493-.7 1.372 0 .5787.2613 1.008.784 1.288.5226.2613 1.2413.392 2.156.392h2.856v2.632h-3.024c-1.064 0-1.82.1587-2.268.476-.448.3173-.672.756-.672 1.316s.2613 1.008.784 1.344c.5413.336 1.344.504 2.408.504 1.064 0 2.016-.1773 2.856-.532.84-.3547 1.4933-.7933 1.96-1.316l1.764 1.82c-.4667.6533-1.2414 1.2693-2.324 1.848-1.0827.56-2.5107.84-4.284.84zm15.2369 0c-1.2134 0-2.3334-.3173-3.36-.952-1.0267-.6533-1.848-1.54-2.464-2.66-.616-1.1387-.924-2.4547-.924-3.948 0-1.512.308-2.8373.924-3.976.6346-1.1573 1.4653-2.0533 2.492-2.688 1.0453-.6347 2.184-.952 3.416-.952 1.0453 0 1.9693.2333 2.772.7.8213.448 1.4373 1.008 1.848 1.68h.168V15.72h2.828v9.52c0 .7093.1213 1.2507.364 1.624.2426.3547.6626.532 1.26.532.2426 0 .4666-.028.672-.084.2053-.0747.4106-.168.616-.28v2.94c-.56.168-1.148.252-1.764.252-1.064 0-1.8947-.2147-2.492-.644-.5974-.4293-1.008-1.064-1.232-1.904h-.168c-1.0827 1.848-2.7347 2.772-4.956 2.772zm.56-2.772c.7466 0 1.4466-.196 2.1-.588.672-.392 1.204-.9427 1.596-1.652.4106-.728.616-1.5867.616-2.576 0-.9893-.2054-1.8387-.616-2.548-.392-.728-.924-1.288-1.596-1.68-.6534-.392-1.3534-.588-2.1-.588-.7467 0-1.4467.196-2.1.588-.6534.392-1.1854.952-1.596 1.68-.4107.7093-.616 1.5587-.616 2.548 0 .9893.2053 1.848.616 2.576.4106.7093.9426 1.26 1.596 1.652.6533.392 1.3533.588 2.1.588zm-1.68-14.7l1.036-4.368h3.584l-2.072 4.368h-2.548zm21.3186 23.072V15.72h3.024v8.54c0 1.2133.271 2.0907.812 2.632.56.5227 1.232.784 2.016.784.803 0 1.494-.2147 2.072-.644.598-.4293 1.055-.98 1.372-1.652.336-.6907.504-1.4093.504-2.156V15.72h2.996v9.576c0 .7093.122 1.2413.364 1.596.262.336.682.504 1.26.504.243 0 .467-.028.672-.084.206-.0747.411-.168.616-.28v2.94c-.261.0747-.532.1307-.812.168-.261.056-.569.084-.924.084-1.138 0-1.997-.224-2.576-.672-.578-.4667-.98-1.092-1.204-1.876h-.168c-.392.7467-.924 1.4-1.596 1.96-.672.5413-1.53.812-2.576.812-.578 0-1.129-.1213-1.652-.364-.522-.2427-.914-.56-1.176-.952h-.168l.168 1.596v5.32h-3.024zm24.28-5.6c-2.016 0-3.547-.392-4.592-1.176-1.045-.784-1.568-1.7547-1.568-2.912 0-.952.252-1.7173.756-2.296.523-.5973 1.251-.98 2.184-1.148v-.112c-.915-.224-1.596-.6347-2.044-1.232-.429-.5973-.644-1.2693-.644-2.016 0-1.344.541-2.3893 1.624-3.136 1.101-.7653 2.679-1.148 4.732-1.148 1.363 0 2.557.1773 3.584.532 1.027.3547 1.848.9147 2.464 1.68l-1.848 1.932c-.448-.4667-1.027-.84-1.736-1.12-.691-.28-1.559-.42-2.604-.42-1.251 0-2.119.196-2.604.588-.467.392-.7.8493-.7 1.372 0 .5787.261 1.008.784 1.288.523.2613 1.241.392 2.156.392h2.856v2.632h-3.024c-1.064 0-1.82.1587-2.268.476-.448.3173-.672.756-.672 1.316s.261 1.008.784 1.344c.541.336 1.344.504 2.408.504 1.064 0 2.016-.1773 2.856-.532.84-.3547 1.493-.7933 1.96-1.316l1.764 1.82c-.467.6533-1.241 1.2693-2.324 1.848-1.083.56-2.511.84-4.284.84z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M186.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM201.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM229.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M174.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M161.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M153.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M161.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-es-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-es-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..a3a6ee7f6b
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-es-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="232dp" android:height="38dp" android:viewportWidth="232" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.85629 30V9.952h6.41201c2.1093 0 3.92.4293 5.432 1.288 1.5307.84 2.7067 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8213 1.4933-1.9973 2.6693-3.528 3.528-1.512.84-3.3227 1.26-5.432 1.26H3.85629zm3.08-2.912h3.24801c2.2773 0 4.0413-.6347 5.292-1.904 1.2693-1.2693 1.904-3.0053 1.904-5.208s-.6347-3.9387-1.904-5.208c-1.2507-1.2693-3.0147-1.904-5.292-1.904H6.93629v14.224zm23.17821 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9974-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6346-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6346 1.1387.952 2.4173.952 3.836 0 1.4373-.3174 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5214.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6906.3733 1.428.56 2.212.56zM40.3742 30V15.72h2.856v1.96h.168c.4106-.6907 1.0173-1.26 1.82-1.708.8213-.4667 1.7173-.7 2.688-.7 1.7546 0 3.0706.5227 3.948 1.568.8773 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2894-1.9973-.868-2.52-.5787-.5413-1.3347-.812-2.268-.812-.728 0-1.3627.2053-1.904.616-.5414.392-.9707.9147-1.288 1.568-.2987.6533-.448 1.3533-.448 2.1V30h-3.024zm20.8854.448c-1.0266 0-1.9413-.196-2.744-.588-.8026-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2614-1.8667.784-2.576.5414-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8854-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2134.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4186.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7466.448-1.6426.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5974-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5786-.168-1.1946-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5226.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM72.3648 30V15.72h2.856v2.1h.168c.3173-.728.8587-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7187.028.98.084.28.056.532.1213.756.196v3.136c-.3547-.1493-.7187-.2707-1.092-.364-.3547-.0933-.728-.14-1.12-.14-.7093 0-1.344.196-1.904.588-.5413.3733-.9707.8867-1.288 1.54-.3173.6347-.476 1.3347-.476 2.1V30h-3.024zm24.9814.448c-1.4373 0-2.7066-.3267-3.808-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.6346-1.1573-.952-2.464-.952-3.92s.3174-2.7533.952-3.892c.6347-1.1573 1.5027-2.0627 2.604-2.716 1.1014-.6533 2.3707-.98 3.808-.98 1.5867 0 2.9218.3547 4.0038 1.064 1.102.7093 1.886 1.6707 2.352 2.884l-2.744 1.12c-.653-1.5307-1.8758-2.296-3.6678-2.296-.784 0-1.5026.2053-2.156.616-.6533.392-1.176.952-1.568 1.68-.392.7093-.588 1.5493-.588 2.52 0 .9707.196 1.82.588 2.548.392.728.9147 1.288 1.568 1.68.6534.392 1.372.588 2.156.588.9147 0 1.6894-.2053 2.324-.616.6348-.4293 1.1298-1.008 1.4838-1.736l2.688 1.176c-.504 1.1387-1.306 2.0813-2.408 2.828-1.101.7467-2.4451 1.12-4.0318 1.12zm15.9158 0c-1.475 0-2.772-.336-3.892-1.008-1.12-.672-1.997-1.5773-2.632-2.716-.635-1.1387-.952-2.4267-.952-3.864 0-1.4187.317-2.6973.952-3.836.635-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.417-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.997 1.5867 2.632 2.744.635 1.1387.952 2.4173.952 3.836 0 1.4373-.317 2.7253-.952 3.864s-1.512 2.044-2.632 2.716c-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.213-.9427 1.624-1.652.429-.728.644-1.596.644-2.604s-.215-1.8667-.644-2.576c-.411-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.521.196-2.212.588-.672.3733-1.223.924-1.652 1.652-.411.7093-.616 1.568-.616 2.576s.205 1.876.616 2.604c.429.7093.98 1.26 1.652 1.652.691.3733 1.428.56 2.212.56zM123.522 30V15.72h2.856v1.96h.168c.41-.6907 1.017-1.26 1.82-1.708.821-.4667 1.717-.7 2.688-.7 1.754 0 3.07.5227 3.948 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.29-1.9973-.868-2.52-.579-.5413-1.335-.812-2.268-.812-.728 0-1.363.2053-1.904.616-.542.392-.971.9147-1.288 1.568-.299.6533-.448 1.3533-.448 2.1V30h-3.024z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M188.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM203.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM231.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M176.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M163.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M155.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M163.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C170.123 6.03271 167.082 4.7 163.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-es/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-es/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..1d5461166f
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-es/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="232dp" android:height="38dp" android:viewportWidth="232" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.85629 30V9.952h6.41201c2.1093 0 3.92.4293 5.432 1.288 1.5307.84 2.7067 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8213 1.4933-1.9973 2.6693-3.528 3.528-1.512.84-3.3227 1.26-5.432 1.26H3.85629zm3.08-2.912h3.24801c2.2773 0 4.0413-.6347 5.292-1.904 1.2693-1.2693 1.904-3.0053 1.904-5.208s-.6347-3.9387-1.904-5.208c-1.2507-1.2693-3.0147-1.904-5.292-1.904H6.93629v14.224zm23.17821 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9974-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6346-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6346 1.1387.952 2.4173.952 3.836 0 1.4373-.3174 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5214.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6906.3733 1.428.56 2.212.56zM40.3742 30V15.72h2.856v1.96h.168c.4106-.6907 1.0173-1.26 1.82-1.708.8213-.4667 1.7173-.7 2.688-.7 1.7546 0 3.0706.5227 3.948 1.568.8773 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2894-1.9973-.868-2.52-.5787-.5413-1.3347-.812-2.268-.812-.728 0-1.3627.2053-1.904.616-.5414.392-.9707.9147-1.288 1.568-.2987.6533-.448 1.3533-.448 2.1V30h-3.024zm20.8854.448c-1.0266 0-1.9413-.196-2.744-.588-.8026-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2614-1.8667.784-2.576.5414-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8854-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2134.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4186.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7466.448-1.6426.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5974-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5786-.168-1.1946-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5226.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM72.3648 30V15.72h2.856v2.1h.168c.3173-.728.8587-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7187.028.98.084.28.056.532.1213.756.196v3.136c-.3547-.1493-.7187-.2707-1.092-.364-.3547-.0933-.728-.14-1.12-.14-.7093 0-1.344.196-1.904.588-.5413.3733-.9707.8867-1.288 1.54-.3173.6347-.476 1.3347-.476 2.1V30h-3.024zm24.9814.448c-1.4373 0-2.7066-.3267-3.808-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.6346-1.1573-.952-2.464-.952-3.92s.3174-2.7533.952-3.892c.6347-1.1573 1.5027-2.0627 2.604-2.716 1.1014-.6533 2.3707-.98 3.808-.98 1.5867 0 2.9218.3547 4.0038 1.064 1.102.7093 1.886 1.6707 2.352 2.884l-2.744 1.12c-.653-1.5307-1.8758-2.296-3.6678-2.296-.784 0-1.5026.2053-2.156.616-.6533.392-1.176.952-1.568 1.68-.392.7093-.588 1.5493-.588 2.52 0 .9707.196 1.82.588 2.548.392.728.9147 1.288 1.568 1.68.6534.392 1.372.588 2.156.588.9147 0 1.6894-.2053 2.324-.616.6348-.4293 1.1298-1.008 1.4838-1.736l2.688 1.176c-.504 1.1387-1.306 2.0813-2.408 2.828-1.101.7467-2.4451 1.12-4.0318 1.12zm15.9158 0c-1.475 0-2.772-.336-3.892-1.008-1.12-.672-1.997-1.5773-2.632-2.716-.635-1.1387-.952-2.4267-.952-3.864 0-1.4187.317-2.6973.952-3.836.635-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.417-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.997 1.5867 2.632 2.744.635 1.1387.952 2.4173.952 3.836 0 1.4373-.317 2.7253-.952 3.864s-1.512 2.044-2.632 2.716c-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.213-.9427 1.624-1.652.429-.728.644-1.596.644-2.604s-.215-1.8667-.644-2.576c-.411-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.521.196-2.212.588-.672.3733-1.223.924-1.652 1.652-.411.7093-.616 1.568-.616 2.576s.205 1.876.616 2.604c.429.7093.98 1.26 1.652 1.652.691.3733 1.428.56 2.212.56zM123.522 30V15.72h2.856v1.96h.168c.41-.6907 1.017-1.26 1.82-1.708.821-.4667 1.717-.7 2.688-.7 1.754 0 3.07.5227 3.948 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.29-1.9973-.868-2.52-.579-.5413-1.335-.812-2.268-.812-.728 0-1.363.2053-1.904.616-.542.392-.971.9147-1.288 1.568-.299.6533-.448 1.3533-.448 2.1V30h-3.024z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M188.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM203.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM231.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M176.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M163.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M155.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M163.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-et-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-et-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..af8bcbe0b9
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-et-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="248dp" android:height="38dp" android:viewportWidth="248" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M1.49344 30l7.56-20.048h3.49996L20.1414 30h-3.388l-1.848-5.152H6.72944L4.88144 30h-3.388zm8.484-14.14l-2.212 6.132h6.10396l-2.212-6.132-.756-2.296h-.168l-.75596 2.296zM22.6335 30V15.72h2.856v1.96h.168c.4107-.6907 1.0174-1.26 1.82-1.708.8214-.4667 1.7174-.7 2.688-.7 1.7547 0 3.0707.5227 3.948 1.568.8774 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2893-1.9973-.868-2.52-.5786-.5413-1.3346-.812-2.268-.812-.728 0-1.3626.2053-1.904.616-.5413.392-.9706.9147-1.288 1.568-.2986.6533-.448 1.3533-.448 2.1V30h-3.024zm16.5422 0V15.72h2.856v1.96h.168c.4107-.6907 1.0174-1.26 1.82-1.708.8214-.4667 1.7174-.7 2.688-.7 1.7547 0 3.0707.5227 3.948 1.568.8774 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2893-1.9973-.868-2.52-.5786-.5413-1.3346-.812-2.268-.812-.728 0-1.3626.2053-1.904.616-.5413.392-.9706.9147-1.288 1.568-.2986.6533-.448 1.3533-.448 2.1V30h-3.024zm23.0662.448c-1.4 0-2.6507-.3267-3.752-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2987-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0827-.7093 2.324-1.064 3.724-1.064 1.4747 0 2.7253.3173 3.752.952 1.0453.6347 1.8387 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0093.392-.028.56 0 .168-.0093.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8587.7093 1.8293 1.064 2.912 1.064.9707 0 1.7733-.2147 2.408-.644.6347-.448 1.1387-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3893 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7093.616-1.1853 1.4373-1.428 2.464h7.924c-.0373-.4853-.196-.9893-.476-1.512-.28-.5227-.7093-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zm11.1233 8.008v-7.504h-2.492V15.72h2.492v-4.032h3.024v4.032h3.5v2.632h-3.5v6.86c0 .7093.14 1.2507.42 1.624.2987.3733.7934.56 1.484.56.3547 0 .6534-.0467.896-.14.2614-.0933.5227-.224.784-.392v2.94c-.3173.1307-.6533.2333-1.008.308-.3546.0747-.7746.112-1.26.112-1.3253 0-2.38-.3827-3.164-1.148-.784-.784-1.176-1.8573-1.176-3.22zm13.9321 4.592c-1.0267 0-1.9413-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm16.8767 8.512c-1.251 0-2.334-.2053-3.248-.616-.896-.392-1.6243-.9053-2.1843-1.54-.56-.616-.9613-1.2507-1.204-1.904l2.8003-1.176c.298.7467.774 1.3533 1.428 1.82.672.4853 1.474.728 2.408.728 1.306 0 2.333-.392 3.08-1.176.765-.784 1.148-1.8947 1.148-3.332v-1.372h-.168c-.448.672-1.074 1.2133-1.876 1.624-.784.392-1.68.588-2.688.588-1.214 0-2.324-.308-3.332-.924-1.0083-.616-1.8203-1.4747-2.4363-2.576-.616-1.12-.924-2.4267-.924-3.92 0-1.512.308-2.8187.924-3.92.616-1.12 1.428-1.988 2.4363-2.604 1.008-.616 2.118-.924 3.332-.924 1.008 0 1.904.2053 2.688.616.802.4107 1.428.952 1.876 1.624h.168V15.72h2.884v13.524c0 1.5493-.308 2.8653-.924 3.948-.598 1.0827-1.428 1.904-2.492 2.464s-2.296.84-3.696.84zm.028-9.1c.746 0 1.437-.1773 2.072-.532.634-.3733 1.148-.9053 1.54-1.596.392-.7093.588-1.5587.588-2.548 0-1.0267-.196-1.8853-.588-2.576-.392-.7093-.906-1.2413-1.54-1.596-.635-.3547-1.326-.532-2.072-.532-.747 0-1.447.1867-2.1.56-.635.3547-1.148.8773-1.54 1.568-.392.6907-.588 1.5493-.588 2.576 0 1.008.196 1.8667.588 2.576.392.6907.905 1.2133 1.54 1.568.653.3547 1.353.532 2.1.532zm17.309 3.052c-1.4 0-2.651-.3267-3.752-.98s-1.969-1.5493-2.604-2.688c-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.725.3173 3.752.952 1.045.6347 1.839 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.859.7093 1.829 1.064 2.912 1.064.971 0 1.773-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zm16.828 4.76v-2.576h13.664v2.576h-13.664z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M204.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM219.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM247.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M192.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M179.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M171.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M179.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C186.123 6.03271 183.082 4.7 179.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-et/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-et/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..367cec333e
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-et/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="248dp" android:height="38dp" android:viewportWidth="248" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M1.49344 30l7.56-20.048h3.49996L20.1414 30h-3.388l-1.848-5.152H6.72944L4.88144 30h-3.388zm8.484-14.14l-2.212 6.132h6.10396l-2.212-6.132-.756-2.296h-.168l-.75596 2.296zM22.6335 30V15.72h2.856v1.96h.168c.4107-.6907 1.0174-1.26 1.82-1.708.8214-.4667 1.7174-.7 2.688-.7 1.7547 0 3.0707.5227 3.948 1.568.8774 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2893-1.9973-.868-2.52-.5786-.5413-1.3346-.812-2.268-.812-.728 0-1.3626.2053-1.904.616-.5413.392-.9706.9147-1.288 1.568-.2986.6533-.448 1.3533-.448 2.1V30h-3.024zm16.5422 0V15.72h2.856v1.96h.168c.4107-.6907 1.0174-1.26 1.82-1.708.8214-.4667 1.7174-.7 2.688-.7 1.7547 0 3.0707.5227 3.948 1.568.8774 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2893-1.9973-.868-2.52-.5786-.5413-1.3346-.812-2.268-.812-.728 0-1.3626.2053-1.904.616-.5413.392-.9706.9147-1.288 1.568-.2986.6533-.448 1.3533-.448 2.1V30h-3.024zm23.0662.448c-1.4 0-2.6507-.3267-3.752-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2987-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0827-.7093 2.324-1.064 3.724-1.064 1.4747 0 2.7253.3173 3.752.952 1.0453.6347 1.8387 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0093.392-.028.56 0 .168-.0093.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8587.7093 1.8293 1.064 2.912 1.064.9707 0 1.7733-.2147 2.408-.644.6347-.448 1.1387-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3893 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7093.616-1.1853 1.4373-1.428 2.464h7.924c-.0373-.4853-.196-.9893-.476-1.512-.28-.5227-.7093-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zm11.1233 8.008v-7.504h-2.492V15.72h2.492v-4.032h3.024v4.032h3.5v2.632h-3.5v6.86c0 .7093.14 1.2507.42 1.624.2987.3733.7934.56 1.484.56.3547 0 .6534-.0467.896-.14.2614-.0933.5227-.224.784-.392v2.94c-.3173.1307-.6533.2333-1.008.308-.3546.0747-.7746.112-1.26.112-1.3253 0-2.38-.3827-3.164-1.148-.784-.784-1.176-1.8573-1.176-3.22zm13.9321 4.592c-1.0267 0-1.9413-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm16.8767 8.512c-1.251 0-2.334-.2053-3.248-.616-.896-.392-1.6243-.9053-2.1843-1.54-.56-.616-.9613-1.2507-1.204-1.904l2.8003-1.176c.298.7467.774 1.3533 1.428 1.82.672.4853 1.474.728 2.408.728 1.306 0 2.333-.392 3.08-1.176.765-.784 1.148-1.8947 1.148-3.332v-1.372h-.168c-.448.672-1.074 1.2133-1.876 1.624-.784.392-1.68.588-2.688.588-1.214 0-2.324-.308-3.332-.924-1.0083-.616-1.8203-1.4747-2.4363-2.576-.616-1.12-.924-2.4267-.924-3.92 0-1.512.308-2.8187.924-3.92.616-1.12 1.428-1.988 2.4363-2.604 1.008-.616 2.118-.924 3.332-.924 1.008 0 1.904.2053 2.688.616.802.4107 1.428.952 1.876 1.624h.168V15.72h2.884v13.524c0 1.5493-.308 2.8653-.924 3.948-.598 1.0827-1.428 1.904-2.492 2.464s-2.296.84-3.696.84zm.028-9.1c.746 0 1.437-.1773 2.072-.532.634-.3733 1.148-.9053 1.54-1.596.392-.7093.588-1.5587.588-2.548 0-1.0267-.196-1.8853-.588-2.576-.392-.7093-.906-1.2413-1.54-1.596-.635-.3547-1.326-.532-2.072-.532-.747 0-1.447.1867-2.1.56-.635.3547-1.148.8773-1.54 1.568-.392.6907-.588 1.5493-.588 2.576 0 1.008.196 1.8667.588 2.576.392.6907.905 1.2133 1.54 1.568.653.3547 1.353.532 2.1.532zm17.309 3.052c-1.4 0-2.651-.3267-3.752-.98s-1.969-1.5493-2.604-2.688c-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.725.3173 3.752.952 1.045.6347 1.839 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.859.7093 1.829 1.064 2.912 1.064.971 0 1.773-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zm16.828 4.76v-2.576h13.664v2.576h-13.664z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M204.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM219.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM247.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M192.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M179.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M171.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M179.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-eu-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-eu-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..0222308e5e
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-eu-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,43 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="498dp"
+    android:height="84dp"
+    android:viewportWidth="498"
+    android:viewportHeight="84">
+  <path
+      android:pathData="M10,4L487,4A4,4 0,0 1,491 8L491,72A4,4 0,0 1,487 76L10,76A4,4 0,0 1,6 72L6,8A4,4 0,0 1,10 4z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M56.416,50V29.952H68.568V32.864H59.496V38.52H67.672V41.432H59.496V47.088H68.568V50H56.416ZM78.402,56.496C77.151,56.496 76.068,56.291 75.154,55.88C74.258,55.488 73.53,54.975 72.97,54.34C72.41,53.724 72.008,53.089 71.766,52.436L74.566,51.26C74.864,52.007 75.34,52.613 75.994,53.08C76.666,53.565 77.468,53.808 78.402,53.808C79.708,53.808 80.735,53.416 81.482,52.632C82.247,51.848 82.63,50.737 82.63,49.3V47.928H82.462C82.014,48.6 81.388,49.141 80.586,49.552C79.802,49.944 78.906,50.14 77.898,50.14C76.684,50.14 75.574,49.832 74.566,49.216C73.558,48.6 72.746,47.741 72.13,46.64C71.514,45.52 71.206,44.213 71.206,42.72C71.206,41.208 71.514,39.901 72.13,38.8C72.746,37.68 73.558,36.812 74.566,36.196C75.574,35.58 76.684,35.272 77.898,35.272C78.906,35.272 79.802,35.477 80.586,35.888C81.388,36.299 82.014,36.84 82.462,37.512H82.63V35.72H85.514V49.244C85.514,50.793 85.206,52.109 84.59,53.192C83.992,54.275 83.162,55.096 82.098,55.656C81.034,56.216 79.802,56.496 78.402,56.496ZM78.43,47.396C79.176,47.396 79.867,47.219 80.502,46.864C81.136,46.491 81.65,45.959 82.042,45.268C82.434,44.559 82.63,43.709 82.63,42.72C82.63,41.693 82.434,40.835 82.042,40.144C81.65,39.435 81.136,38.903 80.502,38.548C79.867,38.193 79.176,38.016 78.43,38.016C77.683,38.016 76.983,38.203 76.33,38.576C75.695,38.931 75.182,39.453 74.79,40.144C74.398,40.835 74.202,41.693 74.202,42.72C74.202,43.728 74.398,44.587 74.79,45.296C75.182,45.987 75.695,46.509 76.33,46.864C76.983,47.219 77.683,47.396 78.43,47.396ZM91.088,33.62C90.527,33.62 90.042,33.424 89.632,33.032C89.24,32.621 89.044,32.136 89.044,31.576C89.044,31.016 89.24,30.54 89.632,30.148C90.042,29.756 90.527,29.56 91.088,29.56C91.647,29.56 92.123,29.756 92.516,30.148C92.926,30.54 93.132,31.016 93.132,31.576C93.132,32.136 92.926,32.621 92.516,33.032C92.123,33.424 91.647,33.62 91.088,33.62ZM89.576,50V35.72H92.6V50H89.576ZM96.651,50V35.72H99.507V37.68H99.675C100.086,36.989 100.693,36.42 101.496,35.972C102.317,35.505 103.213,35.272 104.184,35.272C105.938,35.272 107.254,35.795 108.132,36.84C109.009,37.885 109.448,39.267 109.448,40.984V50H106.452V41.376C106.452,40.219 106.162,39.379 105.584,38.856C105.005,38.315 104.249,38.044 103.316,38.044C102.588,38.044 101.953,38.249 101.412,38.66C100.87,39.052 100.441,39.575 100.124,40.228C99.825,40.881 99.675,41.581 99.675,42.328V50H96.651ZM126.133,50.448C124.845,50.448 123.678,50.131 122.633,49.496C121.606,48.843 120.785,47.947 120.169,46.808C119.572,45.651 119.273,44.335 119.273,42.86C119.273,41.385 119.572,40.079 120.169,38.94C120.785,37.801 121.606,36.905 122.633,36.252C123.678,35.599 124.845,35.272 126.133,35.272C127.234,35.272 128.177,35.515 128.961,36C129.764,36.485 130.352,37.036 130.725,37.652H130.893L130.725,35.664V29.952H133.721V50H130.893V48.096H130.725C130.352,48.712 129.764,49.263 128.961,49.748C128.177,50.215 127.234,50.448 126.133,50.448ZM126.581,47.676C127.328,47.676 128.028,47.48 128.681,47.088C129.353,46.696 129.885,46.145 130.277,45.436C130.688,44.708 130.893,43.849 130.893,42.86C130.893,41.871 130.688,41.021 130.277,40.312C129.885,39.584 129.353,39.024 128.681,38.632C128.028,38.24 127.328,38.044 126.581,38.044C125.834,38.044 125.134,38.24 124.481,38.632C123.828,39.024 123.296,39.584 122.885,40.312C122.474,41.021 122.269,41.871 122.269,42.86C122.269,43.849 122.474,44.708 122.885,45.436C123.296,46.145 123.828,46.696 124.481,47.088C125.134,47.48 125.834,47.676 126.581,47.676ZM144.166,50.448C142.691,50.448 141.394,50.112 140.274,49.44C139.154,48.768 138.277,47.863 137.642,46.724C137.007,45.585 136.69,44.297 136.69,42.86C136.69,41.441 137.007,40.163 137.642,39.024C138.277,37.867 139.154,36.952 140.274,36.28C141.394,35.608 142.691,35.272 144.166,35.272C145.622,35.272 146.91,35.608 148.03,36.28C149.15,36.952 150.027,37.867 150.662,39.024C151.297,40.163 151.614,41.441 151.614,42.86C151.614,44.297 151.297,45.585 150.662,46.724C150.027,47.863 149.15,48.768 148.03,49.44C146.91,50.112 145.622,50.448 144.166,50.448ZM144.166,47.676C144.95,47.676 145.678,47.489 146.35,47.116C147.022,46.724 147.563,46.173 147.974,45.464C148.403,44.736 148.618,43.868 148.618,42.86C148.618,41.852 148.403,40.993 147.974,40.284C147.563,39.556 147.022,39.005 146.35,38.632C145.678,38.24 144.95,38.044 144.166,38.044C143.382,38.044 142.645,38.24 141.954,38.632C141.282,39.005 140.731,39.556 140.302,40.284C139.891,40.993 139.686,41.852 139.686,42.86C139.686,43.868 139.891,44.736 140.302,45.464C140.731,46.173 141.282,46.724 141.954,47.116C142.645,47.489 143.382,47.676 144.166,47.676ZM154.562,50V29.952H157.586V35.44L157.418,37.68H157.586C157.978,36.989 158.576,36.42 159.378,35.972C160.2,35.505 161.105,35.272 162.094,35.272C163.868,35.272 165.202,35.804 166.098,36.868C166.994,37.913 167.442,39.285 167.442,40.984V50H164.446V41.376C164.446,40.219 164.138,39.379 163.522,38.856C162.925,38.315 162.188,38.044 161.31,38.044C160.582,38.044 159.938,38.249 159.378,38.66C158.818,39.071 158.38,39.612 158.062,40.284C157.745,40.937 157.586,41.637 157.586,42.384V50H154.562ZM175.53,50.448C174.503,50.448 173.589,50.252 172.786,49.86C171.983,49.449 171.358,48.88 170.91,48.152C170.462,47.424 170.238,46.593 170.238,45.66C170.238,44.652 170.499,43.793 171.022,43.084C171.563,42.356 172.282,41.805 173.178,41.432C174.074,41.059 175.063,40.872 176.146,40.872C177.042,40.872 177.826,40.956 178.498,41.124C179.189,41.292 179.711,41.469 180.066,41.656V40.9C180.066,39.967 179.73,39.22 179.058,38.66C178.386,38.1 177.518,37.82 176.454,37.82C175.726,37.82 175.035,37.988 174.382,38.324C173.729,38.641 173.206,39.08 172.814,39.64L170.742,38.044C171.358,37.185 172.17,36.513 173.178,36.028C174.205,35.524 175.325,35.272 176.538,35.272C178.61,35.272 180.206,35.785 181.326,36.812C182.446,37.82 183.006,39.239 183.006,41.068V50H180.066V48.236H179.898C179.525,48.815 178.965,49.328 178.218,49.776C177.471,50.224 176.575,50.448 175.53,50.448ZM176.062,47.984C176.846,47.984 177.537,47.797 178.134,47.424C178.731,47.051 179.198,46.565 179.534,45.968C179.889,45.352 180.066,44.689 180.066,43.98C179.637,43.737 179.133,43.541 178.554,43.392C177.975,43.224 177.359,43.14 176.706,43.14C175.474,43.14 174.597,43.392 174.074,43.896C173.551,44.381 173.29,44.979 173.29,45.688C173.29,46.36 173.542,46.911 174.046,47.34C174.55,47.769 175.222,47.984 176.062,47.984ZM188.371,33.62C187.811,33.62 187.326,33.424 186.915,33.032C186.523,32.621 186.327,32.136 186.327,31.576C186.327,31.016 186.523,30.54 186.915,30.148C187.326,29.756 187.811,29.56 188.371,29.56C188.931,29.56 189.407,29.756 189.799,30.148C190.21,30.54 190.415,31.016 190.415,31.576C190.415,32.136 190.21,32.621 189.799,33.032C189.407,33.424 188.931,33.62 188.371,33.62ZM186.859,50V35.72H189.883V50H186.859ZM193.935,50V35.72H196.791V37.68H196.959C197.37,36.989 197.976,36.42 198.779,35.972C199.6,35.505 200.496,35.272 201.467,35.272C203.222,35.272 204.538,35.795 205.415,36.84C206.292,37.885 206.731,39.267 206.731,40.984V50H203.735V41.376C203.735,40.219 203.446,39.379 202.867,38.856C202.288,38.315 201.532,38.044 200.599,38.044C199.871,38.044 199.236,38.249 198.695,38.66C198.154,39.052 197.724,39.575 197.407,40.228C197.108,40.881 196.959,41.581 196.959,42.328V50H193.935ZM211.278,45.856V38.352H208.786V35.72H211.278V31.688H214.302V35.72H217.802V38.352H214.302V45.212C214.302,45.921 214.442,46.463 214.722,46.836C215.021,47.209 215.516,47.396 216.206,47.396C216.561,47.396 216.86,47.349 217.102,47.256C217.364,47.163 217.625,47.032 217.886,46.864V49.804C217.569,49.935 217.233,50.037 216.878,50.112C216.524,50.187 216.104,50.224 215.618,50.224C214.293,50.224 213.238,49.841 212.454,49.076C211.67,48.292 211.278,47.219 211.278,45.856ZM220.549,50V47.48L228.501,38.352H220.801V35.72H232.197V38.24L224.273,47.368H232.421V50H220.549ZM239.756,50.448C238.73,50.448 237.815,50.252 237.012,49.86C236.21,49.449 235.584,48.88 235.136,48.152C234.688,47.424 234.464,46.593 234.464,45.66C234.464,44.652 234.726,43.793 235.248,43.084C235.79,42.356 236.508,41.805 237.404,41.432C238.3,41.059 239.29,40.872 240.372,40.872C241.268,40.872 242.052,40.956 242.724,41.124C243.415,41.292 243.938,41.469 244.292,41.656V40.9C244.292,39.967 243.956,39.22 243.284,38.66C242.612,38.1 241.744,37.82 240.68,37.82C239.952,37.82 239.262,37.988 238.608,38.324C237.955,38.641 237.432,39.08 237.04,39.64L234.968,38.044C235.584,37.185 236.396,36.513 237.404,36.028C238.431,35.524 239.551,35.272 240.764,35.272C242.836,35.272 244.432,35.785 245.552,36.812C246.672,37.82 247.232,39.239 247.232,41.068V50H244.292V48.236H244.124C243.751,48.815 243.191,49.328 242.444,49.776C241.698,50.224 240.802,50.448 239.756,50.448ZM240.288,47.984C241.072,47.984 241.763,47.797 242.36,47.424C242.958,47.051 243.424,46.565 243.76,45.968C244.115,45.352 244.292,44.689 244.292,43.98C243.863,43.737 243.359,43.541 242.78,43.392C242.202,43.224 241.586,43.14 240.932,43.14C239.7,43.14 238.823,43.392 238.3,43.896C237.778,44.381 237.516,44.979 237.516,45.688C237.516,46.36 237.768,46.911 238.272,47.34C238.776,47.769 239.448,47.984 240.288,47.984ZM250.862,50V29.952H253.886V41.768L259.934,35.72H263.686V35.888L258.17,41.348L263.882,49.832V50H260.298L256.042,43.448L253.886,45.576V50H250.862Z"
+      android:fillColor="#3C4043"/>
+  <path
+      android:pathData="M314.529,29.447V37.613H319.565C320.765,37.613 321.757,37.21 322.541,36.403C323.347,35.599 323.75,34.639 323.75,33.529C323.75,32.441 323.347,31.492 322.541,30.686C321.757,29.859 320.765,29.445 319.565,29.445H314.529V29.447ZM314.529,40.487V49.96H311.521V26.572H319.499C321.527,26.572 323.248,27.248 324.666,28.597C326.105,29.947 326.824,31.591 326.824,33.529C326.824,35.511 326.105,37.167 324.666,38.494C323.27,39.823 321.547,40.485 319.499,40.485H314.529V40.487Z"
+      android:fillColor="#5F6368"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M329.864,45.06C329.864,45.844 330.197,46.498 330.862,47.02C331.527,47.543 332.306,47.804 333.2,47.804C334.465,47.804 335.591,47.335 336.584,46.4C337.576,45.463 338.071,44.364 338.071,43.102C337.133,42.361 335.825,41.992 334.147,41.992C332.925,41.992 331.907,42.287 331.09,42.875C330.273,43.462 329.864,44.189 329.864,45.06M333.756,33.432C335.98,33.432 337.735,34.025 339.022,35.212C340.308,36.4 340.95,38.027 340.95,40.095V49.96H338.073V47.739H337.942C336.699,49.568 335.042,50.482 332.972,50.482C331.206,50.482 329.728,49.96 328.541,48.915C327.353,47.869 326.759,46.563 326.759,44.995C326.759,43.339 327.385,42.023 328.638,41.043C329.892,40.063 331.565,39.573 333.658,39.573C335.444,39.573 336.916,39.899 338.071,40.553V39.866C338.071,38.82 337.656,37.934 336.829,37.204C335.999,36.474 335.031,36.11 333.919,36.11C332.239,36.11 330.911,36.818 329.93,38.234L327.28,36.568C328.741,34.477 330.899,33.432 333.756,33.432"
+      android:fillColor="#5F6368"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M357.463,33.954L347.423,57.015H344.318L348.046,48.946L341.44,33.954H344.71L349.484,45.452H349.55L354.193,33.954H357.463Z"
+      android:fillColor="#5F6368"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M302.373,38.445C302.373,37.499 302.293,36.586 302.141,35.713H289.454V40.889H296.72C296.408,42.576 295.465,44.011 294.033,44.972V48.334H298.37C300.91,45.993 302.373,42.535 302.373,38.445"
+      android:fillColor="#4285F4"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M289.454,51.578C293.084,51.578 296.141,50.387 298.37,48.334L294.033,44.972C292.826,45.784 291.272,46.258 289.454,46.258C285.944,46.258 282.966,43.896 281.901,40.711H277.433V44.174C279.647,48.564 284.197,51.578 289.454,51.578"
+      android:fillColor="#34A853"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M281.901,40.711C281.628,39.899 281.479,39.033 281.479,38.139C281.479,37.245 281.628,36.379 281.901,35.567V32.105H277.433C276.518,33.919 276,35.968 276,38.139C276,40.31 276.518,42.36 277.433,44.174L281.901,40.711Z"
+      android:fillColor="#FABB05"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M289.454,30.02C291.436,30.02 293.213,30.701 294.615,32.035V32.037L298.455,28.202C296.123,26.033 293.082,24.7 289.454,24.7C284.197,24.7 279.647,27.715 277.433,32.105L281.901,35.567C282.966,32.383 285.944,30.02 289.454,30.02"
+      android:fillColor="#E94235"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M378.38,50.448C377.279,50.448 376.327,50.215 375.524,49.748C374.74,49.263 374.161,48.712 373.788,48.096H373.62V50H370.764V29.952H373.788V35.664L373.62,37.652H373.788C374.161,37.036 374.74,36.485 375.524,36C376.327,35.515 377.279,35.272 378.38,35.272C379.687,35.272 380.853,35.599 381.88,36.252C382.907,36.905 383.719,37.801 384.316,38.94C384.932,40.079 385.24,41.385 385.24,42.86C385.24,44.335 384.932,45.651 384.316,46.808C383.719,47.947 382.907,48.843 381.88,49.496C380.853,50.131 379.687,50.448 378.38,50.448ZM377.932,47.676C378.679,47.676 379.379,47.48 380.032,47.088C380.685,46.696 381.217,46.145 381.628,45.436C382.039,44.708 382.244,43.849 382.244,42.86C382.244,41.871 382.039,41.021 381.628,40.312C381.217,39.584 380.685,39.024 380.032,38.632C379.379,38.24 378.679,38.044 377.932,38.044C377.185,38.044 376.485,38.24 375.832,38.632C375.179,39.024 374.647,39.584 374.236,40.312C373.825,41.021 373.62,41.871 373.62,42.86C373.62,43.849 373.825,44.708 374.236,45.436C374.647,46.145 375.179,46.696 375.832,47.088C376.485,47.48 377.185,47.676 377.932,47.676ZM389.917,33.62C389.357,33.62 388.872,33.424 388.461,33.032C388.069,32.621 387.873,32.136 387.873,31.576C387.873,31.016 388.069,30.54 388.461,30.148C388.872,29.756 389.357,29.56 389.917,29.56C390.477,29.56 390.953,29.756 391.345,30.148C391.756,30.54 391.961,31.016 391.961,31.576C391.961,32.136 391.756,32.621 391.345,33.032C390.953,33.424 390.477,33.62 389.917,33.62ZM388.405,50V35.72H391.429V50H388.405ZM401.448,50.448C400.16,50.448 398.994,50.131 397.948,49.496C396.922,48.843 396.1,47.947 395.484,46.808C394.887,45.651 394.588,44.335 394.588,42.86C394.588,41.385 394.887,40.079 395.484,38.94C396.1,37.801 396.922,36.905 397.948,36.252C398.994,35.599 400.16,35.272 401.448,35.272C402.55,35.272 403.492,35.515 404.276,36C405.079,36.485 405.667,37.036 406.04,37.652H406.208L406.04,35.664V29.952H409.036V50H406.208V48.096H406.04C405.667,48.712 405.079,49.263 404.276,49.748C403.492,50.215 402.55,50.448 401.448,50.448ZM401.896,47.676C402.643,47.676 403.343,47.48 403.996,47.088C404.668,46.696 405.2,46.145 405.592,45.436C406.003,44.708 406.208,43.849 406.208,42.86C406.208,41.871 406.003,41.021 405.592,40.312C405.2,39.584 404.668,39.024 403.996,38.632C403.343,38.24 402.643,38.044 401.896,38.044C401.15,38.044 400.45,38.24 399.796,38.632C399.143,39.024 398.611,39.584 398.2,40.312C397.79,41.021 397.584,41.871 397.584,42.86C397.584,43.849 397.79,44.708 398.2,45.436C398.611,46.145 399.143,46.696 399.796,47.088C400.45,47.48 401.15,47.676 401.896,47.676ZM419.286,50.448C417.886,50.448 416.635,50.121 415.534,49.468C414.432,48.815 413.564,47.919 412.93,46.78C412.314,45.641 412.006,44.344 412.006,42.888C412.006,41.525 412.304,40.265 412.902,39.108C413.499,37.951 414.33,37.027 415.394,36.336C416.476,35.627 417.718,35.272 419.118,35.272C420.592,35.272 421.843,35.589 422.87,36.224C423.915,36.859 424.708,37.727 425.25,38.828C425.791,39.929 426.062,41.171 426.062,42.552C426.062,42.757 426.052,42.944 426.034,43.112C426.034,43.28 426.024,43.411 426.006,43.504H414.974C415.123,44.923 415.618,45.987 416.458,46.696C417.316,47.405 418.287,47.76 419.37,47.76C420.34,47.76 421.143,47.545 421.778,47.116C422.412,46.668 422.916,46.117 423.29,45.464L425.782,46.668C425.166,47.788 424.326,48.703 423.262,49.412C422.198,50.103 420.872,50.448 419.286,50.448ZM419.146,37.848C418.138,37.848 417.279,38.156 416.57,38.772C415.86,39.388 415.384,40.209 415.142,41.236H423.066C423.028,40.751 422.87,40.247 422.59,39.724C422.31,39.201 421.88,38.763 421.302,38.408C420.742,38.035 420.023,37.848 419.146,37.848ZM428.302,50V47.48L436.254,38.352H428.554V35.72H439.95V38.24L432.026,47.368H440.174V50H428.302Z"
+      android:fillColor="#3C4043"/>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-eu/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-eu/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..083062e8fd
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-eu/donate_with_googlepay_button_content.xml
@@ -0,0 +1,43 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="498dp"
+    android:height="84dp"
+    android:viewportWidth="498"
+    android:viewportHeight="84">
+  <path
+      android:pathData="M10,4L487,4A4,4 0,0 1,491 8L491,72A4,4 0,0 1,487 76L10,76A4,4 0,0 1,6 72L6,8A4,4 0,0 1,10 4z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M56.416,50V29.952H68.568V32.864H59.496V38.52H67.672V41.432H59.496V47.088H68.568V50H56.416ZM78.402,56.496C77.151,56.496 76.068,56.291 75.154,55.88C74.258,55.488 73.53,54.975 72.97,54.34C72.41,53.724 72.008,53.089 71.766,52.436L74.566,51.26C74.864,52.007 75.34,52.613 75.994,53.08C76.666,53.565 77.468,53.808 78.402,53.808C79.708,53.808 80.735,53.416 81.482,52.632C82.247,51.848 82.63,50.737 82.63,49.3V47.928H82.462C82.014,48.6 81.388,49.141 80.586,49.552C79.802,49.944 78.906,50.14 77.898,50.14C76.684,50.14 75.574,49.832 74.566,49.216C73.558,48.6 72.746,47.741 72.13,46.64C71.514,45.52 71.206,44.213 71.206,42.72C71.206,41.208 71.514,39.901 72.13,38.8C72.746,37.68 73.558,36.812 74.566,36.196C75.574,35.58 76.684,35.272 77.898,35.272C78.906,35.272 79.802,35.477 80.586,35.888C81.388,36.299 82.014,36.84 82.462,37.512H82.63V35.72H85.514V49.244C85.514,50.793 85.206,52.109 84.59,53.192C83.992,54.275 83.162,55.096 82.098,55.656C81.034,56.216 79.802,56.496 78.402,56.496ZM78.43,47.396C79.176,47.396 79.867,47.219 80.502,46.864C81.136,46.491 81.65,45.959 82.042,45.268C82.434,44.559 82.63,43.709 82.63,42.72C82.63,41.693 82.434,40.835 82.042,40.144C81.65,39.435 81.136,38.903 80.502,38.548C79.867,38.193 79.176,38.016 78.43,38.016C77.683,38.016 76.983,38.203 76.33,38.576C75.695,38.931 75.182,39.453 74.79,40.144C74.398,40.835 74.202,41.693 74.202,42.72C74.202,43.728 74.398,44.587 74.79,45.296C75.182,45.987 75.695,46.509 76.33,46.864C76.983,47.219 77.683,47.396 78.43,47.396ZM91.088,33.62C90.527,33.62 90.042,33.424 89.632,33.032C89.24,32.621 89.044,32.136 89.044,31.576C89.044,31.016 89.24,30.54 89.632,30.148C90.042,29.756 90.527,29.56 91.088,29.56C91.647,29.56 92.123,29.756 92.516,30.148C92.926,30.54 93.132,31.016 93.132,31.576C93.132,32.136 92.926,32.621 92.516,33.032C92.123,33.424 91.647,33.62 91.088,33.62ZM89.576,50V35.72H92.6V50H89.576ZM96.651,50V35.72H99.507V37.68H99.675C100.086,36.989 100.693,36.42 101.496,35.972C102.317,35.505 103.213,35.272 104.184,35.272C105.938,35.272 107.254,35.795 108.132,36.84C109.009,37.885 109.448,39.267 109.448,40.984V50H106.452V41.376C106.452,40.219 106.162,39.379 105.584,38.856C105.005,38.315 104.249,38.044 103.316,38.044C102.588,38.044 101.953,38.249 101.412,38.66C100.87,39.052 100.441,39.575 100.124,40.228C99.825,40.881 99.675,41.581 99.675,42.328V50H96.651ZM126.133,50.448C124.845,50.448 123.678,50.131 122.633,49.496C121.606,48.843 120.785,47.947 120.169,46.808C119.572,45.651 119.273,44.335 119.273,42.86C119.273,41.385 119.572,40.079 120.169,38.94C120.785,37.801 121.606,36.905 122.633,36.252C123.678,35.599 124.845,35.272 126.133,35.272C127.234,35.272 128.177,35.515 128.961,36C129.764,36.485 130.352,37.036 130.725,37.652H130.893L130.725,35.664V29.952H133.721V50H130.893V48.096H130.725C130.352,48.712 129.764,49.263 128.961,49.748C128.177,50.215 127.234,50.448 126.133,50.448ZM126.581,47.676C127.328,47.676 128.028,47.48 128.681,47.088C129.353,46.696 129.885,46.145 130.277,45.436C130.688,44.708 130.893,43.849 130.893,42.86C130.893,41.871 130.688,41.021 130.277,40.312C129.885,39.584 129.353,39.024 128.681,38.632C128.028,38.24 127.328,38.044 126.581,38.044C125.834,38.044 125.134,38.24 124.481,38.632C123.828,39.024 123.296,39.584 122.885,40.312C122.474,41.021 122.269,41.871 122.269,42.86C122.269,43.849 122.474,44.708 122.885,45.436C123.296,46.145 123.828,46.696 124.481,47.088C125.134,47.48 125.834,47.676 126.581,47.676ZM144.166,50.448C142.691,50.448 141.394,50.112 140.274,49.44C139.154,48.768 138.277,47.863 137.642,46.724C137.007,45.585 136.69,44.297 136.69,42.86C136.69,41.441 137.007,40.163 137.642,39.024C138.277,37.867 139.154,36.952 140.274,36.28C141.394,35.608 142.691,35.272 144.166,35.272C145.622,35.272 146.91,35.608 148.03,36.28C149.15,36.952 150.027,37.867 150.662,39.024C151.297,40.163 151.614,41.441 151.614,42.86C151.614,44.297 151.297,45.585 150.662,46.724C150.027,47.863 149.15,48.768 148.03,49.44C146.91,50.112 145.622,50.448 144.166,50.448ZM144.166,47.676C144.95,47.676 145.678,47.489 146.35,47.116C147.022,46.724 147.563,46.173 147.974,45.464C148.403,44.736 148.618,43.868 148.618,42.86C148.618,41.852 148.403,40.993 147.974,40.284C147.563,39.556 147.022,39.005 146.35,38.632C145.678,38.24 144.95,38.044 144.166,38.044C143.382,38.044 142.645,38.24 141.954,38.632C141.282,39.005 140.731,39.556 140.302,40.284C139.891,40.993 139.686,41.852 139.686,42.86C139.686,43.868 139.891,44.736 140.302,45.464C140.731,46.173 141.282,46.724 141.954,47.116C142.645,47.489 143.382,47.676 144.166,47.676ZM154.562,50V29.952H157.586V35.44L157.418,37.68H157.586C157.978,36.989 158.576,36.42 159.378,35.972C160.2,35.505 161.105,35.272 162.094,35.272C163.868,35.272 165.202,35.804 166.098,36.868C166.994,37.913 167.442,39.285 167.442,40.984V50H164.446V41.376C164.446,40.219 164.138,39.379 163.522,38.856C162.925,38.315 162.188,38.044 161.31,38.044C160.582,38.044 159.938,38.249 159.378,38.66C158.818,39.071 158.38,39.612 158.062,40.284C157.745,40.937 157.586,41.637 157.586,42.384V50H154.562ZM175.53,50.448C174.503,50.448 173.589,50.252 172.786,49.86C171.983,49.449 171.358,48.88 170.91,48.152C170.462,47.424 170.238,46.593 170.238,45.66C170.238,44.652 170.499,43.793 171.022,43.084C171.563,42.356 172.282,41.805 173.178,41.432C174.074,41.059 175.063,40.872 176.146,40.872C177.042,40.872 177.826,40.956 178.498,41.124C179.189,41.292 179.711,41.469 180.066,41.656V40.9C180.066,39.967 179.73,39.22 179.058,38.66C178.386,38.1 177.518,37.82 176.454,37.82C175.726,37.82 175.035,37.988 174.382,38.324C173.729,38.641 173.206,39.08 172.814,39.64L170.742,38.044C171.358,37.185 172.17,36.513 173.178,36.028C174.205,35.524 175.325,35.272 176.538,35.272C178.61,35.272 180.206,35.785 181.326,36.812C182.446,37.82 183.006,39.239 183.006,41.068V50H180.066V48.236H179.898C179.525,48.815 178.965,49.328 178.218,49.776C177.471,50.224 176.575,50.448 175.53,50.448ZM176.062,47.984C176.846,47.984 177.537,47.797 178.134,47.424C178.731,47.051 179.198,46.565 179.534,45.968C179.889,45.352 180.066,44.689 180.066,43.98C179.637,43.737 179.133,43.541 178.554,43.392C177.975,43.224 177.359,43.14 176.706,43.14C175.474,43.14 174.597,43.392 174.074,43.896C173.551,44.381 173.29,44.979 173.29,45.688C173.29,46.36 173.542,46.911 174.046,47.34C174.55,47.769 175.222,47.984 176.062,47.984ZM188.371,33.62C187.811,33.62 187.326,33.424 186.915,33.032C186.523,32.621 186.327,32.136 186.327,31.576C186.327,31.016 186.523,30.54 186.915,30.148C187.326,29.756 187.811,29.56 188.371,29.56C188.931,29.56 189.407,29.756 189.799,30.148C190.21,30.54 190.415,31.016 190.415,31.576C190.415,32.136 190.21,32.621 189.799,33.032C189.407,33.424 188.931,33.62 188.371,33.62ZM186.859,50V35.72H189.883V50H186.859ZM193.935,50V35.72H196.791V37.68H196.959C197.37,36.989 197.976,36.42 198.779,35.972C199.6,35.505 200.496,35.272 201.467,35.272C203.222,35.272 204.538,35.795 205.415,36.84C206.292,37.885 206.731,39.267 206.731,40.984V50H203.735V41.376C203.735,40.219 203.446,39.379 202.867,38.856C202.288,38.315 201.532,38.044 200.599,38.044C199.871,38.044 199.236,38.249 198.695,38.66C198.154,39.052 197.724,39.575 197.407,40.228C197.108,40.881 196.959,41.581 196.959,42.328V50H193.935ZM211.278,45.856V38.352H208.786V35.72H211.278V31.688H214.302V35.72H217.802V38.352H214.302V45.212C214.302,45.921 214.442,46.463 214.722,46.836C215.021,47.209 215.516,47.396 216.206,47.396C216.561,47.396 216.86,47.349 217.102,47.256C217.364,47.163 217.625,47.032 217.886,46.864V49.804C217.569,49.935 217.233,50.037 216.878,50.112C216.524,50.187 216.104,50.224 215.618,50.224C214.293,50.224 213.238,49.841 212.454,49.076C211.67,48.292 211.278,47.219 211.278,45.856ZM220.549,50V47.48L228.501,38.352H220.801V35.72H232.197V38.24L224.273,47.368H232.421V50H220.549ZM239.756,50.448C238.73,50.448 237.815,50.252 237.012,49.86C236.21,49.449 235.584,48.88 235.136,48.152C234.688,47.424 234.464,46.593 234.464,45.66C234.464,44.652 234.726,43.793 235.248,43.084C235.79,42.356 236.508,41.805 237.404,41.432C238.3,41.059 239.29,40.872 240.372,40.872C241.268,40.872 242.052,40.956 242.724,41.124C243.415,41.292 243.938,41.469 244.292,41.656V40.9C244.292,39.967 243.956,39.22 243.284,38.66C242.612,38.1 241.744,37.82 240.68,37.82C239.952,37.82 239.262,37.988 238.608,38.324C237.955,38.641 237.432,39.08 237.04,39.64L234.968,38.044C235.584,37.185 236.396,36.513 237.404,36.028C238.431,35.524 239.551,35.272 240.764,35.272C242.836,35.272 244.432,35.785 245.552,36.812C246.672,37.82 247.232,39.239 247.232,41.068V50H244.292V48.236H244.124C243.751,48.815 243.191,49.328 242.444,49.776C241.698,50.224 240.802,50.448 239.756,50.448ZM240.288,47.984C241.072,47.984 241.763,47.797 242.36,47.424C242.958,47.051 243.424,46.565 243.76,45.968C244.115,45.352 244.292,44.689 244.292,43.98C243.863,43.737 243.359,43.541 242.78,43.392C242.202,43.224 241.586,43.14 240.932,43.14C239.7,43.14 238.823,43.392 238.3,43.896C237.778,44.381 237.516,44.979 237.516,45.688C237.516,46.36 237.768,46.911 238.272,47.34C238.776,47.769 239.448,47.984 240.288,47.984ZM250.862,50V29.952H253.886V41.768L259.934,35.72H263.686V35.888L258.17,41.348L263.882,49.832V50H260.298L256.042,43.448L253.886,45.576V50H250.862Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M314.529,29.347V37.513H319.565C320.765,37.513 321.757,37.11 322.541,36.303C323.347,35.499 323.75,34.539 323.75,33.429C323.75,32.341 323.347,31.392 322.541,30.586C321.757,29.759 320.765,29.345 319.565,29.345H314.529V29.347ZM314.529,40.387V49.86H311.521V26.472H319.499C321.527,26.472 323.248,27.148 324.666,28.497C326.105,29.847 326.824,31.491 326.824,33.429C326.824,35.411 326.105,37.067 324.666,38.394C323.27,39.723 321.547,40.385 319.499,40.385H314.529V40.387Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M329.864,44.96C329.864,45.744 330.197,46.397 330.862,46.92C331.527,47.443 332.306,47.704 333.2,47.704C334.465,47.704 335.591,47.235 336.584,46.3C337.576,45.363 338.071,44.264 338.071,43.002C337.133,42.261 335.825,41.892 334.147,41.892C332.925,41.892 331.907,42.187 331.09,42.775C330.273,43.362 329.864,44.089 329.864,44.96M333.756,33.332C335.98,33.332 337.735,33.925 339.022,35.112C340.308,36.299 340.95,37.927 340.95,39.995V49.86H338.073V47.639H337.942C336.699,49.468 335.042,50.382 332.972,50.382C331.206,50.382 329.728,49.86 328.541,48.815C327.353,47.769 326.759,46.463 326.759,44.895C326.759,43.239 327.385,41.923 328.638,40.943C329.892,39.964 331.565,39.473 333.658,39.473C335.444,39.473 336.916,39.799 338.071,40.452V39.766C338.071,38.72 337.656,37.834 336.829,37.104C335.999,36.374 335.031,36.01 333.919,36.01C332.239,36.01 330.911,36.718 329.93,38.134L327.28,36.467C328.741,34.377 330.899,33.332 333.756,33.332"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M357.463,33.854L347.423,56.915H344.318L348.046,48.846L341.44,33.854H344.71L349.484,45.352H349.55L354.193,33.854H357.463Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M302.373,38.345C302.373,37.399 302.293,36.486 302.141,35.613H289.454V40.789H296.72C296.408,42.476 295.465,43.911 294.033,44.873V48.234H298.37C300.91,45.894 302.373,42.435 302.373,38.345"
+      android:fillColor="#4285F4"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M289.454,51.478C293.084,51.478 296.141,50.287 298.37,48.234L294.033,44.873C292.826,45.684 291.272,46.159 289.454,46.159C285.944,46.159 282.966,43.796 281.901,40.611H277.433V44.074C279.647,48.464 284.197,51.478 289.454,51.478"
+      android:fillColor="#34A853"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M281.901,40.611C281.628,39.799 281.479,38.933 281.479,38.039C281.479,37.145 281.628,36.279 281.901,35.467V32.005H277.433C276.518,33.819 276,35.868 276,38.039C276,40.21 276.518,42.259 277.433,44.074L281.901,40.611Z"
+      android:fillColor="#FABB05"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M289.454,29.92C291.436,29.92 293.213,30.601 294.615,31.935V31.937L298.455,28.102C296.123,25.933 293.082,24.6 289.454,24.6C284.197,24.6 279.647,27.615 277.433,32.005L281.901,35.467C282.966,32.283 285.944,29.92 289.454,29.92"
+      android:fillColor="#E94235"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M378.38,50.448C377.279,50.448 376.327,50.215 375.524,49.748C374.74,49.263 374.161,48.712 373.788,48.096H373.62V50H370.764V29.952H373.788V35.664L373.62,37.652H373.788C374.161,37.036 374.74,36.485 375.524,36C376.327,35.515 377.279,35.272 378.38,35.272C379.687,35.272 380.853,35.599 381.88,36.252C382.907,36.905 383.719,37.801 384.316,38.94C384.932,40.079 385.24,41.385 385.24,42.86C385.24,44.335 384.932,45.651 384.316,46.808C383.719,47.947 382.907,48.843 381.88,49.496C380.853,50.131 379.687,50.448 378.38,50.448ZM377.932,47.676C378.679,47.676 379.379,47.48 380.032,47.088C380.685,46.696 381.217,46.145 381.628,45.436C382.039,44.708 382.244,43.849 382.244,42.86C382.244,41.871 382.039,41.021 381.628,40.312C381.217,39.584 380.685,39.024 380.032,38.632C379.379,38.24 378.679,38.044 377.932,38.044C377.185,38.044 376.485,38.24 375.832,38.632C375.179,39.024 374.647,39.584 374.236,40.312C373.825,41.021 373.62,41.871 373.62,42.86C373.62,43.849 373.825,44.708 374.236,45.436C374.647,46.145 375.179,46.696 375.832,47.088C376.485,47.48 377.185,47.676 377.932,47.676ZM389.917,33.62C389.357,33.62 388.872,33.424 388.461,33.032C388.069,32.621 387.873,32.136 387.873,31.576C387.873,31.016 388.069,30.54 388.461,30.148C388.872,29.756 389.357,29.56 389.917,29.56C390.477,29.56 390.953,29.756 391.345,30.148C391.756,30.54 391.961,31.016 391.961,31.576C391.961,32.136 391.756,32.621 391.345,33.032C390.953,33.424 390.477,33.62 389.917,33.62ZM388.405,50V35.72H391.429V50H388.405ZM401.448,50.448C400.16,50.448 398.994,50.131 397.948,49.496C396.922,48.843 396.1,47.947 395.484,46.808C394.887,45.651 394.588,44.335 394.588,42.86C394.588,41.385 394.887,40.079 395.484,38.94C396.1,37.801 396.922,36.905 397.948,36.252C398.994,35.599 400.16,35.272 401.448,35.272C402.55,35.272 403.492,35.515 404.276,36C405.079,36.485 405.667,37.036 406.04,37.652H406.208L406.04,35.664V29.952H409.036V50H406.208V48.096H406.04C405.667,48.712 405.079,49.263 404.276,49.748C403.492,50.215 402.55,50.448 401.448,50.448ZM401.896,47.676C402.643,47.676 403.343,47.48 403.996,47.088C404.668,46.696 405.2,46.145 405.592,45.436C406.003,44.708 406.208,43.849 406.208,42.86C406.208,41.871 406.003,41.021 405.592,40.312C405.2,39.584 404.668,39.024 403.996,38.632C403.343,38.24 402.643,38.044 401.896,38.044C401.15,38.044 400.45,38.24 399.796,38.632C399.143,39.024 398.611,39.584 398.2,40.312C397.79,41.021 397.584,41.871 397.584,42.86C397.584,43.849 397.79,44.708 398.2,45.436C398.611,46.145 399.143,46.696 399.796,47.088C400.45,47.48 401.15,47.676 401.896,47.676ZM419.286,50.448C417.886,50.448 416.635,50.121 415.534,49.468C414.432,48.815 413.564,47.919 412.93,46.78C412.314,45.641 412.006,44.344 412.006,42.888C412.006,41.525 412.304,40.265 412.902,39.108C413.499,37.951 414.33,37.027 415.394,36.336C416.476,35.627 417.718,35.272 419.118,35.272C420.592,35.272 421.843,35.589 422.87,36.224C423.915,36.859 424.708,37.727 425.25,38.828C425.791,39.929 426.062,41.171 426.062,42.552C426.062,42.757 426.052,42.944 426.034,43.112C426.034,43.28 426.024,43.411 426.006,43.504H414.974C415.123,44.923 415.618,45.987 416.458,46.696C417.316,47.405 418.287,47.76 419.37,47.76C420.34,47.76 421.143,47.545 421.778,47.116C422.412,46.668 422.916,46.117 423.29,45.464L425.782,46.668C425.166,47.788 424.326,48.703 423.262,49.412C422.198,50.103 420.872,50.448 419.286,50.448ZM419.146,37.848C418.138,37.848 417.279,38.156 416.57,38.772C415.86,39.388 415.384,40.209 415.142,41.236H423.066C423.028,40.751 422.87,40.247 422.59,39.724C422.31,39.201 421.88,38.763 421.302,38.408C420.742,38.035 420.023,37.848 419.146,37.848ZM428.302,50V47.48L436.254,38.352H428.554V35.72H439.95V38.24L432.026,47.368H440.174V50H428.302Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-fi-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-fi-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..bbeb11feda
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-fi-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,15 @@
+<vector android:width="242dp" android:height="38dp" android:viewportWidth="242" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.3555 30V9.952h3.08v17.136h8.624V30H3.3555zm19.1237.448c-1.0267 0-1.9414-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6906.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6534.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0266-.504 2.1466-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3734.5787-.9334 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4746-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3546-.616.532-1.2787.532-1.988-.4294-.2427-.9334-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1094.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM33.5843 30V9.952h3.024v5.488l-.168 2.24h.168c.392-.6907.9893-1.26 1.792-1.708.8213-.4667 1.7267-.7 2.716-.7 1.7733 0 3.108.532 4.004 1.596.896 1.0453 1.344 2.4173 1.344 4.116V30h-2.996v-8.624c0-1.1573-.308-1.9973-.924-2.52-.5973-.5413-1.3347-.812-2.212-.812-.728 0-1.372.2053-1.932.616-.56.4107-.9987.952-1.316 1.624-.3173.6533-.476 1.3533-.476 2.1V30h-3.024zm18.3602-16.38c-.56 0-1.0453-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.4107-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.4107.392.616.868.616 1.428 0 .56-.2053 1.0453-.616 1.456-.392.392-.868.588-1.428.588zm-2.716 22.708c-.5786 0-1.1013-.0653-1.568-.196V33.22c.1867.112.4014.196.644.252.224.0747.448.112.672.112.5414 0 .9147-.168 1.12-.504.224-.3173.336-.784.336-1.4V15.72h3.024v15.988c0 1.6427-.4013 2.8187-1.204 3.528-.8026.728-1.8106 1.092-3.024 1.092zm14.8633-5.88c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6347 1.1387.952 2.4173.952 3.836 0 1.4373-.3173 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM76.0875 13.62c-.56 0-1.0453-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.4107-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.4107.392.616.868.616 1.428 0 .56-.2053 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM74.5755 30V15.72h3.024V30h-3.024zm8.4513-4.144v-7.504h-2.492V15.72h2.492v-4.032h3.024v4.032h3.5v2.632h-3.5v6.86c0 .7093.14 1.2507.42 1.624.2987.3733.7933.56 1.484.56.3547 0 .6533-.0467.896-.14.2613-.0933.5227-.224.784-.392v2.94c-.3173.1307-.6533.2333-1.008.308-.3547.0747-.7747.112-1.26.112-1.3253 0-2.38-.3827-3.164-1.148-.784-.784-1.176-1.8573-1.176-3.22zm13.932 4.592c-1.0266 0-1.9413-.196-2.744-.588-.8026-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2614-1.8667.784-2.576.5414-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8854-.56 2.968-.56.896 0 1.68.084 2.352.252.6912.168 1.2132.3453 1.5682.532V20.9c0-.9333-.336-1.68-1.008-2.24-.6722-.56-1.5402-.84-2.6042-.84-.728 0-1.4186.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.0722 0 3.6682.5133 4.7882 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.373.5787-.933 1.092-1.6802 1.54-.7466.448-1.6426.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5972-.3733 1.0642-.8587 1.4002-1.456.355-.616.532-1.2787.532-1.988-.429-.2427-.933-.4387-1.5122-.588-.5786-.168-1.1946-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5226.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M156.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM171.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM199.463 13.9543l-10.04 23.0611h-3.105l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M144.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M131.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M123.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M131.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C138.123 6.03271 135.082 4.7 131.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+  <path android:pathData="M212.792 30V9.952h3.024V30h-3.024zm6.917 0V9.952h3.024V30h-3.024zm11.233.448c-1.027 0-1.942-.196-2.744-.588-.803-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.261-1.8667.784-2.576.541-.728 1.26-1.2787 2.156-1.652.896-.3733 1.885-.56 2.968-.56.896 0 1.68.084 2.352.252.69.168 1.213.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.419.168-2.072.504-.654.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.026-.504 2.146-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.374.5787-.934 1.092-1.68 1.54-.747.448-1.643.672-2.688.672zm.532-2.464c.784 0 1.474-.1867 2.072-.56.597-.3733 1.064-.8587 1.4-1.456.354-.616.532-1.2787.532-1.988-.43-.2427-.934-.4387-1.512-.588-.579-.168-1.195-.252-1.848-.252-1.232 0-2.11.252-2.632.756-.523.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644z" android:fillColor="#3c4043"/>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-fi/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-fi/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..c0022bfc21
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-fi/donate_with_googlepay_button_content.xml
@@ -0,0 +1,15 @@
+<vector android:width="242dp" android:height="38dp" android:viewportWidth="242" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.3555 30V9.952h3.08v17.136h8.624V30H3.3555zm19.1237.448c-1.0267 0-1.9414-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6906.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6534.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0266-.504 2.1466-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3734.5787-.9334 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4746-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3546-.616.532-1.2787.532-1.988-.4294-.2427-.9334-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1094.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM33.5843 30V9.952h3.024v5.488l-.168 2.24h.168c.392-.6907.9893-1.26 1.792-1.708.8213-.4667 1.7267-.7 2.716-.7 1.7733 0 3.108.532 4.004 1.596.896 1.0453 1.344 2.4173 1.344 4.116V30h-2.996v-8.624c0-1.1573-.308-1.9973-.924-2.52-.5973-.5413-1.3347-.812-2.212-.812-.728 0-1.372.2053-1.932.616-.56.4107-.9987.952-1.316 1.624-.3173.6533-.476 1.3533-.476 2.1V30h-3.024zm18.3602-16.38c-.56 0-1.0453-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.4107-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.4107.392.616.868.616 1.428 0 .56-.2053 1.0453-.616 1.456-.392.392-.868.588-1.428.588zm-2.716 22.708c-.5786 0-1.1013-.0653-1.568-.196V33.22c.1867.112.4014.196.644.252.224.0747.448.112.672.112.5414 0 .9147-.168 1.12-.504.224-.3173.336-.784.336-1.4V15.72h3.024v15.988c0 1.6427-.4013 2.8187-1.204 3.528-.8026.728-1.8106 1.092-3.024 1.092zm14.8633-5.88c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6347 1.1387.952 2.4173.952 3.836 0 1.4373-.3173 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM76.0875 13.62c-.56 0-1.0453-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.4107-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.4107.392.616.868.616 1.428 0 .56-.2053 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM74.5755 30V15.72h3.024V30h-3.024zm8.4513-4.144v-7.504h-2.492V15.72h2.492v-4.032h3.024v4.032h3.5v2.632h-3.5v6.86c0 .7093.14 1.2507.42 1.624.2987.3733.7933.56 1.484.56.3547 0 .6533-.0467.896-.14.2613-.0933.5227-.224.784-.392v2.94c-.3173.1307-.6533.2333-1.008.308-.3547.0747-.7747.112-1.26.112-1.3253 0-2.38-.3827-3.164-1.148-.784-.784-1.176-1.8573-1.176-3.22zm13.932 4.592c-1.0266 0-1.9413-.196-2.744-.588-.8026-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2614-1.8667.784-2.576.5414-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8854-.56 2.968-.56.896 0 1.68.084 2.352.252.6912.168 1.2132.3453 1.5682.532V20.9c0-.9333-.336-1.68-1.008-2.24-.6722-.56-1.5402-.84-2.6042-.84-.728 0-1.4186.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.0722 0 3.6682.5133 4.7882 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.373.5787-.933 1.092-1.6802 1.54-.7466.448-1.6426.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5972-.3733 1.0642-.8587 1.4002-1.456.355-.616.532-1.2787.532-1.988-.429-.2427-.933-.4387-1.5122-.588-.5786-.168-1.1946-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5226.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M156.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM171.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM199.463 13.8543l-10.04 23.0611h-3.105l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M144.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M131.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M123.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M131.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+  <path android:pathData="M212.792 30V9.952h3.024V30h-3.024zm6.917 0V9.952h3.024V30h-3.024zm11.233.448c-1.027 0-1.942-.196-2.744-.588-.803-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.261-1.8667.784-2.576.541-.728 1.26-1.2787 2.156-1.652.896-.3733 1.885-.56 2.968-.56.896 0 1.68.084 2.352.252.69.168 1.213.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.419.168-2.072.504-.654.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.026-.504 2.146-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.374.5787-.934 1.092-1.68 1.54-.747.448-1.643.672-2.688.672zm.532-2.464c.784 0 1.474-.1867 2.072-.56.597-.3733 1.064-.8587 1.4-1.456.354-.616.532-1.2787.532-1.988-.43-.2427-.934-.4387-1.512-.588-.579-.168-1.195-.252-1.848-.252-1.232 0-2.11.252-2.632.756-.523.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644z" android:fillColor="#ffffff"/>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-fr-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-fr-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..d5854fee3b
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-fr-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="328dp" android:height="38dp" android:viewportWidth="328" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.88597 30V9.952H16.038v2.912H6.96597v5.88H15.142v2.912H6.96597V30h-3.08zm19.17833.448c-1.0267 0-1.9413-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM35.9055 13.62c-.56 0-1.0454-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.4106-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.4106.392.616.868.616 1.428 0 .56-.2054 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM34.3935 30V15.72h3.024V30h-3.024zm7.076 0V15.72h2.856v2.1h.168c.3173-.728.8586-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7186.028.98.084.28.056.532.1213.756.196v3.136c-.3547-.1493-.7187-.2707-1.092-.364-.3547-.0933-.728-.14-1.12-.14-.7094 0-1.344.196-1.904.588-.5414.3733-.9707.8867-1.288 1.54-.3174.6347-.476 1.3347-.476 2.1V30h-3.024zm17.2146.448c-1.4 0-2.6507-.3267-3.752-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2987-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0827-.7093 2.324-1.064 3.724-1.064 1.4747 0 2.7253.3173 3.752.952 1.0453.6347 1.8387 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0093.392-.028.56 0 .168-.0093.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8587.7093 1.8293 1.064 2.912 1.064.9707 0 1.7733-.2147 2.408-.644.6347-.448 1.1387-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3893 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7093.616-1.1853 1.4373-1.428 2.464h7.924c-.0373-.4853-.196-.9893-.476-1.512-.28-.5227-.7093-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zm22.0366 12.6c-1.7546 0-3.08-.5227-3.976-1.568-.8773-1.064-1.316-2.5013-1.316-4.312V15.72h3.024v8.428c0 1.2133.28 2.1093.84 2.688.5787.56 1.2974.84 2.156.84.7654 0 1.428-.196 1.988-.588.5787-.4107 1.0174-.9333 1.316-1.568.3174-.6533.476-1.3627.476-2.128V15.72h2.996V30h-2.828v-1.932h-.168c-.4106.672-1.0266 1.2413-1.848 1.708-.8026.448-1.6893.672-2.66.672zM91.9429 30V15.72h2.856v1.96h.168c.4107-.6907 1.0173-1.26 1.82-1.708.8213-.4667 1.7173-.7 2.688-.7 1.7551 0 3.0711.5227 3.9481 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.289-1.9973-.868-2.52-.579-.5413-1.3348-.812-2.2681-.812-.728 0-1.3627.2053-1.904.616-.5413.392-.9707.9147-1.288 1.568-.2987.6533-.448 1.3533-.448 2.1V30h-3.024zm29.4811.448c-1.288 0-2.454-.3173-3.5-.952-1.026-.6533-1.848-1.5493-2.464-2.688-.597-1.1573-.896-2.4733-.896-3.948s.299-2.7813.896-3.92c.616-1.1387 1.438-2.0347 2.464-2.688 1.046-.6533 2.212-.98 3.5-.98 1.102 0 2.044.2427 2.828.728.803.4853 1.391 1.036 1.764 1.652h.168l-.168-1.988V9.952h2.996V30h-2.828v-1.904h-.168c-.373.616-.961 1.1667-1.764 1.652-.784.4667-1.726.7-2.828.7zm.448-2.772c.747 0 1.447-.196 2.1-.588.672-.392 1.204-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.392-.728-.924-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.746 0-1.446.196-2.1.588-.653.392-1.185.952-1.596 1.68-.41.7093-.616 1.5587-.616 2.548 0 .9893.206 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.654.392 1.354.588 2.1.588zm17.585 2.772c-1.474 0-2.772-.336-3.892-1.008-1.12-.672-1.997-1.5773-2.632-2.716-.634-1.1387-.952-2.4267-.952-3.864 0-1.4187.318-2.6973.952-3.836.635-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.418-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.998 1.5867 2.632 2.744.635 1.1387.952 2.4173.952 3.836 0 1.4373-.317 2.7253-.952 3.864-.634 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.214-.9427 1.624-1.652.43-.728.644-1.596.644-2.604s-.214-1.8667-.644-2.576c-.41-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.521.196-2.212.588-.672.3733-1.222.924-1.652 1.652-.41.7093-.616 1.568-.616 2.576s.206 1.876.616 2.604c.43.7093.98 1.26 1.652 1.652.691.3733 1.428.56 2.212.56zM149.717 30V15.72h2.856v1.96h.168c.411-.6907 1.017-1.26 1.82-1.708.821-.4667 1.717-.7 2.688-.7 1.755 0 3.071.5227 3.948 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.289-1.9973-.868-2.52-.579-.5413-1.335-.812-2.268-.812-.728 0-1.363.2053-1.904.616-.541.392-.971.9147-1.288 1.568-.299.6533-.448 1.3533-.448 2.1V30h-3.024zm27.857.448c-1.026 0-1.941-.196-2.744-.588-.802-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.262-1.8667.784-2.576.542-.728 1.26-1.2787 2.156-1.652.896-.3733 1.886-.56 2.968-.56.896 0 1.68.084 2.352.252.691.168 1.214.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.418.168-2.072.504-.653.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.027-.504 2.147-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.373.5787-.933 1.092-1.68 1.54-.746.448-1.642.672-2.688.672zm.532-2.464c.784 0 1.475-.1867 2.072-.56.598-.3733 1.064-.8587 1.4-1.456.355-.616.532-1.2787.532-1.988-.429-.2427-.933-.4387-1.512-.588-.578-.168-1.194-.252-1.848-.252-1.232 0-2.109.252-2.632.756-.522.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM192.746 30l-5.908-14.28h3.36l4.004 10.388h.14l4.088-10.388h3.304L195.77 30h-3.024zm17.359.448c-1.4 0-2.65-.3267-3.752-.98-1.101-.6533-1.969-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.598-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.726.3173 3.752.952 1.046.6347 1.839 1.5027 2.38 2.604.542 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.15 1.4187.644 2.4827 1.484 3.192.859.7093 1.83 1.064 2.912 1.064.971 0 1.774-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.866.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.278-.56-2.156-.56zm16.766 12.6c-1.437 0-2.706-.3267-3.808-.98-1.101-.6533-1.969-1.5493-2.604-2.688-.634-1.1573-.952-2.464-.952-3.92s.318-2.7533.952-3.892c.635-1.1573 1.503-2.0627 2.604-2.716 1.102-.6533 2.371-.98 3.808-.98 1.587 0 2.922.3547 4.004 1.064 1.102.7093 1.886 1.6707 2.352 2.884l-2.744 1.12c-.653-1.5307-1.876-2.296-3.668-2.296-.784 0-1.502.2053-2.156.616-.653.392-1.176.952-1.568 1.68-.392.7093-.588 1.5493-.588 2.52 0 .9707.196 1.82.588 2.548.392.728.915 1.288 1.568 1.68.654.392 1.372.588 2.156.588.915 0 1.69-.2053 2.324-.616.635-.4293 1.13-1.008 1.484-1.736l2.688 1.176c-.504 1.1387-1.306 2.0813-2.408 2.828-1.101.7467-2.445 1.12-4.032 1.12z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M284.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM299.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM327.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M272.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M259.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M251.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M259.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C266.123 6.03271 263.082 4.7 259.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-fr/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-fr/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..2cf102c30a
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-fr/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="328dp" android:height="38dp" android:viewportWidth="328" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.88597 30V9.952H16.038v2.912H6.96597v5.88H15.142v2.912H6.96597V30h-3.08zm19.17833.448c-1.0267 0-1.9413-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM35.9055 13.62c-.56 0-1.0454-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.4106-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.4106.392.616.868.616 1.428 0 .56-.2054 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM34.3935 30V15.72h3.024V30h-3.024zm7.076 0V15.72h2.856v2.1h.168c.3173-.728.8586-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7186.028.98.084.28.056.532.1213.756.196v3.136c-.3547-.1493-.7187-.2707-1.092-.364-.3547-.0933-.728-.14-1.12-.14-.7094 0-1.344.196-1.904.588-.5414.3733-.9707.8867-1.288 1.54-.3174.6347-.476 1.3347-.476 2.1V30h-3.024zm17.2146.448c-1.4 0-2.6507-.3267-3.752-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2987-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0827-.7093 2.324-1.064 3.724-1.064 1.4747 0 2.7253.3173 3.752.952 1.0453.6347 1.8387 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0093.392-.028.56 0 .168-.0093.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8587.7093 1.8293 1.064 2.912 1.064.9707 0 1.7733-.2147 2.408-.644.6347-.448 1.1387-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3893 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7093.616-1.1853 1.4373-1.428 2.464h7.924c-.0373-.4853-.196-.9893-.476-1.512-.28-.5227-.7093-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zm22.0366 12.6c-1.7546 0-3.08-.5227-3.976-1.568-.8773-1.064-1.316-2.5013-1.316-4.312V15.72h3.024v8.428c0 1.2133.28 2.1093.84 2.688.5787.56 1.2974.84 2.156.84.7654 0 1.428-.196 1.988-.588.5787-.4107 1.0174-.9333 1.316-1.568.3174-.6533.476-1.3627.476-2.128V15.72h2.996V30h-2.828v-1.932h-.168c-.4106.672-1.0266 1.2413-1.848 1.708-.8026.448-1.6893.672-2.66.672zM91.9429 30V15.72h2.856v1.96h.168c.4107-.6907 1.0173-1.26 1.82-1.708.8213-.4667 1.7173-.7 2.688-.7 1.7551 0 3.0711.5227 3.9481 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.289-1.9973-.868-2.52-.579-.5413-1.3348-.812-2.2681-.812-.728 0-1.3627.2053-1.904.616-.5413.392-.9707.9147-1.288 1.568-.2987.6533-.448 1.3533-.448 2.1V30h-3.024zm29.4811.448c-1.288 0-2.454-.3173-3.5-.952-1.026-.6533-1.848-1.5493-2.464-2.688-.597-1.1573-.896-2.4733-.896-3.948s.299-2.7813.896-3.92c.616-1.1387 1.438-2.0347 2.464-2.688 1.046-.6533 2.212-.98 3.5-.98 1.102 0 2.044.2427 2.828.728.803.4853 1.391 1.036 1.764 1.652h.168l-.168-1.988V9.952h2.996V30h-2.828v-1.904h-.168c-.373.616-.961 1.1667-1.764 1.652-.784.4667-1.726.7-2.828.7zm.448-2.772c.747 0 1.447-.196 2.1-.588.672-.392 1.204-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.392-.728-.924-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.746 0-1.446.196-2.1.588-.653.392-1.185.952-1.596 1.68-.41.7093-.616 1.5587-.616 2.548 0 .9893.206 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.654.392 1.354.588 2.1.588zm17.585 2.772c-1.474 0-2.772-.336-3.892-1.008-1.12-.672-1.997-1.5773-2.632-2.716-.634-1.1387-.952-2.4267-.952-3.864 0-1.4187.318-2.6973.952-3.836.635-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.418-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.998 1.5867 2.632 2.744.635 1.1387.952 2.4173.952 3.836 0 1.4373-.317 2.7253-.952 3.864-.634 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.214-.9427 1.624-1.652.43-.728.644-1.596.644-2.604s-.214-1.8667-.644-2.576c-.41-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.521.196-2.212.588-.672.3733-1.222.924-1.652 1.652-.41.7093-.616 1.568-.616 2.576s.206 1.876.616 2.604c.43.7093.98 1.26 1.652 1.652.691.3733 1.428.56 2.212.56zM149.717 30V15.72h2.856v1.96h.168c.411-.6907 1.017-1.26 1.82-1.708.821-.4667 1.717-.7 2.688-.7 1.755 0 3.071.5227 3.948 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.289-1.9973-.868-2.52-.579-.5413-1.335-.812-2.268-.812-.728 0-1.363.2053-1.904.616-.541.392-.971.9147-1.288 1.568-.299.6533-.448 1.3533-.448 2.1V30h-3.024zm27.857.448c-1.026 0-1.941-.196-2.744-.588-.802-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.262-1.8667.784-2.576.542-.728 1.26-1.2787 2.156-1.652.896-.3733 1.886-.56 2.968-.56.896 0 1.68.084 2.352.252.691.168 1.214.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.418.168-2.072.504-.653.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.027-.504 2.147-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.373.5787-.933 1.092-1.68 1.54-.746.448-1.642.672-2.688.672zm.532-2.464c.784 0 1.475-.1867 2.072-.56.598-.3733 1.064-.8587 1.4-1.456.355-.616.532-1.2787.532-1.988-.429-.2427-.933-.4387-1.512-.588-.578-.168-1.194-.252-1.848-.252-1.232 0-2.109.252-2.632.756-.522.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM192.746 30l-5.908-14.28h3.36l4.004 10.388h.14l4.088-10.388h3.304L195.77 30h-3.024zm17.359.448c-1.4 0-2.65-.3267-3.752-.98-1.101-.6533-1.969-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.598-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.726.3173 3.752.952 1.046.6347 1.839 1.5027 2.38 2.604.542 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.15 1.4187.644 2.4827 1.484 3.192.859.7093 1.83 1.064 2.912 1.064.971 0 1.774-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.866.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.278-.56-2.156-.56zm16.766 12.6c-1.437 0-2.706-.3267-3.808-.98-1.101-.6533-1.969-1.5493-2.604-2.688-.634-1.1573-.952-2.464-.952-3.92s.318-2.7533.952-3.892c.635-1.1573 1.503-2.0627 2.604-2.716 1.102-.6533 2.371-.98 3.808-.98 1.587 0 2.922.3547 4.004 1.064 1.102.7093 1.886 1.6707 2.352 2.884l-2.744 1.12c-.653-1.5307-1.876-2.296-3.668-2.296-.784 0-1.502.2053-2.156.616-.653.392-1.176.952-1.568 1.68-.392.7093-.588 1.5493-.588 2.52 0 .9707.196 1.82.588 2.548.392.728.915 1.288 1.568 1.68.654.392 1.372.588 2.156.588.915 0 1.69-.2053 2.324-.616.635-.4293 1.13-1.008 1.484-1.736l2.688 1.176c-.504 1.1387-1.306 2.0813-2.408 2.828-1.101.7467-2.445 1.12-4.032 1.12z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M284.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM299.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM327.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M272.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M259.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M251.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M259.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-hdpi/googlepay_button_background_image.9.png b/donations/lib/src/gms/res/drawable-hdpi/googlepay_button_background_image.9.png
new file mode 100755
index 0000000000..7091d810af
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-hdpi/googlepay_button_background_image.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-hdpi/googlepay_button_background_image_focused.9.png b/donations/lib/src/gms/res/drawable-hdpi/googlepay_button_background_image_focused.9.png
new file mode 100755
index 0000000000..342f248e86
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-hdpi/googlepay_button_background_image_focused.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-hdpi/googlepay_button_background_image_pressed.9.png b/donations/lib/src/gms/res/drawable-hdpi/googlepay_button_background_image_pressed.9.png
new file mode 100755
index 0000000000..337c9325c9
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-hdpi/googlepay_button_background_image_pressed.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-hdpi/googlepay_button_no_shadow_background_image.9.png b/donations/lib/src/gms/res/drawable-hdpi/googlepay_button_no_shadow_background_image.9.png
new file mode 100755
index 0000000000..4f9bc6ba76
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-hdpi/googlepay_button_no_shadow_background_image.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-hdpi/googlepay_button_no_shadow_background_image_focused.9.png b/donations/lib/src/gms/res/drawable-hdpi/googlepay_button_no_shadow_background_image_focused.9.png
new file mode 100755
index 0000000000..b82ca103aa
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-hdpi/googlepay_button_no_shadow_background_image_focused.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-hdpi/googlepay_button_no_shadow_background_image_pressed.9.png b/donations/lib/src/gms/res/drawable-hdpi/googlepay_button_no_shadow_background_image_pressed.9.png
new file mode 100755
index 0000000000..35a44a23c6
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-hdpi/googlepay_button_no_shadow_background_image_pressed.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-hr-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-hr-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..9f911c374a
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-hr-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="260dp" android:height="38dp" android:viewportWidth="260" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M2.90159 30V9.952h6.412c2.10931 0 3.92001.4293 5.43201 1.288 1.5307.84 2.7067 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8213 1.4933-1.9973 2.6693-3.528 3.528-1.512.84-3.3227 1.26-5.43201 1.26h-6.412zm3.08-2.912h3.248c2.27731 0 4.04131-.6347 5.29201-1.904 1.2693-1.2693 1.904-3.0053 1.904-5.208s-.6347-3.9387-1.904-5.208c-1.2507-1.2693-3.0147-1.904-5.29201-1.904h-3.248v14.224zm23.17821 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9974-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6346-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6346 1.1387.952 2.4173.952 3.836 0 1.4373-.3174 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5214.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6906.3733 1.428.56 2.212.56zM39.4195 30V15.72h2.856v1.96h.168c.4106-.6907 1.0173-1.26 1.82-1.708.8213-.4667 1.7173-.7 2.688-.7 1.7546 0 3.0706.5227 3.948 1.568.8773 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2894-1.9973-.868-2.52-.5787-.5413-1.3347-.812-2.268-.812-.728 0-1.3627.2053-1.904.616-.5414.392-.9707.9147-1.288 1.568-.2987.6533-.448 1.3533-.448 2.1V30h-3.024zm18.2782-16.38c-.56 0-1.0454-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.4106-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.4106.392.616.868.616 1.428 0 .56-.2054 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM56.1857 30V15.72h3.024V30h-3.024zm7.076 0V15.72h2.856v2.1h.168c.3173-.728.8586-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7186.028.98.084.28.056.532.1213.756.196v3.136c-.3547-.1493-.7187-.2707-1.092-.364-.3547-.0933-.728-.14-1.12-.14-.7094 0-1.344.196-1.904.588-.5414.3733-.9707.8867-1.288 1.54-.3174.6347-.476 1.3347-.476 2.1V30h-3.024zm15.526.448c-1.0266 0-1.9413-.196-2.744-.588-.8026-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2614-1.8667.784-2.576.5414-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8854-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2134.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4186.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7466.448-1.6426.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5974-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5786-.168-1.1946-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5226.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM89.8929 30V15.72h2.856v1.96h.168c.4107-.6907 1.0173-1.26 1.82-1.708.8213-.4667 1.7173-.7 2.688-.7 1.7547 0 3.0711.5227 3.9481 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.9961v-8.624c0-1.1573-.2893-1.9973-.868-2.52-.5787-.5413-1.3347-.812-2.268-.812-.728 0-1.3627.2053-1.904.616-.5413.392-.9707.9147-1.288 1.568-.2987.6533-.448 1.3533-.448 2.1V30h-3.024zm18.2781-16.38c-.56 0-1.045-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.411-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.411.392.616.868.616 1.428 0 .56-.205 1.0453-.616 1.456-.392.392-.868.588-1.428.588zm-2.716 22.708c-.579 0-1.101-.0653-1.568-.196V33.22c.187.112.401.196.644.252.224.0747.448.112.672.112.541 0 .915-.168 1.12-.504.224-.3173.336-.784.336-1.4V15.72h3.024v15.988c0 1.6427-.401 2.8187-1.204 3.528-.803.728-1.811 1.092-3.024 1.092zm14.667-5.88c-1.4 0-2.65-.3267-3.752-.98-1.101-.6533-1.969-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.598-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.726.3173 3.752.952 1.046.6347 1.839 1.5027 2.38 2.604.542 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392H115.81c.15 1.4187.644 2.4827 1.484 3.192.859.7093 1.83 1.064 2.912 1.064.971 0 1.774-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.866.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.278-.56-2.156-.56zm22.037 12.6c-1.755 0-3.08-.5227-3.976-1.568-.877-1.064-1.316-2.5013-1.316-4.312V15.72h3.024v8.428c0 1.2133.28 2.1093.84 2.688.579.56 1.297.84 2.156.84.765 0 1.428-.196 1.988-.588.579-.4107 1.017-.9333 1.316-1.568.317-.6533.476-1.3627.476-2.128V15.72h2.996V30h-2.828v-1.932h-.168c-.411.672-1.027 1.2413-1.848 1.708-.803.448-1.689.672-2.66.672zM153.063 30v-2.52l7.952-9.128h-7.7V15.72h11.396v2.52l-7.924 9.128h8.148V30h-11.872z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M216.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM231.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM259.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M204.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M191.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M183.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M191.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C198.123 6.03271 195.082 4.7 191.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-hr/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-hr/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..5934099041
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-hr/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="260dp" android:height="38dp" android:viewportWidth="260" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M2.90159 30V9.952h6.412c2.10931 0 3.92001.4293 5.43201 1.288 1.5307.84 2.7067 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8213 1.4933-1.9973 2.6693-3.528 3.528-1.512.84-3.3227 1.26-5.43201 1.26h-6.412zm3.08-2.912h3.248c2.27731 0 4.04131-.6347 5.29201-1.904 1.2693-1.2693 1.904-3.0053 1.904-5.208s-.6347-3.9387-1.904-5.208c-1.2507-1.2693-3.0147-1.904-5.29201-1.904h-3.248v14.224zm23.17821 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9974-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6346-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6346 1.1387.952 2.4173.952 3.836 0 1.4373-.3174 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5214.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6906.3733 1.428.56 2.212.56zM39.4195 30V15.72h2.856v1.96h.168c.4106-.6907 1.0173-1.26 1.82-1.708.8213-.4667 1.7173-.7 2.688-.7 1.7546 0 3.0706.5227 3.948 1.568.8773 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2894-1.9973-.868-2.52-.5787-.5413-1.3347-.812-2.268-.812-.728 0-1.3627.2053-1.904.616-.5414.392-.9707.9147-1.288 1.568-.2987.6533-.448 1.3533-.448 2.1V30h-3.024zm18.2782-16.38c-.56 0-1.0454-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.4106-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.4106.392.616.868.616 1.428 0 .56-.2054 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM56.1857 30V15.72h3.024V30h-3.024zm7.076 0V15.72h2.856v2.1h.168c.3173-.728.8586-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7186.028.98.084.28.056.532.1213.756.196v3.136c-.3547-.1493-.7187-.2707-1.092-.364-.3547-.0933-.728-.14-1.12-.14-.7094 0-1.344.196-1.904.588-.5414.3733-.9707.8867-1.288 1.54-.3174.6347-.476 1.3347-.476 2.1V30h-3.024zm15.526.448c-1.0266 0-1.9413-.196-2.744-.588-.8026-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2614-1.8667.784-2.576.5414-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8854-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2134.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4186.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7466.448-1.6426.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5974-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5786-.168-1.1946-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5226.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM89.8929 30V15.72h2.856v1.96h.168c.4107-.6907 1.0173-1.26 1.82-1.708.8213-.4667 1.7173-.7 2.688-.7 1.7547 0 3.0711.5227 3.9481 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.9961v-8.624c0-1.1573-.2893-1.9973-.868-2.52-.5787-.5413-1.3347-.812-2.268-.812-.728 0-1.3627.2053-1.904.616-.5413.392-.9707.9147-1.288 1.568-.2987.6533-.448 1.3533-.448 2.1V30h-3.024zm18.2781-16.38c-.56 0-1.045-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.411-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.411.392.616.868.616 1.428 0 .56-.205 1.0453-.616 1.456-.392.392-.868.588-1.428.588zm-2.716 22.708c-.579 0-1.101-.0653-1.568-.196V33.22c.187.112.401.196.644.252.224.0747.448.112.672.112.541 0 .915-.168 1.12-.504.224-.3173.336-.784.336-1.4V15.72h3.024v15.988c0 1.6427-.401 2.8187-1.204 3.528-.803.728-1.811 1.092-3.024 1.092zm14.667-5.88c-1.4 0-2.65-.3267-3.752-.98-1.101-.6533-1.969-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.598-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.726.3173 3.752.952 1.046.6347 1.839 1.5027 2.38 2.604.542 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392H115.81c.15 1.4187.644 2.4827 1.484 3.192.859.7093 1.83 1.064 2.912 1.064.971 0 1.774-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.866.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.278-.56-2.156-.56zm22.037 12.6c-1.755 0-3.08-.5227-3.976-1.568-.877-1.064-1.316-2.5013-1.316-4.312V15.72h3.024v8.428c0 1.2133.28 2.1093.84 2.688.579.56 1.297.84 2.156.84.765 0 1.428-.196 1.988-.588.579-.4107 1.017-.9333 1.316-1.568.317-.6533.476-1.3627.476-2.128V15.72h2.996V30h-2.828v-1.932h-.168c-.411.672-1.027 1.2413-1.848 1.708-.803.448-1.689.672-2.66.672zM153.063 30v-2.52l7.952-9.128h-7.7V15.72h11.396v2.52l-7.924 9.128h8.148V30h-11.872z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M216.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM231.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM259.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M204.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M191.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M183.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M191.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-id-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-id-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..48c66d4ba3
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-id-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="348dp" android:height="38dp" android:viewportWidth="348" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M2.80471 30V9.952h7.50399c1.0827 0 2.072.2333 2.968.7.9147.4667 1.6333 1.1013 2.156 1.904.5413.8027.812 1.708.812 2.716 0 1.0267-.2613 1.904-.784 2.632-.504.728-1.148 1.2787-1.932 1.652v.14c1.008.3547 1.8293.9427 2.464 1.764.6347.8027.952 1.7733.952 2.912 0 1.12-.2893 2.1093-.868 2.968-.56.84-1.3253 1.4933-2.296 1.96-.952.4667-1.9973.7-3.136.7H2.80471zm7.47599-17.22H5.88471v5.6h4.28399c.9707 0 1.7267-.2893 2.268-.868.5413-.5973.812-1.2507.812-1.96 0-.6907-.2613-1.3253-.784-1.904s-1.2507-.868-2.184-.868zM5.88471 27.144h4.75999c1.008 0 1.792-.2987 2.352-.896.5787-.616.868-1.316.868-2.1s-.2893-1.484-.868-2.1c-.5787-.616-1.4-.924-2.464-.924H5.88471v6.02zm20.76739 3.304c-1.4 0-2.6507-.3267-3.752-.98-1.1014-.6533-1.9694-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2986-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0826-.7093 2.324-1.064 3.724-1.064 1.4746 0 2.7253.3173 3.752.952 1.0453.6347 1.8386 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0094.392-.028.56 0 .168-.0094.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8586.7093 1.8293 1.064 2.912 1.064.9706 0 1.7733-.2147 2.408-.644.6346-.448 1.1386-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3894 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7094.616-1.1854 1.4373-1.428 2.464h7.924c-.0374-.4853-.196-.9893-.476-1.512-.28-.5227-.7094-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zM36.5335 30V15.72h2.856v2.1h.168c.3174-.728.8587-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7187.028.98.084.28.056.532.1213.756.196v3.136c-.3546-.1493-.7186-.2707-1.092-.364-.3546-.0933-.728-.14-1.12-.14-.7093 0-1.344.196-1.904.588-.5413.3733-.9706.8867-1.288 1.54-.3173.6347-.476 1.3347-.476 2.1V30h-3.024zm13.2743-16.38c-.56 0-1.0453-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.4107-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.4107.392.616.868.616 1.428 0 .56-.2053 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM48.2958 30V15.72h3.024V30h-3.024zm20.0152.448c-1.288 0-2.4547-.3173-3.5-.952-1.0267-.6533-1.848-1.5493-2.464-2.688-.5974-1.1573-.896-2.4733-.896-3.948s.2986-2.7813.896-3.92c.616-1.1387 1.4373-2.0347 2.464-2.688 1.0453-.6533 2.212-.98 3.5-.98 1.1013 0 2.044.2427 2.828.728.8026.4853 1.3906 1.036 1.764 1.652h.168l-.168-1.988V9.952h2.996V30h-2.828v-1.904h-.168c-.3734.616-.9614 1.1667-1.764 1.652-.784.4667-1.7267.7-2.828.7zm.448-2.772c.7466 0 1.4466-.196 2.1-.588.672-.392 1.204-.9427 1.596-1.652.4106-.728.616-1.5867.616-2.576 0-.9893-.2054-1.8387-.616-2.548-.392-.728-.924-1.288-1.596-1.68-.6534-.392-1.3534-.588-2.1-.588-.7467 0-1.4467.196-2.1.588-.6534.392-1.1854.952-1.596 1.68-.4107.7093-.616 1.5587-.616 2.548 0 .9893.2053 1.848.616 2.576.4106.7093.9426 1.26 1.596 1.652.6533.392 1.3533.588 2.1.588zm17.5852 2.772c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9974-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6346-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6346 1.1387.952 2.4173.952 3.836 0 1.4373-.3174 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5214.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6906.3733 1.428.56 2.212.56zM96.6038 30V15.72h2.856v1.96h.168c.4112-.6907 1.0172-1.26 1.8202-1.708.821-.4667 1.717-.7 2.688-.7 1.755 0 3.071.5227 3.948 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.289-1.9973-.868-2.52-.579-.5413-1.335-.812-2.268-.812-.728 0-1.363.2053-1.904.616-.541.392-.971.9147-1.288 1.568-.2988.6533-.4482 1.3533-.4482 2.1V30h-3.024zm20.8852.448c-1.026 0-1.941-.196-2.744-.588-.802-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.262-1.8667.784-2.576.542-.728 1.26-1.2787 2.156-1.652.896-.3733 1.886-.56 2.968-.56.896 0 1.68.084 2.352.252.691.168 1.214.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.418.168-2.072.504-.653.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.027-.504 2.147-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.373.5787-.933 1.092-1.68 1.54-.746.448-1.642.672-2.688.672zm.532-2.464c.784 0 1.475-.1867 2.072-.56.598-.3733 1.064-.8587 1.4-1.456.355-.616.532-1.2787.532-1.988-.429-.2427-.933-.4387-1.512-.588-.578-.168-1.194-.252-1.848-.252-1.232 0-2.109.252-2.632.756-.522.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm15.645 2.464c-1.718 0-3.09-.3733-4.116-1.12-1.027-.7653-1.736-1.6707-2.128-2.716l2.716-1.176c.336.7653.821 1.3533 1.456 1.764.634.392 1.353.588 2.156.588.746 0 1.39-.1307 1.932-.392.541-.28.812-.728.812-1.344 0-.5973-.271-1.036-.812-1.316-.542-.28-1.214-.5227-2.016-.728l-1.708-.392c-.691-.168-1.335-.4293-1.932-.784-.598-.3547-1.083-.812-1.456-1.372-.374-.5787-.56-1.2507-.56-2.016 0-.84.252-1.568.756-2.184.504-.6347 1.166-1.12 1.988-1.456.84-.3547 1.745-.532 2.716-.532 1.325 0 2.482.2613 3.472.784 1.008.504 1.745 1.2693 2.212 2.296l-2.604 1.176c-.336-.6347-.775-1.0733-1.316-1.316-.523-.2613-1.102-.392-1.736-.392-.71 0-1.307.1493-1.792.448-.467.2987-.7.672-.7 1.12 0 .4853.205.868.616 1.148.429.28.952.504 1.568.672l2.072.504c1.418.3547 2.482.896 3.192 1.624.709.7093 1.064 1.5773 1.064 2.604 0 .9147-.262 1.7173-.784 2.408-.523.672-1.232 1.1947-2.128 1.568-.878.3547-1.858.532-2.94.532zm10.39-16.828c-.56 0-1.045-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.411-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.411.392.616.868.616 1.428 0 .56-.205 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM142.544 30V15.72h3.024V30h-3.024zm20.015.448c-1.288 0-2.454-.3173-3.5-.952-1.026-.6533-1.848-1.5493-2.464-2.688-.597-1.1573-.896-2.4733-.896-3.948s.299-2.7813.896-3.92c.616-1.1387 1.438-2.0347 2.464-2.688 1.046-.6533 2.212-.98 3.5-.98 1.102 0 2.044.2427 2.828.728.803.4853 1.391 1.036 1.764 1.652h.168l-.168-1.988V9.952h2.996V30h-2.828v-1.904h-.168c-.373.616-.961 1.1667-1.764 1.652-.784.4667-1.726.7-2.828.7zm.448-2.772c.747 0 1.447-.196 2.1-.588.672-.392 1.204-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.392-.728-.924-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.746 0-1.446.196-2.1.588-.653.392-1.185.952-1.596 1.68-.41.7093-.616 1.5587-.616 2.548 0 .9893.206 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.654.392 1.354.588 2.1.588zm17.39 2.772c-1.4 0-2.651-.3267-3.752-.98-1.102-.6533-1.97-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.298-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.082-.7093 2.324-1.064 3.724-1.064 1.474 0 2.725.3173 3.752.952 1.045.6347 1.838 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.01.392-.028.56 0 .168-.01.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.858.7093 1.829 1.064 2.912 1.064.97 0 1.773-.2147 2.408-.644.634-.448 1.138-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.39 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.71.616-1.186 1.4373-1.428 2.464h7.924c-.038-.4853-.196-.9893-.476-1.512-.28-.5227-.71-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zM190.278 30V15.72h2.856v1.96h.168c.411-.6907 1.017-1.26 1.82-1.708.821-.4667 1.717-.7 2.688-.7 1.755 0 3.071.5227 3.948 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.289-1.9973-.868-2.52-.579-.5413-1.335-.812-2.268-.812-.728 0-1.363.2053-1.904.616-.541.392-.971.9147-1.288 1.568-.299.6533-.448 1.3533-.448 2.1V30h-3.024zm22.846 6.496c-1.251 0-2.334-.2053-3.248-.616-.896-.392-1.624-.9053-2.184-1.54-.56-.616-.962-1.2507-1.204-1.904l2.8-1.176c.298.7467.774 1.3533 1.428 1.82.672.4853 1.474.728 2.408.728 1.306 0 2.333-.392 3.08-1.176.765-.784 1.148-1.8947 1.148-3.332v-1.372h-.168c-.448.672-1.074 1.2133-1.876 1.624-.784.392-1.68.588-2.688.588-1.214 0-2.324-.308-3.332-.924-1.008-.616-1.82-1.4747-2.436-2.576-.616-1.12-.924-2.4267-.924-3.92 0-1.512.308-2.8187.924-3.92.616-1.12 1.428-1.988 2.436-2.604 1.008-.616 2.118-.924 3.332-.924 1.008 0 1.904.2053 2.688.616.802.4107 1.428.952 1.876 1.624h.168V15.72h2.884v13.524c0 1.5493-.308 2.8653-.924 3.948-.598 1.0827-1.428 1.904-2.492 2.464s-2.296.84-3.696.84zm.028-9.1c.746 0 1.437-.1773 2.072-.532.634-.3733 1.148-.9053 1.54-1.596.392-.7093.588-1.5587.588-2.548 0-1.0267-.196-1.8853-.588-2.576-.392-.7093-.906-1.2413-1.54-1.596-.635-.3547-1.326-.532-2.072-.532-.747 0-1.447.1867-2.1.56-.635.3547-1.148.8773-1.54 1.568-.392.6907-.588 1.5493-.588 2.576 0 1.008.196 1.8667.588 2.576.392.6907.905 1.2133 1.54 1.568.653.3547 1.353.532 2.1.532zm15.265 3.052c-1.027 0-1.942-.196-2.744-.588-.803-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.261-1.8667.784-2.576.541-.728 1.26-1.2787 2.156-1.652.896-.3733 1.885-.56 2.968-.56.896 0 1.68.084 2.352.252.69.168 1.213.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.419.168-2.072.504-.654.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.026-.504 2.146-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.374.5787-.934 1.092-1.68 1.54-.747.448-1.643.672-2.688.672zm.532-2.464c.784 0 1.474-.1867 2.072-.56.597-.3733 1.064-.8587 1.4-1.456.354-.616.532-1.2787.532-1.988-.43-.2427-.934-.4387-1.512-.588-.579-.168-1.195-.252-1.848-.252-1.232 0-2.11.252-2.632.756-.523.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM239.522 30V15.72h2.856v1.96h.168c.41-.6907 1.017-1.26 1.82-1.708.821-.4667 1.717-.7 2.688-.7 1.754 0 3.07.5227 3.948 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.29-1.9973-.868-2.52-.579-.5413-1.335-.812-2.268-.812-.728 0-1.363.2053-1.904.616-.542.392-.971.9147-1.288 1.568-.299.6533-.448 1.3533-.448 2.1V30h-3.024z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M304.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM319.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM347.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M292.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M279.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M271.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M279.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C286.123 6.03271 283.082 4.7 279.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-id/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-id/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..b7f195bc92
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-id/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="348dp" android:height="38dp" android:viewportWidth="348" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M2.80471 30V9.952h7.50399c1.0827 0 2.072.2333 2.968.7.9147.4667 1.6333 1.1013 2.156 1.904.5413.8027.812 1.708.812 2.716 0 1.0267-.2613 1.904-.784 2.632-.504.728-1.148 1.2787-1.932 1.652v.14c1.008.3547 1.8293.9427 2.464 1.764.6347.8027.952 1.7733.952 2.912 0 1.12-.2893 2.1093-.868 2.968-.56.84-1.3253 1.4933-2.296 1.96-.952.4667-1.9973.7-3.136.7H2.80471zm7.47599-17.22H5.88471v5.6h4.28399c.9707 0 1.7267-.2893 2.268-.868.5413-.5973.812-1.2507.812-1.96 0-.6907-.2613-1.3253-.784-1.904s-1.2507-.868-2.184-.868zM5.88471 27.144h4.75999c1.008 0 1.792-.2987 2.352-.896.5787-.616.868-1.316.868-2.1s-.2893-1.484-.868-2.1c-.5787-.616-1.4-.924-2.464-.924H5.88471v6.02zm20.76739 3.304c-1.4 0-2.6507-.3267-3.752-.98-1.1014-.6533-1.9694-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2986-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0826-.7093 2.324-1.064 3.724-1.064 1.4746 0 2.7253.3173 3.752.952 1.0453.6347 1.8386 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0094.392-.028.56 0 .168-.0094.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8586.7093 1.8293 1.064 2.912 1.064.9706 0 1.7733-.2147 2.408-.644.6346-.448 1.1386-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3894 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7094.616-1.1854 1.4373-1.428 2.464h7.924c-.0374-.4853-.196-.9893-.476-1.512-.28-.5227-.7094-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zM36.5335 30V15.72h2.856v2.1h.168c.3174-.728.8587-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7187.028.98.084.28.056.532.1213.756.196v3.136c-.3546-.1493-.7186-.2707-1.092-.364-.3546-.0933-.728-.14-1.12-.14-.7093 0-1.344.196-1.904.588-.5413.3733-.9706.8867-1.288 1.54-.3173.6347-.476 1.3347-.476 2.1V30h-3.024zm13.2743-16.38c-.56 0-1.0453-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.4107-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.4107.392.616.868.616 1.428 0 .56-.2053 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM48.2958 30V15.72h3.024V30h-3.024zm20.0152.448c-1.288 0-2.4547-.3173-3.5-.952-1.0267-.6533-1.848-1.5493-2.464-2.688-.5974-1.1573-.896-2.4733-.896-3.948s.2986-2.7813.896-3.92c.616-1.1387 1.4373-2.0347 2.464-2.688 1.0453-.6533 2.212-.98 3.5-.98 1.1013 0 2.044.2427 2.828.728.8026.4853 1.3906 1.036 1.764 1.652h.168l-.168-1.988V9.952h2.996V30h-2.828v-1.904h-.168c-.3734.616-.9614 1.1667-1.764 1.652-.784.4667-1.7267.7-2.828.7zm.448-2.772c.7466 0 1.4466-.196 2.1-.588.672-.392 1.204-.9427 1.596-1.652.4106-.728.616-1.5867.616-2.576 0-.9893-.2054-1.8387-.616-2.548-.392-.728-.924-1.288-1.596-1.68-.6534-.392-1.3534-.588-2.1-.588-.7467 0-1.4467.196-2.1.588-.6534.392-1.1854.952-1.596 1.68-.4107.7093-.616 1.5587-.616 2.548 0 .9893.2053 1.848.616 2.576.4106.7093.9426 1.26 1.596 1.652.6533.392 1.3533.588 2.1.588zm17.5852 2.772c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9974-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6346-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6346 1.1387.952 2.4173.952 3.836 0 1.4373-.3174 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5214.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6906.3733 1.428.56 2.212.56zM96.6038 30V15.72h2.856v1.96h.168c.4112-.6907 1.0172-1.26 1.8202-1.708.821-.4667 1.717-.7 2.688-.7 1.755 0 3.071.5227 3.948 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.289-1.9973-.868-2.52-.579-.5413-1.335-.812-2.268-.812-.728 0-1.363.2053-1.904.616-.541.392-.971.9147-1.288 1.568-.2988.6533-.4482 1.3533-.4482 2.1V30h-3.024zm20.8852.448c-1.026 0-1.941-.196-2.744-.588-.802-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.262-1.8667.784-2.576.542-.728 1.26-1.2787 2.156-1.652.896-.3733 1.886-.56 2.968-.56.896 0 1.68.084 2.352.252.691.168 1.214.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.418.168-2.072.504-.653.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.027-.504 2.147-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.373.5787-.933 1.092-1.68 1.54-.746.448-1.642.672-2.688.672zm.532-2.464c.784 0 1.475-.1867 2.072-.56.598-.3733 1.064-.8587 1.4-1.456.355-.616.532-1.2787.532-1.988-.429-.2427-.933-.4387-1.512-.588-.578-.168-1.194-.252-1.848-.252-1.232 0-2.109.252-2.632.756-.522.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm15.645 2.464c-1.718 0-3.09-.3733-4.116-1.12-1.027-.7653-1.736-1.6707-2.128-2.716l2.716-1.176c.336.7653.821 1.3533 1.456 1.764.634.392 1.353.588 2.156.588.746 0 1.39-.1307 1.932-.392.541-.28.812-.728.812-1.344 0-.5973-.271-1.036-.812-1.316-.542-.28-1.214-.5227-2.016-.728l-1.708-.392c-.691-.168-1.335-.4293-1.932-.784-.598-.3547-1.083-.812-1.456-1.372-.374-.5787-.56-1.2507-.56-2.016 0-.84.252-1.568.756-2.184.504-.6347 1.166-1.12 1.988-1.456.84-.3547 1.745-.532 2.716-.532 1.325 0 2.482.2613 3.472.784 1.008.504 1.745 1.2693 2.212 2.296l-2.604 1.176c-.336-.6347-.775-1.0733-1.316-1.316-.523-.2613-1.102-.392-1.736-.392-.71 0-1.307.1493-1.792.448-.467.2987-.7.672-.7 1.12 0 .4853.205.868.616 1.148.429.28.952.504 1.568.672l2.072.504c1.418.3547 2.482.896 3.192 1.624.709.7093 1.064 1.5773 1.064 2.604 0 .9147-.262 1.7173-.784 2.408-.523.672-1.232 1.1947-2.128 1.568-.878.3547-1.858.532-2.94.532zm10.39-16.828c-.56 0-1.045-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.411-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.411.392.616.868.616 1.428 0 .56-.205 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM142.544 30V15.72h3.024V30h-3.024zm20.015.448c-1.288 0-2.454-.3173-3.5-.952-1.026-.6533-1.848-1.5493-2.464-2.688-.597-1.1573-.896-2.4733-.896-3.948s.299-2.7813.896-3.92c.616-1.1387 1.438-2.0347 2.464-2.688 1.046-.6533 2.212-.98 3.5-.98 1.102 0 2.044.2427 2.828.728.803.4853 1.391 1.036 1.764 1.652h.168l-.168-1.988V9.952h2.996V30h-2.828v-1.904h-.168c-.373.616-.961 1.1667-1.764 1.652-.784.4667-1.726.7-2.828.7zm.448-2.772c.747 0 1.447-.196 2.1-.588.672-.392 1.204-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.392-.728-.924-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.746 0-1.446.196-2.1.588-.653.392-1.185.952-1.596 1.68-.41.7093-.616 1.5587-.616 2.548 0 .9893.206 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.654.392 1.354.588 2.1.588zm17.39 2.772c-1.4 0-2.651-.3267-3.752-.98-1.102-.6533-1.97-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.298-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.082-.7093 2.324-1.064 3.724-1.064 1.474 0 2.725.3173 3.752.952 1.045.6347 1.838 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.01.392-.028.56 0 .168-.01.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.858.7093 1.829 1.064 2.912 1.064.97 0 1.773-.2147 2.408-.644.634-.448 1.138-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.39 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.71.616-1.186 1.4373-1.428 2.464h7.924c-.038-.4853-.196-.9893-.476-1.512-.28-.5227-.71-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zM190.278 30V15.72h2.856v1.96h.168c.411-.6907 1.017-1.26 1.82-1.708.821-.4667 1.717-.7 2.688-.7 1.755 0 3.071.5227 3.948 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.289-1.9973-.868-2.52-.579-.5413-1.335-.812-2.268-.812-.728 0-1.363.2053-1.904.616-.541.392-.971.9147-1.288 1.568-.299.6533-.448 1.3533-.448 2.1V30h-3.024zm22.846 6.496c-1.251 0-2.334-.2053-3.248-.616-.896-.392-1.624-.9053-2.184-1.54-.56-.616-.962-1.2507-1.204-1.904l2.8-1.176c.298.7467.774 1.3533 1.428 1.82.672.4853 1.474.728 2.408.728 1.306 0 2.333-.392 3.08-1.176.765-.784 1.148-1.8947 1.148-3.332v-1.372h-.168c-.448.672-1.074 1.2133-1.876 1.624-.784.392-1.68.588-2.688.588-1.214 0-2.324-.308-3.332-.924-1.008-.616-1.82-1.4747-2.436-2.576-.616-1.12-.924-2.4267-.924-3.92 0-1.512.308-2.8187.924-3.92.616-1.12 1.428-1.988 2.436-2.604 1.008-.616 2.118-.924 3.332-.924 1.008 0 1.904.2053 2.688.616.802.4107 1.428.952 1.876 1.624h.168V15.72h2.884v13.524c0 1.5493-.308 2.8653-.924 3.948-.598 1.0827-1.428 1.904-2.492 2.464s-2.296.84-3.696.84zm.028-9.1c.746 0 1.437-.1773 2.072-.532.634-.3733 1.148-.9053 1.54-1.596.392-.7093.588-1.5587.588-2.548 0-1.0267-.196-1.8853-.588-2.576-.392-.7093-.906-1.2413-1.54-1.596-.635-.3547-1.326-.532-2.072-.532-.747 0-1.447.1867-2.1.56-.635.3547-1.148.8773-1.54 1.568-.392.6907-.588 1.5493-.588 2.576 0 1.008.196 1.8667.588 2.576.392.6907.905 1.2133 1.54 1.568.653.3547 1.353.532 2.1.532zm15.265 3.052c-1.027 0-1.942-.196-2.744-.588-.803-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.261-1.8667.784-2.576.541-.728 1.26-1.2787 2.156-1.652.896-.3733 1.885-.56 2.968-.56.896 0 1.68.084 2.352.252.69.168 1.213.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.419.168-2.072.504-.654.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.026-.504 2.146-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.374.5787-.934 1.092-1.68 1.54-.747.448-1.643.672-2.688.672zm.532-2.464c.784 0 1.474-.1867 2.072-.56.597-.3733 1.064-.8587 1.4-1.456.354-.616.532-1.2787.532-1.988-.43-.2427-.934-.4387-1.512-.588-.579-.168-1.195-.252-1.848-.252-1.232 0-2.11.252-2.632.756-.523.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM239.522 30V15.72h2.856v1.96h.168c.41-.6907 1.017-1.26 1.82-1.708.821-.4667 1.717-.7 2.688-.7 1.754 0 3.07.5227 3.948 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.29-1.9973-.868-2.52-.579-.5413-1.335-.812-2.268-.812-.728 0-1.363.2053-1.904.616-.542.392-.971.9147-1.288 1.568-.299.6533-.448 1.3533-.448 2.1V30h-3.024z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M304.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM319.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM347.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M292.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M279.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M271.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M279.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-it-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-it-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..e9856c70e1
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-it-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="220dp" android:height="38dp" android:viewportWidth="220" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.39456 30V9.952h6.412c2.10934 0 3.92004.4293 5.43204 1.288 1.5306.84 2.7066 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8214 1.4933-1.9974 2.6693-3.528 3.528-1.512.84-3.3227 1.26-5.43204 1.26h-6.412zm3.08-2.912h3.248c2.27734 0 4.04134-.6347 5.29204-1.904 1.2693-1.2693 1.904-3.0053 1.904-5.208s-.6347-3.9387-1.904-5.208c-1.2507-1.2693-3.0147-1.904-5.29204-1.904h-3.248v14.224zm23.17824 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9974-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6346-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6346 1.1387.952 2.4173.952 3.836 0 1.4373-.3174 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5214.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6906.3733 1.428.56 2.212.56zM39.9124 30V15.72h2.856v1.96h.168c.4107-.6907 1.0174-1.26 1.82-1.708.8214-.4667 1.7174-.7 2.688-.7 1.7547 0 3.0707.5227 3.948 1.568.8774 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2893-1.9973-.868-2.52-.5786-.5413-1.3346-.812-2.268-.812-.728 0-1.3626.2053-1.904.616-.5413.392-.9706.9147-1.288 1.568-.2986.6533-.448 1.3533-.448 2.1V30h-3.024zm20.8855.448c-1.0267 0-1.9413-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm24.0163 2.464c-1.4373 0-2.7066-.3267-3.808-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.6346-1.1573-.952-2.464-.952-3.92s.3174-2.7533.952-3.892c.6347-1.1573 1.5027-2.0627 2.604-2.716 1.1014-.6533 2.3707-.98 3.808-.98 1.5867 0 2.9214.3547 4.004 1.064 1.1014.7093 1.8854 1.6707 2.352 2.884l-2.744 1.12c-.6533-1.5307-1.876-2.296-3.668-2.296-.784 0-1.5026.2053-2.156.616-.6533.392-1.176.952-1.568 1.68-.392.7093-.588 1.5493-.588 2.52 0 .9707.196 1.82.588 2.548.392.728.9147 1.288 1.568 1.68.6534.392 1.372.588 2.156.588.9147 0 1.6894-.2053 2.324-.616.6347-.4293 1.1294-1.008 1.484-1.736l2.688 1.176c-.504 1.1387-1.3066 2.0813-2.408 2.828-1.1013.7467-2.4453 1.12-4.032 1.12zm15.9158 0c-1.4745 0-2.7719-.336-3.8919-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6346-1.1387-.952-2.4267-.952-3.864 0-1.4187.3174-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4174-1.008 3.8919-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.997 1.5867 2.632 2.744.635 1.1387.952 2.4173.952 3.836 0 1.4373-.317 2.7253-.952 3.864s-1.512 2.044-2.632 2.716c-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.213-.9427 1.624-1.652.429-.728.644-1.596.644-2.604s-.215-1.8667-.644-2.576c-.411-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5212.196-2.2119.588-.672.3733-1.2226.924-1.652 1.652-.4106.7093-.616 1.568-.616 2.576s.2054 1.876.616 2.604c.4294.7093.98 1.26 1.652 1.652.6907.3733 1.4279.56 2.2119.56zM111.522 30V15.72h2.856v1.96h.168c.41-.6907 1.017-1.26 1.82-1.708.821-.4667 1.717-.7 2.688-.7 1.754 0 3.07.5227 3.948 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.29-1.9973-.868-2.52-.579-.5413-1.335-.812-2.268-.812-.728 0-1.363.2053-1.904.616-.542.392-.971.9147-1.288 1.568-.299.6533-.448 1.3533-.448 2.1V30h-3.024z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M176.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM191.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM219.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M164.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M151.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M143.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M151.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C158.123 6.03271 155.082 4.7 151.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-it/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-it/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..6ffa94b4dc
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-it/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="220dp" android:height="38dp" android:viewportWidth="220" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.39456 30V9.952h6.412c2.10934 0 3.92004.4293 5.43204 1.288 1.5306.84 2.7066 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8214 1.4933-1.9974 2.6693-3.528 3.528-1.512.84-3.3227 1.26-5.43204 1.26h-6.412zm3.08-2.912h3.248c2.27734 0 4.04134-.6347 5.29204-1.904 1.2693-1.2693 1.904-3.0053 1.904-5.208s-.6347-3.9387-1.904-5.208c-1.2507-1.2693-3.0147-1.904-5.29204-1.904h-3.248v14.224zm23.17824 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9974-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6346-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6346 1.1387.952 2.4173.952 3.836 0 1.4373-.3174 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5214.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6906.3733 1.428.56 2.212.56zM39.9124 30V15.72h2.856v1.96h.168c.4107-.6907 1.0174-1.26 1.82-1.708.8214-.4667 1.7174-.7 2.688-.7 1.7547 0 3.0707.5227 3.948 1.568.8774 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2893-1.9973-.868-2.52-.5786-.5413-1.3346-.812-2.268-.812-.728 0-1.3626.2053-1.904.616-.5413.392-.9706.9147-1.288 1.568-.2986.6533-.448 1.3533-.448 2.1V30h-3.024zm20.8855.448c-1.0267 0-1.9413-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm24.0163 2.464c-1.4373 0-2.7066-.3267-3.808-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.6346-1.1573-.952-2.464-.952-3.92s.3174-2.7533.952-3.892c.6347-1.1573 1.5027-2.0627 2.604-2.716 1.1014-.6533 2.3707-.98 3.808-.98 1.5867 0 2.9214.3547 4.004 1.064 1.1014.7093 1.8854 1.6707 2.352 2.884l-2.744 1.12c-.6533-1.5307-1.876-2.296-3.668-2.296-.784 0-1.5026.2053-2.156.616-.6533.392-1.176.952-1.568 1.68-.392.7093-.588 1.5493-.588 2.52 0 .9707.196 1.82.588 2.548.392.728.9147 1.288 1.568 1.68.6534.392 1.372.588 2.156.588.9147 0 1.6894-.2053 2.324-.616.6347-.4293 1.1294-1.008 1.484-1.736l2.688 1.176c-.504 1.1387-1.3066 2.0813-2.408 2.828-1.1013.7467-2.4453 1.12-4.032 1.12zm15.9158 0c-1.4745 0-2.7719-.336-3.8919-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6346-1.1387-.952-2.4267-.952-3.864 0-1.4187.3174-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4174-1.008 3.8919-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.997 1.5867 2.632 2.744.635 1.1387.952 2.4173.952 3.836 0 1.4373-.317 2.7253-.952 3.864s-1.512 2.044-2.632 2.716c-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.213-.9427 1.624-1.652.429-.728.644-1.596.644-2.604s-.215-1.8667-.644-2.576c-.411-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5212.196-2.2119.588-.672.3733-1.2226.924-1.652 1.652-.4106.7093-.616 1.568-.616 2.576s.2054 1.876.616 2.604c.4294.7093.98 1.26 1.652 1.652.6907.3733 1.4279.56 2.2119.56zM111.522 30V15.72h2.856v1.96h.168c.41-.6907 1.017-1.26 1.82-1.708.821-.4667 1.717-.7 2.688-.7 1.754 0 3.07.5227 3.948 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.29-1.9973-.868-2.52-.579-.5413-1.335-.812-2.268-.812-.728 0-1.363.2053-1.904.616-.542.392-.971.9147-1.288 1.568-.299.6533-.448 1.3533-.448 2.1V30h-3.024z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M176.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM191.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM219.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M164.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M151.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M143.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M151.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-ja-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-ja-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..57ab8714f6
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-ja-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="236dp" android:height="38dp" android:viewportWidth="236" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <group>
+    <group>
+      <path android:pathData="M38.5289 9.44664v8.16616h5.036c1.1996 0 2.1916-.4032 2.9764-1.2096.8054-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.4036-2.0364-1.209-2.8428-.7848-.82685-1.7768-1.24122-2.9764-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.0084V6.57217h7.9788c2.0276 0 3.7485.67569 5.1666 2.0252 1.439 1.34951 2.1582 2.99393 2.1582 4.93143 0 1.9822-.7194 3.6379-2.1582 4.965-1.3958 1.3289-3.1186 1.9916-5.1666 1.9916h-4.9704v.0018zM53.8642 25.0602c0 .784.3326 1.4373.998 1.9599.665.5226 1.4442.7839 2.3376.7839 1.2648 0 2.3915-.4686 3.3837-1.4036.9924-.937 1.4874-2.0364 1.4874-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.2218 0-2.2402.2949-3.0568.8829-.8167.5878-1.2259 1.3141-1.2259 2.1857zm3.8922-11.6285c2.2236 0 3.9782.5935 5.2658 1.7807 1.2856 1.1871 1.9282 2.8147 1.9282 4.8828v9.8647H62.073v-2.2212h-.131c-1.2426 1.829-2.9 2.7438-4.9702 2.7438-1.7658 0-3.2439-.5226-4.4306-1.5679-1.1882-1.0452-1.7824-2.3518-1.7824-3.9197 0-1.6556.6258-2.9717 1.8796-3.9515 1.2538-.9799 2.9264-1.4708 5.0192-1.4708 1.7861 0 3.2586.3266 4.4133.9799v-.6869c0-1.0452-.4148-1.9318-1.2424-2.6616-.8298-.7299-1.7977-1.0938-2.9095-1.0938-1.6799 0-3.0082.7074-3.9892 2.1241l-2.6499-1.6668c1.4613-2.0906 3.6195-3.1358 6.4765-3.1358zM81.4629 13.9543L71.4233 37.0154h-3.1058l3.728-8.069-6.6056-14.9921h3.27l4.7742 11.4979h.0654l4.6434-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M26.3729 18.4452c0-.9463-.0803-1.8591-.2317-2.7326H13.4536v5.1759h7.2669c-.3121 1.6872-1.2557 3.1227-2.687 4.084v3.3616h4.3369c2.5394-2.3406 4.0025-5.7993 4.0025-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M13.4536 31.5782c3.6307 0 6.6876-1.1909 8.9168-3.2441l-4.3369-3.3616c-1.2071.8119-2.7618 1.286-4.5799 1.286-3.50915 0-6.48766-2.363-7.55274-5.5473H1.43311v3.4624c2.21425 4.3901 6.76422 7.4046 12.02049 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M5.90095 20.7111c-.27281-.8119-.4223-1.678-.4223-2.5721 0-.894.14949-1.7601.4223-2.572v-3.4625H1.43319C.517594 13.9188 0 15.9683 0 18.139c0 2.1708.517594 4.2205 1.43319 6.0346l4.46776-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M13.4536 10.0196c1.9826 0 3.7596.6813 5.161 2.0159v.0019l3.8399-3.83578C20.1226 6.03271 17.0824 4.7 13.4536 4.7c-5.25627 0-9.80624 3.01446-12.02049 7.4046l4.46775 3.4624c1.06508-3.1843 4.04359-5.5474 7.55274-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+  <path android:pathData="M95.212 11.576l.252 2.436c3.024-.644 10.164-1.316 13.16-1.652-2.576 1.54-5.236 5.096-5.236 9.464 0 6.244 5.908 9.016 11.088 9.212l.812-2.324c-4.564-.168-9.66-1.904-9.66-7.364 0-3.332 2.436-7.588 6.412-8.876 1.428-.42 3.892-.448 5.488-.448v-2.24c-1.876.084-4.508.252-7.56.504-5.152.42-10.444.952-12.264 1.148-.532.056-1.428.112-2.492.14zm18.284 3.892l-1.428.616c.84 1.148 1.652 2.604 2.296 3.948l1.428-.672c-.588-1.232-1.652-2.968-2.296-3.892zm3.052-1.176l-1.372.644c.868 1.176 1.68 2.548 2.352 3.92l1.456-.7c-.644-1.232-1.764-2.94-2.436-3.864zm8.84-3.668h19.768v3.108h1.988V8.804H136.28v-2.24h-2.044v2.24h-10.78v4.928h1.932v-3.108zm10.248 14.14v2.856h-7.056v-2.856h7.056zm1.932 4.48V23.14H126.62v7.504h1.96v-1.4h8.988zm10.052-9.716h-4.172l.84-1.176c-2.1-1.12-5.908-2.492-9.072-3.304l.252-.504h8.68v-1.68H136c.14-.588.224-1.204.308-1.876h-1.932c-.084.7-.196 1.316-.336 1.876h-7.588v1.68h6.86c-1.148 1.82-3.388 2.828-7.98 3.444.336.364.812 1.092.952 1.54 4.088-.616 6.524-1.568 7.98-3.136 2.884.784 6.244 2.044 8.344 3.136h-19.6v1.876h18.508v8.344c0 .392-.084.476-.532.532-.476 0-2.016 0-3.696-.056.224.56.532 1.344.644 1.876 2.156 0 3.612.028 4.508-.28.896-.308 1.148-.868 1.148-2.016v-8.4h4.032v-1.876zM157.888 6.76c-1.596 4.34-4.256 8.596-7.112 11.312.392.476 1.036 1.568 1.288 2.044.952-.98 1.932-2.128 2.828-3.388v15.344h2.072V13.508c1.148-1.932 2.128-4.004 2.968-6.104l-2.044-.644zm18.34 6.02h-3.556V6.9h-2.1v5.88h-11.284v2.072h11.284V29.3c0 .644-.252.812-.868.868-.672.028-2.968.028-5.32-.056.308.56.7 1.512.812 2.044 3.024.028 4.9 0 5.992-.336 1.036-.308 1.484-.952 1.484-2.52V14.852h3.556V12.78zm-9.184 11.788c-.896-1.708-2.744-4.62-4.2-6.776l-1.792.84c1.428 2.24 3.22 5.236 4.06 6.972l1.932-1.036zm28.412-16.744h-2.548c.028.224.14 1.036.168 1.764.028.392.056 1.064.056 1.848-4.172.056-9.436.224-12.544.28l.056 2.156c3.5-.252 8.26-.448 12.516-.476.028.98.028 1.988.028 2.828-.56-.196-1.176-.308-1.876-.308-2.66 0-4.928 2.1-4.928 4.872 0 3.052 2.24 4.676 4.592 4.676.952 0 1.764-.252 2.436-.756-1.12 2.548-3.696 4.116-7.42 4.956l1.876 1.848c6.524-1.96 8.372-6.16 8.372-9.94 0-1.4-.308-2.632-.896-3.584-.028-1.288-.056-3.024-.056-4.62h.392c4.088 0 6.636.056 8.204.14l.028-2.072c-1.344 0-4.788-.028-8.204-.028h-.42c0-.756.028-1.4.028-1.82.028-.364.084-1.456.14-1.764zm-6.972 12.936c0-1.82 1.372-2.968 2.828-2.968 1.092 0 2.044.532 2.492 1.764.252 2.66-.812 3.976-2.464 3.976-1.568 0-2.856-1.036-2.856-2.772zm27.964 6.3c0-.98.98-1.792 2.24-1.792 2.128 0 3.528 1.596 3.752 3.808-.7.112-1.456.168-2.268.168-2.184 0-3.724-.84-3.724-2.184zm-3.584-17.696l.084 2.324c.588-.084 1.232-.14 1.848-.168 1.484-.084 7.084-.336 8.568-.392-1.428 1.26-4.928 4.2-6.496 5.488-1.624 1.372-5.208 4.368-7.532 6.272l1.596 1.652c3.556-3.612 6.048-5.6 10.724-5.6 3.64 0 6.272 2.072 6.272 4.816 0 2.296-1.26 3.92-3.5 4.788-.336-2.66-2.212-4.956-5.712-4.956-2.604 0-4.312 1.708-4.312 3.64 0 2.324 2.324 3.976 6.132 3.976 5.936 0 9.632-2.912 9.632-7.42 0-3.78-3.332-6.58-7.98-6.58-1.26 0-2.604.14-3.892.588 2.184-1.82 5.992-5.068 7.392-6.132.504-.42 1.064-.784 1.568-1.148l-1.288-1.624c-.28.084-.672.168-1.512.224-1.484.14-8.148.364-9.604.364-.56 0-1.344-.028-1.988-.112z" android:fillColor="#3c4043"/>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-ja/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-ja/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..5909abc9c6
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-ja/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="236dp" android:height="38dp" android:viewportWidth="236" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <group>
+    <group>
+      <path android:pathData="M38.5289 9.34665v8.16615h5.036c1.1996 0 2.1916-.4032 2.9764-1.2096.8054-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.4036-2.0364-1.209-2.8428-.7848-.82684-1.7768-1.24121-2.9764-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.0084V6.47218h7.9788c2.0276 0 3.7485.67569 5.1666 2.0252 1.439 1.3495 2.1582 2.99392 2.1582 4.93142 0 1.9822-.7194 3.6379-2.1582 4.965-1.3958 1.3289-3.1186 1.9916-5.1666 1.9916h-4.9704v.0018zM53.8642 24.9602c0 .784.3326 1.4373.998 1.9599.665.5226 1.4442.7839 2.3376.7839 1.2648 0 2.3915-.4686 3.3837-1.4036.9924-.937 1.4874-2.0364 1.4874-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.2218 0-2.2402.295-3.0568.8829-.8167.5878-1.2259 1.3141-1.2259 2.1857zm3.8922-11.6285c2.2236 0 3.9782.5936 5.2658 1.7807 1.2856 1.1871 1.9282 2.8147 1.9282 4.8828v9.8647H62.073v-2.2212h-.131c-1.2426 1.829-2.9 2.7438-4.9702 2.7438-1.7658 0-3.2439-.5226-4.4306-1.5679-1.1882-1.0452-1.7824-2.3518-1.7824-3.9197 0-1.6556.6258-2.9717 1.8796-3.9515 1.2538-.9799 2.9264-1.4708 5.0192-1.4708 1.7861 0 3.2586.3267 4.4133.9799v-.6868c0-1.0453-.4148-1.9319-1.2424-2.6617-.8298-.7298-1.7977-1.0938-2.9095-1.0938-1.6799 0-3.0082.7074-3.9892 2.1241l-2.6499-1.6668c1.4613-2.0905 3.6195-3.1358 6.4765-3.1358zM81.4629 13.8543L71.4233 36.9154h-3.1058l3.728-8.069-6.6056-14.9921h3.27l4.7742 11.4979h.0654l4.6434-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M26.3729 18.3452c0-.9463-.0803-1.8591-.2317-2.7326H13.4536v5.1759h7.2669c-.3121 1.6872-1.2557 3.1227-2.687 4.084v3.3616h4.3369c2.5394-2.3406 4.0025-5.7993 4.0025-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M13.4536 31.4782c3.6307 0 6.6876-1.1909 8.9168-3.2441l-4.3369-3.3616c-1.2071.8119-2.7618 1.286-4.5799 1.286-3.50915 0-6.48766-2.363-7.55274-5.5473H1.43311v3.4624c2.21425 4.3901 6.76422 7.4046 12.02049 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M5.90095 20.6111c-.27281-.8119-.4223-1.678-.4223-2.572 0-.8941.14949-1.7602.4223-2.5721v-3.4625H1.43319C.517594 13.8188 0 15.8683 0 18.0391c0 2.1707.517594 4.2204 1.43319 6.0345l4.46776-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M13.4536 9.91964c1.9826 0 3.7596.68126 5.161 2.01586v.0019l3.8399-3.83577c-2.3319-2.16891-5.3721-3.50162-9.0009-3.50162-5.25627 0-9.80624 3.01446-12.02049 7.40459l4.46775 3.4624c1.06508-3.1843 4.04359-5.54736 7.55274-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+  <path android:pathData="M95.212 11.576l.252 2.436c3.024-.644 10.164-1.316 13.16-1.652-2.576 1.54-5.236 5.096-5.236 9.464 0 6.244 5.908 9.016 11.088 9.212l.812-2.324c-4.564-.168-9.66-1.904-9.66-7.364 0-3.332 2.436-7.588 6.412-8.876 1.428-.42 3.892-.448 5.488-.448v-2.24c-1.876.084-4.508.252-7.56.504-5.152.42-10.444.952-12.264 1.148-.532.056-1.428.112-2.492.14zm18.284 3.892l-1.428.616c.84 1.148 1.652 2.604 2.296 3.948l1.428-.672c-.588-1.232-1.652-2.968-2.296-3.892zm3.052-1.176l-1.372.644c.868 1.176 1.68 2.548 2.352 3.92l1.456-.7c-.644-1.232-1.764-2.94-2.436-3.864zm8.84-3.668h19.768v3.108h1.988V8.804H136.28v-2.24h-2.044v2.24h-10.78v4.928h1.932v-3.108zm10.248 14.14v2.856h-7.056v-2.856h7.056zm1.932 4.48V23.14H126.62v7.504h1.96v-1.4h8.988zm10.052-9.716h-4.172l.84-1.176c-2.1-1.12-5.908-2.492-9.072-3.304l.252-.504h8.68v-1.68H136c.14-.588.224-1.204.308-1.876h-1.932c-.084.7-.196 1.316-.336 1.876h-7.588v1.68h6.86c-1.148 1.82-3.388 2.828-7.98 3.444.336.364.812 1.092.952 1.54 4.088-.616 6.524-1.568 7.98-3.136 2.884.784 6.244 2.044 8.344 3.136h-19.6v1.876h18.508v8.344c0 .392-.084.476-.532.532-.476 0-2.016 0-3.696-.056.224.56.532 1.344.644 1.876 2.156 0 3.612.028 4.508-.28.896-.308 1.148-.868 1.148-2.016v-8.4h4.032v-1.876zM157.888 6.76c-1.596 4.34-4.256 8.596-7.112 11.312.392.476 1.036 1.568 1.288 2.044.952-.98 1.932-2.128 2.828-3.388v15.344h2.072V13.508c1.148-1.932 2.128-4.004 2.968-6.104l-2.044-.644zm18.34 6.02h-3.556V6.9h-2.1v5.88h-11.284v2.072h11.284V29.3c0 .644-.252.812-.868.868-.672.028-2.968.028-5.32-.056.308.56.7 1.512.812 2.044 3.024.028 4.9 0 5.992-.336 1.036-.308 1.484-.952 1.484-2.52V14.852h3.556V12.78zm-9.184 11.788c-.896-1.708-2.744-4.62-4.2-6.776l-1.792.84c1.428 2.24 3.22 5.236 4.06 6.972l1.932-1.036zm28.412-16.744h-2.548c.028.224.14 1.036.168 1.764.028.392.056 1.064.056 1.848-4.172.056-9.436.224-12.544.28l.056 2.156c3.5-.252 8.26-.448 12.516-.476.028.98.028 1.988.028 2.828-.56-.196-1.176-.308-1.876-.308-2.66 0-4.928 2.1-4.928 4.872 0 3.052 2.24 4.676 4.592 4.676.952 0 1.764-.252 2.436-.756-1.12 2.548-3.696 4.116-7.42 4.956l1.876 1.848c6.524-1.96 8.372-6.16 8.372-9.94 0-1.4-.308-2.632-.896-3.584-.028-1.288-.056-3.024-.056-4.62h.392c4.088 0 6.636.056 8.204.14l.028-2.072c-1.344 0-4.788-.028-8.204-.028h-.42c0-.756.028-1.4.028-1.82.028-.364.084-1.456.14-1.764zm-6.972 12.936c0-1.82 1.372-2.968 2.828-2.968 1.092 0 2.044.532 2.492 1.764.252 2.66-.812 3.976-2.464 3.976-1.568 0-2.856-1.036-2.856-2.772zm27.964 6.3c0-.98.98-1.792 2.24-1.792 2.128 0 3.528 1.596 3.752 3.808-.7.112-1.456.168-2.268.168-2.184 0-3.724-.84-3.724-2.184zm-3.584-17.696l.084 2.324c.588-.084 1.232-.14 1.848-.168 1.484-.084 7.084-.336 8.568-.392-1.428 1.26-4.928 4.2-6.496 5.488-1.624 1.372-5.208 4.368-7.532 6.272l1.596 1.652c3.556-3.612 6.048-5.6 10.724-5.6 3.64 0 6.272 2.072 6.272 4.816 0 2.296-1.26 3.92-3.5 4.788-.336-2.66-2.212-4.956-5.712-4.956-2.604 0-4.312 1.708-4.312 3.64 0 2.324 2.324 3.976 6.132 3.976 5.936 0 9.632-2.912 9.632-7.42 0-3.78-3.332-6.58-7.98-6.58-1.26 0-2.604.14-3.892.588 2.184-1.82 5.992-5.068 7.392-6.132.504-.42 1.064-.784 1.568-1.148l-1.288-1.624c-.28.084-.672.168-1.512.224-1.484.14-8.148.364-9.604.364-.56 0-1.344-.028-1.988-.112z" android:fillColor="#ffffff"/>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-ko-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-ko-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..0951612eec
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-ko-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="180dp" android:height="38dp" android:viewportWidth="180" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <group>
+    <group>
+      <path android:pathData="M38.5289 9.44664v8.16616h5.036c1.1996 0 2.1916-.4032 2.9764-1.2096.8054-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.4036-2.0364-1.209-2.8428-.7848-.82685-1.7768-1.24122-2.9764-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.0084V6.57217h7.9788c2.0276 0 3.7485.67569 5.1666 2.0252 1.439 1.34951 2.1582 2.99393 2.1582 4.93143 0 1.9822-.7194 3.6379-2.1582 4.965-1.3958 1.3289-3.1186 1.9916-5.1666 1.9916h-4.9704v.0018zM53.8642 25.0602c0 .784.3326 1.4373.998 1.9599.665.5226 1.4442.7839 2.3376.7839 1.2648 0 2.3915-.4686 3.3837-1.4036.9924-.937 1.4874-2.0364 1.4874-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.2218 0-2.2402.2949-3.0568.8829-.8167.5878-1.2259 1.3141-1.2259 2.1857zm3.8922-11.6285c2.2236 0 3.9782.5935 5.2658 1.7807 1.2856 1.1871 1.9282 2.8147 1.9282 4.8828v9.8647H62.073v-2.2212h-.131c-1.2426 1.829-2.9 2.7438-4.9702 2.7438-1.7658 0-3.2439-.5226-4.4306-1.5679-1.1882-1.0452-1.7824-2.3518-1.7824-3.9197 0-1.6556.6258-2.9717 1.8796-3.9515 1.2538-.9799 2.9264-1.4708 5.0192-1.4708 1.7861 0 3.2586.3266 4.4133.9799v-.6869c0-1.0452-.4148-1.9318-1.2424-2.6616-.8298-.7299-1.7977-1.0938-2.9095-1.0938-1.6799 0-3.0082.7074-3.9892 2.1241l-2.6499-1.6668c1.4613-2.0906 3.6195-3.1358 6.4765-3.1358zM81.4629 13.9543L71.4233 37.0154h-3.1058l3.728-8.069-6.6056-14.9921h3.27l4.7742 11.4979h.0654l4.6434-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M26.3729 18.4452c0-.9463-.0803-1.8591-.2317-2.7326H13.4536v5.1759h7.2669c-.3121 1.6872-1.2557 3.1227-2.687 4.084v3.3616h4.3369c2.5394-2.3406 4.0025-5.7993 4.0025-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M13.4536 31.5782c3.6307 0 6.6876-1.1909 8.9168-3.2441l-4.3369-3.3616c-1.2071.8119-2.7618 1.286-4.5799 1.286-3.50915 0-6.48766-2.363-7.55274-5.5473H1.43311v3.4624c2.21425 4.3901 6.76422 7.4046 12.02049 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M5.90095 20.7111c-.27281-.8119-.4223-1.678-.4223-2.5721 0-.894.14949-1.7601.4223-2.572v-3.4625H1.43319C.517594 13.9188 0 15.9683 0 18.139c0 2.1708.517594 4.2205 1.43319 6.0346l4.46776-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M13.4536 10.0196c1.9826 0 3.7596.6813 5.161 2.0159v.0019l3.8399-3.83578C20.1226 6.03271 17.0824 4.7 13.4536 4.7c-5.25627 0-9.80624 3.01446-12.02049 7.4046l4.46775 3.4624c1.06508-3.1843 4.04359-5.5474 7.55274-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+  <path android:pathData="M107 27.088v-4.732h8.036v-1.848H99.58v-4.06h14.868V8.804H97.256v1.876h14.952v3.92H97.312v7.756h7.364v4.732h-10.22v1.876h22.82v-1.876H107zm21.861-17.416v1.848h9.436c-.476 5.964-3.836 10.78-10.584 14l1.232 1.876c8.344-4.088 11.676-10.472 11.676-17.724h-11.76zm16.828-2.716v25.116h2.296V6.956h-2.296zm25.33 9.996h-12.46v-3.696h12.46v3.696zm2.296-8.988h-2.296v3.444h-12.46V7.964h-2.268v10.864h17.024V7.964zm2.884 13.888h-22.792V23.7h10.192v8.4h2.296v-8.4h10.304v-1.848z" android:fillColor="#3c4043"/>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-ko/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-ko/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..a54b6d3191
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-ko/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="180dp" android:height="38dp" android:viewportWidth="180" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <group>
+    <group>
+      <path android:pathData="M38.5289 9.34665v8.16615h5.036c1.1996 0 2.1916-.4032 2.9764-1.2096.8054-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.4036-2.0364-1.209-2.8428-.7848-.82684-1.7768-1.24121-2.9764-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.0084V6.47218h7.9788c2.0276 0 3.7485.67569 5.1666 2.0252 1.439 1.3495 2.1582 2.99392 2.1582 4.93142 0 1.9822-.7194 3.6379-2.1582 4.965-1.3958 1.3289-3.1186 1.9916-5.1666 1.9916h-4.9704v.0018zM53.8642 24.9602c0 .784.3326 1.4373.998 1.9599.665.5226 1.4442.7839 2.3376.7839 1.2648 0 2.3915-.4686 3.3837-1.4036.9924-.937 1.4874-2.0364 1.4874-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.2218 0-2.2402.295-3.0568.8829-.8167.5878-1.2259 1.3141-1.2259 2.1857zm3.8922-11.6285c2.2236 0 3.9782.5936 5.2658 1.7807 1.2856 1.1871 1.9282 2.8147 1.9282 4.8828v9.8647H62.073v-2.2212h-.131c-1.2426 1.829-2.9 2.7438-4.9702 2.7438-1.7658 0-3.2439-.5226-4.4306-1.5679-1.1882-1.0452-1.7824-2.3518-1.7824-3.9197 0-1.6556.6258-2.9717 1.8796-3.9515 1.2538-.9799 2.9264-1.4708 5.0192-1.4708 1.7861 0 3.2586.3267 4.4133.9799v-.6868c0-1.0453-.4148-1.9319-1.2424-2.6617-.8298-.7298-1.7977-1.0938-2.9095-1.0938-1.6799 0-3.0082.7074-3.9892 2.1241l-2.6499-1.6668c1.4613-2.0905 3.6195-3.1358 6.4765-3.1358zM81.4629 13.8543L71.4233 36.9154h-3.1058l3.728-8.069-6.6056-14.9921h3.27l4.7742 11.4979h.0654l4.6434-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M26.3729 18.3452c0-.9463-.0803-1.8591-.2317-2.7326H13.4536v5.1759h7.2669c-.3121 1.6872-1.2557 3.1227-2.687 4.084v3.3616h4.3369c2.5394-2.3406 4.0025-5.7993 4.0025-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M13.4536 31.4782c3.6307 0 6.6876-1.1909 8.9168-3.2441l-4.3369-3.3616c-1.2071.8119-2.7618 1.286-4.5799 1.286-3.50915 0-6.48766-2.363-7.55274-5.5473H1.43311v3.4624c2.21425 4.3901 6.76422 7.4046 12.02049 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M5.90095 20.6111c-.27281-.8119-.4223-1.678-.4223-2.572 0-.8941.14949-1.7602.4223-2.5721v-3.4625H1.43319C.517594 13.8188 0 15.8683 0 18.0391c0 2.1707.517594 4.2204 1.43319 6.0345l4.46776-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M13.4536 9.91964c1.9826 0 3.7596.68126 5.161 2.01586v.0019l3.8399-3.83577c-2.3319-2.16891-5.3721-3.50162-9.0009-3.50162-5.25627 0-9.80624 3.01446-12.02049 7.40459l4.46775 3.4624c1.06508-3.1843 4.04359-5.54736 7.55274-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+  <path android:pathData="M107 27.088v-4.732h8.036v-1.848H99.58v-4.06h14.868V8.804H97.256v1.876h14.952v3.92H97.312v7.756h7.364v4.732h-10.22v1.876h22.82v-1.876H107zm21.861-17.416v1.848h9.436c-.476 5.964-3.836 10.78-10.584 14l1.232 1.876c8.344-4.088 11.676-10.472 11.676-17.724h-11.76zm16.828-2.716v25.116h2.296V6.956h-2.296zm25.33 9.996h-12.46v-3.696h12.46v3.696zm2.296-8.988h-2.296v3.444h-12.46V7.964h-2.268v10.864h17.024V7.964zm2.884 13.888h-22.792V23.7h10.192v8.4h2.296v-8.4h10.304v-1.848z" android:fillColor="#ffffff"/>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-mdpi/googlepay_button_background_image.9.png b/donations/lib/src/gms/res/drawable-mdpi/googlepay_button_background_image.9.png
new file mode 100755
index 0000000000..a60464a360
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-mdpi/googlepay_button_background_image.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-mdpi/googlepay_button_background_image_focused.9.png b/donations/lib/src/gms/res/drawable-mdpi/googlepay_button_background_image_focused.9.png
new file mode 100755
index 0000000000..4b0729484c
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-mdpi/googlepay_button_background_image_focused.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-mdpi/googlepay_button_background_image_pressed.9.png b/donations/lib/src/gms/res/drawable-mdpi/googlepay_button_background_image_pressed.9.png
new file mode 100755
index 0000000000..4964cdc1b4
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-mdpi/googlepay_button_background_image_pressed.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-mdpi/googlepay_button_no_shadow_background_image.9.png b/donations/lib/src/gms/res/drawable-mdpi/googlepay_button_no_shadow_background_image.9.png
new file mode 100755
index 0000000000..d0be7ed2d5
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-mdpi/googlepay_button_no_shadow_background_image.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-mdpi/googlepay_button_no_shadow_background_image_focused.9.png b/donations/lib/src/gms/res/drawable-mdpi/googlepay_button_no_shadow_background_image_focused.9.png
new file mode 100755
index 0000000000..c98d387b16
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-mdpi/googlepay_button_no_shadow_background_image_focused.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-mdpi/googlepay_button_no_shadow_background_image_pressed.9.png b/donations/lib/src/gms/res/drawable-mdpi/googlepay_button_no_shadow_background_image_pressed.9.png
new file mode 100755
index 0000000000..340d4494ae
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-mdpi/googlepay_button_no_shadow_background_image_pressed.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-ms-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-ms-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..868979506a
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-ms-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="290dp" android:height="38dp" android:viewportWidth="290" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.42503 30V9.952h6.412c2.10937 0 3.91997.4293 5.43197 1.288 1.5307.84 2.7067 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8213 1.4933-1.9973 2.6693-3.528 3.528-1.512.84-3.3226 1.26-5.43197 1.26h-6.412zm3.08-2.912h3.248c2.27737 0 4.04137-.6347 5.29197-1.904 1.2694-1.2693 1.904-3.0053 1.904-5.208s-.6346-3.9387-1.904-5.208c-1.2506-1.2693-3.0146-1.904-5.29197-1.904h-3.248v14.224zm22.98217 3.36c-1.4 0-2.6507-.3267-3.752-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2987-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0827-.7093 2.324-1.064 3.724-1.064 1.4747 0 2.7253.3173 3.752.952 1.0453.6347 1.8387 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0093.392-.028.56 0 .168-.0093.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8587.7093 1.8293 1.064 2.912 1.064.9707 0 1.7733-.2147 2.408-.644.6347-.448 1.1387-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3893 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7093.616-1.1853 1.4373-1.428 2.464h7.924c-.0373-.4853-.196-.9893-.476-1.512-.28-.5227-.7093-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zM39.3687 30V15.72h2.856v2.1h.168c.3173-.728.8586-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7186.028.98.084.28.056.532.1213.756.196v3.136c-.3547-.1493-.7187-.2707-1.092-.364-.3547-.0933-.728-.14-1.12-.14-.7094 0-1.344.196-1.904.588-.5414.3733-.9707.8867-1.288 1.54-.3174.6347-.476 1.3347-.476 2.1V30h-3.024zm11.5383 0V15.72h2.856v1.96h.168c.4106-.6907 1.008-1.26 1.792-1.708.784-.4667 1.652-.7 2.604-.7 1.064 0 1.9693.252 2.716.756.7466.504 1.2786 1.1387 1.596 1.904.4666-.7467 1.1013-1.372 1.904-1.876.8026-.5227 1.7826-.784 2.94-.784 1.68 0 2.9306.5133 3.752 1.54.8213 1.008 1.232 2.352 1.232 4.032V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.4854-.5413-1.1667-.812-2.044-.812-.6907 0-1.2974.196-1.82.588-.5227.3733-.9334.8867-1.232 1.54-.28.6533-.42 1.3813-.42 2.184V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.504-.5413-1.2134-.812-2.128-.812-.672 0-1.26.196-1.764.588-.504.392-.9054.9147-1.204 1.568-.28.6533-.42 1.3813-.42 2.184V30h-3.024zm29.6081.448c-1.0267 0-1.9413-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm23.5119 2.464c-1.288 0-2.454-.3173-3.5-.952-1.026-.6533-1.8476-1.5493-2.4636-2.688-.5973-1.1573-.896-2.4733-.896-3.948s.2987-2.7813.896-3.92c.616-1.1387 1.4376-2.0347 2.4636-2.688 1.046-.6533 2.212-.98 3.5-.98 1.102 0 2.044.2427 2.828.728.803.4853 1.391 1.036 1.764 1.652h.168l-.168-1.988V9.952h2.996V30h-2.828v-1.904h-.168c-.373.616-.961 1.1667-1.764 1.652-.784.4667-1.726.7-2.828.7zm.448-2.772c.747 0 1.447-.196 2.1-.588.672-.392 1.204-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.392-.728-.924-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.746 0-1.446.196-2.1.588-.653.392-1.185.952-1.596 1.68-.41.7093-.616 1.5587-.616 2.548 0 .9893.206 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.654.392 1.354.588 2.1.588zm17.39 2.772c-1.4 0-2.651-.3267-3.752-.98-1.102-.6533-1.97-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.298-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.082-.7093 2.324-1.064 3.724-1.064 1.474 0 2.725.3173 3.752.952 1.045.6347 1.838 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.01.392-.028.56 0 .168-.01.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.858.7093 1.829 1.064 2.912 1.064.97 0 1.773-.2147 2.408-.644.634-.448 1.138-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.39 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.71.616-1.186 1.4373-1.428 2.464h7.924c-.038-.4853-.196-.9893-.476-1.512-.28-.5227-.71-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zM132.278 30V15.72h2.856v1.96h.168c.411-.6907 1.017-1.26 1.82-1.708.821-.4667 1.717-.7 2.688-.7 1.755 0 3.071.5227 3.948 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.289-1.9973-.868-2.52-.579-.5413-1.335-.812-2.268-.812-.728 0-1.363.2053-1.904.616-.541.392-.971.9147-1.288 1.568-.299.6533-.448 1.3533-.448 2.1V30h-3.024zm22.846 6.496c-1.251 0-2.334-.2053-3.248-.616-.896-.392-1.624-.9053-2.184-1.54-.56-.616-.962-1.2507-1.204-1.904l2.8-1.176c.298.7467.774 1.3533 1.428 1.82.672.4853 1.474.728 2.408.728 1.306 0 2.333-.392 3.08-1.176.765-.784 1.148-1.8947 1.148-3.332v-1.372h-.168c-.448.672-1.074 1.2133-1.876 1.624-.784.392-1.68.588-2.688.588-1.214 0-2.324-.308-3.332-.924-1.008-.616-1.82-1.4747-2.436-2.576-.616-1.12-.924-2.4267-.924-3.92 0-1.512.308-2.8187.924-3.92.616-1.12 1.428-1.988 2.436-2.604 1.008-.616 2.118-.924 3.332-.924 1.008 0 1.904.2053 2.688.616.802.4107 1.428.952 1.876 1.624h.168V15.72h2.884v13.524c0 1.5493-.308 2.8653-.924 3.948-.598 1.0827-1.428 1.904-2.492 2.464s-2.296.84-3.696.84zm.028-9.1c.746 0 1.437-.1773 2.072-.532.634-.3733 1.148-.9053 1.54-1.596.392-.7093.588-1.5587.588-2.548 0-1.0267-.196-1.8853-.588-2.576-.392-.7093-.906-1.2413-1.54-1.596-.635-.3547-1.326-.532-2.072-.532-.747 0-1.447.1867-2.1.56-.635.3547-1.148.8773-1.54 1.568-.392.6907-.588 1.5493-.588 2.576 0 1.008.196 1.8667.588 2.576.392.6907.905 1.2133 1.54 1.568.653.3547 1.353.532 2.1.532zm15.265 3.052c-1.027 0-1.942-.196-2.744-.588-.803-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.261-1.8667.784-2.576.541-.728 1.26-1.2787 2.156-1.652.896-.3733 1.885-.56 2.968-.56.896 0 1.68.084 2.352.252.69.168 1.213.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.419.168-2.072.504-.654.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.026-.504 2.146-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.374.5787-.934 1.092-1.68 1.54-.747.448-1.643.672-2.688.672zm.532-2.464c.784 0 1.474-.1867 2.072-.56.597-.3733 1.064-.8587 1.4-1.456.354-.616.532-1.2787.532-1.988-.43-.2427-.934-.4387-1.512-.588-.579-.168-1.195-.252-1.848-.252-1.232 0-2.11.252-2.632.756-.523.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM181.522 30V15.72h2.856v1.96h.168c.41-.6907 1.017-1.26 1.82-1.708.821-.4667 1.717-.7 2.688-.7 1.754 0 3.07.5227 3.948 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.29-1.9973-.868-2.52-.579-.5413-1.335-.812-2.268-.812-.728 0-1.363.2053-1.904.616-.542.392-.971.9147-1.288 1.568-.299.6533-.448 1.3533-.448 2.1V30h-3.024z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M246.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM261.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM289.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M234.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M221.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M213.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M221.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C228.123 6.03271 225.082 4.7 221.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-ms/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-ms/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..18c0936d5f
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-ms/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="290dp" android:height="38dp" android:viewportWidth="290" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.42503 30V9.952h6.412c2.10937 0 3.91997.4293 5.43197 1.288 1.5307.84 2.7067 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8213 1.4933-1.9973 2.6693-3.528 3.528-1.512.84-3.3226 1.26-5.43197 1.26h-6.412zm3.08-2.912h3.248c2.27737 0 4.04137-.6347 5.29197-1.904 1.2694-1.2693 1.904-3.0053 1.904-5.208s-.6346-3.9387-1.904-5.208c-1.2506-1.2693-3.0146-1.904-5.29197-1.904h-3.248v14.224zm22.98217 3.36c-1.4 0-2.6507-.3267-3.752-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2987-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0827-.7093 2.324-1.064 3.724-1.064 1.4747 0 2.7253.3173 3.752.952 1.0453.6347 1.8387 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0093.392-.028.56 0 .168-.0093.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8587.7093 1.8293 1.064 2.912 1.064.9707 0 1.7733-.2147 2.408-.644.6347-.448 1.1387-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3893 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7093.616-1.1853 1.4373-1.428 2.464h7.924c-.0373-.4853-.196-.9893-.476-1.512-.28-.5227-.7093-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zM39.3687 30V15.72h2.856v2.1h.168c.3173-.728.8586-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7186.028.98.084.28.056.532.1213.756.196v3.136c-.3547-.1493-.7187-.2707-1.092-.364-.3547-.0933-.728-.14-1.12-.14-.7094 0-1.344.196-1.904.588-.5414.3733-.9707.8867-1.288 1.54-.3174.6347-.476 1.3347-.476 2.1V30h-3.024zm11.5383 0V15.72h2.856v1.96h.168c.4106-.6907 1.008-1.26 1.792-1.708.784-.4667 1.652-.7 2.604-.7 1.064 0 1.9693.252 2.716.756.7466.504 1.2786 1.1387 1.596 1.904.4666-.7467 1.1013-1.372 1.904-1.876.8026-.5227 1.7826-.784 2.94-.784 1.68 0 2.9306.5133 3.752 1.54.8213 1.008 1.232 2.352 1.232 4.032V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.4854-.5413-1.1667-.812-2.044-.812-.6907 0-1.2974.196-1.82.588-.5227.3733-.9334.8867-1.232 1.54-.28.6533-.42 1.3813-.42 2.184V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.504-.5413-1.2134-.812-2.128-.812-.672 0-1.26.196-1.764.588-.504.392-.9054.9147-1.204 1.568-.28.6533-.42 1.3813-.42 2.184V30h-3.024zm29.6081.448c-1.0267 0-1.9413-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm23.5119 2.464c-1.288 0-2.454-.3173-3.5-.952-1.026-.6533-1.8476-1.5493-2.4636-2.688-.5973-1.1573-.896-2.4733-.896-3.948s.2987-2.7813.896-3.92c.616-1.1387 1.4376-2.0347 2.4636-2.688 1.046-.6533 2.212-.98 3.5-.98 1.102 0 2.044.2427 2.828.728.803.4853 1.391 1.036 1.764 1.652h.168l-.168-1.988V9.952h2.996V30h-2.828v-1.904h-.168c-.373.616-.961 1.1667-1.764 1.652-.784.4667-1.726.7-2.828.7zm.448-2.772c.747 0 1.447-.196 2.1-.588.672-.392 1.204-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.392-.728-.924-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.746 0-1.446.196-2.1.588-.653.392-1.185.952-1.596 1.68-.41.7093-.616 1.5587-.616 2.548 0 .9893.206 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.654.392 1.354.588 2.1.588zm17.39 2.772c-1.4 0-2.651-.3267-3.752-.98-1.102-.6533-1.97-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.298-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.082-.7093 2.324-1.064 3.724-1.064 1.474 0 2.725.3173 3.752.952 1.045.6347 1.838 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.01.392-.028.56 0 .168-.01.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.858.7093 1.829 1.064 2.912 1.064.97 0 1.773-.2147 2.408-.644.634-.448 1.138-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.39 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.71.616-1.186 1.4373-1.428 2.464h7.924c-.038-.4853-.196-.9893-.476-1.512-.28-.5227-.71-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zM132.278 30V15.72h2.856v1.96h.168c.411-.6907 1.017-1.26 1.82-1.708.821-.4667 1.717-.7 2.688-.7 1.755 0 3.071.5227 3.948 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.289-1.9973-.868-2.52-.579-.5413-1.335-.812-2.268-.812-.728 0-1.363.2053-1.904.616-.541.392-.971.9147-1.288 1.568-.299.6533-.448 1.3533-.448 2.1V30h-3.024zm22.846 6.496c-1.251 0-2.334-.2053-3.248-.616-.896-.392-1.624-.9053-2.184-1.54-.56-.616-.962-1.2507-1.204-1.904l2.8-1.176c.298.7467.774 1.3533 1.428 1.82.672.4853 1.474.728 2.408.728 1.306 0 2.333-.392 3.08-1.176.765-.784 1.148-1.8947 1.148-3.332v-1.372h-.168c-.448.672-1.074 1.2133-1.876 1.624-.784.392-1.68.588-2.688.588-1.214 0-2.324-.308-3.332-.924-1.008-.616-1.82-1.4747-2.436-2.576-.616-1.12-.924-2.4267-.924-3.92 0-1.512.308-2.8187.924-3.92.616-1.12 1.428-1.988 2.436-2.604 1.008-.616 2.118-.924 3.332-.924 1.008 0 1.904.2053 2.688.616.802.4107 1.428.952 1.876 1.624h.168V15.72h2.884v13.524c0 1.5493-.308 2.8653-.924 3.948-.598 1.0827-1.428 1.904-2.492 2.464s-2.296.84-3.696.84zm.028-9.1c.746 0 1.437-.1773 2.072-.532.634-.3733 1.148-.9053 1.54-1.596.392-.7093.588-1.5587.588-2.548 0-1.0267-.196-1.8853-.588-2.576-.392-.7093-.906-1.2413-1.54-1.596-.635-.3547-1.326-.532-2.072-.532-.747 0-1.447.1867-2.1.56-.635.3547-1.148.8773-1.54 1.568-.392.6907-.588 1.5493-.588 2.576 0 1.008.196 1.8667.588 2.576.392.6907.905 1.2133 1.54 1.568.653.3547 1.353.532 2.1.532zm15.265 3.052c-1.027 0-1.942-.196-2.744-.588-.803-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.261-1.8667.784-2.576.541-.728 1.26-1.2787 2.156-1.652.896-.3733 1.885-.56 2.968-.56.896 0 1.68.084 2.352.252.69.168 1.213.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.419.168-2.072.504-.654.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.026-.504 2.146-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.374.5787-.934 1.092-1.68 1.54-.747.448-1.643.672-2.688.672zm.532-2.464c.784 0 1.474-.1867 2.072-.56.597-.3733 1.064-.8587 1.4-1.456.354-.616.532-1.2787.532-1.988-.43-.2427-.934-.4387-1.512-.588-.579-.168-1.195-.252-1.848-.252-1.232 0-2.11.252-2.632.756-.523.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM181.522 30V15.72h2.856v1.96h.168c.41-.6907 1.017-1.26 1.82-1.708.821-.4667 1.717-.7 2.688-.7 1.754 0 3.07.5227 3.948 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.29-1.9973-.868-2.52-.579-.5413-1.335-.812-2.268-.812-.728 0-1.363.2053-1.904.616-.542.392-.971.9147-1.288 1.568-.299.6533-.448 1.3533-.448 2.1V30h-3.024z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M246.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM261.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM289.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M234.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M221.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M213.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M221.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-night-hdpi/googlepay_button_background_image.9.png b/donations/lib/src/gms/res/drawable-night-hdpi/googlepay_button_background_image.9.png
new file mode 100755
index 0000000000..1d6c0e3730
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-night-hdpi/googlepay_button_background_image.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-night-hdpi/googlepay_button_no_shadow_background_image.9.png b/donations/lib/src/gms/res/drawable-night-hdpi/googlepay_button_no_shadow_background_image.9.png
new file mode 100755
index 0000000000..affa0d38c8
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-night-hdpi/googlepay_button_no_shadow_background_image.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-night-mdpi/googlepay_button_background_image.9.png b/donations/lib/src/gms/res/drawable-night-mdpi/googlepay_button_background_image.9.png
new file mode 100755
index 0000000000..98ece61c9a
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-night-mdpi/googlepay_button_background_image.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-night-mdpi/googlepay_button_no_shadow_background_image.9.png b/donations/lib/src/gms/res/drawable-night-mdpi/googlepay_button_no_shadow_background_image.9.png
new file mode 100755
index 0000000000..5d2ca4a449
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-night-mdpi/googlepay_button_no_shadow_background_image.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-night-v21/googlepay_button_background.xml b/donations/lib/src/gms/res/drawable-night-v21/googlepay_button_background.xml
new file mode 100755
index 0000000000..b0a94f3918
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-night-v21/googlepay_button_background.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#1f000000">
+    <item>
+        <selector xmlns:android="http://schemas.android.com/apk/res/android" >
+            <item
+                android:state_enabled="false"
+                android:state_focused="true"
+                android:drawable="@drawable/googlepay_button_background_image_focused" />
+            <item
+                android:state_enabled="false"
+                android:drawable="@drawable/googlepay_button_background_image" />
+            <!-- Skipping state_pressed="true" because the ripple effect is sufficient feedback -->
+            <item
+                android:state_focused="true"
+                android:drawable="@drawable/googlepay_button_background_image_focused" />
+            <item
+                android:drawable="@drawable/googlepay_button_background_image" />
+        </selector>
+    </item>
+</ripple>
diff --git a/donations/lib/src/gms/res/drawable-night-v21/googlepay_button_no_shadow_background.xml b/donations/lib/src/gms/res/drawable-night-v21/googlepay_button_no_shadow_background.xml
new file mode 100755
index 0000000000..c39fc11f0f
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-night-v21/googlepay_button_no_shadow_background.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#1f000000">
+    <item>
+        <selector xmlns:android="http://schemas.android.com/apk/res/android" >
+            <item
+                android:state_enabled="false"
+                android:state_focused="true"
+                android:drawable="@drawable/googlepay_button_no_shadow_background_image_focused" />
+            <item
+                android:state_enabled="false"
+                android:drawable="@drawable/googlepay_button_no_shadow_background_image" />
+            <!-- Skipping state_pressed="true" because the ripple effect is sufficient feedback -->
+            <item
+                android:state_focused="true"
+                android:drawable="@drawable/googlepay_button_no_shadow_background_image_focused" />
+            <item
+                android:drawable="@drawable/googlepay_button_no_shadow_background_image" />
+        </selector>
+    </item>
+</ripple>
diff --git a/donations/lib/src/gms/res/drawable-night-xhdpi/googlepay_button_background_image.9.png b/donations/lib/src/gms/res/drawable-night-xhdpi/googlepay_button_background_image.9.png
new file mode 100755
index 0000000000..2424f96860
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-night-xhdpi/googlepay_button_background_image.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-night-xhdpi/googlepay_button_no_shadow_background_image.9.png b/donations/lib/src/gms/res/drawable-night-xhdpi/googlepay_button_no_shadow_background_image.9.png
new file mode 100755
index 0000000000..95482f4f55
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-night-xhdpi/googlepay_button_no_shadow_background_image.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-night-xxhdpi/googlepay_button_background_image.9.png b/donations/lib/src/gms/res/drawable-night-xxhdpi/googlepay_button_background_image.9.png
new file mode 100755
index 0000000000..a6a1b1876d
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-night-xxhdpi/googlepay_button_background_image.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-night-xxhdpi/googlepay_button_no_shadow_background_image.9.png b/donations/lib/src/gms/res/drawable-night-xxhdpi/googlepay_button_no_shadow_background_image.9.png
new file mode 100755
index 0000000000..69b8340094
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-night-xxhdpi/googlepay_button_no_shadow_background_image.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-night-xxxhdpi/googlepay_button_background_image.9.png b/donations/lib/src/gms/res/drawable-night-xxxhdpi/googlepay_button_background_image.9.png
new file mode 100755
index 0000000000..7c781080cc
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-night-xxxhdpi/googlepay_button_background_image.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-night-xxxhdpi/googlepay_button_no_shadow_background_image.9.png b/donations/lib/src/gms/res/drawable-night-xxxhdpi/googlepay_button_no_shadow_background_image.9.png
new file mode 100755
index 0000000000..41dfb83724
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-night-xxxhdpi/googlepay_button_no_shadow_background_image.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..420a7971b0
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="256dp" android:height="38dp" android:viewportWidth="256" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.90472 30V9.952h6.41198c2.1094 0 3.92.4293 5.432 1.288 1.5307.84 2.7067 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8213 1.4933-1.9973 2.6693-3.528 3.528-1.512.84-3.3226 1.26-5.432 1.26H3.90472zm3.08-2.912h3.24798c2.2774 0 4.0414-.6347 5.292-1.904 1.2694-1.2693 1.904-3.0053 1.904-5.208s-.6346-3.9387-1.904-5.208c-1.2506-1.2693-3.0146-1.904-5.292-1.904H6.98472v14.224zm23.17818 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6347 1.1387.952 2.4173.952 3.836 0 1.4373-.3173 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM40.4226 30V15.72h2.856v1.96h.168c.4107-.6907 1.0173-1.26 1.82-1.708.8213-.4667 1.7173-.7 2.688-.7 1.7547 0 3.0707.5227 3.948 1.568.8773 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2893-1.9973-.868-2.52-.5787-.5413-1.3347-.812-2.268-.812-.728 0-1.3627.2053-1.904.616-.5413.392-.9707.9147-1.288 1.568-.2987.6533-.448 1.3533-.448 2.1V30h-3.024zm20.8855.448c-1.0267 0-1.9414-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6906.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6534.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0266-.504 2.1466-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3734.5787-.9334 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4746-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3546-.616.532-1.2787.532-1.988-.4294-.2427-.9334-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1094.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm11.8117-2.128v-7.504h-2.492V15.72h2.492v-4.032h3.024v4.032h3.5v2.632h-3.5v6.86c0 .7093.14 1.2507.42 1.624.2986.3733.7933.56 1.484.56.3546 0 .6533-.0467.896-.14.2613-.0933.5226-.224.784-.392v2.94c-.3174.1307-.6534.2333-1.008.308-.3547.0747-.7747.112-1.26.112-1.3254 0-2.38-.3827-3.164-1.148-.784-.784-1.176-1.8573-1.176-3.22zm15.7026 4.592c-1.4 0-2.6507-.3267-3.752-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2987-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0827-.7093 2.324-1.064 3.724-1.064 1.4747 0 2.7253.3173 3.752.952 1.0453.6347 1.8387 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0093.392-.028.56 0 .168-.0093.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8587.7093 1.8293 1.064 2.912 1.064.9707 0 1.7733-.2147 2.408-.644.6347-.448 1.1387-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3893 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7093.616-1.1853 1.4373-1.428 2.464h7.924c-.0373-.4853-.196-.9893-.476-1.512-.28-.5227-.7093-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zM109.067 30l-4.564-14.28h3.276l2.94 10.276h.112l3.22-10.276h3.108l3.22 10.276h.112l2.94-10.276h3.22L122.059 30h-3.164l-3.304-10.332h-.112L112.203 30h-3.136zm21.571-16.38c-.56 0-1.045-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.411-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.411.392.616.868.616 1.428 0 .56-.205 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM129.126 30V15.72h3.024V30h-3.024zm8.452-4.144v-7.504h-2.492V15.72h2.492v-4.032h3.024v4.032h3.5v2.632h-3.5v6.86c0 .7093.14 1.2507.42 1.624.298.3733.793.56 1.484.56.354 0 .653-.0467.896-.14.261-.0933.522-.224.784-.392v2.94c-.318.1307-.654.2333-1.008.308-.355.0747-.775.112-1.26.112-1.326 0-2.38-.3827-3.164-1.148-.784-.784-1.176-1.8573-1.176-3.22zM147.44 30V9.952h3.024v5.488l-.168 2.24h.168c.392-.6907.989-1.26 1.792-1.708.821-.4667 1.726-.7 2.716-.7 1.773 0 3.108.532 4.004 1.596.896 1.0453 1.344 2.4173 1.344 4.116V30h-2.996v-8.624c0-1.1573-.308-1.9973-.924-2.52-.598-.5413-1.335-.812-2.212-.812-.728 0-1.372.2053-1.932.616-.56.4107-.999.952-1.316 1.624-.318.6533-.476 1.3533-.476 2.1V30h-3.024z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M212.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM227.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM255.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M200.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M187.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M179.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M187.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C194.123 6.03271 191.082 4.7 187.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-night/googlepay_button_background.xml b/donations/lib/src/gms/res/drawable-night/googlepay_button_background.xml
new file mode 100755
index 0000000000..8f138dc545
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-night/googlepay_button_background.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:state_enabled="false"
+        android:state_focused="true"
+        android:drawable="@drawable/googlepay_button_background_image_focused" />
+    <item
+        android:state_enabled="false"
+        android:drawable="@drawable/googlepay_button_background_image" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/googlepay_button_background_image_pressed" />
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/googlepay_button_background_image_focused" />
+    <item
+        android:drawable="@drawable/googlepay_button_background_image" />
+</selector>
diff --git a/donations/lib/src/gms/res/drawable-night/googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-night/googlepay_button_content.xml
new file mode 100755
index 0000000000..57596ba5f0
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-night/googlepay_button_content.xml
@@ -0,0 +1,48 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="41dp"
+        android:height="17dp"
+        android:viewportWidth="41.0"
+        android:viewportHeight="17.0">
+    <path
+        android:pathData="M19.526,2.635L19.526,6.718L22.044,6.718C22.644,6.718 23.14,6.516 23.532,6.113C23.935,5.711 24.137,5.231 24.137,4.676C24.137,4.132 23.935,3.658 23.532,3.254C23.14,2.841 22.644,2.634 22.044,2.634L19.526,2.634L19.526,2.635ZM19.526,8.155L19.526,12.891L18.022,12.891L18.022,1.198L22.011,1.198C23.025,1.198 23.885,1.535 24.594,2.21C25.314,2.885 25.674,3.707 25.674,4.676C25.674,5.667 25.314,6.495 24.594,7.158C23.897,7.823 23.035,8.154 22.011,8.154L19.526,8.154L19.526,8.155Z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#5F6368"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M27.194,10.442C27.194,10.834 27.36,11.16 27.693,11.422C28.025,11.683 28.415,11.813 28.861,11.813C29.494,11.813 30.057,11.579 30.553,11.112C31.05,10.643 31.297,10.093 31.297,9.463C30.828,9.092 30.174,8.907 29.335,8.907C28.724,8.907 28.215,9.055 27.807,9.349C27.398,9.643 27.194,10.006 27.194,10.442M29.14,4.627C30.252,4.627 31.129,4.924 31.773,5.518C32.415,6.111 32.737,6.925 32.737,7.959L32.737,12.891L31.298,12.891L31.298,11.781L31.233,11.781C30.611,12.695 29.783,13.153 28.747,13.153C27.865,13.153 27.126,12.891 26.532,12.369C25.938,11.846 25.641,11.193 25.641,10.409C25.641,9.581 25.954,8.923 26.581,8.433C27.208,7.943 28.044,7.698 29.09,7.698C29.983,7.698 30.72,7.861 31.297,8.188L31.297,7.844C31.297,7.322 31.09,6.878 30.676,6.513C30.261,6.149 29.777,5.967 29.221,5.967C28.381,5.967 27.717,6.32 27.226,7.029L25.902,6.195C26.632,5.15 27.711,4.627 29.14,4.627"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#5F6368"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M40.993,4.889l-5.02,11.531l-1.553,0l1.864,-4.035l-3.303,-7.496l1.635,0l2.387,5.749l0.033,0l2.322,-5.749z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#5F6368"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M13.448,7.134C13.448,6.661 13.408,6.205 13.332,5.768L6.988,5.768L6.988,8.356L10.622,8.356C10.466,9.199 9.994,9.917 9.278,10.398L9.278,12.079L11.447,12.079C12.716,10.908 13.448,9.179 13.448,7.134"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#4285F4"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M6.988,13.701C8.804,13.701 10.332,13.105 11.447,12.079L9.278,10.398C8.675,10.804 7.897,11.041 6.988,11.041C5.234,11.041 3.744,9.859 3.212,8.267L0.978,8.267L0.978,9.998C2.085,12.193 4.36,13.701 6.988,13.701"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#34A853"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M3.212,8.267C3.076,7.861 3.001,7.428 3.001,6.981C3.001,6.534 3.076,6.101 3.212,5.695L3.212,3.964L0.978,3.964C0.52,4.871 0.261,5.896 0.261,6.981C0.261,8.066 0.52,9.091 0.978,9.998L3.212,8.267Z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#FABB05"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M6.988,2.921C7.98,2.921 8.868,3.262 9.569,3.929L9.569,3.93L11.489,2.012C10.323,0.928 8.803,0.261 6.988,0.261C4.36,0.261 2.085,1.769 0.978,3.964L3.212,5.695C3.744,4.103 5.234,2.921 6.988,2.921"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#E94235"
+        android:strokeWidth="1"/>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-night/googlepay_button_no_shadow_background.xml b/donations/lib/src/gms/res/drawable-night/googlepay_button_no_shadow_background.xml
new file mode 100755
index 0000000000..d6eab82b3a
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-night/googlepay_button_no_shadow_background.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:state_enabled="false"
+        android:state_focused="true"
+        android:drawable="@drawable/googlepay_button_no_shadow_background_image_focused" />
+    <item
+        android:state_enabled="false"
+        android:drawable="@drawable/googlepay_button_no_shadow_background_image" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/googlepay_button_no_shadow_background_image_pressed" />
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/googlepay_button_no_shadow_background_image_focused" />
+    <item
+        android:drawable="@drawable/googlepay_button_no_shadow_background_image" />
+</selector>
diff --git a/donations/lib/src/gms/res/drawable-night/googlepay_button_overlay.xml b/donations/lib/src/gms/res/drawable-night/googlepay_button_overlay.xml
new file mode 100755
index 0000000000..6e46c44805
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-night/googlepay_button_overlay.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_enabled="false">
+        <shape
+            android:shape="rectangle" >
+            <corners android:radius="4dp"/>
+            <solid android:color="#7FFFFFFF"/>
+        </shape>
+    </item>
+    <item android:drawable="@android:color/transparent" />
+</selector>
diff --git a/donations/lib/src/gms/res/drawable-nl-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-nl-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..c803acd121
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-nl-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="268dp" android:height="38dp" android:viewportWidth="268" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.62738 30V9.952h6.41202c2.1093 0 3.92.4293 5.432 1.288 1.5306.84 2.7066 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8214 1.4933-1.9974 2.6693-3.528 3.528-1.512.84-3.3227 1.26-5.432 1.26H3.62738zm3.08-2.912h3.248c2.27732 0 4.04132-.6347 5.29202-1.904 1.2693-1.2693 1.904-3.0053 1.904-5.208s-.6347-3.9387-1.904-5.208c-1.2507-1.2693-3.0147-1.904-5.29202-1.904h-3.248v14.224zm23.17822 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9974-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6346-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6346 1.1387.952 2.4173.952 3.836 0 1.4373-.3174 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5214.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6906.3733 1.428.56 2.212.56zM40.1452 30V15.72h2.856v1.96h.168c.4107-.6907 1.0174-1.26 1.82-1.708.8214-.4667 1.7174-.7 2.688-.7 1.7547 0 3.0707.5227 3.948 1.568.8774 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2893-1.9973-.868-2.52-.5786-.5413-1.3346-.812-2.268-.812-.728 0-1.3626.2053-1.904.616-.5413.392-.9706.9147-1.288 1.568-.2986.6533-.448 1.3533-.448 2.1V30h-3.024zm23.0662.448c-1.4 0-2.6506-.3267-3.752-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2987-2.6227.896-3.78.5974-1.1573 1.428-2.0813 2.492-2.772 1.0827-.7093 2.324-1.064 3.724-1.064 1.4747 0 2.7254.3173 3.752.952 1.0454.6347 1.8387 1.5027 2.38 2.604.5414 1.1013.812 2.3427.812 3.724 0 .2053-.0093.392-.028.56 0 .168-.0093.2987-.028.392h-11.032c.1494 1.4187.644 2.4827 1.484 3.192.8587.7093 1.8294 1.064 2.912 1.064.9707 0 1.7734-.2147 2.408-.644.6347-.448 1.1387-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3893 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8666.308-2.576.924-.7093.616-1.1853 1.4373-1.428 2.464h7.924c-.0373-.4853-.196-.9893-.476-1.512-.28-.5227-.7093-.9613-1.288-1.316-.56-.3733-1.2786-.56-2.156-.56zM73.0929 30V15.72h2.856v2.1h.168c.3173-.728.8587-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7187.028.98.084.28.056.532.1213.756.196v3.136c-.3547-.1493-.7187-.2707-1.092-.364-.3547-.0933-.728-.14-1.12-.14-.7093 0-1.344.196-1.904.588-.5413.3733-.9707.8867-1.288 1.54-.3173.6347-.476 1.3347-.476 2.1V30h-3.024zm17.2146.448c-1.4 0-2.6506-.3267-3.752-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2987-2.6227.896-3.78.5974-1.1573 1.428-2.0813 2.492-2.772 1.0827-.7093 2.324-1.064 3.724-1.064 1.4747 0 2.7254.3173 3.752.952 1.0454.6347 1.8387 1.5027 2.38 2.604.5414 1.1013.812 2.3427.812 3.724 0 .2053-.0093.392-.028.56 0 .168-.0093.2987-.028.392h-11.032c.1494 1.4187.644 2.4827 1.484 3.192.8587.7093 1.8294 1.064 2.912 1.064.9707 0 1.7734-.2147 2.408-.644.6347-.448 1.1387-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3893 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8666.308-2.576.924-.7093.616-1.1853 1.4373-1.428 2.464h7.924c-.0373-.4853-.196-.9893-.476-1.512-.28-.5227-.7093-.9613-1.288-1.316-.56-.3733-1.2786-.56-2.156-.56zM100.189 30V15.72h2.856v1.96h.168c.411-.6907 1.017-1.26 1.82-1.708.821-.4667 1.717-.7 2.688-.7 1.755 0 3.071.5227 3.948 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.289-1.9973-.868-2.52-.579-.5413-1.335-.812-2.268-.812-.728 0-1.363.2053-1.904.616-.541.392-.971.9147-1.288 1.568-.299.6533-.448 1.3533-.448 2.1V30h-3.024zm23.377 0V15.72h2.856v1.96h.168c.411-.6907 1.008-1.26 1.792-1.708.784-.4667 1.652-.7 2.604-.7 1.064 0 1.97.252 2.716.756.747.504 1.279 1.1387 1.596 1.904.467-.7467 1.102-1.372 1.904-1.876.803-.5227 1.783-.784 2.94-.784 1.68 0 2.931.5133 3.752 1.54.822 1.008 1.232 2.352 1.232 4.032V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.485-.5413-1.166-.812-2.044-.812-.69 0-1.297.196-1.82.588-.522.3733-.933.8867-1.232 1.54-.28.6533-.42 1.3813-.42 2.184V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.504-.5413-1.213-.812-2.128-.812-.672 0-1.26.196-1.764.588-.504.392-.905.9147-1.204 1.568-.28.6533-.42 1.3813-.42 2.184V30h-3.024zm31.789.448c-1.4 0-2.65-.3267-3.752-.98-1.101-.6533-1.969-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.598-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.726.3173 3.752.952 1.046.6347 1.839 1.5027 2.38 2.604.542 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.15 1.4187.644 2.4827 1.484 3.192.859.7093 1.83 1.064 2.912 1.064.971 0 1.774-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.866.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.278-.56-2.156-.56zm11.124 8.008v-7.504h-2.492V15.72h2.492v-4.032h3.024v4.032h3.5v2.632h-3.5v6.86c0 .7093.14 1.2507.42 1.624.298.3733.793.56 1.484.56.354 0 .653-.0467.896-.14.261-.0933.522-.224.784-.392v2.94c-.318.1307-.654.2333-1.008.308-.355.0747-.775.112-1.26.112-1.326 0-2.38-.3827-3.164-1.148-.784-.784-1.176-1.8573-1.176-3.22z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M224.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM239.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM267.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M212.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M199.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M191.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M199.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C206.123 6.03271 203.082 4.7 199.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-nl/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-nl/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..4a3dc7bfbc
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-nl/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="268dp" android:height="38dp" android:viewportWidth="268" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.62738 30V9.952h6.41202c2.1093 0 3.92.4293 5.432 1.288 1.5306.84 2.7066 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8214 1.4933-1.9974 2.6693-3.528 3.528-1.512.84-3.3227 1.26-5.432 1.26H3.62738zm3.08-2.912h3.248c2.27732 0 4.04132-.6347 5.29202-1.904 1.2693-1.2693 1.904-3.0053 1.904-5.208s-.6347-3.9387-1.904-5.208c-1.2507-1.2693-3.0147-1.904-5.29202-1.904h-3.248v14.224zm23.17822 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9974-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6346-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6346 1.1387.952 2.4173.952 3.836 0 1.4373-.3174 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5214.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6906.3733 1.428.56 2.212.56zM40.1452 30V15.72h2.856v1.96h.168c.4107-.6907 1.0174-1.26 1.82-1.708.8214-.4667 1.7174-.7 2.688-.7 1.7547 0 3.0707.5227 3.948 1.568.8774 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2893-1.9973-.868-2.52-.5786-.5413-1.3346-.812-2.268-.812-.728 0-1.3626.2053-1.904.616-.5413.392-.9706.9147-1.288 1.568-.2986.6533-.448 1.3533-.448 2.1V30h-3.024zm23.0662.448c-1.4 0-2.6506-.3267-3.752-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2987-2.6227.896-3.78.5974-1.1573 1.428-2.0813 2.492-2.772 1.0827-.7093 2.324-1.064 3.724-1.064 1.4747 0 2.7254.3173 3.752.952 1.0454.6347 1.8387 1.5027 2.38 2.604.5414 1.1013.812 2.3427.812 3.724 0 .2053-.0093.392-.028.56 0 .168-.0093.2987-.028.392h-11.032c.1494 1.4187.644 2.4827 1.484 3.192.8587.7093 1.8294 1.064 2.912 1.064.9707 0 1.7734-.2147 2.408-.644.6347-.448 1.1387-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3893 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8666.308-2.576.924-.7093.616-1.1853 1.4373-1.428 2.464h7.924c-.0373-.4853-.196-.9893-.476-1.512-.28-.5227-.7093-.9613-1.288-1.316-.56-.3733-1.2786-.56-2.156-.56zM73.0929 30V15.72h2.856v2.1h.168c.3173-.728.8587-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7187.028.98.084.28.056.532.1213.756.196v3.136c-.3547-.1493-.7187-.2707-1.092-.364-.3547-.0933-.728-.14-1.12-.14-.7093 0-1.344.196-1.904.588-.5413.3733-.9707.8867-1.288 1.54-.3173.6347-.476 1.3347-.476 2.1V30h-3.024zm17.2146.448c-1.4 0-2.6506-.3267-3.752-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2987-2.6227.896-3.78.5974-1.1573 1.428-2.0813 2.492-2.772 1.0827-.7093 2.324-1.064 3.724-1.064 1.4747 0 2.7254.3173 3.752.952 1.0454.6347 1.8387 1.5027 2.38 2.604.5414 1.1013.812 2.3427.812 3.724 0 .2053-.0093.392-.028.56 0 .168-.0093.2987-.028.392h-11.032c.1494 1.4187.644 2.4827 1.484 3.192.8587.7093 1.8294 1.064 2.912 1.064.9707 0 1.7734-.2147 2.408-.644.6347-.448 1.1387-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3893 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8666.308-2.576.924-.7093.616-1.1853 1.4373-1.428 2.464h7.924c-.0373-.4853-.196-.9893-.476-1.512-.28-.5227-.7093-.9613-1.288-1.316-.56-.3733-1.2786-.56-2.156-.56zM100.189 30V15.72h2.856v1.96h.168c.411-.6907 1.017-1.26 1.82-1.708.821-.4667 1.717-.7 2.688-.7 1.755 0 3.071.5227 3.948 1.568.877 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.289-1.9973-.868-2.52-.579-.5413-1.335-.812-2.268-.812-.728 0-1.363.2053-1.904.616-.541.392-.971.9147-1.288 1.568-.299.6533-.448 1.3533-.448 2.1V30h-3.024zm23.377 0V15.72h2.856v1.96h.168c.411-.6907 1.008-1.26 1.792-1.708.784-.4667 1.652-.7 2.604-.7 1.064 0 1.97.252 2.716.756.747.504 1.279 1.1387 1.596 1.904.467-.7467 1.102-1.372 1.904-1.876.803-.5227 1.783-.784 2.94-.784 1.68 0 2.931.5133 3.752 1.54.822 1.008 1.232 2.352 1.232 4.032V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.485-.5413-1.166-.812-2.044-.812-.69 0-1.297.196-1.82.588-.522.3733-.933.8867-1.232 1.54-.28.6533-.42 1.3813-.42 2.184V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.504-.5413-1.213-.812-2.128-.812-.672 0-1.26.196-1.764.588-.504.392-.905.9147-1.204 1.568-.28.6533-.42 1.3813-.42 2.184V30h-3.024zm31.789.448c-1.4 0-2.65-.3267-3.752-.98-1.101-.6533-1.969-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.598-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.726.3173 3.752.952 1.046.6347 1.839 1.5027 2.38 2.604.542 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.15 1.4187.644 2.4827 1.484 3.192.859.7093 1.83 1.064 2.912 1.064.971 0 1.774-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.866.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.278-.56-2.156-.56zm11.124 8.008v-7.504h-2.492V15.72h2.492v-4.032h3.024v4.032h3.5v2.632h-3.5v6.86c0 .7093.14 1.2507.42 1.624.298.3733.793.56 1.484.56.354 0 .653-.0467.896-.14.261-.0933.522-.224.784-.392v2.94c-.318.1307-.654.2333-1.008.308-.355.0747-.775.112-1.26.112-1.326 0-2.38-.3827-3.164-1.148-.784-.784-1.176-1.8573-1.176-3.22z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M224.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM239.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM267.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M212.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M199.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M191.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M199.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-no-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-no-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..47c80caa8f
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-no-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="242dp" android:height="38dp" android:viewportWidth="242" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M2.8641 30V9.952h6.412c2.1093 0 3.92.4293 5.432 1.288 1.5307.84 2.7067 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8213 1.4933-1.9973 2.6693-3.528 3.528-1.512.84-3.3227 1.26-5.432 1.26h-6.412zm3.08-2.912h3.248c2.2773 0 4.0413-.6347 5.292-1.904 1.2693-1.2693 1.904-3.0053 1.904-5.208s-.6347-3.9387-1.904-5.208c-1.2507-1.2693-3.0147-1.904-5.292-1.904h-3.248v14.224zm23.1782 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6347 1.1387.952 2.4173.952 3.836 0 1.4373-.3173 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM39.382 30V15.72h2.856v1.96h.168c.4106-.6907 1.0173-1.26 1.82-1.708.8213-.4667 1.7173-.7 2.688-.7 1.7546 0 3.0706.5227 3.948 1.568.8773 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2894-1.9973-.868-2.52-.5787-.5413-1.3347-.812-2.268-.812-.728 0-1.3627.2053-1.904.616-.5414.392-.9707.9147-1.288 1.568-.2987.6533-.448 1.3533-.448 2.1V30h-3.024zm23.0662.448c-1.4 0-2.6507-.3267-3.752-.98-1.1014-.6533-1.9694-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2986-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0826-.7093 2.324-1.064 3.724-1.064 1.4746 0 2.7253.3173 3.752.952 1.0453.6347 1.8386 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0094.392-.028.56 0 .168-.0094.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8586.7093 1.8293 1.064 2.912 1.064.9706 0 1.7733-.2147 2.408-.644.6346-.448 1.1386-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3894 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7094.616-1.1854 1.4373-1.428 2.464h7.924c-.0374-.4853-.196-.9893-.476-1.512-.28-.5227-.7094-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zm-1.26-4.872l1.316-3.584h3.416l-2.24 3.584h-2.492zM72.3296 30V15.72h2.856v2.1h.168c.3174-.728.8587-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7187.028.98.084.28.056.532.1213.756.196v3.136c-.3546-.1493-.7186-.2707-1.092-.364-.3546-.0933-.728-.14-1.12-.14-.7093 0-1.344.196-1.904.588-.5413.3733-.9706.8867-1.288 1.54-.3173.6347-.476 1.3347-.476 2.1V30h-3.024zm18.3735 0V15.72h2.856v1.96h.168c.4106-.6907 1.008-1.26 1.792-1.708.784-.4667 1.652-.7 2.604-.7 1.064 0 1.9689.252 2.7159.756.747.504 1.279 1.1387 1.596 1.904.467-.7467 1.101-1.372 1.904-1.876.803-.5227 1.783-.784 2.94-.784 1.68 0 2.931.5133 3.752 1.54.821 1.008 1.232 2.352 1.232 4.032V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.485-.5413-1.167-.812-2.044-.812-.691 0-1.297.196-1.82.588-.523.3733-.933.8867-1.232 1.54-.28.6533-.42 1.3813-.42 2.184V30h-2.9959v-8.652c0-1.1387-.252-1.9693-.756-2.492-.504-.5413-1.2134-.812-2.128-.812-.672 0-1.26.196-1.764.588-.504.392-.9054.9147-1.204 1.568-.28.6533-.42 1.3813-.42 2.184V30h-3.024zm31.7889.448c-1.4 0-2.651-.3267-3.752-.98s-1.969-1.5493-2.604-2.688c-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.725.3173 3.752.952 1.045.6347 1.839 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392H118.18c.149 1.4187.644 2.4827 1.484 3.192.859.7093 1.829 1.064 2.912 1.064.971 0 1.773-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zm16.262 12.6c-1.288 0-2.455-.3173-3.5-.952-1.027-.6533-1.848-1.5493-2.464-2.688-.597-1.1573-.896-2.4733-.896-3.948s.299-2.7813.896-3.92c.616-1.1387 1.437-2.0347 2.464-2.688 1.045-.6533 2.212-.98 3.5-.98 1.101 0 2.044.2427 2.828.728.803.4853 1.391 1.036 1.764 1.652h.168l-.168-1.988V9.952h2.996V30h-2.828v-1.904h-.168c-.373.616-.961 1.1667-1.764 1.652-.784.4667-1.727.7-2.828.7zm.448-2.772c.747 0 1.447-.196 2.1-.588.672-.392 1.204-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.392-.728-.924-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.747 0-1.447.196-2.1.588-.653.392-1.185.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.653.392 1.353.588 2.1.588z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M198.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM213.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM241.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M186.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M173.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M165.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M173.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C180.123 6.03271 177.082 4.7 173.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-no/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-no/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..622d3198de
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-no/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="242dp" android:height="38dp" android:viewportWidth="242" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M2.8641 30V9.952h6.412c2.1093 0 3.92.4293 5.432 1.288 1.5307.84 2.7067 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8213 1.4933-1.9973 2.6693-3.528 3.528-1.512.84-3.3227 1.26-5.432 1.26h-6.412zm3.08-2.912h3.248c2.2773 0 4.0413-.6347 5.292-1.904 1.2693-1.2693 1.904-3.0053 1.904-5.208s-.6347-3.9387-1.904-5.208c-1.2507-1.2693-3.0147-1.904-5.292-1.904h-3.248v14.224zm23.1782 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6347 1.1387.952 2.4173.952 3.836 0 1.4373-.3173 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM39.382 30V15.72h2.856v1.96h.168c.4106-.6907 1.0173-1.26 1.82-1.708.8213-.4667 1.7173-.7 2.688-.7 1.7546 0 3.0706.5227 3.948 1.568.8773 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2894-1.9973-.868-2.52-.5787-.5413-1.3347-.812-2.268-.812-.728 0-1.3627.2053-1.904.616-.5414.392-.9707.9147-1.288 1.568-.2987.6533-.448 1.3533-.448 2.1V30h-3.024zm23.0662.448c-1.4 0-2.6507-.3267-3.752-.98-1.1014-.6533-1.9694-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2986-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0826-.7093 2.324-1.064 3.724-1.064 1.4746 0 2.7253.3173 3.752.952 1.0453.6347 1.8386 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0094.392-.028.56 0 .168-.0094.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8586.7093 1.8293 1.064 2.912 1.064.9706 0 1.7733-.2147 2.408-.644.6346-.448 1.1386-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3894 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7094.616-1.1854 1.4373-1.428 2.464h7.924c-.0374-.4853-.196-.9893-.476-1.512-.28-.5227-.7094-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zm-1.26-4.872l1.316-3.584h3.416l-2.24 3.584h-2.492zM72.3296 30V15.72h2.856v2.1h.168c.3174-.728.8587-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7187.028.98.084.28.056.532.1213.756.196v3.136c-.3546-.1493-.7186-.2707-1.092-.364-.3546-.0933-.728-.14-1.12-.14-.7093 0-1.344.196-1.904.588-.5413.3733-.9706.8867-1.288 1.54-.3173.6347-.476 1.3347-.476 2.1V30h-3.024zm18.3735 0V15.72h2.856v1.96h.168c.4106-.6907 1.008-1.26 1.792-1.708.784-.4667 1.652-.7 2.604-.7 1.064 0 1.9689.252 2.7159.756.747.504 1.279 1.1387 1.596 1.904.467-.7467 1.101-1.372 1.904-1.876.803-.5227 1.783-.784 2.94-.784 1.68 0 2.931.5133 3.752 1.54.821 1.008 1.232 2.352 1.232 4.032V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.485-.5413-1.167-.812-2.044-.812-.691 0-1.297.196-1.82.588-.523.3733-.933.8867-1.232 1.54-.28.6533-.42 1.3813-.42 2.184V30h-2.9959v-8.652c0-1.1387-.252-1.9693-.756-2.492-.504-.5413-1.2134-.812-2.128-.812-.672 0-1.26.196-1.764.588-.504.392-.9054.9147-1.204 1.568-.28.6533-.42 1.3813-.42 2.184V30h-3.024zm31.7889.448c-1.4 0-2.651-.3267-3.752-.98s-1.969-1.5493-2.604-2.688c-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.725.3173 3.752.952 1.045.6347 1.839 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392H118.18c.149 1.4187.644 2.4827 1.484 3.192.859.7093 1.829 1.064 2.912 1.064.971 0 1.773-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zm16.262 12.6c-1.288 0-2.455-.3173-3.5-.952-1.027-.6533-1.848-1.5493-2.464-2.688-.597-1.1573-.896-2.4733-.896-3.948s.299-2.7813.896-3.92c.616-1.1387 1.437-2.0347 2.464-2.688 1.045-.6533 2.212-.98 3.5-.98 1.101 0 2.044.2427 2.828.728.803.4853 1.391 1.036 1.764 1.652h.168l-.168-1.988V9.952h2.996V30h-2.828v-1.904h-.168c-.373.616-.961 1.1667-1.764 1.652-.784.4667-1.727.7-2.828.7zm.448-2.772c.747 0 1.447-.196 2.1-.588.672-.392 1.204-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.392-.728-.924-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.747 0-1.447.196-2.1.588-.653.392-1.185.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.653.392 1.353.588 2.1.588z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M198.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM213.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM241.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M186.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M173.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M165.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M173.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-pl-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-pl-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..f25c83f1a8
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-pl-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="422dp" android:height="38dp" android:viewportWidth="422" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M2.37893 30V9.952h6.888c1.21337 0 2.31467.2613 3.30397.784.9894.5227 1.7734 1.2413 2.352 2.156.5974.9147.896 1.9787.896 3.192 0 1.2133-.2986 2.2867-.896 3.22-.5786.9147-1.3626 1.6333-2.352 2.156-.9893.504-2.0906.756-3.30397.756h-3.808V30h-3.08zm6.972-17.136h-3.892v6.44h3.892c.72797 0 1.34397-.1493 1.84797-.448.504-.3173.8867-.7187 1.148-1.204.28-.504.42-1.0267.42-1.568 0-.5413-.14-1.0547-.42-1.54-.2613-.4853-.644-.8867-1.148-1.204-.504-.3173-1.12-.476-1.84797-.476zM18.7726 30V15.72h2.856v2.1h.168c.3173-.728.8587-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7187.028.98.084.28.056.532.1213.756.196v3.136c-.3547-.1493-.7187-.2707-1.092-.364-.3547-.0933-.728-.14-1.12-.14-.7093 0-1.344.196-1.904.588-.5413.3733-.9707.8867-1.288 1.54-.3173.6347-.476 1.3347-.476 2.1V30h-3.024zm10.5368 0v-2.52l7.952-9.128h-7.7V15.72h11.396v2.52l-7.924 9.128h8.148V30h-11.872zm21.2513.448c-1.4 0-2.6507-.3267-3.752-.98-1.1014-.6533-1.9694-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2986-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0826-.7093 2.324-1.064 3.724-1.064 1.4746 0 2.7253.3173 3.752.952 1.0453.6347 1.8386 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0094.392-.028.56 0 .168-.0094.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8586.7093 1.8293 1.064 2.912 1.064.9706 0 1.7733-.2147 2.408-.644.6346-.448 1.1386-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3894 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7094.616-1.1854 1.4373-1.428 2.464h7.924c-.0374-.4853-.196-.9893-.476-1.512-.28-.5227-.7094-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zM60.4421 30V9.952h3.024v11.816l6.048-6.048h3.752v.168l-5.516 5.46 5.712 8.484V30h-3.584l-4.256-6.552-2.156 2.128V30h-3.024zm19.4089.448c-1.0266 0-1.9413-.196-2.744-.588-.8026-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2614-1.8667.784-2.576.5414-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8854-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2134.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4186.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7466.448-1.6426.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5974-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5786-.168-1.1946-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5226.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM90.2008 30v-2.52l7.952-9.128h-7.7V15.72h11.3962v2.52l-7.9242 9.128h8.1482V30H90.2008zm5.964-17.08c-.4853 0-.9053-.1773-1.26-.532-.3546-.3547-.532-.784-.532-1.288s.1774-.924.532-1.26c.3547-.35467.7747-.532 1.26-.532.5227 0 .952.17733 1.288.532.336.336.504.756.504 1.26s-.168.9333-.504 1.288c-.336.3547-.7653.532-1.288.532zm21.9762 17.528c-1.288 0-2.455-.3173-3.5-.952-1.027-.6533-1.848-1.5493-2.464-2.688-.598-1.1573-.896-2.4733-.896-3.948s.298-2.7813.896-3.92c.616-1.1387 1.437-2.0347 2.464-2.688 1.045-.6533 2.212-.98 3.5-.98 1.101 0 2.044.2427 2.828.728.802.4853 1.39 1.036 1.764 1.652h.168l-.168-1.988V9.952h2.996V30h-2.828v-1.904h-.168c-.374.616-.962 1.1667-1.764 1.652-.784.4667-1.727.7-2.828.7zm.448-2.772c.746 0 1.446-.196 2.1-.588.672-.392 1.204-.9427 1.596-1.652.41-.728.616-1.5867.616-2.576 0-.9893-.206-1.8387-.616-2.548-.392-.728-.924-1.288-1.596-1.68-.654-.392-1.354-.588-2.1-.588-.747 0-1.447.196-2.1.588-.654.392-1.186.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.41.7093.942 1.26 1.596 1.652.653.392 1.353.588 2.1.588zm15.345 2.772c-1.027 0-1.941-.196-2.744-.588-.803-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.261-1.8667.784-2.576.541-.728 1.26-1.2787 2.156-1.652.896-.3733 1.885-.56 2.968-.56.896 0 1.68.084 2.352.252.691.168 1.213.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.419.168-2.072.504-.653.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.027-.504 2.147-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.373.5787-.933 1.092-1.68 1.54-.747.448-1.643.672-2.688.672zm.532-2.464c.784 0 1.475-.1867 2.072-.56.597-.3733 1.064-.8587 1.4-1.456.355-.616.532-1.2787.532-1.988-.429-.2427-.933-.4387-1.512-.588-.579-.168-1.195-.252-1.848-.252-1.232 0-2.109.252-2.632.756-.523.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM145.039 30V15.72h2.856v2.1h.168c.317-.728.859-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .719.028.98.084.28.056.532.1213.756.196v3.136c-.355-.1493-.719-.2707-1.092-.364-.355-.0933-.728-.14-1.12-.14-.709 0-1.344.196-1.904.588-.541.3733-.971.8867-1.288 1.54-.317.6347-.476 1.3347-.476 2.1V30h-3.024zm17.411.448c-1.475 0-2.772-.336-3.892-1.008-1.12-.672-1.998-1.5773-2.632-2.716-.635-1.1387-.952-2.4267-.952-3.864 0-1.4187.317-2.6973.952-3.836.634-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.417-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.997 1.5867 2.632 2.744.634 1.1387.952 2.4173.952 3.836 0 1.4373-.318 2.7253-.952 3.864-.635 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.213-.9427 1.624-1.652.429-.728.644-1.596.644-2.604s-.215-1.8667-.644-2.576c-.411-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.522.196-2.212.588-.672.3733-1.223.924-1.652 1.652-.411.7093-.616 1.568-.616 2.576s.205 1.876.616 2.604c.429.7093.98 1.26 1.652 1.652.69.3733 1.428.56 2.212.56zM175.705 30l-4.564-14.28h3.276l2.94 10.276h.112l3.22-10.276h3.108l3.22 10.276h.112l2.94-10.276h3.22L188.697 30h-3.164l-3.304-10.332h-.112L178.841 30h-3.136zm21.572-16.38c-.56 0-1.046-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.41-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.41.392.616.868.616 1.428 0 .56-.206 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM195.765 30V15.72h3.024V30h-3.024zm6.348 0v-2.52l7.952-9.128h-7.7V15.72h11.396v2.52l-7.924 9.128h8.148V30h-11.872zm15 0V15.72h2.856v1.96h.168c.411-.6907 1.018-1.26 1.82-1.708.822-.4667 1.718-.7 2.688-.7 1.755 0 3.071.5227 3.948 1.568.878 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.289-1.9973-.868-2.52-.578-.5413-1.334-.812-2.268-.812-.728 0-1.362.2053-1.904.616-.541.392-.97.9147-1.288 1.568-.298.6533-.448 1.3533-.448 2.1V30h-3.024zm23.066.448c-1.4 0-2.65-.3267-3.752-.98-1.101-.6533-1.969-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.598-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.726.3173 3.752.952 1.046.6347 1.839 1.5027 2.38 2.604.542 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.15 1.4187.644 2.4827 1.484 3.192.859.7093 1.83 1.064 2.912 1.064.971 0 1.774-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.866.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.278-.56-2.156-.56zm.532 12.32l3.808-.924c-.392.28-.812.5973-1.26.952-.448.3733-.83.7653-1.148 1.176-.317.4107-.476.8307-.476 1.26 0 .3733.112.6907.336.952.224.2613.532.392.924.392.168 0 .336-.028.504-.084.187-.0373.392-.112.616-.224v2.352c-.242.112-.494.1773-.756.196-.261.0373-.513.056-.756.056-1.082 0-1.932-.308-2.548-.924-.616-.5973-.924-1.344-.924-2.24 0-.5973.159-1.1387.476-1.624.318-.4667.719-.9053 1.204-1.316zm16.297 5.88V15.72h2.828v1.932h.168c.373-.616.952-1.1667 1.736-1.652.803-.4853 1.755-.728 2.856-.728 1.307 0 2.473.3267 3.5.98 1.027.6533 1.839 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.597 1.1387-1.409 2.0347-2.436 2.688-1.027.6347-2.193.952-3.5.952-1.101 0-2.053-.2333-2.856-.7-.784-.4853-1.363-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.747 0 1.447-.196 2.1-.588.653-.392 1.185-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.411-.728-.943-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.747 0-1.447.196-2.1.588-.653.392-1.185.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.653.392 1.353.588 2.1.588zM274.259 30V15.72h2.856v2.1h.168c.317-.728.858-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .718.028.98.084.28.056.532.1213.756.196v3.136c-.355-.1493-.719-.2707-1.092-.364-.355-.0933-.728-.14-1.12-.14-.71 0-1.344.196-1.904.588-.542.3733-.971.8867-1.288 1.54-.318.6347-.476 1.3347-.476 2.1V30h-3.024zm10.536 0v-2.52l7.952-9.128h-7.7V15.72h11.396v2.52l-7.924 9.128h8.148V30h-11.872zm21.252.448c-1.4 0-2.651-.3267-3.752-.98-1.102-.6533-1.97-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.298-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.082-.7093 2.324-1.064 3.724-1.064 1.474 0 2.725.3173 3.752.952 1.045.6347 1.838 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.01.392-.028.56 0 .168-.01.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.858.7093 1.829 1.064 2.912 1.064.97 0 1.773-.2147 2.408-.644.634-.448 1.138-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.39 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.71.616-1.186 1.4373-1.428 2.464h7.924c-.038-.4853-.196-.9893-.476-1.512-.28-.5227-.71-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zM315.063 30v-2.52l7.952-9.128h-7.7V15.72h11.396v2.52l-7.924 9.128h8.148V30h-11.872z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M378.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM393.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM421.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M366.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M353.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M345.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M353.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C360.123 6.03271 357.082 4.7 353.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-pl/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-pl/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..2916f90b14
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-pl/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="422dp" android:height="38dp" android:viewportWidth="422" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M2.37893 30V9.952h6.888c1.21337 0 2.31467.2613 3.30397.784.9894.5227 1.7734 1.2413 2.352 2.156.5974.9147.896 1.9787.896 3.192 0 1.2133-.2986 2.2867-.896 3.22-.5786.9147-1.3626 1.6333-2.352 2.156-.9893.504-2.0906.756-3.30397.756h-3.808V30h-3.08zm6.972-17.136h-3.892v6.44h3.892c.72797 0 1.34397-.1493 1.84797-.448.504-.3173.8867-.7187 1.148-1.204.28-.504.42-1.0267.42-1.568 0-.5413-.14-1.0547-.42-1.54-.2613-.4853-.644-.8867-1.148-1.204-.504-.3173-1.12-.476-1.84797-.476zM18.7726 30V15.72h2.856v2.1h.168c.3173-.728.8587-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7187.028.98.084.28.056.532.1213.756.196v3.136c-.3547-.1493-.7187-.2707-1.092-.364-.3547-.0933-.728-.14-1.12-.14-.7093 0-1.344.196-1.904.588-.5413.3733-.9707.8867-1.288 1.54-.3173.6347-.476 1.3347-.476 2.1V30h-3.024zm10.5368 0v-2.52l7.952-9.128h-7.7V15.72h11.396v2.52l-7.924 9.128h8.148V30h-11.872zm21.2513.448c-1.4 0-2.6507-.3267-3.752-.98-1.1014-.6533-1.9694-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2986-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0826-.7093 2.324-1.064 3.724-1.064 1.4746 0 2.7253.3173 3.752.952 1.0453.6347 1.8386 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0094.392-.028.56 0 .168-.0094.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8586.7093 1.8293 1.064 2.912 1.064.9706 0 1.7733-.2147 2.408-.644.6346-.448 1.1386-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3894 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7094.616-1.1854 1.4373-1.428 2.464h7.924c-.0374-.4853-.196-.9893-.476-1.512-.28-.5227-.7094-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zM60.4421 30V9.952h3.024v11.816l6.048-6.048h3.752v.168l-5.516 5.46 5.712 8.484V30h-3.584l-4.256-6.552-2.156 2.128V30h-3.024zm19.4089.448c-1.0266 0-1.9413-.196-2.744-.588-.8026-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2614-1.8667.784-2.576.5414-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8854-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2134.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4186.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7466.448-1.6426.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5974-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5786-.168-1.1946-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5226.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM90.2008 30v-2.52l7.952-9.128h-7.7V15.72h11.3962v2.52l-7.9242 9.128h8.1482V30H90.2008zm5.964-17.08c-.4853 0-.9053-.1773-1.26-.532-.3546-.3547-.532-.784-.532-1.288s.1774-.924.532-1.26c.3547-.35467.7747-.532 1.26-.532.5227 0 .952.17733 1.288.532.336.336.504.756.504 1.26s-.168.9333-.504 1.288c-.336.3547-.7653.532-1.288.532zm21.9762 17.528c-1.288 0-2.455-.3173-3.5-.952-1.027-.6533-1.848-1.5493-2.464-2.688-.598-1.1573-.896-2.4733-.896-3.948s.298-2.7813.896-3.92c.616-1.1387 1.437-2.0347 2.464-2.688 1.045-.6533 2.212-.98 3.5-.98 1.101 0 2.044.2427 2.828.728.802.4853 1.39 1.036 1.764 1.652h.168l-.168-1.988V9.952h2.996V30h-2.828v-1.904h-.168c-.374.616-.962 1.1667-1.764 1.652-.784.4667-1.727.7-2.828.7zm.448-2.772c.746 0 1.446-.196 2.1-.588.672-.392 1.204-.9427 1.596-1.652.41-.728.616-1.5867.616-2.576 0-.9893-.206-1.8387-.616-2.548-.392-.728-.924-1.288-1.596-1.68-.654-.392-1.354-.588-2.1-.588-.747 0-1.447.196-2.1.588-.654.392-1.186.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.41.7093.942 1.26 1.596 1.652.653.392 1.353.588 2.1.588zm15.345 2.772c-1.027 0-1.941-.196-2.744-.588-.803-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.261-1.8667.784-2.576.541-.728 1.26-1.2787 2.156-1.652.896-.3733 1.885-.56 2.968-.56.896 0 1.68.084 2.352.252.691.168 1.213.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.419.168-2.072.504-.653.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.027-.504 2.147-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.373.5787-.933 1.092-1.68 1.54-.747.448-1.643.672-2.688.672zm.532-2.464c.784 0 1.475-.1867 2.072-.56.597-.3733 1.064-.8587 1.4-1.456.355-.616.532-1.2787.532-1.988-.429-.2427-.933-.4387-1.512-.588-.579-.168-1.195-.252-1.848-.252-1.232 0-2.109.252-2.632.756-.523.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM145.039 30V15.72h2.856v2.1h.168c.317-.728.859-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .719.028.98.084.28.056.532.1213.756.196v3.136c-.355-.1493-.719-.2707-1.092-.364-.355-.0933-.728-.14-1.12-.14-.709 0-1.344.196-1.904.588-.541.3733-.971.8867-1.288 1.54-.317.6347-.476 1.3347-.476 2.1V30h-3.024zm17.411.448c-1.475 0-2.772-.336-3.892-1.008-1.12-.672-1.998-1.5773-2.632-2.716-.635-1.1387-.952-2.4267-.952-3.864 0-1.4187.317-2.6973.952-3.836.634-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.417-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.997 1.5867 2.632 2.744.634 1.1387.952 2.4173.952 3.836 0 1.4373-.318 2.7253-.952 3.864-.635 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.213-.9427 1.624-1.652.429-.728.644-1.596.644-2.604s-.215-1.8667-.644-2.576c-.411-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.522.196-2.212.588-.672.3733-1.223.924-1.652 1.652-.411.7093-.616 1.568-.616 2.576s.205 1.876.616 2.604c.429.7093.98 1.26 1.652 1.652.69.3733 1.428.56 2.212.56zM175.705 30l-4.564-14.28h3.276l2.94 10.276h.112l3.22-10.276h3.108l3.22 10.276h.112l2.94-10.276h3.22L188.697 30h-3.164l-3.304-10.332h-.112L178.841 30h-3.136zm21.572-16.38c-.56 0-1.046-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.41-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.41.392.616.868.616 1.428 0 .56-.206 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM195.765 30V15.72h3.024V30h-3.024zm6.348 0v-2.52l7.952-9.128h-7.7V15.72h11.396v2.52l-7.924 9.128h8.148V30h-11.872zm15 0V15.72h2.856v1.96h.168c.411-.6907 1.018-1.26 1.82-1.708.822-.4667 1.718-.7 2.688-.7 1.755 0 3.071.5227 3.948 1.568.878 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.289-1.9973-.868-2.52-.578-.5413-1.334-.812-2.268-.812-.728 0-1.362.2053-1.904.616-.541.392-.97.9147-1.288 1.568-.298.6533-.448 1.3533-.448 2.1V30h-3.024zm23.066.448c-1.4 0-2.65-.3267-3.752-.98-1.101-.6533-1.969-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.598-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.726.3173 3.752.952 1.046.6347 1.839 1.5027 2.38 2.604.542 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.15 1.4187.644 2.4827 1.484 3.192.859.7093 1.83 1.064 2.912 1.064.971 0 1.774-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.866.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.278-.56-2.156-.56zm.532 12.32l3.808-.924c-.392.28-.812.5973-1.26.952-.448.3733-.83.7653-1.148 1.176-.317.4107-.476.8307-.476 1.26 0 .3733.112.6907.336.952.224.2613.532.392.924.392.168 0 .336-.028.504-.084.187-.0373.392-.112.616-.224v2.352c-.242.112-.494.1773-.756.196-.261.0373-.513.056-.756.056-1.082 0-1.932-.308-2.548-.924-.616-.5973-.924-1.344-.924-2.24 0-.5973.159-1.1387.476-1.624.318-.4667.719-.9053 1.204-1.316zm16.297 5.88V15.72h2.828v1.932h.168c.373-.616.952-1.1667 1.736-1.652.803-.4853 1.755-.728 2.856-.728 1.307 0 2.473.3267 3.5.98 1.027.6533 1.839 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.597 1.1387-1.409 2.0347-2.436 2.688-1.027.6347-2.193.952-3.5.952-1.101 0-2.053-.2333-2.856-.7-.784-.4853-1.363-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.747 0 1.447-.196 2.1-.588.653-.392 1.185-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.411-.728-.943-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.747 0-1.447.196-2.1.588-.653.392-1.185.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.653.392 1.353.588 2.1.588zM274.259 30V15.72h2.856v2.1h.168c.317-.728.858-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .718.028.98.084.28.056.532.1213.756.196v3.136c-.355-.1493-.719-.2707-1.092-.364-.355-.0933-.728-.14-1.12-.14-.71 0-1.344.196-1.904.588-.542.3733-.971.8867-1.288 1.54-.318.6347-.476 1.3347-.476 2.1V30h-3.024zm10.536 0v-2.52l7.952-9.128h-7.7V15.72h11.396v2.52l-7.924 9.128h8.148V30h-11.872zm21.252.448c-1.4 0-2.651-.3267-3.752-.98-1.102-.6533-1.97-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.298-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.082-.7093 2.324-1.064 3.724-1.064 1.474 0 2.725.3173 3.752.952 1.045.6347 1.838 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.01.392-.028.56 0 .168-.01.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.858.7093 1.829 1.064 2.912 1.064.97 0 1.773-.2147 2.408-.644.634-.448 1.138-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.39 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.71.616-1.186 1.4373-1.428 2.464h7.924c-.038-.4853-.196-.9893-.476-1.512-.28-.5227-.71-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zM315.063 30v-2.52l7.952-9.128h-7.7V15.72h11.396v2.52l-7.924 9.128h8.148V30h-11.872z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M378.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM393.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM421.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M366.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M353.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M345.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M353.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-pt-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-pt-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..38078a5431
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-pt-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="248dp" android:height="38dp" android:viewportWidth="248" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.17738 30V9.952h6.412c2.10932 0 3.92002.4293 5.43202 1.288 1.5306.84 2.7066 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8214 1.4933-1.9974 2.6693-3.528 3.528-1.512.84-3.3227 1.26-5.43202 1.26h-6.412zm3.08-2.912h3.248c2.27732 0 4.04132-.6347 5.29202-1.904 1.2693-1.2693 1.904-3.0053 1.904-5.208s-.6347-3.9387-1.904-5.208c-1.2507-1.2693-3.0147-1.904-5.29202-1.904h-3.248v14.224zm23.17822 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9974-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6346-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6346 1.1387.952 2.4173.952 3.836 0 1.4373-.3174 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5214.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6906.3733 1.428.56 2.212.56zm15.0131 2.772c-1.0267 0-1.9413-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM55.5538 30V15.72h2.856v2.1h.168c.3174-.728.8587-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7187.028.98.084.28.056.532.1213.756.196v3.136c-.3546-.1493-.7186-.2707-1.092-.364-.3546-.0933-.728-.14-1.12-.14-.7093 0-1.344.196-1.904.588-.5413.3733-.9706.8867-1.288 1.54-.3173.6347-.476 1.3347-.476 2.1V30h-3.024zm24.9815.448c-1.4373 0-2.7067-.3267-3.808-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.6347-1.1573-.952-2.464-.952-3.92s.3173-2.7533.952-3.892c.6347-1.1573 1.5027-2.0627 2.604-2.716 1.1013-.6533 2.3707-.98 3.808-.98 1.5867 0 2.9213.3547 4.004 1.064 1.1013.7093 1.8853 1.6707 2.352 2.884l-2.744 1.12c-.6533-1.5307-1.876-2.296-3.668-2.296-.784 0-1.5027.2053-2.156.616-.6533.392-1.176.952-1.568 1.68-.392.7093-.588 1.5493-.588 2.52 0 .9707.196 1.82.588 2.548.392.728.9147 1.288 1.568 1.68.6533.392 1.372.588 2.156.588.9147 0 1.6893-.2053 2.324-.616.6347-.4293 1.1293-1.008 1.484-1.736l2.688 1.176c-.504 1.1387-1.3067 2.0813-2.408 2.828-1.1013.7467-2.4453 1.12-4.032 1.12zm15.9159 0c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.8638 1.008 1.12.672 1.998 1.5867 2.632 2.744.635 1.1387.952 2.4173.952 3.836 0 1.4373-.317 2.7253-.952 3.864-.634 1.1387-1.512 2.044-2.632 2.716-1.1198.672-2.4078 1.008-3.8638 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.6238-1.652.43-.728.644-1.596.644-2.604s-.214-1.8667-.644-2.576c-.4105-.728-.9518-1.2787-1.6238-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM106.711 30V15.72h2.856v1.96h.168c.411-.6907 1.008-1.26 1.792-1.708.784-.4667 1.652-.7 2.604-.7 1.064 0 1.969.252 2.716.756.747.504 1.279 1.1387 1.596 1.904.467-.7467 1.101-1.372 1.904-1.876.803-.5227 1.783-.784 2.94-.784 1.68 0 2.931.5133 3.752 1.54.821 1.008 1.232 2.352 1.232 4.032V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.485-.5413-1.167-.812-2.044-.812-.691 0-1.297.196-1.82.588-.523.3733-.933.8867-1.232 1.54-.28.6533-.42 1.3813-.42 2.184V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.504-.5413-1.213-.812-2.128-.812-.672 0-1.26.196-1.764.588-.504.392-.905.9147-1.204 1.568-.28.6533-.42 1.3813-.42 2.184V30h-3.024zm38.82.448c-1.475 0-2.772-.336-3.892-1.008-1.12-.672-1.997-1.5773-2.632-2.716-.635-1.1387-.952-2.4267-.952-3.864 0-1.4187.317-2.6973.952-3.836.635-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.417-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.997 1.5867 2.632 2.744.635 1.1387.952 2.4173.952 3.836 0 1.4373-.317 2.7253-.952 3.864s-1.512 2.044-2.632 2.716c-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.213-.9427 1.624-1.652.429-.728.644-1.596.644-2.604s-.215-1.8667-.644-2.576c-.411-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.521.196-2.212.588-.672.3733-1.223.924-1.652 1.652-.411.7093-.616 1.568-.616 2.576s.205 1.876.616 2.604c.429.7093.98 1.26 1.652 1.652.691.3733 1.428.56 2.212.56z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M204.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM219.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM247.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M192.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M179.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M171.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M179.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C186.123 6.03271 183.082 4.7 179.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-pt/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-pt/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..e910854870
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-pt/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="248dp" android:height="38dp" android:viewportWidth="248" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.17738 30V9.952h6.412c2.10932 0 3.92002.4293 5.43202 1.288 1.5306.84 2.7066 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8214 1.4933-1.9974 2.6693-3.528 3.528-1.512.84-3.3227 1.26-5.43202 1.26h-6.412zm3.08-2.912h3.248c2.27732 0 4.04132-.6347 5.29202-1.904 1.2693-1.2693 1.904-3.0053 1.904-5.208s-.6347-3.9387-1.904-5.208c-1.2507-1.2693-3.0147-1.904-5.29202-1.904h-3.248v14.224zm23.17822 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9974-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6346-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6346 1.1387.952 2.4173.952 3.836 0 1.4373-.3174 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5214.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6906.3733 1.428.56 2.212.56zm15.0131 2.772c-1.0267 0-1.9413-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM55.5538 30V15.72h2.856v2.1h.168c.3174-.728.8587-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7187.028.98.084.28.056.532.1213.756.196v3.136c-.3546-.1493-.7186-.2707-1.092-.364-.3546-.0933-.728-.14-1.12-.14-.7093 0-1.344.196-1.904.588-.5413.3733-.9706.8867-1.288 1.54-.3173.6347-.476 1.3347-.476 2.1V30h-3.024zm24.9815.448c-1.4373 0-2.7067-.3267-3.808-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.6347-1.1573-.952-2.464-.952-3.92s.3173-2.7533.952-3.892c.6347-1.1573 1.5027-2.0627 2.604-2.716 1.1013-.6533 2.3707-.98 3.808-.98 1.5867 0 2.9213.3547 4.004 1.064 1.1013.7093 1.8853 1.6707 2.352 2.884l-2.744 1.12c-.6533-1.5307-1.876-2.296-3.668-2.296-.784 0-1.5027.2053-2.156.616-.6533.392-1.176.952-1.568 1.68-.392.7093-.588 1.5493-.588 2.52 0 .9707.196 1.82.588 2.548.392.728.9147 1.288 1.568 1.68.6533.392 1.372.588 2.156.588.9147 0 1.6893-.2053 2.324-.616.6347-.4293 1.1293-1.008 1.484-1.736l2.688 1.176c-.504 1.1387-1.3067 2.0813-2.408 2.828-1.1013.7467-2.4453 1.12-4.032 1.12zm15.9159 0c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.8638 1.008 1.12.672 1.998 1.5867 2.632 2.744.635 1.1387.952 2.4173.952 3.836 0 1.4373-.317 2.7253-.952 3.864-.634 1.1387-1.512 2.044-2.632 2.716-1.1198.672-2.4078 1.008-3.8638 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.6238-1.652.43-.728.644-1.596.644-2.604s-.214-1.8667-.644-2.576c-.4105-.728-.9518-1.2787-1.6238-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM106.711 30V15.72h2.856v1.96h.168c.411-.6907 1.008-1.26 1.792-1.708.784-.4667 1.652-.7 2.604-.7 1.064 0 1.969.252 2.716.756.747.504 1.279 1.1387 1.596 1.904.467-.7467 1.101-1.372 1.904-1.876.803-.5227 1.783-.784 2.94-.784 1.68 0 2.931.5133 3.752 1.54.821 1.008 1.232 2.352 1.232 4.032V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.485-.5413-1.167-.812-2.044-.812-.691 0-1.297.196-1.82.588-.523.3733-.933.8867-1.232 1.54-.28.6533-.42 1.3813-.42 2.184V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.504-.5413-1.213-.812-2.128-.812-.672 0-1.26.196-1.764.588-.504.392-.905.9147-1.204 1.568-.28.6533-.42 1.3813-.42 2.184V30h-3.024zm38.82.448c-1.475 0-2.772-.336-3.892-1.008-1.12-.672-1.997-1.5773-2.632-2.716-.635-1.1387-.952-2.4267-.952-3.864 0-1.4187.317-2.6973.952-3.836.635-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.417-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.997 1.5867 2.632 2.744.635 1.1387.952 2.4173.952 3.836 0 1.4373-.317 2.7253-.952 3.864s-1.512 2.044-2.632 2.716c-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.213-.9427 1.624-1.652.429-.728.644-1.596.644-2.604s-.215-1.8667-.644-2.576c-.411-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.521.196-2.212.588-.672.3733-1.223.924-1.652 1.652-.411.7093-.616 1.568-.616 2.576s.205 1.876.616 2.604c.429.7093.98 1.26 1.652 1.652.691.3733 1.428.56 2.212.56z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M204.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM219.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM247.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M192.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M179.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M171.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M179.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-ru-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-ru-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..c059e985db
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-ru-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="516dp" android:height="38dp" android:viewportWidth="516" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M12.8493 30.448c-1.4746 0-2.8466-.2613-4.11597-.784-1.26934-.5413-2.38001-1.288-3.33201-2.24-.93333-.952-1.67066-2.0627-2.212-3.332-.52266-1.2693-.784-2.6413-.784-4.116 0-1.4747.26134-2.8467.784-4.116.54134-1.2693 1.27867-2.38 2.212-3.332.952-.952 2.06267-1.6893 3.33201-2.212 1.26937-.54133 2.64137-.812 4.11597-.812 1.568 0 2.968.28933 4.2.868 1.232.56 2.3054 1.3627 3.22 2.408l-2.156 2.1c-.672-.8027-1.4373-1.4093-2.296-1.82-.84-.4293-1.82-.644-2.94-.644-1.344 0-2.576.3173-3.69598.952-1.12.616-2.01599 1.4933-2.68799 2.632-.65334 1.12-.98001 2.4453-.98001 3.976s.32667 2.8653.98001 4.004c.672 1.12 1.56799 1.9973 2.68799 2.632 1.11998.616 2.35198.924 3.69598.924 1.2134 0 2.2867-.252 3.22-.756.952-.504 1.792-1.1947 2.52-2.072l2.212 2.128c-.9333 1.1013-2.0813 1.9787-3.444 2.632-1.344.6533-2.856.98-4.536.98zm9.5844 3.808v-6.888h1.568c.2987-.3547.56-.8587.784-1.512.2427-.672.4294-1.428.56-2.268.1494-.84.224-1.6893.224-2.548v-5.32h10.696v11.648h2.072v6.888h-2.772V30h-10.332v4.256h-2.8zm4.816-6.888h6.02v-9.016h-4.844v2.94c0 1.3067-.0933 2.436-.28 3.388-.1866.9333-.4853 1.7733-.896 2.52v.168zm20.1899 3.08c-1.4 0-2.6507-.3267-3.752-.98-1.1014-.6533-1.9694-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2986-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0826-.7093 2.324-1.064 3.724-1.064 1.4746 0 2.7253.3173 3.752.952 1.0453.6347 1.8386 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0094.392-.028.56 0 .168-.0094.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8586.7093 1.8293 1.064 2.912 1.064.9706 0 1.7733-.2147 2.408-.644.6346-.448 1.1386-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3894 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7094.616-1.1854 1.4373-1.428 2.464h7.924c-.0374-.4853-.196-.9893-.476-1.512-.28-.5227-.7094-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zm9.972 12.376c-.4293 0-.84-.0467-1.232-.14v-2.8c.2613.1307.5507.196.868.196.6347 0 1.0827-.2427 1.344-.728.2613-.504.42-1.1387.476-1.904.056-.7653.084-1.5587.084-2.38V15.72h10.92V30h-2.996V18.352h-5.068v4.592c0 .9707-.0653 1.8947-.196 2.772-.112.8587-.3267 1.6333-.644 2.324-.3173.672-.7653 1.204-1.344 1.596-.56.392-1.2973.588-2.212.588zm20.6615.224c-1.0267 0-1.9414-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6906.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6534.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0266-.504 2.1466-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3734.5787-.9334 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4746-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3546-.616.532-1.2787.532-1.988-.4294-.2427-.9334-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1094.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM92.186 30V18.352h-4.704V15.72h12.404v2.632h-4.704V30h-2.996zm13.493-14.28v4.76h3.276c.97 0 1.838.2053 2.604.616.784.4107 1.4.98 1.848 1.708.448.7093.672 1.5213.672 2.436 0 .9147-.224 1.7267-.672 2.436-.448.7093-1.064 1.2787-1.848 1.708-.766.4107-1.634.616-2.604.616h-6.3V15.72h3.024zm0 11.76h3.024c.672 0 1.232-.2147 1.68-.644.448-.4293.672-.9613.672-1.596s-.224-1.1667-.672-1.596c-.448-.448-1.008-.672-1.68-.672h-3.024v4.508zM123.735 30V15.72h12.544V30h-3.024V18.352h-6.496V30h-3.024zm22.962.448c-1.475 0-2.772-.336-3.892-1.008-1.12-.672-1.998-1.5773-2.632-2.716-.635-1.1387-.952-2.4267-.952-3.864 0-1.4187.317-2.6973.952-3.836.634-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.417-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.997 1.5867 2.632 2.744.634 1.1387.952 2.4173.952 3.836 0 1.4373-.318 2.7253-.952 3.864-.635 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.213-.9427 1.624-1.652.429-.728.644-1.596.644-2.604s-.215-1.8667-.644-2.576c-.411-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.522.196-2.212.588-.672.3733-1.223.924-1.652 1.652-.411.7093-.616 1.568-.616 2.576s.205 1.876.616 2.604c.429.7093.98 1.26 1.652 1.652.69.3733 1.428.56 2.212.56zm8.47 2.324v-.168l5.824-7.392-5.516-6.552v-.168h3.528l4.956 6.328h.168V15.72h3.024v6.328h.168l4.984-6.328h3.556v.168l-5.544 6.552 5.824 7.392V30h-3.556l-5.264-7.028h-.168V30h-3.024v-7.028h-.168L158.723 30h-3.556zm29.394.448c-1.4 0-2.65-.3267-3.752-.98-1.101-.6533-1.969-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.598-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.726.3173 3.752.952 1.046.6347 1.839 1.5027 2.38 2.604.542 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.15 1.4187.644 2.4827 1.484 3.192.859.7093 1.83 1.064 2.912 1.064.971 0 1.774-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.866.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.278-.56-2.156-.56zm9.994 18.2V15.72h2.828v1.932h.168c.373-.616.952-1.1667 1.736-1.652.803-.4853 1.755-.728 2.856-.728 1.307 0 2.473.3267 3.5.98 1.027.6533 1.839 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.597 1.1387-1.409 2.0347-2.436 2.688-1.027.6347-2.193.952-3.5.952-1.101 0-2.053-.2333-2.856-.7-.784-.4853-1.363-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.747 0 1.447-.196 2.1-.588.653-.392 1.185-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.411-.728-.943-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.747 0-1.447.196-2.1.588-.653.392-1.185.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.653.392 1.353.588 2.1.588zM215.391 30V18.352h-4.704V15.72h12.404v2.632h-4.704V30h-2.996zm10.468 0V15.72h7.084c.84 0 1.587.168 2.24.504.672.3173 1.195.756 1.568 1.316.392.56.588 1.1853.588 1.876 0 .7467-.168 1.3907-.504 1.932-.317.5413-.737.9427-1.26 1.204v.168c.71.28 1.27.7 1.68 1.26.43.56.644 1.204.644 1.932 0 .84-.224 1.568-.672 2.184-.429.616-.989 1.092-1.68 1.428-.69.3173-1.428.476-2.212.476h-7.476zm3.024-11.816v3.36h3.696c.504 0 .924-.1587 1.26-.476.336-.3173.504-.7187.504-1.204 0-.504-.168-.9053-.504-1.204-.336-.3173-.756-.476-1.26-.476h-3.696zm0 9.296h4.144c.542 0 .99-.168 1.344-.504.374-.3547.56-.8027.56-1.344 0-.5227-.186-.9613-.56-1.316-.354-.3547-.802-.532-1.344-.532h-4.144v3.696zm18.844 2.968c-1.475 0-2.772-.336-3.892-1.008-1.12-.672-1.997-1.5773-2.632-2.716-.635-1.1387-.952-2.4267-.952-3.864 0-1.4187.317-2.6973.952-3.836.635-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.417-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.997 1.5867 2.632 2.744.635 1.1387.952 2.4173.952 3.836 0 1.4373-.317 2.7253-.952 3.864s-1.512 2.044-2.632 2.716c-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.213-.9427 1.624-1.652.429-.728.644-1.596.644-2.604s-.215-1.8667-.644-2.576c-.411-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.521.196-2.212.588-.672.3733-1.223.924-1.652 1.652-.411.7093-.616 1.568-.616 2.576s.205 1.876.616 2.604c.429.7093.98 1.26 1.652 1.652.691.3733 1.428.56 2.212.56zM257.987 30V15.72h7.084c.84 0 1.586.168 2.24.504.672.3173 1.194.756 1.568 1.316.392.56.588 1.1853.588 1.876 0 .7467-.168 1.3907-.504 1.932-.318.5413-.738.9427-1.26 1.204v.168c.709.28 1.269.7 1.68 1.26.429.56.644 1.204.644 1.932 0 .84-.224 1.568-.672 2.184-.43.616-.99 1.092-1.68 1.428-.691.3173-1.428.476-2.212.476h-7.476zm3.024-11.816v3.36h3.696c.504 0 .924-.1587 1.26-.476.336-.3173.504-.7187.504-1.204 0-.504-.168-.9053-.504-1.204-.336-.3173-.756-.476-1.26-.476h-3.696zm0 9.296h4.144c.541 0 .989-.168 1.344-.504.373-.3547.56-.8027.56-1.344 0-.5227-.187-.9613-.56-1.316-.355-.3547-.803-.532-1.344-.532h-4.144v3.696zm16.603 2.968c-1.026 0-1.941-.196-2.744-.588-.802-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.262-1.8667.784-2.576.542-.728 1.26-1.2787 2.156-1.652.896-.3733 1.886-.56 2.968-.56.896 0 1.68.084 2.352.252.691.168 1.214.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.418.168-2.072.504-.653.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.027-.504 2.147-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.373.5787-.933 1.092-1.68 1.54-.746.448-1.642.672-2.688.672zm.532-2.464c.784 0 1.475-.1867 2.072-.56.598-.3733 1.064-.8587 1.4-1.456.355-.616.532-1.2787.532-1.988-.429-.2427-.933-.4387-1.512-.588-.578-.168-1.194-.252-1.848-.252-1.232 0-2.109.252-2.632.756-.522.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM288.719 30V15.72h3.024v5.74h6.776v-5.74h3.024V30h-3.024v-5.908h-6.776V30h-3.024zm16.652 0V15.72h3.024v7.308l-.168 2.688h.168l7.14-9.996h2.996V30h-2.996v-7.28l.168-2.688h-.168L308.395 30h-3.024zm23.394.448c-1.4 0-2.65-.3267-3.752-.98-1.101-.6533-1.969-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.598-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.726.3173 3.752.952 1.046.6347 1.839 1.5027 2.38 2.604.542 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.15 1.4187.644 2.4827 1.484 3.192.859.7093 1.83 1.064 2.912 1.064.971 0 1.774-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.866.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.278-.56-2.156-.56zM353.686 30v-5.152c-.392.28-.887.504-1.484.672-.597.1493-1.251.224-1.96.224-1.643 0-2.959-.476-3.948-1.428-.971-.952-1.456-2.24-1.456-3.864V15.72h3.024v4.424c0 .896.252 1.6053.756 2.128.523.504 1.251.756 2.184.756.579 0 1.12-.084 1.624-.252.523-.1867.943-.4293 1.26-.728V15.72h2.996V30h-2.996zm13.249.448c-1.4 0-2.651-.3267-3.752-.98s-1.969-1.5493-2.604-2.688c-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.725.3173 3.752.952 1.045.6347 1.839 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.859.7093 1.829 1.064 2.912 1.064.971 0 1.773-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zm9.993 18.2V15.72h2.828v1.932h.168c.374-.616.952-1.1667 1.736-1.652.803-.4853 1.755-.728 2.856-.728 1.307 0 2.474.3267 3.5.98 1.027.6533 1.839 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.597 1.1387-1.409 2.0347-2.436 2.688-1.026.6347-2.193.952-3.5.952-1.101 0-2.053-.2333-2.856-.7-.784-.4853-1.362-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.747 0 1.447-.196 2.1-.588.654-.392 1.186-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.41-.728-.942-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.746 0-1.446.196-2.1.588-.653.392-1.185.952-1.596 1.68-.41.7093-.616 1.5587-.616 2.548 0 .9893.206 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.654.392 1.354.588 2.1.588zm16.857 2.772c-1.4 0-2.651-.3267-3.752-.98s-1.969-1.5493-2.604-2.688c-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.725.3173 3.752.952 1.045.6347 1.839 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.859.7093 1.829 1.064 2.912 1.064.971 0 1.773-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zm14.57 12.6c-.784 0-1.568-.0933-2.352-.28-.784-.1867-1.521-.504-2.212-.952-.672-.4667-1.232-1.1107-1.68-1.932l2.408-1.4c.523.728 1.12 1.232 1.792 1.512.691.2613 1.372.392 2.044.392.971 0 1.708-.1867 2.212-.56.504-.3733.756-.8587.756-1.456 0-.5227-.233-.9427-.7-1.26-.448-.336-1.082-.504-1.904-.504h-2.324v-2.38h2.324c.71 0 1.251-.168 1.624-.504.392-.336.588-.7653.588-1.288 0-.616-.261-1.1013-.784-1.456-.522-.3733-1.185-.56-1.988-.56-.709 0-1.39.1493-2.044.448-.653.28-1.148.6627-1.484 1.148l-2.24-1.484c.654-.8213 1.475-1.4653 2.464-1.932 1.008-.4853 2.119-.728 3.332-.728 1.046 0 1.988.1773 2.828.532.859.3547 1.531.8493 2.016 1.484.504.616.756 1.3347.756 2.156 0 .7093-.177 1.344-.532 1.904-.354.5413-.821.952-1.4 1.232v.168c.728.2987 1.316.7467 1.764 1.344.448.5973.672 1.2787.672 2.044 0 .84-.242 1.5867-.728 2.24-.485.6347-1.176 1.1387-2.072 1.512-.896.3733-1.941.56-3.136.56z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M472.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM487.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM515.463 13.9543l-10.04 23.0611h-3.105l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M460.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M447.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M439.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M447.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C454.123 6.03271 451.082 4.7 447.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-ru/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-ru/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..bea5a08460
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-ru/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="516dp" android:height="38dp" android:viewportWidth="516" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M12.8493 30.448c-1.4746 0-2.8466-.2613-4.11597-.784-1.26934-.5413-2.38001-1.288-3.33201-2.24-.93333-.952-1.67066-2.0627-2.212-3.332-.52266-1.2693-.784-2.6413-.784-4.116 0-1.4747.26134-2.8467.784-4.116.54134-1.2693 1.27867-2.38 2.212-3.332.952-.952 2.06267-1.6893 3.33201-2.212 1.26937-.54133 2.64137-.812 4.11597-.812 1.568 0 2.968.28933 4.2.868 1.232.56 2.3054 1.3627 3.22 2.408l-2.156 2.1c-.672-.8027-1.4373-1.4093-2.296-1.82-.84-.4293-1.82-.644-2.94-.644-1.344 0-2.576.3173-3.69598.952-1.12.616-2.01599 1.4933-2.68799 2.632-.65334 1.12-.98001 2.4453-.98001 3.976s.32667 2.8653.98001 4.004c.672 1.12 1.56799 1.9973 2.68799 2.632 1.11998.616 2.35198.924 3.69598.924 1.2134 0 2.2867-.252 3.22-.756.952-.504 1.792-1.1947 2.52-2.072l2.212 2.128c-.9333 1.1013-2.0813 1.9787-3.444 2.632-1.344.6533-2.856.98-4.536.98zm9.5844 3.808v-6.888h1.568c.2987-.3547.56-.8587.784-1.512.2427-.672.4294-1.428.56-2.268.1494-.84.224-1.6893.224-2.548v-5.32h10.696v11.648h2.072v6.888h-2.772V30h-10.332v4.256h-2.8zm4.816-6.888h6.02v-9.016h-4.844v2.94c0 1.3067-.0933 2.436-.28 3.388-.1866.9333-.4853 1.7733-.896 2.52v.168zm20.1899 3.08c-1.4 0-2.6507-.3267-3.752-.98-1.1014-.6533-1.9694-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2986-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0826-.7093 2.324-1.064 3.724-1.064 1.4746 0 2.7253.3173 3.752.952 1.0453.6347 1.8386 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0094.392-.028.56 0 .168-.0094.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8586.7093 1.8293 1.064 2.912 1.064.9706 0 1.7733-.2147 2.408-.644.6346-.448 1.1386-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3894 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7094.616-1.1854 1.4373-1.428 2.464h7.924c-.0374-.4853-.196-.9893-.476-1.512-.28-.5227-.7094-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zm9.972 12.376c-.4293 0-.84-.0467-1.232-.14v-2.8c.2613.1307.5507.196.868.196.6347 0 1.0827-.2427 1.344-.728.2613-.504.42-1.1387.476-1.904.056-.7653.084-1.5587.084-2.38V15.72h10.92V30h-2.996V18.352h-5.068v4.592c0 .9707-.0653 1.8947-.196 2.772-.112.8587-.3267 1.6333-.644 2.324-.3173.672-.7653 1.204-1.344 1.596-.56.392-1.2973.588-2.212.588zm20.6615.224c-1.0267 0-1.9414-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6906.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6534.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0266-.504 2.1466-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3734.5787-.9334 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4746-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3546-.616.532-1.2787.532-1.988-.4294-.2427-.9334-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1094.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM92.186 30V18.352h-4.704V15.72h12.404v2.632h-4.704V30h-2.996zm13.493-14.28v4.76h3.276c.97 0 1.838.2053 2.604.616.784.4107 1.4.98 1.848 1.708.448.7093.672 1.5213.672 2.436 0 .9147-.224 1.7267-.672 2.436-.448.7093-1.064 1.2787-1.848 1.708-.766.4107-1.634.616-2.604.616h-6.3V15.72h3.024zm0 11.76h3.024c.672 0 1.232-.2147 1.68-.644.448-.4293.672-.9613.672-1.596s-.224-1.1667-.672-1.596c-.448-.448-1.008-.672-1.68-.672h-3.024v4.508zM123.735 30V15.72h12.544V30h-3.024V18.352h-6.496V30h-3.024zm22.962.448c-1.475 0-2.772-.336-3.892-1.008-1.12-.672-1.998-1.5773-2.632-2.716-.635-1.1387-.952-2.4267-.952-3.864 0-1.4187.317-2.6973.952-3.836.634-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.417-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.997 1.5867 2.632 2.744.634 1.1387.952 2.4173.952 3.836 0 1.4373-.318 2.7253-.952 3.864-.635 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.213-.9427 1.624-1.652.429-.728.644-1.596.644-2.604s-.215-1.8667-.644-2.576c-.411-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.522.196-2.212.588-.672.3733-1.223.924-1.652 1.652-.411.7093-.616 1.568-.616 2.576s.205 1.876.616 2.604c.429.7093.98 1.26 1.652 1.652.69.3733 1.428.56 2.212.56zm8.47 2.324v-.168l5.824-7.392-5.516-6.552v-.168h3.528l4.956 6.328h.168V15.72h3.024v6.328h.168l4.984-6.328h3.556v.168l-5.544 6.552 5.824 7.392V30h-3.556l-5.264-7.028h-.168V30h-3.024v-7.028h-.168L158.723 30h-3.556zm29.394.448c-1.4 0-2.65-.3267-3.752-.98-1.101-.6533-1.969-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.598-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.726.3173 3.752.952 1.046.6347 1.839 1.5027 2.38 2.604.542 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.15 1.4187.644 2.4827 1.484 3.192.859.7093 1.83 1.064 2.912 1.064.971 0 1.774-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.866.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.278-.56-2.156-.56zm9.994 18.2V15.72h2.828v1.932h.168c.373-.616.952-1.1667 1.736-1.652.803-.4853 1.755-.728 2.856-.728 1.307 0 2.473.3267 3.5.98 1.027.6533 1.839 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.597 1.1387-1.409 2.0347-2.436 2.688-1.027.6347-2.193.952-3.5.952-1.101 0-2.053-.2333-2.856-.7-.784-.4853-1.363-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.747 0 1.447-.196 2.1-.588.653-.392 1.185-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.411-.728-.943-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.747 0-1.447.196-2.1.588-.653.392-1.185.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.653.392 1.353.588 2.1.588zM215.391 30V18.352h-4.704V15.72h12.404v2.632h-4.704V30h-2.996zm10.468 0V15.72h7.084c.84 0 1.587.168 2.24.504.672.3173 1.195.756 1.568 1.316.392.56.588 1.1853.588 1.876 0 .7467-.168 1.3907-.504 1.932-.317.5413-.737.9427-1.26 1.204v.168c.71.28 1.27.7 1.68 1.26.43.56.644 1.204.644 1.932 0 .84-.224 1.568-.672 2.184-.429.616-.989 1.092-1.68 1.428-.69.3173-1.428.476-2.212.476h-7.476zm3.024-11.816v3.36h3.696c.504 0 .924-.1587 1.26-.476.336-.3173.504-.7187.504-1.204 0-.504-.168-.9053-.504-1.204-.336-.3173-.756-.476-1.26-.476h-3.696zm0 9.296h4.144c.542 0 .99-.168 1.344-.504.374-.3547.56-.8027.56-1.344 0-.5227-.186-.9613-.56-1.316-.354-.3547-.802-.532-1.344-.532h-4.144v3.696zm18.844 2.968c-1.475 0-2.772-.336-3.892-1.008-1.12-.672-1.997-1.5773-2.632-2.716-.635-1.1387-.952-2.4267-.952-3.864 0-1.4187.317-2.6973.952-3.836.635-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.417-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.997 1.5867 2.632 2.744.635 1.1387.952 2.4173.952 3.836 0 1.4373-.317 2.7253-.952 3.864s-1.512 2.044-2.632 2.716c-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.213-.9427 1.624-1.652.429-.728.644-1.596.644-2.604s-.215-1.8667-.644-2.576c-.411-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.521.196-2.212.588-.672.3733-1.223.924-1.652 1.652-.411.7093-.616 1.568-.616 2.576s.205 1.876.616 2.604c.429.7093.98 1.26 1.652 1.652.691.3733 1.428.56 2.212.56zM257.987 30V15.72h7.084c.84 0 1.586.168 2.24.504.672.3173 1.194.756 1.568 1.316.392.56.588 1.1853.588 1.876 0 .7467-.168 1.3907-.504 1.932-.318.5413-.738.9427-1.26 1.204v.168c.709.28 1.269.7 1.68 1.26.429.56.644 1.204.644 1.932 0 .84-.224 1.568-.672 2.184-.43.616-.99 1.092-1.68 1.428-.691.3173-1.428.476-2.212.476h-7.476zm3.024-11.816v3.36h3.696c.504 0 .924-.1587 1.26-.476.336-.3173.504-.7187.504-1.204 0-.504-.168-.9053-.504-1.204-.336-.3173-.756-.476-1.26-.476h-3.696zm0 9.296h4.144c.541 0 .989-.168 1.344-.504.373-.3547.56-.8027.56-1.344 0-.5227-.187-.9613-.56-1.316-.355-.3547-.803-.532-1.344-.532h-4.144v3.696zm16.603 2.968c-1.026 0-1.941-.196-2.744-.588-.802-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.262-1.8667.784-2.576.542-.728 1.26-1.2787 2.156-1.652.896-.3733 1.886-.56 2.968-.56.896 0 1.68.084 2.352.252.691.168 1.214.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.418.168-2.072.504-.653.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.027-.504 2.147-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.373.5787-.933 1.092-1.68 1.54-.746.448-1.642.672-2.688.672zm.532-2.464c.784 0 1.475-.1867 2.072-.56.598-.3733 1.064-.8587 1.4-1.456.355-.616.532-1.2787.532-1.988-.429-.2427-.933-.4387-1.512-.588-.578-.168-1.194-.252-1.848-.252-1.232 0-2.109.252-2.632.756-.522.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM288.719 30V15.72h3.024v5.74h6.776v-5.74h3.024V30h-3.024v-5.908h-6.776V30h-3.024zm16.652 0V15.72h3.024v7.308l-.168 2.688h.168l7.14-9.996h2.996V30h-2.996v-7.28l.168-2.688h-.168L308.395 30h-3.024zm23.394.448c-1.4 0-2.65-.3267-3.752-.98-1.101-.6533-1.969-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.598-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.726.3173 3.752.952 1.046.6347 1.839 1.5027 2.38 2.604.542 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.15 1.4187.644 2.4827 1.484 3.192.859.7093 1.83 1.064 2.912 1.064.971 0 1.774-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.866.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.278-.56-2.156-.56zM353.686 30v-5.152c-.392.28-.887.504-1.484.672-.597.1493-1.251.224-1.96.224-1.643 0-2.959-.476-3.948-1.428-.971-.952-1.456-2.24-1.456-3.864V15.72h3.024v4.424c0 .896.252 1.6053.756 2.128.523.504 1.251.756 2.184.756.579 0 1.12-.084 1.624-.252.523-.1867.943-.4293 1.26-.728V15.72h2.996V30h-2.996zm13.249.448c-1.4 0-2.651-.3267-3.752-.98s-1.969-1.5493-2.604-2.688c-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.725.3173 3.752.952 1.045.6347 1.839 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.859.7093 1.829 1.064 2.912 1.064.971 0 1.773-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zm9.993 18.2V15.72h2.828v1.932h.168c.374-.616.952-1.1667 1.736-1.652.803-.4853 1.755-.728 2.856-.728 1.307 0 2.474.3267 3.5.98 1.027.6533 1.839 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.597 1.1387-1.409 2.0347-2.436 2.688-1.026.6347-2.193.952-3.5.952-1.101 0-2.053-.2333-2.856-.7-.784-.4853-1.362-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.747 0 1.447-.196 2.1-.588.654-.392 1.186-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.41-.728-.942-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.746 0-1.446.196-2.1.588-.653.392-1.185.952-1.596 1.68-.41.7093-.616 1.5587-.616 2.548 0 .9893.206 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.654.392 1.354.588 2.1.588zm16.857 2.772c-1.4 0-2.651-.3267-3.752-.98s-1.969-1.5493-2.604-2.688c-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.725.3173 3.752.952 1.045.6347 1.839 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.859.7093 1.829 1.064 2.912 1.064.971 0 1.773-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zm14.57 12.6c-.784 0-1.568-.0933-2.352-.28-.784-.1867-1.521-.504-2.212-.952-.672-.4667-1.232-1.1107-1.68-1.932l2.408-1.4c.523.728 1.12 1.232 1.792 1.512.691.2613 1.372.392 2.044.392.971 0 1.708-.1867 2.212-.56.504-.3733.756-.8587.756-1.456 0-.5227-.233-.9427-.7-1.26-.448-.336-1.082-.504-1.904-.504h-2.324v-2.38h2.324c.71 0 1.251-.168 1.624-.504.392-.336.588-.7653.588-1.288 0-.616-.261-1.1013-.784-1.456-.522-.3733-1.185-.56-1.988-.56-.709 0-1.39.1493-2.044.448-.653.28-1.148.6627-1.484 1.148l-2.24-1.484c.654-.8213 1.475-1.4653 2.464-1.932 1.008-.4853 2.119-.728 3.332-.728 1.046 0 1.988.1773 2.828.532.859.3547 1.531.8493 2.016 1.484.504.616.756 1.3347.756 2.156 0 .7093-.177 1.344-.532 1.904-.354.5413-.821.952-1.4 1.232v.168c.728.2987 1.316.7467 1.764 1.344.448.5973.672 1.2787.672 2.044 0 .84-.242 1.5867-.728 2.24-.485.6347-1.176 1.1387-2.072 1.512-.896.3733-1.941.56-3.136.56z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M472.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM487.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM515.463 13.8543l-10.04 23.0611h-3.105l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M460.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M447.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M439.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M447.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-sk-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-sk-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..20b4772d7a
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-sk-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="254dp" android:height="38dp" android:viewportWidth="254" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M4.14691 30V9.952h6.41199c2.1093 0 3.92.4293 5.432 1.288 1.5307.84 2.7067 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8213 1.4933-1.9973 2.6693-3.528 3.528-1.512.84-3.3227 1.26-5.432 1.26H4.14691zm3.08-2.912h3.24799c2.2773 0 4.0413-.6347 5.292-1.904 1.2693-1.2693 1.904-3.0053 1.904-5.208s-.6347-3.9387-1.904-5.208c-1.2507-1.2693-3.0147-1.904-5.292-1.904H7.22691v14.224zm21.34829 3.36c-1.0266 0-1.9413-.196-2.744-.588-.8026-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2614-1.8667.784-2.576.5414-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8854-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2134.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4186.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7466.448-1.6426.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5974-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.5119-.588-.5787-.168-1.1947-.252-1.8481-.252-1.232 0-2.1093.252-2.632.756-.5226.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM39.6804 30V15.72h2.856v2.1h.168c.3173-.728.8587-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7187.028.98.084.28.056.532.1213.756.196v3.136c-.3547-.1493-.7187-.2707-1.092-.364-.3547-.0933-.728-.14-1.12-.14-.7093 0-1.344.196-1.904.588-.5413.3733-.9707.8867-1.288 1.54-.3173.6347-.476 1.3347-.476 2.1V30h-3.024zm17.4106.448c-1.4746 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6346-1.1387-.952-2.4267-.952-3.864 0-1.4187.3174-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4174-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9974 1.5867 2.632 2.744.6347 1.1387.952 2.4173.952 3.836 0 1.4373-.3173 2.7253-.952 3.864-.6346 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2134-.9427 1.624-1.652.4294-.728.644-1.596.644-2.604s-.2146-1.8667-.644-2.576c-.4106-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2226.924-1.652 1.652-.4106.7093-.616 1.568-.616 2.576s.2054 1.876.616 2.604c.4294.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM71.554 30l-5.908-14.28h3.36l4.004 10.388h.14l4.088-10.388h3.304L74.578 30h-3.024zm15.4517.448c-1.0266 0-1.9413-.196-2.744-.588-.8026-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2614-1.8667.784-2.576.5414-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8854-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2134.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4186.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7466.448-1.6426.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5974-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5786-.168-1.1946-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5226.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm11.8117-2.128v-7.504h-2.492V15.72h2.492v-4.032h3.0236v4.032h3.5v2.632h-3.5v6.86c0 .7093.14 1.2507.42 1.624.299.3733.794.56 1.484.56.355 0 .654-.0467.896-.14.262-.0933.523-.224.784-.392v2.94c-.317.1307-.653.2333-1.008.308-.354.0747-.774.112-1.26.112-1.325 0-2.38-.3827-3.164-1.148-.7836-.784-1.1756-1.8573-1.1756-3.22zm4.5916-11.788V9.952h2.828l-.7 4.116h-2.128zm18.386 16.38c-1.438 0-2.707-.3267-3.808-.98-1.102-.6533-1.97-1.5493-2.604-2.688-.635-1.1573-.952-2.464-.952-3.92s.317-2.7533.952-3.892c.634-1.1573 1.502-2.0627 2.604-2.716 1.101-.6533 2.37-.98 3.808-.98 1.586 0 2.921.3547 4.004 1.064 1.101.7093 1.885 1.6707 2.352 2.884l-2.744 1.12c-.654-1.5307-1.876-2.296-3.668-2.296-.784 0-1.503.2053-2.156.616-.654.392-1.176.952-1.568 1.68-.392.7093-.588 1.5493-.588 2.52 0 .9707.196 1.82.588 2.548.392.728.914 1.288 1.568 1.68.653.392 1.372.588 2.156.588.914 0 1.689-.2053 2.324-.616.634-.4293 1.129-1.008 1.484-1.736l2.688 1.176c-.504 1.1387-1.307 2.0813-2.408 2.828-1.102.7467-2.446 1.12-4.032 1.12zm15.72 0c-1.4 0-2.651-.3267-3.752-.98-1.102-.6533-1.97-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.298-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.082-.7093 2.324-1.064 3.724-1.064 1.474 0 2.725.3173 3.752.952 1.045.6347 1.838 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.01.392-.028.56 0 .168-.01.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.858.7093 1.829 1.064 2.912 1.064.97 0 1.773-.2147 2.408-.644.634-.448 1.138-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.39 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.71.616-1.186 1.4373-1.428 2.464h7.924c-.038-.4853-.196-.9893-.476-1.512-.28-.5227-.71-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zM147.063 30v-2.52l7.952-9.128h-7.7V15.72h11.396v2.52l-7.924 9.128h8.148V30h-11.872z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M210.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM225.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM253.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M198.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M185.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M177.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M185.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C192.123 6.03271 189.082 4.7 185.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-sk/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-sk/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..78e03f8add
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-sk/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="254dp" android:height="38dp" android:viewportWidth="254" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M4.14691 30V9.952h6.41199c2.1093 0 3.92.4293 5.432 1.288 1.5307.84 2.7067 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8213 1.4933-1.9973 2.6693-3.528 3.528-1.512.84-3.3227 1.26-5.432 1.26H4.14691zm3.08-2.912h3.24799c2.2773 0 4.0413-.6347 5.292-1.904 1.2693-1.2693 1.904-3.0053 1.904-5.208s-.6347-3.9387-1.904-5.208c-1.2507-1.2693-3.0147-1.904-5.292-1.904H7.22691v14.224zm21.34829 3.36c-1.0266 0-1.9413-.196-2.744-.588-.8026-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2614-1.8667.784-2.576.5414-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8854-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2134.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4186.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7466.448-1.6426.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5974-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.5119-.588-.5787-.168-1.1947-.252-1.8481-.252-1.232 0-2.1093.252-2.632.756-.5226.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM39.6804 30V15.72h2.856v2.1h.168c.3173-.728.8587-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7187.028.98.084.28.056.532.1213.756.196v3.136c-.3547-.1493-.7187-.2707-1.092-.364-.3547-.0933-.728-.14-1.12-.14-.7093 0-1.344.196-1.904.588-.5413.3733-.9707.8867-1.288 1.54-.3173.6347-.476 1.3347-.476 2.1V30h-3.024zm17.4106.448c-1.4746 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6346-1.1387-.952-2.4267-.952-3.864 0-1.4187.3174-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4174-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9974 1.5867 2.632 2.744.6347 1.1387.952 2.4173.952 3.836 0 1.4373-.3173 2.7253-.952 3.864-.6346 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2134-.9427 1.624-1.652.4294-.728.644-1.596.644-2.604s-.2146-1.8667-.644-2.576c-.4106-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2226.924-1.652 1.652-.4106.7093-.616 1.568-.616 2.576s.2054 1.876.616 2.604c.4294.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM71.554 30l-5.908-14.28h3.36l4.004 10.388h.14l4.088-10.388h3.304L74.578 30h-3.024zm15.4517.448c-1.0266 0-1.9413-.196-2.744-.588-.8026-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2614-1.8667.784-2.576.5414-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8854-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2134.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4186.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7466.448-1.6426.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5974-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5786-.168-1.1946-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5226.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm11.8117-2.128v-7.504h-2.492V15.72h2.492v-4.032h3.0236v4.032h3.5v2.632h-3.5v6.86c0 .7093.14 1.2507.42 1.624.299.3733.794.56 1.484.56.355 0 .654-.0467.896-.14.262-.0933.523-.224.784-.392v2.94c-.317.1307-.653.2333-1.008.308-.354.0747-.774.112-1.26.112-1.325 0-2.38-.3827-3.164-1.148-.7836-.784-1.1756-1.8573-1.1756-3.22zm4.5916-11.788V9.952h2.828l-.7 4.116h-2.128zm18.386 16.38c-1.438 0-2.707-.3267-3.808-.98-1.102-.6533-1.97-1.5493-2.604-2.688-.635-1.1573-.952-2.464-.952-3.92s.317-2.7533.952-3.892c.634-1.1573 1.502-2.0627 2.604-2.716 1.101-.6533 2.37-.98 3.808-.98 1.586 0 2.921.3547 4.004 1.064 1.101.7093 1.885 1.6707 2.352 2.884l-2.744 1.12c-.654-1.5307-1.876-2.296-3.668-2.296-.784 0-1.503.2053-2.156.616-.654.392-1.176.952-1.568 1.68-.392.7093-.588 1.5493-.588 2.52 0 .9707.196 1.82.588 2.548.392.728.914 1.288 1.568 1.68.653.392 1.372.588 2.156.588.914 0 1.689-.2053 2.324-.616.634-.4293 1.129-1.008 1.484-1.736l2.688 1.176c-.504 1.1387-1.307 2.0813-2.408 2.828-1.102.7467-2.446 1.12-4.032 1.12zm15.72 0c-1.4 0-2.651-.3267-3.752-.98-1.102-.6533-1.97-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.298-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.082-.7093 2.324-1.064 3.724-1.064 1.474 0 2.725.3173 3.752.952 1.045.6347 1.838 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.01.392-.028.56 0 .168-.01.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.858.7093 1.829 1.064 2.912 1.064.97 0 1.773-.2147 2.408-.644.634-.448 1.138-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.39 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.71.616-1.186 1.4373-1.428 2.464h7.924c-.038-.4853-.196-.9893-.476-1.512-.28-.5227-.71-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zM147.063 30v-2.52l7.952-9.128h-7.7V15.72h11.396v2.52l-7.924 9.128h8.148V30h-11.872z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M210.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM225.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM253.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M198.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M185.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M177.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M185.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-sl-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-sl-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..bd4388542e
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-sl-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="356dp" android:height="38dp" android:viewportWidth="356" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.12347 30V9.952h6.412c2.10933 0 3.92003.4293 5.43203 1.288 1.5306.84 2.7066 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8214 1.4933-1.9974 2.6693-3.528 3.528-1.512.84-3.3227 1.26-5.43203 1.26h-6.412zm3.08-2.912h3.248c2.27733 0 4.04133-.6347 5.29203-1.904 1.2693-1.2693 1.904-3.0053 1.904-5.208s-.6347-3.9387-1.904-5.208c-1.2507-1.2693-3.0147-1.904-5.29203-1.904h-3.248v14.224zm23.17823 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9974-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6346-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6346 1.1387.952 2.4173.952 3.836 0 1.4373-.3174 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5214.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6906.3733 1.428.56 2.212.56zM39.6413 30V15.72h2.856v1.96h.168c.4107-.6907 1.0174-1.26 1.82-1.708.8214-.4667 1.7174-.7 2.688-.7 1.7547 0 3.0707.5227 3.948 1.568.8774 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2893-1.9973-.868-2.52-.5786-.5413-1.3346-.812-2.268-.812-.728 0-1.3626.2053-1.904.616-.5413.392-.9706.9147-1.288 1.568-.2986.6533-.448 1.3533-.448 2.1V30h-3.024zm20.8855.448c-1.0267 0-1.9413-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm17.0444 2.464c-1.4373 0-2.7066-.3267-3.808-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.6346-1.1573-.952-2.464-.952-3.92s.3174-2.7533.952-3.892c.6347-1.1573 1.5027-2.0627 2.604-2.716 1.1014-.6533 2.3707-.98 3.808-.98 1.5867 0 2.9214.3547 4.004 1.064 1.1014.7093 1.8854 1.6707 2.352 2.884l-2.744 1.12c-.6533-1.5307-1.876-2.296-3.668-2.296-.784 0-1.5026.2053-2.156.616-.6533.392-1.176.952-1.568 1.68-.392.7093-.588 1.5493-.588 2.52 0 .9707.196 1.82.588 2.548.392.728.9147 1.288 1.568 1.68.6534.392 1.372.588 2.156.588.9147 0 1.6894-.2053 2.324-.616.6347-.4293 1.1294-1.008 1.484-1.736l2.688 1.176c-.504 1.1387-1.3066 2.0813-2.408 2.828-1.1013.7467-2.4453 1.12-4.032 1.12zM89.1719 13.62c-.56 0-1.0454-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.4106-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.4106.392.616.868.616 1.428 0 .56-.2054 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM87.6599 30V15.72h3.024V30h-3.024zm8.812-16.38c-.56 0-1.0454-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.4106-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.4106.392.616.868.616 1.428 0 .56-.2054 1.0453-.616 1.456-.392.392-.868.588-1.428.588zm-2.716 22.708c-.5787 0-1.1014-.0653-1.568-.196V33.22c.1866.112.4013.196.644.252.224.0747.448.112.672.112.5413 0 .9146-.168 1.12-.504.224-.3173.336-.784.336-1.4V15.72h3.024v15.988c0 1.6427-.4014 2.8187-1.204 3.528-.8027.728-1.8107 1.092-3.024 1.092zm12.6231-5.88c-1.027 0-1.941-.196-2.744-.588-.803-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.261-1.8667.784-2.576.541-.728 1.26-1.2787 2.156-1.652.896-.3733 1.885-.56 2.968-.56.896 0 1.68.084 2.352.252.691.168 1.213.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.419.168-2.072.504-.653.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.027-.504 2.147-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.373.5787-.933 1.092-1.68 1.54-.747.448-1.643.672-2.688.672zm.532-2.464c.784 0 1.475-.1867 2.072-.56.597-.3733 1.064-.8587 1.4-1.456.355-.616.532-1.2787.532-1.988-.429-.2427-.933-.4387-1.512-.588-.579-.168-1.195-.252-1.848-.252-1.232 0-2.109.252-2.632.756-.523.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm22.616 2.464c-1.717 0-3.089-.3733-4.116-1.12-1.026-.7653-1.736-1.6707-2.128-2.716l2.716-1.176c.336.7653.822 1.3533 1.456 1.764.635.392 1.354.588 2.156.588.747 0 1.391-.1307 1.932-.392.542-.28.812-.728.812-1.344 0-.5973-.27-1.036-.812-1.316-.541-.28-1.213-.5227-2.016-.728l-1.708-.392c-.69-.168-1.334-.4293-1.932-.784-.597-.3547-1.082-.812-1.456-1.372-.373-.5787-.56-1.2507-.56-2.016 0-.84.252-1.568.756-2.184.504-.6347 1.167-1.12 1.988-1.456.84-.3547 1.746-.532 2.716-.532 1.326 0 2.483.2613 3.472.784 1.008.504 1.746 1.2693 2.212 2.296l-2.604 1.176c-.336-.6347-.774-1.0733-1.316-1.316-.522-.2613-1.101-.392-1.736-.392-.709 0-1.306.1493-1.792.448-.466.2987-.7.672-.7 1.12 0 .4853.206.868.616 1.148.43.28.952.504 1.568.672l2.072.504c1.419.3547 2.483.896 3.192 1.624.71.7093 1.064 1.5773 1.064 2.604 0 .9147-.261 1.7173-.784 2.408-.522.672-1.232 1.1947-2.128 1.568-.877.3547-1.857.532-2.94.532zm20.835 0c-1.717 0-3.089-.3733-4.116-1.12-1.027-.7653-1.736-1.6707-2.128-2.716l2.716-1.176c.336.7653.821 1.3533 1.456 1.764.635.392 1.353.588 2.156.588.747 0 1.391-.1307 1.932-.392.541-.28.812-.728.812-1.344 0-.5973-.271-1.036-.812-1.316s-1.213-.5227-2.016-.728l-1.708-.392c-.691-.168-1.335-.4293-1.932-.784s-1.083-.812-1.456-1.372c-.373-.5787-.56-1.2507-.56-2.016 0-.84.252-1.568.756-2.184.504-.6347 1.167-1.12 1.988-1.456.84-.3547 1.745-.532 2.716-.532 1.325 0 2.483.2613 3.472.784 1.008.504 1.745 1.2693 2.212 2.296l-2.604 1.176c-.336-.6347-.775-1.0733-1.316-1.316-.523-.2613-1.101-.392-1.736-.392-.709 0-1.307.1493-1.792.448-.467.2987-.7.672-.7 1.12 0 .4853.205.868.616 1.148.429.28.952.504 1.568.672l2.072.504c1.419.3547 2.483.896 3.192 1.624.709.7093 1.064 1.5773 1.064 2.604 0 .9147-.261 1.7173-.784 2.408-.523.672-1.232 1.1947-2.128 1.568-.877.3547-1.857.532-2.94.532zm10.166-4.592v-7.504h-2.492V15.72h2.492v-4.032h3.024v4.032h3.5v2.632h-3.5v6.86c0 .7093.14 1.2507.42 1.624.299.3733.794.56 1.484.56.355 0 .654-.0467.896-.14.262-.0933.523-.224.784-.392v2.94c-.317.1307-.653.2333-1.008.308-.354.0747-.774.112-1.26.112-1.325 0-2.38-.3827-3.164-1.148-.784-.784-1.176-1.8573-1.176-3.22zm15.899 4.592c-1.475 0-2.772-.336-3.892-1.008-1.12-.672-1.997-1.5773-2.632-2.716-.635-1.1387-.952-2.4267-.952-3.864 0-1.4187.317-2.6973.952-3.836.635-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.417-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.997 1.5867 2.632 2.744.635 1.1387.952 2.4173.952 3.836 0 1.4373-.317 2.7253-.952 3.864s-1.512 2.044-2.632 2.716c-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.213-.9427 1.624-1.652.429-.728.644-1.596.644-2.604s-.215-1.8667-.644-2.576c-.411-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.521.196-2.212.588-.672.3733-1.223.924-1.652 1.652-.411.7093-.616 1.568-.616 2.576s.205 1.876.616 2.604c.429.7093.98 1.26 1.652 1.652.691.3733 1.428.56 2.212.56zM186.687 30V15.72h2.856v2.1h.168c.317-.728.858-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .718.028.98.084.28.056.532.1213.756.196v3.136c-.355-.1493-.719-.2707-1.092-.364-.355-.0933-.728-.14-1.12-.14-.71 0-1.344.196-1.904.588-.542.3733-.971.8867-1.288 1.54-.318.6347-.476 1.3347-.476 2.1V30h-3.024zm13.274-16.38c-.56 0-1.045-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.411-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.411.392.616.868.616 1.428 0 .56-.205 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM198.449 30V15.72h3.024V30h-3.024zm8.451-4.144v-7.504h-2.492V15.72h2.492v-4.032h3.024v4.032h3.5v2.632h-3.5v6.86c0 .7093.14 1.2507.42 1.624.299.3733.794.56 1.484.56.355 0 .654-.0467.896-.14.262-.0933.523-.224.784-.392v2.94c-.317.1307-.653.2333-1.008.308-.354.0747-.774.112-1.26.112-1.325 0-2.38-.3827-3.164-1.148-.784-.784-1.176-1.8573-1.176-3.22zM221.102 30l-5.908-14.28h3.36l4.004 10.388h.14l4.088-10.388h3.304L224.126 30h-3.024zm12.982-16.38c-.56 0-1.046-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.41-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.41.392.616.868.616 1.428 0 .56-.206 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM232.572 30V15.72h3.024V30h-3.024zm8.812-16.38c-.56 0-1.046-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.41-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.41.392.616.868.616 1.428 0 .56-.206 1.0453-.616 1.456-.392.392-.868.588-1.428.588zm-2.716 22.708c-.579 0-1.102-.0653-1.568-.196V33.22c.186.112.401.196.644.252.224.0747.448.112.672.112.541 0 .914-.168 1.12-.504.224-.3173.336-.784.336-1.4V15.72h3.024v15.988c0 1.6427-.402 2.8187-1.204 3.528-.803.728-1.811 1.092-3.024 1.092zm14.863-5.88c-1.475 0-2.772-.336-3.892-1.008-1.12-.672-1.997-1.5773-2.632-2.716-.635-1.1387-.952-2.4267-.952-3.864 0-1.4187.317-2.6973.952-3.836.635-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.417-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.997 1.5867 2.632 2.744.635 1.1387.952 2.4173.952 3.836 0 1.4373-.317 2.7253-.952 3.864s-1.512 2.044-2.632 2.716c-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.213-.9427 1.624-1.652.429-.728.644-1.596.644-2.604s-.215-1.8667-.644-2.576c-.411-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.521.196-2.212.588-.672.3733-1.223.924-1.652 1.652-.411.7093-.616 1.568-.616 2.576s.205 1.876.616 2.604c.429.7093.98 1.26 1.652 1.652.691.3733 1.428.56 2.212.56z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M312.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM327.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM355.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M300.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M287.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M279.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M287.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C294.123 6.03271 291.082 4.7 287.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-sl/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-sl/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..b1a8d5a0d2
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-sl/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="356dp" android:height="38dp" android:viewportWidth="356" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.12347 30V9.952h6.412c2.10933 0 3.92003.4293 5.43203 1.288 1.5306.84 2.7066 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8214 1.4933-1.9974 2.6693-3.528 3.528-1.512.84-3.3227 1.26-5.43203 1.26h-6.412zm3.08-2.912h3.248c2.27733 0 4.04133-.6347 5.29203-1.904 1.2693-1.2693 1.904-3.0053 1.904-5.208s-.6347-3.9387-1.904-5.208c-1.2507-1.2693-3.0147-1.904-5.29203-1.904h-3.248v14.224zm23.17823 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9974-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6346-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6346 1.1387.952 2.4173.952 3.836 0 1.4373-.3174 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5214.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6906.3733 1.428.56 2.212.56zM39.6413 30V15.72h2.856v1.96h.168c.4107-.6907 1.0174-1.26 1.82-1.708.8214-.4667 1.7174-.7 2.688-.7 1.7547 0 3.0707.5227 3.948 1.568.8774 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2893-1.9973-.868-2.52-.5786-.5413-1.3346-.812-2.268-.812-.728 0-1.3626.2053-1.904.616-.5413.392-.9706.9147-1.288 1.568-.2986.6533-.448 1.3533-.448 2.1V30h-3.024zm20.8855.448c-1.0267 0-1.9413-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm17.0444 2.464c-1.4373 0-2.7066-.3267-3.808-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.6346-1.1573-.952-2.464-.952-3.92s.3174-2.7533.952-3.892c.6347-1.1573 1.5027-2.0627 2.604-2.716 1.1014-.6533 2.3707-.98 3.808-.98 1.5867 0 2.9214.3547 4.004 1.064 1.1014.7093 1.8854 1.6707 2.352 2.884l-2.744 1.12c-.6533-1.5307-1.876-2.296-3.668-2.296-.784 0-1.5026.2053-2.156.616-.6533.392-1.176.952-1.568 1.68-.392.7093-.588 1.5493-.588 2.52 0 .9707.196 1.82.588 2.548.392.728.9147 1.288 1.568 1.68.6534.392 1.372.588 2.156.588.9147 0 1.6894-.2053 2.324-.616.6347-.4293 1.1294-1.008 1.484-1.736l2.688 1.176c-.504 1.1387-1.3066 2.0813-2.408 2.828-1.1013.7467-2.4453 1.12-4.032 1.12zM89.1719 13.62c-.56 0-1.0454-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.4106-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.4106.392.616.868.616 1.428 0 .56-.2054 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM87.6599 30V15.72h3.024V30h-3.024zm8.812-16.38c-.56 0-1.0454-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.4106-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.4106.392.616.868.616 1.428 0 .56-.2054 1.0453-.616 1.456-.392.392-.868.588-1.428.588zm-2.716 22.708c-.5787 0-1.1014-.0653-1.568-.196V33.22c.1866.112.4013.196.644.252.224.0747.448.112.672.112.5413 0 .9146-.168 1.12-.504.224-.3173.336-.784.336-1.4V15.72h3.024v15.988c0 1.6427-.4014 2.8187-1.204 3.528-.8027.728-1.8107 1.092-3.024 1.092zm12.6231-5.88c-1.027 0-1.941-.196-2.744-.588-.803-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.261-1.8667.784-2.576.541-.728 1.26-1.2787 2.156-1.652.896-.3733 1.885-.56 2.968-.56.896 0 1.68.084 2.352.252.691.168 1.213.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.419.168-2.072.504-.653.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.027-.504 2.147-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.373.5787-.933 1.092-1.68 1.54-.747.448-1.643.672-2.688.672zm.532-2.464c.784 0 1.475-.1867 2.072-.56.597-.3733 1.064-.8587 1.4-1.456.355-.616.532-1.2787.532-1.988-.429-.2427-.933-.4387-1.512-.588-.579-.168-1.195-.252-1.848-.252-1.232 0-2.109.252-2.632.756-.523.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm22.616 2.464c-1.717 0-3.089-.3733-4.116-1.12-1.026-.7653-1.736-1.6707-2.128-2.716l2.716-1.176c.336.7653.822 1.3533 1.456 1.764.635.392 1.354.588 2.156.588.747 0 1.391-.1307 1.932-.392.542-.28.812-.728.812-1.344 0-.5973-.27-1.036-.812-1.316-.541-.28-1.213-.5227-2.016-.728l-1.708-.392c-.69-.168-1.334-.4293-1.932-.784-.597-.3547-1.082-.812-1.456-1.372-.373-.5787-.56-1.2507-.56-2.016 0-.84.252-1.568.756-2.184.504-.6347 1.167-1.12 1.988-1.456.84-.3547 1.746-.532 2.716-.532 1.326 0 2.483.2613 3.472.784 1.008.504 1.746 1.2693 2.212 2.296l-2.604 1.176c-.336-.6347-.774-1.0733-1.316-1.316-.522-.2613-1.101-.392-1.736-.392-.709 0-1.306.1493-1.792.448-.466.2987-.7.672-.7 1.12 0 .4853.206.868.616 1.148.43.28.952.504 1.568.672l2.072.504c1.419.3547 2.483.896 3.192 1.624.71.7093 1.064 1.5773 1.064 2.604 0 .9147-.261 1.7173-.784 2.408-.522.672-1.232 1.1947-2.128 1.568-.877.3547-1.857.532-2.94.532zm20.835 0c-1.717 0-3.089-.3733-4.116-1.12-1.027-.7653-1.736-1.6707-2.128-2.716l2.716-1.176c.336.7653.821 1.3533 1.456 1.764.635.392 1.353.588 2.156.588.747 0 1.391-.1307 1.932-.392.541-.28.812-.728.812-1.344 0-.5973-.271-1.036-.812-1.316s-1.213-.5227-2.016-.728l-1.708-.392c-.691-.168-1.335-.4293-1.932-.784s-1.083-.812-1.456-1.372c-.373-.5787-.56-1.2507-.56-2.016 0-.84.252-1.568.756-2.184.504-.6347 1.167-1.12 1.988-1.456.84-.3547 1.745-.532 2.716-.532 1.325 0 2.483.2613 3.472.784 1.008.504 1.745 1.2693 2.212 2.296l-2.604 1.176c-.336-.6347-.775-1.0733-1.316-1.316-.523-.2613-1.101-.392-1.736-.392-.709 0-1.307.1493-1.792.448-.467.2987-.7.672-.7 1.12 0 .4853.205.868.616 1.148.429.28.952.504 1.568.672l2.072.504c1.419.3547 2.483.896 3.192 1.624.709.7093 1.064 1.5773 1.064 2.604 0 .9147-.261 1.7173-.784 2.408-.523.672-1.232 1.1947-2.128 1.568-.877.3547-1.857.532-2.94.532zm10.166-4.592v-7.504h-2.492V15.72h2.492v-4.032h3.024v4.032h3.5v2.632h-3.5v6.86c0 .7093.14 1.2507.42 1.624.299.3733.794.56 1.484.56.355 0 .654-.0467.896-.14.262-.0933.523-.224.784-.392v2.94c-.317.1307-.653.2333-1.008.308-.354.0747-.774.112-1.26.112-1.325 0-2.38-.3827-3.164-1.148-.784-.784-1.176-1.8573-1.176-3.22zm15.899 4.592c-1.475 0-2.772-.336-3.892-1.008-1.12-.672-1.997-1.5773-2.632-2.716-.635-1.1387-.952-2.4267-.952-3.864 0-1.4187.317-2.6973.952-3.836.635-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.417-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.997 1.5867 2.632 2.744.635 1.1387.952 2.4173.952 3.836 0 1.4373-.317 2.7253-.952 3.864s-1.512 2.044-2.632 2.716c-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.213-.9427 1.624-1.652.429-.728.644-1.596.644-2.604s-.215-1.8667-.644-2.576c-.411-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.521.196-2.212.588-.672.3733-1.223.924-1.652 1.652-.411.7093-.616 1.568-.616 2.576s.205 1.876.616 2.604c.429.7093.98 1.26 1.652 1.652.691.3733 1.428.56 2.212.56zM186.687 30V15.72h2.856v2.1h.168c.317-.728.858-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .718.028.98.084.28.056.532.1213.756.196v3.136c-.355-.1493-.719-.2707-1.092-.364-.355-.0933-.728-.14-1.12-.14-.71 0-1.344.196-1.904.588-.542.3733-.971.8867-1.288 1.54-.318.6347-.476 1.3347-.476 2.1V30h-3.024zm13.274-16.38c-.56 0-1.045-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.411-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.411.392.616.868.616 1.428 0 .56-.205 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM198.449 30V15.72h3.024V30h-3.024zm8.451-4.144v-7.504h-2.492V15.72h2.492v-4.032h3.024v4.032h3.5v2.632h-3.5v6.86c0 .7093.14 1.2507.42 1.624.299.3733.794.56 1.484.56.355 0 .654-.0467.896-.14.262-.0933.523-.224.784-.392v2.94c-.317.1307-.653.2333-1.008.308-.354.0747-.774.112-1.26.112-1.325 0-2.38-.3827-3.164-1.148-.784-.784-1.176-1.8573-1.176-3.22zM221.102 30l-5.908-14.28h3.36l4.004 10.388h.14l4.088-10.388h3.304L224.126 30h-3.024zm12.982-16.38c-.56 0-1.046-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.41-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.41.392.616.868.616 1.428 0 .56-.206 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM232.572 30V15.72h3.024V30h-3.024zm8.812-16.38c-.56 0-1.046-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.41-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.41.392.616.868.616 1.428 0 .56-.206 1.0453-.616 1.456-.392.392-.868.588-1.428.588zm-2.716 22.708c-.579 0-1.102-.0653-1.568-.196V33.22c.186.112.401.196.644.252.224.0747.448.112.672.112.541 0 .914-.168 1.12-.504.224-.3173.336-.784.336-1.4V15.72h3.024v15.988c0 1.6427-.402 2.8187-1.204 3.528-.803.728-1.811 1.092-3.024 1.092zm14.863-5.88c-1.475 0-2.772-.336-3.892-1.008-1.12-.672-1.997-1.5773-2.632-2.716-.635-1.1387-.952-2.4267-.952-3.864 0-1.4187.317-2.6973.952-3.836.635-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.417-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.997 1.5867 2.632 2.744.635 1.1387.952 2.4173.952 3.836 0 1.4373-.317 2.7253-.952 3.864s-1.512 2.044-2.632 2.716c-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.213-.9427 1.624-1.652.429-.728.644-1.596.644-2.604s-.215-1.8667-.644-2.576c-.411-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.521.196-2.212.588-.672.3733-1.223.924-1.652 1.652-.411.7093-.616 1.568-.616 2.576s.205 1.876.616 2.604c.429.7093.98 1.26 1.652 1.652.691.3733 1.428.56 2.212.56z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M312.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM327.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM355.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M300.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M287.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M279.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M287.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-sr-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-sr-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..b7cec9f8a3
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-sr-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="242dp" android:height="38dp" android:viewportWidth="242" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M1.14069 34.256v-7.168h1.764c.42933-.7093.77467-1.624 1.036-2.744.28-1.1387.476-2.3893.588-3.752.13067-1.3627.196-2.7347.196-4.116V9.952H17.5767v17.136h2.352v7.168h-2.996V30H4.13669v4.256h-2.996zm5.124-7.168h8.23201V12.864H7.72069v4.06c0 2.0347-.13067 3.9107-.392 5.628-.24267 1.7173-.59733 3.1733-1.064 4.368v.168zm23.18651 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6347 1.1387.952 2.4173.952 3.836 0 1.4373-.3173 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM39.7109 30V15.72h3.024v5.74h6.776v-5.74h3.024V30h-3.024v-5.908h-6.776V30h-3.024zm16.6515 0V15.72h3.024v7.308l-.168 2.688h.168l7.14-9.996h2.996V30h-2.996v-7.28l.168-2.688h-.168L59.3864 30h-3.024zm16.9791 6.048V15.72h2.828v1.932h.168c.3733-.616.952-1.1667 1.736-1.652.8026-.4853 1.7546-.728 2.856-.728 1.3066 0 2.4733.3267 3.5.98 1.0266.6533 1.8386 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.5974 1.1387-1.4094 2.0347-2.436 2.688-1.0267.6347-2.1934.952-3.5.952-1.1014 0-2.0534-.2333-2.856-.7-.784-.4853-1.3627-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.7466 0 1.4466-.196 2.1-.588.6533-.392 1.1853-.9427 1.596-1.652.4106-.728.616-1.5867.616-2.576 0-.9893-.2054-1.8387-.616-2.548-.4107-.728-.9427-1.288-1.596-1.68-.6534-.392-1.3534-.588-2.1-.588-.7467 0-1.4467.196-2.1.588-.6534.392-1.1854.952-1.596 1.68-.4107.7093-.616 1.5587-.616 2.548 0 .9893.2053 1.848.616 2.576.4106.7093.9426 1.26 1.596 1.652.6533.392 1.3533.588 2.1.588zm14.8125 2.772c-1.0267 0-1.9413-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm12.309-14.364c-.56 0-1.045-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.411-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.411.392.616.868.616 1.428 0 .56-.205 1.0453-.616 1.456-.392.392-.868.588-1.428.588zm-2.716 22.708c-.579 0-1.101-.0653-1.568-.196V33.22c.187.112.401.196.644.252.224.0747.448.112.672.112.541 0 .915-.168 1.12-.504.224-.3173.336-.784.336-1.4V15.72h3.024v15.988c0 1.6427-.401 2.8187-1.204 3.528-.803.728-1.811 1.092-3.024 1.092zm19.987-.98c-.056.1493-.121.2893-.196.42-.056.1307-.093.224-.112.28h-3.22c.094-.2053.224-.504.392-.896.187-.3733.364-.7373.532-1.092.168-.3547.346-.756.532-1.204.206-.448.411-.8867.616-1.316l1.064-2.324-5.964-13.496h3.36l4.088 9.744h.14l3.948-9.744h3.332l-7.392 17.024c-.205.4853-.429.9893-.672 1.512-.224.5413-.373.9053-.448 1.092zm15.809-4.9c-.784 0-1.568-.0933-2.352-.28-.784-.1867-1.521-.504-2.212-.952-.672-.4667-1.232-1.1107-1.68-1.932l2.408-1.4c.523.728 1.12 1.232 1.792 1.512.691.2613 1.372.392 2.044.392.971 0 1.708-.1867 2.212-.56.504-.3733.756-.8587.756-1.456 0-.5227-.233-.9427-.7-1.26-.448-.336-1.082-.504-1.904-.504h-2.324v-2.38h2.324c.71 0 1.251-.168 1.624-.504.392-.336.588-.7653.588-1.288 0-.616-.261-1.1013-.784-1.456-.522-.3733-1.185-.56-1.988-.56-.709 0-1.39.1493-2.044.448-.653.28-1.148.6627-1.484 1.148l-2.24-1.484c.654-.8213 1.475-1.4653 2.464-1.932 1.008-.4853 2.119-.728 3.332-.728 1.046 0 1.988.1773 2.828.532.859.3547 1.531.8493 2.016 1.484.504.616.756 1.3347.756 2.156 0 .7093-.177 1.344-.532 1.904-.354.5413-.821.952-1.4 1.232v.168c.728.2987 1.316.7467 1.764 1.344.448.5973.672 1.2787.672 2.044 0 .84-.242 1.5867-.728 2.24-.485.6347-1.176 1.1387-2.072 1.512-.896.3733-1.941.56-3.136.56z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M198.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM213.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM241.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M186.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M173.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M165.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M173.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C180.123 6.03271 177.082 4.7 173.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-sr/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-sr/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..59f17d2936
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-sr/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="242dp" android:height="38dp" android:viewportWidth="242" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M1.14069 34.256v-7.168h1.764c.42933-.7093.77467-1.624 1.036-2.744.28-1.1387.476-2.3893.588-3.752.13067-1.3627.196-2.7347.196-4.116V9.952H17.5767v17.136h2.352v7.168h-2.996V30H4.13669v4.256h-2.996zm5.124-7.168h8.23201V12.864H7.72069v4.06c0 2.0347-.13067 3.9107-.392 5.628-.24267 1.7173-.59733 3.1733-1.064 4.368v.168zm23.18651 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6347 1.1387.952 2.4173.952 3.836 0 1.4373-.3173 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM39.7109 30V15.72h3.024v5.74h6.776v-5.74h3.024V30h-3.024v-5.908h-6.776V30h-3.024zm16.6515 0V15.72h3.024v7.308l-.168 2.688h.168l7.14-9.996h2.996V30h-2.996v-7.28l.168-2.688h-.168L59.3864 30h-3.024zm16.9791 6.048V15.72h2.828v1.932h.168c.3733-.616.952-1.1667 1.736-1.652.8026-.4853 1.7546-.728 2.856-.728 1.3066 0 2.4733.3267 3.5.98 1.0266.6533 1.8386 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.5974 1.1387-1.4094 2.0347-2.436 2.688-1.0267.6347-2.1934.952-3.5.952-1.1014 0-2.0534-.2333-2.856-.7-.784-.4853-1.3627-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.7466 0 1.4466-.196 2.1-.588.6533-.392 1.1853-.9427 1.596-1.652.4106-.728.616-1.5867.616-2.576 0-.9893-.2054-1.8387-.616-2.548-.4107-.728-.9427-1.288-1.596-1.68-.6534-.392-1.3534-.588-2.1-.588-.7467 0-1.4467.196-2.1.588-.6534.392-1.1854.952-1.596 1.68-.4107.7093-.616 1.5587-.616 2.548 0 .9893.2053 1.848.616 2.576.4106.7093.9426 1.26 1.596 1.652.6533.392 1.3533.588 2.1.588zm14.8125 2.772c-1.0267 0-1.9413-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6907.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6533.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0267-.504 2.1467-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3733.5787-.9333 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4747-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3547-.616.532-1.2787.532-1.988-.4293-.2427-.9333-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1093.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm12.309-14.364c-.56 0-1.045-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.411-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.411.392.616.868.616 1.428 0 .56-.205 1.0453-.616 1.456-.392.392-.868.588-1.428.588zm-2.716 22.708c-.579 0-1.101-.0653-1.568-.196V33.22c.187.112.401.196.644.252.224.0747.448.112.672.112.541 0 .915-.168 1.12-.504.224-.3173.336-.784.336-1.4V15.72h3.024v15.988c0 1.6427-.401 2.8187-1.204 3.528-.803.728-1.811 1.092-3.024 1.092zm19.987-.98c-.056.1493-.121.2893-.196.42-.056.1307-.093.224-.112.28h-3.22c.094-.2053.224-.504.392-.896.187-.3733.364-.7373.532-1.092.168-.3547.346-.756.532-1.204.206-.448.411-.8867.616-1.316l1.064-2.324-5.964-13.496h3.36l4.088 9.744h.14l3.948-9.744h3.332l-7.392 17.024c-.205.4853-.429.9893-.672 1.512-.224.5413-.373.9053-.448 1.092zm15.809-4.9c-.784 0-1.568-.0933-2.352-.28-.784-.1867-1.521-.504-2.212-.952-.672-.4667-1.232-1.1107-1.68-1.932l2.408-1.4c.523.728 1.12 1.232 1.792 1.512.691.2613 1.372.392 2.044.392.971 0 1.708-.1867 2.212-.56.504-.3733.756-.8587.756-1.456 0-.5227-.233-.9427-.7-1.26-.448-.336-1.082-.504-1.904-.504h-2.324v-2.38h2.324c.71 0 1.251-.168 1.624-.504.392-.336.588-.7653.588-1.288 0-.616-.261-1.1013-.784-1.456-.522-.3733-1.185-.56-1.988-.56-.709 0-1.39.1493-2.044.448-.653.28-1.148.6627-1.484 1.148l-2.24-1.484c.654-.8213 1.475-1.4653 2.464-1.932 1.008-.4853 2.119-.728 3.332-.728 1.046 0 1.988.1773 2.828.532.859.3547 1.531.8493 2.016 1.484.504.616.756 1.3347.756 2.156 0 .7093-.177 1.344-.532 1.904-.354.5413-.821.952-1.4 1.232v.168c.728.2987 1.316.7467 1.764 1.344.448.5973.672 1.2787.672 2.044 0 .84-.242 1.5867-.728 2.24-.485.6347-1.176 1.1387-2.072 1.512-.896.3733-1.941.56-3.136.56z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M198.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM213.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM241.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M186.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M173.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M165.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M173.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-sv-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-sv-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..a30c2fbd3e
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-sv-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="258dp" android:height="38dp" android:viewportWidth="258" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.77113 30V9.952h6.41197c2.1094 0 3.92.4293 5.432 1.288 1.5307.84 2.7067 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8213 1.4933-1.9973 2.6693-3.528 3.528-1.512.84-3.3226 1.26-5.432 1.26H3.77113zm3.08-2.912h3.24797c2.2774 0 4.0414-.6347 5.292-1.904 1.2694-1.2693 1.904-3.0053 1.904-5.208s-.6346-3.9387-1.904-5.208c-1.2506-1.2693-3.0146-1.904-5.292-1.904H6.85113v14.224zm23.17817 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6347 1.1387.952 2.4173.952 3.836 0 1.4373-.3173 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM40.289 30V15.72h2.856v1.96h.168c.4107-.6907 1.0173-1.26 1.82-1.708.8213-.4667 1.7173-.7 2.688-.7 1.7547 0 3.0707.5227 3.948 1.568.8773 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2893-1.9973-.868-2.52-.5787-.5413-1.3347-.812-2.268-.812-.728 0-1.3627.2053-1.904.616-.5413.392-.9707.9147-1.288 1.568-.2987.6533-.448 1.3533-.448 2.1V30h-3.024zm23.0662.448c-1.4 0-2.6507-.3267-3.752-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2987-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0827-.7093 2.324-1.064 3.724-1.064 1.4747 0 2.7253.3173 3.752.952 1.0453.6347 1.8387 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0093.392-.028.56 0 .168-.0093.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8587.7093 1.8293 1.064 2.912 1.064.9707 0 1.7733-.2147 2.408-.644.6347-.448 1.1387-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3893 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7093.616-1.1853 1.4373-1.428 2.464h7.924c-.0373-.4853-.196-.9893-.476-1.512-.28-.5227-.7093-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zM73.2367 30V15.72h2.856v2.1h.168c.3173-.728.8586-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7186.028.98.084.28.056.532.1213.756.196v3.136c-.3547-.1493-.7187-.2707-1.092-.364-.3547-.0933-.728-.14-1.12-.14-.7094 0-1.344.196-1.904.588-.5414.3733-.9707.8867-1.288 1.54-.3174.6347-.476 1.3347-.476 2.1V30h-3.024zm15.5261.448c-1.0267 0-1.9414-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6906.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6534.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0266-.504 2.1466-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3734.5787-.9334 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4746-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3546-.616.532-1.2787.532-1.988-.4294-.2427-.9334-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1094.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM106.703 30V15.72h2.856v1.96h.168c.411-.6907 1.008-1.26 1.792-1.708.784-.4667 1.652-.7 2.604-.7 1.064 0 1.969.252 2.716.756.747.504 1.279 1.1387 1.596 1.904.467-.7467 1.101-1.372 1.904-1.876.803-.5227 1.783-.784 2.94-.784 1.68 0 2.931.5133 3.752 1.54.821 1.008 1.232 2.352 1.232 4.032V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.485-.5413-1.167-.812-2.044-.812-.691 0-1.297.196-1.82.588-.523.3733-.933.8867-1.232 1.54-.28.6533-.42 1.3813-.42 2.184V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.504-.5413-1.213-.812-2.128-.812-.672 0-1.26.196-1.764.588-.504.392-.905.9147-1.204 1.568-.28.6533-.42 1.3813-.42 2.184V30h-3.024zm31.789.448c-1.4 0-2.651-.3267-3.752-.98s-1.969-1.5493-2.604-2.688c-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.725.3173 3.752.952 1.045.6347 1.839 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392H134.18c.149 1.4187.644 2.4827 1.484 3.192.859.7093 1.829 1.064 2.912 1.064.971 0 1.773-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zm16.262 12.6c-1.288 0-2.455-.3173-3.5-.952-1.027-.6533-1.848-1.5493-2.464-2.688-.597-1.1573-.896-2.4733-.896-3.948s.299-2.7813.896-3.92c.616-1.1387 1.437-2.0347 2.464-2.688 1.045-.6533 2.212-.98 3.5-.98 1.101 0 2.044.2427 2.828.728.803.4853 1.391 1.036 1.764 1.652h.168l-.168-1.988V9.952h2.996V30h-2.828v-1.904h-.168c-.373.616-.961 1.1667-1.764 1.652-.784.4667-1.727.7-2.828.7zm.448-2.772c.747 0 1.447-.196 2.1-.588.672-.392 1.204-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.392-.728-.924-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.747 0-1.447.196-2.1.588-.653.392-1.185.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.653.392 1.353.588 2.1.588z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M214.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM229.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM257.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M202.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M189.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M181.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M189.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C196.123 6.03271 193.082 4.7 189.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-sv/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-sv/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..abf8cfe800
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-sv/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="258dp" android:height="38dp" android:viewportWidth="258" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.77113 30V9.952h6.41197c2.1094 0 3.92.4293 5.432 1.288 1.5307.84 2.7067 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8213 1.4933-1.9973 2.6693-3.528 3.528-1.512.84-3.3226 1.26-5.432 1.26H3.77113zm3.08-2.912h3.24797c2.2774 0 4.0414-.6347 5.292-1.904 1.2694-1.2693 1.904-3.0053 1.904-5.208s-.6346-3.9387-1.904-5.208c-1.2506-1.2693-3.0146-1.904-5.292-1.904H6.85113v14.224zm23.17817 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6347 1.1387.952 2.4173.952 3.836 0 1.4373-.3173 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM40.289 30V15.72h2.856v1.96h.168c.4107-.6907 1.0173-1.26 1.82-1.708.8213-.4667 1.7173-.7 2.688-.7 1.7547 0 3.0707.5227 3.948 1.568.8773 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2893-1.9973-.868-2.52-.5787-.5413-1.3347-.812-2.268-.812-.728 0-1.3627.2053-1.904.616-.5413.392-.9707.9147-1.288 1.568-.2987.6533-.448 1.3533-.448 2.1V30h-3.024zm23.0662.448c-1.4 0-2.6507-.3267-3.752-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2987-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0827-.7093 2.324-1.064 3.724-1.064 1.4747 0 2.7253.3173 3.752.952 1.0453.6347 1.8387 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0093.392-.028.56 0 .168-.0093.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8587.7093 1.8293 1.064 2.912 1.064.9707 0 1.7733-.2147 2.408-.644.6347-.448 1.1387-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3893 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7093.616-1.1853 1.4373-1.428 2.464h7.924c-.0373-.4853-.196-.9893-.476-1.512-.28-.5227-.7093-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zM73.2367 30V15.72h2.856v2.1h.168c.3173-.728.8586-1.3253 1.624-1.792.784-.4853 1.624-.728 2.52-.728.392 0 .7186.028.98.084.28.056.532.1213.756.196v3.136c-.3547-.1493-.7187-.2707-1.092-.364-.3547-.0933-.728-.14-1.12-.14-.7094 0-1.344.196-1.904.588-.5414.3733-.9707.8867-1.288 1.54-.3174.6347-.476 1.3347-.476 2.1V30h-3.024zm15.5261.448c-1.0267 0-1.9414-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6906.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6534.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0266-.504 2.1466-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3734.5787-.9334 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4746-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3546-.616.532-1.2787.532-1.988-.4294-.2427-.9334-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1094.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM106.703 30V15.72h2.856v1.96h.168c.411-.6907 1.008-1.26 1.792-1.708.784-.4667 1.652-.7 2.604-.7 1.064 0 1.969.252 2.716.756.747.504 1.279 1.1387 1.596 1.904.467-.7467 1.101-1.372 1.904-1.876.803-.5227 1.783-.784 2.94-.784 1.68 0 2.931.5133 3.752 1.54.821 1.008 1.232 2.352 1.232 4.032V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.485-.5413-1.167-.812-2.044-.812-.691 0-1.297.196-1.82.588-.523.3733-.933.8867-1.232 1.54-.28.6533-.42 1.3813-.42 2.184V30h-2.996v-8.652c0-1.1387-.252-1.9693-.756-2.492-.504-.5413-1.213-.812-2.128-.812-.672 0-1.26.196-1.764.588-.504.392-.905.9147-1.204 1.568-.28.6533-.42 1.3813-.42 2.184V30h-3.024zm31.789.448c-1.4 0-2.651-.3267-3.752-.98s-1.969-1.5493-2.604-2.688c-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.725.3173 3.752.952 1.045.6347 1.839 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392H134.18c.149 1.4187.644 2.4827 1.484 3.192.859.7093 1.829 1.064 2.912 1.064.971 0 1.773-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zm16.262 12.6c-1.288 0-2.455-.3173-3.5-.952-1.027-.6533-1.848-1.5493-2.464-2.688-.597-1.1573-.896-2.4733-.896-3.948s.299-2.7813.896-3.92c.616-1.1387 1.437-2.0347 2.464-2.688 1.045-.6533 2.212-.98 3.5-.98 1.101 0 2.044.2427 2.828.728.803.4853 1.391 1.036 1.764 1.652h.168l-.168-1.988V9.952h2.996V30h-2.828v-1.904h-.168c-.373.616-.961 1.1667-1.764 1.652-.784.4667-1.727.7-2.828.7zm.448-2.772c.747 0 1.447-.196 2.1-.588.672-.392 1.204-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.392-.728-.924-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.747 0-1.447.196-2.1.588-.653.392-1.185.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.653.392 1.353.588 2.1.588z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M214.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM229.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM257.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M202.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M189.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M181.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M189.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-th-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-th-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..4db1e19fdb
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-th-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="222dp" android:height="38dp" android:viewportWidth="222" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M10.411 28.308c-2.27736 0-3.91069-.5227-4.90003-1.568-.98933-1.0453-1.484-2.5387-1.484-4.48v-9.604h2.996v9.688c0 1.1573.27067 2.0347.812 2.632.56.5787 1.41867.868 2.57603.868 1.176 0 2.0346-.2893 2.576-.868.56-.5973.84-1.4747.84-2.632v-9.688h2.996v9.604c0 1.9413-.504 3.4347-1.512 4.48-.9894 1.0453-2.6227 1.568-4.9 1.568zm15.6798 0c-1.1013 0-2.156-.112-3.164-.336-.9893-.224-1.8386-.504-2.548-.84l.868-2.408c.5787.2427 1.288.4947 2.128.756.8587.2613 1.7547.392 2.688.392.9147 0 1.6614-.1587 2.24-.476.5787-.336.868-.8213.868-1.456 0-.5787-.2706-1.0547-.812-1.428-.5413-.3733-1.3626-.7373-2.464-1.092-1.6986-.5413-3.0053-1.1573-3.92-1.848-.896-.7093-1.344-1.7267-1.344-3.052 0-1.2693.504-2.2773 1.512-3.024 1.0267-.7653 2.5574-1.148 4.592-1.148.9334 0 1.8014.084 2.604.252.8214.168 1.456.3827 1.904.644v2.464c-.4853-.224-1.148-.4387-1.988-.644-.8213-.2053-1.6613-.308-2.52-.308-1.12 0-1.9226.168-2.408.504-.4666.3173-.7.7-.7 1.148 0 .5787.28 1.0267.84 1.344.5787.3173 1.5494.7093 2.912 1.176.9334.3173 1.7547.672 2.464 1.064.728.392 1.2974.8867 1.708 1.484.4107.5787.616 1.3253.616 2.24 0 .8027-.196 1.5587-.588 2.268-.3733.6907-1.008 1.2507-1.904 1.68-.8773.4293-2.072.644-3.584.644zm-6.0796-18.004V9.016l2.268-.98h9.912v2.268h-12.18zM37.6968 28v-6.72h-1.988v-2.128h4.76v6.496h.336c1.1387 0 2.0067-.42 2.604-1.26.5974-.84.896-2.212.896-4.116 0-1.9787-.3546-3.388-1.064-4.228-.7093-.84-1.876-1.26-3.5-1.26-.9146 0-1.7733.1213-2.576.364-.8026.2427-1.5586.5973-2.268 1.064v-2.688c.5787-.3173 1.3254-.588 2.24-.812.9334-.2427 1.9507-.364 3.052-.364 2.5947 0 4.4334.6813 5.516 2.044 1.1014 1.3627 1.652 3.3227 1.652 5.88 0 2.464-.532 4.368-1.596 5.712C44.7155 27.328 42.9235 28 40.3848 28h-2.688zm17.9971 0V17.332c0-.8773-.2053-1.5213-.616-1.932-.4107-.4107-1.0827-.616-2.016-.616-.6533 0-1.26.0933-1.82.28-.56.168-1.1013.4013-1.624.7v-2.576c.392-.1867.9333-.3733 1.624-.56.7093-.1867 1.5493-.28 2.52-.28 1.4747 0 2.66.336 3.556 1.008.9147.672 1.372 1.8387 1.372 3.5V28h-2.996zm7.6651 0v-9.604c0-1.9413.5227-3.4347 1.568-4.48 1.0453-1.0453 2.7067-1.568 4.984-1.568 2.296 0 3.9573.5227 4.984 1.568 1.0453 1.0453 1.568 2.5387 1.568 4.48V28h-2.996v-9.604c0-2.3893-1.1947-3.584-3.584-3.584-2.3707 0-3.556 1.1947-3.556 3.584v2.912l.084.028c.392-.728.868-1.204 1.428-1.428.5787-.2427 1.372-.364 2.38-.364h.868v2.352h-.868c-1.064 0-1.876.1587-2.436.476-.56.3173-.9427.7373-1.148 1.26-.2053.5227-.308 1.092-.308 1.708V28h-2.968zm23.0653.28c-1.512 0-2.7066-.3453-3.584-1.036-.8586-.6907-1.4653-1.624-1.82-2.8-.3546-1.176-.532-2.5013-.532-3.976 0-2.128.2987-3.78.896-4.956.5974-1.176 1.428-1.9973 2.492-2.464 1.064-.4667 2.296-.7 3.696-.7 2.3334 0 4.0134.4947 5.04 1.484 1.0267.9893 1.54 2.324 1.54 4.004V28h-2.996v-9.884c0-1.0827-.2706-1.904-.812-2.464-.5226-.56-1.428-.84-2.716-.84-.8026 0-1.512.1493-2.128.448-.616.2987-1.1013.8587-1.456 1.68-.3546.8027-.532 1.9787-.532 3.528 0 1.0267.1027 1.9413.308 2.744.2054.8027.5507 1.4373 1.036 1.904.504.4667 1.1947.7 2.072.7.5227 0 .98-.0653 1.372-.196l.28 2.296c-.2986.1307-.644.224-1.036.28-.392.056-.7653.084-1.12.084zm-.3114-17.948V9.044c.336-.07467.6907-.17733 1.064-.308.3733-.14933.6907-.336.952-.56.2427-.224.364-.51333.364-.868 0-.24267-.0653-.43867-.196-.588-.1493-.14933-.364-.224-.644-.224-.1867 0-.364.03733-.532.112-.1867.056-.3547.112-.504.168l-.56-1.624c.3733-.29867.8027-.49467 1.288-.588.4853-.112.8867-.168 1.204-.168.7653 0 1.372.20533 1.82.616.4293.41067.644.952.644 1.624 0 .56-.1867 1.064-.56 1.512h4.48v2.184h-8.82zm16.3421 17.976c-.784 0-1.54-.084-2.268-.252-.7281-.168-1.4747-.4573-2.2401-.868l.896-2.24c.4107.2427.8867.4573 1.4281.644.541.168 1.139.252 1.792.252 1.269 0 2.268-.4667 2.996-1.4.728-.952 1.092-2.3427 1.092-4.172 0-1.7733-.373-3.1267-1.12-4.06-.747-.9333-1.885-1.4-3.416-1.4-.597 0-1.213.0747-1.8481.224-.616.1307-1.1573.3267-1.624.588v-2.492c.5414-.28 1.148-.476 1.82-.588.6911-.1307 1.3811-.196 2.0721-.196 1.699 0 3.071.3267 4.116.98 1.064.6533 1.839 1.5773 2.324 2.772.504 1.176.756 2.5667.756 4.172 0 2.52-.579 4.4893-1.736 5.908-1.139 1.4187-2.819 2.128-5.04 2.128zm16.961-.028c-2.333 0-3.985-.4293-4.956-1.288-.97-.8773-1.456-2.0347-1.456-3.472 0-.8587.122-1.54.364-2.044.262-.504.588-.8867.98-1.148.392-.2613.794-.4293 1.204-.504v-.112c-.392-.112-.793-.2987-1.204-.56-.392-.2613-.728-.6253-1.008-1.092-.261-.4667-.392-1.0547-.392-1.764 0-.6533.15-1.2693.448-1.848.318-.5973.812-1.0827 1.484-1.456.691-.3733 1.606-.56 2.744-.56.486 0 .98.0373 1.484.112s.896.1867 1.176.336l-.504 2.184c-.186-.056-.438-.112-.756-.168-.317-.056-.634-.084-.952-.084-.709 0-1.241.168-1.596.504-.336.336-.504.7747-.504 1.316 0 .5973.15 1.0547.448 1.372.299.2987.682.504 1.148.616.486.112.98.168 1.484.168h.56v2.044h-.56c-1.026 0-1.782.1867-2.268.56-.485.3733-.728.98-.728 1.82 0 .4667.094.9053.28 1.316.206.4107.551.7467 1.036 1.008.486.2427 1.176.364 2.072.364 1.307 0 2.203-.2707 2.688-.812.486-.5413.728-1.2693.728-2.184V12.656h2.996v10.08c0 1.9413-.522 3.3507-1.568 4.228-1.026.8773-2.65 1.316-4.872 1.316z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M178.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM193.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM221.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M166.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M153.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M145.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M153.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C160.123 6.03271 157.082 4.7 153.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-th/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-th/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..666202619e
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-th/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="222dp" android:height="38dp" android:viewportWidth="222" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M10.411 28.308c-2.27736 0-3.91069-.5227-4.90003-1.568-.98933-1.0453-1.484-2.5387-1.484-4.48v-9.604h2.996v9.688c0 1.1573.27067 2.0347.812 2.632.56.5787 1.41867.868 2.57603.868 1.176 0 2.0346-.2893 2.576-.868.56-.5973.84-1.4747.84-2.632v-9.688h2.996v9.604c0 1.9413-.504 3.4347-1.512 4.48-.9894 1.0453-2.6227 1.568-4.9 1.568zm15.6798 0c-1.1013 0-2.156-.112-3.164-.336-.9893-.224-1.8386-.504-2.548-.84l.868-2.408c.5787.2427 1.288.4947 2.128.756.8587.2613 1.7547.392 2.688.392.9147 0 1.6614-.1587 2.24-.476.5787-.336.868-.8213.868-1.456 0-.5787-.2706-1.0547-.812-1.428-.5413-.3733-1.3626-.7373-2.464-1.092-1.6986-.5413-3.0053-1.1573-3.92-1.848-.896-.7093-1.344-1.7267-1.344-3.052 0-1.2693.504-2.2773 1.512-3.024 1.0267-.7653 2.5574-1.148 4.592-1.148.9334 0 1.8014.084 2.604.252.8214.168 1.456.3827 1.904.644v2.464c-.4853-.224-1.148-.4387-1.988-.644-.8213-.2053-1.6613-.308-2.52-.308-1.12 0-1.9226.168-2.408.504-.4666.3173-.7.7-.7 1.148 0 .5787.28 1.0267.84 1.344.5787.3173 1.5494.7093 2.912 1.176.9334.3173 1.7547.672 2.464 1.064.728.392 1.2974.8867 1.708 1.484.4107.5787.616 1.3253.616 2.24 0 .8027-.196 1.5587-.588 2.268-.3733.6907-1.008 1.2507-1.904 1.68-.8773.4293-2.072.644-3.584.644zm-6.0796-18.004V9.016l2.268-.98h9.912v2.268h-12.18zM37.6968 28v-6.72h-1.988v-2.128h4.76v6.496h.336c1.1387 0 2.0067-.42 2.604-1.26.5974-.84.896-2.212.896-4.116 0-1.9787-.3546-3.388-1.064-4.228-.7093-.84-1.876-1.26-3.5-1.26-.9146 0-1.7733.1213-2.576.364-.8026.2427-1.5586.5973-2.268 1.064v-2.688c.5787-.3173 1.3254-.588 2.24-.812.9334-.2427 1.9507-.364 3.052-.364 2.5947 0 4.4334.6813 5.516 2.044 1.1014 1.3627 1.652 3.3227 1.652 5.88 0 2.464-.532 4.368-1.596 5.712C44.7155 27.328 42.9235 28 40.3848 28h-2.688zm17.9971 0V17.332c0-.8773-.2053-1.5213-.616-1.932-.4107-.4107-1.0827-.616-2.016-.616-.6533 0-1.26.0933-1.82.28-.56.168-1.1013.4013-1.624.7v-2.576c.392-.1867.9333-.3733 1.624-.56.7093-.1867 1.5493-.28 2.52-.28 1.4747 0 2.66.336 3.556 1.008.9147.672 1.372 1.8387 1.372 3.5V28h-2.996zm7.6651 0v-9.604c0-1.9413.5227-3.4347 1.568-4.48 1.0453-1.0453 2.7067-1.568 4.984-1.568 2.296 0 3.9573.5227 4.984 1.568 1.0453 1.0453 1.568 2.5387 1.568 4.48V28h-2.996v-9.604c0-2.3893-1.1947-3.584-3.584-3.584-2.3707 0-3.556 1.1947-3.556 3.584v2.912l.084.028c.392-.728.868-1.204 1.428-1.428.5787-.2427 1.372-.364 2.38-.364h.868v2.352h-.868c-1.064 0-1.876.1587-2.436.476-.56.3173-.9427.7373-1.148 1.26-.2053.5227-.308 1.092-.308 1.708V28h-2.968zm23.0653.28c-1.512 0-2.7066-.3453-3.584-1.036-.8586-.6907-1.4653-1.624-1.82-2.8-.3546-1.176-.532-2.5013-.532-3.976 0-2.128.2987-3.78.896-4.956.5974-1.176 1.428-1.9973 2.492-2.464 1.064-.4667 2.296-.7 3.696-.7 2.3334 0 4.0134.4947 5.04 1.484 1.0267.9893 1.54 2.324 1.54 4.004V28h-2.996v-9.884c0-1.0827-.2706-1.904-.812-2.464-.5226-.56-1.428-.84-2.716-.84-.8026 0-1.512.1493-2.128.448-.616.2987-1.1013.8587-1.456 1.68-.3546.8027-.532 1.9787-.532 3.528 0 1.0267.1027 1.9413.308 2.744.2054.8027.5507 1.4373 1.036 1.904.504.4667 1.1947.7 2.072.7.5227 0 .98-.0653 1.372-.196l.28 2.296c-.2986.1307-.644.224-1.036.28-.392.056-.7653.084-1.12.084zm-.3114-17.948V9.044c.336-.07467.6907-.17733 1.064-.308.3733-.14933.6907-.336.952-.56.2427-.224.364-.51333.364-.868 0-.24267-.0653-.43867-.196-.588-.1493-.14933-.364-.224-.644-.224-.1867 0-.364.03733-.532.112-.1867.056-.3547.112-.504.168l-.56-1.624c.3733-.29867.8027-.49467 1.288-.588.4853-.112.8867-.168 1.204-.168.7653 0 1.372.20533 1.82.616.4293.41067.644.952.644 1.624 0 .56-.1867 1.064-.56 1.512h4.48v2.184h-8.82zm16.3421 17.976c-.784 0-1.54-.084-2.268-.252-.7281-.168-1.4747-.4573-2.2401-.868l.896-2.24c.4107.2427.8867.4573 1.4281.644.541.168 1.139.252 1.792.252 1.269 0 2.268-.4667 2.996-1.4.728-.952 1.092-2.3427 1.092-4.172 0-1.7733-.373-3.1267-1.12-4.06-.747-.9333-1.885-1.4-3.416-1.4-.597 0-1.213.0747-1.8481.224-.616.1307-1.1573.3267-1.624.588v-2.492c.5414-.28 1.148-.476 1.82-.588.6911-.1307 1.3811-.196 2.0721-.196 1.699 0 3.071.3267 4.116.98 1.064.6533 1.839 1.5773 2.324 2.772.504 1.176.756 2.5667.756 4.172 0 2.52-.579 4.4893-1.736 5.908-1.139 1.4187-2.819 2.128-5.04 2.128zm16.961-.028c-2.333 0-3.985-.4293-4.956-1.288-.97-.8773-1.456-2.0347-1.456-3.472 0-.8587.122-1.54.364-2.044.262-.504.588-.8867.98-1.148.392-.2613.794-.4293 1.204-.504v-.112c-.392-.112-.793-.2987-1.204-.56-.392-.2613-.728-.6253-1.008-1.092-.261-.4667-.392-1.0547-.392-1.764 0-.6533.15-1.2693.448-1.848.318-.5973.812-1.0827 1.484-1.456.691-.3733 1.606-.56 2.744-.56.486 0 .98.0373 1.484.112s.896.1867 1.176.336l-.504 2.184c-.186-.056-.438-.112-.756-.168-.317-.056-.634-.084-.952-.084-.709 0-1.241.168-1.596.504-.336.336-.504.7747-.504 1.316 0 .5973.15 1.0547.448 1.372.299.2987.682.504 1.148.616.486.112.98.168 1.484.168h.56v2.044h-.56c-1.026 0-1.782.1867-2.268.56-.485.3733-.728.98-.728 1.82 0 .4667.094.9053.28 1.316.206.4107.551.7467 1.036 1.008.486.2427 1.176.364 2.072.364 1.307 0 2.203-.2707 2.688-.812.486-.5413.728-1.2693.728-2.184V12.656h2.996v10.08c0 1.9413-.522 3.3507-1.568 4.228-1.026.8773-2.65 1.316-4.872 1.316z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M178.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM193.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM221.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M166.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M153.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M145.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M153.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-tr-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-tr-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..11c930e29c
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-tr-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="258dp" android:height="38dp" android:viewportWidth="258" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <group>
+    <group>
+      <path android:pathData="M38.5289 9.44664v8.16616h5.036c1.1996 0 2.1916-.4032 2.9764-1.2096.8054-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.4036-2.0364-1.209-2.8428-.7848-.82685-1.7768-1.24122-2.9764-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.0084V6.57217h7.9788c2.0276 0 3.7485.67569 5.1666 2.0252 1.439 1.34951 2.1582 2.99393 2.1582 4.93143 0 1.9822-.7194 3.6379-2.1582 4.965-1.3958 1.3289-3.1186 1.9916-5.1666 1.9916h-4.9704v.0018zM53.8642 25.0602c0 .784.3326 1.4373.998 1.9599.665.5226 1.4442.7839 2.3376.7839 1.2648 0 2.3915-.4686 3.3837-1.4036.9924-.937 1.4874-2.0364 1.4874-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.2218 0-2.2402.2949-3.0568.8829-.8167.5878-1.2259 1.3141-1.2259 2.1857zm3.8922-11.6285c2.2236 0 3.9782.5935 5.2658 1.7807 1.2856 1.1871 1.9282 2.8147 1.9282 4.8828v9.8647H62.073v-2.2212h-.131c-1.2426 1.829-2.9 2.7438-4.9702 2.7438-1.7658 0-3.2439-.5226-4.4306-1.5679-1.1882-1.0452-1.7824-2.3518-1.7824-3.9197 0-1.6556.6258-2.9717 1.8796-3.9515 1.2538-.9799 2.9264-1.4708 5.0192-1.4708 1.7861 0 3.2586.3266 4.4133.9799v-.6869c0-1.0452-.4148-1.9318-1.2424-2.6616-.8298-.7299-1.7977-1.0938-2.9095-1.0938-1.6799 0-3.0082.7074-3.9892 2.1241l-2.6499-1.6668c1.4613-2.0906 3.6195-3.1358 6.4765-3.1358zM81.4629 13.9543L71.4233 37.0154h-3.1058l3.728-8.069-6.6056-14.9921h3.27l4.7742 11.4979h.0654l4.6434-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M26.3729 18.4452c0-.9463-.0803-1.8591-.2317-2.7326H13.4536v5.1759h7.2669c-.3121 1.6872-1.2557 3.1227-2.687 4.084v3.3616h4.3369c2.5394-2.3406 4.0025-5.7993 4.0025-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M13.4536 31.5782c3.6307 0 6.6876-1.1909 8.9168-3.2441l-4.3369-3.3616c-1.2071.8119-2.7618 1.286-4.5799 1.286-3.50915 0-6.48766-2.363-7.55274-5.5473H1.43311v3.4624c2.21425 4.3901 6.76422 7.4046 12.02049 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M5.90095 20.7111c-.27281-.8119-.4223-1.678-.4223-2.5721 0-.894.14949-1.7601.4223-2.572v-3.4625H1.43319C.517594 13.9188 0 15.9683 0 18.139c0 2.1708.517594 4.2205 1.43319 6.0346l4.46776-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M13.4536 10.0196c1.9826 0 3.7596.6813 5.161 2.0159v.0019l3.8399-3.83578C20.1226 6.03271 17.0824 4.7 13.4536 4.7c-5.25627 0-9.80624 3.01446-12.02049 7.4046l4.46775 3.4624c1.06508-3.1843 4.04359-5.5474 7.55274-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+  <path android:pathData="M96.5 13.62c-.56 0-1.0453-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.4107-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.4107.392.616.868.616 1.428 0 .56-.2053 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM94.988 30V15.72h3.024V30h-3.024zm7.104 0V9.952h3.024V30h-3.024zm13.276.448c-1.4 0-2.65-.3267-3.752-.98-1.101-.6533-1.969-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.598-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.726.3173 3.752.952 1.046.6347 1.839 1.5027 2.38 2.604.542 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.15 1.4187.644 2.4827 1.484 3.192.859.7093 1.83 1.064 2.912 1.064.971 0 1.774-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.866.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.278-.56-2.156-.56zm24.473 12.6c-1.101 0-2.053-.2333-2.856-.7-.784-.4853-1.363-1.036-1.736-1.652h-.168V30h-2.856V9.952h3.024v5.712l-.168 1.988h.168c.373-.616.952-1.1667 1.736-1.652.803-.4853 1.755-.728 2.856-.728 1.307 0 2.473.3267 3.5.98 1.027.6533 1.839 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.597 1.1387-1.409 2.0347-2.436 2.688-1.027.6347-2.193.952-3.5.952zm-.448-2.772c.747 0 1.447-.196 2.1-.588.653-.392 1.185-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.411-.728-.943-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.747 0-1.447.196-2.1.588-.653.392-1.185.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.653.392 1.353.588 2.1.588zm14.866 2.772c-1.027 0-1.941-.196-2.744-.588-.803-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.261-1.8667.784-2.576.541-.728 1.26-1.2787 2.156-1.652.896-.3733 1.885-.56 2.968-.56.896 0 1.68.084 2.352.252.691.168 1.213.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.419.168-2.072.504-.653.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.027-.504 2.147-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.373.5787-.933 1.092-1.68 1.54-.747.448-1.643.672-2.688.672zm.532-2.464c.784 0 1.475-.1867 2.072-.56.597-.3733 1.064-.8587 1.4-1.456.355-.616.532-1.2787.532-1.988-.429-.2427-.933-.4387-1.512-.588-.579-.168-1.195-.252-1.848-.252-1.232 0-2.109.252-2.632.756-.523.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm16.876 8.512c-1.25 0-2.333-.2053-3.248-.616-.896-.392-1.624-.9053-2.184-1.54-.56-.616-.961-1.2507-1.204-1.904l2.8-1.176c.299.7467.775 1.3533 1.428 1.82.672.4853 1.475.728 2.408.728 1.307 0 2.334-.392 3.08-1.176.766-.784 1.148-1.8947 1.148-3.332v-1.372h-.168c-.448.672-1.073 1.2133-1.876 1.624-.784.392-1.68.588-2.688.588-1.213 0-2.324-.308-3.332-.924-1.008-.616-1.82-1.4747-2.436-2.576-.616-1.12-.924-2.4267-.924-3.92 0-1.512.308-2.8187.924-3.92.616-1.12 1.428-1.988 2.436-2.604 1.008-.616 2.119-.924 3.332-.924 1.008 0 1.904.2053 2.688.616.803.4107 1.428.952 1.876 1.624h.168V15.72h2.884v13.524c0 1.5493-.308 2.8653-.924 3.948-.597 1.0827-1.428 1.904-2.492 2.464s-2.296.84-3.696.84zm.028-9.1c.747 0 1.438-.1773 2.072-.532.635-.3733 1.148-.9053 1.54-1.596.392-.7093.588-1.5587.588-2.548 0-1.0267-.196-1.8853-.588-2.576-.392-.7093-.905-1.2413-1.54-1.596-.634-.3547-1.325-.532-2.072-.532-.746 0-1.446.1867-2.1.56-.634.3547-1.148.8773-1.54 1.568-.392.6907-.588 1.5493-.588 2.576 0 1.008.196 1.8667.588 2.576.392.6907.906 1.2133 1.54 1.568.654.3547 1.354.532 2.1.532zm.224-14.364c-.653 0-1.26-.1587-1.82-.476-.56-.3173-1.017-.7467-1.372-1.288-.336-.56-.504-1.1853-.504-1.876h2.24c0 .392.131.7373.392 1.036.262.2987.616.448 1.064.448.43 0 .766-.1493 1.008-.448.262-.2987.392-.644.392-1.036h2.24c0 .6907-.177 1.316-.532 1.876-.336.5413-.784.9707-1.344 1.288-.541.3173-1.129.476-1.764.476zM182.701 30V15.72h3.024V30h-3.024zm12.175.448c-1.717 0-3.089-.3733-4.116-1.12-1.027-.7653-1.736-1.6707-2.128-2.716l2.716-1.176c.336.7653.821 1.3533 1.456 1.764.635.392 1.353.588 2.156.588.747 0 1.391-.1307 1.932-.392.541-.28.812-.728.812-1.344 0-.5973-.271-1.036-.812-1.316s-1.213-.5227-2.016-.728l-1.708-.392c-.691-.168-1.335-.4293-1.932-.784s-1.083-.812-1.456-1.372c-.373-.5787-.56-1.2507-.56-2.016 0-.84.252-1.568.756-2.184.504-.6347 1.167-1.12 1.988-1.456.84-.3547 1.745-.532 2.716-.532 1.325 0 2.483.2613 3.472.784 1.008.504 1.745 1.2693 2.212 2.296l-2.604 1.176c-.336-.6347-.775-1.0733-1.316-1.316-.523-.2613-1.101-.392-1.736-.392-.709 0-1.307.1493-1.792.448-.467.2987-.7.672-.7 1.12 0 .4853.205.868.616 1.148.429.28.952.504 1.568.672l2.072.504c1.419.3547 2.483.896 3.192 1.624.709.7093 1.064 1.5773 1.064 2.604 0 .9147-.261 1.7173-.784 2.408-.523.672-1.232 1.1947-2.128 1.568-.877.3547-1.857.532-2.94.532zm.504 6.188c-.653 0-1.223-.1867-1.708-.56-.467-.3547-.793-.7933-.98-1.316l1.568-.672c.093.2427.233.448.42.616.187.1867.42.28.7.28.336 0 .597-.1027.784-.308.205-.2053.308-.448.308-.728 0-.2987-.103-.56-.308-.784-.187-.224-.448-.336-.784-.336-.187 0-.355.0373-.504.112-.131.0933-.252.196-.364.308l-1.456-.644.98-2.604h1.68l-.588 1.344c.168-.0373.355-.056.56-.056.709 0 1.316.2427 1.82.728.523.4853.784 1.1293.784 1.932 0 .7467-.271 1.3813-.812 1.904-.541.5227-1.241.784-2.1.784zm19.994-1.288c-.056.1493-.121.2893-.196.42-.056.1307-.093.224-.112.28h-3.22c.094-.2053.224-.504.392-.896.187-.3733.364-.7373.532-1.092.168-.3547.346-.756.532-1.204.206-.448.411-.8867.616-1.316l1.064-2.324-5.964-13.496h3.36l4.088 9.744h.14l3.948-9.744h3.332l-7.392 17.024c-.205.4853-.429.9893-.672 1.512-.224.5413-.373.9053-.448 1.092zm14.592-4.9c-1.027 0-1.941-.196-2.744-.588-.803-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.261-1.8667.784-2.576.541-.728 1.26-1.2787 2.156-1.652.896-.3733 1.885-.56 2.968-.56.896 0 1.68.084 2.352.252.691.168 1.213.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.419.168-2.072.504-.653.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.027-.504 2.147-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.373.5787-.933 1.092-1.68 1.54-.747.448-1.643.672-2.688.672zm.532-2.464c.784 0 1.475-.1867 2.072-.56.597-.3733 1.064-.8587 1.4-1.456.355-.616.532-1.2787.532-1.988-.429-.2427-.933-.4387-1.512-.588-.579-.168-1.195-.252-1.848-.252-1.232 0-2.109.252-2.632.756-.523.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm10.545 8.064V15.72h2.828v1.932h.168c.373-.616.952-1.1667 1.736-1.652.803-.4853 1.755-.728 2.856-.728 1.307 0 2.473.3267 3.5.98 1.027.6533 1.839 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.597 1.1387-1.409 2.0347-2.436 2.688-1.027.6347-2.193.952-3.5.952-1.101 0-2.053-.2333-2.856-.7-.784-.4853-1.363-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.747 0 1.447-.196 2.1-.588.653-.392 1.185-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.411-.728-.943-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.747 0-1.447.196-2.1.588-.653.392-1.185.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.653.392 1.353.588 2.1.588z" android:fillColor="#3c4043"/>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-tr/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-tr/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..3c9dd5e5dd
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-tr/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="258dp" android:height="38dp" android:viewportWidth="258" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <group>
+    <group>
+      <path android:pathData="M38.5289 9.34665v8.16615h5.036c1.1996 0 2.1916-.4032 2.9764-1.2096.8054-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.4036-2.0364-1.209-2.8428-.7848-.82684-1.7768-1.24121-2.9764-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.0084V6.47218h7.9788c2.0276 0 3.7485.67569 5.1666 2.0252 1.439 1.3495 2.1582 2.99392 2.1582 4.93142 0 1.9822-.7194 3.6379-2.1582 4.965-1.3958 1.3289-3.1186 1.9916-5.1666 1.9916h-4.9704v.0018zM53.8642 24.9602c0 .784.3326 1.4373.998 1.9599.665.5226 1.4442.7839 2.3376.7839 1.2648 0 2.3915-.4686 3.3837-1.4036.9924-.937 1.4874-2.0364 1.4874-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.2218 0-2.2402.295-3.0568.8829-.8167.5878-1.2259 1.3141-1.2259 2.1857zm3.8922-11.6285c2.2236 0 3.9782.5936 5.2658 1.7807 1.2856 1.1871 1.9282 2.8147 1.9282 4.8828v9.8647H62.073v-2.2212h-.131c-1.2426 1.829-2.9 2.7438-4.9702 2.7438-1.7658 0-3.2439-.5226-4.4306-1.5679-1.1882-1.0452-1.7824-2.3518-1.7824-3.9197 0-1.6556.6258-2.9717 1.8796-3.9515 1.2538-.9799 2.9264-1.4708 5.0192-1.4708 1.7861 0 3.2586.3267 4.4133.9799v-.6868c0-1.0453-.4148-1.9319-1.2424-2.6617-.8298-.7298-1.7977-1.0938-2.9095-1.0938-1.6799 0-3.0082.7074-3.9892 2.1241l-2.6499-1.6668c1.4613-2.0905 3.6195-3.1358 6.4765-3.1358zM81.4629 13.8543L71.4233 36.9154h-3.1058l3.728-8.069-6.6056-14.9921h3.27l4.7742 11.4979h.0654l4.6434-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M26.3729 18.3452c0-.9463-.0803-1.8591-.2317-2.7326H13.4536v5.1759h7.2669c-.3121 1.6872-1.2557 3.1227-2.687 4.084v3.3616h4.3369c2.5394-2.3406 4.0025-5.7993 4.0025-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M13.4536 31.4782c3.6307 0 6.6876-1.1909 8.9168-3.2441l-4.3369-3.3616c-1.2071.8119-2.7618 1.286-4.5799 1.286-3.50915 0-6.48766-2.363-7.55274-5.5473H1.43311v3.4624c2.21425 4.3901 6.76422 7.4046 12.02049 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M5.90095 20.6111c-.27281-.8119-.4223-1.678-.4223-2.572 0-.8941.14949-1.7602.4223-2.5721v-3.4625H1.43319C.517594 13.8188 0 15.8683 0 18.0391c0 2.1707.517594 4.2204 1.43319 6.0345l4.46776-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M13.4536 9.91964c1.9826 0 3.7596.68126 5.161 2.01586v.0019l3.8399-3.83577c-2.3319-2.16891-5.3721-3.50162-9.0009-3.50162-5.25627 0-9.80624 3.01446-12.02049 7.40459l4.46775 3.4624c1.06508-3.1843 4.04359-5.54736 7.55274-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+  <path android:pathData="M96.5 13.62c-.56 0-1.0453-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.4107-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.4107.392.616.868.616 1.428 0 .56-.2053 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM94.988 30V15.72h3.024V30h-3.024zm7.104 0V9.952h3.024V30h-3.024zm13.276.448c-1.4 0-2.65-.3267-3.752-.98-1.101-.6533-1.969-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.598-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.726.3173 3.752.952 1.046.6347 1.839 1.5027 2.38 2.604.542 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.15 1.4187.644 2.4827 1.484 3.192.859.7093 1.83 1.064 2.912 1.064.971 0 1.774-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.866.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.278-.56-2.156-.56zm24.473 12.6c-1.101 0-2.053-.2333-2.856-.7-.784-.4853-1.363-1.036-1.736-1.652h-.168V30h-2.856V9.952h3.024v5.712l-.168 1.988h.168c.373-.616.952-1.1667 1.736-1.652.803-.4853 1.755-.728 2.856-.728 1.307 0 2.473.3267 3.5.98 1.027.6533 1.839 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.597 1.1387-1.409 2.0347-2.436 2.688-1.027.6347-2.193.952-3.5.952zm-.448-2.772c.747 0 1.447-.196 2.1-.588.653-.392 1.185-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.411-.728-.943-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.747 0-1.447.196-2.1.588-.653.392-1.185.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.653.392 1.353.588 2.1.588zm14.866 2.772c-1.027 0-1.941-.196-2.744-.588-.803-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.261-1.8667.784-2.576.541-.728 1.26-1.2787 2.156-1.652.896-.3733 1.885-.56 2.968-.56.896 0 1.68.084 2.352.252.691.168 1.213.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.419.168-2.072.504-.653.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.027-.504 2.147-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.373.5787-.933 1.092-1.68 1.54-.747.448-1.643.672-2.688.672zm.532-2.464c.784 0 1.475-.1867 2.072-.56.597-.3733 1.064-.8587 1.4-1.456.355-.616.532-1.2787.532-1.988-.429-.2427-.933-.4387-1.512-.588-.579-.168-1.195-.252-1.848-.252-1.232 0-2.109.252-2.632.756-.523.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm16.876 8.512c-1.25 0-2.333-.2053-3.248-.616-.896-.392-1.624-.9053-2.184-1.54-.56-.616-.961-1.2507-1.204-1.904l2.8-1.176c.299.7467.775 1.3533 1.428 1.82.672.4853 1.475.728 2.408.728 1.307 0 2.334-.392 3.08-1.176.766-.784 1.148-1.8947 1.148-3.332v-1.372h-.168c-.448.672-1.073 1.2133-1.876 1.624-.784.392-1.68.588-2.688.588-1.213 0-2.324-.308-3.332-.924-1.008-.616-1.82-1.4747-2.436-2.576-.616-1.12-.924-2.4267-.924-3.92 0-1.512.308-2.8187.924-3.92.616-1.12 1.428-1.988 2.436-2.604 1.008-.616 2.119-.924 3.332-.924 1.008 0 1.904.2053 2.688.616.803.4107 1.428.952 1.876 1.624h.168V15.72h2.884v13.524c0 1.5493-.308 2.8653-.924 3.948-.597 1.0827-1.428 1.904-2.492 2.464s-2.296.84-3.696.84zm.028-9.1c.747 0 1.438-.1773 2.072-.532.635-.3733 1.148-.9053 1.54-1.596.392-.7093.588-1.5587.588-2.548 0-1.0267-.196-1.8853-.588-2.576-.392-.7093-.905-1.2413-1.54-1.596-.634-.3547-1.325-.532-2.072-.532-.746 0-1.446.1867-2.1.56-.634.3547-1.148.8773-1.54 1.568-.392.6907-.588 1.5493-.588 2.576 0 1.008.196 1.8667.588 2.576.392.6907.906 1.2133 1.54 1.568.654.3547 1.354.532 2.1.532zm.224-14.364c-.653 0-1.26-.1587-1.82-.476-.56-.3173-1.017-.7467-1.372-1.288-.336-.56-.504-1.1853-.504-1.876h2.24c0 .392.131.7373.392 1.036.262.2987.616.448 1.064.448.43 0 .766-.1493 1.008-.448.262-.2987.392-.644.392-1.036h2.24c0 .6907-.177 1.316-.532 1.876-.336.5413-.784.9707-1.344 1.288-.541.3173-1.129.476-1.764.476zM182.701 30V15.72h3.024V30h-3.024zm12.175.448c-1.717 0-3.089-.3733-4.116-1.12-1.027-.7653-1.736-1.6707-2.128-2.716l2.716-1.176c.336.7653.821 1.3533 1.456 1.764.635.392 1.353.588 2.156.588.747 0 1.391-.1307 1.932-.392.541-.28.812-.728.812-1.344 0-.5973-.271-1.036-.812-1.316s-1.213-.5227-2.016-.728l-1.708-.392c-.691-.168-1.335-.4293-1.932-.784s-1.083-.812-1.456-1.372c-.373-.5787-.56-1.2507-.56-2.016 0-.84.252-1.568.756-2.184.504-.6347 1.167-1.12 1.988-1.456.84-.3547 1.745-.532 2.716-.532 1.325 0 2.483.2613 3.472.784 1.008.504 1.745 1.2693 2.212 2.296l-2.604 1.176c-.336-.6347-.775-1.0733-1.316-1.316-.523-.2613-1.101-.392-1.736-.392-.709 0-1.307.1493-1.792.448-.467.2987-.7.672-.7 1.12 0 .4853.205.868.616 1.148.429.28.952.504 1.568.672l2.072.504c1.419.3547 2.483.896 3.192 1.624.709.7093 1.064 1.5773 1.064 2.604 0 .9147-.261 1.7173-.784 2.408-.523.672-1.232 1.1947-2.128 1.568-.877.3547-1.857.532-2.94.532zm.504 6.188c-.653 0-1.223-.1867-1.708-.56-.467-.3547-.793-.7933-.98-1.316l1.568-.672c.093.2427.233.448.42.616.187.1867.42.28.7.28.336 0 .597-.1027.784-.308.205-.2053.308-.448.308-.728 0-.2987-.103-.56-.308-.784-.187-.224-.448-.336-.784-.336-.187 0-.355.0373-.504.112-.131.0933-.252.196-.364.308l-1.456-.644.98-2.604h1.68l-.588 1.344c.168-.0373.355-.056.56-.056.709 0 1.316.2427 1.82.728.523.4853.784 1.1293.784 1.932 0 .7467-.271 1.3813-.812 1.904-.541.5227-1.241.784-2.1.784zm19.994-1.288c-.056.1493-.121.2893-.196.42-.056.1307-.093.224-.112.28h-3.22c.094-.2053.224-.504.392-.896.187-.3733.364-.7373.532-1.092.168-.3547.346-.756.532-1.204.206-.448.411-.8867.616-1.316l1.064-2.324-5.964-13.496h3.36l4.088 9.744h.14l3.948-9.744h3.332l-7.392 17.024c-.205.4853-.429.9893-.672 1.512-.224.5413-.373.9053-.448 1.092zm14.592-4.9c-1.027 0-1.941-.196-2.744-.588-.803-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.261-1.8667.784-2.576.541-.728 1.26-1.2787 2.156-1.652.896-.3733 1.885-.56 2.968-.56.896 0 1.68.084 2.352.252.691.168 1.213.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.419.168-2.072.504-.653.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.027-.504 2.147-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.373.5787-.933 1.092-1.68 1.54-.747.448-1.643.672-2.688.672zm.532-2.464c.784 0 1.475-.1867 2.072-.56.597-.3733 1.064-.8587 1.4-1.456.355-.616.532-1.2787.532-1.988-.429-.2427-.933-.4387-1.512-.588-.579-.168-1.195-.252-1.848-.252-1.232 0-2.109.252-2.632.756-.523.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm10.545 8.064V15.72h2.828v1.932h.168c.373-.616.952-1.1667 1.736-1.652.803-.4853 1.755-.728 2.856-.728 1.307 0 2.473.3267 3.5.98 1.027.6533 1.839 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.597 1.1387-1.409 2.0347-2.436 2.688-1.027.6347-2.193.952-3.5.952-1.101 0-2.053-.2333-2.856-.7-.784-.4853-1.363-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.747 0 1.447-.196 2.1-.588.653-.392 1.185-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.411-.728-.943-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.747 0-1.447.196-2.1.588-.653.392-1.185.952-1.596 1.68-.411.7093-.616 1.5587-.616 2.548 0 .9893.205 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.653.392 1.353.588 2.1.588z" android:fillColor="#ffffff"/>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-uk-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-uk-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..33cc5f996b
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-uk-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="378dp" android:height="38dp" android:viewportWidth="378" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.41018 30V9.952H18.5302V30h-3.08V12.864H6.49018V30h-3.08zm26.17612.448c-1.4746 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6346-1.1387-.952-2.4267-.952-3.864 0-1.4187.3174-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4174-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9974 1.5867 2.632 2.744.6347 1.1387.952 2.4173.952 3.836 0 1.4373-.3173 2.7253-.952 3.864-.6346 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2134-.9427 1.624-1.652.4294-.728.644-1.596.644-2.604s-.2146-1.8667-.644-2.576c-.4106-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2226.924-1.652 1.652-.4106.7093-.616 1.568-.616 2.576s.2054 1.876.616 2.604c.4294.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM38.0573 30v-.168l5.824-7.392-5.516-6.552v-.168h3.528l4.956 6.328h.168V15.72h3.024v6.328h.168l4.984-6.328h3.556v.168l-5.544 6.552 5.824 7.392V30h-3.556l-5.264-7.028h-.168V30h-3.024v-7.028h-.168L41.6133 30h-3.556zm29.394.448c-1.4 0-2.6507-.3267-3.752-.98-1.1014-.6533-1.9694-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2986-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0826-.7093 2.324-1.064 3.724-1.064 1.4746 0 2.7253.3173 3.752.952 1.0453.6347 1.8386 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0094.392-.028.56 0 .168-.0094.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8586.7093 1.8293 1.064 2.912 1.064.9706 0 1.7733-.2147 2.408-.644.6346-.448 1.1386-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3894 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7094.616-1.1854 1.4373-1.428 2.464h7.924c-.0374-.4853-.196-.9893-.476-1.512-.28-.5227-.7094-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zm9.9934 18.2V15.72h2.828v1.932h.168c.3734-.616.952-1.1667 1.736-1.652.8027-.4853 1.7547-.728 2.856-.728 1.3067 0 2.4734.3267 3.5.98 1.0267.6533 1.8387 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.5973 1.1387-1.4093 2.0347-2.436 2.688-1.0266.6347-2.1933.952-3.5.952-1.1013 0-2.0533-.2333-2.856-.7-.784-.4853-1.3626-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.7467 0 1.4467-.196 2.1-.588.6534-.392 1.1854-.9427 1.596-1.652.4107-.728.616-1.5867.616-2.576 0-.9893-.2053-1.8387-.616-2.548-.4106-.728-.9426-1.288-1.596-1.68-.6533-.392-1.3533-.588-2.1-.588-.7466 0-1.4466.196-2.1.588-.6533.392-1.1853.952-1.596 1.68-.4106.7093-.616 1.5587-.616 2.548 0 .9893.2054 1.848.616 2.576.4107.7093.9427 1.26 1.596 1.652.6534.392 1.3534.588 2.1.588zM98.2806 30V18.352h-4.704V15.72h12.4044v2.632h-4.704V30h-2.9964zm10.4684 0V15.72h7.084c.84 0 1.587.168 2.24.504.672.3173 1.195.756 1.568 1.316.392.56.588 1.1853.588 1.876 0 .7467-.168 1.3907-.504 1.932-.317.5413-.737.9427-1.26 1.204v.168c.709.28 1.269.7 1.68 1.26.429.56.644 1.204.644 1.932 0 .84-.224 1.568-.672 2.184-.429.616-.989 1.092-1.68 1.428-.691.3173-1.428.476-2.212.476h-7.476zm3.024-11.816v3.36h3.696c.504 0 .924-.1587 1.26-.476.336-.3173.504-.7187.504-1.204 0-.504-.168-.9053-.504-1.204-.336-.3173-.756-.476-1.26-.476h-3.696zm0 9.296h4.144c.541 0 .989-.168 1.344-.504.373-.3547.56-.8027.56-1.344 0-.5227-.187-.9613-.56-1.316-.355-.3547-.803-.532-1.344-.532h-4.144v3.696zm16.531 7.868c-.056.1493-.121.2893-.196.42-.056.1307-.093.224-.112.28h-3.22c.093-.2053.224-.504.392-.896.187-.3733.364-.7373.532-1.092.168-.3547.345-.756.532-1.204.205-.448.411-.8867.616-1.316l1.064-2.324-5.964-13.496h3.36l4.088 9.744h.14l3.948-9.744h3.332l-7.392 17.024c-.205.4853-.429.9893-.672 1.512-.224.5413-.373.9053-.448 1.092zM139.291 30V15.72h7.084c.84 0 1.586.168 2.24.504.672.3173 1.194.756 1.568 1.316.392.56.588 1.1853.588 1.876 0 .7467-.168 1.3907-.504 1.932-.318.5413-.738.9427-1.26 1.204v.168c.709.28 1.269.7 1.68 1.26.429.56.644 1.204.644 1.932 0 .84-.224 1.568-.672 2.184-.43.616-.99 1.092-1.68 1.428-.691.3173-1.428.476-2.212.476h-7.476zm3.024-11.816v3.36h3.696c.504 0 .924-.1587 1.26-.476.336-.3173.504-.7187.504-1.204 0-.504-.168-.9053-.504-1.204-.336-.3173-.756-.476-1.26-.476h-3.696zm0 9.296h4.144c.541 0 .989-.168 1.344-.504.373-.3547.56-.8027.56-1.344 0-.5227-.187-.9613-.56-1.316-.355-.3547-.803-.532-1.344-.532h-4.144v3.696zm16.603 2.968c-1.026 0-1.941-.196-2.744-.588-.802-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.262-1.8667.784-2.576.542-.728 1.26-1.2787 2.156-1.652.896-.3733 1.886-.56 2.968-.56.896 0 1.68.084 2.352.252.691.168 1.214.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.418.168-2.072.504-.653.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.027-.504 2.147-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.373.5787-.933 1.092-1.68 1.54-.746.448-1.642.672-2.688.672zm.532-2.464c.784 0 1.475-.1867 2.072-.56.598-.3733 1.064-.8587 1.4-1.456.355-.616.532-1.2787.532-1.988-.429-.2427-.933-.4387-1.512-.588-.578-.168-1.194-.252-1.848-.252-1.232 0-2.109.252-2.632.756-.522.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM173.171 30V18.352h-4.704V15.72h12.404v2.632h-4.704V30h-2.996zm10.469 0V15.72h3.024v7.308l-.168 2.688h.168l7.14-9.996h2.996V30h-2.996v-7.28l.168-2.688h-.168L186.664 30h-3.024zm32.046 0v-5.152c-.392.28-.887.504-1.484.672-.597.1493-1.251.224-1.96.224-1.643 0-2.959-.476-3.948-1.428-.971-.952-1.456-2.24-1.456-3.864V15.72h3.024v4.424c0 .896.252 1.6053.756 2.128.523.504 1.251.756 2.184.756.579 0 1.12-.084 1.624-.252.523-.1867.943-.4293 1.26-.728V15.72h2.996V30h-2.996zm13.249.448c-1.4 0-2.651-.3267-3.752-.98s-1.969-1.5493-2.604-2.688c-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.725.3173 3.752.952 1.045.6347 1.839 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.859.7093 1.829 1.064 2.912 1.064.971 0 1.773-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zm9.993 18.2V15.72h2.828v1.932h.168c.374-.616.952-1.1667 1.736-1.652.803-.4853 1.755-.728 2.856-.728 1.307 0 2.474.3267 3.5.98 1.027.6533 1.839 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.597 1.1387-1.409 2.0347-2.436 2.688-1.026.6347-2.193.952-3.5.952-1.101 0-2.053-.2333-2.856-.7-.784-.4853-1.362-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.747 0 1.447-.196 2.1-.588.654-.392 1.186-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.41-.728-.942-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.746 0-1.446.196-2.1.588-.653.392-1.185.952-1.596 1.68-.41.7093-.616 1.5587-.616 2.548 0 .9893.206 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.654.392 1.354.588 2.1.588zm16.857 2.772c-1.4 0-2.651-.3267-3.752-.98s-1.969-1.5493-2.604-2.688c-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.725.3173 3.752.952 1.045.6347 1.839 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.859.7093 1.829 1.064 2.912 1.064.971 0 1.773-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zm14.57 12.6c-.784 0-1.568-.0933-2.352-.28-.784-.1867-1.521-.504-2.212-.952-.672-.4667-1.232-1.1107-1.68-1.932l2.408-1.4c.523.728 1.12 1.232 1.792 1.512.691.2613 1.372.392 2.044.392.971 0 1.708-.1867 2.212-.56.504-.3733.756-.8587.756-1.456 0-.5227-.233-.9427-.7-1.26-.448-.336-1.082-.504-1.904-.504h-2.324v-2.38h2.324c.71 0 1.251-.168 1.624-.504.392-.336.588-.7653.588-1.288 0-.616-.261-1.1013-.784-1.456-.522-.3733-1.185-.56-1.988-.56-.709 0-1.39.1493-2.044.448-.653.28-1.148.6627-1.484 1.148l-2.24-1.484c.654-.8213 1.475-1.4653 2.464-1.932 1.008-.4853 2.119-.728 3.332-.728 1.046 0 1.988.1773 2.828.532.859.3547 1.531.8493 2.016 1.484.504.616.756 1.3347.756 2.156 0 .7093-.177 1.344-.532 1.904-.354.5413-.821.952-1.4 1.232v.168c.728.2987 1.316.7467 1.764 1.344.448.5973.672 1.2787.672 2.044 0 .84-.242 1.5867-.728 2.24-.485.6347-1.176 1.1387-2.072 1.512-.896.3733-1.941.56-3.136.56z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M334.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM349.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM377.463 13.9543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M322.373 18.4452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M309.454 31.5782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M301.901 20.7111c-.273-.8119-.422-1.678-.422-2.5721 0-.894.149-1.7601.422-2.572v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0345 0 2.1708.518 4.2205 1.433 6.0346l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M309.454 10.0196c1.982 0 3.759.6813 5.161 2.0159v.0019l3.84-3.83578C316.123 6.03271 313.082 4.7 309.454 4.7c-5.257 0-9.807 3.01446-12.021 7.4046l4.468 3.4624c1.065-3.1843 4.043-5.5474 7.553-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-uk/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-uk/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..a92ff95972
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-uk/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="378dp" android:height="38dp" android:viewportWidth="378" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.41018 30V9.952H18.5302V30h-3.08V12.864H6.49018V30h-3.08zm26.17612.448c-1.4746 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6346-1.1387-.952-2.4267-.952-3.864 0-1.4187.3174-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4174-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9974 1.5867 2.632 2.744.6347 1.1387.952 2.4173.952 3.836 0 1.4373-.3173 2.7253-.952 3.864-.6346 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2134-.9427 1.624-1.652.4294-.728.644-1.596.644-2.604s-.2146-1.8667-.644-2.576c-.4106-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2226.924-1.652 1.652-.4106.7093-.616 1.568-.616 2.576s.2054 1.876.616 2.604c.4294.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM38.0573 30v-.168l5.824-7.392-5.516-6.552v-.168h3.528l4.956 6.328h.168V15.72h3.024v6.328h.168l4.984-6.328h3.556v.168l-5.544 6.552 5.824 7.392V30h-3.556l-5.264-7.028h-.168V30h-3.024v-7.028h-.168L41.6133 30h-3.556zm29.394.448c-1.4 0-2.6507-.3267-3.752-.98-1.1014-.6533-1.9694-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2986-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0826-.7093 2.324-1.064 3.724-1.064 1.4746 0 2.7253.3173 3.752.952 1.0453.6347 1.8386 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0094.392-.028.56 0 .168-.0094.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8586.7093 1.8293 1.064 2.912 1.064.9706 0 1.7733-.2147 2.408-.644.6346-.448 1.1386-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3894 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7094.616-1.1854 1.4373-1.428 2.464h7.924c-.0374-.4853-.196-.9893-.476-1.512-.28-.5227-.7094-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zm9.9934 18.2V15.72h2.828v1.932h.168c.3734-.616.952-1.1667 1.736-1.652.8027-.4853 1.7547-.728 2.856-.728 1.3067 0 2.4734.3267 3.5.98 1.0267.6533 1.8387 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.5973 1.1387-1.4093 2.0347-2.436 2.688-1.0266.6347-2.1933.952-3.5.952-1.1013 0-2.0533-.2333-2.856-.7-.784-.4853-1.3626-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.7467 0 1.4467-.196 2.1-.588.6534-.392 1.1854-.9427 1.596-1.652.4107-.728.616-1.5867.616-2.576 0-.9893-.2053-1.8387-.616-2.548-.4106-.728-.9426-1.288-1.596-1.68-.6533-.392-1.3533-.588-2.1-.588-.7466 0-1.4466.196-2.1.588-.6533.392-1.1853.952-1.596 1.68-.4106.7093-.616 1.5587-.616 2.548 0 .9893.2054 1.848.616 2.576.4107.7093.9427 1.26 1.596 1.652.6534.392 1.3534.588 2.1.588zM98.2806 30V18.352h-4.704V15.72h12.4044v2.632h-4.704V30h-2.9964zm10.4684 0V15.72h7.084c.84 0 1.587.168 2.24.504.672.3173 1.195.756 1.568 1.316.392.56.588 1.1853.588 1.876 0 .7467-.168 1.3907-.504 1.932-.317.5413-.737.9427-1.26 1.204v.168c.709.28 1.269.7 1.68 1.26.429.56.644 1.204.644 1.932 0 .84-.224 1.568-.672 2.184-.429.616-.989 1.092-1.68 1.428-.691.3173-1.428.476-2.212.476h-7.476zm3.024-11.816v3.36h3.696c.504 0 .924-.1587 1.26-.476.336-.3173.504-.7187.504-1.204 0-.504-.168-.9053-.504-1.204-.336-.3173-.756-.476-1.26-.476h-3.696zm0 9.296h4.144c.541 0 .989-.168 1.344-.504.373-.3547.56-.8027.56-1.344 0-.5227-.187-.9613-.56-1.316-.355-.3547-.803-.532-1.344-.532h-4.144v3.696zm16.531 7.868c-.056.1493-.121.2893-.196.42-.056.1307-.093.224-.112.28h-3.22c.093-.2053.224-.504.392-.896.187-.3733.364-.7373.532-1.092.168-.3547.345-.756.532-1.204.205-.448.411-.8867.616-1.316l1.064-2.324-5.964-13.496h3.36l4.088 9.744h.14l3.948-9.744h3.332l-7.392 17.024c-.205.4853-.429.9893-.672 1.512-.224.5413-.373.9053-.448 1.092zM139.291 30V15.72h7.084c.84 0 1.586.168 2.24.504.672.3173 1.194.756 1.568 1.316.392.56.588 1.1853.588 1.876 0 .7467-.168 1.3907-.504 1.932-.318.5413-.738.9427-1.26 1.204v.168c.709.28 1.269.7 1.68 1.26.429.56.644 1.204.644 1.932 0 .84-.224 1.568-.672 2.184-.43.616-.99 1.092-1.68 1.428-.691.3173-1.428.476-2.212.476h-7.476zm3.024-11.816v3.36h3.696c.504 0 .924-.1587 1.26-.476.336-.3173.504-.7187.504-1.204 0-.504-.168-.9053-.504-1.204-.336-.3173-.756-.476-1.26-.476h-3.696zm0 9.296h4.144c.541 0 .989-.168 1.344-.504.373-.3547.56-.8027.56-1.344 0-.5227-.187-.9613-.56-1.316-.355-.3547-.803-.532-1.344-.532h-4.144v3.696zm16.603 2.968c-1.026 0-1.941-.196-2.744-.588-.802-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.262-1.8667.784-2.576.542-.728 1.26-1.2787 2.156-1.652.896-.3733 1.886-.56 2.968-.56.896 0 1.68.084 2.352.252.691.168 1.214.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.418.168-2.072.504-.653.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.027-.504 2.147-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.373.5787-.933 1.092-1.68 1.54-.746.448-1.642.672-2.688.672zm.532-2.464c.784 0 1.475-.1867 2.072-.56.598-.3733 1.064-.8587 1.4-1.456.355-.616.532-1.2787.532-1.988-.429-.2427-.933-.4387-1.512-.588-.578-.168-1.194-.252-1.848-.252-1.232 0-2.109.252-2.632.756-.522.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zM173.171 30V18.352h-4.704V15.72h12.404v2.632h-4.704V30h-2.996zm10.469 0V15.72h3.024v7.308l-.168 2.688h.168l7.14-9.996h2.996V30h-2.996v-7.28l.168-2.688h-.168L186.664 30h-3.024zm32.046 0v-5.152c-.392.28-.887.504-1.484.672-.597.1493-1.251.224-1.96.224-1.643 0-2.959-.476-3.948-1.428-.971-.952-1.456-2.24-1.456-3.864V15.72h3.024v4.424c0 .896.252 1.6053.756 2.128.523.504 1.251.756 2.184.756.579 0 1.12-.084 1.624-.252.523-.1867.943-.4293 1.26-.728V15.72h2.996V30h-2.996zm13.249.448c-1.4 0-2.651-.3267-3.752-.98s-1.969-1.5493-2.604-2.688c-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.725.3173 3.752.952 1.045.6347 1.839 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.859.7093 1.829 1.064 2.912 1.064.971 0 1.773-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zm9.993 18.2V15.72h2.828v1.932h.168c.374-.616.952-1.1667 1.736-1.652.803-.4853 1.755-.728 2.856-.728 1.307 0 2.474.3267 3.5.98 1.027.6533 1.839 1.5493 2.436 2.688.616 1.1387.924 2.4453.924 3.92s-.308 2.7907-.924 3.948c-.597 1.1387-1.409 2.0347-2.436 2.688-1.026.6347-2.193.952-3.5.952-1.101 0-2.053-.2333-2.856-.7-.784-.4853-1.362-1.036-1.736-1.652h-.168l.168 1.988v5.964h-2.996zm7.14-8.372c.747 0 1.447-.196 2.1-.588.654-.392 1.186-.9427 1.596-1.652.411-.728.616-1.5867.616-2.576 0-.9893-.205-1.8387-.616-2.548-.41-.728-.942-1.288-1.596-1.68-.653-.392-1.353-.588-2.1-.588-.746 0-1.446.196-2.1.588-.653.392-1.185.952-1.596 1.68-.41.7093-.616 1.5587-.616 2.548 0 .9893.206 1.848.616 2.576.411.7093.943 1.26 1.596 1.652.654.392 1.354.588 2.1.588zm16.857 2.772c-1.4 0-2.651-.3267-3.752-.98s-1.969-1.5493-2.604-2.688c-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.299-2.6227.896-3.78.597-1.1573 1.428-2.0813 2.492-2.772 1.083-.7093 2.324-1.064 3.724-1.064 1.475 0 2.725.3173 3.752.952 1.045.6347 1.839 1.5027 2.38 2.604.541 1.1013.812 2.3427.812 3.724 0 .2053-.009.392-.028.56 0 .168-.009.2987-.028.392h-11.032c.149 1.4187.644 2.4827 1.484 3.192.859.7093 1.829 1.064 2.912 1.064.971 0 1.773-.2147 2.408-.644.635-.448 1.139-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.389 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.867.308-2.576.924-.709.616-1.185 1.4373-1.428 2.464h7.924c-.037-.4853-.196-.9893-.476-1.512-.28-.5227-.709-.9613-1.288-1.316-.56-.3733-1.279-.56-2.156-.56zm14.57 12.6c-.784 0-1.568-.0933-2.352-.28-.784-.1867-1.521-.504-2.212-.952-.672-.4667-1.232-1.1107-1.68-1.932l2.408-1.4c.523.728 1.12 1.232 1.792 1.512.691.2613 1.372.392 2.044.392.971 0 1.708-.1867 2.212-.56.504-.3733.756-.8587.756-1.456 0-.5227-.233-.9427-.7-1.26-.448-.336-1.082-.504-1.904-.504h-2.324v-2.38h2.324c.71 0 1.251-.168 1.624-.504.392-.336.588-.7653.588-1.288 0-.616-.261-1.1013-.784-1.456-.522-.3733-1.185-.56-1.988-.56-.709 0-1.39.1493-2.044.448-.653.28-1.148.6627-1.484 1.148l-2.24-1.484c.654-.8213 1.475-1.4653 2.464-1.932 1.008-.4853 2.119-.728 3.332-.728 1.046 0 1.988.1773 2.828.532.859.3547 1.531.8493 2.016 1.484.504.616.756 1.3347.756 2.156 0 .7093-.177 1.344-.532 1.904-.354.5413-.821.952-1.4 1.232v.168c.728.2987 1.316.7467 1.764 1.344.448.5973.672 1.2787.672 2.044 0 .84-.242 1.5867-.728 2.24-.485.6347-1.176 1.1387-2.072 1.512-.896.3733-1.941.56-3.136.56z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M334.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM349.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM377.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M322.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M309.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M301.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M309.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-v21/googlepay_button_background.xml b/donations/lib/src/gms/res/drawable-v21/googlepay_button_background.xml
new file mode 100755
index 0000000000..4873ef2428
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-v21/googlepay_button_background.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#e0ffffff">
+    <item
+        android:drawable="@drawable/googlepay_button_background_image" />
+</ripple>
+
diff --git a/donations/lib/src/gms/res/drawable-v21/googlepay_button_no_shadow_background.xml b/donations/lib/src/gms/res/drawable-v21/googlepay_button_no_shadow_background.xml
new file mode 100755
index 0000000000..d44e9eb62d
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-v21/googlepay_button_no_shadow_background.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#e0ffffff">
+    <item
+        android:drawable="@drawable/googlepay_button_no_shadow_background_image" />
+</ripple>
+
diff --git a/donations/lib/src/gms/res/drawable-xhdpi/googlepay_button_background_image.9.png b/donations/lib/src/gms/res/drawable-xhdpi/googlepay_button_background_image.9.png
new file mode 100755
index 0000000000..40f767d533
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-xhdpi/googlepay_button_background_image.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-xhdpi/googlepay_button_background_image_focused.9.png b/donations/lib/src/gms/res/drawable-xhdpi/googlepay_button_background_image_focused.9.png
new file mode 100755
index 0000000000..9f1fb57483
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-xhdpi/googlepay_button_background_image_focused.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-xhdpi/googlepay_button_background_image_pressed.9.png b/donations/lib/src/gms/res/drawable-xhdpi/googlepay_button_background_image_pressed.9.png
new file mode 100755
index 0000000000..59161bae9e
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-xhdpi/googlepay_button_background_image_pressed.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-xhdpi/googlepay_button_no_shadow_background_image.9.png b/donations/lib/src/gms/res/drawable-xhdpi/googlepay_button_no_shadow_background_image.9.png
new file mode 100755
index 0000000000..969cc52a94
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-xhdpi/googlepay_button_no_shadow_background_image.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-xhdpi/googlepay_button_no_shadow_background_image_focused.9.png b/donations/lib/src/gms/res/drawable-xhdpi/googlepay_button_no_shadow_background_image_focused.9.png
new file mode 100755
index 0000000000..210493a582
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-xhdpi/googlepay_button_no_shadow_background_image_focused.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-xhdpi/googlepay_button_no_shadow_background_image_pressed.9.png b/donations/lib/src/gms/res/drawable-xhdpi/googlepay_button_no_shadow_background_image_pressed.9.png
new file mode 100755
index 0000000000..e246559b75
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-xhdpi/googlepay_button_no_shadow_background_image_pressed.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-xxhdpi/googlepay_button_background_image.9.png b/donations/lib/src/gms/res/drawable-xxhdpi/googlepay_button_background_image.9.png
new file mode 100755
index 0000000000..91035e2a41
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-xxhdpi/googlepay_button_background_image.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-xxhdpi/googlepay_button_background_image_focused.9.png b/donations/lib/src/gms/res/drawable-xxhdpi/googlepay_button_background_image_focused.9.png
new file mode 100755
index 0000000000..e766ccb293
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-xxhdpi/googlepay_button_background_image_focused.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-xxhdpi/googlepay_button_background_image_pressed.9.png b/donations/lib/src/gms/res/drawable-xxhdpi/googlepay_button_background_image_pressed.9.png
new file mode 100755
index 0000000000..e544a4f388
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-xxhdpi/googlepay_button_background_image_pressed.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image.9.png b/donations/lib/src/gms/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image.9.png
new file mode 100755
index 0000000000..dda66dfd0d
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image_focused.9.png b/donations/lib/src/gms/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image_focused.9.png
new file mode 100755
index 0000000000..9b71cf6cf6
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image_focused.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image_pressed.9.png b/donations/lib/src/gms/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image_pressed.9.png
new file mode 100755
index 0000000000..454df9b85a
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image_pressed.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-xxxhdpi/googlepay_button_background_image.9.png b/donations/lib/src/gms/res/drawable-xxxhdpi/googlepay_button_background_image.9.png
new file mode 100755
index 0000000000..ab905289bc
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-xxxhdpi/googlepay_button_background_image.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-xxxhdpi/googlepay_button_background_image_focused.9.png b/donations/lib/src/gms/res/drawable-xxxhdpi/googlepay_button_background_image_focused.9.png
new file mode 100755
index 0000000000..b9223ea3a7
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-xxxhdpi/googlepay_button_background_image_focused.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-xxxhdpi/googlepay_button_background_image_pressed.9.png b/donations/lib/src/gms/res/drawable-xxxhdpi/googlepay_button_background_image_pressed.9.png
new file mode 100755
index 0000000000..894fdcfbcc
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-xxxhdpi/googlepay_button_background_image_pressed.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image.9.png b/donations/lib/src/gms/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image.9.png
new file mode 100755
index 0000000000..e67fdaf516
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image_focused.9.png b/donations/lib/src/gms/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image_focused.9.png
new file mode 100755
index 0000000000..7889152aef
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image_focused.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image_pressed.9.png b/donations/lib/src/gms/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image_pressed.9.png
new file mode 100755
index 0000000000..c461f63eff
Binary files /dev/null and b/donations/lib/src/gms/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image_pressed.9.png differ
diff --git a/donations/lib/src/gms/res/drawable-zh-night/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-zh-night/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..83f3912a68
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-zh-night/donate_with_googlepay_button_content.xml
@@ -0,0 +1,15 @@
+<vector android:width="222dp" android:height="38dp" android:viewportWidth="222" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M9.288 8.424C7.72 12.54 5.088 16.6 2.344 19.176c.448.616 1.176 2.016 1.428 2.632.924-.924 1.848-2.016 2.716-3.192v15.708h2.464v-19.46c1.064-1.82 1.988-3.752 2.772-5.628l-2.436-.812zm4.676 13.496v-3.556h4.284v3.556h-4.284zm11.284-3.556v3.556h-4.424v-3.556h4.424zm2.492 5.712v-7.868h-6.916V13.8h7.728v-2.38h-7.728V8.648h-2.576v2.772h-7.364v2.38h7.364v2.408h-6.664v7.868h6.496c-.168 1.344-.532 2.632-1.26 3.808-1.288-.952-2.352-2.072-3.136-3.36l-2.128.672c.98 1.708 2.24 3.164 3.752 4.396-1.232 1.036-3.024 1.932-5.516 2.52.56.532 1.288 1.568 1.596 2.156 2.716-.812 4.648-1.904 6.048-3.22 2.716 1.596 6.048 2.632 9.912 3.192.336-.728 1.036-1.792 1.54-2.352-3.864-.392-7.252-1.288-9.94-2.688 1.036-1.54 1.484-3.276 1.708-5.124h7.084zm17.772-.644v-4.144h6.776v4.144h-6.776zm-8.792 0c.084-1.036.112-2.072.112-3.024v-1.12h6.076v4.144H36.72zm6.188-10.528v3.948h-6.076v-3.948h6.076zm9.38 3.948h-6.776v-3.948h6.776v3.948zm2.604-6.44H34.256v9.968c0 3.948-.28 8.904-3.332 12.292.588.308 1.652 1.204 2.044 1.708 2.044-2.268 3.052-5.404 3.5-8.484h6.44v8.008h2.604v-8.008h6.776v5.012c0 .532-.196.7-.7.7-.532 0-2.38.028-4.172-.056.336.672.756 1.82.868 2.52 2.576.028 4.2-.028 5.236-.448 1.008-.392 1.372-1.176 1.372-2.688V10.412z" android:fillColor="#3c4043"/>
+  <group>
+    <group>
+      <path android:pathData="M108.529 9.44664v8.16616h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82685-1.776-1.24122-2.976-1.24122h-5.036v.00186zm0 11.04056v9.4727h-3.008V6.57217h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.34951 2.158 2.99393 2.158 4.93143 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM123.864 25.0602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.2949-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5935 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3266 4.413.9799v-.6869c0-1.0452-.415-1.9318-1.242-2.6616-.83-.7299-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0906 3.619-3.1358 6.476-3.1358zM151.463 13.9543l-10.04 23.0611h-3.105l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#5f6368" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M96.3729 18.4452c0-.9463-.0803-1.8591-.2317-2.7326H83.4536v5.1759h7.2669c-.3121 1.6872-1.2557 3.1227-2.687 4.084v3.3616h4.3369c2.5394-2.3406 4.0025-5.7993 4.0025-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M83.4536 31.5782c3.6307 0 6.6876-1.1909 8.9168-3.2441l-4.3369-3.3616c-1.2071.8119-2.7618 1.286-4.5799 1.286-3.5092 0-6.4877-2.363-7.5527-5.5473h-4.4678v3.4624c2.2143 4.3901 6.7642 7.4046 12.0205 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M75.9009 20.7111c-.2728-.8119-.4222-1.678-.4222-2.5721 0-.894.1494-1.7601.4222-2.572v-3.4625h-4.4677C70.5176 13.9188 70 15.9683 70 18.139c0 2.1708.5176 4.2205 1.4332 6.0346l4.4677-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M83.4536 10.0196c1.9826 0 3.7596.6813 5.161 2.0159v.0019l3.8399-3.83578C90.1226 6.03271 87.0824 4.7 83.4536 4.7c-5.2563 0-9.8062 3.01446-12.0205 7.4046l4.4678 3.4624c1.065-3.1843 4.0435-5.5474 7.5527-5.5474z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+  <path android:pathData="M185.512 14.752h-7.364v-3.22h7.364v3.22zm2.548-5.32h-12.348v7.42h12.348v-7.42zm-14.224 10.92c-1.036.308-2.128.616-3.164.896v-4.844h3.444v-2.408h-3.444v-5.46h-2.548v5.46h-3.668v2.408h3.668v5.516c-1.512.392-2.884.756-4.032 1.008l.7 2.492 3.332-.924V31.3c0 .392-.14.532-.532.532-.336.028-1.54.028-2.744-.028.308.672.672 1.736.756 2.352 1.904.028 3.164-.056 3.976-.448.812-.392 1.092-1.064 1.092-2.436v-7.504c1.176-.336 2.352-.644 3.5-.98l-.336-2.436zm4.172 3.668c2.184.448 4.984 1.344 6.44 2.1l1.036-1.988c-1.512-.756-4.312-1.54-6.496-1.932l-.98 1.82zm-.392-3.136h8.624V26.4c-3.332.728-6.664 1.456-8.988 1.848.28-1.624.364-3.248.364-4.62v-2.744zm11.256-2.212h-13.804V23.6c0 2.8-.252 6.608-2.464 9.324.616.28 1.736 1.064 2.156 1.512 1.4-1.736 2.156-3.948 2.492-6.16l.896 2.436c2.324-.588 5.236-1.344 8.092-2.1v2.744c0 .364-.14.476-.532.476-.364.028-1.68.028-2.968-.028.308.672.672 1.708.756 2.408 1.988 0 3.36-.028 4.228-.42.868-.392 1.148-1.092 1.148-2.408V18.672zm15.924.336H193.68v2.128h11.116v-.952c.616.392 1.456.98 1.848 1.344.924-1.54 1.68-3.444 2.324-5.628h6.132c-.336 1.82-.812 3.64-1.26 4.928l2.128.644c.728-1.932 1.54-4.9 2.044-7.504l-1.764-.532-.392.112h-6.3c.336-1.484.616-3.052.84-4.648l-2.548-.336c-.504 4.172-1.428 8.204-3.052 10.976v-.532zm-6.804-3.892h-4.564v2.128h11.648v-2.128h-4.648v-1.988h5.236V11h-5.236V8.676h-2.436V11h-5.208v2.128h5.208v1.988zM194.52 25.84c-.56 1.904-1.428 4.06-2.352 5.516.588.196 1.568.644 2.044.952.84-1.54 1.792-3.864 2.464-5.936l-2.156-.532zm11.424-.756v-2.156H192.42v2.156h5.6v9.1h2.464v-9.1h5.46zm-4.228 1.512c.728 1.428 1.54 3.304 1.876 4.48l2.1-.952c-.392-1.092-1.26-2.94-2.016-4.312l-1.96.784zm10.724-8.736h-2.464v1.288c0 3.668-.42 9.128-5.236 13.356.644.364 1.54 1.204 1.988 1.764 2.52-2.268 3.92-4.9 4.732-7.476 1.12 3.248 2.8 5.852 5.236 7.364.392-.672 1.176-1.652 1.764-2.184-3.22-1.708-5.18-5.6-6.104-10.08.056-.98.084-1.848.084-2.66V17.86z" android:fillColor="#3c4043"/>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable-zh/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable-zh/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..06ee8ed6ba
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable-zh/donate_with_googlepay_button_content.xml
@@ -0,0 +1,15 @@
+<vector android:width="222dp" android:height="38dp" android:viewportWidth="222" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M9.288 8.424C7.72 12.54 5.088 16.6 2.344 19.176c.448.616 1.176 2.016 1.428 2.632.924-.924 1.848-2.016 2.716-3.192v15.708h2.464v-19.46c1.064-1.82 1.988-3.752 2.772-5.628l-2.436-.812zm4.676 13.496v-3.556h4.284v3.556h-4.284zm11.284-3.556v3.556h-4.424v-3.556h4.424zm2.492 5.712v-7.868h-6.916V13.8h7.728v-2.38h-7.728V8.648h-2.576v2.772h-7.364v2.38h7.364v2.408h-6.664v7.868h6.496c-.168 1.344-.532 2.632-1.26 3.808-1.288-.952-2.352-2.072-3.136-3.36l-2.128.672c.98 1.708 2.24 3.164 3.752 4.396-1.232 1.036-3.024 1.932-5.516 2.52.56.532 1.288 1.568 1.596 2.156 2.716-.812 4.648-1.904 6.048-3.22 2.716 1.596 6.048 2.632 9.912 3.192.336-.728 1.036-1.792 1.54-2.352-3.864-.392-7.252-1.288-9.94-2.688 1.036-1.54 1.484-3.276 1.708-5.124h7.084zm17.772-.644v-4.144h6.776v4.144h-6.776zm-8.792 0c.084-1.036.112-2.072.112-3.024v-1.12h6.076v4.144H36.72zm6.188-10.528v3.948h-6.076v-3.948h6.076zm9.38 3.948h-6.776v-3.948h6.776v3.948zm2.604-6.44H34.256v9.968c0 3.948-.28 8.904-3.332 12.292.588.308 1.652 1.204 2.044 1.708 2.044-2.268 3.052-5.404 3.5-8.484h6.44v8.008h2.604v-8.008h6.776v5.012c0 .532-.196.7-.7.7-.532 0-2.38.028-4.172-.056.336.672.756 1.82.868 2.52 2.576.028 4.2-.028 5.236-.448 1.008-.392 1.372-1.176 1.372-2.688V10.412z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M108.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM123.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM151.463 13.8543l-10.04 23.0611h-3.105l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M96.3729 18.3452c0-.9463-.0803-1.8591-.2317-2.7326H83.4536v5.1759h7.2669c-.3121 1.6872-1.2557 3.1227-2.687 4.084v3.3616h4.3369c2.5394-2.3406 4.0025-5.7993 4.0025-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M83.4536 31.4782c3.6307 0 6.6876-1.1909 8.9168-3.2441l-4.3369-3.3616c-1.2071.8119-2.7618 1.286-4.5799 1.286-3.5092 0-6.4877-2.363-7.5527-5.5473h-4.4678v3.4624c2.2143 4.3901 6.7642 7.4046 12.0205 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M75.9009 20.6111c-.2728-.8119-.4222-1.678-.4222-2.572 0-.8941.1494-1.7602.4222-2.5721v-3.4625h-4.4677C70.5176 13.8188 70 15.8683 70 18.0391c0 2.1707.5176 4.2204 1.4332 6.0345l4.4677-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M83.4536 9.91964c1.9826 0 3.7596.68126 5.161 2.01586v.0019l3.8399-3.83577c-2.3319-2.16891-5.3721-3.50162-9.0009-3.50162-5.2563 0-9.8062 3.01446-12.0205 7.40459l4.4678 3.4624c1.065-3.1843 4.0435-5.54736 7.5527-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+  <path android:pathData="M185.512 14.752h-7.364v-3.22h7.364v3.22zm2.548-5.32h-12.348v7.42h12.348v-7.42zm-14.224 10.92c-1.036.308-2.128.616-3.164.896v-4.844h3.444v-2.408h-3.444v-5.46h-2.548v5.46h-3.668v2.408h3.668v5.516c-1.512.392-2.884.756-4.032 1.008l.7 2.492 3.332-.924V31.3c0 .392-.14.532-.532.532-.336.028-1.54.028-2.744-.028.308.672.672 1.736.756 2.352 1.904.028 3.164-.056 3.976-.448.812-.392 1.092-1.064 1.092-2.436v-7.504c1.176-.336 2.352-.644 3.5-.98l-.336-2.436zm4.172 3.668c2.184.448 4.984 1.344 6.44 2.1l1.036-1.988c-1.512-.756-4.312-1.54-6.496-1.932l-.98 1.82zm-.392-3.136h8.624V26.4c-3.332.728-6.664 1.456-8.988 1.848.28-1.624.364-3.248.364-4.62v-2.744zm11.256-2.212h-13.804V23.6c0 2.8-.252 6.608-2.464 9.324.616.28 1.736 1.064 2.156 1.512 1.4-1.736 2.156-3.948 2.492-6.16l.896 2.436c2.324-.588 5.236-1.344 8.092-2.1v2.744c0 .364-.14.476-.532.476-.364.028-1.68.028-2.968-.028.308.672.672 1.708.756 2.408 1.988 0 3.36-.028 4.228-.42.868-.392 1.148-1.092 1.148-2.408V18.672zm15.924.336H193.68v2.128h11.116v-.952c.616.392 1.456.98 1.848 1.344.924-1.54 1.68-3.444 2.324-5.628h6.132c-.336 1.82-.812 3.64-1.26 4.928l2.128.644c.728-1.932 1.54-4.9 2.044-7.504l-1.764-.532-.392.112h-6.3c.336-1.484.616-3.052.84-4.648l-2.548-.336c-.504 4.172-1.428 8.204-3.052 10.976v-.532zm-6.804-3.892h-4.564v2.128h11.648v-2.128h-4.648v-1.988h5.236V11h-5.236V8.676h-2.436V11h-5.208v2.128h5.208v1.988zM194.52 25.84c-.56 1.904-1.428 4.06-2.352 5.516.588.196 1.568.644 2.044.952.84-1.54 1.792-3.864 2.464-5.936l-2.156-.532zm11.424-.756v-2.156H192.42v2.156h5.6v9.1h2.464v-9.1h5.46zm-4.228 1.512c.728 1.428 1.54 3.304 1.876 4.48l2.1-.952c-.392-1.092-1.26-2.94-2.016-4.312l-1.96.784zm10.724-8.736h-2.464v1.288c0 3.668-.42 9.128-5.236 13.356.644.364 1.54 1.204 1.988 1.764 2.52-2.268 3.92-4.9 4.732-7.476 1.12 3.248 2.8 5.852 5.236 7.364.392-.672 1.176-1.652 1.764-2.184-3.22-1.708-5.18-5.6-6.104-10.08.056-.98.084-1.848.084-2.66V17.86z" android:fillColor="#ffffff"/>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable/donate_with_google_pay_rounded_background.xml b/donations/lib/src/gms/res/drawable/donate_with_google_pay_rounded_background.xml
new file mode 100644
index 0000000000..5c8c27d550
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable/donate_with_google_pay_rounded_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/donate_with_google_pay_background_color" />
+    <corners android:radius="55dp" />
+</shape>
\ No newline at end of file
diff --git a/donations/lib/src/gms/res/drawable/donate_with_googlepay_button_content.xml b/donations/lib/src/gms/res/drawable/donate_with_googlepay_button_content.xml
new file mode 100755
index 0000000000..ee9b8f7428
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable/donate_with_googlepay_button_content.xml
@@ -0,0 +1,14 @@
+<vector android:width="256dp" android:height="38dp" android:viewportWidth="256" android:viewportHeight="38" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:pathData="M3.90472 30V9.952h6.41198c2.1094 0 3.92.4293 5.432 1.288 1.5307.84 2.7067 2.016 3.528 3.528.84 1.512 1.26 3.248 1.26 5.208 0 1.9787-.42 3.724-1.26 5.236-.8213 1.4933-1.9973 2.6693-3.528 3.528-1.512.84-3.3226 1.26-5.432 1.26H3.90472zm3.08-2.912h3.24798c2.2774 0 4.0414-.6347 5.292-1.904 1.2694-1.2693 1.904-3.0053 1.904-5.208s-.6346-3.9387-1.904-5.208c-1.2506-1.2693-3.0146-1.904-5.292-1.904H6.98472v14.224zm23.17818 3.36c-1.4747 0-2.772-.336-3.892-1.008-1.12-.672-1.9973-1.5773-2.632-2.716-.6347-1.1387-.952-2.4267-.952-3.864 0-1.4187.3173-2.6973.952-3.836.6347-1.1573 1.512-2.072 2.632-2.744 1.12-.672 2.4173-1.008 3.892-1.008 1.456 0 2.744.336 3.864 1.008 1.12.672 1.9973 1.5867 2.632 2.744.6347 1.1387.952 2.4173.952 3.836 0 1.4373-.3173 2.7253-.952 3.864-.6347 1.1387-1.512 2.044-2.632 2.716-1.12.672-2.408 1.008-3.864 1.008zm0-2.772c.784 0 1.512-.1867 2.184-.56.672-.392 1.2133-.9427 1.624-1.652.4293-.728.644-1.596.644-2.604s-.2147-1.8667-.644-2.576c-.4107-.728-.952-1.2787-1.624-1.652-.672-.392-1.4-.588-2.184-.588-.784 0-1.5213.196-2.212.588-.672.3733-1.2227.924-1.652 1.652-.4107.7093-.616 1.568-.616 2.576s.2053 1.876.616 2.604c.4293.7093.98 1.26 1.652 1.652.6907.3733 1.428.56 2.212.56zM40.4226 30V15.72h2.856v1.96h.168c.4107-.6907 1.0173-1.26 1.82-1.708.8213-.4667 1.7173-.7 2.688-.7 1.7547 0 3.0707.5227 3.948 1.568.8773 1.0453 1.316 2.4267 1.316 4.144V30h-2.996v-8.624c0-1.1573-.2893-1.9973-.868-2.52-.5787-.5413-1.3347-.812-2.268-.812-.728 0-1.3627.2053-1.904.616-.5413.392-.9707.9147-1.288 1.568-.2987.6533-.448 1.3533-.448 2.1V30h-3.024zm20.8855.448c-1.0267 0-1.9414-.196-2.744-.588-.8027-.4107-1.428-.98-1.876-1.708-.448-.728-.672-1.5587-.672-2.492 0-1.008.2613-1.8667.784-2.576.5413-.728 1.26-1.2787 2.156-1.652.896-.3733 1.8853-.56 2.968-.56.896 0 1.68.084 2.352.252.6906.168 1.2133.3453 1.568.532V20.9c0-.9333-.336-1.68-1.008-2.24-.672-.56-1.54-.84-2.604-.84-.728 0-1.4187.168-2.072.504-.6534.3173-1.176.756-1.568 1.316l-2.072-1.596c.616-.8587 1.428-1.5307 2.436-2.016 1.0266-.504 2.1466-.756 3.36-.756 2.072 0 3.668.5133 4.788 1.54 1.12 1.008 1.68 2.4267 1.68 4.256V30h-2.94v-1.764h-.168c-.3734.5787-.9334 1.092-1.68 1.54-.7467.448-1.6427.672-2.688.672zm.532-2.464c.784 0 1.4746-.1867 2.072-.56.5973-.3733 1.064-.8587 1.4-1.456.3546-.616.532-1.2787.532-1.988-.4294-.2427-.9334-.4387-1.512-.588-.5787-.168-1.1947-.252-1.848-.252-1.232 0-2.1094.252-2.632.756-.5227.4853-.784 1.0827-.784 1.792 0 .672.252 1.2227.756 1.652s1.176.644 2.016.644zm11.8117-2.128v-7.504h-2.492V15.72h2.492v-4.032h3.024v4.032h3.5v2.632h-3.5v6.86c0 .7093.14 1.2507.42 1.624.2986.3733.7933.56 1.484.56.3546 0 .6533-.0467.896-.14.2613-.0933.5226-.224.784-.392v2.94c-.3174.1307-.6534.2333-1.008.308-.3547.0747-.7747.112-1.26.112-1.3254 0-2.38-.3827-3.164-1.148-.784-.784-1.176-1.8573-1.176-3.22zm15.7026 4.592c-1.4 0-2.6507-.3267-3.752-.98-1.1013-.6533-1.9693-1.5493-2.604-2.688-.616-1.1387-.924-2.436-.924-3.892 0-1.3627.2987-2.6227.896-3.78.5973-1.1573 1.428-2.0813 2.492-2.772 1.0827-.7093 2.324-1.064 3.724-1.064 1.4747 0 2.7253.3173 3.752.952 1.0453.6347 1.8387 1.5027 2.38 2.604.5413 1.1013.812 2.3427.812 3.724 0 .2053-.0093.392-.028.56 0 .168-.0093.2987-.028.392h-11.032c.1493 1.4187.644 2.4827 1.484 3.192.8587.7093 1.8293 1.064 2.912 1.064.9707 0 1.7733-.2147 2.408-.644.6347-.448 1.1387-.9987 1.512-1.652l2.492 1.204c-.616 1.12-1.456 2.0347-2.52 2.744-1.064.6907-2.3893 1.036-3.976 1.036zm-.14-12.6c-1.008 0-1.8667.308-2.576.924-.7093.616-1.1853 1.4373-1.428 2.464h7.924c-.0373-.4853-.196-.9893-.476-1.512-.28-.5227-.7093-.9613-1.288-1.316-.56-.3733-1.2787-.56-2.156-.56zM109.067 30l-4.564-14.28h3.276l2.94 10.276h.112l3.22-10.276h3.108l3.22 10.276h.112l2.94-10.276h3.22L122.059 30h-3.164l-3.304-10.332h-.112L112.203 30h-3.136zm21.571-16.38c-.56 0-1.045-.196-1.456-.588-.392-.4107-.588-.896-.588-1.456 0-.56.196-1.036.588-1.428.411-.392.896-.588 1.456-.588.56 0 1.036.196 1.428.588.411.392.616.868.616 1.428 0 .56-.205 1.0453-.616 1.456-.392.392-.868.588-1.428.588zM129.126 30V15.72h3.024V30h-3.024zm8.452-4.144v-7.504h-2.492V15.72h2.492v-4.032h3.024v4.032h3.5v2.632h-3.5v6.86c0 .7093.14 1.2507.42 1.624.298.3733.793.56 1.484.56.354 0 .653-.0467.896-.14.261-.0933.522-.224.784-.392v2.94c-.318.1307-.654.2333-1.008.308-.355.0747-.775.112-1.26.112-1.326 0-2.38-.3827-3.164-1.148-.784-.784-1.176-1.8573-1.176-3.22zM147.44 30V9.952h3.024v5.488l-.168 2.24h.168c.392-.6907.989-1.26 1.792-1.708.821-.4667 1.726-.7 2.716-.7 1.773 0 3.108.532 4.004 1.596.896 1.0453 1.344 2.4173 1.344 4.116V30h-2.996v-8.624c0-1.1573-.308-1.9973-.924-2.52-.598-.5413-1.335-.812-2.212-.812-.728 0-1.372.2053-1.932.616-.56.4107-.999.952-1.316 1.624-.318.6533-.476 1.3533-.476 2.1V30h-3.024z" android:fillColor="#ffffff"/>
+  <group>
+    <group>
+      <path android:pathData="M212.529 9.34665v8.16615h5.036c1.2 0 2.192-.4032 2.976-1.2096.806-.8044 1.209-1.7638 1.209-2.8744 0-1.0882-.403-2.0364-1.209-2.8428-.784-.82684-1.776-1.24121-2.976-1.24121h-5.036v.00186zm0 11.04055v9.4727h-3.008V6.47218h7.978c2.028 0 3.749.67569 5.167 2.0252 1.439 1.3495 2.158 2.99392 2.158 4.93142 0 1.9822-.719 3.6379-2.158 4.965-1.396 1.3289-3.119 1.9916-5.167 1.9916h-4.97v.0018zM227.864 24.9602c0 .784.333 1.4373.998 1.9599s1.444.7839 2.338.7839c1.265 0 2.391-.4686 3.384-1.4036.992-.937 1.487-2.0364 1.487-3.2982-.938-.741-2.246-1.1106-3.924-1.1106-1.222 0-2.24.295-3.057.8829-.817.5878-1.226 1.3141-1.226 2.1857zm3.892-11.6285c2.224 0 3.979.5936 5.266 1.7807 1.286 1.1871 1.928 2.8147 1.928 4.8828v9.8647h-2.877v-2.2212h-.131c-1.243 1.829-2.9 2.7438-4.97 2.7438-1.766 0-3.244-.5226-4.431-1.5679-1.188-1.0452-1.782-2.3518-1.782-3.9197 0-1.6556.626-2.9717 1.879-3.9515 1.254-.9799 2.927-1.4708 5.02-1.4708 1.786 0 3.258.3267 4.413.9799v-.6868c0-1.0453-.415-1.9319-1.242-2.6617-.83-.7298-1.798-1.0938-2.91-1.0938-1.68 0-3.008.7074-3.989 2.1241l-2.65-1.6668c1.461-2.0905 3.619-3.1358 6.476-3.1358zM255.463 13.8543l-10.039 23.0611h-3.106l3.728-8.069-6.606-14.9921h3.27l4.774 11.4979h.066l4.643-11.4979h3.27z" android:fillColor="#ffffff" android:fillType="evenOdd"/>
+    </group>
+    <group>
+      <path android:pathData="M200.373 18.3452c0-.9463-.08-1.8591-.232-2.7326h-12.687v5.1759h7.266c-.312 1.6872-1.255 3.1227-2.687 4.084v3.3616h4.337c2.54-2.3406 4.003-5.7993 4.003-9.8889z" android:fillColor="#4285f4" android:fillType="evenOdd"/>
+      <path android:pathData="M187.454 31.4782c3.63 0 6.687-1.1909 8.916-3.2441l-4.337-3.3616c-1.207.8119-2.761 1.286-4.579 1.286-3.51 0-6.488-2.363-7.553-5.5473h-4.468v3.4624c2.214 4.3901 6.764 7.4046 12.021 7.4046z" android:fillColor="#34a853" android:fillType="evenOdd"/>
+      <path android:pathData="M179.901 20.6111c-.273-.8119-.422-1.678-.422-2.572 0-.8941.149-1.7602.422-2.5721v-3.4625h-4.468c-.915 1.8143-1.433 3.8638-1.433 6.0346 0 2.1707.518 4.2204 1.433 6.0345l4.468-3.4625z" android:fillColor="#fabb05" android:fillType="evenOdd"/>
+      <path android:pathData="M187.454 9.91964c1.982 0 3.759.68126 5.161 2.01586v.0019l3.84-3.83577c-2.332-2.16891-5.373-3.50162-9.001-3.50162-5.257 0-9.807 3.01446-12.021 7.40459l4.468 3.4624c1.065-3.1843 4.043-5.54736 7.553-5.54736z" android:fillColor="#e94235" android:fillType="evenOdd"/>
+    </group>
+  </group>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable/googlepay_button_background.xml b/donations/lib/src/gms/res/drawable/googlepay_button_background.xml
new file mode 100755
index 0000000000..b81005b06f
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable/googlepay_button_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/googlepay_button_background_image" />
+</selector>
+
diff --git a/donations/lib/src/gms/res/drawable/googlepay_button_content.xml b/donations/lib/src/gms/res/drawable/googlepay_button_content.xml
new file mode 100755
index 0000000000..b2cdb1d52b
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable/googlepay_button_content.xml
@@ -0,0 +1,48 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="41dp"
+        android:height="17dp"
+        android:viewportWidth="41.0"
+        android:viewportHeight="17.0">
+    <path
+        android:pathData="M19.526,2.635L19.526,6.718L22.044,6.718C22.644,6.718 23.14,6.516 23.532,6.113C23.935,5.711 24.137,5.231 24.137,4.676C24.137,4.132 23.935,3.658 23.532,3.254C23.14,2.841 22.644,2.634 22.044,2.634L19.526,2.634L19.526,2.635ZM19.526,8.155L19.526,12.891L18.022,12.891L18.022,1.198L22.011,1.198C23.025,1.198 23.885,1.535 24.594,2.21C25.314,2.885 25.674,3.707 25.674,4.676C25.674,5.667 25.314,6.495 24.594,7.158C23.897,7.823 23.035,8.154 22.011,8.154L19.526,8.154L19.526,8.155Z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#FFFFFF"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M27.194,10.442C27.194,10.834 27.36,11.16 27.693,11.422C28.025,11.683 28.415,11.813 28.861,11.813C29.494,11.813 30.057,11.579 30.553,11.112C31.05,10.643 31.297,10.093 31.297,9.463C30.828,9.092 30.174,8.907 29.335,8.907C28.724,8.907 28.215,9.055 27.807,9.349C27.398,9.643 27.194,10.006 27.194,10.442M29.14,4.627C30.252,4.627 31.129,4.924 31.773,5.518C32.415,6.111 32.737,6.925 32.737,7.959L32.737,12.891L31.298,12.891L31.298,11.781L31.233,11.781C30.611,12.695 29.783,13.153 28.747,13.153C27.865,13.153 27.126,12.891 26.532,12.369C25.938,11.846 25.641,11.193 25.641,10.409C25.641,9.581 25.954,8.923 26.581,8.433C27.208,7.943 28.044,7.698 29.09,7.698C29.983,7.698 30.72,7.861 31.297,8.188L31.297,7.844C31.297,7.322 31.09,6.878 30.676,6.513C30.261,6.149 29.777,5.967 29.221,5.967C28.381,5.967 27.717,6.32 27.226,7.029L25.902,6.195C26.632,5.15 27.711,4.627 29.14,4.627"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#FFFFFF"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M40.993,4.889l-5.02,11.531l-1.553,0l1.864,-4.035l-3.303,-7.496l1.635,0l2.387,5.749l0.033,0l2.322,-5.749z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#FFFFFF"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M13.448,7.134C13.448,6.661 13.408,6.205 13.332,5.768L6.988,5.768L6.988,8.356L10.622,8.356C10.466,9.199 9.994,9.917 9.278,10.398L9.278,12.079L11.447,12.079C12.716,10.908 13.448,9.179 13.448,7.134"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#4285F4"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M6.988,13.701C8.804,13.701 10.332,13.105 11.447,12.079L9.278,10.398C8.675,10.804 7.897,11.041 6.988,11.041C5.234,11.041 3.744,9.859 3.212,8.267L0.978,8.267L0.978,9.998C2.085,12.193 4.36,13.701 6.988,13.701"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#34A853"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M3.212,8.267C3.076,7.861 3.001,7.428 3.001,6.981C3.001,6.534 3.076,6.101 3.212,5.695L3.212,3.964L0.978,3.964C0.52,4.871 0.261,5.896 0.261,6.981C0.261,8.066 0.52,9.091 0.978,9.998L3.212,8.267Z"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#FABB05"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="M6.988,2.921C7.98,2.921 8.868,3.262 9.569,3.929L9.569,3.93L11.489,2.012C10.323,0.928 8.803,0.261 6.988,0.261C4.36,0.261 2.085,1.769 0.978,3.964L3.212,5.695C3.744,4.103 5.234,2.921 6.988,2.921"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"
+        android:fillColor="#E94235"
+        android:strokeWidth="1"/>
+</vector>
diff --git a/donations/lib/src/gms/res/drawable/googlepay_button_no_shadow_background.xml b/donations/lib/src/gms/res/drawable/googlepay_button_no_shadow_background.xml
new file mode 100755
index 0000000000..9543c4bcb6
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable/googlepay_button_no_shadow_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:drawable="@drawable/googlepay_button_no_shadow_background_image" />
+</selector>
+
diff --git a/donations/lib/src/gms/res/drawable/googlepay_button_overlay.xml b/donations/lib/src/gms/res/drawable/googlepay_button_overlay.xml
new file mode 100755
index 0000000000..70c7a92271
--- /dev/null
+++ b/donations/lib/src/gms/res/drawable/googlepay_button_overlay.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_enabled="false">
+        <shape
+            android:shape="rectangle" >
+            <corners android:radius="4dp"/>
+            <solid android:color="#7FFFFFFF"/>
+        </shape>
+    </item>
+    <item android:drawable="@android:color/transparent" />
+</selector>
+
diff --git a/donations/lib/src/gms/res/layout/donate_with_googlepay_button.xml b/donations/lib/src/gms/res/layout/donate_with_googlepay_button.xml
new file mode 100755
index 0000000000..888e1acb3f
--- /dev/null
+++ b/donations/lib/src/gms/res/layout/donate_with_googlepay_button.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="44sp"
+    android:layout_marginTop="2sp"
+    android:layout_marginBottom="2sp"
+    android:background="@drawable/donate_with_google_pay_rounded_background"
+    android:clickable="true"
+    android:contentDescription="@string/donate_with_googlepay_button_content_description"
+    android:focusable="true"
+    android:padding="2sp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:duplicateParentState="true"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:weightSum="2">
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:duplicateParentState="true"
+            android:scaleType="fitCenter"
+            android:src="@drawable/donate_with_googlepay_button_content" />
+    </LinearLayout>
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:duplicateParentState="true"
+        android:scaleType="fitXY"
+        android:src="@drawable/googlepay_button_overlay" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/donations/lib/src/gms/res/values-night/colors.xml b/donations/lib/src/gms/res/values-night/colors.xml
new file mode 100644
index 0000000000..65f08edef4
--- /dev/null
+++ b/donations/lib/src/gms/res/values-night/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="donate_with_google_pay_background_color">#FFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/donations/lib/src/gms/res/values/colors.xml b/donations/lib/src/gms/res/values/colors.xml
new file mode 100644
index 0000000000..925d9541dc
--- /dev/null
+++ b/donations/lib/src/gms/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="donate_with_google_pay_background_color">#000000</color>
+</resources>
\ No newline at end of file
diff --git a/donations/lib/src/gms/res/values/googlepay_strings.xml b/donations/lib/src/gms/res/values/googlepay_strings.xml
new file mode 100755
index 0000000000..81d01c2b74
--- /dev/null
+++ b/donations/lib/src/gms/res/values/googlepay_strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="googlepay_button_content_description">Google Pay</string>
+    <string name="buy_with_googlepay_button_content_description">Buy with Google Pay</string>
+    <string name="donate_with_googlepay_button_content_description">Donate With Google Pay</string>
+    <string name="pay_with_googlepay_button_content_description">Pay With Google Pay</string>
+    <string name="subscribe_with_googlepay_button_content_description">Subscribe With Google Pay</string>
+    <string name="book_with_googlepay_button_content_description">Book With Google Pay</string>
+    <string name="checkout_with_googlepay_button_content_description">Checkout With Google Pay</string>
+    <string name="order_with_googlepay_button_content_description">Order With Google Pay</string>
+    <string name="view_in_googlepay_button_content_description">View In Google Pay</string>
+</resources>
\ No newline at end of file
diff --git a/donations/lib/src/main/AndroidManifest.xml b/donations/lib/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..7277dc362a
--- /dev/null
+++ b/donations/lib/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/donations/lib/src/main/java/org/signal/donations/CreditCardPaymentSource.kt b/donations/lib/src/main/java/org/signal/donations/CreditCardPaymentSource.kt
new file mode 100644
index 0000000000..6ae00b921c
--- /dev/null
+++ b/donations/lib/src/main/java/org/signal/donations/CreditCardPaymentSource.kt
@@ -0,0 +1,15 @@
+package org.signal.donations
+
+import org.json.JSONObject
+
+/**
+ * Stripe payment source based off a manually entered credit card.
+ */
+class CreditCardPaymentSource(
+  private val payload: JSONObject
+) : StripeApi.PaymentSource {
+  override val type = PaymentSourceType.Stripe.CreditCard
+  override fun parameterize(): JSONObject = payload
+  override fun getTokenId(): String = parameterize().getString("id")
+  override fun email(): String? = null
+}
diff --git a/donations/lib/src/main/java/org/signal/donations/GooglePayApi.kt b/donations/lib/src/main/java/org/signal/donations/GooglePayApi.kt
new file mode 100644
index 0000000000..1b3cc067ee
--- /dev/null
+++ b/donations/lib/src/main/java/org/signal/donations/GooglePayApi.kt
@@ -0,0 +1,221 @@
+package org.signal.donations
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import com.google.android.gms.common.api.ApiException
+import com.google.android.gms.tasks.Task
+import com.google.android.gms.wallet.AutoResolveHelper
+import com.google.android.gms.wallet.IsReadyToPayRequest
+import com.google.android.gms.wallet.PaymentData
+import com.google.android.gms.wallet.PaymentDataRequest
+import com.google.android.gms.wallet.PaymentsClient
+import com.google.android.gms.wallet.Wallet
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
+import org.signal.core.util.logging.Log
+import org.signal.core.util.money.FiatMoney
+import java.util.Locale
+
+/**
+ * Entrypoint for Google Pay APIs
+ *
+ * @param activity The activity the Pay Client will attach itself to
+ * @param gateway The payment gateway (Such as Stripe)
+ */
+class GooglePayApi(
+  private val activity: Activity,
+  private val gateway: Gateway,
+  private val configuration: Configuration
+) {
+
+  private val paymentsClient: PaymentsClient
+
+  init {
+    val walletOptions = Wallet.WalletOptions.Builder()
+      .setEnvironment(configuration.walletEnvironment)
+      .build()
+
+    paymentsClient = Wallet.getPaymentsClient(activity, walletOptions)
+  }
+
+  fun queryIsReadyToPay(): Completable {
+    return Companion.queryIsReadyToPay(activity, gateway, configuration)
+  }
+
+  /**
+   * Launches the Google Pay sheet via an Activity intent.  It is up to the caller to pass
+   * through the activity result to onActivityResult.
+   */
+  fun requestPayment(price: FiatMoney, label: String, requestCode: Int) {
+    val paymentDataRequest = getPaymentDataRequest(price, label)
+    val request = PaymentDataRequest.fromJson(paymentDataRequest.toString())
+    AutoResolveHelper.resolveTask(paymentsClient.loadPaymentData(request), activity, requestCode)
+  }
+
+  /**
+   * Checks the activity result for payment data and fires off the corresponding callback. Does nothing if
+   * the request code is not the expected request code.
+   */
+  fun onActivityResult(
+    requestCode: Int,
+    resultCode: Int,
+    data: Intent?,
+    expectedRequestCode: Int,
+    paymentRequestCallback: PaymentRequestCallback
+  ) {
+    if (requestCode != expectedRequestCode) {
+      return
+    }
+
+    when (resultCode) {
+      Activity.RESULT_OK -> {
+        data?.let { intent ->
+          PaymentData.getFromIntent(intent)?.let { paymentRequestCallback.onSuccess(it) }
+        } ?: paymentRequestCallback.onError(GooglePayException("No data returned from Google Pay"))
+      }
+      Activity.RESULT_CANCELED -> paymentRequestCallback.onCancelled()
+      AutoResolveHelper.RESULT_ERROR -> {
+        AutoResolveHelper.getStatusFromIntent(data)?.let {
+          Log.w(TAG, "loadPaymentData failed with error code ${it.statusCode}: ${it.statusMessage}")
+          paymentRequestCallback.onError(GooglePayException(it.statusMessage))
+        }
+      }
+    }
+  }
+
+  private fun getPaymentDataRequest(price: FiatMoney, label: String): JSONObject {
+    return baseRequest.apply {
+      put("merchantInfo", merchantInfo)
+      put("allowedPaymentMethods", JSONArray().put(cardPaymentMethod()))
+      put("transactionInfo", getTransactionInfo(price, label))
+      // TODO Donation receipts
+      put("emailRequired", false)
+      put("shippingAddressRequired", false)
+    }
+  }
+
+  private fun getTransactionInfo(price: FiatMoney, label: String): JSONObject {
+    return JSONObject().apply {
+      put("currencyCode", price.currency.currencyCode)
+      put("countryCode", "US")
+      put("totalPriceStatus", "FINAL")
+      put("totalPrice", price.getDefaultPrecisionString(Locale.US))
+      put("totalPriceLabel", label)
+      put("checkoutOption", "COMPLETE_IMMEDIATE_PURCHASE")
+    }
+  }
+
+  private fun gatewayTokenizationSpecification(): JSONObject {
+    return JSONObject().apply {
+      put("type", "PAYMENT_GATEWAY")
+      put("parameters", JSONObject(gateway.getTokenizationSpecificationParameters()))
+    }
+  }
+
+  private fun cardPaymentMethod(): JSONObject {
+    val cardPaymentMethod = baseCardPaymentMethod(gateway)
+    cardPaymentMethod.put("tokenizationSpecification", gatewayTokenizationSpecification())
+
+    return cardPaymentMethod
+  }
+
+  companion object {
+    private val TAG = Log.tag(GooglePayApi::class.java)
+
+    private const val MERCHANT_NAME = "Signal"
+
+    private val merchantInfo: JSONObject =
+      JSONObject().put("merchantName", MERCHANT_NAME)
+
+    private val allowedCardAuthMethods = JSONArray(listOf("PAN_ONLY", "CRYPTOGRAM_3DS"))
+
+    private val baseRequest = JSONObject().apply {
+      put("apiVersion", 2)
+      put("apiVersionMinor", 0)
+    }
+
+    /**
+     * Query the Google Pay API to determine whether or not the device has Google Pay available and ready.
+     *
+     * @return A completable which, when it completes, indicates that Google Pay is available, or when it errors, indicates it is not.
+     */
+    @JvmStatic
+    fun queryIsReadyToPay(
+      context: Context,
+      gateway: Gateway,
+      configuration: Configuration
+    ): Completable = Completable.create { emitter ->
+      val walletOptions = Wallet.WalletOptions.Builder()
+        .setEnvironment(configuration.walletEnvironment)
+        .build()
+
+      val paymentsClient = Wallet.getPaymentsClient(context, walletOptions)
+
+      try {
+        val request: IsReadyToPayRequest = buildIsReadyToPayRequest(gateway)
+        val task: Task<Boolean> = paymentsClient.isReadyToPay(request)
+        task.addOnCompleteListener { completedTask ->
+          if (!emitter.isDisposed) {
+            try {
+              val result: Boolean = completedTask.getResult(ApiException::class.java) ?: false
+              if (result) {
+                emitter.onComplete()
+              } else {
+                emitter.onError(Exception("Google Pay is not available."))
+              }
+            } catch (e: ApiException) {
+              emitter.onError(e)
+            }
+          }
+        }
+      } catch (e: JSONException) {
+        emitter.onError(e)
+      }
+    }.subscribeOn(Schedulers.io())
+
+    private fun buildIsReadyToPayRequest(gateway: Gateway): IsReadyToPayRequest {
+      val isReadyToPayJson: JSONObject = baseRequest.apply {
+        put("allowedPaymentMethods", JSONArray().put(baseCardPaymentMethod(gateway)))
+      }
+
+      return IsReadyToPayRequest.fromJson(isReadyToPayJson.toString())
+    }
+
+    private fun baseCardPaymentMethod(gateway: Gateway): JSONObject {
+      return JSONObject().apply {
+        val parameters = JSONObject().apply {
+          put("allowedAuthMethods", allowedCardAuthMethods)
+          put("allowedCardNetworks", JSONArray(gateway.allowedCardNetworks))
+          put("billingAddressRequired", false)
+        }
+
+        put("type", "CARD")
+        put("parameters", parameters)
+      }
+    }
+  }
+
+  /**
+   * @param walletEnvironment From WalletConstants
+   */
+  data class Configuration(
+    val walletEnvironment: Int
+  )
+
+  interface Gateway {
+    fun getTokenizationSpecificationParameters(): Map<String, String>
+    val allowedCardNetworks: List<String>
+  }
+
+  interface PaymentRequestCallback {
+    fun onSuccess(paymentData: PaymentData)
+    fun onError(googlePayException: GooglePayException)
+    fun onCancelled()
+  }
+
+  class GooglePayException(message: String?) : Exception(message)
+}
diff --git a/donations/lib/src/main/java/org/signal/donations/GooglePayPaymentSource.kt b/donations/lib/src/main/java/org/signal/donations/GooglePayPaymentSource.kt
new file mode 100644
index 0000000000..1b5d1afcd0
--- /dev/null
+++ b/donations/lib/src/main/java/org/signal/donations/GooglePayPaymentSource.kt
@@ -0,0 +1,28 @@
+package org.signal.donations
+
+import com.google.android.gms.wallet.PaymentData
+import org.json.JSONObject
+
+class GooglePayPaymentSource(private val paymentData: PaymentData) : StripeApi.PaymentSource {
+  override val type = PaymentSourceType.Stripe.GooglePay
+
+  override fun parameterize(): JSONObject {
+    val jsonData = JSONObject(paymentData.toJson())
+    val paymentMethodJsonData = jsonData.getJSONObject("paymentMethodData")
+    return paymentMethodJsonData.getJSONObject("tokenizationData")
+  }
+
+  override fun getTokenId(): String {
+    val serializedToken = parameterize().getString("token").replace("\n", "")
+    return JSONObject(serializedToken).getString("id")
+  }
+
+  override fun email(): String? {
+    val jsonData = JSONObject(paymentData.toJson())
+    return if (jsonData.has("email")) {
+      jsonData.getString("email")
+    } else {
+      null
+    }
+  }
+}
diff --git a/donations/lib/src/main/java/org/signal/donations/IDEALPaymentSource.kt b/donations/lib/src/main/java/org/signal/donations/IDEALPaymentSource.kt
new file mode 100644
index 0000000000..15596e0a76
--- /dev/null
+++ b/donations/lib/src/main/java/org/signal/donations/IDEALPaymentSource.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+package org.signal.donations
+
+import org.json.JSONObject
+
+class IDEALPaymentSource(
+  val idealData: StripeApi.IDEALData
+) : StripeApi.PaymentSource {
+  override val type: PaymentSourceType = PaymentSourceType.Stripe.IDEAL
+
+  override fun parameterize(): JSONObject = error("iDEAL does not support tokenization")
+
+  override fun getTokenId(): String = error("iDEAL does not support tokenization")
+  override fun email(): String? = null
+}
diff --git a/donations/lib/src/main/java/org/signal/donations/InAppPaymentType.kt b/donations/lib/src/main/java/org/signal/donations/InAppPaymentType.kt
new file mode 100644
index 0000000000..1e31c436e7
--- /dev/null
+++ b/donations/lib/src/main/java/org/signal/donations/InAppPaymentType.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.signal.donations
+
+import org.signal.core.util.Serializer
+
+enum class InAppPaymentType(val code: Int, val recurring: Boolean) {
+  /**
+   * Used explicitly for mapping DonationErrorSource. Writing this value
+   * into an InAppPayment is an error.
+   */
+  UNKNOWN(-1, false),
+
+  /**
+   * This payment is for a gift badge
+   */
+  ONE_TIME_GIFT(0, false),
+
+  /**
+   * This payment is for a one-time donation
+   */
+  ONE_TIME_DONATION(1, false),
+
+  /**
+   * This payment is for a recurring donation
+   */
+  RECURRING_DONATION(2, true),
+
+  /**
+   * This payment is for a recurring backup payment
+   */
+  RECURRING_BACKUP(3, true);
+
+  companion object : Serializer<InAppPaymentType, Int> {
+    override fun serialize(data: InAppPaymentType): Int = data.code
+    override fun deserialize(input: Int): InAppPaymentType = entries.first { it.code == input }
+  }
+}
diff --git a/donations/lib/src/main/java/org/signal/donations/PaymentSourceType.kt b/donations/lib/src/main/java/org/signal/donations/PaymentSourceType.kt
new file mode 100644
index 0000000000..5e8072f74b
--- /dev/null
+++ b/donations/lib/src/main/java/org/signal/donations/PaymentSourceType.kt
@@ -0,0 +1,66 @@
+package org.signal.donations
+
+sealed class PaymentSourceType {
+  abstract val code: String
+  open val isBankTransfer: Boolean = false
+
+  object Unknown : PaymentSourceType() {
+    override val code: String = Codes.UNKNOWN.code
+  }
+
+  object PayPal : PaymentSourceType() {
+    override val code: String = Codes.PAY_PAL.code
+  }
+
+  sealed class Stripe(
+    override val code: String,
+    val paymentMethod: String,
+    override val isBankTransfer: Boolean
+  ) : PaymentSourceType() {
+    /**
+     * Credit card should happen instantaneously but can take up to 1 day to process.
+     */
+    object CreditCard : Stripe(Codes.CREDIT_CARD.code, "CARD", false)
+
+    /**
+     * Google Pay should happen instantaneously but can take up to 1 day to process.
+     */
+    object GooglePay : Stripe(Codes.GOOGLE_PAY.code, "CARD", false)
+
+    /**
+     * SEPA Debits can take up to 14 bank days to process.
+     */
+    object SEPADebit : Stripe(Codes.SEPA_DEBIT.code, "SEPA_DEBIT", true)
+
+    /**
+     * iDEAL Bank transfers happen instantaneously for 1:1 transactions, but do not do so for subscriptions, as Stripe
+     * will utilize SEPA under the hood.
+     */
+    object IDEAL : Stripe(Codes.IDEAL.code, "IDEAL", true)
+
+    fun hasDeclineCodeSupport(): Boolean = !this.isBankTransfer
+    fun hasFailureCodeSupport(): Boolean = this.isBankTransfer
+  }
+
+  private enum class Codes(val code: String) {
+    UNKNOWN("unknown"),
+    PAY_PAL("paypal"),
+    CREDIT_CARD("credit_card"),
+    GOOGLE_PAY("google_pay"),
+    SEPA_DEBIT("sepa_debit"),
+    IDEAL("ideal")
+  }
+
+  companion object {
+    fun fromCode(code: String?): PaymentSourceType {
+      return when (Codes.values().firstOrNull { it.code == code } ?: Codes.UNKNOWN) {
+        Codes.UNKNOWN -> Unknown
+        Codes.PAY_PAL -> PayPal
+        Codes.CREDIT_CARD -> Stripe.CreditCard
+        Codes.GOOGLE_PAY -> Stripe.GooglePay
+        Codes.SEPA_DEBIT -> Stripe.SEPADebit
+        Codes.IDEAL -> Stripe.IDEAL
+      }
+    }
+  }
+}
diff --git a/donations/lib/src/main/java/org/signal/donations/ResponseFieldLogger.kt b/donations/lib/src/main/java/org/signal/donations/ResponseFieldLogger.kt
new file mode 100644
index 0000000000..0845b1d255
--- /dev/null
+++ b/donations/lib/src/main/java/org/signal/donations/ResponseFieldLogger.kt
@@ -0,0 +1,27 @@
+package org.signal.donations
+
+import com.fasterxml.jackson.core.type.TypeReference
+import com.fasterxml.jackson.databind.ObjectMapper
+import org.signal.core.util.logging.Log
+import java.io.IOException
+
+internal object ResponseFieldLogger {
+
+  private val TAG = Log.tag(ResponseFieldLogger::class.java)
+
+  fun logFields(objectMapper: ObjectMapper, json: String?) {
+    if (json == null) {
+      Log.w(TAG, "Response body was null. No keys to print.")
+      return
+    }
+
+    try {
+      val mapType = object : TypeReference<Map<String, Any>>() {}
+      val map = objectMapper.readValue(json, mapType)
+
+      Log.w(TAG, "Map keys (${map.size}): ${map.keys.joinToString()}", true)
+    } catch (e: IOException) {
+      Log.w(TAG, "Failed to produce key map.", true)
+    }
+  }
+}
diff --git a/donations/lib/src/main/java/org/signal/donations/SEPADebitPaymentSource.kt b/donations/lib/src/main/java/org/signal/donations/SEPADebitPaymentSource.kt
new file mode 100644
index 0000000000..73cb7694ac
--- /dev/null
+++ b/donations/lib/src/main/java/org/signal/donations/SEPADebitPaymentSource.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+package org.signal.donations
+
+import org.json.JSONObject
+
+class SEPADebitPaymentSource(
+  val sepaDebitData: StripeApi.SEPADebitData
+) : StripeApi.PaymentSource {
+  override val type: PaymentSourceType = PaymentSourceType.Stripe.SEPADebit
+
+  override fun parameterize(): JSONObject = error("SEPA Debit does not support tokenization")
+
+  override fun getTokenId(): String = error("SEPA Debit does not support tokenization")
+  override fun email(): String? = null
+}
diff --git a/donations/lib/src/main/java/org/signal/donations/StripeApi.kt b/donations/lib/src/main/java/org/signal/donations/StripeApi.kt
new file mode 100644
index 0000000000..8559433518
--- /dev/null
+++ b/donations/lib/src/main/java/org/signal/donations/StripeApi.kt
@@ -0,0 +1,639 @@
+package org.signal.donations
+
+import android.net.Uri
+import android.os.Parcelable
+import androidx.annotation.WorkerThread
+import com.fasterxml.jackson.databind.exc.InvalidDefinitionException
+import com.fasterxml.jackson.module.kotlin.jsonMapper
+import com.fasterxml.jackson.module.kotlin.kotlinModule
+import com.fasterxml.jackson.module.kotlin.readValue
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
+import kotlinx.parcelize.Parcelize
+import okhttp3.FormBody
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import okio.ByteString.Companion.encodeUtf8
+import org.json.JSONObject
+import org.signal.core.util.logging.Log
+import org.signal.core.util.money.FiatMoney
+import org.signal.donations.json.StripePaymentIntent
+import org.signal.donations.json.StripeSetupIntent
+import java.math.BigDecimal
+import java.util.Locale
+
+class StripeApi(
+  private val configuration: Configuration,
+  private val paymentIntentFetcher: PaymentIntentFetcher,
+  private val setupIntentHelper: SetupIntentHelper,
+  private val okHttpClient: OkHttpClient
+) {
+
+  private val objectMapper = jsonMapper {
+    addModule(kotlinModule())
+  }
+
+  companion object {
+    private val TAG = Log.tag(StripeApi::class.java)
+
+    private val CARD_NUMBER_KEY = "card[number]"
+    private val CARD_MONTH_KEY = "card[exp_month]"
+    private val CARD_YEAR_KEY = "card[exp_year]"
+    private val CARD_CVC_KEY = "card[cvc]"
+
+    const val RETURN_URL_SCHEME = "sgnlpay"
+    private const val RETURN_URL_3DS = "$RETURN_URL_SCHEME://3DS"
+
+    const val RETURN_URL_IDEAL = "https://signaldonations.org/stripe/return/ideal"
+  }
+
+  sealed class CreatePaymentIntentResult {
+    data class AmountIsTooSmall(val amount: FiatMoney) : CreatePaymentIntentResult()
+    data class AmountIsTooLarge(val amount: FiatMoney) : CreatePaymentIntentResult()
+    data class CurrencyIsNotSupported(val currencyCode: String) : CreatePaymentIntentResult()
+    data class Success(val paymentIntent: StripeIntentAccessor) : CreatePaymentIntentResult()
+  }
+
+  data class CreateSetupIntentResult(val setupIntent: StripeIntentAccessor)
+
+  sealed class CreatePaymentSourceFromCardDataResult {
+    data class Success(val paymentSource: PaymentSource) : CreatePaymentSourceFromCardDataResult()
+    data class Failure(val reason: Throwable) : CreatePaymentSourceFromCardDataResult()
+  }
+
+  fun createSetupIntent(inAppPaymentType: InAppPaymentType, sourceType: PaymentSourceType.Stripe): Single<CreateSetupIntentResult> {
+    return setupIntentHelper
+      .fetchSetupIntent(inAppPaymentType, sourceType)
+      .map { CreateSetupIntentResult(it) }
+      .subscribeOn(Schedulers.io())
+  }
+
+  fun confirmSetupIntent(paymentSource: PaymentSource, setupIntent: StripeIntentAccessor): Single<Secure3DSAction> {
+    return Single.fromCallable {
+      val paymentMethodId = createPaymentMethodAndParseId(paymentSource)
+
+      val parameters = mutableMapOf(
+        "client_secret" to setupIntent.intentClientSecret,
+        "payment_method" to paymentMethodId,
+        "return_url" to if (paymentSource is IDEALPaymentSource) RETURN_URL_IDEAL else RETURN_URL_3DS
+      )
+
+      if (paymentSource.type.isBankTransfer) {
+        parameters["mandate_data[customer_acceptance][type]"] = "online"
+        parameters["mandate_data[customer_acceptance][online][infer_from_client]"] = "true"
+      }
+
+      val (nextActionUri, returnUri) = postForm("setup_intents/${setupIntent.intentId}/confirm", parameters).use { response ->
+        getNextAction(response)
+      }
+
+      Secure3DSAction.from(nextActionUri, returnUri, setupIntent, paymentMethodId)
+    }
+  }
+
+  fun createPaymentIntent(price: FiatMoney, level: Long, sourceType: PaymentSourceType.Stripe): Single<CreatePaymentIntentResult> {
+    @Suppress("CascadeIf")
+    return if (Validation.isAmountTooSmall(price)) {
+      Single.just(CreatePaymentIntentResult.AmountIsTooSmall(price))
+    } else if (Validation.isAmountTooLarge(price)) {
+      Single.just(CreatePaymentIntentResult.AmountIsTooLarge(price))
+    } else {
+      if (!Validation.supportedCurrencyCodes.contains(price.currency.currencyCode.uppercase(Locale.ROOT))) {
+        Single.just<CreatePaymentIntentResult>(CreatePaymentIntentResult.CurrencyIsNotSupported(price.currency.currencyCode))
+      } else {
+        paymentIntentFetcher
+          .fetchPaymentIntent(price, level, sourceType)
+          .map<CreatePaymentIntentResult> { CreatePaymentIntentResult.Success(it) }
+      }.subscribeOn(Schedulers.io())
+    }
+  }
+
+  /**
+   * Confirm a PaymentIntent
+   *
+   * This method will create a PaymentMethod with the given PaymentSource and then confirm the
+   * PaymentIntent.
+   *
+   * @return A Secure3DSAction
+   */
+  fun confirmPaymentIntent(paymentSource: PaymentSource, paymentIntent: StripeIntentAccessor): Single<Secure3DSAction> {
+    return Single.fromCallable {
+      val paymentMethodId = createPaymentMethodAndParseId(paymentSource)
+
+      val parameters = mutableMapOf(
+        "client_secret" to paymentIntent.intentClientSecret,
+        "payment_method" to paymentMethodId,
+        "return_url" to if (paymentSource is IDEALPaymentSource) RETURN_URL_IDEAL else RETURN_URL_3DS
+      )
+
+      if (paymentSource.type.isBankTransfer) {
+        parameters["mandate_data[customer_acceptance][type]"] = "online"
+        parameters["mandate_data[customer_acceptance][online][infer_from_client]"] = "true"
+      }
+
+      val (nextActionUri, returnUri) = postForm("payment_intents/${paymentIntent.intentId}/confirm", parameters).use { response ->
+        getNextAction(response)
+      }
+
+      Secure3DSAction.from(nextActionUri, returnUri, paymentIntent)
+    }.subscribeOn(Schedulers.io())
+  }
+
+  /**
+   * Retrieve the setup intent pointed to by the given accessor.
+   */
+  fun getSetupIntent(stripeIntentAccessor: StripeIntentAccessor): StripeSetupIntent {
+    return when (stripeIntentAccessor.objectType) {
+      StripeIntentAccessor.ObjectType.SETUP_INTENT -> get("setup_intents/${stripeIntentAccessor.intentId}?client_secret=${stripeIntentAccessor.intentClientSecret}&expand[0]=latest_attempt").use {
+        val body = it.body?.string()
+        try {
+          objectMapper.readValue(body!!)
+        } catch (e: InvalidDefinitionException) {
+          Log.w(TAG, "Failed to parse JSON for StripeSetupIntent.")
+          ResponseFieldLogger.logFields(objectMapper, body)
+          throw StripeError.FailedToParseSetupIntentResponseError(e)
+        } catch (e: Exception) {
+          Log.w(TAG, "Failed to read value from JSON.", e, true)
+          throw StripeError.FailedToParseSetupIntentResponseError(null)
+        }
+      }
+      else -> error("Unsupported type")
+    }
+  }
+
+  /**
+   * Retrieve the payment intent pointed to by the given accessor.
+   */
+  fun getPaymentIntent(stripeIntentAccessor: StripeIntentAccessor): StripePaymentIntent {
+    return when (stripeIntentAccessor.objectType) {
+      StripeIntentAccessor.ObjectType.PAYMENT_INTENT -> get("payment_intents/${stripeIntentAccessor.intentId}?client_secret=${stripeIntentAccessor.intentClientSecret}").use {
+        val body = it.body?.string()
+        try {
+          Log.d(TAG, "Reading StripePaymentIntent from JSON")
+          objectMapper.readValue(body!!)
+        } catch (e: InvalidDefinitionException) {
+          Log.w(TAG, "Failed to parse JSON for StripePaymentIntent.")
+          ResponseFieldLogger.logFields(objectMapper, body)
+          throw StripeError.FailedToParsePaymentIntentResponseError(e)
+        } catch (e: Exception) {
+          Log.w(TAG, "Failed to read value from JSON.", e, true)
+          throw StripeError.FailedToParsePaymentIntentResponseError(null)
+        }
+      }
+      else -> error("Unsupported type")
+    }
+  }
+
+  private fun getNextAction(response: Response): Pair<Uri, Uri> {
+    val responseBody = response.body?.string()
+    val bodyJson = responseBody?.let { JSONObject(it) }
+    return if (bodyJson?.has("next_action") == true && !bodyJson.isNull("next_action")) {
+      val nextAction = bodyJson.getJSONObject("next_action")
+      if (BuildConfig.DEBUG) {
+        Log.d(TAG, "[getNextAction] Next Action found:\n$nextAction")
+      }
+
+      val redirectToUrl = nextAction.getJSONObject("redirect_to_url")
+      val nextActionUri = redirectToUrl.getString("url")
+      val returnUri = redirectToUrl.getString("return_url")
+
+      Uri.parse(nextActionUri) to Uri.parse(returnUri)
+    } else {
+      Uri.EMPTY to Uri.EMPTY
+    }
+  }
+
+  fun createPaymentSourceFromCardData(cardData: CardData): Single<CreatePaymentSourceFromCardDataResult> {
+    return Single.fromCallable<CreatePaymentSourceFromCardDataResult> {
+      CreatePaymentSourceFromCardDataResult.Success(createPaymentSourceFromCardDataSync(cardData))
+    }.onErrorReturn {
+      CreatePaymentSourceFromCardDataResult.Failure(it)
+    }.subscribeOn(Schedulers.io())
+  }
+
+  fun createPaymentSourceFromSEPADebitData(sepaDebitData: SEPADebitData): Single<PaymentSource> {
+    return Single.just(SEPADebitPaymentSource(sepaDebitData))
+  }
+
+  fun createPaymentSourceFromIDEALData(idealData: IDEALData): Single<PaymentSource> {
+    return Single.just(IDEALPaymentSource(idealData))
+  }
+
+  @WorkerThread
+  private fun createPaymentSourceFromCardDataSync(cardData: CardData): PaymentSource {
+    val parameters: Map<String, String> = mutableMapOf(
+      CARD_NUMBER_KEY to cardData.number,
+      CARD_MONTH_KEY to cardData.month.toString(),
+      CARD_YEAR_KEY to cardData.year.toString(),
+      CARD_CVC_KEY to cardData.cvc
+    )
+
+    postForm("tokens", parameters).use { response ->
+      val body = response.body ?: throw StripeError.FailedToCreatePaymentSourceFromCardData
+      return CreditCardPaymentSource(JSONObject(body.string()))
+    }
+  }
+
+  private fun createPaymentMethodAndParseId(paymentSource: PaymentSource): String {
+    val paymentMethodResponse = when (paymentSource) {
+      is SEPADebitPaymentSource -> createPaymentMethodForSEPADebit(paymentSource)
+      is IDEALPaymentSource -> createPaymentMethodForIDEAL(paymentSource)
+      else -> createPaymentMethodForToken(paymentSource)
+    }
+
+    return paymentMethodResponse.use { response ->
+      val body = response.body ?: throw StripeError.FailedToParsePaymentMethodResponseError
+      val paymentMethodObject = body.string().replace("\n", "").let { JSONObject(it) }
+      paymentMethodObject.getString("id")
+    }
+  }
+
+  private fun createPaymentMethodForSEPADebit(paymentSource: SEPADebitPaymentSource): Response {
+    val parameters = mutableMapOf(
+      "type" to "sepa_debit",
+      "sepa_debit[iban]" to paymentSource.sepaDebitData.iban,
+      "billing_details[email]" to paymentSource.sepaDebitData.email,
+      "billing_details[name]" to paymentSource.sepaDebitData.name
+    )
+
+    return postForm("payment_methods", parameters)
+  }
+
+  private fun createPaymentMethodForIDEAL(paymentSource: IDEALPaymentSource): Response {
+    val parameters = mutableMapOf(
+      "type" to "ideal",
+      "ideal[bank]" to paymentSource.idealData.bank,
+      "billing_details[email]" to paymentSource.idealData.email,
+      "billing_details[name]" to paymentSource.idealData.name
+    )
+
+    return postForm("payment_methods", parameters)
+  }
+
+  private fun createPaymentMethodForToken(paymentSource: PaymentSource): Response {
+    val tokenId = paymentSource.getTokenId()
+    val parameters = mutableMapOf(
+      "card[token]" to tokenId,
+      "type" to "card"
+    )
+
+    return postForm("payment_methods", parameters)
+  }
+
+  private fun get(endpoint: String): Response {
+    val request = getRequestBuilder(endpoint).get().build()
+    val response = okHttpClient.newCall(request).execute()
+    return checkResponseForErrors(response)
+  }
+
+  private fun postForm(endpoint: String, parameters: Map<String, String>): Response {
+    val formBodyBuilder = FormBody.Builder()
+    parameters.forEach { (k, v) ->
+      formBodyBuilder.add(k, v)
+    }
+
+    val request = getRequestBuilder(endpoint)
+      .post(formBodyBuilder.build())
+      .build()
+
+    val response = okHttpClient.newCall(request).execute()
+
+    return checkResponseForErrors(response)
+  }
+
+  private fun getRequestBuilder(endpoint: String): Request.Builder {
+    return Request.Builder()
+      .url("${configuration.baseUrl}/$endpoint")
+      .addHeader("Authorization", "Basic ${"${configuration.publishableKey}:".encodeUtf8().base64()}")
+  }
+
+  private fun checkResponseForErrors(response: Response): Response {
+    if (response.isSuccessful) {
+      return response
+    } else {
+      val body = response.body?.string()
+
+      val errorCode = parseErrorCode(body)
+      val declineCode = parseDeclineCode(body) ?: StripeDeclineCode.getFromCode(errorCode)
+      val failureCode = parseFailureCode(body) ?: StripeFailureCode.getFromCode(errorCode)
+
+      if (failureCode is StripeFailureCode.Known) {
+        throw StripeError.PostError.Failed(response.code, failureCode)
+      } else if (declineCode is StripeDeclineCode.Known) {
+        throw StripeError.PostError.Declined(response.code, declineCode)
+      } else {
+        throw StripeError.PostError.Generic(response.code, errorCode)
+      }
+    }
+  }
+
+  private fun parseErrorCode(body: String?): String? {
+    if (body == null) {
+      Log.d(TAG, "parseErrorCode: No body.", true)
+      return null
+    }
+
+    return try {
+      JSONObject(body).getJSONObject("error").getString("code")
+    } catch (e: Exception) {
+      Log.d(TAG, "parseErrorCode: Failed to parse error.", e, true)
+      null
+    }
+  }
+
+  private fun parseDeclineCode(body: String?): StripeDeclineCode? {
+    if (body == null) {
+      Log.d(TAG, "parseDeclineCode: No body.", true)
+      return null
+    }
+
+    return try {
+      StripeDeclineCode.getFromCode(JSONObject(body).getJSONObject("error").getString("decline_code"))
+    } catch (e: Exception) {
+      Log.d(TAG, "parseDeclineCode: Failed to parse decline code.", null, true)
+      null
+    }
+  }
+
+  private fun parseFailureCode(body: String?): StripeFailureCode? {
+    if (body == null) {
+      Log.d(TAG, "parseFailureCode: No body.", true)
+      return null
+    }
+
+    return try {
+      StripeFailureCode.getFromCode(JSONObject(body).getJSONObject("error").getString("failure_code"))
+    } catch (e: Exception) {
+      Log.d(TAG, "parseFailureCode: Failed to parse failure code.", null, true)
+      null
+    }
+  }
+
+  object Validation {
+    private val MAX_AMOUNT = BigDecimal(99_999_999)
+
+    fun isAmountTooLarge(fiatMoney: FiatMoney): Boolean {
+      return fiatMoney.minimumUnitPrecisionString.toBigDecimal() > MAX_AMOUNT
+    }
+
+    fun isAmountTooSmall(fiatMoney: FiatMoney): Boolean {
+      return fiatMoney.minimumUnitPrecisionString.toBigDecimal() < BigDecimal(minimumIntegralChargePerCurrencyCode[fiatMoney.currency.currencyCode] ?: 50)
+    }
+
+    private val minimumIntegralChargePerCurrencyCode: Map<String, Int> = mapOf(
+      "USD" to 50,
+      "AED" to 200,
+      "AUD" to 50,
+      "BGN" to 100,
+      "BRL" to 50,
+      "CAD" to 50,
+      "CHF" to 50,
+      "CZK" to 1500,
+      "DKK" to 250,
+      "EUR" to 50,
+      "GBP" to 30,
+      "HKD" to 400,
+      "HUF" to 17500,
+      "INR" to 50,
+      "JPY" to 50,
+      "MXN" to 10,
+      "MYR" to 2,
+      "NOK" to 300,
+      "NZD" to 50,
+      "PLN" to 200,
+      "RON" to 200,
+      "SEK" to 300,
+      "SGD" to 50
+    )
+
+    val supportedCurrencyCodes: List<String> = listOf(
+      "USD",
+      "AED",
+      "AFN",
+      "ALL",
+      "AMD",
+      "ANG",
+      "AOA",
+      "ARS",
+      "AUD",
+      "AWG",
+      "AZN",
+      "BAM",
+      "BBD",
+      "BDT",
+      "BGN",
+      "BIF",
+      "BMD",
+      "BND",
+      "BOB",
+      "BRL",
+      "BSD",
+      "BWP",
+      "BZD",
+      "CAD",
+      "CDF",
+      "CHF",
+      "CLP",
+      "CNY",
+      "COP",
+      "CRC",
+      "CVE",
+      "CZK",
+      "DJF",
+      "DKK",
+      "DOP",
+      "DZD",
+      "EGP",
+      "ETB",
+      "EUR",
+      "FJD",
+      "FKP",
+      "GBP",
+      "GEL",
+      "GIP",
+      "GMD",
+      "GNF",
+      "GTQ",
+      "GYD",
+      "HKD",
+      "HNL",
+      "HRK",
+      "HTG",
+      "HUF",
+      "IDR",
+      "ILS",
+      "INR",
+      "ISK",
+      "JMD",
+      "JPY",
+      "KES",
+      "KGS",
+      "KHR",
+      "KMF",
+      "KRW",
+      "KYD",
+      "KZT",
+      "LAK",
+      "LBP",
+      "LKR",
+      "LRD",
+      "LSL",
+      "MAD",
+      "MDL",
+      "MGA",
+      "MKD",
+      "MMK",
+      "MNT",
+      "MOP",
+      "MRO",
+      "MUR",
+      "MVR",
+      "MWK",
+      "MXN",
+      "MYR",
+      "MZN",
+      "NAD",
+      "NGN",
+      "NIO",
+      "NOK",
+      "NPR",
+      "NZD",
+      "PAB",
+      "PEN",
+      "PGK",
+      "PHP",
+      "PKR",
+      "PLN",
+      "PYG",
+      "QAR",
+      "RON",
+      "RSD",
+      "RUB",
+      "RWF",
+      "SAR",
+      "SBD",
+      "SCR",
+      "SEK",
+      "SGD",
+      "SHP",
+      "SLL",
+      "SOS",
+      "SRD",
+      "STD",
+      "SZL",
+      "THB",
+      "TJS",
+      "TOP",
+      "TRY",
+      "TTD",
+      "TWD",
+      "TZS",
+      "UAH",
+      "UGX",
+      "UYU",
+      "UZS",
+      "VND",
+      "VUV",
+      "WST",
+      "XAF",
+      "XCD",
+      "XOF",
+      "XPF",
+      "YER",
+      "ZAR",
+      "ZMW"
+    )
+  }
+
+  class Gateway(private val configuration: Configuration) : GooglePayApi.Gateway {
+    override fun getTokenizationSpecificationParameters(): Map<String, String> {
+      return mapOf(
+        "gateway" to "stripe",
+        "stripe:version" to configuration.version,
+        "stripe:publishableKey" to configuration.publishableKey
+      )
+    }
+
+    override val allowedCardNetworks: List<String> = listOf(
+      "AMEX",
+      "DISCOVER",
+      "JCB",
+      "MASTERCARD",
+      "VISA"
+    )
+  }
+
+  data class Configuration(
+    val publishableKey: String,
+    val baseUrl: String = "https://api.stripe.com/v1",
+    val version: String = "2018-10-31"
+  )
+
+  interface PaymentIntentFetcher {
+    fun fetchPaymentIntent(
+      price: FiatMoney,
+      level: Long,
+      sourceType: PaymentSourceType.Stripe
+    ): Single<StripeIntentAccessor>
+  }
+
+  interface SetupIntentHelper {
+    fun fetchSetupIntent(
+      inAppPaymentType: InAppPaymentType,
+      sourceType: PaymentSourceType.Stripe
+    ): Single<StripeIntentAccessor>
+  }
+
+  @Parcelize
+  data class CardData(
+    val number: String,
+    val month: Int,
+    val year: Int,
+    val cvc: String
+  ) : Parcelable
+
+  @Parcelize
+  data class SEPADebitData(
+    val iban: String,
+    val name: String,
+    val email: String
+  ) : Parcelable
+
+  @Parcelize
+  data class IDEALData(
+    val bank: String,
+    val name: String,
+    val email: String
+  ) : Parcelable
+
+  interface PaymentSource {
+    val type: PaymentSourceType
+    fun parameterize(): JSONObject
+    fun getTokenId(): String
+    fun email(): String?
+  }
+
+  sealed interface Secure3DSAction {
+    data class ConfirmRequired(val uri: Uri, val returnUri: Uri, override val stripeIntentAccessor: StripeIntentAccessor, override val paymentMethodId: String?) : Secure3DSAction
+    data class NotNeeded(override val paymentMethodId: String?, override val stripeIntentAccessor: StripeIntentAccessor) : Secure3DSAction
+
+    val paymentMethodId: String?
+    val stripeIntentAccessor: StripeIntentAccessor
+
+    companion object {
+      fun from(
+        uri: Uri,
+        returnUri: Uri,
+        stripeIntentAccessor: StripeIntentAccessor,
+        paymentMethodId: String? = null
+      ): Secure3DSAction {
+        return if (uri == Uri.EMPTY) {
+          NotNeeded(paymentMethodId, stripeIntentAccessor)
+        } else {
+          ConfirmRequired(uri, returnUri, stripeIntentAccessor, paymentMethodId)
+        }
+      }
+    }
+  }
+}
diff --git a/donations/lib/src/main/java/org/signal/donations/StripeDeclineCode.kt b/donations/lib/src/main/java/org/signal/donations/StripeDeclineCode.kt
new file mode 100644
index 0000000000..986cd7881c
--- /dev/null
+++ b/donations/lib/src/main/java/org/signal/donations/StripeDeclineCode.kt
@@ -0,0 +1,65 @@
+package org.signal.donations
+
+/**
+ * Stripe Payment Processor decline codes
+ */
+sealed class StripeDeclineCode(val rawCode: String) {
+
+  data class Known(val code: Code) : StripeDeclineCode(code.code)
+  data class Unknown(val code: String) : StripeDeclineCode(code)
+
+  fun isKnown(): Boolean = this is Known
+
+  enum class Code(val code: String) {
+    AUTHENTICATION_REQUIRED("authentication_required"),
+    APPROVE_WITH_ID("approve_with_id"),
+    CALL_ISSUER("call_issuer"),
+    CARD_NOT_SUPPORTED("card_not_supported"),
+    CARD_VELOCITY_EXCEEDED("card_velocity_exceeded"),
+    CURRENCY_NOT_SUPPORTED("currency_not_supported"),
+    DO_NOT_HONOR("do_not_honor"),
+    DO_NOT_TRY_AGAIN("do_not_try_again"),
+    DUPLICATE_TRANSACTION("duplicate_transaction"),
+    EXPIRED_CARD("expired_card"),
+    FRAUDULENT("fraudulent"),
+    GENERIC_DECLINE("generic_decline"),
+    INCORRECT_NUMBER("incorrect_number"),
+    INCORRECT_CVC("incorrect_cvc"),
+    INSUFFICIENT_FUNDS("insufficient_funds"),
+    INVALID_ACCOUNT("invalid_account"),
+    INVALID_AMOUNT("invalid_amount"),
+    INVALID_CVC("invalid_cvc"),
+    INVALID_EXPIRY_MONTH("invalid_expiry_month"),
+    INVALID_EXPIRY_YEAR("invalid_expiry_year"),
+    INVALID_NUMBER("invalid_number"),
+    ISSUER_NOT_AVAILABLE("issuer_not_available"),
+    LOST_CARD("lost_card"),
+    MERCHANT_BLACKLIST("merchant_blacklist"),
+    NEW_ACCOUNT_INFORMATION_AVAILABLE("new_account_information_available"),
+    NO_ACTION_TAKEN("no_action_taken"),
+    NOT_PERMITTED("not_permitted"),
+    PROCESSING_ERROR("processing_error"),
+    REENTER_TRANSACTION("reenter_transaction"),
+    RESTRICTED_CARD("restricted_card"),
+    REVOCATION_OF_ALL_AUTHORIZATIONS("revocation_of_all_authorizations"),
+    REVOCATION_OF_AUTHORIZATION("revocation_of_authorization"),
+    SECURITY_VIOLATION("security_violation"),
+    SERVICE_NOT_ALLOWED("service_not_allowed"),
+    STOLEN_CARD("stolen_card"),
+    STOP_PAYMENT_ORDER("stop_payment_order"),
+    TRANSACTION_NOT_ALLOWED("transaction_not_allowed"),
+    TRY_AGAIN_LATER("try_again_later"),
+    WITHDRAWAL_COUNT_LIMIT_EXCEEDED("withdrawal_count_limit_exceeded")
+  }
+
+  companion object {
+    fun getFromCode(code: String?): StripeDeclineCode {
+      if (code == null) {
+        return Unknown("null")
+      }
+
+      val typedCode: Code? = Code.values().firstOrNull { it.code == code }
+      return typedCode?.let { Known(typedCode) } ?: Unknown(code)
+    }
+  }
+}
diff --git a/donations/lib/src/main/java/org/signal/donations/StripeError.kt b/donations/lib/src/main/java/org/signal/donations/StripeError.kt
new file mode 100644
index 0000000000..e19b8cff9d
--- /dev/null
+++ b/donations/lib/src/main/java/org/signal/donations/StripeError.kt
@@ -0,0 +1,17 @@
+package org.signal.donations
+
+import com.fasterxml.jackson.databind.exc.InvalidDefinitionException
+
+sealed class StripeError(message: String) : Exception(message) {
+  class FailedToParsePaymentIntentResponseError(invalidDefCause: InvalidDefinitionException?) : StripeError("Failed to parse payment intent response: ${invalidDefCause?.type} ${invalidDefCause?.property} ${invalidDefCause?.beanDescription}")
+  class FailedToParseSetupIntentResponseError(invalidDefCause: InvalidDefinitionException?) : StripeError("Failed to parse setup intent response: ${invalidDefCause?.type} ${invalidDefCause?.property} ${invalidDefCause?.beanDescription}")
+  object FailedToParsePaymentMethodResponseError : StripeError("Failed to parse payment method response")
+  object FailedToCreatePaymentSourceFromCardData : StripeError("Failed to create payment source from card data")
+  sealed class PostError(
+    override val message: String
+  ) : StripeError(message) {
+    class Generic(statusCode: Int, val errorCode: String?) : PostError("postForm failed with code: $statusCode errorCode: $errorCode")
+    class Declined(statusCode: Int, val declineCode: StripeDeclineCode) : PostError("postForm failed with code: $statusCode declineCode: $declineCode")
+    class Failed(statusCode: Int, val failureCode: StripeFailureCode) : PostError("postForm failed with code: $statusCode failureCode: $failureCode")
+  }
+}
diff --git a/donations/lib/src/main/java/org/signal/donations/StripeFailureCode.kt b/donations/lib/src/main/java/org/signal/donations/StripeFailureCode.kt
new file mode 100644
index 0000000000..28837eb59f
--- /dev/null
+++ b/donations/lib/src/main/java/org/signal/donations/StripeFailureCode.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.signal.donations
+
+/**
+ * Bank Transfer failure codes, as detailed here:
+ * https://stripe.com/docs/payments/sepa-debit#failed-payments
+ */
+sealed class StripeFailureCode(val rawCode: String) {
+  data class Known(val code: Code) : StripeFailureCode(code.code)
+  data class Unknown(val code: String) : StripeFailureCode(code)
+
+  val isKnown get() = this is Known
+  enum class Code(val code: String) {
+    REFER_TO_CUSTOMER("refer_to_customer"),
+    INSUFFICIENT_FUNDS("insufficient_funds"),
+    DEBIT_DISPUTED("debit_disputed"),
+    AUTHORIZATION_REVOKED("authorization_revoked"),
+    DEBIT_NOT_AUTHORIZED("debit_not_authorized"),
+    ACCOUNT_CLOSED("account_closed"),
+    BANK_ACCOUNT_RESTRICTED("bank_account_restricted"),
+    DEBIT_AUTHORIZATION_NOT_MATCH("debit_authorization_not_match"),
+    RECIPIENT_DECEASED("recipient_deceased"),
+    BRANCH_DOES_NOT_EXIST("branch_does_not_exist"),
+    INCORRECT_ACCOUNT_HOLDER_NAME("incorrect_account_holder_name"),
+    INVALID_ACCOUNT_NUMBER("invalid_account_number"),
+    GENERIC_COULD_NOT_PROCESS("generic_could_not_process")
+  }
+
+  companion object {
+    fun getFromCode(code: String?): StripeFailureCode {
+      if (code == null) {
+        return Unknown("null")
+      }
+
+      val typedCode: Code? = Code.values().firstOrNull { it.code == code }
+      return typedCode?.let { Known(typedCode) } ?: Unknown(code)
+    }
+  }
+}
diff --git a/donations/lib/src/main/java/org/signal/donations/StripeIntentAccessor.kt b/donations/lib/src/main/java/org/signal/donations/StripeIntentAccessor.kt
new file mode 100644
index 0000000000..29a840691a
--- /dev/null
+++ b/donations/lib/src/main/java/org/signal/donations/StripeIntentAccessor.kt
@@ -0,0 +1,54 @@
+package org.signal.donations
+
+import android.net.Uri
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+/**
+ * An object which wraps the necessary information to access a SetupIntent or PaymentIntent
+ * from the Stripe API
+ */
+@Parcelize
+data class StripeIntentAccessor(
+  val objectType: ObjectType,
+  val intentId: String,
+  val intentClientSecret: String
+) : Parcelable {
+
+  enum class ObjectType {
+    NONE,
+    PAYMENT_INTENT,
+    SETUP_INTENT
+  }
+
+  companion object {
+
+    /**
+     * noActionRequired is a safe default for when there was no 3DS required,
+     * in order to continue a reactive payment chain.
+     */
+    val NO_ACTION_REQUIRED = StripeIntentAccessor(ObjectType.NONE, "", "")
+
+    private const val KEY_PAYMENT_INTENT = "payment_intent"
+    private const val KEY_PAYMENT_INTENT_CLIENT_SECRET = "payment_intent_client_secret"
+    private const val KEY_SETUP_INTENT = "setup_intent"
+    private const val KEY_SETUP_INTENT_CLIENT_SECRET = "setup_intent_client_secret"
+
+    fun fromUri(uri: String): StripeIntentAccessor {
+      val parsedUri = Uri.parse(uri)
+      return if (parsedUri.queryParameterNames.contains(KEY_PAYMENT_INTENT)) {
+        StripeIntentAccessor(
+          ObjectType.PAYMENT_INTENT,
+          parsedUri.getQueryParameter(KEY_PAYMENT_INTENT)!!,
+          parsedUri.getQueryParameter(KEY_PAYMENT_INTENT_CLIENT_SECRET)!!
+        )
+      } else {
+        StripeIntentAccessor(
+          ObjectType.SETUP_INTENT,
+          parsedUri.getQueryParameter(KEY_SETUP_INTENT)!!,
+          parsedUri.getQueryParameter(KEY_SETUP_INTENT_CLIENT_SECRET)!!
+        )
+      }
+    }
+  }
+}
diff --git a/donations/lib/src/main/java/org/signal/donations/json/StripeIntentStatus.kt b/donations/lib/src/main/java/org/signal/donations/json/StripeIntentStatus.kt
new file mode 100644
index 0000000000..e365be4165
--- /dev/null
+++ b/donations/lib/src/main/java/org/signal/donations/json/StripeIntentStatus.kt
@@ -0,0 +1,27 @@
+package org.signal.donations.json
+
+import com.fasterxml.jackson.annotation.JsonCreator
+
+/**
+ * Stripe intent status, from:
+ *
+ * https://stripe.com/docs/api/setup_intents/object?lang=curl#setup_intent_object-status
+ * https://stripe.com/docs/api/payment_intents/object?lang=curl#payment_intent_object-status
+ *
+ * Note: REQUIRES_CAPTURE is only ever valid for a SetupIntent
+ */
+enum class StripeIntentStatus(private val code: String) {
+  REQUIRES_PAYMENT_METHOD("requires_payment_method"),
+  REQUIRES_CONFIRMATION("requires_confirmation"),
+  REQUIRES_ACTION("requires_action"),
+  REQUIRES_CAPTURE("requires_capture"),
+  PROCESSING("processing"),
+  CANCELED("canceled"),
+  SUCCEEDED("succeeded");
+
+  companion object {
+    @JvmStatic
+    @JsonCreator
+    fun fromCode(code: String): StripeIntentStatus = StripeIntentStatus.values().first { it.code == code }
+  }
+}
diff --git a/donations/lib/src/main/java/org/signal/donations/json/StripePaymentIntent.kt b/donations/lib/src/main/java/org/signal/donations/json/StripePaymentIntent.kt
new file mode 100644
index 0000000000..a1504add83
--- /dev/null
+++ b/donations/lib/src/main/java/org/signal/donations/json/StripePaymentIntent.kt
@@ -0,0 +1,18 @@
+package org.signal.donations.json
+
+import com.fasterxml.jackson.annotation.JsonCreator
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import com.fasterxml.jackson.annotation.JsonProperty
+
+/**
+ * Represents a Stripe API PaymentIntent object.
+ *
+ * See: https://stripe.com/docs/api/payment_intents/object
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class StripePaymentIntent @JsonCreator constructor(
+  @JsonProperty("id") val id: String,
+  @JsonProperty("client_secret") val clientSecret: String,
+  @JsonProperty("status") val status: StripeIntentStatus?,
+  @JsonProperty("payment_method") val paymentMethod: String?
+)
diff --git a/donations/lib/src/main/java/org/signal/donations/json/StripeSetupIntent.kt b/donations/lib/src/main/java/org/signal/donations/json/StripeSetupIntent.kt
new file mode 100644
index 0000000000..799d360dcc
--- /dev/null
+++ b/donations/lib/src/main/java/org/signal/donations/json/StripeSetupIntent.kt
@@ -0,0 +1,19 @@
+package org.signal.donations.json
+
+import com.fasterxml.jackson.annotation.JsonCreator
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import com.fasterxml.jackson.annotation.JsonProperty
+
+/**
+ * Represents a Stripe API SetupIntent object.
+ *
+ * See: https://stripe.com/docs/api/setup_intents/object
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class StripeSetupIntent @JsonCreator constructor(
+  @JsonProperty("id") val id: String,
+  @JsonProperty("client_secret") val clientSecret: String,
+  @JsonProperty("status") val status: StripeIntentStatus,
+  @JsonProperty("payment_method") val paymentMethod: String?,
+  @JsonProperty("customer") val customer: String?
+)
diff --git a/donations/lib/src/test/java/org/signal/donations/ResponseFieldLoggerTest.kt b/donations/lib/src/test/java/org/signal/donations/ResponseFieldLoggerTest.kt
new file mode 100644
index 0000000000..ba09041067
--- /dev/null
+++ b/donations/lib/src/test/java/org/signal/donations/ResponseFieldLoggerTest.kt
@@ -0,0 +1,49 @@
+package org.signal.donations
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import org.junit.Before
+import org.junit.Test
+import org.signal.core.util.logging.Log
+import org.signal.core.util.logging.Log.Logger
+
+class ResponseFieldLoggerTest {
+
+  @Before
+  fun setUp() {
+    Log.initialize(object : Logger() {
+      override fun v(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) = Unit
+      override fun d(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) = Unit
+      override fun i(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) = Unit
+      override fun w(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) = println(message)
+      override fun e(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) = Unit
+      override fun flush() = Unit
+      override fun clear() = Unit
+    })
+  }
+
+  @Test
+  fun `Given a null, when I logFields, then I expect no crash`() {
+    ResponseFieldLogger.logFields(ObjectMapper(), null)
+  }
+
+  @Test
+  fun `Given empty, when I logFields, then I expect no crash`() {
+    ResponseFieldLogger.logFields(ObjectMapper(), "{}")
+  }
+
+  @Test
+  fun `Given non-empty, when I logFields, then I expect no crash`() {
+    ResponseFieldLogger.logFields(
+      ObjectMapper(),
+      """
+      {
+        "id": "asdf",
+        "client_secret": 12345,
+        "structured_obj": {
+          "a": "a"
+        }
+      }
+      """.trimIndent()
+    )
+  }
+}
diff --git a/donations/lib/src/test/java/org/signal/donations/StripeIntentAccessorTest.kt b/donations/lib/src/test/java/org/signal/donations/StripeIntentAccessorTest.kt
new file mode 100644
index 0000000000..cbdf292e68
--- /dev/null
+++ b/donations/lib/src/test/java/org/signal/donations/StripeIntentAccessorTest.kt
@@ -0,0 +1,39 @@
+package org.signal.donations
+
+import android.app.Application
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(application = Application::class)
+class StripeIntentAccessorTest {
+
+  companion object {
+    private const val PAYMENT_INTENT_DATA = "pi_123"
+    private const val PAYMENT_INTENT_SECRET_DATA = "pisc_456"
+    private const val SETUP_INTENT_DATA = "si_123"
+    private const val SETUP_INTENT_SECRET_DATA = "sisc_456"
+
+    private const val PAYMENT_RESULT = "sgnlpay://3DS?payment_intent=$PAYMENT_INTENT_DATA&payment_intent_client_secret=$PAYMENT_INTENT_SECRET_DATA"
+    private const val SETUP_RESULT = "sgnlpay://3DS?setup_intent=$SETUP_INTENT_DATA&setup_intent_client_secret=$SETUP_INTENT_SECRET_DATA"
+  }
+
+  @Test
+  fun `Given a URL with payment data, when I fromUri, then I expect a Secure3DSResult with matching data`() {
+    val expected = StripeIntentAccessor(StripeIntentAccessor.ObjectType.PAYMENT_INTENT, PAYMENT_INTENT_DATA, PAYMENT_INTENT_SECRET_DATA)
+    val result = StripeIntentAccessor.fromUri(PAYMENT_RESULT)
+
+    assertEquals(expected, result)
+  }
+
+  @Test
+  fun `Given a URL with setup data, when I fromUri, then I expect a Secure3DSResult with matching data`() {
+    val expected = StripeIntentAccessor(StripeIntentAccessor.ObjectType.SETUP_INTENT, SETUP_INTENT_DATA, SETUP_INTENT_SECRET_DATA)
+    val result = StripeIntentAccessor.fromUri(SETUP_RESULT)
+
+    assertEquals(expected, result)
+  }
+}
diff --git a/donations/lib/src/test/java/org/signal/donations/StripePaymentIntentTest.kt b/donations/lib/src/test/java/org/signal/donations/StripePaymentIntentTest.kt
new file mode 100644
index 0000000000..40b052cb2a
--- /dev/null
+++ b/donations/lib/src/test/java/org/signal/donations/StripePaymentIntentTest.kt
@@ -0,0 +1,75 @@
+package org.signal.donations
+
+import android.app.Application
+import com.fasterxml.jackson.module.kotlin.jsonMapper
+import com.fasterxml.jackson.module.kotlin.kotlinModule
+import com.fasterxml.jackson.module.kotlin.readValue
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.signal.donations.json.StripeIntentStatus
+import org.signal.donations.json.StripePaymentIntent
+
+@RunWith(RobolectricTestRunner::class)
+@Config(application = Application::class, manifest = Config.NONE)
+class StripePaymentIntentTest {
+  companion object {
+    private const val TEST_JSON = """
+      {
+        "id": "pi_A",
+        "object": "payment_intent",
+        "amount": 1000,
+        "amount_details": {
+          "tip": {}
+        },
+        "automatic_payment_methods": {
+          "allow_redirects": "always",
+          "enabled": true
+        },
+        "canceled_at": null,
+        "cancellation_reason": null,
+        "capture_method": "automatic",
+        "client_secret": "pi_client_secret",
+        "confirmation_method": "automatic",
+        "created": 1697568512,
+        "currency": "eur",
+        "description": "Thank you for supporting Signal. Your contribution helps fuel the mission of developing open source privacy technology that protects free expression and enables secure global communication for millions around the world. If you’re a resident of the United States, please retain this receipt for your tax records. Signal Technology Foundation is a tax-exempt nonprofit organization in the United States under section 501c3 of the Internal Revenue Code. Our Federal Tax ID is 82-4506840.",
+        "last_payment_error": null,
+        "livemode": false,
+        "next_action": null,
+        "payment_method": "pm_A",
+        "payment_method_configuration_details": {
+          "id": "pmc_A",
+          "parent": null
+        },
+        "payment_method_types": [
+          "card",
+          "ideal",
+          "sepa_debit"
+        ],
+        "processing": null,
+        "receipt_email": null,
+        "setup_future_usage": null,
+        "shipping": null,
+        "source": null,
+        "status": "succeeded"
+      }
+    """
+  }
+
+  @Test
+  fun `Given TEST_DATA, when I readValue, then I expect properly set fields`() {
+    val mapper = jsonMapper {
+      addModule(kotlinModule())
+    }
+
+    val intent = mapper.readValue<StripePaymentIntent>(TEST_JSON)
+
+    assertEquals(intent.id, "pi_A")
+    assertEquals(intent.clientSecret, "pi_client_secret")
+    assertEquals(intent.paymentMethod, "pm_A")
+    assertEquals(intent.status, StripeIntentStatus.SUCCEEDED)
+  }
+}
diff --git a/donations/lib/src/test/java/org/signal/donations/StripeSetupIntentTest.kt b/donations/lib/src/test/java/org/signal/donations/StripeSetupIntentTest.kt
new file mode 100644
index 0000000000..e57691d9e5
--- /dev/null
+++ b/donations/lib/src/test/java/org/signal/donations/StripeSetupIntentTest.kt
@@ -0,0 +1,70 @@
+package org.signal.donations
+
+import android.app.Application
+import com.fasterxml.jackson.module.kotlin.jsonMapper
+import com.fasterxml.jackson.module.kotlin.kotlinModule
+import com.fasterxml.jackson.module.kotlin.readValue
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.signal.donations.json.StripeIntentStatus
+import org.signal.donations.json.StripeSetupIntent
+
+@RunWith(RobolectricTestRunner::class)
+@Config(application = Application::class, manifest = Config.NONE)
+class StripeSetupIntentTest {
+  companion object {
+    private const val TEST_JSON = """
+      {
+        "id": "seti_1LyzgK2eZvKYlo2C3AhgI5IC",
+        "object": "setup_intent",
+        "application": null,
+        "cancellation_reason": null,
+        "client_secret": "seti_1LyzgK2eZvKYlo2C3AhgI5IC_secret_MiQXAjP1ZBdORqQWNuJOcLqk9570HkA",
+        "created": 1667229224,
+        "customer": "cus_Fh6d95jDS2fVSL",
+        "description": null,
+        "flow_directions": null,
+        "last_setup_error": null,
+        "latest_attempt": null,
+        "livemode": false,
+        "mandate": null,
+        "metadata": {},
+        "next_action": null,
+        "on_behalf_of": null,
+        "payment_method": "pm_sldalskdjhfalskjdhf",
+        "payment_method_options": {
+          "card": {
+            "mandate_options": null,
+            "network": null,
+            "request_three_d_secure": "automatic"
+          }
+        },
+        "payment_method_types": [
+          "card"
+        ],
+        "redaction": null,
+        "single_use_mandate": null,
+        "status": "requires_payment_method",
+        "usage": "off_session"
+      }
+    """
+  }
+
+  @Test
+  fun `Given TEST_DATA, when I readValue, then I expect properly set fields`() {
+    val mapper = jsonMapper {
+      addModule(kotlinModule())
+    }
+
+    val intent = mapper.readValue<StripeSetupIntent>(TEST_JSON)
+
+    assertEquals(intent.id, "seti_1LyzgK2eZvKYlo2C3AhgI5IC")
+    assertEquals(intent.clientSecret, "seti_1LyzgK2eZvKYlo2C3AhgI5IC_secret_MiQXAjP1ZBdORqQWNuJOcLqk9570HkA")
+    assertEquals(intent.paymentMethod, "pm_sldalskdjhfalskjdhf")
+    assertEquals(intent.status, StripeIntentStatus.REQUIRES_PAYMENT_METHOD)
+    assertEquals(intent.customer, "cus_Fh6d95jDS2fVSL")
+  }
+}
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 265d15b045..17ee85f670 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -9,7 +9,7 @@ Run the following command to update this file after adding or updating a depende
 For more information, see:
 https://docs.gradle.org/current/userguide/dependency_verification.html
 -->
-<verification-metadata xmlns="https://schema.gradle.org/dependency-verification" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://schema.gradle.org/dependency-verification https://schema.gradle.org/dependency-verification/dependency-verification-1.2.xsd">
+<verification-metadata xmlns="https://schema.gradle.org/dependency-verification" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://schema.gradle.org/dependency-verification https://schema.gradle.org/dependency-verification/dependency-verification-1.3.xsd">
    <configuration>
       <verify-metadata>true</verify-metadata>
       <verify-signatures>false</verify-signatures>
@@ -145,6 +145,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="fbc64f5c44a7added8b6eab517cf7d70555e25153bf5d44a6ed9b0e5312f7de9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.annotation" name="annotation" version="1.7.0">
+         <artifact name="annotation-1.7.0.module">
+            <sha256 value="530708656d380605077ea8bca9ae1372fbd1af38e375f411d4e43263bd510c3c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.annotation" name="annotation-experimental" version="1.0.0">
          <artifact name="annotation-experimental-1.0.0.aar">
             <sha256 value="b219d2b568e7e4ba534e09f8c2fd242343df6ccbdfbbe938846f5d740e6b0b11" origin="Generated by Gradle"/>
@@ -174,6 +179,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="9b6974a7dfe26d3c209dd63e16f8ee2461b57a091789160ca1eb492bb1bf3f84" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.annotation" name="annotation-experimental" version="1.4.0">
+         <artifact name="annotation-experimental-1.4.0.aar">
+            <sha256 value="c6eb7e676011ec65b32428373d450debdfc45179c4f8b3a752174fb87c17b08a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="annotation-experimental-1.4.0.module">
+            <sha256 value="5930ea7f21fcb6d0deb2ba32748a0ef7c8fd2c42384860582ba7cd20deb90379" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.annotation" name="annotation-jvm" version="1.6.0">
          <artifact name="annotation-jvm-1.6.0.jar">
             <sha256 value="60b10b5ef5769b79570172e015b8159405c92f034ba88b9391a977589c9deb4e" origin="Generated by Gradle"/>
@@ -182,6 +195,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="3f5a8faa19de667e63dca9730ff8ef0e478e4bafb5feeb8258e5c086246dc90c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.annotation" name="annotation-jvm" version="1.7.0">
+         <artifact name="annotation-jvm-1.7.0.jar">
+            <sha256 value="e36b8e4b8393a4adc74e3d4ab22ad5a36396f0cea2e40b5734eae14937dfd224" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="annotation-jvm-1.7.0.module">
+            <sha256 value="07ce60c377ab94e47c8c902589b9776030064fd1a7e4d5a01a38d700e35e5db4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.appcompat" name="appcompat" version="1.6.1">
          <artifact name="appcompat-1.6.1.aar">
             <sha256 value="7ea5573b93ababd3bd32312451c6ea48a662b03a140dda81aebe75776a20a422" origin="Generated by Gradle"/>
@@ -316,52 +337,52 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="4999f205b2b38e31180ad58111e32d564190c2024fbfd58527e2da8bfb67ff65" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.camera" name="camera-camera2" version="1.3.2">
-         <artifact name="camera-camera2-1.3.2.aar">
-            <sha256 value="930837cb503d6f0f86b9b0691ed8cc330a1c5259c8603547ca8191c012a99314" origin="Generated by Gradle"/>
+      <component group="androidx.camera" name="camera-camera2" version="1.3.4">
+         <artifact name="camera-camera2-1.3.4.aar">
+            <sha256 value="e3ad9af56fe2e71e503af681bc0bcff39af1b4b7f3e4d59649a04d2412a50eea" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-camera2-1.3.2.module">
-            <sha256 value="8561bd8a1f3216d5cc42d22b8e99cb87a22ee5c8ded460722a0e581aaf95a218" origin="Generated by Gradle"/>
+         <artifact name="camera-camera2-1.3.4.module">
+            <sha256 value="f8d5e1ced08b9fa732a4331d87c1f8a998811944fd8aa356ba0a7d968ce52abd" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.camera" name="camera-core" version="1.3.2">
-         <artifact name="camera-core-1.3.2.aar">
-            <sha256 value="b8440872a37e71c6f7f64e91bab414a87368ab095106a6bd49a4848543dcd927" origin="Generated by Gradle"/>
+      <component group="androidx.camera" name="camera-core" version="1.3.4">
+         <artifact name="camera-core-1.3.4.aar">
+            <sha256 value="1ae5cac5652734302609a1ea31948cde31c84d2433eccdc0ee2b80e65eabfc4d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-core-1.3.2.module">
-            <sha256 value="672ff6ea2132328e2ecee7f2076fb7e3627040179766f72a01ed123f6369d2ae" origin="Generated by Gradle"/>
+         <artifact name="camera-core-1.3.4.module">
+            <sha256 value="f74e6f591fca0a6391943de43c3fc24627987e46fcdf8c1999e20c933823790b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.camera" name="camera-extensions" version="1.3.2">
-         <artifact name="camera-extensions-1.3.2.aar">
-            <sha256 value="98941c42aa0b038c8d11c5a9fd9661c9c180f815812ce4f3c3e3ba6de3a68e83" origin="Generated by Gradle"/>
+      <component group="androidx.camera" name="camera-extensions" version="1.3.4">
+         <artifact name="camera-extensions-1.3.4.aar">
+            <sha256 value="f63a86c55f1c3ae4b25ac9f65687932c167045e87f63d3c946e54ffebe6d8c48" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-extensions-1.3.2.module">
-            <sha256 value="c0cb3941068da073a8edc832fcb85898b89495676c353c2e8e31161f9cad6c73" origin="Generated by Gradle"/>
+         <artifact name="camera-extensions-1.3.4.module">
+            <sha256 value="154d964f4608f84759b8d416d35cabb7fcaf3a86be61a7471cab782c04ba9362" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.camera" name="camera-lifecycle" version="1.3.2">
-         <artifact name="camera-lifecycle-1.3.2.aar">
-            <sha256 value="ade7e1d170f6a68d3ceee66e921d1de9b07e468e5a06526919c67ea0fed50ede" origin="Generated by Gradle"/>
+      <component group="androidx.camera" name="camera-lifecycle" version="1.3.4">
+         <artifact name="camera-lifecycle-1.3.4.aar">
+            <sha256 value="0947a0dbc4220b58a978101f758195bbd26d7067c236039ab9c35f0783e5f258" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-lifecycle-1.3.2.module">
-            <sha256 value="8838ad68a8a354b21ff5e0d7c9d73e006edf97acb437932c4d56aa09906e84c4" origin="Generated by Gradle"/>
+         <artifact name="camera-lifecycle-1.3.4.module">
+            <sha256 value="1d418947ed0b9f410f3f4648fc7ae76612b4b0e338a00628fa145e5387e1e0ec" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.camera" name="camera-video" version="1.3.2">
-         <artifact name="camera-video-1.3.2.aar">
-            <sha256 value="e77cdf5efd61d1f03699cfa0f681b18ee856929477d2ab73d0617559c795ef32" origin="Generated by Gradle"/>
+      <component group="androidx.camera" name="camera-video" version="1.3.4">
+         <artifact name="camera-video-1.3.4.aar">
+            <sha256 value="feb77e9ca4c8a14736f4b1adc6e4f50aded98655800101b981115b0b64e8026f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-video-1.3.2.module">
-            <sha256 value="254b755db6ffef3987aac98725abb2fb97873c05c65813abec9a74b62e5401a3" origin="Generated by Gradle"/>
+         <artifact name="camera-video-1.3.4.module">
+            <sha256 value="fa8826a211864ef98bb39e5705b22618a4a4c3d316c0dfa7ad73788b8c1d487b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.camera" name="camera-view" version="1.3.2">
-         <artifact name="camera-view-1.3.2.aar">
-            <sha256 value="6e0b93fad7b1d3265949fb1ac71a352cdb7df86e2be96c0d8d28d238d00c35ad" origin="Generated by Gradle"/>
+      <component group="androidx.camera" name="camera-view" version="1.3.4">
+         <artifact name="camera-view-1.3.4.aar">
+            <sha256 value="99b169603e2ff54f1172eb6459285118f7bba430cb6893d223c1929ec5602b15" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="camera-view-1.3.2.module">
-            <sha256 value="2729841afdfc4161f550818db6a5556ca29706c226256eeda04af2c3cd925b95" origin="Generated by Gradle"/>
+         <artifact name="camera-view-1.3.4.module">
+            <sha256 value="f291f5459da6f75de2b54c365d49db70cbaf23a242a78eaf40e414b8f3609362" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.cardview" name="cardview" version="1.0.0">
@@ -387,11 +408,32 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="6c4c0f9e7dab6d983858e67dd99a93af9d9f7d02ac1f8f648ce1fecc84afffa2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.collection" name="collection" version="1.4.0">
+         <artifact name="collection-1.4.0.module">
+            <sha256 value="2fd3b523e8276c0254c417b66d8e7fecc5b0b975af5d178afa7f5b813812cfab" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.collection" name="collection-jvm" version="1.4.0">
+         <artifact name="collection-jvm-1.4.0.jar">
+            <sha256 value="d5cf7b72647c7995071588fe870450ff9c8f127f253d2d4851e161b800f67ae0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="collection-jvm-1.4.0.module">
+            <sha256 value="21b0b02ea68abe418f3dd4e4d42876ecf3bd9a1cada458b460cae1cd9d58ef6d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.collection" name="collection-ktx" version="1.1.0">
          <artifact name="collection-ktx-1.1.0.jar">
             <sha256 value="2bfc54475c047131913361f56d0f7f019c6e5bee53eeb0eb7d94a7c499a05227" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.collection" name="collection-ktx" version="1.4.0">
+         <artifact name="collection-ktx-1.4.0.jar">
+            <sha256 value="c6deada2fac53b8ea6523dbda77597b128006674616f140f04df23264c6d1aa3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="collection-ktx-1.4.0.module">
+            <sha256 value="3770999ec32d1c082d1a34cf1d64d16d9eca9b6b1263c979954407f461fba82b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.animation" name="animation" version="1.1.1">
          <artifact name="animation-1.1.1.module">
             <sha256 value="078b4dcd5f09689281415d9ea0e09d2775d80f016041dacbcee22d54c43a5fa1" origin="Generated by Gradle"/>
@@ -405,6 +447,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="28a43ab8fba64e55bcd20126b8ed55f5ab4e8f927f749d46b6fbd1f75af04d7e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.animation" name="animation" version="1.5.4">
+         <artifact name="animation-1.5.4.module">
+            <sha256 value="be6a3f91c40ba7dd672ec476dd9e476f359795c8835e8a26bf74162a4fc34ad2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="animation-metadata-1.5.4.jar">
+            <sha256 value="28a43ab8fba64e55bcd20126b8ed55f5ab4e8f927f749d46b6fbd1f75af04d7e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.animation" name="animation" version="1.6.2">
+         <artifact name="animation-1.6.2.module">
+            <sha256 value="1e929c6fdb8ec509a5584e52d3fa11f53353ac204b777790201449aeb9d81e57" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.animation" name="animation-android" version="1.5.1">
          <artifact name="animation-android-1.5.1.module">
             <sha256 value="bff0f739876b4ccc9a6add1f5314ae39811a4663613e887b3bfda9eda1f50960" origin="Generated by Gradle"/>
@@ -413,6 +468,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="966acd4a6396034aba4aea8aefbd1711dbc45dc3bfaaa53fc496129b4e401196" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.animation" name="animation-android" version="1.5.4">
+         <artifact name="animation-android-1.5.4.module">
+            <sha256 value="884b521e74af23190e0224ec82c4002dfe15a3e40028da174f579723a6b331ab" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="animation-release.aar">
+            <sha256 value="428538775ea55529b953fbb7a6000ccfddc89722c69c7a30431a630fa2fe74f2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.animation" name="animation-android" version="1.6.2">
+         <artifact name="animation-android-1.6.2.module">
+            <sha256 value="2c1f3a50e0d185fdf882c6516254e2d67561ae639bb243a10a77d02c0e7e5f84" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="animation-release.aar">
+            <sha256 value="6d620e937f2aa422d5a18595d39b001d9149f6fc0af97d7bed1b1c4dd3a2cae2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.animation" name="animation-core" version="1.5.1">
          <artifact name="animation-core-1.5.1.module">
             <sha256 value="cd280d3b8dbf85f251153129cc67f928bc928dfe7e9e410f1858ad331da48b68" origin="Generated by Gradle"/>
@@ -421,6 +492,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="747b658ee320f6d55a8d40727d6c6b0d78c1dc899ed66fe8b65adefd783976cb" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.animation" name="animation-core" version="1.5.4">
+         <artifact name="animation-core-1.5.4.module">
+            <sha256 value="fcadd766c0fd24c815fcd132e91d71081a58acf3fb9d4d1dc1ad417bac50da2f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="animation-core-metadata-1.5.4.jar">
+            <sha256 value="747b658ee320f6d55a8d40727d6c6b0d78c1dc899ed66fe8b65adefd783976cb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.animation" name="animation-core" version="1.6.2">
+         <artifact name="animation-core-1.6.2.module">
+            <sha256 value="2512e23a51f86a9f51894b9317e3250ee0a0b77eab57e17640ae96b2117bb372" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.animation" name="animation-core-android" version="1.5.1">
          <artifact name="animation-core-android-1.5.1.module">
             <sha256 value="dd8fc6cd7d0c0adff3221a007da1ca258510858bbf0b67a61a49da8465009ba4" origin="Generated by Gradle"/>
@@ -429,6 +513,38 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="d7ce987264935a3b3e4b5d442343cb93eecc13b1d6463797009849bd529d1897" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.animation" name="animation-core-android" version="1.5.4">
+         <artifact name="animation-core-android-1.5.4.module">
+            <sha256 value="32b8ec7c82a91bf4723bfd1512fba58731c180377deaaa90754152c321d817e3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="animation-core-release.aar">
+            <sha256 value="d7e85fb4fb36db15eb15134ffec8363fda8517ee944af1441815131029f960c8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.animation" name="animation-core-android" version="1.6.2">
+         <artifact name="animation-core-android-1.6.2.module">
+            <sha256 value="58b0948d1ea50b3df8ec1ba7f86355676b715c8f1bb75ac9548eed7709fedd27" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="animation-core-release.aar">
+            <sha256 value="d266ed93de86885d2d53017868d9d0e29238663d0f599ef1f094783a0fcbcd26" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.animation" name="animation-core-desktop" version="1.6.2">
+         <artifact name="animation-core-desktop-1.6.2.jar">
+            <sha256 value="791fbb5b90f1db2e128a134d5fb5dfe13b6aa4b184300f351b1466470bff78cc" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="animation-core-desktop-1.6.2.module">
+            <sha256 value="78843578abf9d0613ea37e4f1cc7f4c549513c57eaac3cc1eb1dc72af0f7e4e1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.animation" name="animation-desktop" version="1.6.2">
+         <artifact name="animation-desktop-1.6.2.jar">
+            <sha256 value="6eb162e32fb6b44cdc50cf3e4ad9906163e35f933cd54f0c03677ce240fe9d7e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="animation-desktop-1.6.2.module">
+            <sha256 value="7ff8993c1c012e1ac273f244b939f7d58d23af80eafc97ed644e3fce0fca94b9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.compiler" name="compiler" version="1.3.2">
          <artifact name="compiler-1.3.2.jar">
             <sha256 value="d19beb5fc48395e1730acad2f654daa49a17f6b44a2a45a2e23a0dec806a6931" origin="Generated by Gradle"/>
@@ -453,6 +569,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="7f8b7cdeb1c20b41b87ab280c128b9bbbee612065edc8562c2a8116c23ac8175" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.compiler" name="compiler" version="1.5.4">
+         <artifact name="compiler-1.5.4.jar">
+            <sha256 value="3dd9e0ab752ceae1562b6432f05bc4cae7ba1aebabdaf1323cdc7c366f5060db" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="compiler-1.5.4.module">
+            <sha256 value="3e7ef2b7bae510028131fc27e37a137d5ac77f86d07f4eaa1a61ddd6084f35d7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.foundation" name="foundation" version="1.3.1">
          <artifact name="foundation-1.3.1.module">
             <sha256 value="77b3ecfd07ce23783d0d4712f6ce3611a5fe54aabaefd9dc07c2dcd903a29160" origin="Generated by Gradle"/>
@@ -466,6 +590,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="84ba53af9fd289476e76b74216d43ee54006cc587c0fdbec51c8cdf717ab5e7f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.foundation" name="foundation" version="1.5.4">
+         <artifact name="foundation-1.5.4.module">
+            <sha256 value="43f6c19e718c26ec55e3fb65a165be65e6dad6fa4faa6a874c79b87d5cd675b6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="foundation-metadata-1.5.4.jar">
+            <sha256 value="84ba53af9fd289476e76b74216d43ee54006cc587c0fdbec51c8cdf717ab5e7f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.foundation" name="foundation" version="1.6.2">
+         <artifact name="foundation-1.6.2.module">
+            <sha256 value="a5c3acf77034297fccadb22af2dadf1f65fc4a4df4381f778ef4133ce241bfd6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.foundation" name="foundation-android" version="1.5.1">
          <artifact name="foundation-android-1.5.1.module">
             <sha256 value="ac397138d4c01416189eea4d519c6b8190eabe96558656fd0ec5f4af7a581708" origin="Generated by Gradle"/>
@@ -474,6 +611,30 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="52c2f1b26511981a7787e8df6810842728586995f3879e5a39ebcfdd4b631ae6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.foundation" name="foundation-android" version="1.5.4">
+         <artifact name="foundation-android-1.5.4.module">
+            <sha256 value="6cbd32794422a0a70eb6a51311728ac5dbf01483382954cb586af03003693183" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="foundation-release.aar">
+            <sha256 value="74075b7f5de082f77ce27b80b8787c59ac3ec86d0a66bf5754377211f2894072" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.foundation" name="foundation-android" version="1.6.2">
+         <artifact name="foundation-android-1.6.2.module">
+            <sha256 value="f1e3344f6a263ea1db81fb3ebdaa1776fd76a8bba12d06e97f610905fa5e80ce" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="foundation-release.aar">
+            <sha256 value="185f6b2cc5a777dc23a6164f5cea08cf9b9089e83754226441ab65b48b19f4dc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.foundation" name="foundation-desktop" version="1.6.2">
+         <artifact name="foundation-desktop-1.6.2.jar">
+            <sha256 value="1eda12bee5a9660ba703ebb3bb38a2ef57011fdc8f4cbcce0d0d7da02cd0a8d0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="foundation-desktop-1.6.2.module">
+            <sha256 value="a450f21a355c979768f1ca745a687f66cddbb69bddc91031f0207bbfe638f2b5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.foundation" name="foundation-layout" version="1.5.1">
          <artifact name="foundation-layout-1.5.1.module">
             <sha256 value="9efbdd7abb8bdf1625266a42a560168032d1c0df7046c35b205c2668a57271c7" origin="Generated by Gradle"/>
@@ -482,6 +643,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="f8cbd92d3585570dce2541aefef0d59b4c591ae225d98921058e484e9abf3e42" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.foundation" name="foundation-layout" version="1.5.4">
+         <artifact name="foundation-layout-1.5.4.module">
+            <sha256 value="4990fbc7e570059176153d1780bcd2d8d1abe6fc243e231eb18885188c9bf511" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="foundation-layout-metadata-1.5.4.jar">
+            <sha256 value="f8cbd92d3585570dce2541aefef0d59b4c591ae225d98921058e484e9abf3e42" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.foundation" name="foundation-layout" version="1.6.2">
+         <artifact name="foundation-layout-1.6.2.module">
+            <sha256 value="43f1ce3e2fc8a510b2aaf20439e9e67b416205a61993955cbae8ea618d732cfb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.foundation" name="foundation-layout-android" version="1.5.1">
          <artifact name="foundation-layout-android-1.5.1.module">
             <sha256 value="4622a385fd5ef110d1cc55e65cf45f3fc98ff63aa2f2c329a35750bf3be4cab0" origin="Generated by Gradle"/>
@@ -490,11 +664,45 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="c6c79159fbea908b1e852368c0ad8f61534d0095b566750ce63c2170410fbffb" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.foundation" name="foundation-layout-android" version="1.5.4">
+         <artifact name="foundation-layout-android-1.5.4.module">
+            <sha256 value="c420f6308890c9c4c9b41f7e1bf45bd2f1efa024f739335b2981a79cd67183db" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="foundation-layout-release.aar">
+            <sha256 value="63d6b3832034e6f187213970f42d82d0ce136d6c6061748f34f05cf2ba1d4364" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.foundation" name="foundation-layout-android" version="1.6.2">
+         <artifact name="foundation-layout-android-1.6.2.module">
+            <sha256 value="e6771358144019af6576f2b93479c7635a640a9a20388e815c571a24d8328fad" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="foundation-layout-release.aar">
+            <sha256 value="c17f97ecfa5df6020e5b3b6e89c5b617e0ea66cc22ee9a824303fa426a7bc52b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.foundation" name="foundation-layout-desktop" version="1.6.2">
+         <artifact name="foundation-layout-desktop-1.6.2.jar">
+            <sha256 value="8bb898232e0d9a8c56de51671769b73ea0a5ab526f9005de5deff34dddf5cbed" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="foundation-layout-desktop-1.6.2.module">
+            <sha256 value="a64b0b241ff2ad1c6b1bfffb8a66aa7c5d681f5bc4cc1d71f34b1a5b138f2c30" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.material" name="material" version="1.5.1">
          <artifact name="material-1.5.1.module">
             <sha256 value="e409e658869f7923b2f4a9e2963d6727a598489d73a276d1ad26bf082b235826" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.material" name="material" version="1.5.4">
+         <artifact name="material-1.5.4.module">
+            <sha256 value="8efb57b6aac3eed66afac34e61facc0795ea1e48ff7b5562cd509fe1496d5a41" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.material" name="material" version="1.6.2">
+         <artifact name="material-1.6.2.module">
+            <sha256 value="873eb66028dac3a9f2cf1a74ab3599cbe4fe6e76d8aae010e4ac63c6c7213bc7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.material" name="material-android" version="1.5.1">
          <artifact name="material-android-1.5.1.module">
             <sha256 value="04ca13bc09df6e513407c21abb214275d410a3c05c4ee31fabf71981b32c1c16" origin="Generated by Gradle"/>
@@ -503,6 +711,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="6309772a828c762568a47177dad8e2779aa992690500f6db0268e479c9b382aa" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.material" name="material-android" version="1.5.4">
+         <artifact name="material-android-1.5.4.module">
+            <sha256 value="665adc8c6f5ad82f9d929d66aee3561a8ac8e7b63eb8ae230782288096722545" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="material-release.aar">
+            <sha256 value="6ff3b19950724e44348fd122765efdb7f9f58e4c607ca0439f0e15048766b993" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.material" name="material-android" version="1.6.2">
+         <artifact name="material-android-1.6.2.module">
+            <sha256 value="6dd6c2ecf69c46162ea244474fb1c0a344462b198ac404a9202c47af9df416fe" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="material-release.aar">
+            <sha256 value="ccc622c03a793a5b0244b44469c939ac6286c78760a4d1af503fec9af5074d27" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.material" name="material-icons-core" version="1.5.1">
          <artifact name="material-icons-core-1.5.1.module">
             <sha256 value="bdeafaa32a4cee70b43cf368b570c11e2786cec5ed83a39b270fcfd2fc5873f6" origin="Generated by Gradle"/>
@@ -511,6 +735,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="f8cbd92d3585570dce2541aefef0d59b4c591ae225d98921058e484e9abf3e42" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.material" name="material-icons-core" version="1.5.4">
+         <artifact name="material-icons-core-1.5.4.module">
+            <sha256 value="54b24f5d9053d944289cb2769c895ab1ca53fd5c809476a744b44829fe40bc69" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="material-icons-core-metadata-1.5.4.jar">
+            <sha256 value="f8cbd92d3585570dce2541aefef0d59b4c591ae225d98921058e484e9abf3e42" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.material" name="material-icons-core" version="1.6.2">
+         <artifact name="material-icons-core-1.6.2.module">
+            <sha256 value="8e6968839e23734d5d0375445c23dd9cfe5d9a0fbedc6325ab08e3979f77b503" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.material" name="material-icons-core-android" version="1.5.1">
          <artifact name="material-icons-core-android-1.5.1.module">
             <sha256 value="2f51667a317486ccc524b4e2e957dde79d267bb86dc71ca5f8e812ca7593538d" origin="Generated by Gradle"/>
@@ -519,6 +756,30 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="74077c011b188ffb41c99c13ceefa82810f908dccb1450289465b8b746a25e25" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.material" name="material-icons-core-android" version="1.5.4">
+         <artifact name="material-icons-core-android-1.5.4.module">
+            <sha256 value="78fda3905f6a6c0c09a0c97cd61a62ab709d57ad10604a564b72f94ce5186772" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="material-icons-core-release.aar">
+            <sha256 value="fc2bc75dcd539599a773e3a86dbb3a9899fdc58b65e919751f4a2d77bebbd187" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.material" name="material-icons-core-android" version="1.6.2">
+         <artifact name="material-icons-core-android-1.6.2.module">
+            <sha256 value="9df684d497b70b0b0ebdb643540d5910e26c26a9084cba864947279a134d5aea" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="material-icons-core-release.aar">
+            <sha256 value="2440a3afd96b7af29965f23dc497844360ba1258c09e39cce3a258140a3209f2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.material" name="material-icons-core-desktop" version="1.6.2">
+         <artifact name="material-icons-core-desktop-1.6.2.jar">
+            <sha256 value="9ba0b869bf23bd64187c14a72303d604c287d189b095acf2ddd9e772d608f028" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="material-icons-core-desktop-1.6.2.module">
+            <sha256 value="224dbceb384a927f973ddbd0973e454cee06c7c0b4b63bb03ca76fc3965e0d99" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.material" name="material-ripple" version="1.5.1">
          <artifact name="material-ripple-1.5.1.module">
             <sha256 value="0a66c343a196e90c8c4f6338fc93c574090d1e56d88a2bd05c426b196bdd355e" origin="Generated by Gradle"/>
@@ -527,6 +788,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="aa1bc0c3320609a2a87a689584e21897b5d7dc971b13b656302ba9caa5b2b5df" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.material" name="material-ripple" version="1.5.4">
+         <artifact name="material-ripple-1.5.4.module">
+            <sha256 value="44c7fe364e78e194a462858605d1544a88958ece8de4690f7a5cfa415c0ba1b5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="material-ripple-metadata-1.5.4.jar">
+            <sha256 value="aa1bc0c3320609a2a87a689584e21897b5d7dc971b13b656302ba9caa5b2b5df" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.material" name="material-ripple" version="1.6.2">
+         <artifact name="material-ripple-1.6.2.module">
+            <sha256 value="cf3f1909c7d91168fca47bf90ac1546430b6dcc2fb3046dcec9f7a7d23eb2952" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.material" name="material-ripple-android" version="1.5.1">
          <artifact name="material-ripple-android-1.5.1.module">
             <sha256 value="0ec0d0dd2cab195b1186c8e4df2a61acb2f9f476d84f40823c904977bf6b0e88" origin="Generated by Gradle"/>
@@ -535,6 +809,30 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="c881466a69a7d6806736032dec206c9f44661119374afa87ce579c873afcec22" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.material" name="material-ripple-android" version="1.5.4">
+         <artifact name="material-ripple-android-1.5.4.module">
+            <sha256 value="59484de2230bebfdeab62c066fffc7ff46ef3df90e16a8e7c8d85f5c0eb5f319" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="material-ripple-release.aar">
+            <sha256 value="8a6c8b4bfc8cae9dc7e79653a5de3a482cb9b96d290f6bbdc6d3002b91ed48cb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.material" name="material-ripple-android" version="1.6.2">
+         <artifact name="material-ripple-android-1.6.2.module">
+            <sha256 value="6869707a87beec8e0d15a305eaed7e843c13098807fe2d9cb79cd1d97dcf2f37" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="material-ripple-release.aar">
+            <sha256 value="bf79ee469b54fdf07a594206895791a3d2feafc8d0d1d968482b4c917aee7e4e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.material" name="material-ripple-desktop" version="1.6.2">
+         <artifact name="material-ripple-desktop-1.6.2.jar">
+            <sha256 value="cd56fbe60dfd619b2990194fe69c711562eae151b7c3e92802878d25088873d0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="material-ripple-desktop-1.6.2.module">
+            <sha256 value="e59f78b136a7eda27cfcccba4c0b2db248bfc35064682526668c5cf41bb62760" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.material3" name="material3" version="1.1.2">
          <artifact name="material3-1.1.2.aar">
             <sha256 value="fd9f8fe91d6661afcaf0e9c9cef30b5a196b4def5b28a370f13f2c259c26e482" origin="Generated by Gradle"/>
@@ -543,6 +841,27 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="c99a42a1546e37872d9a3843b4f9738f66aa93c08a66c54c84f775b3da3e5d97" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.material3" name="material3" version="1.2.0">
+         <artifact name="material3-1.2.0.module">
+            <sha256 value="911db8ed8cd7175beff3ea4f69aab68b5ee6c564959a8a27244c27dbd61d1deb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.material3" name="material3-android" version="1.2.0">
+         <artifact name="material3-android-1.2.0.module">
+            <sha256 value="c2e180d82471b2ff0b3cc0a0ec9f0eed13467ca609f046c9daca8747aa212840" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="material3-release.aar">
+            <sha256 value="10facde8f66f91d61a48c8dfece3b493d630822f311cd20643a23416e4f1ea0c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.material3" name="material3-desktop" version="1.2.0">
+         <artifact name="material3-desktop-1.2.0.jar">
+            <sha256 value="a94d9a46ce014f0166f4875cd30c55bd6d54733266ce281e0e1ed3028bf8ec45" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="material3-desktop-1.2.0.module">
+            <sha256 value="cb5a777ab08f3d0081b12e9f3044e1bcb476d0e09e77d5aae61ea78eef0b90fc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.runtime" name="runtime" version="1.0.1">
          <artifact name="runtime-1.0.1.module">
             <sha256 value="2543a8c7edc16bde91f140286b4fd3773d7204a283a4ec99f6e5e286aa92c0c3" origin="Generated by Gradle"/>
@@ -564,6 +883,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="1dd30ce8cca076140ed92ee748c1d35a4ac46b9da435406e353208a07267996d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.runtime" name="runtime" version="1.5.4">
+         <artifact name="runtime-1.5.4.module">
+            <sha256 value="3ddd8b5ef83800f6289b6f0c96c4fb7a640209b42c45e60e18bc8fd17bd3e32f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="runtime-metadata-1.5.4.jar">
+            <sha256 value="1dd30ce8cca076140ed92ee748c1d35a4ac46b9da435406e353208a07267996d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.runtime" name="runtime" version="1.6.2">
+         <artifact name="runtime-1.6.2.module">
+            <sha256 value="f201d15cc15e7af4720940328bbdc75aa85d9f25b1a97c2eef7b39767f60e831" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.runtime" name="runtime-android" version="1.5.1">
          <artifact name="runtime-android-1.5.1.module">
             <sha256 value="63d09bac1fe7e3db9a399416e4788dbe0a6b5f79c60b4aa30fec93425ffba9d8" origin="Generated by Gradle"/>
@@ -572,6 +904,30 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="4505ac028feeb5157ff7ee41e3d1c9bbc1828dc3ee11b3dd32f73a834eaaa205" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.runtime" name="runtime-android" version="1.5.4">
+         <artifact name="runtime-android-1.5.4.module">
+            <sha256 value="24f1001cae44e3d7a33611dd7a1d8be85c724c161fcc27525e3a1a72b850fe44" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="runtime-release.aar">
+            <sha256 value="a7df39bcc1327fa5a7ea5dca2976e11b87feea4ca89d1968cbbb6914f983cd4c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.runtime" name="runtime-android" version="1.6.2">
+         <artifact name="runtime-android-1.6.2.module">
+            <sha256 value="c1fe49667f293b6edba6e93b7465ced8b3f518646ff25e0f7daf089efb4501f7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="runtime-release.aar">
+            <sha256 value="0363fcf31f147a7d07925818375fc47210676e428c51d168d6bbb4c4f99b0e1a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.runtime" name="runtime-desktop" version="1.6.2">
+         <artifact name="runtime-desktop-1.6.2.jar">
+            <sha256 value="5bb2381d819e6b79478ed086ef8fa1be595b16c253ae9774691a4575e4bbcc4a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="runtime-desktop-1.6.2.module">
+            <sha256 value="3cfc02c617e773d2449b74634dd1c66c14d1ebac3aca4c1dee2a92b59f876d06" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.runtime" name="runtime-livedata" version="1.4.2">
          <artifact name="runtime-livedata-1.4.2.aar">
             <sha256 value="caa5f34b824f0df6fbf55cc2a55ffff371d365dbc8383a5faa9f2b57b63276cb" origin="Generated by Gradle"/>
@@ -588,6 +944,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="a2f1d842460c8468eb317604d2f5445b0df128f36f11e67ef37050e69632b36c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.runtime" name="runtime-livedata" version="1.5.4">
+         <artifact name="runtime-livedata-1.5.4.aar">
+            <sha256 value="e4968f0ef65d26a948579b84f539a8cd6bb35276e0be406578654a3f7afa5fd1" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="runtime-livedata-1.5.4.module">
+            <sha256 value="eac600dec9b802388ccf1d22dc32e2496af99f02fc1ab47c2de3fbf2829226b9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.runtime" name="runtime-livedata" version="1.6.2">
+         <artifact name="runtime-livedata-1.6.2.aar">
+            <sha256 value="b58992a123e984aaf6e8e314360b94c57de66fbe85017bdcc3419f3e8eff4011" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="runtime-livedata-1.6.2.module">
+            <sha256 value="6f80e019de1986716a805403775e91f92bb6a0142211ff7cd0ba579135c9e110" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.runtime" name="runtime-rxjava3" version="1.4.2">
          <artifact name="runtime-rxjava3-1.4.2.aar">
             <sha256 value="685877e672f95cf7368ada6e3af07eee107529b6962bf2272b4b1c8d22da7200" origin="Generated by Gradle"/>
@@ -604,6 +976,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="e7485884b1494731a8911ab565c933d550b0b84a54727dd9b1285c20cb04c372" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.runtime" name="runtime-rxjava3" version="1.5.4">
+         <artifact name="runtime-rxjava3-1.5.4.aar">
+            <sha256 value="a8db0dc48c0ee0e7db0597c501f3d4d75489852ed55f107a55c7c9e1a5056b1e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="runtime-rxjava3-1.5.4.module">
+            <sha256 value="b1770a31b297982f21a01d1f2c243c7a1872cf4eccec7b314aa5d4a00fad9ed5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.runtime" name="runtime-rxjava3" version="1.6.2">
+         <artifact name="runtime-rxjava3-1.6.2.aar">
+            <sha256 value="2f326425ffe251bc6b60e764cd890e78cc0eae82012f87f9dfd2237c19d3599f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="runtime-rxjava3-1.6.2.module">
+            <sha256 value="3108e86599972b2ecb8a24c263f2426dbb577e24c9f449713f171a1749128bc5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.runtime" name="runtime-saveable" version="1.0.1">
          <artifact name="runtime-saveable-1.0.1.module">
             <sha256 value="c0d6f142542d8d74f65481ef6526d2be265f01f812a112948fcde87a458f4fb6" origin="Generated by Gradle"/>
@@ -625,6 +1013,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="473560f012448c5ffda939c3b43dd806428d0dfa77b53fe80018942f4555eb4f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.runtime" name="runtime-saveable" version="1.5.4">
+         <artifact name="runtime-saveable-1.5.4.module">
+            <sha256 value="1049e58e6651aef3eb98ce566a0c83e506f0c4d02d9080f1cff6b007fbdafada" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="runtime-saveable-metadata-1.5.4.jar">
+            <sha256 value="473560f012448c5ffda939c3b43dd806428d0dfa77b53fe80018942f4555eb4f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.runtime" name="runtime-saveable" version="1.6.2">
+         <artifact name="runtime-saveable-1.6.2.module">
+            <sha256 value="616baf3a8570bdb15febe1d9921656fb2bbabb25fa5e8b89fd349a80b415d617" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.runtime" name="runtime-saveable-android" version="1.5.1">
          <artifact name="runtime-saveable-android-1.5.1.module">
             <sha256 value="173be33938c899999629cd3ab49502fbd8e807454381297bdc0da50bb23afc29" origin="Generated by Gradle"/>
@@ -633,6 +1034,30 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="ff6a69ce79b501c088b2d8a0e98eb8624d68809b1410dfc8a3dbbb12dbf06f79" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.runtime" name="runtime-saveable-android" version="1.5.4">
+         <artifact name="runtime-saveable-android-1.5.4.module">
+            <sha256 value="dc4a03ace001e2d46e1978128de07cf0647e4910e3c0232a63a5ac5907aaaf6b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="runtime-saveable-release.aar">
+            <sha256 value="5e834c12d7d226a1057e6e70b341cc27414afa2e9d0007660b9dffec6b7673ed" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.runtime" name="runtime-saveable-android" version="1.6.2">
+         <artifact name="runtime-saveable-android-1.6.2.module">
+            <sha256 value="9f4d6d7da7fbed7b4213e9285d40e7fdb0e964ffbb6246240c2e2934b974598b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="runtime-saveable-release.aar">
+            <sha256 value="2c32aa4864f373996bc035e8efce7b337591b4b42c4b6a0079519f00fe487fe6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.runtime" name="runtime-saveable-desktop" version="1.6.2">
+         <artifact name="runtime-saveable-desktop-1.6.2.jar">
+            <sha256 value="55064d4bd481d67a2840e52c594fc9cbbbf15c9a48f224199bbda005da705df4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="runtime-saveable-desktop-1.6.2.module">
+            <sha256 value="79c1cb4cd3998d08f145ed2424013c0c69ddf22112b8011e764664f5b20822e5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui" version="1.0.1">
          <artifact name="ui-1.0.1.aar">
             <sha256 value="1943daa4a3412861b9a2bdc1a7c8c2ff05d9b8191c1d3e56ebb223d2eb4a8526" origin="Generated by Gradle"/>
@@ -649,6 +1074,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="16047bacd8b5409b6b2c57a4761789dff9e6e93e6d35921846c364fcf3dfa1de" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui" version="1.5.4">
+         <artifact name="ui-1.5.4.module">
+            <sha256 value="68b8c22b84c5f96f5af4cc78d39cd8af53d6266d3fa545e626049b38aecca41d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-metadata-1.5.4.jar">
+            <sha256 value="16047bacd8b5409b6b2c57a4761789dff9e6e93e6d35921846c364fcf3dfa1de" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui" version="1.6.2">
+         <artifact name="ui-1.6.2.module">
+            <sha256 value="af19eba05e4b1e56b1e61373c823a548782dc7bfadbc04fb43f13157214a5a28" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-android" version="1.5.1">
          <artifact name="ui-android-1.5.1.module">
             <sha256 value="a682e72c4f1a27387eaaf269679e62dc35e7398aae48fe099cf20b4f6cc1c04e" origin="Generated by Gradle"/>
@@ -657,6 +1095,30 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="f55e18840751493f6af3b78a35b5071c8a8527d28b0a966e371ebceb86fd7748" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-android" version="1.5.4">
+         <artifact name="ui-android-1.5.4.module">
+            <sha256 value="069f99f6e12e860b12865e0da2709da23b84da3851d2417b19a4baff5fef1212" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-release.aar">
+            <sha256 value="13f39a8f0bfaf621ab57f77ad022d482b5f2b14803a5623cc4fdca2ef905ca26" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-android" version="1.6.2">
+         <artifact name="ui-android-1.6.2.module">
+            <sha256 value="56694bbe7c44c15bdc2bdece7e6441becc7bab708877b4eca11c845b95471755" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-release.aar">
+            <sha256 value="9cd47d5634c08497920151d687942d11e4fe2a365255f089612d1cff724cb67a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-desktop" version="1.6.2">
+         <artifact name="ui-desktop-1.6.2.jar">
+            <sha256 value="45c06c1d10faad5fbe32fbd89e3d084281ccb8ae3d1318392410782e741ab948" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-desktop-1.6.2.module">
+            <sha256 value="0c544e4a8b68d8a0a1188525a5e6d4fcd702f152c51ad4bf9f51176075ff3425" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-geometry" version="1.0.1">
          <artifact name="ui-geometry-1.0.1.aar">
             <sha256 value="04dcea79de0af8347f4517bec20578d4240ae5ee40191020ca07d7a38e640033" origin="Generated by Gradle"/>
@@ -673,6 +1135,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="1dd30ce8cca076140ed92ee748c1d35a4ac46b9da435406e353208a07267996d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-geometry" version="1.5.4">
+         <artifact name="ui-geometry-1.5.4.module">
+            <sha256 value="087e58658f2a3eb9fb9fa3ff3ff9cd4d9e62ae73e41457a6cf681cbd4cabec13" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-geometry-metadata-1.5.4.jar">
+            <sha256 value="1dd30ce8cca076140ed92ee748c1d35a4ac46b9da435406e353208a07267996d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-geometry" version="1.6.2">
+         <artifact name="ui-geometry-1.6.2.module">
+            <sha256 value="13e4ecec3172d7751115804d7121bd895357a33f8703e690b33677f062b13fbc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-geometry-android" version="1.5.1">
          <artifact name="ui-geometry-android-1.5.1.module">
             <sha256 value="1550bbf0c36e52e60ec9fbb896221115213ccd68296cacdfe62a4d3ea951b0f5" origin="Generated by Gradle"/>
@@ -681,6 +1156,30 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="b163398164ab1528a44b632e5de7eaac24fd60f35cab9472dbcac4a9e11fcf3b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-geometry-android" version="1.5.4">
+         <artifact name="ui-geometry-android-1.5.4.module">
+            <sha256 value="9202d553cb8acbee84c98cacfb67e5791a1bc6d936ee99809eaee4a3148712a5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-geometry-release.aar">
+            <sha256 value="2ecd05d0c033325304834a361d3e5f2c01395bfc5da2402641cfcee4981a01a9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-geometry-android" version="1.6.2">
+         <artifact name="ui-geometry-android-1.6.2.module">
+            <sha256 value="13edbe112aa62e29223d4583f4cfe5aef1a0b939de370c2a48cf65a594aae312" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-geometry-release.aar">
+            <sha256 value="74ed23d23fe42cc75a5619575c188ddbe552272d8308c58a864b6e75d8063bdb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-geometry-desktop" version="1.6.2">
+         <artifact name="ui-geometry-desktop-1.6.2.jar">
+            <sha256 value="c5ca7579c17710fac77ed93137411531298cca559c8514c9076bc0f2683da350" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-geometry-desktop-1.6.2.module">
+            <sha256 value="eba16975cac4719f4af6945c61d7cd84ad8072a667c49a0193d887bca3a838de" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-graphics" version="1.0.1">
          <artifact name="ui-graphics-1.0.1.aar">
             <sha256 value="6b7f5d0c944483ea390b3d6da8438e7a69e0cfe310bd16c3c5e78ac0015b1663" origin="Generated by Gradle"/>
@@ -697,6 +1196,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="1f0880be97e83fd8e86ce0374937cd6947d3380a2df5ff4bb7cac47587dd601a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-graphics" version="1.5.4">
+         <artifact name="ui-graphics-1.5.4.module">
+            <sha256 value="ab3694601baea2cd9b1f31203313cca9b6cdff8ef5539e4427ba3136548a3fe0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-graphics-metadata-1.5.4.jar">
+            <sha256 value="1f0880be97e83fd8e86ce0374937cd6947d3380a2df5ff4bb7cac47587dd601a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-graphics" version="1.6.2">
+         <artifact name="ui-graphics-1.6.2.module">
+            <sha256 value="a54e070d593f2f41c362e800c79ce5664ad795b7e0fb7e9c4c2f25ff234bfa12" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-graphics-android" version="1.5.1">
          <artifact name="ui-graphics-android-1.5.1.module">
             <sha256 value="6334183295fc3bf67230dad0b7fee097429ff61df500ee62fdaf22e82eaa11b7" origin="Generated by Gradle"/>
@@ -705,6 +1217,30 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="f4dee707fccd1e4e585aae21f0822edba28b98aa8ca2cec4fcbe84bd414c6850" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-graphics-android" version="1.5.4">
+         <artifact name="ui-graphics-android-1.5.4.module">
+            <sha256 value="496345affdf503d8746a2919b77b9e65a79ab40108239a934cbb338cfd2aa1b4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-graphics-release.aar">
+            <sha256 value="8f7811d34f178e2de66399e8b0fd747db3502a9b844a4e2d946a711e75655cbc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-graphics-android" version="1.6.2">
+         <artifact name="ui-graphics-android-1.6.2.module">
+            <sha256 value="bd3787bfb69eae61dafa93eb689e7eb68bb8154be7ca23bac37f36bfe9a22efc" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-graphics-release.aar">
+            <sha256 value="5a2b95861592e9f698d7ce9c6acb1eca008401802f75567efd609b628840970a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-graphics-desktop" version="1.6.2">
+         <artifact name="ui-graphics-desktop-1.6.2.jar">
+            <sha256 value="7d6f9ffc9804cdec9c270abe37c06dbb847fe42b8d316caa73b8135752b7dd66" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-graphics-desktop-1.6.2.module">
+            <sha256 value="0e6e228fb9ca8304e2b537b01d5a3968f1740064359d16805a155f7bdc9f8e62" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-test-manifest" version="1.5.1">
          <artifact name="ui-test-manifest-1.5.1.aar">
             <sha256 value="449a954b2b9908c0fb6faeada91e54749ce2cbb794e4bb0c03d5d27ae1115281" origin="Generated by Gradle"/>
@@ -713,6 +1249,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="a5594d78750c8edd4e92b11d100212598a6fa22c22258df2f79dd7f14c4b7cc5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-test-manifest" version="1.5.4">
+         <artifact name="ui-test-manifest-1.5.4.aar">
+            <sha256 value="9878ca49039b7f9d77c78cf736ec2908bc73e39aaa18cc1de0ec56ed64069b2f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-test-manifest-1.5.4.module">
+            <sha256 value="0dd06bcd2ef2985c6fddcf41536b25d3dc5c921b23b530e0f4cbb5ff1afdd0e4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-text" version="1.0.0">
          <artifact name="ui-text-1.0.0.module">
             <sha256 value="a85fde2fe3c50e9e956daa449f27e7a10c13fe4a1cafe7f41b478ed9ecb6166b" origin="Generated by Gradle"/>
@@ -734,6 +1278,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="56968bd3be7d2bac45fd75252ac9b5f390601b44243d2a410926e6c0cd4f151f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-text" version="1.5.4">
+         <artifact name="ui-text-1.5.4.module">
+            <sha256 value="67e36ee1e7d6f4ce54a6e71e2e42773412d5d5baf878c5ff891e8f6309e0c3c0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-text-metadata-1.5.4.jar">
+            <sha256 value="56968bd3be7d2bac45fd75252ac9b5f390601b44243d2a410926e6c0cd4f151f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-text" version="1.6.2">
+         <artifact name="ui-text-1.6.2.module">
+            <sha256 value="1e16728e46acba7422c668bb43c65103d11a3f03d338e4bab8148123ddf30c13" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-text-android" version="1.5.1">
          <artifact name="ui-text-android-1.5.1.module">
             <sha256 value="b6e932a918a9344d8f7e2f086a6b962d031d733678d6bbf6f6be4bd4a15f5259" origin="Generated by Gradle"/>
@@ -742,6 +1299,30 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="04993fe977bbfc727f5a298d4f79eb12a47a4b38b5d43291c4aa329f63c69cc6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-text-android" version="1.5.4">
+         <artifact name="ui-text-android-1.5.4.module">
+            <sha256 value="355ee7a0c0252905335fb433f18f33665b2e7cf92ddd40738ac09abdee39a3ed" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-text-release.aar">
+            <sha256 value="1633dd54142169a5066580f9a580d2660c790fc1b68c2e533c36a9c0f8b10abb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-text-android" version="1.6.2">
+         <artifact name="ui-text-android-1.6.2.module">
+            <sha256 value="f292c95185b433eb4b5a15a561002ab078ce835aa341ddbc625c2c9ddef0df0c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-text-release.aar">
+            <sha256 value="398cc1df7c583e48bae632b94573c509a134a8184af1ff4e7bc2e457e13fe513" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-text-desktop" version="1.6.2">
+         <artifact name="ui-text-desktop-1.6.2.jar">
+            <sha256 value="098ae9f6453b9a1b1fa5f77b8db2f0d0b372fe83ebcab5e5975f737946cc8ea1" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-text-desktop-1.6.2.module">
+            <sha256 value="f79fa0346d1a12aeacf9c854330b92c122b95fc28b59d1f9a69db1dd59801d11" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-tooling" version="1.5.1">
          <artifact name="ui-tooling-1.5.1.module">
             <sha256 value="c217d8b53be36c3562f01bd2474c0244d1924ba6130f6bc5abf42ab277309087" origin="Generated by Gradle"/>
@@ -750,6 +1331,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="5180afdae77bb0f37b309c31a457641919ebb84012dde2abe93951fe070de3d7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-tooling" version="1.5.4">
+         <artifact name="ui-tooling-1.5.4.module">
+            <sha256 value="cb1a47a0ee360ef4853d0ce78ef1d047d1e982af41c4b2c7c01d700339d4079a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-tooling-metadata-1.5.4.jar">
+            <sha256 value="5180afdae77bb0f37b309c31a457641919ebb84012dde2abe93951fe070de3d7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-tooling" version="1.6.2">
+         <artifact name="ui-tooling-1.6.2.module">
+            <sha256 value="0af4130b88c1acf0cd7a4bab8e616d02aa8c786caa44ad3fdf676a86f1b27654" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-tooling-android" version="1.5.1">
          <artifact name="ui-tooling-android-1.5.1.module">
             <sha256 value="f6559c93178b465f2fb8250f1cdf9dbf5f4845957f87b72a84a62d31b65f1ab3" origin="Generated by Gradle"/>
@@ -758,6 +1352,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="9b9c791b84bf3d15d0a3f275dc4be2591e79322a9a7062daac4df211caab0702" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-tooling-android" version="1.5.4">
+         <artifact name="ui-tooling-android-1.5.4.module">
+            <sha256 value="0e5c534927d0b0254a4a3dfc388d3065d1fb62d01153d0f4da93863278ef0a16" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-tooling-release.aar">
+            <sha256 value="d7459ec30b27d1bd3e922fc69db1e27206a0721d825df44ffc7ef15842124264" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-tooling-android" version="1.6.2">
+         <artifact name="ui-tooling-android-1.6.2.module">
+            <sha256 value="6741e075c9ad6b02439bc25b362055d9859da51c38fcdfacb0e5def5435a3862" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-tooling-release.aar">
+            <sha256 value="dfef530da1a4f809fb58471e2d0f39801ee2f5426a992adf164e687ffc43de1e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-tooling-data" version="1.5.1">
          <artifact name="ui-tooling-data-1.5.1.module">
             <sha256 value="7a6133f6aed027d45a8fd51d8f90c971b0f97f5893a5d720d994a903dab86d82" origin="Generated by Gradle"/>
@@ -766,6 +1376,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="d13169117f6de9a39383c21087cc3a2a2c68f83b5d3d75f5e35bc91996662d66" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-tooling-data" version="1.5.4">
+         <artifact name="ui-tooling-data-1.5.4.module">
+            <sha256 value="a63bbdd7a16052710a91f886e77d582cae50dc8b336ec560989646d19933ab47" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-tooling-data-metadata-1.5.4.jar">
+            <sha256 value="d13169117f6de9a39383c21087cc3a2a2c68f83b5d3d75f5e35bc91996662d66" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-tooling-data" version="1.6.2">
+         <artifact name="ui-tooling-data-1.6.2.module">
+            <sha256 value="e28c62dc2ee0d24f80246df240edcafd607bbac71af5953bb0a814692a1e00c5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-tooling-data-android" version="1.5.1">
          <artifact name="ui-tooling-data-android-1.5.1.module">
             <sha256 value="41a1a7e6603302598e1c28535ce7fdf7d66218057f4d8f1ddadd4b7a1bd7e444" origin="Generated by Gradle"/>
@@ -774,6 +1397,38 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="561ebe4a2c95d18eda78720f83d0ce94ce2e7d11cd7979419f18169aa9c29554" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-tooling-data-android" version="1.5.4">
+         <artifact name="ui-tooling-data-android-1.5.4.module">
+            <sha256 value="a1e01b01676ad39a1d0f203ed001df49e8f405d811135ad020f9f9daae57e2ed" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-tooling-data-release.aar">
+            <sha256 value="d8185c38707f10d094458ab5b8026de93916d925876b32ac53278b1113f66bf1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-tooling-data-android" version="1.6.2">
+         <artifact name="ui-tooling-data-android-1.6.2.module">
+            <sha256 value="521e06044f639b015125383d23121caa6adfc37d5607a00b848cd8b4553e9829" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-tooling-data-release.aar">
+            <sha256 value="6a04bac6a0636f3838ac30abf6bd509f4318c934e5ff796830a0c46b2d02e8dd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-tooling-data-desktop" version="1.6.2">
+         <artifact name="ui-tooling-data-desktop-1.6.2.jar">
+            <sha256 value="e217a177e64d450f68c43964d221afe92bee3b096bb02e9a9644bf23c210aae7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-tooling-data-desktop-1.6.2.module">
+            <sha256 value="f9b6072ea7378c710e7f9bd488c5b063774262df7cbc1c1d8730bead15303c22" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-tooling-desktop" version="1.6.2">
+         <artifact name="ui-tooling-desktop-1.6.2.jar">
+            <sha256 value="b1fafbd90b0a84b22082e8cebd7761d52b1ce8db6c6cf28fcc76204ee1cfb909" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-tooling-desktop-1.6.2.module">
+            <sha256 value="bd95a0db3fbb9a66b91793dfafebc83f6f976a3d970905a15ddde9783c2fd784" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-tooling-preview" version="1.5.1">
          <artifact name="ui-tooling-preview-1.5.1.module">
             <sha256 value="7c0fd4f5a53604092325e58eb735002d16f94e6c646ba26b9e5e7496f444c7b9" origin="Generated by Gradle"/>
@@ -782,6 +1437,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="473560f012448c5ffda939c3b43dd806428d0dfa77b53fe80018942f4555eb4f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-tooling-preview" version="1.5.4">
+         <artifact name="ui-tooling-preview-1.5.4.module">
+            <sha256 value="6ad6c3a8d6897061ae965f18f67aaa5f65e39afc872585d425b71fa0eb080700" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-tooling-preview-metadata-1.5.4.jar">
+            <sha256 value="473560f012448c5ffda939c3b43dd806428d0dfa77b53fe80018942f4555eb4f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-tooling-preview" version="1.6.2">
+         <artifact name="ui-tooling-preview-1.6.2.module">
+            <sha256 value="27a950500f7ad19d930c2d4efb1ffd2768f9e1febc4b0ba6cb71900aefabea2c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-tooling-preview-android" version="1.5.1">
          <artifact name="ui-tooling-preview-android-1.5.1.module">
             <sha256 value="f5c9fc4eb46a414f55f1e6ba39ca0af84a6399b7ac4f8ff77efcf52cbc2da38e" origin="Generated by Gradle"/>
@@ -790,6 +1458,30 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="b2c21088fdfc6c2936a6061a37f4665f75eca78fee8b3cd5358cfc9cd235a3da" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-tooling-preview-android" version="1.5.4">
+         <artifact name="ui-tooling-preview-android-1.5.4.module">
+            <sha256 value="70b7eaea541fe718e17533ea3284a6f4ff2b21ec0e5de6b75d0d009861973a19" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-tooling-preview-release.aar">
+            <sha256 value="1263288480372dbfb54d63234e9cabfa7f94b13a5ba108d06c4aa1976dbbaade" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-tooling-preview-android" version="1.6.2">
+         <artifact name="ui-tooling-preview-android-1.6.2.module">
+            <sha256 value="bb08b9adb59b2f4bd8beea04778500d5ea6408c5166f8ff70a81ed51222ad1a7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-tooling-preview-release.aar">
+            <sha256 value="ee041736f6830ac77b1ded08071d679b45306325f6dd4c5426bbea31fddca3c6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-tooling-preview-desktop" version="1.6.2">
+         <artifact name="ui-tooling-preview-desktop-1.6.2.jar">
+            <sha256 value="1b531c5ec345d60ff880895988e065c39b4d42c3e2cf57f811c2daa7fb2c7322" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-tooling-preview-desktop-1.6.2.module">
+            <sha256 value="e9d2f5a1edaed9a048d0a7c83ed34c7c3b44c700b3fe1bfa5e64fe7df3cf2617" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-unit" version="1.0.1">
          <artifact name="ui-unit-1.0.1.aar">
             <sha256 value="75b13e2a15da8a31acf75d81c4277ff2820b1bf58291b4688ac55200cdc18072" origin="Generated by Gradle"/>
@@ -806,6 +1498,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="a122255bc8f3d7fe1ad1aa4d971508ae552a0c60d05b9c82400f05e579984df1" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-unit" version="1.5.4">
+         <artifact name="ui-unit-1.5.4.module">
+            <sha256 value="263acb76a140f487a7ccbd536f9a6a6fc85f0eec421af203d8d81841a9f705f3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-unit-metadata-1.5.4.jar">
+            <sha256 value="a122255bc8f3d7fe1ad1aa4d971508ae552a0c60d05b9c82400f05e579984df1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-unit" version="1.6.2">
+         <artifact name="ui-unit-1.6.2.module">
+            <sha256 value="cde1d8e6671e4f1a14f8c737a63dbdd91fe0232e240f145b3c29c297bdf76dd9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-unit-android" version="1.5.1">
          <artifact name="ui-unit-android-1.5.1.module">
             <sha256 value="59b1f7938cd9ef40fa13550be3798e6466849460386d2b00a9489442690e544b" origin="Generated by Gradle"/>
@@ -814,6 +1519,30 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="9fbfdfde2c091aeb7eb3be425bb3a304bd1e88f2c2c7dc6ae04488461da89f11" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-unit-android" version="1.5.4">
+         <artifact name="ui-unit-android-1.5.4.module">
+            <sha256 value="bc6bf3a0c7a373a55446cef6ba917f40d2e1d6386bb94ee025058492401cd126" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-unit-release.aar">
+            <sha256 value="ac753ab129b70bab79cfea691ed6bc8ec20fde278db7269b94f50227a712302e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-unit-android" version="1.6.2">
+         <artifact name="ui-unit-android-1.6.2.module">
+            <sha256 value="47bb7662d40774f8aa095b3e73021e1be126a8b9b458c028f29e0c710012a9ec" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-unit-release.aar">
+            <sha256 value="4294337fae5c9eb06b75439093f4d39a3c4a4e3f708c15ee2535790a070d5a64" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-unit-desktop" version="1.6.2">
+         <artifact name="ui-unit-desktop-1.6.2.jar">
+            <sha256 value="eed875aeb6593f2c2548184957f612a3c971c61f4f26ed23893e74dffe4cccc0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-unit-desktop-1.6.2.module">
+            <sha256 value="376c2a185177a53cd28c9f90f1feeb16e8315bb695ded62502166ad5cb6dfe6c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-util" version="1.0.0">
          <artifact name="ui-util-1.0.0.module">
             <sha256 value="a09871728e5a9d050d2fdcb99a875ef2120dc6deea808f5a6d443dd887e081ca" origin="Generated by Gradle"/>
@@ -824,6 +1553,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="54aacd8062efccea99fd702a2be23551207e3723abdad13e02b14b92690196f7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-util" version="1.5.4">
+         <artifact name="ui-util-1.5.4.module">
+            <sha256 value="18b8add303065a8c078fc908584a1a9fe9887df49025e15eb64ee6251d306e4e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-util" version="1.6.2">
+         <artifact name="ui-util-1.6.2.module">
+            <sha256 value="d9c2cb14d2882994f4451da34c1efe81568278ffb5bd9dd37ec7c75f8a2be934" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.ui" name="ui-util-android" version="1.5.1">
          <artifact name="ui-util-android-1.5.1.module">
             <sha256 value="d6574ccd75f47ac2b2733095ab06c683ec23eb0cbe2e842c9a9bc3a62a825a6c" origin="Generated by Gradle"/>
@@ -832,6 +1571,30 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="31df2c7c9658d0adee8d6ae4f3509d8382efe3eedce5c0fd50c415ccb739bbbd" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.ui" name="ui-util-android" version="1.5.4">
+         <artifact name="ui-util-android-1.5.4.module">
+            <sha256 value="89067dcc073eb4f180453d7323d65849bcf54439a5207369a43439b4ef0e5682" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-util-release.aar">
+            <sha256 value="02cd59abbccf95fef2825ba4c0871255380c6f5ba3eaea85b1892de24b4e6b50" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-util-android" version="1.6.2">
+         <artifact name="ui-util-android-1.6.2.module">
+            <sha256 value="86e955e15e2ac19f886bca2be157f04bdf60b716211f6a376823e02a6a0f7944" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-util-release.aar">
+            <sha256 value="05eb30cd374cdf91a69b2a1ab5a1ee41cae9f2576918adc5e0e20f6c42f4142e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.ui" name="ui-util-desktop" version="1.6.2">
+         <artifact name="ui-util-desktop-1.6.2.jar">
+            <sha256 value="0cb9f941d92bb60e2c8deaac1ec8312d9484dce01eacec33003675525ae5915c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ui-util-desktop-1.6.2.module">
+            <sha256 value="0c29231f79c66100409d3202ef8fe1e942feda555ae2be8ff91710491b14c1ca" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.concurrent" name="concurrent-futures" version="1.0.0">
          <artifact name="concurrent-futures-1.0.0.jar">
             <sha256 value="5595a40e278a7b39fa78a09490e3d7f3faa95c7b01447148bd38b5ade0605c35" origin="Generated by Gradle"/>
@@ -974,6 +1737,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="9fa21e2030273ee3cb8c4701c341af8cf9359791a3b45b2bc0be07870c03b1c8" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.databinding" name="databinding-common" version="8.4.0">
+         <artifact name="databinding-common-8.4.0.jar">
+            <sha256 value="66cab82639dac0f6c2433464c093b074d608c4bb887ec38a9b8bc4ac98126732" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.databinding" name="databinding-common" version="8.4.1">
+         <artifact name="databinding-common-8.4.1.jar">
+            <sha256 value="66cab82639dac0f6c2433464c093b074d608c4bb887ec38a9b8bc4ac98126732" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.databinding" name="databinding-compiler-common" version="7.4.1">
          <artifact name="databinding-compiler-common-7.4.1.jar">
             <sha256 value="b9e4baee6a891856c92c53adbd30e7ff1a7fdbaf1a4a0bd87321798abc53056f" origin="Generated by Gradle"/>
@@ -989,6 +1762,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="7b5cf583171d30a3fff4a0230b620a601e4b0a9d2de05d66bebf678229740caf" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.databinding" name="databinding-compiler-common" version="8.4.0">
+         <artifact name="databinding-compiler-common-8.4.0.jar">
+            <sha256 value="b814e97669db30386502d75a78de52d8654c67ec386997f6e12adbcc6802ed9d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.databinding" name="databinding-compiler-common" version="8.4.1">
+         <artifact name="databinding-compiler-common-8.4.1.jar">
+            <sha256 value="6a774892f0a035329a3160d3b72ae5b1f1b981d481ec55c1d147501ada3f2ffd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.databinding" name="viewbinding" version="8.0.2">
          <artifact name="viewbinding-8.0.2.aar">
             <sha256 value="995d561aa5b45401ab6a10e886e53dbd7d813fdfb0d3e170024a4c6260531d80" origin="Generated by Gradle"/>
@@ -997,6 +1780,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="2c36c3fb570d1825e87bf90567d67a8445cbe1055400ef4eb8c969f6cf04d6a9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.databinding" name="viewbinding" version="8.4.0">
+         <artifact name="viewbinding-8.4.0.aar">
+            <sha256 value="bcbbe4431c3eeb66c86e2c63dd093362b83fb442e504e0b01236d50605ed3593" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="viewbinding-8.4.0.module">
+            <sha256 value="48b87ef633f038c0155ff62cd1cb9daf904d2672415e3968ad0fb845cb102dd8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.databinding" name="viewbinding" version="8.4.1">
+         <artifact name="viewbinding-8.4.1.aar">
+            <sha256 value="f3d9d1bb36d0a0f4e7cd3cffc369196668664e2e5b1211e912ba1e5587ae7cb8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="viewbinding-8.4.1.module">
+            <sha256 value="7d6c0745235dac264e21eccde01d0154ff7611b204353c3c0a8672d597aa3f4a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.documentfile" name="documentfile" version="1.0.0">
          <artifact name="documentfile-1.0.0.aar">
             <sha256 value="865a061ef2fad16522f8433536b8d47208c46ff7c7745197dfa1eeb481869487" origin="Generated by Gradle"/>
@@ -1025,6 +1824,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="9d1996cca03777baa1f27cd15531db983a633dae37b90f85bd53501acb56699d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.emoji2" name="emoji2" version="1.3.0">
+         <artifact name="emoji2-1.3.0.aar">
+            <sha256 value="2bf23818b23a996ddaa1b5fd5bb32129daff6bbb2dce15166e2fccdd2010b1a5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="emoji2-1.3.0.module">
+            <sha256 value="ddc851edba65fd15a7a1bc3ad18648e2f732dd5ad8ef3602224bce0647f5b4d1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.emoji2" name="emoji2" version="1.4.0">
          <artifact name="emoji2-1.4.0.aar">
             <sha256 value="433febd3434a45667176c76a64f3f205ca6335a6b544c5b5d57f25a38a375242" origin="Generated by Gradle"/>
@@ -1041,6 +1848,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="a3a9db581abf1787b01ff15c40f059530e8e64f3937caa2d788f42eb39893268" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.emoji2" name="emoji2-views-helper" version="1.3.0">
+         <artifact name="emoji2-views-helper-1.3.0.aar">
+            <sha256 value="9a1351295a4f739df0efe8344adaa9afb34856c3af584d4a9afbec105a45b90b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="emoji2-views-helper-1.3.0.module">
+            <sha256 value="09974bb5ef9780de9d56715d71171a35c78fb2e17fd865773b0c83a3acac039c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.emoji2" name="emoji2-views-helper" version="1.4.0">
          <artifact name="emoji2-views-helper-1.4.0.aar">
             <sha256 value="ed5d3ed772a5fbf0d570f7526f585cd61a180e60f9372584c328a68e2cff3375" origin="Generated by Gradle"/>
@@ -1485,73 +2300,65 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="e71c328ceef5c4a7d76f2d86df1b65d65fe2acf868b1a4efd84a3f34336186d8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media" name="media" version="1.0.0">
+      <component name="media" group="androidx.media" version="1.0.0">
          <artifact name="media-1.0.0.aar">
             <sha256 value="b23b527b2bac870c4a7451e6982d7132e413e88d7f27dbeb1fc7640a720cd9ee" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media" name="media" version="1.4.3">
-         <artifact name="media-1.4.3.aar">
-            <sha256 value="89a83d648dafeb5160a76dcdf996735d746f410c115166cf15693b5208d73d95" origin="Generated by Gradle"/>
+      <component group="androidx.media" name="media" version="1.7.0">
+         <artifact name="media-1.7.0.aar">
+            <sha256 value="81a199ee87c6d3d59fb35f7dbec71b3f1d507128611099b6ac3a4b1c5a0bf1f9" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="media-1.4.3.module">
-            <sha256 value="21e0d4c4c0565106558eab24e6c1344866a300dfacad4732d942c9e920ac8ff9" origin="Generated by Gradle"/>
+         <artifact name="media-1.7.0.module">
+            <sha256 value="996f646284a2d981899cdac3282249e0e1f20ab82838a0875dc66bd264d24961" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media" name="media" version="1.6.0">
-         <artifact name="media-1.6.0.aar">
-            <sha256 value="fe628847d8f909ca8f23d685061f9a7684aa0c9bc9c1b201c4ff6eb7b3372828" origin="Generated by Gradle"/>
+      <component group="androidx.media3" name="media3-common" version="1.3.1">
+         <artifact name="media3-common-1.3.1.aar">
+            <sha256 value="40cf8c6c07f75afd0b213d694fd7ac478c726a94e64fa7ac1833c17752f3e6f4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="media-1.6.0.module">
-            <sha256 value="44d12bf8f7ce879f03af00ba01b556751d0073440fed1150128e903974c4def0" origin="Generated by Gradle"/>
+         <artifact name="media3-common-1.3.1.module">
+            <sha256 value="e03c4fa9d04188ffd7ca74ab2f8a2a0560afd24e151914c0af112c26d0e231af" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media3" name="media3-common" version="1.2.1">
-         <artifact name="media3-common-1.2.1.aar">
-            <sha256 value="3ddd33e8c114b61276adc4eab0e2c87854093fc678e8bb8c30be3ba96fd3b717" origin="Generated by Gradle"/>
+      <component group="androidx.media3" name="media3-container" version="1.3.1">
+         <artifact name="media3-container-1.3.1.aar">
+            <sha256 value="c6103c11666e03ceabeb6454b5bf0b9b51fdc93647f84dd02ee869a9c086269e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="media3-common-1.2.1.module">
-            <sha256 value="24f572989e6cb86468a0c7ef74b8b5df11d6d9fcb8f7a0d1c24d8bf017d77eb2" origin="Generated by Gradle"/>
+         <artifact name="media3-container-1.3.1.module">
+            <sha256 value="1d3b35b97c19501ba3e0c0001511bef9526fc18d52f241471578922c99ee7f95" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media3" name="media3-container" version="1.2.1">
-         <artifact name="media3-container-1.2.1.aar">
-            <sha256 value="e67d8b50fdb174aa23238f79b3583a485caca9658524b506b5ead6e9c47d1b64" origin="Generated by Gradle"/>
+      <component group="androidx.media3" name="media3-database" version="1.3.1">
+         <artifact name="media3-database-1.3.1.aar">
+            <sha256 value="8386d2c445d194268d4af2d63abb31b028da5f742fc38c6365bc2c40ab641383" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="media3-container-1.2.1.module">
-            <sha256 value="9005eb3c4693e829d3393c849f90a27138bc0ef3ccfbb7ca5f1c6d74ddcd3771" origin="Generated by Gradle"/>
+         <artifact name="media3-database-1.3.1.module">
+            <sha256 value="51df60a97ed7dcd7d35ecb174659bc0a9ee13ed9c15f239c888be28183f1e874" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media3" name="media3-database" version="1.2.1">
-         <artifact name="media3-database-1.2.1.aar">
-            <sha256 value="254d600819ea03ec4c21e83c3abfefd22c1d1864074e5caaa753188f6c451195" origin="Generated by Gradle"/>
+      <component group="androidx.media3" name="media3-datasource" version="1.3.1">
+         <artifact name="media3-datasource-1.3.1.aar">
+            <sha256 value="ad94437e3c3dc5b9fb4a5c2dc64aa912a91125519742ec2fc3ae9ebfacc62381" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="media3-database-1.2.1.module">
-            <sha256 value="d932fb4d0f211264a98f128240fa1e5eb55a4db233b333b89c0b65f6a1d61e18" origin="Generated by Gradle"/>
+         <artifact name="media3-datasource-1.3.1.module">
+            <sha256 value="5c33611613f1f65d0e05ca01fb989f3af7be992cd8daef61ef528b5e6243d75f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media3" name="media3-datasource" version="1.2.1">
-         <artifact name="media3-datasource-1.2.1.aar">
-            <sha256 value="6da0f6885c853a1ff9e2874f8ecf684d7b8d18d45d8c18bc1b7c495f05a5b4d5" origin="Generated by Gradle"/>
+      <component group="androidx.media3" name="media3-decoder" version="1.3.1">
+         <artifact name="media3-decoder-1.3.1.aar">
+            <sha256 value="c4799cd411061a654ad9c73fbc3d1a95945fce40f1bbceaf219e17b8a56fa1c1" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="media3-datasource-1.2.1.module">
-            <sha256 value="1f4c6af52a332bc85f729f10e7a49e1fbdb884293bdfa9c0149d9b88e1640f78" origin="Generated by Gradle"/>
+         <artifact name="media3-decoder-1.3.1.module">
+            <sha256 value="a9e432a7cd0722dfbf1f9d3dcf180103bf518826de12300825a391dc3c086442" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media3" name="media3-decoder" version="1.2.1">
-         <artifact name="media3-decoder-1.2.1.aar">
-            <sha256 value="8e448a83aff47c7eadb4dbdbfce48086adcdf850bec833450ae69206f83e276d" origin="Generated by Gradle"/>
+      <component group="androidx.media3" name="media3-exoplayer" version="1.3.1">
+         <artifact name="media3-exoplayer-1.3.1.aar">
+            <sha256 value="00c4be0107fcb95ce62d5f255e0e07b169f25bfcda820054888e26a89bf0647f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="media3-decoder-1.2.1.module">
-            <sha256 value="bf37a49e17e4589ceb3148c0c9314cf4b5d87903c78b316de3809cd21daf70bc" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.media3" name="media3-exoplayer" version="1.2.1">
-         <artifact name="media3-exoplayer-1.2.1.aar">
-            <sha256 value="85204c2fbcb4ea68fd11b9c45da16b691898147a21e3e9d95796ad5b45c41f30" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="media3-exoplayer-1.2.1.module">
-            <sha256 value="197a1c69d1aeb7a71b8c60a79579a7e8db19c53c780d32b129747d5a54a7ad34" origin="Generated by Gradle"/>
+         <artifact name="media3-exoplayer-1.3.1.module">
+            <sha256 value="048ba3612f9a1c88de968b27e345faaf831c71d77c7dcc1abc840cc9ac6fda76" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.media3" name="media3-extractor" version="1.2.1">
@@ -1562,20 +2369,28 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="626d3549cb3d820e7788499d2d435bb93a74b9b92357acb494cf0912db1c9df5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media3" name="media3-session" version="1.2.1">
-         <artifact name="media3-session-1.2.1.aar">
-            <sha256 value="acf6af7714fb6a055966845be67e3c6e43284ba2ef77e34249cba7080be30717" origin="Generated by Gradle"/>
+      <component group="androidx.media3" name="media3-extractor" version="1.3.1">
+         <artifact name="media3-extractor-1.3.1.aar">
+            <sha256 value="54400e411960da947d85567bbce3e752fade6bcb7d075c122a4e2cd05379dc62" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="media3-extractor-1.3.1.module">
+            <sha256 value="1bc5f81099da08e99871eca3f2f2266806ef84a32499aeceb1dd6f8c80232329" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.media3" name="media3-session" version="1.3.1">
+         <artifact name="media3-session-1.3.1.aar">
+            <sha256 value="83448db23fe252e6f0fc3158420bba87d5ca7ddf7f3a36153d0d387130f8cd29" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="media3-session-1.2.1.module">
-            <sha256 value="6b7b282a2694ee908dc30268e31141f9119314f86c61dde8fbc0621d9a328e2d" origin="Generated by Gradle"/>
+         <artifact name="media3-session-1.3.1.module">
+            <sha256 value="2fcfe064bf6c4a713926663836f47a360742aedbc2baa9677315cc7a10d77ed9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media3" name="media3-ui" version="1.2.1">
-         <artifact name="media3-ui-1.2.1.aar">
-            <sha256 value="d20c0cfb29b9e412e1941fc26d856318d1af912848e3deb972856950f661cadf" origin="Generated by Gradle"/>
+      <component group="androidx.media3" name="media3-ui" version="1.3.1">
+         <artifact name="media3-ui-1.3.1.aar">
+            <sha256 value="a8d206f395838a06b82b0789e7200868dabb26b9c7207e98cc3b3196041c1c9d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="media3-ui-1.2.1.module">
-            <sha256 value="e2531707a9e6c2f64b2a2b182ba110de08e9c96201abffcf6432d4261c7ac016" origin="Generated by Gradle"/>
+         <artifact name="media3-ui-1.3.1.module">
+            <sha256 value="043282ebb04a9d29ce8777bebb4e3ff3b59b257f343348ee9a54b6456688eb0f" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.multidex" name="multidex" version="2.0.1">
@@ -2153,6 +2968,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="5b3aba6ecd8b69223f4e1a0f596d488ef59fa56c62b5fa76c477bcddeecb5fcc" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="ch.qos.logback" name="logback-classic" version="1.3.14">
+         <artifact name="logback-classic-1.3.14.jar">
+            <sha256 value="f9b07a6dba4df3899381df7e597df450134e1879b1f3a757456b3cd1c8d94e2f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="ch.qos.logback" name="logback-classic" version="1.3.5">
          <artifact name="logback-classic-1.3.5.jar">
             <sha256 value="9d68b9daf2fbb98a09b0445e0c64ac309d9d0e156b68510b63791397c97e32e4" origin="Generated by Gradle"/>
@@ -2163,6 +2983,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="824fd0313b2f797698f9df66c55a968b589414f43d6cab21916a2cac0ea13efd" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="ch.qos.logback" name="logback-core" version="1.3.14">
+         <artifact name="logback-core-1.3.14.jar">
+            <sha256 value="9f53159af18a9d438bc398c970db3bb7e17ddb07b04bbb3b01dfe3454dd18862" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="ch.qos.logback" name="logback-core" version="1.3.5">
          <artifact name="logback-core-1.3.5.jar">
             <sha256 value="b1f0ec393f2f5bbaf1decb61624de18386634c3197e9eed69d1c1234ddd756f3" origin="Generated by Gradle"/>
@@ -2176,6 +3001,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="48f6b212e8f566a50b7188ce80a2648777c1624350975335cda139be0f34f720" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.airbnb.android" name="lottie" version="6.4.0">
+         <artifact name="lottie-6.4.0.aar">
+            <sha256 value="d6cf3be2c56fa250c96a86eb0baf8a7dfc3cc92b7e728a74f8851f9ad9fec2ba" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="lottie-6.4.0.module">
+            <sha256 value="5c1d2787b267c5a023b13d252f9a9ab1b6aa3b86f083ae7ce2ccfec13a10290d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.airbnb.android" name="lottie-compose" version="6.4.0">
+         <artifact name="lottie-compose-6.4.0.aar">
+            <sha256 value="0db0405db586246750b3c2139dc840697623f0a0a3dff68041f41ca2ff408509" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="lottie-compose-6.4.0.module">
+            <sha256 value="036310ba164264e7603dd050c25dc1b4b40e40672e2748573a7527da571a4844" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.almworks.sqlite4java" name="sqlite4java" version="1.0.392">
          <artifact name="sqlite4java-1.0.392.jar">
             <sha256 value="243a64470fda0e86a6fddeb0af4c7aa9426ce84e68cbfe18d75ee5da4b7e0b92" origin="Generated by Gradle"/>
@@ -2196,6 +3037,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="d82b239494dd262e65cd94b2edf96c9b5cf19c7afbfc84f2601749f50e15c765" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android" name="signflinger" version="8.4.0">
+         <artifact name="signflinger-8.4.0.jar">
+            <sha256 value="c1dca2c683634ee1a294298f9c7179578af6a86e080bdc40f961915bc5c8142f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android" name="signflinger" version="8.4.1">
+         <artifact name="signflinger-8.4.1.jar">
+            <sha256 value="c1dca2c683634ee1a294298f9c7179578af6a86e080bdc40f961915bc5c8142f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android" name="zipflinger" version="8.0.2">
          <artifact name="zipflinger-8.0.2.jar">
             <sha256 value="d82b239494dd262e65cd94b2edf96c9b5cf19c7afbfc84f2601749f50e15c765" origin="Generated by Gradle"/>
@@ -2206,11 +3057,36 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="530b2113317ff4d0f69ffdfb49387ba4b86aac169e1c77dff943405b79adcf8b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android" name="zipflinger" version="8.4.0">
+         <artifact name="zipflinger-8.4.0.jar">
+            <sha256 value="81dd485618a509a3235929b9eb13091d884452661de6ce5a45cc38b1c555421c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android" name="zipflinger" version="8.4.1">
+         <artifact name="zipflinger-8.4.1.jar">
+            <sha256 value="81dd485618a509a3235929b9eb13091d884452661de6ce5a45cc38b1c555421c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.databinding" name="baseLibrary" version="7.4.2">
+         <artifact name="baseLibrary-7.4.2.jar">
+            <sha256 value="530b2113317ff4d0f69ffdfb49387ba4b86aac169e1c77dff943405b79adcf8b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.databinding" name="baseLibrary" version="8.0.2">
          <artifact name="baseLibrary-8.0.2.jar">
             <sha256 value="530b2113317ff4d0f69ffdfb49387ba4b86aac169e1c77dff943405b79adcf8b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.databinding" name="baseLibrary" version="8.4.0">
+         <artifact name="baseLibrary-8.4.0.jar">
+            <sha256 value="794113709dab21b06c262b3795e73cb708fbacae61715f34361e1af6237a1870" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.databinding" name="baseLibrary" version="8.4.1">
+         <artifact name="baseLibrary-8.4.1.jar">
+            <sha256 value="794113709dab21b06c262b3795e73cb708fbacae61715f34361e1af6237a1870" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools" name="annotations" version="30.2.2">
          <artifact name="annotations-30.2.2.jar">
             <sha256 value="630ab4c6f211fa1c0f5c884152cb6311360f1b796442196c287a658645a99645" origin="Generated by Gradle"/>
@@ -2231,6 +3107,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="d4ba7dd6055a6f1fd6ddb6dcef4e2096c15908bc7dc6057cb2e06f3a0db949c7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools" name="annotations" version="31.4.0">
+         <artifact name="annotations-31.4.0.jar">
+            <sha256 value="25e8825547de7146d08fa18f04ef934ee1e6aec52e4c97ffa510a8f0f44b07a0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools" name="annotations" version="31.4.1">
+         <artifact name="annotations-31.4.1.jar">
+            <sha256 value="25e8825547de7146d08fa18f04ef934ee1e6aec52e4c97ffa510a8f0f44b07a0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools" name="common" version="30.2.2">
          <artifact name="common-30.2.2.jar">
             <sha256 value="ba5774b1a04fc11e2dc363ed2e27013ed7cbeabe696d3bdaba36629c996d3d53" origin="Generated by Gradle"/>
@@ -2251,16 +3137,36 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="09f1b19445cc1307e3d065c0f9fde4779abc5100b351eca2b0361c6dc9930d8d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools" name="common" version="31.4.0">
+         <artifact name="common-31.4.0.jar">
+            <sha256 value="d7ce03f7ae4a8b7ad17d5fb61a3beac15c73aff818eac51dedf8e35c204162f3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools" name="common" version="31.4.1">
+         <artifact name="common-31.4.1.jar">
+            <sha256 value="37a718ab8453e4152aa75bb898aaad3d80473a9a69663f0c3d3cdb63b130cc3e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools" name="desugar_jdk_libs" version="1.1.5">
          <artifact name="desugar_jdk_libs-1.1.5.jar">
             <sha256 value="52b390b038c5fd62b1ec697bdf5e236ac3286756667350e5466838edea9cb26e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools" name="desugar_jdk_libs" version="1.1.6">
+         <artifact name="desugar_jdk_libs-1.1.6.jar">
+            <sha256 value="91b4b2410edd5d1222b4c95ebf2937ea9389128dbabae11fadb99d53f14f2f8e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools" name="desugar_jdk_libs_configuration" version="1.1.5">
          <artifact name="desugar_jdk_libs_configuration-1.1.5.jar">
             <sha256 value="4ed1e921fd0ffcfeef2f10ce248f7725b139f593d4bc3549bf694b2e4d3f73a5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools" name="desugar_jdk_libs_configuration" version="1.1.6">
+         <artifact name="desugar_jdk_libs_configuration-1.1.6.jar">
+            <sha256 value="93ae25498b9400a7a674442bc601532baa768be654bc6632201403d221745283" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools" name="dvlib" version="30.2.2">
          <artifact name="dvlib-30.2.2.jar">
             <sha256 value="8f1fa014b70baac7fc4019d7b788280dabadced747cef41e52f4d0c603e7e0b8" origin="Generated by Gradle"/>
@@ -2281,6 +3187,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="d946ad39a40b667c82da87724527815536de62d0db0e8ea333449fdb90509001" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools" name="dvlib" version="31.4.0">
+         <artifact name="dvlib-31.4.0.jar">
+            <sha256 value="bf962bea906e1dc8a3273b8129999eaea3bb16fcb2b9deea1450dc6fb2ef9073" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools" name="dvlib" version="31.4.1">
+         <artifact name="dvlib-31.4.1.jar">
+            <sha256 value="bf962bea906e1dc8a3273b8129999eaea3bb16fcb2b9deea1450dc6fb2ef9073" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools" name="play-sdk-proto" version="31.0.0">
          <artifact name="play-sdk-proto-31.0.0.jar">
             <sha256 value="270f0f4653fe0d6477e55359dd47fb61ec5c96597997871e916b405042b39b91" origin="Generated by Gradle"/>
@@ -2291,6 +3207,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="270f0f4653fe0d6477e55359dd47fb61ec5c96597997871e916b405042b39b91" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools" name="play-sdk-proto" version="31.4.0">
+         <artifact name="play-sdk-proto-31.4.0.jar">
+            <sha256 value="68840b9dc064724dbe12844e0c59e325ac4dfaa818bf3262635bd5254010a29c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools" name="play-sdk-proto" version="31.4.1">
+         <artifact name="play-sdk-proto-31.4.1.jar">
+            <sha256 value="68840b9dc064724dbe12844e0c59e325ac4dfaa818bf3262635bd5254010a29c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools" name="repository" version="30.2.2">
          <artifact name="repository-30.2.2.jar">
             <sha256 value="90bbccdd17c95d0cb66771102d750f159b03f8bb36d8ddef99cdd1e03864b1c6" origin="Generated by Gradle"/>
@@ -2311,6 +3237,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="c11d10822af862cee3412ddc7245f6054d4b00a9e61fd1d2357390280879ea36" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools" name="repository" version="31.4.0">
+         <artifact name="repository-31.4.0.jar">
+            <sha256 value="df2533e154b736a0a95e4804893aa59099552842bf9635cda3751be9e894a0e2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools" name="repository" version="31.4.1">
+         <artifact name="repository-31.4.1.jar">
+            <sha256 value="438597d95beb6d2c3bf17e012c4f46d533660b4f9f36c6181f455ec45cc21c68" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools" name="sdk-common" version="30.2.2">
          <artifact name="sdk-common-30.2.2.jar">
             <sha256 value="f95c9e1c9f78d34e32629408646ebc4c7f3134242e9efa6baf16c13cb5bd43d3" origin="Generated by Gradle"/>
@@ -2331,6 +3267,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="766aa3b48b8c87adb8a1b0fed6689d48ec85ea803f85ab9f155c0e40c510e258" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools" name="sdk-common" version="31.4.0">
+         <artifact name="sdk-common-31.4.0.jar">
+            <sha256 value="f38eba4bbfb6d541dc8c2be38c31e7389d0acdc354b234f258b6ee89e8ddce6d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools" name="sdk-common" version="31.4.1">
+         <artifact name="sdk-common-31.4.1.jar">
+            <sha256 value="f38eba4bbfb6d541dc8c2be38c31e7389d0acdc354b234f258b6ee89e8ddce6d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools" name="sdklib" version="30.2.2">
          <artifact name="sdklib-30.2.2.jar">
             <sha256 value="6a205529e07c7831d2b60bbfc56b82c0e354c8628f5a111bffb7c5f2b930a11c" origin="Generated by Gradle"/>
@@ -2356,11 +3302,31 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="aa05293ff6efca0f1687cfaa2deb201984016320b8bd3636a7e51abbf90f2c5d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools" name="sdklib" version="31.4.0">
+         <artifact name="sdklib-31.4.0.jar">
+            <sha256 value="7d05caeddb635d87d04b4de70f9ee78a247514665ab57f25c07d2ba4e7af0f5b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools" name="sdklib" version="31.4.1">
+         <artifact name="sdklib-31.4.1.jar">
+            <sha256 value="51b499a01f398d6b671911f9d85b3114fde5e462f57b0040c5f0fcab1bdbfc22" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.analytics-library" name="crash" version="31.0.2">
          <artifact name="crash-31.0.2.jar">
             <sha256 value="1a940620fcd33f546200defd5347be74f7341c08563fc52a0eeeb4b8ccdd0c51" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.analytics-library" name="crash" version="31.4.0">
+         <artifact name="crash-31.4.0.jar">
+            <sha256 value="2c5c26420967675c074bc7140831fe3bff5bbabc7fbbc08ba29fdc3eadcc9510" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.analytics-library" name="crash" version="31.4.1">
+         <artifact name="crash-31.4.1.jar">
+            <sha256 value="2c5c26420967675c074bc7140831fe3bff5bbabc7fbbc08ba29fdc3eadcc9510" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.analytics-library" name="protos" version="30.2.2">
          <artifact name="protos-30.2.2.jar">
             <sha256 value="feb293a4d175a24ce7f98d7f783670d81dab61260cf9bbd3d748e94f95e38892" origin="Generated by Gradle"/>
@@ -2376,6 +3342,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="d074b93c2395722c6fff42b0397c5ba6cb2be44338a49a5133fbfb9b8191a68d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.analytics-library" name="protos" version="31.4.0">
+         <artifact name="protos-31.4.0.jar">
+            <sha256 value="c2bb6199304d595cb9b60f282d1bb5016c838809b33c90bf8aaf9a769a58115b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.analytics-library" name="protos" version="31.4.1">
+         <artifact name="protos-31.4.1.jar">
+            <sha256 value="3cc17200f904645251cf6f67c1281a70691428cde8f417b9b6c54acf89bf1a8a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.analytics-library" name="shared" version="30.2.2">
          <artifact name="shared-30.2.2.jar">
             <sha256 value="2512bf78dc8969b0206841ce996369b5a72d490c42e5c8410c3a62b455b0929b" origin="Generated by Gradle"/>
@@ -2391,6 +3367,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="d7efd1542cf705b1a0a46ac493849f7cf3d5e4b3bcdc78a4fa0478ea6c7caccb" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.analytics-library" name="shared" version="31.4.0">
+         <artifact name="shared-31.4.0.jar">
+            <sha256 value="971e224c62bb2f05ca8f4f37ed29ac8f91914b39eb8ac620ba92a2e0ea38bc7d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.analytics-library" name="shared" version="31.4.1">
+         <artifact name="shared-31.4.1.jar">
+            <sha256 value="971e224c62bb2f05ca8f4f37ed29ac8f91914b39eb8ac620ba92a2e0ea38bc7d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.analytics-library" name="tracker" version="30.2.2">
          <artifact name="tracker-30.2.2.jar">
             <sha256 value="3a961cd6b0c9445b47c18d0516b534bdf094f93151197896f480f8798697c729" origin="Generated by Gradle"/>
@@ -2406,6 +3392,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="a62bcf8ad3816bdc276999e80c8edd52bdb1a20bfd571d8f5f7e91fce1c74545" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.analytics-library" name="tracker" version="31.4.0">
+         <artifact name="tracker-31.4.0.jar">
+            <sha256 value="542c6c0070a7df6254050532f2a14aa9db5553a0fc2cb203fdba7b721523e716" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.analytics-library" name="tracker" version="31.4.1">
+         <artifact name="tracker-31.4.1.jar">
+            <sha256 value="542c6c0070a7df6254050532f2a14aa9db5553a0fc2cb203fdba7b721523e716" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="aapt2" version="8.0.0-9289358">
          <artifact name="aapt2-8.0.0-9289358-linux.jar">
             <sha256 value="28a0a45b05fd15fff817ea3a0c9b4aba8ed9230fec3f8537700fca95ad4c02b4" origin="Generated by Gradle"/>
@@ -2428,6 +3424,28 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="ee1b7dee9d1e55cda1c4f745005019584d195474ee573a444b268740c1365287" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="aapt2" version="8.4.0-11315950">
+         <artifact name="aapt2-8.4.0-11315950-linux.jar">
+            <sha256 value="5638a5b151f9c50ba2a9e5291edfc9227aec3fedc3ee8f8a8583fa54cd1dd9ca" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="aapt2-8.4.0-11315950-osx.jar">
+            <sha256 value="05d9ece54eb37b7b6fcf76df1a379b5b29543fb84adab2804446cf36bdad4477" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="aapt2-8.4.0-11315950-windows.jar">
+            <sha256 value="e153516c5e2933528c816c05ff9e21b189ac8c4b1bc456e468af71f6ea8229fc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.build" name="aapt2" version="8.4.1-11315950">
+         <artifact name="aapt2-8.4.1-11315950-linux.jar">
+            <sha256 value="0436553853f613304254a570e67e24951da0b70d34e0594975a1d7df1e7af4a0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="aapt2-8.4.1-11315950-osx.jar">
+            <sha256 value="57c0267a21c00801cf315a42c10d56fb4b56cad54da262ba52d3e34578f21226" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="aapt2-8.4.1-11315950-windows.jar">
+            <sha256 value="db296595cfdfce6137c5815701d87233e3df1032db205b2e7e59358af5623a60" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="aapt2-proto" version="7.0.0-beta04-7396180">
          <artifact name="aapt2-proto-7.0.0-beta04-7396180.jar">
             <sha256 value="1ca4f1b0f550c6c25f63c1916da84f6e7a92c66b7ad38ab1d5d49a20552a5984" origin="Generated by Gradle"/>
@@ -2460,6 +3478,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="0909eb4ba696945619d8589cacf4eb0b60e7db333c998a9bfbb54572ce52f1ed" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="aapt2-proto" version="8.4.0-11315950">
+         <artifact name="aapt2-proto-8.4.0-11315950.jar">
+            <sha256 value="f2832942e1de78a4544d671850d35e4b6e9b0342c1dc216c081707fb98b0dfbe" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="aapt2-proto-8.4.0-11315950.module">
+            <sha256 value="15c5e990f6404c9ec52ed3561c1dc454175089ae5ad14037f2759af14f994959" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.build" name="aapt2-proto" version="8.4.1-11315950">
+         <artifact name="aapt2-proto-8.4.1-11315950.jar">
+            <sha256 value="1a7dfab0f1dbfe6ce4d6fad3d05927d208f8c3087cbc0eb2b761aebf48ea06e4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="aapt2-proto-8.4.1-11315950.module">
+            <sha256 value="5c29e20b974943193b5b9e541d179f5ed4f456d081db2af1109270ddcbf2253f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="aaptcompiler" version="8.0.2">
          <artifact name="aaptcompiler-8.0.2.jar">
             <sha256 value="1006750a1bbdf22db39b480a8c10ee2f982d0395cbefbc83812aeaf9593b6567" origin="Generated by Gradle"/>
@@ -2473,6 +3507,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="6d6a13a51ac3806c11af5f0967092055e35a67df6a74bff1544d9f5518c5ad55" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="aaptcompiler" version="8.4.0">
+         <artifact name="aaptcompiler-8.4.0.jar">
+            <sha256 value="bef2f718a07a2bf5affcf54bccd94dc7a8fdd4042772cd89719b377a2972e189" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="aaptcompiler-8.4.0.module">
+            <sha256 value="ce588080d6fc63d15a24d77aec6e0c995d67d01c3a981c523f318270c1376cda" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.build" name="aaptcompiler" version="8.4.1">
+         <artifact name="aaptcompiler-8.4.1.jar">
+            <sha256 value="476a4d68b56fba17d6da796f2b19ff7d176290bbb9bafee113fddf42c11595e0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="aaptcompiler-8.4.1.module">
+            <sha256 value="79b5577a1d92ca45f6ec064fc2a054b4d4573401c9577149c27a195a31f5029d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="apksig" version="8.0.2">
          <artifact name="apksig-8.0.2.jar">
             <sha256 value="1556367f117415b3fbb66b3222254197b0f4aafdbc9f467497304409f0d30386" origin="Generated by Gradle"/>
@@ -2483,6 +3533,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="79474dbb7505515a7fe081149a119aa4c6580ac4da8dc3ea7d3675956b00fffc" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="apksig" version="8.4.0">
+         <artifact name="apksig-8.4.0.jar">
+            <sha256 value="c4f6fdf2148490296f422a7eb37647ea11d1c3b02f1f2349c33ce257f3c29b1f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.build" name="apksig" version="8.4.1">
+         <artifact name="apksig-8.4.1.jar">
+            <sha256 value="c4f6fdf2148490296f422a7eb37647ea11d1c3b02f1f2349c33ce257f3c29b1f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="apkzlib" version="8.0.2">
          <artifact name="apkzlib-8.0.2.jar">
             <sha256 value="79474dbb7505515a7fe081149a119aa4c6580ac4da8dc3ea7d3675956b00fffc" origin="Generated by Gradle"/>
@@ -2496,6 +3556,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="8404059bdd09e8081d6cbdb945c6e0ca28d63a7370cd036fe46a541e7b0fb74e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="apkzlib" version="8.4.0">
+         <artifact name="apkzlib-8.4.0.jar">
+            <sha256 value="1c1a67d6f4f186427ac166ebaa0dd867f595d5144fc925252b05ffb9d1a156b7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.build" name="apkzlib" version="8.4.1">
+         <artifact name="apkzlib-8.4.1.jar">
+            <sha256 value="1c1a67d6f4f186427ac166ebaa0dd867f595d5144fc925252b05ffb9d1a156b7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="builder" version="8.0.2">
          <artifact name="builder-8.0.2.jar">
             <sha256 value="779804f5b8bd22c4f3fe69866e17cfc0f58f9ed3c4e02b9626b42bf66551140c" origin="Generated by Gradle"/>
@@ -2504,6 +3574,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="720d811feecb2a20e592525e7b38963e39df76c083d355ab55730504d0dc46ec" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="builder" version="8.4.0">
+         <artifact name="builder-8.4.0.jar">
+            <sha256 value="0171bb226224709aa8d0ab4f3bf3163647ed232ade3a851319dd2126c8934119" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="builder-8.4.0.module">
+            <sha256 value="76bb2d6d162b7bc3c058a7c064290d3a85ce15d96aedc848b1a6fec8a5af424c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.build" name="builder" version="8.4.1">
+         <artifact name="builder-8.4.1.jar">
+            <sha256 value="27f8cd73e0ad60c2276c5d4e3c95d6f003fd02edd182ed77692dbbd13947449c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="builder-8.4.1.module">
+            <sha256 value="4756386d6f1f1967e18739f9a7fddfc733fffda0c4643e5881a4a8467c1fdbdd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="builder-model" version="7.2.2">
          <artifact name="builder-model-7.2.2.jar">
             <sha256 value="2022a6eeff0c61f33828ab686dce947b638d04495902436c021fb5b3bb7e6338" origin="Generated by Gradle"/>
@@ -2536,6 +3622,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="e96d047fea4c96eee0eab4df1a91f59bab0d6b8caf6e3a69d3791afda50cb96f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="builder-model" version="8.4.0">
+         <artifact name="builder-model-8.4.0.jar">
+            <sha256 value="0ad5a52ef979140c3ddeab546c0c7e5abf02b8fbf5f8a2fbffeee54ef3eac39d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="builder-model-8.4.0.module">
+            <sha256 value="aa3ed4955f7b03e78db970ea8cd5bc0bf975644f41215a7b489c8bbd8a20ef25" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.build" name="builder-model" version="8.4.1">
+         <artifact name="builder-model-8.4.1.jar">
+            <sha256 value="6b011ed07ffb13526dd91c0c1fbaf57bd45f893d01f44ba9902b13765515791f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="builder-model-8.4.1.module">
+            <sha256 value="d2aff1a0123fde6c14208e0e8636788498b1959eb953310a6a45d3606d5bb098" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="builder-test-api" version="8.0.2">
          <artifact name="builder-test-api-8.0.2.jar">
             <sha256 value="66f7798525a8eb5cd85dd905ce9a6de737a1d2363dee4155babd5e388e96d4f7" origin="Generated by Gradle"/>
@@ -2544,6 +3646,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="acf833bb07ff61db0dc47151eb89236d93f25a75d6bf55958c9c57c36abb8c19" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="builder-test-api" version="8.4.0">
+         <artifact name="builder-test-api-8.4.0.jar">
+            <sha256 value="ab6c1db019eb72dc626a21fae555f44b2da7c0622ae730cd93846810cc1f532d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="builder-test-api-8.4.0.module">
+            <sha256 value="09f960e284da53f9993e1bef82ad330eaa8b08342705a881ed04cdcd33c3e68e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.build" name="builder-test-api" version="8.4.1">
+         <artifact name="builder-test-api-8.4.1.jar">
+            <sha256 value="0695ffddad94a68d505ecf49ad6a26470a4227dea6129fc19e4ea5bdd9a769b9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="builder-test-api-8.4.1.module">
+            <sha256 value="c4eb66b95ff2c191f878ba6b8c50fbb03540a0252b914e764886eeb74e50a215" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="bundletool" version="1.11.4">
          <artifact name="bundletool-1.11.4.jar">
             <sha256 value="27f985038e020997c7d0c23a6cdbb5b3d1de9d091f926748deeb265aa62aae25" origin="Generated by Gradle"/>
@@ -2562,6 +3680,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="e186e823b7bf8286d7573d534f7a3562eb11bb45688dfcdfb9f1878ac00c115e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="bundletool" version="1.15.6">
+         <artifact name="bundletool-1.15.6.jar">
+            <sha256 value="f66992e537adb12ffa6d181cdc536d564b1c4b4b4c5972b4891706c6533a4641" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="gradle" version="8.0.2">
          <artifact name="gradle-8.0.2.jar">
             <sha256 value="645916554831d28eb1dec154910c3e24ed4a077e03949c41d2ab4d47a623c9b6" origin="Generated by Gradle"/>
@@ -2578,6 +3701,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="6bd9ebcd86d7080e6f52567478d605f620e42ae543e07c92998fb402af800ee2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="gradle" version="8.4.0">
+         <artifact name="gradle-8.4.0.jar">
+            <sha256 value="d825d48ed34302f0ce7f4fdfae17b8ee1c345694e1a30dd1e86dad718de2600f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="gradle-8.4.0.module">
+            <sha256 value="38b2ea3d54270f92ef35210438cfd3d6e1d50536ea2d18db034e282aafbe8453" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.build" name="gradle" version="8.4.1">
+         <artifact name="gradle-8.4.1.jar">
+            <sha256 value="a1bee785b6bb2aeb43740ecc24956ea75336272c88b72fb108f17938a6d9cec9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="gradle-8.4.1.module">
+            <sha256 value="792bc97d885734db69582610c4af119697b3ba8425b4f2de4297dc4aa3ab2d7d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="gradle-api" version="8.0.2">
          <artifact name="gradle-api-8.0.2.jar">
             <sha256 value="e3a14c889d8e6b3e1c026015950db54a4d1bd09ade82e05307adba603f46f036" origin="Generated by Gradle"/>
@@ -2594,6 +3733,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="8a9a0767ffa27cf2f1505c5ae3e67480fee52b1f18328765fde8c8ff3eeff8a6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="gradle-api" version="8.4.0">
+         <artifact name="gradle-api-8.4.0.jar">
+            <sha256 value="e445fb24c9da08d8a622626263f1e4d973fad9223fe054d9631e4f9b6a8d79fc" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="gradle-api-8.4.0.module">
+            <sha256 value="0fca77a2c2801208a2573e4b2ada6d19173ec8ab88d594199f7ab12b2258a81a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.build" name="gradle-api" version="8.4.1">
+         <artifact name="gradle-api-8.4.1.jar">
+            <sha256 value="dbb375af8d47cf6b6820a34ce5cdb2dc6efcf33220d874e19caa3321ae00da61" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="gradle-api-8.4.1.module">
+            <sha256 value="e0d78dc9a6861a3b7599eb0d9415875ac68b934cee5988c86c4b6dc93b4eaac3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="gradle-settings-api" version="8.0.2">
          <artifact name="gradle-settings-api-8.0.2.jar">
             <sha256 value="1eeadff69357705c9289e0a7253c95f9e499f543ff853e413d49652ae13e1d8a" origin="Generated by Gradle"/>
@@ -2602,6 +3757,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="038db3ffd98a091a3f3cce0de61ace5d003ee3ade5c903e0c41268e81c2b8213" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="gradle-settings-api" version="8.4.0">
+         <artifact name="gradle-settings-api-8.4.0.jar">
+            <sha256 value="d9f43bf45b8e642803997216012236baa076574cafb89cd95a315ac7c38ea8e6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="gradle-settings-api-8.4.0.module">
+            <sha256 value="ce2fd5d85d6c09b1e5fade21e5716f416c69a9d5da25656a7356d7f76dc3b930" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.build" name="gradle-settings-api" version="8.4.1">
+         <artifact name="gradle-settings-api-8.4.1.jar">
+            <sha256 value="48fca54253cb93182afcb1173c1dbd9953aad7bf29b225b2e37ef9e1ddc01606" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="gradle-settings-api-8.4.1.module">
+            <sha256 value="5f9ccca03508351f095a3765a434590a415d69eb9106c110829affe27b8bbd05" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="manifest-merger" version="30.2.2">
          <artifact name="manifest-merger-30.2.2.jar">
             <sha256 value="4518ba42b1890acdfec41cf7ea30212042f33bbeb682f62aa0be06148b69eede" origin="Generated by Gradle"/>
@@ -2626,6 +3797,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="344ee2fc68a62b42b548a97900c2148cb8185b532ffe5d38a202903c22684bd1" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="manifest-merger" version="31.4.0">
+         <artifact name="manifest-merger-31.4.0.jar">
+            <sha256 value="3439ddad91cf62aa5617af1c3ac2849e35878b487e972dfda26f07236a07e031" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="manifest-merger-31.4.0.module">
+            <sha256 value="16c01f544b86e9df7fdaae7ab1c736079b265f24a0c6263bc42bccf585e633ba" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.build" name="manifest-merger" version="31.4.1">
+         <artifact name="manifest-merger-31.4.1.jar">
+            <sha256 value="437c35776f2eb292cdfb809ac79da0028bc8b943d7f1f5e5095f0ccf13b1c66e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="manifest-merger-31.4.1.module">
+            <sha256 value="f0547bef8c8786e5653705a5cee7a97727d314c63a6d4bb7b07074a06bec017f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="transform-api" version="2.0.0-deprecated-use-gradle-api">
          <artifact name="transform-api-2.0.0-deprecated-use-gradle-api.jar">
             <sha256 value="4de4a3d05e1c534c2db9e4588bf34082bb2bd232d8abb9727c430290ce225740" origin="Generated by Gradle"/>
@@ -2662,11 +3849,31 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="66de3038ddc4f240a2b3331bc9863b379c3999a1a8b0923dc731f11a9a295034" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.ddms" name="ddmlib" version="31.4.0">
+         <artifact name="ddmlib-31.4.0.jar">
+            <sha256 value="f98b88cfe0fe729d755f0bf6d5fc21e20f89aea9e630860dc0f75dcbec6fec0b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.ddms" name="ddmlib" version="31.4.1">
+         <artifact name="ddmlib-31.4.1.jar">
+            <sha256 value="f98b88cfe0fe729d755f0bf6d5fc21e20f89aea9e630860dc0f75dcbec6fec0b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.emulator" name="proto" version="31.0.2">
          <artifact name="proto-31.0.2.jar">
             <sha256 value="03c9f2a9eb08ebad38da2352e82e5ab08fa4fac7083fe771942aa29f60ab5bab" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.emulator" name="proto" version="31.4.0">
+         <artifact name="proto-31.4.0.jar">
+            <sha256 value="5994f35bcfe498aee92a82340b7600902439b1aa153b9398591105c4e00bb994" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.emulator" name="proto" version="31.4.1">
+         <artifact name="proto-31.4.1.jar">
+            <sha256 value="5994f35bcfe498aee92a82340b7600902439b1aa153b9398591105c4e00bb994" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.external.com-intellij" name="intellij-core" version="30.2.2">
          <artifact name="intellij-core-30.2.2.jar">
             <sha256 value="cdec995f5c1a8839b996188fa8e0212b303021a48d4eed9659fcb5a7df92a364" origin="Generated by Gradle"/>
@@ -2682,6 +3889,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="2d258f6137c7585608ea43320cfa0a685d32a40e6dd4cd0c21f466e60fd01ace" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.external.com-intellij" name="intellij-core" version="31.4.0">
+         <artifact name="intellij-core-31.4.0.jar">
+            <sha256 value="025e5a282d9fb83a4e6073ff4ccd5a28e38f8a322a856d4aa29e4ad00bd377f4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.external.com-intellij" name="intellij-core" version="31.4.1">
+         <artifact name="intellij-core-31.4.1.jar">
+            <sha256 value="025e5a282d9fb83a4e6073ff4ccd5a28e38f8a322a856d4aa29e4ad00bd377f4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="30.2.2">
          <artifact name="kotlin-compiler-30.2.2.jar">
             <sha256 value="77e23191adbc7d3235ca69540271edb31f30a9bc9a1e6a6ef255d1a577a595ce" origin="Generated by Gradle"/>
@@ -2697,6 +3914,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="1b1ff8dca59b78e59aaa02818e1aef4aa142302fdfa7fb9041ca0c342da0bbe3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="31.4.0">
+         <artifact name="kotlin-compiler-31.4.0.jar">
+            <sha256 value="fd45a1e4a45c51b46920445586f71c92a8801cb0880bcc0f485144ffbfbc284f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.external.com-intellij" name="kotlin-compiler" version="31.4.1">
+         <artifact name="kotlin-compiler-31.4.1.jar">
+            <sha256 value="fd45a1e4a45c51b46920445586f71c92a8801cb0880bcc0f485144ffbfbc284f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.external.org-jetbrains" name="uast" version="30.2.2">
          <artifact name="uast-30.2.2.jar">
             <sha256 value="878f5b04ab3550074882b1698d58596a89fbe2b41e0fec0e0c3fd6aeb89b7900" origin="Generated by Gradle"/>
@@ -2712,6 +3939,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="b4b1a74a712518c0dfd9930e9ffa69288ec84cf2fb55a5abd09f30b73ab0cac0" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.external.org-jetbrains" name="uast" version="31.4.0">
+         <artifact name="uast-31.4.0.jar">
+            <sha256 value="0df6547b37453f5ad2006179cd65b0ab7109b8f67b837d739509b2ff4f8310b3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.external.org-jetbrains" name="uast" version="31.4.1">
+         <artifact name="uast-31.4.1.jar">
+            <sha256 value="0df6547b37453f5ad2006179cd65b0ab7109b8f67b837d739509b2ff4f8310b3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.layoutlib" name="layoutlib-api" version="30.2.2">
          <artifact name="layoutlib-api-30.2.2.jar">
             <sha256 value="2c7d7945ba2f8d4a482d8e8a5e906923350255fb8b275e5dc6fd0a4a6ee09ab7" origin="Generated by Gradle"/>
@@ -2727,6 +3964,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="3df9c0423d26dffae97d9d622492c817dd57ac2d46b15e077b2af5fd9bf8ac05" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.layoutlib" name="layoutlib-api" version="31.4.0">
+         <artifact name="layoutlib-api-31.4.0.jar">
+            <sha256 value="3c9064c3c3ab0e73f3a5953d1c11c57dbf57a3297957c1d7d460c92e14cf34b2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.layoutlib" name="layoutlib-api" version="31.4.1">
+         <artifact name="layoutlib-api-31.4.1.jar">
+            <sha256 value="3c9064c3c3ab0e73f3a5953d1c11c57dbf57a3297957c1d7d460c92e14cf34b2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.lint" name="lint" version="30.2.2">
          <artifact name="lint-30.2.2.jar">
             <sha256 value="0282dd1831bc449b635c98c2a5060572a4366685e34b2955b8b2ab271c5e3570" origin="Generated by Gradle"/>
@@ -2737,6 +3984,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="e2a2b4f88cf9977021161361c242a6ec8476eaba67fae00074fa0f2eb03252bc" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.lint" name="lint" version="31.4.0">
+         <artifact name="lint-31.4.0.jar">
+            <sha256 value="4c8bbdfaa4fcddd5e8b8f3e9606057a1e5dd6ed8013a7bbc9ae2d4a7d950152c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.lint" name="lint" version="31.4.1">
+         <artifact name="lint-31.4.1.jar">
+            <sha256 value="4c8bbdfaa4fcddd5e8b8f3e9606057a1e5dd6ed8013a7bbc9ae2d4a7d950152c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.lint" name="lint-api" version="30.2.2">
          <artifact name="lint-api-30.2.2.jar">
             <sha256 value="7c76cb21662660fa7ffe79afc44b59bf13ec2cf5e640d40e2c2d3e5a2b0cd4c9" origin="Generated by Gradle"/>
@@ -2747,6 +4004,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="b574c059dbe7c0bd5a8fb99b239e6ba844484a59c6622f2636c107eb87c3c24b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.lint" name="lint-api" version="31.4.0">
+         <artifact name="lint-api-31.4.0.jar">
+            <sha256 value="03046cddd2df9b0d25ae1f5260102922b9efc8118ad1c2566443a04e3008ee55" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.lint" name="lint-api" version="31.4.1">
+         <artifact name="lint-api-31.4.1.jar">
+            <sha256 value="03046cddd2df9b0d25ae1f5260102922b9efc8118ad1c2566443a04e3008ee55" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.lint" name="lint-checks" version="30.2.2">
          <artifact name="lint-checks-30.2.2.jar">
             <sha256 value="c50975fed874d92d95e48123eb68251ce5155f8942f62ee6e772388464c2a4d5" origin="Generated by Gradle"/>
@@ -2757,11 +4024,31 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="67d210b6331030d27b11d7e081a9d299eb1d7a5519304de5a2c00fbb19044d42" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.lint" name="lint-checks" version="31.4.0">
+         <artifact name="lint-checks-31.4.0.jar">
+            <sha256 value="51ad2a41dcf521ad7bb0de716ab7f13a065e3cafe69e9d94c95b54f8589992c6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.lint" name="lint-checks" version="31.4.1">
+         <artifact name="lint-checks-31.4.1.jar">
+            <sha256 value="51ad2a41dcf521ad7bb0de716ab7f13a065e3cafe69e9d94c95b54f8589992c6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.lint" name="lint-gradle" version="31.0.2">
          <artifact name="lint-gradle-31.0.2.jar">
             <sha256 value="0d34bcad5e346ebb6324ff8eee79d8fc418fa9a77892ffe17d48ea7677654a6d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.lint" name="lint-gradle" version="31.4.0">
+         <artifact name="lint-gradle-31.4.0.jar">
+            <sha256 value="ec188c62447a6c7cd781072577b04470d7a8c321de926a95f5c7f92342060fbe" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.lint" name="lint-gradle" version="31.4.1">
+         <artifact name="lint-gradle-31.4.1.jar">
+            <sha256 value="ec188c62447a6c7cd781072577b04470d7a8c321de926a95f5c7f92342060fbe" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.lint" name="lint-model" version="30.2.2">
          <artifact name="lint-model-30.2.2.jar">
             <sha256 value="b7e988df12d6241e8f06f4d353790d01e268e955b2b7b35286d0fa5233e8a045" origin="Generated by Gradle"/>
@@ -2777,6 +4064,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="162eb85f27efc7b11821f80bb9861a02bb979127beba9b265155c19c80f809ac" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.lint" name="lint-model" version="31.4.0">
+         <artifact name="lint-model-31.4.0.jar">
+            <sha256 value="ae5b38460f3a59c0725930d779dbbb3372f08031a1a41faa59d9f8500b3e4641" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.lint" name="lint-model" version="31.4.1">
+         <artifact name="lint-model-31.4.1.jar">
+            <sha256 value="ae5b38460f3a59c0725930d779dbbb3372f08031a1a41faa59d9f8500b3e4641" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.lint" name="lint-tests" version="30.2.2">
          <artifact name="lint-tests-30.2.2.jar">
             <sha256 value="baf519a77ae8f094ad9f7023d58339640bc7cf16d09bdae75b2137ee1ce8c63b" origin="Generated by Gradle"/>
@@ -2792,6 +4089,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="26c9384cd0cc727c0985097baf4fbcd90d556e06bb0f586c175ca9912fbc66ff" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.lint" name="lint-typedef-remover" version="31.4.0">
+         <artifact name="lint-typedef-remover-31.4.0.jar">
+            <sha256 value="5b4f485215ca4d86ef2319fc398b5f2251e62f5446bc5fd0e00653648ddde318" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.lint" name="lint-typedef-remover" version="31.4.1">
+         <artifact name="lint-typedef-remover-31.4.1.jar">
+            <sha256 value="5b4f485215ca4d86ef2319fc398b5f2251e62f5446bc5fd0e00653648ddde318" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-device-provider-ddmlib" version="31.0.0">
          <artifact name="android-device-provider-ddmlib-31.0.0.jar">
             <sha256 value="b4d371f6b25649ecab86fb2369d1b0b3d66ea22200cc83b96406ad91400cd469" origin="Generated by Gradle"/>
@@ -2813,11 +4120,37 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="332794db1e7702c9689c8075532f235cccbf57d70aba29cbd7d378e781bad37f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-device-provider-ddmlib" version="31.4.0">
+         <artifact name="android-device-provider-ddmlib-31.4.0.jar">
+            <sha256 value="fd1cf6b06e1743896944ce545874258e2b6dfc5519db4dceb091aff6c7c2d37a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-device-provider-ddmlib-31.4.0.module">
+            <sha256 value="758154bf748711793b13bbc1336e9c37c1f62c46c9e6b1865092978df2c9953f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-device-provider-ddmlib" version="31.4.1">
+         <artifact name="android-device-provider-ddmlib-31.4.1.jar">
+            <sha256 value="a867f9be959ae8bf0bc2e773c93817559ee528b46ff733a37bc896687451b74e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-device-provider-ddmlib-31.4.1.module">
+            <sha256 value="9135fdb76500c2f2137edcc3c6de9ff1d6411fdf05f15c2d4d70d3ccc0f023d3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-device-provider-ddmlib-proto" version="31.0.2">
          <artifact name="android-device-provider-ddmlib-proto-31.0.2.jar">
             <sha256 value="332794db1e7702c9689c8075532f235cccbf57d70aba29cbd7d378e781bad37f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-device-provider-ddmlib-proto" version="31.4.0">
+         <artifact name="android-device-provider-ddmlib-proto-31.4.0.jar">
+            <sha256 value="da9f3f3dae26544c90668549584765d5854a87c425d2cfe577cd34d3600ea097" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-device-provider-ddmlib-proto" version="31.4.1">
+         <artifact name="android-device-provider-ddmlib-proto-31.4.1.jar">
+            <sha256 value="da9f3f3dae26544c90668549584765d5854a87c425d2cfe577cd34d3600ea097" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-device-provider-gradle" version="31.0.0">
          <artifact name="android-device-provider-gradle-31.0.0.jar">
             <sha256 value="54462e4709020f5afc1aa1982519f82e3a5346a759f1188bcd20930efa53d32d" origin="Generated by Gradle"/>
@@ -2839,35 +4172,113 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="d8e9cdd6075752ed88422a5c37324d9aa6a2a0ea79abcbc61dcc89b8e47f8e98" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-device-provider-gradle" version="31.4.0">
+         <artifact name="android-device-provider-gradle-31.4.0.jar">
+            <sha256 value="da9f91cc945f8c39e1c69ded8aefa3fec9638c35dcb3439aa81ca6971d901698" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-device-provider-gradle-31.4.0.module">
+            <sha256 value="6ef4b838575983b4c2d180439a93d890723abe642239487fc9921c9cf445347b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-device-provider-gradle" version="31.4.1">
+         <artifact name="android-device-provider-gradle-31.4.1.jar">
+            <sha256 value="dea40b48ee3aef01cdd9fc4d71e34f07cbb9e510d8573fe884b9af1500586948" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-device-provider-gradle-31.4.1.module">
+            <sha256 value="a754e5d7547ce83716ef4d7b07c979a06c6040c9350cf780ef5257b27503ef2b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-device-provider-gradle-proto" version="31.0.2">
          <artifact name="android-device-provider-gradle-proto-31.0.2.jar">
             <sha256 value="48f8b288d3b3195199ded91cbaa67a28be2fb9d317da187b88a7d4ffb505a578" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-device-provider-gradle-proto" version="31.4.0">
+         <artifact name="android-device-provider-gradle-proto-31.4.0.jar">
+            <sha256 value="ad2342bb1d6f95563400a322493ea1c229cb93df3944f1261b7399f718494049" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-device-provider-gradle-proto" version="31.4.1">
+         <artifact name="android-device-provider-gradle-proto-31.4.1.jar">
+            <sha256 value="ad2342bb1d6f95563400a322493ea1c229cb93df3944f1261b7399f718494049" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output" version="31.0.0">
          <artifact name="android-test-plugin-host-additional-test-output-31.0.0.jar">
             <sha256 value="c72f69320e3b2a2972e5c44ed0126bdaa0ef83eb20d010c6b1c64d77927ed7a7" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-additional-test-output-31.0.0.module">
-            <sha256 value="cf36bcd4e8af5b240f8f7d80f231ffaf14a442cfe87dea16c5fc4fe8a16c05bb" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-additional-test-output-31.0.0.module">
+            <sha256 value="cf36bcd4e8af5b240f8f7d80f231ffaf14a442cfe87dea16c5fc4fe8a16c05bb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output" version="31.0.2">
+         <artifact name="android-test-plugin-host-additional-test-output-31.0.2.jar">
+            <sha256 value="957d41b43c848272f43e2aee91fb21a65710f6d963639ea4bf210546d3102f6c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-test-plugin-host-additional-test-output-31.0.2.module">
+            <sha256 value="6ae9f8b15d5679d838b538f09b2972f5f4de20cd8fc7824f7695a984b004a92f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="30.4.2">
+         <artifact name="android-test-plugin-host-additional-test-output-proto-30.4.2.jar">
+            <sha256 value="e9ca7656307bff316ca4612a31e996b3e4bb3ca5471248e99add426ffd759936" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output" version="31.4.0">
+         <artifact name="android-test-plugin-host-additional-test-output-31.4.0.jar">
+            <sha256 value="fba57197622753863fdf9b2042518d47e9f9e44eddc315ddfd99d75eb8db044f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-test-plugin-host-additional-test-output-31.4.0.module">
+            <sha256 value="5189f7d877b053052cc13d37795f1b40d9d6df47871a176184c0523fe1ddf15f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output" version="31.4.1">
+         <artifact name="android-test-plugin-host-additional-test-output-31.4.1.jar">
+            <sha256 value="1c047272109c223336a8cda7b37685a34658fabba2579e9cd6723fc454fc544e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-test-plugin-host-additional-test-output-31.4.1.module">
+            <sha256 value="53fa3eb5818f20f614d17c0035b5ac38fedebf782b0b584a978414be868ec145" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="31.0.2">
+         <artifact name="android-test-plugin-host-additional-test-output-proto-31.0.2.jar">
+            <sha256 value="6c4d0907badf886cbea14e56e8d08ce232ee775403ad811c27a280520d7efa1a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="31.4.0">
+         <artifact name="android-test-plugin-host-additional-test-output-proto-31.4.0.jar">
+            <sha256 value="38450694de6328c2c4cba696f9c04ecdd5ce6952355f68c3a22f9541d1d6546f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="31.4.1">
+         <artifact name="android-test-plugin-host-additional-test-output-proto-31.4.1.jar">
+            <sha256 value="38450694de6328c2c4cba696f9c04ecdd5ce6952355f68c3a22f9541d1d6546f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer" version="31.4.0">
+         <artifact name="android-test-plugin-host-apk-installer-31.4.0.jar">
+            <sha256 value="39642d001acffc5a131f389ce2997f3e0f23c1e31fea292107c8cd5d267f024b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-test-plugin-host-apk-installer-31.4.0.module">
+            <sha256 value="37439eb2e3ad2e5dbc3ec32b6b441045fa962e652af87e679e9823f79feea7f1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output" version="31.0.2">
-         <artifact name="android-test-plugin-host-additional-test-output-31.0.2.jar">
-            <sha256 value="957d41b43c848272f43e2aee91fb21a65710f6d963639ea4bf210546d3102f6c" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer" version="31.4.1">
+         <artifact name="android-test-plugin-host-apk-installer-31.4.1.jar">
+            <sha256 value="20ef9f61f8fb1d54a9e16f0c496c08c3bbd70fb03c06e2a561d7a464fc04dc0e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="android-test-plugin-host-additional-test-output-31.0.2.module">
-            <sha256 value="6ae9f8b15d5679d838b538f09b2972f5f4de20cd8fc7824f7695a984b004a92f" origin="Generated by Gradle"/>
+         <artifact name="android-test-plugin-host-apk-installer-31.4.1.module">
+            <sha256 value="65a9f5416bdb01e7a17e94f6a4e47f20b2f4ac65557e8cbfcb3cf23268cf283b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="30.4.2">
-         <artifact name="android-test-plugin-host-additional-test-output-proto-30.4.2.jar">
-            <sha256 value="e9ca7656307bff316ca4612a31e996b3e4bb3ca5471248e99add426ffd759936" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer-proto" version="31.4.0">
+         <artifact name="android-test-plugin-host-apk-installer-proto-31.4.0.jar">
+            <sha256 value="ced49aca4031aa2c57b51d3909ba815082e563c1d9a246bc23ede973782524f7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.android.tools.utp" name="android-test-plugin-host-additional-test-output-proto" version="31.0.2">
-         <artifact name="android-test-plugin-host-additional-test-output-proto-31.0.2.jar">
-            <sha256 value="6c4d0907badf886cbea14e56e8d08ce232ee775403ad811c27a280520d7efa1a" origin="Generated by Gradle"/>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-apk-installer-proto" version="31.4.1">
+         <artifact name="android-test-plugin-host-apk-installer-proto-31.4.1.jar">
+            <sha256 value="ced49aca4031aa2c57b51d3909ba815082e563c1d9a246bc23ede973782524f7" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-coverage" version="31.0.0">
@@ -2891,11 +4302,37 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="2f865cb722be65f8772b218afef4381a574506359b8fed792c077b40202ef210" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage" version="31.4.0">
+         <artifact name="android-test-plugin-host-coverage-31.4.0.jar">
+            <sha256 value="f31d6f556b384987b749fdd539b0fc5744e12b67e81ce6a1c6e5414c52d828bf" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-test-plugin-host-coverage-31.4.0.module">
+            <sha256 value="1b4be5360224783ecbfa39cf3463359a095c8149bedf6995b7756181cb3b8a66" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage" version="31.4.1">
+         <artifact name="android-test-plugin-host-coverage-31.4.1.jar">
+            <sha256 value="0603d01e9ce8930dd76bbc9c7d0188b65a5e6407547828be00b347add2bf44d9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-test-plugin-host-coverage-31.4.1.module">
+            <sha256 value="782a0ba6b54b15bcd722551bd9c54b4b96b883388447141da5ad9ca434ffcb0b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-coverage-proto" version="31.0.2">
          <artifact name="android-test-plugin-host-coverage-proto-31.0.2.jar">
             <sha256 value="22686a7d1775171e76534ab8f40f9c9677cabc77321088e3268cb9cb74d0e5c6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage-proto" version="31.4.0">
+         <artifact name="android-test-plugin-host-coverage-proto-31.4.0.jar">
+            <sha256 value="efb4d7014aaa7355246a07c2e437a2231fb252540ff1bce6872c88dc8da89d12" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-coverage-proto" version="31.4.1">
+         <artifact name="android-test-plugin-host-coverage-proto-31.4.1.jar">
+            <sha256 value="efb4d7014aaa7355246a07c2e437a2231fb252540ff1bce6872c88dc8da89d12" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-device-info" version="31.0.0">
          <artifact name="android-test-plugin-host-device-info-31.0.0.jar">
             <sha256 value="b17261e7f9f5f1195ec333b18621dfcbfd08a303fccc3987374d82b1ca5aae38" origin="Generated by Gradle"/>
@@ -2912,6 +4349,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="2e7b95eda2cb48b2461df0270f7665f801e15b4f7c0fe1c1190d933334bf5f88" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info" version="31.4.0">
+         <artifact name="android-test-plugin-host-device-info-31.4.0.jar">
+            <sha256 value="4caffd2c254737596dbd3a56a138a691f668b21d8b2e882488d1dcac3e366c7f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-test-plugin-host-device-info-31.4.0.module">
+            <sha256 value="b26c2362be457fe197701614a7a9f57b66b081e3f246f681fb59e093e8618ebf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info" version="31.4.1">
+         <artifact name="android-test-plugin-host-device-info-31.4.1.jar">
+            <sha256 value="88e393ac6ddafd872be2723a9a435995b01a1d5df0cdea0c235850e6fd42c2d6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-test-plugin-host-device-info-31.4.1.module">
+            <sha256 value="41119635a2e245c58b048c53c810fb43503576b4cc9cfa91ca807c8507b3b2a6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-device-info-proto" version="31.0.0">
          <artifact name="android-test-plugin-host-device-info-proto-31.0.0.jar">
             <sha256 value="2981a0892b14f189b27c068020b858d91f02c3951bab9b15d49c30d2d356baea" origin="Generated by Gradle"/>
@@ -2922,6 +4375,42 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="2981a0892b14f189b27c068020b858d91f02c3951bab9b15d49c30d2d356baea" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info-proto" version="31.4.0">
+         <artifact name="android-test-plugin-host-device-info-proto-31.4.0.jar">
+            <sha256 value="4f5eccc1d47a981b3ff120e98a3de0988214108fe9dc7b068e95a6b686ada495" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-device-info-proto" version="31.4.1">
+         <artifact name="android-test-plugin-host-device-info-proto-31.4.1.jar">
+            <sha256 value="4f5eccc1d47a981b3ff120e98a3de0988214108fe9dc7b068e95a6b686ada495" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control" version="31.4.0">
+         <artifact name="android-test-plugin-host-emulator-control-31.4.0.jar">
+            <sha256 value="e805505739a07d9601c0056da56961d7c094e363e2c2181cd6549a9709cf17e3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-test-plugin-host-emulator-control-31.4.0.module">
+            <sha256 value="793c454d45cfea081aaecde2939cc7fa73a8fda1573372e261370a2f03088919" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control" version="31.4.1">
+         <artifact name="android-test-plugin-host-emulator-control-31.4.1.jar">
+            <sha256 value="3ef68c87cee8b53e8eb94a09726861877c244159de8582b5819856f070b87185" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-test-plugin-host-emulator-control-31.4.1.module">
+            <sha256 value="09135470b1da10b8a7ea77ae090dea8cbff9bd59ab653e2080f72d570125bcd8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control-proto" version="31.4.0">
+         <artifact name="android-test-plugin-host-emulator-control-proto-31.4.0.jar">
+            <sha256 value="aedec5ec4627d898cccdf42d8038db20eba4495753c53d1b0b378734491caf5f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-emulator-control-proto" version="31.4.1">
+         <artifact name="android-test-plugin-host-emulator-control-proto-31.4.1.jar">
+            <sha256 value="aedec5ec4627d898cccdf42d8038db20eba4495753c53d1b0b378734491caf5f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-logcat" version="31.0.0">
          <artifact name="android-test-plugin-host-logcat-31.0.0.jar">
             <sha256 value="8e0ca774310c4b6abb769ba466a4cb13f1d7c47395fc19b4834402209e8c322d" origin="Generated by Gradle"/>
@@ -2938,11 +4427,37 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="5c66828e36a4796b2d1828ef3856399deb9fc8c9e3f62cdbc4385544439eb79d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat" version="31.4.0">
+         <artifact name="android-test-plugin-host-logcat-31.4.0.jar">
+            <sha256 value="a78beb10162e7c28b57fcde777c12f895121fa38a2a776366d73517b359dfe88" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-test-plugin-host-logcat-31.4.0.module">
+            <sha256 value="9bb194a27fbf786c721c18bd4a3f8bebe0f3464f9fce5dc18b3fe8097cedbed5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat" version="31.4.1">
+         <artifact name="android-test-plugin-host-logcat-31.4.1.jar">
+            <sha256 value="80b634bcf76e50497704da7e2281a96d3725bdc657dfbe252edf3897c5990f76" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-test-plugin-host-logcat-31.4.1.module">
+            <sha256 value="c5f17631357f930020cb550727a8967b3f055f0462a477c913e76cf7afb6afd4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-logcat-proto" version="31.0.2">
          <artifact name="android-test-plugin-host-logcat-proto-31.0.2.jar">
             <sha256 value="62234086f76d3dc1d1acbf9def72fcd7741ce2a10de587b4608ab45da62e9bc1" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat-proto" version="31.4.0">
+         <artifact name="android-test-plugin-host-logcat-proto-31.4.0.jar">
+            <sha256 value="9129024bd8e38353bca3eb26dfd8e3628e058d57d6e9d8451ffc35f016751e63" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-logcat-proto" version="31.4.1">
+         <artifact name="android-test-plugin-host-logcat-proto-31.4.1.jar">
+            <sha256 value="9129024bd8e38353bca3eb26dfd8e3628e058d57d6e9d8451ffc35f016751e63" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-retention" version="31.0.0">
          <artifact name="android-test-plugin-host-retention-31.0.0.jar">
             <sha256 value="374e4126edc56dc7666e5c84e312ca8370931fd7677c672cdeab60b3e874dff1" origin="Generated by Gradle"/>
@@ -2964,11 +4479,37 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="b05e6429a93aa548d1ddc8b3a23affad850a7ac7a7424074517bf42c0b76f110" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-retention" version="31.4.0">
+         <artifact name="android-test-plugin-host-retention-31.4.0.jar">
+            <sha256 value="7e380d328c9b3da7064b18ef79eed7957ef57faa8581b5b8f7d4264c778958bd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-test-plugin-host-retention-31.4.0.module">
+            <sha256 value="f80c5074497e855051ee332d9eae030ae27e79d5fda5a371d2088242cbff67bf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-retention" version="31.4.1">
+         <artifact name="android-test-plugin-host-retention-31.4.1.jar">
+            <sha256 value="7a21b8d83545e2c91925f6650e5c0a5eb80d8f29b233e42215a4fe30562b806d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-test-plugin-host-retention-31.4.1.module">
+            <sha256 value="2de2f29c0fb6cdabe61cfae61bec2dad9bbe5307c01276e350f9940c5e512ba1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-host-retention-proto" version="31.0.2">
          <artifact name="android-test-plugin-host-retention-proto-31.0.2.jar">
             <sha256 value="031c4c933c5e53ddb863b960074ba36ec040a2464f208d4f5d390d2b227f6505" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-retention-proto" version="31.4.0">
+         <artifact name="android-test-plugin-host-retention-proto-31.4.0.jar">
+            <sha256 value="3db8ed38ef49b694caea466ae22e3b36cedc9557b3589d0e07c0cdd83294591c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-host-retention-proto" version="31.4.1">
+         <artifact name="android-test-plugin-host-retention-proto-31.4.1.jar">
+            <sha256 value="3db8ed38ef49b694caea466ae22e3b36cedc9557b3589d0e07c0cdd83294591c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle" version="31.0.0">
          <artifact name="android-test-plugin-result-listener-gradle-31.0.0.jar">
             <sha256 value="b2e0ccbc02041ef54494de85e4887700b521730a0bd1e660e0f553cd58e62ca6" origin="Generated by Gradle"/>
@@ -2990,11 +4531,47 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="d4fd8996ac9a03ee65d1b1823ebd6b70fb0c9b07252a6cd2a38614835b256707" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle" version="31.4.0">
+         <artifact name="android-test-plugin-result-listener-gradle-31.4.0.jar">
+            <sha256 value="709a4c4703ef81eef8511d3b747a46c09d8f0ceaf99eee1c449afefbb41736c8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-test-plugin-result-listener-gradle-31.4.0.module">
+            <sha256 value="9119cef6eed301cae0dadc58ab20bf74a540ba08d30c38a45aad974a47418153" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle" version="31.4.1">
+         <artifact name="android-test-plugin-result-listener-gradle-31.4.1.jar">
+            <sha256 value="42c2a59ed10ca56f21eeb52dbaa436a1ecf121dfb97e484a1b545da8bb31173e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-test-plugin-result-listener-gradle-31.4.1.module">
+            <sha256 value="418c26c65eb6f9387397559c0fd57c55d7d7a3e3f8d175ad61a0a88c40b440c0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="31.0.2">
          <artifact name="android-test-plugin-result-listener-gradle-proto-31.0.2.jar">
             <sha256 value="38c664b016fc380676ab80fb9da0c42f13b049cfd98d16467a2049fe85072e70" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="31.4.0">
+         <artifact name="android-test-plugin-result-listener-gradle-proto-31.4.0.jar">
+            <sha256 value="cbdf71bca60e14c30e7b2cf4b90f0f0a3e8c138f7cadd874b0d9c0ae082e0274" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="android-test-plugin-result-listener-gradle-proto" version="31.4.1">
+         <artifact name="android-test-plugin-result-listener-gradle-proto-31.4.1.jar">
+            <sha256 value="cbdf71bca60e14c30e7b2cf4b90f0f0a3e8c138f7cadd874b0d9c0ae082e0274" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="utp-common" version="31.4.0">
+         <artifact name="utp-common-31.4.0.jar">
+            <sha256 value="bb150aea0c945d38f3360a7eb656d9e721b1cc6cddb36d50fe392cf7015762ce" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.tools.utp" name="utp-common" version="31.4.1">
+         <artifact name="utp-common-31.4.1.jar">
+            <sha256 value="bb150aea0c945d38f3360a7eb656d9e721b1cc6cddb36d50fe392cf7015762ce" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.annimon" name="stream" version="1.1.8">
          <artifact name="stream-1.1.8.jar">
             <sha256 value="5da6e2e3e0551d61a3ea7014f04312276549e3dd739cf637996e4cf43c5535b9" origin="Generated by Gradle"/>
@@ -3037,6 +4614,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="2045ddd4adf0a2e56c054022055c949f7c722aa04986d8341e96d5c106fddf62" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.17.2">
+         <artifact name="jackson-annotations-2.17.2.jar">
+            <sha256 value="873a606e23507969f9bbbea939d5e19274a88775ea5a169ba7e2d795aa5156e1" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-annotations-2.17.2.module">
+            <sha256 value="28cc43e98e7881803e1e828521e38ab7aed2f977a36c2551dd1790f430f3ebcf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson.core" name="jackson-core" version="2.12.0">
          <artifact name="jackson-core-2.12.0.jar">
             <sha256 value="8acab5ef6e4f332bbb331b3fcd24d716598770d13a47e7215aa5ee625d1fd9c9" origin="Generated by Gradle"/>
@@ -3061,6 +4646,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="1bc11f6558a1f2a15a16f8d1e7e1aba7a68a2eed1a2337a68659e2016d2858cf" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-core" version="2.17.2">
+         <artifact name="jackson-core-2.17.2.jar">
+            <sha256 value="721a189241dab0525d9e858e5cb604d3ecc0ede081e2de77d6f34fa5779a5b46" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-core-2.17.2.module">
+            <sha256 value="38282fb75c733d2395dd34dc0b59eccbb43aa7cc31a21a2616baaa8afcb7f236" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.12.0">
          <artifact name="jackson-databind-2.12.0.jar">
             <sha256 value="75d470eda0dd559e43f2ad08209fa09ecd268833492ba93fa46f6f3607acbab7" origin="Generated by Gradle"/>
@@ -3085,6 +4678,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="44702a2bfdd1a3b292711b9356291db05df961d180555849d2cbf60eb9ccb101" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.17.2">
+         <artifact name="jackson-databind-2.17.2.jar">
+            <sha256 value="c04993f33c0f845342653784f14f38373d005280e6359db5f808701cfae73c0c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-databind-2.17.2.module">
+            <sha256 value="f470bde8944d57d6b150caa8bf53bb982a99eb1d6591e731afcb972ab3dd771f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson.module" name="jackson-module-kotlin" version="2.12.0">
          <artifact name="jackson-module-kotlin-2.12.0.jar">
             <sha256 value="ee69650831f72ff2411026b507f3583e90ca88b40e9dae3067f87b34088e0ced" origin="Generated by Gradle"/>
@@ -3093,6 +4694,24 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="7eaf1d8f4e688fd28e58d4249523788af1391a8ecf687db98fc6e3f3f5f94912" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson.module" name="jackson-module-kotlin" version="2.17.2">
+         <artifact name="jackson-module-kotlin-2.17.2.jar">
+            <sha256 value="f96986fe7bc25559f938324065bd7a0e96c0d59acf17a48e26e517a9abd411e8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-module-kotlin-2.17.2.module">
+            <sha256 value="44a3670a99cd31ac262e0c559b4d106cf725af2bf6108991a12816244571d084" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.ajalt.clikt" name="clikt" version="4.2.2">
+         <artifact name="clikt-4.2.2.module">
+            <sha256 value="c5bf32d41e9f06b37b5eb8cd1c27d47d89c37690106e272427374a7463ab9e70" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.ajalt.clikt" name="clikt-jvm" version="4.2.2">
+         <artifact name="clikt-jvm-4.2.2.module">
+            <sha256 value="b7bc6c98f2d2e1739d9e43a0959addce98e8b2ec48bd34926891854c9df24897" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.github.bumptech.glide" name="annotations" version="4.15.1">
          <artifact name="annotations-4.15.1.jar">
             <sha256 value="c331e74f28d573319d6863bfbef3691cd3775580ff4a33b95ed3f227cc339b0d" origin="Generated by Gradle"/>
@@ -3263,6 +4882,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="5ce71656118618731e34a5d4c61aa3a031be23446dc7de8b5a5e77b66ebcd6ef" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.api.grpc" name="proto-google-common-protos" version="2.17.0">
+         <artifact name="proto-google-common-protos-2.17.0.jar">
+            <sha256 value="4ef1fe0c327fc1521d1d753b0b1c4a875a54bd14ebded3afff0ca395320b6ea9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.auto.service" name="auto-service-annotations" version="1.0.1">
          <artifact name="auto-service-annotations-1.0.1.jar">
             <sha256 value="c7bec54b7b5588b5967e870341091c5691181d954cf2039f1bf0a6eeb837473b" origin="Generated by Gradle"/>
@@ -3303,6 +4927,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.code.gson" name="gson" version="2.10.1">
+         <artifact name="gson-2.10.1.jar">
+            <sha256 value="4241c14a7727c34feea6507ec801318a3d4a90f070e4525681079fb94ee4c593" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.code.gson" name="gson" version="2.8.6">
          <artifact name="gson-2.8.6.jar">
             <sha256 value="c8fb4839054d280b3033f800d1f5a97de2f028eb8ba2eb458ad287e536f3f25f" origin="Generated by Gradle"/>
@@ -3338,6 +4967,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="bd0112f8958f0e7259a7e51b9f6d59842aa821439117d1ae08167bb48c0f1d74" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing" version="1.9.20-1.0.14">
+         <artifact name="symbol-processing-1.9.20-1.0.14.jar">
+            <sha256 value="4e96043552488f0606dca92d67ef9bc55c2132b979b27540edf9d0f7f0fb4525" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.devtools.ksp" name="symbol-processing-api" version="1.7.0-1.0.6">
          <artifact name="symbol-processing-api-1.7.0-1.0.6.jar">
             <sha256 value="adc29417be5ca9ff42118105fea4e36d9ef44987abfc41432309371a60198941" origin="Generated by Gradle"/>
@@ -3354,11 +4988,32 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="b1520f2dfdb4237824df4d50348257877a062cf456a9f0262db1ca6febeab2c2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing-api" version="1.9.20-1.0.14">
+         <artifact name="symbol-processing-api-1.9.20-1.0.14.jar">
+            <sha256 value="d0339396f40dc9eb3b3f7bc86257f93869ee23448fa31ec4a1de900c6b7ae6d7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="symbol-processing-api-1.9.20-1.0.14.module">
+            <sha256 value="b351e1ea830783a903ecd55b100642ccf879b76db469d5d1b13b7bd757f36abb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.devtools.ksp" name="symbol-processing-cmdline" version="1.8.10-1.0.9">
          <artifact name="symbol-processing-cmdline-1.8.10-1.0.9.jar">
             <sha256 value="94e492877a3f6f80c631cfe75e2c2f1bb37bc90d394409c02bcdfc19850a1a63" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing-cmdline" version="1.9.20-1.0.14">
+         <artifact name="symbol-processing-cmdline-1.9.20-1.0.14.jar">
+            <sha256 value="44c3b6a7723288dbb964a5b1314026bdab26ab18a19f7c1442195d313d4866fe" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing-common-deps" version="1.9.20-1.0.14">
+         <artifact name="symbol-processing-common-deps-1.9.20-1.0.14.jar">
+            <sha256 value="6462be878c3f1e72fe3361b4f4e6f4ac7e75caca3e1cfd32668834ca86bbacb8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="symbol-processing-common-deps-1.9.20-1.0.14.module">
+            <sha256 value="f0672af5030c6b992fcaf98e998b28f353dce9373d59130d3b592898177e9c6b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.devtools.ksp" name="symbol-processing-gradle-plugin" version="1.8.10-1.0.9">
          <artifact name="symbol-processing-gradle-plugin-1.8.10-1.0.9.jar">
             <sha256 value="55e4cc86d65744d408f5e617787fb12fcdcd5fc82be8b389a02c34441fedb6e1" origin="Generated by Gradle"/>
@@ -3367,6 +5022,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="9be982baefd72b59cde55744d284d80f0d3d206ebbc6965a2c1bb27bb99f5301" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing-gradle-plugin" version="1.9.20-1.0.14">
+         <artifact name="symbol-processing-gradle-plugin-1.9.20-1.0.14.jar">
+            <sha256 value="9fdb5412a517d9e3ab0b7413ad7165e402592d986bd8f1b5f5e9ff3f91cd82d2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="symbol-processing-gradle-plugin-1.9.20-1.0.14.module">
+            <sha256 value="4d224a790fa0eaa873724b50548ebc5c909d9748a9a77a21a8fbeabc27819d2c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.errorprone" name="error_prone_annotations" version="2.10.0">
          <artifact name="error_prone_annotations-2.10.0.jar">
             <sha256 value="a249d4d25dfb86d41e6c82fc335df580189f0c9feeabdc53233fc1e5060724a1" origin="Generated by Gradle"/>
@@ -3392,6 +5055,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="6ebd22ca1b9d8ec06d41de8d64e0596981d9607b42035f9ed374f9de271a481a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.errorprone" name="error_prone_annotations" version="2.21.1">
+         <artifact name="error_prone_annotations-2.21.1.jar">
+            <sha256 value="d1f3c66aa91ac52549e00ae3b208ba4b9af7d72d68f230643553beb38e6118ac" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.errorprone" name="error_prone_annotations" version="2.3.4">
          <artifact name="error_prone_annotations-2.3.4.jar">
             <sha256 value="baf7d6ea97ce606c53e11b6854ba5f2ce7ef5c24dddf0afa18d1260bd25b002c" origin="Generated by Gradle"/>
@@ -3537,6 +5205,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="a42edc9cab792e39fe39bb94f3fca655ed157ff87a8af78e1d6ba5b07c4a00ab" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.guava" name="guava" version="32.0.1-jre">
+         <artifact name="guava-32.0.1-jre.jar">
+            <sha256 value="bd7fa227591fb8509677d0d1122cf95158f3b8a9f45653f58281d879f6dc48c5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.guava" name="guava" version="32.1.3-android">
+         <artifact name="guava-32.1.3-android.jar">
+            <sha256 value="20e6ac8902ddf49e7806cc70f3054c8d91accb5eefdc10f3207e80e0a336b263" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="guava-32.1.3-android.module">
+            <sha256 value="f8a87cef72c0e8027a6fae3cbdf0072a241ce6d8e760f96e7087b742a6605a61" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="guava-32.1.3-jre.jar">
+            <sha256 value="6d4e2b5a118aab62e6e5e29d185a0224eed82c85c40ac3d33cf04a270c3b3744" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.guava" name="listenablefuture" version="1.0">
          <artifact name="listenablefuture-1.0.jar">
             <sha256 value="e4ad7607e5c0477c6f890ef26a49cb8d1bb4dffb650bab4502afee64644e3069" origin="Generated by Gradle"/>
@@ -3557,6 +5241,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.j2objc" name="j2objc-annotations" version="2.8">
+         <artifact name="j2objc-annotations-2.8.jar">
+            <sha256 value="f02a95fa1a5e95edb3ed859fd0fb7df709d121a35290eff8b74dce2ab7f4d6ed" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.jimfs" name="jimfs" version="1.1">
          <artifact name="jimfs-1.1.jar">
             <sha256 value="c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd" origin="Generated by Gradle"/>
@@ -3582,6 +5271,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="440642e3b526663d1c15b4a2071c2696f2a25f031332ac3eb43f63969d819b3d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.protobuf" name="protobuf-java" version="3.22.3">
+         <artifact name="protobuf-java-3.22.3.jar">
+            <sha256 value="59d388ea6a2d2d76ae8efff7fd4d0c60c6f0f464c3d3ab9be8e5add092975708" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.protobuf" name="protobuf-java-util" version="3.17.2">
          <artifact name="protobuf-java-util-3.17.2.jar">
             <sha256 value="849925333aac23f46f9a154a52e441117017d5673e04e5636993bcc3cf1924d9" origin="Generated by Gradle"/>
@@ -3592,6 +5286,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="1ec0733f32d49f8194fb5452613039370623715739568a6d3c987d9a7809c16c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.protobuf" name="protobuf-java-util" version="3.22.3">
+         <artifact name="protobuf-java-util-3.22.3.jar">
+            <sha256 value="c615f76879dc5c303e4df5b94a6afa39534058c7545db2d483fd95d9f63c8bfe" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.protobuf" name="protobuf-javalite" version="3.11.4">
          <artifact name="protobuf-javalite-3.11.4.jar">
             <sha256 value="8cacea2f7a042dabae295c509dcdbfe32a49aa3708eec6ddb8efd8593aa0b4a3" origin="Generated by Gradle"/>
@@ -3621,31 +5320,61 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="a945c7d044f6dd6fae7e315b02dc5cfa75432df41c624c3fb0baeecb841a95ef" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.testing.platform" name="android-device-provider-local" version="0.0.9-alpha02">
+         <artifact name="android-device-provider-local-0.0.9-alpha02.jar">
+            <sha256 value="446d0fca4e3711e3e37219cf888ec12b4dec3f14999ee439735385fb787e914b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.testing.platform" name="android-driver-instrumentation" version="0.0.8-alpha08">
          <artifact name="android-driver-instrumentation-0.0.8-alpha08.jar">
             <sha256 value="c4436abe8b83e5fc7341b2314fd6b327feb8a7b64c294f8b9d08b8b3be214afc" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.testing.platform" name="android-driver-instrumentation" version="0.0.9-alpha02">
+         <artifact name="android-driver-instrumentation-0.0.9-alpha02.jar">
+            <sha256 value="a34731dc23ead15144ad100efac5726a7ed82c2ec8b889504d549ae72dff5029" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.testing.platform" name="android-test-plugin" version="0.0.8-alpha08">
          <artifact name="android-test-plugin-0.0.8-alpha08.jar">
             <sha256 value="27a7ca80d78e568f29e2e59487202d1918e7ba26ff511c756e35e8746baa6e93" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.testing.platform" name="android-test-plugin" version="0.0.9-alpha02">
+         <artifact name="android-test-plugin-0.0.9-alpha02.jar">
+            <sha256 value="a87ed1c766c9a498cfc9280ca65d0c4853875b7ed7fa5ffd89428904eba1c0ff" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.testing.platform" name="core" version="0.0.8-alpha08">
          <artifact name="core-0.0.8-alpha08.jar">
             <sha256 value="88f278028d24b154435dd8563dff4c618bb737b6539d277e46327d898243e722" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.testing.platform" name="core" version="0.0.9-alpha02">
+         <artifact name="core-0.0.9-alpha02.jar">
+            <sha256 value="fe215abd101f29fb388535592e1f14bb4cf8501da6db84422ba1945ac4e26872" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.testing.platform" name="core-proto" version="0.0.8-alpha08">
          <artifact name="core-proto-0.0.8-alpha08.jar">
             <sha256 value="3920575a74f1437975cdf45276f9b75e7ae41bafb8deb1d60e7d639f21d1b06c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.testing.platform" name="core-proto" version="0.0.9-alpha02">
+         <artifact name="core-proto-0.0.9-alpha02.jar">
+            <sha256 value="6d8a8906774150f43a8fad08ca64e25c6070c39bd8a6fc13b2593f289242fe95" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.testing.platform" name="launcher" version="0.0.8-alpha08">
          <artifact name="launcher-0.0.8-alpha08.jar">
             <sha256 value="b12982e7c34c56e480b18d49f1405a8965a9b79823c3805a488c5bc642e579d9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.testing.platform" name="launcher" version="0.0.9-alpha02">
+         <artifact name="launcher-0.0.9-alpha02.jar">
+            <sha256 value="5423e8ca410fcdbcfb3286c18b8be080eaf4ee9bd796ead903e8c885ead16ec3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.zxing" name="android-integration" version="3.3.0">
          <artifact name="android-integration-3.3.0.jar">
             <sha256 value="dc6d6da7d4f4a7dffa6a049e62db6d0cd4c28aa14524968e41460e559a444e84" origin="Generated by Gradle"/>
@@ -3743,6 +5472,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="073121922d2b231e58cd02e010f48b02996180bff609865523c64bf78b489e94" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli" version="1.0.1">
+         <artifact name="ktlint-cli-1.0.1.jar">
+            <sha256 value="81889a9cab5da042aea48869b170299fec7d6f66773aa7d5245b8b8ccb8d0c89" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-1.0.1.module">
+            <sha256 value="1013cec46eb04dba1f3aa4ac447b98d214866677b1bef672328bf077ff0d7755" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli" version="1.2.1">
+         <artifact name="ktlint-cli-1.2.1.jar">
+            <sha256 value="15240d762e3bfad9a7acff74beffa2089e692654aa308732b468f86753cc9edb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-1.2.1.module">
+            <sha256 value="aa34f201408258a6575d893769415f237c2b4ff5aff8aa7c0707584275ae47e0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.pinterest.ktlint" name="ktlint-cli-reporter" version="0.49.1">
          <artifact name="ktlint-cli-reporter-0.49.1.jar">
             <sha256 value="1ff38b245dfdfdf3a16424441a9f5315f6c60079a14cb6fa88b677682ab395f6" origin="Generated by Gradle"/>
@@ -3751,6 +5496,150 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="9aa896aa57a058f2b7e1cd3ac1c15bd4fa4a2d977b4f647e504e706e33a03849" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli-reporter-baseline" version="1.0.1">
+         <artifact name="ktlint-cli-reporter-baseline-1.0.1.jar">
+            <sha256 value="2e7f0c581540a7674b05d36735bfcabe84b14b47de10f13f7f3738cc476f0bd4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-reporter-baseline-1.0.1.module">
+            <sha256 value="5a357f0a878f6bacad7e009aa446ae53cf72efbb795944009442d233bf75b6b2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli-reporter-baseline" version="1.2.1">
+         <artifact name="ktlint-cli-reporter-baseline-1.2.1.jar">
+            <sha256 value="87ef91fbddd952574521a40934d8f3b1d972f011b19c3fdc5750857841841164" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-reporter-baseline-1.2.1.module">
+            <sha256 value="32f6495f22e882ec366364eaaca08041e06529f0f0aeb8873078754e8ff8142d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli-reporter-checkstyle" version="1.0.1">
+         <artifact name="ktlint-cli-reporter-checkstyle-1.0.1.jar">
+            <sha256 value="fb41b8b1f46987cceaac03b1ae526e132d284fd24c2573167369af7f3a672775" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-reporter-checkstyle-1.0.1.module">
+            <sha256 value="39aeb181903e8fafd651c87e2683a8d885c0b38c448b4dab86d4b6aece8beab8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli-reporter-checkstyle" version="1.2.1">
+         <artifact name="ktlint-cli-reporter-checkstyle-1.2.1.jar">
+            <sha256 value="2056042709d85b314e8e49b7c02dabe4ba45c9e410da953f66bbad28a6d82b99" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-reporter-checkstyle-1.2.1.module">
+            <sha256 value="7943944eacce62b7d2989fe2be101e4bbc7b73b7303660e6a564f37334e9710b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli-reporter-core" version="1.0.1">
+         <artifact name="ktlint-cli-reporter-core-1.0.1.jar">
+            <sha256 value="4e7319d32bd1d990fe0dae234582908d08e8514aef84e1dad83cb9a5a159ade3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-reporter-core-1.0.1.module">
+            <sha256 value="e466ea107dfe367b6da7bbe86b0ea856791bf1b5574e4c361b126a56d71de8b3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli-reporter-core" version="1.2.1">
+         <artifact name="ktlint-cli-reporter-core-1.2.1.jar">
+            <sha256 value="3b26e4029695ecbf791e2d9fdab5ba0cbeff7ac474299f5d593b764a06d7b73f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-reporter-core-1.2.1.module">
+            <sha256 value="8ca383632e4cba5976f1819a91a1fd5c919849fb54398de2765dc9a03826d042" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli-reporter-format" version="1.0.1">
+         <artifact name="ktlint-cli-reporter-format-1.0.1.jar">
+            <sha256 value="bd2e23533c2f9d625b7b2519439385802d80fc0764620c8bdc42a49e93370b64" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-reporter-format-1.0.1.module">
+            <sha256 value="fe66e4e160a2adbce020017c8e3201e2fcc0f9286f5642f4e4af222304766d89" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli-reporter-format" version="1.2.1">
+         <artifact name="ktlint-cli-reporter-format-1.2.1.jar">
+            <sha256 value="4c6e8a1f73bc1ce4cbc671bc9d9aadfc90bb29ddc0b52bc2a5f2644df0254ee6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-reporter-format-1.2.1.module">
+            <sha256 value="60e16dfc2d9c4c1fc1d09fea892306bb90c355d6a2cd47eaef2df2a1d34aa91a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli-reporter-html" version="1.0.1">
+         <artifact name="ktlint-cli-reporter-html-1.0.1.jar">
+            <sha256 value="7243022af49f92d4ef495aee161adf65f6c4639997952980acf237988754e964" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-reporter-html-1.0.1.module">
+            <sha256 value="d59d01331d723cc44e70b1ca5ed72275bf3d278789559b8fe7bb9d6e05b6cb7a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli-reporter-html" version="1.2.1">
+         <artifact name="ktlint-cli-reporter-html-1.2.1.jar">
+            <sha256 value="4cf8d32a20e29ba88d5198cbba9826c5e162ed8f66bd2083d5b85ee0dc091375" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-reporter-html-1.2.1.module">
+            <sha256 value="1e431354dab16bf7f36159d88f2b6620a7eb8d0041402f1d2129e320c87ee2c0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli-reporter-json" version="1.0.1">
+         <artifact name="ktlint-cli-reporter-json-1.0.1.jar">
+            <sha256 value="4ec9975b68dd950b41d15db343602fff448c858bac2e3643f85cdf5de2525bee" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-reporter-json-1.0.1.module">
+            <sha256 value="825fe7ec674cff0c3a7b26bed198b986595467ba8b5e5dae90cfc43c2c9b46bd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli-reporter-json" version="1.2.1">
+         <artifact name="ktlint-cli-reporter-json-1.2.1.jar">
+            <sha256 value="c94a2728ecea4be5348f8ef9c5742694f11f71032ef2aac1af6a686063df2c0a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-reporter-json-1.2.1.module">
+            <sha256 value="d19d492514eac98886268c13cc2a0d1f0b36cf46db7653c5c02ea606e9bbe883" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli-reporter-plain" version="1.0.1">
+         <artifact name="ktlint-cli-reporter-plain-1.0.1.jar">
+            <sha256 value="ab211bb3b9076f8cf4536fca39e757a7518fd2864151407cb025f0564bc59892" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-reporter-plain-1.0.1.module">
+            <sha256 value="6856c13679b833b95afdd77a76f68a4c35331edd53332303dafa4465ff219fe5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli-reporter-plain" version="1.2.1">
+         <artifact name="ktlint-cli-reporter-plain-1.2.1.jar">
+            <sha256 value="5dd5949cd1088f2a75f295863cfb7259e54e3577c64496e191dc124dae1701df" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-reporter-plain-1.2.1.module">
+            <sha256 value="7a2a48c6d3ea35723e89f08d666f87b227182794fb5831a1377051b657aed792" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli-reporter-plain-summary" version="1.0.1">
+         <artifact name="ktlint-cli-reporter-plain-summary-1.0.1.jar">
+            <sha256 value="404f6ea0c2b6fd6f19eb8a488a44b7fc0b4f8e116dccba2ea921c506fc4604be" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-reporter-plain-summary-1.0.1.module">
+            <sha256 value="580fcd1d4048928cd9230f6f2d52476c5ed794997589ec771fe5b0d34a8fe40d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli-reporter-plain-summary" version="1.2.1">
+         <artifact name="ktlint-cli-reporter-plain-summary-1.2.1.jar">
+            <sha256 value="7949112e97d62185e546b578050511ffe08f56420a426041ea61a9a7d308df20" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-reporter-plain-summary-1.2.1.module">
+            <sha256 value="5bb492e41a7b4c9297cb99368ae1b0d1d306e25b8f9bc87a53d2aded6580340e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli-reporter-sarif" version="1.0.1">
+         <artifact name="ktlint-cli-reporter-sarif-1.0.1.jar">
+            <sha256 value="31e170b8ce281c8ac192f42fbd1efc521b9250c13ed67a5898b72c54d390c7b0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-reporter-sarif-1.0.1.module">
+            <sha256 value="7b02755b5d4c103c0e29f787a2910558ba943a371451265ba1b061bd564238d4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli-reporter-sarif" version="1.2.1">
+         <artifact name="ktlint-cli-reporter-sarif-1.2.1.jar">
+            <sha256 value="9294c37ba80058a9ddb95d5e8404d8deea67ae8dba9d67559f0668bee7d88682" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-reporter-sarif-1.2.1.module">
+            <sha256 value="fabead41c1aad77b5554d6d882e5ece198ba89bd6eabea776c7709fca248f441" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.pinterest.ktlint" name="ktlint-cli-ruleset-core" version="0.49.1">
          <artifact name="ktlint-cli-ruleset-core-0.49.1.jar">
             <sha256 value="2c6889c1b5a65a9a88dac09ddc5e6397356f0122bb6023c055e57e1d361d4095" origin="Generated by Gradle"/>
@@ -3759,6 +5648,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="8e73bd327ccc7f0d5fd473f88c979c66edcdd114c2b5af2ef8ab4626ff36afe1" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli-ruleset-core" version="1.0.1">
+         <artifact name="ktlint-cli-ruleset-core-1.0.1.jar">
+            <sha256 value="218c602960994903a672d7a191dd01b6fd015a86b67145a470bb57deeb388f5a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-ruleset-core-1.0.1.module">
+            <sha256 value="25c84bf9e92d259b5077c27851bdd92ad4b8dd61227054c535f16c20edc20f54" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-cli-ruleset-core" version="1.2.1">
+         <artifact name="ktlint-cli-ruleset-core-1.2.1.jar">
+            <sha256 value="e4ef4627f9dfe820f5ead537e52547da0e55628bda61a926760f0c9bc4ea5006" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-cli-ruleset-core-1.2.1.module">
+            <sha256 value="8375e2c23122c0b0ec3ed5264d2693957fbf0866f686963709600afa02dfd26d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.pinterest.ktlint" name="ktlint-core" version="0.43.2">
          <artifact name="ktlint-core-0.43.2.jar">
             <sha256 value="401515a76b780a32ef9dfeaf69f77316934c4bb90f339488638311789eca7a1a" origin="Generated by Gradle"/>
@@ -3791,6 +5696,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="4bac3caffe62adf63023fe934020f728274c4d567d39936bf0392933811b7f45" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.pinterest.ktlint" name="ktlint-logger" version="1.0.1">
+         <artifact name="ktlint-logger-1.0.1.jar">
+            <sha256 value="4d11c82204f55940b6354a26c9a71bc3586f27528bcb294661b87964943c526f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-logger-1.0.1.module">
+            <sha256 value="7041ce959fbfb388da63753cd1833b2fcb93b6ddc5c03a268e5aa807a6e6c37f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-logger" version="1.2.1">
+         <artifact name="ktlint-logger-1.2.1.jar">
+            <sha256 value="e63438fe5bab47f1b2fdd980577e32c7c00d7019b5432c06a0f1c2cdbc096b7c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-logger-1.2.1.module">
+            <sha256 value="7c389a17e6c691846feb4473fefc32cfc39e9259385269300eadccdb2f045bf0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.pinterest.ktlint" name="ktlint-reporter-baseline" version="0.43.2">
          <artifact name="ktlint-reporter-baseline-0.43.2.jar">
             <sha256 value="733ee7e2cadb321d6597b3501c70c7da73117adaa0c6bc084dfc16c455d68806" origin="Generated by Gradle"/>
@@ -3967,6 +5888,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="9de9030fa2d16f84e02a7f33299c8c6538916202949ee46725d81ace1b4c856a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.pinterest.ktlint" name="ktlint-rule-engine" version="1.0.1">
+         <artifact name="ktlint-rule-engine-1.0.1.jar">
+            <sha256 value="38ea20553969a554ff2293b2c638869cf0dfef175edeed69ade8ff749b8a09dc" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-rule-engine-1.0.1.module">
+            <sha256 value="9168ba81f8d9eb855e09053c3133e1925323e7685317352a7f03c0677f12e3da" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-rule-engine" version="1.2.1">
+         <artifact name="ktlint-rule-engine-1.2.1.jar">
+            <sha256 value="023ff56bf7bb59160d10256b9a8a04f2afbe2dc643c40f2a09911554a49152b4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-rule-engine-1.2.1.module">
+            <sha256 value="3b16be290bee49d75550dcf78d65af0b09bd5be2d66b1879919494dc71fdf72e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.pinterest.ktlint" name="ktlint-rule-engine-core" version="0.49.1">
          <artifact name="ktlint-rule-engine-core-0.49.1.jar">
             <sha256 value="89967a53e3f0cf3a714b5d860f070ca6df3830924ff94c8e9013dd1dcc3db561" origin="Generated by Gradle"/>
@@ -3975,6 +5912,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="09a7017262a86a7d1c2d49df77caa8ab1d6ffdbbc729072a59597ee2f2e299ea" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.pinterest.ktlint" name="ktlint-rule-engine-core" version="1.0.1">
+         <artifact name="ktlint-rule-engine-core-1.0.1.jar">
+            <sha256 value="ee4417d9a9fe1d42c700b90acb68f0afb3bd5ab8a4c6cfa5d3733887631d654e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-rule-engine-core-1.0.1.module">
+            <sha256 value="dae1a5b2c1efb042305e5b29879ba4181e2c14d8c5cb2a704a021d7a8f6ad4fe" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-rule-engine-core" version="1.2.1">
+         <artifact name="ktlint-rule-engine-core-1.2.1.jar">
+            <sha256 value="eefe75dd29a7c65c9915ef56679c3abfd30465ea8a2d28349ac7a9c96e8022c9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-rule-engine-core-1.2.1.module">
+            <sha256 value="7a33eb1b8165c210040e7fd9b05b66446a6198663fb3267e6b445ee607d08475" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.pinterest.ktlint" name="ktlint-ruleset-experimental" version="0.43.2">
          <artifact name="ktlint-ruleset-experimental-0.43.2.jar">
             <sha256 value="d89e0edcdca0ae375c090565e323520ab5d424d82fd6ac6290ea986d360f0b11" origin="Generated by Gradle"/>
@@ -4015,6 +5968,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="3f23852712c978a1b771eb1defd84b6cee9bca80f75de9b19e649250bdaecc4d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.pinterest.ktlint" name="ktlint-ruleset-standard" version="1.0.1">
+         <artifact name="ktlint-ruleset-standard-1.0.1.jar">
+            <sha256 value="a19d94b7dc967d7433ff9e486037f9db7cfc6ba7739f62f9049f86f3a2fb0273" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-ruleset-standard-1.0.1.module">
+            <sha256 value="fd6fc869b1a0df0a45d391fd0e768b0771a7e8d376da8e1dc801afe02aac2815" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.pinterest.ktlint" name="ktlint-ruleset-standard" version="1.2.1">
+         <artifact name="ktlint-ruleset-standard-1.2.1.jar">
+            <sha256 value="8a9e8d478a5201d9b198c2e942d5a0b36724f6626cc6f8079132deba03760c1b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-ruleset-standard-1.2.1.module">
+            <sha256 value="a8af1434d729e57ac4a34bb5d52a0b34dd670819a8bc6de6f0c8714f1c3c0fd4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.pinterest.ktlint" name="ktlint-ruleset-test" version="0.43.2">
          <artifact name="ktlint-ruleset-test-0.43.2.jar">
             <sha256 value="7270c4d98b2cda268c25397a02b7dea0ab8cb923958cb3853121e0d9366ce797" origin="Generated by Gradle"/>
@@ -4142,24 +6111,20 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="676eb608f56199dff11c9c9d68e078e7768c54e60080e7ae12db8ec8e120675b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.squareup.okhttp" name="okhttp" version="2.5.0">
-         <artifact name="okhttp-2.5.0.jar">
-            <sha256 value="1cc716e29539adcda677949508162796daffedb4794cbf947a6f65e696f0381c" origin="Generated by Gradle"/>
+      <component group="com.squareup.okhttp3" name="mockwebserver" version="4.12.0">
+         <artifact name="mockwebserver-4.12.0.jar">
+            <sha256 value="6784673687f4ac8f21679b9d4bc7cdb46e1a1ce1be9d3133b36bede59a741561" origin="Generated by Gradle"/>
          </artifact>
-      </component>
-      <component group="com.squareup.okhttp" name="okhttp-urlconnection" version="2.5.0">
-         <artifact name="okhttp-urlconnection-2.5.0.jar">
-            <sha256 value="79ec6f4e79e683105e87fe83278a531c693e538d30e3b9237000ce7c94fcb2cf" origin="Generated by Gradle"/>
+         <artifact name="mockwebserver-4.12.0.module">
+            <sha256 value="93e4696552118b6425462aed936edfd320c9fcedef0a82d5741c0a7d53c0cf74" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.squareup.okhttp3" name="mockwebserver" version="3.12.13">
-         <artifact name="mockwebserver-3.12.13.jar">
-            <sha256 value="ec92604c885f37eede54cd8504c871a5163616d94074f34ce27184845e7cfd4c" origin="Generated by Gradle"/>
+      <component group="com.squareup.okhttp3" name="okhttp" version="4.12.0">
+         <artifact name="okhttp-4.12.0.jar">
+            <sha256 value="b1050081b14bb7a3a7e55a4d3ef01b5dcfabc453b4573a4fc019767191d5f4e0" origin="Generated by Gradle"/>
          </artifact>
-      </component>
-      <component group="com.squareup.okhttp3" name="okhttp" version="3.12.13">
-         <artifact name="okhttp-3.12.13.jar">
-            <sha256 value="508234e024ef7e270ab1a6d5b356f5b98e786511239ca986d684fd1e2cf7bc82" origin="Generated by Gradle"/>
+         <artifact name="okhttp-4.12.0.module">
+            <sha256 value="607e220ff8215b929d829bbf54f332894f1459b4d795979aeafcbcc1cea54cf3" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.squareup.okhttp3" name="okhttp-dnsoverhttps" version="3.12.13">
@@ -4167,16 +6132,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="fa51769ed42036919f7b56f769d29ae28abb61b30cb91732767656fcebe21fcc" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.squareup.okhttp3" name="okhttp-dnsoverhttps" version="4.12.0">
+         <artifact name="okhttp-dnsoverhttps-4.12.0.jar">
+            <sha256 value="659d872093bb9dfe7be1e0b818302b6f19c79e2fddc05a545553a65a5cf3154f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="okhttp-dnsoverhttps-4.12.0.module">
+            <sha256 value="6a8f49dbf68c03dcffda2c7d63b9e06f395e68164d3581783edb7bce3414f44f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.squareup.okio" name="okio" version="1.15.0">
          <artifact name="okio-1.15.0.jar">
             <sha256 value="693fa319a7e8843300602b204023b7674f106ebcb577f2dd5807212b66118bd2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.squareup.okio" name="okio" version="1.6.0">
-         <artifact name="okio-1.6.0.jar">
-            <sha256 value="114bdc1f47338a68bcbc95abf2f5cdc72beeec91812f2fcd7b521c1937876266" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.squareup.okio" name="okio" version="2.8.0">
          <artifact name="okio-2.8.0.module">
             <sha256 value="17baab7270389a5fa63ab12811864d0a00f381611bc4eb042fa1bd5918ed0965" origin="Generated by Gradle"/>
@@ -4193,6 +6161,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="dcbe63ed43b2c90c325e9e6a0863e2e7605980bff5e728c6de1088be5574979e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.squareup.okio" name="okio" version="3.6.0">
+         <artifact name="okio-3.6.0.module">
+            <sha256 value="6a47ac50364e6598459401fb86f9b6cfcdf637b9b3a3045b1cc33cbf4c408218" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="okio-metadata-3.6.0-all.jar">
+            <sha256 value="2bbd3f0645a3ada7e6532b2e6db471af4861464e1a140f95f807dfd16aa049e3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.squareup.okio" name="okio-bom" version="3.0.0">
          <artifact name="okio-bom-3.0.0.module">
             <sha256 value="fb5d398df7754d9a95279ff09f1292ebf8dc145008f046a2710c07637aff0e69" origin="Generated by Gradle"/>
@@ -4206,6 +6182,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="17f48d41775bd84dea78e9dfed8dfbcc66af80567a5c9ec9d9608785ec820cde" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.squareup.okio" name="okio-jvm" version="3.6.0">
+         <artifact name="okio-jvm-3.6.0.jar">
+            <sha256 value="67543f0736fc422ae927ed0e504b98bc5e269fda0d3500579337cb713da28412" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="okio-jvm-3.6.0.module">
+            <sha256 value="b1c2199e1c0cc969ef61cbbe4af2ecaf9b06411bdde01cbaf6fc9134dfe04e8a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.squareup.okio" name="okio-multiplatform" version="2.8.0">
          <artifact name="okio-multiplatform-2.8.0.module">
             <sha256 value="87c4327538ba166a914171631470a6e9db2b007125bae164af6b0d47aefd34d7" origin="Generated by Gradle"/>
@@ -4350,6 +6334,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="e599d5318e97aa48f42136a2927e6dfa4e8881dff0e6c8e3109ddbbff51d7b7d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="commons-io" name="commons-io" version="2.13.0">
+         <artifact name="commons-io-2.13.0.jar">
+            <sha256 value="671eaa39688dac2ffaa4645b3c9980ae2d0ea2471e4ae6a5da199cd15ae23666" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="commons-io" name="commons-io" version="2.4">
          <artifact name="commons-io-2.4.jar">
             <sha256 value="cc6a41dc3eaacc9e440a6bd0d2890b20d36b4ee408fe2d67122f328bb6e01581" origin="Generated by Gradle"/>
@@ -4360,6 +6349,32 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="dev.drewhamilton.poko" name="poko-annotations" version="0.15.0">
+         <artifact name="poko-annotations-0.15.0.module">
+            <sha256 value="66d7224d73cd1c350b7523e2d70c11e366fbea51d9cf61ff1099149de35d7fb0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="dev.drewhamilton.poko" name="poko-annotations" version="0.15.2">
+         <artifact name="poko-annotations-0.15.2.module">
+            <sha256 value="baf3502ea74a29dfaeb0014bf592f7ccea70768ea9979de62b0cecaa5aaa81da" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="dev.drewhamilton.poko" name="poko-annotations-jvm" version="0.15.0">
+         <artifact name="poko-annotations-jvm-0.15.0.jar">
+            <sha256 value="3bcb96770ac52075c431201e29fd5e67924435555df22f5e5ab2602b7b773635" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="poko-annotations-jvm-0.15.0.module">
+            <sha256 value="b79c2f6f898fa8e1bf1415a85a14f98fd99f770e00b3e91e9ba6cf1d915bbbff" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="dev.drewhamilton.poko" name="poko-annotations-jvm" version="0.15.2">
+         <artifact name="poko-annotations-jvm-0.15.2.jar">
+            <sha256 value="3bcb96770ac52075c431201e29fd5e67924435555df22f5e5ab2602b7b773635" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="poko-annotations-jvm-0.15.2.module">
+            <sha256 value="645c4504e23ae3b636412b69911e84f272bcd5d54347e312b475503f2296fe8c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="dnsjava" name="dnsjava" version="2.1.9">
          <artifact name="dnsjava-2.1.9.jar">
             <sha256 value="072bba34267ffad8907c30a99a6b68f900782f3191454d278e395e289d478446" origin="Generated by Gradle"/>
@@ -4408,6 +6423,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="9b53a57f325c7ee52cbb4780582dd52afd5c7a9b216bb423bb3516ee66849dc4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="im.molly" name="ringrtc-android" version="2.44.0-1">
+         <artifact name="ringrtc-android-2.44.0-1.aar">
+            <sha256 value="b68fe5d60519ab666eed5356bfb6718366b8be656c288eac70738327d37b1a6c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="info.picocli" name="picocli" version="3.9.6">
          <artifact name="picocli-3.9.6.jar">
             <sha256 value="9442a6a18d869354a0d922ba37b40032aa1b0a172f414a7a644de39d1972f1f4" origin="Generated by Gradle"/>
@@ -4423,6 +6443,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="0e7191fbe324fb9df8d2d207c07b666b8dc25bbbe26f53a4c52e2fece624a976" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="info.picocli" name="picocli" version="4.7.5">
+         <artifact name="picocli-4.7.5.jar">
+            <sha256 value="e83a906fb99b57091d1d68ac11f7c3d2518bd7a81a9c71b259e2c00d1564c8e8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.github.aakira" name="napier" version="1.4.1">
          <artifact name="napier-1.4.1.module">
             <sha256 value="10296ebb83b6812d87b4d3c9f965eafcf5c7b2c8f737c5a044bbd987c4221970" origin="Generated by Gradle"/>
@@ -4460,6 +6485,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="fc9db13ba22cb1101af1ce89c7a073f02f7d23308d0b4c680ece1eec7d80868c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.github.detekt.sarif4k" name="sarif4k" version="0.5.0">
+         <artifact name="sarif4k-0.5.0.module">
+            <sha256 value="e72a62f07b569d13a5d66ba837e74ac33c68cfef01c13f3adde183e7ae64ce89" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.github.detekt.sarif4k" name="sarif4k-jvm" version="0.5.0">
+         <artifact name="sarif4k-jvm-0.5.0.jar">
+            <sha256 value="ead041938323b34336138cf43e1875d8aff90b5e7e9411dbede3d201a327f1a7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="sarif4k-jvm-0.5.0.module">
+            <sha256 value="948a3bad5ce43582aad460366096ca50b491f68a86b586189deb3fa8350e76b1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.github.microutils" name="kotlin-logging-jvm" version="2.1.23">
          <artifact name="kotlin-logging-jvm-2.1.23.jar">
             <sha256 value="e00e75d6b5cc3d24bed2c9542cc65a080435986fe6ecc569da72a4fb6dfd91c8" origin="Generated by Gradle"/>
@@ -4476,6 +6514,27 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="5472ae04eed460a71718a52fefcf1dec59d2dd5ea0c7aba6c957d5e0bb60a098" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.github.oshai" name="kotlin-logging" version="5.1.0">
+         <artifact name="kotlin-logging-5.1.0.module">
+            <sha256 value="dd3ab77e0ec3508ca08980b5426eda6623ce8a5b7d422f383da1607b8513e384" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.github.oshai" name="kotlin-logging-jvm" version="5.1.0">
+         <artifact name="kotlin-logging-jvm-5.1.0.jar">
+            <sha256 value="0e918ecb22a61b99f1eb9acebd689fdaa9a76dc9fe972c360fd36299a92aa892" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-logging-jvm-5.1.0.module">
+            <sha256 value="23991be08eafe5c7b97c0f211d0bf7f0cbfd4276d8630e874cc61f6930375dc6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.github.oshai" name="kotlin-logging-jvm" version="6.0.3">
+         <artifact name="kotlin-logging-jvm-6.0.3.jar">
+            <sha256 value="57d70e95d6ff63a260bb1ea246123a5414af558527b39c4229ed649fa48c8e09" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-logging-jvm-6.0.3.module">
+            <sha256 value="d68bf057facea210647e151917cc077336e159f1fd45216f6c72cdd2285994d9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.grpc" name="grpc-api" version="1.39.0">
          <artifact name="grpc-api-1.39.0.jar">
             <sha256 value="4e80074dc2c627372044599cf873bf644450a218c58af48c03d5bb086cced484" origin="Generated by Gradle"/>
@@ -4491,6 +6550,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="9f21b1585b1c578cf905fb4c926ce895494207cb5bf456a64a24c458850f51d3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.grpc" name="grpc-api" version="1.57.0">
+         <artifact name="grpc-api-1.57.0.jar">
+            <sha256 value="8d2c384299f84ee8aa7f670f00e7cb26b87e231cf3091474307b32b76910f71c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.grpc" name="grpc-context" version="1.39.0">
          <artifact name="grpc-context-1.39.0.jar">
             <sha256 value="97fe70b4e7da86ed4fe3deb16d83fc89c7e5b764ebac8c9dd5d51dd4b5aa920c" origin="Generated by Gradle"/>
@@ -4506,6 +6570,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="541ec1d7ad3389f0b302461432a44b16fc1329153cd0e16faf2d2028b446340d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.grpc" name="grpc-context" version="1.57.0">
+         <artifact name="grpc-context-1.57.0.jar">
+            <sha256 value="953fcacd82f531e69b76e3834f5830bad4c22ae84144e058d71dc80a7430275d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.grpc" name="grpc-core" version="1.39.0">
          <artifact name="grpc-core-1.39.0.jar">
             <sha256 value="3febeb19e18873369efa9bf08edd4e49c4fa3ebdad44e704ac6ea352b62b6be2" origin="Generated by Gradle"/>
@@ -4521,6 +6590,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="c4782555fefb61c72898759a7d11f5f221811935bcf983efb478d796228b65dc" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.grpc" name="grpc-core" version="1.57.0">
+         <artifact name="grpc-core-1.57.0.jar">
+            <sha256 value="3bee48c73bc4c5b55bed79be0e484adf26ba56bebbe5798ddbf34714ef1e1cea" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.grpc" name="grpc-netty" version="1.39.0">
          <artifact name="grpc-netty-1.39.0.jar">
             <sha256 value="672da08c944010494c29ce7ee8323194949d8520e4ea4fe0e6d44e65b9489700" origin="Generated by Gradle"/>
@@ -4531,6 +6605,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="0fef3ca6747242624cad219fdd13b5dbca121de04ea122f5cb1cb5082d998313" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.grpc" name="grpc-netty" version="1.57.0">
+         <artifact name="grpc-netty-1.57.0.jar">
+            <sha256 value="81d43f2d4ed18fa341bd840a3735f1403a70074a046e157e27f679b721b4c9ad" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.grpc" name="grpc-okhttp" version="1.55.1">
          <artifact name="grpc-okhttp-1.55.1.jar">
             <sha256 value="58d3e2903f67357670b962941635926df3a167ee38f06d66dee82c3646b9514f" origin="Generated by Gradle"/>
@@ -4546,6 +6625,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="f59fe662030e30923a91c5d80bf3a25486be2740d08b6757575e7c4213782694" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.grpc" name="grpc-protobuf" version="1.57.0">
+         <artifact name="grpc-protobuf-1.57.0.jar">
+            <sha256 value="49f986d4eab12610fdba4a6890fca52d5eb653598916fdb863a366d5e28eecf7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.grpc" name="grpc-protobuf-lite" version="1.39.0">
          <artifact name="grpc-protobuf-lite-1.39.0.jar">
             <sha256 value="94d9c5ee88abe06a741b4e62d05df6251409e2ccc8e510575891ce3d780c164e" origin="Generated by Gradle"/>
@@ -4561,6 +6645,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="d0253390609c72ec09c31ae46e79b01cd72a2ce2ccae11176de550ffd475c853" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.grpc" name="grpc-protobuf-lite" version="1.57.0">
+         <artifact name="grpc-protobuf-lite-1.57.0.jar">
+            <sha256 value="2c507c02d981b84a21763d44e09af4f279881dd3e25be3080f6361258607f198" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.grpc" name="grpc-stub" version="1.39.0">
          <artifact name="grpc-stub-1.39.0.jar">
             <sha256 value="c85782e20da6eadbf07537f35d52bf2abafd891ae14c27b7d36a4d450575eeb3" origin="Generated by Gradle"/>
@@ -4576,6 +6665,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="58c114817d42237ce50a5f7677cf142564df64200e59c956e49302b6c8af616a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.grpc" name="grpc-stub" version="1.57.0">
+         <artifact name="grpc-stub-1.57.0.jar">
+            <sha256 value="6e6ee141539fa14d9fa479f7f511605544443c7e011e78e273cf9468aa183060" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.mockk" name="mockk" version="1.13.2">
          <artifact name="mockk-1.13.2.module">
             <sha256 value="763ca22e765cc710ef5ba32c8e016a31c0217579f6e61b173282e9338d2dd190" origin="Generated by Gradle"/>
@@ -4682,6 +6776,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="568ff7cd9d8e2284ec980730c88924f686642929f8f219a74518b4e64755f3a1" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.netty" name="netty-buffer" version="4.1.93.Final">
+         <artifact name="netty-buffer-4.1.93.Final.jar">
+            <sha256 value="007c7d9c378df02d390567d0d7ddf542ffddb021b7313dbf502392113ffabb08" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.netty" name="netty-codec" version="4.1.52.Final">
          <artifact name="netty-codec-4.1.52.Final.jar">
             <sha256 value="3c7e78dcce7e353d86ac7dba2c251ab5cddd4eb86eaa889cfe4229782b828e52" origin="Generated by Gradle"/>
@@ -4692,6 +6791,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="5d8591ca271a1e9c224e8de3873aa9936acb581ee0db514e7dc18523df36d16c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.netty" name="netty-codec" version="4.1.93.Final">
+         <artifact name="netty-codec-4.1.93.Final.jar">
+            <sha256 value="990c378168dc6364c6ff569701f4f2f122fffe8998b3e189eba4c4d868ed1084" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.netty" name="netty-codec-http" version="4.1.52.Final">
          <artifact name="netty-codec-http-4.1.52.Final.jar">
             <sha256 value="b5da28d0ea878b07d3111acf5e4faf41288ef2302b26414190fdd1a7d973c80c" origin="Generated by Gradle"/>
@@ -4702,6 +6806,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="fa6fec88010bfaf6a7415b5364671b6b18ffb6b35a986ab97b423fd8c3a0174b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.netty" name="netty-codec-http" version="4.1.93.Final">
+         <artifact name="netty-codec-http-4.1.93.Final.jar">
+            <sha256 value="dacf78ce78ab2d29570325db4cd2451ea589639807de95881a0fa7155a9e6b55" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.netty" name="netty-codec-http2" version="4.1.52.Final">
          <artifact name="netty-codec-http2-4.1.52.Final.jar">
             <sha256 value="eb527a42d2289d12dee6d4753ca2715978a37bbb41c71915ce4e9539c49f93a1" origin="Generated by Gradle"/>
@@ -4712,6 +6821,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="c89a70500f59e8563e720aaa808263a514bd9e2bd91ba84eab8c2ccb45f234b2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.netty" name="netty-codec-http2" version="4.1.93.Final">
+         <artifact name="netty-codec-http2-4.1.93.Final.jar">
+            <sha256 value="d96cc09045a1341c6d47494352aa263b87b72fb1d2ea9eca161aa73820bfe8bb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.netty" name="netty-codec-socks" version="4.1.52.Final">
          <artifact name="netty-codec-socks-4.1.52.Final.jar">
             <sha256 value="fecc577e0bb7721d6768cfc1846ee172911d16ab80dfbd9995d9657a551d4ea7" origin="Generated by Gradle"/>
@@ -4722,6 +6836,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="33c4cd134858aabc5afe5dc440c8880186017dc4dc541f34c8e16bffc5546d07" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.netty" name="netty-codec-socks" version="4.1.93.Final">
+         <artifact name="netty-codec-socks-4.1.93.Final.jar">
+            <sha256 value="0ea47b5ba23ca1da8eb9146c8fc755c1271414633b1e2be2ce1df764ba0fff2a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.netty" name="netty-common" version="4.1.52.Final">
          <artifact name="netty-common-4.1.52.Final.jar">
             <sha256 value="0d1f101e4db7d530ed04d7cabd57d95c0750f059bb6b3fadfed0c80d4734c717" origin="Generated by Gradle"/>
@@ -4732,6 +6851,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="8adb4c291260ceb2859a68c49f0adeed36bf49587608e2b81ecff6aaf06025e9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.netty" name="netty-common" version="4.1.93.Final">
+         <artifact name="netty-common-4.1.93.Final.jar">
+            <sha256 value="443bb316599fb16e3baeba2fb58881814d7ff0b7af176fe76e38071a6e86f8c0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.netty" name="netty-handler" version="4.1.52.Final">
          <artifact name="netty-handler-4.1.52.Final.jar">
             <sha256 value="2cdc21fbfae04940c85929039779c93f51f618f5efb216079319dcfcf32a55c1" origin="Generated by Gradle"/>
@@ -4742,6 +6866,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="9cb6012af7e06361d738ac4e3bdc49a158f8cf87d9dee0f2744056b7d99c28d5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.netty" name="netty-handler" version="4.1.93.Final">
+         <artifact name="netty-handler-4.1.93.Final.jar">
+            <sha256 value="4e5f563ae14ed713381816d582f5fcfd0615aefb29203486cdfb782d8a00a02b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.netty" name="netty-handler-proxy" version="4.1.52.Final">
          <artifact name="netty-handler-proxy-4.1.52.Final.jar">
             <sha256 value="e8d07863ceb4bd4806e255a1d532c8650f0f3b2d4d006ad6d21812e941b42fdc" origin="Generated by Gradle"/>
@@ -4752,6 +6881,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="ce1123250450d2b17815748177fd36843690b8cd703b47e6dc12d159d86da30d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.netty" name="netty-handler-proxy" version="4.1.93.Final">
+         <artifact name="netty-handler-proxy-4.1.93.Final.jar">
+            <sha256 value="2ac5f7fbefa0b73ef783889069344d5515505a14b2303be693c5002c486df2b4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.netty" name="netty-resolver" version="4.1.52.Final">
          <artifact name="netty-resolver-4.1.52.Final.jar">
             <sha256 value="6eeb72a233979cb45b0b4d6d46c5a41332c57c0cf8a803b1efc60dbbecba09a6" origin="Generated by Gradle"/>
@@ -4762,6 +6896,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="6474598aab7cc9d8d6cfa06c05bd1b19adbf7f8451dbdd73070b33a6c60b1b90" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.netty" name="netty-resolver" version="4.1.93.Final">
+         <artifact name="netty-resolver-4.1.93.Final.jar">
+            <sha256 value="e59770b66e81822e5d111ac4e544d7eb0c543e0a285f52628e53941acd8ed759" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.netty" name="netty-tcnative-classes" version="2.0.46.Final">
          <artifact name="netty-tcnative-classes-2.0.46.Final.jar">
             <sha256 value="d3ec888dcc4ac7915bf88b417c5e04fd354f4311032a748a6882df09347eed9a" origin="Generated by Gradle"/>
@@ -4777,6 +6916,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="c5fb68e9a65b6e8a516adfcb9fa323479ee7b4d9449d8a529d2ecab3d3711d5a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.netty" name="netty-transport" version="4.1.93.Final">
+         <artifact name="netty-transport-4.1.93.Final.jar">
+            <sha256 value="a5a78019bc1cd43dbc3c7b7cdd3801912ca26d1f498fb560514fee497864ba96" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-transport-native-unix-common" version="4.1.93.Final">
+         <artifact name="netty-transport-native-unix-common-4.1.93.Final.jar">
+            <sha256 value="774165a1c4dbaacb17f9c1ad666b3569a6a59715ae828e7c3d47703f479a53e7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.perfmark" name="perfmark-api" version="0.23.0">
          <artifact name="perfmark-api-0.23.0.jar">
             <sha256 value="c705b5c10c18ff3032b9e81742bc2f6b0e5607f6a6dfc0c8ad0cff75d4913042" origin="Generated by Gradle"/>
@@ -4793,6 +6942,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="22961ff0b626a66d1e5eada3e9fae8d2ad345147625de5ada73bcb3a86b59f0d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.perfmark" name="perfmark-api" version="0.26.0">
+         <artifact name="perfmark-api-0.26.0.jar">
+            <sha256 value="b7d23e93a34537ce332708269a0d1404788a5b5e1949e82f5535fce51b3ea95b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="perfmark-api-0.26.0.module">
+            <sha256 value="31d832332474ce48150f5bae003343319136f336afd1076a289029319e3ea97a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.reactivex.rxjava3" name="rxandroid" version="3.0.0">
          <artifact name="rxandroid-3.0.0.aar">
             <sha256 value="5b3582a1e9fd9e9037ee933ab9486ff323d6244b5f1b6ff6ebadc2bfa957ce5b" origin="Generated by Gradle"/>
@@ -4911,6 +7068,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="0aeb625c948c697ea7b205156e112363b59ed5e2551212cd4e460bdb72c7c06e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.commons" name="commons-compress" version="1.21">
+         <artifact name="commons-compress-1.21.jar">
+            <sha256 value="6aecfd5459728a595601cfa07258d131972ffc39b492eb48bdd596577a2f244a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.commons" name="commons-lang3" version="3.1">
          <artifact name="commons-lang3-3.1.jar">
             <sha256 value="131f0519a8e4602e47cf024bfd7e0834bcf5592a7207f9a2fdb711d4f5afc166" origin="Generated by Gradle"/>
@@ -4921,6 +7083,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="6fe9026a566c6a5001608cf3fc32196641f6c1e5e1986d1037ccdbd5f31ef743" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.httpcomponents" name="httpclient" version="4.5.14">
+         <artifact name="httpclient-4.5.14.jar">
+            <sha256 value="c8bc7e1c51a6d4ce72f40d2ebbabf1c4b68bfe76e732104b04381b493478e9d6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.httpcomponents" name="httpclient" version="4.5.6">
          <artifact name="httpclient-4.5.6.jar">
             <sha256 value="c03f813195e7a80e3608d0ddd8da80b21696a4c92a6a2298865bf149071551c7" origin="Generated by Gradle"/>
@@ -4946,6 +7113,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="3cbaed088c499a10f96dde58f39dc0e7985171abd88138ca1655a872011bb142" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.httpcomponents" name="httpcore" version="4.4.16">
+         <artifact name="httpcore-4.4.16.jar">
+            <sha256 value="6c9b3dd142a09dc468e23ad39aad6f75a0f2b85125104469f026e52a474e464f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.httpcomponents" name="httpmime" version="4.5.6">
          <artifact name="httpmime-4.5.6.jar">
             <sha256 value="0b2b1102c18d3c7e05a77214b9b7501a6f6056174ae5604e0e256776eda7553e" origin="Generated by Gradle"/>
@@ -4976,6 +7148,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="e5b9cb821df57f70b0593358e89c0e8d7266515da9d088af6c646f63d433c07c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.bouncycastle" name="bcpkix-jdk18on" version="1.77">
+         <artifact name="bcpkix-jdk18on-1.77.jar">
+            <sha256 value="1ac7fe8efd5b2f38cdc165be5a0675734fe44808dab92707201f03a535d6f1b8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.bouncycastle" name="bcprov-jdk15on" version="1.56">
          <artifact name="bcprov-jdk15on-1.56.jar">
             <sha256 value="963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349" origin="Generated by Gradle"/>
@@ -5001,11 +7178,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="39287f2208a753db419f5ca529d6c80f094614aa74d790331126b3c9c6b85fda" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.bouncycastle" name="bcprov-jdk18on" version="1.77">
+         <artifact name="bcprov-jdk18on-1.77.jar">
+            <sha256 value="dabb98c24d72c9b9f585633d1df9c5cd58d9ad373d0cd681367e6a603a495d58" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.bouncycastle" name="bcutil-jdk15on" version="1.70">
          <artifact name="bcutil-jdk15on-1.70.jar">
             <sha256 value="52dc5551b0257666526c5095424567fed7dc7b00d2b1ba7bd52298411112b1d0" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.bouncycastle" name="bcutil-jdk18on" version="1.77">
+         <artifact name="bcutil-jdk18on-1.77.jar">
+            <sha256 value="947673bcbc5a8dde2d2fa688a5b7598d0ca6e2a74a7ea30cd93f04f6b3ad68f8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.checkerframework" name="checker-compat-qual" version="2.5.5">
          <artifact name="checker-compat-qual-2.5.5.jar">
             <sha256 value="11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a" origin="Generated by Gradle"/>
@@ -5024,6 +7211,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="d047949c1b81091c2c3913771fac2f32a2fa549ba3d5d548cc8c0b6dfa493777" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.checkerframework" name="checker-qual" version="3.33.0">
+         <artifact name="checker-qual-3.33.0.jar">
+            <sha256 value="e316255bbfcd9fe50d165314b85abb2b33cb2a66a93c491db648e498a82c2de1" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="checker-qual-3.33.0.module">
+            <sha256 value="e8521d75625d41272c767d262a153ac163cc505b66644a2ef705fa8949ffb4e5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.checkerframework" name="checker-qual" version="3.37.0">
+         <artifact name="checker-qual-3.37.0.jar">
+            <sha256 value="e4ce1376cc2735e1dde220b62ad0913f51297704daad155a33f386bc5db0d9f7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="checker-qual-3.37.0.module">
+            <sha256 value="7258a769dcaa26b98154d229d85cc72e5b3666b0bcb637d2daf16ec498956638" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.checkerframework" name="checker-qual" version="3.5.0">
          <artifact name="checker-qual-3.5.0.jar">
             <sha256 value="729990b3f18a95606fc2573836b6958bcdb44cb52bfbd1b7aa9c339cff35a5a4" origin="Generated by Gradle"/>
@@ -5034,6 +7237,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="dffefada8294865be5035515c0320fb679443d285f4a5f8adadcf00c1130e84c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy" version="3.0.17">
+         <artifact name="groovy-3.0.17.jar">
+            <sha256 value="9ed2a565a8592a9f63f410afed892d0ca6bec1ff96277ce4cc7f3e2e366e794f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy" version="3.0.9">
          <artifact name="groovy-3.0.9.jar">
             <sha256 value="77bf86897f295f8cae2e1f46b1eca109f487ba81b66ef24a2b6dcba1eb7d6ce7" origin="Generated by Gradle"/>
@@ -5054,6 +7262,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="2f25841c937e24959a57b630e2c4b8525b3d0f536f2e511c9b2bed30b1651d54" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.mojo" name="animal-sniffer-annotations" version="1.23">
+         <artifact name="animal-sniffer-annotations-1.23.jar">
+            <sha256 value="9ffe526bf43a6348e9d8b33b9cd6f580a7f5eed0cf055913007eda263de974d0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.conscrypt" name="conscrypt-android" version="2.0.0">
          <artifact name="conscrypt-android-2.0.0.aar">
             <sha256 value="400ca559a49b860a82862b22cee0e3110764bdcf7ee7c79e7479895c25cdfc09" origin="Generated by Gradle"/>
@@ -5097,6 +7310,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="a6e082b23c6e32ed673c7e0556b65c70f62df739aab04383a729b33ffb38aafa" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.gradle.kotlin" name="gradle-kotlin-dsl-plugins" version="4.2.1">
+         <artifact name="gradle-kotlin-dsl-plugins-4.2.1.jar">
+            <sha256 value="514f32c9e9c0d080238bdffc0121f43d16049c5785a9a75eb8660c4eba658ffa" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="gradle-kotlin-dsl-plugins-4.2.1.module">
+            <sha256 value="d30f17331533715dcb8081b862f6631947f860f1cb8e05a325c7b1888cff2a00" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.greenrobot" name="eventbus" version="3.0.0">
          <artifact name="eventbus-3.0.0.jar">
             <sha256 value="180d4212467df06f2fbc9c8d8a2984533ac79c87769ad883bc421612f0b4e17c" origin="Generated by Gradle"/>
@@ -5152,21 +7373,59 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="b8c8f3127c45dcaf2b5fc25507dece9f4ef0f7995d6da92a8b334cacfcffe67c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-android-extensions" version="1.9.20">
+         <artifact name="kotlin-android-extensions-1.9.20.jar">
+            <sha256 value="b771239469f0af07e180f746cfde6a7956c2b6261e1ae20e5b1d620a0dd29bff" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-android-extensions-runtime" version="1.8.10">
          <artifact name="kotlin-android-extensions-runtime-1.8.10.jar">
             <sha256 value="91bc5fcf09f210b5878d2cc2533ed959faf5465dd63259f9333667941d8ba265" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-android-extensions-runtime" version="1.9.20">
+         <artifact name="kotlin-android-extensions-runtime-1.9.20.jar">
+            <sha256 value="21f5762db56c8c0f5630407f14002f11c2f1d038929dc006da766a7af7f62e78" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-annotation-processing-gradle" version="1.8.10">
          <artifact name="kotlin-annotation-processing-gradle-1.8.10.jar">
             <sha256 value="8ee7fb9a6596648c07bbf2072fd7ff68f055e1c1a2ed931ac16ad0e8e280a9cd" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-assignment" version="1.9.20">
+         <artifact name="kotlin-assignment-1.9.20-gradle81.jar">
+            <sha256 value="ced94dedc74c3943a5691b18ead4d16732f0bdb41078b02824d0fc7e82e3fee2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-assignment-1.9.20.module">
+            <sha256 value="29f0336adcb724f6b1d385c6ed27d8bf5162907317bbc82fb9a4e3189f03e467" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-assignment-compiler-plugin-embeddable" version="1.9.20">
+         <artifact name="kotlin-assignment-compiler-plugin-embeddable-1.9.20.jar">
+            <sha256 value="c621b857f5fe131219d8576e191d06f2db7a6df80fa149d046c32eba26906add" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-build-common" version="1.8.10">
          <artifact name="kotlin-build-common-1.8.10.jar">
             <sha256 value="b1b40f680b6ed054697fecf0434774f1c36e1b3f0038382b8fc7aaad5b6114e6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-build-common" version="1.9.20">
+         <artifact name="kotlin-build-common-1.9.20.jar">
+            <sha256 value="17319416d0fa12cd77a9f365f8b8cb9c616953883368a5c7f529cf082da9e98d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-api" version="1.9.20">
+         <artifact name="kotlin-build-tools-api-1.9.20.jar">
+            <sha256 value="c722948c568352cdc19dc8a8b245d14aae507d4dcffde6a7b26c535c472c1b17" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-impl" version="1.9.20">
+         <artifact name="kotlin-build-tools-impl-1.9.20.jar">
+            <sha256 value="b7377a08d67dcddcbe4f7930d8cb0f7d0055789fbb30efdbe97008405d1f026d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-compiler" version="1.8.10">
          <artifact name="kotlin-compiler-1.8.10.jar">
             <sha256 value="a9931ba5342f20439e9b139cdcda3b99ccef9fd32b153af0f137d1e06dbf0477" origin="Generated by Gradle"/>
@@ -5192,16 +7451,41 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="5655386be55d45a78d887372bbd59d03e06750f7756108d14139e8d7e4b2e179" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="1.9.10">
+         <artifact name="kotlin-compiler-embeddable-1.9.10.jar">
+            <sha256 value="b6d3965fdb3fc2a5f8d965681c215c37552b28ae5ad19fcadbc1568c9b65dab4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="1.9.20">
+         <artifact name="kotlin-compiler-embeddable-1.9.20.jar">
+            <sha256 value="a25024fe5da8440de01af045c4fcb954a22f078738ec02616085f0cfc57b2702" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="1.9.22">
+         <artifact name="kotlin-compiler-embeddable-1.9.22.jar">
+            <sha256 value="2bfeadee59ab1988c336dbd6e65d991f766ae1dd8683f2a6ded5faa0279f0ca0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="1.8.10">
          <artifact name="kotlin-compiler-runner-1.8.10.jar">
             <sha256 value="e4af2a17b476a889b6179b4de811f14033072671f4c828de52d0092d53bf2677" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="1.9.20">
+         <artifact name="kotlin-compiler-runner-1.9.20.jar">
+            <sha256 value="49769c046f8d392654a4ab52af795455bd41e88d8392aeab9028f0edd5e8d50b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="1.8.10">
          <artifact name="kotlin-daemon-client-1.8.10.jar">
             <sha256 value="0ae3b87c69d5b83663c65b7a24bbb060924fa2c7bd00c191f5bb710b10401d73" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="1.9.20">
+         <artifact name="kotlin-daemon-client-1.9.20.jar">
+            <sha256 value="582230cbcfd65d36b94bc9d127f90024b8cf17dfa4a67ef6a929f14c6c27661c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="1.5.31">
          <artifact name="kotlin-daemon-embeddable-1.5.31.jar">
             <sha256 value="f61eaf89e5e3848631650b25cdfb66fe8cae0281a054d9d986716000a15ba8d6" origin="Generated by Gradle"/>
@@ -5222,6 +7506,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="4602bd521a708f32deced0921d06c7977056c5887359cdabfc7070e9732cb353" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="1.9.10">
+         <artifact name="kotlin-daemon-embeddable-1.9.10.jar">
+            <sha256 value="79bd4bf388da4430b0a9be86d2f72a111110941965edd478e99f3ae083156116" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="1.9.20">
+         <artifact name="kotlin-daemon-embeddable-1.9.20.jar">
+            <sha256 value="a939cb5d6ee2a758c9285bd9f3286824beabe12d9a4b5f49f784d0bca329dea5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="1.9.22">
+         <artifact name="kotlin-daemon-embeddable-1.9.22.jar">
+            <sha256 value="92a57813171447d534461fa13fe37dc8cd3b7f86d83e9b1f7bb1b0be30541f8b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin" version="1.8.10">
          <artifact name="kotlin-gradle-plugin-1.8.10-gradle76.jar">
             <sha256 value="a677e78283e988dfb0baed88dc20e8ed70ae65e9b958e398804035931e1b0a72" origin="Generated by Gradle"/>
@@ -5230,6 +7529,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="1c92736f47055ad6c6bec26fd98ba35db29bd58d54fc1bd0e601123a0e936749" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin" version="1.9.20">
+         <artifact name="kotlin-gradle-plugin-1.9.20-gradle81.jar">
+            <sha256 value="04910fca652f8dbe804a49c8e72971bf641d03cd8b45a065ba4ce10c6584eaac" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-gradle-plugin-1.9.20.module">
+            <sha256 value="55525c3e03692529c8f196607789adc8eeb1a207ea131f8d9c1c32b497f7e636" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-annotations" version="1.9.20">
+         <artifact name="kotlin-gradle-plugin-annotations-1.9.20.jar">
+            <sha256 value="2a5c3622e2468584d1ab7dab3acd8ffb60403b637dd0603af675e26d3a054329" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-api" version="1.8.10">
          <artifact name="kotlin-gradle-plugin-api-1.8.10-gradle76.jar">
             <sha256 value="fc453e5efb4a644879a54e51d69df4874d0d2b77fce509fe030728119c43ecff" origin="Generated by Gradle"/>
@@ -5241,6 +7553,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="42067a2f2a1f4c13eae4580c20309807b4832277df0b9f0b2adadb950f96cae2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-api" version="1.9.20">
+         <artifact name="kotlin-gradle-plugin-api-1.9.20-gradle81.jar">
+            <sha256 value="287c26765f8692e5eb5505854126819cfbb0c7d5d49bbe5f45771427ea19913d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-gradle-plugin-api-1.9.20.jar">
+            <sha256 value="287c26765f8692e5eb5505854126819cfbb0c7d5d49bbe5f45771427ea19913d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-gradle-plugin-api-1.9.20.module">
+            <sha256 value="483e7577f4e9e2d3ca17f6aa64f4655d4603c2b1d0e6dfd5951552ef40d5d745" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea" version="1.8.10">
          <artifact name="kotlin-gradle-plugin-idea-1.8.10.jar">
             <sha256 value="9cd6ea5e4997dd3853d9407bdc0d3329d9e99ce7ea9bf91d204e1eb0d2439507" origin="Generated by Gradle"/>
@@ -5249,11 +7572,24 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="a5ce36fc248472b791dd2dbc8e2b5427db86c687875152ebd20b411267f21a30" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea" version="1.9.20">
+         <artifact name="kotlin-gradle-plugin-idea-1.9.20.jar">
+            <sha256 value="8d1af87632d95148f122a9fa0ae2903c19ee6fab7d01e017f76e0d2c9a022c20" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-gradle-plugin-idea-1.9.20.module">
+            <sha256 value="1e6b39381f3a4f9b1497454e825f8942e0c9c6ec3dc1b8a2fd636e237195f8ab" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea-proto" version="1.8.10">
          <artifact name="kotlin-gradle-plugin-idea-proto-1.8.10.jar">
             <sha256 value="e9dcadeda7e02c4d1a762f682dbc01cf7c924a68305b95a6569e696f0ee72ccc" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-idea-proto" version="1.9.20">
+         <artifact name="kotlin-gradle-plugin-idea-proto-1.9.20.jar">
+            <sha256 value="c67b0d8849febdd9a964eda0bd167c167c4d056ca8dd389241d92e1d763c9490" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-model" version="1.8.10">
          <artifact name="kotlin-gradle-plugin-model-1.8.10.jar">
             <sha256 value="1a8373a92a1e5bad11a1097971933503561b04157635b134f6427acf6cadd715" origin="Generated by Gradle"/>
@@ -5262,36 +7598,79 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="ac844b010b948fc3d90a2bc913fc1f6a8f5757f6c7cf9d930610437aedcfc293" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugin-model" version="1.9.20">
+         <artifact name="kotlin-gradle-plugin-model-1.9.20.jar">
+            <sha256 value="7f930f0e454b75818f5f8976ba515f3aec887671a5fe85380ac97f05da9986a7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-gradle-plugin-model-1.9.20.module">
+            <sha256 value="3996aaab9b546ccf455b1caf0c316ea32e9ce646feb54e973af4d69fb605f248" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugins-bom" version="1.9.20">
+         <artifact name="kotlin-gradle-plugins-bom-1.9.20.module">
+            <sha256 value="7720f845cfe319aa1a6e5b23387e6920a35e99ae4218ca0f6f6e07fd1713093c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-api" version="1.8.10">
          <artifact name="kotlin-klib-commonizer-api-1.8.10.jar">
             <sha256 value="c8e5bd8afa07c376322daf33538961ea92effbda6a648409852245590f46c69a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-api" version="1.9.20">
+         <artifact name="kotlin-klib-commonizer-api-1.9.20.jar">
+            <sha256 value="89b6260828953042e310a52592aa5b595f5f89b641cc6a3d3a8155ef92d88ffe" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-embeddable" version="1.8.10">
          <artifact name="kotlin-klib-commonizer-embeddable-1.8.10.jar">
             <sha256 value="afdad1afa3796b972549b77fbdc780d253e865629dbebb19751f67e148135dd3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-embeddable" version="1.9.20">
+         <artifact name="kotlin-klib-commonizer-embeddable-1.9.20.jar">
+            <sha256 value="8b36530fb4b68198c7733adbe3749d481af2bd9c0b03e89d88bfe93e12fda0f9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-native-utils" version="1.8.10">
          <artifact name="kotlin-native-utils-1.8.10.jar">
             <sha256 value="b8d21e4bb80dd5c9b4443717fce3c1ea4580eddae43a1119220a5bbe9f47ff6c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-native-utils" version="1.9.20">
+         <artifact name="kotlin-native-utils-1.9.20.jar">
+            <sha256 value="b0f92bc9253a907f0ce285328643fe8a36c27ed494b5c5919ee09c2926d8e8d2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-parcelize-compiler" version="1.8.10">
          <artifact name="kotlin-parcelize-compiler-1.8.10.jar">
             <sha256 value="7dacf3312b648e2502c6d860f02c0653b77a935eeaba0c9f1fe55133f59fd461" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-parcelize-compiler" version="1.9.20">
+         <artifact name="kotlin-parcelize-compiler-1.9.20.jar">
+            <sha256 value="d63a5d7d77557a9265ed09f39c40f4f306b1cc509e2ab197eb997e442044afd8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-parcelize-runtime" version="1.8.10">
          <artifact name="kotlin-parcelize-runtime-1.8.10.jar">
             <sha256 value="699f118cdac092d78c560170b3a0dda8677fd7b93f594facb1a2f42898c62845" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-parcelize-runtime" version="1.9.20">
+         <artifact name="kotlin-parcelize-runtime-1.9.20.jar">
+            <sha256 value="fdee7f84664df01f65e6d39fe2684c494ede79d59e7a90031b093f0b15b62bcb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-project-model" version="1.8.10">
          <artifact name="kotlin-project-model-1.8.10.jar">
             <sha256 value="16a9b3bd343360cd8953f31c2ebee8f4b424e6c50b6d7a5576e2c0c6026e8bf1" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-project-model" version="1.9.20">
+         <artifact name="kotlin-project-model-1.9.20.jar">
+            <sha256 value="261a9b40e240e259ac359c16938002ecc6c08434a5c6e5e5bffee242a3c50218" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.4.10">
          <artifact name="kotlin-reflect-1.4.10.jar">
             <sha256 value="3ab3413ec945f801448360ad97bc6e14fec6d606889ede3c707cc277b4467f45" origin="Generated by Gradle"/>
@@ -5317,11 +7696,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="187c5e5a588a6ed18c3a41b54df138a5944121bdb396be1c3fa4abee67397955" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.7.22">
+         <artifact name="kotlin-reflect-1.7.22.jar">
+            <sha256 value="4d4471d1cbc203d3f9e51d6123956dddbb96d5747f1aee02463c7b920feb2baf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.8.10">
          <artifact name="kotlin-reflect-1.8.10.jar">
             <sha256 value="99672410459045090d062a0194ed87008e2371f06946b6bfa7287c697f924bea" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.9.20">
+         <artifact name="kotlin-reflect-1.9.20.jar">
+            <sha256 value="49b66f9a89d50fd2954c2e8aeac80e4f488b0a09322a25efad6261576713dc0f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-sam-with-receiver" version="1.8.10">
          <artifact name="kotlin-sam-with-receiver-1.8.10-gradle76.jar">
             <sha256 value="9e12bce0661f92a96a49b01277bf2fc64c7510009dbe86e7f8f9f41a7ae7ad9b" origin="Generated by Gradle"/>
@@ -5330,6 +7719,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="d0e81322c34dd3a395458be0e557d7ac6cfef96ba26fc632f7eb47a31042efdc" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-sam-with-receiver" version="1.9.20">
+         <artifact name="kotlin-sam-with-receiver-1.9.20-gradle81.jar">
+            <sha256 value="3030994695bb65a017be33e24332e92ad0d3c1d90bca27c0f4a2f7952b55ef83" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-sam-with-receiver-1.9.20.module">
+            <sha256 value="8282ae244045fe81821413d948bf26a7efe77183421b170e6558fe4c2dce44c0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-sam-with-receiver-compiler-plugin-embeddable" version="1.9.20">
+         <artifact name="kotlin-sam-with-receiver-compiler-plugin-embeddable-1.9.20.jar">
+            <sha256 value="d362170a1cc153160f0cb2038c84411034b56c055a9b316f32c0b7b7168ca0f2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-script-runtime" version="1.5.31">
          <artifact name="kotlin-script-runtime-1.5.31.jar">
             <sha256 value="24e450fee7645ed3590981dddccf397c0d9ebb725815c94c4f555cc3db2f9f96" origin="Generated by Gradle"/>
@@ -5350,26 +7752,61 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="4bddc06cad20bb843fbd24094b1dc3c31f55508c6918885e8b548f2ebaa8a93e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-script-runtime" version="1.9.10">
+         <artifact name="kotlin-script-runtime-1.9.10.jar">
+            <sha256 value="2a6087375be9bdfaaadb4ba4be9833bba0de8edab1255c916642acaabfd20932" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-script-runtime" version="1.9.20">
+         <artifact name="kotlin-script-runtime-1.9.20.jar">
+            <sha256 value="a26a6256a76f766ab8bacdb409b3f8c940d999712a8e88864252b678d66bab9e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-script-runtime" version="1.9.22">
+         <artifact name="kotlin-script-runtime-1.9.22.jar">
+            <sha256 value="b80670579f7f92d473d8d5834f0b124f7755c4598fe94b244183b02834834574" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-scripting-common" version="1.8.10">
          <artifact name="kotlin-scripting-common-1.8.10.jar">
             <sha256 value="5f60cb1dfd5d5df171d2bc8f0e782b4bb46f986dadc8452f85e9995c6df9d0d9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-scripting-common" version="1.9.20">
+         <artifact name="kotlin-scripting-common-1.9.20.jar">
+            <sha256 value="5aa08477cb73f7927413aec683a4aa3b3f99e87be0630255ce697452a1a42d65" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-embeddable" version="1.8.10">
          <artifact name="kotlin-scripting-compiler-embeddable-1.8.10.jar">
             <sha256 value="2888453ecd7689c225f0fe3c64ec8f78122cb65236afc0db7169419a7c5f1a9e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-embeddable" version="1.9.20">
+         <artifact name="kotlin-scripting-compiler-embeddable-1.9.20.jar">
+            <sha256 value="2181dd0c4d52c6f696ad9f17934233790f4d68234b1418d6376fda7e5c374c4e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-impl-embeddable" version="1.8.10">
          <artifact name="kotlin-scripting-compiler-impl-embeddable-1.8.10.jar">
             <sha256 value="7d43f7f5477f9d062787ff6c387f355140670bf3a97d0e7509fd55f179f7e439" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-scripting-compiler-impl-embeddable" version="1.9.20">
+         <artifact name="kotlin-scripting-compiler-impl-embeddable-1.9.20.jar">
+            <sha256 value="dc9ab6f69c592ad1f1d2e2b994b97509d0ee09480bea6bc771eeeef3071eb817" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-scripting-jvm" version="1.8.10">
          <artifact name="kotlin-scripting-jvm-1.8.10.jar">
             <sha256 value="965fae8dacf6a05e64ffbdb4653873064d5282d5c5743a05a808d674d59954ae" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-scripting-jvm" version="1.9.20">
+         <artifact name="kotlin-scripting-jvm-1.9.20.jar">
+            <sha256 value="809f73bdd4dd7766ae1ef2ced968896ce9c03d6a5fe6de6f6799778851f75bd3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.4.10">
          <artifact name="kotlin-stdlib-1.4.10.jar">
             <sha256 value="01ecb09782c042b931c1839acf21a188340b295d05400afd6e3415d4475b8daa" origin="Generated by Gradle"/>
@@ -5420,6 +7857,44 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="03a5c3965cc37051128e64e46748e394b6bd4c97fa81c6de6fc72bfd44e3421b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.9.10">
+         <artifact name="kotlin-stdlib-1.9.10.jar">
+            <sha256 value="55e989c512b80907799f854309f3bc7782c5b3d13932442d0379d5c472711504" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.9.20">
+         <artifact name="kotlin-stdlib-1.9.20-all.jar">
+            <sha256 value="cec38bc3302e72a8aaf9cde436b5a9071ee0331e2ad05e84d8bb897334d7e9d4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-1.9.20.jar">
+            <sha256 value="28a35bcdff46d864f80f346a617e486284b208d17378c41900dfb1de95a90e6c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-1.9.20.module">
+            <sha256 value="dccaa5d315470fab3920502886bbb85f2da6c86102c65d9c04410544eedb2019" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.9.21">
+         <artifact name="kotlin-stdlib-1.9.21-all.jar">
+            <sha256 value="cec38bc3302e72a8aaf9cde436b5a9071ee0331e2ad05e84d8bb897334d7e9d4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-1.9.21.jar">
+            <sha256 value="3b479313ab6caea4e5e25d3dee8ca80c302c89ba73e1af4dafaa100f6ef9296a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-1.9.21.module">
+            <sha256 value="d3019f7f0d71924ce47298c9cc46af0245f75219719b35c5915fbcc7e7a69395" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.9.22">
+         <artifact name="kotlin-stdlib-1.9.22-all.jar">
+            <sha256 value="cec38bc3302e72a8aaf9cde436b5a9071ee0331e2ad05e84d8bb897334d7e9d4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-1.9.22.jar">
+            <sha256 value="6abe146c27864138b874ccccfe5f534e3eb923c99a1b7b5d45494ee5694f3e0a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-1.9.22.module">
+            <sha256 value="f482314b5079c1455f6fb0d4257a745d101c6124ce961522ba86f9dc90901e47" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.4.21">
          <artifact name="kotlin-stdlib-common-1.4.21.jar">
             <sha256 value="812cf197d9c4c67e1f47f95e2d72a9b600f0d1124560617bfe9850773eccbcff" origin="Generated by Gradle"/>
@@ -5470,6 +7945,26 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="d0c2365e2437ef70f34586d50f055743f79716bcfe65e4bc7239cdd2669ef7c5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.9.10">
+         <artifact name="kotlin-stdlib-common-1.9.10.jar">
+            <sha256 value="cde3341ba18a2ba262b0b7cf6c55b20c90e8d434e42c9a13e6a3f770db965a88" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.9.20">
+         <artifact name="kotlin-stdlib-common-1.9.20.module">
+            <sha256 value="858828bc5191b9e602affa14e01d66489dafb08c4c18d2faee3cbed7ba7d9992" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.9.21">
+         <artifact name="kotlin-stdlib-common-1.9.21.module">
+            <sha256 value="68dc8e84aa05f5278c16505247d71346d3512b9edadd41f613d657c94c59993b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.9.22">
+         <artifact name="kotlin-stdlib-common-1.9.22.module">
+            <sha256 value="f93c9e9abf8d52d8e8fd8e851aa802ecec55132161c4aeee7d3cd924bf794246" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.4.10">
          <artifact name="kotlin-stdlib-jdk7-1.4.10.jar">
             <sha256 value="f9566380c08722c780ce33ceee23e98ddf765ca98fabd3e2fabae7975c8d232b" origin="Generated by Gradle"/>
@@ -5500,6 +7995,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="54f61351b1936ad88f4e53059fe781e723eae51d78ed9e7422d8b403574ec682" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.8.0">
+         <artifact name="kotlin-stdlib-jdk7-1.8.0.jar">
+            <sha256 value="4c889d1d9803f5f2eb6c1592a6b7e62369ac7660c9eee15aba16fec059163666" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.8.10">
          <artifact name="kotlin-stdlib-jdk7-1.8.10.jar">
             <sha256 value="a843aae0b7232448afc6af05747cd4de416b9c2b76e100a1b07b1f788337b2ed" origin="Generated by Gradle"/>
@@ -5510,6 +8010,26 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="af1ec40c3b951afdcc0c2a0173c7b81763c5281c2d5bafbf0a8544a24c5dcc0c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.8.21">
+         <artifact name="kotlin-stdlib-jdk7-1.8.21.jar">
+            <sha256 value="33d148db0e11debd0d90677d28242bced907f9c77730000fd597867089039d86" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.9.0">
+         <artifact name="kotlin-stdlib-jdk7-1.9.0.jar">
+            <sha256 value="b7979a7aac94055f0d9f1fd3b47ce5ffe1cb6032a842ba9fbe7186f085289178" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.9.10">
+         <artifact name="kotlin-stdlib-jdk7-1.9.10.jar">
+            <sha256 value="ac6361bf9ad1ed382c2103d9712c47cdec166232b4903ed596e8876b0681c9b7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.9.20">
+         <artifact name="kotlin-stdlib-jdk7-1.9.20.jar">
+            <sha256 value="c5451d67a27f33afd09913c67e1ceba3897ae70884b24ef0ff71157e55b60865" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.4.10">
          <artifact name="kotlin-stdlib-jdk8-1.4.10.jar">
             <sha256 value="39b7a9442d7a3865e0f4a732c56c1d5da0e11ffb3bb82a461d32deb0c0ca7673" origin="Generated by Gradle"/>
@@ -5540,6 +8060,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="8aafdd60c94f454c92e5066d266a5ed53ecc63c78f623b3fd9db56fea4032873" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.8.0">
+         <artifact name="kotlin-stdlib-jdk8-1.8.0.jar">
+            <sha256 value="05b62804441b0c9a1920b6b7d5cf7329a4e24b6258478e32b1f046ca01900946" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.8.10">
          <artifact name="kotlin-stdlib-jdk8-1.8.10.jar">
             <sha256 value="9622f67cbe41e88ad257c1b8018054dd021a6044162474a78b1becd44f15a169" origin="Generated by Gradle"/>
@@ -5550,16 +8075,46 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="e398b67977622718bf18ff99b739c7d9da060f33fb458a2e25203221c16af010" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.8.21">
+         <artifact name="kotlin-stdlib-jdk8-1.8.21.jar">
+            <sha256 value="3db752a30074f06ee6c57984aa6f27da44f4d2bbc7f5442651f6988f1cb2b7d7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.9.0">
+         <artifact name="kotlin-stdlib-jdk8-1.9.0.jar">
+            <sha256 value="a59fa24fdf1ffb594baecdbf0fd10010f977cea10236d487fe3464977a7377fa" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.9.10">
+         <artifact name="kotlin-stdlib-jdk8-1.9.10.jar">
+            <sha256 value="a4c74d94d64ce1abe53760fe0389dd941f6fc558d0dab35e47c085a11ec80f28" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.9.20">
+         <artifact name="kotlin-stdlib-jdk8-1.9.20.jar">
+            <sha256 value="f833fcc94f0bb1c31b9e78bd4bda7ea23f579ff3408ae1a94e2eb5747086a2ab" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-tooling-core" version="1.8.10">
          <artifact name="kotlin-tooling-core-1.8.10.jar">
             <sha256 value="c8958d94e1c1210936c131d388c3237c9ccf2e6189d236c9e07a6946e50f66b3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-tooling-core" version="1.9.20">
+         <artifact name="kotlin-tooling-core-1.9.20.jar">
+            <sha256 value="8938eb97e36320daa3e6fb2a60fd2a05b232ff4a557173c5019f045b8832d9f4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-util-io" version="1.8.10">
          <artifact name="kotlin-util-io-1.8.10.jar">
             <sha256 value="a2512d6ff7cb36b4ef741fffe88e93b952a6ab8e086c3877d1eb80c07fd53b50" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-util-io" version="1.9.20">
+         <artifact name="kotlin-util-io-1.9.20.jar">
+            <sha256 value="c74fdaaae9d79fdf03327ee8738251e024b24b24d8b5377a1a429ac3b7f72cca" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-util-klib" version="1.8.10">
          <artifact name="kotlin-util-klib-1.8.10.jar">
             <sha256 value="4d159f65dd02e8cc0e34a63e75c3ca9246c6cb1371df2553d711f95542be367f" origin="Generated by Gradle"/>
@@ -5573,6 +8128,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="b80d58fd737087f8a74d8ed802f5545e550209823e91d0062de0b09343f0c389" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-util-klib" version="1.9.20">
+         <artifact name="kotlin-util-klib-1.9.20.jar">
+            <sha256 value="c453efe27a0632d16151bfdf0084a12b8cc019fd2cb342e2b8892accce4e91b2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="atomicfu" version="0.17.3">
          <artifact name="atomicfu-0.17.3.module">
             <sha256 value="854a75a9ebf30cb588e8ceda7da1b7089d4272a12324d3cffcaf5b62902738bd" origin="Generated by Gradle"/>
@@ -5589,6 +8149,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="2a91f10b826d3febc47c2b664e268615757c311114239787f5dc37481fdec441" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="atomicfu" version="0.23.1">
+         <artifact name="atomicfu-0.23.1.module">
+            <sha256 value="3e891fe636b55108192100fcf38b1a39bcd1c2533e23c462fc07644eeafcb20f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="atomicfu-metadata-0.23.1.jar">
+            <sha256 value="7db8660ebe4b91bb478edb3616c4e3a50ba59c07dca517d1e1284c03fe86ac57" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-collections-immutable" version="0.3.5">
          <artifact name="kotlinx-collections-immutable-0.3.5.module">
             <sha256 value="0aacd373eab74343783f9aa916a2bfae280eb9222afa4e5186b5dc446f91a0c3" origin="Generated by Gradle"/>
@@ -5634,6 +8202,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="beb7ff0f5ebc63a0b30af2ae1214e0b622a7b7e408240e64a8ea5b213c4d5334" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-android" version="1.8.1">
+         <artifact name="kotlinx-coroutines-android-1.8.1.jar">
+            <sha256 value="a134dacf4e6578b29b32e97aa50548d09cb45e3cb3551ce77ac27e55e265d8f5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinx-coroutines-android-1.8.1.module">
+            <sha256 value="f00af0920cb7dc4611205ff592eec5aa0071bc959b3797026abfe43cf14bfad4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core" version="1.5.2">
          <artifact name="kotlinx-coroutines-core-1.5.2.module">
             <sha256 value="7b9f6960c6689d1a79d82ca3b00b8347bd57d15fe4070a3dd34e826e76136392" origin="Generated by Gradle"/>
@@ -5668,6 +8244,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="b7d5370ed0e54952003b13595a67b97ced3f873d919f5ddfbe50fcd499cbf0a7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core" version="1.8.1">
+         <artifact name="kotlinx-coroutines-core-1.8.1.module">
+            <sha256 value="08cbaf3325b54e0f8ef8da85e4eb596f7d946f843e5d1600385463f3268a4ef0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinx-coroutines-core-metadata-1.8.1.jar">
+            <sha256 value="daf50f1c9404b224a1d6dd5286f8e8ee7d63fe807f78ea98f71795c183b6025f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.5.0">
          <artifact name="kotlinx-coroutines-core-jvm-1.5.0.jar">
             <sha256 value="78d6cc7135f84d692ff3752fcfd1fa1bbe0940d7df70652e4f1eaeec0c78afbb" origin="Generated by Gradle"/>
@@ -5700,6 +8284,30 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="db1fe0110fa82b565d332d39d3f3e62c1dc7eb6238333e3b15e4377fa56e39cb" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.8.1">
+         <artifact name="kotlinx-coroutines-core-jvm-1.8.1.jar">
+            <sha256 value="f3d4f5de1c391bbcc20f3b3435ccbac013521e76b6902d7d59635ec15c1f797e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinx-coroutines-core-jvm-1.8.1.module">
+            <sha256 value="09b81c9d11c2deebf133ad87b707927c1f04099cb611ef008c7725b3eb308329" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-play-services" version="1.8.1">
+         <artifact name="kotlinx-coroutines-play-services-1.8.1.jar">
+            <sha256 value="f90c2c76cab2fb3db89bf8a742bb4f36cba43e52472aeff3919e9143bd5ec072" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinx-coroutines-play-services-1.8.1.module">
+            <sha256 value="2eb0b5c00791576c33079a0750ef3ded335c180f60043d51a19c799f8b737bc5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-swing" version="1.8.1">
+         <artifact name="kotlinx-coroutines-swing-1.8.1.jar">
+            <sha256 value="0c809e79dc64ab5bc9b790389fe491cc19d3574345a431276966fbc09994a659" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinx-coroutines-swing-1.8.1.module">
+            <sha256 value="2915188bf6dde89157cccb480bfa1249f010917a8e1fad340c9dbef6d7e0229b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-serialization-core" version="1.0.1">
          <artifact name="kotlinx-serialization-core-1.0.1.module">
             <sha256 value="9d0f1f6db25e394c89d58838eaebf3eabe360ef8ceb98aa3b9a4283532a54077" origin="Generated by Gradle"/>
@@ -5765,6 +8373,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="c8fbfde4b5ee1e41a69175165e839991d1501665a7590e23162326501ac6122c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.skiko" name="skiko" version="0.7.7">
+         <artifact name="skiko-0.7.7.module">
+            <sha256 value="96b0bc4f70cc6c9dcace55897019eac065c56ab334b615832b23b7babdbf2cbb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.skiko" name="skiko-awt" version="0.7.7">
+         <artifact name="skiko-awt-0.7.7.jar">
+            <sha256 value="93c02a8d773e38d8081d565f83dc14c7e9c9e1607ae4f8791811dbd636711ce3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="skiko-awt-0.7.7.module">
+            <sha256 value="aa18d148903a8057e0cefc0a2ade4df408ea757a19c467ea68b826edcfcd7d5c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jlleitschuh.gradle" name="ktlint-gradle" version="11.1.0">
          <artifact name="ktlint-gradle-11.1.0.jar">
             <sha256 value="f2114379e18faca0f9bd90bdf4936e6484d0b4a85a3a94bcd12d5c102a339281" origin="Generated by Gradle"/>
@@ -5781,6 +8402,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="3c6ce9f9f0b2d21efb3e89f6d753bdee05c969b9b2b8bceb89561692f23b4d61" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jlleitschuh.gradle" name="ktlint-gradle" version="12.1.1">
+         <artifact name="ktlint-gradle-12.1.1.jar">
+            <sha256 value="f314e27ae92dda118e4f0b5eb9f2d867286ed0ccb72090a0a53b5c9f15c032ef" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ktlint-gradle-12.1.1.module">
+            <sha256 value="748378699d6028dab55c6cf7e4cc663aa992e9dd2c90c19a3a92dabaf1700d8a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.json" name="json" version="20180813">
          <artifact name="json-20180813.jar">
             <sha256 value="518080049ba83181914419d11a25d9bc9833a2d729b6a6e7469fa52851356da8" origin="Generated by Gradle"/>
@@ -5806,6 +8435,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="ab137ba5a8e32c9b066bf9126a1c76dd5614b724ba5c0b02549772b5e9f4cf1f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit" name="junit-bom" version="5.9.2">
+         <artifact name="junit-bom-5.9.2.module">
+            <sha256 value="ab137ba5a8e32c9b066bf9126a1c76dd5614b724ba5c0b02549772b5e9f4cf1f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit" name="junit-bom" version="5.9.3">
+         <artifact name="junit-bom-5.9.3.module">
+            <sha256 value="b401fd25901e582a524aa5343c4b39e28bc56e24961c1069bf2b4bbfcee46b93" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.jupiter" name="junit-jupiter" version="5.8.2">
          <artifact name="junit-jupiter-5.8.2.jar">
             <sha256 value="4f5c1cc6432244cd16e36aa0e02b74bce34a81ff95a13d63d50951ec4ce3f4bd" origin="Generated by Gradle"/>
@@ -5954,6 +8593,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="b62e84b5980729751b0458c534cf1366f727542bb8d158621335682a460f0353" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.ow2.asm" name="asm" version="9.6">
+         <artifact name="asm-9.6.jar">
+            <sha256 value="3c6fac2424db3d4a853b669f4e3d1d9c3c552235e19a319673f887083c2303a1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.ow2.asm" name="asm-analysis" version="9.1">
          <artifact name="asm-analysis-9.1.jar">
             <sha256 value="81a88041b1b8beda5a8a99646098046c48709538270c49def68abff25ac3be34" origin="Generated by Gradle"/>
@@ -5969,6 +8613,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="39f1cf1791335701c3b02cae7b2bc21057ec9a55b2240789cb6d552b2b2c62fa" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.ow2.asm" name="asm-analysis" version="9.6">
+         <artifact name="asm-analysis-9.6.jar">
+            <sha256 value="d92832d7c37edc07c60e2559ac6118b31d642e337a6671edcb7ba9fae68edbbb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.ow2.asm" name="asm-commons" version="9.2">
          <artifact name="asm-commons-9.2.jar">
             <sha256 value="be4ce53138a238bb522cd781cf91f3ba5ce2f6ca93ec62d46a162a127225e0a6" origin="Generated by Gradle"/>
@@ -5979,6 +8628,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="72eee9fbafb9de8d9463f20dd584a48ceeb7e5152ad4c987bfbe17dd4811c9ae" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.ow2.asm" name="asm-commons" version="9.6">
+         <artifact name="asm-commons-9.6.jar">
+            <sha256 value="7aefd0d5c0901701c69f7513feda765fb6be33af2ce7aa17c5781fc87657c511" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.ow2.asm" name="asm-tree" version="9.1">
          <artifact name="asm-tree-9.1.jar">
             <sha256 value="fd00afa49e9595d7646205b09cecb4a776a8ff0ba06f2d59b8f7bf9c704b4a73" origin="Generated by Gradle"/>
@@ -5994,6 +8648,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="3c33a648191079aeaeaeb7c19a49b153952f9e40fe86fbac5205554ddd9acd94" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.ow2.asm" name="asm-tree" version="9.6">
+         <artifact name="asm-tree-9.6.jar">
+            <sha256 value="c43ecf17b539c777e15da7b5b86553b377e2d39a683de6285567d5283888e7ef" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.ow2.asm" name="asm-util" version="9.2">
          <artifact name="asm-util-9.2.jar">
             <sha256 value="ff5b3cd331ae8a9a804768280da98f50f424fef23dd3c788bb320e08c94ee598" origin="Generated by Gradle"/>
@@ -6004,6 +8663,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="c467f1bb3c08888f47243e2d475209b34a772d627e44fca06752e18bb038bd74" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.ow2.asm" name="asm-util" version="9.6">
+         <artifact name="asm-util-9.6.jar">
+            <sha256 value="c635a7402f4aa9bf66b2f4230cea62025a0fe1cd63e8729adefc9b1994fac4c3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.reactivestreams" name="reactive-streams" version="1.0.3">
          <artifact name="reactive-streams-1.0.3.jar">
             <sha256 value="1dee0481072d19c929b623e155e14d2f6085dc011529a0a0dbefc84cf571d865" origin="Generated by Gradle"/>
@@ -6117,28 +8781,28 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="6eb4422e8a618b3b76cb2096a3619d251f9e27989dc68307a1e5414c3710f2d1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.signal" name="libsignal-android" version="0.46.0">
-         <artifact name="libsignal-android-0.46.0.aar">
-            <sha256 value="ba943300bf38325a7ce568f433e36e881e472bb8cc649aadbb81bd135dffc1dc" origin="Generated by Gradle"/>
+      <component group="org.signal" name="libsignal-android" version="0.51.1">
+         <artifact name="libsignal-android-0.51.1.aar">
+            <sha256 value="d12f4e794512eef25f7f084001877bf0c0725e1bb7e6bfff18b569c077d6c00d" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="libsignal-android-0.46.0.module">
-            <sha256 value="b2a4d2695527c0f2b12b5a815b7c389bf085d227523c0af5ac7433173acb76a6" origin="Generated by Gradle"/>
+         <artifact name="libsignal-android-0.51.1.module">
+            <sha256 value="c08b6e08e48e7673bc4f2089046fa3ef3e2f011c786b6432946957415231640c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.signal" name="libsignal-client" version="0.46.0">
-         <artifact name="libsignal-client-0.46.0.jar">
-            <sha256 value="bd29ff4a5310fd9d43aead0a780abfbc2ca368daf7ca2a21304fb497605d07cd" origin="Generated by Gradle"/>
+      <component group="org.signal" name="libsignal-client" version="0.51.1">
+         <artifact name="libsignal-client-0.51.1.jar">
+            <sha256 value="b8b770cb98817300c7e5cb84754c7ada32c87c55d93331f2405abd9a74af6d95" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="libsignal-client-0.46.0.module">
-            <sha256 value="a31afd2e42a87359e754ec04437cf35b0a4ab9012a410447f15ceb4cde90d54a" origin="Generated by Gradle"/>
+         <artifact name="libsignal-client-0.51.1.module">
+            <sha256 value="bd3e9d19550ed53f7988a16d9e23bba26c985c673a2cad1ab653b6d8a2aae8b2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.signal" name="ringrtc-android" version="2.42.0">
-         <artifact name="ringrtc-android-2.42.0.aar">
-            <sha256 value="b523dc5d19a16bb497699bc207b9b31cdc8d5d36b4f3535c96a209fc709cdfb4" origin="Generated by Gradle"/>
+      <component group="org.signal" name="ringrtc-android" version="2.44.3">
+         <artifact name="ringrtc-android-2.44.3.aar">
+            <sha256 value="d9d16d48fe271178ec34540c99b66840ccda95f95d211d8448ee769ae4c4664a" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="ringrtc-android-2.42.0.module">
-            <sha256 value="2fbf3af12b6f148e96b33ffaa4f3b3ab26b5ae10f95e3a4dcd28839931bb8be3" origin="Generated by Gradle"/>
+         <artifact name="ringrtc-android-2.44.3.module">
+            <sha256 value="b283441f3f0d08e7432f8eabbc6005282801b2f0e0fed268f8be0e6c9c20585f" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.signal" name="sqlcipher-android" version="4.5.4-S2">
@@ -6176,6 +8840,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="57fa874599ace9259286b99253d7a877afdd2db4b07a6827ac6c847ca5d601a2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.slf4j" name="slf4j-api" version="2.0.7">
+         <artifact name="slf4j-api-2.0.7.jar">
+            <sha256 value="5d6298b93a1905c32cda6478808ac14c2d4a47e91535e53c41f7feeb85d946f4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.snakeyaml" name="snakeyaml-engine" version="2.1">
          <artifact name="snakeyaml-engine-2.1.jar">
             <sha256 value="7007cb15171fb188e0e2abc5ea6f4f97b39cd1f86db6c2cd1b7300d0db67b021" origin="Generated by Gradle"/>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1a703c8b43..e68fc68e50 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=47a5bfed9ef814f90f8debcbbb315e8e7c654109acd224595ea39fca95c5d4da
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
+distributionSha256Sum=85719317abd2112f021d4f41f09ec370534ba288432065f4b477b6a3b652910d
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libfakegms/build.gradle b/libfakegms/build.gradle
deleted file mode 100644
index 82ae34d702..0000000000
--- a/libfakegms/build.gradle
+++ /dev/null
@@ -1,25 +0,0 @@
-plugins {
-    id 'com.android.library'
-}
-
-android {
-    namespace 'com.google.android.gms'
-
-    buildToolsVersion = signalBuildToolsVersion
-    compileSdkVersion = signalCompileSdkVersion
-
-    defaultConfig {
-        minSdk = signalMinSdkVersion
-        targetSdk = signalTargetSdkVersion
-    }
-
-    compileOptions {
-        sourceCompatibility signalJavaVersion
-        targetCompatibility signalJavaVersion
-    }
-}
-
-dependencies {
-    implementation libs.androidx.fragment
-    lintChecks project(':lintchecks')
-}
\ No newline at end of file
diff --git a/libfakegms/build.gradle.kts b/libfakegms/build.gradle.kts
new file mode 100644
index 0000000000..9a9edb8f10
--- /dev/null
+++ b/libfakegms/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+  id("signal-library")
+}
+
+android {
+  namespace = "com.google.android.gms"
+}
+
+dependencies {
+  implementation(libs.androidx.fragment)
+}
diff --git a/libfakegms/src/main/java/com/google/android/gms/common/api/ApiException.java b/libfakegms/src/main/java/com/google/android/gms/common/api/ApiException.java
new file mode 100644
index 0000000000..3a2340f0ba
--- /dev/null
+++ b/libfakegms/src/main/java/com/google/android/gms/common/api/ApiException.java
@@ -0,0 +1,4 @@
+package com.google.android.gms.common.api;
+
+public class ApiException extends Exception {
+}
diff --git a/libfakegms/src/main/java/com/google/android/gms/common/api/Status.java b/libfakegms/src/main/java/com/google/android/gms/common/api/Status.java
index b48d57448f..0733c46d57 100644
--- a/libfakegms/src/main/java/com/google/android/gms/common/api/Status.java
+++ b/libfakegms/src/main/java/com/google/android/gms/common/api/Status.java
@@ -1,6 +1,8 @@
 package com.google.android.gms.common.api;
 
 public class Status {
+  public final String statusMessage = "";
+
   public int getStatusCode() {
     return CommonStatusCodes.ERROR;
   }
diff --git a/libfakegms/src/main/java/com/google/android/gms/tasks/Task.java b/libfakegms/src/main/java/com/google/android/gms/tasks/Task.java
index 9e1a706c72..ca5a46f1ff 100644
--- a/libfakegms/src/main/java/com/google/android/gms/tasks/Task.java
+++ b/libfakegms/src/main/java/com/google/android/gms/tasks/Task.java
@@ -9,6 +9,10 @@ public TResult getResult() {
     return null;
   }
 
+  public <X extends Throwable> TResult getResult(Class<X> clazz) throws X {
+    return null;
+  }
+
   public Exception getException() {
     return new UnsupportedOperationException();
   }
diff --git a/libfakegms/src/main/java/com/google/android/gms/wallet/AutoResolveHelper.java b/libfakegms/src/main/java/com/google/android/gms/wallet/AutoResolveHelper.java
new file mode 100644
index 0000000000..b0a64e87a9
--- /dev/null
+++ b/libfakegms/src/main/java/com/google/android/gms/wallet/AutoResolveHelper.java
@@ -0,0 +1,18 @@
+package com.google.android.gms.wallet;
+
+import android.app.Activity;
+import android.content.Intent;
+
+import com.google.android.gms.common.api.Status;
+import com.google.android.gms.tasks.Task;
+
+public class AutoResolveHelper {
+  public static final int RESULT_ERROR = 1;
+
+  public static <T> void resolveTask(Task<T> task, Activity activity, int requestCode) {
+  }
+
+  public static Status getStatusFromIntent (Intent data) {
+    return new Status();
+  }
+}
diff --git a/libfakegms/src/main/java/com/google/android/gms/wallet/IsReadyToPayRequest.java b/libfakegms/src/main/java/com/google/android/gms/wallet/IsReadyToPayRequest.java
new file mode 100644
index 0000000000..a4960f395b
--- /dev/null
+++ b/libfakegms/src/main/java/com/google/android/gms/wallet/IsReadyToPayRequest.java
@@ -0,0 +1,7 @@
+package com.google.android.gms.wallet;
+
+public final class IsReadyToPayRequest {
+  public static IsReadyToPayRequest fromJson(String isReadyToPayRequestJson) {
+    return new IsReadyToPayRequest();
+  }
+}
diff --git a/libfakegms/src/main/java/com/google/android/gms/wallet/PaymentData.java b/libfakegms/src/main/java/com/google/android/gms/wallet/PaymentData.java
new file mode 100644
index 0000000000..93437a08e9
--- /dev/null
+++ b/libfakegms/src/main/java/com/google/android/gms/wallet/PaymentData.java
@@ -0,0 +1,13 @@
+package com.google.android.gms.wallet;
+
+import android.content.Intent;
+
+public final class PaymentData {
+  public static PaymentData getFromIntent(Intent intent) {
+    return new PaymentData();
+  }
+
+  public String toJson() {
+    return "{}";
+  }
+}
diff --git a/libfakegms/src/main/java/com/google/android/gms/wallet/PaymentDataRequest.java b/libfakegms/src/main/java/com/google/android/gms/wallet/PaymentDataRequest.java
new file mode 100644
index 0000000000..3eb3a16f0e
--- /dev/null
+++ b/libfakegms/src/main/java/com/google/android/gms/wallet/PaymentDataRequest.java
@@ -0,0 +1,7 @@
+package com.google.android.gms.wallet;
+
+public final class PaymentDataRequest {
+  public static PaymentDataRequest fromJson(String paymentDataRequestJson) {
+    return new PaymentDataRequest();
+  }
+}
diff --git a/libfakegms/src/main/java/com/google/android/gms/wallet/PaymentsClient.java b/libfakegms/src/main/java/com/google/android/gms/wallet/PaymentsClient.java
new file mode 100644
index 0000000000..1b8743c976
--- /dev/null
+++ b/libfakegms/src/main/java/com/google/android/gms/wallet/PaymentsClient.java
@@ -0,0 +1,13 @@
+package com.google.android.gms.wallet;
+
+import com.google.android.gms.tasks.Task;
+
+public class PaymentsClient {
+  public Task<Boolean> isReadyToPay(IsReadyToPayRequest request) {
+    return new Task<>();
+  }
+
+  public Task<PaymentData> loadPaymentData(PaymentDataRequest request) {
+    return new Task<>();
+  }
+}
diff --git a/libfakegms/src/main/java/com/google/android/gms/wallet/Wallet.java b/libfakegms/src/main/java/com/google/android/gms/wallet/Wallet.java
new file mode 100644
index 0000000000..67e9ae50a7
--- /dev/null
+++ b/libfakegms/src/main/java/com/google/android/gms/wallet/Wallet.java
@@ -0,0 +1,21 @@
+package com.google.android.gms.wallet;
+
+import android.content.Context;
+
+public final class Wallet {
+  public static PaymentsClient getPaymentsClient(Context context, WalletOptions options) {
+    return new PaymentsClient();
+  }
+
+  public static final class WalletOptions {
+    public static final class Builder {
+      public Builder setEnvironment(int environment) {
+        return this;
+      }
+
+      public WalletOptions build() {
+        return new WalletOptions();
+      }
+    }
+  }
+}
diff --git a/libfakegms/src/main/java/com/google/android/gms/wallet/WalletConstants.java b/libfakegms/src/main/java/com/google/android/gms/wallet/WalletConstants.java
new file mode 100644
index 0000000000..c281243a34
--- /dev/null
+++ b/libfakegms/src/main/java/com/google/android/gms/wallet/WalletConstants.java
@@ -0,0 +1,6 @@
+package com.google.android.gms.wallet;
+
+public final class WalletConstants {
+  public static final int ENVIRONMENT_PRODUCTION = 1;
+  public static final int ENVIRONMENT_TEST       = 3;
+}
diff --git a/libfakegms/src/main/java/tasks/Tasks.kt b/libfakegms/src/main/java/tasks/Tasks.kt
new file mode 100644
index 0000000000..e981ddee44
--- /dev/null
+++ b/libfakegms/src/main/java/tasks/Tasks.kt
@@ -0,0 +1,5 @@
+package kotlinx.coroutines.tasks
+
+import com.google.android.gms.tasks.Task
+
+fun <T> Task<T>.await(): T = result as T
diff --git a/libsignal-service/build.gradle.kts b/libsignal-service/build.gradle.kts
index d4f374f1b4..3381e266cb 100644
--- a/libsignal-service/build.gradle.kts
+++ b/libsignal-service/build.gradle.kts
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -61,6 +66,7 @@ tasks.whenTaskAdded {
 dependencies {
   api(libs.google.libphonenumber)
   api(libs.jackson.core)
+  api(libs.jackson.module.kotlin)
 
   implementation(libs.libsignal.client)
   api(libs.square.okhttp3)
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResult.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResult.kt
index 700d07603c..8b5940a957 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResult.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResult.kt
@@ -30,13 +30,14 @@ sealed class NetworkResult<T>(
   companion object {
     /**
      * A convenience method to capture the common case of making a request.
-     * Perform the network action in the [fetch] lambda, returning your result.
+     * Perform the network action in the [fetcher], returning your result.
      * Common exceptions will be caught and translated to errors.
      */
-    fun <T> fromFetch(fetch: () -> T): NetworkResult<T> = try {
-      Success(fetch())
+    @JvmStatic
+    fun <T> fromFetch(fetcher: Fetcher<T>): NetworkResult<T> = try {
+      Success(fetcher.fetch())
     } catch (e: NonSuccessfulResponseCodeException) {
-      StatusCodeError(e.code, e.body, e)
+      StatusCodeError(e)
     } catch (e: IOException) {
       NetworkError(e)
     } catch (e: Throwable) {
@@ -51,7 +52,9 @@ sealed class NetworkResult<T>(
   data class NetworkError<T>(val exception: IOException) : NetworkResult<T>()
 
   /** Indicates we got a response, but it was a non-2xx response. */
-  data class StatusCodeError<T>(val code: Int, val body: String?, val exception: NonSuccessfulResponseCodeException) : NetworkResult<T>()
+  data class StatusCodeError<T>(val code: Int, val body: String?, val exception: NonSuccessfulResponseCodeException) : NetworkResult<T>() {
+    constructor(e: NonSuccessfulResponseCodeException) : this(e.code, e.body, e)
+  }
 
   /** Indicates that the application somehow failed in a way unrelated to network activity. Usually a runtime crash. */
   data class ApplicationError<T>(val throwable: Throwable) : NetworkResult<T>()
@@ -126,7 +129,7 @@ sealed class NetworkResult<T>(
 
   /**
    * Will perform an operation if the result at this point in the chain is successful. Note that it runs if the chain is _currently_ successful. It does not
-   * depend on anything futher down the chain.
+   * depend on anything further down the chain.
    *
    * ```kotlin
    * val networkResult: NetworkResult<MyData> = NetworkResult
@@ -175,4 +178,9 @@ sealed class NetworkResult<T>(
 
     return this
   }
+
+  fun interface Fetcher<T> {
+    @Throws(Exception::class)
+    fun fetch(): T
+  }
 }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java
index 2daa1ec9f3..5d47a417b0 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java
@@ -8,6 +8,7 @@
 
 import com.squareup.wire.FieldEncoding;
 
+import org.signal.core.util.Base64;
 import org.signal.libsignal.net.Network;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.IdentityKeyPair;
@@ -31,6 +32,7 @@
 import org.whispersystems.signalservice.api.archive.ArchiveApi;
 import org.whispersystems.signalservice.api.crypto.ProfileCipher;
 import org.whispersystems.signalservice.api.crypto.ProfileCipherOutputStream;
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess;
 import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
@@ -62,6 +64,7 @@
 import org.whispersystems.signalservice.api.storage.StorageManifestKey;
 import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV2;
 import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV3;
+import org.whispersystems.signalservice.api.svr.SvrApi;
 import org.whispersystems.signalservice.api.util.CredentialsProvider;
 import org.whispersystems.signalservice.api.util.Preconditions;
 import org.whispersystems.signalservice.internal.ServiceResponse;
@@ -69,13 +72,14 @@
 import org.whispersystems.signalservice.internal.crypto.PrimaryProvisioningCipher;
 import org.whispersystems.signalservice.internal.push.AuthCredentials;
 import org.whispersystems.signalservice.internal.push.BackupAuthCheckRequest;
-import org.whispersystems.signalservice.internal.push.BackupAuthCheckResponse;
+import org.whispersystems.signalservice.internal.push.BackupV2AuthCheckResponse;
 import org.whispersystems.signalservice.internal.push.CdsiAuthResponse;
 import org.whispersystems.signalservice.internal.push.OneTimePreKeyCounts;
 import org.whispersystems.signalservice.internal.push.PaymentAddress;
 import org.whispersystems.signalservice.internal.push.ProfileAvatarData;
 import org.whispersystems.signalservice.internal.push.ProvisionMessage;
 import org.whispersystems.signalservice.internal.push.ProvisioningSocket;
+import org.whispersystems.signalservice.internal.push.ProvisioningUuid;
 import org.whispersystems.signalservice.internal.push.ProvisioningVersion;
 import org.whispersystems.signalservice.internal.push.PushServiceSocket;
 import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse;
@@ -93,8 +97,6 @@
 import org.whispersystems.signalservice.internal.util.StaticCredentialsProvider;
 import org.whispersystems.signalservice.internal.util.Util;
 import org.whispersystems.signalservice.internal.websocket.DefaultResponseMapper;
-import org.signal.core.util.Base64;
-import org.whispersystems.signalservice.internal.websocket.LibSignalNetwork;
 
 import java.io.IOException;
 import java.security.MessageDigest;
@@ -192,8 +194,8 @@ public SecureValueRecoveryV2 getSecureValueRecoveryV2(String mrEnclave) {
     return new SecureValueRecoveryV2(configuration, mrEnclave, pushServiceSocket);
   }
 
-  public SecureValueRecoveryV3 getSecureValueRecoveryV3(Network network, SecureValueRecoveryV3.ShareSetStorage storage) {
-    return new SecureValueRecoveryV3(network, pushServiceSocket, storage);
+  public SecureValueRecoveryV3 getSecureValueRecoveryV3(Network network) {
+    return new SecureValueRecoveryV3(network, pushServiceSocket);
   }
 
   public WhoAmIResponse getWhoAmI() throws IOException {
@@ -214,9 +216,9 @@ public void setGcmId(Optional<String> gcmRegistrationId) throws IOException {
     }
   }
 
-  public Single<ServiceResponse<BackupAuthCheckResponse>> checkBackupAuthCredentials(@Nonnull String e164, @Nonnull List<String> usernamePasswords) {
+  public Single<ServiceResponse<BackupV2AuthCheckResponse>> checkBackupAuthCredentials(@Nonnull String e164, @Nonnull List<String> usernamePasswords) {
 
-    return pushServiceSocket.checkBackupAuthCredentials(new BackupAuthCheckRequest(e164, usernamePasswords), DefaultResponseMapper.getDefault(BackupAuthCheckResponse.class));
+    return pushServiceSocket.checkSvr2AuthCredentials(new BackupAuthCheckRequest(e164, usernamePasswords), DefaultResponseMapper.getDefault(BackupV2AuthCheckResponse.class));
   }
 
   /**
@@ -325,10 +327,6 @@ public ServiceResponse<RegistrationSessionMetadataResponse> verifyAccount(@Nonnu
     }
   }
 
-  public @Nonnull VerifyAccountResponse registerAccountV2(@Nullable String sessionId, @Nullable String recoveryPassword, AccountAttributes attributes, PreKeyCollection aciPreKeys, PreKeyCollection pniPreKeys, String fcmToken, boolean skipDeviceTransfer) throws IOException {
-    return pushServiceSocket.submitRegistrationRequest(sessionId, recoveryPassword, attributes, aciPreKeys, pniPreKeys, fcmToken, skipDeviceTransfer);
-  }
-
   public @Nonnull ServiceResponse<VerifyAccountResponse> changeNumber(@Nonnull ChangePhoneNumberRequest changePhoneNumberRequest) {
     try {
       VerifyAccountResponse response = this.pushServiceSocket.changeNumber(changePhoneNumberRequest);
@@ -376,17 +374,6 @@ public boolean isIdentifierRegistered(ServiceId identifier) throws IOException {
     return pushServiceSocket.isIdentifierRegistered(identifier);
   }
 
-  /**
-   * Request a UUID from the server for linking as a new device.
-   * Called by the new device.
-   * @return The UUID, Base64 encoded
-   * @throws TimeoutException
-   * @throws IOException
-   */
-  public String getNewDeviceUuid() throws TimeoutException, IOException {
-    return provisioningSocket.getProvisioningUuid().uuid;
-  }
-
   @SuppressWarnings("SameParameterValue")
   public CdsiV2Service.Response getRegisteredUsersWithCdsi(Set<String> previousE164s,
                                                            Set<String> newE164s,
@@ -394,7 +381,7 @@ public CdsiV2Service.Response getRegisteredUsersWithCdsi(Set<String> previousE16
                                                            Optional<byte[]> token,
                                                            String mrEnclave,
                                                            Long timeoutMs,
-                                                           @Nullable LibSignalNetwork libsignalNetwork,
+                                                           @Nullable Network libsignalNetwork,
                                                            Consumer<byte[]> tokenSaver)
       throws IOException
   {
@@ -664,6 +651,17 @@ public String getNewDeviceVerificationCode() throws IOException {
     return this.pushServiceSocket.getNewDeviceVerificationCode();
   }
 
+  /**
+   * Request a UUID from the server for linking as a new device.
+   * Called by the new device.
+   * @return The UUID, Base64 encoded
+   * @throws TimeoutException
+   * @throws IOException
+   */
+  public ProvisioningUuid requestNewDeviceUuid() throws TimeoutException, IOException {
+    return provisioningSocket.getProvisioningUuid();
+  }
+
   /**
    * Gets info from the primary device to finish the registration as a new device.<br>
    * @param tempIdentity A temporary identity. Must be the same as the one given to the already verified device.
@@ -861,7 +859,7 @@ public Optional<ExpiringProfileKeyCredential> resolveProfileKeyCredential(ACI se
       throws NonSuccessfulResponseCodeException, PushNetworkException
   {
     try {
-      ProfileAndCredential credential = this.pushServiceSocket.retrieveVersionedProfileAndCredential(serviceId, profileKey, Optional.empty(), locale).get(10, TimeUnit.SECONDS);
+      ProfileAndCredential credential = this.pushServiceSocket.retrieveVersionedProfileAndCredential(serviceId, profileKey, SealedSenderAccess.NONE, locale).get(10, TimeUnit.SECONDS);
       return credential.getExpiringProfileKeyCredential();
     } catch (InterruptedException | TimeoutException e) {
       throw new PushNetworkException(e);
@@ -1065,6 +1063,10 @@ public RegistrationApi getRegistrationApi() {
     return new RegistrationApi(pushServiceSocket);
   }
 
+  public SvrApi getSvrApi() {
+    return new SvrApi(pushServiceSocket);
+  }
+
   public AuthCredentials getPaymentsAuthorization() throws IOException {
     return pushServiceSocket.getPaymentsAuthorization();
   }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java
index d004801ade..b86c3472ae 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java
@@ -14,11 +14,10 @@
 import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.whispersystems.signalservice.api.backup.BackupKey;
-import org.whispersystems.signalservice.api.backup.MediaId;
 import org.whispersystems.signalservice.api.crypto.AttachmentCipherInputStream;
 import org.whispersystems.signalservice.api.crypto.AttachmentCipherStreamUtil;
 import org.whispersystems.signalservice.api.crypto.ProfileCipherInputStream;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment.ProgressListener;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
@@ -44,6 +43,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -98,7 +98,7 @@ public InputStream retrieveAttachment(SignalServiceAttachmentPointer pointer, Fi
 
   public ListenableFuture<ProfileAndCredential> retrieveProfile(SignalServiceAddress address,
                                                                 Optional<ProfileKey> profileKey,
-                                                                Optional<UnidentifiedAccess> unidentifiedAccess,
+                                                                @Nullable SealedSenderAccess sealedSenderAccess,
                                                                 SignalServiceProfile.RequestType requestType,
                                                                 Locale locale)
   {
@@ -115,16 +115,16 @@ public ListenableFuture<ProfileAndCredential> retrieveProfile(SignalServiceAddre
       }
 
       if (requestType == SignalServiceProfile.RequestType.PROFILE_AND_CREDENTIAL) {
-        return socket.retrieveVersionedProfileAndCredential(aci, profileKey.get(), unidentifiedAccess, locale);
+        return socket.retrieveVersionedProfileAndCredential(aci, profileKey.get(), sealedSenderAccess, locale);
       } else {
-        return FutureTransformers.map(socket.retrieveVersionedProfile(aci, profileKey.get(), unidentifiedAccess, locale), profile -> {
+        return FutureTransformers.map(socket.retrieveVersionedProfile(aci, profileKey.get(), sealedSenderAccess, locale), profile -> {
           return new ProfileAndCredential(profile,
                                           SignalServiceProfile.RequestType.PROFILE,
                                           Optional.empty());
         });
       }
     } else {
-      return FutureTransformers.map(socket.retrieveProfile(address, unidentifiedAccess, locale), profile -> {
+      return FutureTransformers.map(socket.retrieveProfile(address, sealedSenderAccess, locale), profile -> {
         return new ProfileAndCredential(profile,
                                         SignalServiceProfile.RequestType.PROFILE,
                                         Optional.empty());
@@ -146,8 +146,8 @@ public FileInputStream retrieveGroupsV2ProfileAvatar(String path, File destinati
     return new FileInputStream(destination);
   }
 
-  public Single<ServiceResponse<IdentityCheckResponse>> performIdentityCheck(@Nonnull IdentityCheckRequest request, @Nonnull Optional<UnidentifiedAccess> unidentifiedAccess, @Nonnull ResponseMapper<IdentityCheckResponse> responseMapper) {
-    return socket.performIdentityCheck(request, unidentifiedAccess, responseMapper);
+  public Single<ServiceResponse<IdentityCheckResponse>> performIdentityCheck(@Nonnull IdentityCheckRequest request, @Nonnull ResponseMapper<IdentityCheckResponse> responseMapper) {
+    return socket.performIdentityCheck(request, responseMapper);
   }
 
   /**
@@ -190,10 +190,11 @@ public InputStream retrieveArchivedAttachment(@Nonnull BackupKey.MediaKeyMateria
                                                 @Nonnull SignalServiceAttachmentPointer pointer,
                                                 @Nonnull File attachmentDestination,
                                                 long maxSizeBytes,
+                                                boolean ignoreDigest,
                                                 @Nullable ProgressListener listener)
       throws IOException, InvalidMessageException, MissingConfigurationException
   {
-    if (pointer.getDigest().isEmpty()) {
+    if (!ignoreDigest && pointer.getDigest().isEmpty()) {
       throw new InvalidMessageException("No attachment digest!");
     }
 
@@ -213,15 +214,21 @@ public InputStream retrieveArchivedAttachment(@Nonnull BackupKey.MediaKeyMateria
     return AttachmentCipherInputStream.createForAttachment(attachmentDestination,
                                                            pointer.getSize().orElse(0),
                                                            pointer.getKey(),
-                                                           pointer.getDigest().get(),
+                                                           ignoreDigest ? null : pointer.getDigest().get(),
                                                            null,
-                                                           0);
+                                                           0,
+                                                           ignoreDigest);
   }
 
   public void retrieveBackup(int cdnNumber, Map<String, String> headers, String cdnPath, File destination, ProgressListener listener) throws MissingConfigurationException, IOException {
     socket.retrieveBackup(cdnNumber, headers, cdnPath, destination, 1_000_000_000L, listener);
   }
 
+  @Nullable
+  public ZonedDateTime getCdnLastModifiedTime(int cdnNumber, Map<String, String> headers, String cdnPath) throws MissingConfigurationException, IOException {
+    return socket.getCdnLastModifiedTime(cdnNumber, headers, cdnPath);
+  }
+
   public InputStream retrieveSticker(byte[] packId, byte[] packKey, int stickerId)
       throws IOException, InvalidMessageException
   {
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
index 75a8fdb57b..6e09af5e93 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
@@ -22,16 +22,18 @@
 import org.signal.libsignal.protocol.state.PreKeyBundle;
 import org.signal.libsignal.protocol.state.SessionRecord;
 import org.signal.libsignal.protocol.util.Pair;
+import org.signal.libsignal.zkgroup.groupsend.GroupSendFullToken;
 import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations;
 import org.whispersystems.signalservice.api.crypto.AttachmentCipherStreamUtil;
 import org.whispersystems.signalservice.api.crypto.ContentHint;
 import org.whispersystems.signalservice.api.crypto.EnvelopeContent;
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess;
 import org.whispersystems.signalservice.api.crypto.SignalGroupSessionBuilder;
 import org.whispersystems.signalservice.api.crypto.SignalServiceCipher;
 import org.whispersystems.signalservice.api.crypto.SignalSessionBuilder;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
+import org.whispersystems.signalservice.api.groupsv2.GroupSendEndorsements;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
@@ -92,8 +94,8 @@
 import org.whispersystems.signalservice.internal.crypto.AttachmentDigest;
 import org.whispersystems.signalservice.internal.crypto.PaddingInputStream;
 import org.whispersystems.signalservice.internal.push.AttachmentPointer;
-import org.whispersystems.signalservice.internal.push.AttachmentV2UploadAttributes;
 import org.whispersystems.signalservice.internal.push.AttachmentUploadForm;
+import org.whispersystems.signalservice.internal.push.AttachmentV2UploadAttributes;
 import org.whispersystems.signalservice.internal.push.BodyRange;
 import org.whispersystems.signalservice.internal.push.CallMessage;
 import org.whispersystems.signalservice.internal.push.Content;
@@ -131,11 +133,9 @@
 import org.whispersystems.signalservice.internal.push.http.PartialSendCompleteListener;
 import org.whispersystems.signalservice.internal.push.http.ResumableUploadSpec;
 import org.whispersystems.signalservice.internal.util.Util;
-import org.whispersystems.util.ByteArrayUtil;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -146,10 +146,8 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
@@ -189,7 +187,6 @@ public class SignalServiceMessageSender {
   private final ExecutorService executor;
   private final Scheduler       scheduler;
   private final long            maxEnvelopeSize;
-  private final boolean         useRxMessageSend;
 
   public SignalServiceMessageSender(SignalServiceConfiguration urls,
                                     CredentialsProvider credentialsProvider,
@@ -201,8 +198,7 @@ public SignalServiceMessageSender(SignalServiceConfiguration urls,
                                     ClientZkProfileOperations clientZkProfileOperations,
                                     ExecutorService executor,
                                     long maxEnvelopeSize,
-                                    boolean automaticNetworkRetry,
-                                    boolean useRxMessageSend)
+                                    boolean automaticNetworkRetry)
   {
     this.socket            = new PushServiceSocket(urls, credentialsProvider, signalAgent, clientZkProfileOperations, automaticNetworkRetry);
     this.aciStore          = store.aci();
@@ -216,7 +212,6 @@ public SignalServiceMessageSender(SignalServiceConfiguration urls,
     this.executor          = executor != null ? executor : Executors.newSingleThreadExecutor();
     this.maxEnvelopeSize   = maxEnvelopeSize;
     this.localPniIdentity  = store.pni().getIdentityKeyPair();
-    this.useRxMessageSend  = useRxMessageSend;
     this.scheduler         = Schedulers.from(executor, false, false);
   }
 
@@ -227,7 +222,7 @@ public SignalServiceMessageSender(SignalServiceConfiguration urls,
    * @param message The read receipt to deliver.
    */
   public SendMessageResult sendReceipt(SignalServiceAddress recipient,
-                                       Optional<UnidentifiedAccessPair> unidentifiedAccess,
+                                       @Nullable SealedSenderAccess sealedSenderAccess,
                                        SignalServiceReceiptMessage message,
                                        boolean includePniSignature)
       throws IOException, UntrustedIdentityException
@@ -244,14 +239,14 @@ public SendMessageResult sendReceipt(SignalServiceAddress recipient,
 
     EnvelopeContent envelopeContent = EnvelopeContent.encrypted(content, ContentHint.IMPLICIT, Optional.empty());
 
-    return sendMessage(recipient, getTargetUnidentifiedAccess(unidentifiedAccess), message.getWhen(), envelopeContent, false, null, null, false, false);
+    return sendMessage(recipient, sealedSenderAccess, message.getWhen(), envelopeContent, false, null, null, false, false);
   }
 
   /**
    * Send a retry receipt for a bad-encrypted envelope.
    */
   public void sendRetryReceipt(SignalServiceAddress recipient,
-                               Optional<UnidentifiedAccessPair> unidentifiedAccess,
+                               @Nullable SealedSenderAccess sealedSenderAccess,
                                Optional<byte[]> groupId,
                                DecryptionErrorMessage errorMessage)
       throws IOException, UntrustedIdentityException
@@ -262,16 +257,16 @@ public void sendRetryReceipt(SignalServiceAddress recipient,
     PlaintextContent content         = new PlaintextContent(errorMessage);
     EnvelopeContent  envelopeContent = EnvelopeContent.plaintext(content, groupId);
 
-    sendMessage(recipient, getTargetUnidentifiedAccess(unidentifiedAccess), System.currentTimeMillis(), envelopeContent, false, null, null, false, false);
+    sendMessage(recipient, sealedSenderAccess, System.currentTimeMillis(), envelopeContent, false, null, null, false, false);
   }
 
   /**
    * Sends a typing indicator using client-side fanout. Doesn't bother with return results, since these are best-effort.
    */
-  public void sendTyping(List<SignalServiceAddress>             recipients,
-                         List<Optional<UnidentifiedAccessPair>> unidentifiedAccess,
-                         SignalServiceTypingMessage             message,
-                         CancelationSignal                      cancelationSignal)
+  public void sendTyping(List<SignalServiceAddress> recipients,
+                         List<SealedSenderAccess> sealedSenderAccesses,
+                         SignalServiceTypingMessage message,
+                         CancelationSignal cancelationSignal)
       throws IOException
   {
     Log.d(TAG, "[" + message.getTimestamp() + "] Sending a typing message to " + recipients.size() + " recipient(s) using 1:1 messages.");
@@ -279,22 +274,23 @@ public void sendTyping(List<SignalServiceAddress>             recipients,
     Content         content         = createTypingContent(message);
     EnvelopeContent envelopeContent = EnvelopeContent.encrypted(content, ContentHint.IMPLICIT, Optional.empty());
 
-    sendMessage(recipients, getTargetUnidentifiedAccess(unidentifiedAccess), message.getTimestamp(), envelopeContent, true, null, cancelationSignal, null, false, false);
+    sendMessage(recipients, sealedSenderAccesses, message.getTimestamp(), envelopeContent, true, null, cancelationSignal, null, false, false);
   }
 
   /**
    * Send a typing indicator to a group using sender key. Doesn't bother with return results, since these are best-effort.
    */
-  public void sendGroupTyping(DistributionId              distributionId,
-                              List<SignalServiceAddress>  recipients,
-                              List<UnidentifiedAccess>    unidentifiedAccess,
-                              SignalServiceTypingMessage  message)
+  public void sendGroupTyping(DistributionId distributionId,
+                              List<SignalServiceAddress> recipients,
+                              List<UnidentifiedAccess> unidentifiedAccess,
+                              @Nullable GroupSendEndorsements groupSendEndorsements,
+                              SignalServiceTypingMessage message)
       throws IOException, UntrustedIdentityException, InvalidKeyException, NoSessionException, InvalidRegistrationIdException
   {
     Log.d(TAG, "[" + message.getTimestamp() + "] Sending a typing message to " + recipients.size() + " recipient(s) using sender key.");
 
     Content content = createTypingContent(message);
-    sendGroupMessage(distributionId, recipients, unidentifiedAccess, message.getTimestamp(), content, ContentHint.IMPLICIT, message.getGroupId(), true, SenderKeyGroupEvents.EMPTY, false, false);
+    sendGroupMessage(distributionId, recipients, unidentifiedAccess, groupSendEndorsements, message.getTimestamp(), content, ContentHint.IMPLICIT, message.getGroupId(), true, SenderKeyGroupEvents.EMPTY, false, false);
   }
 
   /**
@@ -315,28 +311,29 @@ public void sendStorySyncMessage(SignalServiceStoryMessage message,
     }
 
     SignalServiceSyncMessage syncMessage = createSelfSendSyncMessageForStory(message, timestamp, isRecipientUpdate, manifest);
-    sendSyncMessage(syncMessage, Optional.empty());
+    sendSyncMessage(syncMessage);
   }
 
   /**
    * Send a story using sender key. Note: This is not just for group stories -- it's for any story. Just following the naming convention of making sender key
    * method named "sendGroup*"
    */
-  public List<SendMessageResult> sendGroupStory(DistributionId                          distributionId,
-                                                Optional<byte[]>                        groupId,
-                                                List<SignalServiceAddress>              recipients,
-                                                List<UnidentifiedAccess>                unidentifiedAccess,
-                                                boolean                                 isRecipientUpdate,
-                                                SignalServiceStoryMessage               message,
-                                                long                                    timestamp,
+  public List<SendMessageResult> sendGroupStory(DistributionId distributionId,
+                                                Optional<byte[]> groupId,
+                                                List<SignalServiceAddress> recipients,
+                                                List<UnidentifiedAccess> unidentifiedAccess,
+                                                @Nullable GroupSendEndorsements groupSendEndorsements,
+                                                boolean isRecipientUpdate,
+                                                SignalServiceStoryMessage message,
+                                                long timestamp,
                                                 Set<SignalServiceStoryMessageRecipient> manifest,
-                                                PartialSendBatchCompleteListener        partialListener)
+                                                PartialSendBatchCompleteListener partialListener)
       throws IOException, UntrustedIdentityException, InvalidKeyException, NoSessionException, InvalidRegistrationIdException
   {
     Log.d(TAG, "[" + timestamp + "] Sending a story.");
 
     Content                  content            = createStoryContent(message);
-    List<SendMessageResult>  sendMessageResults = sendGroupMessage(distributionId, recipients, unidentifiedAccess, timestamp, content, ContentHint.IMPLICIT, groupId, false, SenderKeyGroupEvents.EMPTY, false, true);
+    List<SendMessageResult>  sendMessageResults = sendGroupMessage(distributionId, recipients, unidentifiedAccess, groupSendEndorsements, timestamp, content, ContentHint.IMPLICIT, groupId, false, SenderKeyGroupEvents.EMPTY, false, true);
 
     if (partialListener != null) {
       partialListener.onPartialSendComplete(sendMessageResults);
@@ -358,7 +355,7 @@ public List<SendMessageResult> sendGroupStory(DistributionId
    * @throws IOException
    */
   public void sendCallMessage(SignalServiceAddress recipient,
-                              Optional<UnidentifiedAccessPair> unidentifiedAccess,
+                              @Nullable SealedSenderAccess sealedSenderAccess,
                               SignalServiceCallMessage message)
       throws IOException, UntrustedIdentityException
   {
@@ -368,11 +365,11 @@ public void sendCallMessage(SignalServiceAddress recipient,
     Content         content         = createCallContent(message);
     EnvelopeContent envelopeContent = EnvelopeContent.encrypted(content, ContentHint.DEFAULT, Optional.empty());
 
-    sendMessage(recipient, getTargetUnidentifiedAccess(unidentifiedAccess), timestamp, envelopeContent, false, null, null, message.isUrgent(), false);
+    sendMessage(recipient, sealedSenderAccess, timestamp, envelopeContent, false, null, null, message.isUrgent(), false);
   }
 
   public List<SendMessageResult> sendCallMessage(List<SignalServiceAddress> recipients,
-                                                 List<Optional<UnidentifiedAccessPair>> unidentifiedAccess,
+                                                 List<SealedSenderAccess> sealedSenderAccesses,
                                                  SignalServiceCallMessage message)
       throws IOException
   {
@@ -382,12 +379,13 @@ public List<SendMessageResult> sendCallMessage(List<SignalServiceAddress> recipi
     Content         content         = createCallContent(message);
     EnvelopeContent envelopeContent = EnvelopeContent.encrypted(content, ContentHint.DEFAULT, Optional.empty());
 
-    return sendMessage(recipients, getTargetUnidentifiedAccess(unidentifiedAccess), timestamp, envelopeContent, false, null, null, null, message.isUrgent(), false);
+    return sendMessage(recipients, sealedSenderAccesses, timestamp, envelopeContent, false, null, null, null, message.isUrgent(), false);
   }
 
   public List<SendMessageResult> sendCallMessage(DistributionId distributionId,
                                                  List<SignalServiceAddress> recipients,
                                                  List<UnidentifiedAccess> unidentifiedAccess,
+                                                 @Nullable GroupSendEndorsements groupSendEndorsements,
                                                  SignalServiceCallMessage message,
                                                  PartialSendBatchCompleteListener partialListener)
       throws IOException, UntrustedIdentityException, InvalidKeyException, NoSessionException, InvalidRegistrationIdException
@@ -396,7 +394,7 @@ public List<SendMessageResult> sendCallMessage(DistributionId distributionId,
 
     Content content = createCallContent(message);
 
-    List<SendMessageResult> results = sendGroupMessage(distributionId, recipients, unidentifiedAccess, message.getTimestamp().get(), content, ContentHint.IMPLICIT, message.getGroupId(), false, SenderKeyGroupEvents.EMPTY, message.isUrgent(), false);
+    List<SendMessageResult> results = sendGroupMessage(distributionId, recipients, unidentifiedAccess, groupSendEndorsements, message.getTimestamp().get(), content, ContentHint.IMPLICIT, message.getGroupId(), false, SenderKeyGroupEvents.EMPTY, message.isUrgent(), false);
 
     if (partialListener != null) {
       partialListener.onPartialSendComplete(results);
@@ -427,27 +425,27 @@ public CallingResponse makeCallingRequest(long requestId, String url, String htt
    * @throws UntrustedIdentityException
    * @throws IOException
    */
-  public SendMessageResult sendDataMessage(SignalServiceAddress             recipient,
-                                           Optional<UnidentifiedAccessPair> unidentifiedAccess,
-                                           ContentHint                      contentHint,
-                                           SignalServiceDataMessage         message,
-                                           IndividualSendEvents             sendEvents,
-                                           boolean                          urgent,
-                                           boolean                          includePniSignature)
+  public SendMessageResult sendDataMessage(SignalServiceAddress recipient,
+                                           @Nullable SealedSenderAccess sealedSenderAccess,
+                                           ContentHint contentHint,
+                                           SignalServiceDataMessage message,
+                                           IndividualSendEvents sendEvents,
+                                           boolean urgent,
+                                           boolean includePniSignature)
       throws UntrustedIdentityException, IOException
   {
     Log.d(TAG, "[" + message.getTimestamp() + "] Sending a data message.");
 
     Content content = createMessageContent(message);
 
-    return sendContent(recipient, unidentifiedAccess, contentHint, message, sendEvents, urgent, includePniSignature, content);
+    return sendContent(recipient, sealedSenderAccess, contentHint, message, sendEvents, urgent, includePniSignature, content);
   }
 
   /**
    * Send an edit message to a single recipient.
    */
   public SendMessageResult sendEditMessage(SignalServiceAddress recipient,
-                                           Optional<UnidentifiedAccessPair> unidentifiedAccess,
+                                           @Nullable SealedSenderAccess sealedSenderAccess,
                                            ContentHint contentHint,
                                            SignalServiceDataMessage message,
                                            IndividualSendEvents sendEvents,
@@ -459,14 +457,14 @@ public SendMessageResult sendEditMessage(SignalServiceAddress recipient,
 
     Content content = createEditMessageContent(new SignalServiceEditMessage(targetSentTimestamp, message));
 
-    return sendContent(recipient, unidentifiedAccess, contentHint, message, sendEvents, urgent, false, content);
+    return sendContent(recipient, sealedSenderAccess, contentHint, message, sendEvents, urgent, false, content);
   }
 
   /**
    * Sends content to a single recipient.
    */
   private SendMessageResult sendContent(SignalServiceAddress recipient,
-                                        Optional<UnidentifiedAccessPair> unidentifiedAccess,
+                                        @Nullable SealedSenderAccess sealedSenderAccess,
                                         ContentHint contentHint,
                                         SignalServiceDataMessage message,
                                         IndividualSendEvents sendEvents,
@@ -485,7 +483,7 @@ private SendMessageResult sendContent(SignalServiceAddress recipient,
     EnvelopeContent envelopeContent = EnvelopeContent.encrypted(content, contentHint, message.getGroupId());
 
     long              timestamp = message.getTimestamp();
-    SendMessageResult result    = sendMessage(recipient, getTargetUnidentifiedAccess(unidentifiedAccess), timestamp, envelopeContent, false, null, sendEvents, urgent, false);
+    SendMessageResult result    = sendMessage(recipient, sealedSenderAccess, timestamp, envelopeContent, false, null, sendEvents, urgent, false);
 
     sendEvents.onMessageSent();
 
@@ -493,7 +491,7 @@ private SendMessageResult sendContent(SignalServiceAddress recipient,
       Content         syncMessage        = createMultiDeviceSentTranscriptContent(content, Optional.of(recipient), timestamp, Collections.singletonList(result), false, Collections.emptySet());
       EnvelopeContent syncMessageContent = EnvelopeContent.encrypted(syncMessage, ContentHint.IMPLICIT, Optional.empty());
 
-      sendMessage(localAddress, Optional.empty(), timestamp, syncMessageContent, false, null, null, false, false);
+      sendMessage(localAddress, SealedSenderAccess.NONE, timestamp, syncMessageContent, false, null, null, false, false);
     }
 
     sendEvents.onSyncMessageSent();
@@ -513,13 +511,13 @@ public SenderKeyDistributionMessage getOrCreateNewGroupSession(DistributionId di
   /**
    * Sends the provided {@link SenderKeyDistributionMessage} to the specified recipients.
    */
-  public List<SendMessageResult> sendSenderKeyDistributionMessage(DistributionId                         distributionId,
-                                                                  List<SignalServiceAddress>             recipients,
-                                                                  List<Optional<UnidentifiedAccessPair>> unidentifiedAccess,
-                                                                  SenderKeyDistributionMessage           message,
-                                                                  Optional<byte[]>                       groupId,
-                                                                  boolean                                urgent,
-                                                                  boolean                                story)
+  public List<SendMessageResult> sendSenderKeyDistributionMessage(DistributionId distributionId,
+                                                                  List<SignalServiceAddress> recipients,
+                                                                  List<SealedSenderAccess> sealedSenderAccesses,
+                                                                  SenderKeyDistributionMessage message,
+                                                                  Optional<byte[]> groupId,
+                                                                  boolean urgent,
+                                                                  boolean story)
       throws IOException
   {
     ByteString      distributionBytes = ByteString.of(message.serialize());
@@ -529,14 +527,14 @@ public List<SendMessageResult> sendSenderKeyDistributionMessage(DistributionId
 
     Log.d(TAG, "[" + timestamp + "] Sending SKDM to " + recipients.size() + " recipients for DistributionId " + distributionId);
 
-    return sendMessage(recipients, getTargetUnidentifiedAccess(unidentifiedAccess), timestamp, envelopeContent, false, null, null, null, urgent, story);
+    return sendMessage(recipients, sealedSenderAccesses, timestamp, envelopeContent, false, null, null, null, urgent, story);
   }
 
   /**
    * Resend a previously-sent message.
    */
   public SendMessageResult resendContent(SignalServiceAddress address,
-                                         Optional<UnidentifiedAccessPair> unidentifiedAccess,
+                                         @Nullable SealedSenderAccess sealedSenderAccess,
                                          long timestamp,
                                          Content content,
                                          ContentHint contentHint,
@@ -547,13 +545,12 @@ public SendMessageResult resendContent(SignalServiceAddress address,
     Log.d(TAG, "[" + timestamp + "] Resending content.");
 
     EnvelopeContent              envelopeContent = EnvelopeContent.encrypted(content, contentHint, groupId);
-    Optional<UnidentifiedAccess> access          = unidentifiedAccess.isPresent() ? unidentifiedAccess.get().getTargetUnidentifiedAccess() : Optional.empty();
 
     if (address.getServiceId().equals(localAddress.getServiceId())) {
-      access = Optional.empty();
+      sealedSenderAccess = SealedSenderAccess.NONE;
     }
 
-    return sendMessage(address, access, timestamp, envelopeContent, false, null, null, urgent, false);
+    return sendMessage(address, sealedSenderAccess, timestamp, envelopeContent, false, null, null, urgent, false);
   }
 
   /**
@@ -562,6 +559,7 @@ public SendMessageResult resendContent(SignalServiceAddress address,
   public List<SendMessageResult> sendGroupDataMessage(DistributionId distributionId,
                                                       List<SignalServiceAddress> recipients,
                                                       List<UnidentifiedAccess> unidentifiedAccess,
+                                                      @Nullable GroupSendEndorsements groupSendEndorsements,
                                                       boolean isRecipientUpdate,
                                                       ContentHint contentHint,
                                                       SignalServiceDataMessage message,
@@ -583,7 +581,7 @@ public List<SendMessageResult> sendGroupDataMessage(DistributionId distributionI
     }
 
     Optional<byte[]>        groupId = message.getGroupId();
-    List<SendMessageResult> results = sendGroupMessage(distributionId, recipients, unidentifiedAccess, message.getTimestamp(), content, contentHint, groupId, false, sendEvents, urgent, isForStory);
+    List<SendMessageResult> results = sendGroupMessage(distributionId, recipients, unidentifiedAccess, groupSendEndorsements, message.getTimestamp(), content, contentHint, groupId, false, sendEvents, urgent, isForStory);
 
     if (partialListener != null) {
       partialListener.onPartialSendComplete(results);
@@ -595,7 +593,7 @@ public List<SendMessageResult> sendGroupDataMessage(DistributionId distributionI
       Content         syncMessage        = createMultiDeviceSentTranscriptContent(content, Optional.empty(), message.getTimestamp(), results, isRecipientUpdate, Collections.emptySet());
       EnvelopeContent syncMessageContent = EnvelopeContent.encrypted(syncMessage, ContentHint.IMPLICIT, Optional.empty());
 
-      sendMessage(localAddress, Optional.empty(), message.getTimestamp(), syncMessageContent, false, null, null, false, false);
+      sendMessage(localAddress, SealedSenderAccess.NONE, message.getTimestamp(), syncMessageContent, false, null, null, false, false);
     }
 
     sendEvents.onSyncMessageSent();
@@ -609,15 +607,15 @@ public List<SendMessageResult> sendGroupDataMessage(DistributionId distributionI
    * @param partialListener A listener that will be called when an individual send is completed. Will be invoked on an arbitrary background thread, *not*
    *                        the calling thread.
    */
-  public List<SendMessageResult> sendDataMessage(List<SignalServiceAddress>             recipients,
-                                                 List<Optional<UnidentifiedAccessPair>> unidentifiedAccess,
-                                                 boolean                                isRecipientUpdate,
-                                                 ContentHint                            contentHint,
-                                                 SignalServiceDataMessage               message,
-                                                 LegacyGroupEvents                      sendEvents,
-                                                 PartialSendCompleteListener            partialListener,
-                                                 CancelationSignal                      cancelationSignal,
-                                                 boolean                                urgent)
+  public List<SendMessageResult> sendDataMessage(List<SignalServiceAddress> recipients,
+                                                 List<SealedSenderAccess> sealedSenderAccesses,
+                                                 boolean isRecipientUpdate,
+                                                 ContentHint contentHint,
+                                                 SignalServiceDataMessage message,
+                                                 LegacyGroupEvents sendEvents,
+                                                 PartialSendCompleteListener partialListener,
+                                                 CancelationSignal cancelationSignal,
+                                                 boolean urgent)
       throws IOException, UntrustedIdentityException
   {
     Log.d(TAG, "[" + message.getTimestamp() + "] Sending a data message to " + recipients.size() + " recipients.");
@@ -625,7 +623,7 @@ public List<SendMessageResult> sendDataMessage(List<SignalServiceAddress>
     Content                 content            = createMessageContent(message);
     EnvelopeContent         envelopeContent    = EnvelopeContent.encrypted(content, contentHint, message.getGroupId());
     long                    timestamp          = message.getTimestamp();
-    List<SendMessageResult> results            = sendMessage(recipients, getTargetUnidentifiedAccess(unidentifiedAccess), timestamp, envelopeContent, false, partialListener, cancelationSignal, sendEvents, urgent, false);
+    List<SendMessageResult> results            = sendMessage(recipients, sealedSenderAccesses, timestamp, envelopeContent, false, partialListener, cancelationSignal, sendEvents, urgent, false);
     boolean                 needsSyncInResults = false;
 
     sendEvents.onMessageSent();
@@ -646,7 +644,7 @@ public List<SendMessageResult> sendDataMessage(List<SignalServiceAddress>
       Content         syncMessage        = createMultiDeviceSentTranscriptContent(content, recipient, timestamp, results, isRecipientUpdate, Collections.emptySet());
       EnvelopeContent syncMessageContent = EnvelopeContent.encrypted(syncMessage, ContentHint.IMPLICIT, Optional.empty());
 
-      sendMessage(localAddress, Optional.empty(), timestamp, syncMessageContent, false, null, null, false, false);
+      sendMessage(localAddress, SealedSenderAccess.NONE, timestamp, syncMessageContent, false, null, null, false, false);
     }
 
     sendEvents.onSyncMessageSent();
@@ -660,16 +658,16 @@ public List<SendMessageResult> sendDataMessage(List<SignalServiceAddress>
    * @param partialListener A listener that will be called when an individual send is completed. Will be invoked on an arbitrary background thread, *not*
    *                        the calling thread.
    */
-  public List<SendMessageResult> sendEditMessage(List<SignalServiceAddress>             recipients,
-                                                 List<Optional<UnidentifiedAccessPair>> unidentifiedAccess,
-                                                 boolean                                isRecipientUpdate,
-                                                 ContentHint                            contentHint,
-                                                 SignalServiceDataMessage               message,
-                                                 LegacyGroupEvents                      sendEvents,
-                                                 PartialSendCompleteListener            partialListener,
-                                                 CancelationSignal                      cancelationSignal,
-                                                 boolean                                urgent,
-                                                 long                                   targetSentTimestamp)
+  public List<SendMessageResult> sendEditMessage(List<SignalServiceAddress> recipients,
+                                                 List<SealedSenderAccess> sealedSenderAccesses,
+                                                 boolean isRecipientUpdate,
+                                                 ContentHint contentHint,
+                                                 SignalServiceDataMessage message,
+                                                 LegacyGroupEvents sendEvents,
+                                                 PartialSendCompleteListener partialListener,
+                                                 CancelationSignal cancelationSignal,
+                                                 boolean urgent,
+                                                 long targetSentTimestamp)
       throws IOException, UntrustedIdentityException
   {
     Log.d(TAG, "[" + message.getTimestamp() + "] Sending a edit message to " + recipients.size() + " recipients.");
@@ -677,7 +675,7 @@ public List<SendMessageResult> sendEditMessage(List<SignalServiceAddress>
     Content                 content            = createEditMessageContent(new SignalServiceEditMessage(targetSentTimestamp, message));
     EnvelopeContent         envelopeContent    = EnvelopeContent.encrypted(content, contentHint, message.getGroupId());
     long                    timestamp          = message.getTimestamp();
-    List<SendMessageResult> results            = sendMessage(recipients, getTargetUnidentifiedAccess(unidentifiedAccess), timestamp, envelopeContent, false, partialListener, cancelationSignal, null, urgent, false);
+    List<SendMessageResult> results            = sendMessage(recipients, sealedSenderAccesses, timestamp, envelopeContent, false, partialListener, cancelationSignal, null, urgent, false);
     boolean                 needsSyncInResults = false;
 
     sendEvents.onMessageSent();
@@ -698,7 +696,7 @@ public List<SendMessageResult> sendEditMessage(List<SignalServiceAddress>
       Content         syncMessage        = createMultiDeviceSentTranscriptContent(content, recipient, timestamp, results, isRecipientUpdate, Collections.emptySet());
       EnvelopeContent syncMessageContent = EnvelopeContent.encrypted(syncMessage, ContentHint.IMPLICIT, Optional.empty());
 
-      sendMessage(localAddress, Optional.empty(), timestamp, syncMessageContent, false, null, null, false, false);
+      sendMessage(localAddress, SealedSenderAccess.NONE, timestamp, syncMessageContent, false, null, null, false, false);
     }
 
     sendEvents.onSyncMessageSent();
@@ -710,17 +708,17 @@ public SendMessageResult sendSyncMessage(SignalServiceDataMessage dataMessage)
       throws IOException, UntrustedIdentityException
   {
     Log.d(TAG, "[" + dataMessage.getTimestamp() + "] Sending self-sync message.");
-    return sendSyncMessage(createSelfSendSyncMessage(dataMessage), Optional.empty());
+    return sendSyncMessage(createSelfSendSyncMessage(dataMessage));
   }
 
   public SendMessageResult sendSelfSyncEditMessage(SignalServiceEditMessage editMessage)
       throws IOException, UntrustedIdentityException
   {
     Log.d(TAG, "[" + editMessage.getDataMessage().getTimestamp() + "] Sending self-sync edit message for " + editMessage.getTargetSentTimestamp() + ".");
-    return sendSyncMessage(createSelfSendSyncEditMessage(editMessage), Optional.empty());
+    return sendSyncMessage(createSelfSendSyncEditMessage(editMessage));
   }
 
-  public SendMessageResult sendSyncMessage(SignalServiceSyncMessage message, Optional<UnidentifiedAccessPair> unidentifiedAccess)
+  public SendMessageResult sendSyncMessage(SignalServiceSyncMessage message)
       throws IOException, UntrustedIdentityException
   {
     Content content;
@@ -740,7 +738,7 @@ public SendMessageResult sendSyncMessage(SignalServiceSyncMessage message, Optio
     } else if (message.getConfiguration().isPresent()) {
       content = createMultiDeviceConfigurationContent(message.getConfiguration().get());
     } else if (message.getSent().isPresent()) {
-      content = createMultiDeviceSentTranscriptContent(message.getSent().get(), unidentifiedAccess.isPresent());
+      content = createMultiDeviceSentTranscriptContent(message.getSent().get());
     } else if (message.getStickerPackOperations().isPresent()) {
       content = createMultiDeviceStickerPackOperationContent(message.getStickerPackOperations().get());
     } else if (message.getFetchType().isPresent()) {
@@ -766,12 +764,19 @@ public SendMessageResult sendSyncMessage(SignalServiceSyncMessage message, Optio
       throw new IOException("Unsupported sync message!");
     }
 
-    long timestamp = message.getSent().isPresent() ? message.getSent().get().getTimestamp()
-                                                   : System.currentTimeMillis();
+    Optional<Long> timestamp = message.getSent().map(SentTranscriptMessage::getTimestamp);
+
+    return sendSyncMessage(content, urgent, timestamp);
+  }
+
+  public @Nonnull SendMessageResult sendSyncMessage(Content content, boolean urgent, Optional<Long> sent)
+      throws IOException, UntrustedIdentityException
+  {
+    long timestamp = sent.orElseGet(System::currentTimeMillis);
 
     EnvelopeContent envelopeContent = EnvelopeContent.encrypted(content, ContentHint.IMPLICIT, Optional.empty());
 
-    return sendMessage(localAddress, Optional.empty(), timestamp, envelopeContent, false, null, null, urgent, false);
+    return sendMessage(localAddress, SealedSenderAccess.NONE, timestamp, envelopeContent, false, null, null, urgent, false);
   }
 
   /**
@@ -789,7 +794,7 @@ public SendMessageResult sendSyncMessage(SignalServiceSyncMessage message, Optio
     Content.Builder     content         = new Content.Builder().syncMessage(syncMessage.build());
     EnvelopeContent     envelopeContent = EnvelopeContent.encrypted(content.build(), ContentHint.IMPLICIT, Optional.empty());
 
-    return getEncryptedMessage(localAddress, Optional.empty(), deviceId, envelopeContent, false);
+    return getEncryptedMessage(localAddress, SealedSenderAccess.NONE, deviceId, envelopeContent, false);
   }
 
   public void cancelInFlightRequests() {
@@ -856,7 +861,8 @@ private SignalServiceAttachmentPointer uploadAttachmentV2(SignalServiceAttachmen
                                               attachment.isGif(),
                                               attachment.getCaption(),
                                               attachment.getBlurHash(),
-                                              attachment.getUploadTimestamp());
+                                              attachment.getUploadTimestamp(),
+                                              attachment.getUuid());
   }
 
   public ResumableUploadSpec getResumableUploadSpec() throws IOException {
@@ -901,14 +907,15 @@ private SignalServiceAttachmentPointer uploadAttachmentV4(SignalServiceAttachmen
                                               attachment.isGif(),
                                               attachment.getCaption(),
                                               attachment.getBlurHash(),
-                                              attachment.getUploadTimestamp());
+                                              attachment.getUploadTimestamp(),
+                                              attachment.getUuid());
   }
 
   private SendMessageResult sendVerifiedSyncMessage(VerifiedMessage message)
       throws IOException, UntrustedIdentityException
   {
     byte[] nullMessageBody = new DataMessage.Builder()
-                                            .body(Base64.encodeWithPadding(Util.getRandomLengthBytes(140)))
+                                            .body(Base64.encodeWithPadding(Util.getRandomLengthSecretBytes(140)))
                                             .build()
                                             .encode();
 
@@ -922,23 +929,23 @@ private SendMessageResult sendVerifiedSyncMessage(VerifiedMessage message)
 
     EnvelopeContent envelopeContent = EnvelopeContent.encrypted(content, ContentHint.IMPLICIT, Optional.empty());
 
-    SendMessageResult result = sendMessage(message.getDestination(), Optional.empty(), message.getTimestamp(), envelopeContent, false, null, null, false, false);
+    SendMessageResult result = sendMessage(message.getDestination(), null, message.getTimestamp(), envelopeContent, false, null, null, false, false);
 
     if (result.getSuccess().isNeedsSync()) {
       Content         syncMessage        = createMultiDeviceVerifiedContent(message, nullMessage.encode());
       EnvelopeContent syncMessageContent = EnvelopeContent.encrypted(syncMessage, ContentHint.IMPLICIT, Optional.empty());
 
-      sendMessage(localAddress, Optional.empty(), message.getTimestamp(), syncMessageContent, false, null, null, false, false);
+      sendMessage(localAddress, SealedSenderAccess.NONE, message.getTimestamp(), syncMessageContent, false, null, null, false, false);
     }
 
     return result;
   }
 
-  public SendMessageResult sendNullMessage(SignalServiceAddress address, Optional<UnidentifiedAccessPair> unidentifiedAccess)
+  public SendMessageResult sendNullMessage(SignalServiceAddress address, @Nullable SealedSenderAccess sealedSenderAccess)
       throws UntrustedIdentityException, IOException
   {
     byte[] nullMessageBody = new DataMessage.Builder()
-                                            .body(Base64.encodeWithPadding(Util.getRandomLengthBytes(140)))
+                                            .body(Base64.encodeWithPadding(Util.getRandomLengthSecretBytes(140)))
                                             .build()
                                             .encode();
 
@@ -952,7 +959,7 @@ public SendMessageResult sendNullMessage(SignalServiceAddress address, Optional<
 
     EnvelopeContent envelopeContent = EnvelopeContent.encrypted(content, ContentHint.IMPLICIT, Optional.empty());
 
-    return sendMessage(address, getTargetUnidentifiedAccess(unidentifiedAccess), System.currentTimeMillis(), envelopeContent, false, null, null, false, false);
+    return sendMessage(address, sealedSenderAccess, System.currentTimeMillis(), envelopeContent, false, null, null, false, false);
   }
 
   private PniSignatureMessage createPniSignatureMessage() {
@@ -1375,10 +1382,10 @@ private Content createMultiDeviceContactsContent(SignalServiceAttachmentStream c
     return container.syncMessage(builder.build()).build();
   }
 
-  private Content createMultiDeviceSentTranscriptContent(SentTranscriptMessage transcript, boolean unidentifiedAccess) throws IOException {
+  private Content createMultiDeviceSentTranscriptContent(SentTranscriptMessage transcript) throws IOException {
     SignalServiceAddress address = transcript.getDestination().get();
     Content              content = createMessageContent(transcript);
-    SendMessageResult    result  = SendMessageResult.success(address, Collections.emptyList(), unidentifiedAccess, true, -1, Optional.ofNullable(content));
+    SendMessageResult    result  = SendMessageResult.success(address, Collections.emptyList(), false, true, -1, Optional.ofNullable(content));
 
 
     return createMultiDeviceSentTranscriptContent(content,
@@ -1419,7 +1426,7 @@ private Content createMultiDeviceSentTranscriptContent(Content content, Optional
 
         unidentifiedDeliveryStatuses.add(new SyncMessage.Sent.UnidentifiedDeliveryStatus.Builder()
                                                                                         .destinationServiceId(result.getAddress().getServiceId().toString())
-                                                                                        .unidentified(result.getSuccess().isUnidentified())
+                                                                                        .unidentified(false)
                                                                                         .destinationIdentityKey(identity)
                                                                                         .build());
       }
@@ -1763,9 +1770,7 @@ private Content createCallLogEventContent(SyncMessage.CallLogEvent proto) {
   }
 
   private SyncMessage.Builder createSyncMessageBuilder() {
-    SecureRandom random  = new SecureRandom();
-    byte[]       padding = Util.getRandomLengthBytes(512);
-    random.nextBytes(padding);
+    byte[]       padding = Util.getRandomLengthSecretBytes(512);
 
     SyncMessage.Builder builder = new SyncMessage.Builder();
     builder.padding(ByteString.of(padding));
@@ -1930,109 +1935,15 @@ private SignalServiceSyncMessage createSelfSendSyncEditMessage(SignalServiceEdit
     return SignalServiceSyncMessage.forSentTranscript(transcript);
   }
 
-  private List<SendMessageResult> sendMessage(List<SignalServiceAddress>         recipients,
-                                              List<Optional<UnidentifiedAccess>> unidentifiedAccess,
-                                              long                               timestamp,
-                                              EnvelopeContent                    content,
-                                              boolean                            online,
-                                              PartialSendCompleteListener        partialListener,
-                                              CancelationSignal                  cancelationSignal,
-                                              SendEvents                         sendEvents,
-                                              boolean                            urgent,
-                                              boolean                            story)
-      throws IOException
-  {
-    if (useRxMessageSend) {
-      return sendMessageRx(recipients, unidentifiedAccess, timestamp, content, online, partialListener, cancelationSignal, sendEvents, urgent, story);
-    }
-
-    Log.d(TAG, "[" + timestamp + "] Sending to " + recipients.size() + " recipients.");
-    enforceMaxContentSize(content);
-
-    long                                   startTime                  = System.currentTimeMillis();
-    List<Future<SendMessageResult>>        futureResults              = new LinkedList<>();
-    Iterator<SignalServiceAddress>         recipientIterator          = recipients.iterator();
-    Iterator<Optional<UnidentifiedAccess>> unidentifiedAccessIterator = unidentifiedAccess.iterator();
-
-    while (recipientIterator.hasNext()) {
-      SignalServiceAddress         recipient = recipientIterator.next();
-      Optional<UnidentifiedAccess> access    = unidentifiedAccessIterator.next();
-      futureResults.add(executor.submit(() -> {
-        SendMessageResult result = sendMessage(recipient, access, timestamp, content, online, cancelationSignal, sendEvents, urgent, story);
-        if (partialListener != null) {
-          partialListener.onPartialSendComplete(result);
-        }
-        return result;
-      }));
-    }
-
-    List<SendMessageResult> results = new ArrayList<>(futureResults.size());
-    recipientIterator = recipients.iterator();
-
-    for (Future<SendMessageResult> futureResult : futureResults) {
-      SignalServiceAddress recipient = recipientIterator.next();
-      try {
-        results.add(futureResult.get());
-      } catch (ExecutionException e) {
-        if (e.getCause() instanceof UntrustedIdentityException) {
-          Log.w(TAG, "[" + timestamp + "] Hit identity mismatch: " + recipient.getIdentifier(), e);
-          results.add(SendMessageResult.identityFailure(recipient, ((UntrustedIdentityException) e.getCause()).getIdentityKey()));
-        } else if (e.getCause() instanceof UnregisteredUserException) {
-          Log.w(TAG, "[" + timestamp + "] Hit unregistered user: " + recipient.getIdentifier());
-          results.add(SendMessageResult.unregisteredFailure(recipient));
-        } else if (e.getCause() instanceof PushNetworkException) {
-          Log.w(TAG, "[" + timestamp + "] Hit network failure: " + recipient.getIdentifier(), e);
-          results.add(SendMessageResult.networkFailure(recipient));
-        } else if (e.getCause() instanceof ServerRejectedException) {
-          Log.w(TAG, "[" + timestamp + "] Hit server rejection: " + recipient.getIdentifier(), e);
-          throw ((ServerRejectedException) e.getCause());
-        } else if (e.getCause() instanceof ProofRequiredException) {
-          Log.w(TAG, "[" + timestamp + "] Hit proof required: " + recipient.getIdentifier(), e);
-          results.add(SendMessageResult.proofRequiredFailure(recipient, (ProofRequiredException) e.getCause()));
-        } else if (e.getCause() instanceof RateLimitException) {
-          Log.w(TAG, "[" + timestamp + "] Hit rate limit: " + recipient.getIdentifier(), e);
-          results.add(SendMessageResult.rateLimitFailure(recipient, (RateLimitException) e.getCause()));
-        } else if (e.getCause() instanceof InvalidPreKeyException) {
-          Log.w(TAG, "[" + timestamp + "] Hit invalid prekey: " + recipient.getIdentifier(), e);
-          results.add(SendMessageResult.invalidPreKeyFailure(recipient));
-        } else {
-          Log.w(TAG, "[" + timestamp + "] Hit unknown exception: " + recipient.getIdentifier(), e);
-          throw new IOException(e);
-        }
-      } catch (InterruptedException e) {
-        throw new IOException(e);
-      }
-    }
-
-    double sendsForAverage = 0;
-    for (SendMessageResult result : results) {
-      if (result.getSuccess() != null && result.getSuccess().getDuration() != -1) {
-        sendsForAverage++;
-      }
-    }
-
-    double average = 0;
-    if (sendsForAverage > 0) {
-      for (SendMessageResult result : results) {
-        if (result.getSuccess() != null && result.getSuccess().getDuration() != -1) {
-          average += result.getSuccess().getDuration() / sendsForAverage;
-        }
-      }
-    }
-
-    Log.d(TAG, "[" + timestamp + "] Completed send to " + recipients.size() + " recipients in " + (System.currentTimeMillis() - startTime) + " ms, with an average time of " + Math.round(average) + " ms per send.");
-    return results;
-  }
-
-  private SendMessageResult sendMessage(SignalServiceAddress         recipient,
-                                        Optional<UnidentifiedAccess> unidentifiedAccess,
-                                        long                         timestamp,
-                                        EnvelopeContent              content,
-                                        boolean                      online,
-                                        CancelationSignal            cancelationSignal,
-                                        SendEvents                   sendEvents,
-                                        boolean                      urgent,
-                                        boolean                      story)
+  private SendMessageResult sendMessage(SignalServiceAddress recipient,
+                                        @Nullable SealedSenderAccess sealedSenderAccess,
+                                        long timestamp,
+                                        EnvelopeContent content,
+                                        boolean online,
+                                        CancelationSignal cancelationSignal,
+                                        SendEvents sendEvents,
+                                        boolean urgent,
+                                        boolean story)
       throws UntrustedIdentityException, IOException
   {
     enforceMaxContentSize(content);
@@ -2045,7 +1956,13 @@ private SendMessageResult sendMessage(SignalServiceAddress         recipient,
       }
 
       try {
-        OutgoingPushMessageList messages = getEncryptedMessages(recipient, unidentifiedAccess, timestamp, content, online, urgent, story);
+        OutgoingPushMessageList messages = getEncryptedMessages(recipient,
+                                                                sealedSenderAccess,
+                                                                timestamp,
+                                                                content,
+                                                                online,
+                                                                urgent,
+                                                                story);
         if (i == 0 && sendEvents != null) {
           sendEvents.onMessageEncrypted();
         }
@@ -2060,52 +1977,41 @@ private SendMessageResult sendMessage(SignalServiceAddress         recipient,
           throw new CancelationException();
         }
 
-        if (!unidentifiedAccess.isPresent()) {
-          try {
-            SendMessageResponse response = new MessagingService.SendResponseProcessor<>(messagingService.send(messages, Optional.empty(), story).blockingGet()).getResultOrThrow();
-            return SendMessageResult.success(recipient, messages.getDevices(), response.sentUnidentified(), response.getNeedsSync() || aciStore.isMultiDevice(), System.currentTimeMillis() - startTime, content.getContent());
-          } catch (InvalidUnidentifiedAccessHeaderException | UnregisteredUserException | MismatchedDevicesException | StaleDevicesException e) {
-            // Non-technical failures shouldn't be retried with socket
-            throw e;
-          } catch (WebSocketUnavailableException e) {
-            Log.i(TAG, "[sendMessage][" + timestamp + "] Pipe unavailable, falling back... (" + e.getClass().getSimpleName() + ": " + e.getMessage() + ")");
-          } catch (IOException e) {
-            Log.w(TAG, e);
-            Log.w(TAG, "[sendMessage][" + timestamp + "] Pipe failed, falling back... (" + e.getClass().getSimpleName() + ": " + e.getMessage() + ")");
-          }
-        } else if (unidentifiedAccess.isPresent()) {
-          try {
-            SendMessageResponse response = new MessagingService.SendResponseProcessor<>(messagingService.send(messages, unidentifiedAccess, story).blockingGet()).getResultOrThrow();
-            return SendMessageResult.success(recipient, messages.getDevices(), response.sentUnidentified(), response.getNeedsSync() || aciStore.isMultiDevice(), System.currentTimeMillis() - startTime, content.getContent());
-          } catch (InvalidUnidentifiedAccessHeaderException | UnregisteredUserException | MismatchedDevicesException | StaleDevicesException e) {
-            // Non-technical failures shouldn't be retried with socket
-            throw e;
-          } catch (WebSocketUnavailableException e) {
-            Log.i(TAG, "[sendMessage][" + timestamp + "] Unidentified pipe unavailable, falling back... (" + e.getClass().getSimpleName() + ": " + e.getMessage() + ")");
-          } catch (IOException e) {
-            Throwable cause = e;
-            if (e.getCause() != null) {
-              cause = e.getCause();
-            }
-            Log.w(TAG, "[sendMessage][" + timestamp + "] Unidentified pipe failed, falling back... (" + cause.getClass().getSimpleName() + ": " + cause.getMessage() + ")");
+        try {
+          SendMessageResponse response = new MessagingService.SendResponseProcessor<>(messagingService.send(messages, sealedSenderAccess, story).blockingGet()).getResultOrThrow();
+          return SendMessageResult.success(recipient, messages.getDevices(), response.sentUnidentified(), response.getNeedsSync() || aciStore.isMultiDevice(), System.currentTimeMillis() - startTime, content.getContent());
+        } catch (InvalidUnidentifiedAccessHeaderException | UnregisteredUserException | MismatchedDevicesException | StaleDevicesException e) {
+          // Non-technical failures shouldn't be retried with socket
+          throw e;
+        } catch (WebSocketUnavailableException e) {
+          String pipe = sealedSenderAccess == null ? "Pipe" : "Unidentified pipe";
+          Log.i(TAG, "[sendMessage][" + timestamp + "] " + pipe + " unavailable, falling back... (" + e.getClass().getSimpleName() + ": " + e.getMessage() + ")");
+        } catch (IOException e) {
+          String pipe = sealedSenderAccess == null ? "Pipe" : "Unidentified pipe";
+          Throwable cause = e;
+          if (e.getCause() != null) {
+            cause = e.getCause();
           }
+          Log.w(TAG, "[sendMessage][" + timestamp + "] " + pipe + " failed, falling back... (" + cause.getClass().getSimpleName() + ": " + cause.getMessage() + ")");
         }
 
         if (cancelationSignal != null && cancelationSignal.isCanceled()) {
           throw new CancelationException();
         }
 
-        SendMessageResponse response = socket.sendMessage(messages, unidentifiedAccess, story);
+        SendMessageResponse response = socket.sendMessage(messages, sealedSenderAccess, story);
 
         return SendMessageResult.success(recipient, messages.getDevices(), response.sentUnidentified(), response.getNeedsSync() || aciStore.isMultiDevice(), System.currentTimeMillis() - startTime, content.getContent());
 
       } catch (InvalidKeyException ike) {
         Log.w(TAG, ike);
-        unidentifiedAccess = Optional.empty();
+        if (sealedSenderAccess != null) {
+          sealedSenderAccess = sealedSenderAccess.switchToFallback();
+        }
       } catch (AuthorizationFailedException afe) {
-        if (unidentifiedAccess.isPresent()) {
+        if (sealedSenderAccess != null) {
           Log.w(TAG, "Got an AuthorizationFailedException when trying to send using sealed sender. Falling back.");
-          unidentifiedAccess = Optional.empty();
+          sealedSenderAccess = sealedSenderAccess.switchToFallback();
         } else {
           Log.w(TAG, "Got an AuthorizationFailedException without using sealed sender!", afe);
           throw afe;
@@ -2128,30 +2034,31 @@ private SendMessageResult sendMessage(SignalServiceAddress         recipient,
    * @return An unordered list of a {@link SendMessageResult} for each send.
    * @throws IOException - Unknown failure or a failure not representable by an unsuccessful {@code SendMessageResult}.
    */
-  private List<SendMessageResult> sendMessageRx(List<SignalServiceAddress> recipients,
-                                                List<Optional<UnidentifiedAccess>> unidentifiedAccess,
-                                                long timestamp,
-                                                EnvelopeContent content,
-                                                boolean online,
-                                                PartialSendCompleteListener partialListener,
-                                                CancelationSignal cancelationSignal,
-                                                @Nullable SendEvents sendEvents,
-                                                boolean urgent,
-                                                boolean story)
+  private List<SendMessageResult> sendMessage(List<SignalServiceAddress> recipients,
+                                              List<SealedSenderAccess> sealedSenderAccesses,
+                                              long timestamp,
+                                              EnvelopeContent content,
+                                              boolean online,
+                                              PartialSendCompleteListener partialListener,
+                                              CancelationSignal cancelationSignal,
+                                              @Nullable SendEvents sendEvents,
+                                              boolean urgent,
+                                              boolean story)
       throws IOException
   {
-    Log.d(TAG, "[" + timestamp + "] Sending to " + recipients.size() + " recipients via Rx.");
+    Log.d(TAG, "[" + timestamp + "] Sending to " + recipients.size() + " recipients.");
     enforceMaxContentSize(content);
 
-    long                                   startTime                  = System.currentTimeMillis();
-    List<Observable<SendMessageResult>>    singleResults              = new LinkedList<>();
-    Iterator<SignalServiceAddress>         recipientIterator          = recipients.iterator();
-    Iterator<Optional<UnidentifiedAccess>> unidentifiedAccessIterator = unidentifiedAccess.iterator();
+    long                                startTime                  = System.currentTimeMillis();
+    List<Observable<SendMessageResult>> singleResults              = new LinkedList<>();
+    Iterator<SignalServiceAddress>      recipientIterator          = recipients.iterator();
+    Iterator<SealedSenderAccess>        sealedSenderAccessIterator = sealedSenderAccesses.iterator();
 
     while (recipientIterator.hasNext()) {
-      SignalServiceAddress         recipient = recipientIterator.next();
-      Optional<UnidentifiedAccess> access    = unidentifiedAccessIterator.next();
-      singleResults.add(sendMessageRx(recipient, access, timestamp, content, online, cancelationSignal, sendEvents, urgent, story, 0).toObservable());
+      SignalServiceAddress recipient          = recipientIterator.next();
+      SealedSenderAccess   sealedSenderAccess = sealedSenderAccessIterator.next();
+
+      singleResults.add(sendMessageRx(recipient, sealedSenderAccess, timestamp, content, online, cancelationSignal, sendEvents, urgent, story, 0).toObservable());
     }
 
     List<SendMessageResult> results;
@@ -2217,7 +2124,7 @@ private List<SendMessageResult> sendMessageRx(List<SignalServiceAddress> recipie
    * errors via {@code onError}
    */
   private Single<SendMessageResult> sendMessageRx(SignalServiceAddress recipient,
-                                                  final Optional<UnidentifiedAccess> unidentifiedAccess,
+                                                  @Nullable SealedSenderAccess sealedSenderAccess,
                                                   long timestamp,
                                                   EnvelopeContent content,
                                                   boolean online,
@@ -2231,7 +2138,7 @@ private Single<SendMessageResult> sendMessageRx(SignalServiceAddress recipient,
     enforceMaxContentSize(content);
 
     Single<OutgoingPushMessageList> messagesSingle = Single.fromCallable(() -> {
-      OutgoingPushMessageList messages = getEncryptedMessages(recipient, unidentifiedAccess, timestamp, content, online, urgent, story);
+      OutgoingPushMessageList messages = getEncryptedMessages(recipient, sealedSenderAccess, timestamp, content, online, urgent, story);
 
       if (retryCount == 0 && sendEvents != null) {
         sendEvents.onMessageEncrypted();
@@ -2252,7 +2159,7 @@ private Single<SendMessageResult> sendMessageRx(SignalServiceAddress recipient,
             return Single.error(new CancelationException());
           }
 
-          return messagingService.send(messages, unidentifiedAccess, story)
+          return messagingService.send(messages, sealedSenderAccess, story)
                                  .map(r -> new kotlin.Pair<>(messages, r));
         })
         .observeOn(scheduler)
@@ -2287,14 +2194,14 @@ private Single<SendMessageResult> sendMessageRx(SignalServiceAddress recipient,
               // Non-technical failures shouldn't be retried with socket
               return Single.error(throwable);
             } else if (throwable instanceof WebSocketUnavailableException) {
-              Log.i(TAG, "[sendMessage][" + timestamp + "] " + (unidentifiedAccess.isPresent() ? "Unidentified " : "") + "pipe unavailable, falling back... (" + throwable.getClass().getSimpleName() + ": " + throwable.getMessage() + ")");
+              Log.i(TAG, "[sendMessage][" + timestamp + "] " + (sealedSenderAccess != null ? "Unidentified " : "") + "pipe unavailable, falling back... (" + throwable.getClass().getSimpleName() + ": " + throwable.getMessage() + ")");
             } else if (throwable instanceof IOException) {
               Throwable cause = throwable.getCause() != null ? throwable.getCause() : throwable;
-              Log.w(TAG, "[sendMessage][" + timestamp + "] " + (unidentifiedAccess.isPresent() ? "Unidentified " : "") + "pipe failed, falling back... (" + cause.getClass().getSimpleName() + ": " + cause.getMessage() + ")");
+              Log.w(TAG, "[sendMessage][" + timestamp + "] " + (sealedSenderAccess != null ? "Unidentified " : "") + "pipe failed, falling back... (" + cause.getClass().getSimpleName() + ": " + cause.getMessage() + ")");
             }
 
             return Single.fromCallable(() -> {
-              SendMessageResponse response = socket.sendMessage(messages, unidentifiedAccess, story);
+              SendMessageResponse response = socket.sendMessage(messages, sealedSenderAccess, story);
               return SendMessageResult.success(
                   recipient,
                   messages.getDevices(),
@@ -2320,7 +2227,7 @@ private Single<SendMessageResult> sendMessageRx(SignalServiceAddress recipient,
         Log.w(TAG, t);
         return sendMessageRx(
             recipient,
-            Optional.empty(),
+            SealedSenderAccess.NONE,
             timestamp,
             content,
             online,
@@ -2331,11 +2238,11 @@ private Single<SendMessageResult> sendMessageRx(SignalServiceAddress recipient,
             retryCount + 1
         );
       } else if (t instanceof AuthorizationFailedException) {
-        if (unidentifiedAccess.isPresent()) {
+        if (sealedSenderAccess != null) {
           Log.w(TAG, "Got an AuthorizationFailedException when trying to send using sealed sender. Falling back.");
           return sendMessageRx(
               recipient,
-              Optional.empty(),
+              sealedSenderAccess.switchToFallback(),
               timestamp,
               content,
               online,
@@ -2359,7 +2266,7 @@ private Single<SendMessageResult> sendMessageRx(SignalServiceAddress recipient,
                      })
                      .flatMap(unused -> sendMessageRx(
                          recipient,
-                         unidentifiedAccess,
+                         sealedSenderAccess,
                          timestamp,
                          content,
                          online,
@@ -2379,7 +2286,7 @@ private Single<SendMessageResult> sendMessageRx(SignalServiceAddress recipient,
                      })
                      .flatMap(unused -> sendMessageRx(
                          recipient,
-                         unidentifiedAccess,
+                         sealedSenderAccess,
                          timestamp,
                          content,
                          online,
@@ -2427,17 +2334,18 @@ private Single<SendMessageResult> sendMessageRx(SignalServiceAddress recipient,
    *
    * This method will handle sending out SenderKeyDistributionMessages as necessary.
    */
-  private List<SendMessageResult> sendGroupMessage(DistributionId             distributionId,
+  private List<SendMessageResult> sendGroupMessage(DistributionId distributionId,
                                                    List<SignalServiceAddress> recipients,
-                                                   List<UnidentifiedAccess>   unidentifiedAccess,
-                                                   long                       timestamp,
-                                                   Content                    content,
-                                                   ContentHint                contentHint,
-                                                   Optional<byte[]>           groupId,
-                                                   boolean                    online,
-                                                   SenderKeyGroupEvents       sendEvents,
-                                                   boolean                    urgent,
-                                                   boolean                    story)
+                                                   List<UnidentifiedAccess> unidentifiedAccess,
+                                                   @Nullable GroupSendEndorsements groupSendEndorsements,
+                                                   long timestamp,
+                                                   Content content,
+                                                   ContentHint contentHint,
+                                                   Optional<byte[]> groupId,
+                                                   boolean online,
+                                                   SenderKeyGroupEvents sendEvents,
+                                                   boolean urgent,
+                                                   boolean story)
       throws IOException, UntrustedIdentityException, NoSessionException, InvalidKeyException, InvalidRegistrationIdException
   {
     if (recipients.isEmpty()) {
@@ -2455,34 +2363,36 @@ private List<SendMessageResult> sendGroupMessage(DistributionId             dist
       accessBySid.put(addressIterator.next().getServiceId(), accessIterator.next());
     }
 
+    SealedSenderAccess sealedSenderAccess = SealedSenderAccess.forGroupSend(groupSendEndorsements, unidentifiedAccess, story);
+
     for (int i = 0; i < RETRY_COUNT; i++) {
             GroupTargetInfo targetInfo         = buildGroupTargetInfo(recipients);
       final GroupTargetInfo targetInfoSnapshot = targetInfo;
 
-      Set<SignalProtocolAddress> sharedWith     = aciStore.getSenderKeySharedWith(distributionId);
-      List<SignalServiceAddress> needsSenderKey = targetInfo.destinations.stream()
-                                                                         .filter(a -> !sharedWith.contains(a) || targetInfoSnapshot.sessions.get(a) == null)
-                                                                         .map(a -> ServiceId.parseOrThrow(a.getName()))
-                                                                         .distinct()
-                                                                         .map(SignalServiceAddress::new)
-                                                                         .collect(Collectors.toList());
-      if (needsSenderKey.size() > 0) {
-        Log.i(TAG, "[sendGroupMessage][" + timestamp + "] Need to send the distribution message to " + needsSenderKey.size() + " addresses.");
-        SenderKeyDistributionMessage           message = getOrCreateNewGroupSession(distributionId);
-        List<Optional<UnidentifiedAccessPair>> access  = needsSenderKey.stream()
-                                                                       .map(r -> {
-                                                                         UnidentifiedAccess targetAccess = accessBySid.get(r.getServiceId());
-                                                                         return Optional.of(new UnidentifiedAccessPair(targetAccess, targetAccess));
-                                                                       })
-                                                                       .collect(Collectors.toList());
+      Set<SignalProtocolAddress> sharedWith            = aciStore.getSenderKeySharedWith(distributionId);
+      List<SignalServiceAddress> needsSenderKeyTargets = targetInfo.destinations.stream()
+                                                                                .filter(a -> !sharedWith.contains(a) || targetInfoSnapshot.sessions.get(a) == null)
+                                                                                .map(a -> ServiceId.parseOrThrow(a.getName()))
+                                                                                .distinct()
+                                                                                .map(SignalServiceAddress::new)
+                                                                                .collect(Collectors.toList());
+      if (needsSenderKeyTargets.size() > 0) {
+        Log.i(TAG, "[sendGroupMessage][" + timestamp + "] Need to send the distribution message to " + needsSenderKeyTargets.size() + " addresses.");
+        SenderKeyDistributionMessage senderKeyDistributionMessage = getOrCreateNewGroupSession(distributionId);
+        List<UnidentifiedAccess>     needsSenderKeyAccesses       = needsSenderKeyTargets.stream()
+                                                                                         .map(r -> accessBySid.get(r.getServiceId()))
+                                                                                         .collect(Collectors.toList());
+
+        List<GroupSendFullToken> needsSenderKeyGroupSendTokens      = groupSendEndorsements != null ? groupSendEndorsements.forIndividuals(needsSenderKeyTargets) : null;
+        List<SealedSenderAccess> needsSenderKeySealedSenderAccesses = SealedSenderAccess.forFanOutGroupSend(needsSenderKeyGroupSendTokens, sealedSenderAccess.getSenderCertificate(), needsSenderKeyAccesses);
 
         List<SendMessageResult> results = sendSenderKeyDistributionMessage(distributionId,
-                                                                           needsSenderKey,
-                                                                           access,
-                                                                           message,
+                                                                           needsSenderKeyTargets,
+                                                                           needsSenderKeySealedSenderAccesses,
+                                                                           senderKeyDistributionMessage,
                                                                            groupId,
                                                                            urgent,
-                                                                           story && !groupId.isPresent()); // We don't want to flag SKDM's as stories for group stories, since we reuse distributionIds for normal group messages
+                                                                           story && groupId.isEmpty()); // We don't want to flag SKDM's as stories for group stories, since we reuse distributionIds for normal group messages
 
         List<SignalServiceAddress> successes = results.stream()
                                                       .filter(SendMessageResult::isSuccess)
@@ -2494,7 +2404,7 @@ private List<SendMessageResult> sendGroupMessage(DistributionId             dist
 
         aciStore.markSenderKeySharedWith(distributionId, successAddresses);
 
-        Log.i(TAG, "[sendGroupMessage][" + timestamp + "] Successfully sent sender keys to " + successes.size() + "/" + needsSenderKey.size() + " recipients.");
+        Log.i(TAG, "[sendGroupMessage][" + timestamp + "] Successfully sent sender keys to " + successes.size() + "/" + needsSenderKeyTargets.size() + " recipients.");
 
         int failureCount = results.size() - successes.size();
         if (failureCount > 0) {
@@ -2525,26 +2435,20 @@ private List<SendMessageResult> sendGroupMessage(DistributionId             dist
 
       sendEvents.onSenderKeyShared();
 
-      SignalServiceCipher cipher            = new SignalServiceCipher(localAddress, localDeviceId, aciStore, sessionLock, null);
-      SenderCertificate   senderCertificate = unidentifiedAccess.get(0).getUnidentifiedCertificate();
+      SignalServiceCipher cipher = new SignalServiceCipher(localAddress, localDeviceId, aciStore, sessionLock, null);
 
       byte[] ciphertext;
       try {
-        ciphertext = cipher.encryptForGroup(distributionId, targetInfo.destinations, targetInfo.sessions, senderCertificate, content.encode(), contentHint, groupId);
+        ciphertext = cipher.encryptForGroup(distributionId, targetInfo.destinations, targetInfo.sessions, sealedSenderAccess.getSenderCertificate(), content.encode(), contentHint, groupId);
       } catch (org.signal.libsignal.protocol.UntrustedIdentityException e) {
         throw new UntrustedIdentityException("Untrusted during group encrypt", e.getName(), e.getUntrustedIdentity());
       }
 
       sendEvents.onMessageEncrypted();
 
-      byte[] joinedUnidentifiedAccess = new byte[16];
-      for (UnidentifiedAccess access : unidentifiedAccess) {
-        joinedUnidentifiedAccess = ByteArrayUtil.xor(joinedUnidentifiedAccess, access.getUnidentifiedAccessKey());
-      }
-
       try {
         try {
-          SendGroupMessageResponse response = new MessagingService.SendResponseProcessor<>(messagingService.sendToGroup(ciphertext, joinedUnidentifiedAccess, timestamp, online, urgent, story).blockingGet()).getResultOrThrow();
+          SendGroupMessageResponse response = new MessagingService.SendResponseProcessor<>(messagingService.sendToGroup(ciphertext, sealedSenderAccess, timestamp, online, urgent, story).blockingGet()).getResultOrThrow();
           return transformGroupResponseToMessageResults(targetInfo.devices, response, content);
         } catch (InvalidUnidentifiedAccessHeaderException | NotFoundException | GroupMismatchedDevicesException | GroupStaleDevicesException e) {
           // Non-technical failures shouldn't be retried with socket
@@ -2555,7 +2459,7 @@ private List<SendMessageResult> sendGroupMessage(DistributionId             dist
           Log.w(TAG, "[sendGroupMessage][" + timestamp + "] Pipe failed, falling back... (" + e.getClass().getSimpleName() + ": " + e.getMessage() + ")");
         }
 
-        SendGroupMessageResponse response = socket.sendGroupMessage(ciphertext, joinedUnidentifiedAccess, timestamp, online, urgent, story);
+        SendGroupMessageResponse response = socket.sendGroupMessage(ciphertext, sealedSenderAccess, timestamp, online, urgent, story);
         return transformGroupResponseToMessageResults(targetInfo.devices, response, content);
       } catch (GroupMismatchedDevicesException e) {
         Log.w(TAG, "[sendGroupMessage][" + timestamp + "] Handling mismatched devices. (" + e.getMessage() + ")");
@@ -2569,6 +2473,13 @@ private List<SendMessageResult> sendGroupMessage(DistributionId             dist
           SignalServiceAddress address = new SignalServiceAddress(ServiceId.parseOrThrow(stale.getUuid()), Optional.empty());
           handleStaleDevices(address, stale.getDevices());
         }
+      } catch (InvalidUnidentifiedAccessHeaderException e) {
+        sealedSenderAccess = sealedSenderAccess.switchToFallback();
+        if (sealedSenderAccess != null) {
+          Log.w(TAG, "[sendGroupMessage][" + timestamp + "] Handling invalid group send endorsements. (" + e.getMessage() + ")");
+        } else {
+          throw e;
+        }
       }
 
       Log.w(TAG, "[sendGroupMessage][" + timestamp + "] Attempt failed (i = " + i + ")");
@@ -2728,7 +2639,7 @@ private TextAttachment createTextAttachment(SignalServiceTextAttachment attachme
   }
 
   private OutgoingPushMessageList getEncryptedMessages(SignalServiceAddress         recipient,
-                                                       Optional<UnidentifiedAccess> unidentifiedAccess,
+                                                       @Nullable SealedSenderAccess sealedSenderAccess,
                                                        long                         timestamp,
                                                        EnvelopeContent              plaintext,
                                                        boolean                      online,
@@ -2750,7 +2661,7 @@ private OutgoingPushMessageList getEncryptedMessages(SignalServiceAddress
 
     for (int deviceId : deviceIds) {
       if (deviceId == SignalServiceAddress.DEFAULT_DEVICE_ID || aciStore.containsSession(new SignalProtocolAddress(recipient.getIdentifier(), deviceId))) {
-        messages.add(getEncryptedMessage(recipient, unidentifiedAccess, deviceId, plaintext, story));
+        messages.add(getEncryptedMessage(recipient, sealedSenderAccess, deviceId, plaintext, story));
       }
     }
 
@@ -2763,7 +2674,7 @@ public List<Integer> getSubDeviceSessions(SignalServiceAddress recipient) {
 
   // Visible for testing only
   public OutgoingPushMessage getEncryptedMessage(SignalServiceAddress         recipient,
-                                                 Optional<UnidentifiedAccess> unidentifiedAccess,
+                                                 @Nullable SealedSenderAccess sealedSenderAccess,
                                                  int                          deviceId,
                                                  EnvelopeContent              plaintext,
                                                  boolean                      story)
@@ -2774,7 +2685,7 @@ public OutgoingPushMessage getEncryptedMessage(SignalServiceAddress         reci
 
     if (!aciStore.containsSession(signalProtocolAddress)) {
       try {
-        List<PreKeyBundle> preKeys = getPreKeys(recipient, unidentifiedAccess, deviceId, story);
+        List<PreKeyBundle> preKeys = getPreKeys(recipient, sealedSenderAccess, deviceId, story);
 
         for (PreKeyBundle preKey : preKeys) {
           Log.d(TAG, "Initializing prekey session for " + signalProtocolAddress);
@@ -2797,24 +2708,24 @@ public OutgoingPushMessage getEncryptedMessage(SignalServiceAddress         reci
     }
 
     try {
-      return cipher.encrypt(signalProtocolAddress, unidentifiedAccess, plaintext);
+      return cipher.encrypt(signalProtocolAddress, sealedSenderAccess, plaintext);
     } catch (org.signal.libsignal.protocol.UntrustedIdentityException e) {
       throw new UntrustedIdentityException("Untrusted on send", recipient.getIdentifier(), e.getUntrustedIdentity());
     }
   }
 
-  private List<PreKeyBundle> getPreKeys(SignalServiceAddress recipient, Optional<UnidentifiedAccess> unidentifiedAccess, int deviceId, boolean story) throws IOException {
+  private List<PreKeyBundle> getPreKeys(SignalServiceAddress recipient, @Nullable SealedSenderAccess sealedSenderAccess, int deviceId, boolean story) throws IOException {
     try {
       // If it's only unrestricted because it's a story send, then we know it'll fail
-      if (story && unidentifiedAccess.isPresent() && unidentifiedAccess.get().isUnrestrictedForStory()) {
-        unidentifiedAccess = Optional.empty();
+      if (story && SealedSenderAccess.isUnrestrictedForStory(sealedSenderAccess)) {
+        sealedSenderAccess = null;
       }
 
-      return socket.getPreKeys(recipient, unidentifiedAccess, deviceId);
+      return socket.getPreKeys(recipient, sealedSenderAccess, deviceId);
     } catch (NonSuccessfulResponseCodeException e) {
       if (e.getCode() == 401 && story) {
         Log.d(TAG, "Got 401 when fetching prekey for story. Trying without UD.");
-        return socket.getPreKeys(recipient, Optional.empty(), deviceId);
+        return socket.getPreKeys(recipient, null, deviceId);
       } else {
         throw e;
       }
@@ -2877,25 +2788,6 @@ private List<SignalProtocolAddress> convertToProtocolAddresses(SignalServiceAddr
     return addresses;
   }
 
-  private Optional<UnidentifiedAccess> getTargetUnidentifiedAccess(Optional<UnidentifiedAccessPair> unidentifiedAccess) {
-    if (unidentifiedAccess.isPresent()) {
-      return unidentifiedAccess.get().getTargetUnidentifiedAccess();
-    }
-
-    return Optional.empty();
-  }
-
-  private List<Optional<UnidentifiedAccess>> getTargetUnidentifiedAccess(List<Optional<UnidentifiedAccessPair>> unidentifiedAccess) {
-    List<Optional<UnidentifiedAccess>> results = new LinkedList<>();
-
-    for (Optional<UnidentifiedAccessPair> item : unidentifiedAccess) {
-      if (item.isPresent()) results.add(item.get().getTargetUnidentifiedAccess());
-      else                  results.add(Optional.empty());
-    }
-
-    return results;
-  }
-
   private EnvelopeContent enforceMaxContentSize(EnvelopeContent content) {
     int size = content.size();
 
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java
index 64c4616b1b..fc4b941fe2 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java
@@ -1,7 +1,7 @@
 package org.whispersystems.signalservice.api;
 
 import org.signal.libsignal.protocol.logging.Log;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess;
 import org.whispersystems.signalservice.api.messages.EnvelopeResponse;
 import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState;
 import org.whispersystems.signalservice.api.websocket.WebSocketFactory;
@@ -11,7 +11,6 @@
 import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage;
 import org.whispersystems.signalservice.internal.websocket.WebSocketResponseMessage;
 import org.whispersystems.signalservice.internal.websocket.WebsocketResponse;
-import org.signal.core.util.Base64;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -19,6 +18,8 @@
 import java.util.Optional;
 import java.util.concurrent.TimeoutException;
 
+import javax.annotation.Nullable;
+
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
@@ -213,10 +214,11 @@ public Single<WebsocketResponse> request(WebSocketRequestMessage requestMessage)
     }
   }
 
-  public Single<WebsocketResponse> request(WebSocketRequestMessage requestMessage, Optional<UnidentifiedAccess> unidentifiedAccess) {
-    if (unidentifiedAccess.isPresent()) {
+  public Single<WebsocketResponse> request(WebSocketRequestMessage requestMessage, @Nullable SealedSenderAccess sealedSenderAccess) {
+    if (sealedSenderAccess != null) {
       List<String> headers = new ArrayList<>(requestMessage.headers);
-      headers.add("Unidentified-Access-Key:" + Base64.encodeWithPadding(unidentifiedAccess.get().getUnidentifiedAccessKey()));
+      headers.add(sealedSenderAccess.getHeader());
+
       WebSocketRequestMessage message = requestMessage.newBuilder()
                                                       .headers(headers)
                                                       .build();
@@ -224,7 +226,7 @@ public Single<WebsocketResponse> request(WebSocketRequestMessage requestMessage,
         return getUnidentifiedWebSocket().sendRequest(message)
                                          .flatMap(r -> {
                                            if (r.getStatus() == 401) {
-                                             return request(requestMessage);
+                                             return request(requestMessage, sealedSenderAccess.switchToFallback());
                                            }
                                            return Single.just(r);
                                          });
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt
index 181baba6ba..487d044a78 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt
@@ -5,24 +5,25 @@
  */
 package org.whispersystems.signalservice.api.account
 
+import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-class AccountAttributes(
-  @JsonProperty("signalingKey") val signalingKey: String?,
-  @JsonProperty("registrationId") val registrationId: Int,
-  @JsonProperty("voice") val voice: Boolean,
-  @JsonProperty("video") val video: Boolean,
-  @JsonProperty("fetchesMessages") val fetchesMessages: Boolean,
-  @JsonProperty("registrationLock") val registrationLock: String?,
-  @JsonProperty("unidentifiedAccessKey") val unidentifiedAccessKey: ByteArray?,
-  @JsonProperty("unrestrictedUnidentifiedAccess") val unrestrictedUnidentifiedAccess: Boolean,
-  @JsonProperty("discoverableByPhoneNumber") val discoverableByPhoneNumber: Boolean,
-  @JsonProperty("capabilities") val capabilities: Capabilities?,
-  @JsonProperty("name") val name: String?,
-  @JsonProperty("pniRegistrationId") val pniRegistrationId: Int,
-  @JsonProperty("recoveryPassword") val recoveryPassword: String?
+class AccountAttributes @JsonCreator constructor(
+  @JsonProperty val signalingKey: String?,
+  @JsonProperty val registrationId: Int,
+  @JsonProperty val voice: Boolean,
+  @JsonProperty val video: Boolean,
+  @JsonProperty val fetchesMessages: Boolean,
+  @JsonProperty val registrationLock: String?,
+  @JsonProperty val unidentifiedAccessKey: ByteArray?,
+  @JsonProperty val unrestrictedUnidentifiedAccess: Boolean,
+  @JsonProperty val discoverableByPhoneNumber: Boolean,
+  @JsonProperty val capabilities: Capabilities?,
+  @JsonProperty val name: String?,
+  @JsonProperty val pniRegistrationId: Int,
+  @JsonProperty val recoveryPassword: String?
 ) {
   constructor(
     signalingKey: String?,
@@ -52,14 +53,8 @@ class AccountAttributes(
     recoveryPassword = recoveryPassword
   )
 
-  data class Capabilities(
-    @JsonProperty("storage") val storage: Boolean,
-    @JsonProperty("senderKey") val senderKey: Boolean,
-    @JsonProperty("announcementGroup") val announcementGroup: Boolean,
-    @JsonProperty("changeNumber") val changeNumber: Boolean,
-    @JsonProperty("stories") val stories: Boolean,
-    @JsonProperty("giftBadges") val giftBadges: Boolean,
-    @JsonProperty("pni") val pni: Boolean,
-    @JsonProperty("paymentActivation") val paymentActivation: Boolean
+  data class Capabilities @JsonCreator constructor(
+    @JsonProperty val storage: Boolean,
+    @JsonProperty val deleteSync: Boolean
   )
 }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveApi.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveApi.kt
index 5ca7baa7b1..e05d72eb40 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveApi.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveApi.kt
@@ -257,7 +257,7 @@ class ArchiveApi(
     }
   }
 
-  private fun getZkCredential(backupKey: BackupKey, serviceCredential: ArchiveServiceCredential): BackupAuthCredential {
+  fun getZkCredential(backupKey: BackupKey, serviceCredential: ArchiveServiceCredential): BackupAuthCredential {
     val backupAuthResponse = BackupAuthCredentialResponse(serviceCredential.credential)
     val backupRequestContext = BackupAuthCredentialRequestContext.create(backupKey.value, aci.rawUuid)
 
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveGetBackupInfoResponse.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveGetBackupInfoResponse.kt
index c07350cdd9..7774fd1d12 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveGetBackupInfoResponse.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveGetBackupInfoResponse.kt
@@ -11,14 +11,14 @@ import com.fasterxml.jackson.annotation.JsonProperty
  * Represents the response when fetching the archive backup info.
  */
 data class ArchiveGetBackupInfoResponse(
-  @JsonProperty("cdn")
+  @JsonProperty
   val cdn: Int?,
-  @JsonProperty("backupDir")
+  @JsonProperty
   val backupDir: String?,
-  @JsonProperty("mediaDir")
+  @JsonProperty
   val mediaDir: String?,
-  @JsonProperty("backupName")
+  @JsonProperty
   val backupName: String?,
-  @JsonProperty("usedSpace")
+  @JsonProperty
   val usedSpace: Long?
 )
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveGetMediaItemsResponse.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveGetMediaItemsResponse.kt
index 991b4514ea..a456fad647 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveGetMediaItemsResponse.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveGetMediaItemsResponse.kt
@@ -11,14 +11,14 @@ import com.fasterxml.jackson.annotation.JsonProperty
  * Response body for getting the media items stored in the user's archive.
  */
 class ArchiveGetMediaItemsResponse(
-  @JsonProperty("storedMediaObjects") val storedMediaObjects: List<StoredMediaObject>,
-  @JsonProperty("cursor") val backupDir: String?,
-  @JsonProperty("mediaDir") val mediaDir: String?,
-  @JsonProperty("cursor") val cursor: String?
+  @JsonProperty val storedMediaObjects: List<StoredMediaObject>,
+  @JsonProperty val backupDir: String?,
+  @JsonProperty val mediaDir: String?,
+  @JsonProperty val cursor: String?
 ) {
   class StoredMediaObject(
-    @JsonProperty("cdn") val cdn: Int,
-    @JsonProperty("mediaId") val mediaId: String,
-    @JsonProperty("objectLength") val objectLength: Long
+    @JsonProperty val cdn: Int,
+    @JsonProperty val mediaId: String,
+    @JsonProperty val objectLength: Long
   )
 }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaRequest.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaRequest.kt
index 360bcac92d..3ed0a8c00d 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaRequest.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaRequest.kt
@@ -11,15 +11,15 @@ import com.fasterxml.jackson.annotation.JsonProperty
  * Request to copy and re-encrypt media from the attachments cdn into the backup cdn.
  */
 class ArchiveMediaRequest(
-  @JsonProperty("sourceAttachment") val sourceAttachment: SourceAttachment,
-  @JsonProperty("objectLength") val objectLength: Int,
-  @JsonProperty("mediaId") val mediaId: String,
-  @JsonProperty("hmacKey") val hmacKey: String,
-  @JsonProperty("encryptionKey") val encryptionKey: String,
-  @JsonProperty("iv") val iv: String
+  @JsonProperty val sourceAttachment: SourceAttachment,
+  @JsonProperty val objectLength: Int,
+  @JsonProperty val mediaId: String,
+  @JsonProperty val hmacKey: String,
+  @JsonProperty val encryptionKey: String,
+  @JsonProperty val iv: String
 ) {
   class SourceAttachment(
-    @JsonProperty("cdn") val cdn: Int,
-    @JsonProperty("key") val key: String
+    @JsonProperty val cdn: Int,
+    @JsonProperty val key: String
   )
 }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaResponse.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaResponse.kt
index 55505cf0ed..9fe8ae4427 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaResponse.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaResponse.kt
@@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
  * Response to archiving media, backup CDN number where media is located.
  */
 class ArchiveMediaResponse(
-  @JsonProperty("cdn") val cdn: Int
+  @JsonProperty val cdn: Int
 ) {
   enum class StatusCodes(val code: Int) {
     BadArguments(400),
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceCredential.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceCredential.kt
index 4d0b93f962..13299a795e 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceCredential.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceCredential.kt
@@ -8,8 +8,8 @@ import com.fasterxml.jackson.annotation.JsonProperty
  * But you use these to make those.
  */
 class ArchiveServiceCredential(
-  @JsonProperty("credential")
+  @JsonProperty
   val credential: ByteArray,
-  @JsonProperty("redemptionTime")
+  @JsonProperty
   val redemptionTime: Long
 )
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceCredentialsResponse.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceCredentialsResponse.kt
index c972c4f47f..bb470f1c28 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceCredentialsResponse.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceCredentialsResponse.kt
@@ -12,6 +12,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
  * See [ArchiveServiceCredential].
  */
 class ArchiveServiceCredentialsResponse(
-  @JsonProperty("credentials")
+  @JsonProperty
   val credentials: Array<ArchiveServiceCredential>
 )
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveSetBackupIdRequest.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveSetBackupIdRequest.kt
index fb108c2102..38a50c9474 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveSetBackupIdRequest.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveSetBackupIdRequest.kt
@@ -17,7 +17,7 @@ import org.signal.libsignal.zkgroup.backups.BackupAuthCredentialRequest
  * Represents the request body when setting the archive backupId.
  */
 class ArchiveSetBackupIdRequest(
-  @JsonProperty("backupAuthCredentialRequest")
+  @JsonProperty
   @JsonSerialize(using = BackupAuthCredentialRequestSerializer::class)
   val backupAuthCredentialRequest: BackupAuthCredentialRequest
 ) {
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveSetPublicKeyRequest.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveSetPublicKeyRequest.kt
index 4e41d9f7a4..89277d2727 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveSetPublicKeyRequest.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveSetPublicKeyRequest.kt
@@ -17,7 +17,7 @@ import org.signal.libsignal.protocol.ecc.ECPublicKey
  * Represents the request body when setting the archive public key.
  */
 class ArchiveSetPublicKeyRequest(
-  @JsonProperty("backupIdPublicKey")
+  @JsonProperty
   @JsonSerialize(using = PublicKeySerializer::class)
   val backupIdPublicKey: ECPublicKey
 ) {
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/BatchArchiveMediaRequest.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/BatchArchiveMediaRequest.kt
index 05e810842e..3f4822b547 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/BatchArchiveMediaRequest.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/BatchArchiveMediaRequest.kt
@@ -11,5 +11,5 @@ import com.fasterxml.jackson.annotation.JsonProperty
  * Request to copy and re-encrypt media from the attachments cdn into the backup cdn.
  */
 class BatchArchiveMediaRequest(
-  @JsonProperty("items") val items: List<ArchiveMediaRequest>
+  @JsonProperty val items: List<ArchiveMediaRequest>
 )
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/BatchArchiveMediaResponse.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/BatchArchiveMediaResponse.kt
index aae7bf7804..2fb002e4cf 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/BatchArchiveMediaResponse.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/BatchArchiveMediaResponse.kt
@@ -11,12 +11,12 @@ import com.fasterxml.jackson.annotation.JsonProperty
  * Multi-response data for a batch archive media operation.
  */
 class BatchArchiveMediaResponse(
-  @JsonProperty("responses") val responses: List<BatchArchiveMediaItemResponse>
+  @JsonProperty val responses: List<BatchArchiveMediaItemResponse>
 ) {
   class BatchArchiveMediaItemResponse(
-    @JsonProperty("status") val status: Int?,
-    @JsonProperty("failureReason") val failureReason: String?,
-    @JsonProperty("cdn") val cdn: Int?,
-    @JsonProperty("mediaId") val mediaId: String
+    @JsonProperty val status: Int?,
+    @JsonProperty val failureReason: String?,
+    @JsonProperty val cdn: Int?,
+    @JsonProperty val mediaId: String
   )
 }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/DeleteArchivedMediaRequest.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/DeleteArchivedMediaRequest.kt
index 709a8f64ff..4d9a5d73b3 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/DeleteArchivedMediaRequest.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/DeleteArchivedMediaRequest.kt
@@ -11,10 +11,10 @@ import com.fasterxml.jackson.annotation.JsonProperty
  * Delete media from the backup cdn.
  */
 class DeleteArchivedMediaRequest(
-  @JsonProperty("mediaToDelete") val mediaToDelete: List<ArchivedMediaObject>
+  @JsonProperty val mediaToDelete: List<ArchivedMediaObject>
 ) {
   class ArchivedMediaObject(
-    @JsonProperty("cdn") val cdn: Int,
-    @JsonProperty("mediaId") val mediaId: String
+    @JsonProperty val cdn: Int,
+    @JsonProperty val mediaId: String
   )
 }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/GetArchiveCdnCredentialsResponse.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/GetArchiveCdnCredentialsResponse.kt
index 85fcdf6d67..f9decda3ee 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/GetArchiveCdnCredentialsResponse.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/GetArchiveCdnCredentialsResponse.kt
@@ -11,5 +11,5 @@ import com.fasterxml.jackson.annotation.JsonProperty
  * Get response with headers to use to read from archive cdn.
  */
 class GetArchiveCdnCredentialsResponse(
-  @JsonProperty("headers") val headers: Map<String, String>
+  @JsonProperty val headers: Map<String, String>
 )
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/backup/BackupKey.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/backup/BackupKey.kt
index 17f8b876db..abca72a70c 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/backup/BackupKey.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/backup/BackupKey.kt
@@ -42,6 +42,10 @@ class BackupKey(val value: ByteArray) {
     return deriveMediaSecrets(deriveMediaId(mediaName))
   }
 
+  fun deriveMediaSecretsFromMediaId(base64MediaId: String): MediaKeyMaterial {
+    return deriveMediaSecrets(MediaId(base64MediaId))
+  }
+
   fun deriveThumbnailTransitKey(thumbnailMediaName: MediaName): ByteArray {
     return HKDF.deriveSecrets(value, deriveMediaId(thumbnailMediaName).value, "20240513_Signal_Backups_EncryptThumbnail".toByteArray(), 64)
   }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/backup/MediaName.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/backup/MediaName.kt
index 3c039634d6..e4f0e6ed97 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/backup/MediaName.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/backup/MediaName.kt
@@ -5,7 +5,7 @@
 
 package org.whispersystems.signalservice.api.backup
 
-import org.signal.core.util.Base64
+import org.signal.core.util.Hex
 
 /**
  * Represent a media name for the various types of media that can be archived.
@@ -14,8 +14,8 @@ import org.signal.core.util.Base64
 value class MediaName(val name: String) {
 
   companion object {
-    fun fromDigest(digest: ByteArray) = MediaName(Base64.encodeWithoutPadding(digest))
-    fun fromDigestForThumbnail(digest: ByteArray) = MediaName("${Base64.encodeWithoutPadding(digest)}_thumbnail")
+    fun fromDigest(digest: ByteArray) = MediaName(Hex.toStringCondensed(digest))
+    fun fromDigestForThumbnail(digest: ByteArray) = MediaName("${Hex.toStringCondensed(digest)}_thumbnail")
     fun forThumbnailFromMediaName(mediaName: String) = MediaName("${mediaName}_thumbnail")
   }
 
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherInputStream.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherInputStream.java
index b5352fe950..8ff7501ef9 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherInputStream.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherInputStream.java
@@ -60,6 +60,16 @@ public class AttachmentCipherInputStream extends FilterInputStream {
    * Passing in a null incrementalDigest and/or 0 for the chunk size at the call site disables incremental mac validation.
    */
   public static InputStream createForAttachment(File file, long plaintextLength, byte[] combinedKeyMaterial, byte[] digest, byte[] incrementalDigest, int incrementalMacChunkSize)
+      throws InvalidMessageException, IOException {
+    return createForAttachment(file, plaintextLength, combinedKeyMaterial, digest, incrementalDigest, incrementalMacChunkSize, false);
+  }
+
+  /**
+   * Passing in a null incrementalDigest and/or 0 for the chunk size at the call site disables incremental mac validation.
+   *
+   * Passing in true for ignoreDigest DOES NOT VERIFY THE DIGEST
+   */
+  public static InputStream createForAttachment(File file, long plaintextLength, byte[] combinedKeyMaterial, byte[] digest, byte[] incrementalDigest, int incrementalMacChunkSize, boolean ignoreDigest)
       throws InvalidMessageException, IOException
   {
     byte[][] parts = Util.split(combinedKeyMaterial, CIPHER_KEY_SIZE, MAC_KEY_SIZE);
@@ -69,7 +79,7 @@ public static InputStream createForAttachment(File file, long plaintextLength, b
       throw new InvalidMessageException("Message shorter than crypto overhead!");
     }
 
-    if (digest == null) {
+    if (!ignoreDigest && digest == null) {
       throw new InvalidMessageException("Missing digest!");
     }
 
@@ -128,6 +138,43 @@ public static InputStream createForArchivedMedia(BackupKey.MediaKeyMaterial arch
     return inputStream;
   }
 
+  public static InputStream createStreamingForArchivedAttachment(BackupKey.MediaKeyMaterial archivedMediaKeyMaterial, File file, long originalCipherTextLength, long plaintextLength, byte[] combinedKeyMaterial, byte[] digest, byte[] incrementalDigest, int incrementalMacChunkSize)
+      throws InvalidMessageException, IOException
+  {
+    final InputStream archiveStream = createForArchivedMedia(archivedMediaKeyMaterial, file, originalCipherTextLength);
+
+    byte[][] parts = Util.split(combinedKeyMaterial, CIPHER_KEY_SIZE, MAC_KEY_SIZE);
+    Mac      mac   = initMac(parts[1]);
+
+    if (originalCipherTextLength <= BLOCK_SIZE + mac.getMacLength()) {
+      throw new InvalidMessageException("Message shorter than crypto overhead!");
+    }
+
+    if (digest == null) {
+      throw new InvalidMessageException("Missing digest!");
+    }
+
+    final InputStream wrappedStream;
+      wrappedStream = new IncrementalMacInputStream(
+          new IncrementalMacAdditionalValidationsInputStream(
+              archiveStream,
+              file.length(),
+              mac,
+              digest
+          ),
+          parts[1],
+          ChunkSizeChoice.everyNthByte(incrementalMacChunkSize),
+          incrementalDigest);
+
+    InputStream inputStream = new AttachmentCipherInputStream(wrappedStream, parts[0], file.length() - BLOCK_SIZE - mac.getMacLength());
+
+    if (plaintextLength != 0) {
+      inputStream = new ContentLengthInputStream(inputStream, plaintextLength);
+    }
+
+    return inputStream;
+  }
+
   public static InputStream createForStickerData(byte[] data, byte[] packKey)
       throws InvalidMessageException, IOException
   {
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SealedSenderAccess.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SealedSenderAccess.kt
new file mode 100644
index 0000000000..cfb765a0f9
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SealedSenderAccess.kt
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.signalservice.api.crypto
+
+import org.signal.core.util.Base64
+import org.signal.libsignal.metadata.certificate.SenderCertificate
+import org.signal.libsignal.zkgroup.groupsend.GroupSendFullToken
+import org.whispersystems.signalservice.api.groupsv2.GroupSendEndorsements
+import org.whispersystems.util.ByteArrayUtil
+
+/**
+ * Provides single interface for the various ways to send via sealed sender.
+ */
+sealed class SealedSenderAccess {
+
+  abstract val senderCertificate: SenderCertificate
+  abstract val headerName: String
+  abstract val headerValue: String
+
+  val header: String
+    get() = "$headerName:$headerValue"
+
+  abstract fun switchToFallback(): SealedSenderAccess?
+
+  /**
+   * For sending to an single recipient using group send endorsement/token first and then fallback to
+   * access key if available.
+   */
+  class IndividualGroupSendTokenFirst(
+    private val groupSendToken: GroupSendFullToken,
+    override val senderCertificate: SenderCertificate,
+    val unidentifiedAccess: UnidentifiedAccess? = null
+  ) : SealedSenderAccess() {
+
+    override val headerName: String = "Group-Send-Token"
+    override val headerValue: String by lazy { Base64.encodeWithPadding(groupSendToken.serialize()) }
+
+    override fun switchToFallback(): SealedSenderAccess? {
+      fallbackListener?.onTokenToAccessFallback(unidentifiedAccess != null)
+      return if (unidentifiedAccess != null) {
+        IndividualUnidentifiedAccessFirst(unidentifiedAccess)
+      } else {
+        null
+      }
+    }
+  }
+
+  /**
+   * For sending to an single recipient using access key first and then fallback to group send
+   * token if available. The token is created lazily via the provided [createGroupSendToken] function.
+   */
+  class IndividualUnidentifiedAccessFirst(
+    val unidentifiedAccess: UnidentifiedAccess,
+    private val createGroupSendToken: CreateGroupSendToken? = null
+  ) : SealedSenderAccess() {
+
+    override val senderCertificate: SenderCertificate
+      get() = unidentifiedAccess.unidentifiedCertificate
+
+    override val headerName: String = "Unidentified-Access-Key"
+    override val headerValue: String by lazy { Base64.encodeWithPadding(unidentifiedAccess.unidentifiedAccessKey) }
+
+    override fun switchToFallback(): SealedSenderAccess? {
+      val groupSendToken = createGroupSendToken?.create()
+      return if (groupSendToken != null) {
+        fallbackListener?.onAccessToTokenFallback()
+        IndividualGroupSendTokenFirst(groupSendToken, senderCertificate)
+      } else {
+        null
+      }
+    }
+  }
+
+  /**
+   * For sending to a "group" of recipients using group send endorsements/tokens.
+   */
+  class GroupGroupSendToken(
+    private val groupSendEndorsements: GroupSendEndorsements
+  ) : SealedSenderAccess() {
+
+    override val headerName: String = "Group-Send-Token"
+    override val headerValue: String by lazy { Base64.encodeWithPadding(groupSendEndorsements.serialize()) }
+
+    override val senderCertificate: SenderCertificate
+      get() = groupSendEndorsements.sealedSenderCertificate
+
+    override fun switchToFallback(): SealedSenderAccess? {
+      return null
+    }
+  }
+
+  /**
+   * For sending to a "group" of recipients using access keys.
+   */
+  class GroupUnidentifiedAccess(
+    private val unidentifiedAccess: List<UnidentifiedAccess>,
+    override val senderCertificate: SenderCertificate = unidentifiedAccess.first().unidentifiedCertificate
+  ) : SealedSenderAccess() {
+
+    override val headerName: String = "Unidentified-Access-Key"
+    override val headerValue: String by lazy {
+      var joinedUnidentifiedAccess = ByteArray(16)
+      for (access in unidentifiedAccess) {
+        joinedUnidentifiedAccess = ByteArrayUtil.xor(joinedUnidentifiedAccess, access.unidentifiedAccessKey)
+      }
+
+      Base64.encodeWithPadding(joinedUnidentifiedAccess)
+    }
+
+    override fun switchToFallback(): SealedSenderAccess? {
+      return null
+    }
+  }
+
+  /**
+   * Provide a lazy way to create a group send token.
+   */
+  fun interface CreateGroupSendToken {
+    fun create(): GroupSendFullToken?
+  }
+
+  interface FallbackListener {
+    fun onAccessToTokenFallback()
+    fun onTokenToAccessFallback(hasAccessKeyFallback: Boolean)
+  }
+
+  companion object {
+    var fallbackListener: FallbackListener? = null
+
+    @JvmField
+    val NONE: SealedSenderAccess? = null
+
+    @JvmStatic
+    fun forIndividualWithGroupFallback(
+      unidentifiedAccess: UnidentifiedAccess?,
+      senderCertificate: SenderCertificate?,
+      createGroupSendToken: CreateGroupSendToken?
+    ): SealedSenderAccess? {
+      if (unidentifiedAccess != null) {
+        return IndividualUnidentifiedAccessFirst(unidentifiedAccess, createGroupSendToken)
+      }
+
+      val groupSendToken = createGroupSendToken?.create()
+      if (groupSendToken != null && senderCertificate != null) {
+        return IndividualGroupSendTokenFirst(groupSendToken, senderCertificate)
+      }
+
+      return null
+    }
+
+    @JvmStatic
+    fun forIndividual(unidentifiedAccess: UnidentifiedAccess?): SealedSenderAccess? {
+      return unidentifiedAccess?.let { IndividualUnidentifiedAccessFirst(it) }
+    }
+
+    @JvmStatic
+    fun forFanOutGroupSend(groupSendTokens: List<GroupSendFullToken?>?, senderCertificate: SenderCertificate?, unidentifiedAccesses: List<UnidentifiedAccess?>): List<SealedSenderAccess?> {
+      if (groupSendTokens == null) {
+        return unidentifiedAccesses.map { a -> forIndividual(a) }
+      }
+
+      require(groupSendTokens.size == unidentifiedAccesses.size)
+
+      return groupSendTokens
+        .zip(unidentifiedAccesses)
+        .map { (token, unidentifiedAccess) ->
+          if (unidentifiedAccess != null) {
+            IndividualUnidentifiedAccessFirst(unidentifiedAccess) { token }
+          } else if (token != null && senderCertificate != null) {
+            IndividualGroupSendTokenFirst(token, senderCertificate)
+          } else {
+            null
+          }
+        }
+    }
+
+    @JvmStatic
+    fun forGroupSend(groupSendEndorsements: GroupSendEndorsements?, unidentifiedAccess: List<UnidentifiedAccess>, forStory: Boolean): SealedSenderAccess {
+      return if (groupSendEndorsements != null && !forStory) {
+        GroupGroupSendToken(groupSendEndorsements)
+      } else {
+        GroupUnidentifiedAccess(unidentifiedAccess)
+      }
+    }
+
+    @JvmStatic
+    fun isUnrestrictedForStory(sealedSenderAccess: SealedSenderAccess?): Boolean {
+      return when (sealedSenderAccess) {
+        is IndividualGroupSendTokenFirst -> sealedSenderAccess.unidentifiedAccess?.isUnrestrictedForStory ?: false
+        is IndividualUnidentifiedAccessFirst -> sealedSenderAccess.unidentifiedAccess.isUnrestrictedForStory
+        else -> false
+      }
+    }
+  }
+}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java
index f88449b34a..704ba1070f 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java
@@ -60,6 +60,8 @@
 import java.util.Map;
 import java.util.Optional;
 
+import javax.annotation.Nullable;
+
 /**
  * This is used to encrypt + decrypt received envelopes.
  */
@@ -110,17 +112,17 @@ public byte[] encryptForGroup(DistributionId distributionId,
   }
 
   public OutgoingPushMessage encrypt(SignalProtocolAddress destination,
-                                     Optional<UnidentifiedAccess> unidentifiedAccess,
+                                     @Nullable SealedSenderAccess sealedSenderAccess,
                                      EnvelopeContent content)
       throws UntrustedIdentityException, InvalidKeyException
   {
     try {
       SignalSessionCipher sessionCipher = new SignalSessionCipher(sessionLock, new SessionCipher(signalProtocolStore, destination));
-      if (unidentifiedAccess.isPresent()) {
+      if (sealedSenderAccess != null) {
         SignalSealedSessionCipher sealedSessionCipher = new SignalSealedSessionCipher(sessionLock, new SealedSessionCipher(signalProtocolStore, localAddress.getServiceId().getRawUuid(), localAddress.getNumber()
                                                                                                                                                                                                       .orElse(null), localDeviceId));
 
-        return content.processSealedSender(sessionCipher, sealedSessionCipher, destination, unidentifiedAccess.get().getUnidentifiedCertificate());
+        return content.processSealedSender(sessionCipher, sealedSessionCipher, destination, sealedSenderAccess.getSenderCertificate());
       } else {
         return content.processUnsealedSender(sessionCipher, destination);
       }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccess.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccess.java
index 5f4091800d..25856107ec 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccess.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccess.java
@@ -65,7 +65,6 @@ public static byte[] deriveAccessKeyFrom(ProfileKey profileKey) {
     }
   }
 
-
   private static byte[] createEmptyByteArray(int length) {
     return new byte[length];
   }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccessPair.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccessPair.java
deleted file mode 100644
index 9d0425c516..0000000000
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccessPair.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.whispersystems.signalservice.api.crypto;
-
-
-import java.util.Optional;
-
-public class UnidentifiedAccessPair {
-
-  private final Optional<UnidentifiedAccess> targetUnidentifiedAccess;
-  private final Optional<UnidentifiedAccess> selfUnidentifiedAccess;
-
-  public UnidentifiedAccessPair(UnidentifiedAccess targetUnidentifiedAccess, UnidentifiedAccess selfUnidentifiedAccess) {
-    this.targetUnidentifiedAccess = Optional.of(targetUnidentifiedAccess);
-    this.selfUnidentifiedAccess   = Optional.of(selfUnidentifiedAccess);
-  }
-
-  public Optional<UnidentifiedAccess> getTargetUnidentifiedAccess() {
-    return targetUnidentifiedAccess;
-  }
-
-  public Optional<UnidentifiedAccess> getSelfUnidentifiedAccess() {
-    return selfUnidentifiedAccess;
-  }
-}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupChangeLog.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupChangeLog.kt
new file mode 100644
index 0000000000..01278f4319
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupChangeLog.kt
@@ -0,0 +1,30 @@
+package org.whispersystems.signalservice.api.groupsv2
+
+import org.signal.storageservice.protos.groups.local.DecryptedGroup
+import org.signal.storageservice.protos.groups.local.DecryptedGroupChange
+
+/**
+ * A changelog from the server representing a specific group state revision. The
+ * log can contain:
+ *
+ * 1. A full group snapshot for the revision
+ * 2. A full group snapshot and the change from the previous revision to achieve the snapshot
+ * 3. Only the change from the previous revision to achieve this revision
+ *
+ * Most often, it will be the change only (3).
+ */
+data class DecryptedGroupChangeLog(val group: DecryptedGroup?, val change: DecryptedGroupChange?) {
+
+  val revision: Int
+    get() = group?.revision ?: change!!.revision
+
+  init {
+    if (group == null && change == null) {
+      throw InvalidGroupStateException("group and change are both null")
+    }
+
+    if (group != null && change != null && group.revision != change.revision) {
+      throw InvalidGroupStateException("group revision != change revision")
+    }
+  }
+}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupHistoryEntry.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupHistoryEntry.java
deleted file mode 100644
index 4ca34c221e..0000000000
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupHistoryEntry.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.whispersystems.signalservice.api.groupsv2;
-
-import org.signal.storageservice.protos.groups.local.DecryptedGroup;
-import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
-
-import java.util.Optional;
-
-
-/**
- * Pair of a {@link DecryptedGroup} and the {@link DecryptedGroupChange} for that version.
- */
-public final class DecryptedGroupHistoryEntry {
-
-  private final Optional<DecryptedGroup>       group;
-  private final Optional<DecryptedGroupChange> change;
-
-  public DecryptedGroupHistoryEntry(Optional<DecryptedGroup> group, Optional<DecryptedGroupChange> change)
-      throws InvalidGroupStateException
-  {
-    if (group.isPresent() && change.isPresent() && group.get().revision != change.get().revision) {
-      throw new InvalidGroupStateException();
-    }
-
-    this.group  = group;
-    this.change = change;
-  }
-
-  public Optional<DecryptedGroup> getGroup() {
-    return group;
-  }
-
-  public Optional<DecryptedGroupChange> getChange() {
-    return change;
-  }
-}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupResponse.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupResponse.kt
new file mode 100644
index 0000000000..d751618574
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupResponse.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.signalservice.api.groupsv2
+
+import org.signal.libsignal.zkgroup.groupsend.GroupSendEndorsementsResponse
+import org.signal.storageservice.protos.groups.local.DecryptedGroup
+
+/**
+ * Decrypted response from server operations that includes our global group state and
+ * our specific-to-us group send endorsements.
+ */
+class DecryptedGroupResponse(
+  val group: DecryptedGroup,
+  val groupSendEndorsementsResponse: GroupSendEndorsementsResponse?
+)
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupHistoryPage.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupHistoryPage.java
deleted file mode 100644
index 5c2f6b1196..0000000000
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupHistoryPage.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.whispersystems.signalservice.api.groupsv2;
-
-import org.whispersystems.signalservice.internal.push.PushServiceSocket;
-
-import java.util.List;
-
-/**
- * Wraps result of group history fetch with it's associated paging data.
- */
-public final class GroupHistoryPage {
-
-  private final List<DecryptedGroupHistoryEntry> results;
-  private final PagingData                       pagingData;
-
-
-  public GroupHistoryPage(List<DecryptedGroupHistoryEntry> results, PagingData pagingData) {
-    this.results    = results;
-    this.pagingData = pagingData;
-  }
-
-  public List<DecryptedGroupHistoryEntry> getResults() {
-    return results;
-  }
-
-  public PagingData getPagingData() {
-    return pagingData;
-  }
-
-  public static final class PagingData {
-    public static final PagingData NONE = new PagingData(false, -1);
-
-    private final boolean hasMorePages;
-    private final int     nextPageRevision;
-
-    public static PagingData fromGroup(PushServiceSocket.GroupHistory groupHistory) {
-      return new PagingData(groupHistory.hasMore(), groupHistory.hasMore() ? groupHistory.getNextPageStartGroupRevision() : -1);
-    }
-
-    private PagingData(boolean hasMorePages, int nextPageRevision) {
-      this.hasMorePages     = hasMorePages;
-      this.nextPageRevision = nextPageRevision;
-    }
-
-    public boolean hasMorePages() {
-      return hasMorePages;
-    }
-
-    public int getNextPageRevision() {
-      return nextPageRevision;
-    }
-  }
-}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupHistoryPage.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupHistoryPage.kt
new file mode 100644
index 0000000000..fae1591c62
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupHistoryPage.kt
@@ -0,0 +1,22 @@
+package org.whispersystems.signalservice.api.groupsv2
+
+import org.signal.libsignal.zkgroup.groupsend.GroupSendEndorsementsResponse
+import org.whispersystems.signalservice.internal.push.PushServiceSocket.GroupHistory
+
+/**
+ * Wraps result of group history fetch with it's associated paging data.
+ */
+data class GroupHistoryPage(val changeLogs: List<DecryptedGroupChangeLog>, val groupSendEndorsementsResponse: GroupSendEndorsementsResponse?, val pagingData: PagingData) {
+
+  data class PagingData(val hasMorePages: Boolean, val nextPageRevision: Int) {
+    companion object {
+      @JvmField
+      val NONE = PagingData(false, -1)
+
+      @JvmStatic
+      fun forGroupHistory(groupHistory: GroupHistory): PagingData {
+        return PagingData(groupHistory.hasMore(), if (groupHistory.hasMore()) groupHistory.nextPageStartGroupRevision else -1)
+      }
+    }
+  }
+}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupSendEndorsements.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupSendEndorsements.kt
new file mode 100644
index 0000000000..a8f5abbee0
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupSendEndorsements.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.signalservice.api.groupsv2
+
+import org.signal.libsignal.metadata.certificate.SenderCertificate
+import org.signal.libsignal.zkgroup.groups.GroupSecretParams
+import org.signal.libsignal.zkgroup.groupsend.GroupSendEndorsement
+import org.signal.libsignal.zkgroup.groupsend.GroupSendFullToken
+import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.SignalServiceAddress
+import java.time.Instant
+
+/**
+ * Helper container for all data needed to send with group send endorsements.
+ */
+data class GroupSendEndorsements(
+  val expirationMs: Long,
+  val endorsements: Map<ServiceId.ACI, GroupSendEndorsement>,
+  val sealedSenderCertificate: SenderCertificate,
+  val groupSecretParams: GroupSecretParams
+) {
+
+  private val expiration: Instant by lazy { Instant.ofEpochMilli(expirationMs) }
+  private val combinedEndorsement: GroupSendEndorsement by lazy { GroupSendEndorsement.combine(endorsements.values) }
+
+  fun serialize(): ByteArray {
+    return combinedEndorsement.toFullToken(groupSecretParams, expiration).serialize()
+  }
+
+  fun forIndividuals(addresses: List<SignalServiceAddress>): List<GroupSendFullToken?> {
+    return addresses
+      .map { a -> endorsements[a.serviceId] }
+      .map { e -> e?.toFullToken(groupSecretParams, expiration) }
+  }
+}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Api.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Api.java
index 42b87b7946..0ce4797ccb 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Api.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Api.java
@@ -9,16 +9,20 @@
 import org.signal.libsignal.zkgroup.calllinks.CallLinkAuthCredentialResponse;
 import org.signal.libsignal.zkgroup.groups.ClientZkGroupCipher;
 import org.signal.libsignal.zkgroup.groups.GroupSecretParams;
+import org.signal.libsignal.zkgroup.groupsend.GroupSendEndorsementsResponse;
 import org.signal.storageservice.protos.groups.AvatarUploadAttributes;
 import org.signal.storageservice.protos.groups.Group;
 import org.signal.storageservice.protos.groups.GroupAttributeBlob;
 import org.signal.storageservice.protos.groups.GroupChange;
+import org.signal.storageservice.protos.groups.GroupChangeResponse;
 import org.signal.storageservice.protos.groups.GroupChanges;
 import org.signal.storageservice.protos.groups.GroupExternalCredential;
 import org.signal.storageservice.protos.groups.GroupJoinInfo;
+import org.signal.storageservice.protos.groups.GroupResponse;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;
 import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
 import org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo;
+import org.whispersystems.signalservice.api.NetworkResult;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.internal.push.PushServiceSocket;
@@ -30,8 +34,11 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 
+import javax.annotation.Nonnull;
+
 import okio.ByteString;
 
 public class GroupsV2Api {
@@ -70,9 +77,9 @@ public GroupsV2AuthorizationString getGroupsV2AuthorizationString(ACI aci,
     return new GroupsV2AuthorizationString(groupSecretParams, authCredentialPresentation);
   }
 
-  public void putNewGroup(GroupsV2Operations.NewGroup newGroup,
-                          GroupsV2AuthorizationString authorization)
-      throws IOException
+  public DecryptedGroupResponse putNewGroup(GroupsV2Operations.NewGroup newGroup,
+                                            GroupsV2AuthorizationString authorization)
+      throws IOException, InvalidGroupStateException, VerificationFailedException, InvalidInputException
   {
     Group group = newGroup.getNewGroupMessage();
 
@@ -80,51 +87,56 @@ public void putNewGroup(GroupsV2Operations.NewGroup newGroup,
       String cdnKey = uploadAvatar(newGroup.getAvatar().get(), newGroup.getGroupSecretParams(), authorization);
 
       group = group.newBuilder()
-                    .avatar(cdnKey)
-                    .build();
+                   .avatar(cdnKey)
+                   .build();
     }
 
-    socket.putNewGroupsV2Group(group, authorization);
-  }
+    GroupResponse response = socket.putNewGroupsV2Group(group, authorization);
 
-  public PartialDecryptedGroup getPartialDecryptedGroup(GroupSecretParams groupSecretParams,
-                                                        GroupsV2AuthorizationString authorization)
-      throws IOException, InvalidGroupStateException, VerificationFailedException
-  {
-    Group group = socket.getGroupsV2Group(authorization);
+    return groupsOperations.forGroup(newGroup.getGroupSecretParams())
+                           .decryptGroup(Objects.requireNonNull(response.group), response.groupSendEndorsementsResponse.toByteArray());
+  }
 
-    return groupsOperations.forGroup(groupSecretParams)
-                           .partialDecryptGroup(group);
+  public NetworkResult<DecryptedGroupResponse> getGroupAsResult(GroupSecretParams groupSecretParams, GroupsV2AuthorizationString authorization) {
+    return NetworkResult.fromFetch(() -> getGroup(groupSecretParams, authorization));
   }
 
-  public DecryptedGroup getGroup(GroupSecretParams groupSecretParams,
-                                 GroupsV2AuthorizationString authorization)
-      throws IOException, InvalidGroupStateException, VerificationFailedException
+  public DecryptedGroupResponse getGroup(GroupSecretParams groupSecretParams,
+                                         GroupsV2AuthorizationString authorization)
+      throws IOException, InvalidGroupStateException, VerificationFailedException, InvalidInputException
   {
-    Group group = socket.getGroupsV2Group(authorization);
+    GroupResponse response = socket.getGroupsV2Group(authorization);
 
     return groupsOperations.forGroup(groupSecretParams)
-                           .decryptGroup(group);
+                           .decryptGroup(Objects.requireNonNull(response.group), response.groupSendEndorsementsResponse.toByteArray());
   }
 
   public GroupHistoryPage getGroupHistoryPage(GroupSecretParams groupSecretParams,
                                               int fromRevision,
                                               GroupsV2AuthorizationString authorization,
-                                              boolean includeFirstState)
-      throws IOException, InvalidGroupStateException, VerificationFailedException
+                                              boolean includeFirstState,
+                                              long sendEndorsementsExpirationMs)
+      throws IOException, InvalidGroupStateException, VerificationFailedException, InvalidInputException
   {
-    PushServiceSocket.GroupHistory     group           = socket.getGroupsV2GroupHistory(fromRevision, authorization, GroupsV2Operations.HIGHEST_KNOWN_EPOCH, includeFirstState);
-    List<DecryptedGroupHistoryEntry>   result          = new ArrayList<>(group.getGroupChanges().groupChanges.size());
+    PushServiceSocket.GroupHistory     group           = socket.getGroupHistory(fromRevision, authorization, GroupsV2Operations.HIGHEST_KNOWN_EPOCH, includeFirstState, sendEndorsementsExpirationMs);
+    List<DecryptedGroupChangeLog>      result          = new ArrayList<>(group.getGroupChanges().groupChanges.size());
     GroupsV2Operations.GroupOperations groupOperations = groupsOperations.forGroup(groupSecretParams);
 
     for (GroupChanges.GroupChangeState change : group.getGroupChanges().groupChanges) {
-      Optional<DecryptedGroup>       decryptedGroup  = change.groupState != null ? Optional.of(groupOperations.decryptGroup(change.groupState)) : Optional.empty();
-      Optional<DecryptedGroupChange> decryptedChange = change.groupChange != null ? groupOperations.decryptChange(change.groupChange, false) : Optional.empty();
+      DecryptedGroup       decryptedGroup  = change.groupState != null ? groupOperations.decryptGroup(change.groupState) : null;
+      DecryptedGroupChange decryptedChange = change.groupChange != null ? groupOperations.decryptChange(change.groupChange, false).orElse(null) : null;
 
-      result.add(new DecryptedGroupHistoryEntry(decryptedGroup, decryptedChange));
+      result.add(new DecryptedGroupChangeLog(decryptedGroup, decryptedChange));
     }
 
-    return new GroupHistoryPage(result, GroupHistoryPage.PagingData.fromGroup(group));
+    byte[]                        groupSendEndorsementsResponseBytes = group.getGroupChanges().groupSendEndorsementsResponse.toByteArray();
+    GroupSendEndorsementsResponse groupSendEndorsementsResponse      = groupSendEndorsementsResponseBytes.length > 0 ? new GroupSendEndorsementsResponse(groupSendEndorsementsResponseBytes) : null;
+
+    return new GroupHistoryPage(result, groupSendEndorsementsResponse, GroupHistoryPage.PagingData.forGroupHistory(group));
+  }
+
+  public NetworkResult<Integer> getGroupJoinedAt(@Nonnull GroupsV2AuthorizationString authorization) {
+    return NetworkResult.fromFetch(() -> socket.getGroupJoinedAtRevision(authorization));
   }
 
   public DecryptedGroupJoinInfo getGroupJoinInfo(GroupSecretParams groupSecretParams,
@@ -161,9 +173,9 @@ public String uploadAvatar(byte[] avatar,
     return form.key;
   }
 
-  public GroupChange patchGroup(GroupChange.Actions groupChange,
-                                GroupsV2AuthorizationString authorization,
-                                Optional<byte[]> groupLinkPassword)
+  public GroupChangeResponse patchGroup(GroupChange.Actions groupChange,
+                                        GroupsV2AuthorizationString authorization,
+                                        Optional<byte[]> groupLinkPassword)
       throws IOException
   {
     return socket.patchGroupsV2Group(groupChange, authorization.toString(), groupLinkPassword);
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations.java
index 07bed200cf..28a1196aa0 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations.java
@@ -10,6 +10,7 @@
 import org.signal.libsignal.zkgroup.groups.GroupSecretParams;
 import org.signal.libsignal.zkgroup.groups.ProfileKeyCiphertext;
 import org.signal.libsignal.zkgroup.groups.UuidCiphertext;
+import org.signal.libsignal.zkgroup.groupsend.GroupSendEndorsementsResponse;
 import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations;
 import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
@@ -53,6 +54,9 @@
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import okio.ByteString;
 
 /**
@@ -154,7 +158,7 @@ public final class GroupOperations {
     private final GroupSecretParams   groupSecretParams;
     private final ClientZkGroupCipher clientZkGroupCipher;
 
-    private GroupOperations(GroupSecretParams groupSecretParams) {
+    public GroupOperations(GroupSecretParams groupSecretParams) {
       this.groupSecretParams   = groupSecretParams;
       this.clientZkGroupCipher = new ClientZkGroupCipher(groupSecretParams);
     }
@@ -425,33 +429,13 @@ public PendingMember.Builder invitee(ServiceId serviceId, Member.Role role) {
       return new PendingMember.Builder().member(member);
     }
 
-    public PartialDecryptedGroup partialDecryptGroup(Group group)
-        throws VerificationFailedException, InvalidGroupStateException
+    public @Nonnull DecryptedGroupResponse decryptGroup(@Nonnull Group group, @Nonnull byte[] groupSendEndorsementsBytes)
+        throws VerificationFailedException, InvalidGroupStateException, InvalidInputException
     {
-      List<Member>                 membersList             = group.members;
-      List<PendingMember>          pendingMembersList      = group.pendingMembers;
-      List<DecryptedMember>        decryptedMembers        = new ArrayList<>(membersList.size());
-      List<DecryptedPendingMember> decryptedPendingMembers = new ArrayList<>(pendingMembersList.size());
+      DecryptedGroup                decryptedGroup                = decryptGroup(group);
+      GroupSendEndorsementsResponse groupSendEndorsementsResponse = groupSendEndorsementsBytes.length > 0 ? new GroupSendEndorsementsResponse(groupSendEndorsementsBytes) : null;
 
-      for (Member member : membersList) {
-        ACI memberAci = decryptAci(member.userId);
-        decryptedMembers.add(new DecryptedMember.Builder().aciBytes(memberAci.toByteString())
-                                                          .joinedAtRevision(member.joinedAtRevision)
-                                                          .build());
-      }
-
-      for (PendingMember member : pendingMembersList) {
-        ServiceId pendingMemberServiceId = decryptServiceIdOrUnknown(member.member.userId);
-        decryptedPendingMembers.add(new DecryptedPendingMember.Builder().serviceIdBytes(pendingMemberServiceId.toByteString()).build());
-      }
-
-      DecryptedGroup decryptedGroup = new DecryptedGroup.Builder()
-                                                        .revision(group.revision)
-                                                        .members(decryptedMembers)
-                                                        .pendingMembers(decryptedPendingMembers)
-                                                        .build();
-
-      return new PartialDecryptedGroup(group, decryptedGroup, GroupsV2Operations.this, groupSecretParams);
+      return new DecryptedGroupResponse(decryptedGroup, groupSendEndorsementsResponse);
     }
 
     public DecryptedGroup decryptGroup(Group group)
@@ -1048,6 +1032,46 @@ public List<ServiceId> decryptAddMembers(List<GroupChange.Actions.AddMemberActio
       return ids;
     }
 
+    public @Nullable ReceivedGroupSendEndorsements receiveGroupSendEndorsements(@Nonnull ACI selfAci,
+                                                                                @Nonnull DecryptedGroup decryptedGroup,
+                                                                                @Nullable ByteString groupSendEndorsementsResponse)
+    {
+      if (groupSendEndorsementsResponse != null && groupSendEndorsementsResponse.size() > 0) {
+        try {
+          return receiveGroupSendEndorsements(selfAci, decryptedGroup, new GroupSendEndorsementsResponse(groupSendEndorsementsResponse.toByteArray()));
+        } catch (InvalidInputException e) {
+          Log.w(TAG, "Unable to parse send endorsements response", e);
+        }
+      }
+
+      return null;
+    }
+
+    public @Nullable ReceivedGroupSendEndorsements receiveGroupSendEndorsements(@Nonnull ACI selfAci,
+                                                                                @Nonnull DecryptedGroup decryptedGroup,
+                                                                                @Nullable GroupSendEndorsementsResponse groupSendEndorsementsResponse)
+    {
+      if (groupSendEndorsementsResponse == null) {
+        return null;
+      }
+
+      List<ACI> members = decryptedGroup.members.stream().map(m -> ACI.parseOrThrow(m.aciBytes)).collect(Collectors.toList());
+
+      GroupSendEndorsementsResponse.ReceivedEndorsements endorsements = null;
+      try {
+        endorsements = groupSendEndorsementsResponse.receive(
+            members.stream().map(ACI::getLibSignalAci).collect(Collectors.toList()),
+            selfAci.getLibSignalAci(),
+            groupSecretParams,
+            serverPublicParams
+        );
+      } catch (VerificationFailedException e) {
+        Log.w(TAG, "Unable to receive send endorsements for group", e);
+      }
+
+      return endorsements != null ? new ReceivedGroupSendEndorsements(groupSendEndorsementsResponse.getExpiration(), members, endorsements)
+                                  : null;
+    }
   }
 
   public static class NewGroup {
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/InvalidGroupStateException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/InvalidGroupStateException.java
index 3b05f55652..3a07b81a8c 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/InvalidGroupStateException.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/InvalidGroupStateException.java
@@ -12,6 +12,10 @@ public final class InvalidGroupStateException extends Exception {
     super(e);
   }
 
+  InvalidGroupStateException(String message) {
+    super(message);
+  }
+
   InvalidGroupStateException() {
   }
 }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/NotAbleToApplyGroupV2ChangeException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/NotAbleToApplyGroupV2ChangeException.java
index 91aa2361c6..0e6433f117 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/NotAbleToApplyGroupV2ChangeException.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/NotAbleToApplyGroupV2ChangeException.java
@@ -2,7 +2,7 @@
 
 public final class NotAbleToApplyGroupV2ChangeException extends Exception {
 
-  NotAbleToApplyGroupV2ChangeException() {
+  public NotAbleToApplyGroupV2ChangeException() {
   }
 
 }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/PartialDecryptedGroup.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/PartialDecryptedGroup.java
deleted file mode 100644
index c603e356dc..0000000000
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/PartialDecryptedGroup.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.whispersystems.signalservice.api.groupsv2;
-
-import org.signal.libsignal.zkgroup.VerificationFailedException;
-import org.signal.libsignal.zkgroup.groups.GroupSecretParams;
-import org.signal.storageservice.protos.groups.Group;
-import org.signal.storageservice.protos.groups.local.DecryptedGroup;
-import org.signal.storageservice.protos.groups.local.DecryptedMember;
-import org.signal.storageservice.protos.groups.local.DecryptedPendingMember;
-
-import java.io.IOException;
-import java.util.List;
-
-/**
- * Decrypting an entire group can be expensive for large groups. Since not every
- * operation requires all data to be decrypted, this class can be populated with only
- * the minimalist about of information need to perform an operation. Currently, only
- * updating from the server utilizes it.
- */
-public class PartialDecryptedGroup {
-  private final Group              group;
-  private final DecryptedGroup     decryptedGroup;
-  private final GroupsV2Operations groupsOperations;
-  private final GroupSecretParams  groupSecretParams;
-
-  public PartialDecryptedGroup(Group group,
-                               DecryptedGroup decryptedGroup,
-                               GroupsV2Operations groupsOperations,
-                               GroupSecretParams groupSecretParams)
-  {
-    this.group             = group;
-    this.decryptedGroup    = decryptedGroup;
-    this.groupsOperations  = groupsOperations;
-    this.groupSecretParams = groupSecretParams;
-  }
-
-  public int getRevision() {
-    return decryptedGroup.revision;
-  }
-
-  public List<DecryptedMember> getMembersList() {
-    return decryptedGroup.members;
-  }
-
-  public List<DecryptedPendingMember> getPendingMembersList() {
-    return decryptedGroup.pendingMembers;
-  }
-
-  public DecryptedGroup getFullyDecryptedGroup()
-      throws IOException
-  {
-    try {
-      return groupsOperations.forGroup(groupSecretParams)
-                             .decryptGroup(group);
-    } catch (VerificationFailedException | InvalidGroupStateException e) {
-      throw new IOException(e);
-    }
-  }
-}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ReceivedGroupSendEndorsements.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ReceivedGroupSendEndorsements.kt
new file mode 100644
index 0000000000..86e8252912
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ReceivedGroupSendEndorsements.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.signalservice.api.groupsv2
+
+import org.signal.libsignal.zkgroup.groupsend.GroupSendEndorsement
+import org.signal.libsignal.zkgroup.groupsend.GroupSendEndorsementsResponse
+import org.whispersystems.signalservice.api.push.ServiceId
+import java.time.Instant
+
+/**
+ * Group send endorsement data received from the server.
+ */
+data class ReceivedGroupSendEndorsements(
+  val expirationMs: Long,
+  val endorsements: Map<ServiceId.ACI, GroupSendEndorsement>
+) {
+  constructor(
+    expiration: Instant,
+    members: List<ServiceId.ACI>,
+    receivedEndorsements: GroupSendEndorsementsResponse.ReceivedEndorsements
+  ) : this(
+    expirationMs = expiration.toEpochMilli(),
+    endorsements = members.zip(receivedEndorsements.endorsements).toMap()
+  )
+}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachment.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachment.java
index 01b1445e57..f6ebb8707a 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachment.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachment.java
@@ -12,6 +12,9 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.Optional;
+import java.util.UUID;
+
+import javax.annotation.Nullable;
 
 public abstract class SignalServiceAttachment {
 
@@ -40,10 +43,6 @@ public static Builder newStreamBuilder() {
     return new Builder();
   }
 
-  public static SignalServiceAttachmentStream emptyStream(String contentType) {
-    return new SignalServiceAttachmentStream(new ByteArrayInputStream(new byte[0]), contentType, 0, Optional.empty(), false, false, false, false, null, null);
-  }
-
   public static class Builder {
 
     private InputStream             inputStream;
@@ -62,6 +61,7 @@ public static class Builder {
     private String                  blurHash;
     private long                    uploadTimestamp;
     private ResumableUploadSpec     resumableUploadSpec;
+    private UUID                    uuid;
 
     private Builder() {}
 
@@ -145,6 +145,11 @@ public Builder withResumableUploadSpec(ResumableUploadSpec resumableUploadSpec)
       return this;
     }
 
+    public Builder withUuid(@Nullable UUID uuid) {
+      this.uuid = uuid;
+      return this;
+    }
+
     public SignalServiceAttachmentStream build() {
       if (inputStream == null) throw new IllegalArgumentException("Must specify stream!");
       if (contentType == null) throw new IllegalArgumentException("No content type specified!");
@@ -166,7 +171,8 @@ public SignalServiceAttachmentStream build() {
                                                Optional.ofNullable(blurHash),
                                                listener,
                                                cancelationSignal,
-                                               Optional.ofNullable(resumableUploadSpec));
+                                               Optional.ofNullable(resumableUploadSpec),
+                                               uuid);
     }
   }
 
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentPointer.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentPointer.java
index 50df2140c8..14ce1d755e 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentPointer.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentPointer.java
@@ -9,6 +9,9 @@
 import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
 
 import java.util.Optional;
+import java.util.UUID;
+
+import javax.annotation.Nullable;
 
 /**
  * Represents a received SignalServiceAttachment "handle."  This
@@ -36,6 +39,7 @@ public class SignalServiceAttachmentPointer extends SignalServiceAttachment {
   private final Optional<String>                caption;
   private final Optional<String>                blurHash;
   private final long                            uploadTimestamp;
+  private final UUID                            uuid;
 
   public SignalServiceAttachmentPointer(int cdnNumber,
                                         SignalServiceAttachmentRemoteId remoteId,
@@ -54,7 +58,8 @@ public SignalServiceAttachmentPointer(int cdnNumber,
                                         boolean gif,
                                         Optional<String> caption,
                                         Optional<String> blurHash,
-                                        long uploadTimestamp)
+                                        long uploadTimestamp,
+                                        @Nullable UUID uuid)
   {
     super(contentType);
     this.cdnNumber               = cdnNumber;
@@ -74,6 +79,7 @@ public SignalServiceAttachmentPointer(int cdnNumber,
     this.blurHash                = blurHash;
     this.uploadTimestamp         = uploadTimestamp;
     this.gif                     = gif;
+    this.uuid                    = uuid;
   }
 
   public int getCdnNumber() {
@@ -153,4 +159,8 @@ public Optional<String> getBlurHash() {
   public long getUploadTimestamp() {
     return uploadTimestamp;
   }
+
+  public @Nullable UUID getUuid() {
+    return uuid;
+  }
 }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentStream.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentStream.java
index 2459f4b9f1..afd859708d 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentStream.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentStream.java
@@ -14,6 +14,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Optional;
+import java.util.UUID;
+
+import javax.annotation.Nullable;
 
 /**
  * Represents a local SignalServiceAttachment to be sent.
@@ -36,6 +39,7 @@ public class SignalServiceAttachmentStream extends SignalServiceAttachment imple
   private final Optional<String>              caption;
   private final Optional<String>              blurHash;
   private final Optional<ResumableUploadSpec> resumableUploadSpec;
+  private final UUID                          uuid;
 
   public SignalServiceAttachmentStream(InputStream inputStream,
                                        String contentType,
@@ -48,7 +52,7 @@ public SignalServiceAttachmentStream(InputStream inputStream,
                                        ProgressListener listener,
                                        CancelationSignal cancelationSignal)
   {
-    this(inputStream, contentType, length, fileName, voiceNote, borderless, gif, faststart, Optional.empty(), 0, 0, System.currentTimeMillis(), Optional.empty(), Optional.empty(), listener, cancelationSignal, Optional.empty());
+    this(inputStream, contentType, length, fileName, voiceNote, borderless, gif, faststart, Optional.empty(), 0, 0, System.currentTimeMillis(), Optional.empty(), Optional.empty(), listener, cancelationSignal, Optional.empty(), UUID.randomUUID());
   }
 
   public SignalServiceAttachmentStream(InputStream inputStream,
@@ -67,7 +71,8 @@ public SignalServiceAttachmentStream(InputStream inputStream,
                                        Optional<String> blurHash,
                                        ProgressListener listener,
                                        CancelationSignal cancelationSignal,
-                                       Optional<ResumableUploadSpec> resumableUploadSpec)
+                                       Optional<ResumableUploadSpec> resumableUploadSpec,
+                                       @Nullable UUID uuid)
   {
     super(contentType);
     this.inputStream         = inputStream;
@@ -86,6 +91,7 @@ public SignalServiceAttachmentStream(InputStream inputStream,
     this.blurHash            = blurHash;
     this.cancelationSignal   = cancelationSignal;
     this.resumableUploadSpec = resumableUploadSpec;
+    this.uuid                = uuid;
   }
 
   @Override
@@ -162,6 +168,10 @@ public Optional<ResumableUploadSpec> getResumableUploadSpec() {
     return resumableUploadSpec;
   }
 
+  public @Nullable UUID getUuid() {
+    return uuid;
+  }
+
   @Override
   public void close() throws IOException {
     inputStream.close();
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.kt
index c34876ab60..c6bbd8ff25 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.kt
@@ -106,11 +106,6 @@ class SignalServiceDataMessage private constructor(
       return this
     }
 
-    fun withAttachment(attachment: SignalServiceAttachment?): Builder {
-      attachment?.let { attachments.add(attachment) }
-      return this
-    }
-
     fun withAttachments(attachments: List<SignalServiceAttachment>?): Builder {
       attachments?.let { this.attachments.addAll(attachments) }
       return this
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java
index 1921952c36..69bdabb717 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java
@@ -12,6 +12,7 @@
 import org.signal.libsignal.protocol.logging.Log;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
@@ -62,7 +63,7 @@ public DeviceContact read() throws IOException {
       InputStream avatarStream      = new LimitedInputStream(in, avatarLength);
       String      avatarContentType = details.avatar.contentType;
 
-      avatar = Optional.of(new SignalServiceAttachmentStream(avatarStream, avatarContentType, avatarLength, Optional.empty(), false, false, false, false, null, null));
+      avatar = Optional.of(SignalServiceAttachment.newStreamBuilder().withStream(avatarStream).withContentType(avatarContentType).withLength(avatarLength).build());
     }
 
     if (details.verified != null) {
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java
index abeffc9511..370a2da21c 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java
@@ -193,22 +193,22 @@ public static class Capabilities {
     private boolean storage;
 
     @JsonProperty
-    private boolean paymentActivation;
+    private boolean deleteSync;
 
     @JsonCreator
     public Capabilities() {}
 
-    public Capabilities(boolean storage, boolean paymentActivation) {
-      this.storage           = storage;
-      this.paymentActivation = paymentActivation;
+    public Capabilities(boolean storage, boolean deleteSync) {
+      this.storage    = storage;
+      this.deleteSync = deleteSync;
     }
 
     public boolean isStorage() {
       return storage;
     }
 
-    public boolean isPaymentActivation() {
-      return paymentActivation;
+    public boolean isDeleteSync() {
+      return deleteSync;
     }
   }
 
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ServiceId.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ServiceId.kt
index 4e2fafdf74..5f8588f7ec 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ServiceId.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ServiceId.kt
@@ -80,7 +80,7 @@ sealed class ServiceId(val libSignalServiceId: LibSignalServiceId) {
 
     /** Parses a ServiceId serialized as a ByteString. Returns null if the ServiceId is invalid. */
     @JvmStatic
-    fun parseOrNull(bytes: okio.ByteString): ServiceId? = parseOrNull(bytes.toByteArray())
+    fun parseOrNull(bytes: okio.ByteString?): ServiceId? = parseOrNull(bytes?.toByteArray())
 
     /** Parses a ServiceId serialized as a string. Crashes if the ServiceId is invalid. */
     @JvmStatic
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java
index ac5526d2be..32bb56e623 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java
@@ -42,8 +42,6 @@ private static Set<Option> parseOptions(List<String> rawOptions) {
 
     for (String raw : rawOptions) {
       switch (raw) {
-        case "recaptcha":
-          options.add(Option.RECAPTCHA);
         case "captcha":
           options.add(Option.CAPTCHA);
           break;
@@ -60,6 +58,6 @@ private static Set<Option> parseOptions(List<String> rawOptions) {
   }
 
   public enum Option {
-    @Deprecated RECAPTCHA, CAPTCHA, PUSH_CHALLENGE
+    CAPTCHA, PUSH_CHALLENGE
   }
 }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/registration/RegistrationApi.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/registration/RegistrationApi.kt
index a3fa4a317a..673f9485e7 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/registration/RegistrationApi.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/registration/RegistrationApi.kt
@@ -7,8 +7,10 @@ package org.whispersystems.signalservice.api.registration
 
 import org.whispersystems.signalservice.api.NetworkResult
 import org.whispersystems.signalservice.api.account.AccountAttributes
+import org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest
 import org.whispersystems.signalservice.api.account.PreKeyCollection
-import org.whispersystems.signalservice.internal.push.BackupAuthCheckResponse
+import org.whispersystems.signalservice.internal.push.BackupV2AuthCheckResponse
+import org.whispersystems.signalservice.internal.push.BackupV3AuthCheckResponse
 import org.whispersystems.signalservice.internal.push.PushServiceSocket
 import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
@@ -23,6 +25,8 @@ class RegistrationApi(
 
   /**
    * Request that the service initialize a new registration session.
+   *
+   * `POST /v1/verification/session`
    */
   fun createRegistrationSession(fcmToken: String?, mcc: String?, mnc: String?): NetworkResult<RegistrationSessionMetadataResponse> {
     return NetworkResult.fromFetch {
@@ -32,6 +36,8 @@ class RegistrationApi(
 
   /**
    * Retrieve current status of a registration session.
+   *
+   * `GET /v1/verification/session/{session-id}`
    */
   fun getRegistrationSessionStatus(sessionId: String): NetworkResult<RegistrationSessionMetadataResponse> {
     return NetworkResult.fromFetch {
@@ -41,6 +47,8 @@ class RegistrationApi(
 
   /**
    * Submit an FCM token to the service as proof that this is an honest user attempting to register.
+   *
+   * `PATCH /v1/verification/session/{session-id}`
    */
   fun submitPushChallengeToken(sessionId: String?, pushChallengeToken: String?): NetworkResult<RegistrationSessionMetadataResponse> {
     return NetworkResult.fromFetch {
@@ -52,16 +60,20 @@ class RegistrationApi(
    * Request an SMS verification code.  On success, the server will send
    * an SMS verification code to this Signal user.
    *
+   * `POST /v1/verification/session/{session-id}/code`
+   *
    * @param androidSmsRetrieverSupported whether the system framework will automatically parse the incoming verification message.
    */
-  fun requestSmsVerificationCode(sessionId: String?, locale: Locale?, androidSmsRetrieverSupported: Boolean): NetworkResult<RegistrationSessionMetadataResponse> {
+  fun requestSmsVerificationCode(sessionId: String?, locale: Locale?, androidSmsRetrieverSupported: Boolean, transport: PushServiceSocket.VerificationCodeTransport): NetworkResult<RegistrationSessionMetadataResponse> {
     return NetworkResult.fromFetch {
-      pushServiceSocket.requestVerificationCode(sessionId, locale, androidSmsRetrieverSupported, PushServiceSocket.VerificationCodeTransport.SMS)
+      pushServiceSocket.requestVerificationCode(sessionId, locale, androidSmsRetrieverSupported, transport)
     }
   }
 
   /**
    * Submit a verification code sent by the service via one of the supported channels (SMS, phone call) to prove the registrant's control of the phone number.
+   *
+   * `PUT /v1/verification/session/{session-id}/code`
    */
   fun verifyAccount(sessionId: String, verificationCode: String): NetworkResult<RegistrationSessionMetadataResponse> {
     return NetworkResult.fromFetch {
@@ -71,6 +83,8 @@ class RegistrationApi(
 
   /**
    * Submits the solved captcha token to the service.
+   *
+   * `PATCH /v1/verification/session/{session-id}`
    */
   fun submitCaptchaToken(sessionId: String, captchaToken: String): NetworkResult<RegistrationSessionMetadataResponse> {
     return NetworkResult.fromFetch {
@@ -80,6 +94,8 @@ class RegistrationApi(
 
   /**
    * Submit the cryptographic assets required for an account to use the service.
+   *
+   * `POST /v1/registration`
    */
   fun registerAccount(sessionId: String?, recoveryPassword: String?, attributes: AccountAttributes?, aciPreKeys: PreKeyCollection?, pniPreKeys: PreKeyCollection?, fcmToken: String?, skipDeviceTransfer: Boolean): NetworkResult<VerifyAccountResponse> {
     return NetworkResult.fromFetch {
@@ -87,9 +103,36 @@ class RegistrationApi(
     }
   }
 
-  fun getSvrAuthCredential(e164: String, usernamePasswords: List<String>): NetworkResult<BackupAuthCheckResponse> {
+  /**
+   * Validates the provided SVR2 auth credentials, returning information on their usability.
+   *
+   * `POST /v2/backup/auth/check`
+   */
+  fun validateSvr2AuthCredential(e164: String, usernamePasswords: List<String>): NetworkResult<BackupV2AuthCheckResponse> {
+    return NetworkResult.fromFetch {
+      pushServiceSocket.checkSvr2AuthCredentials(e164, usernamePasswords)
+    }
+  }
+
+  /**
+   * Validates the provided SVR3 auth credentials, returning information on their usability.
+   *
+   * `POST /v3/backup/auth/check`
+   */
+  fun validateSvr3AuthCredential(e164: String, usernamePasswords: List<String>): NetworkResult<BackupV3AuthCheckResponse> {
+    return NetworkResult.fromFetch {
+      pushServiceSocket.checkSvr3AuthCredentials(e164, usernamePasswords)
+    }
+  }
+
+  /**
+   * Changes the phone number that an account is associated with.
+   *
+   * `PUT /v2/accounts/number`
+   */
+  fun changeNumber(requestBody: ChangePhoneNumberRequest): NetworkResult<VerifyAccountResponse> {
     return NetworkResult.fromFetch {
-      pushServiceSocket.checkBackupAuthCredentials(e164, usernamePasswords)
+      pushServiceSocket.changeNumber(requestBody)
     }
   }
 }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/CdsiSocket.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/CdsiSocket.java
index 9715ac4734..4c4ac22222 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/CdsiSocket.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/CdsiSocket.java
@@ -3,6 +3,7 @@
 import org.signal.cdsi.proto.ClientRequest;
 import org.signal.cdsi.proto.ClientResponse;
 import org.signal.libsignal.attest.AttestationDataException;
+import org.signal.libsignal.attest.AttestationFailedException;
 import org.signal.libsignal.cds2.Cds2Client;
 import org.signal.libsignal.protocol.logging.Log;
 import org.signal.libsignal.protocol.util.Pair;
@@ -161,7 +162,7 @@ public void onMessage(WebSocket webSocket, okio.ByteString bytes) {
                 webSocket.close(1000, "OK");
                 break;
             }
-          } catch (IOException | AttestationDataException | SgxCommunicationFailureException e) {
+          } catch (IOException | AttestationDataException | AttestationFailedException | SgxCommunicationFailureException e) {
             Log.w(TAG, e);
             webSocket.close(1000, "OK");
             emitter.tryOnError(e);
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/CdsiV2Service.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/CdsiV2Service.java
index 7d796c51da..e6e8b83d22 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/CdsiV2Service.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/CdsiV2Service.java
@@ -19,13 +19,11 @@
 import org.whispersystems.signalservice.api.util.UuidUtil;
 import org.whispersystems.signalservice.internal.ServiceResponse;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
-import org.whispersystems.signalservice.internal.websocket.LibSignalNetwork;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.lang.IllegalArgumentException;
 import java.nio.ByteBuffer;
-import java.time.Duration;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -57,7 +55,7 @@ public final class CdsiV2Service {
 
   private final CdsiRequestHandler cdsiRequestHandler;
 
-  public CdsiV2Service(SignalServiceConfiguration configuration, String mrEnclave, @Nullable LibSignalNetwork network) {
+  public CdsiV2Service(SignalServiceConfiguration configuration, String mrEnclave, @Nullable Network network) {
 
     if (network != null) {
       this.cdsiRequestHandler = (username, password, request, tokenSaver) -> {
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java
index 09721453d4..88f6e11801 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java
@@ -80,7 +80,7 @@ public DonationsService(
    * @param visible                       Whether the badge will be visible on the user's profile immediately after redemption
    * @param primary                       Whether the badge will be made primary immediately after redemption
    */
-  public ServiceResponse<EmptyResponse> redeemReceipt(ReceiptCredentialPresentation receiptCredentialPresentation, boolean visible, boolean primary) {
+  public ServiceResponse<EmptyResponse> redeemDonationReceipt(ReceiptCredentialPresentation receiptCredentialPresentation, boolean visible, boolean primary) {
     try {
       pushServiceSocket.redeemDonationReceipt(receiptCredentialPresentation, visible, primary);
       return ServiceResponse.forResult(EmptyResponse.INSTANCE, 200, null);
@@ -89,6 +89,20 @@ public ServiceResponse<EmptyResponse> redeemReceipt(ReceiptCredentialPresentatio
     }
   }
 
+  /**
+   * Allows a user to redeem a given receipt they were given after submitting a donation successfully.
+   *
+   * @param receiptCredentialPresentation Receipt
+   */
+  public ServiceResponse<EmptyResponse> redeemArchivesReceipt(ReceiptCredentialPresentation receiptCredentialPresentation) {
+    try {
+      pushServiceSocket.redeemArchivesReceipt(receiptCredentialPresentation);
+      return ServiceResponse.forResult(EmptyResponse.INSTANCE, 200, null);
+    } catch (Exception e) {
+      return ServiceResponse.<EmptyResponse>forUnknownError(e);
+    }
+  }
+
   /**
    * Submits price information to the server to generate a payment intent via the payment gateway.
    *
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/MessagingService.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/MessagingService.java
index 72712a88dd..2f4ca3d6cd 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/MessagingService.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/MessagingService.java
@@ -1,7 +1,7 @@
 package org.whispersystems.signalservice.api.services;
 
 import org.whispersystems.signalservice.api.SignalWebSocket;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess;
 import org.whispersystems.signalservice.api.push.exceptions.NotFoundException;
 import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
 import org.whispersystems.signalservice.internal.ServiceResponse;
@@ -19,13 +19,14 @@
 import org.whispersystems.signalservice.internal.websocket.DefaultResponseMapper;
 import org.whispersystems.signalservice.internal.websocket.ResponseMapper;
 import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage;
-import org.signal.core.util.Base64;
 
 import java.security.SecureRandom;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
-import java.util.Optional;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import io.reactivex.rxjava3.core.Single;
 import okio.ByteString;
@@ -42,7 +43,9 @@ public MessagingService(SignalWebSocket signalWebSocket) {
     this.signalWebSocket = signalWebSocket;
   }
 
-  public Single<ServiceResponse<SendMessageResponse>> send(OutgoingPushMessageList list, Optional<UnidentifiedAccess> unidentifiedAccess, boolean story) {
+  public Single<ServiceResponse<SendMessageResponse>> send(OutgoingPushMessageList list,
+                                                           @Nullable SealedSenderAccess sealedSenderAccess,
+                                                           boolean story) {
     List<String> headers = new LinkedList<String>() {{
       add("content-type:application/json");
     }};
@@ -66,15 +69,15 @@ public Single<ServiceResponse<SendMessageResponse>> send(OutgoingPushMessageList
                                                                               .withCustomError(404, (status, body, getHeader) -> new UnregisteredUserException(list.getDestination(), new NotFoundException("not found")))
                                                                               .build();
 
-    return signalWebSocket.request(requestMessage, unidentifiedAccess)
+    return signalWebSocket.request(requestMessage, sealedSenderAccess)
                           .map(responseMapper::map)
                           .onErrorReturn(ServiceResponse::forUnknownError);
   }
 
-  public Single<ServiceResponse<SendGroupMessageResponse>> sendToGroup(byte[] body, byte[] joinedUnidentifiedAccess, long timestamp, boolean online, boolean urgent, boolean story) {
+  public Single<ServiceResponse<SendGroupMessageResponse>> sendToGroup(byte[] body, @Nonnull SealedSenderAccess sealedSenderAccess, long timestamp, boolean online, boolean urgent, boolean story) {
     List<String> headers = new LinkedList<String>() {{
       add("content-type:application/vnd.signal-messenger.mrm");
-      add("Unidentified-Access-Key:" + Base64.encodeWithPadding(joinedUnidentifiedAccess));
+      add(sealedSenderAccess.getHeader());
     }};
 
     String path = String.format(Locale.US, "/v1/messages/multi_recipient?ts=%s&online=%s&urgent=%s&story=%s", timestamp, online, urgent, story);
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java
index 55cdcaced2..64e18d595f 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java
@@ -12,6 +12,7 @@
 import org.signal.libsignal.zkgroup.profiles.ProfileKeyVersion;
 import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
 import org.whispersystems.signalservice.api.SignalWebSocket;
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
 import org.whispersystems.signalservice.api.profiles.ProfileAndCredential;
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
@@ -44,6 +45,7 @@
 import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.Single;
@@ -72,7 +74,7 @@ public ProfileService(ClientZkProfileOperations clientZkProfileOperations,
 
   public Single<ServiceResponse<ProfileAndCredential>> getProfile(@Nonnull SignalServiceAddress address,
                                                                   @Nonnull Optional<ProfileKey> profileKey,
-                                                                  @Nonnull Optional<UnidentifiedAccess> unidentifiedAccess,
+                                                                  @Nullable SealedSenderAccess sealedSenderAccess,
                                                                   @Nonnull SignalServiceProfile.RequestType requestType,
                                                                   @Nonnull Locale locale)
   {
@@ -116,9 +118,9 @@ public Single<ServiceResponse<ProfileAndCredential>> getProfile(@Nonnull SignalS
                                                                                .withResponseMapper(new ProfileResponseMapper(requestType, requestContext))
                                                                                .build();
 
-    return signalWebSocket.request(requestMessage, unidentifiedAccess)
+    return signalWebSocket.request(requestMessage, sealedSenderAccess)
                           .map(responseMapper::map)
-                          .onErrorResumeNext(t -> getProfileRestFallback(address, profileKey, unidentifiedAccess, requestType, locale))
+                          .onErrorResumeNext(t -> getProfileRestFallback(address, profileKey, sealedSenderAccess, requestType, locale))
                           .onErrorReturn(ServiceResponse::forUnknownError);
   }
 
@@ -139,19 +141,19 @@ public Single<ServiceResponse<ProfileAndCredential>> getProfile(@Nonnull SignalS
 
     ResponseMapper<IdentityCheckResponse> responseMapper = DefaultResponseMapper.getDefault(IdentityCheckResponse.class);
 
-    return signalWebSocket.request(builder.build(), Optional.empty())
+    return signalWebSocket.request(builder.build(), SealedSenderAccess.NONE)
                           .map(responseMapper::map)
-                          .onErrorResumeNext(t -> performIdentityCheckRestFallback(request, Optional.empty(), responseMapper))
+                          .onErrorResumeNext(t -> performIdentityCheckRestFallback(request, responseMapper))
                           .onErrorReturn(ServiceResponse::forUnknownError);
   }
 
   private Single<ServiceResponse<ProfileAndCredential>> getProfileRestFallback(@Nonnull SignalServiceAddress address,
                                                                                @Nonnull Optional<ProfileKey> profileKey,
-                                                                               @Nonnull Optional<UnidentifiedAccess> unidentifiedAccess,
+                                                                               @Nullable SealedSenderAccess sealedSenderAccess,
                                                                                @Nonnull SignalServiceProfile.RequestType requestType,
                                                                                @Nonnull Locale locale)
   {
-    return Single.fromFuture(receiver.retrieveProfile(address, profileKey, unidentifiedAccess, requestType, locale), 10, TimeUnit.SECONDS)
+    return Single.fromFuture(receiver.retrieveProfile(address, profileKey, sealedSenderAccess, requestType, locale), 10, TimeUnit.SECONDS)
                  .onErrorResumeNext(t -> {
                    Throwable error;
                    if (t instanceof ExecutionException && t.getCause() != null) {
@@ -161,7 +163,7 @@ private Single<ServiceResponse<ProfileAndCredential>> getProfileRestFallback(@No
                    }
 
                    if (error instanceof AuthorizationFailedException) {
-                     return Single.fromFuture(receiver.retrieveProfile(address, profileKey, Optional.empty(), requestType, locale), 10, TimeUnit.SECONDS);
+                     return Single.fromFuture(receiver.retrieveProfile(address, profileKey, null, requestType, locale), 10, TimeUnit.SECONDS);
                    } else {
                      return Single.error(t);
                    }
@@ -170,9 +172,8 @@ private Single<ServiceResponse<ProfileAndCredential>> getProfileRestFallback(@No
   }
 
   private @NonNull Single<ServiceResponse<IdentityCheckResponse>> performIdentityCheckRestFallback(@Nonnull IdentityCheckRequest request,
-                                                                                                   @Nonnull Optional<UnidentifiedAccess> unidentifiedAccess,
                                                                                                    @Nonnull ResponseMapper<IdentityCheckResponse> responseMapper) {
-    return receiver.performIdentityCheck(request, unidentifiedAccess, responseMapper)
+    return receiver.performIdentityCheck(request, responseMapper)
                    .onErrorResumeNext(t -> {
                      Throwable error;
                      if (t instanceof ExecutionException && t.getCause() != null) {
@@ -182,7 +183,7 @@ private Single<ServiceResponse<ProfileAndCredential>> getProfileRestFallback(@No
                      }
 
                      if (error instanceof AuthorizationFailedException) {
-                       return receiver.performIdentityCheck(request, Optional.empty(), responseMapper);
+                       return receiver.performIdentityCheck(request, responseMapper);
                      } else {
                        return Single.error(t);
                      }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriberId.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriberId.java
index 856fbcf7de..b6d75f0d41 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriberId.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriberId.java
@@ -4,6 +4,7 @@
 import org.signal.core.util.Base64;
 import org.whispersystems.signalservice.api.util.Preconditions;
 
+import java.io.IOException;
 import java.security.SecureRandom;
 import java.util.Arrays;
 
@@ -30,6 +31,12 @@ public byte[] getBytes() {
     return Base64.encodeUrlSafeWithPadding(bytes);
   }
 
+  public static @NonNull SubscriberId deserialize(@NonNull String serialized) throws IOException {
+    byte[] bytes = Base64.decode(serialized);
+
+    return fromBytes(bytes);
+  }
+
   public static SubscriberId fromBytes(byte[] bytes) {
     Preconditions.checkArgument(bytes.length == SIZE);
     return new SubscriberId(bytes);
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecovery.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecovery.kt
index 4235655cc4..2386cc2191 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecovery.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecovery.kt
@@ -11,6 +11,12 @@ import java.io.IOException
 import kotlin.jvm.Throws
 
 interface SecureValueRecovery {
+
+  /**
+   * Which version of SVR this is running against.
+   */
+  val svrVersion: SvrVersion
+
   /**
    * Begins a PIN change.
    *
@@ -38,12 +44,14 @@ interface SecureValueRecovery {
    * Currently, this will only happen during a reglock challenge. When in this state, the user is not registered, and will instead
    * be provided credentials in a service response to give the user an opportunity to restore SVR data and generate the reglock proof.
    *
-   * If the user is already registered, use [restoreDataPostRegistration]
+   * If the user is already registered, use [restoreDataPostRegistration].
+   *
+   * @param shareSet Only used for SVR3, where the value is required. For SVR2, this should be null.
    */
-  fun restoreDataPreRegistration(authorization: AuthCredentials, userPin: String): RestoreResponse
+  fun restoreDataPreRegistration(authorization: AuthCredentials, shareSet: ByteArray?, userPin: String): RestoreResponse
 
   /**
-   * Restores data from SVR. Only intended to be called if the user is already registered. If the user is not yet registered, use [restoreDataPreRegistration]
+   * Restores data from SVR. Only intended to be called if the user is already registered. If the user is not yet registered, use [restoreDataPreRegistration].
    */
   fun restoreDataPostRegistration(userPin: String): RestoreResponse
 
@@ -66,7 +74,7 @@ interface SecureValueRecovery {
   /** Response for setting a PIN. */
   sealed class BackupResponse {
     /** Operation completed successfully. */
-    data class Success(val masterKey: MasterKey, val authorization: AuthCredentials) : BackupResponse()
+    data class Success(val masterKey: MasterKey, val authorization: AuthCredentials, val svrVersion: SvrVersion) : BackupResponse()
 
     /** The operation failed because the server was unable to expose the backup data we created. There is no further action that can be taken besides logging the error and treating it as a success. */
     object ExposeFailure : BackupResponse()
@@ -122,4 +130,9 @@ interface SecureValueRecovery {
 
   /** Exception indicating that we received a response from the service that our request was invalid. */
   class InvalidRequestException(message: String) : Exception(message)
+
+  enum class SvrVersion {
+    SVR2,
+    SVR3
+  }
 }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV2.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV2.kt
index 011dfd47a0..2aacf44bf7 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV2.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV2.kt
@@ -20,13 +20,13 @@ import org.whispersystems.signalservice.api.svr.SecureValueRecovery.DeleteRespon
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery.InvalidRequestException
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery.PinChangeSession
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery.RestoreResponse
+import org.whispersystems.signalservice.api.svr.SecureValueRecovery.SvrVersion
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration
 import org.whispersystems.signalservice.internal.push.AuthCredentials
 import org.whispersystems.signalservice.internal.push.PushServiceSocket
 import org.whispersystems.signalservice.internal.util.Hex
 import org.whispersystems.signalservice.internal.util.JsonUtil
 import java.io.IOException
-import kotlin.jvm.Throws
 import org.signal.svr2.proto.BackupResponse as ProtoBackupResponse
 import org.signal.svr2.proto.ExposeResponse as ProtoExposeResponse
 import org.signal.svr2.proto.RestoreResponse as ProtoRestoreResponse
@@ -44,6 +44,8 @@ class SecureValueRecoveryV2(
     private val TAG = SecureValueRecoveryV2::class.java.simpleName
   }
 
+  override val svrVersion: SvrVersion = SvrVersion.SVR2
+
   override fun setPin(userPin: String, masterKey: MasterKey): PinChangeSession {
     return Svr2PinChangeSession(userPin, masterKey)
   }
@@ -58,7 +60,7 @@ class SecureValueRecoveryV2(
     }
   }
 
-  override fun restoreDataPreRegistration(authorization: AuthCredentials, userPin: String): RestoreResponse {
+  override fun restoreDataPreRegistration(authorization: AuthCredentials, shareSet: ByteArray?, userPin: String): RestoreResponse {
     return restoreData({ authorization }, userPin)
   }
 
@@ -90,7 +92,7 @@ class SecureValueRecoveryV2(
 
   @Throws(IOException::class)
   override fun authorization(): AuthCredentials {
-    return pushServiceSocket.svrAuthorization
+    return pushServiceSocket.svr2Authorization
   }
 
   override fun toString(): String {
@@ -250,7 +252,7 @@ class SecureValueRecoveryV2(
         .let { response ->
           when (response.expose?.status) {
             ProtoExposeResponse.Status.OK -> {
-              BackupResponse.Success(masterKey, authorization)
+              BackupResponse.Success(masterKey, authorization, SvrVersion.SVR2)
             }
             ProtoExposeResponse.Status.ERROR -> {
               BackupResponse.ExposeFailure
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV3.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV3.kt
index 78b12d4ed9..e10885251c 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV3.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV3.kt
@@ -5,6 +5,9 @@
 
 package org.whispersystems.signalservice.api.svr
 
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize
+import com.fasterxml.jackson.databind.annotation.JsonSerialize
 import org.signal.core.util.logging.Log
 import org.signal.libsignal.attest.AttestationFailedException
 import org.signal.libsignal.net.EnclaveAuth
@@ -20,8 +23,12 @@ import org.whispersystems.signalservice.api.svr.SecureValueRecovery.BackupRespon
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery.DeleteResponse
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery.PinChangeSession
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery.RestoreResponse
+import org.whispersystems.signalservice.api.svr.SecureValueRecovery.SvrVersion
 import org.whispersystems.signalservice.internal.push.AuthCredentials
+import org.whispersystems.signalservice.internal.push.ByteArrayDeserializerBase64
+import org.whispersystems.signalservice.internal.push.ByteArraySerializerBase64NoPadding
 import org.whispersystems.signalservice.internal.push.PushServiceSocket
+import org.whispersystems.signalservice.internal.util.JsonUtil
 import java.io.IOException
 import java.util.concurrent.CancellationException
 import java.util.concurrent.ExecutionException
@@ -31,54 +38,39 @@ import java.util.concurrent.ExecutionException
  */
 class SecureValueRecoveryV3(
   private val network: Network,
-  private val pushServiceSocket: PushServiceSocket,
-  private val shareSetStorage: ShareSetStorage
+  private val pushServiceSocket: PushServiceSocket
 ) : SecureValueRecovery {
 
   companion object {
     val TAG = Log.tag(SecureValueRecoveryV3::class)
   }
 
+  override val svrVersion: SvrVersion = SvrVersion.SVR3
+
   override fun setPin(userPin: String, masterKey: MasterKey): PinChangeSession {
-    return Svr3PinChangeSession(userPin, masterKey)
+    return Svr3PinChangeSession(userPin, masterKey, null)
   }
 
   /**
    * Note: Unlike SVR2, there is no concept of "resuming", so this is equivalent to starting a new session.
    */
   override fun resumePinChangeSession(userPin: String, masterKey: MasterKey, serializedChangeSession: String): PinChangeSession {
-    return Svr3PinChangeSession(userPin, masterKey)
-  }
-
-  override fun restoreDataPreRegistration(authorization: AuthCredentials, userPin: String): RestoreResponse {
-    val normalizedPin: String = PinHashUtil.normalizeToString(userPin)
-    val shareSet = shareSetStorage.read() ?: return RestoreResponse.ApplicationError(IllegalStateException("No share set found!"))
-    val enclaveAuth = EnclaveAuth(authorization.username(), authorization.password())
+    val data: Svr3SessionData = JsonUtil.fromJson(serializedChangeSession, Svr3SessionData::class.java)
 
-    return try {
-      val result = network.svr3().restore(normalizedPin, shareSet, enclaveAuth).get()
-      val masterKey = MasterKey(result)
-      RestoreResponse.Success(masterKey, authorization)
-    } catch (e: ExecutionException) {
-      when (val cause = e.cause) {
-        is NetworkException -> RestoreResponse.NetworkError(IOException(cause)) // TODO [svr3] Update when we get to IOException
-        is DataMissingException -> RestoreResponse.Missing
-        is RestoreFailedException -> RestoreResponse.PinMismatch(1) // TODO [svr3] Get proper API for this
-        is AttestationFailedException -> RestoreResponse.ApplicationError(cause)
-        is SgxCommunicationFailureException -> RestoreResponse.ApplicationError(cause)
-        is IOException -> RestoreResponse.NetworkError(cause)
-        else -> RestoreResponse.ApplicationError(cause ?: RuntimeException("Unknown!"))
-      }
-    } catch (e: InterruptedException) {
-      return RestoreResponse.ApplicationError(e)
-    } catch (e: CancellationException) {
-      return RestoreResponse.ApplicationError(e)
+    return if (data.userPin == userPin && data.masterKey == masterKey) {
+      Svr3PinChangeSession(userPin, masterKey, data.shareSet)
+    } else {
+      Svr3PinChangeSession(userPin, masterKey, null)
     }
   }
 
+  override fun restoreDataPreRegistration(authorization: AuthCredentials, shareSet: ByteArray?, userPin: String): RestoreResponse {
+    return restoreData(authorization, shareSet, userPin)
+  }
+
   override fun restoreDataPostRegistration(userPin: String): RestoreResponse {
-    val authorization: AuthCredentials = try {
-      pushServiceSocket.svrAuthorization
+    val authorization: Svr3Credentials = try {
+      pushServiceSocket.svr3Authorization
     } catch (e: NonSuccessfulResponseCodeException) {
       return RestoreResponse.ApplicationError(e)
     } catch (e: IOException) {
@@ -87,29 +79,98 @@ class SecureValueRecoveryV3(
       return RestoreResponse.ApplicationError(e)
     }
 
-    return restoreDataPreRegistration(authorization, userPin)
+    return restoreData(authorization.toAuthCredential(), authorization.shareSet, userPin)
   }
 
   /**
    * There's no concept of "deleting" data with SVR3.
    */
   override fun deleteData(): DeleteResponse {
-    return DeleteResponse.Success
+    val authorization: Svr3Credentials = try {
+      pushServiceSocket.svr3Authorization
+    } catch (e: NonSuccessfulResponseCodeException) {
+      return DeleteResponse.ApplicationError(e)
+    } catch (e: IOException) {
+      return DeleteResponse.NetworkError(e)
+    } catch (e: Exception) {
+      return DeleteResponse.ApplicationError(e)
+    }
+
+    val enclaveAuth = EnclaveAuth(authorization.username, authorization.password)
+
+    return try {
+      network.svr3().remove(enclaveAuth).get()
+      DeleteResponse.Success
+    } catch (e: ExecutionException) {
+      when (val cause = e.cause) {
+        is NetworkException -> DeleteResponse.NetworkError(cause)
+        is AttestationFailedException -> DeleteResponse.ApplicationError(cause)
+        is SgxCommunicationFailureException -> DeleteResponse.ApplicationError(cause)
+        is IOException -> DeleteResponse.NetworkError(cause)
+        else -> DeleteResponse.ApplicationError(cause ?: RuntimeException("Unknown!"))
+      }
+    } catch (e: InterruptedException) {
+      DeleteResponse.ApplicationError(e)
+    } catch (e: CancellationException) {
+      DeleteResponse.ApplicationError(e)
+    }
   }
 
   @Throws(IOException::class)
   override fun authorization(): AuthCredentials {
-    return pushServiceSocket.svrAuthorization
+    return pushServiceSocket.svr3Authorization.toAuthCredential()
+  }
+
+  override fun toString(): String {
+    return "SVR3"
+  }
+
+  private fun restoreData(authorization: AuthCredentials, shareSet: ByteArray?, userPin: String): RestoreResponse {
+    if (shareSet == null) {
+      Log.w(TAG, "No share set provided! Assuming no data to restore.")
+      return RestoreResponse.Missing
+    }
+
+    val normalizedPin: String = PinHashUtil.normalizeToString(userPin)
+    val enclaveAuth = EnclaveAuth(authorization.username(), authorization.password())
+
+    return try {
+      val result = network.svr3().restore(normalizedPin, shareSet, enclaveAuth).get()
+      val masterKey = MasterKey(result.value)
+      RestoreResponse.Success(masterKey, authorization)
+    } catch (e: ExecutionException) {
+      when (val cause = e.cause) {
+        is NetworkException -> RestoreResponse.NetworkError(cause)
+        is DataMissingException -> RestoreResponse.Missing
+        is RestoreFailedException -> RestoreResponse.PinMismatch(cause.triesRemaining)
+        is AttestationFailedException -> RestoreResponse.ApplicationError(cause)
+        is SgxCommunicationFailureException -> RestoreResponse.ApplicationError(cause)
+        is IOException -> RestoreResponse.NetworkError(cause)
+        else -> RestoreResponse.ApplicationError(cause ?: RuntimeException("Unknown!"))
+      }
+    } catch (e: InterruptedException) {
+      return RestoreResponse.ApplicationError(e)
+    } catch (e: CancellationException) {
+      return RestoreResponse.ApplicationError(e)
+    }
+  }
+
+  private fun Svr3Credentials.toAuthCredential(): AuthCredentials {
+    return AuthCredentials.create(username, password)
   }
 
   inner class Svr3PinChangeSession(
     private val userPin: String,
-    private val masterKey: MasterKey
+    private val masterKey: MasterKey,
+    private var shareSet: ByteArray?
   ) : PinChangeSession {
+
+    /**
+     * Performs the PIN change operation. This is safe to call repeatedly if you get back a retryable error.
+     */
     override fun execute(): BackupResponse {
-      val normalizedPin: String = PinHashUtil.normalizeToString(userPin)
-      val rawAuth = try {
-        pushServiceSocket.svrAuthorization
+      val rawAuth: Svr3Credentials = try {
+        pushServiceSocket.svr3Authorization
       } catch (e: NonSuccessfulResponseCodeException) {
         return BackupResponse.ApplicationError(e)
       } catch (e: IOException) {
@@ -118,38 +179,56 @@ class SecureValueRecoveryV3(
         return BackupResponse.ApplicationError(e)
       }
 
-      val enclaveAuth = EnclaveAuth(rawAuth.username(), rawAuth.password())
+      if (shareSet == null) {
+        val normalizedPin: String = PinHashUtil.normalizeToString(userPin)
+        val enclaveAuth = EnclaveAuth(rawAuth.username, rawAuth.password)
+
+        try {
+          shareSet = network.svr3().backup(masterKey.serialize(), normalizedPin, 10, enclaveAuth).get()
+        } catch (e: ExecutionException) {
+          when (val cause = e.cause) {
+            is NetworkException -> BackupResponse.NetworkError(cause)
+            is AttestationFailedException -> BackupResponse.ApplicationError(cause)
+            is SgxCommunicationFailureException -> BackupResponse.ApplicationError(cause)
+            is IOException -> BackupResponse.NetworkError(cause)
+            else -> BackupResponse.ApplicationError(cause ?: RuntimeException("Unknown!"))
+          }
+        } catch (e: InterruptedException) {
+          BackupResponse.ApplicationError(e)
+        } catch (e: CancellationException) {
+          BackupResponse.ApplicationError(e)
+        }
+      }
 
       return try {
-        val result = network.svr3().backup(masterKey.serialize(), normalizedPin, 10, enclaveAuth).get()
-        shareSetStorage.write(result)
-        BackupResponse.Success(masterKey, rawAuth)
-      } catch (e: ExecutionException) {
-        when (val cause = e.cause) {
-          is NetworkException -> BackupResponse.NetworkError(IOException(cause)) // TODO [svr] Update when we move to IOException
-          is AttestationFailedException -> BackupResponse.ApplicationError(cause)
-          is SgxCommunicationFailureException -> BackupResponse.ApplicationError(cause)
-          is IOException -> BackupResponse.NetworkError(cause)
-          else -> BackupResponse.ApplicationError(cause ?: RuntimeException("Unknown!"))
-        }
-      } catch (e: InterruptedException) {
-        BackupResponse.ApplicationError(e)
-      } catch (e: CancellationException) {
+        pushServiceSocket.setShareSet(shareSet)
+        BackupResponse.Success(masterKey, pushServiceSocket.svr3Authorization.toAuthCredential(), SvrVersion.SVR3)
+      } catch (e: NonSuccessfulResponseCodeException) {
         BackupResponse.ApplicationError(e)
+      } catch (e: IOException) {
+        BackupResponse.NetworkError(e)
+      } catch (e: Exception) {
+        return BackupResponse.ApplicationError(e)
       }
     }
 
     override fun serialize(): String {
-      // There is no "resuming" SVR3, so we don't need to serialize anything
-      return ""
+      return JsonUtil.toJson(Svr3SessionData(userPin, masterKey, shareSet))
     }
   }
 
-  /**
-   * An interface to allow reading and writing the "share set" to persistent storage.
-   */
-  interface ShareSetStorage {
-    fun write(data: ByteArray)
-    fun read(): ByteArray?
-  }
+  class Svr3SessionData(
+    @JsonProperty
+    val userPin: String,
+
+    @JsonProperty
+    @JsonSerialize(using = JsonUtil.MasterKeySerializer::class)
+    @JsonDeserialize(using = JsonUtil.MasterKeyDeserializer::class)
+    val masterKey: MasterKey,
+
+    @JsonProperty
+    @JsonSerialize(using = ByteArraySerializerBase64NoPadding::class)
+    @JsonDeserialize(using = ByteArrayDeserializerBase64::class)
+    val shareSet: ByteArray?
+  )
 }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SetShareSetRequest.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SetShareSetRequest.kt
new file mode 100644
index 0000000000..b4925ebb79
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SetShareSetRequest.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.signalservice.api.svr
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.databind.annotation.JsonSerialize
+import org.whispersystems.signalservice.internal.push.ByteArraySerializerBase64NoPadding
+
+/**
+ * Request body for setting a share-set on the service.
+ */
+class SetShareSetRequest(
+  @JsonProperty
+  @JsonSerialize(using = ByteArraySerializerBase64NoPadding::class)
+  val shareSet: ByteArray
+)
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/Svr3Credentials.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/Svr3Credentials.kt
new file mode 100644
index 0000000000..4cafdd2be0
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/Svr3Credentials.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.signalservice.api.svr
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize
+import org.whispersystems.signalservice.internal.push.AuthCredentials
+import org.whispersystems.signalservice.internal.push.ByteArrayDeserializerBase64
+
+/**
+ * Response object when fetching SVR3 auth credentials. We also use it elsewhere as a convenient container
+ * for the (username, password, shareset) tuple.
+ */
+class Svr3Credentials(
+  @JsonProperty
+  val username: String,
+
+  @JsonProperty
+  val password: String,
+
+  @JsonProperty
+  @JsonDeserialize(using = ByteArrayDeserializerBase64::class)
+  val shareSet: ByteArray?
+) {
+  val authCredentials: AuthCredentials
+    get() = AuthCredentials.create(username, password)
+}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SvrApi.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SvrApi.kt
new file mode 100644
index 0000000000..20d162144f
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SvrApi.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.signalservice.api.svr
+
+import org.whispersystems.signalservice.api.NetworkResult
+import org.whispersystems.signalservice.internal.push.PushServiceSocket
+
+class SvrApi(private val pushServiceSocket: PushServiceSocket) {
+
+  companion object {
+    @JvmStatic
+    fun create(pushServiceSocket: PushServiceSocket): SvrApi {
+      return SvrApi(pushServiceSocket)
+    }
+  }
+
+  /**
+   * Store the latest share-set on the service. The share-set is a piece of data generated in the course of setting a PIN on SVR3 that needs to be
+   */
+  fun setShareSet(shareSet: ByteArray): NetworkResult<Unit> {
+    return NetworkResult.fromFetch {
+      pushServiceSocket.setShareSet(shareSet)
+    }
+  }
+}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/AttachmentPointerUtil.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/AttachmentPointerUtil.java
index 8ec9b7db75..dd78a4fae8 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/AttachmentPointerUtil.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/AttachmentPointerUtil.java
@@ -35,8 +35,8 @@ public static SignalServiceAttachmentPointer createSignalAttachmentPointer(Attac
                                               ((pointer.flags != null ? pointer.flags : 0) & FlagUtil.toBinaryFlag(AttachmentPointer.Flags.GIF.getValue())) != 0,
                                               pointer.caption != null ? Optional.of(pointer.caption) : Optional.empty(),
                                               pointer.blurHash != null ? Optional.of(pointer.blurHash) : Optional.empty(),
-                                              pointer.uploadTimestamp != null ? pointer.uploadTimestamp : 0);
-
+                                              pointer.uploadTimestamp != null ? pointer.uploadTimestamp : 0,
+                                              UuidUtil.fromByteStringOrNull(pointer.uuid));
   }
 
   public static AttachmentPointer createAttachmentPointer(SignalServiceAttachmentPointer attachment) {
@@ -104,6 +104,10 @@ public static AttachmentPointer createAttachmentPointer(SignalServiceAttachmentP
       builder.blurHash(attachment.getBlurHash().get());
     }
 
+    if (attachment.getUuid() != null) {
+      builder.uuid(UuidUtil.toByteString(attachment.getUuid()));
+    }
+
     return builder.build();
   }
 }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/UuidUtil.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/UuidUtil.java
index cb9333c089..9d2175435b 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/UuidUtil.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/UuidUtil.java
@@ -8,6 +8,9 @@
 import java.util.UUID;
 import java.util.regex.Pattern;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import okio.ByteString;
 
 public final class UuidUtil {
@@ -23,7 +26,7 @@ public static Optional<UUID> parse(String uuid) {
     return Optional.ofNullable(parseOrNull(uuid));
   }
 
-  public static UUID parseOrNull(String uuid) {
+  public static UUID parseOrNull(@Nullable String uuid) {
     return isUuid(uuid) ? parseOrThrow(uuid) : null;
   }
 
@@ -47,7 +50,7 @@ public static boolean isUuid(String uuid) {
     return uuid != null && UUID_PATTERN.matcher(uuid).matches();
   }
 
-  public static byte[] toByteArray(UUID uuid) {
+  public static byte[] toByteArray(@Nonnull UUID uuid) {
     ByteBuffer buffer = ByteBuffer.wrap(new byte[16]);
     buffer.putLong(uuid.getMostSignificantBits());
     buffer.putLong(uuid.getLeastSignificantBits());
@@ -55,7 +58,7 @@ public static byte[] toByteArray(UUID uuid) {
     return buffer.array();
   }
 
-  public static ByteString toByteString(UUID uuid) {
+  public static ByteString toByteString(@Nonnull UUID uuid) {
     return ByteString.of(toByteArray(uuid));
   }
 
@@ -63,7 +66,11 @@ public static UUID fromByteString(ByteString bytes) {
     return parseOrThrow(bytes.toByteArray());
   }
 
-  public static UUID fromByteStringOrNull(ByteString bytes) {
+  public static @Nullable UUID fromByteStringOrNull(@Nullable ByteString bytes) {
+    if (bytes == null) {
+      return null;
+    }
+
     return parseOrNull(bytes.toByteArray());
   }
 
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponse.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponse.java
index 8ea770b4ee..11ab1ee49f 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponse.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponse.java
@@ -84,6 +84,18 @@ public Single<Result> flattenResult() {
     }
   }
 
+  public Result getResultOrThrow() throws Throwable {
+    if (result.isPresent()) {
+      return result.get();
+    } else if (applicationError.isPresent()) {
+      throw applicationError.get();
+    } else  if (executionError.isPresent()) {
+      throw executionError.get();
+    } else {
+      throw new AssertionError("Should never get here");
+    }
+  }
+
   public static <T> ServiceResponse<T> forResult(T result, WebsocketResponse response) {
     return new ServiceResponse<>(result, response);
   }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentUploadForm.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentUploadForm.kt
index 1b87619360..b4efe344bd 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentUploadForm.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentUploadForm.kt
@@ -7,18 +7,18 @@ import com.fasterxml.jackson.annotation.JsonProperty
  */
 data class AttachmentUploadForm(
   @JvmField
-  @JsonProperty("cdn")
+  @JsonProperty
   val cdn: Int,
 
   @JvmField
-  @JsonProperty("key")
+  @JsonProperty
   val key: String,
 
   @JvmField
-  @JsonProperty("headers")
+  @JsonProperty
   val headers: Map<String, String>,
 
   @JvmField
-  @JsonProperty("signedUploadLocation")
+  @JsonProperty
   val signedUploadLocation: String
 )
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupAuthCheckProcessor.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupAuthCheckProcessor.kt
new file mode 100644
index 0000000000..0eba27d6ee
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupAuthCheckProcessor.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.signalservice.internal.push
+
+import org.whispersystems.signalservice.internal.ServiceResponse
+import org.whispersystems.signalservice.internal.ServiceResponseProcessor
+
+/**
+ * Processes a response from the verify stored KBS auth credentials request.
+ */
+class BackupAuthCheckProcessor(response: ServiceResponse<BackupV2AuthCheckResponse>) : ServiceResponseProcessor<BackupV2AuthCheckResponse>(response) {
+  fun getInvalid(): List<String> {
+    return response.result.map { it.invalid }.orElse(emptyList())
+  }
+
+  fun hasValidSvr2AuthCredential(): Boolean {
+    return response.result.map { it.match }.orElse(null) != null
+  }
+
+  fun requireSvr2AuthCredential(): AuthCredentials {
+    return response.result.get().match!!
+  }
+}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupAuthCheckRequest.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupAuthCheckRequest.kt
index f893e3bfd8..52a2d177c6 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupAuthCheckRequest.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupAuthCheckRequest.kt
@@ -1,69 +1,14 @@
 package org.whispersystems.signalservice.internal.push
 
-import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonProperty
-import okio.ByteString.Companion.encode
-import org.whispersystems.signalservice.internal.ServiceResponse
-import org.whispersystems.signalservice.internal.ServiceResponseProcessor
-import java.io.IOException
-import java.nio.charset.StandardCharsets
 
 /**
  * Request body JSON for verifying stored KBS auth credentials.
  */
-@Suppress("unused")
-class BackupAuthCheckRequest @JsonCreator constructor(
-  @JsonProperty("number") val number: String?,
-  @JsonProperty("passwords") val passwords: List<String>
-)
-
-/**
- * Verify KBS auth credentials JSON response.
- */
-data class BackupAuthCheckResponse @JsonCreator constructor(
-  @JsonProperty("matches") private val matches: Map<String, Map<String, Any>>
-) {
-  private val actualMatches = matches["matches"] ?: emptyMap()
-
-  val match: AuthCredentials? = actualMatches.entries.firstOrNull { it.value.toString() == "match" }?.key?.toAuthCredential()
-  val invalid: List<String> = actualMatches.filterValues { it.toString() == "invalid" }.keys.map { it.toBasic() }
-
-  /** Server expects and returns values as <username>:<password> but we prefer the full encoded Basic auth header format */
-  private fun String.toBasic(): String {
-    return "Basic ${encode(StandardCharsets.ISO_8859_1).base64()}"
-  }
-
-  private fun String.toAuthCredential(): AuthCredentials {
-    val firstColonIndex = this.indexOf(":")
-
-    if (firstColonIndex < 0) {
-      throw IOException("Invalid credential returned!")
-    }
+class BackupAuthCheckRequest(
+  @JsonProperty
+  val number: String?,
 
-    val username = this.substring(0, firstColonIndex)
-    val password = this.substring(firstColonIndex + 1)
-
-    return AuthCredentials.create(username, password)
-  }
-
-  fun merge(other: BackupAuthCheckResponse): BackupAuthCheckResponse {
-    return BackupAuthCheckResponse(this.matches + other.matches)
-  }
-}
-
-/**
- * Processes a response from the verify stored KBS auth credentials request.
- */
-class BackupAuthCheckProcessor(response: ServiceResponse<BackupAuthCheckResponse>) : ServiceResponseProcessor<BackupAuthCheckResponse>(response) {
-  fun getInvalid(): List<String> {
-    return response.result.map { it.invalid }.orElse(emptyList())
-  }
-
-  fun hasValidSvr2AuthCredential(): Boolean {
-    return response.result.map { it.match }.orElse(null) != null
-  }
-
-  fun requireSvr2AuthCredential(): AuthCredentials {
-    return response.result.get().match!!
-  }
-}
+  @JsonProperty
+  val passwords: List<String>
+)
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupV2AuthCheckResponse.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupV2AuthCheckResponse.kt
new file mode 100644
index 0000000000..894553725f
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupV2AuthCheckResponse.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.signalservice.internal.push
+
+import com.fasterxml.jackson.annotation.JsonCreator
+import okio.ByteString.Companion.encode
+import java.io.IOException
+import java.nio.charset.StandardCharsets
+
+/**
+ * Verify KBS auth credentials JSON response.
+ */
+data class BackupV2AuthCheckResponse @JsonCreator constructor(
+  private val matches: Map<String, Map<String, Any>>
+) {
+  private val actualMatches = matches["matches"] ?: emptyMap()
+
+  val match: AuthCredentials? = actualMatches.entries.firstOrNull { it.value.toString() == "match" }?.key?.toAuthCredential()
+  val invalid: List<String> = actualMatches.filterValues { it.toString() == "invalid" }.keys.map { it.toBasic() }
+
+  /** Server expects and returns values as <username>:<password> but we prefer the full encoded Basic auth header format */
+  private fun String.toBasic(): String {
+    return "Basic ${encode(StandardCharsets.ISO_8859_1).base64()}"
+  }
+
+  private fun String.toAuthCredential(): AuthCredentials {
+    val firstColonIndex = this.indexOf(":")
+
+    if (firstColonIndex < 0) {
+      throw IOException("Invalid credential returned!")
+    }
+
+    val username = this.substring(0, firstColonIndex)
+    val password = this.substring(firstColonIndex + 1)
+
+    return AuthCredentials.create(username, password)
+  }
+
+  fun merge(other: BackupV2AuthCheckResponse): BackupV2AuthCheckResponse {
+    return BackupV2AuthCheckResponse(this.matches + other.matches)
+  }
+}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupV3AuthCheckResponse.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupV3AuthCheckResponse.kt
new file mode 100644
index 0000000000..1c4e706831
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupV3AuthCheckResponse.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.signalservice.internal.push
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize
+import okio.ByteString.Companion.encode
+import org.whispersystems.signalservice.api.svr.Svr3Credentials
+import java.io.IOException
+import java.nio.charset.StandardCharsets
+
+/**
+ * Response when verifying whether we have valid SVR3 credentials.
+ *
+ * We use a map here because the keys are dynamic. The response looks like this:
+ *
+ * ```json
+ * {
+ *   "matches": {
+ *     "username:password": {
+ *       "status": "match",
+ *       "shareSet": "<base64Data>"
+ *     },
+ *     ...
+ *   }
+ * }
+ */
+class BackupV3AuthCheckResponse(
+  @JsonProperty
+  private val matches: Map<String, MatchData>
+) {
+
+  /** A response that contains a valid SVR3 auth credential if one is present, else null. */
+  val match: Svr3Credentials? = matches.entries.firstOrNull { it.value.isMatch }?.let {
+    val credential = it.key.toAuthCredential()
+    Svr3Credentials(credential.username(), credential.password(), it.value.shareSet)
+  }
+
+  /** A list of credentials that are invalid, in basic-auth format. */
+  val invalid: List<String> = matches.filterValues { it.isInvalid }.keys.map { it.toBasic() }
+
+  private fun String.toAuthCredential(): AuthCredentials {
+    val firstColonIndex = this.indexOf(":")
+
+    if (firstColonIndex < 0) {
+      throw IOException("Invalid credential returned!")
+    }
+
+    val username = this.substring(0, firstColonIndex)
+    val password = this.substring(firstColonIndex + 1)
+
+    return AuthCredentials.create(username, password)
+  }
+
+  /** Server expects and returns values as <username>:<password> but we prefer the full encoded Basic auth header format */
+  private fun String.toBasic(): String {
+    return "Basic ${encode(StandardCharsets.ISO_8859_1).base64()}"
+  }
+
+  class MatchData(
+    @JsonProperty
+    val status: String,
+
+    @JsonProperty
+    @JsonDeserialize(using = ByteArrayDeserializerBase64::class)
+    val shareSet: ByteArray
+  ) {
+    val isMatch = status == "match"
+    val isInvalid = status == "invalid"
+  }
+}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CheckRepeatedUsedPreKeysRequest.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CheckRepeatedUsedPreKeysRequest.kt
index 5aba93fee0..a304069ab9 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CheckRepeatedUsedPreKeysRequest.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CheckRepeatedUsedPreKeysRequest.kt
@@ -12,10 +12,10 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize
  * Request body to check if our prekeys match what's on the service.
  */
 class CheckRepeatedUsedPreKeysRequest(
-  @JsonProperty("identityType")
+  @JsonProperty
   val identityType: String,
 
-  @JsonProperty("digest")
+  @JsonProperty
   @JsonSerialize(using = ByteArraySerializerBase64NoPadding::class)
   val digest: ByteArray
 )
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ConfirmUsernameResponse.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ConfirmUsernameResponse.kt
index 152ebae89d..49a8edd8f0 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ConfirmUsernameResponse.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ConfirmUsernameResponse.kt
@@ -7,10 +7,10 @@ import java.util.UUID
 
 /** Response body for confirming a username reservation. */
 class ConfirmUsernameResponse(
-  @JsonProperty("usernameHash")
+  @JsonProperty
   val usernameHash: String,
 
-  @JsonProperty("usernameLinkHandle")
+  @JsonProperty
   @JsonDeserialize(using = JsonUtil.UuidDeserializer::class)
   val usernameLinkHandle: UUID
 )
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthRequest.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthRequest.kt
index d68d2c1e5e..38f1f9edab 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthRequest.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthRequest.kt
@@ -6,7 +6,6 @@
 package org.whispersystems.signalservice.internal.push
 
 import com.fasterxml.jackson.annotation.JsonCreator
-import com.fasterxml.jackson.annotation.JsonProperty
 import org.signal.core.util.Base64
 import org.signal.libsignal.zkgroup.calllinks.CreateCallLinkCredentialRequest
 
@@ -14,7 +13,7 @@ import org.signal.libsignal.zkgroup.calllinks.CreateCallLinkCredentialRequest
  * Request body to create a call link credential response.
  */
 data class CreateCallLinkAuthRequest @JsonCreator constructor(
-  @JsonProperty("createCallLinkCredentialRequest") val createCallLinkCredentialRequest: String
+  val createCallLinkCredentialRequest: String
 ) {
   companion object {
     @JvmStatic
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthResponse.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthResponse.kt
index 63d1c289ec..eb72d65dcd 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthResponse.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthResponse.kt
@@ -14,8 +14,7 @@ import org.signal.libsignal.zkgroup.calllinks.CreateCallLinkCredentialResponse
  * Response body for CreateCallLinkAuthResponse
  */
 data class CreateCallLinkAuthResponse @JsonCreator constructor(
-  @JsonProperty("credential") val credential: String,
-  @JsonProperty("redemptionTime") val redemptionTime: Long
+  @JsonProperty("credential") val credential: String
 ) {
   val createCallLinkCredentialResponse: CreateCallLinkCredentialResponse
     get() = CreateCallLinkCredentialResponse(Base64.decode(credential))
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GcmRegistrationId.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GcmRegistrationId.kt
index 7cca0e7e4d..f510aa3af5 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GcmRegistrationId.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GcmRegistrationId.kt
@@ -7,6 +7,6 @@ package org.whispersystems.signalservice.internal.push
 import com.fasterxml.jackson.annotation.JsonProperty
 
 data class GcmRegistrationId(
-  @JsonProperty("gcmRegistrationId") val gcmRegistrationId: String,
-  @JsonProperty("webSocketChannel") val webSocketChannel: Boolean
+  @JsonProperty val gcmRegistrationId: String,
+  @JsonProperty val webSocketChannel: Boolean
 )
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetUsernameFromLinkResponseBody.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetUsernameFromLinkResponseBody.kt
index 12efeb02b6..3a20e3533c 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetUsernameFromLinkResponseBody.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetUsernameFromLinkResponseBody.kt
@@ -3,4 +3,4 @@ package org.whispersystems.signalservice.internal.push
 import com.fasterxml.jackson.annotation.JsonProperty
 
 /** Response body for looking up a username by link from the service. */
-data class GetUsernameFromLinkResponseBody(@JsonProperty("usernameLinkEncryptedValue") val usernameLinkEncryptedValue: String)
+data class GetUsernameFromLinkResponseBody(@JsonProperty val usernameLinkEncryptedValue: String)
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/LockedException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/LockedException.java
index eb61e64eb9..53ad86a2c1 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/LockedException.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/LockedException.java
@@ -2,20 +2,21 @@
 
 
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.signalservice.api.svr.Svr3Credentials;
 
 public final class LockedException extends NonSuccessfulResponseCodeException {
 
   private final int             length;
   private final long            timeRemaining;
-  private final AuthCredentials svr1Credentials;
   private final AuthCredentials svr2Credentials;
+  private final Svr3Credentials svr3Credentials;
 
-  public LockedException(int length, long timeRemaining, AuthCredentials svr1Credentials, AuthCredentials svr2Credentials) {
+  public LockedException(int length, long timeRemaining, AuthCredentials svr2Credentials, Svr3Credentials svr3Credentials) {
     super(423);
     this.length          = length;
     this.timeRemaining   = timeRemaining;
-    this.svr1Credentials = svr1Credentials;
     this.svr2Credentials = svr2Credentials;
+    this.svr3Credentials = svr3Credentials;
   }
 
   public int getLength() {
@@ -26,11 +27,11 @@ public long getTimeRemaining() {
     return timeRemaining;
   }
 
-  public AuthCredentials getSvr1Credentials() {
-    return svr1Credentials;
-  }
-
   public AuthCredentials getSvr2Credentials() {
     return svr2Credentials;
   }
+
+  public Svr3Credentials getSvr3Credentials() {
+    return svr3Credentials;
+  }
 }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java
index 1b87a805ca..25c69cac5d 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java
@@ -39,9 +39,12 @@
 import org.signal.storageservice.protos.groups.AvatarUploadAttributes;
 import org.signal.storageservice.protos.groups.Group;
 import org.signal.storageservice.protos.groups.GroupChange;
+import org.signal.storageservice.protos.groups.GroupChangeResponse;
 import org.signal.storageservice.protos.groups.GroupChanges;
 import org.signal.storageservice.protos.groups.GroupExternalCredential;
 import org.signal.storageservice.protos.groups.GroupJoinInfo;
+import org.signal.storageservice.protos.groups.GroupResponse;
+import org.signal.storageservice.protos.groups.Member;
 import org.whispersystems.signalservice.api.account.AccountAttributes;
 import org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest;
 import org.whispersystems.signalservice.api.account.PniKeyDistributionRequest;
@@ -59,7 +62,7 @@
 import org.whispersystems.signalservice.api.archive.BatchArchiveMediaResponse;
 import org.whispersystems.signalservice.api.archive.DeleteArchivedMediaRequest;
 import org.whispersystems.signalservice.api.archive.GetArchiveCdnCredentialsResponse;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess;
 import org.whispersystems.signalservice.api.groupsv2.CredentialResponse;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2AuthorizationString;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment.ProgressListener;
@@ -116,6 +119,8 @@
 import org.whispersystems.signalservice.api.subscriptions.PayPalCreatePaymentIntentResponse;
 import org.whispersystems.signalservice.api.subscriptions.PayPalCreatePaymentMethodResponse;
 import org.whispersystems.signalservice.api.subscriptions.StripeClientSecret;
+import org.whispersystems.signalservice.api.svr.SetShareSetRequest;
+import org.whispersystems.signalservice.api.svr.Svr3Credentials;
 import org.whispersystems.signalservice.api.util.CredentialsProvider;
 import org.whispersystems.signalservice.api.util.Tls12SocketFactory;
 import org.whispersystems.signalservice.internal.ServiceResponse;
@@ -168,6 +173,8 @@
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -270,12 +277,13 @@ public class PushServiceSocket {
   private static final String STICKER_PATH                   = "stickers/%s/full/%d";
 
   private static final String GROUPSV2_CREDENTIAL       = "/v1/certificate/auth/group?redemptionStartSeconds=%d&redemptionEndSeconds=%d&zkcCredential=true";
-  private static final String GROUPSV2_GROUP            = "/v1/groups/";
-  private static final String GROUPSV2_GROUP_PASSWORD   = "/v1/groups/?inviteLinkPassword=%s";
-  private static final String GROUPSV2_GROUP_CHANGES    = "/v1/groups/logs/%s?maxSupportedChangeEpoch=%d&includeFirstState=%s&includeLastState=false";
-  private static final String GROUPSV2_AVATAR_REQUEST   = "/v1/groups/avatar/form";
-  private static final String GROUPSV2_GROUP_JOIN       = "/v1/groups/join/%s";
-  private static final String GROUPSV2_TOKEN            = "/v1/groups/token";
+  private static final String GROUPSV2_GROUP            = "/v2/groups/";
+  private static final String GROUPSV2_GROUP_PASSWORD   = "/v2/groups/?inviteLinkPassword=%s";
+  private static final String GROUPSV2_GROUP_CHANGES    = "/v2/groups/logs/%s?maxSupportedChangeEpoch=%d&includeFirstState=%s&includeLastState=false";
+  private static final String GROUPSV2_AVATAR_REQUEST   = "/v2/groups/avatar/form";
+  private static final String GROUPSV2_GROUP_JOIN       = "/v2/groups/join/%s";
+  private static final String GROUPSV2_TOKEN            = "/v2/groups/token";
+  private static final String GROUPSV2_JOINED_AT        = "/v2/groups/joined_at_version";
 
   private static final String PAYMENTS_CONVERSIONS      = "/v1/payments/conversions";
 
@@ -284,6 +292,7 @@ public class PushServiceSocket {
   private static final String REQUEST_RATE_LIMIT_PUSH_CHALLENGE = "/v1/challenge/push";
 
   private static final String DONATION_REDEEM_RECEIPT = "/v1/donation/redeem-receipt";
+  private static final String ARCHIVES_REDEEM_RECEIPT = "/v1/archives/redeem-receipt";
 
   private static final String UPDATE_SUBSCRIPTION_LEVEL                  = "/v1/subscription/%s/level/%s/%s/%s";
   private static final String SUBSCRIPTION                               = "/v1/subscription/%s";
@@ -306,11 +315,13 @@ public class PushServiceSocket {
   private static final String REGISTRATION_PATH    = "/v1/registration";
 
   private static final String CDSI_AUTH = "/v2/directory/auth";
-  private static final String SVR_AUTH  = "/v2/backup/auth";
+  private static final String SVR2_AUTH = "/v2/backup/auth";
+  private static final String SVR3_AUTH = "/v3/backup/auth";
 
   private static final String REPORT_SPAM = "/v1/messages/report/%s/%s";
 
-  private static final String BACKUP_AUTH_CHECK = "/v2/backup/auth/check";
+  private static final String BACKUP_AUTH_CHECK_V2 = "/v2/backup/auth/check";
+  private static final String BACKUP_AUTH_CHECK_V3 = "/v3/backup/auth/check";
 
   private static final String ARCHIVE_CREDENTIALS         = "/v1/archives/auth?redemptionStartSeconds=%d&redemptionEndSeconds=%d";
   private static final String ARCHIVE_READ_CREDENTIALS    = "/v1/archives/auth/read?cdn=%d";
@@ -325,6 +336,8 @@ public class PushServiceSocket {
   private static final String ARCHIVE_MEDIA_DELETE        = "/v1/archives/media/delete";
   private static final String ARCHIVE_MEDIA_DOWNLOAD_PATH = "backups/%s/%s/%s";
 
+  private static final String SET_SHARE_SET_PATH = "/v3/backup/share-set";
+
   private static final String CALL_LINK_CREATION_AUTH = "/v1/call-link/create-auth";
   private static final String SERVER_DELIVERED_TIMESTAMP_HEADER = "X-Signal-Timestamp";
 
@@ -367,7 +380,7 @@ public PushServiceSocket(SignalServiceConfiguration configuration,
 
   public RegistrationSessionMetadataResponse createVerificationSession(@Nullable String pushToken, @Nullable String mcc, @Nullable String mnc) throws IOException {
     final String jsonBody = JsonUtil.toJson(new VerificationSessionMetadataRequestBody(credentialsProvider.getE164(), pushToken, mcc, mnc));
-    try (Response response = makeServiceRequest(VERIFICATION_SESSION_PATH, "POST", jsonRequestBody(jsonBody), NO_HEADERS, new RegistrationSessionResponseHandler(), Optional.empty(), false)) {
+    try (Response response = makeServiceRequest(VERIFICATION_SESSION_PATH, "POST", jsonRequestBody(jsonBody), NO_HEADERS, new RegistrationSessionResponseHandler(), SealedSenderAccess.NONE, false)) {
       return parseSessionMetadataResponse(response);
     }
   }
@@ -375,7 +388,7 @@ public RegistrationSessionMetadataResponse createVerificationSession(@Nullable S
   public RegistrationSessionMetadataResponse getSessionStatus(String sessionId) throws IOException {
     String path = VERIFICATION_SESSION_PATH + "/" + sessionId;
 
-    try (Response response = makeServiceRequest(path, "GET", jsonRequestBody(null), NO_HEADERS, new RegistrationSessionResponseHandler(), Optional.empty(), false)) {
+    try (Response response = makeServiceRequest(path, "GET", jsonRequestBody(null), NO_HEADERS, new RegistrationSessionResponseHandler(), SealedSenderAccess.NONE, false)) {
       return parseSessionMetadataResponse(response);
     }
   }
@@ -384,7 +397,7 @@ public RegistrationSessionMetadataResponse patchVerificationSession(String sessi
     String path = VERIFICATION_SESSION_PATH + "/" + sessionId;
 
     final UpdateVerificationSessionRequestBody requestBody = new UpdateVerificationSessionRequestBody(captchaToken, pushToken, pushChallengeToken, mcc, mnc);
-    try (Response response = makeServiceRequest(path, "PATCH", jsonRequestBody(JsonUtil.toJson(requestBody)), NO_HEADERS, new PatchRegistrationSessionResponseHandler(), Optional.empty(), false)) {
+    try (Response response = makeServiceRequest(path, "PATCH", jsonRequestBody(JsonUtil.toJson(requestBody)), NO_HEADERS, new PatchRegistrationSessionResponseHandler(), SealedSenderAccess.NONE, false)) {
       return parseSessionMetadataResponse(response);
     }
   }
@@ -405,7 +418,7 @@ public RegistrationSessionMetadataResponse requestVerificationCode(String sessio
 
     body.put("client", androidSmsRetriever ? "android-2021-03" : "android");
 
-    try (Response response = makeServiceRequest(path, "POST", jsonRequestBody(JsonUtil.toJson(body)), headers, new RegistrationCodeRequestResponseHandler(), Optional.empty(), false)) {
+    try (Response response = makeServiceRequest(path, "POST", jsonRequestBody(JsonUtil.toJson(body)), headers, new RegistrationCodeRequestResponseHandler(), SealedSenderAccess.NONE, false)) {
       return parseSessionMetadataResponse(response);
     }
   }
@@ -414,7 +427,7 @@ public RegistrationSessionMetadataResponse submitVerificationCode(String session
     String path = String.format(VERIFICATION_CODE_PATH, sessionId);
     Map<String, String> body =  new HashMap<>();
     body.put("code", verificationCode);
-    try (Response response = makeServiceRequest(path, "PUT", jsonRequestBody(JsonUtil.toJson(body)), NO_HEADERS, new RegistrationCodeSubmissionResponseHandler(), Optional.empty(), false)) {
+    try (Response response = makeServiceRequest(path, "PUT", jsonRequestBody(JsonUtil.toJson(body)), NO_HEADERS, new RegistrationCodeSubmissionResponseHandler(), SealedSenderAccess.NONE, false)) {
       return parseSessionMetadataResponse(response);
     }
   }
@@ -461,7 +474,7 @@ public VerifyAccountResponse submitRegistrationRequest(@Nullable String sessionI
                                                                              skipDeviceTransfer,
                                                                              true);
 
-    String response = makeServiceRequest(path, "POST", JsonUtil.toJson(body), NO_HEADERS, new RegistrationSessionResponseHandler(), Optional.empty());
+    String response = makeServiceRequest(path, "POST", JsonUtil.toJson(body), NO_HEADERS, new RegistrationSessionResponseHandler(), SealedSenderAccess.NONE);
     return JsonUtil.fromJson(response, VerifyAccountResponse.class);
   }
 
@@ -487,25 +500,30 @@ public CdsiAuthResponse getCdsiAuth() throws IOException {
     return JsonUtil.fromJsonResponse(body, CdsiAuthResponse.class);
   }
 
-  public AuthCredentials getSvrAuthorization() throws IOException {
-    String          body        = makeServiceRequest(SVR_AUTH, "GET", null);
+  public AuthCredentials getSvr2Authorization() throws IOException {
+    String          body        = makeServiceRequest(SVR2_AUTH, "GET", null);
     AuthCredentials credentials = JsonUtil.fromJsonResponse(body, AuthCredentials.class);
 
     return credentials;
   }
 
+  public Svr3Credentials getSvr3Authorization() throws IOException {
+    String body = makeServiceRequest(SVR3_AUTH, "GET", null);
+    return JsonUtil.fromJsonResponse(body, Svr3Credentials.class);
+  }
+
   public ArchiveServiceCredentialsResponse getArchiveCredentials(long currentTime) throws IOException {
     long secondsRoundedToNearestDay = TimeUnit.DAYS.toSeconds(TimeUnit.MILLISECONDS.toDays(currentTime));
     long endTimeInSeconds           = secondsRoundedToNearestDay + TimeUnit.DAYS.toSeconds(7);
 
-    String response = makeServiceRequest(String.format(Locale.US, ARCHIVE_CREDENTIALS, secondsRoundedToNearestDay, endTimeInSeconds), "GET", null, NO_HEADERS, UNOPINIONATED_HANDLER, Optional.empty());
+    String response = makeServiceRequest(String.format(Locale.US, ARCHIVE_CREDENTIALS, secondsRoundedToNearestDay, endTimeInSeconds), "GET", null, NO_HEADERS, UNOPINIONATED_HANDLER, SealedSenderAccess.NONE);
 
     return JsonUtil.fromJson(response, ArchiveServiceCredentialsResponse.class);
   }
 
   public void setArchiveBackupId(BackupAuthCredentialRequest request) throws IOException {
     String body = JsonUtil.toJson(new ArchiveSetBackupIdRequest(request));
-    makeServiceRequest(ARCHIVE_BACKUP_ID, "PUT", body, NO_HEADERS, UNOPINIONATED_HANDLER, Optional.empty());
+    makeServiceRequest(ARCHIVE_BACKUP_ID, "PUT", body, NO_HEADERS, UNOPINIONATED_HANDLER, SealedSenderAccess.NONE);
   }
 
   public void setArchivePublicKey(ECPublicKey publicKey, ArchiveCredentialPresentation credentialPresentation) throws IOException {
@@ -609,6 +627,11 @@ public GetArchiveCdnCredentialsResponse getArchiveCdnReadCredentials(int cdnNumb
     return JsonUtil.fromJson(response, GetArchiveCdnCredentialsResponse.class);
   }
 
+  public void setShareSet(byte[] shareSet) throws IOException {
+    SetShareSetRequest request = new SetShareSetRequest(shareSet);
+    makeServiceRequest(SET_SHARE_SET_PATH, "PUT", JsonUtil.toJson(request));
+  }
+
   public VerifyAccountResponse changeNumber(@Nonnull ChangePhoneNumberRequest changePhoneNumberRequest)
       throws IOException
   {
@@ -663,7 +686,7 @@ public int finishNewDeviceRegistration(String provisioningCode,
         gcmRegistrationId
     );
     String   json         = JsonUtil.toJson(linkDeviceRequest);
-    String   responseText = makeServiceRequest(DEVICE_LINK_PATH, "PUT", json, NO_HEADERS, NEW_DEVICE_PUT_RESPONSE_HANDLER, Optional.empty());
+    String   responseText = makeServiceRequest(DEVICE_LINK_PATH, "PUT", json, NO_HEADERS, NEW_DEVICE_PUT_RESPONSE_HANDLER, SealedSenderAccess.NONE);
     DeviceId response     = JsonUtil.fromJson(responseText, DeviceId.class);
     return response.getDeviceId();
   }
@@ -728,7 +751,7 @@ public byte[] getUuidOnlySenderCertificate() throws IOException {
     return JsonUtil.fromJson(responseText, SenderCertificate.class).getCertificate();
   }
 
-  public SendGroupMessageResponse sendGroupMessage(byte[] body, byte[] joinedUnidentifiedAccess, long timestamp, boolean online, boolean urgent, boolean story)
+  public SendGroupMessageResponse sendGroupMessage(byte[] body, @Nonnull SealedSenderAccess sealedSenderAccess, long timestamp, boolean online, boolean urgent, boolean story)
       throws NonSuccessfulResponseCodeException, PushNetworkException, MalformedResponseException
   {
     ServiceConnectionHolder connectionHolder = (ServiceConnectionHolder) getRandom(serviceClients, random);
@@ -738,7 +761,7 @@ public SendGroupMessageResponse sendGroupMessage(byte[] body, byte[] joinedUnide
     Request.Builder requestBuilder = new Request.Builder();
     requestBuilder.url(String.format("%s%s", connectionHolder.getUrl(), path));
     requestBuilder.put(RequestBody.create(MediaType.get("application/vnd.signal-messenger.mrm"), body));
-    requestBuilder.addHeader("Unidentified-Access-Key", Base64.encodeWithPadding(joinedUnidentifiedAccess));
+    requestBuilder.addHeader(sealedSenderAccess.getHeaderName(), sealedSenderAccess.getHeaderValue());
 
     if (signalAgent != null) {
       requestBuilder.addHeader("X-Signal-Agent", signalAgent);
@@ -784,14 +807,14 @@ public SendGroupMessageResponse sendGroupMessage(byte[] body, byte[] joinedUnide
     }
   }
 
-  public SendMessageResponse sendMessage(OutgoingPushMessageList bundle, Optional<UnidentifiedAccess> unidentifiedAccess, boolean story)
+  public SendMessageResponse sendMessage(OutgoingPushMessageList bundle, @Nullable SealedSenderAccess sealedSenderAccess, boolean story)
       throws IOException
   {
     try {
-      String              responseText = makeServiceRequest(String.format("/v1/messages/%s?story=%s", bundle.getDestination(), story ? "true" : "false"), "PUT", JsonUtil.toJson(bundle), NO_HEADERS, NO_HANDLER, unidentifiedAccess);
+      String              responseText = makeServiceRequest(String.format("/v1/messages/%s?story=%s", bundle.getDestination(), story ? "true" : "false"), "PUT", JsonUtil.toJson(bundle), NO_HEADERS, NO_HANDLER, sealedSenderAccess);
       SendMessageResponse response     = JsonUtil.fromJson(responseText, SendMessageResponse.class);
 
-      response.setSentUnidentfied(unidentifiedAccess.isPresent());
+      response.setSentUnidentfied(sealedSenderAccess != null);
 
       return response;
     } catch (NotFoundException nfe) {
@@ -802,7 +825,7 @@ public SendMessageResponse sendMessage(OutgoingPushMessageList bundle, Optional<
   public SignalServiceMessagesResult getMessages(boolean allowStories) throws IOException {
     Map<String, String> headers = Collections.singletonMap("X-Signal-Receive-Stories", allowStories ? "true" : "false");
 
-    try (Response response = makeServiceRequest(String.format(MESSAGE_PATH, ""), "GET", (RequestBody) null, headers, NO_HANDLER, Optional.empty(), false)) {
+    try (Response response = makeServiceRequest(String.format(MESSAGE_PATH, ""), "GET", (RequestBody) null, headers, NO_HANDLER, SealedSenderAccess.NONE, false)) {
       validateServiceResponse(response);
 
       List<SignalServiceEnvelopeEntity> envelopes = readBodyJson(response.body(), SignalServiceEnvelopeEntityList.class).getMessages();
@@ -892,18 +915,18 @@ public OneTimePreKeyCounts getAvailablePreKeys(ServiceIdType serviceIdType) thro
    * for all devices. If it is not a primary, it will only contain the prekeys for that specific device.
    */
   public List<PreKeyBundle> getPreKeys(SignalServiceAddress destination,
-                                       Optional<UnidentifiedAccess> unidentifiedAccess,
+                                       @Nullable SealedSenderAccess sealedSenderAccess,
                                        int deviceId)
       throws IOException
   {
-    return getPreKeysBySpecifier(destination, unidentifiedAccess, deviceId == 1 ? "*" : String.valueOf(deviceId));
+    return getPreKeysBySpecifier(destination, sealedSenderAccess, deviceId == 1 ? "*" : String.valueOf(deviceId));
   }
 
   /**
    * Retrieves a prekey for a specific device.
    */
   public PreKeyBundle getPreKey(SignalServiceAddress destination, int deviceId) throws IOException {
-    List<PreKeyBundle> bundles = getPreKeysBySpecifier(destination, Optional.empty(), String.valueOf(deviceId));
+    List<PreKeyBundle> bundles = getPreKeysBySpecifier(destination, null, String.valueOf(deviceId));
 
     if (bundles.size() > 0) {
       return bundles.get(0);
@@ -913,7 +936,7 @@ public PreKeyBundle getPreKey(SignalServiceAddress destination, int deviceId) th
   }
 
   private List<PreKeyBundle> getPreKeysBySpecifier(SignalServiceAddress destination,
-                                                   Optional<UnidentifiedAccess> unidentifiedAccess,
+                                                   @Nullable SealedSenderAccess sealedSenderAccess,
                                                    String deviceSpecifier)
       throws IOException
   {
@@ -922,7 +945,7 @@ private List<PreKeyBundle> getPreKeysBySpecifier(SignalServiceAddress destinatio
 
       Log.d(TAG, "Fetching prekeys for " + destination.getIdentifier() + "." + deviceSpecifier + ", i.e. GET " + path);
 
-      String             responseText = makeServiceRequest(path, "GET", null, NO_HEADERS, NO_HANDLER, unidentifiedAccess);
+      String             responseText = makeServiceRequest(path, "GET", null, NO_HEADERS, NO_HANDLER, sealedSenderAccess);
       PreKeyResponse     response     = JsonUtil.fromJson(responseText, PreKeyResponse.class);
       List<PreKeyBundle> bundles      = new LinkedList<>();
 
@@ -980,7 +1003,7 @@ public void checkRepeatedUsePreKeys(ServiceIdType serviceIdType, byte[] digest)
       if  (responseCode == 409) {
         throw new NonSuccessfulResponseCodeException(409);
       }
-    }, Optional.empty());
+    }, null);
   }
 
   public void retrieveBackup(int cdnNumber, Map<String, String> headers, String cdnPath, File destination, long maxSizeBytes, ProgressListener listener)
@@ -1034,8 +1057,8 @@ public byte[] retrieveStickerManifest(byte[] packId)
     return output.toByteArray();
   }
 
-  public ListenableFuture<SignalServiceProfile> retrieveProfile(SignalServiceAddress target, Optional<UnidentifiedAccess> unidentifiedAccess, Locale locale) {
-    ListenableFuture<String> response = submitServiceRequest(String.format(PROFILE_PATH, target.getIdentifier()), "GET", null, AcceptLanguagesUtil.getHeadersWithAcceptLanguage(locale), unidentifiedAccess);
+  public ListenableFuture<SignalServiceProfile> retrieveProfile(SignalServiceAddress target, @Nullable SealedSenderAccess sealedSenderAccess, Locale locale) {
+    ListenableFuture<String> response = submitServiceRequest(String.format(PROFILE_PATH, target.getIdentifier()), "GET", null, AcceptLanguagesUtil.getHeadersWithAcceptLanguage(locale), sealedSenderAccess);
 
     return FutureTransformers.map(response, body -> {
       try {
@@ -1047,7 +1070,7 @@ public ListenableFuture<SignalServiceProfile> retrieveProfile(SignalServiceAddre
     });
   }
 
-  public ListenableFuture<ProfileAndCredential> retrieveVersionedProfileAndCredential(ACI target, ProfileKey profileKey, Optional<UnidentifiedAccess> unidentifiedAccess, Locale locale) {
+  public ListenableFuture<ProfileAndCredential> retrieveVersionedProfileAndCredential(ACI target, ProfileKey profileKey, @Nullable SealedSenderAccess sealedSenderAccess, Locale locale) {
     ProfileKeyVersion                  profileKeyIdentifier = profileKey.getProfileKeyVersion(target.getLibSignalAci());
     ProfileKeyCredentialRequestContext requestContext       = clientZkProfileOperations.createProfileKeyCredentialRequestContext(random, target.getLibSignalAci(), profileKey);
     ProfileKeyCredentialRequest        request              = requestContext.getRequest();
@@ -1057,7 +1080,7 @@ public ListenableFuture<ProfileAndCredential> retrieveVersionedProfileAndCredent
     String subPath           = String.format("%s/%s/%s?credentialType=expiringProfileKey", target, version, credentialRequest);
 
 
-    ListenableFuture<String> response = submitServiceRequest(String.format(PROFILE_PATH, subPath), "GET", null, AcceptLanguagesUtil.getHeadersWithAcceptLanguage(locale), unidentifiedAccess);
+    ListenableFuture<String> response = submitServiceRequest(String.format(PROFILE_PATH, subPath), "GET", null, AcceptLanguagesUtil.getHeadersWithAcceptLanguage(locale), sealedSenderAccess);
 
     return FutureTransformers.map(response, body -> formatProfileAndCredentialBody(requestContext, body));
   }
@@ -1083,12 +1106,12 @@ private ProfileAndCredential formatProfileAndCredentialBody(ProfileKeyCredential
     }
   }
 
-  public ListenableFuture<SignalServiceProfile> retrieveVersionedProfile(ACI target, ProfileKey profileKey, Optional<UnidentifiedAccess> unidentifiedAccess, Locale locale) {
+  public ListenableFuture<SignalServiceProfile> retrieveVersionedProfile(ACI target, ProfileKey profileKey, @Nullable SealedSenderAccess sealedSenderAccess, Locale locale) {
     ProfileKeyVersion profileKeyIdentifier = profileKey.getProfileKeyVersion(target.getLibSignalAci());
 
     String                   version  = profileKeyIdentifier.serialize();
     String                   subPath  = String.format("%s/%s", target, version);
-    ListenableFuture<String> response = submitServiceRequest(String.format(PROFILE_PATH, subPath), "GET", null, AcceptLanguagesUtil.getHeadersWithAcceptLanguage(locale), unidentifiedAccess);
+    ListenableFuture<String> response = submitServiceRequest(String.format(PROFILE_PATH, subPath), "GET", null, AcceptLanguagesUtil.getHeadersWithAcceptLanguage(locale), sealedSenderAccess);
 
     return FutureTransformers.map(response, body -> {
       try {
@@ -1124,7 +1147,7 @@ public Optional<String> writeProfile(SignalServiceProfileWrite signalServiceProf
                                          requestBody,
                                          NO_HEADERS,
                                          PaymentsRegionException::responseCodeHandler,
-                                         Optional.empty());
+                                         SealedSenderAccess.NONE);
 
     if (signalServiceProfileWrite.hasAvatar() && profileAvatar != null) {
       try {
@@ -1148,13 +1171,12 @@ public Optional<String> writeProfile(SignalServiceProfileWrite signalServiceProf
   }
 
   public Single<ServiceResponse<IdentityCheckResponse>> performIdentityCheck(@Nonnull IdentityCheckRequest request,
-                                                                             @Nonnull Optional<UnidentifiedAccess> unidentifiedAccess,
                                                                              @Nonnull ResponseMapper<IdentityCheckResponse> responseMapper)
   {
     Single<ServiceResponse<IdentityCheckResponse>> requestSingle = Single.fromCallable(() -> {
-      try (Response response = getServiceConnection(PROFILE_BATCH_CHECK_PATH, "POST", jsonRequestBody(JsonUtil.toJson(request)), Collections.emptyMap(), unidentifiedAccess, false)) {
+      try (Response response = getServiceConnection(PROFILE_BATCH_CHECK_PATH, "POST", jsonRequestBody(JsonUtil.toJson(request)), Collections.emptyMap(), SealedSenderAccess.NONE, false)) {
         String body = response.body() != null ? readBodyString(response.body()): "";
-        return responseMapper.map(response.code(), body, response::header, unidentifiedAccess.isPresent());
+        return responseMapper.map(response.code(), body, response::header, false);
       }
     });
 
@@ -1164,11 +1186,11 @@ public Single<ServiceResponse<IdentityCheckResponse>> performIdentityCheck(@Nonn
         .onErrorReturn(ServiceResponse::forUnknownError);
   }
 
-  public Single<ServiceResponse<BackupAuthCheckResponse>> checkBackupAuthCredentials(@Nonnull BackupAuthCheckRequest request,
-                                                                                     @Nonnull ResponseMapper<BackupAuthCheckResponse> responseMapper)
+  public Single<ServiceResponse<BackupV2AuthCheckResponse>> checkSvr2AuthCredentials(@Nonnull BackupAuthCheckRequest request,
+                                                                                     @Nonnull ResponseMapper<BackupV2AuthCheckResponse> responseMapper)
   {
-    Single<ServiceResponse<BackupAuthCheckResponse>> requestSingle = Single.fromCallable(() -> {
-      try (Response response = getServiceConnection(BACKUP_AUTH_CHECK, "POST", jsonRequestBody(JsonUtil.toJson(request)), Collections.emptyMap(), Optional.empty(), false)) {
+    Single<ServiceResponse<BackupV2AuthCheckResponse>> requestSingle = Single.fromCallable(() -> {
+      try (Response response = getServiceConnection(BACKUP_AUTH_CHECK_V2, "POST", jsonRequestBody(JsonUtil.toJson(request)), Collections.emptyMap(), SealedSenderAccess.NONE, false)) {
         String body = response.body() != null ? readBodyString(response.body()): "";
         return responseMapper.map(response.code(), body, response::header, false);
       }
@@ -1180,21 +1202,14 @@ public Single<ServiceResponse<BackupAuthCheckResponse>> checkBackupAuthCredentia
         .onErrorReturn(ServiceResponse::forUnknownError);
   }
 
-  public BackupAuthCheckResponse checkBackupAuthCredentials(@Nullable String number, @Nonnull List<String> passwords) throws IOException {
-    String response = makeServiceRequest(BACKUP_AUTH_CHECK, "POST", JsonUtil.toJson(new BackupAuthCheckRequest(number, passwords)), NO_HEADERS, UNOPINIONATED_HANDLER, Optional.empty());
-    return JsonUtil.fromJson(response, BackupAuthCheckResponse.class);
+  public BackupV2AuthCheckResponse checkSvr2AuthCredentials(@Nullable String number, @Nonnull List<String> passwords) throws IOException {
+    String response = makeServiceRequest(BACKUP_AUTH_CHECK_V2, "POST", JsonUtil.toJson(new BackupAuthCheckRequest(number, passwords)), NO_HEADERS, UNOPINIONATED_HANDLER, SealedSenderAccess.NONE);
+    return JsonUtil.fromJson(response, BackupV2AuthCheckResponse.class);
   }
 
-  private Single<ServiceResponse<BackupAuthCheckResponse>> createBackupAuthCheckSingle(@Nonnull String path,
-                                                                                       @Nonnull BackupAuthCheckRequest request,
-                                                                                       @Nonnull ResponseMapper<BackupAuthCheckResponse> responseMapper)
-  {
-    return Single.fromCallable(() -> {
-      try (Response response = getServiceConnection(path, "POST", jsonRequestBody(JsonUtil.toJson(request)), Collections.emptyMap(), Optional.empty(), false)) {
-        String body = response.body() != null ? readBodyString(response.body()): "";
-        return responseMapper.map(response.code(), body, response::header, false);
-      }
-    });
+  public BackupV3AuthCheckResponse checkSvr3AuthCredentials(@Nullable String number, @Nonnull List<String> passwords) throws IOException {
+    String response = makeServiceRequest(BACKUP_AUTH_CHECK_V3, "POST", JsonUtil.toJson(new BackupAuthCheckRequest(number, passwords)), NO_HEADERS, UNOPINIONATED_HANDLER, SealedSenderAccess.NONE);
+    return JsonUtil.fromJson(response, BackupV3AuthCheckResponse.class);
   }
 
   /**
@@ -1247,7 +1262,7 @@ private Single<ServiceResponse<BackupAuthCheckResponse>> createBackupAuthCheckSi
         case 422: throw new UsernameMalformedException();
         case 409: throw new UsernameTakenException();
       }
-    }, Optional.empty());
+    }, SealedSenderAccess.NONE);
 
     return JsonUtil.fromJsonResponse(responseString, ReserveUsernameResponse.class);
   }
@@ -1278,7 +1293,7 @@ public UUID confirmUsernameAndCreateNewLink(Username username, Username.Username
           case 410:
             throw new UsernameTakenException();
         }
-      }, Optional.empty());
+      }, SealedSenderAccess.NONE);
 
       return JsonUtil.fromJson(response, ConfirmUsernameResponse.class).getUsernameLinkHandle();
     } catch (BaseUsernameException e) {
@@ -1332,7 +1347,7 @@ public void submitRateLimitPushChallenge(String challenge) throws IOException {
       if (responseCode == 428) {
         throw new CaptchaRejectedException();
       }
-    }, Optional.empty());
+    }, SealedSenderAccess.NONE);
 
   }
 
@@ -1342,10 +1357,15 @@ public void submitRateLimitRecaptchaChallenge(String challenge, String recaptcha
   }
 
   public void redeemDonationReceipt(ReceiptCredentialPresentation receiptCredentialPresentation, boolean visible, boolean primary) throws IOException {
-    String payload = JsonUtil.toJson(new RedeemReceiptRequest(Base64.encodeWithPadding(receiptCredentialPresentation.serialize()), visible, primary));
+    String payload = JsonUtil.toJson(new RedeemDonationReceiptRequest(Base64.encodeWithPadding(receiptCredentialPresentation.serialize()), visible, primary));
     makeServiceRequest(DONATION_REDEEM_RECEIPT, "POST", payload);
   }
 
+  public void redeemArchivesReceipt(ReceiptCredentialPresentation receiptCredentialPresentation) throws IOException {
+    String payload = JsonUtil.toJson(new RedeemArchivesReceiptRequest(Base64.encodeWithPadding(receiptCredentialPresentation.serialize())));
+    makeServiceRequest(ARCHIVES_REDEEM_RECEIPT, "POST", payload);
+  }
+
   public StripeClientSecret createStripeOneTimePaymentIntent(String currencyCode, String paymentMethod, long amount, long level) throws IOException {
     String payload = JsonUtil.toJson(new StripeOneTimePaymentIntentPayload(amount, currencyCode, level, paymentMethod));
     String result  = makeServiceRequestWithoutAuthentication(CREATE_STRIPE_ONE_TIME_PAYMENT_INTENT, "POST", payload);
@@ -1750,6 +1770,56 @@ private void downloadFromCdn(OutputStream outputStream, long offset, int cdnNumb
     }
   }
 
+  @Nullable
+  public ZonedDateTime getCdnLastModifiedTime(int cdnNumber, Map<String, String> headers, String path) throws MissingConfigurationException, PushNetworkException, NonSuccessfulResponseCodeException {
+    ConnectionHolder[] cdnNumberClients = cdnClientsMap.get(cdnNumber);
+    if (cdnNumberClients == null) {
+      throw new MissingConfigurationException("Attempted to download from unsupported CDN number: " + cdnNumber + ", Our configuration supports: " + cdnClientsMap.keySet());
+    }
+    ConnectionHolder   connectionHolder = getRandom(cdnNumberClients, random);
+    OkHttpClient       okHttpClient     = connectionHolder.getClient()
+                                                          .newBuilder()
+                                                          .connectTimeout(soTimeoutMillis, TimeUnit.MILLISECONDS)
+                                                          .readTimeout(soTimeoutMillis, TimeUnit.MILLISECONDS)
+                                                          .build();
+
+    Request.Builder request = new Request.Builder().url(connectionHolder.getUrl() + "/" + path).get();
+
+    if (connectionHolder.getHostHeader().isPresent()) {
+      request.addHeader("Host", connectionHolder.getHostHeader().get());
+    }
+
+    for (Map.Entry<String, String> header : headers.entrySet()) {
+      request.addHeader(header.getKey(), header.getValue());
+    }
+
+    Call call = okHttpClient.newCall(request.build());
+
+    synchronized (connections) {
+      connections.add(call);
+    }
+
+    try (Response response = call.execute()) {
+      if (response.isSuccessful()) {
+        String lastModified = response.header("Last-Modified");
+        if (lastModified == null) {
+          return null;
+        }
+        return ZonedDateTime.parse(lastModified, DateTimeFormatter.RFC_1123_DATE_TIME);
+      } else {
+        throw new NonSuccessfulResponseCodeException(response.code(), "Response: " + response);
+      }
+    } catch (NonSuccessfulResponseCodeException | PushNetworkException e) {
+      throw e;
+    } catch (IOException e) {
+      throw new PushNetworkException(e);
+    } finally {
+      synchronized (connections) {
+        connections.remove(call);
+      }
+    }
+  }
+
   private AttachmentDigest uploadToCdn0(String path, String acl, String key, String policy, String algorithm,
                                         String credential, String date, String signature,
                                         InputStream data, String contentType, long length, boolean incremental,
@@ -2113,7 +2183,7 @@ private String makeServiceRequestWithoutAuthentication(String urlFragment, Strin
   private String makeServiceRequestWithoutAuthentication(String urlFragment, String method, String jsonBody, Map<String, String> headers, ResponseCodeHandler responseCodeHandler)
       throws NonSuccessfulResponseCodeException, PushNetworkException, MalformedResponseException
   {
-    try (Response response = makeServiceRequest(urlFragment, method, jsonRequestBody(jsonBody), headers, responseCodeHandler, Optional.empty(), true)) {
+    try (Response response = makeServiceRequest(urlFragment, method, jsonRequestBody(jsonBody), headers, responseCodeHandler, SealedSenderAccess.NONE, true)) {
       return readBodyString(response);
     }
   }
@@ -2121,13 +2191,13 @@ private String makeServiceRequestWithoutAuthentication(String urlFragment, Strin
   private String makeServiceRequest(String urlFragment, String method, String jsonBody)
       throws NonSuccessfulResponseCodeException, PushNetworkException, MalformedResponseException
   {
-    return makeServiceRequest(urlFragment, method, jsonBody, NO_HEADERS, NO_HANDLER, Optional.empty());
+    return makeServiceRequest(urlFragment, method, jsonBody, NO_HEADERS, NO_HANDLER, SealedSenderAccess.NONE);
   }
 
-  private String makeServiceRequest(String urlFragment, String method, String jsonBody, Map<String, String> headers, ResponseCodeHandler responseCodeHandler, Optional<UnidentifiedAccess> unidentifiedAccessKey)
+  private String makeServiceRequest(String urlFragment, String method, String jsonBody, Map<String, String> headers, ResponseCodeHandler responseCodeHandler, @Nullable SealedSenderAccess sealedSenderAccess)
       throws NonSuccessfulResponseCodeException, PushNetworkException, MalformedResponseException
   {
-    try (Response response = makeServiceRequest(urlFragment, method, jsonRequestBody(jsonBody), headers, responseCodeHandler, unidentifiedAccessKey, false)) {
+    try (Response response = makeServiceRequest(urlFragment, method, jsonRequestBody(jsonBody), headers, responseCodeHandler, sealedSenderAccess, false)) {
       return readBodyString(response);
     }
   }
@@ -2146,10 +2216,10 @@ private ListenableFuture<String> submitServiceRequest(String urlFragment,
                                                         String method,
                                                         String jsonBody,
                                                         Map<String, String> headers,
-                                                        Optional<UnidentifiedAccess> unidentifiedAccessKey)
+                                                        @Nullable SealedSenderAccess sealedSenderAccess)
   {
-    OkHttpClient okHttpClient = buildOkHttpClient(unidentifiedAccessKey.isPresent());
-    Call         call         = okHttpClient.newCall(buildServiceRequest(urlFragment, method, jsonRequestBody(jsonBody), headers, unidentifiedAccessKey, false));
+    OkHttpClient okHttpClient = buildOkHttpClient(sealedSenderAccess != null);
+    Call         call         = okHttpClient.newCall(buildServiceRequest(urlFragment, method, jsonRequestBody(jsonBody), headers, sealedSenderAccess, false));
 
     synchronized (connections) {
       connections.add(call);
@@ -2182,13 +2252,13 @@ private Response makeServiceRequest(String urlFragment,
                                       RequestBody body,
                                       Map<String, String> headers,
                                       ResponseCodeHandler responseCodeHandler,
-                                      Optional<UnidentifiedAccess> unidentifiedAccessKey,
+                                      @Nullable SealedSenderAccess sealedSenderAccess,
                                       boolean doNotAddAuthenticationOrUnidentifiedAccessKey)
       throws NonSuccessfulResponseCodeException, PushNetworkException, MalformedResponseException
   {
     Response response = null;
     try {
-      response = getServiceConnection(urlFragment, method, body, headers, unidentifiedAccessKey, doNotAddAuthenticationOrUnidentifiedAccessKey);
+      response = getServiceConnection(urlFragment, method, body, headers, sealedSenderAccess, doNotAddAuthenticationOrUnidentifiedAccessKey);
       responseCodeHandler.handle(response.code(), response.body());
       return validateServiceResponse(response);
     } catch (Exception e) {
@@ -2235,8 +2305,8 @@ private Response validateServiceResponse(Response response)
 
         throw new LockedException(accountLockFailure.length,
                                   accountLockFailure.timeRemaining,
-                                  accountLockFailure.svr1Credentials,
-                                  accountLockFailure.svr2Credentials);
+                                  accountLockFailure.svr2Credentials,
+                                  accountLockFailure.svr3Credentials);
       case 428:
         ProofRequiredResponse proofRequiredResponse = readResponseJson(response, ProofRequiredResponse.class);
         String                retryAfterRaw = response.header("Retry-After");
@@ -2262,13 +2332,13 @@ private Response getServiceConnection(String urlFragment,
                                         String method,
                                         RequestBody body,
                                         Map<String, String> headers,
-                                        Optional<UnidentifiedAccess> unidentifiedAccess,
+                                        @Nullable SealedSenderAccess sealedSenderAccess,
                                         boolean doNotAddAuthenticationOrUnidentifiedAccessKey)
       throws PushNetworkException
   {
     try {
-      OkHttpClient okHttpClient = buildOkHttpClient(unidentifiedAccess.isPresent());
-      Call         call         = okHttpClient.newCall(buildServiceRequest(urlFragment, method, body, headers, unidentifiedAccess, doNotAddAuthenticationOrUnidentifiedAccessKey));
+      OkHttpClient okHttpClient = buildOkHttpClient(sealedSenderAccess != null);
+      Call         call         = okHttpClient.newCall(buildServiceRequest(urlFragment, method, body, headers, sealedSenderAccess, doNotAddAuthenticationOrUnidentifiedAccessKey));
 
       synchronized (connections) {
         connections.add(call);
@@ -2301,14 +2371,11 @@ private Request buildServiceRequest(String urlFragment,
                                       String method,
                                       RequestBody body,
                                       Map<String, String> headers,
-                                      Optional<UnidentifiedAccess> unidentifiedAccess,
+                                      @Nullable SealedSenderAccess sealedSenderAccess,
                                       boolean doNotAddAuthenticationOrUnidentifiedAccessKey) {
 
     ServiceConnectionHolder connectionHolder = (ServiceConnectionHolder) getRandom(serviceClients, random);
 
-//      Log.d(TAG, "Push service URL: " + connectionHolder.getUrl());
-//      Log.d(TAG, "Opening URL: " + String.format("%s%s", connectionHolder.getUrl(), urlFragment));
-
     Request.Builder request = new Request.Builder();
     request.url(String.format("%s%s", connectionHolder.getUrl(), urlFragment));
     request.method(method, body);
@@ -2318,8 +2385,8 @@ private Request buildServiceRequest(String urlFragment,
     }
 
     if (!headers.containsKey("Authorization") && !doNotAddAuthenticationOrUnidentifiedAccessKey) {
-      if (unidentifiedAccess.isPresent()) {
-        request.addHeader("Unidentified-Access-Key", Base64.encodeWithPadding(unidentifiedAccess.get().getUnidentifiedAccessKey()));
+      if (sealedSenderAccess != null) {
+        request.addHeader(sealedSenderAccess.getHeaderName(), sealedSenderAccess.getHeaderValue());
       } else if (credentialsProvider.getPassword() != null) {
         request.addHeader("Authorization", getAuthorizationHeader(credentialsProvider));
       }
@@ -2338,6 +2405,12 @@ private Request buildServiceRequest(String urlFragment,
 
   private Response makeStorageRequest(String authorization, String path, String method, RequestBody body, ResponseCodeHandler responseCodeHandler)
       throws PushNetworkException, NonSuccessfulResponseCodeException
+  {
+    return makeStorageRequest(authorization, path, method, body, NO_HEADERS, responseCodeHandler);
+  }
+
+  private Response makeStorageRequest(String authorization, String path, String method, RequestBody body, Map<String, String> headers, ResponseCodeHandler responseCodeHandler)
+      throws PushNetworkException, NonSuccessfulResponseCodeException
   {
     ConnectionHolder connectionHolder = getRandom(storageClients, random);
     OkHttpClient     okHttpClient     = connectionHolder.getClient()
@@ -2346,8 +2419,6 @@ private Response makeStorageRequest(String authorization, String path, String me
                                                         .readTimeout(soTimeoutMillis, TimeUnit.MILLISECONDS)
                                                         .build();
 
-//    Log.d(TAG, "Opening URL: " + connectionHolder.getUrl());
-
     Request.Builder request = new Request.Builder().url(connectionHolder.getUrl() + path);
     request.method(method, body);
 
@@ -2359,6 +2430,10 @@ private Response makeStorageRequest(String authorization, String path, String me
       request.addHeader("Authorization", authorization);
     }
 
+    for (Map.Entry<String, String> entry : headers.entrySet()) {
+      request.addHeader(entry.getKey(), entry.getValue());
+    }
+
     Call call = okHttpClient.newCall(request.build());
 
     synchronized (connections) {
@@ -2668,6 +2743,9 @@ public static class RegistrationLockFailure {
 
     @JsonProperty
     public AuthCredentials svr2Credentials;
+
+    @JsonProperty
+    public Svr3Credentials svr3Credentials;
   }
 
   private static class ConnectionHolder {
@@ -2755,7 +2833,7 @@ public CredentialResponse retrieveGroupsV2Credentials(long todaySeconds)
                                          null,
                                          NO_HEADERS,
                                          NO_HANDLER,
-                                         Optional.empty());
+                                         SealedSenderAccess.NONE);
 
     return JsonUtil.fromJson(response, CredentialResponse.class);
   }
@@ -2763,7 +2841,6 @@ public CredentialResponse retrieveGroupsV2Credentials(long todaySeconds)
   private static final ResponseCodeHandler GROUPS_V2_PUT_RESPONSE_HANDLER   = (responseCode, body) -> {
     if (responseCode == 409) throw new GroupExistsException();
   };;
-  private static final ResponseCodeHandler GROUPS_V2_GET_LOGS_HANDLER       = NO_HANDLER;
   private static final ResponseCodeHandler GROUPS_V2_GET_CURRENT_HANDLER    = (responseCode, body) -> {
     switch (responseCode) {
       case 403: throw new NotInGroupException();
@@ -2787,8 +2864,8 @@ public void handle(int responseCode, ResponseBody body, Function<String, String>
     }
   };
 
-  public void putNewGroupsV2Group(Group group, GroupsV2AuthorizationString authorization)
-      throws NonSuccessfulResponseCodeException, PushNetworkException
+  public GroupResponse putNewGroupsV2Group(Group group, GroupsV2AuthorizationString authorization)
+      throws NonSuccessfulResponseCodeException, PushNetworkException, IOException, MalformedResponseException
   {
     try (Response response = makeStorageRequest(authorization.toString(),
                                                 GROUPSV2_GROUP,
@@ -2796,11 +2873,11 @@ public void putNewGroupsV2Group(Group group, GroupsV2AuthorizationString authori
                                                 protobufRequestBody(group),
                                                 GROUPS_V2_PUT_RESPONSE_HANDLER))
     {
-      return;
+      return GroupResponse.ADAPTER.decode(readBodyBytes(response));
     }
   }
 
-  public Group getGroupsV2Group(GroupsV2AuthorizationString authorization)
+  public GroupResponse getGroupsV2Group(GroupsV2AuthorizationString authorization)
       throws NonSuccessfulResponseCodeException, PushNetworkException, IOException, MalformedResponseException
   {
     try (Response response = makeStorageRequest(authorization.toString(),
@@ -2809,7 +2886,7 @@ public Group getGroupsV2Group(GroupsV2AuthorizationString authorization)
                                                 null,
                                                 GROUPS_V2_GET_CURRENT_HANDLER))
     {
-      return Group.ADAPTER.decode(readBodyBytes(response));
+      return GroupResponse.ADAPTER.decode(readBodyBytes(response));
     }
   }
 
@@ -2826,7 +2903,7 @@ public AvatarUploadAttributes getGroupsV2AvatarUploadForm(String authorization)
     }
   }
 
-  public GroupChange patchGroupsV2Group(GroupChange.Actions groupChange, String authorization, Optional<byte[]> groupLinkPassword)
+  public GroupChangeResponse patchGroupsV2Group(GroupChange.Actions groupChange, String authorization, Optional<byte[]> groupLinkPassword)
       throws NonSuccessfulResponseCodeException, PushNetworkException, IOException, MalformedResponseException
   {
     String path;
@@ -2843,30 +2920,29 @@ public GroupChange patchGroupsV2Group(GroupChange.Actions groupChange, String au
                                                 protobufRequestBody(groupChange),
                                                 GROUPS_V2_PATCH_RESPONSE_HANDLER))
     {
-      return GroupChange.ADAPTER.decode(readBodyBytes(response));
+      return GroupChangeResponse.ADAPTER.decode(readBodyBytes(response));
     }
   }
 
-  public GroupHistory getGroupsV2GroupHistory(int fromVersion, GroupsV2AuthorizationString authorization, int highestKnownEpoch, boolean includeFirstState)
+  public GroupHistory getGroupHistory(int fromVersion, GroupsV2AuthorizationString authorization, int highestKnownEpoch, boolean includeFirstState, long sendEndorsementsExpirationMs)
       throws IOException
   {
+    Map<String, String> headers = new HashMap<>();
+    headers.put("Cached-Send-Endorsements", Long.toString(TimeUnit.MILLISECONDS.toSeconds(sendEndorsementsExpirationMs)));
+
     try (Response response = makeStorageRequest(authorization.toString(),
                                                 String.format(Locale.US, GROUPSV2_GROUP_CHANGES, fromVersion, highestKnownEpoch, includeFirstState),
                                                 "GET",
                                                 null,
-                                                GROUPS_V2_GET_LOGS_HANDLER))
+                                                headers,
+                                                GROUPS_V2_GET_CURRENT_HANDLER))
     {
 
       if (response.body() == null) {
         throw new PushNetworkException("No body!");
       }
 
-      GroupChanges groupChanges;
-      try (InputStream input = response.body().byteStream()) {
-        groupChanges = GroupChanges.ADAPTER.decode(input);
-      } catch (IOException e) {
-        throw new PushNetworkException(e);
-      }
+      GroupChanges groupChanges = GroupChanges.ADAPTER.decode(readBodyBytes(response));
 
       if (response.code() == 206) {
         String                 contentRangeHeader = response.header("Content-Range");
@@ -2885,6 +2961,19 @@ public GroupHistory getGroupsV2GroupHistory(int fromVersion, GroupsV2Authorizati
     }
   }
 
+  public int getGroupJoinedAtRevision(GroupsV2AuthorizationString authorization)
+      throws IOException
+  {
+    try (Response response = makeStorageRequest(authorization.toString(),
+                                                GROUPSV2_JOINED_AT,
+                                                "GET",
+                                                null,
+                                                GROUPS_V2_GET_CURRENT_HANDLER))
+    {
+      return Member.ADAPTER.decode(readBodyBytes(response)).joinedAtRevision;
+    }
+  }
+
   public GroupJoinInfo getGroupJoinInfo(Optional<byte[]> groupLinkPassword, GroupsV2AuthorizationString authorization)
       throws NonSuccessfulResponseCodeException, PushNetworkException, IOException, MalformedResponseException
   {
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RedeemArchivesReceiptRequest.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RedeemArchivesReceiptRequest.kt
new file mode 100644
index 0000000000..21ed0312d3
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RedeemArchivesReceiptRequest.kt
@@ -0,0 +1,13 @@
+package org.whispersystems.signalservice.internal.push
+
+import com.fasterxml.jackson.annotation.JsonCreator
+import com.fasterxml.jackson.annotation.JsonProperty
+
+/**
+ * POST /v1/archives/redeem-receipt
+ *
+ * Request object for redeeming a receipt from a donation transaction.
+ *
+ * @param receiptCredentialPresentation base64-encoded no-newlines standard-character-set with-padding of the bytes of a [ReceiptCredentialPresentation] object
+ */
+internal class RedeemArchivesReceiptRequest @JsonCreator constructor(@param:JsonProperty("receiptCredentialPresentation") val receiptCredentialPresentation: String)
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RedeemReceiptRequest.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RedeemDonationReceiptRequest.java
similarity index 94%
rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RedeemReceiptRequest.java
rename to libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RedeemDonationReceiptRequest.java
index fc38966fbf..ffa5d761fc 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RedeemReceiptRequest.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RedeemDonationReceiptRequest.java
@@ -10,7 +10,7 @@
  *
  * Request object for redeeming a receipt from a donation transaction.
  */
-class RedeemReceiptRequest {
+class RedeemDonationReceiptRequest {
 
   private final String  receiptCredentialPresentation;
   private final boolean visible;
@@ -21,8 +21,7 @@ class RedeemReceiptRequest {
    * @param visible boolean indicating if the new badge should be visible or not on the profile
    * @param primary boolean indicating if the new badge should be primary or not on the profile; is always treated as false if `visible` is false
    */
-  @JsonCreator
-  RedeemReceiptRequest(
+  @JsonCreator RedeemDonationReceiptRequest(
       @JsonProperty("receiptCredentialPresentation") String receiptCredentialPresentation,
       @JsonProperty("visible") boolean visible,
       @JsonProperty("primary") boolean primary) {
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RegistrationSessionRequestBody.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RegistrationSessionRequestBody.kt
index 69fab66e52..4657b58373 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RegistrationSessionRequestBody.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RegistrationSessionRequestBody.kt
@@ -7,16 +7,16 @@ import org.whispersystems.signalservice.api.push.SignedPreKeyEntity
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 data class RegistrationSessionRequestBody(
-  @JsonProperty("sessionId") val sessionId: String? = null,
-  @JsonProperty("recoveryPassword") val recoveryPassword: String? = null,
-  @JsonProperty("accountAttributes") val accountAttributes: AccountAttributes,
-  @JsonProperty("aciIdentityKey") val aciIdentityKey: String,
-  @JsonProperty("pniIdentityKey") val pniIdentityKey: String,
-  @JsonProperty("aciSignedPreKey") val aciSignedPreKey: SignedPreKeyEntity,
-  @JsonProperty("pniSignedPreKey") val pniSignedPreKey: SignedPreKeyEntity,
-  @JsonProperty("aciPqLastResortPreKey") val aciPqLastResortPreKey: KyberPreKeyEntity,
-  @JsonProperty("pniPqLastResortPreKey") val pniPqLastResortPreKey: KyberPreKeyEntity,
-  @JsonProperty("gcmToken") val gcmToken: GcmRegistrationId?,
-  @JsonProperty("skipDeviceTransfer") val skipDeviceTransfer: Boolean,
-  @JsonProperty("requireAtomic") val requireAtomic: Boolean = true
+  @JsonProperty val sessionId: String? = null,
+  @JsonProperty val recoveryPassword: String? = null,
+  @JsonProperty val accountAttributes: AccountAttributes,
+  @JsonProperty val aciIdentityKey: String,
+  @JsonProperty val pniIdentityKey: String,
+  @JsonProperty val aciSignedPreKey: SignedPreKeyEntity,
+  @JsonProperty val pniSignedPreKey: SignedPreKeyEntity,
+  @JsonProperty val aciPqLastResortPreKey: KyberPreKeyEntity,
+  @JsonProperty val pniPqLastResortPreKey: KyberPreKeyEntity,
+  @JsonProperty val gcmToken: GcmRegistrationId?,
+  @JsonProperty val skipDeviceTransfer: Boolean,
+  @JsonProperty val requireAtomic: Boolean = true
 )
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkRequestBody.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkRequestBody.kt
index 209a649116..67778d2383 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkRequestBody.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkRequestBody.kt
@@ -3,4 +3,4 @@ package org.whispersystems.signalservice.internal.push
 import com.fasterxml.jackson.annotation.JsonProperty
 
 /** Request body for setting a username link on the service. */
-data class SetUsernameLinkRequestBody(@JsonProperty("usernameLinkEncryptedValue") val usernameLinkEncryptedValue: String, @JsonProperty("keepLinkHandle") val keepLinkHandle: Boolean)
+data class SetUsernameLinkRequestBody(@JsonProperty val usernameLinkEncryptedValue: String, @JsonProperty val keepLinkHandle: Boolean)
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkResponseBody.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkResponseBody.kt
index 4f3047cc84..a2d71b9177 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkResponseBody.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkResponseBody.kt
@@ -7,7 +7,7 @@ import java.util.UUID
 
 /** Response body for setting a username link on the service. */
 data class SetUsernameLinkResponseBody(
-  @JsonProperty("usernameLinkHandle")
+  @JsonProperty
   @JsonDeserialize(using = UuidDeserializer::class)
   val usernameLinkHandle: UUID
 )
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SpamTokenMessage.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SpamTokenMessage.kt
index 9885b4fc25..fbf8eed5b2 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SpamTokenMessage.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SpamTokenMessage.kt
@@ -2,4 +2,4 @@ package org.whispersystems.signalservice.internal.push
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
-data class SpamTokenMessage(@JsonProperty("token") val token: String?)
+data class SpamTokenMessage(@JsonProperty val token: String?)
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SubscriptionsConfiguration.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SubscriptionsConfiguration.java
index 8cc0d6792b..27de4d719a 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SubscriptionsConfiguration.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SubscriptionsConfiguration.java
@@ -23,6 +23,7 @@ public class SubscriptionsConfiguration {
 
   public static final int               BOOST_LEVEL        = 1;
   public static final int               GIFT_LEVEL         = 100;
+  public static final int               BACKUPS_LEVEL      = 201;
   public static final HashSet<Integer>  SUBSCRIPTION_LEVELS = new HashSet<>(Arrays.asList(500, 1000, 2000));
 
   @JsonProperty("currencies")
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/UpdateVerificationSessionRequestBody.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/UpdateVerificationSessionRequestBody.kt
index 677efeab78..4f6c5af77d 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/UpdateVerificationSessionRequestBody.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/UpdateVerificationSessionRequestBody.kt
@@ -5,12 +5,12 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 data class UpdateVerificationSessionRequestBody(
-  @JsonProperty("captcha") val captcha: String?,
-  @JsonProperty("pushToken") val pushToken: String?,
-  @JsonProperty("pushChallenge") val pushChallenge: String?,
-  @JsonProperty("mcc") val mcc: String?,
-  @JsonProperty("mnc") val mnc: String?
+  @JsonProperty val captcha: String?,
+  @JsonProperty val pushToken: String?,
+  @JsonProperty val pushChallenge: String?,
+  @JsonProperty val mcc: String?,
+  @JsonProperty val mnc: String?
 ) {
-  @JsonProperty("pushTokenType")
+  @JsonProperty
   val pushTokenType: String? = if (pushToken != null) "fcm" else null
 }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerificationSessionMetadataRequestBody.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerificationSessionMetadataRequestBody.kt
index 4c9b22ce4f..75a304531a 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerificationSessionMetadataRequestBody.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerificationSessionMetadataRequestBody.kt
@@ -5,11 +5,11 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 data class VerificationSessionMetadataRequestBody(
-  @JsonProperty("number") val number: String,
-  @JsonProperty("pushToken") val pushToken: String?,
-  @JsonProperty("mcc") val mcc: String?,
-  @JsonProperty("mnc") val mnc: String?
+  @JsonProperty val number: String,
+  @JsonProperty val pushToken: String?,
+  @JsonProperty val mcc: String?,
+  @JsonProperty val mnc: String?
 ) {
-  @JsonProperty("pushTokenType")
+  @JsonProperty
   val pushTokenType: String? = if (pushToken != null) "fcm" else null
 }
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/DonationProcessorError.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/DonationProcessorError.kt
index d64e5d1e0e..db07d9726e 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/DonationProcessorError.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/DonationProcessorError.kt
@@ -6,7 +6,6 @@
 package org.whispersystems.signalservice.internal.push.exceptions
 
 import com.fasterxml.jackson.annotation.JsonCreator
-import com.fasterxml.jackson.annotation.JsonProperty
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.ChargeFailure
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.Processor
@@ -16,8 +15,8 @@ import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.Pro
  * confirming a PayPal intent.
  */
 class DonationProcessorError @JsonCreator constructor(
-  @JsonProperty("processor") val processor: Processor,
-  @JsonProperty("chargeFailure") val chargeFailure: ChargeFailure
+  val processor: Processor,
+  val chargeFailure: ChargeFailure
 ) : NonSuccessfulResponseCodeException(440) {
   override fun toString(): String {
     return """
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/DonationReceiptCredentialError.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/DonationReceiptCredentialError.kt
index e60cb29d11..88f30e641c 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/DonationReceiptCredentialError.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/DonationReceiptCredentialError.kt
@@ -6,7 +6,6 @@
 package org.whispersystems.signalservice.internal.push.exceptions
 
 import com.fasterxml.jackson.annotation.JsonCreator
-import com.fasterxml.jackson.annotation.JsonProperty
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.ChargeFailure
 
@@ -15,7 +14,7 @@ import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.Cha
  * a failed payment.
  */
 class DonationReceiptCredentialError @JsonCreator constructor(
-  @JsonProperty("chargeFailure") val chargeFailure: ChargeFailure
+  val chargeFailure: ChargeFailure
 ) : NonSuccessfulResponseCodeException(402) {
   override fun toString(): String {
     return """
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBody.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBody.kt
index 6a76822e59..cb455c9672 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBody.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBody.kt
@@ -1,8 +1,8 @@
 package org.whispersystems.signalservice.internal.push.http
 
 import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.RequestBody
-import okhttp3.internal.http.UnrepeatableRequestBody
 import okio.BufferedSink
 import org.signal.libsignal.protocol.incrementalmac.ChunkSizeChoice
 import org.signal.libsignal.protocol.logging.Log
@@ -26,7 +26,7 @@ class DigestingRequestBody(
   private val progressListener: SignalServiceAttachment.ProgressListener?,
   private val cancelationSignal: CancelationSignal?,
   private val contentStart: Long
-) : RequestBody(), UnrepeatableRequestBody {
+) : RequestBody() {
   var attachmentDigest: AttachmentDigest? = null
 
   init {
@@ -35,7 +35,7 @@ class DigestingRequestBody(
   }
 
   override fun contentType(): MediaType? {
-    return MediaType.parse(contentType)
+    return contentType.toMediaTypeOrNull()
   }
 
   @Throws(IOException::class)
@@ -85,6 +85,10 @@ class DigestingRequestBody(
     return if (contentLength > 0) contentLength - contentStart else -1
   }
 
+  override fun isOneShot(): Boolean {
+    return true
+  }
+
   private fun logMessage(actual: Long, expected: Long): String {
     val difference = actual - expected
     return if (difference > 0) {
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/JsonUtil.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/JsonUtil.java
index 8f01a0392f..844325d9c5 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/JsonUtil.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/JsonUtil.java
@@ -35,14 +35,17 @@
 
 import okio.ByteString;
 
+import static com.fasterxml.jackson.module.kotlin.ExtensionsKt.registerKotlinModule;
+
 @SuppressWarnings("unused")
 public class JsonUtil {
 
   private static final String TAG = JsonUtil.class.getSimpleName();
 
-  private static final ObjectMapper objectMapper = new ObjectMapper();
+  private static final ObjectMapper objectMapper;
 
   static {
+    objectMapper = registerKotlinModule(new ObjectMapper());
     objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
   }
 
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/Util.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/Util.java
index 513d4ae905..b14eb2e014 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/Util.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/Util.java
@@ -75,7 +75,7 @@ public static byte[] getSecretBytes(int size) {
     return secret;
   }
 
-  public static byte[] getRandomLengthBytes(int maxSize) {
+  public static byte[] getRandomLengthSecretBytes(int maxSize) {
     SecureRandom secureRandom = new SecureRandom();
     byte[]       result       = new byte[secureRandom.nextInt(maxSize) + 1];
     secureRandom.nextBytes(result);
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultErrorMapper.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultErrorMapper.java
index 03e1b8457c..d90c919720 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultErrorMapper.java
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultErrorMapper.java
@@ -121,8 +121,8 @@ public Throwable parseError(int status, String body, Function<String, String> ge
 
         return new LockedException(accountLockFailure.length,
                                    accountLockFailure.timeRemaining,
-                                   accountLockFailure.svr1Credentials,
-                                   accountLockFailure.svr2Credentials);
+                                   accountLockFailure.svr2Credentials,
+                                   accountLockFailure.svr3Credentials);
       case 428:
         ProofRequiredResponse proofRequiredResponse;
         try {
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalNetwork.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalNetwork.kt
deleted file mode 100644
index 3476e6be9c..0000000000
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalNetwork.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.signalservice.internal.websocket
-
-import org.signal.core.util.orNull
-import org.signal.libsignal.internal.CompletableFuture
-import org.signal.libsignal.net.CdsiLookupRequest
-import org.signal.libsignal.net.CdsiLookupResponse
-import org.signal.libsignal.net.ChatService
-import org.signal.libsignal.net.Network
-import org.whispersystems.signalservice.api.util.CredentialsProvider
-//import org.whispersystems.signalservice.internal.configuration.SignalProxy
-import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration
-import java.io.IOException
-import java.util.concurrent.ExecutionException
-import java.util.function.Consumer
-
-/**
- * Makes Network API more ergonomic to use with Android client types
- */
-class LibSignalNetwork(val network: Network, config: SignalServiceConfiguration) {
-  init {
-    resetSettings(config)
-  }
-
-  fun createChatService(
-    credentialsProvider: CredentialsProvider? = null
-  ): ChatService {
-    val username = credentialsProvider?.username ?: ""
-    val password = credentialsProvider?.password ?: ""
-    return network.createChatService(username, password)
-  }
-
-  fun resetSettings(config: SignalServiceConfiguration) {
-    // TODO: MOLLY
-//    resetProxy(config.signalProxy.orNull())
-  }
-
-//  private fun resetProxy(proxy: SignalProxy?) {
-//    if (proxy == null) {
-//      network.clearProxy()
-//    } else {
-//      network.setProxy(proxy.host, proxy.port)
-//    }
-//  }
-
-  // Delegates
-  @Throws(IOException::class, InterruptedException::class, ExecutionException::class)
-  fun cdsiLookup(
-    username: String?,
-    password: String?,
-    request: CdsiLookupRequest?,
-    tokenConsumer: Consumer<ByteArray?>
-  ): CompletableFuture<CdsiLookupResponse?>? {
-    return network.cdsiLookup(username, password, request, tokenConsumer)
-  }
-}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalNetworkExtensions.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalNetworkExtensions.kt
new file mode 100644
index 0000000000..2ba03b72e0
--- /dev/null
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalNetworkExtensions.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+@file:JvmName("LibSignalNetworkExtensions")
+
+package org.whispersystems.signalservice.internal.websocket
+
+import org.signal.libsignal.net.ChatService
+import org.signal.libsignal.net.Network
+import org.whispersystems.signalservice.api.util.CredentialsProvider
+import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration
+
+/**
+ * Helper method to create a ChatService with optional credentials.
+ */
+fun Network.createChatService(
+  credentialsProvider: CredentialsProvider? = null
+): ChatService {
+  val username = credentialsProvider?.username ?: ""
+  val password = credentialsProvider?.password ?: ""
+  return this.createChatService(username, password)
+}
+
+/**
+ * Helper method to apply settings from the SignalServiceConfiguration.
+ */
+fun Network.applyConfiguration(config: SignalServiceConfiguration) {
+  // MOLLY: FIXME
+}
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ShadowingWebSocketConnection.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ShadowingWebSocketConnection.kt
index 2cfb5b948a..f1ecb2d98d 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ShadowingWebSocketConnection.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ShadowingWebSocketConnection.kt
@@ -37,7 +37,7 @@ import kotlin.time.Duration.Companion.seconds
  *
  * When a hardcoded error threshold is reached, the user is notified to submit debug logs.
  *
- * @see [org.thoughtcrime.securesms.util.FeatureFlags.libSignalWebSocketShadowingPercentage]
+ * @see [org.thoughtcrime.securesms.util.RemoteConfig.libSignalWebSocketShadowingPercentage]
  */
 class ShadowingWebSocketConnection(
   name: String,
diff --git a/libsignal-service/src/main/protowire/Groups.proto b/libsignal-service/src/main/protowire/Groups.proto
index 3f0b7300bf..63970c7741 100644
--- a/libsignal-service/src/main/protowire/Groups.proto
+++ b/libsignal-service/src/main/protowire/Groups.proto
@@ -213,13 +213,24 @@ message GroupChange {
   uint32 changeEpoch     = 3;
 }
 
+message GroupResponse {
+  Group group                         = 1;
+  bytes groupSendEndorsementsResponse = 2;
+}
+
 message GroupChanges {
   message GroupChangeState {
     GroupChange groupChange = 1;
     Group       groupState  = 2;
   }
 
-  repeated GroupChangeState groupChanges = 1;
+  repeated GroupChangeState groupChanges                  = 1;
+           bytes            groupSendEndorsementsResponse = 2;
+}
+
+message GroupChangeResponse {
+  GroupChange groupChange                   = 1;
+  bytes       groupSendEndorsementsResponse = 2;
 }
 
 message GroupAttributeBlob {
diff --git a/libsignal-service/src/main/protowire/Provisioning.proto b/libsignal-service/src/main/protowire/Provisioning.proto
index 2b9bef426e..7fa89650c5 100644
--- a/libsignal-service/src/main/protowire/Provisioning.proto
+++ b/libsignal-service/src/main/protowire/Provisioning.proto
@@ -3,7 +3,7 @@
  *
  * Licensed according to the LICENSE file in this repository.
  */
-syntax = "proto2";
+syntax = "proto3";
 
 package signalservice;
 
@@ -11,7 +11,7 @@ option java_package         = "org.whispersystems.signalservice.internal.push";
 option java_outer_classname = "ProvisioningProtos";
 
 message ProvisioningUuid {
-  optional string uuid = 1;
+  string uuid = 1;
 }
 
 message ProvisionEnvelope {
diff --git a/libsignal-service/src/main/protowire/SignalService.proto b/libsignal-service/src/main/protowire/SignalService.proto
index 4fa93c6a4b..4dd8986883 100644
--- a/libsignal-service/src/main/protowire/SignalService.proto
+++ b/libsignal-service/src/main/protowire/SignalService.proto
@@ -614,6 +614,7 @@ message SyncMessage {
       ACCEPTED       = 1;
       NOT_ACCEPTED   = 2;
       DELETE         = 3;
+      OBSERVED       = 4;
     }
 
     optional bytes     conversationId = 1;
@@ -653,6 +654,53 @@ message SyncMessage {
     optional uint64 callId        = 4;
   }
 
+  message DeleteForMe {
+    message ConversationIdentifier {
+      oneof identifier {
+        string threadServiceId = 1;
+        bytes threadGroupId = 2;
+        string threadE164 = 3;
+      }
+    }
+
+    message AddressableMessage {
+      oneof author {
+        string authorServiceId = 1;
+        string authorE164 = 2;
+      }
+      optional uint64 sentTimestamp = 3;
+    }
+
+    message MessageDeletes {
+      optional ConversationIdentifier conversation = 1;
+      repeated AddressableMessage messages = 2;
+    }
+
+    message AttachmentDelete {
+      optional ConversationIdentifier conversation = 1;
+      optional AddressableMessage targetMessage = 2;
+      optional bytes uuid = 3; // The `uuid` from the `Attachment`.
+      optional bytes fallbackDigest = 4;
+      optional bytes fallbackPlaintextHash = 5;
+    }
+
+    message ConversationDelete {
+      optional ConversationIdentifier conversation = 1;
+      repeated AddressableMessage mostRecentMessages = 2;
+      repeated AddressableMessage mostRecentNonExpiringMessages = 4;
+      optional bool isFullDelete = 3;
+    }
+
+    message LocalOnlyConversationDelete {
+      optional ConversationIdentifier conversation = 1;
+    }
+
+    repeated MessageDeletes messageDeletes = 1;
+    repeated ConversationDelete conversationDeletes = 2;
+    repeated LocalOnlyConversationDelete localOnlyConversationDeletes = 3;
+    repeated AttachmentDelete attachmentDeletes = 4;
+  }
+
   optional Sent                   sent                   = 1;
   optional Contacts               contacts               = 2;
   reserved                      /*groups*/                 3;
@@ -674,6 +722,7 @@ message SyncMessage {
   optional CallEvent              callEvent              = 19;
   optional CallLinkUpdate         callLinkUpdate         = 20;
   optional CallLogEvent           callLogEvent           = 21;
+  optional DeleteForMe            deleteForMe            = 22;
 }
 
 message AttachmentPointer {
@@ -705,7 +754,8 @@ message AttachmentPointer {
   optional string  blurHash                = 12;
   optional uint64  uploadTimestamp         = 13;
   optional uint32  cdnNumber               = 14;
-  // Next ID: 19
+  optional bytes   uuid                    = 20;
+  // Next ID: 21
 }
 
 message GroupContext {
diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/exceptions/DonationProcessorErrorTest.kt b/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/exceptions/DonationProcessorErrorTest.kt
new file mode 100644
index 0000000000..598096d715
--- /dev/null
+++ b/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/exceptions/DonationProcessorErrorTest.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.signalservice.internal.push.exceptions
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
+import org.whispersystems.signalservice.internal.util.JsonUtil
+
+class DonationProcessorErrorTest {
+
+  companion object {
+    private val TEST_PROCESSOR = ActiveSubscription.Processor.STRIPE
+    private const val TEST_CODE = "account_closed"
+    private const val TEST_MESSAGE = "test_message"
+    private const val TEST_OUTCOME_NETWORK_STATUS = "test_outcomeNetworkStatus"
+    private const val TEST_OUTCOME_REASON = "test_outcomeReason"
+    private const val TEST_OUTCOME_TYPE = "test_outcomeType"
+    private val TEST_JSON = """
+      {
+      "processor": "${TEST_PROCESSOR.code}",
+      "chargeFailure": {
+        "code": "$TEST_CODE",
+        "message": "$TEST_MESSAGE",
+        "outcomeNetworkStatus": "$TEST_OUTCOME_NETWORK_STATUS",
+        "outcomeReason": "$TEST_OUTCOME_REASON",
+        "outcomeType": "$TEST_OUTCOME_TYPE"
+      }
+    
+    }
+    """.trimIndent()
+  }
+
+  @Test
+  fun givenTestJson_whenIFromJson_thenIExpectProperlyParsedError() {
+    val result = JsonUtil.fromJson(TEST_JSON, DonationProcessorError::class.java)
+
+    assertEquals(TEST_PROCESSOR, result.processor)
+    assertEquals(TEST_CODE, result.chargeFailure.code)
+    assertEquals(TEST_OUTCOME_TYPE, result.chargeFailure.outcomeType)
+    assertEquals(TEST_OUTCOME_NETWORK_STATUS, result.chargeFailure.outcomeNetworkStatus)
+  }
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6c4efc6b43..5d797b715e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -66,6 +66,8 @@ include(":device-transfer")
 //include(":device-transfer-app")
 include(":image-editor")
 //include(":image-editor-app")
+include(":donations")
+//include(":donations-app")
 include(":spinner")
 //include(":spinner-app")
 include(":contacts")
@@ -87,6 +89,9 @@ project(":device-transfer").projectDir = file("device-transfer/lib")
 project(":image-editor").projectDir = file("image-editor/lib")
 //project(":image-editor-app").projectDir = file("image-editor/app")
 
+project(":donations").projectDir = file("donations/lib")
+//project(":donations-app").projectDir = file("donations/app")
+
 project(":spinner").projectDir = file("spinner/lib")
 //project(":spinner-app").projectDir = file("spinner/app")
 
diff --git a/video/app/build.gradle.kts b/video/app/build.gradle.kts
index 51e84b782c..1448c4aed3 100644
--- a/video/app/build.gradle.kts
+++ b/video/app/build.gradle.kts
@@ -48,7 +48,7 @@ android {
     compose = true
   }
   composeOptions {
-    kotlinCompilerExtensionVersion = "1.4.3"
+    kotlinCompilerExtensionVersion = "1.5.4"
   }
   packaging {
     resources {
diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AudioTrackConverter.java b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AudioTrackConverter.java
index a597702d83..d5d2380d32 100644
--- a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AudioTrackConverter.java
+++ b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AudioTrackConverter.java
@@ -398,19 +398,13 @@ void release() throws Exception {
         }
     }
 
-    String dumpState() {
-        return String.format(Locale.US,
-                "A{"
-                        + "extracted:%d(done:%b) "
-                        + "decoded:%d(done:%b) "
-                        + "encoded:%d(done:%b) "
-                        + "pending:%d "
-                        + "muxing:%b(track:%d} )",
-                mAudioExtractedFrameCount, mAudioExtractorDone,
-                mAudioDecodedFrameCount, mAudioDecoderDone,
-                mAudioEncodedFrameCount, mAudioEncoderDone,
-                mPendingAudioDecoderOutputBufferIndex,
-                mMuxer != null, mOutputAudioTrack);
+    AudioTrackConverterState dumpState() {
+        return new AudioTrackConverterState(
+            mAudioExtractedFrameCount, mAudioExtractorDone,
+            mAudioDecodedFrameCount, mAudioDecoderDone,
+            mAudioEncodedFrameCount, mAudioEncoderDone,
+            mPendingAudioDecoderOutputBufferIndex,
+            mMuxer != null, mOutputAudioTrack);
     }
 
     void verifyEndState() {
diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/MediaConverter.java b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/MediaConverter.java
index 7d780d50ea..c7ad42ee2a 100644
--- a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/MediaConverter.java
+++ b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/MediaConverter.java
@@ -47,6 +47,8 @@ public final class MediaConverter {
     private static final String TAG = "media-converter";
     private static final boolean VERBOSE = false; // lots of logging
 
+    private static final int STUCK_FRAME_THRESHOLD = 100;
+
     // Describes when the annotation will be discarded
     @Retention(RetentionPolicy.SOURCE)
     @StringDef({VIDEO_CODEC_H264, VIDEO_CODEC_H265})
@@ -217,6 +219,8 @@ private void doExtractDecodeEditEncodeMux(
             final @Nullable AudioTrackConverter audioTrackConverter,
             final @NonNull Muxer muxer) throws IOException, TranscodingException {
 
+        MediaConverterState oldState = null;
+        int stuckFrames = 0;
         boolean muxing = false;
         int percentProcessed = 0;
         long inputDuration = Math.max(
@@ -227,11 +231,19 @@ private void doExtractDecodeEditEncodeMux(
                 ((videoTrackConverter != null && !videoTrackConverter.mVideoEncoderDone) ||
                  (audioTrackConverter != null &&!audioTrackConverter.mAudioEncoderDone))) {
 
+            final MediaConverterState currentState = new MediaConverterState(videoTrackConverter != null ? videoTrackConverter.dumpState() : null, audioTrackConverter != null ? audioTrackConverter.dumpState() : null, muxing);
+
             if (VERBOSE) {
-                Log.d(TAG, "loop: " +
-                        (videoTrackConverter == null ? "" : videoTrackConverter.dumpState()) +
-                        (audioTrackConverter == null ? "" : audioTrackConverter.dumpState()) +
-                        " muxing:" + muxing);
+                Log.d(TAG, "loop: " + currentState);
+            }
+
+            if (currentState.equals(oldState)) {
+                if (++stuckFrames >= STUCK_FRAME_THRESHOLD) {
+                    mCancelled = true;
+                }
+            } else {
+                oldState = currentState;
+                stuckFrames = 0;
             }
 
             if (videoTrackConverter != null && (audioTrackConverter == null || audioTrackConverter.mAudioExtractorDone || videoTrackConverter.mMuxingVideoPresentationTime <= audioTrackConverter.mMuxingAudioPresentationTime)) {
diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/MediaConverterState.kt b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/MediaConverterState.kt
new file mode 100644
index 0000000000..b59bde8763
--- /dev/null
+++ b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/MediaConverterState.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.video.videoconverter
+
+data class MediaConverterState(val videoTrack: VideoTrackConverterState?, val audioTrack: AudioTrackConverterState?, val muxing: Boolean)
+
+data class VideoTrackConverterState(val extractedCount: Long, val extractedDone: Boolean, val decodedCount: Long, val decodedDone: Boolean, val encodedCount: Long, val encodedDone: Boolean, val muxing: Boolean, val trackIndex: Int)
+
+data class AudioTrackConverterState(val extractedCount: Long, val extractedDone: Boolean, val decodedCount: Long, val decodedDone: Boolean, val encodedCount: Long, val encodedDone: Boolean, val pendingBufferIndex: Int, val muxing: Boolean, val trackIndex: Int)
diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoTrackConverter.java b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoTrackConverter.java
index 961dfed6bb..a045d0ef0e 100644
--- a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoTrackConverter.java
+++ b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoTrackConverter.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 package org.thoughtcrime.securesms.video.videoconverter;
 
 import android.media.MediaCodec;
@@ -21,7 +26,6 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.Locale;
 import java.util.concurrent.atomic.AtomicReference;
 
 import kotlin.Pair;
@@ -157,6 +161,7 @@ private VideoTrackConverter(
         // configure() call to throw an unhelpful exception.
         outputVideoFormat.setInteger(MediaFormat.KEY_COLOR_FORMAT, MediaCodecInfo.CodecCapabilities.COLOR_FormatSurface);
         outputVideoFormat.setInteger(MediaFormat.KEY_BIT_RATE, videoBitrate);
+        outputVideoFormat.setInteger(MediaFormat.KEY_BITRATE_MODE, MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_CBR);
         outputVideoFormat.setInteger(MediaFormat.KEY_FRAME_RATE, OUTPUT_VIDEO_FRAME_RATE);
         outputVideoFormat.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, OUTPUT_VIDEO_IFRAME_INTERVAL);
         if (Build.VERSION.SDK_INT >= 31 && isHdr(inputVideoFormat)) {
@@ -429,17 +434,12 @@ void release() throws Exception {
         }
     }
 
-    String dumpState() {
-        return String.format(Locale.US,
-                "V{"
-                        + "extracted:%d(done:%b) "
-                        + "decoded:%d(done:%b) "
-                        + "encoded:%d(done:%b) "
-                        + "muxing:%b(track:%d)} ",
-                mVideoExtractedFrameCount, mVideoExtractorDone,
-                mVideoDecodedFrameCount, mVideoDecoderDone,
-                mVideoEncodedFrameCount, mVideoEncoderDone,
-                mMuxer != null, mOutputVideoTrack);
+    VideoTrackConverterState dumpState() {
+        return new VideoTrackConverterState(
+            mVideoExtractedFrameCount, mVideoExtractorDone,
+            mVideoDecodedFrameCount, mVideoDecoderDone,
+            mVideoEncodedFrameCount, mVideoEncoderDone,
+            mMuxer != null, mOutputVideoTrack);
     }
 
     void verifyEndState() {
@@ -481,15 +481,15 @@ private static String createFragmentShader(
                 }
             }
             shader =
-                    "#extension GL_OES_EGL_image_external : require\n" +
-                            "precision mediump float;\n" +      // highp here doesn't seem to matter
-                            "varying vec2 vTextureCoord;\n" +
-                            "uniform samplerExternalOES sTexture;\n" +
-                            "void main() {\n" +
-                            "    gl_FragColor = (texture2D(sTexture, vTextureCoord)\n" +
-                            colorLoop.toString() +
-                            "    ) / " + sum + ";\n" +
-                            "}\n";
+                "#extension GL_OES_EGL_image_external : require\n" +
+                "precision mediump float;\n" +      // highp here doesn't seem to matter
+                "varying vec2 vTextureCoord;\n" +
+                "uniform samplerExternalOES sTexture;\n" +
+                "void main() {\n" +
+                "    gl_FragColor = (texture2D(sTexture, vTextureCoord)\n" +
+                colorLoop +
+                "    ) / " + sum + ";\n" +
+                "}\n";
         }
         Log.i(TAG, shader);
         return shader;
diff --git a/wire-handler/lib/build.gradle.kts b/wire-handler/lib/build.gradle.kts
index f98401b2fa..1e93b467e1 100644
--- a/wire-handler/lib/build.gradle.kts
+++ b/wire-handler/lib/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
 
 plugins {
-  id("org.jetbrains.kotlin.jvm") version "1.8.10"
+  id("org.jetbrains.kotlin.jvm") version "1.9.20"
   `java-library`
 }